Merged latest HEAD branch into skeleton-refactor branch

4396 files changed, 102690 insertions, 269458 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 0302faafb08..412b3ee371c 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -4,8 +4,6 @@
 
   <link rev="made" href="mailto:d.schmidt@vanderbilt.edu"></head>
 
-
-
 <body bgcolor="#ffffff" link="#000fff" text="#000000" vlink="#ff0f0f">
 
 <hr>
@@ -13,13 +11,16 @@
 
 <h4>Synopsis</h4>
 
-The file explains how to build and install ACE and its Network
-Services on the various OS platforms and compilers that it has been
-ported to.  Please consult the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ChangeLog">ChangeLog</a> file
-to see whether any recent changes to the release will affect your
-code.  In addition, you should check out our <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-development-process.html">development
-process</a>.  As you start working with ACE, we suggest you get copies
-of the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE/book1/">C++NPv1</a>, <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE/book2/">C++NPv2</a>, and <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0201699710/qid=1066059513/sr=8-1/ref=sr_8_1/103-7740325-3955843?v=glance&amp;s=books&amp;n=507846">APG</a> books
+The file explains how to build and install ACE, its Network
+Services, test suite and examples on the various OS platforms and compilers
+that it has been ported to.  Please consult the
+<a href="ChangeLog">ChangeLog</a> file to see whether any recent changes to
+the release will affect your code.  In addition, you should check out our
+<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-development-process.html">development
+process</a>.  As you start working with ACE, we suggest you get copies of the
+<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE/book1/">C++NPv1</a>,
+<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE/book2/">C++NPv2</a>, and
+<a href="http://www.riverace.com/acebooks/">APG</a> books
 to help guide you after you've built and installed ACE.  You should
 also consult the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-FMM.html">ACE Frequently Made
 Mistakes page</a>.  If you encounter any problems or would like to
@@ -30,7 +31,7 @@ report process</a>.<p>
 </p><h4>Document Index</h4>
 
 <ul>
-  <li><a href="#platforms">Supported Platforms and C++ Compilers</a>
+  <li><a href="#platforms">Platforms, C++ Compilers, and Support</a>
   </li><li><a href="#installpre">Installation prerequisites</a>
   </li><li><a href="#installnotes">Installation Notes</a>
   </li><li><a href="#g++">Compiling ACE with GNU g++</a>
@@ -38,6 +39,7 @@ report process</a>.<p>
   </li><li><a href="#aceinstall">Building and Installing ACE</a>
   </li><li><a href="#svcsinstall">Building and Installing ACE Network Services</a>
   </li><li><a href="#sslinstall">Building and Installing The ACE_SSL Library</a>
+  </li><li><a href="#guireactor_install">Building and Using GUI Reactors Libraries</a>
   </li><li><a href="#minimum_build">What Do I Need to Build for TAO?</a>
   </li><li><a href="#resource_requirements">System Resource Requirements</a>
   </li><li><a href="#MPC">General MPC Information</a>
@@ -50,49 +52,78 @@ report process</a>.<p>
 <p></p><hr><p>
 </p><h3><a name="platforms">Platforms, C++ Compilers, and Support</a></h3>
 
-<p>ACE has been ported to a large number of platfroms using many different
-compilers over the years.  The <a href="http://www.dre.vanderbilt.edu/">DOC group</a>, <a href="http://www.riverace.com/">Riverace</a>, <a href="http://www.theaceorb.com/">OCI</a>, <a href="http://www.theaceorb.nl/">Remedy IT</a>, and members of the ACE
+<p>ACE has been ported to a large number of platforms using many different
+compilers over the years.
+The <a href="http://www.dre.vanderbilt.edu/">DOC group</a>,
+<a href="http://www.riverace.com/">Riverace</a>,
+<a href="http://www.theaceorb.com/">OCI</a>,
+<a href="http://www.theaceorb.nl/">Remedy IT</a>, and members of the ACE
 user community have all contributed ports to make ACE the successful
 and far-reaching toolkit it is today.  Any UNIX/POSIX/Windows
-variation is a potential target platform for ACE.  If you have <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-porting.html">porting questions</a> or have a problem
+variation is probably an easy target platform for ACE.  If you have
+<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-porting.html">porting questions</a> or have a problem
 compiling the ACE source distribution, please contact one of the
 commercial support companies, or send a copy of the
-PROBLEM-REPORT-FORM to either the <a href="news:comp.soft-sys.ace">ACE
+<a href="PROBLEM-REPORT-FORM">PROBLEM-REPORT-FORM</a>, located in the
+ACE_wrappers directory, to either the <a href="news:comp.soft-sys.ace">ACE
 Newsgroup</a> or the <a href="mailto:ace-users@cs.wustl.edu">ACE
 mailing list</a> and someone will try to help you fix the problems.
 
 </p><p>The responsibility for maintaining ACE across this wide range of
-platforms is divided among a few different groups: the DOC group,
-Riverace, OCI, Remedy IT, and the ACE user community itself.  The
-table below summarizes each group's role and where you can get more
+platforms is divided among a few different groups:
+<ul>
+<li>The DOC group maintains platforms used in the course of their research
+and sponsored work</li>
+<li>Companies that provide support (Riverace, OCI, and Remedy IT), maintain
+platforms they support in the course of their various service offerings</li>
+<li>The ACE user community maintains any other desired platforms.</li>
+</ul>
+The <a href="http://www.dre.vanderbilt.edu/scoreboard/" target="_blank">
+build scoreboard</a>
+records the current status of build and regression testing during
+development by all of the above groups. It is available to all users wishing
+to provide build results. Members of the ACE community that maintain ACE on
+platforms not maintained by the DOC group, Riverace, OCI, or Remedy IT are
+encouraged to provide build and regression test results for the scoreboard
+to ensure that all in-use platforms are represented.
+See the <a href="http://cvs.doc.wustl.edu/viewcvs.cgi/*checkout*/README?cvsroot=autobuild" target="_blank">autobuild README</a> for more information about
+how to set up a build; contact one of the above groups to inquire about how
+to get your build results recorded on the scoreboard.</p>
+<p>Because older
+platforms that are not maintained tend to fall into a broken state and
+clutter the ACE sources with code that is no longer used, the development
+team reserves the right to remove ACE configuration files and source code
+specific to inactive platform configurations that are not
+listed on the scoreboard.</p>
+<p>The table below summarizes each group's role and where you can get more
 detailed information.  For information on TAO's platform coverage and
-support, please also see <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/TAO-INSTALL.html">TAO's install
+support, please also see <a href="TAO/TAO-INSTALL.html">TAO's install
 document</a>.</p><p>
 
 <table border="1" width="75%">
 <caption><b>Groups Involved in ACE Development and Support<br></b></caption>
 <thead>
   <tr valign="top">
-    <th>Group
-    </th><th>Platforms
-    </th><th>For more information
-  </th></tr>
+    <th>Group</th>
+    <th>Platforms</th>
+    <th>For more information</th>
+  </tr>
 </thead><tbody>
   <tr>
     <th>DOC Group</th>
-    <td><a href="http://www.dre.vanderbilt.edu/scoreboard/">Tested</a>
-        and used daily by the DOC group:
-        Solaris 7, 8 and 9 (many compilers excluding SunC++ 4.x)
-        Windows 2000, XP (MSVC++ 6.x, and 7.x)
-        Linux/Intel (many compilers), Linux/IA64 (GCC).
+    <td>Solaris 7, 8, 9, and 10 (many compilers excluding SunC++ 4.x);
+        Windows 2000, XP (MSVC++ 6, and 7.1);
+        many versions of Linux/Intel (many compilers), Linux/IA64 (GCC).
     </td>
-    <td>DOC sites at <a href="http://www.dre.vanderbilt.edu/">ISIS, </a><a href="http://doc.ece.uci.edu/">UCI</a> and <a href="http://tao.doc.wustl.edu/">Washington University</a>
+    <td>DOC sites at <a href="http://www.dre.vanderbilt.edu/">ISIS</a>,
+        <a href="http://doc.ece.uci.edu/">UCI</a> and
+        <a href="http://tao.doc.wustl.edu/">Washington University</a>
     </td>
   </tr>
   <tr>
     <th>Riverace</th>
-    <td>Offers support services for many platforms including those
-        above, HP-UX, AIX, and Windows CE.
+    <td>Offers ACE support and consulting services for many platforms
+        including AIX, HP-UX, Linux, Solaris, and Windows (including CE).
     </td>
     <td>Riverace's <a href="http://www.riverace.com/">web site</a></td>
   </tr>
@@ -102,18 +133,19 @@ document</a>.</p><p>
         software and service offerings.
     </td>
     <td>OCI's <a href="http://www.theaceorb.com/">web site</a> and
-        the TAO <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/TAO-INSTALL.html">install document</a></td>
+        the TAO <a href="TAO/TAO-INSTALL.html">install document</a></td>
   </tr>
   <tr>
     <th>Remedy IT</th>
     <td>Maintains ACE on many platforms required for their ACE and
         TAO service offerings. Besides the standard DOC group platforms
         we also support Borland C++ Builder 6, CBuilderX 1.0, MinGW,
-        Cygwin, VxWorks 5.5, OpenVMS 7.3-2, Linux 64bit Alpha, Tru64,
-        HPUX 11i 32/64 bit on PA-RISC, and HPUX 11i v2 on Itanium.
+        Cygwin, VxWorks 5.5.1, OpenVMS 7.3-2, Linux 64bit Alpha, Tru64,
+        SuSE Linux, HPUX 11i 32/64 bit on PA-RISC, and 
+        HPUX 11i v2 on Itanium.
     </td>
     <td>Remedy IT <a href="http://www.theaceorb.nl/">web site</a> and
-        the TAO <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/TAO-INSTALL.html">install document</a>
+        the TAO <a href="TAO/TAO-INSTALL.html">install document</a>
     </td>
   </tr>
   <tr>
@@ -125,16 +157,20 @@ document</a>.</p><p>
         IRIX 6.x; UnixWare 7.1.0; SunOS 4.x and Solaris with SunC++ 4.x;
         Linux on PPC; OpenMVS;
         Tandem; SCO; FreeBSD; NetBSD; OpenBSD;
+        Macintosh OS X;
         Chorus; OS/9; PharLap TNT Embedded ToolSuite 9.1;
-        QNX RTP and Neutrino 2.0; VxWorks; LynxOS; RTEMS
+        QNX RTP and Neutrino 2.0; LynxOS; RTEMS; Interix
+        (Windows Services for Unix)
     </td>
   </tr><tr>
-    <th>Not supported</th>
-    <td>The following platforms have been supported in the past but are
-        not supported anymore by the DOC Group. If you want to have
-        support for these environments contact one of the commercial
-        support organisations. The platforms are: VxWorks 5.4, MSVC5,
-        Borland C++ Builder 4 and 5.
+    <th>Not maintained</th>
+    <td>The following platforms have been ported to in the past but are
+        no longer maintained and may be removed from ACE at any time.
+        If you want to have support for these environments contact one
+        of the commercial support organisations. The platforms include:
+        DG/UX, VxWorks 5.4, MSVC5, Borland C++ Builder 4 and 5.
+        For up-to-date listings on platform that are deprecated and pending
+        removal from ACE, please see the <a href="NEWS">NEWS file</a>.
     </td>
   </tr>
     <tr><td></td>
@@ -169,9 +205,11 @@ of ACE (TAO and CIAO) includes GNUmakefiles for UNIX platforms, VC6
 project files, and VC71 solution files. If it is necessary to generate
 files for build tools for other compilers such as Visual Age for IBM,
 and Windows CE users have to run MPC themselves to generate the
-appropriate files. Please see <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/MPC/USAGE"> USAGE </a>, <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/MPC/README"> README </a> and <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/bin/MakeProjectCreator/README">README for ACE</a> files for
+appropriate files. Please see <a href="MPC/USAGE"> USAGE </a>,
+<a href="MPC/README"> README </a> and
+<a href="bin/MakeProjectCreator/README">README for ACE</a> files for
 details. The options that have been used to generate the above build
-files can be found in <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/bin/MakeProjectCreator/config/global.features">
+files can be found in <a href="bin/MakeProjectCreator/config/global.features">
 global.features</a> file.
 
 
@@ -188,14 +226,16 @@ global.features</a> file.
       a static (LIB) and dynamic (DLL) library, using the Win32 installation
       process described below.</p><p>
 
-      Please see the <a href="#Non-static%20Object%20Manager">Non-static
+      Please see the <a href="#NonStaticObjectManager">Non-static
       ACE_Object_Manager</a> discussion below.</p><p>
 
       We've also added some support for
       <a href="#mingw">GNU g++ with MinGW</a>,
-      <a href="#cygwin">GNU g++ with Cygwin</a>
-      <a href="#borland">Borland C++ 5.5, Borland C++ Builder 4.0/5.0/6.0
-      and Borland C++ BuilderX</a>, and IBM's VisualAge C++ compiler.
+      <a href="#cygwin">GNU g++ with Cygwin</a>,
+      <a href="#borland">Borland C++ Builder 6.0
+      and Borland C++ BuilderX</a>,
+      <a href="#interix">Interix (Windows Services for Unix)</a>,
+      and IBM's VisualAge C++ compiler.
       Since we don't have these compilers we rely on the ACE+TAO users
       community to maintain these ports.  Therefore, please send email
       to the ACE mailing list if you run into problems. </p><p>
@@ -274,7 +314,7 @@ global.features</a> file.
 
       Here's how to optimise the ACE library generation:</p><p>
 
-      Look at the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/GNUmakefile.ACE">ace/GNUmakefile.ACE</a>
+      Look at the <a href="ace/GNUmakefile.ACE">ace/GNUmakefile.ACE</a>
       in <code>$ACE_ROOT/ace</code>. Create a file called
       <code>ACE_All_Src.cpp</code>, and add a line to #include
       each of the source files
@@ -294,7 +334,7 @@ global.features</a> file.
       without any modifications on RedHat 5.1 and later, and on
       Debian 2.1 on both Intel and Alpha.  Use the
       <code>platform_linux.GNU</code> and <code>ace/config-linux.h</code>
-      in your <code>platform_macros.GNU</code> and 
+      in your <code>platform_macros.GNU</code> and
       <code>config.h</code> files, respectively.  The same
       files can be used on PowerPC, with LinuxPPC
       1999 (R5), with glibc 2.1.1.</p><p>
@@ -339,12 +379,6 @@ global.features</a> file.
             </pre><p>
       </p></li></ul>
 
-      With RedHat 5.0, you'll need some <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/os-patches/linux-patches.html">updates and possibly some
-      patches</a> to get ACE working with LinuxThreads.  Some of the
-      patches are necessary with Alpha CPUs and with some older
-      kernels.  egcs 1.0.1 can also be used, but it may need patches,
-      described there, as well.<p>
-
       <strong>NOTE:</strong> Be careful when installing egcs on RedHat
       systems.  If you don't remove your old gcc and libg++ RPMs, it's
       best to install egcs in a different directory than
@@ -560,25 +594,28 @@ global.features</a> file.
       <a href="http://www.cs.wustl.edu/%7Elevine/">David Levine</a>
       &lt;<a href="mailto:levine@cs.wustl.edu">levine@cs.wustl.edu</a>&gt; has
       ported ACE to VxWorks 5.2/5.3/5.3.1/5.4 with the GreenHills
-      1.8.8/1.8.9 and g++ compilers that are distributed with
-      VxWorks/Tornado.  An anonymous contributor has also
-      provided <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/os-patches/vxworks-5.1.txt">notes for using
-      ACE with VxWorks 5.1.</a>. It is not possible to use VxWorks 5.4
+      1.8.8/1.8.9, g++ and diab compilers that are distributed with
+      VxWorks/Tornado. It is not possible to use VxWorks 5.4
       and earlier with ACE anymore because the compilers delivered with
       5.4 and earlier don't support the C++ features ACE needs.</p><p>
 
-      Tornado 2.2/VxWorks 5.5 support IP multicast.  That is not enabled
-      by default in ACE for VxWorks, because it probably depends on
+      At this moment <a href="http://www.theaceorb.nl">Remedy IT</a> is upgrading 
+      and stabilizing ACE/TAO support for Tornado 2.2/VxWorks 5.5.1.
+      Since the existing support for previous VxWorks version has been unsupported 
+      and broken for some time and most (potential) users seem to have upgraded to 
+      VxWorks 5.5.1 no backporting effort is done. See also <a href="#vxworks">here</a>.
+      </p><p>
+      
+      Tornado 2.2/VxWorks 5.5.1 support IP multicast.  That is not enabled
+      by default in ACE for VxWorks, because it depends on your
       kernel configuration.  To enable it, add
       <code>#define ACE_HAS_IP_MULTICAST</code> to your
       <code>ace/config.h</code>.</p><p>
 
       In addition to all of the other benefits of ACE, it helps work
-      around some deficiencies with VxWorks 5.3/5.3.1.  Some of these
-      apply only with g++, at least thru version 2.7.2.  That is the
-      version that is shipped with Tornado 1.0.1/ VxWorks 5.3.1.  The
-      problems are:</p><p>
+      around some deficiencies with VxWorks. The problems are:</p>
 
+      <p>
       </p><ol>
         <li>The program entry point cannot be called "main" with g++.  ACE
             renames it to "ace_main" (configurable via ACE_MAIN) on VxWorks.
@@ -590,33 +627,15 @@ global.features</a> file.
             line arguments to argc/argv form.  See <a href="#spa">below</a>
             for details.<p>
 
-        </p></li><li>Unsigned long long support is not available with the g++ that
-            is distributed with Tornado 1.0.1/VxWorks 5.3.1, or with
-            GreenHills 1.8.8.  The documentation says that it is supported
-            by g++, but try using it :-)   Wind River technical support verified
-            that it doesn't work.  ACE provides its own 64-bit unsigned integer
-            type, ACE_hrtime_t, so you don't even have to worry about this
-            problem if you use it.<p>
-
-        </p></li><li>There a gory problem with munch that is severely aggravated
-            by the presence of a static in the Wind River/g++ iostream.h.
-            ACE hides this and provides an easy-to-use workaround in the
-            very unlikely situation where it becomes a problem.
-            Please see ace/config-vxworks5.x.h for more information.<p>
       </p></li></ol>
 
-      In addition, as noted <a href="#g++">below</a> following the
-      discussion of the g++ -fno-implicit-templates option,
-      -fno-implicit-templates is broken for x86 targets.  And, -O2
-      is not supported on some targets.<p>
-
       Please note that ACE uses one of the spare fields in the Wind
       River task control block, spare4, for thread- specific storage.
-      This field is specified in only one place, in ace/OS.i, so it
+      This field is specified in only one place, in ace/OS_NS_Thread.inl, so it
       can easily be changed to one of the other spare fields, if
       necessary.</p><p>
 
-      Versions of ACE from 4.3.3 and beyond destroy dynamically
+      ACE destroys dynamically
       allocated singletons in the ACE library.  But, they may not
       properly destroy some static objects.  If you have trouble
       running a program multiple times, it may be necessary to unload
@@ -626,7 +645,7 @@ global.features</a> file.
 
   </p></li><li><b>MVS OpenEdition</b> <p>
 
-      All of ACE has been ported to OpenEdition by Chuck Gehr &lt;<a href="mailto:gehr@sweng.stortek.com">gehr@sweng.stortek.com</a>&amp;gt.
+      All of ACE has been ported to OpenEdition by Chuck Gehr &lt;<a href="mailto:gehr@sweng.stortek.com">gehr@sweng.stortek.com</a>&gt;.
       The ACE library, all the tests and most of the examples and apps
       build clean.  There are still some problems that need to be
       ironed out:</p><p>
@@ -655,7 +674,7 @@ global.features</a> file.
       ACE has been ported to <a href="http://www.qnx.com/products/os/neutrino.html">QNX Neutrino
       2.0</a>.  We cross-compile for Neutrino on a QNX4 host using g++
       2.8.1, using the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/config-qnx-neutrino.h">ace/config-qnx-neutrino.h</a>
-      and <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_qnx_neutrino.GNU">include/makeinclude/platform_qnx_neutrino.GNU</a>
+      and <a href="include/makeinclude/platform_qnx_neutrino.GNU">include/makeinclude/platform_qnx_neutrino.GNU</a>
       configuration files.  Many of the ACE tests succeed, though some
       fail.  As the porting effort progresses, we hope to eliminate
       these failures.  If you know of fixes, please send them to
@@ -749,12 +768,7 @@ If you use the GNU GCC g++ compiler please note the following:
       We don't know what causes the link problem, though the
       workaround solves it.<p>
 
-  </p></li><li>ACE/TAO don't seem to build well with g++ 2.8.*.  We routinely
-      use g++ 2.95.x and g++ 3.x, and recommend those versions or better.<p>
-
-  </p></li><li>Earlier (prior to 2.95.2) versions of g++ may not compile
-      certain parts of ACE correctly due to compiler bugs.  Please
-      upgrade to g++ 2.95.2 or greater.<p>
+  </p></li><li>ACE/TAO needs g++ 2.95.x or better. Older versions are not usable anymore<p>
 
   </p></li><li>Make sure to update your gcc <code>config.status</code>
       file.  This file is produced when installing gcc; it specifies
@@ -787,10 +801,6 @@ If you use the GNU GCC g++ compiler please note the following:
       that initializes static objects.  Please see gcc's
       documentation for using <code>collect2</code>.<p>
 
-  </p></li><li>On VxWorks only, g++ (thru version 2.9.6, distributed
-      with Tornado 2.2/VxWorks 5.5), for x86 targets,
-      -fno-implicit-templates is broken.  In addition, -O2
-      is not supported on some targets.<p>
 </p></li></ul>
 
 
@@ -948,9 +958,9 @@ the UNIX methods.
 
 <h5><a name="unix_autoconf">Building ACE with GNU Autoconf</a></h5>
 <p>
-GNU Autoconf support is available in the ACE only distribution in the
-DOC group website. More, precisely support for Autoconf will be
-missing in distributions that have TAO and CIAO bundled along.
+GNU Autoconf support is available in the ACE and ACE+TAO distributions
+in the DOC group website. More, precisely support for Autoconf will be
+missing in distributions that have CIAO bundled along.
 
 GNU Autoconf support has been partially present in a number of ACE
 versions. However, ACE 5.4 was the first version that supported it in
@@ -960,12 +970,13 @@ your applications. The traditional configuration method is still more
 reliable. Any help you can
 lend to improve the ACE build process using GNU Autoconf would be very much
 appreciated. Please send any fixes to the
-<a href="mailto:ace-users@cs.wustl.edu">ACE users</a> mailing list.</p>
+<a href="mailto:ace-users@cs.wustl.edu">ACE users</a> mailing list
+using the standard <a href="PROBLEM-REPORT-FORM">problem-report-form</a>.</p>
 <p>
-The ACE only kit has been bootstrapped so you do not need to install
-the GNU Autotools (autoconf, automake, libtool) unless you want to
-participate in testing and developing this process further. To simply
-configure and build ACE, do:
+The kit has been bootstrapped so you do not need to install the GNU
+Autotools (autoconf, automake, libtool) unless you want to participate
+in testing and developing this process further. To simply configure
+and build ACE, do:
 </p><ol>
   <li><code>cd</code> to the top-level <code>ACE_wrappers</code> directory.</li>
   <li>Create a subdirectory to hold your build's configuration and built
@@ -973,7 +984,7 @@ configure and build ACE, do:
        <pre>       mkdir build
        cd build
        </pre>
-      Note that you do not run the <code>create_ace_build</code> utility
+      Note that you do not run the <code>create_ace_build.pl</code> utility
       mentioned in the <a href="#cloning">Cloning the Source Tree</a>
       section. The configure script takes care of creating all files
       and links that are needed.</li>
@@ -1117,6 +1128,8 @@ include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU
       This file contains the compiler and Makefile directives that are
       platform/compiler-specific. If you'd like to add make options, you
       can add them before including the paltform-specific configuration.<p>
+      NOTE! There really is not a # character before 'include' in the
+      platform_macros.GNU file. # is a comment character.<p>
 
   </p></li><li>Note that because ACE builds shared libraries, you'll need to set
       LD_LIBRARY_PATH to whereever you put the binary version of the
@@ -1137,13 +1150,13 @@ include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU
       library, tests, the examples, and the sample applications.
       Building the entire ACE release can take a long time and consume
       lots of disk space, however.  Therefore, you might consider
-      cd'ing into the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace">$ACE_ROOT/ace/</a> directory and
+      cd'ing into the <a href="ace">$ACE_ROOT/ace/</a> directory and
       running <code>make</code> there to build just the ACE library.
       As a sanity check, you might also want to build and run the
-      automated <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/tests/README">"one-button" tests</a> in <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/tests/">$ACE_ROOT/tests/</a>.  Finally, if you're also
+      automated <a href="tests/README">"one-button" tests</a> in <a href="tests/">$ACE_ROOT/tests/</a>.  Finally, if you're also
       planning on building <a href="http://www.cs.wustl.edu/%7Eschmidt/TAO.html">TAO</a>, you
       should build the <a href="http://www.cs.wustl.edu/%7Eschmidt/PDF/gperf.pdf">gperf</a>
-      perfect hash function generator application in <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/apps/gperf">$ACE_ROOT/apps/gperf/</a>.</p><p>
+      perfect hash function generator application in <a href="apps/gperf">$ACE_ROOT/apps/gperf/</a>.</p><p>
 
   </p></li><li>If you need to regenerate the Svc_Conf_y.cpp file, you'll need to
       get <a href="http://ftp.gnu.org/pub/gnu/bison/">GNU Bison</a>.
@@ -1234,11 +1247,6 @@ Set the environment variable below to build a version of ACE with
 Codeguard support. Should only be used when DEBUG is also set<br>
       <code>set CODEGUARD=1</code><br>
       <br>
-Set the environment variable below to build a version of ACE that is
-build against the VCL-compatible run-time library. This can only be
-used with BCB version 4<br>
-      <code>set PASCAL=1</code><br>
-      <br>
       Set the environment variable below to build a version of ACE using the
       C++BuilderX preview compiler. This compiler isn't supported at this moment
       but by setting this environment variable the new compiler is used and
@@ -1249,7 +1257,7 @@ used with BCB version 4<br>
       <br><code>make -f Makefile.bor</code><br>
       <br>
       You may also enable the options by passing them as command line options to make, for example:<br>
-      <code>make -f Makefile.bor -DDEBUG -DPASCAL</code><br>
+      <code>make -f Makefile.bor -DDEBUG</code><br>
       <br>
   </li><li>Optionally install the ACE header files, libraries and executables
 for use
@@ -1264,17 +1272,6 @@ see <a href="http://www.tenermerx.com/tao_bcb/index.html">http://www.tenermerx.c
 for more detailed information on building and using ACE+TAO with Borland C++
 Builder. <p>
 
-If you are using C++Builder 4, then the libraries built using the above
-instructions are intended for use with generic console or windows applications
-and they link against the corresponding C++ runtime library. VCL applications
-created using BCB4's RAD environment must link against the VCL-compatible (ie
-pascal-compatible) runtime library.  To tell the difference between these
-libraries the VCL-compatible ones have a 'p' in the suffix (i.e., 'p' for
-pascal).  To build VCL compatible libraries try
-</p><blockquote><pre><code>set PASCAL=1
-make -f Makefile.bor
-</code></pre></blockquote> <p>
-
 The Borland C++ Builder 4.0/5.0/6.0 port has been done by <a href="mailto:jody@atdesk.com">Jody Hagins</a>, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p>
 
 <b>ACE TESTS</b></p><p>
@@ -1314,8 +1311,8 @@ Microsoft Visual C++</a></h4>
   files for static builds. Workspaces for static and DLL builds will be
   available through the stock release at DOC group's website. The
   workspaces for MFC are not available and have to be generated using
-  MPC. Please see <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/MPC/README">MPC's README</a> for
-  details.<br>
+  MPC. Please see <a href="MPC/README">MPC's README</a> for
+  details.<br><br>
   </li><li>Now load the workspace file for ACE (ACE_ROOT/ACE.dsw).<br>
       <br>
   </li><li>Make sure you are building the configuration (i.e, Debug/Release)
@@ -1388,7 +1385,7 @@ Microsoft Visual C++</a></h4>
 </li></ol>
 
 <p>More information for ACE/TAO on MSVC can be found
-<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/msvc_notes.txt">here</a>.  The doxygen version of this
+<a href="docs/msvc_notes.txt">here</a>.  The doxygen version of this
 document is available under Related Topics in the ACE Library.</p>
 
 <b>ACE TESTS</b><p>
@@ -1625,7 +1622,7 @@ For our build we require the following packages besides the packages the
 setup selects by default:
 <a name="cygwinpacks">
 </a></p><blockquote>
-<a name="cygwinpacks"><b><tt>gcc (version 3.3.3), cygipc, make, perl</tt></b>.
+<a name="cygwinpacks"><b><tt>gcc (version 3.3.3), cygipc, make, perl, binutils</tt></b>.
 </a></blockquote>
 
 <ol>
@@ -1745,8 +1742,47 @@ variable as explained </a><a href="#cygwinrunpath">above</a>.
 </p><p>
 You may want to check <tt>$ACE_ROOT/tests/README</tt> for the status
 of the various tests on Cygwin and the different Windows flavors.
+</p>
 
-</p><p></p><hr align="left" width="50%"><p>
+<p></P>
+<hr align=left width="50%">
+
+<p>
+<H4><a name="interix">Building and Installing ACE on Win32 with Interix</H4>
+<P>Interix comes with a BSD style make you need GNUmake.
+</P>
+<P>Make builds easily under Interix or there is a pre-built
+package at: </P>
+<P><A
+href="http://www.interopsystems.com/tools/warehouse.htm">http://www.interopsystems.com/tools/warehouse.htm</A> </P>
+<P>If you are building for a machine without a network
+card, you may want to check <A href="#win32nonic" ><FONT color=#0000ff>here</FONT></A> first. </P>
+<P>This port was built and tested under Interix 3.5. a.k.a.
+<A href="http://www.microsoft.com/windows/sfu/">Windows
+Services for UNIX 3.5.</A></P>
+<P>To build follow the <A href="#unix_traditional" >Traditional ACE/GNU Make
+Configuration</A> instructions replacing the following include directives:</P>
+<P><TT>#include
+"ace/config-win32-interix.h"</TT> </P>
+<P>for the config.h header </P>
+<P>and: </P>
+<P><TT>include
+$(ACE_ROOT)/include/makeinclude/platform_win32_interix.GNU</TT></P>
+<P>for your platform_macros.GNU file.</P>
+<P>ACE should build fine with just '<TT>make</TT>', the only other option tried thus far is
+'<TT>make static_libs_only=1</TT>' which also works. Any
+other options may not work.</P>
+<P><b>ACE TESTS</B> </P>
+<p>The tests are located in <TT>$ACE_ROOT/tests</TT>. After building the library, you can
+change to that directory and run make: </P><code></CODE>
+<P><TT>% cd $ACE_ROOT/tests </TT><BR><TT>% make </TT>
+<p>Once you build all the tests, you can run <code>run_test.pl</CODE> in the <code>tests</CODE> directory to try all the tests: </P>
+<P><TT>% run_test.pl </TT></P>
+<p>If you are using ACE as a shared library, you will need
+to modify your LD_LIBRARY_PATH as explained in<A href="#unix_traditional" ><FONT color=#800080>Traditional ACE/GNU Make Configuration</FONT></A>. </P>
+<p></P>
+
+<p></p><hr align="left" width="50%"><p>
 </p><h4><a name="vxworks">Building and Installing ACE on VxWorks</a></h4>
 For the most part, you should be able to follow the instructions above
 to build ACE and applications that use it.  Start with the
@@ -1755,18 +1791,24 @@ applications that use it.  Please see below for more information on
 <a href="#VxWorks/NT">building ACE on NT hosts for VxWorks targets</a>.<p>
 
 A few notes on VxWorks builds (thanks to
-<a href="mailto:Paul_von_Behren@stortek.com">Paul von Behren</a>
-for these notes):</p><p>
+<a href="mailto:Paul_von_Behren@stortek.com">Paul von Behren</a> and 
+<a href="http://www.theaceorb.nl">Remedy IT</a> for these notes):</p>
+<p>
 </p><ul>
   <li>VxWorks builds are done with a cross compiler, i.e., the compiles
       are done on a workstation creating object modules which are
       downloaded and loaded into the VxWorks target system.<p>
   </p></li><li>C++ object modules must be post-processed by a VxWorks
-      utility called "munch."  ACE includes a perl script called
-      <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/bin/ace_ld">$ACE_ROOT/bin/ace_ld</a>,
-      which is called from the Makefiles, replacing
-      the traditional <code>ld</code> step.  You must have perl installed
-      to use <code>ace_ld</code>.  If perl is not on your path, you'll
+      utility called "munch" to set up calls to static constructors and destructors. 
+      ACE integrates the makefile includes/rules files
+      distributed with VxWorks to achieve maximum compatibility and reuse the target 
+      specifications and buildcommands defined by Windriver itself.
+      The original ACE support for VxWorks included a perl script called
+      <a href="bin/ace_ld">$ACE_ROOT/bin/ace_ld</a>,
+      which was called from the Makefiles, replacing
+      the traditional <code>ld</code> step. Although this script is currently still 
+      available it is not used anymore.<BR>
+      You must have perl installed to use <code>ace_ld</code>.  If perl is not on your path, you'll
       have to set <code>PERL_PATH</code> to the full path (including
       perl.exe), either in your
       <code>$(ACE_ROOT)/include/makeinclude/platform_macros.GNU</code>
@@ -1779,7 +1821,7 @@ for these notes):</p><p>
 
 You'll have to let ACE know the target type at compile time.  There
 are several ways to do this; please see the
-<code>$ACE_ROOT/include/makeinclude/platform_vxworks5.x_g++.GNU</code>
+<code>$ACE_ROOT/include/makeinclude/platform_vxworks5.5.x.GNU</code>
 platform file for detailed information.<p>
 
 The VxWorks platform_vxworks*.GNU files are set up so that shared
@@ -1791,10 +1833,6 @@ you use TAO on VxWorks that you will need to set your LD_LIBRARY_PATH
 to find the TAO IDL compiler libraries (installed in the ace
 directory) on the host.</p><p>
 
-With g++, $ACE_ROOT/bin/ace_ld is used to munch object files and
-libraries to set up calls to static constructors and destructors.
-bin/ace_ld requires perl on the host platform.</p><p>
-
 These non-default VxWorks kernel configuration <code>#defines</code>
 are required with ACE:</p><p>
 
@@ -1852,7 +1890,7 @@ Please note that the <code>main</code> entry point is renamed to
 to comply with its restriction against using <code>main</code>.
 In addition, ACE_HAS_NONSTATIC_OBJECT_MANAGER is enabled by default
 to cleanly support construction and destruction of static objects.
-Please see the <a href="#Non-static%20Object%20Manager">Non-static
+Please see the <a href="#NonStaticObjectManager">Non-static
 ACE_Object_Manager</a> discussion for the important implication
 of this feature.</p><p>
 
@@ -1870,37 +1908,23 @@ to <code>ace_main</code>.  Its usage is:
 spa ace_main, "arg1" [, ...]
 </code></pre>
 
-All arguments must be quoted, even numbers.<p>
+All arguments must be quoted, even numbers. You can start also ace_main
+without spawning another thread by using:<p>
 
-The ACE <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/tests/">tests</a> write their output files in a
-directory named <code>log/</code>, below the current
-(<code>tests</code>) directory.  If you don't have NFS included in
-your VxWorks kernel, you can use these steps, provided by
-<a href="mailto:clarence_m_weaver@md.northgrum.com">Clarence M. Weaver</a>,
-to run the tests and capture their output:</p><p>
-</p><ol>
-  <li>What I did was create a log directory on the boot NT host of my vxworks
-    target.<p>
-  </p></li><li>I copied all the test applications and the run_tests.vxworks script to
-    the parent of the log directory.<p>
-  </p></li><li>Using the target shell not the host shell, I "cd" to the directory
-    containing the script and test programs.<p>
-  </p></li><li>Invoked the script &lt; run_tests.vxworks from this target shell.<p>
-</p></li></ol>
+</p><pre><code>
+spaef ace_main, "arg1" [, ...]
+</code></pre>
 
-<a href="mailto:Kirk.Davies@pobox.com">Kirk Davies</a> provided this
-approach for running the ACE tests on Tornado II:
-
-<ul>
-  <li>Under Tornado II, I set up the Target Server File System (TSFS), and
-    the test logs get written to the log subdirectory under that.<p>
-  </p></li><li>You have to set an environment variable before running the tests:
-<pre>putenv("ACE_TEST_DIR=/tgtsvr")
-</pre><p>
-</p></li></ul>
+Be aware of the fact that when you execute <code>ace_main</code> that argc
+will be zero and argv* will also be zero. Using argv[0] will then not return
+the program name, but will result in a crash.</p>
 
 <h5><a name="VxWorks/SharedLibs">Building Shared Libraries for VxWorks</a>.</h5>
 
+<strong>NOTE</strong>: Since VxWorks support is currently being reworked with
+an initial focus on static builds the support for shared builds is momentarily
+broken. This will be remedied(!) as soon as possible.
+
 ACE supports shared libraries for VxWorks, but only with the g++
 compiler.  To build shared libraries instead of the default static
 libraries, added <code>shared_libs=1</code> (<strong>not</strong>
@@ -1952,6 +1976,55 @@ After building the shared lib, link it into the kernel by setting
 the <code>MACH_EXTRA</code> make variable in the kernel configuration
 Makefile.  Then, build the kernel using <code>make exe</code>.<p>
 
+</p><h5><a name="VxWorksTestScript">Using the one-button ACE tests with VxWorks</a>.</h5>
+
+It is possible to generate a script to execute all ACE tests. You can do this by executing
+</a></p><blockquote><code></code><pre><a name="vxworksscript">% perl run_test.pl -v -o > run_test.vxworks
+</a></pre></blockquote>
+
+The ACE tests write their output files in a directory named 
+<code>log/</code>, below the current (<code>tests</code>) directory.<br/>
+</p>
+<p>
+To run the tests from the build directory on an NT host where you crossbuild your
+VxWorks ACE/TAO you can set up the Target Server File System (TSFS) in your Target Server
+configuration. If you f.i. set the root for the TSFS to the root directory of your builddisk
+you can set the default directory for the target by issueing the following command
+from a Host shell: '@cd "/tgtsvr/{path to ACE}/ACE_wrappers/tests"'.
+The '@' addition makes sure this command is executed for the target environment and not the
+local host shell environment.
+If you also issue the command 'cd {path to ACE}/ACE_wrappers/tests' you can execute the
+generated one button testscript like: '&lt; run_test.vxworks'.
+</p>
+<p>
+Running the ACE tests automatically from the ACE autobuild tool using Target Server and Host 
+shell options is also supported.
+</p>
+<p>
+If you don't have NFS included in your VxWorks kernel, you can use these steps, provided by
+<a href="mailto:clarence_m_weaver@md.northgrum.com">Clarence M. Weaver</a>,
+to run the tests and capture their output:</p><p>
+</p><ol>
+  <li>What I did was create a log directory on the boot NT host of my VxWorks
+    target.<p>
+  </p></li><li>I copied all the test applications and the run_test.vxworks script to
+    the parent of the log directory.<p>
+  </p></li><li>Using the target shell not the host shell, I "cd" to the directory
+    containing the script and test programs.<p>
+  </p></li><li>Invoked the script using <code>&lt; run_test.vxworks</code> from this target shell.<p>
+</p></li></ol>
+
+<a href="mailto:Kirk.Davies@pobox.com">Kirk Davies</a> provided this
+approach for running the ACE tests on Tornado II:
+
+<ul>
+  <li>Under Tornado II, I set up the Target Server File System (TSFS), and
+    the test logs get written to the log subdirectory under that.<p>
+  </p></li><li>You have to set an environment variable before running the tests:
+<pre>putenv("ACE_TEST_DIR=/tgtsvr")
+</pre><p>
+</p></li></ul>
+
 </p><h5><a name="VxWorks/NT">Building ACE on Tornado/NT hosts for VxWorks targets</a>.</h5>
 The following, very useful information was contributed by
 <a href="http://people.qualcomm.com/cryan">Chris Ryan</a>
@@ -1960,14 +2033,12 @@ Please submit corrections, additions, or clarifications to the
 the <a href="mailto:ace-users@cs.wustl.edu">ACE mailing list</a>.<p>
 
 <strong>NOTE:</strong>The make (version 3.74) that is provided with
-Tornado II cannot be used to build ACE.  Use Cygnus' make (version 3.75)
-instead.)</p><p>
-
-<strong>NOTE:</strong>Optimization is enabled be default in
-<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_vxworks5.x_g++.GNU">platform_vxworks5.x_g++.GNU</a>.  However, the compiler that is shipped with Tornado II has
-trouble compiling some files with -O2.  To disable optimization
-for an individual file, just add <code>optimize=0</code> to your
-make invocation when compiling that file.</p><p>
+Tornado 2.2 cannot be used to build ACE. A working version is available
+from the WindRiver support site, download the
+<a href="https://secure.windriver.com/cgi-bin/windsurf/downloads/view_binary.cgi?binaryid=838">
+make3_80.gvk_patches</a> and the
+<a href="https://secure.windriver.com/cgi-bin/windsurf/downloads/view_binary.cgi?binaryid=100340">
+make3_80.tor2_2.new_dependency_rules</a> package and install them.</p><p>
 
 Using the Cygnus tools, this approach works:
 </p><ul>
@@ -1978,7 +2049,7 @@ Using the Cygnus tools, this approach works:
   </p></li><li>Set up your
     <code>ACE_wrappers/include/makeinclude/platform_macros.GNU</code>
     as usual for VxWorks.  See
-    <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_vxworks5.x_g++.GNU">the
+    <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_vxworks5.5.x.GNU">the
     g++/VxWorks platform file</a> for more information.<p>
   </p></li><li>Create an <code>ACE_wrappers/ace/config.h</code> file that looks
     something like the following.  tao_idl should be built to not support
@@ -2003,7 +2074,7 @@ A few additional Windows Notes, from Paul von Behren:<p>
       large collection of GNU tools to WinNT/95 - including a port of
       gcc/g++.  See <a href="http://www.cygnus.com/misc/gnu-win32/">http://www.cygnus.com/misc/gnu-win32/</a>
       A related link is <a href="ftp://ftp.cygnus.com/pub/gnu-win32/latest/">ftp://ftp.cygnus.com/pub/gnu-win32/latest/</a><p>
-  </p></li><li>To set up the command-prompt build environemnt, run
+  </p></li><li>To set up the command-prompt build environment, run
       <code>Tornado\host\x86-win32\bin\TorVars.bat</code>.  This is done
       implicitly within the Tornado IDE.<p>
   </p></li><li>To run <code>ace_ld</code>, you still need perl installed -
@@ -2061,7 +2132,7 @@ on Windows NT hosts:
       </pre>
 
       <code>aced.dll</code> is produced in an ACE NT source tree according to
-      documented procedure for NT VC++5.0 ACE build.
+      documented procedure for NT VC++ 6.0 ACE build.
 
       <code>cygwin.dll</code> is from the Cygnus GNU software download and install.
 
@@ -2074,10 +2145,11 @@ on Windows NT hosts:
       And create a
       <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code>
       that looks like:<p>
-      </p><pre>      WIND_BASE = /tornado
+      </p><pre>
+      WIND_BASE = /tornado
       WIND_HOST_TYPE = x86-win32
       CPU = I80486
-      include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU
+      include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.5.x.GNU
       </pre>
 
  </li><li>When using cygnus windows GNUTools on WinNT you have to start
@@ -2090,8 +2162,7 @@ on Windows NT hosts:
 <h5>TAO on NT Tornado host, VxWorks target.</h5>
 
 <ol>
-  <li>Build ACE and TAO_IDL in the NT tree as already documented. As
-      mentioned above, I put <code>aced.dll</code> in <code>/bin</code>.
+  <li>Build ACE and TAO_IDL in the NT tree as already documented.
       Be sure to build ACE's gperf on NT, in
       <code>ACE_wrappers/apps/gperf/src</code>.<p>
 
@@ -2111,7 +2182,7 @@ on Windows NT hosts:
 </p></li></ol>
 
 
-<h4><a name="vxworks"> </a>
+<h4><a name="vxworks"></a>
 <a href="mailto:Jaffar_Shaikh@Mitel.COM">Jaffar Shaikh's</a>
 Notes for Building ACE and TAO for VxWorks on NT host</h4>
 <b></b><p><b>Scenario:</b>  I was building the ACE and TAO for VxWorks
@@ -2121,16 +2192,14 @@ host based card.</p>
 </b><p>NT 4.0 workstation with 128 M RAM, 266MHz Pentium.</p>
 
 <b><p>Software Needed For Building TAO</p>
-</b><p>1) PERL: Active State's ActivePerl 5.6.0.618 for NT available as
-freeware from
-http://www.ActiveState.com/download/contrib/Microsoft/NT/InstMsi.exe
+</b><p>1) Active State's ActivePerl from
+<a href="http://www.activestate.com/software/default.htm">http://www.activestate.com/software/default.htm</a>
 </p>
 
-<p>2) Tornado II .Release V 9904 from Windriver.</p>
+<p>2) Tornado 2.2.1 from Windriver.</p>
 
 <p>3) Cygwin GNU to build TAO. It is available for NT as a freeware
-from </p>
-<p>http://www.cygwin.com/</p>
+from the <a href="http://www.cygwin.com">Cygwin</a> site</p>
 <p>The Cygwin Make (version 3.75) can only build the TAO not the
 Tornado II make (version 3.74)</p>
 
@@ -2191,11 +2260,11 @@ Control Panel-&gt; System -&gt; Environment)</p>
 <p>WIND_BASE = /tornado</p>
 <p>WIND_HOST_TYPE = x86-win32</p>
 <p>include
-$(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU</p>
+$(ACE_ROOT)/include/makeinclude/platform_vxworks5.5.x.GNU</p>
 <p>ACE_COMPONENTS=FOR_TAO (you may choose this option to build ACE
 library that supports TAO)</p>
 
-<p> </p>
+<p></p>
 <b><p>Steps to Build</p>
 </b><p>1) Build Ace.dll under NT</p>
 <p>In  MS Visual C++ open C:\Corba\ACE_wrappers\ace.dsw And build Ace
@@ -2305,7 +2374,7 @@ Here's what you need to do:<p>
 cd ACE_wrappers
 
 # create the host (e.g. Linux in this case) build tree
-./bin/create_ace_build Linux_g++
+bin/create_ace_build.pl Linux_g++
 cd build/Linux_g++/ace
 ln -s ../../../ace/config-linux.h config.h
 cd ../include/makeinclude
@@ -2313,7 +2382,7 @@ ln -s ../../../../include/makeinclude/platform_linux.GNU platform_macros.GNU
 cd ../../../..
 
 # create the target build tree
-./bin/create_ace_build rtems
+bin/create_ace_build.pl rtems
 cd build/rtems/TAO
 /bin/rm -r TAO_IDL
 ln -s ../../Linux_g++/TAO/TAO_IDL .
@@ -2405,7 +2474,7 @@ below.</p>
 </ol>
 <h3>Borland C++</h3>
 <p>Support for building ACE's ACE_SSL library and TAO's SSLIOP
-   pluggable protocol with Borland C++ does exist. 
+   pluggable protocol with Borland C++ does exist.
 <ol>
   <li>Set the <code>SSL_ROOT</code> environment variable to the location
       of the directory containing the OpenSSL <code>inc32</code> and
@@ -2418,6 +2487,89 @@ below.</p>
 </ol>
 </p>
 
+<hr><p>
+</p><h3><a name="guireactor_install">Building and Using GUI Reactors Libraries</a></h3>
+There is a general method for building and using <code>ACE_Reactors</code> for various GUI
+libraries.
+    <h4> Building GUI Reactor Library </h4>
+    <ol>
+      <li>Try to generate build files using MPC. Inspect the output of MPC to find out which features are
+        necessary to build given reactor. Add these features to
+        <code>ACE_wrappers/bin/MakeProjectCreator/*.features</code> file, or pass them directly to MPC
+        using <code>-features</code> command line option. For example, for <code>FlReactor</code> the procedure
+        consists of five steps
+        <ol>
+          <li> In the first pass one gets that <code>x11</code> (X11 libraries) is missing.<br>
+            <code>$ mwc.pl
+              Skipping ACE_FlReactor (ace_flreactor.mpc), it requires x11.
+            </code></li>
+            Ensure that <code>X11</code> libraries are installed, then pass <code>x11=1</code> feature to MPC.
+          <li>In the second pass one gets that <code>gl</code> (OpenGL library) is missing.<br>
+            <code>$ mwc.pl -features x11=1 ace.mwc
+              Skipping ACE_FlReactor (ace_flreactor.mpc), it requires gl.
+            </code></li>
+            Ensure that <code>OpenGL</code> libraries are installed, then pass <code>gl=1</code> feature to MPC.
+          <li>In the third pass one gets that <code>fl</code> (Fast Light Toolkit) is missing.<br>
+            <code>$ mwc.pl -features x11=1,gl=1 ace.mwc
+              Skipping ACE_FlReactor (ace_flreactor.mpc), it requires fl.
+            </code></li>
+            Ensure that <code>Fast Light Toolkit</code> libraries are installed, then pass <code>fl=1</code>
+            feature to MPC.
+          <li>In the fourth pass one gets that <code>ace_flreactor</code> feature is missing<br>
+            <code>$ mwc.pl -features x11=1,gl=1,fl=1 ace.mwc
+              Skipping ACE_FlReactor (ace_flreactor.mpc), it requires ace_flreactor.
+            </code></li>
+          Allow MPC to generate makefiles for <code>FlReactor</code> by setting <code>ace_flreactor=1</code> feature.
+          <li>In the last pass one obtains files for building <code>FlReactor</code>.<br>
+            <code>$ mwc.pl -features x11=1,gl=1,fl=1,ace_flreactor=1 ace.mwc
+            </code></li>
+        </ol>
+      </li>
+      <li> Required build files are generated now, it is enough then to invoke build tool.
+      For example for under <code>MPC::gnuace</code> one has to call
+      <code>make x11=1 gl=1 fl=1 ace_flreactor=1</code>. For <code>MPC::vc7</code> target all features are
+      encoded in generated project files, thus it is enough to compile ACE using MSVC.</li>
+  </ol>
+    The build procedure leads to a specific GUI Reactor library. For example, for
+    <code>Qt</code> and <code>Linux </code> one gets <code>libQtReactor.so</code>, while for
+    <code>Windows</code> the results are shared <code>QtReactor.dll</code> and import
+    <code>QtReactor.lib</code> libraries or their variants depending on build options.
+  <h4> Using GUI Reactor Library </h4>
+    MPC-based application projects depending on specific [Gui]Reactor may inherit settings from
+    <code>ace_[gui]reactor.mpb</code> base projects. These base projects ensure that all necessary libraries
+    are linked to the aplpication, specifies feature necessary to build a project and moreover impose a
+    build order consistant with ACE. For example, the application project using <code>XtReactor</code> should be
+    derived from <code>ace_xtreactor.mpb</code>.
+  <h4>Notes on specific GUI Reactors</h4>
+    <ul>
+      <li> <code>QtReactor</code></li>
+        The build is controlled by <code>ace_glreactor</code> feature.
+        To build this reactor one has to provide feature <code>qt</code> (Qt library). Moreover,
+        it is assumed that <code>Qt</code> was installed in a standard way
+        and <code>QTDIR</code> points to <code>Qt</code> installation folder. To build TAO
+        support for <code>Qt</code> one should use <code>tao_qtresource</code> feature.
+      <li> <code>XtReactor</code></li>
+        The build is controlled by <code>ace_xtreactor</code> feature.
+        To build this reactor one has to provide the following features: <code>x11</code> (X11 libraries) and
+        <code>xt</code> (X11 Toolkit). Moreover, some examples and tests related with <code>XtReactor</code>
+        needs additionall features namely either <code>motif</code> (Motif/Lesstif libraries) or
+        <code>athena</code> (Athena widgets). To build TAO
+        support for <code>xt</code> one should use <code>tao_xtresource
+        </code> feature.
+      <li> <code>TkReactor</code></li>
+        The is controlled by <code>ace_tkreactor</code> feature. To build this reactor one has to provide
+        <code>tk</code> (Tcl libraries) feature. To build TAO
+        support for <code>Tk</code> one should use <code>tao_tkresource</code> feature.
+      <li> <code>FlReactor</code></li>
+        The  build is controlled by <code>ace_flreactor</code> feature.
+        To build this reactor one has to provide the following features: <code>x11</code> (X11 libraries),
+        <code>gl</code> (OpenGl) and <code>fl</code> (Fast Light Toolkit). To build TAO
+        support for <code>Fl</code> one should use <code>tao_flresource</code> feature.
+        <strong>MS Windows:</strong> The paths to <code>fltkdll</code> and
+        <code>OpenGL32</code> libraries, as well as <code>fltk</code> header files
+        should be setup manually for succesfull compilation. Obviosuly,
+        <code>x11</code>switch is ignored for this platform.</li>
+    </ul>
 
 <hr><p>
 </p><h3><a name="minimum_build">What Do I Need to Build for TAO?</a></h3>
@@ -2578,23 +2730,22 @@ The Eclipse CDT C++ development environment can be used to develop ACE applicati
 
 <ul>
   <li><a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-porting.html">Porting ACE and TAO to a New OS Platform</a>
-  </li><li><a href="#Non-static%20Object%20Manager">Non-static ACE_Object_Manager</a>
+  </li><li><a href="#NonStaticObjectManager">Non-static ACE_Object_Manager</a>
   </li><li><a href="#cloning">Cloning the Source Tree</a>
   </li><li><a href="#mvs">Additional Build Tips for MVS</a>
   </li><li><a href="#flags">Makefile Flags</a>
   </li><li><a href="http://www.cs.wustl.edu/%7Elevine/CVS.html">Version Control</a>
-  </li><li><a href="http://www.cs.wustl.edu/%7Ecleeland/ace/makefile-hints.html">ACE Makefile hints</a>
-  </li><li><a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/docs/ACE-SSL.html">ACE SSL effort</a>
+  </li><li><a href="docs/ACE-SSL.html">ACE SSL effort</a>
 </li></ul>
 
 <p></p><hr align="left" width="50%"><p>
-</p><h4><a name="Non-static Object Manager">Non-static
+</p><h4><a name="NonStaticObjectManager">Non-static
 ACE_Object_Manager</a></h4> The ACE_Object_Manager can be instantiated
 as a static object, can be instantiated on the stack of the main
 program thread, or can be explicitly instantiated and destroyed by the
 application with <code>ACE::init ()</code> and <code>ACE::fini
-()</code>.  The comments in the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/Object_Manager.h">header
-file, <code>ace/Object_Manager.h</code></a>, as well as Section 1.6.3 in
+()</code>.  The comments in the header file,
+<a href="ace/Object_Manager.h"><code>ace/Object_Manager.h</code></a>, as well as Section 1.6.3 in
 <a href="http://www.riverace.com/docs">The ACE Programmer's Guide</a>
 provide more detail.<p>
 
@@ -2603,8 +2754,8 @@ Special requirements are imposed on applications if the
 ACE_Object_Manager is instantiated, by ACE, on the stack of the main
 thread.  This behavior is selected by defining
 <code>ACE_HAS_NONSTATIC_OBJECT_MANAGER</code> in
-<code>ace/config.h</code>.  Again, see the ACE Object_Manager <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/Object_Manager.h">header file,
-<code>ace/Object_Manager.h</code></a> for more information.  One of
+<code>ace/config.h</code>.  Again, see the ACE Object_Manager header file,
+<a href="ace/Object_Manager.h"><code>ace/Object_Manager.h</code></a> for more information.  One of
 these requirements is discussed here, because it is so important.
 Please note that <code>ACE_HAS_NONSTATIC_OBJECT_MANAGER</code> is
 defined in the distributed ACE <code>config.h</code> headers for
@@ -2639,7 +2790,7 @@ entry point something other than <code>main</code>, you'll need to
 construct and destroy the ACE_Object_Manager.  The best way to do that
 is to call <code>ACE::init ()</code> and <code>ACE::fini ()</code>.
 Or, see the <code>#define</code> of <code>main (int, char *[])</code>
-in <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/ace/OS.h"><code>ace/OS.h</code></a> to see how ACE does
+in <a href="ace/OS_main.h"><code>ace/OS_main.h</code></a> to see how ACE does
 that for entry points named <code>main</code>.
 
 </p><p></p><hr align="left" width="50%"><p>
@@ -2647,37 +2798,25 @@ that for entry points named <code>main</code>.
 
 On UNIX platforms, we typically like to support multiple platform
 builds using the same ACE source tree.  This idiom is supported by ACE
-using the $ACE_ROOT/bin/create_ace_build script or
-$ACE_ROOT/bin/clone.cpp program.
-
-To use build and use the clone program, first make sure there's a file
-called <code>platform_macros.GNU</code> that contains the correct platform-specific
-Makefile configurations in the <code>$ACE_ROOT/include/makeinclude/</code>
-directory, as well as making sure there's a $ACE_ROOT/ace/config.h
-file that includes the desired platform/compiler specific
-configuration header.  Then perform the following steps:<p>
-
-</p><pre>% cd $ACE_ROOT/bin
-% make
-% mv clone ~/bin
-% rehash
-</pre><p>
-
-Then create a ./build subdirectory someplace, e.g., under $ACE_ROOT.
-Once this is done, then invoke the top-level Makefile with the
-"clone" target, e.g.:</p><p>
-
-</p><pre>% cd $ACE_ROOT
-% mkdir build-SunOS5
-% cd build-SunOS5
-% make -f ../Makefile clone
+using the $ACE_ROOT/bin/create_ace_build.pl script.
+
+To clone the source tree, create ./build and ./build/{your build name}
+subdirectories under the ACE_wrappers directory.
+Then invoke the create_ace_build.pl script to clone the source tree using
+soft links from your build directory back to the actual sources.
+Here is an example:</p><p>
+
+</p><pre>% cd ACE_wrappers
+% mkdir build build/build-SunOS5
+% perl bin/create_ace_build.pl -a -v build-SunOS5
+% cd build/build-SunOS5
 % setenv ACE_ROOT $cwd
 % make
 </pre><p>
 
 This will establish a complete tree of links.  In addition, make sure
 you set your <code>LD_LIBRARY_PATH</code> to
-<code>$ACE_ROOT/ace:$ACE_ROOT/lib:$LD_LIBRARY_PATH</code> on SVR4 UNIX
+<code>$ACE_ROOT/lib:$LD_LIBRARY_PATH</code> on SVR4 UNIX
 platforms.</p><p>
 
 When you do a make in the $ACE_ROOT directory you will be producing
@@ -2685,26 +2824,8 @@ object code that is not stored in the same place as the original
 source tree.  This way, you can easily build another platform in a
 parallel tree structure.</p><p>
 
-<b> VERY IMPORTANT! </b></p><p>
-
-If you use the "clone trick" discussed above, make sure that the
-symbolic links are correctly in place before starting the build.  In
-particular, if you plan to clone the tree, it is preferable to do so
-before you start a build procedure on the original tree.  This is
-because the build procedure create object directories (.obj and
-.shobj) and the cloning procedure will clone these directories also.
-You would end up with links pointing to object files of another
-platform.  If you clone the tree after you've done a build on the
-original tree, make sure to remove all ".obj", ".shobj" and (any other
-files or directories) in all subdirectories before starting the build
-on your cloned tree.</p><p>
-
-Alternatively, the perl script
-<code>ACE_wrappers/bin/create_ace_build</code> can be used to create
-build trees.  It creates them below <code>ACE_wrappers/build</code>.
-It filters out all but the necessary files, so the warning above does
-not apply.  See the comments at the top of the script itself for usage
-information.
+See the comments at the top of the create_ace_build.pl script for
+further usage information.
 
 </p><p></p><hr align="left" width="50%"><p>
 </p><h4><a name="mvs">Additional Build Tips for MVS</a></h4>
@@ -2760,7 +2881,7 @@ faster even on single-CPU UNIX machines with <code>make -j
 
 ACE further supports the following flags.  They can be enabled either
 on the command line, e.g., "make purify=1", or added to your
-<code>platform_macros.GNU</code>.  To disable the option, 
+<code>platform_macros.GNU</code>.  To disable the option,
 set the flag to null,
 e.g., "make debug=".  Some flags support setting to 0 disable, e.g.,
 "make debug=0".  debug=1 is enabled in the platform files that are
@@ -2819,7 +2940,6 @@ xt_reactor       Build the XtReactor.
 fl_reactor       Build the FlReactor.
 tk_reactor       Build the TkReactor.
 qt_reactor       Build the QtReactor.
-gtk_reactor      Build the GtkReactor.
 ssl              Build with OpenSSL support.
 rapi             Build with RAPI
 split            Build the library by first splitting up the ACE source
@@ -2845,26 +2965,26 @@ show_uninit        Lists all uninitialized in object files built for
 
 </p><hr><p>
 </p><h3><a name="power">Building from anonymous CVS</a></h3>
-If users are building from our <a href="http://cvs.doc.wustl.edu/anoncvs.html"> anon cvs </a> the
+If users are building from our <a href="http://cvs.doc.wustl.edu/anoncvs.html">anon cvs</a> the
 GNUmakefiles, and project files for building on various platforms will
 not be available. Users from anon cvs are expected to generate them
-using <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/MPC/README">MPC </a> before building ACE, TAO or
+using <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/MPC/README">MPC</a> before building ACE, TAO or
 CIAO. We point out some suggestions below to get bootstrapped
 quickly.
 
 <ul>
-  <li> Please see <a href="#MPC"> instructions </a> above to  download
+  <li> Please see <a href="#MPC"> instructions</a> above to  download
   MPC from anon cvs repository <p>
   </p></li><li>Please make sure that you have <a href="http://www.perl.org/">
   perl</a> installed, preferably perl
   5.8 or higher. Users on Win32 based platforms are recommended to use
   <a href="http://www.activestate.com/Products/ActivePerl/"> Active
-  State Perl </a>. We use active state perl without problems. We have
+  State Perl</a>. We use active state perl without problems. We have
   ran into problems trying to use the cygwin version of perl on Win32
   based platforms. <p>
   </p></li><li>If you just want to build ACE and associated tests, examples,
   and associated utility libraries, we recommend that you do <p>
-  <code> $ACE_ROOT/bin/mwc.pl ACE.mwc </code> </p><p>
+  <code> $ACE_ROOT/bin/mwc.pl ACE.mwc</code> </p><p>
 
   from <code> $ACE_ROOT </code> to generate GNUmakefiles. Please use
 
@@ -2874,7 +2994,8 @@ quickly.
   vc71</code> to generate VC71 project and solution files.
 
   </p></li><li>If you want to build TAO+CIAO and its associated libraries
-  please see <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/TAO-INSTALL.html"> TAO-INSTALL </a><a> and </a><a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/CIAO/CIAO-INSTALL.html"> CIAO-INSTALL </a> for details.
+  please see <a href="TAO/TAO-INSTALL.html">TAO-INSTALL</a><a> and
+  </a><a href="TAO/CIAO/CIAO-INSTALL.html">CIAO-INSTALL</a> for details.
 </li></ul>
 
 <hr><p>
@@ -2892,7 +3013,7 @@ from
 <EM><br> -->
 
 <!-- hhmts start -->
-Last modified: Wed Aug 25 11:18:59 PDT 2004
+Last modified: Tue Feb  8 08:04:28 CST 2005
 <!-- hhmts end -->
 
 
diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog
index d1685d6b5a1..e60c9f4b2db 100644
--- a/ACEXML/ChangeLog
+++ b/ACEXML/ChangeLog
@@ -1,3 +1,21 @@
+Sun Feb 13 23:54:25 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	From Lothar Werzinger <lothar at xcerla dot com>
+	* apps/svcconf/Svcconf_Handler.cpp:
+
+	  Enhanced error messages.
+
+Wed Jan  5 14:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * common/DefaultHandler.{h,cpp,i}:
+        * common/NamespaceSupport.{h,cpp,i}:
+        * common/Transcode.{h,cpp,i}:
+        * examples/SAXPrint/Print_Handler.{cpp,i}:
+          Removed .i file and updated h/cpp file
+
+        * common/Makefile.am:
+          Updated
+
 Tue Aug 17 19:07:11 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* common/NamespaceSupport.cpp:
diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACEXML/apps/svcconf/Svcconf_Handler.cpp
index c10400743e0..f9105555580 100644
--- a/ACEXML/apps/svcconf/Svcconf_Handler.cpp
+++ b/ACEXML/apps/svcconf/Svcconf_Handler.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*-  $Id$
+// $Id$
 
 #include "Svcconf_Handler.h"
 #include "ace/ACE.h"
@@ -10,6 +10,7 @@
 #include "ace/ARGV.h"
 #include "ace/Module.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/SString.h"
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 0)
 
@@ -63,7 +64,14 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
 
       if (svc_dll.open (active_info->path ()) == -1)
         {
-          ACEXML_THROW (ACEXML_SAXException (ACE_TEXT("Cannot locate DLL\n")));
+          // build the error message
+          ACE_CString msg (ACE_TEXT ("Cannot locate DLL: '"));
+          msg += ACE_CString (ACE_TEXT (active_info->path ()));
+          msg += ACE_CString (ACE_TEXT ("' for entity '"));
+          msg += ACE_CString (ACE_TEXT (active_info->name ()));
+          msg += ACE_CString (ACE_TEXT ("'\n"));
+
+          ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
         }
 
       void *(*func) (ACE_Service_Object_Exterminator *) = 0;
@@ -71,13 +79,19 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
       void *symbol = 0;
 
       long temp_ptr =
-        ACE_reinterpret_cast(long, svc_dll.symbol (active_info->init_func ()));
-      func = ACE_reinterpret_cast(void *(*)(ACE_Service_Object_Exterminator *),
-                                  temp_ptr);
+        reinterpret_cast<long> (svc_dll.symbol (active_info->init_func ()));
+      func = reinterpret_cast<void *(*)(ACE_Service_Object_Exterminator *)> (temp_ptr);
 
       if (func == 0)
         {
-          ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Cannot locate init function\n")));
+          // build the error message
+          ACE_CString msg (ACE_TEXT ("Cannot locate init function: '"));
+          msg += ACE_CString (ACE_TEXT (active_info->init_func ()));
+          msg += ACE_CString (ACE_TEXT ("' for entity '"));
+          msg += ACE_CString (ACE_TEXT (active_info->name ()));
+          msg += ACE_CString (ACE_TEXT ("'\n"));
+
+          ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
         }
       symbol = (*func)(&gobbler); // target object created in the loaded DLL.
 
@@ -99,7 +113,13 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
             }
           else
             {
-              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Expecting Stream type in stream header\n")));
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Expecting Stream type in stream header"));
+              msg += ACE_CString (ACE_TEXT (" for entity '"));
+              msg += ACE_CString (ACE_TEXT (active_info->name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
             }
 
           this->stream_svc_type_ =
@@ -131,7 +151,13 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
               if (mt->init (args.argc (), args.argv ()) == -1
                   || this->stream_->push (mt) == -1)
                 {
-                  ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Error initializing module")));
+                  // build the error message
+                  ACE_CString msg (ACE_TEXT ("Error initializing module"));
+                  msg += ACE_CString (ACE_TEXT (" for entity '"));
+                  msg += ACE_CString (ACE_TEXT (active_info->name ()));
+                  msg += ACE_CString (ACE_TEXT ("'\n"));
+
+                  ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
                 }
 
 
@@ -153,7 +179,13 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
               if (ACE_Service_Config::initialize (stype,
                                                   active_info->init_params ()) == -1)
                 {
-                  ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Failed to initialize dynamic service\n")));
+                  // build the error message
+                  ACE_CString msg (ACE_TEXT ("Failed to initialize dynamic service"));
+                  msg += ACE_CString (ACE_TEXT (" for entity '"));
+                  msg += ACE_CString (ACE_TEXT (active_info->name ()));
+                  msg += ACE_CString (ACE_TEXT ("'\n"));
+
+                  ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
                 }
             }
           this->parsed_info_.reset ();
@@ -183,7 +215,13 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
               if (ACE_Service_Config::initialize (this->parsed_info_.name (),
                                                   this->parsed_info_.init_params ()) == -1)
                 {
-                  ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Failed to initialize static service\n")));
+                  // build the error message
+                  ACE_CString msg (ACE_TEXT ("Failed to initialize static service"));
+                  msg += ACE_CString (ACE_TEXT (" for entity '"));
+                  msg += ACE_CString (ACE_TEXT (this->parsed_info_.name ()));
+                  msg += ACE_CString (ACE_TEXT ("'\n"));
+
+                  ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
                 }
             }
           this->parsed_info_.reset ();
@@ -289,13 +327,16 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
           (this->stream_info_.name (),
            (const ACE_Service_Type **) &this->stream_svc_type_) == -1)
         {
-          ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Cannot find stream\n")));
+          // build the error message
+          ACE_CString msg (ACE_TEXT ("Cannot find stream '"));
+          msg += ACE_CString (ACE_TEXT (this->stream_info_.name ()));
+          msg += ACE_CString (ACE_TEXT ("'\n"));
+
+          ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
         }
       this->stream_ =   this->stream_svc_type_ == 0
         ? 0
-        : ACE_dynamic_cast (ACE_Stream_Type *,
-                            ACE_const_cast (ACE_Service_Type_Impl *,
-                                            this->stream_svc_type_->type ()));
+        : dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (this->stream_svc_type_->type ()));
 
 //       ACE_DEBUG ((LM_INFO, ACE_TEXT ("Retrieve stream %s from repository\n"),
 //                   this->stream_info_.name ()));
@@ -324,7 +365,12 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 
           if (mt == 0)
             {
-              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Can't locate module\n")));
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Can't locate module '"));
+              msg += ACE_CString (ACE_TEXT (this->parsed_info_.name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
             }
 
           mt->resume ();
@@ -335,7 +381,13 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 //                       this->parsed_info_.name ()));
           if (ACE_Service_Config::resume (this->parsed_info_.name ()) == -1)
             {
-              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Resume fail\n")));
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Resume failed"));
+              msg += ACE_CString (ACE_TEXT (" for entity '"));
+              msg += ACE_CString (ACE_TEXT (this->parsed_info_.name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
             }
         }
       this->parsed_info_.reset ();
@@ -354,7 +406,12 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 
           if (mt == 0)
             {
-              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Can't locate module\n")));
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Can't locate module '"));
+              msg += ACE_CString (ACE_TEXT (this->parsed_info_.name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
             }
 
           mt->suspend ();
@@ -365,7 +422,13 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
           //                      this->parsed_info_.name ()));
           if (ACE_Service_Config::suspend (this->parsed_info_.name ()) == -1)
             {
-              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Suspend failed\n")));
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Suspend failed"));
+              msg += ACE_CString (ACE_TEXT (" for entity '"));
+              msg += ACE_CString (ACE_TEXT (this->parsed_info_.name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
             }
         }
       this->parsed_info_.reset ();
@@ -384,7 +447,12 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 
           if (mt == 0)
             {
-              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Can't locate module\n")));
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Can't locate module '"));
+              msg += ACE_CString (ACE_TEXT (this->parsed_info_.name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
             }
 
           this->stream_->remove (mt);
@@ -395,7 +463,13 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 //                       this->parsed_info_.name ()));
           if (ACE_Service_Config::remove (this->parsed_info_.name ()) == -1)
             {
-              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Remove failed\n")));
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Remove failed"));
+              msg += ACE_CString (ACE_TEXT (" for entity '"));
+              msg += ACE_CString (ACE_TEXT (this->parsed_info_.name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
             }
         }
       this->parsed_info_.reset ();
@@ -500,8 +574,15 @@ ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_D
           }
         else
           {
-            ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid stream attribute\n")),
-													  -1);
+            // build the error message
+            ACE_CString msg (ACE_TEXT ("Invalid stream attribute '"));
+            msg += ACE_CString (ACE_TEXT (alist->getQName (i)));
+            msg += ACE_CString (ACE_TEXT ("' for entity '"));
+            msg += ACE_CString (ACE_TEXT (this->stream_info_.name ()));
+            msg += ACE_CString (ACE_TEXT ("'\n"));
+
+            ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()),
+                                                                                                          -1);
           }
       }
   return 0;
@@ -519,7 +600,16 @@ ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL)
           }
         else
           {
-            ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid attribute, expecting 'id'\n")), -1);
+            // build the error message
+            ACE_CString msg (ACE_TEXT ("Invalid attribute '"));
+            msg += ACE_CString (ACE_TEXT (alist->getQName (i)));
+            msg += ACE_CString (ACE_TEXT ("', expecting 'id'"));
+            msg += ACE_CString (ACE_TEXT (" for entity '"));
+            msg += ACE_CString (ACE_TEXT (this->parsed_info_.name ()));
+            msg += ACE_CString (ACE_TEXT ("'\n"));
+
+            ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()),
+                            -1);
           }
       }
   return 0;
@@ -551,7 +641,16 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_A
                 }
               else
                 {
-                  ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid attribute value, expecting 'active' or 'inactive'\n")), -1);
+                  // build the error message
+                  ACE_CString msg (ACE_TEXT ("Invalid attribute value '"));
+                  msg += ACE_CString (ACE_TEXT (alist->getQName (i)));
+                  msg += ACE_CString (ACE_TEXT ("', expecting 'active' or 'inactive'"));
+                  msg += ACE_CString (ACE_TEXT (" for entity '"));
+                  msg += ACE_CString (ACE_TEXT (info->name ()));
+                  msg += ACE_CString (ACE_TEXT ("'\n"));
+
+                  ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()),
+                                  -1);
                 }
             }
           else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0)
@@ -570,12 +669,27 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_A
                 }
               else
                 {
-                  ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid Service_Object attribute value\n")), -1);
+                  // build the error message
+                  ACE_CString msg (ACE_TEXT ("Invalid Service_Object attribute value'"));
+                  msg += ACE_CString (ACE_TEXT (alist->getQName (i)));
+                  msg += ACE_CString (ACE_TEXT ("' for entity '"));
+                  msg += ACE_CString (ACE_TEXT (info->name ()));
+                  msg += ACE_CString (ACE_TEXT ("'\n"));
+
+                  ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()),
+                                  -1);
                 }
             }
           else
             {
-              ACEXML_THROW_RETURN(ACEXML_SAXException(ACE_TEXT ("Invalid attribute\n")), -1);
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Invalid attribute'"));
+              msg += ACE_CString (ACE_TEXT (alist->getQName (i)));
+              msg += ACE_CString (ACE_TEXT ("' for entity '"));
+              msg += ACE_CString (ACE_TEXT (info->name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()), -1);
             }
         }
     }
@@ -606,7 +720,14 @@ ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist ACEXML_E
             }
           else
             {
-              ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid initializer attribute.\n")), -1);
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Invalid initializer attribute'"));
+              msg += ACE_CString (ACE_TEXT (alist->getQName (i)));
+              msg += ACE_CString (ACE_TEXT ("' for entity '"));
+              msg += ACE_CString (ACE_TEXT (info->name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()), -1);
             }
         }
     }
@@ -633,7 +754,14 @@ ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_AR
             }
           else
             {
-              ACEXML_THROW_RETURN (ACEXML_SAXException (ACE_TEXT ("Invalid static attribute.\n")), -1);
+              // build the error message
+              ACE_CString msg (ACE_TEXT ("Invalid static attribute '"));
+              msg += ACE_CString (ACE_TEXT (alist->getQName (i)));
+              msg += ACE_CString (ACE_TEXT ("' for entity '"));
+              msg += ACE_CString (ACE_TEXT (info->name ()));
+              msg += ACE_CString (ACE_TEXT ("'\n"));
+
+              ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()), -1);
             }
         }
     }
diff --git a/ACEXML/apps/svcconf/svcconf.mpc b/ACEXML/apps/svcconf/svcconf.mpc
index 62af58ffbe7..9b9f84b5413 100644
--- a/ACEXML/apps/svcconf/svcconf.mpc
+++ b/ACEXML/apps/svcconf/svcconf.mpc
@@ -1,6 +1,6 @@
 //  -*- MPC -*-
 // $Id$
 
-project(ACEXML_XML_Svc_Conf_Parser): acelib, acexml {
+project(ACEXML_XML_Svc_Conf_Parser): acelib, acexml, core {
   sharedname = ACEXML_XML_Svc_Conf_Parser
 }
diff --git a/ACEXML/common/AttributesImpl.cpp b/ACEXML/common/AttributesImpl.cpp
index 6866c31e268..b0bcd32515d 100644
--- a/ACEXML/common/AttributesImpl.cpp
+++ b/ACEXML/common/AttributesImpl.cpp
@@ -42,7 +42,7 @@ ACEXML_AttributesImpl::addAttribute (const ACEXML_Char *uri,
                       qName,
                       type,
                       value);
-  return ACE_static_cast (int, length);
+  return static_cast<int> (length);
 }
 
 int
@@ -53,7 +53,7 @@ ACEXML_AttributesImpl::addAttribute (const ACEXML_Attribute &att)
   size_t length = this->attrs_.size ();
   this->attrs_.size (length+1);
   this->attrs_[length] = att;
-  return ACE_static_cast (int, length);
+  return static_cast<int> (length);
 }
 
 int
@@ -97,7 +97,7 @@ ACEXML_AttributesImpl::getIndex (const ACEXML_Char *qName)
 {
   for (size_t i = 0; i < this->attrs_.size (); i++)
     if (ACE_OS::strcmp (qName, this->attrs_[i].qName ()) == 0)
-      return ACE_static_cast (int, i);
+      return static_cast<int> (i);
 
   return -1;
 }
@@ -109,7 +109,7 @@ ACEXML_AttributesImpl::getIndex (const ACEXML_Char *uri,
   for (size_t i = 0; i < this->attrs_.size (); i++)
     if (ACE_OS::strcmp (uri, this->attrs_[i].uri ()) == 0 &&
         ACE_OS::strcmp (localPart, this->attrs_[i].localName ()) == 0)
-      return ACE_static_cast (int, i);
+      return static_cast<int> (i);
 
   return -1;
 }
diff --git a/ACEXML/common/AttributesImpl.h b/ACEXML/common/AttributesImpl.h
index 3531f96b119..85c48ed1c2e 100644
--- a/ACEXML/common/AttributesImpl.h
+++ b/ACEXML/common/AttributesImpl.h
@@ -102,10 +102,9 @@ public:
   bool operator!= (const ACEXML_Attribute&rhs) const;
 
 private:
-  /// @var uri_ Namespace URI of an attribute
+  /// Namespace URI of an attribute
   ACEXML_Char *uri_;
 
-  /// @var localName_
   ACEXML_Char *localName_;
   ACEXML_Char *qName_;
   ACEXML_Char *type_;
diff --git a/ACEXML/common/DefaultHandler.cpp b/ACEXML/common/DefaultHandler.cpp
index 60d2d783366..25e2f4dcf9d 100644
--- a/ACEXML/common/DefaultHandler.cpp
+++ b/ACEXML/common/DefaultHandler.cpp
@@ -1,9 +1,6 @@
 // -*- C++ -*-  $Id$
 
 #include "ACEXML/common/DefaultHandler.h"
-#if !defined (__ACEXML_INLINE__)
-# include "ACEXML/common/DefaultHandler.i"
-#endif /* __ACEXML_INLINE__ */
 
 ACEXML_DefaultHandler::ACEXML_DefaultHandler (void)
 {
diff --git a/ACEXML/common/DefaultHandler.h b/ACEXML/common/DefaultHandler.h
index 1ef6283d15e..149254c18e6 100644
--- a/ACEXML/common/DefaultHandler.h
+++ b/ACEXML/common/DefaultHandler.h
@@ -186,10 +186,6 @@ public:
         ACE_THROW_SPEC ((ACEXML_SAXException)) ;
 };
 
-#if defined (__ACEXML_INLINE__)
-# include "ACEXML/common/DefaultHandler.i"
-#endif /* __ACEXML_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ACEXML_DEFAULTHANDLER_H */
diff --git a/ACEXML/common/DefaultHandler.i b/ACEXML/common/DefaultHandler.i
deleted file mode 100644
index 77b4466a3cb..00000000000
--- a/ACEXML/common/DefaultHandler.i
+++ /dev/null
@@ -1 +0,0 @@
-// -*- C++ -*-  $Id$
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp
index 59de1436b63..2e3fc8abc5c 100644
--- a/ACEXML/common/FileCharStream.cpp
+++ b/ACEXML/common/FileCharStream.cpp
@@ -141,8 +141,7 @@ ACEXML_FileCharStream::read (ACEXML_Char *str,
   if (this->infile_ == 0)
     return -1;
 
-  return ACE_static_cast (int,
-          ACE_OS::fread (str, sizeof (ACEXML_Char), len, this->infile_));
+  return static_cast<int> (ACE_OS::fread (str, sizeof (ACEXML_Char), len, this->infile_));
 }
 
 int
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp
index 004bbb6fcfe..42015f16213 100644
--- a/ACEXML/common/HttpCharStream.cpp
+++ b/ACEXML/common/HttpCharStream.cpp
@@ -79,7 +79,7 @@ ACEXML_HttpCharStream::open (const ACEXML_Char *url)
                        "Refer HTTP/1.0 error code for details"), -1);
   }
 
-  this->size_ = ACE_static_cast (off_t, len);
+  this->size_ = static_cast<off_t> (len);
   return this->determine_encoding();
 }
 
@@ -123,8 +123,7 @@ ACEXML_HttpCharStream::get_url (size_t& len)
   size_t buflen = BUFSIZ;
   for (;;)
     {
-      if ((buf = ACE_const_cast (char*,
-                                 this->stream_->recv (buflen))) == 0)
+      if ((buf = const_cast<char*> (this->stream_->recv (buflen))) == 0)
         if (buflen <= 0)
           break;
 
@@ -230,8 +229,7 @@ ACEXML_HttpCharStream::get_url (size_t& len)
 
   // Get all of the data. Since this is backed by file store, we won't lose
   // any of the data.
-  while (( buf = ACE_const_cast (char*,
-                                 this->stream_->recv (buflen))) != 0)
+  while (( buf = const_cast<char*> (this->stream_->recv (buflen))) != 0)
     ;
 
   // Length of data in the URL.
@@ -287,7 +285,7 @@ ACEXML_HttpCharStream::available (void)
 {
   if (this->stream_ == 0)
     return -1;
-  return ACE_static_cast (int, this->stream_->available());
+  return static_cast<int> (this->stream_->available());
 }
 
 int
@@ -322,7 +320,7 @@ ACEXML_HttpCharStream::determine_encoding (void)
 
   char input[4] = {0, 0, 0, 0};
   int i = 0;
-  for (; i < 4 && input[i] != -1; ++i)
+  for (; i < 4 && input[i] != (char)-1; ++i)
     input[i] = this->stream_->peek_char(i);
   if (i < 4)
     return -1;
@@ -383,11 +381,11 @@ ACEXML_HttpCharStream::read (ACEXML_Char *str,
   if (this->stream_ == 0)
     return -1;
   len = len * sizeof (ACEXML_Char);
-  char* temp = ACE_const_cast (char*, this->stream_->recv (len));
+  char* temp = const_cast<char*> (this->stream_->recv (len));
   str = ACE_TEXT_CHAR_TO_TCHAR (temp);
   if (str == 0)
     return -1;
-  return ACE_static_cast (int, len);
+  return static_cast<int> (len);
 }
 
 
diff --git a/ACEXML/common/InputSource.h b/ACEXML/common/InputSource.h
index 2049d188386..ae2b70b130e 100644
--- a/ACEXML/common/InputSource.h
+++ b/ACEXML/common/InputSource.h
@@ -64,7 +64,7 @@ public:
    * Notice that ACEXML_InputSource assumes the ownership
    * of <stream>
    */
-  ACE_EXPLICIT ACEXML_InputSource (ACEXML_CharStream *stream);
+  explicit ACEXML_InputSource (ACEXML_CharStream *stream);
 
   /**
    * Create a new input source with a system identifier.
diff --git a/ACEXML/common/Mem_Map_Stream.cpp b/ACEXML/common/Mem_Map_Stream.cpp
index 3b1705bafa0..c66d01f563d 100644
--- a/ACEXML/common/Mem_Map_Stream.cpp
+++ b/ACEXML/common/Mem_Map_Stream.cpp
@@ -42,7 +42,7 @@ ACEXML_Mem_Map_Stream::get_char (void)
 void
 ACEXML_Mem_Map_Stream::rewind (void)
 {
-  this->recv_pos_ = ACE_reinterpret_cast (char *, this->mem_map_.addr ());
+  this->recv_pos_ = reinterpret_cast<char *> (this->mem_map_.addr ());
   this->get_pos_ = this->recv_pos_;
   this->end_of_mapping_plus1_ = this->recv_pos_ + this->mem_map_.size ();
 }
@@ -73,7 +73,7 @@ ACEXML_Mem_Map_Stream::recv (size_t &len)
       return 0;
     }
   const char *s = this->recv_pos_;
-  this->seek (ACE_static_cast (off_t, len), SEEK_CUR);
+  this->seek (static_cast<off_t> (len), SEEK_CUR);
   len = this->get_pos_ - s;
   return s;
 }
@@ -103,8 +103,7 @@ ACEXML_Mem_Map_Stream::seek (off_t offset, int whence)
     {
     case SEEK_SET:
       this->get_pos_ =
-        ACE_reinterpret_cast (char *,
-                              this->mem_map_.addr ())
+        reinterpret_cast<char *> (this->mem_map_.addr ())
         + offset;
       break;
 
@@ -126,8 +125,7 @@ ACEXML_Mem_Map_Stream::seek (off_t offset, int whence)
       this->get_pos_ = this->end_of_mapping_plus1_;
 
   this->recv_pos_ = this->get_pos_;
-  return this->recv_pos_ - ACE_reinterpret_cast (char *,
-                                                 this->mem_map_.addr ());
+  return this->recv_pos_ - reinterpret_cast<char *> (this->mem_map_.addr ());
 }
 
 Svc_Handler *
@@ -246,13 +244,12 @@ ACEXML_Mem_Map_Stream::grow_file_and_remap (void)
   // MAP_FAILED is used as a "first time in" flag.
   if (this->recv_pos_ == MAP_FAILED)
     {
-      this->recv_pos_ = ACE_reinterpret_cast (char *, this->mem_map_.addr ());
+      this->recv_pos_ = reinterpret_cast<char *> (this->mem_map_.addr ());
       this->get_pos_ = this->recv_pos_;
     }
 
   this->end_of_mapping_plus1_ =
-    ACE_reinterpret_cast (char *,
-                          this->mem_map_.addr ())
+    reinterpret_cast<char *> (this->mem_map_.addr ())
     + this->mem_map_.size ();
 
   return 0;
diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp
index 5e049ca9cd4..cae3a02474f 100644
--- a/ACEXML/common/NamespaceSupport.cpp
+++ b/ACEXML/common/NamespaceSupport.cpp
@@ -3,10 +3,6 @@
 #include "ACEXML/common/NamespaceSupport.h"
 #include "ace/OS_NS_string.h"
 
-#if !defined (__ACEXML_INLINE__)
-# include "ACEXML/common/NamespaceSupport.i"
-#endif /* __ACEXML_INLINE__ */
-
 static const ACEXML_Char ACEXML_XMLNS_PREFIX_name[] = ACE_TEXT ("xmlns");
 
 const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS_PREFIX = ACEXML_XMLNS_PREFIX_name;
@@ -94,8 +90,7 @@ ACEXML_NamespaceSupport::declarePrefix (const ACEXML_Char *prefix,
   ACEXML_String ns_prefix (prefix, 0, 0);
   ACEXML_String ns_uri (uri, 0, 0);
 
-  return this->effective_context_->bind (ns_prefix,
-                                         ns_uri);
+  return this->effective_context_->rebind (ns_prefix, ns_uri);
 }
 
 int
@@ -124,8 +119,7 @@ ACEXML_NamespaceSupport::getPrefix (const ACEXML_Char *uri) const
   for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_);
        iter.next (entry) != 0;
        iter.advance ())
-    if (entry->int_id_ == ACEXML_String (uri, 0, 0) &&
-        entry->ext_id_ != ACEXML_String (ACEXML_DEFAULT_NS_PREFIX, 0, 0))
+    if (entry->int_id_ == ACEXML_String (uri, 0, 0))
       return entry->ext_id_.c_str ();
 
   return 0;                     // Nothing found.
@@ -141,11 +135,7 @@ ACEXML_NamespaceSupport::getPrefixes (ACEXML_STR_LIST &prefixes) const
   for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_);
        iter.next (entry) != 0;
        iter.advance ())
-    if (entry->ext_id_ != ACEXML_String(ACEXML_DEFAULT_NS_PREFIX, 0, 0))
-      prefixes.enqueue_tail (entry->ext_id_.c_str ());
-    else
-      continue;
-
+    prefixes.enqueue_tail (entry->ext_id_.c_str ());
   return 0;
 }
 
@@ -221,7 +211,7 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
                                       const ACEXML_Char *&name,
                                       int is_attribute) const
 {
-  int qlen = ACE_static_cast (int, ACE_OS::strlen (qName));
+  int qlen = static_cast<int> (ACE_OS::strlen (qName));
   int len = -1;
   for (int i = 0; i < qlen; ++i)
     if (qName [i] == ':')
@@ -246,16 +236,8 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
 
   ACEXML_NS_CONTEXT_ENTRY *entry;
 
-  if (prefix != ACEXML_DEFAULT_NS_PREFIX)
-    {
-      if (this->effective_context_->find (prefix, entry) == 0)
-        uri = entry->int_id_.c_str ();
-      else
-        {
-          uri = ACEXML_DEFAULT_NS_PREFIX;
-          return -1;
-        }
-    }
+  if (this->effective_context_->find (prefix, entry) == 0)
+    uri = entry->int_id_.c_str ();
   else
     {
       uri = ACEXML_DEFAULT_NS_PREFIX;
diff --git a/ACEXML/common/NamespaceSupport.h b/ACEXML/common/NamespaceSupport.h
index 3b906c37c44..4299b57ddcf 100644
--- a/ACEXML/common/NamespaceSupport.h
+++ b/ACEXML/common/NamespaceSupport.h
@@ -236,11 +236,6 @@ private:
   ACEXML_NS_CONTEXT *effective_context_;
 };
 
-
-#if defined (__ACEXML_INLINE__)
-# include "ACEXML/common/NamespaceSupport.i"
-#endif /* __ACEXML_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ACEXML_NAMESPACESUPPORT_H */
diff --git a/ACEXML/common/NamespaceSupport.i b/ACEXML/common/NamespaceSupport.i
deleted file mode 100644
index 3557677a1fc..00000000000
--- a/ACEXML/common/NamespaceSupport.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-  $Id$
-
diff --git a/ACEXML/common/SAXExceptions.cpp b/ACEXML/common/SAXExceptions.cpp
index 9a503798816..0e1cbd2a827 100644
--- a/ACEXML/common/SAXExceptions.cpp
+++ b/ACEXML/common/SAXExceptions.cpp
@@ -51,7 +51,7 @@ ACEXML_SAXException*
 ACEXML_SAXException::_downcast (ACEXML_Exception* ex)
 {
   if (ex->is_a (ACE_TEXT ("ACEXML_SAXException")))
-    return ACE_dynamic_cast (ACEXML_SAXException*, ex);
+    return dynamic_cast<ACEXML_SAXException*> (ex);
   return 0;
 }
 
@@ -106,7 +106,7 @@ ACEXML_SAXNotSupportedException*
 ACEXML_SAXNotSupportedException::_downcast (ACEXML_Exception* ex)
 {
   if (ex->is_a (ACE_TEXT ("ACEXML_SAXNotSupportedException")))
-    return ACE_dynamic_cast (ACEXML_SAXNotSupportedException*, ex);
+    return dynamic_cast<ACEXML_SAXNotSupportedException*> (ex);
   return 0;
 }
 
@@ -170,7 +170,7 @@ ACEXML_SAXNotRecognizedException*
 ACEXML_SAXNotRecognizedException::_downcast (ACEXML_Exception* ex)
 {
   if (ex->is_a (ACE_TEXT ("ACEXML_SAXNotRecognizedException")))
-    return ACE_dynamic_cast (ACEXML_SAXNotRecognizedException*, ex);
+    return dynamic_cast<ACEXML_SAXNotRecognizedException*> (ex);
   return 0;
 }
 
@@ -228,7 +228,7 @@ ACEXML_SAXParseException*
 ACEXML_SAXParseException::_downcast (ACEXML_Exception* ex)
 {
   if (ex->is_a (ACE_TEXT ("ACEXML_SAXParseException")))
-    return ACE_dynamic_cast (ACEXML_SAXParseException*, ex);
+    return dynamic_cast<ACEXML_SAXParseException*> (ex);
   return 0;
 }
 
diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp
index fe566e8bd0e..aec2f83d945 100644
--- a/ACEXML/common/StrCharStream.cpp
+++ b/ACEXML/common/StrCharStream.cpp
@@ -103,7 +103,7 @@ ACEXML_StrCharStream::read (ACEXML_Char *str, size_t len)
         len = this->end_ - this->ptr_;
       ACE_OS::strncpy (str, this->ptr_, len);
       this->ptr_ += len;
-      return ACE_static_cast (int, len);
+      return static_cast<int> (len);
     }
   return 0;
 }
diff --git a/ACEXML/common/StreamFactory.cpp b/ACEXML/common/StreamFactory.cpp
index 4d73b7de71a..7cee4c1a65f 100644
--- a/ACEXML/common/StreamFactory.cpp
+++ b/ACEXML/common/StreamFactory.cpp
@@ -6,9 +6,9 @@
 #include "ACEXML/common/FileCharStream.h"
 #include "ACEXML/common/HttpCharStream.h"
 
-#ifdef ACEXML_HAS_ZZIPLIB
+#ifdef USE_ZZIP
 #include "ACEXML/common/ZipCharStream.h"
-#endif /* ACEXML_HAS_ZZIPLIB */
+#endif /* USE_ZZIP */
 
 ACE_RCSID (common, StreamFactory, "$Id$")
 
@@ -37,7 +37,7 @@ ACEXML_StreamFactory::create_stream (const ACEXML_Char* uri)
       ACE_NEW_RETURN (fstream, ACEXML_FileCharStream, 0);
       if (fstream->open (uri) != -1)
         return fstream;
-#ifdef ACEXML_HAS_ZZIPLIB
+#ifdef USE_ZZIP
       else
         {
           ACEXML_ZipCharStream* zstream = 0;
@@ -45,7 +45,7 @@ ACEXML_StreamFactory::create_stream (const ACEXML_Char* uri)
           if (zstream->open (uri) != -1)
             return zstream;
         }
-#endif /* ACEXML_HAS_ZZIPLIB */
+#endif /* USE_ZZIP */
     }
   return 0;
 }
diff --git a/ACEXML/common/Transcode.cpp b/ACEXML/common/Transcode.cpp
index c91ec11a9de..e43a407d2e3 100644
--- a/ACEXML/common/Transcode.cpp
+++ b/ACEXML/common/Transcode.cpp
@@ -3,10 +3,6 @@
 #include "ACEXML/common/Transcode.h"
 #include "ace/OS_NS_string.h"
 
-#if !defined (__ACEXML_INLINE__)
-# include "ACEXML/common/Transcode.i"
-#endif /* __ACEXML_INLINE__ */
-
 int
 ACEXML_Transcoder::utf162utf8 (ACEXML_UTF16 src,
                                ACEXML_UTF8 *dst,
@@ -22,7 +18,7 @@ ACEXML_Transcoder::utf162utf8 (ACEXML_UTF16 src,
       if (len < 1)
         return ACEXML_DESTINATION_TOO_SHORT;
 
-      *dst = ACE_static_cast (ACEXML_UTF8, src);
+      *dst = static_cast<ACEXML_UTF8> (src);
       return 1;
     }
   else if (src < 0x800)
@@ -59,7 +55,7 @@ ACEXML_Transcoder::ucs42utf8 (ACEXML_UCS4 src,
   if (src < 0x10000)
     {
       int retv = ACEXML_Transcoder::utf162utf8
-                 (ACE_static_cast (ACEXML_UTF16, src),
+                 (static_cast<ACEXML_UTF16> (src),
                   dst, len);
       return (retv == ACEXML_IS_SURROGATE ? ACEXML_NON_UNICODE : retv);
     }
@@ -97,7 +93,7 @@ ACEXML_Transcoder::ucs42utf16 (ACEXML_UCS4 src,
       if (src >= 0xD800 && src < 0xE000)
         return ACEXML_NON_UNICODE;     // Surrogates are not valid unicode value
 
-      *dst = ACE_static_cast (ACEXML_UTF16, src);
+      *dst = static_cast<ACEXML_UTF16> (src);
       return 1;
     }
   else if (src >= 0x100000 && src < 0x110000)
@@ -155,15 +151,14 @@ ACEXML_Transcoder::utf82ucs4 (const ACEXML_UTF8 *the_src,
   if (the_src == 0)
     return ACEXML_INVALID_ARGS;
 
-  const unsigned char *src = ACE_reinterpret_cast (const unsigned char *,
-                                                   the_src);
+  const unsigned char *src = reinterpret_cast<const unsigned char *> (the_src);
 
   size_t forward = 1;
 
   if (forward > len)
     return ACEXML_END_OF_SOURCE;
 
-  if (ACE_static_cast (unsigned char, *src) < 0x80)
+  if (static_cast<unsigned char> (*src) < 0x80)
     dst = *src;
   else if ((*src & 0xE0) == 0xC0)
     {
@@ -274,7 +269,7 @@ ACEXML_Transcoder::utf8s2utf16s (const ACEXML_UTF8 *src,
       len -= forward;
     }
 
-  return ACE_static_cast (int, total_len);
+  return static_cast<int> (total_len);
 }
 
 int
@@ -313,5 +308,5 @@ ACEXML_Transcoder::utf16s2utf8s (const ACEXML_UTF16 *src,
       len -= forward;
     }
 
-  return ACE_static_cast (int, total_len);
+  return static_cast<int> (total_len);
 }
diff --git a/ACEXML/common/Transcode.h b/ACEXML/common/Transcode.h
index 0afaaa0e74c..1acf294c7aa 100644
--- a/ACEXML/common/Transcode.h
+++ b/ACEXML/common/Transcode.h
@@ -47,7 +47,7 @@ public:
     ACEXML_INVALID_ARGS = -3,
     ACEXML_IS_SURROGATE = -4,
     ACEXML_NON_UNICODE = -5
-  } STATUS;
+  } ACEXML_STATUS;
 
 
   // The following functions translate a unicode characters
@@ -167,10 +167,6 @@ public:
                            size_t len);
 };
 
-#if defined (__ACEXML_INLINE__)
-# include "ACEXML/common/Transcode.i"
-#endif /* __ACEXML_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* _ACEXML_TRANSCODE_H_ */
diff --git a/ACEXML/common/Transcode.i b/ACEXML/common/Transcode.i
deleted file mode 100644
index 77b4466a3cb..00000000000
--- a/ACEXML/common/Transcode.i
+++ /dev/null
@@ -1 +0,0 @@
-// -*- C++ -*-  $Id$
diff --git a/ACEXML/common/ZipCharStream.cpp b/ACEXML/common/ZipCharStream.cpp
index 3303451c1eb..bea182781ad 100644
--- a/ACEXML/common/ZipCharStream.cpp
+++ b/ACEXML/common/ZipCharStream.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#ifdef ACEXML_HAS_ZZIPLIB
+#ifdef USE_ZZIP
 
 #include "ACEXML/common/ZipCharStream.h"
 #include "ace/ACE.h"
@@ -252,4 +252,4 @@ ACEXML_ZipCharStream::peek_i (void)
 static int shut_up_aCC = 0;
 #endif /* __HP_aCC */
 
-#endif /* ACEXML_HAS_ZZIPLIB */
+#endif /* USE_ZZIP */
diff --git a/ACEXML/common/ZipCharStream.h b/ACEXML/common/ZipCharStream.h
index bc04b2ea07e..e65d7f640b6 100644
--- a/ACEXML/common/ZipCharStream.h
+++ b/ACEXML/common/ZipCharStream.h
@@ -13,7 +13,7 @@
 #ifndef _ACEXML_ZIPCHARSTREAM_H_
 #define _ACEXML_ZIPCHARSTREAM_H_
 
-#ifdef ACEXML_HAS_ZZIPLIB
+#ifdef USE_ZZIP
 
 #include /**/ "ace/pre.h"
 #include "ACEXML/common/ACEXML_Export.h"
@@ -139,6 +139,6 @@ private:
 
 #include /**/ "ace/post.h"
 
-#endif /* ACEXML_HAS_ZZIPLIB */
+#endif /* USE_ZZIP */
 
 #endif /* _ACEXML_ZIPCHARSTREAM_H_ */
diff --git a/ACEXML/common/common.mpc b/ACEXML/common/common.mpc
index e8c7858146f..edd903cf5b7 100644
--- a/ACEXML/common/common.mpc
+++ b/ACEXML/common/common.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project(ACEXML): acelib, codecs {
+project(ACEXML): acelib, codecs, core {
   sharedname    = ACEXML
   dynamicflags += ACEXML_BUILD_DLL
 
diff --git a/ACEXML/examples/SAXPrint/Print_Handler.cpp b/ACEXML/examples/SAXPrint/Print_Handler.cpp
index 1dca52c8a37..34434cafc7a 100644
--- a/ACEXML/examples/SAXPrint/Print_Handler.cpp
+++ b/ACEXML/examples/SAXPrint/Print_Handler.cpp
@@ -4,10 +4,6 @@
 #include "ace/ACE.h"
 #include "ace/Log_Msg.h"
 
-#if !defined (__ACEXML_INLINE__)
-# include "Print_Handler.i"
-#endif /* __ACEXML_INLINE__ */
-
 ACEXML_Print_Handler::ACEXML_Print_Handler (ACEXML_Char* fileName)
   : fileName_(ACE::strnew (fileName))
 {
diff --git a/ACEXML/examples/SAXPrint/Print_Handler.i b/ACEXML/examples/SAXPrint/Print_Handler.i
deleted file mode 100644
index 77b4466a3cb..00000000000
--- a/ACEXML/examples/SAXPrint/Print_Handler.i
+++ /dev/null
@@ -1 +0,0 @@
-// -*- C++ -*-  $Id$
diff --git a/ACEXML/examples/SAXPrint/broken.xml b/ACEXML/examples/SAXPrint/broken.xml
index fc8432680e8..8c350cc24fe 100644
--- a/ACEXML/examples/SAXPrint/broken.xml
+++ b/ACEXML/examples/SAXPrint/broken.xml
@@ -2,4 +2,4 @@
 <!-- This is a broken XML file.  Most of the stuff here don't make any sense at all -->
 
 <root>
-  <child> kid </child>
\ No newline at end of file
+  <child> kid
diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp
index 1fb07e43ddd..333ba361eee 100644
--- a/ACEXML/examples/SAXPrint/main.cpp
+++ b/ACEXML/examples/SAXPrint/main.cpp
@@ -58,13 +58,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             break;
           case 'z':
             zip = 1;
-#ifndef ACEXML_HAS_ZZIPLIB
+#ifndef USE_ZZIP
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ZZIPLIB support has not been")
                         ACE_TEXT (" compiled in. Refer to ")
                         ACE_TEXT ("$ACE_ROOT/ACEXML/README for more ")
                         ACE_TEXT ("information. \n")));
             return -1;
-#endif /* ACEXML_HAS_ZZIPLIB */
+#endif /* USE_ZZIP */
             break;
           default:
             usage(argv[0]);
@@ -82,12 +82,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACEXML_FileCharStream *fstm = 0;
   ACEXML_HttpCharStream *ustm = 0;
   ACEXML_StrCharStream* sstm = 0;
-#ifdef ACEXML_HAS_ZZIPLIB
+#ifdef USE_ZZIP
   ACEXML_ZipCharStream* zstm = 0;
-#endif /* ACEXML_HAS_ZZIPLIB */
+#endif /* USE_ZZIP */
   if (filename != 0)
     {
-#ifdef ACEXML_HAS_ZZIPLIB
+#ifdef USE_ZZIP
       if (zip)
         {
           ACE_NEW_RETURN (zstm, ACEXML_ZipCharStream(), -1);
@@ -100,7 +100,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
       else
         {
-#endif /* ACEXML_HAS_ZZIPLIB */
+#endif /* USE_ZZIP */
           ACE_NEW_RETURN (fstm, ACEXML_FileCharStream (), -1);
           if (fstm->open (filename) != 0)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -108,9 +108,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                filename),
                               -1);
           stm = fstm;
-#ifdef ACEXML_HAS_ZZIPLIB
+#ifdef USE_ZZIP
         }
-#endif /* ACEXML_HAS_ZZIPLIB */
+#endif /* USE_ZZIP */
     }
   else if (url != 0)
     {
@@ -152,30 +152,31 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   parser.setDTDHandler (handler);
   parser.setErrorHandler (handler);
   parser.setEntityResolver (handler);
-  ACEXML_TRY_NEW_ENV
+  ACEXML_DECLARE_NEW_ENV;
+
+  ACEXML_TRY_EX (FIRST)
   {
     parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
-    ACEXML_TRY_CHECK;
+    ACEXML_TRY_CHECK_EX (FIRST);
   }
   ACEXML_CATCH (ACEXML_Exception, ex)
     {
       ex.print();
       ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n")));
+    }
+  ACEXML_ENDTRY;
+  ACEXML_TRY_EX (SECOND)
+  {
+    parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
+    ACEXML_TRY_CHECK_EX (SECOND);
+  }
+  ACEXML_CATCH (ACEXML_SAXException, ex)
+    {
+      ex.print();
+      ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n")));
       return 1;
     }
   ACEXML_ENDTRY;
-//   ACEXML_TRY_EX (SECOND)
-//   {
-//     parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
-//     ACEXML_TRY_CHECK_EX (SECOND);
-//   }
-//   ACEXML_CATCH (ACEXML_SAXException, ex)
-//     {
-//       ex.print();
-//       ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n")));
-//       return 1;
-//     }
-//   ACEXML_ENDTRY;
 //   ACEXML_TRY_EX (THIRD)
 //   {
 //     parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
diff --git a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp b/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
index 2ad9e7183bf..65ae6e3776d 100644
--- a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
+++ b/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
@@ -189,7 +189,7 @@ ACEXML_Debug_Attributes_Builder::insertAttribute (ACEXML_Attribute_Def_Builder *
     {
       ACEXML_String attname (def->getName (), 0, 0);
       ACEXML_Debug_Attribute_Builder *ptr =
-        ACE_dynamic_cast (ACEXML_Debug_Attribute_Builder *, def);
+        dynamic_cast<ACEXML_Debug_Attribute_Builder *> (def);
       this->attributes_.bind (attname, *ptr);
       return 0;
     }
diff --git a/ACEXML/parser/parser/Entity_Manager.i b/ACEXML/parser/parser/Entity_Manager.i
index 05b3859724b..93a4fb014a3 100644
--- a/ACEXML/parser/parser/Entity_Manager.i
+++ b/ACEXML/parser/parser/Entity_Manager.i
@@ -39,10 +39,10 @@ ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char* ref,
 
   if (iter != end)
     {
-      systemId = ACE_const_cast (ACEXML_Char*, (*iter).int_id_.c_str());
+      systemId = const_cast<ACEXML_Char*> ((*iter).int_id_.c_str());
       ++iter;
       if (iter != end)
-        publicId = ACE_const_cast (ACEXML_Char*, (*iter).int_id_.c_str());
+        publicId = const_cast<ACEXML_Char*> ((*iter).int_id_.c_str());
       return 0;
     }
   return -1;
diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp
index d60a9b35c31..7b1172a3ba8 100644
--- a/ACEXML/parser/parser/Parser.cpp
+++ b/ACEXML/parser/parser/Parser.cpp
@@ -842,6 +842,9 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
     }
   ACEXML_AttributesImpl attributes;
   ACEXML_Char ch;
+  int ns_flag = 0;   // Push only one namespace context onto the stack
+                     // if there are multiple namespaces declared.
+
   const ACEXML_Char* ns_uri = 0;
   const ACEXML_Char* ns_lname = 0; // namespace URI and localName
   for (int start_element_done = 0; start_element_done == 0;)
@@ -879,7 +882,7 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
                                   ns_uri, ns_lname, 0
                                   ACEXML_ENV_ARG_PARAMETER);
             ACEXML_CHECK;
-            if (this->nested_namespace_ >= 1)
+            if (ns_flag)
               {
                 this->xml_namespace_.popContext ();
                 this->nested_namespace_--;
@@ -913,12 +916,17 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
 
             // Handling new namespace if any. Notice that the order of
             // namespace declaration does matter.
-            if (ACE_OS::strcmp (attname, ACE_TEXT("xmlns")) == 0)
+            if (ACE_OS::strncmp (attname, ACE_TEXT("xmlns"), 5) == 0)
               {
                 if (this->namespaces_)
                   {
-                    this->xml_namespace_.pushContext ();
-                    this->nested_namespace_++;
+                    if (!ns_flag)
+                      {
+                        this->xml_namespace_.pushContext ();
+                        this->nested_namespace_++;
+                        ns_flag = 1;
+                      }
+
                     ACEXML_Char* name = ACE_OS::strchr (attname, ':');
                     const ACEXML_Char* ns_name = (name == 0)?
                                                  empty_string:name+1;
@@ -935,7 +943,8 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
                   {
                     // Namespace_prefixes_feature_ is required. So add the
                     // xmlns:foo to the list of attributes.
-                    if (attributes.addAttribute (0, 0, attname,
+                    if (attributes.addAttribute (ACE_TEXT (""), ACE_TEXT (""),
+                                                 attname,
                                                  default_attribute_type,
                                                  attvalue) == -1)
                       {
@@ -1154,7 +1163,7 @@ ACEXML_Parser::parse_content (const ACEXML_Char* startname,
             this->obstack_.grow (ch);
         }
     }
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 
@@ -1393,7 +1402,6 @@ ACEXML_Parser::parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL)
       ACEXML_CHECK_RETURN (-1);
     }
   ACEXML_Char fwd = 0;
-  ACEXML_Char* attname = 0;
   count = this->skip_whitespace_count (&fwd);
   // Parse AttDef*
   while (fwd != '>')
@@ -1411,7 +1419,7 @@ ACEXML_Parser::parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL)
       count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER);
       ACEXML_CHECK_RETURN (-1);
 
-      attname = this->parse_attname (ACEXML_ENV_SINGLE_ARG_PARAMETER);
+      this->parse_attname (ACEXML_ENV_SINGLE_ARG_PARAMETER);
       ACEXML_CHECK_RETURN (-1);
 
       count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER);
@@ -3161,7 +3169,7 @@ ACEXML_Parser::parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_DECL)
       ACEXML_CHECK;
     }
   const ACEXML_Char* encoding = this->current_->getInputSource()->getEncoding();
-  if (ACE_OS::strcmp (astring, encoding) != 0)
+  if (encoding != 0 && ACE_OS::strcmp (astring, encoding) != 0)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Detected Encoding is %s ")
                   ACE_TEXT (": Declared Encoding is %s\n"),
@@ -3327,7 +3335,7 @@ ACEXML_Parser::parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_DECL)
                                                                instruction
                                                                ACEXML_ENV_ARG_PARAMETER);
                 ACEXML_CHECK_RETURN (-1);
-                this->obstack_.unwind (ACE_const_cast (ACEXML_Char*, pitarget));
+                this->obstack_.unwind (const_cast<ACEXML_Char*> (pitarget));
                 return 0;
               }
             break;
@@ -3351,11 +3359,14 @@ ACEXML_Parser::reset (void)
   if (this->ctx_stack_.pop (this->current_) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("Mismatched push/pop of Context stack")));
-  this->current_->getInputSource()->getCharStream()->rewind();
+  if (this->current_)
+    {
+      this->current_->getInputSource()->getCharStream()->rewind();
 
-  this->current_->setInputSource (0);
-  delete this->current_;
-  this->current_ = 0;
+      this->current_->setInputSource (0);
+      delete this->current_;
+      this->current_ = 0;
+    }
 
   ACEXML_Char* temp = 0;
   while (this->GE_reference_.pop (temp) != -1)
diff --git a/ACEXML/parser/parser/Parser.i b/ACEXML/parser/parser/Parser.i
index d7c2f8a8705..0857aa37835 100644
--- a/ACEXML/parser/parser/Parser.i
+++ b/ACEXML/parser/parser/Parser.i
@@ -248,8 +248,7 @@ ACEXML_Parser::parse_token (const ACEXML_Char* keyword)
   if (keyword == 0)
     return -1;
   const ACEXML_Char* ptr = keyword;
-  ACEXML_Char ch;
-  for (; *ptr != 0 && ((ch = this->get()) == *ptr); ++ptr)
+  for (; *ptr != 0 && (this->get() == *ptr); ++ptr)
     ;
   if (*ptr == 0)
   return 0;
diff --git a/ACEXML/parser/parser/parser.mpc b/ACEXML/parser/parser/parser.mpc
index 2a1af216254..adac22796f0 100644
--- a/ACEXML/parser/parser/parser.mpc
+++ b/ACEXML/parser/parser/parser.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project(ACEXML_Parser): acelib {
+project(ACEXML_Parser): acelib, core {
   sharedname    = ACEXML_Parser
   after        += ACEXML
   libs         += ACEXML
diff --git a/ACEXML/tests/ContentHandler_Test.cpp b/ACEXML/tests/ContentHandler_Test.cpp
index 604cf9873d3..ec4315f892a 100644
--- a/ACEXML/tests/ContentHandler_Test.cpp
+++ b/ACEXML/tests/ContentHandler_Test.cpp
@@ -55,7 +55,7 @@ Basic_Content_Tester::characters (const ACEXML_Char *ch,
     }
   already_called = 1;
 
-  int expected_len = ACE_static_cast (int, ACE_OS::strlen (expect));
+  int expected_len = static_cast<int> (ACE_OS::strlen (expect));
   if (length != expected_len)
     {
       ACE_ERROR ((LM_ERROR,
diff --git a/ACEXML/tests/Transcoder_Test.cpp b/ACEXML/tests/Transcoder_Test.cpp
index a1ac572327a..f5dc289e5e0 100644
--- a/ACEXML/tests/Transcoder_Test.cpp
+++ b/ACEXML/tests/Transcoder_Test.cpp
@@ -43,7 +43,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
 
   for (x = 0; temp < 0x10000; x++, temp <<= 1)
     {
-      org[x] = ACE_static_cast (ACEXML_UTF16, temp);
+      org[x] = static_cast<ACEXML_UTF16> (temp);
     }
 
   ACE_DEBUG ((LM_DEBUG, "Original UTF16 string:\n"));
diff --git a/ACEXML/tests/tests.mpc b/ACEXML/tests/tests.mpc
index c6a0b85e7b5..e0a2365e689 100644
--- a/ACEXML/tests/tests.mpc
+++ b/ACEXML/tests/tests.mpc
@@ -2,24 +2,28 @@
 // $Id$
 
 project(Transcoder_Test): aceexe, acexml {
+  exename = Transcoder_Test
   Source_Files {
     Transcoder_Test.cpp
   }
 }
 
 project(NamespaceSupport_Test): aceexe, acexml {
+  exename = NamespaceSupport_Test
   Source_Files {
     NamespaceSupport_Test.cpp
   }
 }
 
 project(HttpCharStream_Test): aceexe, acexml {
+  exename = HttpCharStream_Test
   Source_Files {
     HttpCharStream_Test.cpp
   }
 }
 
 project(ContentHandler_Test): aceexe, acexml {
+  exename = ContentHandler_Test
   Source_Files {
     ContentHandler_Test.cpp
   }
diff --git a/ASNMP/ChangeLog b/ASNMP/ChangeLog
index 980b2e7a824..62cce551c9c 100644
--- a/ASNMP/ChangeLog
+++ b/ASNMP/ChangeLog
@@ -1,3 +1,39 @@
+Sun Oct  3 20:12:43 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* asnmp/oid.cpp:
+
+	  Fixed a double deletion problem reported by  Shlomi Yaakobovich. 
+
+Thu Sep 30 10:54:39 2004  Steve Huston  <shuston@riverace.com>
+
+	* examples/get/get.cpp:
+	* examples/get/get_async.cpp:
+	* examples/next/next.cpp:
+	* examples/set/set.cpp:
+	* examples/trap/trap.cpp:
+	* examples/walk/walk.cpp: Added #include "ace/Argv_Type_Converter.h".
+
+Wed Sep 29 15:33:29 2004  Steve Huston  <shuston@riverace.com>
+
+	* asnmp/sagent.cpp:
+	* agent/snmp_agent.cpp:
+	* examples/get/get.cpp:
+	* examples/get/get_async.cpp:
+	* examples/next/next.cpp:
+	* examples/set/set.cpp:
+	* examples/trap/trap.cpp:
+	* examples/walk/walk.cpp:
+	* tests/test_config.h:
+	* tests/Address_Test.cpp:
+	* tests/Counter64_Test.cpp:
+	* tests/Counter_Test.cpp:
+	* tests/Gauge_Test.cpp:
+	* tests/Integer_Test.cpp:
+	* tests/Octet_Test.cpp:
+	* tests/Oid_Test.cpp:
+	* tests/Target_Test.cpp:
+	* tests/Varbind_Test.cpp: Adjustments to build with wide-char.
+
 Fri Aug  6 08:14:12 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
 	* asnmp/transaction.{h,cpp}: Added a get_handle() call to
diff --git a/ASNMP/agent/agent.mpc b/ASNMP/agent/agent.mpc
index c83c707ad78..4579c29d458 100644
--- a/ASNMP/agent/agent.mpc
+++ b/ASNMP/agent/agent.mpc
@@ -4,6 +4,7 @@ project (asnmp_agent) : aceexe {
   exename = agent
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     agent_impl.cpp
diff --git a/ASNMP/agent/snmp_agent.cpp b/ASNMP/agent/snmp_agent.cpp
index 27d445929e7..520c58eaccf 100644
--- a/ASNMP/agent/snmp_agent.cpp
+++ b/ASNMP/agent/snmp_agent.cpp
@@ -4,6 +4,7 @@
 
 #include "snmp_agent.h"
 #include "agent_impl.h"  // actual implementation
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
 
@@ -11,8 +12,8 @@ ACE_RCSID(agent, snmp_agent, "$Id$")
 
 // module globals 
 #define SNMP_AGENT_PORT (161)
-#define WR_COM ("private")
-#define RD_COM ("public")
+#define WR_COM ACE_TEXT ("private")
+#define RD_COM ACE_TEXT ("public")
 
 snmp_agent::snmp_agent() : agent_(0)
 {
@@ -36,10 +37,12 @@ int snmp_agent::set_args(int argc, char *argv[])
 {
   ACE_TRACE("snmp_agent::set_args");
   unsigned short port = SNMP_AGENT_PORT;
-  char *rd = const_cast <char*> RD_COM;
-  char *wr = const_cast <char*> WR_COM;
+  const ACE_TCHAR *rd = RD_COM;
+  const ACE_TCHAR *wr = WR_COM;
+  ACE_Argv_Type_Converter to_tchar (argc, argv);
 
-  ACE_Get_Opt get_opt (argc, argv, "p:w:r:hv");
+  ACE_Get_Opt get_opt
+    (argc, to_tchar.get_TCHAR_argv (), ACE_TEXT ("p:w:r:hv"));
   for (int c; (c = get_opt ()) != -1; ) {
      switch (c)
        {
@@ -55,8 +58,9 @@ int snmp_agent::set_args(int argc, char *argv[])
         
        case 'h': // help & version info  
        case 'v': 
-        ACE_DEBUG ((LM_DEBUG,
-	      "(%P|%t) Example SNMP Version 1 Agent - ASNMP/ACE\n"));
+        ACE_DEBUG
+          ((LM_DEBUG,
+            ACE_TEXT ("(%P|%t) Example SNMP Version 1 Agent - ASNMP/ACE\n")));
          return -1;
          break;
 
@@ -66,7 +70,9 @@ int snmp_agent::set_args(int argc, char *argv[])
   }
 
    
-   agent_ = new agent_impl(port, rd, wr); // opens OS IO port
+   agent_ = new agent_impl(port,
+                           ACE_TEXT_ALWAYS_CHAR (rd),
+                           ACE_TEXT_ALWAYS_CHAR (wr)); // opens OS IO port
    return 0;
 }
 
@@ -86,12 +92,13 @@ int snmp_agent::run()
   // Run forever, processing SNMP requests.
 
   ACE_DEBUG ((LM_DEBUG,
-	      "(%P|%t) starting up snmp agent (server) daemon\n"));
+	      ACE_TEXT ("(%P|%t) starting up snmp agent (server) daemon\n")));
 
   agent_->process_requests();
 
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%P|%t) shutting down snmp agent (server) daemon\n"));
+  ACE_DEBUG
+    ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) shutting down snmp agent (server) daemon\n")));
   return 0;
 }
 
diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp
index d5a72aad750..2442ea50550 100644
--- a/ASNMP/asnmp/address.cpp
+++ b/ASNMP/asnmp/address.cpp
@@ -527,7 +527,6 @@ int IpAddress::parse_address( const char *inaddr)
 
         // save the friendly name
         ACE_OS::strcpy( iv_friendly_name_, inaddr);
-        return 1;
 
     }    // end if lookup result
     else {
@@ -554,7 +553,12 @@ int IpAddress::addr_to_friendly()
     return 0;
  }
  else {
+#if defined (VXWORKS)
+   // VxWorks doesn't have h_errno
+   iv_friendly_name_status_ = errno;
+#else
    iv_friendly_name_status_ = h_errno;
+#endif /* VXWORKS */
    return iv_friendly_name_status_;
  }
 }
diff --git a/ASNMP/asnmp/asn1.cpp b/ASNMP/asnmp/asn1.cpp
index baeffbccd22..59b0fa9f8bf 100644
--- a/ASNMP/asnmp/asn1.cpp
+++ b/ASNMP/asnmp/asn1.cpp
@@ -194,7 +194,7 @@ u_char * asn1::build_int( u_char *data,
    * consecutive 1's or 0's at the most significant end of the
    * integer.
    */
-  mask = 0x1FF << ((8 * (sizeof(long) - 1)) - 1);
+  mask = u_long (0x1FF) << ((8 * (sizeof(u_long) - 1)) - 1);
   /* mask is 0xFF800000 on a big-endian machine */
   while((((integer & mask) == 0) || ((integer & mask) == mask))
         && intsize > 1){
@@ -207,7 +207,7 @@ u_char * asn1::build_int( u_char *data,
   if (*datalength < intsize)
     return 0;
   *datalength -= intsize;
-  mask = 0xFF << (8 * (sizeof(long) - 1));
+  mask = u_long (0xFF) << (8 * (sizeof(u_long) - 1));
   /* mask is 0xFF000000 on a big-endian machine */
   while(intsize--){
     *data++ = (u_char)((integer & mask) >> (8 * (sizeof(long) - 1)));
@@ -245,7 +245,7 @@ u_char * asn1::build_unsigned_int( u_char *data,
   if (intsize != sizeof (long))
     return 0;
   integer = *intp;
-  mask = 0xFF << (8 * (sizeof(long) - 1));
+  mask = u_long (0xFF) << (8 * (sizeof(u_long) - 1));
   /* mask is 0xFF000000 on a big-endian machine */
   if ((u_char)((integer & mask) >> (8 * (sizeof(long) - 1))) & 0x80){
     /* if MSB is set */
@@ -257,7 +257,7 @@ u_char * asn1::build_unsigned_int( u_char *data,
    * There should be no sequence of 9 consecutive 1's or 0's at the most significant end of the
    * integer.
    */
-  mask = 0x1FF << ((8 * (sizeof(long) - 1)) - 1);
+  mask = u_long (0x1FF) << ((8 * (sizeof(u_long) - 1)) - 1);
   /* mask is 0xFF800000 on a big-endian machine */
   while((((integer & mask) == 0) || ((integer & mask) == mask)) && intsize > 1){
     intsize--;
@@ -273,7 +273,7 @@ u_char * asn1::build_unsigned_int( u_char *data,
     *data++ = '\0';
     intsize--;
   }
-  mask = 0xFF << (8 * (sizeof(long) - 1));
+  mask = u_long (0xFF) << (8 * (sizeof(u_long) - 1));
   /* mask is 0xFF000000 on a big-endian machine */
   while(intsize--){
     *data++ = (u_char)((integer & mask) >> (8 * (sizeof(long) - 1)));
@@ -921,7 +921,7 @@ u_char * asn1::build_unsigned_int64( u_char *data,
   intsize = 8;
   low = cp->low;
   high = cp->high;
-  mask = 0xFF << (8 * (sizeof(long) - 1));
+  mask = u_long (0xFF) << (8 * (sizeof(u_long) - 1));
   /* mask is 0xFF000000 on a big-endian machine */
   if ((u_char)((high & mask) >> (8 * (sizeof(long) - 1))) & 0x80){
     /* if MSB is set */
@@ -934,7 +934,7 @@ u_char * asn1::build_unsigned_int64( u_char *data,
    * There should be no sequence of 9 consecutive 1's or 0's at the most
    * significant end of the integer.
    */
-  mask2 = 0x1FF << ((8 * (sizeof(long) - 1)) - 1);
+  mask2 = u_long (0x1FF) << ((8 * (sizeof(u_long) - 1)) - 1);
   /* mask2 is 0xFF800000 on a big-endian machine */
   while((((high & mask2) == 0) || ((high & mask2) == mask2))
         && intsize > 1){
diff --git a/ASNMP/asnmp/enttraps.h b/ASNMP/asnmp/enttraps.h
index 13dcaea1cad..460c2bae121 100644
--- a/ASNMP/asnmp/enttraps.h
+++ b/ASNMP/asnmp/enttraps.h
@@ -43,6 +43,7 @@ class ASNMP_Export snmpTrapsOid: public Oid
 {
    public:
    snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){}
+   SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); }
 };
 
 class ASNMP_Export snmpTrapEnterpriseOid: public Oid
@@ -51,6 +52,7 @@ class ASNMP_Export snmpTrapEnterpriseOid: public Oid
 {
    public:
    snmpTrapEnterpriseOid(void): Oid("1.3.6.1.6.3.1.1.4.3.0") { }
+   SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); }
 };
 
 class ASNMP_Export coldStartOid: public snmpTrapsOid
@@ -59,6 +61,7 @@ class ASNMP_Export coldStartOid: public snmpTrapsOid
 {
    public:
    coldStartOid( void){*this+=".1";}
+   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 class ASNMP_Export warmStartOid: public snmpTrapsOid
@@ -67,6 +70,7 @@ class ASNMP_Export warmStartOid: public snmpTrapsOid
 {
    public:
    warmStartOid( void){*this+=".2";}
+   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 class ASNMP_Export linkDownOid: public snmpTrapsOid
@@ -75,6 +79,7 @@ class ASNMP_Export linkDownOid: public snmpTrapsOid
 {
    public:
    linkDownOid( void){*this+=".3";}
+   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 
@@ -85,6 +90,7 @@ class ASNMP_Export linkUpOid: public snmpTrapsOid
 {
    public:
    linkUpOid( void){*this+=".4";}
+   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 class ASNMP_Export authenticationFailureOid: public snmpTrapsOid
@@ -93,6 +99,7 @@ class ASNMP_Export authenticationFailureOid: public snmpTrapsOid
 {
    public:
    authenticationFailureOid( void){*this+=".5";}
+   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 class ASNMP_Export egpNeighborLossOid: public snmpTrapsOid
@@ -101,6 +108,7 @@ class ASNMP_Export egpNeighborLossOid: public snmpTrapsOid
 {
    public:
    egpNeighborLossOid( void){*this+=".6";}
+   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 #ifdef DEFINE_TRAP_CONSTANTS_
diff --git a/ASNMP/asnmp/octet.cpp b/ASNMP/asnmp/octet.cpp
index 795aa39210b..885197919c4 100644
--- a/ASNMP/asnmp/octet.cpp
+++ b/ASNMP/asnmp/octet.cpp
@@ -84,7 +84,6 @@ OctetStr::OctetStr( const char  * string, long size):
   output_buffer(0), validity(0)
 {
 
-  size_t z;
   init_octet_smi(smival);
 
   // check for null string
@@ -92,7 +91,7 @@ OctetStr::OctetStr( const char  * string, long size):
     return;
 
   if (size == -1) // calc if no length given - assume c style string
-    size = z = ACE_OS::strlen( string);
+    size = ACE_OS::strlen( string);
 
   copy_octet_smi(smival, size, string, validity);
 }
@@ -102,8 +101,6 @@ OctetStr::OctetStr( const char  * string, long size):
 // TODO: should return status since it can fail in so many places
 void OctetStr::set_data( const SmiBYTE* string, long size)
 {
-  size_t z;
-
   // invalid args, set octetStr to not valid
   if ( !string || !size) {
     validity = 0;
@@ -112,7 +109,7 @@ void OctetStr::set_data( const SmiBYTE* string, long size)
 
   // assume non-zero terminated string
   if (size == -1) // calc if no length given - assume c style string
-    size = z = ACE_OS::strlen( (char *)string);
+    size = ACE_OS::strlen( (char *)string);
 
   // free up already used space
   if ( smival.value.string.ptr ) {
diff --git a/ASNMP/asnmp/oid.cpp b/ASNMP/asnmp/oid.cpp
index d5aa31b5d09..b5999a1fcbd 100644
--- a/ASNMP/asnmp/oid.cpp
+++ b/ASNMP/asnmp/oid.cpp
@@ -187,8 +187,8 @@ Oid& Oid::operator=( const Oid &oid)
   if ( oid.smival.value.oid.len == 0)
      return *this;
 
-  init_value((const SmiLPOID) &(oid.smival.value.oid),
-                 oid.smival.value.oid.len);
+  const SmiLPOID srcOid = (SmiLPOID) &(oid.smival.value.oid);
+  init_value(srcOid, oid.smival.value.oid.len);
   return *this;
 }
 
@@ -249,8 +249,6 @@ Oid& Oid::operator+=( const char *a)
    ACE_OS::strcat(ptr,a);
    if ( smival.value.oid.len !=0) {
      set_invalid();
-     delete [] smival.value.oid.ptr;
-     smival.value.oid.len = 0;
     }
 
    if (StrToOid( (char *) ptr, &smival.value.oid, byte_counter) < 0) {
diff --git a/ASNMP/asnmp/oid.h b/ASNMP/asnmp/oid.h
index fd198c04073..7de02013ef4 100644
--- a/ASNMP/asnmp/oid.h
+++ b/ASNMP/asnmp/oid.h
@@ -117,7 +117,7 @@ public:
   void trim( const size_t how_many = 1);
   // trim off the n rightmost values of an oid
 
-  int suboid(Oid& oid, size_t start = 0, size_t how_many = -1);
+  int suboid(Oid& oid, size_t start = 0, size_t how_many = size_t (-1));
   // the equivalent of a substr(new_str, 0, 1)
 
   int left_comparison( const unsigned long n, const Oid &o) const;
diff --git a/ASNMP/asnmp/sagent.cpp b/ASNMP/asnmp/sagent.cpp
index fc56a2c728f..8ee2fdb5b8d 100644
--- a/ASNMP/asnmp/sagent.cpp
+++ b/ASNMP/asnmp/sagent.cpp
@@ -53,9 +53,9 @@ int sagent::handle_input(ACE_HANDLE fd)
      return 0;
   OctetStr community(rcv_com_str);
   const ACE_INET_Addr &ta = tr.get_from_addr();
-  char buf_tmp[MAXHOSTNAMELEN + 1];
+  ACE_TCHAR buf_tmp[MAXHOSTNAMELEN + 1];
   ta.addr_to_string (buf_tmp, MAXHOSTNAMELEN);
-  UdpAddress ra(buf_tmp);
+  UdpAddress ra (ACE_TEXT_ALWAYS_CHAR (buf_tmp));
   tgt_.set_address(ra);
 
 
diff --git a/ASNMP/asnmp/smival.h b/ASNMP/asnmp/smival.h
index 45911d21246..c8bd6b8a5c9 100644
--- a/ASNMP/asnmp/smival.h
+++ b/ASNMP/asnmp/smival.h
@@ -88,7 +88,7 @@ public:
   virtual ~SnmpSyntax() {};
   // virtual destructor to ensure deletion of derived classes...
 
-  virtual SnmpSyntax& operator=( SnmpSyntax &/*val*/)
+  virtual SnmpSyntax& operator=(SnmpSyntax &/*val*/)
   {
       return *this;
   }
diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp
index 1396ea3e488..2964ff8a1f2 100644
--- a/ASNMP/asnmp/transaction.cpp
+++ b/ASNMP/asnmp/transaction.cpp
@@ -140,8 +140,7 @@ int transaction::handle_input (ACE_HANDLE)
 int transaction::handle_timeout(const ACE_Time_Value &,
                                 const void *)
 {
-    int rc;
-    if ((rc = send()) < 0)      // send pkt to agent
+    if (send() < 0)      // send pkt to agent
         result_->result(this, 0);
     else
         if (retry_counter_++ > params_.get_retry())
diff --git a/ASNMP/examples/get/get.cpp b/ASNMP/examples/get/get.cpp
index d335ab43f98..ff6fcb9681f 100644
--- a/ASNMP/examples/get/get.cpp
+++ b/ASNMP/examples/get/get.cpp
@@ -35,6 +35,7 @@
 =====================================================================*/
 
 #include "asnmp/snmp.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Get_Opt.h"
 
 // FUZZ: disable check_for_streams_include
@@ -93,19 +94,23 @@ getapp::getapp(int argc, char *argv[]): valid_(0)
       return;
    }
 
-   ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:p:");
+   ACE_Argv_Type_Converter to_tchar (argc, argv);
+   ACE_Get_Opt get_opt (argc,
+                        to_tchar.get_TCHAR_argv (),
+                        ACE_TEXT ("o:c:r:t:p:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = get_opt.opt_arg();
+         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          if (req.valid() == 0)
-         cout << "ERROR: oid value: " <<get_opt.opt_arg()  \
+         cout << "ERROR: oid value: "
+              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = get_opt.opt_arg();
+         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
diff --git a/ASNMP/examples/get/get.mpc b/ASNMP/examples/get/get.mpc
index 63e09955d42..ffa5a2a5f53 100644
--- a/ASNMP/examples/get/get.mpc
+++ b/ASNMP/examples/get/get.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_get) : aceexe {
   exename = get
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     get.cpp
@@ -14,6 +15,7 @@ project (asnmp_example_get_async) : aceexe {
   exename = get_async
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     get_async.cpp
diff --git a/ASNMP/examples/get/get_async.cpp b/ASNMP/examples/get/get_async.cpp
index ff90105591b..8217ffabac1 100644
--- a/ASNMP/examples/get/get_async.cpp
+++ b/ASNMP/examples/get/get_async.cpp
@@ -33,6 +33,7 @@
 =====================================================================*/
 
 #include "asnmp/snmp.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Get_Opt.h"
 
 // FUZZ: disable check_for_streams_include
@@ -93,19 +94,23 @@ getapp::getapp(int argc, char *argv[]): valid_(0)
       return;
    }
 
-   ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:p:");
+   ACE_Argv_Type_Converter to_tchar (argc, argv);
+   ACE_Get_Opt get_opt (argc,
+                        to_tchar.get_TCHAR_argv (),
+                        ACE_TEXT ("o:c:r:t:p:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = get_opt.opt_arg();
+         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          if (req.valid() == 0)
-         cout << "ERROR: oid value: " <<get_opt.opt_arg()  \
+         cout << "ERROR: oid value: "
+              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = get_opt.opt_arg();
+         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
diff --git a/ASNMP/examples/next/next.cpp b/ASNMP/examples/next/next.cpp
index c8c58db88d4..7a9a2208ca2 100644
--- a/ASNMP/examples/next/next.cpp
+++ b/ASNMP/examples/next/next.cpp
@@ -34,6 +34,7 @@
 =====================================================================*/
 
 #include "asnmp/snmp.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Get_Opt.h"
 
 // FUZZ: disable check_for_streams_include
@@ -92,19 +93,23 @@ nextapp::nextapp(int argc, char *argv[]): valid_(0)
       return;
    }
 
-   ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:");
+   ACE_Argv_Type_Converter to_tchar (argc, argv);
+   ACE_Get_Opt get_opt (argc,
+                        to_tchar.get_TCHAR_argv (),
+                        ACE_TEXT ("o:c:r:t:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = get_opt.opt_arg();
+         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          if (req.valid() == 0)
-         cout << "ERROR: oid value: " <<get_opt.opt_arg()  \
+         cout << "ERROR: oid value: "
+              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = get_opt.opt_arg();
+         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
diff --git a/ASNMP/examples/next/next.mpc b/ASNMP/examples/next/next.mpc
index 6fe405a1e51..f0022cb46a2 100644
--- a/ASNMP/examples/next/next.mpc
+++ b/ASNMP/examples/next/next.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_next) : aceexe {
   exename = next
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     next.cpp
diff --git a/ASNMP/examples/set/set.cpp b/ASNMP/examples/set/set.cpp
index cb3cb4f451d..39eb447f9a7 100644
--- a/ASNMP/examples/set/set.cpp
+++ b/ASNMP/examples/set/set.cpp
@@ -34,6 +34,7 @@
 =====================================================================*/
 
 #include "asnmp/snmp.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Get_Opt.h"
 
 // FUZZ: disable check_for_streams_include
@@ -95,19 +96,23 @@ set::set(int argc, char *argv[]): valid_(0)
       return;
    }
 
-   ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:I:U:C:G:T:O:S:P:");
+   ACE_Argv_Type_Converter to_tchar (argc, argv);
+   ACE_Get_Opt get_opt (argc,
+                        to_tchar.get_TCHAR_argv (),
+                        ACE_TEXT ("o:c:r:t:I:U:C:G:T:O:S:P:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = get_opt.opt_arg();
+         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          if (req.valid() == 0)
-         cout << "ERROR: oid value: " <<get_opt.opt_arg()  \
+         cout << "ERROR: oid value: "
+              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = get_opt.opt_arg();
+         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          target_.set_write_community(community_);
          break;
 
@@ -161,14 +166,14 @@ set::set(int argc, char *argv[]): valid_(0)
 
        case 'O': // Oid as a variable identifier
         {
-         oid_ = get_opt.opt_arg();
+         oid_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          vb.set_oid(oid_); // when value is set, pdu updated
          }
          break;
 
        case 'S': // Octet String
          {
-         OctetStr o(get_opt.opt_arg());
+         OctetStr o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()));
          vb.set_value(o);                    // set the Oid portion of the Vb
          pdu_ += vb;
          }
@@ -176,7 +181,7 @@ set::set(int argc, char *argv[]): valid_(0)
 
        case 'P': // Oid String as a value
          {
-         Oid o(get_opt.opt_arg());
+         Oid o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()));
          vb.set_value(o);                    // set the Oid portion of the Vb
          pdu_ += vb;
          }
diff --git a/ASNMP/examples/set/set.mpc b/ASNMP/examples/set/set.mpc
index 46c8f7f87d1..bb40f93e6df 100644
--- a/ASNMP/examples/set/set.mpc
+++ b/ASNMP/examples/set/set.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_set) : aceexe {
   exename = set
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     set.cpp
diff --git a/ASNMP/examples/trap/trap.cpp b/ASNMP/examples/trap/trap.cpp
index cb1ad66a1e4..59d4f9f25bc 100644
--- a/ASNMP/examples/trap/trap.cpp
+++ b/ASNMP/examples/trap/trap.cpp
@@ -36,6 +36,7 @@
 #include "asnmp/snmp.h"
 #define DEFINE_TRAP_CONSTANTS_
 #include "asnmp/enttraps.h" // enterprise standard traps
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Get_Opt.h"
 
 // FUZZ: disable check_for_streams_include
@@ -96,21 +97,24 @@ trapapp::trapapp(int argc, char *argv[]): valid_(0)
       return;
    }
 
-   ACE_Get_Opt get_opt (argc, argv, "c:e:t:");
+   ACE_Argv_Type_Converter to_tchar (argc, argv);
+   ACE_Get_Opt get_opt (argc,
+                        to_tchar.get_TCHAR_argv (),
+                        ACE_TEXT ("c:e:t:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'c': // community string
-         community_ = get_opt.opt_arg();
+         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
        case 'e': // trap oid to send
-         ent = get_opt.opt_arg();
+         ent = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          break;
 
        case 't': // trap oid
-         trap = get_opt.opt_arg();
+         trap = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          break;;
 
        default:
diff --git a/ASNMP/examples/trap/trap.mpc b/ASNMP/examples/trap/trap.mpc
index 9330364a84d..d0d6dc8e897 100644
--- a/ASNMP/examples/trap/trap.mpc
+++ b/ASNMP/examples/trap/trap.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_trap) : aceexe {
   exename = trap
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     trap.cpp
diff --git a/ASNMP/examples/walk/walk.cpp b/ASNMP/examples/walk/walk.cpp
index 0147b8fce0e..56fc112fd71 100644
--- a/ASNMP/examples/walk/walk.cpp
+++ b/ASNMP/examples/walk/walk.cpp
@@ -34,6 +34,7 @@
 =====================================================================*/
 
 #include "asnmp/snmp.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Get_Opt.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
@@ -92,19 +93,23 @@ walkapp::walkapp(int argc, char *argv[]): valid_(0)
       return;
    }
 
-   ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:");
+   ACE_Argv_Type_Converter to_tchar (argc, argv);
+   ACE_Get_Opt get_opt (argc,
+                        to_tchar.get_TCHAR_argv (),
+                        ACE_TEXT ("o:c:r:t:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = get_opt.opt_arg();
+         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          if (req.valid() == 0)
-         cout << "ERROR: oid value: " <<get_opt.opt_arg()  \
+         cout << "ERROR: oid value: "
+              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = get_opt.opt_arg();
+         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
diff --git a/ASNMP/examples/walk/walk.mpc b/ASNMP/examples/walk/walk.mpc
index 478405a786a..aff0fb98d35 100644
--- a/ASNMP/examples/walk/walk.mpc
+++ b/ASNMP/examples/walk/walk.mpc
@@ -4,6 +4,7 @@ project (asnmp_example_walk) : aceexe {
   exename = walk
   after += asnmp_lib
   libs  += asnmp
+  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     walk.cpp
diff --git a/ASNMP/tests/Address_Test.cpp b/ASNMP/tests/Address_Test.cpp
index 134a3e8a950..fce2067ab31 100644
--- a/ASNMP/tests/Address_Test.cpp
+++ b/ASNMP/tests/Address_Test.cpp
@@ -39,6 +39,7 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
 DAMAGES.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 
+#include "ace/OS_main.h"
 #include "asnmp/address.h"
 #include "test_config.h"
 
@@ -532,9 +533,9 @@ static void TestUdpAddress()
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("Address_Test");
+  ACE_START_TEST (ACE_TEXT ("Address_Test"));
 
   TestGenAddr();
   TestIpAddress();
diff --git a/ASNMP/tests/Counter64_Test.cpp b/ASNMP/tests/Counter64_Test.cpp
index d38a7524100..f0b9ee8ad56 100644
--- a/ASNMP/tests/Counter64_Test.cpp
+++ b/ASNMP/tests/Counter64_Test.cpp
@@ -38,7 +38,7 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
 DAMAGES.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 
-
+#include "ace/OS_main.h"
 #include "asnmp/ctr64.h"
 #include "test_config.h"
 
@@ -145,9 +145,9 @@ static void TestCounter64()
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("Counter64_Test");
+  ACE_START_TEST (ACE_TEXT ("Counter64_Test"));
 
   TestCounter64();
 
diff --git a/ASNMP/tests/Counter_Test.cpp b/ASNMP/tests/Counter_Test.cpp
index fb5447ad396..4f34c7a29bf 100644
--- a/ASNMP/tests/Counter_Test.cpp
+++ b/ASNMP/tests/Counter_Test.cpp
@@ -37,7 +37,7 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
 DAMAGES.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 
-
+#include "ace/OS_main.h"
 #include "asnmp/counter.h"
 #include "test_config.h"
 
@@ -125,9 +125,9 @@ static void  TestCounter()
 
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("Counter_Test");
+  ACE_START_TEST (ACE_TEXT ("Counter_Test"));
 
   TestCounter();
 
diff --git a/ASNMP/tests/Gauge_Test.cpp b/ASNMP/tests/Gauge_Test.cpp
index b87795fb174..58f44da6935 100644
--- a/ASNMP/tests/Gauge_Test.cpp
+++ b/ASNMP/tests/Gauge_Test.cpp
@@ -37,6 +37,7 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
 DAMAGES.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 
+#include "ace/OS_main.h"
 #include "asnmp/gauge.h"
 #include "test_config.h"
 
@@ -121,9 +122,9 @@ TestGuage (void)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("Guage_Test");
+  ACE_START_TEST (ACE_TEXT ("Gauge_Test"));
 
   TestGuage();
 
diff --git a/ASNMP/tests/Integer_Test.cpp b/ASNMP/tests/Integer_Test.cpp
index 6084865db36..8cea7e33f1b 100644
--- a/ASNMP/tests/Integer_Test.cpp
+++ b/ASNMP/tests/Integer_Test.cpp
@@ -38,7 +38,7 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
 DAMAGES.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 
-
+#include "ace/OS_main.h"
 #include "asnmp/integer.h"
 #include "test_config.h"
 
@@ -187,9 +187,9 @@ static void TestUnsignedInteger32()
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("Integer_Test");
+  ACE_START_TEST (ACE_TEXT ("Integer_Test"));
 
   TestInteger32();
 
diff --git a/ASNMP/tests/Octet_Test.cpp b/ASNMP/tests/Octet_Test.cpp
index 759ac16ee7c..a32f1cd2f09 100644
--- a/ASNMP/tests/Octet_Test.cpp
+++ b/ASNMP/tests/Octet_Test.cpp
@@ -39,10 +39,10 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
 DAMAGES.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 
-
+#include "ace/OS_main.h"
+#include "ace/OS_NS_string.h"
 #include "asnmp/octet.h"
 #include "test_config.h"
-#include "ace/OS_NS_string.h"
 
 ACE_RCSID(tests, Octet_Test, "$Id$")
 
@@ -146,9 +146,9 @@ static void TestOctet()
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("Octet_Test");
+  ACE_START_TEST (ACE_TEXT ("Octet_Test"));
 
   TestOctet();
   ACE_END_TEST;
diff --git a/ASNMP/tests/Oid_Test.cpp b/ASNMP/tests/Oid_Test.cpp
index c4b1660ef92..7add52bd790 100644
--- a/ASNMP/tests/Oid_Test.cpp
+++ b/ASNMP/tests/Oid_Test.cpp
@@ -38,6 +38,7 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
 DAMAGES.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 
+#include "ace/OS_main.h"
 #include "asnmp/oid.h"
 #include "test_config.h"
 
@@ -171,9 +172,9 @@ static void OidTest()
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("Oid_Test");
+  ACE_START_TEST (ACE_TEXT ("Oid_Test"));
   OidTest();
   ACE_END_TEST;
   return 0;
diff --git a/ASNMP/tests/Target_Test.cpp b/ASNMP/tests/Target_Test.cpp
index bd74641ee4a..28302e11cfd 100644
--- a/ASNMP/tests/Target_Test.cpp
+++ b/ASNMP/tests/Target_Test.cpp
@@ -39,7 +39,7 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
 DAMAGES.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 
-
+#include "ace/OS_main.h"
 #include "asnmp/octet.h"
 #include "asnmp/target.h"
 #include "test_config.h"
@@ -135,9 +135,9 @@ static void TestSnmpTarget()
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("Target_Test");
+  ACE_START_TEST (ACE_TEXT ("Target_Test"));
   TestSnmpTarget();
 
   ACE_END_TEST;
diff --git a/ASNMP/tests/Varbind_Test.cpp b/ASNMP/tests/Varbind_Test.cpp
index ea7ffc7239a..e9c9ecc923b 100644
--- a/ASNMP/tests/Varbind_Test.cpp
+++ b/ASNMP/tests/Varbind_Test.cpp
@@ -39,7 +39,7 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL
 DAMAGES.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 
-
+#include "ace/OS_main.h"
 #include "asnmp/oid.h"
 #include "asnmp/vb.h"
 #include "test_config.h"
@@ -187,9 +187,9 @@ static void VbTest()
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST ("VbTest");
+  ACE_START_TEST (ACE_TEXT ("Varbind_Test"));
   VbTest();
   ACE_END_TEST;
   return 0;
diff --git a/ASNMP/tests/test_config.h b/ASNMP/tests/test_config.h
index 510a93a4005..887fa5cec8a 100644
--- a/ASNMP/tests/test_config.h
+++ b/ASNMP/tests/test_config.h
@@ -68,14 +68,14 @@ typedef size_t KEY;
 #endif /* ACE_WIN32 */
 
 #define ACE_START_TEST(NAME) \
-  const char *program = NAME; \
+  const ACE_TCHAR *program = NAME; \
   ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
   if (ace_file_stream.set_output (program) != 0) \
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set_output failed"), -1); \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting %s test at %T\n", program));
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) starting %s test at %T\n"), program));
 
 #define ACE_END_TEST \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Ending %s test at %T\n", program)); \
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %T\n"), program)); \
   ace_file_stream.close ();
 
 #define ACE_NEW_THREAD \
@@ -86,23 +86,23 @@ do {\
 } while (0)
 
 #define ACE_APPEND_LOG(NAME) \
-  const char *program = NAME; \
+  const ACE_TCHAR *program = NAME; \
   ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
   if (ace_file_stream.set_output (program, 1) != 0) \
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set_output failed"), -1); \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting %s test at %T\n", program));
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %T\n"), program));
 
 #define ACE_END_LOG \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Ending %s test at %T\n\n", program)); \
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %T\n\n"), program)); \
   ace_file_stream.close ();
 
 #define ACE_INIT_LOG(NAME) \
   char temp[BUFSIZ]; \
   ACE_OS::sprintf (temp, "%s%s%s", \
-                   ACE_LOG_DIRECTORY, \
-                   ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR), \
+                   ACE_TEXT_ALWAYS_CHAR (ACE_LOG_DIRECTORY), \
+                   ACE_TEXT_ALWAYS_CHAR (ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR)), \
                    ".log"); \
-  ACE_DEBUG ((LM_DEBUG, "Deleting old log file %s (if any)\n\n", temp)); \
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Deleting old log file %C (if any)\n\n"), temp)); \
   ACE_OS::unlink (temp);
 
 
@@ -121,7 +121,7 @@ class ACE_Test_Output
 public:
   ACE_Test_Output (void);
   ~ACE_Test_Output (void);
-  int set_output (const char *filename, int append = 0);
+  int set_output (const ACE_TCHAR *filename, int append = 0);
   ofstream *output_file (void);
   void close (void);
 
@@ -140,14 +140,14 @@ ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 int
-ACE_Test_Output::set_output (const char *filename, int append)
+ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 {
   char temp[BUFSIZ];
   // Ignore the error value since the directory may already exist.
   ACE_OS::mkdir (ACE_LOG_DIRECTORY);
   ACE_OS::sprintf (temp, "%s%s%s",
-                   ACE_LOG_DIRECTORY,
-                   ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR),
+                   ACE_TEXT_ALWAYS_CHAR (ACE_LOG_DIRECTORY),
+                   ACE_TEXT_ALWAYS_CHAR (ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)),
                    ".log");
 
   this->output_file_.open (temp, ios::out | (append ? ios::app : ios::trunc));
@@ -180,7 +180,7 @@ randomize (int array[], size_t size)
   size_t i;
 
   for (i = 0; i < size; i++)
-    array [i] = i;
+    array [i] = static_cast<int> (i);
 
   ACE_OS::srand (ACE_OS::time (0L));
 
@@ -188,7 +188,8 @@ randomize (int array[], size_t size)
 
   for (i = 0; i < size; i++)
     {
-      int index = ACE_OS::rand() % size--;
+      int index = ACE_OS::rand() % static_cast<int> (size);
+      --size;
       int temp = array [index];
       array [index] = array [size];
       array [size] = temp;
diff --git a/AUTHORS b/AUTHORS
index b8223e0fa10..3e474e06cc0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,13 @@
 Douglas C. Schmidt 
-schmidt@uci.edu
+d.schmidt@vanderbilt.edu
 
-Associate Professor &
-Head of the Distributed Object Computing Laboratory
-
-616E Engineering Tower
-Department of Electrical and Computer Engineering
-University of California, Irvine
-Irvine, CA 92697-2625
+Professor of Computer Science
+Associate Chair of Computer Science and Engineering
+Department of Electrical Engineering and Computer Science  
+Senior Researcher at the Institute for Software Integrated Systems (ISIS)
+Vanderbilt University                        
+Nashville, TN 37203                          
 
+www.dre.vanderbilt.edu/~schmidt
+TEL: (615) 343-8197
+FAX: (615) 343-7440
diff --git a/COPYING b/COPYING
index 0862d5dca3a..0cc3d9cca79 100644
--- a/COPYING
+++ b/COPYING
@@ -1,81 +1,85 @@
-    _________________________________________________________________
+
+     _________________________________________________________________
    
-  Copyright and Licensing Information for ACE(TM), TAO(TM), and CIAO(TM)
+  Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and
+  CoSMIC(TM)
   
-   [1]ACE(TM), [2]TAO(TM) and [3]CIAO(TM) are copyrighted by [4]Douglas
-   C. Schmidt and his [5]research group at [6]Washington University,
-   [7]University of California, Irvine, and [8]Vanderbilt University
-   Copyright (c) 1993-2003, all rights reserved. Since ACE+TAO+CIAO are
-   open-source, free software, you are free to use, modify, copy, and
-   distribute--perpetually and irrevocably--the ACE+TAO+CIAO source code
+   [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-2005, all rights reserved. Since DOC software is
+   [10]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
-   ACE+TAO+CIAO.
+   include this copyright statement along with code built using DOC
+   software.
    
-   You can use ACE+TAO+CIAO in proprietary software and are under no
+   You can use DOC software in proprietary software and are under no
    obligation to redistribute any of your source code that is built using
-   ACE+TAO+CIAO. Note, however, that you may not do anything to the
-   ACE+TAO+CIAO code, such as copyrighting it yourself or claiming
-   authorship of the ACE+TAO+CIAO code, that will prevent ACE+TAO+CIAO
-   from being distributed freely using an open-source development model.
-   You needn't inform anyone that you're using ACE+TAO+CIAO in your
-   software, though we encourage you to let [9]us know so we can promote
-   your project in the [10]ACE+TAO+CIAO success stories..
+   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 [11]us know so we can promote your project in
+   the [12]DOC software success stories..
    
-   ACE+TAO+CIAO are provided as is with no warranties of any kind,
+   DOC software is provided as is with no warranties of any kind,
    including the warranties of design, merchantability, and fitness for a
    particular purpose, noninfringement, or arising from a course of
-   dealing, usage or trade practice. Moreover, ACE+TAO+CIAO are provided
+   dealing, usage or trade practice. Moreover, 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 [11]number of companies provide commercial support for
-   ACE and TAO, however. ACE, TAO and CIAO are Y2K-compliant, as long as
-   the underlying OS platform is Y2K-compliant.
+   enhancement. A [13]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.
    
    Washington University, UC Irvine, Vanderbilt University, their
    employees, and students shall have no liability with respect to the
-   infringement of copyrights, trade secrets or any patents by
-   ACE+TAO+CIAO or any part thereof. Moreover, in no event will
-   Washington University, UC Irvine, or Vanderbilt University, their
-   employees, or students be liable for any lost revenue or profits or
-   other special, indirect and consequential damages.
+   infringement of copyrights, trade secrets or any patents by DOC
+   software or any part thereof. Moreover, in no event will Washington
+   University, UC Irvine, or Vanderbilt University, their employees, or
+   students be liable for any lost revenue or profits or other special,
+   indirect and consequential damages.
    
-   The [12]ACE, [13]TAO and [14]CIAO web sites are maintained by the
-   [15]Center for Distributed Object Computing of Washington University
-   for the development of open-source software as part of the
-   [16]open-source software community. By submitting comments,
-   suggestions, code, code snippets, techniques (including that of
-   usage), and algorithms, submitters acknowledge that they have the
-   right to do so, that any such submissions are given freely and
-   unreservedly, and that they waive any claims to copyright or
-   ownership. In addition, submitters acknowledge that any such
-   submission might become part of the copyright maintained on the
-   overall body of code, which comprises the [17]ACE, [18]TAO and
-   [19]CIAO software. By making a submission, submitter agree to these
-   terms. Furthermore, submitters acknowledge that the incorporation or
-   modification of such submissions is entirely at the discretion of the
-   moderators of the open-source ACE+TAO+CIAO projects or their
-   designees.
+   The [14]ACE, [15]TAO, [16]CIAO, and [17]CoSMIC web sites are
+   maintained by the [18]DOC Group at the [19]Institute for Software
+   Integrated Systems (ISIS) and the [20]Center for Distributed Object
+   Computing of Washington University, St. Louis for the development of
+   open-source software as part of the [21]open-source software
+   community. By submitting comments, suggestions, code, code snippets,
+   techniques (including that of usage), and algorithms, submitters
+   acknowledge that they have the right to do so, that any such
+   submissions are given freely and unreservedly, and that they waive any
+   claims to copyright or ownership. In addition, submitters acknowledge
+   that any such submission might become part of the copyright maintained
+   on the overall body of code, which comprises the DOC software. By
+   making a submission, submitter agree to these terms. Furthermore,
+   submitters acknowledge that the incorporation or modification of such
+   submissions is entirely at the discretion of the moderators of the
+   open-source DOC software projects or their designees.
    
-   The names ACE(TM), TAO(TM), CIAO(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. Further, products or services derived from this
-   source may not be called ACE(TM), TAO(TM), or CIAO(TM) nor may the
-   name Washington University, UC Irvine, or Vanderbilt University appear
-   in their names, without express written permission from Washington
-   University, UC Irvine, and Vanderbilt University.
+   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. Further, products or services
+   derived from this source may not be called ACE(TM), TAO(TM), CIAO(TM),
+   or CoSMIC(TM) nor may the name Washington University, UC Irvine, or
+   Vanderbilt University appear in their names, without express written
+   permission from Washington University, UC Irvine, and Vanderbilt
+   University.
    
    If you have any suggestions, additions, comments, or questions, please
-   let [20]me know.
+   let [22]me know.
    
-   [21]Douglas C. Schmidt
+   [23]Douglas C. Schmidt
      _________________________________________________________________
    
-   Back to the [22]ACE home page.
+   Back to the [24]ACE home page.
    
    Last modified 21:26:22 CST 03 November 2003 
 
@@ -84,22 +88,24 @@ References
    1. http://www.cs.wustl.edu/~schmidt/ACE.html
    2. http://www.cs.wustl.edu/~schmidt/TAO.html
    3. http://www.dre.vanderbilt.edu/CIAO/
-   4. http://www.cs.wustl.edu/~schmidt/
-   5. http://www.cs.wustl.edu/~schmidt/ACE-members.html
-   6. http://www.wustl.edu/
-   7. http://www.uci.edu/
-   8. http://www.vanderbilt.edu/
-   9. mailto:doc_group@cs.wustl.edu
-  10. http://www.cs.wustl.edu/~schmidt/ACE-users.html
-  11. http://www.cs.wustl.edu/~schmidt/commercial-support.html
-  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.cs.wustl.edu/~schmidt/doc-center.html
-  16. http://www.opensource.org/
-  17. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html
-  18. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
-  19. http://www.dre.vanderbilt.edu/CIAO/
-  20. mailto:schmidt@cs.wustl.edu
-  21. http://www.cs.wustl.edu/~schmidt/
-  22. file://localhost/project/adaptive/.www-docs/ACE.html
+   4. http://www.dre.vanderbilt.edu/cosmic/
+   5. http://www.dre.vanderbilt.edu/~schmidt/
+   6. http://www.cs.wustl.edu/~schmidt/ACE-members.html
+   7. http://www.wustl.edu/
+   8. http://www.uci.edu/
+   9. http://www.vanderbilt.edu/
+  10. http://www.the-it-resource.com/Open-Source/Licenses.html
+  11. mailto:doc_group@cs.wustl.edu
+  12. http://www.cs.wustl.edu/~schmidt/ACE-users.html
+  13. http://www.cs.wustl.edu/~schmidt/commercial-support.html
+  14. http://www.cs.wustl.edu/~schmidt/ACE.html
+  15. http://www.cs.wustl.edu/~schmidt/TAO.html
+  16. http://www.dre.vanderbilt.edu/CIAO/
+  17. http://www.dre.vanderbilt.edu/cosmic/
+  18. http://www.dre.vanderbilt.edu/
+  19. http://www.isis.vanderbilt.edu/
+  20. http://www.cs.wustl.edu/~schmidt/doc-center.html
+  21. http://www.opensource.org/
+  22. mailto:d.schmidt@vanderbilt.edu
+  23. http://www.dre.vanderbilt.edu/~schmidt/
+  24. http://www.cs.wustl.edu/ACE.html
diff --git a/ChangeLog b/ChangeLog
index 42905a998bd..21277eb8419 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3111 +1,3361 @@
-Tue Sep 14 11:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Feb 15 18:10:56 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/Dynamic_Service.h:
-          Doxygen improvement
+	* m4/ace.m4:
 
-Tue Sep 14 10:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+	  Removed ACE_ENABLE_RMCAST macro.  Building RMCast library is now
+	  unconditional.
 
-        * include/makeinclude/platform_linux_icc.GNU:
-          Added support for the Intel 8.1 C++ Compiler
+Tue Feb 15 18:45:26 2005  Steve Huston  <shuston@riverace.com>
 
-Tue Sep 14 07:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+	* ace/POSIX_Asynch_IO.{h cpp}:
+	* ace/POSIX_Proactor.cpp: Fixed compile errors resulting from
+	  Proxy_Ptr changes, below.
 
-        * bin/msvc_static_order.lst:
-          Added TAO/orbsvcs/orbsvcs/CosNaming_Skel to the list of projects
-          to build first.
+Tue Feb 15 18:19:25 2005  Steve Huston  <shuston@riverace.com>
 
-Mon Sep 13 19:09:23 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+	* ace/Asynch_IO.{h cpp}:
+	* ace/Asynch_IO_Impl.h:
+	* ace/POSIX_Asynch_IO.{h cpp}:
+	* ace/POSIX_Proactor.{h cpp}:
+	* ace/Proactor.{h cpp}:
+	* ace/Proactor_Impl.h:
+	* ace/WIN32_Asynch_IO.{h cpp}:
+	* ace/WIN32_Proactor.{h cpp}: All methods that accepted an ACE_Handler
+	  below the user-accessed methods were changed to accept an
+	  ACE_Handler::Proxy_Ptr instead. The ACE_Handler class has a new
+	  Proxy_Ptr typedef which is an ACE_Refcounted_Auto_Ptr for
+	  a Proxy class. When an ACE_Handler is created, it allocates a
+	  Proxy to refer to itself. The Proxy carries a pointer to the
+	  ACE_Handler it proxies for in lower levels of the framework.
+	  When the ACE_Handler is destroyed, it clears the ACE_Handler
+	  pointer in the proxy.
+	  Any part of the framework that dispatches completions gets the
+	  ACE_Handler pointer from the proxy and only dispatches if the
+	  pointer is not 0. This allows ACE_Handlers to be deleted while
+	  operations may be outstanding, a previously vexing issue since one
+	  can never be sure how many operations are outstanding at any given
+	  time. The Proxy remains valid until all references to it are
+	  released.
 
-	* configure.ac:
-	* m4/config_h.m4:
+	* ace/config-win32-common.h: Removed NOMINMAX define. The min/max
+	  stuff is needed for MFC and CString classes and, since we require
+	  ACE includes to come before system includes, adding NOMINMAX in all
+	  cases makes life very hard for these users.
 
-	  Changed to use ACE_CHECK_HAS_FUNC([scandir]) and get rid of
-	  explicit definition, autoconf template macro, etc.
+	* ace/OS_NS_stdlib.cpp (mkstemp_emulation): Don't try the
+	  std::numeric_limits<char>::max() call if 'max' is a macro. Use the
+	  older hard-coded 127 instead.
 
-Mon Sep 13 20:33:25 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+Tue Feb 15 14:33:18 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-  	* ace/Select_Reactor_Base.cpp: Changed the
-	  ACE_Select_Reactor_Handler_Repository::open() method so that it
- 	  uses the generalized ACE::set_handle_limit() method to not lower
- 	  the handles, which caused problems for applications that want to
- 	  use small reactor sizes but not limit the number of handles in
- 	  the process.  Thanks to Eider Oliveira <eider at oliveira dot
- 	  gmail at com> for suggesting this.
+	* examples/RMCast/Send_Msg/Makefile.am:
+	* examples/TMCast/Member/Makefile.am:
 
-	* ace/ACE.cpp,
-	  ace/ACE.h: Generalized ACE::set_handle_limit() so
-	  it can be told not to lower the handle limit.
+	  Regenerated.
 
-Mon Sep 13 18:15:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+	* examples/RMCast/Send_Msg/Receiver.cpp:
+	* examples/RMCast/Send_Msg/Sender.cpp:
+	* examples/TMCast/Member/member.cpp:
 
-	* ACE_wrappers/m4/platform.m4:
+	  Changed <protocols/ace/*.h> to <ace/*.h> so headers are
+	  #included the same regardless of whether they're in the
+	  source tree or installed.
 
-	  Added new ACE_FUNC_IOCTL_ARGTYPES macro, used to set
-	  ACE_IOCTL_TYPE_ARG2.
+	* examples/TMCast/Member/Member.mpc:
 
-	* ACE_wrappers/ace/config-netbsd.h:
+	  Add exename definition so executable is actually built.
 
-	  Added ACE_IOCTL_TYPE_ARG2 definition.
+Tue Feb 15 16:15:28 2005  Steve Huston  <shuston@riverace.com>
 
-	* ACE_wrappers/ace/OS_NS_stropts.h:
-	* ACE_wrappers/ace/OS_NS_stropts.inl:
+	* examples/RMCast/Receiver.cpp:
+	* examples/RMCast/Sender.cpp:
+	* examples/TMCast/Member/member.cpp: Corrected location of includes
+	  after they moved.
 
-	  Added feature test macro ACE_IOCTL_TYPE_ARG2 (which defaults to
-	  int) so that ACE_OS::ioctl uses the same type as ::ioctl.  This
-	  help avoid sign extension problems on 64 bit platforms that use
-	  unsigned long.
+Tue Feb 15 13:34:42 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Mon Sep 13 15:52:04 2004  Dale Wilson  <wilson_d@ociweb.com>
+	* Makefile.am:
 
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-        * ace/TSS_T.cpp:
-          Bugzilla Bug 1542 TSS Leak revisited.
-          The goal is for each thread's TSS object to be
-          deleted at thread exit time, and for the TSS
-          key itself to be released when:
-            the last thread stops using it, or
-            the ACE_TSS<X> (if any) is deleted
-          which ever comes *last*.
+	  Move examples until after protocols in SUBDIRS.
 
-Mon Sep 13 14:56:53 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Tue Feb 15 13:32:15 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/RB_Tree.h (class ACE_RB_Tree):
-        * ace/RB_Tree.cpp:
+	* configure.ac:
 
-          Added a special constructor useful for providing a valid vtable
-          and allocator if the tree is reconstructed from shared
-          memory. Thanks to Lothar Werzinger for the patches.
+	  Configure moved RMCast and TMCast libraries.
 
-Mon Sep 13 12:49:22 2004  Steve Huston  <shuston@riverace.com>
+	* bin/MakeProjectCreator/config/rmcast.mpb:
 
-        * ace/config-aix-4.x.h: Alter the value of ACE_SIZEOF_WCHAR based
-          on whether or not __64BIT__ is set (4 if yes, 2 if no). See
-          /usr/include/sys/types.h for verification.
+	  Removed "requires += rmcast".  The RMCast library is now built
+	  unconditionally.
 
-        * apps/Gateway/Gateway/Connection_Handler.cpp: Add missing #include
-          "ace/OS_NS_string.h".
+	* bin/MakeProjectCreator/config/rmcast.mpb:
+	* bin/MakeProjectCreator/config/tmcast.mpb:
 
-Mon Sep 13 12:39:11 2004  Steve Huston  <shuston@riverace.com>
+	  Append $(ACE_ROOT)/protocols to includes.
 
-        * ace/DLL_Manager.cpp: Added explicit template instantiations for
-          Wed Sep  8 17:13:41 2004  Steve Huston  <shuston@riverace.com>
+Tue Feb 15 21:27:25 2005  Olli Savia  <ops@iki.fi>
 
-Mon Sep 13 06:50:46 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/config-lynxos.h:
+        * include/makeinclude/platform_lynxos.GNU:
+          Updated. Utilize new ACE_LYNXOS_* macros, removed some ancient
+          settings etc.
 
-        * bin/MakeProjectCreator/config/dslogadmin_serv.mpb:
+        * examples/APG/ThreadPools/LF_ThreadPool.cpp:
+        * examples/APG/ThreadPools/ThreadPool.cpp:
+          Replaced NULL with 0.
 
-          Changed to inherit from svc_utils.
+        * tests/Reactor_Dispatch_Order_Test.cpp:
+          Utilize new ACE_LYNXOS_* macros to differentiate LynxOS
+          versions.
 
-Mon Sep 13 12:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Feb 15 10:23:39 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * bin/msvc_static_order.lst:
-          Added TAO/orbsvcs/orbsvcs/CosNotification_Skel
+        * examples/Service_Configurator/Misc/Timer_Service.cpp (handle_close):
+          Make sure to cancel the timer when we're done.  Thanks to Scott
+          Z <sz@finsatconsulting.com> for reporting this.
 
-Mon Sep 13 10:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Feb 15 11:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * include/makeinclude/platform_linux_icc.GNU:
-          When using the 8.0 compiler, disable certain warnings about padding
+        * ace/ACE.h:
+        * ace/OS_NS_string.h:
+          Doxygen improvements
 
-Mon Sep 13 09:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Feb 15 11:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * include/makeinclude/platform_linux_icc.GNU:
-          The intel compiler on Itanium is called icc, not ecc anymore
+        * etc/ace_rmcast.doxygen:
+          Updated because of move of RMCast library
 
-Mon Sep 13 09:46:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Feb 14 20:19:35 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * ace/OS_NS_Thread.inl:
-          Fixed compile error in VxWorks specific code
+        * protocols/ace/RMCast/Socket.h (Socket):
 
-Mon Sep 13 09:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Export this class in the shared library case.  Addresses
+          link-time errors in MS Windows builds.
 
-        * ace/config-icc-common.h:
-          Added ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+Mon Feb 14 18:45:28 2005  Steve Huston  <shuston@riverace.com>
 
-Mon Sep 13 09:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * protocols/ace/RMCast/Acknowledge.{h cpp}:
+        * protocols/ace/RMCast/Link.h:
+        * protocols/ace/RMCast/Protocol.{h cpp}:
+        * protocols/ace/RMCast/Retransmit.{h cpp}:
+        * protocols/ace/RMCast/Simulator.{h cpp}:
+        * protocols/ace/RMCast/Socket.{h cpp}:
+        * protocols/ace/RMCast/Stack.{h cpp}:
+          Get RMCast's includes by #include "file.h", not
+          #include <ace/RMCast/file.h>.
 
-        * configure.ac:
-          Added ACE_CHECK_LACKS_HEADERS for wchar.h.
-
-Mon Sep 13 09:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Feb 14 18:24:19 2005  Steve Huston  <shuston@riverace.com>
 
-        * bin/msvc_static_order.lst:
-          Added TAO/orbsvcs/orbsvcs/CosNaming_Serv to the list of projects
-          to build first.
+        * ace/OS_TLI.inl: Added "namespace ACE_OS" around all the methods,
+          instead of prepending ACE_OS to the names. This continues some
+          similar changes, such as to OS_NS_signal.inl.
 
-Sun Sep 12 17:20:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * apps/JAWS3/jaws3/Asynch_IO.h:
+        * apps/JAWS3/jaws3/Asynch_IO_Helpers.h:
+        * apps/JAWS3/jaws3/Concurrency_T.h:
+        * apps/JAWS3/jaws3/Event_Dispatcher.h:
+        * apps/JAWS3/jaws3/Options.h:
+        * apps/JAWS3/jaws3/Reactive_IO.h:
+        * apps/JAWS3/jaws3/Reactive_IO_Helpers.h:
+        * apps/JAWS3/jaws3/Signal_Task.h:
+        * apps/JAWS3/jaws3/Synch_IO.h:
+          Removed #include "ace/OS.h", replacing with other #includes
+          as needed. If OS.h is included, some other OS_*.h files can get
+          pulled in and sometimes ends up tentatively defining structs in
+          ACE_OS's namespace. This can end up tripping HP-UX aCC. Not sure
+          why it's only aCC and not other compilers as well, but there it is.
+          Finally resolves some nagging compile errors on HP-UX.
 
-        * bin/MakeProjectCreator/config/rteventlogadmin.mpb
+        * apps/JAWS3/jaws3/Concurrency.cpp:
+        * apps/JAWS3/jaws3/IO.cpp: Add missing OS_NS_* defines
+          necessitated by no longer including OS.h.
 
-          Update *.mpb files to reflect new libraries.
+Mon Feb 14 17:36:43 2005  Steve Huston  <shuston@riverace.com>
 
-        * bin/MakeProjectCreator/config/dseventlogadmin.mpb
-        * bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb
-        * bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb
-        * bin/MakeProjectCreator/config/dslogadmin.mpb
-        * bin/MakeProjectCreator/config/dslogadmin_serv.mpb
-        * bin/MakeProjectCreator/config/dslogadmin_skel.mpb
-        * bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
-        * bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb
-        * bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb
+        * ace/ace.mwc: Removed RMCast and TMCast, since they're now under
+          protocols/ace.
 
-          Split Logging, Event Logging, and Notify Logging Services into
-          client stub, servant skeleton, and service implementation
-          libraries.
+        * ace/Makefile.am:
+        * protocols/ace/Makefile.am: Moved RMCast and TMCast entries from
+          the former to the latter.
+
+Mon Feb 14 17:03:11 2005  Steve Huston  <shuston@riverace.com>
+
+        * ace/RMCast/Acknowledge.cpp:
+        * ace/RMCast/Acknowledge.h:
+        * ace/RMCast/Agent.tar.bz2:
+        * ace/RMCast/Bits.h:
+        * ace/RMCast/Link.cpp:
+        * ace/RMCast/Link.h:
+        * ace/RMCast/Protocol.cpp:
+        * ace/RMCast/Protocol.h:
+        * ace/RMCast/RMCast.mpc:
+        * ace/RMCast/Retransmit.cpp:
+        * ace/RMCast/Retransmit.h:
+        * ace/RMCast/Simulator.cpp:
+        * ace/RMCast/Simulator.h:
+        * ace/RMCast/Socket.cpp:
+        * ace/RMCast/Socket.h:
+        * ace/RMCast/Stack.cpp:
+        * ace/RMCast/Stack.h:
+          Moved from ace/RMCast to protocols/ace/RMCast.
+
+        * ace/TMCast/ACE_TMCast.pc.in:
+        * ace/TMCast/Export.hpp:
+        * ace/TMCast/FaultDetector.hpp:
+        * ace/TMCast/Group.cpp:
+        * ace/TMCast/Group.hpp:
+        * ace/TMCast/GroupFwd.hpp:
+        * ace/TMCast/LinkListener.hpp:
+        * ace/TMCast/MTQueue.cpp:
+        * ace/TMCast/MTQueue.hpp:
+        * ace/TMCast/Makefile.am:
+        * ace/TMCast/Messaging.hpp:
+        * ace/TMCast/Protocol.cpp:
+        * ace/TMCast/Protocol.hpp:
+        * ace/TMCast/README:
+        * ace/TMCast/TMCast.mpc:
+        * ace/TMCast/TransactionController.hpp:
+          Moved from ace/TMCast to protocols/ace/TMCast.
+
+Mon Feb 14 21:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb:
-        * bin/MakeProjectCreator/config/event_serv.mpb
-        * bin/MakeProjectCreator/config/event_skel.mpb
+        * ace/Global_Macros.h:
+          Added !ACE_LACKS_DEPRECATED_MACROS around ACE_CLASS_IS_NAMESPACE,
+          ACE_CORBA_1, ACE_CORBA_2, and ACE_CORBA_3. We have a build where
+          ACE_LACKS_DEPRECATED_MACROS is defined and we can so easily make
+          sure these deprecated macros are not used anymore in the ACE/TAO
+          code, our users can just use these macros until x.5.1 has been
+          released, then these macros are on the list to be removed.
 
-          Updated dependencies.
+Mon Feb 14 23:08:52 2005  Olli Savia  <ops@iki.fi>
 
-        * bin/MakeProjectCreator/config/ec_use_typed_events_skel.mpb:
+        * include/makeinclude/platform_lynxos.GNU:
+          Added missing Id tag that somehow disappeared in
+          previous checkin.
 
-          Removed file, events skeleton w/typed events does not require
-          any additional dependencies.  They have been moved to _serv.
+Mon Feb 14 12:17:06 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Sun Sep 12 17:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/RMCast/Link.cpp:
 
-        * ace/Log_Msg.cpp (log):
-          In then handling of %Z replaced an ACE_NEW_RETURN with a
-          ACE_NEW_NORETURN, so that when allocation fails, we just do
-          a break instead of return. Seems this code was written before
-          the existence of ACE_NEW_NORETURN. This also fixes the crashing
-          of the Intel 8.0 C++ Compiler on Itanium on this file, no idea
-          why this caused a crash, that is one for Intel to sort out.
+          Include "ace/OS_NS_sys_socket.h" to pull in ACE_OS::connect()
+          prototype.
 
-Sat Sep 11 11:41:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/RMCast/Protocol.h:
 
-        * apps/Gateway/Peer/Peer.cpp:
-        * apps/Gateway/Peer/peerd.cpp:
-          Added missing includes to fix compile problems in Cygwin build
+          Include "ace/OS_NS_string.h" to pull in ACE_OS::memcpy()
+          prototype.
 
-Fri Sep 10 22:54:55 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Mon Feb 14 11:59:27 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
- 	* bin/MakeProjectCreator/config/ciao_server.mpb:
-        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb:
+        * ace/RMCast/Protocol.h (id):
+        * ace/RMCast/Protocol.cpp (id):
 
-          Added utils to the list of projects that are inherited.
+          Moved static constant initialization out of class declaration.
+          MSVC++ 6 cannot handle in-class static constant initialization.
+          Thanks to Chad Elliot for pointing the problem.
 
-Sat Sep 11 00:49:39 2004  Olli Savia  <ops@iki.fi>
+        * ace/RMCast/Link.cpp (recv):
 
-        * ace/IOStream.h:
-          Changed NULL to 0 to silence compile time warning.
+          Changed the "switch" expression to an "if/else" expression since
+          the actual values of the cases are no longer available to the
+          compiler when compiling this file.
 
-Fri Sep 10 15:39:22 2004  Steve Huston  <shuston@riverace.com>
+Mon Feb 14 20:37:56 2005  Olli Savia  <ops@iki.fi>
 
-        * ace/High_Res_Timer.{h inl cpp}: Added a new static method that
-          calculates the difference between two ACE_hrtime_t quantities.
-          Takes into account that the time counter may have wrapped around
-          between the start and end. Changed all time difference calculations
-          to use the new elapsed_hrtime() method.
+        * include/makeinclude/platform_lynxos.GNU:
 
-Fri Sep 10 13:53:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+          Removed LynxOS 2.5 leftovers.
+          Added definition of two new preprocessor macros
+          ACE_LYNXOS_MAJOR and ACE_LYNXOS_MINOR. These macros make
+          easier to maintain code that depend on LynxOS version.
 
-        * ace/Time_Value.h:
-        * ace/Time_Value.inl:
+Mon Feb 14 10:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-      Moved '#include "ace/Basic_Types.h"' from Time_Value.cpp to
-      Time_Value.h because it's needed there since ACE_UINT64 is
-      introduced (see below).
+        * Kokyu/DSRT_Dispatch_Item_T.h:
+        * ACEXML/common/InputSource.h:
+          Replaced ACE_EXPLICIT with explicit
 
-Thu Sep 09 18:29:17 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Mon Feb 14 01:22:19 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * ace/Time_Value.h (msec):
-        * ace/Time_Value.inl (msec):
+        * examples/RMCast/Send_Msg/Receiver.cpp:
 
-          Even though MSVC++ 6 supports 64 bit integers, it does not
-          support the "long long" syntax.  Instead it supports its own
-          "__int64" built-in type.  Use "ACE_UINT64" instead of "unsigned
-          long long".  Fixes syntax errors exhibited by MSVC++ 6.
+          Use "ACE_OS::memcmp()" instead of "std::memcmp()".  MSVC++ 6
+          doesn't place memcmp() in the "std" C++ namespace.
 
-Thu Sep  9 16:40:27 2004  Steve Huston  <shuston@riverace.com>
+Mon Feb 14 00:56:18 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * apps/Gateway/Gateway/Connection_Handler.cpp:
-        * apps/Gateway/Gateway/Connection_Handler_Connector.cpp:
-        * apps/Gateway/Gateway/File_Parser.{h cpp}:
-        * apps/Gateway/Gateway/Gateway.cpp:
-        * apps/Gateway/Gateway/gatewayd.cpp:
-        * apps/Gateway/Peer/Options.{h cpp}:
-        * apps/Gateway/Peer/Peer.{h cpp}: Narrow/wide char fixes.
+        * ace/RMCast/Acknowledge.cpp:
 
-        * apps/Gateway/Gateway/Options.h: Removed const char *connector_host()
-          method because it's not ever defined or referenced.
+          No need to include "ace/OS.h".  Include "ace/OS_NS_unistd.h"
+          instead.
 
-        * apps/Gateway/Peer/peer.mpc: New project definition.
+        * ace/RMCast/Protocol.h:
 
-Thu Sep  9 16:17:38 2004  Olli Savia  <ops@iki.fi>
+          Corrected friend declaration to use "struct" instead of "class"
+          since the friend type in question is actually struct.
 
-        * apps/JAWS3/jaws3/Templates.cpp:
-          Added explicit static template member instantiations.
+Mon Feb 14 00:41:11 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Thu Sep  9 05:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/RMCast/Bits.h:
 
-        * ace/OS_NS_unistd.cpp:
-          Implemented num_processors and num_processors_online for Cygwin
+          Added support for single-threaded configurations.
 
-Wed Sep  8 21:50:13 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * ace/RMCast/Link.cpp:
 
-        * ace/Time_Value.h:
-        * ace/Time_Value.inl:
+          Explicitly cast INADDR_ANY argument in ACE_INET_Addr constructor
+          call to ACE_UINT32.  Addresses constructor ambiguity issues
+          exhibited by some compilers.
 
-          The change added in this checkin
-
-          Wed Sep  8 10:17:46 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-          should not be available on platforms that lacks long long.
-
-Wed Sep  8 17:13:41 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/DLL_Manager.{h cpp}: Added new private method,
-          ACE_DLL_Handle::get_dll_names().
-          This builds the list of names to try to dlopen() based on the
-          specified dll_name and the platform's prefix/suffix/decorator
-          configuration. It doesn't try to load anything and doesn't do any
-          search path games like ACE::ldfind(). All of the rules for locating
-          files based on environments and security policy are administered by
-          the OS. This just feeds names to try, allowing for example, svc.conf
-          to continue simply specifying base names like "ACE". This restores
-          basic OS functionality, such as the ability to load a DLL from the
-          same directory as the loading executable, as well as closing
-          potential security loopholes opened by ACE's scanning the search
-          path and passing absolute paths to dlopen().
-          ACE_DLL_Handle::open() now calls get_dll_names() for a list of names
-          to try unless ACE_MUST_HELP_DLOPEN_SEARCH_PATH is defined, in which
-          case it does the old ACE::ldfind() call and dlopen()s the
-          absolute path as it did before this change.
-
-          This also allows DLLs to load on wide-char non-Windows builds without
-          messing with the sprintf() format specs in Lib_Find.cpp.
-
-Wed Sep  8 10:17:46 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Time_Value.{h,inl} Added a new msec() method that uses
-          unsigned long long to compute the value to prevent overflow.
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting this.
-
-Wed Sep  8 08:15:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * tests/FIFO_Test.cpp
-          Fixed one of the failing tests under HPUX requires delay like AIX
-
-Wed Sep  8 08:15:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * tests/IOStream_Test.cpp
-          Sorry, I got the wrong header file yesterday; isspace() is defined in
-          ace/os_include/os_ctype.h  NOT  #include ace/OS_NS_ctype.h
-
-Tue Sep  7 16:39:28 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/dseventlogadmin.mpb
-        * bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
-        * bin/MakeProjectCreator/config/lifecycle.mpb
-        * bin/MakeProjectCreator/config/notifytest.mpb
-        * bin/MakeProjectCreator/config/rtnotify.mpb
-        * bin/MakeProjectCreator/config/time.mpb
-
-          Update *.mpb files to reflect new libraries.  In many cases this
-          required adding inheriting from additional base projects, as
-          libraries were being linked in because of naming -- which was
-          once the service implementation (and thus pulled in lots of
-          other libraries) and is now just the Naming client stubs.
-
-        * bin/MakeProjectCreator/config/ec_use_typed_events.mpb
-        * bin/MakeProjectCreator/config/ec_use_typed_events_skel.mpb
-        * bin/MakeProjectCreator/config/event.mpb
-        * bin/MakeProjectCreator/config/event_serv.mpb
-        * bin/MakeProjectCreator/config/event_skel.mpb
-        * bin/MakeProjectCreator/config/naming.mpb
-        * bin/MakeProjectCreator/config/naming_serv.mpb
-        * bin/MakeProjectCreator/config/naming_skel.mpb
-        * bin/MakeProjectCreator/config/notification.mpb
-        * bin/MakeProjectCreator/config/notification_serv.mpb
-        * bin/MakeProjectCreator/config/notification_skel.mpb
-        * bin/MakeProjectCreator/config/trading.mpb
-        * bin/MakeProjectCreator/config/trading_serv.mpc
-        * bin/MakeProjectCreator/config/trading_skel.mpc
-
-          Split Event, Naming, Notification, and Trading Services into
-          client stub, servant skeleton, and service implementation
-          libraries.
+        * ace/RMCast/Protocol.h:
+        * ace/RMCast/Simulator.h:
+        * ace/RMCast/Socket.h:
 
-(not committed)  Steve Huston  <shuston@riverace.com>
+          Added missing #include directives now made necessary by header
+          reductions in "Bits.h".
 
-        * apps/JAWS/clients/Caching/http_handler.cpp:
-        * apps/JAWS/clients/Caching/http_client.cpp:
-        * apps/JAWS/server/IO.cpp: Add missing includes.
+Sun Feb 13 13:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Sep  7 15:45:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
+        * ace/Timer_Queue_Adapters.h:
+          Doxygen improvements
 
-        * examples/IOStream/server/iostream_server.cpp
-          getpid() from ace/OS_NS_unistd.h actually used in both halves of
-          #ifdef #else #endif guard so the conditional arround the #include
-          is actually wrong and so has been removed.
+Sun Feb 13 13:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/IOStream_Test.cpp
-          isspace() used without #include ace/OS_NS_ctype.h, added this to
-          the guarded section where it is used.
+        * ace/config-lite.h:
+          When the new define ACE_LACKS_DEPRECATED_MACROS is set, the
+          deprecated macros ACE_MUTABLE, ACE_EXPLICIT and
+          ACE_CONST_WHEN_MUTABLE are not defined making it easy to see
+          if we use these deprecated macros anywhere. These macros are
+          defined normally so for our users nothing changes
 
-Tue Sep  7 07:08:26 2004  Chad Elliott  <elliott_c@ociweb.com>
+        * ace/README:
+          Documented ACE_LACKS_DEPRECATED_MACROS
 
-        * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm:
+Sun Feb 13 07:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          As part of the -expand_env option, I moved some functionality out
-          of the ProjectCreator.pm and into this module which was only used
-          by this project creator.
+        * bin/tao_other_tests.lst:
+          Disabled the notify filter performance test under Irix, it hangs
+          forever
 
-Tue Sep  7 06:41:27 2004  Chad Elliott  <elliott_c@ociweb.com>
+        * ace/Asynch_IO.h:
+          Updated some method signatures so that they are exactly the same
+          as used in the implementation to resolve Doxygen warnings
 
-        * include/makeinclude/rules.local.GNU:
+        * ace/config-doxygen.h:
+          Added define of ACE_HAS_ICMP_SUPPORT to 1 so that icmp classes are
+          also parsed by doxygen
 
-          Removed the if check for static_libs_only.  The STATIC_LINK_FLAG
-          option will be added to the LDFLAGS if static_link is set to 1.
+Sat Feb 12 09:00:51 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Mon Sep  6 10:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * m4/ace.m4:
 
-        * ace/Sock_Connect.cpp:
-          When using VxWorks also include OS_NS_stdio.h
+          Rename ACE_WITH_{GL,FL,QT,TK} autoconf macros to ACE_PATH_{GL,
+          FL,QT,TK} to be consistant with standard naming conventions.
 
-Mon Sep  6 07:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sat Feb 12 01:00:25 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * ace/OS.h:
-          Removed include of sys/modem.h for HPUX, this is already done in
-          os_include/os_termios.h
+        * ace/RMCast/Protocol.h (Header):
 
-Fri Sep  3 15:53:19 2004  Steve Huston  <shuston@riverace.com>
+          Fixed "value computed is not used" warning exhibited by g++ 4.0
+          CVS snapshot.
 
-        * ace/config-sunos5.8.h: Added ACE_HAS_TIMEZONE. This may be
-          pertinent to previous Solaris versions, but I don't have any
-          to test on.
+        * ace/RMCast/RMCast.mpc:
+        * bin/MakeProjectCreator/config/rmcast.mpb:
 
-Fri Sep  3 12:34:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Require native C++ exception support.  The new reliable
+          multicast implementation currently requires it.
 
-        * ace/OS_NS_sys_mman.inl:
+Sat Feb 12 00:09:18 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Removed redundant conditional used to disable madvise for WIN32
-          systems.  Instead use ACE_LACKS_MADVISE feature test macro.
+        * ace/RMCast/Protocol.h:
 
-        * ace/config-win32-common.h:
+          Work around Borland C++ Builder 6 (or earlier) inability to deal
+          with default template parameters.  Thanks to Johnny for
+          suggesting a work-around.
 
-          Added ACE_LACKS_MADVISE definition.
+Fri Feb 11 21:39:04 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Fri Sep  3 15:10:22 2004  Steve Huston  <shuston@riverace.com>
+        * configure.ac:
 
-        * ace/config-aix-5.x.h: Add ACE_HAS_TIMEZONE.
+          Updated for new RMCast implementation.
 
-        * ace/OS_NS_time.h: Include "ace/OS_NS_errno.h" - ACE_NOTSUP_RETURN
-          sets errno.
+        * tests/Makefile.am:
 
-Fri Sep  3 21:36:51 2004  Olli Savia  <ops@iki.fi>
+          Removed RMCast from SUBDIRS.
 
-        * apps/drwho/File_Manager.cpp:
-          Use ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-          to check if explicit template instantiation is needed.
-          Thanks to Johnny Willemsen for informing me about this
-          macro.
+        * ace/RMCast/Makefile.am:
+        * examples/RMCast/Makefile.am:
+        * examples/RMCast/Send_Msg/Makefile.am:
 
-Fri Sep  3 20:02:20 2004  Olli Savia  <ops@iki.fi>
+          New files.
 
-        * ace/OS_NS_unistd.inl:
-          There is no need to check missing prototype since this has
-          already been taken care by os_unistd.h.
-
-        * ace/os_include/arpa/os_inet.h:
-        * ace/os_include/os_stdlib.h:
-        * ace/os_include/os_strings.h:
-        * ace/os_include/os_unistd.h:
-          To make things easier to maintain use new ACE_LACKS_xxx_PROTOTYPE
-          macros to check whether we need to declare missing function
-          prototype.
+Fri Feb 11 17:59:50 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/README:
-          Added new ACE_LACKS_xxx_PROTOTYPE macros
+        * ace/Makefile.am:
 
-        * ace/config-lynxos.h:
-          Modified to follow changes above.
+          Fix typo in pkgconfigdatadir definition.
 
-Fri Sep  3 19:35:48 2004  Olli Savia  <ops@iki.fi>
+Fri Feb 11 18:11:29 2005  Steve Huston  <shuston@riverace.com>
 
-        * ace/Log_Msg.h:
-          Removed broken macro redefinition code to prevent people
-          thinking that it actually works. Cleaned up #undef's.
+        * ace/Dev_Poll_Reactor.{h inl cpp}:
+          Comment out the check for epoll's proper Linux kernel version
+          based on linux/version.h. It's not always accurate. For example,
+          on Fedora Core 2 it says 2.4.20, yet the actual kernel is 2.6.5
+          and epoll_ctl works fine (apparantly).
 
-Fri Sep  3 19:30:18 2004  Olli Savia  <ops@iki.fi>
+          Removed the original reference counting scheme based on the
+          handler repository and implemented the ACE_Event_Handler-based
+          scheme used by the other reactors. Kept the
+          ACE_Dev_Poll_Handler_Guard class, though, as it is very nice.
+          Just changed some contents and added a release() method to make it
+          easier to work with the notify case since the refcount is incremented
+          when the handler is queued for notify and decremented after the
+          later upcall is done.
 
-        * ace/Global_Macros.h:
-          LynxOS no longer needs special macro handling.
+          (wakeup_all_threads): Removed the #if 0 block around the notify()
+          call. This works fine (and is necessary) for epoll-capable systems.
 
-Fri Sep  3 19:13:24 2004  Olli Savia  <ops@iki.fi>
+          (handle_events_i, dispatch): Moved the signal-dispatched detection
+          to handle_events_i() from dispatch() and allowed a dispatched signal
+          to count as a dispatched event instead of always causing a
+          -1/EINTR return.
 
-        * apps/drwho/File_Manager.cpp:
-          LynxOS 3.x needs explicit template instantiation.
+          (dispatch_io_events): Increment io_handlers_dispatched before
+          doing the upcall. Previously, it wouldn't get incremented if the
+          handler returned -1.
 
-Fri Sep  3 10:44:27 2004  Steve Huston  <shuston@riverace.com>
+        * ace/Reactor.cpp: Added the ability to specify ACE_Dev_Poll_Reactor
+          as the default reactor implementation by specifying
+          ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL in the config file.
 
-        * ace/Process_Manager.cpp (append_proc): If the process_table_ needs
-          to be enlarged, make sure it's to a size greater than 0. If the
-          original size is 0, change it to DEFAULT_SIZE, else double it (as
-          was always done).
-          (resize): Changed to not shrink the process_table_ array. Primarily
-          to guard against changing it to 0, but also guards against having to
-          decide what to do with entries that won't fit in the new array.
+        * tests/Dev_Poll_Reactor_Test.cpp: Ignore SIGPIPE, else if the
+          receiving side closes its handle first, the sending side will crash
+          on SIGPIPE. Make the Client shut down its reactor if handle_output()
+          fails. Else, the timer will never fire again and the test will hang.
 
-Fri Sep  3 07:43:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/MT_Reactor_Upcall_Test.cpp:
+        * tests/MT_Reference_Counted_Event_Handler_Test.cpp:
+        * tests/MT_Reference_Counted_Notify_Test.cpp: Added test for
+          ACE_Dev_Poll_Reactor using -d (defaults to 1) but only runs it
+          if ACE_HAS_EVENT_POLL is set.
+          For MT_Reference_Counted_Notify_Test, added checks to see that
+          the reference count actually gets incremented for the upcall.
 
-        * examples/DLL/test_dll.cpp:
-        * examples/Export/test.cpp:
-          Fixed for unicode builds
+Fri Feb 11 13:55:47 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Thu Sep  2 16:39:29 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * configure.ac:
+        * m4/config_h.m4:
 
-        * ace/config-linux-common.h:
-        * ace/config-netbsd.h:
+          Define ACE_HAS_ICMP_SUPPORT if host supports raw sockets.
+	  This fixes bugzilla id [2039].
 
-          Changed to define ACE_HAS_TIMEZONE.
+Fri Feb 11 21:33:37 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
+        * bin/make_release:
+          Don't perform crlf conversions on a .bz2 file during the release
+
+Fri Feb 11 08:43:04 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * ace/RMCast/Makefile.am:
+        * ace/RMCast/RMCast.cpp:
+        * ace/RMCast/RMCast.h:
+        * ace/RMCast/RMCast.rc:
+        * ace/RMCast/RMCast_Ack_Worker.cpp:
+        * ace/RMCast/RMCast_Ack_Worker.h:
+        * ace/RMCast/RMCast_Ack_Worker.i:
+        * ace/RMCast/RMCast_Copy_On_Write.cpp:
+        * ace/RMCast/RMCast_Copy_On_Write.h:
+        * ace/RMCast/RMCast_Copy_On_Write.i:
+        * ace/RMCast/RMCast_Export.h:
+        * ace/RMCast/RMCast_Fork.cpp:
+        * ace/RMCast/RMCast_Fork.h:
+        * ace/RMCast/RMCast_Fork.i:
+        * ace/RMCast/RMCast_Fragment.cpp:
+        * ace/RMCast/RMCast_Fragment.h:
+        * ace/RMCast/RMCast_Fragment.i:
+        * ace/RMCast/RMCast_IO_UDP.cpp:
+        * ace/RMCast/RMCast_IO_UDP.h:
+        * ace/RMCast/RMCast_IO_UDP.i:
+        * ace/RMCast/RMCast_Membership.cpp:
+        * ace/RMCast/RMCast_Membership.h:
+        * ace/RMCast/RMCast_Membership.i:
+        * ace/RMCast/RMCast_Module.cpp:
+        * ace/RMCast/RMCast_Module.h:
+        * ace/RMCast/RMCast_Module.i:
+        * ace/RMCast/RMCast_Module_Factory.cpp:
+        * ace/RMCast/RMCast_Module_Factory.h:
+        * ace/RMCast/RMCast_Partial_Message.cpp:
+        * ace/RMCast/RMCast_Partial_Message.h:
+        * ace/RMCast/RMCast_Partial_Message.i:
+        * ace/RMCast/RMCast_Proxy.cpp:
+        * ace/RMCast/RMCast_Proxy.h:
+        * ace/RMCast/RMCast_Proxy.i:
+        * ace/RMCast/RMCast_Reassembly.cpp:
+        * ace/RMCast/RMCast_Reassembly.h:
+        * ace/RMCast/RMCast_Receiver_Module.cpp:
+        * ace/RMCast/RMCast_Receiver_Module.h:
+        * ace/RMCast/RMCast_Receiver_Module.i:
+        * ace/RMCast/RMCast_Reliable_Factory.cpp:
+        * ace/RMCast/RMCast_Reliable_Factory.h:
+        * ace/RMCast/RMCast_Reliable_Factory.i:
+        * ace/RMCast/RMCast_Reordering.cpp:
+        * ace/RMCast/RMCast_Reordering.h:
+        * ace/RMCast/RMCast_Reordering.i:
+        * ace/RMCast/RMCast_Resend_Handler.cpp:
+        * ace/RMCast/RMCast_Resend_Handler.h:
+        * ace/RMCast/RMCast_Resend_Handler.i:
+        * ace/RMCast/RMCast_Resend_Worker.cpp:
+        * ace/RMCast/RMCast_Resend_Worker.h:
+        * ace/RMCast/RMCast_Resend_Worker.i:
+        * ace/RMCast/RMCast_Retransmission.cpp:
+        * ace/RMCast/RMCast_Retransmission.h:
+        * ace/RMCast/RMCast_Retransmission.i:
+        * ace/RMCast/RMCast_Sequencer.cpp:
+        * ace/RMCast/RMCast_Sequencer.h:
+        * ace/RMCast/RMCast_Sequencer.i:
+        * ace/RMCast/RMCast_Singleton_Factory.cpp:
+        * ace/RMCast/RMCast_Singleton_Factory.h:
+        * ace/RMCast/RMCast_Singleton_Factory.i:
+        * ace/RMCast/RMCast_UDP_Event_Handler.cpp:
+        * ace/RMCast/RMCast_UDP_Event_Handler.h:
+        * ace/RMCast/RMCast_UDP_Event_Handler.i:
+        * ace/RMCast/RMCast_UDP_Proxy.cpp:
+        * ace/RMCast/RMCast_UDP_Proxy.h:
+        * ace/RMCast/RMCast_UDP_Proxy.i:
+        * ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp:
+        * ace/RMCast/RMCast_UDP_Reliable_Receiver.h:
+        * ace/RMCast/RMCast_UDP_Reliable_Receiver.i:
+        * ace/RMCast/RMCast_UDP_Reliable_Sender.cpp:
+        * ace/RMCast/RMCast_UDP_Reliable_Sender.h:
+        * ace/RMCast/RMCast_UDP_Reliable_Sender.i:
+        * ace/RMCast/RMCast_Worker.cpp:
+        * ace/RMCast/RMCast_Worker.h:
+        * examples/RMCast/Makefile.am:
+        * examples/RMCast/Send_File/Makefile.am:
+        * examples/RMCast/Send_File/RMCast_Send_File.mpc:
+        * examples/RMCast/Send_File/Receiver.cpp:
+        * examples/RMCast/Send_File/Sender.cpp:
+        * tests/RMCast/Main.cpp:
+        * tests/RMCast/Makefile.am:
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Membership_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+        * tests/RMCast/RMCast_Reordering_Test.cpp:
+        * tests/RMCast/RMCast_Retransmission_Test.cpp:
+        * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp:
+        * tests/RMCast/acetest.mpb:
+        * tests/RMCast/tests.mpc:
+
+          Removed old ACE reliable multicast implementation.  It is not
+          maintained, and is now superseded by Boris's implementation
+          described below.
+
+        From Boris Kolpkacov <boris at kolpackov dot net>
+        * ace/RMCast/Acknowledge.cpp:
+        * ace/RMCast/Acknowledge.h:
+        * ace/RMCast/Agent.tar.bz2:
+        * ace/RMCast/Bits.h:
+        * ace/RMCast/Link.cpp:
+        * ace/RMCast/Link.h:
+        * ace/RMCast/Protocol.cpp:
+        * ace/RMCast/Protocol.h:
+        * ace/RMCast/RMCast.mpc:
+        * ace/RMCast/Retransmit.cpp:
+        * ace/RMCast/Retransmit.h:
+        * ace/RMCast/Simulator.cpp:
+        * ace/RMCast/Simulator.h:
+        * ace/RMCast/Socket.cpp:
+        * ace/RMCast/Socket.h:
+        * ace/RMCast/Stack.cpp:
+        * ace/RMCast/Stack.h:
+        * examples/RMCast/Send_Msg/Protocol.h:
+        * examples/RMCast/Send_Msg/README:
+        * examples/RMCast/Send_Msg/Receiver.cpp:
+        * examples/RMCast/Send_Msg/Send_Msg.mpc:
+        * examples/RMCast/Send_Msg/Sender.cpp:
+
+          New reliable source-ordered multicast protocol implementation
+          for message-oriented multi-sender group communication built on
+          top of IPv4 multicast.
+
+Fri Feb 11 16:01:37 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Thread_Pool_Reactor_Test.cpp:
+        * tests/Thread_Pool_Reactor_Resume_Test.cpp:
+
+          Scaled down the tests on VxWorks as for CHORUS to make them
+          runnable with default target kernel network parameters.
+
+Fri Feb 11 07:32:06 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/OS_NS_sys_time.h:
+        * ace/OS_NS_sys_time.inl:
         * ace/OS_NS_time.h:
+        * ace/Time_Value.h:
+        * ace/Time_Value.inl:
 
-          Changed ace_timezone() to use ACE_HAS_TIMEZONE feature test
-          macro instead of OS-specific macros to determine whether to
-          use global timezone variable or the gettimeofday() function
-          to obtain the current timezone.
+          Enhanced support for Release mode builds for EVC 4.
 
-        * configure.ac:
+Fri Feb 11 08:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Changed to call ACE_VAR_TIMEZONE.
+        * bin/generate_doxygen.pl:
+          Group all ciao projects together and get then the version from
+          the version file in the CIAO directory. This way with a release
+          the ciao documentation gets the correct version number
 
-        * m4/platform.m4:
+Fri Feb 11 08:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added new macro, ACE_VAR_TIMEZONE.  Sets new feature test macro
-          ACE_HAS_TIMEZONE if platform supports global timezone variable.
+        * include/makeinclude/outputdir.bor:
+          Don't use separate output directories for the output, this is
+          not used anymore after the switch to MPC.
 
-Thu Sep  2 16:43:29 2004  Steve Huston  <shuston@riverace.com>
+        * bin/MakeProjectCreator/templates/bor.mpd:
+          No need to set STATIC_DIR, DEBUG_DIR and UNICODE_DIR anymore
 
-        * m4/ace.m4: Added AM_CONDITIONAL for BUILD_EXCEPTIONS, BUILD_THREADS,
-          BUILD_ACE_CODECS, BUILD_ACE_FILECACHE, BUILD_ACE_OTHER,
-          BUILD_ACE_TOKEN, BUILD_ACE_UUID, BUILD_RWHO, BUILD_WFMO, and
-          BUILD_WINREGISTRY so the MPC 'requires' feature can properly weed
-          things out without configure- and build-time errors.
+        * include/makeinclude/recurse.bor:
+        * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm:
+          Removed usage of MAKE_FLAGS, was not set at all
 
-Thu Sep  2 12:51:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+Fri Feb 11 08:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Process_Manager_Test.cpp:
+        * bin/tao_orb_tests.lst:
+          Added !IRIX to the Bug_1361_Regression tests, it hangs forever on
+          Irix
 
-          Changed commandline buildup of childprocesses to start with './'
-          for non-WIN32 platforms as with other tests.
-          By default test did not run on OpenVMS without this.
+Thu Feb 10 07:04:33 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Sep  2 12:51:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+        * ACE version 5.4.4 released.
 
-        * ace/config-openvms.h:
+Thu Feb 10 02:51:19 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-          Added ACE_LACKS_UNIX_SIGNALS since OpenVMS cannot use signals
-          in combination with PTHREAD.
+        * Release: Added *.vcw files to the tar distribution.
 
-        * ace/Process.cpp:
-        * ace/Process_Manager.cpp:
+Thu Feb 10 08:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Implemented alternatives in timed wait() functions for systems
-          with ACE_LACKS_UNIX_SIGNALS and !WIN32.
+        * bin/make_release:
+          Don't do crlf conversion on .vsd files, that are Microsoft Visio
+          files which must be shipped unmodified
 
-Thu Sep  2 07:24:20 2004  Chad Elliott  <elliott_c@ociweb.com>
+Wed Feb  9 14:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/core.mpb:
-        * bin/MakeProjectCreator/templates/bor.mpd:
+        * bin/make_release:
+          Added the removal of the temporary file we create in the
+          old_versions_dir to check if we can write to that directory
 
-          Switch the borland template over to use the INSTALL_THIS_TARGET
-          template value instead of a 'verbatim' section to do the same
-          thing.
+Tue Feb  8 20:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Sep  2 09:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ACE-INSTALL.html:
+          Improved VxWorks description, committed on behalf of Martin Corino
 
-        * include/makeinclude/platform_gnuwin32_common.GNU:
-          With gcc 3.4.1 -mcpu is deprecated, but -mtune must be used
+Tue Feb  8 05:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Sep  2 07:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/tao_orb_tests.lst:
+          Disable the CodeSet test in the static builds
 
-        * apps/FaCE/FaCE.mpc:
-        * apps/FaCE/FaCENOACE.mpc:
-          Added missing Id tag
+Mon Feb  7 21:36:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-Wed Sep  1 17:16:29 2004  Steve Huston  <shuston@riverace.com>
+        * tests/run_test.pl:
 
-        * ace/Reverse_Lock_T.inl:
-        * ace/Typed_SV_Message.inl: Added #include "ace/config-all.h" to get
-          missing macros (ACE_NOTSUP_RETURN, ACE_TRACE).
+          Some improvements for autobuild testruns on VxWorks.
 
-        * apps/JAWS/clients/Caching/http_client.cpp:
-        * apps/JAWS/clients/Caching/http_handler.cpp:
-        * apps/JAWS/server/HTTP_Response.cpp:
-        * apps/JAWS/server/HTTP_Server.{h cpp}:
-        * apps/JAWS/server/IO.cpp:
-        * apps/JAWS3/jaws3/Task_Timer.cpp: Add missing includes.
+Mon Feb  7 15:19:40 2005  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Wed Sep  1 12:32:31 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * bin/tao_orb_tests.lst:
+          Added CodeSet test to the list. This should run on all platforms
+          except those using GIOP 1.0 explicitly.
 
-        * ace/OS_NS_Thread.inl (mutex_init):
+Mon Feb 7 14:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Explicitly cast the unused returned value of an
-          ACE_ADAPT_RETVAL macro call to "void" to address a "right-hand
-          operand of comma has no effect" warning exhibited by GNU g++
-          3.4.x.  Thanks to Bogdan Jeram <bjeram at eso dot org> and
-          Paul Lew <paullew@cisco.com> for reporting the warning.
+        * bin/make_release:
+          Added a test to check if the previous_version directory is
+          writeable for the user running this script
 
-Wed Sep  1 11:35:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Mon Feb  7 05:32:32 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * m4/config_h.m4:
+        * configure.ac:
 
-          Removed ACE_UINT64_FORMAT_SPECIFIER autoheader template.  It
-          is now defined within ACE_CHECK_FORMAT_SPECIFIERS.
+          Configure ACEXML makefiles if ACEXML directory exists.
 
-        * m4/platforms.m4:
+Mon Feb 7 13:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added new macro ACE_CHECK_FORMAT_SPECIFIERS, which is used to
-          define preprocessor macros that overide the defaults provided
-          for size_t, ssize_t, ACE_INT64, and ACE_UINT64 *printf format
-          specifiers.  I don't think autoconf feature tests are possible,
-          especially if we ever hope to support cross compilation, but at
-          least this pulls everything into one place.
+        * bin/tao_other_tests.lst:
+          After disabling a few test according to the logs already simple tests
+          do hang our system. This can't be true, so for the time being I
+          disabled all performance tests under windows and enabled the other
+          tests again.
 
-Wed Sep  1 12:52:40 2004  Chad Elliott  <elliott_c@ociweb.com>
+Mon Feb 7 12:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
+        * bin/tao_other_tests.lst:
+          Don't run the pluggable udp tests on win32
 
-          Split out the ACE specific portion of AutomakeWorkspaceCreator.pm
-          into a new helper module.  The helper module is dynamically loaded
-          in by the AutomakeWorkspaceCreator.
+Mon Feb 7 11:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Sep  1 10:01:57 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * bin/tao_other_tests.lst:
+          Also don't run the AMI Latency test on Win32
 
-        * ace/SOCK_Dgram_Bcast.cpp:
+Mon Feb 7 11:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_other_tests.lst:
+          Also don't run the Quoter example on Win32
 
-          Added !defined(__NetBSD__) to conditional so sockaddr.sa_len
-          version of the code will be used.  Fixes SOCK_Bcast_Dgram_Test
-          failures.
+Mon Feb 7 11:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Sock_Connect.cpp:
+        * bin/tao_other_tests.lst:
+          Also don't run the Loadbalancing example on Win32
 
-          Added !defined(__NetBSD__) to conditional so sockaddr.sa_len
-          version of the code will be used.
+Mon Feb 7 10:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Sep  1 12:40:28 2004  Steve Huston  <shuston@riverace.com>
+        * bin/tao_other_tests.lst:
+          Don't run the AMI Sequence_Latency performance-test under Windows,
+          it causes the system to crash. We will sort out this problem later but
+          we first need to get the other tests running on Windows to keep an
+          eye on the test results.
 
-        * ace/config-aix-4.x.h: Changed the ACE_HAS_3_PARAM_WCSTOK test to
-          include _XOPEN_SOURCE >= 500, not == 500. Fixes compile error
-          on AIX 5.2.
+Sun Feb 6 20:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Sep  1 12:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ACE-INSTALL.html:
+          Added SuSE Linux to the list of platforms supported by
+          Remedy IT
 
-        * ace/Dump_T.cpp:
-          Added include of config-all.h to get ACE_TRACE
+Sun Feb 6 10:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Sep  1 07:43:46 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+        * ace/Service_Object.cpp:
+        * ace/LSOCK_Stream.cpp:
+        * ace/Event_Handler.cpp:
+          Replaced c-style casts with C++ casts
 
-        * tests/Message_Queue_Notifications_Test.cpp (producer): Fixed
-          this test so it works with the changes to
-          ACE_Message_Queue::is_full_i() below.  Thanks to Rick Robinson
-          for this fix, as well.
+Sat Feb 5 20:12:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-        * ace/Message_Queue_T.inl: Changed the implementation of
-          is_full_i() so the comparision operator is >= rather than >,
-          which makes it possible to use a 0 high water mark to disable
-          the enqueue side of the queue.  Thanks to Rick Robinson
-          <rick@oyarsa.com> for reporting this.
+        * ace/OS_NS_Thread.cpp:
+        * ace/OS_NS_Thread.h:
+        * ace/OS_NS_Thread.inl:
 
-        * ace/POSIX_Proactor.h: Updated the documentation to use
-          the right names for ACE_POSIX_SIG_Proactor and
-          ACE_POSIX_AIOCB_Proactor.  Thanks to John D. Robertson
-          <john@rrci.com> for motivating this fix.
+          Fixed some flaws in TSS_Emulation tests for TSS key validity introduced
+          some 3 years ago when key reuse was enabled for TSS_Emulation.
 
-Wed Sep  1 07:00:39 2004  Chad Elliott  <elliott_c@ociweb.com>
+Sat Feb 5 15:17:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-        * bin/MakeProjectCreator/config/global.features:
+        * tests/run_test.pl:
 
-          Disable the wince feature setting.
+          Some improvements for autobuild testing with VxWorks.
 
-        * apps/FaCE/FaCE.mpc:
-        * apps/FaCE/FaCENOACE.mpc:
+        * tests/Reactor_Notify_Test.cpp:
+        * tests/Task_Ex_Test.cpp:
 
-          Adding mpc files to replace the vcp files.  These projects will
-          only build on wince so they require the wince feature which is
-          disabled by default.
+          Scaled down testparameters for VxWorks because otherwise the tests take too
+          long and are killed before having a chance to finish.
 
-        * apps/FaCE/FaCE.vcp:
-        * apps/FaCE/FaCE.vcw:
-        * apps/FaCE/FaCENOACE.vcp:
-        * apps/FaCE/FaCENOACE.vcw:
+Sat Feb 5 11:38:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-          Removed these files.
+        * tests/run_test.pl:
 
-Wed Sep  1 06:48:34 2004  Chad Elliott  <elliott_c@ociweb.com>
+          Added functionality to run and analyze ACE tests for VxWorks from the
+          autobuild process (depending on target features).
 
-        * examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc:
+        * tests/Multicast_Test.cpp:
 
-          With the current version of MPC, we must specify the exename for
-          this project.  MPC no longer automatically determines that
-          ACE_TMAIN is the entry point.
+          Fixed sloppy resource management (sockets) leading to problems on VxWorks.
 
-Wed Sep  1 10:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/TP_Reactor_Test.cpp:
 
-        * ace/config-hpux-11.00.h:
-          Added several new defines, these are gathered by comparing an
-          autoconf generated config.h and the original file. It seems HPUX
-          has much more stuff than we currently use. Everything is tested
-          on HPUX 11i v2, maybe it breaks older versions, I don't think so
-          but if it will, our daily builds will trigger this and we have
-          to make the defines than dependent on the HPUX version. Added are:
-          ACE_HAS_NEW_NO_H, ACE_HAS_AUTOMATIC_INIT_FINI,
-          ACE_HAS_LONG_MAP_FAILED, ACE_HAS_MEMCHR,
-          ACE_HAS_POSITION_INDEPENDENT_POINTERS, ACE_HAS_POSIX_GETPWNAM_R,
-          ACE_HAS_P_READ_WRITE, ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS,
-          ACE_LACKS_PRI_T, ACE_HAS_SIG_C_FUNC, ACE_HAS_SIGSUSPEND,
-          ACE_HAS_SOCKLEN_T, ACE_HAS_SYS_ERRLIST, ACE_HAS_VOIDPTR_MMAP,
-          ACE_HAS_VOIDPTR_SOCKOPT, ACE_HAS_GETRUSAGE_PROTOTYPE, ACE_HAS_TIMOD_H,
-          ACE_HAS_SYS_XTI_H, ACE_HAS_PTHREAD_RESUME_NP. If you don't agree to
-          one of these defines, let us know, then we also have some work on
-          the autoconf support, because autoconf gave info all these can be
-          setup.
+          Fixed compiletime test around pthread_sigmask() call so it now compiles
+          correctly for (non-WIN32) platforms having threads but no pthread_sigmask()
+          (f.i. VxWorks).
 
-Wed Sep  1 07:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sat Feb 4 11:32:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-        * ace/Synch_Options.cpp:
-        * ace/Shared_Object.cpp:
-        * ace/Read_Buffer.cpp:
-        * ace/SV_Message.inl:
-          Added include of config-all.h to get ACE_TRACE
+        * ace/OS_NS_time.inl:
 
-Tue Aug 31 12:18:01 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Made ACE_OS::gethrtime() for VxWorks always (also on PENTIUM) go through
+          clock_gettime() because the RDTSC somehow does not work correctly (all
+          HiResTime related tests fail) and clock_gettime() does.
 
-        * ace/config-netbsd.h:
+Fri Feb 4 14:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Moved ACE_HAS_PENTIUM into "defined(__i386__)" conditional.
+        * ace/Hashable.inl:
+          Replaced c-style cast with C++ const_cast
 
-Tue Aug 31 14:38:19 2004  Steve Huston  <shuston@riverace.com>
+Thu Feb  3 09:25:38 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/OS_NS_errno.h:
-        * ace/os_include/os_errno.h: Include config-lite.h instead of
-          config-all.h to minimize re-includes.
+        * bin/MakeProjectCreator/templates/gnu.mpd:
 
-        * ace/OS_NS_errno.inl: Include config-all.h to pick up ACE_TRACE.
+          Ensure that TAO_ROOT is set if it is a tao or a ciao project.
 
-Tue Aug 31 08:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Feb 3 12:43:37 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-hpux-11.00.h:
-          Added ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION for the HP aCC
-          compiler
+        * include/makeinclude/rules.local.GNU:
+          Added build rule for .rc files in a static build. Thanks to
+          Arto Jalkanen <ajalkane at gmail dot com> for reporting this.
 
-Tue Aug 31 08:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Feb 3 10:36:37 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_time.cpp:
-          When ACE_LACKS_NATIVE_STRPTIME is defined, include
-          os_include/os_ctype.h to get isdigit
+        * ace/config-win32-common.h:
+          Added ACE_LACKS_UNIX_SYSLOG
 
-Tue Aug 31 00:21:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
+          Only check for the ACE_LACKS_UNIX_SYSLOG define, not for ACE_WIN32.
+          Makes it a little easier to maintain and then this class is also
+          added to the doxygen documentation
 
-        * ace/config-unixware-7.1.0.h:
-        * ace/config-unixware-7.1.0.udk.h:
+Thu Feb 3 10:28:37 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed vestigial ACE_HAS_LAZY_V definition.
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+          Removed some empty lines and use the ?= operator to set TAO_ROOT
+          and CIAO_ROOT if they are not set yet, saves us a few lines in each
+          generated GNU makefile
 
-Tue Aug 31 00:17:45 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Feb 3 08:43:37 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-unixware-7.1.0.h:
-        * ace/config-unixware-7.1.0.udk.h:
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+          Only generate CIAO_ROOT when we are generating a project for CIAO
 
-          Removed vestigial ACE_HAS_IOMANIP_NO_H definition.
+Thu Feb 3 08:43:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-Mon Aug 30 23:57:58 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * test/Proactor_Test_IPV6.cpp:
 
-        * ace/config-netbsd.h:
-        * ace/config-unixware-7.1.0.h:
-        * ace/config-unixware-7.1.0.udk.h:
+          Fixed incorrect logfile name in cases where this test is unsupported
+          leading to falsely reported testfailures.
 
-          Removed vestigial ACE_HAS_SYS_IOCTL_H definition.  ACE now uses
-          ACE_LACKS_SYS_IOCTL_H.
+Wed Feb  2 15:25:39 2005  Steve Huston  <shuston@riverace.com>
 
-        * ace/config-integritySCA.h:
+        * ace/OS_NS_stdio.inl (vsprintf): Clarified the reason why ULONG_MAX
+          doesn't always work with vswprintf(). glibc (at least newer versions
+          such as 2.3) check the bounds of the buffer/size combination before
+          attempting the operation.
 
-          Removed vestigial ACE_LACKS_SYS_FILE_H definition.
+Wed Feb 02 08:57:23 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * ace/config-integritySCA.h:
-        * ace/config-psos-diab-mips.h:
-        * ace/config-qnx-neutrino.h:
-        * ace/config-rtp-62x.h:
-        * ace/config-rtp-pre62x.h:
+        * bin/make_release:
 
-          Removed vestigial ACE_LACKS_RPC_H definition.
+          Added some comments and removed some old comments.
 
-Mon Aug 30 23:47:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Wed Feb  2 08:46:51 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * configure.ac:
+        * bin/MakeProjectCreator/templates/gnu.mpd:
 
-          Added check for ACE_LACKS_TOWLOWER and ACE_LACKS_TOWUPPER.
+          Added an include of $(CIAO_ROOT)/rules.ciao.GNU if 'ciao' is set.
 
-Mon Aug 30 23:39:33 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Feb 01 16:12:43 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * configure.ac:
+        * bin/make_release:
 
-          Changed check for libc.h and osfcn.h to not export a feature
-          test macro definition, as the results are only needed within
-          the configure script itself.
+          A typo that created problems during tar ball creation. Removed
+          updates to the *version.mpb's too.
 
-Mon Aug 30 23:28:03 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Feb  1 19:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-macos.h:
-        * ace/config-macos-panther.h:
+        * include/makeinclude/platform_vxworks5.5.x.GNU:
+          Reverted part of the change Fri Jan 28 20:46:12 UTC 2005.
+          Set shared_libs to empty and static_libs to 1, because of the
+          change our static builds are broken, we will figure this out
+          when we have setup some shared builds.
 
-          Removed vestigial ACE_HAS_PTHREAD_CANCEL and ACE_HAS_PTHREAD_KILL
-          definitions.
+Tue Feb 1 14:33:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-Mon Aug 30 23:18:51 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * test/OS_Test.cpp:
 
-        * ace/config-linux-common.h:
-        * ace/config-openbsd.h:
+          Excluded rename test for VxWorks since this is only supported for a restricted
+          set of filesystem drivers.
 
-          Removed vestigial ACE_HAS_MKSTEMP definition.  ACE now uses
-          ACE_LACKS_MKSTEMP.
+Tue Feb 1 14:30:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-Mon Aug 30 22:39:24 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/OS_NS_time.inl:
 
-        * tests/TSS_Test.cpp:
+          Moved buflen check in ctime_r() to more global scope. This way
+          we always get required behaviour even if OS *with* buflen arg
+          behaves badly (i.e. VxWorks).
 
-          Changed the number of iterations from 100 to 25 so the test will
-          run on systems with pthreads with the minimum required number of
-          thread keys (128).  This should still be sufficient to check the
-          TSS wrappers without exceeding the minimum requirements.
+Tue Feb  1 13:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Aug 30 18:31:28 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/ace.mpc:
+        * ace/ace_flreactor.mpc:
+        * ace/ace_qtreactor.mpc:
+        * ace/ace_tkreactor.mpc:
+        * ace/ace_xtreactor.mpc:
+        * bin/MakeProjectCreator/config/aceexe.mpb:
+        * bin/MakeProjectCreator/config/acelib.mpb:
+        * bin/MakeProjectCreator/config/ciao_client.mpb:
+        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
+        * bin/MakeProjectCreator/config/taoexe.mpb:
+        * bin/MakeProjectCreator/config/taolib.mpb:
+          Removed version as base project. This will be removed because it
+          results in the fact that each generated GNU makefile will get the
+          version number generated. We want that the GNU make rules get the
+          version number from Version.h
+
+        * bin/MakeProjectCreator/config/aceversion.mpb:
+        * bin/MakeProjectCreator/config/ciaoversion.mpb:
+        * bin/MakeProjectCreator/config/taoversion.mpb:
+          Removed these files.
 
-        * ace/config-netbsd.h:
+Tue Feb 1 12:42:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-          Add ACE_SSIZE_T_FORMAT_SPECIFIER and ACE_SIZE_T_FORMAT_SPECIFIER
-          definitions for NetBSD/amd64.
+        * tests/Dirent_Test.cpp:
 
-        * netsvcs/clients/Logger/Makefile.am:
-        * netsvcs/clients/Naming/Client/Makefile.am:
-        * netsvcs/clients/Naming/Dump_Restore/Makefile.am:
-        * netsvcs/servers/Makefile.am:
+          Fixed directory recursion test for VxWorks where chdir() only
+          accepts full paths.
 
-          Fix the _LDADD definitions that MPC doesn't get right yet.
+Tue Feb  1 11:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * configure.ac:
+        * bin/ace_tests.lst:
+          Added !VxWorks for the WFMO_Reactor tests. The perl script for those
+          tests detects windows or not, but with VxWorks we are using Windows
+          as host, but do a cross environment test. This prevents us from
+          running these tests on a VxWorks target.
 
-          Added checks for: ACE_LACKS_STRCHR, ACE_LACKS_STRCSPN,
-          ACE_LACKS_STRERROR, ACE_LACKS_STRPBRK, ACE_LACKS_STRSPN,
-          ACE_LACKS_STRTOD, ACE_LACKS_STRTOL, ACE_LACKS_STRTOUL,
-          and ACE_LACKS_SWAB.
+Mon Jan 31 20:48:04 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Added check for ACE_HAS_STRNLEN.
+        * tests/Proactor_Test.cpp (TestData):
+        * tests/Proactor_Test_IPV6.cpp (TestData):
 
-          Added checks for: ACE_LACKS_ARPA_INET_H, ACE_LACKS_DIRENT_H,
-          ACE_LACKS_DLFCN_H, ACE_LACKS_ERRNO_H ACE_LACKS_FCNTL_H,
-          ACE_LACKS_NET_IF_H, ACE_LACKS_NETDB_H, ACE_LACKS_NETINET_IN_H,
-          ACE_LACKS_SEARCH_H, ACE_LACKS_SEMAPHORE_H, ACE_LACKS_SIGNAL_H,
-          ACE_LACKS_STDLIB_H, ACE_LACKS_STRING_H, ACE_LACKS_STRINGS_H,
-          ACE_LACKS_SYS_IOCTL_H, ACE_LACKS_SYS_IPC_H, ACE_LACKS_SYS_MMAN_H,
-          ACE_LACKS_SYS_RESOURCE_H, ACE_LACKS_SYS_SEM_H, ACE_LACKS_SYS_SHM_H,
-          ACE_LACKS_SYS_SOCKET_H, ACE_LACKS_SYS_STAT_H, ACE_LACKS_SYS_TIME_H,
-          ACE_LACKS_SYS_UN_H, ACE_LACKS_SYS_WAIT_H, ACE_LACKS_TERMIOS_H, and
-          ACE_LACKS_TIME_H.
+          Name the nested/local structure declared in this class to
+          workaround MSVC++ complaints about required compiler generated
+          default constructors for unnamed classes.
 
-          Removed checks for ACE_HAS_SYS_IOCTL_H.
+Mon Jan 31 13:37:48 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-Mon Aug 30 17:38:22 2004  Steve Huston  <shuston@riverace.com>
+        * ace/Acceptor.cpp (handle_close): Fixed the code so that it
+          closes down properly.  Thanks to Kobi Cohen-Arazi
+          <kobi dot cohenarazi at gmail dot com> for this fix.
 
-        Changes that get PocketPC/WinCE back into a state where they build.
+Mon Jan 31 11:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-WinCE.h: Add ACE_LACKS_ASSERT_H, ACE_LACKS_SEARCH_H,
-          and ACE_LACKS_WCHAR_H for WinCE 3.
-          Add ACE_LACKS_SWAB for all versions.
+        * ace/Service_Config.h:
+          Doxygen improvements
 
-        * ace/config-win32-msvc.h: Set (or clear) ACE_LACKS_RTTI based on
-          whether or not the compiler switch to enable rtti is used.
+Mon Jan 31 10:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_Errno.{h inl}:
-        * ace/OS_NS_errno.{h inl}: Moved ACE_CE_Errno from OS_Errno to
-          OS_NS_errno. This seems like a more sensible place for an errno
-          replacement, and avoids having to add includes for OS_Errno.h to
-          a bunch of other files.
+        * netsvcs/clients/Naming/Client/Client_Test.cpp:
+          Fixed compile warning in wchar build
 
-        * ace/OS_NS_stdio.inl (rename): In the char* variant, always convert
-          the names to wide-char for WinCE.
+Mon Jan 31 10:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_stdlib.{h cpp inl}: Don't attempt ACE_OS::realpath() for
-          ACE_HAS_WINCE. It has no native support and there's no
-          ACE_OS::getcwd() to fake it with.
+        * ASNMP/agent/agent.mpc:
+          Added avoids += uses_wchar, the code can't be build with wchar
+          enabled
 
-        * ace/OS_NS_stropts.{h cpp}: The 9-arg version of ACE_OS::ioctl is
-          ok for WinCE, but the ACE_QoS one is disabled. Changed both files
-          to implement this. They were mismatched for CE.
+Mon Jan 31 09:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_sys_select.inl: Replace #include ace/os_include/os_errno.h
-          with ace/OS_NS_errno.h to pick up errno correctly across all
-          platforms.
+        * ace/ARGV.h:
+        * ace/Configuration.h:
+          Doxygen improvements
 
-        * ace/OS_NS_sys_socket.cpp: Moved #endif closing #ifndef ACE_HAS_WINCE
-          to encompass join_leaf() to match what's done in the class decl.
+Mon Jan 31 08:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_sys_stat.inl (mkdir, stat): Added #include
-          "ace/OS_NS_macros.h" to get ACE_ADAPT_RETVAL.
-          For the char* mkdir() and stat(), CE needs to convert
-          the strings to wide-char.
+        * examples/APG/Logging/Trace_Return.cpp:
+        * apps/JAWS/clients/Caching/http_client.cpp:
+          Fixed unicode errors
 
-        * ace/OS_NS_time.h: Moved the day_of_week and month_name const
-          strings into the ACE_OS namespace, as OS_NS_time.cpp desires.
+        * apps/mkcsregdb/mkcsregdb.mpc:
+        * ASNMP/examples/walk/walk.mpc:
+        * ASNMP/examples/trap/trap.mpc:
+        * ASNMP/examples/set/set.mpc:
+        * ASNMP/examples/next/next.mpc:
+        * ASNMP/examples/get/get.mpc:
+          Added avoids += uses_wchar, the code can't be build with wchar
+          enabled
 
-        * ace/OS_NS_time.cpp: Removed the MT-only compile block around the
-          day_of_week and month_name arrays. As suspected by Don Hinton,
-          this is an incorrect condition.
-          Also added #include "ace/OS_NS_stdio.h" for ACE_HAS_WINCE, as the
-          ctime_r emulation needs it.
+Mon Jan 31 08:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_unistd.inl (unlink): Convert path to wide-char for WinCE.
-          (rmdir): RemoveDirectory() takes only 1 arg.
-          wide-char getcwd() is a NOTSUP for WinCE, as is the char* version.
+        * examples/APG/Reactor/Timers.cpp:
+          Fixed unicode link errors
 
-        * ace/Proactor.cpp: Add #include "ace/config-lite.h" since the
-          user config is needed to decide whether to compile this file.
-          Also remove 'tv' param name from the stubbed-out version of
-          run_event_loop(ACE_Time_Value&).
+Mon Jan 31 07:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Aug 30 16:24:51 2004  Steve Huston  <shuston@riverace.com>
+        * ace/ace_wchar.h:
+          Added ACE_TEXT_OutputDebugString
 
-        * NEWS: Noted that the wide-char stuff is done and autoconf is in
-          progress.
+        * examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp:
+          Use ACE_TEXT_OutputDebugString instead of ::OutputDebugString
+          to fix compile errors in wchar builds
 
-Mon Aug 30 11:54:01 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Sun Jan 30 08:46:56 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * bin/MakeProjectCreator/config/security.mpb:
+        * ace/Filecache.cpp:
 
-          Added missing "interceptors" and "corba_messaging" base
-          projects.
+          Added missing "template<>" to explicit class member
+          specializations, as required by the C++ standard.
 
-        * bin/MakeProjectCreator/config/ssliop.mpb:
+Sun Jan 30 13:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added missing "interceptors" base project.
+        * examples/IOStream/client/iostream_client.cpp:
+          Fixed unicode compile warning
 
-Mon Aug 30 13:02:22 2004  Steve Huston  <shuston@riverace.com>
+Sun Jan 30 13:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Basic_Types.h: Don't use sizeof() when defining ACE_SIZEOF_WCHAR.
-          Other code (e.g. ACEXML) in ACE uses ACE_SIZEOF_WCHAR in
-          preprocessor tests, so it needs to be a preprocessor constant.
-          If the config file doesn't set it, and on an XPG4 system, set
-          the size to 4. If it's wrong, Basic_Types_Test will catch it.
+        * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp:
+          Use ACE_OS::strncpy instead of strncpy directly to fix compile
+          error in Cygwin build
 
-        * tests/Basic_Types_Test.cpp: Remove the comment that says the check
-          for ACE_SIZEOF_WCHAR is pointless. It's now important.
+Sun Jan 30 13:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Aug 30 10:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * examples/ASX/CCM_App/CCM_App.cpp:
+          Fixed warning in unicode build
 
-        * bin/MakeProjectCreator/config/amh.mpb:
-        * bin/MakeProjectCreator/config/ami.mpb:
-          Both use idlflags, so add taoidldefaults as base project
+        * ace/Service_Object.h:
+          Doxygen fixes
 
-Mon Aug 30 06:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sun Jan 30 13:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/amh.mpb:
-          AMH is dependent on messaging and doesn't require ami
+        * examples/APG/Logging/Wrap_Macros.cpp:
+          Fixed compile problem in unicode build
 
-Sun Aug 29 16:53:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+Sun Jan 30 13:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-linux-common.h:
+        * examples/APG/Reactor/Timers.cpp:
+          Fixed compile problem in unicode build
 
-        Added '__GLIBC_MINOR__ < 2' test for setting ACE_POLL_IS_BROKEN
-        on Alpha platform.
+Sun Jan 30 13:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Aug 27 11:40:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * examples/TMCast/Member/member.cpp:
+          Fixed compile problem in unicode build
 
-        * bin/MakeProjectCreator/ftrtevent.mpb:
-        * bin/MakeProjectCreator/portablegroup.mpb:
+Sun Jan 30 13:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Changed to inherit from messaging.mpb.
+        * ACE-INSTALL.html:
+        * include/makeinclude/*.bor:
+        * bin/MakeProjectCreator/templates/bor.mpd:
+          Removed support for PASCAL, this was used for BCB4 which is already
+          not supported already for a long time
 
-        * bin/MakeProjectCreator/rtsched.mpb:
+Sat Jan 29 23:55:03 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Changed to inherit from svc_utils.mpb.
+        * examples/Misc/test_read_buffer.cpp:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i:
+        * examples/Web_Crawler/URL.h:
 
-Fri Aug 27 13:38:25 2004  Steve Huston  <shuston@riverace.com>
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
 
-        * netsvcs/clients/Naming/Client/Client_Test.cpp:
-        * netsvcs/clients/Naming/Client/main.cpp:
-        * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.{h cpp}:
-        * netsvcs/clients/Naming/Dump_Restore/main.cpp:
-        * netsvcs/servers/main.cpp:
-        * websvcs/lib/URL_Addr.cpp: Fix wide-char errors.
+Sat Jan 29 23:44:37 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Fri Aug 27 12:01:37 2004  Steve Huston  <shuston@riverace.com>
+        * examples/ASX/Event_Server/Event_Server/event_server.cpp:
+        * examples/ASX/Event_Server/Transceiver/transceiver.cpp:
+        * examples/ASX/UPIPE_Event_Server/event_server.cpp:
 
-        * netsvcs/lib/Client_Logging_Handler.cpp:
-        * netsvcs/lib/Log_Message_Receiver.{h cpp}:
-        * netsvcs/lib/Name_Handler.{h cpp}:
-        * netsvcs/lib/Server_Logging_Handler_T.{h cpp}:
-        * netsvcs/lib/TS_Server_Handler.{h cpp}:
-        * netsvcs/lib/TS_Clerk_Handler.{h cpp}: Correct Service Configurator
-          framework entrypoints (init(), etc.) to match ACE_TCHAR* instead of
-          char*. Also corrected char-width problems and naked text literals.
+          Added missing "ace/OS_NS_unistd.h" include directives.  Fixes
+          compile-time errors related to missing function prototypes.
 
-        * ACEXML/parser/parser/Parser.cpp: Fixed uninitialized variable.
+Sat Jan 29 11:12:58 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Fri Aug 27 08:18:21 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * examples/OS/Process/process.cpp:
 
-        * bin/footprint_stats.sh:
+        Fixed compile errors due to (now) missing includes because of include
+        reductions done to Service_Config.h and Svc_Handler.h.
 
-          Fixed the path to the libraries. Thanks to Johnny for spotting
-          the error in the scoreboard.
+Sat Jan 29 16:12:37 2005  Martin Corino  <mcorino@remedy.nl>
 
-Fri Aug 27 10:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * apps/Gateway/Gateway/gatewayd.cpp:
+        * examples/APG/Svc_Config/HA_Status_Static.h:
+        * examples/ASX/CCM_App/SC_Server.cpp:
+        * examples/Connection/blocking/SPIPE-acceptor.h:
+        * examples/Connection/blocking/SPIPE-connector.h:
+        * examples/Connection/misc/test_upipe.h:
+        * examples/Reactor/FIFO/server.cpp:
+        * examples/Reactor/Misc/notification.cpp:
+        * examples/Reactor/Misc/test_demuxing.cpp:
+        * examples/Reactor/Misc/test_signals_1.cpp:
+        * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h:
+        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h:
+        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h:
+        * examples/Service_Configurator/IPC-tests/server/server_test.cpp:
+        * examples/Service_Configurator/Misc/Timer_Service.h:
+        * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp:
+        * tests/Logging_Strategy_Test.cpp:
+        * tests/Service_Config_Test.cpp:
 
-        * bin/MakeProjectCreator/config/security.mpb:
-          Security library uses valuetype, so added valuetype as base
-          project.
+        Fixed compile errors due to (now) missing includes because of include
+        reductions done to Service_Config.h and Svc_Handler.h.
 
-Fri Aug 27 09:48:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sat Jan 29 00:39:37 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.{h,cpp}:
-        * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp:
-          Fixed unicode build errors
+        * m4/ace.m4:
 
-Fri Aug 27 09:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Change --with-{acexml,qos,rmcast,ssl} to --enable-{acexml,qos,
+          rmcast,ssl} to be consistant with standard autoconf conventions.
+          This also paves the way for a *new* --with-ssl flag to point to
+          the openssl install directory.
 
-        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.{h,cpp,i}:
-        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.{h,cpp,i}:
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.{h,cpp}:
-          Fixed unicode build errors
+Fri Jan 28 20:30:02 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Fri Aug 27 09:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Configuration.h:
 
-        * bin/MakeProjectCreator/config/loadbalancing.mpb:
-          Loadbalancing uses iorinterceptor, so added that as base
+          Include "ace/SStringfwd.h" instead of "ace/SString.h".  Forward
+          declarations of ACE's string types are enough.  Reduces
+          interheader dependencies and also reduces ACE's footprint
+          slightly.
 
-Fri Aug 27 08:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Configuration.cpp:
+        * ace/Local_Name_Space.cpp
+        * ace/Remote_Name_Space.cpp:
+        * ace/Service_Config.cpp:
 
-        Integrated ORTrefactor_2 branch into main. Previously the PortableServer
-        library was dependent on IORInterceptor, ObjRefTemplate and Valuetype,
-        this dependency has been removed. PortableServer doesn't use these libs
-        anymore, but IORInterceptor, ObjRefTemplate and Valuetype are now
-        dependent on PortableServer. This will reduce the size of corba servers
-        which don't use IORInterceptor, ObjRefTemplate and Valuetype.
+          Include "ace/SString.h" since to pull in complete ACE string
+          class declarations, since the corresponding header only has
+          forward declarations of those string classes.
 
-        This are the needed MPC changes. Without MPC this would have been a
-        hard job to change all makefiles by hand.
+        * ace/Filecache.cpp:
+        * ace/Filecache.h:
 
-        Fri Aug 20 13:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Removed alternatives to C++ template specializations in these
+          files.  All platforms supported by ACE support standard C++
+          explicit/full specialization of classes and their members.
 
-                * bin/MakeProjectCreator/config/portableserver.mpb:
-                * tao/PortableServer.mpc:
-                  PortableServer is not dependent on ValueType anymore, so removed it
-                  as base project
+        * ace/Local_Name_Space.h:
+        * ace/Remote_Name_Space.h:
 
-        Fri Aug 20 11:47:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Forward declare ACE_NS_WString instead of including
+          "ace/SString.h".  The former is all that is needed.
 
-                * bin/MakeProjectCreator/config/iorinterceptor.mpb:
-                  When using iorinterceptor use portableserver and objreftemplate
+        * ace/Name_Proxy.h:
 
-                * bin/MakeProjectCreator/config/objreftemplate.mpb:
-                  When using objreftemplate, you must use portableserver
+          Include "ace/Event_Handler.h" to pull in complete
+          ACE_Event_Handler class declaration.  Necessitated by include
+          directive reductions in ace/Service_Config.h.
 
-                * bin/MakeProjectCreator/config/portableserver.mpb:
-                  When using portableserver there is no need to use objreftemplate and
-                  iorinterceptor
+        * ace/Process.h:
+        * ace/Time_Request_Reply.h:
+        * ace/Token_Collection.h:
 
-Fri Aug 27 07:40:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          Removed "ace/SString.h" include directive.  It isn't needed.
 
-        * ace/ace_wchar.h:
+        * ace/Service_Config.h:
 
-        Fixed for broken OpenVMS build because of missing <cwchar>
-        and <cwctype> includes.
+          Include "ace/SStringfwd.h" instead of "ace/SString.h".  Forward
+          declarations of ACE's string types are enough.  Reduces
+          interheader dependencies and also reduces ACE's footprint
+          slightly.
 
-Thu Aug 26 19:55:03 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Forward declare ACE_XML_Svc_Conf class instead of include
+          "ace/XML_Svc_Conf.h".  The former is all that is needed.
 
-        * ace/Makefile.am:
+          Removed "ace/Reactor.h" and "ace/Svc_Conf_Tokens.h" include
+          directives.  They haven't been needed for quite some time.
 
-          Fixed thinko in last change.  CVS and .svn directories *and*
-          their contents must be pruned in install-local-data target.
+        * ace/Svc_Handler.h:
 
-Thu Aug 26 19:37:10 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          No need to include "ace/Service_Config.h".  "ace/Reactor.h" is
+          enough.
 
-        * ace/Makefile.am:
+        * netsvcs/clients/Naming/Client/Client_Test.cpp:
+        * netsvcs/clients/Naming/Client/main.cpp:
+        * protocols/ace/HTBP/HTBP_Channel.cpp:
 
-          Changed dist-hook and install-local-data targets to skip .svn as
-          well as CVS directories to support subversion.
+          Include "ace/Reactor.h" to pull in complete ACE_Reactor class
+          declaration.
 
-Thu Aug 26 19:22:31 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Fri Jan 28 16:02:28 2005  Steve Huston  <shuston@riverace.com>
 
-        * ace/Makefile.am:
+        * tests/Proactor_Test.cpp:
+        * tests/Proactor_Test_IPV6.cpp: Fixed compile diagnostics.
 
-          Added If_Then_Else.h to HEADER_FILES.
+Fri Jan 28 20:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug 26 11:53:26 2004  Steve Huston  <shuston@riverace.com>
+        * include/makeinclude/platform_vxworks5.5.x.GNU:
+          Applied some changes from  Thomas Lockhart
+          <Thomas dot Lockhart at jpl dot nasa dot gov>:
+          - set versioned_so to 0, VxWorks doesn't support this
+          - set shared_libs to 0, by default we build staticly, but this
+            can be overridden by our users. For dynamic builds Thomas
+            supplied more fixes but we have to test some more before adding
+            those.
+          - added some more notes
+          - removed remark of Tornado 1.0, it is not usable anymore
 
-        * ace/Time_Value.h: Added extern "C++" around the ACE_Time_Value class
-          declaration for WinCE. This is a total hack that I hate, but I have
-          not been able to find any other way around it. The same code
-          worked before the great ACE_OS reorg, but I don't know what tickled
-          it to start misbehaving. Without the hack, eVC complains that
-          the operators are C functions and so can't return a class.
+Fri Jan 28 14:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Dev_Poll_Reactor.{cpp h}: Inserted /**/ in #include directives
-          to silence MSVC warnings that the files are missing dependencies.
+        * html/README:
+          Corrected download link doxygen documentation
 
-Thu Aug 26 11:39:29 2004  Steve Huston  <shuston@riverace.com>
+Fri Jan 28 13:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ACEXML/common/XML_Types.h: Add #include "ace/Basic_Types.h" to
-          pick up ACE_SIZEOF_WCHAR.
+        * examples/README:
+          Removed description of CORBA directory, it doesn't exists anymore
 
-Thu Aug 26 12:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Jan 28 13:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_unistd.cpp:
-          Tru64 also provides sysconf functionality to retrieve number
-          of cpu's. Implemented ACE_OS::num_processors() and
-          ACE_OS::num_processors_online() for Tru64 (Digital Unix)
+        * tests/Multicast_Test_IPV6.cpp:
+          Updated debug message that this test needs multicast and thread
+          support. When this is not available return 0 not 1 just as the
+          other tests do. This way single threaded builds don't flag this
+          test as failed.
 
-        * tests/OS_Test.cpp:
-          Corrected copy/paste error
+Fri Jan 28 09:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug 26 11:54:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Network_Adapters_Test.{h,cpp}:
+          Fixed compile warnings when building this test with the Borland
+          compiler. Thanks to Robert Iakobashvili
+          <roberti at GoNetworks dot com> for supplying the patches
 
-        * tests/OS_Test.cpp:
-          Added test for ACE_OS::num_processors() and
-          ACE_OS::num_processors_online()
+Fri Jan 28 08:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug 26 09:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Global_Macros.h
+          Changed ACE_SERVER_ADDRESS to don't cause problems in unicode
+          builds
 
-        * ACE-INSTALL.html:
-          I know we are working on footprint, but stating that an entire
-          build of ACE/TAO could use more than 2MB of diskspace is an
-          understatement ;-). Updated this to could use more than 4GB of
-          diskspace, which is something we have seen on the 64 bit systems.
-          Also updated the peak memory usage from 256Mb to 512Mb, the
-          Notification Service is a very memory consuming services when
-          being build.
+Fri Jan 28 08:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug 26 09:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * examples/C++NPv2/C++NPv2.mpc:
+          Don't build the configurable_logging_server when uses_wchar is defined.
+          This example just can't build with wchar
 
-        * ACE-INSTALL.html:
-          Updated instructions to build SSL with Borland C++, no OpenSSL
-          patch is necessary anymore and now MPC must be used. Updated HPUX
-          supported platforms.
+Fri Jan 28 07:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug 26 07:58:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+        * examples/ASX/Event_Server/Event_Server/Event.mpc:
+        * examples/ASX/Event_Server/Transceiver/Transceiver.mpc:
+        * examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc:
+          New MPC files. Thanks to Thomas Lockhart
+          <Thomas dot Lockhart at jpl dot nasa dot gov> for contributing
+          these.
 
-        * ace/config-linux-common.h:
+Fri Jan 28 05:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Included check on defined(__alpha) for correctly setting 64 bit
-          format specifiers.
+        * ace/Name_Request_Reply.h:
+          Removed private copy constructor and assignment operator, in the
+          netsvcs library this gave problems.
 
-        * examples/Threads/cancel.cpp:
-        * performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp:
+Thu Jan 27 18:28:19 2005  Steve Huston  <shuston@riverace.com>
 
-          Fixed 64 bit conversion warnings.
+        * tests/Proactor_Test.{h cpp}:
+        * tests/Proactor_Test_IPV6.cpp: Rearranged the pieces of this test to
+          allow the Acceptor and Connector objects to be destroyed during the
+          test and still have all the stats kept accurately. This is to enable
+          testing of some Proactor improvements that are coming.
 
-Thu Aug 26 06:47:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Proactor_Scatter_Gather_Test.cpp:
+        * tests/TP_Reactor_Test.cpp: Be careful to use the same address family
+          when forming the listen and connect addresses. This allows things to
+          work regardless of IPv4/IPv6 use.
 
-        * ace/Auto_Ptr.h:
-          Readded disappeared include of post.h
+Thu Jan 27 18:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Aug 25 23:31:02 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+        * ace/Hash_Map_Manager_T.inl:
+          Replaced c-style cast with C++ casts
 
-        * include/makeinclude/platform_linux.GNU:
+Thu Jan 27 18:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed an error caused by a misplaced newline in Rich's previous
-          commit.
+        * ace/ARGV.cpp:
+        * ace/Condition_Recursive_Thread_Mutex.cpp:
+        * ace/Condition_Thread_Mutex.cpp:
+        * ace/Dump.cpp:
+        * ace/Event.cpp:
+        * ace/Filecache.cpp:
+        * ace/Message_Block.cpp:
+        * ace/OS_NS_sys_socket.cpp:
+        * ace/Service_Object.cpp:
+        * ace/Service_Types.cpp:
+          Replaced c-style cast with C++ casts
+
+        * ace/Name_Proxy.cpp:
+        * ace/Naming_Context.cpp:
+          Added missing members to initialisation list
 
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
+        * ace/Name_Proxy.h:
+        * ace/Name_Request_Reply.h:
+          Added private assignment operator and copy constructor
+          to prevent copying.
 
-          Brought over the following changes from OCITAO 1.3a.
-          Added -ladm to LIBS.  This is needed for SunOS 5.6 for
-          resolving symbols for regular expression processing (e.g.,
-          compile, step), and does not appear to cause a problem on
-          later version of SunOS.
+Wed Jan 26 12:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Change directory that is argument to ld's '-R' to use the new
-          $ACE_ROOT/lib directory rather than $ACE_ROOT/ace.
+        * ace/ICMP_Socket.{h,cpp}:
+        * ace/Ping_Socket.{h,cpp}:
+        * tests/Network_Adapters_Test.cpp:
+          Added missing includes. Thanks to Peter Falsh
+          <webangel at list dot ru> for reporting this.
 
-Wed Aug 25 21:10:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/run_test.lst:
+          Added Network_Adapters_Test
 
-        * configure.ac:
+Tue Jan 25 21:05:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
-          Fixed tipo introduced by:
-          Mon Aug 23 23:23:18 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * tests/Reactor_Registration_Test.cpp:
 
-Wed Aug 25 17:33:47 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        Revoked earlier change because it's erroneous:-(
 
-        * ace/config-netbsd.h:
+Tue Jan 25 19:41:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
-          Removed ACE_NTRACE definition.  It slipped in again.
+        * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp:
 
-Wed Aug 25 16:00:11 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+        Fixed typo in include statement. Thanks to JT Conklin.
 
-        * ace/Auto_Ptr.h:
-        * ace/Auto_Ptr.inl:
+Tue Jan 25 15:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added new ACE_Auto_Ptr which can be used more portably than
-          auto_ptr even with the ACE auto_ptr workarounds. Specifically,
-          this obviates the need for the ACE_AUTO_PTR_RESET macro, and
-          will have better performance than the pre-standard auto_ptr that
-          comes with VC6.
+        * docs/ACE-bug-process.html:
+          Fixed links
 
-Wed Aug 25 14:58:51 2004  Rich Seibel <seibel_r@ociweb.com>
+Tue Jan 25 15:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-      * include/makeincludes/platform_linux.GNU:
-        Generalized the way the rt library is searched.  The
-        previous code did not find it on RedHat AS 3.0 for opteron.
+        * docs/ACE-categories.html:
+          Updated this document
 
-Wed Aug 25 14:49:11 2004  Rich Seibel <seibel_r@ociweb.com>
+Tue Jan 25 15:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Basic_Types.h:
-        added __x86_64 to long double to satisy opteron.
+        * ace/OS.h:
+          Removed include of os_include/sys/os_fcntl.h, this file doesn't
+          exists
 
-Wed Aug 25 11:15:33 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Tue Jan 25 14:41:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
-        * ACE-INSTALL.html:
+        * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp:
 
-          Updated ACE_SSL library build notes to refer to MPC, i.e. the
-          proper way to add ACE_SSL support to GNUmakefiles and MSVC++
-          workspace/project files.  Thanks to Johnny for pointing out that
-          the documentation was out of date.
+        Added a necessary includefile which make things compile better
+        when ACE_HAS_STREAM_PIPES is defined.
 
-          Wrap the "Last modified" line within an Emacs "hhtms" block to
-          allow Emacs to automatically update the date and time this file
-          was last modified.
+Tue Jan 25 14:15:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
-Wed Aug 25 11:46:49 2004  Steve Huston  <shuston@riverace.com>
+        * tests/Reference_Counted_Event_Handler_Test.cpp:
+        * tests/Reactor_Registration_Test.cpp:
 
-        * ace/os_include/sys/os_pstat.h: If ACE_HAS_SYS_PSTAT_H, include
-          <sys/param.h> and <sys/pstat.h> (not <time.h>) as directed by
-          HP-UX man page. HP-UX 11 is the only config that sets this.
+        Tidied up resource management (i.e. close pipes in eventhandler
+        destructors) since VxWorks does not automatically release those
+        when a dynamically loaded app module is finished.
 
-Wed Aug 25 08:46:02 2004  Chad Elliott  <elliott_c@ociweb.com>
+        * tests/Reactor_Dispatch_Order_Test.cpp:
 
-        * include/makeinclude/wrapper_macros.GNU:
+        Tidied up resource management and fixed handling superfluous output
+        event (like OpenBSD and Lynx).
 
-          Fixed the ace_filecache misspelling.
+Mon Jan 24 23:10:33 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Wed Aug 25 08:38:29 2004  Steve Huston  <shuston@riverace.com>
+        * ace/Process_Manager.cpp (terminate):
+        * ace/Signal.cpp (remove_handler, register_handler):
+        * ace/Thread_Manager.cpp (spawn_i):
 
-        * ace/OS_NS_unistd.inl (rmdir): Removed the ACE_USES_WCHAR case from
-          the char* version of this method.
+          Fixed "control reaches end of non-void function" warnings
+          exhibited by the latest GNU G++ 4.0 CVS snapshot.
 
-Wed Aug 25 09:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Jan 24 17:00:39 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ACE-INSTALL.html:
-          Minor updates to Cygwin notes
+        * ace/Makefile.am:
 
-Wed Aug 25 09:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Fix thinko in pkgsrc *.pc file generation.
 
-        * ace/os_include/sys/os_pstat.h:
-          Corrected incorrect doxygen file tag
+Mon Jan 24 18:24:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
-Wed Aug 25 08:47:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+        * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/producer_read.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/server.cpp:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i:
 
-        * ace/config-lite.h:
+        Added a number necessary includefiles which make things compile better
+        when ACE_HAS_STREAM_PIPES is defined.
 
-          Introduced new macro ACE_HAS_PROCESS_SPAWN to be able to do
-          better checks for availability of subprocessing than is
-          possible with ACE_LACKS_FORK. See [Bug 1793].
+Mon Jan 24 07:49:21 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * tests/MEM_Stream_Test.cpp:
-        * tests/Malloc_Test.cpp
-        * tests/SOCK_Dgram_Bcast_Test.cpp
+        * ace/OS_NS_sys_socket.inl (setsockopt): Fixed a mistake in the
+          comment, where it should say "Windows always set
+          SO_REUSEADDR=1."  Thanks to  YiQing Xiong
+          <xjaguar at 126 dot com> for reporting this.
 
-          Changed to use new ACE_HAS_PROCESS_SPAWN macro to test for
-          subprocessing capabilities. See [Bug 1793].
+Mon Jan 24 11:23:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
-Wed Aug 25 01:19:03 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/CDR_Test.cpp:
 
-        * configure.ac:
+        Fixed incorrect initializer for char array.
 
-          Add checks for ACE_HAS_SYS_PSTAT_H and ACE_HAS_SYS_LOADAVG_H.
+Sun Jan 23 21:34:00 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Wed Aug 25 08:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Makefile.am:
+        * examples/Misc/Makefile.am:
+        * tests/Makefile.am:
 
-        * include/makeinclude/platform_hpux_aCC.GNU:
-          The warnings disabled in this file are for major version 03 of aCC
-          only (PA-RISC), for version 05 (Itanium), disable 1016 and 1031,
-          these are binary incompatible warnings.
+          Regenerate.
 
-Wed Aug 25 07:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * m4/ace.m4:
 
-        * ace/os_include/sys/os_loadavg.h:
-        * ace/os_include/sys/os_pstat.h:
-          New files to include sys/loadavg.h and sys/pstat.h when
-          ACE_HAS_SYS_LOADAVG_H and ACE_HAS_SYS_PSTAT_H is set
+          Added extra quoting to AC_REQUIRE arguments.
+          Set BUILD_ACE_{FL,TK,QT,XT}REACTOR automake conditionals.
 
-        * ace/config-hpux-11.00.h:
-          HPUX has sys/pstat.h, so added define ACE_HAS_SYS_PSTAT_H
+Sun Jan 23 19:17:25 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/README:
-          Documented ACE_HAS_SYS_LOADAVG_H and ACE_HAS_SYS_PSTAT_H
+        * m4/ace.m4:
 
-        * ace/OS.h:
-          Removed including of sys/pstat.h, it is really not needed here
+          Create new ACE_WITH_{GL,FL,QT,TK} autoconf macros which will be
+          used for finding OpenGL, FL/TK, Qt and Tk libraries and setting
+          compiler and linker flags.
 
-        * ace/OS_NS_unistd.cpp:
-          Instead of including sys/pstat.h include os_include/sys/os_pstat.h
+Sun Jan 23 15:45:46 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Wed Aug 25 07:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * m4/ace.m4:
 
-        * include/makeinclude/platform_hpux_aCC.GNU:
-          Changed CXXVERS to CXXMINORVERS and added CXXMAJORVERS,
-          we just compare minor version at this moment, but we really
-          should also check major vers soon, major version 3 is aCC
-          on PARISC, version 5 is on Itanium. Changed the way we
-          detect itanium to a portable way that works with all
-          HPUX versions.
+          Split --enable-{fl,qt,tk,xt}-reactor processing into separate
+          autoconf macros.
 
-Tue Aug 24 19:59:18 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Sun Jan 23 15:07:08 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * ace/config-netbsd.h:
+        * bin/make_release:
 
-          Fixed typo in last change, add back typedef for ACE_UINT64.
+          Omit .cvsignore files.
 
-Tue Aug 24 19:32:07 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Sun Jan 23 18:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-netbsd.h:
+        * examples/Reactor/Proactor/test_multiple_loops.cpp:
+        * examples/Shared_Memory/test_SV.cpp:
+        * examples/Smart_Pointers/gadget_test.cpp:
+        * examples/Smart_Pointers/widget_test.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp:
 
-          Removed extraneous cruft left over from autoheader generated
-          file.  Added conditional support for NetBSD/AMD64.
+Sun Jan 23 15:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Aug 24 15:03:22 2004  Steve Huston  <shuston@riverace.com>
+        * examples/OS/Process/process.cpp:
+        * examples/IPC_SAP/TLI_SAP/CPP-client.cpp:
+          Fixed unicode build error
 
-        * ace/OS_NS_Thread.inl (thread_mutex_init): Fixed wchar_t version to
-          pass a 0 sa value. Corrects the passing of the lock_type value
-          through to ACE_OS::mutex_init(), restoring behavior of recursive
-          mutexes.
+Sun Jan 23 13:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Aug 24 14:07:22 2004  Steve Huston  <shuston@riverace.com>
+        * include/makeinclude/wrapper_macros.GNU:
 
-        Changes to improve the functionality of wide-char operation on
-        non-Windows platforms:
+          Default rtti to 1 instead of 0, we now use dynamic_cast in the
+          ACE library itself, TAO requires RTTI, so changed the default
 
-        * ace/ace_wchar.h: If ACE_HAS_XPG4_MULTIBYTE_CHAR is defined, but not
-          ACE_HAS_WCHAR, set ACE_HAS_WCHAR.
+        * include/makeinclude/platform_vxworks5.5.x.GNU:
 
-        * ace/ACE.cpp (timestamp): Use ACE_TCHAR for temp char arrays,
-          not char. If ACE_USES_WCHAR on non-Windows, use %ls for printf
-          strings, not %s.
+          Simplified this file by using ?=
 
-        * ace/ARGV.cpp (constructor): Replaced most of the body with a call
-          to ACE_OS::argv_to_string().
+Sun Jan 23 13:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Basic_Types.h:
-        * ace/Cleanup.h:
-        * ace/Object_Manager_Base.h:
-        * ace/OS_NS_string.h:
-        * ace/os_include/os_float.h:
-        * ace/os_include/os_inttypes.h:
-        * ace/os_include/os_limits.h:
-        * ace/os_include/os_signal.h:
-        * ace/os_include/os_stdint.h:
-        * ace/os_include/os_stdlib.h:
-        * ace/os_include/os_time.h:
-        * ace/os_include/os_ucontext.h:
-        * ace/os_include/os_unistd.h:
-        * ace/os_include/sys/os_ipc.h:
-        * ace/os_include/sys/os_mman.h:
-        * ace/os_include/sys/os_msg.h:
-        * ace/os_include/sys/os_resource.h:
-        * ace/os_include/sys/os_select.h:
-        * ace/os_include/sys/os_sem.h:
-        * ace/os_include/sys/os_shm.h:
-        * ace/os_include/sys/os_socket.h:
-        * ace/os_include/sys/os_stat.h:
-        * ace/os_include/sys/os_statvfs.h:
-        * ace/os_include/sys/os_timeb.h:
-        * ace/os_include/sys/os_time.h:
-        * ace/os_include/sys/os_times.h:
-        * ace/os_include/sys/os_types.h:
-        * ace/os_include/sys/os_uio.h:
-        * ace/os_include/sys/os_un.h:
-        * ace/os_include/sys/os_utsname.h:
-        * ace/os_include/sys/os_wait.h: #include "config-lite.h" rather than
-          "config-all.h". Only need the user config.h and "lite" things.
-          Including config-all.h introduces a circular include
-          dependency from OS_main.h.
-
-        * ace/Default_Constants.h: Add ACE_LIB_TEXT() to ACE_DEFAULT_SVC_CONF
-          strings.
-
-        * ace/Env_Value_T.i (fetch_value): For non-Win32, force the env var
-          name to narrow-char then convert the result back to ACE_TCHAR.
-
-        * ace/FILE_Connector.cpp (connect): When generating a temp name,
-          convert it to ACE_TCHAR for ACE_FILE_Addr.
-
-        * ace/Get_Opt.cpp (constructor): When checking for POSIXLY_CORRECT,
-          must always use char *, not ACE_TCHAR*, on non-Win32.
-
-        * ace/High_Res_Timer.cpp: Added ACE_LIB_TEXT to naked string literals.
-          Use 'char' when it must be narrow char; ACE_TCHAR when it has to
-          change based on ACE_USES_WCHAR.
-
-        * ace/Lib_Find.cpp (ldfind, get_temp_dir): Environment variables on
-          non-Windows are always narrow char, so account for that.
-
-        * ace/Log_Msg_UNIX_Syslog.cpp: Operate internally with all narrow
-          chars because the underlying OS APIs are only narrow char.
-
-        * ace/Log_Msg.cpp (log): For 'D', 'M', 'm', 'N', and 'p', use the
-          proper 's' format code for the platform/char width. Similar to
-          Log_Record.cpp below.
-
-        * ace/Log_Msg.h (ACE_ASSERT): Convert __FILE__ name to proper char
-          width when necessary.
-
-        * ace/Log_Record.cpp: When formatting log strings, have to change
-          printf formats if using wide chars on non-Windows. Wide-char
-          strings are printed with %ls, whereas Windows uses %s for
-          wide-char strings if the format is wide-char.
-
-        * ace/Memory_Pool.cpp (ctor): Change backing_store_name to narrow
-          char when needed to pass it to sscanf().
-
-        * ace/Object_Manager_Base.cpp (print_error_message): Add
-          ACE_TEXT_ALWAYS_CHAR to the message arg to convert on wide-char
-          builds.
-
-        * ace/OS_main.h: For ACE_MAIN on non-Windows ACE_USES_WCHAR platforms,
-          convert the argv to wchar_t, and pass the wide-char strings to the
-          ACE_TCHAR[]-expecting real main program.
-
-        * ace/OS_NS_dirent.inl (opendir): Moved the const_cast-needing
-          VxWorks part to its own #elif section. Added ACE_TEXT_ALWAYS_CHAR
-          to the other invocation of ::opendir().
-
-        * ace/OS_NS_dlfcn.inl (dlerror, dlopen, dlsym): Corrected use of
-          narrow/wide-char.
-
-        * ace/OS_NS_stdio.inl (cuserid, fdopen, freopen): Don't use
-          ACE_TCHAR when a char is always needed.
-          (fgets, fputs, perror, puts): Changed to have both narrow- and
-          wide-char variants.
-          (checkUnicodeFormat): Use a platform-neutral 2-byte type to
-          read 2 bytes. Need a non-Windows 'whence' arg for fseek().
-          (vsprintf (wchar_t)): Added the non-Windows, XPG5 code for this to
-          use the XPG5 vswprintf() when equippped.
-
-        * ace/OS_NS_stdlib.{h inl cpp}:
-          (ACE_OS::mktemp() and mkstemp()): Changed to have both narrow-
-          and wide-char variants for the !ACE_LACKS_MKTEMP case.
-          Offering both for the ACE_LACKS_MKTEMP case is a low-return
-          use of time since the wide-char variant will probably never be used.
-          (strenvdup): Handle ACE_USES_WCHAR on non-Windows by converting
-          back and forth to narrow-char.
-          (system): On non-Windows, convert command line string to narrow-char.
-          (getcwd): Changed to have both narrow- and wide-char variants.
-
-        * ace/OS_NS_sys_stat.inl (creat, mkfifo): For non-Windows, convert
-          name to narrow-char when needed.
-          (lstat): Change from a single ACE_TCHAR-based interface to both
-          char* and wchar_t*.
-
-        * ace/OS_NS_time.inl (ctime, ctime_r): Corrected narrow/wide char
-          usage.
-
-        * ace/OS_NS_unistd.inl (truncate): For non-Windows, convert the path
-          to narrow-char when needed.
-          (realpath): Changed to have both narrow- and wide-char variants.
-
-        * ace/OS_NS_unistd.{h inl cpp}:
-          (rmdir): Changed to have both narrow- and wide-char variants.
-          (argv_to_string): Handle narrow and wide-char environment variables.
-          (fork_exec): Convert path and argv to narrow-char when needed.
-
-        * ace/Process.cpp (spawn): Convert argv, procname, env vars to narrow
-          char for non-Windows wide-char builds.
+        * ace/Capabilities.cpp:
+          Removed instantiations of ACE_Hash and ACE_Equal_To of
+          ACE_TString. These where already giving problems on VxWorks,
+          now also on Irix, so removed them. Thanks to Doug McCorkle
+          <mccdo at iastate dot edu> for reporting this
 
-        * ace/Process.i (setreugid): Convert user name to narrow char for
-          getpwnam().
+Sun Jan 23 12:39:20 2005  Marek Brudka  <mbrudka@aster.pl>
 
-        * ace/Process_Mutex.cpp (ctor): Don't convert name to ACE_TCHAR for
-          ACE_SV_Semaphore case - it requires char*.
+        * bin/MakeProjectCreator/config/tao_xtresource.mpb:
+        * bin/MakeProjectCreator/config/tao_tkresource.mpb:
+        * bin/MakeProjectCreator/config/tao_qtresource.mpb:
+        * bin/MakeProjectCreator/config/tao_flresource.mpb:
+        * bin/MakeProjectCreator/config/ace_xtreactor.mpb:
+        * bin/MakeProjectCreator/config/ace_xt.mpb:
+        * bin/MakeProjectCreator/config/ace_x11.mpb:
+        * bin/MakeProjectCreator/config/ace_tkreactor.mpb:
+        * bin/MakeProjectCreator/config/ace_tk.mpb:
+        * bin/MakeProjectCreator/config/ace_motif.mpb:
+        * bin/MakeProjectCreator/config/ace_gl.mpb:
+        * bin/MakeProjectCreator/config/ace_flreactor.mpb:
+        * bin/MakeProjectCreator/config/ace_fl.mpb:
+        * bin/MakeProjectCreator/config/ace_athena.mpb:
+        * ace/ace_xtreactor.mpc:
+        * ace/ace_tkreactor.mpc:
+        * ace/ace_qtreactor.mpc:
+        * ace/ace_flreactor.mpc:
+        * ace/ace.mpc:
 
-        * ace/Process_Semaphore.cpp (ctor): Convert name to narrow char
-          for ACE_SV_Semaphore_Complex case.
+          Added missing Id strings.
 
-        * ace/Sock_Connect.cpp (get_bcast_addr):
-        * ace/SOCK_Dgram_Bcast.cpp (mk_broadcast): Host name needs to be
-          converted to narrow-char for wide-char builds.
+Sun Jan 23 02:22:13 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/SOCK_Dgram_Mcast.cpp (make_multicast_ifaddr): Interface name
-          needs to be converted to narrow-char for wide-char builds.
+        * ace/ACE_FlReactor.pc.in:
+        * ace/ACE_QtReactor.pc.in:
+        * ace/ACE_TkReactor.pc.in:
+        * ace/ACE_XtReactor.pc.in:
 
-        * ace/SV_Semaphore_Simple.{h,i,cpp}: Added wide-char versions of
-          the named constructor and open() methods. They forward to the
-          narrow-char versions.
+          New files, pkg-config *.pc templates.
 
-        * tests/Dirent_Test.cpp: Account for dirent's d_name is an ACE_TCHAR
-          when ACE_LACKS_STRUCT_DIR and a char* otherwise.
+        * ace/ace_flreactor.mpc:
+        * ace/ace_qtreactor.mpc:
+        * ace/ace_tkreactor.mpc:
+        * ace/ace_xtreactor.mpc:
 
-        * tests/FIFO_Test.cpp: Change ACE_ALPHABET to char[].
+          Removed Demux subsection from Source_Files.
 
-        * tests/Proactor_Test.cpp: Change complete_message from ACE_TCHAR
-          to char. This is easier to handle; as ACE_TCHAR, we'd need to
-          correct all the message block pointer adjustments to take the
-          charset width into account.
+          Added empty Inline_Files, Template_Files, and Resource_Files
+          sections.
 
-        * tests/Log_Msg_Test.cpp:
-        * tests/MEM_Stream_Test.cpp:
-        * tests/Message_Queue_Test.cpp:
-        * tests/Pipe_Test.cpp:
-        * tests/Process_Manager_Test.cpp:
-        * tests/Process_Mutex_Test.cpp:
-        * tests/Process_Strategy_Test.cpp:
-        * tests/Signal_Test.cpp:
-        * tests/SOCK_Connector_Test.cpp:
-        * tests/SOCK_Dgram_Test.cpp:
-        * tests/SOCK_Send_Recv_Test.cpp:
-        * tests/SOCK_Test.cpp:
-        * tests/SV_Shared_Memory_Test.cpp: Char width correction.
+          Added Pkgconfig_Files sections.
 
-        * tests/Service_Config_Test.cpp:
-        * tests/Service_Config_Test.WCHAR_T.conf:
-        * tests/Service_Config_Test.WCHAR_T.conf.xml: Added WCHAR_T-coded
-          versions of the test input file and changed the test to use
-          them on non-Windows ACE_USES_WCHAR builds.
+Sun Jan 23 00:25:48 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tests/Test_Output.cpp (set_output): Handle env var and filepath
-          building correctly even on wide-char non-Windows builds.
+        * m4/ace.m4:
 
-        * ACEXML/common/XML_Types.h: typedef ACEXML_Char as ACE_TCHAR, else
-          it doesn't match any char interfaces when wchar_t is not 2 bytes.
+          Initial --enable-tk-reactor and --enable-qt-reactor support.
+          Set BUILD_{FL,TK,QT,XT} automake conditionals.
 
-        * ACEXML/parser/parser/Parser.cpp (parse_char_reference): Add the
-          case where wide-char is 4 bytes.
+Sun Jan 23 01:54:59 2005  Marek Brudka  <mbrudka@aster.pl>
 
-        Also brought in this fix:
-        Mon Mar  8 15:52:33 2004  Steve Huston  <shuston@riverace.com>
+        * */.cvsignore:
+          To make cvs silent.
 
-        * ace/POSIX_Proactor.cpp: Comment out the signal setup; this should
-          not be necessary and, indeed, is erroneous, at least on Linux.
-          It's commented out instead of removed in case further testing on
-          other platforms determines that it is needed sometimes.
+        * tests/tests.mpc:
+        * tests/XtReactor_Test.cpp:
+        * tests/XtMotifReactor_Test.cpp:
+        * tests/XtAthenaReactor_Test.cpp:
+        * tests/TkReactor_Test.cpp:
+        * tests/QtReactor_Test.h:
+        * tests/QtReactor_Test.cpp:
+        * tests/FlReactor_Test.cpp:
+        * include/makeinclude/wrapper_macros.GNU:
+        * include/makeinclude/platform_sunos5_g++.GNU:
+        * include/makeinclude/platform_lynxos.GNU:
+        * include/makeinclude/platform_linux_pgi.GNU:
+        * include/makeinclude/platform_linux_icc.GNU:
+        * include/makeinclude/platform_linux_borland.GNU:
+        * include/makeinclude/platform_linux.GNU:
+        * examples/Misc/test_XtReactor2.cpp:
+        * examples/Misc/test_XtReactor1.cpp:
+        * examples/Misc/Misc.mpc:
+        * bin/MakeProjectCreator/config/tao_xtresource.mpb:
+        * bin/MakeProjectCreator/config/tao_tkresource.mpb:
+        * bin/MakeProjectCreator/config/tao_qtresource.mpb:
+        * bin/MakeProjectCreator/config/tao_flresource.mpb:
+        * bin/MakeProjectCreator/config/strategies.mpb:
+        * bin/MakeProjectCreator/config/global.features:
+        * bin/MakeProjectCreator/config/acedefaults.mpb:
+        * bin/MakeProjectCreator/config/ace_xtreactor.mpb:
+        * bin/MakeProjectCreator/config/ace_xt.mpb:
+        * bin/MakeProjectCreator/config/ace_x11.mpb:
+        * bin/MakeProjectCreator/config/ace_tkreactor.mpb:
+        * bin/MakeProjectCreator/config/ace_tk.mpb:
+        * bin/MakeProjectCreator/config/ace_qtreactor.mpb:
+        * bin/MakeProjectCreator/config/ace_qt.mpb:
+        * bin/MakeProjectCreator/config/ace_motif.mpb:
+        * bin/MakeProjectCreator/config/ace_gtk.mpb:
+        * bin/MakeProjectCreator/config/ace_gl.mpb:
+        * bin/MakeProjectCreator/config/ace_flreactor.mpb:
+        * bin/MakeProjectCreator/config/ace_fl.mpb:
+        * bin/MakeProjectCreator/config/ace_athena.mpb:
+        * ace/config-win32-msvc.h:
+        * ace/config-doxygen.h:
+        * ace/ace_xtreactor.mpc:
+        * ace/ace_tkreactor.mpc:
+        * ace/ace_qtreactor.mpc:
+        * ace/ace_flreactor.mpc:
+        * ace/ace.mwc:
+        * ace/ace.mpc:
+        * ace/XtReactor.h:
+        * ace/XtReactor.cpp:
+        * ace/TkReactor.h:
+        * ace/TkReactor.cpp:
+        * ace/README:
+        * ace/QtReactor.h:
+        * ace/QtReactor.cpp:
+        * ace/FlReactor.h:
+        * ace/FlReactor.cpp:
+        * ace/ACE_XtReactor_export.h:
+        * ace/ACE_TkReactor_export.h:
+        * ace/ACE_QtReactor_export.h:
+        * ace/ACE_FlReactor_export.h:
+        * ACE-INSTALL.html:
+          Changes related with separation of GUI reactors.
+          The additional information is avalaible below.
 
-Tue Aug 24 10:22:18 2004  Steve Huston  <shuston@riverace.com>
+        Wed Jan 19 22:55:50 2005  Marek Brudka  <mbrudka@aster.pl>
 
-        * ace/config-linux-common.h: Added ACE_HAS_SCANDIR and a new
-          macro, ACE_SCANDIR_CMP_USES_VOIDPTR, saying that scandir()
-          cmp() function takes void pointers, not dirent pointers.
+        * bin/MakeProjectCreator/config/tao_xtresource.mpb:
+        * bin/MakeProjectCreator/config/tao_xtreactor.mpb:
+        * bin/MakeProjectCreator/config/tao_tkresource.mpb:
+        * bin/MakeProjectCreator/config/tao_tkreactor.mpb:
+        * bin/MakeProjectCreator/config/tao_qtresource.mpb:
+        * bin/MakeProjectCreator/config/tao_qtreactor.mpb:
+        * bin/MakeProjectCreator/config/tao_flresource.mpb:
+        * bin/MakeProjectCreator/config/tao_flreactor.mpb:
 
-        * ace/OS_NS_dirent.inl (scandir): When calling native scandir()
-          with ACE_SCANDIR_CMP_USES_VOIDPTR, cast comparator appropriately.
-          Also, for native scandir(), ACE_TEXT_ALWAYS_CHAR the dirname.
+          Adapted to new naming.
 
-        * ace/OS_NS_dlfcn.inl:
-        * tests/Test_Output.cpp: Added #include "ace/OS_NS_string.h" to get
-          ACE_OS string methods. Fixes compile error on inline=0 build.
+        Sun Jan  9 01:13:42 2005  Marek Brudka  <mbrudka@aster.pl>
 
-Tue Aug 24 11:16:00 2004  Jules White   <jules@dre.vanderbilt.edu>
+        * ace/TkReactor.h (Module):
+        * ace/TkReactor.cpp (Module):
+        * ace/FlReactor.h (Module):
+        * ace/FlReactor.cpp (Module):
 
-        * ACE-INSTALL.html: Added a section on using ACE within Eclipse
+          Removed factory methods for loading reactor from shared
+          library.
 
-Tue Aug 24 10:10:22 2004  Steve Huston  <shuston@riverace.com>
+        * bin/MakeProjectCreator/config/global.features (Module):
 
-        * ace/config-all.h: Moved #include "ace/OS_main.h" down to the bottom
-          of the file, lest it invoke a circular dependency.
+          Disabled by defult tao_flreactor and tao_tkreactor features.
 
-        * ace/OS_NS_stdlib.inl: Added #include "ace/config-all.h" to get
-          ACE_TRACE.
+        Mon Jan  3 22:48:32 2005  Marek Brudka  <mbrudka@aster.pl>
 
-Mon Aug 23 23:23:18 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * ace/ace_xtreactor.mpc (Module):
+        * ace/ace_tkreactor.mpc (Module):
+        * ace/ace_qtreactor.mpc (Module):
+        * ace/ace_flreactor.mpc (Module):
 
-        * Makefile.am (AUTOMAKE_OPTIONS):
+          Removed ace_*reactor required features.
 
-          Removed required Automake version from `Makefile.am'.
-          `configure.ac' already defines it.
+        Tue Dec 14 00:09:48 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * configure.ac:
+        * bin/MakeProjectCreator/config/ace_x11.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_gl.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_fl.mpb (Module):
+        * ACE-INSTALL.html (Module):
 
-          Updated required version of Automake to 1.9.
+          Modified base projects to enable FlReactor compilation for
+          Windows.
 
-          Added test for partial template specialization.  Issue a warning
-          if it isn't support by the compiler since ACE will require it in
-          the near future.
+        Mon Dec 13 01:39:12 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * ace/ACE.h:
+        * bin/MakeProjectCreator/config/ace_xt.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_gl.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_fl.mpb (Module):
 
-          Corrected ACE namespace documentation to describe the ACE
-          namespace itself rather than summarizing the contents of this
-          header (i.e. the value added global ACE functions).
+          Removed nice feature inheritance and reentered a workaround
+          related with "verbatim" section bug in MPC.
 
-        * ace/If_Then_Else.h:
+        Mon Dec 13 00:36:44 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Doxygen documentation corrections and improvements.
+        * bin/MakeProjectCreator/config/strategies.mpb (Module):
 
-Mon Aug 23 22:19:16 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Removed explicite dependencies of TAO_Strategies on
+          TAO_TkReactor.
 
-        * tests/CDR_Test.cpp (run_main):
+        * bin/MakeProjectCreator/config/tao_tkreactor.mpb (Module):
 
-          Added run-time assertions that verify proper CDR type sizes
-          (e.g. sizeof (ACE_CDR::Boolean) == 1).
+          Creating base project for using TAO_TkReactor library.
 
-Mon Aug 23 19:18:58 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * bin/MakeProjectCreator/config/strategies.mpb (Module):
 
-        * m4/config_h.m4:
+          Removed dependency on tao_tkreactor.
 
-          Removed autoheader template for ACE_LACKS_PARAM_H.
+        * tests/TkReactor_Test.cpp (Module):
+        * bin/MakeProjectCreator/config/ace_tk.mpb (Module):
+        * ace/config-doxygen.h (Module):
 
-Mon Aug 23 18:33:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Removed ACE_HAS_TK macros.
 
-        * configure.ac:
+        * ace/TkReactor.h (Module):
+        * ace/TkReactor.cpp (Module):
 
-          Added check for ACE_HAS_ITOA.
-          Added check for ACE_LACKS_ITOW.
-
-Mon Aug 23 18:22:25 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/config-dgux-4.11-epc.h
-        * ace/config-dgux-4.x-ghs.h
-        * ace/config-freebsd.h
-        * ace/config-lynxos.h
-        * ace/config-m88k.h
-        * ace/config-macosx-panther.h
-        * ace/config-macosx.h
-        * ace/config-openbsd.h
-        * ace/config-sunos4-g++.h
-        * ace/config-sunos4-lucid3.2.h
-        * ace/config-sunos4-sun3.x.h
-        * ace/config-sunos4-sun4.1.4.h
-        * ace/config-sunos4-sun4.x.h
-        * ace/config-sunos5.4-centerline-2.x.h
-        * ace/config-sunos5.4-g++.h
-        * ace/config-sunos5.4-sunc++-4.x.h
-        * ace/config-sunos5.5.h
-        * ace/config-tandem.h
-        * ace/config-unixware-2.01-g++.h
-        * ace/config-unixware-2.1.2-g++.h
-        * ace/config-unixware-7.1.0.h
-        * ace/config-unixware-7.1.0.udk.h
-        * ace/os_include/os_stropts.h
-
-          Changed name of feature test macro ACE_HAS_SOCKIO_H to
-          ACE_HAS_SYS_SOCKIO_H.
-
-Mon Aug 23 17:41:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Removed ACE_HAS_TK macros. Created factory method TkReactor in
+          dll.
 
-        * m4/config_h.m4:
-        * m4/platform.m4:
+        Sun Dec 12 22:53:48 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Removed support for unused ACE_NETBSD feature test macro.
+        * tests/FlReactor_Test.cpp (Module):
 
-Mon Aug 23 17:37:16 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Removed ACE_HAS_FL macros.
 
-        * m4/platform.m4:
+        * bin/MakeProjectCreator/config/strategies.mpb (Module):
 
-          Add check for ACE_LACKS_PERFECT_MULTICAST_FILTERING.
+          Removed explicite dependence of TAO_Strategies on
+          TAO_FlReactor.
 
-Mon Aug 23 16:33:59 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * bin/MakeProjectCreator/config/tao_flreactor.mpb (Module):
 
-        * ace/config-netbsd.h:
+          Creating base project for using TAO_FlReactor library.
 
-          Remove PACKAGE, PACKAGE_*, and VERSION definitions.  The latter
-          conflicts with some of the test/example programs.  I'll get rid
-          of the others just to be safe.
+        * bin/MakeProjectCreator/config/ace_fl.mpb (Module):
 
-          Comment out ACE_NTRACE, as the constant definition conflicts
-          with Misc_test_trace.  We probably need an option to control
-          whether tracing and debugging features are enabled when ACE/
-          TAO is compiled that is separate from the one used after it
-          has been built.
+          Removed ACE_HAS_FL macros.
 
-Mon Aug 23 16:06:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/config-doxygen.h (Module):
 
-        * configure.ac:
+          Removed ACE_HAS_FL macros.
+        * ace/FlReactor.h (Module):
+        * ace/FlReactor.cpp (Module):
 
-          Added checks for ACE_HAS_VWFPRINTF and ACE_HAS_VWSPRINTF.
+          Removed ACE_HAS_FL macros. Created factory method for
+          instantinating FlReactor from dll.
 
-Tue Aug 24 00:34:30 2004  Marek Brudka  <mbrudka@elka.pw.edu.pl>
+        Sun Dec 12 02:14:51 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * ace/QtReactor.cpp:
-        Removed unecessary #include <qeventloop.h>. Thanks to
-        Gan Deng <gan.deng@vanderbilt.edu> for a patch.
+        * .cvsignore:
 
+          Made cvs more silent on executables.
 
-Mon Aug 23 17:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/tests.mpc (Module):
 
-        * include/makeinclude/platform_hpux_aCC.GNU:
-          Added support for itanium on HPUX 11iv2 (11.23). Different options
-          have to be passed when on itanium, so when version 11.23 is detected,
-          set itanium to 1 and dependent on that set different compiler options.
+          Introduced new dependencies on ace_flreactor and ace_tkreactor
+          for specific reactors tests.
 
-Mon Aug 23 16:58:18 UTC 2004  Don Hinton  <don.hinton@vanderbilt.edu>
+        * include/makeinclude/platform_sunos5_sunc++.GNU (Module):
 
-        * include/makeinclude/rules.local.GNU:
-          Added CCFLAGS to the list of arguments passed to the dependency
-          generator.  Thanks to Matthew Townsend <mtownsen@harris.com>
-          for reporting the problem.
+          Replaced ace_with_x11 by x11 feature.
 
-        * THANKS:
-          Added Matthew Townsend to the hall of fame.
+        * include/makeinclude/wrapper_macros.GNU (Module):
 
-Mon Aug 23 08:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Modified documentation about features. Removed rules for an
+          unknown gtk_reactor. Modified statements related with new naming
+          schema and feature definitions.
 
-        * ace/config-hpux11.h:
-          Removed this file from the repo, use config-hpux-11.00.h instead,
-          the contents of this file refers to config-hpux11-xx.h files
-          which are not there, making this file unusable.
+        * bin/MakeProjectCreator/config/global.features (Module):
 
-Sun Aug 22 21:49:14 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Grouped and commented features related with GUI reactors.
 
-        * ace/config-netbsd.h:
+        * bin/MakeProjectCreator/config/strategies.mpb (Module):
 
-          Update with autoconf generated results.  While not perfect, the
-          old version would be difficult to update by hand.
+          Created temporary dependence on tao_tk(fl)reactors. To be
+          removed when TAO is separated from Tk and Fl Reactors.
 
-Mon Aug 23 01:04:34 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * bin/MakeProjectCreator/config/tao_flreactor.mpb (Module):
+        * bin/MakeProjectCreator/config/tao_tkreactor.mpb (Module):
 
-        * ace/Select_Reactor_T.cpp:
+          Created dummy projects to tao_*reactors. Will be handy when TAO
+          is separated from Tk and Fl Reactors.
 
-          Made some slight changes to the BUG 1890 patch after receiving
-          some clarifications from Kobi.
+        * bin/MakeProjectCreator/config/tao_xtreactor.mpb (Module):
+        * bin/MakeProjectCreator/config/tao_qtreactor.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_xtreactor.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_tkreactor.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_qtreactor.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_flreactor.mpb (Module):
 
-Sun Aug 22 11:11:00 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Unified derivation and naming schema.
 
-        * bin/MakeProjectCreator/config/amh.mpb:
-          When using amh, you must have valuetype support, so add valuetype
-          as base project of amh
+        * bin/MakeProjectCreator/config/ace_fltk.mpb (Module):
 
-Sun Aug 22 09:53:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          Replaced this file by ace_fl.mpb
 
-        * tests/MEM_Stream_Test.cpp:
+        * bin/MakeProjectCreator/config/ace_xt.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_x11.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_tk.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_qt.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_motif.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_fl.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_gl.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_athena.mpb (Module):
 
-          Changed to remove compile warning resulting from bad use
-          of ACE_UNUSED_ARG().
+          Replaced ace_with_* features by * features to unify naming
+          schema. Removed unnecessary definitions
+          (includes,flags,libraries). Introduced unified derivation
+          schema.
 
-Fri Aug 20 15:29:29 MST 2004  Trevor Fields  <fields_t@ociweb.com>
+        * ace/ace_xtreactor.mpc (Module):
+        * ace/ace_tkreactor.mpc (Module):
+        * ace/ace_qtreactor.mpc (Module):
+        * ace/ace_flreactor.mpc (Module):
 
-         * bin/auto_run_tests.pl:
-         * tests/run_test.pl:
-           Changed the run test scripts to time the execution
-           and print test finished messages.  This for the
-           generation of statistics.
+          Added header files. Created new dependencies.
 
-Fri Aug 20 15:10:08 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/TkReactor.h (Module):
+        * ace/FlReactor.h (Module):
 
-        * bin/MakeProjectCreator/config/core.mpb:
+          Used new export macros.
 
-          Changed to define INSTALL_THIS_TARGET for automake builds.
+        * ace/ACE_TkReactor_export.h (Module):
+        * ace/ACE_FlReactor_export.h (Module):
 
-        * bin/MakeProjectCreator/config/taodefaults.mpb:
+          Created export macros for these GUI reactors. Will be handy in
+          future.
 
-          Changed to add $(TAO_BUILDDIR) to includes for automake builds.
+        * ACE-INSTALL.html (Module):
 
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
+          Rewrote documentation related with GUI reactors.
 
-          Changed to add $(ACE_BUILDDIR) to includes for automake builds.
+        Fri Dec 10 23:53:41 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Fri Aug 20 12:17:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * bin/MakeProjectCreator/config/global.features (Module):
 
-        * configure.ac:
-        * m4/config_h.m4:
+          Removed xt_reactor feature.
 
-          Added check for ACE_SIZEOF_WCHAR.
+        * ACE-INSTALL.html (Module):
 
-Fri Aug 20 16:13:29 2004  Dale Wilson  <wilson_d@ociweb.com>
+          Modified documentation related to QtReactor and XtReactor.
 
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-        * ace/TSS_T.cpp:
-          Revert.  It triggers (or causes) an intermittent problem
-          in the Timer_Cancellation_Test
+        Fri Dec 10 22:57:22 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Fri Aug 20 10:22:34 2004  Dale Wilson  <wilson_d@ociweb.com>
+        * tests/QtReactor_Test.cpp (Message):
 
-        * TAO/tests/MT_Client/client.cpp:
-          Revert this.  It wasn't supposed to be included in my previous
-          check in. (Thu Aug 19 12:42:19 2004)
+          Removed unnecesary log about lack of Qt support.
 
-Fri Aug 20 15:20:31 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        Fri Dec 10 22:39:12 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        Fixes for Bug 1890. Please see
+        * bin/MakeProjectCreator/config/global.features (Message):
 
-        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1890
+          Disabled by default ace_With_xt and ace_with_x11.
 
-        for details of this bug. What follows are the individual changes.
+        * include/makeinclude/wrapper_macros.GNU (Module):
 
-        * ace/Select_Reactor_Base.cpp:
-        * ace/Select_Reactor_Base.h:
+          Replace qt_rector variables by qt, as MPC currently uses qt
+          feature.
 
-          Added a new method clear_dispatch_mask (), which as the name
-          indicates clears the masks in the dispatch_set. The dispatch set
-          is a new addition, which keeps track of the handles that can be
-          used for dispatching.
+        Fri Dec 10 01:04:52 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * ace/Select_Reactor_Base.inl:
-        * ace/Select_Reactor_T.cpp:
-        * ace/Select_Reactor_T.h: Modified dispatch_io_set () so that it
-          doesn't break the loop when state_changes occur. This is the
-          crux of the 1890 bug report. If unbinding occurs as part of an
-          upcall, the bit_ops () calls clear_dispatch_mask (), which
-          prevents dispatching to already removed (and potentially
-          rebounded) handles.
+        * examples/Misc/.cvsignore (Module):
 
-          Additional cosmetic changes.
+          Created few ignores to make cvs silent.
 
-        * ace/Priority_Reactor.cpp:
-        * ace/Priority_Reactor.h:
-        * ace/TP_Reactor.cpp:
-        * ace/TP_Reactor.h:
-        * ace/TP_Reactor.inl:
+        Fri Dec 10 00:45:56 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Replicate changes to the above reactors.
+        * tests/.cvsignore (Module):
 
-        * ace/Signal.h:
-        * ace/Signal.inl:
+          Created few ignores to make cvs silent.
 
-          Added a default argument to the ACE_Signal class, which is used
-          by the ACE_Select_Reactor.
+        * ace/ace_xtreactor.mpc (Module):
 
-          Thanks to Kobi for the patches.
+        * ace/config-tandem.h (Module):
+        * ace/config-doxygen.h (Module):
+        * ace/XtReactor.cpp (Module):
 
-Fri Aug 20 14:26:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          Removed ACE_HAS_XT macros.
 
-        * tests/Process_Mutex_Test.cpp:
+        * ace/XtReactor.h (Module):
 
-          Changed to use a separate logfile per child (based on PID like
-          in MEM_Stream_Test) because of concurrency problems in using a
-          single non-synchronized child logfile (at least under windows).
+          Removed ACE_HAS_XT macros and applied export macros for
+          ACE_XtReactor.
 
-Fri Aug 20 14:10:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+        * ace/README (Module):
 
-        * tests/MEM_Stream_Test.cpp:
+          Removed notice on ACE_HAS_XT.
 
-          Changed to use child processes instead of threads for testing.
-          See also [Bug 1793].
+        * ace/ACE_XtReactor_export.h (Module):
 
-Fri Aug 20 07:47:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          Create export macros for XtReactor. Please, do not ask if anyone
+          needs these macros under Windows. Probably no, but they are
+          present here to remain consistent with the rest of ACE.
 
-        * bin/bin/MakeProjectCreator/templates/gnu.mpd:
+        * tests/tests.mpc (Module):
 
-          Added $(EXEEXT) to BIN build target.
-          Removed from $(EXEEXT) from install and cleanup target
-          because these are derived from build target.
-          This improves link behaviour (disables unnecessary links
-          because dependency checks on build targets did not function)
-          on platforms using GNU make and having a executable extension
-          (like MingW; .exe).
-          Fixes [Bug 1876].
+          Created two project XtReactor_Tests for Athena widgets and
+          Motif. Removed XtReactor_Test.
 
-        * apps/gperf/tests/tests.mpc:
+        * tests/XtReactor_Test.cpp (Module):
+        * tests/XtMotifReactor_Test.cpp (Module):
+        * tests/XtAthenaReactor_Test.cpp (Module):
 
-          Added $(EXEEXT) to verbatim 'runtests' targets because
-          otherwise dependencies on build targets do not function
-          anymore.
+          XtReactor_Test was splitted into separate test for Athena
+          widgets and Motif, hence they depend on distinct
+          libraries. Removed ACE_HAS_XT and ACE_LACKS_MOTIF macros, as
+          they are not needed now.
 
-Thu Aug 19 16:45:05 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * examples/Misc/test_XtReactor2.cpp (Module):
+        * examples/Misc/test_XtReactor1.cpp (Module):
 
-        * bin/MakeProjectCreator/config/security.mpb:
+          Removed ACE_HAS_XT macros.
 
-          Changed to inherit from orbsvcslib.
+        * examples/Misc/Misc.mpc (Module):
 
-Thu Aug 19 12:42:19 2004  Dale Wilson  <wilson_d@ociweb.com>
+          Added dependencies on ace_xtreactor and ace_motif.
 
-        * TAO/tests/MT_Client/client.cpp:
+        * bin/MakeProjectCreator/config/tao_xtreactor.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_xtreactor.mpb (Module):
 
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-        * ace/TSS_T.cpp:
-        Repeat part of the checkin from Fri Aug 13 15:26:40 2004
-        This corrects the incorrect thread-in-use count problem
-        that leads to premature TSS key deletion, but does not fix
-        the TSS leak because fixing that reveals other problems
-        that I don't have a solution for, yet.
+          Created base projects for applications using ACE/TAO_XtReactor
+          libraries.
 
-Thu Aug 19 08:26:11 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * bin/MakeProjectCreator/config/global.features (Module):
 
-        * apps/drwho/Rwho_DB_Manager.h:
+          By default ace_with_x11, ace_withxt, ace_with_motif,
+          ace_with_athena features are not avalaible.
 
-          Changed to #include <sys/types.h> before <protocols/rwhod.h>,
-          as the latter needs the former on some systems.
+        * bin/MakeProjectCreator/config/ace_xt.mpb (Module):
+        * bin/MakeProjectCreator/config/ace_x11.mpb (Module):
 
-Thu Aug 19 08:07:53 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Transformed features into projects with explicit requirements.
 
-        * examples/APG/Signals/SigAction.cpp:
+        * bin/MakeProjectCreator/config/ace_motif.mpb (Module):
 
-          Changed to use a (conditional) extern "C" linkage block around
-          my_sighandler, because the plain extern "C" directive resulted
-          in a declaration with multiple storage classes.
+          Created base project for motif/lestif  library.
 
-Thu Aug 19 08:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/MakeProjectCreator/config/ace_athena.mpb (Module):
 
-        * PROBLEM-REPORT-FORM:
-          Ask for the default.features file used by MPC.
+          Created base project for athena widgets library.
 
-Wed Aug 18 21:02:34 2004  Dale Wilson  <wilson_d@ociweb.com>
+        * ACE-INSTALL.html (Module):
 
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-        * ace/Object_Manager.cpp:
-        * ace/TSS_T.cpp:
-          Revert TSS leak fix (temporarily, I hope)
-          until I can find and eliminate the hang.
+          Modified section on QtReactor and added section on XtReactor.
+
+        Tue Dec  7 20:48:36 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Wed Aug 18 15:07:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+        * ace/ace_qtreactor.mpc (Module):
+        * ace/QtReactor_export.h (Module):
+        * ace/QtReactor.h (Module):
+        * ace/ACE_QtReactor_export.h (Module):
 
-        * bin/msvc_static_compile.pl:
-          bin/msvc_mpc_auto_compile.pl:
+          Change QtReactor_export.h into ACE_QtReactor_export.h to avoid
+          possible, though not very probably name conflict and remain
+          consistent with TAO_QtReact_export.
 
-        Fixed wrong comment characters.
+        Tue Dec  7 00:23:54 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Wed Aug 18 13:35:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+        * ace/ace_qtreactor.mpc (Module):
+        * ace/QtReactor_export.h (Module):
+        * ace/QtReactor.h (Module):
 
-        * bin/msvc_static_compile.pl:
+          Created and applied export macros for ACE_QtReactor library.
 
-        Added support for building VC8 projects.
+        Sun Dec  5 23:18:29 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Wed Aug 18 13:29:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+        * include/makeinclude/wrapper_macros.GNU (Module):
+        * include/makeinclude/platform_linux_pgi.GNU (Module):
+        * include/makeinclude/platform_linux_icc.GNU (Module):
+        * include/makeinclude/platform_linux.GNU (Module):
 
-        * bin/msvc_mpc_auto_compile.pl:
+          Removed unnecessary ACE_HAS_QT and make options regarding
+          qt. All those things are now set up by MPC.
 
-        Added support for building VC8 projects.
+        * tests/tests.mpc (Module):
 
-Wed Aug 18 08:50:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
+          Removed explicit dependency on qt. It is ensured now by qt base
+          project.
 
-        * ace/Asynch_Connector.h:
-        * ace/Asynch_Connector.cpp:
+        * tests/QtReactor_Test.h (Module):
+        * tests/QtReactor_Test.cpp (Module):
 
-          Thanks to Douglas for his assistance. This change introduces a
-          class-static "local_default" for use as the default parameter
-          for the second attribute of
-          ACE_Asynch_Connector<>::connect(). This "simplifies" the nested
-          templated class for the Solaris Lynxos GCC295 cross compiler
-          which was faulting due to the complexity of this
-          definition. This change does not appreachiably modify the
-          signature of the member function, just stops clients from having
-          to create their own local default parameter.
+          Removed ACE_HAS_QT section as MPC manages now configuration.
 
-Wed Aug 18 01:05:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * bin/MakeProjectCreator/config/tao_qtreactor.mpb (Module):
 
-        * include/makeinclude/platform_netbsd.GNU:
+          Removed tao_qtreactor as it seems to be redundant with qt=1. I'm
+          not sure if this.
 
-          Update to support current NetBSD platforms.
+        * bin/MakeProjectCreator/config/ace_qt.mpb (Module):
 
-Tue Aug 17 21:03:08 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Removed ace_qtreactor as it seems to be redundant with qt=1. I'm
+          not sure if this.
 
-        * bin/MakeProjectCreator/config/interceptors.mpb:
+        * ace/config-win32-msvc.h (Module):
 
-          New file, with base project requiring interceptors.  Project
-          files should inherit from this instead of providing explicit
-          requires statements to eliminate duplicate entries in list.
+          Removed sections related with ACE_HAS_QT and QT_DLL
+          definition. It is manged now by MPC.
 
-Tue Aug 17 17:42:16 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/config-doxygen.h (Module):
 
-        * bin/MakeProjectCreator/config/rtcosscheduler.mpb:
+          Removed ACE_HAS_QT as it is ACE_QtReactor compiles now alway if
+          qt option is set.
 
-          Changed to inherit from orbsvcslib.
+        * ace/README (Module):
 
-Tue Aug 17 09:50:46 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          Removed paragraph on ACE_HAS_QT.
 
-        * bin/MakeProjectCreator/config/ciao_servant.mpb:
-        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb:
+        * ace/QtReactor.h (Module):
+        * ace/QtReactor.cpp (Module):
 
-          Added the path to $TAO_ROOT/orbsvcs to the CIDL compiler.
+          Removed code compiled conditionally on ACE_HAS_QT
+          predicate. Compilation is now managed by MPC.
 
-Tue Aug 17 14:30:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-        * tests/Proactor_Test.cpp
-          Revertion of change to this file (for the sake of being complete).
+        Sat Dec  4 17:03:38 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Tue Aug 17 13:00:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-        * ace/Asynch_Connector.h
-          Revertion of change to this file as it breaks the windows build and
-          changed the public interface of the template class.
+        * tests/RMCast/.cvsignore (Module):
+        * ace/.cvsignore (Module):
+        * tests/.cvsignore (Module):
 
-Tue Aug 17 10:03:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          Added linux executables to prevent cvs warnings.
 
-        * ace/ACE.cpp:
+        Sat Dec  4 16:02:30 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Added ACE_UNUSED_ARG() to is_sock_error() for non-WIN32
-          builds.
+        * ace/qt_reactor.mpb (Module):
 
-Tue Aug 17 09:43:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          This base project is no necessary now.
 
-        * bin/msvc_static_order.lst:
+        Sat Dec  4 15:51:01 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Removed DOS style linefeeds.
+        * bin/MakeProjectCreator/config/ace_qtreactor.mpb (Module):
+        * ace/ace_qtreactor.mpc (Module):
 
-Tue Aug 17 08:49:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          Removed depracated qt_moc project.
 
-        * ace/OS_NS_String.cpp:
+        Sat Dec  4 15:49:03 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Removed some hidden characters causing compile problems.
+        * ACE-INSTALL.html (Module):
 
-Tue Aug 17 08:00:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-        * ace/Asynch_Connector.h
-        * tests/Proactor_Test.cpp
-          Due to a long standing fatal cross development compiler bug in the
-          Solaris -> Lynxos cross development environment.
-          (LynxOS gcc 2.95.3 cross compiler)
+          Added paragraph on building ACE_QtLibrary.
 
-Tue Aug 17 08:00:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+        Sat Dec  4 14:28:54 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * ace/ACE.h:
-          ace/ACE.cpp:
+        * bin/MakeProjectCreator/config/global.features (Module):
 
-          Added ACE::is_sock_error() to be able to test if errorcode is
-          WinSock error *before* converting to error string.
+          Added comment about -features option.
 
-        * ace/OS_NS_String.cpp:
+        Fri Dec  3 23:10:39 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Fixed WCHAR bug in ACE_OS::strerror().
-          Introduced use of ACE::is_sock_error().
+        * bin/MakeProjectCreator/config/tao_qtreactor.mpb (Added):
+        * bin/MakeProjectCreator/config/ace_xt.mpb (Added):
+        * bin/MakeProjectCreator/config/ace_x11.mpb (Added):
+        * bin/MakeProjectCreator/config/ace_tk.mpb (Added):
+        * bin/MakeProjectCreator/config/ace_qtreactor.mpb (Added):
+        * bin/MakeProjectCreator/config/ace_gtk.mpb (Added):
+        * bin/MakeProjectCreator/config/ace_gl.mpb (Added):
+        * bin/MakeProjectCreator/config/ace_fltk.mpb (Added):
+        * ace/ace_xtreactor.mpc (Added):
+        * ace/ace_tkreactor.mpc (Added):
+        * ace/ace_qtreactor.mpc (Added):
+        * ace/ace_flreactor.mpc (Added):
 
-Mon Aug 16 22:53:53 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * tests/tests.mpc (Modified):
+        * include/makeinclude/wrapper_macros.GNU (Modified):
+        * include/makeinclude/platform_sunos5_sunc++.GNU (Modified):
+        * include/makeinclude/platform_sunos5_g++.GNU (Modified):
+        * include/makeinclude/platform_lynxos.GNU (Modified):
+        * include/makeinclude/platform_linux_pgi.GNU (Modified):
+        * include/makeinclude/platform_linux_icc.GNU (Modified):
+        * include/makeinclude/platform_linux_borland.GNU (Modified):
+        * include/makeinclude/platform_linux.GNU (Modified):
+        * bin/MakeProjectCreator/config/acedefaults.mpb (Modified):
+        * bin/MakeProjectCreator/config/ace_qt.mpb (Modified):
+        * ace/ace.mwc (Modified):
+        * ace/ace.mpc (Modified):
 
-        * ace/SSL/SSL_SOCK_Stream.cpp (~ACE_SSL_SOCK_Stream):
+         Initial changes related with the separation of reactors into
+          distinct libraries.  Many thanks to Raphael Bossek
+          <raphael.bossek@gmx.de> for this patch.
 
-          Removed useless invalidation of "ssl_" pointer member by
-          assignment of zero.  Once the destructor is called, the object
-          no longer exists so invalidation is unnecessary.
+Sat Jan 22 21:18:58 2005  Kobi Cohen-Arazi  <kobi.cohenarazi@gmail.com>
 
-Mon Aug 16 16:54:18 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/Logging_Strategy.cpp (handle_timeout): Fixed when defined
+          ACE_LACKS_IOSTREAM_TOTALLY. Use ftell instead of fseek in order
+          to get the current file length. Thanks to Kim ByeongSu <kcando
+          at kcando dot org> for pointing it out.
 
-        * bin/MakeProjectCreator/config/ftorbutils.mpb
-        * bin/MakeProjectCreator/config/smart_proxies.mpb
-        * bin/MakeProjectCreator/config/svc_utils.mpb
+Sat Jan 22 21:13:11 2005  Kobi Cohen-Arazi  <kobi.cohenarazi@gmail.com>
 
-          Changed to inherit from orbsvcslib instead of taolib_with_idl.
+        * tests/Test_Output.cpp(close): Fixed when
+          ACE_LACKS_IOSTREAM_TOTALLY - fflush and fclose should be called
+          only when output_file_ is valid, and it points to the same
+          current ACE_LOG_MSG->msg_ostream ().
 
-        * bin/MakeProjectCreator/config/orbsvcslib.mpb:
+Fri Jan 21 19:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added $(TAO_ROOT)/orbsvcs to includes.
-          Added -I$(TAO_ROOT)/orbsvcs to idlflags.
+        * ACE-INSTALL.html:
+          Added Solaris 10
 
-Mon Aug 16 15:58:21 2004  Steve Huston  <shuston@riverace.com>
+Fri Jan 21 18:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Signal.cpp: Added template instantiations for
-          ACE_Fixed_Set_Iterator_Base. Related to:
-          Mon Aug  2 08:55:17 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+        * bin/MakeProjectCreator/config/ciao_client.mpb:
+          Removed duplicate includes
 
-Mon Aug 16 15:30:29 2004  Steve Huston  <shuston@riverace.com>
+Fri Jan 21 16:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Task.cpp (svc_run): Added "defined (ACE_WIN32)" to the
-          "defined (__IBMCPP__)" test for how to cast a thread result.
-          __IBMCPP__ is defined for both Windows (where the alternate cast
-          is needed) and AIX (where it is prohibited).
-          This is related to this change:
-          Fri Aug  6 08:34:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+        * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp:
+          Fixed compile error in Solaris 10 build
 
-Mon Aug 16 11:54:50 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Fri Jan 21 11:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/ACE.h (debug):
+        * etc/ace.doxygen:
+          Also parse config-lite.h and config-all.h to generate the
+          ACE documentation
 
-          Corrected the export qualifier for these functions.  They are no
-          longer inlined.
+Thu Jan 20 22:48:24 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Mon Aug 16 11:16:02 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * docs/ACE-guidelines.html:
 
-        * ace/ACE.h:
+          Removed obsolete ACE cast macro usage recommendations.  They are
+          deprecated.  Thanks to Olli Savia <ops at iki dot fi> for
+          pointing out this document needed updating.
 
-          Moved remaining ACE namespace variables out of header and into
-          the '.cpp' file.  They should not be accessed/modified
-          directly.
+          Updated and removed out-of-date guidelines.
 
-        * ace/ACE.inl (hex_chars_, nibble2hex):
+Thu Jan 20 19:07:35 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          No need to declare/define the hex_chars_ constant variable in
-          the ACE namespace.  Define it as a static constant in the
-          nibble2hex() function instead, the only place it is used.
+        * bin/ACE-casts-convert:
 
-        * ace/ACE.cpp (debug):
+          Enhanced to support conversion of ACE_*_cast_[1-5]_{ptr,ref}
+          macro calls to their standard C++ counterparts.
 
-          Unlined these functions.  They generally aren't performance
-          critical, and doing so allows us to remove the ACE::debug_
-          internal variable to the '.cpp' file.
+        * ace/Map_T.inl:
 
-Mon Aug 16 11:16:02 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Converting remaining deprecated ACE cast macro calls using the
+          enhanced ACE-casts-convert script described above.
 
-        * ace/ACE.h:
-        * ace/ACE.cpp:
+Thu Jan 20 18:18:00 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Added remaining missing DLL export qualifiers.  Fixes
-          "unresolved external symbol" errors in MS Windows builds.
+        * ACEXML/apps/svcconf/Svcconf_Handler.cpp:
+        * ACEXML/common/AttributesImpl.cpp:
+        * ACEXML/common/FileCharStream.cpp:
+        * ACEXML/common/HttpCharStream.cpp:
+        * ACEXML/common/Mem_Map_Stream.cpp:
+        * ACEXML/common/NamespaceSupport.cpp:
+        * ACEXML/common/SAXExceptions.cpp:
+        * ACEXML/common/StrCharStream.cpp:
+        * ACEXML/common/Transcode.cpp:
+        * ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp:
+        * ACEXML/parser/parser/Entity_Manager.i:
+        * ACEXML/parser/parser/Parser.cpp:
+        * ACEXML/tests/ContentHandler_Test.cpp:
+        * ACEXML/tests/Transcoder_Test.cpp:
+        * Kokyu/Dispatch_Deferrer.cpp:
+        * Kokyu/Dispatcher_Task.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+        * ace/RMCast/RMCast_Fragment.cpp:
+        * ace/RMCast/RMCast_IO_UDP.cpp:
+        * ace/RMCast/RMCast_Partial_Message.cpp:
+        * ace/RMCast/RMCast_Reassembly.cpp:
+        * apps/JAWS/server/IO.cpp:
+        * apps/JAWS/server/JAWS_Pipeline_Handler.cpp:
+        * apps/JAWS2/HTTP_10_Parse.cpp:
+        * apps/JAWS2/HTTP_10_Write.cpp:
+        * apps/JAWS2/JAWS/Assoc_Array.cpp:
+        * apps/JAWS2/JAWS/Concurrency.cpp:
+        * apps/JAWS2/JAWS/IO.cpp:
+        * apps/JAWS2/JAWS/Pipeline_Tasks.cpp:
+        * apps/JAWS3/http/HTTP_States.h:
+        * apps/JAWS3/jaws3/Asynch_IO.cpp:
+        * apps/drwho/CM_Client.cpp:
+        * apps/drwho/CM_Server.cpp:
+        * apps/drwho/server.cpp:
+        * apps/gperf/src/Hash_Table.cpp:
+        * apps/gperf/src/Key_List.cpp:
+        * apps/gperf/src/List_Node.cpp:
+        * apps/mkcsregdb/mkcsregdb.cpp:
+        * examples/APG/Config/HA_Status.cpp:
+        * examples/APG/Logging/Callback-2.h:
+        * examples/APG/Misc_IPC/UDP_Broadcast.cpp:
+        * examples/APG/Misc_IPC/UDP_Unicast.cpp:
+        * examples/APG/Naming/Name_Binding.h:
+        * examples/APG/Proactor/HA_Proactive_Status.cpp:
+        * examples/APG/Reactor/Client.cpp:
+        * examples/APG/Reactor/HAStatus-AC.cpp:
+        * examples/APG/Reactor/HAStatus.cpp:
+        * examples/APG/Reactor/Timer_State_Data.cpp:
+        * examples/APG/Shared_Memory/Hash_Map.cpp:
+        * examples/APG/Shared_Memory/Malloc.cpp:
+        * examples/APG/Shared_Memory/PI_Malloc.cpp:
+        * examples/APG/Sockets/Iovec.cpp:
+        * examples/APG/Svc_Config/HA_Status_Dynamic.cpp:
+        * examples/APG/Svc_Config/HA_Status_Static.cpp:
+        * examples/APG/ThreadPools/TP_Reactor.cpp:
+        * examples/APG/Timers/Alarm.cpp:
+        * examples/APG/Timers/CB.cpp:
+        * examples/APG/Timers/PCB.cpp:
+        * examples/APG/Timers/Task.cpp:
+        * examples/Bounded_Packet_Relay/BPR_Drivers.cpp:
+        * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp:
+        * examples/C++NPv1/Logging_Client.cpp:
+        * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp:
+        * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp:
+        * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp:
+        * examples/C++NPv2/AC_Client_Logging_Daemon.cpp:
+        * examples/C++NPv2/Client_Logging_Daemon.cpp:
+        * examples/C++NPv2/Logging_Event_Handler.h:
+        * examples/C++NPv2/Select_Reactor_Logging_Server.cpp:
+        * examples/C++NPv2/Server_Shutdown.cpp:
+        * examples/C++NPv2/Service_Reporter.cpp:
+        * examples/C++NPv2/TPC_Logging_Server.cpp:
+        * examples/C++NPv2/TP_Logging_Server.cpp:
+        * examples/C++NPv2/TP_Reactor_Logging_Server.cpp:
+        * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp:
+        * examples/C++NPv2/display_logfile.cpp:
+        * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp:
+        * examples/IPC_SAP/FILE_SAP/client.cpp:
+        * examples/IPC_SAP/SOCK_SAP/C-inclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/C-inserver.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp:
+        * examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp:
+        * examples/Reactor/Misc/notification.cpp:
+        * examples/Reactor/Multicast/Log_Wrapper.cpp:
+        * examples/Reactor/Proactor/test_aiosig_ace.cpp:
+        * examples/Reactor/WFMO_Reactor/APC.cpp:
+        * examples/Reactor/WFMO_Reactor/Handle_Close.cpp:
+        * examples/Reactor/WFMO_Reactor/Multithreading.cpp:
+        * examples/Reactor/WFMO_Reactor/Removals.cpp:
+        * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i:
+        * examples/Shared_Malloc/test_malloc.cpp:
+        * examples/Shared_Malloc/test_persistence.cpp:
+        * examples/Shared_Malloc/test_position_independent_malloc.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp:
+        * examples/TMCast/Member/member.cpp:
+        * examples/Threads/thread_manager.cpp:
+        * examples/Threads/thread_specific.cpp:
+        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp:
+        * examples/Web_Crawler/Command_Processor.cpp:
+        * examples/Web_Crawler/Iterators.cpp:
+        * examples/Web_Crawler/Mem_Map_Stream.cpp:
+        * examples/Web_Crawler/URL_Addr.cpp:
+        * examples/Web_Crawler/URL_Visitor.cpp:
+        * netsvcs/lib/Name_Handler.cpp:
+        * protocols/ace/HTBP/HTBP_Channel.cpp:
+        * protocols/ace/HTBP/HTBP_Session.cpp:
+        * performance-tests/Misc/basic_perf.cpp:
+        * performance-tests/Misc/childbirth_time.cpp:
+        * performance-tests/Misc/context_switch_time.cpp:
+        * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp:
+        * performance-tests/SCTP/SOCK_SEQPACK_srv.cpp:
+        * performance-tests/SCTP/SOCK_STREAM_clt.cpp:
+        * performance-tests/SCTP/SOCK_STREAM_srv.cpp:
+        * performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp:
+        * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp:
+        * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp:
+        * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp:
+        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp:
+        * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp:
+        * tests/ACE_Init_Test.cpp:
+        * tests/ACE_Test.cpp:
+        * tests/CDR_Array_Test.cpp:
+        * tests/Cache_Map_Manager_Test.cpp:
+        * tests/Cache_Map_Manager_Test.h:
+        * tests/Conn_Test.cpp:
+        * tests/DLL_Test.cpp:
+        * tests/DLList_Test.cpp:
+        * tests/Dynamic_Priority_Test.cpp:
+        * tests/FlReactor_Test.cpp:
+        * tests/Handle_Set_Test.cpp:
+        * tests/IOStream_Test.cpp:
+        * tests/MT_Reactor_Upcall_Test.cpp:
+        * tests/MT_SOCK_Test.cpp:
+        * tests/Malloc_Test.cpp:
+        * tests/Map_Manager_Test.cpp:
+        * tests/Max_Default_Port_Test.cpp:
+        * tests/Max_Default_Port_Test_IPV6.cpp:
+        * tests/Message_Queue_Test.cpp:
+        * tests/Message_Queue_Test_Ex.cpp:
+        * tests/Multicast_Test.cpp:
+        * tests/Multicast_Test_IPV6.cpp:
+        * tests/OS_Test.cpp:
+        * tests/Object_Manager_Test.cpp:
+        * tests/Priority_Buffer_Test.cpp:
+        * tests/Priority_Reactor_Test.cpp:
+        * tests/Proactor_Scatter_Gather_Test.cpp:
+        * tests/Proactor_Test.cpp:
+        * tests/Proactor_Test_IPV6.cpp:
+        * tests/Proactor_Timer_Test.cpp:
+        * tests/Process_Strategy_Test.cpp:
+        * tests/Reactor_Performance_Test.cpp:
+        * tests/Reactor_Timer_Test.cpp:
+        * tests/Reactors_Test.cpp:
+        * tests/Recursive_Condition_Bug_Test.cpp:
+        * tests/Recursive_Condition_Test.cpp:
+        * tests/Recursive_Mutex_Test.cpp:
+        * tests/SOCK_SEQPACK_SCTP_Test.cpp:
+        * tests/SOCK_Send_Recv_Test.cpp:
+        * tests/SOCK_Send_Recv_Test_IPV6.cpp:
+        * tests/SString_Test.cpp:
+        * tests/SV_Shared_Memory_Test.cpp:
+        * tests/Semaphore_Test.cpp:
+        * tests/Service_Config_DLL.cpp:
+        * tests/Service_Config_Test.cpp:
+        * tests/TSS_Test.cpp:
+        * tests/Task_Ex_Test.cpp:
+        * tests/Thread_Pool_Reactor_Resume_Test.cpp:
+        * tests/Thread_Pool_Reactor_Test.cpp:
+        * tests/Thread_Pool_Test.cpp:
+        * tests/Time_Value_Test.cpp:
+        * tests/HTBP/Reactor_Tests/test_config.h:
+        * tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp:
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Membership_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+        * tests/RMCast/RMCast_Reordering_Test.cpp:
+        * tests/RMCast/RMCast_Retransmission_Test.cpp:
+        * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp:
+        * websvcs/lib/URL_Addr.cpp:
+
+          Converted remainder of
+          ACE_{static,dynamic,reinterpret,const}_cast macros calls to
+          their standard C++ counterparts using new bin/ACE-casts-convert
+          script.
+
+Thu Jan 20 18:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/MEM_Acceptor.h:
+          Doxygen improvement
 
-          Moved variables in ACE namespace that are internal to ACE into
-          the '.cpp' file.  They should be not be accessed or modified
-          directly.
+Thu Jan 20 18:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Aug 16 10:58:09 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * ace/MEM_Addr.h:
+          Doxygen improvement
 
-        * ace/ACE.h (recv):
+Thu Jan 20 15:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed DLL export qualifier.  Addresses "unresolved external
-          symbol" link-time errors in MS Windows builds.
+        * ace/Connector.cpp:
+          Replaced C-style cast with C++ const_cast
 
-Mon Aug 16 12:14:37 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Thu Jan 20 07:00:15 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb:
+        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
 
-          Changed the names of the Deployment libraries. Arranged the
-          dependencies in such a manner so that it is easier to use it in
-          the application.
+          Honor the -into option by prefixing each open with the
+          correct output directory determined by the new method on the
+          Creator.
 
-Mon Aug 16 09:27:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+Thu Jan 20 01:16:21 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * bin/msvc_mpc_auto_compile.pl:
+        * bin/ACE-casts-convert:
 
-           Added MSVC 7.1 compatibility through '-vc7' option.
+          New convenience script that converts all ACE cast macro calls
+          (e.g. ACE_static_cast (foo, bar)) to their standard C++
+          counterparts (e.g. static_cast<foo> (bar)).  It is meant as an
+          aid to help app developers that use the ACE cast macros upgrade
+          their apps to the standard C++ cast syntax since the ACE cast
+          macros were deprecated back in ACE 5.4.2.
 
-        * bin/msvc_static_compile.pl:
+Wed Jan 19 23:06:14 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Added MSVC 7.1 compatibility through '-vc7' option. Added
-          support for MPC '-name_modifier' option.
+        * bin/MakeProjectCreator/config/acelib.mpb:
 
-        * bin/msvc_static_compile.lst:
+          Changed to inherit from pkgconfig.mpb.
 
-          Removed projectfile extensions to be able to generate these
-          dynamically from 'msvc_static_compile.pl'.
+        * bin/MakeProjectCreator/config/pkgconfig.mpb:
 
-Sat Aug 14 19:38:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          New file, custom file definition for pkgconfig *.pc.in file.
 
-        * ace/CDR_Base.h:
+Wed Jan 19 15:20:19 2005  Steve Huston  <shuston@riverace.com>
 
-          Do not include "ace/If_Then_Else.h" when using MSVC++ 6.  It
-          can't handle the partial template specializations in that file.
+        * ace/Dev_Poll_Reactor.inl: Add #include "ace/Log_Msg.h" to pick up
+          ACE_ASSERT. Fixes compile error on Solaris 9.
 
-Sat Aug 14 19:34:02 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Wed Jan 19 11:23:41 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/Sock_Connect.cpp (ipv6_enabled_):
+        * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm:
 
-          Fixed syntax error.
+          Use the new get_use_env() method which is part of the MPC change
+          from Wed Jan 19 11:20:42 2005.
 
-Sat Aug 14 13:07:50 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Wed Jan 19 08:28:11 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp (subscribe_ifs):
+        * bin/tao_orb_tests.lst:
 
-          The "ACE_Sock_Connect" interim pseudo namespace no longer
-          exists.  Use the true "ACE" C++ namespace instead.  Fixes a
-          compile-time error.
+          Added TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl to
+          the list of tests.
 
-Sat Aug 14 14:48:01 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Tue Jan 18 09:32:47 2005  Chad Elliott  <elliott_c@ociweb.com>
 
+        * bin/MakeProjectCreator/templates/bor.mpd:
         * bin/MakeProjectCreator/templates/gnu.mpd:
 
-          Add /usr/lib as a path for library check. If the location of the
-          library is not specified by the application, the compiler,
-          linker and loader knows where to look in for *nix based
-          systems. So should our library checker.Without this applications
-          MPC file starts pointing to /usr/lib to locate libraries like
-          PCAP and XERCES, which can be installed with system
-          libraries. It is bad to see installation specific thingies
-          making its way up the order.
+          Allow the addition to 'command' and 'dependent' within the scope
+          of a custom section.  This is part of the MPC change from
+          Tue Jan 18 09:29:09 2005.
+
+Tue Jan 18 08:17:10 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-Sat Aug 14 09:28:19 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * ace/Log_Msg.cpp (open): Fixed the logic to pass prog_name
+          rather than logger_key, which fixes a bug with syslog.  Thanks
+          to Robert Iakobashvili <roberti@GoNetworks.com> for this fix.
 
-        * ace/CDR_Base.h (ACE_CDR::Boolean):
+Mon Jan 17 23:08:20 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          MSVC++ 6 can't handle partial template specializations so fall
-          back on an unsigned char typedef if _MSC_VER < 1300 (i.e. MSVC++
-          version is less than 7).  This is an interim solution to get the
-          MSVC++ 6 builds going again.
+        * configure.ac:
+
+          Clarify that we're checking whether the second argument to
+          gettimeofday() is a _struct_ timezone *.
 
-        * ace/IfThenElse.h:
-        * ace/If_Then_Else.h:
+        * m4/platform.m4:
 
-          Renamed the former to the latter, including the class template
-          defined within, to match ACE naming conventions.  Thanks to Doug
-          for pointing this out.
+          Fixed ACE_VAR_TIMEZONE macro to avoid false positive on systems
+          with the timezone() function.
 
-Sat Aug 14 01:43:16 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Sun Jan 16 23:26:58 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/CDR_Base.h (ACE_CDR):
+        * m4/config_h.m4:
 
-          Parenthesize boolean condition that is the first argument to the
-          ACE::IfThenElse<> template to avoid any potential confusion.
+          Removed autoheader template for ACE_HAS_SIGINFO_T.
 
-Sat Aug 14 00:33:59 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * configure.ac:
 
-        * ace/IfThenElse.h (IfThenElse):
+          Simplified check for ACE_HAS_SIGINFO_T.
+          Added check for ACE_LACKS_SI_ADDR.
+          Added check for ACE_HAS_PTHREAD_NP_H.
 
-          Place sample code within a Doxygen code block.  Addresses some
-          documentation formatting problems.
+Sun Jan 16 22:14:25 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Fri Aug 13 23:26:56 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * ace/os_include/os_pthread.h:
 
-        * ace/IfThenElse.h:
+          #include <pthread_np.h> if ACE_HAS_PTHREAD_NP_H is defined.
 
-          New template that allows one to choose between two types at
-          compile-time based on a boolean value.  This is basically the
-          IfThenElse template described in the book "C++ Templates" by
-          Vandevoorde and Josuttis.
+        * ace/README:
 
-        * ace/CDR_Base.h (ACE_CDR::Boolean):
+          Document new feature test macro ACE_HAS_PTHREAD_NP_H.
 
-          Detect at compile-time whether the C++ "bool" type can be used
-          as the underlying ACE_CDR::Boolean type using the new
-          ACE::IfThenElse template.
+Sun Jan 16 18:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/ACE.h:
-        * ace/Flag_Manip.cpp:
-        * ace/Flag_Manip.h:
-        * ace/Flag_Manip.inl:
-        * ace/Handle_Ops.cpp:
-        * ace/Handle_Ops.h:
-        * ace/Init_ACE.cpp:
-        * ace/Init_ACE.h:
-        * ace/Lib_Find.cpp:
-        * ace/Lib_Find.h:
-        * ace/Sock_Connect.cpp:
-        * ace/Sock_Connect.h:
-
-          Functions that were in the pseudo "ACE" namespace are now in a
-          true "ACE" C++ namespace.
-
-        * ace/ACE.inl (log2):
-
-          Use the prefix increment operator when incrementing the loop
-          index.  It is generally more efficient than the postfix
-          increment operator.
-
-        * ace/Asynch_Acceptor.cpp:
-        * ace/Asynch_Connector.cpp:
-        * ace/DEV_Connector.cpp:
-        * ace/DLL_Manager.cpp:
-        * ace/FILE_Addr.cpp:
-        * ace/FILE_Connector.cpp:
-        * ace/INET_Addr.inl:
-        * ace/IO_SAP.cpp:
-        * ace/IPC_SAP.cpp:
-        * ace/Logging_Strategy.cpp:
-        * ace/MEM_Acceptor.cpp:
-        * ace/Memory_Pool.cpp:
+        * ace/CDR_Stream.{h,cpp}:
+          Don't implement the destructor of ACE_WChar_Codeset_Translator
+          in the header file, but in the cpp file. Fixes link errors
+          with TAO and Cygwin. Thanks to Mike McGahan
+          <mcgahan at sparta dot com> for reporting this.
+          This fixes bugzilla id [2020].
+
+Sat Jan 15 22:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc:
+          Also build the client after the Test_Output library
+
+Thu Jan 13 23:32:03 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * ace/Capabilities.cpp:
+        * ace/Configuration.cpp:
+        * ace/Connector.cpp:
+        * ace/Containers_T.cpp:
+        * ace/Dev_Poll_Reactor.cpp:
+        * ace/Dynamic_Service.cpp:
+        * ace/FILE.cpp:
+        * ace/LSOCK_Acceptor.cpp:
+        * ace/LSOCK_Stream.cpp:
+        * ace/Log_Msg.cpp:
+        * ace/Message_Queue.cpp:
+        * ace/Message_Queue_T.cpp:
         * ace/Naming_Context.cpp:
+        * ace/OS_NS_fcntl.cpp:
+        * ace/OS_NS_netdb.cpp:
+        * ace/OS_NS_stdio.cpp:
+        * ace/OS_NS_stropts.cpp:
+        * ace/OS_NS_sys_uio.cpp:
+        * ace/OS_NS_sys_utsname.cpp:
+        * ace/OS_NS_time.cpp:
+        * ace/OS_NS_unistd.inl:
+        * ace/OS_NS_wchar.cpp:
+        * ace/OS_Thread_Adapter.cpp:
+        * ace/Obstack_T.cpp:
         * ace/POSIX_Asynch_IO.cpp:
+        * ace/POSIX_CB_Proactor.cpp:
         * ace/POSIX_Proactor.cpp:
+        * ace/Parse_Node.cpp:
+        * ace/Remote_Name_Space.cpp:
         * ace/SOCK_Acceptor.cpp:
-        * ace/SOCK_Dgram.cpp:
+        * ace/SOCK_Connector.cpp:
         * ace/SOCK_Dgram_Mcast.cpp:
         * ace/SOCK_SEQPACK_Acceptor.cpp:
-        * ace/SPIPE_Connector.cpp:
-        * ace/System_Time.cpp:
-        * ace/UPIPE_Connector.cpp:
-        * tests/Enum_Interfaces_Test.cpp:
-        * tests/FIFO_Test.cpp:
-        * tests/INET_Addr_Test.cpp:
-        * tests/INET_Addr_Test_IPV6.cpp:
+        * ace/SOCK_SEQPACK_Association.cpp:
+        * ace/SOCK_SEQPACK_Connector.cpp:
+        * ace/Select_Reactor_Base.cpp:
+        * ace/Service_Config.cpp:
+        * ace/Service_Repository.cpp:
+        * ace/Sock_Connect.cpp:
+        * ace/Stream_Modules.cpp:
+        * ace/Svc_Conf.y:
+        * ace/Svc_Conf_y.cpp:
+        * ace/TLI.cpp:
+        * ace/TLI_Acceptor.cpp:
+        * ace/TLI_Connector.cpp:
+        * ace/TSS_T.cpp:
+        * ace/Timer_Heap_T.cpp:
+        * ace/Timer_Wheel_T.cpp:
+        * ace/Token_Collection.cpp:
+        * ace/UPIPE_Stream.cpp:
+        * ace/UUID.cpp:
+        * ace/Unbounded_Queue.cpp:
+        * ace/Unbounded_Set.cpp:
+        * ace/WFMO_Reactor.cpp:
+        * ace/WIN32_Asynch_IO.cpp:
+        * ace/WIN32_Proactor.cpp:
+
+          Converted all ACE_*_cast macro calls to their standard C++
+          counterparts.  The ACE_*_cast macros were deprecated in ACE
+          5.4.2.
+
+Thu Jan 13 11:29:35 2005  Boris Kolpackov  <boris@dre.vanderbilt.edu>
+
+        * ace/TMCast/Group.cpp:
+        * ace/TMCast/LinkListener.hpp: Use ACE_hthread_t instead of
+          ACE_thread_t to join threads.
+
+Wed Jan 12 22:52:12 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * ace/OS_NS_stdio.h (gets):
+        * ace/OS_NS_stdio.cpp (gets):
+
+          Removed this implementation.  While this ACE implementation of
+          gets() did not contain the security holes that all standard
+          gets() implementations have, keeping it around only serves to
+          foster confusion since (1) some may incorrectly assume that this
+          ACE-specific gets() implementation has the same holes as
+          standard ones, and (2) invoking it with a default size argument
+          so that it looks like a standard gets() call results in behavior
+          that is different from the standard.  Use fgets() instead.
+
+        * examples/C++NPv2/Select_Reactor_Logging_Server.cpp:
+        * examples/C++NPv2/Server_Shutdown.cpp:
+        * examples/C++NPv2/TP_Reactor_Logging_Server.cpp:
+
+          Replaced all gets() calls with their fgets() counterparts.
+          gets() is evil (read insecure), and should not be used.
+
+Wed Jan 12 14:02:03 2005  Boris Kolpackov  <boris@dre.vanderbilt.edu>
+
+        * ace/TMCast/Group.cpp:
+        * ace/TMCast/LinkListener.hpp: Called different version of
+          ACE_OS::thr_join which happens to be supported on Win32.  Thanks
+          to Huang Rui <huangrui@mail.cqzte.com.cn> for reporting the
+          problem and helping in narrowing it down.
+
+Tue Jan 11 23:16:35 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Updated all calls to functions that were in the pseudo "ACE"
-          namespace through a former ACE class base class
-          (e.g. ACE_Sock_Connect, ACE_Flag_Manip, etc) to use the correct
-          "ACE" namespace.  Use of the base class names should never have
-          been used since it was known long ago that the "ACE" pseudo
-          namespace would be changed to true C++ namespace.
+        * configure.ac:
 
-        * ace/Basic_Types.h:
-        * ace/OS_NS_fcntl.inl:
-        * ace/OS_NS_stdio.h:
-        * ace/OS_NS_stdlib.h:
+          Added test for existence of `/dev/poll' device file.  If that
+          file exists and is readable define the "ACE_HAS_DEV_POLL"
+          preprocessor symbol.
 
-          Nuked trailing whitespace.
+        * m4/config_h.m4:
 
-Sat Aug 14 03:44:02 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          Minor preprocessor symbol documentation fixes.
 
-        * ace/TSS_T.cpp:
+Tue Jan 11 22:32:47 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Fixed compilation errors in the SingleThreaded builds.
+        * ace/Dev_Poll_Reactor.cpp (remove_handler_i):
 
-Sat Aug 14 03:37:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          Release the lock during the "close" upcall.  Fixes a deadlock
+          that occurred when cancelling a timer during removal of an event
+          handler from the reactor.  Thanks to Gao Xianchao <info at
+          socks5cn dot com> for reporting the problem and confirming that
+          this change fixes the problem.
 
-        * ace/OS_NS_Thread.cpp:
+Wed Jan 12 00:12:03 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-          Fixed a unused variable warning in the daily builds.
+        * ace/OS_NS_signal.inl:
 
-Sat Aug 14 01:58:32 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          Fixed a compile error with the following checkin "Tue Jan 11
+          18:14:22 2005  Steve Huston  <shuston@riverace.com>". Not sure
+          whether this is going to break aCC. The existing code broke
+          atleast g++ 3.3.4. Need to sync with Steve on this.
 
-        * Release:
+Tue Jan 11 18:14:22 2005  Steve Huston  <shuston@riverace.com>
 
-          Added the NEWS file to the release. Thanks to Ramiro Morales
-          <rm0 at gmx dot net> for reporting the problem.
+        * ace/OS_NS_signal.inl: Added "namespace ACE_OS" to this as some other
+          .inl files have done. This helped get HP aC++ around its confusion
+          of ACE_OS::sigaction() vs. sigaction(). Added "::" to the sigaction
+          type specifiers in the signature to resolve the confusion between
+          the sigaction type and ACE_OS::sigaction.
 
-Fri Aug 13 16:17:32 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+Mon Jan 10 12:41:23 2005  Steve Huston  <shuston@riverace.com>
 
-        * ace/Module.h (class ACE_Module):
-        * ace/Task.h (ACE_Task_Base):
-          Updated the documentation so it's more clear.  Thanks to Andrew
-          Athan <aathan-ace-bugs-1524@cloakmail.com> for motivating this.
+        * tests/Test_Output.cpp (close): If the output_file_ pointer is
+          already 0, don't flush/close/delete it. Logging_Strategy_Test
+          does a close before the end of the program, and this will
+          cause ACE_END_TEST to close it again and crash, at least on
+          some plaforms.
 
-        * ace/Stream.h: Updated the documentation for push() and pop() to
-          clarify how it affects open() and close() hooks on the tasks.
-          Thanks to Andrew Athan <aathan-ace-bugs-1524@cloakmail.com> for
-          motivating this.
+Mon Jan 10 10:29:38 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-Fri Aug 13 15:26:40 2004  Dale Wilson  <wilson_d@ociweb.com>
+        * bin/MakeProjectCreator/templates/gnu.mpd:
 
-        * ace/TSS_T.cpp:
-          Pass the TSS key to ACE_OS::thr_key_detach.  This
-          eliminates the table lookup formerly required to
-          identify the key being detached.
+          Ensure that all generated files are created before attempting to
+          create the precompiled header binary.
 
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.cpp:
-          --Accept and use the TSS key from TST_T.cpp
-          --Typedef the function pointer used to delete TSS
-          objects.  This improves readability.
-          --Change the name of the ACE_TSS_Info member from
-          tss_obj_ to tss_info_.  This avoids confusion
-          due to conflicting use of the name "tss_obj"
-          --Check to see if a thread has actually used
-          a TSS key before decrementing the "number of
-          threads using this key" counter.  This eliminates
-          a messy situation in which the key is deleted
-          while threads are still using it.
-          --Fix bugzilla 1542:  Leaks in ACE_TSS
-          Note that the patch suggested
-          in the bugzilla report did not completely address
-          the problem, so this fix takes a different approach.
-          Significant features of this change:
-          > The ACE_TSS_Cleanup::detach method now frees the
-            thread's specified TSS entry.  Formerly it leaked it.
-          > The exit method defers to the detach method to
-            free the entry. This ensures entries are handled
-            consistently -- no matter how they are freed up.
-          > The ACE_TSS_Cleanup::in_use_ entry receives special
-            handling to avoid using it while deleting it.  Formerly
-            it was leaked, so it didn't matter.
-          -- Note this does NOT address bugzilla 1797.  I'll
-          look at that one next.
-
-        * ace/Object_Manager.cpp:
-          Eliminating TSS leaks revealed another problem.  The
-          main thread was not waiting for other threads to exit
-          before dismantling the ACE infrastructure in
-          Object_Manager::fini.  There's a hack in Thread_Manager
-          that disables the wait method when the Object_Manager
-          is shutting down.
-          Unfortunatly this causes a messy race condition in which
-          one thread is deleting objects while other threads are
-          using them.
-          The "solution" here is to call Thread_Manager::wait()
-          with a short (1 second) timeout.  If the threads have
-          already exited -- no problem, and no delay.  If they
-          haven't, they get a chance to exit cleanly.
-
-Fri Aug 13 18:43:01 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * ace/CDR_Base.h (ACE_CDR):
-
-          Reverted the usage of C++ bool as a typedef of
-          ACE_CDR::Boolean. We will now use unsigned char on all
-          platforms. MacOSX (Panther) atleast makes the size of bool to be
-          4 bytes which creates problems for TAO. Thanks to Rich Shapiro
-          <rshapiro at bbn dot com> for reporting the problem.
-
-Fri Aug 13 18:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/IOStream_T.h:
-          When ACE_LACKS_IOSTREAM_FX is defined, also include ace/os_include/
-          os_ctype.h
-
-Fri Aug 13 12:03:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/depgen.pl:
 
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          Also install pidl files
+          Use canonpath on all paths provide by the user to ensure that
+          things get substituted properly in the generated dependency file.
 
-Fri Aug 13 07:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Jan 10 16:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * include/makeinclude/platform_gnuwin32_common.GNU:
-          Pass the def file with -Wl, to the compiler, it is a linker option
-          and with the Cygwin GCC 3.3.3 it seems the compiler thinks the def
-          file is a modula2 file. By marking it as linker option it works
-          without problems again
+        * examples/Mem_Map/IO-tests/test_io.cpp:
+          Fixed compile errors
 
-        * etc/*.doxygen:
-          Set INTERNAL_DOCS to YES, that way we generate documentation for
-          stuff marked with @internal, but doxygen will make sure the
-          documentation says it is for internal use only
+Mon Jan 10 12:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug 12 21:17:05 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * apps/gperf/tests/test.cpp:
+          Fixed unicode link errors
 
-        * bin/MakeProjectCreator/config/taolib.mpb:
-          Inherit from pidl.mpb:
+Mon Jan 10 10:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/pidl.mpb:
-          New file, custom file type definition for *.pidl files.
+        * examples/Mem_Map/IO-tests/test_io.cpp:
+        * examples/IPC_SAP/TLI_SAP/ftp-server.cpp:
+        * examples/IPC_SAP/TLI_SAP/ftp-client.cpp:
+        * examples/IPC_SAP/TLI_SAP/db-server.cpp:
+        * examples/IPC_SAP/TLI_SAP/db-client.cpp:
+        * examples/IPC_SAP/TLI_SAP/CPP-server.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp:
+        * examples/Connection/non_blocking/test_lsock_acceptor.cpp:
+        * examples/Bounded_Packet_Relay/bpr_thread.cpp:
+        * examples/ASX/Message_Queue/bounded_buffer.cpp:
+        * examples/ASX/Message_Queue/priority_buffer.cpp:
+        * examples/ASX/CCM_App/SC_Client.cpp:
+          Fixed unicode link errors
 
-Thu Aug 12 16:12:18 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Mon Jan 10 08:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/fuzz.pl:
+        * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp:
+          Fixed compile error
 
-          Priority of synch.h inclusion is reduced.
+Sun Jan  9 19:49:19 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Thu Aug 12 13:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ACE-INSTALL.html:
 
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
-          Use LIBMODIFIER with bmake, not LIB_MODIFIER
+          Updated to note that autoconf/automake build is available
+          in ACE only and ACE+TAO releases.
 
-Thu Aug 12 07:54:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sun Jan  9 18:29:13 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * include/makeinclude/platform_hpux_gcc.GNU:
-          Removed support for buildbits=64 again, the way I tried it doesn't
-          work
+        * ACEXML/apps/svcconf/Makefile.am:
+        * ACEXML/common/Makefile.am:
+        * ACEXML/parser/parser/Makefile.am:
+        * Kokyu/Makefile.am:
+        * protocols/ace/HTBP/Makefile.am:
 
-Wed Aug 11 22:20:49 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          Generate pkg-config *.pc files from templates.
 
-        * bin/fuzz.pl:
+        * ACEXML/apps/svcconf/ACEXML_XML_Svc_Conf_Parser.pc.in:
+        * ACEXML/common/ACEXML.pc.in:
+        * ACEXML/parser/parser/ACEXML_Parser.pc.in:
+        * Kokyu/Kokyu.pc.in:
+        * protocols/ace/HTBP/ACE_HTBP.pc.in:
 
-          Priority of OS.h and Synch.h inclusions have been reduced.
+          New files, pkg-config *.pc templates.
 
-Wed Aug 11 11:55:46 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Sun Jan  9 17:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/event.mpb
-        * bin/MakeProjectCreator/config/ftorbutils.mpb
-        * bin/MakeProjectCreator/config/ftrtevent.mpb
-        * bin/MakeProjectCreator/config/rtcorbacommon.mpb
-          Changed to inherit from minimum_corba instead of providing avoids
-          statements to eliminate duplicate entries in list.
+        * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp:
+        * examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp:
+        * examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp:
+          Fixed unicode compile errors
 
-Wed Aug 11 08:48:48 2004  Chad Elliott  <elliott_c@ociweb.com>
+Sun Jan  9 17:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm:
-        * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm:
-        * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
-        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
+        * netsvcs/lib/Server_Logging_Handler_T.{h,cpp}:
+          Fixed unicode compile errors
 
-          Call $self->mpc_dirname() instead of dirname() to be consistent
-          with the modules in MPC.
+Sun Jan  9 12:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/mpc.pl:
-        * bin/mwc.pl:
+        * examples/IOStream/client/iostream_client.cpp:
+        * examples/IOStream/server/iostream_server.cpp:
+        * examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp:
+        * examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp:
+        * examples/OS/process/process.cpp:
+          Fixed unicode link errors
 
-          Put back the getBasePath() function and cleaned up the VMS
-          support.
+Sun Jan  9 12:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Aug 11 10:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * examples/Connection/non_blocking/test_lsock_connector.cpp:
+        * examples/Connection/non_blocking/test_spipe_acceptor.cpp:
+        * examples/Connection/non_blocking/test_spipe_connector.cpp:
+        * examples/Connection/non_blocking/test_tli_acceptor.cpp:
+        * examples/Connection/non_blocking/test_tli_connector.cpp:
+          Fixed unicode link errors
 
-        * bin/tao_other_tests.lst:
-          Don't run the PluggableUDP examples when NO_DIOP is defined,
-          makes it possible to exclude these examples in builds that don't
-          have DIOP
+Sun Jan  9 11:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Aug 11 08:32:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+        * tests/Unbounded_Set_Test.cpp:
+          Removed test for bug 1460, it is just not safe to remove the element
+          the iterator points to, always move the iterator first forward
+          and then remove the element.
 
-        * ace/Process.cpp:
-          Added OpenVMS version of ACE_Process::spawn().
+Sat Jan  8 14:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * include/makeinclude/platform-openvms.GNU:
-          Removed mathlibrary from required libs.
-          Added dummy code to circumvent 'touch' problem with OpenVMS make port.
+        * bin/MakeProjectCreator/config/server.mpb:
+          Removed this file, name is just too generic, use taoserver for
+          TAO servers that have taoexe and portableserver as base project
+          and server as exename
 
-Wed Aug 11 08:00:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Jan  7 21:04:44 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * bin/tao_other_tests.lst:
-          Don't run TAO/orbsvcs/tests/Notify/performance-tests/Filter when
-          MINIMUM is set, this test isn't build with minimum corba
+        * include/makeinclude/wrapper_macros.GNU:
 
-Tue Aug 10 10:57:00 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Added the required path settings for SSL.
 
-        * configure.ac:
-          Enable check for ACE_HAS_WCHAR.  We'll never shake out any
-          wide character configuration bugs that may remain if it's
-          disabled.
+Fri Jan  7 18:23:19 2005  Steve Huston  <shuston@riverace.com>
 
-Tue Aug 10 11:08:31 2004  Steve Huston  <shuston@riverace.com>
+        * configure.ac: Corrected the check for ACE_HAS_CONFLICTING_XTI_MACROS.
+          We're checking for a conflict of macros from other places. The
+          requirement for this macro originally came from HP-UX, and shows
+          as a "Future error" (aka a warning) from aC++. Simply having
+          the macros show up when the "wrong" header is included first isn't
+          a problem - it's the compiler complaining that they conflict.
 
-        * ace/config-linux-common.h: Removed ACE_LACKS_TOWLOWER and
-          ACE_LACKS_TOWUPPER. These functions are present but, I suspect,
-          marked "lacks" because of type conflicts, which J.T. Conklin fixed:
-          Mon Aug  9 23:13:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Fri Jan  7 19:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Aug 10 06:52:47 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/tests.mpc:
+          Found that Unbounded_Set_Test was not listed, added this
 
-        * configure.ac:
-          Removed AC_LANG_PUSH([C])/.../AC_LANG_POP([C]) which forced the
-          use of C for selected AC_CHECK_FUNC calls.  The current version
-          of autoconf always uses C.
+        * tests/run_test.lst:
+          Removed Unbounded_Set_Test_Ex, but added Unbounded_Set_Test
 
-Tue Aug 10 14:00:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
+Fri Jan  7 15:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        I shouldn't have been rushed into these guarded #includes. The
-        following two files now need these guarded #includes to be moved
-        after the rest.
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i:
+          Added include of OS_NS_unistd.h to fix compile errors in Solaris 10
+          build.
 
-        * ace/FILE_IO.h
-        * ace/FIFO_Send_Msg.h
-          Moved guarded  #include "ace/OS_NS_stropts.h"  to end of other
-          #includes
+Fri Jan  7 08:39:40 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-Tue Aug 10 11:20:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
+        * tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc:
+        * tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc:
 
-        * examples/IOStream/server/iostream_server.cpp
-          Added missing  #include "ace/OS_NS_unistd.h"  inside the guard of
-          #if defined (ACE_HAS_STRING_CLASS)
+          Added after += Test_Output to make sure that these projects aren't
+          built before the Test_Output library.
 
-        * tests/IOStream_Test.cpp
-          Added missing  #include "ace/OS_NS_unistd.h"  inside the guard of
-          #if !defined (ACE_LACKS_ACE_IOSTREAM)
+Fri Jan  7 13:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Aug 10 12:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Unbounded_Set_Ex.{h,cpp,inl}:
+        * ace/ace.mpc:
+        * ace/Makefile.am:
+          Removed the ACE_Unbounded_Set_Ex. It gives the false idea
+          that the iterators can be used thread safe. If you used this,
+          use ACE_Unbounded_Set and handle thread safety in your own
+          code
 
-        * bin/tao_orb_tests.lst:
-        * bin/tao_other_tests.lst:
-          When DISABLE_BIDIR is set, don't run the BiDIR tests, this can be
-          used for builds that build without BiDIR GIOP
+        * ace/Node.{h,cpp}:
+          Removed deleted_, this was there for ACE_Unbounded_Set_Ex, which
+          is now removed.
 
-Tue Aug 10 11:20:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
+        * tests/Unbounded_Set_Test_Ex.{h,cpp}:
+        * tests/Makefile.am:
+        * tests/tests.mpc:
+          Removed the ACE_Unbounded_Set_Ex test
 
-        Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for the information
-        leading to these guard conditions.
+Fri Jan  7 11:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Sock_Connect.cpp
-          Added guard checks around #include "ace/OS_NS_fcntl.h"
+        * ace/OS_NS_math.inl:
+          Replaced ACE_OS:: before each method with namespace ACE_OS {},
+          hopefully this fixes the compile warnings in the SuSE 8 fuzz builds.
+          Thanks to Steve Huston for this idea.
 
-        * ace/DEV_IO.h
-        * ace/FILE_IO.h
-        * ace/FIFO_Send_Msg.h
-          Added guard checks around #include "ace/OS_NS_stropts.h"
+        * ace/config-vxworks5.x.h:
+          Removed ACE_HAS_NONCONST_RMDIR, rmdir has a const char* on VxWorks
 
-        * ace/Pipe.cpp
-        * ace/SPIPE_Acceptor.cpp
-          Added guard checks around #include "ace/OS_NS_unistd.h"
+        * ace/OS_NS_unistd.inl (rmdir):
+          Removed part with ACE_HAS_NONCONST_RMDIR, there are no config files
+          anymore that define this
 
-Mon Aug  9 23:13:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/README:
+          Removed ACE_HAS_NONCONST_RMDIR
 
-        * ace/config-freebsd.h:
-          Remove #define of ACE_LACKS_TOWLOWER and ACE_LACKS_TOWUPPER.
-          FreeBSD has these functions, but they were disabled because
-          of the problem below.
+Thu Jan  6 18:29:22 2005  Steve Huston  <shuston@riverace.com>
 
-        * ace/OS_NS_ctype.h:
-        * ace/OS_NS_ctype.inl:
-        * ace/OS_NS_strings.cpp:
-        * ace/OS_NS_wchar.cpp:
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp:
-        * tests/Config_Test.cpp:
-        * tests/Proactor_Test.cpp:
-        * tests/Proactor_Test_IPV6.cpp:
-          Renamed ACE_OS::to_upper(int) and ACE_OS::to_upper(wint_t) to
-          ACE_OS::ace_toupper() and ACE_OS::ace_towupper() because they
-          are ambiguous on systems where wint_t is in fact an int.  The
-          same was done for ACE_OS::to_lower(), etc.
+        * configure.ac: Added check for
+          ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS ( ~CLASS<PARAM>() ),
+          and made it the primary check since most compilers like this one.
+          If this one fails, then test for
+          ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR ( ~CLASS() ). Some
+          compilers don't like this one (such as IBM Visual Age C++) but
+          do like the first one.
 
-Mon Aug  9 18:12:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+        * m4/config_h.m4: Added ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS.
 
-        * ace/OS_NS_stdlib.cpp (realpath):
-          Applied ACE code formatting to make it readable
+Thu Jan  6 08:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Aug  9 15:20:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
+        * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp:
+        * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp:
+          Added includes to fix compile errors in Solaris 10 build
 
-        * ace/Sock_Connect.cpp
-          Added missing #include "ace/OS_NS_fcntl.h"
+Wed Jan  5 14:06:03 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/DEV_IO.h
-        * ace/FILE_IO.h
-        * ace/FIFO_Send_Msg.h
-          Added missing #include "ace/OS_NS_stropts.h"
+        * ace/config-aix-4.x.h:
+        * include/makeinclude/platform_aix_ibm.GNU:
 
-        * ace/Pipe.cpp
-        * ace/SPIPE_Acceptor.cpp
-          Added missing #include "ace/OS_NS_unistd.h"
+          Visual Age 6 does not require #pragma implementation for template
+          cpp files and so for backward compatibility, set the
+          ACE_TEMPLATES_REQUIRE_PRAGMA macro if using Visual Age 5 or
+          earlier and ACE_TEMPLATES_REQUIRE_SOURCE for 6 and later.
 
-Mon Aug  9 15:05:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+Wed Jan  5 13:03:23 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * include/makeinclude/platform_hpux_gcc.GNU:
-          When buildbits is set to 64, add -m64 to the CPPFLAGS
+        * ace/qt_reactor.mpb:
 
-Mon Aug  9 09:25:12 2004  Huang-Ming Huang  <hh1@cse.wustl.edu>
+          Modified this file similarly to those in
 
-        * tests/Dynamic_Priority_Test.cpp:
-          Fixed buffer overrun problem when ACE_HAS_TIMED_MESSAGE_BLOCKS
-          macro is defined.
+          Wed Jan  5 09:25:49 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Mon Aug  9 09:56:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+          so that MPC regeneration will work correctly when qt=1.
 
-        * examples/APG/Processes/Spawn.cpp:
-          Changed the check of the result of spawn, use ACE_INVALID_PID
-          instead of -1.
+Wed Jan  5 17:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Aug  9 08:55:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+        * ace/Dev_Poll_Reactor.cpp:
+          Added include of ace/OS_NS_stropts.h to get ACE_OS::ioctl
 
-        * ace/OS_NS_unistd.inl (chdir):
-          Fixed Visual Age on Win32 implementation
+Wed Jan  5 09:25:49 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
-          this.
+        * ace/ace.mpc:
+        * ace/codecs.mpb:
+        * ace/filecache.mpb:
+        * ace/other.mpb:
+        * ace/svcconf.mpb:
+        * ace/token.mpb:
+        * ace/uuid.mpb:
 
-Sun Aug  8 22:43:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Removed the extra nested braces related to ACE_COMPONENTS
+          that create "subdirectories" in VC project files. In makefiles,
+          these "components" can be separately compiled but not linked,
+          so the feature is not used on any platform. In VC projects,
+          the extra level of folders makes source and header files
+          much harder to locate in the GUI environment.
 
-        * ace/config-integritySCA.h:
-        * m4/config_h.m4:
-          Removed vestigial mentions of ACE_HAS_ONE_DEFINITION_RULE.
+Wed Jan  5 14:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Sun Aug  8 17:38:05 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/Dev_Poll_Reactor.cpp:
+          Always include OS_NS_fcntl.h and OS_NS_unistd.h
 
-        * ace/README:
-        * ace/config-g++-common.h:
-          Removed vestigial mentions of ACE_HAS_GNUG_PRE_2_8.
+Wed Jan  5 14:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * m4/compiler.m4:
-        * m4/config_h.m4:
-          Removed check for ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS
-          and ACE_HAS_GNUG_PRE_2_8, as those feature test macros have been
-          removed from ACE for some time.
+        * ace/RMCast/RMCast.{h,cpp,i}:
+        * ace/RMCast/RMCast_Worker.{h,cpp,i}:
+        * ace/RMCast/RMCast_Module_Factory.{h,cpp,i}:
+        * ace/RMCast/RMCast_Reassembly.{h,cpp,i}:
+          Removed i file, update h/cpp
 
-        * m4/config_h.m4:
-        * m4/threads.m4:
-          Replaced AH_TEMPLATE for ACE_HAS_STHREADS and ACE_HAS_PTHREADS
-          with third argument to AC_DEFINE.
+        * ace/RMCast/*.cpp:
+          Updated module name to RMCast in ACE_RCSID tag
 
-Sun Aug  8 07:12:32 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/RMCast/Makefile.am:
+          Updated
 
-        * configure.ac:
-          Start converting checks for for prototypes to use AC_CHECK_DECL
-          instead of AC_EGREP_CPP or AC_EGREP_HEADER.
+Wed Jan  5 13:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/OS_NS_sys_resource.inl:
-          Changed so conditionals aren't used inside macro call.
+        * bin/fuzz.pl:
+          Added zip files to the noncvs files that shouldn't be in the repo.
+          Added a new check that tests for inline files just containing empty
+          lines and c-style comments. These files shouldn't be in the repo
+          and need to get removed. There is an exclusion for TAO_IDL generated
+          files, we don't have an option yet to suppress the generation of
+          empty inline files so, we allow them for the time being. Thanks to
+          Don Hinton, Carlos O'Ryan and Martin Corino for their answers
+          on my questions.
 
-        * m4/subsets.m4:
-          Changed AC_HELP_STRING to AS_HELP_STRING.
+Wed Jan  5 09:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-sco-4.2-nothread.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-        * ace/config-sco-5.0.0.h:
-        * ace/config-tandem.h:
-          Removed (commented-out) definition of ACE_HAS_SYSCALL_GETRUSAGE.
+        * ace/OS_NS_dirent.inl (readdir_r):
+          For readdir_r we also have multiple versions on Solaris. Changed
+          the detection which version to use. Tested on Solaris 8, hopefully
+          fixes also the problems on Solaris 10
 
-        * ace/config-hpux11.h:
-        * ace/config-hpux-11.00.h:
-          Removed ACE_HAS_SYSCALL_GETRUSAGE.  getrusage() was added in
-          HPUX 10.10.
+Wed Jan  5 09:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * configure.ac:
-          Fixed check for setregid() and setreuid() prototypes to look for
-          them in <unistd.h>, not <time.h>.
+        * ace/OS_NS_Thread.inl (sigwait):
+          On Solaris it seems we have two versions of sigwait, one with one
+          argument, another with two arguments. Added a check to detect which
+          one to use and implemented both variants. I tested this on Solaris 8
+          and there it works, is should fix the compile problems in the
+          Solaris 10 x86 isis build
 
-        * m4/config_h.m4:
-          Replace some AH_TEMPLATE definitions.  ACE_CHECK_HAS_HEADERS and
-          ACE_CHECK_LACKS_HEADERS provide autoheader templates themselves.
+Wed Jan  5 09:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
+        * ace/Dev_Poll_Reactor.cpp:
+          Fixed includes for Solaris x86 isis build
+
+Tue Jan  4 17:38:23 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+        * Release:
         * configure.ac:
-          Replace some calls to AC_CHECK_HEADERS with ACE_CHECK_HAS_HEADERS
-          or ACE_CHECK_LACKS_HEADERS.
 
-        * m4/ace_headers.m4:
-          New file, with ACE_CHECK_HAS_HEADERS and ACE_CHECK_LACKS_HEADERS
-          autoconf macros.  These macros are similar to AC_CHECK_HEADERS,
-          but define either ACE_HAS_<foo> or ACE_LACKS_<foo>.
+          Updated for removal of ace-config.in and ace-config.1.in.
 
-        * ace/OS_NS_unistd.inl:
-        * config-rtems.h:
-          Changed name of feature test macro ACE_HAS_GETOPT_PROTO to
-          ACE_HAS_GETOPT_PROTOTYPE.
-
-        * ace/config-linux-common.h:
-        * ace/config-unixware-7.1.0:
-        * ace/config-unixware-7.1.0.udk.h:
-        * ace/os_include/sys/os_resource.h:
-          Changed name of feature test macro ACE_HAS_GETRUSAGE_PROTO to
-          ACE_HAS_GETRUSAGE_PROTOTYPE.
-
-        * ace/Basic_Types.h:
-        * ace/config-chorus.h:
-        * ace/config-integritySCA.h:
-        * ace/config-mvs.h:
-        * ace/config-openvms.h:
-        * ace/config-psos-diab.h:
-        * ace/config-psos-diab-mips.h:
-        * ace/config-psos-diab-ppc.h:
-        * ace/config-psos-tm.h:
-        * ace/config-psosim-g++.h:
-        * ace/config-tandem.h:
-        * ace/config-vxworks5.x.h:
-        * ace/config-win32-common.h:
-        * ace/os_include/os_limits.h:
-          Changed name of feature test macro ACE_LACKS_PARAM_H to
-          ACE_LACKS_SYS_PARAM_H.
-
-        * ace/OS.inl:
-        * ace/config-dgux-4.11-epc.h:
-        * ace/config-freebsd.h:
-        * ace/config-hpux-10.x.h:
-        * ace/config-hpux-11.00.h:
-        * ace/config-hpux11.h:
-        * ace/config-irix5.2.h:
-        * ace/config-irix5.3-g++.h:
-        * ace/config-irix5.3-sgic++.h:
-        * ace/config-irix6.x-common.h:
-        * ace/config-linux-common.h:
-        * ace/config-m88k.h:
-        * ace/config-macosx-panther.h:
-        * ace/config-macosx.h:
-        * ace/config-netbsd.h:
-        * ace/config-openbsd.h:
-        * ace/config-osf1-3.2.h:
-        * ace/config-osf1-4.0.h:
-        * ace/config-sco-4.2-nothread.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-        * ace/config-sco-5.0.0.h:
-        * ace/config-sunos4-g++.h:
-        * ace/config-sunos4-lucid3.2.h:
-        * ace/config-sunos4-sun3.x.h:
-        * ace/config-sunos4-sun4.1.4.h:
-        * ace/config-sunos4-sun4.x.h:
-        * ace/config-sunos5.4-centerline-2.x.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos5.4-sunc++-4.x.h:
-        * ace/config-sunos5.5.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-tandem.h:
-        * ace/config-unixware-2.01-g++.h:
-        * ace/config-unixware-2.1.2-g++.h:
-        * ace/config-unixware-7.1.0.h:
-        * ace/config-unixware-7.1.0.udk.h:
-        * ace/os_include/sys/os_resource.h:
-          Changed name of feature test macro ACE_HAS_SYSCALL_H to
-          ACE_HAS_SYS_SYSCALL_H.
-
-Sat Aug  7 10:43:51 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/OS_NS_string.cpp:
-        * ace/OS_NS_string.h:
-        * ace/OS_NS_string.inl:
+        * ace-config.in:
+        * ace-config.1.in:
 
-          Uninlined the ACE_OS::strerror() method, so the #include of ACE.h
-          necessitated by the changes in
+          Removed.
 
-          Fri Aug  6 07:58:54 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+Tue Jan  4 18:19:11 2005  Steve Huston  <shuston@riverace.com>
 
-          can be moved to the .cpp file.
+        * ace/ACE_export.h: Adjusted ACE_NAMESPACE_INLINE_FUNCTION to include
+          the extern storage class when inlining for non-Windows. This resolves
+          some warnings on Solaris/Forte7, and is (hopefully!) the nit
+          behind the mysterious intermittent compile failures on HP-UX aCC.
 
-Fri Aug  6 20:22:02 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Jan  4 17:37:29 2005  Steve Huston  <shuston@riverace.com>
 
-        * configure.ac:
-          Added check for mkstemp() which sets ACE_LACKS_MKSTEMP if
-          it is not available.
+        * ace/ACE.h: Corrected t_rcv(), t_rcv_n_i() to be extern ACE_Export,
+          not ACE_NAMESPACE_INLINE_FUNCTION - the bodies are defined in the
+          .cpp file, and not inline.
+
+Tue Jan  4 17:22:14 2005  Steve Huston  <shuston@riverace.com>
 
-Fri Aug  6 19:13:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+        * ace/Signal.h:
+        * ace/TLI.h:
+        * ace/TLI_Stream.h: Include "ace/config-lite.h" before testing any ACE
+          config macros.
 
-        * ace/config-openvms.h:
-        Added ACE_HAS_VOIDPTR_GETTIMEOFDAY.
+Tue Jan  4 09:56:46 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Fri Aug  6 08:17:23 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/TMCast/TMCast.mpc:
+        * bin/MakeProjectCreator/config/tmcast.mpb:
 
-        * m4/ace.m4:
-          Split new ACE_WITH_RMCAST, ACE_WITH_QOS, and ACE_WITH_SSL macros
-          out of ACE_CONFIGURATION_OPTIONS so they can be used with other
-          packages.
+          Changed to inherit from exceptions.mpb and threads.mpb
 
-        * ace/OS_NS_sys_uio.cpp:
-        * ace/OS_NS_sys_uio.h:
-        * ace/OS_NS_sys_uio.inl:
-          Changed ACE_OS::readv_emulation() and ACE_OS::writev_emulation()
-          to use const iovec * instead of type of system iovec parameter.
-          Changed ACE_OS::readv() to cast const qualification of iovec
-          parameter away if ACE_HAS_NONCONST_READV.
-          Changed ACE_OS::writev() to cast const qualifiaction of iovec
-          parameter away if ACE_HAS_NONCONST_WRITEV.
-        * ace/os_include/os_uio.h:
-          Removed ACE_READV_TYPE type definition.
-          Removed ACE_WRITEV_TYPE type definition.
-          Changed readv_timedwait and writev_timedwait definitions to
-          use const iovec *'s for iovec parameter.
-
-        * ace/OS_sys_socket.inl:
-          Cast const qualifiaction away if ACE_HAS_NONCONST_SENDMSG.
-        * ace/os_include/sys/os_socket.h:
-          Removed ACE_SENDMSG_TYPE type definition.
-
-        * ace/OS_sys_resource.h:
-        * ace/OS_sys_resource.inl:
-          Changed ACE_OS::setrlimit() to use const struct rlimit*
-          instead of type of system rlimit parameter.  Cast const
-          qualification away if ACE_HAS_NONCONST_SETRLIMIT.
-        * ace/os_include/sys/os_resource.h:
-          Removed ACE_SETRLIMIT_TYPE type definition.
+        * bin/MakeProjectCreator/exceptions.mpb:
+        * bin/MakeProjectCreator/threads.mpb:
 
-        * ace/config-chorus.h:
-        * ace/config-linux-common.h:
-        * ace/config-lynxos.h:
-        * ace/config-m88k.h:
-        * ace/config-osf1-3.2.h:
-        * ace/config-osf1-4.0.h:
-        * ace/config-psos-diab-mips.h:
-        * ace/config-psos-diab-ppc.h:
-        * ace/config-psos-diab.h:
-        * ace/config-psos-tm.h:
-        * ace/config-psosim-g++.h
-        * ace/config-rtems.h:
-        * ace/config-sunos5.4-centerline-2.x.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos5.4-sunc++-4.x.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-tandem.h:
-        * ace/config-vxworks5.x.h:
-        * configure.ac:
-        * m4/config_h.m4:
-          Rename ACE_HAS_BROKEN_SETRLIMIT, ACE_HAS_BROKEN_SENDMSG,
-          ACE_HAS_BROKEN_READV, and ACE_HAS_BROKEN_WRITEV to
-          ACE_HAS_NONCONST_SETRLIMIT, ACE_HAS_NONCONST_SENDMSG,
-          ACE_HAS_NONCONST_READV, and ACE_HAS_NONCONST_WRITEV to
-          be more descriptive of what's really broken.
+          New files, MPC base projects that require exceptions and threads
+          respecitively.  Projects can inherit from these instead of using
+          an explicit requires +=, which can result in duplicate entries.
 
-        * bin/MakeProjectCreator/config/ec_used_typed_events.mpb:
-          Changed to inherit from dynamicinterface and ifr_client instead
-          of providing libs and after statements so that dependency chain
-          is complete.
+Tue Jan  4 13:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Aug  6 10:26:20 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * etc/create-jace-release:
+          Removed this file
 
-        * ace/OS_NS_string.h:
+Tue Jan  4 13:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added include of ACE.h needed for WIN32 version of change in
+        * ace/CLASSIX/*:
+        * tests/CLASSIX/*:
+          Removed all these files, they are old and not maintained for
+          a long time
 
-          Fri Aug  6 07:58:54 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+        * psosim/*:
+        * java/*:
+          Removed the contents of these directories. These files where not
+          shipped as part of the release and are not used anymore.
 
-        * ace/OS_NS_string.inl:
+          This fixes bugzilla bug [2015].
 
-          Fixed typo and mismatched return type for WIN32.
+Tue Jan  4 08:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Aug  6 14:15:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+        * tests/Multicast_Test.cpp:
+        * tests/Multicast_Test_IPV6.cpp:
+          Fixed unused argument warnings
 
-        * ace/config-win32-common.h:
-          Don't define export macro's also for Visual Age.
+Tue Jan  4 04:25:44 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * ace/config-win32-visualage.h:
-          Added special Visual Age export macros
+        * ace/OS_NS_sys_stat.inl:
+        * ace/OS_NS_sys_utsname.inl:
 
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
-          this.
+          Fixes for SUN Studio 9 builds on x86 platform. New builds will
+          be setup soon to track this on a day-today basis.
 
-Fri Aug  6 14:14:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+Mon Jan  3 16:53:59 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/OS_NS_sys_socket.h:
-          Removed include for 'ace/os_include/netinet/os_tcp.h'.
-        * ace/Pipe.cpp:
-          Added include for 'ace/os_include/netinet/os_tcp.h' to provide
-          TCP macros/constants (f.i. TCP_NODELAY) for OS like OpenVMS.
+        * examples/TMCast/Member/Makefile.am:
 
-Fri Aug  6 07:58:54 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+          Update for ACE prefix being added to TMCast library name.
 
-        * ace/Message_Block.cpp (crunch): If rd_ptr_ was greater than
-          wr_ptr_ memory was overwritten, so added a check for this case
-          and return -1 in this case.  Also, simplified the initial if
-          statement.  Thanks to Boris Kaminer for reporting this.
+Mon Jan  3 17:42:39 2005  Steve Huston  <shuston@riverace.com>
 
-        * ace/OS_NS_string.inl: Updated ACE_OS::strerror() so it checks
-          for socket errors explicitly.  Thanks to Boris Kaminer
-          <boris_kaminer@mail.ru> for reporting this.
+        * apps/JAWS/server/server.mpc:
+        * apps/JAWS3jaws3/jaws3.mpc: Added "avoids += uses_wchar" because
+          there are some sources in here that won't work with wide-char.
+          Furthermore, it's not immediately clear what the needs of the code
+          are with respect to char width. These could probably be fixed,
+          but may require (or be greatly helped by) some improvement to
+          ACE_Process_Options::setenv() to accept narrow-char args and/or
+          adjust string formatting to account for wide-char input.
 
-Fri Aug  6 10:18:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+        * examples/Connection/non_blocking/CPP-acceptor.cpp: The
+          ACE_DEFAULT_SERVER_PORT_STR is already defined in terms of
+          ACE_TEXT, so it shouldn't be wrapped in ACE_TEXT.
 
-        * ace/config-openvms.h:
-          Added ACE_LACKS_REALPATH.
-          Added '#define MAXSYMLINKS 0'.
-          Removed uppercase macros for pthread symbols.
+Mon Jan  3 14:38:01 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Fri Aug  6 10:08:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+        * netsvcs/lib/Makefile.am:
 
-        * ace/OS_NS_sys_socket.h:
-          Added include for 'ace/os_include/netinet/os_tcp.h' to provide
-          TCP macros/constants (f.i. TCP_NODELAY) for OS like OpenVMS.
+          Install header files.
 
-Fri Aug  6 09:50:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+Mon Jan  3 14:34:57 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * bin/make_release:
-          For generating the project files for borland, vc6 & vc71 set
-          qos=1 in the default.features file, these environments support
-          qos.
+        * ace/Makefile.am:
+        * ace/QoS/Makefile.am:
+        * ace/RMCast/Makefile.am:
+        * ace/SSL/Makefile.am:
+        * ace/TMCast/Makefile.am:
 
-Fri Aug  6 09:41:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+          Generate pkg-config *.pc files from templates.
 
-        * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm:
-          Just always use Makefile.bor as workspace name, this is the way
-          our Borland users expect things to work.
+        * ace/ACE.pc.in:
+        * ace/QoS/ACE_QoS.pc.in:
+        * ace/RMCast/ACE_RMCast.pc.in:
+        * ace/SSL/ACE_SSL.pc.in:
+        * ace/TMCast/ACE_TMCast.pc.in:
 
-Fri Aug  6 09:15:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
+          New files, pkg-config *.pc templates.
 
-        * apps/JAWS3/jaws3/Reactive_IO_Helpers.h
-          private -> public ~JAWS_IO_Reactive_Handler (void) due to
-          aCC: HP ANSI C++ B3910B A.03.39 compiler bug not allowing
-          friend derived classes access.
+Mon Jan  3 19:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Aug  6 08:34:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+        * ace/Dev_Poll_Reactor.{h,cpp}:
+          Changed the return type of the notify method to int to match the
+          declaration in the base class. Also added argument names to the
+          header file to help doxygen generate the documentation. Thanks to
+          Alexander Libman <alexander dot libman at earthlink dot net> for
+          reporting this.
 
-        * ace/config-win32-msvc-7.h:
-        * ace/config-win32-msvc-8.h:
-          Added ACE_HAS_TEMPLATE_TYPEDEFS
+        * ace/Reactor_Impl.h:
+          Added argument names to the notify method so that doxygen can
+          generate better documentation
 
-        * ace/config-win32-visualage.h:
-          Added huge list of new defines
+Mon Jan  3 13:05:46 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/Event_Handler_T.h:
-          Instead of -1 use ACE_INVALID_HANDLE to make it portable
+        * bin/MakeProjectCreator/config/core.mpb:
 
-        * ace/Malloc.cpp:
-          Corrected assert
+          Added a setting for the template variable 'install_headers' which
+          is currently only used by the automake project type.
+          Coincidentally, I changed the case of INSTALL_THIS_TARGET to
+          lowercase.  I personally prefer lowercase and since MPC is case
+          insensitive with respect to variable names, it causes no harm to
+          the borland project type which also uses that template variable.
 
-        * ace/OS_NS_sys_stat.h:
-          For IBMCPP also define ACE_stat as stat
+Mon Jan  3 10:56:59 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ace/OS_NS_sys_stat.inl (stat):
-          For Visual Age use special _stat call
+        * ace/TMCast/Makefile.am:
+        * ace/TMCast/TMCast.mpc:
+        * bin/MakeProjectCreator/config/tmcast.mpb:
 
-        * ace/Task.cpp (svc_run):
-          For Visual Age also do a static cast
+          Add ACE prefix to TMCast library name.
 
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
-          this.
+Mon Jan  3 14:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Aug  6 08:03:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+          Previously explicit was the default for templates, changed this
+          so that we use explicit for version 4.2 and 5.3 and otherwise
+          we default to implicit. Explicit templates are not usable anymore
+          for TAO, maybe these older compilers work for ACE, but we don't
+          know.
 
-        * ace/config-win32-msvc-8.h:
-          Added this file for msvc8, is a copy of msvc7 but this will change as
-          things are tested for msvc8.
+Mon Jan  3 08:02:33 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * ace/config-win32-msvc.h:
-          If msvc_ver >= 1400 then we are including the msvc-8 file.
+        * examples/TMCast/Member:
+        * TMCast/*: Changed the use of TMCast to ACE_TMCast.  Thanks to
+          J.T. Conklin for pointing out the inconsistency.
 
-Thu Aug  5 23:50:38 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Mon Jan  3 09:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/ec_use_typed_events.mpb:
-          Changed to inherit from dynamicinterface and ifr_client instead
-          of providing libs and after statements so that dependency chain
-          is complete.
+        * tests/Thread_Manager_Test.cpp:
+        * tests/Conn_Test.cpp:
+          Fixed compile errors with VxWorks and ACE_HAS_PTHREADS
 
-Thu Aug  5 13:17:26 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+Mon Jan  3 09:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/ACE.cpp (sock_error): Changed the WSAEWOULDBLOCK message
-          back to "resource temporarily unavailable" to be consistent with
-          the UNIX error string.  Thanks to Boris Kaminer
-          <boris_kaminer@mail.ru> for reporting this.
+        * ace/config-vxworks5.x.h:
+          Added include of vxCpu.h to get the CPU defines from VxWorks
+          so that we can determine if we use pentium or not
 
-        * examples/NT_Service/ntsvc.{h,cpp}: Added a destructor to
-          Service that cancels the timer.  Thanks to Scott Harris
-          <harris_s@ociweb.com> for this fix.
+Sun Jan  2 13:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/ACE.cpp (sock_error): Added support for WSAEISCONN.
-          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
-          this.
+        * tests/Thread_Manager_Test.cpp:
+          Fixed compile errors with VxWorks and ACE_HAS_PTHREADS
 
-Thu Aug  5 07:45:53 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * examples/Misc/test_trace.cpp:
+          Replaced variable with name _ by trace, this fixes compile warning
+          with VxWorks.
 
-        * m4/config_h.m4:
-          Replace some AH_TEMPLATE definitions.  ACE_CHECK_HAS_FUNCS and
-          ACE_CHECK_LACKS_FUNCS provide autoheader templates themselves.
+Sun Jan  2 13:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * configure.ac:
-          Replace some calls to AC_CHECK_FUNCS with ACE_CHECK_HAS_FUNCS or
-          ACE_CHECK_LACKS_FUNCS.
+        * tests/Conn_Test.cpp:
+          Fixed compile errors with VxWorks and ACE_HAS_PTHREADS
 
-        * m4/ace_functions.m4:
-          New file, with ACE_CHECK_HAS_FUNCS and ACE_CHECK_LACKS_FUNCS
-          autoconf macros.  These macros are similar to AC_CHECK_FUNCS,
-          but define either ACE_HAS_<foo> or ACE_LACKS_<foo>.
+Sun Jan  2 12:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug  5 09:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/config-vxworks5.x.h:
+          When ACE_HAS_PTHREADS is defined, include the VxWorks file
+          types/vxTypesOld.h, the header file sys/stat.h uses types from
+          this file and is not according to the spec. A TSR has been
+          filed to WindRiver to get this corrected, until the time being
+          this is the easiest fix because on more places we got problems
+          and we only now have one fix that is easily to remove
 
-        The following changes are from Martin Corino <mcorino@remedy.nl>
+Sun Jan  2 12:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/mwc.pl:
-        * bin/mpc.pl:
-        * bin/depgen.pl:
-        * bin/cle.pl:
-          Added various changes to support autobuild MPC generation on
-          OpenVMS.
+        * ace/Thread_Manager.cpp:
+          VxWorks deliver also a pthread implementation. This can be used by
+          defined ACE_HAS_PTHREADS, but when this is set, we don't need to use
+          some special VxWorks code.
 
-Wed Aug  4 18:09:47 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Sun Jan  2 11:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * m4/ace.m4:
-        * configure.ac:
-          Support --with/without-tao flag to provide find grain
-          control over TAO configuration.
+        * ace/OS_NS_stdlib.cpp:
+          Fixed compile problem when ACE_LACKS_MKTEMP is defined
 
-Wed Aug  4 16:19:40 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Sun Jan  2 10:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Global_Macros.h (ACE_CORBA_1, ACE_CORBA_2, ACE_CORBA_3):
+        * bin/MakeProjectCreator/config/ciao_client.mpb:
+        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
+          Added ciaoversion as base project so that the version number
+          assigned to SOVERSION in the GNU makefiles is set to the CIAO
+          version and not to the TAO version
 
-          Marked these macros as deprecated, and removed the version of
-          these macros that defined the obsolete "CORBA_foo" broken
-          namespace workaround classes.
+Sun Jan  2 10:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Aug  4 14:46:07 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/CDR_Array_Test.cpp:
+        * tests/CDR_File_Test.cpp:
+        * tests/Logging_Strategy_Test.cpp
+          Fixed deprecated conversion warnings
 
-        * Makefile.am:
-        * configure.ac:
-          Configure TAO if TAO subdirectory is present.
+Sun Jan  2 09:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Aug  4 16:33:14 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * ace/config-vxworks5.x.h:
+          Added, ACE_HAS_NONCONST_GETBY
 
-        * ace/Select_Reactor_T.cpp:
+Sat Jan  1 22:53:41 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-          Fix for Bug 1893. Please see
+        * bin/generate_rel_manpages:
 
-          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1893
+          Fixed the doxygen revision number
 
-          for details. Thanks to Alan L Batongbacal <alanlb at vt dot edu>
-          for the patch.
+        * bin/make_release:
 
-Wed Aug  4 08:31:43 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+          Fixed a typo.
 
-        * ace/config-linux-common.h: If the version of glibc
-          is less than 2.1 add the ACE_HAS_NONCONST_MSGSND macro.  Thanks
-          to Anand <anand@icmgworld.com> and Johnny Willemsen for this
-          fix.
+Sat Jan  1 18:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Aug  3 15:25:43 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        Reverted the change below, the define doesn't seem to be the
+        correct one, it breaks on some platforms, have to investigate
+        this again
 
-        From Jaroslaw Nozderko <jaroslaw.nozderko@polkomtel.com.pl>.
-        * ace/Dev_Poll_Reactor.cpp (register_handler_i):
+        * ace/OS_NS_stdlib.cpp:
+          Just include os_limits.h instead of limits directly
 
-          Allow same handler to be registered with a different event,
-          which is consistent with the other reactor implementations.
+        * ace/os_include/os_limits.h:
+          Dependent on ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB include
+          limits or limits.h, just as we do for new
 
-Tue Aug  3 13:04:24 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Sat Jan  1 15:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Svc_Handler.h:
-        * ace/Svc_Handler.cpp:
-          Add throw() exception specifier to no-throw version of class
-          local operator new.  In addition to squelching warnings from
-          gcc, this tells the compiler to check the return value before
-          constructing the object.
+        * ace/Service_Config.{h,cpp}:
+          Fixed compile problems in unicode builds
 
-Tue Aug  3 08:55:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Sat Jan  1 13:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Condition_Recursive_Thread_Mutex.cpp:
-        * ace/Functor.inl:
-        * ace/config-borland-common.h:
-        * ace/config-g++-common.h:
-        * ace/config-hpux-11.00.h:
-        * ace/config-lite.h:
-        * ace/config-lynxos.h:
-        * ace/config-sunos5.5.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-win32-ghs.h:
-          Remove vestigial traces of ACE_TEMPLATE_METHOD_SPECIALIZATION.
+        * ace/Service_Config.cpp:
+          Added include of OS_NS_unistd.h to get ACE_OS::getpid()
 
-Tue Aug  3 14:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sat Jan  1 13:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Containers_T.cpp:
-          Fixed incorrect trace macro
+        * include/makeinclude/platform_gnuwin32_common.GNU:
+          Added needed flags for wxWindows
 
-Tue Aug  3 08:22:10 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+Sat Jan  1 13:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-aix-5.x.h:
-          ace/OS_NS_dirent.inl (readdir_r): Added support for AIX and G++.
-          Thanks to Raz Ben-Yehuda <raz.b@corigin.com>.
+        * docs/ACE-guidelines.html:
+          Updated that ACE_OS is a namespace, not a class
 
-Tue Aug  3 11:56:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sat Jan  1 13:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/msvc_static_order.lst:
-          Updated location of TAO vc6 static project files
+        * ACE-INSTALL.html:
+          Updated VxWorks instructions and some other small improvements
 
-Tue Aug  3 06:19:06 2004  Chad Elliott  <elliott_c@ociweb.com>
+        * ace/Activation_Queue.h:
+        * ace/Active_Map_Manager.h:
+        * ace/Arg_Shifter.h:
+        * ace/Lib_Find.h:
+        * ace/Local_Memory_Pool.h:
+        * ace/Pipe.h:
+        * ace/Timer_List_T.h:
+        * ace/Timer_Hash_T.h:
+          Doxygen improvements
+
+        * ace/Async_Acceptor.cpp:
+        * ace/WIN32_Asynch_IO.cpp:
+          Just check for msvc, not for _MSC_VER > 1020, that version is really
+          ancient and we always have a bigger version number
+
+        * ace/config-all.h:
+          When ACE_HAS_VERBOSE_NOTSUP is defined, we use ACE_OS::fprintf, so
+          always include OS_NS_stdio.h, it doesn't work to include cstdio. This
+          fixes compile problems with VxWorks when ACE_HAS_VERBOSE_NOTSUP is
+          defined. Also there is no need to include vxWorks.h for VxWorks.
+
+        * ace/Configuration.cpp (create_index):
+          Improved error message to make clear something went wrong
+
+        * ace/Dirent.cpp:
+        * ace/OS_Memory.cpp:
+        * ace/OS_TLI.cpp:
+          Removed construction to silence the HP aCC compiler, empty cpp
+          files are used a lot in the ACE_OS files and there it is not needed,
+          so zap it here.
+
+        * ace/MMAP_Memory_Pool.h:
+          Define private copy constructor and assignment operator for
+          ACE_MMAP_Memory_Pool_Options. This class contains pointers
+          it is not allowed to copy them, so prevent that.
 
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
+        * ace/Naming_Context.cpp:
+          Replaced ACE cast macro with the C++ version. Just don't use argv[0]
+          without checking argc in the parse_args method. Under VxWorks it can
+          happen that argc and argv are 0, so reading argv[0] returns random
+          memory. When argc = 0, then we just don't have a program name
 
-          Added macros in a specific section for the bmake project type.
+        * ace/OS_Errno.h:
+          Prevent copying of ACE_Errno_Guard
 
-Tue Aug  3 07:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/UUID.cpp:
+          Added missing \n in several ACE_DEBUG statements
 
-        * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm:
-        * bin/MakeProjectCreator/templates/bor.mpd:
-          Updated Borland templates to handle resource files in
-          subdirectories, this is needed for the moving of the mpc
-          files in TAO. Thanks to J.T. Conklin for making these
-          patches.
-
-Mon Aug  2 15:33:27 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/Containers_T.cpp (ACE_Fixed_Set_Iterator::remove()): Had to
-          qualify 'iterated_items_' with 'this->' to make it visible in this
-          class now that iterated_items_ is in an inherited class. This per
-          HP-UX aC++, citing [temp.dep], 14.6.2(3) in the C++ Standard.
-
-Mon Aug  2 15:20:37 2004  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS3/jaws3/Event_Result.h: Added #include
-          "ace/os_include/os_stddef.h" to pick up size_t for platforms where
-          it's not defined by the compiler, such as Cygwin. Thanks to
-          Johnny Willemsen for reporting this.
-
-Mon Aug  2 08:55:17 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ace/Containers_T.h: The class ACE_Fixed_Set had some bugs in
-          it's interface declaration and also some in it's implementation:
-          1) typedef the wrong class for is constant iterator and
-          2) its method size() misbehave in certain circumstances where
-             elements were randomly deleted from a set object.
-          Moreover, the iterators of ACE_Fixed_Set has a lot of code in
-          common so the can be refactored to have a common abstract
-          ancestor with all the shared code.  Therefore, refactored the
-          three classes and fixed the bug on the size() method.  Thanks
-          to J. Abelardo Gutierrez <jabelardo@cantv.net> for these fixes.
-
-Mon Aug  2 09:06:39 2004  Steve Huston  <shuston@riverace.com>
-
-        * ace/os_include/os_signal.h: Removed the #include os_time.h - it's
-          not needed for anything in this header, and for some reason, it
-          introduces a type oddity on HP-UX - aC++ gets the idea there's a
-          tentative struct sigaction and doesn't match the real one, causing
-          compile errors in ACE_OS::sigaction().
-
-        * ace/OS_TLI.h: Removed stray '#'.
-
-        * ace/Signal.{h inl}: Removed the hack typedef ACE_SIGACTION that
-          was allegedly put in for an HP-UX C++ bug. It's not needed and is
-          causing further problems. #include "ace/os_include/os_signal.h"
-          to get the needed signal-related types.
-
-        * apps/JAWS3/jaws3/Event_Result.h: Changed #include "ace/OS.h" to
-          "ace/OS_NS_errno.h". Removing the "big hammer" OS.h stuff. This
-          fixes a compile error in OS_TLI.inl on HP-UX w/ aC++. Why? I
-          have no idea... there's something odd still about orders of
-          includes and/or preprocessor defs or something. This odd compile
-          error creeps up every once in a while and is always related to
-          fudging something somewhere (see fix above for signal...) but
-          this one doesn't have an apparant cause.
-
-        * include/makeinclude/platform_hpux_aCC.GNU: Removed AREXTRA. It
-          was breaking static lib builds.
-
-Sun Aug  1 08:15:23 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * ace/OS_Log_Msg_Attributes.h:
+          Prevent copying of ACE_OS_Log_Msg_Attributes
 
-        * configure.ac:
-          Moved subdirectory configuration above call to AC_OUTPUT.
+        * ace/config-lite.h:
+          VxWorks deliver also a pthread implementation. This can be used by
+          defined ACE_HAS_PTHREADS, but when this is set, we don't need some
+          special VxWorks types, so changed some checks for VXWORKS to
+          VXWORKS && !defined ACE_HAS_PTHREADS
+
+        * ace/OS_NS_stropts.inl:
+        * ace/OS_NS_arpa_inet.inl:
+        * ace/Service_Object.cpp:
+        * ace/String_Base.cpp:
+        * ace/OS_NS_stdlib.inl:
+          Replaced c-style cast with C++ cast
+
+        * ace/OS_NS_stdio.cpp:
+        * ace/OS_NS_time.cpp:
+        * ace/Pipe.cpp:
+        * tests/Max_Default_Port_Test.cpp:
+        * tests/Time_Value_Test.cpp:
+          Replaced ACE cast macros with C++ casts
+
+        * ace/Default_Constants.h:
+          Added ACE_LIB_TEXT to ACE_DEFAULT_SERVER_PORT_STR to fix compile
+          errors in Unicode builds
 
         * ace/OS_Memory.h:
-          Provide ACE_nothrow and ACE_nothrow_t definitions for platforms
-          where definitions are not handled by special cases.
+          Removed not needed check for borland
+
+        * ace/OS_NS_sys_wait.inl:
+          Added ACE_LACKS_WAIT and ACE_LACKS_WAITPID, these defines are set
+          in the needed config files to determine if the OS has wait and
+          waitpid
+
+        * ace/config-chorus.h:
+          Added ACE_LACKS_WAIT
+
+        * ace/config-win32-common.h:
+          Added ACE_LACKS_WAIT, ACE_LACKS_SOCKETPAIR and ACE_LACKS_DUP2
+
+        * ace/OS_NS_signal.h:
+          Removed commented out typedefs
+
+        * ace/OS_NS_sys_socket.inl:
+          Replaced C style cast with C++ const_cast and in socketpair
+          just only check for ACE_LACKS_SOCKETPAIR, this define is now
+          also set for win32
+
+        * ace/OS_NS_unistd.inl (dup2):
+          Check for ACE_LACKS_DUP2 instead for specific OS defines
+
+        * ace/Time_Value.h:
+          Prevent copying of ACE_Countdown_Time
+
+        * ace/config-g++-common.h:
+          Cleaned up this file, removed code for pre 2.8 versions of gcc, these
+          are already dropped with the x.4 release. Makes maintenance a lot
+          easier.
+
+        * ace/config-vxworks5.x.h:
+          Added several defines, detect pentium or not on the CPU define that
+          is set. Make several defines dependent on ACE_HAS_PTHREADS, when this
+          is set, we want to use the pthread library of VxWorks.
+
+        * ace/config-psosim-g++.h:
+        * ace/config-psos-tm.h:
+        * ace/config-psos-diab.h:
+        * ace/config-psos-diab-ppc.h:
+        * ace/config-psos-diab-mips.h:
+          Added ACE_LACKS_WAIT, ACE_LACKS_WAITPID and ACE_LACKS_DUP2
+
+        * ace/config-integritySCA.h:
+          Added ACE_LACKS_WAIT, ACE_LACKS_WAITPID
+
+        * ace/OS_NS_time.inl:
+          VxWorks defines asctime_r and ctime_r but with a 3rd size_t*,
+          this is not according to the spec, so a new define
+          ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R is added on which we
+          can determine to use this variant of asctime_r and ctime_r.
+          A support request to WindRiver has been make to get these
+          methods spec compliant in newer versions of VxWorks.
 
+        * ace/Object_Manager_Base.{h,cpp}:
+          Replaced ACE cast macros with C++ casts, use unsigned int instaead
+          of u_int because u_int is not defined with VxWorks when using
+          the pthread support
+
+        * ace/README:
+          Documented the new defines
+
+        * ace/OS_NS_string.{h,cpp,inl}:
+        * ace/config-doxygen.h:
         * configure.ac:
-        * m4/config_h.m4:
-          Added check for ACE_HAS_NEW_NOTHROW.
+          Removed ACE_LACKS_STRCHR and ACE_LACKS_STRCSPN and the related
+          code, these defines aren't set in any config file so the emulation
+          is not needed anymore
 
-Sun Aug  1 15:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Log_Msg.cpp:
+          When a buffer overflow has occured, just don't log anything anymore,
+          when for example a backend is used, the pointer to that backend
+          can also be corrupted. So, just only log when there is no overflow.
 
-        * ace/QoS/qos.mpc:
-          Also with bmake set macros += ACE_HAS_WINSOCK2_GQOS
+        * ace/SOCK_Dgram_Bcast.cpp:
+          Replaced ACE cast with C++ cast, also handle VxWorks specially and
+          when setsockopt fails, use ACE_ERROR_RETURN to return -1 and log an
+          error message so that the log explains what goes wrong.
 
-        * ace/Select_Reactor_Base.h:
-        * ace/Object_Manager_Base.cpp:
-        * ace/Object_Manager.cpp:
-        * ace/Global_Macros.h:
-        * ace/Dev_Poll_Reactor.h:
-          Doxygen improvements/fixes
+        * ace/os_include/os_time.h:
+          VxWorks doesn't have 2 arg ctime_r and asctime_r
 
-        * ace/config-openvms.h:
-          Removed commented out lines
+        * ace/os_include/os_signal.h:
+          Don't include sigLib.h with VxWorks when ACE_HAS_PTHREADS is defined
+
+        * ace/Malloc_T.h:
+          Moved ACE_Malloc_Lock_Adapter_T to the end of this file to prevent
+          compile problems with VxWorks.
 
-        * ace/CDR_Stream.h:
-          Changed to signature for the to_string methods from char to
-          ACE_CDR::char so that they match the implementation
+        * ace/OS_NS_sys_shm.cpp:
+          Removed some code that was already marked as not used.
 
-Sun Aug  1 09:07:16 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * ace/OS_NS_Thread.{h,cpp,inl}:
+          Removed old code that was guarded using ifdef 0. Don't use
+          ACE_OS_TRACE in thr_getspecific_native because this method is
+          used in the trace functionality and are tracing again in this
+          macro, so we get a stack overflow. Changed several checks for
+          VxWorks to include ACE_HAS_PTHREADS. Made several methods
+          smaller by combining includes and reducing duplicated code.
+          Replaced ACE casts with C++ casts.
 
-        * ChangeLogs/ChangeLog-04a:
+        * ace/OS_NS_stdlib.cpp:
+          Just include os_limits.h instead of limits directly
 
-          Moved contents from this file to a new file.
+        * ace/os_include/os_limits.h:
+          Dependent on ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB include
+          limits or limits.h, just as we do for new
+
+        * ace/Unbounded_Set.{h,cpp}:
+          Doxygen update and return a Unbounded_Set& from the operator=
+          to allow chaining.
+
+        * examples/Misc/test_trace.cpp:
+          Replaced variable with name _ by trace, this fixes compile warning
+          with VxWorks.
+
+        * tests/UPIPE_SAP_Test.cpp:
+        * tests/Conn_Test.cpp:
+          Removed explicit template instantiations for Borland C++, we don't use
+          that.
+
+        * tests/Cache_Map_Manager_Test.cpp:
+        * tests/Cached_Accept_Conn_Test.cpp:
+        * tests/Cached_Conn_Test.cpp:
+        * tests/CDR_Array_Test.cpp:
+        * tests/CDR_File_Test.cpp:
+        * tests/CDR_Test.cpp:
+        * tests/Hash_Map_Bucket_Iterator_Test.cpp:
+        * tests/Logging_Strategy_Test.cpp:
+        * tests/MEM_Stream_Test.cpp:
+        * tests/Multicast_Test.cpp:
+        * tests/Multicast_Test_IPV6.cpp:
+        * tests/SOCK_Dgram_Bcast_Test.cpp:
+          Replaced argv[0] with fixed program name, because argc could be zero
+          with VxWorks and then we get a crash when using argv[0].
 
-Sat Jul 31 17:01:27 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * tests/Config_Test.cpp:
+          Logged an error if tests.reg can't be opened.
 
-        * bin/generate_rel_manpages:
+        * tests/FIFO_Test.cpp:
+          Only run this test when ACE_LACKS_MKFIFO is not defined, other
+          platforms then win32 also can lack this. Replaced ACE casts with
+          C++ casts.
+
+        * tests/Log_Msg_Test.cpp:
+          Don't try to overflow the log buffer with VxWorks, this will result
+          in a crash and then the rest of this test is not done.
+
+        * tests/MT_Reactor_Timer_Test.cpp:
+          Rewrote this test a little to use ACE_ERROR instead of ACE_ASSERT,
+          under VxWorks the log files are only written at the moment the
+          tests ends normally and with the ACE_ASSERT we just didn't get
+          a log file, with the ACE_ERROR we get one and can look better why
+          it fails under VxWorks.
+
+        * tests/Signal_Test.cpp:
+          Replace ACE casts with C++ casts and changed the return types of the
+          thread functions to fix compile errors with VxWorks.
+
+        * tests/run_test.lst:
+          Enabled some more tests for VxWorks.
+
+        * tests/run_test.pl:
+          Added .out to the program names generated in the VxWorks script
+
+Sat Jan  1 00:00:00 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * Happy New Year!!!
+
+Fri Dec 31 15:23:58 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ace/Service_Config.cpp:
+        * ace/Service_Config.h:
 
-          This is now executed at tao.dre for generating doxygen
-          documentation. The files are then scp'ed to the main website.
+          Added support for -p command line argument, which specifies
+          a filename to write the process id.
 
-Sat Jul 31 11:13:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Thu Dec 30 13:21:37 2004  Chris Cleeland  <cleeland@ociweb.com>
 
-        * ACE version 5.4.2 released.
+        * ACE version 5.4.3 released.
 
 Local Variables:
 add-log-time-format: current-time-string
diff --git a/Kokyu/DSRT_Dispatch_Item_T.h b/Kokyu/DSRT_Dispatch_Item_T.h
index 5271dfd2abf..f87826832fe 100644
--- a/Kokyu/DSRT_Dispatch_Item_T.h
+++ b/Kokyu/DSRT_Dispatch_Item_T.h
@@ -42,7 +42,7 @@ namespace Kokyu
     Guid_t guid_;
     DSRT_QoSDescriptor qos_;
     ACE_Time_Value insertion_time_;
-    
+
   public:
     DSRT_Dispatch_Item (Guid_t guid, const DSRT_QoSDescriptor&);
 
@@ -78,7 +78,7 @@ namespace Kokyu
                               ACE_SYNCH_MUTEX>
   {
   public:
-    ACE_EXPLICIT
+    explicit
     DSRT_Dispatch_Item_var (DSRT_Dispatch_Item<DSRT_Scheduler_Traits>
                             *p = 0);
 
diff --git a/Kokyu/Dispatch_Deferrer.cpp b/Kokyu/Dispatch_Deferrer.cpp
index 9cc8ccdc706..134a9a900e4 100644
--- a/Kokyu/Dispatch_Deferrer.cpp
+++ b/Kokyu/Dispatch_Deferrer.cpp
@@ -75,7 +75,7 @@ Dispatch_Deferrer::handle_timeout (const ACE_Time_Value &,
   while (begin <= end)
     {
       Dispatch_Queue_Item *qitem =
-        ACE_dynamic_cast(Dispatch_Queue_Item*, begin);
+        dynamic_cast<Dispatch_Queue_Item*> (begin);
 
       if (qitem == 0)
         {
diff --git a/Kokyu/Dispatcher_Task.cpp b/Kokyu/Dispatcher_Task.cpp
index f6a02d2feac..491e59fda40 100644
--- a/Kokyu/Dispatcher_Task.cpp
+++ b/Kokyu/Dispatcher_Task.cpp
@@ -109,7 +109,7 @@ Dispatcher_Task::svc (void)
       //ACE_DEBUG ((LM_DEBUG, "(%t) : next command got from queue\n"));
 
       Dispatch_Queue_Item *qitem =
-        ACE_dynamic_cast(Dispatch_Queue_Item*, mb);
+        dynamic_cast<Dispatch_Queue_Item*> (mb);
 
       if (qitem == 0)
         {
diff --git a/Kokyu/Kokyu.cpp b/Kokyu/Kokyu.cpp
index b79b78abec4..e447f731493 100644
--- a/Kokyu/Kokyu.cpp
+++ b/Kokyu/Kokyu.cpp
@@ -39,19 +39,17 @@ void Dispatcher::implementation (Dispatcher_Impl* impl)
   //dispatcher_impl_.reset (impl);
 }
 
-Dispatcher_Auto_Ptr
+Dispatcher*
 Dispatcher_Factory::
 create_dispatcher(const Dispatcher_Attributes& attrs)
 {
   Dispatcher* disp;
-  Dispatcher_Auto_Ptr nil_ptr((Dispatcher*)0);
   Dispatcher_Impl* tmp;
-  ACE_NEW_RETURN (tmp, Default_Dispatcher_Impl, nil_ptr);
-  ACE_NEW_RETURN (disp, Dispatcher, nil_ptr);
-  Dispatcher_Auto_Ptr disp_auto_ptr(disp);
+  ACE_NEW_RETURN (tmp, Default_Dispatcher_Impl, 0);
+  ACE_NEW_RETURN (disp, Dispatcher, 0);
   disp->implementation (tmp);
   tmp->init (attrs);
-  return disp_auto_ptr;
+  return disp;
 }
 
 }
diff --git a/Kokyu/Kokyu.h b/Kokyu/Kokyu.h
index b2e041bed8c..9414b9bfbe0 100644
--- a/Kokyu/Kokyu.h
+++ b/Kokyu/Kokyu.h
@@ -100,9 +100,9 @@ namespace Kokyu
        *
        * @param config Configuration information for the dispatcher.
        *
-       * @return Auto pointer to the dispatcher.
+       * @return pointer to the dispatcher.
        */
-      static Dispatcher_Auto_Ptr
+      static Dispatcher*
       create_dispatcher (const Dispatcher_Attributes& attr);
     };
 } //end of namespace
diff --git a/Kokyu/Kokyu_dsrt.cpp b/Kokyu/Kokyu_dsrt.cpp
index a6f18760065..9cf8238994a 100644
--- a/Kokyu/Kokyu_dsrt.cpp
+++ b/Kokyu/Kokyu_dsrt.cpp
@@ -58,7 +58,7 @@ int DSRT_Dispatcher<DSRT_Scheduler_Traits>::shutdown ()
 }
 
 template <class DSRT_Scheduler_Traits>
-typename DSRT_Dispatcher_Factory<DSRT_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr
+DSRT_Dispatcher<DSRT_Scheduler_Traits>*
 DSRT_Dispatcher_Factory<DSRT_Scheduler_Traits>::
 create_DSRT_dispatcher (const DSRT_ConfigInfo& config_info)
 {
@@ -66,14 +66,6 @@ create_DSRT_dispatcher (const DSRT_ConfigInfo& config_info)
 
   DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>* tmp;
   DSRT_Dispatcher<DSRT_Scheduler_Traits>* disp;
-  DSRT_Dispatcher_Auto_Ptr nil_ptr((DSRT_Dispatcher<DSRT_Scheduler_Traits>*)0);
-
-  //DSRT_Dispatcher_Impl::init_svcs ();
-
-  //ACE_Service_Config::open ("Kokyu", ACE_DEFAULT_LOGGER_KEY, 0);
-
-  //tmp =
-  //  ACE_Dynamic_Service<DSRT_Dispatcher_Impl>::instance ("DSRT_Dispatcher_Impl");
 
   switch (config_info.impl_type_)
     {
@@ -82,7 +74,7 @@ create_DSRT_dispatcher (const DSRT_ConfigInfo& config_info)
                       DSRT_Direct_Dispatcher_Impl<DSRT_Scheduler_Traits> (
                       config_info.sched_policy_, 
                       config_info.sched_scope_), 
-                      nil_ptr);
+                      0);
       break;
 
     case DSRT_CV_BASED:
@@ -91,16 +83,15 @@ create_DSRT_dispatcher (const DSRT_ConfigInfo& config_info)
                       DSRT_CV_Dispatcher_Impl<DSRT_Scheduler_Traits>(
                       config_info.sched_policy_, 
                       config_info.sched_scope_), 
-                      nil_ptr);
+                      0);
       break;
     }
     
   ACE_ASSERT (tmp != 0);
-  ACE_NEW_RETURN (disp, DSRT_Dispatcher<DSRT_Scheduler_Traits>, nil_ptr);
-  DSRT_Dispatcher_Auto_Ptr disp_auto_ptr(disp);
+  ACE_NEW_RETURN (disp, DSRT_Dispatcher<DSRT_Scheduler_Traits>, 0);
   disp->implementation (tmp);
   tmp->init (config_info);
-  return disp_auto_ptr;
+  return disp;
 }
 
 template <class QoSDescriptor_t>
diff --git a/Kokyu/Kokyu_dsrt.h b/Kokyu/Kokyu_dsrt.h
index 1c75df12192..97aa4766ee6 100644
--- a/Kokyu/Kokyu_dsrt.h
+++ b/Kokyu/Kokyu_dsrt.h
@@ -101,9 +101,9 @@ namespace Kokyu
        *
        * @param config Configuration information for the DSRT dispatcher.
        *
-       * @return Auto pointer to the DSRT dispatcher.
+       * @return pointer to the DSRT dispatcher.
        */
-      static DSRT_Dispatcher_Auto_Ptr create_DSRT_dispatcher (const DSRT_ConfigInfo&);
+      static DSRT_Dispatcher<DSRT_Scheduler_Traits>* create_DSRT_dispatcher (const DSRT_ConfigInfo&);
     };
 
   /**
diff --git a/Kokyu/tests/DSRT_MIF/MIF.cpp b/Kokyu/tests/DSRT_MIF/MIF.cpp
index 196289b3944..df787972bd3 100644
--- a/Kokyu/tests/DSRT_MIF/MIF.cpp
+++ b/Kokyu/tests/DSRT_MIF/MIF.cpp
@@ -48,11 +48,11 @@ class MyTask : public ACE_Task_Base
 {
 public:
 
-  MyTask (ACE_Barrier& barrier,
+  MyTask (ACE_Barrier& bar,
           Kokyu::DSRT_Dispatcher<mif_scheduler_traits>* dispatcher,
           mif_scheduler_traits::QoSDescriptor_t& qos,
           int exec_duration)
-    :barrier_ (barrier),
+    :barrier_ (bar),
      dispatcher_ (dispatcher),
      qos_ (qos),
      guid_ (++guid),
@@ -125,7 +125,7 @@ int ACE_TMAIN (int,ACE_TCHAR**)
   //  config_info.scheduler_type_ = Kokyu::SCHED_MIF;
   config_info.impl_type_ = Kokyu::DSRT_OS_BASED;
 
-  ACE_Barrier barrier (3);
+  ACE_Barrier bar (3);
 
   ACE_DEBUG ((LM_DEBUG, "before create_dispatcher\n" ));
 
@@ -145,9 +145,9 @@ int ACE_TMAIN (int,ACE_TCHAR**)
   qos2.importance_ = 2;
   qos3.importance_ = 3;
 
-  MyTask mytask1 (barrier, disp.get (), qos1, 15);
-  MyTask mytask2 (barrier, disp.get (), qos2, 6);
-  MyTask mytask3 (barrier, disp.get (), qos3, 4);
+  MyTask mytask1 (bar, disp.get (), qos1, 15);
+  MyTask mytask2 (bar, disp.get (), qos2, 6);
+  MyTask mytask3 (bar, disp.get (), qos3, 4);
 
   long flags = THR_BOUND | THR_SCHED_FIFO;
 
diff --git a/Makefile.am b/Makefile.am
index 5d8d06f3c13..40e551bbca6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,118 +1,34 @@
-##---------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Top-level Makefile for the ACE toolkit libraries, tests, and
-##       applications
+## $Id$
 ##
-##---------------------------------------------------------------------------
-
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
-##  Process this file with automake to create Makefile.in
-##
-
-AUTOMAKE_OPTIONS = foreign
-
-
-bin_SCRIPTS = ace-config
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
-man_MANS = ace-config.1
-
-## Build the library directories first.
-## The docs directory is currently handled by the "dist-hook" makefile target.
 SUBDIRS = \
-  ace \
-  apps \
-  netsvcs \
-  tests
+        ace \
+        ASNMP
 
-if BUILD_TAO
-SUBDIRS += TAO
+if BUILD_ACEXML
+SUBDIRS += ACEXML 
 endif
 
-##  man
-
-##SUBDIRS = \
-##          docs \
-##          apps \
-##          examples \
-##          performance-tests \
-##          bin \
-##          ASNMP \
-##          os-patches \
-##          etc \
-##          includes
+SUBDIRS += \
+        apps \
+        bin \
+        netsvcs \
+        performance-tests \
+        protocols \
+        examples \
+        tests \
+        websvcs \
+	@KOKYU@ \
+	@TAO@
 
-## Additional flags to pass to `aclocal' when invoked by the generated
-## Makefile.  In particular, add ACE's `m4' directory to the macro
-## search path.
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
 
-## If any of these files are modified, `configure' will be
-## regenerated.
-CONFIGURE_DEPENDENCIES = \
-  m4/ace.m4 \
-  m4/aio.m4 \
-  m4/acinclude.m4 \
-  m4/compiler.m4 \
-  m4/config_h.m4 \
-  m4/platform.m4 \
-  m4/subsets.m4 \
-  m4/threads.m4 \
-  m4/tls.m4
-
-## For some reason, automake doesn't include acconfig.h in the distribution
-EXTRA_DIST = \
-  ACE-INSTALL.html \
-  ACE-install.sh \
-  FAQ \
-  PROBLEM-REPORT-FORM \
-  VERSION \
-  ace-config.in \
-  ace-config.1.in \
-  aceConf.sh.in
-
-DISTCLEANFILES = ace-config aceConf.sh ace-config.1 
-
-## release:
-##         $(MAKE) dist distdir=$(PACKAGE)$(VERSION)
-release:
-	$(MAKE) dist
-
-## Put `exec' in the name because this should be installed by
-## `install-exec', not `install-data'.
-confexecdir=$(libdir)
-confexec_DATA = aceConf.sh
-
-## Directories to include in the distribution but which I am too lazy to
-## create Makefile.am files for.  A Makefile.am for these directories isn't
-## needed anyway.
-ACE_EXTRA_DIST = ChangeLogs bin docs m4
-
-## Automake recognized target.  Appends these rules to the "all"
-## target.
-all-local:
-	test -d bin || ($(LN_S) $(top_srcdir)/bin bin && touch ace-bin-stamp)
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
-## Make sure config.h doesn't get into the distribution
-## since it may later intefere with the newly generated
-## config.h when doing VPATH builds.
-## We don't want it in the distribution, anyway, since
-## config.h is platform specific.
-dist-hook:
-	-rm -f $(distdir)/ace/config.h
-	(cd $(top_srcdir); tar cf - $(ACE_EXTRA_DIST)) | (cd $(distdir); \
-          tar xfBp -)
-	list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \
-          rm -rf $$p; \
-        done
-
-## Clean up files and directories created by this Makefile.
-distclean-local:
-	-test -f ace-bin-stamp && rm bin ace-bin-stamp
diff --git a/NEWS b/NEWS
index 0b30531a4f8..292593737c9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,30 +1,120 @@
-PLANNED MAJOR CHANGES TARGETED FOR ACE-5.4.3
+PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
+===========================================================================
+
+PLANNED MAJOR CHANGES TARGETED FOR ACE-5.4.5
 ====================================================
 
-- (Bala) Bug 1890-Select_Reactor and Priority_Reactor performance can
-  be improved
+. Support for shared libraries with VxWorks
+
+USER VISIBLE CHANGES BETWEEN ACE-5.4.3 and ACE-5.4.4
+====================================================
+
+. The ace-config script has been replaced by pkg-config metadata files
+  which are installed in ${prefix}/lib/pkgconfig by the automake build.
+
+. Remove ACE_OS::gets() implementation.  While this ACE implementation
+  of gets() did not contain the security holes that all standard
+  gets() implementations have, keeping it around only serves to foster
+  confusion since (1) some may incorrectly assume that this
+  ACE-specific gets() implementation has the same holes as standard
+  ones, and (2) invoking it with a default size argument so that it
+  looks like a standard gets() call results in behavior that is
+  different from the standard.  Use ACE_OS::fgets() instead.
+
+. Removed ACE_Unbounded_Set_Ex, this gave the false idea that it had
+  thread safe iterators. Use ACE_Unbounded_Set instead
+
+. Improved VxWorks support for static libraries. Shared libraries do cause
+  several known problems which will be fixed in the x.4.5 release.
+
+. Removed the usage of the ACE_x_cast macros, we are using the C++ casts
+  from now on. The ACE_x_cast macros are deprecated and will be removed
+  after the x.5.1 release
+
+. Some improvements in autoconf support; better detection of available
+  OS and compiler features.
+
+. Fixed bugs in ACE TSS emulation
+
+USER VISIBLE CHANGES BETWEEN ACE-5.4.2 and ACE-5.4.3
+====================================================
+
+. Improved Cygwin 1.5.12 support, 90% of the tests now succeed
+
+. Improved OpenVMS support.
+
+. Added ability to use fltk with Cygwin/MinGW
+
+. Added ACE_INT64 that defines a native 64 bit type.
+
+. Added 'q' as usable specifier for ACE_Log_Msg to print out int64 bit number.
+
+. Added better support for Intel C++ compilers.
+
+. Improved HPUX support.
+
+. Added a new directory ("ACE_wrappers/protocols/ace") for new protocols
+  that are not directly components of ACE, but are relate to ACE and
+  defined a new protocol, HTBP (Hypertext Tunneling, Bidirectional
+  Protocol) providing ACE_Acceptor/Connector/Stream semantics over a
+  connection owned by an HTTP proxy. Test cases in
+  ACE_wrappers/tests/HTBP provide examples of use.
+
+. Performace enhancement in TP_Reactor's handle_timer_events method [Bug
+  1971].
+
+. Various changes to permit ACE to execute on HP NonStop platform (e.g
+  support for its pthreads version).
+
+. Updated HP NonStop configuration files (config-tandem-nsk).
+
+. The "ACE" pseudo-namespace is now a true C++ namespace.  Transitional
+  pseudo-namespaces that were only meant to be used internally by ACE,
+  such as "ACE_Sock_Connect", no longer exist.
+
+. ACE_CDR::Boolean type is now a true C++ "bool" on all platforms except
+  MSVC++ 6.  We plan to deprecate MSVC++ 6 support sometime after the
+  x.5 release of ACE+TAO+CIAO, so we recommend you start migrating to a
+  later version of MSVC++.
+
+. More GNU g++ 3.4.x fixes.
+
+. Added ICMP and "ping" socket support.
+
+. Added mkstemp() emulation.
+
+. Fixed problem on Linux < 2.5.47 platforms where equality comparison of
+  two logically equal sockaddr_in structure instances would incorrectly
+  fail.
+
+. Support for wide characters has been improved on non-Windows
+  platforms.
+
+. A number of Windows CE problems have been fixed.
+
+. ACE's loading of DLLs (for example, as a result of loading synamic
+  services) has been changed to use the native OS's facilities for
+  locating the DLL instead of searching LD_LIBRARY_PATH (or its
+  equivalent) then loading the DLL using a full pathname. This restores
+  enforcement of a platform's loading and security policy.  To use the
+  old DLL locating method, add ACE_MUST_HELP_DLOPEN_SEARCH_PATH to your
+  config.h file before building ACE.
+
+. A number of errors in the APG example programs have been corrected.
 
-- (Boris) Addition of XSC
+. Select_Reactor and Priority_Reactor performance improved. [Bug 1890]
 
-- (Steve, J.T., Ossama) Autoconfigure using all MPC-generated files.
-  **In progress. Mostly fighting with MPC.
+. Wide-char functionality on POSIX (Linux, etc.)
 
-- (Steve) Wide-char functionality on POSIX (Linux, etc.)
-  Tue Aug 24 14:07:22 2004  Steve Huston  <shuston@riverace.com>
-  (and subsequent follow-ups)
+. TSS memory leak fixes [Bug 1542]
 
-- (OCI) TSS memory leak fixes (Bug 1542)
+. Ported to HPUX 11i v2 on Itanium
 
-  ACE - Initially Fri Aug 13 15:26:40 2004  Dale Wilson  <wilson_d@ociweb.com>
-        with many others following on.
+. Added code to ACE for platform RedHat AS 3.0 on Opteron.
 
-- (Johnny) Ported to HPUX 11i v2 on Itanium
-  Finished, Mon Aug 23 17:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+. Changed ACE::crc32() family of functions to NOT fold in the length of
+  the string/buffer/iovec into the CRC.
 
-*** not user visible, but probably significant anyway
-- Added code to ace for platform RedHat AS 3.0 on Opteron.
-  Wed Aug 25 14:58:51 2004  Rich Seibel <seibel_r@ociweb.com>
-  Wed Aug 25 14:49:11 2004  Rich Seibel <seibel_r@ociweb.com>
 
 USER VISIBLE CHANGES BETWEEN ACE-5.4.1 and ACE-5.4.2
 ====================================================
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index e138fa4c983..565da2cd048 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -43,7 +43,7 @@
 To: ace-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 5.4.2
+    ACE VERSION: 5.4.4
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/Release b/Release
index f57dca04732..b37b0bf1e29 100644
--- a/Release
+++ b/Release
@@ -64,9 +64,6 @@ CONTROLLED_FILES = \
         VERSION \
 	ACEXML \
         ace \
-        ace-config.1.in \
-        ace-config.in \
-        aceConf.sh.in \
         apps \
         bin \
 	configure.ac \
@@ -81,6 +78,7 @@ CONTROLLED_FILES = \
         performance-tests \
         tests \
 	Kokyu \
+	protocols \
         websvcs
 
 RELEASE_FILES = \
@@ -90,15 +88,13 @@ RELEASE_FILES = \
         ACE_wrappers/*.dsw \
         ACE_wrappers/*.sln \
         ACE_wrappers/*.bor \
-        ACE_wrappers/man
-
-AUTOCONF_RELEASE_FILES = \
-	$(RELEASE_FILES) \
+        ACE_wrappers/*.vcw \
 	ACE_wrappers/Makefile.in \
 	ACE_wrappers/configure \
 	ACE_wrappers/aclocal.m4 \
 	ACE_wrappers/aux_config
 
+
 ALL_RELEASE_FILES = \
 	$(RELEASE_FILES) \
         ACE_wrappers/TAO
@@ -208,9 +204,6 @@ show_controlled_files:
 show_release_files:
 	@echo $(RELEASE_FILES)
 
-show_autoconf_release_files:
-	@echo $(AUTOCONF_RELEASE_FILES)
-
 show_release_lib_files:
 	@echo $(RELEASE_LIB_FILES)
 
diff --git a/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc b/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc
index 9006d3a7577..2282230c383 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc
+++ b/TAO/CIAO/CCF/CCF/CIDL/CIDL.mpc
@@ -4,7 +4,7 @@ project(CIDL) {
   requires += cidl exceptions
   sharedname =
   staticname = CIDL
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   Source_Files {
  	.
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc
index b45a3ad38b5..23e1e308ebd 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc
@@ -4,7 +4,7 @@ project(CodeGenerationKit) {
   requires += cidl exceptions
   sharedname =
   staticname = CodeGenerationKit
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   
   specific(vc71) {
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp
index 1c620338206..24f9866eac4 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationIDL.hpp
@@ -82,14 +82,54 @@ namespace Indentation
 
             ensure_new_line ();
             output_indentation ();
-            result = write (c);
+
+            hold_.push_back (c);
+
+            // result = write (c);
+
+            //ensure_new_line ();
+
+            // Add double newline after '}'.
+            //
+            hold_.push_back ('\n');
+            hold_.push_back ('\n');
+
+
             break;
           }
         case ';':
           {
+            // Handling '};' case.
+            //
+
+            bool brace (false);
+
+            if (hold_.size () > 1 && hold_.back () == '\n')
+            {
+              bool pop_nl (false);
+
+              for (typename Hold::reverse_iterator
+                     i (hold_.rbegin ()), e (hold_.rend ()); i != e; ++i)
+              {
+                if (*i != '\n')
+                {
+                  if (*i == '}') brace = pop_nl = true;
+                  break;
+                }
+              }
+
+              if (pop_nl) while (hold_.back () == '\n') hold_.pop_back ();
+            }
+
             output_indentation ();
             result = write (c);
 
+            if (brace)
+            {
+              hold_.push_back ('\n');
+              hold_.push_back ('\n');
+            }
+
             if (construct_ != STRING_LITERAL && construct_ != CHAR_LITERAL)
             {
               ensure_new_line ();
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc b/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc
index e35da40ede2..037d97e2301 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements.mpc
@@ -4,7 +4,7 @@ project(CompilerElements) {
   requires += cidl exceptions
   sharedname =
   staticname = CompilerElements
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   
   specific(vc71) {
diff --git a/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc b/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc
index f7319d3f623..c56319af393 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc
+++ b/TAO/CIAO/CCF/CCF/IDL2/IDL2.mpc
@@ -4,7 +4,7 @@ project(IDL2) {
   requires += cidl exceptions
   sharedname =
   staticname = IDL2
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   Source_Files {
 	.
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/ValueType.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/ValueType.cpp
index f369e7d790d..ace6d65eac9 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/ValueType.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/ValueType.cpp
@@ -72,6 +72,27 @@ namespace CCF
 
       TypeInfo const& ConcreteValueType::
       static_type_info () { return concrete_value_type_; }
+
+
+      // ValueTypeFactory
+      //
+      //
+      namespace
+      {
+        TypeInfo
+        value_type_factory_init_ ()
+        {
+          TypeInfo ti (typeid (ValueTypeFactory));
+          ti.add_base (
+            Access::PUBLIC, true, TwoWayOperation::static_type_info ());
+          return ti;
+        }
+
+        TypeInfo value_type_factory_ (value_type_factory_init_ ());
+      }
+
+      TypeInfo const& ValueTypeFactory::
+      static_type_info () { return value_type_factory_; }
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/ValueType.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/ValueType.hpp
index 377e70ab31f..15a2f0d867c 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/ValueType.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/ValueType.hpp
@@ -6,6 +6,7 @@
 #define CCF_IDL2_SEMANTIC_GRAPH_VALUE_TYPE_HPP
 
 #include "CCF/IDL2/SemanticGraph/Elements.hpp"
+#include "CCF/IDL2/SemanticGraph/Operation.hpp"
 
 namespace CCF
 {
@@ -81,6 +82,25 @@ namespace CCF
           type_info (static_type_info ());
         }
       };
+
+
+      //
+      //
+      //
+      class ValueTypeFactory : public virtual TwoWayOperation
+      {
+      public:
+        static Introspection::TypeInfo const&
+        static_type_info ();
+
+      protected:
+        friend class Graph<Node, Edge>;
+
+        ValueTypeFactory ()
+        {
+          type_info (static_type_info ());
+        }
+      };
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/ValueType.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/ValueType.hpp
index 40be839503c..a99ee48e814 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/ValueType.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/ValueType.hpp
@@ -6,7 +6,7 @@
 #define CCF_IDL2_TRAVERSAL_VALUE_TYPE_HPP
 
 #include "CCF/IDL2/Traversal/Elements.hpp"
-
+#include "CCF/IDL2/Traversal/Operation.hpp"
 #include "CCF/IDL2/SemanticGraph/ValueType.hpp"
 
 namespace CCF
@@ -76,6 +76,10 @@ namespace CCF
       typedef
       ValueTypeTemplate<SemanticGraph::ConcreteValueType>
       ConcreteValueType;
+
+      typedef
+      OperationTemplate<SemanticGraph::ValueTypeFactory>
+      ValueTypeFactory;
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc b/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc
index 0b2c441708b..d6cd8bfe316 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc
+++ b/TAO/CIAO/CCF/CCF/IDL3/IDL3.mpc
@@ -4,7 +4,7 @@ project(IDL3) {
   requires += cidl exceptions
   sharedname =
   staticname = IDL3
-  includes += ../..
+  includes += $(CIAO_ROOT)/CCF
   libout = ..
   Source_Files {
         .
diff --git a/TAO/CIAO/CCF/CCF/IDL3/IDL3.vcproj b/TAO/CIAO/CCF/CCF/IDL3/IDL3.vcproj
index 2392df0eee4..b31530826e6 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/IDL3.vcproj
+++ b/TAO/CIAO/CCF/CCF/IDL3/IDL3.vcproj
@@ -164,6 +164,9 @@
 					RelativePath=".\SemanticAction\EventType.hpp">

 				</File>

 				<File

+					RelativePath=".\SemanticAction\EventTypeFactory.hpp">

+				</File>

+				<File

 					RelativePath=".\SemanticAction\Factory.hpp">

 				</File>

 				<File

@@ -204,6 +207,9 @@
 						RelativePath=".\SemanticAction\Impl\EventType.cpp">

 					</File>

 					<File

+						RelativePath=".\SemanticAction\Impl\EventTypeFactory.cpp">

+					</File>

+					<File

 						RelativePath=".\SemanticAction\Impl\Factory.cpp">

 					</File>

 					<File

@@ -247,6 +253,9 @@
 						RelativePath=".\SemanticAction\Impl\EventType.hpp">

 					</File>

 					<File

+						RelativePath=".\SemanticAction\Impl\EventTypeFactory.hpp">

+					</File>

+					<File

 						RelativePath=".\SemanticAction\Impl\Factory.hpp">

 					</File>

 					<File

diff --git a/TAO/CIAO/CCF/CCF/IDL3/Parser.cpp b/TAO/CIAO/CCF/CCF/IDL3/Parser.cpp
index 4f2c8467376..1d04529c1fe 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Parser.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Parser.cpp
@@ -120,6 +120,17 @@ namespace CCF
           act_event_type_end (
             f.event_type (), &SemanticAction::EventType::end),
 
+          // EventTypeFactory
+          //
+          act_event_type_factory_name (
+            f.event_type_factory (), &SemanticAction::EventTypeFactory::name),
+
+          act_event_type_factory_parameter (
+            f.event_type_factory (), &SemanticAction::EventTypeFactory::parameter),
+
+          act_event_type_factory_raises (
+            f.event_type_factory (), &SemanticAction::EventTypeFactory::raises),
+
 
           // Home
           //
@@ -422,10 +433,41 @@ namespace CCF
            | attribute_decl
            | operation_decl
            | value_type_member_decl
-           | value_type_factory_decl
+           | event_type_factory_decl
+        )
+        ;
+
+
+      // eventtype factory
+      //
+      //
+      event_type_factory_decl =
+           FACTORY
+        >> simple_identifier[act_event_type_factory_name]
+        >> LPAREN
+        >> event_type_factory_parameter_list
+        >> RPAREN
+        >> !(RAISES >> LPAREN >> event_type_factory_raises_list >> RPAREN)
+        >> SEMI
+        ;
+
+      event_type_factory_parameter_list =
+        *(
+              event_type_factory_parameter
+           >> *(COMMA >> event_type_factory_parameter)
         )
         ;
 
+      event_type_factory_parameter =
+           IN
+        >> (identifier >> simple_identifier)[act_event_type_factory_parameter]
+        ;
+
+      event_type_factory_raises_list =
+           identifier[act_event_type_factory_raises]
+        >> *(COMMA >> identifier[act_event_type_factory_raises])
+        ;
+
       //
       // home
       //
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Parser.hpp b/TAO/CIAO/CCF/CCF/IDL3/Parser.hpp
index ffce97c5601..39a11f022ca 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Parser.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Parser.hpp
@@ -68,6 +68,11 @@ namespace CCF
       Rule event_type_def_trailer;
       Rule event_type_body;
 
+      Rule event_type_factory_decl;
+      Rule event_type_factory_parameter_list;
+      Rule event_type_factory_parameter;
+      Rule event_type_factory_raises_list;
+
       // home
       //
       Rule home_decl;
@@ -183,6 +188,19 @@ namespace CCF
       NoArgAction<SemanticAction::EventType>
       act_event_type_end;
 
+      // EventTypeFactory
+      //
+      OneArgAction<SimpleIdentifierPtr, SemanticAction::EventTypeFactory>
+      act_event_type_factory_name;
+
+      TwoArgAction<IdentifierPtr,
+                   SimpleIdentifierPtr,
+                   SemanticAction::EventTypeFactory>
+      act_event_type_factory_parameter;
+
+      OneArgAction<IdentifierPtr, SemanticAction::EventTypeFactory>
+      act_event_type_factory_raises;
+
 
       // Home
       //
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction.hpp
index 021dbcc598e..ae0f9d21b2e 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction.hpp
@@ -13,6 +13,7 @@
 #include "CCF/IDL3/SemanticAction/Consumes.hpp"
 #include "CCF/IDL3/SemanticAction/Emits.hpp"
 #include "CCF/IDL3/SemanticAction/EventType.hpp"
+#include "CCF/IDL3/SemanticAction/EventTypeFactory.hpp"
 #include "CCF/IDL3/SemanticAction/Home.hpp"
 #include "CCF/IDL3/SemanticAction/HomeFactory.hpp"
 #include "CCF/IDL3/SemanticAction/HomeFinder.hpp"
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Factory.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Factory.hpp
index 10e4635a64d..8dd3ae3d25f 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Factory.hpp
@@ -20,6 +20,7 @@ namespace CCF
       struct Emits;
       struct Consumes;
       struct EventType;
+      struct EventTypeFactory;
       struct Home;
       struct HomeFactory;
       struct HomeFinder;
@@ -48,6 +49,9 @@ namespace CCF
         virtual EventType&
         event_type () = 0;
 
+        virtual EventTypeFactory&
+        event_type_factory () = 0;
+
         virtual Home&
         home () = 0;
 
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp
index 276272ae041..075955ecc2b 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.cpp
@@ -22,6 +22,7 @@ namespace CCF
               consumes_ (ctx_),
               emits_ (ctx_),
               event_type_ (ctx_),
+              event_type_factory_ (ctx_),
               home_ (ctx_),
               home_factory_ (ctx_),
               home_finder_ (ctx_),
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp
index 404f377c0f3..fc6b80a9a6b 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Factory.hpp
@@ -16,6 +16,7 @@
 #include "CCF/IDL3/SemanticAction/Impl/Emits.hpp"
 #include "CCF/IDL3/SemanticAction/Impl/Consumes.hpp"
 #include "CCF/IDL3/SemanticAction/Impl/EventType.hpp"
+#include "CCF/IDL3/SemanticAction/Impl/EventTypeFactory.hpp"
 #include "CCF/IDL3/SemanticAction/Impl/Home.hpp"
 #include "CCF/IDL3/SemanticAction/Impl/HomeFactory.hpp"
 #include "CCF/IDL3/SemanticAction/Impl/HomeFinder.hpp"
@@ -61,6 +62,13 @@ namespace CCF
             return event_type_;
           }
 
+          virtual EventTypeFactory&
+          event_type_factory ()
+          {
+            return event_type_factory_;
+          }
+
+
           virtual SemanticAction::Home&
           home ()
           {
@@ -109,6 +117,7 @@ namespace CCF
           Consumes consumes_;
           Emits emits_;
           EventType event_type_;
+          EventTypeFactory event_type_factory_;
           Home home_;
           HomeFactory home_factory_;
           HomeFinder home_finder_;
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/EventType.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/EventType.cpp
index 5054b1f2c3e..fcb9ef57f7d 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/EventType.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/EventType.cpp
@@ -75,6 +75,27 @@ namespace CCF
 
       TypeInfo const& ConcreteEventType::
       static_type_info () { return concrete_event_type_; }
+
+
+      // EventTypeFactory
+      //
+      //
+      namespace
+      {
+        TypeInfo
+        event_type_factory_init_ ()
+        {
+          TypeInfo ti (typeid (EventTypeFactory));
+          ti.add_base (
+            Access::PUBLIC, true, ValueTypeFactory::static_type_info ());
+          return ti;
+        }
+
+        TypeInfo event_type_factory_ (event_type_factory_init_ ());
+      }
+
+      TypeInfo const& EventTypeFactory::
+      static_type_info () { return event_type_factory_; }
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/EventType.hpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/EventType.hpp
index d2c352fda80..5990e1e5884 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/EventType.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticGraph/EventType.hpp
@@ -71,6 +71,24 @@ namespace CCF
           type_info (static_type_info ());
         }
       };
+
+      //
+      //
+      //
+      class EventTypeFactory : public virtual ValueTypeFactory
+      {
+      public:
+        static Introspection::TypeInfo const&
+        static_type_info ();
+
+      protected:
+        friend class Graph<Node, Edge>;
+
+        EventTypeFactory ()
+        {
+          type_info (static_type_info ());
+        }
+      };
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.hpp b/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.hpp
index 4eab9a361ad..941dfad76e6 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/Traversal/EventType.hpp
@@ -6,6 +6,8 @@
 #define CCF_IDL3_TRAVERSAL_EVENT_TYPE_HPP
 
 #include "CCF/IDL3/SemanticGraph/EventType.hpp"
+
+#include "CCF/IDL2/Traversal/Operation.hpp"
 #include "CCF/IDL3/Traversal/Elements.hpp"
 
 namespace CCF
@@ -40,7 +42,7 @@ namespace CCF
 
         virtual void
         inherits_none (T&);
-        
+
         virtual void
         supports (T&, EdgeDispatcherBase&);
 
@@ -55,7 +57,7 @@ namespace CCF
 
         virtual void
         supports_none (T&);
-        
+
         virtual void
         post (T&);
 
@@ -75,6 +77,10 @@ namespace CCF
       typedef
       EventTypeTemplate<SemanticGraph::ConcreteEventType>
       ConcreteEventType;
+
+      typedef
+      OperationTemplate<SemanticGraph::EventTypeFactory>
+      EventTypeFactory;
     }
   }
 }
diff --git a/TAO/CIAO/CCF/Config.rules b/TAO/CIAO/CCF/Config.rules
index 91803ad8d62..5c17ea3bf9e 100644
--- a/TAO/CIAO/CCF/Config.rules
+++ b/TAO/CIAO/CCF/Config.rules
@@ -78,3 +78,6 @@ endif
 ifneq ($(strip $(UTILITY_INCLUDE)),)
   UTILITY_CPP_FLAGS := -I$(UTILITY_INCLUDE)
 endif
+
+CPPFLAGS += $(BOOST_CPP_FLAGS) $(UTILITY_CPP_FLAGS)
+LD_FLAGS += $(BOOST_LD_FLAGS)
diff --git a/TAO/CIAO/CIDLC/CIDLC.mpc b/TAO/CIAO/CIDLC/CIDLC.mpc
index 87e965a1942..fd669339955 100644
--- a/TAO/CIAO/CIDLC/CIDLC.mpc
+++ b/TAO/CIAO/CIDLC/CIDLC.mpc
@@ -6,7 +6,7 @@ project(CIDLC) {
   includes += .. ../CCF
   after += IDL2 IDL3 CIDL CodeGenerationKit CompilerElements
   install = ../bin
-  libpaths += ../CCF/CCF ../../../lib
+  libpaths += $(CIAO_ROOT)/CCF/CCF ../../../lib
   libs += CIDL IDL3 IDL2 CodeGenerationKit CompilerElements
   Source_Files {
     ExecutorMappingGenerator.cpp
diff --git a/TAO/CIAO/CIDLC/CIDLC.sln b/TAO/CIAO/CIDLC/CIDLC.sln
index 540e86456b2..5d05675fe52 100644
--- a/TAO/CIAO/CIDLC/CIDLC.sln
+++ b/TAO/CIAO/CIDLC/CIDLC.sln
@@ -1,6 +1,31 @@
 Microsoft Visual Studio Solution File, Format Version 8.00

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CIDLC", "CIDLC.vcproj", "{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}"

 	ProjectSection(ProjectDependencies) = postProject

+		{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6} = {ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}

+		{78A62970-330F-4FF1-9B0E-74F689A4EA4F} = {78A62970-330F-4FF1-9B0E-74F689A4EA4F}

+		{CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC} = {CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}

+		{5F0B01BD-722F-4958-8E02-680588866D7C} = {5F0B01BD-722F-4958-8E02-680588866D7C}

+		{108D07F1-6364-4B51-87DB-AED8BBE6396A} = {108D07F1-6364-4B51-87DB-AED8BBE6396A}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CIDL", "..\CCF\CCF\CIDL\CIDL.vcproj", "{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CodeGenerationKit", "..\CCF\CCF\CodeGenerationKit\CodeGenerationKit.vcproj", "{5F0B01BD-722F-4958-8E02-680588866D7C}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompilerElements", "..\CCF\CCF\CompilerElements\CompilerElements.vcproj", "{CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDL2", "..\CCF\CCF\IDL2\IDL2.vcproj", "{78A62970-330F-4FF1-9B0E-74F689A4EA4F}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDL3", "..\CCF\CCF\IDL3\IDL3.vcproj", "{108D07F1-6364-4B51-87DB-AED8BBE6396A}"

+	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

 Global

@@ -13,6 +38,26 @@ Global
 		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Debug.Build.0 = Debug|Win32

 		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Release.ActiveCfg = Release|Win32

 		{8F2A74C0-C995-4BE2-8FD7-538F64BF98FD}.Release.Build.0 = Release|Win32

+		{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Debug.ActiveCfg = Debug|Win32

+		{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Debug.Build.0 = Debug|Win32

+		{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Release.ActiveCfg = Release|Win32

+		{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}.Release.Build.0 = Release|Win32

+		{5F0B01BD-722F-4958-8E02-680588866D7C}.Debug.ActiveCfg = Debug|Win32

+		{5F0B01BD-722F-4958-8E02-680588866D7C}.Debug.Build.0 = Debug|Win32

+		{5F0B01BD-722F-4958-8E02-680588866D7C}.Release.ActiveCfg = Release|Win32

+		{5F0B01BD-722F-4958-8E02-680588866D7C}.Release.Build.0 = Release|Win32

+		{CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Debug.ActiveCfg = Debug|Win32

+		{CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Debug.Build.0 = Debug|Win32

+		{CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Release.ActiveCfg = Release|Win32

+		{CED6ADA4-86E1-4F4A-95A2-7AB986D9E4CC}.Release.Build.0 = Release|Win32

+		{78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Debug.ActiveCfg = Debug|Win32

+		{78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Debug.Build.0 = Debug|Win32

+		{78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Release.ActiveCfg = Release|Win32

+		{78A62970-330F-4FF1-9B0E-74F689A4EA4F}.Release.Build.0 = Release|Win32

+		{108D07F1-6364-4B51-87DB-AED8BBE6396A}.Debug.ActiveCfg = Debug|Win32

+		{108D07F1-6364-4B51-87DB-AED8BBE6396A}.Debug.Build.0 = Debug|Win32

+		{108D07F1-6364-4B51-87DB-AED8BBE6396A}.Release.ActiveCfg = Release|Win32

+		{108D07F1-6364-4B51-87DB-AED8BBE6396A}.Release.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection

diff --git a/TAO/CIAO/CIDLC/DescriptorGenerator.cpp b/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
index 7753922eaa2..7b5b41933c2 100644
--- a/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
+++ b/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
@@ -30,70 +30,6 @@ namespace
     return os.str ();
   }
 
-  Nameable* defined_in (Nameable& n)
-  {
-    for (Nameable::NamedIterator i (n.named_begin ()), e (n.named_end ());
-        i != e;
-        ++i)
-    {
-      if (Defines* d = dynamic_cast<Defines*> (*i))
-      {
-        return &d->scope ();
-      }
-    }
-
-    return 0;
-  }
-
-  string
-  compute_repo_id (Nameable& d)
-  {
-    if (d.context ().count (STRS[REPO_ID]))
-    {
-      return d.context ().get<string> (STRS[REPO_ID]);
-    }
-
-    string prefix ("");
-    TypePrefix *tp = 0;
-
-    if (d.context ().count (STRS[TYPE_PREFIX]))
-    {
-      tp = d.context ().get<TypePrefix*> (STRS[TYPE_PREFIX]);
-      prefix = tp->prefix ().literal ();
-    }
-    else
-    {
-      Nameable* parent = defined_in (d);
-
-      while (parent != 0)
-      {
-        if (parent->context ().count (STRS[TYPE_PREFIX]))
-        {
-          tp =
-            parent->context ().get<TypePrefix*> (STRS[TYPE_PREFIX]);
-
-          prefix = tp->prefix ().literal ();
-          break;
-        }
-
-        parent = defined_in (*parent);
-      }
-    }
-
-    if (prefix != "") prefix += "/";
-
-    ScopedName scoped (d.scoped_name ());
-    Name stripped (scoped.begin () + 1, scoped.end ());
-
-    string scope_name = regex::perl_s (name_to_string (stripped), "%::%/%");
-
-    string repo_id = "IDL:" + prefix + scope_name + ":1.0";
-
-    // Store the repo id for possible future reference.
-    d.context ().set<string> (STRS[REPO_ID], repo_id);
-    return repo_id;
-  }
-
   class EmitterBase
   {
   public:
@@ -120,7 +56,9 @@ namespace
       virtual void
       traverse (Type& c)
       {
-        os << "<componentrepid repid=\"" << compute_repo_id (c) << "\"/>"
+        os << "<componentrepid repid=\"" 
+           << c.context ().get<string> (STRS[REPO_ID])
+           << "\"/>"
            << endl;
       }
     };
@@ -134,7 +72,9 @@ namespace
       virtual void
       traverse (Type& h)
       {
-        os << "<homerepid repid=\"" << compute_repo_id (h) << "\"/>"
+        os << "<homerepid repid=\"" 
+           << h.context ().get<string> (STRS[REPO_ID])
+           << "\"/>"
            << endl;
       }
     };
@@ -150,7 +90,8 @@ namespace
       {
         os << "<homefeatures" << endl
            << "name=\"" << h.name () << "\"" << endl
-           << "repid=\"" << compute_repo_id (h)
+           << "repid=\"" 
+           << h.context ().get<string> (STRS[REPO_ID])
            << "\">" << endl;
 
         Traversal::Inherits home_inherits;
@@ -175,7 +116,9 @@ namespace
         virtual void
         traverse (Type& h)
         {
-          os << "<inheritshome repid=\"" << compute_repo_id (h) << "\"/>"
+          os << "<inheritshome repid=\"" 
+             << h.context ().get<string> (STRS[REPO_ID])
+             << "\"/>"
              << endl;
         }
       };
@@ -188,11 +131,12 @@ namespace
       {}
 
       virtual void
-      traverse (Type& h)
+      traverse (Type& c)
       {
         os << "<componentfeatures" << endl
-           << "name=\"" << h.name () << "\"" << endl
-           << "repid=\"" << compute_repo_id (h)
+           << "name=\"" << c.name () << "\"" << endl
+           << "repid=\"" 
+           << c.context ().get<string> (STRS[REPO_ID])
            << "\">" << endl;
 
         Traversal::Inherits component_inherits;
@@ -202,8 +146,8 @@ namespace
         component_inherits.node_traverser (i_emitter);
         component_supports.node_traverser (s_emitter);
 
-        inherits (h, component_inherits);
-        supports (h, component_supports);
+        inherits (c, component_inherits);
+        supports (c, component_supports);
 
         os << "<ports>" << endl;
 
@@ -211,7 +155,7 @@ namespace
         PortsEmitter ports_emitter (os);
         defines.node_traverser (ports_emitter);
 
-        names (h, defines);
+        names (c, defines);
 
         os << "</ports>" << endl;
 
@@ -219,7 +163,7 @@ namespace
 
         // Go after inherited components.
         //
-        Traversal::Component::traverse (h);
+        Traversal::Component::traverse (c);
       }
 
       struct ComponentInheritanceEmitter : Traversal::Component, EmitterBase
@@ -229,9 +173,11 @@ namespace
         {}
 
         virtual void
-        traverse (Type& h)
+        traverse (Type& c)
         {
-          os << "<inheritscomponent repid=\"" << compute_repo_id (h) << "\"/>"
+          os << "<inheritscomponent repid=\"" 
+             << c.context ().get<string> (STRS[REPO_ID])
+             << "\"/>"
              << endl;
         }
       };
@@ -243,9 +189,11 @@ namespace
         {}
 
         virtual void
-        traverse (Type& h)
+        traverse (Type& i)
         {
-          os << "<supportsinterface repid=\"" << compute_repo_id (h) << "\"/>"
+          os << "<supportsinterface repid=\"" 
+             << i.context ().get<string> (STRS[REPO_ID])
+             << "\"/>"
              << endl;
         }
       };
@@ -346,7 +294,9 @@ namespace
           virtual void
           traverse (SemanticGraph::Type& t)
           {
-            os << '\"' << compute_repo_id (t) << '\"';
+            os << '\"' 
+               << t.context ().get<string> (STRS[REPO_ID])
+               << '\"';
           }
         };
 
@@ -376,10 +326,11 @@ namespace
         if (add (i))
         {
           os << "<interface" << endl
-              << "name=\"" << i.name ()
-              << "\"" << endl
-              << "repid=\"" << compute_repo_id (i)
-              << "\">" << endl;
+             << "name=\"" << i.name ()
+             << "\"" << endl
+             << "repid=\"" 
+             << i.context ().get<string> (STRS[REPO_ID])
+             << "\">" << endl;
 
           Traversal::Inherits interface_inherits;
           InterfaceInheritanceEmitter i_emitter (os);
@@ -403,8 +354,9 @@ namespace
       virtual void
       traverse (Type& i)
       {
-        os << "<inheritsinterface repid=\"" << compute_repo_id (i)
-            << "\"/>" << endl;
+        os << "<inheritsinterface repid=\"" 
+           << i.context ().get<string> (STRS[REPO_ID])
+           << "\"/>" << endl;
       }
     };
 
diff --git a/TAO/CIAO/CIDLC/ExecImplGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplGenerator.cpp
index da965893980..45762e37269 100644
--- a/TAO/CIAO/CIDLC/ExecImplGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplGenerator.cpp
@@ -163,7 +163,7 @@ ExecImplGenerator::configure_stream (string const& suffix_option,
                                         default_suffix);
     string file_expr =
       cl_.get_value (regex_option,
-                     "/(\\.(idl|cidl))?$/" + file_suffix + "/");
+                     "/(\\.(idl|cidl|cdl))?$/" + file_suffix + "/");
 
     string file_name = regex::perl_s (file_name_, file_expr);
 
diff --git a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
index 9c99b88200d..1f2ec8b399e 100644
--- a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
@@ -773,7 +773,7 @@ namespace
     }
 
     virtual void
-    returns (SemanticGraph::HomeFactory& hf)
+    returns (SemanticGraph::HomeFactory&)
     {
       os << STRS[COMP_EC] << "_ptr" << endl;
     }
@@ -849,7 +849,7 @@ namespace
     }
 
     virtual void
-    returns (SemanticGraph::HomeFinder& t)
+    returns (SemanticGraph::HomeFinder&)
     {
       os << STRS[COMP_EC] << "_ptr" << endl;
     }
@@ -1177,7 +1177,7 @@ ExecImplHeaderEmitter::ExecImplHeaderEmitter (std::ostream& os_,
 {}
 
 void
-ExecImplHeaderEmitter::pre (TranslationUnit& u)
+ExecImplHeaderEmitter::pre (TranslationUnit&)
 {
   os << COPYRIGHT;
 
@@ -1219,7 +1219,7 @@ ExecImplHeaderEmitter::pre (TranslationUnit& u)
                                       "_svnt.h");
 
   file_name = regex::perl_s (file_name,
-                             "/(\\.(idl|cidl))?$/"
+                             "/(\\.(idl|cidl|cdl))?$/"
                              + file_suffix
                              + "/");
 
@@ -1300,7 +1300,7 @@ ExecImplHeaderEmitter::generate (TranslationUnit& u)
 }
 
 void
-ExecImplHeaderEmitter::post (TranslationUnit& u)
+ExecImplHeaderEmitter::post (TranslationUnit&)
 {
   if (file_.empty ()) return;
   
diff --git a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
index 2e12a819fad..85b7f241e1a 100644
--- a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
@@ -276,10 +276,10 @@ namespace
   {
     AttributeEmitter (Context& c, T& scope)
       : EmitterBase (c),
+        scope_ (scope),
         write_type_name_emitter_ (c.os ()),
         read_type_name_emitter_ (c.os ()),
-        return_emitter_ (c.os ()),
-        scope_ (scope)
+        return_emitter_ (c.os ())
     {
       write_belongs_.node_traverser (write_type_name_emitter_);
       read_belongs_.node_traverser (read_type_name_emitter_);
@@ -336,9 +336,9 @@ namespace
   {
     ReadOnlyAttributeEmitter (Context& c, T& scope)
       : EmitterBase (c),
+        scope_ (scope),
         read_type_name_emitter_ (c.os ()),
-        return_emitter_ (c.os ()),
-        scope_ (scope)
+        return_emitter_ (c.os ())
     {
       read_belongs_.node_traverser (read_type_name_emitter_);
       return_belongs_.node_traverser (return_emitter_);
@@ -731,7 +731,7 @@ namespace
 
       os << "void" << endl
          << t.name () << "_exec_i::ciao_preactivate (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -741,7 +741,7 @@ namespace
 
       os << "void" << endl
          << t.name () << "_exec_i::ciao_postactivate (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -751,7 +751,7 @@ namespace
 
       os << "void" << endl
          << t.name () << "_exec_i::ccm_activate (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -761,7 +761,7 @@ namespace
 
       os << "void" << endl
          << t.name () << "_exec_i::ccm_passivate (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -771,7 +771,7 @@ namespace
 
       os << "void" << endl
          << t.name () << "_exec_i::ccm_remove (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -781,7 +781,7 @@ namespace
     }
 
     virtual void
-    post (Type& t)
+    post (Type&)
     {
     }
   };
@@ -826,7 +826,7 @@ namespace
     }
 
     virtual void
-    returns (SemanticGraph::HomeFactory& hf)
+    returns (SemanticGraph::HomeFactory&)
     {
       os << STRS[COMP_EC] << "_ptr" << endl;
     }
@@ -920,7 +920,7 @@ namespace
     }
 
     virtual void
-    returns (SemanticGraph::HomeFinder& hf)
+    returns (SemanticGraph::HomeFinder&)
     {
       os << STRS[COMP_EC] << "_ptr" << endl;
     }
@@ -1216,7 +1216,7 @@ namespace
       os << "// Implicit operations." << endl << endl
          << STRS[COMP_EC] << "_ptr" << endl
          << t.name () << "_exec_i::create (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << STRS[ENV_SNGL_SRC] << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -1274,7 +1274,7 @@ ExecImplSourceEmitter::ExecImplSourceEmitter (std::ostream& os_,
 {}
 
 void
-ExecImplSourceEmitter::pre (TranslationUnit& u)
+ExecImplSourceEmitter::pre (TranslationUnit&)
 {
   os << COPYRIGHT;
 
@@ -1289,7 +1289,7 @@ ExecImplSourceEmitter::pre (TranslationUnit& u)
                                       "_exec.h");
 
   file_name = regex::perl_s (file_name,
-                             "/(\\.(idl|cidl))?$/"
+                             "/(\\.(idl|cidl|cdl))?$/"
                              + file_suffix
                              + "/");
 
@@ -1364,7 +1364,7 @@ ExecImplSourceEmitter::generate (TranslationUnit& u)
 }
 
 void
-ExecImplSourceEmitter::post (TranslationUnit& u)
+ExecImplSourceEmitter::post (TranslationUnit&)
 {
 }
 
diff --git a/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp b/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
index cd940a233ee..a160c24d90d 100644
--- a/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
@@ -993,19 +993,19 @@ namespace
     virtual void
     pre (InParameter&)
     {
-      os << "in ";
+      os << endl << "in ";
     }
 
     virtual void
     pre (OutParameter&)
     {
-      os << "out ";
+      os << endl << "out ";
     }
 
     virtual void
     pre (InOutParameter&)
     {
-      os << "inout ";
+      os << endl << "inout ";
     }
 
     virtual void
@@ -1640,7 +1640,8 @@ generate (CommandLine const& cl,
     string suffix (cl.get_value ("lem-file-suffix", "E.idl"));
 
     string expr (cl.get_value (
-                   "lem-file-regex", "/(\\.(idl|cidl))?$/" + suffix + "/"));
+                   "lem-file-regex",
+                   "/(\\.(idl|cidl|cdl))?$/" + suffix + "/"));
 
     string lem_file_name (regex::perl_s (file_name, expr));
 
diff --git a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
index 796f2ef848e..073aa844f77 100644
--- a/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
+++ b/TAO/CIAO/CIDLC/RepositoryIdGenerator.cpp
@@ -215,7 +215,9 @@ namespace
   };
   
   class RepoIdGenerator : public Traversal::Interface,
-                          public Traversal::EventType
+                          public Traversal::EventType,
+                          public Traversal::Home,
+                          public Traversal::Component
   {
     virtual void
     traverse (SemanticGraph::Interface& i)
@@ -228,6 +230,18 @@ namespace
     {
       compute_repo_id (e);
     }
+    
+    virtual void
+    traverse (SemanticGraph::Home& h)
+    {
+      compute_repo_id (h);
+    }
+    
+    virtual void
+    traverse (SemanticGraph::Component& c)
+    {
+      compute_repo_id (c);
+    }
   };
 }
 
diff --git a/TAO/CIAO/CIDLC/ServantGenerator.cpp b/TAO/CIAO/CIDLC/ServantGenerator.cpp
index 54622931221..832795ee5b5 100644
--- a/TAO/CIAO/CIDLC/ServantGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantGenerator.cpp
@@ -76,6 +76,12 @@ void ServantGenerator::options (CL::Description& d)
                   "Replace default servant export include file "
                   "with provided file.",
                   true));
+  d.add_option (CL::OptionDescription (
+                  "suppress-register-factory",
+                  "",
+                  "Suppress generation of code to register eventtype "
+                  "factories for event sinks.",
+                  true));
 }
 
 
@@ -143,7 +149,7 @@ ServantGenerator::compute_export_macro (const fs::path& file_path)
     // Replace the suffix.
     export_macro_ =
       regex::perl_s (export_macro_,
-                     "/(\\.(IDL|CIDL))?$/_SVNT_Export/");
+                     "/(\\.(IDL|CIDL|CDL))?$/_SVNT_Export/");
 
     // Replace any remaining '.' in the string with '_'.
     export_macro_ = regex::perl_s (export_macro_,
@@ -165,7 +171,7 @@ ServantGenerator::configure_stream (string const& suffix_option,
                                         default_suffix);
     string file_expr =
       cl_.get_value (regex_option,
-                     "/(\\.(idl|cidl))?$/" + file_suffix + "/");
+                     "/(\\.(idl|cidl|cdl))?$/" + file_suffix + "/");
 
     string file_name = regex::perl_s (file_name_, file_expr);
 
diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
index b24cccd7f10..c8fe1b94155 100644
--- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
@@ -132,7 +132,7 @@ namespace
     virtual void
     post (Type&)
     {
-      os << ";" << endl;
+      os << ";" << endl << endl;
     }
 
     virtual void
@@ -300,7 +300,7 @@ namespace
     Traversal::Belongs read_belongs_;
   };
 
-  struct InterfaceEmitter : Traversal::UnconstrainedInterface,
+  struct InterfaceEmitter : Traversal::Interface,
                             EmitterBase
   {
     InterfaceEmitter (Context& c)
@@ -308,22 +308,22 @@ namespace
     {}
 
     bool
-    add (UnconstrainedInterface& i)
+    add (Interface& i)
     {
       return interfaces_.insert (&i).second;
     }
 
     virtual void
-    traverse (UnconstrainedInterface& i)
+    traverse (Interface& i)
     {
       if (add (i))
       {
-        Traversal::UnconstrainedInterface::traverse (i);
+        Traversal::Interface::traverse (i);
       }
     }
 
   private:
-    std::set<UnconstrainedInterface*> interfaces_;
+    std::set<Interface*> interfaces_;
   };
 
   struct FacetEmitter : Traversal::UnconstrainedInterface,
@@ -736,21 +736,33 @@ namespace
       os << STRS[GLUE_NS]
          << regex::perl_s (t.scoped_name ().scope_name ().str (), "/::/_/")
          << "{";
+         
+      os << "class " << t.name () << "_Servant;" << endl;
 
       os << "class " << ctx.export_macro () << " " << t.name ()
          << "_Context" << endl
-         << ": public virtual " << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_Context,"
-         << endl
-         << "public virtual TAO_Local_RefCounted_Object"
-         << endl
+         << "  : public virtual CIAO::Context_Impl<" << endl
+         << "      " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "_Context," << endl
+         << "      " << t.name () << "_Servant," << endl
+         << "      " << t.scoped_name () << "," << endl
+         << "      " << t.scoped_name () << "_var" << endl
+         << "    >" << endl
          << "{"
          << "public:" << endl;
 
       os << "// We will allow the servant glue code we generate to "
          << "access our state." << endl
-         << "friend class " << t.name () << "_Servant;"
-         << endl;
+         << "friend class " << t.name () << "_Servant;" << endl;
+
+      os << "/// Hack for VC6." << endl
+         << "typedef CIAO::Context_Impl<" << endl
+         << "    " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "_Context," << endl
+         << "    " << t.name () << "_Servant," << endl
+         << "    " << t.scoped_name () << "," << endl
+         << "    " << t.scoped_name () << "_var" << endl
+         << "  > ctx_svnt_base;" << endl;
 
       os << t.name () << "_Context (" << endl
          << "::Components::CCMHome_ptr home," << endl
@@ -760,55 +772,6 @@ namespace
       os << "virtual ~" << t.name () << "_Context (void);"
          << endl;
 
-      os << "// Operations from ::Components::CCMContext." << endl << endl;
-
-      os << "virtual ::Components::Principal_ptr" << endl
-         << "get_caller_principal (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
-
-      os << "virtual ::Components::CCMHome_ptr" << endl
-         << "get_CCM_home (" << endl
-         << STRS[ENV_SNGL_HDR_NOTUSED] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl ;
-
-      os << "virtual CORBA::Boolean" << endl
-         << "get_rollback_only (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IS] << "));" << endl;
-
-      os << "virtual ::Components::Transaction::UserTransaction_ptr" << endl
-         << "get_user_transaction (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IS] << "));" << endl;
-
-      os << "virtual CORBA::Boolean" << endl
-         << "is_caller_in_role (" << endl
-         << "const char *role" << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
-
-      os << "virtual void" << endl
-         << "set_rollback_only (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IS] << "));" << endl;
-
-      os << "// Operations from " << STRS[COMP_SC] << " interface."
-         << endl << endl;
-
-      os << "virtual CORBA::Object_ptr" << endl
-         << "get_CCM_object (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IS] << "));" << endl;
-
       os << "// Operations for " << t.name () << " receptacles"
          << " and event sources," << endl
          << "// defined in " << t.scoped_name ().scope_name () << "::CCM_"
@@ -831,9 +794,7 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "// CIAO-specific." << endl << endl
-         << "::CIAO::Session_Container *" << endl
-         << "_ciao_the_Container (void) const;" << endl;
+      os << "// CIAO-specific." << endl << endl;
 
       os << "static " << t.name () << "_Context *" << endl
          << "_narrow (" << endl
@@ -880,13 +841,8 @@ namespace
     }
 
     virtual void
-    post (Type& t)
+    post (Type&)
     {
-      os << "::Components::CCMHome_var home_;" << endl
-         << "::CIAO::Session_Container *container_;" << endl << endl
-         << t.name () << "_Servant *servant_;" << endl
-         << t.scoped_name () << "_var component_;" << endl;
-
       // Component context class closer.
       os << "};";
 
@@ -1219,12 +1175,12 @@ namespace
       }
 
       virtual void
-      traverse (SemanticGraph::SingleUser& u)
+      traverse (SemanticGraph::SingleUser&)
       {
       }
 
       virtual void
-      traverse (SemanticGraph::MultiUser& u)
+      traverse (SemanticGraph::MultiUser&)
       {
       }
 
@@ -1238,12 +1194,12 @@ namespace
       }
 
       virtual void
-      traverse (SemanticGraph::Emitter& e)
+      traverse (SemanticGraph::Emitter&)
       {
       }
 
       virtual void
-      traverse (SemanticGraph::Publisher& p)
+      traverse (SemanticGraph::Publisher&)
       {
       }
 
@@ -1276,12 +1232,11 @@ namespace
          << "      " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_var," << endl
          << "      " << t.name () << "_Context" << endl
-         << "    >," << endl
-         << "    " << STRS[INH_RCSB] << endl
+         << "    >" << endl
          << "{"
          << "public:" << endl;
 
-      os << "/// Hack for VC6 the most sucky compiler" << endl
+      os << "/// Hack for VC6." << endl
                << "typedef CIAO::Servant_Impl<" << endl
                << "    POA_" << stripped << "," << endl
          << "    " << t.scoped_name ().scope_name () << "::CCM_"
@@ -1289,7 +1244,7 @@ namespace
          << "    " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_var," << endl
          << "    " << t.name () << "_Context" << endl
-         << "  > our_base;" << endl << endl;
+         << "  > comp_svnt_base;" << endl << endl;
 
       os << t.name () << "_Servant (" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
@@ -1409,24 +1364,6 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "// Operations for Navigation interface." << endl << endl;
-
-      os << "virtual CORBA::Object_ptr" << endl
-         << "provide_facet (" << endl
-         << "const char *name" << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "));" << endl << endl;
-
-      os << "virtual ::Components::FacetDescriptions *" << endl
-         << "get_named_facets (" << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "));" << endl << endl;
-
       os << "// Operations for Receptacles interface." << endl << endl;
 
       os << "virtual " << STRS[COMP_CK] << " *" << endl
@@ -1453,37 +1390,8 @@ namespace
          << STRS[EXCP_CR] << "," << endl
          << STRS[EXCP_NC] << "));" << endl << endl;
 
-      os << "virtual ::Components::ConnectionDescriptions *" << endl
-         << "get_connections (" << endl
-         << "const char *name" << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "));" << endl << endl;
-
-      os << "virtual ::Components::ReceptacleDescriptions *" << endl
-         << "get_all_receptacles (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl << endl;
-
-      os << "virtual ::Components::ReceptacleDescriptions *" << endl
-         << "get_named_receptacles (" << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "));" << endl << endl;
-
       os << "// Operations for Events interface." << endl << endl;
 
-      os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
-         << "get_consumer (" << endl
-         << "const char *sink_name" << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "));" << endl << endl;
-
       os << "virtual " << STRS[COMP_CK] << " *" << endl
          << "subscribe (" << endl
          << "const char *publisher_name," << endl
@@ -1516,70 +1424,6 @@ namespace
          << STRS[EXCP_AC] << "," << endl
          << STRS[EXCP_IC] << "));" << endl << endl;
 
-      os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
-         << "disconnect_consumer (" << endl
-         << "const char *source_name" << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_NC] << "));" << endl << endl;
-
-      os << "virtual ::Components::ConsumerDescriptions *" << endl
-         << "get_named_consumers (" << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "));" << endl << endl;
-
-      os << "virtual ::Components::EmitterDescriptions *" << endl
-         << "get_all_emitters (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl << endl;
-
-      os << "virtual ::Components::EmitterDescriptions *" << endl
-         << "get_named_emitters(" << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "));" << endl << endl;
-
-      os << "virtual ::Components::PublisherDescriptions *" << endl
-         << "get_all_publishers (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl << endl;
-
-      os << "virtual ::Components::PublisherDescriptions *" << endl
-         << "get_named_publishers (" << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "));" << endl << endl;
-
-      os << "// Operations for CCMObject interface." << endl << endl;
-
-      os << "virtual CORBA::IRObject_ptr" << endl
-         << "get_component_def (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl << endl;
-
-      os << "virtual void" << endl
-         << "configuration_complete (" << endl
-         << STRS[ENV_SNGL_HDR_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_ICF] << "));" << endl << endl;
-
-      os << "virtual void" << endl
-         << "remove (" << endl
-         << STRS[ENV_SNGL_HDR_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_RF] << "));" << endl << endl;
-
       os << "// CIAO specific operations on the servant " << endl
          << "CORBA::Object_ptr" << endl
          << "get_facet_executor (const char *name" << endl
@@ -1631,7 +1475,7 @@ namespace
     }
 
     virtual void
-    post (Type& t)
+    post (Type&)
     {
       // Component servant class closer.
       os << "};";
@@ -1861,15 +1705,94 @@ namespace
 
       os << "class " << ctx.export_macro () << " " << t.name ()
          << "_Servant" << endl
-         << ": public virtual POA_" << stripped << "," << endl
-         << STRS[INH_RCSB] << endl
+         << "  : public virtual CIAO::Home_Servant_Impl<" << endl
+         << "      POA_" << stripped << "," << endl
+         << "      " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "," << endl
+         << "      " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "_var," << endl
+         << "      ";
+         
+      Traversal::Home::manages (t, manages_);
+
+      os << "," << endl
+         << "      ";
+      
+      Traversal::Home::manages (t, manages_);
+
+      os << "_var," << endl
+         << "      ";
+      
+      Traversal::Home::manages (t, enclosing_manages_);
+
+      os << "::CCM_";
+      
+      Traversal::Home::manages (t, simple_manages_);
+
+      os << "," << endl
+         << "      ";
+      
+      Traversal::Home::manages (t, enclosing_manages_);
+
+      os << "::CCM_";
+      
+      Traversal::Home::manages (t, simple_manages_);
+
+      os << "_var," << endl
+         << "      ";
+      
+      Traversal::Home::manages (t, simple_manages_);
+
+      os << "_Servant" << endl
+         << "    >" << endl
          << "{"
-         << "public:" << endl;
+         << "public:" << endl
+         << "/// Hack for VC6." << endl
+         << "typedef CIAO::Home_Servant_Impl<" << endl
+         << "    POA_" << stripped << "," << endl
+         << "    " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "," << endl
+         << "    " << t.scoped_name ().scope_name () << "::CCM_"
+         << t.name () << "_var," << endl
+         << "    ";
+         
+      Traversal::Home::manages (t, manages_);
+
+      os << "," << endl
+         << "    ";
+      
+      Traversal::Home::manages (t, manages_);
+
+      os << "_var," << endl
+         << "    ";
+      
+      Traversal::Home::manages (t, enclosing_manages_);
+
+      os << "::CCM_";
+      
+      Traversal::Home::manages (t, simple_manages_);
+
+      os << "," << endl
+         << "    ";
+      
+      Traversal::Home::manages (t, enclosing_manages_);
+
+      os << "::CCM_";
+      
+      Traversal::Home::manages (t, simple_manages_);
+
+      os << "_var," << endl
+         << "    ";
+      
+      Traversal::Home::manages (t, simple_manages_);
+
+      os << "_Servant" << endl
+         << "  > home_svnt_base;" << endl << endl;
 
       os << t.name () << "_Servant (" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
          << "_ptr exe," << endl
-         << "::CIAO::Session_Container *c);" << endl;
+         << "::CIAO::Session_Container *c);" << endl << endl;
 
       os << "virtual ~" << t.name () << "_Servant (void);"
          << endl << endl;
@@ -2002,51 +1925,6 @@ namespace
         home_emitter.traverse (t);
       }
 
-      // @@@ (JP) Need primary key support.
-      os << "// Operations for keyless home interface." << endl << endl;
-
-      os << "virtual ::Components::CCMObject_ptr" << endl
-         << "create_component (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << "::Components::CreateFailure));" << endl << endl;
-
-      os << "// Operations for implicit home interface." << endl << endl;
-
-      os << "virtual ";
-
-      Traversal::Home::manages (t, manages_);
-
-      os << "_ptr" << endl
-         << "create (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << "::Components::CreateFailure));" << endl << endl;
-
-      os << "// Operations for CCMHome interface." << endl << endl;
-
-      os << "virtual ::CORBA::IRObject_ptr" << endl
-         << "get_component_def (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl << endl;
-
-      os << "virtual ::CORBA::IRObject_ptr" << endl
-         << "get_home_def (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl << endl;
-
-      os << "virtual void" << endl
-         << "remove_component (" << endl
-         << "::Components::CCMObject_ptr comp" << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_RF] << "));" << endl << endl;
-
-      os << "// Supported operations." << endl << endl;
-
       // Generate operations for all supported interfaces.
       {
         Traversal::Home home_emitter;
@@ -2109,53 +1987,6 @@ namespace
         home_emitter.traverse (t);
       }
 
-      os << "protected:" << endl
-         << "// CIAO-specific operations." << endl << endl;
-
-      Traversal::Home::manages (t, manages_);
-
-      os << "_ptr" << endl
-         << "_ciao_activate_component (" << endl;
-
-      Traversal::Home::manages (t, enclosing_manages_);
-
-      os << "::CCM_";
-
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "_ptr exe" << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl << endl;
-
-      os << "void" << endl
-         << "_ciao_passivate_component (" << endl;
-
-      Traversal::Home::manages (t, manages_);
-
-      os << "_ptr comp" << endl
-         << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl << endl;
-
-      os << "protected:" << endl;
-
-      os << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "_var" << endl
-         << "executor_;" << endl << endl;
-
-      os << "::CIAO::Session_Container *" << endl
-         << "container_;" << endl << endl;
-
-      os << "ACE_Hash_Map_Manager_Ex<" << endl
-         << "PortableServer::ObjectId," << endl;
-
-      Traversal::Home::manages (t, simple_manages_);
-
-      os << "_Servant *," << endl
-         << "TAO_ObjectId_Hash," << endl
-         << "ACE_Equal_To<PortableServer::ObjectId>," << endl
-         << "ACE_SYNCH_MUTEX>" << endl
-         << "component_map_;" << endl << endl;
-
       // Home servant class closer.
       os << "};";
 
@@ -2167,7 +1998,7 @@ namespace
          << STRS[ENV_HDR] << ");" << endl;
     }
 
-    virtual void post (Type& t)
+    virtual void post (Type&)
     {
       // Namespace closer.
       os << "}";
@@ -2217,7 +2048,7 @@ namespace
     {
       os << "#include \""
          << regex::perl_s (qi.file ().string (),
-                           "/(\\.(idl|cidl))?$/S.h/")
+                           "/(\\.(idl|cidl|cdl))?$/S.h/")
          << "\""
          << endl;
     }
@@ -2227,7 +2058,7 @@ namespace
     {
       os << "#include \""
          << regex::perl_s (bi.file ().string (),
-                           "/(\\.(idl|cidl))?$/S.h/")
+                           "/(\\.(idl|cidl|cdl))?$/S.h/")
          << "\""
          << endl;
     }
@@ -2245,7 +2076,7 @@ ServantHeaderEmitter::ServantHeaderEmitter (std::ostream& os_,
 {}
 
 void
-ServantHeaderEmitter::pre (TranslationUnit& u)
+ServantHeaderEmitter::pre (TranslationUnit&)
 {
   os << COPYRIGHT;
 
@@ -2274,7 +2105,7 @@ ServantHeaderEmitter::pre (TranslationUnit& u)
   string guard =
       "CIAO_GLUE_SESSION_"
       + regex::perl_s (uc_file_name,
-                       "/(\\.(IDL|CIDL))?$/" +  uc_file_suffix + "/");
+                       "/(\\.(IDL|CIDL|CDL))?$/" +  uc_file_suffix + "/");
 
   // Replace any remaining '.' with '_'.
   guard = regex::perl_s (guard, "/\\./_/");
@@ -2304,7 +2135,7 @@ ServantHeaderEmitter::pre (TranslationUnit& u)
   // they are in synch with the IDL compiler's options.
   os << "#include \""
      << regex::perl_s (file_name,
-                       "/(\\.(idl|cidl))?$/" + suffix + "C.h/")
+                       "/(\\.(idl|cidl|cdl))?$/" + suffix + "C.h/")
      << "\""
      << endl << endl;
 
@@ -2314,8 +2145,8 @@ ServantHeaderEmitter::pre (TranslationUnit& u)
 
   os << "#include \"ciao/Container_Base.h\"" << endl
      << "#include \"ciao/Servant_Impl_T.h\"" << endl
-     << "#include \"tao/LocalObject.h\"" << endl
-     << "#include \"tao/PortableServer/Key_Adapters.h\"" << endl
+     << "#include \"ciao/Context_Impl_T.h\"" << endl
+     << "#include \"ciao/Home_Servant_Impl_T.h\"" << endl
      << "#include \"ace/Active_Map_Manager_T.h\"" << endl << endl;
 }
 
@@ -2409,7 +2240,7 @@ ServantHeaderEmitter::generate (TranslationUnit& u)
 }
 
 void
-ServantHeaderEmitter::post (TranslationUnit& u)
+ServantHeaderEmitter::post (TranslationUnit&)
 {
   if (file_.empty ()) return;
 
@@ -2431,7 +2262,7 @@ ServantHeaderEmitter::post (TranslationUnit& u)
   string guard =
     "CIAO_GLUE_SESSION_"
     + regex::perl_s (uc_file_name,
-                     "/(\\.(IDL|CIDL))?$/" +  uc_file_suffix + "/");
+                     "/(\\.(IDL|CIDL|CDL))?$/" +  uc_file_suffix + "/");
 
   guard = regex::perl_s (guard, "/\\./_/");
 
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index fbee906ef9a..b4c9773a73f 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -22,9 +22,11 @@ namespace
   {
   public:
     Context (std::ostream& os,
-             string export_macro)
+             string export_macro,
+             CommandLine const& cl)
         : os_ (os),
-          export_macro_ (export_macro)
+          export_macro_ (export_macro),
+          cl_ (cl)
     {
     }
 
@@ -40,9 +42,16 @@ namespace
     return export_macro_;
   }
 
+  CommandLine const&
+  cl ()
+  {
+    return cl_;
+  }
+
   private:
     std::ostream& os_;
     string export_macro_;
+    CommandLine const& cl_;
   };
 
   class EmitterBase
@@ -339,7 +348,7 @@ namespace
     std::ostream& os;
   };
 
-  struct InterfaceEmitter : Traversal::UnconstrainedInterface,
+  struct InterfaceEmitter : Traversal::Interface,
                             EmitterBase
   {
     InterfaceEmitter (Context& c)
@@ -347,22 +356,22 @@ namespace
     {}
 
     bool
-    add (UnconstrainedInterface& i)
+    add (Interface& i)
     {
       return interfaces_.insert (&i).second;
     }
 
     virtual void
-    traverse (UnconstrainedInterface& i)
+    traverse (Interface& i)
     {
       if (add (i))
       {
-        Traversal::UnconstrainedInterface::traverse (i);
+        Traversal::Interface::traverse (i);
       }
     }
 
   private:
-    std::set<UnconstrainedInterface*> interfaces_;
+    std::set<Interface*> interfaces_;
   };
 
   // Generates operations associated with attributes.
@@ -373,9 +382,9 @@ namespace
   {
     AttributeEmitter (Context& c, T& scope)
       : EmitterBase (c),
+        scope_ (scope),
         write_type_name_emitter_ (c.os ()),
-        read_type_name_emitter_ (c.os ()),
-        scope_ (scope)
+        read_type_name_emitter_ (c.os ())
     {
       write_belongs_.node_traverser (write_type_name_emitter_);
       read_belongs_.node_traverser (read_type_name_emitter_);
@@ -446,8 +455,8 @@ namespace
   {
     ReadOnlyAttributeEmitter (Context& c, T& scope)
       : EmitterBase (c),
-        read_type_name_emitter_ (c.os ()),
-        scope_ (scope)
+        scope_ (scope),
+        read_type_name_emitter_ (c.os ())
     {
       read_belongs_.node_traverser (read_type_name_emitter_);
     }
@@ -781,11 +790,11 @@ namespace
            << STRS[EXCP_SNGL] << endl
            << "{"
            << u.scoped_name () << "Connections *tmp_retv;"
-           << "ACE_NEW_RETURN (" << endl
+           << "ACE_NEW_THROW_EX (" << endl
            << "tmp_retv," << endl
            << u.scoped_name () << "Connections (this->ciao_uses_"
            << u.name () << "_.current_size ())," << endl
-           << "0);" << endl << endl
+           << "CORBA::NO_MEMORY ());" << endl << endl
            << u.scoped_name () << "Connections_var retv"
            << " = tmp_retv ;" << endl
            << "retv->length (this->ciao_uses_" << u.name ()
@@ -816,10 +825,11 @@ namespace
            << STRS[ENV_ARG] << ");"
            << "ACE_CHECK_RETURN (0);" << endl;
 
-        os << "ACE_NEW_RETURN (" << endl
-           << "retv[i++].ck," << endl
+        os << "ACE_NEW_THROW_EX (" << endl
+           << "retv[i].ck," << endl
            << "CIAO::Map_Key_Cookie (entry.ext_id_)," << endl
-           << "0);" << endl
+           << "CORBA::NO_MEMORY ());" << endl
+           << "++i;" << endl
            << "}";
 
         os << "return retv._retn ();" << endl
@@ -861,10 +871,10 @@ namespace
         os << "conn._retn ();" << endl;
 
         os << "Components::Cookie_var retv;"
-           << "ACE_NEW_RETURN (" << endl
+           << "ACE_NEW_THROW_EX (" << endl
            << "retv.out ()," << endl
            << "CIAO::Map_Key_Cookie (key)," << endl
-           << "0);" << endl;
+           << "CORBA::NO_MEMORY ());" << endl;
 
         os << "return retv._retn ();" << endl
            << "}";
@@ -1166,9 +1176,8 @@ namespace
          << "::Components::CCMHome_ptr home," << endl
          << "::CIAO::Session_Container *c," << endl
          << t.name () << "_Servant *sv)" << endl
-         << ": home_ (::Components::CCMHome::_duplicate (home))," << endl
-         << "container_ (c)," << endl
-         << "servant_ (sv)" << endl
+         << "  : ACE_NESTED_CLASS (CIAO, Context_Impl_Base (home, c)), " << endl
+         << "  ctx_svnt_base (home, c, sv)" << endl
          << "{"
          << "}";
 
@@ -1177,108 +1186,6 @@ namespace
          << "{"
          << "}";
 
-      os << "// Operations from ::Components::CCMContext." << endl << endl;
-
-      os << "::Components::Principal_ptr" << endl
-         << t.name () << "_Context::"
-         << "get_caller_principal (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "ACE_THROW_RETURN (" << endl
-         << "::CORBA::NO_IMPLEMENT ()," << endl
-         << "::Components::Principal::_nil ());" << endl
-         << "}";
-
-      os << "::Components::CCMHome_ptr" << endl
-         << t.name () << "_Context::"
-         << "get_CCM_home (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "return ::Components::CCMHome::_duplicate (this->home_.in ());"
-         << endl
-         << "}";
-
-      os << "CORBA::Boolean" << endl
-         << t.name () << "_Context::"
-         << "get_rollback_only (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IS] << "))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
-      os << "::Components::Transaction::UserTransaction_ptr" << endl
-         << t.name () << "_Context::"
-         << "get_user_transaction (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IS] << "))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (" << endl
-         << "::CORBA::NO_IMPLEMENT ()," << endl
-         << "::Components::Transaction::UserTransaction::_nil ());" << endl
-         << "}";
-
-      os << "CORBA::Boolean" << endl
-         << t.name () << "_Context::"
-         << "is_caller_in_role (" << endl
-         << "const char * /* role */" << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
-      os << "void" << endl
-         << t.name () << "_Context::"
-         << "set_rollback_only (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IS] << "))" << endl
-         << "{"
-         << "ACE_THROW (CORBA::NO_IMPLEMENT ());" << endl
-         << "}";
-
-      os << "// Operations from " << STRS[COMP_SC] << "interface."
-         << endl << endl;
-
-      os << "CORBA::Object_ptr" << endl
-         << t.name () << "_Context::"
-         << "get_CCM_object (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IS] << "))" << endl
-         << "{"
-         << "if (CORBA::is_nil (this->component_.in ()))" << endl
-         << "{"
-         << "CORBA::Object_var obj =" << endl
-         << "this->container_->get_objref (" << endl
-         << "this->servant_" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_CHECK_RETURN (CORBA::Object::_nil ());" << endl
-         << "this->component_ =" << endl
-         << t.scoped_name () << "::_narrow (" << endl
-         << "obj.in ()" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_CHECK_RETURN (CORBA::Object::_nil ());" << endl
-         << "if (CORBA::is_nil (this->component_.in ()))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (" << endl
-         << "::CORBA::INTERNAL ()," << endl
-         << "::CORBA::Object::_nil ());" << endl
-         << "}"
-         << "}"
-         << "return " << t.scoped_name () << "::_duplicate (" << endl
-         << "this->component_.in ());" << endl
-         << "}";
-
       os << "// Operations for " << t.name () << " receptacles"
          << " and event sources," << endl
          << "// defined in " << t.scoped_name ().scope_name () << "::CCM_"
@@ -1302,13 +1209,7 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "// CIAO-specific." << endl << endl
-         << "::CIAO::Session_Container *" << endl
-         << t.name () << "_Context::"
-         << "_ciao_the_Container (void) const" << endl
-         << "{"
-         << "return this->container_;" << endl
-         << "}";
+      os << "// CIAO-specific." << endl << endl;
 
       os << t.name () << "_Context *" << endl
          << t.name () << "_Context::_narrow (" << endl
@@ -1321,7 +1222,7 @@ namespace
     }
 
     virtual void
-    post (Type& t)
+    post (Type&)
     {
       // Namespace closer.
       os << "}";
@@ -1381,25 +1282,6 @@ namespace
       Traversal::Belongs belongs_;
     };
 
-    struct NavigationProvidesEmitter : Traversal::ProviderData,
-                                       EmitterBase
-    {
-      NavigationProvidesEmitter (Context& c)
-        : EmitterBase (c)
-      {}
-
-      virtual void
-      traverse (Type& t)
-      {
-        os << "if (ACE_OS::strcmp (name, \""
-           << t.name () << "\") == 0)" << endl
-           << "{"
-           << "return this->provide_" << t.name ()
-           << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
-           << "}";
-      }
-    };
-
     struct NavigationGetFacetExecEmitter : Traversal::ProviderData,
                                            EmitterBase
     {
@@ -1708,25 +1590,6 @@ namespace
       SemanticGraph::Component& scope_;
     };
 
-    struct ConsumesGetEmitter : Traversal::ConsumerData,
-                                EmitterBase
-    {
-      ConsumesGetEmitter (Context& c)
-        : EmitterBase (c)
-      {}
-
-      virtual void
-      traverse (Type& c)
-      {
-        os << "if (ACE_OS::strcmp (sink_name, \""
-           << c.name () << "\") == 0)" << endl
-           << "{"
-           << "return this->get_consumer_" << c.name ()
-           << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
-           << "}";
-      }
-    };
-
     struct PublishesSubscribeEmitter : Traversal::PublisherData,
                                        EmitterBase
     {
@@ -1994,48 +1857,61 @@ namespace
            << "return ret;"
            << "}";
 
-        os << "CIAO::Port_Activator_T< " ;
+        os << "CIAO::Port_Activator_T<" << endl
+           << "    ";
+
         Traversal::ProviderData::belongs (p, servant_belongs_);
-        os << "," << endl;
+
+        os << "," << endl
+           << "    ";
+
         Traversal::ProviderData::belongs (p, enclosing_belongs_);
 
         os << "::CCM_";
 
         Traversal::ProviderData::belongs (p, simple_belongs_);
 
-        os << "," <<endl
-           << " ::Components::CCMContext," << endl
-           << scope_.name () << "_Servant"
-           << " > *tmp = 0;" << endl
-           << "typedef  CIAO::Port_Activator_T<" << endl;
+        os << "," << endl
+           << "    ::Components::CCMContext," << endl
+           << "    " << scope_.name () << "_Servant" << endl
+           << "  > *tmp = 0;" << endl
+           << "typedef CIAO::Port_Activator_T<" << endl
+           << "    ";
 
         Traversal::ProviderData::belongs (p, servant_belongs_);
-        os << "," << endl;
+
+        os << "," << endl
+           << "    ";
+
         Traversal::ProviderData::belongs (p, enclosing_belongs_);
+
         os << "::CCM_";
+
         Traversal::ProviderData::belongs (p, simple_belongs_);
-        os << "," <<endl
-           << " ::Components::CCMContext," << endl
-           << scope_.name () << "_Servant"
-           << " >" << endl
-           << " MACRO_MADNESS_TYPEDEF;"
-           << endl << endl;
+
+        os << "," << endl
+           << "    ::Components::CCMContext," << endl
+           << "    " << scope_.name () << "_Servant" << endl
+           << "  >" << endl
+           << "MACRO_MADNESS_TYPEDEF;" << endl;
 
         os << "ACE_NEW_THROW_EX ( " << endl
-           << "  tmp," << endl
-           << "  MACRO_MADNESS_TYPEDEF (" << endl
+           << "tmp," << endl
+           << "MACRO_MADNESS_TYPEDEF (" << endl
            << "\"" << unique_obj_name << "\"," << endl
            << "\"" << p.name () << "\"," << endl
            << "CIAO::Port_Activator::Facet," << endl
            << "0," << endl
            << "this->context_," << endl
            << "this)," << endl
-           << "CORBA::NO_MEMORY ());" << endl << endl;
+           << "CORBA::NO_MEMORY ());" << endl;
 
         os << "CIAO::Servant_Activator *sa = " << endl
-           << "this->container_->ports_servant_activator ();" <<endl
+           << "this->container_->ports_servant_activator ();" << endl
            << "if (!sa->register_port_activator (tmp))" << endl
-           << "return 0;" <<endl;
+           << "{"
+           << "return 0;" << endl
+           << "}";
 
         os << "::CORBA::Object_var obj =" << endl
            << "this->container_->generate_reference (" << endl
@@ -2192,7 +2068,7 @@ namespace
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << "::_downcast (ev);" << endl
-           << "if (ev_type != 0)" << endl
+           << "if (ev_type.in () != 0)" << endl
            << "{"
            << "this->push_";
 
@@ -2329,7 +2205,9 @@ namespace
         os << "CIAO::Servant_Activator *sa = " << endl
            << "this->container_->ports_servant_activator ();" <<endl
            << "if (!sa->register_port_activator (tmp))" << endl
-           << "return 0;" << endl;
+           << "{"
+           << "return 0;" << endl
+           << "}";
 
         os << "::CORBA::Object_var obj =" << endl
            << "this->container_->generate_reference (" << endl
@@ -2374,33 +2252,87 @@ namespace
       SemanticGraph::Component& scope_;
     };
 
+    struct OperationExistsEmitter;
+
     struct RegisterValueFactoryEmitter : Traversal::ConsumerData,
                                          EmitterBase
     {
       RegisterValueFactoryEmitter (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c.os ())
+          type_name_emitter_ (c.os ()),
+          gen_factory_ (true)
       {
         belongs_.node_traverser (type_name_emitter_);
       }
 
+      void factory_gen_off (void)
+      {
+        gen_factory_ = false;
+      }
+
       virtual void
       traverse (Type& c)
       {
-        os << "CIAO_REGISTER_OBV_FACTORY (" << endl;
+        {
+          Traversal::ConsumerData consumer;
 
-        Traversal::ConsumerData::belongs (c, belongs_);
+          Traversal::Belongs consumer_belongs;
+          consumer.edge_traverser (consumer_belongs);
 
-        os << "_init," << endl;
+          Traversal::EventType event_type;
+          consumer_belongs.node_traverser (event_type);
 
-        Traversal::ConsumerData::belongs (c, belongs_);
+          Traversal::Defines defines;
+          event_type.edge_traverser (defines);
+
+          OperationExistsEmitter op_emitter (this);
+          defines.node_traverser (op_emitter);
 
-        os << ");" << endl;
+          consumer.traverse (c);
+        }
+
+        if (gen_factory_)
+        {
+          os << "CIAO_REGISTER_OBV_FACTORY (" << endl;
+
+          Traversal::ConsumerData::belongs (c, belongs_);
+
+          os << "_init," << endl;
+
+          Traversal::ConsumerData::belongs (c, belongs_);
+
+          os << ");" << endl;
+        }
       }
 
     private:
       TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
+      bool gen_factory_;
+    };
+
+    struct OperationExistsEmitter : Traversal::Operation,
+                                    Traversal::EventTypeFactory
+    {
+      OperationExistsEmitter (RegisterValueFactoryEmitter* r)
+        : r_ (r)
+      {
+      }
+
+      virtual void
+      traverse (SemanticGraph::Operation&)
+      {
+        r_->factory_gen_off ();
+      }
+
+      virtual void
+      traverse (SemanticGraph::EventTypeFactory&)
+      {
+        r_->factory_gen_off ();
+      }
+
+    private:
+      RegisterValueFactoryEmitter* r_;
     };
 
     struct PortTablePopulator : Traversal::ProviderData,
@@ -2425,17 +2357,17 @@ namespace
       }
 
       virtual void
-      traverse (SemanticGraph::User& u)
+      traverse (SemanticGraph::User&)
       {
       }
 
       virtual void
-      traverse (SemanticGraph::Publisher& p)
+      traverse (SemanticGraph::Publisher&)
       {
       }
 
       virtual void
-      traverse (SemanticGraph::Emitter& p)
+      traverse (SemanticGraph::Emitter&)
       {
       }
 
@@ -2505,13 +2437,15 @@ namespace
          << "_ptr exe," << endl
          << "::Components::CCMHome_ptr h," << endl
          << "::CIAO::Session_Container *c)" << endl
-         << "  : our_base (exe, c)" << endl
+         << "  : ACE_NESTED_CLASS (CIAO, Servant_Impl_Base (c))," << endl
+         << "  comp_svnt_base (exe, c)" << endl
          << "{"
          << "this->context_ = "
          << "new " << t.name () << "_Context (h, c, this);" << endl;
 
       // Generate the macro to register a value factory for each
       // eventtype consumed.
+      if (!ctx.cl ().get_value ("suppress-register-factory", false))
       {
         Traversal::Component component_emitter;
 
@@ -2610,77 +2544,6 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "// Operations for Navigation interface." << endl << endl;
-
-      os << "CORBA::Object_ptr" << endl
-         << t.name () << "_Servant::provide_facet (" << endl
-         << "const char *name" << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "))" << endl
-         << "{"
-         << "if (name == 0)" << endl
-         << "{"
-         << "ACE_THROW_RETURN (" << endl
-         << "::CORBA::BAD_PARAM ()," << endl
-         << "::CORBA::Object::_nil ());" << endl
-         << "}";
-
-      // Generate an IF block for each facet inside provide_facet().
-      {
-        Traversal::Component component_emitter;
-
-        Traversal::Inherits inherits;
-        inherits.node_traverser (component_emitter);
-
-        Traversal::Defines defines;
-        component_emitter.edge_traverser (defines);
-        component_emitter.edge_traverser (inherits);
-
-        NavigationProvidesEmitter navigation_provides_emitter (ctx);
-        defines.node_traverser (navigation_provides_emitter);
-
-        component_emitter.traverse (t);
-      }
-
-      os << "ACE_THROW_RETURN (" << endl
-         << STRS[EXCP_IN] << " ()," << endl
-         << "::CORBA::Object::_nil ());" << endl
-         << "}";
-
-      os << "::Components::FacetDescriptions *" << endl
-         << t.name () << "_Servant::get_named_facets (" << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
-      os << "::Components::EmitterDescriptions *" << endl
-         << t.name () << "_Servant::get_all_emitters ("
-         << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
-      os << "::Components::EmitterDescriptions *" << endl
-         << t.name () << "_Servant::get_named_emitters ("
-         << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
       // Generate subscribe_* and unsubscribe_* operations.
       {
         Traversal::Component component_emitter;
@@ -2797,39 +2660,6 @@ namespace
          << "ACE_UNUSED_ARG (ck);" << endl
          << "}";
 
-      os << "::Components::ConnectionDescriptions *" << endl
-         << t.name () << "_Servant::get_connections ("
-         << endl
-         << "const char * /* name */" << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
-      os << "::Components::ReceptacleDescriptions *" << endl
-         << t.name () << "_Servant::get_all_receptacles ("
-         << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
-      os << "::Components::ReceptacleDescriptions *" << endl
-         << t.name () << "_Servant::get_named_receptacles ("
-         << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
       // Generate generic operations for receptacles.
       {
         Traversal::Component component_emitter;
@@ -2847,43 +2677,6 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[COMP_ECB] << "_ptr" << endl
-         << t.name () << "_Servant::get_consumer (" << endl
-         << "const char *sink_name" << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "))" << endl
-         << "{"
-         << "if (sink_name == 0)" << endl
-         << "{"
-         << "ACE_THROW_RETURN (" << endl
-         << STRS[EXCP_IN] << " ()," << endl
-         << STRS[COMP_ECB] << "::_nil ());" << endl
-         << "}";
-
-      // Generate an IF block in for each consumer in get_consumer().
-      {
-        Traversal::Component component_emitter;
-
-        Traversal::Inherits inherits;
-        inherits.node_traverser (component_emitter);
-
-        Traversal::Defines defines;
-        component_emitter.edge_traverser (defines);
-        component_emitter.edge_traverser (inherits);
-
-        ConsumesGetEmitter consumes_emitter (ctx);
-        defines.node_traverser (consumes_emitter);
-
-        component_emitter.traverse (t);
-      }
-
-      os << "ACE_THROW_RETURN (" << endl
-         << STRS[EXCP_IN] << " ()," << endl
-         << STRS[COMP_ECB] << "::_nil ());" << endl
-         << "}";
-
       os << "void" << endl
          << t.name () << "_Servant::connect_consumer ("
          << endl
@@ -2923,31 +2716,6 @@ namespace
          << STRS[EXCP_IN] << " ());" << endl
          << "}";
 
-      os << STRS[COMP_ECB] << "_ptr" << endl
-         << t.name () << "_Servant::disconnect_consumer ("
-         << endl
-         << "const char * /* source_name */" << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_NC] << "))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
-      os << "::Components::ConsumerDescriptions *" << endl
-         << t.name () << "_Servant::get_named_consumers ("
-         << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
       os << STRS[COMP_CK] << " *" << endl
          << t.name () << "_Servant::subscribe (" << endl
          << "const char *publisher_name," << endl
@@ -3029,30 +2797,6 @@ namespace
          << STRS[COMP_ECB] << "::_nil ());" << endl
          << "}";
 
-      // @@ (diego) These are not implemented. Whenever they are,
-      // they'll require a treatment as all the other ports above.
-
-      os << "::Components::PublisherDescriptions *" << endl
-         << t.name () << "_Servant::get_all_publishers ("
-         << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
-      os << "::Components::PublisherDescriptions *" << endl
-         << t.name () << "_Servant::get_named_publishers ("
-         << endl
-         << "const " << STRS[COMP_NAMES] << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "))" << endl
-         << "{"
-         << "ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);" << endl
-         << "}";
-
       // Generate connect() and disconnect() for each emits declaration.
       {
         Traversal::Component component_emitter;
@@ -3070,39 +2814,6 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "// Operations for CCMObject interface." << endl << endl;
-
-      os << "CORBA::IRObject_ptr" << endl
-         << t.name () << "_Servant::get_component_def (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "ACE_THROW_RETURN (" << endl
-         << "::CORBA::NO_IMPLEMENT ()," << endl
-         << "::CORBA::IRObject::_nil ());" << endl
-         << "}";
-
-      os << "void" << endl
-         << t.name ()
-         << "_Servant::configuration_complete (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_ICF] << "))" << endl
-         << "{"
-         << "// CIAO to-do" << endl
-         << "}";
-
-      os << "void" << endl
-         << t.name () << "_Servant::remove (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_RF] << "))" << endl
-         << "{"
-         << "// CIAO to-do" << endl
-         << "}";
-
       os << "CORBA::Object_ptr" << endl
          << t.name ()
          << "_Servant::get_facet_executor (const char *name" << endl
@@ -3231,6 +2942,7 @@ namespace
          << STRS[ENV_SNGL_SRC] << ")" << endl
          << STRS[EXCP_SNGL] << endl
          << "{"
+         << "ACE_ENV_ARG_NOT_USED;"
          << "::CORBA::Object_var obj_var;"
          << "::Components::EventConsumerBase_var ecb_var;" << endl;
 
@@ -3254,7 +2966,7 @@ namespace
     }
 
     virtual void
-    post (Type& t)
+    post (Type&)
     {
       // Namespace closer.
       os << "}";
@@ -3321,11 +3033,13 @@ namespace
           return_type_name_emitter_ (c.os ()),
           enclosing_type_name_emitter_ (c.os ()),
           simple_type_name_emitter_ (c.os ()),
+          type_name_emitter_ (c.os ()),
           scope_ (home)
       {
         returns_.node_traverser (return_type_name_emitter_);
         enclosing_manages_.node_traverser (enclosing_type_name_emitter_);
         simple_manages_.node_traverser (simple_type_name_emitter_);
+        manages_.node_traverser (type_name_emitter_);
       }
 
       virtual void
@@ -3408,7 +3122,7 @@ namespace
 
         os << "ACE_CHECK_RETURN (";
 
-        Traversal::HomeFactory::returns (hf, returns_);
+        Traversal::Home::manages (scope_, manages_);
 
         os << "::_nil ());" << endl;
 
@@ -3432,7 +3146,7 @@ namespace
 
         os << "ACE_CHECK_RETURN (";
 
-        Traversal::HomeFactory::returns (hf, returns_);
+        Traversal::Home::manages (scope_, manages_);
 
         os << "::_nil ());" << endl;
 
@@ -3453,9 +3167,11 @@ namespace
       ReturnTypeNameEmitter return_type_name_emitter_;
       EnclosingTypeNameEmitter enclosing_type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Returns returns_;
       Traversal::Manages enclosing_manages_;
       Traversal::Manages simple_manages_;
+      Traversal::Manages manages_;
       SemanticGraph::Home& scope_;
     };
 
@@ -3573,9 +3289,8 @@ namespace
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
          << "_ptr exe," << endl
          << "::CIAO::Session_Container *c)" << endl
-         << ": executor_ (" << t.scoped_name ().scope_name () << "::CCM_"
-         << t.name () << "::_duplicate (exe))," << endl
-         << "container_ (c)" << endl
+         << "  : ACE_NESTED_CLASS (CIAO, Home_Servant_Impl_Base (c))," << endl
+         << "  home_svnt_base (exe, c)" << endl
          << "{"
          << "}";
 
@@ -3772,380 +3487,6 @@ namespace
 
         home_emitter.traverse (t);
       }
-
-      os << "// Operations for keyless home interface." << endl << endl;
-
-      os << "::Components::CCMObject_ptr" << endl
-         << t.name () << "_Servant::create_component (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << "::Components::CreateFailure))" << endl
-         << "{"
-         << "return this->create (" << STRS[ENV_SNGL_ARG] << ");" << endl
-         << "}";
-
-      os << "// Operations for implicit home interface." << endl << endl;
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_ptr" << endl
-         << t.name () << "_Servant::create (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << "::Components::CreateFailure))" << endl
-         << "{"
-         << "if (this->executor_.in () == 0)" << endl
-         << "{"
-         << "ACE_THROW_RETURN (" << endl
-         << "::CORBA::INTERNAL ()," << endl;
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::_nil ());" << endl
-         << "}"
-         << STRS[COMP_EC] << "_var _ciao_ec =" << endl
-         << "this->executor_->create (" << STRS[ENV_SNGL_ARG] << ");"
-         << "ACE_CHECK_RETURN (";
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::_nil ());" << endl;
-
-      {
-        EnclosingTypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::CCM_";
-
-      {
-        SimpleTypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_var _ciao_comp =" << endl;
-
-      {
-        EnclosingTypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::CCM_";
-
-      {
-        SimpleTypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::_narrow (" << endl
-         << "_ciao_ec.in ()" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_CHECK_RETURN (";
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::_nil ());" << endl
-         << "return this->_ciao_activate_component (" << endl
-         << "_ciao_comp.in ()" << endl
-         << STRS[ENV_ARG] << ");" << endl
-         << "}";
-
-      os << "// Operations for CCMHome interface." << endl << endl;
-
-      os << "::CORBA::IRObject_ptr" << endl
-         << t.name () << "_Servant::get_component_def (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "ACE_THROW_RETURN (" << endl
-         << "::CORBA::NO_IMPLEMENT ()," << endl
-         << "::CORBA::IRObject::_nil ());" << endl
-         << "}";
-
-      os << "::CORBA::IRObject_ptr" << endl
-         << t.name () << "_Servant::get_home_def (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "ACE_THROW_RETURN (" << endl
-         << "::CORBA::NO_IMPLEMENT ()," << endl
-         << "::CORBA::IRObject::_nil ());" << endl
-         << "}";
-
-      os << "void" << endl
-         << t.name () << "_Servant::remove_component (" << endl
-         << "::Components::CCMObject_ptr comp" << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_RF] << "))" << endl
-         << "{";
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_var _ciao_comp =" << endl;
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::_narrow (" << endl
-         << "comp" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_CHECK;" << endl
-         << "if (CORBA::is_nil (_ciao_comp.in ()))" << endl
-         << "{"
-         << "ACE_THROW (CORBA::INTERNAL ());" << endl
-         << "}"
-         << "_ciao_comp->remove (" << STRS[ENV_SNGL_ARG] << ");"
-         << "ACE_CHECK;" << endl
-         << "this->_ciao_passivate_component (" << endl
-         << "_ciao_comp.in ()" << endl
-         << STRS[ENV_ARG] << ");" << endl
-         << "}";
-
-      os << "// CIAO-specific operations." << endl << endl;
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_ptr" << endl
-         << t.name ()
-         << "_Servant::_ciao_activate_component (" << endl;
-
-      {
-        EnclosingTypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::CCM_";
-
-      {
-        SimpleTypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_ptr exe" << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "::CORBA::Object_var hobj =" << endl
-         << "this->container_->get_objref (" << endl
-         << "this" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_CHECK_RETURN (";
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-       os << "::_nil ());"
-         << endl
-         << "::Components::CCMHome_var home =" << endl
-         << "::Components::CCMHome::_narrow (" << endl
-         << "hobj.in ()" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_CHECK_RETURN (";
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::_nil ());"
-         << endl;
-
-      {
-        SimpleTypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_Servant *svt =" << endl
-         << "new ";
-
-      {
-        SimpleTypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_Servant ("
-         << endl
-         << "exe," << endl
-         << "home.in ()," << endl
-         << "this->container_);" << endl
-         << "PortableServer::ServantBase_var safe (svt);"
-         << "PortableServer::ObjectId_var oid;" << endl
-         << "CORBA::Object_var objref =" << endl
-         << "this->container_->install_component (" << endl
-         << "svt," << endl
-         << "oid.out ()" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_CHECK_RETURN (";
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::_nil ());"
-         << endl;
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_var ho =" << endl;
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::_narrow (" << endl
-         << "objref.in ()" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_CHECK_RETURN (";
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "::_nil ());"
-         << endl
-         << "if (this->component_map_.bind (oid.in (), svt) == 0)" << endl
-         << "{"
-         << "safe._retn ();" << endl
-         << "}"
-         << "return ho._retn ();" << endl
-         << "}";
-
-      os << "void" << endl
-         << t.name ()
-         << "_Servant::_ciao_passivate_component (" << endl;
-
-      {
-        TypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_ptr comp" << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_SNGL] << endl
-         << "{"
-         << "PortableServer::ObjectId_var oid;" << endl
-         << "this->container_->uninstall_component (" << endl
-         << "comp," << endl
-         << "oid.out ()" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_CHECK;" << endl;
-
-      {
-        SimpleTypeNameEmitter name_emitter (os);
-        Traversal::Manages manages_;
-        manages_.node_traverser (name_emitter);
-
-        manages (t, manages_);
-      }
-
-      os << "_Servant *servant = 0;"
-         << endl
-         << "if (this->component_map_.unbind (oid.in (), servant) == 0)"
-         << endl
-         << "{"
-         << "PortableServer::ServantBase_var safe (servant);" << endl
-         << "servant->_ciao_passivate (" << STRS[ENV_SNGL_ARG] << ");"
-         << "ACE_CHECK;" << endl
-         << "}"
-         << "}";
     }
 
     virtual void
@@ -4204,7 +3545,7 @@ namespace
     }
 
     virtual void
-    post (Type& t)
+    post (Type&)
     {
       os << "}";
     }
@@ -4222,7 +3563,7 @@ ServantSourceEmitter::ServantSourceEmitter (std::ostream& os_,
 {}
 
 void
-ServantSourceEmitter::pre (TranslationUnit& u)
+ServantSourceEmitter::pre (TranslationUnit&)
 {
   os << COPYRIGHT;
 
@@ -4237,14 +3578,15 @@ ServantSourceEmitter::pre (TranslationUnit& u)
                                       "_svnt.h");
 
   file_name = regex::perl_s (file_name,
-                             "/(\\.(idl|cidl))?$/"
+                             "/(\\.(idl|cidl|cdl))?$/"
                              + file_suffix
                              + "/");
 
   os << "#include \"" << file_name << "\"" << endl
      << "#include \"Cookies.h\"" << endl
      << "#include \"ciao/Servant_Activator.h\"" << endl
-     << "#include \"ciao/Port_Activator_T.h\"" << endl << endl;
+     << "#include \"ciao/Port_Activator_T.h\"" << endl
+     << "#include \"ace/OS_NS_string.h\"" << endl << endl;
 }
 
 void
@@ -4252,7 +3594,7 @@ ServantSourceEmitter::generate (TranslationUnit& u)
 {
   pre (u);
 
-  Context c (os, export_macro_);
+  Context c (os, export_macro_, cl_);
 
   Traversal::TranslationUnit unit;
 
diff --git a/TAO/CIAO/CIDLC/cidlc.cpp b/TAO/CIAO/CIDLC/cidlc.cpp
index 5961e28869f..06f22e6fca6 100644
--- a/TAO/CIAO/CIDLC/cidlc.cpp
+++ b/TAO/CIAO/CIDLC/cidlc.cpp
@@ -88,7 +88,8 @@ main (int argc, char* argv[])
 
     if (cl.get_value ("version", false))
     {
-      cerr << "CIAO CIDL Compiler " << CIAO_VERSION << endl;
+      cerr << "CIAO CIDL Compiler " << CIAO_VERSION
+           << " (built on " << __DATE__ << " at " << __TIME__ << ")" << endl;
       return 0;
     }
 
diff --git a/TAO/CIAO/COPYING b/TAO/CIAO/COPYING
index 18ba46daa50..0cc3d9cca79 100644
--- a/TAO/CIAO/COPYING
+++ b/TAO/CIAO/COPYING
@@ -1,81 +1,85 @@
+
      _________________________________________________________________
    
-  Copyright and Licensing Information for ACE(TM), TAO(TM), and CIAO(TM)
+  Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and
+  CoSMIC(TM)
   
-   [1]ACE(TM), [2]TAO(TM) and [3]CIAO(TM) are copyrighted by [4]Douglas
-   C. Schmidt and his [5]research group at [6]Washington University,
-   [7]University of California, Irvine, and [8]Vanderbilt University
-   Copyright (c) 1993-2003, all rights reserved. Since ACE+TAO+CIAO are
-   open-source, free software, you are free to use, modify, copy, and
-   distribute--perpetually and irrevocably--the ACE+TAO+CIAO source code
+   [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-2005, all rights reserved. Since DOC software is
+   [10]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
-   ACE+TAO+CIAO.
+   include this copyright statement along with code built using DOC
+   software.
    
-   You can use ACE+TAO+CIAO in proprietary software and are under no
+   You can use DOC software in proprietary software and are under no
    obligation to redistribute any of your source code that is built using
-   ACE+TAO+CIAO. Note, however, that you may not do anything to the
-   ACE+TAO+CIAO code, such as copyrighting it yourself or claiming
-   authorship of the ACE+TAO+CIAO code, that will prevent ACE+TAO+CIAO
-   from being distributed freely using an open-source development model.
-   You needn't inform anyone that you're using ACE+TAO+CIAO in your
-   software, though we encourage you to let [9]us know so we can promote
-   your project in the [10]ACE+TAO+CIAO success stories..
+   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 [11]us know so we can promote your project in
+   the [12]DOC software success stories..
    
-   ACE+TAO+CIAO are provided as is with no warranties of any kind,
+   DOC software is provided as is with no warranties of any kind,
    including the warranties of design, merchantability, and fitness for a
    particular purpose, noninfringement, or arising from a course of
-   dealing, usage or trade practice. Moreover, ACE+TAO+CIAO are provided
+   dealing, usage or trade practice. Moreover, 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 [11]number of companies provide commercial support for
-   ACE and TAO, however. ACE, TAO and CIAO are Y2K-compliant, as long as
-   the underlying OS platform is Y2K-compliant.
+   enhancement. A [13]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.
    
    Washington University, UC Irvine, Vanderbilt University, their
    employees, and students shall have no liability with respect to the
-   infringement of copyrights, trade secrets or any patents by
-   ACE+TAO+CIAO or any part thereof. Moreover, in no event will
-   Washington University, UC Irvine, or Vanderbilt University, their
-   employees, or students be liable for any lost revenue or profits or
-   other special, indirect and consequential damages.
+   infringement of copyrights, trade secrets or any patents by DOC
+   software or any part thereof. Moreover, in no event will Washington
+   University, UC Irvine, or Vanderbilt University, their employees, or
+   students be liable for any lost revenue or profits or other special,
+   indirect and consequential damages.
    
-   The [12]ACE, [13]TAO and [14]CIAO web sites are maintained by the
-   [15]Center for Distributed Object Computing of Washington University
-   for the development of open-source software as part of the
-   [16]open-source software community. By submitting comments,
-   suggestions, code, code snippets, techniques (including that of
-   usage), and algorithms, submitters acknowledge that they have the
-   right to do so, that any such submissions are given freely and
-   unreservedly, and that they waive any claims to copyright or
-   ownership. In addition, submitters acknowledge that any such
-   submission might become part of the copyright maintained on the
-   overall body of code, which comprises the [17]ACE, [18]TAO and
-   [19]CIAO software. By making a submission, submitter agree to these
-   terms. Furthermore, submitters acknowledge that the incorporation or
-   modification of such submissions is entirely at the discretion of the
-   moderators of the open-source ACE+TAO+CIAO projects or their
-   designees.
+   The [14]ACE, [15]TAO, [16]CIAO, and [17]CoSMIC web sites are
+   maintained by the [18]DOC Group at the [19]Institute for Software
+   Integrated Systems (ISIS) and the [20]Center for Distributed Object
+   Computing of Washington University, St. Louis for the development of
+   open-source software as part of the [21]open-source software
+   community. By submitting comments, suggestions, code, code snippets,
+   techniques (including that of usage), and algorithms, submitters
+   acknowledge that they have the right to do so, that any such
+   submissions are given freely and unreservedly, and that they waive any
+   claims to copyright or ownership. In addition, submitters acknowledge
+   that any such submission might become part of the copyright maintained
+   on the overall body of code, which comprises the DOC software. By
+   making a submission, submitter agree to these terms. Furthermore,
+   submitters acknowledge that the incorporation or modification of such
+   submissions is entirely at the discretion of the moderators of the
+   open-source DOC software projects or their designees.
    
-   The names ACE(TM), TAO(TM), CIAO(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. Further, products or services derived from this
-   source may not be called ACE(TM), TAO(TM), or CIAO(TM) nor may the
-   name Washington University, UC Irvine, or Vanderbilt University appear
-   in their names, without express written permission from Washington
-   University, UC Irvine, and Vanderbilt University.
+   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. Further, products or services
+   derived from this source may not be called ACE(TM), TAO(TM), CIAO(TM),
+   or CoSMIC(TM) nor may the name Washington University, UC Irvine, or
+   Vanderbilt University appear in their names, without express written
+   permission from Washington University, UC Irvine, and Vanderbilt
+   University.
    
    If you have any suggestions, additions, comments, or questions, please
-   let [20]me know.
+   let [22]me know.
    
-   [21]Douglas C. Schmidt
+   [23]Douglas C. Schmidt
      _________________________________________________________________
    
-   Back to the [22]ACE home page.
+   Back to the [24]ACE home page.
    
    Last modified 21:26:22 CST 03 November 2003 
 
@@ -84,22 +88,24 @@ References
    1. http://www.cs.wustl.edu/~schmidt/ACE.html
    2. http://www.cs.wustl.edu/~schmidt/TAO.html
    3. http://www.dre.vanderbilt.edu/CIAO/
-   4. http://www.cs.wustl.edu/~schmidt/
-   5. http://www.cs.wustl.edu/~schmidt/ACE-members.html
-   6. http://www.wustl.edu/
-   7. http://www.uci.edu/
-   8. http://www.vanderbilt.edu/
-   9. mailto:doc_group@cs.wustl.edu
-  10. http://www.cs.wustl.edu/~schmidt/ACE-users.html
-  11. http://www.cs.wustl.edu/~schmidt/commercial-support.html
-  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.cs.wustl.edu/~schmidt/doc-center.html
-  16. http://www.opensource.org/
-  17. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html
-  18. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
-  19. http://www.dre.vanderbilt.edu/CIAO/
-  20. mailto:schmidt@cs.wustl.edu
-  21. http://www.cs.wustl.edu/~schmidt/
-  22. file://localhost/project/adaptive/.www-docs/ACE.html
+   4. http://www.dre.vanderbilt.edu/cosmic/
+   5. http://www.dre.vanderbilt.edu/~schmidt/
+   6. http://www.cs.wustl.edu/~schmidt/ACE-members.html
+   7. http://www.wustl.edu/
+   8. http://www.uci.edu/
+   9. http://www.vanderbilt.edu/
+  10. http://www.the-it-resource.com/Open-Source/Licenses.html
+  11. mailto:doc_group@cs.wustl.edu
+  12. http://www.cs.wustl.edu/~schmidt/ACE-users.html
+  13. http://www.cs.wustl.edu/~schmidt/commercial-support.html
+  14. http://www.cs.wustl.edu/~schmidt/ACE.html
+  15. http://www.cs.wustl.edu/~schmidt/TAO.html
+  16. http://www.dre.vanderbilt.edu/CIAO/
+  17. http://www.dre.vanderbilt.edu/cosmic/
+  18. http://www.dre.vanderbilt.edu/
+  19. http://www.isis.vanderbilt.edu/
+  20. http://www.cs.wustl.edu/~schmidt/doc-center.html
+  21. http://www.opensource.org/
+  22. mailto:d.schmidt@vanderbilt.edu
+  23. http://www.dre.vanderbilt.edu/~schmidt/
+  24. http://www.cs.wustl.edu/ACE.html
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index ad10aa47f84..72a45c85b69 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,1270 +1,314 @@
-Mon Sep 13 13:18:33 2004  Gan Deng  <gan.deng@vanderbilt.edu>
+Mon Feb 14 14:52:32 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        * RepositoryManager/Update_Plan.h
+        * DAnCE/NEWS
 
-          Fixed a waring in Windows build by changing "class" to "struct"
-          in forward declaration.
+          Updated the NEWS file by adding support for parsing
+          hierarchical assembly of component descriptors.
 
-        * examples/BasicSP/BasicSP.mpc
-        * examples/BasicSP/BMClosedED/BMClosedED.mpc
-        * examples/BasicSP/BMDevice/BMDevice.mpc
-        * examples/BasicSP/BMDisplay/BMDisplay.mpc
-        * examples/BasicSP/EC/EC.mpc
+Sun Feb 13 13:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Changed the output stub, servant, and executor library names 
-          for all the components in BasicSP example. The reason is 
-          becasue all the DnC descriptors are tightly coupled with the
-          output library names. I might come back switch this change
-          back since this will conflict with the BasicSP example in
-          CIAO_ROOT/examples.
+        * Release:
+          Removed CIAO-INSTALL from the release files. It is already
+          picked up because we include the complete CIAO directory
 
-Mon Sep 13 13:07:33 2004  Gan Deng  <gan.deng@vanderbilt.edu>
+Fri Feb 11 11:12:21 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/NEWS
 
-          Fixed a bug inside create_connections () method.
+          Updated the NEWS file by adding support for setting up
+          attribute in component configuration.
 
-Mon Sep 13 15:16:33 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Fri Feb 11 11:10:54 2005  Will Otte <wotte@dre.vanderbilt.edu>
 
-	* DAnCE/tests/NodeApplicationTest/run_test.pl:
-	* DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
-	* DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
-
-	  Fixed the paths in the scripts.
-
-Mon Sep 13 07:11:06 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Port_Activator.h:
-	* DAnCE/ciao/Servant_Activator.cpp:
-	* ciao/Port_Activator.h:
-	* ciao/Servant_Activator.cpp:
-
-	  Fixes for MSVC++ compilation errors. Inspite of being careful I
-	  introduced a couple of VC++ anathemas.
-
-Mon Sep 13 06:16:31 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Container_Base.cpp:
-	* ciao/Container_Base.cpp:
-
-	  Fixed wrong ACE_CHECK usage. This should fix compilation errors
-	  in Full_Reactors build.
-
-Mon Sep 13 04:20:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/CCM_Core.mpc:
-
-	  Removed iorinterceptor and objreftemplate from CIAO_DnC_Server
-	  project. No reason to believe that they need thes. This should
-	  hopefully remove the warnings in our daily builds.
-	
-	* examples/Hello/Sender/Sender_exec.cpp:
-
-	  Added a simple debug statement. 
-	
-	* performance-tests/Benchmark/Benchmark.mpc:
-
-	  Tried fixing the link errors on the scoreboard.
-
-Mon Sep 13 03:50:08 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/CCM_Core.mpc:
-	* DAnCE/ciao/Container_Base.cpp:
-	* DAnCE/ciao/Container_Base.h:
-	* DAnCE/ciao/Container_Base.inl:
-	* DAnCE/ciao/Port_Activator.cpp:
-	* DAnCE/ciao/Port_Activator.h:
-	* DAnCE/ciao/Port_Activator_T.cpp:
-	* DAnCE/ciao/Port_Activator_T.h:
-	* DAnCE/ciao/Servant_Activator.cpp:
-	* DAnCE/ciao/Servant_Activator.h:
-
-	  Replicated changes to DAnCE. DAnCE testing hasn't been completed
-	  yet. 
-
-Sun Sep 12 22:10:38 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* CIDLC/ServantHeaderGenerator.cpp:
-	* CIDLC/ServantSourceGenerator.cpp:
-
-	  Changes to the CIDL which uses the servant and port activators
-	  checked in now. 
-
-Mon Sep 13 03:00:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	To overcome the long standing problem in DAnCE, we are now making
-        the facet and consumer servants to be on demand activatable. This
-        would make sure that application level ports are not activated
-        until used. This should help address the problems between DAnCE
-        and existing way of doing things. These changes should be useful
-        even after old CIAO is removed since we want to give existing
-        component applications the same activation semantics with DAnCE.
-
-	This checkin addresses old CIAO. DAnCE and CIDLC changes will come
-        in soon. 
-
-	* ciao/Servant_Activator.cpp:
-	* ciao/Servant_Activator.h:
-
-	  New files for facet and consumer activations. We now have a
-	  seperate servant activator for facet and consumer ports. The
-	  servant activator acts like a factory activating the right port
-	  activators which can create the right servant for every port. 
-
-	* ciao/Port_Activator.cpp:
-	* ciao/Port_Activator.h:
-	* ciao/Port_Activator_T.cpp:
-	* ciao/Port_Activator_T.h:
-
-	  Concrete port activators for every port.
-	
-	* ciao/CCM_Core.mpc:
-
-	  Added the new files for building.
-	
-	* ciao/Container_Base.cpp:
-	* ciao/Container_Base.h:
-	* ciao/Container_Base.inl:
-
-	  Changes to the Container to use the above servant activator. The
-	  continer creates the servant activator and sets that in the POA
-	  meant for facet and consumers. 
-
-Fri Sep 10 23:08:15 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Container_Base.cpp:
-	* DAnCE/ciao/Container_Base.h:
-	* ciao/Container_Base.cpp:
-	* ciao/Container_Base.h:
-
-	  Reverted this change "Sat Sep 11 03:35:24 2004  Balachandran
-	  Natarajan  <bala@dre.vanderbilt.edu>"
-
-Fri Sep 10 22:53:58 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/CCM_Core.mpc:
-	* ciao/CCM_Core.mpc:
-
-	  Linked with TAO_Utils library
-
-Sat Sep 11 03:35:24 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Container_Base.cpp:
-	* DAnCE/ciao/Container_Base.h:
-	* ciao/Container_Base.cpp:
-	* ciao/Container_Base.h:
-
-	  Removed install_servant () since it is not used.
-
-Fri Sep 10 22:28:45 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* CIDLC/ServantSourceGenerator.cpp:
-
-	  Changes to accomodate the accessor renaming.
+	* docs/schema/Modified_Deployment.xsd:
 
-Sat Sep 11 03:22:06 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+	  Corrected a couple mistakes in the schema.
 
-	* ciao/Container_Base.cpp:
-	* ciao/Container_Base.h:
-	* ciao/Container_Base.inl:
-	* DAnCE/ciao/Container_Base.cpp:
-	* DAnCE/ciao/Container_Base.h:
-	* DAnCE/ciao/Container_Base.inl:
+Thu Feb 10 07:11:04 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	  Made a few changes. They are 
+        * CIAO version 0.4.4 released.
 
-	  . Added a second POA into the container. One of the POA's will
-	    host the component and the other POA will host the facet and
-	    consumer servants. Obviously the two POA's have different sets
-	    of policies. The new POA is primarily targeted to activate
-	    facet and consumer servants on demand. 
+Tue Feb 08 10:04:21 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	  . Renamed the accessor to the ORB and POA. Made them const
-            methods 
+        * DAnCE/NEWS
 
-	  . Improved documentation and a number of costeic changes. 
-	  
-	  
- 	* DAnCE/RepositoryManager/Repository_Manager.cpp:
-	* DAnCE/RepositoryManager/Update_Plan.cpp:
-	* DAnCE/RepositoryManager/Update_Plan.h:
+          Updated the NEWS file for the coming 0.4.4 release.
 
-	  BUnch of cosmetic changes to be conformant with ACE+TAI coding
-	  guidelines. 
-	
-	* DAnCE/ciao/Servant_Impl_Base.cpp:
-	* DAnCE/ciao/Servant_Impl_T.cpp:
-	* ciao/Servant_Impl_Base.cpp:
-	* ciao/Servant_Impl_T.cpp:
+Mon Feb  7 09:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	  Fixed simple compilation errors and warnings.
-	
-Thu Sep  9 17:07:59 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * Release:
+          Added CIAO-INSTALL to the release files
 
-        * tests/IDL3/Events/Abstract/Abstract.idl:
-        
-          Uncommented IDL testing multiple inheritance of eventtypes.
+Fri Feb  4 09:35:00 2005 Emre Turkay <turkaye@dre.vanderbilt.edu>
 
-Thu Sep  9 10:30:22 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * DAnCE/examples/Hello/descriptors/basicNodeDaemon.pl:
+          The perl script to create node daemons created.
 
-        * DAnCE/ciao/Container_Base.cpp:
-        * DAnCE/ciao/Container_Base.h:
-        * ciao/Container_Base.cpp:
-          
-          Added generate_reference() method to DAnCE version of
-          Container_Base, and fixed ACE_CHECK macro mistake in
-          both versions.
+        * DAnCE/examples/Hello/step-by-step.html:
+          Step by step tutorial for the DAnCE.
 
-Wed Sep  8 11:52:45 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+Fri Feb  4 12:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/ciao/Servant_Impl_Base.h:
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-        
-          Updated files with changes made to the corresponding files
-          in regular CIAO/ciao.
+        * tools/RTComponentServer/RTConfig_Manager.h:
+          Include SString.h instead of SStringfwd.h to fix compile errors with
+          CBuilderX
 
-Tue Sep  7 22:14:43 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Thu Feb  3 20:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* CCF/CCF/IDL2/SemanticGraph/Elements.hpp:
-	* CCF/CCF/IDL2/Traversal/Elements.hpp:
-	* CIDLC/ExecutorMappingGenerator.cpp:
+        * tools/Segment_Timer/Segment_Timer.mpc:
+          Removed TAO_ROOT again, the gnu template has been changed so that
+          when CIAO is detected, also TAO_ROOT is set
 
-	  Fixed unused argument warnings.
+Thu Feb  3 12:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Sep  7 15:48:19 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * DAnCE/ciao/NodeApplication_Impl.h:
+          Added include of ace/SString.h to fix compile errors with CBuilderX
 
-        * DAnCE/ciao/Servant_Impl_Base.cpp:
-        * ciao/Servant_Impl_Base.cpp:
+Thu Feb  3 10:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Cosmetic changes.
+        * tools/Segment_Timer/Segment_Timer.mpc:
+          Added $(TAO_ROOT) so that MPC creates a correct GNU makefile
 
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * DAnCE/ciao/Servant_Impl_T.cpp:
-        * DAnCE/ciao/Servant_Impl_T.h:
-        * ciao/Servant_Impl_T.cpp:
-        * ciao/Servant_Impl_T.h:
+Wed Feb  2 19:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Moved several methods from the generated servant class to the
-          template Servant_Impl base class.
+        * rules.ciao.GNU:
+          Fixed error in this file
 
-Tue Sep  7 10:44:10 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+Wed Feb  2 09:39:25 2005  Chad Elliott  <elliott_c@ociweb.com>
 
+        * CCF/CCF/CIDL/CIDL.mpc:
+        * CCF/CCF/CodeGenerationKit/CodeGenerationKit.mpc:
+        * CCF/CCF/CompilerElements/CompilerElements.mpc:
+        * CCF/CCF/IDL2/IDL2.mpc:
+        * CCF/CCF/IDL3/IDL3.mpc:
         * CIDLC/CIDLC.mpc:
-        * CIDLC/CIDLC.vcproj:
-        * CIDLC/RepositoryIdGenerator.cpp:
-        * CIDLC/RepositoryIdGenerator.hpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/cidlc.cpp:
-
-          - Updated the RepositoryIdGenerator and re-added the source
-            and header files to the build. This generator creates
-            repository ids for interfaces and eventtypes, and stores
-            them internally in a context variable for later access
-            in code generation. It also handles modifications to the
-            repository ids stemming from 'typeprefix' or 'typeid'
-            declarations.
-
-          - Added generation of 'provide_<facet name>_i' and
-            'get_consumer_<event consumer name>_i' methods in the servant,
-            which create dummy object references and store them in the
-            appropriate port table in the servant base class.
-
-          - Re-implemented the generated 'provide_<facet name>' and
-            'get_consumer_<event consumer name>' methods. They now
-            use the container's POA to activate the dummy objects
-            created by the corresponding _i methods described above.
-            The activation takes place upon the first outside access
-            of these objects. If an object has already been activated,
-            it will simply be found in its port table and returned.
-            Thanks to Bala for the prototype code for this feature.
-
-        * ciao/Container_Base.cpp:
-        * ciao/Container_Base.h:
-
-          Added 'generate_reference' utility method called by the
-          '_i' methods described above.
-
-        * ciao/Servant_Impl_Base.cpp:
-        * ciao/Servant_Impl_Base.h:
-
-          Added 'lookup_facet' and 'lookup_consumer' methods used in
-          generated servant code to determine if a desired object has
-          been activated already (and added to a port table) or not.
-
-Mon Aug 30 12:52:28 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* performance-tests/Benchmark/Benchmark.mpc:
-
-	  Fixes for link errors in the daily builds
-
-Sun Aug 29 19:25:21 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* tools/XML_Helpers/XMLHelpers.mpc:
-
-	  Fix for link errors in Debian_Core builds.
-
-Sun Aug 29 19:02:42 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/ciao/CCM_Core.mpc:
-
-	  Added valuetype seperately to the Deployment_svnt project.
-
-Sun Aug 29 18:10:13 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h:
-	* DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h:
-	* DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h:
-	* DAnCE/examples/BasicSP/EC/EC_svnt.h:
-
-	  These files should not be in the repository.
-
-Sat Aug 28 18:44:00 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc:
-
-	  Fixed a compile erros in the daily builds.
-
-Sat Aug 28 09:22:15 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/examples/BasicSP/BasicSP.mpc:
-	* DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc:
-	* DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc:
-	* DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc:
-	* DAnCE/examples/BasicSP/EC/EC.mpc:
 
-	  Fixed the project names and shared librray names so that they
-	  don't collide with the regual BasicSP test. Ideally there
-	  shouldn't be any duplicate code. I waill talk to Gan about
-	  this.
-
-Thu Aug 26 16:45:10 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/IDL3/Lookup/README:
-        * tests/IDL3/Lookup/lookup_test.idl:
-        * tests/IDL3/Lookup/lookup_test.mpc:
-
-          New files, a test for the IDL compiler lookup of declarations
-          in base interfaces, valuetypes, components, and homes, and
-          in supported interfaces, referenced by the local name in the
-          derived IDL type. Thanks to Boris Kolpackov
-          <boris@dre.vanderbilt.edu> for reporting the bug and for
-          providing an example IDL file that illustrates the various
-          cases.
-
-Thu Aug 26 13:24:40 2004  Gan Deng <gan.deng@vanderbilt.edu>
-
-        * DAnCE/examples/BaiscSP/*.*:
-
-          Created above directory and subdictories to add an example for
-          using DAnCE.
-
-Thu Aug 26 12:28:40 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/CIDLC.vcproj:
-
-          Added missing files to project.
-
-Thu Aug 26 11:25:39 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/CIDL/CodeGen/CodeGen.mpc:
-
-          Changed dependency from ciao_server to ciao_servant.
-
-Wed Aug 25 11:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/DnC_Dump.h:
-          Removed not needed qualifier
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-          Removed not needed ; after namespace closure
-
-Wed Aug 25 11:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/Config_Error_Handler.h:
-          Removed not needed ; after namespace closure
-
-Tue Aug 24 11:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/Config.h:
-          Removed not needed ; after namespace closure
-
-Mon Aug 23 21:47:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/Config_Handlers/XSCRT/Elements.hpp:
-	* DAnCE/Config_Handlers/XSCRT/Elements.ipp:
-	* DAnCE/Config_Handlers/XSCRT/Elements.tpp:
-	* DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp:
-	* DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp:
-	* DAnCE/Config_Handlers/XSCRT/Parser.hpp:
-	* DAnCE/Config_Handlers/XSCRT/Parser.ipp:
-	* DAnCE/Config_Handlers/XSCRT/Parser.tpp:
-	* DAnCE/Config_Handlers/XSCRT/Traversal.hpp:
-	* DAnCE/Config_Handlers/XSCRT/Traversal.ipp:
-	* DAnCE/Config_Handlers/XSCRT/Traversal.tpp:
-	* DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp:
-	* DAnCE/Config_Handlers/XSCRT/XMLSchema.ipp:
-	* DAnCE/Config_Handlers/XSCRT/XMLSchema.tpp:
-
-	  Added XSCRT 0.0.4 into the repository to compile the handlers.
-
-Mon Aug 23 21:32:50 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* CIDLC/TypeNameEmitter.cpp:
-
-	  Fixed a compiler error in the daily builds showing up from a
-	  non-const declaration of a char * for extraction into an Any.
-
-	* DAnCE/Config_Handlers/Config.h:
-
-	  Deployment.h has been renamed to Config.h
-
-	* DAnCE/Config_Handlers/Process_Element.h:
-	* DAnCE/Config_Handlers/Basic_Handler.h:
-
-	  Include Config.h
-
-	* DAnCE/Config_Handlers/Basic_Deployment_Data.cpp:
-	* DAnCE/Config_Handlers/Basic_Deployment_Data.hpp:
-	* DAnCE/Config_Handlers/Deployment.cpp:
-	* DAnCE/Config_Handlers/Deployment.hpp:
-	* DAnCE/Config_Handlers/ccd.cpp:
-	* DAnCE/Config_Handlers/ccd.hpp:
-	* DAnCE/Config_Handlers/cdd.cpp:
-	* DAnCE/Config_Handlers/cdd.hpp:
-	* DAnCE/Config_Handlers/cdp.cpp:
-	* DAnCE/Config_Handlers/cdp.hpp:
-	* DAnCE/Config_Handlers/cid.cpp:
-	* DAnCE/Config_Handlers/cid.hpp:
-	* DAnCE/Config_Handlers/cpd.cpp:
-	* DAnCE/Config_Handlers/cpd.hpp:
-	* DAnCE/Config_Handlers/iad.cpp:
-	* DAnCE/Config_Handlers/iad.hpp:
-	* DAnCE/Config_Handlers/pcd.cpp:
-	* DAnCE/Config_Handlers/pcd.hpp:
-	* DAnCE/Config_Handlers/toplevel.cpp:
-	* DAnCE/Config_Handlers/toplevel.hpp:
-	* DAnCE/Config_Handlers/Config_Handlers.mpc:
-
-	  Generated code from XSC which is going to be used for the next
-	  generation handlers. They have been added in the MPC but guarded
-	  with requires += dummy_label since they give lot of warnings.
-
-Mon Aug 23 08:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Converted includes to incorporate $(CIAO_ROOT).  This allows the
+          GNUACEProjectCreator to recognize these projects as CIAO projects.
 
+        * DAnCE/ciao/CCM_Core.mpc:
+        * ciao/CCM_Core.mpc:
         * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
-          Fixed typo in vpath
-
-Sun Aug 22 22:23:12 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/Config_Handlers/Config_Handlers.mpc:
-
-	  Fixed VC6 compilation errors.
-
-Mon Aug 23 01:07:24 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/StandardConfigurator_Impl.cpp:
-	* ciao/StandardConfigurator_Impl.cpp:
-
-	  Fixed unused variable warnings.
-
-Sun Aug 22 21:28:34 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/ciao/Servant_Impl_Base.cpp:
-	* DAnCE/ciao/Servant_Impl_Base.h:
-	* DAnCE/ciao/StandardConfigurator_Impl.cpp:
-	* DAnCE/ciao/StandardConfigurator_Impl.h:
- 	* DAnCE/ciao/CCM_Core.mpc:
-
-          Added these files to the DAnCE builds. These were from the
-	  following change
-
-	  Tue Aug 17 14:29:00 2004  Jules White <jules@dre.vanderbilt.edu>
-
-	* ciao/CCM_Core.mpc:
-	* ciao/Servant_Impl_Base.cpp:
-	* ciao/Servant_Impl_Base.h:
-	* ciao/StandardConfigurator_Impl.cpp:
-	* ciao/StandardConfigurator_Impl.h:
-
-	  Fixed compilation errors in builds where exceptions have been
-	  turned off.
-
-Sun Aug 22 22:11:49 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
-	  Fixed redeclaration error in VC6 builds.
-
-Sun Aug 22 20:08:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* CIDLC/ServantSourceGenerator.cpp:
-
-	  Fixed unused variable warnings in the generated code.
-
-Sun Aug 22 17:06:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* tools/IDL3_to_IDL2/be_global.cpp:
-	* tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
-	  Fixed unused variable warnings in our daily builds.
-
-Sun Aug 22 16:26:01 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* performance-tests/Protocols/Receiver/Receiver.mpc:
-
-	  Fixed a compile error in our daily builds.
-
-Fri Aug 20 16:01:55 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
-
-          Fixed typo in source file name.
-
-Fri Aug 20 10:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ciao/Container_Base.h:
-          Fixed compile errors
-
-Fri Aug 20 07:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Container_Base.h:
-          Fixed compile errors
+        * tools/Segment_Timer/Segment_Timer.mpc:
 
-Thu Aug 19 17:13:22 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Added a bogus include of $(CIAO_ROOT).  This allows the
+          GNUACEProjectCreator to recognize these projects as CIAO projects.
 
-        * CIDLC/Literals.cpp:
-        * CIDLC/Literals.hpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/TypeNameEmitter.cpp:
-        * CIDLC/TypeNameEmitter.hpp:
+Wed Feb  2 14:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added code generation for the set_attributes() method called
-          on the servant by the deployer.
+        * rules.ciao.GNU:
+          New rules file to set the correct SOVERSION and SONAME values
 
-Thu Aug 19 16:09:45 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Wed Feb  2 10:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
- 	* DAnCE/ciao/Container_Base.h:
-	* ciao/Container_Base.h:
+        * ciao/Port_Activator_T.cpp:
+          Added include of OS_NS_string.h to get ACE_OS::strcmp
 
-	  Fixed a compilation error reported by  Roland Schimmack <Roland
-	  dot Schimmack at gmx dot de>
+Tue Feb  1 18:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug 19 08:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ciao/CCM_Core.mpc:
+        * DAnCE/ciao/CCM_Core.mpc:
+          Removed some ciaoversion based projects I missed during my checkin
+          below
 
-        * PROBLEM-REPORT-FORM:
-          Ask for the default.features file used by MPC.
+Tue Feb  1 13:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Aug 18 14:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ciao/CCM_Core.mpc:
+        * DAnCE/ciao/CCM_Core.mpc:
+          Removed ciaoversion as base project. This will be removed because it
+          results in the fact that each generated GNU makefile will get the
+          version number generated. We want that the GNU make rules get the
+          version number from Version.h
 
-        * DAnCE/NodeManager/NodeDaemon_Impl.h:
-          Added missing pragma pop
+Mon Jan 31 21:00:12 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Tue Aug 17 14:29:00 2004  Jules White <jules@dre.vanderbilt.edu>
+        * CIDLC/ServantSourceGenerator.cpp (pre):
 
-        * CIAO/ciao/Servant_Impl_Base.h:
-        * CIAO/ciao/Servant_Impl_Base.cpp:
-          Added a method to create and return the StandardConfigurator for a component.
-          Overrided _default_POA so that it returns the POA of the servant's container.
+          Generate '#include "ace/OS_NS_string.h"' directive.  CIAO CIDL
+          servant sources call ACE_OS::strcmp(), the prototype of which is
+          found in that header.  Necessitated by inter-header dependency
+          reductions in ACE.
 
-        * CIAO/ciao/StandardConfigurator_Impl.h:
-        * CIAO/ciao/StandardConfigurator_Impl.cpp:
-          Created an implementation of the StandardConfigurator interface.
+Mon Jan 31 11:59:04 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Mon Aug 16 22:15:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * DAnCE/Config_Handlers/Any_Handler.cpp:
+        * DAnCE/Config_Handlers/CPK_Handler.cpp:
+        * DAnCE/Config_Handlers/DT_Handler.cpp:
+        * DAnCE/Config_Handlers/Property_Handler.cpp:
+        * DAnCE/Config_Handlers/RS_Handler.cpp:
+        * DAnCE/Config_Handlers/Requirement_Handler.cpp:
+        * DAnCE/Config_Handlers/SP_Handler.cpp:
+        * DAnCE/ciao/Port_Activator_T.cpp:
+        * DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp:
+        * ciao/Container_Impl.cpp:
+        * performance-tests/Protocols/Controller/Controller.cpp:
+        * tools/RTComponentServer/RTConfig_Manager.cpp:
+        * tools/RTComponentServer/RTConfig_Manager.h:
+        * tools/RTComponentServer/RTServer_Impl.cpp:
 
- 	* DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp:
-	* DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h:
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
 
-	  Fixed compilation errors in builds where exceptions have been
-	  turned off.
+Sun Jan 30 20:30:46 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Mon Aug 16 22:09:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* performance-tests/Protocols/Sender/Sender.mpc:
-
-	  Fix for link errors on the scoreboard.
-
-Mon Aug 16 21:01:49 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* performance-tests/Benchmark/Benchmark.mpc:
-
-	  Fix for link errors on the scoreboard.
-
-Mon Aug 16 16:44:13 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp:
-	* CIAO/DAnCE/NodeManager/Node_Daemon.cpp:
-	* CIAO/DAnCE/ciao/CCM_Container.idl:
-	* CIAO/ciao/CCM_Container.idl:
-	  Changed #include "orbsvcs/orbsvcs/..." to #include "orbsvcs/...".
-
-Mon Aug 16 16:36:49 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
-          Changed conversion for eventtypes to generate, instead of the
-          original eventtype, a valuetype with Components::EventBase added
-          to its inheritance list. This is completely equivalent to the
-          original eventtype and has the advantage that it eliminates the
-          need to use the -Sm option (disabling CCM equivalent IDL
-          preprocessing) when running the IDL compiler on a converted
-          file. Thanks to Bala Natarajan <bala@dre.vanderbilt.edu> for
-          the suggestion.
-
-Mon Aug 16 14:14:15 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl:
-
-	  Do not do the compile the implied data part of the IDL.
-
-Mon Aug 16 12:42:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/Config_Handlers/CAD_Handler.h:
-	* DAnCE/Config_Handlers/CEPE_Handler.h:
-	* DAnCE/Config_Handlers/CPK_Handler.h:
-	* DAnCE/Config_Handlers/CPR_Handler.h:
-	* DAnCE/Config_Handlers/Cap_Handler.h:
-	* DAnCE/Config_Handlers/CompIntrDesc_Handler.h:
-	* DAnCE/Config_Handlers/CompPkgDesc_Handler.h:
-	* DAnCE/Config_Handlers/DT_Handler.h:
-	* DAnCE/Config_Handlers/Domain_Handler.h:
-	* DAnCE/Config_Handlers/ERE_Handler.h:
-	* DAnCE/Config_Handlers/IAD_Handler.h:
-	* DAnCE/Config_Handlers/ID_Handler.h:
-	* DAnCE/Config_Handlers/IR_Handler.h:
-	* DAnCE/Config_Handlers/MID_Handler.h:
-	* DAnCE/Config_Handlers/NIA_Handler.h:
-	* DAnCE/Config_Handlers/PCI_Handler.h:
-	* DAnCE/Config_Handlers/PC_Handler.h:
-	* DAnCE/Config_Handlers/Plan_Handler.h:
-	* DAnCE/Config_Handlers/Process_Element.h:
-	* DAnCE/Config_Handlers/Property_Handler.h:
-	* DAnCE/Config_Handlers/RS_Handler.h:
-	* DAnCE/Config_Handlers/RUK_Handler.h:
-	* DAnCE/Config_Handlers/Requirement_Handler.h:
-	* DAnCE/Config_Handlers/SPK_Handler.h:
-	* DAnCE/Config_Handlers/SP_Handler.h:
-	* DAnCE/Config_Handlers/TPD_Handler.h:
-	* DAnCE/Config_Handlers/Utils.h:
-
-	  Use ciao/ to include any header files from core ciao.
-
-	* DAnCE/ciao/CCM_Core.mpc:
-	* DAnCE/tests/Config_Handlers/handler_test.mpb:
-	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
-
-	  Use the right libraries for linking. This should probably
-	  address some of the core build errors on the scoreboard.
-
-Sun Aug 15 18:32:49 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
-        * tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h:
-        * tools/IDL3_to_IDL2/be_extern.h:
-        * tools/IDL3_to_IDL2/be_global.cpp:
-        * tools/IDL3_to_IDL2/be_global.h:
-        * tools/IDL3_to_IDL2/be_helper.cpp:
-        * tools/IDL3_to_IDL2/be_helper.h:
-        * tools/IDL3_to_IDL2/be_init.cpp:
-        * tools/IDL3_to_IDL2/be_produce.cpp:
-        * tools/IDL3_to_IDL2/be_sunsoft.cpp:
-        * tools/IDL3_to_IDL2/be_sunsoft.h:
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h:
-        * tools/IDL3_to_IDL2/README:
-
-          New files implementing a tool that inputs an IDL file with IDL3
-          constructs and generates another IDL file with the IDL3
-          constructs converted to the spec-defined IDL2 equivalents. Using
-          the generated file instead of the original one in applications
-          will allow the developer to reference the IDL2 equivalent types
-          in application IDL, rather than just in C++ code as before.
-          The generated IDL file has a '_IDL2' suffix added to the
-          original file name just before the '.idl' extension.
-
-Sun Aug 15 09:17:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* performance-tests/Benchmark/Benchmark.mpc:
-
-	  Added missing libraries as reported by our daily builds.
-
-Sun Aug 15 09:12:36 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/tests/Config_Handlers/handler_test.mpb:
-
-	  Fixed the handlers to link in CIAO_DnC_Container too.
-
-Sat Aug 14 14:44:24 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/Config_Handlers/Config_Handlers.mpc:
-
-	  Do not include /usr/lib to be in libpaths. This is odd and
-	  shouldn't be there at the application level. Applications should
-	  only be bothered about using $XERCESCROOT and the like. If the
-	  application doesn't specify the compiler, linker and the loader
-	  knows where to pick things from.
-
-Sat Aug 14 14:07:53 2004  Aniruddha Gokhale  <a.gokhale@vanderbilt.edu>
-
-	* DAnCE/NodeManager/Node_Daemon.cpp:
-
-	  Included "ace/os_include/os_netdb.h since otherwise the
-	  MAXHOSTNAMELEN constant was not found.
-
-Sat Aug 14 15:36:28 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/NodeManager/NodeDaemon_Impl.cpp:
-	* DAnCE/NodeManager/NodeDaemon_Impl.h:
-	* DAnCE/NodeManager/Node_Daemon.cpp:
-
-	  Cosmetic fixes for fuzz errors and other simple fixes for the
-	  daily builds.
-
-	* DAnCE/NodeManager/README:
-
-	  Added a README file in the directory.
-
-Sat Aug 14 04:20:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ExecutionManager/ExecutionManager_Impl.h:
-	* DAnCE/ciao/ComponentsC.h:
-	* ciao/ComponentsC.h:
-
-	  Removed a trailing ; at the end of namespace closure. g++-3.4.1
-	  starts getting seizures once it locates a trailing ;.
-
-Sat Aug 14 03:29:18 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/tests/Config_Handlers/handler_test.mpb:
-	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
-	* tools/XML_Helpers/XMLHelpers.mpc:
-
-	  Tried fixing some warnings and errors in the builds. I am not
-	  able to reproduce it and so I am taking a blind shot.
-
-Thu Aug 12 14:14:00 Jules White <jules@dre.vanderbilt.edu>
-
-	* docs/schema/cdp.xsd:
-	* docs/schema/Modified_Deployment.xsd:
-
-          Changed the schema so that it was more compliant with the spec.
-
-Thu Aug 12 15:25:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/NEWS:
-	* DAnCE/ciao/Servant_Impl_T.cpp:
-	* DAnCE/ciao/Servant_Impl_T.h:
-
-	  Updates at this
-
-Thu Aug 12 11:35:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ciao/Servant_Impl_T.cpp:
-	* DAnCE/ciao/Servant_Impl_T.h:
-
-	  Propogating the changes from "Mon Aug  9 11:38:04 2004  Jeff
-	  Parsons <j.parsons@vanderbilt.edu>"  to DAnCE.
-
-	* DAnCE/tests/Config_Handlers/Handler_Test.cpp:
-	* DAnCE/tests/Config_Handlers/Handler_Test.h:
-
-	  Cleaned up things so that it is more portable.
-
-	* DAnCE/tests/Config_Handlers/handler_test.mpb:
-
-	  Put Handler_Test as a template file.
-
-Thu Aug 12 16:20:19 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* DAnCE/tests/Config_Handlers/Handler_Test.cpp:
-	* DAnCE/tests/Config_Handlers/Handler_Test.h:
-	* DAnCE/tests/Config_Handlers/Handler_Test.i:
-
-	  Fixed fuzz errors.
-
-Wed Aug 11 22:37:31 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/NodeManager/Node_Daemon.cpp:
-	* tests/RTCCM/DiffServ/Sender/Sender_exec.cpp:
-
-	  Fixed fuzz errors.
-
-Wed Aug 11 22:15:26 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
-
-	  Fixed yet another problem with MPC file. Should by now compile
-	  clean on the scoreboard. Let us see hwo it goes.
-
-Wed Aug 11 20:08:58 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* CIDLC/CIDLC.mpc:
-
-	  Fixed library paths. This seems to have been busted.
-
-Wed Aug 11 14:38:00 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/ExecutionManager/Execution_Manager.cpp:
-
-	  Made certain parts exception safe and fixed fuzz errors.
-
-	* tests/CIDL/CodeGen/CodeGen.mpc:
-
-	  The MPC file was busted which lead to errors in the daily
-	  builds.
-
-	* tests/RTCCM/DiffServ/Receiver/Receiver.mpc:
-
-	  Fixed errors in he MPC file.
-
-	* tests/RTCCM/DiffServ/Sender/Sender_exec.cpp:
-
-	  Fixed fuzz errors.
-
-Wed Aug 11 12:45:09 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* CIDLC/CIDLC.mpc:
-
-	  Added new files startting with Exec* into the CIDLC project.
-
-	* CIAOTAO.mwc:
-
-	  Added tests section to the above file.
-
-Wed Aug 11 15:08:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* tests/CIDL/CodeGen/CodeGen.mpc:
-
-	  Fix for the compilation errors in the daily builds.
-
-Mon Aug  9 11:38:04 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Servant_Impl_T.cpp:
-        * ciao/Servant_Impl_T.h:
-
-          Moved the body of the destructor and the same_component()
-          method from the generated servant class to the base class.
-
-Sat Aug  7 17:55:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc:
-
-	  Prevented compilation errors if CIDL is not built.
-
-Sat Aug  7 16:43:45 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
- 	* tests/CIDL/CodeGen/CodeGen.mpc:
-	* tests/IDL3/Homes/Basic/Basic.mpc:
-
-	  Changed the name of the stub library and project names. There
-	  was a clash in project and library names.
-
-Thu Aug  5 17:42:56 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/ExecImplGenerator.cpp:
-        * CIDLC/ExecImplGenerator.hpp:
-        * CIDLC/ExecImplHeaderGenerator.cpp:
-        * CIDLC/ExecImplHeaderGenerator.hpp:
-        * CIDLC/ExecImplSourceGenerator.cpp:
-        * CIDLC/ExecImplSourceGenerator.hpp:
-
-          New files, which generate empty executor implementation
-          classes (with spec-defined operations filled in and
-          IDL operations and attributes marked for the developer
-          to fill in). This generation is optional, triggered by
-          the CIDL compiler command line option --gen-exec-impl.
-          Two other options --exec-hdr-file-suffix and --exec-src-file-suffix,
-          can override the default generated file extensions of
-          _exec.h and _exec.cpp. Tao others, --exec-hdr-file-regex and
-          --exec-src-file-regex, allow replacement of default generated
-          filenames by pattern matching with regular expressions.
-          And finally, two more, --exec-export-include,
-          overrides the default generated export macro header file,
-          and --exec-export-macro, overrides the default generated
-          export macro for the executor implementation file.
-
-        * CIDLC/Literals.cpp:
-        * CIDLC/Literals.hpp:
-        * CIDLC/ServantGenerator.cpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantHeaderGenerator.hpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CIDLC/TypeNameEmitter.cpp:
-        * CIDLC/TypeNameEmitter.hpp:
-        * CIDLC/cidlc.cpp:
-
-          - Added generation of (unimplemented) home finder
-            operations.
-
-          - Filled gaps and organized the command line options
-            for servant filename suffixes and regular expressions
-            to replace default generated filenames.
-
-          - Added a new type name emitter that generates the
-            appropriate NULL return value for any type.
-
-        * tests/CIDL/CodeGen/Basic.idl:
-        * tests/CIDL/CodeGen/Basic_stub_export.h:
-        * tests/CIDL/CodeGen/Basic_svnt_export.h:
-        * tests/CIDL/CodeGen/CodeGen.cidl:
-        * tests/CIDL/CodeGen/CodeGen.idl:
-        * tests/CIDL/CodeGen/CodeGen.mpc:
-        * tests/CIDL/CodeGen/CodeGen_exec_export.h:
-        * tests/CIDL/CodeGen/CodeGen_stub_export.h:
-        * tests/CIDL/CodeGen/CodeGen_svnt_export.h:
-        * tests/CIDL/CodeGen/README:
-
-          New test, for servant and executor implemtation code
-          generation of the CIDL compiler. This test target
-          correct code generation for many component-specific
-          features of IDL - catching operations and attributes
-          for supported interfaces, operations and attributes
-          for parents of supported interfaces, home operations
-          from base homes, inherited home factory and finder
-          operations, etc. The object of the test is to check
-          that the generated code builds and links successfully.
-
-Thu Aug  5 15:49:10 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-	* DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h:
-
-	  Made destructors in reference count enabled classes protected to
-	  enforce proper memory management through the reference counting
-	  mechansism (i.e. prevent directly calling operator delete() on
-	  the reference counted object).
-
-	  (cube_long):
-	* DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp (cube_long):
-	* performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h
-	  (makeCall):
-	* performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
-	  (makeCall):
-
-	  Added missing emulated exception parameter.  Fixes compile-time
-	  errors in emulated exception builds.
-
-	* examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
-	  (ccm_activate):
-
-	  Corrected emulated excepton parameter.  Fixes a compile-time
-	  error in emulated exception builds.
-
-	* performance-tests/Protocols/Controller/Controller.mpc:
-	* tests/RTCCM/DiffServ/Receiver/Receiver.mpc
-	  (DiffServ_Receiver_exec):
-	* tests/RTCCM/DiffServ/Sender/Sender.mpc (DiffServ_Sender_exec):
-
-	  Added missing "requires += exceptions".  These tests will not
-	  compile in emulated exception configurations.
-
-	* performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
-	  (get_latency):
-
-	  Fixed unused parameter warning in emulated exception builds.
-
-Thu Aug  5 11:48:49 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-	* performance-tests/Protocols/Controller/Controller.mpc:
-
-	  Corrected library link order.  Addresses undefined reference
-	  link-time errors in static builds.
-
-	* tools/XML_Helpers/XMLHelpers.mpc (Helper_Test):
-
-	  Added missing TAO_IFR_Client library to "libs" variable.
-	  Addresses undefined reference link-time errors in static
-	  builds.
-
-Thu Aug  5 13:28:49 2004  Will Otte <wotte@dre.vanderbilt.edu>
-
-	* docs/schema/ciaopolicy.xsd:
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DAnCE/ExecutionManager/ExecutionManager_Impl.h:
+        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+        * DAnCE/ciao/Container_Base.cpp:
+        * DAnCE/ciao/NodeApplication_Impl.cpp:
+        * ciao/Container_Base.cpp:
+        * ciao/ServerActivator_Impl.h:
+        * docs/tutorial/Hello/hello_exec.cpp:
+        * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp:
+        * tests/RTCCM/Priority_Test/Controllers/client.cpp:
+        * tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp:
+        * tools/Assembly_Deployer/Deployment_Configuration.h:
+        * tools/RTComponentServer/RTServer_Impl.cpp:
 
-	  Schema describing ORB policy configurations.
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
 
-Thu Aug  5 11:56:03 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+Sun Jan 23 01:49:51 2005  Marek Brudka  <mbrudka@aster.pl>
 
-        * CCF/CCF/CodeGenerationKit/IndentationImplanter.hpp:
+        * examples/OEP/Display/NavDisplayGUI_exec/README (Module):
+        * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc (Module):
+        Changes related with separation of GUI reactors.
+        The additional information is avalaible in ChangeLog at REACTOR_SEPARATION branch (below).
 
-          Changed template template parameter of class Implanter from
-          "Buffer" to "BufferType" because the former was causing a
-          problem with VC 7.1 clashing with a class Buffer in another
-          file.
+        Mon Dec  6 00:39:19 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Thu Aug  5 08:48:50 2004  Krishnakumar B  <kitty@nospam.invalid.domain>
+        * examples/OEP/Display/NavDisplayGUI_exec/README (Module):
+        Remove reference to ACE_HAS_QT.
 
-        * CIAO-INSTALL.html: Updated to reflect dependency on Xerces and
-          native exceptions.
+        * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc (Module):
+        Removed deprecated qt_moc base project.
 
-Wed Aug  4 22:50:17 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+>>>>>>> 1.1095
+Fri Jan 21 17:27:12 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	* examples/Hello/Sender/Sender.mpc (Hello_Starter):
-	* performance-tests/Protocols/Controller/Controller.mpc (perf):
-	* tools/XML_Helpers/XMLHelpers.mpc (Helper_Test):
+        * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
 
-	  Fixed static build link-time errors caused by not linking the
-	  appropriate libraries.
+          Fixed dependency relationship by making
+          NodeAppTest_RoundTrip_stub depending on CIAO_DnC_Container.
 
-Wed Aug  4 22:31:24 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
 
-	* docs/tutorial/Hello/client.cpp (main):
+          Fixed warning on Debian_Full_Reactor build. The warning is
+          caused because of assigning "const char*" to a "char *" type.
 
-	  Fixed typo that caused a syntax error.
+          Thanks Johnny Willemsen <jwillemsen@remedy.nl> for pointing
+          these.
 
-Wed Aug  4 17:24:18 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Thu Jan 20 18:29:47 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* examples/OEP/Display/RateGen/RateGen_exec.cpp (create):
-	* performance-tests/Benchmark/LatencyTest.cpp (makeCall):
-	* performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
-	  (makeCall):
-	* tests/RTCCM/Priority_Test/Controllers/Rate_Controller.cpp
-	  (create):
-	* tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp:
-	* tests/RTCCM/Priority_Test/Workers/IOB_Worker_exec.cpp:
+        * DAnCE/Config_Handlers/Any_Handler.cpp:
+        * DAnCE/Config_Handlers/Utils.cpp:
+        * performance-tests/Protocols/Sender/Sender_exec.cpp:
+        * tools/Daemon/Daemon_Impl.cpp:
 
-	  Fixued unused parameter warnings.
+          Converted all ACE_{static,dynamic,reinterpret,const}_cast macros
+          calls to their standard C++ counterparts using new
+          bin/ACE-casts-convert script.  The ACE cast macros were
+          deprecated back in ACE 5.4.2.
 
-	* docs/tutorial/Hello/hello_exec.cpp:
-	* performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp:
+Thu Jan 20 09:54:04 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	  Fixed emulated exception usage.
+        * examples/OEP/Display/descriptors/NOTE.txt:
+        * examples/OEP/Display/descriptors/NOTE-win.txt:
 
-	  Fixed unused argument warnings.
+          Fixed the discrepancy on using Assembly_Deployer. Thanks to
+          Martina Yen <martina_h_yen@raytheon.com> for reporting this.
 
-	* docs/tutorial/Hello/client.cpp (main):
-	* docs/tutorial/Hello/simple_client.cpp (main):
-	* performance-tests/Benchmark/Multi_Threaded/client.cpp (main):
-	* performance-tests/Benchmark/RoundTrip/client.cpp (main):
-	* performance-tests/Benchmark/RoundTripClient/client.cpp (main):
+Wed Jan 19 09:39:14 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	  Fixed CORBA::ORB_init() arguments in emulated exception case.
+        * DAnCE/examples/BasicSP/BasicSP.mpc
+        * DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc
+        * DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc
+        * DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc
+        * DAnCE/examples/BasicSP/EC/EC.mpc
 
-	  Added missing ACE_TRY_CHECK after CORBA::ORB_init() call.
+          Changed the shared component library name from
+          <what_ever_component>_DnC_<stub> to <What_ever_component>_<stub>,
+          since it doesn't make sense to let the modelers to put _DnC
+          trailing a component name.
 
-	* performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
-	  (start):
+          The same change applied to _svnt and _exec libraries.
 
-	  Fixed emulated exception usage.
+        * DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl
 
-	  Added missing emulated exception parameter.  Fixes a
-	  compile-time error.
+          Fixed this script since Some earlier cosmetic change make
+          this perl script broken.
 
-	  Fixed unused parameter warnings.
+          Thanks Steven Baker <Steven_D_Baker@raytheon.com> and
+          Sam Abbe <sam_abbe@raytheon.com> to pointing errors to
+          run this example.
 
-	* tests/RTCCM/DiffServ/Sender/Sender_exec.cpp:
+Sat Jan 15 15:16:14 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 
-	  Include "ace/OS_NS_unistd.h" to pull in ACE_OS::sleep()
-	  declaration.
+        * DAnCE/examples/BasicSP/README.html
 
-	* tests/RTCCM/Priority_Test/Controllers/Controller_exec.cpp:
+          Updated this README file for instructions on running the BasicSP
+          example by using DAnCE. Thanks Sam Abbe <sam_abbe@raytheon.com>
+          for pointing errors on this document page.  This fixes bugid
+          2031.
 
-	  Include "ace/OS_NS_stdio.h" to pull in ACE_OS::snprintf()
-	  declaration.
+Mon Jan 10 09:45:14 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	  Fixed unused parameter warnings.
+        * DAnCE/RTNodeApplication/RTServer_Impl.h:
+        * DAnCE/RTNodeApplication/RTServer_Impl.cpp: Removed init method
+          altogether.  VC6 can't handle the syntax and we'll deal with
+          later.
 
-Wed Aug  4 16:43:43 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Fri Jan  7 10:02:02 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp:
-	* examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
-	  (push_Refresh):
+        * DAnCE/RTNodeApplication/RTServer_Impl.cpp (init): Changed to
+          call the virtual function defined by the parent explicitly with
+          this pointer to work around a VC6 bug.
 
-	  Fixed emulated exception usage.
+Wed Jan  5 15:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	  Fixed unused parameter warnings.
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.inl:
+        * DAnCE/tests/Config_Handlers/Handler_Test.i:
+          Removed inl/i file, updated h,cpp
 
-	* examples/OEP/BasicSP/EC/EC_exec.cpp (pulse):
+Wed Jan  5 14:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	  Added missing ACE_TRY_CHECK emulated exception macro.  Fixes
-	  warning about unused "ACE_TRY_LABEL" label.
+        * tools/Assembly_Deployer/Deployment_Configuration.{h,cpp,inl}:
+        * tools/XML_Helpers/XML_Utils.{h,cpp,inl}:
+          Removed inl file, updated h,cpp
 
-	* examples/OEP/Display/RateGen/client.cpp:
+Wed Jan  5 10:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	  Include "ace/OS_NS_unistd.h" to pull in ACE_OS::sleep()
-	  declaration.
-
-	* examples/Hello/Receiver/Receiver_exec.cpp (ccm_activate):
-	* examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
-	  (ccm_activate):
-	* examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp (ccm_activate):
-	* examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp
-	  (ccm_activate):
-	* examples/OEP/Display/GPS/GPS_exec.cpp (get_MyLocation, posx):
-	  (posy, create):
-	* examples/OEP/Display/GPS/GPS_tracing_exec.cpp (get_MyLocation):
-	  (posx, posy, create):
-	* examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp
-	  (ccm_activate):
-	* examples/OEP/Display/NavDisplayGUI_exec/AddNavUnitCmd.cpp
-	  (execute):
-	* examples/OEP/Display/NavDisplayGUI_exec/NodeItem.cpp (moveBy):
-	* examples/OEP/Display/NavDisplayGUI_exec/QuitCmd.cpp (execute):
-
-	  Fixed unused parameter warnings.
-
-Wed Aug  4 11:16:47 2004  Will Otte <wotte@dre.vanderbilt.edu>
-
-	* Components/ComplexComponent/Attributes/Attributes.idl:
-	* Homes/Attributes/HomeAttributes.idl:
-	* ImpliedIDL/Components/Basic/ICBasic.idl:
-	* Homes/Finder/Finder.idl:
-	* ImpliedIDL/Components/EventSink/ICEventSink.idl:
-	* ImpliedIDL/Components/EventSource/ICEventSource.idl:
-	* ImpliedIDL/Components/Receptacles/ICReceptacles.idl:
-
-	  Addressed some build errors on the Fuzz build.
-
-	* Components/ComplexComponent/Attributes/AttributesS.cpp:
-	* Components/ComplexComponent/EventSink/EventSinkS.cpp:
-	* Components/ComplexComponent/EventSource/EventSourceS.cpp:
-	* Components/ComplexComponent/Facets/FacetsS.cpp:
-	* Components/ComplexComponent/Receptacles/ReceptaclesS.cpp:
-	* Components/SimpleComponent/SimpleComponentS.cpp:
-	* Events/Abstract/AbstractS.cpp:
-	* Events/Regular/RegularS.cpp:
-	* Homes/Attributes/HomeAttributesS.cpp:
-	* Homes/Basic/BasicS.cpp:
-	* Homes/Factory/FactoryS.cpp:
-	* Homes/Finder/FinderS.cpp:
-	* Homes/Inheritance/InheritanceS.cpp:
-	* ImpliedIDL/Components/Basic/ICBasicS.cpp:
-	* ImpliedIDL/Components/EventSink/ICEventSinkS.cpp:
-	* ImpliedIDL/Components/EventSource/ICEventSourceS.cpp:
-	* ImpliedIDL/Components/Receptacles/ICReceptaclesS.cpp:
-	* ImpliedIDL/Events/EventsS.cpp:
-	* ImpliedIDL/Homes/HomesS.cpp:
-
-	  Removed a bunch of generated code from the repository.
-
-Tue Aug  3 20:18:48 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* docs/schema/cid.xsd:
-	* docs/schema/Deployment.xsd:
-
-	  Added some tweaks.
-
-Tue Aug  3 14:25:44 2004  Will Otte <wotte@dre.vanderbilt.edu>
-
-	* IDL3/Components/ComplexComponent/Attributes/Attributes.idl:
-	* IDL3/Components/ComplexComponent/Attributes/Attributes.mpc:
-	* IDL3/Components/ComplexComponent/Attributes/AttributesS.cpp:
-	* IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h:
-	* IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h:
-	* IDL3/Components/ComplexComponent/EventSink/EventSink.idl:
-	* IDL3/Components/ComplexComponent/EventSink/EventSink.mpc:
-	* IDL3/Components/ComplexComponent/EventSink/EventSinkS.cpp:
-	* IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h:
-	* IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h:
-	* IDL3/Components/ComplexComponent/EventSource/EventSource.idl:
-	* IDL3/Components/ComplexComponent/EventSource/EventSource.mpc:
-	* IDL3/Components/ComplexComponent/EventSource/EventSourceS.cpp:
-	* IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h:
-	* IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h:
-	* IDL3/Components/ComplexComponent/Facets/Facets.idl:
-	* IDL3/Components/ComplexComponent/Facets/Facets.mpc:
-	* IDL3/Components/ComplexComponent/Facets/FacetsS.cpp:
-	* IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h:
-	* IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h:
-	* IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl:
-	* IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc:
-	* IDL3/Components/ComplexComponent/Receptacles/ReceptaclesS.cpp:
-	* IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h:
-	* IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h:
-	* IDL3/Components/SimpleComponent/SimpleComponent.idl:
-	* IDL3/Components/SimpleComponent/SimpleComponent.mpc:
-	* IDL3/Components/SimpleComponent/SimpleComponentS.cpp:
-	* IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h:
-	* IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h:
-	* IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h:
-	* IDL3/Events/Abstract/Abstract.idl:
-	* IDL3/Events/Abstract/Abstract.mpc:
-	* IDL3/Events/Abstract/AbstractS.cpp:
-	* IDL3/Events/Abstract/Abstract_stub_export.h:
-	* IDL3/Events/Abstract/Abstract_svnt_export.h:
-	* IDL3/Events/Regular/Regular.idl:
-	* IDL3/Events/Regular/Regular.mpc:
-	* IDL3/Events/Regular/RegularS.cpp:
-	* IDL3/Events/Regular/Regular_stub_export.h:
-	* IDL3/Events/Regular/Regular_svnt_export.h:
-	* IDL3/Homes/Attributes/HomeAttributes.idl:
-	* IDL3/Homes/Attributes/HomeAttributes.mpc:
-	* IDL3/Homes/Attributes/HomeAttributesS.cpp:
-	* IDL3/Homes/Attributes/HomeAttributes_stub_export.h:
-	* IDL3/Homes/Attributes/HomeAttributes_svnt_export.h:
-	* IDL3/Homes/Basic/Basic.idl:
-	* IDL3/Homes/Basic/Basic.mpc:
-	* IDL3/Homes/Basic/BasicS.cpp:
-	* IDL3/Homes/Basic/Basic_stub_export.h:
-	* IDL3/Homes/Basic/Basic_svnt_export.h:
-	* IDL3/Homes/Factory/Factory.idl:
-	* IDL3/Homes/Factory/Factory.mpc:
-	* IDL3/Homes/Factory/FactoryS.cpp:
-	* IDL3/Homes/Factory/Factory_stub_export.h:
-	* IDL3/Homes/Factory/Factory_svnt_export.h:
-	* IDL3/Homes/Finder/Finder.idl:
-	* IDL3/Homes/Finder/Finder.mpc:
-	* IDL3/Homes/Finder/FinderS.cpp:
-	* IDL3/Homes/Finder/Finder_stub_export.h:
-	* IDL3/Homes/Finder/Finder_svnt_export.h:
-	* IDL3/Homes/Inheritance/Inheritance.idl:
-	* IDL3/Homes/Inheritance/Inheritance.mpc:
-	* IDL3/Homes/Inheritance/InheritanceS.cpp:
-	* IDL3/Homes/Inheritance/Inheritance_stub_export.h:
-	* IDL3/Homes/Inheritance/Inheritance_svnt_export.h:
-	* IDL3/ImpliedIDL/Components/Basic/ICBasic.idl:
-	* IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc:
-	* IDL3/ImpliedIDL/Components/Basic/ICBasicS.cpp:
-	* IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h:
-	* IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h:
-	* IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl:
-	* IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc:
-	* IDL3/ImpliedIDL/Components/EventSink/ICEventSinkS.cpp:
-	* IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h:
-	* IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h:
-	* IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl:
-	* IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc:
-	* IDL3/ImpliedIDL/Components/EventSource/ICEventSourceS.cpp:
-	* IDL3/ImpliedIDL/Components:
-
-	  Various tests of compilation for IDL3 constructs.
-
-Tue Aug  3 18:36:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* docs/schema/README.html:
-
-	  File explaining what these new descriptors mean.
-
- 	* docs/schema/Basic_Deployment_Data.xsd:
-	* docs/schema/Deployment.xsd:
-	* docs/schema/Modified_Deployment.xsd:
-	* docs/schema/Spec_Defined_Deployment.xsd:
-	* docs/schema/Spec_Defined_XMI.xsd:
-	* docs/schema/ccd.xsd:
-	* docs/schema/cdd.xsd:
-	* docs/schema/cdp.xsd:
-	* docs/schema/cid.xsd:
-	* docs/schema/cpd.xsd:
-	* docs/schema/iad.xsd:
-	* docs/schema/pcd.xsd:
-	* docs/schema/toplevel.xsd:
-	* docs/schema/unused_elements.xsd:
+        * DAnCE/RTNodeApplication/RTServer_Impl.h:
+          Fixed compile problem in emulated exception builds due to
+          incorrect environment macro
 
-	  Sets of schemata that will be used in DAnCE. The meaning of
-	  these different schemata have been documented in the
-	  README.html.
+Mon Jan  3 10:01:09 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-Sun Aug  1 09:30:37 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * DAnCE/RTNodeApplication/README:
+        * DAnCE/RTNodeApplication/NodeApplication_Task.cpp:
+        * DAnCE/RTNodeApplication/NodeApplication_Task.h:
+        * DAnCE/RTNodeApplication/NodeApplication_Task.inl:
+        * DAnCE/RTNodeApplication/RTNodeApplication.cpp:
+        * DAnCE/RTNodeApplication/RTNodeApplication.mpc:
+        * DAnCE/RTNodeApplication/RTServer_Impl.cpp:
+        * DAnCE/RTNodeApplication/RTServer_Impl.h:
+        * DAnCE/RTNodeApplication/RTServer_Impl.inl:
+        * DAnCE/RTNodeApplication/senv.sh: Added a minimal
+          real-time-enabled NodeApplication server.
 
-	* ChangeLogs:
+Mon Jan  3 12:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	  Created a new directory and moved a bunch of ChangeLog entries
-	  there.
+        * ciao/CCM_Core.mpc:
+        * DAnCE/ciao/CCM_Core.mpc:
+          Added ciaoversion as base project to all projects so that SOVERSION
+          is set to the correct version number in the GNU makefiles
 
-Sat Jul 31 11:15:15 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Thu Dec 30 13:24:16 2004  Chris Cleeland  <cleeland@ociweb.com>
 
-        * CIAO version 0.4.2 released.
+        * CIAO version 0.4.3 released.
 
 Local Variables:
 add-log-time-format: current-time-string
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
index 49ba1e531d1..55efb468266 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
@@ -2,9 +2,12 @@
 
 #include "Any_Handler.h"
 #include "DT_Handler.h"
-#include "tao/Exception.h"
 #include "Utils.h"
 
+#include "tao/Exception.h"
+
+#include "ace/OS_NS_string.h"
+
 void
 CIAO::Config_Handler::Any_Handler::validate_ValueNode (DOMNodeIterator * iter,
                                                        const char * name)
@@ -52,8 +55,7 @@ CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
           CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
                                                                  "short");
           // Process the short value
-          any_obj <<= ACE_static_cast(CORBA::Short,
-                                      Utils::parse_long (iter));
+          any_obj <<= static_cast<CORBA::Short> (Utils::parse_long (iter));
           break;
 
         case CORBA::tk_ushort:
@@ -65,8 +67,7 @@ CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
           CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
                                                                  "ushort");
           // Process the ushort value
-          any_obj <<= ACE_static_cast (CORBA::UShort,
-                                       Utils::parse_ulong (iter));
+          any_obj <<= static_cast<CORBA::UShort> (Utils::parse_ulong (iter));
           break;
 
         case CORBA::tk_long:
@@ -78,8 +79,7 @@ CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
           CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
                                                                  "long");
           // Process the long value
-          any_obj <<= ACE_static_cast (CORBA::Long,
-                                       Utils::parse_long (iter));
+          any_obj <<= static_cast<CORBA::Long> (Utils::parse_long (iter));
           break;
 
         case CORBA::tk_ulong:
@@ -90,8 +90,7 @@ CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
           CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
                                                                  "ulong");
           // Process the ulong value
-          any_obj <<= ACE_static_cast (CORBA::ULong,
-                                       Utils::parse_long (iter));
+          any_obj <<= static_cast<CORBA::ULong> (Utils::parse_long (iter));
           break;
 
         case CORBA::tk_float:
@@ -102,8 +101,7 @@ CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
           CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
                                                                  "float");
           // Process the float value
-          any_obj <<= ACE_static_cast (CORBA::Float,
-                                       Utils::parse_float (iter));
+          any_obj <<= static_cast<CORBA::Float> (Utils::parse_float (iter));
           break;
 
         case CORBA::tk_double:
@@ -114,8 +112,7 @@ CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
           CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
                                                                  "double");
           // Process the double value
-          any_obj <<= ACE_static_cast (CORBA::Double,
-                                       Utils::parse_double (iter));
+          any_obj <<= static_cast<CORBA::Double> (Utils::parse_double (iter));
           break;
 
         case CORBA::tk_boolean:
@@ -162,7 +159,7 @@ CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
           {
             char * temp = Utils::parse_string (iter);
             any_obj <<= temp;
-            XMLString::release (&temp); 
+            XMLString::release (&temp);
           }
           break;
 
@@ -174,8 +171,7 @@ CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
           CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
                                                                  "longlong");
           // Process the longlong value
-          any_obj <<= ACE_static_cast (CORBA::LongLong,
-                                       Utils::parse_long (iter));
+          any_obj <<= static_cast<CORBA::LongLong> (Utils::parse_long (iter));
           break;
 
         case CORBA::tk_ulonglong:
@@ -186,8 +182,7 @@ CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
           CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
                                                                  "ulonglong");
           // Process the longlong value
-          any_obj <<= ACE_static_cast (CORBA::ULongLong,
-                                       Utils::parse_ulong (iter));
+          any_obj <<= static_cast<CORBA::ULongLong> (Utils::parse_ulong (iter));
           break;
 
         case CORBA::tk_longdouble:
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
index 735ed133b4f..9113806e87e 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
@@ -44,8 +44,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 namespace CIAO
 {
@@ -159,7 +159,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // kind
-      // 
+      //
       public:
       bool kind_p () const;
       ::CIAO::Config_Handlers::TCKind const& kind () const;
@@ -187,7 +187,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // short
-      // 
+      //
       public:
       bool short_p () const;
       ::XMLSchema::short_ const& short_ () const;
@@ -198,7 +198,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::short_ > short__;
 
       // long
-      // 
+      //
       public:
       bool long_p () const;
       ::XMLSchema::int_ const& long_ () const;
@@ -209,7 +209,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::int_ > long__;
 
       // ushort
-      // 
+      //
       public:
       bool ushort_p () const;
       ::XMLSchema::unsignedShort const& ushort () const;
@@ -220,7 +220,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedShort > ushort_;
 
       // ulong
-      // 
+      //
       public:
       bool ulong_p () const;
       ::XMLSchema::unsignedInt const& ulong () const;
@@ -231,7 +231,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedInt > ulong_;
 
       // float
-      // 
+      //
       public:
       bool float_p () const;
       ::XMLSchema::float_ const& float_ () const;
@@ -242,7 +242,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::float_ > float__;
 
       // double
-      // 
+      //
       public:
       bool double_p () const;
       ::XMLSchema::double_ const& double_ () const;
@@ -253,7 +253,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::double_ > double__;
 
       // boolean
-      // 
+      //
       public:
       bool boolean_p () const;
       ::XMLSchema::boolean const& boolean () const;
@@ -264,7 +264,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::boolean > boolean_;
 
       // octet
-      // 
+      //
       public:
       bool octet_p () const;
       ::XMLSchema::unsignedByte const& octet () const;
@@ -275,7 +275,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedByte > octet_;
 
       // objref
-      // 
+      //
       public:
       bool objref_p () const;
       ::XMLSchema::string< char > const& objref () const;
@@ -286,7 +286,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > objref_;
 
       // enum
-      // 
+      //
       public:
       bool enum_p () const;
       ::XMLSchema::string< char > const& enum_ () const;
@@ -297,7 +297,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > enum__;
 
       // string
-      // 
+      //
       public:
       bool string_p () const;
       ::XMLSchema::string< char > const& string () const;
@@ -308,7 +308,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > string_;
 
       // longlong
-      // 
+      //
       public:
       bool longlong_p () const;
       ::XMLSchema::long_ const& longlong () const;
@@ -319,7 +319,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::long_ > longlong_;
 
       // ulonglong
-      // 
+      //
       public:
       bool ulonglong_p () const;
       ::XMLSchema::unsignedLong const& ulonglong () const;
@@ -330,7 +330,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::unsignedLong > ulonglong_;
 
       // longdouble
-      // 
+      //
       public:
       bool longdouble_p () const;
       ::XMLSchema::double_ const& longdouble () const;
@@ -341,7 +341,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::double_ > longdouble_;
 
       // fixed
-      // 
+      //
       public:
       bool fixed_p () const;
       ::XMLSchema::string< char > const& fixed () const;
@@ -352,7 +352,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > fixed_;
 
       // typecode
-      // 
+      //
       public:
       bool typecode_p () const;
       ::CIAO::Config_Handlers::DataType const& typecode () const;
@@ -380,7 +380,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // type
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::DataType const& type () const;
       ::CIAO::Config_Handlers::DataType& type ();
@@ -390,7 +390,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
 
       // value
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::DataValue const& value () const;
       ::CIAO::Config_Handlers::DataValue& value ();
@@ -417,7 +417,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -427,7 +427,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // value
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& value () const;
       ::CIAO::Config_Handlers::Any& value ();
@@ -454,7 +454,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -464,7 +464,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // label
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& label () const;
       ::XMLSchema::string< char >& label ();
@@ -531,7 +531,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -541,7 +541,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // kind
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
       ::CIAO::Config_Handlers::SatisfierPropertyKind& kind ();
@@ -551,7 +551,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
 
       // value
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& value () const;
       ::CIAO::Config_Handlers::Any& value ();
@@ -578,7 +578,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -588,7 +588,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -598,7 +598,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
       ::CIAO::Config_Handlers::SatisfierProperty& property ();
@@ -625,7 +625,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -635,7 +635,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -645,7 +645,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // node
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Node const& node () const;
       ::CIAO::Config_Handlers::Node& node ();
@@ -655,7 +655,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Node > node_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
       ::CIAO::Config_Handlers::SatisfierProperty& property ();
@@ -682,7 +682,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -692,7 +692,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -702,7 +702,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Property const& property () const;
       ::CIAO::Config_Handlers::Property& property ();
@@ -729,7 +729,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // requirementName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requirementName () const;
       ::XMLSchema::string< char >& requirementName ();
@@ -739,7 +739,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requirementName_;
 
       // resourceName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceName () const;
       ::XMLSchema::string< char >& resourceName ();
@@ -749,7 +749,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceName_;
 
       // resourceValue
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& resourceValue () const;
       ::CIAO::Config_Handlers::Any& resourceValue ();
@@ -776,7 +776,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -786,7 +786,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // source
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& source () const;
       ::XMLSchema::string< char >& source ();
@@ -796,7 +796,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > source_;
 
       // node
-      // 
+      //
       public:
       bool node_p () const;
       ::XMLSchema::string< char > const& node () const;
@@ -807,7 +807,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > node_;
 
       // location
-      // 
+      //
       public:
       typedef ::std::vector< ::XMLSchema::string< char > >::iterator location_iterator;
       typedef ::std::vector< ::XMLSchema::string< char > >::const_iterator location_const_iterator;
@@ -821,7 +821,7 @@ namespace CIAO
       ::std::vector< ::XMLSchema::string< char > > location_;
 
       // execParameter
-      // 
+      //
       public:
       bool execParameter_p () const;
       ::CIAO::Config_Handlers::Property const& execParameter () const;
@@ -832,7 +832,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -843,7 +843,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // deployedResource
-      // 
+      //
       public:
       bool deployedResource_p () const;
       ::CIAO::Config_Handlers::ResourceDeploymentDescription const& deployedResource () const;
@@ -854,7 +854,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< char > const& id () const;
@@ -882,7 +882,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -892,7 +892,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // source
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& source () const;
       ::XMLSchema::string< char >& source ();
@@ -902,7 +902,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > source_;
 
       // artifact
-      // 
+      //
       public:
       typedef ::std::vector< ::XMLSchema::IDREF< char > >::iterator artifact_iterator;
       typedef ::std::vector< ::XMLSchema::IDREF< char > >::const_iterator artifact_const_iterator;
@@ -916,7 +916,7 @@ namespace CIAO
       ::std::vector< ::XMLSchema::IDREF< char > > artifact_;
 
       // execParameter
-      // 
+      //
       public:
       bool execParameter_p () const;
       ::CIAO::Config_Handlers::Property const& execParameter () const;
@@ -927,7 +927,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -938,7 +938,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< char > const& id () const;
@@ -1004,7 +1004,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resourceUsage
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
       ::CIAO::Config_Handlers::ResourceUsageKind& resourceUsage ();
@@ -1014,7 +1014,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
 
       // requirementName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requirementName () const;
       ::XMLSchema::string< char >& requirementName ();
@@ -1024,7 +1024,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requirementName_;
 
       // resourceName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceName () const;
       ::XMLSchema::string< char >& resourceName ();
@@ -1034,7 +1034,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceName_;
 
       // resourceValue
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& resourceValue () const;
       ::CIAO::Config_Handlers::Any& resourceValue ();
@@ -1061,7 +1061,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1071,7 +1071,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // node
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& node () const;
       ::XMLSchema::string< char >& node ();
@@ -1081,7 +1081,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > node_;
 
       // source
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& source () const;
       ::XMLSchema::string< char >& source ();
@@ -1091,7 +1091,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > source_;
 
       // implementation
-      // 
+      //
       public:
       ::XMLSchema::IDREF< char > const& implementation () const;
       ::XMLSchema::IDREF< char >& implementation ();
@@ -1101,7 +1101,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::IDREF< char > > implementation_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -1112,7 +1112,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // deployedResource
-      // 
+      //
       public:
       bool deployedResource_p () const;
       ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedResource () const;
@@ -1123,7 +1123,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedResource_;
 
       // deployedSharedResource
-      // 
+      //
       public:
       bool deployedSharedResource_p () const;
       ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedSharedResource () const;
@@ -1134,7 +1134,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< char > const& id () const;
@@ -1202,7 +1202,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1212,7 +1212,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // specificType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& specificType () const;
       ::XMLSchema::string< char >& specificType ();
@@ -1222,7 +1222,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > specificType_;
 
       // supportedType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& supportedType () const;
       ::XMLSchema::string< char >& supportedType ();
@@ -1232,7 +1232,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > supportedType_;
 
       // provider
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& provider () const;
       ::XMLSchema::string< char >& provider ();
@@ -1242,7 +1242,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > provider_;
 
       // exclusiveProvider
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& exclusiveProvider () const;
       ::XMLSchema::string< char >& exclusiveProvider ();
@@ -1252,7 +1252,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > exclusiveProvider_;
 
       // exclusiveUser
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& exclusiveUser () const;
       ::XMLSchema::string< char >& exclusiveUser ();
@@ -1262,7 +1262,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > exclusiveUser_;
 
       // optional
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& optional () const;
       ::XMLSchema::string< char >& optional ();
@@ -1272,7 +1272,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > optional_;
 
       // kind
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
       ::CIAO::Config_Handlers::CCMComponentPortKind& kind ();
@@ -1299,7 +1299,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1309,7 +1309,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // type
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::DataType const& type () const;
       ::CIAO::Config_Handlers::DataType& type ();
@@ -1336,7 +1336,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // portName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& portName () const;
       ::XMLSchema::string< char >& portName ();
@@ -1363,7 +1363,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // portName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& portName () const;
       ::XMLSchema::string< char >& portName ();
@@ -1373,7 +1373,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > portName_;
 
       // provider
-      // 
+      //
       public:
       bool provider_p () const;
       ::XMLSchema::string< char > const& provider () const;
@@ -1384,7 +1384,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > provider_;
 
       // kind
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
       ::CIAO::Config_Handlers::CCMComponentPortKind& kind ();
@@ -1394,7 +1394,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
 
       // instance
-      // 
+      //
       public:
       ::XMLSchema::IDREF< char > const& instance () const;
       ::XMLSchema::IDREF< char >& instance ();
@@ -1421,7 +1421,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // location
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& location () const;
       ::XMLSchema::string< char >& location ();
@@ -1448,7 +1448,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // targetName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& targetName () const;
       ::XMLSchema::string< char >& targetName ();
@@ -1458,7 +1458,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > targetName_;
 
       // requirementName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requirementName () const;
       ::XMLSchema::string< char >& requirementName ();
@@ -1468,7 +1468,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requirementName_;
 
       // resourceName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceName () const;
       ::XMLSchema::string< char >& resourceName ();
@@ -1478,7 +1478,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceName_;
 
       // resourceValue
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Any const& resourceValue () const;
       ::CIAO::Config_Handlers::Any& resourceValue ();
@@ -1505,7 +1505,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1515,7 +1515,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // source
-      // 
+      //
       public:
       bool source_p () const;
       ::XMLSchema::string< char > const& source () const;
@@ -1526,7 +1526,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > source_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -1537,7 +1537,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // externalEndpoint
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
@@ -1551,7 +1551,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
 
       // internalEndpoint
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
@@ -1565,7 +1565,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint > internalEndpoint_;
 
       // externalReference
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
@@ -1579,7 +1579,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_;
 
       // deployedResource
-      // 
+      //
       public:
       bool deployedResource_p () const;
       ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& deployedResource () const;
@@ -1607,7 +1607,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // requiredType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requiredType () const;
       ::XMLSchema::string< char >& requiredType ();
@@ -1634,7 +1634,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1644,7 +1644,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -1654,7 +1654,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
       ::CIAO::Config_Handlers::SatisfierProperty& property ();
@@ -1681,7 +1681,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resourceUsage
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
       ::CIAO::Config_Handlers::ResourceUsageKind& resourceUsage ();
@@ -1691,7 +1691,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
 
       // resourcePort
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourcePort () const;
       ::XMLSchema::string< char >& resourcePort ();
@@ -1701,7 +1701,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourcePort_;
 
       // componentPort
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& componentPort () const;
       ::XMLSchema::string< char >& componentPort ();
@@ -1711,7 +1711,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > componentPort_;
 
       // resourceType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& resourceType () const;
       ::XMLSchema::string< char >& resourceType ();
@@ -1721,7 +1721,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > resourceType_;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1731,7 +1731,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // property
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::Property const& property () const;
       ::CIAO::Config_Handlers::Property& property ();
@@ -1758,7 +1758,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // requiredUUID
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requiredUUID () const;
       ::XMLSchema::string< char >& requiredUUID ();
@@ -1768,7 +1768,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requiredUUID_;
 
       // requiredName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requiredName () const;
       ::XMLSchema::string< char >& requiredName ();
@@ -1778,7 +1778,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > requiredName_;
 
       // requiredType
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& requiredType () const;
       ::XMLSchema::string< char >& requiredType ();
@@ -1805,7 +1805,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // portName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& portName () const;
       ::XMLSchema::string< char >& portName ();
@@ -1815,7 +1815,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > portName_;
 
       // instance
-      // 
+      //
       public:
       ::XMLSchema::IDREF< char > const& instance () const;
       ::XMLSchema::IDREF< char >& instance ();
@@ -1842,7 +1842,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -1852,7 +1852,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -1863,7 +1863,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // externalEndpoint
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator;
@@ -1877,7 +1877,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_;
 
       // internalEndpoint
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::iterator internalEndpoint_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator;
@@ -1891,7 +1891,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::SubcomponentPortEndpoint > internalEndpoint_;
 
       // externalReference
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.cpp
index d2fee81d7ce..0326581ff18 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.cpp
@@ -1,8 +1,9 @@
 //$Id$
 
 #include "CPK_Handler.h"
-#include "tao/Exception.h"
 #include "Utils.h"
+#include "tao/Exception.h"
+#include "ace/OS_NS_string.h"
 
 using CIAO::Config_Handler::Utils;
 
@@ -13,7 +14,7 @@ process_CCMComponentPortKind (DOMNodeIterator * iter,
 {
   char* facet = XMLString::transcode (XStr ("Facet"));
   char* simplex_receptacle = XMLString::transcode (XStr ("SimplexReceptacle"));
-  char* multiplex_receptacle = XMLString::transcode 
+  char* multiplex_receptacle = XMLString::transcode
                                  (XStr ("MultiplexReceptacle"));
   char* event_emitter = XMLString::transcode (XStr ("EventEmitter"));
   char* event_publisher = XMLString::transcode (XStr ("EventPublisher"));
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
index 12ab9879d79..99fe13a616d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
@@ -1,15 +1,12 @@
 //$Id$
 
-project (Config_Handlers) : ciao_deployment_stub {
+project (Config_Handlers) : ciao_deployment_stub, ifr_client, valuetype,xerces {
 
   after     += CIAO_DnC_Server
   sharedname = Config_Handlers
   dynamicflags   = CONFIG_HANDLER_BUILD_DLL
-  macros   += XML_USE_PTHREADS
   requires += exceptions
-  includes += $(XERCESCROOT)/include 
-  libpaths += $(XERCESCROOT)/lib
-  libs     += xerces-c CIAO_DnC_Server TAO_IFR_Client TAO_Valuetype
+  libs     += CIAO_DnC_Server 
 
   Source_Files {
     Utils.cpp
@@ -25,6 +22,7 @@ project (Config_Handlers) : ciao_deployment_stub {
     CPK_Handler.cpp
     CPR_Handler.cpp
     DnC_Dump.cpp
+    Dump_Obj.cpp
     Domain_Handler.cpp
     DT_Handler.cpp
     ERE_Handler.cpp
@@ -48,17 +46,15 @@ project (Config_Handlers) : ciao_deployment_stub {
   }
 }
 
-project (XSC_Config_Handlers) : ciao_deployment_stub {
+project (XSC_Config_Handlers) : ciao_deployment_stub, ifr_client, xerces {
 
   requires += dummy_label
 
   sharedname = XSC_Config_Handlers
   dynamicflags   = CONFIG_HANDLER_BUILD_DLL
-  macros   += XML_USE_PTHREADS
   requires += exceptions
-  includes += $(XERCESCROOT)/include  .
-  libpaths += $(XERCESCROOT)/lib
-  libs     += xerces-c CIAO_DnC_Server TAO_IFR_Client
+  includes += .
+  libs     += CIAO_DnC_Server
 
   Source_Files {
     Basic_Deployment_Data.cpp
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.cpp
index 7840e86caa2..c0fc774811c 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.cpp
@@ -1,9 +1,10 @@
 //$Id$
 
 #include "DT_Handler.h"
+#include "Utils.h"
 #include "tao/Typecode.h"
 #include "ace/Auto_Ptr.h"
-#include "Utils.h"
+#include "ace/OS_NS_string.h"
 
 void
 CIAO::Config_Handler::DT_Handler::process_basic_tc (DOMNodeIterator * iter,
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
index e4cd3aecdaf..575ea151800 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
@@ -13,8 +13,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp
index e0f0fc87c36..2763d3390b5 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp
@@ -1,123 +1,23 @@
 // $Id$
 
-#ifndef DNC_DUMP_C
-#define DNC_DUMP_C
-
 #include "ace/Log_Msg.h"
-
+#include "ciao/Deployment_DataC.h"
 #include "DnC_Dump.h"
+#include "DnC_Dump_T.h"
 #include <iostream>
-#include <string>
-#include <map>
 
+using namespace ::Deployment::DnC_Dump_T;
 namespace Deployment
 {
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-  /*
-   *  Generic dump functions
-   */
-
-  /*
-   *  class Dump_Obj handles the indentation and keeps a map of 
-      structures for reference look-up.
-   */
-  class Dump_Obj {
-  public:
-    // Exception thrown when there is a node with the same name in the map
-    class Node_Exist { };
-    // Exception thrown when there is no node with the name given in the map
-    class Node_Not_Exist { };
-
-    // Constructor prints out the caption and increases indent
-    Dump_Obj(const char* caption)
-      : desc_()
-    {
-      ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption));
-      indent_.append("  ");
-    }
-
-    // Constructor prints out the caption, increases indent and inserts 
-    // the given desc into the map
-    template <typename DESC>
-    Dump_Obj(const char* caption, DESC &desc)
-      : desc_(caption)
-    {
-      ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption));
-      indent_.append("   ");
-
-      if (desc_map_.find(std::string(caption)) != desc_map_.end())
-        {
-          ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                      The item with name %s is already in \
-                      the node map.\n", caption));
-          throw Node_Exist();
-        }
-      else
-        {
-          CORBA::Any val;
-          val <<= desc;
-          desc_map_[std::string(caption)] = val;
-        }
-    }
-
-    // Destructor
-    ~Dump_Obj()
-    {
-      indent_.erase(indent_.size() - 2, 2);
-      if (desc_.size() != 0)
-        {
-          if (desc_map_.find(desc_) != desc_map_.end())
-            {
-              desc_map_.erase(desc_map_.find(desc_));
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                          The item with name %s is not in the node map.\n",
-                          desc_.c_str()));
-              throw Node_Not_Exist();
-            }
-        }
-    }
-
-    // return the indent string
-    static const char* indent()
-    {
-      return indent_.c_str();
-    }
-
-    // reference lookup within the map
-    template <typename DESC>
-    static const DESC& desc(const char* caption)
-    {
-      static DESC* val;
-      desc_map_[caption] >>= val;
-      return *val;
-    }
-
-  private:
-    // indent string
-    static std::string indent_;
-    // map for reference lookup
-    static std::map<std::string, CORBA::Any> desc_map_;
-    // descriptor - used by destructor for deleting the 
-    // correct descriptor from the map
-    std::string desc_;
-  };
-
-  // static member initialization
-  std::string Dump_Obj::indent_ = "-";
-  std::map<std::string, CORBA::Any> Dump_Obj::desc_map_;
-
-  // Dumps a string sequence
-  void DnC_Dump::dump (const char* caption, const ::CORBA::StringSeq &str_seq)
+  void
+  DnC_Dump::dump (const char* caption, const ::CORBA::StringSeq &str_seq)
   {
     CORBA::ULong size = str_seq.length ();
 
     if (size != 0)
       {
         Dump_Obj dump_obj (caption);
-        
+
         for (CORBA::ULong i = 0; i < size; ++i)
           {
             ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n",
@@ -128,72 +28,20 @@ namespace Deployment
       }
   }
 
-  // Dumps a sequence
-  template <typename SEQUENCE>
-  void DnC_Dump::dump_sequence (const char* caption, const SEQUENCE &seq)
-  {
-    CORBA::ULong size = seq.length ();
-
-    if (size != 0)
-      {
-        Dump_Obj dump_obj(caption);
-        
-        for (CORBA::ULong i = 0; i < size; ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", Dump_Obj::indent(), 
-                        caption, i));
-            DnC_Dump::dump (seq[i]);
-          }
-      }
-  }
-
   // Dumps a string
   void DnC_Dump::dump (const char* caption, const TAO_String_Manager& str)
   {
-    ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), 
+    ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(),
                 caption, str.in()));
   }
 
   // Dumps a boolean
   void DnC_Dump::dump (const char* caption, const CORBA::Boolean& val)
   {
-    ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), 
+    ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(),
                 caption, val ? "true" : "false"));
   }
 
-  // Dumps a reference
-  template <typename ROOT, typename REFERENCE, typename DATA_TYPE, 
-            typename CLASS>
-  void DnC_Dump::dump_ref (const char* caption, REFERENCE& ref, 
-                           const char* root, DATA_TYPE CLASS::*data)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n", Dump_Obj::indent(), caption));
-    const ROOT &root_obj = Dump_Obj::desc<ROOT>(root);
-
-    int value = ref;
-    ACE_DEBUG ((LM_DEBUG, "%s%s.name: %s\n",
-                Dump_Obj::indent(), caption,
-                (root_obj.*data)[value].name.in()));
-  }
-
-  // Dumps a reference sequence
-  template <typename ROOT, typename SEQUENCE, typename DATA_TYPE, 
-            typename CLASS>
-  void DnC_Dump::dump_ref_seq (const char* caption, SEQUENCE& seq, 
-                               const char* root, DATA_TYPE CLASS::*data)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n", Dump_Obj::indent(), caption));
-    for (size_t i = 0; i < seq.length(); ++i)
-      {
-        const ROOT &root_obj = Dump_Obj::desc<ROOT>(root);
-
-        int value = seq[i];
-        ACE_DEBUG ((LM_DEBUG, "%s%s[%d].name: %s\n",
-                    Dump_Obj::indent(), caption, i,
-                    (root_obj.*data)[value].name.in()));
-      }
-  }
-
   /*
    *  Object dump methods
    */
@@ -224,9 +72,14 @@ namespace Deployment
     Dump_Obj dump_obj("SharedResource");
     dump ("name", sr.name);
     dump ("resourceType", sr.resourceType);
-    dump_ref_seq<Deployment::Domain> ("nodeRef", sr.nodeRef, 
-                                      "Domain", &Domain::node);
-    dump_sequence ("property", sr.property);
+#if 0
+    dump_ref_seq<Deployment::Domain> ("nodeRef",
+                                      sr.nodeRef,
+                                      "Domain",
+                                      &Domain::node);
+#endif /*if 0*/
+    dump_sequence ("property",
+                   sr.property);
   }
 
   // Resource
@@ -235,7 +88,8 @@ namespace Deployment
     Dump_Obj dump_obj("Resource");
     dump ("name", resource.name);
     dump ("resourceType", resource.resourceType);
-    dump_sequence ("property", resource.property);
+    dump_sequence ("property",
+                   resource.property);
   }
 
   // Node
@@ -244,12 +98,22 @@ namespace Deployment
     Dump_Obj dump_obj("Node");
     dump ("name", node.name);
     dump ("label", node.label);
-    dump_ref_seq<Deployment::Domain> ("sharedResourceRef", 
-                                      node.sharedResourceRef, "Domain", 
-                                      &Domain::sharedResource);
-    dump_ref_seq<Deployment::Domain> ("connectionRef", node.connectionRef, 
-                                      "Domain", &Domain::interconnect);
-    dump_sequence ("resource", node.resource);
+
+#if (_MSC_VER > 1200)
+    dump_ref_seq<Deployment::Domain> (
+      "sharedResourceRef",
+      node.sharedResourceRef, "Domain",
+      &Domain::sharedResource);
+
+    dump_ref_seq<Deployment::Domain> (
+      "connectionRef",
+      node.connectionRef,
+      "Domain",
+      &Domain::interconnect);
+#endif /* _MSC_VER */
+    dump_sequence ("resource",
+                   node.resource);
+
   }
 
   // Interconnect
@@ -258,40 +122,73 @@ namespace Deployment
     Dump_Obj dump_obj("Interconnect");
     dump ("name", conn.name);
     dump ("label", conn.label);
-    dump_ref_seq<Deployment::Domain> ("connectionRef", conn.connectionRef, 
-                                      "Domain", &Domain::bridge);
-    dump_ref_seq<Deployment::Domain> ("connectRef", conn.connectRef, 
-                                      "Domain", &Domain::node);
-    dump_sequence ("resource", conn.resource);
+
+#if (_MSC_VER > 1200)
+    dump_ref_seq<Deployment::Domain> (
+      "connectionRef",
+      conn.connectionRef,
+      "Domain",
+      &Domain::bridge);
+
+    dump_ref_seq<Deployment::Domain> (
+      "connectRef",
+      conn.connectRef,
+      "Domain",
+      &Domain::node);
+#endif /*_MSC_VER*/
+
+    dump_sequence ("resource",
+                   conn.resource);
   }
 
   // Bridge
-  void DnC_Dump::dump (const Deployment::Bridge& bridge)
+  void
+  DnC_Dump::dump (const Deployment::Bridge& bridge)
   {
     Dump_Obj dump_obj("Bridge");
     dump ("name", bridge.name);
     dump ("label", bridge.label);
-    dump_ref_seq<Deployment::Domain> ("connectRef", bridge.connectRef,
-                                      "Domain", &Domain::interconnect);
+#if (_MSC_VER > 1200)
+
+    dump_ref_seq<Deployment::Domain> (
+      "connectRef",
+      bridge.connectRef,
+      "Domain",
+      &Domain::interconnect);
+#endif /*_MSC_VER*/
+
     dump_sequence ("resource", bridge.resource);
   }
 
   void DnC_Dump::dump (const ::Deployment::Domain &domain)
   {
-    Dump_Obj dump_obj("Domain", domain);
-    dump ("UUID", domain.UUID);
-    dump ("label", domain.label);
-
-    dump_sequence ("sharedResource", domain.sharedResource);
-    dump_sequence ("node", domain.node);
-    dump_sequence ("interconnect", domain.interconnect);
-    dump_sequence ("bridge", domain.bridge);
-    dump_sequence ("infoProperty", domain.infoProperty);
+    CORBA::Any val;
+    val <<= domain;
+
+    Dump_Obj dump_obj ("Domain",
+                       val);
+
+    dump ("UUID",
+          domain.UUID);
+    dump ("label",
+          domain.label);
+
+    dump_sequence ("sharedResource",
+                   domain.sharedResource);
+    dump_sequence ("node",
+                   domain.node);
+    dump_sequence ("interconnect",
+                   domain.interconnect);
+    dump_sequence ("bridge",
+                   domain.bridge);
+
+    dump_sequence ("infoProperty",
+                   domain.infoProperty);
   }
 
   // ComponentPortDescription
 
-  void DnC_Dump::dump (const ::Deployment::ComponentPortDescription 
+  void DnC_Dump::dump (const ::Deployment::ComponentPortDescription
                          &compportdesc)
   {
     Dump_Obj dump_obj("ComponentPortDescription");
@@ -320,7 +217,7 @@ namespace Deployment
   void DnC_Dump::dump (const ::Deployment::ComponentPropertyDescription &comppropdesc)
   {
     Dump_Obj dump_obj("ComponentPropertyDescription");
-    
+
     dump ("name", comppropdesc.name);
 
     ACE_DEBUG ((LM_DEBUG, "%stype: ", Dump_Obj::indent()));
@@ -388,7 +285,7 @@ namespace Deployment
   void DnC_Dump::dump (const ::Deployment::Requirement &req)
   {
     Dump_Obj dump_obj("Requirement");
-    
+
     dump ("resourceType", req.resourceType);
     dump ("name", req.name);
     dump_sequence ("property", req.property);
@@ -402,9 +299,12 @@ namespace Deployment
 
     dump ("name", mdd.name);
     dump ("source", mdd.source);
+#if (_MSC_VER > 1200)
+
     dump_ref_seq<Deployment::DeploymentPlan> ("artifactRef", mdd.artifactRef,
                                               "DeploymentPlan",
                                               &DeploymentPlan::artifact);
+#endif /*_MSC_VER*/
     dump_sequence ("execParameter", mdd.execParameter);
     dump_sequence ("deployRequirement", mdd.deployRequirement);
   }
@@ -445,10 +345,13 @@ namespace Deployment
     dump ("name", idd.name);
     dump ("node", idd.node);
     dump ("source", idd.source);
+
+#if (_MSC_VER > 1200)
     dump_ref<Deployment::DeploymentPlan> ("implementationRef",
                                           idd.implementationRef,
                                           "DeploymentPlan",
                                           &DeploymentPlan::implementation);
+#endif /*_MSC_VER*/
     dump_sequence ("configProperty", idd.configProperty);
     dump_sequence ("deployedResource", idd.deployedResource);
     dump_sequence ("deployedSharedResource", idd.deployedSharedResource);
@@ -480,9 +383,11 @@ namespace Deployment
     case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
     case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
     }
+#if (_MSC_VER > 1200)
     dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspe.instanceRef,
                                           "DeploymentPlan",
                                           &DeploymentPlan::instance);
+#endif /*_MSC_VER*/
   }
 
   // ExternalReferenceEndpoint
@@ -530,9 +435,11 @@ namespace Deployment
 
     dump ("propertyName", pspr.propertyName);
 
+#if (_MSC_VER > 1200)
     dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspr.instanceRef,
                                           "DeploymentPlan",
                                           &DeploymentPlan::instance);
+#endif /*_MSC_VER*/
   }
 
   // PlanPropertyMapping
@@ -577,7 +484,7 @@ namespace Deployment
     dump ("name", add.name);
     dump ("location", add.location);
     dump ("node", add.node);
-    dump ("source", add.source); 
+    dump ("source", add.source);
     dump_sequence ("execParameter", add.execParameter);
     dump_sequence ("deployRequirement", add.deployRequirement);
     dump_sequence ("deployedResource", add.deployedResource);
@@ -585,7 +492,11 @@ namespace Deployment
 
   void DnC_Dump::dump(const Deployment::DeploymentPlan &plan)
   {
-    Dump_Obj dump_obj("DeploymentPlan", plan);
+    CORBA::Any val;
+
+    val <<= plan;
+
+    Dump_Obj dump_obj("DeploymentPlan", val);
 
     dump ("label", plan.label);
     dump ("UUID", plan.UUID);
@@ -631,9 +542,14 @@ namespace Deployment
 
     dump ("portName", spe.portName);
     int value = spe.instanceRef;
+    ::Deployment::ComponentAssemblyDescription *v;
+    const CORBA::Any &a =
+      Dump_Obj::desc ("ComponentAssemblyDescription");
+
+    a >>= v;
+
     ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (),
-                Dump_Obj::desc<Deployment::ComponentAssemblyDescription>
-                ("ComponentAssemblyDescription").instance[value].name.in ()));
+                v->instance[value].name.in ()));
   }
 
   // AssemblyConnectionDescription
@@ -657,14 +573,20 @@ namespace Deployment
 
     dump ("propertyName", spr.propertyName);
     int value = spr.instanceRef;
+
+    ::Deployment::ComponentAssemblyDescription *v;
+
+    const CORBA::Any &a =
+      Dump_Obj::desc ("ComponentAssemblyDescription");
+
+    a >>= v;
+
     ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (),
-                Dump_Obj::desc<Deployment::ComponentAssemblyDescription>
-                ("ComponentAssemblyDescription").instance[value].name.in ()));
+                v->instance[value].name.in ()));
   }
 
-  // AssemblyPropertyMapping
-
-  void DnC_Dump::dump (const ::Deployment::AssemblyPropertyMapping &apm)
+  void
+  DnC_Dump::dump (const ::Deployment::AssemblyPropertyMapping &apm)
   {
     Dump_Obj dump_obj("AssemblyPropertyMapping");
 
@@ -674,11 +596,15 @@ namespace Deployment
   }
 
   // ComponentAssemblyDescription
- 
+
   void DnC_Dump::dump (const ::Deployment::ComponentAssemblyDescription& cad)
   {
-    Dump_Obj dump_obj("ComponentAssemblyDescription", cad);
-    
+    CORBA::Any a;
+    a <<= cad;
+
+    Dump_Obj dump_obj ("ComponentAssemblyDescription",
+                       a);
+
     dump_sequence ("instance", cad.instance);
     dump_sequence ("connection", cad.connection);
     dump_sequence ("externalProperty", cad.externalProperty);
@@ -694,9 +620,9 @@ namespace Deployment
     dump ("UUID", iad.UUID);
     dump ("location", iad.location);
     dump_sequence ("execParameter", iad.execParameter);
-    dump_sequence ("deployRequirement", iad.deployRequirement); 
-    dump_sequence ("dependsOn", iad.dependsOn); 
-    dump_sequence ("infoProperty", iad.infoProperty); 
+    dump_sequence ("deployRequirement", iad.deployRequirement);
+    dump_sequence ("dependsOn", iad.dependsOn);
+    dump_sequence ("infoProperty", iad.infoProperty);
   }
 
   // NamedImplementationArtifact
@@ -714,7 +640,7 @@ namespace Deployment
   void DnC_Dump::dump (const ::Deployment::ImplementationRequirement &ir)
   {
     Dump_Obj dump_obj("ImplementationRequirement");
-    
+
     dump_sequence ("resourceUsage", ir.resourceUsage);
     dump ("resourcePort", ir.resourcePort);
     dump ("componentPort", ir.componentPort);
@@ -725,7 +651,7 @@ namespace Deployment
 
   // MonolithicImplementationDescription
 
-  void DnC_Dump::dump (const ::Deployment::MonolithicImplementationDescription 
+  void DnC_Dump::dump (const ::Deployment::MonolithicImplementationDescription
                          &mid)
   {
     Dump_Obj dump_obj("MonolithicImplementationDescription");
@@ -735,15 +661,15 @@ namespace Deployment
     dump_sequence ("deployRequirement", mid.deployRequirement);
   }
 
-  // Capability
-
-  void DnC_Dump::dump (const ::Deployment::Capability &capability)
+  void
+  DnC_Dump::dump (const ::Deployment::Capability &capability)
   {
     Dump_Obj dump_obj("Capability");
-    
+
     dump ("name", capability.name);
-    DnC_Dump::dump ("resourceType", capability.resourceType); 
-    DnC_Dump::dump_sequence ("property", capability.property);
+    DnC_Dump::dump ("resourceType", capability.resourceType);
+    dump_sequence ("property",
+                   capability.property);
   }
 
   // ComponentImplementationDescription
@@ -772,14 +698,14 @@ namespace Deployment
     Dump_Obj dump_obj("PackagedComponentImplementation");
 
     dump ("Name", pci.name);
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 "%sreferencedImplementation: \n", Dump_Obj::indent()));
-    DnC_Dump::dump (pci.referencedImplementation); 
+    DnC_Dump::dump (pci.referencedImplementation);
   }
 
   // ComponentPackageDescription
 
-  void DnC_Dump::dump (const ::Deployment::ComponentPackageDescription 
+  void DnC_Dump::dump (const ::Deployment::ComponentPackageDescription
                          &comppkgdesc)
   {
     Dump_Obj dump_obj("ComponentPackageDescription");
@@ -812,7 +738,7 @@ namespace Deployment
   void DnC_Dump::dump (const Deployment::RequirementSatisfier& rs)
   {
     Dump_Obj dump_obj("RequirementSatisfier");
-    
+
     dump ("name", rs.name);
     dump ("resourceType", rs.resourceType);
     dump_sequence ("property", rs.property);
@@ -1043,7 +969,4 @@ namespace Deployment
         ACE_THROW (CORBA::INTERNAL ());
       }
   }
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
 }
-
-#endif /* DNC_DUMP_C */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
index b20b98469e9..1c504e57133 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
@@ -29,146 +29,123 @@ namespace Deployment
    * the contents of various IDL data types, which passed as input.
    */
   class Config_Handler_Export DnC_Dump
-    {
-/*
- *  If the compiler has broken nested templates exclude dumping functionality.
- */
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
-    public:
-      /// Dump functions for CORBA sequences
-      static void dump (const char* caption,
-                        const ::CORBA::StringSeq &str_seq);
-
-      template <typename SEQUENCE>
-        static void dump_sequence (const char* caption, const SEQUENCE &seq);
-
-      template <typename ROOT, typename SEQUENCE,
-                typename DATA_TYPE, typename CLASS>
-        static void dump_ref_seq (const char* caption, SEQUENCE& seq,
-                                  const char* root, DATA_TYPE CLASS::*data);
+  {
+  public:
+    /// Dump functions for CORBA sequences
+    static void dump (const char* caption,
+                      const ::CORBA::StringSeq &str_seq);
 
-      template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
-                typename CLASS>
-        static void dump_ref (const char* caption, REFERENCE& ref,
-                              const char* root, DATA_TYPE CLASS::*data);
+    static void dump (const char* caption, const TAO_String_Manager& str);
 
-      static void dump (const char* caption, const TAO_String_Manager& str);
+    static void dump (const char* caption, const CORBA::Boolean& val);
 
-      static void dump (const char* caption, const CORBA::Boolean& val);
+    /// A whole slew of overloaded dump routines for different IDL
+    /// data types.
 
-      /// A whole slew of overloaded dump routines for different IDL data types.
+    static void dump(const Deployment::SatisfierProperty &sp);
 
-      static void dump(const Deployment::SatisfierProperty &sp);
+    static void dump (const Deployment::SharedResource& sr);
 
-      static void dump (const Deployment::SharedResource& sr);
+    static void dump (const Deployment::Node& node);
 
-      static void dump (const Deployment::Node& node);
+    static void dump (const Deployment::Resource& resource);
 
-      static void dump (const Deployment::Resource& resource);
+    static void dump (const Deployment::Interconnect& conn);
 
-      static void dump (const Deployment::Interconnect& conn);
+    static void dump (const Deployment::Bridge& bridge);
 
-      static void dump (const Deployment::Bridge& bridge);
+    static void dump (const ::Deployment::Property &property);
 
-      static void dump (const ::Deployment::Property &property);
+    static void dump (const ::Deployment::AssemblyConnectionDescription &acd);
 
-      static void dump (const ::Deployment::AssemblyConnectionDescription &acd);
+    static void dump (const ::Deployment::AssemblyPropertyMapping &apm);
 
-      static void dump (const ::Deployment::AssemblyPropertyMapping &apm);
+    static void dump (const ::Deployment::ComponentPackageDescription
+                      &comppkgdesc);
 
-      static void dump (const ::Deployment::ComponentPackageDescription
-                             &comppkgdesc);
+    static void dump (const ::Deployment::ComponentPortDescription
+                      &compportdesc);
 
-      static void dump (const ::Deployment::ComponentPortDescription
-                             &compportdesc);
+    static void dump (const ::Deployment::ComponentPropertyDescription
+                      &comppropdesc);
 
-      static void dump (const ::Deployment::ComponentPropertyDescription
-                             &comppropdesc);
+    static void dump (const ::Deployment::MonolithicImplementationDescription
+                      &mid);
 
-      static void dump (const ::Deployment::MonolithicImplementationDescription
-                             &mid);
+    static void dump (const ::Deployment::PackageConfiguration &pc);
 
-      static void dump (const ::Deployment::PackageConfiguration &pc);
+    static void dump (const ::Deployment::PackagedComponentImplementation
+                      &pci);
 
-      static void dump (const ::Deployment::PackagedComponentImplementation
-                             &pci);
+    static void dump (const ::Deployment::SubcomponentPortEndpoint &spe);
 
-      static void dump (const ::Deployment::SubcomponentPortEndpoint &spe);
+    static void dump (const ::Deployment::Requirement &requirement);
 
-      static void dump (const ::Deployment::Requirement &requirement);
+    static void dump (const ::Deployment::ComponentExternalPortEndpoint
+                      &cepe);
 
-      static void dump (const ::Deployment::ComponentExternalPortEndpoint
-                             &cepe);
+    static void dump (const ::Deployment::ComponentPackageReference &cpr);
 
-      static void dump (const ::Deployment::ComponentPackageReference &cpr);
-
-      static void dump (const ::Deployment::ComponentImplementationDescription
+    static void dump (const ::Deployment::ComponentImplementationDescription
                              &cid);
 
-      static void dump (const ::Deployment::SubcomponentInstantiationDescription
+    static void dump (const ::Deployment::SubcomponentInstantiationDescription
                              &sid);
 
-      static void dump (const ::Deployment::NamedImplementationArtifact
-                             &named_implementation);
+    static void dump (const ::Deployment::NamedImplementationArtifact
+                      &named_implementation);
 
-      static void dump (const ::Deployment::ComponentInterfaceDescription &cid);
+    static void dump (const ::Deployment::ComponentInterfaceDescription &cid);
 
-      static void dump (const ::Deployment::SubcomponentPropertyReference
-                             &scpr);
+    static void dump (const ::Deployment::SubcomponentPropertyReference
+                      &scpr);
 
-      static void dump (const ::Deployment::ExternalReferenceEndpoint &ere);
+    static void dump (const ::Deployment::ExternalReferenceEndpoint &ere);
 
-      static void dump (const ::Deployment::Domain &domain);
+    static void dump (const ::Deployment::Domain &domain);
 
-      static void dump (const ::Deployment::Capability &capability);
+    static void dump (const ::Deployment::Capability &capability);
 
-      static void dump (const ::Deployment::ImplementationArtifactDescription
+    static void dump (const ::Deployment::ImplementationArtifactDescription
                              &iad);
 
-      static void dump (const ::Deployment::ImplementationRequirement &ir);
-
-      static void dump(const Deployment::ResourceUsageKind &ruk);
-
-      static void dump(const Deployment::DeploymentPlan &plan);
+    static void dump (const ::Deployment::ImplementationRequirement &ir);
 
-      static void dump(const Deployment::MonolithicDeploymentDescription &mdd);
+    static void dump(const Deployment::ResourceUsageKind &ruk);
 
-      static void dump(const Deployment::InstanceDeploymentDescription &idd);
+    static void dump(const Deployment::DeploymentPlan &plan);
 
-      static void dump(const Deployment::PlanConnectionDescription &pcd);
+    static void dump(const Deployment::MonolithicDeploymentDescription &mdd);
 
-      static void dump(const Deployment::PlanPropertyMapping &ppm);
+    static void dump(const Deployment::InstanceDeploymentDescription &idd);
 
-      static void dump(const Deployment::ImplementationDependency &id);
+    static void dump(const Deployment::PlanConnectionDescription &pcd);
 
-      static void dump(const Deployment::ArtifactDeploymentDescription &add);
+    static void dump(const Deployment::PlanPropertyMapping &ppm);
 
-      static void dump(const Deployment::InstanceResourceDeploymentDescription
-                             &irdd);
+    static void dump(const Deployment::ImplementationDependency &id);
 
-      static void dump(const PlanSubcomponentPortEndpoint &pspe);
+    static void dump(const Deployment::ArtifactDeploymentDescription &add);
 
-      static void dump(const ConnectionResourceDeploymentDescription &crdd);
+    static void dump(const Deployment::InstanceResourceDeploymentDescription
+                     &irdd);
 
-      static void dump(const PlanSubcomponentPropertyReference &pspr);
+    static void dump(const PlanSubcomponentPortEndpoint &pspe);
 
-      static void dump(const ResourceDeploymentDescription &rdd);
+    static void dump(const ConnectionResourceDeploymentDescription &crdd);
 
-      static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
+    static void dump(const PlanSubcomponentPropertyReference &pspr);
 
-      static void dump (const Deployment::RequirementSatisfier& rs);
+    static void dump(const ResourceDeploymentDescription &rdd);
 
-    private:
-      static void dump (const ::CORBA::Any &any);
-      // Helper function to print an Any
+    static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
 
-#else // ACE_HAS_BROKEN_NESTED_TEMPLATES
-    public:
-      static void dump(const Deployment::DeploymentPlan &plan) { }
+    static void dump (const Deployment::RequirementSatisfier& rs);
 
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
-    };
+  private:
+    static void dump (const ::CORBA::Any &any);
+    // Helper function to print an Any
+  };
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.cpp
index bf4b22c2c3f..2b3e5bd3a28 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.cpp
@@ -144,7 +144,7 @@ void Plan_Handler::process_irdd (DOMNodeIterator* iter,
                 (ACE_TEXT ("Deployment:InstanceResourceDeploymentDescription")))
         {
         }
-      else if (node_name == "resourceUsage")
+      else if (node_name == XStr ("resourceUsage"))
         {
           RUK_Handler::process_ResourceUsageKind (iter, irdd.resourceUsage);
         }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp
index 1272ad9dcc6..0260921be11 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp
@@ -2,9 +2,11 @@
 
 #include "Property_Handler.h"
 #include "Any_Handler.h"
+#include "Utils.h"
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
-#include "Utils.h"
+#include "ace/SString.h"
+
 
 using CIAO::Config_Handler::Utils;
 using CIAO::Config_Handler::Any_Handler;
@@ -28,7 +30,7 @@ CIAO::Config_Handler::Property_Handler::process_Property (DOMNodeIterator * iter
           valid_value = 1;
           if (node->hasAttributes ())
             {
-              xercesc::DOMNamedNodeMap * named_node_map = 
+              xercesc::DOMNamedNodeMap * named_node_map =
                 node->getAttributes ();
               int length = named_node_map->getLength ();
               if (length > 1)
@@ -37,21 +39,21 @@ CIAO::Config_Handler::Property_Handler::process_Property (DOMNodeIterator * iter
                     {
                       DOMNode * attr_node = named_node_map->item (j);
                       XStr attr_node_name = attr_node->getNodeName ();
-                      char*  attr_node_value_ch = 
+                      char*  attr_node_value_ch =
                         XMLString::transcode (attr_node->getNodeValue ());
                       ACE_TString attr_node_value = attr_node_value_ch;
                       XMLString::release (&attr_node_value_ch);
                       if (attr_node_name = XStr (ACE_TEXT ("href")))
                         {
                           XMLURL url (attr_node_value.c_str ());
-                          DOMNodeIterator * value_iter = 
-                            Utils::parse_href_tag (url, 
+                          DOMNodeIterator * value_iter =
+                            Utils::parse_href_tag (url,
                                                    node->getOwnerDocument ());
                           // Get to the root-node
                           value_iter->nextNode ();
 
                           // Process the value node present there
-                          Any_Handler::process_Any (value_iter, 
+                          Any_Handler::process_Any (value_iter,
                                                     property.value);
                         }
                     }
@@ -63,7 +65,7 @@ CIAO::Config_Handler::Property_Handler::process_Property (DOMNodeIterator * iter
             // Process the value associated
             Any_Handler::process_Any (iter, property.value);
         }
-      else 
+      else
         {
           if (! valid_name || ! valid_value)
             {
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.cpp
index f27f02c2d7b..0d385e759c1 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.cpp
@@ -2,9 +2,11 @@
 
 #include "RS_Handler.h"
 #include "SP_Handler.h"
+#include "Utils.h"
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
-#include "Utils.h"
+#include "ace/SString.h"
+
 
 void
 CIAO::Config_Handler::RS_Handler::
@@ -36,7 +38,7 @@ process_RequirementSatisfier (DOMNodeIterator * iter,
             {
               ::CORBA::ULong index = res_seq->length ();
               res_seq->length (res_seq->length () + 1);
-              res_seq [index] = 
+              res_seq [index] =
                 CIAO::Config_Handler::Utils::parse_string (iter);
               name = node->getNodeName ();
             }
@@ -59,10 +61,10 @@ process_RequirementSatisfier (DOMNodeIterator * iter,
           property_seq->length (0);
           while (name == XStr (ACE_TEXT ("property")))
             {
-              // Check for <href> tags 
+              // Check for <href> tags
               if (node->hasAttributes ())
                 {
-                  xercesc::DOMNamedNodeMap * named_node_map = 
+                  xercesc::DOMNamedNodeMap * named_node_map =
                     node->getAttributes ();
                   int length = named_node_map->getLength ();
                   if (length > 1)
@@ -79,7 +81,7 @@ process_RequirementSatisfier (DOMNodeIterator * iter,
                             {
                               XMLURL url (attr_node_value.c_str ());
                               DOMNodeIterator * value_iter =
-                                Utils::parse_href_tag (url, 
+                                Utils::parse_href_tag (url,
                                                        node->getOwnerDocument ());
                               // Get to the root-node
                               value_iter->nextNode ();
@@ -88,8 +90,8 @@ process_RequirementSatisfier (DOMNodeIterator * iter,
                               property_iter = value_iter;
                             }
                         }
-                    } 
-                } 
+                    }
+                }
               else
                 property_iter = iter;
 
@@ -117,7 +119,7 @@ process_RequirementSatisfier (DOMNodeIterator * iter,
             ACE_DEBUG ((LM_DEBUG, "Config_Handlers::RS_Handler::process_ \
                         RequirementSatisfier element mismatch expected <name>,\
                         <resourceType> <property>\n"));
-          // On exit go one step back as one might have processed the next 
+          // On exit go one step back as one might have processed the next
           // valid tag
           iter->previousNode ();
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.cpp
index bc5b1fcb56a..2b6eb94fb9c 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.cpp
@@ -2,8 +2,10 @@
 
 #include "Requirement_Handler.h"
 #include "Property_Handler.h"
-#include "tao/Exception.h"
 #include "Utils.h"
+#include "tao/Exception.h"
+#include "ace/SString.h"
+
 
 using CIAO::Config_Handler::Property_Handler;
 
@@ -12,8 +14,8 @@ CIAO::Config_Handler::Requirement_Handler::process_Requirement (DOMNodeIterator
                                                                 Deployment::Requirement &ret_struct)
 {
   int valid_resourceType = 0, valid_property = 0, valid_name = 0;
-  for (DOMNode * node = iter->nextNode (); 
-       node != 0; 
+  for (DOMNode * node = iter->nextNode ();
+       node != 0;
        node = iter->nextNode ())
     {
       XStr name (node->getNodeName ());
@@ -21,7 +23,7 @@ CIAO::Config_Handler::Requirement_Handler::process_Requirement (DOMNodeIterator
         {
           valid_resourceType = 1;
           // Populate the structure
-          ret_struct.resourceType = 
+          ret_struct.resourceType =
             CIAO::Config_Handler::Utils::parse_string (iter);
         }
       else if (name == XStr (ACE_TEXT ("property")))
@@ -62,7 +64,7 @@ CIAO::Config_Handler::Requirement_Handler::process_Requirement (DOMNodeIterator
                             {
                               XMLURL url (attr_node_value.c_str ());
                               DOMNodeIterator * value_iter =
-                                Utils::parse_href_tag (url, 
+                                Utils::parse_href_tag (url,
                                                        node->getOwnerDocument ());
                               // Get to the root-node
                               value_iter->nextNode ();
@@ -78,7 +80,7 @@ CIAO::Config_Handler::Requirement_Handler::process_Requirement (DOMNodeIterator
                   // Deep copy the value
                   CIAO::Config_Handler::Property_Handler::
                     process_Property (property_iter, properties [index]);
-                }  
+                }
             }
           valid_property = 1;
 
@@ -93,9 +95,9 @@ CIAO::Config_Handler::Requirement_Handler::process_Requirement (DOMNodeIterator
           valid_name = 1;
           ret_struct.name = CIAO::Config_Handler::Utils::parse_string (iter);
         }
-      else 
+      else
         {
-          if (! valid_resourceType || 
+          if (! valid_resourceType ||
               ! valid_property     ||
               ! valid_name)
             {
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.cpp
index 842912db9ca..f741b93e701 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.cpp
@@ -3,9 +3,11 @@
 #include "SP_Handler.h"
 #include "Any_Handler.h"
 #include "SPK_Handler.h"
+#include "Utils.h"
 #include "tao/Exception.h"
 #include "ace/Auto_Ptr.h"
-#include "Utils.h"
+#include "ace/SString.h"
+
 
 using CIAO::Config_Handler::Utils;
 using CIAO::Config_Handler::Any_Handler;
@@ -46,14 +48,14 @@ process_SatisfierProperty (DOMNodeIterator * iter,
                         {
                           XMLURL url (attr_node_value.c_str ());
                           DOMNodeIterator * value_iter =
-                            Utils::parse_href_tag (url, 
+                            Utils::parse_href_tag (url,
                                                    node->getOwnerDocument ());
 
                           // Get to the root-node
                           value_iter->nextNode ();
 
                           // Process the property href tag
-                          Any_Handler::process_Any (value_iter, 
+                          Any_Handler::process_Any (value_iter,
                                                     property.value);
                         }
                     }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Utils.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Utils.cpp
index 526d757dbd9..02068be58ad 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Utils.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Utils.cpp
@@ -26,7 +26,7 @@ char *
 CIAO::Config_Handler::Utils::parse_string (DOMNodeIterator * iter)
 {
   DOMNode * node = iter->nextNode();
-  DOMText* text = ACE_reinterpret_cast (DOMText*, node);
+  DOMText* text = reinterpret_cast<DOMText*> (node);
   return XMLString::transcode (text->getNodeValue ());
 }
 
@@ -69,7 +69,7 @@ CIAO::Config_Handler::Utils::parse_double (DOMNodeIterator * iter)
 CORBA::Float
 CIAO::Config_Handler::Utils::parse_float (DOMNodeIterator * iter)
 {
-  return ACE_static_cast (CORBA::Float, Utils::parse_double (iter));
+  return static_cast<CORBA::Float> (Utils::parse_double (iter));
 }
 
 CORBA::Boolean
@@ -78,7 +78,7 @@ CIAO::Config_Handler::Utils::parse_bool (DOMNodeIterator * iter)
   XStr true_val ("true");
   XStr true_cap_val ("TRUE");
 
-  DOMText * text = ACE_reinterpret_cast (DOMText *, iter->nextNode ());
+  DOMText * text = reinterpret_cast<DOMText *> (iter->nextNode ());
   XStr value (text->getNodeValue ());
 
   if (value == true_val || value == true_cap_val)
@@ -90,7 +90,7 @@ CIAO::Config_Handler::Utils::parse_bool (DOMNodeIterator * iter)
 CORBA::Char
 CIAO::Config_Handler::Utils::parse_char (DOMNodeIterator * iter)
 {
-  DOMText * text = ACE_reinterpret_cast (DOMText *, iter->nextNode ());
+  DOMText * text = reinterpret_cast<DOMText *> (iter->nextNode ());
   char * temp_string = XMLString::transcode (text->getNodeValue ());
 
   // Should be non-null
@@ -117,7 +117,7 @@ CIAO::Config_Handler::Utils::process_string (DOMNodeIterator* iter,
   if (result == true)
     {
       DOMNode* node = iter->nextNode();
-      const XMLCh* text = ACE_reinterpret_cast(DOMText*, node)->getNodeValue
+      const XMLCh* text = reinterpret_cast<DOMText*> (node)->getNodeValue
 ();
       if (text)
         var = XMLString::transcode (text);
@@ -135,8 +135,7 @@ CIAO::Config_Handler::Utils::process_string_seq (DOMNodeIterator* iter,
   if (result == true)
     {
       DOMNode* node = iter->nextNode ();
-      const XMLCh* text = ACE_reinterpret_cast
-                            (DOMText*, node)->getNodeValue ();
+      const XMLCh* text = reinterpret_cast<DOMText*> (node)->getNodeValue ();
 
       if (text)
         {
@@ -159,13 +158,12 @@ CIAO::Config_Handler::Utils::process_ulong (DOMNodeIterator* iter,
   if (result == true)
     {
       DOMNode* node = iter->nextNode ();
-      const XMLCh* text = ACE_reinterpret_cast
-                            (DOMText*, node)->getNodeValue ();
+      const XMLCh* text = reinterpret_cast<DOMText*> (node)->getNodeValue ();
 
       if (text)
         {
           CORBA::String_var temp = XMLString::transcode (text);
-          var = ACE_static_cast (CORBA::ULong, ACE_OS::strtol (temp.in (),
+          var = static_cast<CORBA::ULong> (ACE_OS::strtol (temp.in (),
                                  0, 10));
         }
     }
@@ -183,13 +181,12 @@ CIAO::Config_Handler::Utils::process_boolean (DOMNodeIterator* iter,
   if (result == true)
     {
       DOMNode* node = iter->nextNode ();
-      const XMLCh* text = ACE_reinterpret_cast
-                            (DOMText*, node)->getNodeValue ();
+      const XMLCh* text = reinterpret_cast<DOMText*> (node)->getNodeValue ();
 
       if (text)
         {
           CORBA::String_var temp = XMLString::transcode (text);
-          var = ACE_static_cast (CORBA::Boolean, ACE_OS::strtol (temp.in (),
+          var = static_cast<CORBA::Boolean> (ACE_OS::strtol (temp.in (),
                                  0, 10));
         }
     }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Utils.h b/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
index c47cd4a37c2..fd77fa947c9 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
@@ -88,21 +88,21 @@ namespace CIAO {
       static DOMBuilder* create_parser ();
       // Create a parser from the URL
 
-      static bool process_string (DOMNodeIterator* iter, const XStr& node_name, 
+      static bool process_string (DOMNodeIterator* iter, const XStr& node_name,
                                   const char* name, TAO_String_Manager& var);
       // process strings
 
-      static bool process_string_seq (DOMNodeIterator* iter, 
-                                      const XStr& node_name, 
+      static bool process_string_seq (DOMNodeIterator* iter,
+                                      const XStr& node_name,
                                       const char* name, CORBA::StringSeq& seq);
       // process string sequence
 
-      static bool process_boolean (DOMNodeIterator* iter, 
-                                   const XStr& node_name, 
+      static bool process_boolean (DOMNodeIterator* iter,
+                                   const XStr& node_name,
                                    const char* name, CORBA::Boolean& var);
       // process strings
 
-      static bool process_ulong (DOMNodeIterator* iter, const XStr& node_name, 
+      static bool process_ulong (DOMNodeIterator* iter, const XStr& node_name,
                                  const char* name, CORBA::ULong& var);
       // process ulong
 
@@ -113,6 +113,8 @@ namespace CIAO {
       // new document
     };
   }
-
 }
+
+#include /**/ "ace/post.h"
+
 #endif /* UTILS_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp
index ae73ae8a0b1..cfad56f4dc9 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp
@@ -10,7 +10,7 @@
 #include <sstream>
 //#include <iostream> //@@ tmp
 
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/Parser.hpp"
 
 #if defined (_MSC_VER) && (_MSC_VER < 1300)
 
@@ -724,7 +724,7 @@ namespace XSCRT
 
 }
 
-#include <XSCRT/Elements.ipp>
-#include <XSCRT/Elements.tpp>
+#include "XSCRT/Elements.ipp"
+#include "XSCRT/Elements.tpp"
 
 #endif  // XSCRT_ELEMENTS_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
index 6a380e5d971..e271a54b6d6 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
@@ -155,7 +155,7 @@ namespace XSCRT
   {
     ExtendedTypeInfoMap::const_iterator i (
       extended_type_info_map ().find (tid));
-    
+
     if (i == extended_type_info_map ().end ()) throw NotAvailable ();
 
     return i->second;
@@ -170,6 +170,6 @@ namespace XSCRT
   }
 }
 
-#include <XSCRT/ExtendedTypeInfo.ipp>
+#include "XSCRT/ExtendedTypeInfo.ipp"
 
 #endif  // XSCRT_EXTENDED_TYPE_INFO_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp
index 66d73e1f348..dd6363a4dfd 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp
@@ -247,7 +247,7 @@ namespace XSCRT
       XMLCh const* xns = e.dom_element ()->lookupNamespaceURI (p);
       std::basic_string<C> ns (
         xns ? transcode<C> (xns, 0) : std::basic_string<C> ());
-      
+
       delete[] p;
       return ns;
 
@@ -315,7 +315,7 @@ namespace XSCRT
   };
 }
 
-#include <XSCRT/Parser.ipp>
-#include <XSCRT/Parser.tpp>
+#include "XSCRT/Parser.ipp"
+#include "XSCRT/Parser.tpp"
 
 #endif  // XSCRT_PARSER_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp
index c898caa7681..4fbd1ee242b 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp
@@ -9,7 +9,7 @@
 #include <set>
 #include <vector>
 
-#include <XSCRT/ExtendedTypeInfo.hpp>
+#include "XSCRT/ExtendedTypeInfo.hpp"
 
 namespace XSCRT
 {
@@ -192,7 +192,7 @@ namespace XSCRT
   }
 }
 
-#include <XSCRT/Traversal.ipp>
-#include <XSCRT/Traversal.tpp>
+#include "XSCRT/Traversal.ipp"
+#include "XSCRT/Traversal.tpp"
 
 #endif  // XSCRT_TRAVERSAL_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp
index 49e04e7ec00..31bad0bc207 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp
@@ -8,7 +8,7 @@
 #include <string>
 // #include <iostream> //@@ tmp
 
-#include <XSCRT/Elements.hpp>
+#include "XSCRT/Elements.hpp"
 
 namespace XMLSchema
 {
@@ -364,7 +364,7 @@ namespace XMLSchema
       NCName<C>::container (c);
 
       register_id ();
-    }    
+    }
 
   private:
     using NCName<C>::empty;
@@ -492,7 +492,7 @@ namespace XMLSchema
 //
 //
 
-#include <XSCRT/Traversal.hpp>
+#include "XSCRT/Traversal.hpp"
 
 namespace XMLSchema
 {
@@ -547,7 +547,7 @@ namespace XMLSchema
 //
 //
 
-#include <XSCRT/ExtendedTypeInfo.hpp>
+#include "XSCRT/ExtendedTypeInfo.hpp"
 
 namespace XMLSchema
 {
@@ -558,7 +558,7 @@ namespace XMLSchema
   };
 }
 
-#include <XSCRT/XMLSchema.ipp>
-#include <XSCRT/XMLSchema.tpp>
+#include "XSCRT/XMLSchema.ipp"
+#include "XSCRT/XMLSchema.tpp"
 
 #endif  // XSCRT_XMLSCHEMA_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XercesString.cpp b/TAO/CIAO/DAnCE/Config_Handlers/XercesString.cpp
index 7b719e4dc80..877f9639d51 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XercesString.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XercesString.cpp
@@ -115,11 +115,6 @@ namespace Config_Handler
     return _wstr[i];
   }
 
-  bool XStr::operator== (const XMLCh* wstr) const
-  {
-    return XMLString::compareIString (wstr, this->_wstr) == 0;
-  }
-
   bool operator== (const XStr& lhs, const XStr& rhs)
   {
     return XMLString::compareIString (lhs,rhs) == 0;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XercesString.h b/TAO/CIAO/DAnCE/Config_Handlers/XercesString.h
index 87ef31c3c2c..7ac692d34de 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XercesString.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XercesString.h
@@ -44,7 +44,7 @@ namespace Config_Handler
 
     bool append(const XMLCh* tail);
 
-    bool erase(const XMLCh* head, const XMLCh* tail);
+    bool erase (const XMLCh* head, const XMLCh* tail);
 
     int size() const;
 
@@ -54,9 +54,6 @@ namespace Config_Handler
 
     operator const XMLCh* () const { return _wstr; };
 
-    bool operator== (const XMLCh* wstr) const;
-
-
   private:
 
     XMLCh* _wstr; // Internal representation
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
index 622334b2268..684dd24a4d3 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -29,7 +29,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -40,7 +40,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -51,7 +51,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // specificType
-      // 
+      //
       public:
       bool specificType_p () const;
       ::XMLSchema::string< char > const& specificType () const;
@@ -62,7 +62,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > specificType_;
 
       // supportedType
-      // 
+      //
       public:
       bool supportedType_p () const;
       ::XMLSchema::string< char > const& supportedType () const;
@@ -73,7 +73,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > supportedType_;
 
       // idlFile
-      // 
+      //
       public:
       bool idlFile_p () const;
       ::XMLSchema::string< char > const& idlFile () const;
@@ -84,7 +84,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > idlFile_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -95,7 +95,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // port
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription >::iterator port_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription >::const_iterator port_const_iterator;
@@ -109,7 +109,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ComponentPortDescription > port_;
 
       // property
-      // 
+      //
       public:
       bool property_p () const;
       ::CIAO::Config_Handlers::ComponentPropertyDescription const& property () const;
@@ -120,7 +120,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPropertyDescription > property_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
@@ -131,7 +131,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
index a3834aa1303..16053fce1f3 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -29,7 +29,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& label () const;
       ::XMLSchema::string< char >& label ();
@@ -39,7 +39,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& UUID () const;
       ::XMLSchema::string< char >& UUID ();
@@ -49,7 +49,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // sharedResource
-      // 
+      //
       public:
       bool sharedResource_p () const;
       ::CIAO::Config_Handlers::SharedResource const& sharedResource () const;
@@ -60,7 +60,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::SharedResource > sharedResource_;
 
       // node
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::Node >::iterator node_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::Node >::const_iterator node_const_iterator;
@@ -74,7 +74,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::Node > node_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
index de201bfca33..012daf5621a 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "ccd.hpp"
 
@@ -29,7 +29,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -40,7 +40,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -51,7 +51,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // realizes
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
       ::CIAO::Config_Handlers::ComponentInterfaceDescription& realizes ();
@@ -61,7 +61,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
 
       // implementation
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::MonolithicDeploymentDescription const& implementation () const;
       ::CIAO::Config_Handlers::MonolithicDeploymentDescription& implementation ();
@@ -71,7 +71,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
 
       // instance
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::const_iterator instance_const_iterator;
@@ -85,7 +85,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
 
       // connection
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription >::const_iterator connection_const_iterator;
@@ -99,7 +99,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
 
       // dependsOn
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
@@ -113,7 +113,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
 
       // artifact
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::const_iterator artifact_const_iterator;
@@ -127,7 +127,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
 
       // infoProperty
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
index d3659edbe7d..8e84504bafd 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
@@ -19,8 +19,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -38,7 +38,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -48,7 +48,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // package
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ComponentPackageDescription const& package () const;
       ::CIAO::Config_Handlers::ComponentPackageDescription& package ();
@@ -58,7 +58,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > package_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -69,7 +69,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // selectRequirement
-      // 
+      //
       public:
       bool selectRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
@@ -80,7 +80,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
 
       // reference
-      // 
+      //
       public:
       bool reference_p () const;
       ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
@@ -91,7 +91,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
 
       // id
-      // 
+      //
       public:
       bool id_p () const;
       ::XMLSchema::ID< char > const& id () const;
@@ -119,7 +119,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // propertyName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& propertyName () const;
       ::XMLSchema::string< char >& propertyName ();
@@ -129,7 +129,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > propertyName_;
 
       // instance
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance () const;
       ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& instance ();
@@ -156,7 +156,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -166,7 +166,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // externalName
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& externalName () const;
       ::XMLSchema::string< char >& externalName ();
@@ -176,7 +176,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > externalName_;
 
       // delegatesTo
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo () const;
       ::CIAO::Config_Handlers::SubcomponentPropertyReference& delegatesTo ();
@@ -203,7 +203,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // instance
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::iterator instance_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::const_iterator instance_const_iterator;
@@ -217,7 +217,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
 
       // connection
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::iterator connection_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::const_iterator connection_const_iterator;
@@ -231,7 +231,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription > connection_;
 
       // externalProperty
-      // 
+      //
       public:
       bool externalProperty_p () const;
       ::CIAO::Config_Handlers::AssemblyPropertyMapping const& externalProperty () const;
@@ -259,7 +259,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // execParameter
-      // 
+      //
       public:
       bool execParameter_p () const;
       ::CIAO::Config_Handlers::Property const& execParameter () const;
@@ -270,7 +270,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
 
       // primaryArtifact
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator primaryArtifact_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator primaryArtifact_const_iterator;
@@ -284,7 +284,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > primaryArtifact_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::ImplementationRequirement const& deployRequirement () const;
@@ -312,7 +312,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -323,7 +323,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -334,7 +334,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // implements
-      // 
+      //
       public:
       bool implements_p () const;
       ::CIAO::Config_Handlers::ComponentInterfaceDescription const& implements () const;
@@ -345,7 +345,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > implements_;
 
       // assemblyImpl
-      // 
+      //
       public:
       bool assemblyImpl_p () const;
       ::CIAO::Config_Handlers::ComponentAssemblyDescription const& assemblyImpl () const;
@@ -356,7 +356,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > assemblyImpl_;
 
       // monolithicImpl
-      // 
+      //
       public:
       bool monolithicImpl_p () const;
       ::CIAO::Config_Handlers::MonolithicImplementationDescription const& monolithicImpl () const;
@@ -367,7 +367,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > monolithicImpl_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -378,7 +378,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // capability
-      // 
+      //
       public:
       bool capability_p () const;
       ::CIAO::Config_Handlers::Capability const& capability () const;
@@ -389,7 +389,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > capability_;
 
       // dependsOn
-      // 
+      //
       public:
       bool dependsOn_p () const;
       ::CIAO::Config_Handlers::ImplementationDependency const& dependsOn () const;
@@ -400,7 +400,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
@@ -411,7 +411,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
index 9d9292e8682..290af440d33 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
@@ -15,8 +15,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "ccd.hpp"
 
@@ -32,7 +32,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -42,7 +42,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // referencedImplementation
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation () const;
       ::CIAO::Config_Handlers::ComponentImplementationDescription& referencedImplementation ();
@@ -69,7 +69,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -80,7 +80,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -91,7 +91,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // realizes
-      // 
+      //
       public:
       bool realizes_p () const;
       ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
@@ -102,7 +102,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -113,7 +113,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // implementation
-      // 
+      //
       public:
       bool implementation_p () const;
       ::CIAO::Config_Handlers::PackagedComponentImplementation const& implementation () const;
@@ -124,7 +124,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > implementation_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
@@ -135,7 +135,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
index a94ef2fd5a0..882a18332a8 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
@@ -15,8 +15,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -30,7 +30,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< char > const& name () const;
       ::XMLSchema::string< char >& name ();
@@ -40,7 +40,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > name_;
 
       // referencedArtifact
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact () const;
       ::CIAO::Config_Handlers::ImplementationArtifactDescription& referencedArtifact ();
@@ -67,7 +67,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -78,7 +78,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -89,7 +89,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // location
-      // 
+      //
       public:
       typedef ::std::vector< ::XMLSchema::string< char > >::iterator location_iterator;
       typedef ::std::vector< ::XMLSchema::string< char > >::const_iterator location_const_iterator;
@@ -103,7 +103,7 @@ namespace CIAO
       ::std::vector< ::XMLSchema::string< char > > location_;
 
       // execParameter
-      // 
+      //
       public:
       bool execParameter_p () const;
       ::CIAO::Config_Handlers::Property const& execParameter () const;
@@ -114,7 +114,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
 
       // deployRequirement
-      // 
+      //
       public:
       bool deployRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
@@ -125,7 +125,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // dependsOn
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator dependsOn_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator dependsOn_const_iterator;
@@ -139,7 +139,7 @@ namespace CIAO
       ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > dependsOn_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
@@ -150,7 +150,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
index 2b76f3cfdcc..94ad98b2f56 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "Basic_Deployment_Data.hpp"
 
@@ -31,7 +31,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< char > const& label () const;
@@ -42,7 +42,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< char > const& UUID () const;
@@ -53,7 +53,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< char > > UUID_;
 
       // basePackage
-      // 
+      //
       public:
       bool basePackage_p () const;
       ::CIAO::Config_Handlers::ComponentPackageDescription const& basePackage () const;
@@ -64,7 +64,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > basePackage_;
 
       // reference
-      // 
+      //
       public:
       bool reference_p () const;
       ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
@@ -75,7 +75,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
 
       // selectRequirement
-      // 
+      //
       public:
       bool selectRequirement_p () const;
       ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
@@ -86,7 +86,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -97,7 +97,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< char > const& contentLocation () const;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
index c2f860ea87f..2897d588609 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
@@ -14,8 +14,8 @@ namespace CIAO
 
 #include <memory>
 #include <vector>
-#include <XSCRT/XMLSchema.hpp>
-#include <XSCRT/Parser.hpp>
+#include "XSCRT/XMLSchema.hpp"
+#include "XSCRT/Parser.hpp"
 
 #include "pcd.hpp"
 
@@ -29,7 +29,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // package
-      // 
+      //
       public:
       typedef ::std::vector< ::CIAO::Config_Handlers::PackageConfiguration >::iterator package_iterator;
       typedef ::std::vector< ::CIAO::Config_Handlers::PackageConfiguration >::const_iterator package_const_iterator;
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
index c42e892081d..35d0d551668 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
@@ -4,10 +4,6 @@
 
 #include "ace/OS_NS_stdio.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Deployment_Configuration.inl"
-#endif /* __ACE_INLINE__ */
-
 const int NAME_BUFSIZE = 1024;
 
 CIAO::Deployment_Configuration::Deployment_Configuration (CORBA::ORB_ptr o)
@@ -106,7 +102,7 @@ CIAO::Deployment_Configuration::get_node_manager (const char *name
                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
-  return ::Deployment::NodeManager::_duplicate 
+  return ::Deployment::NodeManager::_duplicate
     (entry->int_id_.node_manager_.in ());
 }
 
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
index 3fe47051fcf..4c54851e94b 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
@@ -13,8 +13,6 @@
  *  @author Gan Deng <gan.deng@vanderbilt.edu>
  */
 //=============================================================================
-
-
 #ifndef CIAO_DEPLOYMENT_CONFIGURATION_H
 #define CIAO_DEPLOYMENT_CONFIGURATION_H
 #include /**/ "ace/pre.h"
@@ -26,9 +24,10 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "DeploymentC.h"
-
+#include "DomainApplicationManager/DomainApplicationManager_Export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
+#include "ace/SString.h"
 
 namespace CIAO
 {
@@ -47,7 +46,7 @@ namespace CIAO
    * strategy.  We can enhance this class later on to provide
    * different deployment location strategies, such as naming service.
    */
-  class Deployment_Configuration
+  class DomainApplicationManager_Export Deployment_Configuration
   {
   public:
     typedef struct _node_manager_info
@@ -125,9 +124,5 @@ namespace CIAO
 
 }
 
-#if defined (__ACE_INLINE__)
-# include "Deployment_Configuration.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* CIAO_DEPLOYMENT_CONFIGURATION_H */
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.inl b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
index 648a4e7d053..5e166ba1418 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project (DomainApplicationManager): taolib, ciao_deployment_stub, ciao_deployment_svnt {
+project (DomainApplicationManager): taolib, ciao_deployment_stub, ciao_deployment_svnt, valuetype, ifr_client {
   after += Config_Handlers Node_Daemon
-  
+
   sharedname = DomainApplicationManager
   dynamicflags   = DOMAINAPPLICATIONMANAGER_BUILD_DLL
-  libs += TAO_Valuetype CIAO_DnC_Client CIAO_DnC_Server TAO_IFR_Client
- 
+  libs += CIAO_DnC_Client CIAO_DnC_Server
+
   Source_Files {
     DomainApplicationManager_Impl.cpp
     Deployment_Configuration.cpp
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 7f07705f78a..483ba0cb483 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -1,9 +1,10 @@
 // $Id$
 
 #include "DomainApplicationManager_Impl.h"
+#include "NodeManager/NodeDaemonC.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
-#include "NodeManager/NodeDaemonC.h"
+#include "ace/SString.h"
 
 #if !defined (__ACE_INLINE__)
 # include "DomainApplicationManager_Impl.inl"
@@ -95,7 +96,7 @@ init (ACE_ENV_SINGLE_ARG_DECL)
           // corresponding child plan as input, which returns a
           // NodeApplicationManager object reference.
           Deployment::ApplicationManager_var tmp_app_manager =
-            my_node_manager->preparePlan (artifacts.child_plan_
+            my_node_manager->preparePlan (artifacts.child_plan_.in ()
                                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -394,7 +395,7 @@ startLaunch (const ::Deployment::Properties & configProperty,
           ACE_TRY_CHECK;
 
           // Cache the returned set of connections into the list.
-          this->add_connections (retn_connections);
+          this->add_connections (retn_connections.in ());
 
           // Cache the returned NodeApplication object reference into
           // the hash table.
@@ -443,7 +444,7 @@ finishLaunch (::CORBA::Boolean start
 
           // Get the Connections variable.
           Deployment::Connections * my_connections =
-            this->get_outgoing_connections ((entry->int_id_).child_plan_);
+            this->get_outgoing_connections ((entry->int_id_).child_plan_.in ());
 
           if (my_connections == 0)
             ACE_THROW (Deployment::StartError ());
@@ -579,7 +580,7 @@ destroyManager (ACE_ENV_SINGLE_ARG_DECL)
 
           ::Deployment::NodeManager_var my_node_manager =
              (entry->int_id_).node_manager_;
-          
+
           // Since we have the first arg is not used by NM anyway.
           my_node_manager->destroyManager (0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index 067cad1415d..36e9cdba2c1 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -15,10 +15,10 @@ project (ExecutionManager_stub): ciao_deployment_stub, ciao_server_dnc {
   }
 }
 
-project(Execution_Manager): ciao_server_dnc, ciao_deployment_svnt, ciao_deployment_stub, iortable, naming {
+project(Execution_Manager): ciao_server_dnc, ciao_deployment_svnt, ciao_deployment_stub, iortable, naming, ifr_client {
   exename = Execution_Manager
   after += DomainApplicationManager ExecutionManager_stub
-  libs += DomainApplicationManager ExecutionManager_stub TAO_IFR_Client
+  libs += DomainApplicationManager ExecutionManager_stub
 
   IDL_Files {
   }
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
index 1d009de77a6..306a1776971 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Synch.h"
+#include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 #include "tao/Utils/Servant_Var.h"
 #include "DomainApplicationManager/DomainApplicationManager_Impl.h"
diff --git a/TAO/CIAO/DAnCE/NEWS b/TAO/CIAO/DAnCE/NEWS
index 2a3e58cf995..9f5bc88bb06 100644
--- a/TAO/CIAO/DAnCE/NEWS
+++ b/TAO/CIAO/DAnCE/NEWS
@@ -1,47 +1,44 @@
-PLANNED MAJOR CHANGES TARGETED FOR DAnCE-0.4.3
+PLANNED MAJOR CHANGES TARGETED FOR DAnCE-0.4.5
 ====================================================
+ . Split the current NodeApplication entity into
+   ComponentServer(still bearing the name "NodeApplication" though)
+   and Container. (Gan)
+
+ . Allow colocated and non-colocated decisions within the schema
+   (Gan)
+
+ . Support for server-side RT policies, including extension for schema, container,
+   and NodeApplication.  Configuring client-side (receptacle) policies
+   to honor these server policies.  (Gan, Nanbor)
 
  . Convert C++ datastructures generated from XSC to IDL data types
-   defined in D+C. (Boris, Jules, Kitty)
+   defined in D+C. (Will, Jules)
      
  . Change spec defined IDL's for adding policies (Depends on last)
 
- . Attribute configuration, atleast the basic types. (Jules, Bala)
-
- . Support homeless component deployment (Low priority)
-
- . Allow colocated and non-colocated decisions within the schema
-   (Arvind)
-  
  . Add binding to the NameService (Gan Deng)
 
  . Connections to supported interfaces. 
 
- . Split the current NodeApplication entity into
-   ComponentServer(still bearing the name "NodeApplication" though)
-   and  Container. (Tao)
-
- . NodeApplication will be responsible for creating Containers for an
-   assembly. Atleast 1 per node application will be created to start
-   off.  (Tao)
-
  . Have more than one NodeApplicationManager within the NodeManager (Tao)
 
- . Event Channel Integration (Amogh Kavimandan)
+ . RT Event Channel Integration (Gan Deng)
 
- . Tools for dynamic replacement of components (Dr. Schmidt)
+ . Tools for dynamic replacement of components (Jai)
 
- . Thread pools and the like. (Bala and Nanbor).
+ . Thread pools and the like. (Nanbor and Gan).
 
  . Dependencies during deployment.
 
  . Static Configuration for DAnCE (??) 
 
- . Target Manager (Jai and Kitty)
-
- . Support for server-side RT policies, including extension for schema, container,
-   and NodeApplication.  Configuring client-side (receptacle) policies
-   to honor these server policies.  (Gan, Nanbor)
+ . Target Manager (Jai and Gan and Kitty)
 
  . Tools and utilities for developing and debugging components and
-   applications. (low prio.)
+   applications. (Kitty)
+
+ . Support adding attribute values on Component through XML and
+   DAnCE configurator. (Gan and Kitty)
+
+ . Support parsing XML descriptors which describes the hierarchical
+   assembly of components model. (Ming Xiong)
\ No newline at end of file
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index e4710977c72..9f5f2f12dec 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -3,6 +3,7 @@
 #define CIAO_IMPLEMENTATION_INFO_C
 
 #include "ImplementationInfo.h"
+#include "ace/SString.h"
 
 // Specialized operation that we will use for now.
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 86ef0881fa8..0aaea995377 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -89,6 +89,7 @@ CIAO::NodeApplicationManager_Impl::
 create_node_application (const ACE_CString & options
                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::ResourceNotAvailable,
                    Deployment::StartError,
                    Deployment::InvalidProperty))
 {
@@ -107,7 +108,7 @@ create_node_application (const ACE_CString & options
                                                     this->callback_poa_.in (),
                                                     this->objref_.in (),
                                                     prop.in ()),
-                                                    CORBA::INTERNAL ());
+                                                    CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
 
   PortableServer::ServantBase_var servant_var (callback_servant);
@@ -149,8 +150,7 @@ create_node_application (const ACE_CString & options
         {
           if (CIAO::debug_level () > 1)
             ACE_DEBUG ((LM_ERROR, "Fail to spawn a NodeApplication process\n"));
-
-          ACE_TRY_THROW (Components::CreateFailure ());
+          ACE_TRY_THROW (Deployment::ResourceNotAvailable ());
         }
 
       // wait for nodeApp to pass back its object reference. with a
@@ -177,7 +177,7 @@ create_node_application (const ACE_CString & options
           if (CIAO::debug_level () > 1)
             ACE_DEBUG ((LM_ERROR, "Fail to acquire the NodeApplication object\n"));
 
-          ACE_TRY_THROW (Components::CreateFailure ());
+          ACE_TRY_THROW (Deployment::ResourceNotAvailable ());
         }
 
       {
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index ab95755a924..1da9f624d32 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -28,6 +28,8 @@
 #include "ciao/NodeApp_CB_Impl.h"
 #include "ImplementationInfo.h"
 #include "ciao/CIAO_common.h"
+#include "ace/SString.h"
+
 
 namespace CIAO
 {
@@ -109,6 +111,7 @@ namespace CIAO
     create_node_application (const ACE_CString & options
                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
+                       Deployment::ResourceNotAvailable,
                        Deployment::StartError,
                        Deployment::InvalidProperty));
 
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon.mpc
index 1d1ba443463..e3e6e3bac78 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon.mpc
@@ -1,24 +1,23 @@
 // -*- MPC -*-
 // $Id$
 
-project (NodeDaemon_stub): ciao_deployment_stub, ciao_server_dnc {
+project (NodeDaemon_stub): ciao_deployment_stub, ciao_server_dnc, ifr_client {
   sharedname = NodeDaemon_stub
   idlflags += -Wb,stub_export_macro=NodeDaemon_stub_Export -Wb,stub_export_include=NodeDaemon_stub_export.h
   dynamicflags = NODEDAEMON_STUB_BUILD_DLL
-                                                                
-  libs += TAO_IFR_Client                                                                                       
+
   IDL_Files {
    NodeDaemon.idl
   }
-                                                                                                                                                        
+
   Source_Files {
    NodeDaemonC.cpp
   }
 }
 
-project(Node_Daemon): ciao_deployment_stub, ciao_deployment_svnt, ciao_server_dnc, iortable, naming {
+project(Node_Daemon): ciao_deployment_stub, ciao_deployment_svnt, ciao_server_dnc, iortable, ifr_client, naming {
   after += NodeApplicationManager NodeDaemon_stub
-  libs += NodeDaemon_stub NodeApplicationManager TAO_IFR_Client
+  libs += NodeDaemon_stub NodeApplicationManager
   exename = Node_Daemon
 
   IDL_Files {
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
index 0209fa2ac5e..2909e3da5d0 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -1,14 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(Repository_Manager): ciao_server_dnc,ciao_deployment_svnt, ciao_deployment_stub, taoexe {
+project(Repository_Manager): ciao_server_dnc,ciao_deployment_svnt, ciao_deployment_stub, taoexe, xerces {
   exename = executor
   requires += exceptions
   after += Config_Handlers ExecutionManager_stub NodeDaemon_stub
-  macros   += XML_USE_PTHREADS
-  includes += /usr/include $(XERCESCROOT)/include
-  libpaths += /usr/lib $(XERCESCROOT)/lib
-  libs     += xerces-c Config_Handlers NodeDaemon_stub 
+  includes += /usr/include
+  libpaths += /usr/lib
+  libs     += Config_Handlers NodeDaemon_stub
   libs     += ExecutionManager_stub CIAO_DnC_Server
   after    += Config_Handlers
 
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index fa5b840ef43..c9e9a588adf 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -48,14 +48,14 @@ installPackage (const char* installation_name,
     {
       CIAO::Config_Handler::Config_Error_Handler tpd_err_handler;
       CIAO::Config_Handler::Config_Error_Handler pc_err_handler;
-      std::auto_ptr<DOMBuilder> tpd_parser (CIAO::Config_Handler::Utils::
-                                            create_parser ());
+      auto_ptr<DOMBuilder> tpd_parser (CIAO::Config_Handler::Utils::
+                                       create_parser ());
       tpd_parser->setErrorHandler(&tpd_err_handler);
       DOMDocument* tpd_doc = tpd_parser->parseURI (location);
 
       if (tpd_err_handler.getErrors())
         {
-          throw DOMException ();
+          throw Deployment::PackageError ();
         }
 
       CIAO::Config_Handler::TPD_Handler top_pc_handler
@@ -65,14 +65,14 @@ installPackage (const char* installation_name,
       ACE_TString package_location = top_pc_handler.
           process_TopLevelPackageDescription ();
 
-      std::auto_ptr<DOMBuilder> pc_parser (CIAO::Config_Handler::Utils::
-                                           create_parser ());
+      auto_ptr<DOMBuilder> pc_parser (CIAO::Config_Handler::Utils::
+                                      create_parser ());
       pc_parser->setErrorHandler(&pc_err_handler);
       DOMDocument* pc_doc = pc_parser->parseURI (package_location.c_str());
 
       if (pc_err_handler.getErrors())
         {
-          throw DOMException ();
+          throw Deployment::PackageError ();
         }
 
       CIAO::Config_Handler::PC_Handler pc_handler (pc_doc,
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
index 4605a1ea41b..b6406da05e2 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
@@ -7,6 +7,7 @@
 #include "NodeManager/NodeDaemonC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/streams.h"
+#include "ace/Auto_Ptr.h"
 using namespace std;
 
 const char * exec_ior = "file://exec_mgr.ior";
@@ -88,19 +89,24 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   try
     {
       // get a reference to the parser.
-      std::auto_ptr<DOMBuilder> plan_parser (CIAO::Config_Handler::Utils::
-                                             create_parser ());
+      auto_ptr<DOMBuilder> plan_parser (
+          CIAO::Config_Handler::Utils::create_parser ()
+        );
+        
       CIAO::Config_Handler::Config_Error_Handler handler;
       plan_parser->setErrorHandler(&handler);
 
-      std::auto_ptr<DOMBuilder> tpd_parser (CIAO::Config_Handler::Utils::
-                                            create_parser ());
+      auto_ptr<DOMBuilder> tpd_parser (
+          CIAO::Config_Handler::Utils::create_parser ()
+        );
+
       CIAO::Config_Handler::Config_Error_Handler tpd_handler;
       tpd_parser->setErrorHandler(&tpd_handler);
 
       // use the parser to parse the deployment plan URL and create
       // a DOM document.
       DOMDocument* plan_doc = plan_parser->parseURI (plan_url);
+      
       if (handler.getErrors())
         {
           return 1;
@@ -126,9 +132,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       //auto_ptr<DOMBuilder> cleanup_parser (parser);
 
       // call the Deployment Plan handler to parse the XML descriptor.
-      CIAO::Config_Handler::Plan_Handler plan_handler (plan_doc,
-                                                  DOMNodeFilter::SHOW_ELEMENT |
-                                                  DOMNodeFilter::SHOW_TEXT);
+      CIAO::Config_Handler::Plan_Handler plan_handler (
+          plan_doc,
+          DOMNodeFilter::SHOW_ELEMENT | DOMNodeFilter::SHOW_TEXT
+        );
+        
       Deployment::DeploymentPlan plan;
       plan_handler.process_plan (plan);
 
@@ -158,11 +166,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Deployment Process.
 
       CORBA::Object_var obj = orb->string_to_object (exec_ior
-                                                ACE_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CIAO::ExecutionManagerDaemon_var exec_mgr =
-        CIAO::ExecutionManagerDaemon::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+        CIAO::ExecutionManagerDaemon::_narrow (obj.in ()
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (exec_mgr.in ()))
@@ -177,9 +186,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CIAO::NodeDaemon_var node_mgr;
       if (node_daemon_ior != 0)
       {
-        CORBA::Object_var node_mgr_obj = orb->string_to_object
-                                                 (node_daemon_ior
-                                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var node_mgr_obj = 
+          orb->string_to_object (node_daemon_ior
+                                 ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         node_mgr =
@@ -259,7 +268,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   catch (CORBA::Exception& ex)
     {
       ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
-      while (true);
       return -1;
     }
   catch (const DOMException& e)
@@ -278,13 +286,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
       //ACE_PRINT_EXCEPTION ("Caught DOM Exception: ");
       ACE_ERROR ((LM_ERROR, "Caught DOM exception\n"));
-      while (true);
       return -1;
     }
   catch (...)
     {
       ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
-      while (true);
       return -1;
     }
 
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
index f8f16019b95..9fa5cf18fce 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
@@ -24,6 +24,7 @@ namespace CIAO
     // traverse the package configuration structure to get to the
     // BasePackage which consists of assemblies.
     //
+    REF_MAP plan_ref_map;
     CORBA::ULong bp_len =
       pc->basePackage.length ();
 
@@ -54,7 +55,8 @@ namespace CIAO
                 //
                 // traverse the individual assembly.
                 //
-                traverse_assembly (assembly, plan, ref_map, primary_ref_map);
+                traverse_assembly (assembly, plan, ref_map, primary_ref_map,
+                                   plan_ref_map);
               }
           }
       }
@@ -63,7 +65,8 @@ namespace CIAO
   void
   traverse_assembly (ComponentAssemblyDescription &assembly,
                      DeploymentPlan &plan,
-                     REF_MAP &ref_map, REF_MAP &primary_ref_map)
+                     REF_MAP &ref_map, REF_MAP &primary_ref_map,
+                     REF_MAP &plan_ref_map)
   {
     // traverse the assembly (ComponentAssemblyDescription) and
     // processes the instances and the connection within the assembly.
@@ -84,7 +87,8 @@ namespace CIAO
           if (strcmp (plan_name, in_name) == 0)
             {
               traverse_assembly_instance (ins, plan, l,
-                                          ref_map, primary_ref_map);
+                                          ref_map, primary_ref_map,
+                                          plan_ref_map);
             }
         }
       }
@@ -183,7 +187,8 @@ namespace CIAO
                               SubcomponentInstantiationDescription
                               &instance,
                               DeploymentPlan &plan, int l,
-                              REF_MAP &ref_map, REF_MAP &primary_ref_map)
+                              REF_MAP &ref_map, REF_MAP &primary_ref_map,
+                              REF_MAP &plan_ref_map)
   {
     // Each instance has a package.
     //   Each package has an implementation and their correspoding artifacts.
@@ -217,7 +222,8 @@ namespace CIAO
                   mid = impl.referencedImplementation.monolithicImpl[p];
 
                 update_artifacts (mid, plan, plan.instance[l],
-                                ref_map, primary_ref_map, art_ref_map,
+                                  ref_map, primary_ref_map, art_ref_map,
+                                  plan_ref_map,
                                   plan.implementation[impl_length]);
               }
             update_impl_config_property (impl, plan.implementation[impl_length],
@@ -232,8 +238,12 @@ namespace CIAO
                     InstanceDeploymentDescription &instance,
                     REF_MAP &ref_map, REF_MAP &primary_ref_map,
                     ART_REF_MAP &art_ref_map,
+                    REF_MAP &plan_ref_map,
                     MonolithicDeploymentDescription &mdd)
   {
+    ref_map.unbind_all ();
+    primary_ref_map.unbind_all ();
+    art_ref_map.unbind_all ();
     CORBA::ULong prim_art_len = mid.primaryArtifact.length ();
     for (CORBA::ULong q = 0; q < prim_art_len; ++q)
       {
@@ -241,26 +251,44 @@ namespace CIAO
           pack_iad = mid.primaryArtifact[q].referencedArtifact;
         ACE_TString artifact_name = (const char*)mid.primaryArtifact[q].name;
         int arti_len;
+        int plan_arti_len;
         CORBA::ULong art_length (plan.artifact.length ());
 
         if (ref_map.find (artifact_name, arti_len) != 0)
           {
-            plan.artifact.length (art_length + 1);
-            plan.artifact[art_length].name = mid.primaryArtifact[q].name;
-            plan.artifact[art_length].node = instance.node;
-            ref_map.bind (artifact_name, art_length);
-            primary_ref_map.bind (artifact_name, art_length);
-            CORBA::ULong art_ref_len (mdd.artifactRef.length ());
-            mdd.artifactRef.length (art_ref_len + 1);
-            mdd.artifactRef[art_ref_len] = art_length;
-            update_artifact_location (pack_iad,
-                                    plan.artifact[art_length]);
-            update_artifact_property (pack_iad,
-                                      plan.artifact[art_length]);
+            if (plan_ref_map.find (artifact_name, plan_arti_len) != 0)
+              {
+                plan.artifact.length (art_length + 1);
+                plan.artifact[art_length].name = mid.primaryArtifact[q].name;
+                plan.artifact[art_length].node = instance.node;
+                ref_map.bind (artifact_name, art_length);
+                plan_ref_map.bind (artifact_name, art_length);
+                primary_ref_map.bind (artifact_name, art_length);
+                CORBA::ULong art_ref_len (mdd.artifactRef.length ());
+                mdd.artifactRef.length (art_ref_len + 1);
+                mdd.artifactRef[art_ref_len] = art_length;
+                update_artifact_location (pack_iad,
+                                          plan.artifact[art_length]);
+                update_artifact_property (pack_iad,
+                                          plan.artifact[art_length]);
+              }
+            else
+              {
+                art_length = plan_arti_len;
+                ref_map.bind (artifact_name, art_length);
+                primary_ref_map.bind (artifact_name, art_length);
+                CORBA::ULong art_ref_len (mdd.artifactRef.length ());
+                mdd.artifactRef.length (art_ref_len + 1);
+                mdd.artifactRef[art_ref_len] = art_length;
+                update_artifact_location (pack_iad,
+                                          plan.artifact[art_length]);
+                update_artifact_property (pack_iad,
+                                          plan.artifact[art_length]);
+              }
           }
         update_common_artifact_and_art_ref (pack_iad,
                                             primary_ref_map, ref_map,
-                                          art_ref_map, mdd,
+                                            art_ref_map, plan_ref_map, mdd,
                                             plan, instance);
       }
   }
@@ -272,19 +300,20 @@ namespace CIAO
                                       REF_MAP &primary_ref_map,
                                       REF_MAP &ref_map,
                                       ART_REF_MAP &art_ref_map,
-
+                                      REF_MAP &plan_ref_map,
                                       MonolithicDeploymentDescription &mid,
                                       DeploymentPlan &plan,
-
-                                         InstanceDeploymentDescription
-                                         &instance)
+                                      InstanceDeploymentDescription
+                                      &instance)
   {
+    int plan_arti_len;
+    int arti_len;
+    CORBA::ULong new_art_length;
     CORBA::ULong deps_len = pack_iad.dependsOn.length ();
     for (CORBA::ULong g = 0; g < deps_len; ++g)
       {
         ACE_TString dep_name =
           (const char*)pack_iad.dependsOn[g].name;
-        int arti_len;
 
         if (ref_map.find (dep_name, arti_len) == 0)
           {
@@ -302,19 +331,34 @@ namespace CIAO
             ImplementationArtifactDescription
               depends_iad = pack_iad.dependsOn[g].
               referencedArtifact;
-            CORBA::ULong new_art_length (plan.artifact.length ());
-            plan.artifact.length (new_art_length + 1);
-            plan.artifact[new_art_length].name =
-              pack_iad.dependsOn[g].name;
-            plan.artifact[new_art_length].node = instance.node;
-            update_artifact_location (depends_iad,
-                                      plan.artifact
-                                      [new_art_length]);
-            ref_map.bind (
-                          (const char*)plan.artifact[new_art_length].name,
-                          new_art_length);
-            update_impl_art_ref (mid, new_art_length);
-            art_ref_map.bind (new_art_length, new_art_length);
+            if (plan_ref_map.find (dep_name, plan_arti_len) != 0)
+              {
+                new_art_length = plan.artifact.length ();
+                plan.artifact.length (new_art_length + 1);
+                plan.artifact[new_art_length].name =
+                  pack_iad.dependsOn[g].name;
+                plan.artifact[new_art_length].node = instance.node;
+                update_artifact_location (depends_iad,
+                                          plan.artifact
+                                          [new_art_length]);
+                ref_map.bind (
+                              (const char*)plan.artifact[new_art_length].name,
+                              new_art_length);
+                plan_ref_map.bind (
+                              (const char*)plan.artifact[new_art_length].name,
+                              new_art_length);
+                update_impl_art_ref (mid, new_art_length);
+                art_ref_map.bind (new_art_length, new_art_length);
+              }
+            else
+              {
+                new_art_length = plan_arti_len;
+                ref_map.bind (
+                              (const char*)plan.artifact[new_art_length].name,
+                              new_art_length);
+                update_impl_art_ref (mid, new_art_length);
+                art_ref_map.bind (new_art_length, new_art_length);
+              }
           }
       }
   }
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
index 3a67955bd2f..347330e09fe 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
@@ -46,11 +46,13 @@ namespace CIAO
                               Deployment::DeploymentPlan &plan,
                               int l,
                               REF_MAP &ref_map,
-                              REF_MAP &primary_ref_map);
+                              REF_MAP &primary_ref_map,
+                              REF_MAP &plan_ref_map);
 
   void traverse_assembly (Deployment::ComponentAssemblyDescription &assembly,
                           Deployment::DeploymentPlan &plan,
-                          REF_MAP &ref_map, REF_MAP &primary_ref_map);
+                          REF_MAP &ref_map, REF_MAP &primary_ref_map,
+                          REF_MAP &plan_ref_map);
 
   void traverse_interface (Deployment::SubcomponentInstantiationDescription
                            &instance,
@@ -72,6 +74,7 @@ namespace CIAO
                          Deployment::InstanceDeploymentDescription &instance,
                          REF_MAP &ref_map, REF_MAP &primary_ref_map,
                          ART_REF_MAP &art_ref_map,
+                         REF_MAP &plan_ref_map,
                          Deployment::MonolithicDeploymentDescription &mdd);
 
   void update_artifact_location (Deployment::ImplementationArtifactDescription
@@ -100,6 +103,7 @@ namespace CIAO
                                            REF_MAP &primary_ref_map,
                                            REF_MAP &ref_map,
                                            ART_REF_MAP &art_ref_map,
+                                           REF_MAP &plan_ref_map,
                                            Deployment::MonolithicDeploymentDescription
                                            &mid,
                                            Deployment::DeploymentPlan &plan,
diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
index 6e775812619..30b974517ad 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
@@ -8,6 +8,9 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   idlflags  += -Wb,skel_export_include=CIAO_Container_Export.h
   idlflags  += -Wb,skel_export_macro=CIAO_CONTAINER_Export
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)/DAnCE
+    
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
   IDL_Files {
@@ -39,6 +42,9 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)/DAnCE
+
   IDL_Files {
     CCM_Transaction.idl
     CosPersistentState.idl
@@ -65,6 +71,11 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client {
   sharedname   =  CIAO_Deployment_stub
   after        += CIAO_DnC_Client
 
+  libs += CIAO_DnC_Client
+
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)/DAnCE
+
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
   idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
   idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
@@ -91,7 +102,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client {
 
 // CIAO_DnC_Client library must be linked for this project.
 // Please don't remove.
-project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype,ifr_client {
+project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client {
   after        += Deployment_stub
   sharedname   =  CIAO_Deployment_svnt
   dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
@@ -101,6 +112,9 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype,ifr_client
   idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
   idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)/DAnCE
+
   IDL_Files {
   }
 
@@ -130,8 +144,10 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, ifr_client, u
   Source_Files {
     Container_Base.cpp
     NodeApplication_Impl.cpp
-    Server_init.cpp
+    Context_Impl_Base.cpp
+    Home_Servant_Impl_Base.cpp
     Servant_Impl_Base.cpp
+    Server_init.cpp
     Servant_Activator.cpp
     Port_Activator.cpp
     StandardConfigurator_Impl.cpp
@@ -140,11 +156,13 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, ifr_client, u
   Header_Files {
     CIAO_Server_Export.h
     CIAO_common.h
-    StandardConfigurator_Impl.h
   }
 
   Template_Files {
+    Context_Impl_T.cpp
+    Home_Servant_Impl_T.cpp
     Servant_Impl_T.cpp
+    Servant_Activator_T.cpp
   }
 }
 
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
index f1fce5ec95f..7a9124c4b95 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
@@ -5,6 +5,7 @@
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "ace/OS_NS_stdio.h"
 #include "Servant_Activator.h"
+#include "ace/SString.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Container_Base.inl"
diff --git a/TAO/CIAO/DAnCE/ciao/Deployment.idl b/TAO/CIAO/DAnCE/ciao/Deployment.idl
index c046e73facb..def2bbf2624 100644
--- a/TAO/CIAO/DAnCE/ciao/Deployment.idl
+++ b/TAO/CIAO/DAnCE/ciao/Deployment.idl
@@ -93,7 +93,7 @@ module Deployment {
   };
 
   interface NodeManager {
-    void joinDomain (in Domain domain, in TargetManager manager, in Logger log);
+    void joinDomain (in Domain ciao_domain, in TargetManager manager, in Logger log);
     void leaveDomain ();
     NodeApplicationManager preparePlan (in DeploymentPlan plan)
       raises (StartError, PlanError);
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index 5c8c4fcf553..a9299ce1d54 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -1,6 +1,7 @@
 //$Id$
 
 #include "NodeApplication_Impl.h"
+#include "ace/SString.h"
 
 #if !defined (__ACE_INLINE__)
 # include "NodeApplication_Impl.inl"
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h
index 64e497f2fdb..9925f18f285 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h
@@ -22,6 +22,7 @@
 #include "tao/ORB.h"
 #include "ace/Synch.h"
 #include "ace/Synch_Traits.h"
+#include "ace/SString.h"
 #include "Container_Base.h"
 #include "Deployment_CoreS.h"
 #include "Server_init.h"
diff --git a/TAO/CIAO/DAnCE/ciao/Port_Activator_T.cpp b/TAO/CIAO/DAnCE/ciao/Port_Activator_T.cpp
index f2832290731..20b083496ef 100644
--- a/TAO/CIAO/DAnCE/ciao/Port_Activator_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Port_Activator_T.cpp
@@ -5,6 +5,9 @@
 #include "Port_Activator_T.h"
 #include "tao/CORBA_String.h"
 
+#include "ace/OS_NS_string.h"
+
+
 namespace CIAO
 {
   template <typename SERV,
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp
index 4f6dce18a5c..03899555bfd 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Activator.cpp
@@ -56,7 +56,7 @@ namespace CIAO
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         guard,
                         this->mutex_,
-                        false);
+                        0);
 
       const unsigned int sz = this->slot_index_;
 
@@ -95,7 +95,7 @@ namespace CIAO
                                   PortableServer::Servant ,
                                   CORBA::Boolean ,
                                   CORBA::Boolean
-                                  ACE_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /// Need to investigate what needs to be handled here..
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Activator.h b/TAO/CIAO/DAnCE/ciao/Servant_Activator.h
index 4b4fbf65130..a9f75028a67 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Activator.h
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Activator.h
@@ -25,9 +25,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -100,5 +98,9 @@ namespace CIAO
   };
 }
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #include /**/ "ace/post.h"
 #endif /*CIAO_SERVANT_ACTIVATOR_H*/
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
index 38976b397a3..b19a5de1f95 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
-
-
 #include "Servant_Impl_Base.h"
 #include "StandardConfigurator_Impl.h"
 #include "Container_Base.h"
 
 namespace CIAO
 {
+  Servant_Impl_Base::Servant_Impl_Base (void)
+  {
+    ACE_ASSERT (0);
+  }
+
   Servant_Impl_Base::Servant_Impl_Base (Session_Container * c)
     : container_ (c)
   {
@@ -17,6 +20,347 @@ namespace CIAO
   {
   }
 
+  // Operations for CCMObject interface.
+
+  ::Components::PrimaryKeyBase *
+  Servant_Impl_Base::get_primary_key (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     ::Components::NoKeyAvailable))
+  {
+    ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
+
+    return 0;
+  }
+
+  CORBA::IRObject_ptr
+  Servant_Impl_Base::get_component_def (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
+                      CORBA::IRObject::_nil ());
+  }
+
+  void
+  Servant_Impl_Base::configuration_complete (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidConfiguration))
+  {
+    // CIAO to-do
+  }
+
+  void
+  Servant_Impl_Base::remove (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::RemoveFailure))
+  {
+    // CIAO to-do
+  }
+
+  ::Components::ConnectionDescriptions *
+  Servant_Impl_Base::get_connections (
+      const char * /* name */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::ComponentPortDescription *
+  Servant_Impl_Base::get_all_ports (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    OBV_Components::ComponentPortDescription *cps = 0;
+    ACE_NEW_RETURN (cps,
+                    OBV_Components::ComponentPortDescription,
+                    0);
+    ::Components::ComponentPortDescription_var retv = cps;
+
+    ::Components::FacetDescriptions_var facets_desc =
+      this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    ::Components::ReceptacleDescriptions_var receptacle_desc =
+      this->get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    ::Components::ConsumerDescriptions_var consumer_desc =
+      this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    ::Components::EmitterDescriptions_var emitter_desc =
+      this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    ::Components::PublisherDescriptions_var publisher_desc =
+      this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    retv->facets (facets_desc.in ());
+    retv->receptacles (receptacle_desc.in ());
+    retv->consumers (consumer_desc.in ());
+    retv->emitters (emitter_desc.in ());
+    retv->publishers (publisher_desc.in ());
+
+    return retv._retn ();
+  }
+
+  CORBA::Object_ptr
+  Servant_Impl_Base::provide_facet (
+      const char *name
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    if (name == 0)
+      {
+        ACE_THROW_RETURN (Components::InvalidName (),
+                          CORBA::Object::_nil ());
+      }
+
+    CORBA::Object_ptr retval = this->lookup_facet (name);
+
+    if (CORBA::is_nil (retval))
+      {
+        ACE_THROW_RETURN (Components::InvalidName (),
+                          CORBA::Object::_nil ());
+      }
+
+    return retval;
+  }
+
+  Components::FacetDescriptions *
+  Servant_Impl_Base::get_named_facets (
+      const ::Components::NameList & names
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    Components::FacetDescriptions *retval = 0;
+    ACE_NEW_RETURN (retval,
+                    ::Components::FacetDescriptions,
+                    0);
+    Components::FacetDescriptions_var safe_retval = retval;
+    CORBA::ULong len = names.length ();
+    safe_retval->length (len);
+    ::Components::FacetDescription *tmp = 0;
+
+    for (CORBA::ULong i = 0; i < len; ++i)
+      {
+        tmp = this->lookup_facet_description (names[i].in ());
+
+        if (tmp == 0)
+          {
+            ACE_THROW_RETURN (Components::InvalidName (),
+                              0);
+          }
+
+        safe_retval[i] = tmp;
+      }
+
+    return safe_retval._retn ();
+  }
+
+  ::Components::FacetDescriptions *
+  Servant_Impl_Base::get_all_facets (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ::Components::FacetDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::FacetDescriptions,
+                    0);
+
+    ::Components::FacetDescriptions_var retval = tmp;
+
+    retval->length (this->facet_table_.current_size ());
+    CORBA::ULong i = 0;
+
+    for (FacetTable::iterator iter = this->facet_table_.begin ();
+         iter != this->facet_table_.end ();
+         ++iter, ++i)
+      {
+        FacetTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
+      }
+
+    return retval._retn ();
+  }
+
+  ::Components::ConsumerDescriptions *
+  Servant_Impl_Base::get_all_consumers (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ::Components::ConsumerDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::ConsumerDescriptions,
+                    0);
+
+    ::Components::ConsumerDescriptions_var retval = tmp;
+
+    retval->length (this->consumer_table_.current_size ());
+    CORBA::ULong i = 0;
+
+    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
+         iter != this->consumer_table_.end ();
+         ++iter, ++i)
+      {
+        ConsumerTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
+      }
+
+    return retval._retn ();
+  }
+
+  ::Components::EventConsumerBase_ptr
+  Servant_Impl_Base::get_consumer (
+      const char *sink_name
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    if (sink_name == 0)
+      {
+        ACE_THROW_RETURN (Components::InvalidName (),
+                          Components::EventConsumerBase::_nil ());
+      }
+
+    Components::EventConsumerBase_ptr retval =
+      this->lookup_consumer (sink_name);
+
+    if (CORBA::is_nil (retval))
+      {
+        ACE_THROW_RETURN (Components::InvalidName (),
+                          Components::EventConsumerBase::_nil ());
+      }
+
+    return retval;
+  }
+
+  ::Components::EventConsumerBase_ptr
+  Servant_Impl_Base::disconnect_consumer (
+      const char * /* source_name */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName,
+                     Components::NoConnection))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::ConsumerDescriptions *
+  Servant_Impl_Base::get_named_consumers (
+      const ::Components::NameList & names
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    Components::ConsumerDescriptions *retval = 0;
+    ACE_NEW_RETURN (retval,
+                    ::Components::ConsumerDescriptions,
+                    0);
+    Components::ConsumerDescriptions_var safe_retval = retval;
+    CORBA::ULong len = names.length ();
+    safe_retval->length (len);
+    ::Components::ConsumerDescription *tmp = 0;
+
+    for (CORBA::ULong i = 0; i < len; ++i)
+      {
+        tmp = this->lookup_consumer_description (names[i].in ());
+
+        if (tmp == 0)
+          {
+            ACE_THROW_RETURN (Components::InvalidName (),
+                              0);
+          }
+
+        safe_retval[i] = tmp;
+      }
+
+    return safe_retval._retn ();
+  }
+
+  ::Components::EmitterDescriptions *
+  Servant_Impl_Base::get_all_emitters (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::EmitterDescriptions *
+  Servant_Impl_Base::get_named_emitters (
+      const ::Components::NameList & /* names */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::ReceptacleDescriptions *
+  Servant_Impl_Base::get_all_receptacles (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::ReceptacleDescriptions *
+  Servant_Impl_Base::get_named_receptacles (
+      const ::Components::NameList & /* names */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::PublisherDescriptions *
+  Servant_Impl_Base::get_all_publishers (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::PublisherDescriptions *
+  Servant_Impl_Base::get_named_publishers (
+      const ::Components::NameList & /* names */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  /// Protected operations.
+
   void
   Servant_Impl_Base::add_facet (const char *port_name,
                                 CORBA::Object_ptr port_ref)
@@ -40,15 +384,28 @@ namespace CIAO
   Servant_Impl_Base::lookup_facet (const char *port_name)
   {
     ::Components::FacetDescription_var fd;
-    
+
     if (this->facet_table_.find (port_name, fd) != 0)
       {
         return CORBA::Object::_nil ();
       }
-      
+
     return CORBA::Object::_duplicate (fd.in ()->facet_ref ());
   }
 
+  ::Components::FacetDescription *
+  Servant_Impl_Base::lookup_facet_description (const char *port_name)
+  {
+    ::Components::FacetDescription_var fd;
+
+    if (this->facet_table_.find (port_name, fd) != 0)
+      {
+        return 0;
+      }
+
+    return fd._retn ();
+  }
+
   void
   Servant_Impl_Base::add_consumer (
       const char *port_name,
@@ -74,21 +431,36 @@ namespace CIAO
   Servant_Impl_Base::lookup_consumer (const char *port_name)
   {
     ::Components::ConsumerDescription_var cd;
-    
+
     if (this->consumer_table_.find (port_name, cd) != 0)
       {
         return ::Components::EventConsumerBase::_nil ();
       }
-      
+
     return
       ::Components::EventConsumerBase::_duplicate (cd.in ()->consumer ());
   }
 
+  ::Components::ConsumerDescription *
+  Servant_Impl_Base::lookup_consumer_description (
+      const char *port_name
+    )
+  {
+    ::Components::ConsumerDescription_var cd;
+
+    if (this->consumer_table_.find (port_name, cd) != 0)
+      {
+        return 0;
+      }
+
+    return cd._retn ();
+  }
+
   Components::StandardConfigurator*
   Servant_Impl_Base::get_standard_configurator (
     ACE_ENV_SINGLE_ARG_DECL)
   {
-    //create the configurator servant
+    // Create the configurator servant.
     StandardConfigurator_Impl *config_impl = 0;
 
     ACE_NEW_THROW_EX (config_impl,
@@ -103,12 +475,10 @@ namespace CIAO
     return configurator._retn ();
   }
 
-
   PortableServer::POA_ptr
   Servant_Impl_Base::_default_POA (
         ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   {
-
     return
       PortableServer::POA::_duplicate (container_->the_POA ());
   }
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
index f3b5a693d17..67b736d99b2 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.h
@@ -42,22 +42,125 @@ namespace CIAO
    * Servant_Impl.
    */
   class CIAO_SERVER_Export Servant_Impl_Base
+    : public virtual POA_Components::CCMObject
   {
   public:
+    explicit Servant_Impl_Base (void);
+
     Servant_Impl_Base (Session_Container * c);
 
     virtual ~Servant_Impl_Base (void);
 
+    /// Operations for CCMObject interface.
+
+    virtual ::Components::PrimaryKeyBase *
+    get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::NoKeyAvailable));
+
+    virtual CORBA::IRObject_ptr
+    get_component_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual void
+    configuration_complete (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidConfiguration));
+
+    virtual void
+    remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::RemoveFailure));
+
+    virtual ::Components::ConnectionDescriptions *
+    get_connections (const char *name
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::ComponentPortDescription *
+    get_all_ports (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual CORBA::Object_ptr
+    provide_facet (const char *name
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::FacetDescriptions *
+    get_named_facets (const ::Components::NameList & names
+                        ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::FacetDescriptions *
+    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::ConsumerDescriptions *
+    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::EventConsumerBase_ptr
+    get_consumer (const char *sink_name
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::EventConsumerBase_ptr
+    disconnect_consumer (const char *source_name
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName,
+                       Components::NoConnection));
+
+    virtual ::Components::ConsumerDescriptions *
+    get_named_consumers (const ::Components::NameList & names
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::EmitterDescriptions *
+    get_all_emitters (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::EmitterDescriptions *
+    get_named_emitters (const ::Components::NameList & /* names */
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::ReceptacleDescriptions *
+    get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::ReceptacleDescriptions *
+    get_named_receptacles (const ::Components::NameList & /* names */
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::PublisherDescriptions *
+    get_all_publishers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::PublisherDescriptions *
+    get_named_publishers (const ::Components::NameList & names
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
     /// Operation to set attributes on the component.
     virtual void set_attributes (const Components::ConfigValues &descr
                                  ACE_ENV_ARG_DECL) = 0;
 
-    //Creates and returns the StandardConfigurator for the component
+    // Creates and returns the StandardConfigurator for the component.
     virtual Components::StandardConfigurator *get_standard_configurator (
         ACE_ENV_SINGLE_ARG_DECL
       );
 
-        /// Override that returns the (passed-in) default POA of our member
+    /// Override that returns the (passed-in) default POA of our member
     /// component's container, to ensure that we get registered
     /// to that POA when _this() is called.
     virtual PortableServer::POA_ptr _default_POA (
@@ -70,13 +173,21 @@ namespace CIAO
 
     CORBA::Object_ptr lookup_facet (const char *port_name);
 
+    ::Components::FacetDescription *lookup_facet_description (
+        const char *port_name
+      );
+
     void add_consumer (const char *port_name,
                        ::Components::EventConsumerBase_ptr port_ref);
-                       
+
     ::Components::EventConsumerBase_ptr lookup_consumer (
         const char *port_name
       );
-                       
+
+    ::Components::ConsumerDescription *lookup_consumer_description (
+        const char *port_name
+      );
+
   protected:
     typedef ACE_Hash_Map_Manager_Ex<const char *,
                                     ::Components::FacetDescription_var,
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
index 7bee9698885..4e39010461f 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.cpp
@@ -48,67 +48,7 @@ namespace CIAO
     this->context_->_remove_ref ();
   }
 
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  ::Components::FacetDescriptions *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_facets (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::FacetDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::FacetDescriptions,
-                    0);
-
-    ::Components::FacetDescriptions_var retval = tmp;
-
-    retval->length (this->facet_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (FacetTable::iterator iter = this->facet_table_.begin ();
-         iter != this->facet_table_.end ();
-         ++iter, ++i)
-      {
-        FacetTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  ::Components::ConsumerDescriptions *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_consumers (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::ConsumerDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::ConsumerDescriptions,
-                    0);
-
-    ::Components::ConsumerDescriptions_var retval = tmp;
-
-    retval->length (this->consumer_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
-         iter != this->consumer_table_.end ();
-         ++iter, ++i)
-      {
-        ConsumerTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
+  // Operations for CCMObject interface.
 
   template <typename BASE_SKEL,
             typename EXEC,
@@ -155,67 +95,6 @@ namespace CIAO
             typename EXEC,
             typename EXEC_VAR,
             typename CONTEXT>
-  ::Components::PrimaryKeyBase *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_primary_key (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::Components::NoKeyAvailable))
-  {
-    ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
-
-    return 0;
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  ::Components::ComponentPortDescription *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_ports (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    OBV_Components::ComponentPortDescription *cps = 0;
-    ACE_NEW_RETURN (cps,
-                    OBV_Components::ComponentPortDescription,
-                    0);
-    ::Components::ComponentPortDescription_var retv = cps;
-
-    ::Components::FacetDescriptions_var facets_desc =
-      this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ReceptacleDescriptions_var receptacle_desc =
-      this->get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ConsumerDescriptions_var consumer_desc =
-      this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::EmitterDescriptions_var emitter_desc =
-      this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::PublisherDescriptions_var publisher_desc =
-      this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    retv->facets (facets_desc.in ());
-    retv->receptacles (receptacle_desc.in ());
-    retv->consumers (consumer_desc.in ());
-    retv->emitters (emitter_desc.in ());
-    retv->publishers (publisher_desc.in ());
-
-    return retv._retn ();
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
   CORBA::Object_ptr
   Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::_get_component (
       ACE_ENV_SINGLE_ARG_DECL
@@ -250,7 +129,7 @@ namespace CIAO
                       ::CORBA::Object::_nil ());
   }
 
-    // CIAO-specific operations.
+  // CIAO-specific operations.
 
   template <typename BASE_SKEL,
             typename EXEC,
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h
index 48af7435c3c..45f223f57b5 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_T.h
@@ -43,21 +43,16 @@ namespace CIAO
             typename EXEC_VAR, 
             typename CONTEXT>
   class Servant_Impl : public virtual BASE_SKEL,
-                       public Servant_Impl_Base
+                       public virtual Servant_Impl_Base
   {
   public:
     Servant_Impl (EXEC * exe,
                   Session_Container * c);
+                  
     virtual ~Servant_Impl (void);
    
-    virtual ::Components::FacetDescriptions *
-    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual ::Components::ConsumerDescriptions *
-    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-      
+    // Operations for CCMObject interface.
+
     virtual CORBA::Boolean
     same_component (CORBA::Object_ptr object_ref
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -67,20 +62,11 @@ namespace CIAO
     get_ccm_home (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual ::Components::PrimaryKeyBase *
-    get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::NoKeyAvailable));
-
-    virtual ::Components::ComponentPortDescription *
-    get_all_ports (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
     virtual CORBA::Object_ptr
     _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // CIAO-specific operations.
+   // CIAO-specific operations.
 
     void
     ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h b/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h
index 39bf3a132dd..0395f8adc10 100644
--- a/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h
+++ b/TAO/CIAO/DAnCE/ciao/StandardConfigurator_Impl.h
@@ -4,7 +4,7 @@
 /**
  *  @file    StandardConfigurator_Impl.h
  *
- *  $Id$:StandardConfigurator_Impl.h,v 1.0 2004/08/12 20:00:00 jules
+ *  $Id$
  *
  *  This file contains implementation for the servant of
  *  Components::StandardConfigurator interface.
@@ -61,7 +61,7 @@ namespace CIAO
         ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void StandardConfigurator_Impl::configure (
+    void configure (
         Components::CCMObject_ptr comp
         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc
index cf18d6ceb51..652dab2f7a3 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -5,13 +5,20 @@
 project(BMClosedED_DnC_stub): ciao_client_dnc {
   after += BasicSP_DnC_stub
   sharedname = BMClosedED_stub
-  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h
+
+  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export 
+  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h 
+  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags += -Wb,skel_export_include=BMClosedED_svnt_export.h
+
+  libs += BasicSP_stub
+
   dynamicflags   = BMCLOSEDED_STUB_BUILD_DLL
 
   IDL_Files {
     BMClosedED.idl
   }
-  
+
   Source_Files {
     BMClosedEDC.cpp
   }
@@ -19,10 +26,17 @@ project(BMClosedED_DnC_stub): ciao_client_dnc {
 
 project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
   after += BasicSP_DnC_svnt BMClosedED_DnC_stub
-  sharedname  = BMClosedED_svnt
-  libs    += BMClosedED_stub BasicSP_stub BasicSP_svnt
+
+  sharedname = BMClosedED_svnt
+
+  libs    += BMClosedED_stub BasicSP_stub 
+  libs    += BasicSP_svnt
+
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export -Wb,export_include=BMClosedED_svnt_export.h
+
+  idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags  += -Wb,export_include=BMClosedED_svnt_export.h
+
   dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -42,11 +56,17 @@ project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
 
 
 project(BMClosedED_DnC_exec) : ciao_component_dnc {
-  after   += BMClosedED_DnC_svnt
+  after      += BMClosedED_DnC_svnt
+
   sharedname = BMClosedED_exec
-  libs      += BMClosedED_stub BMClosedED_svnt BasicSP_stub BasicSP_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=BMCLOSEDED_EXEC_Export -Wb,export_include=BMClosedED_exec_export.h
+
+  libs       += BMClosedED_stub BMClosedED_svnt 
+  libs       += BasicSP_stub BasicSP_svnt
+
+  libpaths   += ..
+  idlflags   += -Wb,export_macro=BMCLOSEDED_EXEC_Export 
+  idlflags   += -Wb,export_include=BMClosedED_exec_export.h
+
   dynamicflags   = BMCLOSEDED_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -58,4 +78,3 @@ project(BMClosedED_DnC_exec) : ciao_component_dnc {
     BMClosedED_exec.cpp
   }
 }
-
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
index b6fbd9cb4b0..299a39dc08b 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -3,6 +3,9 @@
 #include "ciao/CIAO_common.h"
 #include "BMClosedED_exec.h"
 
+#include "ace/OS_NS_string.h"
+
+
 #define DISPLACEMENT 256
 
 /// Default constructor.
@@ -122,7 +125,7 @@ MyImpl::BMClosedED_exec_i::ciao_preactivate (
 }
 
 void
-MyImpl::BMClosedED_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::BMClosedED_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc
index 3c8a7390238..a58ba4a18fe 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -61,4 +61,3 @@ project(BMDevice_DnC_exec) : ciao_component_dnc {
     BMDevice_exec.cpp
   }
 }
-
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_exec.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_exec.cpp
index e50238e2ef4..089ea646f76 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -91,7 +91,7 @@ MyImpl::BMDevice_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::BMDevice_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::BMDevice_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 47833492fec..5a28ed1b783 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -3,9 +3,16 @@
 
 project(BMDisplay_DnC_stub): ciao_client_dnc {
   after += BasicSP_DnC_stub
+
   sharedname = BMDisplay_stub
-  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h
+
+  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export 
+  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h 
+  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export 
+  idlflags += -Wb,skel_export_include=BMDisplay_svnt_export.h
   dynamicflags   = BMDISPLAY_STUB_BUILD_DLL
+ 
+  libs += BasicSP_stub
 
   IDL_Files {
     BMDisplay.idl
@@ -18,10 +25,16 @@ project(BMDisplay_DnC_stub): ciao_client_dnc {
 
 project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
   after += BasicSP_DnC_svnt BMDisplay_DnC_stub
+
   sharedname  = BMDisplay_svnt
+
   libs    += BMDisplay_stub BasicSP_stub BasicSP_svnt
+
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export -Wb,export_include=BMDisplay_svnt_export.h
+
+  idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export 
+  idlflags += -Wb,export_include=BMDisplay_svnt_export.h
+
   dynamicflags = BMDISPLAY_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -42,10 +55,17 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
 
 project(BMDisplay_DnC_exec) : ciao_component_dnc {
   after += BMDisplay_DnC_svnt
+
   sharedname = BMDisplay_exec
-  libs      += BMDisplay_stub BMDisplay_svnt BasicSP_stub BasicSP_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=BMDISPLAY_EXEC_Export -Wb,export_include=BMDisplay_exec_export.h
+
+  libs      += BMDisplay_stub BMDisplay_svnt 
+  libs      += BasicSP_stub BasicSP_svnt
+
+  libpaths  += ..
+
+  idlflags  += -Wb,export_macro=BMDISPLAY_EXEC_Export 
+  idlflags  += -Wb,export_include=BMDisplay_exec_export.h
+
   dynamicflags   = BMDISPLAY_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -57,4 +77,3 @@ project(BMDisplay_DnC_exec) : ciao_component_dnc {
     BMDisplay_exec.cpp
   }
 }
-
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
index 22ab46c1bbe..f0fc61007d7 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
@@ -86,7 +86,7 @@ MyImpl::BMDisplay_exec_impl::ciao_preactivate (
 }
 
 void
-MyImpl::BMDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::BMDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC.mpc
index d77bb2a4140..2b0362f66ba 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC.mpc
@@ -3,10 +3,18 @@
 
 project(EC_DnC_stub): ciao_client_dnc {
   after += BasicSP_DnC_stub
+
   sharedname = EC_stub
-  idlflags += -Wb,stub_export_macro=EC_STUB_Export -Wb,stub_export_include=EC_stub_export.h -Wb,skel_export_macro=EC_SVNT_Export -Wb,skel_export_include=EC_svnt_export.h
+
+  idlflags += -Wb,stub_export_macro=EC_STUB_Export 
+  idlflags += -Wb,stub_export_include=EC_stub_export.h 
+  idlflags += -Wb,skel_export_macro=EC_SVNT_Export 
+  idlflags += -Wb,skel_export_include=EC_svnt_export.h
+
   dynamicflags   = EC_STUB_BUILD_DLL
 
+  libs   += BasicSP_stub
+
   IDL_Files {
     EC.idl
   }
@@ -17,13 +25,18 @@ project(EC_DnC_stub): ciao_client_dnc {
 }
 
 project(EC_DnC_svnt) : ciao_servant_dnc {
-  after += BasicSP_DnC_svnt EC_DnC_stub
-  sharedname  = EC_svnt
-  libs    += EC_stub BasicSP_stub BasicSP_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=EC_SVNT_Export -Wb,export_include=EC_svnt_export.h
+  after     += BasicSP_DnC_svnt EC_DnC_stub
+  sharedname = EC_svnt
+
+  libpaths  += ..
+
+  idlflags  += -Wb,export_macro=EC_SVNT_Export 
+  idlflags  += -Wb,export_include=EC_svnt_export.h
+
   dynamicflags = EC_SVNT_BUILD_DLL
 
+  libs      += EC_stub BasicSP_stub BasicSP_svnt
+
   CIDL_Files {
     EC.cidl
   }
@@ -41,11 +54,16 @@ project(EC_DnC_svnt) : ciao_servant_dnc {
 
 
 project(EC_DnC_exec) : ciao_component_dnc {
-  after += EC_DnC_svnt
+  after    += EC_DnC_svnt
   sharedname = EC_exec
-  libs      += EC_stub BasicSP_stub EC_svnt
+
+  libs     += EC_stub BasicSP_stub EC_svnt
+
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=EC_EXEC_Export -Wb,export_include=EC_exec_export.h
+
+  idlflags +=  -Wb,export_macro=EC_EXEC_Export 
+  idlflags += -Wb,export_include=EC_exec_export.h
+
   dynamicflags   = EC_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -88,4 +106,3 @@ project (EC_DnC_controller) : ciao_client_dnc, valuetype {
     controller.cpp
   }
 }
-
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_exec.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_exec.cpp
index 0a7d012fc7e..e7de45b3b46 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_exec.cpp
@@ -24,13 +24,13 @@ MyImpl::timeout_Handler::~timeout_Handler ()
 }
 
 int
-MyImpl::timeout_Handler::open ()
+MyImpl::timeout_Handler::open_h ()
 {
   return this->activate ();
 }
 
 int
-MyImpl::timeout_Handler::close ()
+MyImpl::timeout_Handler::close_h ()
 {
   this->done_ = 1;
   this->reactor ()->notify ();
@@ -217,7 +217,7 @@ MyImpl::EC_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_activate\n"));
 
-  this->pulser_.open ();
+  this->pulser_.open_h ();
 }
 
 void
@@ -234,7 +234,7 @@ MyImpl::EC_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_passivate\n"));
-  this->pulser_.close ();
+  this->pulser_.close_h ();
 }
 
 void
@@ -258,7 +258,8 @@ MyImpl::EC_exec_i::pulse (void)
       BasicSP::TimeOut_var ev = new OBV_BasicSP::TimeOut ();
 
       this->context_->push_timeout (ev.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_exec.h b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_exec.h
index c0181bdf37c..057f8f70f14 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_exec.h
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_exec.h
@@ -34,9 +34,9 @@ namespace MyImpl
     timeout_Handler (EC_exec_i *cb);
     ~timeout_Handler ();
 
-    int open (void);
+    int open_h (void);
 
-    int close (void);
+    int close_h (void);
 
     int start (CORBA::Long hertz);
 
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/README.html b/TAO/CIAO/DAnCE/examples/BasicSP/README.html
index 81078e31ed8..59f9e4b73c5 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/README.html
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/README.html
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 <BODY>
 
-This document describes how to compile/run the HUDisplay example with the new DnC implementation.
+This document describes how to compile/run the BasicSP (HUDisplay) example with the new DnC implementation.
 
 <H3> Installing </H3>
 
@@ -17,13 +17,23 @@ This document describes how to compile/run the HUDisplay example with the new Dn
     </A>
 
     Copy the file into the <code> $CIAO_ROOT/bin </code> directory.
-  </LI>
-
-  <LI> Generate the make/project files for the DnC directory by using <code> $ACE_ROOT/bin/mwc.pl </code> script:
-    <UL>
-    <LI> <em> linux: </em> <code> [in $CIAO_ROOT/DnC] mwc.pl </code> </LI>
-    <LI> <em> windows: </em> <code> [in %CIAO_ROOT%/DnC] mwc.pl </code> </LI>
-    </UL>
+    Build ACE, TAO, DAnCE before you proceed.
+    
+    <br><br>
+    <em>NOTE</em>:  <br>
+           While buiding DAnCE, we also suggest that you build the tests in the $CIAO_ROOT/test directory and make sure
+           all the tests run OK before you proceed to try out the BasicSP example or any other DAnCE-based
+           applications. To do this, open the file
+    
+          $ACE_ROOT/bin/MakeProjectCreator/config/global.features, 
+          
+         then change the line from "cidl = 0" to "cidl = 1". <br><br>
+          
+          After this, go back to the $CIAO_ROOT/DAnCE directory to generate your workspace/project or makefile by using MPC.<br>
+          After the DAnCE and the tests are build OK, go to the $CIAO_ROOT/DAnCE/tests/NodeApplicationTest directory and make
+          sure all the three perl scripts (run_test.pl, run_test_simple.pl and run_test_ex.pl) run successfully.
+          
+          <br><br>
   </LI>
 
   <LI> Generate the project/make files for the <em> BasicSP </em> example directory:
@@ -41,7 +51,7 @@ This document describes how to compile/run the HUDisplay example with the new Dn
 
 <UL>
 
-  <LI> Change into the $CIAO_ROOT/DAnCE/examples/descriptors directory Start NodeManagers (NodeDameon) by running <code> NodeDaemon.pl </code>
+  <LI> Change into the $CIAO_ROOT/DAnCE/examples/BasicSP/descriptors directory Start NodeManagers (NodeDameon) by running <code> basicNodeDaemon.pl </code>
   
   <LI> Start the execution manager:
   <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i basicsp.dat </code>
@@ -51,6 +61,7 @@ This document describes how to compile/run the HUDisplay example with the new Dn
   <code> $CIAO_ROOT/DAnCE/RepositoryManager/executor -p package.tpd -d HUDisplay.cdp -k file://EM.ior </code>
   
   <LI> After this, components should be deployed successfully. You can run the $CIAO_ROOT/DAnCE/examples/BasicSP/EC/controller to start the application.
+       Please make sure that the component IOR file for the EC component is present when you run this client.
 
   <BR/>
   </LI>
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl
index 1d7892ffe09..03c92d19b33 100755
--- a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/basicNodeDaemon.pl
@@ -35,24 +35,19 @@ unlink $iorfile5;
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
 $SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:10000 -s
-$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+                             "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:20000  -s
-$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+                             "-ORBEndpoint iiop://localhost:20000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV3 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:30000  -s
-$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+                             "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:40000  -s
-$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+                             "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
                              
 $SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:50000  -s
-$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
+                             "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
 $SV1->Spawn ();
 $SV2->Spawn ();
 $SV3->Spawn ();
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp
index ef03b09cec6..70bbe0fe85d 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp
@@ -2,15 +2,16 @@
 
 #include "Handler_Test.h"
 
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
 #include "Config_Handlers/CompImplDesc_Handler.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  return run_test <CIAO::Config_Handler::CompImplDesc_Handler, Deployment::ComponentImplementationDescription>
-    (argc, argv, &CIAO::Config_Handler::CompImplDesc_Handler::process_ComponentImplementationDescription);
+  return Config_Handler_Test::run_test 
+    <CIAO::Config_Handler::CompImplDesc_Handler, 
+    Deployment::ComponentImplementationDescription>
+    (argc, 
+     argv, 
+     &CIAO::Config_Handler::CompImplDesc_Handler::process_ComponentImplementationDescription);
 }
 
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp
index b6a33919068..d03613ce22b 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp
@@ -2,15 +2,12 @@
 
 #include "Handler_Test.h"
 
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
 #include "Config_Handlers/CompIntrDesc_Handler.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  return run_test <CIAO::Config_Handler::CompIntrDesc_Handler, Deployment::ComponentInterfaceDescription>
+  return Config_Handler_Test::run_test <CIAO::Config_Handler::CompIntrDesc_Handler, Deployment::ComponentInterfaceDescription>
     (argc, argv, &CIAO::Config_Handler::CompIntrDesc_Handler::process_ComponentInterfaceDescription);
 }
 
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp
index adf64ee1380..a6ed08db5dc 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp
@@ -2,15 +2,12 @@
 
 #include "Handler_Test.h"
 
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
 #include "Config_Handlers/CompPkgDesc_Handler.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  return run_test <CIAO::Config_Handler::CompPkgDesc_Handler, Deployment::ComponentPackageDescription>
+  return Config_Handler_Test::run_test <CIAO::Config_Handler::CompPkgDesc_Handler, Deployment::ComponentPackageDescription>
     (argc, argv, &CIAO::Config_Handler::CompPkgDesc_Handler::process_ComponentPackageDescription);
 }
 
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp
index 4d0cf09ef99..e8082e43304 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp
@@ -2,15 +2,12 @@
 
 #include "Handler_Test.h"
 
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
 #include "Config_Handlers/Domain_Handler.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  return run_test <CIAO::Config_Handler::Domain_Handler, Deployment::Domain>
+  return Config_Handler_Test::run_test <CIAO::Config_Handler::Domain_Handler, Deployment::Domain>
     (argc, argv, &CIAO::Config_Handler::Domain_Handler::process_domain);
 }
 
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
index 6b117839019..5db10ac0393 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
@@ -36,169 +36,173 @@ using xercesc::DOMNodeIterator;
 using xercesc::DOMNode;
 using xercesc::DOMNodeFilter;
 
-void
-usage (const ACE_TCHAR* program)
+namespace Config_Handler_Test 
 {
-  ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("Usage: %s -u <URI>\n")
-              ACE_TEXT (" <URI>: URI identifying the resource\n"),
-              program));
-}
-
-template <typename HANDLER, typename DATA>
-int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&))
-{
-  ACE_TCHAR* url = 0;
-
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("u:"));
-  int c;
-
-  while ((c = get_opt ()) != EOF)
-    {
-      switch (c)
-        {
+  void
+  usage (const ACE_TCHAR* program)
+  {
+    ACE_ERROR ((LM_ERROR,
+		ACE_TEXT ("Usage: %s -u <URI>\n")
+		ACE_TEXT (" <URI>: URI identifying the resource\n"),
+		program));
+  }
+  
+  template <typename HANDLER, typename DATA>
+  int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&))
+  {
+    ACE_TCHAR* url = 0;
+    
+    ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("u:"));
+    int c;
+    
+    while ((c = get_opt ()) != EOF)
+      {
+	switch (c)
+	  {
           case 'u':
             url = get_opt.opt_arg();
             break;
           default:
             usage(argv[0]);
             return -1;
-        }
+	  }
+      }
+    
+    if (url == 0) {
+      usage (argv[0]);
+      return -1;
     }
+    
+    // Initialize the ORB so that CORBA::Any will work
+    //
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
-  if (url == 0) {
-    usage (argv[0]);
-    return -1;
-  }
-
-  // Initialize the ORB so that CORBA::Any will work
-  //
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
-
-  // Initialize the Xerces run-time
-  try
+    // Initialize the Xerces run-time
+    try
     {
       xercesc::XMLPlatformUtils::Initialize();
     }
-
-  catch (const XMLException& e)
-    {
-      char* message = XMLString::transcode (e.getMessage());
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-      ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
-      return 1;
-    }
-
-  try
-    {
-
-      // Instantiate the DOM parser.
-      static const XMLCh gLS[] = { xercesc::chLatin_L,
-                                   xercesc::chLatin_S,
-                                   xercesc::chNull };
-
-      // Get an implementation of the Load-Store (LS) interface
-      DOMImplementation* impl
-        = DOMImplementationRegistry::getDOMImplementation(gLS);
-
-      auto_ptr<DOMImplementation> cleanup_impl (impl);
-
-      // Create a DOMBuilder
-      DOMBuilder* parser =
-        ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
-
-      auto_ptr<DOMBuilder> cleanup_builder (parser);
-
-      // Discard comment nodes in the document
-      parser->setFeature (XMLUni::fgDOMComments, false);
-
-      // Disable datatype normalization. The XML 1.0 attribute value
-      // normalization always occurs though.
-      parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
-
-      // Do not create EntityReference nodes in the DOM tree. No
-      // EntityReference nodes will be created, only the nodes
-      // corresponding to their fully expanded sustitution text will be
-      // created.
-      parser->setFeature (XMLUni::fgDOMEntities, false);
-
-      // Perform Namespace processing.
-      parser->setFeature (XMLUni::fgDOMNamespaces, true);
-
-      // Perform Validation
-      parser->setFeature (XMLUni::fgDOMValidation, true);
-
-      // Do not include ignorable whitespace in the DOM tree.
-      parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
-
-      // Enable the parser schema support.
-      parser->setFeature (XMLUni::fgXercesSchema, true);
-
-      // Enable full schema constraint checking, including checking which
-      // may be time-consuming or memory intensive. Currently, particle
-      // unique attribution constraint checking and particle derivation
-      // restriction checking are controlled by this option.
-      parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
-
-      // The parser will treat validation error as fatal and will exit.
-      parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
-
-      CIAO::Config_Handler::Config_Error_Handler handler;
-      parser->setErrorHandler(&handler);
-
-      DOMDocument* doc = parser->parseURI(url);
-      auto_ptr<DOMDocument> cleanup_doc (doc);
-
-      if (handler.getErrors())
-        {
-          return 1;
-        }
-      HANDLER obj (doc, DOMNodeFilter::SHOW_ELEMENT |
-                        DOMNodeFilter::SHOW_TEXT);
-
-      DATA data;
-      (obj.*func)(data);
-      Deployment::DnC_Dump::dump (data);
-      //domain_handler.dump(domain);
-
-      // parser->release ();
-    }
-  catch (const DOMException& e)
-    {
-      const unsigned int maxChars = 2047;
-      XMLCh errText[maxChars + 1];
-
-      ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \n", url));
-      ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code));
-      if (DOMImplementation::loadDOMExceptionMsg(e.code, errText, maxChars))
-        {
-          char* message = XMLString::transcode (errText);
-          ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-          ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
-        }
-      return 1;
-    }
-  catch (const XMLException& e)
-    {
-      char* message = XMLString::transcode (e.getMessage());
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-      ACE_ERROR ((LM_ERROR, "\nException occured: %s\n ", message));
-      return 1;
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
-      return 1;
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
-      return 1;
-    }
-
-  xercesc::XMLPlatformUtils::Terminate();
-  return 0;
+    
+    catch (const XMLException& e)
+      {
+	char* message = XMLString::transcode (e.getMessage());
+	ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+	ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
+	return 1;
+      }
+    
+    try
+      {
+	
+	// Instantiate the DOM parser.
+	static const XMLCh gLS[] = { xercesc::chLatin_L,
+				     xercesc::chLatin_S,
+				     xercesc::chNull };
+	
+	// Get an implementation of the Load-Store (LS) interface
+	DOMImplementation* impl
+	  = DOMImplementationRegistry::getDOMImplementation(gLS);
+	
+	auto_ptr<DOMImplementation> cleanup_impl (impl);
+	
+	// Create a DOMBuilder
+	DOMBuilder* parser =
+	  ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+	
+	auto_ptr<DOMBuilder> cleanup_builder (parser);
+	
+	// Discard comment nodes in the document
+	parser->setFeature (XMLUni::fgDOMComments, false);
+	
+	// Disable datatype normalization. The XML 1.0 attribute value
+	// normalization always occurs though.
+	parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
+	
+	// Do not create EntityReference nodes in the DOM tree. No
+	// EntityReference nodes will be created, only the nodes
+	// corresponding to their fully expanded sustitution text will be
+	// created.
+	parser->setFeature (XMLUni::fgDOMEntities, false);
+	
+	// Perform Namespace processing.
+	parser->setFeature (XMLUni::fgDOMNamespaces, true);
+	
+	// Perform Validation
+	parser->setFeature (XMLUni::fgDOMValidation, true);
+
+	// Do not include ignorable whitespace in the DOM tree.
+	parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
+	
+	// Enable the parser schema support.
+	parser->setFeature (XMLUni::fgXercesSchema, true);
+	
+	// Enable full schema constraint checking, including checking which
+	// may be time-consuming or memory intensive. Currently, particle
+	// unique attribution constraint checking and particle derivation
+	// restriction checking are controlled by this option.
+	parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
+	
+	// The parser will treat validation error as fatal and will exit.
+	parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
+	
+	CIAO::Config_Handler::Config_Error_Handler handler;
+	parser->setErrorHandler(&handler);
+	
+	DOMDocument* doc = parser->parseURI(url);
+	auto_ptr<DOMDocument> cleanup_doc (doc);
+	
+	if (handler.getErrors())
+	  {
+	    return 1;
+	  }
+	HANDLER obj (doc, DOMNodeFilter::SHOW_ELEMENT |
+		     DOMNodeFilter::SHOW_TEXT);
+	
+	DATA data;
+	(obj.*func)(data);
+	Deployment::DnC_Dump::dump (data);
+	//domain_handler.dump(domain);
+	
+	// parser->release ();
+      }
+    catch (const DOMException& e)
+      {
+	const unsigned int maxChars = 2047;
+	XMLCh errText[maxChars + 1];
+	
+	ACE_ERROR ((LM_ERROR, 
+		    "\nException occured while parsing %s: \n", url));
+	ACE_ERROR ((LM_ERROR, 
+		    "DOMException code: %d\n ", e.code));
+	if (DOMImplementation::loadDOMExceptionMsg(e.code, errText, maxChars))
+	  {
+	    char* message = XMLString::transcode (errText);
+	    ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+	    ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
+	  }
+	return 1;
+      }
+    catch (const XMLException& e)
+      {
+	char* message = XMLString::transcode (e.getMessage());
+	ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+	ACE_ERROR ((LM_ERROR, "\nException occured: %s\n ", message));
+	return 1;
+      }
+    catch (CORBA::Exception& ex)
+      {
+	ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+	return 1;
+      }
+    catch (...)
+      {
+	ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
+	return 1;
+      }
+    
+    xercesc::XMLPlatformUtils::Terminate();
+    return 0;
+  }
 }
 
-
 #endif /*HANDLER_TEST_CPP*/
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
index b51a6e4c00b..4c48a7f37f4 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
@@ -37,8 +37,9 @@ using xercesc::DOMNodeIterator;
 using xercesc::DOMNode;
 using xercesc::DOMNodeFilter;
 
-template <typename HANDLER, typename DATA>
-int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&));
+namespace Config_Handler_Test
+{
+}
 
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp
index c71e11fce28..925ac4f43bb 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp
@@ -2,15 +2,12 @@
 
 #include "Handler_Test.h"
 
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
 #include "Config_Handlers/IAD_Handler.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  return run_test <CIAO::Config_Handler::IAD_Handler, Deployment::ImplementationArtifactDescription>
+  return Config_Handler_Test::run_test <CIAO::Config_Handler::IAD_Handler, Deployment::ImplementationArtifactDescription>
     (argc, argv, &CIAO::Config_Handler::IAD_Handler::process_ImplementationArtifactDescription);
 }
 
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp
index e8a8980108b..d304ecc91f2 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp
@@ -2,15 +2,12 @@
 
 #include "Handler_Test.h"
 
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
 #include "Config_Handlers/PC_Handler.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  return run_test <CIAO::Config_Handler::PC_Handler, Deployment::PackageConfiguration>
+  return Config_Handler_Test::run_test <CIAO::Config_Handler::PC_Handler, Deployment::PackageConfiguration>
     (argc, argv, &CIAO::Config_Handler::PC_Handler::process_PackageConfiguration);
 }
 
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp
index e42d4d345a3..33ea1d3e1dc 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp
@@ -2,15 +2,12 @@
 
 #include "Handler_Test.h"
 
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
 #include "Config_Handlers/Plan_Handler.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-	return run_test <CIAO::Config_Handler::Plan_Handler, Deployment::DeploymentPlan>
+  return Config_Handler_Test::run_test <CIAO::Config_Handler::Plan_Handler, Deployment::DeploymentPlan>
            (argc, argv, &CIAO::Config_Handler::Plan_Handler::process_plan);
 }
 
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
index 07bec27c7a4..f342352961e 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
@@ -1,13 +1,11 @@
 //$Id$
 
-project : taoexe, ciao_server_dnc, ciao_deployment_stub  { 
+project : taoexe, ciao_server_dnc, ciao_deployment_stub, xerces  {
   dynamicflags   = CONFIG_HANDLER_BUILD_DLL
-  macros   += XML_USE_PTHREADS
   requires += exceptions
-  includes += $(XERCESCROOT)/include $(ACE_ROOT)/TAO/CIAO/DAnCE
-  libpaths += $(XERCESCROOT)/lib  
-  libs     += xerces-c Config_Handlers // Deployment_stub Deployment_svnt
-//   libs     += CIAO_DnC_Server CIAO_DnC_Container 
+  includes += $(ACE_ROOT)/TAO/CIAO/DAnCE
+  libs     += Config_Handlers // Deployment_stub Deployment_svnt
+//   libs     += CIAO_DnC_Server CIAO_DnC_Container
   after    += Config_Handlers
 
   Template_Files {
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
index d9048326040..cc49df95555 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
@@ -2,6 +2,7 @@
 
 project(NodeAppTest_RoundTrip_stub): ciao_client_dnc {
   sharedname = NodeAppTest_RoundTrip_stub
+  after += CIAO_DnC_Server
 
   idlflags += -Wb,stub_export_macro=NODEAPPTEST_ROUNDTRIP_STUB_Export -Wb,stub_export_include=RoundTrip_stub_export.h -Wb,skel_export_macro=NODEAPPTEST_ROUNDTRIP_SVNT_Export -Wb,skel_export_include=RoundTrip_svnt_export.h
   dynamicflags   = NODEAPPTEST_ROUNDTRIP_STUB_BUILD_DLL
@@ -40,7 +41,7 @@ project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc {
 }
 
 project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc {
-  after += NodeAppTest_RoundTrip_svnt
+  after += NodeAppTest_RoundTrip_stub NodeAppTest_RoundTrip_svnt
 
   sharedname = NodeAppTest_RoundTrip_exec
   libs      += NodeAppTest_RoundTrip_stub NodeAppTest_RoundTrip_svnt
@@ -56,7 +57,7 @@ project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc {
 }
 
 project (NodeAppTest_client_simple) : ciao_server_dnc, ciao_deployment_svnt {
- after += NodeAppTest_RoundTrip_exec
+ after += NodeAppTest_RoundTrip_stub
 
  libs += NodeAppTest_RoundTrip_stub 
  exename += client_simple
@@ -70,7 +71,7 @@ project (NodeAppTest_client_simple) : ciao_server_dnc, ciao_deployment_svnt {
 }
 
 project (NodeAppTest_client) : ciao_server_dnc, ciao_deployment_svnt {
- after += NodeAppTest_RoundTrip_exec
+ after += NodeAppTest_RoundTrip_stub
  libs += NodeAppTest_RoundTrip_stub
  exename += client
 
@@ -84,7 +85,7 @@ project (NodeAppTest_client) : ciao_server_dnc, ciao_deployment_svnt {
 }
 
 project (NodeAppTest_client_ex) : ciao_server_dnc, ciao_deployment_svnt {
- after += NodeAppTest_RoundTrip_exec
+ after += NodeAppTest_RoundTrip_stub
  libs += NodeAppTest_RoundTrip_stub 
  exename += client_ex
 
diff --git a/TAO/CIAO/NEWS b/TAO/CIAO/NEWS
index f9bb415d491..20ecc15d66f 100644
--- a/TAO/CIAO/NEWS
+++ b/TAO/CIAO/NEWS
@@ -1,12 +1,34 @@
-PLANNED MAJOR CHANGES TARGETED FOR TAO-1.4.3
-====================================================
+PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
+===========================================================================
+
+. Integrate Real-time Event Channel into CIAO and DAnCE.
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.4.3 and CIAO-0.4.4
+======================================================
+
+. Minor bugfixes.
+
+USER VISIBLE CHANGES BETWEEN CIAO-0.4.2 and CIAO-0.4.3
+======================================================
+
+. CIDLC can generate empty executor implementations for a given
+  composition, which makes it easier to write executors.  This can be
+  trigerred by passing --gen-exec-impl option while invoking CIDLC.
+
+. Generated container code has been refactored into base classes,
+  thereby reducing the amount of code generated by CIDLC.
+
+. A new tool for generating equivalent IDL2 declarations from IDL3
+  declarations has been added.
+
+. Fixed a problem with DAnCE that prevented ports from getting activated
+  properly.
+
+. Added support for eventtype factories within CIDLC.
 
-- (DOC-ISIS) Changes to DAnCE
+. DAncE compiles clean and works with VC6 and Borland compilers.
 
-- (Jeff/Boris) CIDL compiler generates dummy implementation code
-  . This item added 08/05/04. See CIAO ChangeLog:
-  
-    Thu Aug  5 17:42:56 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+. Fixed compile errors and memory related errors on many platforms.
 
 
 USER VISIBLE CHANGES BETWEEN CIAO-0.4.1 and CIAO-0.4.2
diff --git a/TAO/CIAO/PROBLEM-REPORT-FORM b/TAO/CIAO/PROBLEM-REPORT-FORM
index 5cda35bc57e..ef23dce73af 100644
--- a/TAO/CIAO/PROBLEM-REPORT-FORM
+++ b/TAO/CIAO/PROBLEM-REPORT-FORM
@@ -43,9 +43,9 @@
 To: ciao-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 0.4.2
-    TAO VERSION : 1.4.2
-    ACE VERSION : 5.4.2
+    CIAO VERSION: 0.4.4
+    TAO VERSION : 1.4.4
+    ACE VERSION : 5.4.4
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/CIAO/Release b/TAO/CIAO/Release
index fc7d50f0b01..2198eab5e2a 100644
--- a/TAO/CIAO/Release
+++ b/TAO/CIAO/Release
@@ -11,7 +11,7 @@
 
 CONTROLLED_FILES = CIAO
 
-RELEASE_FILES = $(addprefix ACE_wrappers/TAO/,$(CONTROLLED_FILES)) 
+RELEASE_FILES = $(addprefix ACE_wrappers/TAO/,$(CONTROLLED_FILES))
 
 .PHONY: CIAO tag
 
@@ -48,3 +48,6 @@ show_release_lib_files:
 show_release_tag_files:
 	@echo ""
 
+CIAO-INSTALL: CIAO-INSTALL.html
+	@lynx -dump $< > CIAO-INSTALL
+
diff --git a/TAO/CIAO/VERSION b/TAO/CIAO/VERSION
index 18c11099898..93594ac9a1c 100644
--- a/TAO/CIAO/VERSION
+++ b/TAO/CIAO/VERSION
@@ -1,11 +1,11 @@
-This is CIAO version 0.4.2, released Sat Jul 31 11:15:15 2004.
+This is CIAO version 0.4.4, released Thu Feb 10 07:11:04 2005.
 
-If you have any problems with or questions about TAO, please send
+If you have any problems with or questions about CIAO, please send
 e-mail to the CIAO mailing list (ciao-users@cs.wustl.edu), using the
 form found in the file CIAO/PROBLEM-REPORT-FORM.  To ensure that you
 see responses, please do one of the following:
 
-    1) Subscribe to the ace-users mail list, by sending email with
-       contents "subscribe tao-users" to majordomo@cs.wustl.edu.
+    1) Subscribe to the ciao-users mail list, by sending email with
+       contents "subscribe ciao-users" to majordomo@cs.wustl.edu.
 
     2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 78ddc0ca40e..78183923d84 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -6,6 +6,9 @@ project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
   idlflags  += -Sc -Wb,stub_export_include=CIAO_Client_Export.h -Wb,stub_export_macro=CIAO_CLIENT_Export -Wb,skel_export_include=CIAO_Container_Export.h -Wb,skel_export_macro=CIAO_CONTAINER_Export
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   IDL_Files {
     CCM_Base.idl
     CCM_Event.idl
@@ -25,7 +28,7 @@ project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
     CIAO_Client_Export.h
     CIAO_common.h
   }
-  
+
   Template_Files {
   }
 }
@@ -34,10 +37,13 @@ project (CIAO_Container) : orbsvcslib, portableserver, security, valuetype, ifr_
   after += CIAO_Client
   sharedname  = CIAO_Container
   libs       += CIAO_Client
-  idlflags   += -Sc -Wb,export_include=CIAO_Container_Export.h 
+  idlflags   += -Sc -Wb,export_include=CIAO_Container_Export.h
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   IDL_Files {
     CCM_Transaction.idl
     CosPersistentState.idl
@@ -55,7 +61,7 @@ project (CIAO_Container) : orbsvcslib, portableserver, security, valuetype, ifr_
     CCM_ComponentS.cpp
     Cookies.cpp
   }
-  
+
   Template_Files {
   }
 }
@@ -72,7 +78,6 @@ project (CIAO_Server) : orbsvcslib, portableserver, valuetype, ifr_client, secur
   IDL_Files {
     CCM_Deployment.idl
     CIAO_Servers.idl
-//    HomeRegistrar.idl
   }
 
   Source_Files {
@@ -84,6 +89,8 @@ project (CIAO_Server) : orbsvcslib, portableserver, valuetype, ifr_client, secur
     ComponentServer_Impl.cpp
     Container_Base.cpp
     Container_Impl.cpp
+    Context_Impl_Base.cpp
+    Home_Servant_Impl_Base.cpp
     Servant_Impl_Base.cpp
     Servant_Activator.cpp
     Port_Activator.cpp
@@ -96,8 +103,10 @@ project (CIAO_Server) : orbsvcslib, portableserver, valuetype, ifr_client, secur
     CIAO_Server_Export.h
     CIAO_common.h
   }
-  
+
   Template_Files {
+    Context_Impl_T.cpp
+    Home_Servant_Impl_T.cpp
     Object_Set_T.cpp
     Servant_Impl_T.cpp
     Servant_Activator_T.cpp
diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp
index 8a0d48b8810..abad0fa788a 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -4,6 +4,7 @@
 #include "ace/DLL.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/SString.h"
 #include "Servant_Activator.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/CIAO/ciao/Container_Impl.cpp b/TAO/CIAO/ciao/Container_Impl.cpp
index 14a965c3772..c6feed5c3bf 100644
--- a/TAO/CIAO/ciao/Container_Impl.cpp
+++ b/TAO/CIAO/ciao/Container_Impl.cpp
@@ -1,10 +1,14 @@
 // $Id$
 #include "Container_Impl.h"
 
+#include "ace/Auto_Ptr.h"
+#include "ace/OS_NS_string.h"
+
 #if !defined (__ACE_INLINE__)
 # include "Container_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
+
 CIAO::Container_Impl::~Container_Impl ()
 {
   // @@ remove all home?
diff --git a/TAO/CIAO/ciao/Port_Activator_T.cpp b/TAO/CIAO/ciao/Port_Activator_T.cpp
index f2832290731..257ea137204 100644
--- a/TAO/CIAO/ciao/Port_Activator_T.cpp
+++ b/TAO/CIAO/ciao/Port_Activator_T.cpp
@@ -4,6 +4,7 @@
 
 #include "Port_Activator_T.h"
 #include "tao/CORBA_String.h"
+#include "ace/OS_NS_string.h"
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/ciao/Servant_Activator.cpp b/TAO/CIAO/ciao/Servant_Activator.cpp
index 4f6dce18a5c..03899555bfd 100644
--- a/TAO/CIAO/ciao/Servant_Activator.cpp
+++ b/TAO/CIAO/ciao/Servant_Activator.cpp
@@ -56,7 +56,7 @@ namespace CIAO
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         guard,
                         this->mutex_,
-                        false);
+                        0);
 
       const unsigned int sz = this->slot_index_;
 
@@ -95,7 +95,7 @@ namespace CIAO
                                   PortableServer::Servant ,
                                   CORBA::Boolean ,
                                   CORBA::Boolean
-                                  ACE_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /// Need to investigate what needs to be handled here..
diff --git a/TAO/CIAO/ciao/Servant_Activator.h b/TAO/CIAO/ciao/Servant_Activator.h
index 4b4fbf65130..a9f75028a67 100644
--- a/TAO/CIAO/ciao/Servant_Activator.h
+++ b/TAO/CIAO/ciao/Servant_Activator.h
@@ -25,9 +25,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -100,5 +98,9 @@ namespace CIAO
   };
 }
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #include /**/ "ace/post.h"
 #endif /*CIAO_SERVANT_ACTIVATOR_H*/
diff --git a/TAO/CIAO/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
index cf5ba965941..b19a5de1f95 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
-
-
 #include "Servant_Impl_Base.h"
 #include "StandardConfigurator_Impl.h"
 #include "Container_Base.h"
 
 namespace CIAO
 {
+  Servant_Impl_Base::Servant_Impl_Base (void)
+  {
+    ACE_ASSERT (0);
+  }
+
   Servant_Impl_Base::Servant_Impl_Base (Session_Container * c)
     : container_ (c)
   {
@@ -17,6 +20,347 @@ namespace CIAO
   {
   }
 
+  // Operations for CCMObject interface.
+
+  ::Components::PrimaryKeyBase *
+  Servant_Impl_Base::get_primary_key (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     ::Components::NoKeyAvailable))
+  {
+    ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
+
+    return 0;
+  }
+
+  CORBA::IRObject_ptr
+  Servant_Impl_Base::get_component_def (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
+                      CORBA::IRObject::_nil ());
+  }
+
+  void
+  Servant_Impl_Base::configuration_complete (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidConfiguration))
+  {
+    // CIAO to-do
+  }
+
+  void
+  Servant_Impl_Base::remove (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::RemoveFailure))
+  {
+    // CIAO to-do
+  }
+
+  ::Components::ConnectionDescriptions *
+  Servant_Impl_Base::get_connections (
+      const char * /* name */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::ComponentPortDescription *
+  Servant_Impl_Base::get_all_ports (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    OBV_Components::ComponentPortDescription *cps = 0;
+    ACE_NEW_RETURN (cps,
+                    OBV_Components::ComponentPortDescription,
+                    0);
+    ::Components::ComponentPortDescription_var retv = cps;
+
+    ::Components::FacetDescriptions_var facets_desc =
+      this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    ::Components::ReceptacleDescriptions_var receptacle_desc =
+      this->get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    ::Components::ConsumerDescriptions_var consumer_desc =
+      this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    ::Components::EmitterDescriptions_var emitter_desc =
+      this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    ::Components::PublisherDescriptions_var publisher_desc =
+      this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    retv->facets (facets_desc.in ());
+    retv->receptacles (receptacle_desc.in ());
+    retv->consumers (consumer_desc.in ());
+    retv->emitters (emitter_desc.in ());
+    retv->publishers (publisher_desc.in ());
+
+    return retv._retn ();
+  }
+
+  CORBA::Object_ptr
+  Servant_Impl_Base::provide_facet (
+      const char *name
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    if (name == 0)
+      {
+        ACE_THROW_RETURN (Components::InvalidName (),
+                          CORBA::Object::_nil ());
+      }
+
+    CORBA::Object_ptr retval = this->lookup_facet (name);
+
+    if (CORBA::is_nil (retval))
+      {
+        ACE_THROW_RETURN (Components::InvalidName (),
+                          CORBA::Object::_nil ());
+      }
+
+    return retval;
+  }
+
+  Components::FacetDescriptions *
+  Servant_Impl_Base::get_named_facets (
+      const ::Components::NameList & names
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    Components::FacetDescriptions *retval = 0;
+    ACE_NEW_RETURN (retval,
+                    ::Components::FacetDescriptions,
+                    0);
+    Components::FacetDescriptions_var safe_retval = retval;
+    CORBA::ULong len = names.length ();
+    safe_retval->length (len);
+    ::Components::FacetDescription *tmp = 0;
+
+    for (CORBA::ULong i = 0; i < len; ++i)
+      {
+        tmp = this->lookup_facet_description (names[i].in ());
+
+        if (tmp == 0)
+          {
+            ACE_THROW_RETURN (Components::InvalidName (),
+                              0);
+          }
+
+        safe_retval[i] = tmp;
+      }
+
+    return safe_retval._retn ();
+  }
+
+  ::Components::FacetDescriptions *
+  Servant_Impl_Base::get_all_facets (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ::Components::FacetDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::FacetDescriptions,
+                    0);
+
+    ::Components::FacetDescriptions_var retval = tmp;
+
+    retval->length (this->facet_table_.current_size ());
+    CORBA::ULong i = 0;
+
+    for (FacetTable::iterator iter = this->facet_table_.begin ();
+         iter != this->facet_table_.end ();
+         ++iter, ++i)
+      {
+        FacetTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
+      }
+
+    return retval._retn ();
+  }
+
+  ::Components::ConsumerDescriptions *
+  Servant_Impl_Base::get_all_consumers (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ::Components::ConsumerDescriptions *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    ::Components::ConsumerDescriptions,
+                    0);
+
+    ::Components::ConsumerDescriptions_var retval = tmp;
+
+    retval->length (this->consumer_table_.current_size ());
+    CORBA::ULong i = 0;
+
+    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
+         iter != this->consumer_table_.end ();
+         ++iter, ++i)
+      {
+        ConsumerTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
+      }
+
+    return retval._retn ();
+  }
+
+  ::Components::EventConsumerBase_ptr
+  Servant_Impl_Base::get_consumer (
+      const char *sink_name
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    if (sink_name == 0)
+      {
+        ACE_THROW_RETURN (Components::InvalidName (),
+                          Components::EventConsumerBase::_nil ());
+      }
+
+    Components::EventConsumerBase_ptr retval =
+      this->lookup_consumer (sink_name);
+
+    if (CORBA::is_nil (retval))
+      {
+        ACE_THROW_RETURN (Components::InvalidName (),
+                          Components::EventConsumerBase::_nil ());
+      }
+
+    return retval;
+  }
+
+  ::Components::EventConsumerBase_ptr
+  Servant_Impl_Base::disconnect_consumer (
+      const char * /* source_name */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName,
+                     Components::NoConnection))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::ConsumerDescriptions *
+  Servant_Impl_Base::get_named_consumers (
+      const ::Components::NameList & names
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    Components::ConsumerDescriptions *retval = 0;
+    ACE_NEW_RETURN (retval,
+                    ::Components::ConsumerDescriptions,
+                    0);
+    Components::ConsumerDescriptions_var safe_retval = retval;
+    CORBA::ULong len = names.length ();
+    safe_retval->length (len);
+    ::Components::ConsumerDescription *tmp = 0;
+
+    for (CORBA::ULong i = 0; i < len; ++i)
+      {
+        tmp = this->lookup_consumer_description (names[i].in ());
+
+        if (tmp == 0)
+          {
+            ACE_THROW_RETURN (Components::InvalidName (),
+                              0);
+          }
+
+        safe_retval[i] = tmp;
+      }
+
+    return safe_retval._retn ();
+  }
+
+  ::Components::EmitterDescriptions *
+  Servant_Impl_Base::get_all_emitters (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::EmitterDescriptions *
+  Servant_Impl_Base::get_named_emitters (
+      const ::Components::NameList & /* names */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::ReceptacleDescriptions *
+  Servant_Impl_Base::get_all_receptacles (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::ReceptacleDescriptions *
+  Servant_Impl_Base::get_named_receptacles (
+      const ::Components::NameList & /* names */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::PublisherDescriptions *
+  Servant_Impl_Base::get_all_publishers (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  ::Components::PublisherDescriptions *
+  Servant_Impl_Base::get_named_publishers (
+      const ::Components::NameList & /* names */
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     Components::InvalidName))
+  {
+    ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+  }
+
+  /// Protected operations.
+
   void
   Servant_Impl_Base::add_facet (const char *port_name,
                                 CORBA::Object_ptr port_ref)
@@ -35,20 +379,33 @@ namespace CIAO
         safe._retn ();
       }
   }
-  
+
   CORBA::Object_ptr
   Servant_Impl_Base::lookup_facet (const char *port_name)
   {
     ::Components::FacetDescription_var fd;
-    
+
     if (this->facet_table_.find (port_name, fd) != 0)
       {
         return CORBA::Object::_nil ();
       }
-      
+
     return CORBA::Object::_duplicate (fd.in ()->facet_ref ());
   }
 
+  ::Components::FacetDescription *
+  Servant_Impl_Base::lookup_facet_description (const char *port_name)
+  {
+    ::Components::FacetDescription_var fd;
+
+    if (this->facet_table_.find (port_name, fd) != 0)
+      {
+        return 0;
+      }
+
+    return fd._retn ();
+  }
+
   void
   Servant_Impl_Base::add_consumer (
       const char *port_name,
@@ -74,21 +431,36 @@ namespace CIAO
   Servant_Impl_Base::lookup_consumer (const char *port_name)
   {
     ::Components::ConsumerDescription_var cd;
-    
+
     if (this->consumer_table_.find (port_name, cd) != 0)
       {
         return ::Components::EventConsumerBase::_nil ();
       }
-      
+
     return
       ::Components::EventConsumerBase::_duplicate (cd.in ()->consumer ());
   }
 
+  ::Components::ConsumerDescription *
+  Servant_Impl_Base::lookup_consumer_description (
+      const char *port_name
+    )
+  {
+    ::Components::ConsumerDescription_var cd;
+
+    if (this->consumer_table_.find (port_name, cd) != 0)
+      {
+        return 0;
+      }
+
+    return cd._retn ();
+  }
+
   Components::StandardConfigurator*
   Servant_Impl_Base::get_standard_configurator (
     ACE_ENV_SINGLE_ARG_DECL)
   {
-    //create the configurator servant
+    // Create the configurator servant.
     StandardConfigurator_Impl *config_impl = 0;
 
     ACE_NEW_THROW_EX (config_impl,
@@ -103,12 +475,10 @@ namespace CIAO
     return configurator._retn ();
   }
 
-
   PortableServer::POA_ptr
   Servant_Impl_Base::_default_POA (
         ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   {
-
     return
       PortableServer::POA::_duplicate (container_->the_POA ());
   }
diff --git a/TAO/CIAO/ciao/Servant_Impl_Base.h b/TAO/CIAO/ciao/Servant_Impl_Base.h
index f3b5a693d17..67b736d99b2 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.h
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.h
@@ -42,22 +42,125 @@ namespace CIAO
    * Servant_Impl.
    */
   class CIAO_SERVER_Export Servant_Impl_Base
+    : public virtual POA_Components::CCMObject
   {
   public:
+    explicit Servant_Impl_Base (void);
+
     Servant_Impl_Base (Session_Container * c);
 
     virtual ~Servant_Impl_Base (void);
 
+    /// Operations for CCMObject interface.
+
+    virtual ::Components::PrimaryKeyBase *
+    get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::NoKeyAvailable));
+
+    virtual CORBA::IRObject_ptr
+    get_component_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual void
+    configuration_complete (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidConfiguration));
+
+    virtual void
+    remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::RemoveFailure));
+
+    virtual ::Components::ConnectionDescriptions *
+    get_connections (const char *name
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::ComponentPortDescription *
+    get_all_ports (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual CORBA::Object_ptr
+    provide_facet (const char *name
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::FacetDescriptions *
+    get_named_facets (const ::Components::NameList & names
+                        ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::FacetDescriptions *
+    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::ConsumerDescriptions *
+    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::EventConsumerBase_ptr
+    get_consumer (const char *sink_name
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::EventConsumerBase_ptr
+    disconnect_consumer (const char *source_name
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName,
+                       Components::NoConnection));
+
+    virtual ::Components::ConsumerDescriptions *
+    get_named_consumers (const ::Components::NameList & names
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::EmitterDescriptions *
+    get_all_emitters (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::EmitterDescriptions *
+    get_named_emitters (const ::Components::NameList & /* names */
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::ReceptacleDescriptions *
+    get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::ReceptacleDescriptions *
+    get_named_receptacles (const ::Components::NameList & /* names */
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
+    virtual ::Components::PublisherDescriptions *
+    get_all_publishers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::PublisherDescriptions *
+    get_named_publishers (const ::Components::NameList & names
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::InvalidName));
+
     /// Operation to set attributes on the component.
     virtual void set_attributes (const Components::ConfigValues &descr
                                  ACE_ENV_ARG_DECL) = 0;
 
-    //Creates and returns the StandardConfigurator for the component
+    // Creates and returns the StandardConfigurator for the component.
     virtual Components::StandardConfigurator *get_standard_configurator (
         ACE_ENV_SINGLE_ARG_DECL
       );
 
-        /// Override that returns the (passed-in) default POA of our member
+    /// Override that returns the (passed-in) default POA of our member
     /// component's container, to ensure that we get registered
     /// to that POA when _this() is called.
     virtual PortableServer::POA_ptr _default_POA (
@@ -70,13 +173,21 @@ namespace CIAO
 
     CORBA::Object_ptr lookup_facet (const char *port_name);
 
+    ::Components::FacetDescription *lookup_facet_description (
+        const char *port_name
+      );
+
     void add_consumer (const char *port_name,
                        ::Components::EventConsumerBase_ptr port_ref);
-                       
+
     ::Components::EventConsumerBase_ptr lookup_consumer (
         const char *port_name
       );
-                       
+
+    ::Components::ConsumerDescription *lookup_consumer_description (
+        const char *port_name
+      );
+
   protected:
     typedef ACE_Hash_Map_Manager_Ex<const char *,
                                     ::Components::FacetDescription_var,
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.cpp b/TAO/CIAO/ciao/Servant_Impl_T.cpp
index 7bee9698885..4e39010461f 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_T.cpp
@@ -48,67 +48,7 @@ namespace CIAO
     this->context_->_remove_ref ();
   }
 
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  ::Components::FacetDescriptions *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_facets (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::FacetDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::FacetDescriptions,
-                    0);
-
-    ::Components::FacetDescriptions_var retval = tmp;
-
-    retval->length (this->facet_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (FacetTable::iterator iter = this->facet_table_.begin ();
-         iter != this->facet_table_.end ();
-         ++iter, ++i)
-      {
-        FacetTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  ::Components::ConsumerDescriptions *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_consumers (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ::Components::ConsumerDescriptions *tmp = 0;
-    ACE_NEW_RETURN (tmp,
-                    ::Components::ConsumerDescriptions,
-                    0);
-
-    ::Components::ConsumerDescriptions_var retval = tmp;
-
-    retval->length (this->consumer_table_.current_size ());
-    CORBA::ULong i = 0;
-
-    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
-         iter != this->consumer_table_.end ();
-         ++iter, ++i)
-      {
-        ConsumerTable::ENTRY & entry = *iter;
-        retval[i] = entry.int_id_;
-      }
-
-    return retval._retn ();
-  }
+  // Operations for CCMObject interface.
 
   template <typename BASE_SKEL,
             typename EXEC,
@@ -155,67 +95,6 @@ namespace CIAO
             typename EXEC,
             typename EXEC_VAR,
             typename CONTEXT>
-  ::Components::PrimaryKeyBase *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_primary_key (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::Components::NoKeyAvailable))
-  {
-    ACE_THROW_RETURN (::Components::NoKeyAvailable (), 0);
-
-    return 0;
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
-  ::Components::ComponentPortDescription *
-  Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_ports (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    OBV_Components::ComponentPortDescription *cps = 0;
-    ACE_NEW_RETURN (cps,
-                    OBV_Components::ComponentPortDescription,
-                    0);
-    ::Components::ComponentPortDescription_var retv = cps;
-
-    ::Components::FacetDescriptions_var facets_desc =
-      this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ReceptacleDescriptions_var receptacle_desc =
-      this->get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::ConsumerDescriptions_var consumer_desc =
-      this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::EmitterDescriptions_var emitter_desc =
-      this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    ::Components::PublisherDescriptions_var publisher_desc =
-      this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    retv->facets (facets_desc.in ());
-    retv->receptacles (receptacle_desc.in ());
-    retv->consumers (consumer_desc.in ());
-    retv->emitters (emitter_desc.in ());
-    retv->publishers (publisher_desc.in ());
-
-    return retv._retn ();
-  }
-
-  template <typename BASE_SKEL,
-            typename EXEC,
-            typename EXEC_VAR,
-            typename CONTEXT>
   CORBA::Object_ptr
   Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::_get_component (
       ACE_ENV_SINGLE_ARG_DECL
@@ -250,7 +129,7 @@ namespace CIAO
                       ::CORBA::Object::_nil ());
   }
 
-    // CIAO-specific operations.
+  // CIAO-specific operations.
 
   template <typename BASE_SKEL,
             typename EXEC,
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.h b/TAO/CIAO/ciao/Servant_Impl_T.h
index 48af7435c3c..4bface2a5b8 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.h
+++ b/TAO/CIAO/ciao/Servant_Impl_T.h
@@ -43,21 +43,17 @@ namespace CIAO
             typename EXEC_VAR, 
             typename CONTEXT>
   class Servant_Impl : public virtual BASE_SKEL,
-                       public Servant_Impl_Base
+                       public virtual Servant_Impl_Base,
+                       public virtual PortableServer::RefCountServantBase
   {
   public:
     Servant_Impl (EXEC * exe,
                   Session_Container * c);
+                  
     virtual ~Servant_Impl (void);
    
-    virtual ::Components::FacetDescriptions *
-    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual ::Components::ConsumerDescriptions *
-    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-      
+    // Operations for CCMObject interface.
+
     virtual CORBA::Boolean
     same_component (CORBA::Object_ptr object_ref
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -67,20 +63,11 @@ namespace CIAO
     get_ccm_home (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual ::Components::PrimaryKeyBase *
-    get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::NoKeyAvailable));
-
-    virtual ::Components::ComponentPortDescription *
-    get_all_ports (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
     virtual CORBA::Object_ptr
     _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    // CIAO-specific operations.
+   // CIAO-specific operations.
 
     void
     ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/CIAO/ciao/ServerActivator_Impl.h b/TAO/CIAO/ciao/ServerActivator_Impl.h
index c80df8abef8..7ff3c783d7d 100644
--- a/TAO/CIAO/ciao/ServerActivator_Impl.h
+++ b/TAO/CIAO/ciao/ServerActivator_Impl.h
@@ -28,6 +28,9 @@
 #include "CIAO_ServersS.h"
 #include "Object_Set_T.h"
 
+#include "ace/SString.h"
+
+
 namespace CIAO
 {
   /**
diff --git a/TAO/CIAO/ciao/StandardConfigurator_Impl.h b/TAO/CIAO/ciao/StandardConfigurator_Impl.h
index 39bf3a132dd..99e8e6bd892 100644
--- a/TAO/CIAO/ciao/StandardConfigurator_Impl.h
+++ b/TAO/CIAO/ciao/StandardConfigurator_Impl.h
@@ -61,7 +61,7 @@ namespace CIAO
         ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void StandardConfigurator_Impl::configure (
+    void configure (
         Components::CCMObject_ptr comp
         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
diff --git a/TAO/CIAO/ciao/Version.h b/TAO/CIAO/ciao/Version.h
index 6f75b78837a..07555ab0b41 100644
--- a/TAO/CIAO/ciao/Version.h
+++ b/TAO/CIAO/ciao/Version.h
@@ -3,5 +3,5 @@
 
 #define CIAO_MAJOR_VERSION 0
 #define CIAO_MINOR_VERSION 4
-#define CIAO_BETA_VERSION 2
-#define CIAO_VERSION "0.4.2"
+#define CIAO_BETA_VERSION 4
+#define CIAO_VERSION "0.4.4"
diff --git a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd
index 1e2ce46e08c..cc0e8172430 100644
--- a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd
+++ b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd
@@ -50,7 +50,7 @@
     <xsd:choice>
       <xsd:element name="kind" type="Deployment:TCKind"/>
 <!--      
-@@ not used, what for?
+@@ not supported now..
 
       <xsd:element name="enum" type="Deployment:EnumType"/>
       <xsd:element name="objref" type="Deployment:ObjrefType"/>
@@ -200,12 +200,12 @@
   <xsd:complexType name="ArtifactDeploymentDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string" minOccurs="0"/>
+      <xsd:element name="source" type="xsd:string" maxOccurs="unbounded"/>
+      <xsd:element name="node" type="xsd:string"/>
       <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/>
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
-      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription" minOccurs="0"/>
+      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
@@ -214,10 +214,10 @@
   <xsd:complexType name="MonolithicDeploymentDescription">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string" maxOccurs="unbounded"/>
       <xsd:element name="artifact" type="xsd:IDREF" maxOccurs="unbounded"/> <!-- ArtifactDeploymentDescription -->
-      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
+      <xsd:element name="execParameter" type="Deployment:Property" maxOccurs="unbounded"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement" maxOccurs="unbounded"/>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
@@ -249,7 +249,8 @@
       <xsd:element name="node" type="xsd:string"/>
       <xsd:element name="source" type="xsd:string"/>
       <xsd:element name="implementation" type="xsd:IDREF"/> <!-- MonolithicDeploymentDescription -->
-      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+      <xsd:element name="configProperty" type="Deployment:Property"
+    minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
       <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
     </xsd:sequence>
@@ -329,11 +330,11 @@
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="source" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription" minOccurs="0"/>
+      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
 
diff --git a/TAO/CIAO/docs/schema/Modified_Deployment.xsd b/TAO/CIAO/docs/schema/Modified_Deployment.xsd
index af2f1885837..2e960712a9f 100644
--- a/TAO/CIAO/docs/schema/Modified_Deployment.xsd
+++ b/TAO/CIAO/docs/schema/Modified_Deployment.xsd
@@ -314,7 +314,7 @@
         <xsd:element name="label" type="xsd:string"/>
         <xsd:element name="UUID" type="xsd:string"/>
         <xsd:element name="specificType" type="xsd:string"/>
-        <xsd:element name="supportedType" type="xsd:string"/>
+        <xsd:element name="supportedType" type="xsd:string" maxOccurs="unbounded" />
         <xsd:element name="idlFile" type="xsd:string" minOccurs="0"/>
         <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
         <xsd:element name="port" type="Deployment:ComponentPortDescription" maxOccurs="unbounded"/>
@@ -382,21 +382,21 @@
 
   <xsd:complexType name="DeploymentPlan">
    <xsd:sequence>
-	<xsd:element name="label" type="xsd:string" minOccurs="0"/>
-    <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
-	<xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" />     
-    <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" />
-    <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
-    <!-- potentially recursive, not used
-      <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
-    -->
-    <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
-  	<xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
+     <xsd:element name="label" type="xsd:string" minOccurs="0"/>
+     <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
+     <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" />     
+     <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded" />
+     <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
+     <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
+     <!-- potentially recursive, not used
+          <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
+     -->
+     <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
+     <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
+     <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  
 
 
 
diff --git a/TAO/CIAO/docs/schema/ccd.xsd b/TAO/CIAO/docs/schema/ccd.xsd
index e4cb729b1f8..23dbc57b368 100644
--- a/TAO/CIAO/docs/schema/ccd.xsd
+++ b/TAO/CIAO/docs/schema/ccd.xsd
@@ -9,17 +9,17 @@
   <xsd:complexType name="ComponentInterfaceDescription">
     <xsd:choice>
       <xsd:sequence>
-        <xsd:element name="label" type="xsd:string"/>
-        <xsd:element name="UUID" type="xsd:string"/>
+        <xsd:element name="label" type="xsd:string" minOccurs="0"/>
+        <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>
         <xsd:element name="specificType" type="xsd:string"/>
-        <xsd:element name="supportedType" type="xsd:string"/>
-        <xsd:element name="idlFile" type="xsd:string" minOccurs="0"/>
-        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="supportedType" type="xsd:string" maxOccurs="unbounded"/>
+        <xsd:element name="idlFile" type="xsd:string" maxOccurs="unbounded"/>
+        <xsd:element name="configProperty" type="Deployment:Property" maxOccurs="unbounded"/>
         <xsd:element name="port" type="Deployment:ComponentPortDescription" maxOccurs="unbounded"/>
-        <xsd:element name="property" type="Deployment:ComponentPropertyDescription" minOccurs="0"/>
-        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="property" type="Deployment:ComponentPropertyDescription" maxOccurs="unbounded"/>
+        <xsd:element name="infoProperty" type="Deployment:Property" maxOccurs="unbounded"/>
       </xsd:sequence>
       <xsd:element name="contentLocation" type="xsd:string"/>
     </xsd:choice>
   </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/TAO/CIAO/docs/schema/cdp.xsd b/TAO/CIAO/docs/schema/cdp.xsd
index b907f4df0af..050fb0c3048 100644
--- a/TAO/CIAO/docs/schema/cdp.xsd
+++ b/TAO/CIAO/docs/schema/cdp.xsd
@@ -10,7 +10,7 @@
    <xsd:sequence>
 	<xsd:element name="label" type="xsd:string" minOccurs="0"/>
     <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
-	<xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" />     
+    <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" />     
     <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" />
     <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
     <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
diff --git a/TAO/CIAO/docs/schema/ciaopolicy.xsd b/TAO/CIAO/docs/schema/ciaopolicy.xsd
index 99d2274260b..93a7415c4b4 100644
--- a/TAO/CIAO/docs/schema/ciaopolicy.xsd
+++ b/TAO/CIAO/docs/schema/ciaopolicy.xsd
@@ -21,11 +21,25 @@
   <xs:complexType name="policyType">
     <xs:sequence>
       <xs:choice>
+        <xs:element name="rebindPolicy" type="ciao:rebindPolicyType" />
+        <xs:element name="syncScopePolicy" type="ciao:syncScopePolicyType" />
+        <xs:element name="requestPriorityPolicy" type="ciao:requestPriorityPolicyType" />
+        <xs:element name="replyPriorityPolicy" type="ciao:replyPriorityPolicyType" />
+        <xs:element name="requestStartTimePolicy" type="ciao:requestStartTimePolicyType" />
+        <xs:element name="requestEndTimePolicy" type="ciao:requestEndTimePolicyType" />
+        <xs:element name="replyStartTimePolicy" type="ciao:replyStartTimePolicyType" />
+        <xs:element name="replyEndTimePolicy" type="ciao:replyEndTimePolicyType" />
+        <xs:element name="relativeRequestTimeoutPolicy" type="ciao:relativeRequestTimeoutPolicyType" />
+        <xs:element name="relativeRoundtripPolicy" type="ciao:relativeRoundtripPolicyType" />
+        <xs:element name="routingPolicy" type="ciao:routingPolicyType" />
+        <xs:element name="maxHopsPolicy" type="ciao:maxHopsPolicyType" />
+        <xs:element name="queueOrderPolicy" type="ciao:queueOrderPolicyType" />
+        <xs:element name="priorityModelPolicy" type="ciao:priorityModelPolicyType" />
         <xs:element name="threadPoolPolicy" type="ciao:threadPoolPolicyType" />
         <xs:element name="serverProtocolPolicy" type="ciao:serverProtocolPolicyType" />
         <xs:element name="clientProtocolPolicy" type="ciao:clientProtocolPolicyType" />
         <xs:element name="privateConnectionPolicy" type="ciao:privateConnectionPolicyType" />
-        <xs:element name="priorityBandedPolicy" type="=ciao:priorityBandedPolicyType" />
+        <xs:element name="priorityBandedPolicy" type="ciao:priorityBandedPolicyType" />
       </xs:choice>
     </xs:sequence>
   </xs:complexType>
@@ -69,13 +83,340 @@
       <xs:enumeration value="ADD_OVERRIDE" />
     </xs:restriction>
   </xs:simpleType>
-
+  
 
   
   <!-- The following are extensions of policyBase, one each for each policy 
        we may want to group these into seperate schema documents, for our
        own sanity.
   -->
+  <!-- Policies 23 - 35 are defined in Messaging_No_Impl.pidl,
+       with the exception of policy 32, defined in Messaging_RT_Policy.pidl
+       and policy 24, defined in Messaging_SyncScope_Policy.pidl -->
+
+  <xs:complexType name="rebindPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents the RebindPolicy type, ID 23
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="rebindMode" type="ciao:rebindModeType" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="23" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:simpleType name="rebindModeType">
+    <xs:annotation>
+      <xs:documentation>
+        Note:  This is not strictly represented in the pidl as an enum,
+        but that appears to be the intent of the way it is declared.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="TRANSPARENT" />
+      <xs:enumeration value="NO_REBIND" />
+      <xs:enumeration value="NO_RECONNECT" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="syncScopePolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a SyncScopePolicyType, ID 24
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="synchronization" type="ciao:syncScopeType" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="25" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="syncScopeType">
+    <xs:annotation>
+      <xs:documentation>
+        Note: This was not declared an enum in Messaging_SyncScope_Policy.pidl,
+        but from the declaration, that appears to be the intent.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="SYNC_NONE" />
+      <xs:enumeration value="SYNC_WITH_TRANSPORT" />
+      <xs:enumeration value="SYNC_WITH_SERVER" />
+      <xs:enumeration value="SYNC_WITH_TARGET" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="requestPriorityPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a RequestPriorityPolicy, ID 25
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="priorityRange" type="ciao:priorityRangeType" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="25" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="replyPriorityPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a ReplyPriorityPolicy, ID 26
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="priorityRange" type="ciao:priorityRangeType" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="26" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="priorityRangeType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a PriorityRange struct defined in Messaging_No_Impl.pidl
+      </xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="min" type="xs:integer" />
+      <xs:element name="max" type="xs:integer" />
+    </xs:sequence>
+  </xs:complexType>
+  
+  
+  <xs:complexType name="requestStartTimePolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a RequestStartTimePolicy, ID 27
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="startTime" type="ciao:utcTime" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="27" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  
+  <xs:complexType name="requestEndTimePolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a RequestEndTimePolicy, ID 28
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="endTime" type="ciao:utcTime" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="28" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+
+  <xs:complexType name="replyStartTimePolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a ReplyStartTimePolicy, ID 29
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="startTime" type="ciao:utcTime" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="29" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+
+  <xs:complexType name="replyEndTimePolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a ReplyEndTimePolicy, ID 30
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="endTime" type="ciao:utcTime" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="30" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="utcTime">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a TimeBase::UtcT struct, defined in tao/TimeBase.pidl
+      </xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="time" type="xs:integer" />
+      <xs:element name="inaccLo" type="xs:integer" />
+      <xs:element name="inaccHi" type="xs:integer" />
+      <xs:element name="tdf" type="xs:integer" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="relativeRequestTimeoutPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a RelativeRequestTimeoutPolicy, ID 31.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="relativeExpiry" type="xs:integer" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="31" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="relativeRoundtripPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a RelativeRoundtripPolicy, ID 32
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="relativeExpiry" type="xs:integer" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="32" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="routingPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a RoutingPolicy, ID 33
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="routingTypeRangeMin" type="ciao:routingType" />
+          <xs:element name="routingTypeRangeMax" type="ciao:routingType" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="33" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="routingType">
+    <xs:annotation>
+      <xs:documentation>
+        Note: This is not explicitly set up as an enum in Messaging_No_Impl.pidl,
+        but that appears to be the intent from the declaration.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="ROUTE_NONE" />
+      <xs:enumeration value="ROUTE_FORWARD" />
+      <xs:enumeration value="ROUTE_STORE_AND_FORWARD" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="maxHopsPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a MaxHopsPolicy, ID 34
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="maxHops" type="xs:integer" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="34" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="queueOrderPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents a QueueOrderPolicy, ID 35
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="allowedOrders" type="ciao:ordersType" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="35" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:simpleType name="ordersType">
+    <xs:annotation>
+      <xs:documentation>
+        Note: This is not explicitly declared to be an enum in Messaging_No_Impl.pidl,
+        but that appears to be the intent from the declaration.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="ORDER_ANY" />
+      <xs:enumeration value="ORDER_TEMPORAL" />
+      <xs:enumeration value="ORDER_PRIORITY" />
+      <xs:enumeration value="ORDER_DEADLINE" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <!-- Policies 40 - 45 are defined in RTCORBA.pidl -->
+  <!-- priorityModelPolicy -->
+  <xs:complexType name="priorityModelPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        Represents the Priority Model Policy, ID 40
+      </xs:documentation>
+    </xs:annotation>
+    
+    <xs:complexContent>
+      <xs:extension base="ciao:policyBase">
+        <xs:sequence>
+          <xs:element name="priorityModel" type="ciao:priorityModelType" />
+          <xs:element name="serverPriority" type="xs:integer" />
+        </xs:sequence>
+        <xs:attribute name="typeID" type="xs:integer" use="required" fixed="40" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:simpleType name="priorityModelType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="CLIENT_PROPAGATED" />
+      <xs:enumeration value="SERVER_DECLARED" />
+    </xs:restriction>
+  </xs:simpleType>
 
   <!-- threadPoolPolicy -->
 
@@ -152,8 +493,8 @@
       <xs:choice>
         <xs:element name="tcpProtocolProperties" type="ciao:tcpProtocolPropertiesType" />
         <xs:element name="giopProtocolProperties" type="ciao:giopProtocolPropertiesType" />
-        <xs:element name="unixDomainProtocolProperties" type="unixDomainProtocolPropertiesType" />
-        <xs:element name="sharedMemoryProtocolProperties" type="sharedMemoryProtocolPropertiesType" />
+        <xs:element name="unixDomainProtocolProperties" type="ciao:unixDomainProtocolPropertiesType" />
+        <xs:element name="sharedMemoryProtocolProperties" type="ciao:sharedMemoryProtocolPropertiesType" />
       </xs:choice>
     </xs:sequence>
   </xs:complexType>
@@ -182,15 +523,15 @@
     </xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="giopProtocolProperties">
+  <xs:complexType name="giopProtocolPropertiesType">
     <xs:complexContent>
       <xs:extension base="ciao:protocolPropertyBase" />
     </xs:complexContent>
   </xs:complexType>
   
-  <xs:complexType name="unixDomainProtocolProperties">
+  <xs:complexType name="unixDomainProtocolPropertiesType">
     <xs:complexContent>
-      <xs:extension base="ciao:protocolProperyBase">
+      <xs:extension base="ciao:protocolPropertyBase">
         <xs:sequence>
           <xs:element name="sendBufferSize" type="xs:integer" />
           <xs:element name="recvBufferSize" type="xs:integer" />
@@ -199,7 +540,7 @@
     </xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="sharedMemoryProtocolProperties">
+  <xs:complexType name="sharedMemoryProtocolPropertiesType">
     <xs:complexContent>
       <xs:extension base="ciao:protocolPropertyBase">
         <xs:sequence>
@@ -215,8 +556,14 @@
 
   <!-- privateConnectionPolicy -->
   <xs:complexType name="privateConnectionPolicyType">
+    <xs:annotation>
+      <xs:documentation>
+        privateConnectionPolicy extension of policyBase, ID 44
+      </xs:documentation>
+    </xs:annotation>
     <xs:complexContent>
       <xs:extension base="ciao:policyBase">
+        <!-- empty -->
         <xs:attribute name="typeID" type="xs:integer" use="required" fixed="44" />
       </xs:extension>
     </xs:complexContent>
diff --git a/TAO/CIAO/docs/tutorial/Hello/hello_exec.cpp b/TAO/CIAO/docs/tutorial/Hello/hello_exec.cpp
index bbeb128d9c8..6a43ad843d8 100644
--- a/TAO/CIAO/docs/tutorial/Hello/hello_exec.cpp
+++ b/TAO/CIAO/docs/tutorial/Hello/hello_exec.cpp
@@ -2,6 +2,9 @@
 
 #include "hello_exec.h"
 
+#include "ace/OS_NS_string.h"
+
+
 hello_example::HelloWorld_Impl::HelloWorld_Impl ()
 {
 }
@@ -12,7 +15,7 @@ hello_example::HelloWorld_Impl::~HelloWorld_Impl ()
 
 char *
 hello_example::HelloWorld_Impl::sayhello (const char *username
-					  ACE_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static const char *fmt = "Hello World message for ";
@@ -34,14 +37,14 @@ hello_example::HelloWorld_Impl::set_session_context (
     Components::SessionContext_ptr ctx
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   Components::CCMException))
+                   Components::CCMException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "hello_example::HelloWorld_Impl::set_session_context\n"));
 
   this->context_ =
     hello_example::HelloWorld_Exec_Context::_narrow (ctx
-						     ACE_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 
@@ -51,16 +54,16 @@ hello_example::HelloWorld_Impl::set_session_context (
 }
 
 void
-hello_example::HelloWorld_Impl::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
+hello_example::HelloWorld_Impl::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   Components::CCMException))
+                   Components::CCMException))
 {
 }
 
 void
 hello_example::HelloWorld_Impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   Components::CCMException))
+                   Components::CCMException))
 {
 }
 
@@ -68,7 +71,7 @@ void
 hello_example::HelloWorld_Impl::ciao_postactivate (
     ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   Components::CCMException))
+                   Components::CCMException))
 {
 }
 
@@ -76,14 +79,14 @@ void
 hello_example::HelloWorld_Impl::ccm_passivate (
     ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   Components::CCMException))
+                   Components::CCMException))
 {
 }
 
 void
 hello_example::HelloWorld_Impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   Components::CCMException))
+                   Components::CCMException))
 {
 }
 
diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver.idl b/TAO/CIAO/examples/Hello/Receiver/Receiver.idl
index bf03b35237e..44b3ab09375 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver.idl
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.idl
@@ -15,6 +15,10 @@ module Hello
   component Receiver
   {
     uses message read_message;
+    
+    // Not use in test, just used to test 'uses multiple'.
+    uses multiple message gather_messages;
+    
     consumes timeout click_in;
   };
 
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc
index dd6587e30bb..3a34534e512 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc
@@ -5,9 +5,16 @@
 project(BMClosedED_stub): ciao_client {
   after += BasicSP_stub
   sharedname = BMClosedED_stub
-  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h
+   
+  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export 
+  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h 
+  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags += -Wb,skel_export_include=BMClosedED_svnt_export.h
+
   dynamicflags   = BMCLOSEDED_STUB_BUILD_DLL
 
+  libs += BasicSP_stub
+
   IDL_Files {
     BMClosedED.idl
   }
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
index e8fcb553049..a08164ffc10 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -3,6 +3,8 @@
 #include "ciao/CIAO_common.h"
 #include "BMClosedED_exec.h"
 
+#include "ace/OS_NS_string.h"
+
 #define DISPLACEMENT 256
 
 /// Default constructor.
@@ -183,8 +185,8 @@ MyImpl::BMClosedEDHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
   Components::EnterpriseComponent_ptr tmp =
     Components::EnterpriseComponent::_nil ();
   ACE_NEW_THROW_EX (tmp,
-		                MyImpl::BMClosedED_exec_i,
-		                CORBA::NO_MEMORY ());
+                                MyImpl::BMClosedED_exec_i,
+                                CORBA::NO_MEMORY ());
   return tmp;
 }
 
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc
index 2c618860cb9..af2e66ae3a6 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc
@@ -2,9 +2,16 @@
 
 project(BMDevice_stub): ciao_client {
   after += BasicSP_stub
+
   sharedname = BMDevice_stub
 
-  idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h
+  libs += BasicSP_stub
+
+  idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export 
+  idlflags += -Wb,stub_export_include=BMDevice_stub_export.h 
+  idlflags += -Wb,skel_export_macro=BMDEVICE_SVNT_Export 
+  idlflags += -Wb,skel_export_include=BMDevice_svnt_export.h
+
   libpaths += ..
   libs += BasicSP_stub
   dynamicflags   = BMDEVICE_STUB_BUILD_DLL
@@ -21,9 +28,13 @@ project(BMDevice_stub): ciao_client {
 project(BMDevice_svnt) : ciao_servant {
   after += BMDevice_stub BasicSP_stub
   sharedname  = BMDevice_svnt
+
   libs    += BMDevice_stub BasicSP_stub BasicSP_svnt
+
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=BMDEVICE_SVNT_Export -Wb,export_include=BMDevice_svnt_export.h
+
+  idlflags  +=  -Wb,export_macro=BMDEVICE_SVNT_Export 
+  idlflags += -Wb,export_include=BMDevice_svnt_export.h
   dynamicflags = BMDEVICE_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -46,8 +57,9 @@ project(BMDevice_exec) : ciao_component {
   after += BMDevice_svnt
   sharedname = BMDevice_exec
   libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=BMDEVICE_EXEC_Export -Wb,export_include=BMDevice_exec_export.h
+  libpaths  += ..
+  idlflags  +=  -Wb,export_macro=BMDEVICE_EXEC_Export 
+  idlflags  += -Wb,export_include=BMDevice_exec_export.h
   dynamicflags   = BMDEVICE_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc
index 5c0a113b9c8..539650f007f 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc
@@ -3,8 +3,16 @@
 
 project(BMDisplay_stub): ciao_client {
   after += BasicSP_stub
+  
   sharedname = BMDisplay_stub
-  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h
+
+  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export 
+  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h 
+  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export 
+  idlflags += -Wb,skel_export_include=BMDisplay_svnt_export.h
+
+  libs += BasicSP_stub
+
   dynamicflags   = BMDISPLAY_STUB_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc
index b5d7a251536..3544eac4714 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc
@@ -4,7 +4,14 @@
 project(EC_stub): ciao_client {
   after += BasicSP_stub
   sharedname = EC_stub
-  idlflags += -Wb,stub_export_macro=EC_STUB_Export -Wb,stub_export_include=EC_stub_export.h -Wb,skel_export_macro=EC_SVNT_Export -Wb,skel_export_include=EC_svnt_export.h
+
+  libs += BasicSP_stub
+
+  idlflags += -Wb,stub_export_macro=EC_STUB_Export 
+  idlflags += -Wb,stub_export_include=EC_stub_export.h 
+  idlflags += -Wb,skel_export_macro=EC_SVNT_Export 
+  idlflags += -Wb,skel_export_include=EC_svnt_export.h
+
   dynamicflags   = EC_STUB_BUILD_DLL
 
   IDL_Files {
@@ -19,9 +26,11 @@ project(EC_stub): ciao_client {
 project(EC_svnt) : ciao_servant {
   after += BasicSP_svnt EC_stub
   sharedname  = EC_svnt
-  libs    += EC_stub BasicSP_stub BasicSP_svnt
+  libs     += EC_stub BasicSP_stub BasicSP_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=EC_SVNT_Export -Wb,export_include=EC_svnt_export.h
+  idlflags += -Wb,export_macro=EC_SVNT_Export 
+  idlflags += -Wb,export_include=EC_svnt_export.h
+
   dynamicflags = EC_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -44,8 +53,9 @@ project(EC_exec) : ciao_component {
   after += EC_svnt
   sharedname = EC_exec
   libs      += EC_stub BasicSP_stub EC_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=EC_EXEC_Export -Wb,export_include=EC_exec_export.h
+  libpaths  += ..
+  idlflags  +=  -Wb,export_macro=EC_EXEC_Export 
+  idlflags  += -Wb,export_include=EC_exec_export.h
   dynamicflags   = EC_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp
index 766defe147b..d4930ceec3c 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp
@@ -24,13 +24,13 @@ MyImpl::timeout_Handler::~timeout_Handler ()
 }
 
 int
-MyImpl::timeout_Handler::open ()
+MyImpl::timeout_Handler::open_h ()
 {
   return this->activate ();
 }
 
 int
-MyImpl::timeout_Handler::close ()
+MyImpl::timeout_Handler::close_h()
 {
   this->done_ = 1;
   this->reactor ()->notify ();
@@ -217,7 +217,7 @@ MyImpl::EC_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_activate\n"));
 
-  this->pulser_.open ();
+  this->pulser_.open_h ();
 }
 
 void
@@ -234,7 +234,7 @@ MyImpl::EC_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_passivate\n"));
-  this->pulser_.close ();
+  this->pulser_.close_h ();
 }
 
 void
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.h b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.h
index c0181bdf37c..057f8f70f14 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.h
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.h
@@ -34,9 +34,9 @@ namespace MyImpl
     timeout_Handler (EC_exec_i *cb);
     ~timeout_Handler ();
 
-    int open (void);
+    int open_h (void);
 
-    int close (void);
+    int close_h (void);
 
     int start (CORBA::Long hertz);
 
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc b/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc
index 635fb423371..3b7a859de56 100644
--- a/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc
@@ -5,7 +5,14 @@
 project(GPS_stub): ciao_client {
   after += HUDisplay_stub
   sharedname = GPS_stub
-  idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h
+  
+  libs += HUDisplay_stub
+
+  idlflags += -Wb,stub_export_macro=GPS_STUB_Export 
+  idlflags += -Wb,stub_export_include=GPS_stub_export.h 
+  idlflags += -Wb,skel_export_macro=GPS_SVNT_Export 
+  idlflags += -Wb,skel_export_include=GPS_svnt_export.h
+
   dynamicflags   = GPS_STUB_BUILD_DLL
 
   IDL_Files {
@@ -20,9 +27,14 @@ project(GPS_stub): ciao_client {
 project(GPS_svnt) : ciao_servant {
   after += HUDisplay_svnt GPS_stub
   sharedname  = GPS_svnt
+
   libs    += GPS_stub HUDisplay_stub HUDisplay_svnt
+
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h
+
+  idlflags  +=  -Wb,export_macro=GPS_SVNT_Export 
+  idlflags  += -Wb,export_include=GPS_svnt_export.h
+
   dynamicflags = GPS_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -46,7 +58,8 @@ project(GPS_exec) : ciao_component {
   sharedname = GPS_exec
   libs      += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h
+  idlflags  += -Wb,export_macro=GPS_EXEC_Export 
+  idlflags  += -Wb,export_include=GPS_exec_export.h
   dynamicflags   = GPS_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -64,7 +77,8 @@ project(GPS_tracing_exec) : ciao_component {
   sharedname = GPS_tracing_exec
   libs      += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h
+  idlflags  += -Wb,export_macro=GPS_EXEC_Export 
+  idlflags  += -Wb,export_include=GPS_exec_export.h
   dynamicflags   = GPS_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc
index 4123dcdb27a..aa7d123f11d 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc
@@ -4,7 +4,14 @@
 project(NavDisplay_stub): ciao_client {
   after += HUDisplay_stub
   sharedname = NavDisplay_stub
-  idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h
+  
+  libs += HUDisplay_stub
+
+  idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export 
+  idlflags += -Wb,stub_export_include=NavDisplay_stub_export.h 
+  idlflags += -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export 
+  idlflags += -Wb,skel_export_include=NavDisplay_svnt_export.h
+
   dynamicflags   = NAVDISPLAY_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,7 +28,8 @@ project(NavDisplay_svnt) : ciao_servant {
   sharedname  = NavDisplay_svnt
   libs    += NavDisplay_stub HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h
+  idlflags  += -Wb,export_macro=NAVDISPLAY_SVNT_Export 
+  idlflags  += -Wb,export_include=NavDisplay_svnt_export.h
   dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -45,7 +53,8 @@ project(NavDisplay_exec) : ciao_component {
   sharedname = NavDisplay_exec
   libs      += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h
+  idlflags  += -Wb,export_macro=NAVDISPLAY_EXEC_Export 
+  idlflags  += -Wb,export_include=NavDisplay_exec_export.h
   dynamicflags   = NAVDISPLAY_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/DetailView.cpp b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/DetailView.cpp
index 8a5c61d3c2f..95125600100 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/DetailView.cpp
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/DetailView.cpp
@@ -127,9 +127,9 @@ DetailView::currentNode(NavUnit *unit)
 void
 DetailView::updateLocation(const UnitLocation &loc)
 {
-  x_edit->setValue(loc.x_);
-  y_edit->setValue(loc.y_);
-  z_edit->setValue(loc.z_);
+  x_edit->setValue(static_cast<int>(loc.x_));
+  y_edit->setValue(static_cast<int>(loc.y_));
+  z_edit->setValue(static_cast<int>(loc.z_));
 }
 
 void
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index e48a08219bd..cb5cea1b621 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(NavDisplayGUI_exec) : ciao_component, qt, qt_moc {
+project(NavDisplayGUI_exec) : ciao_component, qt {
   after   += NavDisplay_exec
   requires += qt
   sharedname = NavDisplayGUI_exec
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
index 1b704d38678..224e0cac41b 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
@@ -10,7 +10,7 @@
 #include "AddNavUnitCmd.h"
 #include "Worker.h"
 
-static char *argv[] =
+static const char *argv[] =
 {
   "NavDisplayGUI"
 };
@@ -109,7 +109,7 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG, "ENTER: MyImpl::NavDisplayGUI_exec_impl::ccm_activate\n"));
 
-  worker_ = new Worker(sizeof(argv)/sizeof(argv[0]), argv);
+  worker_ = new Worker(sizeof(argv)/sizeof(argv[0]), const_cast<char **> (argv));
 
   if (worker_->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
   {
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README
index 83b58e12736..c5cb76a6fd9 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README
@@ -1,7 +1,7 @@
 This example is the Qt-based GUI implementation of NavDisplay component.
 
 It is NOT necessary to compile ACE/TAO/CIAO with Qt support,
-i.e. ACE_HAS_QT since this example does not relyes on Qt Reactor and
+since this example does not relyes on Qt Reactor and
 communicates with GUI part using QApplication::postMessage() and
 simple Command Pattern based framework.  But be sure that QTDIR
 environment variable is pointed to your Qt installation directory.
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc
index cfe7fc7e2a3..649aa038b66 100644
--- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc
@@ -4,8 +4,15 @@
 project(RateGen_stub): ciao_client {
   after += HUDisplay_stub
   sharedname = RateGen_stub
-  idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h
+
+  idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export 
+  idlflags += -Wb,stub_export_include=RateGen_stub_export.h 
+  idlflags += -Wb,skel_export_macro=RATEGEN_SVNT_Export 
+  idlflags += -Wb,skel_export_include=RateGen_svnt_export.h
+
   dynamicflags   = RATEGEN_STUB_BUILD_DLL
+ 
+  libs += HUDisplay_stub
 
   IDL_Files {
     RateGen.idl
@@ -21,7 +28,8 @@ project(RateGen_svnt) : ciao_servant {
   sharedname  = RateGen_svnt
   libs    += RateGen_stub HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h
+  idlflags +=  -Wb,export_macro=RATEGEN_SVNT_Export 
+  idlflags += -Wb,export_include=RateGen_svnt_export.h
   dynamicflags = RATEGEN_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -44,8 +52,9 @@ project(RateGen_exec) : ciao_component {
   after   += RateGen_svnt
   sharedname = RateGen_exec
   libs      += RateGen_stub HUDisplay_stub RateGen_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h
+  libpaths  += ..
+  idlflags  +=  -Wb,export_macro=RATEGEN_EXEC_Export 
+  idlflags  += -Wb,export_include=RateGen_exec_export.h
   dynamicflags   = RATEGEN_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp
index 4691c7cd8fc..a79c4d0a3b1 100644
--- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp
@@ -24,13 +24,13 @@ MyImpl::Pulse_Handler::~Pulse_Handler ()
 }
 
 int
-MyImpl::Pulse_Handler::open ()
+MyImpl::Pulse_Handler::open_h ()
 {
   return this->activate ();
 }
 
 int
-MyImpl::Pulse_Handler::close ()
+MyImpl::Pulse_Handler::close_h ()
 {
   this->done_ = 1;
   this->reactor ()->notify ();
@@ -242,7 +242,7 @@ MyImpl::RateGen_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                   "MyImpl::RateGen_exec_i::ccm_activate\n"));
     }
 
-  this->pulser_.open ();
+  this->pulser_.open_h ();
 }
 
 void
@@ -263,7 +263,7 @@ MyImpl::RateGen_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                   "MyImpl::RateGen_exec_i::ccm_passivate\n"));
     }
 
-  this->pulser_.close ();
+  this->pulser_.close_h ();
 }
 
 void
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.h b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.h
index 9d9779c4b02..7e29d047e75 100644
--- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.h
+++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.h
@@ -32,9 +32,9 @@ namespace MyImpl
     Pulse_Handler (RateGen_exec_i *cb);
     ~Pulse_Handler ();
 
-    int open (void);
+    int open_h (void);
 
-    int close (void);
+    int close_h (void);
 
     int start (CORBA::Long hertz);
 
diff --git a/TAO/CIAO/examples/OEP/Display/descriptors/NOTE-win.txt b/TAO/CIAO/examples/OEP/Display/descriptors/NOTE-win.txt
index b0c07f899f5..463c05cb080 100644
--- a/TAO/CIAO/examples/OEP/Display/descriptors/NOTE-win.txt
+++ b/TAO/CIAO/examples/OEP/Display/descriptors/NOTE-win.txt
@@ -29,7 +29,7 @@ Assembly Deployer
 
     w:\TAO\CIAO\examples\OEP\Display\descriptors\
     title Assembly Deployer
-    .....\tools\Assembly_Deployer\Assembly_Deployer -k file://ior  -a HUDisplay.cad
+    .....\tools\Assembly_Deployer\Assembly_Deployer -k file://ior  -a HUDisplay.cad -o IDfile
 
 client
 ------
@@ -39,6 +39,12 @@ client
     ..\RateGen\controller -o
 
 
+Tearing down the application:
+-----------------------------
+
+    .....\tools\Assembly_Deployer\Assembly_Deployer -k file://ior  -d IDfile
+
+
 RT-server-test:
 ===============
 
@@ -70,7 +76,7 @@ Assembly Deployer
 
     w:\TAO\CIAO\examples\OEP\Display\descriptors\
     title Assembly Deployer
-    .....\tools\Assembly_Deployer\Assembly_Deployer -k file://ior  -a HUDisplay-rtcad.cad
+    .....\tools\Assembly_Deployer\Assembly_Deployer -k file://ior  -a HUDisplay-rtcad.cad -o IDfile
 
 client
 ------
@@ -78,3 +84,8 @@ client
     w:\TAO\CIAO\examples\OEP\Display\descriptors\
     title Controller
     ..\RateGen\controller -o
+
+Tearing down the application:
+-----------------------------
+
+    .....\tools\Assembly_Deployer\Assembly_Deployer -k file://ior  -d IDfile
diff --git a/TAO/CIAO/examples/OEP/Display/descriptors/NOTE.txt b/TAO/CIAO/examples/OEP/Display/descriptors/NOTE.txt
index fd1ddd8763f..902735238e3 100644
--- a/TAO/CIAO/examples/OEP/Display/descriptors/NOTE.txt
+++ b/TAO/CIAO/examples/OEP/Display/descriptors/NOTE.txt
@@ -86,11 +86,11 @@ Step 3:
   You then need to instruct the Assembly_Manager to deploy a specific
   component assembly descriptor.  For example:
 
-    ${CIAO_ROOT}/tools/Assembly_Deployer/Assembly_Deployer -k file://ior  -a BasicSP.cad
+    ${CIAO_ROOT}/tools/Assembly_Deployer/Assembly_Deployer -k file://ior  -a BasicSP.cad -o IDfile
 
   or
 
-    %CIAO_ROOT%/tools/Assembly_Deployer/Assembly_Deployer -k file://ior  -a BasicSP.cad
+    %CIAO_ROOT%/tools/Assembly_Deployer/Assembly_Deployer -k file://ior  -a BasicSP.cad -o IDfile
 
 Step 4:
 =======
@@ -121,11 +121,16 @@ Step 4:
 Step 5:
 =======
 
-  Once you are done with the test.  Press <enter> in the shell window
-  running Assembly_Deployer that you started in Step 3.  This will
+  Once you are done with the test.  Use the following command to
   tear_down the application, kill all ComponentServer's, and terminate
   both the Assembly_Deployer and Assembly_Manager process.
 
+    ${CIAO_ROOT}/tools/Assembly_Deployer/Assembly_Deployer -k file://ior  -d IDfile
+
+  or
+
+    %CIAO_ROOT%/tools/Assembly_Deployer/Assembly_Deployer -k file://ior  -d IDfile
+
   Repeat Step 2-5 using different configurations and assembly
   descriptors.
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
index 6d8f33460ea..d8c8b1c966e 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
@@ -5,7 +5,7 @@ project (Multi_Threaded_client) : ciao_client, valuetype , strategies{
   after += RoundTripClient_stub
   libs += RoundTripClient_stub Benchmark_stub
   libpaths += ..
-  includes += ../RoundTripClient/
+  includes += ../RoundTripClient
 
   IDL_Files {
   }
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index 1cda8a59e02..88abbd6494a 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -4,7 +4,14 @@
 project(RoundTrip_stub): ciao_client {
   after += Benchmark_stub
   sharedname = RoundTrip_stub
-  idlflags += -Wb,stub_export_macro=ROUNDTRIP_STUB_Export -Wb,stub_export_include=RoundTrip_stub_export.h -Wb,skel_export_macro=ROUNDTRIP_SVNT_Export -Wb,skel_export_include=RoundTrip_svnt_export.h
+
+  libs     += Benchmark_stub
+
+  idlflags += -Wb,stub_export_macro=ROUNDTRIP_STUB_Export 
+  idlflags += -Wb,stub_export_include=RoundTrip_stub_export.h 
+  idlflags += -Wb,skel_export_macro=ROUNDTRIP_SVNT_Export 
+  idlflags += -Wb,skel_export_include=RoundTrip_svnt_export.h
+
   dynamicflags   = ROUNDTRIP_STUB_BUILD_DLL
 
   IDL_Files {
@@ -19,9 +26,14 @@ project(RoundTrip_stub): ciao_client {
 project(RoundTrip_svnt) : ciao_servant {
   after += Benchmark_svnt RoundTrip_stub
   sharedname  = RoundTrip_svnt
+
   libs    += RoundTrip_stub Benchmark_stub Benchmark_svnt
+
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=ROUNDTRIP_SVNT_Export -Wb,export_include=RoundTrip_svnt_export.h
+
+  idlflags +=  -Wb,export_macro=ROUNDTRIP_SVNT_Export 
+  idlflags += -Wb,export_include=RoundTrip_svnt_export.h
+
   dynamicflags = ROUNDTRIP_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -43,9 +55,13 @@ project(RoundTrip_svnt) : ciao_servant {
 project(RoundTrip_exec) : ciao_component {
   after += RoundTrip_svnt
   sharedname = RoundTrip_exec
-  libs      += RoundTrip_stub Benchmark_stub RoundTrip_svnt
+
+  libs     += RoundTrip_stub Benchmark_stub RoundTrip_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=ROUNDTRIP_EXEC_Export -Wb,export_include=RoundTrip_exec_export.h
+
+  idlflags +=  -Wb,export_macro=ROUNDTRIP_EXEC_Export 
+  idlflags += -Wb,export_include=RoundTrip_exec_export.h
+
   dynamicflags   = ROUNDTRIP_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 9ca96a7da72..08bd7c111d9 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -90,12 +90,6 @@ main (int argc, char *argv[])
       //set priority on the platform
       set_priority();
 
-      if (parse_args(argc, argv) == -1)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Error parsing Arguments\n"));
-          return -1;
-        }
-
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
@@ -103,6 +97,12 @@ main (int argc, char *argv[])
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      if (parse_args(argc, argv) == -1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Error parsing Arguments\n"));
+          return -1;
+        }
+
       // Resolve HomeFinder interface
       CORBA::Object_var obj
         = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
index 90c2bb71eac..99b0968e61b 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
@@ -4,7 +4,14 @@
 project(RoundTripClient_stub): ciao_client {
   after += Benchmark_stub
   sharedname = RoundTripClient_stub
-  idlflags += -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export -Wb,stub_export_include=RoundTripClient_stub_export.h -Wb,skel_export_macro=ROUNDTRIPCLIENT_SVNT_Export -Wb,skel_export_include=RoundTripClient_svnt_export.h
+
+  libs     += Benchmark_stub
+
+  idlflags += -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export 
+  idlflags += -Wb,stub_export_include=RoundTripClient_stub_export.h 
+  idlflags += -Wb,skel_export_macro=ROUNDTRIPCLIENT_SVNT_Export 
+  idlflags += -Wb,skel_export_include=RoundTripClient_svnt_export.h
+
   dynamicflags   = ROUNDTRIPCLIENT_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,7 +28,10 @@ project(RoundTripClient_svnt) : ciao_servant {
   sharedname  = RoundTripClient_svnt
   libs    += RoundTripClient_stub Benchmark_stub Benchmark_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=ROUNDTRIPCLIENT_SVNT_Export -Wb,export_include=RoundTripClient_svnt_export.h
+
+  idlflags +=  -Wb,export_macro=ROUNDTRIPCLIENT_SVNT_Export 
+  idlflags +=-Wb,export_include=RoundTripClient_svnt_export.h
+
   dynamicflags = ROUNDTRIPCLIENT_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -42,10 +52,16 @@ project(RoundTripClient_svnt) : ciao_servant {
 
 project(RoundTripClient_exec) : ciao_component {
   after += RoundTripClient_svnt
+
   sharedname = RoundTripClient_exec
+
   libs      += RoundTripClient_stub Benchmark_stub RoundTripClient_svnt
+
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=ROUNDTRIPCLIENT_EXEC_Export -Wb,export_include=RoundTripClient_exec_export.h
+
+  idlflags  += -Wb,export_macro=ROUNDTRIPCLIENT_EXEC_Export 
+  idlflags  += -Wb,export_include=RoundTripClient_exec_export.h
+
   dynamicflags   = ROUNDTRIPCLIENT_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
index 885c0d6d012..9bb151d9940 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project (RoundTripServer) : taoserver, strategies, ciao_servant {
+project (RoundTripServer) : strategies, ciao_server {
   after += Benchmark_svnt
   libs    += Benchmark_stub Benchmark_svnt
   libpaths += ..
diff --git a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index 01fb78d3f9c..2ea3c57a1c3 100644
--- a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -4,6 +4,8 @@
 #include "ReceiverC.h"
 #include "tao/ORB_Constants.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_string.h"
+
 
 static const char *sender_ior = "file://sender.ior";
 static const char *distributor_ior = "file://distributor.ior";
@@ -16,7 +18,7 @@ static CORBA::ULong invocation_rate = 5;
 static int count_missed_end_deadlines = 0;
 static int do_dump_history = 0;
 static int print_missed_invocations = 0;
-static CORBA::ULong message_size = 0;
+static CORBA::ULong message_size = 100;
 static const char *test_protocol = "IIOP";
 static int print_statistics = 1;
 static int number_of_connection_attempts = 20;
@@ -171,7 +173,7 @@ main (int argc, char *argv[])
 
       CORBA::ULong test_protocol_tag = IOP::TAG_INTERNET_IOP;
       if (ACE_OS::strcmp (test_protocol, "DIOP") == 0)
-        test_protocol_tag = TAO_TAG_UDP_PROFILE;
+        test_protocol_tag = TAO_TAG_DIOP_PROFILE;
       else if (ACE_OS::strcmp (test_protocol, "SCIOP") == 0)
         test_protocol_tag = TAO_TAG_SCIOP_PROFILE;
 
diff --git a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index b24ccfcf9e8..d5d4edbe507 100644
--- a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -3,6 +3,7 @@
 
 project(Protocols_Receiver_stub): ciao_client {
   libs += Protocols_stub
+  requires += exceptions
   after += Protocols_stub
   sharedname = Protocols_Receiver_stub
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export -Wb,stub_export_include=Receiver_stub_export.h -Wb,skel_export_macro=RECEIVER_SVNT_Export -Wb,skel_export_include=Receiver_svnt_export.h
@@ -21,7 +22,7 @@ project(Protocols_Receiver_svnt) : ciao_servant {
   after += Protocols_svnt Protocols_Receiver_stub
   sharedname  = Protocols_Receiver_svnt
   libs    += Protocols_Receiver_stub Protocols_stub Protocols_svnt
-  
+  requires += exceptions
   idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
@@ -44,18 +45,15 @@ project(Protocols_Receiver_svnt) : ciao_servant {
 project(Protocols_Receiver_exec) : ciao_component {
   after   += Protocols_Receiver_svnt
   sharedname = Protocols_Receiver_exec
-  requires += dummy
   libs      += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_svnt
-  
+  requires += exceptions
   idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
   }
 
   Source_Files {
-    
     Receiver_exec.cpp
   }
 }
diff --git a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.idl b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.idl
index 2de14607b5d..e76f0922215 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.idl
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.idl
@@ -24,7 +24,7 @@ module Protocols
                 in unsigned long number_of_connection_attempts,
                 in boolean enable_diffserv_code_points,
                 in short priority,
-                in Test_Type test_type);
+                in Test_Type testtype);
 
     void shutdown ();
   };
diff --git a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index b517cc2d754..cdec19cd856 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -3,7 +3,7 @@
 
 project(Protocols_Sender_stub): ciao_client {
   libs += Protocols_stub
-
+  requires += exceptions
   after += Protocols_stub
   sharedname = Protocols_Sender_stub
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export -Wb,stub_export_include=Sender_stub_export.h -Wb,skel_export_macro=SENDER_SVNT_Export -Wb,skel_export_include=Sender_svnt_export.h
@@ -22,7 +22,7 @@ project(Protocols_Sender_svnt) : ciao_servant {
   after += Protocols_svnt Protocols_Sender_stub
   sharedname  = Protocols_Sender_svnt
   libs    += Protocols_Sender_stub Protocols_stub Protocols_svnt
-  
+  requires += exceptions
   idlflags  +=  -Wb,export_macro=SENDER_SVNT_Export -Wb,export_include=Sender_svnt_export.h
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
@@ -44,21 +44,18 @@ project(Protocols_Sender_svnt) : ciao_servant {
 
 project(Protocols_Sender_exec) : ciao_component, rtcorba {
   after   += Protocols_Sender_svnt
-  requires += dummy
   sharedname = Protocols_Sender_exec
-  libs      += Sender_stub Sender_svnt Protocols_stub Protocols_svnt
-  includes += ../../../../tests/RTCORBA/DiffServ
-  
+  libs      += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_svnt
+  includes += ../../../../tests/RTCORBA/Diffserv
+  requires += exceptions
   idlflags  +=  -Wb,export_macro=SENDER_EXEC_Export -Wb,export_include=Sender_exec_export.h
   dynamicflags   = SENDER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
   }
 
   Source_Files {
     Sender_exec.cpp
-    ../../../../tests/RTCORBA/DiffServ/Custom_Network_Priority_Mapping.cpp
   }
 }
 
diff --git a/TAO/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/TAO/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index a22a117aa87..95e8800fa83 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -15,6 +15,7 @@
 #include "ace/Array.h"
 #include "ace/Sample_History.h"
 #include "Custom_Network_Priority_Mapping.h"
+#include "Custom_Network_Priority_Mapping.cpp"
 #include "Sender_exec.h"
 
 static ACE_UINT32 gsf = 0;
@@ -27,8 +28,7 @@ to_seconds (ACE_UINT64 hrtime,
 #if defined ACE_LACKS_LONGLONG_T
     hrtime / sf;
 #else  /* ! ACE_LACKS_LONGLONG_T */
-  ACE_static_cast (double,
-                   ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
+  static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
 #endif /* ! ACE_LACKS_LONGLONG_T */
   seconds /= ACE_HR_SCALE_CONVERSION;
 
@@ -45,7 +45,8 @@ to_hrtime (double seconds,
 class Worker
 {
 public:
-  Worker (RTCORBA::RTORB_ptr rtorb,
+  Worker (CORBA::ORB_ptr orb,
+          RTCORBA::RTORB_ptr rtorb,
           CORBA::PolicyManager_ptr policy_manager,
           Protocols::test_ptr test,
           ::CORBA::ULong iterations,
@@ -102,7 +103,8 @@ private:
   ::Protocols::Sender_Controller::Test_Type test_type_;
 };
 
-Worker::Worker (RTCORBA::RTORB_ptr rtorb,
+Worker::Worker (CORBA::ORB_ptr orb,
+                RTCORBA::RTORB_ptr rtorb,
                 CORBA::PolicyManager_ptr policy_manager,
                 Protocols::test_ptr test,
                 ::CORBA::ULong iterations,
@@ -151,10 +153,13 @@ Worker::Worker (RTCORBA::RTORB_ptr rtorb,
   this->test_protocol_policy_.length (1);
 
   RTCORBA::ProtocolProperties_var base_transport_protocol_properties =
-    TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::TAG_INTERNET_IOP);
+    TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::TAG_INTERNET_IOP,
+                                                                         orb->orb_core ());
 
-  base_transport_protocol_properties->set_network_priority (this->enable_diffserv_code_points_);
-  ACE_CHECK;
+  RTCORBA::TCPProtocolProperties_var tcp_base_transport_protocol_properties =
+    RTCORBA::TCPProtocolProperties::_narrow (base_transport_protocol_properties.in ());
+
+  tcp_base_transport_protocol_properties->enable_network_priority (this->enable_diffserv_code_points_);
 
   RTCORBA::ProtocolList protocols;
   protocols.length (1);
@@ -173,10 +178,30 @@ Worker::Worker (RTCORBA::RTORB_ptr rtorb,
   protocols[0].protocol_type = test_protocol_tag;
 
   RTCORBA::ProtocolProperties_var test_transport_protocol_properties =
-    TAO_Protocol_Properties_Factory::create_transport_protocol_property (protocols[0].protocol_type);
+    TAO_Protocol_Properties_Factory::create_transport_protocol_property (protocols[0].protocol_type,
+                                                                         orb->orb_core ());
+
+  if (protocols[0].protocol_type == TAO_TAG_DIOP_PROFILE)
+    {
+      RTCORBA::UserDatagramProtocolProperties_var udp_test_transport_protocol_properties =
+        RTCORBA::UserDatagramProtocolProperties::_narrow (test_transport_protocol_properties.in ());
+
+      udp_test_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
+    }
+  else if (protocols[0].protocol_type == TAO_TAG_SCIOP_PROFILE)
+    {
+      RTCORBA::StreamControlProtocolProperties_var sctp_test_transport_protocol_properties =
+        RTCORBA::StreamControlProtocolProperties::_narrow (test_transport_protocol_properties.in ());
 
-  test_transport_protocol_properties->set_network_priority (enable_diffserv_code_points);
-  ACE_CHECK;
+      sctp_test_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
+    }
+  else if (protocols[0].protocol_type == IOP::TAG_INTERNET_IOP)
+    {
+      RTCORBA::TCPProtocolProperties_var tcp_test_transport_protocol_properties =
+        RTCORBA::TCPProtocolProperties::_narrow (test_transport_protocol_properties.in ());
+
+      tcp_test_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
+    }
 
   protocols[0].transport_protocol_properties =
     test_transport_protocol_properties;
@@ -332,7 +357,7 @@ Worker::setup (void)
 
   // Since the network maybe unavailable temporarily, make sure to try
   // for a few times before giving up.
-  for (int j = 0;;)
+  for (CORBA::ULong j = 0;;)
     {
       try
         {
@@ -362,7 +387,7 @@ Worker::setup (void)
   const char *test_protocol = 0;
   if (this->test_protocol_tag_ == IOP::TAG_INTERNET_IOP)
     test_protocol = "IIOP";
-  else if (this->test_protocol_tag_ == TAO_TAG_UDP_PROFILE)
+  else if (this->test_protocol_tag_ == TAO_TAG_DIOP_PROFILE)
     test_protocol = "DIOP";
   else if (this->test_protocol_tag_ == TAO_TAG_SCIOP_PROFILE)
     test_protocol = "SCIOP";
@@ -374,7 +399,7 @@ Worker::setup (void)
 
   // Since the network maybe unavailable temporarily, make sure to try
   // for a few times before giving up.
-  for (int k = 0;;)
+  for (CORBA::ULong k = 0;;)
     {
       try
         {
@@ -511,7 +536,7 @@ Worker::run (void)
   // This call is used to ensure that all the THROUGHPUT related data
   // has reached the server.
   if (this->test_type_ == ::Protocols::Sender_Controller::THROUGHPUT &&
-      this->test_protocol_tag_ != TAO_TAG_UDP_PROFILE)
+      this->test_protocol_tag_ != TAO_TAG_DIOP_PROFILE)
     {
       this->test_->twoway_sync ();
     }
@@ -588,7 +613,8 @@ SenderImpl::SenderExec_i::start (::CORBA::ULong iterations,
   Protocols::test_var test =
     this->context_->get_connection_reader ();
 
-  Worker worker (rtorb.in (),
+  Worker worker (this->orb_.in (),
+                 rtorb.in (),
                  policy_manager.in (),
                  test.in (),
                  iterations,
diff --git a/TAO/CIAO/performance-tests/Protocols/descriptors/CIAO_Installation_Data.ini b/TAO/CIAO/performance-tests/Protocols/descriptors/CIAO_Installation_Data.ini
index c75aea61ebf..379d481d131 100644
--- a/TAO/CIAO/performance-tests/Protocols/descriptors/CIAO_Installation_Data.ini
+++ b/TAO/CIAO/performance-tests/Protocols/descriptors/CIAO_Installation_Data.ini
@@ -1,5 +1,5 @@
 [ComponentInstallation]
-DCE:83d9348a-3248-445c-82c6-e38294943d65=Sender_exec
-DCE:2c16cd81-a364-4422-b9e0-ee2ebe084954=Sender_svnt
-DCE:6b6d29ca-c6e7-4823-806d-157113767331=Receiver_svnt
-DCE:34b61767-2b7d-459d-985d-ece6255275d5=Receiver_exec
+DCE:83d9348a-3248-445c-82c6-e38294943d65=Protocols_Sender_exec
+DCE:2c16cd81-a364-4422-b9e0-ee2ebe084954=Protocols_Sender_svnt
+DCE:6b6d29ca-c6e7-4823-806d-157113767331=Protocols_Receiver_svnt
+DCE:34b61767-2b7d-459d-985d-ece6255275d5=Protocols_Receiver_exec
diff --git a/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.csd b/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.csd
index b0d9ff97dcb..44606201edc 100644
--- a/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.csd
+++ b/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.csd
@@ -11,8 +11,8 @@
 
   <title>Receiver</title>
 
-  <idl id="IDL:Hello/Receiver:1.0"
-    homeid="IDL:Hello/ReceiverHome:1.0">
+  <idl id="IDL:Protocols/Receiver:1.0"
+    homeid="IDL:Protocols/ReceiverHome:1.0">
    <fileinarchive name="Receiver.idl"/>
   </idl>
 
@@ -31,7 +31,7 @@
    </dependency>
 
    <code type="DLL">
-     <fileinarchive name="Receiver_exec"/>
+     <fileinarchive name="Protocols_Receiver_exec"/>
      <entrypoint>createReceiverHome_Impl</entrypoint>
    </code>
 
diff --git a/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.ssd b/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.ssd
index 2f687961d27..83f896c5416 100644
--- a/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.ssd
+++ b/TAO/CIAO/performance-tests/Protocols/descriptors/Receiver.ssd
@@ -11,8 +11,8 @@
 
   <title>componentizedSender::Receiver Servants</title>
 
-  <idl id="IDL:Hello/Receiver:1.0" 
-       homeid="IDL:Hello/ReceiverHome:1.0">
+  <idl id="IDL:Protocols/Receiver:1.0" 
+       homeid="IDL:Protocols/ReceiverHome:1.0">
    <fileinarchive name="Receiver.idl"/>
   </idl>
 
@@ -28,7 +28,7 @@
 
    <code>
      <!-- No need to specify extension below since ACE takes care of that, -->
-     <fileinarchive name="Receiver_svnt"/>
+     <fileinarchive name="Protocols_Receiver_svnt"/>
      <entrypoint>createReceiverHome_Servant</entrypoint>
    </code>
 
diff --git a/TAO/CIAO/performance-tests/Protocols/descriptors/Sender.csd b/TAO/CIAO/performance-tests/Protocols/descriptors/Sender.csd
index 18c189e0989..f2d899f3338 100644
--- a/TAO/CIAO/performance-tests/Protocols/descriptors/Sender.csd
+++ b/TAO/CIAO/performance-tests/Protocols/descriptors/Sender.csd
@@ -11,8 +11,8 @@
 
   <title>Sender</title>
 
-  <idl id="IDL:Hello/Sender:1.0"
-       homeid="IDL:Hello/SenderHome:1.0">
+  <idl id="IDL:Protocols/Sender:1.0"
+       homeid="IDL:Protocols/SenderHome:1.0">
    <fileinarchive name="Sender.idl"/>
   </idl>
 
@@ -31,7 +31,7 @@
    </dependency>
 
    <code type="DLL">
-     <fileinarchive name="Sender_exec"/>
+     <fileinarchive name="Protocols_Sender_exec"/>
      <entrypoint>createSenderHome_Impl</entrypoint>
    </code>
 
diff --git a/TAO/CIAO/performance-tests/Protocols/descriptors/Sender.ssd b/TAO/CIAO/performance-tests/Protocols/descriptors/Sender.ssd
index 1f677cbef03..411bbbc66d6 100644
--- a/TAO/CIAO/performance-tests/Protocols/descriptors/Sender.ssd
+++ b/TAO/CIAO/performance-tests/Protocols/descriptors/Sender.ssd
@@ -11,8 +11,8 @@
 
   <title>componentizedSender::Sender Servants</title>
 
-  <idl id="IDL:Hello/Sender:1.0"
-       homeid="IDL:Hello/SenderHome:1.0">
+  <idl id="IDL:Protocols/Sender:1.0"
+       homeid="IDL:Protocols/SenderHome:1.0">
    <fileinarchive name="Sender.idl"/>
   </idl>
 
@@ -28,7 +28,7 @@
 
    <code>
      <!-- No need to specify extension below since ACE takes care of that, -->
-     <fileinarchive name="Sender_svnt"/>
+     <fileinarchive name="Protocols_Sender_svnt"/>
      <entrypoint>createSenderHome_Servant</entrypoint>
    </code>
 
diff --git a/TAO/CIAO/performance-tests/Protocols/descriptors/run_test.pl b/TAO/CIAO/performance-tests/Protocols/descriptors/run_test.pl
index f16e0bad168..b9ec459dcde 100755
--- a/TAO/CIAO/performance-tests/Protocols/descriptors/run_test.pl
+++ b/TAO/CIAO/performance-tests/Protocols/descriptors/run_test.pl
@@ -12,6 +12,8 @@ $ACE_ROOT = $ENV {'ACE_ROOT'};
 $CIAO_ROOT = $ENV {'CIAO_ROOT'};
 
 $ORBdebuglevel = 0;
+$protocols = "-ORBEndpoint \'iiop://\'";
+#$protocols = "-ORBEndpoint \'iiop://;diop://:5678;sciop://\'";
 
 $daemon_1 = new PerlACE::Process ("${CIAO_ROOT}/tools/Daemon/CIAO_Daemon",
                                   "-ORBEndpoint iiop://localhost:20000 " .
@@ -19,7 +21,7 @@ $daemon_1 = new PerlACE::Process ("${CIAO_ROOT}/tools/Daemon/CIAO_Daemon",
 
 $daemon_2 = new PerlACE::Process ("${CIAO_ROOT}/tools/Daemon/CIAO_Daemon",
                                   "-ORBEndpoint iiop://localhost:12000 " .
-                                  "-n \"${CIAO_ROOT}/tools/RTComponentServer/RTComponentServer -ORBdebuglevel $ORBdebuglevel -ORBEndpoint iiop:// -ORBEndpoint diop://:5678\"");
+                                  "-n \"${CIAO_ROOT}/tools/RTComponentServer/RTComponentServer -ORBdebuglevel $ORBdebuglevel $protocols\"");
 
 $assembly_manager_args = "-o assembly_manager.ior -c test.dat";
 $assembly_manager = new PerlACE::Process ("${CIAO_ROOT}/tools/Assembly_Deployer/Assembly_Manager", "$assembly_manager_args");
@@ -27,7 +29,7 @@ $assembly_manager = new PerlACE::Process ("${CIAO_ROOT}/tools/Assembly_Deployer/
 $assembly_deployer_args = "-k file://assembly_manager.ior -a remote.cad -o assembly";
 $assembly_deployer = new PerlACE::Process ("${CIAO_ROOT}/tools/Assembly_Deployer/Assembly_Deployer", "$assembly_deployer_args");
 
-$controller = new PerlACE::Process ("../Controller/Controller", "-p DIOP -x 1 -z 1");
+$controller = new PerlACE::Process ("../Controller/Controller", "-x 1 -z 1");
 
 # Remove all ior files
 unlink "assembly_manager.ior";
@@ -53,23 +55,23 @@ $assembly_deployer->Spawn ();
 PerlACE::waitforfile ("sender.ior");
 PerlACE::waitforfile ("receiver.ior");
 
-## Now start the controller
-#$controller->Spawn ();
-#
-## Wait for controller to get done.
-#$controller->Wait ();
-#$controller->{RUNNING} = 0;
-#
-## Kill daemons.
-#$daemon_1->Kill ();
-#$daemon_2->Kill ();
-#$assembly_manager->Kill ();
-#$assembly_deployer->Kill ();
-#
-## Remove all ior files
-#unlink "assembly_manager.ior";
-#unlink "daemon.ior";
-#unlink "receiver.ior";
-#unlink "sender.ior";
-#unlink "assembly";
+# Now start the controller
+$controller->Spawn ();
+
+# Wait for controller to get done.
+$controller->Wait ();
+$controller->{RUNNING} = 0;
+
+# Kill daemons.
+$daemon_1->Kill ();
+$daemon_2->Kill ();
+$assembly_manager->Kill ();
+$assembly_deployer->Kill ();
+
+# Remove all ior files
+unlink "assembly_manager.ior";
+unlink "daemon.ior";
+unlink "receiver.ior";
+unlink "sender.ior";
+unlink "assembly";
 
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index b84b270cb58..06e458f0b69 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -13,7 +13,7 @@ project(CIDL_Basic_stub): ciao_client {
   Source_Files {
     BasicC.cpp
   }
-  
+
   Header_Files {
     BasicC.h
     Basic_stub_export.h
@@ -27,7 +27,7 @@ project(CIDL_Basic_svnt) : ciao_servant {
 
   idlflags  += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
   dynamicflags = BASIC_SVNT_BUILD_DLL
-  
+
   IDL_Files {
     Basic.idl
   }
@@ -35,7 +35,7 @@ project(CIDL_Basic_svnt) : ciao_servant {
   Source_Files {
     BasicS.cpp
   }
-  
+
   Header_Files {
     BasicS.h
     Basic_svnt_export.h
@@ -44,6 +44,7 @@ project(CIDL_Basic_svnt) : ciao_servant {
 
 project(CodeGen_stub): ciao_client {
   after += CIDL_Basic_stub
+  libs    += CIDL_Basic_stub
   sharedname = CodeGen_stub
   idlflags += -Wb,stub_export_macro=CODEGEN_STUB_Export -Wb,stub_export_include=CodeGen_stub_export.h -Wb,skel_export_macro=CODEGEN_SVNT_Export -Wb,skel_export_include=CodeGen_svnt_export.h
   dynamicflags   = CODEGEN_STUB_BUILD_DLL
@@ -51,11 +52,11 @@ project(CodeGen_stub): ciao_client {
   IDL_Files {
     CodeGen.idl
   }
-  
+
   Source_Files {
     CodeGenC.cpp
   }
-  
+
   Header_Files {
     CodeGenC.h
     CodeGen_stub_export.h
@@ -85,7 +86,7 @@ project(CodeGen_svnt) : ciao_servant {
     CodeGenS.cpp
     CodeGen_svnt.cpp
   }
-  
+
   Header_Files {
     CodeGenEC.h
     CodeGenS.h
@@ -96,18 +97,18 @@ project(CodeGen_svnt) : ciao_servant {
 
 
 project(CodeGen_exec) : ciao_component {
-  after   += CodeGen_svnt
+  after   += CodeGen_svnt CodeGen_stub
   sharedname = CodeGen_exec
   libs      += CodeGen_stub CodeGen_svnt CIDL_Basic_stub CIDL_Basic_svnt
   dynamicflags   = CODEGEN_EXEC_BUILD_DLL
-  
+
   IDL_Files {
   }
 
   Source_Files {
     CodeGen_exec.cpp
   }
-  
+
   Header_Files {
     CodeGen_exec.h
     CodeGen_exec_export.h
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc b/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc
index 4d89e627648..6236570f5f1 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc
@@ -1,9 +1,9 @@
 // $Id$
 
 project (*) : ciao_client, rtcorba {
-  requires += DiffServ_Sender_stub DiffServ_Receiver_stub
+  after += DiffServ_Sender_stub DiffServ_Receiver_stub
+  requires += exceptions
   includes += ../Sender
   includes += ../Receiver
-  libs += DiffServ_Sender_stub
-  libs += DiffServ_Receiver_stub
+  libs += DiffServ_Sender_stub DiffServ_Receiver_stub DiffServ_stub
 }
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.mpc b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.mpc
index e6463ed256d..8414a989886 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.mpc
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender.mpc
@@ -20,7 +20,7 @@ project(DiffServ_Sender_stub): ciao_client {
 project(DiffServ_Sender_svnt) : ciao_servant {
   after += DiffServ_svnt DiffServ_Sender_stub
   sharedname  = DiffServ_Sender_svnt
-  libs    += Sender_stub DiffServ_stub DiffServ_svnt
+  libs    += DiffServ_Sender_stub DiffServ_stub DiffServ_svnt
   
   idlflags  +=  -Wb,export_macro=SENDER_SVNT_Export -Wb,export_include=Sender_svnt_export.h
   dynamicflags = SENDER_SVNT_BUILD_DLL
@@ -44,7 +44,7 @@ project(DiffServ_Sender_svnt) : ciao_servant {
 project(DiffServ_Sender_exec) : ciao_component, rtcorba {
   after   += DiffServ_Sender_svnt
   sharedname = DiffServ_Sender_exec
-  libs      += Sender_stub Sender_svnt DiffServ_stub DiffServ_svnt
+  libs      += DiffServ_Sender_stub DiffServ_Sender_svnt DiffServ_stub DiffServ_svnt
   includes += ../../../../../tests/RTCORBA/Diffserv
   
   idlflags  +=  -Wb,export_macro=SENDER_EXEC_Export -Wb,export_include=Sender_exec_export.h
@@ -57,7 +57,6 @@ project(DiffServ_Sender_exec) : ciao_component, rtcorba {
 
   Source_Files {
     Sender_exec.cpp
-    ../../../../../tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp    
   }
 }
 
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
index c63a0d32d2d..902adc3a04d 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Sender/Sender_exec.cpp
@@ -4,6 +4,7 @@
 #include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
 #include "tao/RTCORBA/Network_Priority_Mapping.h"
 #include "Custom_Network_Priority_Mapping.h"
+#include "Custom_Network_Priority_Mapping.cpp"
 #include "Sender_exec.h"
 #include "ace/OS_NS_unistd.h"
 
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/CIAO_Installation_Data.ini b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/CIAO_Installation_Data.ini
index c75aea61ebf..dd3bead273e 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/CIAO_Installation_Data.ini
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/CIAO_Installation_Data.ini
@@ -1,5 +1,5 @@
 [ComponentInstallation]
-DCE:83d9348a-3248-445c-82c6-e38294943d65=Sender_exec
-DCE:2c16cd81-a364-4422-b9e0-ee2ebe084954=Sender_svnt
-DCE:6b6d29ca-c6e7-4823-806d-157113767331=Receiver_svnt
-DCE:34b61767-2b7d-459d-985d-ece6255275d5=Receiver_exec
+DCE:83d9348a-3248-445c-82c6-e38294943d65=DiffServ_Sender_exec
+DCE:2c16cd81-a364-4422-b9e0-ee2ebe084954=DiffServ_Sender_svnt
+DCE:6b6d29ca-c6e7-4823-806d-157113767331=DiffServ_Receiver_svnt
+DCE:34b61767-2b7d-459d-985d-ece6255275d5=DiffServ_Receiver_exec
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.csd b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.csd
index 3ac941a00a8..757e9f7532b 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.csd
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.csd
@@ -11,8 +11,8 @@
 
   <title>Receiver</title>
 
-  <idl id="IDL:Hello/Receiver:1.0"
-    homeid="IDL:Hello/ReceiverHome:1.0">
+  <idl id="IDL:DiffServ/Receiver:1.0"
+    homeid="IDL:DiffServ/ReceiverHome:1.0">
    <fileinarchive name="Receiver.idl"/>
   </idl>
 
@@ -31,7 +31,7 @@
    </dependency>
 
    <code type="DLL">
-     <fileinarchive name="Receiver_exec"/>
+     <fileinarchive name="DiffServ_Receiver_exec"/>
      <entrypoint>createReceiverHome_Impl</entrypoint>
    </code>
 
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.ssd b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.ssd
index 3e090c2921b..a292a0a7a5b 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.ssd
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Receiver.ssd
@@ -11,8 +11,8 @@
 
   <title>componentizedSender::Receiver Servants</title>
 
-  <idl id="IDL:Hello/Receiver:1.0" 
-       homeid="IDL:Hello/ReceiverHome:1.0">
+  <idl id="IDL:DiffServ/Receiver:1.0" 
+       homeid="IDL:DiffServ/ReceiverHome:1.0">
    <fileinarchive name="Receiver.idl"/>
   </idl>
 
@@ -28,7 +28,7 @@
 
    <code>
      <!-- No need to specify extension below since ACE takes care of that, -->
-     <fileinarchive name="Receiver_svnt"/>
+     <fileinarchive name="DiffServ_Receiver_svnt"/>
      <entrypoint>createReceiverHome_Servant</entrypoint>
    </code>
 
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.csd b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.csd
index d402ccc1818..1814d85830d 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.csd
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.csd
@@ -11,8 +11,8 @@
 
   <title>Sender</title>
 
-  <idl id="IDL:Hello/Sender:1.0"
-       homeid="IDL:Hello/SenderHome:1.0">
+  <idl id="IDL:DiffServ/Sender:1.0"
+       homeid="IDL:DiffServ/SenderHome:1.0">
    <fileinarchive name="Sender.idl"/>
   </idl>
 
@@ -31,7 +31,7 @@
    </dependency>
 
    <code type="DLL">
-     <fileinarchive name="Sender_exec"/>
+     <fileinarchive name="DiffServ_Sender_exec"/>
      <entrypoint>createSenderHome_Impl</entrypoint>
    </code>
 
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.ssd b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.ssd
index 4f20c6edde5..196b618e0c6 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.ssd
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/descriptors/Sender.ssd
@@ -11,8 +11,8 @@
 
   <title>componentizedSender::Sender Servants</title>
 
-  <idl id="IDL:Hello/Sender:1.0"
-       homeid="IDL:Hello/SenderHome:1.0">
+  <idl id="IDL:DiffServ/Sender:1.0"
+       homeid="IDL:DiffServ/SenderHome:1.0">
    <fileinarchive name="Sender.idl"/>
   </idl>
 
@@ -28,7 +28,7 @@
 
    <code>
      <!-- No need to specify extension below since ACE takes care of that, -->
-     <fileinarchive name="Sender_svnt"/>
+     <fileinarchive name="DiffServ_Sender_svnt"/>
      <entrypoint>createSenderHome_Servant</entrypoint>
    </code>
 
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.mpc b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.mpc
index 1eb9ffc6f89..d097c0dce34 100644
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.mpc
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Controller.mpc
@@ -4,6 +4,8 @@
 project(Priority_Test_Controller_stub): ciao_client {
   after += Priority_Test_stub
   sharedname = Controller_stub
+  libs    += Priority_Test_stub
+  libpaths += ..
   idlflags += -Wb,stub_export_macro=CONTROLLER_STUB_Export -Wb,stub_export_include=Controller_stub_export.h -Wb,skel_export_macro=CONTROLLER_SVNT_Export -Wb,skel_export_include=Controller_svnt_export.h
   dynamicflags   = CONTROLLER_STUB_BUILD_DLL
 
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp
index 6f4be265b19..51f563cd3c7 100644
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp
@@ -24,13 +24,13 @@ PTImpl::Pulser::~Pulser ()
 }
 
 int
-PTImpl::Pulser::open ()
+PTImpl::Pulser::open (void*)
 {
   return this->activate ();
 }
 
 int
-PTImpl::Pulser::close ()
+PTImpl::Pulser::close (u_long)
 {
   this->done_ = 1;
   this->reactor ()->notify ();
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h
index 67aa316f893..3986dc982da 100644
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h
@@ -35,9 +35,9 @@ namespace PTImpl
     Pulser (Pulse_Handler *cb);
     ~Pulser ();
 
-    int open (void);
+    int open (void *args = 0);
 
-    int close (void);
+    int close (u_long flags = 0);
 
     int start (CORBA::Long hertz);
 
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/client.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/client.cpp
index bbcf0065e8a..7ee91f86db9 100644
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/client.cpp
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/client.cpp
@@ -8,6 +8,8 @@
 #include "ControllerC.h"
 #include "ace/Get_Opt.h"
 #include "ace/streams.h"
+#include "ace/SString.h"
+
 
 int ctrl_off = 0;
 long work = 80;
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp
index 4f2476ad939..c6f64623405 100644
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/CB_Worker_exec.cpp
@@ -3,6 +3,9 @@
 #include "CB_Worker_exec.h"
 #include "CIAO_common.h"
 
+#include "ace/ACE.h"
+
+
 // This should really be a configurable value.  CIAO doesn't suppor
 // this yet but the new D&C shall support this RSN.
 static long local_primer_ = 9619;
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.mpc b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.mpc
index 0b8c74f81b0..e50e699862f 100644
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.mpc
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/Workers/Worker.mpc
@@ -3,6 +3,8 @@
 
 project(Priority_Test_Worker_stub): ciao_client {
   after += Priority_Test_stub
+  libs    += Priority_Test_stub
+  libpaths += ..
   sharedname = Worker_stub
   idlflags += -Wb,stub_export_macro=WORKER_STUB_Export -Wb,stub_export_include=Worker_stub_export.h -Wb,skel_export_macro=WORKER_SVNT_Export -Wb,skel_export_include=Worker_svnt_export.h
   dynamicflags   = WORKER_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.cpp b/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.cpp
index 638febd9711..249240c690d 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.cpp
@@ -4,10 +4,6 @@
 
 #include "ace/OS_NS_stdio.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Deployment_Configuration.inl"
-#endif /* __ACE_INLINE__ */
-
 #define NAME_BUFSIZE 1024
 
 CIAO::Deployment_Configuration::Deployment_Configuration (CORBA::ORB_ptr o)
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.h b/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.h
index 7db20158de1..783926df8be 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.h
+++ b/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.h
@@ -18,13 +18,15 @@
 #define CIAO_DEPLOYMENT_CONFIGURATION_H
 #include /**/ "ace/pre.h"
 
-#include "ace/Hash_Map_Manager_T.h"
+#include "ciao/CCM_DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/CCM_DeploymentC.h"
+#include "ace/SString.h"
+#include "ace/Hash_Map_Manager_T.h"
+
 
 namespace CIAO
 {
@@ -120,9 +122,5 @@ namespace CIAO
 
 }
 
-#if defined (__ACE_INLINE__)
-# include "Deployment_Configuration.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* CIAO_DEPLOYMENT_CONFIGURATION_H */
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.inl b/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/CIAO/tools/Daemon/Daemon_Impl.cpp b/TAO/CIAO/tools/Daemon/Daemon_Impl.cpp
index 6f68caeb364..68b27d5eb34 100644
--- a/TAO/CIAO/tools/Daemon/Daemon_Impl.cpp
+++ b/TAO/CIAO/tools/Daemon/Daemon_Impl.cpp
@@ -13,7 +13,7 @@ CIAO::Daemon_Impl::~Daemon_Impl ()
        ++i)
     {
       // Deallocate the id.
-      CORBA::string_free (ACE_const_cast (char *, (*i).ext_id_));
+      CORBA::string_free (const_cast<char *> ((*i).ext_id_));
 
       // Release the Object.
       CORBA::release ((*i).int_id_);
@@ -99,7 +99,7 @@ CIAO::Daemon_Impl::unbind (const char *id)
       // Deallocate the external ID and obtain the ORB core pointer
       // before unbinding the entry since the entry is deallocated
       // during the call to unbind().
-      CORBA::string_free (ACE_const_cast (char *, entry->ext_id_));
+      CORBA::string_free (const_cast<char *> (entry->ext_id_));
       CORBA::Object_ptr obj = entry->int_id_;
 
       result = this->table_.unbind (entry);
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc b/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
index 3f3c5a30042..66630b71645 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc
@@ -8,6 +8,9 @@ project(TAO_IDL3_TO_IDL2_BE) : acelib, core, tao_output, crosscompile {
   dynamicflags = TAO_IDL3_TO_IDL2_BE_BUILD_DLL
   includes    += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   Source_Files {
     be_global.cpp
     be_helper.cpp
@@ -36,6 +39,9 @@ project(TAO_IDL3_TO_IDL2_EXE) : aceexe, core, tao_output, crosscompile {
   libpaths       += $(TAO_ROOT)/TAO_IDL
   install         = $(ACE_ROOT)/bin
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   verbatim(gnuace, local) {
     ifeq ($(TAO_IDL_PREPROCESSOR),)
       CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(strip $(CXX))\\\"
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h b/TAO/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h
index 036f7926f25..ca8bb4e2394 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE_Export.h
@@ -9,7 +9,7 @@
 
 #include "ace/config-all.h"
 
-#if defined (TAO_AS_STATIC_LIBS)
+#if defined (ACE_AS_STATIC_LIBS)
 #  if !defined (TAO_IDL3_TO_IDL2_BE_HAS_DLL)
 #    define TAO_IDL3_TO_IDL2_BE_HAS_DLL 0
 #  endif /* ! TAO_IDL3_TO_IDL2_BE_HAS_DLL */
diff --git a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
index cfeac13cd7d..abfa8917508 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
@@ -279,7 +279,7 @@ CIAO::RTPolicy_Set_Manager::create_single_policy
                                                            ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        retv = 
+        retv =
           this->rtorb_->create_priority_banded_connection_policy (bands.in ()
                                                                   ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
diff --git a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.h b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.h
index 2c768e25721..60ea4645f7a 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.h
+++ b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.h
@@ -27,6 +27,7 @@
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tools/XML_Helpers/RTConfigurationC.h"
 #include "ace/Null_Mutex.h"
+#include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
 
 namespace CIAO
diff --git a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp
index 7b549a1ec2c..319e526388d 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp
@@ -2,11 +2,14 @@
 
 #include "RTServer_Impl.h"
 #include "ciao/CIAO_common.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
 # include "RTServer_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
+
 CIAO::RTServer::RTComponentServer_Impl::~RTComponentServer_Impl ()
 {
 }
diff --git a/TAO/CIAO/tools/Segment_Timer/Segment_Timer.h b/TAO/CIAO/tools/Segment_Timer/Segment_Timer.h
index 0065857e6a5..c33a0d042f6 100644
--- a/TAO/CIAO/tools/Segment_Timer/Segment_Timer.h
+++ b/TAO/CIAO/tools/Segment_Timer/Segment_Timer.h
@@ -7,7 +7,7 @@
 #include "ace/Log_Msg.h"
 #include "Segment_Timer_Export.h"
 
-#define MAX_READINGS 50
+#define MAX_READINGS 500
 class Segment_Timer_Export Segment_Timer : public ACE_High_Res_Timer
 {
   ACE_hrtime_t recorded_times_[MAX_READINGS];
diff --git a/TAO/CIAO/tools/Segment_Timer/Segment_Timer.mpc b/TAO/CIAO/tools/Segment_Timer/Segment_Timer.mpc
index 5238008f8e4..a89cfbf6956 100644
--- a/TAO/CIAO/tools/Segment_Timer/Segment_Timer.mpc
+++ b/TAO/CIAO/tools/Segment_Timer/Segment_Timer.mpc
@@ -5,10 +5,13 @@ project(Segment_Timer): acelib {
   sharedname    = Segment_Timer
   dynamicflags += SEGMENT_TIMER_BUILD_DLL
 
+  // This is necessary for MPC to pull in rules.ciao.GNU
+  includes += $(CIAO_ROOT)
+
   Source_Files {
     Segment_Timer.cpp
   }
-  
+
   Header_Files {
     Segment_Timer_Export.h
   }
diff --git a/TAO/CIAO/tools/XML_Helpers/XML_Utils.cpp b/TAO/CIAO/tools/XML_Helpers/XML_Utils.cpp
index a460bbaa6eb..dd555318da1 100644
--- a/TAO/CIAO/tools/XML_Helpers/XML_Utils.cpp
+++ b/TAO/CIAO/tools/XML_Helpers/XML_Utils.cpp
@@ -8,10 +8,6 @@
 #include "RTConfig_Handlers.h"
 #include "ace/OS_String.h"
 
-#if !defined (__ACE_INLINE__)
-# include "XML_Utils.inl"
-#endif /* __ACE_INLINE__ */
-
 int
 CIAO::XML_Utils::parse_softpkg (CIAO::Softpkg_Handler::Softpkg_Info *info)
 {
diff --git a/TAO/CIAO/tools/XML_Helpers/XML_Utils.h b/TAO/CIAO/tools/XML_Helpers/XML_Utils.h
index 22d75a3b72e..873c9322888 100644
--- a/TAO/CIAO/tools/XML_Helpers/XML_Utils.h
+++ b/TAO/CIAO/tools/XML_Helpers/XML_Utils.h
@@ -87,7 +87,4 @@ namespace CIAO
 
 }
 
-#if defined (__ACE_INLINE__)
-# include "XML_Utils.inl"
-#endif /* __ACE_INLINE__ */
 #endif /* CIAO_XML_UTILS_H */
diff --git a/TAO/CIAO/tools/XML_Helpers/XML_Utils.inl b/TAO/CIAO/tools/XML_Helpers/XML_Utils.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/CIAO/tools/XML_Helpers/XML_Utils.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/COPYING b/TAO/COPYING
index 18ba46daa50..0cc3d9cca79 100644
--- a/TAO/COPYING
+++ b/TAO/COPYING
@@ -1,81 +1,85 @@
+
      _________________________________________________________________
    
-  Copyright and Licensing Information for ACE(TM), TAO(TM), and CIAO(TM)
+  Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and
+  CoSMIC(TM)
   
-   [1]ACE(TM), [2]TAO(TM) and [3]CIAO(TM) are copyrighted by [4]Douglas
-   C. Schmidt and his [5]research group at [6]Washington University,
-   [7]University of California, Irvine, and [8]Vanderbilt University
-   Copyright (c) 1993-2003, all rights reserved. Since ACE+TAO+CIAO are
-   open-source, free software, you are free to use, modify, copy, and
-   distribute--perpetually and irrevocably--the ACE+TAO+CIAO source code
+   [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-2005, all rights reserved. Since DOC software is
+   [10]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
-   ACE+TAO+CIAO.
+   include this copyright statement along with code built using DOC
+   software.
    
-   You can use ACE+TAO+CIAO in proprietary software and are under no
+   You can use DOC software in proprietary software and are under no
    obligation to redistribute any of your source code that is built using
-   ACE+TAO+CIAO. Note, however, that you may not do anything to the
-   ACE+TAO+CIAO code, such as copyrighting it yourself or claiming
-   authorship of the ACE+TAO+CIAO code, that will prevent ACE+TAO+CIAO
-   from being distributed freely using an open-source development model.
-   You needn't inform anyone that you're using ACE+TAO+CIAO in your
-   software, though we encourage you to let [9]us know so we can promote
-   your project in the [10]ACE+TAO+CIAO success stories..
+   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 [11]us know so we can promote your project in
+   the [12]DOC software success stories..
    
-   ACE+TAO+CIAO are provided as is with no warranties of any kind,
+   DOC software is provided as is with no warranties of any kind,
    including the warranties of design, merchantability, and fitness for a
    particular purpose, noninfringement, or arising from a course of
-   dealing, usage or trade practice. Moreover, ACE+TAO+CIAO are provided
+   dealing, usage or trade practice. Moreover, 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 [11]number of companies provide commercial support for
-   ACE and TAO, however. ACE, TAO and CIAO are Y2K-compliant, as long as
-   the underlying OS platform is Y2K-compliant.
+   enhancement. A [13]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.
    
    Washington University, UC Irvine, Vanderbilt University, their
    employees, and students shall have no liability with respect to the
-   infringement of copyrights, trade secrets or any patents by
-   ACE+TAO+CIAO or any part thereof. Moreover, in no event will
-   Washington University, UC Irvine, or Vanderbilt University, their
-   employees, or students be liable for any lost revenue or profits or
-   other special, indirect and consequential damages.
+   infringement of copyrights, trade secrets or any patents by DOC
+   software or any part thereof. Moreover, in no event will Washington
+   University, UC Irvine, or Vanderbilt University, their employees, or
+   students be liable for any lost revenue or profits or other special,
+   indirect and consequential damages.
    
-   The [12]ACE, [13]TAO and [14]CIAO web sites are maintained by the
-   [15]Center for Distributed Object Computing of Washington University
-   for the development of open-source software as part of the
-   [16]open-source software community. By submitting comments,
-   suggestions, code, code snippets, techniques (including that of
-   usage), and algorithms, submitters acknowledge that they have the
-   right to do so, that any such submissions are given freely and
-   unreservedly, and that they waive any claims to copyright or
-   ownership. In addition, submitters acknowledge that any such
-   submission might become part of the copyright maintained on the
-   overall body of code, which comprises the [17]ACE, [18]TAO and
-   [19]CIAO software. By making a submission, submitter agree to these
-   terms. Furthermore, submitters acknowledge that the incorporation or
-   modification of such submissions is entirely at the discretion of the
-   moderators of the open-source ACE+TAO+CIAO projects or their
-   designees.
+   The [14]ACE, [15]TAO, [16]CIAO, and [17]CoSMIC web sites are
+   maintained by the [18]DOC Group at the [19]Institute for Software
+   Integrated Systems (ISIS) and the [20]Center for Distributed Object
+   Computing of Washington University, St. Louis for the development of
+   open-source software as part of the [21]open-source software
+   community. By submitting comments, suggestions, code, code snippets,
+   techniques (including that of usage), and algorithms, submitters
+   acknowledge that they have the right to do so, that any such
+   submissions are given freely and unreservedly, and that they waive any
+   claims to copyright or ownership. In addition, submitters acknowledge
+   that any such submission might become part of the copyright maintained
+   on the overall body of code, which comprises the DOC software. By
+   making a submission, submitter agree to these terms. Furthermore,
+   submitters acknowledge that the incorporation or modification of such
+   submissions is entirely at the discretion of the moderators of the
+   open-source DOC software projects or their designees.
    
-   The names ACE(TM), TAO(TM), CIAO(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. Further, products or services derived from this
-   source may not be called ACE(TM), TAO(TM), or CIAO(TM) nor may the
-   name Washington University, UC Irvine, or Vanderbilt University appear
-   in their names, without express written permission from Washington
-   University, UC Irvine, and Vanderbilt University.
+   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. Further, products or services
+   derived from this source may not be called ACE(TM), TAO(TM), CIAO(TM),
+   or CoSMIC(TM) nor may the name Washington University, UC Irvine, or
+   Vanderbilt University appear in their names, without express written
+   permission from Washington University, UC Irvine, and Vanderbilt
+   University.
    
    If you have any suggestions, additions, comments, or questions, please
-   let [20]me know.
+   let [22]me know.
    
-   [21]Douglas C. Schmidt
+   [23]Douglas C. Schmidt
      _________________________________________________________________
    
-   Back to the [22]ACE home page.
+   Back to the [24]ACE home page.
    
    Last modified 21:26:22 CST 03 November 2003 
 
@@ -84,22 +88,24 @@ References
    1. http://www.cs.wustl.edu/~schmidt/ACE.html
    2. http://www.cs.wustl.edu/~schmidt/TAO.html
    3. http://www.dre.vanderbilt.edu/CIAO/
-   4. http://www.cs.wustl.edu/~schmidt/
-   5. http://www.cs.wustl.edu/~schmidt/ACE-members.html
-   6. http://www.wustl.edu/
-   7. http://www.uci.edu/
-   8. http://www.vanderbilt.edu/
-   9. mailto:doc_group@cs.wustl.edu
-  10. http://www.cs.wustl.edu/~schmidt/ACE-users.html
-  11. http://www.cs.wustl.edu/~schmidt/commercial-support.html
-  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.cs.wustl.edu/~schmidt/doc-center.html
-  16. http://www.opensource.org/
-  17. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html
-  18. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
-  19. http://www.dre.vanderbilt.edu/CIAO/
-  20. mailto:schmidt@cs.wustl.edu
-  21. http://www.cs.wustl.edu/~schmidt/
-  22. file://localhost/project/adaptive/.www-docs/ACE.html
+   4. http://www.dre.vanderbilt.edu/cosmic/
+   5. http://www.dre.vanderbilt.edu/~schmidt/
+   6. http://www.cs.wustl.edu/~schmidt/ACE-members.html
+   7. http://www.wustl.edu/
+   8. http://www.uci.edu/
+   9. http://www.vanderbilt.edu/
+  10. http://www.the-it-resource.com/Open-Source/Licenses.html
+  11. mailto:doc_group@cs.wustl.edu
+  12. http://www.cs.wustl.edu/~schmidt/ACE-users.html
+  13. http://www.cs.wustl.edu/~schmidt/commercial-support.html
+  14. http://www.cs.wustl.edu/~schmidt/ACE.html
+  15. http://www.cs.wustl.edu/~schmidt/TAO.html
+  16. http://www.dre.vanderbilt.edu/CIAO/
+  17. http://www.dre.vanderbilt.edu/cosmic/
+  18. http://www.dre.vanderbilt.edu/
+  19. http://www.isis.vanderbilt.edu/
+  20. http://www.cs.wustl.edu/~schmidt/doc-center.html
+  21. http://www.opensource.org/
+  22. mailto:d.schmidt@vanderbilt.edu
+  23. http://www.dre.vanderbilt.edu/~schmidt/
+  24. http://www.cs.wustl.edu/ACE.html
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3dea9397858..84378ae943f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -345,3376 +345,2300 @@ Mon Feb 14 22:56:17 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	  New source containing TAO::Upcall_Wrapper class implementation.
 
-Tue Sep 14 06:27:15 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Feb 15 21:47:15 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-	* docs/compiler.html:
-
-	  Fix typos.  Change *.i to *.inl.
-
-Tue Sep 14 08:49:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * tao/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input:
-        * tao/orbsvcs/tests/AVStreams/Bidirectional_Flows/input:
-        * tao/orbsvcs/tests/AVStreams/Component_Switching/input:
-        * tao/orbsvcs/tests/AVStreams/Modify_QoS/input:
-        * tao/orbsvcs/tests/AVStreams/Multiple_Flows/input:
-        * tao/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/input:
-        * tao/orbsvcs/tests/AVStreams/Simple_Three_Stage/input:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage/input:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input:
-
-          Removed achived test inputfiles because these are now generated (and
-          removed) at runtime.
-
-Tue Sep 14 08:41:00 UTC 2004  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/PerlACE/Run_test.pm:
-
-          Added a new PerlACE::generate_test_file(<basename>, <size>) subroutine
-          to be used with tests needing (large) testdata as input (like AVStreams
-          tests).
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+        
+          Removed the static method queryinterface_helper(), which is
+          no longer used.
+          
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        
+          Removed generation of the static in _tao_class_id. It is
+          not used and was removed from interface code generation
+          some time ago.
 
-        * tao/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multicast/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Pluggable/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl:
+Tue Feb 15 18:09:46 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Changed to use the new PerlACE::generate_test_file() subroutine.
+	* TAO_IDL/Makefile.am:
 
-Mon Sep 13 15:56:53 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+	  Regenerated.
 
-	* orbsvcs/tests/Trading/Trading.mpc:
+Tue Feb 15 14:10:33 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-          Changed import_test and export_test projects to inherit from
-	  trading_serv.  Needed by Borland CBuilderX.
+        * TAOACE.mwc:
 
-Mon Sep 13 12:18:49 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Changed ../protocols/ace/HTBP to ../protocols to get RMCast and
+          TMCast too.
 
-	* orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-	* orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-	* orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-	* orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+Tue Feb 15 14:04:51 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-	  Updated.
+        * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl:
 
-	* orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
-	* orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
-	* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
-	* orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
+          Corrected an error when resetting the consumer and supplier
+          arguments.  The exe name was accidentally added to the arguments
+          too.
 
-	  Changed to inherit from core.mpb so services will be installed.
+Tue Feb 15 13:29:35 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-Mon Sep 13 12:06:20 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
 
-	* orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h:
+          Removed an unused #include of Trader.h.
 
-	  Remove #include of Naming_Server.h and unused method
-	  name_server() to avoid introducing a dependency on the naming
-	  service implementation on some windows systems.
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
 
-Mon Sep 13 11:47:13 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Changed messages to not use the word Error to avoid potential
+          problems with the Scoreboard.
 
-	* orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-	* orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-	* orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-	* orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-	* orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
 
-	  Updated.
+          Fixed a bug in the output code to include a missing space.
 
-Mon Sep 13 06:40:36 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * orbsvcs/tests/Notify/XML_Persistence/main.cpp:
+        * orbsvcs/tests/Notify/XML_Persistence/run_test.pl:
 
-	* orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+          Added a persistent POA to help with IOR comparisons.  It's not
+          100% perfect, but it's better than it was.
 
-	  Changed to inherit from dslogadmin_serv.
+        * orbsvcs/tests/Notify/XML_Persistence/svc.conf:
 
-	* orbsvcs/orbsvcs/DsLogAdmin.mpc:
+          Changed the case of persistence to match the
+          TAO_CosNotification_Persistence library.
 
-	  Changed to inherit from svc_utils.
+Tue Feb 15 07:09:41 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Mon Sep 13 12:29:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
 
-        * tao/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multicast/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Pluggable/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl:
-        * tao/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl:
+          Added generation of forward declaration of the associated
+          event consumer interface, if the valuetype node being
+          processed happens to be an eventtype. Also added the _ptr
+          typedef, so it can be seen by a component declaration
+          that occurs later in the same scope.
 
-          Added generation of input datafiles to testscripts.
-          All these scripts now generate an input file of ~100Kb when started,
-          deleting the file when the test has finished.
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
 
-Mon Sep 13 09:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Changed return values of some generated methods that
+          return CORBA::Boolean to return 'true' or 'false'
+          instead of '1' or '0'.
 
-        * tao/UShortSeqC.h:
-          Explictly export the base template, to fix duplicate link errors
-          when linking DsAdmin. This is a workaround for a bug in the vc7
-          compiler.
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp (_tao_duplicate):
 
-Sun Sep 12 17:08:17 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Added code generation to initialize the declaration of the
+          return value pointer to 0. Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for making the suggestion.
 
-	* orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
-	* orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
-	* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
-	* orbsvcs/examples/Log/Event/Log_Event.mpc:
-	* orbsvcs/examples/Log/Notify/Log_Notify.mpc:
+Tue Feb 15 10:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Update *.mpc files to reflect new libraries.
+        * orbsvcs/performance-tests/RTEvent/lib/Servant_var.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h:
+          Replaced ACE_EXPLICIT with explicit
 
-	* orbsvcs/orbsvcs/Log/BasicLogFactory_i.h:
-	* orbsvcs/orbsvcs/Log/BasicLog_i.h:
-	* orbsvcs/orbsvcs/Log/EventLogConsumer.h:
-	* orbsvcs/orbsvcs/Log/EventLogFactory_i.h:
-	* orbsvcs/orbsvcs/Log/EventLogNotification.h:
-	* orbsvcs/orbsvcs/Log/EventLog_i.h:
-	* orbsvcs/orbsvcs/Log/Iterator_i.h:
-	* orbsvcs/orbsvcs/Log/LogMgr_i.h:
-	* orbsvcs/orbsvcs/Log/LogNotification.h:
-	* orbsvcs/orbsvcs/Log/LogRecordStore.h:
-	* orbsvcs/orbsvcs/Log/LogRecordStore_persist.h:
-	* orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h:
-	* orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
-	* orbsvcs/orbsvcs/Log/Log_i.h:
-	* orbsvcs/orbsvcs/Log/NotifyLogConsumer.h:
-	* orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h:
-	* orbsvcs/orbsvcs/Log/NotifyLogNotification.h:
-	* orbsvcs/orbsvcs/Log/NotifyLog_i.h:
-	* orbsvcs/orbsvcs/Log/PersistStore.h:
+Tue Feb 15 08:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Changed #include "*_export.h" to "*_serv_export.h"; Renamed
-          TAO_*_Export to TAO_*_Serv_Export.
+        * tao/ORBInitializer_Registry.cpp:
+          Fixed problem in static template member instantiation, thanks to
+          Werner Buchert <w dot buchert at medat dot de> for reporting
+          this
 
-	* orbsvcs/orbsvcs/Log/eventlog_serv_export.h:
-	* orbsvcs/orbsvcs/Log/eventlog_skel_export.h:
-	* orbsvcs/orbsvcs/Log/log_serv_export.h:
-	* orbsvcs/orbsvcs/Log/log_skel_export.h:
-	* orbsvcs/orbsvcs/Log/notifylog_serv_export.h:
-	* orbsvcs/orbsvcs/Log/notifylog_skel_export.h:
-	* orbsvcs/orbsvcs/DsEventLogAdmin.rc:
-	* orbsvcs/orbsvcs/DsNotifyLogAdmin.rc:
+Mon Feb 14 23:05:55 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-	  New files.
+        * TAO_IDL/ast/ast_recursive.cpp:
+        * TAO_IDL/be/be_eventtype.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_factory.cpp:
+        * TAO_IDL/be/be_visitor_module.cpp:
+        * TAO_IDL/be/be_visitor_root.cpp:
+        * TAO_IDL/be/be_visitor_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd.cpp:
+        * TAO_IDL/be/be_visitor_module/module.cpp:
+        * TAO_IDL/be/be_visitor_root/root.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_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_ch.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.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.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_ci.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_si.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/valuetype_fwd_ch.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/field_ch.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/field_ci.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/field_cs.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h:
+        * TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h:
+        * TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h:
+
+          - Removed all eventtype visitors, they all just delegate to
+            the corresponding valuetype visitor. Added visit_eventtype()
+            methods to valuetype visitors where necessary so the delegation
+            can be done within the valuetype visitor itself and still
+            keep the polymorphism in be_eventtype::visit_eventtype(),
+            since the arg traits and ccm-preproc visitors still need
+            it.
+
+          - Changed error checking to allow a struct/union/sequence/array
+            defined inside an interface to contain that interface
+            as a member or element type, that is, this is no longer
+            regarded by the IDL compiler as illegal recursion. Thanks to
+            Don Sharp <dws@prismtech.com> for bringing this up.
+
+          - Fixed bug that aborted the IDL compiler when an eventtype
+            contained a constant declaration. Thanks to Steven Baker
+            <Steven_D_Baker@raytheon.com> for reporting the bug.
+
+        * tests/IDL_Test/interface.idl:
+
+          Expanded sample IDL file sent in by Don Sharp in the
+          second list item above and added it to the test suite.
+
+        * TAO_IDL/be/be_visitor_eventtype.cpp:
+        * TAO_IDL/be/be_visitor_eventtype_fwd.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/cdr_op_ci.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/eventtype_ch.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/eventtype_ci.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/eventtype_cs.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ch.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ci.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/eventtype_obv_cs.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/eventtype_sh.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/eventtype_si.cpp:
+        * TAO_IDL/be/be_visitor_eventtype/eventtype_ss.cpp:
+        * TAO_IDL/be/be_visitor_eventtype_fwd/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_eventtype_fwd/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp:
+        * TAO_IDL/be_include/be_visitor_eventtype.h:
+        * TAO_IDL/be_include/be_visitor_eventtype_fwd.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/any_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/any_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ci.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/cdr_op_cs.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/eventtype_ch.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/eventtype_ci.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/eventtype_cs.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ch.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ci.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_cs.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/eventtype_sh.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/eventtype_si.h:
+        * TAO_IDL/be_include/be_visitor_eventtype/eventtype_ss.h:
+        * TAO_IDL/be_include/be_visitor_eventtype_fwd/any_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_eventtype_fwd/cdr_op_ch.h:
+        * TAO_IDL/be_include/be_visitor_eventtype_fwd/eventtype_fwd_ch.h:
+
+          Files removed as part of the fix in the first listed item
+          above.
+
+Mon Feb 14 09:25:27 2005  Ciju John  <john_c@ociweb.com>
+
+        * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl:
+          Cleaned out consumer/supplier argument list on each test iteration.
+
+Mon Feb 14 10:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h:
+          Replaced ACE_EXPLICIT with explicit
+
+Sun Feb 13 13:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+        * tao/Transport.h:
+        * tao/Wait_Strategy.h:
+          Doxygen improvements
 
-          Split Event Logging Service into three libraries:
-	  DsEventLogAdmin, DsEventLogAdmin_Skel, and
-	  DsEventLogAdmin_Serv for client stubs, servant skeletons, and
-	  service implementation respectively.
+Fri Feb 11 11:12:56 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-	* orbsvcs/orbsvcs/DsLogAdmin.mpc:
+        * tao/Valuetype/ValueBase.inl (is_end_tag):
 
-          Split Logging Service into three libraries:
-	  DsLogAdmin, DsLogAdmin_Skel, and DsLogAdmin_Serv for client
-	  stubs, servant skeletons, and service implementation
-	  respectively.
+          Removed comparison that is always true.  Addresses warning
+          exhibited by g++ 3.3.4.
 
-	* orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+Fri Feb 11 08:42:25 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-          Split Notify Logging Service into three libraries:
-	  DsNotifyLogAdmin, DsNotifyLogAdmin_Skel, and
-	  DsNotifyLogAdmin_Serv for client stubs, servant skeletons, and
-	  service implementation respectively.
-
-Sun Sep 12 14:38:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Leader_Followers/client.cpp:
-          Changed type of the sleep_ member from u_long to long, to fix
-          warnings in our HPUX 64bit build.
-
-Sat Sep 11 19:43:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* orbsvcs/orbsvcs/Makefile.am:
-	* orbsvcs/tests/CosEvent/Basic/Makefile.am:
-	* orbsvcs/tests/FT_App/Makefile.am:
-	* tao/Makefile.am:
-
-	  Updated.
-
-Sat Sep 11 12:41:22 2004  Steve Totten  <totten_s@ociweb.com>
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
-        * orbsvcs/tests/ImplRepo/locked/run_test.pl:
-        * utils/nslist/run_test.pl:
-          Removed some trailing blanks and tab characters from these
-          files.
-
-Sat Sep 11 12:25:07 2004  Steve Totten  <totten_s@ociweb.com>
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
+        * orbsvcs/TAO_Service/TAO_Service.cpp:
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
+        * tao/CDR.cpp:
+        * tao/Connector_Registry.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/UTF16_BOM_Factory.cpp:
+        * utils/NamingViewer/BindDialog.cpp:
+        * utils/NamingViewer/BindNewContext.cpp:
+        * utils/NamingViewer/NamingTreeCtrl.cpp:
         * utils/NamingViewer/NamingViewer.mpc:
+        * utils/NamingViewer/NamingViewer.cpp:
+        * utils/NamingViewer/NamingViewerDlg.h:
+        * utils/NamingViewer/NamingViewerDlg.cpp:
+        * utils/NamingViewer/SelectNSDialog.cpp:
+        * utils/NamingViewer/ViewIORDialog.cpp:
+        * utils/catior/catior.cpp:
+        * utils/catior/catior.mpc:
+        * utils/nslist/nsadd.cpp:
+        * utils/nslist/nsdel.cpp:
+        * utils/nslist/nslist.cpp:
         * utils/nslist/nslist.mpc:
-          Modified MPC files for the following TAO utilities to make
-          sure the executables are installed in $ACE_ROOT/bin:
-          - tao_imr
-          - nslist
-          - nsdel
-          - nsadd
-          - NamingViewer
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
-        * orbsvcs/tests/ImplRepo/locked/run_test.pl:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:
-        * utils/nslist/run_test.pl:
-          Also modified various test scripts that invoke these
-          utilities to get them from $ACE_ROOT/bin.
-
-Sat Sep 11 08:47:58 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* orbsvcs/orbsvcs/Notify/Properties.h:
-
-	  Changed to use TAO_NOTIFY_SERV_SINGLETON_DECLARE.
-
-	* orbsvcs/orbsvcs/Log/NotifyLogNotification.h:
-
-	  Removed #include of CosNamingC.h.  It isn't used, but requires
-	  linking with naming client library with some windows compilers.
-
-Sat Sep 11 00:44:34 2004  Olli Savia  <ops@iki.fi>
-
-        * TAO_IDL/ast/ast_module.cpp:
-          Changed NULL to 0 to silence compile time warning.
-
-Fri Sep 10 12:28:52 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Trading/Trading.mpc:
-
-          Changed colocated_test project to inherit from trading_serv.
-
-          Changed import_test and export_test projects to inherit from
-          portableserver.
-
-        * orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc:
-
-          Changed project to inherit from notification_skel.
-
-        * orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc:
-
-          Changed project to inherit from naming.
-
-Fri Sep 10 09:06:42 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/ec_typed_events_serv.mpb:
-        * orbsvcs/orbsvcs/ec_typed_events_skel.mpb:
-
-          Moved dependency on dynamicinterface and ifr_client from _skel
-          to _serv.
-
-Thu Sep  9 19:26:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc:
-
-          Changed project to inherit from event_skel.
-
-Thu Sep  9 19:21:21 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Notify/lib/Notify_lib.mpc:
-
-          Changed project to inherit from svc_utils.
-
-Thu Sep  9 19:18:11 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/RT_Notification.mpc:
-
-          Changed project to inherit from notify_serv.  Removed
-          unused dependency on dynamicany and svc_utils.
-
-Thu Sep  9 19:13:30 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/examples/Log/Event/Log_Event.mpc:
-
-          Changed projects to inherit from naming.
-
-Thu Sep  9 19:09:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc:
-
-          Changed projects to inherit from event_skel and naming.
-
-Thu Sep  9 18:46:20 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc:
-
-          Changed project to inherit from event_skel.
-
-Thu Sep  9 18:30:56 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/Simple/time-date/Simple_time_date.mpc:
-
-          Changed client project to inherit from portableserver.  It
-          doesn't really use it, but Simple_util.h #includes
-          "PortableServer/PortableServer.h", which forces it
-          to be resolved.
-
-        * orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc:
-
-          Added exename definitions so that programs, not libraries, are
-          built.
-
-          Added main.cpp to FactoryServer project's Source_Files.
-
-          Changed FactoryServer project to inherit from event_serv.
-
-Thu Sep  9 17:24:29 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Notify/Notify_Extensions.h:
-
-          Revert change:
-          Wed Sep  8 12:15:18 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-          for this file only.  This is actually part of the notication
-          client stub library.
-
-Thu Sep  9 16:16:48 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/ORB.cpp:
-        * tao/TAO_Singleton_Manager.h:
-        * tao/TAO_Singleton_Manager.cpp:
-
-          Reintroduced TAO's unexpected exception handler.  It will be
-          removed once again once the skeleton refactoring work is
-          committed.
-
-Thu Sep  9 15:57:30 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/DLL_ORB.h:
-        * tao/DLL_ORB.inl:
-        * tao/DLL_ORB.cpp:
-
-          Removed these files.  They have been deprecated for a few
-          years.  See the `tests/DLL_ORB' test to get an idea of how to
-          use DLL ORB functionality without explicitly linking the TAO
-          library.  Thanks to Bala for the reminder.
-
-        * tao/Makefile.am (ORB_Core):
-        * tao/tao.mpc (Source_Files):
-
-          Removed `DLL_ORB.cpp' from the source file list.
-
-Thu Sep  9 11:53:40 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_decl.cpp (version):
-
-          Fixed logic of method that computes the version to handle
-          the case where the repository ID is set with 'typeid'
-          with no valid version at the end of the string.
-
-Thu Sep  9 07:16:02 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-
-          Updated inheritance.
-
-Thu Sep  9 07:05:20 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Notify/lib/Notify_lib.mpc:
-
-          Changed to inherit from notification_skel.
-
-Thu Sep  9 06:46:00 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-
-          Changed CosNotification_Skel project to inherit from event_skel.
-
-Thu Sep  9 06:15:38 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-
-          Updated library project to inherit from naming_skel.
-
-Thu Sep  9 05:49:49 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Concurrency_Service/Makefile.am:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Dump_Schedule/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/LoadBalancer/Makefile.am:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-        * orbsvcs/Scheduling_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Updated for orbsvcs library refactor.
-
-Thu Sep  9 05:08:57 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/PortableGroup.mpc:
-        * orbsvcs/orbsvcs/RTSched.mpc:
-
-          Updated.  Missing some dependencies now that naming.mpb is just
-          client stub library.
-
-Wed Sep  8 22:08:29 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
-          Added exename definition so that programs, not libraries, are built.
-
-Wed Sep  8 21:31:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/ec_typed_events.mpb:
-
-          Added idlflags setting for stub and skeleton export headers and
-          macros.  Fixed typos in the lists of source, header, and inline
-          files.
-
-Wed Sep  8 21:36:34 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/Typecode.cpp:
-        * tao/Typecode.h:
-        * tao/Typecode.i:
-
-          For long we got away with wrong typecode memory
-          manipulation. The fundamental problem was that somewhere
-          inbetween we started manipulating the lifetimes of stack based
-          typecodes that are generated in the stub and skeleton code. This
-          fix basically makes sure that we don't do that. The changes are
-          as follows.
-
-          - Made _incr_ref () and _decr_ref () protected since
-            clients should not be using this directly.
-
-          - The _duplicate () will check for stack based typecodes,
-            allocate a typecode off the heap if the incoming tyoecodes are
-            stack based. If the typecode is heap allocated we just increment
-            the refcount.
-
-          - The _release () decrements the ref count if it is off the heap
-            and is a no-op otherwise.
-
-          The Typecode had a boolean flag orb_owns_ which was supposed to
-          be used for the above, but we never used it for some reason.
-
-        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
-
-          Set the orb_owns_ flag while creating a new typecode off the
-          heap.
-
-          Thanks to JT Conklin for pointing out the problem.
-
-Wed Sep  8 12:51:53 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
-
-          Added #include "event_serv_export.h".
-
-Wed Sep  8 12:15:18 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h:
-        * orbsvcs/orbsvcs/Naming/Entries.h:
-        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Loader.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Loader.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Server.h:
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
-        * orbsvcs/orbsvcs/Naming/Persistent_Entries.h:
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h:
-        * orbsvcs/orbsvcs/Notify/Admin.h:
-        * orbsvcs/orbsvcs/Notify/AdminProperties.h:
-        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h:
-        * orbsvcs/orbsvcs/Notify/Builder.h:
-        * orbsvcs/orbsvcs/Notify/Consumer.h:
-        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Notify/Consumer_Map.h:
-        * orbsvcs/orbsvcs/Notify/Container_T.h:
-        * orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h:
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.h:
-        * orbsvcs/orbsvcs/Notify/Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Notify/Default_Factory.h:
-        * orbsvcs/orbsvcs/Notify/ETCL_Filter.h:
-        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp:
-        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h:
-        * orbsvcs/orbsvcs/Notify/Event.h:
-        * orbsvcs/orbsvcs/Notify/EventChannel.h:
-        * orbsvcs/orbsvcs/Notify/EventChannelFactory.h:
-        * orbsvcs/orbsvcs/Notify/EventType.h:
-        * orbsvcs/orbsvcs/Notify/EventTypeSeq.h:
-        * orbsvcs/orbsvcs/Notify/Event_Manager.h:
-        * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h:
-        * orbsvcs/orbsvcs/Notify/Event_Map_T.h:
-        * orbsvcs/orbsvcs/Notify/Factory.h:
-        * orbsvcs/orbsvcs/Notify/FilterAdmin.h:
-        * orbsvcs/orbsvcs/Notify/FilterFactory.h:
-        * orbsvcs/orbsvcs/Notify/Find_Worker_T.h:
-        * orbsvcs/orbsvcs/Notify/ID_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Event.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.h:
-        * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Extensions.h:
-        * orbsvcs/orbsvcs/Notify/Object.h:
-        * orbsvcs/orbsvcs/Notify/POA_Helper.h:
-        * orbsvcs/orbsvcs/Notify/Peer.h:
-        * orbsvcs/orbsvcs/Notify/Properties.h:
-        * orbsvcs/orbsvcs/Notify/Property.h:
-        * orbsvcs/orbsvcs/Notify/PropertySeq.h:
-        * orbsvcs/orbsvcs/Notify/Property_Boolean.h:
-        * orbsvcs/orbsvcs/Notify/Property_T.h:
-        * orbsvcs/orbsvcs/Notify/Proxy.h:
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h:
-        * orbsvcs/orbsvcs/Notify/ProxySupplier.h:
-        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.h:
-        * orbsvcs/orbsvcs/Notify/Proxy_T.h:
-        * orbsvcs/orbsvcs/Notify/QoSProperties.h:
-        * orbsvcs/orbsvcs/Notify/Reactive_Task.h:
-        * orbsvcs/orbsvcs/Notify/Refcountable.h:
-        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h:
-        * orbsvcs/orbsvcs/Notify/Seq_Worker_T.h:
-        * orbsvcs/orbsvcs/Notify/Service.h:
-        * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h:
-        * orbsvcs/orbsvcs/Notify/Supplier.h:
-        * orbsvcs/orbsvcs/Notify/SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Notify/Supplier_Map.h:
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
-        * orbsvcs/orbsvcs/Notify/Timer.h:
-        * orbsvcs/orbsvcs/Notify/Timer_Queue.h:
-        * orbsvcs/orbsvcs/Notify/Timer_Reactor.h:
-        * orbsvcs/orbsvcs/Notify/Worker_Task.h:
-        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h:
-        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h:
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Trader/Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h:
-        * orbsvcs/orbsvcs/Trader/Trader.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.h:
-        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp:
-        * orbsvcs/orbsvcs/Trader/Trading_Loader.h:
-
-          Changed #include "*_export.h" to "*_serv_export.h"; Renamed
-          TAO_*_Export to TAO_*_Serv_Export.
-
-        * orbsvcs/orbsvcs/CosEvent/event_serv_export.h:
-        * orbsvcs/orbsvcs/Naming/naming_serv_export.h:
-        * orbsvcs/orbsvcs/Notify/notify_serv_export.h:
-        * orbsvcs/orbsvcs/Trader/trading_serv_export.h:
-
-          New files.
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Changed to use different export macros service implementations.
-
-Wed Sep  8 11:03:47 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent/event_skel_export.h:
-        * orbsvcs/orbsvcs/Naming/naming_skel_export.h:
-        * orbsvcs/orbsvcs/Notify/notify_skel_export.h:
-        * orbsvcs/orbsvcs/Trader/trading_skel_export.h:
-
-          New files.
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Changed to use different export macros and export includes for
-          stub and skeleton libraries.
-
-Wed Sep  8 12:55:30 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-          Add explicit Resource_Files sections to associate
-          rc files with the correct project.
-
-Wed Sep  8 09:53:02 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
-
-          Added support for getting load average on NetBSD.
-
-Wed Sep  8 09:02:57 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Changed *_Skel project to inherit from portableserver.
-
-Wed Sep  8 08:58:21 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-
-          Fixed tipo -- the export macro was not changed when export
-          header was.
-
-Wed Sep  8 10:28:29 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-          Add explicit Resource_Files sections to associate
-          rc files with the correct project.
-
-Wed Sep  8 10:22:39 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-
-          Modified stream output to make sure a bare newline (with no
-          whitespace) is added at the end of the generated source
-          file containing Any operators and type codes (if the file
-          is generated) both when explicit template instantiations are
-          generated and when they are not. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for reporting the problem, for
-          compilers that must have an empty newline at the end of
-          each file.
-
-Wed Sep  8 04:54:23 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Define TAO_*_BUILD_DLL macro for stub and skeleton libraries
-          so that symbols will be exported for Windows builds.  I hope
-          this will be enough so that separate #defines aren't needed
-          for each library.  Thanks to Johnny Willemsen for help with
-          this problem.
-
-Tue Sep  7 21:48:40 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Utils/Server_Main.cpp:
-
-          Removed redundant include guards around ace/Time_Value.h include
-          directive.
-
-Tue Sep  7 16:31:25 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Notify/lib/EventChannel_Command.h:
-
-          Removed #include of "orbsvcs/Notify/CosNotify_Initializer.h", as
-          that requires the Notification Service implementation library to
-          be pulled in.
-
-        * orbsvcs/TAO_Service/svc.conf:
-        * orbsvcs/examples/Notify/ThreadPool/notify.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/Colocated/colocated.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.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:
-
-          Changed CosEvent, CosNaming, CosNotification, and CosTrading
-          Service file/path names.
-
-        * docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc:
-        * docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc:
-        * examples/Callback_Quoter/Callback_Quoter.mpc:
-        * examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc:
-        * examples/Event_Comm/Event_Comm.mpc:
-        * examples/Logging/Logging.mpc:
-        * examples/Simple/bank/bank.mpc:
-        * examples/Simple/echo/echo.mpc:
-        * examples/Simple/grid/grid.mpc:
-        * examples/Simple/time-date/Simple_time_date.mpc:
-        * examples/Simple/time/time.mpc:
-        * examples/ior_corbaloc/ior_corbaloc.mpc:
-        * examples/mfc/client.mpc:
-        * examples/mfc/server.mpc:
-        * orbsvcs/Concurrency_Service/Concurrency_Service.mpc:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.mpc:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-        * orbsvcs/Fault_Notifier/Fault_Notifier.mpc:
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
-        * orbsvcs/Naming_Service/Naming_Service.mpc:
-        * orbsvcs/Notify_Service/Notify_Service.mpc:
-        * orbsvcs/Time_Service/Time_Service.mpc:
-        * orbsvcs/Trading_Service/Trading_Service.mpc:
-        * orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc:
-        * orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc:
-        * orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc:
-        * orbsvcs/examples/Notify/Filter/Notify_Filter.mpc:
-        * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc:
-        * orbsvcs/orbsvcs/CosLifeCycle.mpc:
-        * orbsvcs/orbsvcs/CosTime.mpc:
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-        * orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb:
-        * orbsvcs/tests/FT_App/FT_App.mpc:
-        * orbsvcs/tests/IOR_MCast/IOR_MCast.mpc:
-        * orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc:
-        * orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc:
-        * orbsvcs/tests/Simple_Naming/Simple_Naming.mpc:
-        * orbsvcs/tests/Trading/Trading.mpc:
-        * orbsvcs/tests/ior_corbaname/ior_corbaname.mpc:
-        * performance-tests/POA/Demux/Demux.mpc:
-
-          Update *.mpc and *.mpb files to reflect new libraries.  In many
-          cases this required adding new base projects, as libraries were
-          being linked in because of naming -- which was once the service
-          implementation (and thus pulled in lots of other libraries) and
-          is now just the Naming client stubs.
-
-        * orbsvcs/orbsvcs/Event/Local_ESTypes.h:
-
-          Removed #include of "orbsvcs/CosNaming.h".  The Event Service
-          does not use/depend on the Naming Service.
-
-        * orbsvcs/orbsvcs/CosEvent_Serv.rc:
-        * orbsvcs/orbsvcs/CosEvent_Skel.rc:
-        * orbsvcs/orbsvcs/CosNaming_Serv.rc:
-        * orbsvcs/orbsvcs/CosNaming_Skel.rc:
-        * orbsvcs/orbsvcs/CosNotification_Serv.rc:
-        * orbsvcs/orbsvcs/CosNotification_Skel.rc:
-        * orbsvcs/orbsvcs/CosTrading_Serv.rc:
-        * orbsvcs/orbsvcs/CosTrading_Skel.rc:
-
-          New files, resource files for new libraries.
-
-        * orbsvcs/orbsvcs/ec_typed_events.mpb:
-
-          Update to contain the additional source files, etc. for Event
-          Service client stubs only.
-
-        * orbsvcs/orbsvcs/ec_typed_events_serv.mpb:
-        * orbsvcs/orbsvcs/ec_typed_events_skel.mpb:
-
-          New files, containing the additional source files, etc. for the
-          Event Service implementation and servant skeletons.
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-          Split Event Service into three libraries:
-          CosEvent, CosEvent_Skel, and CosEvent_Serv for client stubs,
-          servant skeletons, and service implementation respectively.
-
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-          Split Naming Service into three libraries:
-          CosNaming, CosNaming_Skel, and CosNaming_Serv for client stubs,
-          servant skeletons, and service implementation respectively.
-
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-          Split Notification Service into three libraries:
-          CosNotification, CosNotification_Skel, and CosNotification_Serv
-          for client stubs, servant skeletons, and service implementation
-          respectively.
-
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-          Split Trading Service into three libraries:
-          CosTrading, CosTrading_Skel, and CosTrading_Serv for client stubs,
-          servant skeletons, and service implementation respectively.
-
-Tue Sep  7 14:10:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
-
-        * TAO/tao/Utils/Server_Main.cpp
-          ACE_Time_Value class is used without necessary first including its
-          definition in some build environments. Ensure that this class's
-          header is included if it hasn't been so before this use here.
-
-Mon Sep  6 22:59:11 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp (gen_stub_src_includes):
-
-          The UserException::_tao_{en,de}code() methods can throw a
-          CORBA::MARSHAL exception so make sure that system exception is
-          fully declared/defined by including
-          "tao/SystemException.h".  However, only include
-          "tao/SystemException.h" if a user exception was encountered and
-          if we're not already including it in the stub header.  Thanks to
-          Johnny Willemsen for reporting the problem.
-
-Mon Sep  6 19:45:32 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-        * TAO_IDL/ast/ast_decl.cpp:
-
-          Fixed a bug in the generation of repository ids for implied
-          IDL event consumer interfaces.
-
-Mon Sep  6 00:54:48 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/LoadBalancer/LoadBalancer.mpc:
-
-          For some reason this MPC file was configured to generate
-          "CosLoadManager" and "CosLoadMonitor" libraries rather
-          "LoadManager" and "LoadMonitor" executables, respectively; a
-          complete departure from the pre-MPC "hand-written" Makefiles and
-          project files.  Fixed this problem.  This should also fix the
-          Load Balancer test failures in our daily automated regression
-          tests.
-
-Mon Sep  6 00:42:49 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Utils/Server_Main.cpp:
-
-          Include "ace/Time_Value.h" to pull ACE_Time_Value class
-          declaration.
-
-          (Server_Main):
-
-          Fixed emulated exception macro usage for CORBA::ORB_init()
-          call within an ACE_TRY block, i.e. "ACE_TRY_CHECK", not
-          "ACE_CHECK_RETURN(...)".
-
-Sun Sep  5 22:46:13 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * TAO_IDL/be/be_attribute.cpp (be_attribute):
-
-          TAO_IDL generated attribute methods currently have an exception
-          specification containing CORBA::SystemException.  Make sure we
-          generate a "tao/SystemException.h" include directive.
-
-        * examples/RTScheduling/MIF_SchedulingC.h:
-
-          Removed some lingering "_tao" prefixes in TAO::Objref_Traits<>
-          traits templates.  Fixes compile-time errors.
-
-        * orbsvcs/tests/IOR_MCast/server.cpp:
-        * orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp:
-
-          Fixed compile-time errors due to missing #include directives now
-          made necessary by header reductions performed over the last few
-          days.
-
-Sun Sep  5 09:42:34 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Time_Utilities.i:
-
-          Include "ace/Time_Value.h" to pull in ACE_Time_Value class
-          declaration.
-
-Sun Sep  5 09:32:18 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tests/CDR/basic_types.cpp:
-        * tests/Connection_Failure/client.cpp:
-        * tests/DynAny_Test/data.h:
-        * tests/ORB_init/ORB_init.cpp:
-
-          Added missing #include directives now needed due to included
-          header reductions in tao/ORB.h.
-
-        * tests/ORT/ObjectReferenceFactory.h (make_object):
-        * tests/ORT/ObjectReferenceFactory.cpp (make_object):
-
-          Removed exception specification.  Valuetypes in TAO_IDL
-          generated stubs do not have one, nor does this test
-          ObjectReferenceFactory method need one.  Fixes a compile-time
-          error.
-
-Sun Sep  5 09:21:49 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
-        * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h:
-        * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h:
-
-          Added missing "tao/PolicyC.h" #include.
 
-Sun Sep  5 03:58:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Added better support for EVC 4.  It is not complete, but now the
+          CosNaming library (among other things) can be built.
 
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+Fri Feb 11 07:29:34 2005  Ciju John  <john_c@ociweb.com>
 
-          Added missing "tao/SystemException.h" #include.
+        * orbsvcs/tests/Notify/Reconnecting/run_test.pl:
+        * orbsvcs/tests/Notify/Discarding/run_test.pl
+        * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
+        * orbsvcs/tests/Notify/Structured_Filter/run_test.pl
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
+        * orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
+          Some Notification test scripts were timing out on the
+          scoreboard. Increased the wait-time.
 
-Sun Sep  5 01:42:18 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Stub.h (create_ior_info, get_profile_ior_info):
-
-          Removed exception specifications from these methods.  They
-          aren't needed and force an unecessary include of the heavy
-          weight tao/SystemException.h header.
-
-        * tao/Stub.cpp:
-
-          Likewise.
-
-        * tao/IOP_CodecC.h:
-        * tao/PollableC.h:
-        * tao/PortableInterceptorC.h:
-        * tao/IFR_Client/IFR_BaseC.h:
-        * tao/PortableServer/ImplRepoC.h:
-        * tao/PortableServer/ORT_Adapter.h:
-
-          Added missing header #includes now made necessary by header
-          dependency reductions in tao/ORB.h.
-
-Sun Sep  5 01:21:45 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * examples/RTScheduling/MIF_SchedulingC.h:
-        * examples/RTScheduling/MIF_SchedulingC.cpp:
+Fri Feb 11 07:08:12 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-          Removed "tao_" prefix from methods in the TAO traits templates
-          used in these sources, as was done to the other traits templates
-          used throughout TAO.
-
-Sun Sep  5 01:13:12 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/ORB.h:
-
-          Removed exception specifications from CORBA::ORB methods.  The
-          C++ mapping no longer requires them.  This also allows for the
-          removal of the "tao/SystemException.h" include which will
-          improve TAO library compile times, in addition to compile times
-          for TAO_IDL generated stubs for IDL that contain no operations
-          (e.g. anything except for non-empty interfaces).
-
-          Include "Policy_ForwardC.h" instead of "PolicyC.h".  The former
-          is much lighter weight, and is all that is needed.
-
-          Forward declare some types in the CORBA namespace since they are
-          no longer pulled in by removed "PolicyC.h" #include.
-
-          Include "VarOut_T.h" to pull in some necessary TAO templates.
-
-          Corrected some Doxygen documentation.
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/lex.yy.cpp.diff:
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/y.tab.h:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/y.tab.cpp.diff:
+        * TAO_IDL/tao_idl.mpc:
 
-        * tao/ORB.cpp:
+          Brought the ll and yy files back into sync with the cpp files that
+          had been modified independently.  I also added targets to the mpc
+          file to regenerate lex.yy.cpp, y.tab.cpp and fe_lookup.cpp based
+          on the original Makefile targets.  The generated code (aside from
+          whitespace) is virtually the same as the previous version.
 
-          Removed exception specifications from CORBA::ORB methods in
-          accordance with changes made to ORB.h.
+Fri Feb 11 10:08:39 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed code that initiated TAO unexpected exception handler
-          registration.  See TAO_Singleton_Manager.* change description
-          below for details.
+        * tao/Services.pidl:
+          Updated regeneration instructions
 
-        * tao/TAO_Singleton_Manager.h:
-        * tao/TAO_Singleton_Manager.cpp:
+Fri Feb 11 09:41:39 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed code that set the TAO unexpected exception handler.  It
-          is no longer needed since the C++ mapping no longer requires
-          unknown C++ exceptions to be converted to the CORBA::UNKNOWN
-          system exception.  It is anyway considered "bad form" to
-          potentially override an application defined unexpected exception
-          handler.
+        * examples/POA/Forwarding/client.cpp:
+          When an exception is caught print out that it is caught in the
+          client.
 
-        * tao/ClientRequestInfo.cpp:
-        * tao/FILE_Parser.cpp:
-        * tao/Object.cpp:
-        * tao/Object_Ref_Table.cpp:
-        * tao/PolicyFactory_Registry.cpp:
-        * tao/PortableInterceptorC.cpp:
-        * tao/PortableInterceptorC.h:
-        * tao/Stub.h:
-        * tao/DynamicInterface/Server_Request.cpp:
-        * tao/RTCORBA/RTCORBAC.h:
-        * tao/RTCORBA/RT_ORB_Loader.cpp:
-        * tao/RTCORBA/RT_Stub_Factory.cpp:
-        * tao/Utils/RIR_Narrow.cpp:
+        * examples/POA/Forwarding/server.cpp:
+          When an exception is caught print out that it is caught in the
+          server. Moved the parsing of the arguments after ORB::init so
+          that without problems additional orb arguments can be passed
 
-          Added missing header #includes now made necessary by header
-          dependency reductions in tao/ORB.h.
+Fri Feb 11 09:19:39 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/be/be_codegen.cpp (gen_stub_hdr_includes):
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
+        * orbsvcs/tests/AVStreams/Multicast/run_test.pl:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl:
+          When the spawn of the naming service fails exit directly from the
+          test script instead of waiting on the timeout of the ior file
 
-          Enabled/uncommented code that conditionally generates a
-          "tao/SystemException.h" include for IDL that defines
-          operations.  Since tao/ORB.h no longer includes
-          "tao/SystemException.h", it must be included in TAO_IDL
-          generated stub headers; at least until exception specifications
-          are removed from IDL-based stub and skeleton operations (see Bug
-          1852).
+        * orbsvcs/tests/Notify/Basic/run_test.pl:
+        * orbsvcs/tests/Notify/Blocking/run_test.pl:
+        * orbsvcs/tests/Notify/Discarding/run_test.pl:
+        * orbsvcs/tests/Notify/Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/Ordering/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/ThreadPool/run_test.pl:
+          When the naming service or notify service fails to spawn, kill the
+          already started processes and exit instead of waiting for the timeout
+          of the IOR file
 
-Sat Sep  4 23:30:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Thu Feb 10 07:07:39 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/IORTable/IORTableC.h:
-        * tao/PortableServer/ORT_Adapter_Factory.h:
+        * TAO version 1.4.4 released.
 
-          Added missing "tao/SystemException.h" include.
+Mon Feb  7 21:49:48 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Fri Sep  3 13:55:53 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * orbsvcs/orbsvcs/TAO_FTORB_Utils.pc.in:
+        * orbsvcs/orbsvcs/TAO_FT_ClientORB.pc.in:
+        * orbsvcs/orbsvcs/TAO_FT_ServerORB.pc.in:
+        * orbsvcs/orbsvcs/TAO_FaultTolerance.pc.in:
+        * orbsvcs/orbsvcs/TAO_PortableGroup.pc.in:
 
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h:
+          New files, pkg-config *.pc templates.
 
-          Include "tao/SystemException.h" instead of "tao/Exception.h" to
-          pull CORBA::SystemException class declaration.
+Mon Feb  7 21:54:58 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/IORManipulation/IORC.h:
-        * tao/IORManipulation/IORC.cpp:
-        * tao/RTPortableServer/RTPortableServerC.h:
-        * tao/RTPortableServer/RTPortableServerC.cpp:
-        * tao/TypeCodeFactory/TypeCodeFactoryC.h:
-        * tao/TypeCodeFactory/TypeCodeFactoryC.cpp:
+        * tao/DynamicAny/DynStruct_i.cpp (to_any):
 
-          Removed "tao_" prefix from methods in the TAO traits templates
-          used in these sources, as was done to the other traits templates
-          used throughout TAO.
+          Removed unused local variable.
 
-Fri Sep  3 13:42:16 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Mon Feb  7 21:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/Acceptor_Registry.h (open):
-        * tao/Acceptor_Registry.cpp (open):
+        * tao/DynamicAny/DynStruct_i.cpp:
+          Removed not used variable and replaced ACE cast macros with their
+          C++ version
 
-          Removed the exception specification from this method.  It really
-          isn't needed.  Removing it also allows us to avoid including
-          "tao/SystemException.h" to pull in the CORBA::SystemException
-          class declaration.  Fixes a compile-time error regarding
-          undefined CORBA::SystemException type in header.
+Mon Feb  7 13:24:23 2005  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Fri Sep  3 14:18:35 2004  Dale Wilson  <wilson_d@ociweb.com>
+        * tao/Remote_Invocation.cpp:
+        * tao/Transport.cpp:
+        * tao/Transport.h:
 
-        * interop-tests/wchar/interop_wchar_i.cpp:
-          gcc on Tru64 is still complaining about using a
-          wchar_t * where a CORBA::WChar * is expected.
-          ( I wonder if this is a 32 vs 64 bit problem?)
-          Try again to make it happy.
+          In order to ensure that request headers are not translated, I
+          added a new transport method, clear_translators() that is called
+          by TAO_Remote_Invocation::write_header. This is necesssary to
+          avoid problems brought on by reusing CDR streams.
 
-Fri Sep  3 11:54:49 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Mon Feb  7 08:49:46 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * utils/catior/Makefile.am:
-        * utils/nslist/Makefile.am:
+        * orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp:
+        * tao/Any_Array_Impl_T.cpp:
+        * tao/Any_Basic_Impl_T.cpp:
+        * tao/Any_Special_Impl_T.cpp:
+        * tao/Any_Unknown_IDL_Type.cpp:
+        * tao/DynamicAny/DynArray_i.cpp:
+        * tao/DynamicAny/DynSequence_i.cpp:
+        * tao/DynamicAny/DynStruct_i.cpp:
+        * tao/DynamicAny/DynUnion_i.cpp:
 
-          Updated.
+          Fixed various minor problems overlooked in
 
-        * utils/catior/catior.mpc:
-        * utils/nslist/nslist.mpc:
+          Sun Feb  6 19:46:23 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Changed to inherit from core.mpb so utilities will be installed.
+Mon Feb  7 14:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Sep  3 21:46:10 2004  Olli Savia  <ops@iki.fi>
+        * orbsvcs/tests/Trading/run_test.pl:
+          When we can't start the Trading_Service, directly exit instead of
+          waiting another 20 seconds for a file that doesn't appear
 
-        * TAO_IDL/be/be_tmplinst.cpp:
-          Use ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-          to check if explicit template instantiation is needed.
-          Thanks to Johnny Willemsen for informing me about this
-          macro.
+Mon Feb  7 13:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Sep  3 12:41:36 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/Messaging/Connection_Timeout_Policy_i.h:
+        * tao/Messaging/Messaging_ORBInitializer.h:
+        * tao/Messaging/Messaging_Policy_i.h:
+        * tao/Messaging/Messaging_PolicyFactory.h:
+          Simplified msc_ver checks
 
-        * tao/Object_KeyC.cpp:
+        * tao/Messaging/Messaging.pidl:
+        * tao/Messaging/Messaging_No_Impl.pidl:
+        * tao/Messaging/Messaging_RT_Policy.pidl:
+        * tao/Messaging/Messaging_SyncScope_Policy.pidl:
+        * tao/Messaging/TAO_Ext.pidl:
+          Updated regeneration instructions
 
-          Fixed hand-crafted code to compile when
-          TAO_NO_COPY_OCTET_SEQUENCES is defined as 0.
+        * tao/Messaging/diffs/Messaging.diff:
+        * tao/Messaging/diffs/Messaging_No_Impl.diff:
+          Updated
 
-Fri Sep  3 10:17:32 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Messaging/Messaging_No_Impl{A,C}.{h,cpp,i,inl}:
+        * tao/Messaging/Messaging_RT_Policy{A,C}.{h,cpp,i,inl}:
+        * tao/Messaging/Messaging_SyncScopy_Policy{A,C}.{h,cpp,i,inl}:
+        * tao/Messaging/Messaging{A,C,S,S_T}.{h,cpp,i,inl}:
+        * tao/Messaging/TAO_Ext{A,C}.{h,cpp,i,inl}:
+          Regenerated all these files, added new A.cpp files and replaced .i
+          with .inl files.
 
         * tao/Makefile.am:
+          Updated for changes above
 
-          Updated to account for Ossama's Exception refactor.
-
-Fri Sep  3 19:01:59 2004  Olli Savia  <ops@iki.fi>
-
-        * TAO_IDL/be/be_tmplinst.cpp:
-          LynxOS 3.x needs explicit template instantiation.
-
-        * TAO_IDL/include/idl_defines.h:
-          Added #include "ace/os_include/os_limits.h" to pick NFILES
-          on LynxOS 3.x
-
-Fri Sep  3 10:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Profile.cpp:
-          Fixed compile problem when TAO_NO_COPY_OCTET_SEQUENCES is defined
-          to 0
-
-Fri Sep  3 08:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Exception.h:
-          Mark TAO_DONT_CATCH with @internal
-
-        * tao/Sequence.cpp:
-          Include SystemException.h instead of Exception.h
-
-        * tao/SystemException.cpp:
-          Include OS_NS_stdio.h to get printf
-        * tao/UserException.cpp:
-          Include UserException.inl when not defined ACE_INLINE
-
-Thu Sep  2 22:21:35 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Exception.h:
-        * tao/Exception.i:
-        * tao/Exception.cpp:
-
-          Moved CORBA::SystemException and CORBA::UserException related
-          code to separate files to improve compile times.
-
-          (Exception):
+Mon Feb  7 10:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Improved exception safety by making "id_" and "name_" attributes
-          CORBA::String_vars instead of "char *"s.
-
-        * tao/SystemException.h:
-        * tao/SystemException.inl:
-        * tao/SystemException.cpp:
-
-          Moved CORBA::SystemException class and related code to this set
-          of files to improve compile-times of sources that don't need the
-          declarations and definitions now in these files.
+        * tao/DynamicAny/DynamicAnyC.cpp:
+          Regenerated
 
-          (SystemException):
+Mon Feb  7 10:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed problem where SystemException attributes were not
-          initialized in the default constructor, as required by the C++
-          mapping.
+        * tao/CDR_Encaps_Codec.cpp:
+          Removed not used variable
 
-        * tao/UserException.h:
-        * tao/UserException.inl:
-        * tao/UserException.cpp:
+        * Release:
+          Changed INSTALL to TAO-INSTALL so that this file is generated
 
-          Moved CORBA::SystemException class and related code to this set
-          of files.  This was done mostly for the sake of consistency
-          since this is not an expensive set of sources in terms of
-          compile times and footprint.
+Sun Feb  6 19:46:23 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/Acceptor_Registry.cpp:
-        * tao/Adapter.cpp:
-        * tao/Adapter.h:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Log/PersistStore.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp:
+        * tao/Any.cpp:
+        * tao/Any.h:
+        * tao/Any_Array_Impl_T.cpp:
         * tao/Any_Basic_Impl.cpp:
+        * tao/Any_Basic_Impl_T.cpp:
         * tao/Any_Dual_Impl_T.cpp:
         * tao/Any_Impl.cpp:
+        * tao/Any_Impl.h:
         * tao/Any_Impl_T.cpp:
+        * tao/Any_Special_Impl_T.cpp:
         * tao/Any_SystemException.cpp:
         * tao/Any_Unknown_IDL_Type.cpp:
-        * tao/BiDir_Adapter.h:
-        * tao/BoundsC.cpp:
-        * tao/Buffering_Constraint_Policy.cpp:
-        * tao/CDR.cpp:
+        * tao/Any_Unknown_IDL_Type.h:
         * tao/CDR_Encaps_Codec.cpp:
-        * tao/CORBALOC_Parser.cpp:
-        * tao/CORBANAME_Parser.cpp:
-        * tao/ClientRequestInfo.inl:
-        * tao/ClientRequestInfo_i.inl:
-        * tao/CodecFactory.cpp:
-        * tao/CodecFactory_ORBInitializer.cpp:
-        * tao/Codeset_Manager.cpp:
-        * tao/Connector_Registry.cpp:
-        * tao/DLL_Parser.cpp:
-        * tao/Default_Stub_Factory.cpp:
-        * tao/Environment.cpp:
-        * tao/GIOP_Message_Base.cpp:
-        * tao/GIOP_Message_Generator_Parser.h:
-        * tao/GIOP_Message_Generator_Parser_10.cpp:
-        * tao/GIOP_Message_Lite.cpp:
-        * tao/GIOP_Message_Lite.h:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_Profile.cpp:
-        * tao/IORInterceptor_Adapter.h:
-        * tao/IORInterceptor_Adapter_Factory.h:
-        * tao/IOR_Parser.h:
-        * tao/Interceptor_List.cpp:
-        * tao/Invocation_Base.cpp:
-        * tao/Invocation_Endpoint_Selectors.cpp:
-        * tao/LocalObject.cpp:
-        * tao/MProfile.cpp:
-        * tao/NVList.cpp:
-        * tao/ORB.cpp:
-        * tao/ORB.h:
-        * tao/ORBInitializer_Registry.cpp:
-        * tao/Object_Loader.h:
-        * tao/Object_Ref_Table.cpp:
-        * tao/Object_T.cpp:
-        * tao/PICurrent.cpp:
-        * tao/PICurrent_ORBInitializer.cpp:
-        * tao/PolicyFactory_Registry.cpp:
-        * tao/Policy_ForwardA.cpp:
-        * tao/Policy_Set.cpp:
-        * tao/PollableC.cpp:
-        * tao/Profile.cpp:
-        * tao/Profile_Transport_Resolver.cpp:
-        * tao/Profile_Transport_Resolver.h:
-        * tao/Remote_Object_Proxy_Broker.cpp:
-        * tao/RequestInfo_Util.cpp:
-        * tao/Request_Dispatcher.h:
-        * tao/Service_Callbacks.cpp:
-        * tao/Services_Activate.h:
-        * tao/Stub.cpp:
-        * tao/Synch_Invocation.cpp:
-        * tao/Synch_Invocation.h:
-        * tao/TAO_Server_Request.cpp:
-        * tao/Thread_Lane_Resources.cpp:
-        * tao/Transport_Connector.cpp:
-        * tao/TypeCodeFactory_Adapter.h:
-        * tao/Typecode_Constants.cpp:
-        * tao/WrongTransactionA.cpp:
-        * tao/WrongTransactionC.cpp:
+        * tao/Typecode.cpp:
         * tao/append.cpp:
-        * tao/corba.h:
-        * tao/operation_details.cpp:
-        * tao/operation_details.h:
         * tao/skip.cpp:
-        * tao/Messaging/AMH_Response_Handler.cpp:
-        * tao/PortableServer/Object_Adapter.i:
-        * tao/PortableServer/POAManager.i:
+        * 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/DynamicInterface/DII_Invocation.cpp:
         * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+        * tests/DynAny_Test/analyzer.cpp:
+        * tests/DynAny_Test/test_dynsequence.cpp:
+        * tests/Param_Test/except.cpp:
+        * tests/Param_Test/small_union.cpp:
 
-          Include "tao/SystemException.h" and/or "tao/UserException.h" to
-          pull in CORBA::{System,User}Exception class declaration.
-
-        * tao/Array_VarOut_T.h:
-        * tao/Array_VarOut_T.inl:
-        * tao/Array_VarOut_T.cpp:
-        * tao/CurrentC.cpp:
-        * tao/CurrentC.h:
-        * tao/DomainC.cpp:
-        * tao/DomainC.h:
-        * tao/Fixed_Array_Argument_T.cpp:
-        * tao/IOP_CodecC.cpp:
-        * tao/IOP_CodecC.h:
-        * tao/ORBInitInfo.cpp:
-        * tao/ORBInitInfo.h:
-        * tao/Object.cpp:
-        * tao/Object.h:
-        * tao/Object_Argument_T.cpp:
-        * tao/Objref_VarOut_T.cpp:
-        * tao/Objref_VarOut_T.h:
-        * tao/PolicyC.cpp:
-        * tao/PolicyC.h:
-        * tao/Policy_ForwardC.cpp:
-        * tao/Policy_ForwardC.h:
-        * tao/PortableInterceptorC.cpp:
-        * tao/PortableInterceptorC.h:
-        * tao/Sequence_T.cpp:
-        * tao/Sequence_T.i:
-        * tao/TAOC.cpp:
-        * tao/TAOC.h:
-        * tao/Typecode.cpp:
-        * tao/Typecode.h:
-        * tao/Var_Array_Argument_T.cpp:
-        * tao/BiDir_GIOP/BiDirPolicyC.cpp:
-        * tao/BiDir_GIOP/BiDirPolicyC.h:
-        * tao/DynamicAny/DynamicAnyC.cpp:
-        * tao/DynamicAny/DynamicAnyC.h:
-        * tao/DynamicInterface/Context.cpp:
-        * tao/DynamicInterface/ExceptionList.cpp:
-        * tao/DynamicInterface/Unknown_User_Exception.cpp:
-        * tao/DynamicInterface/Unknown_User_Exception.h:
-        * tao/IFR_Client/IFR_BaseC.cpp:
-        * tao/IFR_Client/IFR_BaseC.h:
-        * tao/IFR_Client/IFR_BasicC.cpp:
-        * tao/IFR_Client/IFR_BasicC.h:
-        * tao/IFR_Client/IFR_ComponentsC.cpp:
-        * tao/IFR_Client/IFR_ComponentsC.h:
-        * tao/IFR_Client/IFR_ExtendedC.cpp:
-        * tao/IFR_Client/IFR_ExtendedC.h:
-        * tao/IORInterceptor/IORInfoC.cpp:
-        * tao/IORInterceptor/IORInfoC.h:
-        * tao/IORInterceptor/IORInterceptorC.cpp:
-        * tao/IORInterceptor/IORInterceptorC.h:
-        * tao/IORTable/IORTableC.cpp:
-        * tao/IORTable/IORTableC.h:
-        * tao/Messaging/AMH_Response_Handler.cpp:
-        * tao/Messaging/MessagingC.cpp:
-        * tao/Messaging/MessagingC.h:
-        * tao/Messaging/Messaging_No_ImplC.cpp:
-        * tao/Messaging/Messaging_No_ImplC.h:
-        * tao/Messaging/Messaging_RT_PolicyC.cpp:
-        * tao/Messaging/Messaging_RT_PolicyC.h:
-        * tao/Messaging/Messaging_SyncScope_PolicyC.cpp:
-        * tao/Messaging/Messaging_SyncScope_PolicyC.h:
-        * tao/Messaging/TAO_ExtC.cpp:
-        * tao/Messaging/TAO_ExtC.h:
-        * tao/ObjRefTemplate/Default_ORTC.cpp:
-        * tao/ObjRefTemplate/Default_ORTC.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
-        * tao/PortableServer/ImR_LocatorC.cpp:
-        * tao/PortableServer/ImR_LocatorC.h:
-        * tao/PortableServer/ImplRepoC.cpp:
-        * tao/PortableServer/ImplRepoC.h:
-        * tao/PortableServer/PortableServerC.cpp:
-        * tao/PortableServer/PortableServerC.h:
-        * tao/RTCORBA/RTCORBAC.cpp:
-        * tao/RTCORBA/RTCORBAC.h:
-        * tao/RTScheduling/RTSchedulerC.cpp:
-        * tao/RTScheduling/RTSchedulerC.h:
-        * tao/Valuetype/Sequence_T.cpp:
-        * tao/Valuetype/Sequence_T.inl:
-        * tao/Valuetype/ValueBase.cpp:
-        * tao/Valuetype/ValueBase.h:
-        * tao/Valuetype/ValueFactory.cpp:
-        * tao/Valuetype/ValueFactory.h:
-        * tao/Valuetype/Value_VarOut_T.cpp:
-        * tao/Valuetype/Value_VarOut_T.h:
-
-          Removed "tao_" prefix from methods in the TAO traits templates
-          used in these sources.  It is redundant since the traits
-          templates are TAO-specific, and in the TAO namespace.
-
-        * tao/ORB_Core.cpp (check_shutdown):
-        * tao/ORB_Core.i (check_shutdown):
-
-          Uninlined this method so that we can avoid including
-          "tao/SystemException.h" in the inline source file.
-
-        * tao/tao.mpc:
+          Changed implementation of class TAO::Any_Unknown_IDL_Type to
+          have a TAO_InputCDR member instead of ACE_Message_Block*.
+          This change not only makes usage of codeset translators
+          easier during Any extraction (which was the original
+          impetus for opening up this issue) but also cleans up
+          some of the alignment and memory management code formerly
+          needed when handling this subclass of TAO::Any_Impl.
 
-          Added new SystemException.cpp and UserException.cpp files to the
-          ORB_Core source list.
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Updated conditional Exception.h header include directive to
-          generate include directives for tao/SystemException.h and
-          tao/UserException.h instead.  This code is still commented out,
-          as it was previously, and will be enabled once we reduce
-          included headers in tao/ORB.h.
-
-        * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+Sat Feb  5 21:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed "tao_" prefix from methods in the TAO traits templates
-          and their uses generated by TAO_IDL.  It is redundant since the
-          traits templates are TAO-specific, and in the TAO namespace.
+        * tao/Messaging/diffs/Messaging_RT_Policy.diff:
+        * tao/Messaging/diffs/Messaging_SyncScope_Policy.diff:
+        * tao/Messaging/diffs/TAO_ExtC.diff:
+          Removed these empty files
 
-Thu Sep  2 14:41:42 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+Fri Feb  4 18:00:03 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * tao/Connection_Handler.cpp (handle_input_eh): Updated to be
-          consistent with the OCI 1.3a version.  Somehow during the merge
-          an older version from the OCI repo got in here.  Thanks to
-          Johnny Willemsen for spotting this.
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
 
-        * tao/default_client.cpp (parse_args): Changed ACE_LIB_TEXT usage
-          to ACE_TEXT.  The merge of MT_NOUPCALL brought in uses of the
-          ACE_LIB_TEXT macro.
+          Followed the same protocol as applied in "Thu Feb  3 19:27:58
+          2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>".
 
-Thu Sep  2 09:41:28 2004  Dale Wilson  <wilson_d@ociweb.com>
+Fri Feb  4 15:09:22 2005  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        * interop-tests/wchar/interop_wchar_i.cpp:
-          Add a cast to keep the Tru64 compiler from complaining
-          that a wchar_t * cannot be used for a
-          const CORBA::WChar_T * argument.
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i:
 
-Thu Sep  2 08:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          In an effort to resolve multithreaded issues in the SSLIOP
+          connector, the assignment of security attributes to the endpoint
+          are now guarded by the same lock used to guard access to these
+          parameters.
 
-        * tao/PortableServer/ServerRequestInfo.cpp:
-          Replaced ACE cast macros with normal C++ casts
+Fri Feb  4 11:17:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Thu Sep  2 07:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Profile.cpp (TAO_Profile):
 
-        * tao/PortableServer/Servant_Base.cpp:
-          Replaced ACE cast macros with normal C++ casts
+          Updated order of attributes in constructor base member
+          initializer lists to match new attribute declaration order.
 
-Wed Sep  1 12:55:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Fri Feb  4 11:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * docs/libraries.html:
+        * tao/SystemException.cpp:
+          Added several missing error texts.
 
-          Removed duplicate DynamicInterface entry.
+        * tao/LocalObject.cpp:
+          Changed _get_component, _get_interface, _get_policy,
+          _set_policy_overrides, _get_policy_overrides, _validate_connection
+          to throw a CORBA::NO_IMPLEMENT system exception with minor code 8
+          as described by the latest corba spec.
 
-        * docs/orbsvcs.html:
+Fri Feb  4 01:25:05 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Fixed Sched service directory
+        * tao/IIOP_Endpoint.h:
+        * tao/Object.h:
+        * tao/Profile.h:
+        * tao/Profile_Transport_Resolver.h:
+        * tao/params.h:
 
-Wed Sep  1 10:42:38 2004  Chad Elliott  <elliott_c@ociweb.com>
+          Optimized class/struct attribute declaration order to reduce
+          alignment padding, hence the overall size of the class/struct.
 
-        * docs/cec_options.html:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i:
-        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
-        * 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_Reactive_ConsumerControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
-        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/Object.cpp:
+        * tao/Object.i:
+        * tao/Profile.cpp:
+        * tao/Profile_Transport_Resolver.inl:
+        * tao/params.cpp:
 
-          Added a configurator option to determine the number of retries
-          before removing an unresponsive consumer or supplier from the
-          CosEvent Service.  This option is fully documented in
-          docs/cec_options.html.
+          Updated order of attributes in constructor base member
+          initializer lists accordingly.
 
-Wed Sep  1 11:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Feb  3 19:27:58 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * tao/Policy_Set.h:
-          Replaced html style with doxygen style
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp (reply_timed_out):
 
-Wed Sep  1 06:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          A slightly modified fix for [BUGID2038]. Once Torsten confirms
+          this works, I will close the bugzilla entry.
 
-        * tao/Transport.cpp (dump_iov):
-          Reverted my change of yesterday, this is an ACE_OS::sprintf and
-          no ACE_DEBUG, so %P and %t don't work.
+Thu Feb  3 19:14:17 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-Tue Aug 31 17:53:30 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
 
-        * orbsvcs/orbsvcs/Makefile.am:
+          Reverted this patch "Thu Jan 27 20:01:21 2005  Balachandran
+          Natarajan  <bala@dre.vanderbilt.edu>"
 
-          Update after Portable Server refactor changes.
+Wed Feb  2 22:17:49 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Tue Aug 31 19:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
 
-        * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
-          When the input file cannot be opened, log an error and return -1
-          instead of going on further without an input file, which results
-          in strange crashes.
+          Changed C-style casts in generated code for arrays
+          to c++-style casts. Thanks again to Johhny Willemsen
+          <jwillemsen@remedy.nl> for digging these up.
 
-Tue Aug 31 10:00:48 2004  Chad Elliott  <elliott_c@ociweb.com>
+Wed Feb  2 20:25:18 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be_include/be_visitor_arg_traits.h:
 
-          When an array is not nested inside a class we need to specify the
-          storage type as the TAO_EXPORT_MACRO to get the functions
-          required for copying, freeing, duplicating and allocating exported
-          into the dll for Windows.
+          Added visit_attribute() method, which tales action
+          only if the attribute type is an unaliased bounded (w)string.
+          Thanks to Gary Maxey <gary.maxey@hp.com> for sending in
+          the example IDL file that showed that the arg_traits
+          visitor was not handling this case.
 
-Tue Aug 31 14:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/IDL_Test/interface.idl:
 
-        * tao/GIOP_Message_Base.cpp:
-          Updated some debug messages so that the formatting matches other
-          messages in TAO and when the log is read, it is clear where this
-          message is coming from.
+          Added Gary Maxey's example IDL file to the test.
 
-Tue Aug 31 09:06:40 2004  Dale Wilson  <wilson_d@ociweb.com>
+Wed Feb  2 19:26:22 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * interop-tests/wchar/interop_wchar_i.cpp:
-          Another exception emulation problem.
+        * TAO_IDL/be/be_sequence.cpp:
 
-Tue Aug 31 13:43:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added missing comma in template parameter list of bounded
+          CORBA::Object sequence base class. Thanks to Gary Maxey
+          <gary.maxey@hp.com> for tracking down the problem.
 
-        * tao/Transport.cpp (dump_iov):
-          Updated formatting of debug messages so that it matches other debug
-          lines
+Wed Feb  2 06:45:59 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-Tue Aug 31 13:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * NEWS:
 
-        * orbsvcs/examples/ORT/run_test.pl:
-          New perl script that is usefull to automatically run this example,
-          the example itself it still broken, working on it but the script
-          saves a lot of test time
+          Updated with information about PMB and GIOP fragments.
 
-Tue Aug 31 11:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Feb  2 09:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Big_Oneways/server.cpp:
-          Added some more debug statements so that we can better track the
-          steps of the server
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
+          Use ACE_OS::strtok instead of strtok directly and replaced usage
+          of NULL with 0
 
-Tue Aug 31 09:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h:
+          Include SString.h instead of SStringfwd.h to fix compile errors
+          with vc71
 
-        * docs/Options.html:
-          Removed trailing " which was incorrect
+Tue Feb  1 20:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Aug 30 23:03:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/IFR_Client/IFR_BaseC.cpp:
+        * tao/IFR_Client/IFR_BasicC.cpp:
+        * tao/IFR_Client/IFR_ComponentsC.cpp:
+        * tao/IFR_Client/IFR_ExtendedC.cpp:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-        * tao/Makefile.am:
+Tue Feb  1 19:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Update after Portable Server refactor changes.
+        * tao/PortableServer/ServerObjectC.cpp:
+        * tao/PortableServer/ServerObjectA.cpp:
+        * tao/PortableServer/ImplRepoC.cpp:
+        * tao/PortableServer/ImplRepoA.cpp:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-Mon Aug 30 18:14:49 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+Tue Feb  1 18:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/ast/ast_expression.cpp:
-        * TAO_IDL/include/ast_expression.h:
-        * TAO_IDL/include/utl_err.h:
-        * TAO_IDL/util/utl_err.cpp:
+        * tao/ObjRefTemplate/Default_ORTC.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
+          Regenerated
 
-          Fixed handling of boolean IDL constants so that 'true' or
-          'false' is generated on the rhs, instead of '0' or '1'
-          as formerly. Also added a check for the use of infix
-          operators in an expression with types other than integer or
-          floating point, (illegal as per CORBA 3.0.3 section 3.10.2), and a
-          new error to report if a violation is found. This last
-          fix closes [BUGID:1682].
+Tue Feb  1 11:17:10 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Mon Aug 30 12:27:38 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
 
-        * orbsvcs/examples/Security/Send_File/README:
+          - Converted more generated C-style casts to C++-style casts, in
+            _is_a() (stub side), _non_existent_skel(), _is_a_skel(),
+            _interface_skel(), and _component_skel().
 
-          Added note that "-SSLNoProtection" flag must be set when running
-          IIOP client to SSLIOP server test.  Thanks to Jules Colding
-          <jules at tdcadsl dot dk> for pointing out the inconsistency.
+          - Refactored generated code for _this() to eliminate an
+            IF block.
 
-        * orbsvcs/examples/Security/Send_File/server.conf:
+          Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for
+          the above suggestions.
 
-          Enabled "-SSLNoProtection" flag to server configuration to allow
-          IIOP client to SSLIOP server test to work as documented.
+        * tao/Any_Array_Impl_T.cpp:
 
-Mon Aug 30 14:24:20 2004  Dale Wilson  <wilson_d@ociweb.com>
+          Added #include of SystemException.h. The definition of
+          _tao_decode() at the end of the file now seems to need it.
 
-        * interop-tests/wchar/interop_wchar_i.cpp:
-          Build correctly with exception emulation.
+Tue Feb  1 13:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Aug 30 12:19:04 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+        * tao/FlResource.mpc:
+        * tao/QtResource.mpc:
+        * tao/tao.mpc:
+        * tao/TkResource.mpc:
+        * tao/XtResource.mpc:
+          Removed taoversion as base project. This will be removed because it
+          results in the fact that each generated GNU makefile will get the
+          version number generated. We want that the GNU make rules get the
+          version number from Version.h
 
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc:
+Tue Feb  1 13:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Reordered base projects, putting amh last, to resolve generation
-          problems on RH80_Static_Core.
+        * tao/diffs/IOP.diff:
+          Removed, not needed
 
-Mon Aug 30 15:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/IOPC.{h,cpp,i,inl}:
+          Regenerated and replace .i with .inl file
 
         * tao/Makefile.am:
-          Updated this file for the moving of AMH_Response_Handler, forgot this
-          file this morning
-
-Mon Aug 30 15:29:07 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/ORB.h (CORBA):
+          Updated because of change above
 
-          Added documentation for run () with a timeout parameter. Thanks
-          to Jules Colding <jules at tdcadsl dot dk> for motivating this.
+Tue Feb  1 13:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Aug 30 08:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Big_Oneways/Session.cpp:
-          When catching an exception in the svc method print out the number
-          of messages sent. This test fails in some builds, maybe it is
-          just taking a long time, this should give us some more info.
+        * tao/CurrentA.cpp:
+        * tao/CurrentC.{h,cpp}:
+        * tao/Policy_ForwardA.cpp:
+          Regenerated
 
-Mon Aug 30 08:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Policy_ForwardC.{h,cpp,i,inl}:
+          Regenerated and replace .i with .inl file
 
-        * tests/Big_Twoways/Session.cpp:
-          When catching an exception in the svc method print out the number
-          of messages sent. This test fails in some builds, maybe it is
-          just taking a long time, this should give us some more info.
+        * tao/Makefile.am:
+          Updated because of change above
 
-Mon Aug 30 07:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/diffs/Policy_Forward.diff:
+          Updated
 
-        * tao/PortableServer/AMH_Response_Handler.{h,cpp}:
-        * tao/Messaging/AMH_Response_Handler.{h,cpp}:
-          Moved the AMH Response Handler class from PortableServer to Messaging,
-          when using AMH we need Messaging because of the ExceptionHolder.
-          Moving this class doesn't change anything then when you use AMH, but
-          when not using AMH, the portableserver library will be smaller.
+        * tao/IORTable/diffs/IORTable.diff:
+          Removed this empty file
 
-        * TAO_IDL/be/be_codegen.cpp:
-          Updated include path of AMH_Response_Handler.h
+Tue Feb  1 12:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Aug 27 23:08:33 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * tao/IORInterceptor/IORInfoC.{h,cpp,inl}:
+        * tao/IORInterceptor/IORInterceptorC.{h,cpp,inl}:
+          Regenerated
 
-        * TAO_IDL/fe/idl.ll:
+Tue Feb  1 11:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fix for BUG 1683. Jeff prepared this lex file. I just generated
-          the code, and applied the patches.
+        * tao/DynamicAny/DynamicAnyC.{h,cpp,i,inl}:
+          Regenerated and replace .i with .inl file
 
-        * TAO_IDL/fe/lex.yy.cpp:
+        * tao/Makefile.am:
+          Updated because of change above
 
-          Regenerated code for the new lex file.
+        * tao/DynamicAny/diffs/DynamicAny.diff:
+          Updated
 
-        * TAO_IDL/fe/lex.yy.cpp.diff:
+Tue Feb  1 10:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Another useless diff that we maintain which we cannot use! The
-          above change took only 4-5 hours! Anyway, we have tested on
-          Linux and things seem to be working. Let us see how other
-          platforms behave.
+        * tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.{h,cpp,inl}:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-        * TAO_IDL/util/utl_scope.cpp:
+Tue Feb  1 10:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed unused variable warnings.
+        * tao/IFR_Service/*C.{h,cpp,inl}:
+        * tao/IFR_Service/*A.{cpp}:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-Fri Aug 27 13:34:58 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Feb  1 10:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * utils/NamingViewer/NamingViewerDlg.cpp:
+        * tao/Object.h:
+          Removed check for GNU 2.8 or newer, older versions aren't supported
+          anymore
 
-          Changed #include "Naming/Naming_Server.h" to #include
-          "Naming/Naming_Client.h".
+Tue Feb  1 10:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Aug 27 18:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PortableServer/ServerObject*.*:
+        * tao/PortableServer/ImplRepo*.*:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-        * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
-          Added iorinterceptor as base project
+Mon Jan 31 20:42:11 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Fri Aug 27 16:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h:
+
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
+
+Mon Jan 31 16:56:25 2005  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/orbsvcs/SSLIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/SSLIOP_Endpoint.cpp:
+        * orbsvcs/orbsvcs/SSLIOP_Endpoint.h:
+        * orbsvcs/orbsvcs/SSLIOP_Endpoint.i:
+
+          Modified the order of execution in ssliop_connect. The change to
+          SSLIOP_Endpoint was to add an explicit flag for determining that
+          initialization was complete. The problem this addresses is that
+          the SSLIOP_Endpoint is used to query the connection cache before
+          all of its state is set. The qop, trust, and credentials members
+          are all set after the query, but before a new connection is
+          bound to the cache. This leads to redundant connections in the
+          cache if two or more SSLIOP_endpoints happen to point to the
+          same peer using the same security options.
+
+        * orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp:
+        * orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h:
+        * orbsvcs/tests/Security/MT_SSLIOP/client.cpp:
+        * orbsvcs/tests/Security/MT_SSLIOP/server.cpp:
+        * orbsvcs/tests/Security/MT_SSLIOP/test.idl:
+        * orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp:
+        * orbsvcs/tests/Security/MT_SSLIOP/test_i.h:
+        * orbsvcs/tests/Security/MT_SSLIOP/test_i.i:
+
+          Added a second interface to the test so that the behavior
+          indicated above could be tested.
+
+Mon Jan 31 16:06:28 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
-          Added .in() to silence gcc warning about better conversion
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
 
-Fri Aug 27 10:07:17 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+          - In the generated _nil() method for interfaces, changed
+            the C-style cast of 0 to the *_ptr type to a C++-style
+            static_cast<>.
 
+          - In the generated _is_a() method for the skeleton, removed
+            the unnecessary cast to char* on the first argument
+            passed to ACE_OS::strcmp().
+
+          - Also in the generated _is_a() method for the skeleton,
+            changed the 'if (...) return 1 else return 0;' style
+            to just 'return (...)' since the expression (..)
+            already evaluates to the required boolean return type.
+
+          Thanks to Johnny Willemsen <jwillemsen@rememedy.nl> for
+          suggesting the first two of the above changes.
+
+Mon Jan 31 15:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h:
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
+
+Mon Jan 31 15:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h:
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
+
+Mon Jan 31 15:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp:
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
+
+Mon Jan 31 15:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/ImR/Combined_Service/combined.cpp:
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
+
+Mon Jan 31 11:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/AV/QoS_UDP.h:
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
+
+Mon Jan 31 07:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * utils/NamingViewer/SelectNSDialog.cpp:
+        * utils/NamingViewer/NamingViewer.cpp:
+          Fixed part of the compile errors in the unicode builds
+
+Sun Jan 30 20:47:11 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * examples/Simple/time-date/server.cpp:
+
+          Fixed syntax error in ACE_RCSID macro argument.
+
+Sun Jan 30 19:57:37 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp:
+        * examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp:
+        * examples/Content_Server/AMI_Observer/Callback_i.cpp:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp:
+        * examples/Content_Server/SMI_Iterator/client.cpp:
+        * examples/Simple/time-date/Time_Date.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp:
+        * orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/RecursDef_i.h:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.h:
+        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h:
+        * orbsvcs/tests/FT_App/StubBatchConsumer.h:
+        * orbsvcs/tests/FT_App/StubFaultAnalyzer.h:
+        * orbsvcs/tests/FT_App/StubFaultConsumer.h:
+        * orbsvcs/tests/FT_App/StubFaultNotifier.h:
+        * orbsvcs/tests/FtRtEvent/consumer.cpp:
+        * orbsvcs/tests/FtRtEvent/supplier.cpp:
+        * performance-tests/RTCorba/Oneways/Reliable/client.cpp:
+        * performance-tests/Sequence_Latency/AMI/client.cpp:
+        * tests/Abstract_Interface/test_i.cpp:
+        * tests/Bug_1482_Regression/Hello.cpp:
+        * tests/DynAny_Test/test_dynenum.cpp:
+        * tests/DynAny_Test/test_dynsequence.cpp:
+        * tests/DynAny_Test/test_dynstruct.cpp:
+        * tests/DynAny_Test/test_dynunion.cpp:
+
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
+
+Sun Jan 30 12:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h:
+          Fixed fuzz error
+
+Sat Jan 29 23:58:18 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * examples/AMH/Sink_Server/AMH_Servant.cpp:
+        * examples/Event_Comm/Consumer_Input_Handler.h:
+        * examples/POA/POA_BiDir/POA_BiDir.cpp:
+        * examples/RTCORBA/Activity/Activity.cpp:
+        * examples/Simple/time-date/server.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h:
+        * orbsvcs/Fault_Notifier/FT_Notifier_i.h:
+        * orbsvcs/ImplRepo_Service/Activator_Info.h:
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * orbsvcs/LoadBalancer/LoadMonitor.cpp:
+        * orbsvcs/TAO_Service/TAO_Service.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h:
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp:
         * orbsvcs/orbsvcs/IFRService/Contained_i.cpp:
         * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp:
         * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
+        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp:
         * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
-        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp:
         * orbsvcs/orbsvcs/IFRService/Repository_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/StringDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp:
         * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp:
+        * orbsvcs/tests/Notify/lib/Driver.h:
+        * tao/CORBALOC_Parser.h:
+        * tao/default_server.h:
+        * tao/Messaging/Messaging.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+        * tests/MProfile_Forwarding/Manager.cpp:
 
-          Added logical ORs of CORBA::OMGVMCID to the minor codes
-          in raised exceptions. Thanks to Ossama Othman
-          <ossama@dre.vanderbilt.edu> for pointing out this
-          oversight.
-
-Fri Aug 27 14:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/ORT/ORT.mpc:
-          Added iorinterceptor as base of the server project
-
-        * orbsvcs/examples/ORT/Object_Factory_i.cpp:
-          Commented out some code that uses a non portable way of getting
-          the ORT Factory, this now doesn't work anymore. I am working on
-          changing this example so that it works again, but for a day or so
-          comment out the incorrect code so that we get green build results
-          again
-
-Fri Aug 27 10:19:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Security.mpc:
-          SecurityLevel3.idl uses valuetype, so add valuetype as base
-          project.
-
-Fri Aug 27 09:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added missing header include directives that are necessary due
+          to inter-header dependency reductions in ACE.
 
-        * orbsvcs/tests/Concurrency/CC_command.cpp:
-          Added #include "ace/Log_Msg.h"
+Sat Jan 29 00:43:32 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Fri Aug 27 01:12:59 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * configure.ac:
 
-        * tao/ORB_Table.h:
+          Change --with-{acexml,qos,rmcast,ssl} to --enable-{acexml,qos,
+          rmcast,ssl} to be consistant with standard autoconf conventions.
 
-          No need to include "tao/corbafwd.h".
+Sat Jan 29 02:31:21 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/TC_Constants_Forward.h:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
 
-          Added missing "tao/TAO_Export.h" include.
+          Modified the handler-creating behavior to allow limited
+          processing of imported nodes. This is so a base interface
+          from another file will get a handler created and its
+          operations added so that the child handler will have all
+          the inherited operations in its operation table. The
+          restriction is that exception holders cannot be created
+          for imported nodes. Thanks to Don Sharp <dws@prismtech.com>
+          for reporting the 'operation not found' error with his
+          example IDL files.
 
-Fri Aug 27 08:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Jan 28 21:48:12 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        Integrated ORTrefactor_2 branch into main. Previously the
-        PortableServer library was dependent on IORInterceptor,
-        ObjRefTemplate and Valuetype, this dependency has been
-        removed. PortableServer doesn't use these libs anymore, but
-        IORInterceptor, ObjRefTemplate and Valuetype are now dependent on
-        PortableServer. This will reduce the size of corba servers which
-        don't use IORInterceptor, ObjRefTemplate and Valuetype.
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h:
 
-        * tao/Makefile.am:
-          Updated for changes below.
+          Include "ace/Auto_Ptr.h" to pull in auto_ptr<> class template
+          declaration.
 
-        Fri Aug 27 06:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Jan 28 21:39:09 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * tao/PortableServer/POA.cpp (ORT_adapter_i):
-          Readded the check whether ort_adapter_ is not null, we call this
-          method from _i methods and we need this check for that invocation
-          path
+        * orbsvcs/orbsvcs/AV/RTP.h:
+        * orbsvcs/orbsvcs/AV/TCP.h:
+        * orbsvcs/orbsvcs/AV/UDP.h:
 
-        Thu Aug 26 17:07:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          Include "ace/Service_Config.h" to pull in
+          complete ACE_Static_Svc_Descriptor class declaration.
+          Necessitated by interheader dependency reductions in ACE.
 
-        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp:
-        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h:
-        * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp:
-        * tao/PortableServer/POA.cpp:
-        * tao/PortableServer/POA.i:
-        * tao/PortableServer/PortableServer.pidl:
+Fri Jan 28 21:07:07 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Cosmtic changes after a review.
+        * tao/CORBANAME_Parser.cpp:
+        * tao/DynamicInterface/Request.h:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
 
-        Thu Aug 26 13:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Include "ace/SString.h" since to pull in complete ACE string
+          class declarations.  Necessitated by include directive
+          reductions in ACE.
 
         * tao/ORB_Core.cpp:
-          Fix for emulated exceptions builds
-
-        Thu Aug 26 13:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.{h,cpp,i}:
-        * tao/IORInterceptor/IORInfo.cpp:
-        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp:
-        * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp:
-          Fixes for emulated exceptions builds
-
-        Thu Aug 26 09:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp:
-          Changed invoke_key_to_helper to invoke_key_to_helper_i, this is
-          always called from _i methods, and also use then
-          ORT_adapter_i instead of ORT_adapter
-
-        Thu Aug 26 08:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.{h,cpp,i}:
-          Shorted some method names, also added a get_adapter_template_i()
-          with which I can try to get an ORT Adapter without that it tries to
-          grep the POA lock, we also have the lock in destroy_i() and we can't
-          grep it another time because it is non recursive.
-
-        Wed Aug 25 13:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp (object_reference_template_adapter):
-          When we don't have a adapter, first see if we have a factory before
-          locking the POA, in case we then get called from POA::destroy_i()
-          and we don't have an adapter and not factory we don't grep the lock
-          and don't get a deadlock, have to solve this better, but this way I
-          can continue testing
-
-        Wed Aug 25 12:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.cpp (ior_interceptor_adapter):
-          Added ACE_CHECK_RETURN after the ACE_ENDTRY as last check for
-          uncaught exceptions
-
-        * tao/PortableServer/POA.cpp (object_reference_template_adapter):
-          Changed logic that when adapter_name_i fails we don't have a not
-          activated adapter. The guard here seems to cause a problem on Linux
-
-        Wed Aug 25 12:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.i:
-          Added missing returns statements
-
-        Wed Aug 25 12:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp (object_reference_template_adapter):
-          Fixed for emulated exception case
-
-        Wed Aug 25 10:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.i:
-          Removed the throw from get_obj_ref_factory() and
-          get_adapter_template() when we can't retrieve these, exceptions
-          are already thrown in the IORInterceptor and we call the
-          get_adapter_template() also from the POA and we don't want to have
-          an exception then.
-
-        * tao/PortableServer/POA.cpp:
-          In the destroy_i() check whether get_adapter_template() doesn't
-          return zero, if it returns zero, then we don't have an
-          adapter_template, so don't add it to the array, this can happen when
-          we don't load the ORT library.
-          In the object_reference_template_adapter() method use a POA Guard
-          that doesn't check for closure, this method can be called by
-          destroy_i() when we don't have an ORT library loaded and then we
-          don't want to get an exception by the guard that we are closing
-
-        Tue Aug 24 14:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp (destroy_i):
-          Changed the logic of informing the IORInterceptors of state changed,
-          first iterate through all the child_poa's, set their state to
-          inactive and gather the ort adapters, then in one call inform all
-          IORInterceptors, then destroy the child poa's and as last step
-          destroy ourself and only notify that this poa has changed to
-          non_existent, each child POA will have done this already for itself.
-
-        Tue Aug 24 13:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ObjRefTemplate/ORT_Adapter_Impl.{h,cpp}
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.{h,cpp}
-        * tao/PortableServer/ORT_Adapter.h:
-        * tao/PortableServer/POA.cpp:
-          Instead of passing and storing a TAO_POA*, pass a
-          PortableServer::POA_ptr, duplicate that and store it in a
-          PortableServer::POA_var. At the moment the ORT adapter is then
-          destructed we automatically drop the refcount on the POA and we
-          don't have the risk the POA is destructed before the ORT adapter is
-          destructed. There is no need anymore then for the poa() method to
-          set the TAO_POA* to zero.
-
-        Tue Aug 24 12:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp:
-          Added todo with activation of ort_adapter because we hold the lock
-          there
-
-        Tue Aug 24 10:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        The ORTrefactor branch is now ORTrefactor_2 and the compile archive is
-        branched now.
-
-        * tests/Abstract_Interface/Abstract_Interface.mpc:
-          Added missing base projects
-
-        * tests/ORT/ORT.mpc:
-        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc:
-        * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc:
-          Added missing base projects and removed not needed idlflags
-
-        * tao/PortableServer/*C.i:
-          Renamed all generated .i files to .inl
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_*.*:
-          Renamed all to ORT_*.*, moved classes to TAO namespace and shortened
-          classnames
-
-        * tao/PortableServer/POA.h:
-          Make TAO_IORInfo a friend and make the methods that this class needs
-          protected instead of public.
-
-        * tao/Messaging.mpc:
-          Messaging is dependent on valuetype
-
-        Mon Aug 23 18:33:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * tao/Thread_Per_Connection_Handler.cpp:
-
-          Fixed a compile error with the latest version of ACE. This has
-          been fixed in the main trunk.
-
-        * tao/IORInterceptor/IORInterceptor_List.cpp:
-        * tao/IORInterceptor/IORInterceptor_List.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory_Impl.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Impl.inl:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.inl:
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.cpp:
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.h:
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h:
-        * tao/PortableServer/POA.cpp:
-        * tao/PortableServer/POA.h:
-
-          Added a number of comments and suggestions for Johnny. The
-          significant among them are:
-
-          - adding implementations in the TAO namespace. The TAO_* naming
-            should be killed.
-
-          - Make the names of the classes and file names shorter. The
-            existing makes things harder to read and find the relation
-            ships. I have done a few. I have left the rest for Johnny as
-            homework :-)
-
-        Mon Aug 23 12:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor/IORInterceptor_List.cpp:
-          When copying the array into the sequence to an add_ref on each of
-          array members. Have to look a little bit more at this, but now the
-          tests doesn't crash, but I think I maybe have a leak now somewhere.
-
-        Fri Aug 20 14:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POAManager.cpp:
-          Corrected the variable to be passed
-
-        Fri Aug 20 12:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableInterceptor.pidl:
-        * tao/IORInterceptor/IORInfo.pidl:
-          Moved AdapterState constants from IORInfo to PortableInterceptor
-          file
-
-        * tao/PortableInterceptorC.h:
-        * tao/IORInterceptor/IORInfoC.{h,cpp,inl}:
-          Updated these files with changes above
-
-        * tao/PortableServer/POA.cpp:
-        * tao/PortableServer/POAManager.cpp:
-          No need anymore to include IORInfoC.h to get AdapterState constants
-
-        Fri Aug 20 12:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.{h,cpp}:
-          Include PI_ForwardC.h in header file, and PortableInterceptorC.h in
-          the cpp file.
-
-        Fri Aug 20 12:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.cpp:
-          Removed some commented out code and removed comment after include of
-          IORInfoC.h, no good idea yet how to prevent this
-
-        Fri Aug 20 12:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POAManager.cpp:
-          Removed not needed include of Interceptor_List
-
-        Fri Aug 20 11:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor.mpc:
-          IORInterceptor is now dependent on PortableServer
 
-        * tao/IORInterceptor_Adapter.h:
-          Added several new pure virtual methods that must be implemented by
-          the real adapter implementations
+          Include "ace/Reactor.h" to pull in complete ACE_Reactor class
+          declaration.  Necessitated by include directive reductions in
+          ACE.
 
-        * tao/ORB_Core.{h,cpp}:
-          Removed ior_interceptor_list(), make ior_interceptor_adapter()
-          public, the POA will just retrieve the ior_interceptor_adapter from
-          the ORB core and will use it then from then.
-
-        * tao/PortableServer.mpc:
-          PortableServer is not dependent on IORInterceptor anymore.
-
-        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
-          Initialise pointer with 0.
-
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.{h,cpp}:
-          Implemented new pure virtual methods from the base, this code was
-          previously in the POA, but couples the POA to the IORInterceptor, by
-          moving it here we can decouple it
-
-        * tao/PortableServer/POA.cpp:
-        * tao/PortableServer/POAManager.cpp:
-          Instead of handling IORInterceptors here, just try to retrieve the
-          IORInterceptor adapter from the ORB Core and pass the call to the
-          adapter, this removes the dependency of the POA on IORInterceptor
-
-        * tao/PortableServer/IORInfo.{h,cpp,inl}:
-        * tao/IORInterceptor/IORInfo.{h,cpp,inl}:
-          Moved this class from PortableServer to IORInterceptor, because of
-          the changes above the usage of IORInfo is restricted to the
-          IORInterceptor library
-
-        Fri Aug 20 07:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor/IORInterceptor.pidl:
-        * tao/IORInterceptor/IORInfo.pidl:
-          Moved IORInfo interface to its own file
-
-        * tao/IORInterceptor/IORInterceptorC.{h,cpp,i}:
-          Regenerated
-
-        * tao/IORInterceptor/IORInfoC.{h,cpp,i}:
-          New generated files
-
-        * tao/PortableServer/IORInfo.h:
-          Include IORInfoC.h instead of IORInterceptorC.h
-
-        Thu Aug 19 17:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI_Forward.pidl:
-          Moved AdapterManagerId and AdapterState typedefs to this file
-
-        * tao/PI_ForwardC.{h,cpp,i,inl}:
-          Regenerated these files, replaced .i with .inl file
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
-          No need to include orb.idl, removed AdapterMangerId and
-          AdapterState, these moved to other places
-
-        * tao/ObjRefTemplate/Attic/ObjectReferenceTemplate_Adapter_Impl.cpp:
-          Added missing .in()
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.{h,cpp,i,inl}:
-          Regenerated these files, replaced .i with .inl file
-
-        * tao/PortableServer/POA.h:
-          Fixed include
-
-        * tao/PortableServer/POA_Manager.h:
-          No need to include ObjectReferenceTemplaceC.h now the typedefs are
-          in PI_Forward
-
-        * tao/IORInterceptor/IORInterceptor.pidl:
-          Moved AdapterState constants to this file
-
-        * tao/IORInterceptor/IORInterceptorC.{h,cpp,i,inl}:
-          Regenerated these files
-
-        * tao/diffs/ObjectReferenceTemplate.diff:
-          No diffs need to be applied anymore, so zapped this file
-
-        Wed Aug 18 13:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.h:
-          Removed some unneeded friends but had to make invoke_key_to_object
-          public because we now need it from the ORT library, friend doesn't
-          work anymore because it moved to a default servant we don't know
-          anything about in this library, any other ideas?
-
-        Wed Aug 18 12:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor/IORInterceptor.pidl:
-        * tao/IORInterceptor/IORInterceptorC.{h,cpp,i,inl}:
-          Regenerated these files, no need to apply patches anymore, and use
-          .inl file instead of .i files.
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.h:
-          Added typedef for a list of ORT Adapter pointers
-
-        * tao/IORInterceptor/IORInterceptor_List.{h,cpp}:
-          Removed typedef of array of ObjectReferenceTemplate*, include the
-          ORT Adapter header file instead
-
-        * tao/PorableServer.mpc:
-        * tao/ObjRefTemplate.mpc:
-          PortableServer library is not dependent on objreftemplate anymore
-          but objreftemplate is dependent on portableserver
-
-        * tao/ObjRefTemplate/ObjectReferneceTemplate_Adapter_Impl.{h,cpp,i}:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.{h,cpp,i}:
-          Split the adapter implementation and the ort_factory and
-          ort_template. The adapter creates a TAO_ObjectReferenceTemplate
-          which is a ort_template, which then also a ort_factory. The
-          ort_factory can be replaced using IORInfo, for the identity methods
-          the ort_template is used, until the ort_factory is changed from
-          outside the ort_template is used, after that the new set one.
-
-        Tue Aug 17 14:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-          Checkin of rework until now, not happy with the interfaces yet, now
-          the test app seems to work a little, I am going to review all
-          changed interfaces again and improve things.
-
-        * tao/POA.{h,cpp}:
-          - Changed adapter_state_changed to use IORInterceptor_List
-          functionality to call adapter_state_changed on all IORInterceptors
-          - Changed access of some methods
-        * tao/IORInfo.cpp:
-          Commented out some add_refs on the ORT, this should be done in the
-          ORT Adapter. Need to check this
-
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Adapter_Factory.{h,cpp}:
-        * tao/ObjRefTemplate/ObjectReferenceTemplate_Impl.{h,cpp,inl}:
-          New files with first implementation
-
-        Tue Aug 17 13:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORInterceptor/IORInterceptor_List/{h,cpp}:
-          Added adapter_state_changed, this gets a normal
-          TAO_ObjectReferenceTemplate_Array, converts this into a corba
-          sequence and calls adapter_state_change for each interceptor.
-
-        * tao/PortableServer/diffs/Default_ORT.diff:
-          Zap this file
-
-        Tue Aug 17 10:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.h:
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h:
-          Corrected export macro
-
-        Tue Aug 17  90:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.cpp:
-          Fixed incorrect include
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.h:
-          - Added adapter_name as constructor argument
-          - Added destroy() method, called by POA when this adapter is not
-          needed anymore, adapter must do its own cleanup
-          - Added activate() method with just a ORT* to activate the adapter
-          with an existing factory.
-          - Added get_adapter_template and get_obj_ref_factory to get the real
-          servant, this is needed for the IORInterceptors
-
-        * tao/PortableServer/POA.{h,cpp,i}:
-          - Added invoke_key_to_object_helper() which will check for the ORT and
-          if available will call that or will call invoke_key_to_object
-          instead.
-          - Added object_reference_template_adapter() which will check
-          ir an ORT Adapter is already available, if not, tries to get an
-          ORT Adapater Factory, if that is available, create a new ORT
-          Adapter.
-          - Added some doxygen grouping to group methods belonging to each other
-          in one doxygen group.
-          - Added ort_adapter_ member to store the ORT Adapter when we have
-          retrieved one.
-          - Removed set_adapter_template() from the header file, there is no
-          implementation of this method and it is not needed
-          - Added TAO_POA_Static_Resources to store the name of the ORT factory,
-          used the TAO_ORB_Core_Static_Resources but I didn't it put it there
-          because the ORB_Core doesn't need to know anything or ORT.
-          - Removed old ort_template, def_ort_template and obj_ref_factory and
-          its usage.
-
-        * tao/PortableServer/Default_ORT*.*:
-        * tao/PortableServer/ObjectReferenceTemplate.{h,cpp,i}:
-          Removed these files, default ORT implementation is now in the ORT
-          library
-
-        Fri Aug 13 18:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter.{h,cpp}
-          New file with base calss for ORT Adapters
-
-        * tao/PortableServer/ObjectReferenceTemplate_Adapter_Facotry.{h,cpp}
-          New file with base calss for ORT Adapter factories
-
-Fri Aug 27 00:25:47 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/ORB_Constants.h:
-
-          No need to include "tao/TAO_Export.h".
-
-          (CORBA::OMGVMCID):
-
-          Added documentation about how and when to use this constant.
-
-          (TAO_DEFAULT_MINOR_CODE, TAO_MAX_MINOR_CODE):
-
-          Deprecated these constants.  They have been replaced with
-          counterparts in the TAO namespace, as described below, but still
-          exist in order to maintain backward compatibility for a
-          reasonable amount of time.
-
-          Added documentation that details how TAO_DEFAULT_MINOR_CODE is
-          often misused.
-
-          (TAO::VMCID):
-
-          New constant in the TAO namespace that replaces
-          global namespace constant TAO_DEFAULT_MINOR_CODE.  The latter
-          constant name was not very descriptive about what the constant
-          represents.  "TAO::VMCID" is improves on that, and is also more
-          consistent with OMG naming conventions.
-
-          (TAO::MAX_MINOR_CODE):
+        * tao/default_resource.h:
 
-          Moved the global namespace TAO_MAX_MINOR_CODE constant into the
-          TAO namespace to be consistent with the above TAO::VMCID
-          change.
+          Forward declare ACE_Reactor_Impl class.  Necessitated by include
+          directive reductions in ACE.
 
-          Added documentation that makes it obvious how this constant is
-          determined.  Previously, a "magic number" was assigned to this
-          constant (actually TAO_MAX_MINOR_CODE).  This constant is now
-          defined in terms of TAO::VMCID.
+Fri Jan 28 13:32:47 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          (TAO::VPVID):
+        * tests/OctetSeq/client.cpp:
+        * tests/OctetSeq/test_i.cpp:
 
-          New TAO namespace constant that is TAO's OMG assigned Vendor
-          PolicyType Valueset ID (VPVID).  This constant is the same as
-          the VMCID, and is automatically assigned by the OMG in this
-          manner when a VMCID is reserved for a given vendor (i.e TAO /
-          DOC group in this case).  Please refer to the documentation for
-          this constant when creating new TAO-specific CORBA::PolicyType
-          values.
+          Removed reinterpret_cast<const char*> for ACE_crc32's buffer
+          parameter, as it was changed to take a const void* some time
+          back.
 
-        * tao/Exception.cpp:
+Fri Jan 28 07:53:34 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Use new TAO::VMCID instead of the deprecated
-          TAO_DEFAULT_MINOR_CODE constant.
-
-        * tao/CORBA.pidl:
-
-          Removed this file.  It has been deprecated for at least four
-          years.
-
-        * tao/Invocation_Endpoint_Selectors.cpp:
-        * tao/Profile_Transport_Resolver.cpp:
-
-          Corrected grammar in a comment.
-
-        * tao/Policy_Forward.pidl:
-
-          Added a "-*- IDL -*-" Emacs mode comment to this file so that we
-          can automatically get some syntax highlighting and automatic
-          indenting.
-
-        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
-
-          Corrected minor codes passed to CORBA::SystemException
-          constructors.  They were not logically OR-ed with the
-          CORBA::OMGVMCID constant.
-
-Fri Aug 27 00:03:51 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/AV/Makefile.am:
-        * orbsvcs/orbsvcs/Concurrency/Makefile.am:
-        * orbsvcs/orbsvcs/CosEvent/Makefile.am:
-        * orbsvcs/orbsvcs/Event/Makefile.am:
-        * orbsvcs/orbsvcs/Naming/Makefile.am:
-        * orbsvcs/orbsvcs/Property/Makefile.am:
-        * orbsvcs/orbsvcs/Sched/Makefile.am:
-        * orbsvcs/orbsvcs/Time/Makefile.am:
-        * orbsvcs/orbsvcs/Trader/Makefile.am:
-
-          Removed.
-
-        * orbsvcs/tests/Concurrency/CC_naming_service.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+        * orbsvcs/Fault_Detector/Fault_Detector_i.cpp:
+        * orbsvcs/LoadBalancer/LoadManager.cpp:
+        * orbsvcs/LoadBalancer/LoadMonitor.cpp:
+        * orbsvcs/Naming_Service/NT_Naming_Service.cpp:
+        * orbsvcs/Notify_Service/NT_Notify_Service.cpp:
+        * orbsvcs/PSS/PSDL_Datastore.cpp:
+        * orbsvcs/PSS/PSDL_OctetSeq.cpp:
+        * orbsvcs/examples/LoadBalancing/server.cpp:
+        * orbsvcs/examples/ORT/Object_Factory_i.cpp:
+        * orbsvcs/orbsvcs/IOR_Multicast.cpp:
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+        * orbsvcs/orbsvcs/Time_Utilities.i:
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp:
+        * orbsvcs/orbsvcs/AV/RTCP.cpp:
+        * orbsvcs/orbsvcs/AV/sfp.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp:
+        * orbsvcs/orbsvcs/Event/Timer_Module.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/PersistStore.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp:
+        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp:
+        * orbsvcs/orbsvcs/Notify/AllocTracker.h:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/PropertySeq.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp:
+        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+        * orbsvcs/orbsvcs/Sched/SchedEntry.i:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp:
+        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp:
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp:
+        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp:
         * orbsvcs/tests/Concurrency/CC_test_utils.cpp:
         * orbsvcs/tests/Concurrency/CC_tests.cpp:
-        * orbsvcs/tests/Time/client.cpp:
-
-          Changed to #include "ace/Log_Msg.h"
-
-        * examples/RTScheduling/Starter.h:
-        * examples/Simple/Simple_util.h:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h:
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.i:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+        * orbsvcs/tests/Notify/Blocking/common.cpp:
+        * orbsvcs/tests/Notify/Discarding/common.cpp:
+        * orbsvcs/tests/Notify/Ordering/common.cpp:
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp:
+        * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp:
+        * orbsvcs/tests/Notify/lib/Task_Stats.inl:
+        * orbsvcs/tests/Notify/performance-tests/Filter/common.cpp:
         * orbsvcs/tests/Sched_Conf/Sched_Conf.cpp:
-
-          Changed #include "orbsvcs/Naming/Naming_Utils.h" to #include
-          "orbsvcs/Naming/Naming_Client.h" and
-          "orbsvcs/Naming/Naming_Server.h".
-
-        * examples/Callback_Quoter/Notifier_Input_Handler.h:
-        * examples/Event_Comm/Notifier_Server.h:
-        * examples/Logging/Logging_Service_i.h:
-        * examples/Quoter/server.h:
-        * orbsvcs/Concurrency_Service/Concurrency_Service.h:
-        * orbsvcs/Naming_Service/Naming_Service.h:
-        * orbsvcs/Time_Service/Clerk_i.h:
-        * orbsvcs/Time_Service/Server_i.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Loader.h:
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h:
-        * orbsvcs/tests/Redundant_Naming/client.cpp:
         * orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp:
-        * orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp:
-        * utils/NamingViewer/NamingViewerDlg.cpp:
-        * utils/wxNamingViewer/wxNamingViewerFrame.cpp:
-
-          Changed #include "orbsvcs/Naming/Naming_Utils.h" to #include
-          "orbsvcs/Naming/Naming_Server.h".
-
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h:
-        * orbsvcs/examples/Callback_Quoter/Consumer_Handler.h:
-        * orbsvcs/examples/Callback_Quoter/Supplier_i.h:
-        * orbsvcs/examples/CosEC/Factory/FactoryDriver.h:
-        * orbsvcs/examples/Event_Comm/Consumer_Handler.h:
-        * orbsvcs/examples/Event_Comm/Notifier_Handler.h:
-        * orbsvcs/tests/AVstreams/Asynch_Three_Stage/Connection_Manager.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/Full_Profile/server.h:
-        * orbsvcs/tests/AVstreams/Modify_QoS/receiver.h:
-        * orbsvcs/tests/AVstreams/Modify_QoS/sender.h:
-        * orbsvcs/tests/AVstreams/Multicast/ftp.h:
-        * orbsvcs/tests/AVstreams/Multicast/server.h:
-        * orbsvcs/tests/AVstreams/Multicast_Full_Profile/ftp.h:
-        * orbsvcs/tests/AVstreams/Multicast_Full_Profile/server.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/Concurrency/CC_naming_service.h:
-        * orbsvcs/tests/Property/client.h:
-        * orbsvcs/tests/Property/server.h:
-        * orbsvcs/tests/Simple_Naming/client.h:
-        * orbsvcs/tests/Time/Client_i.h:
-        * examples/Logging/Logging_Test_i.h:
-        * performance-tests/POA/Demux/demux_test_server.h:
-
-          Changed #include "orbsvcs/Naming/Naming_Utils.h" to #include
-          "orbsvcs/Naming/Naming_Client.h".
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Updated.
+        * orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp:
+        * orbsvcs/tests/Trading/Offer_Importer.cpp:
+
+          Converted ACE_{static,dynamic,reinterpret,const}_cast macros
+          calls to their standard C++ counterparts.
+
+Fri Jan 28 07:18:10 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/AMH/Sink_Server/AMH_Servant.cpp:
+        * examples/AMI/FL_Callback/Progress_i.cpp:
+        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
+        * examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp:
+        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
+        * examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp:
+        * examples/Event_Comm/Event_Comm_i.cpp:
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp:
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
+        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
+        * examples/Logging/Logger_i.cpp:
+        * examples/Logging/Logging_Service_i.cpp:
+        * examples/Logging/Logging_Test_i.cpp:
+        * examples/OBV/Typed_Events/Client_i.cpp:
+        * examples/OBV/Typed_Events/Event_Types_impl.cpp:
+        * examples/OBV/Typed_Events/Server_i.cpp:
+        * examples/POA/DSI/Database_i.cpp:
+        * examples/POA/DSI/server.cpp:
+        * examples/POA/Generic_Servant/client.cpp:
+        * examples/POA/Loader/Servant_Activator.cpp:
+        * examples/POA/Loader/Servant_Locator.cpp:
+        * examples/POA/Loader/Server_Manager.cpp:
+        * examples/POA/On_Demand_Activation/server.cpp:
+        * examples/POA/On_Demand_Loading/Servant_Locator.cpp:
+        * examples/POA/On_Demand_Loading/Servant_Manager.cpp:
+        * examples/POA/On_Demand_Loading/Server_Manager.cpp:
+        * examples/Persistent_Grid/Grid_i.cpp:
+        * examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp:
+        * examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp:
+        * examples/RTCORBA/Activity/Task_Stats.cpp:
+        * examples/RTScheduling/FP_SchedulingC.cpp:
+        * examples/RTScheduling/MIF_SchedulingC.cpp:
+        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp:
+        * examples/Simple/Simple_util.cpp:
+        * examples/Simple/time/Time_Client_i.cpp:
+        * examples/Simulator/Event_Supplier/DOVE_Supplier.cpp:
+        * examples/Simulator/Event_Supplier/DualEC_Sup.cpp:
+        * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp:
+        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
+        * performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
+        * performance-tests/POA/Object_Creation_And_Registration/registration.cpp:
+        * performance-tests/RTCorba/Thread_Pool/client.cpp:
+        * tests/AMH_Exceptions/server.cpp:
+        * tests/AMH_Oneway/server.cpp:
+        * tests/CDR/allocator.cpp:
+        * tests/CDR/growth.cpp:
+        * tests/CDR/octet_sequence.cpp:
+        * tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp:
+        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
+        * tests/CodeSets/simple/client.cpp:
+        * tests/Codec/client.cpp:
+        * tests/Collocation_Opportunities/Collocation_Opportunities.cpp:
+        * tests/FL_Cube/client.cpp:
+        * tests/NestedUpcall/MT_Client_Test/client.cpp:
+        * tests/NestedUpcall/Simple/server.cpp:
+        * tests/OctetSeq/OctetSeq.cpp:
+        * tests/OctetSeq/client.cpp:
+        * tests/OctetSeq/test_i.cpp:
+        * tests/Policies/Manipulation.cpp:
+        * tests/Portable_Interceptors/Benchmark/interceptors.cpp:
+        * tests/Portable_Interceptors/Bug_1559/interceptors.cpp:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp:
+        * tests/RTCORBA/RTMutex/server.cpp:
+        * tests/RTScheduling/DT_Spawn/test.cpp:
+        * tests/Xt_Stopwatch/client.cpp:
+        * tests/Xt_Stopwatch/timer.cpp:
+        * utils/catior/catior.cpp:
 
-        * orbsvcs/orbsvcs/CosNaming.mpc:
+          Converted ACE_{static,dynamic,reinterpret,const}_cast macros
+          calls to their standard C++ counterparts.
 
-          Changed Naming_Utils.{cpp,h} to Naming_{Client,Server}.{cpp,h}.
+Thu Jan 27 20:01:21 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.h:
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
 
-          Removed files.
+          Fix for [BUGID 2038]. Please see
 
-        * orbsvcs/orbsvcs/Naming/Naming_Client.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Client.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Server.h:
+          http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2038
 
-          New files, split out from Naming_Utils.cpp and Naming_Utils.h so
-          that it is possible to have client and server side libraries.
+          for details and thanks to Torsten Kuepper
+          <torsten.kuepper@nokia.com> for reporting the problem.
 
-Thu Aug 26 22:54:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Jan 27 11:39:00 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/Current.pidl:
+        * orbsvcs/.../*.{cpp,h,i,inl}:
 
-          Added #ifndef guard, as was done with GIOP.idl in:
-          Thu Aug 26 22:54:35 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Ossama let me know that my ACE-style to C++ cast conversion
+          script didn't add a space between the ">" and the "(", which
+          violates the ACE/TAO conventions.  I wrote another script to
+          fix the damage, which fixed up a lot of other cases as well.
 
-Thu Aug 26 22:48:26 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Jan 27 10:37:19 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * Makefile.am:
-        * configure.ac:
+        * orbsvcs/examples/ImR/Combined_Service/run_test.pl:
 
-          Changed to enable building utils directory.
+          Use the tao_imr to shutdown the server before ending the test.
+          Since the ImR Activator probably started the server, $SERV no
+          longer refers to the actual server process.
 
-        * utils/Makefile.am:
-        * utils/catior/Makefile.am:
-        * utils/nslist/Makefile.am:
+Thr Jan 27 07:35:05 2005  Huang-Ming Huang  <hh1@cse.wustul.edu>
 
-          New files, built with a little help from MPC.
+        * orbsvcs/orbsvcs/FtRtEvent/EventChanel/GroupInfoPublisher.cpp
+        Removed dependancy on log_obj_endpoints.h.
 
-Thu Aug 26 22:46:24 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Wed Jan 26 17:20:05 2005  Huang-Ming Huang  <hh1@cse.wustul.edu>
 
-        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChanel/FTEC_Group_Manager.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChanel/GroupInfoPublisher.h
+        * orbsvcs/orbsvcs/FtRtEvent/EventChanel/GroupInfoPublisher.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChanel/IOGR_Maker.h
+        * orbsvcs/orbsvcs/FtRtEvent/EventChanel/IOGR_Maker.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChanel/Replication_Service.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChanel/FtEventServiceInterceptor
 
-          Fixed tipo I introduced when adding Shutdown_Utilities.cpp.
+          Fixed incorrect object_group_ref_version problem. Thanks to
+          Thia Chang Chao <tchangch@dso.org.sg> for reporting the problem.
 
-Thu Aug 26 22:54:35 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/GIOP.pidl:
-
-          Added missing #ifndef guard around the file. With recent
-          changes that have tightened up redefinition checking in
-          reopened modules, we were getting a redefinition error
-          from GIOP.pidl being included in FT_CORBA_ORB.idl by
-          two different paths and having no protection from the
-          #ifndef guard. Thanks to J.T. Conklin <jtc@acorntoolworks.com>
-          for reporting the problem.
-
-Thu Aug 26 20:19:19 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Jan 25 14:15:05 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * tao/Makefile.am:
 
-          Added back includedir definition that got lost in a previous
-          edit.
-
-Thu Aug 26 22:07:30 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be_include/be_visitor_amh_pre_proc.h:
-        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
-
-          Removed the overridden visit_scope() method. It does
-          nothing different from the be_visitor_scope base class
-          method. This closes [BUGID:1882].
-
-Thu Aug 26 18:58:22 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_is.cpp:
-
-          Fixed code generation in implementation files for local
-          interfaces. Changes include:
+          Update for this change:
 
-          - inheritance from TAO_Local_RefCounted_Object instead
-            of PortableServer::ServantBase.
+          Tue Jan 26 10:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          - no copy constructor generated.
+Tue Jan 25 12:57:05 2005  Phil Mesnier  <mesnier_p@ociweb.com>
 
-          - tao/LocalObject.h included if local interface is seen.
-
-        This fix closes [BUGID:1871].
+        * tao/Codeset_Manager.cpp:
+          Moved default selection of the UTF16_BOM codeset translator from
+          get_char_trans() to get_wchar_trans() where it belongs. Thanks
+          to Olivier Brunet <o.brunet@free.fr> for finding this.
 
-Thu Aug 26 18:11:09 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+Tue Jan 25 09:59:28 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
+        * orbsvcs/Event_Service/Event_Service.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp:
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+        * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp:
+        * orbsvcs/IFR_Service/be_init.cpp:
+        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp:
+        * orbsvcs/ImplRepo_Service/Forwarder.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+        * orbsvcs/LoadBalancer/LoadManager.cpp:
+        * orbsvcs/LoadBalancer/LoadMonitor.cpp:
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
+        * orbsvcs/PSS/PSDL_Datastore.cpp:
+        * orbsvcs/PSS/PSDL_Interface_Visitor.cpp:
+        * orbsvcs/PSS/PSDL_Struct_Visitor.cpp:
+        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp:
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * orbsvcs/orbsvcs/AV/AV_Core.cpp:
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp:
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp:
+        * orbsvcs/orbsvcs/AV/MCast.cpp:
+        * orbsvcs/orbsvcs/AV/QoS_UDP.cpp:
+        * orbsvcs/orbsvcs/AV/RTCP.cpp:
+        * orbsvcs/orbsvcs/AV/RTCP_Channel.cpp:
+        * orbsvcs/orbsvcs/AV/RTCP_Packet.cpp:
+        * orbsvcs/orbsvcs/AV/RTP.cpp:
+        * orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp:
+        * orbsvcs/orbsvcs/AV/TCP.cpp:
+        * orbsvcs/orbsvcs/AV/UDP.cpp:
+        * orbsvcs/orbsvcs/AV/sfp.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i:
+        * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl:
+        * orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp:
+        * orbsvcs/orbsvcs/Event/Dispatching_Modules.i:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i:
+        * orbsvcs/orbsvcs/Event/EC_And_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp:
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp:
+        * orbsvcs/orbsvcs/Event/Event_Channel.cpp:
+        * orbsvcs/orbsvcs/Event/Timer_Module.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Contained_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp:
         * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
-
-          Changed the minor code of a BAD_PARAM exception to 3
-          (local name clash) from its incorrect value of 5
-          (inherited name clash).
-
-Thu Aug 26 16:37:29 2004  Dale Wilson  <wilson_d@ociweb.com>
-
-        * interop-tests/wchar/interop_wchar.idl:
-        * interop-tests/wchar/interop_wchar_i.h:
-        * interop-tests/wchar/interop_wchar_i.cpp:
-        * interop-tests/wchar/Client.java:
-        * interop-tests/wchar/WChar_PasserImpl.java:
-          Modified to test interoperability test JDK 1.4x ORB.
-          The JDK ORB has trouble marshaling wide character strings
-          when they are embedded in structures.
-          This revised test reveals the problem so the solution
-          can be tested.
-          Declare/implement methods to send and receive wide
-          character strings in structures and validate the
-          results.
-          Remove explicit references to JACOrb.
-
-        * interop-tests/wchar/Server.java:
-          Honor -o option rather than using argv[1] as IOR filename.
-
-
-Thu Aug 26 16:29:53 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
-
-          Changed the check for generating _add_ref(), _remove_ref(),
-          and _tao_to_value() for valuetypes from support of
-          abstract interface(s) to support for any interface(s).
-          For the first two methods, the generation is done to avoid
-          their ambiguous inheritance. One source of inheritance
-          is CORBA::ValueBase, and the other could be CORBA::Object,
-          or CORBA::AbstractBase, or both. The third method is
-          generated to extract a valuetype from an abstract
-          interface, if it was passed by value. A valuetype could
-          support a concrete interface that inherits from an
-          abstract one, so again the method is necessary even if
-          the valuetype supports a concrete interface.
-
-Thu Aug 26 15:46:36 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_component.cpp:
-        * TAO_IDL/ast/ast_home.cpp:
-        * TAO_IDL/ast/ast_interface.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_valuetype.h:
-        * TAO_IDL/include/utl_scope.h:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Made UTL_Scope::look_in_inherited() virtual and a no-op,
-          while adding overrides to the appropriate AST_* classes.
-          Also added a no-op look_in_supported() to UTL_Scope,
-          and overrides where appropriate. Modified code in
-          UTL_Scope::lookup_by_name() to call these new methods,
-          and removed the check for node type, which is no longer
-          needed. Thanks to Boris Kolpackov <boris@dre.vanderbilt.edu>
-          for providing the IDL example that (legally) references
-          by local name things declared in supported interfaces,
-          base valuetypes, base components and base homes. This
-          closes [BUGID:1706].
-
-Thu Aug 26 13:48:31 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_module.cpp:
-        * TAO_IDL/include/ast_module.h:
-        * TAO_IDL/include/utl_scope.h:
-
-          Specialized the referenced() method for modules to
-          catch redefinitions in a reopened module. Thanks to
-          Boris Kolpackov <boris@dre.vanderbilt.edu> for reporting
-          this bug. This fixed closes [BUGID:1695].
-
-Thu Aug 26 12:37:45 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_check_for_include):
-
-          Added check for .pidl file included as a local filename.
-          Because of lookup quirks necessary for orb.idl, the
-          above case will also be found, even without a proper
-          -I option, but the generated C++ include will be incorrect.
-          So we add the necessary path to the .pidl filename before
-          it is stored for later validation and code generation.
-          This closes [BUGID:1608].
-
-Thu Aug 26 11:22:51 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/Abstract_Interface/Abstract_Interface.mpc:
-
-          Changed dependencies in the client project, and added
-          explicit file lists to both projects.
-
-Thu Aug 26 10:38:49 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
-
-          Fix fuzz build complaints about returning 'int' rather than
-          'bool' from operator== and operator!=.
-
-Thu Aug 26 10:17:45 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-
-          Fixed incorrect generation of base classes for C++ classes
-          mapped from valuetypes, to include only the immediate
-          supported abstract interfaces rather than the entire
-          graph of supported abstract interfaces.
-
-Thu Aug 26 00:17:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Added Shutdown_Utilities.cpp to Svc_Util libraries sources.
-
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
-
-          Removed -Gv from IDL compiler flags.
-
-Wed Aug 25 16:03:29 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/Naming_Service/Naming_Server.cpp:
-        * orbsvcs/Naming_Service/Naming_Service.cpp:
-        * orbsvcs/Naming_Service/Naming_Service.h:
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/StringDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp:
         * orbsvcs/orbsvcs/IOR_Multicast.cpp:
-        * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
-        * orbsvcs/orbsvcs/Shutdown_Utilities.h:
-        * orbsvcs/orbsvcs/Svc_Utils.mpc:
-        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp:
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp:
+        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp:
+        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
         * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
-        * utils/nslist/nsadd.cpp:
-        * utils/nslist/nsdel.cpp:
-
-          Integrated many memory leak fixes for the Naming Service
-          originally done in OCITAO 1.3a.  All relevant original changelog
-          entries are below:
-
-        Thu Jul 22 11:31:30 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * utils/nslist/nsdel.cpp (main):
-
-                  Added a new option, --destroy, that can be used to destroy the
-                  specified context after the unbind.  If the context is unbound
-                  but not destroyed using "nsdel", then the context will leak
-                  within the Naming Service because no NS client will be able to
-                  resolve() to get a reference to it again.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (TAO_Storable_Naming_Context::DTOR):
-
-                  Corrected a problem where the file that acts as persistent
-                  backing store for context information didn't get removed when
-                  the context had been destroyed via the "destroy()" operation.
-                  This should address [RT 4221].
-
-        Wed Jul  7 15:41:33 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (TAO_Naming_Server):
-                  Made deletion of servant_activator_ conditional on the
-                  use_servant_activator_ member variable, since servant_activator_
-                  should only have a value when use_servant_activator_ is true.
-                  For safety sake, however, we now also explicitly initialize
-                  servant_activator_ to zero.
-
-                  This should fix scoreboard problems on tests that instantiate a
-                  TAO_Naming_Server directly in their code rather than starting up
-                  a naming service executable, such as TAO/examples/Simple/grid.
-
-        Fri Jul  2 10:16:06 2004  Rich Seibel <seibel_r@ociweb.com>
-
-                * utils/nslist/nsadd.cpp:
-                  Integrated change from Dave Knox at Intrado Inc. to add the
-                  ability to add a new context to the Naming Service.
-                  At the same time, I pulled over the DOC group change to
-                  automatically add any intermediate contexts.  RT4014.
-
-                * utils/nslist/runtest.pl:
-                  New test added to test the ability to use the above.
-
-        Wed Jun 30 12:29:50 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (File_Open_Lock_and_Check::File_Open_Lock_and_Check):
-                  Added an else clause to delete the file returned from
-                  create_stream in case none of the other branches were executed.
-                  This eliminates a continuous leak seen only using the "-u"
-                  option on the Naming Service.
-
-        Wed Jun 30 12:29:18 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
-                  (TAO_Naming_Server::DTOR): Added an explicit delete for the
-                  servant_activator_.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
-                  (ServantActivator): Eliminated the inheritance from
-                  TAO_RefcountedLocalObject.  The inheritance was placed there
-                  with the thought that the servant would be reference counted
-                  and, thus, its lifecycle magically managed.  Empirical evidence
-                  shows otherwise, so we have these two changes.  This eliminates
-                  a one-time 88 byte or so leak when running the Naming Service
-                  with flat file persistence.
-
-        Mon Jun 21 16:43:06 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: Forgot to
-                  update this when I did the entry below.
-
-        Mon Jun 21 12:17:35 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
-                  (TAO_Storable_Naming_Context):
-                * tao/ORB_Core.{h,cpp} (instance_):
-
-                  Changed use of auto_ptr<> to ACE_Auto_Ptr<> to avoid
-                  compatibility problems on VC6 platforms.
-
-        Sun Jun 20 09:34:46 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: More tweaks in
-                  various places to use *_var's in() method in order to de-warn
-                  about ambiguous conversions on certain compilers.
-
-                * orbsvcs/tests/ImplRepo/NameService/run_test.pl: Increaed the
-                  waitforfile_timed timeout value so the test could succeed on
-                  slow/overloaded nightly build platforms.
-
-        Sat Jun 19 00:21:28 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (~TAO_Storable_Naming_Context): Sigh...removed code residue from
-                  debugging the problem below that was causing rampant breakage on
-                  any platform that wasn't glibc-based.
-
-        Fri Jun 18 17:34:22 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (~TAO_Storable_Naming_Context): Got rid of the call to remove
-                  the file.  Having the remove in here broke persistence when all
-                  the memory leaks got fixed, because upon destruction it would
-                  end up removing the file for the context.  This should fix the
-                  failures of the persistent variant of the Simple_Naming test.
-
-                  A point worth noting is that I originally thought that the
-                  remove() needed to be moved into a different, new method so that
-                  when a context got unbound the file would get properly removed.
-                  While I can find no place in the code where an unbind calls the
-                  equivalent of remove(), anecdotal evidence shows that, indeed,
-                  the files get removed at unbind time, and everything works the
-                  way it's supposed to.  Mysterious...
-
-        Fri Jun 18 13:52:07 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/IOR_Multicast.cpp (~TAO_IOR_Multicast): Changed
-                  to use the leave() method, since apparently *all* unsubscribe
-                  methods are deprecated.
-
-        Fri Jun 18 13:34:01 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: Tweaks in
-                  various places to use the ORB_var's in() method in order to
-                  de-warn on gcc 3.2.
-
-                * orbsvcs/orbsvcs/IOR_Multicast.cpp (~TAO_IOR_Multicast):
-                  Eliminated use of deprecated unargumented unsubscribe() call,
-                  and use the correct calls instead.  This should get rid of the
-                  deprecation message printed out when the naming service
-                  terminates, which was also upsetting the Simple_Naming test
-                  output processing script (see below).
-
-                * orbsvcs/Naming_Service/Naming_Server.cpp (operator()): Made the
-                  message only get printed out when the debug level is turned on.
-                  Seems that the multithreaded version of the Simple_Naming test
-                  was seeing this message, not expecting it, and declaring that
-                  the test had failed.
-
-        Thu Jun 17 18:30:52 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/Naming_Service/Naming_Service.cpp (fini): Add call to
-                  the naming server object's fini method so things get properly
-                  removed/deallocated.
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (fini): Moved code that
-                  was in the destructor into here in order to parallel the
-                  allocation of things occurring in the init*() methods.
-
-                  Also changed to get the reactor through orb->orb_core() rather
-                  than TAO_ORB_Core_instance(), which is old and decrepit.
-
-                  Hopefully this fixes core dumps on exit when using "-m 1".
-
-        Tue Jun 15 17:34:42 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (DTOR):
-
-                  Removed the delete of the servant activator.  Turns out that
-                  reference-counting the servant activator was enough.  This
-                  should fix a core dump observed in the nightly builds on exit
-                  from the Naming Service.
-
-        Mon Jun 14 13:56:22 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (init_with_orb):
-
-                  Fixed message printed in exception so that it has the correct
-                  class name.
-
-        Mon Jun 14 12:22:03 2004  Chris Cleeland  <cleeland_c@ociweb.com>
-
-                  Corrected a bunch of memory leaks throughout the naming
-                  service.  Details below...
-
-                * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp (close):
-
-                  Properly close the flat file to reclaim memory allocated in the
-                  system's stdio library.
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (init_with_orb):
-
-                  Use auto_ptr<> to hold the persistence factory so that it gets
-                  properly cleaned up.
-
-                  The servant activator accepts and holds on to a pointer to the
-                  persistence factory.  However, we don't always create a servant
-                  activator.  We need to use auto_ptr<> over the persistence
-                  factory to insure proper cleanup in the case of an exception or
-                  in the case where we don't use use servant activator, so the
-                  code is a little goofy, and we end up releasing the pointer from
-                  the auto_ptr<> if the servant activator's in use.
-
-                  There's probably a better way to handle this, such as reference
-                  counting, but I wanted going for the minimal thing that worked.
-
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.*:
-
-                  Refined the role of the activator with regard to ownership of
-                  and responsibility for managing the persistence factory--the
-                  activator is now responsible for cleaning up the persistence
-                  factory.
-
-                  The destructor now performs its duty.
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (init_new_naming):
-
-                  Change to hold the heap-allocated servant activator in a data
-                  member rather than a local so that we can clean it up when we're
-                  finished rather than just leak it.
-
-                * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (DTOR):
-
-                  Make sure everything gets cleaned up.
+        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request.inl:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
+        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp:
+        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp:
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i:
+        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+        * orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp:
+        * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp:
+        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp:
+        * orbsvcs/orbsvcs/Time_Utilities.i:
+        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Trader/Offer_Database.cpp:
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp:
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp:
+        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp:
+        * orbsvcs/tests/AVStreams/Latency/ping.cpp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
+        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
+        * orbsvcs/tests/Event/lib/Driver.cpp:
+        * orbsvcs/tests/FT_App/FT_Client.cpp:
+        * orbsvcs/tests/FT_App/FT_Creator.cpp:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp:
+        * orbsvcs/tests/FT_App/StubFaultConsumer.cpp:
+        * orbsvcs/tests/FT_App/StubFaultNotifier.cpp:
+        * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp:
+        * orbsvcs/tests/HTIOP/AMI/Test_Output.cpp:
+        * orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp:
+        * orbsvcs/tests/HTIOP/Hello/Test_Output.cpp:
+        * orbsvcs/tests/HTIOP/test_config.h:
+        * orbsvcs/tests/ImplRepo/nestea_i.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp:
+        * orbsvcs/tests/Notify/Blocking/common.cpp:
+        * orbsvcs/tests/Notify/Discarding/common.cpp:
+        * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp:
+        * orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp:
+        * orbsvcs/tests/Notify/Ordering/common.cpp:
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp:
+        * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp:
+        * orbsvcs/tests/Notify/performance-tests/Filter/common.cpp:
+        * orbsvcs/tests/Sched_Conf/Sched_Conf.cpp:
+        * orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp:
+        * orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp:
+        * orbsvcs/tests/Trading/Offer_Exporter.cpp:
+        * orbsvcs/tests/Trading/Offer_Importer.cpp:
+        * orbsvcs/tests/Trading/Service_Type_Exporter.cpp:
+
+          Converted ACE_{static,dynamic,reinterpret,const}_cast macros
+          calls to their standard C++ counterparts using my "safe" but
+          conservative perl script.  This takes the easy cases out off
+          the table so it will be easier to review diffs from Ossama's
+          ACE-cast-convert script on the next pass.
+
+Tue Jan 26 10:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CONV_FRAMES.{h,cpp,inl}:
+        * tao/CONV_FRAMES_T.{h,cpp,inl}:
+        * tao/GIOPS.{h,cpp,inl}:
+        * tao/GIOPS_T.{h,cpp,inl}:
+        * tao/IOPS.{h,cpp,i}:
+        * tao/IOPS_T.{h,cpp,i}:
+        * tao/PollableS.{h,cpp,inl}:
+        * tao/PollableS_T.{h,cpp,inl}:
+        * tao/ServiceS.{h,cpp,inl}:
+        * tao/ServiceS_T.{h,cpp,inl}:
+        * tao/TAOS.{h,cpp,inl}:
+        * tao/TAOS_T.{h,cpp,inl}:
+        * tao/TimeBaseS.{h,cpp,inl}:
+        * tao/TimeBaseS_T.{h,cpp,inl}:
+          The generated S.cpp, S.inl, S_T.cpp and S_T.inl are empty and
+          don't contain real code, so we removed these files from the repo
+          and updated the correspondind S.h/S_T.h file. This is now done
+          by hand but there is a feature request to the TAO_IDL compiler
+          to be able to suppress the generation of these files
+
+Tue Jan 25 00:00:51 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/PortableServer/POA.cpp (reference_to_id):
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+          (handle_input):
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+          (visit_component_assoc):
+        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+          (bind_new_context):
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+          (bind_new_context):
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+          (visit_component_assoc):
+
+          Fixed "control reaches end of non-void function" warnings
+          exhibited by the latest GNU G++ 4.0 CVS snapshot.
+
+        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+          (allocate_nowrite):
+
+          Explicitly cast "~0" to a "size_t".  Addresses a warning
+          exhibited by the latest GNU G++ 4.0 CVS snapshot regarding
+          passing a negative value as a "size_t" function argument.
+
+Mon Jan 24 22:06:05 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/ORB_Core.h (TAO_ORB_Core):
+
+          Removed obsolete "friend class TAO_ORB_Table" declaration.
+
+Mon Jan 24 21:38:09 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/CosLoadBalancing.idl (CosLoadBalancing):
+
+          Changed typeprefix for this module from "omg.org" to "tao.lb".
+          The IDL in this file is not yet OMG standard, and is generally
+          specific to TAO.
+
+Mon Jan 24 16:59:22 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
+        * tao/Makefile.am:
 
-                  Discontinued use of the TAO_Persistent_*Id classes.  These
-                  classes were designed and implemented to be used with the
-                  Persistent store, which is memory-mapped.   Therefore, they
-                  assume that some external entity will be doing any and all
-                  dynamic allocations, and that they should do none lest they
-                  screw it up.
+          Fix thinko in pkgsrc *.pc file generation.
 
-                  We now have analogous TAO_Storable_*Id classes which DO assume
-                  responsibility for managing their dynamically-allocated memory.
-                  For the moment, since they are not used anywhere except within
-                  the Storable_Naming_Context, they do not have their own files.
+Mon Jan 24 16:15:31 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.* (gfl_):
+        * tao/Makefile.am:
 
-                  Wrap in an auto_ptr<> so that the stream gets properly destroyed
-                  at the proper time and doesn't leak.
+          Update.
 
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
-                  (shared_bind):
+        * configure.ac:
 
-                  Capture the return from object_to_string in a String_var to
-                  eliminate a leak.
+          Changed to invoke ACE_ENABLE_{FL,QT,TK,XT}_REACTOR.
 
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp (DTOR):
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp (recreate_all):
+Mon Jan 24 13:22:04 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-                  Use an auto_ptr<> to capture the values returned from
-                  create_stream() so that they get properly destroyed.
+        * tao/FlResource.mpc:
+        * tao/QtResource.mpc:
+        * tao/TkResource.mpc:
+        * tao/XtResource.mpc:
 
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h (TAO_Storable_Bindings_Map):
+          Removed Default_Resources subsection from Source_Files.
 
-                  Hold the ORB reference in a _var rather than a _ptr so it gets
-                  properly refcounted.
+          Added empty Inline_Files, Template_Files, Resource_Files, and
+          PIDL_Files sections.
 
-                * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
+Mon Jan 24 09:38:08 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-                  Mixed-in TAO_Local_RefCounted_Object hoping that the POA called
-                  the reference-counting methods, and, thus, it would insure that
-                  the POA would manage the activator's instance automagically.
-                  Alas, this didn't appear to work, but I can't see any harm in
-                  leaving this in for now.
+        * tests/GIOP_Fragments/PMB_With_Fragments/giop1.2_fragments_be.dat:
+        * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl:
 
-        Mon Jun 14 12:06:45 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+          Added a data file for big endien servers and conditionally
+          determine which data file to use in the test script.
 
-                * orbsvcs/Naming_Service/Naming_Service.*:
+Mon Jan 24 06:23:04 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-                  Added a fini() method to clean up resources acquired/allocated
-                  in the init*() methods.  The onus is on the application to call
-                  fini(), however.
+        * orbsvcs/tests/FT_App/FT_App.mpc:
 
-                * orbsvcs/Naming_Service/Naming_Server.cpp (main):
+          Reverted my change from Fri Jan 21 10:11:29 2005.
 
-                  Added call to new fini() method to insure proper cleanup.
+Sun Jan 23 14:56:20 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        Mon Jun  7 11:13:44 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+        * TAO-INSTALL.html (href):
 
-                * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
+          Added some notes about g++ on Solaris 10 downloaded from
+          blastwave.
 
-                  Defined our own TAO_ORBSVCS_MAXSIG as "one plus the largest
-                  signal number to which we pay attention", rather than using
-                  SIGRTMIN.  This should be portable across all platforms.
+Sun Jan 23 19:04:31 2005  Marek Brudka  <mbrudka@aster.pl>
 
-                  Bracketed use of actual signal names in the convenience CTOR by
-                  ACE_LACKS_UNIX_SIGNALS so that non-Unix platforms actually
-                  compile.
+        * .cvsignore (Module):
+          Removed unnecessary file.
 
-        Fri Jun  4 16:16:02 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+Sun Jan 23 18:04:02 2005  Marek Brudka  <mbrudka@aster.pl>
 
-                * orbsvcs/orbsvcs/Shutdown_Utilities.h:
-                * orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
-                * orbsvcs/orbsvcs/Svc_Utils.mpc:
+        * examples/AMI/FL_Callback/Peer_i.cpp (Module):
+          Fixed error related with sleep once again. I lost this fix
+          during merge.
 
-                  Added a new utility class to the Svc_Utils library that makes it
-                  easy to have a service propertly shut itself down in response to
-                  a signal.  The motivation for this was an apparent memory leak
-                  in the Naming Service and the desire to use purify-like tools to
-                  diagnose.  However, the service never shut itself down properly,
-                  so purify would not produce a leak report.
+Sun Jan 23 15:50:25 2005  Marek Brudka  <mbrudka@aster.pl>
 
-                * orbsvcs/Naming_Service/Naming_Service.h (shutdown):
-                * orbsvcs/Naming_Service/Naming_Service.cpp (shutdown):
+        * */.cvsignore (Module):
 
-                  Added a new method to shut down the Naming Service.
+          Made cvs less annoyed.
 
-                * orbsvcs/Naming_Service/Naming_Server.cpp:
+Sun Jan 23 13:17:29 2005  Marek Brudka  <mbrudka@aster.pl>
 
-                  Added code to use the new shutdown utility classes to gracefully
-                  shut down the naming service.
+        * tao/Strategies/advanced_resource.h (Module):
 
-Wed Aug 25 15:06:35 2004  Rich Seibel <seibel_r@ociweb.com>
+          Removed unnecessary commma.
 
-        * examples/PluggableUDP/tests/SimplePerformance/client.cpp:
-        The test does an FPE if the time measured is smaller than
-        the resolution of the Hi-Res timer.  It now tests for zero
-        elapsed time and does not try to divide by zero.
+Sun Jan 23 12:38:45 2005  Marek Brudka  <mbrudka@aster.pl>
 
-Wed Aug 25 11:24:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * tao/XtResource.mpc (Message):
+        * tao/TkResource.mpc (Message):
+        * tao/QtResource.mpc (Message):
+        * tao/FlResource.mpc (Message):
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp:
+          Added missing Id strings.
 
-          Include <openssl/{x509,rsa,dsa,dh}.h to pull in OpenSSL function
-          prototypes used in this file.  Fixes compile-time problems that
-          occur when using older versions of OpenSSL.  Thanks to Chris
-          Cleeland for pointing this out.
+Sun Jan 23 11:56:27 2005  Marek Brudka  <mbrudka@aster.pl>
 
-Wed Aug 25 13:11:39 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tao/ORB_Core.cpp (Message):
 
-        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
+          Removed outdated remark.
 
-          Fixed newline formatting of generated code.
+Sun Jan 23 11:41:55 2005  Marek Brudka  <mbrudka@aster.pl>
 
-Wed Aug 25 09:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/ORB_Core.cpp (Module):
+          Added necessary include directive lost during merge.
 
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
-          Added missing sys in the include path of my change below
+Sun Jan 23 01:52:50 2005  Marek Brudka  <mbrudka@aster.pl>
 
-Wed Aug 25 07:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Xt_Stopwatch/timer.h:
+        * tests/Xt_Stopwatch/timer.cpp:
+        * tests/Xt_Stopwatch/test_i.h:
+        * tests/Xt_Stopwatch/test_i.cpp:
+        * tests/Xt_Stopwatch/svc.conf.xml:
+        * tests/Xt_Stopwatch/svc.conf:
+        * tests/Xt_Stopwatch/server.cpp:
+        * tests/Xt_Stopwatch/client.cpp:
+        * tests/Xt_Stopwatch/Xt_Stopwatch.mpc:
+        * tests/Xt_Stopwatch/Stopwatch_display.h:
+        * tests/Xt_Stopwatch/Stopwatch_display.cpp:
+        * tests/Xt_Stopwatch/README:
+        * tests/Xt_Stopwatch/Control.h:
+        * tests/Xt_Stopwatch/Control.cpp:
+        * tests/Xt_Stopwatch/Client.h:
+        * tests/QtTests/test_i.h:
+        * tests/QtTests/test_i.cpp:
+        * tests/QtTests/svc.conf.xml:
+        * tests/QtTests/svc.conf:
+        * tests/QtTests/server.cpp:
+        * tests/QtTests/client.h:
+        * tests/QtTests/client.cpp:
+        * tests/QtTests/README:
+        * tests/QtTests/QtTests.mpc:
+        * tests/FL_Cube/test_i.h:
+        * tests/FL_Cube/test_i.cpp:
+        * tests/FL_Cube/svc.conf.xml:
+        * tests/FL_Cube/svc.conf:
+        * tests/FL_Cube/server.cpp:
+        * tests/FL_Cube/client.cpp:
+        * tests/FL_Cube/FL_Cube.mpc:
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
+        * tao/xt_resource.i (Module):
+        * tao/xt_resource.h (Module):
+        * tao/xt_resource.cpp (Module):
+        * tao/tao.mpc (Module):
+        * tao/qt_resource.i (Module):
+        * tao/qt_resource.h (Module):
+        * tao/qt_resource.cpp (Module):
+        * tao/XtResource_Loader.h (Module):
+        * tao/XtResource_Loader.cpp (Module):
+        * tao/XtResource_Factory.h (Module):
+        * tao/XtResource_Factory.cpp (Module):
+        * tao/XtResource.mpc (Module):
+        * tao/TkResource_Loader.h (Module):
+        * tao/TkResource_Loader.cpp (Module):
+        * tao/TkResource_Factory.h (Module):
+        * tao/TkResource_Factory.cpp (Module):
+        * tao/TkResource.mpc (Module):
+        * tao/TSS_Resources.h (Module):
+        * tao/TSS_Resources.cpp (Module):
+        * tao/TAO_XtResource_Export.h (Module):
+        * tao/TAO_TkResource_Export.h (Module):
+        * tao/TAO_QtResource_Export.h (Module):
+        * tao/TAO_FlResource_Export.h (Module):
+        * tao/Strategies.mpc (Module):
+        * tao/QtResource_Loader.h (Module):
+        * tao/QtResource_Loader.cpp (Module):
+        * tao/QtResource_Factory.h (Module):
+        * tao/QtResource_Factory.cpp (Module):
+        * tao/QtResource.mpc (Module):
+        * tao/ORB_Core.h (Module):
+        * tao/ORB_Core.cpp (Module):
+        * tao/Leader_Follower.cpp (Module):
+        * tao/GUIResource_Factory.h (Module):
+        * tao/GUIResource_Factory.cpp (Module):
+        * tao/FlResource_Loader.h (Module):
+        * tao/FlResource_Loader.cpp (Module):
+        * tao/FlResource_Factory.h (Module):
+        * tao/FlResource_Factory.cpp (Module):
+        * tao/FlResource.mpc (Module):
+        * examples/AMI/FL_Callback/svc.conf.xml (Module):
+        * examples/AMI/FL_Callback/svc.conf (Module):
+        * examples/AMI/FL_Callback/progress.cpp (Module):
+        * examples/AMI/FL_Callback/README (Module):
+        * examples/AMI/FL_Callback/Progress_i.h (Module):
+        * examples/AMI/FL_Callback/Progress_i.cpp (Module):
+        * examples/AMI/FL_Callback/FL_Callback.mpc (Module):
+        * docs/Options.html (Module):
+
+          Changes related with separation of GUI reactors. The additional
+          information is below.
+
+        * .cvsignore:
+          To make cvs silent.
+
+        Sat Jan 22 19:57:16 2005  Marek Brudka  <mbrudka@aster.pl>
+
+        * tao/XtResource_Loader.h (Module):
+        * tao/XtResource_Loader.cpp (Module):
+        * tao/XtResource_Factory.h (Module):
+        * tao/XtResource_Factory.cpp (Module):
+        * tao/TkResource_Loader.h (Module):
+        * tao/TkResource_Loader.cpp (Module):
+        * tao/TkResource_Factory.h (Module):
+        * tao/TkResource_Factory.cpp (Module):
+        * tao/QtResource_Loader.h (Module):
+        * tao/QtResource_Loader.cpp (Module):
+        * tao/QtResource_Factory.h (Module):
+        * tao/QtResource_Factory.cpp (Module):
+        * tao/GUIResource_Factory.h (Module):
+        * tao/GUIResource_Factory.cpp (Module):
+        * tao/FlResource_Loader.h (Module):
+        * tao/FlResource_Loader.cpp (Module):
+        * tao/FlResource_Factory.h (Module):
+        * tao/FlResource_Factory.cpp (Module):
+
+          Style changes, addedin internal locking in factory when creating
+          reactor.
+
+        Wed Jan 19 22:52:34 2005  Marek Brudka  <mbrudka@aster.pl>
+
+        * tests/Xt_Stopwatch/server.cpp:
+        * tests/Xt_Stopwatch/client.cpp:
+        * tests/Xt_Stopwatch/Xt_Stopwatch.mpc:
+        * tests/Xt_Stopwatch/Client.h:
+        * tests/QtTests/test_i.h:
+        * tests/QtTests/server.cpp:
+        * tests/QtTests/client.h:
+        * tests/QtTests/client.cpp:
+        * tests/QtTests/QtTests.mpc:
+        * tests/FL_Cube/server.cpp:
+        * tests/FL_Cube/client.cpp:
+        * tests/FL_Cube/FL_Cube.mpc:
+        * tao/Strategies/advanced_resource.cpp:
+        * tao/xt_resource_loader.h:
+        * tao/xt_resource_loader.cpp:
+        * tao/xt_resource.i:
+        * tao/xt_resource.h:
+        * tao/xt_resource.cpp:
+        * tao/tk_resource_loader.h:
+        * tao/tk_resource_loader.cpp:
+        * tao/tk_resource.i:
+        * tao/tk_resource.h:
+        * tao/tk_resource.cpp:
+        * tao/tao_xtreactor.mpc:
+        * tao/tao_tkreactor.mpc:
+        * tao/tao_qtreactor.mpc:
+        * tao/tao_flreactor.mpc:
+        * tao/tao.mpc:
+        * tao/qt_resource_loader.h:
+        * tao/qt_resource_loader.cpp:
+        * tao/qt_resource.i:
+        * tao/qt_resource.h:
+        * tao/qt_resource.cpp:
+        * tao/fl_resource_loader.h:
+        * tao/fl_resource_loader.cpp:
+        * tao/fl_resource.i:
+        * tao/fl_resource.h:
+        * tao/fl_resource.cpp:
+        * tao/XtResource_Loader.h:
+        * tao/XtResource_Loader.cpp:
+        * tao/XtResource_Factory.h:
+        * tao/XtResource_Factory.cpp:
+        * tao/XtResource.mpc:
+        * tao/TkResource_Loader.h:
+        * tao/TkResource_Loader.cpp:
+        * tao/TkResource_Factory.h:
+        * tao/TkResource_Factory.cpp:
+        * tao/TkResource.mpc:
+        * tao/TSS_Resources.h:
+        * tao/TSS_Resources.cpp:
+        * tao/TAO_XtResource_Export.h:
+        * tao/TAO_XtReactor_export.h:
+        * tao/TAO_TkResource_Export.h:
+        * tao/TAO_TkReactor_export.h:
+        * tao/TAO_QtResource_Export.h:
+        * tao/TAO_QtReactor_export.h:
+        * tao/TAO_FlResource_Export.h:
+        * tao/TAO_FlReactor_export.h:
+        * tao/Qt_Resources_Export.h:
+        * tao/Qt_Resource_Factory.h:
+        * tao/Qt_Resource_Factory.cpp:
+        * tao/QtResource_Loader.h:
+        * tao/QtResource_Loader.cpp:
+        * tao/QtResource_Factory.h:
+        * tao/QtResource_Factory.cpp:
+        * tao/QtResource.mpc:
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.cpp:
+        * tao/Leader_Follower.cpp:
+        * tao/GUI_Resource_Factory.h:
+        * tao/GUIResource_Factory.h:
+        * tao/GUIResource_Factory.cpp:
+        * tao/FlResource_Loader.h:
+        * tao/FlResource_Loader.cpp:
+        * tao/FlResource_Factory.h:
+        * tao/FlResource_Factory.cpp:
+        * tao/FlResource.mpc:
+        * examples/AMI/FL_Callback/progress.cpp (Module):
+        * examples/AMI/FL_Callback/FL_Callback.mpc (Module):
+
+          Naming more constistent and new GUIResources loading schema.
+
+        Sat Jan 15 00:19:04 2005  Marek Brudka  <mbrudka@aster.pl>
+
+        * tao/tk_resource_loader.h (Module):
+        * tao/tk_resource_loader.cpp (Module):
+        * tao/fl_resource_loader.h (Module):
+        * tao/fl_resource_loader.cpp (Module):
+        * tao/tk_resource.h (Module):
+        * tao/tk_resource.cpp (Module):
+        * examples/AMI/FL_Callback/svc.conf.xml (Module):
+        * examples/AMI/FL_Callback/svc.conf (Module):
+        * tests/FL_Cube/server.cpp (Module):
+        * tests/FL_Cube/client.cpp (Module):
+        * tao/tao_flreactor.mpc (Module):
+        * tao/fl_resource.h (Module):
+        * tao/fl_resource.cpp (Module):
+        * examples/AMI/FL_Callback/progress.cpp (Module):
+        * examples/AMI/FL_Callback/README (Module):
+        * tests/Xt_Stopwatch/svc.conf (Module):
+        * tests/Xt_Stopwatch/svc.conf.xml (Module):
+        * tests/Xt_Stopwatch/server.cpp (Module):
+        * tests/Xt_Stopwatch/client.cpp (Module):
+        * tests/Xt_Stopwatch/Client.h (Module):
+        * tao/xt_resource_loader.h (Module):
+        * tao/xt_resource_loader.cpp (Module):
+        * tao/xt_resource.i (Module):
+        * tao/xt_resource_loader.cpp (Module):
+        * tao/xt_resource.h (Module):
+        * tao/xt_resource.cpp (Module):
+        * tao/tao_xtreactor.mpc (Module):
+
+          Created TAO_*Resource_Loader, changed some names,updated doc and
+          adapted tests to new way gui resources are loaded.
+
+        * tests/QtTests/server.cpp (Module):
+        * tests/QtTests/client.cpp (Module):
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
+        * tao/qt_resource_loader.h (Module):
+        * tao/qt_resource_loader.cpp (Module):
+        * tao/qt_resource.cpp (Module):
+        * tao/ORB_Core.h (Module):
+        * tao/ORB_Core.cpp (Module):
+        * tao/Leader_Follower.cpp (Module):
 
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
-          Instead of including sys/loadavg.h, include
-          ace/os_include/os_loadavg.h
+          Created reactor factory on ORB_Core level to create GUI
+          reactors. Removed resouce_factory chain from
+          Advanced_Resource_Factory. Adapted qt_resource_loader to new
+          reactor creation schema. Some style changes.
 
-        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
-          Instead of including sys/loadavg.h, include
-          ace/os_include/os_loadavg.h. Added include of os_pstat.h to fix
-          compile error on HPUX on Itanium
+        Tue Jan 11 23:39:37 2005  Marek Brudka  <mbrudka@aster.pl>
 
-Tue Aug 24 20:33:08 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
 
-        * tests/RTCORBA/RTMutex/server.cpp:
+          Created a simple chain of resource_factories to allow creation
+          of GUIReactors and using Advanced_Resource_Factory the same
+          time.
 
-          Changed test_mutex_try_lock to unlock mutex before releasing it.
+        * tao/qt_resource_loader.cpp (Module):
+        * tao/qt_resource.h (Module):
+        * tao/qt_resource.cpp (Module):
 
-Tue Aug 24 16:09:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          Corrected loading of TAO_QtResource_Factory. Protected against
+          multiple calls of create_reactor_impl.
 
-        * docs/releasenotes/OBV.html:
-        * docs/releasenotes/index.html:
+        Sun Jan  9 22:58:24 2005  Marek Brudka  <mbrudka@aster.pl>
 
-          Updated documentation of valuetype support. See [Bug 1908].
+        * tests/QtTests/svc.conf.xml (Module):
+        * tests/QtTests/svc.conf (Module):
+        * tests/QtTests/server.cpp (Module):
+        * tests/QtTests/client.cpp (Module):
 
-Tue Aug 24 08:53:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          Adapted the test to the current programming model for qt
+          resource.
 
-        * docs/compiler.html:
+        * tao/tao_qtreactor.mpc (Module):
+        * tao/qt_resource_loader.h (Module):
+        * tao/qt_resource_loader.cpp (Module):
 
-          Removed documentation of '-Sv' option. See [Bug 1908].
+          Create preliminary version of QtReasourceLoader class for static
+          use of Qt resources in TAO servers.
 
-Tue Aug 24 06:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Sun Jan  9 01:20:25 2005  Marek Brudka  <mbrudka@aster.pl>
 
-        * tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc:
-          Added missing base project, removed not needed idlflags
+        * docs/Options.html (Module):
 
-Mon Aug 23 23:27:01 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Updated documentation.
 
-        * Makefile.am (AUTOMAKE_OPTIONS):
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
 
-          Removed required Automake version from `Makefile.am'.
-          `configure.ac' already defines it.
+          Removed support for FlReactor and TkReactor from
+          AdvancedFactory.
 
-        * configure.ac (AM_INIT_AUTOMAKE):
+        * examples/AMI/FL_Callback/svc.conf.xml (Module):
+        * examples/AMI/FL_Callback/svc.conf (Module):
+        * examples/AMI/FL_Callback/FL_Callback.mpc (Module):
+        * tests/FL_Cube/svc.conf.xml (Module):
+        * tests/FL_Cube/svc.conf (Module):
+        * tests/FL_Cube/server.cpp (Module):
+        * tests/FL_Cube/client.cpp (Module):
 
-          Updated required version of Automake to 1.9.
+          TAO_Advanced_Resource_Factory changed into
+          TAO_FlResource_Factory.
 
-Mon Aug 23 21:40:36 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * tao/tao_xtreactor.mpc (Module):
+        * tao/tao_tkreactor.mpc (Module):
+        * tao/tao_qtreactor.mpc (Module):
+        * tao/tao_flreactor.mpc (Module):
 
-        * tao/Synch_Invocation.cpp:
-        * tao/Messaging/Asynch_Invocation.cpp:
+          Removed dependencies on features
+          tao_qtreactor,tao_xtreactor,tao_flreactor,tao_tkreactor
 
-          Fixed a problem which used to make the client ORB hang when the
-          BiDirPolicy was set and a corbaloc URL was used. The problem
-          stemmed from the following
+        Mon Dec 13 19:17:29 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          - The reply dispatcher was bound to the table with some
-            request ID.
+        * */.cvsignore (Module):
 
-          - When the request header was generated, the request ID was
-            munged to be compliant with BiDir GIOP semantics.
+          Stopped cvs from complaining about unknown executables.
 
-          - The request could possible be sent out with a different
-            request ID whose reply dispatcher could have been bounded with
-            a different ID.
+        Mon Dec 13 02:32:56 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          The above made the client ORB hang. We now marshal the whole
-          request before we bind the dispatcher, which will get us the
-          right ID. This fixes the problem. After getting permissions from
-          Thomas Lockhart, I will checkin the test.
+        * tao/Strategies/advanced_resource.cpp (Message):
 
-          Thanks to Thomas Lockhart for reporting the problem.
+          Fix small bug related with missing plugin library.
 
-Mon Aug 23 20:36:59 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        Mon Dec 13 02:28:06 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * tao/Transport_Connector.cpp:
+        * tests/FL_Cube/FL_Cube.mpc (Module):
+        * examples/AMI/FL_Callback/FL_Callback.mpc (Module):
 
-          A simple programmatic error while trying to set the type of role
-          on the client caused a bunch of tests to fail. Many tests should be
-          going strong after this change.
+          Dependence on tao_flreactor changed into ace_fl.
 
-Mon Aug 23 06:40:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Mon Dec 13 00:38:28 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
-          Fixed incorrect usage of iterator, thanks to Sebastien Roy
-          <sroy@positron.qc.ca> for reporting this. This fixes bugzilla
-          id [1911].
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
 
-Sun Aug 22 10:04:33 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Removed ACE_HAS_TK macros. Removed static linkage with
+          ACE_TkReactor. Applied for dynamic loading of reactor framework
+          to TkReactor.
 
-        * tao/DynamicAny.mpc:
+        Mon Dec 13 00:37:45 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Changed to not inherit from valuetype.
+        * tao/tk_resource.i (Module):
+        * tao/tk_resource.h (Module):
+        * tao/tk_resource.cpp (Module):
+        * tao/tao_tkreactor.mpc (Module):
+        * tao/TAO_TkReactor_export.h (Module):
 
-Sun Aug 22 10:19:00 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Created TAO_TkReactor library with TAO_TkResourceFactory.
 
-        * tao/Wait_On_LF_No_Upcall.cpp:
-          Fixed compile error with Borland compiler
+        * tao/fl_resource.h (Module):
+        * tao/fl_resource.cpp (Module):
 
-Sun Aug 22 09:44:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+          Move #include "ace/FlReactor" from header to definition.
 
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/util/utl_global.cpp:
+        * tao/Strategies.mpc (Module):
 
-          Removed all support for '-Gv' and '-Sv' valuetype switches as per
-          [Bug 1908].
+          Removed explicite dependencies of TAO_Strategies on
+          TAO_TkReactor.
 
-Fri Aug 20 13:11:38 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        Sun Dec 12 23:38:40 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * orbsvcs/orbsvcs/Makefile.am:
+        * docs/Options.html (Message):
 
-          Updated.
+          Updated documentation on Advanced_Resource_Factory.
 
-        * orbsvcs/orbsvcs/ec_typed_events.mpc:
+        Sun Dec 12 23:01:58 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Changed to prepend "orbsvcs/" to export include path.
+        * tao/tao_flreactor.mpc (Module):
 
-Fri Aug 20 19:15:16 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          Created project for build TAO_FlReactor library.
 
-        * tao/Wait_On_LF_No_Upcall.cpp:
-        * tao/Wait_On_LF_No_Upcall.h:
+        * tao/xt_resource.h (Module):
+        * tao/xt_resource.cpp (Module):
+        * tao/qt_resource.h (Module):
+        * tao/qt_resource.cpp (Module):
 
-          Moved the classes within the TAO namespace. The TAO_* classes
-          have to die. New classes needs to go in TAO namespace.
+          Removed bug related with incorrect service class (was TAO, is
+          TAO_QtReactor or TAO_XtReactor) for exported Service_Objects and
+          Factories.
 
-        * tao/Transport.cpp:
-        * tao/Transport.h:
-        * tao/Transport.inl:
+        * tao/fl_resource.i (Module):
+        * tao/fl_resource.h (Module):
+        * tao/fl_resource.cpp (Module):
+        * tao/TAO_FlReactor_export.h (Module):
 
-          The Connection_Role enum is now in TAO namespace instead of the
-          the global namespace.
+          Create TAO_FlResourceFactory for ACE_FlReactor similar to
+          QtResourceFactory.
 
-        * tao/Acceptor_Impl.cpp:
-        * tao/Transport_Connector.cpp:
-        * tao/default_client.cpp:
+        * tao/Strategies.mpc (Module):
 
-          Changes that got propagated from above.
+          Removed explicite dependence on tao_flreactor.
 
-Fri Aug 20 10:36:57 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
 
-        * tao/Wait_On_LF_No_Upcall.h: Fix fuzz build errors from missing
-          /**/ on pre.h/post.h includes.
+          Removed ACE_HAS_FL macros. Removed static linkage with
+          ACE_FlReactor. Created framework for dynamic loading of GUI
+          reactors using ACE_DLL. Applied this framework for
+          FlReactor. This framework is needed to preserve compatibility
+          with previous TAO_AdvancedResourceFactory.
 
-Fri Aug 19 14:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/FL_Cube/test_i.h (Module):
+        * tests/FL_Cube/test_i.cpp (Module):
+        * tests/FL_Cube/server.cpp (Module):
+        * tests/FL_Cube/client.cpp (Module):
+        * examples/AMI/FL_Callback/progress.cpp (Module):
+        * examples/AMI/FL_Callback/Progress_i.h (Module):
+        * examples/AMI/FL_Callback/Progress_i.cpp (Module):
 
-        * tests/Bug_1670_Regression/Bug_1670_Regression.mpc:
-          Instead of adding -GH to the idlflags, use amh as base project, this
-          does the same and is much better to maintain
+          Removed ACE_HAS_FL macros.
 
-Fri Aug 19 14:43:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Sun Dec 12 15:12:41 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * tests/Bug_1568_Regression/Bug_1568_Regression.mpc:
-          Instead of adding -GH to the idlflags, use amh as base project, this
-          does the same and is much better to maintain
+        * .cvsignore (Module):
 
-Fri Aug 19 10:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          To stop cvs from complaining about unknown files.
 
-        * tao/Transport.h:
-          Removed not allowed comma at end of enum list
+        Sun Dec 12 14:44:53 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Fri Aug 20 02:15:42 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * TAOACE.mwc (Module):
 
-        * tao/Makefile.am:
+          Temporarily disabled some projects as MPC is now buggy.
 
-          Updated to account for addition of Wait_On_LF_No_Upcall.*
-          plus some improvements in MPC's automake support.
+        Sun Dec 12 01:14:03 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Fri Aug 20 09:27:00 UTC 2004  Martin Corino <mcorino@remedy.nl>
+        * tao/tao_xtreactor.mpc (Module):
+        * tao/tao_qtreactor.mpc (Module):
 
-        * tests/ORT/ORT.mpc:
-        * tests/Bug_1670_Regression/Bug_1670_Regression.mpc:
-        * tests/Bug_1568_Regression/Bug_1568_Regression.mpc:
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc:
-          Removed outdated -Gv IDL option according to [Bug 1908].
+          Added header and inline files to project.
 
-Thu Aug 19 23:28:25 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * tao/Strategies.mpc (Module):
 
-        * tao/Acceptor_Impl.cpp:
+          Created dependence on tao_tkreactor and tao_flreactor. To be
+          removed when tao_flresource and tao_tkresource will be
+          avalaible.
 
-          Include "Transport.h" to pull in "TAO_SERVER_ROLE" enumeration
-          member definition.
+        * tests/FL_Cube/FL_Cube.mpc (Module):
+        * examples/AMI/FL_Callback/progress.cpp (Module):
 
-Thu Aug 19 22:00:39 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Fixed a bug related with undefined stdio functions.
 
-        * orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc:
-        * orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc:
-        * orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc:
+        * examples/AMI/FL_Callback/Peer_i.cpp (Module):
 
-          Fixed incorrect base project.  "orbsvcslib", not "orbsvcsexe".
-          Addresses problems related to missing directories in the
-          preprocessor include path.
+          Fixed a bug related with undefined sleep function.
 
-          Removed unecessary base projects from client projects.
+        * examples/AMI/FL_Callback/FL_Callback.mpc (Module):
 
-Thu Aug 19 16:49:24 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+          Created dependence on tao_flreactor. To be removed when
+          tao_flresource will be available.
 
-        * tao/Wait_On_LF_No_Upcall.h:
-        * tao/Wait_On_LF_No_Upcall.cpp:
-        * tao/tao.mpc:
+        Fri Dec 10 01:04:12 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Created new wait strategy that combines features of Wait_On_Read
-          and Wait_On_Leader_Follower.  This strategy re-enters the
-          leader-follower, but does not permit nested upcalls on the
-          requesting thread while waiting for a reply.  Other threads are
-          permitted to operate normally.  The strategy was motivated by
-          the need to recognize connections opened in the client role and
-          closed by the far side.  Using Wait_On_Read, the closure would
-          only be recognized the next time an invocation gets made that
-          goes through that connection.  Notably in the notification
-          service, there is a _narrow() that causes an invocation on an
-          object, and that connection never gets reused.  Thus, it sits in
-          CLOSE_WAIT consuming a file descriptor for the rest of the
-          process.
-
-          Implementing this required modifications to other files to
-          allocate and honor a flag set by this wait strategy.
-
-        * docs/Options.html:
-
-          Added documentation on the new wait strategy.
-
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * tao/Strategies/DIOP_Connection_Handler.cpp:
-        * tao/Strategies/SCIOP_Connection_Handler.cpp:
-        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
-        * tao/Strategies/UIOP_Connection_Handler.cpp:
-        * tao/Transport.h:
-        * tao/Transport.cpp:
-        * tao/Transport.inl:
-        * tao/Transport_Connector.cpp:
-        * tao/Connection_Handler.h:
-        * tao/Connection_Handler.inl:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.cpp:
-        * tao/Connection_Handler.cpp:
-        * tao/IIOP_Connection_Handler.cpp:
-        * tao/Acceptor_Impl.cpp:
-        * tao/default_client.cpp:
-        * tao/default_client.h:
-        * tao/Thread_Per_Connection_Handler.cpp:
+        * tests/Xt_Stopwatch/.cvsignore (Module):
 
-          Updated to cooperate with the new wait strategy.  Note that some
-          refactoring in the Connection_Handler requires changes in any
-          pluggable transport's derived Connection_Handler in order to
-          participate in this wait strategy.
+          Created few ignores to make cvs silent.
 
-Thu Aug 19 01:54:51 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        Fri Dec 10 00:45:22 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h:
+        * tests/QtTests/.cvsignore (Module):
+        * utils/catior/.cvsignore (Module):
 
-          Fixed some syntax errors that MSVC++ 6 let slip through.
+          Created few ignores to make cvs silent.
 
-Thu Aug 19 08:49:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Xt_Stopwatch/svc.conf.xml (Module):
+        * tests/Xt_Stopwatch/svc.conf (Module):
 
-        * tao/BiDir_GIOP/BiDirGIOP.h:
-          Corrected comment after #endif
+          Changed shared library wher XtResourceFactory is to be looked
+          for.
 
-Thu Aug 19 08:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Xt_Stopwatch/timer.h (Module):
+        * tests/Xt_Stopwatch/timer.cpp (Module):
+        * tests/Xt_Stopwatch/test_i.h (Module):
+        * tests/Xt_Stopwatch/test_i.cpp (Module):
+        * tests/Xt_Stopwatch/server.cpp (Module):
+        * tests/Xt_Stopwatch/client.cpp (Module):
+        * tests/Xt_Stopwatch/Xt_Stopwatch.mpc (Module):
+        * tests/Xt_Stopwatch/Stopwatch_display.h (Module):
+        * tests/Xt_Stopwatch/Stopwatch_display.cpp (Module):
+        * tests/Xt_Stopwatch/Control.h (Module):
+        * tests/Xt_Stopwatch/Control.cpp (Module):
+        * tests/Xt_Stopwatch/Client.h (Module):
 
-        * PROBLEM-REPORT-FORM:
-          Ask for the default.features file used by MPC.
+          Removed ACE_HAS_XT macros.
 
-Wed Aug 18 23:09:29 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * tao/TAO_XtReactor_export.h (Module):
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl:
+          Created export macros for TAO_XtRector library.
 
-          Due MSVC++ 6's inability to correctly deduce the function
-          template specialization to use based on the function argument,
-          resort to explicitly calling the type-specific
-          TAO::SSLIOP::OpenSSL trait function instead.  Once we drop
-          support for MSVC++ 6, we can go back to using the function
-          templates so that the code can be cleaner once again.
+        * tao/xt_resource.h (Module):
+        * tao/xt_resource.cpp (Module):
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h:
+          Removed ACE_HAS_XT macros. Applied export macros for
+          XtResourceFactory.
 
-          Added new _duplicate() static trait function.  MSVC++ 6 couldn't
-          handle the function templates in the TAO::SSLIOP namespace so
-          resort to reproducing code in each specialization.
+        * tao/tao_xtreactor.mpc (Module):
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp (copy):
+          Derived tao_xtreactor from all needed base projects.
 
-          Not all versions of OpenSSL declare the RSAPrivateKey_dup()
-          function in the global namespace.  Remove the global "::"
-          namespace qualifier to fix a compile-time error when using those
-          versions of OpenSSL.
+        Fri Dec 10 00:40:11 2004  Marek Brudka  <mbrudka@aster.pl>
 
-Wed Aug 18 10:41:03 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tests/QtTests/README (Module):
 
-        * TAO_IDL/be/be_visitor_component/component.cpp:
+          Described a problem with ORB shutdown.
 
-          Changed context state in switch case labels to correspond with
-          changes in
+        * tests/QtTests/svc.conf.xml (Module):
+        * tests/QtTests/svc.conf (Module):
 
-          Tue Aug 17 15:48:28 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Change shared library where QtResource factory can be found from
+          TAO to TAO_QtReactor.
 
-Wed Aug 18 08:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/QtTests/server.cpp (Module):
+        * tests/QtTests/client.cpp (Module):
 
-        * tao/ORB_Core.h:
-          Converted some old style documentation to doxygen style
+          Removed silly mistake related with removing ACE_HAS_QT macros.
 
-Wed Aug 18 06:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Tue Dec  7 20:48:26 2004  Marek Brudka  <mbrudka@aster.pl>
 
-        * tao/Strategies/SCIOP_Connector.{h,cpp}:
-          Fixed compile errors in sctp enabled builds. Now the ATL builds
-          are online again, these reported some errors.
+        * tao/tao_qtreactor.mpc (Module):
+        * tao/qt_resource.h (Module):
+        * tao/TAO_QtReactor_export.h (Module):
 
-Tue Aug 17 21:33:35 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Created and applied export macros for TAO_QtReactor.
 
-        * orbsvcs/orbsvcs/CosNaming.mpc:
+        Mon Dec  6 00:35:59 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Removed explicit libs and after statements for messaging, since
-          project allready inherits from messaging base project.
+        * TAO_IDL/.cvsignore (Module):
 
-Tue Aug 17 21:16:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          To remove cvs warnings.
 
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
+        Sun Dec  5 23:17:46 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Changed to inherit from corba_messaging instead of providing
-          requires statement to eliminate duplicate entries in list.
+        * tests/QtTests/test_i.h (Module):
+        * tests/QtTests/test_i.cpp (Module):
+        * tests/QtTests/server.cpp (Module):
+        * tests/QtTests/server.cpp (Module):
+        * tests/QtTests/client.h (Module):
+        * tests/QtTests/client.cpp (Module):
+        * tao/qt_resource.h (Module):
+        * tao/qt_resource.cpp (Module):
 
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-        * orbsvcs/orbsvcs/Security.mpc:
+          Removed dependencies on ACE_HAS_QT. Compilation is now managed
+          by MPC.
 
-          Changed to inherit from interceptors instead of providing
-          requires statements to eliminate duplicate entries in list.
+        * tests/QtTests/QtTests.mpc (Module):
 
-Tue Aug 17 17:32:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Removed explicite dependencies on qt. They are managed now by qt
+          based projects.
 
-        * {docs,examples,orbsvcs,performance-tests,utils}/.../*.{cpp,h,idl}:
+        Fri Dec  3 23:15:18 2004  Marek Brudka  <mbrudka@aster.pl>
 
-          Changed #include <orbsvcs/orbsvcs/...> to #include <orbsvcs/...>.
+        * tao/tao_xtreactor.mpc (Added):
+        * tao/tao_qtreactor.mpc (Added):
+        * tests/QtTests/QtTests.mpc (Modified):
+        * tao/tao.mpc (Modified):
 
-Tue Aug 17 17:56:23 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Initial changes related with the separation of reactors into
+          distinct libraries.  Many thanks to Raphael Bossek
+          <raphael.bossek@gmx.de> for this patch.
 
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_component/component.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/fe/fe_interface_header.cpp:
-        * TAO_IDL/include/utl_err.h:
-        * TAO_IDL/util/utl_err.cpp:
+Sat Jan 22 12:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Eliminated the error message generated when a component is
-          supporting an abstract interface - it was mistakenly assumed
-          that such a thing was barred by the spec. Once this error
-          was eliminated, other changes were required to support the
-          new 'feature'.
+        * orbsvcs/orbsvcs/Shutdown_Utilities.{h,cpp}:
+          Moved implementation of Shutdown_Functor from header file
+          to cpp file to fix link errors with Cygwin. Thanks to
+          to Mike McGahan <mcgahan at sparta dot com> for reporting this.
+          This fixes bugzilla id [2036].
 
-Tue Aug 17 15:48:28 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+Fri Jan 21 17:10:31 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * TAO_IDL/be/be_interface.cpp:
+        * orbsvcs/orbsvcs/FTORB.mpc:
+        * orbsvcs/orbsvcs/FaultTolerance.mpc:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
 
-          Changed the logic of the check for 'mixed parentage'
-          (abstract & concrete) in an interface, to return true not
-          only if an interface has an immediate abstract parent (as
-          before) but also if there is an abstract interface
-          anywhere in its ancestry. This is necessary for skeletons-side
-          code generation, since abstract interfaces have no operations
-          generated on the skeleton side for children to inherit, the
-          operations must be regenerated in each child.
-
-        * 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/interceptors_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:
-
-          For the gen_abstract_ops_helper() static method in each of the
-          above visitors, changed the logic to do nothing unless the
-          base interface passed to the method is abstract. The check
-          has been moved here from its former location in the method
-          call so operations inherited from distance abstract ancestors
-          can be found and regenerated. Thanks to Markus Stenberg
-          <markus.stenberg@conformiq.com> for sending in an example that
-          uncovered the bug.
+          Added Pkgconfig_Files definitions.
 
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be_include/be_valuetype.h:
+Fri Jan 21 18:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Removed unused code.
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
 
-Tue Aug 17 11:40:05 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Used VMCID while trying to propogate system exception with minor
+          code.
 
-        * TAO_IDL/be/be_visitor_root/root.cpp:
+Fri Jan 21 08:42:19 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Added generation of '\n' as the very last thing that
-          happens in each generated file, to make absolutely
-          sure every file ends with a newline (required by CVS
-          and some compilers). Thanks to
-          Markus Stenberg <markus.stenberg@conformiq.com> for
-          reporting the problem in *S.inl when -Sp (suppression
-          of thru-POA collocation code) is in effect.
+        * tao/ORB.cpp (ORB_init):
 
-Mon Aug 16 23:56:21 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Reverted change that stored return value
+          TAO_default_environment() in a reference to a
+          CORBA::Environment.  MSVC++ 6 couldn't grok it.
 
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
+Fri Jan 21 10:11:29 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-          Changed FTRT_EventChannel project to inherit from core.
+        * orbsvcs/tests/FT_App/FT_App.mpc:
 
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
+          Corrected a typo in the 'after' setting.
 
-          Changed RTCosScheduling project to inherit from core.
+Fri Jan 21 09:50:40 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-Tue Aug 17 06:49:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/examples/ImR/Combined_Service/run_test.pl:
 
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-          Fixed member initialisation order warning
+          Changed the final TerminateWaitKill()'s to Kill()'s as I should
+          have done originally.
 
-Mon Aug 16 23:35:00 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Fri Jan 21 13:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * configure.ac:
+        * orbsvcs/orbsvcs/Event/RT_Task.cpp:
+          Added needed include for Solaris 10 build
 
-          Update to configure orbsvcs/tests/F*.
+Fri Jan 21 13:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/tests/Makefile.am:
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+          When ORBDottedDecimalAddresses is set to 1, then also respect
+          this for SHMIOP. The endpoint created then also contains the
+          ip address instead of the hostname. This is the same behaviour
+          as for IIOP. On Windows we default to using ip addresses because
+          DNS is often broken on Windows systems, SHMIOP didn't respected
+          this behaviour which caused test failures on our Windows build
+          systems at the moment our DNS server was crashed. This fixes
+          bugzilla bug [2033].
 
-          Update to build new tests.
+Fri Jan 21 12:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/tests/FT_App/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am:
-        * orbsvcs/tests/FtRtEvent/Makefile.am:
+        * tao/Strategies/SHMIOP_Connector.cpp:
+          Improved debug messages to make formatting consistent
+          and give a little more info what the problem is.
 
-          New files.
+Thu Jan 20 17:23:27 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/orbsvcs/AV.mpc:
         * orbsvcs/orbsvcs/CosConcurrency.mpc:
         * orbsvcs/orbsvcs/CosEvent.mpc:
         * orbsvcs/orbsvcs/CosLifeCycle.mpc:
@@ -3727,380 +2651,54 @@ Mon Aug 16 23:35:00 2004  J.T. Conklin  <jtc@acorntoolworks.com>
         * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
         * orbsvcs/orbsvcs/DsLogAdmin.mpc:
         * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-        * orbsvcs/orbsvcs/FTORB.mpc:
-        * orbsvcs/orbsvcs/FaultTolerance.mpc:
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-        * orbsvcs/orbsvcs/PortableGroup.mpc:
-        * orbsvcs/orbsvcs/RTCORBAEvent.mpc:
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/RTSched.mpc:
-        * orbsvcs/orbsvcs/RT_Notification.mpc:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-        * orbsvcs/orbsvcs/Security.mpc:
+        * orbsvcs/orbsvcs/ETCL.mpc:
         * orbsvcs/orbsvcs/Svc_Utils.mpc:
 
-          Changed to prepend "orbsvcs/" to export include path.
-
-        * orbsvcs/Concurrency_Service/Makefile.am:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Dump_Schedule/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/LoadBalancer/Makefile.am:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-        * orbsvcs/Scheduling_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am:
-        * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am:
-        * orbsvcs/tests/AVStreams/Full_Profile/Makefile.am:
-        * orbsvcs/tests/AVStreams/Latency/Makefile.am:
-        * orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multicast/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am:
-        * orbsvcs/tests/AVStreams/Pluggable/Makefile.am:
-        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am:
-        * orbsvcs/tests/Bug_1334_Regression/Makefile.am:
-        * orbsvcs/tests/Concurrency/Makefile.am:
-        * orbsvcs/tests/CosEvent/Basic/Makefile.am:
-        * orbsvcs/tests/CosEvent/lib/Makefile.am:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/EC_MT_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Multiple/Makefile.am:
-        * orbsvcs/tests/EC_Throughput/Makefile.am:
-        * orbsvcs/tests/Event/Basic/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Common/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Complex/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Simple/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am:
-        * orbsvcs/tests/Event/Performance/Makefile.am:
-        * orbsvcs/tests/Event/lib/Makefile.am:
-
-          Updated to access orbsvcs headers with -I$(TAO_ROOT)/orbsvcs.:
-
-Mon Aug 16 16:45:06 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc:
-
-          Changed muf_client project to inherit from svc_utils.
-
-        * {docs,examples,orbsvcs,performance-tests,utils}/.../*.{cpp,h,idl}:
-
-          Changed #include "orbsvcs/orbsvcs/..." to #include "orbsvcs/...".
-
-Mon Aug 16 18:14:53 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Added Pkgconfig_Files definitions.
 
-        * TAO_IDL/be/be_interface.cpp (gen_stub_ctor):
+Thu Jan 20 16:22:42 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Fixed logic in generation of constructor taking stub and
-          servant, for abstract interfaces that inherit from other
-          abstract interfaces.
+        * TAO_IDL/be/be_visitor_typedef.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
 
-Mon Aug 16 16:31:19 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          In code generation for a typedef of an IDL array, added
+          a check for the case where the typedef is in the same
+          scope as the array. In such a case, we now generate the
+          local name for the declaration of the typedef's array
+          memory management functions, if it is declared in a
+          scope that is not global or a module (namespace). An
+          array + array typedef inside an interface (C++ class)
+          for example formerly generated static inline function
+          declarations which, when declared with the fully scoped
+          name inside the C++ class, caused a problem with some
+          compilers.
 
-        * TAO-INSTALL.html (href):
-
-          Addressed an additional concern from Dr. Schmidt regarding
-          broken documentation.
-
-Mon Aug 16 12:13:30 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * TAO-INSTALL.html (href):
-
-          Fixed some notes on .sln files generated for VC71.
-
-Sun Aug 15 18:16:00 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_decl.cpp:
-
-          Fixed minor bug in setting the default version to 1.0.
-
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h:
-        * TAO_IDL/driver/drv_preproc.cpp:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/util/utl_global.cpp:
-
-          - Moved code to create AST nodes for a struct and sequence
-            implied IDL for 'uses multiple' declarations from the
-            parser back to its original location in the CCM preprocessing
-            visitor.
-
-          - Added a command line option (-Sm) to suppress the CCM
-            preprocessing visitor, for use on IDL files that have
-            already had their CCM-related implied IDL converted explicitly.
-
-          - Added a flag to change the way the includes orb.idl,
-            Components.idl and *.pidl are handled. This flag can be set
-            to modify the default behavior by a plugin back end.
-
-Sun Aug 15 18:07:04 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * docs/compiler.html:
-        * docs/releasenotes/index.html:
-
-          Added items for a new IDL compiler command line option -Sm, that
-          disables the visitor that converts IDL3 constructs to the
-          equivalent IDL2. This option is for use in IDL files where such
-          conversions are already present explicitly, for example if the
-          IDL file is the product of a converstion tool.
-
-Sat Aug 14 20:21:34 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h (OpenSSL_traits):
-
-          Replaced primary template definition with a forward declaration.
-          OpenSSL data structure-specific traits should always
-          define/specialize their own traits template.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h (OpenSSL_traits):
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h (OpenSSL_traits):
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h (OpenSSL_traits):
-
-          More MSVC++ 6 brain damage.  MSVC++ 6 cannot handle
-          initialization of a static constant variable in the structure
-          declaration.  It considers non-zero initialization to be an
-          improper pure function specifier despite the fact no function is
-          declared in this case.  Define the constant inside an
-          enumeration instead to work around the problem.
-
-Sat Aug 14 18:17:59 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_interface.cpp:
-
-          In the traversal of the inheritance graph for components, changed
-          the algorithm so that CCMObject is processed before the base
-          component, if any. This move ensures that, in the generated
-          copy constructor in the skeleton class of the equivalent interface,
-          the calls to base class copy constructors will be generated in
-          the correct order. For compilers that are strict about this,
-          the correct order is depth-first pre-order on the inheritance
-          tree.
-
-Sat Aug 14 12:11:06 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp (is_loopback):
-
-          The "ACE_Sock_Connect" interim pseudo namespace no longer
-          exists.  Use the true "ACE" C++ namespace instead.  Fixes a
-          compile-time error.
-
-Fri Aug 13 23:58:50 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * tao/Thread_Per_Connection_Handler.cpp (svc):
-
-          The "ACE_Flag_Manip" pseudo namespace no longer exists, and was
-          not meant to be used in the long run in this code.  Use the true
-          "ACE" C++ namespace instead.
-
-Sat Aug 14 03:32:38 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Thu Jan 20 12:41:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tests/Bug_1904_Regression/test.cpp:
-
-          Fixed warnings in the daily builds.
-
-Fri Aug 13 11:06:43 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h (OpenSSL_st_var):
-
-          The types used as template parameters for this class template do
-          not inherit from a common base class so there is no need to
-          inherit from TAO_Base_var and declare undefined a TAO_Base_var
-          copy constructor and assignment operator to prevent widening
-          assignments.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl (OpenSSL_st_var):
-
-          Removed TAO_Base_var constructor call from the base member
-          initializer list.  This class no longer inherits from
-          TAO_Base_var.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h (Current_var):
-
-          Define this class in terms of the TAO::Pseudo_Var_T class
-          template instead of customized class.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp:
-
-          Removed the custom TAO::SSLIOP::Current_var class definition.
-          It is no longer needed.
-
-        * orbsvsc/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
-        * orbsvsc/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp:
-        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp:
-
-          Added missing explicit template instantiations for
-          TAO_Pseudo_Var_T template instances defined in the corresponding
-          headers of these files.  Fixes link-time errors in explicit
-          template instantiation builds.
-
-Fri Aug 13 17:46:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IOR_Parser.h:
-          Small doxygen tag improvements
-
-Fri Aug 13 10:25:25 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h (OpenSSL_traits):
-
-          Corrected doxygen documentation for this traits structure.
-          "@struct", not "@class".
-
-Fri Aug 13 10:17:46 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-          Remove PIDL_Files.  Thanks to Ossama Othman who let me know that
-          ssl_endpoint.pidl needn't be installed.
-
-Fri Aug 13 09:38:24 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h (copy):
-
-          Corrected function parameter.  It should have been "T const &",
-          not "T *".  This should fix a Borland C++ Builder X compile-time
-          problem.  Interestingly, g++ 3.4.1 did not complain about this
-          problem.
-
-Fri Aug 13 11:10:00 2004  Liang-Jui Shen <ls1@cec.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h:
-
-        My previous check-ins failed the tests. Therefore, I reverted to
-        the original version.
-
-Fri Aug 13 09:01:00 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-          Update to configure orbsvcs/tests/[A-E]*.
-
-        * orbsvcs/Makefile.am:
-          Update to build tests.
-
-        * orbsvcs/tests/Makefile.am
-        * orbsvcs/tests/AVStreams/Makefile.am:
-          Updated.
-
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am:
-        * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am:
-        * orbsvcs/tests/AVStreams/Full_Profile/Makefile.am:
-        * orbsvcs/tests/AVStreams/Latency/Makefile.am:
-        * orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multicast/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am:
-        * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am:
-        * orbsvcs/tests/AVStreams/Pluggable/Makefile.am:
-        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am:
-        * orbsvcs/tests/Bug_1334_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_1393_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_1630_Regression/Makefile.am:
-        * orbsvcs/tests/Concurrency/Makefile.am:
-        * orbsvcs/tests/CosEvent/Makefile.am:
-        * orbsvcs/tests/CosEvent/Basic/Makefile.am:
-        * orbsvcs/tests/CosEvent/lib/Makefile.am:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/EC_MT_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Mcast/Makefile.am:
-        * orbsvcs/tests/EC_Multiple/Makefile.am:
-        * orbsvcs/tests/EC_Throughput/Makefile.am:
-        * orbsvcs/tests/Event/Makefile.am:
-        * orbsvcs/tests/Event/Basic/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Common/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Complex/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Simple/Makefile.am:
-        * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am:
-        * orbsvcs/tests/Event/Performance/Makefile.am:
-        * orbsvcs/tests/Event/lib/Makefile.am:
-          New files, built with a little help from MPC.
-
-Fri Aug 13 09:30:54 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * orbsvcs/tests/ior_corbaname/README:
+        * tao/Makefile.am:
 
-          Fixed a typo in the instructions. Thanks to TG <groth dot th at
-          nord-com dot net>.
+          Removed directory prefixes from pkgconfig_DATA definitions.
 
-Fri Aug 13 12:48:48 2004  Simon McQueen  <sm@prismtechnologies.com>
+Thu Jan 20 18:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/fe/fe_lookup.cpp (lookup):
-          Fixed warning in Linux builds.
+        * tao/Strategies/SHMIOP_Endpoint.cpp (set):
+          Added more debug messages just like in IIOP_Endpoint
 
-        * tests/Bug_1904_Regression/test.mpc:
-          Added missing $Id tag.
+        * tao/Strategies/SHMIOP_Endpoint.h:
+          Doxygen improvements
 
-Fri Aug 13 00:46:24 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Jan 20 16:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Makefile.am:
-          Update to account for Ossama's SSLIOP changes.
+        * tao/IIOP_Acceptor.cpp:
+          Updated debug messages so that we use the same formatting throughtout
+          TAO
 
-        * configure.ac:
-          Update to configure orbsvcs/performance-tests/*.
-
-        * orbsvcs/Makefile.am:
-          Update to build performance-tests.
-
-        * orbsvcs/performance-tests/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-          New files, built with a little help from MPC.
-
-Thu Aug 12 21:00:22 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Thu Jan 20 06:42:31 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/orbsvcs/Makefile.am:
         * tao/Makefile.am:
-          Update, with a little help from MPC.
 
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
+          Regenerate.
+
         * tao/BiDir_GIOP.mpc:
         * tao/Domain.mpc:
         * tao/DynamicAny.mpc:
@@ -4121,1722 +2719,1499 @@ Thu Aug 12 21:00:22 2004  J.T. Conklin  <jtc@acorntoolworks.com>
         * tao/Utils.mpc:
         * tao/Valuetype.mpc:
         * tao/tao.mpc:
-          Use new PIDL_Files custom file type so that *.pidl files are
-          known to MPC.  This will be used by the automake template so
-          *.pidl files are installed.
-
-Thu Aug 12 19:21:25 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-
-          Removed SSLIOPS.cpp from the source file list.  No unconstrained
-          interfaces are defined in the SSLIOP.idl IDL file, meaning that
-          there is no need to compile and link the corresponding
-          skeleton file.
-
-Thu Aug 12 18:45:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
-
-          Added new OpenSSL "SSL" data structure constructor parameter,
-          and accompanying cached member.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
-          (ClientCredentials):
-
-          Initialize new SSL data structure member with given SSL
-          argument.
-
-          (parent_credentials, client_authentication, integrity):
-
-          Implemented these methods.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (ssliop_connect):
-
-          Do not widen the retrieved OwnCredentials pointer to a
-          Credentials pointer.  We really want to retain the narrower
-          interface for later use.  Furthermore, it is more correct to
-          store an OwnCredentials reference in an endpoint rather than one
-          that has been widened to a Credentials reference.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
-
-          Cosmetic updates.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
-          (client_credentials):
-
-          Pass the underlying SSL data structur to the ClientCredentials
-          constructor.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h:
-
-          The types that were defined in these files are now implemented
-          in terms of the new TAO::SSLIOP::OpenSSL_st_T<> template.
-          Reduces code duplication and maintenance burden.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i:
-
-          Cache and return an OwnCredentials reference, not a wider
-          Credentials reference.  It is more correct to use the former.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl:
-
-          New template used to implement a "_var" class for OpenSSL data
-          structures such as "X509, EVP_PKEY" and "SSL".
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
-
-          Corrected typo in documentation.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h:
-
-          New files containing TAO::SSLIOP::SSL_var typdef and
-          accompanying explicit template instantiations.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.inl:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.inl:
-
-          Removed these files.  They are no longer used.
 
-Thu Aug 12 17:52:36 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Added Pkgconfig_Files definitions.
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp (operator==):
+Thu Jan 20 07:53:44 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-          Cast away the const-ness of the right hand side argument before
-          invoking its non-const cred_type() method.  The method in
-          question doesn't modify the object so doing so is not violating
-          any "immutability contract".  Fixes a compile-time error.
+        * orbsvcs/examples/ImR/Combined_Service/run_test.pl:
 
-Thu Aug 12 17:51:52 2004  Simon McQueen  <sm@prismtechnologies.com>
+          Attempt to ensure that no processes are left running when the
+          script completes.
 
-        * TAO_IDL/fe/fe_lookup.cpp (lookup):
-          Added test for matching string lengths to prevent incorrect
-          identification of non-keyword strings as c++ keywords.
-
-          This fixes bugzilla #1904.
-
-        * tests/Bug_1904_Regression/test.cpp:
-        * tests/Bug_1904_Regression/test.idl:
-        * tests/Bug_1904_Regression/test.mpc:
-
-          Regression test for the above.
-
-Thu Aug 12 11:56:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IIOP_Transport.cpp:
-        * tao/Codeset_Manager.cpp:
-          Smaller debug message formatting so that things look the same and
-          that it is directly clear where the message is coming from when
-          reading a log.
-
-        * tao/IIOP_Transport.cpp (set_bidir_context_info):
-          After we retrieved all listen_points check that the list is
-          empty, if it is, we really have a problem and we report it.
-
-        * tao/IIOP_Connection_Handler.cpp (process_listen_point_list):
-          This method processes the listen_point_list, when we are here we
-          should have a list with something in it, when the client has a
-          misconfigured DNS, it can be that an empty list is send by the
-          client because in TAO_IIOP_Transport::get_listen_point we only
-          add endpoints there that match the local address and when we have
-          misconfigured this, this check could fail and we could send an
-          empty list.
-
-Thu Aug 12 10:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Big_Oneways/server.cpp:
-        * tests/Big_Oneways/Session_Control.cpp:
-          Added a few more debug lines to the shutdown process, so that we
-          can see how far we get when this test fails.
-
-Thu Aug 12 09:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp:
-          When catching an exception, tell whether it is in the client or
-          server task. When an event loop ends, also tell which loop it is.
-
-Thu Aug 12 09:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/AMI_Buffering/admin.cpp:
-        * tests/AMI_Buffering/client.cpp:
-        * tests/AMI_Buffering/server.cpp:
-          When catching an exception, tell whether it is in the client,
-          admin or server.
-
-        * tests/Faults/client.cpp:
-        * tests/Faults/middle.cpp:
-        * tests/Faults/ping.cpp:
-        * tests/Faults/server.cpp:
-          When catching an exception, tell whether it is in the client,
-          ping, admin or server. When an event loop ends, also tell which
-          loop it is.
-
-Wed Aug 11 22:28:47 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/CSI.idl:
-        * orbsvcs/orbsvcs/CSIIOP.idl:
-        * orbsvcs/orbsvcs/SecurityLevel3.idl:
-
-          Fixed fuzz errors.
-
-Wed Aug 11 18:54:35 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-          Update, with help from the latest version of automake.mpd.
-          Adds resource files to EXTRA_DIST, and installs *.idl files.
-
-Wed Aug 11 15:34:59 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp:
-
-          Remove explicit namespace qualifier from base class constructor
-          call in the base member initializer list due to MSVC++ 6 brain
-          damage.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp (operator==):
-
-          Added missing SSLIOP Credentials attribute checks.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp:
-
-          Coding style updates.
-
-Wed Aug 11 14:54:31 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-        * docs/ORBEndpoint.html:
-
-          Improved documentation with additional examples and fixed a few
-          typos. Thanks to Jules Colding <jules at tdcadsl dot dk> for
-          motivating this.
-
-Wed Aug 11 09:36:16 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-         * docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc:
-         * docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc:
-         * docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc:
-         * docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc:
-         * examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc:
-         * examples/OBV/Typed_Events/Typed_Events.mpc:
-         * examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
-         * examples/POA/DSI/POA_DSI.mpc:
-         * examples/POA/Default_Servant/POA_Default_Servant.mpc:
-         * examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
-         * examples/POA/FindPOA/POA_FindPOA.mpc:
-         * examples/POA/Forwarding/POA_Forwarding.mpc:
-         * examples/POA/Generic_Servant/POA_Generic_Servant.mpc:
-         * examples/POA/Loader/POA_Loader.mpc:
-         * examples/POA/NewPOA/POA_NewPOA.mpc:
-         * examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
-         * examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc:
-         * examples/POA/POA_BiDir/POA_BiDir.mpc:
-         * examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc:
-         * examples/POA/TIE/POA_TIE.mpc:
-         * examples/Quoter/Quoter.mpc:
-         * examples/TypeCode_Creation/TypeCode_Creation.mpc:
-         * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-         * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc:
-         * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc:
-         * orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc:
-         * orbsvcs/examples/ORT/ORT.mpc:
-         * orbsvcs/orbsvcs/CosEvent.mpc:
-         * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
-         * orbsvcs/orbsvcs/FaultTolerance.mpc:
-         * orbsvcs/orbsvcs/FtRtEvent.mpc:
-         * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc:
-         * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc:
-         * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc:
-         * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc:
-         * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc:
-         * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc:
-         * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
-         * orbsvcs/tests/Bug_1630_Regression/test.mpc:
-         * orbsvcs/tests/FT_App/FT_App.mpc:
-         * orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc:
-         * orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc:
-         * orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc:
-         * orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc:
-         * orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc:
-         * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc:
-         * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
-         * performance-tests/Latency/DII/DII.mpc:
-         * performance-tests/Latency/DSI/DSI.mpc:
-         * performance-tests/Latency/Deferred/Deferred.mpc:
-         * performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc:
-         * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc:
-         * performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc:
-         * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc:
-         * performance-tests/Sequence_Latency/DII/DII.mpc:
-         * performance-tests/Sequence_Latency/DSI/DSI.mpc:
-         * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
-         * tao/DynamicInterface.mpc:
-         * tests/Bug_1636_Regression/test.mpc:
-         * tests/POA/Default_Servant/Default_Servant.mpc:
-         * tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc:
-         * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc:
-         * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc:
-         * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc:
-         * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc:
-         * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc:
-         * tests/RTCORBA/Policies/Policies.mpc:
-         * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc:
-         * tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc:
-         * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc:
-         * tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc:
-         * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc:
-         * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc:
-
-           Changed to inherit from minimum_corba instead of providing
-           avoids statements to eliminate duplicate entries in list.
-
-Wed Aug 11 13:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Oneway_Buffering/admin.cpp:
-        * tests/Oneway_Buffering/client.cpp:
-        * tests/Oneway_Buffering/server.cpp:
-          When catching an exception, tell whether it is in the client,
-          admin or server.
-
-Wed Aug 11 09:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/POA.h:
-          Updated documentation to doxygen style
-
-Wed Aug 11 09:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ImplRepo.pidl:
-          Updated documentation to doxygen style
+Thu Jan 20 07:41:04 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-Wed Aug 11 07:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp:
+        * tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp:
 
-        * orbsvcs/tests/Notify/Basic/Basic.mpc:
-        * orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc:
-          Removed naming as base project, the notifytests base used is also
-          based on naming
+          Supply the ACE_ENV_... to ORB::shutdown() to support non-native
+          exception builds.
 
-Tue Aug 10 18:33:30 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tests/GIOP_Fragments/Java_Big_Request/server.cpp:
+        * tests/GIOP_Fragments/PMB_With_Fragments/server.cpp:
 
-        * configure.ac:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/LoadBalancer/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-          Initial support for user-configurable features (ssl, rt_corba,
-          minimum_corba, etc.) with automake conditionals.  Conditional
-          values are currently hard-coded in configure.ac and will have
-          to be replaced by --with-* and --enable-* options.
+          Added #include "ace/OS_NS_stdio.h" to avoid build problems with
+          inline=0.
 
-Tue Aug 10 17:56:00 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+Thu Jan 20 06:57:40 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * TAO_IDL/be/be_interface.cpp:
+        * orbsvcs/tests/Property/client.cpp:
+        * performance-tests/Callback/client.cpp:
+        * performance-tests/Latency/AMI/client.cpp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp:
+        * tests/MT_BiDir/client.cpp:
+        * tests/Portable_Interceptors/Benchmark/client.cpp:
+        * tests/Smart_Proxies/Benchmark/client.cpp:
 
-          Fixed bug in the inheritance graph traversal algorithm
-          that was sometimes failing to enqueue CCMObject and therefore
-          also its parents Navigation, Receptacles, and Events. Thanks
-          to Matthew Gillen <mgillen@bbn.com> for pointing out
-          resulting runtime error in the generated skeleton operation
-          table.
+          Changed debug messages from printing "server" to "client".
 
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+Thu Jan 20 00:47:58 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Fixed bug where the stub export macro was getting generated
-          on the skeleton side.
+        * tests/Collocation_Tests/Hello.cpp (get_string):
 
-        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
+          Fixed syntax error caused by renaming of TAO_ORB_Table class to
+          TAO::ORB_Table (see below).  Note that TAO::ORB_Table is only
+          meant to be used internally by TAO.
 
-          Cosmetic changes to source code.
+Wed Jan 19 11:44:48 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+        * tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h:
+        * tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc:
+        * tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc:
+        * tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h:
+        * tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc:
+        * tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h:
 
-          Removed generation of collocation classes for abstract interfaces
-          in the skeleton header file, since they are not generated in
-          the skeleton source file, thus causing a link error. For
-          abstract interfaces, all the code related to their operations
-          is duplicated in code generation for concrete interfaces
-          deriving from them, at least on the skeleton side, so no code
-          generation is required on the skeleton side at all for
-          abstract interfaces.
+          Got rid of fuzz errors.
 
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp:
+Wed Jan 19 09:31:05 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Fixed a bug in code generation of the copy constructor for
-          a valuetype that supports an abstract interface.
+        * tao/ORB.cpp:
+        * tao/ORB.h:
+        * tao/ORBInitializer_Registry.cpp:
+        * tao/ORBInitializer_Registry.h:
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Table.cpp:
+        * tao/ORB_Table.h:
+        * tao/ORB_Table.inl:
+        * tao/TAO_Internal.cpp:
+        * tao/TAO_Internal.h:
 
-Tue Aug 10 13:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Fixed a deadlock that occurred when daemonizing an ORB process
+          via "-ORBDaemon" by making locking finer grained and not abusing
+          the ACE_Static_Object_Lock.  The problem only appears to occur
+          on (NPTL-based?) Linux installations. Thanks to Ken Sedgwick
+          <ken at bonsai dot com> for pointing out the problem.
 
-        * tao/BiDir_GIOP/BiDirPolicy_Validator.h:
-          Use unique ifdef defines
+          Moved some static functions into the TAO::ORB namespace and some
+          global variables into an anonymous namespace since they are
+          used internal to TAO.
 
-Tue Aug 10 12:54:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jan 19 10:01:57 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tests/Bug_1476_Regression/Client_Task.cpp:
-        * tests/Bug_1476_Regression/Sender_i.h:
-          Fixed compile errors with emulated exceptions
+        * TAO_IDL/be/be_visitor_typedef.cpp:
+        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
 
-Tue Aug 10 10:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Fixed a bug in code generation when both an array (which
+          is declared in generated code as a typedef) and a typedef
+          of the array are declared inside another data type which
+          is not a module. In such a case, the *_alloc(), *_dup(),
+          *_copy() and *_free() functions must be static. Also,
+          the empty struct *_tag (used as a template parameter)
+          was not being declared for the typedef of the array, along
+          with the *_slice, *_var, *_out, and *_forany typedefs.
+          Thanks to Johnny Willemsen <jwillemsen@remedy.nl> and
+          Thomas Groth <groth.th@nord-com.net> for reporting the bug
+          and submitting the example IDL that demonstrated the problem.
 
-        * NEWS:
-          Updated that the fixes for bug 1476 aren't planned anymore but
-          will be visible in the x.4.3 release
+        * tests/IDL_Test/array.idl:
 
-Tue Aug 10 08:13:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added the submitted IDL mentioned above to the IDL test
+          for arrays.
 
-        * tests/Bug_1476_Regression/*:
-          New regression test for bug 1476. This tests that when using
-          oneways with sync_none policy applied the ORB doesn't block
-          on connection establishment. To be able to run this test you
-          must have a long connection establishment time, this isn't
-          the case on localhost, so run client and server far far from
-          away. Because of this, this test isn't able to run in our
-          daily builds.
+Wed Jan 19 15:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Aug 10 00:41:10 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * tao/Strategies/SHMIOP_Endpoint.cpp:
+          Fixed compile error
 
-        * utils/nslist/nslist.cpp (display_endpoint_info):
+Wed Jan 19 08:24:36 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-          Fixed compile-time error.  "CORBA::is_nil()", not
-          "CORBA::Object::is_nil()".
+        * tao/GIOP_Message_Base.h:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/GIOP_Message_Generator_Parser.h:
+        * tao/GIOP_Message_Generator_Parser_10.h:
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+        * tao/GIOP_Message_Generator_Parser_12.h:
+        * tao/GIOP_Message_Generator_Parser_12.cpp:
+        * tao/GIOP_Message_Generator_Parser_Impl.inl:
+        * tao/GIOP_Message_Lite.h:
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/GIOP_Message_State.h:
+        * tao/GIOP_Message_State.cpp:
+        * tao/Incoming_Message_Queue.h:
+        * tao/Incoming_Message_Queue.inl:
+        * tao/Incoming_Message_Queue.cpp:
+        * tao/Pluggable_Messaging.h:
+        * tao/Transport.h:
+        * tao/Transport.cpp:
 
-Mon Aug  9 23:31:45 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+          Adding an alternate implementation of PMB and an implementation of
+          GIOP fragment handling that only consolidates fragments when the
+          last one is received.
+
+          Partial GIOP messages are accumulated in a message block within
+          the TAO_Transport until a sufficient amount of data is collected.
+          At that point, processing occurs as usual.
+
+        * tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h:
+        * tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp:
+        * tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc:
+        * tests/GIOP_Fragments/Java_Big_Reply/Test.idl:
+        * tests/GIOP_Fragments/Java_Big_Reply/client.cpp:
+        * tests/GIOP_Fragments/Java_Big_Reply/run_test.pl:
+        * tests/GIOP_Fragments/Java_Big_Reply/server.java:
+        * tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc:
+        * tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h:
+        * tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp:
+        * tests/GIOP_Fragments/Java_Big_Request/Test.idl:
+        * tests/GIOP_Fragments/Java_Big_Request/client.java:
+        * tests/GIOP_Fragments/Java_Big_Request/run_test.pl:
+        * tests/GIOP_Fragments/Java_Big_Request/server.cpp:
+
+          When the Java client/server is run using the JDK ORB, it will
+          fragment the GIOP messages to exercise the GIOP fragment handling
+          code in TAO.
+
+        * tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc:
+        * tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h:
+        * tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp:
+        * tests/GIOP_Fragments/PMB_With_Fragments/Test.idl:
+        * tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl:
+        * tests/GIOP_Fragments/PMB_With_Fragments/giop1.2_fragments.dat:
+        * tests/GIOP_Fragments/PMB_With_Fragments/giop1.2_fragments.layout:
+        * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl:
+        * tests/GIOP_Fragments/PMB_With_Fragments/server.cpp:
+
+          This test uses canned GIOP 1.2 fragment data and exercises the PMB
+          code as well as GIOP fragment handling code.
+
+Wed Jan 19 12:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/SHMIOP_Endpoint.cpp:
+        * tao/Strategies/SHMIOP_Profile.cpp:
+          Replaced ACE casts with their C++ versions
+
+Tue Jan 18 19:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Strategies/SHMIOP_Connector.cpp:
+          Use ACE_ERROR/LM_ERROR to print out error messages instead of
+          ACE_DEBUG/LM_DEBUG, makes it easier to search for messages
+          in the log
+
+Tue Jan 18 19:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Strategies/SHMIOP_Connector.cpp:
+          Replaced ACE casts with their C++ versions
+
+Thu Jan 13 13:50:26 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+
+          - Replaced calls to an interface's virtual marshal() method
+            with calls to TAO::Objref_Traits<>::marshal(), which
+            in turn calls the static methjod CORBA::Object::Marshal(),
+            which does a check for null reference. Most of these
+            replacements had been done some time ago, these were
+            evidently overlooked. This fix closes [BUGID:2027].
+            Thanks to Jiang Wei <jiangwei_1976@yahoo.com.cn> for
+            reporting the marshaling failure of empty object
+            references in a sequence.
+
+          - Made generated CORBA::Boolean values more consistent about
+            assigning or returniong 'true' or 'false' rather than
+            '1' or '0'.
+
+        * tao/Valuetype/AbstractBase.cpp:
+
+          Added a check to the CDR stream output operator for null
+          _ptr value. If a null is found, the operator marshals a
+          discriminator value of 1 (corresponding to an object reference)
+          and an empty type hint (this last is similar to the behavior
+          of CORBA::Object::marshal()).
 
-        * orbsvcs/PSS/PSDL_Scope.cpp:
-          Change call to ACE_OS::to_lower() to ACE_OS::ace_tolower()
-          to adapt to API change.
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/ValueBase.cpp:
 
-Mon Aug  9 17:43:33 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Made CORBA::Boolean values more consistent about assigning or
+          returning 'true' or 'false' rather than '1' or '0'. Also
+          changed evaluation of CDR stream operations to use '!' instead
+          of '== 0'.
 
-        * tao/Utils/Servant_Var.inl:
+        * tests/IDL_Test/IDL_Test.mpc:
 
-          Include "tao/Exception.h" to pull CORBA::Exception declaration.
-          Fixes a compile-time error regarding an incomplete
-          CORBA::Exception type in a catch() statement.
+          Shortened file to use wildcards instead of listing file names.
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl:
+Thu Jan 13 11:55:55 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Renamed TAO::SSLIOP::Credentials class to
-          TAO::SSLIOP_Credentials, i.e. moved it one namespace level up.
-          Brain damaged MSVC++ 6 cannot handle calling base class
-          constructors of classes declared in a nested namespace inside a
-          sub-class base member initializer.
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h:
+          Include "ace/OS_NS_unistd.h" to pull in ACE_OS::getpid()
+          declaration.
 
-          Updated these sources to refer to the renamed
-          TAO::SSLIOP_Credentials class.
+          Replaced ACE_static_cast macro usage with standard C++
+          static_cast<>.
 
-Mon Aug  9 12:16:50 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+Thu Jan 13 11:52:55 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * tao/BD_String_Argument_T.cpp:
+        * orbsvcs/tests/Concurrency/CC_command.cpp (execute):
 
-          Fixed incorrect placement of #if TAO_HAS_INTERCEPTORS == 1
-          guard.
+          Use "fgetc (stdin)" instead of "getchar ()".  ACE doesn't wrap
+          the latter.  Fixes a build error.
 
-Mon Aug  9 15:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jan 13 01:07:11 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.{h,cpp}:
-          Updated these files because of the interface changes of the base class
+        * tao/PortableServer/POA.h (objectkey_prefix):
+        * tao/PortableServer/POA.cpp (objectkey_prefix):
 
-Mon Aug  9 11:51:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Changed this static array is to be an array of constant
+          CORBA::Octets of instead of an array of non-constant
+          CORBA::Octets.  The former is what was intended.  Also provides
+          compiler with additional optimization opportunities.
 
-        Integration of the fixes for bug 1476. In short, when making oneway
-        calls with sync_none policy applied, the ORB shouldn't block, this was
-        working for all calls, except for the first call, the connection
-        establishment blocked and violated the meaning of sync_none. All changes
-        below are there to also don't block on the first call, but just queue
-        the messages until the transport is connection. Thanks to Bala for
-        helping with this.
+Wed Jan 12 23:01:24 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        Fri Aug  6 15:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp:
 
-                * tao/IIOP_Connector:
-                * tao/SCIOP_Connection:
-                * tao/UIOP_Connector:
-                * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
-                * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
-                  As last step in the make_connection register the transport with the
-                  reactor when the transport is connected. When it is not connected it
-                  will or happen in the Transport_Connector when there the connection
-                  is established or in the Transport::post_open when the transport is
-                  connected and we have outgoing data.
+          Fixed spelling typo.
 
-        Fri Aug  6 15:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Portable_Interceptors/PolicyFactory/server.cpp:
 
-                * tao/IIOP_Connector.cpp (make_connection):
-                * tao/Transport_Connector.cpp (connect):
-                  Corrected method name in debug statement
+          Cosmetic change.
 
-        Fri Aug  6 14:58:18 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Wed Jan 12 22:36:58 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-                * tao/IIOP_Connector.cpp:
-                * tao/Transport_Connector.cpp:
+        * tao/ObjRefTemplate/ORT_Adapter_Impl.h (tao_ort_template_):
 
-                  Test for is_connected () before registration.
+          Removed this attribute.  A local variable within the activate()
+          method is all that is needed.
 
-        Fri Aug  6 14:11:10 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          (ORT_Adapter_Impl):
 
-                * tao/IIOP_Connection_Handler.cpp:
+          Removed default constructor declaration.  The compiler generated
+          one will now suffice since all remaining class members define
+          suitable default constructors.
 
-                  Cosmetic fix.
+        * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp:
 
-                * tao/IIOP_Connector.cpp:
+          Coding convention improvements.
 
-                  Register handler after the caching the transport.
+          (ORT_Adapter_Impl):
 
-                * tao/Transport.cpp:
+          Removed default constructor implementation.  See default
+          constructor declaration removal description above.
 
-                  Register handler if there is a non-empty queue. then call
-                  schedule_wakeup (). Added locks to prevents races.
+          (activate):
 
-                  Removed locks from format_queue_message (), since I think its
-                  not necessary.
+          Fixed invalid widening assignment from
+          PortableInterceptor::ObjectReferenceTemplate_var to
+          PortableInterceptor::ObjectReferenceFactory_var.
 
-                * tao/Transport.inl:
+        * tao/PortableServer/ORT_Adapter.h (release):
 
-                  Added a lock to is_connected (). This introduces a lock on the
-                  critical path. We need to think about this later.
+          Added this new pure virtual method.  It allows the POA to
+          explicitly release an ObjectReferenceTemplate instance without
+          pulling in valuetype related code.
 
-                * tao/Transport_Connector.cpp:
+        * tao/PortableServer/POA.cpp (destroy_i):
 
-                  Added code to register the handler with the reactor.
+          Fixed memory leak related to tricky ObjectReferenceTemplate
+          memory management.
 
-        Fri Aug  6 13:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PortableServer/POA.h:
 
-                * tao/IIOP_Connection_Handler.cpp:
-                  Removed duplicate include
+          Cosmetic improvement.
 
-                * ace/Thread_Per_Connection_Handler.cpp:
-                  Corrected classname in debug statement
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.h:
+        * tao/RTCORBA/Priority_Mapping_Manager.h:
+        * tao/RTScheduling/Current.h:
+        * tao/RTScheduling/RTScheduler_Manager.h:
 
-        Thu Aug  5 08:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Changed all TAO-specific "_var" classes to inherit privately,
+          rather than publicly, from TAO_Base_var.  Public inheritance in
+          this case is not correct since (1) the TAO-specific "_var"
+          classes are not meant to satisfy an "IS-A" relationship with
+          TAO_Base_var, and (2) since it allows some invalid widening
+          assignments to occur.
 
-                * tao/Invocation_Adapter.{h,cpp}:
-                  Renamed set_sync_policy to set_response_flags, we are setting
-                  the response flags using sync_policy for oneways. Also, when
-                  having a twoway set the correct response_flags, this was done
-                  later in the twoday invocation, but the response_flags are
-                  SYNC_NONE by default, resulting that all twoways used a non
-                  blocking connect. By setting the response_flags earlier, the
-                  blocked member of the profile transport resolver is set
-                  to the correct value
+        * tao/Valuetype/Value_VarOut_T.h (TAO_Value_Var_T):
 
-                * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
-                  Corrected some errors
+          Inherit privately from TAO_Base_var and declare a private copy
+          constructor and assignment operator that accept a reference to a
+          constant TAO_Base_var.  Prevents invalid widening assignments.
 
-                * tao/Transport.cpp:
-                  When we are not connected, also purge us from the connection
-                  cache. When we are connected, the connection closure will do this
-                  but not when we are not connected. Use in recache_transport() the
-                  this->purge_entry() call to reduce code duplication
+        * tao/Valuetype/Value_VarOut_T.cpp (TAO_Value_Var_T):
 
-                * tao/IIOP_Connector:
-                * tao/SCIOP_Connection:
-                * tao/UIOP_Connector:
-                * orbsvcs/orbsvcs/SSLIOP_Connector.cpp:
-                * orbsvcs/orbsvcs/IIOP_SSL_Connector.cpp:
-                  When the connect() calls return -1, only when errno == EWOULDBLOCK
-                  we wait for completion, for other errno's we have to set
-                  transport to zero, because the transport is not usable in that
-                  case and we just don't have a connection then.
+          Explicitly initialize TAO_Base_var base class in base member
+          initializer list of copy constructor.
 
-        Wed Aug  4 09:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/tests/Concurrency/CC_command.cpp (execute):
 
-                * orbsvs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
-                * orbsvs/orbsvcs/SSLIOP/SSLIOP_Connector.{h,cpp}:
-                * orbsvs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-                  Updated for changes. These files wheren't added to my original
-                  branch and they where recently changed by Ossame, so make a new
-                  branch bug1476 on the head, so that I can merge all changes in one
-                  action to the main
+          Replaced use of insecure gets() function call with one to
+          getchar().  The latter is all that is needed since only one
+          character is needed from stdin.
 
-        Wed Aug  4 09:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jan 12 19:53:06 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-                * tao/IIOP_Connector.cpp:
-                  Fixed typo in debug line
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
 
-                * tao/IIOP_Connector.h:
-                  Added virtual to cancel_svc_handler() to show that this is a virtual
-                  method.
+          Changed to not crash if ior file can not be opened.
 
-                * tao/Strategies/DIOP_Connection_Handler.cpp:
-                * tao/Strategies/SCIOP_Connection_Handler.cpp:
-                * tao/Strategies/SHMIOP_Connection_Handler.cpp:
-                * tao/Strategies/UIOP_Connection_Handler.cpp:
-                * tao/Strategies/DIOP_Connector.{h,cpp}:
-                * tao/Strategies/SCIOP_Connector.{h,cpp}:
-                * tao/Strategies/SHMIOP_Connector.{h,cpp}:
-                * tao/Strategies/UIOP_Connector.{h,cpp}:
-                  Updated these protocols with all changes we did in the base classes
+          Added '-p' command line option to write process id to file.
 
-        Tue Aug  3 11:56:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jan 12 15:57:30 2005 Huang-Ming Huang <hh1@cse.wustl.edu>
 
-                  An overview of the changes in the pluggable transport interface
-                  which has to be done in all pluggable transports:
-                  * Connection_Handler::open(), instead of setting just the id of the
-                    transport, call transport::post_open() with the id, this will set
-                    the id, mark the transport as connected, register the transport with
-                    the reactor and in case there is data in the outgoing queue it
-                    will also schedule the transport for output.
-                  * Connection_Handler::close(), check the implementation of this
-                    method, it should in most cases sufficient to just call
-                    this->close_handler().
-                  * Connector::make_connection(), check using the profile transport
-                    resolver whether to make a blocked connect or non blocked. A non
-                    blocked is done when making oneways with sync_none policy applied.
-                    In case the connect returns -1 and errno == EWOULDBLOCK use the
-                    base method wait_for_connection_completion to wait for the
-                    connection to be established. Don't register here anymore the
-                    transport with the reactor, this is already done in your derived
-                    Connection_Handler::open() by calling the post_open()
-                  * Connector::cancel_svc_handler, a new method that must be
-                    implemented by each pluggable protocol to cancel the connection
-                    handler from the connector.
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRT_Group_Manager.cpp
 
-        Tue Aug  3 09:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Remove_Invocation.cpp:
-                  Removed debug comment
-
-        Tue Aug  3 09:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.{h,cpp}:
-                * tao/IIOP_Connector.cpp:
-                  Changed signature of wait_for_connection_completion, pass transport
-                  as *&, so that is can be set to 0 when not usable and return a bool
-                  whether succeeded or not.
-
-        Tue Aug  3 08:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.h:
-                  Corrected link to pluggable protocols documentation
-
-        Mon Aug  2 18:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport_Connector.cpp:
-                  Added wait_for_connection_completion() which now contains the code
-                  from connect that handles the waiting until the connection is
-                  completed. The only thing is the result value, maybe add a bool as
-                  return value and pass Transport by *&, what about that?
-
-                * tao/IIOP_Connector.cpp:
-                  Use the new Transport_Connector::wait_for_connection_completion
-                  instead of doing everything here again
-
-        Mon Aug  2 13:52:27 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-                * tao/Transport_Connector.cpp (connect):
-
-                  Left some comments for Johnny.
-
-        Mon Aug  2 09:45:36 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Transport.h:
-                  Added a todo that event_handler_i has to be renamed to event_handler
+          Fixed unused variable warning. Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for pointing out.
 
-                * tao/Transport.cpp (send_message_shared_i):
-                  Use ACE_ERROR for a fatal message instead of a debug
+Tue Jan 11 23:19:33 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-        Mon Aug  2 09:16:36 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/GIOP_Message_Base.cpp:
 
-                * tao/Transport_Connector.cpp (connect):
-                  Refactored this method so that checking for errors is easier, seems
-                  to me that part of this method can be factored out again and can
-                  then also be called from IIOP_Connector::make_connection(). Added
-                  some remarks for Bala, in case we do a wait of zero on a non
-                  blocking connection, how to handle any return value?
+          Fixed a debug output which was appearing without the debug level
+          being set. Thanks to Lother Werzinger for reporting this.
 
-        Mon Aug  2 07:54:36 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jan 11 20:44:30 2005 Huang-Ming Huang <hh1@cse.wustl.edu>
 
-                * tao/Transport.{h,cpp}:
-                  Changed the result value type of post_open from int to bool. In case
-                  registration succeeds and we have data in our outgoing queue,
-                  schedule ourselves for output.
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRT_Group_Manager.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGRMaker.h
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGRMaker.cpp
 
-                * tao/IIOP_Connection_Handler.cpp:
-                  Check the result value of post_open. In case this fails, we return
-                  -1, the setting of the state to success, is now moved after the
-                  post_open.
+          Fixed problem with the scenario when the secondary event
+          channel crashes and a new backup joins in the object group.
+          Thanks to Thia Chang Chao <tchangch@dso.org.sg> for reporting
+          the problem.
 
-                * tao/IIOP_Connector.cpp:
-                  Added a comment for Bala. Only call check_connection_closure when
-                  wait return -1.
+        * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+        * orbsvcs/FTRT_Event_Service/ftec
+        * orbsvcs/FTRT_Event_Service/supplier
 
-                * tao/Transport_Connector.{h,cpp}:
-                  Only when wait fails call check_connection_closure. Removed the
-                  result argument from this method, the caller should only call this
-                  when wait returns -1, clarified the return value meaning. Removed
-                  the printing of errno when connection establishment fails, shouldn't
-                  we do the same in TAO_IIOP_Connector::make_connection()?
+          Added debug options.
 
-                  Not all comments of Bala below are handled yet, handling
-                  of connection failures must still be improved.
+Tue Jan 11 14:49:40 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        Mon Aug  2 03:40:36 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * TAO_IDL/driver/drv_preproc.cpp:
 
-                * tao/Transport_Connector.cpp:
+          Added close of temporary file created only inside
+          #ifndef ACE_LACKS_MKSTEMP guard. Thanks to
+          M. C. Gahan <mcgahan@sparta.com> for reporting the
+          problem of the dangling descriptor. This fix closes
+          [BUGID:2026].
 
-                  Fixed a logic error and added a few comments for Johnny.
+Tue Jan 11 12:17:26 2005  Chad Elliott  <elliott_c@ociweb.com>
 
-                * tao/IIOP_Connection_Handler.cpp:
-                * tao/IIOP_Connector.cpp:
-                * tao/Transport.cpp:
-                * tao/Transport_Connector.h:
+        * orbsvcs/orbsvcs/CosNaming.mpc:
 
-                  More comments for Johnny.
+          List the naming_serv_export.h instead of Naming_Server.h.
+          Naming_Server.h gets added automatically.
 
-        Fri Jul 30 10:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/FaultTolerance.mpc:
 
-                * tao/Transport.cpp:
-                * tao/Transport_Connector.cpp:
-                * tao/IIOP_Connector.cpp:
-                  Added some comments, removed commented out code
+          Removed a redundant listing of FT_CORBAC.cpp.
 
-                * tao/IIOP_Connection_Handler.cpp:
-                  Removed not needed include which I added during my changes but is
-                  now not needed anymore
+        * orbsvcs/orbsvcs/RTEvent.mpc:
 
-                * tao/Invocation_Endpoint_Selectors.cpp:
-                  Removed comments and changed the logic of selecting an endpoint, if
-                  one isn't usable not break but try the next.
+          Moved two files listed in Source_Files into Template_Files as they
+          are template cpp files.
 
-        Thu Jul 29 13:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/RTOLDEvent.mpc:
 
-                * tao/Transport_Connector.cpp:
-                  Removed not needed include
+          Removed the listing of RTOldEvent.rc.  MPC will now detect that it
+          belongs to the RTOLDEvent project due to case insensitivity for
+          resource files.
 
-        Thu Jul 29 13:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Jan 10 18:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Transport.{h,cpp}:
-                  Renamed set_connected to post_open, we do much more then just
-                  setting a property. When the transport is connected we register
-                  ourselves with the reactor. In case of failure we close the
-                  connection. The thing to check is whether it is safe to assume that
-                  we are also in the transport cache
+        * tao/ORB_Core.cpp:
+          When the IORInterceptor Adapter is requested but can't be
+          retrieved we throw an internal error. Added an ACE_ERROR in
+          front of it so that it is much easier to detect what went
+          wrong and caused the internal error
 
-                * tao/Transport_Connector.{h,cpp}:
-                  Removed register_transport() because the transport register itselves
-                  now. Also removed the calls to register_transport, we don't have to
-                  register the transport as connector anymore, the transport does
-                  that.
+Mon Jan 10 10:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/IIOP_Connector.cpp (make_connection):
-                  Removed the registration of the transport with the reactor, see
-                  above. Use a ACE_Event_Handler_var to make sure that we always do
-                  a remove reference on the connection handler.
+        * tao/Profile.h:
+          Doxygen improvements
 
-                * tao/IIOP_Connection_Handler.cpp (open):
-                  Call transport::post_open instead of set_connected
+Sun Jan  9 19:52:09 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        Thu Jul 29 10:00:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/Naming/README:
 
-                * tao/Transport.cpp (set_connected):
-                  Commented out schedule_output, this doesn't work, have to think
-                  about something else
+          Updated to note that Naming_Utils.{cpp,h} was split into
+          Naming_Client.{cpp,h} and Naming_Server.{cpp,h}.
 
-                * tao/Transport_Connector.cpp (connect):
-                  When we get a connected transport out of the transport cache it can
-                  happen that another thread drove the reactor and set the transport
-                  to connected, but then it is not registered with the reactor, so add
-                  a check here that when we get a connected transport and it is not
-                  registered it yet, register it.
+Sun Jan  9 19:36:24 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-                  In case we get a setup where the connection_handler::open() could
-                  safely register it, we could remove the checks above.
+        * orbsvcs/orbsvcs/Makefile.am:
 
-        Thu Jul 29 08:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Generate pkg-config *.pc files from templates.
 
-                * tao/Transport_Connector.cpp (connect):
-                  Added more error handling to handle situations where connections
-                  can't be established
+        * orbsvcs/orbsvcs/TAO_CosConcurrency.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosLifeCycle.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosLoadBalancing.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosProperty.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosTime.pc.in:
 
-        Wed Jul 28 15:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          New files, pkg-config *.pc templates.
 
-                * tao/Transport_Connector.{h,cpp}
-                  Added pure virtual cancel_svc_handler() method which must be
-                  implemented by derived connectors to cancel the passed svc_handler
-                  with their base connector, the cancel on the base_connector must
-                  have derived connection handler, so we just can't do it in the base.
-                  Another option would be to make Transport_Connector a template which
-                  gets the connection handler type as template argument.
-                  Added also check_connection_closure, which is now generic and can
-                  also be used from the connect() call.
+Sun Jan  9 12:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/IIOP_Connector.{h,cpp}:
-                  Implemented the cancel_svc_handler() and removed the
-                  check_connection_closure() because it is now in the base.
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/Servant_Location:
+          Moved the enum TAO_SERVANT_LOCATION to its own file.
 
-        Tue Jul 27 18:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Makefile.am:
+          Updated for change above
 
-                * tao/Connection_Handler.{h,cpp}:
-                  Added virtual close_handler() method, this will be called the the
-                  Transport_Connector and derived classes if they want to close the
-                  connection_handler, the default implementation changes the LF state
-                  to closed and removes a reference from the transport
+Sun Jan  9 11:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/IIOP_Connection_Handler.cpp (close):
-                  Instead of modifing the LF state and removing a reference from the
-                  transport, just call this->close_handler(), this calls the
-                  Connection_Handler::close_handler().
+        * tao/PortableServer/Object_Adapter.{h,cpp}:
+        * tao/PortableServer/Object_Adapter_Factory.{h,cpp}:
+          Moved TAO_Object_Adapter_Factory to its own file
 
-                  With this we can close handlers in a generic way from the
-                  Transport_Connectors.
+        * tao/PortableServer/PortableServer.cpp:
+          Added include of Object_Adapter_Factory.h
 
-                  When we would move a template class between
-                  the ACE_Svc_Handler template and the derived connection handlers,
-                  this extra template could implement the close method in a generic
-                  way, this would reduce the footprint a little.
+        * tao/RTPortableServer/RT_Object_Adapter_Factory.h:
+          Include Object_Adapter_Factory.h instead of Object_Adapter.h
 
-                * tao/IIO_Connector.cpp:
-                  Moved docu to the correct place
+        * tao/Makefile.am:
+          Updated for change above
 
-        Tue Jul 27 17:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sun Jan  9 10:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/IIOP_Connection_Handler.cpp:
-                  Instead of modifying the transport in several steps, just call
-                  set_connected which will do all work.
+        * tao/PortableServer/Default_Acceptor_Filter.cpp:
+          Fixed incorrect ACE_RCSID
 
-                * tao/Transport.{h,cpp,inl}:
-                  Removed the is_connected accessor, made a set_connected, which will
-                  set the id, set the connected_ bool and will schedule an output
-                  when the queue is not empty
+        * tao/PortableServer/Default_Acceptor_Filter.h:
+          Removed not needed push/pop for msvc
 
-        Tue Jul 27 12:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sun Jan  9 10:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Transport.{h,cpp}:
-                * tao/Synch_Invocation.cpp:
-                  Renamed queue_message to format_queue_message
+        * tao/PortableServer/Servant_Base.{h,cpp,i}:
+        * tao/PortableServer/Local_Servant_Base.{h,cpp,inl}:
+          Moved TAO_Local_ServantBase to its own file. Also changed
+          TAO_RefCountServantBase::_ref_count to
+          TAO_RefCountServantBase::_refcount_value, the first was TAO
+          specific, the second is defined by the corba spec. This fixes
+          bugzilla [1951]. Thanks to Frank Pilhofer <fp at mc dot com>
+          for reporting this
 
-        Tue Jul 27 12:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Makefile.am:
+          Updated for change above
 
-                * tao/Transport.{h,cpp}:
-                  Added out_stream() which returns the out_stream from the
-                  messaging_object, this way the invocation classes don't need to use
-                  messaging_object anymore, just get the stream from the transport
+Sat Jan  8 14:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Synch_Invocation.cpp:
-                * tao/Messaging/Asynch_Invocation.cpp:
-                * tao/LocateRequest_Invocation.cpp:
-                  Instead of getting the out_stream from the messaging_object which is
-                  retrieved from the transport, get it from the transport. This way we
-                  don't have to include tao/Pluggable_Messaging.h
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc:
+        * performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc:
+        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
+        * performance-tests/Sequence_Latency/DII/DII.mpc:
+        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+        * performance-tests/Sequence_Latency/AMI/ami.mpc:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc:
+        * performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc:
+        * tests/Bug_1330_Regression/Bug_1330_Regression.mpc:
+          Use taoserver instead of server as base project and use taoclient
+          for the client
 
-        Tue Jul 27 08:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Jan  7 22:46:31 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-                * tao/Transport_Connector.{h,cpp}:
-                  Factered out the registration of the transport into
-                  register_transport()
+        * orbsvcs/orbsvcs/Makefile.am:
 
-        Tue Jul 27 07:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Generate pkg-config *.pc files from templates.
+
+        * orbsvcs/orbsvcs/TAO_CosEvent.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosEvent_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosEvent_Skel.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosNaming.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosNaming_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosNaming_Skel.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosNotification.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosNotification_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosNotification_Skel.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosTrading.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosTrading_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_CosTrading_Skel.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsEventLogAdmin.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsEventLogAdmin_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsEventLogAdmin_Skel.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsLogAdmin.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsLogAdmin_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsLogAdmin_Skel.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsNotifyLogAdmin.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsNotifyLogAdmin_Serv.pc.in:
+        * orbsvcs/orbsvcs/TAO_DsNotifyLogAdmin_Skel.pc.in:
+        * orbsvcs/orbsvcs/TAO_ETCL.pc.in:
+        * orbsvcs/orbsvcs/TAO_Svc_Utils.pc.in:
+
+          New files, pkg-config *.pc templates.
+
+Fri Jan  7 19:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Two_Objects/Two_Objects.mpc:
+        * tests/Timeout/Timeout.mpc:
+        * tests/Single_Read/Single_Read.mpc:
+        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
+        * tests/Server_Leaks/Server_Leaks.mpc:
+        * tests/ORB_shutdown/Foo_Bar.mpc:
+        * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc:
+        * tests/OctetSeq/OctetSeq.mpc:
+        * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc:
+        * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc:
+        * tests/Native_Exceptions/Native_Exceptions.mpc:
+        * tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc:
+        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
+        * tests/Multiple/Multiple.mpc:
+        * tests/MT_Timeout/MT_Timeout.mpc:
+        * tests/Forwarding/Forwarding.mpc:
+        * tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc:
+        * tests/Crash_On_Write/Crash_On_Write.mpc:
+        * tests/Connection_Purging/Connection_Purging.mpc:
+        * tests/Connection_Failure/Connection_Failure.mpc:
+        * tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc:
+        * tests/Cache_Growth_Test/Cache_Growth_Test.mpc:
+        * tests/Bug_1627_Regression/test.mpc:
+        * tests/Abstract_Interface/Abstract_Interface.mpc:
+          Changed above mpc files by using the correct base project, derive
+          the server from taoserver, the client from taoclient. Some clients
+          did link S.cpp files which where not needed. Seems more mpc files
+          could be cleaned and simplified.
 
-                * tao/Sync_Invocation.cpp:
-                * tao/Transport.{h,cpp}:
-                  Changed queue_message so that transport does the formatting
+Fri Jan  7 18:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Tue Jul 27 02:47:18 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * tests/Client_Leaks/Client_Leaks.mpc:
+          Simplified this mpc file by using taoserver and taoclient base
+          projects
 
-                * tao/Synch_Invocation.cpp:
+Fri Jan  7 18:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                  Left some comments for Johnny.
+        * tests/Big_Request_Muxing/Big_Request_Muxing.mpc:
+          Simplified this mpc file by using taoserver and taoclient base
+          projects
 
-        Mon Jul 26 13:48:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Jan  7 18:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Synch_Invocation.cpp (remote_oneway):
-                  When queueing the message, stream it first else we just queue no
-                  message contents. The only question is how to handle the failure
-                  of the streaming
+        * tests/Hello/Hello.mpc:
+          Use taoserver and taoclient as base projects to simplify this file
 
-        Mon Jul 26 13:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Muxing/Muxing.mpc:
+        * tests/Big_Reply/Big_Reply.mpc:
+          Use taoserver and taoclient as base projects to simplify this file.
+          Added TestC.cpp explicitly to the client, so that we don't get
+          TestS.cpp and then we also don't need portableserver for the client
 
-                * tao/Transport.{h,cpp}:
-                  Moved cleaning up the queue out of destruction and
-                  send_connection_closed_notifications_i annd into the new method
-                  cleanup_queue_i which is called from these places
+Fri Jan  7 17:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/IIOP_Connection_Handler.cpp:
-                  Marked the transport as connected after we changed the state to
-                  success
+        * orbsvcs/orbsvcs/Event/Event_Channel.h:
+          Include ace/Unbounded_Set.h, not Unbound_Set_Ex.h because that
+          one has been removed
 
-                * tao/IIOP_Connector.cpp:
-                  We have to handle the timeout of wait, made an implementation, but
-                  with a remark to Bala to check this, not sure if this is the correct
-                  way todo.
+Fri Jan  7 14:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Mon Jul 26 11:38:41 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * tao/orb.idl:
+        * tao/orb_types.pidl:
+        * tao/orb_typesA.cpp:
+        * tao/orb_typesC.h:
+          Checked the CORBA spec, that ObjectId and ObjectIdList are not in the
+          CORBA module but are in CORBA::ORB. Both where defined in orb.idl
+          but shouldn't be there. So, removed ObjectId from orb_types and
+          ObjectIdList from orb_types. This way there is also no conflict
+          with the PortableServer::ObjectId
 
-                * tao/Transport.cpp (TAO_Transport):
+Fri Jan  7 12:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                  Left a comment for Johnny.
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/Event_Channel.{h,cpp}:
+        * orbsvcs/orbsvcs/Notify/Default_Factory.cpp:
+          Replaced ACE_Unbounded_Set_Ex with ACE_Unbounded_Set, the Ex version
+          gives the wrong feeling about safety when using it. This belongs to
+          the change below:
+          Thu Jan  6 08:24:39 2005  Carlos O'Ryan  <coryan@atdesk.com>
+          After a last check for ACE_Unbounded_Set_Ex this template will be
+          removed from ACE
 
-        Mon Jul 26 11:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h:
+          Replaced ACE_Unbounded_Set_Ex with ACE_Unbounded_Set in comments
 
-                * tao/Invocation_Adapter.cpp:
-                  Check for blocked or not blocked connection was wrong
+Fri Jan  7 08:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Transport_Connector.cpp:
-                  Corrected debug statement
+        * tao/ORB.h:
+        * tao/orb_typesC.h:
+        * tao/orb_typesA.cpp:
+          Temporarily commented out the ObjectId typedefs in the orb_typesC.h,
+          when someone uses using namespace CORBA and PortableServer we get
+          ambiguity because ObjectId is in the CORBA and PortableServer
+          namespace. Removed the typecode for ObjectId from ORB.h, it is not
+          in orb_types. When the POA refactoring is merged next month, the
+          ObjectId in the PortableServer namespace will move to the GOA
+          namespace (see MIOP specification) and we can enable the typedefs
+          again
 
-        Mon Jul 26 09:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jan  6 12:39:43 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-                * tao/Transport.cpp:
-                  In case we destruct a not connected transport it can happen that
-                  we have queued messages, zap these then from memory, we just can't
-                  deliver them.
+        * tao/Makefile.am:
 
-        Sat Jul 24 18:08:13 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+          Add Adapter_{Factory,Registry}.cpp to ORB_Core defn.
 
-                * tao/Connect_Strategy.h:
+Thu Jan  6 18:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                  Added a new wait () method which takes in a transport.
+        * tao/tao.mpc:
+          Fixed casing in orb_types filenames.
 
-                * tao/Blocked_Connect_Strategy.cpp:
-                * tao/Blocked_Connect_Strategy.h:
+Thu Jan  6 15:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                  Provided a default implementation for the new wait () method.
+        * tao/orb.idl:
+        * tao/Typecode_types.pidl:
+        * tao/orb_types.pidl:
+          Moved typecode stuff to Typecode_types.pidl and simple typedefs to
+          orb_types.pidl and include both new files again in orb.idl. Other
+          idl/pidl files which just need the typedefs or typecode stuff just
+          can then include the specific pidl file instead of orb.idl which
+          pulls in a lot more then really needed
 
-                * tao/LF_Connect_Strategy.cpp:
-                * tao/LF_Connect_Strategy.h:
-                * tao/Reactive_Connect_Strategy.cpp:
-                * tao/Reactive_Connect_Strategy.h:
+        * tao/ORB.h:
+          Removed typedefs that now are in orb_types.pidl, added a needed
+          forward declaration and removed some commented out code
 
-                  Provided an implementation of the new wait () method.
+        * tao/orb_typesA.cpp:
+        * tao/orb_typesC.{h,cpp,inl}:
+        * tao/orb_typesS.h:
+        * tao/Typecode_typesC.{h,cpp,inl}:
+        * tao/Typecode_typesS.h:
+          Added new generated files
 
-                * tao/Invocation_Adapter.h:
+        * tao/tao.mpc:
+          Added new fils
 
-                  Changed the setup_operation_details_i () to set_syncscope_policy
-                  () since that is what it does.
+        * tao/Makefile.am:
+          Added new files
 
-                * tao/Invocation_Adapter.cpp:
+        * tao/Typecode.{h,cpp}:
+          Removed things that are now in Typecode.pidl and included
+          the TypecodeC.h file instead.
 
-                  Changed the operation name in the implementation of the above
-                  method. Did a bunch of cosmetic changes to keep the line lengths
-                  smaller.
+        * tao/diffs/Typecode_types.diff:
+          New diff file
 
-                * tao/Profile_Transport_Resolver.h:
-                * tao/Profile_Transport_Resolver.inl:
+        * tao/Typecode_Constants.cpp:
+          Removed typecode for ORBid, it is now in orb_types
 
-                  Changed the name of the connected () method as blocked
-                  (). Improved const correctness so that the blocked_ data member
-                  is const.
+Thu Jan  6 08:24:39 2005  Carlos O'Ryan  <coryan@atdesk.com>
 
-                * tao/Invocation_Endpoint_Selectors.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i:
+          Use ACE_Unbounded_Set instead of ACE_Unbounded_Set_Ex.  The
+          latter is not thread-safe, and the bugs attributed to the former
+          (see http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1465)
+          are actually a user-configuration mistake.
 
-                  Use TAO::ProfileTransportResolver::blocked () instead of
-                  TAO::ProfileTransportResolver::connected ().
+Thu Jan  6 12:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Transport_Connector.cpp:
-                * tao/IIOP_Connector.cpp:
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.h:
+        * tao/RTCORBA/Priority_Mapping_Manager.h:
+          Removed not needed pragma push/pop for msvc
 
-                  Made a bunch of changes to improve readability of the code. Left
-                  a couple of questions for Johnny. There are a few more things
-                  that need to be addressed here.
+Thu Jan  6 11:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Fri Jul 22 09:54:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Adapter.{h,cpp}:
+        * tao/Adapter_Factory.{h,cpp}:
+        * tao/Adapter_Registry.{h,cpp}:
+          Moved TAO_Adapter_Registry and TAO_Adapter_Factory to its own file
 
-                * tao/IIOP_Connector.cpp (make_connection):
-                  Call the check_connection_closure only when we want to have a
-                  connected transport, for the non-blocking case we have to do
-                  something else because the return value of -1 doesn't mean there
-                  always the we have a problem just establishing this connection.
+        * tao/ORB_Core.{h,cpp}:
+        * tao/Internal.cpp:
+        * tao/IORTable/Table_Adapter.h:
+        * tao/PortableServer/Object_Adapter.h:
+          Updated includes because of change above
 
-                * tao/IIOP_Connector.{h,cpp} (check_connection_closure):
-                  Changed method signature to have a return value
+        * tao/Makefile.am:
+        * tao/tao.mpc:
+          Added new files above
 
-        Fri Jul 22 09:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jan  6 09:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Transport_Connector.cpp (connect):
-                  When getting a transport out of the cache, print out whether it is
-                  connected or not
+          Checkin of separate footprint issue. This has no influence at the
+          other code, so committed this. When the POA refactoring is merged
+          the ImplRepo code will move to another new library
 
-        Thu Jul 21 15:03:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PortableServer/ImplRepo.pidl:
+        * tao/PortableServer/ServerObject.pidl:
+        * tao/PortableServer/ImplRepoA.cpp:
+        * tao/PortableServer/ImplRepoC.{h,cpp,i,inl}:
+        * tao/PortableServer/ImplRepoS.{h,cpp,i,inl}:
+          Moved the ServerObject interface to its own idl file so
+          that when someone just uses the ServerObject stub and
+          the ImplRepo proxy, he doesn't link in the ImplRepo stub
+          which is big.
+
+        * tao/PortableServer/ServerObjectA.cpp:
+        * tao/PortableServer/ServerObjectC.{h,cpp,inl}:
+        * tao/PortableServer/ServerObjectS.{h,cpp,inl}:
+          New generated files
 
-                * tao/IIOP_Connector.cpp (make_connection):
-                  Use timeout to change the sync_options, this way we don't change
-                  the bitmask
+        * tao/PortableSever/ImplRepo_i.h:
+          Replaced include of ImplRepoS.h with ServerObjectS.h
 
-        Thu Jul 21 14:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PortableServer/POA.cpp:
+          Added include of ImplRepoC.h
 
-                * tao/ORB_Core.h:
-                  Removed the transport_cache accessor method, it was just declared
-                  and not implemented, the ORB_Core know nothing about this
+        * tao/Makefile.am:
+          Added new files above
 
-        Thu Jul 21 13:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Jan  6 09:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Transport_Connector.cpp:
-                  In case we have a not connected transport we should look if we need
-                  to deliver a connected transport or not and behave accordingly to it
+        * tao/PortableServer/PortableServer_include.pidl:
+        * tao/PortableServer/PortableServer_includeS.h:
+        * tao/PortableServer/PortableServer_includeC.h:
+          Added new files. These will be used soon, we will prevent
+          the including of PortableServerC.h soon, users should include
+          PortableServer.h to make sure the PortableServer library is
+          loaded. Some users include PortableServer.pidl, they should
+          include this new PortableServer_include.pidl instead else they
+          get compile errors in the future
 
-        Wed Jul 20 15:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Makefile.am:
+          Added new files above
 
-                * tao/TAO_Server_Request.cpp:
-                  Updated all ACE_DEBUG and ACE_ERROR macros so that the formatting of
-                  messages is the same as in the rest of TAO. This makes reading the
-                  logfiles much easier.
+Wed Jan  5 22:06:14 2005  Phil Mesnier  <mesnier_p@ociweb.com>
 
-        Wed Jul 20 14:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/UTF16_BOM_Translator.cpp (write_wstring):
 
-                * tao/IIOP_Connector.cpp (make_connection):
-                  Removed commented out code and only check for registration errors
-                  when we are calling the register_handler().
+          When writing a nul wstring in a GIOP 1.2 message, the translator
+          had been writing out a BOM. While this behavior was consistent
+          with the CORBA specification, and handled just fine by some
+          ORBs, others, specifically JDK's ORB, did not tolerate this. The
+          solution is to simply not write out a BOM when writing a zero
+          length wstring.
 
-        Wed Jul 20 11:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * interop-tests/wchar/client.cpp:
+        * interop-tests/wchar/Client.java:
+        * interop-tests/wchar/wchar_reference.cpp:
+        * interop-tests/wchar/WCharReference.java:
+        * interop-tests/wchar/README:
 
-                * tao/Transport_Connector.cpp:
-                  Changed some remarks, some are not valid, some need some more
-                  clarification
+          Added a new test case specifically for sending a nul wstring.
+          Thanks to Deiter Schneiders <dschneiders@lhs-systems.com> for
+          pointing this out.
 
-                * tao/IIOP_Connector.{h,cpp}:
-                  Moved the handling of connection closure to a new separate method
-                  check_connection_closure(). This contains code original in
-                  make_connection(). This code is dependent on the type of tranport
-                  used, so it can't move into the base class.
+Wed Jan  5 19:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Thu Jul  8 14:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.{h,cpp,i}:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.{h,cpp,i}:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.{h,cpp,i}:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.{h,cpp,i}:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.{h,cpp,i}:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.{h,cpp,i}:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.{h,cpp,i}:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.{h,cpp,i}:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.{h,cpp,i}:
+          Removed i/inl file, update h/cpp
 
-                * tao/IIOP_Connection_Handler.cpp (open):
-                  Set the transport to connected here. We should refactor the last
-                  lines of this method, these lines are copied in each different type
-                  of connection_handler.
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for change above
 
-                * tao/IIOP_Connector.cpp:
-                  Removed not needed code, just us is_connected() on the transport.
-                  Made a remark with the registration of the wait_strategy, do we need
-                  to do this here?
+Wed Jan  5 19:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Transport_Connector.cpp:
-                  Use the transport->is_connected() instead of the wait of the result.
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.{h,cpp,i,inl}:
+          Removed i/inl file, update h/cpp
 
-                  Thanks to Bala for getting me on the right track.
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for change above
 
-        Thu Jul  8 13:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jan  5 19:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/IIOP_Connector.cpp:
-                * tao/Transport_Connector.cpp:
-                  Some changes to handle the wait, but things are still not correct
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.{h,cpp,i}:
+        * orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.{h,cpp,i}:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.{h,cpp,i}:
+        * orbsvcs/orbsvcs/ESF/ESF_Worker.{h,cpp,i}:
+          Removed i file, update h/cpp
 
-                * tao/Transport.cpp:
-                  Initialize is_connected+ to false
+Wed Jan  5 19:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Thu Jul  8 11:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PortableServer/Key_Adapters.{h,cpp,i}:
+        * tao/PortableServer/POA_Policies.{h,cpp,i}:
+          Removed i file, update h/cpp
 
-                * tao/IIOP_Connector.cpp:
-                  Added some test code for how the handle the wait result value
+        * tao/Makefile.am:
+          Updated for change above
 
-                * tao/Transport_Connector.cpp:
-                  Added more logic what to do when a not connected transport is
-                  retrieved
+Wed Jan  5 19:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Mon Jul  5 12:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/Runtime_Scheduler.{h,cpp,i}:
+          Removed i file, update h/cpp
 
-                * tao/Transport.{h,cpp}:
-                  Removed commented out method in the header file and give purge_entry
-                  a return value, so that we can check for failure.
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for change above
 
-        Mon Jul  5 12:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jan  5 19:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/IIOP_Connector.cpp:
-                * tao/Transport_Connector.cpp:
-                * tao/Profile_Transport_Resolver.cpp:
-                  Added some documentation and added some question to some code parts
-                  to be sure that we check this
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+          Removed include of EC_ConsumerAdmin.i, this file is zapped and
+          it was completely wrong to include that file here.
 
-        Fri Jul  2 11:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jan  5 09:33:54 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-                * tao/Invocation_Adapter.{h,cpp}:
-                  Added setup_operation_details_i() which will setup the operation
-                  details and determine whether we want to block until a connection
-                  is ready or not, this removes duplicated code and we ony determine
-                  the settings once in the invocation path.
+        * tao/extra_core.mpb:
+        * tao/tao.mpc:
 
-        Thu Jul  1 12:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Removed the extra nested braces related to TAO_COMPONENTS
+          that create "subdirectories" in VC project files. In makefiles,
+          these "components" might be separately compiled but they won't
+          link, so the feature is not used on any platform. In VC projects,
+          the extra level of folders makes source and header files
+          much harder to locate in the GUI environment.
+
+Wed Jan  5 14:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/AMI/FL_Callback/Progress_i.{h,cpp,i}:
+        * examples/AMI/FL_Callback/Peer_i.{h,cpp,i}:
+        * tests/FL_Cube/test_i/{h,cpp,i}:
+        * tests/Object_Loader/Loader.{h,cpp,i}:
+        * tests/Object_Loader/Test_i.{h,cpp,i}:
+        * tests/QtTests/test_i.{h,cpp,i}:
+        * tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.i:
+        * tests/Timeout/test_i.{h,cpp,i}:
+        * tests/Xt_Stopwatch/test_i.{h,cpp,i}:
+        * orbsvcs/tests/EC_Throughput/ECT_Driver.{h,cpp,i}:
+        * orbsvcs/tests/Notify/lib/Supplier_T.{h,cpp,i}:
+        * orbsvcs/tests/Notify/lib/Peer_T.{h,cpp,i}:
+        * orbsvcs/tests/Notify/lib/Consumer_T.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
 
-                * tao/Transport_Connector.{h,cpp}:
-                  Removed the block argument from the make_connection and connect
-                  method again, if we should get a connected transport or not can be
-                  retrieved from the ProfileTransportResolver
+        * orbsvcs/tests/EC_Throughput/Makefile.am:
+          Updated for changes above
+
+Wed Jan  5 13:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Valuetype/ValueFactory.{h,cpp,inl}:
+        * tao/Valuetype/ValueFactory_Map.{h,cpp,inl}:
+        * tao/Valuetype/Value_VarOut_T.{h,cpp,inl}:
+          Removed inl file and updated h/cpp file.
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for changes above
+
+Wed Jan  5 13:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/default_client.{h,cpp,i}:
+        * tao/default_server.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for changes above
+
+Wed Jan  5 11:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/Builder.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Default_Factory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/EventChannel.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/EventChannelFactory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Proxy_T.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/RT_Builder.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/RT_Factory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/RT_Notify_Service.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/RT_POA_Helper.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Refcountable.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Timer_Queue.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Timer_Reactor.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Worker_Task.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Notify/Any/PushSupplier.{h,cpp,inl}:
+          Removed inl file and updated h/cpp file.
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for changes above
+
+Wed Jan  5 11:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/SchedConfig_Scheduler.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedReconfig_Sched_Utils.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedReconfig_Sched_Utils_T.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedReconfig_Scheduler.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedReconfig_Scheduler_T.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedScheduler.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedScheduler_Generic.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedStrategy_Scheduler.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for changes above
+
+Wed Jan  5 11:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.{h,cpp,i}:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.{h,cpp,i}:
+        * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.{h,cpp,i}:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp:
+          Removed empty explicit instantiation block
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for changes above
+
+Wed Jan  5 11:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_And_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_ConsumerControl.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Event_Channel.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Factory.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Negation_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Null_Factory.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Sched_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_SupplierControl.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/EC_Type_Filter.{h,cpp,i}:
+        * orbsvcs/orbsvcs/Event/Local_ESTypes.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for changes above
+
+Wed Jan  5 10:50:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTPortableServer/RT_Acceptor_Filters.{h,cpp,i}:
+        * tao/RTPortableServer/RT_Collocation_Resolver.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
+
+        * tao/Makefile.am
+          Updated for changes above
+
+Wed Jan  5 10:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/Asynch_Reply_Dispatcher.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
+
+        * tao/Makefile.am
+          Updated for changes above
+
+Wed Jan  5 10:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/Continuous_Priority_Mapping.{h,cpp,i}:
+        * tao/RTCORBA/Direct_Priority_Mapping.{h,cpp,i}:
+        * tao/RTCORBA/Linear_Network_Priority_Mapping.{h,cpp,i}:
+        * tao/RTCORBA/Linear_Priority_Mapping.{h,cpp,i}:
+        * tao/RTCORBA/Multi_Priority_Mapping.{h,cpp,i}:
+        * tao/RTCORBA/Network_Priority_Mapping.{h,cpp,i}:
+        * tao/RTCORBA/Priority_Mapping.{h,cpp,i}:
+        * tao/RTCORBA/RT_Current.{h,cpp,i}:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.{h,cpp,i}:
+        * tao/RTCORBA/RT_Mutex.{h,cpp,i}:
+        * tao/RTCORBA/RT_ORB.{h,cpp,i}:
+        * tao/RTCORBA/RT_Policy_i.{h,cpp,i}:
+        * tao/RTCORBA/RT_Protocols_Hooks.{h,cpp,i}:
+        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.{h,cpp,i}:
+        * tao/RTCORBA/Thread_Pool.{h,cpp,i}:
+          All .i/.inl files above where empty, so removed them from the repo
+          and updated the h/cpp files to not include the removed file. In case
+          someone want to inline a method, must re-add the file at that moment
+          with the .inl extension. Also updated some wrong ACE_RCSID tags
+
+        * tao/Makefile.am
+          Updated for changes above
+
+Tue Jan  4 17:55:15 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-                * tao/Transport_Connector.cpp:
-                  In case we get a transport from the cache that is not connected,
-                  call wait with zero time. We have to add more functionality here
-                  to handle the closing of that transport, and check the
-                  implementation what we do when we can't register the wait strategy
-                  with the reactor
+        * Makefile.am:
+        * Release:
+        * configure.ac:
 
-                * tao/IIOP_Connector.{h,cpp}:
-                  Added better handling of blocking or non-blocking connects.
+          Updated for removal of tao-config.in and tao-config.1.in.
 
-        Thu Jul  1 10:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao-config.in:
+        * tao-config.1.in:
 
-                * tao/Transport.{h,inl}:
-                  Added connection_handler accessor function and made
-                  connetion_handler_i protected again
+          Removed.
 
-                * tao/Transport_Connector.cpp:
-                  Use Transport::connection_handler instead of the _i version.
+Tue Jan  4 20:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/DIOP_Connection_Handler.{h,cpp,i}:
+        * tao/Strategies/DIOP_Profile.{h,cpp,i}:
+        * tao/Strategies/DIOP_Transport.{h,cpp,i}:
+        * tao/Strategies/SCIOP_Connection_Handler.{h,cpp,i}:
+        * tao/Strategies/SCIOP_Profile.{h,cpp,i}:
+        * tao/Strategies/SCIOP_Transport.{h,cpp,i}:
+        * tao/Strategies/SHMIOP_Acceptor.{h,cpp,i}:
+        * tao/Strategies/SHMIOP_Connection_Handler.{h,cpp,inl}:
+        * tao/Strategies/SHMIOP_Profile.{h,cpp,i}:
+        * tao/Strategies/SHMIOP_Transport.{h,cpp,i}:
+        * tao/Strategies/UIOP_Connection_Handler.{h,cpp,inl}:
+        * tao/Strategies/UIOP_Endpoint.cpp
+        * tao/Strategies/UIOP_Endpoint.h
+        * tao/Strategies/UIOP_Profile.{h,cpp,i}:
+        * tao/Strategies/UIOP_Transport.{h,cpp,i}:
+        * tao/Strategies/advanced_resource.{h,cpp,i}:
+          All .i/.inl files above where empty, so removed them from the repo
+          and updated the h/cpp files to not include the removed file. In case
+          someone want to inline a method, must re-add the file at that moment
+          with the .inl extension
+
+        * tao/Makefile.am
+          Updated for changes above
+
+Tue Jan  4 19:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BiDir_GIOP/BiDirPolicyC.{h,cpp,i,inl}:
+          Regenerated and replace .i with .inl files
+
+        * tao/BiDir_GIOP/diffs/BiDirPolicy.diff:
+          Updated
+
+        * tao/Makefile.am
+          Updated for change above
+
+Tue Jan  4 19:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BiDir_GIOP/BiDir_Policy_i.{h,cpp,inl}:
+          Removed empty .inl file and updated cpp/h file for this
+
+        * tao/Makefile.am
+          Updated for change above
+
+Tue Jan  4 16:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Acceptor_Filter.{h,cpp,i}:
+        * tao/Acceptor_Impl.{h,cpp,i}:
+        * tao/Adapter.{h,cpp,i}:
+        * tao/Collocation_Resolver.{h,cpp,i}:
+        * tao/Connector_Impl.{h,cpp,inl}:
+        * tao/Default_Collocation_Resolver.{h,cpp,i}:
+        * tao/Default_Protocols_Hooks.{h,cpp,i}:
+        * tao/Default_Thread_Lane_Resources_Manager.{h,cpp,i}:
+        * tao/GIOP_Message_Base.{h,cpp,i}:
+        * tao/GIOP_Message_Generator_Parser.{h,cpp,inl}:
+        * tao/GIOP_Message_Generator_Parser_10.{h,cpp,inl}:
+        * tao/GIOP_Message_Generator_Parser_11.{h,inl}:
+        * tao/GIOP_Message_Generator_Parser_12.{h,cpp,inl}:
+        * tao/GIOP_Message_Lite.{h,cpp,i}:
+        * tao/GIOP_Utils.{h,cpp,i}:
+        * tao/IIOP_Connection_Handler.{h,cpp,i}:
+        * tao/IIOP_Profile.{h,cpp,i}:
+        * tao/IOR_Parser.{h,cpp,i}:
+        * tao/Objref_VarOut_T.{h,cpp,inl}:
+        * tao/Service_Callbacks.{h,cpp,i}:
+        * tao/corbafwd.{h,cpp,i}:
+        * tao/default_resource.{h,cpp,i}:
+          All .i/.inl files above where empty, so removed them from the repo
+          and updated the h/cpp files to not include the removed file. In case
+          someone want to inline a method, must re-add the file at that moment
+          with the .inl extension
+
+        * tao/Makefile.am
+          Updated for changes above
+
+Tue Jan  4 13:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableInterceptorS.h:
+          Regenerated
 
-        Wed Jun 30 14:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jan  4 12:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Profile_Transport_Resolver.{h,cpp,i}:
-                  Instead of passed with each operation whether the connect should
-                  block or not, we now pass a boolean with the constructor if this
-                  tranport must deliver a connected transport or whether it is also
-                  allowed to deliver a not connected transport. Added an accessor for
-                  this member.
+        * tao/ShortSeqA.cpp:
+        * tao/ShortSeqS.h:
+          Regenerated
 
-                * tao/Invocation_Adapter.cpp:
-                * tao/Invocation_Endpoint_Selectors.{h,cpp}:
-                * tao/LocateRequest_Invocation_Adapter.cpp:
-                  Instead of passing the block boolean with each operation, pass it
-                  with the constructor or the Profile_Transport_Resolver.
+        * tao/ShortSeqC.{h,cpp,inl,i}:
+          Regenerated and replace .i with .inl files
 
-        Wed Jun 30 10:19:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Makefile.am:
+          Updated because of change above
 
-                * tao/Synch_Invocation (remote_oneway):
-                  At the top of the method we check for sync with server or sync with
-                  target. In case of this we do a twoway. I don't see any reason why
-                  lower in the method we check another time for sync with server, so
-                  removed that check. Changed the calling of
-                  Synch_Twoway_Invocation::remote_twoway(), so that we check for
-                  exceptions in case of emulated exception macros. Add transport local
-                  variable, so that we don't need to get it several times in one
-                  method call.
+Tue Jan  4 12:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/Transport.cpp (send_message_shared_i):
-                  Removed queueing, it should be here, added some comments that the
-                  code checking for twoways or replies should go out of here. This
-                  class also got the new methods queue_message and queue_message_i
-                  when it was created as branch.
+        * tao/TAOA.cpp:
+        * tao/TAOC.{h,cpp,inl}:
+        * tao/TAOS.{h,cpp,i,inl}:
+        * tao/TAOS_T.{h,cpp,i,inl}:
+          Regenerated and replace .i with .inl files
 
-        Tue Jun 20 10:10:10 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Makefile.am:
+          Updated because of change above
 
-                * tao/Transport.{h,cpp}:
-                  Added queue_message and queue_message_i to be able to queue a
-                  message from the outside, use this method also internally.
-                  Added connected_ member and accessors to indicate whether this
-                  transport is connected or not
+Tue Jan  4 12:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tao/LocateRequest_Invocation_Adapter.cpp:
-                  We use the Profile_Transport_Resolver here, assume that we always
-                  need to get a connected transport
+        * tao/LongDoubleSeqS.h:
+        * tao/LongLongSeqS.h:
+        * tao/LongSeqS.h:
+        * tao/OctectSeqC.{h,cpp,inl}:
+        * tao/OctectSeqS.h:
+        * tao/OctectSeqA.cpp:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-Mon Aug  9 09:29:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/OctetSeq.pidl:
+          Updated regeneration instructions
 
-        * tao/Buffer_Allocator_T.h:
-          Added missing access control specifier public for the base class
+        * tao/diffs/OctetSeq.diff:
+          Updated this diff
 
-Sat Aug  7 23:06:41 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Tue Jan  4 12:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Makefile.am:
-          Changed to introduce an intermediate dependency between the IDL
-          sources and generated output files so that only one instance of
-          tao_idl is spawned per input file with parallel make.
+        * tao/IIOPC.{h,cpp,i,inl}:
+          Regenerated and replaced .i with .inl file
 
-Sat Aug  7 18:08:51 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * tao/IIOPA.cpp:
+          Regenerated
 
-        * utils/catior/catior.cpp:
+        * tao/Makefile.am:
+          Updated because of change above
 
-          Removed direct inclusion of <ctype.h>. This file already
-          includes ace/os_include/os_ctype.h. If LynxOS has problems, then
-          the problem is elsewhere.
+        * tao/diffs/IIOP.diff
+          Removed this file, not needed anymore
 
-        * utils/nslist/nslist.cpp:
+Tue Jan  4 12:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Used Object::is_nil () instead of _nil ().
-
-Fri Aug  6 15:44:50 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/TAO_Service/Makefile.am:
-          New file.
-
-Fri Aug  6 12:51:33 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/Argument.cpp:
-        * tao/Argument.h:
-        * tao/BD_String_Argument_T.cpp:
-        * tao/BD_String_Argument_T.h:
-        * tao/BD_String_SArgument_T.cpp:
-        * tao/BD_String_SArgument_T.h:
-        * tao/Basic_Argument_T.cpp:
-        * tao/Basic_Argument_T.h:
-        * tao/Basic_SArgument_T.cpp:
-        * tao/Basic_SArgument_T.h:
-        * tao/DomainC.cpp:
-        * tao/Fixed_Array_Argument_T.cpp:
-        * tao/Fixed_Array_Argument_T.h:
-        * tao/Fixed_Array_SArgument_T.cpp:
-        * tao/Fixed_Array_SArgument_T.h:
-        * tao/Fixed_Size_Argument_T.cpp:
-        * tao/Fixed_Size_Argument_T.h:
-        * tao/Fixed_Size_SArgument_T.cpp:
-        * tao/Fixed_Size_SArgument_T.h:
-        * tao/Object_Argument_T.cpp:
-        * tao/Object_Argument_T.h:
-        * tao/Object_SArgument_T.cpp:
-        * tao/Object_SArgument_T.h:
-        * tao/Special_Basic_Argument_T.cpp:
-        * tao/Special_Basic_Argument_T.h:
-        * tao/Special_Basic_SArgument_T.cpp:
-        * tao/Special_Basic_SArgument_T.h:
-        * tao/UB_String_Argument_T.cpp:
-        * tao/UB_String_Argument_T.h:
-        * tao/UB_String_SArgument_T.cpp:
-        * tao/UB_String_SArgument_T.h:
-        * tao/Var_Array_Argument_T.cpp:
-        * tao/Var_Array_Argument_T.h:
-        * tao/Var_Array_SArgument_T.cpp:
-        * tao/Var_Array_SArgument_T.h:
-        * tao/Var_Size_Argument_T.cpp:
-        * tao/Var_Size_Argument_T.h:
-        * tao/Var_Size_SArgument_T.cpp:
-        * tao/Var_Size_SArgument_T.h:
-        * tao/operation_details.cpp:
-        * tao/operation_details.h:
-        * tao/DynamicInterface/DII_Invocation.cpp:
+        * tao/IIOP_Transport.{h,cpp,i}:
+          Removed the empty .i file and updated the cpp and h file to not
+          include it anymore
 
-          Added TAO_HAS_INTERCEPTORS == 1 guards to all interceptor-related
-          operations, so code generated from IDL operations will compile
-          if Any operators (used by interceptors) are suppressed in code
-          generation. Thanks to Nicolas HUYNH <HUYNH_Nicolas at cena dot fr>
-          for reporting the problem.
+        * tao/Makefile.am:
+          Updated because of change above
 
-Fri Aug  6 15:45:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
+Tue Jan  4 12:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO/utils/catior/catior.cpp
-          Added #include <ctype.h> required for Lynxos cross build.
+        * tao/IIOP_EndpointsC.{h,cpp,i,inl}:
+          Regenerated and replaced .i with .inl file
 
-Fri Aug  6 08:05:25 2004  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+        * tao/IIOP_EndpointA.cpp:
+          Regenerated
 
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp (TAO_LogMgr_i): Initialize
-          max_id_ to 0.  Thanks to Thomas Girard <thomas.g.girard@free.fr>
-          for reporting this.
+        * tao/IIOP_Endpoint.pidl:
+          Updated regeneration instructions
 
-        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp (create_with_id):
-          Duplidate object references before putting them in the hash map.
-          Thanks to Thomas Girard <thomas.g.girard@free.fr> for this fix.
+        * tao/diffs/IIOP_Endpoints.diff:
+          Removed this file, not needed anymore
 
-Fri Aug  6 12:16:35 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+        * tao/Makefile.am:
+          Updated because of change above
 
-        * utils/nslist/nslist.cpp:
+Tue Jan  4 11:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Fixed a core dump with the Object is _nil (). Thanks to Tufan
-          Oruk <toruk at usa dot net> for the patch.
+        * tao/BooleanSeqS.h:
+        * tao/DoubleSeqS.h:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-Thu Aug  5 23:42:02 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Bounds.pidl:
+        * tao/CharSeq.pid:
+          Updated regeneration instructions
 
-        * orbsvcs/orbsvcs/ec_typed_events.mpb:
-          Changed to inherit from dynamicinterface and ifr_client instead
-          of providing libs and after statements so that dependency chain
-          is complete.
+Tue Jan  4 11:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug  5 20:20:37 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/ULongLongSeqC.{h,cpp,inl}:
+        * tao/ULongLongSeqS.h:
+        * tao/StringSeqS.h:
+        * tao/AnySeqS.h:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-        * orbsvcs/orbsvcs/Makefile.am:
-          Changed custom build rules to use $(srcdir)/<input-file> so
-          resulting makefiles will work on systems where make doesn't
-          support VPATH.
+        * tao/StringSeq.pidl:
+          No need to apply patches anymore
 
-Thu Aug  5 07:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/diffs/StringSeq.diff:
+          Removed this file, not needed anymore
 
-        * examples/PluggableUDP/tests/Performance/run_test.pl:
-          The client also has a servant, so we must specifiy also an
-          -ORBEndPoint for the client process. This fixes bugzilla bug
-          1899.
+Tue Jan  4 11:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Thu Aug  5 07:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/WrongTransaction.pidl:
+          Updated regeneration instructions, no need to apply diffs
 
-        * examples/PluggableUDP/tests/Performance/run_test.pl:
-          Updated this script to use the PerlACE module, simplifies this
-          script a lot.
+        * tao/diffs/UShortSeq.diff:
+          New diff file corresponding pidl file
 
-Wed Aug  4 23:03:45 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * tao/WCharSeqC.{h,cpp,inl}:
+        * tao/WCharSeqS.h:
+        * tao/UShortSeqS.h:
+        * tao/ULongSeqS.h:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp (Credentials):
+        * tao/UShortSeqC.{h,cpp,i,inl}:
+        * tao/ULongSeqC.{h,cpp,i,inl}:
+          Regenerated and replaced .i with .inl file
 
-          Older versions of OpenSSL didn't define the OpenSSL macro.  Use
-          CRYPTO_free if OPENSSL_free isn't defined.
+        * tao/Makefile.am:
+          Updated because of changes above
 
-Wed Aug  4 22:13:19 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Tue Jan  4 10:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
-          (register_acquirer_factory):
+        * tao/WStringSeqC.{h,cpp,inl}:
+        * tao/WStringSeqS.h:
+          Regenerated with the latest version of the TAO_IDL compiler
 
-          Release the String_var containing the acquisition method Id once
-          the factory is successfully registered.  Memory management
-          becomes the responsiblity of the CredentialsCurator.  Fixes a
-          double deletion error.
+Tue Jan  4 10:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Aug  4 21:23:52 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * tao/FloatSeq.pidl:
+          Updated regeneration instructions
 
-        * tao/IIOP_Acceptor.h (BASE_ACCEPTOR, CREATION_STRATEGY):
-          (CONCURRENCY_STRATEGY, ACCEPT_STRATEGY):
         * tao/IIOP_Acceptor.cpp:
+          Updated debug message to get the same format as used on other
+          places
 
-          Removed the "TAO_IIOP_" prefix from these typedefs.  It was
-          redundant since these typedefs are already encapsulated within
-          the TAO_IIOP_Acceptor class.
-
-        * tao/ORB_Table.cpp (get_orbs):
-
-          Minor TAO coding convention update.
-
-Wed Aug  4 21:16:42 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
-          (ClientCredentials):
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
-          (OwnCredentials):
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
-          (TargetCredentials):
-
-          Explicitly qualify the namespace to which the Credentials base
-          class belongs to work around MSVC++ 6 namespace brain damage.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (open, close):
-          (iiop_connect):
-
-          Wrap calls to TAO::IIOP_SSL_Connector base class methods with
-          the ACE_NESTED_CLASS macro to work around MSVC++ 6 namespace
-          brain damage.
-
-Wed Aug  4 15:48:06 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * TAO_IDL/be/be_global.cpp (destroy):
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_cpp_init):
-
-          Fixed memory leaks.
-
-Wed Aug  4 14:10:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl:
-          This test uses multiple clients, when a client timeouts, report
-          which client this is.
+        * tao/Invocation_Endpoint_Selectors.{h,cpp,i}:
+        * tao/LF_Invocation_Event.{h,cpp,inl}:
+        * tao/LF_Strategy.{h,cpp,inl}:
+        * tao/Object_Loader.{h,cpp,i}:
+        * tao/Pluggable_Messaging.{h,cpp,i}:
+        * tao/Sync_Strategies.{h,cpp,i}:
+        * tao/Thread_Lane_Resources_Manager.{h,cpp,i}:
+          Removed the empty .i/.inl file and updated the cpp and h file to not
+          include it anymore
 
-Wed Aug  4 07:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/LF_CH_Event.h:
+          This file included LF_Invocation_Event.inl which is totally wrong, so
+          zapped the include
 
-        * examples/AMH/Sink_Server/Timer_Handler.h:
-        * examples/AMH/Sink_Server/Client_Task.cpp:
-          Removed old comments that just shouldn't be in the code anymore
+        * tao/Managed_Types.h:
+          Fixed typo in documentation
 
-Tue Aug  3 17:08:38 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Pluggable_Messaging_Utils.h:
+          Converted documentation to doxygen style
 
-        * orbsvcs/orbsvcs/Makefile.am:
-          Removed duplicate rules for building CosEventComm and
-          CosEventChannelAdmin IDL files.
-          Changed to not install headers, at least for the time
-          being.
-
-        * orbsvcs/FTRT_Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
-        * orbsvcs/FT_ReplicationManager/Makefile.am:
-        * orbsvcs/Fault_Detector/Makefile.am:
-        * orbsvcs/Fault_Notifier/Makefile.am:
-        * orbsvcs/LoadBalancer/Makefile.am:
-        * orbsvcs/Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-        * orbsvcs/Notify_Service/Makefile.am:
-          New file.
-
-        * orbsvcs/Concurrency_Service/Makefile.am:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Dump_Schedule/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/IFR_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Scheduling_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-          Update, with a little help from MPC.
-
-        * orbsvcs/Makefile.am:
-          Added Concurrency, CosEvent, Dump Schedule, Event, Fault
-          Detector, Fault Notifier, FT Replication Manager, FTRT Event,
-          IFR, LifeCycle, Load Balancer, Logging, Naming, Notify,
-          Scheduling, Time, and Trading services to list of SUBDIRS.
-
-        * configure.ac:
-          Added Concurrency, CosEvent, Dump Schedule, Event, Fault
-          Detector, Fault Notifier, FT Replication Manager, FTRT Event,
-          IFR, LifeCycle, Load Balancer, Logging, Naming, Notify,
-          Scheduling, Time, and Trading service Makefile.am's to list of
-          config files.
-
-Tue Aug  3 16:32:56 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_interface.cpp:
-
-          Made the checking more strict for enqueueing abstract
-          interfaces to an internally used list - abstract
-          valuetypes and eventtypes were also getting put on it,
-          leading to generated code that wouldn't compile. Thanks to
-          Will Otte <wotte@dre.vanderbilt.edu> for pointing out
-          the problem.
-
-Tue Aug  3 13:10:04 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-          Update, with a little help from MPC.
-
-        * orbsvcs/Makefile.am:
-          Added orbsvcs to list of SUBDIRS.
-
-        * configure.ac:
-          Added orbsvcs/orbsvcs/Makefile to list of config files.
-
-Tue Aug  3 08:05:20 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/PSS/PSDL_Datastore.cpp:
-          Fixed TAO_PSDL_Datastore::create_index_helper() where the
-          ACE_NEW_RETURN macro was being ab/used for placement new.
-          This caused problems for targets w/ACE_HAS_NOTHROW_NEW.
-          I eliminated the error checks because this function can
-          never called with a bad buffer pointer.
-
-        * orbsvcs/PSS/Makefile.am:
-          New file.
-
-        * orbsvcs/Makefile.am:
-          Update with current MPC generated file, but enable only
-          PSS and TAO_Service in SUBDIRS.
-
-        * Makefile.am:
-          Added orbsvcs to SUBDIRS.
-
-        * configure.ac:
-          Added orbsvcs/{,PSS/,TAO_Service/}Makefile to list of
-          config files.
-
-Tue Aug  3 13:47:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/AMH_Response_Handler.{h,cpp}:
-          Corrected the method name for decrementing the reference count
-          from decr_refcount to _remove_ref. The AMH Response Handler is
-          derived from TAO_Local_RefCounted_Object and this defines the
-          virtual method _remove_ref, we now had two methods where the
-          base method didn't know anything of the allocator. By overruling
-          we also get the derived _remove_ref and use the allocator
-          when needed. This fixes the crashing of the AMH Sink_Server
-          example in our daily builds.
-
-Tue Aug  3 08:34:53 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/IFR_Service/be_extern.h:
-        * orbsvcs/IFR_Service/be_global.cpp:
-        * orbsvcs/IFR_Service/be_global.h:
-        * orbsvcs/IFR_Service/be_init.cpp:
-
-          Changes corresponding to those in TAO_IDL_BE, made in
-
-          Sun Aug  1 20:57:32 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Mon Aug  2 14:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/AMH_Response_Handler.cpp:
-          Removed incorrect ACE_INLINE, fixes linker errors in the builds
-
-Mon Aug  2 08:40:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Collocated_Invocation.h:
-          Doxygen fix
-
-Mon Aug  2 07:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Transport_Cache_Manager.cpp (is_entry_idle):
-          Corrected method name in debug statement and instead of retrieving
-          the recycle_state three times, get it into a local variable and use
-          that for checking.
+        * tao/Policy_Set.h:
+        * tao/Pseudo_VarOut_T.h:
+          Removed commented out code
 
-Mon Aug  2 06:46:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PolicyFactory_Registry.h:
+          Small doxygen improvement
 
-        * orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp:
-          Fixed compile error due to SSLIOP Transport name change
+        * tao/Profile.cpp:
+          Replaced ACE cast macros with their C++ versions
 
-Sun Aug  1 23:41:50 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/TSS_Resources.h:
+          Added include to TAO_Export.h, the export macro is used, so we need
+          to do this include
 
         * tao/Makefile.am:
-          Update after last change.  Fixes "make install" failure due to
-          bad dependencies.
+          Updated for changes above
 
-Mon Aug  2 06:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/BiDir_GIOP/BiDir_ORBInitializer.h:
+        * tao/BiDir_GIOP/BiDir_Policy_i.h:
+        * tao/BiDir_GIOP/BiDir_PolicyFactory.h:
+        * tao/RTCORBA/RT_ORB.h:
+        * tao/RTCORBA/RT_Mutex.h:
+        * tao/RTCORBA/RT_Current.h:
+        * tao/RTCORBA/RT_PolicyFactory.h:
+        * tao/RTCORBA/RT_ORBInitializer.h:
+        * tao/RTCORBA/RT_Policy_i.h:
+          Removed checks for _MSC_VER >= 1200, just check for _MSC_VER
 
-        * tao/PortableServer/AMH_Response_Handler.{h,cpp}:
-          Changed this class so that AMH Response Handlers can be allocated
-          with an allocator and when the reference count reaches zero we
-          look if we have an allocator, if so, release from the allocator,
-          else just delete
+Tue Jan  4 09:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/be/be_codegen.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_operation/amh_ss.cpp:
-        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp:
-          Changed the generation of the allocation of the AMH Response
-          Handler so that we use an allocator.
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.{h,cpp,inl}:
+          The cpp file was including the wrong inline file, the inline file was empty,
+          so just zapped it
 
-Mon Aug  2 06:10:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Active_Object_Map.h:
-          Doxygen improvement
-
-Sun Aug  1 22:39:44 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/BiDir_GIOP.mpc:
-        * tao/Domain.mpc:
-        * tao/DynamicAny.mpc:
-        * tao/DynamicInterface.mpc:
-        * tao/IFR_Client.mpc:
-        * tao/IORInterceptor.mpc:
-        * tao/IORManipulation.mpc:
-        * tao/IORTable.mpc:
-        * tao/Messaging.mpc:
-        * tao/ObjRefTemplate.mpc:
-        * tao/PortableServer.mpc:
-        * tao/RTCORBA.mpc:
-        * tao/RTPortableServer.mpc:
-        * tao/RTScheduler.mpc:
-        * tao/SmartProxies.mpc:
-        * tao/Strategies.mpc:
-        * tao/TypeCodeFactory.mpc:
-        * tao/Utils.mpc:
-        * tao/Valuetype.mpc:
-          Fix thinko.  When these files were moved from subdirectories, I
-          first merged them into tao.mpc, which required explicit project
-          names.  I didn't realize at that time that the precise name was
-          significant.  This caused build failures due to bad dependencies.
-          I've removed the explicit names since the projects have been
-          split back into separate project files.
-
-Sun Aug  1 21:05:59 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+        * orbsvcs/orbsvcs/Makefile.am:
+          Removed FaultTolerance/FT_Invocation_Endpoint_Selectors.inl
 
-        * TAO_IDL/Makefile.am:
-          Add _LDFLAGS definitions with -version-number flag for FE and BE
-          libraries.
+Mon Jan  3 17:04:26 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * tao/Makefile.am:
-          Update, with a little help from MPC.
-
-        * Makefile.am:
-          Update.
-
-        * configure.ac:
-          Added.  First cut at a new configure script with bits taken from
-          ACE's configure.ac and the old TAO configure.in in the CVS Attic.
-
-Sun Aug  1 20:57:32 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/tao_idl.cpp:
-        * TAO_IDL/ast/ast_decl.cpp:
-        * TAO_IDL/ast/ast_home.cpp:
-        * TAO_IDL/ast/ast_root.cpp:
-        * TAO_IDL/ast/ast_sequence.cpp:
-        * TAO_IDL/be/be_init.cpp:
-        * TAO_IDL/be_include/be_extern.h:
-        * TAO_IDL/include/idl_defines.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:
-
-          - Fixed bugs in cleanup between iterations in processing eacj IDL
-            file in the list passed on the command line.
-
-          - Fixed bug in checking for recursive types.
-
-          - Fixed bug in eager calculation of the version segment of the
-            repository ID.
-
-          - Fixed bug in checking number of interfaces supported by a home.
-
-          - Added markers in existing bit vector to keep track of which
-            sequences of basic types have been referenced, and code to
-            update the markers.
-
-Sun Aug  1 16:32:56 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/Makefile.am:
-          Update, with a little help from MPC.
-
-        * TAO_IDL/ast/Makefile.am:
-        * TAO_IDL/be/Makefile.am:
-        * TAO_IDL/be_include/Makefile.am:
-        * TAO_IDL/driver/Makefile.am:
-        * TAO_IDL/fe/Makefile.am:
-        * TAO_IDL/include/Makefile.am:
-        * TAO_IDL/narrow/Makefile.am:
-        * TAO_IDL/util/Makefile.am:
-          Remove stale Makefile.am's.
-
-Sun Aug  1 09:48:46 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/BiDir_GIOP/BiDir_GIOP.mpc:
-        * tao/Domain/Domain.mpc:
-        * tao/DynamicAny/DynamicAny.mpc:
-        * tao/DynamicInterface/DynamicInterface.mpc:
-        * tao/IFR_Client/IFR_Client.mpc:
-        * tao/IORInterceptor/IORInterceptor.mpc:
-        * tao/IORManipulation/IORManipulation.mpc:
-        * tao/IORTable/IORTable.mpc:
-        * tao/Messaging/Messaging.mpc:
-        * tao/ObjRefTemplate/ObjRefTemplate.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/TypeCodeFactory/TypeCodeFactory.mpc:
-        * tao/Utils/Utils.mpc:
-        * tao/Valuetype/Valuetype.mpc:
-          Move from here...
-
-        * tao/BiDir_GIOP.mpc:
-        * tao/Domain.mpc:
-        * tao/DynamicAny.mpc:
-        * tao/DynamicInterface.mpc:
-        * tao/IFR_Client.mpc:
-        * tao/IORInterceptor.mpc:
-        * tao/IORManipulation.mpc:
-        * tao/IORTable.mpc:
-        * tao/Messaging.mpc:
-        * tao/ObjRefTemplate.mpc:
-        * tao/PortableServer.mpc:
-        * tao/RTCORBA.mpc:
-        * tao/RTPortableServer.mpc:
-        * tao/RTScheduler.mpc:
-        * tao/SmartProxies.mpc:
-        * tao/Strategies.mpc:
-        * tao/TypeCodeFactory.mpc:
-        * tao/Utils.mpc:
-        * tao/Valuetype.mpc:
-          ...to here.  Adapt as necessary to find source, inline, and
-          template files.
-
-Sun Aug  1 17:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/QtTests/server.cpp:
-          Added missing include
-
-Sun Aug  1 17:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/RTCORBA/Banded_Connections/server.cpp:
-          When we get an exception, an internal corba error is handled
-          to look if it is an permission error and a specific minor code
-          is set, this fails on HPUX and then the test just uses ACE_ASSERT,
-          added some more code to get some specific feedback what the
-          retrieved minor code from the exception is
+          Generate pkg-config *.pc files from templates.
+
+        * tao/BiDir_GIOP/TAO_BiDirGIOP.pc.in:
+        * tao/Domain/TAO_Domain.pc.in:
+        * tao/DynamicAny/TAO_DynamicAny.pc.in:
+        * tao/DynamicInterface/TAO_DynamicInterface.pc.in:
+        * tao/IFR_Client/TAO_IFR_Client.pc.in:
+        * tao/IORInterceptor/TAO_IORInterceptor.pc.in:
+        * tao/IORManipulation/TAO_IORManip.pc.in:
+        * tao/IORTable/TAO_IORTable.pc.in:
+        * tao/Messaging/TAO_Messaging.pc.in:
+        * tao/ObjRefTemplate/TAO_ObjRefTemplate.pc.in:
+        * tao/PortableServer/TAO_PortableServer.pc.in:
+        * tao/RTCORBA/TAO_RTCORBA.pc.in:
+        * tao/RTPortableServer/TAO_RTPortableServer.pc.in:
+        * tao/RTScheduling/TAO_RTScheduler.pc.in:
+        * tao/SmartProxies/TAO_SmartProxies.pc.in:
+        * tao/Strategies/TAO_Strategies.pc.in:
+        * tao/TAO.pc.in:
+        * tao/TAO_Utils.pc.in:
+        * tao/TypeCodeFactory/TAO_TypeCodeFactory.pc.in:
+        * tao/Valuetype/TAO_Valuetype.pc.in:
+
+          New files, pkg-config *.pc templates.
+
+Mon Jan  3 11:31:35 2005  Dale Wilson  <wilson_d@ociweb.com>
 
-Sun Aug  1 08:53:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/tao.mpc:
-          Updated Header_Files, Inline_Files, and Template_Files so that
-          generated project files will contain complete list for install.
-          Suggested by Chad Elliot <elliot_c@ociweb.com>.
-
-Sun Aug  1 15:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp:
-          Fixed conversion warning by adding missing .in()
-
-Sun Aug  1 15:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
-        * orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h:
-        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h:
-        * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h:
-          Fixed fuzz errors
+        * NEWS:
+          Additional info on Notification Service changes.
 
-Sun Aug  1 15:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Jan  3 14:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/Wait_Strategy.h:
-        * tao/Strategies/SCIOP_Transport.h:
-        * tao/Valuetype/AbstractBase.h:
-          Doxygen improvement
+        * tao/IIOP_Connection_Handler.cpp (open):
+          Added missing space in debug statement to get the same format as
+          used in the other debug messages
 
-        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h:
-          Removed not needed forward declarations
+Mon Jan  3 08:02:33 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-        * orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp:
-        * orbsvcs/examples/Log/Basic/TLS_Client.cpp:
-        * orbsvcs/examples/Log/Event/Event_Supplier.cpp:
-        * orbsvcs/examples/Log/Notify/Notify_Supplier.cpp:
-        * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp:
-          Fixed vc71 conversion warnings
+        * orbsvcs/examples/FaultTolerance/RolyPoly: Changed the use of
+          TMCast to ACE_TMCast.  Thanks to J.T. Conklin for pointing out
+          the inconsistency.
 
-Sun Aug  1 08:16:27 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+Sun Jan  2 21:26:58 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-          Changed ftrtec_export.h to FtRtEvent/EventChannel/ftrtec_export.h
-          in Header_Files.
-
-        * tao/tao.mpc:
-        * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
-          Removed Auto_Functor.cpp from Template_Files.
+        * TAO_IDL/driver/drv_preproc.cpp (DRV_cpp_init):
 
-        * TAO_IDL/tao_idl.1: Update to reflect current file extensions.
+          Moved the location of the check for the preprocessor
+          definition of TAO_IDL_INCLUDE_DIR to come after the
+          checks for TAO_ROOT and ACE_ROOT. This move changes
+          the logic so the environment variable is used if it is
+          set and TAO_IDL_INCLUDE_DIR is used otherwise, enabling
+          the path to orb.idl to be found both during and after
+          installation. Thanks to Ken Sedgwick <ken@bonsai.com>
+          for supplying the patch.
+
+Sun Jan  2 14:21:21 2005  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp:
+          Implement unbounded sequences of object references.
+
+        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
+        * tests/Sequence_Unit_Tests/run_test.pl:
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp:
+          Add a new unit test (still in progress) to test the object
+          reference sequences.
+
+        * tests/Sequence_Unit_Tests/generic_sequence.hpp:
+          Fixed a performance bug in length(...), the sequence was
+          reallocated and grown when not strictly needed.
+          Document in more detail why some code is not exception-safe, and
+          why it may not matter (applications that could depend on it are
+          non-conforming.)
+
+        * tests/Sequence_Unit_Tests/string_sequence_element.hpp:
+          Add missing #include.
+
+Sun Jan  2 12:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/PSS/PSDL_Interface_Visitor.cpp:
+        * orbsvcs/PSS/PSDL_Struct_Visitor.cpp:
+        * orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp:
+          Removed generation of check for ACE_HAS_GNUG_PRE_2_8, this is not
+          set anywhere anymore
+
+Sat Jan  1 13:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.h:
+        * tao/RTCORBA/Priority_Mapping_Manager.h:
+        * tao/RTScheduling/Current.h:
+        * tao/RTScheduling/RTScheduler_Manager.h:
+        * tao/Strategies/sciop_endpoints.h:
+        * tao/Strategies/uiop_endpoints.h:
+          Removed check for ACE_HAS_GNUG_PRE_2_8, this is not set anywhere
+          anymore
+
+Sat Jan  1 13:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Endpoint.cpp:
+          Updated formatting of some debug messages to match the other
+          messages in TAO
 
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-          Changed group name from EventLog to DsEventLogAdmin.
+        * tao/ORBInitInfo.h:
+          Removed check for _MSC_VER >= 1200, this is always true, removed
+          check for ACE_HAS_GNUG_PRE_2_8, this define is nowhere set and
+          such old versions of GCC aren't usable anymore
 
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-          Changed group name from Log to DsLogAdmin.
+        * tao/UTF16_BOM_Factory.cpp:
+          Check argc before using argv[0], this can be unitialized memory
+          under VxWorks.
 
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-          Changed group name from Log to DsNotifyLogAdmin.
+        * TAO-INSTALL.html:
+          Corrected e-mail address of the TAO mailing list
 
-Sun Aug  1 09:10:39 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+Fri Dec 31 22:10:51 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * ChangeLogs/ChangeLog-04a:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
+        * orbsvcs/orbsvcs/Time_Utilities.cpp:
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h:
 
-          Moved the contents to the new directory.
+          Changed #include "orbsvcs/orbsvcs/..." to #include "orbsvcs/..."
+          in files where it was missed or was inadvertantly reintroduced.
 
-Sat Jul 31 11:14:00 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Thu Dec 30 13:22:25 2004  Chris Cleeland  <cleeland@ociweb.com>
 
-        * TAO version 1.4.2 released.
+        * TAO version 1.4.3 released.
 
 Local Variables:
 add-log-time-format: current-time-string
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index 75b66ba6476..c58de134d89 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -14,10 +14,6 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = -I ../m4
 
-bin_SCRIPTS = tao-config
-
-man_MANS = tao-config.1
-
 SUBDIRS = \
         TAO_IDL \
         tao \
@@ -30,23 +26,15 @@ EXTRA_DIST =  \
   VERSION \
   COPYING.sun \
   LICENSE.sun \
-  README.sun \
-  tao-config.in \
-  tao-config.1.in \
-  taoConf.sh.in
+  README.sun
 
-DISTCLEANFILES = tao-config taoConf.sh tao-config.1
+DISTCLEANFILES = tao-config tao-config.1
 
 ## release:
 ##         $(MAKE) dist distdir=$(PACKAGE)$(VERSION)
 release:
 	$(MAKE) dist
 
-## Put `exec' in the name because this should be installed by
-## `install-exec', not `install-data'.
-confexecdir=$(libdir)
-confexec_DATA = taoConf.sh
-
 ## Directories to include in the distribution but which I am too lazy to
 ## create Makefile.am files for.  A Makefile.am for these directories isn't
 ## needed anyway.
diff --git a/TAO/NEWS b/TAO/NEWS
index 491a3fd9486..de6513ecb02 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,73 +1,185 @@
-PLANNED MAJOR CHANGES TARGETED FOR TAO-1.4.3
-====================================================
+PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
+===========================================================================
 
 - (Johnny/Ossama) Bug 1420-Protocols in Transport Cache not amenable for
   strict policy enforcement
 
 - (Johnny/Ossama) Location Forwarding fixes
 
-- (Ossama) Typecode overhaul
+- (JTC/Ossama) autoconf support for TAO
 
-  . ONGOING - ETA 8/31
+  . ONGOING - ETA unknown
 
-- (Ossama) Remainder of CSIv2 code that didn't make it into TAO 1.4.2
+PLANNED MAJOR CHANGES TARGETED FOR TAO-1.4.5
+============================================
 
-  . ONGOING - ETA 9/26
+- (Johnny/Ossama) POA refactoring/modularization
+
+  . ONGOING - ETA 10/31 -- currently targeted for TAO 1.4.5.
+
+- (Ossama) Typecode overhaul
+
+  . ONGOING - ETA 11/12 -- currently targeted for TAO 1.4.5.  60% complete.
 
 - (Ossama/Jeff) Skeleton refactoring
 
-  . TO BE STARTED - 9/1
+  . ONGOING - ETA 11/10 -- currently targeted for TAO 1.4.5.  75% complete.
 
-- (Johnny/Ossama) POA refactoring/modularization
+- (Ossama) Remainder of CSIv2 code that didn't make it into TAO 1.4.2
 
-  . ONGOING - ETA unknown
+  . ONGOING - ETA 2/30 -- currently targeted for TAO 1.4.5.
 
-- (JTC/Ossama) autoconf support for TAO
+USER VISIBLE CHANGES BETWEEN TAO-1.4.3 and TAO-1.4.4
+====================================================
 
-  . ONGOING - ETA unknown
+. Reimplemented the way that TAO_Transport deals with GIOP headers.  In
+  some cases partial GIOP message headers were read and used as if a full
+  GIOP header were received. [Bug 1681]
 
-- (Bala) Implementation Repository enhancements
+. GIOP fragment handling has changed where a single large allocation and
+  copy occurs at the end of a fragment chain instead of an allocation and
+  copy for every fragment received.
 
-- (OCI) Naming Service implementation fixes
+. The tao-config script has been replaced by pkg-config metadata files
+  which are installed in ${prefix}/lib/pkgconfig by the automake build.
 
-  Wed Aug 25 16:03:29 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+. SHMIOP respects now the dotted decimal addresses setting. When this is
+  set it uses ip addresses instead of hostnames.
 
-- (OCI) Wait on LF No Upcalls wait strategy
+. Removed the usage of the ACE_x_cast macros, we are using the C++ casts
+  from now on.  The TAO core libraries will be updated before the x.4.5
+  release.
 
-  Thu Aug 19 16:49:24 2004  Chris Cleeland  <cleeland_c@ociweb.com>
+. Removed MPC code that creates unused and unnecessary subfolders in
+  Visual Studio projects and makefiles.
 
-- (OCI) Parse-magic-bytes re-integration
+. Fixed unclosed temporary file created by the IDL compiler on platforms that
+  lack mkstemp. [BUGID:2026]
 
-  Chris/Bala--need to coordinate.  Hopefully week of 8/30?
+. Fixed IDL compiler bug related to handling null object references in a
+  sequence. [BUGID:2027]
 
-- (OCI) [hopeful] Notification Service EventReliability and ConnectionReliability QoS
+. Made behavior when marshaling null value of an abstract interface similar
+  to the behavior of CORBA::Object.
 
-  Dale Wilson, Ongoing.
+. Made use of 'true' and 'false' with CORBA::Boolean more consistent in TAO
+  source code and generated code.
 
-- (OCI) better compatibility with JDK orb
+. Fixed bug in code generation for typedefs of IDL arrays that are not declared
+  at global scope or in a module (i.e., in an interface, valuetype, eventtype
+  or home).
 
-  Dale Wilson will do this week of 8/30.
+. Fixed bug in code generation of parent operations in AMI ReplyHandler
+  interfaces.
 
-- (JTC) Split ORB Services into stub, skeleton, and implementation libraries.
+. Changed remaining instances of C-style casts in generated code to the
+  appropriate C++-style cast.
 
-  Naming, Trading, Event, and Notification Services ready to commit 
-  as soon as library naming issues are resolved.
+. Fixed typo in code generation of bounded sequences of CORBA::Object.
 
-- (OCI) Install common utilities (tao_imr, tao_ifr, nslist, nsadd,
-  nsdel, NamingViewer) in $ACE_ROOT/bin.
+. Fixed bug in code generation for attributes which are unaliased bounded
+  (w)strings.
 
-  Sat Sep 11 12:25:07 2004  Steve Totten  <totten_s@ociweb.com>
+. Changed implementation of TAO::Unknown_IDL_Type (a subclass of TAO::Any_Impl
+  used when an Any is first decoded from the wire or created from a Dynamic
+  Any) to contain its value in a TAO_InputCDR stream rather than an
+  ACE_Message_Block*, thus cleaning up alignment and memory management code
+  related to this type.
 
 USER VISIBLE CHANGES BETWEEN TAO-1.4.2 and TAO-1.4.3
 ====================================================
 
-. ORB
-  - Bug 1476-SyncScope::NONE blocks during connects
+. New pluggable protocol for GIOP over HTBP, known as HTIOP.  Source in
+  orbsvcs/orbsvcs/HTIOP.
+
+. All TAO-specific vendor IDs are now found in the "TAO" namespace.
+  Documentation for these constants has also been improved in a number
+  of cases.
+
+. Further reduced inter-header dependencies, which should improve
+  compilation times for TAO and TAO applications.
+
+. Fixed memory leak in CDR encapsulation Codec's encode_value() method.
+
+. Modified PerlACE scripts for Tests/test environment to allow
+  per-platform customization of process startup delay.  Used the changes
+  in various run_test scripts.
+
+. SyncScope::NONE blocks during connects [Bug 1476].
+
+. Improved compatibility with JDK orb.
+
+. Added Wait on LF No Upcalls (MT_NOUPCALLS) wait strategy.  However,
+  recent experiences with it indicate there may be problems in scenarios
+  other than its original motivating case (see ChangeLog).  This feature
+  should be considered EXPERIMENTAL, and use it at your own risk.
+
+. New CORBALOC parsing is available. This feature allows TAO clients to
+  use any third-party pluggable protocol in corbaloc strings.
+
+. Fixed bug that caused memory fault when incoming object reference
+  contains an unknown profile.
+
+. Fixed problem in some modules when platform lacks unsigned long long
+  support.
+
+. Modified catior to allow decoding of additional protocols.
+
+. The PortableServer library isn't depended anymore on the
+  ObjRefTemplate and IORInterceptor libraries.  ObjRefTemplate and
+  IORInterceptor are loaded on demand and depend on PortableServer.
+
+. IDL compiler can be built for environments that lack unsigned long
+  long.
+
+. Reduced the amount of code generated by the TAO_IDL compiler when
+  using forward declarations.
+
+. Naming Service implementation memory leak fixes.
+
+. Split ORB Services into stub, skeleton, and implementation libraries.
+  Changes to the Naming, Trading, Event, Notification, and Logging
+  Services have been committed.
+
+. Common utilities (tao_imr, tao_ifr, nslist, nsadd, nsdel,
+  NamingViewer) now installed in $ACE_ROOT/bin.
+
+. Changed #includes of orbsvcs header files to be consistent.  The
+  pathname now always contains a "orbsvcs/" prefix.
+
+. Notification Service EventReliability and ConnectionReliability QoS
+  have been added to bring the DOC version of Notification Service
+  into feature parity (in this area) with OCITAO's 1.3a version of the
+  Notification Service.  Note that due to changes between 1.3a's
+  source base and DOC's 1.4.3 source base, this is a re-implementation
+  of the changes and not a simple port.
+
+  In addition to the changes made directly to the Notification Service
+  a number of test and example programs have been created for the
+  reliable notification service. These programs may be found in
+  subdirectories of $TAO_ROOT/orbsvcs/tests/Notify. A README file
+  in each directory provides more detailed information, and a run_test.pl
+  script is included to run the example or test.
+
+. A change has been made to the Notification Service IDL to improve build
+  times and reduce the Notification Service footprint. The change suppresses
+  the generation proxy and stub code for the many interfaces that are
+  specified by the OMG, but are not implemented in TAO.
+
+. Implementation Repository refactored to allow the locator and
+  activator to be used as services in the ACE Service Configurator
+  framework.  The locator and activator services have been split into
+  separate libraries and executables.  There have also been
+  miscellaneous bugs fixed and performance enhancements made.
+
+. Fixed Load Balancer binary generation problem.  Libraries were being
+  created rather than executables.
+
+. Work around MSVC++ 6 namespace brain damage in new Security/SSLIOP
+  code.
+
+. Fixed memory management problem in SecurityLevel3 code.
 
-. POA
-  - The PortableServer library isn't depended anymore on the
-    ObjRefTemplate and IORInterceptor libraries.  ObjRefTemplate and
-    IORInterceptor are loaded on demand and depend on PortableServer.
 
 USER VISIBLE CHANGES BETWEEN TAO-1.4.1 and TAO-1.4.2
 ====================================================
@@ -118,7 +230,7 @@ USER VISIBLE CHANGES BETWEEN TAO-1.4.1 and TAO-1.4.2
     ".i".  The latter is generally used as the extension for
     pre-processed C sources.
   - Process multiple IDL files in a single execution by iteration
-    in a single process, rather than spawing a process for each
+    in a single process, rather than spawning a process for each
     file as before.
   - Added the remaining spec-defined sequences of predefined types
     to the CORBA namespace in TAO.
@@ -198,7 +310,7 @@ IDL COMPILER
 . Changed the names of some local variables in generated
   operation code, to reduce that chance of a name clash.
 
-. Fixed bug where a #pragam version directive is sometimes
+. Fixed bug where a #pragma version directive is sometimes
   not reflected in the generated repository id.
 
 . Disambiguated generated template instantiations for array
@@ -221,7 +333,7 @@ IDL COMPILER
 . Added -GId command line option to generate line and
   file debug info in *I.* files, similar to what is
   already generated in *C.* and *S.* files. This debug
-  info generation is now off by defaul in *I.* files.
+  info generation is now off by default in *I.* files.
 
 . Fixed the handling of included orb.idl file to generate
   corresponding C++ includes for the files orb.idl
@@ -278,12 +390,12 @@ IDL COMPILER
 . Fixed bug in code generation for an array of typedef of
   string and wstring.
 
-. Fixed a bug in the generation of respository ids for
+. Fixed a bug in the generation of repository ids for
   explicit, implicit and equivalent interfaces for component
   homes.
 
 . Fixed bugs in the generation of marshaling and demarshaling
-  code for aggragate types with component or eventtype members.
+  code for aggregate types with component or eventtype members.
 
 ORB SERVICES:
 -------------
@@ -348,13 +460,13 @@ CORE ORB
   specification of -ORBEndpoint sciop:// at startup.
 
 . Fixed a bug that caused the ORB to dump a core when server side
-  interceptors returns an exception and if the operartion parameters
+  interceptors returns an exception and if the operation parameters
   contains a sequence an out parameter.
 
 . Fixed a bug that caused extraction of basic data types that are
   aliased from an Any.
 
-. Added a couple of regerssions tests for some of AMH features.
+. Added a couple of regressions tests for some of AMH features.
 
 . Lots of other bug fixes (see the bottom of this message for a
   complete list of bugzilla bugids fixed in this beta).
@@ -364,7 +476,7 @@ CORE ORB
   where dynamic loading/unloading of the ORB failed.
 
 . Added an option, -ORBDisableRTCollocation which allows users to
-  disable the RT collocation technique used by TAO and fallback on the
+  disable the RT collocation technique used by TAO and fall back on the
   default collocation technique used for the vanilla ORB.
 
 . Prevent the TP_Reactor used within TAO from exiting when it receives
@@ -377,7 +489,7 @@ ORB SERVICES
   independently of libTAO_SSLIOP, and set the default to true.
 
 . An initial implementation of the FTCORBA spec has been added to
-  TAO. This release features an intial cut of ReplicationManager,
+  TAO. This release features an initial cut of ReplicationManager,
   FaultNotifier, and a FaultDetector. Please see
 
   $TAO_ROOT/orbsvcs/tests/FT_App/README
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 451457668da..185db67e7e6 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -43,8 +43,8 @@
 To: tao-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 1.4.2
-    ACE VERSION: 5.4.2
+    TAO VERSION: 1.4.4
+    ACE VERSION: 5.4.4
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/Release b/TAO/Release
index f70cefc8c91..890006fa3f9 100644
--- a/TAO/Release
+++ b/TAO/Release
@@ -10,32 +10,31 @@
 #### the make invocation.
 ####
 
-CONTROLLED_FILES = TAO/COPYING* \
-	    	   TAO/ChangeLog* \
-	  	   TAO/LICENSE.sun \
-		   TAO/PROBLEM-REPORT-FORM \
-                   TAO/Release \
-		   TAO/README* \
-		   TAO/TAO-INSTALL.html \
-		   TAO/TAOACE* \
-		   TAO/TAO.mwc \
-		   TAO/TAO_IDL \
-		   TAO/VERSION \
-		   TAO/docs \
-		   TAO/NEWS \
-		   TAO/examples \
-		   TAO/orbsvcs \
-		   TAO/performance-tests \
-		   TAO/release.pl \
-		   TAO/rules.tao.GNU \
-		   TAO/tao \
-		   TAO/tao-config.1.in \
-		   TAO/tao-config.in \
-		   TAO/taoConf.sh.in \
-	           TAO/tao_targets.GNU \
-		   TAO/taoconfig.mk \
-		   TAO/tests \
-		   TAO/utils
+CONTROLLED_FILES = \
+	TAO/COPYING* \
+	TAO/ChangeLog* \
+	TAO/LICENSE.sun \
+	TAO/PROBLEM-REPORT-FORM \
+	TAO/Release \
+	TAO/README* \
+	TAO/TAO-INSTALL.html \
+	TAO/TAOACE* \
+	TAO/TAO.mwc \
+	TAO/TAO_IDL \
+	TAO/VERSION \
+	TAO/docs \
+	TAO/NEWS \
+	TAO/examples \
+	TAO/interop-tests \
+	TAO/orbsvcs \
+	TAO/performance-tests \
+	TAO/release.pl \
+	TAO/rules.tao.GNU \
+	TAO/tao \
+	TAO/Makefile.am \
+	TAO/configure.ac \
+	TAO/tests \
+	TAO/utils
 
 
 RELEASE_FILES = $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
@@ -43,11 +42,13 @@ RELEASE_FILES = $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
 		ACE_wrappers/TAO/*.dsw \
         	ACE_wrappers/TAO/*.sln \
         	ACE_wrappers/TAO/*.bor \
-                ACE_wrappers/TAO/INSTALL
+        	ACE_wrappers/TAO/configure \
+        	ACE_wrappers/TAO/Makefile.in \
+                ACE_wrappers/TAO/TAO-INSTALL
 
 
 .PHONY: INSTALL
-INSTALL: TAO-INSTALL.html
+TAO-INSTALL: TAO-INSTALL.html
 	@lynx -dump $^ > $@; chmod a+r $@
 
 .PHONY: release tag
@@ -88,3 +89,6 @@ show_release_lib_files:
 
 show_release_tag_files:
 	@echo ""
+
+INSTALL: TAO-INSTALL.html
+	@lynx -dump $< > TAO-INSTALL
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 41f004eeaee..696aed32f42 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -29,18 +29,19 @@
   <tr valign=top>
     <td><b>Fully supported, i.e., continually tested and used daily</b></td>
     <td>Solaris 7, 8 and 9, Windows 2000/XP (6.x, and 7.1 and
-        Borland C++ Builder 6), DEC UNIX 6.5, and Linux/Intel (Redhat,
-        Debian and SuSe),  Linux/Alpha (Redhat, Debian and SuSe).
+        Borland C++ Builder 6), and Linux/Intel (Redhat,
+        Debian and SuSe),  Linux/Alpha (SuSe).
     </td>
   </tr>
   <tr valign=top bgcolor="#AFAFAF">
    <td><b>Nearly fully supported, i.e., periodically tested</b></td>
-   <td>Windows 9x/ME, HP/UX 10.x and 11.x, VxWorks, LynxOS, and AIX 4.x
+   <td>Windows 9x/ME, HP/UX 11.x, VxWorks 5.5.1, LynxOS, and AIX 4.x
    </td>
   </tr>
   <tr valign=top>
     <td><b>Partially supported, i.e., infrequently tested</b></td>
-    <td> FreeBSD, NetBSD, Chorus, Tandem NS and MACOSX
+    <td> FreeBSD, NetBSD, Chorus, Tandem NS, HP/UX 10.x,
+         DEC UNIX 6.5, Linux/Alpha (Redhat and Debian), and MACOSX
     </td>
   </tr>
   <tr valign=top bgcolor="#AFAFAF">
@@ -60,8 +61,8 @@ TAO.  If you have <A
 HREF="../docs/ACE-porting.html">porting
 questions</A> or have a problem compiling the TAO along with ACE
 wrappers on the platforms shown above please send email to either the
-<A HREF="news:comp.soft-sys.ace">Newsgroup</A> or to the <A 
-HREF="mailto:ace-users@cs.wustl.edu">TAO mailing list</A> and we'll
+<A HREF="news:comp.soft-sys.ace">Newsgroup</A> or to the <A
+HREF="mailto:tao-users@cs.wustl.edu">TAO mailing list</A> and we'll
 try to help you fix the problems.  You can also submit bug reports and
 enhancement requests in our
 <a href="../docs/usage-bugzilla.html">bug tracking system</a>.<P>
@@ -74,7 +75,7 @@ with the <A
 HREF="http://www.dre.vanderbilt.edu/ACE"> ACE </A> release.  You'll
 always need the most recent version of ACE because TAO tracks and
 influences changes to ACE.  Always use the ACE+TAO release
-bundle as a single piece instead of trying to mix and match things up.<P> 
+bundle as a single piece instead of trying to mix and match things up.<P>
 
 <HR><P>
 <H3>On UNIX platforms</H3>
@@ -123,7 +124,7 @@ bundle as a single piece instead of trying to mix and match things up.<P>
         <P>If you wish to compile the ORB services distributed with TAO,
           including the <CODE>Naming_Service</CODE> you
           must include <CODE>$TAO_ROOT/orbsvcs</CODE> to the list
-          above.  Please see the 
+          above.  Please see the
           <A HREF="docs/configurations.html#orbsvcs">TAO configuration documentation</a>
           for a discussion on how to create a subset configuration of specific
           TAO ORB servcies.
@@ -150,6 +151,24 @@ bundle as a single piece instead of trying to mix and match things up.<P>
 
 </OL>
 
+<h3><strong><a name="sun_g++_notes">Note About g++ On
+Solaris for x86 Target</a></strong></h3> 
+
+If you install g++/gcc from <a href="www.blastwave.org"> blastwave
+</a> then this note is applicable for you. If you are in the habit of
+building g++/gcc from sources directly, please feel free to skip this
+section. <p>
+
+The distribution from <a href="www.blastwave.org">  blastwave</a> has,
+as we believe, a bug in it. This bug manifests as compilation errors
+when you try to build the orbsvcs when debugging is enabled. Please
+remember that debugging is enabled in your platform_macros.GNU if you
+haven't specifically disabled it. The easiest way to address this
+issue is to set debug=0 in platform_macros.GNu file or build a g++
+compiler for your target platform. A bug has been registered with
+blastwave. If you have more questions please feel to contact <a
+mailto="bala at dre.vanderbilt.edu"> Bala Natarajan </a>. 
+
 <h2><strong><a name="makenotes">A Note On Make</a></strong></h2>
 
 Since TAO is built atop ACE, TAO re-uses ACE's Makefile structure as
@@ -160,7 +179,7 @@ etc.<p>
 
 GNU Make can be obtained from various places in source and binary
 form. Please see <a href="../ACE-INSTALL.html"> ACE-INSTALL.html </a>
-for details from where they can be obtained.<P> 
+for details from where they can be obtained.<P>
 
 
 <HR><P>
@@ -290,7 +309,7 @@ $ echo 'include $(ACE_ROOT)/include/makeinclude/platform_TARGET.GNU' \
       <a href="../ACE-INSTALL.html#vxworks">../ACE-INSTALL.html</a>,
       and
       <a href="../ACE-INSTALL.html#VxWorks/NT">Building ACE on
-	Tornado/NT hosts for VxWorks targets</a>
+        Tornado/NT hosts for VxWorks targets</a>
     </P>
 
     <P>Please note that dynamic loading of libraries is not supported
@@ -301,7 +320,7 @@ $ echo 'include $(ACE_ROOT)/include/makeinclude/platform_TARGET.GNU' \
     <P>If using perfect hashing, TAO_IDL needs gperf to be built on
       the host. That's the default on many platforms.  First, build
       <code>gperf</code> in the
-      <code>ACE_wrappers/apps/gperf/src/</code> directory.  
+      <code>ACE_wrappers/apps/gperf/src/</code> directory.
     </P>
 
     <H4>Which one is right for me?</H4>
@@ -344,7 +363,7 @@ are setup up to work in this configuration. If you move it, then make
 sure you regenerate the project files to look for the include and
 library files in the correct place. The default place for placing the
 library files are $ACE_ROOT/lib. You can change this setting in <a
-href=../bin/MakeProjectCreator/config/acedefaults.mpb"> this base
+href="../bin/MakeProjectCreator/config/acedefaults.mpb"> this base
 project </a> file.</P>
 
 <OL>
@@ -370,21 +389,6 @@ project </a> file.</P>
       and build both client and server. <P>
 </OL>
 
-<H4><A NAME="taoace">TAOACE.dsw, and TAOACE.sln files</A></H4>
-
-<P>TAOACE.dsw and TAOACE.sln are  Visual C++ 6.0 and VC 7.1 workspace
-files that loads the projects ACE, ACEXML, Kokyu, TAO, TAO_IDL (the
-compiler), gperf, the orb services libraries, and the standalone
-executables (such as Naming Service, etc.).  It can be used to build
-all the files needed to build/run TAO applications.</P>  
-
-<<<<<<< TAO-INSTALL.html
-<H4>Visual C++ 7.1</H4> The DOC group doesn't support TAO on VC++ 7.0
-since the libraries that were shipped with VC++ 7.0 did not work
-well. The DOC group supports only VC++ 7.1, which is used by their
-sponsors. The following points are relevant to users who are trying to
-use TAO with VC++ 7.1.
-=======
 <H4>Visual C++ 7.1</H4>
 The DOC group doesn't support TAO on VC++ 7.0 since the libraries that
 were shipped with VC++ 7.0 did not work well. The DOC group supports
@@ -393,7 +397,6 @@ points are also relevant to users who are trying to use TAO with VC++
 7.1. Additionally, all required options are set for the generated .sln
 files. If something is missing then it is probably a bug with
 MPC. Please report such bugs to the tao-users newsgroups.
->>>>>>> 1.86
 
 <H4>Borland C++ Builder</H4> <P>
 
@@ -434,7 +437,7 @@ creating static libraries and linking with them.
 <P>First, follow the build instructions in the
 <A HREF="../ACE-INSTALL.html#mingw">ACE installation notes.</A>
 When building with MinGW and Cygwin you are using the GNU make under Windows.
-When you use make from the commandline, make sure that <code>TAO_ROOT</code> is 
+When you use make from the commandline, make sure that <code>TAO_ROOT</code> is
 set to a full path or to <code>%ACE_ROOT%/TAO</code>, which will also result
 in setting a full path. Setting it with the Unix style to <code>$ACE_ROOT/TAO</code>
 will not work, setting it using the make style to <code>$(ACE_ROOT)/TAO</code> looks
@@ -499,27 +502,27 @@ GNUmakefiles, and project files for building on various platforms will
 not be available. Users from anon cvs are expected to generate them
 using <a href="../MPC/README">MPC</a> before building ACE, TAO or
 CIAO. We point out some suggestions below to get bootstrapped
-quickly. 
+quickly.
 
 <UL>
   <LI> Please see <a href="#MPC"> instructions </a> above to  download
-  MPC from anon cvs repository <p>       
+  MPC from anon cvs repository <p>
   <LI>Please make sure that you have <a href="http://www.perl.org">
-  perl</a> installed, preferably perl 
-  5.8 or higher. Users on Win32 based platforms are recommended to use
+  perl</a> installed, preferably perl
+   5.8 or higher. Users on Win32 based platforms are recommended to use
   <a href="http://www.activestate.com/Products/ActivePerl/"> Active
   State Perl </a>. We use active state perl without problems. We have
   ran into problems trying to use the cygwin version of perl on Win32
   based platforms. <p>
   <LI>If you just want to build TAO and associated tests, examples,
   and associated utility libraries, we recommend the following
-  alternatives: 
+  alternatives:
     <UL>
     <LI> Build ACE and TAO seperately. ACE needs to be built first and
   instructins for building ACE are available at <a
   href="../ACE-INSTALL.html#MPC">ACE-INSTALL</a>. GNUmakefiles and
   project files for TAO can be generated by using the following
-  commands:<p> 
+  commands:<p>
     <CODE> $ACE_ROOT/bin/mwc.pl TAO.mwc </CODE> <p>
    from <CODE> $TAO_ROOT </CODE> to generate GNUmakefiles. Use <CODE>
   -type vc6 </CODE> or <CODE>-type vc71</CODE> to generate VC6 and
@@ -539,9 +542,9 @@ quickly.
   <LI>If you want to build CIAO and its associated libraries
   please see <a href="CIAO/CIAO-INSTALL.html"> CIAO-INSTALL <a> for
   details.
-  
-  </UL>  
-  
+
+  </UL>
+
 
 <HR><P>
 Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A> home page.
diff --git a/TAO/TAOACE.mwc b/TAO/TAOACE.mwc
index 35c4ffa7986..38830f933d9 100644
--- a/TAO/TAOACE.mwc
+++ b/TAO/TAOACE.mwc
@@ -8,6 +8,7 @@ workspace {
   ../ACEXML/parser/parser
   ../ACEXML/apps/svcconf
   ../Kokyu/Kokyu.mpc
+  ../protocols
   tao
   TAO_IDL
   utils
@@ -16,5 +17,5 @@ workspace {
     orbsvcs/tests
     orbsvcs/performance-tests
     orbsvcs/examples
-  }  
+  }
 }
diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am
index 16475309829..d9e2db55e41 100644
--- a/TAO/TAO_IDL/Makefile.am
+++ b/TAO/TAO_IDL/Makefile.am
@@ -1,37 +1,27 @@
 ##  Process this file with automake to create Makefile.in
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
 
 ## Makefile.TAO_IDL_FE.am 
 
 lib_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 \
- $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH)
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(srcdir)/include \
+  -I$(srcdir)/fe \
+  -DTAO_IDL_FE_BUILD_DLL
 
 libTAO_IDL_FE_la_SOURCES = \
-  fe/fe_declarator.cpp \
-  fe/fe_interface_header.cpp \
-  fe/fe_extern.cpp \
-  fe/fe_global.cpp \
-  fe/fe_init.cpp \
-  fe/fe_lookup.cpp \
-  fe/fe_private.cpp \
-  fe/fe_tmplinst.cpp \
-  fe/lex.yy.cpp \
-  fe/y.tab.cpp \
   ast/ast_argument.cpp \
-  ast/ast_attribute.cpp \
   ast/ast_array.cpp \
-  ast/ast_component.cpp \
+  ast/ast_attribute.cpp \
   ast/ast_check.cpp \
-  ast/ast_interface_fwd.cpp \
+  ast/ast_component.cpp \
   ast/ast_component_fwd.cpp \
   ast/ast_concrete_type.cpp \
   ast/ast_constant.cpp \
@@ -47,10 +37,10 @@ libTAO_IDL_FE_la_SOURCES = \
   ast/ast_generator.cpp \
   ast/ast_home.cpp \
   ast/ast_interface.cpp \
-  ast/ast_operation.cpp \
+  ast/ast_interface_fwd.cpp \
   ast/ast_module.cpp \
   ast/ast_native.cpp \
-  ast/ast_union_branch.cpp \
+  ast/ast_operation.cpp \
   ast/ast_predefined_type.cpp \
   ast/ast_recursive.cpp \
   ast/ast_redef.cpp \
@@ -62,42 +52,51 @@ libTAO_IDL_FE_la_SOURCES = \
   ast/ast_type.cpp \
   ast/ast_typedef.cpp \
   ast/ast_union.cpp \
-  ast/ast_valuetype_fwd.cpp \
+  ast/ast_union_branch.cpp \
   ast/ast_union_fwd.cpp \
   ast/ast_union_label.cpp \
   ast/ast_valuetype.cpp \
+  ast/ast_valuetype_fwd.cpp \
   ast/ast_visitor.cpp \
-  util/utl_exceptlist.cpp \
+  fe/fe_declarator.cpp \
+  fe/fe_extern.cpp \
+  fe/fe_global.cpp \
+  fe/fe_init.cpp \
+  fe/fe_interface_header.cpp \
+  fe/fe_lookup.cpp \
+  fe/fe_private.cpp \
+  fe/fe_tmplinst.cpp \
+  fe/lex.yy.cpp \
+  fe/y.tab.cpp \
+  narrow/narrow.cpp \
+  util/utl_decllist.cpp \
   util/utl_err.cpp \
-  util/utl_identifier.cpp \
+  util/utl_exceptlist.cpp \
   util/utl_exprlist.cpp \
   util/utl_global.cpp \
-  util/utl_labellist.cpp \
+  util/utl_identifier.cpp \
   util/utl_idlist.cpp \
   util/utl_indenter.cpp \
-  util/utl_namelist.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 \
-  util/utl_decllist.cpp \
-  narrow/narrow.cpp
-
-libTAO_IDL_FE_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ 
+  util/utl_strlist.cpp
 
 libTAO_IDL_FE_la_LIBADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
+  ${ACE_BUILDDIR}/ace/libACE.la
 
 noinst_HEADERS = \
-  include/ast_argument.h \
+  fe/y.tab.h \
+  include/TAO_IDL_FE_Export.h \
   include/ast.h \
-  include/ast_attribute.h \
+  include/ast_argument.h \
   include/ast_array.h \
-  include/ast_component_fwd.h \
+  include/ast_attribute.h \
   include/ast_component.h \
-  include/ast_factory.h \
+  include/ast_component_fwd.h \
   include/ast_concrete_type.h \
   include/ast_constant.h \
   include/ast_decl.h \
@@ -108,126 +107,94 @@ noinst_HEADERS = \
   include/ast_exception.h \
   include/ast_expression.h \
   include/ast_extern.h \
-  include/ast_generator.h \
+  include/ast_factory.h \
   include/ast_field.h \
-  include/ast_interface.h \
+  include/ast_generator.h \
   include/ast_home.h \
-  include/ast_predefined_type.h \
+  include/ast_interface.h \
   include/ast_interface_fwd.h \
   include/ast_module.h \
   include/ast_native.h \
   include/ast_operation.h \
-  include/ast_sequence.h \
+  include/ast_predefined_type.h \
   include/ast_root.h \
-  include/ast_structure.h \
+  include/ast_sequence.h \
   include/ast_string.h \
-  include/fe_interface_header.h \
-  include/utl_idlist.h \
+  include/ast_structure.h \
   include/ast_structure_fwd.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_valuetype.h \
-  include/fe_extern.h \
   include/ast_union_label.h \
+  include/ast_valuetype.h \
   include/ast_valuetype_fwd.h \
   include/ast_visitor.h \
   include/drv_extern.h \
   include/fe_declarator.h \
-  include/global_extern.h \
+  include/fe_extern.h \
+  include/fe_interface_header.h \
   include/fe_private.h \
-  include/idl_defines.h \
+  include/global_extern.h \
   include/idl_bool.h \
-  include/utl_decllist.h \
+  include/idl_defines.h \
   include/idl_global.h \
   include/idl_narrow.h \
+  include/idl_uns_long.h \
   include/nr_extern.h \
-  include/utl_exceptlist.h \
+  include/utl_decllist.h \
   include/utl_err.h \
-  include/utl_scoped_name.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_strlist.h \
+  include/utl_scoped_name.h \
   include/utl_stack.h \
   include/utl_string.h \
-  include/TAO_IDL_FE_Export.h \
-  fe/y.tab.h
-
+  include/utl_strlist.h
 
 ## Makefile.TAO_IDL_BE.am 
 
 lib_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 \
- $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH)
+  -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_visitor_component_fwd.cpp \
-  be/be_visitor_constant.cpp \
-  be/be_visitor_context.cpp \
-  be/be_visitor_decl.cpp \
-  be/be_visitor_enum.cpp \
-  be/be_visitor_eventtype.cpp \
-  be/be_visitor_eventtype_fwd.cpp \
-  be/be_visitor_exception.cpp \
-  be/be_visitor_factory.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_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_tmplinst.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_valuetype.cpp \
-  be/be_visitor_valuetype_fwd.cpp \
-  be/be_init.cpp \
   be/be_argument.cpp \
-  be/be_attribute.cpp \
   be/be_array.cpp \
-  be/be_component_fwd.cpp \
+  be/be_attribute.cpp \
   be/be_codegen.cpp \
   be/be_component.cpp \
-  be/be_eventtype_fwd.cpp \
+  be/be_component_fwd.cpp \
   be/be_constant.cpp \
   be/be_decl.cpp \
   be/be_enum.cpp \
   be/be_enum_val.cpp \
-  be/be_factory.cpp \
   be/be_eventtype.cpp \
-  be/be_expression.cpp \
+  be/be_eventtype_fwd.cpp \
   be/be_exception.cpp \
-  be/be_interface_fwd.cpp \
+  be/be_expression.cpp \
+  be/be_factory.cpp \
   be/be_field.cpp \
-  be/be_home.cpp \
   be/be_generator.cpp \
   be/be_global.cpp \
   be/be_helper.cpp \
+  be/be_home.cpp \
+  be/be_init.cpp \
   be/be_interface.cpp \
-  be/be_root.cpp \
-  be/be_structure_fwd.cpp \
+  be/be_interface_fwd.cpp \
   be/be_interface_strategy.cpp \
   be/be_module.cpp \
   be/be_native.cpp \
@@ -235,99 +202,93 @@ libTAO_IDL_BE_la_SOURCES = \
   be/be_operation_strategy.cpp \
   be/be_predefined_type.cpp \
   be/be_produce.cpp \
-  be/be_type.cpp \
+  be/be_root.cpp \
   be/be_scope.cpp \
   be/be_sequence.cpp \
   be/be_stream_factory.cpp \
   be/be_string.cpp \
   be/be_structure.cpp \
-  be/be_union_branch.cpp \
+  be/be_structure_fwd.cpp \
   be/be_sunsoft.cpp \
   be/be_tmplinst.cpp \
+  be/be_type.cpp \
   be/be_typedef.cpp \
   be/be_union.cpp \
-  be/be_union_label.cpp \
+  be/be_union_branch.cpp \
   be/be_union_fwd.cpp \
-  be/be_valuetype_fwd.cpp \
+  be/be_union_label.cpp \
   be/be_valuetype.cpp \
-  be/be_visitor_argument.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_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
-
-libTAO_IDL_BE_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ 
+  be/be_visitor_component.cpp \
+  be/be_visitor_component_fwd.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_factory.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_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_tmplinst.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_valuetype.cpp \
+  be/be_visitor_valuetype_fwd.cpp
 
 libTAO_IDL_BE_la_LIBADD = \
- libTAO_IDL_FE.la \
- $(ACE_BUILDDIR)/ace/libACE.la
+  libTAO_IDL_FE.la \
+  ${ACE_BUILDDIR}/ace/libACE.la
 
 noinst_HEADERS += \
-  be_include/be_visitor_component.h \
-  be_include/be_visitor_component_fwd.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_eventtype.h \
-  be_include/be_visitor_eventtype_fwd.h \
-  be_include/be_visitor_exception.h \
-  be_include/be_visitor_factory.h \
-  be_include/be_visitor_field.h \
-  be_include/be_visitor_home.h \
-  be_include/be_visitor_interface_fwd.h \
-  be_include/be_visitor_module.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_tmplinst.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_valuetype.h \
-  be_include/be_visitor_valuetype_fwd.h \
-  be_include/be_visitor_interface.h \
   be_include/TAO_IDL_BE_Export.h \
-  be_include/be_component_fwd.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_eventtype_fwd.h \
+  be_include/be_component_fwd.h \
   be_include/be_constant.h \
   be_include/be_decl.h \
   be_include/be_enum.h \
   be_include/be_enum_val.h \
   be_include/be_eventtype.h \
-  be_include/be_generator.h \
+  be_include/be_eventtype_fwd.h \
   be_include/be_exception.h \
   be_include/be_expression.h \
   be_include/be_extern.h \
   be_include/be_factory.h \
   be_include/be_field.h \
-  be_include/be_interface.h \
+  be_include/be_generator.h \
   be_include/be_global.h \
   be_include/be_helper.h \
   be_include/be_home.h \
-  be_include/be_interface_strategy.h \
+  be_include/be_interface.h \
   be_include/be_interface_fwd.h \
-  be_include/be_operation.h \
+  be_include/be_interface_strategy.h \
   be_include/be_module.h \
   be_include/be_native.h \
-  be_include/be_union_branch.h \
-  be_include/be_sunsoft.h \
+  be_include/be_operation.h \
   be_include/be_operation_strategy.h \
   be_include/be_predefined_type.h \
   be_include/be_root.h \
@@ -337,50 +298,77 @@ noinst_HEADERS += \
   be_include/be_string.h \
   be_include/be_structure.h \
   be_include/be_structure_fwd.h \
+  be_include/be_sunsoft.h \
   be_include/be_type.h \
   be_include/be_typedef.h \
   be_include/be_union.h \
-  be_include/be_valuetype_fwd.h \
+  be_include/be_union_branch.h \
   be_include/be_union_fwd.h \
   be_include/be_union_label.h \
   be_include/be_valuetype.h \
-  be_include/be_visitor_array.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_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_ccm_pre_proc.h \
+  be_include/be_visitor_component.h \
+  be_include/be_visitor_component_fwd.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_factory.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_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_tmplinst.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_valuetype.h \
+  be_include/be_visitor_valuetype_fwd.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 \
- $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH)
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(srcdir)/include \
+  -I$(srcdir)/be_include \
+  -I$(srcdir)/fe
 
 tao_idl_SOURCES = \
   driver/drv_args.cpp \
   driver/drv_preproc.cpp \
-  tao_idl.cpp
+  tao_idl.cpp \
+  include/drv_extern.h
 
 tao_idl_LDADD = \
- libTAO_IDL_BE.la \
- libTAO_IDL_FE.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-noinst_HEADERS += \
-  include/drv_extern.h
+  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_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index c0721b6a34b..f877e5ef2c9 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -93,8 +93,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
-ACE_RCSID (ast, 
-           ast_decl, 
+ACE_RCSID (ast,
+           ast_decl,
            "$Id$")
 
 COMMON_Base::COMMON_Base (idl_bool local,
@@ -263,7 +263,7 @@ AST_Decl::compute_full_name (UTL_ScopedName *n)
 }
 
 void
-AST_Decl::set_prefix_with_typeprefix_r (char *value,
+AST_Decl::set_prefix_with_typeprefix_r (const char *value,
                                         UTL_Scope *appeared_in)
 {
   if (this->typeid_set_)
@@ -296,7 +296,7 @@ AST_Decl::set_prefix_with_typeprefix_r (char *value,
       AST_Decl *tmp = 0;
       UTL_Scope *s_tmp = 0;
 
-      for (UTL_ScopeActiveIterator i (s, UTL_Scope::IK_decls); 
+      for (UTL_ScopeActiveIterator i (s, UTL_Scope::IK_decls);
            !i.is_done ();
            i.next ())
         {
@@ -355,8 +355,8 @@ AST_Decl::compute_full_name (void)
       long second = I_FALSE;
       char *name = 0;
 
-      for (UTL_IdListActiveIterator i (this->name ()); 
-           !i.is_done (); 
+      for (UTL_IdListActiveIterator i (this->name ());
+           !i.is_done ();
            i.next ())
         {
           if (!first)
@@ -393,8 +393,8 @@ AST_Decl::compute_full_name (void)
       first = I_TRUE;
       second = I_FALSE;
 
-      for (UTL_IdListActiveIterator j (this->name ()); 
-           !j.is_done (); 
+      for (UTL_IdListActiveIterator j (this->name ());
+           !j.is_done ();
            j.next ())
         {
           if (!first)
@@ -484,8 +484,8 @@ AST_Decl::compute_repoID (void)
       namelen += 4;
     }
 
-  for (UTL_IdListActiveIterator i (this->name ()); 
-       !i.is_done (); 
+  for (UTL_IdListActiveIterator i (this->name ());
+       !i.is_done ();
        i.next ())
     {
       if (!first)
@@ -540,12 +540,12 @@ AST_Decl::compute_repoID (void)
 
       ACE_OS::strcat (this->repoID_, "/");
     }
-  
+
   first = I_TRUE;
   second = I_FALSE;
 
-  for (UTL_IdListActiveIterator j (this->name ()); 
-       !j.is_done (); 
+  for (UTL_IdListActiveIterator j (this->name ());
+       !j.is_done ();
        j.next ())
     {
       if (!first)
@@ -869,7 +869,7 @@ AST_Decl::repoID (char *value)
       delete [] this->repoID_;
       this->repoID_ = 0;
     }
-    
+
   this->repoID_ = value;
 }
 
@@ -880,7 +880,7 @@ AST_Decl::prefix (void)
 }
 
 void
-AST_Decl::prefix (char *value)
+AST_Decl::prefix (const char *value)
 {
   delete [] this->prefix_;
   this->prefix_ = ACE::strnew (value);
@@ -933,14 +933,14 @@ AST_Decl::version (char *value)
     {
       delete [] this->version_;
       this->version_ = value;
-      
+
       // Repo id is now computed eagerly, so a version set must update
       // is as well.
       if (this->repoID_ != 0)
         {
           ACE_CString tmp (this->repoID_);
           int pos = tmp.rfind (':');
-          
+
           if (pos != ACE_CString::npos)
             {
               tmp = tmp.substr (0, pos + 1) + value;
@@ -994,7 +994,7 @@ AST_Decl::set_id_with_typeid (char *value)
   {
     case AST_Decl::NT_field:
       {
-        AST_Interface *iface = 
+        AST_Interface *iface =
           AST_Interface::narrow_from_scope (this->defined_in ());
 
         if (iface == 0 || iface->node_type () == AST_Decl::NT_valuetype == 0)
@@ -1034,7 +1034,7 @@ AST_Decl::set_id_with_typeid (char *value)
 }
 
 void
-AST_Decl::set_prefix_with_typeprefix (char *value)
+AST_Decl::set_prefix_with_typeprefix (const char *value)
 {
   // Are we a legal type for 'typeprefix'? This is checked only at
   // the top level.
@@ -1343,14 +1343,6 @@ void
 AST_Decl::last_referenced_as (UTL_ScopedName *n)
 {
   this->last_referenced_as_ = n;
-
-  if (idl_global->in_main_file ()
-      && ACE_OS::strcmp (n->last_component ()->get_string (),
-                         "ParameterMode") == 0)
-    {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.parametermode_seen_);
-    }
 }
 
 UTL_Scope *
@@ -1366,7 +1358,7 @@ AST_Decl::prefix_scope (UTL_Scope *s)
 }
 
 // Container types will override this.
-int 
+int
 AST_Decl::contains_wstring (void)
 {
   if (this->contains_wstring_ == -1)
@@ -1376,7 +1368,7 @@ AST_Decl::contains_wstring (void)
           case AST_Decl::NT_array:
             {
               AST_Array *a = AST_Array::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 a->base_type ()->contains_wstring ();
               break;
             }
@@ -1385,14 +1377,14 @@ AST_Decl::contains_wstring (void)
           case AST_Decl::NT_union:
             {
               AST_Structure *s = AST_Structure::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 s->contains_wstring ();
               break;
             }
           case AST_Decl::NT_sequence:
             {
               AST_Sequence *s = AST_Sequence::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 s->base_type ()->contains_wstring ();
               break;
             }
@@ -1401,14 +1393,14 @@ AST_Decl::contains_wstring (void)
           case AST_Decl::NT_union_branch:
             {
               AST_Field *f = AST_Field::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 f->field_type ()->contains_wstring ();
               break;
             }
           case AST_Decl::NT_typedef:
             {
               AST_Typedef *td = AST_Typedef::narrow_from_decl (this);
-              this->contains_wstring_ = 
+              this->contains_wstring_ =
                 td->primitive_base_type ()->contains_wstring ();
               break;
             }
@@ -1425,7 +1417,7 @@ AST_Decl::contains_wstring (void)
 }
 
 // Non-virtual - no need to override this one.
-void 
+void
 AST_Decl::contains_wstring (int val)
 {
   this->contains_wstring_ = val;
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 4cd2bf8af20..e4efec3ac4c 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -237,7 +237,7 @@ AST_Expression::AST_Expression (unsigned long ulv)
 }
 
 // An AST_Expression denoting an unsigned long integer.
-AST_Expression::AST_Expression (ACE_UINT64 ulv,
+AST_Expression::AST_Expression (idl_uns_long ulv,
                                 ExprType t)
   : pd_ec (EC_none),
     pd_ev (0),
@@ -252,7 +252,11 @@ AST_Expression::AST_Expression (ACE_UINT64 ulv,
            AST_ExprValue);
 
   this->pd_ev->et = t;
+#if defined (ACE_LACKS_LONGLONG_T)
+  this->pd_ev->u.ulval = ulv;
+#else
   this->pd_ev->u.ullval = ulv;
+#endif
 }
 
 // An AST_Expression denoting a 32-bit floating point number.
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index aef8463440c..81765b7807f 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -705,7 +705,7 @@ AST_Generator::create_expr (long v,
 }
 
 AST_Expression *
-AST_Generator::create_expr (ACE_UINT64 v,
+AST_Generator::create_expr (idl_uns_long v,
                             AST_Expression::ExprType t)
 {
   AST_Expression *retval = 0;
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
index 265704c8cfc..fe2ffed59a7 100644
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ b/TAO/TAO_IDL/ast/ast_operation.cpp
@@ -443,6 +443,15 @@ AST_Operation::fe_add_argument (AST_Argument *t)
                            I_FALSE,
                            t->local_name ());
 
+  UTL_ScopedName *mru = arg_type->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (arg_type,
+                               I_FALSE,
+                               mru->first_component ());
+    }
+
   return t;
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp
index 99fbca2ac38..d95c3cc6cd4 100644
--- a/TAO/TAO_IDL/ast/ast_recursive.cpp
+++ b/TAO/TAO_IDL/ast/ast_recursive.cpp
@@ -141,7 +141,7 @@ AST_illegal_recursive_type (AST_Decl *t)
   if (nt == AST_Decl::NT_interface)
     {
       // Check for interface->struct/union->....->interface nesting.
-      return AST_illegal_interface_recursion (t);
+//      return AST_illegal_interface_recursion (t);
     }
   else if (nt != AST_Decl::NT_struct && nt != AST_Decl::NT_union)
     {
diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp
index 1cd6826c64d..5daf5e67380 100644
--- a/TAO/TAO_IDL/ast/ast_root.cpp
+++ b/TAO/TAO_IDL/ast/ast_root.cpp
@@ -220,16 +220,22 @@ AST_Root::destroy ()
 {
   long i = 0;
   long j = 0;
+  AST_Decl *d = 0;
     
   // Just destroy and delete the non-predefined types in the
   // scope, in case we are processing multiple IDL files.
   // Final cleanup will be done in fini().
   for (i = this->pd_decls_used; i > 0; --i)
     {
-      AST_Decl *d = this->pd_decls[i - 1];
+      d = this->pd_decls[i - 1];
       
+      // We want to keep the predefined types we add to global
+      // scope around and not add them each time.
       if (d->node_type () == AST_Decl::NT_pre_defined)
         {
+          // This needs to be j = i, but it has been temporarily
+          // changed for the CoSMIC release. Need to actually
+          // track down the source of the problem with tao_picml.
           j = i;
           break;
         }
@@ -242,7 +248,7 @@ AST_Root::destroy ()
     
   for (i = this->pd_referenced_used; i > j; --i)
     {
-      AST_Decl *d = this->pd_referenced[i - 1];    
+      d = this->pd_referenced[i - 1];    
       d = 0;
       --this->pd_referenced_used;
     }
@@ -260,7 +266,7 @@ void
 AST_Root::fini (void)
 {
   long i = 0;
-   
+  
   for (i = this->pd_referenced_used; i > 0; --i)
     {
       AST_Decl *d = this->pd_referenced[i - 1];
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
index 8ae07c34fe3..f8cd8ccb7b4 100644
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ b/TAO/TAO_IDL/ast/ast_union.cpp
@@ -646,7 +646,7 @@ AST_Union::compute_default_value (void)
       ACE_NOTREACHED (break;)
     } // End of switch
 
-  // If we have determined that we don't need a default case and even then a
+  // If we have determined that we don't have a default case and even then a
   // default case was provided, flag this off as error.
   if ((this->default_value_.computed_ == 0)
       && (this->default_index () != -1))
@@ -968,6 +968,14 @@ AST_Union::fe_add_union_branch (AST_UnionBranch *t)
   // Add it to scope.
   this->add_to_scope (t);
 
+  // If we have an enum discriminator, add the label names to
+  // the name_referenced list before we add the union branch,
+  // so a branch name clash with a label name will be caught.
+  if (this->pd_udisc_type == AST_Expression::EV_enum)
+    {
+      t->add_labels (this);
+    }
+
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
                            I_FALSE,
@@ -982,7 +990,7 @@ AST_Union::fe_add_union_branch (AST_UnionBranch *t)
                                I_FALSE,
                                mru->first_component ());
     }
-
+    
   this->fields_.enqueue_tail (t);
 
   return t;
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
index 736e15ec3a4..9f1809d397d 100644
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp
@@ -71,6 +71,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ast_union_branch.h"
 #include "ast_union_label.h"
+#include "ast_union.h"
 #include "ast_visitor.h"
 #include "utl_labellist.h"
 
@@ -161,6 +162,28 @@ AST_UnionBranch::label_list_length (void)
     }
 }
 
+void
+AST_UnionBranch::add_labels (AST_Union *u)
+{
+  AST_UnionLabel *ul = 0;
+  AST_Expression *ex = 0;
+
+  for (UTL_LabellistActiveIterator i (this->pd_ll);
+       !i.is_done ();
+       i.next ())
+    {
+      ul = i.item ();
+      
+      if (ul->label_kind () == AST_UnionLabel::UL_default)
+        {
+          return;
+        }
+        
+      ex = ul->label_val ();
+      u->add_to_name_referenced (ex->n ()->first_component ());
+    }
+}
+
 // Narrowing.
 IMPL_NARROW_METHODS1(AST_UnionBranch, AST_Field)
 IMPL_NARROW_FROM_DECL(AST_UnionBranch)
diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp
index e3485d1758f..1aafd25caa1 100644
--- a/TAO/TAO_IDL/be/be_argument.cpp
+++ b/TAO/TAO_IDL/be/be_argument.cpp
@@ -23,6 +23,7 @@
 #include "be_type.h"
 #include "be_visitor.h"
 #include "nr_extern.h"
+#include "global_extern.h"
 
 ACE_RCSID (be,
            be_argument,
@@ -56,7 +57,13 @@ be_argument::be_argument (AST_Argument::Direction d,
 
   // If there have been previous errors, dcl may be 0,
   // and we don't want to crash, so we check for non-zero.
-  if (dcl != 0 && !dcl->is_local ())
+  // Also, we don't want to set the bit if the operation is
+  // declared in an included file UNLESS the enclosing 
+  // interface is abstract, in which case we regenerate the
+  // operation.
+  if (dcl != 0
+      && !dcl->is_local ()
+      && (idl_global->in_main_file () || dcl->is_abstract ()))
     {
       be_type *bt = be_type::narrow_from_decl (ft);
       bt->seen_in_operation (I_TRUE);
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index dd7088e3603..56e956a7c49 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -71,8 +71,7 @@ be_array::be_array (UTL_ScopedName *n,
 {
   if (!this->imported ())
     {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.array_seen_);
+      idl_global->array_seen_ = true;
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
index b00d7d35941..2f62f94e7cc 100644
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ b/TAO/TAO_IDL/be/be_attribute.cpp
@@ -80,16 +80,14 @@ be_attribute::be_attribute (idl_bool ro,
   // TAO_IDL generated attribute methods currently have an exception
   // specification containing CORBA::SystemException.  Make sure we
   // generate a "tao/SystemException.h" include directive.
-  ACE_SET_BITS (idl_global->decls_seen_info_,
-                idl_global->decls_seen_masks.operation_seen_);
+  idl_global->operation_seen_ = true;
 
   if (!this->imported () && !this->is_local ())
     {
       // For the return types of the two operations
       // generated from this attribute.
       this->set_arg_seen_bit (be_type::narrow_from_decl (ft));
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.basic_arg_seen_);
+      idl_global->basic_arg_seen_ = true;
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 67ddf434e32..f8163b8b98b 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -169,6 +169,7 @@ TAO_CodeGen::start_client_header (const char *fname)
                             << "\"\n\n";
     }
 
+  // To get ACE_UNUSED_ARGS
   this->gen_standard_include (this->client_header_,
                               "ace/config-all.h");
 
@@ -252,9 +253,7 @@ TAO_CodeGen::start_client_header (const char *fname)
                         << "#endif /* TAO_EXPORT_NESTED_CLASSES */";
 
   *this->client_header_ << "\n\n#if defined(_MSC_VER)\n"
-                        << "#if (_MSC_VER >= 1200)\n"
                         << "#pragma warning(push)\n"
-                        << "#endif /* _MSC_VER >= 1200 */\n"
                         << "#pragma warning(disable:4250)";
 
   if (be_global->use_raw_throw ())
@@ -428,14 +427,6 @@ TAO_CodeGen::start_server_header (const char *fname)
                                    server_hdr);
     }
 
-  // Include the Messaging files if AMI is enabled.
-  if (be_global->ami_call_back () == I_TRUE)
-    {
-      // Include Messaging skeleton file.
-      this->gen_standard_include (this->server_header_,
-                                  "tao/Messaging/MessagingS.h");
-    }
-
   // The server header should include the client header.
   *this->server_header_ << "\n#include \""
                         << be_global->be_get_client_hdr_fname (1)
@@ -452,24 +443,33 @@ TAO_CodeGen::start_server_header (const char *fname)
   // thing, because we need the definitions there, it also
   // registers the POA factory with the Service_Configurator, so
   // the ORB can automatically find it.
-  this->gen_standard_include (this->server_header_,
-                              "tao/Collocation_Proxy_Broker.h");
-  this->gen_standard_include (this->server_header_,
-                              "tao/PortableServer/PortableServer.h");
-  this->gen_standard_include (this->server_header_,
-                              "tao/PortableServer/Servant_Base.h");
-
-  if (be_global->gen_amh_classes ())
+  if (idl_global->non_local_iface_seen_)
     {
+      // Include the Messaging files if AMI is enabled.
+      if (be_global->ami_call_back () == I_TRUE)
+        {
+          // Include Messaging skeleton file.
+          this->gen_standard_include (this->server_header_,
+                                      "tao/Messaging/MessagingS.h");
+        }
+
+      this->gen_standard_include (this->server_header_,
+                                  "tao/Collocation_Proxy_Broker.h");
+      this->gen_standard_include (this->server_header_,
+                                  "tao/PortableServer/PortableServer.h");
       this->gen_standard_include (this->server_header_,
-                                  "tao/Messaging/AMH_Response_Handler.h");
+                                  "tao/PortableServer/Servant_Base.h");
+
+      if (be_global->gen_amh_classes ())
+        {
+          this->gen_standard_include (this->server_header_,
+                                      "tao/Messaging/AMH_Response_Handler.h");
+        }
     }
 
   *this->server_header_ << be_nl << be_nl
                         << "#if defined(_MSC_VER)\n"
-                        << "#if (_MSC_VER >= 1200)\n"
                         << "#pragma warning(push)\n"
-                        << "#endif /* _MSC_VER >= 1200 */\n"
                         << "#pragma warning(disable:4250)";
 
   if (be_global->use_raw_throw ())
@@ -563,9 +563,7 @@ TAO_CodeGen::start_server_template_header (const char *fname)
     }
 
   *this->server_template_header_ << "\n\n#if defined(_MSC_VER)\n"
-                                 << "#if (_MSC_VER >= 1200)\n"
                                  << "#pragma warning(push)\n"
-                                 << "#endif /* _MSC_VER >= 1200 */\n"
                                  << "#pragma warning(disable:4250)\n";
 
   if (be_global->use_raw_throw ())
@@ -885,8 +883,7 @@ TAO_CodeGen::start_implementation_header (const char *fname)
     << "#pragma once\n"
     << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n\n";
 
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.local_iface_seen_))
+  if (idl_global->local_iface_seen_)
     {
       *this->implementation_header_ << "#include \"tao/LocalObject.h\"\n\n";
     }
@@ -970,7 +967,7 @@ TAO_CodeGen::end_client_header (void)
                         << "\"\n";
   *this->client_header_ << "#endif /* defined INLINE */";
 
-  *this->client_header_ << "\n\n#if defined(_MSC_VER) && (_MSC_VER >= 1200)\n"
+  *this->client_header_ << "\n\n#if defined(_MSC_VER)\n"
                         << "#pragma warning(pop)\n"
                         << "#endif /* _MSC_VER */";
 
@@ -1015,7 +1012,7 @@ TAO_CodeGen::end_server_header (void)
                         << "\"\n";
   *this->server_header_ << "#endif /* defined INLINE */";
 
-  *this->server_header_ << "\n\n#if defined(_MSC_VER) && (_MSC_VER >= 1200)\n"
+  *this->server_header_ << "\n\n#if defined(_MSC_VER)\n"
                         << "#pragma warning(pop)\n"
                         << "#endif /* _MSC_VER */";
 
@@ -1122,7 +1119,7 @@ TAO_CodeGen::end_server_template_header (void)
       << "\")";
   *this->server_template_header_ << "\n#endif /* defined REQUIRED PRAGMA */";
 
-  *this->server_template_header_ << "\n\n#if defined(_MSC_VER) && (_MSC_VER >= 1200)\n"
+  *this->server_template_header_ << "\n\n#if defined(_MSC_VER)\n"
                                  << "#pragma warning(pop)\n"
                                  << "#endif /* _MSC_VER */";
 
@@ -1335,32 +1332,27 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
   // that require all necessary non-dependent names be parsed prior to
   // parsing templates that may use them (e.g. GNU g++ 3.4.x).
 
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.abstract_iface_seen_))
+  if (idl_global->abstract_iface_seen_)
     {
       // Include the AbstractBase file from the Valuetype library.
       this->gen_standard_include (this->client_header_,
                                   "tao/Valuetype/AbstractBase.h");
 
       // Turn on generation of the rest of the Valuetype library includes.
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.valuetype_seen_);
+      idl_global->valuetype_seen_ = I_TRUE;
     }
 
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.valuebase_seen_))
+  if (idl_global->valuebase_seen_)
     {
       // Include files from the Valuetype library.
       this->gen_standard_include (this->client_header_,
                                   "tao/Valuetype/ValueBase.h");
     }
 
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.valuetype_seen_))
+  if (idl_global->valuetype_seen_)
     {
       // Don't want to generate this twice.
-      if (!ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                          idl_global->decls_seen_masks.valuebase_seen_))
+      if (!idl_global->valuebase_seen_)
         {
           this->gen_standard_include (this->client_header_,
                                       "tao/Valuetype/ValueBase.h");
@@ -1372,7 +1364,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
       // Check for setting this bit performed in y.tab.cpp, actual checking
       // code is in be_valuetype.cpp.
       this->gen_cond_file_include (
-          idl_global->decls_seen_masks.valuefactory_seen_,
+          idl_global->valuefactory_seen_,
           "tao/Valuetype/ValueFactory.h",
           this->client_header_
         );
@@ -1384,7 +1376,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
                               "tao/ORB.h");
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.operation_seen_,
+      idl_global->operation_seen_,
       "tao/SystemException.h",
       this->client_header_
     );
@@ -1396,7 +1388,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
 #if 0
   // For IDL exception, we need full knowledge of CORBA::UserException.
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.exception_seen_,
+      idl_global->exception_seen_,
       "tao/UserException.h",
       this->client_header_
     );
@@ -1409,9 +1401,9 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
 
   // Non-abstract interface or keyword 'Object'.
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.non_local_iface_seen_
-      | idl_global->decls_seen_masks.local_iface_seen_
-      | idl_global->decls_seen_masks.base_object_seen_,
+      idl_global->non_local_iface_seen_
+      | idl_global->local_iface_seen_
+      | idl_global->base_object_seen_,
       "tao/Object.h",
       this->client_header_
     );
@@ -1419,7 +1411,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
   // This is true if we have a typecode or TCKind in the IDL file.
   // If not included here, it will appear in *C.cpp, if TCs not suppressed.
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.typecode_seen_,
+      idl_global->typecode_seen_,
       "tao/Typecode.h",
       this->client_header_
     );
@@ -1427,18 +1419,11 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
   // This is true if we have an 'any' in the IDL file.
   // If not included here, it will appear in *C.cpp, if Anys not suppressed.
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.any_seen_,
+      idl_global->any_seen_,
       "tao/Any.h",
       this->client_header_
     );
 
-  // ParameterMode is so rarely used, it was put in a separate TAO file.
-  this->gen_cond_file_include (
-      idl_global->decls_seen_masks.parametermode_seen_,
-      "tao/ParameterMode.h",
-      this->client_header_
-    );
-
   // Include the Messaging library entry point, if AMI is enabled.
   if (be_global->ami_call_back () == I_TRUE)
     {
@@ -1485,8 +1470,7 @@ TAO_CodeGen::gen_stub_src_includes (void)
   // Conditional includes.
 
   // Operations for local interfaces are pure virtual.
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.non_local_op_seen_))
+  if (idl_global->non_local_op_seen_)
     {
       this->gen_standard_include (this->client_stubs_,
                                   "tao/Exception_Data.h");
@@ -1495,8 +1479,7 @@ TAO_CodeGen::gen_stub_src_includes (void)
     }
 
   // Any abstract interface present will probably have an operation.
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                        idl_global->decls_seen_masks.abstract_iface_seen_))
+  if (idl_global->abstract_iface_seen_)
     {
       this->gen_standard_include (
           this->client_stubs_,
@@ -1515,12 +1498,10 @@ TAO_CodeGen::gen_stub_src_includes (void)
                                   "tao/Messaging/Asynch_Invocation_Adapter.h");
 
       // If a valuetype has been seen, this will already be in the header file.
-      if (!ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                            idl_global->decls_seen_masks.valuetype_seen_))
+      if (!idl_global->valuetype_seen_)
         {
           // This may already be in the generated header file.
-          if (!ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                           idl_global->decls_seen_masks.valuebase_seen_))
+          if (!idl_global->valuebase_seen_)
             {
               // For AMI exception holders.
               this->gen_standard_include (this->client_stubs_,
@@ -1534,25 +1515,21 @@ TAO_CodeGen::gen_stub_src_includes (void)
 
   // If valuefactory_seen_ was set, this was generated in the stub header file,
   // otherwise it needs to go here - used in _tao_unmarshal().
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.valuetype_seen_)
-      && !ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                           idl_global->decls_seen_masks.valuefactory_seen_))
+  if (idl_global->valuetype_seen_
+      && !idl_global->valuefactory_seen_)
     {
       this->gen_standard_include (this->client_stubs_,
                                   "tao/Valuetype/ValueFactory.h");
     }
 
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.non_local_iface_seen_))
+  if (idl_global->non_local_iface_seen_)
     {
       // Needed for _narrow(), which is now template-based.
       this->gen_standard_include (this->client_stubs_,
                                   "tao/Object_T.h");
     }
 
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.octet_seq_seen_))
+  if (idl_global->octet_seq_seen_)
     {
       // Needed for the TAO_NO_COPY_OCTET_SEQUENCES optimization. Note that
       // it is preferable to just refer to CORBA::OctetSeq in the IDL file.
@@ -1560,11 +1537,15 @@ TAO_CodeGen::gen_stub_src_includes (void)
                                   "tao/ORB_Core.h");
     }
 
-  // We generate this include if we have typecode support and have not
-  // already included it in the header file.
-  if (!ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                        idl_global->decls_seen_masks.typecode_seen_)
-      && be_global->tc_support ())
+  // We generate this include if we
+  // have typecode support
+  // AND have not already included it in the header file
+  // OR a TypeCode or TCKind reference is not seen
+  //    AND we are not generating typecodes in a separate file.
+  if (be_global->tc_support ()
+      && ( idl_global->exception_seen_
+      || (!idl_global->typecode_seen_
+          && !be_global->gen_anyop_files ())))
     {
       this->gen_standard_include (this->client_stubs_,
                                   "tao/Typecode.h");
@@ -1576,10 +1557,8 @@ TAO_CodeGen::gen_stub_src_includes (void)
   // However, only include "tao/SystemException.h" if a user exception
   // was encountered and if we're not already including it in the stub
   // header.
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.exception_seen_)
-      && ACE_BIT_DISABLED (idl_global->decls_seen_info_,
-                           idl_global->decls_seen_masks.operation_seen_))
+  if (idl_global->exception_seen_
+      && !idl_global->operation_seen_)
     {
       this->gen_standard_include (this->client_stubs_,
                                   "tao/SystemException.h");
@@ -1593,12 +1572,9 @@ TAO_CodeGen::gen_stub_src_includes (void)
   this->gen_stub_arg_file_includes (this->client_stubs_);
 
   // strcmp() is used with interfaces and exceptions.
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.interface_seen_)
-      || ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                          idl_global->decls_seen_masks.exception_seen_)
-      || ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                          idl_global->decls_seen_masks.union_seen_))
+  if (idl_global->interface_seen_
+      || idl_global->exception_seen_
+      || idl_global->union_seen_)
     {
       // Needed for _narrow(), which is now template-based.
       this->gen_standard_include (this->client_stubs_,
@@ -1618,6 +1594,12 @@ TAO_CodeGen::gen_stub_src_includes (void)
 void
 TAO_CodeGen::gen_skel_src_includes (void)
 {
+  // Only non-local interfaces generate anything in the skeleton.
+  if (!idl_global->non_local_iface_seen_)
+    {
+      return;
+    }
+
   this->gen_standard_include (this->server_skeletons_,
                               "tao/PortableServer/Object_Adapter.h");
   this->gen_standard_include (this->server_skeletons_,
@@ -1674,9 +1656,6 @@ TAO_CodeGen::gen_skel_src_includes (void)
   // For Static_Allocator_Base
   this->gen_standard_include (this->server_skeletons_,
                               "ace/Malloc_Allocator.h");
-  // To get ACE_UNUSED_ARGS
-  this->gen_standard_include (this->server_skeletons_,
-                              "ace/config-all.h");
 }
 
 void
@@ -1686,13 +1665,13 @@ TAO_CodeGen::gen_seq_file_includes (void)
   // files have been split up.
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.vt_seq_seen_,
+      idl_global->vt_seq_seen_,
       "tao/Valuetype/Sequence_T.h",
       this->client_header_
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.seq_seen_,
+      idl_global->seq_seen_,
       "tao/Sequence_T.h",
       this->client_header_
     );
@@ -1708,31 +1687,36 @@ TAO_CodeGen::gen_any_file_includes (void)
       if (be_global->gen_anyop_files ())
         {
           stream = this->anyop_source_;
+
+          this->gen_standard_include (stream,
+                                      "tao/CDR.h");
+          this->gen_standard_include (stream,
+                                      "tao/Any.h");
         }
 
       this->gen_cond_file_include (
-          idl_global->decls_seen_masks.interface_seen_
-          | idl_global->decls_seen_masks.valuetype_seen_,
+          idl_global->interface_seen_
+          | idl_global->valuetype_seen_,
           "tao/Any_Impl_T.h",
           stream
         );
 
       this->gen_cond_file_include (
-          idl_global->decls_seen_masks.aggregate_seen_
-          | idl_global->decls_seen_masks.seq_seen_
-          | idl_global->decls_seen_masks.exception_seen_,
+          idl_global->aggregate_seen_
+          | idl_global->seq_seen_
+          | idl_global->exception_seen_,
           "tao/Any_Dual_Impl_T.h",
           stream
         );
 
       this->gen_cond_file_include (
-          idl_global->decls_seen_masks.array_seen_,
+          idl_global->array_seen_,
           "tao/Any_Array_Impl_T.h",
           stream
         );
 
       this->gen_cond_file_include (
-          idl_global->decls_seen_masks.enum_seen_,
+          idl_global->enum_seen_,
           "tao/Any_Basic_Impl_T.h",
           stream
         );
@@ -1743,39 +1727,39 @@ void
 TAO_CodeGen::gen_var_file_includes (void)
 {
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.valuetype_seen_
-      | idl_global->decls_seen_masks.fwd_valuetype_seen_,
+      idl_global->valuetype_seen_
+      | idl_global->fwd_valuetype_seen_,
       "tao/Valuetype/Value_VarOut_T.h",
       this->client_header_
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.interface_seen_
-      | idl_global->decls_seen_masks.fwd_iface_seen_,
+      idl_global->interface_seen_
+      | idl_global->fwd_iface_seen_,
       "tao/Objref_VarOut_T.h",
       this->client_header_
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.seq_seen_,
+      idl_global->seq_seen_,
       "tao/Seq_Var_T.h",
       this->client_header_
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.seq_seen_,
+      idl_global->seq_seen_,
       "tao/Seq_Out_T.h",
       this->client_header_
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.aggregate_seen_,
+      idl_global->aggregate_seen_,
       "tao/VarOut_T.h",
       this->client_header_
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.array_seen_,
+      idl_global->array_seen_,
       "tao/Array_VarOut_T.h",
       this->client_header_
     );
@@ -1785,58 +1769,64 @@ void
 TAO_CodeGen::gen_stub_arg_file_includes (TAO_OutStream * stream)
 {
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.basic_arg_seen_,
+      idl_global->basic_arg_seen_,
       "tao/Basic_Arguments.h",
       stream
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.bd_string_arg_seen_,
+      idl_global->bd_string_arg_seen_,
       "tao/BD_String_Argument_T.h",
       stream
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.fixed_array_arg_seen_,
+      idl_global->fixed_array_arg_seen_,
       "tao/Fixed_Array_Argument_T.h",
       stream
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.fixed_size_arg_seen_,
+      idl_global->fixed_size_arg_seen_,
       "tao/Fixed_Size_Argument_T.h",
       stream
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.object_arg_seen_,
+      idl_global->object_arg_seen_,
       "tao/Object_Argument_T.h",
       stream
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.special_basic_arg_seen_,
+      idl_global->special_basic_arg_seen_,
       "tao/Special_Basic_Arguments.h",
       stream
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.ub_string_arg_seen_,
+      idl_global->ub_string_arg_seen_,
       "tao/UB_String_Arguments.h",
       stream
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.var_array_arg_seen_,
+      idl_global->var_array_arg_seen_,
       "tao/Var_Array_Argument_T.h",
       stream
     );
 
   this->gen_cond_file_include (
-      idl_global->decls_seen_masks.var_size_arg_seen_,
+      idl_global->var_size_arg_seen_,
       "tao/Var_Size_Argument_T.h",
       stream
     );
+
+  this->gen_cond_file_include (
+      idl_global->any_arg_seen_,
+      "tao/Any_Arg_Traits.h",
+      stream
+    );
 }
 
 
@@ -1904,11 +1894,11 @@ TAO_CodeGen::gen_skel_arg_file_includes (TAO_OutStream * stream)
 }
 
 void
-TAO_CodeGen::gen_cond_file_include (ACE_UINT64 mask,
+TAO_CodeGen::gen_cond_file_include (bool condition_green,
                                     const char *filepath,
                                     TAO_OutStream *stream)
 {
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_, mask))
+  if (condition_green)
     {
       this->gen_standard_include (stream,
                                   filepath);
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index 00fbf97a237..2f90b5ab385 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -270,7 +270,7 @@ be_decl::compute_flat_name  (const char *prefix,
       result_str += suffix_str;
     }
 
-  name = result_str.rep ();
+  name = ACE_OS::strdup (result_str.rep ());
 }
 
 void
@@ -834,20 +834,17 @@ be_decl::set_arg_seen_bit (be_type *bt)
       case NT_home:
       case NT_eventtype:
       case NT_eventtype_fwd:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.object_arg_seen_);
+        idl_global->object_arg_seen_ = true;
         break;
       case NT_union:
       case NT_struct:
         if (bt->size_type () == AST_Type::FIXED)
           {
-            ACE_SET_BITS (idl_global->decls_seen_info_,
-                          idl_global->decls_seen_masks.fixed_size_arg_seen_);
+            idl_global->fixed_size_arg_seen_ = true;
           }
         else
           {
-            ACE_SET_BITS (idl_global->decls_seen_info_,
-                          idl_global->decls_seen_masks.var_size_arg_seen_);
+            idl_global->var_size_arg_seen_ = true;
           }
 
         break;
@@ -861,8 +858,7 @@ be_decl::set_arg_seen_bit (be_type *bt)
         }
       case NT_enum:
       case NT_enum_val:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.basic_arg_seen_);
+        idl_global->basic_arg_seen_ = true;
         break;
       case NT_string:
       case NT_wstring:
@@ -871,13 +867,11 @@ be_decl::set_arg_seen_bit (be_type *bt)
 
           if (str->max_size ()->ev ()->u.ulval == 0)
             {
-              ACE_SET_BITS (idl_global->decls_seen_info_,
-                            idl_global->decls_seen_masks.ub_string_arg_seen_);
+              idl_global->ub_string_arg_seen_ = true;
             }
           else
             {
-              ACE_SET_BITS (idl_global->decls_seen_info_,
-                            idl_global->decls_seen_masks.bd_string_arg_seen_);
+              idl_global->bd_string_arg_seen_ = true;
             }
 
           break;
@@ -885,19 +879,16 @@ be_decl::set_arg_seen_bit (be_type *bt)
       case NT_array:
         if (bt->size_type () == AST_Type::FIXED)
           {
-            ACE_SET_BITS (idl_global->decls_seen_info_,
-                          idl_global->decls_seen_masks.fixed_array_arg_seen_);
+            idl_global->fixed_array_arg_seen_ = true;
           }
         else
           {
-            ACE_SET_BITS (idl_global->decls_seen_info_,
-                          idl_global->decls_seen_masks.var_array_arg_seen_);
+            idl_global->var_array_arg_seen_ = true;
           }
 
         break;
       case NT_sequence:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.var_size_arg_seen_);
+        idl_global->var_size_arg_seen_ = true;
         break;
       case NT_pre_defined:
         {
@@ -908,25 +899,20 @@ be_decl::set_arg_seen_bit (be_type *bt)
               case AST_PredefinedType::PT_object:
               case AST_PredefinedType::PT_pseudo:
               case AST_PredefinedType::PT_value:
-                ACE_SET_BITS (idl_global->decls_seen_info_,
-                              idl_global->decls_seen_masks.object_arg_seen_);
+                idl_global->object_arg_seen_ = true;
                 break;
               case AST_PredefinedType::PT_any:
-                ACE_SET_BITS (idl_global->decls_seen_info_,
-                              idl_global->decls_seen_masks.var_size_arg_seen_);
+                idl_global->var_size_arg_seen_ = true;
+                idl_global->any_arg_seen_ = true;
                 break;
               case AST_PredefinedType::PT_char:
               case AST_PredefinedType::PT_wchar:
               case AST_PredefinedType::PT_octet:
               case AST_PredefinedType::PT_boolean:
-                ACE_SET_BITS (
-                    idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.special_basic_arg_seen_
-                  );
+                idl_global->special_basic_arg_seen_ = true;
                 break;
              default:
-                ACE_SET_BITS (idl_global->decls_seen_info_,
-                              idl_global->decls_seen_masks.basic_arg_seen_);
+                idl_global->basic_arg_seen_ = true;
                 break;
             }
         }
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
index bb40996f128..8890a95eff9 100644
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ b/TAO/TAO_IDL/be/be_enum.cpp
@@ -64,8 +64,7 @@ be_enum::be_enum (UTL_ScopedName *n,
 {
   if (!this->imported ())
     {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.enum_seen_);
+      idl_global->enum_seen_ = true;
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_eventtype.cpp b/TAO/TAO_IDL/be/be_eventtype.cpp
index 83fe7034d67..6f770a3158d 100644
--- a/TAO/TAO_IDL/be/be_eventtype.cpp
+++ b/TAO/TAO_IDL/be/be_eventtype.cpp
@@ -123,7 +123,8 @@ be_eventtype::~be_eventtype (void)
 {
 }
 
-// Accept a visitor.
+// The differences between valuetype and eventtype are too small
+// to warrant a separate set of visitors.
 int
 be_eventtype::accept (be_visitor *visitor)
 {
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
index 93996373ab8..ffc5e2b1129 100644
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ b/TAO/TAO_IDL/be/be_exception.cpp
@@ -71,8 +71,7 @@ be_exception::be_exception (UTL_ScopedName *n,
 
   if (!this->imported ())
     {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.exception_seen_);
+      idl_global->exception_seen_ = true;
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp
index b7022962ee5..3c940b81abd 100644
--- a/TAO/TAO_IDL/be/be_expression.cpp
+++ b/TAO/TAO_IDL/be/be_expression.cpp
@@ -58,7 +58,7 @@ be_expression::be_expression (long l,
 {
 }
 
-be_expression::be_expression (ACE_UINT64 l,
+be_expression::be_expression (idl_uns_long l,
                               AST_Expression::ExprType t)
   : AST_Expression (l, 
                     t)
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index fbba8bde07a..48f69771ec4 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -704,7 +704,7 @@ be_generator::create_expr (long l,
 }
 
 AST_Expression *
-be_generator::create_expr (ACE_UINT64 l,
+be_generator::create_expr (idl_uns_long l,
                            AST_Expression::ExprType t)
 {
   be_expression *retval = 0;
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 7d30f48bfd2..1fe1a3d9752 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -25,6 +25,7 @@
 #include "idl_defines.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_sys_stat.h"
 #include "ace/os_include/os_ctype.h"
 
 ACE_RCSID (be,
@@ -117,7 +118,9 @@ be_change_idl_file_extension (UTL_String* idl_file,
   // @@ This shouldn't happen anyway; but a better error handling
   // mechanism is needed.
   if (idl_file == 0 || new_extension == 0)
-    return 0;
+    {
+      return 0;
+    }
 
   static char fname[MAXPATHLEN];
   ACE_OS::memset (fname, 0, MAXPATHLEN);
@@ -135,16 +138,23 @@ be_change_idl_file_extension (UTL_String* idl_file,
     ".IDL",
     ".PIDL"
   };
+
   static int nextensions = sizeof(extensions)/sizeof(extensions[0]);
 
   for (int k = 0; k < nextensions; ++k)
     {
       base = ACE_OS::strstr (string, extensions[k]);
+
       if (base != 0)
-        break;
+        {
+          break;
+        }
     }
+
   if (base == 0)
-    return 0;
+    {
+      return 0;
+    }
 
   if ((!base_name_only) && (be_global->output_dir () != 0))
     {
@@ -157,23 +167,32 @@ be_change_idl_file_extension (UTL_String* idl_file,
       ACE_OS::strncpy (fname + strlen (fname), string, base - string);
     }
   else
-    // Base_name_only or no putput_dir specified by user. JUST put the
-    // base part to fname.
-    ACE_OS::strncpy (fname, string, base - string);
+    {
+      // Base_name_only or no putput_dir specified by user. JUST put the
+      // base part to fname.
+      ACE_OS::strncpy (fname, string, base - string);
+    }
 
   // Turn '\' and '\\' into '/'.
   char* i = fname;
+
   for (char* j = fname; *j != 0; ++i, ++j)
     {
       if (*j == '\\')
         {
           *i = '/';
+
           if (*(j+1) == '\\')
-            ++j;
+            {
+              ++j;
+            }
         }
       else
-        *i = *j;
+        {
+          *i = *j;
+        }
     }
+
   *i = 0;
 
   // Append the newextension.
@@ -1265,6 +1284,27 @@ BE_GlobalData::parse_args (long &i, char **av)
         if (av[i][2] == '\0')
           {
             idl_global->append_idl_flag (av[i + 1]);
+
+            int result = ACE_OS::mkdir (av[i + 1]);
+
+            #if !defined (__BORLANDC__)
+              if (result != 0 && errno != EEXIST)
+            #else
+              // The Borland RTL doesn't give EEXIST back, only EACCES in case
+              // the directory exists, reported to Borland as QC 9495
+              if (result != 0 && errno != EEXIST && errno != EACCES)
+            #endif
+              {
+                ACE_ERROR ((
+                    LM_ERROR,
+                    ACE_TEXT ("IDL: unable to create directory %s")
+                    ACE_TEXT (" specified by -o option\n"),
+                    av[i + 1]
+                  ));
+
+                ACE_OS::exit (99);
+              }
+
             be_global->output_dir (av [i + 1]);
             i++;
           }
@@ -1686,7 +1726,7 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -GI[h|s|b|e|c]\t\tGenerate Implemenation Files \n")
+      ACE_TEXT (" -GI[h|s|b|e|c]\t\tGenerate Implementation Files \n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp
index 067895ad392..c9f5afe5036 100644
--- a/TAO/TAO_IDL/be/be_home.cpp
+++ b/TAO/TAO_IDL/be/be_home.cpp
@@ -94,10 +94,9 @@ be_home::be_home (UTL_ScopedName *n,
   be_component *bt =
      be_component::narrow_from_decl (managed_component);
 
-  bt->seen_in_operation ();
+  bt->seen_in_operation (I_TRUE);
 
-  ACE_SET_BITS (idl_global->decls_seen_info_,
-                idl_global->decls_seen_masks.object_arg_seen_);
+  idl_global->object_arg_seen_ = true;
 }
 
 be_home::~be_home (void)
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 58760041cfe..06df1f23a52 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -60,7 +60,8 @@ be_interface::be_interface (void)
     in_mult_inheritance_ (-1),
     strategy_ (0),
     original_interface_ (0),
-    has_mixed_parentage_ (-1)
+    has_mixed_parentage_ (-1),
+    session_component_child_ (-1)
 {
   ACE_NEW (this->strategy_,
            be_interface_default_strategy (this));
@@ -95,7 +96,8 @@ be_interface::be_interface (UTL_ScopedName *n,
     skel_count_ (0),
     in_mult_inheritance_ (-1),
     original_interface_ (0),
-    has_mixed_parentage_ (-1)
+    has_mixed_parentage_ (-1),
+    session_component_child_ (-1)
 {
   ACE_NEW (this->strategy_,
            be_interface_default_strategy (this));
@@ -108,34 +110,29 @@ be_interface::be_interface (UTL_ScopedName *n,
   if (this->is_defined ())
     {
       // Set the flag that says we have a interface in this IDL file.
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.interface_seen_);
+      idl_global->interface_seen_ = true;
 
       if (abstract || this->has_mixed_parentage ())
         {
           // Set the flag for abstract interface seen in this IDL file.
-          ACE_SET_BITS (idl_global->decls_seen_info_,
-                        idl_global->decls_seen_masks.abstract_iface_seen_);
+          idl_global->abstract_iface_seen_ = true;
         }
 
       if (local)
         {
           // Set the flag for local interface seen in this IDL file.
-          ACE_SET_BITS (idl_global->decls_seen_info_,
-                        idl_global->decls_seen_masks.local_iface_seen_);
+          idl_global->local_iface_seen_ = true;
         }
       else
         {
           // Set the flag for non-local interface seen in this IDL file.
-          ACE_SET_BITS (idl_global->decls_seen_info_,
-                        idl_global->decls_seen_masks.non_local_iface_seen_);
+          idl_global->non_local_iface_seen_ = true;
         }
     }
   else
     {
       // Forward declared non-defined interface. Still gets a _var decl.
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.fwd_iface_seen_);
+      idl_global->fwd_iface_seen_ = true;
     }
 }
 
@@ -706,9 +703,10 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface,
       return 0;
     }
 
-  // A parent that's local will already have its operations declared
-  // as pure virtual.
-  if (base_interface->is_local ())
+  // If the parent is local, it will already have its operations declared
+  // as pure virtual, and if it's abstract, its operations will already
+  // be generated as pure virtual for the derived local interface.
+  if (base_interface->is_local () || base_interface->is_abstract ())
     {
       return 0;
     }
@@ -716,8 +714,8 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface,
   be_decl *d = 0;
 
   for (UTL_ScopeActiveIterator si (base_interface, UTL_Scope::IK_decls);
-        !si.is_done ();
-        si.next ())
+       !si.is_done ();
+       si.next ())
     {
       d = be_decl::narrow_from_decl (si.item ());
 
@@ -1891,7 +1889,7 @@ be_interface::is_a_helper (be_interface * /*derived*/,
 {
   // Emit the comparison code.
   *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-      << "(char *)value," << be_nl
+      << "value," << be_nl
       << "\"" << bi->repoID () << "\"" << be_uidt_nl
       << ") ||" << be_uidt_nl;
 
@@ -1899,70 +1897,6 @@ be_interface::is_a_helper (be_interface * /*derived*/,
 }
 
 int
-be_interface::queryinterface_helper (be_interface *derived,
-                                     be_interface *ancestor,
-                                     TAO_OutStream *os)
-{
-  // Emit the comparison code.
-  *os << "(type == reinterpret_cast<"
-      << be_idt << be_idt <<be_idt << be_idt << be_idt << be_idt_nl
-      << "ptrdiff_t> (" << be_nl;
-
-  be_decl *scope =
-    be_scope::narrow_from_scope (ancestor->defined_in ())->decl ();
-
-  be_decl *derived_scope =
-    be_scope::narrow_from_scope (derived->defined_in ())->decl ();
-
-  // If the ancestor is in the root scope, we can use the local name.
-  if (scope->node_type () == AST_Decl::NT_root)
-    {
-      *os << "&" << ancestor->local_name () << "::_tao_class_id)"
-          << be_uidt_nl;
-    }
-  // Or, if it's defined in a scope different than the child's, the
-  // ACE_NESTED_CLASS macro won't work - we use the scoped name.
-  else if (scope != derived_scope)
-    {
-      *os << "&::" << ancestor->name () << "::_tao_class_id)"
-          << be_uidt_nl;
-    }
-  // The ACE_NESTED_CLASS macro is necessary in this case.
-  else
-    {
-      *os << "&ACE_NESTED_CLASS (::" << scope->name () << ", "
-          << ancestor->local_name () << ")" << "::_tao_class_id)"
-          << be_uidt_nl;
-    }
-
-  *os << ")" << be_uidt << be_uidt << be_uidt << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  if (derived == ancestor)
-    {
-      *os << "retv = reinterpret_cast<void*> (this);" << be_uidt_nl;
-    }
-  else
-    {
-      *os << "retv =" << be_idt_nl
-          << "reinterpret_cast<" << be_idt << be_idt_nl
-          << "void *> (" << be_nl
-          << "static_cast<" << be_idt << be_idt_nl
-          << ancestor->full_name () << "_ptr> (" << be_nl
-          << "this" << be_uidt_nl
-          << ")" << be_uidt << be_uidt_nl
-          << ");" << be_uidt << be_uidt << be_uidt_nl;
-    }
-
-  *os << "}" << be_uidt_nl
-      << "else if ";
-
-  return 0;
-}
-
-
-
-int
 be_interface::downcast_helper (be_interface * /* derived */,
                                be_interface *base,
                                TAO_OutStream *os)
@@ -2417,8 +2351,15 @@ be_interface::copy_ctor_helper (be_interface *derived,
     }
 
   *os << "," << be_idt_nl;
+  
+  idl_bool is_rh_base =
+    (ACE_OS::strcmp (base->flat_name (), "Messaging_ReplyHandler") == 0);
 
-  if (base->is_nested ())
+  if (is_rh_base)
+    {
+      *os << "ACE_NESTED_CLASS (POA_Messaging, ReplyHandler) (rhs)";
+    }
+  else if (base->is_nested ())
     {
       be_decl *scope;
       scope = be_scope::narrow_from_scope (base->defined_in ())->decl ();
@@ -2596,6 +2537,55 @@ be_interface::has_mixed_parentage (void)
   return this->has_mixed_parentage_;
 }
 
+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, 
+                                                                    I_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_;
+}
+
 const char *
 be_interface::base_proxy_impl_name (void)
 {
diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp
index 1f4d045fffd..ad495310970 100644
--- a/TAO/TAO_IDL/be/be_operation.cpp
+++ b/TAO/TAO_IDL/be/be_operation.cpp
@@ -69,16 +69,14 @@ be_operation::be_operation (AST_Type *rt,
       return;
     }
     
-  ACE_SET_BITS (idl_global->decls_seen_info_,
-                idl_global->decls_seen_masks.operation_seen_);
+  idl_global->operation_seen_ = true;
 
   if (!this->is_local ())
     {
       be_type *bt = be_type::narrow_from_decl (rt);
       bt->seen_in_operation (I_TRUE);
       this->set_arg_seen_bit (bt);
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.non_local_op_seen_);
+      idl_global->non_local_op_seen_ = true;
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
index 3d155aa2bbb..67e730a49ce 100644
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ b/TAO/TAO_IDL/be/be_predefined_type.cpp
@@ -84,8 +84,7 @@ be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t,
       case AST_PredefinedType::PT_wchar:
       case AST_PredefinedType::PT_boolean:
       case AST_PredefinedType::PT_octet:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.ambiguous_type_seen_);
+        idl_global->ambiguous_type_seen_ = true;
         break;
       case AST_PredefinedType::PT_any:
       case AST_PredefinedType::PT_object:
@@ -94,8 +93,7 @@ be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t,
       case AST_PredefinedType::PT_pseudo:
         break;
       default:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.basic_type_seen_);
+        idl_global->basic_type_seen_ = true;
         break;
     }
 }
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 15f64977184..4626a99936f 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -96,8 +96,7 @@ be_sequence::be_sequence (AST_Expression *v,
 
   // This one gets set for all sequences, in addition to any specialized
   // one that may get set below.
-  ACE_SET_BITS (idl_global->decls_seen_info_,
-                idl_global->decls_seen_masks.seq_seen_);
+  idl_global->seq_seen_ = true;
 
   // Don't need the return value - just set the member.
   (void) this->managed_type ();
@@ -105,24 +104,19 @@ be_sequence::be_sequence (AST_Expression *v,
   switch (this->mt_)
     {
       case MNG_OBJREF:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.iface_seq_seen_);
+        idl_global->iface_seq_seen_ = true;
         break;
       case MNG_PSEUDO:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.pseudo_seq_seen_);
+        idl_global->pseudo_seq_seen_ = true;
         break;
       case MNG_VALUE:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.vt_seq_seen_);
+        idl_global->vt_seq_seen_ = true;
         break;
       case MNG_STRING:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.string_seq_seen_);
+        idl_global->string_seq_seen_ = true;
         break;
       case MNG_WSTRING:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.wstring_seq_seen_);
+        idl_global->wstring_seq_seen_ = true;
         break;
       default:
         break;
@@ -147,8 +141,7 @@ be_sequence::be_sequence (AST_Expression *v,
       switch (pdt->pt ())
         {
           case AST_PredefinedType::PT_octet:
-            ACE_SET_BITS (idl_global->decls_seen_info_,
-                          idl_global->decls_seen_masks.octet_seq_seen_);
+            idl_global->octet_seq_seen_ = true;
             break;
           default:
             break;
@@ -575,7 +568,8 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
         {
           *os << "TAO_Bounded_Pseudo_Sequence<" << linebreak
               << be_idt << be_idt_nl
-              << elem->nested_type_name (ctx_scope) << linebreak << be_nl
+              << elem->nested_type_name (ctx_scope) << "," << linebreak
+              << be_nl
               << this->max_size ()->ev ()->u.ulval << linebreak
               << be_uidt_nl
               << ">" << be_uidt;
diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp
index 861f91c3742..c431bb52b1e 100644
--- a/TAO/TAO_IDL/be/be_string.cpp
+++ b/TAO/TAO_IDL/be/be_string.cpp
@@ -60,8 +60,7 @@ be_string::be_string (AST_Decl::NodeType nt,
     be_type (nt,
              n)
 {
-  ACE_SET_BITS (idl_global->decls_seen_info_,
-                idl_global->decls_seen_masks.string_seen_);
+  idl_global->string_seen_ = true;
 }
 
 // Overriden method.
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index 53aebd709b9..438c8fa4668 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -70,8 +70,7 @@ be_structure::be_structure (UTL_ScopedName *n,
 {
   if (!this->imported ())
     {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.aggregate_seen_);
+      idl_global->aggregate_seen_ = true;
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 5ee7a7bd9fe..c483a315565 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -83,11 +83,9 @@ be_union::be_union (AST_ConcreteType *dt,
 
   if (!this->imported ())
     {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.aggregate_seen_);
+      idl_global->aggregate_seen_ = true;
 
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.union_seen_);
+      idl_global->union_seen_ = true;
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp
index 006ce84d787..4c67346e028 100644
--- a/TAO/TAO_IDL/be/be_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_union_branch.cpp
@@ -152,7 +152,7 @@ be_union_branch::gen_default_label_value (TAO_OutStream *os,
         os->print ("%d", dv.u.char_val);
         break;
       case AST_Expression::EV_bool:
-        *os << dv.u.bool_val;
+        *os << (dv.u.bool_val == 0 ? "false" : "true");
         break;
       case AST_Expression::EV_enum:
         // The discriminant is an enum. Some compilers will
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index 60445e0aebc..6a60be80ff6 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -148,13 +148,11 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
   // Set the flag that says we have a valuetype in this IDL file.
   if (this->is_defined ())
     {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.valuetype_seen_);
+      idl_global->valuetype_seen_ = true;
     }
   else
     {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.fwd_valuetype_seen_);
+      idl_global->fwd_valuetype_seen_ = true;
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index f557bb052c8..9ccd1db6c4c 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -143,6 +143,9 @@ be_visitor_amh_pre_proc::create_response_handler (
     dynamic_cast<UTL_ScopedName*> (node->name ()->copy ());
   Identifier *local_name = amh_name->last_component ();
   local_name->replace_string (class_name.c_str ());
+  
+  UTL_Scope *s = node->defined_in ();
+  idl_global->scopes ().push (s);
 
   // @@ Mayur, you are not filling up the list of inherited classes,
   // however, you *are* using that same list in the amh_rh_sh.cpp and
@@ -160,6 +163,8 @@ be_visitor_amh_pre_proc::create_response_handler (
                                 1,          // local
                                 0),         // non-abstract
                   0);
+                  
+  idl_global->scopes ().pop ();
 
   response_handler->set_name (amh_name);
   response_handler->set_defined_in (node->defined_in ());
@@ -573,11 +578,9 @@ be_valuetype *
 be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
 {
   // AMH exception holders require both of these.
-  ACE_SET_BITS (idl_global->decls_seen_info_,
-                idl_global->decls_seen_masks.valuetype_seen_);
+  idl_global->valuetype_seen_ = true;
 
-  ACE_SET_BITS (idl_global->decls_seen_info_,
-                idl_global->decls_seen_masks.valuefactory_seen_);
+  idl_global->valuefactory_seen_ = true;
 
   const int inherit_count = 0;
   AST_Interface **p_intf = 0;
@@ -585,6 +588,9 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
   UTL_ScopedName *excep_holder_name =
     node->compute_name ("AMH_",
                         "ExceptionHolder");
+                        
+  UTL_Scope *s = node->defined_in ();
+  idl_global->scopes ().push (s);
 
   be_valuetype *excep_holder = 0;
   ACE_NEW_RETURN (excep_holder,
@@ -601,6 +607,8 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
                                 0,
                                 0),
                   0);
+                  
+  idl_global->scopes ().pop ();
 
   excep_holder->set_name (excep_holder_name);
   excep_holder->set_defined_in (node->defined_in ());
diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index db932c5bc29..61eedb3a7cd 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -36,6 +36,7 @@
 #include "be_argument.h"
 #include "utl_identifier.h"
 #include "nr_extern.h"
+#include "global_extern.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (be,
@@ -312,6 +313,24 @@ be_valuetype *
 be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
 {
   Identifier *id = 0;
+  UTL_ScopedName *sn = 0;
+
+  ACE_NEW_RETURN (id,
+                  Identifier ("Messaging"),
+                  0);
+
+  ACE_NEW_RETURN (sn,
+                  UTL_ScopedName (id,
+                                  0),
+                  0);
+
+  be_module *msg = 0;
+  ACE_NEW_RETURN (msg,
+                  be_module (sn),
+                  0);
+                  
+  idl_global->scopes ().push (msg);
+
   ACE_NEW_RETURN (id,
                   Identifier ("Messaging"),
                   0);
@@ -328,7 +347,6 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
                   Identifier ("ExceptionHolder"),
                   0);
 
-  UTL_ScopedName *sn = 0;
   ACE_NEW_RETURN (sn,
                   UTL_ScopedName (id,
                                   0),
@@ -351,26 +369,15 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
                                 0,
                                 0),
                   0);
+                  
+  idl_global->scopes ().pop ();
 
   inherit_vt->set_name (inherit_name);
 
-  ACE_NEW_RETURN (id,
-                  Identifier ("Messaging"),
-                  0);
-
-  ACE_NEW_RETURN (sn,
-                  UTL_ScopedName (id,
-                                  0),
-                  0);
-
-  be_module *msg = 0;
-  ACE_NEW_RETURN (msg,
-                  be_module (sn),
-                  0);
-
   // Notice the valuetype "ExceptionHolder" that it is defined in the
   // "Messaging" module
   inherit_vt->set_defined_in (msg);
+  inherit_vt->set_prefix_with_typeprefix ("omg.org");
 
   // Create the excpetion holder name
   ACE_CString excep_holder_local_name;
@@ -391,10 +398,13 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
                   0);
 
   p_intf[0] = inherit_vt;
+  
+  UTL_Scope *s = node->defined_in ();
+  idl_global->scopes ().push (s);
 
   be_valuetype *excep_holder = 0;
   ACE_NEW_RETURN (excep_holder,
-                  be_valuetype (0,
+                  be_valuetype (excep_holder_name,
                                 p_intf,
                                 1,
                                 inherit_vt,
@@ -407,7 +417,10 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
                                 0,
                                 0),
                   0);
+                  
+  idl_global->scopes ().pop ();
 
+  excep_holder->set_defined_in (s);
   excep_holder->set_name (excep_holder_name);
   excep_holder->seen_in_operation (I_TRUE);
 
@@ -476,6 +489,12 @@ be_interface *
 be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                                                be_valuetype *excep_holder)
 {
+  // We're at global scope here so we need to fool the scope stack
+  // for a minute so the correct repo id can be calculated at
+  // interface construction time.
+  UTL_Scope *s = node->defined_in ();
+  idl_global->scopes ().push (s);
+
   // Create the reply handler name.
   ACE_CString reply_handler_local_name;
   this->generate_name (reply_handler_local_name,
@@ -503,14 +522,21 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                                 0),                 // non-abstract
                   0);
 
+  // Back to reality.
+  idl_global->scopes ().pop ();
+
   reply_handler->set_name (reply_handler_name);
-  reply_handler->set_defined_in (node->defined_in ());
+  reply_handler->set_defined_in (s);
   reply_handler->gen_fwd_helper_name ();
 
-  // Now our customized valuetype is created, we have to
-  // add now the operations and attributes to the scope.
-
-  if (! node->imported () && node->nmembers () > 0)
+  // Now our customized reply handler is created, we have to
+  // add the operations and attributes to the scope.
+  // Imported nodes get admitted here, so they can get
+  // the reply handler operations added, in case they are
+  // needed in the inheritance graph traversal for a
+  // child reply handler. However, no exception holder
+  // stuff is executed for an imported node.
+  if (node->nmembers () > 0)
     {
       this->elem_number_ = 0;
       // Initialize an iterator to iterate thru our scope.
@@ -544,9 +570,12 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
               this->create_reply_handler_operation (get_operation,
                                                     reply_handler);
 
-              this->create_excep_operation (get_operation,
-                                            reply_handler,
-                                            excep_holder);
+              if (!node->imported ())
+                {
+                  this->create_excep_operation (get_operation,
+                                                reply_handler,
+                                                excep_holder);
+                }
 
               if (!attribute->readonly ())
                 {
@@ -555,11 +584,13 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                   this->create_reply_handler_operation (set_operation,
                                                         reply_handler);
 
-                  this->create_excep_operation (set_operation,
-                                                reply_handler,
-                                                excep_holder);
+                  if (!node->imported ())
+                    {
+                      this->create_excep_operation (set_operation,
+                                                    reply_handler,
+                                                    excep_holder);
+                    }
                 }
-
             }
           else
             {
@@ -570,9 +601,12 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                   this->create_reply_handler_operation (operation,
                                                         reply_handler);
 
-                  this->create_excep_operation (operation,
-                                                reply_handler,
-                                                excep_holder);
+                  if (!node->imported ())
+                    {
+                      this->create_excep_operation (operation,
+                                                    reply_handler,
+                                                    excep_holder);
+                    }
                 }
             }
         } // end of while loop
@@ -1164,7 +1198,6 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node)
           }
       }
 
-
       int elem_number = 0;
 
       // Continue until each element is visited.
@@ -1339,6 +1372,22 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
 
   if (n_rh_parents == 0)
     {
+      ACE_NEW_RETURN (id,
+                      Identifier ("Messaging"),
+                      0);
+
+      ACE_NEW_RETURN (sn,
+                      UTL_ScopedName (id,
+                                      0),
+                      0);
+
+      be_module *msg = 0;
+      ACE_NEW_RETURN (msg,
+                      be_module (sn),
+                      0);
+                      
+      idl_global->scopes ().push (msg);
+
       // Create a virtual module named "Messaging" and an interface "ReplyHandler"
       // from which we inherit.
       ACE_NEW_RETURN (id,
@@ -1374,20 +1423,9 @@ be_visitor_ami_pre_proc::create_inheritance_list (be_interface *node,
                       0);
 
       inherit_intf->set_name (inherit_name);
-
-      ACE_NEW_RETURN (id,
-                      Identifier ("Messaging"),
-                      0);
-
-      ACE_NEW_RETURN (sn,
-                      UTL_ScopedName (id,
-                                      0),
-                      0);
-
-      be_module *msg = 0;
-      ACE_NEW_RETURN (msg,
-                      be_module (sn),
-                      0);
+      inherit_intf->set_prefix_with_typeprefix ("omg.org");
+      
+      idl_global->scopes ().pop ();
 
       // Notice the interface "ReplyHandler" that it is defined in the
       // "Messaging" module.
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 050bab78db7..9f3d7e49490 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -20,9 +20,11 @@
 #include "be_valuetype_fwd.h"
 #include "be_component_fwd.h"
 #include "be_component.h"
+#include "be_home.h"
 #include "be_eventtype.h"
 #include "be_eventtype_fwd.h"
 #include "be_operation.h"
+#include "be_attribute.h"
 #include "be_argument.h"
 #include "be_array.h"
 #include "be_enum.h"
@@ -342,6 +344,55 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
 }
 
 int
+be_visitor_arg_traits::visit_attribute (be_attribute *node)
+{
+  if (this->ctx_->alias () != 0 || this->generated (node))
+    {
+      return 0;
+    }
+
+  AST_String *st = AST_String::narrow_from_decl (node->field_type ());
+  
+  if (st == 0)
+    {
+      return 0;
+    }
+    
+  unsigned long bound = st->max_size ()->ev ()->u.ulval;
+  
+  if (bound == 0)
+    {
+      return 0;
+    }
+    
+  TAO_OutStream *os = this->ctx_->stream ();
+  idl_bool wide = (st->width () != 1);
+
+  // It is legal IDL to declare a bounded (w)string as an operation
+  // parameter type. There could be any number of identical
+  // declarations in the same build, translation unit, or even in
+  // 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
+      << "struct " << node->flat_name () << " {};"
+      << be_nl << be_nl
+      << "ACE_TEMPLATE_SPECIALIZATION" << be_nl
+      << "class " << be_global->stub_export_macro () << " "
+      << this->S_ << "Arg_Traits<" << node->flat_name ()
+      << ">" << be_idt_nl
+      << ": public" << be_idt << be_idt_nl
+      << "BD_" << (wide ? "W" : "")
+      << "String_" << this->S_ << "Arg_Traits<" << bound << ">"
+      << be_uidt << be_uidt << be_uidt_nl
+      << "{" << be_nl
+      << "};";
+  
+  this->generated (node, I_TRUE);
+  return 0;
+}
+
+int
 be_visitor_arg_traits::visit_argument (be_argument *node)
 {
   if (this->ctx_->alias () != 0 || this->generated (node))
@@ -541,12 +592,42 @@ be_visitor_arg_traits::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  std::string guard_suffix =
-    std::string (this->S_) + std::string ("arg_traits");
+  // This should be generated even for imported nodes. The ifdef guard prevents
+  // multiple declarations.
+//  os->gen_ifdef_macro (node->flat_name (), "arg_traits");
 
-  // This should be generated even for imported nodes. The ifdef
-  // guard prevents multiple declarations.
-  os->gen_ifdef_macro (node->flat_name (), guard_suffix.c_str ());
+  // Generate the array traits specialization definitions,
+  // guarded by #ifdef on unaliased array element type and length.
+
+  ACE_CString unique;
+  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  AST_Decl::NodeType nt = bt->node_type ();
+
+  if (nt == AST_Decl::NT_typedef)
+    {
+      be_typedef *td = be_typedef::narrow_from_decl (bt);
+      unique = td->primitive_base_type ()->flat_name ();
+    }
+  else
+    {
+      unique = bt->flat_name ();
+    }
+
+  char buf[NAMEBUFSIZE];
+
+  for (unsigned long i = 0; i < node->n_dims (); ++i)
+    {
+      ACE_OS::memset (buf,
+                      '\0',
+                      NAMEBUFSIZE);
+      ACE_OS::sprintf (buf,
+                       "_%ld",
+                       node->dims ()[i]->ev ()->u.ulval);
+      unique += buf;
+    }
+
+  unique += "_traits";
+  os->gen_ifdef_macro (unique.fast_rep ());
 
   *os << be_nl << be_nl
       << "ACE_TEMPLATE_SPECIALIZATION" << be_nl
@@ -626,54 +707,6 @@ be_visitor_arg_traits::visit_enum (be_enum *node)
 }
 
 int
-be_visitor_arg_traits::visit_predefined_type (be_predefined_type *node)
-{
-  if (this->generated (node) || !node->seen_in_operation ())
-    {
-      return 0;
-    }
-
-  // Only for an Any used in an operation.
-  if (node->pt () != AST_PredefinedType::PT_any)
-    {
-      this->generated (node, I_TRUE);
-      return 0;
-    }
-
-  // This should be generated even for imported nodes. The ifdef guard prevents
-  // multiple declarations.
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  std::string guard_suffix =
-    std::string (this->S_) + std::string ("arg_traits");
-
-  // This should be generated even for imported nodes. The ifdef
-  // guard prevents multiple declarations.
-  os->gen_ifdef_macro ("corba_any", guard_suffix.c_str ());
-
-  *os << be_nl << be_nl
-      << "ACE_TEMPLATE_SPECIALIZATION" << be_nl
-      << "class " << be_global->stub_export_macro () << " "
-      << this->S_ << "Arg_Traits<CORBA::Any>" << be_idt_nl
-      << ": public" << be_idt << be_idt_nl
-      << "Var_Size_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl
-      << "CORBA::Any," << be_nl
-      << "CORBA::Any_var," << be_nl
-      << "CORBA::Any_out" << be_uidt_nl
-      << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
-      << "{" << be_nl
-      << "};";
-
-  os->gen_endif ();
-
-  this->generated (node, I_TRUE);
-  return 0;
-}
-
-int
 be_visitor_arg_traits::visit_structure (be_structure *node)
 {
   if (this->generated (node) || !node->seen_in_operation ())
@@ -720,6 +753,24 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
 
   os->gen_endif ();
 
+  /* Set this before visiting the scope so things like
+  
+      interface foo
+      {
+        struct bar
+        {
+          ....
+          foo foo_member;
+        };
+        
+        void op (in bar inarg);
+      };
+      
+     will not cause infinite recursion in this visitor.
+  */
+  
+  this->generated (node, I_TRUE);
+
   if (this->visit_scope (node) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -728,7 +779,6 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
                         -1);
     }
 
-  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -817,6 +867,24 @@ be_visitor_arg_traits::visit_union (be_union *node)
 
   os->gen_endif ();
 
+  /* Set this before visiting the scope so things like
+  
+      interface foo
+      {
+        struct bar
+        {
+          ....
+          foo foo_member;
+        };
+        
+        void op (in bar inarg);
+      };
+      
+     will not cause infinite recursion in this visitor.
+  */
+  
+  this->generated (node, I_TRUE);
+
   int status = this->visit_scope (node);
 
   if (status != 0)
@@ -827,7 +895,6 @@ be_visitor_arg_traits::visit_union (be_union *node)
                         -1);
     }
 
-  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -932,3 +999,10 @@ be_visitor_arg_traits::visit_component_fwd (be_component_fwd *node)
 {
   return this->visit_interface_fwd (node);
 }
+
+int
+be_visitor_arg_traits::visit_home (be_home *node)
+{
+  return this->visit_interface (node);
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
index 2fa4e527ac7..fbb5e7613cd 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
@@ -101,11 +101,12 @@ int be_visitor_args_paramlist::visit_argument (be_argument *node)
       *os << " _tao_forany_" << node->local_name () << " (";
       *os << this->type_name (bt, "_dup");
       *os << " (";
-      // This is to placate some compilers which have
-      // trouble with IN args that are multidimensional arrays.
-      //if (node->n_dims () > 1) cant do this here since dont have a be_array node
+      
       if (this->direction () != AST_Argument::dir_IN)
-        *os << "(const ::" << bt->name () << "_slice *) ";
+        {
+          *os << "(const ::" << bt->name () << "_slice *) ";
+        }
+        
       *os << "this->";
       *os << node->local_name () << "_));" << be_nl;
       *os << "(*parameter_list)[len].argument <<= _tao_forany_" ;
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index ce9d0d4f1f2..61e888f3a27 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -70,7 +70,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
           << node->name () << "_forany" << be_uidt_nl
           << ">::marshal_value (TAO_OutputCDR &)" << be_uidt_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -81,7 +81,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
           << node->name () << "_forany" << be_uidt_nl
           << ">::demarshal_value (TAO_OutputCDR &)" << be_uidt_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
index 0ab3c10066d..8afb42d1c75 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -117,8 +117,8 @@ int be_visitor_array_cs::visit_array (be_array *node)
       << fname << "_alloc ();" << be_uidt_nl << be_nl;
   *os << "if (!_tao_dup_array)" << be_idt_nl
       << "{" << be_idt_nl
-      << "return (" << fname
-      << "_slice *)0;" << be_uidt_nl
+      << "return static_cast <" << fname
+      << "_slice *> (0);" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
   *os << fname << "_copy (_tao_dup_array, _tao_src_array);" << be_nl;
   *os << "return _tao_dup_array;" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
index a397590dde8..1e4cf991e0c 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
@@ -296,7 +296,8 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
   // We generate optimized code based on an optimized interface available from
   // the CDR class. These optimizations are applicable only to primitive
   // types.
-  *os << " return strm.";
+  *os << "return" << be_idt_nl
+      << "strm.";
 
   // Based on our substate, we may be reading from a stream or writing into a
   // stream.
@@ -370,10 +371,12 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << " ((";
+      *os << " (" << be_idt << be_idt_nl
+          << "reinterpret_cast <";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << " ((const ";
+      *os << " (" << be_idt << be_idt_nl
+          << "reinterpret_cast <const ";
       break;
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -386,43 +389,43 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
   switch (node->pt ())
     {
     case AST_PredefinedType::PT_long:
-      *os << "ACE_CDR::Long *)";
+      *os << "ACE_CDR::Long";
       break;
     case AST_PredefinedType::PT_ulong:
-      *os << "ACE_CDR::ULong *)";
+      *os << "ACE_CDR::ULong";
       break;
     case AST_PredefinedType::PT_short:
-      *os << "ACE_CDR::Short *)";
+      *os << "ACE_CDR::Short";
       break;
     case AST_PredefinedType::PT_ushort:
-      *os << "ACE_CDR::UShort *)";
+      *os << "ACE_CDR::UShort";
       break;
     case AST_PredefinedType::PT_octet:
-      *os << "ACE_CDR::Octet *)";
+      *os << "ACE_CDR::Octet";
       break;
     case AST_PredefinedType::PT_char:
-      *os << "ACE_CDR::Char *)";
+      *os << "ACE_CDR::Char";
       break;
     case AST_PredefinedType::PT_wchar:
-      *os << "ACE_CDR::WChar *)";
+      *os << "ACE_CDR::WChar";
       break;
     case AST_PredefinedType::PT_float:
-      *os << "ACE_CDR::Float *)";
+      *os << "ACE_CDR::Float";
       break;
     case AST_PredefinedType::PT_double:
-      *os << "ACE_CDR::Double *)";
+      *os << "ACE_CDR::Double";
       break;
     case AST_PredefinedType::PT_longlong:
-      *os << "ACE_CDR::LongLong *)";
+      *os << "ACE_CDR::LongLong";
       break;
     case AST_PredefinedType::PT_ulonglong:
-      *os << "ACE_CDR::ULongLong *)";
+      *os << "ACE_CDR::ULongLong";
       break;
     case AST_PredefinedType::PT_longdouble:
-      *os << "ACE_CDR::LongDouble *)";
+      *os << "ACE_CDR::LongDouble";
       break;
     case AST_PredefinedType::PT_boolean:
-      *os << "ACE_CDR::Boolean *)";
+      *os << "ACE_CDR::Boolean";
       break;
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -436,10 +439,10 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << " _tao_array.out (), ";
+      *os << " *> (_tao_array.out ())," << be_nl;
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "_tao_array.in (), ";
+      *os << " *> (_tao_array.in ())," << be_nl;
       break;
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -488,7 +491,8 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
         }
     }
 
-  *os << ");" << be_uidt_nl;
+  *os << be_uidt_nl
+      << ");" << be_uidt << be_uidt << be_uidt_nl;
 
   return 0;
 }
@@ -696,40 +700,16 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
       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
+          *os << "_tao_marshal_flag = " << be_idt_nl
+              << "TAO::Objref_Traits<" << bt->name () << ">::"
+              << "marshal (_tao_array";
+          
+          for (i = 0; i < ndims; ++i)
             {
-              
-              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;
+              *os << "[i" << i << "]";
             }
+
+          *os << ".in (), strm);" << be_uidt;
         }
       else
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
index 826b7082b6e..a9cb5a44a15 100644
--- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -58,8 +58,6 @@ be_exception *EXCEPS[N_EXCEPS];
 be_visitor_ccm_pre_proc::be_visitor_ccm_pre_proc (be_visitor_context *ctx)
   : be_visitor_scope (ctx),
     module_id_ ("Components"),
-    connection_ (0),
-    connections_ (0),
     cookie_ (0),
     already_connected_ (0),
     invalid_connection_ (0),
@@ -358,15 +356,6 @@ be_visitor_ccm_pre_proc::gen_uses (be_component *node)
         }
       else
         {
-          if (this->create_uses_multiple_stuff (node, pd) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_ccm_pre_proc::"
-                                 "gen_uses - "
-                                 "create_uses_multiple_stuff failed\n"),
-                                -1);
-            }
-
           if (this->gen_connect_multiple (node, pd) == -1)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -1466,152 +1455,6 @@ be_visitor_ccm_pre_proc::lookup_one_exception (be_component *node,
 }
 
 int
-be_visitor_ccm_pre_proc::create_uses_multiple_stuff (
-    be_component *node,
-    AST_Component::port_description *pd
-  )
-{
-  if (this->create_uses_multiple_struct (node, pd) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_stuff - "
-                         "create_uses_multiple_struct failed\n"),
-                        -1);
-    }
-
-  if (this->create_uses_multiple_sequence (node, pd) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_stuff - "
-                         "create_uses_multiple_sequence failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_ccm_pre_proc::create_uses_multiple_struct (
-    be_component *node,
-    AST_Component::port_description *pd
-  )
-{
-  UTL_ScopedName *full_name = 
-    this->create_scoped_name (0,
-                              pd->id->get_string (),
-                              "Connection",
-                              node);
-  ACE_NEW_RETURN (this->connection_,
-                  be_structure (0,
-                                0,
-                                0),
-                  -1);
-  this->connection_->set_defined_in (node);
-  this->connection_->set_imported (node->imported ());
-  this->connection_->set_name (full_name);
-
-  Identifier o_id ("objref");
-  UTL_ScopedName o_sn (&o_id,
-                       0);
-  AST_Field *m_objref = 0;
-  ACE_NEW_RETURN (m_objref,
-                  be_field (pd->impl,
-                            &o_sn),
-                  -1);
-  o_id.destroy ();
-
-  if (this->connection_->be_add_field (m_objref) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_struct - "
-                         "be_add_field failed\n"),
-                        -1);
-    }
-
-  Identifier v_id ("ck");
-  UTL_ScopedName v_sn (&v_id,
-                       0);
-  AST_Field *m_ck = 0;
-  ACE_NEW_RETURN (m_ck,
-                  be_field (this->cookie_,
-                            &v_sn),
-                  -1);
-
-  if (this->connection_->be_add_field (m_ck) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_struct - "
-                         "be_add_field failed\n"),
-                        -1);
-    }
-
-  if (node->be_add_structure (this->connection_) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_struct - "
-                         "be_add_structure failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_ccm_pre_proc::create_uses_multiple_sequence (
-    be_component *node,
-    AST_Component::port_description *pd
-  )
-{
-  ACE_UINT64 bound = 0;
-  ACE_NEW_RETURN (
-      this->connections_,
-      be_sequence (
-          idl_global->gen ()->create_expr (
-                                  bound,
-                                  AST_Expression::EV_ulong
-                                ),
-          this->connection_,
-          0,
-          0,
-          0
-        ),
-      -1
-    );
-
-  UTL_ScopedName *sn = 
-    this->create_scoped_name (0,
-                              pd->id->get_string (),
-                              "Connections",
-                              node);
-  AST_Typedef *td = 0;
-  ACE_NEW_RETURN (td,
-                  be_typedef (this->connections_,
-                              0,
-                              0,
-                              0),
-                  -1);
-  td->set_defined_in (node);
-  td->set_imported (node->imported ());
-  td->set_name (sn);
-
-  if (node->be_add_typedef (td) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_ccm_pre_proc::"
-                         "create_uses_multiple_sequence - "
-                         "be_add_typedef failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
 be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
 {
   AST_Interface *event_consumer = 0;
@@ -1627,71 +1470,30 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
   // We're at global scope here so we need to fool the scope stack
   // for a minute so the correct repo id can be calculated at
   // interface construction time.
-  idl_global->scopes ().push (node->defined_in ());
+  idl_global->scopes ().push (s);
 
-  if (node->n_inherits () == 0
-      || node->inherits ()[0]->node_type () == AST_Decl::NT_valuetype)
-    {
-      Identifier parent_id ("EventConsumerBase");
-      UTL_ScopedName parent_local_name (&parent_id,
-                                        0);
-      UTL_ScopedName parent_full_name (&this->module_id_,
-                                       &parent_local_name);
-      UTL_NameList parent_list (&parent_full_name,
-                                0);
-      FE_InterfaceHeader header (consumer_name,
-                                 &parent_list,
-                                 I_FALSE,
-                                 I_FALSE,
-                                 I_TRUE);
-      ACE_NEW_RETURN (event_consumer,
-                      be_interface (header.name (),
-                                    header.inherits (),
-                                    header.n_inherits (),
-                                    header.inherits_flat (),
-                                    header.n_inherits_flat (),
-                                    I_FALSE,
-                                    I_FALSE),
-                      -1);
-      parent_id.destroy ();
-    }
-  else
-    {
-      const char *tmp = node->inherits ()[0]->local_name ()->get_string ();
-      ACE_CString parent_name_base (tmp,
-                                    0,
+  Identifier parent_id ("EventConsumerBase");
+  UTL_ScopedName parent_local_name (&parent_id,
                                     0);
-      parent_name_base += "Consumer";
-      Identifier *parent_id = 0;
-      ACE_NEW_RETURN (parent_id,
-                      Identifier (parent_name_base.fast_rep ()),
-                      -1);
-      UTL_ScopedName *parent_local_name = 0;
-      ACE_NEW_RETURN (parent_local_name,
-                      UTL_ScopedName (parent_id,
-                                      0),
-                      -1);
-      UTL_ScopedName *parent_full_name =
-        (UTL_ScopedName *)m->name ()->copy ();
-      parent_full_name->nconc (parent_local_name);
-      UTL_NameList parent_list (parent_full_name,
-                                0);
-      FE_InterfaceHeader header (consumer_name,
-                                 &parent_list,
-                                 I_FALSE,
-                                 I_FALSE,
-                                 I_TRUE);
-      ACE_NEW_RETURN (event_consumer,
-                      be_interface (header.name (),
-                                    header.inherits (),
-                                    header.n_inherits (),
-                                    header.inherits_flat (),
-                                    header.n_inherits_flat (),
-                                    I_FALSE,
-                                    I_FALSE),
-                      -1);
-      parent_full_name->destroy ();
-    }
+  UTL_ScopedName parent_full_name (&this->module_id_,
+                                    &parent_local_name);
+  UTL_NameList parent_list (&parent_full_name,
+                            0);
+  FE_InterfaceHeader header (consumer_name,
+                              &parent_list,
+                              I_FALSE,
+                              I_FALSE,
+                              I_TRUE);
+  ACE_NEW_RETURN (event_consumer,
+                  be_interface (header.name (),
+                                header.inherits (),
+                                header.n_inherits (),
+                                header.inherits_flat (),
+                                header.n_inherits_flat (),
+                                I_FALSE,
+                                I_FALSE),
+                  -1);
+  parent_id.destroy ();
 
   // Back to reality.
   idl_global->scopes ().pop ();
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
index c2f85d715ff..df033ef129f 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -110,10 +110,6 @@ be_visitor_component_ch::visit_component (be_component *node)
       << "typedef " << node->local_name () << "_var _var_type;"
       << be_nl;
 
-
-  // Generate the static variable that we use for narrowing.
-  *os << "static int _tao_class_id;" << be_nl << be_nl;
-
   // Generate the static _duplicate, _narrow, and _nil operations.
   *os << "// The static operations." << be_nl
       << "static " << node->local_name () << "_ptr " << "_duplicate ("
@@ -128,8 +124,8 @@ be_visitor_component_ch::visit_component (be_component *node)
   // g++ problems.
   *os << "static " << node->local_name () << "_ptr _nil (void)"
       << be_idt_nl << "{" << be_idt_nl
-      << "return (" << node->local_name ()
-      << "_ptr)0;" << be_uidt_nl
+      << "return static_cast<" << node->local_name ()
+      << "_ptr> (0);" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
 
   if (be_global->any_support ())
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
index cc46761452b..d9aa9352aad 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -268,7 +268,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       << ")" << be_uidt << be_uidt_nl
       << " )" << be_nl
       << "{" << be_idt_nl
-      << "return 1; // success using local knowledge" << be_uidt_nl
+      << "return true; // success using local knowledge" << be_uidt_nl
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index 5198bcea272..45b966a4a0f 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -65,7 +65,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
           << "TAO::Any_Basic_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -74,7 +74,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
           << "TAO::Any_Basic_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype.cpp
deleted file mode 100644
index 3351a947161..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_eventtype.cpp
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype class
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#include "ace/SString.h"
-
-#include "be_eventtype.h"
-
-#include "be_visitor_eventtype.h"
-#include "be_visitor_valuetype.h"
-#include "be_visitor_context.h"
-#include "be_helper.h"
-
-#include "be_visitor_eventtype/eventtype_ch.cpp"
-#include "be_visitor_eventtype/eventtype_ci.cpp"
-#include "be_visitor_eventtype/eventtype_cs.cpp"
-#include "be_visitor_eventtype/eventtype_sh.cpp"
-#include "be_visitor_eventtype/eventtype_si.cpp"
-#include "be_visitor_eventtype/eventtype_ss.cpp"
-#include "be_visitor_eventtype/eventtype_obv_ch.cpp"
-#include "be_visitor_eventtype/eventtype_obv_ci.cpp"
-#include "be_visitor_eventtype/eventtype_obv_cs.cpp"
-#include "be_visitor_eventtype/any_op_ch.cpp"
-#include "be_visitor_eventtype/any_op_cs.cpp"
-#include "be_visitor_eventtype/cdr_op_ch.cpp"
-#include "be_visitor_eventtype/cdr_op_cs.cpp"
-
-ACE_RCSID (be,
-           be_visitor_eventtype,
-          "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_ch.cpp
deleted file mode 100644
index 23bf3f3950d..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_ch.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    any_op_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating Any operators for Eventtypes in the client header
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           any_op_ch, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for Any operators in the client header
-// ******************************************************
-
-be_visitor_eventtype_any_op_ch::be_visitor_eventtype_any_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_any_op_ch::~be_visitor_eventtype_any_op_ch (void)
-{
-}
-
-int
-be_visitor_eventtype_any_op_ch::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_any_op_ch visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_cs.cpp
deleted file mode 100644
index 80474142c50..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/any_op_cs.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    any_op_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating Any operators for Eventtypes in the client source
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           any_op_cs, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for Any operators in the client source
-// ******************************************************
-
-be_visitor_eventtype_any_op_cs::be_visitor_eventtype_any_op_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_any_op_cs::~be_visitor_eventtype_any_op_cs (void)
-{
-}
-
-int
-be_visitor_eventtype_any_op_cs::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_any_op_cs visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ch.cpp
deleted file mode 100644
index b04d9ed516e..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ch.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating CDR operators for Eventtypes in the client header
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           cdr_op_ch, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for CDR operators in the client header
-// ******************************************************
-
-be_visitor_eventtype_cdr_op_ch::be_visitor_eventtype_cdr_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_cdr_op_ch::~be_visitor_eventtype_cdr_op_ch (void)
-{
-}
-
-int
-be_visitor_eventtype_cdr_op_ch::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_cdr_op_ch visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ci.cpp
deleted file mode 100644
index 760703bb154..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_ci.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating CDR operators for Eventtypes in the client inline
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           cdr_op_ci, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for CDR operators in the client inline
-// ******************************************************
-
-be_visitor_eventtype_cdr_op_ci::be_visitor_eventtype_cdr_op_ci (
-    be_visitor_context *ctx
-  )
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_cdr_op_ci::~be_visitor_eventtype_cdr_op_ci (void)
-{
-}
-
-int
-be_visitor_eventtype_cdr_op_ci::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_cdr_op_ci visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_cs.cpp
deleted file mode 100644
index 3c6456643f4..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/cdr_op_cs.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating CDR operators for Eventtypes in the client source
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           cdr_op_cs, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for CDR operators in the client source
-// ******************************************************
-
-be_visitor_eventtype_cdr_op_cs::be_visitor_eventtype_cdr_op_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_cdr_op_cs::~be_visitor_eventtype_cdr_op_cs (void)
-{
-}
-
-int
-be_visitor_eventtype_cdr_op_cs::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_cdr_op_cs visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ch.cpp
deleted file mode 100644
index 87514072e0d..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ch.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Eventtypes in the client header
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           eventtype_ch, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for client header
-// ******************************************************
-
-be_visitor_eventtype_ch::be_visitor_eventtype_ch (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_ch::~be_visitor_eventtype_ch (void)
-{
-}
-
-int
-be_visitor_eventtype_ch::visit_eventtype (be_eventtype *node)
-{
-  if (node->cli_hdr_gen () || node->imported ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // All we do in this is generate a forward declaration of the 
-  // corresponding consumer interface class.
-  *os << be_nl << be_nl << "class " << node->local_name () << "Consumer;";
-
-  // Generate the ifdefined macro for the _ptr type.
-  os->gen_ifdef_macro (node->flat_name (), "Consumer_ptr");
-
-  // Generate the _ptr typedef.
-  *os << be_nl << be_nl 
-      << "typedef " << node->local_name () << "Consumer *" << node->local_name ()
-      << "Consumer_ptr;";
-
-  os->gen_endif ();
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_ch visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ci.cpp
deleted file mode 100644
index 8f877b580cb..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ci.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Eventtypes in the client inline
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           eventtype_ci, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for client inline
-// ******************************************************
-
-be_visitor_eventtype_ci::be_visitor_eventtype_ci (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_ci::~be_visitor_eventtype_ci (void)
-{
-}
-
-int
-be_visitor_eventtype_ci::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_ci visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_cs.cpp
deleted file mode 100644
index 4dd1b75cb3a..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_cs.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Eventtypes in the client source
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           eventtype_cs, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for client source
-// ******************************************************
-
-be_visitor_eventtype_cs::be_visitor_eventtype_cs (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_cs::~be_visitor_eventtype_cs (void)
-{
-}
-
-int
-be_visitor_eventtype_cs::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_cs visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ch.cpp
deleted file mode 100644
index f0164d197ec..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ch.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_obv_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Eventtypes in the client header
-//    OBV_ class
-//    (see C++ mapping OMG 20.17)
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           eventtype_obv_ch, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for client header
-// ******************************************************
-
-be_visitor_eventtype_obv_ch::be_visitor_eventtype_obv_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_obv_ch::~be_visitor_eventtype_obv_ch (void)
-{
-}
-
-
-// OBV_ class must be in OBV_ namespace.
-int
-be_visitor_eventtype_obv_ch::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_obv_ch visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ci.cpp
deleted file mode 100644
index 17a50567d75..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_ci.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_obv_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Eventtypes in the client inline
-//    OBV_ class
-//    (see C++ mapping OMG 20.17)
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           eventtype_obv_ci, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for client inline
-// ******************************************************
-
-be_visitor_eventtype_obv_ci::be_visitor_eventtype_obv_ci (
-    be_visitor_context *ctx
-  )
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_obv_ci::~be_visitor_eventtype_obv_ci (void)
-{
-}
-
-
-// OBV_ class must be in OBV_ namespace.
-int
-be_visitor_eventtype_obv_ci::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_obv_ci visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_cs.cpp
deleted file mode 100644
index 01b917396d4..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_obv_cs.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_obv_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Eventtypes in the client stub
-//    OBV_ class
-//    (see C++ mapping OMG 20.17)
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           eventtype_obv_cs, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for client stub
-// ******************************************************
-
-be_visitor_eventtype_obv_cs::be_visitor_eventtype_obv_cs (
-    be_visitor_context *ctx
-  )
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_obv_cs::~be_visitor_eventtype_obv_cs (void)
-{
-}
-
-
-// OBV_ class must be in OBV_ namespace.
-int
-be_visitor_eventtype_obv_cs::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_obv_cs visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_sh.cpp
deleted file mode 100644
index 4bb72071b58..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_sh.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_sh.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Eventtypes in the server header
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           eventtype_sh, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for server header
-// ******************************************************
-
-be_visitor_eventtype_sh::be_visitor_eventtype_sh (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_sh::~be_visitor_eventtype_sh (void)
-{
-}
-
-int
-be_visitor_eventtype_sh::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_sh visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_si.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_si.cpp
deleted file mode 100644
index 76112de4454..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_si.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_si.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Eventtypes in the server inline
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           eventtype_si, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for server inline
-// ******************************************************
-
-be_visitor_eventtype_si::be_visitor_eventtype_si (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_si::~be_visitor_eventtype_si (void)
-{
-}
-
-int
-be_visitor_eventtype_si::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_si visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ss.cpp
deleted file mode 100644
index ed8433bd9a0..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype/eventtype_ss.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_ss.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Eventtypes in the server source
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype, 
-           eventtype_ss, 
-           "$Id$")
-
-// ******************************************************
-// Eventtype visitor for server source
-// ******************************************************
-
-be_visitor_eventtype_ss::be_visitor_eventtype_ss (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_eventtype_ss::~be_visitor_eventtype_ss (void)
-{
-}
-
-int
-be_visitor_eventtype_ss::visit_eventtype (be_eventtype *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_ss visitor (&ctx);
-  return visitor.visit_valuetype (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype_fwd.cpp
deleted file mode 100644
index b68da9d5a75..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_eventtype_fwd.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Eventtype_Fwd
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#include "be_eventtype_fwd.h"
-
-#include "be_visitor_eventtype_fwd.h"
-#include "be_visitor_valuetype_fwd.h"
-#include "be_visitor_context.h"
-#include "be_helper.h"
-
-#include "be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp"
-#include "be_visitor_eventtype_fwd/any_op_ch.cpp"
-#include "be_visitor_eventtype_fwd/cdr_op_ch.cpp"
-
-ACE_RCSID (be, 
-           be_visitor_eventtype_fwd, 
-           "$Id$")
-
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/any_op_ch.cpp
deleted file mode 100644
index 86116afede8..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/any_op_ch.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    any_op_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating Any operators for EventTypeFwd node in the 
-//    client header.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype_fwd, 
-           any_op_ch, 
-           "$Id$")
-
-be_visitor_eventtype_fwd_any_op_ch::be_visitor_eventtype_fwd_any_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_eventtype_fwd_any_op_ch::~be_visitor_eventtype_fwd_any_op_ch (void)
-{
-}
-
-int
-be_visitor_eventtype_fwd_any_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_fwd_any_op_ch visitor (&ctx);
-  return visitor.visit_valuetype_fwd (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/cdr_op_ch.cpp
deleted file mode 100644
index 15858b3e88e..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/cdr_op_ch.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_fwd_cdr_op_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating CDR operators for EventTypeFwd node in the 
-//    client header.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype_fwd, 
-           eventtype_fwd_cdr_op_ch, 
-           "$Id$")
-
-be_visitor_eventtype_fwd_cdr_op_ch::be_visitor_eventtype_fwd_cdr_op_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_eventtype_fwd_cdr_op_ch::~be_visitor_eventtype_fwd_cdr_op_ch (void)
-{
-}
-
-int
-be_visitor_eventtype_fwd_cdr_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node)
-{
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_fwd_cdr_op_ch visitor (&ctx);
-  return visitor.visit_valuetype_fwd (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp
deleted file mode 100644
index 7f0d8c8d21c..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_eventtype_fwd/eventtype_fwd_ch.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_fwd_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for EventTypeFwd node in the client header.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-ACE_RCSID (be_visitor_eventtype_fwd, 
-           eventtype_fwd_ch, 
-           "$Id$")
-
-be_visitor_eventtype_fwd_ch::be_visitor_eventtype_fwd_ch (
-    be_visitor_context *ctx
-  )
-  : be_visitor_decl (ctx)
-{
-}
-
-be_visitor_eventtype_fwd_ch::~be_visitor_eventtype_fwd_ch (void)
-{
-}
-
-int
-be_visitor_eventtype_fwd_ch::visit_eventtype_fwd (be_eventtype_fwd *node)
-{
-  if (node->cli_hdr_gen () || node->imported ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // All we do in this is generate a forward declaration of the 
-  // corresponding consumer interface class.
-  *os << be_nl << be_nl << "class " << node->local_name () << "Consumer;";
-
-  // Generate the ifdefined macro for the _ptr type.
-  os->gen_ifdef_macro (node->flat_name (), "Consumer_ptr");
-
-  // Generate the _ptr typedef.
-  *os << be_nl << be_nl 
-      << "typedef " << node->local_name () << "Consumer *" << node->local_name ()
-      << "Consumer_ptr;";
-
-  os->gen_endif ();
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_valuetype_fwd_ch visitor (&ctx);
-  return visitor.visit_valuetype_fwd (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index f826cc6d789..178d5892a0f 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -60,9 +60,9 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
           << "CORBA::String_var id;" << be_nl << be_nl
-          << "if ((cdr >> id.out ()) == 0)" << be_idt_nl
+          << "if (!(cdr >> id.out ()))" << be_idt_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
           << "ACE_TRY_NEW_ENV" << be_idt_nl
           << "{" << be_idt_nl
@@ -71,10 +71,10 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "}" << be_uidt_nl
           << "ACE_CATCHANY" << be_idt_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "ACE_ENDTRY;" << be_nl << be_nl
-          << "return 1;" << be_uidt_nl
+          << "return true;" << be_uidt_nl
           << "}";
     }
   // Since we don't generate CDR stream operators for types that
@@ -91,7 +91,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -100,7 +100,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
index cad4fc6e9e0..f46219433cb 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
@@ -81,7 +81,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
           << "if (strm << _tao_aggregate._rep_id ())" << be_idt_nl
           << "{" << be_idt_nl
           << "// Now marshal the members (if any)." << be_nl
-          << "if (" << be_idt_nl;
+          << "return (" << be_idt_nl;
 
       if (this->visit_scope (node) == -1)
         {
@@ -92,33 +92,18 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
                             -1);
         }
 
-      *os << be_uidt_nl << " )"
-          << be_idt_nl
-          << "{" << be_idt_nl
-          << "return 1;" << be_uidt_nl
-          << "}" << be_uidt_nl
-          << "else" << be_idt_nl
-          << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
-          << "}" << be_uidt << be_uidt_nl
+      *os << be_uidt_nl << " );" << be_uidt_nl
           << "}" << be_uidt_nl
           << "else" << be_idt_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}" << be_uidt << be_uidt_nl;
     }
   else
     {
       // No members.
-      *os << "// First marshal the repository ID." << be_nl
-          << "if (strm << _tao_aggregate._rep_id ())" << be_idt_nl
-          << "{" << be_idt_nl
-          << "return 1;" << be_uidt_nl
-          << "}" << be_uidt_nl
-          << "else" << be_idt_nl
-          << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
-          << "}" << be_uidt << be_uidt_nl;
+      *os << "// Marshal the repository ID." << be_nl
+          << "return (strm << _tao_aggregate._rep_id ());" << be_uidt_nl;
     }
 
   *os << "}" << be_nl << be_nl;
@@ -159,7 +144,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
 
       // Some members.
       *os << "// Demarshal the members." << be_nl
-          << "if (" << be_idt_nl;
+          << "return (" << be_idt_nl;
 
       if (this->visit_scope (node) == -1)
         {
@@ -170,19 +155,11 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
                             -1);
         }
 
-      *os << be_uidt_nl << ")"
-          << be_idt_nl
-          << "{" << be_idt_nl
-          << "return 1;" << be_uidt_nl
-          << "}" << be_uidt_nl
-          << "else" << be_idt_nl
-          << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
-          << "}" << be_uidt << be_uidt_nl;
+      *os << be_uidt_nl << ");" << be_uidt_nl;
     }
   else
     {
-      *os << "return 1;" << be_uidt_nl;
+      *os << "return true;" << be_uidt_nl;
     }
 
   *os << "}";
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
index 1aa107199bc..db0ec84fed0 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
@@ -156,13 +156,15 @@ be_visitor_exception_ctor_assign::visit_interface (be_interface *node)
 
   if (this->ctx_->exception ()) // Special constructor.
     {
-      *os << "this->" << bd->local_name () << " = " << node->name ()
-          << "::_duplicate (_tao_" << bd->local_name () << ");";
+      *os << "this->" << bd->local_name () << " = TAO::Objref_Traits<"
+          << node->name () << ">::duplicate (_tao_" 
+          << bd->local_name () << ");";
     }
   else
     {
-      *os << "this->" << bd->local_name () << " = " << node->name ()
-          << "::_duplicate (_tao_excp." << bd->local_name () << ".in ());";
+      *os << "this->" << bd->local_name () << " = TAO::Objref_Traits<"
+          << node->name () << ">::duplicate (_tao_excp." 
+          << bd->local_name () << ".in ());";
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
index 3b9f24c1263..fa4befa74ca 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -87,9 +87,11 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
 
 
   *os << "static " << node->local_name ()
-      << " *_downcast (CORBA::Exception *);" << be_nl;
+      << " *_downcast (CORBA::Exception *);" << be_nl
+      << "static const " << node->local_name ()
+      << " *_downcast (CORBA::Exception const *);" << be_nl << be_nl;
 
-  *os << "static CORBA::Exception *_alloc (void);\n" << be_nl;
+  *os << "static CORBA::Exception *_alloc (void);" << be_nl << be_nl;
 
   *os << "virtual CORBA::Exception *"
       << "_tao_duplicate (void) const;\n" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 83a07eaf1ef..57f95a097d5 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -142,24 +142,26 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "{" << be_idt_nl
           << node->local_name () << " *_tao_tmp_pointer =" << be_idt_nl
           << "static_cast<"
-          << node->local_name () << "*> (_tao_void_pointer);" << be_uidt_nl
+          << node->local_name () << " *> (_tao_void_pointer);" << be_uidt_nl
           << "delete _tao_tmp_pointer;" << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
 
+  // Non-const downcast method.
   *os << node->name () << " *" << be_nl;
   *os << node->name () << "::_downcast (CORBA::Exception *_tao_excp)" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "if (!ACE_OS::strcmp (\"" << node->repoID ()
-      << "\", _tao_excp->_rep_id ()))" << be_idt_nl;
-  *os << "{" << be_idt_nl;
   *os << "return dynamic_cast<" << node->local_name ()
       << " *> (_tao_excp);" << be_uidt_nl;
-  *os << "}" << be_uidt_nl;
-  *os << "else" << be_idt_nl;
+  *os << "}" << be_nl << be_nl;
+  
+  // Const downcast method.
+  *os << "const " << node->name () << " *" << be_nl;
+  *os << node->name () << "::_downcast (CORBA::Exception const *_tao_excp)" 
+      << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "return 0;" << be_uidt_nl;
-  *os << "}" << be_uidt << be_uidt_nl;
+  *os << "return dynamic_cast<const " << node->local_name ()
+      << " *> (_tao_excp);" << be_uidt_nl;
   *os << "}" << be_nl << be_nl;
 
   // Generate the _alloc method.
@@ -175,7 +177,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
   *os << "CORBA::Exception *" << be_nl
       << node->name () << "::_tao_duplicate (void) const" << be_nl
       << "{" << be_idt_nl
-      << "CORBA::Exception *result;" << be_nl
+      << "CORBA::Exception *result = 0;" << be_nl
       << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
       << "result," << be_nl
       << "::" << node->name () << " (*this)," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index 84e541a3035..2a228ffe01d 100644
--- a/TAO/TAO_IDL/be/be_visitor_factory.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp
@@ -33,8 +33,6 @@
 #include "be_visitor_valuetype/valuetype_ch.h"
 #include "be_visitor_valuetype/valuetype_obv_ch.h"
 #include "be_visitor_valuetype/valuetype_obv_cs.h"
-#include "be_visitor_eventtype/eventtype_obv_ch.h"
-#include "be_visitor_eventtype/eventtype_obv_cs.h"
 #include "be_visitor_valuetype/ami_exception_holder_ch.h"
 #include "be_visitor_valuetype/ami_exception_holder_cs.h"
 #include "be_visitor_operation/operation.h"
@@ -80,16 +78,6 @@ TAO_Visitor_Factory::make_visitor (be_visitor_context *ctx)
                       be_visitor_valuetype_obv_cs (ctx),
                       0);
       break;
-    case TAO_CodeGen::TAO_EVENTTYPE_OBV_CH:
-      ACE_NEW_RETURN (retval,
-                      be_visitor_eventtype_obv_ch (ctx),
-                      0);
-      break;
-    case TAO_CodeGen::TAO_EVENTTYPE_OBV_CS:
-      ACE_NEW_RETURN (retval,
-                      be_visitor_eventtype_obv_cs (ctx),
-                      0);
-      break;
     case TAO_CodeGen::TAO_OPERATION_CH:
       ACE_NEW_RETURN (retval,
                       be_visitor_operation_ch (ctx),
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
index 4be4db0a459..dd51983df52 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
@@ -53,7 +53,9 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node)
   node->compute_full_name (rh_skel_prefix.c_str(), "", buf);
   ACE_CString rh_skel_full_scope_name ("POA_");
   rh_skel_full_scope_name += buf;
-  delete [] buf;
+  // buf was allocated by ACE_OS::strdup, so we need to use free instead
+  // of delete.
+  ACE_OS::free (buf);
 
   ACE_CString rh_skel_class_name_prefix (rh_skel_prefix.c_str ());
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index 0fc1fc9da96..4619aa4f754 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -88,7 +88,10 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
             be_interface::narrow_from_decl (node->inherits ()[i]);
           base->compute_full_name ("AMH_", "", buf);
           amh_name += buf;
-          delete [] buf;
+          // buf was allocated by ACE_OS::strdup, so we need to use free
+          // instead of delete. 
+          ACE_OS::free (buf);
+
 
           if (i != 0)
             {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
index 8be77a46ee4..b65470e9acd 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
@@ -95,7 +95,9 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
       char *buf = 0;
       ancestor->compute_full_name ("AMH_", "", buf);
       ancestor_name += buf;
-      delete [] buf;
+      // buf was allocated by ACE_OS::strdup, so we need to use free instead
+      // of delete.
+      ACE_OS::free (buf);
       buf = 0;
 
       const char *ancestor_amh_name = ancestor_name.fast_rep ();
@@ -103,7 +105,9 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
       ACE_CString derived_name ("POA_");
       derived->compute_full_name ("AMH_", "", buf);
       derived_name += buf;
-      delete [] buf;
+      // buf was allocated by ACE_OS::strdup, so we need to use free instead
+      // of delete.
+      ACE_OS::free (buf);
       buf = 0;
 
       const char *derived_amh_name = derived_name.fast_rep ();
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index e92127f6108..4a82a7a80da 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -76,8 +76,9 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
       << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);"
       << be_nl
       << "ACE_CHECK_RETURN (0);" << be_nl << be_nl;
-
-  *os << "CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl
+      
+  *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl
+      << "CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl
       << be_nl
       << "if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())"
       << be_idt_nl
@@ -97,8 +98,9 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
       << "0" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "CORBA::Object_var obj = tmp;" << be_nl << be_nl;
-
+      << "CORBA::Object_var obj = tmp;" << be_nl
+      << "(void) safe_stub.release ();" << be_nl << be_nl;
+      
   *os << "typedef ::" << node->name () << " STUB_SCOPED_NAME;" << be_nl
       << "return" << be_idt_nl;
 
@@ -203,7 +205,9 @@ emit (be_interface * /* derived */,
   char *buf = 0;
   base->compute_full_name ("AMH_", "", buf);
   amh_name += buf;
-  delete[] buf;
+  // buf was allocated using ACE_OS::strdup, so we must use free instead
+  // of delete.
+  ACE_OS::free (buf);
 
   *os << "if (ACE_OS::strcmp (logical_type_id, \""
       << base->repoID () << "\") == 0)" << be_idt_nl
@@ -285,7 +289,9 @@ emit (be_interface *derived,
       char *buf = 0;
       base->compute_full_name ("AMH_", "", buf);
       amh_name += buf;
-      delete[] buf;
+      // buf was allocated by ACE_OS::strdup, so we need to use free
+      // instead of delete.
+      ACE_OS::free (buf);
 
       *os << amh_name.c_str () << " (rhs)";
     }
@@ -330,7 +336,9 @@ be_visitor_amh_interface_ss::generate_flat_name (be_interface *node)
   // ACE_CString to compute_flat_name, after all it uses that
   // internally.
   ACE_CString result (buf);
-  delete[] buf;
+  // buf was allocated using ACE_OS::strdup, so we must use free instead
+  // of delete.
+  ACE_OS::free (buf);
 
   return result;
 }
@@ -355,7 +363,9 @@ be_visitor_amh_interface_ss::generate_full_skel_name (be_interface *node)
   char *buf = 0;
   node->compute_full_name ("AMH_", "", buf);
   result += buf;
-  delete[] buf;
+  // buf was allocated using ACE_OS::strdup, so we must use free instead
+  // of delete.
+  ACE_OS::free (buf);
 
   return result;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index d30c009f4d6..9cf778c7adb 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -98,7 +98,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           << "TAO::Any_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -107,7 +107,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           << "TAO::Any_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp
index 22dea90b18a..0958fa5e06d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp
@@ -160,12 +160,16 @@ be_visitor_interface_base_proxy_impl_ch::gen_abstract_ops_helper (
           UTL_ScopedName item_new_name (d->local_name (),
                                         0);
 
+          // We pass the node's is_abstract flag to the operation
+          // constructor so we will get the right generated operation
+          // body if we are regenerating an operation from an
+          // abstract interface in a concrete interface or component.
           AST_Operation *op = AST_Operation::narrow_from_decl (d);
           be_operation new_op (op->return_type (),
                                op->flags (),
                                &item_new_name,
                                op->is_local (),
-                               op->is_abstract ());
+                               node->is_abstract ());
           new_op.set_defined_in (node);
           be_visitor_interface::add_abstract_op_args (op,
                                                       new_op);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index 74bdfc80ac9..026a7276195 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -111,9 +111,9 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
     }
 
   *os << be_nl << be_nl
-      << "if ((strm >> obj.inout ()) == 0)" << be_idt_nl
+      << "if (!(strm >> obj.inout ()))" << be_idt_nl
       << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
+      << "return false;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "typedef ::" << node->name () << " RHS_SCOPED_NAME;"
       << be_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index b6863cc1822..18306c84602 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -157,6 +157,10 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
       UTL_ScopedName item_new_name (d->local_name (),
                                     0);
 
+          // We pass the node's is_abstract flag to the operation
+          // constructor so we will get the right generated operation
+          // body if we are regenerating an operation from an
+          // abstract interface in a concrete interface or component.
       if (d->node_type () == AST_Decl::NT_op)
         {
           AST_Operation *op = AST_Operation::narrow_from_decl (d);
@@ -164,7 +168,7 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
                                op->flags (),
                                &item_new_name,
                                op->is_local (),
-                               op->is_abstract ());
+                               node->is_abstract ());
           new_op.set_defined_in (node);
           be_visitor_interface::add_abstract_op_args (op,
                                                       new_op);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
index be617ef34ce..3b5b49c5b59 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
@@ -97,6 +97,10 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
       UTL_ScopedName *base = (UTL_ScopedName *)node->name ()->copy ();
       base->nconc (item_new_name);
 
+      // We pass the node's is_abstract flag to the operation
+      // constructor so we will get the right generated operation
+      // body if we are regenerating an operation from an
+      // abstract interface in a concrete interface or component.
       if (d->node_type () == AST_Decl::NT_op)
         {
           AST_Operation *op = AST_Operation::narrow_from_decl (d);
@@ -104,7 +108,7 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
                                op->flags (),
                                0,
                                op->is_local (),
-                               op->is_abstract ());
+                               node->is_abstract ());
           new_op.set_defined_in (node);
           be_visitor_interface::add_abstract_op_args (op,
                                                       new_op);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 675f9e648d5..e21027e99aa 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -170,8 +170,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   *os << "static " << node->local_name () << "_ptr _nil (void)"
       << be_nl
       << "{" << be_idt_nl
-      << "return (" << node->local_name ()
-      << "_ptr)0;" << be_uidt_nl
+      << "return static_cast<" << node->local_name ()
+      << "_ptr> (0);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   if (be_global->any_support ())
@@ -207,11 +207,31 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  if (node->session_component_child () == 1)
+    {
+      *os << "// These two are inherited from SessionComponent." 
+          << be_nl << be_nl
+          << "virtual void ciao_preactivate (" << be_idt << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << ")" << be_nl
+          << "ACE_THROW_SPEC ((" << be_idt_nl
+          << "CORBA::SystemException," << be_nl
+          << "::Components::CCMException" << be_uidt_nl
+          << "));" << be_uidt_nl << be_nl
+          << "virtual void ciao_postactivate (" << be_idt << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << ")" << be_nl
+          << "ACE_THROW_SPEC ((" << be_idt_nl
+          << "CORBA::SystemException," << be_nl
+          << "::Components::CCMException" << be_uidt_nl
+          << "));" << be_uidt_nl << be_nl;
+    }
+
   if (! node->is_abstract ())
     {
       node->analyze_parentage ();
     }
-
+    
   // If we inherit from both CORBA::Object and CORBA::AbstractBase,
   // we have to override _add_ref() to avoid ambiguity.
   if (node->has_mixed_parentage ())
@@ -411,7 +431,7 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node,
           be_operation new_op (op->return_type (),
                                op->flags (),
                                &item_new_name,
-                               op->is_local (),
+                               node->is_local (),
                                op->is_abstract ());
           new_op.set_defined_in (node);
           be_visitor_interface::add_abstract_op_args (op,
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 071136f1ee2..c3ad637baa7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -142,17 +142,20 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "}";
     }
 
-  // Generate the proxy broker factory function pointer definition.
-  *os << be_nl << be_nl
-      << "// Function pointer for collocation factory initialization."
-      << be_nl
-      << "TAO::Collocation_Proxy_Broker * " << be_nl
-      << "(*" << node->flat_client_enclosing_scope ()
-      << node->base_proxy_broker_name ()
-      << "_Factory_function_pointer) ("
-      << be_idt << be_idt_nl
-      << "CORBA::Object_ptr obj" << be_uidt_nl
-      << ") = 0;" << be_uidt;
+  if (!node->is_local ())
+    {
+      // Generate the proxy broker factory function pointer definition.
+      *os << be_nl << be_nl
+          << "// Function pointer for collocation factory initialization."
+          << be_nl
+          << "TAO::Collocation_Proxy_Broker * " << be_nl
+          << "(*" << node->flat_client_enclosing_scope ()
+          << node->base_proxy_broker_name ()
+          << "_Factory_function_pointer) ("
+          << be_idt << be_idt_nl
+          << "CORBA::Object_ptr obj" << be_uidt_nl
+          << ") = 0;" << be_uidt;
+    }
 
   // Generate code for the elements of the interface.
   if (this->visit_scope (node) == -1)
@@ -323,6 +326,31 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "return obj;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  // Empty implementations so the application can override or not.
+  if (node->session_component_child () == 1)
+    {
+      *os << "// These two are inherited from SessionComponent." 
+          << be_nl << be_nl
+          << "void" << be_nl
+          << node->full_name () << "::ciao_preactivate (" 
+          << be_idt << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl
+          << ")" << be_uidt_nl
+          << "ACE_THROW_SPEC ((CORBA::SystemException," << be_nl
+          << "                 ::Components::CCMException))" << be_uidt_nl
+          << "{" << be_nl
+          << "}" << be_nl << be_nl
+          << "void" << be_nl
+          << node->full_name () << "::ciao_postactivate (" 
+          << be_idt << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl
+          << ")" << be_uidt_nl
+          << "ACE_THROW_SPEC ((CORBA::SystemException," << be_nl
+          << "                 ::Components::CCMException))" << be_uidt_nl
+          << "{" << be_nl
+          << "}" << be_nl << be_nl;
+    }
+
   *os << "CORBA::Boolean" << be_nl
       << node->full_name () << "::_is_a (" << be_idt << be_idt_nl
       << "const char *value" << be_nl;
@@ -352,14 +380,14 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   if (node->is_abstract () || node->has_mixed_parentage ())
     {
       *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "(char *)value," << be_nl
+          << "value," << be_nl
           << "\"IDL:omg.org/CORBA/AbstractBase:1.0\"" << be_uidt_nl
           << ")";
     }
   else if (node->is_local ())
     {
       *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "(char *)value," << be_nl
+          << "value," << be_nl
           << "\"IDL:omg.org/CORBA/LocalObject:1.0\"" << be_uidt_nl
           << ")";
     }
@@ -376,21 +404,21 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   if (! node->is_abstract ())
     {
       *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "(char *)value," << be_nl
+          << "value," << be_nl
           << "\"IDL:omg.org/CORBA/Object:1.0\"" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl;
     }
 
-  *os << " )" << be_nl
+  *os << ")" << be_nl
       << "{" << be_idt_nl
-      << "return 1; // success using local knowledge" << be_uidt_nl
+      << "return true; // success using local knowledge" << be_uidt_nl
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl;
 
   if (node->is_abstract () || node->is_local ())
     {
-      *os << "return 0;" << be_uidt_nl;
+      *os << "return false;" << be_uidt_nl;
     }
   else
     {
@@ -419,7 +447,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     {
       *os << node->name () << "::marshal (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
   else
@@ -562,7 +590,9 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node,
                                                   be_interface *base,
                                                   TAO_OutStream *os)
 {
-  if (!base->is_abstract ())
+  // If the derived interface is local, the abstract parent's operation
+  // was generated as pure virtual.
+  if (!base->is_abstract () || node->is_local ())
     {
       return 0;
     }
@@ -597,12 +627,16 @@ be_visitor_interface_cs::gen_abstract_ops_helper (be_interface *node,
           UTL_ScopedName *base = (UTL_ScopedName *)node->name ()->copy ();
           base->nconc (item_new_name);
 
+          // We pass the node's is_abstract flag to the operation
+          // constructor so we will get the right generated operation
+          // body if we are regenerating an operation from an
+          // abstract interface in a concrete interface or component.
           AST_Operation *op = AST_Operation::narrow_from_decl (d);
           be_operation new_op (op->return_type (),
                                op->flags (),
                                0,
                                op->is_local (),
-                               op->is_abstract ());
+                               node->is_abstract ());
           new_op.set_defined_in (node);
           be_visitor_interface::add_abstract_op_args (op,
                                                       new_op);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 754c5424990..9f5d326b7ea 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -176,7 +176,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   << be_nl << be_nl;
 
   *os << full_skel_name << " *_tao_impl =" << be_idt_nl
-      << "(" << full_skel_name << " *) _tao_servant;" << be_uidt_nl << be_nl;
+      << "static_cast<" << full_skel_name
+      << " *> (_tao_servant);" << be_uidt_nl << be_nl;
 
   *os << "CORBA::Boolean _tao_retval = 0;" << be_nl;
   *os << "CORBA::String_var value;" << be_nl << be_nl;
@@ -235,7 +236,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << full_skel_name << " *_tao_impl =" << be_idt_nl
-      << "(" << full_skel_name << " *) _tao_servant;" << be_uidt_nl << be_nl;
+      << "static_cast<" << full_skel_name
+      << " *> (_tao_servant);" << be_uidt_nl << be_nl;
 
   *os << "CORBA::Boolean _tao_retval =" << be_idt_nl
       << "_tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);"
@@ -286,7 +288,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "ACE_THROW (CORBA::INTF_REPOS ());" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
   *os << full_skel_name << " *_tao_impl =" << be_idt_nl
-      << "(" << full_skel_name << " *) _tao_servant;" << be_uidt_nl << be_nl;
+      << "static_cast<" << full_skel_name
+      << " *> (_tao_servant);" << be_uidt_nl << be_nl;
 
   *os << "CORBA::InterfaceDef_ptr _tao_retval = " << be_idt_nl
       << "_tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);"
@@ -322,8 +325,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << full_skel_name << " *_tao_impl =" << be_idt_nl
-      << "(" << full_skel_name << " *) _tao_object_reference;"
-      << be_uidt_nl << be_nl;
+      << "static_cast<" << full_skel_name
+      << " *> (_tao_object_reference);" << be_uidt_nl << be_nl;
 
   *os << "CORBA::Object_var _tao_retval =" << be_idt_nl
       << "_tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);"
@@ -362,7 +365,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "if (" << be_idt << be_idt_nl;
+      << "return" << be_idt_nl
+      << "(" << be_idt_nl;
 
   if (node->traverse_inheritance_graph (be_interface::is_a_helper, os) == -1)
     {
@@ -374,7 +378,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     }
 
   *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-      << "(char *)value," << be_nl
+      << "value," << be_nl
       << "\"IDL:omg.org/CORBA/Object:1.0\"" << be_uidt_nl
       << ")";
 
@@ -388,14 +392,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     }
 
   *os << be_uidt << be_uidt_nl
-      << " )" << be_nl
-      << "{" << be_idt_nl
-      << "return 1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // the downcast method.
@@ -481,12 +478,16 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
 
       if (d->node_type () == AST_Decl::NT_op)
         {
+          // We pass the node's is_abstract flag to the operation
+          // constructor so we will get the right generated operation
+          // body if we are regenerating an operation from an
+          // abstract interface in a concrete interface or component.
           AST_Operation *op = AST_Operation::narrow_from_decl (d);
           be_operation new_op (op->return_type (),
                                op->flags (),
                                0,
                                op->is_local (),
-                               op->is_abstract ());
+                               node->is_abstract ());
           new_op.set_defined_in (node);
           be_visitor_interface::add_abstract_op_args (op,
                                                       new_op);
@@ -537,25 +538,16 @@ be_visitor_interface_ss::this_method (be_interface *node)
       << "ACE_CHECK_RETURN (0);" << be_nl << be_nl
       << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl;
 
-  *os << "CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl
-      << be_nl
-      << "if (stub->servant_orb_var ()->orb_core ()->"
-      << "optimize_collocation_objects ())" << be_idt_nl
-      << "{" << be_idt_nl
-      << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-      << "tmp," << be_nl
-      << "CORBA::Object (stub, 1, this)," << be_nl
-      << "0" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
+  *os << "CORBA::Object_ptr tmp = CORBA::Object::_nil ();" 
+      << be_nl << be_nl
+      << "CORBA::Boolean _tao_opt_colloc =" << be_idt_nl
+      << "stub->servant_orb_var ()->orb_core ()->"
+      << "optimize_collocation_objects ();" << be_uidt_nl << be_nl
       << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
       << "tmp," << be_nl
-      << "CORBA::Object (stub, 0, this)," << be_nl
+      << "CORBA::Object (stub, _tao_opt_colloc, this)," << be_nl
       << "0" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl;
+      << ");" << be_uidt_nl << be_nl;
 
   *os << "CORBA::Object_var obj = tmp;" << be_nl
       << "(void) safe_stub.release ();" << be_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp
index 60b78e71365..d406126bcd6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp
@@ -115,12 +115,16 @@ be_visitor_interface_remote_proxy_impl_cs::gen_abstract_ops_helper (
           UTL_ScopedName *base = (UTL_ScopedName *)node->name ()->copy ();
           base->nconc (item_new_name);
 
+          // We pass the node's is_abstract flag to the operation
+          // constructor so we will get the right generated operation
+          // body if we are regenerating an operation from an
+          // abstract interface in a concrete interface or component.
           AST_Operation *op = AST_Operation::narrow_from_decl (d);
           be_operation new_op (op->return_type (),
                                op->flags (),
                                0,
                                op->is_local (),
-                               op->is_abstract ());
+                               node->is_abstract ());
           new_op.set_defined_in (node);
           be_visitor_interface::add_abstract_op_args (op,
                                                       new_op);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index ee5be9b7dfe..397dc2c3986 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -111,7 +111,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_CHECK;" << be_nl << be_nl
-      << "servant_upcall.pre_invoke_collocated_request (" 
+      << "servant_upcall.pre_invoke_collocated_request ("
       << be_idt << be_idt_nl
       << "ACE_ENV_SINGLE_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
@@ -128,7 +128,8 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "                             op_len);" << be_nl << be_nl
       << "if (status == -1)" << be_idt_nl
       << "{" << be_idt_nl
-      << "ACE_THROW (CORBA::BAD_OPERATION ());" << be_uidt_nl
+      << "ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, "
+      << "CORBA::COMPLETED_NO));" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "ACE_TRY" << be_idt_nl
       << "{" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
index e110498bd7c..319ba991a4d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -95,11 +95,6 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  if (node->is_nested ())
-    {
-      *os << "#if defined (ACE_HAS_USING_KEYWORD)" << be_nl << be_nl;
-    }
-
   *os << "template <class T> ACE_INLINE" << be_nl
       << fulltiename << "<T>::" << localtiename << " (T &t)" << be_nl
       << "\t: ptr_ (&t)," << be_nl
@@ -210,11 +205,6 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
                         -1);
     }
 
-  if (node->is_nested ())
-    {
-      *os << "\n\n#endif /* ACE_HAS_USING_KEYWORD */";
-    }
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
index f7c297f2789..ee1f579dd58 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
@@ -39,16 +39,14 @@ be_visitor_interface_fwd_any_op_ch::~be_visitor_interface_fwd_any_op_ch (void)
 }
 
 int
-be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (
-    be_interface_fwd *node
-  )
+be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node)
 {
   AST_Interface *fd = node->full_definition ();
 
   // Only a forward declared interface that is not defined in the same file
   // needs to have this generated here. The Any operators are needed by
   // portable interceptor code if the interface is a parameter of an operation.
-  if (fd->is_defined () != 0)
+  if (fd->is_defined () != 0 || node->is_local ())
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
index ac208f83648..1d801f131bd 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
@@ -48,7 +48,7 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node)
   // the CDR operator declaration (along with the corresponding
   // declarations for members of the interface's scope) will be
   // generated then.
-  if (fd->is_defined ())
+  if (fd->is_defined () || node->is_local ())
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_module.cpp b/TAO/TAO_IDL/be/be_visitor_module.cpp
index 6a8bfc29f89..296a97fb111 100644
--- a/TAO/TAO_IDL/be/be_visitor_module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module.cpp
@@ -53,8 +53,8 @@
 #include "be_visitor_union_fwd.h"
 #include "be_visitor_valuetype.h"
 #include "be_visitor_valuetype_fwd.h"
-#include "be_visitor_eventtype.h"
-#include "be_visitor_eventtype_fwd.h"
+//#include "be_visitor_eventtype.h"
+//#include "be_visitor_eventtype_fwd.h"
 #include "be_visitor_component.h"
 #include "be_visitor_component_fwd.h"
 #include "be_visitor_home.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
index 7505969be27..063a22f5bf4 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
@@ -36,7 +36,8 @@ be_visitor_module::~be_visitor_module (void)
 {
 }
 
-int be_visitor_module::visit_module (be_module *node)
+int 
+be_visitor_module::visit_module (be_module *node)
 {
   if (node->nmembers () == 0)
     {
@@ -572,133 +573,13 @@ be_visitor_module::visit_valuetype_fwd (be_valuetype_fwd *node)
 int
 be_visitor_module::visit_eventtype (be_eventtype *node)
 {
-  // Instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node);
-  int status = 0;
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      {
-        be_visitor_eventtype_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CI:
-      {
-        be_visitor_eventtype_ci visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CS:
-      {
-        be_visitor_eventtype_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
-      {
-        be_visitor_eventtype_cdr_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
-      {
-        be_visitor_eventtype_cdr_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
-      {
-        be_visitor_eventtype_any_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
-      {
-        be_visitor_eventtype_any_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SH:
-      {
-        be_visitor_eventtype_sh visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SI:
-      {
-        be_visitor_eventtype_si visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SS:
-      {
-        be_visitor_eventtype_ss visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    default:
-      return 0;    // nothing to do.
-    }
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_eventtype - "
-                         "failed to accept visitor\n"),  
-                        -1);
-    }
-
-  return 0;
+  return this->visit_valuetype (node);
 }
 
 int
 be_visitor_module::visit_eventtype_fwd (be_eventtype_fwd *node)
 {
-  // Instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting.
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node);
-  int status = 0;
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      {
-        be_visitor_eventtype_fwd_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
-      {
-        be_visitor_eventtype_fwd_any_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
-      {
-        be_visitor_eventtype_fwd_cdr_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    default:
-      return 0; // nothing to be done
-    }
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_eventtype_fwd - "
-                         "failed to accept visitor\n"),  
-                        -1);
-    }
-
-  return 0;
+  return this->visit_valuetype_fwd (node);
 }
 
 int 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
index d49e70e859f..3875db2d840 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
@@ -60,7 +60,9 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
   intf->compute_full_name ("TAO_", "", buf);
   ACE_CString response_handler_implementation_name ("POA_");
   response_handler_implementation_name += buf;
-  delete [] buf;
+  // buf was allocated by ACE_OS::strdup, so we need to use free instead
+  // of delete.
+  ACE_OS::free (buf);
   buf = 0;
 
   // Step 1 : Generate return type: always void
@@ -176,7 +178,8 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);" 
-          << be_nl << be_nl;
+          << be_nl
+          << "ACE_CHECK;" << be_nl << be_nl;
 
       this->marshal_params (node);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
index 3f88d2f4fef..b19b72f4656 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -217,6 +217,8 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
   intf->compute_full_name ("AMH_", "ResponseHandler_ptr", buf);
 
   *os << buf << " _tao_rh";
-  delete [] buf;
+  // buf was allocated by ACE_OS::strdup, so we must use free instead
+  // of delete.
+  ACE_OS::free (buf);
   buf = 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index 45bf3384dc4..c48a71faded 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -320,7 +320,9 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
   intf->compute_full_name ("AMH_", "", buf);
   ACE_CString amh_skel_name ("POA_");
   amh_skel_name += buf;
-  delete [] buf;
+  // buf was allocated by ACE_OS::strdup, so we need to use free instead
+  // of delete.
+  ACE_OS::free (buf);
   buf = 0;
 
   *os << "void" << be_nl
@@ -360,7 +362,9 @@ be_visitor_amh_operation_ss::generate_shared_section (be_decl *node,
   intf->compute_full_name ("TAO_AMH_", "ResponseHandler", buf);
   ACE_CString response_handler_implementation_name ("POA_");
   response_handler_implementation_name += buf;
-  delete [] buf;
+  // buf was allocated by ACE_OS::strdup, so we need to use free instead
+  // of delete.
+  ACE_OS::free (buf);
   buf = 0;
 
   *os << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 58fbf41603a..c0f6e6eb4f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -707,7 +707,7 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope,
       // last line of this method, whether bt is a typedef or not.
       if (bound > 0)
         {
-          *os << "TAO::";
+          *os << "::TAO::";
 
           if (alias != 0)
             {
@@ -745,28 +745,24 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope,
       switch (pdt->pt ())
         {
           case AST_PredefinedType::PT_boolean:
-            *os << "ACE_InputCDR::to_boolean";
+            *os << "::ACE_InputCDR::to_boolean";
             return;
           case AST_PredefinedType::PT_octet:
-            *os << "ACE_InputCDR::to_octet";
+            *os << "::ACE_InputCDR::to_octet";
             return;
           case AST_PredefinedType::PT_char:
-            *os << "ACE_InputCDR::to_char";
+            *os << "::ACE_InputCDR::to_char";
             return;
           case AST_PredefinedType::PT_wchar:
-            *os << "ACE_InputCDR::to_wchar";
+            *os << "::ACE_InputCDR::to_wchar";
             return;
+          case AST_PredefinedType::PT_void:
+            break;
           default:
+            *os << "::";
             break;
         }
     }
-  else
-    {
-      // If it is not a basic type, then it is a scoped name, and
-      // we need this to possibly disambiguate.
-      *os << "::";
-    }
-
   // For types other than the 4 above, don't unalias the type name
   // in case it is a sequence or array.
   *os << bt->name ();
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
index dbc17505b5f..795c4a63cd4 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
@@ -44,7 +44,7 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
+     
   // Every operation is declared virtual in the client code.
   *os << "virtual ";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp
index 567c4a4ee42..5dd2cac3f79 100644
--- a/TAO/TAO_IDL/be/be_visitor_root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root.cpp
@@ -52,8 +52,8 @@
 #include "be_visitor_union_fwd.h"
 #include "be_visitor_valuetype.h"
 #include "be_visitor_valuetype_fwd.h"
-#include "be_visitor_eventtype.h"
-#include "be_visitor_eventtype_fwd.h"
+//#include "be_visitor_eventtype.h"
+//#include "be_visitor_eventtype_fwd.h"
 #include "be_visitor_component.h"
 #include "be_visitor_component_fwd.h"
 #include "be_visitor_home.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index dc3297ec514..f6887fe9cee 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -973,133 +973,13 @@ be_visitor_root::visit_valuetype_fwd (be_valuetype_fwd *node)
 int
 be_visitor_root::visit_eventtype (be_eventtype *node)
 {
-  // Instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node);
-  int status = 0;
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      {
-        be_visitor_eventtype_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CI:
-      {
-        be_visitor_eventtype_ci visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CS:
-      {
-        be_visitor_eventtype_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
-      {
-        be_visitor_eventtype_cdr_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
-      {
-        be_visitor_eventtype_cdr_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
-      {
-        be_visitor_eventtype_any_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
-      {
-        be_visitor_eventtype_any_op_cs visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SH:
-      {
-        be_visitor_eventtype_sh visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SI:
-      {
-        be_visitor_eventtype_si visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_SS:
-      {
-        be_visitor_eventtype_ss visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    default:
-      return 0;    // nothing to do.
-    }
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_eventtype - "
-                         "failed to accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
+  return this->visit_valuetype (node);
 }
 
 int
 be_visitor_root::visit_eventtype_fwd (be_eventtype_fwd *node)
 {
-  // Instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting.
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node);
-  int status = 0;
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      {
-        be_visitor_eventtype_fwd_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
-      {
-        be_visitor_eventtype_fwd_any_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
-      {
-        be_visitor_eventtype_fwd_cdr_op_ch visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
-    default:
-      return 0; // nothing to be done
-    }
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_eventtype_fwd - "
-                         "failed to accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
+  return this->visit_valuetype_fwd (node);
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
index 9ed3a36428a..268badf87af 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
@@ -53,8 +53,7 @@ be_visitor_root_ch::init (void)
 
   // If this IDL file contains an interface declaration, generated a
   // forward declaration of the proxy broker for a possible collocated call.
-  if (ACE_BIT_ENABLED (idl_global->decls_seen_info_,
-                       idl_global->decls_seen_masks.interface_seen_))
+  if (idl_global->interface_seen_)
     {
       TAO_OutStream *os = this->ctx_->stream ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
index 161541c8f94..c0d397965d0 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
@@ -115,13 +115,6 @@ be_visitor_root_sth::visit_module (be_module *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
                << "// " __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  if (!node->is_nested ())
-    {
-      // If the line below is not true, we don't want to
-      // see 'TAO_NAMESPACE' or anything in it.
-      *os << "#if defined (ACE_HAS_USING_KEYWORD)" << be_nl;
-    }
-
   // Now generate the class definition. The prefix POA_ is prepended to our
   // name only if we are the outermost module.
   *os << "namespace ";
@@ -150,11 +143,6 @@ be_visitor_root_sth::visit_module (be_module *node)
 
   *os << be_uidt_nl << "} // module " << node->name ();
 
-  if (!node->is_nested ())
-    {
-      *os << "\n#endif /* ACE_HAS_USING_KEYWORD */";
-    }
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence.cpp b/TAO/TAO_IDL/be/be_visitor_sequence.cpp
index c9ecc7c1568..005c535d46b 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence.cpp
@@ -23,6 +23,7 @@
 #include "be_interface_fwd.h"
 #include "be_component.h"
 #include "be_component_fwd.h"
+#include "be_home.h"
 #include "be_predefined_type.h"
 #include "be_sequence.h"
 #include "be_string.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index 1e7633179b0..5541c9f15bf 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -67,7 +67,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -76,7 +76,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 3a27523ade3..93df5e8a155 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -137,7 +137,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
     }
 
   *os << "}" << be_uidt_nl << be_nl
-      << "return 0;" << be_uidt_nl
+      << "return false;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   //  Set the sub state as generating code for the input operator.
@@ -176,7 +176,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       *os << "// of the stream. (See bug 58.)" << be_nl;
       *os << "if (_tao_seq_len > strm.length ())" << be_idt_nl
           << "{" << be_idt_nl;
-      *os << "return 0;" << be_uidt_nl
+      *os << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
       // Now check if the length does not exceed the maximum. We do this only
@@ -219,7 +219,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       *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
+      *os << "return true;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
       *os << "// Retrieve all the elements." << be_nl;
@@ -249,7 +249,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       *os << be_nl << "}" << be_uidt_nl << be_nl;
     }
 
-  *os << "return 0;" << be_uidt_nl
+  *os << "return false;" << be_uidt_nl
       << "}";
 
   *os << be_nl << be_nl
@@ -285,6 +285,24 @@ be_visitor_sequence_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
 }
 
 int
+be_visitor_sequence_cdr_op_cs::visit_component (be_component *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_sequence_cdr_op_cs::visit_component_fwd (be_component_fwd *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_sequence_cdr_op_cs::visit_home (be_home *node)
+{
+  return this->visit_node (node);
+}
+
+int
 be_visitor_sequence_cdr_op_cs::visit_valuetype (be_valuetype *node)
 {
   return this->visit_node (node);
@@ -297,6 +315,18 @@ be_visitor_sequence_cdr_op_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
 }
 
 int
+be_visitor_sequence_cdr_op_cs::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_node (node);
+}
+
+int
+be_visitor_sequence_cdr_op_cs::visit_eventtype_fwd (be_eventtype_fwd *node)
+{
+  return this->visit_node (node);
+}
+
+int
 be_visitor_sequence_cdr_op_cs::visit_predefined_type (
     be_predefined_type *node
   )
@@ -374,11 +404,11 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (
         case TAO_CodeGen::TAO_CDR_OUTPUT:
           {
             *os << "{" << be_idt_nl
-                << "TAO_Unbounded_Sequence<CORBA::Octet> *oseq = " << be_nl
-                << "  static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> ("
-                << "(" << sequence->name () << " *)&_tao_sequence);" << be_nl
-                << "if (oseq->mb ())" << be_idt_nl
-                << "return strm.write_octet_array_mb (oseq->mb ());"
+                << "TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = " << be_nl
+                << "  static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> "
+                << "(const_cast<" << sequence->name () << " *> (&_tao_sequence));" << be_nl
+                << "if (_tao_octet_seq->mb ())" << be_idt_nl
+                << "return strm.write_octet_array_mb (_tao_octet_seq->mb ());"
                 << be_uidt_nl
                 << "else" << be_idt_nl
                 << "return strm.write_octet_array ("
@@ -561,7 +591,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
   be_visitor_sequence_base visitor (&ctx);
 
   // Initialize a boolean variable.
-  *os << "CORBA::Boolean _tao_marshal_flag = 1;" << be_nl << be_nl;
+  *os << "CORBA::Boolean _tao_marshal_flag = true;" << be_nl << be_nl;
 
   // 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
@@ -789,31 +819,8 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                                 -1);
             }
 
-          *os << "_dup (\n";
-
-          // Even though the following arg is declared const in the
-          // function signature, MSVC++ 5.0 needs the const cast,
-          // and many other compilers just won't do it.
-          *os << "#if defined (_MSC_VER) && (_MSC_VER <= 1100)";
-
-          os->indent ();
-
-          *os << be_idt << be_idt_nl;
-          *os << "const_cast<const " << this->ctx_->node ()->name ()
-              << "> (_tao_sequence)[i]\n";
-          *os << "#else";
-
-          os->indent ();
-
-          *os << be_nl;
-          *os << "_tao_sequence[i]\n";
-          *os << "#endif /* defined (_MSC_VER) && (_MSC_VER <= 1100) */";
-
-          os->indent ();
-
-          *os << be_uidt_nl;
-          *os << ")" << be_uidt << be_uidt_nl;
-          *os << ");" << be_uidt_nl;
+          *os << "_dup (_tao_sequence[i])" << be_uidt_nl
+              << ");" << be_uidt_nl;
 
           if (bt->accept (&visitor) == -1)
             {
@@ -830,19 +837,11 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
           break;
         case AST_Decl::NT_interface:
         case AST_Decl::NT_interface_fwd:
-          *os << "_tao_marshal_flag =" << be_idt_nl;
-
-          if (bt->is_defined ())
-            {
-              *os << "_tao_sequence[i].in ()->marshal (strm);" << be_uidt;
-            }
-          else
-            {
-              *os << "TAO::Objref_Traits<" << bt->name () << ">::marshal ("
-                  << be_idt << be_idt_nl
-                  << "_tao_sequence[i].in (), strm" << be_uidt_nl
-                  << ");" << be_uidt << be_uidt;
-            }
+          *os << "_tao_marshal_flag =" << be_idt_nl
+              << "TAO::Objref_Traits<" << bt->name () << ">::marshal ("
+              << be_idt << be_idt_nl
+              << "_tao_sequence[i].in (), strm" << be_uidt_nl
+              << ");" << be_uidt << be_uidt;
 
           break;
         case AST_Decl::NT_string:
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index 753e661757c..9e8cd439a26 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -67,7 +67,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -76,7 +76,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
index f42f6b7654b..dbbdab9dfd6 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
@@ -112,7 +112,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
 
   if (node->is_local ())
     {
-      *os << "return 0;";
+      *os << "return false;";
     }
   else
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_tmplinst.cpp b/TAO/TAO_IDL/be/be_visitor_tmplinst.cpp
index ffbfe1c6d23..3de043eef68 100644
--- a/TAO/TAO_IDL/be/be_visitor_tmplinst.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_tmplinst.cpp
@@ -21,6 +21,10 @@
 #include "be_root.h"
 #include "be_module.h"
 #include "be_interface.h"
+#include "be_interface_fwd.h"
+#include "be_component.h"
+#include "be_component_fwd.h"
+#include "be_home.h"
 #include "be_valuetype.h"
 #include "be_array.h"
 #include "be_attribute.h"
@@ -32,7 +36,6 @@
 #include "be_union.h"
 #include "be_operation.h"
 #include "be_argument.h"
-#include "be_interface_fwd.h"
 #include "be_valuetype_fwd.h"
 #include "be_eventtype.h"
 #include "be_eventtype_fwd.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp b/TAO/TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp
index 8bcf206fed7..be8b8d3aacd 100644
--- a/TAO/TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp
@@ -103,6 +103,24 @@ be_visitor_arg_tmplinst::visit_interface_fwd (be_interface_fwd *node)
 }
 
 int
+be_visitor_arg_tmplinst::visit_component (be_component *node)
+{
+  return this->visit_interface (node);
+}
+
+int
+be_visitor_arg_tmplinst::visit_component_fwd (be_component_fwd *node)
+{
+  return this->visit_interface_fwd (node);
+}
+
+int
+be_visitor_arg_tmplinst::visit_home (be_home *node)
+{
+  return this->visit_interface (node);
+}
+
+int
 be_visitor_arg_tmplinst::visit_valuetype (be_valuetype *node)
 {
   if (this->this_mode_and_dir_generated (node))
diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp
index d7233422e98..189ad0d4f06 100644
--- a/TAO/TAO_IDL/be/be_visitor_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp
@@ -94,7 +94,7 @@ be_visitor_traits::visit_module (be_module *node)
 int
 be_visitor_traits::visit_interface (be_interface *node)
 {
-  if (node->cli_traits_gen ())
+  if (node->cli_traits_gen () || !node->is_defined ())
     {
       return 0;
     }
@@ -103,10 +103,8 @@ be_visitor_traits::visit_interface (be_interface *node)
 
   // Since the three blocks below generate specialized (i.e., non-template)
   // classes, we don't want to generate them unless it's necessary - thus
-  // the logic surrounding each one.
+  // the ifdef logic surrounding each one.
 
-  // I think we need to generate this only for non-defined forward
-  // declarations.
   if (!node->imported ())
     {
       os->gen_ifdef_macro (node->flat_name (), "traits");
@@ -388,39 +386,6 @@ be_visitor_traits::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // Generate the array traits specialization definitions,
-  // guarded by #ifdef on unaliased array element type and length.
-
-  ACE_CString unique;
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Decl::NodeType nt = bt->node_type ();
-
-  if (nt == AST_Decl::NT_typedef)
-    {
-      be_typedef *td = be_typedef::narrow_from_decl (bt);
-      unique = td->primitive_base_type ()->flat_name ();
-    }
-  else
-    {
-      unique = bt->flat_name ();
-    }
-
-  char buf[NAMEBUFSIZE];
-
-  for (unsigned long i = 0; i < node->n_dims (); ++i)
-    {
-      ACE_OS::memset (buf,
-                      '\0',
-                      NAMEBUFSIZE);
-      ACE_OS::sprintf (buf,
-                       "_%ld",
-                       node->dims ()[i]->ev ()->u.ulval);
-      unique += buf;
-    }
-
-  unique += "_traits";
-//  os->gen_ifdef_macro (unique.fast_rep ());
-
   *os << be_nl << be_nl
       << "ACE_TEMPLATE_SPECIALIZATION" << be_nl
       << "struct " << be_global->stub_export_macro () << " Array_Traits<"
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index b455d50d7b1..b43f94e21bf 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -262,7 +262,12 @@ be_visitor_typecode_defn::gen_nested_namespace_end (be_module *node)
 int
 be_visitor_typecode_defn::visit_type (be_type *node)
 {
-  if (be_global->gen_anyop_files ())
+  AST_Decl::NodeType nt = node->base_node_type ();
+
+  // Exceptions depend on their typcodes, so if we
+  // generate the typecode in the *A.cpp file, we also
+  // pull in the Any operators, which we may not need.
+  if (be_global->gen_anyop_files () && nt != AST_Decl::NT_except)
     {
       // Switch streams, ctx will be reassigned when this
       // pass is done.
@@ -380,7 +385,7 @@ be_visitor_typecode_defn::visit_type (be_type *node)
   // Name generation.
   *os << "," << be_nl
       << "0," << be_nl
-      << "sizeof (" << node->name () << ")" << be_uidt_nl
+      << "0" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Is our enclosing scope a module? We need this check because for
@@ -1020,7 +1025,7 @@ be_visitor_typecode_defn::gen_typecode (be_enum *node)
 
       // The offset must point to the tc_kind value of the first occurrence of
       // this type.
-      os->print ("0x%x, // negative offset (%ld)\n",
+      os->print ("0x%x, // negative offset (%d)\n",
                  (qnode->offset - this->tc_offset_),
                  (qnode->offset - this->tc_offset_));
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
@@ -1142,7 +1147,7 @@ be_visitor_typecode_defn::gen_typecode (be_exception *node)
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
       // the offset must point to the tc_kind value of the first occurrence of
       // this type
-      os->print ("0x%x, // negative offset (%ld)\n",
+      os->print ("0x%x, // negative offset (%d)\n",
                  (qnode->offset - this->tc_offset_),
                  (qnode->offset - this->tc_offset_));
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
@@ -1309,7 +1314,7 @@ be_visitor_typecode_defn::gen_typecode (be_interface *node)
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
       // the offset must point to the tc_kind value of the first occurrence of
       // this type
-      os->print ("0x%x, // negative offset (%ld)\n",
+      os->print ("0x%x, // negative offset (%d)\n",
                  (qnode->offset - this->tc_offset_),
                  (qnode->offset - this->tc_offset_));
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
@@ -1469,7 +1474,7 @@ be_visitor_typecode_defn::gen_typecode (be_predefined_type *node)
             this->tc_offset_ += sizeof (ACE_CDR::ULong);
             // the offset must point to the tc_kind value of the first occurrence of
             // this type
-            os->print ("0x%x, // negative offset (%ld)\n",
+            os->print ("0x%x, // negative offset (%d)\n",
                        (qnode->offset - this->tc_offset_),
                        (qnode->offset - this->tc_offset_));
             this->tc_offset_ += sizeof (ACE_CDR::ULong);
@@ -1704,7 +1709,7 @@ be_visitor_typecode_defn::gen_typecode (be_structure *node)
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
       // the offset must point to the tc_kind value of the first occurrence of
       // this type
-      os->print ("0x%x, // negative offset (%ld)\n",
+      os->print ("0x%x, // negative offset (%d)\n",
                  (qnode->offset - this->tc_offset_),
                  (qnode->offset - this->tc_offset_));
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
@@ -1815,7 +1820,7 @@ be_visitor_typecode_defn::gen_typecode (be_typedef *node)
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
       // the offset must point to the tc_kind value of the first occurrence of
       // this type
-      os->print ("0x%x, // negative offset (%ld)\n",
+      os->print ("0x%x, // negative offset (%d)\n",
                  (qnode->offset - this->tc_offset_),
                  (qnode->offset - this->tc_offset_));
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
@@ -1931,7 +1936,7 @@ be_visitor_typecode_defn::gen_typecode (be_union *node)
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
       // the offset must point to the tc_kind value of the first occurrence of
       // this type
-      os->print ("0x%x, // negative offset (%ld)\n",
+      os->print ("0x%x, // negative offset (%d)\n",
                  (qnode->offset - this->tc_offset_),
                  (qnode->offset - this->tc_offset_));
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
@@ -2262,7 +2267,7 @@ be_visitor_typecode_defn::gen_typecode (be_valuetype *node)
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
       // the offset must point to the tc_kind value of the first occurrence of
       // this type
-      os->print ("0x%x, // negative offset (%ld)\n",
+      os->print ("0x%x, // negative offset (%d)\n",
                  (qnode->offset - this->tc_offset_),
                  (qnode->offset - this->tc_offset_));
       this->tc_offset_ += sizeof (ACE_CDR::ULong);
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef.cpp
index 8b60b836550..82468facbbe 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef.cpp
@@ -22,6 +22,7 @@
 #include "be_enum.h"
 #include "be_interface.h"
 #include "be_interface_fwd.h"
+#include "be_module.h"
 #include "be_predefined_type.h"
 #include "be_sequence.h"
 #include "be_string.h"
@@ -41,6 +42,7 @@
 #include "be_visitor_typecode.h"
 #include "be_visitor_union.h"
 #include "be_visitor_context.h"
+#include "utl_identifier.h"
 #include "ace/Log_Msg.h"
 
 #include "be_visitor_typedef/typedef.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
index 1c0729ff571..422aa7496be 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
@@ -188,7 +188,7 @@ be_visitor_typedef_ch::visit_array (be_array *node)
 
       // Base type is simply an alias to an array node. Simply output the
       // required typedefs.
-
+      
       // Typedef the type and the _slice type.
       *os << "typedef " << bt->nested_type_name (scope)
           << " " << tdef->nested_type_name (scope) << ";" << be_nl;
@@ -201,6 +201,8 @@ be_visitor_typedef_ch::visit_array (be_array *node)
           << " " << tdef->nested_type_name (scope, "_out") << ";" << be_nl;
       *os << "typedef " << bt->nested_type_name (scope, "_forany")
           << " " << tdef->nested_type_name (scope, "_forany") << ";" << be_nl;
+      *os << "typedef " << bt->nested_type_name (scope, "_tag")
+          << " " << tdef->nested_type_name (scope, "_tag") << ";" << be_nl;
 
       // The _alloc, _dup, copy, and free methods
 
@@ -208,20 +210,55 @@ be_visitor_typedef_ch::visit_array (be_array *node)
       // we can have only one call to it from any instantiation per stream
       // output statement.
 
+      const char *static_decl = "";
+      AST_Module *scope = AST_Module::narrow_from_scope (tdef->defined_in ());
+      
+      // If the typedef is not declared globally or in a module, the 
+      // associated array memory management function must be static.
+      if (scope == 0)
+        {
+          static_decl = "static ";
+        }
+        
+      const char *td_name = tdef->nested_type_name (scope);
+      
+      // If the array and the typedef are both declared inside
+      // an interface or valuetype, for example, nested_type_name()
+      // generates the scoped name, which, for the header file,
+      // causes problems with some compilers. If the array and
+      // the typedef are in different scopes of a reopened
+      // module, nested_type_name() will generate the local
+      // name for each, which is ok.
+      if (tdef->defined_in () == node->defined_in ())
+        {
+          td_name = tdef->local_name ()->get_string ();
+        }
+
       // _alloc
-      *os << "ACE_INLINE " << tdef->nested_type_name (scope, "_slice") << " *";
-      *os << tdef->nested_type_name (scope, "_alloc") << " (void);" << be_nl;
+      *os << be_nl
+          << "ACE_INLINE " << static_decl << be_nl
+          << td_name << "_slice *" << be_nl
+          << td_name << "_alloc (void);" << be_nl;
       // _dup
-      *os << "ACE_INLINE " << tdef->nested_type_name (scope, "_slice") << " *";
-      *os << tdef->nested_type_name (scope, "_dup") << " (const ";
-      *os << tdef->nested_type_name (scope, "_slice") << " *_tao_slice);" << be_nl;
+      *os << be_nl
+          << "ACE_INLINE " << static_decl << be_nl
+          << td_name << "_slice *" << be_nl
+          << td_name << "_dup (" << be_idt << be_idt_nl
+          << "const " << td_name << "_slice *_tao_slice" << be_uidt_nl
+          << ");" << be_uidt_nl;
       // _copy
-      *os << "ACE_INLINE void " << tdef->nested_type_name (scope, "_copy") << " (";
-      *os << tdef->nested_type_name (scope, "_slice") << " *_tao_to, const ";
-      *os << tdef->nested_type_name (scope, "_slice") << " *_tao_from);" << be_nl;
+      *os << be_nl
+          << "ACE_INLINE " << static_decl << be_nl
+          << "void " << td_name << "_copy (" << be_idt << be_idt_nl
+          << td_name << "_slice *_tao_to," << be_nl
+          << "const " << td_name << "_slice *_tao_from" << be_uidt_nl
+          << ");" << be_uidt_nl;
       // _free
-      *os << "ACE_INLINE void " << tdef->nested_type_name (scope, "_free") << " (";
-      *os << tdef->nested_type_name (scope, "_slice") << " *_tao_slice);";
+      *os << be_nl
+          << "ACE_INLINE " << static_decl << be_nl
+          << "void " << td_name << "_free (" << be_idt << be_idt_nl
+          << td_name << "_slice *_tao_slice" << be_uidt_nl
+          << ");" << be_uidt;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index 0d087f39611..042b717f225 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -67,7 +67,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -76,7 +76,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
index a97cdd1a0b6..f340e1ce35b 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
@@ -99,9 +99,9 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
     }
 
   *os << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
+      << "return false;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "CORBA::Boolean result = 1;" << be_nl << be_nl
+      << "CORBA::Boolean result = true;" << be_nl << be_nl
       << "switch (_tao_union._d ())" << be_nl
       << "{" << be_idt;
 
@@ -169,9 +169,9 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
     }
 
   *os << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
+      << "return false;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "CORBA::Boolean result = 1;" << be_nl << be_nl
+      << "CORBA::Boolean result = true;" << be_nl << be_nl
       << "switch (_tao_discriminant)" << be_nl
       << "{" << be_idt;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index f9801d2d421..c7257392ecc 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -118,8 +118,16 @@ int be_visitor_union_cs::visit_union (be_union *node)
 
   // Get the first label in its list.
   AST_UnionLabel *ul = ub->label (0);
-
-  if (ul->label_kind () == AST_UnionLabel::UL_label)
+  AST_Union::DefaultValue dv;
+  
+  // This can indicate an error in the return value, but it is
+  // caught elsewhere.
+  (void) node->default_value (dv);
+    
+  bool test = dv.computed_ == 0 
+              && ul->label_kind () == AST_UnionLabel::UL_label;
+
+  if (test)
     {
       ub->gen_label_value (os);
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
index f9574060652..bd709da4be1 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
@@ -280,7 +280,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
     case TAO_CodeGen::TAO_CDR_INPUT:
       if (node->is_local ())
         {
-          *os << "result = 0;";
+          *os << "result = false;";
         }
       else
         {
@@ -297,30 +297,24 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
       break;
 
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      if (node->is_defined ())
+    
+      *os << "result =" << be_idt_nl;
+      
+      if (f->is_abstract ())
         {
-          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;
-            }
+          *os << "(strm << _tao_union."
+              << f->local_name () << " ());";
         }
       else
         {
-          *os << "result =" << be_idt_nl
-              << "TAO::Objref_Traits<" << node->name () << ">::marshal ("
+          *os << "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;
+              << ");" << be_uidt;
         }
+        
+      *os << be_uidt;
 
       break;
 
@@ -365,7 +359,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
     case TAO_CodeGen::TAO_CDR_INPUT:
       if (node->is_local ())
         {
-          *os << "result = 0;";
+          *os << "result = false;";
         }
       else
         {
@@ -382,8 +376,12 @@ be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
       break;
 
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = _tao_union."
-          << f->local_name () << " ()->marshal (strm);";
+      *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:
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
index 6a514e4160e..cb3dd343aec 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
@@ -51,7 +51,6 @@
 #include "be_visitor_valuetype.h"
 #include "be_visitor_argument.h"
 #include "be_visitor_array.h"
-#include "be_visitor_eventtype.h"
 #include "be_visitor_field.h"
 #include "be_visitor_constant.h"
 #include "be_visitor_enum.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
index 2f4e63fec96..6245adb5ec3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
@@ -68,3 +68,10 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
   node->cli_hdr_any_op_gen (1);
   return 0;
 }
+
+int
+be_visitor_valuetype_any_op_ch::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index 0f9a4cc3abf..6887c191370 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -117,3 +117,10 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
   node->cli_stub_any_op_gen (1);
   return 0;
 }
+
+int
+be_visitor_valuetype_any_op_cs::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
index 13fe3bc35ff..effc2db8a7c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
@@ -91,3 +91,11 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
   node->cli_hdr_cdr_op_gen (1);
   return 0;
 }
+
+int
+be_visitor_valuetype_cdr_op_ch::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
index 6c8aa07b375..2bb5674fb48 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -74,6 +74,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
 
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
+  
   *os << "CORBA::Boolean" << be_nl
       << "operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
@@ -84,11 +85,10 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
   *os << "return" << be_idt_nl
       << "CORBA::ValueBase::_tao_marshal (" << be_idt << be_idt_nl
       << "strm," << be_nl
-      << "const_cast<" << be_idt << be_idt_nl
-      << node->full_name () << " *> (" << be_nl
-      << "_tao_valuetype" << be_uidt_nl
-      << ")," << be_uidt_nl
-      << "(ptrdiff_t) &" << node->full_name () <<"::_downcast"
+      << "const_cast<" << node->full_name ()
+      << " *> (_tao_valuetype)," << be_nl
+      << "reinterpret_cast<ptrdiff_t> (&"
+      << node->full_name () << "::_downcast)"
       << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
@@ -116,6 +116,12 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
   return 0;
 }
 
+int
+be_visitor_valuetype_cdr_op_cs::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
 // @@@ (JP) The following three methods are a hack to get CDR
 // operators generated for anonymous array and sequence
 // valuetype members. This should be done like it is in structs,
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
index de0386f949c..7a18a5cd7e3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
@@ -130,11 +130,13 @@ be_visitor_valuetype_field_cdr_cs::visit_array (be_array *node)
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
       *os << "(strm >> "
-          << "_tao_" << pre_ << f->local_name () << post_ << ")";
+          << "_tao_" << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
       *os << "(strm << "
-          << "_tao_" << pre_ << f->local_name () << post_ << ")";
+          << "_tao_" << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // Proceed further.
@@ -192,10 +194,12 @@ be_visitor_valuetype_field_cdr_cs::visit_enum (be_enum *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+      *os << "(strm >> " << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+      *os << "(strm << " << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // Proceed further.
@@ -230,7 +234,7 @@ be_visitor_valuetype_field_cdr_cs::visit_enum (be_enum *node)
 }
 
 int
-be_visitor_valuetype_field_cdr_cs::visit_interface (be_interface *)
+be_visitor_valuetype_field_cdr_cs::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -251,10 +255,16 @@ be_visitor_valuetype_field_cdr_cs::visit_interface (be_interface *)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ".out ())";
+      *os << "(strm >> " << this->pre_ << f->local_name ()
+          << this->post_ << ".out ())";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << pre_ << f->local_name () << post_ << ".in ()->marshal (strm)";
+      *os << "TAO::Objref_Traits< ::" << node->name () 
+          << ">::marshal (" << be_idt << be_idt_nl
+          << this->pre_ << f->local_name ()
+          << this->post_ << ".in (), " << be_nl
+          << "strm" << be_uidt_nl
+          << ")" << be_uidt;
       break;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // Nothing to be done because an interface cannit be declared inside a
@@ -273,7 +283,7 @@ be_visitor_valuetype_field_cdr_cs::visit_interface (be_interface *)
 }
 
 int
-be_visitor_valuetype_field_cdr_cs::visit_interface_fwd (be_interface_fwd *)
+be_visitor_valuetype_field_cdr_cs::visit_interface_fwd (be_interface_fwd *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -294,13 +304,19 @@ be_visitor_valuetype_field_cdr_cs::visit_interface_fwd (be_interface_fwd *)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ").out ()";
+      *os << "(strm >> " << this->pre_ << f->local_name ()
+          << this->post_ << ").out ()";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << pre_ << f->local_name () << post_ << ".in ()->marshal (strm)";
+      *os << "TAO::Objref_Traits< ::" << node->name () 
+          << ">::marshal (" << be_idt << be_idt_nl
+          << this->pre_ << f->local_name ()
+          << this->post_ << ".in (), " << be_nl
+          << "strm" << be_uidt_nl
+          << ")" << be_uidt;
       break;
     case TAO_CodeGen::TAO_CDR_SCOPE:
-      // Nothing to be done because an interface cannit be declared inside a
+      // Nothing to be done because an interface cannot be declared inside a
       // structure.
       break;
     default:
@@ -337,10 +353,12 @@ be_visitor_valuetype_field_cdr_cs::visit_valuetype (be_valuetype *)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ".out ())";
+      *os << "(strm >> " << this->pre_ << f->local_name ()
+          << this->post_ << ".out ())";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
+      *os << "(strm << " << this->pre_ << f->local_name ()
+          << this->post_ << ".in ())";
       break;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // Nothing to be done because a valuetype cannit be declared inside a
@@ -380,10 +398,12 @@ be_visitor_valuetype_field_cdr_cs::visit_valuetype_fwd (be_valuetype_fwd *)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ").out ()";
+      *os << "(strm >> " << this->pre_ << f->local_name ()
+          << this->post_ << ").out ()";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ").in ()";
+      *os << "(strm << " << this->pre_ << f->local_name ()
+          << this->post_ << ").in ()";
       break;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // Nothing to be done because a valuetype cannot be declared inside a
@@ -452,64 +472,66 @@ be_visitor_valuetype_field_cdr_cs::visit_predefined_type (be_predefined_type *no
       if (pt == AST_PredefinedType::PT_pseudo
           || pt == AST_PredefinedType::PT_object)
         {
-          *os << "(strm >> " << pre_ << f->local_name () << post_
-              << ".out ())";
+          *os << "(strm >> " << this->pre_ << f->local_name ()
+              << this->post_ << ".out ())";
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "(strm >> CORBA::Any::to_char (" << pre_
-              << f->local_name () << post_ << "))";
+          *os << "(strm >> CORBA::Any::to_char ("
+              << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "(strm >> CORBA::Any::to_wchar (" << pre_
-              << f->local_name () << post_ << "))";
+          *os << "(strm >> CORBA::Any::to_wchar ("
+              << this->pre_ << f->local_name () << this->post_ << "))";
             }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "(strm >> CORBA::Any::to_octet (" << pre_
-              << f->local_name () << post_ << "))";
+          *os << "(strm >> CORBA::Any::to_octet ("
+              << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "(strm >> CORBA::Any::to_boolean (" << pre_
-              << f->local_name () << post_ << "))";
+          *os << "(strm >> CORBA::Any::to_boolean ("
+              << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else
         {
-          *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+          *os << "(strm >> " << this->pre_ << f->local_name ()
+              << this->post_ << ")";
         }
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
       if (pt == AST_PredefinedType::PT_pseudo
           || pt == AST_PredefinedType::PT_object)
         {
-          *os << "(strm << " << pre_ << f->local_name ()
-              << post_ << ".in ())";
+          *os << "(strm << " << this->pre_ << f->local_name ()
+              << this->post_ << ".in ())";
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "(strm << CORBA::Any::from_char (" << pre_
-              << f->local_name () << post_ << "))";
+          *os << "(strm << CORBA::Any::from_char ("
+              << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "(strm << CORBA::Any::from_wchar (" << pre_
-              << f->local_name () << post_ << "))";
+          *os << "(strm << CORBA::Any::from_wchar ("
+              << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "(strm << CORBA::Any::from_octet (" << pre_
-              << f->local_name () << post_ << "))";
+          *os << "(strm << CORBA::Any::from_octet ("
+              << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "(strm << CORBA::Any::from_boolean (" << pre_
-              << f->local_name () << post_ << "))";
+          *os << "(strm << CORBA::Any::from_boolean ("
+              << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else
         {
-          *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+          *os << "(strm << " << this->pre_ << f->local_name ()
+              << this->post_ << ")";
         }
       break;
     case TAO_CodeGen::TAO_CDR_SCOPE:
@@ -549,10 +571,12 @@ be_visitor_valuetype_field_cdr_cs::visit_sequence (be_sequence *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+      *os << "(strm >> " << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+      *os << "(strm << " << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // Proceed further.
@@ -611,10 +635,12 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ".out ())";
+      *os << "(strm >> " << this->pre_ << f->local_name ()
+          << this->post_ << ".out ())";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
+      *os << "(strm << " << this->pre_ << f->local_name ()
+          << this->post_ << ".in ())";
       break;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // Nothing to be done.
@@ -653,10 +679,12 @@ be_visitor_valuetype_field_cdr_cs::visit_structure (be_structure *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+      *os << "(strm >> " << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+      *os << "(strm << " << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // Proceed further.
@@ -733,10 +761,12 @@ be_visitor_valuetype_field_cdr_cs::visit_union (be_union *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+      *os << "(strm >> " << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+      *os << "(strm << " << this->pre_ << f->local_name ()
+          << this->post_ << ")";
       return 0;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // Proceed further.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
index 461a6b53a4c..d3024c82d35 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -338,6 +338,12 @@ be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node)
 }
 
 int
+be_visitor_valuetype_field_ch::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
+int
 be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
@@ -381,6 +387,12 @@ be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
 }
 
 int
+be_visitor_valuetype_field_ch::visit_eventtype_fwd (be_eventtype_fwd *node)
+{
+  return this->visit_valuetype_fwd (node);
+}
+
+int
 be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
 {
   be_decl *ub = this->ctx_->node ();
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp
index 7d9b10d035c..9574e2bca3d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp
@@ -114,54 +114,6 @@ be_visitor_valuetype_field_ci::visit_array (be_array *node)
 }
 
 int
-be_visitor_valuetype_field_ci::visit_enum (be_enum *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_ci::visit_interface (be_interface *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_ci::visit_interface_fwd (be_interface_fwd *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_ci::visit_valuetype (be_valuetype *)
-{
- return 0;
-}
-
-int
-be_visitor_valuetype_field_ci::visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_ci::visit_predefined_type (be_predefined_type *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_ci::visit_sequence (be_sequence *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_ci::visit_string (be_string *)
-{
-  return 0;
-}
-
-int
 be_visitor_valuetype_field_ci::visit_structure (be_structure *node)
 {
   be_decl *ub = this->ctx_->node ();
@@ -208,12 +160,6 @@ be_visitor_valuetype_field_ci::visit_structure (be_structure *node)
 }
 
 int
-be_visitor_valuetype_field_ci::visit_typedef (be_typedef *)
-{
-  return 0;
-}
-
-int
 be_visitor_valuetype_field_ci::visit_union (be_union *node)
 {
   be_decl *ub = this->ctx_->node ();
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
index afc9a49771f..c608bcf6a4b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -307,8 +307,9 @@ be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
 
   *os << "this->"
       << bu->field_pd_prefix () << ub->local_name () 
-      << bu->field_pd_postfix ()
-      << " = " << bt->name () << "::_duplicate (val);" << be_uidt_nl;
+      << 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 << "// Retrieve the member." << be_nl
@@ -467,6 +468,12 @@ be_visitor_valuetype_field_cs::visit_valuetype (be_valuetype *node)
 }
 
 int
+be_visitor_valuetype_field_cs::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
+int
 be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
 {
   be_decl *ub = this->ctx_->node ();
@@ -536,6 +543,12 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
 }
 
 int
+be_visitor_valuetype_field_cs::visit_eventtype_fwd (be_eventtype_fwd *node)
+{
+  return this->visit_valuetype_fwd (node);
+}
+
+int
 be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
 {
   be_decl *ub = this->ctx_->node ();
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
index a4fa8a2aeb6..55aec2de444 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
@@ -81,3 +81,10 @@ be_visitor_valuetype_marshal_ch::visit_valuetype (be_valuetype *node)
 
   return 0;
 }
+
+int
+be_visitor_valuetype_marshal_ch::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index 4f1377455f3..442017f72d6 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -71,7 +71,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
 
           *os << "::_tao_marshal_state (strm))" << be_idt_nl
               << "{" << be_idt_nl
-              << "return 0;" << be_uidt_nl
+              << "return false;" << be_uidt_nl
               << "}" << be_uidt_nl << be_nl;
         }
       // Can access base class only via virtual function.
@@ -81,7 +81,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
               <<       inh->flat_name ()
               << " (strm))" << be_idt_nl
               << "{" << be_idt_nl
-              << "return 0;" << be_uidt_nl
+              << "return false;" << be_uidt_nl
               << "}" << be_uidt_nl << be_nl;
         }
     }
@@ -159,7 +159,12 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
   return 0;
 }
 
-// Retrieve the fully scoped skeleton name.
+int
+be_visitor_valuetype_marshal_cs::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
 void
 be_visitor_valuetype_marshal_cs::class_name (be_valuetype *node,
                                              TAO_OutStream *os)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
index 87571fa8cba..c69154e3dce 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
@@ -197,16 +197,18 @@ be_visitor_obv_module::visit_eventtype (be_eventtype *node)
   switch (this->ctx_->state ())
     {
       case TAO_CodeGen::TAO_MODULE_OBV_CH:
-        ctx.state (TAO_CodeGen::TAO_EVENTTYPE_OBV_CH);
+        ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CH);
         break;
       case TAO_CodeGen::TAO_MODULE_OBV_CI:
-        {
-          be_visitor_eventtype_obv_ci visitor (&ctx);
-          status = node->accept (&visitor);
-          break;
-        }
+      {
+        // This context state is not involved in any strategies.
+        ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CI);
+        be_visitor_valuetype_obv_ci visitor (&ctx);
+        status = node->accept (&visitor);
+        break;
+      }
       case TAO_CodeGen::TAO_MODULE_OBV_CS:
-        ctx.state (TAO_CodeGen::TAO_EVENTTYPE_OBV_CS);
+        ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CS);
         break;
       default:
         return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index 78d29d24e77..b4b89f4d92c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -32,13 +32,6 @@ be_visitor_valuetype::~be_visitor_valuetype (void)
 {
 }
 
-// This method must be overridden by the derived valuetype visitors.
-int
-be_visitor_valuetype::visit_valuetype (be_valuetype *)
-{
-  return -1;
-}
-
 int
 be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index 6292d08fa71..1b554882495 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -57,6 +57,14 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
 
   // Now the valuetype definition itself.
   os->gen_ifdef_macro (node->flat_name ());
+  
+  if (node->node_type () == AST_Decl::NT_eventtype)
+    {
+      *os << be_nl << be_nl
+          << "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 ()
@@ -380,6 +388,11 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   return 0;
 }
 
+int
+be_visitor_valuetype_ch::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
 
 int
 be_visitor_valuetype_ch::visit_operation (be_operation *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
index 2ee88358c20..f4cab1d1ae2 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -94,6 +94,11 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
   return 0;
 }
 
+int
+be_visitor_valuetype_ci::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
 
 int
 be_visitor_valuetype_ci::visit_field (be_field *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 869e85a1e6b..7d20399e061 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -106,11 +106,8 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << node->name () << " *" << be_nl << node->name ()
       << "::_downcast (CORBA::ValueBase *v)" << be_nl
       << "{" << be_idt_nl
-      << "if (v == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return dynamic_cast< ::" << node->name () << " * > (v);" << be_uidt_nl
+      << "return dynamic_cast< ::" << node->name () 
+      << " * > (v);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // The _tao_obv_repository_id method.
@@ -272,6 +269,12 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
 }
 
 int
+be_visitor_valuetype_cs::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
+int
 be_visitor_valuetype_cs::visit_operation (be_operation *node)
 {
   if (node->cli_stub_gen () || node->imported ())
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp
index 84a56777620..bc351d2fc65 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp
@@ -35,66 +35,6 @@ be_visitor_valuetype_init::~be_visitor_valuetype_init (void)
 {
 }
 
-int
-be_visitor_valuetype_init::visit_attribute (be_attribute *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init::visit_constant (be_constant *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init::visit_enum (be_enum *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init::visit_operation (be_operation *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init::visit_exception (be_exception *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init::visit_structure (be_structure *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init::visit_union (be_union *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init::visit_typedef (be_typedef *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init::visit_field (be_field *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init::visit_factory (be_factory *)
-{
-  return 0;
-}
-
 void
 be_visitor_valuetype_init::begin_public (void)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
index cbbdd869030..0d27a6f5cef 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
@@ -151,6 +151,12 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
 }
 
 int
+be_visitor_valuetype_init_ch::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
+int
 be_visitor_valuetype_init_ch::visit_factory (be_factory *node)
 {
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp
index feb64624ca4..68e9b6f3bb1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp
@@ -35,14 +35,3 @@ be_visitor_valuetype_init_ci::~be_visitor_valuetype_init_ci (void)
 {
 }
 
-int
-be_visitor_valuetype_init_ci::visit_valuetype (be_valuetype *)
-{
-  return 0;
-}
-
-int
-be_visitor_valuetype_init_ci::visit_factory (be_factory *)
-{
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
index 3453c53fcff..4adbbc0e883 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
@@ -99,11 +99,8 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
       << node->name () << "_init *" << be_nl << node->name ()
       << "_init::_downcast (CORBA::ValueFactoryBase *v)" << be_nl
       << "{" << be_idt_nl
-      << "if (v == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return dynamic_cast< ::" << node->name () << "_init * > (v);" << be_uidt_nl
+      << "return dynamic_cast< ::" << node->name () 
+      << "_init * > (v);" << be_uidt_nl
       << "}";
 
   // tao_repository_id
@@ -154,7 +151,8 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
 }
 
 int
-be_visitor_valuetype_init_cs::visit_factory (be_factory *)
+be_visitor_valuetype_init_cs::visit_eventtype (be_eventtype *node)
 {
-  return 0;
+  return this->visit_valuetype (node);
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
index 0d89ded2a01..5cc1bbc11eb 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -249,6 +249,12 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
 }
 
 int
+be_visitor_valuetype_obv_ch::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
+int
 be_visitor_valuetype_obv_ch::visit_field (be_field *node)
 {
   be_valuetype *vt = be_valuetype::narrow_from_scope (node->defined_in ());
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
index c66063fc844..66750c54136 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
@@ -72,25 +72,32 @@ be_visitor_valuetype_obv_ci::visit_valuetype (be_valuetype *node)
                              ), -1);
         }
     } // if !opt_accessor ()
+    
   return 0;
 }
 
+int
+be_visitor_valuetype_obv_ci::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
 
 int
 be_visitor_valuetype_obv_ci::visit_field (be_field *node)
 {
-  be_visitor_context *ctx = new be_visitor_context (*this->ctx_);
-  be_visitor_valuetype_field_ci *visitor =
-    new be_visitor_valuetype_field_ci (ctx);
-  visitor->in_obv_space_ = 1;
-  if (visitor->visit_field (node) == -1)
+  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,
                          "(%N:%l) be_visitor_valuetype_obv_ci::"
                          "visit_field - "
-                         "visit_field failed\n"
-                         ), -1);
+                         "visit_field failed\n"),
+                        -1);
     }
-  delete visitor;
+    
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
index fc0202f10a6..20aeee342b1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -134,6 +134,12 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
 }
 
 int
+be_visitor_valuetype_obv_cs::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
+int
 be_visitor_valuetype_obv_cs::visit_field (be_field *node)
 {
   be_visitor_context ctx = (*this->ctx_);
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
index 3e9f96accd3..d9938ccfd9d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
@@ -127,3 +127,9 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node)
   return 0;
 }
 
+int
+be_visitor_valuetype_sh::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp
index e07545f171f..34cd0b2f248 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp
@@ -42,3 +42,10 @@ be_visitor_valuetype_si::visit_valuetype (be_valuetype *)
   // Nothing needed for now, but the visitor is here just in case.
   return 0;
 }
+
+int
+be_visitor_valuetype_si::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
index e3f63a051a7..780e54f73c3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
@@ -124,6 +124,12 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
   return 0;
 }
 
+int
+be_visitor_valuetype_ss::visit_eventtype (be_eventtype *node)
+{
+  return this->visit_valuetype (node);
+}
+
 ACE_CString
 be_visitor_valuetype_ss::generate_flat_name (be_valuetype *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
index 1a7f813f2a6..ade9f142cd9 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
@@ -20,6 +20,8 @@
 
 #include "be_valuetype.h"
 #include "be_valuetype_fwd.h"
+#include "be_eventtype.h"
+#include "be_eventtype_fwd.h"
 #include "be_extern.h"
 #include "be_helper.h"
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
index ee2355ca3cd..772bc543db3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
@@ -77,3 +77,10 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
   node->cli_hdr_any_op_gen (1);
   return 0;
 }
+
+int
+be_visitor_valuetype_fwd_any_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node)
+{
+  return this->visit_valuetype_fwd (node);
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
index a6c0d58dbad..b89f35115c3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
@@ -91,3 +91,10 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd (
 
   return 0;
 }
+
+int
+be_visitor_valuetype_fwd_cdr_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node)
+{
+  return this->visit_valuetype_fwd (node);
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
index d97f32902be..10c14850898 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
@@ -56,3 +56,10 @@ be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
   node->cli_hdr_gen (I_TRUE);
   return 0;
 }
+
+int
+be_visitor_valuetype_fwd_ch::visit_eventtype_fwd (be_eventtype_fwd *node)
+{
+  return this->visit_valuetype_fwd (node);
+}
+
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 85e39756965..63ae9119fee 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -1,5 +1,7 @@
+// -*- C++ -*-
+//
 // $Id$
-/* -*- c++ -*- */
+
 // ================================================================
 //
 // = LIBRARY
@@ -84,10 +86,7 @@ public:
       TAO_VALUETYPE_OBV_CH,                 // OBV_ class
       TAO_VALUETYPE_OBV_CI,
       TAO_VALUETYPE_OBV_CS,
-
-      TAO_EVENTTYPE_OBV_CH,
-      TAO_EVENTTYPE_OBV_CS,
-
+      
       // Emitting code for the module,
       TAO_MODULE_OBV_CH,                    // for OBV_ (cmp. POA_ namespace)
       TAO_MODULE_OBV_CI,
@@ -386,7 +385,7 @@ private:
   void gen_var_file_includes (void);
   void gen_stub_arg_file_includes (TAO_OutStream * stream);
   void gen_skel_arg_file_includes (TAO_OutStream * stream);
-  void gen_cond_file_include (ACE_UINT64 mask,
+  void gen_cond_file_include (bool condition_green,
                               const char *filepath,
                               TAO_OutStream *stream);
 
diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h
index 4ebca2d7819..b5954dc8135 100644
--- a/TAO/TAO_IDL/be_include/be_expression.h
+++ b/TAO/TAO_IDL/be_include/be_expression.h
@@ -23,6 +23,7 @@
 #define BE_EXPRESSION_H
 
 #include "ast_expression.h"
+#include "idl_uns_long.h"
 
 class be_visitor;
 
@@ -44,7 +45,7 @@ public:
   be_expression (long l,
                  AST_Expression::ExprType t);
 
-  be_expression (ACE_UINT64 l,
+  be_expression (idl_uns_long l,
                  AST_Expression::ExprType t);
 
   be_expression (UTL_String *s);
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index 4444a8999e6..1fdc96bd7f4 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -218,7 +218,7 @@ public:
   virtual AST_Expression *create_expr (long v,
                                        AST_Expression::ExprType t);
 
-  virtual AST_Expression *create_expr (ACE_UINT64 v,
+  virtual AST_Expression *create_expr (idl_uns_long v,
                                        AST_Expression::ExprType t);
 
   virtual AST_Expression *create_expr(UTL_String *s);
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 28bd3c303b5..c0546cb8359 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -234,12 +234,6 @@ public:
   // Helper method passed to the template method that generates code for the
   // is_a method.
 
-  static int queryinterface_helper (be_interface *,
-                                    be_interface *,
-                                    TAO_OutStream *os);
-  // Helper method passed to the template method that generates code for the
-  // _tao_QueryInterface method.
-
   static int downcast_helper (be_interface *,
                               be_interface *,
                               TAO_OutStream *os);
@@ -344,6 +338,9 @@ public:
 
   int has_mixed_parentage (void);
   // Do we have both abstract and concrete parents?
+  
+  int session_component_child (void);
+  // Is Components::SessionComponent an immediate parent?
 
 private:
   void gen_gperf_input_header (TAO_OutStream *ss);
@@ -406,6 +403,9 @@ private:
 
   int has_mixed_parentage_;
   // Do we have both abstract and concrete parents?
+  
+  int session_component_child_;
+  // Are we a direct child of Components::SessionComponent?
 };
 
 /**
diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
index 192ddceaf21..a88ddd5d900 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
@@ -35,8 +35,6 @@ public:
 
   virtual int visit_enum (be_enum *node);
 
-  virtual int visit_predefined_type (be_predefined_type *node);
-
   virtual int visit_interface (be_interface *node);
 
   virtual int visit_interface_fwd (be_interface_fwd *node);
@@ -51,6 +49,8 @@ public:
   
   virtual int visit_operation (be_operation *node);
   
+  virtual int visit_attribute (be_attribute *node);
+  
   virtual int visit_argument (be_argument *node);
 
   virtual int visit_sequence (be_sequence *node);
@@ -71,6 +71,8 @@ public:
 
   virtual int visit_component_fwd (be_component_fwd *node);
 
+  virtual int visit_home (be_home *node);
+
 private:
 
   idl_bool generated (be_decl *node) const;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
index f62257fcf3b..a1e5f0c6af8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
@@ -126,13 +126,6 @@ private:
                             const char *name,
                             be_exception *&result);
 
-  int create_uses_multiple_stuff (be_component *node,
-                                  AST_Component::port_description *pd);
-  int create_uses_multiple_struct (be_component *node,
-                                   AST_Component::port_description *pd);
-  int create_uses_multiple_sequence (be_component *node,
-                                     AST_Component::port_description *pd);
-
   int create_event_consumer (be_eventtype *node);
   AST_Interface *lookup_consumer (AST_Component::port_description *pd);
   AST_Interface *create_explicit (be_home *node);
@@ -149,8 +142,6 @@ private:
 private:
   // These are created for operations implied by 'uses multiple' declarations.
   Identifier module_id_;
-  be_structure *connection_;
-  be_sequence *connections_;
   be_valuetype *cookie_;
 
   // Exceptions thrown by implied CCM operations.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype.h
deleted file mode 100644
index 4a8388dc5d7..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_eventtype.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the EventType class
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef TAO_BE_VISITOR_EVENTTYPE_H
-#define TAO_BE_VISITOR_EVENTTYPE_H
-
-#include "be_visitor_valuetype.h"
-
-#include "be_visitor_eventtype/eventtype_ch.h"
-#include "be_visitor_eventtype/eventtype_ci.h"
-#include "be_visitor_eventtype/eventtype_cs.h"
-#include "be_visitor_eventtype/eventtype_sh.h"
-#include "be_visitor_eventtype/eventtype_si.h"
-#include "be_visitor_eventtype/eventtype_ss.h"
-#include "be_visitor_eventtype/eventtype_obv_ch.h"
-#include "be_visitor_eventtype/eventtype_obv_ci.h"
-#include "be_visitor_eventtype/eventtype_obv_cs.h"
-#include "be_visitor_eventtype/any_op_ch.h"
-#include "be_visitor_eventtype/any_op_cs.h"
-#include "be_visitor_eventtype/cdr_op_ch.h"
-#include "be_visitor_eventtype/cdr_op_cs.h"
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_ch.h
deleted file mode 100644
index 1de871158ad..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_ch.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    any_op_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for eventtypes.
-//    This one provides code generation for the any operators.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_EVENTTYPE_ANY_OP_CH_H_
-#define _BE_VISITOR_EVENTTYPE_ANY_OP_CH_H_
-
-class be_visitor_eventtype_any_op_ch : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_any_op_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for eventtype that generates the Any operator
-  //   declarations
-  //
-
-public:
-  be_visitor_eventtype_any_op_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_any_op_ch (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-  // visit valuetype
-};
-
-#endif /* _BE_VISITOR_EVENTTYPE_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_cs.h
deleted file mode 100644
index b24f645b963..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/any_op_cs.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    any_op_cs.h
-//
-// = DESCRIPTION
-//    Concrete visitor for eventtypes.
-//    This one provides code generation for the any operators.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_EVENTTYPE_ANY_OP_CS_H_
-#define _BE_VISITOR_EVENTTYPE_ANY_OP_CS_H_
-
-class be_visitor_eventtype_any_op_cs : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_any_op_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for eventtype that generates the Any operator
-  //   declarations
-  //
-
-public:
-  be_visitor_eventtype_any_op_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_any_op_cs (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-  // visit valuetype
-};
-
-#endif /* _BE_VISITOR_EVENTTYPE_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ch.h
deleted file mode 100644
index 3e72c36c6b5..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ch.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for eventtypes.
-//    This one provides code generation for the CDR operators.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_EVENTTYPE_CDR_OP_CH_H_
-#define _BE_VISITOR_EVENTTYPE_CDR_OP_CH_H_
-
-class be_visitor_eventtype_cdr_op_ch : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_cdr_op_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for eventtype that generates the CDR operator
-  //   declarations
-  //
-
-public:
-  be_visitor_eventtype_cdr_op_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_cdr_op_ch (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-  // visit valuetype
-};
-
-#endif /* _BE_VISITOR_EVENTTYPE_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ci.h
deleted file mode 100644
index a3c1fdcbcc7..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_ci.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_ci.h
-//
-// = DESCRIPTION
-//    Concrete visitor for eventtypes.
-//    This one provides code generation for the CDR operators.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_EVENTTYPE_CDR_OP_CI_H_
-#define _BE_VISITOR_EVENTTYPE_CDR_OP_CI_H_
-
-class be_visitor_eventtype_cdr_op_ci : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_cdr_op_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for eventtype that generates the CDR operator
-  //   declarations
-  //
-
-public:
-  be_visitor_eventtype_cdr_op_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_cdr_op_ci (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-  // visit valuetype
-};
-
-#endif /* _BE_VISITOR_EVENTTYPE_CDR_OP_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_cs.h
deleted file mode 100644
index 2fd94f7587a..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/cdr_op_cs.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_cs.h
-//
-// = DESCRIPTION
-//    Concrete visitor for eventtypes.
-//    This one provides code generation for the CDR operators.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_EVENTTYPE_CDR_OP_CS_H_
-#define _BE_VISITOR_EVENTTYPE_CDR_OP_CS_H_
-
-class be_visitor_eventtype_cdr_op_cs : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_cdr_op_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for eventtype that generates the CDR operator
-  //   declarations
-  //
-
-public:
-  be_visitor_eventtype_cdr_op_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_cdr_op_cs (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-  // visit valuetype
-};
-
-#endif /* _BE_VISITOR_EVENTTYPE_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ch.h
deleted file mode 100644
index e2e873e61f7..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ch.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype node.
-//    This one provides code generation for eventtypes in the (client) header.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_EVENTTYPE_CH_H_
-#define _BE_EVENTTYPE_EVENTTYPE_CH_H_
-
-class be_visitor_eventtype_ch : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for eventtype
-  //
-  //
-public:
-  be_visitor_eventtype_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_ch (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_EVENTTYPE_EVENTTYPE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ci.h
deleted file mode 100644
index 0ed63ed297c..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ci.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_ci.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype node.
-//    This one provides code generation for eventtypes in the (client) inline.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_EVENTTYPE_CI_H_
-#define _BE_EVENTTYPE_EVENTTYPE_CI_H_
-
-class be_visitor_eventtype_ci : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client inline for eventtype
-  //
-  //
-public:
-  be_visitor_eventtype_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_ci (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_EVENTTYPE_EVENTTYPE_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_cs.h
deleted file mode 100644
index 8682cb4b21d..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_cs.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_cs.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype node.
-//    This one provides code generation for eventtypes in the (client) source.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_EVENTTYPE_CS_H_
-#define _BE_EVENTTYPE_EVENTTYPE_CS_H_
-
-class be_visitor_eventtype_cs : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client source for eventtype
-  //
-  //
-public:
-  be_visitor_eventtype_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_cs (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_EVENTTYPE_EVENTTYPE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ch.h
deleted file mode 100644
index d720aa1c011..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ch.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_obv_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype node.
-//    This one provides code generation for valuetype OBV_ class
-//    in the (client) header.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_EVENTTYPE_OBV_CH_H_
-#define _BE_EVENTTYPE_EVENTTYPE_OBV_CH_H_
-
-class be_visitor_eventtype_obv_ch : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_obv_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the header for valuetype
-  //   OBV_ class
-  //
-public:
-  be_visitor_eventtype_obv_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_obv_ch (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_EVENTTYPE_EVENTTYPE_OBV_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ci.h
deleted file mode 100644
index 136ec808ff0..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_ci.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_obv_ci.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype node.
-//    This one provides code generation for valuetype OBV_ class
-//    in the (client) inline.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_EVENTTYPE_OBV_CI_H_
-#define _BE_EVENTTYPE_EVENTTYPE_OBV_CI_H_
-
-class be_visitor_eventtype_obv_ci : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_obv_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the inline for valuetype
-  //   OBV_ class
-  //
-public:
-  be_visitor_eventtype_obv_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_obv_ci (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_EVENTTYPE_EVENTTYPE_OBV_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_cs.h
deleted file mode 100644
index 8024c40f0cb..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_obv_cs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_obv_cs.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype node.
-//    This one provides code generation for valuetype OBV_ class
-//    in the (client) stub.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_EVENTTYPE_OBV_CS_H_
-#define _BE_EVENTTYPE_EVENTTYPE_OBV_CS_H_
-
-class be_visitor_eventtype_obv_cs : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_obv_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the stub for valuetype
-  //   OBV_ class
-  //
-public:
-  be_visitor_eventtype_obv_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_obv_cs (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_EVENTTYPE_EVENTTYPE_OBV_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_sh.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_sh.h
deleted file mode 100644
index e86b44e2b6b..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_sh.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_sh.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype node.
-//    This one provides code generation for eventtypes in the server header.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_EVENTTYPE_SH_H_
-#define _BE_EVENTTYPE_EVENTTYPE_SH_H_
-
-class be_visitor_eventtype_sh : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_sh
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server header for eventtype
-  //
-  //
-public:
-  be_visitor_eventtype_sh (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_sh (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_EVENTTYPE_EVENTTYPE_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_si.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_si.h
deleted file mode 100644
index 2da19a133c1..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_si.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_si.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype node.
-//    This one provides code generation for eventtypes in the server inline.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_EVENTTYPE_SI_H_
-#define _BE_EVENTTYPE_EVENTTYPE_SI_H_
-
-class be_visitor_eventtype_si : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_si
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server inline for eventtype
-  //
-  //
-public:
-  be_visitor_eventtype_si (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_si (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_EVENTTYPE_EVENTTYPE_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ss.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ss.h
deleted file mode 100644
index 51da4f80356..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype/eventtype_ss.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_ss.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype node.
-//    This one provides code generation for eventtypes in the server source.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_EVENTTYPE_SS_H_
-#define _BE_EVENTTYPE_EVENTTYPE_SS_H_
-
-class be_visitor_eventtype_ss : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_ss
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the server source for eventtype
-  //
-  //
-public:
-  be_visitor_eventtype_ss (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_ss (void);
-  // destructor
-
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_EVENTTYPE_EVENTTYPE_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd.h
deleted file mode 100644
index 1959b5e3609..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_eventtype_fwd.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the eventtype_fwd class
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef TAO_BE_VISITOR_EVENTTYPE_FWD_H
-#define TAO_BE_VISITOR_EVENTTYPE_FWD_H
-
-#include "be_visitor_decl.h"
-#include "be_visitor_eventtype_fwd/eventtype_fwd_ch.h"
-#include "be_visitor_eventtype_fwd/any_op_ch.h"
-#include "be_visitor_eventtype_fwd/cdr_op_ch.h"
-
-#endif /* TAO_BE_VISITOR_EVENTTYPE_FWD_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/any_op_ch.h
deleted file mode 100644
index 029e6fc3b23..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/any_op_ch.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    any_op_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the forward declared Eventtype node.
-//    This one provides code generation for the Any operators.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_FWD_ANY_OP_CH_H_
-#define _BE_EVENTTYPE_FWD_ANY_OP_CH_H_
-
-class be_visitor_eventtype_fwd_any_op_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_fwd_any_op_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for forward declared eventtypes that
-  //   generates the Any operator declaration.
-  //
-
-public:
-  be_visitor_eventtype_fwd_any_op_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_fwd_any_op_ch (void);
-  // destructor
-
-  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-  // visit valuetype_fwd
-};
-
-#endif /* _BE_EVENTTYPE_FWD_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/cdr_op_ch.h
deleted file mode 100644
index 9318df51813..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/cdr_op_ch.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the forward declared Eventtype node.
-//    This one provides code generation for the CDR operators.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_EVENTTYPE_FWD_CDR_OP_CH_H_
-#define _BE_EVENTTYPE_FWD_CDR_OP_CH_H_
-
-class be_visitor_eventtype_fwd_cdr_op_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_fwd_cdr_op_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for forward declared eventtypes that
-  //   generates the CDR operator declaration.
-  //
-
-public:
-  be_visitor_eventtype_fwd_cdr_op_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_fwd_cdr_op_ch (void);
-  // destructor
-
-  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-  // visit valuetype_fwd
-};
-
-#endif /* _BE_EVENTTYPE_FWD_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/eventtype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/eventtype_fwd_ch.h
deleted file mode 100644
index 3f477575696..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_eventtype_fwd/eventtype_fwd_ch.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    eventtype_fwd_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Eventtype Forward node.
-//    This one provides code generation for eventtype forward node.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_EVENTTYPE_FWD_CH_H_
-#define _BE_VISITOR_EVENTTYPE_FWD_CH_H_
-
-class be_visitor_eventtype_fwd_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_eventtype_fwd_ch
-  //
-  // = DESCRIPTION
-  //   This is the visitor for eventtype_fwd for the header file
-  //
-  //
-public:
-  be_visitor_eventtype_fwd_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_eventtype_fwd_ch (void);
-  // destructor
-
-  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-  // visit valuetype_fwd.
-};
-
-#endif /* _BE_VISITOR_EVENTTYPE_FWD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
index b4be5b420c9..1dfa22ff362 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
@@ -61,11 +61,26 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface forward node
 
+  virtual int visit_component (be_component *node);
+  // visit a component
+
+  virtual int visit_component_fwd (be_component_fwd *node);
+  // visit a component forward node
+
+  virtual int visit_home (be_home *node);
+  // visit a home
+
   virtual int visit_valuetype (be_valuetype *node);
-  // visit an interface
+  // visit a valuetype
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit an interface forward node
+  // visit a valuetype forward node
+
+  virtual int visit_eventtype (be_eventtype *node);
+  // visit an eventtype
+
+  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit an eventtype forward node
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
diff --git a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h b/TAO/TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h
index c5a3d348efd..0d73080775c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h
@@ -41,6 +41,12 @@ public:
 
   virtual int visit_valuetype (be_valuetype *node);
 
+  virtual int visit_component (be_component *node);
+
+  virtual int visit_component_fwd (be_component_fwd *node);
+
+  virtual int visit_home (be_home *node);
+
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
 
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h
index afb3290262d..12a18d278f7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h
@@ -41,7 +41,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
+  virtual int visit_eventtype (be_eventtype *node);
 };
 
 #endif /* _BE_VALUETYPE_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h
index 3c930612a46..86b86ed0df2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h
@@ -41,7 +41,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
+  virtual int visit_eventtype (be_eventtype *node);
 };
 
 #endif /* _BE_VALUETYPE_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
index 43c9ab57038..9555c9e0f15 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
@@ -42,7 +42,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
+  virtual int visit_eventtype (be_eventtype *node);
 };
 
 #endif /* _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
index 17d45be4b70..e45eb3cc4ed 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
@@ -43,7 +43,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_field (be_field *node);
   // visit field
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
index 4a6184adc85..8ed42da9295 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
@@ -58,10 +58,8 @@ public:
   // visit interface forward type
 
   virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype type
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward type
 
   virtual int visit_component (be_component *node);
   // visit component type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
index b22d8b269ba..82b4a8bdae8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
@@ -60,10 +60,10 @@ public:
   // visit interface forward type
 
   virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype type
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward type
+  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
index facd77c06be..fe0e43b1909 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
@@ -49,36 +49,9 @@ public:
   virtual int visit_array (be_array *node);
   // visit array type
 
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface type
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward type
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype type
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward type
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
   virtual int visit_structure (be_structure *node);
   // visit structure type
 
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
   virtual int visit_union (be_union *node);
   // visit union type
 
@@ -90,6 +63,7 @@ public:
   // if (in_obv_space_) print OBV_name else print name
 
   idl_bool in_obv_space_;
+  
 private:
   const char *pre_op_;
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
index cbb51bb2de4..ad1a8d91e62 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
@@ -60,10 +60,10 @@ public:
   // visit interface forward type
 
   virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype type
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward type
+  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
index 662529b8de8..997f267b315 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
@@ -42,8 +42,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
+  virtual int visit_eventtype (be_eventtype *node);
 };
 
 #endif /* _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
index 8ec036d370f..833658657d1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
@@ -42,7 +42,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
+  virtual int visit_eventtype (be_eventtype *node);
 
   void class_name (be_valuetype *node, TAO_OutStream *os);
   int gen_fields (be_valuetype *node, be_visitor_context &ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
index b2c404bfd1b..1789d83b667 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
@@ -44,10 +44,6 @@ public:
   // destructor
 
 public:
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit the valuetype node
-
   virtual int visit_valuetype_scope (be_valuetype *node);
   // visit the scope of the valuetype node
   // (in public/private field order)
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
index 054f2ed38af..0af5bed92b0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
@@ -44,6 +44,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_operation (be_operation *node);
   virtual int visit_field (be_field *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
index 44e8445de09..d3960113f7e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
@@ -41,7 +41,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // set the right context and make a visitor
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_field (be_field *node);
 private:
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
index f2378bf0e7b..6035d3bc09d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
@@ -39,7 +39,7 @@ public:
   ~be_visitor_valuetype_cs (void);
 
   virtual int visit_valuetype (be_valuetype *node);
-  // Set the right context and make a visitor.l
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_operation (be_operation *node);
   // Called only by AMH exceptions.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h
index 9a3deef7f5b..1c867521d14 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h
@@ -45,36 +45,6 @@ public:
 
 public:
 
-  virtual int visit_attribute (be_attribute *node);
-  // visit attribute
-
-  virtual int visit_constant (be_constant *node);
-  // visit a constant
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation
-
-  virtual int visit_exception (be_exception *node);
-  // visit exception (not used)
-
-  virtual int visit_structure (be_structure *node);
-  // visit a structure
-
-  virtual int visit_union (be_union *node);
-  // visit a union
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef node
-
-  virtual int visit_field (be_field *node);
-  // visit a field
-
-  virtual int visit_factory (be_factory *node);
-  // visit a factory
-
   void begin_public (void);
   void begin_private (void);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h
index 509980771a2..32508516a49 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h
@@ -44,7 +44,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // entry point
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_factory (be_factory *node);
   // visit a factory
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h
index 49632f5217d..142b19ffdcf 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h
@@ -42,11 +42,6 @@ public:
 
   ~be_visitor_valuetype_init_ci (void);
   // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-
-  virtual int visit_factory (be_factory *node);
-  // visit a factory
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_INIT_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h
index 87584641443..c604b286fea 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h
@@ -44,9 +44,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-
-  virtual int visit_factory (be_factory *node);
-  // visit a factory
+  virtual int visit_eventtype (be_eventtype *node);
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_INIT_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
index b2523ef2b7a..c2ff28d31ef 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
@@ -45,6 +45,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_field (be_field *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
index fff3dfe2565..47648bb9e74 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
@@ -45,6 +45,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_field (be_field *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
index fc7eba823b4..b6a05417462 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
@@ -42,6 +42,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
+  virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_field (be_field *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
index 7bc105ebc18..810bc4be474 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
@@ -40,7 +40,7 @@ public:
   // destructor
   
   virtual int visit_valuetype (be_valuetype *node);
-  // set the right context and make a visitor
+  virtual int visit_eventtype (be_eventtype *node);
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h
index bbe594e1283..6c01a376559 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h
@@ -40,7 +40,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // set the right context and make a visitor
+  virtual int visit_eventtype (be_eventtype *node);
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
index 57dbef6bdcc..8392afce8e9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
@@ -40,7 +40,7 @@ public:
   // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
-  // set the right context and make a visitor
+  virtual int visit_eventtype (be_eventtype *node);
 
 protected:
   ACE_CString generate_flat_name (be_valuetype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h
index 9d20239758c..099299c684f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h
@@ -41,7 +41,7 @@ public:
   // destructor
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype_fwd
+  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
 };
 
 #endif /* _BE_VALUETYPE_FWD_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h
index a0a0401af93..5270f9ca665 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h
@@ -46,7 +46,7 @@ public:
   // destructor
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype
+  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
 };
 
 #endif /* BE_VISITOR_VALUETYPE_FWD_CDR_OP_CH_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
index 40301223436..428a645de1c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
@@ -41,7 +41,7 @@ public:
   // destructor
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype_fwd.
+  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
 };
 
 #endif /* _BE_VISITOR_VALUETYPE_FWD_CH_H_ */
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index bf9c2d1bd76..239932eb4a3 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -188,7 +188,6 @@ void
 DRV_cpp_init (void)
 {
   const char *cpp_loc = FE_get_cpp_loc_from_env ();
-
   DRV_cpp_putarg (cpp_loc);
 
   // Add an option to the IDL compiler to make the TAO version
@@ -200,10 +199,9 @@ DRV_cpp_init (void)
                    ACE_MAJOR_VERSION,
                    ACE_MINOR_VERSION,
                    ACE_BETA_VERSION);
+                   
   DRV_cpp_putarg (version_option);
-
   DRV_cpp_putarg ("-I.");
-
   const char *cpp_args = FE_get_cpp_args_from_env ();
 
   if (cpp_args == 0)
@@ -221,15 +219,8 @@ DRV_cpp_init (void)
 #endif /* TAO_IDL_PREPROCESSOR_ARGS */
 
       // So we can find OMG IDL files, such as `orb.idl'.
+      
       ACE_OS::strcpy (option, "-I");
-
-#if defined (TAO_IDL_INCLUDE_DIR)
-      // TAO_IDL_INCLUDE_DIR should be in quotes,
-      // e.g. "/usr/local/include/tao"
-
-      ACE_OS::strcat (option,
-                      TAO_IDL_INCLUDE_DIR);
-#else
       char* TAO_ROOT = ACE_OS::getenv ("TAO_ROOT");
       size_t len = 0;
 
@@ -265,6 +256,12 @@ DRV_cpp_init (void)
             }
           else
             {
+#if defined (TAO_IDL_INCLUDE_DIR)
+              // TAO_IDL_INCLUDE_DIR should be in quotes,
+              // e.g. "/usr/local/include/tao"
+              ACE_OS::strcat (option,
+                              TAO_IDL_INCLUDE_DIR);
+#else
               ACE_ERROR ((LM_WARNING,
                           "NOTE: The environment variables "
                           "TAO_ROOT and ACE_ROOT are not defined.\n"
@@ -272,9 +269,9 @@ DRV_cpp_init (void)
                           "locate orb.idl\n"));
 
               ACE_OS::strcat (option, ".");
+#endif  /* TAO_IDL_INCLUDE_DIR */
             }
         }
-#endif  /* TAO_IDL_INCLUDE_DIR */
 
       DRV_cpp_putarg (option);
       idl_global->add_include_path (ACE_CString (option + 2).c_str ());
@@ -674,10 +671,10 @@ DRV_pre_proc (const char *myfile)
   ACE_OS::strcat (tmp_file,  tao_idlf_template);
   ACE_OS::strcat (tmp_ifile, tao_idli_template);
 
-  int tf_fd = ACE_OS::mkstemp (tmp_file);
   int ti_fd = ACE_OS::mkstemp (tmp_ifile);
+  int tf_fd = ACE_OS::mkstemp (tmp_file);
 
-  if (tf_fd == -1 || ti_fd == -1)
+  if (ti_fd == -1 || tf_fd == -1)
     {
       ACE_ERROR ((LM_ERROR,
                   "%s: Unable to create temporary file: %m\n",
@@ -699,6 +696,8 @@ DRV_pre_proc (const char *myfile)
   char * t_file  = tmp_cpp_file;
   char * t_ifile = tmp_cpp_ifile;
 
+  ACE_OS::close (tf_fd);
+
 #endif  /* ACE_LACKS_MKSTEMP */
 
   // Rename temporary files so that they have extensions accepted
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index a7cb460ae90..21f74631129 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -67,6 +67,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * idl.ll - Lexical scanner for IDL 1.1
  */
 
+#include "idl_uns_long.h"
 #include "utl_strlist.h"
 #include "utl_exprlist.h"
 #include "utl_labellist.h"
@@ -78,6 +79,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_expression.h"
 #include "ast_argument.h"
 #include "ast_operation.h"
+#include "ast_root.h"
 #include "fe_interface_header.h"
 #include "global_extern.h"
 #include "fe_private.h"
@@ -89,27 +91,14 @@ static ACE_CDR::WChar   idl_wchar_escape_reader (char *);
 static char             idl_escape_reader (char *);
 static double           idl_atof (char *);
 static long             idl_atoi (char *, long);
-static ACE_UINT64	idl_atoui (char *, long);
-static void		idl_parse_line_and_file (char *);
-static void		idl_store_pragma (char *);
+static idl_uns_long     idl_atoui (char *, long);
+static void             idl_parse_line_and_file (char *);
+static void             idl_store_pragma (char *);
 static char *           idl_get_pragma_string (char *);
 static idl_bool         idl_valid_version (char *);
 static AST_Decl *       idl_find_node (char *);
 
-#if 0 /* defined (HPUX) */
-// HPUX has yytext typed to unsigned char *. We make sure here that
-// we'll always use char * static char* __yytext = (char*) yytext;
-// NOTE: This will not work under flex(1) were yytext is not a fixed
-// buffer, but a dynamically allocated one. This function should do
-// the trick for us.
-inline char *__yytext()
-{
-  return (char *) yytext;
-}
-#define ace_yytext __yytext()
-#else
 #define ace_yytext yytext
-#endif /* 0 */
 
 %}
 
@@ -123,35 +112,35 @@ NL [\r?\n]
 
 any             return IDL_ANY;
 Object          return IDL_OBJECT;
-module		return IDL_MODULE;
-raises		return IDL_RAISES;
-readonly	return IDL_READONLY;
-attribute	return IDL_ATTRIBUTE;
-exception	return IDL_EXCEPTION;
-context		return IDL_CONTEXT;
-interface	return IDL_INTERFACE;
-const		return IDL_CONST;
-typedef		return IDL_TYPEDEF;
-struct		return IDL_STRUCT;
-enum		return IDL_ENUM;
-string		return IDL_STRING;
-wstring 	return IDL_WSTRING;
-sequence	return IDL_SEQUENCE;
-union		return IDL_UNION;
-fixed		return IDL_FIXED;
-switch		return IDL_SWITCH;
-case		return IDL_CASE;
-default		return IDL_DEFAULT;
-float		return IDL_FLOAT;
-double		return IDL_DOUBLE;
-long		return IDL_LONG;
-short		return IDL_SHORT;
-unsigned	return IDL_UNSIGNED;
-char		return IDL_CHAR;
-wchar		return IDL_WCHAR;
-boolean		return IDL_BOOLEAN;
-octet		return IDL_OCTET;
-void		return IDL_VOID;
+module          return IDL_MODULE;
+raises          return IDL_RAISES;
+readonly        return IDL_READONLY;
+attribute       return IDL_ATTRIBUTE;
+exception       return IDL_EXCEPTION;
+context         return IDL_CONTEXT;
+interface       return IDL_INTERFACE;
+const           return IDL_CONST;
+typedef         return IDL_TYPEDEF;
+struct          return IDL_STRUCT;
+enum            return IDL_ENUM;
+string          return IDL_STRING;
+wstring         return IDL_WSTRING;
+sequence        return IDL_SEQUENCE;
+union           return IDL_UNION;
+fixed           return IDL_FIXED;
+switch          return IDL_SWITCH;
+case            return IDL_CASE;
+default         return IDL_DEFAULT;
+float           return IDL_FLOAT;
+double          return IDL_DOUBLE;
+long            return IDL_LONG;
+short           return IDL_SHORT;
+unsigned        return IDL_UNSIGNED;
+char            return IDL_CHAR;
+wchar           return IDL_WCHAR;
+boolean         return IDL_BOOLEAN;
+octet           return IDL_OCTET;
+void            return IDL_VOID;
 native          return IDL_NATIVE;
 local           return IDL_LOCAL;
 abstract        return IDL_ABSTRACT;
@@ -180,22 +169,22 @@ typeprefix      return IDL_TYPEPREFIX;
 uses            return IDL_USES;
 manages         return IDL_MANAGES;
 
-TRUE		return IDL_TRUETOK;
-FALSE		return IDL_FALSETOK;
+TRUE            return IDL_TRUETOK;
+FALSE           return IDL_FALSETOK;
 
-inout		return IDL_INOUT;
-in		return IDL_IN;
-out		return IDL_OUT;
-oneway		return IDL_ONEWAY;
+inout           return IDL_INOUT;
+in              return IDL_IN;
+out             return IDL_OUT;
+oneway          return IDL_ONEWAY;
 
-\<\<		return IDL_LEFT_SHIFT;
-\>\>		return IDL_RIGHT_SHIFT;
-\:\:		{
-		  yylval.strval = (char *) "::";
-		  return IDL_SCOPE_DELIMITOR;
-		}
+\<\<            return IDL_LEFT_SHIFT;
+\>\>            return IDL_RIGHT_SHIFT;
+\:\:            {
+                  yylval.strval = (char *) "::";
+                  return IDL_SCOPE_DELIMITOR;
+                }
 
-[a-ij-rs-zA-IJ-RS-Z_][a-ij-rs-zA-IJ-RS-Z0-9_]*	{
+[a-ij-rs-zA-IJ-RS-Z_][a-ij-rs-zA-IJ-RS-Z0-9_]* {
   // Make sure that this identifier is not a C++ keyword. If it is,
   // prepend it with a _cxx_. Lookup in the perfect hash table for C++
   // keyword and grab the mapping.  BTW, the reason for the odd
@@ -208,21 +197,21 @@ oneway		return IDL_ONEWAY;
       // This check will ensure that escaped C++ keywords will be
       // caught and prepended with '_cxx' as non-escaped keywords
       // are now prepended with '_cxx_'.
-      const char *tmp = 
-        ace_tao_yytext[0] == '_' ? ace_tao_yytext + 1 : ace_tao_yytext;
+      const char *tmp =
+        ace_yytext[0] == '_' ? ace_yytext + 1 : ace_yytext;
 
-      entry = 
+      entry =
         cpp_key_tbl.lookup (tmp,
                             static_cast<unsigned int> (ACE_OS::strlen (tmp)));
     }
 
   if (entry)
     {
-      tao_yylval.strval = ACE_OS::strdup (entry->mapping_);
+      yylval.strval = ACE_OS::strdup (entry->mapping_);
     }
   else
     {
-      tao_yylval.strval = ACE_OS::strdup (ace_tao_yytext);
+      yylval.strval = ACE_OS::strdup (ace_yytext);
     }
 
   return IDENTIFIER;
@@ -237,34 +226,34 @@ oneway		return IDL_ONEWAY;
                   return IDL_FLOATING_PT_LITERAL;
                 }
 
-"-"[1-9][0-9]*	{
-		  yylval.ival = idl_atoi(ace_yytext, 10);
-		  return IDL_INTEGER_LITERAL;
-	        }
+"-"[1-9][0-9]*  {
+                  yylval.ival = idl_atoi(ace_yytext, 10);
+                  return IDL_INTEGER_LITERAL;
+                }
 [1-9][0-9]*     {
-		  yylval.uival = idl_atoui(ace_yytext, 10);
-		  return IDL_UINTEGER_LITERAL;
-		}
+                  yylval.uival = idl_atoui(ace_yytext, 10);
+                  return IDL_UINTEGER_LITERAL;
+                }
 "-"0[xX][a-fA-F0-9]+ {
-		  yylval.ival = idl_atoi(ace_yytext, 16);
-		  return IDL_INTEGER_LITERAL;
-	        }
+                  yylval.ival = idl_atoi(ace_yytext, 16);
+                  return IDL_INTEGER_LITERAL;
+                }
 0[xX][a-fA-F0-9]+    {
                   yylval.uival = idl_atoui(ace_yytext, 16);
-		  return IDL_UINTEGER_LITERAL;
-		}
-"-"0[0-7]*	{
-		  yylval.ival = idl_atoi(ace_yytext, 8);
-		  return IDL_INTEGER_LITERAL;
-	      	}
-0[0-7]*	        {
-		  yylval.uival = idl_atoui(ace_yytext, 8);
-		  return IDL_UINTEGER_LITERAL;
-	      	}
-
-(\"([^\\\"]*|\\[ntvbrfax\\\?\'\"])*\"[ \t]*)+	{
-		  /* Skip the quotes */
-		  char *tmp = ace_yytext;
+                  return IDL_UINTEGER_LITERAL;
+                }
+"-"0[0-7]*      {
+                  yylval.ival = idl_atoi(ace_yytext, 8);
+                  return IDL_INTEGER_LITERAL;
+                }
+0[0-7]*         {
+                  yylval.uival = idl_atoui(ace_yytext, 8);
+                  return IDL_UINTEGER_LITERAL;
+                }
+
+(\"([^\\\"]*|\\[ntvbrfax\\\?\'\"])*\"[ \t]*)+ {
+                  /* Skip the quotes */
+                  char *tmp = ace_yytext;
                   for(int i = strlen(tmp) - 1; i >= 0; --i) {
                     if (isspace(tmp[i])) {
                       tmp[i] = '\0';
@@ -273,103 +262,103 @@ oneway		return IDL_ONEWAY;
                       break;
                     }
                   }
-		  tmp[strlen (tmp) - 1] = '\0';
-		  ACE_NEW_RETURN (yylval.sval,
+                  tmp[strlen (tmp) - 1] = '\0';
+                  ACE_NEW_RETURN (yylval.sval,
                                   UTL_String (tmp + 1),
                                   IDL_STRING_LITERAL);
-		  return IDL_STRING_LITERAL;
-	      	}
-(L\"([^\\\"]*|\\u([0-9a-fA-F]{1,4}))*\"[ \t]*)+	{
-		  /* Skip the bookends */
-		  char *tmp = ACE_OS::strdup (ace_yytext);
-		  tmp[strlen (tmp) - 1] = '\0';
-		  yylval.wsval = idl_wstring_escape_reader(tmp + 2);
-		  return IDL_WSTRING_LITERAL;
-		}
-"'"."'"		{
-		  yylval.cval = ace_yytext [1];
-		  return IDL_CHARACTER_LITERAL;
-	      	}
-"'"\\([0-7]{1,3})"'"	{
-		  // octal character constant
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-"'"\\[xX]([0-9a-fA-F]{1,2})"'"	{
-		  // hexadecimal character constant
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-"'"\\."'"	{
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-L"'"."'"	{
-		  // wide character constant
-		  yylval.wcval = ace_yytext [2];
-		  return IDL_WCHAR_LITERAL;
-		}
-L"'"\\u([0-9a-fA-F]{1,4})"'"	{
-		  // hexadecimal wide character constant
-		  yylval.wcval = idl_wchar_escape_reader(ace_yytext + 2);
-		  return IDL_WCHAR_LITERAL;
-		}
-^[ \t]*#[ \t]*pragma[ \t].*{NL}	|
-^\?\?=[ \t]*pragma[ \t].*{NL}	{/* remember pragma */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		  idl_store_pragma(ace_yytext);
-		}
-^[ \t]*#file[ \t].*{NL}	|
-^\?\?=[ \t]*file[ \t].*{NL}	{/* ignore file */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-^[ \t]*#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL}		|
-^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL}		{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-^[ \t]*#[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		|
-^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-^[ \t]*#line[ \t]*[0-9]+[ \t]*("\""[^\"]*"\"")?{NL}		|
-^\?\?=line[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
-		  idl_parse_line_and_file(ace_yytext);
-		}
+                  return IDL_STRING_LITERAL;
+                }
+(L\"([^\\\"]*|\\u([0-9a-fA-F]{1,4}))*\"[ \t]*)+ {
+                  /* Skip the bookends */
+                  char *tmp = ACE_OS::strdup (ace_yytext);
+                  tmp[strlen (tmp) - 1] = '\0';
+                  yylval.wsval = idl_wstring_escape_reader(tmp + 2);
+                  return IDL_WSTRING_LITERAL;
+                }
+"'"."'"         {
+                  yylval.cval = ace_yytext [1];
+                  return IDL_CHARACTER_LITERAL;
+                }
+"'"\\([0-7]{1,3})"'" {
+                  // octal character constant
+                  yylval.cval = idl_escape_reader(ace_yytext + 1);
+                  return IDL_CHARACTER_LITERAL;
+                }
+"'"\\[xX]([0-9a-fA-F]{1,2})"'" {
+                  // hexadecimal character constant
+                  yylval.cval = idl_escape_reader(ace_yytext + 1);
+                  return IDL_CHARACTER_LITERAL;
+                }
+"'"\\."'"       {
+                  yylval.cval = idl_escape_reader(ace_yytext + 1);
+                  return IDL_CHARACTER_LITERAL;
+                }
+L"'"."'"        {
+                  // wide character constant
+                  yylval.wcval = ace_yytext [2];
+                  return IDL_WCHAR_LITERAL;
+                }
+L"'"\\u([0-9a-fA-F]{1,4})"'" {
+                  // hexadecimal wide character constant
+                  yylval.wcval = idl_wchar_escape_reader(ace_yytext + 2);
+                  return IDL_WCHAR_LITERAL;
+                }
+^[ \t]*#[ \t]*pragma[ \t].*{NL} |
+^\?\?=[ \t]*pragma[ \t].*{NL} {/* remember pragma */
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                  idl_store_pragma(ace_yytext);
+                }
+^[ \t]*#file[ \t].*{NL} |
+^\?\?=[ \t]*file[ \t].*{NL} {/* ignore file */
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
+^[ \t]*#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} |
+^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*([ \t]*[0-9]*)?{NL} {
+                  idl_parse_line_and_file(ace_yytext);
+                }
+^[ \t]*#[ \t]*[0-9]*" ""\""[^\"]*"\""{NL} |
+^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""{NL} {
+                  idl_parse_line_and_file(ace_yytext);
+                }
+^[ \t]*#line[ \t]*[0-9]+[ \t]*("\""[^\"]*"\"")?{NL} |
+^\?\?=line[ \t]*[0-9]*" ""\""[^\"]*"\""{NL} {
+                  idl_parse_line_and_file(ace_yytext);
+                }
 ^[ \t]*#[ \t]*[0-9]*{NL} |
 ^\?\?=[ \t]*[0-9]*{NL} {
-		  idl_parse_line_and_file(ace_yytext);
-	        }
-^[ \t]*#[ \t]*ident[ \t].*{NL}	|
-^\?\?=[ \t]*ident[ \t].*{NL}	{
-		  /* ignore cpp ident */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-\/\/.*{NL}	{
-		  /* ignore comments */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-"/*"		{
-		  for(;;) {
-		    char c = yyinput();
-		    if (c == '*') {
-		      char next = yyinput();
-		      if (next == '/')
-			break;
-		      else
-			yyunput(c, NULL);
-	              if (c == '\n')
-		        idl_global->set_lineno(idl_global->lineno() + 1);
-		    }
-	          }
-	        }
-[ \t]*		;
-{NL}		{
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-.		return ace_yytext [0];
+                  idl_parse_line_and_file(ace_yytext);
+                }
+^[ \t]*#[ \t]*ident[ \t].*{NL} |
+^\?\?=[ \t]*ident[ \t].*{NL} {
+                  /* ignore cpp ident */
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
+\/\/.*{NL}      {
+                  /* ignore comments */
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
+"/*"            {
+                  for(;;) {
+                    char c = yyinput();
+                    if (c == '*') {
+                      char next = yyinput();
+                      if (next == '/')
+                        break;
+                      else
+                        yyunput(c, NULL);
+                      if (c == '\n')
+                        idl_global->set_lineno(idl_global->lineno() + 1);
+                    }
+                  }
+                }
+[ \t]*          ;
+{NL}            {
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
+.               return ace_yytext [0];
 
 %%
-	/* subroutines */
+        /* subroutines */
 
 // Parse a #line statement generated by the C preprocessor
 static void
@@ -449,10 +438,10 @@ idl_parse_line_and_file (char *buf)
         {
           if (h[j] == '\\' && h[j + 1] == '\\')
             {
-	            j++;
+              j++;
             }
 
-	        h[i] = h[j];
+            h[i] = h[j];
         }
 
       h[i] = '\0';
@@ -481,7 +470,7 @@ idl_parse_line_and_file (char *buf)
 
   // Strip off any command line -I prefix that may have been added
   // by the preprocessor.
-  if (!(idl_global->in_main_file ()) && idl_global->import ()) 
+  if (!(idl_global->in_main_file ()) && idl_global->import ())
     {
       ACE_NEW (
           nm,
@@ -593,7 +582,7 @@ idl_store_pragma (char *buf)
           ext_id.set (idl_global->filename ()->get_string (),
                       0);
           char *int_id = ACE::strnew (new_prefix);
-          (void) idl_global->file_prefixes ().rebind (ext_id, 
+          (void) idl_global->file_prefixes ().rebind (ext_id,
                                                       int_id);
         }
     }
@@ -628,7 +617,7 @@ idl_store_pragma (char *buf)
           len = ACE_OS::strlen (number);
         }
 
-      // This call adds a proper null terminator to tmp, so no need to 
+      // This call adds a proper null terminator to tmp, so no need to
       // do it here.
       AST_Decl *d = idl_find_node (tmp);
 
@@ -645,7 +634,7 @@ idl_store_pragma (char *buf)
 
       d->version (ACE::strnew (number));
     }
-  else if (ACE_OS::strncmp (buf + 8, "ident", 5) == 0) 
+  else if (ACE_OS::strncmp (buf + 8, "ident", 5) == 0)
     {
       idl_global->ident_string (buf + 8);
     }
@@ -675,7 +664,7 @@ idl_store_pragma (char *buf)
                                                   new_id);
               return;
             }
-            
+
           d->repoID (new_id);
           d->typeid_set (I_TRUE);
         }
@@ -726,10 +715,10 @@ idl_atoi(char *s, long b)
 /*
  * idl_atoui - Convert a string of digits into an unsigned integer according to base b
  */
-static ACE_UINT64
+static idl_uns_long
 idl_atoui(char *s, long b)
 {
-  ACE_UINT64    r = 0;
+  idl_uns_long  r = 0;
 
   if (b == 8 && *s == '0')
     {
@@ -773,24 +762,24 @@ idl_atof (char *s)
   double e, k;
   long neg = 0, negexp = 0;
 
-  if (*s == '-') 
+  if (*s == '-')
     {
       neg = 1;
       s++;
     }
 
-  while (*s >= '0' && *s <= '9') 
+  while (*s >= '0' && *s <= '9')
     {
       d = (d * 10) + *s - '0';
       s++;
     }
 
-  if (*s == '.') 
+  if (*s == '.')
     {
       s++;
       e = 10;
 
-      while (*s >= '0' && *s <= '9') 
+      while (*s >= '0' && *s <= '9')
         {
           d += (*s - '0') / (e * 1.0);
           e *= 10;
@@ -798,15 +787,15 @@ idl_atof (char *s)
         }
     }
 
-  if (*s == 'e' || *s == 'E') 
+  if (*s == 'e' || *s == 'E')
     {
       s++;
 
-      if (*s == '-') 
+      if (*s == '-')
         {
             negexp = 1;
             s++;
-        } 
+        }
       else if (*s == '+')
         {
           s++;
@@ -814,13 +803,13 @@ idl_atof (char *s)
 
       e = 0;
 
-      while (*s >= '0' && *s <= '9') 
+      while (*s >= '0' && *s <= '9')
         {
           e = (e * 10) + *s - '0';
           s++;
         }
 
-      if (e > 0) 
+      if (e > 0)
         {
           for (k = 1; e > 0; k *= 10, e--);
 
@@ -835,7 +824,7 @@ idl_atof (char *s)
         }
     }
 
-  if (neg) 
+  if (neg)
     {
       d *= -1.0;
     }
@@ -851,12 +840,12 @@ idl_escape_reader(
     char *str
   )
 {
-  if (str[0] != '\\') 
+  if (str[0] != '\\')
     {
-	    return str[0];
+            return str[0];
     }
 
-  switch (str[1]) 
+  switch (str[1])
   {
     case 'n':
       return '\n';
@@ -885,10 +874,10 @@ idl_escape_reader(
         int i;
 
         // hex value
-        for (i = 2; str[i] != '\0' && isxdigit (str[i]); ++i) 
+        for (i = 2; str[i] != '\0' && isxdigit (str[i]); ++i)
           {
-	     continue;
-	  }
+            continue;
+          }
 
         char save = str[i];
         str[i] = '\0';
@@ -899,25 +888,25 @@ idl_escape_reader(
       ACE_NOTREACHED (break;)
     default:
       // check for octal value
-      if (str[1] >= '0' && str[1] <= '7') 
+      if (str[1] >= '0' && str[1] <= '7')
         {
- 	  int i;
+          int i;
 
-	  for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i) 
+          for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i)
             {
-	      continue;
-	    }
-
-	  char save = str[i];
-	  str[i] = '\0';
-	  char out = (char)idl_atoui(&str[1], 8);
-	  str[i] = save;
-	  return out;
-	} 
-      else 
+              continue;
+            }
+
+          char save = str[i];
+          str[i] = '\0';
+          char out = (char)idl_atoui(&str[1], 8);
+          str[i] = save;
+          return out;
+        }
+      else
         {
-	  return str[1] - 'a';
-	}
+          return str[1] - 'a';
+        }
       ACE_NOTREACHED  (break;)
   }
 }
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index c4a400ffbfa..66eb81e85fa 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -152,7 +152,7 @@ AST_Decl *tao_enum_constant_decl = 0;
   FE_Declarator                 *deval;         /* Declarator value     */
   idl_bool                      bval;           /* Boolean value        */
   long                          ival;           /* Long value           */
-  ACE_UINT64                    uival;          /* Unsigned long value  */
+  idl_uns_long                  uival;          /* Unsigned long value  */
   double                        dval;           /* Double value         */
   float                         fval;           /* Float value          */
   char                          cval;           /* Char value           */
@@ -258,7 +258,7 @@ AST_Decl *tao_enum_constant_decl = 0;
 %type <dcval>   template_type_spec sequence_type_spec string_type_spec
 %type <dcval>   struct_type enum_type switch_type_spec union_type
 %type <dcval>   array_declarator op_type_spec seq_head wstring_type_spec
-%type <dcval>   param_type_spec  
+%type <dcval>   param_type_spec
 
 %type <idlist>  scoped_name interface_type component_inheritance_spec
 %type <idlist>  home_inheritance_spec primary_key_spec
@@ -456,7 +456,7 @@ module  : IDL_MODULE
           {
 //        IDENTIFIER
             Identifier id ($3);
-            UTL_ScopedName n (&id, 
+            UTL_ScopedName n (&id,
                               0);
             AST_Module *m = 0;
             UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -465,9 +465,9 @@ module  : IDL_MODULE
             /*
              * Make a new module and add it to the enclosing scope
              */
-            if (s != 0) 
+            if (s != 0)
               {
-                m = idl_global->gen ()->create_module (s, 
+                m = idl_global->gen ()->create_module (s,
                                                        &n);
                 (void) s->fe_add_module (m);
               }
@@ -505,16 +505,16 @@ interface_def
 interface :
         interface_header
         {
-// interface : interface_header          
+// interface : interface_header
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Interface *i = 0;
 
           /*
            * Make a new interface node and add it to its enclosing scope.
            */
-          if (s != 0 && $1 != 0) 
+          if (s != 0 && $1 != 0)
             {
-              i = 
+              i =
                 idl_global->gen ()->create_interface (
                                         $1->name (),
                                         $1->inherits (),
@@ -524,7 +524,7 @@ interface :
                                         $1->is_local (),
                                         $1->is_abstract ()
                                       );
-              AST_Interface::fwd_redefinition_helper (i, 
+              AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the interface to its definition scope.
@@ -597,7 +597,7 @@ interface_header :
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName n ($1, 
+          UTL_ScopedName n ($1,
                             0);
           ACE_NEW_RETURN ($$,
                           FE_InterfaceHeader (&n,
@@ -619,10 +619,10 @@ interface_header :
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           ACE_NEW_RETURN ($$,
-                          FE_InterfaceHeader (&n, 
+                          FE_InterfaceHeader (&n,
                                               $3,
                                               I_TRUE,
                                               I_FALSE,
@@ -641,10 +641,10 @@ interface_header :
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           ACE_NEW_RETURN ($$,
-                          FE_InterfaceHeader (&n, 
+                          FE_InterfaceHeader (&n,
                                               $3,
                                               I_FALSE,
                                               I_TRUE,
@@ -702,9 +702,9 @@ value_concrete_decl :
           AST_ValueType *v = 0;
           AST_Interface *i = 0;
 
-          if (s != 0 && $1 != 0) 
+          if (s != 0 && $1 != 0)
             {
-              v = 
+              v =
                 idl_global->gen ()->create_valuetype (
                     $1->name (),
                     $1->inherits (),
@@ -720,7 +720,7 @@ value_concrete_decl :
                     I_FALSE
                   );
               i = AST_Interface::narrow_from_decl (v);
-              AST_Interface::fwd_redefinition_helper (i, 
+              AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the valuetype to its definition scope
@@ -749,15 +749,14 @@ value_concrete_decl :
 //      '}'
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
 
-          AST_ValueType *vt = 
+          AST_ValueType *vt =
             AST_ValueType::narrow_from_scope (
                 idl_global->scopes ().top_non_null ()
               );
 
           if (vt != 0 && vt->will_have_factory ())
             {
-              ACE_SET_BITS (idl_global->decls_seen_info_,
-                            idl_global->decls_seen_masks.valuefactory_seen_);
+              idl_global->valuefactory_seen_ = true;
             }
 
           /*
@@ -776,9 +775,9 @@ value_abs_decl :
           AST_ValueType *v = 0;
           AST_Interface *i = 0;
 
-          if (s != 0 && $2 != 0) 
+          if (s != 0 && $2 != 0)
             {
-              v = 
+              v =
                 idl_global->gen ()->create_valuetype (
                     $2->name (),
                     $2->inherits (),
@@ -794,7 +793,7 @@ value_abs_decl :
                     I_FALSE
                   );
               i = AST_Interface::narrow_from_decl (v);
-              AST_Interface::fwd_redefinition_helper (i, 
+              AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the valuetype to its definition scope
@@ -834,7 +833,7 @@ value_header :
         value_decl
         inheritance_spec
         {
-// value_header : value_decl inheritance_spec 
+// value_header : value_decl inheritance_spec
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
 
           if ($2 != 0 && $2->truncatable ())
@@ -855,7 +854,7 @@ value_header :
 
           UTL_ScopedName *sn = 0;
           ACE_NEW_RETURN (sn,
-                          UTL_ScopedName ($1, 
+                          UTL_ScopedName ($1,
                                           0),
                           1);
           ACE_NEW_RETURN ($$,
@@ -863,7 +862,7 @@ value_header :
                                         $2,
                                         $4,
                                         $2 ? $2->truncatable () : I_FALSE),
-                          1);      
+                          1);
         }
         ;
 
@@ -914,7 +913,7 @@ value_forward_decl :
         {
 // value_forward_decl : IDL_ABSTRACT value_decl
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           AST_ValueTypeFwd *f = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeForwardSeen);
@@ -923,7 +922,7 @@ value_forward_decl :
            * Create a node representing a forward declaration of an
            * valuetype. Store it in the enclosing scope
            */
-          if (s != 0) 
+          if (s != 0)
             {
               f = idl_global->gen ()->create_valuetype_fwd (&n,
                                                            I_TRUE);
@@ -935,7 +934,7 @@ value_forward_decl :
         {
 //      | value_decl
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($1, 
+          UTL_ScopedName n ($1,
                             0);
           AST_ValueTypeFwd *f = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeForwardSeen);
@@ -944,7 +943,7 @@ value_forward_decl :
            * Create a node representing a forward declaration of an
            * valuetype. Store it in the enclosing scope
            */
-          if (s != 0) 
+          if (s != 0)
             {
               f = idl_global->gen ()->create_valuetype_fwd (&n,
                                                             I_FALSE);
@@ -1090,7 +1089,7 @@ at_least_one_scoped_name :
         {
 // at_least_one_scoped_name : scoped_name scoped_names
           ACE_NEW_RETURN ($$,
-                          UTL_NameList ($1, 
+                          UTL_NameList ($1,
                                         $2),
                           1);
         }
@@ -1111,15 +1110,15 @@ scoped_names
           if ($1 == 0)
             {
               ACE_NEW_RETURN ($$,
-                              UTL_NameList ($4, 
+                              UTL_NameList ($4,
                                             0),
                               1);
             }
-          else 
+          else
             {
               UTL_NameList *nl = 0;
               ACE_NEW_RETURN (nl,
-                              UTL_NameList ($4, 
+                              UTL_NameList ($4,
                                             0),
                               1);
               $1->nconc (nl);
@@ -1204,11 +1203,11 @@ interface_forward :
         {
 // interface_forward : interface_decl
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($1, 
+          UTL_ScopedName n ($1,
                             0);
 
-          if (ACE_OS_String::strcmp ($1->get_string (),
-                                     "TypeCode") == 0
+          if (ACE_OS::strcmp ($1->get_string (),
+                              "TypeCode") == 0
               && !idl_global->in_main_file ())
             {
               AST_PredefinedType *pdt =
@@ -1228,9 +1227,9 @@ interface_forward :
            * Create a node representing a forward declaration of an
            * interface. Store it in the enclosing scope
            */
-          if (s != 0) 
+          if (s != 0)
             {
-              f = idl_global->gen ()->create_interface_fwd (&n, 
+              f = idl_global->gen ()->create_interface_fwd (&n,
                                                             0,
                                                             0);
               (void) s->fe_add_interface_fwd (f);
@@ -1241,7 +1240,7 @@ interface_forward :
         {
 //      | IDL_LOCAL interface_decl
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           AST_InterfaceFwd *f = 0;
           idl_global->set_parse_state (
@@ -1252,10 +1251,10 @@ interface_forward :
            * Create a node representing a forward declaration of an
            * interface. Store it in the enclosing scope
            */
-          if (s != 0) 
+          if (s != 0)
             {
-              f = idl_global->gen ()->create_interface_fwd (&n, 
-                                                            1, 
+              f = idl_global->gen ()->create_interface_fwd (&n,
+                                                            1,
                                                             0);
               (void) s->fe_add_interface_fwd (f);
             }
@@ -1265,7 +1264,7 @@ interface_forward :
         {
 //      | IDL_ABSTRACT interface_decl
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           AST_InterfaceFwd *f = 0;
           idl_global->set_parse_state (
@@ -1276,10 +1275,10 @@ interface_forward :
            * Create a node representing a forward declaration of an
            * interface. Store it in the enclosing scope
            */
-          if (s != 0) 
+          if (s != 0)
             {
-              f = idl_global->gen ()->create_interface_fwd (&n, 
-                                                            0, 
+              f = idl_global->gen ()->create_interface_fwd (&n,
+                                                            0,
                                                             1);
               (void) s->fe_add_interface_fwd (f);
             }
@@ -1310,7 +1309,7 @@ const_dcl :
         expression
         {
 //      expression
-          UTL_ScopedName n ($5, 
+          UTL_ScopedName n ($5,
                             0);
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Constant *c = 0;
@@ -1320,30 +1319,30 @@ const_dcl :
            * Create a node representing a constant declaration. Store
            * it in the enclosing scope.
            */
-          if ($9 != 0 && s != 0) 
+          if ($9 != 0 && s != 0)
             {
-              AST_Expression::AST_ExprValue *result = 
+              AST_Expression::AST_ExprValue *result =
                 $9->check_and_coerce ($3,
                                       tao_enum_constant_decl);
               tao_enum_constant_decl = 0;
 
               if (result == 0)
                 {
-                  idl_global->err ()->coercion_error ($9, 
+                  idl_global->err ()->coercion_error ($9,
                                                       $3);
                 }
-              else 
+              else
                 {
-                  c = 
+                  c =
                     idl_global->gen ()->create_constant (
                                             $3,
-                                            $9, 
+                                            $9,
                                             &n
                                           );
                   (void) s->fe_add_constant (c);
                   delete result;
                 }
-              
+
               $5->destroy ();
               delete $5;
               $5 = 0;
@@ -1386,18 +1385,18 @@ const_type
            * If the constant's type is a scoped name, it must resolve
            * to a scalar constant type
            */
-          AST_Decl *d = 
-            s->lookup_by_name ($1, 
+          AST_Decl *d =
+            s->lookup_by_name ($1,
                                I_TRUE);
 
-          if (s != 0  && d != 0) 
+          if (s != 0  && d != 0)
             {
               tao_enum_constant_decl = d;
 
               /*
                * Look through typedefs.
                */
-              while (d->node_type () == AST_Decl::NT_typedef) 
+              while (d->node_type () == AST_Decl::NT_typedef)
                 {
                   t = AST_Typedef::narrow_from_decl (d);
 
@@ -1413,32 +1412,32 @@ const_type
                 {
                   $$ = AST_Expression::EV_enum;
                 }
-              else if (d->node_type () == AST_Decl::NT_pre_defined) 
+              else if (d->node_type () == AST_Decl::NT_pre_defined)
                 {
                   c = AST_PredefinedType::narrow_from_decl (d);
 
-                  if (c != 0) 
+                  if (c != 0)
                     {
                       $$ = idl_global->PredefinedTypeToExprType (c->pt ());
-                    } 
-                  else 
+                    }
+                  else
                     {
                       $$ = AST_Expression::EV_enum;
                     }
-                } 
-              else if (d->node_type () == AST_Decl::NT_string) 
+                }
+              else if (d->node_type () == AST_Decl::NT_string)
                 {
                   $$ = AST_Expression::EV_string;
-                } 
-              else if (d->node_type () == AST_Decl::NT_wstring) 
+                }
+              else if (d->node_type () == AST_Decl::NT_wstring)
                 {
                   $$ = AST_Expression::EV_wstring;
-                } 
+                }
               else
                 {
                   $$ = AST_Expression::EV_enum;
                 }
-            } 
+            }
           else
             {
               $$ = AST_Expression::EV_enum;
@@ -1455,10 +1454,10 @@ or_expr : xor_expr
         {
 // or_expr : xor_expr
 //      | or_expr '|' xor_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_or, 
-                                    $1, 
+                                    AST_Expression::EC_or,
+                                    $1,
                                     $3
                                   );
         }
@@ -1470,10 +1469,10 @@ xor_expr
         {
 // xor_expr : and_expr
 //      | xor_expr '^' and_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_xor, 
-                                    $1, 
+                                    AST_Expression::EC_xor,
+                                    $1,
                                     $3
                                   );
         }
@@ -1484,10 +1483,10 @@ and_expr
         | and_expr '&' shift_expr
         {
 // and_expr : shift_expr | and_expr '&' shift_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_and, 
-                                    $1, 
+                                    AST_Expression::EC_and,
+                                    $1,
                                     $3
                                   );
         }
@@ -1498,20 +1497,20 @@ shift_expr
         | shift_expr IDL_LEFT_SHIFT add_expr
         {
 // shift_expr : add_expr | shift_expr IDL_LEFT_SHIFT add_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_left, 
-                                    $1, 
+                                    AST_Expression::EC_left,
+                                    $1,
                                     $3
                                   );
         }
         | shift_expr IDL_RIGHT_SHIFT add_expr
         {
 //      | shift_expr IDL_RIGHT_SHIFT add_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_right, 
-                                    $1, 
+                                    AST_Expression::EC_right,
+                                    $1,
                                     $3
                                   );
         }
@@ -1522,20 +1521,20 @@ add_expr
         | add_expr '+' mult_expr
         {
 // add_expr : mult_expr | add_expr '+' mult_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_add, 
-                                    $1, 
+                                    AST_Expression::EC_add,
+                                    $1,
                                     $3
                                   );
         }
         | add_expr '-' mult_expr
         {
 //      | add_expr '-' mult_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_minus, 
-                                    $1, 
+                                    AST_Expression::EC_minus,
+                                    $1,
                                     $3
                                   );
         }
@@ -1546,30 +1545,30 @@ mult_expr
         | mult_expr '*' unary_expr
         {
 // mult_expr : unary_expr | mult_expr '*' unary_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_mul, 
-                                    $1, 
+                                    AST_Expression::EC_mul,
+                                    $1,
                                     $3
                                   );
         }
         | mult_expr '/' unary_expr
         {
 //      | mult_expr '/' unary_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_div, 
-                                    $1, 
+                                    AST_Expression::EC_div,
+                                    $1,
                                     $3
                                   );
         }
         | mult_expr '%' unary_expr
         {
 //      | mult_expr '%' unary_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
-                                    AST_Expression::EC_mod, 
-                                    $1, 
+                                    AST_Expression::EC_mod,
+                                    $1,
                                     $3
                                   );
         }
@@ -1580,7 +1579,7 @@ unary_expr
         | '+' primary_expr
         {
 // unary_expr : primary_expr | '+' primary_expr
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr (
                                     AST_Expression::EC_u_plus,
                                     $2,
@@ -1590,7 +1589,7 @@ unary_expr
         | '-' primary_expr
         {
 //      | '-' primary_expr
-          $$ = 
+          $$ =
             idl_global->gen()->create_expr (
                                    AST_Expression::EC_u_minus,
                                    $2,
@@ -1600,7 +1599,7 @@ unary_expr
         | '~' primary_expr
         {
 //      | '~' primary_expr
-          $$ = 
+          $$ =
             idl_global->gen()->create_expr (
                                    AST_Expression::EC_bit_neg,
                                    $2,
@@ -1624,9 +1623,9 @@ primary_expr
 
           /*
            * If the scoped name is an IDL constant, it may be used in an
-           * array dim, a string bound, or a sequence bound. If so, it 
+           * array dim, a string bound, or a sequence bound. If so, it
            * must be unsigned and > 0. We assign the constant's value
-           * and type to the expression created here so we can check 
+           * and type to the expression created here so we can check
            * them later.
            */
           if (d != 0 && d->node_type () == AST_Decl::NT_const)
@@ -1658,7 +1657,7 @@ literal
         | IDL_UINTEGER_LITERAL
         {
 //      | IDL_UINTEGER_LITERAL
-          $$ = 
+          $$ =
             idl_global->gen ()->create_expr ($1,
                                              AST_Expression::EV_ulonglong);
         }
@@ -1733,6 +1732,7 @@ positive_int_expr :
                     }
 
                   break;
+#if !defined (ACE_LACKS_LONGLONG_T)
                 case AST_Expression::EV_ulonglong:
                   if (ev->u.ullval == 0)
                     {
@@ -1740,6 +1740,7 @@ positive_int_expr :
                     }
 
                   break;
+#endif
                 case AST_Expression::EV_octet:
                   if (ev->u.oval == 0)
                     {
@@ -1762,8 +1763,8 @@ positive_int_expr :
 
           if (good_expression)
             {
-              $$ = 
-                idl_global->gen()->create_expr ($1, 
+              $$ =
+                idl_global->gen()->create_expr ($1,
                                                 AST_Expression::EV_ulong);
             }
           else
@@ -1779,24 +1780,24 @@ type_dcl
 // type_dcl : IDL_TYPEDEF
           idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen);
         }
-        type_declarator 
-        { 
-//      type_declarator 
-          $$ = 0; 
+        type_declarator
+        {
+//      type_declarator
+          $$ = 0;
         }
-        | struct_type 
-        { 
-//      | struct_type 
+        | struct_type
+        {
+//      | struct_type
           $$ = 0;
         }
-        | union_type 
-        { 
-//      | union_type 
+        | union_type
+        {
+//      | union_type
           $$ = 0;
         }
-        | enum_type 
-        { 
-//      | enum_type 
+        | enum_type
+        {
+//      | enum_type
           $$ = 0;
         }
         | IDL_NATIVE simple_declarator
@@ -1810,9 +1811,9 @@ type_dcl
            * Create a node representing a Native and add it to its
            * enclosing scope
            */
-          if (s != 0) 
+          if (s != 0)
             {
-              node = 
+              node =
                 idl_global->gen ()->create_native (
                                         $2->name ()
                                       );
@@ -1847,11 +1848,11 @@ type_declarator :
            * Create a list of type renamings. Add them to the
            * enclosing scope
            */
-          if (s != 0 && $1 != 0 && $3 != 0) 
+          if (s != 0 && $1 != 0 && $3 != 0)
             {
-              for (UTL_DecllistActiveIterator l ($3); 
-                   !l.is_done (); 
-                   l.next ()) 
+              for (UTL_DecllistActiveIterator l ($3);
+                   !l.is_done ();
+                   l.next ())
                 {
                   d = l.item ();
 
@@ -1867,7 +1868,7 @@ type_declarator :
                       continue;
                     }
 
-                  t = idl_global->gen ()->create_typedef (tp, 
+                  t = idl_global->gen ()->create_typedef (tp,
                                                           d->name (),
                                                           s->is_local (),
                                                           s->is_abstract ());
@@ -1891,7 +1892,7 @@ simple_type_spec
         : base_type_spec
         {
 // simple_type_spec : base_type_spec
-          $$ = 
+          $$ =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  $1
                                                );
@@ -1906,7 +1907,7 @@ simple_type_spec
 
           if (s != 0)
             {
-              d = s->lookup_by_name ($1, 
+              d = s->lookup_by_name ($1,
                                      I_TRUE);
             }
 
@@ -1980,9 +1981,9 @@ declarators
               ACE_NEW_RETURN ($$,
                               UTL_DeclList ($4,
                                             0),
-                              1);               
+                              1);
             }
-          else 
+          else
             {
               UTL_DeclList *dl = 0;
               ACE_NEW_RETURN (dl,
@@ -2035,7 +2036,7 @@ simple_declarators
                                             0),
                               1);
             }
-          else 
+          else
             {
               UTL_DeclList *dl = 0;
               ACE_NEW_RETURN (dl,
@@ -2227,7 +2228,7 @@ struct_type
         {
 // struct_type : struct_header
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($1, 
+          UTL_ScopedName n ($1,
                             0);
           AST_Structure *d = 0;
 
@@ -2235,9 +2236,9 @@ struct_type
            * Create a node representing a struct declaration. Add it
            * to the enclosing scope
            */
-          if (s != 0) 
+          if (s != 0)
             {
-              d = 
+              d =
                 idl_global->gen ()->create_structure (
                                         &n,
                                         s->is_local (),
@@ -2316,23 +2317,23 @@ member_i :
           /*
            * Check for illegal recursive use of type.
            */
-          if ($1 != 0 
+          if ($1 != 0
               && AST_illegal_recursive_type ($1))
             {
-              idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE, 
+              idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE,
                                           $1);
             }
           /*
            * Create a node representing a struct or exception member
            * Add it to the enclosing scope.
            */
-          else if (s != 0 
-                   && $1 != 0 
-                   && $3 != 0) 
+          else if (s != 0
+                   && $1 != 0
+                   && $3 != 0)
             {
-              for (UTL_DecllistActiveIterator l ($3); 
-                   !l.is_done (); 
-                   l.next ()) 
+              for (UTL_DecllistActiveIterator l ($3);
+                   !l.is_done ();
+                   l.next ())
                 {
                   d = l.item ();
 
@@ -2349,10 +2350,10 @@ member_i :
                     }
 
                   /* $0 denotes Visibility, must be on yacc reduction stack. */
-                  f = 
+                  f =
                     idl_global->gen ()->create_field (
-                                            tp, 
-                                            d->name (), 
+                                            tp,
+                                            d->name (),
                                             $<vival>0
                                           );
                   (void) s->fe_add_field (f);
@@ -2386,7 +2387,7 @@ union_decl :
         }
         ;
 
-union_type 
+union_type
         : union_decl IDL_SWITCH
         {
 // union_type : union_decl IDL_SWITCH
@@ -2406,7 +2407,7 @@ union_type
         {
 //      ')'
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($1, 
+          UTL_ScopedName n ($1,
                             0);
           AST_Union *u = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_SwitchCloseParSeen);
@@ -2415,17 +2416,17 @@ union_type
            * Create a node representing a union. Add it to its enclosing
            * scope.
            */
-          if ($6 != 0 
-              && s != 0) 
+          if ($6 != 0
+              && s != 0)
             {
-              AST_ConcreteType *tp = 
+              AST_ConcreteType *tp =
                 AST_ConcreteType::narrow_from_decl ($6);
 
-              if (tp == 0) 
+              if (tp == 0)
                 {
                   idl_global->err ()->not_a_type ($6);
-                } 
-              else 
+                }
+              else
                 {
                   u = idl_global->gen ()->create_union (tp,
                                                         &n,
@@ -2478,7 +2479,7 @@ switch_type_spec :
         integer_type
         {
 // switch_type_spec : integer_type
-          $$ = 
+          $$ =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  $1
                                                );
@@ -2492,7 +2493,7 @@ switch_type_spec :
               idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
             }
 
-          $$ = 
+          $$ =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  $1
                                                );
@@ -2502,7 +2503,7 @@ switch_type_spec :
 //      | octet_type
           /* octets are not allowed. */
           idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
-          $$ = 
+          $$ =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  $1
                                                );
@@ -2510,7 +2511,7 @@ switch_type_spec :
         | boolean_type
         {
 //      | boolean_type
-          $$ = 
+          $$ =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  $1
                                                );
@@ -2532,14 +2533,14 @@ switch_type_spec :
            * typedef's to arrive at the base type at the end of the
            * chain.
            */
-          d = s->lookup_by_name ($1, 
+          d = s->lookup_by_name ($1,
                                  I_TRUE);
 
-          if (s != 0 && d != 0) 
+          if (s != 0 && d != 0)
             {
-              while (!found) 
+              while (!found)
                 {
-                  switch (d->node_type ()) 
+                  switch (d->node_type ())
                   {
                     case AST_Decl::NT_enum:
                       $$ = d;
@@ -2548,9 +2549,9 @@ switch_type_spec :
                     case AST_Decl::NT_pre_defined:
                       p = AST_PredefinedType::narrow_from_decl (d);
 
-                      if (p != 0) 
+                      if (p != 0)
                         {
-                          switch (p->pt ()) 
+                          switch (p->pt ())
                           {
                             case AST_PredefinedType::PT_long:
                             case AST_PredefinedType::PT_ulong:
@@ -2577,7 +2578,7 @@ switch_type_spec :
                               found = I_TRUE;
                               break;
                           }
-                        } 
+                        }
                       else
                         {
                           $$ = 0;
@@ -2588,7 +2589,7 @@ switch_type_spec :
                     case AST_Decl::NT_typedef:
                       t = AST_Typedef::narrow_from_decl (d);
 
-                      if (t != 0) 
+                      if (t != 0)
                         {
                           d = t->base_type ();
                         }
@@ -2600,7 +2601,7 @@ switch_type_spec :
                       break;
                   }
                 }
-            } 
+            }
           else
             {
               $$ = 0;
@@ -2643,11 +2644,11 @@ case_branch :
            * Create several nodes representing branches of a union.
            * Add them to the enclosing scope (the union scope)
            */
-          if (s != 0 
-              &&  $1 != 0 
-              && $3 != 0) 
+          if (s != 0
+              &&  $1 != 0
+              && $3 != 0)
             {
-              b = 
+              b =
                 idl_global->gen ()->create_union_branch (
                                         $1,
                                         f->field_type (),
@@ -2674,7 +2675,7 @@ at_least_one_case_label :
         {
 // at_least_one_case_label : case_label case_labels
           ACE_NEW_RETURN ($$,
-                          UTL_LabelList ($1, 
+                          UTL_LabelList ($1,
                                          $2),
                           1);
         }
@@ -2691,7 +2692,7 @@ case_labels
                                              0),
                               1);
             }
-          else 
+          else
             {
               UTL_LabelList *ll = 0;
               ACE_NEW_RETURN (ll,
@@ -2760,23 +2761,23 @@ element_spec :
           /*
            * Check for illegal recursive use of type
            */
-          if ($1 != 0 
+          if ($1 != 0
               && AST_illegal_recursive_type ($1))
             {
-              idl_global->err()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE, 
+              idl_global->err()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE,
                                          $1);
-                     
-              $$ = 0;                  
+
+              $$ = 0;
             }
           /*
            * Create a field in a union branch
            */
-          else if ($1 == 0 
+          else if ($1 == 0
                    || $3 == 0)
             {
               $$ = 0;
             }
-          else 
+          else
             {
               AST_Type *tp = $3->compose ($1);
 
@@ -2795,19 +2796,19 @@ element_spec :
         }
         ;
 
-struct_forward_type 
-        : struct_decl 
+struct_forward_type
+        : struct_decl
         {
 // struct_forward_type : struct_decl
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($1, 
+          UTL_ScopedName n ($1,
                             0);
           AST_StructureFwd *d = 0;
 
           /*
            * Create a node representing a forward declaration of a struct.
            */
-          if (s != 0) 
+          if (s != 0)
             {
               d = idl_global->gen ()->create_structure_fwd (&n);
               (void) s->fe_add_structure_fwd (d);
@@ -2815,19 +2816,19 @@ struct_forward_type
         }
         ;
 
-union_forward_type 
-        : union_decl 
+union_forward_type
+        : union_decl
         {
 // union_forward_type : union_decl
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($1, 
+          UTL_ScopedName n ($1,
                             0);
           AST_UnionFwd *u = 0;
 
           /*
            * Create a node representing a forward declaration of a union.
            */
-          if (s != 0) 
+          if (s != 0)
             {
               u = idl_global->gen ()->create_union_fwd (&n);
               (void) s->fe_add_union_fwd (u);
@@ -2845,7 +2846,7 @@ enum_type :
         {
 //      id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($3, 
+          UTL_ScopedName n ($3,
                              0);
           AST_Enum *e = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_EnumIDSeen);
@@ -2854,7 +2855,7 @@ enum_type :
            * Create a node representing an enum and add it to its
            * enclosing scope.
            */
-          if (s != 0) 
+          if (s != 0)
             {
               e = idl_global->gen ()->create_enum (&n,
                                                    s->is_local (),
@@ -2892,7 +2893,7 @@ enum_type :
             {
               $$ = 0;
             }
-          else 
+          else
             {
               $$ = AST_Enum::narrow_from_scope (
                        idl_global->scopes ().top_non_null ()
@@ -2921,7 +2922,7 @@ enumerator :
 // enumerator : IDENTIFIER
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           Identifier id ($1);
-          UTL_ScopedName n (&id, 
+          UTL_ScopedName n (&id,
                             0);
           AST_EnumVal *e = 0;
           AST_Enum *c = 0;
@@ -2930,15 +2931,15 @@ enumerator :
            * Create a node representing one enumerator in an enum
            * Add it to the enclosing scope (the enum scope)
            */
-          if (s != 0 
-              && s->scope_node_type () == AST_Decl::NT_enum) 
+          if (s != 0
+              && s->scope_node_type () == AST_Decl::NT_enum)
             {
               c = AST_Enum::narrow_from_scope (s);
 
               if (c != 0)
                 {
                   e = idl_global->gen ()->create_enum_val (
-                                              c->next_enum_val (), 
+                                              c->next_enum_val (),
                                               &n
                                             );
                 }
@@ -2978,17 +2979,17 @@ sequence_type_spec
           /*
            * Create a node representing a sequence
            */
-          if ($4 == 0 || $4->coerce (AST_Expression::EV_ulong) == 0) 
+          if ($4 == 0 || $4->coerce (AST_Expression::EV_ulong) == 0)
             {
-              idl_global->err ()->coercion_error ($4, 
+              idl_global->err ()->coercion_error ($4,
                                                   AST_Expression::EV_ulong);
               $$ = 0;
-            } 
-          else if ($1 == 0) 
+            }
+          else if ($1 == 0)
             {
               $$ = 0;
-            } 
-          else 
+            }
+          else
             {
               AST_Type *tp = AST_Type::narrow_from_decl ($1);
 
@@ -2996,13 +2997,13 @@ sequence_type_spec
                 {
                   ; // Error will be caught in FE_Declarator.
                 }
-              else 
+              else
                 {
                   Identifier id ("sequence");
                   UTL_ScopedName sn (&id,
                                      0);
 
-                  $$ = 
+                  $$ =
                     idl_global->gen ()->create_sequence (
                                             $4,
                                             tp,
@@ -3036,15 +3037,15 @@ sequence_type_spec
             {
               $$ = 0;
             }
-          else 
+          else
             {
               AST_Type *tp = AST_Type::narrow_from_decl ($1);
-                
+
               if (tp == 0)
                 {
                   ; // Error will be caught in FE_Declarator.
                 }
-              else 
+              else
                 {
                   Identifier id ("sequence");
                   UTL_ScopedName sn (&id,
@@ -3053,7 +3054,7 @@ sequence_type_spec
                   $$ =
                     idl_global->gen ()->create_sequence (
                         idl_global->gen ()->create_expr (
-                                                (ACE_UINT64) 0,
+                                                (idl_uns_long) 0,
                                                 AST_Expression::EV_ulong
                                               ),
                         tp,
@@ -3110,14 +3111,14 @@ string_type_spec
           /*
            * Create a node representing a string.
            */
-          if ($4 == 0 
-              || $4->coerce (AST_Expression::EV_ulong) == 0) 
+          if ($4 == 0
+              || $4->coerce (AST_Expression::EV_ulong) == 0)
             {
-              idl_global->err ()->coercion_error ($4, 
+              idl_global->err ()->coercion_error ($4,
                                                   AST_Expression::EV_ulong);
               $$ = 0;
-            } 
-          else 
+            }
+          else
             {
               $$ = idl_global->gen ()->create_string ($4);
               /*
@@ -3139,7 +3140,7 @@ string_type_spec
            */
           $$ =
             idl_global->gen ()->create_string (
-                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                idl_global->gen ()->create_expr ((idl_uns_long) 0,
                                                  AST_Expression::EV_ulong)
               );
           /*
@@ -3181,14 +3182,14 @@ wstring_type_spec
           /*
            * Create a node representing a string.
            */
-          if ($4 == 0 
-              || $4->coerce (AST_Expression::EV_ulong) == 0) 
+          if ($4 == 0
+              || $4->coerce (AST_Expression::EV_ulong) == 0)
             {
-              idl_global->err ()->coercion_error ($4, 
+              idl_global->err ()->coercion_error ($4,
                                                   AST_Expression::EV_ulong);
               $$ = 0;
-            } 
-          else 
+            }
+          else
             {
               $$ = idl_global->gen ()->create_wstring ($4);
               /*
@@ -3209,7 +3210,7 @@ wstring_type_spec
            */
           $$ =
             idl_global->gen ()->create_wstring (
-                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                idl_global->gen ()->create_expr ((idl_uns_long) 0,
                                                  AST_Expression::EV_ulong)
               );
           /*
@@ -3243,16 +3244,16 @@ array_declarator :
           /*
            * Create a node representing an array.
            */
-          if ($3 != 0) 
+          if ($3 != 0)
             {
               UTL_ScopedName sn ($1,
                                  0);
-              $$ = 
+              $$ =
                 idl_global->gen ()->create_array (
                                         &sn,
-                                        $3->length (), 
-                                        $3, 
-                                        0, 
+                                        $3->length (),
+                                        $3,
+                                        0,
                                         0
                                       );
             }
@@ -3281,7 +3282,7 @@ array_dims
                                             0),
                               1);
             }
-          else 
+          else
             {
               UTL_ExprList *el = 0;
               ACE_NEW_RETURN (el,
@@ -3319,13 +3320,13 @@ array_dim :
            * Array dimensions are expressions which must be coerced to
            * positive integers.
            */
-          if ($3 == 0 
-              || $3->coerce (AST_Expression::EV_ulong) == 0) 
+          if ($3 == 0
+              || $3->coerce (AST_Expression::EV_ulong) == 0)
             {
-              idl_global->err ()->coercion_error ($3, 
+              idl_global->err ()->coercion_error ($3,
                                                   AST_Expression::EV_ulong);
               $$ = 0;
-            } 
+            }
           else
             {
               $$ = $3;
@@ -3333,7 +3334,7 @@ array_dim :
         }
         ;
 
-attribute 
+attribute
         : attribute_readonly
         | attribute_readwrite
         ;
@@ -3372,13 +3373,13 @@ attribute_readonly :
            * Create nodes representing attributes and add them to the
            * enclosing scope.
            */
-          if (s != 0 
-              && $5 != 0 
-              && $7 != 0) 
+          if (s != 0
+              && $5 != 0
+              && $7 != 0)
             {
-              for (UTL_DecllistActiveIterator l ($7); 
-                   !l.is_done (); 
-                   l.next ()) 
+              for (UTL_DecllistActiveIterator l ($7);
+                   !l.is_done ();
+                   l.next ())
                 {
                   d = l.item ();
 
@@ -3394,7 +3395,7 @@ attribute_readonly :
                       continue;
                     }
 
-                  a = 
+                  a =
                     idl_global->gen ()->create_attribute (
                                             I_TRUE,
                                             tp,
@@ -3448,13 +3449,13 @@ attribute_readwrite :
            * Create nodes representing attributes and add them to the
            * enclosing scope.
            */
-          if (s != 0 
-              && $3 != 0 
-              && $5 != 0) 
+          if (s != 0
+              && $3 != 0
+              && $5 != 0)
             {
-              for (UTL_DecllistActiveIterator l ($5); 
-                   !l.is_done (); 
-                   l.next ()) 
+              for (UTL_DecllistActiveIterator l ($5);
+                   !l.is_done ();
+                   l.next ())
                 {
                   d = l.item ();
 
@@ -3470,7 +3471,7 @@ attribute_readwrite :
                       continue;
                     }
 
-                  a = 
+                  a =
                     idl_global->gen ()->create_attribute (
                                             I_FALSE,
                                             tp,
@@ -3505,7 +3506,7 @@ exception :
         {
 //      id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($3, 
+          UTL_ScopedName n ($3,
                             0);
           AST_Exception *e = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_ExceptIDSeen);
@@ -3514,7 +3515,7 @@ exception :
            * Create a node representing an exception and add it to
            * the enclosing scope.
            */
-          if (s != 0) 
+          if (s != 0)
             {
               e = idl_global->gen ()->create_exception (&n,
                                                         s->is_local (),
@@ -3560,7 +3561,7 @@ operation :
 //      IDENTIFIER
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           Identifier id ($4);
-          UTL_ScopedName n (&id, 
+          UTL_ScopedName n (&id,
                             0);
           AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
@@ -3569,28 +3570,28 @@ operation :
            * Create a node representing an operation on an interface
            * and add it to its enclosing scope.
            */
-          if (s != 0 && $2 != 0) 
+          if (s != 0 && $2 != 0)
             {
-              AST_Type *tp = 
+              AST_Type *tp =
                 AST_Type::narrow_from_decl ($2);
 
-              if (tp == 0) 
+              if (tp == 0)
                 {
                   idl_global->err ()->not_a_type ($2);
-                } 
-              else if (tp->node_type () == AST_Decl::NT_except) 
+                }
+              else if (tp->node_type () == AST_Decl::NT_except)
                 {
                   idl_global->err ()->not_a_type ($2);
-                } 
-              else 
+                }
+              else
                 {
                   AST_Decl *d = ScopeAsDecl (s);
                   AST_Decl::NodeType nt = d->node_type ();
-                  idl_bool local = 
-                    s->is_local () 
+                  idl_bool local =
+                    s->is_local ()
                     || nt == AST_Decl::NT_valuetype
                     || nt == AST_Decl::NT_eventtype;
-                  o = 
+                  o =
                     idl_global->gen ()->create_operation (tp,
                                                           $1,
                                                           &n,
@@ -3628,7 +3629,7 @@ operation :
           /*
            * Add exceptions and context to the operation.
            */
-          if (s != 0 && s->scope_node_type () == AST_Decl::NT_op) 
+          if (s != 0 && s->scope_node_type () == AST_Decl::NT_op)
             {
               o = AST_Operation::narrow_from_scope (s);
 
@@ -3683,15 +3684,15 @@ op_type_spec
         ;
 
 init_decl
-        : IDL_FACTORY 
+        : IDL_FACTORY
         {
-// init_decl : IDL_FACTORY 
+// init_decl : IDL_FACTORY
           //@@ PS_FactorySeen?
           idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
         }
-        IDENTIFIER 
+        IDENTIFIER
         {
-//      IDENTIFIER 
+//      IDENTIFIER
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
 
           if (s->is_abstract ())
@@ -3703,10 +3704,10 @@ init_decl
                           ACE_TEXT ("factory construct.\n"),
                           idl_global->filename ()->get_string (),
                           idl_global->lineno ()));
-            }   
-            
-          Identifier id ($3);  
-          UTL_ScopedName n (&id, 
+            }
+
+          Identifier id ($3);
+          UTL_ScopedName n (&id,
                             0);
           AST_Factory *factory = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
@@ -3806,17 +3807,17 @@ in_parameter :
            * Create a node representing an argument to an operation
            * Add it to the enclosing scope (the operation scope).
            */
-          if ($3 != 0 
-              && $5 != 0 && 
-              s != 0) 
+          if ($3 != 0
+              && $5 != 0 &&
+              s != 0)
             {
               AST_Type *tp = $5->compose ($3);
 
-              if (tp != 0) 
+              if (tp != 0)
                 {
                   a = idl_global->gen ()->create_argument (
-                          AST_Argument::dir_IN, 
-                          tp, 
+                          AST_Argument::dir_IN,
+                          tp,
                           (UTL_IdList *) $5->name ()->copy ()
                         );
 
@@ -3885,31 +3886,24 @@ parameter :
            * Create a node representing an argument to an operation
            * Add it to the enclosing scope (the operation scope).
            */
-          if ($3 != 0 
-              && $5 != 0 
-              && s != 0) 
+          if ($3 != 0
+              && $5 != 0
+              && s != 0)
             {
               AST_Type *tp = $5->compose ($3);
 
-              if (tp != 0) 
+              if (tp != 0)
                 {
                   if (!s->is_local () && tp->is_local ())
                     {
-                      ACE_DEBUG ((LM_DEBUG,
-                                  ACE_TEXT ("error in %s line %d\n"),
-                                  idl_global->filename ()->get_string (),
-                                  idl_global->lineno ()));
-                      ACE_DEBUG ((LM_DEBUG,
-                                  ACE_TEXT ("Cannot use a local type as an ")
-                                  ACE_TEXT ("argument of a remote ")
-                                  ACE_TEXT ("operation\n")));
+                      idl_global->err ()->local_remote_mismatch (tp, s);
                     }
                   else
                     {
-                      a = 
+                      a =
                         idl_global->gen ()->create_argument (
-                            $1, 
-                            tp, 
+                            $1,
+                            tp,
                             (UTL_IdList *) $5->name ()->copy ()
                           );
                       (void) s->fe_add_argument (a);
@@ -3923,7 +3917,7 @@ param_type_spec
         : base_type_spec
         {
 // param_type_spec : base_type_spec
-          $$ = 
+          $$ =
             idl_global->scopes ().bottom ()->lookup_primitive_type (
                                                  $1
                                                );
@@ -3940,7 +3934,7 @@ param_type_spec
 
           if (s != 0)
             {
-              d = s->lookup_by_name ($1, 
+              d = s->lookup_by_name ($1,
                                      I_TRUE);
             }
 
@@ -3950,9 +3944,10 @@ param_type_spec
             }
           else
             {
+              d->last_referenced_as ($1);
               AST_Decl::NodeType nt = d->node_type ();
 
-              if (nt == AST_Decl::NT_struct_fwd 
+              if (nt == AST_Decl::NT_struct_fwd
                   || nt == AST_Decl::NT_union_fwd)
                 {
                   if (! AST_Type::narrow_from_decl (d)->is_defined ())
@@ -4117,7 +4112,7 @@ string_literals
                                            0),
                               1);
             }
-          else 
+          else
             {
               UTL_StrList *sl = 0;
               ACE_NEW_RETURN (sl,
@@ -4140,7 +4135,7 @@ typeid_dcl
         {
 // typeid_dcl : IDL_TYPEID scoped_name IDL_STRING_LITERAL
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          AST_Decl *d = s->lookup_by_name ($2, 
+          AST_Decl *d = s->lookup_by_name ($2,
                                            I_TRUE);
 
           if (d == 0)
@@ -4169,7 +4164,7 @@ typeprefix_dcl
           // of this opening would never get checked or set.
           if (d->name ()->compare ($2) != 0)
             {
-              d = s->lookup_by_name ($2, 
+              d = s->lookup_by_name ($2,
                                      I_TRUE);
             }
 
@@ -4186,18 +4181,18 @@ typeprefix_dcl
         }
         ;
 
-component 
+component
         : component_decl
         | component_forward_decl
         ;
 
 component_forward_decl :
-        IDL_COMPONENT 
+        IDL_COMPONENT
         id
         {
 // component_forward_decl : IDL_COMPONENT id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           AST_ComponentFwd *f = 0;
           idl_global->set_parse_state (
@@ -4208,7 +4203,7 @@ component_forward_decl :
            * Create a node representing a forward declaration of a
            * component. Store it in the enclosing scope.
            */
-          if (s != 0) 
+          if (s != 0)
             {
               f = idl_global->gen ()->create_component_fwd (&n);
               (void) s->fe_add_component_fwd (f);
@@ -4217,18 +4212,18 @@ component_forward_decl :
         ;
 
 component_decl :
-        component_header 
+        component_header
         {
-// component_decl : component_header          
+// component_decl : component_header
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Component *c = 0;
 
           /*
            * Make a new component node and add it to the enclosing scope.
            */
-          if (s != 0 && $1 != 0) 
+          if (s != 0 && $1 != 0)
             {
-              c = 
+              c =
                 idl_global->gen ()->create_component (
                                         $1->name (),
                                         $1->base_component (),
@@ -4238,7 +4233,7 @@ component_decl :
                                         $1->n_supports_flat ()
                                       );
               AST_Interface *i = AST_Interface::narrow_from_decl (c);
-              AST_Interface::fwd_redefinition_helper (i, 
+              AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the component to its definition scope.
@@ -4257,7 +4252,7 @@ component_decl :
            */
           idl_global->scopes ().push (c);
         }
-        '{' 
+        '{'
         {
 //      '{'
           idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen);
@@ -4280,13 +4275,13 @@ component_decl :
         ;
 
 component_header :
-        IDL_COMPONENT 
-        id 
+        IDL_COMPONENT
+        id
         {
 //      id
           idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen);
         }
-        component_inheritance_spec 
+        component_inheritance_spec
         {
 //      component_inheritance_spec
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
@@ -4300,7 +4295,7 @@ component_header :
            * Create an AST representation of the information in the header
            * part of a component.
            */
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           ACE_NEW_RETURN ($$,
                           FE_ComponentHeader (&n,
@@ -4311,8 +4306,8 @@ component_header :
         }
         ;
 
-component_inheritance_spec 
-        : ':' 
+component_inheritance_spec
+        : ':'
         {
 // component_inheritance_spec : ':'
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
@@ -4329,12 +4324,12 @@ component_inheritance_spec
         }
         ;
 
-component_exports 
+component_exports
         : component_exports component_export
         | /* EMPTY */
         ;
 
-component_export 
+component_export
         : provides_decl
         {
 // component_export : provides_decl
@@ -4398,46 +4393,47 @@ component_export
         ;
 
 provides_decl :
-        IDL_PROVIDES 
-        interface_type 
+        IDL_PROVIDES
+        interface_type
         id
         {
 // provides_decl : IDL_PROVIDES interface_type id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Component *c = AST_Component::narrow_from_scope (s);
-          
+
           if (c != 0)
             {
-              AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist,
+              AST_Decl *d = s->lookup_by_name (yyvsp[-1].idlist,
                                                I_TRUE);
               if (d == 0)
                 {
-                  idl_global->err ()->lookup_error (tao_yyvsp[-1].idlist);
+                  idl_global->err ()->lookup_error (yyvsp[-1].idlist);
+                  break;
                 }
               else if (d->node_type () != AST_Decl::NT_interface)
                 {
-                  if (ACE_OS::strcmp (d->local_name ()->get_string (), 
+                  // Nothing else but CORBA::Object can have
+                  // this identifier.
+                  if (ACE_OS::strcmp (d->local_name ()->get_string (),
                                       "Object")
                         != 0)
                     {
                       idl_global->err ()->interface_expected (d);
+                      break;
                     }
                 }
-              else
-                {
-                  AST_Type *interface_type =
-                    AST_Interface::narrow_from_decl (d);
+              AST_Type *interface_type =
+                AST_Type::narrow_from_decl (d);
 
-                  AST_Component::port_description pd;
-                  pd.id = tao_yyvsp[0].idval;
-                  pd.impl = interface_type;
-                  c->provides ().enqueue_tail (pd);
-                }
+              AST_Component::port_description pd;
+              pd.id = yyvsp[0].idval;
+              pd.impl = interface_type;
+              c->provides ().enqueue_tail (pd);
             }
         }
         ;
 
-interface_type 
+interface_type
         : scoped_name
         {
 // interface_type : scoped_name
@@ -4481,9 +4477,9 @@ interface_type
         ;
 
 uses_decl :
-        IDL_USES 
-        opt_multiple 
-        interface_type 
+        IDL_USES
+        opt_multiple
+        interface_type
         id
         {
 // uses_decl : IDL_USES opt_multiple interface_type id
@@ -4493,29 +4489,38 @@ uses_decl :
 
           if (d == 0)
             {
-              idl_global->err ()->lookup_error (tao_yyvsp[-1].idlist);
+              idl_global->err ()->lookup_error (yyvsp[-1].idlist);
+              break;
             }
           else if (d->node_type () != AST_Decl::NT_interface)
             {
-              if (ACE_OS::strcmp (d->local_name ()->get_string (), 
+              if (ACE_OS::strcmp (d->local_name ()->get_string (),
                                   "Object")
                     != 0)
                 {
                   idl_global->err ()->interface_expected (d);
+                  break;
                 }
             }
-          else
+
+          AST_Type *interface_type = AST_Type::narrow_from_decl (d);
+          AST_Component *c = AST_Component::narrow_from_scope (s);
+
+          if (c != 0)
             {
-              AST_Type *interface_type = AST_Type::narrow_from_decl (d);
-              AST_Component *c = AST_Component::narrow_from_scope (s);
-          
-              if (c != 0)
+              AST_Component::port_description ud;
+              ud.id = $4;
+              ud.impl = interface_type;
+              ud.is_multiple = $2;
+              c->uses ().enqueue_tail (ud);
+
+              if (ud.is_multiple == I_TRUE
+                  && !idl_global->using_ifr_backend ())
                 {
-                  AST_Component::port_description ud;
-                  ud.id = $4;
-                  ud.impl = interface_type;
-                  ud.is_multiple = $2;
-                  c->uses ().enqueue_tail (ud);
+                  // These datatypes must be created in the
+                  // front end so they can be looked up
+                  // when compiling the generated executor IDL.
+                  idl_global->create_uses_multiple_stuff (c, ud);
                 }
             }
         }
@@ -4535,8 +4540,8 @@ opt_multiple
         ;
 
 emits_decl :
-        IDL_EMITS 
-        scoped_name 
+        IDL_EMITS
+        scoped_name
         id
         {
 // emits_decl : IDL_EMITS scoped_name id
@@ -4556,7 +4561,7 @@ emits_decl :
             {
               AST_Type *event_type = AST_Type::narrow_from_decl (d);
               AST_Component *c = AST_Component::narrow_from_scope (s);
-          
+
               if (c != 0)
                 {
                   AST_Component::port_description pd;
@@ -4569,8 +4574,8 @@ emits_decl :
         ;
 
 publishes_decl :
-        IDL_PUBLISHES 
-        scoped_name 
+        IDL_PUBLISHES
+        scoped_name
         id
         {
 // publishes_decl : IDL_PUBLISHES scoped_name id
@@ -4590,7 +4595,7 @@ publishes_decl :
             {
               AST_Type *event_type = AST_Type::narrow_from_decl (d);
               AST_Component *c = AST_Component::narrow_from_scope (s);
-          
+
               if (c != 0)
                 {
                   AST_Component::port_description pd;
@@ -4603,8 +4608,8 @@ publishes_decl :
         ;
 
 consumes_decl :
-        IDL_CONSUMES 
-        scoped_name 
+        IDL_CONSUMES
+        scoped_name
         id
         {
 // consumes_decl : IDL_CONSUMES scoped_name id
@@ -4624,7 +4629,7 @@ consumes_decl :
             {
               AST_Type *event_type = AST_Type::narrow_from_decl (d);
               AST_Component *c = AST_Component::narrow_from_scope (s);
-          
+
               if (c != 0)
                 {
                   AST_Component::port_description pd;
@@ -4637,18 +4642,18 @@ consumes_decl :
         ;
 
 home_decl :
-        home_header 
+        home_header
         {
-// home_decl : home_header 
+// home_decl : home_header
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Home *h = 0;
 
           /*
            * Make a new home node and add it to the enclosing scope.
            */
-          if (s != 0 && $1 != 0) 
+          if (s != 0 && $1 != 0)
             {
-              h = 
+              h =
                 idl_global->gen ()->create_home (
                                         $1->name (),
                                         $1->base_home (),
@@ -4686,35 +4691,35 @@ home_decl :
         ;
 
 home_header :
-        IDL_HOME 
+        IDL_HOME
         {
 // home_header : IDL_HOME
-          idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen);    
+          idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen);
         }
-        id 
+        id
         {
 //      id
-          idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen);    
+          idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen);
         }
-        home_inheritance_spec 
+        home_inheritance_spec
         {
 //      home_inheritance_spec
-          idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);    
+          idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
         }
-        supports_spec 
+        supports_spec
         {
 //      supports_spec
-          idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);    
+          idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
         }
-        IDL_MANAGES 
+        IDL_MANAGES
         {
 //      IDL_MANAGES
-          idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen);    
+          idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen);
         }
-        scoped_name 
+        scoped_name
         {
 //      scoped_name
-          idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen);    
+          idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen);
         }
         primary_key_spec
         {
@@ -4725,7 +4730,7 @@ home_header :
            * Create an AST representation of the information in the header
            * part of a component home.
            */
-          UTL_ScopedName n ($3, 
+          UTL_ScopedName n ($3,
                             0);
           ACE_NEW_RETURN ($$,
                           FE_HomeHeader (&n,
@@ -4737,11 +4742,11 @@ home_header :
         }
         ;
 
-home_inheritance_spec 
+home_inheritance_spec
         : ':'
         {
-// home_inheritance_spec ':' 
-          idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);    
+// home_inheritance_spec ':'
+          idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
         }
           scoped_name
         {
@@ -4755,7 +4760,7 @@ home_inheritance_spec
         }
         ;
 
-primary_key_spec 
+primary_key_spec
         : IDL_PRIMARYKEY
           scoped_name
         {
@@ -4787,12 +4792,12 @@ home_body :
         }
         ;
 
-home_exports 
+home_exports
         : home_exports home_export
         | /* EMPTY */
         ;
 
-home_export 
+home_export
         : export
         | factory_decl
         {
@@ -4822,7 +4827,7 @@ factory_decl :
         {
 // factory_decl : IDL_FACTORY id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
@@ -4831,10 +4836,10 @@ factory_decl :
            * Create a node representing a factory operation
            * and add it to the enclosing scope.
            */
-          if (s != 0) 
+          if (s != 0)
             {
               AST_Home *home = AST_Home::narrow_from_scope (s);
-              o = 
+              o =
                 idl_global->gen ()->create_operation (
                                         home->managed_component (),
                                         AST_Operation::OP_noflags,
@@ -4884,14 +4889,14 @@ factory_decl :
           idl_global->scopes ().pop ();
         }
         ;
-        
+
 finder_decl :
         IDL_FINDER
         id
         {
 // finder_decl : IDL_FINDER id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
@@ -4900,10 +4905,10 @@ finder_decl :
            * Create a node representing a finder operation
            * and add it to the enclosing scope.
            */
-          if (s != 0) 
+          if (s != 0)
             {
               AST_Home *home = AST_Home::narrow_from_scope (s);
-              o = 
+              o =
                 idl_global->gen ()->create_operation (
                                         home->managed_component (),
                                         AST_Operation::OP_noflags,
@@ -4953,7 +4958,7 @@ finder_decl :
           idl_global->scopes ().pop ();
         }
         ;
-        
+
 event
         : event_decl
         | event_abs_decl
@@ -4971,7 +4976,7 @@ event_concrete_forward_decl :
         {
 // event_concrete_forward_decl : IDL_EVENTTYPE id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($2, 
+          UTL_ScopedName n ($2,
                             0);
           AST_EventTypeFwd *f = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeForwardSeen);
@@ -4980,15 +4985,15 @@ event_concrete_forward_decl :
            * Create a node representing a forward declaration of an
            * eventtype. Store it in the enclosing scope
            */
-          if (s != 0) 
+          if (s != 0)
             {
               f = idl_global->gen ()->create_eventtype_fwd (&n,
                                                             I_FALSE);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
-        ;        
-        
+        ;
+
 event_abs_forward_decl :
         IDL_ABSTRACT
         IDL_EVENTTYPE
@@ -4996,7 +5001,7 @@ event_abs_forward_decl :
         {
 // event_abs_forward_decl : IDL_ABSTRACT IDL_EVENTTYPE id
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-          UTL_ScopedName n ($3, 
+          UTL_ScopedName n ($3,
                             0);
           AST_EventTypeFwd *f = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeForwardSeen);
@@ -5005,7 +5010,7 @@ event_abs_forward_decl :
            * Create a node representing a forward declaration of an
            * eventtype. Store it in the enclosing scope
            */
-          if (s != 0) 
+          if (s != 0)
             {
               f = idl_global->gen ()->create_eventtype_fwd (&n,
                                                             I_TRUE);
@@ -5023,11 +5028,11 @@ event_abs_decl :
           AST_EventType *e = 0;
           AST_Interface *i = 0;
 
-          if (s != 0 && $1 != 0) 
+          if (s != 0 && $1 != 0)
             {
               UTL_ScopedName sn ($1,
                                  0);
-              e = 
+              e =
                 idl_global->gen ()->create_eventtype (
                     &sn,
                     $2->inherits (),
@@ -5043,7 +5048,7 @@ event_abs_decl :
                     I_FALSE
                   );
               i = AST_Interface::narrow_from_decl (e);
-              AST_Interface::fwd_redefinition_helper (i, 
+              AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the eventetype to its definition scope
@@ -5108,7 +5113,7 @@ event_custom_header :
         }
         ;
 
-event_plain_header : 
+event_plain_header :
         IDL_EVENTTYPE
         id
         {
@@ -5117,9 +5122,9 @@ event_plain_header :
 
           $$ = $2;
         }
-        ;   
-        
-event_rest_of_header :     
+        ;
+
+event_rest_of_header :
         inheritance_spec
         {
 // event_rest_of_header : inheritance_spec
@@ -5159,11 +5164,11 @@ event_decl :
           AST_EventType *e = 0;
           AST_Interface *i = 0;
 
-          if (s != 0 && $1 != 0) 
+          if (s != 0 && $1 != 0)
             {
               UTL_ScopedName sn ($1,
                                  0);
-              e = 
+              e =
                 idl_global->gen ()->create_eventtype (
                     &sn,
                     $2->inherits (),
@@ -5179,7 +5184,7 @@ event_decl :
                     I_FALSE
                   );
               i = AST_Interface::narrow_from_decl (e);
-              AST_Interface::fwd_redefinition_helper (i, 
+              AST_Interface::fwd_redefinition_helper (i,
                                                       s);
               /*
                * Add the eventetype to its definition scope
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 38ac79e950e..4be1052c21a 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -1,13 +1,15 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Id: lex.yy.cpp,v 1.2 2003/02/10 16:17:07 sm Exp $
+ * $Id$
  */
 
 #define FLEX_SCANNER
 #define TAO_YY_FLEX_MAJOR_VERSION 2
 #define TAO_YY_FLEX_MINOR_VERSION 5
 
+#include "ace/os_include/os_stdio.h"
+#include "ace/os_include/os_ctype.h"
 
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -20,8 +22,6 @@
 
 #ifdef __cplusplus
 
-#include "ace/os_include/os_stdio.h"
-#include "ace/os_include/os_ctype.h"
 
 /* Use prototypes in function declarations. */
 #define TAO_YY_USE_PROTOS
@@ -29,15 +29,15 @@
 /* The "const" storage-class-modifier is valid. */
 #define TAO_YY_USE_CONST
 
-#else   /* ! __cplusplus */
+#else        /* ! __cplusplus */
 
-#ifdef __STDC__
+#if __STDC__
 
 #define TAO_YY_USE_PROTOS
 #define TAO_YY_USE_CONST
 
-#endif  /* __STDC__ */
-#endif  /* ! __cplusplus */
+#endif        /* __STDC__ */
+#endif        /* ! __cplusplus */
 
 #ifdef __TURBOC__
  #pragma warn -rch
@@ -106,10 +106,10 @@ extern FILE *tao_yyin, *tao_yyout;
  * int a single C statement (which needs a semi-colon terminator).  This
  * avoids problems with code like:
  *
- *      if ( condition_holds )
- *              tao_yyless( 5 );
- *      else
- *              do_something_else();
+ *         if ( condition_holds )
+ *                tao_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
@@ -142,8 +142,8 @@ struct tao_yy_buffer_state
         {
         FILE *tao_yy_input_file;
 
-        char *tao_yy_ch_buf;            /* input buffer */
-        char *tao_yy_buf_pos;           /* current position in input buffer */
+        char *tao_yy_ch_buf;                /* input buffer */
+        char *tao_yy_buf_pos;                /* current position in input buffer */
 
         /* Size of input buffer in bytes, not including room for EOB
          * characters.
@@ -163,7 +163,7 @@ struct tao_yy_buffer_state
 
         /* 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
+         * instead of static_cast<int> (fread()), to make sure we stop fetching input after
          * each newline.
          */
         int tao_yy_is_interactive;
@@ -207,15 +207,15 @@ static TAO_YY_BUFFER_STATE tao_yy_current_buffer = 0;
 /* tao_yy_hold_char holds the character lost when tao_yytext is formed. */
 static char tao_yy_hold_char;
 
-static int tao_yy_n_chars;              /* number of characters read into tao_yy_ch_buf */
+static int tao_yy_n_chars;                /* number of characters read into tao_yy_ch_buf */
 
 
 int tao_yyleng;
 
 /* Points to current character in buffer. */
 static char *tao_yy_c_buf_p = (char *) 0;
-static int tao_yy_init = 1;             /* whether we need to initialize */
-static int tao_yy_start = 0;    /* start state number */
+static int tao_yy_init = 1;                /* whether we need to initialize */
+static int tao_yy_start = 0;        /* start state number */
 
 /* Flag which is used to allow tao_yywrap()'s to do buffer switches
  * instead of setting up a fresh tao_yyin.  A bit of a hack ...
@@ -648,7 +648,6 @@ static tao_yyconst short int tao_yy_nxt[1105] =
       550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
 
       550,  550,  550,  550
-
     } ;
 
 static tao_yyconst short int tao_yy_chk[1105] =
@@ -775,7 +774,6 @@ static tao_yyconst short int tao_yy_chk[1105] =
       550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
 
       550,  550,  550,  550
-
     } ;
 
 static tao_yy_state_type tao_yy_last_accepting_state;
@@ -795,7 +793,7 @@ static char *tao_yy_last_accepting_cpos;
 char tao_yytext[TAO_YYLMAX];
 char *tao_yytext_ptr;
 #define INITIAL 0
-/*  $Id: idl.ll,v 1.70 2002/08/26 19:47:28 parsons Exp $
+/*  $Id: idl.ll,v 1.93 2004/12/14 23:11:22 gmaxey Exp $
 
 COPYRIGHT
 
@@ -863,6 +861,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * idl.ll - Lexical scanner for IDL 1.1
  */
 
+#include "idl_uns_long.h"
 #include "utl_strlist.h"
 #include "utl_exprlist.h"
 #include "utl_labellist.h"
@@ -886,27 +885,14 @@ static ACE_CDR::WChar   idl_wchar_escape_reader (char *);
 static char             idl_escape_reader (char *);
 static double           idl_atof (char *);
 static long             idl_atoi (char *, long);
-static ACE_UINT64       idl_atoui (char *, long);
+static idl_uns_long     idl_atoui (char *, long);
 static void             idl_parse_line_and_file (char *);
 static void             idl_store_pragma (char *);
 static char *           idl_get_pragma_string (char *);
 static idl_bool         idl_valid_version (char *);
 static AST_Decl *       idl_find_node (char *);
 
-#if 0 /* defined (HPUX) */
-// HPUX has tao_yytext typed to unsigned char *. We make sure here that
-// we'll always use char * static char* __tao_yytext = (char*) tao_yytext;
-// NOTE: This will not work under flex(1) were tao_yytext is not a fixed
-// buffer, but a dynamically allocated one. This function should do
-// the trick for us.
-inline char *__tao_yytext()
-{
-  return (char *) tao_yytext;
-}
-#define ace_tao_yytext __tao_yytext()
-#else
 #define ace_tao_yytext tao_yytext
-#endif /* 0 */
 
 /* SO we don't choke on files that use \r\n */
 #define TAO_YY_NEVER_INTERACTIVE 1
@@ -943,7 +929,7 @@ static int input TAO_YY_PROTO(( void ));
 #endif
 #endif
 
-#ifdef TAO_YY_STACK_USED
+#if TAO_YY_STACK_USED
 static int tao_yy_start_stack_ptr = 0;
 static int tao_yy_start_stack_depth = 0;
 static int *tao_yy_start_stack = 0;
@@ -966,7 +952,7 @@ static int tao_yy_top_state TAO_YY_PROTO(( void ));
 #ifdef TAO_YY_MALLOC_DECL
 TAO_YY_MALLOC_DECL
 #else
-#ifdef __STDC__
+#if __STDC__
 #ifndef __cplusplus
 #endif
 #else
@@ -1008,8 +994,7 @@ TAO_YY_MALLOC_DECL
                         TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
                 result = n; \
                 } \
-        else if ( ((result = static_cast<int> ( \
-                                  fread( buf, 1, max_size, tao_yyin ))) == 0) \
+        else if ( ((result = static_cast<int> (fread( buf, 1, max_size, tao_yyin ))) == 0) \
                   && ferror( tao_yyin ) ) \
                 TAO_YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
@@ -1075,7 +1060,7 @@ TAO_YY_DECL
 #endif
 
                 if ( ! tao_yy_start )
-                        tao_yy_start = 1;       /* first start state */
+                        tao_yy_start = 1;        /* first start state */
 
                 if ( ! tao_yyin )
                         tao_yyin = stdin;
@@ -1090,7 +1075,7 @@ TAO_YY_DECL
                 tao_yy_load_buffer_state();
                 }
 
-        while ( 1 )             /* loops until end-of-file is reached */
+        while ( 1 )                /* loops until end-of-file is reached */
                 {
                 tao_yy_cp = tao_yy_c_buf_p;
 
@@ -1122,7 +1107,7 @@ tao_yy_match:
                         tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
                         ++tao_yy_cp;
                         }
-                while ( tao_yy_current_state != 550 );
+                while ( tao_yy_base[tao_yy_current_state] != 1045 );
 
 tao_yy_find_action:
                 tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -1136,7 +1121,7 @@ tao_yy_find_action:
                 TAO_YY_DO_BEFORE_ACTION;
 
 
-do_action:      /* This label is used only to access EOF actions. */
+do_action:        /* This label is used only to access EOF actions. */
 
 
                 switch ( tao_yy_act )
@@ -1429,7 +1414,6 @@ TAO_YY_RULE_SETUP
 
   TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
   const TAO_IDL_CPP_Keyword_Entry *entry = 0;
-
   if (!idl_global->preserve_cpp_keywords())
     {
       // This check will ensure that escaped C++ keywords will be
@@ -1655,7 +1639,7 @@ TAO_YY_RULE_SETUP
                       if (next == '/')
                         break;
                       else
-                        tao_yyunput(c, NULL);
+                        tao_yyunput(c, 0);
                       if (c == '\n')
                         idl_global->set_lineno(idl_global->lineno() + 1);
                     }
@@ -1675,7 +1659,7 @@ TAO_YY_RULE_SETUP
 case 103:
 TAO_YY_RULE_SETUP
 return ace_tao_yytext [0];
-        break;
+        TAO_YY_BREAK
 case 104:
 TAO_YY_RULE_SETUP
 TAO_YY_ECHO;
@@ -1816,9 +1800,9 @@ case TAO_YY_STATE_EOF(INITIAL):
 /* tao_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
+ *        EOB_ACT_LAST_MATCH -
+ *        EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *        EOB_ACT_END_OF_FILE - end of file
  */
 
 static int tao_yy_get_next_buffer()
@@ -1985,7 +1969,7 @@ static tao_yy_state_type tao_yy_get_previous_state()
 /* tao_yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
- *      next_state = tao_yy_try_NUL_trans( current_state );
+ *        next_state = tao_yy_try_NUL_trans( current_state );
  */
 
 #ifdef TAO_YY_USE_PROTOS
@@ -2059,9 +2043,10 @@ register char *tao_yy_bp;
         tao_yy_hold_char = *tao_yy_cp;
         tao_yy_c_buf_p = tao_yy_cp;
         }
-#endif  /* ifndef TAO_YY_NO_UNPUT */
+#endif        /* ifndef TAO_YY_NO_UNPUT */
 
 
+#ifndef TAO_YY_NO_INPUT
 #ifdef __cplusplus
 static int tao_yyinput()
 #else
@@ -2126,15 +2111,15 @@ static int input()
                         }
                 }
 
-        c = *(unsigned char *) tao_yy_c_buf_p;  /* cast for 8-bit char's */
-        *tao_yy_c_buf_p = '\0'; /* preserve tao_yytext */
+        c = *(unsigned char *) tao_yy_c_buf_p;        /* cast for 8-bit char's */
+        *tao_yy_c_buf_p = '\0';        /* preserve tao_yytext */
         tao_yy_hold_char = *++tao_yy_c_buf_p;
 
         tao_yy_current_buffer->tao_yy_at_bol = (c == '\n');
 
         return c;
         }
-
+#endif /* TAO_YY_NO_INPUT */
 
 #ifdef TAO_YY_USE_PROTOS
 void tao_yyrestart( FILE *input_file )
@@ -2245,11 +2230,6 @@ TAO_YY_BUFFER_STATE b;
         }
 
 
-#ifndef TAO_YY_ALWAYS_INTERACTIVE
-#ifndef TAO_YY_NEVER_INTERACTIVE
-extern int isatty TAO_YY_PROTO(( int ));
-#endif
-#endif
 
 #ifdef TAO_YY_USE_PROTOS
 void tao_yy_init_buffer( TAO_YY_BUFFER_STATE b, FILE *file )
@@ -2266,10 +2246,10 @@ FILE *file;
         b->tao_yy_input_file = file;
         b->tao_yy_fill_buffer = 1;
 
-#ifdef TAO_YY_ALWAYS_INTERACTIVE
+#if TAO_YY_ALWAYS_INTERACTIVE
         b->tao_yy_is_interactive = 1;
 #else
-#ifdef TAO_YY_NEVER_INTERACTIVE
+#if TAO_YY_NEVER_INTERACTIVE
         b->tao_yy_is_interactive = 0;
 #else
         b->tao_yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
@@ -2329,7 +2309,7 @@ tao_yy_size_t size;
         if ( ! b )
                 TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_buffer()" );
 
-        b->tao_yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
+        b->tao_yy_buf_size = size - 2;        /* "- 2" to take care of EOB's */
         b->tao_yy_buf_pos = b->tao_yy_ch_buf = base;
         b->tao_yy_is_our_buffer = 0;
         b->tao_yy_input_file = 0;
@@ -2560,7 +2540,7 @@ void *ptr;
         free( ptr );
         }
 
-#ifdef TAO_YY_MAIN
+#if TAO_YY_MAIN
 int main()
         {
         tao_yylex();
@@ -2648,10 +2628,10 @@ idl_parse_line_and_file (char *buf)
         {
           if (h[j] == '\\' && h[j + 1] == '\\')
             {
-                    j++;
+              j++;
             }
 
-                h[i] = h[j];
+            h[i] = h[j];
         }
 
       h[i] = '\0';
@@ -2925,10 +2905,10 @@ idl_atoi(char *s, long b)
 /*
  * idl_atoui - Convert a string of digits into an unsigned integer according to base b
  */
-static ACE_UINT64
+static idl_uns_long
 idl_atoui(char *s, long b)
 {
-  ACE_UINT64    r = 0;
+  idl_uns_long  r = 0;
 
   if (b == 8 && *s == '0')
     {
@@ -3058,66 +3038,66 @@ idl_escape_reader(
   switch (str[1])
   {
     case 'n':
-            return '\n';
+      return '\n';
     case 't':
-            return '\t';
+      return '\t';
     case 'v':
-            return '\v';
+      return '\v';
     case 'b':
-            return '\b';
+      return '\b';
     case 'r':
-            return '\r';
+      return '\r';
     case 'f':
-            return '\f';
+      return '\f';
     case 'a':
-            return '\a';
+      return '\a';
     case '\\':
-            return '\\';
+      return '\\';
     case '\?':
-            return '?';
+      return '?';
     case '\'':
-            return '\'';
+      return '\'';
     case '"':
-            return '"';
+      return '"';
     case 'x':
-            {
-              int i;
+      {
+        int i;
 
-              // hex value
-              for (i = 2; str[i] != '\0' && isxdigit(str[i]); ++i)
+        // hex value
+        for (i = 2; str[i] != '\0' && isxdigit (str[i]); ++i)
           {
-                        continue;
-                }
-
-              char save = str[i];
-              str[i] = '\0';
-              char out = (char)idl_atoui(&str[2], 16);
-              str[i] = save;
-              return out;
-            }
-            ACE_NOTREACHED (break;)
+            continue;
+          }
+
+        char save = str[i];
+        str[i] = '\0';
+        char out = (char)idl_atoui(&str[2], 16);
+        str[i] = save;
+        return out;
+      }
+      ACE_NOTREACHED (break;)
     default:
-            // check for octal value
-            if (str[1] >= '0' && str[1] <= '7')
+      // check for octal value
+      if (str[1] >= '0' && str[1] <= '7')
         {
-                int i;
+          int i;
 
-                for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i)
+          for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i)
             {
-                          continue;
-                  }
+              continue;
+            }
 
-                char save = str[i];
-                str[i] = '\0';
-                char out = (char)idl_atoui(&str[1], 8);
-                str[i] = save;
-                return out;
-              }
+          char save = str[i];
+          str[i] = '\0';
+          char out = (char)idl_atoui(&str[1], 8);
+          str[i] = save;
+          return out;
+        }
       else
         {
-                return str[1] - 'a';
-              }
-            ACE_NOTREACHED  (break;)
+          return str[1] - 'a';
+        }
+      ACE_NOTREACHED  (break;)
   }
 }
 /*
@@ -3137,7 +3117,6 @@ idl_wchar_escape_reader (char *str)
     {
       continue;
     }
-
   char save = str[i];
   str[i] = '\0';
   ACE_CDR::WChar out = (ACE_CDR::WChar) idl_atoui (&str[2], 16);
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
index 652a0a770c8..52e738c4bb0 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
@@ -1,3989 +1,98 @@
---- lex.yy.cpp.new	2004-08-27 21:34:13.000000000 -0500
-+++ lex.yy.cpp	2004-08-27 21:53:40.000000000 -0500
-@@ -1,369 +1,290 @@
--lex -L -t fe/idl.ll
--
--#line 3 "<stdout>"
--
--#define  YY_INT_ALIGNED short int
--
- /* A lexical scanner generated by flex */
- 
-+/* Scanner skeleton version:
-+ * $Id$
-+ */
-+
- #define FLEX_SCANNER
--#define YY_FLEX_MAJOR_VERSION 2
--#define YY_FLEX_MINOR_VERSION 5
--#define YY_FLEX_SUBMINOR_VERSION 31
--#if YY_FLEX_SUBMINOR_VERSION > 0
--#define FLEX_BETA
--#endif
-+#define TAO_YY_FLEX_MAJOR_VERSION 2
-+#define TAO_YY_FLEX_MINOR_VERSION 5
- 
--/* First, we deal with  platform-specific or compiler-specific issues. */
- 
--/* begin standard C headers. */
--#include <stdio.h>
--#include <string.h>
--#include <errno.h>
--#include <stdlib.h>
- 
--/* end standard C headers. */
-+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-+#ifdef c_plusplus
-+#ifndef __cplusplus
-+#define __cplusplus
-+#endif
-+#endif
- 
--/* flex integer type definitions */
- 
--#ifndef FLEXINT_H
--#define FLEXINT_H
-+#ifdef __cplusplus
- 
--/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-+#include "ace/os_include/os_stdio.h"
-+#include "ace/os_include/os_ctype.h"
- 
--#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
--#include <inttypes.h>
--typedef int8_t flex_int8_t;
--typedef uint8_t flex_uint8_t;
--typedef int16_t flex_int16_t;
--typedef uint16_t flex_uint16_t;
--typedef int32_t flex_int32_t;
--typedef uint32_t flex_uint32_t;
--#else
--typedef signed char flex_int8_t;
--typedef short int flex_int16_t;
--typedef int flex_int32_t;
--typedef unsigned char flex_uint8_t; 
--typedef unsigned short int flex_uint16_t;
--typedef unsigned int flex_uint32_t;
--#endif /* ! C99 */
-+/* Use prototypes in function declarations. */
-+#define TAO_YY_USE_PROTOS
- 
--/* Limits of integral types. */
--#ifndef INT8_MIN
--#define INT8_MIN               (-128)
--#endif
--#ifndef INT16_MIN
--#define INT16_MIN              (-32767-1)
--#endif
--#ifndef INT32_MIN
--#define INT32_MIN              (-2147483647-1)
--#endif
--#ifndef INT8_MAX
--#define INT8_MAX               (127)
--#endif
--#ifndef INT16_MAX
--#define INT16_MAX              (32767)
--#endif
--#ifndef INT32_MAX
--#define INT32_MAX              (2147483647)
--#endif
--#ifndef UINT8_MAX
--#define UINT8_MAX              (255U)
--#endif
--#ifndef UINT16_MAX
--#define UINT16_MAX             (65535U)
--#endif
--#ifndef UINT32_MAX
--#define UINT32_MAX             (4294967295U)
--#endif
-+/* The "const" storage-class-modifier is valid. */
-+#define TAO_YY_USE_CONST
- 
--#endif /* ! FLEXINT_H */
-+#else   /* ! __cplusplus */
- 
--#ifdef __cplusplus
-+#ifdef __STDC__
- 
--/* The "const" storage-class-modifier is valid. */
--#define YY_USE_CONST
-+#define TAO_YY_USE_PROTOS
-+#define TAO_YY_USE_CONST
- 
--#else	/* ! __cplusplus */
-+#endif  /* __STDC__ */
-+#endif  /* ! __cplusplus */
- 
--#if __STDC__
-+#ifdef __TURBOC__
-+ #pragma warn -rch
-+ #pragma warn -use
-+#define TAO_YY_USE_CONST
-+#define TAO_YY_USE_PROTOS
-+#endif
- 
--#define YY_USE_CONST
-+#ifdef TAO_YY_USE_CONST
-+#define tao_yyconst const
-+#else
-+#define tao_yyconst
-+#endif
- 
--#endif	/* __STDC__ */
--#endif	/* ! __cplusplus */
- 
--#ifdef YY_USE_CONST
--#define yyconst const
-+#ifdef TAO_YY_USE_PROTOS
-+#define TAO_YY_PROTO(proto) proto
- #else
--#define yyconst
-+#define TAO_YY_PROTO(proto) ()
- #endif
- 
- /* Returned upon end-of-file. */
--#define YY_NULL 0
-+#define TAO_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)
-+#define TAO_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 *
-+#define BEGIN tao_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
-+ * to BEGIN to return to the state.  The TAO_YYSTATE alias is for lex
-  * compatibility.
-  */
--#define YY_START (((yy_start) - 1) / 2)
--#define YYSTATE YY_START
-+#define TAO_YY_START ((tao_yy_start - 1) / 2)
-+#define TAO_YYSTATE TAO_YY_START
- 
- /* Action number for EOF rule of a given start state. */
--#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-+#define TAO_YY_STATE_EOF(state) (TAO_YY_END_OF_BUFFER + state + 1)
- 
- /* Special action meaning "start processing a new file". */
--#define YY_NEW_FILE yyrestart(yyin  )
-+#define TAO_YY_NEW_FILE tao_yyrestart( tao_yyin )
- 
--#define YY_END_OF_BUFFER_CHAR 0
-+#define TAO_YY_END_OF_BUFFER_CHAR 0
- 
- /* Size of default input buffer. */
--#ifndef YY_BUF_SIZE
--#define YY_BUF_SIZE 16384
--#endif
--
--#ifndef YY_TYPEDEF_YY_BUFFER_STATE
--#define YY_TYPEDEF_YY_BUFFER_STATE
--typedef struct yy_buffer_state *YY_BUFFER_STATE;
--#endif
-+#define TAO_YY_BUF_SIZE 16384
- 
--extern int yyleng;
-+typedef struct tao_yy_buffer_state *TAO_YY_BUFFER_STATE;
- 
--extern FILE *yyin, *yyout;
-+extern int tao_yyleng;
-+extern FILE *tao_yyin, *tao_yyout;
- 
- #define EOB_ACT_CONTINUE_SCAN 0
- #define EOB_ACT_END_OF_FILE 1
- #define EOB_ACT_LAST_MATCH 2
- 
--    #define YY_LESS_LINENO(n)
--    
--/* Return all but the first "n" matched characters back to the input stream. */
--#define yyless(n) \
--	do \
--		{ \
--		/* Undo effects of setting up yytext. */ \
--        int yyless_macro_arg = (n); \
--        YY_LESS_LINENO(yyless_macro_arg);\
--		*yy_cp = (yy_hold_char); \
--		YY_RESTORE_YY_MORE_OFFSET \
--		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
--		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
--		} \
--	while ( 0 )
-+/* 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 )
-+ *              tao_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 tao_yyless() call.
-+ */
-+
-+/* Return all but the first 'n' matched characters back to the input stream. */
-+
-+#define tao_yyless(n) \
-+        do \
-+                { \
-+                /* Undo effects of setting up tao_yytext. */ \
-+                *tao_yy_cp = tao_yy_hold_char; \
-+                TAO_YY_RESTORE_TAO_YY_MORE_OFFSET \
-+                tao_yy_c_buf_p = tao_yy_cp = tao_yy_bp + n - TAO_YY_MORE_ADJ; \
-+                TAO_YY_DO_BEFORE_ACTION; /* set up tao_yytext again */ \
-+                } \
-+        while ( 0 )
- 
--#define unput(c) yyunput( c, (yytext_ptr)  )
-+#define unput(c) tao_yyunput( c, tao_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 tao_yy_size_t;
- 
--#ifndef YY_TYPEDEF_YY_SIZE_T
--#define YY_TYPEDEF_YY_SIZE_T
--typedef unsigned int yy_size_t;
--#endif
--
--#ifndef YY_STRUCT_YY_BUFFER_STATE
--#define YY_STRUCT_YY_BUFFER_STATE
--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;
--
--    int yy_bs_lineno; /**< The line count. */
--    int yy_bs_column; /**< The column count. */
--    
--	/* 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
--
--	};
--#endif /* !YY_STRUCT_YY_BUFFER_STATE */
--
--/* Stack of input buffers. */
--static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
--static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
--static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
- 
--/* 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".
-- *
-- * Returns the top of the stack, or NULL.
-- */
--#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
--                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
--                          : NULL)
-+struct tao_yy_buffer_state
-+        {
-+        FILE *tao_yy_input_file;
- 
--/* Same as previous macro, but useful when we know that the buffer stack is not
-- * NULL or when we need an lvalue. For internal use only.
-- */
--#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-+        char *tao_yy_ch_buf;            /* input buffer */
-+        char *tao_yy_buf_pos;           /* current position in input 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;
-+        /* Size of input buffer in bytes, not including room for EOB
-+         * characters.
-+         */
-+        tao_yy_size_t tao_yy_buf_size;
- 
--/* 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 */
-+        /* Number of characters read into tao_yy_ch_buf, not including EOB
-+         * characters.
-+         */
-+        int tao_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 tao_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 tao_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 tao_yy_at_bol;
-+
-+        /* Whether to try to fill the input buffer when we reach the
-+         * end of it.
-+         */
-+        int tao_yy_fill_buffer;
-+
-+        int tao_yy_buffer_status;
-+#define TAO_YY_BUFFER_NEW 0
-+#define TAO_YY_BUFFER_NORMAL 1
-+        /* When an EOF's been seen but there's still some text to process
-+         * then we mark the buffer as TAO_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 tao_yyrestart()), so that the user can continue scanning by
-+         * just pointing tao_yyin at a new input file.
-+         */
-+#define TAO_YY_BUFFER_EOF_PENDING 2
-+        };
- 
--/* 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 TAO_YY_BUFFER_STATE tao_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".
-  */
--static int yy_did_buffer_switch_on_eof;
-+#define TAO_YY_CURRENT_BUFFER tao_yy_current_buffer
- 
--void yyrestart (FILE *input_file  );
--void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
--YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
--void yy_delete_buffer (YY_BUFFER_STATE b  );
--void yy_flush_buffer (YY_BUFFER_STATE b  );
--void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
--void yypop_buffer_state (void );
- 
--static void yyensure_buffer_stack (void );
--static void yy_load_buffer_state (void );
--static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-+/* tao_yy_hold_char holds the character lost when tao_yytext is formed. */
-+static char tao_yy_hold_char;
- 
--#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-+static int tao_yy_n_chars;              /* number of characters read into tao_yy_ch_buf */
- 
--YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
--YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
--YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
- 
--void *yyalloc (yy_size_t  );
--void *yyrealloc (void *,yy_size_t  );
--void yyfree (void *  );
-+int tao_yyleng;
- 
--#define yy_new_buffer yy_create_buffer
-+/* Points to current character in buffer. */
-+static char *tao_yy_c_buf_p = (char *) 0;
-+static int tao_yy_init = 1;             /* whether we need to initialize */
-+static int tao_yy_start = 0;    /* start state number */
- 
--#define yy_set_interactive(is_interactive) \
--	{ \
--	if ( ! YY_CURRENT_BUFFER ){ \
--        yyensure_buffer_stack (); \
--		YY_CURRENT_BUFFER_LVALUE =    \
--            yy_create_buffer(yyin,YY_BUF_SIZE ); \
--	} \
--	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
--	}
-+/* Flag which is used to allow tao_yywrap()'s to do buffer switches
-+ * instead of setting up a fresh tao_yyin.  A bit of a hack ...
-+ */
-+static int tao_yy_did_buffer_switch_on_eof;
- 
--#define yy_set_bol(at_bol) \
--	{ \
--	if ( ! YY_CURRENT_BUFFER ){\
--        yyensure_buffer_stack (); \
--		YY_CURRENT_BUFFER_LVALUE =    \
--            yy_create_buffer(yyin,YY_BUF_SIZE ); \
--	} \
--	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
--	}
-+void tao_yyrestart TAO_YY_PROTO(( FILE *input_file ));
- 
--#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-+void tao_yy_switch_to_buffer TAO_YY_PROTO(( TAO_YY_BUFFER_STATE new_buffer ));
-+void tao_yy_load_buffer_state TAO_YY_PROTO(( void ));
-+TAO_YY_BUFFER_STATE tao_yy_create_buffer TAO_YY_PROTO(( FILE *file, int size ));
-+void tao_yy_delete_buffer TAO_YY_PROTO(( TAO_YY_BUFFER_STATE b ));
-+void tao_yy_init_buffer TAO_YY_PROTO(( TAO_YY_BUFFER_STATE b, FILE *file ));
-+void tao_yy_flush_buffer TAO_YY_PROTO(( TAO_YY_BUFFER_STATE b ));
-+#define TAO_YY_FLUSH_BUFFER tao_yy_flush_buffer( tao_yy_current_buffer )
- 
--/* Begin user sect3 */
-+TAO_YY_BUFFER_STATE tao_yy_scan_buffer TAO_YY_PROTO(( char *base, tao_yy_size_t size ));
-+TAO_YY_BUFFER_STATE tao_yy_scan_string TAO_YY_PROTO(( tao_yyconst char *tao_yy_str ));
-+TAO_YY_BUFFER_STATE tao_yy_scan_bytes TAO_YY_PROTO(( tao_yyconst char *bytes, int len ));
- 
--typedef unsigned char YY_CHAR;
-+static void *tao_yy_flex_alloc TAO_YY_PROTO(( tao_yy_size_t ));
-+static void *tao_yy_flex_realloc TAO_YY_PROTO(( void *, tao_yy_size_t ));
-+static void tao_yy_flex_free TAO_YY_PROTO(( void * ));
- 
--FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-+#define tao_yy_new_buffer tao_yy_create_buffer
- 
--typedef int yy_state_type;
-+#define tao_yy_set_interactive(is_interactive) \
-+        { \
-+        if ( ! tao_yy_current_buffer ) \
-+                tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE ); \
-+        tao_yy_current_buffer->tao_yy_is_interactive = is_interactive; \
-+        }
- 
--extern int yylineno;
-+#define tao_yy_set_bol(at_bol) \
-+        { \
-+        if ( ! tao_yy_current_buffer ) \
-+                tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE ); \
-+        tao_yy_current_buffer->tao_yy_at_bol = at_bol; \
-+        }
-+
-+#define TAO_YY_AT_BOL() (tao_yy_current_buffer->tao_yy_at_bol)
- 
--int yylineno = 1;
-+typedef unsigned char TAO_YY_CHAR;
-+FILE *tao_yyin = (FILE *) 0, *tao_yyout = (FILE *) 0;
-+typedef int tao_yy_state_type;
-+extern char tao_yytext[];
- 
--extern char yytext[];
- 
--static yy_state_type yy_get_previous_state (void );
--static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
--static int yy_get_next_buffer (void );
--static void yy_fatal_error (yyconst char msg[]  );
-+static tao_yy_state_type tao_yy_get_previous_state TAO_YY_PROTO(( void ));
-+static tao_yy_state_type tao_yy_try_NUL_trans TAO_YY_PROTO(( tao_yy_state_type current_state ));
-+static int tao_yy_get_next_buffer TAO_YY_PROTO(( void ));
-+static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] ));
- 
- /* Done after the current pattern has been matched and before the
-- * corresponding action - sets up yytext.
-+ * corresponding action - sets up tao_yytext.
-  */
--#define YY_DO_BEFORE_ACTION \
--	(yytext_ptr) = yy_bp; \
--	yyleng = (size_t) (yy_cp - yy_bp); \
--	(yy_hold_char) = *yy_cp; \
--	*yy_cp = '\0'; \
--	if ( yyleng >= YYLMAX ) \
--		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
--	yy_flex_strncpy( yytext, (yytext_ptr), yyleng + 1 ); \
--	(yy_c_buf_p) = yy_cp;
--
--#define YY_NUM_RULES 104
--#define YY_END_OF_BUFFER 105
--/* This struct is not used in this scanner,
--   but its presence is necessary. */
--struct yy_trans_info
--	{
--	flex_int32_t yy_verify;
--	flex_int32_t yy_nxt;
--	};
--static yyconst flex_int16_t yy_accept[551] =
-+#define TAO_YY_DO_BEFORE_ACTION \
-+        tao_yytext_ptr = tao_yy_bp; \
-+        tao_yyleng = (int) (tao_yy_cp - tao_yy_bp); \
-+        tao_yy_hold_char = *tao_yy_cp; \
-+        *tao_yy_cp = '\0'; \
-+        if ( tao_yyleng >= TAO_YYLMAX ) \
-+                TAO_YY_FATAL_ERROR( "token too large, exceeds TAO_YYLMAX" ); \
-+        tao_yy_flex_strncpy( tao_yytext, tao_yytext_ptr, tao_yyleng + 1 ); \
-+        tao_yy_c_buf_p = tao_yy_cp;
-+
-+#define TAO_YY_NUM_RULES 104
-+#define TAO_YY_END_OF_BUFFER 105
-+static tao_yyconst short int tao_yy_accept[551] =
-     {   0,
-       101,  101,  105,  103,  101,  102,  102,  103,  103,  103,
-       103,  103,   76,   72,  103,  103,  103,   68,   68,   68,
-@@ -427,7 +348,7 @@
-        98,    0,    0,    0,   40,   94,    0,   86,   86,    0
-     } ;
- 
--static yyconst flex_int32_t yy_ec[256] =
-+static tao_yyconst int tao_yy_ec[256] =
-     {   0,
-         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-         1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
-@@ -459,7 +380,7 @@
-         1,    1,    1,    1,    1
-     } ;
- 
--static yyconst flex_int32_t yy_meta[60] =
-+static tao_yyconst int tao_yy_meta[60] =
-     {   0,
-         1,    1,    2,    1,    1,    3,    1,    4,    1,    1,
-         1,    1,    1,    5,    5,    5,    1,    1,    1,    1,
-@@ -469,7 +390,7 @@
-         6,    8,    6,    8,    6,    8,    6,    8,    6
-     } ;
- 
--static yyconst flex_int16_t yy_base[578] =
-+static tao_yyconst short int tao_yy_base[578] =
-     {   0,
-         0,   58, 1044, 1045,   59, 1045, 1045,   56, 1009,   54,
-        57,   65,   68,   73, 1025, 1023, 1020,    0, 1017,   69,
-@@ -536,7 +457,7 @@
-       739,  747,  755,  763,  771,  779,  787
-     } ;
- 
--static yyconst flex_int16_t yy_def[578] =
-+static tao_yyconst short int tao_yy_def[578] =
-     {   0,
-       550,    1,  550,  550,  550,  550,  550,  551,  552,  550,
-       550,  550,  550,  550,  550,  550,  550,  553,  553,  553,
-@@ -603,7 +524,7 @@
-       550,  550,  550,  550,  550,  550,  550
-     } ;
- 
--static yyconst flex_int16_t yy_nxt[1105] =
-+static tao_yyconst short int tao_yy_nxt[1105] =
-     {   0,
-         4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
-        10,   11,   12,   13,   14,   14,   15,   16,    4,   17,
-@@ -727,9 +648,10 @@
-       550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
- 
-       550,  550,  550,  550
-+
-     } ;
- 
--static yyconst flex_int16_t yy_chk[1105] =
-+static tao_yyconst short int tao_yy_chk[1105] =
-     {   0,
-         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-@@ -853,28 +775,27 @@
-       550,  550,  550,  550,  550,  550,  550,  550,  550,  550,
- 
-       550,  550,  550,  550
--    } ;
- 
--static yy_state_type yy_last_accepting_state;
--static char *yy_last_accepting_cpos;
-+    } ;
- 
--extern int yy_flex_debug;
--int yy_flex_debug = 0;
-+static tao_yy_state_type tao_yy_last_accepting_state;
-+static char *tao_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
--#ifndef YYLMAX
--#define YYLMAX 8192
-+#define tao_yymore() tao_yymore_used_but_not_detected
-+#define TAO_YY_MORE_ADJ 0
-+#define TAO_YY_RESTORE_TAO_YY_MORE_OFFSET
-+#ifndef TAO_YYLMAX
-+#define TAO_YYLMAX 8192
- #endif
- 
--char yytext[YYLMAX];
--char *yytext_ptr;
--/*  $Id$
-+char tao_yytext[TAO_YYLMAX];
-+char *tao_yytext_ptr;
-+#define INITIAL 0
-+/*  $Id$
- 
- COPYRIGHT
- 
-@@ -953,6 +874,7 @@
- #include "ast_expression.h"
- #include "ast_argument.h"
- #include "ast_operation.h"
-+#include "ast_root.h"
- #include "fe_interface_header.h"
- #include "global_extern.h"
- #include "fe_private.h"
-@@ -964,533 +886,541 @@
- static char             idl_escape_reader (char *);
- static double           idl_atof (char *);
- static long             idl_atoi (char *, long);
--static ACE_UINT64	idl_atoui (char *, long);
--static void		idl_parse_line_and_file (char *);
--static void		idl_store_pragma (char *);
-+static ACE_UINT64       idl_atoui (char *, long);
-+static void             idl_parse_line_and_file (char *);
-+static void             idl_store_pragma (char *);
- static char *           idl_get_pragma_string (char *);
- static idl_bool         idl_valid_version (char *);
- static AST_Decl *       idl_find_node (char *);
- 
- #if 0 /* defined (HPUX) */
--// HPUX has yytext typed to unsigned char *. We make sure here that
--// we'll always use char * static char* __yytext = (char*) yytext;
--// NOTE: This will not work under flex(1) were yytext is not a fixed
-+// HPUX has tao_yytext typed to unsigned char *. We make sure here that
-+// we'll always use char * static char* __tao_yytext = (char*) tao_yytext;
-+// NOTE: This will not work under flex(1) were tao_yytext is not a fixed
- // buffer, but a dynamically allocated one. This function should do
- // the trick for us.
--inline char *__yytext()
-+inline char *__tao_yytext()
- {
--  return (char *) yytext;
-+  return (char *) tao_yytext;
- }
--#define ace_yytext __yytext()
-+#define ace_tao_yytext __tao_yytext()
- #else
--#define ace_yytext yytext
-+#define ace_tao_yytext tao_yytext
- #endif /* 0 */
- 
- /* SO we don't choke on files that use \r\n */
--
--#define INITIAL 0
--
--#ifndef YY_NO_UNISTD_H
--/* Special case for "unistd.h", since it is non-ANSI. We include it way
-- * down here because we want the user's section 1 to have been scanned first.
-- * The user has a chance to override it with an option.
-- */
--#include <unistd.h>
--#endif
--
--#ifndef YY_EXTRA_TYPE
--#define YY_EXTRA_TYPE void *
--#endif
-+#define TAO_YY_NEVER_INTERACTIVE 1
- 
- /* Macros after this point can all be overridden by user definitions in
-  * section 1.
-  */
- 
--#ifndef YY_SKIP_YYWRAP
-+#ifndef TAO_YY_SKIP_TAO_YYWRAP
- #ifdef __cplusplus
--extern "C" int yywrap (void );
-+extern "C" int tao_yywrap TAO_YY_PROTO(( void ));
- #else
--extern int yywrap (void );
-+extern int tao_yywrap TAO_YY_PROTO(( void ));
- #endif
- #endif
- 
--    static void yyunput (int c,char *buf_ptr  );
--    
--#ifndef yytext_ptr
--static void yy_flex_strncpy (char *,yyconst char *,int );
-+#ifndef TAO_YY_NO_UNPUT
-+static void tao_yyunput TAO_YY_PROTO(( int c, char *buf_ptr ));
- #endif
- 
--#ifdef YY_NEED_STRLEN
--static int yy_flex_strlen (yyconst char * );
-+#ifndef tao_yytext_ptr
-+static void tao_yy_flex_strncpy TAO_YY_PROTO(( char *, tao_yyconst char *, int ));
- #endif
- 
--#ifndef YY_NO_INPUT
-+#ifdef TAO_YY_NEED_STRLEN
-+static int tao_yy_flex_strlen TAO_YY_PROTO(( tao_yyconst char * ));
-+#endif
- 
-+#ifndef TAO_YY_NO_INPUT
- #ifdef __cplusplus
--static int yyinput (void );
-+static int tao_yyinput TAO_YY_PROTO(( void ));
- #else
--static int input (void );
-+static int input TAO_YY_PROTO(( void ));
-+#endif
- #endif
- 
-+#ifdef TAO_YY_STACK_USED
-+static int tao_yy_start_stack_ptr = 0;
-+static int tao_yy_start_stack_depth = 0;
-+static int *tao_yy_start_stack = 0;
-+#ifndef TAO_YY_NO_PUSH_STATE
-+static void tao_yy_push_state TAO_YY_PROTO(( int new_state ));
-+#endif
-+#ifndef TAO_YY_NO_POP_STATE
-+static void tao_yy_pop_state TAO_YY_PROTO(( void ));
-+#endif
-+#ifndef TAO_YY_NO_TOP_STATE
-+static int tao_yy_top_state TAO_YY_PROTO(( void ));
-+#endif
-+
-+#else
-+#define TAO_YY_NO_PUSH_STATE 1
-+#define TAO_YY_NO_POP_STATE 1
-+#define TAO_YY_NO_TOP_STATE 1
-+#endif
-+
-+#ifdef TAO_YY_MALLOC_DECL
-+TAO_YY_MALLOC_DECL
-+#else
-+#ifdef __STDC__
-+#ifndef __cplusplus
-+#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
-+#ifndef TAO_YY_READ_BUF_SIZE
-+#define TAO_YY_READ_BUF_SIZE 8192
- #endif
- 
- /* Copy whatever the last rule matched to the standard output. */
--#ifndef ECHO
-+
-+#ifndef TAO_YY_ECHO
- /* This used to be an fputs(), but since the string might contain NUL's,
-  * we now use fwrite().
-  */
--#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-+#define TAO_YY_ECHO (void) fwrite( tao_yytext, tao_yyleng, 1, tao_yyout )
- #endif
- 
--/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
-+/* Gets input and stuffs it into "buf".  number of characters read, or TAO_YY_NULL,
-  * is returned in "result".
-  */
--#ifndef YY_INPUT
--#define YY_INPUT(buf,result,max_size) \
--	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
--		{ \
--		int c = '*'; \
--		size_t n; \
--		for ( n = 0; n < max_size && \
--			     (c = 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 = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
--			{ \
--			if( errno != EINTR) \
--				{ \
--				YY_FATAL_ERROR( "input in flex scanner failed" ); \
--				break; \
--				} \
--			errno=0; \
--			clearerr(yyin); \
--			} \
--		}\
--\
--
-+#ifndef TAO_YY_INPUT
-+#define TAO_YY_INPUT(buf,result,max_size) \
-+        if ( tao_yy_current_buffer->tao_yy_is_interactive ) \
-+                { \
-+                int c = '*', n; \
-+                for ( n = 0; n < max_size && \
-+                             (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
-+                        buf[n] = (char) c; \
-+                if ( c == '\n' ) \
-+                        buf[n++] = (char) c; \
-+                if ( c == EOF && ferror( tao_yyin ) ) \
-+                        TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-+                result = n; \
-+                } \
-+        else if ( ((result = static_cast<int> ( \
-+                                  fread( buf, 1, max_size, tao_yyin ))) == 0) \
-+                  && ferror( tao_yyin ) ) \
-+                TAO_YY_FATAL_ERROR( "input in flex scanner failed" );
- #endif
- 
--/* No semi-colon after return; correct usage is to write "yyterminate();" -
-+/* No semi-colon after return; correct usage is to write "tao_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
-+#ifndef tao_yyterminate
-+#define tao_yyterminate() return TAO_YY_NULL
- #endif
- 
- /* Number of entries by which start-condition stack grows. */
--#ifndef YY_START_STACK_INCR
--#define YY_START_STACK_INCR 25
-+#ifndef TAO_YY_START_STACK_INCR
-+#define TAO_YY_START_STACK_INCR 25
- #endif
- 
- /* Report a fatal error. */
--#ifndef YY_FATAL_ERROR
--#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-+#ifndef TAO_YY_FATAL_ERROR
-+#define TAO_YY_FATAL_ERROR(msg) tao_yy_fatal_error( msg )
- #endif
- 
--/* end tables serialization structures and prototypes */
--
- /* Default declaration of generated scanner - a define so the user can
-  * easily add parameters.
-  */
--#ifndef YY_DECL
--#define YY_DECL_IS_OURS 1
--
--extern int yylex (void);
--
--#define YY_DECL int yylex (void)
--#endif /* !YY_DECL */
-+#ifndef TAO_YY_DECL
-+#define TAO_YY_DECL int tao_yylex TAO_YY_PROTO(( void ))
-+#endif
- 
--/* Code executed at the beginning of each rule, after yytext and yyleng
-+/* Code executed at the beginning of each rule, after tao_yytext and tao_yyleng
-  * have been set up.
-  */
--#ifndef YY_USER_ACTION
--#define YY_USER_ACTION
-+#ifndef TAO_YY_USER_ACTION
-+#define TAO_YY_USER_ACTION
- #endif
- 
- /* Code executed at the end of each rule. */
--#ifndef YY_BREAK
--#define YY_BREAK break;
-+#ifndef TAO_YY_BREAK
-+#define TAO_YY_BREAK ACE_NOTREACHED (break;)
-+#endif
-+
-+#define TAO_YY_RULE_SETUP \
-+        if ( tao_yyleng > 0 ) \
-+                tao_yy_current_buffer->tao_yy_at_bol = \
-+                                (tao_yytext[tao_yyleng - 1] == '\n'); \
-+        TAO_YY_USER_ACTION
-+
-+TAO_YY_DECL
-+        {
-+        register tao_yy_state_type tao_yy_current_state;
-+        register char *tao_yy_cp = 0, *tao_yy_bp = 0;
-+        register int tao_yy_act;
-+
-+
-+
-+
-+        if ( tao_yy_init )
-+                {
-+                tao_yy_init = 0;
-+
-+#ifdef TAO_YY_USER_INIT
-+                TAO_YY_USER_INIT;
- #endif
- 
--#define YY_RULE_SETUP \
--	if ( yyleng > 0 ) \
--		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
--				(yytext[yyleng - 1] == '\n'); \
--	YY_USER_ACTION
--
--/** The main scanner function which does all the work.
-- */
--YY_DECL
--{
--	register yy_state_type yy_current_state;
--	register char *yy_cp, *yy_bp;
--	register int yy_act;
--    
--	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 ) {
--			yyensure_buffer_stack ();
--			YY_CURRENT_BUFFER_LVALUE =
--				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_current_state += YY_AT_BOL();
--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 >= 551 )
--					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_current_state != 550 );
--		yy_cp = (yy_last_accepting_cpos);
--		yy_current_state = (yy_last_accepting_state);
--
--yy_find_action:
--		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;
-+                if ( ! tao_yy_start )
-+                        tao_yy_start = 1;       /* first start state */
-+
-+                if ( ! tao_yyin )
-+                        tao_yyin = stdin;
-+
-+                if ( ! tao_yyout )
-+                        tao_yyout = stdout;
-+
-+                if ( ! tao_yy_current_buffer )
-+                        tao_yy_current_buffer =
-+                                tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE );
-+
-+                tao_yy_load_buffer_state();
-+                }
-+
-+        while ( 1 )             /* loops until end-of-file is reached */
-+                {
-+                tao_yy_cp = tao_yy_c_buf_p;
-+
-+                /* Support of tao_yytext. */
-+                *tao_yy_cp = tao_yy_hold_char;
-+
-+                /* tao_yy_bp points to the position in tao_yy_ch_buf of the start of
-+                 * the current run.
-+                 */
-+                tao_yy_bp = tao_yy_cp;
-+
-+                tao_yy_current_state = tao_yy_start;
-+                tao_yy_current_state += TAO_YY_AT_BOL();
-+tao_yy_match:
-+                do
-+                        {
-+                        register TAO_YY_CHAR tao_yy_c = tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)];
-+                        if ( tao_yy_accept[tao_yy_current_state] )
-+                                {
-+                                tao_yy_last_accepting_state = tao_yy_current_state;
-+                                tao_yy_last_accepting_cpos = tao_yy_cp;
-+                                }
-+                        while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-+                                {
-+                                tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-+                                if ( tao_yy_current_state >= 551 )
-+                                        tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-+                                }
-+                        tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-+                        ++tao_yy_cp;
-+                        }
-+                while ( tao_yy_current_state != 550 );
-+
-+tao_yy_find_action:
-+                tao_yy_act = tao_yy_accept[tao_yy_current_state];
-+                if ( tao_yy_act == 0 )
-+                        { /* have to back up */
-+                        tao_yy_cp = tao_yy_last_accepting_cpos;
-+                        tao_yy_current_state = tao_yy_last_accepting_state;
-+                        tao_yy_act = tao_yy_accept[tao_yy_current_state];
-+                        }
-+
-+                TAO_YY_DO_BEFORE_ACTION;
-+
-+
-+do_action:      /* This label is used only to access EOF actions. */
-+
-+
-+                switch ( tao_yy_act )
-+        { /* beginning of action switch */
-+                        case 0: /* must back up */
-+                        /* undo the effects of TAO_YY_DO_BEFORE_ACTION */
-+                        *tao_yy_cp = tao_yy_hold_char;
-+                        tao_yy_cp = tao_yy_last_accepting_cpos;
-+                        tao_yy_current_state = tao_yy_last_accepting_state;
-+                        goto tao_yy_find_action;
- 
- case 1:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ANY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 2:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_OBJECT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 3:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_MODULE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 4:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_RAISES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 5:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_READONLY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 6:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ATTRIBUTE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 7:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_EXCEPTION;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 8:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CONTEXT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 9:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_INTERFACE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 10:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CONST;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 11:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TYPEDEF;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 12:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_STRUCT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 13:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ENUM;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 14:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_STRING;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 15:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_WSTRING;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 16:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SEQUENCE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 17:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_UNION;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 18:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FIXED;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 19:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SWITCH;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 20:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CASE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 21:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_DEFAULT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 22:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FLOAT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 23:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_DOUBLE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 24:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_LONG;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 25:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SHORT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 26:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_UNSIGNED;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 27:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CHAR;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 28:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_WCHAR;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 29:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_BOOLEAN;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 30:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_OCTET;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 31:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_VOID;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 32:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_NATIVE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 33:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_LOCAL;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 34:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ABSTRACT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 35:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CUSTOM;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 36:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FACTORY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 37:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PRIVATE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 38:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PUBLIC;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 39:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SUPPORTS;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 40:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TRUNCATABLE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 41:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_VALUETYPE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 42:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_COMPONENT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 43:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_CONSUMES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 44:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_EMITS;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 45:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_EVENTTYPE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 46:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FINDER;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 47:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_GETRAISES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 48:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_HOME;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 49:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_IMPORT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 50:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_MULTIPLE;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 51:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PRIMARYKEY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 52:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PROVIDES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 53:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_PUBLISHES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 54:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_SETRAISES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 55:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TYPEID;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 56:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TYPEPREFIX;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 57:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_USES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 58:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_MANAGES;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 59:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_TRUETOK;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 60:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_FALSETOK;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 61:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_INOUT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 62:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_IN;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 63:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_OUT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 64:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_ONEWAY;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 65:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_LEFT_SHIFT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 66:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- return IDL_RIGHT_SHIFT;
--	YY_BREAK
-+        TAO_YY_BREAK
- case 67:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.strval = (char *) "::";
--		  return IDL_SCOPE_DELIMITOR;
--		}
--	YY_BREAK
-+                  tao_yylval.strval = (char *) "::";
-+                  return IDL_SCOPE_DELIMITOR;
-+                }
-+        TAO_YY_BREAK
- case 68:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
-   // Make sure that this identifier is not a C++ keyword. If it is,
-   // prepend it with a _cxx_. Lookup in the perfect hash table for C++
-@@ -1499,15 +1429,16 @@
- 
-   TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
-   const TAO_IDL_CPP_Keyword_Entry *entry = 0;
-+
-   if (!idl_global->preserve_cpp_keywords())
-     {
-       // This check will ensure that escaped C++ keywords will be
-       // caught and prepended with '_cxx' as non-escaped keywords
-       // are now prepended with '_cxx_'.
--      const char *tmp = 
-+      const char *tmp =
-         ace_tao_yytext[0] == '_' ? ace_tao_yytext + 1 : ace_tao_yytext;
- 
--      entry = 
-+      entry =
-         cpp_key_tbl.lookup (tmp,
-                             static_cast<unsigned int> (ACE_OS::strlen (tmp)));
-     }
-@@ -1523,69 +1454,68 @@
- 
-   return IDENTIFIER;
- }
--	YY_BREAK
-+        TAO_YY_BREAK
- case 69:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--                  yylval.dval = idl_atof(ace_yytext);
-+                  tao_yylval.dval = idl_atof(ace_tao_yytext);
-                   return IDL_FLOATING_PT_LITERAL;
+--- lex.yy.cpp.orig 2005-01-28 10:30:36.000000000 -0600
++++ lex.yy.cpp 2005-01-28 10:30:44.000000000 -0600
+@@ -1591,42 +1591,42 @@
+                   idl_global->set_lineno(idl_global->lineno() + 1);
+                   idl_store_pragma(ace_tao_yytext);
                  }
--	YY_BREAK
-+        TAO_YY_BREAK
- case 70:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--                  yylval.dval = idl_atof(ace_yytext);
-+                  tao_yylval.dval = idl_atof(ace_tao_yytext);
-                   return IDL_FLOATING_PT_LITERAL;
-                 }
--	YY_BREAK
-+        TAO_YY_BREAK
- case 71:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.ival = idl_atoi(ace_yytext, 10);
--		  return IDL_INTEGER_LITERAL;
--	        }
--	YY_BREAK
-+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 10);
-+                  return IDL_INTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 72:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.uival = idl_atoui(ace_yytext, 10);
--		  return IDL_UINTEGER_LITERAL;
--		}
--	YY_BREAK
-+                  tao_yylval.uival = idl_atoui(ace_tao_yytext, 10);
-+                  return IDL_UINTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 73:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.ival = idl_atoi(ace_yytext, 16);
--		  return IDL_INTEGER_LITERAL;
--	        }
--	YY_BREAK
-+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 16);
-+                  return IDL_INTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 74:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--                  yylval.uival = idl_atoui(ace_yytext, 16);
--		  return IDL_UINTEGER_LITERAL;
--		}
--	YY_BREAK
-+                  tao_yylval.uival = idl_atoui(ace_tao_yytext, 16);
-+                  return IDL_UINTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 75:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.ival = idl_atoi(ace_yytext, 8);
--		  return IDL_INTEGER_LITERAL;
--	      	}
--	YY_BREAK
-+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 8);
-+                  return IDL_INTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 76:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.uival = idl_atoui(ace_yytext, 8);
--		  return IDL_UINTEGER_LITERAL;
--	      	}
--	YY_BREAK
-+                  tao_yylval.uival = idl_atoui(ace_tao_yytext, 8);
-+                  return IDL_UINTEGER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 77:
--/* rule 77 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  /* Skip the quotes */
--		  char *tmp = ace_yytext;
-+                  /* Skip the quotes */
-+                  char *tmp = ace_tao_yytext;
-                   for(int i = strlen(tmp) - 1; i >= 0; --i) {
-                     if (isspace(tmp[i])) {
-                       tmp[i] = '\0';
-@@ -1594,1146 +1524,1051 @@
-                       break;
-                     }
-                   }
--		  tmp[strlen (tmp) - 1] = '\0';
--		  ACE_NEW_RETURN (yylval.sval,
-+                  tmp[strlen (tmp) - 1] = '\0';
-+                  ACE_NEW_RETURN (tao_yylval.sval,
-                                   UTL_String (tmp + 1),
-                                   IDL_STRING_LITERAL);
--		  return IDL_STRING_LITERAL;
--	      	}
--	YY_BREAK
-+                  return IDL_STRING_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 78:
--/* rule 78 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  /* Skip the bookends */
--		  char *tmp = ACE_OS::strdup (ace_yytext);
--		  tmp[strlen (tmp) - 1] = '\0';
--		  yylval.wsval = idl_wstring_escape_reader(tmp + 2);
--		  return IDL_WSTRING_LITERAL;
--		}
--	YY_BREAK
-+                  /* Skip the bookends */
-+                  char *tmp = ACE_OS::strdup (ace_tao_yytext);
-+                  tmp[strlen (tmp) - 1] = '\0';
-+                  tao_yylval.wsval = idl_wstring_escape_reader(tmp + 2);
-+                  return IDL_WSTRING_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 79:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.cval = ace_yytext [1];
--		  return IDL_CHARACTER_LITERAL;
--	      	}
--	YY_BREAK
-+                  tao_yylval.cval = ace_tao_yytext [1];
-+                  return IDL_CHARACTER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 80:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  // octal character constant
--		  yylval.cval = idl_escape_reader(ace_yytext + 1);
--		  return IDL_CHARACTER_LITERAL;
--		}
--	YY_BREAK
-+                  // octal character constant
-+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-+                  return IDL_CHARACTER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 81:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  // hexadecimal character constant
--		  yylval.cval = idl_escape_reader(ace_yytext + 1);
--		  return IDL_CHARACTER_LITERAL;
--		}
--	YY_BREAK
-+                  // hexadecimal character constant
-+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-+                  return IDL_CHARACTER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 82:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  yylval.cval = idl_escape_reader(ace_yytext + 1);
--		  return IDL_CHARACTER_LITERAL;
--		}
--	YY_BREAK
-+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-+                  return IDL_CHARACTER_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 83:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  // wide character constant
--		  yylval.wcval = ace_yytext [2];
--		  return IDL_WCHAR_LITERAL;
--		}
--	YY_BREAK
-+                  // wide character constant
-+                  tao_yylval.wcval = ace_tao_yytext [2];
-+                  return IDL_WCHAR_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 84:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  // hexadecimal wide character constant
--		  yylval.wcval = idl_wchar_escape_reader(ace_yytext + 2);
--		  return IDL_WCHAR_LITERAL;
--		}
--	YY_BREAK
-+                  // hexadecimal wide character constant
-+                  tao_yylval.wcval = idl_wchar_escape_reader(ace_tao_yytext + 2);
-+                  return IDL_WCHAR_LITERAL;
-+                }
-+        TAO_YY_BREAK
- case 85:
--/* rule 85 can match eol */
- case 86:
--/* rule 86 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {/* remember pragma */
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		  idl_store_pragma(ace_yytext);
--		}
--	YY_BREAK
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                  idl_store_pragma(ace_tao_yytext);
-+                }
+-        TAO_YY_BREAK
 +        break;
  case 87:
--/* rule 87 can match eol */
  case 88:
--/* rule 88 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  {/* ignore file */
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		}
--	YY_BREAK
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                }
+                   idl_global->set_lineno(idl_global->lineno() + 1);
+                 }
+-        TAO_YY_BREAK
 +        break;
  case 89:
--/* rule 89 can match eol */
  case 90:
--/* rule 90 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  {
--		  idl_parse_line_and_file(ace_yytext);
--		}
--	YY_BREAK
-+                  idl_parse_line_and_file(ace_tao_yytext);
-+                }
+                   idl_parse_line_and_file(ace_tao_yytext);
+                 }
+-        TAO_YY_BREAK
 +        break;
  case 91:
--/* rule 91 can match eol */
  case 92:
--/* rule 92 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  {
--		  idl_parse_line_and_file(ace_yytext);
--		}
--	YY_BREAK
-+                  idl_parse_line_and_file(ace_tao_yytext);
-+                }
+                   idl_parse_line_and_file(ace_tao_yytext);
+                 }
+-        TAO_YY_BREAK
 +        break;
  case 93:
--/* rule 93 can match eol */
  case 94:
--/* rule 94 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  {
--		  idl_parse_line_and_file(ace_yytext);
--		}
--	YY_BREAK
-+                  idl_parse_line_and_file(ace_tao_yytext);
-+                }
+                   idl_parse_line_and_file(ace_tao_yytext);
+                 }
+-        TAO_YY_BREAK
 +        break;
  case 95:
--/* rule 95 can match eol */
  case 96:
--/* rule 96 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  {
--		  idl_parse_line_and_file(ace_yytext);
--	        }
--	YY_BREAK
-+                  idl_parse_line_and_file(ace_tao_yytext);
-+                }
+                   idl_parse_line_and_file(ace_tao_yytext);
+                 }
+-        TAO_YY_BREAK
 +        break;
  case 97:
--/* rule 97 can match eol */
  case 98:
--/* rule 98 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
- {
--		  /* ignore cpp ident */
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		}
--	YY_BREAK
-+                  /* ignore cpp ident */
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                }
+ TAO_YY_RULE_SETUP
+@@ -1634,14 +1634,14 @@
+                   /* ignore cpp ident */
+                   idl_global->set_lineno(idl_global->lineno() + 1);
+                 }
+-        TAO_YY_BREAK
 +        break;
  case 99:
--/* rule 99 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  {
--		  /* ignore comments */
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		}
--	YY_BREAK
-+                  /* ignore comments */
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                }
+                   /* ignore comments */
+                   idl_global->set_lineno(idl_global->lineno() + 1);
+                 }
+-        TAO_YY_BREAK
 +        break;
  case 100:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  {
--		  for(;;) {
--		    char c = yyinput();
--		    if (c == '*') {
--		      char next = yyinput();
--		      if (next == '/')
--			break;
--		      else
--			yyunput(c, NULL);
--	              if (c == '\n')
--		        idl_global->set_lineno(idl_global->lineno() + 1);
--		    }
--	          }
--	        }
--	YY_BREAK
-+                  for(;;) {
-+                    char c = tao_yyinput();
-+                    if (c == '*') {
-+                      char next = tao_yyinput();
-+                      if (next == '/')
-+                        break;
-+                      else
-+                        tao_yyunput(c, NULL);
-+                      if (c == '\n')
-+                        idl_global->set_lineno(idl_global->lineno() + 1);
-+                    }
-+                  }
-+                }
+@@ -1658,17 +1658,17 @@
+                     }
+                   }
+                 }
+-        TAO_YY_BREAK
 +        break;
  case 101:
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  ;
--	YY_BREAK
+-        TAO_YY_BREAK
 +        break;
  case 102:
--/* rule 102 can match eol */
--YY_RULE_SETUP
-+TAO_YY_RULE_SETUP
+ TAO_YY_RULE_SETUP
  {
--  		  idl_global->set_lineno(idl_global->lineno() + 1);
--		}
--	YY_BREAK
-+                  idl_global->set_lineno(idl_global->lineno() + 1);
-+                }
+                   idl_global->set_lineno(idl_global->lineno() + 1);
+                 }
+-        TAO_YY_BREAK
 +        break;
  case 103:
--YY_RULE_SETUP
--return ace_yytext [0];
--	YY_BREAK
-+TAO_YY_RULE_SETUP
-+return ace_tao_yytext [0];
-+        break;
+ TAO_YY_RULE_SETUP
+ return ace_tao_yytext [0];
+@@ -1676,7 +1676,7 @@
  case 104:
--YY_RULE_SETUP
--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_LVALUE->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_LVALUE->yy_n_chars;
--			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
--			YY_CURRENT_BUFFER_LVALUE->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_LVALUE->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_last_accepting_cpos);
--				yy_current_state = (yy_last_accepting_state);
--				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_LVALUE->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 */
-+TAO_YY_RULE_SETUP
-+TAO_YY_ECHO;
+ TAO_YY_RULE_SETUP
+ TAO_YY_ECHO;
+-        TAO_YY_BREAK
 +        break;
-+case TAO_YY_STATE_EOF(INITIAL):
-+        tao_yyterminate();
-+
-+        case TAO_YY_END_OF_BUFFER:
-+                {
-+                /* Amount of text matched not including the EOB char. */
-+                int tao_yy_amount_of_matched_text = (int) (tao_yy_cp - tao_yytext_ptr) - 1;
-+
-+                /* Undo the effects of TAO_YY_DO_BEFORE_ACTION. */
-+                *tao_yy_cp = tao_yy_hold_char;
-+                TAO_YY_RESTORE_TAO_YY_MORE_OFFSET
-+
-+                if ( tao_yy_current_buffer->tao_yy_buffer_status == TAO_YY_BUFFER_NEW )
-+                        {
-+                        /* We're scanning a new file or input source.  It's
-+                         * possible that this happened because the user
-+                         * just pointed tao_yyin at a new source and called
-+                         * tao_yylex().  If so, then we have to assure
-+                         * consistency between tao_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.
-+                         */
-+                        tao_yy_n_chars = tao_yy_current_buffer->tao_yy_n_chars;
-+                        tao_yy_current_buffer->tao_yy_input_file = tao_yyin;
-+                        tao_yy_current_buffer->tao_yy_buffer_status = TAO_YY_BUFFER_NORMAL;
-+                        }
-+
-+                /* Note that here we test for tao_yy_c_buf_p "<=" to the position
-+                 * of the first EOB in the buffer, since tao_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 ( tao_yy_c_buf_p <= &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] )
-+                        { /* This was really a NUL. */
-+                        tao_yy_state_type tao_yy_next_state;
-+
-+                        tao_yy_c_buf_p = tao_yytext_ptr + tao_yy_amount_of_matched_text;
-+
-+                        tao_yy_current_state = tao_yy_get_previous_state();
-+
-+                        /* Okay, we're now positioned to make the NUL
-+                         * transition.  We couldn't have
-+                         * tao_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).
-+                         */
-+
-+                        tao_yy_next_state = tao_yy_try_NUL_trans( tao_yy_current_state );
-+
-+                        tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-+
-+                        if ( tao_yy_next_state )
-+                                {
-+                                /* Consume the NUL. */
-+                                tao_yy_cp = ++tao_yy_c_buf_p;
-+                                tao_yy_current_state = tao_yy_next_state;
-+                                goto tao_yy_match;
-+                                }
-+
-+                        else
-+                                {
-+                                tao_yy_cp = tao_yy_c_buf_p;
-+                                goto tao_yy_find_action;
-+                                }
-+                        }
-+
-+                else switch ( tao_yy_get_next_buffer() )
-+                        {
-+                        case EOB_ACT_END_OF_FILE:
-+                                {
-+                                tao_yy_did_buffer_switch_on_eof = 0;
-+
-+                                if ( tao_yywrap() )
-+                                        {
-+                                        /* Note: because we've taken care in
-+                                         * tao_yy_get_next_buffer() to have set up
-+                                         * tao_yytext, we can now set up
-+                                         * tao_yy_c_buf_p so that if some total
-+                                         * hoser (like flex itself) wants to
-+                                         * call the scanner after we return the
-+                                         * TAO_YY_NULL, it'll still work - another
-+                                         * TAO_YY_NULL will get returned.
-+                                         */
-+                                        tao_yy_c_buf_p = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-+
-+                                        tao_yy_act = TAO_YY_STATE_EOF(TAO_YY_START);
-+                                        goto do_action;
-+                                        }
-+
-+                                else
-+                                        {
-+                                        if ( ! tao_yy_did_buffer_switch_on_eof )
-+                                                TAO_YY_NEW_FILE;
-+                                        }
-+                                break;
-+                                }
-+
-+                        case EOB_ACT_CONTINUE_SCAN:
-+                                tao_yy_c_buf_p =
-+                                        tao_yytext_ptr + tao_yy_amount_of_matched_text;
-+
-+                                tao_yy_current_state = tao_yy_get_previous_state();
-+
-+                                tao_yy_cp = tao_yy_c_buf_p;
-+                                tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-+                                goto tao_yy_match;
-+
-+                        case EOB_ACT_LAST_MATCH:
-+                                tao_yy_c_buf_p =
-+                                &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars];
-+
-+                                tao_yy_current_state = tao_yy_get_previous_state();
-+
-+                                tao_yy_cp = tao_yy_c_buf_p;
-+                                tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-+                                goto tao_yy_find_action;
-+                        }
-+                break;
-+                }
-+
-+        default:
-+                TAO_YY_FATAL_ERROR(
-+                        "fatal flex scanner internal error--no action found" );
-+        } /* end of action switch */
-+                } /* end of scanning one token */
-+        } /* end of tao_yylex */
-+
- 
--/* yy_get_next_buffer - try to read in a new buffer
-+/* tao_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 (void)
--{
--    	register char *dest = YY_CURRENT_BUFFER_LVALUE->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_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
--		YY_FATAL_ERROR(
--		"fatal flex scanner internal error--end of buffer missed" );
--
--	if ( YY_CURRENT_BUFFER_LVALUE->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_LVALUE->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_LVALUE->yy_n_chars = (yy_n_chars) = 0;
--
--	else
--		{
--			size_t num_to_read =
--			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
--
--		while ( num_to_read <= 0 )
--			{ /* Not enough room in the buffer - grow it. */
--
--			/* 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. */
--					yyrealloc((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_LVALUE->yy_buf_size -
--						number_to_move - 1;
--
--			}
--
--		if ( num_to_read > YY_READ_BUF_SIZE )
--			num_to_read = YY_READ_BUF_SIZE;
--
--		/* Read in more data. */
--		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
--			(yy_n_chars), num_to_read );
--
--		YY_CURRENT_BUFFER_LVALUE->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_LVALUE->yy_buffer_status =
--				YY_BUFFER_EOF_PENDING;
--			}
--		}
--
--	else
--		ret_val = EOB_ACT_CONTINUE_SCAN;
--
--	(yy_n_chars) += number_to_move;
--	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
--	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-+ *      EOB_ACT_LAST_MATCH -
-+ *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
-+ *      EOB_ACT_END_OF_FILE - end of file
-+ */
-+
-+static int tao_yy_get_next_buffer()
-+        {
-+        register char *dest = tao_yy_current_buffer->tao_yy_ch_buf;
-+        register char *source = tao_yytext_ptr;
-+        register int number_to_move, i;
-+        int ret_val;
-+
-+        if ( tao_yy_c_buf_p > &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars + 1] )
-+                TAO_YY_FATAL_ERROR(
-+                "fatal flex scanner internal error--end of buffer missed" );
-+
-+        if ( tao_yy_current_buffer->tao_yy_fill_buffer == 0 )
-+                { /* Don't try to fill the buffer, so this is an EOF. */
-+                if ( tao_yy_c_buf_p - tao_yytext_ptr - TAO_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;
-+                        }
-+                }
- 
--	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-+        /* Try to read more data. */
- 
--	return ret_val;
--}
-+        /* First move last chars to start of buffer. */
-+        number_to_move = (int) (tao_yy_c_buf_p - tao_yytext_ptr) - 1;
- 
--/* yy_get_previous_state - get the state just before the EOB char was reached */
-+        for ( i = 0; i < number_to_move; ++i )
-+                *(dest++) = *(source++);
- 
--    static yy_state_type yy_get_previous_state (void)
--{
--	register yy_state_type yy_current_state;
--	register char *yy_cp;
--    
--	yy_current_state = (yy_start);
--	yy_current_state += YY_AT_BOL();
--
--	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 >= 551 )
--				yy_c = yy_meta[(unsigned int) yy_c];
--			}
--		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
--		}
-+        if ( tao_yy_current_buffer->tao_yy_buffer_status == TAO_YY_BUFFER_EOF_PENDING )
-+                /* don't do the read, it's not guaranteed to return an EOF,
-+                 * just force an EOF
-+                 */
-+                tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars = 0;
-+
-+        else
-+                {
-+                int num_to_read =
-+                        tao_yy_current_buffer->tao_yy_buf_size - number_to_move - 1;
-+
-+                while ( num_to_read <= 0 )
-+                        { /* Not enough room in the buffer - grow it. */
-+#ifdef TAO_YY_USES_REJECT
-+                        TAO_YY_FATAL_ERROR(
-+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-+#else
-+
-+                        /* just a shorter name for the current buffer */
-+                        TAO_YY_BUFFER_STATE b = tao_yy_current_buffer;
-+
-+                        int tao_yy_c_buf_p_offset =
-+                                (int) (tao_yy_c_buf_p - b->tao_yy_ch_buf);
-+
-+                        if ( b->tao_yy_is_our_buffer )
-+                                {
-+                                int new_size = b->tao_yy_buf_size * 2;
-+
-+                                if ( new_size <= 0 )
-+                                        b->tao_yy_buf_size += b->tao_yy_buf_size / 8;
-+                                else
-+                                        b->tao_yy_buf_size *= 2;
-+
-+                                b->tao_yy_ch_buf = (char *)
-+                                        /* Include room in for 2 EOB chars. */
-+                                        tao_yy_flex_realloc( (void *) b->tao_yy_ch_buf,
-+                                                         b->tao_yy_buf_size + 2 );
-+                                }
-+                        else
-+                                /* Can't grow it, we don't own it. */
-+                                b->tao_yy_ch_buf = 0;
-+
-+                        if ( ! b->tao_yy_ch_buf )
-+                                TAO_YY_FATAL_ERROR(
-+                                "fatal error - scanner input buffer overflow" );
-+
-+                        tao_yy_c_buf_p = &b->tao_yy_ch_buf[tao_yy_c_buf_p_offset];
-+
-+                        num_to_read = tao_yy_current_buffer->tao_yy_buf_size -
-+                                                number_to_move - 1;
-+#endif
-+                        }
-+
-+                if ( num_to_read > TAO_YY_READ_BUF_SIZE )
-+                        num_to_read = TAO_YY_READ_BUF_SIZE;
-+
-+                /* Read in more data. */
-+                TAO_YY_INPUT( (&tao_yy_current_buffer->tao_yy_ch_buf[number_to_move]),
-+                        tao_yy_n_chars, num_to_read );
-+
-+                tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars;
-+                }
-+
-+        if ( tao_yy_n_chars == 0 )
-+                {
-+                if ( number_to_move == TAO_YY_MORE_ADJ )
-+                        {
-+                        ret_val = EOB_ACT_END_OF_FILE;
-+                        tao_yyrestart( tao_yyin );
-+                        }
-+
-+                else
-+                        {
-+                        ret_val = EOB_ACT_LAST_MATCH;
-+                        tao_yy_current_buffer->tao_yy_buffer_status =
-+                                TAO_YY_BUFFER_EOF_PENDING;
-+                        }
-+                }
-+
-+        else
-+                ret_val = EOB_ACT_CONTINUE_SCAN;
-+
-+        tao_yy_n_chars += number_to_move;
-+        tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] = TAO_YY_END_OF_BUFFER_CHAR;
-+        tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars + 1] = TAO_YY_END_OF_BUFFER_CHAR;
-+
-+        tao_yytext_ptr = &tao_yy_current_buffer->tao_yy_ch_buf[0];
-+
-+        return ret_val;
-+        }
- 
--	return yy_current_state;
--}
- 
--/* yy_try_NUL_trans - try to make a transition on the NUL character
-+/* tao_yy_get_previous_state - get the state just before the EOB char was reached */
-+
-+static tao_yy_state_type tao_yy_get_previous_state()
-+        {
-+        register tao_yy_state_type tao_yy_current_state;
-+        register char *tao_yy_cp;
-+
-+        tao_yy_current_state = tao_yy_start;
-+        tao_yy_current_state += TAO_YY_AT_BOL();
-+
-+        for ( tao_yy_cp = tao_yytext_ptr + TAO_YY_MORE_ADJ; tao_yy_cp < tao_yy_c_buf_p; ++tao_yy_cp )
-+                {
-+                register TAO_YY_CHAR tao_yy_c = (*tao_yy_cp ? tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)] : 1);
-+                if ( tao_yy_accept[tao_yy_current_state] )
-+                        {
-+                        tao_yy_last_accepting_state = tao_yy_current_state;
-+                        tao_yy_last_accepting_cpos = tao_yy_cp;
-+                        }
-+                while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-+                        {
-+                        tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-+                        if ( tao_yy_current_state >= 551 )
-+                                tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-+                        }
-+                tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-+                }
-+
-+        return tao_yy_current_state;
-+        }
-+
-+
-+/* tao_yy_try_NUL_trans - try to make a transition on the NUL character
-  *
-  * synopsis
-- *	next_state = yy_try_NUL_trans( current_state );
-+ *      next_state = tao_yy_try_NUL_trans( current_state );
-  */
--    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
--{
--	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 >= 551 )
--			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 == 550);
-+#ifdef TAO_YY_USE_PROTOS
-+static tao_yy_state_type tao_yy_try_NUL_trans( tao_yy_state_type tao_yy_current_state )
-+#else
-+static tao_yy_state_type tao_yy_try_NUL_trans( tao_yy_current_state )
-+tao_yy_state_type tao_yy_current_state;
-+#endif
-+        {
-+        register int tao_yy_is_jam;
-+        register char *tao_yy_cp = tao_yy_c_buf_p;
- 
--	return yy_is_jam ? 0 : yy_current_state;
--}
-+        register TAO_YY_CHAR tao_yy_c = 1;
-+        if ( tao_yy_accept[tao_yy_current_state] )
-+                {
-+                tao_yy_last_accepting_state = tao_yy_current_state;
-+                tao_yy_last_accepting_cpos = tao_yy_cp;
-+                }
-+        while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-+                {
-+                tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-+                if ( tao_yy_current_state >= 551 )
-+                        tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-+                }
-+        tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-+        tao_yy_is_jam = (tao_yy_current_state == 550);
-+
-+        return tao_yy_is_jam ? 0 : tao_yy_current_state;
-+        }
-+
-+
-+#ifndef TAO_YY_NO_UNPUT
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yyunput( int c, register char *tao_yy_bp )
-+#else
-+static void tao_yyunput( c, tao_yy_bp )
-+int c;
-+register char *tao_yy_bp;
-+#endif
-+        {
-+        register char *tao_yy_cp = tao_yy_c_buf_p;
-+
-+        /* undo effects of setting up tao_yytext */
-+        *tao_yy_cp = tao_yy_hold_char;
-+
-+        if ( tao_yy_cp < tao_yy_current_buffer->tao_yy_ch_buf + 2 )
-+                { /* need to shift things up to make room */
-+                /* +2 for EOB chars. */
-+                register int number_to_move = tao_yy_n_chars + 2;
-+                register char *dest = &tao_yy_current_buffer->tao_yy_ch_buf[
-+                                        tao_yy_current_buffer->tao_yy_buf_size + 2];
-+                register char *source =
-+                                &tao_yy_current_buffer->tao_yy_ch_buf[number_to_move];
-+
-+                while ( source > tao_yy_current_buffer->tao_yy_ch_buf )
-+                        *--dest = *--source;
-+
-+                tao_yy_cp += (int) (dest - source);
-+                tao_yy_bp += (int) (dest - source);
-+                tao_yy_current_buffer->tao_yy_n_chars =
-+                        tao_yy_n_chars = tao_yy_current_buffer->tao_yy_buf_size;
-+
-+                if ( tao_yy_cp < tao_yy_current_buffer->tao_yy_ch_buf + 2 )
-+                        TAO_YY_FATAL_ERROR( "flex scanner push-back overflow" );
-+                }
-+
-+        *--tao_yy_cp = (char) c;
-+
-+
-+        tao_yytext_ptr = tao_yy_bp;
-+        tao_yy_hold_char = *tao_yy_cp;
-+        tao_yy_c_buf_p = tao_yy_cp;
-+        }
-+#endif  /* ifndef TAO_YY_NO_UNPUT */
- 
--    static void yyunput (int c, register char * yy_bp )
--{
--	register char *yy_cp;
--    
--    yy_cp = (yy_c_buf_p);
--
--	/* undo effects of setting up yytext */
--	*yy_cp = (yy_hold_char);
--
--	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->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_LVALUE->yy_ch_buf[
--					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
--		register char *source =
--				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
--
--		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
--			*--dest = *--source;
--
--		yy_cp += (int) (dest - source);
--		yy_bp += (int) (dest - source);
--		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
--			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
--
--		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->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;
--}
- 
--#ifndef YY_NO_INPUT
- #ifdef __cplusplus
--    static int yyinput (void)
-+static int tao_yyinput()
- #else
--    static int input  (void)
-+static int input()
- #endif
-+        {
-+        int c;
- 
--{
--	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_LVALUE->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 );
--
--					/*FALLTHROUGH*/
--
--				case EOB_ACT_END_OF_FILE:
--					{
--					if ( yywrap( ) )
--						return EOF;
-+        *tao_yy_c_buf_p = tao_yy_hold_char;
-+
-+        if ( *tao_yy_c_buf_p == TAO_YY_END_OF_BUFFER_CHAR )
-+                {
-+                /* tao_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 ( tao_yy_c_buf_p < &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] )
-+                        /* This was really a NUL. */
-+                        *tao_yy_c_buf_p = '\0';
-+
-+                else
-+                        { /* need more input */
-+                        int offset = tao_yy_c_buf_p - tao_yytext_ptr;
-+                        ++tao_yy_c_buf_p;
-+
-+                        switch ( tao_yy_get_next_buffer() )
-+                                {
-+                                case EOB_ACT_LAST_MATCH:
-+                                        /* This happens because tao_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. */
-+                                        tao_yyrestart( tao_yyin );
-+
-+                                        /* fall through */
-+
-+                                case EOB_ACT_END_OF_FILE:
-+                                        {
-+                                        if ( tao_yywrap() )
-+                                                return EOF;
- 
--					if ( ! (yy_did_buffer_switch_on_eof) )
--						YY_NEW_FILE;
-+                                        if ( ! tao_yy_did_buffer_switch_on_eof )
-+                                                TAO_YY_NEW_FILE;
- #ifdef __cplusplus
--					return yyinput();
-+                                        return tao_yyinput();
- #else
--					return input();
-+                                        return input();
- #endif
--					}
-+                                        }
- 
--				case EOB_ACT_CONTINUE_SCAN:
--					(yy_c_buf_p) = (yytext_ptr) + offset;
--					break;
--				}
--			}
--		}
-+                                case EOB_ACT_CONTINUE_SCAN:
-+                                        tao_yy_c_buf_p = tao_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);
-+        c = *(unsigned char *) tao_yy_c_buf_p;  /* cast for 8-bit char's */
-+        *tao_yy_c_buf_p = '\0'; /* preserve tao_yytext */
-+        tao_yy_hold_char = *++tao_yy_c_buf_p;
- 
--	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
-+        tao_yy_current_buffer->tao_yy_at_bol = (c == '\n');
- 
--	return c;
--}
--#endif	/* ifndef YY_NO_INPUT */
-+        return c;
-+        }
- 
--/** Immediately switch to a different input stream.
-- * @param input_file A readable stream.
-- * 
-- * @note This function does not reset the start condition to @c INITIAL .
-- */
--    void yyrestart  (FILE * input_file )
--{
--    
--	if ( ! YY_CURRENT_BUFFER ){
--        yyensure_buffer_stack ();
--		YY_CURRENT_BUFFER_LVALUE =
--            yy_create_buffer(yyin,YY_BUF_SIZE );
--	}
- 
--	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
--	yy_load_buffer_state( );
--}
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yyrestart( FILE *input_file )
-+#else
-+void tao_yyrestart( input_file )
-+FILE *input_file;
-+#endif
-+        {
-+        if ( ! tao_yy_current_buffer )
-+                tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE );
- 
--/** Switch to a different input buffer.
-- * @param new_buffer The new input buffer.
-- * 
-- */
--    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
--{
--    
--	/* TODO. We should be able to replace this entire function body
--	 * with
--	 *		yypop_buffer_state();
--	 *		yypush_buffer_state(new_buffer);
--     */
--	yyensure_buffer_stack ();
--	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_LVALUE->yy_buf_pos = (yy_c_buf_p);
--		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
--		}
--
--	YY_CURRENT_BUFFER_LVALUE = 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;
--}
-+        tao_yy_init_buffer( tao_yy_current_buffer, input_file );
-+        tao_yy_load_buffer_state();
-+        }
- 
--static void yy_load_buffer_state  (void)
--{
--    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
--	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
--	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
--	(yy_hold_char) = *(yy_c_buf_p);
--}
- 
--/** Allocate and initialize an input buffer state.
-- * @param file A readable stream.
-- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
-- * 
-- * @return the allocated buffer state.
-- */
--    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
--{
--	YY_BUFFER_STATE b;
--    
--	b = (YY_BUFFER_STATE) yyalloc(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 *) yyalloc(b->yy_buf_size + 2  );
--	if ( ! b->yy_ch_buf )
--		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_switch_to_buffer( TAO_YY_BUFFER_STATE new_buffer )
-+#else
-+void tao_yy_switch_to_buffer( new_buffer )
-+TAO_YY_BUFFER_STATE new_buffer;
-+#endif
-+        {
-+        if ( tao_yy_current_buffer == new_buffer )
-+                return;
- 
--	b->yy_is_our_buffer = 1;
-+        if ( tao_yy_current_buffer )
-+                {
-+                /* Flush out information for old buffer. */
-+                *tao_yy_c_buf_p = tao_yy_hold_char;
-+                tao_yy_current_buffer->tao_yy_buf_pos = tao_yy_c_buf_p;
-+                tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars;
-+                }
- 
--	yy_init_buffer(b,file );
-+        tao_yy_current_buffer = new_buffer;
-+        tao_yy_load_buffer_state();
- 
--	return b;
--}
-+        /* We don't actually know whether we did this switch during
-+         * EOF (tao_yywrap()) processing, but the only time this flag
-+         * is looked at is after tao_yywrap() is called, so it's safe
-+         * to go ahead and always set it.
-+         */
-+        tao_yy_did_buffer_switch_on_eof = 1;
-+        }
- 
--/** Destroy the buffer.
-- * @param b a buffer created with yy_create_buffer()
-- * 
-- */
--    void yy_delete_buffer (YY_BUFFER_STATE  b )
--{
--    
--	if ( ! b )
--		return;
- 
--	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
--		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_load_buffer_state( void )
-+#else
-+void tao_yy_load_buffer_state()
-+#endif
-+        {
-+        tao_yy_n_chars = tao_yy_current_buffer->tao_yy_n_chars;
-+        tao_yytext_ptr = tao_yy_c_buf_p = tao_yy_current_buffer->tao_yy_buf_pos;
-+        tao_yyin = tao_yy_current_buffer->tao_yy_input_file;
-+        tao_yy_hold_char = *tao_yy_c_buf_p;
-+        }
- 
--	if ( b->yy_is_our_buffer )
--		yyfree((void *) b->yy_ch_buf  );
- 
--	yyfree((void *) b  );
--}
-+#ifdef TAO_YY_USE_PROTOS
-+TAO_YY_BUFFER_STATE tao_yy_create_buffer( FILE *file, int size )
-+#else
-+TAO_YY_BUFFER_STATE tao_yy_create_buffer( file, size )
-+FILE *file;
-+int size;
-+#endif
-+        {
-+        TAO_YY_BUFFER_STATE b;
- 
--/* Initializes or reinitializes a buffer.
-- * This function is sometimes called more than once on the same buffer,
-- * such as during a yyrestart() or at EOF.
-- */
--    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-+        b = (TAO_YY_BUFFER_STATE) tao_yy_flex_alloc( sizeof( struct tao_yy_buffer_state ) );
-+        if ( ! b )
-+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
- 
--{
--	int oerrno = errno;
--    
--	yy_flush_buffer(b );
-+        b->tao_yy_buf_size = size;
- 
--	b->yy_input_file = file;
--	b->yy_fill_buffer = 1;
-+        /* tao_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->tao_yy_ch_buf = (char *) tao_yy_flex_alloc( b->tao_yy_buf_size + 2 );
-+        if ( ! b->tao_yy_ch_buf )
-+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
- 
--    /* If b is the current buffer, then yy_init_buffer was _probably_
--     * called from yyrestart() or through yy_get_next_buffer.
--     * In that case, we don't want to reset the lineno or column.
--     */
--    if (b != YY_CURRENT_BUFFER){
--        b->yy_bs_lineno = 1;
--        b->yy_bs_column = 0;
--    }
-+        b->tao_yy_is_our_buffer = 1;
- 
--        b->yy_is_interactive = 0;
--    
--	errno = oerrno;
--}
-+        tao_yy_init_buffer( b, file );
- 
--/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
-- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
-- * 
-- */
--    void yy_flush_buffer (YY_BUFFER_STATE  b )
--{
--    	if ( ! b )
--		return;
-+        return b;
-+        }
- 
--	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;
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_delete_buffer( TAO_YY_BUFFER_STATE b )
-+#else
-+void tao_yy_delete_buffer( b )
-+TAO_YY_BUFFER_STATE b;
-+#endif
-+        {
-+        if ( ! b )
-+                return;
- 
--	b->yy_buf_pos = &b->yy_ch_buf[0];
-+        if ( b == tao_yy_current_buffer )
-+                tao_yy_current_buffer = (TAO_YY_BUFFER_STATE) 0;
- 
--	b->yy_at_bol = 1;
--	b->yy_buffer_status = YY_BUFFER_NEW;
-+        if ( b->tao_yy_is_our_buffer )
-+                tao_yy_flex_free( (void *) b->tao_yy_ch_buf );
- 
--	if ( b == YY_CURRENT_BUFFER )
--		yy_load_buffer_state( );
--}
-+        tao_yy_flex_free( (void *) b );
-+        }
- 
--/** Pushes the new state onto the stack. The new state becomes
-- *  the current state. This function will allocate the stack
-- *  if necessary.
-- *  @param new_buffer The new state.
-- *  
-- */
--void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
--{
--    	if (new_buffer == NULL)
--		return;
--
--	yyensure_buffer_stack();
--
--	/* This block is copied from yy_switch_to_buffer. */
--	if ( YY_CURRENT_BUFFER )
--		{
--		/* Flush out information for old buffer. */
--		*(yy_c_buf_p) = (yy_hold_char);
--		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
--		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
--		}
--
--	/* Only push if top exists. Otherwise, replace top. */
--	if (YY_CURRENT_BUFFER)
--		(yy_buffer_stack_top)++;
--	YY_CURRENT_BUFFER_LVALUE = new_buffer;
--
--	/* copied from yy_switch_to_buffer. */
--	yy_load_buffer_state( );
--	(yy_did_buffer_switch_on_eof) = 1;
--}
- 
--/** Removes and deletes the top of the stack, if present.
-- *  The next element becomes the new top.
-- *  
-- */
--void yypop_buffer_state (void)
--{
--    	if (!YY_CURRENT_BUFFER)
--		return;
--
--	yy_delete_buffer(YY_CURRENT_BUFFER );
--	YY_CURRENT_BUFFER_LVALUE = NULL;
--	if ((yy_buffer_stack_top) > 0)
--		--(yy_buffer_stack_top);
--
--	if (YY_CURRENT_BUFFER) {
--		yy_load_buffer_state( );
--		(yy_did_buffer_switch_on_eof) = 1;
--	}
--}
-+#ifndef TAO_YY_ALWAYS_INTERACTIVE
-+#ifndef TAO_YY_NEVER_INTERACTIVE
-+extern int isatty TAO_YY_PROTO(( int ));
-+#endif
-+#endif
- 
--/* Allocates the stack if it does not exist.
-- *  Guarantees space for at least one push.
-- */
--static void yyensure_buffer_stack (void)
--{
--	int num_to_alloc;
--    
--	if (!(yy_buffer_stack)) {
--
--		/* First allocation is just for 2 elements, since we don't know if this
--		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
--		 * immediate realloc on the next call.
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_init_buffer( TAO_YY_BUFFER_STATE b, FILE *file )
-+#else
-+void tao_yy_init_buffer( b, file )
-+TAO_YY_BUFFER_STATE b;
-+FILE *file;
-+#endif
-+
-+
-+        {
-+        tao_yy_flush_buffer( b );
-+
-+        b->tao_yy_input_file = file;
-+        b->tao_yy_fill_buffer = 1;
-+
-+#ifdef TAO_YY_ALWAYS_INTERACTIVE
-+        b->tao_yy_is_interactive = 1;
-+#else
-+#ifdef TAO_YY_NEVER_INTERACTIVE
-+        b->tao_yy_is_interactive = 0;
-+#else
-+        b->tao_yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-+#endif
-+#endif
-+        }
-+
-+
-+#ifdef TAO_YY_USE_PROTOS
-+void tao_yy_flush_buffer( TAO_YY_BUFFER_STATE b )
-+#else
-+void tao_yy_flush_buffer( b )
-+TAO_YY_BUFFER_STATE b;
-+#endif
-+
-+        {
-+        if ( ! b )
-+                return;
-+
-+        b->tao_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.
-          */
--		num_to_alloc = 1;
--		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
--								(num_to_alloc * sizeof(struct yy_buffer_state*)
--								);
--		
--		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
--				
--		(yy_buffer_stack_max) = num_to_alloc;
--		(yy_buffer_stack_top) = 0;
--		return;
--	}
--
--	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
--
--		/* Increase the buffer to prepare for a possible push. */
--		int grow_size = 8 /* arbitrary grow size */;
--
--		num_to_alloc = (yy_buffer_stack_max) + grow_size;
--		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
--								((yy_buffer_stack),
--								num_to_alloc * sizeof(struct yy_buffer_state*)
--								);
--
--		/* zero only the new slots.*/
--		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
--		(yy_buffer_stack_max) = num_to_alloc;
--	}
--}
-+        b->tao_yy_ch_buf[0] = TAO_YY_END_OF_BUFFER_CHAR;
-+        b->tao_yy_ch_buf[1] = TAO_YY_END_OF_BUFFER_CHAR;
- 
--/** Setup the input buffer state to scan directly from a user-specified character buffer.
-- * @param base the character buffer
-- * @param size the size in bytes of the character buffer
-- * 
-- * @return the newly allocated buffer state object. 
-- */
--YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
--{
--	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) yyalloc(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;
-+        b->tao_yy_buf_pos = &b->tao_yy_ch_buf[0];
- 
--	yy_switch_to_buffer(b  );
-+        b->tao_yy_at_bol = 1;
-+        b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
- 
--	return b;
--}
-+        if ( b == tao_yy_current_buffer )
-+                tao_yy_load_buffer_state();
-+        }
- 
--/** Setup the input buffer state to scan a string. The next call to yylex() will
-- * scan from a @e copy of @a str.
-- * @param str a NUL-terminated string to scan
-- * 
-- * @return the newly allocated buffer state object.
-- * @note If you want to scan bytes that may contain NUL values, then use
-- *       yy_scan_bytes() instead.
-- */
--YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
--{
--    
--	return yy_scan_bytes(yy_str,strlen(yy_str) );
--}
- 
--/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
-- * scan from a @e copy of @a bytes.
-- * @param bytes the byte buffer to scan
-- * @param len the number of bytes in the buffer pointed to by @a bytes.
-- * 
-- * @return the newly allocated buffer state object.
-- */
--YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
--{
--	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 *) yyalloc(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;
-+#ifndef TAO_YY_NO_SCAN_BUFFER
-+#ifdef TAO_YY_USE_PROTOS
-+TAO_YY_BUFFER_STATE tao_yy_scan_buffer( char *base, tao_yy_size_t size )
-+#else
-+TAO_YY_BUFFER_STATE tao_yy_scan_buffer( base, size )
-+char *base;
-+tao_yy_size_t size;
-+#endif
-+        {
-+        TAO_YY_BUFFER_STATE b;
-+
-+        if ( size < 2 ||
-+             base[size-2] != TAO_YY_END_OF_BUFFER_CHAR ||
-+             base[size-1] != TAO_YY_END_OF_BUFFER_CHAR )
-+                /* They forgot to leave room for the EOB's. */
-+                return 0;
- 
--	return b;
--}
-+        b = (TAO_YY_BUFFER_STATE) tao_yy_flex_alloc( sizeof( struct tao_yy_buffer_state ) );
-+        if ( ! b )
-+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_buffer()" );
- 
--#ifndef YY_EXIT_FAILURE
--#define YY_EXIT_FAILURE 2
-+        b->tao_yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
-+        b->tao_yy_buf_pos = b->tao_yy_ch_buf = base;
-+        b->tao_yy_is_our_buffer = 0;
-+        b->tao_yy_input_file = 0;
-+        b->tao_yy_n_chars = b->tao_yy_buf_size;
-+        b->tao_yy_is_interactive = 0;
-+        b->tao_yy_at_bol = 1;
-+        b->tao_yy_fill_buffer = 0;
-+        b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
-+
-+        tao_yy_switch_to_buffer( b );
-+
-+        return b;
-+        }
- #endif
- 
--static void yy_fatal_error (yyconst char* msg )
--{
--    	(void) fprintf( stderr, "%s\n", msg );
--	exit( YY_EXIT_FAILURE );
--}
- 
--/* Redefine yyless() so it works in section 3 code. */
-+#ifndef TAO_YY_NO_SCAN_STRING
-+#ifdef TAO_YY_USE_PROTOS
-+TAO_YY_BUFFER_STATE tao_yy_scan_string( tao_yyconst char *tao_yy_str )
-+#else
-+TAO_YY_BUFFER_STATE tao_yy_scan_string( tao_yy_str )
-+tao_yyconst char *tao_yy_str;
-+#endif
-+        {
-+        int len;
-+        for ( len = 0; tao_yy_str[len]; ++len )
-+                ;
- 
--#undef yyless
--#define yyless(n) \
--	do \
--		{ \
--		/* Undo effects of setting up yytext. */ \
--        int yyless_macro_arg = (n); \
--        YY_LESS_LINENO(yyless_macro_arg);\
--		yytext[yyleng] = (yy_hold_char); \
--		(yy_c_buf_p) = yytext + yyless_macro_arg; \
--		(yy_hold_char) = *(yy_c_buf_p); \
--		*(yy_c_buf_p) = '\0'; \
--		yyleng = yyless_macro_arg; \
--		} \
--	while ( 0 )
--
--/* Accessor  methods (get/set functions) to struct members. */
-+        return tao_yy_scan_bytes( tao_yy_str, len );
-+        }
-+#endif
- 
--/** Get the current line number.
-- * 
-- */
--int yyget_lineno  (void)
--{
--        
--    return yylineno;
--}
- 
--/** Get the input stream.
-- * 
-- */
--FILE *yyget_in  (void)
--{
--        return yyin;
--}
-+#ifndef TAO_YY_NO_SCAN_BYTES
-+#ifdef TAO_YY_USE_PROTOS
-+TAO_YY_BUFFER_STATE tao_yy_scan_bytes( tao_yyconst char *bytes, int len )
-+#else
-+TAO_YY_BUFFER_STATE tao_yy_scan_bytes( bytes, len )
-+tao_yyconst char *bytes;
-+int len;
-+#endif
-+        {
-+        TAO_YY_BUFFER_STATE b;
-+        char *buf;
-+        tao_yy_size_t n;
-+        int i;
- 
--/** Get the output stream.
-- * 
-- */
--FILE *yyget_out  (void)
--{
--        return yyout;
--}
-+        /* Get memory for full buffer, including space for trailing EOB's. */
-+        n = len + 2;
-+        buf = (char *) tao_yy_flex_alloc( n );
-+        if ( ! buf )
-+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_bytes()" );
-+
-+        for ( i = 0; i < len; ++i )
-+                buf[i] = bytes[i];
-+
-+        buf[len] = buf[len+1] = TAO_YY_END_OF_BUFFER_CHAR;
-+
-+        b = tao_yy_scan_buffer( buf, n );
-+        if ( ! b )
-+                TAO_YY_FATAL_ERROR( "bad buffer in tao_yy_scan_bytes()" );
- 
--/** Get the length of the current token.
-- * 
-- */
--int yyget_leng  (void)
--{
--        return yyleng;
--}
-+        /* It's okay to grow etc. this buffer, and we should throw it
-+         * away when we're done.
-+         */
-+        b->tao_yy_is_our_buffer = 1;
- 
--/** Get the current token.
-- * 
-- */
-+        return b;
-+        }
-+#endif
- 
--char *yyget_text  (void)
--{
--        return yytext;
--}
- 
--/** Set the current line number.
-- * @param line_number
-- * 
-- */
--void yyset_lineno (int  line_number )
--{
--    
--    yylineno = line_number;
--}
-+#ifndef TAO_YY_NO_PUSH_STATE
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yy_push_state( int new_state )
-+#else
-+static void tao_yy_push_state( new_state )
-+int new_state;
-+#endif
-+        {
-+        if ( tao_yy_start_stack_ptr >= tao_yy_start_stack_depth )
-+                {
-+                tao_yy_size_t new_size;
- 
--/** Set the input stream. This does not discard the current
-- * input buffer.
-- * @param in_str A readable stream.
-- * 
-- * @see yy_switch_to_buffer
-- */
--void yyset_in (FILE *  in_str )
--{
--        yyin = in_str ;
--}
-+                tao_yy_start_stack_depth += TAO_YY_START_STACK_INCR;
-+                new_size = tao_yy_start_stack_depth * sizeof( int );
- 
--void yyset_out (FILE *  out_str )
--{
--        yyout = out_str ;
--}
-+                if ( ! tao_yy_start_stack )
-+                        tao_yy_start_stack = (int *) tao_yy_flex_alloc( new_size );
- 
--int yyget_debug  (void)
--{
--        return yy_flex_debug;
--}
-+                else
-+                        tao_yy_start_stack = (int *) tao_yy_flex_realloc(
-+                                        (void *) tao_yy_start_stack, new_size );
- 
--void yyset_debug (int  bdebug )
--{
--        yy_flex_debug = bdebug ;
--}
-+                if ( ! tao_yy_start_stack )
-+                        TAO_YY_FATAL_ERROR(
-+                        "out of memory expanding start-condition stack" );
-+                }
- 
--/* yylex_destroy is for both reentrant and non-reentrant scanners. */
--int yylex_destroy  (void)
--{
--    
--    /* Pop the buffer stack, destroying each element. */
--	while(YY_CURRENT_BUFFER){
--		yy_delete_buffer(YY_CURRENT_BUFFER  );
--		YY_CURRENT_BUFFER_LVALUE = NULL;
--		yypop_buffer_state();
--	}
--
--	/* Destroy the stack itself. */
--	yyfree((yy_buffer_stack) );
--	(yy_buffer_stack) = NULL;
-+        tao_yy_start_stack[tao_yy_start_stack_ptr++] = TAO_YY_START;
- 
--    return 0;
--}
-+        BEGIN(new_state);
-+        }
-+#endif
- 
--/*
-- * Internal utility routines.
-- */
- 
--#ifndef yytext_ptr
--static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
--{
--	register int i;
--    	for ( i = 0; i < n; ++i )
--		s1[i] = s2[i];
--}
-+#ifndef TAO_YY_NO_POP_STATE
-+static void tao_yy_pop_state()
-+        {
-+        if ( --tao_yy_start_stack_ptr < 0 )
-+                TAO_YY_FATAL_ERROR( "start-condition stack underflow" );
-+
-+        BEGIN(tao_yy_start_stack[tao_yy_start_stack_ptr]);
-+        }
- #endif
- 
--#ifdef YY_NEED_STRLEN
--static int yy_flex_strlen (yyconst char * s )
--{
--	register int n;
--    	for ( n = 0; s[n]; ++n )
--		;
- 
--	return n;
--}
-+#ifndef TAO_YY_NO_TOP_STATE
-+static int tao_yy_top_state()
-+        {
-+        return tao_yy_start_stack[tao_yy_start_stack_ptr - 1];
-+        }
- #endif
- 
--void *yyalloc (yy_size_t  size )
--{
--	return (void *) malloc( size );
--}
-+#ifndef TAO_YY_EXIT_FAILURE
-+#define TAO_YY_EXIT_FAILURE 2
-+#endif
- 
--void *yyrealloc  (void * ptr, yy_size_t  size )
--{
--	/* 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 *) realloc( (char *) ptr, size );
--}
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yy_fatal_error( tao_yyconst char msg[] )
-+#else
-+static void tao_yy_fatal_error( msg )
-+char msg[];
-+#endif
-+        {
-+        (void) fprintf( stderr, "%s\n", msg );
-+        exit( TAO_YY_EXIT_FAILURE );
-+        }
- 
--void yyfree (void * ptr )
--{
--	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
--}
- 
--#define YYTABLES_NAME "yytables"
- 
--#undef YY_NEW_FILE
--#undef YY_FLUSH_BUFFER
--#undef yy_set_bol
--#undef yy_new_buffer
--#undef yy_set_interactive
--#undef yytext_ptr
--#undef YY_DO_BEFORE_ACTION
--
--#ifdef YY_DECL_IS_OURS
--#undef YY_DECL_IS_OURS
--#undef YY_DECL
-+/* Redefine tao_yyless() so it works in section 3 code. */
-+
-+#undef tao_yyless
-+#define tao_yyless(n) \
-+        do \
-+                { \
-+                /* Undo effects of setting up tao_yytext. */ \
-+                tao_yytext[tao_yyleng] = tao_yy_hold_char; \
-+                tao_yy_c_buf_p = tao_yytext + n; \
-+                tao_yy_hold_char = *tao_yy_c_buf_p; \
-+                *tao_yy_c_buf_p = '\0'; \
-+                tao_yyleng = n; \
-+                } \
-+        while ( 0 )
-+
-+
-+/* Internal utility routines. */
-+
-+#ifndef tao_yytext_ptr
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yy_flex_strncpy( char *s1, tao_yyconst char *s2, int n )
-+#else
-+static void tao_yy_flex_strncpy( s1, s2, n )
-+char *s1;
-+tao_yyconst char *s2;
-+int n;
-+#endif
-+        {
-+        register int i;
-+        for ( i = 0; i < n; ++i )
-+                s1[i] = s2[i];
-+        }
- #endif
- 
--	/* subroutines */
-+#ifdef TAO_YY_NEED_STRLEN
-+#ifdef TAO_YY_USE_PROTOS
-+static int tao_yy_flex_strlen( tao_yyconst char *s )
-+#else
-+static int tao_yy_flex_strlen( s )
-+tao_yyconst char *s;
-+#endif
-+        {
-+        register int n;
-+        for ( n = 0; s[n]; ++n )
-+                ;
-+
-+        return n;
-+        }
-+#endif
-+
-+
-+#ifdef TAO_YY_USE_PROTOS
-+static void *tao_yy_flex_alloc( tao_yy_size_t size )
-+#else
-+static void *tao_yy_flex_alloc( size )
-+tao_yy_size_t size;
-+#endif
-+        {
-+        return (void *) malloc( size );
-+        }
-+
-+#ifdef TAO_YY_USE_PROTOS
-+static void *tao_yy_flex_realloc( void *ptr, tao_yy_size_t size )
-+#else
-+static void *tao_yy_flex_realloc( ptr, size )
-+void *ptr;
-+tao_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 *) realloc( (char *) ptr, size );
-+        }
-+
-+#ifdef TAO_YY_USE_PROTOS
-+static void tao_yy_flex_free( void *ptr )
-+#else
-+static void tao_yy_flex_free( ptr )
-+void *ptr;
-+#endif
-+        {
-+        free( ptr );
-+        }
-+
-+#ifdef TAO_YY_MAIN
-+int main()
-+        {
-+        tao_yylex();
-+        return 0;
-+        }
-+#endif
-+
-+        /* subroutines */
- 
- // Parse a #line statement generated by the C preprocessor
- static void
-@@ -2813,10 +2648,10 @@
-         {
-           if (h[j] == '\\' && h[j + 1] == '\\')
-             {
--	            j++;
-+                    j++;
-             }
- 
--	        h[i] = h[j];
-+                h[i] = h[j];
-         }
- 
-       h[i] = '\0';
-@@ -2845,7 +2680,7 @@
- 
-   // Strip off any command line -I prefix that may have been added
-   // by the preprocessor.
--  if (!(idl_global->in_main_file ()) && idl_global->import ()) 
-+  if (!(idl_global->in_main_file ()) && idl_global->import ())
-     {
-       ACE_NEW (
-           nm,
-@@ -2957,7 +2792,7 @@
-           ext_id.set (idl_global->filename ()->get_string (),
-                       0);
-           char *int_id = ACE::strnew (new_prefix);
--          (void) idl_global->file_prefixes ().rebind (ext_id, 
-+          (void) idl_global->file_prefixes ().rebind (ext_id,
-                                                       int_id);
-         }
-     }
-@@ -2992,7 +2827,7 @@
-           len = ACE_OS::strlen (number);
-         }
- 
--      // This call adds a proper null terminator to tmp, so no need to 
-+      // This call adds a proper null terminator to tmp, so no need to
-       // do it here.
-       AST_Decl *d = idl_find_node (tmp);
- 
-@@ -3009,7 +2844,7 @@
- 
-       d->version (ACE::strnew (number));
-     }
--  else if (ACE_OS::strncmp (buf + 8, "ident", 5) == 0) 
-+  else if (ACE_OS::strncmp (buf + 8, "ident", 5) == 0)
-     {
-       idl_global->ident_string (buf + 8);
-     }
-@@ -3039,7 +2874,7 @@
-                                                   new_id);
-               return;
-             }
--            
-+
-           d->repoID (new_id);
-           d->typeid_set (I_TRUE);
-         }
-@@ -3137,24 +2972,24 @@
-   double e, k;
-   long neg = 0, negexp = 0;
- 
--  if (*s == '-') 
-+  if (*s == '-')
-     {
-       neg = 1;
-       s++;
-     }
- 
--  while (*s >= '0' && *s <= '9') 
-+  while (*s >= '0' && *s <= '9')
-     {
-       d = (d * 10) + *s - '0';
-       s++;
-     }
- 
--  if (*s == '.') 
-+  if (*s == '.')
-     {
-       s++;
-       e = 10;
- 
--      while (*s >= '0' && *s <= '9') 
-+      while (*s >= '0' && *s <= '9')
-         {
-           d += (*s - '0') / (e * 1.0);
-           e *= 10;
-@@ -3162,15 +2997,15 @@
-         }
-     }
- 
--  if (*s == 'e' || *s == 'E') 
-+  if (*s == 'e' || *s == 'E')
-     {
-       s++;
- 
--      if (*s == '-') 
-+      if (*s == '-')
-         {
-             negexp = 1;
-             s++;
--        } 
-+        }
-       else if (*s == '+')
-         {
-           s++;
-@@ -3178,13 +3013,13 @@
- 
-       e = 0;
- 
--      while (*s >= '0' && *s <= '9') 
-+      while (*s >= '0' && *s <= '9')
-         {
-           e = (e * 10) + *s - '0';
-           s++;
-         }
- 
--      if (e > 0) 
-+      if (e > 0)
-         {
-           for (k = 1; e > 0; k *= 10, e--);
- 
-@@ -3199,7 +3034,7 @@
-         }
-     }
- 
--  if (neg) 
-+  if (neg)
-     {
-       d *= -1.0;
-     }
-@@ -3215,74 +3050,74 @@
-     char *str
-   )
- {
--  if (str[0] != '\\') 
-+  if (str[0] != '\\')
-     {
--	    return str[0];
-+            return str[0];
-     }
- 
--  switch (str[1]) 
-+  switch (str[1])
-   {
-     case 'n':
--      return '\n';
-+            return '\n';
-     case 't':
--      return '\t';
-+            return '\t';
-     case 'v':
--      return '\v';
-+            return '\v';
-     case 'b':
--      return '\b';
-+            return '\b';
-     case 'r':
--      return '\r';
-+            return '\r';
-     case 'f':
--      return '\f';
-+            return '\f';
-     case 'a':
--      return '\a';
-+            return '\a';
-     case '\\':
--      return '\\';
-+            return '\\';
-     case '\?':
--      return '?';
-+            return '?';
-     case '\'':
--      return '\'';
-+            return '\'';
-     case '"':
--      return '"';
-+            return '"';
-     case 'x':
--      {
--        int i;
-+            {
-+              int i;
- 
--        // hex value
--        for (i = 2; str[i] != '\0' && isxdigit (str[i]); ++i) 
-+              // hex value
-+              for (i = 2; str[i] != '\0' && isxdigit(str[i]); ++i)
-           {
--	     continue;
--	  }
-+                        continue;
-+                }
- 
--        char save = str[i];
--        str[i] = '\0';
--        char out = (char)idl_atoui(&str[2], 16);
--        str[i] = save;
--        return out;
--      }
--      ACE_NOTREACHED (break;)
-+              char save = str[i];
-+              str[i] = '\0';
-+              char out = (char)idl_atoui(&str[2], 16);
-+              str[i] = save;
-+              return out;
-+            }
-+            ACE_NOTREACHED (break;)
-     default:
--      // check for octal value
--      if (str[1] >= '0' && str[1] <= '7') 
-+            // check for octal value
-+            if (str[1] >= '0' && str[1] <= '7')
-         {
-- 	  int i;
-+                int i;
- 
--	  for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i) 
-+                for (i = 1; str[i] >= '0' && str[i] <= '7'; ++i)
-             {
--	      continue;
--	    }
-+                          continue;
-+                  }
- 
--	  char save = str[i];
--	  str[i] = '\0';
--	  char out = (char)idl_atoui(&str[1], 8);
--	  str[i] = save;
--	  return out;
--	} 
--      else 
--        {
--	  return str[1] - 'a';
--	}
--      ACE_NOTREACHED  (break;)
-+                char save = str[i];
-+                str[i] = '\0';
-+                char out = (char)idl_atoui(&str[1], 8);
-+                str[i] = save;
-+                return out;
-+              }
-+      else
-+        {
-+                return str[1] - 'a';
-+              }
-+            ACE_NOTREACHED  (break;)
-   }
- }
- /*
-@@ -3302,6 +3137,7 @@
-     {
-       continue;
-     }
-+
-   char save = str[i];
-   str[i] = '\0';
-   ACE_CDR::WChar out = (ACE_CDR::WChar) idl_atoui (&str[2], 16);
-@@ -3425,4 +3261,3 @@
+ case TAO_YY_STATE_EOF(INITIAL):
+         tao_yyterminate();
  
-   return d;
- }
--
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 493280ecb2b..cbaafe249cb 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -1,5 +1,5 @@
 // $Id$
-/* A Bison parser, made by GNU Bison 1.875b.  */
+/* A Bison parser, made by GNU Bison 1.875c.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
@@ -307,7 +307,7 @@ typedef union TAO_YYSTYPE {
   FE_Declarator                 *deval;         /* Declarator value     */
   idl_bool                      bval;           /* Boolean value        */
   long                          ival;           /* Long value           */
-  ACE_UINT64                    uival;          /* Unsigned long value  */
+  idl_uns_long                  uival;          /* Unsigned long value  */
   double                        dval;           /* Double value         */
   float                         fval;           /* Float value          */
   char                          cval;           /* Char value           */
@@ -335,18 +335,25 @@ typedef union TAO_YYSTYPE {
 
 #if ! defined (tao_yyoverflow) || TAO_YYERROR_VERBOSE
 
+# ifndef TAO_YYFREE
+#  define TAO_YYFREE free
+# endif
+# ifndef TAO_YYMALLOC
+#  define TAO_YYMALLOC malloc
+# endif
+
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# if TAO_YYSTACK_USE_ALLOCA
-#  define TAO_YYSTACK_ALLOC alloca
+# ifdef TAO_YYSTACK_USE_ALLOCA
+#  if TAO_YYSTACK_USE_ALLOCA
+#   define TAO_YYSTACK_ALLOC alloca
+#  endif
 # else
-#  ifndef TAO_YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define TAO_YYSTACK_ALLOC alloca
-#   else
-#    ifdef __GNUC__
-#     define TAO_YYSTACK_ALLOC __builtin_alloca
-#    endif
+#  if defined (alloca) || defined (_ALLOCA_H)
+#   define TAO_YYSTACK_ALLOC alloca
+#  else
+#   ifdef __GNUC__
+#    define TAO_YYSTACK_ALLOC __builtin_alloca
 #   endif
 #  endif
 # endif
@@ -359,15 +366,15 @@ typedef union TAO_YYSTYPE {
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   define TAO_YYSIZE_T size_t
 #  endif
-#  define TAO_YYSTACK_ALLOC malloc
-#  define TAO_YYSTACK_FREE free
+#  define TAO_YYSTACK_ALLOC TAO_YYMALLOC
+#  define TAO_YYSTACK_FREE TAO_YYFREE
 # endif
 #endif /* ! defined (tao_yyoverflow) || TAO_YYERROR_VERBOSE */
 
 
 #if (! defined (tao_yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (TAO_YYSTYPE_IS_TRIVIAL)))
+         || (defined (TAO_YYSTYPE_IS_TRIVIAL) && TAO_YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union tao_yyalloc
@@ -382,23 +389,23 @@ union tao_yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define TAO_YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (TAO_YYSTYPE))				\
+     ((N) * (sizeof (short) + sizeof (TAO_YYSTYPE))                                \
       + TAO_YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef TAO_YYCOPY
-#  if 1 < __GNUC__
+#  if defined (__GNUC__) && 1 < __GNUC__
 #   define TAO_YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
-#   define TAO_YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  register TAO_YYSIZE_T tao_yyi;		\
-	  for (tao_yyi = 0; tao_yyi < (Count); tao_yyi++)	\
-	    (To)[tao_yyi] = (From)[tao_yyi];		\
-	}					\
+#   define TAO_YYCOPY(To, From, Count)                \
+      do                                        \
+        {                                        \
+          register TAO_YYSIZE_T tao_yyi;                \
+          for (tao_yyi = 0; tao_yyi < (Count); tao_yyi++)        \
+            (To)[tao_yyi] = (From)[tao_yyi];                \
+        }                                        \
       while (0)
 #  endif
 # endif
@@ -408,15 +415,15 @@ union tao_yyalloc
    elements in the stack, and TAO_YYPTR gives the new location of the
    stack.  Advance TAO_YYPTR to a properly aligned location for the next
    stack.  */
-# define TAO_YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	TAO_YYSIZE_T tao_yynewbytes;						\
-	TAO_YYCOPY (&tao_yyptr->Stack, Stack, tao_yysize);				\
-	Stack = &tao_yyptr->Stack;						\
-	tao_yynewbytes = tao_yystacksize * sizeof (*Stack) + TAO_YYSTACK_GAP_MAXIMUM; \
-	tao_yyptr += tao_yynewbytes / sizeof (*tao_yyptr);				\
-      }									\
+# define TAO_YYSTACK_RELOCATE(Stack)                                        \
+    do                                                                        \
+      {                                                                        \
+        TAO_YYSIZE_T tao_yynewbytes;                                                \
+        TAO_YYCOPY (&tao_yyptr->Stack, Stack, tao_yysize);                                \
+        Stack = &tao_yyptr->Stack;                                                \
+        tao_yynewbytes = tao_yystacksize * sizeof (*Stack) + TAO_YYSTACK_GAP_MAXIMUM; \
+        tao_yyptr += tao_yynewbytes / sizeof (*tao_yyptr);                                \
+      }                                                                        \
     while (0)
 
 #endif
@@ -445,7 +452,7 @@ union tao_yyalloc
 #define TAO_YYUNDEFTOK  2
 #define TAO_YYMAXUTOK   333
 
-#define TAO_YYTRANSLATE(TAO_YYX) 						\
+#define TAO_YYTRANSLATE(TAO_YYX)                                                 \
   ((unsigned int) (TAO_YYX) <= TAO_YYMAXUTOK ? tao_yytranslate[TAO_YYX] : TAO_YYUNDEFTOK)
 
 /* TAO_YYTRANSLATE[TAO_YYLEX] -- Bison symbol number corresponding to TAO_YYLEX.  */
@@ -676,49 +683,49 @@ static const unsigned short tao_yyrline[] =
      397,   408,   407,   418,   417,   428,   427,   438,   437,   451,
      456,   480,   485,   450,   501,   502,   507,   546,   551,   506,
      569,   568,   582,   611,   633,   658,   657,   669,   676,   677,
-     678,   679,   683,   694,   699,   738,   743,   698,   762,   801,
-     806,   760,   825,   823,   861,   860,   874,   880,   887,   894,
-     901,   923,   946,   960,   961,   965,   966,   967,   973,   972,
-     980,   979,   989,   990,   995,   994,  1005,  1004,  1015,  1014,
-    1025,  1024,  1035,  1034,  1045,  1044,  1055,  1054,  1065,  1064,
-    1078,  1091,  1089,  1119,  1126,  1137,  1136,  1162,  1160,  1181,
-    1192,  1214,  1238,  1265,  1270,  1275,  1280,  1264,  1329,  1330,
-    1331,  1332,  1333,  1334,  1335,  1347,  1352,  1423,  1425,  1427,
-    1428,  1442,  1443,  1457,  1458,  1471,  1472,  1482,  1495,  1496,
-    1506,  1519,  1520,  1530,  1540,  1553,  1554,  1564,  1574,  1587,
-    1617,  1618,  1627,  1632,  1639,  1644,  1649,  1654,  1660,  1665,
-    1671,  1680,  1752,  1751,  1761,  1766,  1771,  1776,  1799,  1808,
-    1807,  1860,  1861,  1865,  1873,  1874,  1902,  1903,  1904,  1905,
-    1906,  1907,  1908,  1909,  1913,  1914,  1915,  1919,  1920,  1921,
-    1925,  1926,  1930,  1943,  1941,  1971,  1978,  1979,  1983,  1996,
-    1994,  2024,  2031,  2048,  2067,  2068,  2072,  2077,  2082,  2090,
-    2095,  2100,  2108,  2113,  2118,  2126,  2140,  2145,  2153,  2161,
-    2169,  2177,  2186,  2185,  2201,  2231,  2236,  2200,  2255,  2258,
-    2259,  2263,  2263,  2273,  2278,  2272,  2337,  2336,  2351,  2350,
-    2365,  2370,  2375,  2380,  2422,  2427,  2364,  2451,  2459,  2473,
-    2483,  2491,  2492,  2589,  2592,  2593,  2598,  2603,  2597,  2633,
-    2632,  2646,  2657,  2679,  2687,  2686,  2702,  2707,  2701,  2724,
-    2723,  2770,  2790,  2811,  2816,  2845,  2850,  2810,  2876,  2881,
-    2879,  2886,  2890,  2925,  2930,  2923,  2987,  3039,  3049,  3038,
-    3064,  3069,  3062,  3101,  3124,  3134,  3139,  3132,  3169,  3191,
-    3200,  3199,  3229,  3240,  3262,  3270,  3275,  3269,  3303,  3304,
-    3309,  3314,  3319,  3324,  3308,  3385,  3390,  3395,  3400,  3384,
-    3466,  3471,  3497,  3502,  3465,  3520,  3525,  3578,  3583,  3518,
-    3620,  3626,  3633,  3640,  3641,  3653,  3659,  3696,  3652,  3718,
-    3717,  3728,  3727,  3740,  3745,  3743,  3750,  3755,  3760,  3754,
-    3797,  3796,  3807,  3806,  3819,  3824,  3822,  3829,  3834,  3839,
-    3833,  3889,  3897,  3898,  3899,  3941,  3946,  3951,  3960,  3965,
-    3959,  3977,  3985,  3990,  3984,  4002,  4010,  4015,  4009,  4027,
-    4035,  4040,  4034,  4052,  4059,  4072,  4070,  4098,  4105,  4126,
-    4156,  4157,  4161,  4187,  4227,  4232,  4186,  4251,  4256,  4249,
-    4282,  4281,  4292,  4299,  4300,  4305,  4304,  4315,  4314,  4325,
-    4324,  4335,  4334,  4345,  4344,  4355,  4354,  4367,  4403,  4421,
-    4446,  4482,  4488,  4495,  4529,  4563,  4598,  4597,  4647,  4652,
-    4657,  4662,  4667,  4672,  4646,  4699,  4698,  4709,  4716,  4723,
-    4731,  4736,  4730,  4748,  4749,  4753,  4755,  4754,  4765,  4764,
-    4779,  4814,  4777,  4848,  4883,  4846,  4915,  4916,  4917,  4921,
-    4922,  4926,  4950,  4977,  5018,  5023,  4975,  5040,  5050,  5069,
-    5081,  5080,  5113,  5154,  5159,  5111,  5176,  5181
+     678,   679,   683,   694,   699,   738,   743,   698,   772,   811,
+     816,   770,   835,   833,   871,   870,   884,   890,   897,   904,
+     911,   933,   956,   970,   971,   975,   976,   977,   983,   982,
+     990,   989,   999,  1000,  1005,  1004,  1015,  1014,  1025,  1024,
+    1035,  1034,  1045,  1044,  1055,  1054,  1065,  1064,  1075,  1074,
+    1088,  1101,  1099,  1129,  1136,  1147,  1146,  1172,  1170,  1191,
+    1202,  1239,  1263,  1290,  1295,  1300,  1305,  1289,  1354,  1355,
+    1356,  1357,  1358,  1359,  1360,  1372,  1377,  1448,  1450,  1452,
+    1453,  1467,  1468,  1482,  1483,  1496,  1497,  1507,  1520,  1521,
+    1531,  1544,  1545,  1555,  1565,  1578,  1579,  1589,  1599,  1612,
+    1642,  1643,  1652,  1657,  1664,  1669,  1674,  1679,  1685,  1690,
+    1696,  1705,  1779,  1778,  1788,  1793,  1798,  1803,  1826,  1835,
+    1834,  1887,  1888,  1892,  1900,  1901,  1929,  1930,  1931,  1932,
+    1933,  1934,  1935,  1936,  1940,  1941,  1942,  1946,  1947,  1948,
+    1952,  1953,  1957,  1970,  1968,  1998,  2005,  2006,  2010,  2023,
+    2021,  2051,  2058,  2075,  2094,  2095,  2099,  2104,  2109,  2117,
+    2122,  2127,  2135,  2140,  2145,  2153,  2167,  2172,  2180,  2188,
+    2196,  2204,  2213,  2212,  2228,  2258,  2263,  2227,  2282,  2285,
+    2286,  2290,  2290,  2300,  2305,  2299,  2364,  2363,  2378,  2377,
+    2392,  2397,  2402,  2407,  2450,  2455,  2391,  2479,  2487,  2501,
+    2511,  2519,  2520,  2617,  2620,  2621,  2626,  2631,  2625,  2661,
+    2660,  2674,  2685,  2707,  2715,  2714,  2730,  2735,  2729,  2752,
+    2751,  2800,  2820,  2841,  2846,  2875,  2880,  2840,  2906,  2911,
+    2909,  2916,  2920,  2955,  2960,  2953,  3017,  3072,  3082,  3071,
+    3097,  3102,  3095,  3134,  3158,  3168,  3173,  3166,  3203,  3226,
+    3235,  3234,  3264,  3275,  3297,  3305,  3310,  3304,  3338,  3339,
+    3344,  3349,  3354,  3359,  3343,  3420,  3425,  3430,  3435,  3419,
+    3501,  3506,  3532,  3537,  3500,  3555,  3560,  3613,  3618,  3553,
+    3655,  3661,  3668,  3675,  3676,  3688,  3694,  3731,  3687,  3753,
+    3752,  3763,  3762,  3775,  3780,  3778,  3785,  3790,  3795,  3789,
+    3832,  3831,  3842,  3841,  3854,  3859,  3857,  3864,  3869,  3874,
+    3868,  3917,  3925,  3926,  3927,  3970,  3975,  3980,  3989,  3994,
+    3988,  4006,  4014,  4019,  4013,  4031,  4039,  4044,  4038,  4056,
+    4064,  4069,  4063,  4081,  4088,  4101,  4099,  4127,  4134,  4155,
+    4185,  4186,  4190,  4216,  4256,  4261,  4215,  4280,  4285,  4278,
+    4311,  4310,  4321,  4328,  4329,  4334,  4333,  4344,  4343,  4354,
+    4353,  4364,  4363,  4374,  4373,  4384,  4383,  4396,  4437,  4455,
+    4480,  4530,  4536,  4543,  4577,  4611,  4646,  4645,  4695,  4700,
+    4705,  4710,  4715,  4720,  4694,  4747,  4746,  4757,  4764,  4771,
+    4779,  4784,  4778,  4796,  4797,  4801,  4803,  4802,  4813,  4812,
+    4827,  4862,  4825,  4896,  4931,  4894,  4963,  4964,  4965,  4969,
+    4970,  4974,  4998,  5025,  5066,  5071,  5023,  5088,  5098,  5117,
+    5129,  5128,  5161,  5202,  5207,  5159,  5224,  5229
 };
 #endif
 
@@ -741,18 +748,17 @@ static const char *const tao_yytname[] =
   "IDL_EMITS", "IDL_EVENTTYPE", "IDL_FINDER", "IDL_GETRAISES", "IDL_HOME",
   "IDL_IMPORT", "IDL_MULTIPLE", "IDL_PRIMARYKEY", "IDL_PROVIDES",
   "IDL_PUBLISHES", "IDL_SETRAISES", "IDL_TYPEID", "IDL_TYPEPREFIX",
-  "IDL_USES", "IDL_MANAGES", "IDL_INTEGER_LITERAL",
-  "IDL_UINTEGER_LITERAL", "IDL_STRING_LITERAL", "IDL_CHARACTER_LITERAL",
-  "IDL_FLOATING_PT_LITERAL", "IDL_TRUETOK", "IDL_FALSETOK",
-  "IDL_SCOPE_DELIMITOR", "IDL_LEFT_SHIFT", "IDL_RIGHT_SHIFT",
-  "IDL_WCHAR_LITERAL", "IDL_WSTRING_LITERAL", "';'", "'{'", "'}'", "':'",
-  "','", "'='", "'|'", "'^'", "'&'", "'+'", "'-'", "'*'", "'/'", "'%'",
-  "'~'", "'('", "')'", "'>'", "'<'", "'['", "']'", "$accept", "start",
-  "definitions", "definition", "@1", "@2", "@3", "@4", "@5", "@6", "@7",
-  "@8", "@9", "@10", "@11", "@12", "module", "@13", "@14", "@15", "@16",
-  "interface_def", "interface", "@17", "@18", "@19", "interface_decl",
-  "@20", "interface_header", "inheritance_spec", "@21", "value_def",
-  "valuetype", "value_concrete_decl", "@22", "@23", "@24",
+  "IDL_USES", "IDL_MANAGES", "IDL_INTEGER_LITERAL", "IDL_UINTEGER_LITERAL",
+  "IDL_STRING_LITERAL", "IDL_CHARACTER_LITERAL", "IDL_FLOATING_PT_LITERAL",
+  "IDL_TRUETOK", "IDL_FALSETOK", "IDL_SCOPE_DELIMITOR", "IDL_LEFT_SHIFT",
+  "IDL_RIGHT_SHIFT", "IDL_WCHAR_LITERAL", "IDL_WSTRING_LITERAL", "';'",
+  "'{'", "'}'", "':'", "','", "'='", "'|'", "'^'", "'&'", "'+'", "'-'",
+  "'*'", "'/'", "'%'", "'~'", "'('", "')'", "'>'", "'<'", "'['", "']'",
+  "$accept", "start", "definitions", "definition", "@1", "@2", "@3", "@4",
+  "@5", "@6", "@7", "@8", "@9", "@10", "@11", "@12", "module", "@13",
+  "@14", "@15", "@16", "interface_def", "interface", "@17", "@18", "@19",
+  "interface_decl", "@20", "interface_header", "inheritance_spec", "@21",
+  "value_def", "valuetype", "value_concrete_decl", "@22", "@23", "@24",
   "value_abs_decl", "@25", "@26", "@27", "value_header", "@28",
   "value_decl", "@29", "opt_truncatable", "supports_spec",
   "value_forward_decl", "value_box_decl", "value_elements",
@@ -789,10 +795,10 @@ static const char *const tao_yytname[] =
   "opt_op_attribute", "op_type_spec", "init_decl", "@105", "@106", "@107",
   "init_parameter_list", "@108", "@109", "at_least_one_in_parameter",
   "in_parameters", "@110", "in_parameter", "@111", "@112",
-  "parameter_list", "@113", "@114", "at_least_one_parameter",
-  "parameters", "@115", "parameter", "@116", "@117", "param_type_spec",
-  "direction", "opt_raises", "@118", "@119", "opt_getraises", "@120",
-  "@121", "opt_setraises", "@122", "@123", "opt_context", "@124", "@125",
+  "parameter_list", "@113", "@114", "at_least_one_parameter", "parameters",
+  "@115", "parameter", "@116", "@117", "param_type_spec", "direction",
+  "opt_raises", "@118", "@119", "opt_getraises", "@120", "@121",
+  "opt_setraises", "@122", "@123", "opt_context", "@124", "@125",
   "at_least_one_string_literal", "string_literals", "@126", "typeid_dcl",
   "typeprefix_dcl", "component", "component_forward_decl",
   "component_decl", "@127", "@128", "@129", "component_header", "@130",
@@ -801,9 +807,9 @@ static const char *const tao_yytname[] =
   "provides_decl", "interface_type", "uses_decl", "opt_multiple",
   "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "@139",
   "home_header", "@140", "@141", "@142", "@143", "@144", "@145",
-  "home_inheritance_spec", "@146", "primary_key_spec", "home_body",
-  "@147", "@148", "home_exports", "home_export", "@149", "@150",
-  "factory_decl", "@151", "@152", "finder_decl", "@153", "@154", "event",
+  "home_inheritance_spec", "@146", "primary_key_spec", "home_body", "@147",
+  "@148", "home_exports", "home_export", "@149", "@150", "factory_decl",
+  "@151", "@152", "finder_decl", "@153", "@154", "event",
   "event_forward_decl", "event_concrete_forward_decl",
   "event_abs_forward_decl", "event_abs_decl", "@155", "@156", "@157",
   "event_abs_header", "event_custom_header", "event_plain_header",
@@ -1489,53 +1495,53 @@ static const unsigned short tao_yystos[] =
 # define TAO_YYSIZE_T unsigned int
 #endif
 
-#define tao_yyerrok		(tao_yyerrstatus = 0)
-#define tao_yyclearin	(tao_yychar = TAO_YYEMPTY)
-#define TAO_YYEMPTY		(-2)
-#define TAO_YYEOF		0
+#define tao_yyerrok                (tao_yyerrstatus = 0)
+#define tao_yyclearin        (tao_yychar = TAO_YYEMPTY)
+#define TAO_YYEMPTY                (-2)
+#define TAO_YYEOF                0
 
-#define TAO_YYACCEPT	goto tao_yyacceptlab
-#define TAO_YYABORT		goto tao_yyabortlab
-#define TAO_YYERROR		goto tao_yyerrlab1
+#define TAO_YYACCEPT        goto tao_yyacceptlab
+#define TAO_YYABORT                goto tao_yyabortlab
+#define TAO_YYERROR                goto tao_yyerrorlab
 
 
 /* Like TAO_YYERROR except do call tao_yyerror.  This remains here temporarily
    to ease the transition to the new meaning of TAO_YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
 
-#define TAO_YYFAIL		goto tao_yyerrlab
+#define TAO_YYFAIL                goto tao_yyerrlab
 
 #define TAO_YYRECOVERING()  (!!tao_yyerrstatus)
 
-#define TAO_YYBACKUP(Token, Value)					\
-do								\
-  if (tao_yychar == TAO_YYEMPTY && tao_yylen == 1)				\
-    {								\
-      tao_yychar = (Token);						\
-      tao_yylval = (Value);						\
-      tao_yytoken = TAO_YYTRANSLATE (tao_yychar);				\
-      TAO_YYPOPSTACK;						\
-      goto tao_yybackup;						\
-    }								\
-  else								\
-    { 								\
+#define TAO_YYBACKUP(Token, Value)                                        \
+do                                                                \
+  if (tao_yychar == TAO_YYEMPTY && tao_yylen == 1)                                \
+    {                                                                \
+      tao_yychar = (Token);                                                \
+      tao_yylval = (Value);                                                \
+      tao_yytoken = TAO_YYTRANSLATE (tao_yychar);                                \
+      TAO_YYPOPSTACK;                                                \
+      goto tao_yybackup;                                                \
+    }                                                                \
+  else                                                                \
+    {                                                                 \
       tao_yyerror ("syntax error: cannot back up");\
-      TAO_YYERROR;							\
-    }								\
+      TAO_YYERROR;                                                        \
+    }                                                                \
 while (0)
 
-#define TAO_YYTERROR	1
-#define TAO_YYERRCODE	256
+#define TAO_YYTERROR        1
+#define TAO_YYERRCODE        256
 
 /* TAO_YYLLOC_DEFAULT -- Compute the default location (before the actions
    are run).  */
 
 #ifndef TAO_YYLLOC_DEFAULT
-# define TAO_YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define TAO_YYLLOC_DEFAULT(Current, Rhs, N)                \
+   ((Current).first_line   = (Rhs)[1].first_line,        \
+    (Current).first_column = (Rhs)[1].first_column,        \
+    (Current).last_line    = (Rhs)[N].last_line,        \
+    (Current).last_column  = (Rhs)[N].last_column)
 #endif
 
 /* TAO_YYLEX -- calling `tao_yylex' with the right arguments.  */
@@ -1554,32 +1560,32 @@ while (0)
 #  define TAO_YYFPRINTF fprintf
 # endif
 
-# define TAO_YYDPRINTF(Args)			\
-do {						\
-  if (tao_yydebug)					\
-    TAO_YYFPRINTF Args;				\
+# define TAO_YYDPRINTF(Args)                        \
+do {                                                \
+  if (tao_yydebug)                                        \
+    TAO_YYFPRINTF Args;                                \
 } while (0)
 
-# define TAO_YYDSYMPRINT(Args)			\
-do {						\
-  if (tao_yydebug)					\
-    tao_yysymprint Args;				\
+# define TAO_YYDSYMPRINT(Args)                        \
+do {                                                \
+  if (tao_yydebug)                                        \
+    tao_yysymprint Args;                                \
 } while (0)
 
-# define TAO_YYDSYMPRINTF(Title, Token, Value, Location)		\
-do {								\
-  if (tao_yydebug)							\
-    {								\
-      TAO_YYFPRINTF (stderr, "%s ", Title);				\
-      tao_yysymprint (stderr, 					\
-                  Token, Value);	\
-      TAO_YYFPRINTF (stderr, "\n");					\
-    }								\
+# define TAO_YYDSYMPRINTF(Title, Token, Value, Location)                \
+do {                                                                \
+  if (tao_yydebug)                                                        \
+    {                                                                \
+      TAO_YYFPRINTF (stderr, "%s ", Title);                                \
+      tao_yysymprint (stderr,                                         \
+                  Token, Value);        \
+      TAO_YYFPRINTF (stderr, "\n");                                        \
+    }                                                                \
 } while (0)
 
 /*------------------------------------------------------------------.
 | tao_yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded).                                                   |
+| TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
@@ -1598,10 +1604,10 @@ tao_yy_stack_print (bottom, top)
   TAO_YYFPRINTF (stderr, "\n");
 }
 
-# define TAO_YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (tao_yydebug)							\
-    tao_yy_stack_print ((Bottom), (Top));				\
+# define TAO_YY_STACK_PRINT(Bottom, Top)                                \
+do {                                                                \
+  if (tao_yydebug)                                                        \
+    tao_yy_stack_print ((Bottom), (Top));                                \
 } while (0)
 
 
@@ -1628,10 +1634,10 @@ tao_yy_reduce_print (tao_yyrule)
   TAO_YYFPRINTF (stderr, "-> %s\n", tao_yytname [tao_yyr1[tao_yyrule]]);
 }
 
-# define TAO_YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (tao_yydebug)				\
-    tao_yy_reduce_print (Rule);		\
+# define TAO_YY_REDUCE_PRINT(Rule)                \
+do {                                        \
+  if (tao_yydebug)                                \
+    tao_yy_reduce_print (Rule);                \
 } while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
@@ -1647,7 +1653,7 @@ int tao_yydebug;
 
 
 /* TAO_YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	TAO_YYINITDEPTH
+#ifndef        TAO_YYINITDEPTH
 # define TAO_YYINITDEPTH 200
 #endif
 
@@ -1658,7 +1664,7 @@ int tao_yydebug;
    SIZE_MAX < TAO_YYSTACK_BYTES (TAO_YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if TAO_YYMAXDEPTH == 0
+#if defined (TAO_YYMAXDEPTH) && TAO_YYMAXDEPTH == 0
 # undef TAO_YYMAXDEPTH
 #endif
 
@@ -1846,7 +1852,7 @@ tao_yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short	tao_yyssa[TAO_YYINITDEPTH];
+  short        tao_yyssa[TAO_YYINITDEPTH];
   short *tao_yyss = tao_yyssa;
   register short *tao_yyssp;
 
@@ -1875,7 +1881,7 @@ tao_yyparse ()
   tao_yystate = 0;
   tao_yyerrstatus = 0;
   tao_yynerrs = 0;
-  tao_yychar = TAO_YYEMPTY;		/* Cause a token to be read.  */
+  tao_yychar = TAO_YYEMPTY;                /* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
@@ -1906,25 +1912,25 @@ tao_yyparse ()
 
 #ifdef tao_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.  */
-	TAO_YYSTYPE *tao_yyvs1 = tao_yyvs;
-	short *tao_yyss1 = tao_yyss;
+        /* Give user a chance to reallocate the stack. Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        TAO_YYSTYPE *tao_yyvs1 = tao_yyvs;
+        short *tao_yyss1 = tao_yyss;
 
 
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if tao_yyoverflow is a macro.  */
-	tao_yyoverflow ("parser stack overflow",
-		    &tao_yyss1, tao_yysize * sizeof (*tao_yyssp),
-		    &tao_yyvs1, tao_yysize * sizeof (*tao_yyvsp),
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if tao_yyoverflow is a macro.  */
+        tao_yyoverflow ("parser stack overflow",
+                    &tao_yyss1, tao_yysize * sizeof (*tao_yyssp),
+                    &tao_yyvs1, tao_yysize * sizeof (*tao_yyvsp),
 
-		    &tao_yystacksize);
+                    &tao_yystacksize);
 
-	tao_yyss = tao_yyss1;
-	tao_yyvs = tao_yyvs1;
+        tao_yyss = tao_yyss1;
+        tao_yyvs = tao_yyvs1;
       }
 #else /* no tao_yyoverflow */
 # ifndef TAO_YYSTACK_RELOCATE
@@ -1932,23 +1938,23 @@ tao_yyparse ()
 # else
       /* Extend the stack our own way.  */
       if (TAO_YYMAXDEPTH <= tao_yystacksize)
-	goto tao_yyoverflowlab;
+        goto tao_yyoverflowlab;
       tao_yystacksize *= 2;
       if (TAO_YYMAXDEPTH < tao_yystacksize)
-	tao_yystacksize = TAO_YYMAXDEPTH;
+        tao_yystacksize = TAO_YYMAXDEPTH;
 
       {
-	short *tao_yyss1 = tao_yyss;
-	union tao_yyalloc *tao_yyptr =
-	  (union tao_yyalloc *) TAO_YYSTACK_ALLOC (TAO_YYSTACK_BYTES (tao_yystacksize));
-	if (! tao_yyptr)
-	  goto tao_yyoverflowlab;
-	TAO_YYSTACK_RELOCATE (tao_yyss);
-	TAO_YYSTACK_RELOCATE (tao_yyvs);
+        short *tao_yyss1 = tao_yyss;
+        union tao_yyalloc *tao_yyptr =
+          (union tao_yyalloc *) TAO_YYSTACK_ALLOC (TAO_YYSTACK_BYTES (tao_yystacksize));
+        if (! tao_yyptr)
+          goto tao_yyoverflowlab;
+        TAO_YYSTACK_RELOCATE (tao_yyss);
+        TAO_YYSTACK_RELOCATE (tao_yyvs);
 
 #  undef TAO_YYSTACK_RELOCATE
-	if (tao_yyss1 != tao_yyssa)
-	  TAO_YYSTACK_FREE (tao_yyss1);
+        if (tao_yyss1 != tao_yyssa)
+          TAO_YYSTACK_FREE (tao_yyss1);
       }
 # endif
 #endif /* no tao_yyoverflow */
@@ -1958,10 +1964,10 @@ tao_yyparse ()
 
 
       TAO_YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) tao_yystacksize));
+                  (unsigned long int) tao_yystacksize));
 
       if (tao_yyss + tao_yystacksize - 1 <= tao_yyssp)
-	TAO_YYABORT;
+        TAO_YYABORT;
     }
 
   TAO_YYDPRINTF ((stderr, "Entering state %d\n", tao_yystate));
@@ -2012,7 +2018,7 @@ tao_yybackup:
   if (tao_yyn <= 0)
     {
       if (tao_yyn == 0 || tao_yyn == TAO_YYTABLE_NINF)
-	goto tao_yyerrlab;
+        goto tao_yyerrlab;
       tao_yyn = -tao_yyn;
       goto tao_yyreduce;
     }
@@ -2596,15 +2602,14 @@ tao_yyreduce:
 //      '}'
           idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
 
-          AST_ValueType *vt = 
+          AST_ValueType *vt =
             AST_ValueType::narrow_from_scope (
                 idl_global->scopes ().top_non_null ()
               );
 
           if (vt != 0 && vt->will_have_factory ())
             {
-              ACE_SET_BITS (idl_global->decls_seen_info_,
-                            idl_global->decls_seen_masks.valuefactory_seen_);
+              idl_global->valuefactory_seen_ = true;
             }
 
           /*
@@ -3695,6 +3700,7 @@ tao_yyreduce:
                     }
 
                   break;
+#if !defined (ACE_LACKS_LONGLONG_T)
                 case AST_Expression::EV_ulonglong:
                   if (ev->u.ullval == 0)
                     {
@@ -3702,6 +3708,7 @@ tao_yyreduce:
                     }
 
                   break;
+#endif
                 case AST_Expression::EV_octet:
                   if (ev->u.oval == 0)
                     {
@@ -4807,9 +4814,9 @@ tao_yyreduce:
           if (tao_yyvsp[-2].dcval != 0
               && AST_illegal_recursive_type (tao_yyvsp[-2].dcval))
             {
-              idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE,
-                                          tao_yyvsp[-2].dcval);
-                                          
+              idl_global->err()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE,
+                                         tao_yyvsp[-2].dcval);
+
               tao_yyval.ffval = 0;
             }
           /*
@@ -5111,7 +5118,7 @@ tao_yyreduce:
                   tao_yyval.dcval =
                     idl_global->gen ()->create_sequence (
                         idl_global->gen ()->create_expr (
-                                                (ACE_UINT64) 0,
+                                                (idl_uns_long) 0,
                                                 AST_Expression::EV_ulong
                                               ),
                         tp,
@@ -5211,7 +5218,7 @@ tao_yyreduce:
            */
           tao_yyval.dcval =
             idl_global->gen ()->create_string (
-                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                idl_global->gen ()->create_expr ((idl_uns_long) 0,
                                                  AST_Expression::EV_ulong)
               );
           /*
@@ -5289,7 +5296,7 @@ tao_yyreduce:
            */
           tao_yyval.dcval =
             idl_global->gen ()->create_wstring (
-                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                idl_global->gen ()->create_expr ((idl_uns_long) 0,
                                                  AST_Expression::EV_ulong)
               );
           /*
@@ -6061,14 +6068,7 @@ tao_yyreduce:
                 {
                   if (!s->is_local () && tp->is_local ())
                     {
-                      ACE_DEBUG ((LM_DEBUG,
-                                  ACE_TEXT ("error in %s line %d\n"),
-                                  idl_global->filename ()->get_string (),
-                                  idl_global->lineno ()));
-                      ACE_DEBUG ((LM_DEBUG,
-                                  ACE_TEXT ("Cannot use a local type as an ")
-                                  ACE_TEXT ("argument of a remote ")
-                                  ACE_TEXT ("operation\n")));
+                      idl_global->err ()->local_remote_mismatch (tp, s);
                     }
                   else
                     {
@@ -6117,6 +6117,7 @@ tao_yyreduce:
             }
           else
             {
+              d->last_referenced_as (tao_yyvsp[0].idlist);
               AST_Decl::NodeType nt = d->node_type ();
 
               if (nt == AST_Decl::NT_struct_fwd
@@ -6667,9 +6668,9 @@ tao_yyreduce:
                 }
               else if (d->node_type () != AST_Decl::NT_interface)
                 {
-                  // Nothing else but CORBA::Object can have 
+                  // Nothing else but CORBA::Object can have
                   // this identifier.
-                  if (ACE_OS::strcmp (d->local_name ()->get_string (), 
+                  if (ACE_OS::strcmp (d->local_name ()->get_string (),
                                       "Object")
                         != 0)
                     {
@@ -6677,7 +6678,6 @@ tao_yyreduce:
                       break;
                     }
                 }
-                
               AST_Type *interface_type =
                 AST_Type::narrow_from_decl (d);
 
@@ -6750,7 +6750,7 @@ tao_yyreduce:
             }
           else if (d->node_type () != AST_Decl::NT_interface)
             {
-              if (ACE_OS::strcmp (d->local_name ()->get_string (), 
+              if (ACE_OS::strcmp (d->local_name ()->get_string (),
                                   "Object")
                     != 0)
                 {
@@ -6758,7 +6758,7 @@ tao_yyreduce:
                   break;
                 }
             }
-            
+
           AST_Type *interface_type = AST_Type::narrow_from_decl (d);
           AST_Component *c = AST_Component::narrow_from_scope (s);
 
@@ -6769,6 +6769,15 @@ tao_yyreduce:
               ud.impl = interface_type;
               ud.is_multiple = tao_yyvsp[-2].bval;
               c->uses ().enqueue_tail (ud);
+
+              if (ud.is_multiple == I_TRUE
+                  && !idl_global->using_ifr_backend ())
+                {
+                  // These datatypes must be created in the
+                  // front end so they can be looked up
+                  // when compiling the generated executor IDL.
+                  idl_global->create_uses_multiple_stuff (c, ud);
+                }
             }
         }
     break;
@@ -7531,7 +7540,7 @@ tao_yyreduce:
 
     }
 
-/* Line 999 of yacc.c.  */
+/* Line 1000 of yacc.c.  */
 
 
   tao_yyvsp -= tao_yylen;
@@ -7570,62 +7579,62 @@ tao_yyerrlab:
       tao_yyn = tao_yypact[tao_yystate];
 
       if (TAO_YYPACT_NINF < tao_yyn && tao_yyn < TAO_YYLAST)
-	{
-	  TAO_YYSIZE_T tao_yysize = 0;
-	  int tao_yytype = TAO_YYTRANSLATE (tao_yychar);
-	  const char* tao_yyprefix;
-	  char *tao_yymsg;
-	  int tao_yyx;
-
-	  /* Start TAO_YYX at -TAO_YYN if negative to avoid negative indexes in
-	     TAO_YYCHECK.  */
-	  int tao_yyxbegin = tao_yyn < 0 ? -tao_yyn : 0;
-
-	  /* Stay within bounds of both tao_yycheck and tao_yytname.  */
-	  int tao_yychecklim = TAO_YYLAST - tao_yyn;
-	  int tao_yyxend = tao_yychecklim < TAO_YYNTOKENS ? tao_yychecklim : TAO_YYNTOKENS;
-	  int tao_yycount = 0;
-
-	  tao_yyprefix = ", expecting ";
-	  for (tao_yyx = tao_yyxbegin; tao_yyx < tao_yyxend; ++tao_yyx)
-	    if (tao_yycheck[tao_yyx + tao_yyn] == tao_yyx && tao_yyx != TAO_YYTERROR)
-	      {
-		tao_yysize += tao_yystrlen (tao_yyprefix) + tao_yystrlen (tao_yytname [tao_yyx]);
-		tao_yycount += 1;
-		if (tao_yycount == 5)
-		  {
-		    tao_yysize = 0;
-		    break;
-		  }
-	      }
-	  tao_yysize += (sizeof ("syntax error, unexpected ")
-		     + tao_yystrlen (tao_yytname[tao_yytype]));
-	  tao_yymsg = (char *) TAO_YYSTACK_ALLOC (tao_yysize);
-	  if (tao_yymsg != 0)
-	    {
-	      char *tao_yyp = tao_yystpcpy (tao_yymsg, "syntax error, unexpected ");
-	      tao_yyp = tao_yystpcpy (tao_yyp, tao_yytname[tao_yytype]);
-
-	      if (tao_yycount < 5)
-		{
-		  tao_yyprefix = ", expecting ";
-		  for (tao_yyx = tao_yyxbegin; tao_yyx < tao_yyxend; ++tao_yyx)
-		    if (tao_yycheck[tao_yyx + tao_yyn] == tao_yyx && tao_yyx != TAO_YYTERROR)
-		      {
-			tao_yyp = tao_yystpcpy (tao_yyp, tao_yyprefix);
-			tao_yyp = tao_yystpcpy (tao_yyp, tao_yytname[tao_yyx]);
-			tao_yyprefix = " or ";
-		      }
-		}
-	      tao_yyerror (tao_yymsg);
-	      TAO_YYSTACK_FREE (tao_yymsg);
-	    }
-	  else
-	    tao_yyerror ("syntax error; also virtual memory exhausted");
-	}
+        {
+          TAO_YYSIZE_T tao_yysize = 0;
+          int tao_yytype = TAO_YYTRANSLATE (tao_yychar);
+          const char* tao_yyprefix;
+          char *tao_yymsg;
+          int tao_yyx;
+
+          /* Start TAO_YYX at -TAO_YYN if negative to avoid negative indexes in
+             TAO_YYCHECK.  */
+          int tao_yyxbegin = tao_yyn < 0 ? -tao_yyn : 0;
+
+          /* Stay within bounds of both tao_yycheck and tao_yytname.  */
+          int tao_yychecklim = TAO_YYLAST - tao_yyn;
+          int tao_yyxend = tao_yychecklim < TAO_YYNTOKENS ? tao_yychecklim : TAO_YYNTOKENS;
+          int tao_yycount = 0;
+
+          tao_yyprefix = ", expecting ";
+          for (tao_yyx = tao_yyxbegin; tao_yyx < tao_yyxend; ++tao_yyx)
+            if (tao_yycheck[tao_yyx + tao_yyn] == tao_yyx && tao_yyx != TAO_YYTERROR)
+              {
+                tao_yysize += tao_yystrlen (tao_yyprefix) + tao_yystrlen (tao_yytname [tao_yyx]);
+                tao_yycount += 1;
+                if (tao_yycount == 5)
+                  {
+                    tao_yysize = 0;
+                    break;
+                  }
+              }
+          tao_yysize += (sizeof ("syntax error, unexpected ")
+                     + tao_yystrlen (tao_yytname[tao_yytype]));
+          tao_yymsg = (char *) TAO_YYSTACK_ALLOC (tao_yysize);
+          if (tao_yymsg != 0)
+            {
+              char *tao_yyp = tao_yystpcpy (tao_yymsg, "syntax error, unexpected ");
+              tao_yyp = tao_yystpcpy (tao_yyp, tao_yytname[tao_yytype]);
+
+              if (tao_yycount < 5)
+                {
+                  tao_yyprefix = ", expecting ";
+                  for (tao_yyx = tao_yyxbegin; tao_yyx < tao_yyxend; ++tao_yyx)
+                    if (tao_yycheck[tao_yyx + tao_yyn] == tao_yyx && tao_yyx != TAO_YYTERROR)
+                      {
+                        tao_yyp = tao_yystpcpy (tao_yyp, tao_yyprefix);
+                        tao_yyp = tao_yystpcpy (tao_yyp, tao_yytname[tao_yyx]);
+                        tao_yyprefix = " or ";
+                      }
+                }
+              tao_yyerror (tao_yymsg);
+              TAO_YYSTACK_FREE (tao_yymsg);
+            }
+          else
+            tao_yyerror ("syntax error; also virtual memory exhausted");
+        }
       else
 #endif /* TAO_YYERROR_VERBOSE */
-	tao_yyerror ("syntax error");
+        tao_yyerror ("syntax error");
     }
 
 
@@ -7633,27 +7642,29 @@ tao_yyerrlab:
   if (tao_yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
+         error, discard it.  */
 
-      /* Return failure if at end of input.  */
-      if (tao_yychar == TAO_YYEOF)
+      if (tao_yychar <= TAO_YYEOF)
         {
-	  /* Pop the error token.  */
-          TAO_YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (tao_yyss < tao_yyssp)
-	    {
-	      TAO_YYDSYMPRINTF ("Error: popping", tao_yystos[*tao_yyssp], tao_yyvsp, tao_yylsp);
-	      tao_yydestruct (tao_yystos[*tao_yyssp], tao_yyvsp);
-	      TAO_YYPOPSTACK;
-	    }
-	  TAO_YYABORT;
-        }
-
-      TAO_YYDSYMPRINTF ("Error: discarding", tao_yytoken, &tao_yylval, &tao_yylloc);
-      tao_yydestruct (tao_yytoken, &tao_yylval);
-      tao_yychar = TAO_YYEMPTY;
+          /* If at end of input, pop the error token,
+             then the rest of the stack, then return failure.  */
+          if (tao_yychar == TAO_YYEOF)
+             for (;;)
+               {
+                 TAO_YYPOPSTACK;
+                 if (tao_yyssp == tao_yyss)
+                   TAO_YYABORT;
+                 TAO_YYDSYMPRINTF ("Error: popping", tao_yystos[*tao_yyssp], tao_yyvsp, tao_yylsp);
+                 tao_yydestruct (tao_yystos[*tao_yyssp], tao_yyvsp);
+               }
+        }
+      else
+        {
+          TAO_YYDSYMPRINTF ("Error: discarding", tao_yytoken, &tao_yylval, &tao_yylloc);
+          tao_yydestruct (tao_yytoken, &tao_yylval);
+          tao_yychar = TAO_YYEMPTY;
 
+        }
     }
 
   /* Else will try to reuse lookahead token after shifting the error
@@ -7661,35 +7672,52 @@ tao_yyerrlab:
   goto tao_yyerrlab1;
 
 
-/*----------------------------------------------------.
-| tao_yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
+/*---------------------------------------------------.
+| tao_yyerrorlab -- error raised explicitly by TAO_YYERROR.  |
+`---------------------------------------------------*/
+tao_yyerrorlab:
+
+#if defined (__GNUC__) || defined (WIN32) || defined (__HP_aCC)
+  /* Pacify GCC when the user code never invokes TAO_YYERROR and the label
+     tao_yyerrorlab therefore never appears in user code.  */
+  if (0)
+     goto tao_yyerrorlab;
+#endif
+
+  tao_yyvsp -= tao_yylen;
+  tao_yyssp -= tao_yylen;
+  tao_yystate = *tao_yyssp;
+  goto tao_yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| tao_yyerrlab1 -- common code for both syntax error and TAO_YYERROR.  |
+`-------------------------------------------------------------*/
 tao_yyerrlab1:
-  tao_yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  tao_yyerrstatus = 3;        /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       tao_yyn = tao_yypact[tao_yystate];
       if (tao_yyn != TAO_YYPACT_NINF)
-	{
-	  tao_yyn += TAO_YYTERROR;
-	  if (0 <= tao_yyn && tao_yyn <= TAO_YYLAST && tao_yycheck[tao_yyn] == TAO_YYTERROR)
-	    {
-	      tao_yyn = tao_yytable[tao_yyn];
-	      if (0 < tao_yyn)
-		break;
-	    }
-	}
+        {
+          tao_yyn += TAO_YYTERROR;
+          if (0 <= tao_yyn && tao_yyn <= TAO_YYLAST && tao_yycheck[tao_yyn] == TAO_YYTERROR)
+            {
+              tao_yyn = tao_yytable[tao_yyn];
+              if (0 < tao_yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (tao_yyssp == tao_yyss)
-	TAO_YYABORT;
+        TAO_YYABORT;
 
       TAO_YYDSYMPRINTF ("Error: popping", tao_yystos[*tao_yyssp], tao_yyvsp, tao_yylsp);
       tao_yydestruct (tao_yystos[tao_yystate], tao_yyvsp);
-      tao_yyvsp--;
-      tao_yystate = *--tao_yyssp;
-
+      TAO_YYPOPSTACK;
+      tao_yystate = *tao_yyssp;
       TAO_YY_STACK_PRINT (tao_yyss, tao_yyssp);
     }
 
@@ -7761,3 +7789,4 @@ tao_yyerror (const char *msg)
               "%s\n",
               msg));
 }
+
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp.diff b/TAO/TAO_IDL/fe/y.tab.cpp.diff
index 3e6d7a1390e..0357abf4ae1 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp.diff
+++ b/TAO/TAO_IDL/fe/y.tab.cpp.diff
@@ -1,6 +1,6 @@
---- y.tab.cpp	2003-08-26 17:09:54.000000000 -0500
-+++ y.tab.cpp.mine	2003-08-26 17:09:45.000000000 -0500
-@@ -1752,11 +1752,6 @@
+--- y.tab.cpp.orig	2005-01-28 10:00:07.000000000 -0600
++++ y.tab.cpp	2005-01-28 10:07:56.000000000 -0600
+@@ -1758,11 +1758,6 @@
    else
      TAO_YYFPRINTF (tao_yyoutput, "nterm %s (", tao_yytname[tao_yytype]);
  
@@ -12,8 +12,11 @@
    TAO_YYFPRINTF (tao_yyoutput, ")");
  }
  
-@@ -1778,12 +1773,6 @@
+@@ -1782,14 +1777,9 @@
+ #endif
+ {
    /* Pacify ``unused variable'' warnings.  */
++  (void) tao_yytype;
    (void) tao_yyvaluep;
  
 -  switch (tao_yytype)
@@ -25,3 +28,12 @@
  }
  
  
+@@ -7687,7 +7677,7 @@
+ `---------------------------------------------------*/
+ tao_yyerrorlab:
+ 
+-#ifdef __GNUC__
++#if defined (__GNUC__) || defined (WIN32) || defined (__HP_aCC)
+   /* Pacify GCC when the user code never invokes TAO_YYERROR and the label
+      tao_yyerrorlab therefore never appears in user code.  */
+   if (0)
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 409d65edcb1..3667943b930 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -1,5 +1,5 @@
 // $Id$
-/* A Bison parser, made by GNU Bison 1.875b.  */
+/* A Bison parser, made by GNU Bison 1.875c.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
@@ -212,7 +212,7 @@ typedef union TAO_YYSTYPE {
   FE_Declarator                 *deval;         /* Declarator value     */
   idl_bool                      bval;           /* Boolean value        */
   long                          ival;           /* Long value           */
-  ACE_UINT64                    uival;          /* Unsigned long value  */
+  idl_uns_long                  uival;          /* Unsigned long value  */
   double                        dval;           /* Double value         */
   float                         fval;           /* Float value          */
   char                          cval;           /* Char value           */
@@ -223,7 +223,7 @@ typedef union TAO_YYSTYPE {
   Identifier                    *idval;         /* Identifier           */
   UTL_IdList                    *idlist;        /* Identifier list      */
 } TAO_YYSTYPE;
-/* Line 1252 of yacc.c.  */
+/* Line 1275 of yacc.c.  */
 
 # define tao_yystype TAO_YYSTYPE /* obsolescent; will be withdrawn */
 # define TAO_YYSTYPE_IS_DECLARED 1
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 14573a53f57..d4665ea0d14 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -76,6 +76,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "utl_scoped_name.h"
 #include "idl_narrow.h"
+#include "ace/os_include/sys/os_types.h"
 
 // This is for AIX w/IBM C++
 class Identifier;
@@ -209,7 +210,7 @@ public:
   // Accessors for the repository ID.
 
   const char *prefix (void);
-  void prefix (char *value);
+  void prefix (const char *value);
   // Accessors for the repository ID prefix.
 
   const char *version (void);
@@ -227,7 +228,7 @@ public:
   void set_id_with_typeid (char *value);
   // Called by a 'typeId' declaration.
 
-  void set_prefix_with_typeprefix (char *value);
+  void set_prefix_with_typeprefix (const char *value);
   // Called by a 'type_prefix' declaration.
 
   // If there is _cxx_ in the beginning, we will remove that and keep
@@ -361,7 +362,7 @@ private:
   void compute_full_name (UTL_ScopedName *n);
   // Compute the full name of an AST node.
 
-  void set_prefix_with_typeprefix_r (char *value,
+  void set_prefix_with_typeprefix_r (const char *value,
                                      UTL_Scope *appeared_in);
   // Non-top-level version of set_prefix_with_typeprefix.
 };
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 2c0c017ee36..c8115168e4c 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -68,6 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define _AST_EXPRESSION_AST_EXPRESSION_HH
 
 #include "ace/CDR_Stream.h"
+#include "idl_uns_long.h"
 #include "utl_scoped_name.h"
 
 class UTL_String;
@@ -205,7 +206,7 @@ public:
 
   AST_Expression (unsigned long ul);
 
-  AST_Expression (ACE_UINT64 ull,
+  AST_Expression (idl_uns_long,
                   ExprType t);
 
   AST_Expression (float f);
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 173646c09fa..a6a5b5fc162 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -71,6 +71,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_argument.h"
 #include "ast_predefined_type.h"
 #include "ast_union_label.h"
+#include "idl_uns_long.h"
 
 class UTL_LabelList;
 class UTL_ExprList;
@@ -283,7 +284,7 @@ public:
   virtual AST_Expression *create_expr (long v,
                                        AST_Expression::ExprType t);
 
-  virtual AST_Expression *create_expr (ACE_UINT64 v,
+  virtual AST_Expression *create_expr (idl_uns_long v,
                                        AST_Expression::ExprType t);
 
   virtual AST_Expression *create_expr (UTL_String *s);
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
index acb4eb2cc76..fdc784341fc 100644
--- a/TAO/TAO_IDL/include/ast_union.h
+++ b/TAO/TAO_IDL/include/ast_union.h
@@ -160,7 +160,7 @@ private:
   // Operations.
 
   // Look up a branch by node pointer.
-  AST_UnionBranch *lookup_branch(AST_UnionBranch *branch);
+  AST_UnionBranch *lookup_branch (AST_UnionBranch *branch);
 
   // Look up the branch with the "default" label.
   AST_UnionBranch *lookup_default (void);
@@ -185,7 +185,7 @@ private:
   virtual AST_Enum *fe_add_enum (AST_Enum *e);
 
   virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v);
-
+  
   virtual int compute_default_value (void);
   // Compute the default value (if any).
 
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
index 191d3b4003e..fc0e8430c7c 100644
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ b/TAO/TAO_IDL/include/ast_union_branch.h
@@ -73,6 +73,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class UTL_LabelList;
 class AST_Type;
 class AST_UnionLabel;
+class AST_Union;
 
 // Representation of union branch declaration.
 // A branch of a union is a field with a label.
@@ -95,10 +96,14 @@ public:
   AST_UnionLabel *label (unsigned long index = 0);
 
   unsigned long label_list_length (void);
+  
+  // Called if our labels are enum values - adds them the
+  // enclosing scope's name_referenced list.
+  void add_labels (AST_Union *u);
 
   // Narrowing.
-  DEF_NARROW_METHODS1(AST_UnionBranch, AST_Field);
-  DEF_NARROW_FROM_DECL(AST_UnionBranch);
+  DEF_NARROW_METHODS1 (AST_UnionBranch, AST_Field);
+  DEF_NARROW_FROM_DECL (AST_UnionBranch);
 
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index e0cb760293e..0f6de0c430f 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -265,70 +265,60 @@ public:
     , PS_PragmaPrefixSyntax     // Could not parse the #pragma prefix
   };
 
-  // 64-bit vector of flags for types of declarations seen while parsing.
-  ACE_UINT64 decls_seen_info_;
-
-  // Holds the masks to set and get in the above bit vector.
-  struct dsf
-  {
-    dsf (void);
-
-    ACE_UINT64 interface_seen_;
-    ACE_UINT64 valuetype_seen_;
-    ACE_UINT64 abstract_iface_seen_;
-    ACE_UINT64 local_iface_seen_;
-    ACE_UINT64 non_local_iface_seen_;
-    ACE_UINT64 fwd_iface_seen_;
-    ACE_UINT64 fwd_valuetype_seen_;
-    ACE_UINT64 basic_type_seen_;
-    ACE_UINT64 ambiguous_type_seen_;
-    ACE_UINT64 enum_seen_;
-    ACE_UINT64 string_seen_;
-    ACE_UINT64 array_seen_;
-    ACE_UINT64 aggregate_seen_;
-    ACE_UINT64 union_seen_;
-    ACE_UINT64 exception_seen_;
-    ACE_UINT64 operation_seen_;
-    ACE_UINT64 non_local_op_seen_;
-    ACE_UINT64 typecode_seen_;
-    ACE_UINT64 any_seen_;
-    ACE_UINT64 parametermode_seen_;
-    ACE_UINT64 base_object_seen_;
-    ACE_UINT64 valuefactory_seen_;
-    ACE_UINT64 valuebase_seen_;
-
-    ACE_UINT64 seq_seen_;
-    ACE_UINT64 iface_seq_seen_;
-    ACE_UINT64 vt_seq_seen_;
-    ACE_UINT64 array_seq_seen_;
-    ACE_UINT64 pseudo_seq_seen_;
-    ACE_UINT64 string_seq_seen_;
-    ACE_UINT64 wstring_seq_seen_;
-    ACE_UINT64 octet_seq_seen_;
-    ACE_UINT64 boolean_seq_seen_;
-    ACE_UINT64 char_seq_seen_;
-    ACE_UINT64 wchar_seq_seen_;
-    ACE_UINT64 short_seq_seen_;
-    ACE_UINT64 ushort_seq_seen_;
-    ACE_UINT64 long_seq_seen_;
-    ACE_UINT64 ulong_seq_seen_;
-    ACE_UINT64 longlong_seq_seen_;
-    ACE_UINT64 ulonglong_seq_seen_;
-    ACE_UINT64 float_seq_seen_;
-    ACE_UINT64 double_seq_seen_;
-    ACE_UINT64 longdouble_seq_seen_;
-    ACE_UINT64 any_seq_seen_;
-
-    ACE_UINT64 basic_arg_seen_;
-    ACE_UINT64 bd_string_arg_seen_;
-    ACE_UINT64 fixed_array_arg_seen_;
-    ACE_UINT64 fixed_size_arg_seen_;
-    ACE_UINT64 object_arg_seen_;
-    ACE_UINT64 special_basic_arg_seen_;
-    ACE_UINT64 ub_string_arg_seen_;
-    ACE_UINT64 var_array_arg_seen_;
-    ACE_UINT64 var_size_arg_seen_;
-  } decls_seen_masks;
+  // flags for types of declarations seen while parsing.
+  bool abstract_iface_seen_;
+  bool aggregate_seen_;
+  bool ambiguous_type_seen_;
+  bool any_arg_seen_;
+  bool any_seen_;
+  bool any_seq_seen_;
+  bool array_seen_;
+  bool array_seq_seen_;
+  bool base_object_seen_;
+  bool basic_arg_seen_;
+  bool basic_type_seen_;
+  bool bd_string_arg_seen_;
+  bool boolean_seq_seen_;
+  bool char_seq_seen_;
+  bool double_seq_seen_;
+  bool enum_seen_;
+  bool exception_seen_;
+  bool fixed_array_arg_seen_;
+  bool fixed_size_arg_seen_;
+  bool float_seq_seen_;
+  bool fwd_iface_seen_;
+  bool fwd_valuetype_seen_;
+  bool iface_seq_seen_;
+  bool interface_seen_;
+  bool local_iface_seen_;
+  bool long_seq_seen_;
+  bool longdouble_seq_seen_;
+  bool longlong_seq_seen_;
+  bool non_local_iface_seen_;
+  bool non_local_op_seen_;
+  bool object_arg_seen_;
+  bool octet_seq_seen_;
+  bool operation_seen_;
+  bool pseudo_seq_seen_;
+  bool seq_seen_;
+  bool short_seq_seen_;
+  bool special_basic_arg_seen_;
+  bool string_seen_;
+  bool string_seq_seen_;
+  bool typecode_seen_;
+  bool ub_string_arg_seen_;
+  bool ulong_seq_seen_;
+  bool ulonglong_seq_seen_;
+  bool union_seen_;
+  bool ushort_seq_seen_;
+  bool valuebase_seen_;
+  bool valuefactory_seen_;
+  bool valuetype_seen_;
+  bool var_array_arg_seen_;
+  bool var_size_arg_seen_;
+  bool vt_seq_seen_;
+  bool wchar_seq_seen_;
+  bool wstring_seq_seen_;
 
   // Constructor
   IDL_GlobalData (void);
@@ -399,6 +389,8 @@ public:
   virtual unsigned long    n_include_file_names (void); // How many
   virtual void             set_n_include_file_names (unsigned long n);
 
+  virtual void             reset_flag_seen (void);
+
   // = Access methods to deal with other IDL files included in the main
   //   IDL file. These IDL files are exactly the same strings that are
   //   "#include"d in the main IDL file, not the ones after CC
@@ -530,17 +522,25 @@ public:
   ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> &
   file_prefixes (void);
   // Accessor for the IDL file prefix container.
-  
+
   idl_bool pass_orb_idl (void) const;
   void pass_orb_idl (idl_bool val);
   // Accessor for the pass_orb_idl_ member.
-  
+
+  bool using_ifr_backend (void) const;
+  void using_ifr_backend (bool val);
+
   int check_gperf (void);
   // Currently called only from IDL backend, but could be useful elsewhere.
-  
+
   void fini (void);
   // Do final cleanup just before process exits.
 
+  void create_uses_multiple_stuff (AST_Component *c,
+                                   AST_Component::port_description &pd);
+  // We must do this in the front end since the executor
+  // mapping IDL will have these data types.
+
 private:
   // Data
   UTL_ScopeStack             pd_scopes;              // Store scopes stack
@@ -580,7 +580,7 @@ private:
 
   char *tao_root_;
   // Needed if orb.idl is included.
-  
+
   char *gperf_path_;
   // Path for the perfect hash generator(gperf) program. Default
   // is $ACE_ROOT/bin/gperf.
@@ -620,9 +620,12 @@ private:
 
   ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> file_prefixes_;
   // Associates a prefix with a file.
-  
+
   idl_bool pass_orb_idl_;
   // Treat orb.idl like any other included IDL file.
+
+  bool using_ifr_backend_;
+  // Set by the IFR backend itself.
 };
 
 
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index 5983c4ce49e..9aaabd9d5e8 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -135,6 +135,7 @@ public:
     EIDL_EMPTY_MODULE,          // Empty modules not allowed in IDL.
     EIDL_BACK_END,              // Back end error
     EIDL_ILLEGAL_INFIX,         // Illegal infix operator in expression
+    EIDL_LOCAL_REMOTE_MISMATCH, // Local type used in remote operation
     EIDL_OK                     // No error
   };
 
@@ -324,6 +325,10 @@ public:
   // Report illegal infix operator error (they can be used
   // only with integer, floating point or fixed point expressions.
   void illegal_infix (void);
+  
+  // Report local type used in remote operation.
+  void local_remote_mismatch (AST_Decl *l,
+                              UTL_Scope *s);
 };
 
 #endif           // _UTL_ERR_UTL_ERR_HH
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index b9d990d2b36..9bb45cfd949 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -254,6 +254,10 @@ public:
   void add_to_scope (AST_Decl *e,
                      AST_Decl *ex = 0);
 
+  // Add to name_referenced identifier list. It's public because
+  // a union needs to add its enum discriminator label names.
+  void add_to_name_referenced (Identifier *id);
+
   // Accessors for the has_prefix_ member.
   idl_bool has_prefix (void);
   void has_prefix (idl_bool val);
@@ -286,7 +290,7 @@ protected:
                           idl_bool recursive,
                           Identifier *id,
                           AST_Decl *ex = 0);
-
+                          
   // Add to local types. Node represents a local manifest type.
   void add_to_local_types (AST_Decl *e);
 
diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp
index dc5c105fc56..4cc6f427ef6 100644
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ b/TAO/TAO_IDL/tao_idl.cpp
@@ -143,6 +143,7 @@ DRV_refresh (void)
 //  idl_global->set_import (I_TRUE);
 //  idl_global->set_in_main_file (I_FALSE);
   idl_global->set_lineno (-1);
+  idl_global->reset_flag_seen ();
 }
 
 /*
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 2767b78c71b..790061e54c3 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -11,7 +11,8 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
   specific {
     // Override the template value for optimize.  Building the exe
     // with optimization turned on doesn't seem to work (at least not with
-    // vc6 or vc71).
+    // vc6 or vc71).  This is due to the use of addresses of static objecs
+    // within the code.
     optimize =
   }
 
@@ -45,7 +46,8 @@ project(TAO_IDL_BE) : acelib, core, tao_output, crosscompile {
   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).
+    // vc6 or vc71).  This is due to the use of addresses of static objecs
+    // within the code.
     optimize =
   }
 
@@ -67,7 +69,8 @@ project(TAO_IDL_FE) : acelib, core, tao_output, crosscompile {
   specific {
     // Override the template value for optimize.  Building the frontend
     // with optimization turned on doesn't seem to work (at least not with
-    // vc6 or vc71).
+    // vc6 or vc71).  This is due to the use of addresses of static objecs
+    // within the code.
     optimize =
   }
 
@@ -81,4 +84,82 @@ project(TAO_IDL_FE) : acelib, core, tao_output, crosscompile {
   Header_Files {
     include
   }
+
+  verbatim(gnuace, local) {
+    fe/fe_lookup.cpp: fe/keywords.dat
+    "	echo '\/\/ $$I''d$$' > $@"
+    "	echo '' >> $@"
+    "	echo '#include \"fe_private.h\"' >> $@"
+    "	echo '#include \"ace/OS_NS_string.h\"' >> $@"
+    "	echo '' >> $@"
+    "	$(ACE_ROOT)/bin/gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$$ $^ | \\"
+    "	sed -e 's/,}/,0}/g' \\"
+    "	    -e 's/\\*str == \\*s && !strncmp/len == static_cast<unsigned int> (ACE_OS::strlen (s)) \\&\\& *str == *s \\&\\& !ACE_OS::strncmp/g' \\"
+    "	>> $@"
+
+    fe/lex.yy.cpp: fe/idl.ll
+    "	@echo 'WARNING: Potentially outdated $@'"
+    "	@echo '         either touch(1) the file or explicitly'"
+    "	@echo '         generate it using:'"
+    "	@echo '    make lex.yy'"
+
+    .PHONY: lex.yy
+    lex.yy:
+    "ifeq ($(notdir $(LEX)), flex)"
+    "	$(LEX) -L -t fe/idl.ll | \\"
+    "	sed -e 's/yy/tao_yy/g' \\"
+    "	    -e 's/YY/TAO_YY/g' \\"
+    "	    -e 's/ NULL/ 0/g' \\"
+    "	    -e 's/	/        /g' \\"
+    "	    -e 's/  *$$\/\/g' \\"
+    "	    -e 's/TAO_YY_BREAK break;/TAO_YY_BREAK ACE_NOTREACHED (break;)/g' \\"
+    "	    -e 's/ECHO/TAO_YY_ECHO/' \\"
+    "	    -e 's/fread\([^\)]*\)/static_cast<int> (&)/g' \\"
+    "	    -e 's/\\$$Hea''der.*\\$$/$$I''d$$/' \\"
+    "	    -e 's@#include <stdio\.h>@#include \"ace/os_include/os_stdio.h\"@' \\"
+    "	    -e 's@#include <unistd\.h>@#include \"ace/os_include/os_ctype.h\"@' \\"
+    "	    -e '/#include </d' \\"
+    "	> fe/lex.yy.cpp"
+    "	(cd fe; patch < lex.yy.cpp.diff)"
+    "else"
+    "	@echo 'ERROR: You must use flex 2.5.4 or higher to process this file'"
+    "	@/bin/false"
+    "endif"
+
+    fe/y.tab.cpp: fe/idl.yy
+    "	@echo 'WARNING: Potentially outdated $@'"
+    "	@echo '         either touch(1) the file or explicitly'"
+    "	@echo '         generate it using:'"
+    "	@echo '    make y.tab'"
+
+    .PHONY: y.tab
+    y.tab: fe/idl.yy
+    "ifeq ($(notdir $(YACC)), bison)"
+    "	$(YACC) -y -l -d fe/idl.yy"
+    "	sed -e 's/char \\*getenv/char *ace_foo/g' \\"
+    "	    -e 's/= getenv/= ACE_OS::getenv/g' \\"
+    "	    -e 's/int yynew_state,/int,/g' \\"
+    "	    -e 's/int yyold_state,/int,/g' \\"
+    "	    -e 's/int yyrule_num,/int,/g' \\"
+    "	    -e 's/\\(YYDEBUG_DISCARD_TOKEN.*int\\) yytoken_num/\\1/g' \\"
+    "	    -e 's/yynewerror:\/\/g' \\"
+    "	    -e 's/yy/tao_yy/g' \\"
+    "	    -e 's/YY/TAO_YY/g' \\"
+    "	    -e 's/	/        /g' \\"
+    "	    -e 's/  *$$\/\/g' \\"
+    "	    -e 's/y\\.tab\\.c/y.tab.cpp/g' \\"
+    "	    -e 's%\\(#pragma ident\\)%\/\/ \\1%' < y.tab.c > /tmp/$(USER).Y"
+    "	sed -e 's/yy/tao_yy/g' \\"
+    "	    -e 's/YY/TAO_YY/g' < y.tab.h > /tmp/$(USER).YH"
+    "	echo '\/\/ $$I''d$$' > fe/y.tab.cpp"
+    "	cat /tmp/$(USER).Y >> fe/y.tab.cpp"
+    "	echo '\/\/ $$I''d$$' > fe/y.tab.h"
+    "	cat /tmp/$(USER).YH >> fe/y.tab.h"
+    "	$(RM) /tmp/$(USER).Y /tmp/$(USER).YH y.tab.c y.tab.h"
+    "	(cd fe; patch < y.tab.cpp.diff)"
+    "else"
+    "	@echo 'ERROR: You must use bison 1.875b or higher to process this file'"
+    "	@/bin/false"
+    "endif"
+  }
 }
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 51b2afc7e7c..9771a2188ca 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -201,6 +201,8 @@ error_string (UTL_Error::ErrorCode c)
       return "back end: ";
     case UTL_Error::EIDL_ILLEGAL_INFIX:
       return "illegal infix operator in expression";
+    case UTL_Error::EIDL_LOCAL_REMOTE_MISMATCH:
+      return "";
   }
 
   return 0;
@@ -1301,10 +1303,10 @@ UTL_Error::redefinition_in_scope (AST_Decl *d,
   idl_error_header (EIDL_REDEF_SCOPE,
                     d->line (),
                     d->file_name ());
-  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               ", "));
-  s->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
+  s->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -1355,3 +1357,22 @@ UTL_Error::illegal_infix (void)
   idl_global->set_err_count (idl_global->err_count () + 1);
 }
 
+void
+UTL_Error::local_remote_mismatch (AST_Decl *l,
+                                  UTL_Scope *s)
+{
+  AST_Decl *r = ScopeAsDecl (s);
+  idl_error_header (EIDL_LOCAL_REMOTE_MISMATCH,
+                    r->line (),
+                    r->file_name ());
+  ACE_ERROR ((LM_ERROR,
+              "local type "));
+  l->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
+  ACE_ERROR ((LM_ERROR,
+              " used in remote operation "));
+  r->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/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 008eae5be2c..76034c5f306 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -89,69 +89,12 @@ ACE_RCSID (util,
 #undef INCREMENT
 #define INCREMENT 64
 
-static long seen_once[INCREMENT] = {0};
-
-IDL_GlobalData::dsf::dsf (void)
-  : interface_seen_ (0),
-    valuetype_seen_ (0),
-    abstract_iface_seen_ (0),
-    local_iface_seen_ (0),
-    non_local_iface_seen_ (0),
-    fwd_iface_seen_ (0),
-    fwd_valuetype_seen_ (0),
-    basic_type_seen_ (0),
-    ambiguous_type_seen_ (0),
-    enum_seen_ (0),
-    string_seen_ (0),
-    array_seen_ (0),
-    aggregate_seen_ (0),
-    union_seen_ (0),
-    exception_seen_ (0),
-    operation_seen_ (0),
-    non_local_op_seen_ (0),
-    typecode_seen_ (0),
-    any_seen_ (0),
-    parametermode_seen_ (0),
-    base_object_seen_ (0),
-    valuefactory_seen_ (0),
-    valuebase_seen_ (0),
-
-    seq_seen_ (0),
-    iface_seq_seen_ (0),
-    vt_seq_seen_ (0),
-    array_seq_seen_ (0),
-    pseudo_seq_seen_ (0),
-    string_seq_seen_ (0),
-    wstring_seq_seen_ (0),
-    octet_seq_seen_ (0),
-    boolean_seq_seen_ (0),
-    char_seq_seen_ (0),
-    wchar_seq_seen_ (0),
-    short_seq_seen_ (0),
-    ushort_seq_seen_ (0),
-    long_seq_seen_ (0),
-    ulong_seq_seen_ (0),
-    longlong_seq_seen_ (0),
-    ulonglong_seq_seen_ (0),
-    float_seq_seen_ (0),
-    double_seq_seen_ (0),
-    longdouble_seq_seen_ (0),
-    any_seq_seen_ (0),
-
-    basic_arg_seen_ (0),
-    bd_string_arg_seen_ (0),
-    fixed_array_arg_seen_ (0),
-    fixed_size_arg_seen_ (0),
-    object_arg_seen_ (0),
-    special_basic_arg_seen_ (0),
-    ub_string_arg_seen_ (0),
-    var_array_arg_seen_ (0),
-    var_size_arg_seen_ (0)
-{}
+static long *pSeenOnce= 0;
+
+
 
 IDL_GlobalData::IDL_GlobalData (void)
-  : decls_seen_info_ (0),
-    pd_root (0),
+  : pd_root (0),
     pd_gen (0),
     pd_err (0),
     pd_err_count (0),
@@ -183,7 +126,8 @@ IDL_GlobalData::IDL_GlobalData (void)
     nest_orb_ (I_FALSE),
     idl_flags_ (""),
     preserve_cpp_keywords_ (I_TRUE),
-    pass_orb_idl_ (I_FALSE)
+    pass_orb_idl_ (I_FALSE),
+    using_ifr_backend_ (false)
 {
   // Path for the perfect hash generator(gperf) program.
   // Default is $ACE_ROOT/bin/gperf unless ACE_GPERF is defined.
@@ -191,7 +135,7 @@ IDL_GlobalData::IDL_GlobalData (void)
   // in the environment.
   // Form the absolute pathname.
   char* ace_root = ACE_OS::getenv ("ACE_ROOT");
-  
+
   if (ace_root == 0)
     // This may not cause any problem if -g option is used to specify
     // the correct path for the  gperf program. Let us ignore this
@@ -237,72 +181,76 @@ IDL_GlobalData::IDL_GlobalData (void)
 #endif /* ACE_GPERF */
     }
 
-  // Initialize the decls seen info masks
-
-  const ACE_UINT64 cursor = 1U;
-
-  ACE_SET_BITS (this->decls_seen_masks.interface_seen_,         cursor);
-  ACE_SET_BITS (this->decls_seen_masks.valuetype_seen_,         cursor << 1);
-  ACE_SET_BITS (this->decls_seen_masks.abstract_iface_seen_,    cursor << 2);
-  ACE_SET_BITS (this->decls_seen_masks.local_iface_seen_,       cursor << 3);
-  ACE_SET_BITS (this->decls_seen_masks.non_local_iface_seen_,   cursor << 4);
-  ACE_SET_BITS (this->decls_seen_masks.fwd_iface_seen_,         cursor << 5);
-  ACE_SET_BITS (this->decls_seen_masks.fwd_valuetype_seen_,     cursor << 6);
-  ACE_SET_BITS (this->decls_seen_masks.basic_type_seen_,        cursor << 7);
-  ACE_SET_BITS (this->decls_seen_masks.ambiguous_type_seen_,    cursor << 8);
-  ACE_SET_BITS (this->decls_seen_masks.enum_seen_,              cursor << 9);
-  ACE_SET_BITS (this->decls_seen_masks.string_seen_,            cursor << 10);
-  ACE_SET_BITS (this->decls_seen_masks.array_seen_,             cursor << 11);
-  ACE_SET_BITS (this->decls_seen_masks.aggregate_seen_,         cursor << 12);
-  ACE_SET_BITS (this->decls_seen_masks.union_seen_,             cursor << 13);
-  ACE_SET_BITS (this->decls_seen_masks.exception_seen_,         cursor << 14);
-  ACE_SET_BITS (this->decls_seen_masks.operation_seen_,         cursor << 15);
-  ACE_SET_BITS (this->decls_seen_masks.non_local_op_seen_,      cursor << 16);
-  ACE_SET_BITS (this->decls_seen_masks.typecode_seen_,          cursor << 17);
-  ACE_SET_BITS (this->decls_seen_masks.any_seen_,               cursor << 18);
-  ACE_SET_BITS (this->decls_seen_masks.parametermode_seen_,     cursor << 19);
-  ACE_SET_BITS (this->decls_seen_masks.base_object_seen_,       cursor << 20);
-  ACE_SET_BITS (this->decls_seen_masks.valuefactory_seen_,      cursor << 21);
-  ACE_SET_BITS (this->decls_seen_masks.valuebase_seen_,         cursor << 22);
-
-  ACE_SET_BITS (this->decls_seen_masks.seq_seen_,               cursor << 27);
-  ACE_SET_BITS (this->decls_seen_masks.iface_seq_seen_,         cursor << 28);
-  ACE_SET_BITS (this->decls_seen_masks.vt_seq_seen_,            cursor << 29);
-  ACE_SET_BITS (this->decls_seen_masks.array_seq_seen_,         cursor << 30);
-  ACE_SET_BITS (this->decls_seen_masks.pseudo_seq_seen_,        cursor << 31);
-  ACE_SET_BITS (this->decls_seen_masks.string_seq_seen_,        cursor << 32);
-  ACE_SET_BITS (this->decls_seen_masks.wstring_seq_seen_,       cursor << 33);
-  ACE_SET_BITS (this->decls_seen_masks.octet_seq_seen_,         cursor << 34);
-  ACE_SET_BITS (this->decls_seen_masks.boolean_seq_seen_,       cursor << 35);
-  ACE_SET_BITS (this->decls_seen_masks.char_seq_seen_,          cursor << 36);
-  ACE_SET_BITS (this->decls_seen_masks.wchar_seq_seen_,         cursor << 37);
-  ACE_SET_BITS (this->decls_seen_masks.short_seq_seen_,         cursor << 38);
-  ACE_SET_BITS (this->decls_seen_masks.ushort_seq_seen_,        cursor << 39);
-  ACE_SET_BITS (this->decls_seen_masks.octet_seq_seen_,         cursor << 40);
-  ACE_SET_BITS (this->decls_seen_masks.long_seq_seen_,          cursor << 41);
-  ACE_SET_BITS (this->decls_seen_masks.ulong_seq_seen_,         cursor << 42);
-  ACE_SET_BITS (this->decls_seen_masks.longlong_seq_seen_,      cursor << 43);
-  ACE_SET_BITS (this->decls_seen_masks.ulonglong_seq_seen_,     cursor << 44);
-  ACE_SET_BITS (this->decls_seen_masks.float_seq_seen_,         cursor << 45);
-  ACE_SET_BITS (this->decls_seen_masks.double_seq_seen_,        cursor << 46);
-  ACE_SET_BITS (this->decls_seen_masks.longdouble_seq_seen_,    cursor << 47);
-  ACE_SET_BITS (this->decls_seen_masks.any_seq_seen_,           cursor << 48);
-
-  ACE_SET_BITS (this->decls_seen_masks.basic_arg_seen_,         cursor << 52);
-  ACE_SET_BITS (this->decls_seen_masks.bd_string_arg_seen_,     cursor << 53);
-  ACE_SET_BITS (this->decls_seen_masks.fixed_array_arg_seen_,   cursor << 54);
-  ACE_SET_BITS (this->decls_seen_masks.fixed_size_arg_seen_,    cursor << 55);
-  ACE_SET_BITS (this->decls_seen_masks.object_arg_seen_,        cursor << 56);
-  ACE_SET_BITS (this->decls_seen_masks.special_basic_arg_seen_, cursor << 57);
-  ACE_SET_BITS (this->decls_seen_masks.ub_string_arg_seen_,     cursor << 58);
-  ACE_SET_BITS (this->decls_seen_masks.var_array_arg_seen_,     cursor << 59);
-  ACE_SET_BITS (this->decls_seen_masks.var_size_arg_seen_,      cursor << 60);
+  // ambiguous_type_seen_ and basic_type_seen_ are not reset between
+  // command line idl files, so do those here and then reset the rest.
+  this->ambiguous_type_seen_ = false;
+  this->basic_type_seen_ = false;
+  this->reset_flag_seen ();
 }
 
 IDL_GlobalData::~IDL_GlobalData (void)
 {
 }
 
+// When starting to process the next command line input idl file, reset.
+void
+IDL_GlobalData::reset_flag_seen (void)
+{
+  abstract_iface_seen_ = false;
+  aggregate_seen_ = false;
+//ambiguous_type_seen_
+  any_arg_seen_ = false;
+  any_seen_ = false;
+  any_seq_seen_ = false;
+  array_seen_ = false;
+  array_seq_seen_ = false;
+  base_object_seen_ = false;
+  basic_arg_seen_ = false;
+//basic_type_seen_
+  bd_string_arg_seen_ = false;
+  boolean_seq_seen_ = false;
+  char_seq_seen_ = false;
+  double_seq_seen_ = false;
+  enum_seen_ = false;
+  exception_seen_ = false;
+  fixed_array_arg_seen_ = false;
+  fixed_size_arg_seen_ = false;
+  float_seq_seen_ = false;
+  fwd_iface_seen_ = false;
+  fwd_valuetype_seen_ = false;
+  iface_seq_seen_ = false;
+  interface_seen_ = false;
+  local_iface_seen_ = false;
+  long_seq_seen_ = false;
+  longdouble_seq_seen_ = false;
+  longlong_seq_seen_ = false;
+  non_local_iface_seen_ = false;
+  non_local_op_seen_ = false;
+  object_arg_seen_ = false;
+  octet_seq_seen_ = false;
+  operation_seen_ = false;
+  pseudo_seq_seen_ = false;
+  seq_seen_ = false;
+  short_seq_seen_ = false;
+  special_basic_arg_seen_ = false;
+  string_seen_ = false;
+  string_seq_seen_ = false;
+  typecode_seen_ = false;
+  ub_string_arg_seen_ = false;
+  ulong_seq_seen_ = false;
+  ulonglong_seq_seen_ = false;
+  union_seen_ = false;
+  ushort_seq_seen_ = false;
+  valuebase_seen_ = false;
+  valuefactory_seen_ = false;
+  valuetype_seen_ = false;
+  var_array_arg_seen_ = false;
+  var_size_arg_seen_ = false;
+  vt_seq_seen_ = false;
+  wchar_seq_seen_ = false;
+  wstring_seq_seen_ = false;
+}
+
 // Get or set scopes stack
 UTL_ScopeStack &
 IDL_GlobalData::scopes (void)
@@ -568,7 +516,7 @@ IDL_GlobalData::seen_include_file_before (char *n)
 
       if (ACE_OS::strcmp (tmp, incl) == 0)
         {
-          return seen_once[i]++;
+          return ++pSeenOnce[i];
         }
     }
 
@@ -579,13 +527,11 @@ IDL_GlobalData::seen_include_file_before (char *n)
 void
 IDL_GlobalData::store_include_file_name (UTL_String *n)
 {
-  UTL_String **o_include_file_names;
-  unsigned long o_n_alloced_file_names;
-  unsigned long i;
-
   // Check if we need to store it at all or whether we've seen it already.
   if (this->seen_include_file_before (n->get_string ()))
     {
+      n->destroy ();
+      delete n; // Don't keep filenames we don't store!
       return;
     }
 
@@ -598,26 +544,32 @@ IDL_GlobalData::store_include_file_name (UTL_String *n)
           this->pd_n_alloced_file_names = INCREMENT;
           ACE_NEW (this->pd_include_file_names,
                    UTL_String *[this->pd_n_alloced_file_names]);
+          ACE_NEW (pSeenOnce, long [this->pd_n_alloced_file_names]);
         }
       else
         {
-          o_include_file_names = this->pd_include_file_names;
-          o_n_alloced_file_names = this->pd_n_alloced_file_names;
+          UTL_String    **o_include_file_names=   this->pd_include_file_names;
+          unsigned long   o_n_alloced_file_names= this->pd_n_alloced_file_names;
+          long           *o_pSeenOnce=            pSeenOnce;
+
           this->pd_n_alloced_file_names += INCREMENT;
           ACE_NEW (this->pd_include_file_names,
                    UTL_String *[this->pd_n_alloced_file_names]);
+          ACE_NEW (pSeenOnce, long [this->pd_n_alloced_file_names]);
 
-          for (i = 0; i < o_n_alloced_file_names; ++i)
+          for (unsigned long i = 0; i < o_n_alloced_file_names; ++i)
             {
               this->pd_include_file_names[i] = o_include_file_names[i];
+              pSeenOnce[i]= o_pSeenOnce[i];
             }
 
           delete [] o_include_file_names;
+          delete [] o_pSeenOnce;
         }
     }
 
   // Store it.
-  seen_once[this->pd_n_include_file_names] = 1;
+  pSeenOnce[this->pd_n_include_file_names] = 1;
   this->pd_include_file_names[this->pd_n_include_file_names++] = n;
 }
 
@@ -730,8 +682,8 @@ IDL_GlobalData::validate_included_idl_files (void)
   size_t n_post_preproc_includes = idl_global->n_include_file_names ();
   UTL_String **post_preproc_includes = idl_global->include_file_names ();
 
-  char pre_abspath[MAXPATHLEN];
-  char post_abspath[MAXPATHLEN];
+  char pre_abspath[MAXPATHLEN] = "";
+  char post_abspath[MAXPATHLEN] = "";
   char **path_tmp = 0;
   char *post_tmp = 0;
   char *full_path = 0;
@@ -761,6 +713,8 @@ IDL_GlobalData::validate_included_idl_files (void)
                       continue;
                     }
 
+                  ACE_OS::fclose (test);
+
                   // This file name is valid.
                   valid_file = 1;
                   ++n_found;
@@ -800,6 +754,8 @@ IDL_GlobalData::validate_included_idl_files (void)
                               continue;
                             }
 
+                          ACE_OS::fclose (test);
+
                           // This file name is valid.
                           valid_file = 1;
                           ++n_found;
@@ -818,7 +774,7 @@ IDL_GlobalData::validate_included_idl_files (void)
       // Remove the file, if it is not valid.
       if (valid_file == 0)
         {
-          delete pre_preproc_includes[j];
+          delete [] pre_preproc_includes[j];
           pre_preproc_includes[j] = 0;
         }
       else
@@ -1051,7 +1007,7 @@ IDL_GlobalData::destroy (void)
       delete [] trash;
       trash = 0;
     }
-    
+
   for (unsigned long j = 0; j < this->pd_n_include_file_names; ++j)
     {
       // Delete the contained char* but not the UTL_String -
@@ -1059,15 +1015,15 @@ IDL_GlobalData::destroy (void)
       this->pd_include_file_names[j]->destroy ();
       this->pd_include_file_names[j] = 0;
     }
-    
+
   this->pd_n_include_file_names = 0;
-  
+
   for (size_t k = 0; k < n_included_idl_files_; ++k)
     {
       // No memory allocated for these, so just set to 0.
       this->included_idl_files_[k] = 0;
     }
-    
+
   this->n_included_idl_files_ = 0;
 
   this->pd_root->destroy ();
@@ -1320,6 +1276,18 @@ IDL_GlobalData::pass_orb_idl (idl_bool val)
   this->pass_orb_idl_ = val;
 }
 
+bool
+IDL_GlobalData::using_ifr_backend (void) const
+{
+  return this->using_ifr_backend_;
+}
+
+void
+IDL_GlobalData::using_ifr_backend (bool val)
+{
+  this->using_ifr_backend_ = val;
+}
+
 // Return 0 on success, -1 failure. The <errno> corresponding to the
 // error that caused the GPERF execution is also set.
 int
@@ -1452,3 +1420,85 @@ IDL_GlobalData::fini (void)
   delete [] this->ident_string_;
   this->ident_string_ = 0;
 }
+
+void
+IDL_GlobalData::create_uses_multiple_stuff (
+    AST_Component *c,
+    AST_Component::port_description &pd
+  )
+{
+  ACE_CString struct_name (pd.id->get_string ());
+  struct_name += "Connection";
+  Identifier struct_id (struct_name.c_str ());
+  UTL_ScopedName sn (&struct_id, 0);
+  AST_Structure *connection =
+    idl_global->gen ()->create_structure (&sn, 0, 0);
+  struct_id.destroy ();
+
+  Identifier object_id ("objref");
+  UTL_ScopedName object_name (&object_id,
+                              0);
+  AST_Field *object_field =
+    idl_global->gen ()->create_field (pd.impl,
+                                      &object_name,
+                                      AST_Field::vis_NA);
+  (void) DeclAsScope (connection)->fe_add_field (object_field);
+  object_id.destroy ();
+
+  Identifier local_id ("Cookie");
+  UTL_ScopedName local_name (&local_id,
+                             0);
+  Identifier module_id ("Components");
+  UTL_ScopedName scoped_name (&module_id,
+                              &local_name);
+  AST_Decl *d = c->lookup_by_name (&scoped_name,
+                                   I_TRUE);
+  local_id.destroy ();
+  module_id.destroy ();
+
+  if (d == 0)
+    {
+      // This would happen if we haven't included Componennts.idl.
+      idl_global->err ()->lookup_error (&scoped_name);
+      return;
+    }
+
+  AST_ValueType *cookie = AST_ValueType::narrow_from_decl (d);
+
+  Identifier cookie_id ("ck");
+  UTL_ScopedName cookie_name (&cookie_id,
+                              0);
+  AST_Field *cookie_field =
+    idl_global->gen ()->create_field (cookie,
+                                      &cookie_name,
+                                      AST_Field::vis_NA);
+  (void) DeclAsScope (connection)->fe_add_field (cookie_field);
+  cookie_id.destroy ();
+
+  (void) c->fe_add_structure (connection);
+
+  idl_uns_long bound = 0;
+  AST_Expression *bound_expr =
+    idl_global->gen ()->create_expr (bound,
+                                     AST_Expression::EV_ulong);
+  AST_Sequence *sequence =
+    idl_global->gen ()->create_sequence (bound_expr,
+                                         connection,
+                                         0,
+                                         0,
+                                         0);
+
+  ACE_CString seq_string (pd.id->get_string ());
+  seq_string += "Connections";
+  Identifier seq_id (seq_string.c_str ());
+  UTL_ScopedName seq_name (&seq_id,
+                           0);
+  AST_Typedef *connections =
+    idl_global->gen ()->create_typedef (sequence,
+                                        &seq_name,
+                                        0,
+                                        0);
+  seq_id.destroy ();
+
+  (void) c->fe_add_typedef (connections);
+}
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 47facd16613..924a1cc4e74 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -500,14 +500,12 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
   // First check for string or wstring base type.
   if (nt == AST_Decl::NT_string)
     {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.string_seq_seen_);
+      idl_global->string_seq_seen_ = true;
       return;
     }
   else if (nt == AST_Decl::NT_wstring)
     {
-      ACE_SET_BITS (idl_global->decls_seen_info_,
-                    idl_global->decls_seen_masks.wstring_seq_seen_);
+      idl_global->wstring_seq_seen_ = true;
       return;
     }
   
@@ -521,60 +519,46 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
   switch (pdt->pt ())
     {
       case AST_PredefinedType::PT_long:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.long_seq_seen_);
+        idl_global->long_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_ulong:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.ulong_seq_seen_);
+        idl_global->ulong_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_longlong:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.longlong_seq_seen_);
+        idl_global->longlong_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_ulonglong:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.ulonglong_seq_seen_);
+        idl_global->ulonglong_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_short:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.short_seq_seen_);
+        idl_global->short_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_ushort:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.ushort_seq_seen_);
+        idl_global->ushort_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_float:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.float_seq_seen_);
+        idl_global->float_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_double:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.double_seq_seen_);
+        idl_global->double_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_longdouble:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.longdouble_seq_seen_);
+        idl_global->longdouble_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_char:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.char_seq_seen_);
+        idl_global->char_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_wchar:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.wchar_seq_seen_);
+        idl_global->wchar_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_boolean:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.boolean_seq_seen_);
+        idl_global->boolean_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_octet:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.octet_seq_seen_);
+        idl_global->octet_seq_seen_ = true;
         break;
       case AST_PredefinedType::PT_any:
-        ACE_SET_BITS (idl_global->decls_seen_info_,
-                      idl_global->decls_seen_masks.any_seq_seen_);
+        idl_global->any_seq_seen_ = true;
         break;
       default:
         break;
@@ -1408,18 +1392,15 @@ UTL_Scope::lookup_pseudo (Identifier *e)
                 {
                   // Generation of #includes for Typecode.h
                   // checks this bit, so we set it for TCKind as well.
-                  ACE_SET_BITS (idl_global->decls_seen_info_,
-                                idl_global->decls_seen_masks.typecode_seen_);
+                  idl_global->typecode_seen_ = true;
                 }
               else if (obj_lookup)
                 {
-                  ACE_SET_BITS (idl_global->decls_seen_info_,
-                                idl_global->decls_seen_masks.base_object_seen_);
+                  idl_global->base_object_seen_ = true;
                 }
               else if (vb_lookup)
                 {
-                  ACE_SET_BITS (idl_global->decls_seen_info_,
-                                idl_global->decls_seen_masks.valuebase_seen_);
+                  idl_global->valuebase_seen_ = true;
                 }
             }
 
@@ -1435,8 +1416,7 @@ UTL_Scope::lookup_pseudo (Identifier *e)
         {
           // Generation of #includes for Typecode.h
           // checks this bit, so we set it for TCKind as well.
-          ACE_SET_BITS (idl_global->decls_seen_info_,
-                        idl_global->decls_seen_masks.typecode_seen_);
+          idl_global->typecode_seen_ = true;
           delete i;
           return d;
         }
@@ -1554,14 +1534,10 @@ UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et)
                   switch (pdt)
                     {
                       case AST_PredefinedType::PT_any:
-                        ACE_SET_BITS (idl_global->decls_seen_info_,
-                                      idl_global->decls_seen_masks.any_seen_);
+                        idl_global->any_seen_ = true;
                         break;
                       case AST_PredefinedType::PT_object:
-                        ACE_SET_BITS (
-                            idl_global->decls_seen_info_,
-                            idl_global->decls_seen_masks.base_object_seen_
-                          );
+                        idl_global->base_object_seen_ = true;
                         break;
                       default:
                         break;
@@ -1620,7 +1596,11 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
   idl_bool in_corba =
     ACE_OS::strcmp (e->get_string (), "CORBA") == 0;
 
-  // Iterate over this scope.
+  // Iterate over this scope. We need IK_both here for the legacy
+  // case where a recursive type is defined via an anonymous sequence.
+  // Looking up the anonymous sequence parameter succeeds only if
+  // references are included, since the decl for the (unfinished)
+  // enclosing type has not yet been added to the scope decls.
   for (UTL_ScopeActiveIterator i (this, UTL_Scope::IK_both);
        !i.is_done ();
        i.next ())
@@ -1950,9 +1930,6 @@ UTL_Scope::add_to_referenced (AST_Decl *e,
       this->pd_referenced = tmp;
     }
 
-  // Insert new decl.
-  this->pd_referenced[this->pd_referenced_used++] = e;
-
   // Insert new reference.
   if (ex == 0)
     {
@@ -1964,14 +1941,17 @@ UTL_Scope::add_to_referenced (AST_Decl *e,
         {
           this->pd_referenced[i] = this->pd_referenced[i - 1];
 
-          if (this->pd_referenced[i-1] == ex)
+          if (this->pd_referenced[i - 1] == ex)
             {
               this->pd_referenced[i] = e;
               break;
             }
         }
-
-      ++this->pd_referenced_used;
+      
+      if (this->pd_referenced_used > 0)
+        {
+          ++this->pd_referenced_used;
+        }
     }
 
   // Now, if recursive is specified and "this" is not a common ancestor
@@ -1992,28 +1972,35 @@ UTL_Scope::add_to_referenced (AST_Decl *e,
   // Add the identifier arg, if non-null, to the identifier list.
   if (id)
     {
-      if (this->pd_name_referenced_allocated == this->pd_name_referenced_used)
-        {
-          long name_referenced_allocated = this->pd_name_referenced_allocated;
-          pd_name_referenced_allocated += INCREMENT;
-
-          Identifier **name_tmp = 0;
-          ACE_NEW (name_tmp,
-                   Identifier *[this->pd_name_referenced_allocated]);
+      this->add_to_name_referenced (id);
+    }
+}
 
-          for (i = 0; i < name_referenced_allocated; i++)
-            {
-              name_tmp[i] = this->pd_name_referenced[i];
-            }
+void
+UTL_Scope::add_to_name_referenced (Identifier *id)
+{
+  // Make sure we have enough space.
+  if (this->pd_name_referenced_allocated == this->pd_name_referenced_used)
+    {
+      long name_referenced_allocated = this->pd_name_referenced_allocated;
+      pd_name_referenced_allocated += INCREMENT;
 
-          delete [] this->pd_name_referenced;
+      Identifier **name_tmp = 0;
+      ACE_NEW (name_tmp,
+               Identifier *[this->pd_name_referenced_allocated]);
 
-          this->pd_name_referenced = name_tmp;
+      for (long i = 0; i < name_referenced_allocated; i++)
+        {
+          name_tmp[i] = this->pd_name_referenced[i];
         }
 
-      // Insert new identifier.
-      this->pd_name_referenced[this->pd_name_referenced_used++] = id->copy ();
+      delete [] this->pd_name_referenced;
+
+      this->pd_name_referenced = name_tmp;
     }
+
+  // Insert new identifier.
+  this->pd_name_referenced[this->pd_name_referenced_used++] = id->copy ();
 }
 
 void
diff --git a/TAO/VERSION b/TAO/VERSION
index 08a4f8e884c..06e5363d39d 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,11 +1,11 @@
-This is TAO version 1.4.2, released Sat Jul 31 11:14:00 2004.
+This is TAO version 1.4.4, released Thu Feb 10 07:07:39 2005.
 
 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:
 
-    1) Subscribe to the ace-users mail list, by sending email with
+    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.
diff --git a/TAO/configure.ac b/TAO/configure.ac
index c3a870bd5eb..d86a3b68b40 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -149,15 +149,22 @@ 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.
 AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE, false)
-
 AM_CONDITIONAL(BUILD_RT_CORBA, true)
 AM_CONDITIONAL(BUILD_CORBA_MESSAGING, true)
 AM_CONDITIONAL(BUILD_MINIMUM_CORBA, false)
 AM_CONDITIONAL(BUILD_INTERCEPTORS, true)
 AM_CONDITIONAL(BUILD_ACE_UUID, true)
 AM_CONDITIONAL(BUILD_AMI, true)
-AM_CONDITIONAL(BUILD_SSL, false)
+
+ACE_ENABLE_ACEXML
+ACE_ENABLE_SSL
+ACE_ENABLE_FL_REACTOR
+ACE_ENABLE_QT_REACTOR
+ACE_ENABLE_TK_REACTOR
+ACE_ENABLE_XT_REACTOR
 
 
 dnl
@@ -169,9 +176,6 @@ dnl created from Makefile.in, etc.  Top-level Makefiles should be
 dnl created first.
 
 AC_CONFIG_FILES([
-  tao-config
-  tao-config.1
-  taoConf.sh
   Makefile
   TAO_IDL/Makefile
   tao/Makefile
@@ -186,6 +190,7 @@ AC_CONFIG_FILES([
   orbsvcs/FT_ReplicationManager/Makefile
   orbsvcs/Fault_Detector/Makefile
   orbsvcs/Fault_Notifier/Makefile
+  orbsvcs/ImplRepo_Service/Makefile
   orbsvcs/IFR_Service/Makefile
   orbsvcs/LifeCycle_Service/Makefile
   orbsvcs/LoadBalancer/Makefile
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index baa2dc38466..695f59cbad1 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -92,7 +92,7 @@ high-performance applications.
   <li> <b>Command-line options</b> are passed to the ORB
 initialization
 factory method, <code>CORBA::ORB_init()</code>, by an application
-using the standard <i>argc, argv</i> tuple passed to the application's
+using the standard <i>argc/argv</i> tuple passed to the application's
     <code>main()</code>. Most of the options that can be exercised
 through
 environment variables can also be manipulated through command-line
@@ -108,13 +108,7 @@ configurator file, whose default file name is
     <code>svc.conf</code>. The service configurator is opened and
 processed by the ORB in <code>CORBA::ORB_init()</code>. The service
 configurator processing is done after all the command-line options
-have been<!-- Bala, should this be "processed" or just "parsed"?
-There could be a different -->
-parsed.
-    <p><!-- It should be just "parsed". The options from the command lines
-<!-- are just parsed in ORB_init () and stored for later use -->
-<!-- For the service configurator it is tricky. To be on the safer
-<!-- side I would say "processed". --></p>
+have been parsed.
   </li>
 </ul>
 <p></p>
@@ -377,7 +371,7 @@ default is used.</td>
 the ORB does not generate the OMG standardized profile components, such
 as the ORB type and code sets. Notice that the presence of this
 components is optional in GIOP 1.1 The default value is controlled by a
-compile-time flag (check orbconf.h).</td>
+compile-time flag defined in <CODE>orbconf.h</CODE>.</td>
       </tr>
       <tr>
         <td><code>-ORBSingleReadOptimization</code> <em>boolean (0|1)</em></td>
@@ -390,7 +384,7 @@ the ORB will do a read of size <code>TAO_MAXBUFSIZE</code>, hoping to
 read the entire request. If more than one request is read they will be
 queued up for processing later.
         <p> This option defaults to <code>1</code> because it can
-provide better performance. However, in the case of RT-CORBA, this
+provide better performance.  In the case of Real-time CORBA, however, this
 option should be set to <code>0</code>. Consider the following
 scenario: (1) two requests are read from one socket, (2) the additional
 request is queued, and (3) the ORB uses its Reactor's notification
@@ -405,13 +399,13 @@ preferences over normal I/O, thereby causing priority inversion.</p>
        <td><code>-ORBDisableRTCollocation</code> <em>boolean
        (0|1)</em></td> <td><a name="-ORBDisableRTCollocation"></a>This
        option controls whether the application wants to use or discard
-       RT collocation decisions made by the RT ORB. A value of true
-       disables RT collocation decisions and falls back on the default
-       collocation decisions implemented in the default ORB. This is
-       very useful for applications using the RT ORB and doesn't want
+       RT collocation decisions made by the RT ORB. A value of
+       <CODE>1</CODE> (true) disables RT collocation decisions and falls back on the default
+       collocation decisions implemented in the default ORB, which is
+       useful for applications using the RT ORB and doesn't want
        to use the RT collocation decisions but fallback on the default
        decisions for better performance. The default value is
-       <code>0</code>. </td>      
+       <code>0</code> (false). </td>      
        </tr>
     </tbody>
   </table>
@@ -436,7 +430,7 @@ selection within a TAO application.
         <td><code>-ORBDefaultInitRef</code> <em>IOR prefix</em></td>
         <td><a name="-ORBDefaultInitRef"></a>This argument allows
 resolution of initial references not explicitly specified with
--ORBInitRef. It requires a URL prefix that, after appending a slash '/'
+<CODE>-ORBInitRef</CODE>. It requires a URL prefix that, after appending a slash '/'
 ('|' for the UIOP pluggable protocol) and a simple object key, forms a
 new URL to identify an initial object reference. The URL prefix format
 currently supported is based on the standard <code>corbaloc</code>
@@ -448,45 +442,136 @@ Service. </a></td>
         <td><a name="-ORBDottedDecimalAddresses"></a>Use the dotted
 decimal notation for addresses. This option can be used to workaround
 broken DNS implementations and may also reduce the time spent resolving
-IP addresses. By default, this option is disabled (<code>0</code>)
-since domain names are the standard address notation for IORs.</td>
+IP addresses.  This option is enabled (<code>1</code>) by default on
+Windows since DNS is often misconfigured there.  On other platforms
+this option is disabled (<code>0</code>) since domain names are 
+more flexible address notations for IORs.</td> 
       </tr>
       <tr>
         <td><code>-ORBEndpoint</code> <em>endpoint</em></td>
-        <td><a name="-ORBEndpoint"></a>This option is similar to the <code>-ORBListenEndPoints</code>
-option described below. <font color="red">This option will be
-deprecated in later versions on TAO since the CORBA specification now
-defines the <code>-ORBListenEndpoints</code> option instead. </font> </td>
-      </tr>
+        <td><a name="-ORBEndpoint"></a>This option is same as the <a
+        href="#-ORBListenEndpoints"><code>-ORBListenEndPoints</code></a>
+        option described below. <font color="red">This option will be
+        deprecated in later versions on TAO since the CORBA
+        specification now defines the <code>-ORBListenEndpoints</code>
+        option instead. </font> </td>
+      </tr>
+      <tr>
+        <td><code>-ORBPreferredInterfaces</code>
+        <em>"targetNetwork:localNetwork,.."</em></td> 
+        <td><a name="-ORBPreferredInterfaces"></a> This option allows
+        clients running on a multihomed host to pick a local
+        network/interface to communicate with a remote target. This
+        option looks for fully qualified interface names (either the
+        IP address or the DNS names) in the <em>targetNetwork</em> and
+        <em>localNetwork</em> parts. Multiple preferred tuples (a
+        tuple refers to a <em> target-to-local</em> network combo) can
+        be provided in the option using a comma seperated list. The
+        option doesn't yet support using jsut the network part of the 
+        qualified name. 
+        </tr>
+      <tr>
+        <td><code>-ORBEnforcePreferredInterfaces</code>
+        <em>Yes/No</em></td> 
+        <td><a name="-ORBEnforcePreferredInterfaces"></a> This option
+        specifies whether <CODE>-ORBPreferredInterfaces</CODE> option
+        needs to be enforced. The option is supposed to help with the following
+        usecase. It is possible that under some situations the
+        preferred local network may not have a route to the target
+        host/interface. The ORB can do one of the following. The ORB
+        coudl either choose a default local interface to send the
+        message or raise an exception to the application that
+        preferred interfaces are not usable. The option helps the ORB
+        decide on the course of action. If
+        <em> -ORBEnforcePreferredInterfaces</em> is set to true,
+        unusable preferred interfaces will make the ORB raise an
+        exception to the application. The defaul value for this option
+        is <em> no </em>.
+        </tr>
       <tr>
         <td><code>-ORBListenEndpoints</code> <em>endpoint</em></td>
         <td><a name="-ORBListenEndpoints"></a> This option was
-introduced with the CORBA <a
- href="http://cgi.omg.org/docs/orbos/01-01-04.pdf"> ORT </a> (Object
-Reference Template) specification. It instructs a server ORB to listen
-for requests on the interface specified by <code>endpoint</code>. TAO <a
- href="ORBEndpoint.html"> endpoints</a> are specified using a URL style
-format. An endpoint has the form:
-        <blockquote><code>protocol://V.v@addr1,...,W.w@addrN </code></blockquote>
-where <code>V.v</code> and <code>W.w</code> are optional protocol
-versions for each address. An example of an IIOP endpoint is:
+        introduced with the CORBA <a
+        href="http://cgi.omg.org/docs/orbos/01-01-04.pdf">Object
+            Reference Template</A> (ORT) specification. It instructs a
+        server ORB to listen for requests on the interface specified
+        by <code>endpoint</code>. When used with Real-time CORBA, the option
+        specifies the endpoints that the default thread pool listens
+        to.  TAO endpoints are specified using a URL style format. An
+        endpoint has the form:
+        <blockquote><code>protocol://V.v@addr1,...,W.w@addrN
+        </code></blockquote> where <code>V.v</code> and
+        <code>W.w</code> are optional protocol versions for each
+        address. An example of an IIOP endpoint is:
         <blockquote><code>iiop://<i><em>hostname</em></i>:<i><em>port</em></i>
-          </code></blockquote>
-Sets of endpoints may be specified using multiple <code>-ORBEndpoint</code>
-options or by delimiting endpoints with a semi-colon (;). For example,
-        <blockquote><code>-ORBEndpoint iiop://localhost:9999
--ORBEndpoint uiop:///tmp/mylocalsock -ORBEndpoint shmiop://10002 </code></blockquote>
-is equivalent to:
-        <blockquote><code>-ORBEndpoint
-'iiop://localhost:9999;uiop:///tmp/mylocalsock;shmiop://10002' </code></blockquote>
-Notice the single quotes (') in the latter option specification. Single
-quotes are needed to prevent the shell from interpreting text after the
-semi-colon as another command to run.
-        <p>If an endpoint is specified without an <code>addr</code>
-such as the following: </p>
-        <blockquote><code>-ORBEndpoint uiop:// -ORBEndpoint shmiop:// </code></blockquote>
-then a default endpoint will be created for the specified protocol.
-        <p></p>
+        </code></blockquote> 
+
+        Sets of endpoints may be specified using multiple
+        <code>-ORBListenEndpoints</code> options or by delimiting
+        endpoints with a semi-colon (;).  For example,
+        <blockquote><code>-ORBListenEndpoints iiop://localhost:9999
+        -ORBListenEndpoints uiop:///tmp/mylocalsock
+        -ORBListenEndpoints shmiop://10002 </code></blockquote> is
+        equivalent to: <blockquote><code>-ORBListenEndpoints
+        'iiop://localhost:9999;uiop:///tmp/mylocalsock;shmiop://10002'
+        </code></blockquote> Notice the single quotes (') in the
+        latter option specification. Single quotes are needed to
+        prevent the shell from interpreting text after the semi-colon
+        as another command to run.  <p>If an endpoint is specified
+        without an <code>addr</code> such as the following: </p>
+        <blockquote><code>-ORBListenEndpoints uiop://
+        -ORBListenEndpoints shmiop:// </code></blockquote> then a
+        default endpoint will be created for the specified
+        protocol. <p>
+
+        Click <a href="ORBEndpoint.html"> here</a> for much more on
+        how to specify endpoints.
+        </td>
+      </tr>
+      <tr>
+        <td><code>-ORBLaneEndpoint</code> <em>endpoint</em></td>
+        <td><a name="-ORBLaneEndpoint"></a>This option is same as the
+        <a
+        href="#-ORBLaneListenEndpoints"><code>-ORBLaneListenEndPoints</code></a>
+        option described below. <font color="red">This option will be
+        deprecated in later versions on TAO.</font>
+        </td>
+      </tr>
+      <tr>
+        <td><code>-ORBLaneListenEndpoints</code>
+        <em>thread-pool-id:thread-lane-id endpoint</em></td> <td><a
+        name="-ORBLaneListenEndpoints"></a> This option allows the
+        user to specify endpoints for thread pools and lanes. This
+        option is only meaningful when used with Real-time CORBA and
+        only makes sense when the thread pools and lanes are created in the
+        same order across server incarnations.  See <a
+        href="#-ORBListenEndpoints"><code>-ORBListenEndPoints</code></a>
+        option on how to specify endpoints.  An example is:
+        <blockquote><code>2:3 iiop://localhost:2345
+        </code></blockquote> where <code>2</code> specifies the second
+        thread pool created by the process and <code>3</code>
+        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.
+
+        <p>Sets of endpoints may be specified using multiple
+        <code>-ORBLaneListenEndpoints</code> options or by delimiting
+        endpoints with a semi-colon (;). For example,
+        <blockquote><code>-ORBLaneListenEndpoints 1:4
+        iiop://localhost:9999 -ORBLaneListenEndpoints 1:4
+        uiop:///tmp/mylocalsock -ORBLaneListenEndpoints 1:4
+        shmiop://10002 </code></blockquote> is equivalent to:
+        <blockquote><code>-ORBLaneListenEndpoints 1:4
+        'iiop://localhost:9999;uiop:///tmp/mylocalsock;shmiop://10002'
+        </code></blockquote> Notice the single quotes (') in the
+        latter option specification. Single quotes are needed to
+        prevent the shell from interpreting text after the semi-colon
+        as another command to run.  <p>If an endpoint is specified
+        without an <code>addr</code> such as the following: </p>
+        <blockquote><code>-ORBLaneListenEndpoints 2:3 uiop://
+        -ORBLaneListenEndpoints 2:3 shmiop:// </code></blockquote>
+        then a default endpoint will be created for the specified
+        protocol. 
         </td>
       </tr>
       <tr>
@@ -561,9 +646,9 @@ provided for specific application requirements.
       <tr>
         <td><code>-ORBId</code> <em>orb_name</em></td>
         <td><a name="-ORBId"></a>This option allows the name of an ORB
-to be set to <code>orb_name</code>. The ORBId will be passed to the
-ORB_init() method to differentiate coexisting ORBs (when there are more
-than one ORBs).</td>
+to be set to <code>orb_name</code>. The <CODE>ORBId</CODE> will be
+passed to the <CODE>CORBA::ORB_init()</CODE> method to differentiate
+coexisting ORBs (when there is more than one ORB).</td>
       </tr>
       <tr>
         <td><code>-ORBServerId</code> <em>server_id</em></td>
@@ -755,14 +840,16 @@ new IOR formats </a>using this option. </td>
         <td><code>-ORBConnectionPurgingStrategy</code> <em>type</em></td>
         <td><a name="-ORBConnectionPurgingStrategy"></a>Opened
 connections are added to the transport cache so they can be reused.
-However, if a process continues to run and these connections are not
-reused, the cache will continue to grow. Therefore, before each new
-connection, the cache is checked and purged if it has reached the limit
-specified by the -ORBConnectionCacheMax option or the system default if
-that option was not used. The possible values for type are lru, lfu,
-fifo and null. The default is LRU (Least Recently Used). The others LFU
-(Least Frequently Used), FIFO (First In First Out), and null (No
-connections are purged) are contained within the TAO Strategies
+If a process continues to run and these connections are not reused,
+however, the cache will continue to grow.  Before each new connection,
+therefore, the cache is checked and purged if it has reached the limit
+specified by the <CODE>-ORBConnectionCacheMax</CODE> option or the
+system default if that option was not used. The possible values for
+type are <CODE>lru</CODE>, <CODE>lfu</CODE>, <CODE>fifo</CODE>, and
+<CODE>null</CODE>. The default is <CODE>lru</CODE> (least recently
+used). The other options are <CODE>lfu</CODE> (least frequently used),
+<CODE>fifo</CODE> (first in first out), and <CODE>null</CODE> (no
+connections are purged) and are contained within the TAO Strategies
 library. </td>
       </tr>
       <tr>
@@ -770,7 +857,7 @@ library. </td>
         <td><a name="-ORBConnectionCacheMax"></a>The transport cache
 will grow to a maximum of the specified limit. The default is system
 dependent, but can be overridden at compile-time by defining the
-preprocessor macro TAO_CONNECTION_CACHE_MAXIMUM. </td>
+preprocessor macro <CODE>TAO_CONNECTION_CACHE_MAXIMUM</CODE>. </td>
       </tr>
       <tr>
         <td><code>-ORBMuxedConnectionMax</code> <em>number</em></td>
@@ -894,10 +981,6 @@ the ORB uses. The default reactor is the ACE_TP_Reactor.
               <td>Use the single-thread select-based reactor.</td>
             </tr>
             <tr>
-              <td><code>fl</code></td>
-              <td>Use the FLReactor (FLTK-based).</td>
-            </tr>
-            <tr>
               <td><code>wfmo</code></td>
               <td>Use the WFMO reactor (Win32 only).</td>
             </tr>
@@ -923,23 +1006,25 @@ default.</td>
       <tr>
         <td><code>-ORBReactorThreadQueue</code> <em>which</em></td>
         <td><a name="-ORBReactorThreadQueue"></a>Applies only to the
-ACE_TP_Reactor, i.e., when <code>-ORBReactorType</code> = <code>tp</code>,
-and specifies the order, last-in-first-out (<em>which</em> = <code>LIFO</code>),
-the default, or first-in-first-out (<em>which</em> = <code>FIFO</code>),
-in which waiting threads are selected to run by the
-ACE_Select_Reactor_Token. </td>
+<CODE>ACE_TP_Reactor</CODE>, i.e., when <code>-ORBReactorType</code> =
+<code>tp</code>, and specifies the order, last-in-first-out
+(<em>which</em> = <code>LIFO</code>), the default, or
+first-in-first-out (<em>which</em> = <code>FIFO</code>), in which
+waiting threads are selected to run by the
+<CODE>ACE_Select_Reactor_Token</CODE>. </td>
       </tr>
       <tr>
         <td><code>-ORBInputCDRAllocator</code> <em>which</em></td>
-        <td><a name="-ORBInputCDRAllocator"></a>Specify whether the ORB
-uses locked (<em>which</em> = <code>thread</code>) or lock-free (<em>which</em>
-= <code>null</code>) allocators for the incoming CDR buffers. Though <code>null</code>
-should give the optimal performance; we made the default <code>thread</code>.
-TAO optimizations for octet sequences will not work in all cases when
-the allocator does not have locks (for example if the octet sequences
-are part of a return value). Using locked allocators also allows the
-users to take advantage of the TAO octet sequence extensions to
-preserve the buffer after the upcall. </td>
+        <td><a name="-ORBInputCDRAllocator"></a>Specify whether the
+ORB uses locked (<em>which</em> = <code>thread</code>) or lock-free
+(<em>which</em> = <code>null</code>) allocators for the incoming CDR
+buffers. Though <code>null</code> should give the optimal performance;
+we made the default <code>thread</code>.  TAO optimizations for octet
+sequences will not work in all cases when the allocator does not have
+locks (for example if the octet sequences are part of a return
+value). Using locked allocators also allows the users to take
+advantage of the TAO octet sequence extensions to preserve the buffer
+after the upcall. </td>
       </tr>
       <tr>
         <td><code>-ORBAMHResponseHandlerAllocator</code> <em>which</em></td>
@@ -1199,13 +1284,13 @@ one way calls. This strategy can also be used in an application that is
 both a client and a server if the server side is handled by a separate
 thread and the client threads are "pure" clients. </p>
 <p>
-        MT_NOUPCALL means use a client connection handler that
+        <CODE>MT_NOUPCALL</CODE> means use a client connection handler that
         participates in the leader-follower model like MT, but, like
         RW, does not allow handling of nested upcalls within the
         waiting thread.  Note that with this strategy it is possible
         to "run out of threads" in a thread pool, and that TAO doesn't
         grow thread pools.  Unlike RW, this does not require  <a
-        href="-ORBTransportMuxStrategy">-ORBTransportMuxStrategy&nbsp;<em>EXCLUSIVE</em></a>.
+        href="#ORBTransportMuxStrategy">-ORBTransportMuxStrategy&nbsp;<em>EXCLUSIVE</em></a>.
 <!--
 I'm not sure what the effect of AMI on this option is.
 -->
@@ -1215,7 +1300,7 @@ I'm not sure what the effect of AMI on this option is.
       </tr>
       <tr>
         <td><code>-ORBTransportMuxStrategy</code> <em>EXCLUSIVE | MUXED</em></td>
-        <td><a name="-ORBTransportMuxStrategy"></a><em>EXCLUSIVE</em>
+        <td><a name="ORBTransportMuxStrategy"></a><em>EXCLUSIVE</em>
 means that the Transport does not multiplex requests on a connection.
 At a time, there can be only one request pending on a connection.
         <p><em>MUXED</em> means that Transport multiplexes more than
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 3c67ac8d5cd..d300062b353 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -456,7 +456,9 @@ also receives other options that are specific to it. <p>
     <td>To specify the output directory to IDL compiler as to where all the
         IDL-compiler-generated files are to be put. By default, all the files are
         put in the current directory from where&nbsp;<tao_idl>is called.&nbsp;</td>
-    <td>&nbsp;</td>
+    <td>If the specified directory does not exist, it will be created, if any path
+        that may precede the directory name already exists. If the directory
+        itself already exists, no action is taken.&nbsp;</td>
   </tr>
 
   <tr><a name="hc">
diff --git a/TAO/docs/implrepo/index.html b/TAO/docs/implrepo/index.html
index cdad9b52798..34d0e34c492 100644
--- a/TAO/docs/implrepo/index.html
+++ b/TAO/docs/implrepo/index.html
@@ -16,8 +16,10 @@
 
 <p><b>Note:</b> I have moved most of the documentation here to the <A
 HREF="http://www.dre.vanderbilt.edu/Doxygen/">ACE+TAO doxygen</A> website, so
-please check <A
-HREF="http://www.dre.vanderbilt.edu/Doxygen/Stable/html/tao/implrepo_service/index.html">here</A>.
+please check for the last night documention <A
+HREF="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/implrepo_service/index.html">here</A> and
+<A HREF="http://www.dre.vanderbilt.edu/Doxygen/Stable/tao/implrepo_service/index.html">here</A> for the
+latest stable documentation
 
 <hr>
 
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
index ad95e341380..e3d2a55fc0e 100644
--- a/TAO/docs/index.html
+++ b/TAO/docs/index.html
@@ -35,7 +35,7 @@ HREF="http://www.omg.org/library/c2indx.html">CORBA</a> Documentation</h3>
       <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> TAO <a HREF="compiler.html">IDL Compiler Options</a> </dt><P>
       <dt> <img alt="o"
           src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> TAO <a HREF="libraries.html">Library Subsets</a></dt><p>
-      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <a HREF="orbsvcs.html">ORB Services Directories</a> </dt><P>
+      <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <a HREF="orbsvcs.html">ORB Services Documentation</a> </dt><P>
       <dt> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <a HREF="Tags.html">Tags and Magic Numbers</a> </dt><P>
     </dl>
     </td>
diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html
index b1469d84279..e79eb4f411e 100644
--- a/TAO/docs/orbsvcs.html
+++ b/TAO/docs/orbsvcs.html
@@ -224,7 +224,7 @@ bgcolor="#ffffff">
 
   <H2>SEE ALSO</H2>
 
-  <P>You may you to check TAO
+  <P>You may want to check TAO
      <A HREF="releasenotes/index.html">release notes</A>
      for up to date information on status, changes, future work, etc.</P>
 
diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html
index b1921b71942..34311012efe 100644
--- a/TAO/docs/releasenotes/ec.html
+++ b/TAO/docs/releasenotes/ec.html
@@ -7,42 +7,31 @@
 <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
 
 <H3>TAO's Real-time Event Service</H3>
-    Point of contact: <A HREF="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</A>
+    Point of contact: <A HREF="mailto:jwillemsen@remedy.nl">Johnny Willemsen</A>
     <H4>Last Updated: $Date$</H4>
 
+    Documentation for the command line and service configurator
+    options used to configure the real-time event service is available <A
+    HREF="../ec_options.html">here</A>.
+
+
 <H3>New on this release</H3>
 
     <UL>
-      <LI><P>The copy-on-write semantics has been supported for a
-	  while now.
+      <LI><P>The consumer/supplier control can be controlled better, interval
+        and timeout can be configured.
 	</P>
       </LI>
-      <LI><P>The event service library has been divided in several
-	  smaller libraries, so applications only link the required
-	  components.
-	  The base code for the Event Service is located in the
-	  <CODE>TAO_RTEvent</CODE> library.
-	  <CODE>TAO_RTOLDEvent</CODE> contains the old implementation
-	  for the real-time Event Service,
-	  in addition to this the <CODE>TAO_RTSchedEvent</CODE>
-	  contains the components that will support scheduling in the
-	  new Event Service.
-	  This means that applications using only the
-	  <CODE>TAO_RTEvent</CODE> library do not need to link the
-	  scheduling service.
-	</P>
-      </LI>
-      <LI><P>More details can be found on the <CODE>README</CODE> file
-	  in the <CODE>$TAO_ROOT/orbsvcs/orbsvcs/Event</CODE>
-	  directory.
+      <LI><P>At the moment a consumer is connected it can be controlled when the
+        connection from the EC to the consumer is created, this can be directly
+        at the first connect or with the first push.
 	</P>
       </LI>
-      <LI><P>Add strategies to remove unresponsive or dead consumers
-	  and/or suppliers
+      <LI><P>The IIOP Gateway has been expanded with several options to control
+        its behaviour.
 	</P>
       </LI>
-      <LI><P>Lots of bug fixes since the last time this releases notes
-	  where updated.
+      <LI><P>The implementation of the multicast gateway has been improved.
 	</P>
       </LI>
     </UL>
@@ -116,6 +105,38 @@ this test can be found in the scripts located in <TT>$TAO_ROOT/orbsvcs/tests/EC_
 Features in previous releases</H3>
 
     <UL>
+      <LI><P>The copy-on-write semantics has been supported for a
+	  while now.
+	</P>
+      </LI>
+      <LI><P>The event service library has been divided in several
+	  smaller libraries, so applications only link the required
+	  components.
+	  The base code for the Event Service is located in the
+	  <CODE>TAO_RTEvent</CODE> library.
+	  <CODE>TAO_RTOLDEvent</CODE> contains the old implementation
+	  for the real-time Event Service,
+	  in addition to this the <CODE>TAO_RTSchedEvent</CODE>
+	  contains the components that will support scheduling in the
+	  new Event Service.
+	  This means that applications using only the
+	  <CODE>TAO_RTEvent</CODE> library do not need to link the
+	  scheduling service.
+	</P>
+      </LI>
+      <LI><P>More details can be found on the <CODE>README</CODE> file
+	  in the <CODE>$TAO_ROOT/orbsvcs/orbsvcs/Event</CODE>
+	  directory.
+	</P>
+      </LI>
+      <LI><P>Add strategies to remove unresponsive or dead consumers
+	  and/or suppliers
+	</P>
+      </LI>
+      <LI><P>Lots of bug fixes since the last time this releases notes
+	  where updated.
+	</P>
+      </LI>
       <LI><P>In this release the EC supports atomic updates of
 	  subscriptions and publications.  In previous versions events
 	  could be lost during an update of the subscription list.
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 751a13f40e8..a6fd3d6d222 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -279,11 +279,11 @@ WFMO_Reactor_Test, Timer_Cancellation_Test</ul>
 <h3>
 <a NAME="idl"></a>IDL Compiler</h3>
 Point of contact: <a href="mailto:j.parsons@vanderbilt.edu">Jeff Parsons</a>
-<p>Current status: (As of August 14, 2004.)
+<p>Current status: (As of October 25, 2004.)
 <ul>
 <li>
 Generated code closely follows the C++ Mapping specified in the latest
-C++ mapping for CORBA 2.3 (Document ptc/98-09-03).</li>
+C++ mapping for CORBA 3.0 (Document ptc/03-06-03).</li>
 
 <li>
 IDL compiler is now able to generate code that support native C++ exceptions
@@ -636,6 +636,13 @@ which converts IDL files by replacing IDL3 constructs with equivalent IDL2
 constructs, and if the IDL compiler is run on these files, we do not want
 the CCM preprocessing to occur.
 </li>
+
+<li>
+Changed the behavior of the -o option to create the specified directory
+if it does not already exist. Only one level of directory can be created
+with this option (any path prefix included must already exist).
+If the specified directory already exists, no action is taken.
+</li>
 </ul>
 
 <h4>
@@ -1392,7 +1399,10 @@ Point of contact: <a href="mailto:pradeep@cs.wustl.edu">Pradeep Gore</a>
 <p>The COS compliant Event Service implements the Event Service Specification:
 <a href="ftp://ftp.omg.org/pub/docs/formal/97-12-11.pdf">(.pdf)</a>,
 <a href="ftp://ftp.omg.org/pub/docs/formal/97-12-11.ps">(.ps)</a>
-<br>This implementation is based on the Real Time Event service.
+<br>The different command line and service configurator options used
+for configuring the CORBA event services are located <A
+href="../cec_options.html"> here</a>. This implementation is based on
+the Real Time Event service. 
 <h3>
 Features in this release:</h3>
 
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
index 95fc7a4ee53..8bdaab076a8 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
@@ -7,6 +7,7 @@
 #include <orbsvcs/Event_Utilities.h>
 #include "ace/streams.h"
 #include "ace/OS_NS_string.h"
+#include "tao/Exception.h"
 
 int main (int argc, char* argv[])
 {
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index 02fc48a62c4..1bb6f2cbc19 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -3,9 +3,11 @@
 //
 
 #include "AMH_Servant.h"
-#include "ace/Get_Opt.h"
 #include "Timer_Handler.h"
 
+#include "ace/Reactor.h"
+#include "ace/Get_Opt.h"
+
 
 AMH_Servant::AMH_Servant (CORBA::ORB_ptr orb)
   : sleep_time_ (0)
@@ -83,7 +85,7 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
       //    schedule_timer() call below fails (which you do not check
       //    for).  If the schedule_timer() call fails, then you should
       //    delete() the Timer_Handler instance.
-      // 
+      //
       // Done.
 
       // Handler will 'kill' itself when it is done.
@@ -102,7 +104,7 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
           delete handler;
 
           // send a no-op to the client
-          _tao_rh->test_method (ACE_static_cast (Test::Timestamp, 0));
+          _tao_rh->test_method (static_cast<Test::Timestamp> (0));
 
           // just in case we add code later on after this if stmt
           return;
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index c7e9ff8910b..3830cb052d3 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*progress): taoexe, strategies, messaging, ami, portableserver {
-  requires += fl_reactor
+project(*progress): taoexe, messaging, ami, portableserver, tao_flresource {
   Source_Files {
     Progress_i.cpp
     progress.cpp
@@ -10,7 +9,6 @@ project(*progress): taoexe, strategies, messaging, ami, portableserver {
 }
 
 project(*peer): taoexe, strategies, messaging, ami, portableserver {
-  requires += fl_reactor
   Source_Files {
     Peer_i.cpp
     peer.cpp
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 59f3cbfaae1..6d04cad3f50 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -1,10 +1,7 @@
 // $Id$
 
 #include "Peer_i.h"
-
-#if !defined(__ACE_INLINE__)
-#include "Peer_i.i"
-#endif /* __ACE_INLINE__ */
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(FL_Callback, Peer_i, "$Id$")
 
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index c0583be398c..b5593adc52a 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -128,8 +128,4 @@ private:
   // Our id
 };
 
-#if defined(__ACE_INLINE__)
-#include "Peer_i.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* PEER_I_H */
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.i b/TAO/examples/AMI/FL_Callback/Peer_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/examples/AMI/FL_Callback/Peer_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index 4b1d16887bc..91e6c571118 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -2,17 +2,11 @@
 
 #include "Progress_i.h"
 
-#if defined(ACE_HAS_FL)
-
 #include <FL/Fl_Slider.h>
 #include <FL/Fl_Button.h>
 
-#if !defined(__ACE_INLINE__)
-#include "Progress_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (FL_Cube, 
-           test_i, 
+ACE_RCSID (FL_Cube,
+           test_i,
            "$Id$")
 
 Progress_i::Progress_i (Progress_Window *window)
@@ -108,11 +102,11 @@ Progress_Window::sent_request (CORBA::Long id)
   if (id < 0 || id >= this->n_peers_)
     return;
   Fl_Slider *obj =
-    ACE_dynamic_cast (Fl_Slider*,this->request_progress_[id]);
+    dynamic_cast<Fl_Slider*> (this->request_progress_[id]);
   obj->value (obj->value () + 1);
   obj->redraw ();
 
-  int i = ACE_static_cast(int,obj->value ());
+  int i = static_cast<int> (obj->value ());
   if (i % 100 == 0)
     ACE_DEBUG ((LM_DEBUG, "Progress (%t) - recv reply %d\n", i));
 }
@@ -123,11 +117,11 @@ Progress_Window::recv_reply (CORBA::Long id)
   if (id < 0 || id >= this->n_peers_)
     return;
   Fl_Slider *obj =
-    ACE_dynamic_cast (Fl_Slider*,this->reply_progress_[id]);
+    dynamic_cast<Fl_Slider*> (this->reply_progress_[id]);
   obj->value (obj->value () + 1);
   obj->redraw ();
 
-  int i = ACE_static_cast(int,obj->value ());
+  int i = static_cast<int> (obj->value ());
   if (i % 100 == 0)
     ACE_DEBUG ((LM_DEBUG, "Progress (%t) - recv reply %d\n", i));
 }
@@ -147,7 +141,7 @@ void
 Progress_Window::start_callback (Fl_Widget* /* widget */,
                                  void *data)
 {
-  Progress_Window *self = ACE_static_cast (Progress_Window*, data);
+  Progress_Window *self = static_cast<Progress_Window*> (data);
   self->start ();
 }
 
@@ -174,6 +168,3 @@ Progress_Window::start ()
       ACE_ENDTRY;
     }
 }
-
-
-#endif /* ACE_HAS_FL */
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index e382d928147..efb915e3b52 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -18,8 +18,6 @@
 
 #include "testS.h"
 
-#if defined(ACE_HAS_FL)
-
 #include <FL/Fl_Box.h>
 
 class Progress_Window : public Fl_Box
@@ -91,10 +89,4 @@ private:
   // Display the graphics...
 };
 
-#if defined(__ACE_INLINE__)
-#include "Progress_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_FL */
-
 #endif /* PROGRESS_I_H */
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.i b/TAO/examples/AMI/FL_Callback/Progress_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/examples/AMI/FL_Callback/Progress_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/examples/AMI/FL_Callback/README b/TAO/examples/AMI/FL_Callback/README
index 134cce782e1..59c3cd0ba9a 100644
--- a/TAO/examples/AMI/FL_Callback/README
+++ b/TAO/examples/AMI/FL_Callback/README
@@ -5,7 +5,7 @@ GUI components.
 
 	Run as:
 
-$ ./progress -p 4 -i 10000 -ORBSvcConf svc.conf
+$ ./progress -p 4 -i 10000
 $ ./peer -n 1 -t 10000 -ORBSvcConf peer.conf
 $ ./peer -n 2 -t 10000 -ORBSvcConf peer.conf
 $ ./peer -n 4 -t 10000 -ORBSvcConf peer.conf
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 4e16631d0d7..d5d9556a839 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -2,22 +2,13 @@
 
 #include "Progress_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+#include "tao/FlResource_Loader.h"
 
-ACE_RCSID (FL_Callback, 
-           progress, 
+ACE_RCSID (FL_Callback,
+           progress,
            "$Id$")
 
-#if !defined (ACE_HAS_FL)
-
-int main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "This example requires FL support\n"));
-  return 0;
-}
-
-#else
-
 #include <FL/Fl.h>
 #include <FL/Fl_Window.h>
 
@@ -64,6 +55,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+  TAO::FlResource_Loader fl_loader;
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -150,5 +142,3 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
   return 0;
 }
-
-#endif /* ACE_HAS_FL */
diff --git a/TAO/examples/AMI/FL_Callback/svc.conf b/TAO/examples/AMI/FL_Callback/svc.conf
deleted file mode 100644
index f7d75c036eb..00000000000
--- a/TAO/examples/AMI/FL_Callback/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorType fl"
diff --git a/TAO/examples/AMI/FL_Callback/svc.conf.xml b/TAO/examples/AMI/FL_Callback/svc.conf.xml
deleted file mode 100644
index 6520d125ad8..00000000000
--- a/TAO/examples/AMI/FL_Callback/svc.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./examples/AMI/FL_Callback/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorType fl"/>
-</ACE_Svc_Conf>
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index 60a0519cbd0..c5ae00a4544 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -47,7 +47,7 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("Error during lseek")),
                       0);
-  else if (offset != ACE_static_cast (CORBA::ULong, real_offset))
+  else if (offset != static_cast<CORBA::ULong> (real_offset))
     {
       // Didn't get the desired offset.
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index d91be62615e..214b818cfd3 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -7,8 +7,13 @@
 #include "Iterator_Factory_i.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI_Iterator,
+           Iterator_Factory_i,
+           "$Id$")
 
-ACE_RCSID (AMI_Iterator, Iterator_Factory_i, "$Id$")
 
 void
 Iterator_Factory_i::get_iterator (const char *pathname,
@@ -110,18 +115,17 @@ Iterator_Factory_i::content_type (const char *filename,
   // Handle the case where multiple periods exists in the filename,
   // e.g.:  foo.bar.ps
   char *extension = 0;
-  for (char * tmp = ACE_const_cast (char *, filename);
+  for (char * tmp = const_cast<char *> (filename);
        tmp != 0 && tmp != tmp + len;
        )
     {
-      tmp = ACE_const_cast (char *,
-                            ACE_OS::strchr (tmp, '.'));
+      tmp = const_cast<char *> (ACE_OS::strchr (tmp, '.'));
       if (tmp != 0)
         extension = ++tmp;  // Skip over the '.'
     }
 
   if (extension == 0)
-    extension = ACE_const_cast (char *, filename);  // No extension!
+    extension = const_cast<char *> (filename);  // No extension!
 
   if (ACE_OS::strcasecmp (extension, "htm") == 0
       || ACE_OS::strcasecmp (extension, "html") == 0)
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index df7814ef774..85f0cdd68fb 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -8,8 +8,13 @@
 #include "ace/Process_Manager.h"
 #include "Iterator_Handler.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI_Iterator,
+           Iterator_Handler,
+           "$Id$")
 
-ACE_RCSID(AMI_Iterator, Iterator_Handler, "$Id$")
 
 Iterator_Handler::Iterator_Handler (void)
   : file_ (ACE_sap_any_cast (const ACE_FILE_Addr &)),
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index ad805c1bc48..15755e55328 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -8,8 +8,13 @@
 #include "ace/Process_Manager.h"
 #include "Callback_i.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI_Observer,
+           Callback_i,
+           "$Id$")
 
-ACE_RCSID (AMI_Observer, Callback_i, "$Id$")
 
 Callback_i::Callback_i (int *request_count)
   : file_ (ACE_sap_any_cast (ACE_FILE_Addr &)),
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
index 7ace45deb14..4b6f0db6c37 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
@@ -7,8 +7,13 @@
 #include "Callback_Handler.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI_Observer,
+           Push_Iterator_Factory_i,
+           "$Id$")
 
-ACE_RCSID (AMI_Observer, Push_Iterator_Factory_i, "$Id$")
 
 Web_Server::Metadata_Type *
 Push_Iterator_Factory_i::register_callback
@@ -119,19 +124,18 @@ Push_Iterator_Factory_i::content_type (const char *filename,
   // Handle the case where multiple periods exists in the filename,
   // e.g.:  foo.bar.ps
   char * extension = 0;
-  for (char * tmp = ACE_const_cast (char *, filename);
+  for (char * tmp = const_cast<char *> (filename);
        tmp != 0 && tmp != tmp + len;
        )
     {
-      tmp = ACE_const_cast (char *,
-                            ACE_OS::strchr (tmp, '.'));
+      tmp = const_cast<char *> (ACE_OS::strchr (tmp, '.'));
 
       if (tmp != 0)
         extension = ++tmp;  // Skip over the '.'
     }
 
   if (extension == 0)
-    extension = ACE_const_cast (char *, filename);  // No extension!
+    extension = const_cast<char *> (filename);  // No extension!
 
   if (ACE_OS::strcasecmp (extension, "htm") == 0
       || ACE_OS::strcasecmp (extension, "html") == 0)
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 5fef64be5a2..669ead91a3b 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -57,7 +57,7 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset,
                          ACE_TEXT ("Error during lseek")),
                         0);
     }
-  else if (offset != ACE_static_cast (CORBA::ULong, real_offset))
+  else if (offset != static_cast<CORBA::ULong> (real_offset))
     {
       // Didn't get the desired offset.
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
index 1560bed9d78..d7cebf1b26f 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
@@ -121,19 +121,18 @@ Iterator_Factory_i::content_type (const char *filename,
   // Handle the case where multiple periods exists in the filename,
   // e.g.:  foo.bar.ps
   char * extension = 0;
-  for (char * tmp = ACE_const_cast (char *, filename);
+  for (char * tmp = const_cast<char *> (filename);
        tmp != 0 && tmp != tmp + len;
        )
     {
-      tmp = ACE_const_cast (char *,
-                            ACE_OS::strchr (tmp, '.'));
+      tmp = const_cast<char *> (ACE_OS::strchr (tmp, '.'));
 
       if (tmp != 0)
         extension = ++tmp;  // Skip over the '.'
     }
 
   if (extension == 0)
-    extension = ACE_const_cast (char *, filename);  // No extension!
+    extension = const_cast<char *> (filename);  // No extension!
 
   if (ACE_OS::strcasecmp (extension, "htm") == 0
       || ACE_OS::strcasecmp (extension, "html") == 0)
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index a5ec056cc20..dcec6b9a578 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -8,9 +8,11 @@
 #include "orbsvcs/CosNamingC.h"
 #include "Web_ServerC.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
 
-ACE_RCSID (SMI_Iterator, 
-           client, 
+
+ACE_RCSID (SMI_Iterator,
+           client,
            "$Id$")
 
 
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.h b/TAO/examples/Event_Comm/Consumer_Input_Handler.h
index c4325081fbb..0a98278ffae 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.h
@@ -18,6 +18,8 @@
 #define CONSUMER_INPUT_HANDLER_
 
 #include "ace/Service_Config.h"
+#include "ace/Event_Handler.h"
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index 49db2ba7bda..033d1f0d8ae 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -350,7 +350,7 @@ Notifier_i::push (const Event_Comm::Event &event
       ACE_ASSERT (consumer_ref != 0);
 
 #if defined (ACE_HAS_REGEX)
-      char *regexp = ACE_const_cast (char *, me->int_id_->regexp ());
+      char *regexp = const_cast<char *> (me->int_id_->regexp ());
       ACE_ASSERT (regexp);
 
       const char *criteria = me->int_id_->criteria ();
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index 782346a1b7e..2b6f34dfc15 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -323,9 +323,9 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
   sc_qos_as_any <<= sc_qos;
 
   sc.context_data =
-    ACE_reinterpret_cast(IOP::ServiceContext::
-                         _tao_seq_CORBA_Octet_ &,
-                         *codec_->encode (sc_qos_as_any));
+    ACE_reinterpret_cast<IOP::ServiceContext::_tao_seq_CORBA_Octet_ &> (
+	*codec_->encode (sc_qos_as_any)
+	);
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp
index b9640a4c8c7..fa3a5e71254 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp
@@ -155,7 +155,7 @@ EDF_Scheduling::SchedulingParameter::_tao_any_destructor (
   )
 {
   SchedulingParameter *_tao_tmp_pointer =
-    ACE_static_cast (SchedulingParameter *, _tao_void_pointer);
+    static_cast<SchedulingParameter *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -215,7 +215,7 @@ void
 EDF_Scheduling::SchedulingParameterPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   SchedulingParameterPolicy *_tao_tmp_pointer =
-    ACE_static_cast (SchedulingParameterPolicy *, _tao_void_pointer);
+    static_cast<SchedulingParameterPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -391,7 +391,7 @@ void
 EDF_Scheduling::Scheduler::_tao_any_destructor (void *_tao_void_pointer)
 {
   Scheduler *_tao_tmp_pointer =
-    ACE_static_cast (Scheduler *, _tao_void_pointer);
+    static_cast<Scheduler *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -540,9 +540,7 @@ CORBA::Boolean operator>>= (
     EDF_Scheduling::SchedulingParameter *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const EDF_Scheduling::SchedulingParameter *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const EDF_Scheduling::SchedulingParameter *&> (_tao_elem
     );
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index be451cd3e18..92039e6c7b1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -334,8 +334,7 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
       sc_qos_as_any <<= sc_qos;
 
       sc.context_data =
-        ACE_reinterpret_cast (CORBA::OctetSeq &,
-                             *codec_->encode (sc_qos_as_any));
+        reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
 
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
@@ -514,8 +513,7 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
       CORBA::Any sc_qos_as_any;
       sc_qos_as_any <<= sc_qos;
 
-      sc.context_data = ACE_reinterpret_cast(CORBA::OctetSeq &,
-                                             *codec_->encode (sc_qos_as_any));
+      sc.context_data = reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
 
       // Add this context to the service context list.
       ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index dbc2f6262f0..c29054aa439 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -317,8 +317,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
       sc_qos_as_any <<= sc_qos;
 
       sc.context_data =
-        ACE_reinterpret_cast(CORBA::OctetSeq &,
-                             *codec_->encode (sc_qos_as_any));
+        reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
       
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
@@ -493,8 +492,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
       CORBA::Any sc_qos_as_any;
       sc_qos_as_any <<= sc_qos;
 
-      sc.context_data = ACE_reinterpret_cast(CORBA::OctetSeq &,
-                                             *codec_->encode (sc_qos_as_any));
+      sc.context_data = reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
 
       // Add this context to the service context list.
       ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index c93fe444a89..c70de4a578b 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -332,8 +332,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
       sc_qos_as_any <<= sc_qos;
 
       sc.context_data =
-        ACE_reinterpret_cast(CORBA::OctetSeq &,
-                             *codec_->encode (sc_qos_as_any));
+        reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
       
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
@@ -540,8 +539,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
       CORBA::Any sc_qos_as_any;
       sc_qos_as_any <<= sc_qos;
 
-      sc.context_data = ACE_reinterpret_cast(CORBA::OctetSeq &,
-                                             *codec_->encode (sc_qos_as_any));
+      sc.context_data = reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
 
       // Add this context to the service context list.
       ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
index 704cb646f3f..a28658d96d1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
@@ -82,7 +82,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
       if (j%1000 == 0)
         {
           ACE_Time_Value run_time = ACE_OS::gettimeofday ();
-          task_stats_.sample (ACE_UINT64 (run_time.msec ()), guid);
+          task_stats_.sample (ACE_UINT32 (run_time.msec ()), guid);
         }
       
       compute_count_down.update ();
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
index 704cb646f3f..0f6874449e4 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
@@ -82,7 +82,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
       if (j%1000 == 0)
         {
           ACE_Time_Value run_time = ACE_OS::gettimeofday ();
-          task_stats_.sample (ACE_UINT64 (run_time.msec ()), guid);
+          task_stats_.sample (run_time.msec (), guid);
         }
       
       compute_count_down.update ();
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
index 704cb646f3f..0f6874449e4 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
@@ -82,7 +82,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
       if (j%1000 == 0)
         {
           ACE_Time_Value run_time = ACE_OS::gettimeofday ();
-          task_stats_.sample (ACE_UINT64 (run_time.msec ()), guid);
+          task_stats_.sample (run_time.msec (), guid);
         }
       
       compute_count_down.update ();
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 77d9a529374..eeecdfa03ae 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -115,7 +115,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 
   if (obj.in () == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%N|%l) <ERROR> [Identity_Client::run] \n"),
+                       ACE_TEXT ("(%N|%l) <ERROR> [Identity_Client::run] \n")
                        ACE_TEXT ("factory_resolve \n")),
                       -1);
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index cfba0d60e66..fb44c1ec6f0 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -93,12 +93,12 @@ Object_Group_Factory_i::unbind_round_robin (const char * id
   char *int_id = 0;
 
   // Throw an exception if not found in the HASH MAP
-  if (this->rr_groups_->find (ACE_const_cast (char *, id),
+  if (this->rr_groups_->find (const_cast<char *> (id),
                               this->mem_pool_) < 0)
     ACE_THROW (Load_Balancer::no_such_group ());
 
   // Unbind the entry
-  this->rr_groups_->unbind (ACE_const_cast (char *, id),
+  this->rr_groups_->unbind (const_cast<char *> (id),
                             int_id,
                             this->mem_pool_);
 
@@ -166,12 +166,12 @@ Object_Group_Factory_i::unbind_random (const char * id
   char *int_id = 0;
 
   // Throw an exception if not found in the HASH MAP
-  if (this->random_groups_->find (ACE_const_cast (char *, id),
+  if (this->random_groups_->find (const_cast<char *> (id),
                                   this->mem_pool_) < 0)
     ACE_THROW (Load_Balancer::no_such_group ());
 
   // Unbind the entry
-  this->random_groups_->unbind (ACE_const_cast (char *, id),
+  this->random_groups_->unbind (const_cast<char *> (id),
                                 int_id,
                                 this->mem_pool_);
 
@@ -208,14 +208,14 @@ Object_Group_Factory_i::make_group (int random,
 
   if (random)
     {
-      if (this->random_groups_->find (ACE_const_cast (char *,id),
+      if (this->random_groups_->find (const_cast<char *> (id),
                                       this->mem_pool_) == 0)
         ACE_THROW_RETURN (Load_Balancer::duplicate_group (),
                           Load_Balancer::Object_Group::_nil ());
     }
   else
     {
-      if (this->rr_groups_->find (ACE_const_cast (char *,id),
+      if (this->rr_groups_->find (const_cast<char *> (id),
                                   this->mem_pool_) == 0)
         ACE_THROW_RETURN (Load_Balancer::duplicate_group (),
                           Load_Balancer::Object_Group::_nil ());
@@ -335,7 +335,7 @@ Object_Group_Factory_i::resolve (const char * id
                                  (void *&)this->rr_groups_) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("(%N|%l) The factory does not have any references "),
+                             ACE_TEXT ("(%N|%l) The factory does not have any references ")
                              ACE_TEXT ("to the group that you have sought \n\n")),
                             0);
         }
@@ -347,7 +347,7 @@ Object_Group_Factory_i::resolve (const char * id
                                  (void *&)this->random_groups_) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("(%N|%l) The factory does not have any references "),
+                             ACE_TEXT ("(%N|%l) The factory does not have any references ")
                              ACE_TEXT ("to the group that you have sought \n\n")),
                             0);
 
@@ -364,10 +364,10 @@ Object_Group_Factory_i::resolve (const char * id
 
   char *ior = 0;
 
-  if (rr_groups_->find (ACE_const_cast (char *, id),
+  if (rr_groups_->find (const_cast<char *> (id),
                         ior,
                         this->mem_pool_) == -1
-      && random_groups_->find (ACE_const_cast (char *, id),
+      && random_groups_->find (const_cast<char *> (id),
                                ior,
                                this->mem_pool_) == -1)
     ACE_THROW_RETURN (Load_Balancer::no_such_group (),
@@ -631,8 +631,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member
     }
 
   // Check whether the element already exists..
-  if (this->members_->find (ACE_const_cast (char *,
-                                            (const char *) member.id),
+  if (this->members_->find (const_cast<char *> ((const char *) member.id),
                             this->allocator_) == 0)
     ACE_THROW (Load_Balancer::duplicate_member ());
 
@@ -718,12 +717,12 @@ Object_Group_i::unbind (const char * id
         }
     }
   // Check to make sure we have it.
-  if (this->members_->find (ACE_const_cast (char *, id),
+  if (this->members_->find (const_cast<char *> (id),
                             this->allocator_) == -1)
     ACE_THROW (Load_Balancer::no_such_member ());
 
   // Remove all entries for this member.
-  this->members_->unbind (ACE_const_cast(char *, id),
+  this->members_->unbind (const_cast<char *> (id),
                           this->allocator_);
 
   if (this->member_id_list_ == 0)
@@ -760,8 +759,7 @@ Object_Group_i::resolve_with_id (const char * id
   CORBA::String_var ior;
 
 
-  if (this->members_->find (ACE_const_cast (char *,
-                                            id),
+  if (this->members_->find (const_cast<char *> (id),
                       ior.out (), this->allocator_) == -1)
     ACE_THROW_RETURN (Load_Balancer::no_such_member (),
                       0);
@@ -969,12 +967,12 @@ RR_Object_Group::unbind (const char *id
     }
 
   // Check to make sure we have it.
-  if (this->members_->find (ACE_const_cast (char *,id),
+  if (this->members_->find (const_cast<char *> (id),
                             this->allocator_) == -1)
     ACE_THROW (Load_Balancer::no_such_member ());
 
   // Remove all entries for this member.
-  this->members_->unbind (ACE_const_cast (char *, id),
+  this->members_->unbind (const_cast<char *> (id),
                           this->allocator_);
 
   // As we remove the id from the <member_id_list>, we note the
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 6881006c3f1..0c9b24e87fe 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -85,10 +85,9 @@ Logger_i::priority_conversion (Logger::Log_Priority priority)
     return LM_MAX;
   else
     {
-      int pval = ACE_static_cast (int, priority);
+      int pval = static_cast<int> (priority);
 
-      return ACE_static_cast (ACE_Log_Priority,
-                              1 << pval);
+      return static_cast<ACE_Log_Priority> (1 << pval);
       // (1 << pval) == 2^pval. <ACE_Log_Priority> are powers of 2.
     }
 }
@@ -169,9 +168,8 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
 
   // The constructor for <ACE_INET_Addr> requires a port number, which
   // is not relevant in this context, so we give it 0.
-  ACE_INET_Addr addy (ACE_static_cast (u_short, 0),
-                      ACE_static_cast (ACE_UINT32,
-                                       addr));
+  ACE_INET_Addr addy (static_cast<u_short> (0),
+                      static_cast<ACE_UINT32> (addr));
 
   // Create a buffer and fill it with the host name of the logger
   ACE_TCHAR namebuf[MAXHOSTNAMELEN + 1];
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp
index 36a50a7287a..0f1f549b9da 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/examples/Logging/Logging_Service_i.cpp
@@ -6,7 +6,7 @@
 ACE_RCSID(Logging_Service, Logging_Service_i, "$Id$")
 
 Logger_Server::Logger_Server (void)
-  :service_name_ (ACE_const_cast (char *,"LoggingService"))
+  :service_name_ (const_cast<char *> ("LoggingService"))
 {
   // Do nothing
 }
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index d04a9f713e7..f82bba200c4 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -346,8 +346,7 @@ Logger_Client::init_record (Logger::Log_Record &newrec,
   ACE_OS::hostname (name, MAXHOSTNAMELEN);
   hostent *he = ACE_OS::gethostbyname (name);
   newrec.host_addr =
-    (ACE_reinterpret_cast (in_addr *,
-                           he->h_addr_list[0])->s_addr);
+    (reinterpret_cast<in_addr *> (he->h_addr_list[0])->s_addr);
 }
 
 void
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index 9d977b2cb59..de35eb52028 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -40,8 +40,7 @@ Checkpoint_Client_i::run (const char *name,
       ACE_DEBUG ((LM_DEBUG, "Send some random events:\n"));
 
       CORBA::Float temperature = random_number (29, 34);
-      Temperature_var t_e (ACE_static_cast(Temperature*,
-                                           new Temperature_impl (temperature)));
+      Temperature_var t_e (static_cast<Temperature*> (new Temperature_impl (temperature)));
       t_e->origin_id_ (KITCHEN);
       t_e->do_print ();
       checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
@@ -57,8 +56,7 @@ Checkpoint_Client_i::run (const char *name,
       Point point = { random_number (0,4),
                       random_number (0,4),
                       random_number (0,4)  };
-      Position_var p_e (ACE_static_cast(Position*,
-                                        new Position_impl (point)));
+      Position_var p_e (static_cast<Position*> (new Position_impl (point)));
       p_e->origin_id_ (JONAS);
       p_e->do_print ();
       checkpoint->put_event (p_e ACE_ENV_ARG_PARAMETER);
@@ -68,8 +66,7 @@ Checkpoint_Client_i::run (const char *name,
       int urgent = (random_number (0,2) > 1) ? 1 : 0;
       const char *a_text = (random_number (0,2) > 1) ? "Coffee is cold."
                                                      : "I want pasta.";
-      Log_Msg_var l_e (ACE_static_cast(Log_Msg*,
-                                       new Log_Msg_impl (urgent, a_text)));
+      Log_Msg_var l_e (static_cast<Log_Msg*> (new Log_Msg_impl (urgent, a_text)));
       l_e->origin_id_ (JONAS);
       l_e->do_print ();
       checkpoint->put_event (l_e ACE_ENV_ARG_PARAMETER);
@@ -119,7 +116,7 @@ Checkpoint_Client_i::~Checkpoint_Client_i (void)
 CORBA::Float random_number (double min, double max)
 {
   double range = max - min;
-  return ACE_static_cast (CORBA::Float, (min + (range * ACE_OS::rand () / (RAND_MAX + 1.0))));
+  return static_cast<CORBA::Float> ((min + (range * ACE_OS::rand () / (RAND_MAX + 1.0))));
 }
 
 
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 709d8c3f295..f6c06328d45 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -392,8 +392,7 @@ Temperature_Criterion_impl::
 Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp)
 {
   this->origin_id_ (origin_id);
-  Temperature_var tmp (ACE_static_cast(Temperature*,
-                                       new Temperature_impl (temp)));
+  Temperature_var tmp (static_cast<Temperature*> (new Temperature_impl (temp)));
   this->meltingpoint (tmp.in ());
 }
 
@@ -567,7 +566,7 @@ Criterion_List_impl::store_criterion (Criterion *c
 {
   if (!my_list ())
     {
-      Event_List_var ev(ACE_static_cast(Event_List*,new Event_List_impl));
+      Event_List_var ev(static_cast<Event_List*> (new Event_List_impl));
       my_list (ev);
     }
 
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index ab79f8576e0..0c610fb3b12 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -43,32 +43,26 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
   // The conditions which will raise an alarm follow.
 
   // The first parameter is the origin_id and the second the temperature.
-  Temperature_Criterion_var tc (ACE_static_cast(Temperature_Criterion*,
-                                                new Temperature_Criterion_impl (KITCHEN, 32)));
+  Temperature_Criterion_var tc (static_cast<Temperature_Criterion*> (new Temperature_Criterion_impl (KITCHEN, 32)));
   criterions->store_criterion (tc.in ());
 
-  tc = ACE_static_cast(Temperature_Criterion*,
-                       new Temperature_Criterion_impl (BATHROOM, 27));
+  tc = static_cast<Temperature_Criterion*> (new Temperature_Criterion_impl (BATHROOM, 27));
   criterions->store_criterion (tc.in ());
 
 
   // Alarm if little Jonas is not in the child's room
 
   Point leftbottom = {1, 2, 3};
-  Position_var leftbottom_v (ACE_static_cast(Position*,
-                                             new Position_impl (leftbottom)));
+  Position_var leftbottom_v (static_cast<Position*> (new Position_impl (leftbottom)));
   Point topright = {2, 3, 4};
-  Position_var topright_v (ACE_static_cast(Position*,
-                                           new Position_impl (topright)));
-  Position_Criterion_var pc (ACE_static_cast(Position_Criterion*,
-                                             new Position_Criterion_impl (JONAS,
+  Position_var topright_v (static_cast<Position*> (new Position_impl (topright)));
+  Position_Criterion_var pc (static_cast<Position_Criterion*> (new Position_Criterion_impl (JONAS,
                                                                           leftbottom_v,
                                                                           topright_v)));
   criterions->store_criterion (pc.in ());
 
   // Generic criterion matches every urgent massage
-  Log_Msg_Criterion_var lc (ACE_static_cast(Log_Msg_Criterion*,
-                                            new Log_Msg_Criterion_impl));
+  Log_Msg_Criterion_var lc (static_cast<Log_Msg_Criterion*> (new Log_Msg_Criterion_impl));
   // Null id flags to handle every Log_Msg
   lc->origin_id_ (0);
   criterions->store_criterion (lc.in ());
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index 1574ad898c3..d26da17347e 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -243,8 +243,7 @@ DatabaseImpl::Agent::find_entry (const char *key,
   if (DATABASE::instance ()->find (key, temp) == 0)
     {
       Employee *employee =
-        ACE_reinterpret_cast (Employee *,
-                              temp);
+        reinterpret_cast<Employee *> (temp);
       ACE_DEBUG ((LM_DEBUG,
                   "Employee with key = %s found: name = %s and id = %d\n",
                   key,
@@ -296,8 +295,7 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
   if (DATABASE::instance ()->unbind (key, temp) == 0)
     {
       Employee *employee =
-        ACE_reinterpret_cast (Employee *,
-                              temp);
+        reinterpret_cast<Employee *> (temp);
       ACE_DEBUG ((LM_DEBUG,
                   "Employee with key = %s will be removed from the database: "
                   "name = %s and id = %d \n",
@@ -420,4 +418,6 @@ template class ACE_Singleton<DatabaseImpl::Simpler_Database_Malloc, ACE_Null_Mut
 #pragma instantiate ACE_Malloc_Iterator<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
 #pragma instantiate ACE_Malloc_LIFO_Iterator_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
 #pragma instantiate ACE_Singleton<DatabaseImpl::Simpler_Database_Malloc, ACE_Null_Mutex>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<DatabaseImpl::Simpler_Database_Malloc, ACE_Null_Mutex> *ACE_Singleton<DatabaseImpl::Simpler_Database_Malloc, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 407adc032a3..56254659fef 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -65,7 +65,7 @@ write_iors_to_file (const char *first_ior)
                             "%s",
                             first_ior);
   if (result < 0 ||
-      ACE_static_cast (size_t, result) != ACE_OS::strlen (first_ior))
+      static_cast<size_t> (result) != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
                        first_ior,
diff --git a/TAO/examples/POA/Explicit_Activation/alternate.conf.xml b/TAO/examples/POA/Explicit_Activation/alternate.conf.xml
index 91a6184d096..35d76be275b 100644
--- a/TAO/examples/POA/Explicit_Activation/alternate.conf.xml
+++ b/TAO/examples/POA/Explicit_Activation/alternate.conf.xml
@@ -3,6 +3,6 @@
 <ACE_Svc_Conf>
  <!--  Refer to Alternate_Resource_Factory/README for details -->
  <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="Alt_Resources/Alt_Resource_Factory" init="_make_My_Resource_Factory" params="-ORBresources global"/>
+   <initializer path="Alt_Resources/Alt_Resource_Factory" init="_make_My_Resource_Factory"/>
  </dynamic>
 </ACE_Svc_Conf>
diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp
index 16232812931..a47f480a36d 100644
--- a/TAO/examples/POA/Forwarding/client.cpp
+++ b/TAO/examples/POA/Forwarding/client.cpp
@@ -131,7 +131,7 @@ main (int argc, char **argv)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in client");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp
index d51d2b542ac..b4a4e26b918 100644
--- a/TAO/examples/POA/Forwarding/server.cpp
+++ b/TAO/examples/POA/Forwarding/server.cpp
@@ -178,12 +178,6 @@ int
 main (int argc,
       char **argv)
 {
-  int result =
-    parse_args (argc, argv);
-
-  if (result == -1)
-    return -1;
-
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -195,6 +189,12 @@ main (int argc,
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      int result =
+        parse_args (argc, argv);
+
+      if (result == -1)
+        return -1;
+
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
@@ -233,7 +233,7 @@ main (int argc,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in server");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp
index 1959aaac34e..901c06ce028 100644
--- a/TAO/examples/POA/Generic_Servant/client.cpp
+++ b/TAO/examples/POA/Generic_Servant/client.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, char **argv)
         break;
 
       case 'T':
-        timeout = ACE_static_cast (CORBA::ULong, ::atoi (get_opts.opt_arg ()));
+        timeout = static_cast<CORBA::ULong> (::atoi (get_opts.opt_arg ()));
         break;
 
       case 'x':
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index eef07a7ec2e..72bf969c798 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -47,17 +47,17 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
   void *symbol = this->dll_.symbol (factory_function);
-  long function = ACE_reinterpret_cast (long, symbol);
+  long function = reinterpret_cast<long> (symbol);
 
   servant_supplier_ =
-    ACE_reinterpret_cast (SERVANT_FACTORY, function);
+    reinterpret_cast<SERVANT_FACTORY> (function);
 
   // Obtain the symbol for the function which will destroy the
   // servant.
   symbol = this->dll_.symbol (garbage_collection_function);
-  function = ACE_reinterpret_cast (long, symbol);
+  function = reinterpret_cast<long> (symbol);
   servant_garbage_collector_ =
-    ACE_reinterpret_cast (SERVANT_GARBAGE_COLLECTOR, function);
+    reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function);
 }
 
 // This method associates an servant with the ObjectID.
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index 30abe0e702c..3850c8743ce 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -49,18 +49,18 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
   // to long first.
   //
   void *symbol = this->dll_.symbol (factory_function);
-  long function = ACE_reinterpret_cast (long, symbol);
+  long function = reinterpret_cast<long> (symbol);
 
   servant_supplier_ =
-    ACE_reinterpret_cast (SERVANT_FACTORY, function);
+    reinterpret_cast<SERVANT_FACTORY> (function);
 
   // Obtain the symbol for the function which will destroy the
   // servant.
   symbol = this->dll_.symbol (garbage_collection_function);
-  function = ACE_reinterpret_cast (long, symbol);
+  function = reinterpret_cast<long> (symbol);
 
   servant_garbage_collector_ =
-    ACE_reinterpret_cast (SERVANT_GARBAGE_COLLECTOR, function);
+    reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function);
 }
 
 // This method associates an servant with the ObjectID.
@@ -106,8 +106,7 @@ ServantLocator::postinvoke (const PortableServer::ObjectId &oid,
 {
   // Check the passed servant with the cookie.
   PortableServer::Servant my_servant =
-    ACE_reinterpret_cast (PortableServer::Servant,
-                          cookie);
+    reinterpret_cast<PortableServer::Servant> (cookie);
 
   ACE_ASSERT (servant == my_servant);
 
diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index 295234488f7..051ef1b2124 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -82,7 +82,7 @@ Server_i::write_iors_to_file (const char *first_ior,
                                 "%s",
                                 first_ior);
   if (result <= 0
-      || ACE_static_cast (size_t,result) != ACE_OS::strlen (first_ior))
+      || static_cast<size_t> (result) != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
                        first_ior,
@@ -93,7 +93,7 @@ Server_i::write_iors_to_file (const char *first_ior,
                             "%s",
                             second_ior);
   if (result <= 0
-      || ACE_static_cast (size_t,result) != ACE_OS::strlen (second_ior))
+      || static_cast<size_t> (result) != ACE_OS::strlen (second_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
                        second_ior,
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index 5f23837b0ca..c5aa44a172f 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -75,7 +75,7 @@ write_iors_to_file (const char *first_ior,
                                 "%s",
                                 first_ior);
   if (result <= 0
-      || ACE_static_cast(size_t,result) != ACE_OS::strlen (first_ior))
+      || static_cast<size_t> (result) != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
                        first_ior,
@@ -86,7 +86,7 @@ write_iors_to_file (const char *first_ior,
                             "%s",
                             second_ior);
   if (result <= 0
-      || ACE_static_cast(size_t,result) != ACE_OS::strlen (second_ior))
+      || static_cast<size_t> (result) != ACE_OS::strlen (second_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
                        second_ior,
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
index be4a1893bea..9e83dfa84b3 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -81,8 +81,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid,
   // Check the passed servant with the cookie.
 
   PortableServer::Servant my_servant =
-    ACE_reinterpret_cast (PortableServer::Servant,
-                          cookie);
+    reinterpret_cast<PortableServer::Servant> (cookie);
 
   ACE_ASSERT (servant == my_servant);
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
index cf52475b7fd..b62f8507cb8 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -81,10 +81,10 @@ ServantManager_i::obtain_servant (const char *str,
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
   void *symbol = dll->symbol (create_symbol_.c_str ());
-  long function = ACE_reinterpret_cast (long, symbol);
+  long function = reinterpret_cast<long> (symbol);
 
   SERVANT_FACTORY servant_creator =
-    ACE_reinterpret_cast (SERVANT_FACTORY, function);
+    reinterpret_cast<SERVANT_FACTORY> (function);
 
   // Checking whether it is possible to create the servant.
   if (servant_creator == 0)
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index c81c7b1bf1f..c1d6f600d34 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -86,7 +86,7 @@ Server_i::write_iors_to_file (const char *first_ior,
                                 "%s",
                                 first_ior);
   if (result <= 0
-      || ACE_static_cast (size_t,result) != ACE_OS::strlen (first_ior))
+      || static_cast<size_t> (result) != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
                        first_ior,
@@ -97,7 +97,7 @@ Server_i::write_iors_to_file (const char *first_ior,
                             "%s",
                             second_ior);
   if (result <= 0
-      || ACE_static_cast (size_t,result) != ACE_OS::strlen (second_ior))
+      || static_cast<size_t> (result) != ACE_OS::strlen (second_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
                        second_ior,
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
index f3e2299214d..933fcc1ccc4 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
@@ -23,8 +23,11 @@
 #include "tao/Any.h"
 #include "tao/ORB.h"
 
-ACE_RCSID (POA_BiDir, 
-           POA_BiDir, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (POA_BiDir,
+           POA_BiDir,
            "$Id$")
 
 void
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index 404b70192fb..fcec899cc6e 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -28,8 +28,7 @@ Grid_i::Grid_i (CORBA::Short x,
     {
       // Allocate memory for the matrix.
        ACE_ALLOCATOR (array_,
-                      ACE_static_cast (CORBA::Long **,
-                                       mem_pool->malloc (y * sizeof (CORBA::Long *))));
+                      static_cast<CORBA::Long **> (mem_pool->malloc (y * sizeof (CORBA::Long *))));
       //array_ = (CORBA::Long **) mem_pool->malloc (y * sizeof (CORBA::Long *));
 
       if (array_ != 0)
@@ -37,8 +36,7 @@ Grid_i::Grid_i (CORBA::Short x,
           for (int ctr = 0; ctr < y; ctr++)
             {
               ACE_ALLOCATOR (array_[ctr],
-                             ACE_static_cast (CORBA::Long *,
-                                              mem_pool->malloc (x *
+                             static_cast<CORBA::Long *> (mem_pool->malloc (x *
                                                                 sizeof (CORBA::Long ))));
 
               //array_[ctr] = (CORBA::Long *)mem_pool->malloc (x *
diff --git a/TAO/examples/PluggableUDP/DIOP/README b/TAO/examples/PluggableUDP/DIOP/README
index 553d33d91c8..8a352e5d4a3 100644
--- a/TAO/examples/PluggableUDP/DIOP/README
+++ b/TAO/examples/PluggableUDP/DIOP/README
@@ -37,7 +37,7 @@ $TAO_ROOT/tao/Strategies/ directory):
 
 - Uncomment the following line in TAO/tao/corbafwd.h:
 
-  #define TAO_TAG_UDP_PROFILE    0x54414f04U /* UDP */
+  #define TAO_TAG_DIOP_PROFILE    0x54414f04U /* UDP */
 
 - The application using DIOP should have a svc.conf file with the
   following entry:
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
index c5f2e57cda8..882b5078c5d 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
@@ -35,7 +35,7 @@ UDP_Client_i::svc (void)
   ACE_TCHAR pid[256];
   ACE_OS::sprintf (pid,
                    "%u",
-                   ACE_static_cast (u_int, ACE_OS::getpid ()));
+                   static_cast<u_int> (ACE_OS::getpid ()));
   client_name += "_";
   client_name += pid;
 
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
index dc60b8aeebd..77db4ccca0e 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
@@ -38,7 +38,7 @@ UDP_PerformanceClient::svc ()
   ACE_TCHAR pid[256];
   ACE_OS::sprintf (pid,
                    "%u",
-                   ACE_static_cast (u_int, ACE_OS::getpid ()));
+                   static_cast<u_int> (ACE_OS::getpid ()));
   client_name += "_";
   client_name += pid;
 
diff --git a/TAO/examples/Quoter/Quoter.idl b/TAO/examples/Quoter/Quoter.idl
index c5cbbe44367..c6b5de6bc98 100644
--- a/TAO/examples/Quoter/Quoter.idl
+++ b/TAO/examples/Quoter/Quoter.idl
@@ -27,11 +27,10 @@ module Stock
       // = TITLE
       //   Access Stock information.
 
+      // Returns the current stock value or throws an exception.
       long get_quote (in string stock_name) 
         raises (Invalid_Stock, Invalid_Quoter);
 
-      // Returns the current stock value or throws and exception.
-
       // LifeCycleObject copy(in FactoryFinder there, 
       // 	   in Criteria the_criteria)
       //     raises(NoFactory, NotCopyable, InvalidCriteria, CannotMeetCriteria);
@@ -59,7 +58,6 @@ module Stock
       // "Reuters,", etc
     };
 
-
   interface Quoter_Factory_Finder : CosLifeCycle::FactoryFinder
     {
       // = TITLE 
diff --git a/TAO/examples/Quoter/client.conf b/TAO/examples/Quoter/client.conf
index 3c0cc0cc469..7adf91ec452 100644
--- a/TAO/examples/Quoter/client.conf
+++ b/TAO/examples/Quoter/client.conf
@@ -1,5 +1,4 @@
 # $Id$
 #
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources tss"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
 dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Quoter/client.conf.xml b/TAO/examples/Quoter/client.conf.xml
index 5eada5ba176..3fb0800e130 100644
--- a/TAO/examples/Quoter/client.conf.xml
+++ b/TAO/examples/Quoter/client.conf.xml
@@ -4,7 +4,7 @@
  <!--  $Id$ -->
  <!--  -->
  <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="TAO" init="_make_TAO_Default_Resource_Factory" params="-ORBresources tss"/>
+   <initializer path="TAO" init="_make_TAO_Default_Resource_Factory"/>
  </dynamic>
  <dynamic id="Client_Strategy_Factory" type="Service_Object">
    <initializer path="TAO" init="_make_TAO_Default_Client_Strategy_Factory"/>
diff --git a/TAO/examples/Quoter/server.conf b/TAO/examples/Quoter/server.conf
index a785e63f513..7adf91ec452 100644
--- a/TAO/examples/Quoter/server.conf
+++ b/TAO/examples/Quoter/server.conf
@@ -1,5 +1,4 @@
 # $Id$
 #
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources global"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
 dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Quoter/server.conf.xml b/TAO/examples/Quoter/server.conf.xml
index afb0b535916..14134f9150c 100644
--- a/TAO/examples/Quoter/server.conf.xml
+++ b/TAO/examples/Quoter/server.conf.xml
@@ -4,7 +4,7 @@
  <!--  $Id$ -->
  <!--  -->
  <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="TAO" init="_make_TAO_Default_Resource_Factory" params="-ORBresources global"/>
+   <initializer path="TAO" init="_make_TAO_Default_Resource_Factory"/>
  </dynamic>
  <dynamic id="Client_Strategy_Factory" type="Service_Object">
    <initializer path="TAO" init="_make_TAO_Default_Client_Strategy_Factory"/>
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 1046525d3e6..d163c8686f6 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -1,5 +1,12 @@
 //$Id$
 #include "Activity.h"
+#include "Thread_Task.h"
+#include "Job_i.h"
+#include "POA_Holder.h"
+#include "Builder.h"
+
+#include "tao/ORB_Core.h"
+#include "tao/debug.h"
 
 #include "ace/High_Res_Timer.h"
 #include "ace/Barrier.h"
@@ -8,14 +15,9 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
 #include "ace/Signal.h"
+#include "ace/Reactor.h"
 
-#include "Thread_Task.h"
-#include "Job_i.h"
-#include "POA_Holder.h"
-#include "Builder.h"
 
 //***************************************************************//
 extern "C" void handler (int)
@@ -462,4 +464,8 @@ template class ACE_Singleton<Activity, ACE_Null_Mutex>;
 
 #pragma instantiate ACE_Singleton<Activity, ACE_Null_Mutex>
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template ACE_Singleton<Activity, ACE_Null_Mutex> *ACE_Singleton<Activity, ACE_Null_Mutex>::singleton_;
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
index 1b2a4baffcf..864cd5b8465 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
@@ -111,8 +111,7 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf)
   ACE_UINT64 avg = this->sum_ / this->samples_count_;
   ACE_UINT64 dev =
 #if defined ACE_LACKS_LONGLONG_T
-    ACE_static_cast (ACE_U_LongLong,
-                     this->sum2_ / this->samples_count_)
+    static_cast<ACE_U_LongLong> (this->sum2_ / this->samples_count_)
     - avg * ACE_U64_TO_U32(avg);
 #else  /* ! ACE_LACKS_LONGLONG_T */
     this->sum2_ / this->samples_count_ - avg * avg;
@@ -188,4 +187,8 @@ template class ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX>;
 
 #pragma instantiate ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX>
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template ACE_Singleton<Base_Time, ACE_Thread_Mutex> *ACE_Singleton<Base_Time, ACE_Thread_Mutex>::singleton_;
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/RTScheduling/FP_SchedulingC.cpp b/TAO/examples/RTScheduling/FP_SchedulingC.cpp
index 81167d4d619..7b9f98d7a82 100644
--- a/TAO/examples/RTScheduling/FP_SchedulingC.cpp
+++ b/TAO/examples/RTScheduling/FP_SchedulingC.cpp
@@ -102,7 +102,7 @@ void
 FP_Scheduling::SegmentSchedulingParameterPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   SegmentSchedulingParameterPolicy *_tao_tmp_pointer =
-    ACE_static_cast (SegmentSchedulingParameterPolicy *, _tao_void_pointer);
+    static_cast<SegmentSchedulingParameterPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -277,7 +277,7 @@ void
 FP_Scheduling::FP_Scheduler::_tao_any_destructor (void *_tao_void_pointer)
 {
   FP_Scheduler *_tao_tmp_pointer =
-    ACE_static_cast (FP_Scheduler *, _tao_void_pointer);
+    static_cast<FP_Scheduler *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
index 6552d80f4df..a42c951386e 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
@@ -114,8 +114,7 @@ FP_Task::perform_task (void)
   for (int j = 0; j < this->iter_; j++)
     {
       ACE_Time_Value run_time = ACE_OS::gettimeofday () - *base_time_;
-      TASK_STATS::instance ()->sample (ACE_UINT64 (run_time.sec ()),
-       				       count_);
+      TASK_STATS::instance ()->sample (run_time.sec (), count_);
 
       ACE_Time_Value count_down_time (1);
       ACE_Countdown_Time count_down (&count_down_time);
@@ -143,8 +142,7 @@ FP_Task::perform_task (void)
       for (int j = 0; j < this->iter_; j++)
 	{
 	  ACE_Time_Value run_time = ACE_OS::gettimeofday () - *base_time_;
-	  TASK_STATS::instance ()->sample (ACE_UINT64 (run_time.sec ()),
-					   count_);
+	  TASK_STATS::instance ()->sample (run_time.sec (), count_);
 
 	  ACE_Time_Value count_down_time (1);
 	  ACE_Countdown_Time count_down (&count_down_time);
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
index 18da5f9a4c2..0c60f3ddd73 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
@@ -291,4 +291,8 @@ template class ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX>;
 
 #pragma instantiate ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX>
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template ACE_Singleton<DT_Test, ACE_Thread_Mutex> *ACE_Singleton<DT_Test, ACE_Thread_Mutex>::singleton_;
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index 768c0ddcdc1..90aa0376198 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -82,23 +82,21 @@ Job_i::work (CORBA::ULong work,
       //    ACE_hrtime_t now = ACE_OS::gethrtime ();
 
       ACE_Time_Value run_time = ACE_OS::gettimeofday () - *(dt_creator_->base_time ());
-      TASK_STATS::instance ()->sample (ACE_UINT64 (run_time.sec ()),
-       				       guid_);
+      TASK_STATS::instance ()->sample (run_time.sec (), guid_);
 
       ACE_Time_Value count_down_time (1);
       ACE_Countdown_Time count_down (&count_down_time);
 
       while (count_down_time > ACE_Time_Value::zero)
-	{
-	  ACE::is_prime (prime_number,
-			 2,
-			 prime_number / 2);
-	  count_down.update ();
-	}
+	      {
+	        ACE::is_prime (prime_number,
+			      2,
+			      prime_number / 2);
+	        count_down.update ();
+	      }
 
       run_time = ACE_OS::gettimeofday () - *(dt_creator_->base_time ());
-      TASK_STATS::instance ()->sample (ACE_UINT64 (run_time.sec ()),
-       				       guid_);
+      TASK_STATS::instance ()->sample (run_time.sec (), guid_);
 
       CORBA::Policy_var sched_param;
       sched_param = CORBA::Policy::_duplicate (dt_creator_->sched_param (importance));
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index 41e1a2bea06..16d15ab8021 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -220,7 +220,7 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/
       DT* run_dt;
       ACE_Message_Block* msg;
       ready_que_.dequeue_head (msg);
-      run_dt = ACE_dynamic_cast (DT*, msg);
+      run_dt = dynamic_cast<DT*> (msg);
       if ((desired_priority == 100) || run_dt->msg_priority () >= (unsigned int)desired_priority)
 	{
 	  ready_que_.enqueue_prio (new_dt);
@@ -258,7 +258,7 @@ MIF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid
       DT* run_dt;
       ACE_Message_Block* msg;
       ready_que_.dequeue_head (msg);
-      run_dt = ACE_dynamic_cast (DT*, msg);
+      run_dt = dynamic_cast<DT*> (msg);
       lock_.acquire ();
       run_dt->resume ();
       lock_.release ();
@@ -353,7 +353,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
       DT* run_dt;
       ACE_Message_Block* msg;
       ready_que_.dequeue_head (msg);
-      run_dt = ACE_dynamic_cast (DT*, msg);
+      run_dt = dynamic_cast<DT*> (msg);
       run_dt->resume ();
     }
   lock_.release ();
@@ -459,7 +459,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
       DT* run_dt;
       ACE_Message_Block* msg;
       ready_que_.dequeue_head (msg);
-      run_dt = ACE_dynamic_cast (DT*, msg);
+      run_dt = dynamic_cast<DT*> (msg);
       lock_.acquire ();
       run_dt->resume ();
       lock_.release ();
@@ -477,7 +477,7 @@ MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr
       DT* run_dt;
       ACE_Message_Block* msg;
       ready_que_.dequeue_head (msg);
-      run_dt = ACE_dynamic_cast (DT*, msg);
+      run_dt = dynamic_cast<DT*> (msg);
       lock_.acquire ();
       run_dt->resume ();
       lock_.release ();
@@ -511,7 +511,7 @@ MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
       DT* run_dt;
       ACE_Message_Block* msg;
       ready_que_.dequeue_head (msg);
-      run_dt = ACE_dynamic_cast (DT*, msg);
+      run_dt = dynamic_cast<DT*> (msg);
       lock_.acquire ();
       run_dt->resume ();
       lock_.release ();
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
index e08bb93e2a6..265b607b56b 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
@@ -100,8 +100,7 @@ MIF_Task::perform_task (void)
       for (int i = 0; i < this->iter_; i++)
         {
           ACE_Time_Value run_time = ACE_OS::gettimeofday () - *base_time_;
-          TASK_STATS::instance ()->sample (ACE_UINT64 (run_time.sec ()),
-                                           count_);
+          TASK_STATS::instance ()->sample (run_time.sec (), count_);
 
           ACE_Time_Value count_down_time (1);
           ACE_Countdown_Time count_down (&count_down_time);
@@ -130,8 +129,7 @@ MIF_Task::perform_task (void)
           for (int j = 0; j < this->iter_; j++)
             {
               ACE_Time_Value run_time = ACE_OS::gettimeofday () - *base_time_;
-              TASK_STATS::instance ()->sample (ACE_UINT64 (run_time.sec ()),
-                                               count_);
+              TASK_STATS::instance ()->sample (run_time.sec (), count_);
 
               ACE_Time_Value count_down_time (1);
               ACE_Countdown_Time count_down (&count_down_time);
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index c8ca9947be4..a3ea1235e52 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -188,4 +188,8 @@ template class ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX>;
 
 #pragma instantiate ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX>
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template ACE_Singleton<DT_Test, ACE_Thread_Mutex> *ACE_Singleton<DT_Test, ACE_Thread_Mutex>::singleton_;
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.cpp b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp
index 2e9d20ec627..cd7973138fe 100644
--- a/TAO/examples/RTScheduling/MIF_SchedulingC.cpp
+++ b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp
@@ -102,7 +102,7 @@ void
 MIF_Scheduling::SegmentSchedulingParameterPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   SegmentSchedulingParameterPolicy *_tao_tmp_pointer =
-    ACE_static_cast (SegmentSchedulingParameterPolicy *, _tao_void_pointer);
+    static_cast<SegmentSchedulingParameterPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -277,7 +277,7 @@ void
 MIF_Scheduling::MIF_Scheduler::_tao_any_destructor (void *_tao_void_pointer)
 {
   MIF_Scheduler *_tao_tmp_pointer =
-    ACE_static_cast (MIF_Scheduler *, _tao_void_pointer);
+    static_cast<MIF_Scheduler *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp
index 225ba2fe893..005cf866bc9 100644
--- a/TAO/examples/RTScheduling/Task_Stats.cpp
+++ b/TAO/examples/RTScheduling/Task_Stats.cpp
@@ -109,4 +109,8 @@ template class ACE_Singleton<Task_Stats, TAO_SYNCH_MUTEX>;
 #pragma instantiate ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX>
 #pragma instantiate ACE_Singleton<Task_Stats, TAO_SYNCH_MUTEX>
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template ACE_Singleton<Task_Stats, ACE_Thread_Mutex> *ACE_Singleton<Task_Stats, ACE_Thread_Mutex>::singleton_;
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index e4aea7df2bc..ebbedd84389 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -414,7 +414,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
           // No IOR specified. Use the Naming Service
           ACE_DEBUG((LM_DEBUG,
                      "Using the Naming Service \n"));
-          this->name_ = ACE_const_cast (char *, name);
+          this->name_ = const_cast<char *> (name);
           int retv = this->obtain_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (retv ==-1)
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index b27072dac0c..1c00ff70576 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -23,7 +23,7 @@ Grid_Client_i::Grid_Client_i (void)
 //Destructor.
 Grid_Client_i::~Grid_Client_i (void)
 {
-  cout << "Called " << endl;
+  ACE_DEBUG ((LM_DEBUG, "Called \n"));
   //no-op
 }
 
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index c95126fde6e..a701a65f1c6 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -13,6 +13,7 @@
 #include "Time_Date.h"
 #include "tao/TAO_Singleton_Manager.h"
 #include "tao/debug.h"
+#include "ace/Reactor.h"
 #include "ace/Get_Opt.h"
 #include "ace/Dynamic_Service.h"
 
diff --git a/TAO/examples/Simple/time-date/run_test.pl b/TAO/examples/Simple/time-date/run_test.pl
index 878cb5a5623..ec0290a14bd 100755
--- a/TAO/examples/Simple/time-date/run_test.pl
+++ b/TAO/examples/Simple/time-date/run_test.pl
@@ -15,6 +15,23 @@ $conf = PerlACE::LocalFile ("client" . "$PerlACE::svcconf_ext");
 # Remove the file before starting the test.
 unlink $iorfile;
 
+sub add_path {
+  my($name)  = shift;
+  my($value) = shift;
+  if (defined $ENV{$name}) {
+    $ENV{$name} .= ':' . $value
+  }
+  else {
+    $ENV{$name} = $value;
+  }
+}
+
+# Set the library path for the client to be able to load
+# the Time_Date library.
+add_path('LD_LIBRARY_PATH', '.');
+add_path('LIBPATH', '.');
+add_path('SHLIB_PATH', '.');
+
 $SV = new PerlACE::Process ("server");
 $CL = new PerlACE::Process ("client", "-f $iorfile -ORBSvcConf $conf");
 
@@ -33,7 +50,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$SV->Kill (); 
+$SV->Kill ();
 
 unlink $iorfile;
 
diff --git a/TAO/examples/Simple/time-date/server.cpp b/TAO/examples/Simple/time-date/server.cpp
index 477584c380c..f9ddbadc4bb 100644
--- a/TAO/examples/Simple/time-date/server.cpp
+++ b/TAO/examples/Simple/time-date/server.cpp
@@ -19,9 +19,12 @@
 // ============================================================================
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(Misc, main, "$Id$")
+ACE_RCSID (time_date,
+           server,
+           "$Id$")
 
 int
 main (int argc, char *argv[])
diff --git a/TAO/examples/Simple/time-date/svc.conf b/TAO/examples/Simple/time-date/svc.conf
index 5910a17107d..feed2720801 100644
--- a/TAO/examples/Simple/time-date/svc.conf
+++ b/TAO/examples/Simple/time-date/svc.conf
@@ -1,11 +1,11 @@
 # $Id$
 # Define a special Reactor for single-threaded configurations.  Refer
 # to README for details.  
-dynamic Resource_Factory Service_Object * ./Time_Date:_make_My_Resource_Factory()
+dynamic Resource_Factory Service_Object * Time_Date:_make_My_Resource_Factory()
 
 # Dynamically configure the ORB into the application process.
-dynamic ORB Service_Object * ./Time_Date:_make_DLL_ORB() "dummy"
+dynamic ORB Service_Object * Time_Date:_make_DLL_ORB() "dummy"
 
 # Once the ORB is configured, dynamically configure the Time_Date service.
-dynamic Time_Date_Servant Service_Object * ./Time_Date:_make_Time_Date_Servant() "dummy -n ORB -o ior"
+dynamic Time_Date_Servant Service_Object * Time_Date:_make_Time_Date_Servant() "dummy -n ORB -o ior"
 
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index 4eb31acd0d3..48d0425974b 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -50,7 +50,7 @@ Time_Client_i::run (const char *name,
       // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly
       // under 64-bit solaris.
       ACE_TCHAR ascii_timedate[64] = "";
-      ACE_OS::ctime_r (ACE_reinterpret_cast (const time_t *, &timedate),
+      ACE_OS::ctime_r (reinterpret_cast<const time_t *> (&timedate),
                        ascii_timedate, 64);
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index dbe6c2a9ebf..2f16dd37bb5 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -421,18 +421,15 @@ DOVE_Supplier::connect_Supplier ()
 
     this->current_connection_params_->scheduler_var_->
       set (this->current_connection_params_->rt_info_,
-           ACE_static_cast (RtecScheduler::Criticality_t,
-                            this->current_connection_params_->pod_rt_info_.criticality),
+           static_cast<RtecScheduler::Criticality_t> (this->current_connection_params_->pod_rt_info_.criticality),
            this->current_connection_params_->pod_rt_info_.worst_case_execution_time,
            this->current_connection_params_->pod_rt_info_.typical_execution_time,
            this->current_connection_params_->pod_rt_info_.cached_execution_time,
            this->current_connection_params_->pod_rt_info_.period,
-           ACE_static_cast (RtecScheduler::Importance_t,
-                            this->current_connection_params_->pod_rt_info_.importance),
+           static_cast<RtecScheduler::Importance_t> (this->current_connection_params_->pod_rt_info_.importance),
            this->current_connection_params_->pod_rt_info_.quantum,
            this->current_connection_params_->pod_rt_info_.threads,
-           ACE_static_cast (RtecScheduler::Info_Type_t,
-                            this->current_connection_params_->pod_rt_info_.info_type)
+           static_cast<RtecScheduler::Info_Type_t> (this->current_connection_params_->pod_rt_info_.info_type)
            ACE_ENV_ARG_PARAMETER);
 
     ACE_TRY_CHECK;
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index d3f8aae7059..e95c8c82581 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -321,7 +321,7 @@ ACE_THR_FUNC_RETURN
 DualEC_Supplier::run_nav_thread (void *arg)
 {
   DualEC_Supplier * sup =
-    ACE_static_cast (DualEC_Supplier *, arg);
+    static_cast<DualEC_Supplier *> (arg);
 
   ACE_TRY_NEW_ENV
     {
@@ -403,7 +403,7 @@ ACE_THR_FUNC_RETURN
 DualEC_Supplier::run_weap_thread (void *arg)
 {
   DualEC_Supplier * sup =
-    ACE_static_cast (DualEC_Supplier *, arg);
+    static_cast<DualEC_Supplier *> (arg);
 
   ACE_TRY_NEW_ENV
     {
@@ -528,18 +528,15 @@ DualEC_Supplier::create_schedulers (void)
 
           this->sched_hi_->
             set (this->sched_hi_rt_info_hi_,
-                 ACE_static_cast (RtecScheduler::Criticality_t,
-                                  this->rt_info_dummy_hi_.criticality),
+                 static_cast<RtecScheduler::Criticality_t> (this->rt_info_dummy_hi_.criticality),
                  this->rt_info_dummy_hi_.worst_case_execution_time,
                  this->rt_info_dummy_hi_.typical_execution_time,
                  this->rt_info_dummy_hi_.cached_execution_time,
                  this->rt_info_dummy_hi_.period,
-                 ACE_static_cast (RtecScheduler::Importance_t,
-                                  this->rt_info_dummy_hi_.importance),
+                 static_cast<RtecScheduler::Importance_t> (this->rt_info_dummy_hi_.importance),
                  this->rt_info_dummy_hi_.quantum,
                  this->rt_info_dummy_hi_.threads,
-                 ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  this->rt_info_dummy_hi_.info_type)
+                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_hi_.info_type)
                  ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
@@ -553,18 +550,15 @@ DualEC_Supplier::create_schedulers (void)
 
           this->sched_hi_->
             set (this->sched_hi_rt_info_lo_,
-                 ACE_static_cast (RtecScheduler::Criticality_t,
-                                  this->rt_info_dummy_lo_.criticality),
+                 static_cast<RtecScheduler::Criticality_t> (this->rt_info_dummy_lo_.criticality),
                  this->rt_info_dummy_lo_.worst_case_execution_time,
                  this->rt_info_dummy_lo_.typical_execution_time,
                  this->rt_info_dummy_lo_.cached_execution_time,
                  this->rt_info_dummy_lo_.period,
-                 ACE_static_cast (RtecScheduler::Importance_t,
-                                  this->rt_info_dummy_lo_.importance),
+                 static_cast<RtecScheduler::Importance_t> (this->rt_info_dummy_lo_.importance),
                  this->rt_info_dummy_lo_.quantum,
                  this->rt_info_dummy_lo_.threads,
-                 ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  this->rt_info_dummy_lo_.info_type)
+                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_lo_.info_type)
                  ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
@@ -578,18 +572,15 @@ DualEC_Supplier::create_schedulers (void)
 
           this->sched_lo_->
             set (this->sched_hi_rt_info_hi_,
-                 ACE_static_cast (RtecScheduler::Criticality_t,
-                                  this->rt_info_dummy_hi_.criticality),
+                 static_cast<RtecScheduler::Criticality_t> (this->rt_info_dummy_hi_.criticality),
                  this->rt_info_dummy_hi_.worst_case_execution_time,
                  this->rt_info_dummy_hi_.typical_execution_time,
                  this->rt_info_dummy_hi_.cached_execution_time,
                  this->rt_info_dummy_hi_.period,
-                 ACE_static_cast (RtecScheduler::Importance_t,
-                                  this->rt_info_dummy_hi_.importance),
+                 static_cast<RtecScheduler::Importance_t> (this->rt_info_dummy_hi_.importance),
                  this->rt_info_dummy_hi_.quantum,
                  this->rt_info_dummy_hi_.threads,
-                 ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  this->rt_info_dummy_hi_.info_type)
+                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_hi_.info_type)
                  ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
@@ -603,18 +594,15 @@ DualEC_Supplier::create_schedulers (void)
 
           this->sched_lo_->
             set (this->sched_hi_rt_info_lo_,
-                 ACE_static_cast (RtecScheduler::Criticality_t,
-                                  this->rt_info_dummy_lo_.criticality),
+                 static_cast<RtecScheduler::Criticality_t> (this->rt_info_dummy_lo_.criticality),
                  this->rt_info_dummy_lo_.worst_case_execution_time,
                  this->rt_info_dummy_lo_.typical_execution_time,
                  this->rt_info_dummy_lo_.cached_execution_time,
                  this->rt_info_dummy_lo_.period,
-                 ACE_static_cast (RtecScheduler::Importance_t,
-                                  this->rt_info_dummy_lo_.importance),
+                 static_cast<RtecScheduler::Importance_t> (this->rt_info_dummy_lo_.importance),
                  this->rt_info_dummy_lo_.quantum,
                  this->rt_info_dummy_lo_.threads,
-                 ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  this->rt_info_dummy_lo_.info_type)
+                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_lo_.info_type)
                  ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
@@ -1061,7 +1049,7 @@ DualEC_Supplier::get_options (int argc, char *argv [])
           if (temp >= 0)
             {
               this->nav_pause_ =
-                ACE_Time_Value(0, ACE_static_cast (long, temp));
+                ACE_Time_Value(0, static_cast<long> (temp));
               ACE_DEBUG ((LM_DEBUG,
                           "Navigation pause: %d usec\n",
                           temp));
@@ -1079,7 +1067,7 @@ DualEC_Supplier::get_options (int argc, char *argv [])
           if (temp >= 0)
             {
               this->weap_pause_ =
-                ACE_Time_Value(0, ACE_static_cast (long, temp));
+                ACE_Time_Value(0, static_cast<long> (temp));
               ACE_DEBUG ((LM_DEBUG,
                           "Weapons pause: %d usec\n",
                           temp));
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index 920754dd3fa..b0718b89605 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -162,7 +162,8 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events
       return;
     }
 
-  cout << "Number of events: " << received++ << endl;
+  ACE_DEBUG ((LM_DEBUG, "Number of events: %d\n", received));
+  ++received;
 
   for (CORBA::ULong i = 0; i < events.length (); ++i)
     {
@@ -182,27 +183,27 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events
               int kind = events[i].data.any_value.type()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              cout << "ID: " << events[i].data.any_value.type()->id(ACE_ENV_SINGLE_ARG_PARAMETER) << endl;
+              ACE_DEBUG ((LM_DEBUG, "ID: %s\n", events[i].data.any_value.type()->id(ACE_ENV_SINGLE_ARG_PARAMETER)));
               ACE_TRY_CHECK;
-              cout << "Name: " << events[i].data.any_value.type()->name(ACE_ENV_SINGLE_ARG_PARAMETER) << endl;
+              ACE_DEBUG ((LM_DEBUG, "Name: %s\n", events[i].data.any_value.type()->name(ACE_ENV_SINGLE_ARG_PARAMETER)));
               ACE_TRY_CHECK;
-              cout << "member_count: " << events[i].data.any_value.type()->member_count(ACE_ENV_SINGLE_ARG_PARAMETER) << endl;
+              ACE_DEBUG ((LM_DEBUG, "member_count: %u\n", events[i].data.any_value.type()->member_count(ACE_ENV_SINGLE_ARG_PARAMETER)));
               ACE_TRY_CHECK;
-              cout << "TCKind: " << kind << endl;
+              ACE_DEBUG ((LM_DEBUG, "TCKind: %d\n", kind));
 
               int ret = _tc_Navigation->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               if (ret)
                 {
                   Navigation *navigation_ = (Navigation*) events[i].data.any_value.value ();
-                  cout << "Found a Navigation struct in the any: pos_lat = " << navigation_->position_latitude << endl;
+                  ACE_DEBUG ((LM_DEBUG, "Found a Navigation struct in the any: pos_lat = %d\n", navigation_->position_latitude));
                 }
               else {
                 ret = (_tc_Weapons->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER));
                 ACE_TRY_CHECK;
                 if (ret) {
                   Weapons *weapons_ = (Weapons*) events[i].data.any_value.value ();
-                  cout << "Found a Navigation struct in the any: pos_lat = " << weapons_->number_of_weapons << endl;
+                  ACE_DEBUG ((LM_DEBUG, "Found a Weapons struct in the any: nr_of_weapons = %u\n", weapons_->number_of_weapons));
                 }
               }
             }
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index 3abf03fa02d..bc4b918404d 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -11,7 +11,8 @@ main (int argc, char *argv[])
     {
       const char *orb_name = "";
 
-      cout << "Initializing the ORB!" << endl;
+	  ACE_DEBUG ((LM_DEBUG,
+                  "Initializing the ORB!\n"));
       CORBA::ORB_var the_orb = CORBA::ORB_init (argc,
                                                 argv,
                                                 orb_name
@@ -31,7 +32,8 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Retrieving the servants IOR from a file
-      cout << "Reading the IOR!" << endl;
+	  ACE_DEBUG ((LM_DEBUG,
+                  "Reading the IOR!\n"));
 
       const char *filename =
         "file://ior.txt";
@@ -40,15 +42,18 @@ main (int argc, char *argv[])
         the_orb->string_to_object (filename ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      cout << "Narrowing the IOR!" << endl;
+	  ACE_DEBUG ((LM_DEBUG,
+                  "Narrowing the IOR!\n"));
 
       W32_Test_Interface_var mycall =
         W32_Test_Interface::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      cout << "Sending the Request!" << endl;
+	  ACE_DEBUG ((LM_DEBUG,
+                  "Sending the Request!\n"));
       char *response = mycall->getresponse (1);
-      cout << "The answer ..." << response << endl;
+	  ACE_DEBUG ((LM_DEBUG,
+                  "The answer ...%s\n", response));
 
       // Free up the string.
       CORBA::string_free (response);
diff --git a/TAO/interop-tests/wchar/Client.java b/TAO/interop-tests/wchar/Client.java
index 9caf55e5b92..73bb469660e 100644
--- a/TAO/interop-tests/wchar/Client.java
+++ b/TAO/interop-tests/wchar/Client.java
@@ -18,32 +18,58 @@ public class Client
     private WCharReference ref;
     private org.omg.CORBA.ORB orb;
 
-    final private static int WCHAR_TO_SERVER = 0x0001;
-    final private static int WSTRING_TO_SERVER = 0x0002;
-    final private static int WARRAY_TO_SERVER = 0x0004;
-    final private static int ANY_WCHAR_TO_SERVER = 0x0008;
-    final private static int WSTRING_EXCEPTION = 0x0010;
-    final private static int WCHAR_FROM_SERVER = 0x0020;
-    final private static int WSTRING_FROM_SERVER = 0x0040;
-    final private static int WARRAY_FROM_SERVER = 0x0080;
-    final private static int ANY_WCHAR_FROM_SERVER = 0x0100;
-    final private static int ANY_WSTRING_TO_SERVER = 0x0200;
-    final private static int ANY_WSTRING_FROM_SERVER = 0x0400;
-    final private static int ANY_WSTRING_ECHO = 0x0800;
-    final private static int WSTRUCTSEQ_FROM_SERVER = 0x1000;
-    final private static int WSTRUCTSEQ_TO_SERVER = 0x2000;
-    final private static int TBD_1 = 0x4000; // update ALL_TESTS if this is defined
-    final private static int TBD_0 = 0x8000; // update ALL_TESTS if this is defined
-    final private static int ALL_TESTS = 0x3FFF;
+    final private static int WCHAR_TO_SERVER         = 0x00000001;
+    final private static int WSTRING_TO_SERVER       = 0x00000002;
+    final private static int WARRAY_TO_SERVER        = 0x00000004;
+    final private static int ANY_WCHAR_TO_SERVER     = 0x00000008;
+    final private static int WSTRING_EXCEPTION       = 0x00000010;
+    final private static int WCHAR_FROM_SERVER       = 0x00000020;
+    final private static int WSTRING_FROM_SERVER     = 0x00000040;
+    final private static int WARRAY_FROM_SERVER      = 0x00000080;
+    final private static int ANY_WCHAR_FROM_SERVER   = 0x00000100;
+    final private static int ANY_WSTRING_TO_SERVER   = 0x00000200;
+    final private static int ANY_WSTRING_FROM_SERVER = 0x00000400;
+    final private static int ANY_WSTRING_ECHO        = 0x00000800;
+    final private static int WSTRUCTSEQ_FROM_SERVER  = 0x00001000;
+    final private static int WSTRUCTSEQ_TO_SERVER    = 0x00002000;
+    final private static int NUL_WSTRING_TO_SERVER   = 0x00004000;
+    final private static int TBD_16 = 0x00008000; // update ALL_TESTS if this is defined
+    final private static int TBD_15 = 0x00010000; // update ALL_TESTS if this is defined
+    final private static int TBD_14 = 0x00020000; // update ALL_TESTS if this is defined
+    final private static int TBD_13 = 0x00040000; // update ALL_TESTS if this is defined
+    final private static int TBD_12 = 0x00080000; // update ALL_TESTS if this is defined
+    final private static int TBD_11 = 0x00100000; // update ALL_TESTS if this is defined
+    final private static int TBD_10 = 0x00200000; // update ALL_TESTS if this is defined
+    final private static int TBD_9  = 0x00400000; // update ALL_TESTS if this is defined
+    final private static int TBD_8  = 0x00800000; // update ALL_TESTS if this is defined
+    final private static int TBD_7  = 0x01000000; // update ALL_TESTS if this is defined
+    final private static int TBD_6  = 0x02000000; // update ALL_TESTS if this is defined
+    final private static int TBD_5  = 0x04000000; // update ALL_TESTS if this is defined
+    final private static int TBD_4  = 0x08000000; // update ALL_TESTS if this is defined
+    final private static int TBD_3  = 0x10000000; // update ALL_TESTS if this is defined
+    final private static int TBD_2  = 0x20000000; // update ALL_TESTS if this is defined
+    final private static int TBD_1  = 0x40000000; // update ALL_TESTS if this is defined
+    final private static int TBD_0  = 0x80000000; // update ALL_TESTS if this is defined
+
+    final private static int ALL_TESTS = 0x00007FFF;
 
     // for all tests, run each test named in this array
-    final private static String test_name[] =
-        {
-            "wchar_to_server", "wstring_to_server", "warray_to_server",
-            "any(wchar)_to_server", "wstring_exception", "wchar_from_server",
-            "wstring_from_server", "warray_from_server", "any(wchar)_from_server",
-            "any(wstring)_to_server", "any(wstring)_from_server",
-            "any(wstring)_echo", "wstructseq_from_server", "wstructseq_to_server"
+    final private static String test_name[] = {
+        "wchar_to_server",
+        "wstring_to_server",
+        "warray_to_server",
+        "any(wchar)_to_server",
+        "wstring_exception",
+        "wchar_from_server",
+        "wstring_from_server",
+        "warray_from_server",
+        "any(wchar)_from_server",
+        "any(wstring)_to_server",
+        "any(wstring)_from_server",
+        "any(wstring)_echo",
+        "wstructseq_from_server",
+        "wstructseq_to_server",
+        "nul_wstring_to_server"
         };
 
     private int tests_to_run = 0;
@@ -52,100 +78,85 @@ public class Client
 
     private boolean runOneTest (WChar_Passer server, int test_num)
     {
+        if (test_num > ALL_TESTS)
+            return false;
+
         switch (test_num)
         {
-            case 0x0001: //WCHAR_TO_SERVER:
+            case 0x00000001: //WCHAR_TO_SERVER:
             {
-                if (verbose)
-                    System.out.println ("test wchar_to_server");
                 return server.wchar_to_server (ref.get_wchar(data_set),
                     data_set);
             }
-            case 0x0002: //WSTRING_TO_SERVER:
+            case 0x00000002: //WSTRING_TO_SERVER:
             {
-                if (verbose)
-                    System.out.println ("test wstring_to_server");
                 return server.wstring_to_server (ref.get_wstring(data_set),
                     data_set);
-            }          
-            case 0x0004: //WARRAY_TO_SERVER:
+            }
+            case 0x00000004: //WARRAY_TO_SERVER:
             {
-                if (verbose)
-                    System.out.println ("test warray_to_server");
                 return server.warray_to_server (ref.get_warray(data_set),
                     data_set);
             }
-            case 0x0008: //ANY_WCHAR_TO_SERVER:
+            case 0x00000008: //ANY_WCHAR_TO_SERVER:
             {
-                if (verbose)
-                    System.out.println ("test any_wchar_to_server");
                 Any a = orb.create_any();
                 a.insert_wchar (ref.get_wchar(data_set));
                 return server.any_to_server (a,data_set);
             }
-            case 0x0010: //WSTRING_EXCEPTION:
+            case 0x00000010: //WSTRING_EXCEPTION:
             {
-                if (verbose)
-                    System.out.println ("test wstring_exception");
-                try 
+                try
                 {
                     server.exception_test(data_set);
-                } 
-                catch (interop.WChar_PasserPackage.WStringException ex) 
+                }
+                catch (interop.WChar_PasserPackage.WStringException ex)
                 {
                     return ref.match_except (data_set,ex.why);
                 }
                 break;
             }
-            case 0x0020: // WCHAR_FROM_SERVER:
+            case 0x00000020: // WCHAR_FROM_SERVER:
             {
-                if (verbose)
-                    System.out.println ("test wchar_from_server");
                 char wc = server.wchar_from_server (data_set);
                 return ref.match_wchar (data_set,wc);
             }
-            case 0x0040: //WSTRING_FROM_SERVER:
+            case 0x00000040: //WSTRING_FROM_SERVER:
             {
-                if (verbose)
-                    System.out.println ("test wstring_from_server");
                 String ws = server.wstring_from_server (data_set);
                 return ref.match_wstring (data_set,ws);
             }
-            case 0x0080: //WARRAY_FROM_SERVER:
+            case 0x00000080: //WARRAY_FROM_SERVER:
             {
-                if (verbose)
-                    System.out.println ("test warray_from_server");
                 char wa[] = server.warray_from_server (data_set);
                 return ref.match_warray (data_set,wa);
             }
-            case 0x0100: // ANY_WCHAR_FROM_SERVER:
+            case 0x00000100: // ANY_WCHAR_FROM_SERVER:
             {
                 if (verbose)
-                    System.out.println ("test any(wchar) from server not yet implemented");
+                    System.out.println ("     not yet implemented");
                 return true;
             }
-            case 0x0200: // ANY_WSTRING_TO_SERVER:
-                {
+            case 0x00000200: // ANY_WSTRING_TO_SERVER:
+            {
                 if (verbose)
-                    System.out.println ("test wstring to server not yet implemented");
+                    System.out.println ("     not yet implemented");
                 return true;
             }
-            case 0x0400: // ANY_WSTRING_FROM_SERVER:
-                {
+            case 0x00000400: // ANY_WSTRING_FROM_SERVER:
+            {
                 if (verbose)
-                    System.out.println ("test wstring from server not yet implemented");
+                    System.out.println ("    not yet implemented");
                 return true;
             }
-            case 0x0800: // ANY_WSTRING_ECHO:
-                {
+            case 0x00000800: // ANY_WSTRING_ECHO:
+            {
                 if (verbose)
-                    System.out.println ("test wstring echo not yet implemented");
+                    System.out.println ("    not yet implemented");
                 return true;
             }
-            case 0x1000: // WSTRUCTSEQ_FROM_SERVER
+            case 0x00001000: // WSTRUCTSEQ_FROM_SERVER
             {
-                if (verbose)
-                    System.out.println ("test wstructseq_from_server");
                 wstruct wsList[] =
                     server.wstructseq_from_server(data_set);
                 boolean result = true;
@@ -155,10 +166,8 @@ public class Client
                         wsList[i].st_string);
                 return result;
             }
-            case 0x2000: // WSTRUCTSEQ_TO_SERVER
+            case 0x00002000: // WSTRUCTSEQ_TO_SERVER
             {
-                if (verbose)
-                    System.out.println ("test wstructseq_to_server");
                 wstruct wsList[] = new wstruct[5];
                 for (int i = 0; i < wsList.length; ++i)
                 {
@@ -168,13 +177,19 @@ public class Client
                 }
                 return server.wstructseq_to_server(wsList, data_set);
             }
-      
+
+            case 0x00004000: // NUL_WSTRING_TO_SERVER
+            {
+                return server.wstring_to_server ("", (short)-1);
+            }
+
             default:
             {
                 if (verbose)
-                    System.out.println ("unknown test type" + test_num);
-                break;
-            }        
+                    System.out.println ("    not yet implemented");
+                return false;
+
+            }
         }
         return false;
     }
@@ -188,6 +203,8 @@ public class Client
         for (int i = 0; i < test_name.length; i++, t <<= 1)
             if ((tests_to_run & t) == t)
             {
+                if (verbose)
+                    System.out.println ("test " + test_name[i]);
                 boolean result = runOneTest (server,t);
                 ++numtests;
                 if (result) ++successes;
@@ -198,7 +215,7 @@ public class Client
             }
         if (verbose)
             System.out.println ("Total of " + successes +
-                                "successes out of " + numtests + " tests");
+                                " successes out of " + numtests + " tests");
         return successes == numtests;
     }
 
@@ -213,10 +230,10 @@ public class Client
         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 )
@@ -227,7 +244,7 @@ public class Client
         // @@ todo result &= ref.match_wstring (key, test.st_any.extract_wstring());
         return result;
     }
-  
+
 
     public void run(String[] args)
         throws Exception
@@ -311,5 +328,5 @@ public class Client
         Client client = new Client();
         client.run(args);
     }
-  
+
 }// Client
diff --git a/TAO/interop-tests/wchar/README b/TAO/interop-tests/wchar/README
index 99335123e81..3e9e71d873c 100644
--- a/TAO/interop-tests/wchar/README
+++ b/TAO/interop-tests/wchar/README
@@ -16,7 +16,7 @@ The default ior file for the server is "./IOR"
 The -v option causes the server to output some details of its operation.
 
 The TAO client command line is:
-  ./client [-k ior] [[-t 0 < n <= 8]...] [-v] [-x]
+  ./client [-k ior] [[-t 0 < n <= 14]...] [-v] [-x]
 The default ior is "file://IOR". Note that it is an IOR, not a filename.
 The -t option selects individual tests, no selection implies all tests,
   the -t option may be repeated to select a number of tests
@@ -27,6 +27,6 @@ Anything else, such as -?, will yield a list of options and test descriptions.
 
 To run the JacORB client or server, use the "jaco" utility,
 
-jaco interop.wchar.Server [-o iorfile] [-v]
-jaco interop.wchar.Client [-i iorfile] [-t 0..8] [-v] [-x]
+jaco -classpath ../classes interop.wchar.Server [-o iorfile] [-v]
+jaco -classpath ../classes interop.wchar.Client [-i iorfile] [-t 0..14] [-v] [-x]
 Note that Client takes -i iorfile, not -k ior.
diff --git a/TAO/interop-tests/wchar/WCharReference.java b/TAO/interop-tests/wchar/WCharReference.java
index ae62392afcf..0037c6ed5c9 100644
--- a/TAO/interop-tests/wchar/WCharReference.java
+++ b/TAO/interop-tests/wchar/WCharReference.java
@@ -63,6 +63,12 @@ public class WCharReference
 
     public boolean match_wstring (short key, String test)
     {
+        if (key == -1) {
+            if (verbose)
+                System.out.println ("match_wstring: expcting nul string, " +
+                                    "got string length " + test.length());
+            return test.length() == 0;
+        }
         if (verbose)
             System.out.println ("match_wstring: expecting " +
                                 ref_wstring[key] + " got " +
diff --git a/TAO/interop-tests/wchar/client.cpp b/TAO/interop-tests/wchar/client.cpp
index 4367a71176b..c7ebabb7368 100644
--- a/TAO/interop-tests/wchar/client.cpp
+++ b/TAO/interop-tests/wchar/client.cpp
@@ -20,36 +20,66 @@
 #include "interop_wcharC.h"
 #include "wchar_reference.h"
 
-#include <ace/Get_Opt.h>
+#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
-const int WCHAR_TO_SERVER = 0x0001;
-const int WSTRING_TO_SERVER = 0x0002;
-const int WARRAY_TO_SERVER = 0x0004;
-const int ANY_WCHAR_TO_SERVER = 0x0008;
-const int WSTRING_EXCEPTION = 0x0010;
-const int WCHAR_FROM_SERVER = 0x0020;
-const int WSTRING_FROM_SERVER = 0x0040;
-const int WARRAY_FROM_SERVER = 0x0080;
-const int ANY_WCHAR_FROM_SERVER = 0x0100;
-const int ANY_WSTRING_TO_SERVER = 0x0200;
-const int ANY_WSTRING_FROM_SERVER = 0x0400;
-const int ANY_WSTRING_ECHO = 0x0800;
-const int TBD_3 = 0x1000;
-const int TBD_2 = 0x2000;
-const int TBD_1 = 0x4000;
-const int TBD_0 = 0x8000;
-const int ALL_TESTS = 0xFFFF;
+const int WCHAR_TO_SERVER         = 0x00000001;
+const int WSTRING_TO_SERVER       = 0x00000002;
+const int WARRAY_TO_SERVER        = 0x00000004;
+const int ANY_WCHAR_TO_SERVER     = 0x00000008;
+const int WSTRING_EXCEPTION       = 0x00000010;
+const int WCHAR_FROM_SERVER       = 0x00000020;
+const int WSTRING_FROM_SERVER     = 0x00000040;
+const int WARRAY_FROM_SERVER      = 0x00000080;
+const int ANY_WCHAR_FROM_SERVER   = 0x00000100;
+const int ANY_WSTRING_TO_SERVER   = 0x00000200;
+const int ANY_WSTRING_FROM_SERVER = 0x00000400;
+const int ANY_WSTRING_ECHO        = 0x00000800;
+const int WSTRUCTSEQ_FROM_SERVER  = 0x00001000;
+const int WSTRUCTSEQ_TO_SERVER    = 0x00002000;
+const int NUL_WSTRING_TO_SERVER   = 0x00004000;
+const int TBD_16 = 0x00008000; // update ALL_TESTS if this is defined
+const int TBD_15 = 0x00010000; // update ALL_TESTS if this is defined
+const int TBD_14 = 0x00020000; // update ALL_TESTS if this is defined
+const int TBD_13 = 0x00040000; // update ALL_TESTS if this is defined
+const int TBD_12 = 0x00080000; // update ALL_TESTS if this is defined
+const int TBD_11 = 0x00100000; // update ALL_TESTS if this is defined
+const int TBD_10 = 0x00200000; // update ALL_TESTS if this is defined
+const int TBD_9  = 0x00400000; // update ALL_TESTS if this is defined
+const int TBD_8  = 0x00800000; // update ALL_TESTS if this is defined
+const int TBD_7  = 0x01000000; // update ALL_TESTS if this is defined
+const int TBD_6  = 0x02000000; // update ALL_TESTS if this is defined
+const int TBD_5  = 0x04000000; // update ALL_TESTS if this is defined
+const int TBD_4  = 0x08000000; // update ALL_TESTS if this is defined
+const int TBD_3  = 0x10000000; // update ALL_TESTS if this is defined
+const int TBD_2  = 0x20000000; // update ALL_TESTS if this is defined
+const int TBD_1  = 0x40000000; // update ALL_TESTS if this is defined
+const int TBD_0  = 0x80000000; // update ALL_TESTS if this is defined
 
+const int ALL_TESTS = 0x00007FFF;
+
+// The length of this array determines which tests are run for "all tests"
 const char * test_name[] =
   {
-    "wchar_to_server", "wstring_to_server", "warray_to_server",
-    "any(wchar)_to_server", "wstring_exception", "wchar_from_server",
-    "wstring_from_server", "warray_from_server", "any(wchar)_from_server",
-    "any(wstring)_to_server", "any(wstring)_from_server", "any(wstring)_echo"
+    "wchar_to_server",
+    "wstring_to_server",
+    "warray_to_server",
+    "any(wchar)_to_server",
+    "wstring_exception",
+    "wchar_from_server",
+    "wstring_from_server",
+    "warray_from_server",
+    "any(wchar)_from_server",
+    "any(wstring)_to_server",
+    "any(wstring)_from_server",
+    "any(wstring)_echo",
+    "wstructseq_from_server",
+    "wstructseq_to_server",
+    "nul_wstring_to_server"
   };
 
 const int LAST_TEST = sizeof (test_name) / sizeof (test_name[0]);
-const char *ior = "file://IOR";
+const ACE_TCHAR *ior = ACE_TEXT("file://IOR");
 int tests_to_run = 0;
 int verbose = 0;
 int kill_server = 0;
@@ -59,6 +89,16 @@ int data_set = 0;
 
 wchar_reference ref;
 
+void
+assign_wstruct (short key, interop::wstruct & ws)
+{
+    ws.st_char = ref.get_wchar(key);
+    ws.st_string = CORBA::wstring_dup(ref.get_wstring(key));
+    ref.assign_warray(key, ws.st_array);
+    ws.st_any <<= CORBA::wstring_dup(ref.get_wstring(key));
+}
+
+
 CORBA::Boolean
 run_one_test (interop::WChar_Passer_ptr server,
               int test_num ACE_ENV_ARG_DECL)
@@ -166,6 +206,34 @@ run_one_test (interop::WChar_Passer_ptr server,
           }
         return 0;
       }
+    case WSTRUCTSEQ_FROM_SERVER:
+      {
+        interop::wstructseq_var wsList =
+          server->wstructseq_from_server(data_set ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN(0);
+        int result = 1;
+
+        for (CORBA::ULong i = 0; i < wsList->length(); i++)
+          result &= ref.match_wstring (data_set,
+                                       wsList[i].st_string.in());
+
+        return result;
+      }
+    case WSTRUCTSEQ_TO_SERVER:
+      {
+        interop::wstructseq_var wsList = new interop::wstructseq;
+        wsList->length(5);
+        for (CORBA::ULong i = 0; i < wsList->length(); ++i)
+        {
+          assign_wstruct(data_set, (*wsList)[i]);
+        }
+        return server->wstructseq_to_server(wsList.in(), data_set
+                                            ACE_ENV_ARG_PARAMETER);
+      }
+    case NUL_WSTRING_TO_SERVER:
+      return server->wstring_to_server (L"",
+                                        -1
+                                        ACE_ENV_ARG_PARAMETER);
     default:
       break;
     }
@@ -199,9 +267,9 @@ run_tests (interop::WChar_Passer_ptr server ACE_ENV_ARG_DECL)
 #endif // ACE_HAS_WCHAR || ACE_HAS_XPG4_MULTIBYTE_CHAR
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:t:vx");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:t:vx"));
   int c;
   while ((c = get_opts ()) != -1)
     switch (c)
@@ -211,7 +279,7 @@ parse_args (int argc, char *argv[])
         break;
       case 't':
         {
-          int tnum = atoi(get_opts.opt_arg());
+          int tnum = ACE_OS::atoi(get_opts.opt_arg());
           if (tnum >= 0 && tnum < LAST_TEST)
             tests_to_run |= (1 << tnum);
           else
@@ -249,56 +317,59 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main( int argc, char *argv[] )
+ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
 {
 #if (!defined ACE_HAS_WCHAR) && (!defined ACE_HAS_XPG4_MULTIBYTE_CHAR)
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
-  ACE_ERROR_RETURN ((LM_ERROR,"This test requires wchar support\n"),0);
+  ACE_ERROR_RETURN ((LM_ERROR,ACE_TEXT ("This test requires wchar support\n")),0);
 #else
   ACE_TRY_NEW_ENV
-    {
-      // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv);
-      if (parse_args(argc, argv) == -1)
-        return 0;
+  {
+    ACE_Argv_Type_Converter command_line(argc, argv);
+    // Initialize orb
+    CORBA::ORB_var orb = CORBA::ORB_init( command_line.get_argc(), command_line.get_ASCII_argv() );
+    if (parse_args(argc, argv) == -1)
+      return 0;
 
-      // Destringify ior
-      CORBA::Object_var obj = orb->string_to_object( ior
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if( CORBA::is_nil( obj.in() ) )
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "arg is not a valid ior sting"),
-                          -1);
+    // Destringify ior
+    CORBA::Object_var obj = orb->string_to_object( ACE_TEXT_ALWAYS_CHAR(ior) ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    if( CORBA::is_nil( obj.in() ) )
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "arg is not a valid ior sting"),
+                        -1);
 
-      // Narrow
-      interop::WChar_Passer_var server =
-        interop::WChar_Passer::_narrow( obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    // Narrow
+    interop::WChar_Passer_var server =
+      interop::WChar_Passer::_narrow( obj.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      if( CORBA::is_nil( server.in() ))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "arg is not a interop::WChar_Passer reference\n"),
-                          -1);
+    if( CORBA::is_nil( server.in() ))
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "arg is not a interop::WChar_Passer reference\n"),
+                        -1);
 
-      short result = run_tests (server.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::String_var server_orb =
-        server->orb_name(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_ERROR ((LM_ERROR,
-                  "wchar_interop test (TAO client, %s server) %s \n",
-                  server_orb.in(),
-                  (result ? "passed" : "failed")));
-      if (kill_server)
-        server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  ACE_CATCH(CORBA::Exception,ex)
+    short result = run_tests (server.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    CORBA::String_var server_orb =
+      server->orb_name(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ERROR ((LM_ERROR,
+                "wchar_interop test (TAO client, %s server) %s \n",
+                server_orb.in(),
+                (result ? "passed" : "failed")));
+    if (kill_server)
     {
-      ACE_PRINT_EXCEPTION(ex, "Uncaught CORBA exception: ");
-      return 1;
+      server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
+  }
+  ACE_CATCH(CORBA::Exception, ex)
+  {
+    ACE_PRINT_EXCEPTION(ex, "Uncaught CORBA exception: ");
+    return 1;
+  }
   ACE_ENDTRY;
   return 0;
 #endif
diff --git a/TAO/interop-tests/wchar/interop_wchar.mpc b/TAO/interop-tests/wchar/interop_wchar.mpc
index 4d9c5693901..1ab33650887 100644
--- a/TAO/interop-tests/wchar/interop_wchar.mpc
+++ b/TAO/interop-tests/wchar/interop_wchar.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Server): taoexe, portableserver {
+  exename = server
   Source_Files {
     interop_wchar_i.cpp
     wchar_reference.cpp
@@ -10,6 +11,7 @@ project(*Server): taoexe, portableserver {
 }
 
 project(*Client): taoexe {
+  exename = client
   Source_Files {
     interop_wcharC.cpp
     wchar_reference.cpp
diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp
index 59da18ea716..8b464c4cbd5 100644
--- a/TAO/interop-tests/wchar/server.cpp
+++ b/TAO/interop-tests/wchar/server.cpp
@@ -16,17 +16,18 @@
 //    Phil Mesnier <mesnier_p@ociweb.com>
 //
 // ============================================================================
-
 #include "interop_wchar_i.h"
-#include <ace/Get_Opt.h>
+#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("IOR");
 int verbose = 0;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:v");
+
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:v"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -53,10 +54,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main( int argc, char *argv[] )
+ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
 {
-  if (parse_args(argc, argv))
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("failed to parse args\n")), 1);
+  ACE_Argv_Type_Converter command_line(argc, argv);
+
+  if (parse_args(command_line.get_argc(), command_line.get_TCHAR_argv()))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                        ACE_TEXT ("failed to parse args")),
+                        1);
+    }
+
 #if (!defined ACE_HAS_WCHAR) && (!defined ACE_HAS_XPG4_MULTIBYTE_CHAR)
   // the run_test script looks for the ior file. By touching it here, the
   // script can run at full speed, rather than timing out waiting for a
@@ -75,63 +83,64 @@ main( int argc, char *argv[] )
   ACE_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
-      //Get reference to Root POA
-      CORBA::Object_var obj =
+        // Initialize orb
+        CORBA::ORB_var orb = CORBA::ORB_init( command_line.get_argc(), command_line.get_ASCII_argv() );
+
+        //Get reference to Root POA
+        CORBA::Object_var obj =
         orb->resolve_initial_references( "RootPOA"
                                          ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+        ACE_TRY_CHECK;
+
+        PortableServer::POA_var poa =
+          PortableServer::POA::_narrow( obj.in()
+                                        ACE_ENV_ARG_PARAMETER );
+        ACE_TRY_CHECK;
 
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow( obj.in()
-                                      ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+        PortableServer::POAManager_var mgr =
+          poa->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER );
+        ACE_TRY_CHECK;
 
-      PortableServer::POAManager_var mgr =
-        poa->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+        // Activate POA Manager
+        mgr->activate( ACE_ENV_SINGLE_ARG_PARAMETER );
+        ACE_TRY_CHECK;
 
-      // Activate POA Manager
-      mgr->activate( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+        // Create an object
+        interop_WChar_Passer_i servant(orb.in(), verbose);
 
-      // Create an object
-      interop_WChar_Passer_i servant(orb.in(), verbose);
+        // Register the servant with the RootPOA, obtain its object
+        // reference, stringify it, and write it to a file.
+        obj = poa->servant_to_reference( &servant
+                                         ACE_ENV_ARG_PARAMETER );
+        ACE_TRY_CHECK;
 
-      // Register the servant with the RootPOA, obtain its object
-      // reference, stringify it, and write it to a file.
-      obj = poa->servant_to_reference( &servant
-                                       ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+        CORBA::String_var str =
+          orb->object_to_string( obj.in()
+                                 ACE_ENV_ARG_PARAMETER );
+        ACE_TRY_CHECK;
 
-      CORBA::String_var str =
-        orb->object_to_string( obj.in()
-                               ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+        FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
+        if (output_file == 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT("Cannot open output file ")
+                             ACE_TEXT("for writing IOR: %s"),
+                            ior_output_file),
+                            1);
+        ACE_OS::fprintf (output_file, "%s", str.in ());
+        ACE_OS::fclose (output_file);
 
-      FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT("Cannot open output file ")
-                           ACE_TEXT("for writing IOR: %s"),
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", str.in ());
-      ACE_OS::fclose (output_file);
-
-      // Accept requests
-      orb->run( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
-      orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH(CORBA::Exception,ex)
-    {
-      ACE_PRINT_EXCEPTION(ex, "uncaught exception");
-      return 1;
-    }
-  ACE_ENDTRY;
+        // Accept requests
+        orb->run( ACE_ENV_SINGLE_ARG_PARAMETER );
+        ACE_TRY_CHECK;
+        orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCH(CORBA::Exception, ex)
+      {
+        ACE_PRINT_EXCEPTION(ex, "uncaught exception");
+        return 1;
+      }
+    ACE_ENDTRY;
 
     return 0;
 #endif /* ACE_HAS_WCHAR */
diff --git a/TAO/interop-tests/wchar/wchar_reference.cpp b/TAO/interop-tests/wchar/wchar_reference.cpp
index 83d3971bade..0ca0384c81b 100644
--- a/TAO/interop-tests/wchar/wchar_reference.cpp
+++ b/TAO/interop-tests/wchar/wchar_reference.cpp
@@ -88,7 +88,8 @@ int
 wchar_reference::match_wchar (short key, ACE_OS::WChar test)
 {
   if (verbose_)
-    ACE_DEBUG ((LM_DEBUG,"match_wchar, expecting %x, got %x for key %d\n",
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("match_wchar, expecting %x, got %x for key %d\n"),
                 wchar_reference::ref_wchar[key],test,key));
   return wchar_reference::ref_wchar[key] == test;
 }
@@ -96,8 +97,18 @@ wchar_reference::match_wchar (short key, ACE_OS::WChar test)
 int
 wchar_reference::match_wstring (short key, const ACE_OS::WChar *test)
 {
+  if (key == -1)
+    {
+      if (verbose_)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT("match_wstring: expecting nul string, ")
+                    ACE_TEXT("got string length %d\n"),
+                    ACE_OS::strlen (test)));
+      return (ACE_OS::strlen (test) == 0);
+    }
   if (verbose_)
-    ACE_DEBUG ((LM_DEBUG,"match_wstring: expecting %W, got %W for key %d\n",
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("match_wstring: expecting %W, got %W for key %d\n"),
                 wchar_reference::ref_wstring[key],test,key));
   return ACE_OS::strcmp(wchar_reference::ref_wstring[key],test) == 0;
 }
@@ -106,11 +117,13 @@ int
 wchar_reference::match_warray (short key, const ACE_OS::WChar *test)
 {
   if (verbose_)
-    ACE_DEBUG ((LM_DEBUG, "match_warray: key %d\n",key));
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("match_warray: key %d\n"),key));
   for (int i = 0; i < 10; i++)
     {
       if (verbose_)
-        ACE_DEBUG ((LM_DEBUG,"  expecting[%d] %x, got %x\n",
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT("  expecting[%d] %x, got %x\n"),
                     i, wchar_reference::ref_warray[key][i],
                     test[i]));
       if (wchar_reference::ref_warray[key][i] != test[i])
@@ -123,7 +136,8 @@ int
 wchar_reference::match_except(short key, const ACE_OS::WChar *test)
 {
   if (verbose_)
-    ACE_DEBUG ((LM_DEBUG,"match_except: expecting %W, got %W for key %d\n",
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("match_except: expecting %W, got %W for key %d\n"),
                 wchar_reference::ref_except[key],test,key));
   return ACE_OS::strcmp(wchar_reference::ref_except[key],test) == 0;
 }
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index 220aa334965..2bdb8761528 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, event_serv, naming, svc_utils, iortable, messaging, portableserver {
+project : orbsvcsexe, core, naming, event_serv, svc_utils, iortable, messaging, portableserver {
   exename  = CosEvent_Service
 }
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index c0355d78d0f..8c86a6eae4f 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -311,7 +311,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
             {
               ACE_OS::fprintf (pidf,
                                "%ld\n",
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pidf);
             }
         }
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.mpc b/TAO/orbsvcs/Event_Service/Event_Service.mpc
index b42f6a2e965..f0f27552c58 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.mpc
+++ b/TAO/orbsvcs/Event_Service/Event_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, event, rtevent, rtoldevent, rtschedevent, bidir_giop {
+project : orbsvcsexe, core, rtevent, rtoldevent, rtschedevent, bidir_giop {
   exename  = Event_Service
 }
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
index 1acbc3499a5..d0b1273b3af 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -35,7 +35,6 @@ Event_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index 8f9e7124820..0f9a9e63104 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -10,6 +10,7 @@
 #include "orbsvcs/Sched/Config_Scheduler.h"
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h"
+#include "orbsvcs/FtRtEvent/Utils/Log.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID (Event_Service,
@@ -142,13 +143,16 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv [])
   if (n_threads)
     this->num_threads_ = ACE_OS::atoi(n_threads);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("jn:ps:"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("d:jn:ps:"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
   {
     switch (opt)
     {
+    case 'd':
+      TAO_FTRTEC::Log::level(ACE_OS::atoi(get_opt.opt_arg ()));
+      break;
     case 'j':
       this->membership_ = TAO_FTEC_Event_Channel::BACKUP;
       break;
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index 3a8a8db6714..18edb1a1c48 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/SString.h"
 #include "ace/OS_NS_stdio.h"
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
diff --git a/TAO/orbsvcs/FTRT_Event_Service/ftec b/TAO/orbsvcs/FTRT_Event_Service/ftec
index 390c1af594a..a6ca436573b 100755
--- a/TAO/orbsvcs/FTRT_Event_Service/ftec
+++ b/TAO/orbsvcs/FTRT_Event_Service/ftec
@@ -13,13 +13,13 @@ do
             export FTEC_HEART_BEAT=$2
             shift;;
     -ami)   export FTEC_REPLCATION_STRATEGY=AMI;;
-    -p)     ARGS="$ARGS -p";;
-    -j)     ARGS="$ARGS -j";;
     -ns)    ORBNameServicePort=${ORBNameServicePort=10000}
             export NameServiceIOR=${NameServiceIOR=corbaloc:iiop:$2:$ORBNameServicePort/NameService};
             shift;;
-    esac
-  shift
+      *)    ARGS="$ARGS $1";;
+    esac 
+    shift
 done
+echo $ARGS
 cd ./Event_Service
 ./ftrt_eventservice $ARGS
diff --git a/TAO/orbsvcs/FTRT_Event_Service/supplier b/TAO/orbsvcs/FTRT_Event_Service/supplier
index 96c63a29e90..8825f9a75ae 100755
--- a/TAO/orbsvcs/FTRT_Event_Service/supplier
+++ b/TAO/orbsvcs/FTRT_Event_Service/supplier
@@ -10,8 +10,10 @@ do
         -sciop) ORBNameServicePort=${ORBNameServicePort=10000}
             export NameServiceIOR=${NameServiceIOR=corbaloc:sciop:$HOSTNAME:$ORBNameServicePort/NameService}
             EndpointParam="-ORBEndpoint sciop://";;
-  -d) $FTEC_TransactionDepth=$2
-      shift;;
+        -d) $FTEC_TransactionDepth=$2
+            shift;;
+        -orbd) EndpointParam="$EndpointParam -ORBDebugLevel $2"; shift;;
+         *) EndpointParam="$EndpointParam $1";;
     esac
     shift
 done
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index 83df60813d3..ba03306ae7d 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
@@ -18,6 +18,7 @@
 #include "orbsvcs/FT_ReplicationManagerC.h"
 #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h"
 #include "tao/debug.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID (FT_DefaultFaultAnalyzer,
            FT_DefaultFaultAnalyzer,
@@ -166,4 +167,3 @@ int TAO::FT_DefaultFaultAnalyzer::analyze_fault_event (
   // no-op
   return 0;
 }
-
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 2464d558f1a..41aa53029ed 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -234,7 +234,7 @@ void TAO::FT_FaultConsumer::push_structured_event (
       ACE_TEXT (
         "TAO::FT_FaultConsumer::push_structured_event: "
         "Received Fault notification(%d):\n"),
-      ACE_static_cast (unsigned int, this->notifications_)
+      static_cast<unsigned int> (this->notifications_)
     ));
   }
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
index a8f7556b3f6..b285d43d71f 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
@@ -17,6 +17,8 @@
 
 #include "FT_FaultEventDescriptor.h"
 
+#include "ace/SString.h"
+
 ACE_RCSID (FT_FaultEventDescriptor,
            FT_FaultEventDescriptor,
            "$Id$")
@@ -88,4 +90,3 @@ void TAO::FT_FaultEventDescriptor::dump ()
     ));
   }
 }
-
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index dfd27e69fe0..7892785ce31 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -11,7 +11,7 @@ project(*Lib): orbsvcslib, core, fault_tolerance, notification_skel, ftorb, port
   }
 }
 
-project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb {
+project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb, core {
   exename  = FT_ReplicationManager
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index ecce2c241ae..8796d31f381 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -30,7 +30,7 @@ ACE_RCSID (FT_ReplicationManagerFaultAnalyzer,
 TAO::FT_ReplicationManagerFaultAnalyzer::FT_ReplicationManagerFaultAnalyzer (
   const TAO::FT_ReplicationManager * replication_manager)
   : replication_manager_ (
-      ACE_const_cast (TAO::FT_ReplicationManager *, replication_manager))
+      const_cast<TAO::FT_ReplicationManager *> (replication_manager))
 {
 }
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
index c033916bcff..7d156abde51 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
+++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
@@ -61,7 +61,7 @@ endif BUILD_ACE_UUID
 if BUILD_ACE_UUID
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = FT_ReplicationManager
+bin_PROGRAMS = FT_ReplicationManager
 
 FT_ReplicationManager_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index ef7637ddf64..979d3806a43 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -435,7 +435,7 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault
     {
       ACE_ERROR (( LM_ERROR,
         "Remove detector %d mismatch.\n",
-        ACE_static_cast(int, id)
+        static_cast<int> (id)
         ));
     }
   }
@@ -443,8 +443,8 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault
   {
     ACE_ERROR (( LM_ERROR,
       "Attempt to remove invalid detector %d. Limit %d.\n",
-      ACE_static_cast(int, id),
-      ACE_static_cast(int, this->detectors_.size())
+      static_cast<int> (id),
+      static_cast<int> (this->detectors_.size())
       ));
   }
 }
@@ -474,8 +474,8 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
   {
     // note: these should be unsigned long, but
     // ACE_Time_Value wants longs.
-    long uSec = ACE_static_cast (long, (value / timeT_per_uSec) % uSec_per_sec);
-    long sec = ACE_static_cast (long, (value / timeT_per_uSec) / uSec_per_sec);
+    long uSec = static_cast<long> ((value / timeT_per_uSec) % uSec_per_sec);
+    long sec = static_cast<long> ((value / timeT_per_uSec) / uSec_per_sec);
     ACE_Time_Value atv(sec, uSec);
     TAO::Fault_Detector_i::set_time_for_all_detectors(atv);
   }
@@ -566,7 +566,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
   if (::TAO::find (decoder, ::FT::FT_DOMAIN_ID, domain_id_string) )
   {
     // NOTE the assumption that we can assign a char * to a domain id
-    domain_id = ACE_const_cast (char *, domain_id_string);
+    domain_id = const_cast<char *> (domain_id_string);
   }
   else
   {
@@ -597,11 +597,11 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
   const char * object_type_string;
   if (::TAO::find (decoder, ::FT::FT_TYPE_ID, object_type_string))
   {
-    object_type = ACE_const_cast (char *, object_type_string);
+    object_type = const_cast<char *> (object_type_string);
   }
   else
   {
-    object_type = ACE_const_cast (char *, "unknown");
+    object_type = const_cast<char *> ("unknown");
     // Not required: missingParameter = 1;
     ACE_DEBUG ((LM_DEBUG, "Object type not given.\n"));
   }
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index ec7dd75f590..7333ffb7a87 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -16,8 +16,9 @@
 
 #ifndef FT_FAULTDETECTORFACTORY_I_H_
 #define FT_FAULTDETECTORFACTORY_I_H_
-#include /**/ <ace/pre.h>
-#include <ace/ACE.h>
+#include /**/ "ace/pre.h"
+#include "ace/ACE.h"
+#include "ace/SString.h"
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -343,5 +344,5 @@ namespace TAO
   };
 }   // namespace TAO
 
-#include /**/ <ace/post.h>
+#include /**/ "ace/post.h"
 #endif /* FT_FAULTDETECTORFACTORY_I_H_  */
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
index c8395db75b8..b88d38ae6f2 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : taoserver, orbsvcsexe, fault_tolerance {
+project : taoserver, orbsvcsexe, core, fault_tolerance {
   exename  = Fault_Detector
   Source_Files {
     Fault_Detector_i.cpp
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
index 0b9a7cbd3b2..bba77092823 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
@@ -196,7 +196,7 @@ void TAO::Fault_Detector_i::notify()
 //static
 ACE_THR_FUNC_RETURN TAO::Fault_Detector_i::thr_func (void * arg)
 {
-  TAO::Fault_Detector_i * detector = ACE_static_cast (TAO::Fault_Detector_i * , arg);
+  TAO::Fault_Detector_i * detector = static_cast<TAO::Fault_Detector_i * > (arg);
   detector->run ();
   return 0;
 }
diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am
index f61903d0926..f05999275fb 100644
--- a/TAO/orbsvcs/Fault_Detector/Makefile.am
+++ b/TAO/orbsvcs/Fault_Detector/Makefile.am
@@ -10,7 +10,7 @@ TAO_BUILDDIR = $(top_builddir)
 if BUILD_ACE_UUID
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = Fault_Detector
+bin_PROGRAMS = Fault_Detector
 
 Fault_Detector_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/Fault_Notifier/.cvsignore b/TAO/orbsvcs/Fault_Notifier/.cvsignore
index 26f0ac494ac..346d74c2dcd 100644
--- a/TAO/orbsvcs/Fault_Notifier/.cvsignore
+++ b/TAO/orbsvcs/Fault_Notifier/.cvsignore
@@ -1,4 +1,5 @@
 *.dsp
 *.dsw
-Release
 Debug
+Fault_Notifier
+Release
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index f4d74f9f06a..fdf261d9ea8 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -685,7 +685,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::disconnect_consumer);
 
-  size_t index = ACE_static_cast ( size_t, connection);
+  size_t index = static_cast<size_t> (connection);
   if (index < this->proxy_infos_.size())
   {
     ProxyInfo & info = this->proxy_infos_[index];
@@ -736,8 +736,8 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
     {
       ACE_ERROR((LM_ERROR,
         "FaultNotifier (%P|%t) quit on idle: connects %d, disconnects %d\n",
-        ACE_static_cast (unsigned int, this->consumer_connects_),
-        ACE_static_cast (unsigned int, this->consumer_disconnects_)
+        static_cast<unsigned int> (this->consumer_connects_),
+        static_cast<unsigned int> (this->consumer_disconnects_)
         ));
       this->poa_->deactivate_object (this->object_id_.in ()
                    ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index ab820df236c..dd1d000722d 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -21,6 +21,7 @@
 #define TAO_FT_NOTIFIER_I_H_
 #include /**/ "ace/pre.h"
 #include "ace/ACE.h"
+#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
index ae081aaa722..071207bca3a 100644
--- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
+++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : taoserver, orbsvcsexe, fault_tolerance, notification_serv {
+project : taoserver, orbsvcsexe, core, fault_tolerance, notification_serv {
   exename  = Fault_Notifier
   Source_Files {
     FT_Notifier_i.cpp
diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am
index 68c4b852343..8c0c899723f 100644
--- a/TAO/orbsvcs/Fault_Notifier/Makefile.am
+++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am
@@ -10,7 +10,7 @@ TAO_BUILDDIR = $(top_builddir)
 if BUILD_ACE_UUID
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = Fault_Notifier
+bin_PROGRAMS = Fault_Notifier
 
 Fault_Notifier_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index b48a0e9ecdb..505afb05051 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -4,15 +4,15 @@
 #include "IFR_Service.h"
 #include "tao/Environment.h"
 
-ACE_RCSID(IFR_Service, IFR_Server, "$Id$")
+ACE_RCSID (IFR_Service, 
+           IFR_Server,
+           "$Id$")
 
 int
 main (int argc, char *argv[])
 {
   IFR_Service server;
 
-  ACE_DEBUG ((LM_DEBUG, "TAO Interface Repository\n"));
-
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index f598d35bb93..327ecfa4ae2 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -41,7 +41,9 @@ IFR_Service::init (int argc,
                                                    argv,
                                                    this->orb_.in ());
       if (result == -1)
-        return result;
+        {
+          return result;
+        }
 
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index b4b7e88117d..85c9f9b9ddb 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -3,8 +3,12 @@
 
 // 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, core, ifrservice, typecodefactory, svc_utils, ifr_client, iortable, portableserver, crosscompile {
+project(IFR_Service) : orbsvcsexe, core, ifrservice, ifr_client, portableserver, crosscompile {
   exename = IFR_Service
+  
+  IDL_Files {
+  }
+  
   Source_Files {
     IFR_Server.cpp
     IFR_Service.cpp
@@ -38,7 +42,7 @@ project(TAO_IFR_BE) : taolib, core, ifr_client, crosscompile, minimum_corba {
 }
 
 
-project(TAO_IFR_EXE) : taoexe, core, ifr_client, crosscompile, minimum_corba {
+project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, minimum_corba {
   after          += TAO_IFR_BE TAO_IDL_FE
   exename         = tao_ifr
   libs           += TAO_IFR_BE TAO TAO_IDL_FE
@@ -51,14 +55,12 @@ project(TAO_IFR_EXE) : taoexe, core, ifr_client, crosscompile, minimum_corba {
     else
       CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(subst \\,\\,$(TAO_IDL_PREPROCESSOR))\\\"
     endif
-    
-    VPATH = $(TAO_ROOT)/TAO_IDL $(TAO_ROOT)/TAO_IDL/driver
   }
 
   Source_Files {
-    $(TAO_ROOT)/TAO_IDL/driver/drv_args.cpp
-    $(TAO_ROOT)/TAO_IDL/driver/drv_preproc.cpp
-    $(TAO_ROOT)/TAO_IDL/tao_idl.cpp
+    drv_args.cpp
+    drv_preproc.cpp
+    tao_idl.cpp
   }
   
   Header_Files {
diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp
index abe656a82c2..c9eafd3de5a 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_global.cpp
@@ -31,9 +31,13 @@ TAO_IFR_BE_Export BE_GlobalData *be_global = 0;
 BE_GlobalData::BE_GlobalData (void)
   : removing_ (I_FALSE),
     holding_scope_name_ (CORBA::string_dup ("TAO_IFR_holding_scope_module")),
+    filename_ (0),
     enable_locking_ (I_FALSE),
     do_included_files_ (I_TRUE)
 {
+  // At this point, the FE has been initialized.  We can
+  // now instruct it that we want to preserve c++ keywords.
+  idl_global->preserve_cpp_keywords (I_TRUE);
 }
 
 BE_GlobalData::~BE_GlobalData (void)
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 4099b328eba..017c1402ec3 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -31,7 +31,7 @@ BE_save_orb_args (int &argc, char *argv[])
 
           // If the arg ends with either .idl or .pidl, we're done.
 
-          int len = ACE_static_cast (int, tmp.length ());
+          int len = static_cast<int> (tmp.length ());
           int pos = tmp.find (".idl");
 
           if (len - pos == 4)
@@ -62,7 +62,7 @@ BE_save_orb_args (int &argc, char *argv[])
   return 0;
 }
 
-// ac must be passed in by reference, because it is also
+// 'ac' must be passed in by reference, because it is also
 // passed by reference to ORB_init, which may modify it.
 // After BE_ifr_init returns to main() the modified argc
 // must be passed to DRV_parse_args().
@@ -109,6 +109,8 @@ BE_init (int &argc, char *argv[])
       return status;
     }
     
+  idl_global->using_ifr_backend (true);
+    
   return BE_ifr_orb_init (argc, argv);
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 656ef68579f..20661a2d020 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -211,8 +211,8 @@ BE_produce (void)
           return;
         }
 
-//      BE_create_holding_scope (ACE_ENV_SINGLE_ARG_PARAMETER);
-//      ACE_TRY_CHECK;
+      BE_create_holding_scope (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       // Get the root node.
       AST_Decl *d = idl_global->root ();
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff
deleted file mode 100644
index 2f6b9ce3def..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff
+++ /dev/null
@@ -1,563 +0,0 @@
---- orig/IFR_BaseS.cpp	Mon Apr 30 22:22:30 2001
-+++ IFR_BaseS.cpp	Fri May 11 00:03:12 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,8 +19,8 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_IFR_BASES_CPP_
--#define _TAO_IDL_IFR_BASES_CPP_
-+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_
-+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_
- 
- #include "IFR_BaseS.h"
- 
-@@ -36,6 +36,7 @@
- #endif  /* TAO_HAS_INTERCEPTORS == 1 */
- 
- #include "ace/Dynamic_Service.h"
-+
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus
- #endif /* __BORLANDC__ */
-@@ -51,7 +52,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:29 */
-+/* starting time is 12:14:19 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -147,7 +148,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:29 */
-+/* ending time is 12:14:19 */
- static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -528,7 +529,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_IRObject_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_IRObject:1.0"
-+          "IDL:omg.org/CORBA/IRObject:1.0"
-         )
-     )->def_kind (
-         ACE_TRY_ENV
-@@ -557,7 +558,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_IRObject_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_IRObject:1.0"
-+          "IDL:omg.org/CORBA/IRObject:1.0"
-         )
-     )->destroy (
-         ACE_TRY_ENV
-@@ -831,7 +832,7 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -842,7 +843,7 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -856,7 +857,7 @@
- 
- const char* POA_CORBA_IRObject::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_IRObject:1.0";
-+  return "IDL:omg.org/CORBA/IRObject:1.0";
- }
- 
- CORBA_IRObject*
-@@ -884,7 +885,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:29 */
-+/* starting time is 12:14:19 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -1011,7 +1012,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:29 */
-+/* ending time is 12:14:19 */
- static TAO_CORBA_Contained_Perfect_Hash_OpTable tao_CORBA_Contained_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -2526,7 +2527,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->id (
-         ACE_TRY_ENV
-@@ -2556,7 +2557,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->id (
-         id,
-@@ -2589,7 +2590,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->name (
-         ACE_TRY_ENV
-@@ -2619,7 +2620,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->name (
-         name,
-@@ -2652,7 +2653,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->version (
-         ACE_TRY_ENV
-@@ -2682,7 +2683,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->version (
-         version,
-@@ -2715,7 +2716,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->defined_in (
-         ACE_TRY_ENV
-@@ -2746,7 +2747,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->absolute_name (
-         ACE_TRY_ENV
-@@ -2777,7 +2778,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->containing_repository (
-         ACE_TRY_ENV
-@@ -2808,7 +2809,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->describe (
-         ACE_TRY_ENV
-@@ -2840,7 +2841,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_Contained_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Contained:1.0"
-+          "IDL:omg.org/CORBA/Contained:1.0"
-         )
-     )->move (
-         new_container,
-@@ -3853,8 +3854,8 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -3865,9 +3866,9 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -3881,7 +3882,7 @@
- 
- const char* POA_CORBA_Contained::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_Contained:1.0";
-+  return "IDL:omg.org/CORBA/Contained:1.0";
- }
- 
- CORBA_Contained*
-@@ -3909,7 +3910,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:29 */
-+/* starting time is 12:14:19 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -4042,7 +4043,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:29 */
-+/* ending time is 12:14:19 */
- static TAO_CORBA_Container_Perfect_Hash_OpTable tao_CORBA_Container_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -6945,7 +6946,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->lookup (
-         search_name,
-@@ -6979,7 +6980,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->contents (
-         limit_type,
-@@ -7016,7 +7017,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->lookup_name (
-         search_name,
-@@ -7054,7 +7055,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->describe_contents (
-         limit_type,
-@@ -7091,7 +7092,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_module (
-         id,
-@@ -7130,7 +7131,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_constant (
-         id,
-@@ -7170,7 +7171,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_struct (
-         id,
-@@ -7210,7 +7211,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_union (
-         id,
-@@ -7250,7 +7251,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_enum (
-         id,
-@@ -7289,7 +7290,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_alias (
-         id,
-@@ -7328,7 +7329,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_interface (
-         id,
-@@ -7373,7 +7374,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_value (
-         id,
-@@ -7418,7 +7419,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_value_box (
-         id,
-@@ -7457,7 +7458,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_exception (
-         id,
-@@ -7495,7 +7496,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_native (
-         id,
-@@ -7533,7 +7534,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_abstract_interface (
-         id,
-@@ -7572,7 +7573,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Container_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Container:1.0"
-+          "IDL:omg.org/CORBA/Container:1.0"
-         )
-     )->create_local_interface (
-         id,
-@@ -9418,8 +9419,8 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -9430,9 +9431,9 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -9446,7 +9447,7 @@
- 
- const char* POA_CORBA_Container::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_Container:1.0";
-+  return "IDL:omg.org/CORBA/Container:1.0";
- }
- 
- CORBA_Container*
-@@ -9474,7 +9475,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:30 */
-+/* starting time is 12:14:19 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -9571,7 +9572,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:30 */
-+/* ending time is 12:14:19 */
- static TAO_CORBA_IDLType_Perfect_Hash_OpTable tao_CORBA_IDLType_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -9841,7 +9842,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_IDLType_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_IDLType:1.0"
-+          "IDL:omg.org/CORBA/IDLType:1.0"
-         )
-     )->type (
-         ACE_TRY_ENV
-@@ -10046,8 +10047,8 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -10058,9 +10059,9 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -10074,7 +10075,7 @@
- 
- const char* POA_CORBA_IDLType::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_IDLType:1.0";
-+  return "IDL:omg.org/CORBA/IDLType:1.0";
- }
- 
- CORBA_IDLType*
-@@ -10102,7 +10103,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:30 */
-+/* starting time is 12:14:19 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -10230,7 +10231,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:30 */
-+/* ending time is 12:14:19 */
- static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -10473,10 +10474,10 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -10487,13 +10488,13 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -10507,7 +10508,7 @@
- 
- const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_TypedefDef:1.0";
-+  return "IDL:omg.org/CORBA/TypedefDef:1.0";
- }
- 
- CORBA_TypedefDef*
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
deleted file mode 100644
index ef31bb029eb..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
+++ /dev/null
@@ -1,201 +0,0 @@
---- orig/IFR_BaseS.h	Mon Apr 30 22:22:30 2001
-+++ IFR_BaseS.h	Mon Apr 30 22:27:06 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,11 +19,11 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_IFR_BASES_H_
--#define _TAO_IDL_IFR_BASES_H_
-+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_H_
-+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_H_
- 
- #include "ace/pre.h"
--#include "IFR_BaseC.h"
-+#include "tao/IFR_Client/IFR_BaseC.h"
- 
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
-@@ -46,11 +46,6 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
--TAO_NAMESPACE  POA_CORBA
--{
--}
--TAO_NAMESPACE_CLOSE // module CORBA
--
- class POA_CORBA_IRObject;
- typedef POA_CORBA_IRObject *POA_CORBA_IRObject_ptr;
- // Forward Classes Declaration
-@@ -168,6 +163,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -175,6 +171,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -225,14 +223,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_Contained;
- typedef POA_CORBA_Contained *POA_CORBA_Contained_ptr;
- // Forward Classes Declaration
-@@ -516,6 +513,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -523,6 +521,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -653,14 +653,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_Container;
- typedef POA_CORBA_Container *POA_CORBA_Container_ptr;
- // Forward Classes Declaration
-@@ -1102,6 +1101,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -1109,6 +1109,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -1349,14 +1351,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_IDLType;
- typedef POA_CORBA_IDLType *POA_CORBA_IDLType_ptr;
- // Forward Classes Declaration
-@@ -1474,6 +1475,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -1481,6 +1483,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -1525,14 +1529,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_TypedefDef;
- typedef POA_CORBA_TypedefDef *POA_CORBA_TypedefDef_ptr;
- // Forward Classes Declaration
-@@ -1730,6 +1733,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -1737,6 +1741,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -1774,13 +1780,12 @@
-   
-   virtual ~_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl (void) { }
-   
--  
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
--
- 
- #include "IFR_BaseS_T.h"
- 
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.i.diff
deleted file mode 100644
index ad727c94862..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.i.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/IFR_BaseS.i	Mon Apr 23 20:55:58 2001
-+++ IFR_BaseS.i	Mon Apr 23 18:37:21 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.cpp.diff
deleted file mode 100644
index 858919e756d..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.cpp.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/IFR_BaseS_T.cpp	Mon Apr 23 20:55:58 2001
-+++ IFR_BaseS_T.cpp	Mon Apr 23 18:43:36 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.h.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.h.diff
+++ /dev/null
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.i.diff
+++ /dev/null
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff
deleted file mode 100644
index 4aaacd4d2c0..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff
+++ /dev/null
@@ -1,1882 +0,0 @@
---- orig/IFR_BasicS.cpp	Mon Apr 30 22:22:33 2001
-+++ IFR_BasicS.cpp	Fri May 11 00:01:55 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,8 +19,8 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_IFR_BASICS_CPP_
--#define _TAO_IDL_IFR_BASICS_CPP_
-+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_
-+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_
- 
- #include "IFR_BasicS.h"
- 
-@@ -51,7 +51,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:32 */
-+/* starting time is 13:56:20 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -194,7 +194,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:32 */
-+/* ending time is 13:56:20 */
- static TAO_CORBA_Repository_Perfect_Hash_OpTable tao_CORBA_Repository_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -1444,7 +1444,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Repository_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Repository:1.0"
-+          "IDL:omg.org/CORBA/Repository:1.0"
-         )
-     )->lookup_id (
-         search_id,
-@@ -1477,7 +1477,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Repository_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Repository:1.0"
-+          "IDL:omg.org/CORBA/Repository:1.0"
-         )
-     )->get_canonical_typecode (
-         tc,
-@@ -1510,7 +1510,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Repository_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Repository:1.0"
-+          "IDL:omg.org/CORBA/Repository:1.0"
-         )
-     )->get_primitive (
-         kind,
-@@ -1543,7 +1543,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Repository_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Repository:1.0"
-+          "IDL:omg.org/CORBA/Repository:1.0"
-         )
-     )->create_string (
-         bound,
-@@ -1576,7 +1576,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Repository_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Repository:1.0"
-+          "IDL:omg.org/CORBA/Repository:1.0"
-         )
-     )->create_wstring (
-         bound,
-@@ -1610,7 +1610,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Repository_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Repository:1.0"
-+          "IDL:omg.org/CORBA/Repository:1.0"
-         )
-     )->create_sequence (
-         bound,
-@@ -1645,7 +1645,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Repository_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Repository:1.0"
-+          "IDL:omg.org/CORBA/Repository:1.0"
-         )
-     )->create_array (
-         length,
-@@ -1680,7 +1680,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_Repository_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_Repository:1.0"
-+          "IDL:omg.org/CORBA/Repository:1.0"
-         )
-     )->create_fixed (
-         digits,
-@@ -2532,9 +2532,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -2545,11 +2545,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Repository:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Repository:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Repository_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -2563,7 +2563,7 @@
- 
- const char* POA_CORBA_Repository::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_Repository:1.0";
-+  return "IDL:omg.org/CORBA/Repository:1.0";
- }
- 
- CORBA_Repository*
-@@ -2591,7 +2591,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:32 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -2737,7 +2737,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:32 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -2980,10 +2980,10 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ModuleDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -2994,13 +2994,13 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ModuleDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ModuleDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_ModuleDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -3014,7 +3014,7 @@
- 
- const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_ModuleDef:1.0";
-+  return "IDL:omg.org/CORBA/ModuleDef:1.0";
- }
- 
- CORBA_ModuleDef*
-@@ -3042,7 +3042,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:32 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -3174,7 +3174,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:32 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_ConstantDef_Perfect_Hash_OpTable tao_CORBA_ConstantDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -3935,7 +3935,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ConstantDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ConstantDef:1.0"
-+          "IDL:omg.org/CORBA/ConstantDef:1.0"
-         )
-     )->type (
-         ACE_TRY_ENV
-@@ -3966,7 +3966,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ConstantDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ConstantDef:1.0"
-+          "IDL:omg.org/CORBA/ConstantDef:1.0"
-         )
-     )->type_def (
-         ACE_TRY_ENV
-@@ -3996,7 +3996,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ConstantDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ConstantDef:1.0"
-+          "IDL:omg.org/CORBA/ConstantDef:1.0"
-         )
-     )->type_def (
-         type_def,
-@@ -4029,7 +4029,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ConstantDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ConstantDef:1.0"
-+          "IDL:omg.org/CORBA/ConstantDef:1.0"
-         )
-     )->value (
-         ACE_TRY_ENV
-@@ -4059,7 +4059,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ConstantDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ConstantDef:1.0"
-+          "IDL:omg.org/CORBA/ConstantDef:1.0"
-         )
-     )->value (
-         value,
-@@ -4585,9 +4585,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ConstantDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -4598,11 +4598,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ConstantDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstantDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_ConstantDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -4616,7 +4616,7 @@
- 
- const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_ConstantDef:1.0";
-+  return "IDL:omg.org/CORBA/ConstantDef:1.0";
- }
- 
- CORBA_ConstantDef*
-@@ -4644,7 +4644,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -4793,7 +4793,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_StructDef_Perfect_Hash_OpTable tao_CORBA_StructDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -5186,7 +5186,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_StructDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_StructDef:1.0"
-+          "IDL:omg.org/CORBA/StructDef:1.0"
-         )
-     )->members (
-         ACE_TRY_ENV
-@@ -5216,7 +5216,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_StructDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_StructDef:1.0"
-+          "IDL:omg.org/CORBA/StructDef:1.0"
-         )
-     )->members (
-         members,
-@@ -5506,12 +5506,12 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StructDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -5522,17 +5522,17 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StructDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StructDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_StructDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -5546,7 +5546,7 @@
- 
- const char* POA_CORBA_StructDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_StructDef:1.0";
-+  return "IDL:omg.org/CORBA/StructDef:1.0";
- }
- 
- CORBA_StructDef*
-@@ -5574,7 +5574,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -5726,7 +5726,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_UnionDef_Perfect_Hash_OpTable tao_CORBA_UnionDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -6488,7 +6488,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_UnionDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_UnionDef:1.0"
-+          "IDL:omg.org/CORBA/UnionDef:1.0"
-         )
-     )->discriminator_type (
-         ACE_TRY_ENV
-@@ -6519,7 +6519,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_UnionDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_UnionDef:1.0"
-+          "IDL:omg.org/CORBA/UnionDef:1.0"
-         )
-     )->discriminator_type_def (
-         ACE_TRY_ENV
-@@ -6549,7 +6549,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_UnionDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_UnionDef:1.0"
-+          "IDL:omg.org/CORBA/UnionDef:1.0"
-         )
-     )->discriminator_type_def (
-         discriminator_type_def,
-@@ -6582,7 +6582,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_UnionDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_UnionDef:1.0"
-+          "IDL:omg.org/CORBA/UnionDef:1.0"
-         )
-     )->members (
-         ACE_TRY_ENV
-@@ -6612,7 +6612,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_UnionDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_UnionDef:1.0"
-+          "IDL:omg.org/CORBA/UnionDef:1.0"
-         )
-     )->members (
-         members,
-@@ -7141,12 +7141,12 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_UnionDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -7157,17 +7157,17 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_UnionDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/UnionDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_UnionDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -7181,7 +7181,7 @@
- 
- const char* POA_CORBA_UnionDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_UnionDef:1.0";
-+  return "IDL:omg.org/CORBA/UnionDef:1.0";
- }
- 
- CORBA_UnionDef*
-@@ -7209,7 +7209,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -7339,7 +7339,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_EnumDef_Perfect_Hash_OpTable tao_CORBA_EnumDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -7732,7 +7732,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_EnumDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_EnumDef:1.0"
-+          "IDL:omg.org/CORBA/EnumDef:1.0"
-         )
-     )->members (
-         ACE_TRY_ENV
-@@ -7762,7 +7762,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_EnumDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_EnumDef:1.0"
-+          "IDL:omg.org/CORBA/EnumDef:1.0"
-         )
-     )->members (
-         members,
-@@ -8051,11 +8051,11 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_EnumDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -8066,15 +8066,15 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_EnumDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/EnumDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_EnumDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -8088,7 +8088,7 @@
- 
- const char* POA_CORBA_EnumDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_EnumDef:1.0";
-+  return "IDL:omg.org/CORBA/EnumDef:1.0";
- }
- 
- CORBA_EnumDef*
-@@ -8116,7 +8116,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -8246,7 +8246,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_AliasDef_Perfect_Hash_OpTable tao_CORBA_AliasDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -8639,7 +8639,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_AliasDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_AliasDef:1.0"
-+          "IDL:omg.org/CORBA/AliasDef:1.0"
-         )
-     )->original_type_def (
-         ACE_TRY_ENV
-@@ -8669,7 +8669,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_AliasDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_AliasDef:1.0"
-+          "IDL:omg.org/CORBA/AliasDef:1.0"
-         )
-     )->original_type_def (
-         original_type_def,
-@@ -8958,11 +8958,11 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AliasDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -8973,15 +8973,15 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AliasDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AliasDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_AliasDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -8995,7 +8995,7 @@
- 
- const char* POA_CORBA_AliasDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_AliasDef:1.0";
-+  return "IDL:omg.org/CORBA/AliasDef:1.0";
- }
- 
- CORBA_AliasDef*
-@@ -9023,7 +9023,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -9151,7 +9151,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -9395,11 +9395,11 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_NativeDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -9410,15 +9410,15 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_NativeDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/NativeDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_NativeDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -9432,7 +9432,7 @@
- 
- const char* POA_CORBA_NativeDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_NativeDef:1.0";
-+  return "IDL:omg.org/CORBA/NativeDef:1.0";
- }
- 
- CORBA_NativeDef*
-@@ -9460,7 +9460,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -9558,7 +9558,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable tao_CORBA_PrimitiveDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -9828,7 +9828,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_PrimitiveDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_PrimitiveDef:1.0"
-+          "IDL:omg.org/CORBA/PrimitiveDef:1.0"
-         )
-     )->kind (
-         ACE_TRY_ENV
-@@ -10033,9 +10033,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_PrimitiveDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -10046,11 +10046,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_PrimitiveDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PrimitiveDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_PrimitiveDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -10064,7 +10064,7 @@
- 
- const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_PrimitiveDef:1.0";
-+  return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
- }
- 
- CORBA_PrimitiveDef*
-@@ -10092,7 +10092,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -10210,7 +10210,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_StringDef_Perfect_Hash_OpTable tao_CORBA_StringDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -10602,7 +10602,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_StringDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_StringDef:1.0"
-+          "IDL:omg.org/CORBA/StringDef:1.0"
-         )
-     )->bound (
-         ACE_TRY_ENV
-@@ -10632,7 +10632,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_StringDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_StringDef:1.0"
-+          "IDL:omg.org/CORBA/StringDef:1.0"
-         )
-     )->bound (
-         bound,
-@@ -10918,9 +10918,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StringDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -10931,11 +10931,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StringDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StringDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_StringDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -10949,7 +10949,7 @@
- 
- const char* POA_CORBA_StringDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_StringDef:1.0";
-+  return "IDL:omg.org/CORBA/StringDef:1.0";
- }
- 
- CORBA_StringDef*
-@@ -10977,7 +10977,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -11095,7 +11095,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_WstringDef_Perfect_Hash_OpTable tao_CORBA_WstringDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -11487,7 +11487,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_WstringDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_WstringDef:1.0"
-+          "IDL:omg.org/CORBA/WstringDef:1.0"
-         )
-     )->bound (
-         ACE_TRY_ENV
-@@ -11517,7 +11517,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_WstringDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_WstringDef:1.0"
-+          "IDL:omg.org/CORBA/WstringDef:1.0"
-         )
-     )->bound (
-         bound,
-@@ -11803,9 +11803,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_WstringDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -11816,11 +11816,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_WstringDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/WstringDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_WstringDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -11834,7 +11834,7 @@
- 
- const char* POA_CORBA_WstringDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_WstringDef:1.0";
-+  return "IDL:omg.org/CORBA/WstringDef:1.0";
- }
- 
- CORBA_WstringDef*
-@@ -11862,7 +11862,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -11871,46 +11871,46 @@
-   static const unsigned char asso_values[] =
-     {
- #if defined (ACE_MVS)
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23,  0,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23,  0,
--     23, 23,  0,  5,  0, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23,  5, 23, 23, 23, 23,  0, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
-+     22, 22,  5,  0,  0, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22,  0, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22,
- #else
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23,  0, 23,  0, 23, 23,
--      0,  5,  0, 23, 23, 23, 23, 23, 23, 23,
--     23, 23, 23, 23, 23, 23,  5, 23, 23, 23,
--     23,  0, 23, 23, 23, 23, 23, 23,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22,  0, 22,  0, 22, 22,
-+      5,  0,  0, 22, 22, 22, 22, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22,  0, 22, 22, 22,
-+     22, 22, 22, 22, 22, 22, 22, 22,
- #endif /* ACE_MVS */
-     };
-   return len + asso_values[str[len - 1]] + asso_values[str[0]];
-@@ -11921,12 +11921,12 @@
- {
-   enum
-     {
--      TOTAL_KEYWORDS = 11,
-+      TOTAL_KEYWORDS = 8,
-       MIN_WORD_LENGTH = 5,
-       MAX_WORD_LENGTH = 21,
-       MIN_HASH_VALUE = 5,
--      MAX_HASH_VALUE = 22,
--      HASH_VALUE_RANGE = 18,
-+      MAX_HASH_VALUE = 21,
-+      HASH_VALUE_RANGE = 17,
-       DUPLICATES = 3
-     };
- 
-@@ -11934,22 +11934,19 @@
-     {
-       {"",0},{"",0},{"",0},{"",0},{"",0},
-       {"_is_a",  &POA_CORBA_SequenceDef::_is_a_skel},
--      {"destroy", 	&POA_CORBA_SequenceDef::destroy_skel},
--      {"_get_bound", 	&POA_CORBA_SequenceDef::_get_bound_skel},
--      {"_set_bound", 	&POA_CORBA_SequenceDef::_set_bound_skel},
--      {"_get_def_kind", 	&POA_CORBA_SequenceDef::_get_def_kind_skel},
--      {"_get_type", 	&POA_CORBA_SequenceDef::_get_type_skel},
-       {"_interface",  &POA_CORBA_SequenceDef::_interface_skel},
-       {"_non_existent",  &POA_CORBA_SequenceDef::_non_existent_skel},
-+      {"_get_bound", 	&POA_CORBA_SequenceDef::_get_bound_skel},
-+      {"_set_bound", 	&POA_CORBA_SequenceDef::_set_bound_skel},
-+      {"_get_element_type", 	&POA_CORBA_SequenceDef::_get_element_type_skel},
-       {"_get_element_type_def", 	&POA_CORBA_SequenceDef::_get_element_type_def_skel},
-       {"_set_element_type_def", 	&POA_CORBA_SequenceDef::_set_element_type_def_skel},
--      {"_get_element_type", 	&POA_CORBA_SequenceDef::_get_element_type_skel},
-     };
- 
-   static const signed char lookup[] =
-     {
--       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -24,  -1,  -1,   9, 
--       10,  11,  -1,  -1,  12, -13,  -2, -24,  15, 
-+       -1,  -1,  -1,  -1,  -1,   5,  -1,  -1,  -1,  -1,   6,  -8,  -2,   7, 
-+       -1, -25,  -1,  10,  -1, -11,  -2, -23, 
-     };
- 
-   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -11983,7 +11980,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_SequenceDef_Perfect_Hash_OpTable tao_CORBA_SequenceDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -12744,7 +12741,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_SequenceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_SequenceDef:1.0"
-+          "IDL:omg.org/CORBA/SequenceDef:1.0"
-         )
-     )->bound (
-         ACE_TRY_ENV
-@@ -12774,7 +12771,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_SequenceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_SequenceDef:1.0"
-+          "IDL:omg.org/CORBA/SequenceDef:1.0"
-         )
-     )->bound (
-         bound,
-@@ -12807,7 +12804,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_SequenceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_SequenceDef:1.0"
-+          "IDL:omg.org/CORBA/SequenceDef:1.0"
-         )
-     )->element_type (
-         ACE_TRY_ENV
-@@ -12838,7 +12835,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_SequenceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_SequenceDef:1.0"
-+          "IDL:omg.org/CORBA/SequenceDef:1.0"
-         )
-     )->element_type_def (
-         ACE_TRY_ENV
-@@ -12868,7 +12865,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_SequenceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_SequenceDef:1.0"
-+          "IDL:omg.org/CORBA/SequenceDef:1.0"
-         )
-     )->element_type_def (
-         element_type_def,
-@@ -13393,9 +13390,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_SequenceDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -13406,11 +13403,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_SequenceDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/SequenceDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_SequenceDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -13424,7 +13421,7 @@
- 
- const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_SequenceDef:1.0";
-+  return "IDL:omg.org/CORBA/SequenceDef:1.0";
- }
- 
- CORBA_SequenceDef*
-@@ -13452,7 +13449,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -13573,7 +13570,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_ArrayDef_Perfect_Hash_OpTable tao_CORBA_ArrayDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -14334,7 +14331,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ArrayDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ArrayDef:1.0"
-+          "IDL:omg.org/CORBA/ArrayDef:1.0"
-         )
-     )->length (
-         ACE_TRY_ENV
-@@ -14364,7 +14361,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ArrayDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ArrayDef:1.0"
-+          "IDL:omg.org/CORBA/ArrayDef:1.0"
-         )
-     )->length (
-         length,
-@@ -14397,7 +14394,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ArrayDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ArrayDef:1.0"
-+          "IDL:omg.org/CORBA/ArrayDef:1.0"
-         )
-     )->element_type (
-         ACE_TRY_ENV
-@@ -14428,7 +14425,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ArrayDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ArrayDef:1.0"
-+          "IDL:omg.org/CORBA/ArrayDef:1.0"
-         )
-     )->element_type_def (
-         ACE_TRY_ENV
-@@ -14458,7 +14455,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ArrayDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ArrayDef:1.0"
-+          "IDL:omg.org/CORBA/ArrayDef:1.0"
-         )
-     )->element_type_def (
-         element_type_def,
-@@ -14983,9 +14980,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ArrayDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -14996,11 +14993,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ArrayDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ArrayDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_ArrayDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -15014,7 +15011,7 @@
- 
- const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_ArrayDef:1.0";
-+  return "IDL:omg.org/CORBA/ArrayDef:1.0";
- }
- 
- CORBA_ArrayDef*
-@@ -15042,7 +15039,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -15191,7 +15188,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable tao_CORBA_ExceptionDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -15707,7 +15704,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ExceptionDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ExceptionDef:1.0"
-+          "IDL:omg.org/CORBA/ExceptionDef:1.0"
-         )
-     )->type (
-         ACE_TRY_ENV
-@@ -15738,7 +15735,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ExceptionDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ExceptionDef:1.0"
-+          "IDL:omg.org/CORBA/ExceptionDef:1.0"
-         )
-     )->members (
-         ACE_TRY_ENV
-@@ -15768,7 +15765,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ExceptionDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ExceptionDef:1.0"
-+          "IDL:omg.org/CORBA/ExceptionDef:1.0"
-         )
-     )->members (
-         members,
-@@ -16136,10 +16133,10 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ExceptionDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -16150,13 +16147,13 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ExceptionDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ExceptionDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_ExceptionDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -16170,7 +16167,7 @@
- 
- const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_ExceptionDef:1.0";
-+  return "IDL:omg.org/CORBA/ExceptionDef:1.0";
- }
- 
- CORBA_ExceptionDef*
-@@ -16198,7 +16195,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -16330,7 +16327,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_AttributeDef_Perfect_Hash_OpTable tao_CORBA_AttributeDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -17092,7 +17089,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_AttributeDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_AttributeDef:1.0"
-+          "IDL:omg.org/CORBA/AttributeDef:1.0"
-         )
-     )->type (
-         ACE_TRY_ENV
-@@ -17123,7 +17120,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_AttributeDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_AttributeDef:1.0"
-+          "IDL:omg.org/CORBA/AttributeDef:1.0"
-         )
-     )->type_def (
-         ACE_TRY_ENV
-@@ -17153,7 +17150,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_AttributeDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_AttributeDef:1.0"
-+          "IDL:omg.org/CORBA/AttributeDef:1.0"
-         )
-     )->type_def (
-         type_def,
-@@ -17186,7 +17183,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_AttributeDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_AttributeDef:1.0"
-+          "IDL:omg.org/CORBA/AttributeDef:1.0"
-         )
-     )->mode (
-         ACE_TRY_ENV
-@@ -17216,7 +17213,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_AttributeDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_AttributeDef:1.0"
-+          "IDL:omg.org/CORBA/AttributeDef:1.0"
-         )
-     )->mode (
-         mode,
-@@ -17741,9 +17738,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AttributeDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -17754,11 +17751,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AttributeDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AttributeDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_AttributeDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -17772,7 +17769,7 @@
- 
- const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_AttributeDef:1.0";
-+  return "IDL:omg.org/CORBA/AttributeDef:1.0";
- }
- 
- CORBA_AttributeDef*
-@@ -17800,7 +17797,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -17989,7 +17986,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_OperationDef_Perfect_Hash_OpTable tao_CORBA_OperationDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -19489,7 +19486,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->result (
-         ACE_TRY_ENV
-@@ -19520,7 +19517,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->result_def (
-         ACE_TRY_ENV
-@@ -19550,7 +19547,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->result_def (
-         result_def,
-@@ -19583,7 +19580,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->params (
-         ACE_TRY_ENV
-@@ -19613,7 +19610,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->params (
-         params,
-@@ -19646,7 +19643,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->mode (
-         ACE_TRY_ENV
-@@ -19676,7 +19673,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->mode (
-         mode,
-@@ -19709,7 +19706,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->contexts (
-         ACE_TRY_ENV
-@@ -19739,7 +19736,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->contexts (
-         contexts,
-@@ -19772,7 +19769,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->exceptions (
-         ACE_TRY_ENV
-@@ -19802,7 +19799,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_OperationDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_OperationDef:1.0"
-+          "IDL:omg.org/CORBA/OperationDef:1.0"
-         )
-     )->exceptions (
-         exceptions,
-@@ -20804,9 +20801,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -20817,11 +20814,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -20835,7 +20832,7 @@
- 
- const char* POA_CORBA_OperationDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_OperationDef:1.0";
-+  return "IDL:omg.org/CORBA/OperationDef:1.0";
- }
- 
- CORBA_OperationDef*
-@@ -20863,7 +20860,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -21017,7 +21014,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -22041,7 +22038,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_InterfaceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_InterfaceDef:1.0"
-+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-         )
-     )->base_interfaces (
-         ACE_TRY_ENV
-@@ -22071,7 +22068,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_InterfaceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_InterfaceDef:1.0"
-+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-         )
-     )->base_interfaces (
-         base_interfaces,
-@@ -22105,7 +22102,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_InterfaceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_InterfaceDef:1.0"
-+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-         )
-     )->is_a (
-         interface_id,
-@@ -22137,7 +22134,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_InterfaceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_InterfaceDef:1.0"
-+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-         )
-     )->describe_interface (
-         ACE_TRY_ENV
-@@ -22173,7 +22170,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_InterfaceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_InterfaceDef:1.0"
-+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-         )
-     )->create_attribute (
-         id,
-@@ -22217,7 +22214,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_InterfaceDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_InterfaceDef:1.0"
-+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-         )
-     )->create_operation (
-         id,
-@@ -22902,11 +22899,11 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -22917,15 +22914,15 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -22939,7 +22936,7 @@
- 
- const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_InterfaceDef:1.0";
-+  return "IDL:omg.org/CORBA/InterfaceDef:1.0";
- }
- 
- CORBA_InterfaceDef*
-@@ -22967,7 +22964,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:21 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -23121,7 +23118,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:21 */
- static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInterfaceDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -23366,12 +23363,12 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -23382,17 +23379,17 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_AbstractInterfaceDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -23406,7 +23403,7 @@
- 
- const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0";
-+  return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
- }
- 
- CORBA_AbstractInterfaceDef*
-@@ -23434,7 +23431,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:33 */
-+/* starting time is 13:56:22 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -23588,7 +23585,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:33 */
-+/* ending time is 13:56:22 */
- static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterfaceDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -23833,12 +23830,12 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -23849,17 +23846,17 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_LocalInterfaceDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -23873,7 +23870,7 @@
- 
- const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_LocalInterfaceDef:1.0";
-+  return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0";
- }
- 
- CORBA_LocalInterfaceDef*
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
deleted file mode 100644
index ce3c642d39b..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
+++ /dev/null
@@ -1,664 +0,0 @@
---- orig/IFR_BasicS.h	Mon Apr 30 22:22:33 2001
-+++ IFR_BasicS.h	Mon Apr 30 22:31:49 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,12 +19,12 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_IFR_BASICS_H_
--#define _TAO_IDL_IFR_BASICS_H_
-+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_H_
-+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_H_
- 
- #include "ace/pre.h"
- #include "IFR_BaseS.h"
--#include "IFR_BasicC.h"
-+#include "tao/IFR_Client/IFR_BasicC.h"
- 
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
-@@ -47,11 +47,6 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
--TAO_NAMESPACE  POA_CORBA
--{
--}
--TAO_NAMESPACE_CLOSE // module CORBA
--
- class POA_CORBA_Repository;
- typedef POA_CORBA_Repository *POA_CORBA_Repository_ptr;
- // Forward Classes Declaration
-@@ -428,6 +423,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -435,6 +431,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -546,14 +544,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_ModuleDef;
- typedef POA_CORBA_ModuleDef *POA_CORBA_ModuleDef_ptr;
- // Forward Classes Declaration
-@@ -879,6 +876,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -886,6 +884,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -923,14 +923,13 @@
-   
-   virtual ~_TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void) { }
-   
--  
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_ConstantDef;
- typedef POA_CORBA_ConstantDef *POA_CORBA_ConstantDef_ptr;
- // Forward Classes Declaration
-@@ -1202,6 +1201,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -1209,6 +1209,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -1287,14 +1289,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_StructDef;
- typedef POA_CORBA_StructDef *POA_CORBA_StructDef_ptr;
- // Forward Classes Declaration
-@@ -1661,6 +1662,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -1668,6 +1670,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -1722,14 +1726,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_UnionDef;
- typedef POA_CORBA_UnionDef *POA_CORBA_UnionDef_ptr;
- // Forward Classes Declaration
-@@ -2145,6 +2148,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -2152,6 +2156,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -2231,14 +2237,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_EnumDef;
- typedef POA_CORBA_EnumDef *POA_CORBA_EnumDef_ptr;
- // Forward Classes Declaration
-@@ -2469,6 +2474,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -2476,6 +2482,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -2529,14 +2537,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_AliasDef;
- typedef POA_CORBA_AliasDef *POA_CORBA_AliasDef_ptr;
- // Forward Classes Declaration
-@@ -2767,6 +2774,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -2774,6 +2782,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -2827,14 +2837,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_NativeDef;
- typedef POA_CORBA_NativeDef *POA_CORBA_NativeDef_ptr;
- // Forward Classes Declaration
-@@ -3032,6 +3041,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -3039,6 +3049,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -3075,14 +3087,13 @@
-   
-   virtual ~_TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void) { }
-   
--  
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_PrimitiveDef;
- typedef POA_CORBA_PrimitiveDef *POA_CORBA_PrimitiveDef_ptr;
- // Forward Classes Declaration
-@@ -3208,6 +3219,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -3215,6 +3227,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -3259,14 +3273,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_StringDef;
- typedef POA_CORBA_StringDef *POA_CORBA_StringDef_ptr;
- // Forward Classes Declaration
-@@ -3409,6 +3422,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -3416,6 +3430,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -3469,14 +3485,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_WstringDef;
- typedef POA_CORBA_WstringDef *POA_CORBA_WstringDef_ptr;
- // Forward Classes Declaration
-@@ -3619,6 +3634,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -3626,6 +3642,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -3679,14 +3697,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_SequenceDef;
- typedef POA_CORBA_SequenceDef *POA_CORBA_SequenceDef_ptr;
- // Forward Classes Declaration
-@@ -3878,6 +3895,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -3885,6 +3903,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -3963,14 +3983,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_ArrayDef;
- typedef POA_CORBA_ArrayDef *POA_CORBA_ArrayDef_ptr;
- // Forward Classes Declaration
-@@ -4162,6 +4181,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -4169,6 +4189,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -4247,14 +4269,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_ExceptionDef;
- typedef POA_CORBA_ExceptionDef *POA_CORBA_ExceptionDef_ptr;
- // Forward Classes Declaration
-@@ -4629,6 +4650,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -4636,6 +4658,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -4698,14 +4722,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_AttributeDef;
- typedef POA_CORBA_AttributeDef *POA_CORBA_AttributeDef_ptr;
- // Forward Classes Declaration
-@@ -4977,6 +5000,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -4984,6 +5008,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -5062,14 +5088,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_OperationDef;
- typedef POA_CORBA_OperationDef *POA_CORBA_OperationDef_ptr;
- // Forward Classes Declaration
-@@ -5440,6 +5465,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -5447,6 +5473,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -5576,14 +5604,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_InterfaceDef;
- typedef POA_CORBA_InterfaceDef *POA_CORBA_InterfaceDef_ptr;
- // Forward Classes Declaration
-@@ -6028,6 +6055,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -6035,6 +6063,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -6136,14 +6166,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_AbstractInterfaceDef;
- typedef POA_CORBA_AbstractInterfaceDef *POA_CORBA_AbstractInterfaceDef_ptr;
- // Forward Classes Declaration
-@@ -6525,6 +6554,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -6532,6 +6562,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -6568,14 +6600,13 @@
-   
-   virtual ~_TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) { }
-   
--  
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_LocalInterfaceDef;
- typedef POA_CORBA_LocalInterfaceDef *POA_CORBA_LocalInterfaceDef_ptr;
- // Forward Classes Declaration
-@@ -6957,6 +6988,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -6964,6 +6996,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -7000,13 +7034,12 @@
-   
-   virtual ~_TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) { }
-   
--  
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
--
- 
- #include "IFR_BasicS_T.h"
- 
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.i.diff
deleted file mode 100644
index 685cea3cc01..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.i.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/IFR_BasicS.i	Mon Apr 23 20:56:03 2001
-+++ IFR_BasicS.i	Mon Apr 23 21:17:29 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.cpp.diff
deleted file mode 100644
index 9564148f478..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.cpp.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/IFR_BasicS_T.cpp	Mon Apr 23 20:56:03 2001
-+++ IFR_BasicS_T.cpp	Mon Apr 23 19:02:06 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff
+++ /dev/null
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.i.diff
+++ /dev/null
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff
deleted file mode 100644
index 0db2951b717..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff
+++ /dev/null
@@ -1,558 +0,0 @@
---- orig/IFR_ComponentsS.cpp	Mon Apr 30 22:22:39 2001
-+++ IFR_ComponentsS.cpp	Fri May 11 00:03:05 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,8 +19,8 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_IFR_COMPONENTSS_CPP_
--#define _TAO_IDL_IFR_COMPONENTSS_CPP_
-+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_CPP_
-+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_CPP_
- 
- #include "IFR_ComponentsS.h"
- 
-@@ -51,7 +51,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:38 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentRepository_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -196,7 +196,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:38 */
-+/* ending time is 13:56:28 */
- static TAO_IR_ComponentRepository_Perfect_Hash_OpTable tao_IR_ComponentRepository_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -1092,9 +1092,9 @@
-   
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -1107,11 +1107,11 @@
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentRepository:1.0") == 0)
-     return ACE_static_cast (POA_IR::ComponentRepository_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Repository:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Repository:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Repository_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -1153,7 +1153,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:38 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -1281,7 +1281,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:38 */
-+/* ending time is 13:56:28 */
- static TAO_IR_ProvidesDef_Perfect_Hash_OpTable tao_IR_ProvidesDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -1758,8 +1758,8 @@
-   
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -1772,9 +1772,9 @@
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ProvidesDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::ProvidesDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -1816,7 +1816,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:38 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UsesDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -1945,7 +1945,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:38 */
-+/* ending time is 13:56:28 */
- static TAO_IR_UsesDef_Perfect_Hash_OpTable tao_IR_UsesDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -2655,8 +2655,8 @@
-   
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -2669,9 +2669,9 @@
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/UsesDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::UsesDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -2713,7 +2713,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:38 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EventDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -2842,7 +2842,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:38 */
-+/* ending time is 13:56:28 */
- static TAO_IR_EventDef_Perfect_Hash_OpTable tao_IR_EventDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -3574,8 +3574,8 @@
-   
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -3588,9 +3588,9 @@
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::EventDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -3632,7 +3632,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:38 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -3761,7 +3761,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:38 */
-+/* ending time is 13:56:28 */
- static TAO_IR_EmitsDef_Perfect_Hash_OpTable tao_IR_EmitsDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -4006,8 +4006,8 @@
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -4022,9 +4022,9 @@
-     return ACE_static_cast (POA_IR::EmitsDef_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::EventDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -4066,7 +4066,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:38 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -4195,7 +4195,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:38 */
-+/* ending time is 13:56:28 */
- static TAO_IR_PublishesDef_Perfect_Hash_OpTable tao_IR_PublishesDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -4440,8 +4440,8 @@
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -4456,9 +4456,9 @@
-     return ACE_static_cast (POA_IR::PublishesDef_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::EventDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -4500,7 +4500,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:38 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -4629,7 +4629,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:38 */
-+/* ending time is 13:56:28 */
- static TAO_IR_ConsumesDef_Perfect_Hash_OpTable tao_IR_ConsumesDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -4874,8 +4874,8 @@
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -4890,9 +4890,9 @@
-     return ACE_static_cast (POA_IR::ConsumesDef_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::EventDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -4934,7 +4934,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:38 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -5104,7 +5104,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:38 */
-+/* ending time is 13:56:28 */
- static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -8980,11 +8980,11 @@
-   
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -8997,15 +8997,15 @@
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::ComponentDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -9047,7 +9047,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:39 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -9176,7 +9176,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:39 */
-+/* ending time is 13:56:28 */
- static TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable tao_IR_PrimaryKeyDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -9908,8 +9908,8 @@
-   
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -9922,9 +9922,9 @@
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/PrimaryKeyDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::PrimaryKeyDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -9966,7 +9966,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:39 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -10155,7 +10155,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:39 */
-+/* ending time is 13:56:28 */
- static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -10399,9 +10399,9 @@
-   
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -10414,11 +10414,11 @@
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FactoryDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::FactoryDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -10460,7 +10460,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:39 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FinderDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -10649,7 +10649,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:39 */
-+/* ending time is 13:56:28 */
- static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -10893,9 +10893,9 @@
-   
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -10908,11 +10908,11 @@
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FinderDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::FinderDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -10954,7 +10954,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:39 */
-+/* starting time is 13:56:28 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_HomeDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -11118,7 +11118,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:39 */
-+/* ending time is 13:56:28 */
- static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -13705,11 +13705,11 @@
-   
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -13722,15 +13722,15 @@
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/HomeDef:1.0") == 0)
-     return ACE_static_cast (POA_IR::HomeDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
deleted file mode 100644
index 2a03ee5d895..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
+++ /dev/null
@@ -1,370 +0,0 @@
---- orig/IFR_ComponentsS.h	Mon Apr 30 22:22:39 2001
-+++ IFR_ComponentsS.h	Mon Apr 30 22:38:01 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,12 +19,12 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_IFR_COMPONENTSS_H_
--#define _TAO_IDL_IFR_COMPONENTSS_H_
-+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_H_
-+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_H_
- 
- #include "ace/pre.h"
- #include "IFR_ExtendedS.h"
--#include "IFR_ComponentsC.h"
-+#include "tao/IFR_Client/IFR_ComponentsC.h"
- 
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
-@@ -393,6 +393,7 @@
-     );
-   
-   private:
-+  
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -400,6 +401,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+  private:
-+    
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -463,9 +466,9 @@
-         CORBA::SystemException
-       ));
- 
--
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -676,6 +679,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -683,6 +687,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -727,9 +733,9 @@
-         CORBA::SystemException
-       ));
- 
--
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -956,6 +962,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -963,6 +970,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -1015,9 +1024,9 @@
-         CORBA::SystemException
-       ));
- 
--
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -1245,6 +1254,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -1252,6 +1262,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -1305,9 +1317,9 @@
-         CORBA::SystemException
-       ));
- 
--
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -1518,6 +1530,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -1525,6 +1538,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -1561,9 +1576,9 @@
-     
-     virtual ~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void) { }
-     
--    
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -1774,6 +1789,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -1781,6 +1797,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -1817,9 +1835,9 @@
-     
-     virtual ~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void) { }
-     
--    
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -2030,6 +2048,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -2037,6 +2056,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -2073,9 +2094,9 @@
-     
-     virtual ~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void) { }
-     
--    
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -2708,6 +2729,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -2715,6 +2737,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -2885,9 +2909,9 @@
-         CORBA::SystemException
-       ));
- 
--
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -3115,6 +3139,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -3122,6 +3147,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -3175,9 +3202,9 @@
-         CORBA::SystemException
-       ));
- 
--
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -3460,6 +3487,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -3467,6 +3495,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -3503,9 +3533,9 @@
-     
-     virtual ~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void) { }
-     
--    
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -3788,6 +3818,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -3795,6 +3826,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -3831,9 +3864,9 @@
-     
-     virtual ~_TAO_FinderDef_ThruPOA_Proxy_Impl (void) { }
-     
--    
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-@@ -4378,6 +4411,7 @@
-     );
-   
-   private:
-+
-     // Helper methods that takes care to create the proxy
-     // as soon as their use is necessary.
-     void create_proxy (
-@@ -4385,6 +4419,8 @@
-       TAO_ENV_SINGLE_ARG_DECL
-     );
-     
-+private:
-+  
-     // Caches the proxy implementations. The proxy implementation
-     // are totally stateless, and those can be shared by all the
-     // instances of a given IDL interface type.
-@@ -4507,16 +4543,16 @@
-         CORBA::SystemException
-       ));
- 
--
-   };
-   
-+
-   //
-   //                ThruPOA  Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
-   
-   
- }
--TAO_NAMESPACE_CLOSE // module IR
-+TAO_NAMESPACE_CLOSE
- 
- #include "IFR_ComponentsS_T.h"
- 
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.i.diff
deleted file mode 100644
index 2c1ad8b4555..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.i.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/IFR_ComponentsS.i	Mon Apr 23 20:56:09 2001
-+++ IFR_ComponentsS.i	Mon Apr 23 19:19:30 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.cpp.diff
deleted file mode 100644
index 05c248f983a..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.cpp.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/IFR_ComponentsS_T.cpp	Mon Apr 23 20:56:09 2001
-+++ IFR_ComponentsS_T.cpp	Mon Apr 23 19:18:59 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.h.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.h.diff
+++ /dev/null
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.i.diff
+++ /dev/null
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff
deleted file mode 100644
index 9efdc466dc5..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff
+++ /dev/null
@@ -1,531 +0,0 @@
---- orig/IFR_ExtendedS.cpp	Mon Apr 30 22:22:36 2001
-+++ IFR_ExtendedS.cpp	Fri May 11 00:03:12 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,8 +19,8 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_IFR_EXTENDEDS_CPP_
--#define _TAO_IDL_IFR_EXTENDEDS_CPP_
-+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_
-+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_
- 
- #include "IFR_ExtendedS.h"
- 
-@@ -51,7 +51,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:35 */
-+/* starting time is 13:56:24 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -171,7 +171,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:35 */
-+/* ending time is 13:56:24 */
- static TAO_CORBA_FixedDef_Perfect_Hash_OpTable tao_CORBA_FixedDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -808,7 +808,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_FixedDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_FixedDef:1.0"
-+          "IDL:omg.org/CORBA/FixedDef:1.0"
-         )
-     )->digits (
-         ACE_TRY_ENV
-@@ -838,7 +838,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_FixedDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_FixedDef:1.0"
-+          "IDL:omg.org/CORBA/FixedDef:1.0"
-         )
-     )->digits (
-         digits,
-@@ -871,7 +871,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_FixedDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_FixedDef:1.0"
-+          "IDL:omg.org/CORBA/FixedDef:1.0"
-         )
-     )->scale (
-         ACE_TRY_ENV
-@@ -901,7 +901,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_FixedDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_FixedDef:1.0"
-+          "IDL:omg.org/CORBA/FixedDef:1.0"
-         )
-     )->scale (
-         scale,
-@@ -1345,9 +1345,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_FixedDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -1358,11 +1358,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_FixedDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/FixedDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_FixedDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -1376,7 +1376,7 @@
- 
- const char* POA_CORBA_FixedDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_FixedDef:1.0";
-+  return "IDL:omg.org/CORBA/FixedDef:1.0";
- }
- 
- CORBA_FixedDef*
-@@ -1404,7 +1404,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:35 */
-+/* starting time is 13:56:24 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -1536,7 +1536,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:35 */
-+/* ending time is 13:56:24 */
- static TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable tao_CORBA_ValueMemberDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -2297,7 +2297,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueMemberDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
-+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
-         )
-     )->type (
-         ACE_TRY_ENV
-@@ -2328,7 +2328,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueMemberDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
-+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
-         )
-     )->type_def (
-         ACE_TRY_ENV
-@@ -2358,7 +2358,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueMemberDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
-+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
-         )
-     )->type_def (
-         type_def,
-@@ -2391,7 +2391,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueMemberDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
-+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
-         )
-     )->access (
-         ACE_TRY_ENV
-@@ -2421,7 +2421,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueMemberDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
-+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
-         )
-     )->access (
-         access,
-@@ -2946,9 +2946,9 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueMemberDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -2959,11 +2959,11 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueMemberDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueMemberDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_ValueMemberDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -2977,7 +2977,7 @@
- 
- const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_ValueMemberDef:1.0";
-+  return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
- }
- 
- CORBA_ValueMemberDef*
-@@ -3005,7 +3005,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:35 */
-+/* starting time is 13:56:24 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -3173,7 +3173,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:35 */
-+/* ending time is 13:56:24 */
- static TAO_CORBA_ValueDef_Perfect_Hash_OpTable tao_CORBA_ValueDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -5841,7 +5841,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->supported_interfaces (
-         ACE_TRY_ENV
-@@ -5871,7 +5871,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->supported_interfaces (
-         supported_interfaces,
-@@ -5904,7 +5904,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->initializers (
-         ACE_TRY_ENV
-@@ -5934,7 +5934,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->initializers (
-         initializers,
-@@ -5967,7 +5967,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->base_value (
-         ACE_TRY_ENV
-@@ -5997,7 +5997,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->base_value (
-         base_value,
-@@ -6030,7 +6030,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->abstract_base_values (
-         ACE_TRY_ENV
-@@ -6060,7 +6060,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->abstract_base_values (
-         abstract_base_values,
-@@ -6093,7 +6093,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->is_abstract (
-         ACE_TRY_ENV
-@@ -6123,7 +6123,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->is_abstract (
-         is_abstract,
-@@ -6156,7 +6156,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->is_custom (
-         ACE_TRY_ENV
-@@ -6186,7 +6186,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->is_custom (
-         is_custom,
-@@ -6219,7 +6219,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->is_truncatable (
-         ACE_TRY_ENV
-@@ -6249,7 +6249,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->is_truncatable (
-         is_truncatable,
-@@ -6283,7 +6283,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->is_a (
-         id,
-@@ -6315,7 +6315,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->describe_value (
-         ACE_TRY_ENV
-@@ -6351,7 +6351,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->create_value_member (
-         id,
-@@ -6392,7 +6392,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->create_attribute (
-         id,
-@@ -6436,7 +6436,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueDef:1.0"
-+          "IDL:omg.org/CORBA/ValueDef:1.0"
-         )
-     )->create_operation (
-         id,
-@@ -8177,11 +8177,11 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -8192,15 +8192,15 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_ValueDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Container_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -8214,7 +8214,7 @@
- 
- const char* POA_CORBA_ValueDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_ValueDef:1.0";
-+  return "IDL:omg.org/CORBA/ValueDef:1.0";
- }
- 
- CORBA_ValueDef*
-@@ -8242,7 +8242,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 17:22:35 */
-+/* starting time is 13:56:24 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -8372,7 +8372,7 @@
-     }
-   return 0;
- }
--/* ending time is 17:22:35 */
-+/* ending time is 13:56:24 */
- static TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable tao_CORBA_ValueBoxDef_optable;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -8765,7 +8765,7 @@
-     return ACE_reinterpret_cast (
-       POA_CORBA_ValueBoxDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
-+          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
-         )
-     )->original_type_def (
-         ACE_TRY_ENV
-@@ -8795,7 +8795,7 @@
-     ACE_reinterpret_cast (
-       POA_CORBA_ValueBoxDef_ptr,
-       servant_upcall.servant ()->_downcast (
--          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
-+          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
-         )
-     )->original_type_def (
-         original_type_def,
-@@ -9084,11 +9084,11 @@
-   ACE_CHECK_RETURN (0);
-   
-   if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueBoxDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, base_id)))
-       return 1;
-     else
-@@ -9099,15 +9099,15 @@
-     const char* logical_type_id
-   )
- {
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueBoxDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueBoxDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_ValueBoxDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
--  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
-+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-@@ -9121,7 +9121,7 @@
- 
- const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const
- {
--  return "IDL:omg.org/CORBA_ValueBoxDef:1.0";
-+  return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
- }
- 
- CORBA_ValueBoxDef*
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
deleted file mode 100644
index fcec20c57a1..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
+++ /dev/null
@@ -1,169 +0,0 @@
---- orig/IFR_ExtendedS.h	Mon Apr 30 22:22:36 2001
-+++ IFR_ExtendedS.h	Mon Apr 30 22:34:49 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,12 +19,12 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_IFR_EXTENDEDS_H_
--#define _TAO_IDL_IFR_EXTENDEDS_H_
-+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_H_
-+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_H_
- 
- #include "ace/pre.h"
- #include "IFR_BasicS.h"
--#include "IFR_ExtendedC.h"
-+#include "tao/IFR_Client/IFR_ExtendedC.h"
- 
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
-@@ -47,11 +47,6 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
--TAO_NAMESPACE  POA_CORBA
--{
--}
--TAO_NAMESPACE_CLOSE // module CORBA
--
- class POA_CORBA_FixedDef;
- typedef POA_CORBA_FixedDef *POA_CORBA_FixedDef_ptr;
- // Forward Classes Declaration
-@@ -227,6 +222,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -234,6 +230,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -304,14 +302,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_ValueMemberDef;
- typedef POA_CORBA_ValueMemberDef *POA_CORBA_ValueMemberDef_ptr;
- // Forward Classes Declaration
-@@ -583,6 +580,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -590,6 +588,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -668,14 +668,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_ValueDef;
- typedef POA_CORBA_ValueDef *POA_CORBA_ValueDef_ptr;
- // Forward Classes Declaration
-@@ -1339,6 +1338,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -1346,6 +1346,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -1562,14 +1564,13 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
- 
--
- class POA_CORBA_ValueBoxDef;
- typedef POA_CORBA_ValueBoxDef *POA_CORBA_ValueBoxDef_ptr;
- // Forward Classes Declaration
-@@ -1800,6 +1801,7 @@
-   );
- 
- private:
-+
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
-   void create_proxy (
-@@ -1807,6 +1809,8 @@
-     TAO_ENV_SINGLE_ARG_DECL
-   );
-   
-+private:
-+  
-   // Caches the proxy implementations. The proxy implementation
-   // are totally stateless, and those can be shared by all the
-   // instances of a given IDL interface type.
-@@ -1860,13 +1864,12 @@
-       CORBA::SystemException
-     ));
- 
--
- };
- 
-+
- //
- //                ThruPOA  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
--
- 
- #include "IFR_ExtendedS_T.h"
- 
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.i.diff
deleted file mode 100644
index 4e6f29c48a4..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.i.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/IFR_ExtendedS.i	Mon Apr 23 20:56:05 2001
-+++ IFR_ExtendedS.i	Mon Apr 23 19:10:58 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.cpp.diff
deleted file mode 100644
index ced988e3315..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.cpp.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/IFR_ExtendedS_T.cpp	Mon Apr 23 20:56:05 2001
-+++ IFR_ExtendedS_T.cpp	Mon Apr 23 19:10:42 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.h.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.h.diff
+++ /dev/null
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.i.diff
+++ /dev/null
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 6bd899610d0..9c1de0fad80 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -361,8 +361,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                     }
                 }
 
-              CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong,
-                                                        node->n_inherits ());
+              CORBA::ULong n_parents = static_cast<CORBA::ULong> (node->n_inherits ());
 
               CORBA::InterfaceDefSeq bases (n_parents);
               bases.length (n_parents);
@@ -740,24 +739,15 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
 
               // Truncatable, abstract, custom.
 
-              extant_def->is_abstract (ACE_static_cast (
-                                           CORBA::Boolean,
-                                           node->is_abstract ()
-                                         )
+              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ())
                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              extant_def->is_truncatable (ACE_static_cast (
-                                              CORBA::Boolean,
-                                              node->truncatable ()
-                                            )
+              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ())
                                           ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              extant_def->is_custom (ACE_static_cast (
-                                         CORBA::Boolean,
-                                         node->custom ()
-                                       )
+              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ())
                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
@@ -878,7 +868,7 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
             CORBA::Container::_nil ();
             
           CORBA::Boolean abstract = 
-            ACE_static_cast (CORBA::Boolean, v->is_abstract ());
+            static_cast<CORBA::Boolean> (v->is_abstract ());
 
           if (be_global->ifr_scopes ().top (current_scope) == 0)
             {
@@ -1446,24 +1436,15 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
 
               // Truncatable, abstract, custom.
 
-              extant_def->is_abstract (ACE_static_cast (
-                                           CORBA::Boolean,
-                                           node->is_abstract ()
-                                         )
+              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ())
                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              extant_def->is_truncatable (ACE_static_cast (
-                                              CORBA::Boolean,
-                                              node->truncatable ()
-                                            )
+              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ())
                                           ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              extant_def->is_custom (ACE_static_cast (
-                                         CORBA::Boolean,
-                                         node->custom ()
-                                       )
+              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ())
                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
@@ -1593,7 +1574,7 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
               ACE_TRY_CHECK;
               
               CORBA::Boolean abstract =
-                ACE_static_cast (CORBA::Boolean, v->is_abstract ());
+                static_cast<CORBA::Boolean> (v->is_abstract ());
 
               this->ir_current_ =
                 ccm_scope->create_event (
@@ -1791,9 +1772,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
 
       if (CORBA::is_nil (prev_def.in ()))
         {
-          ifr_adding_visitor_structure visitor (node,
-                                                0);
-
+          ifr_adding_visitor_structure visitor (node, 0);
           int retval = visitor.visit_structure (node);
 
           if (retval == 0)
@@ -1877,8 +1856,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
       if (CORBA::is_nil (prev_def.in ()))
         {
           CORBA::ULong member_count =
-            ACE_static_cast (CORBA::ULong,
-                             node->member_count ());
+            static_cast<CORBA::ULong> (node->member_count ());
 
           CORBA::EnumMemberSeq members (member_count);
           members.length (member_count);
@@ -2363,7 +2341,7 @@ ifr_adding_visitor::visit_string (AST_String *node)
 
   AST_Expression::AST_ExprValue *ev = ex->ev ();
 
-  CORBA::ULong bound = ACE_static_cast (CORBA::ULong, ev->u.ulval);
+  CORBA::ULong bound = static_cast<CORBA::ULong> (ev->u.ulval);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -2720,10 +2698,10 @@ ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev,
       any <<= ev->u.usval;
       break;
     case AST_Expression::EV_long:
-      any <<= ACE_static_cast (CORBA::Long, ev->u.lval);
+      any <<= static_cast<CORBA::Long> (ev->u.lval);
       break;
     case AST_Expression::EV_ulong:
-      any <<= ACE_static_cast (CORBA::ULong, ev->u.ulval);
+      any <<= static_cast<CORBA::ULong> (ev->u.ulval);
       break;
 #if !defined (ACE_LACKS_LONGLONG_T)
     case AST_Expression::EV_longlong:
@@ -2768,7 +2746,7 @@ ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev,
 
         for (size_t i = 0; i < len; ++i)
           {
-            wstr[i] = ACE_static_cast (CORBA::WChar, str[i]);
+            wstr[i] = static_cast<CORBA::WChar> (str[i]);
           }
 
         wstr[len] = 0;
@@ -2822,8 +2800,7 @@ int
 ifr_adding_visitor::create_interface_def (AST_Interface *node
                                           ACE_ENV_ARG_DECL)
 {
-  CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong,
-                                            node->n_inherits ());
+  CORBA::ULong n_parents = static_cast<CORBA::ULong> (node->n_inherits ());
   AST_Interface **parents = node->inherits ();
   CORBA::Contained_var result;
   CORBA::AbstractInterfaceDefSeq abs_bases;
@@ -2867,13 +2844,13 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
             }
           else
             {
-              bases[i] = 
+              abs_bases[i] = 
                 CORBA::AbstractInterfaceDef::_narrow (result.in ()
                                                       ACE_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (-1);
             }
 
-          if (CORBA::is_nil (bases[i].in ()))
+          if (CORBA::is_nil (abs_bases[i].in ()))
             {
               ACE_ERROR_RETURN ((
                   LM_ERROR,
@@ -3095,13 +3072,10 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
                            node->repoID (),
                            node->local_name ()->get_string (),
                            node->version (),
-                           ACE_static_cast (CORBA::Boolean,
-                                            node->custom ()),
-                           ACE_static_cast (CORBA::Boolean,
-                                            node->is_abstract ()),
+                           static_cast<CORBA::Boolean> (node->custom ()),
+                           static_cast<CORBA::Boolean> (node->is_abstract ()),
                            base_value.in (),
-                           ACE_static_cast (CORBA::Boolean,
-                                            node->truncatable ()),
+                           static_cast<CORBA::Boolean> (node->truncatable ()),
                            abstract_base_values,
                            supported_interfaces,
                            initializers
@@ -3483,13 +3457,10 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
                        node->repoID (),
                        node->local_name ()->get_string (),
                        node->version (),
-                       ACE_static_cast (CORBA::Boolean,
-                                        node->custom ()),
-                       ACE_static_cast (CORBA::Boolean,
-                                        node->is_abstract ()),
+                       static_cast<CORBA::Boolean> (node->custom ()),
+                       static_cast<CORBA::Boolean> (node->is_abstract ()),
                        base_value.in (),
-                       ACE_static_cast (CORBA::Boolean,
-                                        node->truncatable ()),
+                       static_cast<CORBA::Boolean> (node->truncatable ()),
                        abstract_base_values,
                        supported_interfaces,
                        initializers
@@ -3873,8 +3844,7 @@ ifr_adding_visitor::fill_abstract_base_values (CORBA::ValueDefSeq &result,
   if (s_length > 0)
     {
       AST_Interface **list = node->inherits ();
-      CORBA::ULong u_length = ACE_static_cast (CORBA::ULong,
-                                               s_length);
+      CORBA::ULong u_length = static_cast<CORBA::ULong> (s_length);
       idl_bool first_abs = list[0]->is_abstract ();
       result.length (first_abs ? u_length : u_length - 1);
 
@@ -3962,8 +3932,7 @@ ifr_adding_visitor::fill_interfaces (CORBA::InterfaceDefSeq &result,
   // existing entries, if any,  from the repository.
   if (length > 0)
     {
-      CORBA::ULong u_length = ACE_static_cast (CORBA::ULong,
-                                               length);
+      CORBA::ULong u_length = static_cast<CORBA::ULong> (length);
       result.length (u_length);
 
       for (CORBA::ULong i = 0; i < u_length; ++i)
@@ -4018,8 +3987,7 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
   for (CORBA::ULong i = 0; i < n_factories; ++i)
     {
       result[i].name = factories[i]->local_name ()->get_string ();
-      n_args = ACE_static_cast (CORBA::ULong,
-                                factories[i]->argument_count ());
+      n_args = static_cast<CORBA::ULong> (factories[i]->argument_count ());
       result[i].members.length (n_args);
 
       // The factory should have nothing in its scope but args.
@@ -4051,8 +4019,7 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
         }
 
       CORBA::ULong n_exceptions = 
-        ACE_static_cast (CORBA::ULong,
-                         factories[i]->n_exceptions ());
+        static_cast<CORBA::ULong> (factories[i]->n_exceptions ());
       result[i].exceptions.length (n_exceptions);
       index = 0;
 
@@ -4133,8 +4100,7 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
       return;
     }
 
-  result.length (ACE_static_cast (CORBA::ULong,
-                                  list->length ()));
+  result.length (static_cast<CORBA::ULong> (list->length ()));
   CORBA::ULong index = 0;
   AST_Decl *d = 0;
   CORBA::Contained_var holder;
@@ -4167,8 +4133,7 @@ ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
                                  ACE_ENV_ARG_DECL)
 {
   AST_Argument *arg = 0;
-  CORBA::ULong n_args = ACE_static_cast (CORBA::ULong,
-                                         node->argument_count ());
+  CORBA::ULong n_args = static_cast<CORBA::ULong> (node->argument_count ());
   result.length (n_args);
   CORBA::ULong index = 0;
   CORBA::Contained_var holder;
@@ -4265,8 +4230,7 @@ ifr_adding_visitor::visit_all_uses (AST_Component *node,
                                 local_name,
                                 tmp->impl->version (),
                                 interface_type.in (),
-                                ACE_static_cast (CORBA::Boolean,
-                                                 tmp->is_multiple)
+                                static_cast<CORBA::Boolean> (tmp->is_multiple)
                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 8fba5bdf940..be61ce0f0a9 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -42,8 +42,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 
   AST_Exception *e = AST_Exception::narrow_from_scope (node);
 
-  CORBA::ULong nfields = ACE_static_cast (CORBA::ULong,
-                                          e->nfields ());
+  CORBA::ULong nfields = static_cast<CORBA::ULong> (e->nfields ());
 
   this->members_.length (nfields);
 
@@ -334,8 +333,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong,
-                                                       node->member_count ());
+          CORBA::ULong member_count = static_cast<CORBA::ULong> (node->member_count ());
 
           CORBA::EnumMemberSeq members (member_count);
           members.length (member_count);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index 0524a64597d..1a3972ea18c 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -52,8 +52,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       // will look up each parameter and add its repository entry to
       // our params_ member.
 
-      CORBA::ULong length = ACE_static_cast (CORBA::ULong,
-                                             node->argument_count ());
+      CORBA::ULong length = static_cast<CORBA::ULong> (node->argument_count ());
 
       this->params_.length (length);
 
@@ -77,8 +76,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 
       if (excepts != 0)
         {
-          length = ACE_static_cast (CORBA::ULong,
-                                    excepts->length ());
+          length = static_cast<CORBA::ULong> (excepts->length ());
         }
       else
         {
@@ -114,8 +112,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 
       if (ctx_list != 0)
         {
-          length = ACE_static_cast (CORBA::ULong,
-                                    ctx_list->length ());
+          length = static_cast<CORBA::ULong> (ctx_list->length ());
         }
       else
         {
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 4414333be63..b65ad0a9442 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -39,8 +39,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
     }
 
   AST_Structure *s = AST_Structure::narrow_from_scope (node);
-  CORBA::ULong nfields = ACE_static_cast (CORBA::ULong,
-                                          s->nfields ());
+  CORBA::ULong nfields = static_cast<CORBA::ULong> (s->nfields ());
   this->members_.length (nfields);
   AST_Field **f = 0;
 
@@ -74,8 +73,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                   // Since the enclosing scope hasn't been created yet,
                   // we make a special visitor to create this member
                   // at global scope and move it into the struct later.
-                  ifr_adding_visitor_structure visitor (ft,
-                                                        1);
+                  ifr_adding_visitor_structure visitor (ft, 1);
 
                   if (ft->ast_accept (&visitor) == -1)
                     {
@@ -94,7 +92,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 
                   CORBA::Contained_ptr tmp =
                     CORBA::Contained::_narrow (visitor.ir_current ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   this->move_queue_.enqueue_tail (tmp);
@@ -161,55 +159,54 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 
       if (CORBA::is_nil (prev_def.in ()))
         {
-          if (this->visit_scope (node) == -1)
+          CORBA::StructDef_var    struct_def;
+          CORBA::StructMemberSeq  dummyMembers( 0 );
+          dummyMembers.length( 0 );
+
+          CORBA::Container_ptr current_scope= CORBA::Container::_nil ();
+          if (this->is_nested_)
+            {
+              current_scope= be_global->holding_scope ();
+            }
+          else if (be_global->ifr_scopes ().top (current_scope) != 0)
             {
               ACE_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                   ACE_TEXT ("visit_structure -")
-                  ACE_TEXT (" visit_scope failed\n")
+                  ACE_TEXT (" scope stack is empty\n")
                 ),
                 -1
               );
             }
 
-          if (this->is_nested_)
+          // First create the named structure without any members
+          struct_def=
+            current_scope->create_struct (
+                node->repoID (),
+                node->local_name ()->get_string (),
+                node->version (),
+                dummyMembers
+                ACE_ENV_ARG_PARAMETER
+              );
+          ACE_TRY_CHECK;
+
+          // Then recurse into the real structure members (which corrupts ir_current_)
+          if (this->visit_scope (node) == -1)
             {
-              this->ir_current_ =
-                be_global->holding_scope ()->create_struct (
-                    node->repoID (),
-                    node->local_name ()->get_string (),
-                    node->version (),
-                    this->members_
-                    ACE_ENV_ARG_PARAMETER
-                  );
+              ACE_ERROR_RETURN ((
+                  LM_ERROR,
+                  ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
+                  ACE_TEXT ("visit_structure -")
+                  ACE_TEXT (" visit_scope failed\n")
+                ),
+                -1
+              );
             }
-          else
-            {
-              CORBA::Container_ptr current_scope =
-                CORBA::Container::_nil ();
 
-              if (be_global->ifr_scopes ().top (current_scope) != 0)
-                {
-                  ACE_ERROR_RETURN ((
-                      LM_ERROR,
-                      ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
-                      ACE_TEXT ("visit_structure -")
-                      ACE_TEXT (" scope stack is empty\n")
-                    ),
-                    -1
-                  );
-                }
-
-              this->ir_current_ =
-                current_scope->create_struct (
-                                   node->repoID (),
-                                   node->local_name ()->get_string (),
-                                   node->version (),
-                                   this->members_
-                                   ACE_ENV_ARG_PARAMETER
-                                );
-            }
+          // Correct ir_current_ and move the real structure members into the struct
+          this->ir_current_= CORBA::StructDef::_duplicate (struct_def.in ());
+          struct_def->members( this->members_ );
 
           ACE_TRY_CHECK;
 
@@ -221,14 +218,15 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 
               CORBA::Container_var new_container =
                 CORBA::Container::_narrow (this->ir_current_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               for (size_t i = 0; i < size; ++i)
                 {
                   this->move_queue_.dequeue_head (traveller);
-
-                  CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  
+                  CORBA::String_var name =
+                    traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   CORBA::String_var version =
@@ -295,8 +293,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong,
-                                                       node->member_count ());
+          CORBA::ULong member_count = static_cast<CORBA::ULong> (node->member_count ());
 
           CORBA::EnumMemberSeq members (member_count);
           members.length (member_count);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 673728b8c18..a93742537ab 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -44,8 +44,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
 
   AST_Union *u = AST_Union::narrow_from_scope (node);
 
-  CORBA::ULong nfields = ACE_static_cast (CORBA::ULong,
-                                          u->nfields ());
+  CORBA::ULong nfields = static_cast<CORBA::ULong> (u->nfields ());
 
   this->members_.length (nfields);
 
@@ -167,12 +166,12 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                     {
                       TAO_OutputCDR cdr;
                       cdr.write_ulong (ev->u.ulval);
+                      TAO_InputCDR in_cdr (cdr);
                       TAO::Unknown_IDL_Type *unk = 0;
                       ACE_NEW_RETURN (unk,
                                       TAO::Unknown_IDL_Type (
                                           this->disc_tc_.in (),
-                                          cdr.begin (),
-                                          TAO_ENCAP_BYTE_ORDER
+                                          in_cdr
                                         ),
                                       -1);
                       this->members_[index].label.replace (unk);
@@ -305,8 +304,7 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong,
-                                                       node->member_count ());
+          CORBA::ULong member_count = static_cast<CORBA::ULong> (node->member_count ());
 
           CORBA::EnumMemberSeq members (member_count);
           members.length (member_count);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index 08eeb4b7824..8a1ec7376a4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -16,6 +16,9 @@
 #if defined (ACE_WIN32)
 
 #include "ImR_Activator_i.h"
+#include "Activator_Options.h"
+
+#include "ace/Reactor.h"
 #include "tao/ORB_Core.h"
 
 /**
@@ -57,13 +60,18 @@ int
 Activator_NT_Service::svc (void)
 {
   ImR_Activator_i server;
+  Options opts;
 
-  int status = 0;
+  if (opts.init_from_registry() != 0)
+  {
+    report_status (SERVICE_STOPPED);
+    return -1;
+  }
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER);
+      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -77,6 +85,9 @@ Activator_NT_Service::svc (void)
           server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
+          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
           report_status (SERVICE_STOPPED);
 
         }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
index 1fc289707ed..339d06c5b19 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
@@ -7,8 +7,8 @@
  *
  *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
  *  @author Jeff Parsons <parsons@cs.wustl.edu>
- *  @author John Tucker <jtucker@infoglide.com> 
- *  @author Mike Vitalo <mvitalo@infoglide.com>   
+ *  @author John Tucker <jtucker@infoglide.com>
+ *  @author Mike Vitalo <mvitalo@infoglide.com>
  */
 //=============================================================================
 
@@ -21,8 +21,13 @@
 
 #include "ace/NT_Service.h"
 #include "ace/Singleton.h"
+#include "ace/Synch.h"
 #include "tao/orbconf.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 static const char * IMR_ACTIVATOR_SERVICE_NAME = "TAOIMRActivator";
 static const char * IMR_ACTIVATOR_DISPLAY_NAME = "TAO Implementation Repository Activator";
 static const char * IMR_ACTIVATOR_DESCRIPTION = "Implementation Repository Activator service for TAO";
@@ -51,8 +56,10 @@ private:
   friend class ACE_Singleton<Activator_NT_Service, MUTEX>;
 };
 
-typedef ACE_Singleton<Activator_NT_Service, Activator_NT_Service::MUTEX> SERVICE;
+typedef ACE_Singleton<Activator_NT_Service, ACE_Mutex> SERVICE;
 
 #endif /* ACE_WIN32 */
 
 #endif /* Activator_NT_Service_H */
+
+
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index a8f02762c14..97c828255af 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -8,18 +8,15 @@
  */
 //=============================================================================
 #include "Activator_Options.h"
-#include "Activator_NT_Service.h"
-#include "tao/Strategies/advanced_resource.h"
+
 #include "ace/Arg_Shifter.h"
-#include "ace/ARGV.h"
 #include "ace/OS_NS_strings.h"
-#include "ace/Mutex.h"
+#include "ace/Log_Msg.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 Activator_NT_Service.h
@@ -27,35 +24,18 @@ static const ACE_TCHAR *SERVICE_REG_PATH =
   ACE_TEXT ("SYSTEM\\CurrentControlSet\\Services\\TAOIMRActivator\\Parameters");
 #endif /* ACE_WIN32 */
 
-/**
- * Default Constructor.  Assigns default values to all the member variables.
- */
 Options::Options ()
-  : repo_mode_ (REPO_NONE)
-  , debug_ (1)
-  , ping_interval_ (0, 200 * 1000) // 200 milliseconds
-  , service_ (false)
-  , startup_timeout_ (5)
-  , readonly_ (false)
-  , service_command_(SC_NONE)
+: debug_ (1)
+, service_ (false)
+, service_command_(SC_NONE)
 {
 }
 
-/**
- * parse_args uses an ACE_Arg_Shifter to grab all the options that are
- * specific to the ImR.
- * If running as an nt service, most of these options will come from the
- * registry instead.
- *
- * @retval  0 Success
- * @retval -1 Error parsing args
- * @retval  1 Success but we should exit.
- */
 int
 Options::parse_args (int &argc, char *argv[])
 {
   ACE_Arg_Shifter shifter (argc, argv);
-  
+ 
   while (shifter.is_anything_left ())
     {
       if (ACE_OS::strcasecmp (shifter.get_current (),
@@ -71,21 +51,26 @@ Options::parse_args (int &argc, char *argv[])
             }
 
           if (ACE_OS::strcasecmp (shifter.get_current (),
-                                   ACE_TEXT ("install")) == 0) 
+                                   ACE_TEXT ("install")) == 0)
           {
             this->service_command_ = SC_INSTALL;
           }
           else if (ACE_OS::strcasecmp (shifter.get_current (),
-                                   ACE_TEXT ("remove")) == 0) 
+                                   ACE_TEXT ("remove")) == 0)
           {
             this->service_command_ = SC_REMOVE;
           }
+          else if (ACE_OS::strcasecmp (shifter.get_current (),
+                                   ACE_TEXT ("install_no_locator")) == 0)
+          {
+            this->service_command_ = SC_INSTALL_NO_LOCATOR;
+          }
           else
           {
             ACE_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current()));
             this->print_usage ();
             return -1;
-          } 
+          }
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-d")) == 0)
@@ -102,11 +87,6 @@ Options::parse_args (int &argc, char *argv[])
           this->debug_ = ACE_OS::atoi (shifter.get_current ());
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
-                                   ACE_TEXT ("-l")) == 0)
-        {
-          this->readonly_ = true;
-        }
-      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-o")) == 0)
         {
           shifter.consume_arg ();
@@ -120,79 +100,10 @@ Options::parse_args (int &argc, char *argv[])
           this->ior_output_file_ = shifter.get_current();
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
-                                   ACE_TEXT ("-p")) == 0)
-        {
-          shifter.consume_arg ();
-
-          if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
-            {
-              ACE_ERROR ((LM_ERROR, "Error: -p option needs a filename\n"));
-              this->print_usage ();
-              return -1;
-            }
-
-          if (repo_mode_ != REPO_NONE) 
-          {
-            ACE_ERROR ((LM_ERROR, "Error: Persistence already specified.\n"));
-            this->print_usage ();
-            return -1;
-          }
-
-          this->file_name_ = shifter.get_current ();
-          this->repo_mode_ = REPO_HEAP_FILE;
-        }
-      else if (ACE_OS::strcasecmp (shifter.get_current (),
-                                   ACE_TEXT ("-r")) == 0)
-        {
-          if (repo_mode_ != REPO_NONE) 
-          {
-            ACE_ERROR ((LM_ERROR, "Error: Persistence already specified.\n"));
-            this->print_usage ();
-            return -1;
-          }
-          this->repo_mode_ = REPO_REGISTRY;
-        }
-      else if (ACE_OS::strcasecmp (shifter.get_current (),
-                                   ACE_TEXT ("-x")) == 0)
-        {
-          shifter.consume_arg ();
-
-          if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
-            {
-              ACE_ERROR ((LM_ERROR, "Error: -x option needs a filename\n"));
-              this->print_usage ();
-              return -1;
-            }
-
-          if (repo_mode_ != REPO_NONE) 
-          {
-            ACE_ERROR ((LM_ERROR, "Error: Persistence already specified.\n"));
-            this->print_usage ();
-            return -1;
-          }
-
-          this->file_name_ = shifter.get_current ();
-          this->repo_mode_ = REPO_XML_FILE;
-        }
-      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-s")) == 0)
         {
           this->service_ = true;
         }
-      else if (ACE_OS::strcasecmp (shifter.get_current (),
-                                   ACE_TEXT ("-t")) == 0)
-        {
-          shifter.consume_arg ();
-
-          if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
-            {
-              ACE_ERROR ((LM_ERROR, "Error: -t option needs a value\n"));
-              this->print_usage ();
-              return -1;
-            }
-          this->startup_timeout_ =
-            ACE_Time_Value (ACE_OS::atoi (shifter.get_current ()));
-        }
       else if ((ACE_OS::strcasecmp (shifter.get_current (),
                                     ACE_TEXT ("-?")) == 0)
                || (ACE_OS::strcasecmp (shifter.get_current (),
@@ -212,311 +123,50 @@ Options::parse_args (int &argc, char *argv[])
   return 0;
 }
 
-/**
- * @retval  0 Success
- * @retval -1 Error parsing args
- * @retval  1 Success but we should exit.
- */
 int
 Options::init (int argc, char *argv[])
 {
   // Make an initial pass through and grab the arguments that we recognize.
   // This may also run the commands to install or remove the nt service.
   int result = this->parse_args (argc, argv);
-  if (result != 0) {
+  if (result != 0)
+  {
     return result;
   }
 
-  ACE_ARGV orb_args;   // Save the leftovers to a ACE_ARGV class
-  ACE_CString cmdline; // We'll save this in the registry when installing.
-  for (int i = 1; i < argc; ++i)
-    {
-      cmdline += ACE_CString(argv[i]) + ACE_CString(" ");
-      if (orb_args.add (argv[i]) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error: Could not save argument"));
-          return -1;
-        }
-    }
-
-  result = run_service_command(cmdline);
-  
-  if (result != 0) 
-    return result;
-
-  char* argv_tmp = 0;
-
-  // Load from the registry. This may replace the args.
-  if (this->load_registry_options(argv_tmp, orb_args) != 0)
-    return -1;
-
-  ACE_Auto_Array_Ptr<char> argv_deleter(argv_tmp);
-
-  if (orb_args.add ("-ORBSvcConfDirective\"static Advanced_Resource_Factory '-ORBReactorType select_st'\"") == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) TAO_ImR_Activator- Could not add"
-                         " SvcConfDirective \n"),
-                        -1);
-    }
-
-  int orb_argc = orb_args.argc ();
-
-  // Now initialize the orb and pass it the leftover arguments
-  ACE_TRY_NEW_ENV
-    {
-      // First make sure the Activator doesn't pick up an environment setting 
-      // that would make it try to register its POAs with the ImplRepo.
-      char* use_IMR_env_var_value = ACE_OS::getenv ("TAO_USE_IMR");
-      if (use_IMR_env_var_value != 0)
-        {
-          ACE_OS::putenv ("TAO_USE_IMR=0");
-        }
-
-      this->orb_ = CORBA::ORB_init (orb_argc,
-                                    orb_args.argv (),
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception \n");
-      ACE_ERROR ((LM_ERROR, "Error: Cannot initialize ORB\n"));
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  // If there are any arguments left (besides the executable filename)
-  // then they were not picked up by us or the orb and must be
-  // unrecognized.
-  if (orb_argc > 1)
-    {
-      // Just print out the first option as an error
-      ACE_ERROR ((LM_ERROR,
-                  "Unrecognized option: %s\n",
-                  orb_args.argv ()[1]));
-      return -1;
-    }
-
-  if (this->initialize_persistence () != 0)
-    return -1;
+  for (int i = 0; i < argc; ++i)
+  {
+    this->cmdline_ += ACE_CString(argv[i]) + ACE_CString(" ");
+  }
 
-  // Indicates successful parsing of command line.
   return 0;
 }
 
+int
+Options::init_from_registry (void)
+{
+  this->load_registry_options();
+  return 0;
+}
 
-/**
- * Just print out the usage message to STDERR
- */
 void
 Options::print_usage (void) const
 {
   ACE_ERROR ((LM_ERROR,
               "Usage:\n"
               "\n"
-              "ImR_Activator [-c cmd] [-d 0|1|2] [-l] [-m] [-o file]"
-              " [-r|-p file|-x file] [-s] [-t secs]\n"
+              "ImR_Activator [-c cmd] [-d 0|1|2] [-l] [-o file]\n"
               "\n"
-              "  -c command  Runs service commands ('install' or 'remove')\n"
+              "  -c command  Runs service commands \n"
+              "              ('install' or 'remove' or 'install_no_locator')\n"
               "  -d level    Sets the debug level\n"
-              "  -l          Lock the database\n"
               "  -o file     Outputs the ImR's IOR to a file\n"
-              "  -p file     Use file for storing/loading settings\n"
-              "  -x file     Use XML file for storing/loading setting\n"
-              "  -r          Use the registry for storing/loading settings\n"
-              "  -s          Runs as a service (NT Only)\n"
-              "  -t secs     Timeout used for killing unresponsive servers\n")
+              "  -s          Runs as a service (NT Only)\n")
              );
 }
 
 int
-Options::initialize_persistence(void)
-{
-  switch (this->repo_mode_) 
-  {
-  case REPO_NONE:
-    return this->initialize_non_persistence();
-  case REPO_XML_FILE:
-    return this->initialize_xml_persistence();
-  case REPO_HEAP_FILE:
-    return this->initialize_heap_persistence();
-  case REPO_REGISTRY:
-    return this->initialize_registry_persistence();
-  }
-  ACE_ERROR((LM_ERROR, "Error: Unknown persistence type.\n"));
-  return -1;
-}
-/**
- * The most portable form of persistence is file persistence.  Here
- * we assign an ACE_Configuration_Heap object using @param filename
- * as the file.
- *
- * @retval  0 Success
- * @retval -1 Failure
- */
-int
-Options::initialize_heap_persistence (void)
-{
-  ACE_ASSERT(this->repo_config_.get() == 0);
-
-  auto_ptr<Repository_Configuration> rc(new Repository_Configuration ("h"));
-
-  if (rc->open (this->file_name_.c_str()) == 0)
-    {
-      this->repo_config_ = rc;
-      return 0;
-    }
-  ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("Error: Opening persistent heap file '%s'\n"),
-              this->file_name_.c_str()));
-  return -1;
-}
-
-
-/**
- * On Windows, we have the option of using the Registry to store the
- * server data.  Assigns a ACE_Configuration_Win32Registry to
- * this->repo_config_.  On non-Win32 systems, just returns an error.
- *
- * @todo Where in the registry should this be stored?
- *
- * @retval  0 Success
- * @retval -1 Failure
- */
-int
-Options::initialize_registry_persistence (void)
-{
-  ACE_ASSERT(this->repo_config_.get() == 0);
-#if defined (ACE_WIN32)
-  auto_ptr<Repository_Configuration> rc(new Repository_Configuration ("w"));
-  this->repo_config_ = rc;
-  return 0;
-#else /* ACE_WIN32 */
-  ACE_ERROR_RETURN ((LM_ERROR, "Registry not supported on this platform"), -1);
-#endif /* ACE_WIN32 */
-}
-
-
-/**
- * In cases where persistence isn't needed, create an object of
- * the ACE_Configuration_Heap class to be used.  Initializes
- * this->repo_config_ to an opened ACE_Configuration_Heap.
- *
- * @retval 0  Success
- * @retval -1 Failure
- */
-int
-Options::initialize_non_persistence (void)
-{
-  ACE_ASSERT(this->repo_config_.get() == 0);
-
-  auto_ptr<Repository_Configuration> rc(new Repository_Configuration ("h"));
-
-  if (rc->open () == 0)
-    {
-      this->repo_config_ = rc;
-      return 0;
-    }
-  ACE_ERROR ((LM_ERROR,
-             ACE_TEXT ("Error: Opening Configuration heap\n")));
-  return -1;
-}
-
-/// Initialize for the XML repository case.
-int
-Options::initialize_xml_persistence (void)
-{
-  ACE_ASSERT(this->repo_config_.get() == 0);
-
-  auto_ptr<Repository_Configuration> rc(new Repository_Configuration ("x"));
-
-  if (rc->open (this->file_name_.c_str()) == 0)
-    {
-      this->repo_config_ = rc;
-      return 0;
-    }
-  ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("Error: Opening Configuration XML file %s\n"),
-              this->file_name_.c_str()
-              ));
-  return -1;
-}
-
-/**
- * Executes the various commands that are useful for a NT service.  Right
- * now these include 'install' and 'remove'.  Others, such as 'start' and
- * 'stop' can be added, but the 'net' program in Windows already handles
- * these commands.
- *
- * @todo Finish implementing Options::run_service_command
- * @todo Update to unicode
- */
-int
-Options::run_service_command (const ACE_CString& cmdline)
-{
-  if (this->service_command_ == SC_NONE) 
-    return 0;
-#if defined (ACE_WIN32)
-  SERVICE::instance ()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
-
-  if (this->service_command_ == SC_INSTALL)
-    {
-      char pathname[_MAX_PATH * 2 + 3];  // +3 for the ' -s' at the end
-
-      if (ACE_TEXT_GetModuleFileName(NULL, pathname, _MAX_PATH * 2) == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Error: Could not get module file name.\n"));
-          return -1;
-        }
-
-      // Append the command used for running the implrepo as
-      ACE_OS::strcat (pathname, ACE_TEXT (" -s"));
-
-      const char* DEPENDS_ON = "TAOIMRLocator"; // Must match Locator_NT_Service.h
-
-      int ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
-                                           SERVICE_ERROR_NORMAL,
-                                           pathname,
-                                           0, // group
-                                           0, // tag
-                                           DEPENDS_ON
-                                           );
-      if (ret != -1) {
-        if (debug() >= 1) {
-          ACE_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n"));
-        }
-        this->save_registry_options(cmdline);
-      } else {
-        ACE_ERROR((LM_ERROR, "Error: Failed to install service.\n"));
-      }
-      if (ret == 0) 
-        return 1;
-    }
-  else if (this->service_command_ == SC_REMOVE)
-    {
-      int ret = SERVICE::instance ()->remove ();
-      if (debug() >= 1) {
-        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;
-
-#else /* ACE_WIN32 */
-  ACE_UNUSED_ARG (cmdline);
-  ACE_ERROR ((LM_ERROR, "Service not supported on this platform"));
-
-  return -1;
-#endif /* ACE_WIN32 */
-}
-
-int 
-Options::save_registry_options(const ACE_CString& cmdline) 
+Options::save_registry_options()
 {
 #if defined (ACE_WIN32)
   HKEY key = 0;
@@ -534,85 +184,28 @@ Options::save_registry_options(const ACE_CString& cmdline)
   if (err != ERROR_SUCCESS) {
     return -1;
   }
-  err = ACE_TEXT_RegSetValueEx(key, "ORBInitOptions", 0, REG_SZ, 
-    (LPBYTE) cmdline.c_str(), cmdline.length() + 1);
-  ACE_ASSERT(err == ERROR_SUCCESS);
-
-  err = ACE_TEXT_RegSetValueEx(key, "PersistFile", 0, REG_SZ, 
-   (LPBYTE) file_name_.c_str(), file_name_.length() + 1);
-  ACE_ASSERT(err == ERROR_SUCCESS);
-
-  err = ACE_TEXT_RegSetValueEx(key, "IORFile", 0, REG_SZ, 
-    (LPBYTE) ior_output_file_.c_str(), ior_output_file_.length() + 1);
-  ACE_ASSERT(err == ERROR_SUCCESS);
-
-  err = ACE_TEXT_RegSetValueEx(key, "DebugLevel", 0, REG_DWORD, 
-    (LPBYTE) &debug_ , sizeof(debug_));
-  ACE_ASSERT(err == ERROR_SUCCESS);
-
-  DWORD tmp = ping_interval_.msec();
-  err = ACE_TEXT_RegSetValueEx(key, "PingInterval", 0, REG_DWORD, 
-    (LPBYTE) &tmp, sizeof(DWORD));
-  ACE_ASSERT(err == ERROR_SUCCESS);
-
-  tmp = readonly_ ? 1 : 0;
-  err = ACE_TEXT_RegSetValueEx(key, "Lock", 0, REG_DWORD, 
-    (LPBYTE) &tmp, sizeof(DWORD));
+  err = ACE_TEXT_RegSetValueEx(key, "ORBInitOptions", 0, REG_SZ,
+    (LPBYTE) this->cmdline_.c_str(), this->cmdline_.length() + 1);
   ACE_ASSERT(err == ERROR_SUCCESS);
 
-  tmp = repo_mode_;
-  err = ACE_TEXT_RegSetValueEx(key, "PersistType", 0, REG_DWORD, 
-    (LPBYTE) &tmp, sizeof(DWORD));
+  err = ACE_TEXT_RegSetValueEx(key, "IORFile", 0, REG_SZ,
+    (LPBYTE) this->ior_output_file_.c_str(), this->ior_output_file_.length() + 1);
   ACE_ASSERT(err == ERROR_SUCCESS);
 
-  tmp = startup_timeout_.sec();
-  err = ACE_TEXT_RegSetValueEx(key, "Timeout", 0, REG_DWORD, 
-    (LPBYTE) &tmp, sizeof(DWORD));
+  err = ACE_TEXT_RegSetValueEx(key, "DebugLevel", 0, REG_DWORD,
+    (LPBYTE) &this->debug_ , sizeof(this->debug_));
   ACE_ASSERT(err == ERROR_SUCCESS);
 
   err = ::RegCloseKey(key);
   ACE_ASSERT(err == ERROR_SUCCESS);
-#else 
-  ACE_UNUSED_ARG (cmdline);
 #endif
   return 0;
 }
 
-namespace {
-  // This both parses the cmdline by replacing spaces with \0's, and
-  // adds each command to the ACE_ARGV. 
-  void parse_command_line(char* cmdline, ACE_ARGV& argv) {
-    // This tokenizer will replace all spaces with end-of-string
-    // characters and will preserve text between "" and '' pairs.
-    ACE_Tokenizer parser (cmdline);
-    parser.delimiter_replace (' ', '\0');
-    parser.preserve_designators ('\"', '\"');
-    parser.preserve_designators ('\'', '\'');
-
-    for (char *p = parser.next (); p; p = parser.next ()) {
-      argv.add(p);
-    }
-  }
-}
-/**
- *  We will only load from the registry if we are a service.
- *  We load each parameter from individual string keys, and then
- *  we have to parse the cmdline property into the orb_options
- *  so that they can be passed to ORB_init()
- */
 int
-Options::load_registry_options (char*& cmdline, ACE_ARGV& argv)
+Options::load_registry_options ()
 {
 #if defined (ACE_WIN32)
-  if (! this->service())
-  {
-    if (this->debug () >= 2)
-      ACE_DEBUG ((LM_DEBUG,
-      "ActivatorOptions::load_registry_options: Not running as "
-      "a service, will not load data from registry\n"));
-    return 0;
-  }
-
   HKEY key = 0;
   // Create or open the parameters key
   LONG err = ACE_TEXT_RegOpenKeyEx (SERVICE_REG_ROOT,
@@ -625,214 +218,64 @@ Options::load_registry_options (char*& cmdline, ACE_ARGV& argv)
     // If there aren't any saved parameters, then that's ok.
     return 0;
   }
-  ACE_TCHAR tmpstr[4096];
+  char tmpstr[4096];
   DWORD sz = sizeof(tmpstr);
   DWORD type = 0;
-  err = ACE_TEXT_RegQueryValueEx(key, "ORBInitOptions", 0, &type, 
-    (LPBYTE) tmpstr, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_SZ);
-    tmpstr[sz] = ACE_LIB_TEXT('\0');
-    cmdline = new char[sz+1];
-    ACE_OS::strcpy(cmdline, tmpstr);
-    parse_command_line(cmdline, argv);
-  }
-
-  sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx(key, "PersistFile", 0, &type, 
+  err = ACE_TEXT_RegQueryValueEx(key, "ORBInitOptions", 0, &type,
     (LPBYTE) tmpstr, &sz);
   if (err == ERROR_SUCCESS) {
     ACE_ASSERT(type == REG_SZ);
-    tmpstr[sz] = ACE_LIB_TEXT('\0');
-    this->file_name_ = ACE_CString(tmpstr);
+    tmpstr[sz - 1] = '\0';
+    this->cmdline_ = tmpstr;
   }
 
   sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx(key, "IORFile", 0, &type, 
+  err = ACE_TEXT_RegQueryValueEx(key, "IORFile", 0, &type,
     (LPBYTE) tmpstr, &sz);
   if (err == ERROR_SUCCESS) {
     ACE_ASSERT(type == REG_SZ);
-    tmpstr[sz] = ACE_LIB_TEXT('\0');
-    this->ior_output_file_ = ACE_CString(tmpstr);
+    tmpstr[sz - 1] = '\0';
+    this->ior_output_file_ = tmpstr;
   }
 
   sz = sizeof(debug_);
-  err = ACE_TEXT_RegQueryValueEx(key, "DebugLevel", 0, &type, 
-    (LPBYTE) &debug_ , &sz);
+  err = ACE_TEXT_RegQueryValueEx(key, "DebugLevel", 0, &type,
+    (LPBYTE) &this->debug_ , &sz);
   if (err == ERROR_SUCCESS) {
     ACE_ASSERT(type == REG_DWORD);
   }
 
-  DWORD tmp = 0;
-  err = ACE_TEXT_RegQueryValueEx(key, "PingInterval", 0, &type, 
-    (LPBYTE) &tmp, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-    ping_interval_.msec(tmp);
-  }
-
-  tmp = 0;
-  err = ACE_TEXT_RegQueryValueEx(key, "Lock", 0, &type, 
-    (LPBYTE) &tmp, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-    readonly_ = tmp != 0;
-  }
-
-  err = ACE_TEXT_RegQueryValueEx(key, "PersistType", 0, &type, 
-    (LPBYTE) &repo_mode_, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-  }
-
-  tmp = 0;
-  err = ACE_TEXT_RegQueryValueEx(key, "Timeout", 0, &type, 
-    (LPBYTE) &tmp, &sz);
-  if (err == ERROR_SUCCESS) {
-    ACE_ASSERT(type == REG_DWORD);
-    startup_timeout_.sec(tmp);
-  }
-
   err = ::RegCloseKey(key);
   ACE_ASSERT(err == ERROR_SUCCESS);
-
-  return 0;
-#else /* ACE_WIN32 */
-  ACE_UNUSED_ARG (cmdline);
-  ACE_UNUSED_ARG (argv);
-  return 0;
 #endif /* ACE_WIN32 */
+  return 0;
 }
 
-/**
- * Standalone Mode
- *
- * @retval 0 Run as standalone service
- * @retval 1 Run as a service (only on NT right now)
- */
 bool
 Options::service (void) const
 {
   return this->service_;
 }
 
-
-/**
- * Debug level for the IR.
- *
- * @retval 0 Quiet
- * @retval 1 Trace messages
- * @retval 2 Detailed messages
- */
 unsigned int
 Options::debug (void) const
 {
   return this->debug_;
 }
 
-
-/**
- * @return The file where the IOR will be stored.
- */
-ACE_CString
-Options::output_filename (void) const
+const ACE_CString&
+Options::ior_filename (void) const
 {
   return this->ior_output_file_;
 }
 
-
-/**
- * @return The amount of time to wait for a server to start.
- */
-ACE_Time_Value
-Options::startup_timeout (void) const
+Options::SERVICE_COMMAND
+Options::service_command(void) const
 {
-  return this->startup_timeout_;
+  return this->service_command_;
 }
 
-
-/**
- * @return The amount of time to wait between pings
- */
-ACE_Time_Value
-Options::ping_interval (void) const
-{
-  return this->ping_interval_;
+const char*
+Options::cmdline(void) const {
+  return this->cmdline_.c_str ();
 }
-
-/**
- * @return The ACE_Configuration object that is used to store data.
- */
-Repository_Configuration *
-Options::config (void) const
-{
-  return this->repo_config_.get();
-}
-
-int
-Options::repository_mode (void)
-{
-  return this->repo_mode_;
-}
-
-ACE_CString
-Options::file_name (void) const
-{
-  return this->file_name_;
-}
-
-const char *
-Options::convert_str (ImplementationRepository::ActivationMode mode)
-{
-  switch (mode)
-    {
-    case ImplementationRepository::NORMAL:
-      return "NORMAL";
-    case ImplementationRepository::MANUAL:
-      return "MANUAL";
-    case ImplementationRepository::PER_CLIENT:
-      return "PER_CLIENT";
-    case ImplementationRepository::AUTO_START:
-      return "AUTO_START";
-    default:
-      return "UNKNOWN";
-    };
-}
-
-ImplementationRepository::ActivationMode
-Options::convert_mode (const char * mode)
-{
-  if (ACE_OS::strcmp (mode, "NORMAL") == 0)
-    return ImplementationRepository::NORMAL;
-  else if (ACE_OS::strcmp (mode, "MANUAL") == 0)
-    return ImplementationRepository::MANUAL;
-  else if (ACE_OS::strcmp (mode, "PER_CLIENT") == 0)
-    return ImplementationRepository::PER_CLIENT;
-  else //if (ACE_OS::strcmp (mode, "AUTO_START") == 0)
-    return ImplementationRepository::AUTO_START;
-}
-
-/**
- * @return A pointer to the ORB.
- */
-CORBA::ORB_ptr
-Options::orb (void) const
-{
-  return CORBA::ORB::_duplicate (this->orb_.in ());
-}
-
-/**
- * @retval 0 Normal operation.
- * @retval 1 Do not let server info be modified.
- */
-bool
-Options::readonly (void) const
-{
-  return this->readonly_;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton <Options, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton <Options, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
index e9e7cc15466..fdf4d58acb9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
@@ -15,47 +15,37 @@
 #ifndef ACTIVATOR_OPTIONS_H
 #define ACTIVATOR_OPTIONS_H
 
-#include "Repository_Configuration.h"
+#include "activator_export.h"
 
-#include "tao/ORB.h"
-#include "tao/PortableServer/ImplRepoC.h"
-
-#include "ace/Singleton.h"
 #include "ace/SString.h"
-#include "ace/Auto_Ptr.h"
 
-// Forward declarations
-class ACE_ARGV;
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 /**
  * @class Options
  *
- * @brief Maintains the global options.
- *
- * This is where all the settings for TAO's Implementation Repository is
+ * This is where all the settings for TAO's Implementation Repository are
  * stored.
  */
-class Options
+class Activator_Export Options
 {
 public:
-  enum REPO_MODE {
-    REPO_NONE,
-    REPO_XML_FILE,
-    REPO_HEAP_FILE,
-    REPO_REGISTRY
-  };
-
+ 
   enum SERVICE_COMMAND {
     SC_NONE,
     SC_INSTALL,
-    SC_REMOVE
+    SC_REMOVE,
+    SC_INSTALL_NO_LOCATOR
   };
 
-  /// Default Constructor
   Options ();
 
   /// Parse the command-line arguments and initialize the options.
   int init (int argc, char *argv[]);
+  /// This version should only be used when run as an nt service.
+  int init_from_registry();
 
   /// Service Mode
   bool service (void) const;
@@ -64,36 +54,15 @@ public:
   unsigned int debug (void) const;
 
   /// Returns the file where the IOR should be stored.
-  ACE_CString output_filename (void) const;
-
-  /// Returns the configuration  object.
-  Repository_Configuration* config (void) const;
-
-  int repository_mode (void);
-
-  /// Returns the file name.
-  ACE_CString file_name (void) const;
+  const ACE_CString& ior_filename (void) const;
 
-  /// Converts the activation mode to a const char *. Needed to put
-  /// the activation mode into the XML file or print it out.
-  const char *convert_str (ImplementationRepository::ActivationMode mode);
+  /// The nt service command to run (install/remove)
+  SERVICE_COMMAND service_command(void) const;
 
-  ImplementationRepository::ActivationMode convert_mode (const char *mode);
+  /// Save the command line arguments as registry settings. (Windows only)
+  int save_registry_options ();
 
-  /// Returns the timeout value for program starting.
-  ACE_Time_Value startup_timeout (void) const;
-
-  /// Returns the timeout value for program starting.
-  ACE_Time_Value ping_interval (void) const;
-
-  /// Returns a pointer to the ORB.
-  CORBA::ORB_ptr orb (void) const;
-
-  /// Will we listen for multicast location requests?
-  bool multicast (void) const;
-
-  /// Do we allow modifications to the servers?
-  bool readonly (void) const;
+  const char* cmdline(void) const;
 
 private:
   /// Parses and pulls out arguments for the ImR
@@ -102,36 +71,13 @@ private:
   /// Print the usage information.
   void print_usage (void) const;
 
-  /// Wrapper for the other initialize_persistence() methods
-  int initialize_persistence(void);
-
-  /// Initialize heap file persistence.
-  int initialize_heap_persistence (void);
-
-  /// Initialize Registry persistence.
-  int initialize_registry_persistence (void);
+  /// Loads options from the registry
+  int load_registry_options ();
 
-  /// Initialize default heap for no persistence.
-  int initialize_non_persistence (void);
-
-  /// Initialize XML file persistence
-  int initialize_xml_persistence (void);
-
-  /// Run a service command.
-  int run_service_command (const ACE_CString& cmdline);
-
-  /// Loads ORB options from the registry
-  int load_registry_options (char*& cmdline, ACE_ARGV& argv);
-  int save_registry_options (const ACE_CString& cmdline);
-
-  /// The persistent configuration object.
-  auto_ptr<Repository_Configuration> repo_config_;
-
-  /// Mode of the Server Repository: if XML (x) or non-XML (n)
-  int repo_mode_;
+private:
 
-  /// The persistent file option.
-  ACE_CString file_name_;
+  /// Our extra command line arguments
+  ACE_CString cmdline_;
 
   /// Debug level.
   unsigned int debug_;
@@ -139,28 +85,11 @@ private:
   /// File where the IOR of the server object is stored.
   ACE_CString ior_output_file_;
 
-  /// Will we listen for multicast location requests?
-  bool multicast_;
-
-  /// The ORB for the Implementation Repository.
-  CORBA::ORB_var orb_;
-
-  /// The amount of time between successive "are you started yet?" pings.
-  ACE_Time_Value ping_interval_;
-
-  /// Are we running as a service?
+  /// Should we run as a service?
   bool service_;
 
-  /// The amount of time to wait for a server to response after starting it.
-  ACE_Time_Value startup_timeout_;
-
-  /// Can the server_repository be modified?
-  bool readonly_;
-
   /// SC_NONE, SC_INSTALL, SC_REMOVE, ...
-  int service_command_;
+  SERVICE_COMMAND service_command_;
 };
 
-typedef ACE_Singleton <Options, ACE_Null_Mutex> OPTIONS;
-
 #endif
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index b076bc5ae61..04cf4f5e647 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -13,20 +13,25 @@
 
 #include "ace/Log_Msg.h"
 
-ImR_Adapter_Activator::ImR_Adapter_Activator (
-  PortableServer::ServantLocator_ptr servant
-)  
-  : servant_locator_ (servant)
+ImR_Adapter::ImR_Adapter(void)
+: servant_locator_(0)
 {
-  // Nothing
+}
+
+void
+ImR_Adapter::init(PortableServer::ServantLocator_ptr servant)
+{
+  servant_locator_ = servant;
 }
 
 CORBA::Boolean
-ImR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
+ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
                                         const char *name
-                                        ACE_ENV_ARG_DECL) 
+                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_ASSERT(! CORBA::is_nil(parent));
+  ACE_ASSERT(name != 0);
   CORBA::PolicyList policies (2);
   policies.length (2);
 
@@ -37,8 +42,7 @@ ImR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
       // Servant Retention Policy
       exception_message = "While PortableServer::POA::create_servant_retention_policy";
       policies[0] =
-        parent->create_servant_retention_policy (PortableServer::NON_RETAIN
-                                                 ACE_ENV_ARG_PARAMETER);
+        parent->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
@@ -77,8 +81,8 @@ ImR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
     }
   ACE_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR, 
-                  "IMR_Adapter_Activator::unknown_adapter - %s\n", 
+      ACE_ERROR ((LM_ERROR,
+                  "IMR_Adapter_Activator::unknown_adapter - %s\n",
                   exception_message));
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "System Exception");
       return 0;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
index 62757907e07..f629595b5c3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
@@ -16,6 +16,10 @@
 
 #include "tao/PortableServer/PortableServerC.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /**
  * @class ImR_Adapter_Activator
  *
@@ -26,11 +30,10 @@
  * the POA structure that the request expects.  For each POA created, the
  * same ServantLocator will be registered in each one.
  */
-class ImR_Adapter_Activator : public PortableServer::AdapterActivator
+class ImR_Adapter : public PortableServer::AdapterActivator
 {
 public:
-  /// Constructor
-  ImR_Adapter_Activator (PortableServer::ServantLocator_ptr servant);
+  ImR_Adapter();
 
   /// Called when a POA needs to be created.
   virtual CORBA::Boolean unknown_adapter (
@@ -40,6 +43,7 @@ public:
   )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  void init(PortableServer::ServantLocator_ptr servant);
 private:
   /// The ServantLocator registered in each new POA.
   PortableServer::ServantLocator_ptr servant_locator_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 709239a31ce..73d9ad0c420 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -1,14 +1,14 @@
 //=============================================================================
 /**
- *  @file   Forwarder.cpp
- *
- *  $Id$
- *
- *  @brief  Definition of ImR_Forwarder
- *
- *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
- *  @author Priyanka Gontla <pgontla@doc.ece.uci.edu>
- */
+*  @file   Forwarder.cpp
+*
+*  $Id$
+*
+*  @brief  Definition of ImR_Forwarder
+*
+*  @author Darrell Brunsch <brunsch@cs.wustl.edu>
+*  @author Priyanka Gontla <pgontla@doc.ece.uci.edu>
+*/
 //=============================================================================
 
 #include "Forwarder.h"
@@ -21,47 +21,47 @@
 #include "tao/PortableServer/Object_Adapter.h"
 
 /**
- * This constructor takes in orb and ImR_Locator_i pointers to store for later
- * use.  It also grabs a reference to the POACurrent object for use in
- * preinvoke.
- */
-ImR_Forwarder::ImR_Forwarder (ImR_Locator_i *imr_impl, CORBA::ORB_ptr orb)
-  : imr_impl_ (imr_impl),
-    orb_ (orb)
+* This constructor takes in orb and ImR_Locator_i pointers to store for later
+* use.  It also grabs a reference to the POACurrent object for use in
+* preinvoke.
+*/
+ImR_Forwarder::ImR_Forwarder (ImR_Locator_i& imr_impl)
+  : locator_ (imr_impl)
 {
-  ACE_ASSERT (imr_impl != 0);
+}
 
+void
+ImR_Forwarder::init(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+{
+  ACE_ASSERT(! CORBA::is_nil(orb));
+  this->orb_ = orb;
   ACE_TRY_NEW_ENV
-    {
-      CORBA::Object_var tmp =
-        orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->poa_current_var_ =
-        PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
+  {
+    CORBA::Object_var tmp =
+      orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    this->poa_current_var_ =
+      PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  }
   ACE_CATCHANY
-    {
-      // Ignore
-    }
+  {
+    ACE_DEBUG((LM_DEBUG, "ImR_Forwarder::init() Exception ignored.\n"));
+  }
   ACE_ENDTRY;
-
+  ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (this->poa_current_var_.in ()));
 }
 
-
 /**
- * We figure out the intended recipient from the POA name.  After activating
- * the server, we throw a forwarding exception to the correct server.
- *
- * The big complicated thing here is that we have to create the forwarding
- * ior based on what we already have.  So we combine the endpoint received
- * from activate_server_i and append the objectid from the request to it.
- *
- * @todo Should we base the name on the entire POA hierarchy?
- * @todo Use ACE_TString for the IOR?  Can it always be a char?
- */
+* We figure out the intended recipient from the POA name.  After activating
+* the server, we throw a forwarding exception to the correct server.
+*
+* The big complicated thing here is that we have to create the forwarding
+* ior based on what we already have.  So we combine the endpoint received
+* from activate_server_i and append the objectid from the request to it.
+*/
 PortableServer::Servant
 ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
                           PortableServer::POA_ptr poa,
@@ -70,53 +70,64 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest))
 {
-  ACE_TString ior;
+  ACE_ASSERT(! CORBA::is_nil(poa));
   CORBA::Object_var forward_obj;
 
   ACE_TRY
+  {
+    CORBA::String_var server_name = poa->the_name();
+
+    // The activator stores a partial ior with each server. We can
+    // just tack on the current ObjectKey to get a valid ior for
+    // the desired server.
+    CORBA::String_var pior = locator_.activate_server_by_name(server_name.in(), false ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    ACE_CString ior = pior.in();
+ 
+    // Check that the returned ior is the expected partial ior with
+    // missing ObjectKey.
+    if (ior.find("corbaloc:") != 0 || ior[ior.length() - 1] != '/')
     {
-      CORBA::String_var poa_name = poa->the_name();
-
-      // The activator stores a partial ior with each server. We can
-      // just tack on the current ObjectKey to get a valid ior for 
-      // the desired server.
-      ior = this->imr_impl_->activate_server_with_startup (poa_name.in (), 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Check that the returned ior is the expected partial ior with 
-      // missing ObjectKey.
-      ACE_ASSERT(ACE_OS::strncmp(ior.c_str(), "corbaloc:", 9) == 0);
-      ACE_ASSERT(ior[ior.length() - 1] == '/');
-
-      CORBA::String_var key_str;
-
-      // Unlike POA Current, this implementation cannot be cached.
-      TAO_POA_Current *tao_current =
-        ACE_dynamic_cast (TAO_POA_Current*, this->poa_current_var_.in ());
-      TAO_POA_Current_Impl *impl = tao_current->implementation ();
-      TAO::ObjectKey::encode_sequence_to_string (key_str.out(), impl->object_key ());
-
-      // Append the key_string to the IOR that is received from the
-      // activate_server_with_startup function call.
-      ior += key_str.in();
-
-      // Get the object corresponding to the string.
-      forward_obj =
-        this->orb_->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "Forwarder system exception");
-      ACE_RE_THROW;
+      ACE_ERROR((LM_ERROR, "ImR_Forwarder::preinvoke() Invalid corbaloc ior.\n\t<%s>\n", ior.c_str()));
+      ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST (
+        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+        CORBA::COMPLETED_NO));
     }
+ 
+    CORBA::String_var key_str;
+    // Unlike POA Current, this implementation cannot be cached.
+    TAO_POA_Current* tao_current =
+      dynamic_cast<TAO_POA_Current*> (this->poa_current_var_.in ());
+    ACE_ASSERT(tao_current != 0);
+    TAO_POA_Current_Impl* impl = tao_current->implementation ();
+    TAO::ObjectKey::encode_sequence_to_string (key_str.out(), impl->object_key ());
+ 
+    ior += key_str.in();
+ 
+    forward_obj =
+      this->orb_->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+  {
+    ACE_TRY_THROW (CORBA::TRANSIENT (
+      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+      CORBA::COMPLETED_NO));
+  }
+  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  {
+    ACE_TRY_THROW (CORBA::TRANSIENT (
+      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+      CORBA::COMPLETED_NO));
+  }
   ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Forwarder exception");
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-          CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-          CORBA::COMPLETED_NO));
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Forwarder");
+    ACE_TRY_THROW (CORBA::TRANSIENT (
+      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+      CORBA::COMPLETED_NO));
+  }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
 
@@ -124,20 +135,20 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
     ACE_THROW_RETURN (PortableServer::ForwardRequest (forward_obj.in ()), 0);
 
   ACE_ERROR ((LM_ERROR, "Error: Forward_to reference is nil.\n"));
-  ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+  ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (
+    CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+    CORBA::COMPLETED_NO), 0);
 }
 
-/**
- * The postinvoke method just deletes the passed in servant.
- */
 void
-ImR_Forwarder::postinvoke (const PortableServer::ObjectId &,
-                           PortableServer::POA_ptr ,
-                           const char * ,
-                           PortableServer::ServantLocator::Cookie ,
-                           PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+ImR_Forwarder::postinvoke (
+                           const PortableServer::ObjectId &,
+                           PortableServer::POA_ptr,
+                           const char *,
+                           PortableServer::ServantLocator::Cookie,
+                           PortableServer::Servant
+                           ACE_ENV_ARG_DECL_NOT_USED
+                           ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  delete servant;
 }
+
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
index fe0828939ad..2236f1cf7ff 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
@@ -17,6 +17,10 @@
 
 #include "tao/PortableServer/PortableServerC.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 class ImR_Locator_i;
 
 /**
@@ -31,7 +35,7 @@ class ImR_Locator_i;
 class ImR_Forwarder: public PortableServer::ServantLocator
 {
 public:
-  ImR_Forwarder (ImR_Locator_i *ir_impl, CORBA::ORB_ptr orb);
+  ImR_Forwarder (ImR_Locator_i& imr_impl);
 
   /// Called before the invocation begins.
   virtual PortableServer::Servant preinvoke (
@@ -42,18 +46,20 @@ public:
     ACE_ENV_ARG_DECL
   ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest));
 
-  /// Called after the invocation finishes.
-  virtual void postinvoke (const PortableServer::ObjectId &oid,
-                           PortableServer::POA_ptr poa,
-                           const char * operation,
-                           PortableServer::ServantLocator::Cookie cookie,
-                           PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void postinvoke (
+    const PortableServer::ObjectId & oid,
+    PortableServer::POA_ptr adapter,
+    const char * operation,
+    PortableServer::ServantLocator::Cookie the_cookie,
+    PortableServer::Servant the_servant
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    ) ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void init(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
 
 private:
   /// Where we find out where to forward to.
-  ImR_Locator_i *imr_impl_;
+  ImR_Locator_i& locator_;
 
   /// POA reference.
   PortableServer::Current_var poa_current_var_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index 7dff48ece99..fc134784585 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -1,26 +1,51 @@
 //=============================================================================
 /**
- *  @file   INS_Locator.cpp
- *
- *  $Id$
- *
- *  @brief  Implementation of the ImR's INS Locator class
- *
- *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
- */
+*  @file   INS_Locator.cpp
+*
+*  $Id$
+*
+*  @brief  Implementation of the ImR's INS Locator class
+*
+*  @author Darrell Brunsch <brunsch@cs.wustl.edu>
+*/
 //=============================================================================
 
 #include "INS_Locator.h"
 #include "ImR_Locator_i.h"
+#include "tao/ORB_Constants.h"
 
-INS_Locator::INS_Locator (ImR_Locator_i* loc)
-  :  imr_locator_ (loc)
+INS_Locator::INS_Locator (ImR_Locator_i& loc)
+: imr_locator_ (loc)
 {
 }
 
 char *
 INS_Locator::locate (const char* object_key ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
+ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
-  return this->imr_locator_->find_ior (object_key ACE_ENV_ARG_PARAMETER);
+  ACE_ASSERT(object_key != 0);
+  ACE_TRY
+  {
+    CORBA::String_var located =
+      this->imr_locator_.activate_server_by_object(object_key ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    ACE_CString tmp = located.in();
+    tmp += object_key;
+    return CORBA::string_dup(tmp.c_str());
+  }
+  ACE_CATCH(ImplementationRepository::CannotActivate, ex)
+  {
+    ACE_TRY_THROW (CORBA::TRANSIENT (
+      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+      CORBA::COMPLETED_NO));
+  }
+  ACE_CATCH(ImplementationRepository::NotFound, ex)
+  {
+    ACE_TRY_THROW (CORBA::TRANSIENT (
+      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+      CORBA::COMPLETED_NO));
+  }
+  ACE_ENDTRY;
+  return 0;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
index 26071a51348..0536aac2fb0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
@@ -16,7 +16,10 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/IORTable/IORTable.h"
-#include "tao/LocalObject.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class ImR_Locator_i;
 
@@ -28,22 +31,18 @@ class ImR_Locator_i;
  * This class provides a callback for the IORTable to call when it needs
  * to dynamically receive a IOR to forward in response to an INS request.
  */
-class INS_Locator : public virtual IORTable::Locator,
-                    public virtual TAO_Local_RefCounted_Object
+class INS_Locator : public virtual IORTable::Locator
 {
 public:
-  /// Constructor
-  INS_Locator (ImR_Locator_i* loc);
+  INS_Locator (ImR_Locator_i& loc);
 
   /// Locate the appropriate IOR.
-  char * locate (const char *object_key ACE_ENV_ARG_DECL)
+  char* locate (const char *object_key ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
 
 private:
-
-  ImR_Locator_i* imr_locator_;
-
+  ImR_Locator_i& imr_locator_;
 };
 
 #include /**/ "ace/post.h"
-#endif 
+#endif
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index 32bcac3b6c2..d0282d28cae 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -6,15 +6,14 @@
 #include "Activator_NT_Service.h"
 
 int
-run_standalone (void)
+run_standalone (Options& opts)
 {
   ImR_Activator_i server;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      // Initialize the ImR_Activator_i server.
-      int status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER);
+      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -27,8 +26,9 @@ run_standalone (void)
           server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          // We should only get here if the shutdown_repo operation has
-          // been called. That operation saves the Activator's state.  
+          // End the server after its work is done.
+          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
           if (status == -1)
             return 1;
@@ -60,11 +60,7 @@ int
 run_service (void)
 {
 #if defined (ACE_WIN32)
-  // @todo: Update me
-
-  // If we get here, we either run the app in debug mode (-d) or are
-  // being called from the service manager to start the service.
-
+  SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
   ACE_NT_SERVICE_RUN (service, SERVICE::instance (), ret);
 
   if (ret == 0)
@@ -76,18 +72,106 @@ run_service (void)
 #endif /* ACE_WIN32 */
 }
 
+/**
+ * Executes the various commands that are useful for a NT service.  Right
+ * now these include 'install' and 'remove'.  Others, such as 'start' and
+ * 'stop' can be added, but the 'net' program in Windows already handles
+ * these commands.
+ */
+static int
+run_service_command (Options& opts)
+{
+  if (opts.service_command() == Options::SC_NONE) 
+    return 0;
+
+#if defined (ACE_WIN32)
+  SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
+
+  if (opts.service_command() == Options::SC_INSTALL ||
+    opts.service_command() == Options::SC_INSTALL_NO_LOCATOR)
+    {
+      const DWORD MAX_PATH_LENGTH = 4096;
+      char pathname[MAX_PATH_LENGTH]; 
+
+      DWORD length = ACE_TEXT_GetModuleFileName(NULL, pathname, MAX_PATH_LENGTH);
+      if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s"))
+        {
+          ACE_ERROR ((LM_ERROR, "Error: Could not get module file name\n"));
+          return -1;
+        }
+
+      // Append the command used for running the implrepo as a service
+      ACE_OS::strcat (pathname, ACE_TEXT (" -s"));
+      int ret = -1;
+      if (opts.service_command() == Options::SC_INSTALL) 
+      {
+        const char* DEPENDS_ON = "TAOIMRLocator"; // Must match Locator_NT_Service.h
+
+        ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
+                                            SERVICE_ERROR_NORMAL,
+                                            pathname,
+                                            0, // group
+                                            0, // tag
+                                            DEPENDS_ON
+                                            );
+      }
+      else
+      {
+        ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
+                                            SERVICE_ERROR_NORMAL,
+                                            pathname);
+      }
+      if (ret != -1) {
+        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n"));
+        opts.save_registry_options();
+      } else {
+        ACE_ERROR((LM_ERROR, "Error: Failed to install service.\n"));
+      }
+      if (ret == 0) 
+        return 1;
+    }
+  else if (opts.service_command() == Options::SC_REMOVE)
+    {
+      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.
+    }
+  else 
+  {
+    ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d \n", 
+      opts.service_command()));
+    return -1;
+  }
+
+  return -1;
+
+#else /* ACE_WIN32 */
+  ACE_ERROR ((LM_ERROR, "NT Service not supported on this platform"));
+  return -1;
+#endif /* ACE_WIN32 */
+}
+
 int
 main (int argc, char *argv[])
 {
-  int result = OPTIONS::instance ()->init (argc, argv);
+  Options opts;
+
+  int result = opts.init (argc, argv);
+  if (result < 0)
+    return 1;  // Error
+  else if (result > 0)
+    return 0;  // No error, but we should exit anyway.
 
+  result = run_service_command(opts);
   if (result < 0)
-    return 1;  // Error parsing args
+    return 1;  // Error
   else if (result > 0)
     return 0;  // No error, but we should exit anyway.
 
-  if (OPTIONS::instance()->service())
-    return run_service ();
+  if (opts.service())
+    return run_service();
 
-  return run_standalone ();
+  return run_standalone (opts);
 }
+
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index f48de6daf17..c2f07a4fa3d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -2,1338 +2,388 @@
 
 #include "ImR_Activator_i.h"
 
-#include "INS_Locator.h"
-#include "Iterator.h"
 #include "Activator_Options.h"
 
-#include "tao/PortableServer/Default_Acceptor_Filter.h"
-#include "tao/PortableServer/ImR_LocatorC.h"
-
-#include "tao/Acceptor_Registry.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/ORB_Core.h"
-#include "tao/MProfile.h"
-#include "tao/Profile.h"
-#include "tao/default_ports.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_netdb.h"
-#include "ace/OS_NS_sys_time.h"
+#include "ace/Reactor.h"
+#include "ace/ARGV.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (ImplRepo_Service,
-           ImR_Activator_i,
-           "$Id$")
 
-
-ImR_Activator_i::ImR_Activator_i (void)
-  : registration_token_(0)
+static ACE_CString getActivatorName()
 {
-  char host_name[MAXHOSTNAMELEN + 1];
+  char host_name[MAXHOSTNAMELEN];
   ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
-  name_ = host_name;
-}
-
-char *
-ImR_Activator_i::find_ior (const char* oname ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
-{
-  // We assume that the first part of the object name is the poa name.
-  // So we would think that a name of foo/bar means that the POA name
-  // is foo.
-  ACE_CString object_name(oname);
-  ssize_t pos = object_name.find ('/');
-
-  if (pos == ACE_CString::npos)
-    pos = ACE_static_cast (ssize_t, object_name.length ());
-
-  ACE_CString poa_name;
-  poa_name.set (object_name.fast_rep (), pos, 1);
-
-  ACE_CString endpoint;
-  ACE_TRY
-    {
-      // Activate the server and return the object reference.
-      endpoint = this->activate_server_with_startup (poa_name.c_str (), 1
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  // Have to do this so it is null terminated
-  ACE_CString object_name2 (object_name.fast_rep (),
-                            object_name.length ());
-
-  ACE_CString ior = endpoint;
-  ior += object_name2;
-
-  if (OPTIONS::instance()->debug () >= 1)
-    ACE_DEBUG ((LM_DEBUG, "ImR Activator: Found IOR"
-      " for %s is %s\n", oname, endpoint.c_str()));
-
-  return CORBA::string_dup (ior.c_str ());
-}
-
-
-// Starts the server defined by the POA name <server> if it is
-// not already started and if it can be started.
-void
-ImR_Activator_i::activate_server (const char *server ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::NotFound,
-                     ImplementationRepository::CannotActivate))
-{
-  // Since this is called through the Admin interface, we should ignore some
-  // of the activation modes.  Also ignore the return value.
-  this->activate_server_i (server, 0 ACE_ENV_ARG_PARAMETER);
-  if (OPTIONS::instance()->debug () >= 1)
-    ACE_DEBUG ((LM_DEBUG, "ImR Activator: Activate server %s.\n", server));
+  return ACE_CString (host_name);
 }
 
-char *
-ImR_Activator_i::activate_server_with_startup (const char *server,
-                                               int check_startup
-                                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::NotFound,
-                   ImplementationRepository::CannotActivate))
+ImR_Activator_i::ImR_Activator_i (void)
+: registration_token_(0)
+, debug_(0)
+, name_(getActivatorName())
 {
-  if (OPTIONS::instance()->debug () >= 1)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ImR Activator: Activate server"
-      " %s. Check startup=%d.\n", server, check_startup));
-  }
-  return this->activate_server_i (server, check_startup ACE_ENV_ARG_PARAMETER);
 }
 
-// Activates the server and returns the IOR of the object that is
-// activated.
-char *
-ImR_Activator_i::activate_server_i(const char *server,
-                                               int check_startup
-                                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::NotFound,
-                   ImplementationRepository::CannotActivate))
+int
+ImR_Activator_i::init_with_orb(CORBA::ORB_ptr orb, const Options& opts ACE_ENV_ARG_DECL)
 {
-  CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
-
-  int start = 0;
-  ACE_CString server_object_ior, partial_ior;
-
-  ACE_CString logical, startup, working;
-  ImplementationRepository::EnvironmentList environment;
-  ImplementationRepository::ActivationMode activation;
-
-  // Get the startup information for the server in question.
-  if (this->repository_.get_startup_info (server,
-                                          logical,
-                                          startup,
-                                          environment,
-                                          working,
-                                          activation) != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Cannot find startup info for server <%s>\n",
-                  server));
-      ACE_THROW_RETURN(ImplementationRepository::NotFound (), 0);
-    }
-
-  // Find out if it is already running
-  if (this->repository_.get_running_info (server,
-                                          partial_ior,
-                                          server_object_ior) != 0)
-    {
-      // If we had problems getting the server_object_ior, probably meant that
-      // there is no <server> registered
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Cannot find ServerObject IOR for server <%s>\n",
-                  server));
-      ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
-    }
-
-  // Check to see if there is one running (if there is a server_object_ior)
-  if (server_object_ior.length () != 0)
-    {
-      // It is running
-      ACE_TRY
-        {
-          CORBA::Object_var object =
-            orb->string_to_object (server_object_ior.c_str ()
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ImplementationRepository::ServerObject_var server_object =
-            ImplementationRepository::ServerObject::_narrow (object.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (server_object.in ()))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "ImR Activator: Invalid ServerObject IOR: <%s>\n",
-                          server_object_ior.c_str ()));
-              ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
-            }
+  ACE_ASSERT(! CORBA::is_nil(orb));
+  orb_ = CORBA::ORB::_duplicate(orb);
+  debug_ = opts.debug();
 
-          // Check to see if we can ping it
-          server_object->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          // If we got an exception, then we have to restart it.
-          start = 1;
-        }
-      ACE_ENDTRY;
-    }
-  else
-  {
-    start = 1;
-  }
-
-  if (start == 1)
-    {
-      // Make sure the activation allows us to start it up.
-      if (activation == ImplementationRepository::MANUAL && check_startup)
-        ACE_THROW_RETURN (CORBA::TRANSIENT (
-            CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE,
-                                                     0),
-            CORBA::COMPLETED_NO),
-          0);
-
-      this->start_server_i (server);
-      ACE_CHECK_RETURN (0);
-    }
-
-  // Get the latest information about where the server is running and
-  // it's IOR
-  if (this->repository_.get_running_info (server,
-                                          partial_ior,
-                                          server_object_ior) != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Can not resolve server <%s>\n",
-                  server));
-    }
-
-  if (activation == ImplementationRepository::PER_CLIENT && check_startup)
+  ACE_TRY
   {
-    if (this->repository_.update (server, "", "") != 0)
+    if (this->debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Activator: Contacting ImplRepoService...\n"));
+
+    // First, resolve the ImR Locator, without this we can go no further
+    CORBA::Object_var obj =
+      orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    if (CORBA::is_nil(obj.in ()))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+        "Unable to resolve_initial_references \"ImplRepoService\"\n"), -1);
+    }
+    locator_ = ImplementationRepository::Locator::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ASSERT(! CORBA::is_nil(locator_.in()));
+
+    // Create a new poa and poa manager
+    obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ASSERT(! CORBA::is_nil(obj.in()));
+    this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ASSERT(! CORBA::is_nil(this->root_poa_.in()));
+
+    // Note : There is no point in making the activator use a persistent POA, because
+    // it will always re-register with the ImR on startup anyway.
+    CORBA::PolicyList policies;
+    this->imr_poa_ = this->root_poa_->create_POA("ImR_Activator",
+      PortableServer::POAManager::_nil(), policies ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ASSERT(! CORBA::is_nil(this->imr_poa_.in()));
+
+    // Activate ourself
+    PortableServer::ObjectId_var id =
+      this->imr_poa_->activate_object(this ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    obj = this->imr_poa_->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ImplementationRepository::Activator_var activator =
+      ImplementationRepository::Activator::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ASSERT(! CORBA::is_nil(activator.in()));
+
+    CORBA::String_var ior = this->orb_->object_to_string(activator.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    if (this->debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str()));
+
+    // initialize our process manager.
+    // This requires a reactor that has signal handling.
+    ACE_Reactor *reactor = ACE_Reactor::instance ();
+    if (reactor != 0)
+    {
+      if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, reactor) == -1)
       {
-        ACE_ERROR ((LM_ERROR,
-                    "ImR Activator: Could not update information for server <%s>\n",
-                   server));
-        ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
+        ACE_ERROR_RETURN ((LM_ERROR,
+          "The ACE_Process_Manager didnt get initialized\n"), -1);
       }
-  }
-
-  return CORBA::string_dup (partial_ior.c_str ());
-}
-
-
-// Starts the server process
-void
-ImR_Activator_i::start_server_i (const char *server ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::NotFound,
-                     ImplementationRepository::CannotActivate))
-{
-  CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
-
-  int spawned_pid = 0;
-  ACE_CString logical, startup, working;
-  ImplementationRepository::EnvironmentList environment;
-  ImplementationRepository::ActivationMode activation;
-
-  // Get the server startup information.
-  if (this->repository_.get_startup_info (server,
-                                          logical,
-                                          startup,
-                                          environment,
-                                          working,
-                                          activation) != 0)
-    {
-      // In case of failure, print it out.
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Cannot find startup info for server <%s>\n",
-                  server));
-
-      // And, throw the exception.
-      ACE_THROW (ImplementationRepository::NotFound ());
-      ACE_CHECK;
-    }
-
-  // Check to see if it is already starting up
-  int startup_val = this->repository_.starting_up (server, 1);
-
-  if (startup_val == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Cannot find startup info for server <%s>\n",
-                  server));
-
-      ACE_THROW (ImplementationRepository::NotFound ());
-      ACE_CHECK;
-    }
-
-  // startup_val will be zero only if the server is running.
-  if (startup_val == 0)
-    {
-      if (startup.length () == 0)
-        {
-          // If there is no startup information, throw an exception
-          ACE_ERROR ((LM_ERROR,
-                      "ImR Activator: No startup information for server <%s>\n",
-                      server));
-          ACE_THROW (ImplementationRepository::CannotActivate
-            (CORBA::string_dup ("No startup information")));
-          ACE_CHECK;
-        }
-
-      if (OPTIONS::instance()->debug () >= 1)
-        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Starting server %s\n", server));
-
-      // Set the Process parameters.
-      ACE_Process_Options proc_opts;
-
-      proc_opts.command_line (startup.c_str ());
-      proc_opts.working_directory (working.c_str ());
-      proc_opts.handle_inheritence (0);
-
-      // Win32 does not support the CLOSE_ON_EXEC semantics for sockets
-      // the way unix does, so in order to avoid having the child process
-      // hold the listen socket open, we force the child to inherit no
-      // handles. This includes stdin, stdout, logs, etc.
-
-      for (CORBA::ULong i = 0; i < environment.length(); ++i)
-        proc_opts.setenv (environment[i].name.in (), environment[i].value.in ());
-
-      // Spawn the proces.
-      spawned_pid = this->process_mgr_.spawn (proc_opts);
-
-      if (spawned_pid == ACE_INVALID_PID)
-        {
-          // If invalid PID..
-          ACE_ERROR ((LM_ERROR,
-                     "ImR Activator: Cannot activate server <%s> using <%s>\n",
-                      server,
-                      startup.c_str ()));
-
-          // and throw the exception
-          ACE_THROW (ImplementationRepository::CannotActivate
-            (CORBA::string_dup ("Process Creation Failed")));
-          ACE_CHECK;
-        }
-      else if (OPTIONS::instance ()->debug () >= 2)
-        ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::start_server_i: Process ID is %d\n", spawned_pid));
-    }
-
-  // Now that the server has been started up, we need to go back into the event
-  // loop so we can get the reponse or handle other requests
-  TAO_ORB_Core *orb_core = orb->orb_core ();
-
-  int starting_up;
-
-  ACE_Time_Value timeout = OPTIONS::instance ()->startup_timeout ();
-
-  // We will wait till the timeout period for the server to get
-  // started up. The starting_up value will be made zero when the
-  // server is up and running. And, thats the condition that we are
-  // checking.
-  while ((starting_up = this->repository_.starting_up (server)) == 1)
-    {
-      if (OPTIONS::instance()->debug () >= 2)
-        ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::activate_server: Going into handle_events\n"));
-
-      // Will wait for the specified timeout.
-      int result = orb_core->reactor ()->handle_events (&timeout);
-
-      if (result == 0 && timeout == ACE_Time_Value::zero)
-        {
-          // The timer is out and we are still in the while loop which
-          // means that the server is not activated. Set the
-          // starting_up_ value to '0' and
-          this->repository_.starting_up (server, 0);
-
-          // print the same.
-          ACE_ERROR ((LM_ERROR,
-                      "ImR Activator: Cannot activate server <%s> using <%s>, "
-                      "terminating it.\n",
-                      server,
-                      startup.c_str ()));
-
-          // Kill the server
-          this->process_mgr_.terminate (spawned_pid);
-
-          ACE_THROW(ImplementationRepository::CannotActivate
-                    (CORBA::string_dup ("Timeout")));
-          ACE_CHECK;
-        }
     }
 
-  // If the control comes here, it means that the server got activated.
-  if (OPTIONS::instance()->debug () >= 2)
-    ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::activate_server: Got out of handle_events loop\n"));
+    // Register with the ImR Locator
+    this->registration_token_ =
+      locator_->register_activator (name_.c_str(), activator.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-  // Check to see if it disappeared on us
-  if (starting_up == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Cannot find startup info for server <%s>\n",
-                  server));
-
-      ACE_THROW (ImplementationRepository::NotFound ());
-      ACE_CHECK;
-    }
-
-  // Now check to see if it is responding yet.
-  int ready_error = this->ready_check (server);
-
-  if (ready_error < 0)
-    {
-      // We got an error in ready_check, so shutdown the server and
-      // throw an exception
-
-      this->process_mgr_.terminate (spawned_pid);
-
-      if (ready_error == -1)
-        {
-          ACE_THROW (ImplementationRepository::CannotActivate
-            (CORBA::string_dup ("Timeout while pinging for readiness")));
-        }
-      else
-        {
-          ACE_THROW (ImplementationRepository::CannotActivate
-            (CORBA::string_dup ("Unknown error")));
-        }
-    }
-}
-
-
-// ready_check will continuously ping a server and either return when it
-// responds to the ping or return -1 if it times out.
-int
-ImR_Activator_i::ready_check (const char *server)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::NotFound))
-{
-  CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
-
-  ACE_CString ping_object_ior, location;
-  ImplementationRepository::ServerObject_var ping_object;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // <end> is the end of the window where we can get a response before
-  // timing out
-  ACE_Time_Value end = ACE_OS::gettimeofday ()
-                       + OPTIONS::instance ()->startup_timeout ();
-
-  // Get the ior for the "ping" object for the server
-  if (this->repository_.get_running_info (server,
-                                          location,
-                                          ping_object_ior) != 0)
-    {
-      // If get_running_info fails, something weird must have happened.
-      // Maybe it was removed after we started it up, but before we got here.
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Cannot find ServerObject IOR for server <%s>\n",
-                  server));
-
-      ACE_THROW_RETURN (
-          ImplementationRepository::NotFound (),
-          -2
-        );
-    }
-
-  // Narrow the ping object
-
-  ACE_TRY_EX (ping1)
-    {
-      // Get the Object
-      CORBA::Object_var object =
-        orb->string_to_object (ping_object_ior.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (ping1);
+    // Activate the manager for the root poa
+    PortableServer::POAManager_var poaman =
+      this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // Narrow it down to the correct interface
-      ping_object =
-        ImplementationRepository::ServerObject::_narrow (object.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (ping1);
+    // Activate the manager for the activator poa
+    poaman = this->imr_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      if (CORBA::is_nil (ping_object.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "ImR Activator: Invalid ServerObject IOR: <%s>\n",
-                      ping_object_ior.c_str ()));
-
-          ACE_THROW_RETURN (
-              ImplementationRepository::NotFound (),
-              -2
-            );
-        }
-
-  }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Cannot activate server <%s>, "
-                  "terminating it (Server Ping Object failed).\n",
-                  server));
-
-      return -2;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-2);
-
-  // Now ping it until we get a response.
-  while (ACE_OS::gettimeofday () < end)
-    {
-      ACE_TRY_EX (ping2);
-        {
-          if (OPTIONS::instance()->debug () >= 2)
-            ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::ready_check: ping server.\n"));
-
-          ping_object->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (ping2);
-
-          if (OPTIONS::instance()->debug () >= 2)
-            ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::ready_check: Pinged Server OK\n"));
-
-          // If we got here, we successfully pinged, therefore we
-          // can exit the function.
-          return 0;
-        }
-      ACE_CATCHANY // todo : I doubt we really want to retry on all exceptions. Maybe just transient?
-        {
-          // Ignore the exception
-          if (OPTIONS::instance()->debug () >= 2)
-            ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::ready_check: Server not ready (Exception)\n"));
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-2);
-
-      // Sleep between sending pings.
-      ACE_OS::sleep (OPTIONS::instance ()->ping_interval ());
-    }
-
-  // If we fall out here, that means we didn't get a response before timing
-  // out, so return an error.
-  return -1;
-}
-
-
-// Adds an entry to the Repository about this <server>
-
-void
-ImR_Activator_i::register_server (
-    const char *server,
-    const ImplementationRepository::StartupOptions &options
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::AlreadyRegistered,
-                   ImplementationRepository::NotFound
-                   ))
-{
-  if (OPTIONS::instance ()->readonly ())
-    {
-      ACE_THROW (CORBA::NO_PERMISSION ());
-    }
-
-  if (OPTIONS::instance ()->debug () >= 1)
-    ACE_DEBUG((LM_DEBUG, "Imr Activator: Register server %s.\n", server));
-
-  if (OPTIONS::instance ()->debug () >= 2)
+    if (this->debug_ > 1)
     {
       ACE_DEBUG ((LM_DEBUG,
-        "ImR_Activator_i::register_server:\nServer: %s\n"
-                  "Command Line: %s\n"
-                  "Working Directory: %s\n"
-                  "Activation Mode: %s\n\n",
-                  server,
-                  options.command_line.in (),
-                  options.working_directory.in (),
-                  OPTIONS::instance ()->convert_str (options.activation)));
-
-      for (CORBA::ULong i = 0; i < options.environment.length (); ++i)
-         ACE_DEBUG ((LM_DEBUG, "Environment variable %s=%s\n",
-                     options.environment[i].name.in (),
-                     options.environment[i].value.in ()));
+        "ImR_Activator_i::init: The Activator IOR is: <%s>\n", ior.in ()));
     }
 
-  // Add the server
-  int status = this->repository_.add (server,
-                                      "",
-                                      options.command_line.in (),
-                                      options.environment,
-                                      options.working_directory.in (),
-                                      options.activation);
-
-  if (status == 1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Server %s Already Registered!\n",
-                  server));
-      ACE_THROW (ImplementationRepository::AlreadyRegistered ());
-    }
-}
-
-
-// Updates the entry in the Repository about this <server> or adds it
-// if necessary.
-
-void
-ImR_Activator_i::reregister_server (const char *server,
-                                    const ImplementationRepository::StartupOptions &options
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-  ImplementationRepository::AlreadyRegistered,
-  ImplementationRepository::NotFound
-  ))
-{
-  if (OPTIONS::instance ()->debug () >= 1)
-    ACE_DEBUG((LM_DEBUG, "ImR Activator: Reregister server %s.\n", server));
-
-  if (OPTIONS::instance ()->readonly ())
+    // The last thing we do is write out the ior so that a test program can assume
+    // that the activator is ready to go as soon as the ior is written.
+    if (opts.ior_filename().length() > 0)
     {
-      ACE_THROW (CORBA::NO_PERMISSION ());
+      FILE* fp = ACE_OS::fopen(opts.ior_filename().c_str(), "w");
+      if (fp == 0)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+          "ImR Activator: Could not open file: %s\n", opts.ior_filename().c_str()), -1);
+      }
+      ACE_OS::fprintf(fp, "%s", ior.in());
+      ACE_OS::fclose(fp);
     }
-
-  // Get current starting up value
-  int starting_up = this->repository_.starting_up (server);
-
-  // Get ready to save the running info
-  ACE_CString location;
-  ACE_CString server_object_ior;
-
-  // Only save the running info if it's still running before we remove it.
-  ACE_TRY
-    {
-      // Get the current running information
-      ACE_CString ping_location;
-      ACE_CString ping_object_ior;
-      this->repository_.get_running_info (server,
-                                          ping_location,
-                                          ping_object_ior);
-
-      // Narrow the server
-      CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
-      CORBA::Object_var object =
-        orb->string_to_object (ping_object_ior.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ImplementationRepository::ServerObject_var ping_object =
-        ImplementationRepository::ServerObject::_narrow (object.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!CORBA::is_nil (ping_object.in ()))
-        {
-          // Ok, we've found our ior, now we remove the server from the
-          // repository in order to avoid restarting it if it's not
-          // running
-          this->repository_.remove (server);
-
-          // Now ping the object
-          ping_object->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // If the ping succeeded, then we will save the
-          // running information for this server
-          location = ping_location;
-          server_object_ior = ping_object_ior;
-        }
   }
   ACE_CATCHANY
-    {
-      // Ignore all exceptions
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::init_with_orb");
+    ACE_RE_THROW;
+  }
   ACE_ENDTRY;
-
-  // Remove old info
-  this->repository_.remove (server);
-
-  // Add server with new startup parameters
-  this->repository_.add (server,
-                         "",
-                         options.command_line.in (),
-                         options.environment,
-                         options.working_directory.in (),
-                         options.activation);
-
-  // Set the old running info
-  if (location.length () != 0)
-    this->repository_.update (server, location, server_object_ior);
-
-  // Set old starting up value, if there was one.
-  if (starting_up != -1)
-    this->repository_.starting_up (server, starting_up);
-
-  if (OPTIONS::instance()->debug () >= 2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::reregister_server:\nServer: %s\n"
-                            "Command Line: %s\n"
-                            "Working Directory: %s\n"
-                            "Activation: %s\n\n",
-                            server,
-                            options.command_line.in (),
-                            options.working_directory.in (),
-                            OPTIONS::instance ()->convert_str (options.activation)));
-      for (CORBA::ULong i = 0; i < options.environment.length (); ++i)
-          ACE_DEBUG ((LM_DEBUG, "Environment variable %s=%s\n",
-                      options.environment[i].name.in (),
-                      options.environment[i].value.in ()));
-    }
-}
-
-
-// Remove the server entry from the Repository
-
-void
-ImR_Activator_i::remove_server (const char *server
-                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::NotFound))
-{
-  if (OPTIONS::instance ()->readonly ())
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Activator is readonly. Can't remove server %s.\n",
-                  server));
-      ACE_THROW (CORBA::NO_PERMISSION ());
-    }
-
-  if (this->repository_.remove (server) == 0)
-    {
-      if (OPTIONS::instance()->debug () >= 1)
-        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Removed Server %s.\n", server));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Can't remove unknown server %s.\n",
-                  server));
-      ACE_THROW (ImplementationRepository::NotFound ());
-    }
+  ACE_CHECK_RETURN (-1);
+  return 0;
 }
 
-// Register the current location of the server
-void
-ImR_Activator_i::server_is_running (const char *server,
-                                    const char *partial_ior,
-                                    ImplementationRepository::ServerObject_ptr server_object
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
+int
+ImR_Activator_i::init (Options& opts ACE_ENV_ARG_DECL)
 {
-  CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
-
-  if (OPTIONS::instance()->debug () >= 1)
-    ACE_DEBUG ((LM_DEBUG, "ImR Activator: Server %s is running.\n", server));
-
-  if (OPTIONS::instance()->debug () >= 2)
-    ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::server_is_running: at %s\n", partial_ior));
-
-  CORBA::String_var server_object_ior =
-    orb->object_to_string (server_object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_ARGV av(opts.cmdline());
+  int argc = av.argc();
 
-  // Update the status of the server in the repository.
-  if (this->repository_.update (server, partial_ior, server_object_ior.in ()) == 0)
-    {
-      if (OPTIONS::instance()->debug () >= 1)
-        ACE_DEBUG ((LM_DEBUG,
-          "ImR Activator: Status updated for server %s.\n", server));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                 "ImR Activator: Could not update running information for server <%s>\n",
-                 server));
-      ACE_THROW(ImplementationRepository::NotFound());
-    }
+  CORBA::ORB_var orb =
+    CORBA::ORB_init(argc, av.argv(), "TAO_ImR_Activator" ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN(-1);
 
-  this->repository_.starting_up (server, 0);
-}
+  int ret = this->init_with_orb(orb.in(), opts ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN(-1);
 
-// Remove the state information for the current server
-void
-ImR_Activator_i::server_is_shutting_down (const char *server ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::NotFound))
-{
-  if (this->repository_.update (server, "", "") == 0)
-    {
-      if (OPTIONS::instance()->debug () >= 1)
-        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shut down server %s.\n", server));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                 "ImR Activator: Could not update information for unknown server <%s>\n",
-                 server));
-      ACE_THROW (ImplementationRepository::NotFound ());
-    }
+  return ret;
 }
 
 int
-ImR_Activator_i::init (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
 {
-  CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
-
   ACE_TRY
-    {
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      IORTable::Table_var adapter =
-        IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (CORBA::is_nil (adapter.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
-          return -1;
-        }
-
-      obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (CORBA::is_nil (obj.in ()))
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to initialize the ROOT POA.\n"),
-                          -1);
-      }
-      this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::PolicyList policies (2);
-      policies.length (2);
-
-      policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create a child POA with userId "ImR_Activator"
-      this->imr_poa_ =
-        this->root_poa_->create_POA ("ImR_Activator",
-                                     poa_manager.in (),
-                                     policies
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      // If create_POA throws an exception then the process will end, and free all memory.
-      for (CORBA::ULong i = 0; i < policies.length (); ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      // Get the ObjectId for the string 'ImR_Activator'
-      PortableServer::ObjectId_var imr_id =
-        PortableServer::string_to_ObjectId ("ImR_Activator");
-
-      // Activate the object
-      this->imr_poa_->activate_object_with_id (imr_id.in (),
-                                               this
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      obj = this->imr_poa_->id_to_reference (imr_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ImplementationRepository::Administration_var activator = 
-        ImplementationRepository::Administration::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-
-      CORBA::String_var ior = orb->object_to_string (activator.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      adapter->bind ("ImR_Activator", ior.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      obj = orb->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (CORBA::is_nil (obj.in ()))
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to get a reference to a Locator.\n"),
-                          -1);
-      }
-
-      ImplementationRepository::Locator_var locator =
-        ImplementationRepository::Locator::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG((LM_DEBUG, "Starting activator : %s\n", this->name_.c_str()));
-
-      ACE_Reactor *reactor = orb->orb_core ()->reactor ();
+  {
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Activator: Shutting down...\n"));
 
-      if (reactor != 0)
-        {
-          if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE,
-                                       reactor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "The ACE_Process_Manager didnt get initialized\n"),
-                                 -1);
-            }
-        }
+    this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // Initialize the persistent storage
-      if (this->repository_.init ())
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Repository failed to initialize\n"),
-                            -1);
-        }
+    this->unblock_all_servers();
 
-      
-      // We need to send the list of our persisted server names to the Locator
-      // so that it knows we are managing them.
-      auto_ptr<Server_Repository::HASH_IMR_MAP::ITERATOR>
-        server_iter(this->repository_.new_iterator());
-      if (server_iter.get () == 0) 
-      {
-        ACE_THROW_RETURN (CORBA::NO_MEMORY (), -1);
-      }
-      ImplementationRepository::Locator::ServerNameList server_names;
-      server_names.length(this->repository_.get_repository_size());
-      Server_Repository::HASH_IMR_MAP::ENTRY* next_entry = 0;
-      for (CORBA::ULong idx = 0;server_iter->next(next_entry) != 0; server_iter->advance())
-      {
-        ACE_CString server_name = next_entry->ext_id_;
-        server_names[idx++] = server_name.c_str();
-      }
+    this->locator_->unregister_activator (name_.c_str(),
+      this->registration_token_ ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      this->registration_token_ =
-        locator->register_activator (this->name_.c_str(), 
-                                     activator.in (),
-                                     server_names
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    this->orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // The last thing we do is write out the ior so that a test program can assume
-      // that the activator is ready to go as soon as the ior is written.
-      if (OPTIONS::instance ()->debug () >= 2)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-          "ImR_Activator_i::init: The Activator IOR is: <%s>\n",
-          ior.in ()));
-      }
-      
-      ACE_CString filename = OPTIONS::instance()->output_filename();
-      if (filename.length() > 0)
-      {
-        FILE* fp = ACE_OS::fopen(filename.c_str(), "w");
-        if (fp != 0) {
-          ACE_OS::fprintf(fp, "%s", ior.in());
-          ACE_OS::fclose(fp);
-        } else {
-          ACE_ERROR((LM_ERROR, "ImR Activator: Could not open file %s\n", filename.c_str()));
-        }
-      }
-
-    }
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Activator: Shut down successfully.\n"));
+  }
   ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init");
-      ACE_RE_THROW;
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::fini");
+    ACE_RE_THROW;
+  }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
-ImR_Activator_i::fini1 (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Activator_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
-
-  ACE_TRY
-    {
-      CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (adapter.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
-        }
-      else
-        {
-          adapter->set_locator (IORTable::Locator::_nil ()
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init");
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+  this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   return 0;
 }
- 	 
-int
-ImR_Activator_i::fini2 (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_TRY
-    {
-      this->imr_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init");
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-  return 0;
-}
-
-int
-ImR_Activator_i::run (ACE_ENV_SINGLE_ARG_DECL)
+void
+ImR_Activator_i::start_server
+(
+ ImplementationRepository::AMH_ActivatorResponseHandler_ptr rh,
+ const char* name,
+ const char* cmdline,
+ const char* dir,
+ const ImplementationRepository::EnvironmentList & env ACE_ENV_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
-
-  PortableServer::POAManager_var poa_manager =
-    this->imr_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  auto_ptr<Server_Repository::HASH_IMR_MAP::ITERATOR>
-    server_iter (this->repository_.new_iterator ());
-
-  if (server_iter.get () == 0)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (), -1);
-
-  Server_Repository::HASH_IMR_MAP::ENTRY *server_entry;
-
-  if (OPTIONS::instance()->debug () >= 2)
-    ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::run: Activating AUTO_START servers\n"));
+  RHListPtr server;
+  waiting_servers_.find(name, server);
+  if (server.null())
+  {
+    server = RHListPtr(new RHList);
+    int err = waiting_servers_.bind(name, server);
+    ACE_ASSERT(err == 0);
+    ACE_UNUSED_ARG(err);
+  }
 
-  // For each of the entries in the Server_Repository, get the startup
-  // information and activate the servers, if they are not already
-  // running.
-  while (!server_iter->done ())
+  if (server->size() == 0)
+  {
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Activator: Spawn server <%s>\n", name));
+    if (debug_ > 1)
+      ACE_DEBUG((LM_DEBUG, "\tcommand line : <%s>\n\tdirectory : <%s>\n", cmdline, dir));
+
+    // Launch the process using the given command line.
+    ACE_Process_Options proc_opts;
+    proc_opts.command_line (cmdline);
+    proc_opts.working_directory (dir);
+    // Win32 does not support the CLOSE_ON_EXEC semantics for sockets
+    // the way unix does, so in order to avoid having the child process
+    // hold the listen socket open, we force the child to inherit no
+    // handles. This includes stdin, stdout, logs, etc.
+    proc_opts.handle_inheritence (0);
+
+    for (CORBA::ULong i = 0; i < env.length(); ++i)
+      proc_opts.setenv (env[i].name.in(), env[i].value.in());
+
+    int pid = this->process_mgr_.spawn (proc_opts);
+    if (pid == ACE_INVALID_PID)
     {
-      server_iter->next (server_entry);
-      server_iter->advance ();
+      ACE_ERROR ((LM_ERROR,
+        "ImR Activator: Cannot spawn server <%s> using <%s>\n", name, cmdline));
 
-      ACE_CString logical, server, command_line, working_directory, location;
-      ImplementationRepository::ActivationMode activation
-        = ImplementationRepository::NORMAL;
-      ImplementationRepository::EnvironmentList environment_vars ;
+      ImplementationRepository::CannotActivate* ex = new
+        ImplementationRepository::CannotActivate(CORBA::string_dup ("Process Creation Failed"));
 
-      server_entry->int_id_->get_startup_info (logical,
-                                               command_line,
-                                               environment_vars,
-                                               working_directory,
-                                               activation);
+      ImplementationRepository::AMH_ActivatorExceptionHolder holder(ex);
 
       ACE_TRY
-        {
-          if (activation == ImplementationRepository::AUTO_START)
-            this->activate_server (server_entry->ext_id_.c_str ()
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+      {
+        rh->start_server_excep (&holder ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
       ACE_CATCHANY
-        {
-          if (OPTIONS::instance()->debug () >= 2)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                "ImR_Activator_i::run: AUTO_START Could not activate <%s>\n",
-                         server_entry->ext_id_.c_str ()));
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AUTO_START");
-            }
-          // Ignore exceptions
-        }
+      {
+        ACE_ERROR((LM_ERROR, "Exception during asynch exception throw.\n"));
+      }
       ACE_ENDTRY;
+      return;
     }
 
-  orb->run (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
+    if (debug_ > 0)
+    {
+      ACE_DEBUG((LM_DEBUG,
+        "ImR Activator: Successfully spawned. Waiting for status of <%s>...\n", name));
+    }
+  }
+  else if (debug_ > 0)
+  {
+    ACE_DEBUG((LM_DEBUG, "ImR Activator: Waiting for status of <%s>...\n", name));
+  }
 
-ImR_Activator_i::~ImR_Activator_i (void)
-{
+  server->push_back(ImplementationRepository::AMH_ActivatorResponseHandler::_duplicate(rh));
 }
 
-
-// Returns the startup information for a server
-
 void
-ImR_Activator_i::find (const char *server,
-                  ImplementationRepository::ServerInformation_out info
-                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::NotFound))
+ImR_Activator_i::server_status_changed
+(
+ ImplementationRepository::AMH_ActivatorResponseHandler_ptr rh,
+ const char* name ACE_ENV_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_CString logical, command_line, working_directory;
-  ACE_CString location, server_object_ior;
-  ImplementationRepository::EnvironmentList environment_vars;
-  ImplementationRepository::ActivationMode activation;
-
-  ACE_NEW_THROW_EX (info,
-                    ImplementationRepository::ServerInformation,
-                    CORBA::NO_MEMORY ());
+  // First, send the reply, because the servers server_is_running shouldn't
+  // have to wait for all of the waiting clients to return.
+  ACE_TRY_EX(ACE_TRY_LABEL2)
+  {
+    rh->server_status_changed(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK_EX(ACE_TRY_LABEL2);
+  }
+  ACE_CATCHANY
+  {
+    if (debug_ > 1)
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::server_status_changed() return");
+  }
+  ACE_ENDTRY;
   ACE_CHECK;
 
-  // Get the information from the server repository.
-  if (this->repository_.get_startup_info (server,
-                                          logical,
-                                          command_line,
-                                          environment_vars,
-                                          working_directory,
-                                          activation) != 0)
-    ACE_THROW (ImplementationRepository::NotFound ());
-
-  // Get the running information which would include the location
-  // where the server is running and its IOR.
-  if (this->repository_.get_running_info (server,
-                                          location,
-                                          server_object_ior) != 0)
+  RHListPtr server;
+  this->waiting_servers_.find(name, server);
+  if (! server.null() && server->size() > 0)
   {
-    ACE_THROW (ImplementationRepository::NotFound ());
+    this->unblock_server(server);
+  }
+  else
+  {
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Activator: No waiting clients.\n"));
   }
-
-  // Fill in <info>.
-  info->logical_server = CORBA::string_dup (logical.c_str ());
-  info->server = CORBA::string_dup (server);
-  info->startup.command_line = CORBA::string_dup (command_line.c_str ());
-  info->startup.environment = environment_vars;
-  info->startup.working_directory = CORBA::string_dup (working_directory.c_str ());
-  info->startup.activation = activation;
-  info->startup.activator = this->name_.c_str();
-  info->location = CORBA::string_dup (location.c_str ());
-
-  if (OPTIONS::instance()->debug () >= 1)
-      ACE_DEBUG ((LM_DEBUG, "ImR Activator: Found server %s.\n", server));
 }
 
-
-// Used to access the list of servers registered.  May also return an
-// iterator which can be used to access more than <how_many> of them.
-
 void
-ImR_Activator_i::list (CORBA::ULong how_many,
-                       ImplementationRepository::ServerInformationList_out server_list,
-                       ImplementationRepository::ServerInformationIterator_out server_iterator
-                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImR_Activator_i::unblock_all_servers()
 {
-  if (OPTIONS::instance()->debug () >= 1)
-      ACE_DEBUG ((LM_DEBUG, "ImR Activator: List servers.\n"));
-
-  // Initialize the out variables, so if we return early, they will
-  // not be dangling.
-  server_iterator =
-    ImplementationRepository::ServerInformationIterator::_nil ();
-
-  ACE_NEW_THROW_EX (server_list,
-                    ImplementationRepository::ServerInformationList (0),
-                    CORBA::NO_MEMORY ());
-
-  // Get a new iterator
-  auto_ptr<Server_Repository::HASH_IMR_MAP::ITERATOR> server_iter (this->repository_.new_iterator ());
-
-  // Check for a memory error.
-  if (server_iter.get () == 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
-
-  // Number of servers that will go into the server_list.
-  CORBA::ULong n;
-
-  if (this->repository_.get_repository_size () > how_many)
-    n = how_many;
-  else
-    n = ACE_static_cast (CORBA::ULong,
-                         this->repository_.get_repository_size ());
-
-  // Now copy over to the server list.
-
-  server_list->length (n);
+  ServerMap::ENTRY* entry = 0;
+  ServerMap::ITERATOR it(this->waiting_servers_);
+  for (; it.next(entry); it.advance())
+  {
+    ACE_CString name = entry->ext_id_;
+    RHListPtr server = entry->int_id_;
+    this->unblock_server(server);
+  }
+  this->waiting_servers_.unbind_all();
+}
 
-  Server_Repository::HASH_IMR_MAP::ENTRY *server_entry;
+void
+ImR_Activator_i::unblock_server(RHListPtr server)
+{
+  if (debug_ > 0)
+    ACE_DEBUG((LM_DEBUG, "ImR Activator: Unblocking %u waiting clients.\n", server->size()));
 
-  if (OPTIONS::instance()->debug () >= 2)
-    ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::list: Filling ServerList with %d servers\n", n));
+  RHList& svr = *server;
 
-  for (CORBA::ULong i = 0; i < n; i++)
+  for (size_t i = 0; i < svr.size(); ++i)
+  {
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
     {
-      server_iter->next (server_entry);
-      server_iter->advance ();
-
-      ACE_CString logical, server, command_line, working_directory;
-      ACE_CString location, server_ior;
-
-      ImplementationRepository::EnvironmentList environment_vars;
-      ImplementationRepository::ActivationMode activation =
-        ImplementationRepository::NORMAL;
-
-      server_entry->int_id_->get_running_info (location, server_ior);
-      server_entry->int_id_->get_startup_info (logical,
-                                               command_line,
-                                               environment_vars,
-                                               working_directory,
-                                               activation);
-
-      server_list[i].logical_server = CORBA::string_dup (logical.c_str ());
-      server_list[i].server = CORBA::string_dup (server_entry->ext_id_.c_str ());
-      server_list[i].startup.command_line = CORBA::string_dup (command_line.c_str ());
-      server_list[i].startup.environment = environment_vars;
-      server_list[i].startup.working_directory = CORBA::string_dup (working_directory.c_str ());
-      server_list[i].startup.activation = activation;
-      server_list[i].startup.activator = CORBA::string_dup(this->name_.c_str());
-      server_list[i].location = CORBA::string_dup (location.c_str ());
+      ImplementationRepository::AMH_ActivatorResponseHandler_var ssrh = svr[i];
+      ssrh->start_server(ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
-
-
-  // Now work on the iterator
-
-  // Only set up an iterator if we need to
-  if (this->repository_.get_repository_size () > how_many)
+    ACE_CATCHANY
     {
-      if (OPTIONS::instance()->debug () >= 2)
-        ACE_DEBUG ((LM_DEBUG, "ImR_Activator_i::list: Creating ServerInformationIterator\n"));
-
-      // Create an imr_iter and give it the server_iter pointer
-      ImR_Iterator *imr_iter;
-
-      ACE_NEW_THROW_EX (imr_iter,
-                        ImR_Iterator (server_iter.release (), this->root_poa_.in ()),
-                        CORBA::NO_MEMORY ());
-
-      ACE_TRY
-        {
-          PortableServer::ObjectId_var id =
-            this->root_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          server_iterator = imr_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
+      if (debug_ > 1)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::unblock_server()");
     }
+    ACE_ENDTRY;
+  }
+  server->clear();
 }
 
+//@@ todo : Use the process_manager so that we're notified when any of our launched
+//          processes die. Add a new operation to the Locator idl, so that we can
+//          notify the locator when this happens.
 
-/**
- * Attempt to gracefully shut down the server, if that fails, will try
- * to do it ungracefully.
- */
-void
-ImR_Activator_i::shutdown_server (const char *server ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::NotFound))
-{
-  if (OPTIONS::instance()->debug () >= 1)
-    ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shutting down server.\n"));
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-  CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
+template class ACE_Array_Base<ImplementationRepository::AMH_ActivatorResponseHandler_var>;
+template class ACE_Array<ImplementationRepository::AMH_ActivatorResponseHandler_var>;
+template class ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>;
 
-  ACE_CString server_object_ior, location;
+template class ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex>;
 
-  // Find out if it is already running
-  if (this->repository_.get_running_info (server, location, server_object_ior) != 0)
-    {
-      // If we had problems getting the server_object_ior, probably meant that
-      // there is no <server> registered
-      ACE_ERROR ((LM_ERROR,
-                  "ImR Activator: Cannot find ServerObject IOR for server <%s>\n",
-                  server));
-      ACE_THROW (ImplementationRepository::NotFound ());
-    }
+template class ACE_Hash_Map_Entry<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex> >;
+template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex>, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex>,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex>,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex>,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
 
-  // Check to see if there is one running (if there is a server_object_ior)
-  if (server_object_ior.length () != 0)
-    {
-      // It is running, so shut it down
-      ACE_TRY
-        {
-          CORBA::Object_var object =
-            orb->string_to_object (server_object_ior.c_str () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ImplementationRepository::ServerObject_var server_object =
-            ImplementationRepository::ServerObject::_narrow (object.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (server_object.in ()))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "ImR Activator: Invalid ServerObject IOR: <%s>\n",
-                          server_object_ior.c_str ()));
-              ACE_THROW (ImplementationRepository::NotFound ());
-            }
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-          server_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+#pragma instantiate ACE_Array_Base<ImplementationRepository::AMH_ActivatorResponseHandler_var>
+#pragma instantiate ACE_Array<ImplementationRepository::AMH_ActivatorResponseHandler_var>
+#pragma instantiate ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>
 
-          // This removes running info from repository
-          if (this->repository_.update (server, "", "") != 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                         "ImR Activator: Could not update information for unknown server <%s>\n",
-                         server));
-              ACE_THROW (ImplementationRepository::NotFound ());
-            }
-        }
-      ACE_CATCHANY
-        {
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-    }
-}
+#pragma instantiate ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex>
 
-void ImR_Activator_i::shutdown_repo( ACE_ENV_SINGLE_ARG_DECL )
- 	              ACE_THROW_SPEC( (CORBA::SystemException) )
-{
-  CORBA::ORB_var orb = OPTIONS::instance ()->orb () ;
-  this->fini1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-  orb->shutdown (0);
-  this->fini2 (ACE_ENV_SINGLE_ARG_PARAMETER) ;
-}
+#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex> >
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex> ,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex> ,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex> ,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Strong_Bound_Ptr<ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var>, ACE_Null_Mutex> ,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<ACE_Hash_Map_Iterator_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> >;
-template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<ACE_Hash_Map_Iterator_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> >
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index 71e5dd3eab4..560eacf6237 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -1,201 +1,106 @@
 // -*- C++ -*-
 //=============================================================================
 /**
- *  @file   ImR_Activator_i.h
- *
- *  $Id$
- *
- *  @brief  This class implements the Implementation Repository.
- *
- *  @author Priyanka Gontla <gontla_p@ociweb.com>
- *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
- */
+*  @file   ImR_Activator_i.h
+*
+*  $Id$
+*
+*  @author Priyanka Gontla <gontla_p@ociweb.com>
+*  @author Darrell Brunsch <brunsch@cs.wustl.edu>
+*/
 //=============================================================================
 
 #ifndef IMR_ACTIVATOR_I_H
 #define IMR_ACTIVATOR_I_H
 
-#include "Server_Repository.h"
+#include "activator_export.h"
 
-#include "orbsvcs/IOR_Multicast.h"
-
-#include "tao/PortableServer/ImplRepoS.h"
-#include "tao/IORTable/IORTable.h"
+#include "ImR_ActivatorS.h"
+#include "ImR_LocatorC.h"
 
 #include "ace/Process_Manager.h"
+#include "ace/Vector_T.h"
+#include "ace/SString.h"
+#include "ace/Hash_Map_Manager.h"
+#include "ace/Bound_Ptr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class Options;
 
 /**
- * @class ImR_Activator_i
- *
- * @brief IMR Activator Interface.
- *
- * This class provides the interface for the various activities
- * that can be done by the ImR_Activator.
- *
- */
-class ImR_Activator_i : public POA_ImplementationRepository::Administration
+* @class ImR_Activator_i
+*
+* @brief IMR Activator Interface.
+*
+* This class provides the interface for the various activities
+* that can be done by the ImR_Activator.
+*
+*/
+class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::AMH_Activator
 {
+  typedef ACE_Vector<ImplementationRepository::AMH_ActivatorResponseHandler_var> RHList;
+  typedef ACE_Strong_Bound_Ptr<RHList, ACE_Null_Mutex> RHListPtr;
+  typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+    RHListPtr,
+    ACE_Hash<ACE_CString>,
+    ACE_Equal_To<ACE_CString>,
+    ACE_Null_Mutex> ServerMap;
+
 public:
-  // = Constructor and destructor
   ImR_Activator_i (void);
-  ~ImR_Activator_i (void);
-
-  /// IOR_LookupTable_Callback method.  Will return an IOR
-  char *find_ior (const char* object_name  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-
-  // = Interface methods
-
-  /// Starts up the server <server> if not already running.
-  virtual void activate_server (
-      const char *server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          ImplementationRepository::NotFound,
-          ImplementationRepository::CannotActivate
-        ));
-
-  /// Adds the server to the repository and registers the startup information
-  /// about the server <server>.
-  virtual void register_server (
-      const char *server,
-      const ImplementationRepository::StartupOptions &options
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          ImplementationRepository::AlreadyRegistered,
-          ImplementationRepository::NotFound
-        ));
-
-  /// Updates the startup information about the server <server>.
-  virtual void reregister_server (
-      const char *server,
-      const ImplementationRepository::StartupOptions &options
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((CORBA::SystemException,
-    ImplementationRepository::AlreadyRegistered,
-    ImplementationRepository::NotFound
-    ));
-
-  /// Removes the server <server> from the repository.
-  virtual void remove_server (
-      const char *server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((CORBA::SystemException,
-                       ImplementationRepository::NotFound));
-
-  /// Attempts to gracefully shut down the server,
-  virtual void shutdown_server (
-      const char *server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((CORBA::SystemException,
-                       ImplementationRepository::NotFound));
-
-  /// Shuts down the repository.
-  virtual void shutdown_repo (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Called by the server to update transient information such as current
-  /// location of the <server> and its ServerObject.
-  virtual void server_is_running (
-      const char *server,
-      const char * partial_ior,
-      ImplementationRepository::ServerObject_ptr server_object
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((CORBA::SystemException,
-                       ImplementationRepository::NotFound));
-
-  /// What the server should call before it shuts down.
-  virtual void server_is_shutting_down (
-      const char *server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((CORBA::SystemException,
-                       ImplementationRepository::NotFound));
-
-  /// Returns the startup information for a server
-  virtual void find (
-      const char *server,
-      ImplementationRepository::ServerInformation_out info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((CORBA::SystemException,
-                       ImplementationRepository::NotFound));
-
-  /// Used to access the list of servers registered.  May also return an
-  /// iterator which can be used to access more than <how_many> of them.
-  virtual void list (
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Implementation of activate_server.  <check_startup> is a flag to check
-  /// the activation mode before attempting to start it.
-  virtual char *activate_server_with_startup (const char *server,
-                                              int check_startup
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          ImplementationRepository::NotFound,
-          ImplementationRepository::CannotActivate
-        ));
+
+ void start_server (
+   ImplementationRepository::AMH_ActivatorResponseHandler_ptr rh,
+   const char* name,
+   const char* cmdline,
+   const char* dir,
+   const ImplementationRepository::EnvironmentList & env ACE_ENV_ARG_DECL)
+   ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void server_status_changed(
+    ImplementationRepository::AMH_ActivatorResponseHandler_ptr rh,
+    const char* name ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Initialize the Server state - parsing arguments and waiting.
-  int init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int init (Options& opts ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  /// Cleans up any state created by init (), called before ORB shutdown.
-  int fini1 (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- 	 
-  /// Cleans up any state created by init (), called after ORB shutdown.
-  int fini2 (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  /// Cleans up any state created by init*.
+  int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Runs the orb.
   int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 private:
 
-  char* activate_server_i (const char *server,int check_startup 
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          ImplementationRepository::NotFound,
-          ImplementationRepository::CannotActivate
-        ));
-
-  /// This method starts the server process.
-  void start_server_i (
-      const char *server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          ImplementationRepository::NotFound,
-          ImplementationRepository::CannotActivate
-        ));
-
-  /// This method will continuously ping a server and either return when it
-  /// responds to the ping or return -1 if it times out.
-  int ready_check (const char *server)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::NotFound));
-
-  /// The Process Manager.
-  ACE_Process_Manager process_mgr_;
+  int init_with_orb (CORBA::ORB_ptr orb, const Options& opts ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  /// Repository containing information about each server.
-  Server_Repository repository_;
+  void unblock_all_servers();
+  void unblock_server(RHListPtr server);
 
-  /// The Root POA for this ORB.
-  PortableServer::POA_var root_poa_;
+private:
+  ACE_Process_Manager process_mgr_;
 
-  /// Implementation Repository's POA.
+  PortableServer::POA_var root_poa_;
   PortableServer::POA_var imr_poa_;
 
+  /// IMR Locator Object
+  ImplementationRepository::Locator_var locator_;
+
   /// We're given a token when registering with the locator, which
   /// we must use when unregistering.
   CORBA::Long registration_token_;
 
+  CORBA::ORB_var orb_;
+
+  unsigned int debug_;
+
   ACE_CString name_;
+
+  ServerMap waiting_servers_;
 };
 
 #endif /* IMR_ACTIVATOR_I_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 33b21fbc734..48c9cbde2b7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -5,17 +5,33 @@
 #include "Locator_Options.h"
 
 int
-run_standalone (void)
+run_standalone (Options& opts)
 {
   ImR_Locator_i server;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER);
+      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      if (status != -1) 
-        return 0;
+      if (status == -1)
+        {
+          return 1;
+        }
+      else
+        {
+          // Run the server if it is initialized correctly.
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          // End the server after its work is done.
+          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          if (status == -1)
+            return 1;
+        }
+      return 0;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
@@ -56,20 +72,92 @@ run_service (void)
 #endif /* ACE_WIN32 */
 }
 
-#include <ace/streams.h>
+/**
+ * Executes the various commands that are useful for a NT service.  Right
+ * now these include 'install' and 'remove'.  Others, such as 'start' and
+ * 'stop' can be added, but the 'net' program in Windows already handles
+ * these commands.
+ */
+static int
+run_service_command (Options& opts)
+{
+  if (opts.service_command() == Options::SC_NONE) 
+    return 0;
+
+#if defined (ACE_WIN32)
+  SERVICE::instance()->name (IMR_LOCATOR_SERVICE_NAME, IMR_LOCATOR_DISPLAY_NAME);
+
+  if (opts.service_command() == Options::SC_INSTALL)
+    {
+      const DWORD MAX_PATH_LENGTH = 4096;
+      char pathname[MAX_PATH_LENGTH]; 
+
+      DWORD length = ACE_TEXT_GetModuleFileName(NULL, pathname, MAX_PATH_LENGTH);
+      if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s"))
+        {
+          ACE_ERROR ((LM_ERROR, "Error: Could not get module file name\n"));
+          return -1;
+        }
+
+      // Append the command used for running the implrepo as a service
+      ACE_OS::strcat (pathname, ACE_TEXT (" -s"));
+
+      int ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
+                                           SERVICE_ERROR_NORMAL,
+                                           pathname);
+      if (ret != -1) {
+        ACE_DEBUG ((LM_DEBUG, "ImR Locator: Service installed.\n"));
+        opts.save_registry_options();
+      } else {
+        ACE_ERROR((LM_ERROR, "Error: Failed to install service. error:%d\n", errno));
+      }
+      if (ret == 0) 
+        return 1;
+    }
+  else if (opts.service_command() == Options::SC_REMOVE)
+    {
+      int ret = SERVICE::instance ()->remove ();
+      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Service removed.\n"));
+      if (ret == 0) 
+        return 1; // If successfull, then we don't want to continue.
+    }
+  else 
+  {
+    ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d \n", 
+      opts.service_command()));
+    return -1;
+  }
+
+  return -1;
+
+#else /* ACE_WIN32 */
+  ACE_ERROR ((LM_ERROR, "NT Service not supported on this platform"));
+  return -1;
+#endif /* ACE_WIN32 */
+}
 
 int
 main (int argc, char *argv[])
 {
-  int result = OPTIONS::instance()->init(argc, argv);
+  Options opts;
 
+  int result = opts.init (argc, argv);
   if (result < 0)
-    return 1;  // Error parsing args
+    return 1;  // Error
   else if (result > 0)
     return 0;  // No error, but we should exit anyway.
 
-  if (OPTIONS::instance()->service())
-    return run_service();
+  result = run_service_command(opts);
+  if (result < 0)
+    return 1;  // Error
+  else if (result > 0)
+    return 0;  // No error, but we should exit anyway.
 
-  return run_standalone();
+  if (opts.service())
+  {
+    return run_service ();
+  }
+
+  return run_standalone (opts);
 }
+
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index f2971a7fbc5..1a59d3efab3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -1,706 +1,890 @@
 // $Id$
 
 #include "ImR_Locator_i.h"
+#include "utils.h"
+#include "Iterator.h"
 
-#include "Locator_Options.h"
-#include "Forwarder.h"
-#include "INS_Locator.h"
-#include "Adapter_Activator.h"
-
-#include "orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/Time_Utilities.h"
 
 #include "tao/IORTable/IORTable.h"
 #include "tao/PortableServer/POA.h"
-
 #include "tao/ORB_Core.h"
 #include "tao/default_ports.h"
+#include "tao/Messaging/Messaging.h"
 
-#include "ace/Get_Opt.h"
-#include "ace/Process_Manager.h"
+#include "ace/ARGV.h"
 #include "ace/OS_NS_sys_time.h"
 
+static const int DEFAULT_START_LIMIT = 1;
+static const int IS_ALIVE_RETRY_COUNT = 60;
+static const ACE_Time_Value IS_ALIVE_RETRY_INTERVAL(1);
+
+static const ACE_Time_Value DEFAULT_SERVER_TIMEOUT(0, 100 * 1000); // 100ms
+
+// If the POA locking problem is ever corrected, this class (along with
+// some code in ImR_Locator_i::server_is_running) should be removed.
+#if !defined (ACE_HAS_RECURSIVE_MUTEXES)
+class Status_Changed_Timer: public ACE_Event_Handler
+{
+public:
+  Status_Changed_Timer(ImR_Locator_i* locator,
+                       const Server_Info_Ptr& info);
+
+  virtual int handle_timeout (const ACE_Time_Value& current_time,
+                              const void* act);
+private:
+  ImR_Locator_i* locator_;
+  Server_Info_Ptr info_;
+};
+
+Status_Changed_Timer::Status_Changed_Timer(ImR_Locator_i* locator,
+                                           const Server_Info_Ptr& info)
+ : locator_(locator),
+   info_(info)
+{
+}
+
+int
+Status_Changed_Timer::handle_timeout (const ACE_Time_Value&,
+                                      const void*)
+{
+  locator_->server_status_changed(*info_);
+  delete this;
+  return 0;
+}
+#endif /* ACE_HAS_RECURSIVE_MUTEXES */
+
+
 ImR_Locator_i::ImR_Locator_i ()
-  : 
-    forwarder_impl_ (0),
-    activator_ (0),
-    ins_locator_ (0)
+: forwarder_(*this)
+, ins_locator_(*this)
+, debug_(0)
+, read_only_(false)
 {
-  this->ins_locator_ = new INS_Locator(this);
 }
 
 int
-ImR_Locator_i::init (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL)
 {
-  orb_ = OPTIONS::instance()->orb();
+  orb_ = CORBA::ORB::_duplicate(orb);
+  debug_ = opts.debug();
+  read_only_ = opts.readonly();
+  startup_timeout_ = opts.startup_timeout();
+  ping_interval_ = opts.ping_interval();
 
   CORBA::Object_var obj =
-    orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-
-  PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+  this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
+  ACE_ASSERT(! CORBA::is_nil(this->root_poa_.in()));
 
-  if (CORBA::is_nil (root_poa.in ()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to obtain RootPOA reference.\n"),
-                      -1);
+  this->forwarder_.init(orb ACE_ENV_ARG_PARAMETER);
+  this->adapter_.init(& this->forwarder_);
 
-  PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // Register the Adapter_Activator reference to be the RootPOA's
+  // Adapter Activator.
+  root_poa_->the_activator (&this->adapter_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  // We are going to set the policies to be used with the child
-  // POA.
-  CORBA::PolicyList policies (2);
-  policies.length (2);
-
-  policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                           ACE_ENV_ARG_PARAMETER);
+  CORBA::PolicyList policies;
+  imr_poa_ = root_poa_->create_POA ("ImplRepoService",
+    PortableServer::POAManager::_nil(), policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policies[1] =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                      ACE_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var id = this->imr_poa_->activate_object(this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  PortableServer::POA_var locator_poa =
-    root_poa->create_POA ("ImplRepoService",
-                          poa_manager.in (),
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
+  obj = this->imr_poa_->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+  CORBA::String_var ior = this->orb_->object_to_string(obj.in() ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  // Creation of the new POAs is over, so destroy the Policy_ptr's as
-  // we dont need them anymore.
-  for (CORBA::ULong i = 0; i < policies.length (); ++i)
-    {
-      CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
+  // Register the ImR for use with INS
+  obj = orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+  IORTable::Table_var ior_table = IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+  ACE_ASSERT(! CORBA::is_nil(ior_table.in()));
+  ior_table->bind ("ImplRepoService", ior.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+  ior_table->set_locator (&this->ins_locator_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
 
-  // Register 'this' with the ImR_Forwarder
-  ACE_NEW_RETURN (this->forwarder_impl_,
-                  ImR_Forwarder (this, orb_.in ()),
-                  -1);
+  // Set up multicast support (if enabled)
+  if (opts.multicast())
+  {
+    ACE_Reactor* reactor = orb->orb_core()->reactor();
+    if (this->setup_multicast (reactor, ior.in()) != 0)
+      return -1;
+  }
 
-  // Get the ObjectID for the string child POA name.
-  PortableServer::ObjectId_var locator_id =
-    PortableServer::string_to_ObjectId ("ImplRepoService");
+  // Initialize the persistent storage. This will load any values that
+  // may have been persisted before.
+  // The init can return 1 if there is no persistent file yet. In
+  // that case, we need not do anything for now.
+  int init_result =
+    this->repository_.init (opts.repository_mode(), opts.persist_file_name());
+  if (init_result == -1)
+  {
+    ACE_ERROR_RETURN ((LM_ERROR, "Repository failed to initialize\n"), -1);
+  }
 
-  // Activate the object with the given id.
-  locator_poa->activate_object_with_id (locator_id.in (),
-                                        this
-                                        ACE_ENV_ARG_PARAMETER);
+  // Activate the two poa managers
+  PortableServer::POAManager_var poaman =
+    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-
-  // Get the locator object reference
-  CORBA::Object_var locator_obj = 
-    locator_poa->id_to_reference (locator_id.in () ACE_ENV_ARG_PARAMETER);
+  poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-
-  // Get the reference to IORTable.
-  obj = orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+  poaman = this->imr_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-
-  // Narrow it down to the correct type
-  IORTable::Table_var adapter =
-    IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+  poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  CORBA::String_var ior;
-
-  if (CORBA::is_nil (adapter.in ()))
-    {
-      ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
-    }
-  else
+  // We write the ior file last so that the tests can know we are ready.
+  if (opts.ior_filename().length() > 0)
+  {
+    FILE* fp = ACE_OS::fopen(opts.ior_filename().c_str(), "w");
+    if (fp == 0)
     {
-      // Set the locator
-      adapter->set_locator (this->ins_locator_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      // Get the stringified format of the locator's object
-      // reference.
-      ior = orb_->object_to_string (locator_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      // Finally, bind this ior to the child POA's name in the
-      // IORTable.
-      adapter->bind ("ImplRepoService", ior.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      ACE_ERROR_RETURN ((LM_ERROR,
+        "ImR Locator: Could not open file: %s\n", opts.ior_filename().c_str()), -1);
     }
+    ACE_OS::fprintf(fp, "%s", ior.in());
+    ACE_OS::fclose(fp);
+  }
 
-  ACE_CString output_filename = OPTIONS::instance()->output_filename();
-  
-  if (output_filename.length() > 0)
-    {
-      FILE* fp = ACE_OS::fopen(output_filename.c_str(), "w");
-      ACE_ASSERT(fp != 0);
-      ACE_OS::fprintf(fp, "%s", ior.in());
-      ACE_OS::fclose(fp);
-    }
+  return 0;
+}
 
-  ACE_NEW_RETURN (this->activator_,
-                  ImR_Adapter_Activator (this->forwarder_impl_),
-                  -1);
+int
+ImR_Locator_i::init(Options& opts ACE_ENV_ARG_DECL)
+{
+  ACE_ARGV av(opts.cmdline());
+  int argc = av.argc();
+  char** argv = av.argv();
+
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "TAO_ImR_Locator" ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN(-1);
+  int err = this->init_with_orb(orb.in(), opts ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN(-1);
+  return err;
+}
 
-  // Register the Adapter_Activator reference to be the RootPOA's
-  // Adapter Activator.
-  root_poa->the_activator (this->activator_ ACE_ENV_ARG_PARAMETER);
+int
+ImR_Locator_i::run(ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (debug_ > 0)
+  {
+    ACE_DEBUG((LM_DEBUG, "ImR Locator: Running\n"
+      "\tPing Interval : %ds\n"
+      "\tStartup Timeout : %ds\n"
+      "\tPersistence : %s\n"
+      "\tLocked : %s\n\n",
+      ping_interval_.sec(),
+      startup_timeout_.sec(),
+      repository_.repo_mode(),
+      read_only_ ? "true" : "false"));
+  }
+  this->auto_start_servers(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  if (OPTIONS::instance()->multicast())
-    {
-      ACE_Reactor *reactor = orb_->orb_core ()->reactor ();
+  this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+  return 0;
+}
 
-      ACE_Process_Manager process_manager;
-      process_manager.open (ACE_Process_Manager::DEFAULT_SIZE, reactor);
+int
+ImR_Locator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+{
+  ACE_TRY
+  {
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Shutting down...\n"));
 
-      if (this->setup_multicast (reactor, ior.in ()) != 0)
-        return -1;
-    }
-  else
-    {
-      if (OPTIONS::instance()->debug() >= 1)
-        {
-          ACE_DEBUG ((LM_DEBUG, "ImR Locator: Multicast Handler disabled.\n"));
-        }
-    }
+    this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-  orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Shut down successfully.\n"));
+  }
+  ACE_CATCHANY
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::fini");
+    ACE_RE_THROW;
+  }
+  ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
   return 0;
 }
 
-/**
- * First, figure out if we should set up a multicast handler (based on command
- * line settings) and which port to set it up (based on the environment,
- * command line, or the default IMPLREPOSERVICE port).  Then register the
- * handler with the @param reactor.
- *
- * @retval  0 ok
- * @retval -1 failed
- */
 int
-ImR_Locator_i::setup_multicast (ACE_Reactor *reactor,
-                                const char *ior)
+ImR_Locator_i::setup_multicast (ACE_Reactor* reactor, const char* ior)
 {
   ACE_ASSERT (reactor != 0);
+  ACE_ASSERT (ior != 0);
 #if defined (ACE_HAS_IP_MULTICAST)
 
+  TAO_ORB_Core* core = TAO_ORB_Core_instance();
   // See if the -ORBMulticastDiscoveryEndpoint option was specified.
-  ACE_CString mde (TAO_ORB_Core_instance ()->orb_params ()->mcast_discovery_endpoint ());
-
-  // First, see if the user has given us a multicast port number
-  // on the command-line;
-  u_short port =
-    TAO_ORB_Core_instance ()->orb_params ()->service_port (IMPLREPOSERVICE);
+  ACE_CString mde (core->orb_params()->mcast_discovery_endpoint());
 
-  if (port == 0)
+  if (mde.length () != 0)
+  {
+    if (this->ior_multicast_.init(ior,
+      mde.c_str(), TAO_SERVICEID_IMPLREPOSERVICE) == -1)
+    {
+      return -1;
+    }
+  }
+  else
+  {
+    // Port can be specified as param, env var, or default
+    CORBA::UShort port = core->orb_params()->service_port(IMPLREPOSERVICE);
+    if (port == 0)
     {
       // Check environment var. for multicast port.
-      const char *port_number = ACE_OS::getenv ("ImplRepoServicePort");
+      const char* port_number = ACE_OS::getenv ("ImplRepoServicePort");
 
       if (port_number != 0)
         port = ACE_OS::atoi (port_number);
     }
+    if (port == 0)
+      port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
 
-  // Port wasn't specified on the command-line or in environment -
-  // use the default.
-  if (port == 0)
-    port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
-
-  // Instantiate a handler which will handle client requests for
-  // the ImplRepoService ior, received on the multicast port.
-  TAO_IOR_Multicast *ior_multicast;
-
-  ACE_NEW_RETURN (ior_multicast,
-                  TAO_IOR_Multicast (),
-                  -1);
-
-  if (mde.length () != 0)
-    {
-      // initializes
-      if (ior_multicast->init (ior,
-                               mde.c_str (),
-                               TAO_SERVICEID_IMPLREPOSERVICE) == -1)
-        return -1;
-    }
-  else
+    if (this->ior_multicast_.init(ior, port,
+      ACE_DEFAULT_MULTICAST_ADDR, TAO_SERVICEID_IMPLREPOSERVICE) == -1)
     {
-      if (ior_multicast->init (ior,
-                               port,
-                               ACE_DEFAULT_MULTICAST_ADDR,
-                               TAO_SERVICEID_IMPLREPOSERVICE) == -1)
-        return -1;
+      return -1;
     }
+  }
 
   // Register event handler for the ior multicast.
-  if (reactor->register_handler (ior_multicast,
-                                 ACE_Event_Handler::READ_MASK) == -1)
-    {
-      if (OPTIONS::instance()->debug() >= 1)
-        ACE_DEBUG ((LM_DEBUG,
-                    "ImR Locator: "
-                    "cannot register Event handler\n"));
-      return -1;
-    }
+  if (reactor->register_handler (&this->ior_multicast_,
+    ACE_Event_Handler::READ_MASK) == -1)
+  {
+    if (debug_ >= 1)
+      ACE_DEBUG ((LM_DEBUG, "ImR Locator: cannot register Event handler\n"));
+    return -1;
+  }
 
-  if (OPTIONS::instance()->debug() >= 1)
-    ACE_DEBUG ((LM_DEBUG,
-                "ImR Locator: Multicast Handler enabled.\n"));
+  if (this->debug_ > 0)
+    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Multicast Handler enabled.\n"));
 
   return 0;
-#else /* ACE_HAS_IP_MULTICAST */
-
+#else /* ACE_HAS_IP_MULTICAST*/
   ACE_UNUSED_ARG (reactor);
   ACE_UNUSED_ARG (ior);
-  ACE_DEBUG ((LM_WARNING,
-              "ImR Locator: "
-              "ACE_HAS_IP_MULTICAST is not defined. "
-              "Multicast support disabled.\n"));
-
   return 0;
-#endif /* ACE_HAS_IP_MULTICAST */
+#endif /* ACE_HAS_IP_MULTICAST*/
 }
 
 CORBA::Long
-ImR_Locator_i::register_activator (const char* activator,
-                                   ImplementationRepository::Administration_ptr admin,
-                                   const ImplementationRepository::Locator::ServerNameList & servers
-                                   ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImR_Locator_i::register_activator (const char* aname,
+                                   ImplementationRepository::Activator_ptr activator
+                                   ACE_ENV_ARG_DECL)
+                                   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  for (CORBA::ULong idx = 0; idx < servers.length(); ++idx) {
-    const char* server = servers[idx];
-    int err = this->server_map_.bind(server, activator);
-    ACE_ASSERT(err == 0 || err == 1);
-    ACE_UNUSED_ARG (err);
-  }
+  ACE_ASSERT(aname != 0);
+  ACE_ASSERT(! CORBA::is_nil(activator));
 
-  ActivatorInfo info;
-  // We save the unique hash value of the passed in admin object, so that 
-  // we can prevent accidental unregister by a different activator.
-  info.token = ACE_OS::gettimeofday().msec(); 
-  info.admin = ImplementationRepository::Administration::_duplicate(admin);
+  // Before we can register the activator, we need to ensure that any existing
+  // registration is purged.
+  this->unregister_activator_i(aname);
+  ACE_CHECK_RETURN(0);
 
-  int bind_return = this->activator_map_.bind (activator, info);
+  CORBA::String_var ior =
+    this->orb_->object_to_string (activator ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
 
-  if (bind_return == 1) // Success, but was already bound.
+  CORBA::Long token = ACE_OS::gettimeofday().msec();
+
+  int err = this->repository_.add_activator (aname, token, ior.in(), activator);
+  ACE_ASSERT(err == 0);
+  ACE_UNUSED_ARG(err);
+
+  if (this->debug_ > 0)
+    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Activator registered for %s.\n", aname));
+
+  return token;
+}
+
+void
+ImR_Locator_i::unregister_activator (const char* aname,
+                                     CORBA::Long token
+                                     ACE_ENV_ARG_DECL)
+                                     ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_ASSERT(aname != 0);
+  Activator_Info_Ptr info =
+    this->get_activator (aname);
+  ACE_CHECK;
+
+  if (! info.null())
   {
-    if (OPTIONS::instance()->debug() >= 1)
+    if (info->token != token && this->debug_ > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: New activator registered for %s.\n", activator));
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Ignoring unregister activator:%s. Wrong token.\n", aname));
+      return;
     }
-    return info.token; 
+
+    this->unregister_activator_i(aname);
+    ACE_CHECK;
+
+    if (this->debug_ > 0)
+      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Activator %s unregistered.\n", aname));
   }
-  else if (bind_return != 0) 
+  else
   {
-    ACE_ASSERT(bind_return != 0);
+    if (this->debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Ignoring unregister activator:%s. Unknown activator.\n", aname));
   }
+}
+
+void
+ImR_Locator_i::unregister_activator_i(const char* aname)
+{
+  ACE_ASSERT(aname != 0);
+  int err = this->repository_.remove_activator (aname);
+  ACE_UNUSED_ARG(err);
+}
+
+void
+ImR_Locator_i::activate_server (const char* server ACE_ENV_ARG_DECL)
+ACE_THROW_SPEC ((CORBA::SystemException,
+                ImplementationRepository::NotFound,
+                ImplementationRepository::CannotActivate))
+{
+  // This is the version called by tao_imr to activate the server, manually
+  // starting it if necessary.
+  activate_server_by_name(server, true ACE_ENV_ARG_PARAMETER);
+}
 
-  if (OPTIONS::instance()->debug() >= 1)
+char*
+ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start ACE_ENV_ARG_DECL)
+ACE_THROW_SPEC ((CORBA::SystemException,
+                ImplementationRepository::NotFound,
+                ImplementationRepository::CannotActivate))
+{
+  // Activate the server, starting it if necessary. Don't start MANUAL
+  // servers unless manual_start=true
+  ACE_ASSERT(name != 0);
+
+  Server_Info_Ptr info = this->repository_.get_server(name);
+  if (info.null())
   {
-    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Activator registered for %s.\n", activator));
+    ACE_ERROR ((LM_ERROR, "ImR Locator: Cannot find info for server <%s>\n", name));
+    ACE_THROW_RETURN(ImplementationRepository::NotFound (), 0);
   }
-  return info.token;
+
+  return activate_server_i(*info, manual_start ACE_ENV_ARG_PARAMETER);
 }
 
-// Remove a activator when it no longer wants to receive requests.
-// object_ref is set to the removed activator.
-void
-ImR_Locator_i::unregister_activator (const char * activator,
-                                     CORBA::Long token
-                                     ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+char*
+ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
+ACE_THROW_SPEC ((CORBA::SystemException,
+                ImplementationRepository::NotFound,
+                ImplementationRepository::CannotActivate))
 {
-  ActivatorInfo info;
-  if (this->activator_map_.find (activator, info) == 0) 
+  if (info.activation_mode == ImplementationRepository::PER_CLIENT && ! manual_start)
+  {
+    info.reset();
+  }
+ 
+  while(true)
   {
-    if (info.token != token && OPTIONS::instance()->debug() >= 1) 
+    if (is_alive(info))
     {
-      ACE_DEBUG((LM_DEBUG, "ImR Locator: Ignoring unregister activator:%s. Wrong token.\n", activator));
-      return;
+      if (debug_ > 0)
+      {
+        ACE_DEBUG((LM_DEBUG, "ImR Locator: Successfully activated <%s> at \n\t%s\n",
+          info.name.c_str(), info.partial_ior.c_str()));
+      }
+      info.start_count = 0;
+      return CORBA::string_dup(info.partial_ior.c_str());
     }
-  
-    int bind_return = this->activator_map_.unbind (activator, info); 
-    ACE_UNUSED_ARG (bind_return);
-    ACE_ASSERT(bind_return == 0);
 
-    if (OPTIONS::instance()->debug() >= 1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Activator %s unregistered.\n", activator));
-    }
-  } 
-  else 
-  {
-    if (OPTIONS::instance()->debug() >= 1)
+    if (info.start_count >= info.start_limit)
     {
-      ACE_DEBUG((LM_DEBUG, "ImR Locator: Ignoring unregister activator:%s. Unknown activator.\n", activator));
+      break;
     }
+
+    ++info.start_count;
+
+    // Note : If the activator is already in the process of starting a server, then
+    // this will simply block with the others currently waiting.
+    start_server(info, manual_start ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN(0);
   }
+
+  if (this->debug_ > 0)
+    ACE_DEBUG((LM_DEBUG, "ImR Locator: Cannot Activate <%s>. Too many retries.\n", info.name.c_str()));
+
+  ACE_THROW_RETURN (ImplementationRepository::CannotActivate
+    (CORBA::string_dup ("Too many retries.")), 0);
+}
+
+char*
+ImR_Locator_i::activate_server_by_object (const char* object_name ACE_ENV_ARG_DECL)
+ACE_THROW_SPEC ((CORBA::SystemException,
+                ImplementationRepository::NotFound,
+                ImplementationRepository::CannotActivate))
+{
+  ACE_ASSERT(object_name != 0);
+
+  // We assume that the first part of the object name is the server name.
+  // So a name of foo/bar means that the server name is foo.
+  ACE_CString server_name(object_name);
+  ssize_t pos = server_name.find ('/');
+  if (pos != ACE_CString::npos)
+    server_name = server_name.substr(pos + 1);
+
+  return activate_server_by_name(server_name.c_str(), false ACE_ENV_ARG_PARAMETER);
 }
 
-// Starts up the server <server> at all the activators where it is
-// registered, if not already running.
 void
-ImR_Locator_i::activate_server (const char *server ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-       CORBA::SystemException,
-       ImplementationRepository::NotFound,
-       ImplementationRepository::CannotActivate))
+ImR_Locator_i::start_server(Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
+ACE_THROW_SPEC ((CORBA::SystemException,
+                ImplementationRepository::NotFound,
+                ImplementationRepository::CannotActivate))
 {
-  if (OPTIONS::instance()->debug() >= 1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Activating server %s.\n", server));
-    }
+  if (info.activation_mode == ImplementationRepository::MANUAL && ! manual_start)
+  {
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Cannot Activate MANUAL server <%s>.\n", info.name.c_str()));
+    ACE_THROW(ImplementationRepository::CannotActivate
+      (CORBA::string_dup ("MANUAL server.")));
+  }
+  if (info.cmdline.length() == 0)
+  {
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Cannot Activate server <%s>."
+        " No command line.\n", info.name.c_str()));
+    ACE_THROW(ImplementationRepository::CannotActivate
+      (CORBA::string_dup ("No command line registered for server.")));
+  }
+
+  Activator_Info_Ptr ainfo = get_activator(info.activator);
 
-  ACE_CString activator;
-  if (this->server_map_.find(server, activator) == 0) 
+  if (ainfo.null() || CORBA::is_nil(ainfo->activator.in()))
   {
-    this->activate_server_in_activator(server, activator.c_str());
-  } 
-  else 
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Cannot Activate server <%s>. "
+        "Activator <%s> not found.\n", info.name.c_str(), info.activator.c_str()));
+    ACE_THROW(ImplementationRepository::CannotActivate
+      (CORBA::string_dup ("No activator registered for server.")));
+  }
+
+  if (this->debug_ > 0)
   {
-    ACE_ERROR ((LM_ERROR, "ImR Locator: Couldn't find an activator for server:%s\n", server));
-    ACE_THROW(ImplementationRepository::NotFound());
+    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Starting server <%s>. Attempt %d/%d.\n",
+      info.name.c_str(), info.start_count, info.start_limit));
   }
-}
 
-// Starts up the server <server> at one or more activators
-// and returns the IOR of the activated server.
-char *
-ImR_Locator_i::activate_server_with_startup (const char *server,
-                                             int check_startup
-                                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::NotFound,
-                   ImplementationRepository::CannotActivate))
-{
-  if (OPTIONS::instance()->debug() >= 1)
+  ACE_TRY
+  {
+    ++ ainfo->waiting_clients;
+    ainfo->activator->start_server(
+      info.name.c_str(),
+      info.cmdline.c_str(),
+      info.dir.c_str(),
+      info.env_vars
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    -- ainfo->waiting_clients;
+  }
+  ACE_CATCH(CORBA::TIMEOUT, ex)
+  {
+    -- ainfo->waiting_clients;
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator : Timeout or error waiting for startup.\n"));
+    info.reset();
+  }
+  ACE_CATCHANY
   {
-    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Activating server %s."
-      " Check startup=%d.\n", server, check_startup));
+    -- ainfo->waiting_clients;
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "Exception during activator communication. Activator connection broken.\n"));
+    if (debug_ > 1)
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::start_server()");
+    ainfo->reset();
+    info.reset();
   }
+  ACE_ENDTRY;
+}
+
+void
+ImR_Locator_i::server_status_changed(Server_Info& info)
+{
+  Activator_Info_Ptr ainfo = get_activator(info.activator);
 
-  ACE_CString activator;
-  if (this->server_map_.find(server, activator) == 0) 
+  if (! ainfo.null()
+    && ! CORBA::is_nil(ainfo->activator.in())
+    && ainfo->waiting_clients > 0
+    )
   {
-    ImplementationRepository::Administration_var admin =
-      this->choose_activator (activator.c_str() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-    char* partial_ior = admin->activate_server_with_startup (server,
-      check_startup ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-    if (partial_ior != 0) {
-      return partial_ior; 
+    ACE_TRY_NEW_ENV
+    {
+      ainfo->activator->server_status_changed(info.name.c_str() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
-  } 
-  ACE_ERROR ((LM_ERROR, "ImR Locator: Couldn't find an activator for server:%s\n", server));
-  ACE_THROW_RETURN (ImplementationRepository::NotFound(), 0);
-  return 0;
+    ACE_CATCHANY
+    {
+      if (debug_ > 0)
+        ACE_DEBUG((LM_DEBUG, "Exception during activator communication. Activator connection broken.\n"));
+      if (debug_ > 1)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::server_status_changed()");
+      ainfo->reset();
+    }
+    ACE_ENDTRY;
+  }
 }
 
-
-// Starts up the server <server> if not already running in the
-// specified activator.
 void
-ImR_Locator_i::activate_server_in_activator (const char *server,
-                                            const char * activator
-                                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::NotFound,
-                   ImplementationRepository::CannotActivate))
+ImR_Locator_i::set_timeout_policy(CORBA::Object_ptr obj, const ACE_Time_Value& to)
 {
-  if (OPTIONS::instance()->debug() >= 1)
+  ACE_TRY_NEW_ENV
+  {
+    TimeBase::TimeT timeout;
+    ORBSVCS_Time::Time_Value_to_TimeT (timeout, to);
+    CORBA::Any tmp;
+    tmp <<= timeout;
+
+    CORBA::PolicyList policies(1);
+    policies.length(1);
+    policies[0] = orb_->create_policy(Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, tmp ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER);
+  }
+  ACE_CATCHANY
   {
-    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Activating server"
-      " %s in activator %s.\n", server, activator));
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::set_timeout_policy()");
   }
-  ImplementationRepository::Administration_var admin =
-    this->choose_activator (activator ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  admin->activate_server (server ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_ENDTRY;
 }
 
-// Adds the server to the repository and registers the startup information
-// about the server <server>.
 void
-ImR_Locator_i::register_server (const char *server,
+ImR_Locator_i::register_server (const char* server,
                                 const ImplementationRepository::StartupOptions &options
                                 ACE_ENV_ARG_DECL)
                                 ACE_THROW_SPEC ((CORBA::SystemException,
-
-ImplementationRepository::AlreadyRegistered,
+                                ImplementationRepository::AlreadyRegistered,
                                 ImplementationRepository::NotFound))
 {
-  ACE_CString activator;
-  if (this->server_map_.find(server, activator) == 0) 
+  register_server_i(server, options, false ACE_ENV_ARG_PARAMETER);
+}
+
+void
+ImR_Locator_i::reregister_server (const char* server,
+                                  const ImplementationRepository::StartupOptions &options
+                                  ACE_ENV_ARG_DECL )
+                                  ACE_THROW_SPEC ((CORBA::SystemException,
+                                  ImplementationRepository::AlreadyRegistered,
+                                  ImplementationRepository::NotFound))
+{
+  register_server_i(server, options, true ACE_ENV_ARG_PARAMETER);
+}
+void
+ImR_Locator_i::register_server_i (const char* server,
+                                  const ImplementationRepository::StartupOptions &options,
+                                  bool allow_updates
+                                  ACE_ENV_ARG_DECL )
+                                  ACE_THROW_SPEC ((CORBA::SystemException,
+                                  ImplementationRepository::AlreadyRegistered,
+                                  ImplementationRepository::NotFound))
+{
+  ACE_ASSERT(server != 0);
+
+  if (this->read_only_)
   {
-    ACE_THROW(ImplementationRepository::AlreadyRegistered());
-    return;
+    ACE_DEBUG((LM_DEBUG, "ImR Locator: Cannot register server <%s> due to locked database.\n", server));
+    ACE_THROW (CORBA::NO_PERMISSION (
+      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+      CORBA::COMPLETED_NO));
   }
 
-  ImplementationRepository::Administration_var admin =
-    this->choose_activator (options.activator.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  admin->register_server (server, options ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  if (OPTIONS::instance()->debug() >= 1)
+  Server_Info_Ptr info = this->repository_.get_server(server);
+  if (info.null())
+  {
+    if (this->debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Adding server <%s>.\n", server));
+
+    this->repository_.add_server (server,
+      options.activator.in(),
+      options.command_line.in (),
+      options.environment,
+      options.working_directory.in (),
+      options.activation,
+      options.start_limit < 1 ? 1 : options.start_limit);
+  }
+  else if (! allow_updates)
+  {
+    ACE_ERROR ((LM_ERROR,
+      "ImR Locator: Server <%s> Already Registered!\n", server));
+    ACE_THROW (ImplementationRepository::AlreadyRegistered());
+  }
+  else
+  {
+    if (info->activator.length() > 0 && info->activator != options.activator.in())
     {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Registered server %s "
-        "in activator %s.\n", server, options.activator.in()));
+      ACE_ERROR ((LM_ERROR,
+        "ImR Locator: Server <%s> Already Registered with Activator <%s>\n",
+        server, info->activator.c_str()));
+      ACE_THROW (ImplementationRepository::AlreadyRegistered());
     }
-  int bind_return = this->server_map_.bind (server, options.activator.in());
-  ACE_UNUSED_ARG (bind_return);
-  ACE_ASSERT(bind_return == 0);
+ 
+    if (this->debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Updating server <%s>.\n", server));
+
+    info->activator = options.activator.in();
+    info->cmdline = options.command_line.in();
+    info->env_vars = options.environment;
+    info->dir = options.working_directory.in();
+    info->activation_mode = options.activation;
+    info->start_limit = options.start_limit < 1 ? 1 : options.start_limit;
+    info->start_count = 0;
+    int err = this->repository_.update_server(*info);
+    ACE_ASSERT(err == 0);
+    ACE_UNUSED_ARG(err);
+  }
+
+  if (this->debug_ > 1)
+  {
+    // Note : The info var may be null
+    ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::register_server_i:\nServer: %s\n"
+      "Activator: %s\n"
+      "Command Line: %s\n"
+      "Working Directory: %s\n"
+      "Activation: %s\n"
+      "Start Limit: %d\n"
+      "\n",
+      server,
+      options.activator.in(),
+      options.command_line.in (),
+      options.working_directory.in (),
+      ImR_Utils::activationModeToString(options.activation).c_str(),
+      options.start_limit
+      ));
+
+    for (CORBA::ULong i = 0; i < options.environment.length(); ++i)
+      ACE_DEBUG ((LM_DEBUG, "Environment variable %s=%s\n",
+      options.environment[i].name.in(),
+      options.environment[i].value.in()));
+  }
 }
 
-// Updates the startup information about the server <server>.
-// Can not currently be used to move a server from one activator to another,
-// this simply updates the registered info.
 void
-ImR_Locator_i::reregister_server (
-      const char *server,
-      const ImplementationRepository::StartupOptions &options
-      ACE_ENV_ARG_DECL )
-  ACE_THROW_SPEC ((CORBA::SystemException,ImplementationRepository::NotFound))
+ImR_Locator_i::remove_server (const char* name ACE_ENV_ARG_DECL)
+ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
-  ACE_CString activator;
-  if (this->server_map_.find(server, activator) != 0) 
+  ACE_ASSERT(name != 0);
+  if (this->read_only_)
   {
-    ACE_THROW(ImplementationRepository::NotFound());
-  }
-  if (activator.compare(options.activator.in()) != 0) 
-  {
-    ACE_THROW(ImplementationRepository::NotFound());
+    ACE_ERROR ((LM_ERROR,
+      "ImR Locator: Can't remove server <%s> due to locked database.\n", name));
+    ACE_THROW (CORBA::NO_PERMISSION (
+      CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+      CORBA::COMPLETED_NO));
   }
 
-  ImplementationRepository::Administration_var admin =
-    this->choose_activator (activator.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  // Note : This will be safe, because any Server_Info_Ptr objects will still
+  // be valid, and the actual Server_Info will be destroyed when the last
+  // one goes out of scope.
 
-  if (OPTIONS::instance()->debug() >= 1)
+  Server_Info_Ptr info = this->repository_.get_server(name);
+  if (! info.null())
   {
-    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Reregister server %s "
-      "in activator %s.\n", server, activator.c_str()));
+    server_status_changed(*info);
+
+    if (this->repository_.remove_server (name) == 0)
+    {
+      if (this->debug_ > 0)
+        ACE_DEBUG ((LM_DEBUG, "ImR Locator: Removed Server <%s>.\n", name));
+    }
+  }
+  else
+  {
+    ACE_ERROR ((LM_ERROR,
+      "ImR Locator: Can't remove unknown server <%s>.\n", name));
+    ACE_THROW (ImplementationRepository::NotFound ());
   }
-  admin->reregister_server (server, options ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
-// Removes the server <server> from the repository.
 void
-ImR_Locator_i::remove_server (const char *server ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
+ImR_Locator_i::shutdown_server (const char* server ACE_ENV_ARG_DECL)
+ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
-  if (OPTIONS::instance()->debug() >= 1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Remove server %s.\n", server));
-    }
-  ACE_CString activator;
-  if (this->server_map_.find(server, activator) == 0) 
+  ACE_ASSERT(server != 0);
+
+  if (this->debug_ > 0)
+    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Shutting down server <%s>.\n", server));
+
+  Server_Info_Ptr info = this->repository_.get_server(server);
+  if (info.null())
   {
-    this->remove_server_in_activator(server, activator.c_str());
-  } 
-  else 
+    ACE_ERROR ((LM_ERROR,
+      "ImR Locator: shutdown_server() Cannot find info for server <%s>\n", server));
+    ACE_THROW(ImplementationRepository::NotFound());
+  }
+
+  connect_server(*info);
+
+  if (CORBA::is_nil(info->server.in()))
   {
-    ACE_ERROR ((LM_ERROR, "ImR Locator: Couldn't find an activator for server:%s\n", server));
+    ACE_ERROR ((LM_ERROR,
+      "ImR Locator: shutdown_server() Cannot connect to server <%s>\n", server));
     ACE_THROW(ImplementationRepository::NotFound());
   }
-}
 
-// Removes the server <server> from the repository.
-void
-ImR_Locator_i::remove_server_in_activator (const char *server,
-                                          const char *activator
-                                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::NotFound
-                   ))
-{
-  if (OPTIONS::instance()->debug() >= 1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Remove server %s "
-        "from activator %s.\n", server, activator));
-    }
-  ACE_CString registered_activator;
-  if (this->server_map_.find(server, registered_activator) != 0) 
+  ACE_TRY_NEW_ENV
   {
-    ACE_THROW(ImplementationRepository::NotFound()); // todo : Add to signature in pidl and others
+    ImplementationRepository::ServerObject_var server = info->server;
+    server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
   }
-  if (registered_activator.compare(activator) != 0) 
+  ACE_CATCHANY
   {
-    ACE_ASSERT(false);
+    if (this->debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Exception ignored while shutting down <%s>\n", server));
   }
+  ACE_ENDTRY;
 
-  ImplementationRepository::Administration_var admin =
-    this->choose_activator (activator ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  admin->remove_server (server ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  int err = this->server_map_.unbind(server);
-  ACE_UNUSED_ARG (err);
+  info->reset();
+
+  int err = this->repository_.update_server(*info);
   ACE_ASSERT(err == 0);
+  ACE_UNUSED_ARG(err);
+
+  server_status_changed(*info);
 }
 
-// Attempts to gracefully shut down the server, at all activators that
-// it is running.
 void
-ImR_Locator_i::shutdown_server (const char *server ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
+ImR_Locator_i::server_is_running (const char* name,
+                                  const char* partial_ior,
+                                  ImplementationRepository::ServerObject_ptr server
+                                  ACE_ENV_ARG_DECL)
+                                  ACE_THROW_SPEC ((CORBA::SystemException,
+                                  ImplementationRepository::NotFound))
 {
-  if (OPTIONS::instance()->debug() >= 1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Shutdown server %s.\n", server));
-    }
-  ACE_CString activator;
-  if (this->server_map_.find(server, activator) == 0) 
+  ACE_ASSERT(name != 0);
+  ACE_ASSERT(partial_ior != 0);
+  ACE_ASSERT(! CORBA::is_nil(server));
+
+  if (this->debug_ > 0)
+    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Server %s is running at %s.\n", name, partial_ior));
+
+  set_timeout_policy(server, DEFAULT_SERVER_TIMEOUT);
+
+  CORBA::String_var ior = orb_->object_to_string (server ACE_ENV_ARG_PARAMETER);
+
+  Server_Info_Ptr info = this->repository_.get_server(name);
+  if (info.null())
   {
-    this->shutdown_server_in_activator(server, activator.c_str());
-  } 
-  else 
+    if (this->debug_ > 0)
+      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Auto adding NORMAL server:<%s>\n", name));
+
+    ImplementationRepository::EnvironmentList env(0);
+    this->repository_.add_server (name,
+      "", // no activator
+      "", // no cmdline
+      ImplementationRepository::EnvironmentList(),
+      "", // no working dir
+      ImplementationRepository::NORMAL,
+      DEFAULT_START_LIMIT,
+      partial_ior,
+      ior.in(),
+      server
+      );
+  }
+  else
   {
-    ACE_ERROR ((LM_ERROR, "ImR Locator: Couldn't find an activator for server:%s\n", server));
-    ACE_THROW(ImplementationRepository::NotFound());
+    info->ior = ior.in();
+    info->partial_ior = partial_ior;
+    info->server = ImplementationRepository::ServerObject::_duplicate(server);
+
+    int err = this->repository_.update_server(*info);
+    ACE_ASSERT(err == 0);
+    ACE_UNUSED_ARG(err);
+
+    // Temporarily disable this optimization since it only works on Windows, due to root poa lock
+    // being held in the server, preventing us from calling back to the server from within this call.
+    //is_alive(*info); // We don't really care if it is or not, we just want to cache the result.
+
+#if !defined (ACE_HAS_RECURSIVE_MUTEXES)
+    // Schedule a timer to call server_status_changed() on this
+    // ImR_Locator_i.  Due to locking problems within the POA, we need to
+    // do this after we return from this method.  Status_Changed_Timer is
+    // allocated on the heap here, but is deleted within the
+    // handle_timeout() call.
+    Status_Changed_Timer* sct;
+    ACE_NEW_THROW_EX (sct, 
+                      Status_Changed_Timer (this, info),
+                      CORBA::NO_MEMORY ());
+
+    ACE_Time_Value delay(0, 10000);
+    this->orb_->orb_core()->reactor()->schedule_timer (sct, 0, delay);
+#else
+    server_status_changed(*info);
+#endif /* ACE_HAS_RECURSIVE_MUTEXES */
   }
 }
 
-// Attempts to gracefully shut down the server,
 void
-ImR_Locator_i::shutdown_server_in_activator (
-      const char *server,
-      const char *activator
-      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
-{
-  ImplementationRepository::Administration_var admin =
-    this->choose_activator (activator ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  if (OPTIONS::instance()->debug() >= 1)
+ImR_Locator_i::server_is_shutting_down (const char* server ACE_ENV_ARG_DECL_NOT_USED)
+ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
+{
+  ACE_ASSERT(server != 0);
+  Server_Info_Ptr info = this->repository_.get_server(server);
+  if (info.null())
+  {
+    if (this->debug_ > 1)
     {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Shutdown server %s "
-        "in activator %s.\n", server, activator));
+      ACE_DEBUG((LM_DEBUG,
+        "ImR_Locator_i::server_is_shutting_down: Unknown server:%s\n", server));
     }
-  admin->shutdown_server (server ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
+    return;
+  }
 
-void
-ImR_Locator_i::server_is_running (const char *,
-                                  const char *,
-                                  ImplementationRepository::ServerObject_ptr
-                                  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   ImplementationRepository::NotFound))
-{
-  ACE_ERROR((LM_ERROR, "ImR_Locator_i::server_is_running() "
-    "This operation is only for the ImR_Activator.\n"));
-  ACE_ASSERT(false);
-}
+  if (this->debug_ > 0)
+    ACE_DEBUG((LM_DEBUG, "ImR Locator: server <%s> is shutting down.\n", server));
 
-void
-ImR_Locator_i::server_is_running_in_activator (const char* server,
-                                               const char* activator,
-                                               const char* partial_ior,
-                                               ImplementationRepository::ServerObject_ptr server_object
-                                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
-{
-  // todo : At this point we could automatically register the server, so that 
-  // manually started servers don't require tao_imr add first.
-  ImplementationRepository::Administration_var admin =
-    this->choose_activator (activator ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  if (OPTIONS::instance()->debug() >= 1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Server %s "
-        "running in activator %s.\n", server, activator));
-    }
-  admin->server_is_running (server, partial_ior, server_object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
+  info->reset();
 
-void
-ImR_Locator_i::server_is_shutting_down (const char* ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
-{
-  ACE_ERROR((LM_ERROR, "ImR_Locator_i::server_is_shutting_down()"
-    " This operation is only for the ImR_Activator.\n"));
-  ACE_ASSERT(false);
-}
+  int err = this->repository_.update_server(*info);
+  ACE_ASSERT(err == 0);
+  ACE_UNUSED_ARG(err);
 
-// What the server should call before it shuts down.
-void
-ImR_Locator_i::server_is_shutting_down_in_activator (
-      const char *server,
-      const char *activator
-      ACE_ENV_ARG_DECL
-    ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
-{
-  ImplementationRepository::Administration_var admin =
-    this->choose_activator (activator ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  if (OPTIONS::instance()->debug() >= 1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Server %s "
-        "shutting down in activator %s.\n", server, activator));
-    }
-  admin->server_is_shutting_down (server ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  server_status_changed(*info);
 }
 
-// Find 
 void
-ImR_Locator_i::find (
-      const char * server,
-      ImplementationRepository::ServerInformation_out info
-      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
+ImR_Locator_i::find (const char* server,
+                     ImplementationRepository::ServerInformation_out imr_info
+                     ACE_ENV_ARG_DECL)
+                     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
-  ACE_CString activator;
-  if (this->server_map_.find(server, activator) == 0) 
-  {
-    this->find_in_activator(server, activator.c_str(), info);
-  } 
-  else 
+  ACE_ASSERT(server != 0);
+  ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
+
+  Server_Info_Ptr info = this->repository_.get_server(server);
+  if (info.null())
   {
-    ACE_ERROR ((LM_ERROR, "ImR Locator: Couldn't find an activator for server:%s\n", server));
+    ACE_ERROR ((LM_ERROR,
+      "ImR Locator: Cannot find info for server <%s>\n",
+      server));
     ACE_THROW(ImplementationRepository::NotFound());
   }
-}
 
-void
-ImR_Locator_i::find_in_activator (
-      const char* server,
-      const char* activator,
-      ImplementationRepository::ServerInformation_out info
-      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
-{
-  ImplementationRepository::Administration_var admin =
-    this->choose_activator (activator ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  if (OPTIONS::instance()->debug() >= 1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Find server %s "
-        "in activator %s.\n", server, activator));
-    }
-  admin->find(server, info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  imr_info = info->createImRServerInfo(ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  if (this->debug_ > 0)
+    ACE_DEBUG ((LM_DEBUG, "ImR Locator: Found server %s.\n", server));
 }
 
-// Used to access the list of servers registered.  May also return an
-// iterator which can be used to access more than <how_many> of them.
 void
 ImR_Locator_i::list (CORBA::ULong how_many,
                      ImplementationRepository::ServerInformationList_out server_list,
@@ -708,158 +892,364 @@ ImR_Locator_i::list (CORBA::ULong how_many,
                      ACE_ENV_ARG_DECL
                      ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (OPTIONS::instance()->debug() >= 1)
-  {
+  if (this->debug_ > 0)
     ACE_DEBUG ((LM_DEBUG, "ImR Locator: List servers.\n"));
+
+  // Initialize the out variables, so if we return early, they will
+  // not be dangling.
+  server_iterator = ImplementationRepository::ServerInformationIterator::_nil();
+  ACE_NEW_THROW_EX (server_list,
+    ImplementationRepository::ServerInformationList(0), CORBA::NO_MEMORY());
+
+  Locator_Repository::SIMap::ENTRY* entry = 0;
+  Locator_Repository::SIMap::ITERATOR it(this->repository_.servers());
+
+  // Number of servers that will go into the server_list.
+  CORBA::ULong n = this->repository_.servers().current_size();
+  if (how_many > 0 && n > how_many)
+  {
+    n = how_many;
   }
-  ActivatorMap::ENTRY *next_entry = 0;
-  int cnt = 0;
 
-  for (ActivatorMap::ITERATOR iterator (this->activator_map_);
-    iterator.next (next_entry) != 0;
-    iterator.advance ())
+  server_list->length(n);
+
+  if (this->debug_ > 1)
+    ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::list: Filling ServerList with %d servers\n", n));
+
+  for (CORBA::ULong i = 0; i < n; i++)
   {
-    ImplementationRepository::Administration_ptr admin = next_entry->int_id_.admin.in();
-    ++cnt;
-    // todo : Check to make sure activator implementation supports repeat calls correctly.
-    admin->list (how_many,
-      server_list,
-      server_iterator
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    it.next(entry);
+    it.advance();
+    ACE_ASSERT(entry != 0);
+
+    Server_Info_Ptr info = entry->int_id_;
+
+    ImplementationRepository::ServerInformation_var imr_info = info->createImRServerInfo(ACE_ENV_SINGLE_ARG_PARAMETER);
+    server_list[i] = *imr_info;
   }
 
-  if (cnt <= 0) 
+  if (this->repository_.servers().current_size() > n)
   {
-    // Temporary fix for the seg fault that occurs when the skel tries to
-    // handle the unitialised sequence when this method is called and
-    // no activator has been registered yet.
-    // @todo A full rework of this method is needed - see bug #1543. 
-    server_iterator =
-      ImplementationRepository::ServerInformationIterator::_nil (); 
-    ACE_NEW_THROW_EX (server_list,
-      ImplementationRepository::ServerInformationList (0),
+    if (this->debug_ > 1)
+      ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::list: Creating ServerInformation Iterator\n"));
+
+    ImR_Iterator* imr_iter;
+
+    ACE_NEW_THROW_EX (imr_iter,
+      ImR_Iterator (n, this->repository_, this->imr_poa_.in()),
       CORBA::NO_MEMORY ());
+
+    PortableServer::ServantBase_var tmp(imr_iter);
+
+    ACE_TRY
+    {
+      PortableServer::ObjectId_var id =
+        this->imr_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CORBA::Object_var obj = this->imr_poa_->id_to_reference(id.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      server_iterator = ImplementationRepository::
+        ServerInformationIterator::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+    ACE_CATCHANY
+    {
+      ACE_RE_THROW;
+    }
+    ACE_ENDTRY;
+    ACE_CHECK;
   }
 }
 
-ImplementationRepository::Administration_ptr
-ImR_Locator_i::choose_activator (const char *activator ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((ImplementationRepository::NotFound, CORBA::SystemException))
+Activator_Info_Ptr
+ImR_Locator_i::get_activator (const ACE_CString& aname)
 {
-  ActivatorInfo info;
-  if (this->activator_map_.find (activator, info) != 0)
+  Activator_Info_Ptr info = this->repository_.get_activator (aname);
+  if (! info.null())
+  {
+    this->connect_activator (*info);
+  }
+  return info;
+}
+
+void
+ImR_Locator_i::connect_activator (Activator_Info& info)
+{
+  if (! CORBA::is_nil(info.activator.in()) || info.ior.length() == 0)
+    return;
+
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj =
+      this->orb_->string_to_object (info.ior.c_str()
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    if (CORBA::is_nil(obj.in()))
     {
-      ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
+      info.reset();
+      return;
     }
-  return info.admin._retn();
+
+    info.activator =
+      ImplementationRepository::Activator::_narrow (obj.in ()
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    if (CORBA::is_nil(info.activator.in()))
+    {
+      info.reset();
+      return;
+    }
+
+    set_timeout_policy(info.activator.in(), startup_timeout_);
+
+    if (debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: reconnected to activator <%s>\n", info.name.c_str()));
+  }
+  ACE_CATCHANY
+  {
+    info.reset();
+  }
+  ACE_ENDTRY;
 }
 
-char *
-ImR_Locator_i::find_ior (const char *object_name ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
+void
+ImR_Locator_i::auto_start_servers(ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (OPTIONS::instance()->debug() >= 1)
+  if (this->repository_.servers().current_size() == 0)
+    return;
+
+  Locator_Repository::SIMap::ENTRY* server_entry;
+  Locator_Repository::SIMap::ITERATOR server_iter(this->repository_.servers());
+
+  // For each of the entries in the Locator_Repository, get the startup
+  // information and activate the servers, if they are not already
+  // running.
+  for (;server_iter.next(server_entry) != 0; server_iter.advance())
+  {
+    Server_Info_Ptr info = server_entry->int_id_;
+    ACE_ASSERT(! info.null());
+
+    ACE_TRY
+    {
+      if (info->activation_mode == ImplementationRepository::AUTO_START
+        && info->cmdline.length() > 0)
+      {
+        this->activate_server_i (*info, true ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    }
+    ACE_CATCHANY
     {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Find ior %s.\n", object_name));
+      if (this->debug_ > 1)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+          "ImR_Locator_i::run: AUTO_START Could not activate <%s>\n",
+          server_entry->ext_id_.c_str ()));
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AUTO_START");
+      }
+      // Ignore exceptions
     }
+    ACE_ENDTRY;
+    ACE_CHECK;
+  }
+}
+
+void
+ImR_Locator_i::connect_server(Server_Info& info)
+{
+  if (! CORBA::is_nil(info.server.in()) || info.ior.length() == 0)
+    return;
+
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj = orb_->string_to_object (info.ior.c_str() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-  ActivatorMap::ENTRY *next_entry = 0;
-  
-  for (ActivatorMap::ITERATOR iterator (this->activator_map_);
-       iterator.next (next_entry) != 0;
-       iterator.advance ())
+    if (CORBA::is_nil(obj.in()))
     {
-      ImplementationRepository::Administration_ptr admin = next_entry->int_id_.admin.in();
-      ACE_TRY
-        {
-          char* ior = admin->find_ior (object_name ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      info.reset();
+      return;
+    }
 
-          return ior;    
-        }
-      ACE_CATCH (ImplementationRepository::NotFound, ex)
-        {
-          ACE_UNUSED_ARG(ex);
-        }
-      ACE_ENDTRY;
+    info.server =
+      ImplementationRepository::ServerObject::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    if (CORBA::is_nil(info.server.in()))
+    {
+      info.reset();
+      return;
     }
-  
-  ACE_ERROR ((LM_ERROR, "ImR Locator: Couldn't find an activator for object:%s\n", object_name));
-  ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
-  return 0;
+
+    set_timeout_policy(info.server.in(), DEFAULT_SERVER_TIMEOUT);
+
+    if (debug_)
+      ACE_DEBUG((LM_DEBUG, "ImR Locator: Reconnected server <%s>\n", info.name.c_str()));
+  }
+  ACE_CATCHANY
+  {
+    info.reset();
+  }
+  ACE_ENDTRY;
+}
+
+bool
+ImR_Locator_i::is_alive(Server_Info& info)
+{
+  for (int i = 0; i < IS_ALIVE_RETRY_COUNT; ++i)
+  {
+    int status = this->is_alive_i(info);
+    if (status == 0)
+      return false;
+    if (status == 1)
+      return true;
+
+    // This is evil, but there's not much else we can do for now. We should never
+    // reach this code once the ImR Servers are fixed so that they don't lie about
+    // server_is_running. Currently, they send this notification during poa creation.
+    // We have to run the orb, because the very thing that may be slowing the 
+    // aliveness of the servers is the fact that they're trying to register more
+    // objects with us.
+    ACE_Time_Value tv = IS_ALIVE_RETRY_INTERVAL;
+    this->orb_->run(tv);
+  }
+  if (debug_ > 0)
+  {
+    ACE_DEBUG((LM_DEBUG,
+      "ImR Locator: <%s> is_alive() retry count exceeded. alive=false.\n", info.name.c_str()));
+  }
+  // We return true here, because the server *might* be alive, it's just not starting in a timely
+  // manner. We can't return false, because then we'll just try to start another instance, and the
+  // same thing will likely happen.
+  info.last_ping = ACE_OS::gettimeofday();
+  return true;
 }
 
-void ImR_Locator_i::shutdown_repo (ACE_ENV_SINGLE_ARG_DECL)
- 	   ACE_THROW_SPEC ( (CORBA::SystemException) )
+int
+ImR_Locator_i::is_alive_i(Server_Info& info)
 {
-  if (OPTIONS::instance()->debug() >= 1)
+  // This is used by the ACE_TRY below when exceptions are turned off.
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  if (info.ior.length() == 0 || info.partial_ior.length() == 0)
+  {
+    if (debug_ > 1)
+    {
+      ACE_DEBUG((LM_DEBUG,
+        "ImR Locator: <%s> not running. alive=false.\n", info.name.c_str()));
+    }
+    info.last_ping = ACE_Time_Value::zero;
+    return 0;
+  }
+
+  if (ping_interval_ == ACE_Time_Value::zero)
+  {
+    if (debug_ > 1)
+    {
+      ACE_DEBUG((LM_DEBUG,
+        "ImR Locator: <%s> Ping verification disabled. alive=true.\n", info.name.c_str()));
+    }
+    return 1;
+  }
+
+  if (ACE_OS::gettimeofday() - info.last_ping < ping_interval_)
+  {
+    if (debug_ > 1)
     {
-      ACE_DEBUG ((LM_DEBUG, "ImR Locator: Shutting down repository\n"));
+      ACE_DEBUG((LM_DEBUG,
+        "ImR Locator: <%s> within ping interval. alive=true.\n", info.name.c_str()));
     }
+    return 1;
+  }
+
+  connect_server(info);
 
-  ActivatorMap::ENTRY *next_entry = 0;
-  
-  for (ActivatorMap::ITERATOR iterator (this->activator_map_);
-       iterator.next (next_entry) != 0;
-       iterator.advance ())
+  if (CORBA::is_nil (info.server.in()))
+  {
+    if (debug_ > 1)
     {
-      ImplementationRepository::Administration_ptr admin_ref = next_entry->int_id_.admin.in();;
+      ACE_DEBUG((LM_DEBUG,
+        "ImR Locator: <%s> Could not connect. alive=false.\n", info.name.c_str()));
+    }
+    return 0;
+  }
+
+  ACE_TRY
+  {
+    // Make a copy, in case the info is updated during the ping.
+    ImplementationRepository::ServerObject_var server = info.server;
+
+    // This will timeout if it takes too long
+    server->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      ACE_TRY
+    if (debug_ > 1)
+    {
+      ACE_DEBUG((LM_DEBUG,
+        "ImR Locator: <%s> Ping successfull. alive=true\n", info.name.c_str()));
+    }
+    info.last_ping = ACE_OS::gettimeofday();
+  }
+  ACE_CATCH(CORBA::TRANSIENT, ex)
+  {
+    const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80;
+    switch (ex.minor() & BITS_5_THRU_12_MASK)
+    {
+    case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
+      {
+        if (debug_ > 1)
         {
-          admin_ref->shutdown_repo (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;    
+          ACE_DEBUG((LM_DEBUG,
+            "ImR Locator: <%s> Local TRANSIENT. alive=false.\n", info.name.c_str()));
         }
-      ACE_CATCH (ImplementationRepository::NotFound, ex)
+      }
+      info.last_ping = ACE_Time_Value::zero;
+      return 0;
+    case TAO_POA_DISCARDING:
+    case TAO_POA_HOLDING:
+      {
+        if (debug_ > 1)
         {
-          ACE_UNUSED_ARG(ex);
+          ACE_DEBUG((LM_DEBUG,
+            "ImR Locator: <%s> Remote TRANSIENT. alive=maybe.\n", info.name.c_str()));
         }
-      ACE_ENDTRY; 	  
+      }
+      return -1; // We keep trying to ping, because returning 1 now, would just lead
+                 // to clients getting the same exception. If we can't ping after several
+                 // attempts, then we'll give up and return 1, letting the client worry about it.
+    default:
+      ACE_ERROR ((LM_ERROR,
+        "ImR_Activator_i::is_alive(): <%s> unexpected TRANSIENT minor code (%d). alive=false\n",
+        info.name.c_str(), ex.minor()));
+      info.last_ping = ACE_Time_Value::zero;
+      return 0;
+    }
+  }
+  ACE_CATCH(CORBA::TIMEOUT, ex)
+  {
+    if (debug_ > 1)
+    {
+      ACE_DEBUG((LM_DEBUG,
+      "ImR Locator: <%s> Ping timed out. alive=true.\n", info.name.c_str()));
+    }
+    return -1; // See above.
+  }
+  ACE_CATCHANY
+  {
+    if (debug_ > 1)
+    {
+      ACE_DEBUG((LM_DEBUG,
+        "ImR Locator: <%s> Ping exception. alive=false.\n"));
     }
-       
-  // Finally shutdown the ORB.
-  //
-  orb_->shutdown (0) ;
+    info.last_ping = ACE_Time_Value::zero;
+    return false;
+  }
+  ACE_ENDTRY;
+  return 1;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager<ACE_CString, ActivatorInfo, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ActivatorInfo, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_CString, ActivatorInfo, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, ActivatorInfo, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_CString, ActivatorInfo>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, ActivatorInfo, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ActivatorInfo, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ActivatorInfo, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Manager<ACE_CString, ACE_CString, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_CString, ACE_CString, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_CString, ACE_CString>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, ACE_CString, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,ActivatorInfo,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ActivatorInfo, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,ActivatorInfo,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, ActivatorInfo, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ActivatorInfo>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, ActivatorInfo, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ActivatorInfo, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ActivatorInfo, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,ACE_CString,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,ACE_CString,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_CString>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, ACE_CString, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index 5f7ea07d604..5b59f663e32 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -4,212 +4,178 @@
 #define IMR_LOCATOR_I_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/ImR_LocatorS.h"
-#include "tao/IORTable/IORTable.h"
+#include "locator_export.h"
 
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "ace/SString.h"
+#include "Adapter_Activator.h"
+#include "Forwarder.h"
+#include "INS_Locator.h"
+#include "Locator_Options.h"
+#include "Locator_Repository.h"
 
-class ACE_Reactor;
-
-struct ActivatorInfo {
-  CORBA::Long token; // A unique token is assigned at registration
-  ImplementationRepository::Administration_var admin;
-};
+#include "orbsvcs/IOR_Multicast.h"
 
-// Look up activator information by activator name.
-typedef ACE_Hash_Map_Manager_Ex <ACE_CString,
-                                 ActivatorInfo,
-                                 ACE_Hash<ACE_CString>,
-                                 ACE_Equal_To<ACE_CString>,
-                                 ACE_Null_Mutex> ActivatorMap;
+#include "ImR_LocatorS.h"
 
-// Look up activator name by server name. (where the server name is the name of a poa 
-//      registered in the call to server_is_running().)
-typedef ACE_Hash_Map_Manager_Ex <ACE_CString,
-                                 ACE_CString,
-                                 ACE_Hash<ACE_CString>,
-                                 ACE_Equal_To<ACE_CString>,
-                                 ACE_Null_Mutex> ServerMap;
-
-class ImR_Adapter_Activator;
-class ImR_Forwarder;
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
+class ACE_Reactor;
 
 // Gets a request from a client and depending on the POA name,
 // requests an activator to take care of activating the
 // corresponding server and raises a forward exception to the
 // client pointing to the correct server.
-class ImR_Locator_i : public virtual POA_ImplementationRepository::Locator
+class Locator_Export ImR_Locator_i : public virtual POA_ImplementationRepository::Locator
 {
+public:
+  ImR_Locator_i();
 
- public:
+  /// Initialize the service, creating its own orb, poa, etc.
+  int init (Options& opts ACE_ENV_ARG_DECL);
 
-  ImR_Locator_i ();
+  /// Same as above, but use the given orb
+  int init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL);
 
-  // Initialize and gets the ImR_Locator running and ready to accept
-  // requests.
-  int init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  /// Cleans up any state created by init*.
+  int fini (ACE_ENV_SINGLE_ARG_DECL);
 
-  // Register an activator with the locator. 
-  // Returns a token that must be used when unregistering.
-  virtual CORBA::Long register_activator (const char *activator,
-    ImplementationRepository::Administration_ptr admin,
-    const ImplementationRepository::Locator::ServerNameList & servers
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  /// Run using the orb reference created during init()
+  int run (ACE_ENV_SINGLE_ARG_DECL);
+
+  // Note : See the IDL for descriptions of the operations.
+
+  // Activator->Locator
 
-  // UnRegister an activator with the locator.
-  virtual void unregister_activator (const char *activator,
-    CORBA::Long token ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long register_activator (const char* name,
+    ImplementationRepository::Activator_ptr admin
+    ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void unregister_activator (const char* name,
+    CORBA::Long token ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  // Starts up the server <server> if not already running.
-  virtual void activate_server (const char *server
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::NotFound,
-                     ImplementationRepository::CannotActivate));
+  // tao_imr->Locator
 
-  // Starts up the server <server> if not already running.
-  virtual void activate_server_in_activator (const char *server,
-                                            const char *activator
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void activate_server (const char * name
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::NotFound,
-                     ImplementationRepository::CannotActivate));
-
-  // Adds the server to the repository and registers the startup information
-  // about the server <server>.
-  virtual void register_server (const char *server,
-                                const ImplementationRepository::StartupOptions &options
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                ACE_THROW_SPEC ((CORBA::SystemException, 
-                                ImplementationRepository::AlreadyRegistered,
-                                ImplementationRepository::NotFound));
-
-  // Updates the startup information about the server <server>.
-  virtual void reregister_server (const char *server,
-                                  const ImplementationRepository::StartupOptions &options
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,ImplementationRepository::NotFound ));
-
-  // Removes the server <server> from the repository.
-  virtual void remove_server (const char *server
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-
-  // Removes the server <server> from the repository.
-  virtual void remove_server_in_activator (const char *server,
-                                          const char *activator
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ImplementationRepository::NotFound,
+    ImplementationRepository::CannotActivate));
+  virtual void register_server (const char * name,
+    const ImplementationRepository::StartupOptions &options
+    ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+    ImplementationRepository::AlreadyRegistered,
+    ImplementationRepository::NotFound));
+  virtual void reregister_server (const char * name,
+    const ImplementationRepository::StartupOptions &options
+    ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+    ImplementationRepository::AlreadyRegistered,
+    ImplementationRepository::NotFound ));
+  virtual void remove_server (const char * name
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-
-  // Attempts to gracefully shut down the server,
-  virtual void shutdown_server (const char *server
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown_server (const char * name
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-
-  // Attempts to gracefully shut down the server <server> in activator
-  // <activator>
-  virtual void shutdown_server_in_activator (const char *server,
-                                            const char *activator
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void find (const char * name,
+    ImplementationRepository::ServerInformation_out info
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-
-  // Shuts down the repository.
-  virtual void shutdown_repo (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+  virtual void list (
+    CORBA::ULong how_many,
+    ImplementationRepository::ServerInformationList_out server_list,
+    ImplementationRepository::ServerInformationIterator_out server_iterator
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  // Invoked by the server to update transient information such as current
-  // activator of the <server> and its ServerObject.
-  virtual void server_is_running_in_activator (const char *server,
-                                   const char* activator,
-                                   const char* partial_ior,
-                                   ImplementationRepository::ServerObject_ptr server_object
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
+  // Server->Locator
 
-  // This version should only be used by the activator.
-  virtual void server_is_running (const char* server,
-                                   const char* partial_ior,
-                                   ImplementationRepository::ServerObject_ptr server_object
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void server_is_running (const char* name,
+    const char* partial_ior,
+    ImplementationRepository::ServerObject_ptr server_object
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-
-  // Only used by activator.
-  virtual void server_is_shutting_down (const char *server ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void server_is_shutting_down (const char * name ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
 
-  // What the server <server> should call before it shuts down from
-  // activator <activator>
-  virtual void server_is_shutting_down_in_activator (const char *server,
-                                                    const char *activator
-                                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
+  // Used by the INS_Locator to start a sever given an object name
+  char* activate_server_by_object (const char* object_name ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+    ImplementationRepository::NotFound,
+    ImplementationRepository::CannotActivate));
 
-  /// IOR_LookupTable_Callback method helper. Will return an IOR
-  char *find_ior (const char* object_name ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
+  char* activate_server_by_name (const char * name, bool manual_start ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+    ImplementationRepository::NotFound,
+    ImplementationRepository::CannotActivate));
 
-  virtual void find (const char *server,
-                     ImplementationRepository::ServerInformation_out info
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
+  void server_status_changed(Server_Info& info);
 
-  // Returns the startup information for a server
-  virtual void find_in_activator (const char *server,
-                     const char* activator,
-                     ImplementationRepository::ServerInformation_out info
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
+private:
 
-  // Used to access the list of servers registered.  May also return an
-  // iterator which can be used to access more than <how_many> of them.
-  virtual void list (
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char* activate_server_i (Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+    ImplementationRepository::NotFound,
+    ImplementationRepository::CannotActivate));
+
+  void start_server(Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+    ImplementationRepository::NotFound,
+    ImplementationRepository::CannotActivate));
 
-  // Starts up the server <server> on one or more activators.
-  // Returns a partial ior for the server that is missing only the ObjectKey.
-  char *activate_server_with_startup (const char *server,
-                                      int check_startup
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void register_server_i (const char * name,
+    const ImplementationRepository::StartupOptions &options,
+    bool allow_updates
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     ImplementationRepository::NotFound,
-                     ImplementationRepository::CannotActivate));
- private:
+    ImplementationRepository::AlreadyRegistered,
+    ImplementationRepository::NotFound ));
+
+  bool is_alive(Server_Info& info);
+  int is_alive_i(Server_Info& info);
 
   // Set up the multicast related if 'm' is passed on the command
   // line.
   int setup_multicast (ACE_Reactor *reactor, const char *ior);
 
-  // As the name suggests, this methods helps choose the activator
-  // based on the activator passed.
-  ImplementationRepository::Administration_ptr
-    choose_activator(const char *activator ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((ImplementationRepository::NotFound, CORBA::SystemException));
+  void unregister_activator_i(const char* activator);
+
+  Activator_Info_Ptr get_activator (const ACE_CString& name);
+  void connect_activator (Activator_Info& info);
+
+  void auto_start_servers(ACE_ENV_SINGLE_ARG_DECL);
+
+  void set_timeout_policy(CORBA::Object_ptr obj, const ACE_Time_Value& to);
 
-  // Table that maintains the activator to Object Reference of the
-  // Activator running in that activator.
-  ActivatorMap activator_map_;
-  ServerMap server_map_;
+  void connect_server(Server_Info& info);
+
+private:
 
   // The class that handles the forwarding.
-  ImR_Forwarder *forwarder_impl_;
+  ImR_Forwarder forwarder_;
 
   // Used for the forwarding of any type of POA.
-  ImR_Adapter_Activator *activator_;
+  ImR_Adapter adapter_;
 
   /// The locator interface for the IORTable
-  IORTable::Locator_var ins_locator_;
+  INS_Locator ins_locator_;
+
+  CORBA::ORB_var orb_;
+  PortableServer::POA_var root_poa_;
+  PortableServer::POA_var imr_poa_;
+
+  int debug_;
+
+  TAO_IOR_Multicast ior_multicast_;
+
+  Locator_Repository repository_;
 
-  // The ORB.
-  CORBA::ORB_var orb_ ;
+  bool read_only_;
+  ACE_Time_Value startup_timeout_;
+  ACE_Time_Value ping_interval_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index 39f5d0f11fb..30218651d5b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -1,41 +1,131 @@
 // $Id$
-project(ImR_Locator) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, strategies {
-  exename  = ImplRepo_Service
+
+project(ImR_Activator_IDL) : orbsvcslib, portableserver, messaging {
+  sharedname = TAO_ImR_Activator_IDL
+  dynamicflags = ACTIVATOR_IDL_BUILD_DLL
+  idlflags += -GH -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h
+  idl_files {
+    ImR_Activator.idl
+  }
+  source_files {
+    ImR_ActivatorS.cpp
+    ImR_ActivatorC.cpp
+  }
+  header_files {
+    activator_idl_export.h
+  }
+}
+
+project(ImR_Locator_IDL) : orbsvcslib, valuetype, portableserver {
+  sharedname   = TAO_ImR_Locator_IDL
+  after       += ImR_Activator_IDL
+  libs        += TAO_ImR_Activator_IDL
+  // Dont try to build this project if ImR_Activator_IDL is not built
+  requires    += corba_messaging
+
+  dynamicflags = LOCATOR_IDL_BUILD_DLL
+  idlflags    += -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h
+  idl_files {
+    ImR_Locator.idl
+  }
+  source_files {
+    ImR_LocatorS.cpp
+    ImR_LocatorC.cpp
+  }
+  header_files {
+    locator_idl_export.h
+  }
+}
+
+project(ImR_Activator) : orbsvcslib, core, acexml, minimum_corba, valuetype, portableserver {
+  sharedname   = TAO_ImR_Activator
+  dynamicflags = ACTIVATOR_BUILD_DLL
+  after       += ImR_Activator_IDL ImR_Locator_IDL
+  libs        += TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL
+  // Dont try to build this project if ImR_Activator_IDL is not built
+  requires    += corba_messaging
+
+  Source_Files {
+    ImR_Activator_i.cpp
+    Activator_Options.cpp
+    Activator_Loader.cpp
+  }
+  header_files {
+    activator_export.h
+  }
+  idl_files {
+  }
+}
+
+project(ImR_Locator) : orbsvcslib, core, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml {
+  sharedname   = TAO_ImR_Locator
+  dynamicflags = LOCATOR_BUILD_DLL
+  after       += ImR_Locator_IDL ImR_Activator_IDL
+  libs        += TAO_ImR_Locator_IDL TAO_ImR_Activator_IDL
   Source_Files {
+    Activator_Info.cpp
     Adapter_Activator.cpp
     Forwarder.cpp
-    ImR_Locator.cpp
     ImR_Locator_i.cpp
-    Locator_NT_Service.cpp
-    Locator_Options.cpp
     INS_Locator.cpp
+    Locator_XMLHandler.cpp
+    Locator_Loader.cpp
+    Locator_Options.cpp
+    Iterator.cpp
+    Server_Info.cpp
+    Locator_Repository.cpp
+  }
+  header_files {
+    utils.h
+    locator_export.h
+  }
+  idl_files {
+  }
+}
+
+project(ImR_Locator_Service) : orbsvcsexe, core, minimum_corba, iortable, messaging, acexml ,svc_utils {
+  exename  = ImplRepo_Service
+  after   += ImR_Locator ImR_Activator_IDL ImR_Locator_IDL
+  libs    += TAO_ImR_Locator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL
+
+  // Static Debug builds on Windows will not link properly due
+  // to a linker bug.  It complains that the ACEXML library duplicates
+  // a couple of template instantiations from the TAO_ImR_Locator library.
+  // This option works around that bug.  Unfortunately, there is no way to
+  // narrow the options down to only static debug builds.
+  specific(em3, nmake, vc6, vc71) {
+    link_options += /FORCE:MULTIPLE
+  }
+
+  Source_Files {
+    ImR_Locator.cpp
+    Locator_NT_Service.cpp
+  }
+  idl_files {
   }
 }
 
 
-project(ImR_Activator) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, strategies {
+project(ImR_Activator_Service) : orbsvcsexe, core, acexml, minimum_corba, messaging, svc_utils {
   exename  = 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 {
     ImR_Activator.cpp
-    ImR_Activator_i.cpp
-    Iterator.cpp
-    Activator_Options.cpp
-    Server_Info.cpp
-    Server_Repository.cpp
-    Repository_Configuration.cpp
-    XML_ContentHandler.cpp
     Activator_NT_Service.cpp
   }
+  idl_files {
+  }
 }
 
 
-project(tao_imr) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable {
+project(tao_imr) : orbsvcsexe, core, minimum_corba, portableserver {
   exename  = tao_imr
   install  = $(ACE_ROOT)/bin
   Source_Files {
     tao_imr.cpp
     tao_imr_i.cpp
   }
+  idl_files {
+  }
 }
-
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index 59fcb5b6a10..4afae0cfc76 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -12,24 +12,14 @@
 
 #include "Iterator.h"
 
-ImR_Iterator::ImR_Iterator (Server_Repository::HASH_IMR_MAP::ITERATOR *iterator,
-                            PortableServer::POA_ptr poa)
-  : iterator_ (iterator),
-    poa_ (poa)
+ImR_Iterator::ImR_Iterator (CORBA::ULong n, Locator_Repository& repo, PortableServer::POA_ptr poa)
+  : repo_(repo)
+  , count_(n)
+  , poa_(poa)
 {
-  // Nothing
 }
 
 
-ImR_Iterator::~ImR_Iterator ()
-{
-  delete iterator_;
-}
-
-
-// Returns the next list of up to <how_many> servers.  If empty, will return
-// false.
-
 CORBA::Boolean
 ImR_Iterator::next_n (CORBA::ULong how_many,
                       ImplementationRepository::ServerInformationList_out server_list
@@ -37,61 +27,65 @@ ImR_Iterator::next_n (CORBA::ULong how_many,
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (server_list,
-                    ImplementationRepository::ServerInformationList (0),
-                    CORBA::NO_MEMORY ());
-
-  // If there are no more bindings...
-  if (this->iterator_->done ())
-    return 0; // Return false
-
-  // Initially assume that iterator has the requested number of
-  // bindings.
-  server_list->length (how_many);
-
-  Server_Repository::HASH_IMR_MAP::ENTRY *server_entry;
-
-  // Iterate and populate the BindingList.
-
-  for (CORBA::ULong i = 0; i < how_many; i++)
-    {
-      this->iterator_->next (server_entry);
-
-      ACE_CString logical, server, command_line, working_directory, location, server_ior;
-      ImplementationRepository::EnvironmentList environment_vars;
-      ImplementationRepository::ActivationMode activation =
-        ImplementationRepository::NORMAL;
-
-      server_entry->int_id_->get_running_info (location, server_ior);
-      server_entry->int_id_->get_startup_info (logical,
-                                               command_line,
-                                               environment_vars,
-                                               working_directory,
-                                               activation);
-
-      server_list[i].logical_server = CORBA::string_dup (logical.c_str ());
-      server_list[i].server = CORBA::string_dup (server_entry->ext_id_.c_str ());
-      server_list[i].startup.command_line = CORBA::string_dup (command_line.c_str ());
-      server_list[i].startup.environment = environment_vars;
-      server_list[i].startup.working_directory = CORBA::string_dup (working_directory.c_str ());
-      server_list[i].startup.activation = activation;
-      server_list[i].location = CORBA::string_dup (location.c_str ());
-
-      if (this->iterator_->advance () == 0)
-        {
-          // If no more servers left, reset length to the actual
-          // number servers and get out of the loop.
-          server_list->length (i + 1);
-          break;
-        }
-    }
+    ImplementationRepository::ServerInformationList(0), CORBA::NO_MEMORY());
+
+  Locator_Repository::SIMap::ENTRY* entry = 0;
+  Locator_Repository::SIMap::ITERATOR it(this->repo_.servers());
+
+  // Number of servers that will go into the server_list.
+  CORBA::ULong n = this->repo_.servers().current_size();
+  if (n <= this->count_)
+  {
+    return 0; // We already finished.
+  }
+  else
+  {
+    n -= this->count_;
+  }
+
+  if (how_many > 0 && n > how_many)
+  {
+    n = how_many;
+  }
+
+  server_list->length(n);
+
+  CORBA::ULong i = 0;
+  for (; i < this->count_; ++i)
+  {
+    it.advance();
+  }
+
+  for (i = 0; i < n; ++i)
+  {
+    it.next(entry);
+    it.advance();
+    ACE_ASSERT(entry != 0);
+
+    Server_Info_Ptr info = entry->int_id_;
+
+    server_list[i].server = info->name.c_str();
+    server_list[i].startup.command_line = info->cmdline.c_str();
+    server_list[i].startup.environment = info->env_vars;
+    server_list[i].startup.working_directory = info->dir.c_str();
+    server_list[i].startup.activation = info->activation_mode;
+    server_list[i].startup.activator = info->activator.c_str();
+    server_list[i].startup.start_limit = info->start_limit;
+    server_list[i].partial_ior = info->partial_ior.c_str();
+  }
+
+  this->count_ += n;
+
   return 1;
 }
 
 
-// Destroys the iterator.
-
 void
-ImR_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ImR_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  PortableServer::ObjectId_var oid = poa_->servant_to_id(this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  poa_->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index 2acb593021e..40059bcd58f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -14,10 +14,14 @@
 #ifndef IMR_ITERATOR_H
 #define IMR_ITERATOR_H
 
-#include "Server_Repository.h"
+#include "Locator_Repository.h"
 #include "tao/PortableServer/PortableServerC.h"
 #include "tao/PortableServer/ImplRepoS.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 /**
  * @class ImR_Iterator
  *
@@ -26,15 +30,10 @@
  */
 class ImR_Iterator
   : public POA_ImplementationRepository::ServerInformationIterator
+  , public PortableServer::RefCountServantBase
 {
 public:
-  /// Constructor
-  /// Ownership of iterator is transfered to this class (we'll delete it)
-  ImR_Iterator (Server_Repository::HASH_IMR_MAP::ITERATOR *iterator,
-                PortableServer::POA_ptr poa);
-
-  /// Destructor
-  ~ImR_Iterator ();
+  ImR_Iterator (CORBA::ULong n, Locator_Repository& repo, PortableServer::POA_ptr poa);
 
   /// Returns the next list of up to <how_many> servers.  If empty, will return
   /// false.
@@ -45,15 +44,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  /// Destroys the iterator.
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  /// Our very own iterator for transversing the server repository.
-  Server_Repository::HASH_IMR_MAP::ITERATOR *iterator_;
-
-  PortableServer::POA_var poa_;
+  Locator_Repository& repo_;
+  CORBA::ULong count_;
+  PortableServer::POA_ptr poa_;
 };
 
 #endif /* IMR_ITERATOR_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 4fb3d110445..8cc1728b610 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -16,9 +16,10 @@
 #if defined (ACE_WIN32)
 
 #include "ImR_Locator_i.h"
+#include "Locator_Options.h"
 
 #include "tao/ORB_Core.h"
-//#include "tao/corba.h"
+#include "tao/corba.h"
 #include "ace/Reactor.h"
 
 /**
@@ -53,25 +54,45 @@ Locator_NT_Service::handle_exception (ACE_HANDLE)
 
 
 /**
- * We do almost the same thing as we do in run_standalone () 
+ * We do almost the same thing as we do in run_standalone ()
  */
 int
 Locator_NT_Service::svc (void)
 {
   ImR_Locator_i server;
+  Options opts;
+
+  if (opts.init_from_registry() != 0)
+  {
+    report_status (SERVICE_STOPPED);
+    return -1;
+  }
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      report_status (SERVICE_RUNNING);
-      int status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER);
+      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      report_status (SERVICE_STOPPED);
 
-      if (status != -1)
+      if (status == -1)
+        {
+          report_status (SERVICE_STOPPED);
+          return -1;
+        }
+      else
         {
-          return 0;
+          report_status (SERVICE_RUNNING);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          report_status (SERVICE_STOPPED);
+
         }
+        if (status != -1)
+            return 0;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
index 20ba4866584..5e046236ae2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
@@ -7,8 +7,8 @@
  *
  *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
  *  @author Jeff Parsons <parsons@cs.wustl.edu>
- *  @author John Tucker <jtucker@infoglide.com> 
- *  @author Mike Vitalo <mvitalo@infoglide.com>   
+ *  @author John Tucker <jtucker@infoglide.com>
+ *  @author Mike Vitalo <mvitalo@infoglide.com>
  */
 //=============================================================================
 
@@ -19,10 +19,10 @@
 
 #if defined (ACE_WIN32)
 
-#include "tao/orbconf.h"
-
 #include "ace/NT_Service.h"
 #include "ace/Singleton.h"
+#include "ace/Synch.h"
+#include "tao/orbconf.h"
 
 static const char * IMR_LOCATOR_SERVICE_NAME = "TAOIMRLocator";
 static const char * IMR_LOCATOR_DISPLAY_NAME = "TAO Implementation Repository Locator";
@@ -53,8 +53,10 @@ private:
   friend class ACE_Singleton<Locator_NT_Service, MUTEX>;
 };
 
-typedef ACE_Singleton<Locator_NT_Service, Locator_NT_Service::MUTEX> SERVICE;
+typedef ACE_Singleton<Locator_NT_Service, ACE_Mutex> SERVICE;
 
 #endif /* ACE_WIN32 */
 
 #endif /* Locator_NT_Service_H */
+
+
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index 70ea00c9586..70e960a31b7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -9,12 +9,9 @@
 //=============================================================================
 
 #include "Locator_Options.h"
-#include "Locator_NT_Service.h"
-#include "tao/Strategies/advanced_resource.h"
 #include "ace/Arg_Shifter.h"
-#include "ace/ARGV.h"
+#include "ace/Log_Msg.h"
 #include "ace/OS_NS_strings.h"
-#include "ace/Mutex.h"
 
 ACE_RCSID (ImplRepo_Service,
            Options,
@@ -28,25 +25,19 @@ static const ACE_TCHAR *SERVICE_REG_PATH =
   ACE_TEXT ("SYSTEM\\CurrentControlSet\\Services\\TAOIMRLocator\\Parameters");
 #endif /* ACE_WIN32 */
 
-/**
- * Default Constructor.  Assigns default values to all the member variables.
- */
+static const int DEFAULT_PING_INTERVAL = 10; // seconds
+
 Options::Options ()
-  : debug_ (1)
-  , multicast_ (false)
-  , service_ (false)
-  , service_command_(SC_NONE)
+: repo_mode_ (REPO_NONE)
+, debug_ (1)
+, multicast_ (false)
+, service_ (false)
+, ping_interval_(DEFAULT_PING_INTERVAL)
+, readonly_ (false)
+, service_command_(SC_NONE)
 {
 }
 
-/**
- * parse_args uses an ACE_Arg_Shifter to grab all the options that are
- * specific to the ImR.
- *
- * @retval  0 Success
- * @retval -1 Error parsing args
- * @retval  1 Success but we should exit.
- */
 int
 Options::parse_args (int &argc, char *argv[])
 {
@@ -67,12 +58,12 @@ Options::parse_args (int &argc, char *argv[])
             }
 
           if (ACE_OS::strcasecmp (shifter.get_current (),
-                                   ACE_TEXT ("install")) == 0) 
+                                   ACE_TEXT ("install")) == 0)
           {
             this->service_command_ = SC_INSTALL;
           }
           else if (ACE_OS::strcasecmp (shifter.get_current (),
-                                   ACE_TEXT ("remove")) == 0) 
+                                   ACE_TEXT ("remove")) == 0)
           {
             this->service_command_ = SC_REMOVE;
           }
@@ -81,7 +72,7 @@ Options::parse_args (int &argc, char *argv[])
             ACE_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current()));
             this->print_usage ();
             return -1;
-          } 
+          }
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-d")) == 0)
@@ -129,6 +120,74 @@ Options::parse_args (int &argc, char *argv[])
           this->print_usage ();
           return 1;
         }
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
+                                   ACE_TEXT ("-l")) == 0)
+        {
+          this->readonly_ = true;
+        }
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
+                                   ACE_TEXT ("-p")) == 0)
+        {
+          shifter.consume_arg ();
+
+          if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
+            {
+              ACE_ERROR ((LM_ERROR, "Error: -p option needs a filename\n"));
+              this->print_usage ();
+              return -1;
+            }
+
+          this->persist_file_name_ = shifter.get_current ();
+          this->repo_mode_ = REPO_HEAP_FILE;
+        }
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
+                                   ACE_TEXT ("-r")) == 0)
+        {
+          this->repo_mode_ = REPO_REGISTRY;
+        }
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
+                                   ACE_TEXT ("-x")) == 0)
+        {
+          shifter.consume_arg ();
+
+          if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
+            {
+              ACE_ERROR ((LM_ERROR, "Error: -x option needs a filename\n"));
+              this->print_usage ();
+              return -1;
+            }
+
+          this->persist_file_name_ = shifter.get_current ();
+          this->repo_mode_ = REPO_XML_FILE;
+        }
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
+                                   ACE_TEXT ("-t")) == 0)
+        {
+          shifter.consume_arg ();
+
+          if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
+            {
+              ACE_ERROR ((LM_ERROR, "Error: -t option needs a value\n"));
+              this->print_usage ();
+              return -1;
+            }
+          this->startup_timeout_ =
+            ACE_Time_Value (ACE_OS::atoi (shifter.get_current ()));
+        }
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
+                                   ACE_TEXT ("-v")) == 0)
+        {
+          shifter.consume_arg ();
+
+          if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-')
+            {
+              ACE_ERROR ((LM_ERROR, "Error: -v option needs a value\n"));
+              this->print_usage ();
+              return -1;
+            }
+          this->ping_interval_ =
+            ACE_Time_Value (0, 1000 * ACE_OS::atoi (shifter.get_current ()));
+        }
       else
         {
           shifter.ignore_arg ();
@@ -141,163 +200,56 @@ Options::parse_args (int &argc, char *argv[])
   return 0;
 }
 
-/**
- * @retval  0 Success
- * @retval -1 Error parsing args
- * @retval  1 Success but we should exit.
- */
 int
 Options::init (int argc, char *argv[])
 {
+  // Make an initial pass through and grab the arguments that we recognize.
+  // This may also run the commands to install or remove the nt service.
   int result = this->parse_args (argc, argv);
-  if (result != 0) {
+  if (result != 0)
+  {
     return result;
   }
 
-  ACE_ARGV orb_args;   // Save the leftovers to a ACE_ARGV class
-  ACE_CString cmdline; // We'll save this in the registry when installing.
-  for (int i = 1; i < argc; ++i)
-    {
-      cmdline += ACE_CString(argv[i]) + ACE_CString(" ");
-      if (orb_args.add (argv[i]) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error: Could not save argument"));
-          return -1;
-        }
-    }
-
-  result = run_service_command(cmdline);
-  
-  if (result != 0) 
-    return result;
-
-  char* argv_tmp = 0;
-
-  // Load from the registry. This may replace the args.
-  if (this->load_registry_options(argv_tmp, orb_args) != 0)
-    return -1;
-
-  ACE_Auto_Array_Ptr<char> argv_deleter(argv_tmp);
-
-  int orb_argc = orb_args.argc ();
-  // Now initialize the orb and pass it the leftover arguments
-  ACE_TRY_NEW_ENV
-    {
-      // First make sure the ImplRepo doesn't pick up an environment setting 
-      // that would make it try to register with itself.
-      char* use_IMR_env_var_value = ACE_OS::getenv ("TAO_USE_IMR");
-      if (use_IMR_env_var_value != 0)
-        {
-          ACE_OS::putenv ("TAO_USE_IMR=0");
-        }
-
-      this->orb_ = CORBA::ORB_init (orb_argc,
-                                    orb_args.argv (),
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception \n");
-      ACE_ERROR ((LM_ERROR, "Error: Cannot initialize ORB\n"));
-      return -1;
-    }
-  ACE_ENDTRY;
+  for (int i = 0; i < argc; ++i)
+  {
+    this->cmdline_ += ACE_CString(argv[i]) + ACE_CString(" ");
+  }
+  return 0;
+}
 
-  // Indicates successful parsing of command line.
+int
+Options::init_from_registry (void)
+{
+  this->load_registry_options();
   return 0;
 }
 
 
-/**
- * Just print out the usage message to STDERR
- */
 void
 Options::print_usage (void) const
 {
   ACE_ERROR ((LM_ERROR,
               "Usage:\n"
               "\n"
-              "ImR_Locator [-c cmd] [-d 0|1|2] [-m] [-o file] [-s]\n"
-              "\n"
+              "ImR_Locator [-c cmd] [-d 0|1|2] [-m] [-o file]\n"
+              " [-r|-p file|-x file] [-s] [-t secs] [-v secs]\n"
               "  -c command  Runs nt service commands ('install' or 'remove')\n"
               "  -d level    Sets the debug level (default 1)\n"
+              "  -l          Lock the database\n"
               "  -m          Turn on multicast\n"
               "  -o file     Outputs the ImR's IOR to a file\n"
-              "  -s          Runs as a service (NT Only)\n")
-             );
+              "  -s          Runs as a service (NT Only)\n"
+              "  -p file     Use file for storing/loading settings\n"
+              "  -x file     Use XML file for storing/loading setting\n"
+              "  -r          Use the registry for storing/loading settings\n"
+              "  -t secs     Server startup timeout.(Default=0)\n"
+              "  -v secs     Server verification interval.(Default=10)\n"
+              ));
 }
 
-
-/**
- * Executes the various commands that are useful for a NT service.  Right
- * now these include 'install' and 'remove'.  Others, such as 'start' and
- * 'stop' can be added, but the 'net' program in Windows already handles
- * these commands.
- *
- * @todo Finish implementing Options::run_service_command
- * @todo Update to unicode
- */
 int
-Options::run_service_command (const ACE_CString& cmdline)
-{
-  if (this->service_command_ == SC_NONE) 
-    return 0;
-#if defined (ACE_WIN32)
-  SERVICE::instance ()->name (IMR_LOCATOR_SERVICE_NAME, IMR_LOCATOR_DISPLAY_NAME);
-
-  if (this->service_command_ == SC_INSTALL)
-    {
-      char pathname[_MAX_PATH * 2 + 3];  // +3 for the ' -s' at the end
-
-      if (ACE_TEXT_GetModuleFileName(NULL, pathname, _MAX_PATH * 2) == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Error: Could not get module file name.\n"));
-          return -1;
-        }
-
-      // Append the command used for running the implrepo as
-      ACE_OS::strcat (pathname, ACE_TEXT (" -s"));
-
-      int ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
-                                           SERVICE_ERROR_NORMAL,
-                                           pathname
-                                           );
-      if (ret != -1) {
-        if (debug() > 0) {
-          ACE_DEBUG ((LM_DEBUG, "ImR Locator: Service installed.\n"));
-        }
-        this->save_registry_options(cmdline);
-      } else {
-        ACE_ERROR((LM_ERROR, "Error: Failed to install service.\n"));
-      }
-      if (ret == 0) 
-        return 1;
-    }
-  else if (this->service_command_ == SC_REMOVE)
-    {
-      int ret = SERVICE::instance ()->remove ();
-      if (debug() > 0) {
-        ACE_DEBUG ((LM_DEBUG, "ImR Locator: Service removed.\n"));
-      }
-      if (ret == 0) 
-        return 1; // If successfull, then we don't want to continue.
-    }
-
-  return -1;
-
-#else /* ACE_WIN32 */
-  ACE_UNUSED_ARG (cmdline);
-  ACE_ERROR ((LM_ERROR, "Service not supported on this platform"));
-
-  return -1;
-#endif /* ACE_WIN32 */
-}
-
-int 
-Options::save_registry_options(const ACE_CString& cmdline) 
+Options::save_registry_options()
 {
 #if defined (ACE_WIN32)
   HKEY key = 0;
@@ -315,66 +267,57 @@ Options::save_registry_options(const ACE_CString& cmdline)
   if (err != ERROR_SUCCESS) {
     return -1;
   }
-  err = ACE_TEXT_RegSetValueEx(key, "ORBInitOptions", 0, REG_SZ, 
-    (LPBYTE) cmdline.c_str(), cmdline.length() + 1);
+  err = ACE_TEXT_RegSetValueEx(key, "ORBInitOptions", 0, REG_SZ,
+    (LPBYTE) this->cmdline_.c_str(), this->cmdline_.length() + 1);
   ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx(key, "IORFile", 0, REG_SZ, 
+  err = ACE_TEXT_RegSetValueEx(key, "IORFile", 0, REG_SZ,
     (LPBYTE) ior_output_file_.c_str(), ior_output_file_.length() + 1);
   ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx(key, "DebugLevel", 0, REG_DWORD, 
+  err = ACE_TEXT_RegSetValueEx(key, "DebugLevel", 0, REG_DWORD,
     (LPBYTE) &debug_ , sizeof(debug_));
   ACE_ASSERT(err == ERROR_SUCCESS);
 
-  DWORD tmp = multicast_ ? 1 : 0;
-  err = ACE_TEXT_RegSetValueEx(key, "Multicast", 0, REG_DWORD, 
+  err = ACE_TEXT_RegSetValueEx(key, "PersistFile", 0, REG_SZ,
+    (LPBYTE) this->persist_file_name_.c_str(), this->persist_file_name_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
+
+  DWORD tmp = this->ping_interval_.msec();
+  err = ACE_TEXT_RegSetValueEx(key, "PingInterval", 0, REG_DWORD,
+    (LPBYTE) &tmp, sizeof(DWORD));
+  ACE_ASSERT(err == ERROR_SUCCESS);
+
+  tmp = this->readonly_ ? 1 : 0;
+  err = ACE_TEXT_RegSetValueEx(key, "Lock", 0, REG_DWORD,
+    (LPBYTE) &tmp, sizeof(DWORD));
+  ACE_ASSERT(err == ERROR_SUCCESS);
+
+  tmp = this->repo_mode_;
+  err = ACE_TEXT_RegSetValueEx(key, "PersistType", 0, REG_DWORD,
+    (LPBYTE) &tmp, sizeof(DWORD));
+  ACE_ASSERT(err == ERROR_SUCCESS);
+
+  tmp = this->startup_timeout_.sec();
+  err = ACE_TEXT_RegSetValueEx(key, "Timeout", 0, REG_DWORD,
+    (LPBYTE) &tmp, sizeof(DWORD));
+  ACE_ASSERT(err == ERROR_SUCCESS);
+
+  tmp = multicast_ ? 1 : 0;
+  err = ACE_TEXT_RegSetValueEx(key, "Multicast", 0, REG_DWORD,
     (LPBYTE) &tmp, sizeof(DWORD));
   ACE_ASSERT(err == ERROR_SUCCESS);
 
   err = ::RegCloseKey(key);
   ACE_ASSERT(err == ERROR_SUCCESS);
-#else
-  ACE_UNUSED_ARG (cmdline);
 #endif
   return 0;
 }
 
-namespace {
-  // This both parses the cmdline by replacing spaces with \0's, and
-  // adds each command to the ACE_ARGV. 
-  void parse_command_line(char* cmdline, ACE_ARGV& argv) {
-    // This tokenizer will replace all spaces with end-of-string
-    // characters and will preserve text between "" and '' pairs.
-    ACE_Tokenizer parser (cmdline);
-    parser.delimiter_replace (' ', '\0');
-    parser.preserve_designators ('\"', '\"');
-    parser.preserve_designators ('\'', '\'');
-
-    for (char *p = parser.next (); p; p = parser.next ()) {
-      argv.add(p);
-    }
-  }
-}
-/**
- *  We will only load from the registry if we are a service.
- *  We load each parameter from individual string keys, and then
- *  we have to parse the cmdline property into the orb_options
- *  so that they can be passed to ORB_init()
- */
 int
-Options::load_registry_options (char*& cmdline, ACE_ARGV& argv)
+Options::load_registry_options ()
 {
 #if defined (ACE_WIN32)
-  if (! this->service())
-  {
-    if (this->debug () > 1)
-      ACE_DEBUG ((LM_DEBUG,
-      "Locator_Options::load_registry_options: Not running "
-      "as a service, will not load data from registry\n"));
-    return 0;
-  }
-
   HKEY key = 0;
   // Create or open the parameters key
   LONG err = ACE_TEXT_RegOpenKeyEx (SERVICE_REG_ROOT,
@@ -390,107 +333,149 @@ Options::load_registry_options (char*& cmdline, ACE_ARGV& argv)
   ACE_TCHAR tmpstr[4096];
   DWORD sz = sizeof(tmpstr);
   DWORD type = 0;
-  err = ACE_TEXT_RegQueryValueEx(key, "ORBInitOptions", 0, &type, 
+  err = ACE_TEXT_RegQueryValueEx(key, "ORBInitOptions", 0, &type,
     (LPBYTE) tmpstr, &sz);
   if (err == ERROR_SUCCESS) {
     ACE_ASSERT(type == REG_SZ);
-    cmdline = new char[sz+1];
-    ACE_OS::strncpy(cmdline, tmpstr, sz);
-    parse_command_line(cmdline, argv);
+    tmpstr[sz - 1] = '\0';
+    this->cmdline_ = tmpstr;
   }
 
   sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx(key, "IORFile", 0, &type, 
+  err = ACE_TEXT_RegQueryValueEx(key, "IORFile", 0, &type,
     (LPBYTE) tmpstr, &sz);
   if (err == ERROR_SUCCESS) {
     ACE_ASSERT(type == REG_SZ);
-    tmpstr[sz] = ACE_TCHAR('\0');
-    this->ior_output_file_ = ACE_CString(tmpstr);
+    tmpstr[sz - 1] = '\0';
+    this->ior_output_file_ = tmpstr;
   }
 
   sz = sizeof(debug_);
-  err = ACE_TEXT_RegQueryValueEx(key, "DebugLevel", 0, &type, 
-    (LPBYTE) &debug_ , &sz);
+  err = ACE_TEXT_RegQueryValueEx(key, "DebugLevel", 0, &type,
+    (LPBYTE) &this->debug_ , &sz);
   if (err == ERROR_SUCCESS) {
     ACE_ASSERT(type == REG_DWORD);
   }
 
   DWORD tmp = 0;
-  err = ACE_TEXT_RegQueryValueEx(key, "Multicast", 0, &type, 
+  sz = sizeof(tmp);
+  err = ACE_TEXT_RegQueryValueEx(key, "PingInterval", 0, &type,
+    (LPBYTE) &tmp, &sz);
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+    ping_interval_.msec(tmp);
+  }
+
+  tmp = 0;
+  sz = sizeof(tmp);
+  err = ACE_TEXT_RegQueryValueEx(key, "Lock", 0, &type,
+    (LPBYTE) &tmp, &sz);
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+    readonly_ = tmp != 0;
+  }
+
+  sz = sizeof(this->repo_mode_);
+  err = ACE_TEXT_RegQueryValueEx(key, "PersistType", 0, &type,
+    (LPBYTE) &this->repo_mode_, &sz);
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+  }
+
+  tmp = 0;
+  sz = sizeof(tmp);
+  err = ACE_TEXT_RegQueryValueEx(key, "Timeout", 0, &type,
+    (LPBYTE) &tmp, &sz);
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+    this->startup_timeout_.sec(tmp);
+  }
+
+  tmp = 0;
+  sz = sizeof(tmp);
+  err = ACE_TEXT_RegQueryValueEx(key, "Multicast", 0, &type,
     (LPBYTE) &tmp, &sz);
   if (err == ERROR_SUCCESS) {
     ACE_ASSERT(type == REG_DWORD);
     this->multicast_ = tmp != 0;
   }
 
+  sz = sizeof(tmpstr);
+  err = ACE_TEXT_RegQueryValueEx(key, "PersistFile", 0, &type,
+    (LPBYTE) tmpstr, &sz);
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_SZ);
+    tmpstr[sz - 1] = '\0';
+    this->persist_file_name_ = tmpstr;
+  }
+
   err = ::RegCloseKey(key);
   ACE_ASSERT(err == ERROR_SUCCESS);
-
-  return 0;
-#else /* ACE_WIN32 */
-  ACE_UNUSED_ARG (cmdline);
-  ACE_UNUSED_ARG (argv);
+#endif
   return 0;
-#endif /* ACE_WIN32 */
 }
 
-/**
- * Standalone Mode
- *
- * @retval false Run as standalone service
- * @retval true Run as a service (only on NT right now)
- */
 bool
 Options::service (void) const
 {
   return this->service_;
 }
 
-
-/**
- * Debug level for the IR.
- *
- * @retval 0 Quiet
- * @retval 1 Trace messages
- * @retval 2 Detailed messages
- */
 unsigned int
 Options::debug (void) const
 {
   return this->debug_;
 }
 
-
-/**
- * @return The file where the IOR will be stored.
- */
-ACE_CString
-Options::output_filename (void) const
+const ACE_CString&
+Options::ior_filename (void) const
 {
   return this->ior_output_file_;
 }
 
-/**
- * @return A pointer to the ORB.
- */
-CORBA::ORB_ptr
-Options::orb (void) const
+bool
+Options::multicast (void) const
 {
-  return CORBA::ORB::_duplicate (this->orb_.in ());
+  return this->multicast_;
+}
+
+Options::SERVICE_COMMAND
+Options::service_command(void) const
+{
+  return this->service_command_;
+}
+
+const char*
+Options::cmdline(void) const {
+  return this->cmdline_.c_str ();
+}
+
+const ACE_CString&
+Options::persist_file_name(void) const {
+  return this->persist_file_name_;
+}
+
+ACE_Time_Value
+Options::startup_timeout (void) const
+{
+  return this->startup_timeout_;
+}
+
+ACE_Time_Value
+Options::ping_interval (void) const
+{
+  return this->ping_interval_;
+}
+
+Options::RepoMode
+Options::repository_mode (void) const
+{
+  return this->repo_mode_;
 }
 
-/**
- * @retval false Do not listen for multicast location requests.
- * @retval true Do Listen.
- */
 bool
-Options::multicast (void) const
+Options::readonly (void) const
 {
-  return this->multicast_;
+  return this->readonly_;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton <Options, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton <Options, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index 3585e3bb2cd..682b2769523 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -15,17 +15,14 @@
 #ifndef LOCATOR_OPTIONS_H
 #define LOCATOR_OPTIONS_H
 
-#include "Repository_Configuration.h"
+#include "locator_export.h"
 
-#include "tao/ORB.h"
-
-#include "ace/Singleton.h"
 #include "ace/SString.h"
-#include "ace/Auto_Ptr.h"
-
+#include "ace/Time_Value.h"
 
-// Forward declarations
-class ACE_ARGV;
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 /**
  * @class Options
@@ -34,20 +31,29 @@ class ACE_ARGV;
  *
  * This is where the settings for TAO's Implementation Repository are stored.
  */
-class Options
+class Locator_Export Options
 {
 public:
+
   enum SERVICE_COMMAND {
     SC_NONE,
     SC_INSTALL,
     SC_REMOVE
   };
 
-  /// Default Constructor
+  enum RepoMode {
+    REPO_NONE,
+    REPO_XML_FILE,
+    REPO_HEAP_FILE,
+    REPO_REGISTRY
+  };
+
   Options ();
 
   /// Parse the command-line arguments and initialize the options.
   int init (int argc, char *argv[]);
+  /// This version should only be used when run as an nt service.
+  int init_from_registry();
 
   /// Service Mode
   bool service (void) const;
@@ -56,14 +62,35 @@ public:
   unsigned int debug (void) const;
 
   /// Returns the file where the IOR should be stored.
-  ACE_CString output_filename (void) const;
-
-  /// Returns a pointer to the ORB.
-  CORBA::ORB_ptr orb (void) const;
+  const ACE_TString& ior_filename (void) const;
 
   /// Will we listen for multicast location requests?
   bool multicast (void) const;
 
+  /// The nt service command to run (install/remove)
+  SERVICE_COMMAND service_command(void) const;
+
+  int save_registry_options();
+
+  const char* cmdline(void) const;
+
+  /// File that contains the activator related information
+  /// that the persistent locator has to save.
+  const ACE_TString& persist_file_name(void) const;
+
+  /// Do we allow modifications to the servers?
+  bool readonly (void) const;
+
+  RepoMode repository_mode (void) const;
+
+  /// Returns the timeout value for program starting.
+  ACE_Time_Value startup_timeout (void) const;
+
+  /// If the server hasn't been verified for a while, then we'll
+  /// ping it. Note : No timers are currently used. We simply ping()
+  /// during indirect invocations, if this interval has elapsed.
+  ACE_Time_Value ping_interval (void) const;
+
 private:
   /// Parses and pulls out arguments for the ImR
   int parse_args (int &argc, char *argv[]);
@@ -72,31 +99,43 @@ private:
   void print_usage (void) const;
 
   /// Run a service command.
-  int run_service_command (const ACE_CString& cmdline);
+  int run_service_command (const ACE_TString& cmdline);
 
-  /// Loads ORB options from the registry
-  int load_registry_options (char*& cmdline, ACE_ARGV& argv);
-  int save_registry_options (const ACE_CString& cmdline);
+  int load_registry_options();
+private:
+
+  // xml, heap, or registry
+  RepoMode repo_mode_;
 
   /// Debug level.
   unsigned int debug_;
 
   /// File where the IOR of the server object is stored.
-  ACE_CString ior_output_file_;
+  ACE_TString ior_output_file_;
 
   /// Will we listen for multicast location requests?
   bool multicast_;
 
-  /// The ORB for the Implementation Repository.
-  CORBA::ORB_var orb_;
-
   /// Are we running as a service?
   bool service_;
 
+  /// The amount of time between successive "are you started yet?" pings.
+  ACE_Time_Value ping_interval_;
+ 
+  /// The amount of time to wait for a server to response after starting it.
+  ACE_Time_Value startup_timeout_;
+
+  /// Can the server_repository be modified?
+  bool readonly_;
+
   /// SC_NONE, SC_INSTALL, SC_REMOVE, ...
-  int service_command_;
-};
+  SERVICE_COMMAND service_command_;
 
-typedef ACE_Singleton <Options, ACE_Null_Mutex> OPTIONS;
+  /// Our extra command line arguments
+  ACE_CString cmdline_;
+
+  /// The persistent XML file name.
+  ACE_TString persist_file_name_;
+};
 
-#endif 
+#endif
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
index beb9beef56a..99a66870116 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
@@ -1,51 +1,397 @@
-##---------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile for TAO's Implementation Repository Service
+## $Id$
 ##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 
-bin_PROGRAMS = ImplRepo_Service
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+noinst_HEADERS =
+CLEANFILES =
+BUILT_SOURCES =
 
-ImplRepo_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+## Makefile.ImR_Activator_IDL.am 
+
+if BUILD_CORBA_MESSAGING
+
+BUILT_SOURCES += \
+  ImR_ActivatorS_T.cpp \
+  ImR_ActivatorC.inl \
+  ImR_ActivatorS.inl \
+  ImR_ActivatorS_T.inl \
+  ImR_ActivatorC.cpp \
+  ImR_ActivatorS.cpp \
+  ImR_ActivatorC.h \
+  ImR_ActivatorS.h \
+  ImR_ActivatorS_T.h
+
+CLEANFILES += \
+  ImR_ActivatorS_T.cpp \
+  ImR_ActivatorC.inl \
+  ImR_ActivatorS.inl \
+  ImR_ActivatorS_T.inl \
+  ImR_ActivatorC.cpp \
+  ImR_ActivatorS.cpp \
+  ImR_ActivatorC.h \
+  ImR_ActivatorS.h \
+  ImR_ActivatorS_T.h \
+  ImR_Activator-stamp
+
+ImR_ActivatorS_T.cpp ImR_ActivatorC.inl ImR_ActivatorS.inl ImR_ActivatorS_T.inl ImR_ActivatorC.cpp ImR_ActivatorS.cpp ImR_ActivatorC.h ImR_ActivatorS.h ImR_ActivatorS_T.h: ImR_Activator-stamp
+
+ImR_Activator-stamp: $(srcdir)/ImR_Activator.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GH -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl
+	@touch $@
+
+lib_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
+
+libTAO_ImR_Activator_IDL_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_ImR_Activator_IDL_la_LIBADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+  ImR_ActivatorC.h \
+  ImR_ActivatorS.h \
+  ImR_ActivatorS_T.h \
+  activator_idl_export.h \
+  ImR_ActivatorC.inl \
+  ImR_ActivatorS.inl \
+  ImR_ActivatorS_T.inl \
+  ImR_ActivatorS_T.cpp \
+  ImR_Activator.idl
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.ImR_Locator_IDL.am 
+
+if BUILD_CORBA_MESSAGING
+
+BUILT_SOURCES += \
+  ImR_LocatorS_T.cpp \
+  ImR_LocatorC.inl \
+  ImR_LocatorS.inl \
+  ImR_LocatorS_T.inl \
+  ImR_LocatorC.cpp \
+  ImR_LocatorS.cpp \
+  ImR_LocatorC.h \
+  ImR_LocatorS.h \
+  ImR_LocatorS_T.h
+
+CLEANFILES += \
+  ImR_LocatorS_T.cpp \
+  ImR_LocatorC.inl \
+  ImR_LocatorS.inl \
+  ImR_LocatorS_T.inl \
+  ImR_LocatorC.cpp \
+  ImR_LocatorS.cpp \
+  ImR_LocatorC.h \
+  ImR_LocatorS.h \
+  ImR_LocatorS_T.h \
+  ImR_Locator-stamp
+
+ImR_LocatorS_T.cpp ImR_LocatorC.inl ImR_LocatorS.inl ImR_LocatorS_T.inl ImR_LocatorC.cpp ImR_LocatorS.cpp ImR_LocatorC.h ImR_LocatorS.h ImR_LocatorS_T.h: ImR_Locator-stamp
+
+ImR_Locator-stamp: $(srcdir)/ImR_Locator.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl
+	@touch $@
+
+lib_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 = \
+  ImR_LocatorC.cpp \
+  ImR_LocatorS.cpp
+
+libTAO_ImR_Locator_IDL_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_ImR_Locator_IDL_la_LIBADD = \
+  libTAO_ImR_Activator_IDL.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+  ImR_LocatorC.h \
+  ImR_LocatorS.h \
+  ImR_LocatorS_T.h \
+  locator_idl_export.h \
+  ImR_LocatorC.inl \
+  ImR_LocatorS.inl \
+  ImR_LocatorS_T.inl \
+  ImR_LocatorS_T.cpp \
+  ImR_Locator.idl
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.ImR_Activator.am 
+
+if BUILD_ACEXML
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+lib_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
+
+libTAO_ImR_Activator_la_SOURCES = \
+  Activator_Loader.cpp \
+  Activator_Options.cpp \
+  ImR_Activator_i.cpp
+
+libTAO_ImR_Activator_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_ImR_Activator_la_LIBADD = \
+  libTAO_ImR_Activator_IDL.la \
+  libTAO_ImR_Locator_IDL.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.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+  Activator_Loader.h \
+  Activator_Options.h \
+  ImR_Activator_i.h \
+  activator_export.h
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+endif BUILD_ACEXML
+
+## Makefile.ImR_Activator_Service.am 
+
+if BUILD_ACEXML
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+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
+
+ImR_Activator_SOURCES = \
+  Activator_NT_Service.cpp \
+  ImR_Activator.cpp \
+  Activator_NT_Service.h
+
+ImR_Activator_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+ImR_Activator_LDADD = \
+  libTAO_ImR_Activator.la \
+  libTAO_ImR_Activator_IDL.la \
+  libTAO_ImR_Locator_IDL.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.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.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+endif BUILD_ACEXML
+
+## Makefile.ImR_Locator.am 
+
+if BUILD_CORBA_MESSAGING
+if BUILD_ACEXML
+if !BUILD_MINIMUM_CORBA
+
+lib_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
+
+libTAO_ImR_Locator_la_SOURCES = \
+  Activator_Info.cpp \
+  Adapter_Activator.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 = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_ImR_Locator_la_LIBADD = \
+  libTAO_ImR_Locator_IDL.la \
+  libTAO_ImR_Activator_IDL.la \
+  $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
+  $(ACE_BUILDDIR)/ACEXML/common/libACEXML.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_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+  Activator_Info.h \
+  Adapter_Activator.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_MINIMUM_CORBA
+endif BUILD_ACEXML
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.ImR_Locator_Service.am 
+
+if BUILD_CORBA_MESSAGING
+if BUILD_ACEXML
+if !BUILD_MINIMUM_CORBA
+
+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
 
 ImplRepo_Service_SOURCES = \
-        Adapter_Activator.cpp \
-        Forwarder.cpp \
-        ImplRepo.cpp \
-        ImplRepo_i.cpp \
-        Iterator.cpp \
-        Locator.cpp \
-        NT_Service.h \
-        Options.cpp \
-        Repository.cpp
-
-noinst_HEADERS = \
-        Adapter_Activator.h \
-        Forwarder.h \
-        ImplRepo_i.h \
-        Iterator.h \
-        NT_Service.h \
-        Options.h \
-	Server_Info.h \
-        Server_Repository.h
-
-## EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+  ImR_Locator.cpp \
+  Locator_NT_Service.cpp \
+  Locator_NT_Service.h
+
+ImplRepo_Service_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+ImplRepo_Service_LDADD = \
+  libTAO_ImR_Locator.la \
+  libTAO_ImR_Activator_IDL.la \
+  libTAO_ImR_Locator_IDL.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_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_ACEXML
+endif BUILD_CORBA_MESSAGING
 
+## Makefile.tao_imr.am 
+
+if !BUILD_MINIMUM_CORBA
+
+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_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+tao_imr_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/ImplRepo_Service/README.txt b/TAO/orbsvcs/ImplRepo_Service/README.txt
index 34fe77ace81..35bfe25157c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/README.txt
+++ b/TAO/orbsvcs/ImplRepo_Service/README.txt
@@ -184,9 +184,15 @@ Commandline Arguments that can be passed to ImplRepo_Service
 -d  debug information
 -m  support multicast discovery.
 -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. 
 
 	And, ofcourse, the ORB Options.
 
+
 @subsection activator ImR_Activator
 
 	ImR_Activators, as you might have guessed, do the real work of
@@ -501,6 +507,11 @@ Admin Tool or via the "net" program on the command line:
 
 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_locator
+option instead. 
+
 @subsection serviceopts Service Options
 
 Any options that are specified along with -c install, will be saved in
diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository_Configuration.cpp b/TAO/orbsvcs/ImplRepo_Service/Repository_Configuration.cpp
deleted file mode 100644
index c71f1348294..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/Repository_Configuration.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-#include "Repository_Configuration.h"
-#include "Activator_NT_Service.h"
-
-#include "ace/Configuration.h"
-#include "ace/OS_NS_stdio.h"
-
-
-ACE_RCSID (ImplRepo_Service,
-           Repository_Configuration,
-           "$Id$")
-
-
-Repository_Configuration::Repository_Configuration (const char *repository_mode)
-  : config_ (0)
-{
-  if (ACE_OS::strcmp (repository_mode, "x") == 0)
-    {
-      /// XML Mode : Dont do anything special
-    }
-  else if (ACE_OS::strcmp (repository_mode, "w") == 0)
-    {
-#if defined (ACE_WIN32)
-      /// Win32 Repository.
-      HKEY root =
-        ACE_Configuration_Win32Registry::resolve_key(HKEY_LOCAL_MACHINE,
-                                                     "Software\\TAO\\IR");
-      ACE_NEW (this->config_, ACE_Configuration_Win32Registry(root));
-
-#endif /* ACE_WIN32 */
-    }
- else if (ACE_OS::strcmp (repository_mode, "h") == 0)
-    {
-      ACE_NEW (this->config_, ACE_Configuration_Heap);
-
-      if (this->config_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Initialization of config_ didnt happen correctly\n"));
-        }
-    }
-}
-
-Repository_Configuration::~Repository_Configuration (void)
-{
-  delete this->config_;
-}
-
-const ACE_Configuration_Section_Key &
-Repository_Configuration::root_section ()
-{
-  ACE_ASSERT(this->config_ != 0);
-  return this->config_->root_section ();
-}
-
-int
-Repository_Configuration::open (void)
-{
-  // This method would have been called only if some kind of
-  // persistence is to be used: either the ACE_Configuration_Heap
-  // or the XML format of the file.
-  if (this->config_ != 0)
-    {
-      // Open the configuration heap.
-      ACE_Configuration_Heap *heap =
-        ACE_dynamic_cast (ACE_Configuration_Heap *,
-                          this->config_);
-      ACE_ASSERT(heap != 0);
-      return heap->open ();
-    }
-
-  // The persistence file type is to be in XML format. Dont do
-  // anything here. Just return.
-  return 0;
-}
-
-
-int
-Repository_Configuration::open (const char *file_name)
-{
-  if (this->config_ == 0)
-    {
-      FILE *fp = ACE_OS::fopen (file_name, "w");
-
-      if (fp == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Couldnt open the file %s\n", file_name),
-                            -1);
-        }
-
-      // @@@ Initial setup: write the DTD here.
-      ACE_OS::fprintf (fp,
-                       "<?xml version=\"1.0\"?>\n");
-      ACE_OS::fprintf (fp,
-                       "<!DOCTYPE SERVER_REPOSITORY>\n");
-      ACE_OS::fclose (fp);
-    }
-  else
-    {
-      ACE_Configuration_Heap *heap =
-        ACE_dynamic_cast (ACE_Configuration_Heap *,
-                          this->config_);
-      ACE_ASSERT(heap != 0);
-      return heap->open (file_name);
-    }
-  return 0;
-}
-
-int
-Repository_Configuration::open_section (const ACE_Configuration_Section_Key& base,
-                                        const char* sub_section,
-                                        int create,
-                                        ACE_Configuration_Section_Key& result)
-{
-  if (this->config_ == 0)
-    {
-      /// @@ May be I need to write the initial DTD etc stuff here.
-    }
-  else
-    {
-      return this->config_->open_section (base,
-                                          sub_section,
-                                          create,
-                                          result);
-    }
-  return 0;
-
-}
-
-int
-Repository_Configuration::remove_section (const ACE_Configuration_Section_Key& key,
-                                          const char* sub_section,
-                                          int recursive)
-{
-  if (this->config_ == 0)
-    {
-      /// @@ May be I need to write the initial DTD etc stuff here.
-    }
-  else
-    {
-      return this->config_->remove_section (key,
-                                          sub_section,
-                                          recursive);
-    }
-
-  return 0;
-}
-
-int
-Repository_Configuration::enumerate_sections (const ACE_Configuration_Section_Key& key,
-                                              int Index,
-                                              ACE_CString& name)
-{
-  if (this->config_ != 0)
-    {
-      return this->config_->enumerate_sections (key,
-                                                Index,
-                                                name);
-    }
-
-  /// @@ May be I need to write the initial DTD etc stuff here.
-  return 0;
-}
-
-int
-Repository_Configuration::set_string_value (const ACE_Configuration_Section_Key& key,
-                        const char* name,
-                        const ACE_CString& value)
-{
-  if (this->config_ == 0)
-    {
-      /// @@ May be I need to write the initial DTD etc stuff here.
-    }
-  else
-    {
-      return this->config_->set_string_value (key,
-                                            name,
-                                            value);
-    }
-
-  return 0;
-
-}
-
-int
-Repository_Configuration::set_integer_value (const ACE_Configuration_Section_Key& key,
-                                             const char* name,
-                                             u_int value)
-{
-  if (this->config_ == 0)
-    {
-      /// @@ May be I need to write the initial DTD etc stuff here.
-    }
-  else
-    {
-      return this->config_->set_integer_value (key,
-                                             name,
-                                             value);
-    }
-
-  return 0;
-}
-
-int
-Repository_Configuration::get_string_value (const ACE_Configuration_Section_Key& key,
-                                            const char* name,
-                                            ACE_CString& value)
-{
-  if (this->config_ == 0)
-    {
-      /// @@ May be I need to write the initial DTD etc stuff here.
-    }
-  else
-    {
-      return this->config_->get_string_value (key,
-                                            name,
-                                            value);
-    }
-
-  return 0;
-}
-
-int
-Repository_Configuration::get_integer_value (const ACE_Configuration_Section_Key& key,
-                                             const char* name,
-                                             u_int& value)
-{
-  if (this->config_ == 0)
-    {
-      /// @@ May be I need to write the initial DTD etc stuff here.
-    }
-  else
-    {
-      return this->config_->get_integer_value (key,
-                                               name,
-                                               value);
-    }
-
-  return 0;
-
- }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository_Configuration.h b/TAO/orbsvcs/ImplRepo_Service/Repository_Configuration.h
deleted file mode 100644
index 786cdcd9cd4..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/Repository_Configuration.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file  Repository_Configuration.h
- *
- *  $Id$
- *
- *  @brief  Class to maintain the non-Win32 Registry Server
- *  Configuration. Also is a wrapper around ACE_Configuration_Heap
- *  class.
- *  
- *  @author Priyanka Gontla <gontla_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef REPOSITORY_CONFIGURATION_H
-#define REPOSITORY_CONFIGURATION_H
-
-#include "ace/Configuration.h"
-
-/**
- * @class Repository_Configuration
- *
- * @brief Maintains the server configurations.
- *
- * Class to help maintain the xml and non-win32 registry configuration.
- */
-class Repository_Configuration
-{
- public:
-  
-  /// Default Constructor
-  Repository_Configuration (const char *repository_mode);
-  
-  /// Destructor
-  ~Repository_Configuration ();
-
-  const ACE_Configuration_Section_Key& root_section ();
-
-  /// 
-  int open ();
-  
-  /// opens a configuration based on a file name
-  int open (const char* file_name);
-    
-  int open_section (const ACE_Configuration_Section_Key& base,
-                    const char* sub_section,
-                    int create, ACE_Configuration_Section_Key& result);
-  
-  int remove_section (const ACE_Configuration_Section_Key& key,
-                      const char* sub_section,
-                      int recursive);
-  
-  int enumerate_sections (const ACE_Configuration_Section_Key& key,
-                          int Index,
-                          ACE_CString& name);
-  
-  int set_string_value (const ACE_Configuration_Section_Key& key,
-                        const char* name,
-                        const ACE_CString& value);
-  
-  int set_integer_value (const ACE_Configuration_Section_Key& key,
-                         const char* name,
-                         u_int value);
-  
-  int get_string_value (const ACE_Configuration_Section_Key& key,
-                        const char* name,
-                        ACE_CString& value);
-  
-  int get_integer_value (const ACE_Configuration_Section_Key& key,
-                         const char* name,
-                         u_int& value);
-  
- private:
-  
-  ACE_Configuration *config_;
-
-};
-
-#endif /* REPOSITORY_CONFIGURATION_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index d2d503911ec..63faa10e10f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -1,67 +1,63 @@
+// $Id$
 #include "Server_Info.h"
 
-
-ACE_RCSID (ImplRepo_Service,
-           Server_Info,
-           "$Id$")
-
-
-Server_Info::Server_Info (
-    const ACE_CString POA_name,
-    const ACE_CString logical_server_name,
-    const ACE_CString startup_command,
-    const ImplementationRepository::EnvironmentList environment_vars,
-    const ACE_CString working_dir,
-    const ImplementationRepository::ActivationMode activation)
-  : starting_up_ (false),
-    logical_server_name_ (logical_server_name),
-    POA_name_ (POA_name),
-    startup_command_ (startup_command),
-    environment_vars_ (environment_vars),
-    working_dir_ (working_dir),
-    location_ (""),
-    server_object_ior_ (""),
-    activation_ (activation)
+Server_Info::Server_Info
+(
+ const ACE_CString& server_name,
+ const ACE_CString& aname,
+ const ACE_CString& cmdline,
+ const ImplementationRepository::EnvironmentList& env,
+ const ACE_CString& working_dir,
+ ImplementationRepository::ActivationMode amode,
+ int limit,
+ const ACE_CString& partial_ior,
+ const ACE_CString& server_ior,
+ ImplementationRepository::ServerObject_ptr svrobj
+ )
+ : name(server_name)
+ , activator(aname)
+ , cmdline(cmdline)
+ , env_vars(env)
+ , dir(working_dir)
+ , activation_mode(amode)
+ , start_limit (limit)
+ , partial_ior(partial_ior)
+ , ior(server_ior)
+ , server(ImplementationRepository::ServerObject::_duplicate(svrobj))
+ , start_count(0)
 {
 }
 
-
-Server_Info::~Server_Info (void)
+ImplementationRepository::ServerInformation*
+Server_Info::createImRServerInfo(ACE_ENV_SINGLE_ARG_DECL)
 {
+  ImplementationRepository::ServerInformation* info;
+  ACE_NEW_THROW_EX (info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY());
+
+  info->server = name.c_str();
+  info->startup.command_line = cmdline.c_str();
+  info->startup.environment = env_vars;
+  info->startup.working_directory = dir.c_str();
+  info->startup.activation = activation_mode;
+  info->startup.activator = activator.c_str();
+  info->startup.start_limit = start_limit;
+  info->partial_ior = partial_ior.c_str();
+
+  return info;
 }
 
-
-// Updates information that is relevant only when an instance
-// of the server is running.
 void
-Server_Info::update_running_info (const ACE_CString location,
-                                  const ACE_CString server_object_ior)
+Server_Info::reset(void)
 {
-  this->location_ = location;
-  this->server_object_ior_ = server_object_ior;
-  this->starting_up_ = false;
+  ior = "";
+  partial_ior = "";
+  last_ping = ACE_Time_Value::zero;
+  server = ImplementationRepository::ServerObject::_nil();
+  // start_count = 0; Note : We can't do this, because it would be reset during startup.
 }
 
-
-void
-Server_Info::get_startup_info (
-    ACE_CString &logical_server_name,
-    ACE_CString &startup_command,
-    ImplementationRepository::EnvironmentList &environment_vars,
-    ACE_CString &working_dir,
-    ImplementationRepository::ActivationMode &activation)
-{
-  logical_server_name = this->logical_server_name_;
-  startup_command = this->startup_command_;
-  environment_vars = this->environment_vars_;
-  working_dir = this->working_dir_;
-  activation = this->activation_;
-}
-
-void
-Server_Info::get_running_info (ACE_CString &location,
-                               ACE_CString &server_object_ior)
-{
-  location = this->location_;
-  server_object_ior = this->server_object_ior_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Strong_Bound_Ptr<Server_Info, ACE_Null_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Strong_Bound_Ptr<Server_Info, ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
index 090eb2bb603..b6e451d9419 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 //=============================================================================
 /**
  *  @file    Server_Info.h
@@ -12,102 +10,66 @@
  *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
  *  @author Priyanka Gontla <gontla_p@ociweb.com>
  */
-//=============================================================================
-
 #ifndef SERVER_INFO_H
 #define SERVER_INFO_H
 
-#include "XML_ContentHandler.h"
+#include "ace/Bound_Ptr.h"
 
 #include "tao/PortableServer/ImplRepoC.h"
 
-/**
- * @class Server_Info
- *
- * @brief Information about IMR registered servers.
- *
- * Contains all the necessary information about the server including
- * Information on how to start it up and where it is running.
- */
-class Server_Info
-{
-public:
-  // = Constructors
-
-  /// Initialize the command_line and working_dir.
-  Server_Info (const ACE_CString POA_name,
-               const ACE_CString logical_server_name,
-               const ACE_CString startup_command,
-               const ImplementationRepository::EnvironmentList
-                     environment_vars,
-               const ACE_CString working_dir,
-               const ImplementationRepository::ActivationMode activation);
-
-  // = Destructors
-
-  /// The only destructor there is.
-  ~Server_Info (void);
-
-  /// Updates information that is relevant only when an instance
-  /// of the server is running.
-  void update_running_info (const ACE_CString location,
-                            const ACE_CString server_object_ior);
-
-  /// Returns startup information.
-  void get_startup_info (ACE_CString &logical_server_name,
-                         ACE_CString &startup_command,
-                         ImplementationRepository::EnvironmentList
-                            &environment_vars,
-                         ACE_CString &working_dir,
-                         ImplementationRepository::ActivationMode
-                         &activation);
-
-  /// Returns information about a running instance.
-  void get_running_info (ACE_CString &location,
-                         ACE_CString &server_object_ior);
-
-  // ActivationMode get_activation (void);
-  // Get the activation mode.
+#include "ace/SString.h"
 
-  // @@ Does this belong here?
-  //  int startup ();
-  // Starts up the server based on the information.
-  // Returns:  0  if successful
-  //           -1 if there is no registration command (it has to be manually
-  //              restarted)
-
-  /// This is a flag to determine if the process has already been spawned
-  /// and we are just waiting for it to start up.
-  bool starting_up_;
-
-private:
-  /// Which server process this poa is grouped in.
-  ACE_CString logical_server_name_;
-
-  /// The name of the POA.
-  ACE_CString POA_name_;
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+* @brief Information about IMR registered servers.
+*/
+struct Server_Info
+{
+  Server_Info (const ACE_CString& server_name,
+    const ACE_CString& aname,
+    const ACE_CString& cmdline,
+    const ImplementationRepository::EnvironmentList& env,
+    const ACE_CString& working_dir,
+    ImplementationRepository::ActivationMode amode,
+    int start_limit,
+    const ACE_CString& partial_ior = ACE_CString(""),
+    const ACE_CString& server_ior = ACE_CString(""),
+    ImplementationRepository::ServerObject_ptr svrobj = ImplementationRepository::ServerObject::_nil()
+    );
+
+  /// Convert to the corba type
+  ImplementationRepository::ServerInformation* createImRServerInfo(ACE_ENV_SINGLE_ARG_DECL);
+
+  void reset();
+
+  /// The name of the server.
+  ACE_CString name;
+  /// The name of the activator in which this server runs
+  ACE_CString activator;
   /// The command line startup command (program and arguments).
-  ACE_CString startup_command_;
-
+  ACE_CString cmdline;
   /// Environment Variables.
-  ImplementationRepository::EnvironmentList environment_vars_;
-
+  ImplementationRepository::EnvironmentList env_vars;
   /// The working directory.
-  ACE_CString working_dir_;
-
+  ACE_CString dir;
+  /// The type of activation this supports.
+  ImplementationRepository::ActivationMode activation_mode;
+  /// Limit of retries to start the server
+  int start_limit;
   /// Current endpoint used by the server.
-  ACE_CString location_;
-
+  ACE_CString partial_ior;
   /// IOR of the server object in the server.
-  ACE_CString server_object_ior_;
-
-  /// The type of activation this supports.
-  ImplementationRepository::ActivationMode activation_;
-
-  // No copying allowed.
-  void operator= (Server_Info &);
-  Server_Info (Server_Info &);
+  ACE_CString ior;
+  /// The timestamp of the last time we verified the server is alive
+  ACE_Time_Value last_ping;
+  /// The cached server object
+  ImplementationRepository::ServerObject_var server;
+  int start_count;
 };
 
+typedef ACE_Strong_Bound_Ptr<Server_Info, ACE_Null_Mutex> Server_Info_Ptr;
+
 #endif /* SERVER_INFO_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Repository.cpp
deleted file mode 100644
index 7ef2dc52637..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Repository.cpp
+++ /dev/null
@@ -1,726 +0,0 @@
-#include "Server_Repository.h"
-#include "XML_ContentHandler.h"
-#include "Activator_Options.h"
-
-#include "ACEXML/parser/parser/Parser.h"
-#include "ACEXML/common/FileCharStream.h"
-
-#include "ace/OS_NS_unistd.h"
-
-ACE_RCSID (ImplRepo_Service,
-           Server_Repository,
-           "$Id$")
-
-int
-Server_Repository::init (void)
-{
-  int rmode = OPTIONS::instance ()->repository_mode ();
-  if (rmode != Options::REPO_XML_FILE)
-    {
-      Repository_Configuration *config = OPTIONS::instance ()->config ();
-      ACE_ASSERT(config != 0);
-
-      // iterate through the list of registered servers and register them
-
-      config->open_section (config->root_section (),
-                            ACE_LIB_TEXT ("Servers"),
-                            1,
-                            this->servers_);
-      int index = 0;
-      ACE_CString name;
-
-      while (config->enumerate_sections (servers_, index, name) == 0)
-        {
-          ACE_CString logical, startup, working_dir;
-          u_int activation_val = 0;
-          ImplementationRepository::ActivationMode activation;
-
-          ImplementationRepository::EnvironmentList environment_vars;
-
-          ACE_Configuration_Section_Key server_key;
-          int error = 0;
-
-          error += config->open_section (this->servers_,
-                                         name.c_str(),
-                                         0,
-                                         server_key);
-
-          error += config->get_string_value (server_key,
-                                             ACE_LIB_TEXT ("LogicalServer"),
-                                             logical);
-
-          error += config->get_string_value (server_key,
-                                             ACE_LIB_TEXT ("StartupCommand"),
-                                             startup);
-
-          error += config->get_string_value (server_key,
-                                             ACE_LIB_TEXT ("WorkingDir"),
-                                             working_dir);
-
-          error += config->get_integer_value (server_key,
-                                              ACE_LIB_TEXT ("Activation"),
-                                              activation_val);
-
-          activation =
-            ACE_static_cast (ImplementationRepository::ActivationMode,
-                             activation_val);
-
-          // Maybe environments variables?? need a straightforward
-          // way to store env vars.
-
-          if (error != 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Error reading configuration data for ")
-                ACE_TEXT ("service '%s',skipping\n"),
-                name.c_str ()));
-            }
-          else
-            {
-              this->add (name,
-                         logical,
-                         startup,
-                         environment_vars,
-                         working_dir,
-                         activation);
-            }
-
-          index++;
-        }
-    }
-  else
-    {
-      /// @@ Not quite sure what I want to do here .. leave for
-      /// now. I guess similar stuff like check if that particular
-      /// server info exists etc.
-    }
-
-  return 0;
-}
-
-
-// Add a new server to the Repository
-
-int
-Server_Repository::add (
-    const ACE_CString& POA_name,
-    const ACE_CString& logical_server_name,
-    const ACE_CString& startup_command,
-    const ImplementationRepository::EnvironmentList& environment_vars,
-    const ACE_CString& working_dir,
-    const ImplementationRepository::ActivationMode& activation
-  )
-{
-  int rmode = OPTIONS::instance ()->repository_mode ();
-  if (rmode != Options::REPO_XML_FILE)
-    {
-      Repository_Configuration *config = OPTIONS::instance ()->config ();
-      ACE_ASSERT(config != 0);
-
-      // @@ Add this to the persistent configuration; environment_vars??
-      ACE_Configuration_Section_Key server;
-      config->open_section (this->servers_,
-                            POA_name.c_str(),
-                            1,
-                            server);
-
-      config->set_string_value (server,
-                                ACE_LIB_TEXT ("LogicalServer"),
-                                logical_server_name);
-
-      config->set_string_value (server,
-                                ACE_LIB_TEXT ("StartupCommand"),
-                                startup_command);
-
-      config->set_string_value (server,
-                                ACE_LIB_TEXT ("WorkingDir"),
-                                working_dir);
-
-      config->set_integer_value (server,
-                                 ACE_LIB_TEXT ("Activation"),
-                                 activation);
-
-      Server_Info *new_server = 0;
-      ACE_NEW_RETURN (new_server,
-                      Server_Info (POA_name,
-                                   logical_server_name,
-                                   startup_command,
-                                   environment_vars,
-                                   working_dir,
-                                   activation),
-                      -1);
-
-      return this->repository_.bind (POA_name, new_server);
-    }
-  else
-    {
-      ACE_CString filename = OPTIONS::instance ()->file_name ();
-
-      FILE *fp = ACE_OS::fopen (filename.c_str(), "r");
-
-      if (fp != 0)
-        {
-          ACE_TCHAR buffer[4096];
-          while (ACE_OS::fgets (buffer, sizeof (buffer), fp))
-            {
-              /// Obviously, we need to/can update only if we find an
-              /// entry for it in the xml file.
-              ACE_TCHAR* found = ACE_OS::strstr (buffer, POA_name.c_str ());
-
-              if (found != 0)
-                {
-                  /// An entry found for the POA_name. So, dont
-                  /// add it again.
-                  ACE_DEBUG ((LM_DEBUG,
-                              "ImR Activator: The %s is already added.\n", POA_name.c_str ()));
-
-                  ACE_OS::fclose (fp);
-
-                  return 0;
-                }
-            }
-        }
-
-      /// If control comes here, it means this server isnt added already.
-      fp = ACE_OS::fopen (filename.c_str(), "a");
-
-      if (fp == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Coudnt open the file to append\n"),
-                            -1);
-        }
-
-      ACE_CString server_info = "<SERVER_INFORMATION>";
-      server_info += "<Server>";
-      server_info += POA_name.c_str ();
-      server_info += "</Server>\n<StartupOptions>\n<Command_Line>";
-      server_info += startup_command;
-      server_info += "</Command_Line>\n<WorkingDir>";
-      server_info += working_dir;
-      server_info += "</WorkingDir>\n<Activation>";
-      server_info += OPTIONS::instance ()->convert_str (activation);
-      server_info += "</Activation>\n</StartupOptions>\n</SERVER_INFORMATION>\n";
-
-      ACE_OS::fprintf(fp, server_info.c_str());
-      ACE_OS::fclose(fp);
-
-      return 0;
-    }
-}
-
-// Update the associated process information.
-
-int
-Server_Repository::update (const ACE_CString& POA_name,
-                           const ACE_CString& location,
-                           const ACE_CString& server_object_ior)
-{
-  int rmode = OPTIONS::instance ()->repository_mode ();
-  if (rmode != Options::REPO_XML_FILE)
-    {
-      Server_Info *server = 0;
-      int retval = this->repository_.find (POA_name, server);
-
-      // Only fill in data if it was found
-      if (retval == 0)
-        {
-          ACE_ASSERT(server != 0);
-          server->update_running_info (location, server_object_ior);
-        }
-
-      return retval;
-    }
-  else
-    {
-      ACE_CString filename = OPTIONS::instance ()->file_name ();
-
-      FILE *fp = ACE_OS::fopen (filename.c_str(), "r+");
-      ACE_ASSERT(fp != 0);
-
-      ACE_TCHAR buffer[4096];
-
-      while (ACE_OS::fgets (buffer, sizeof (buffer), fp))
-        {
-          /// Obviously, we need to/can update only if we find an
-          /// entry for it in the xml file.
-          ACE_TCHAR* found = ACE_OS::strstr (buffer, POA_name.c_str ());
-
-          if (found != 0)
-            {
-              /// found an entry. So, need to update the entry
-              /// information.
-              this->handler_->update_running_information (POA_name,
-                                                          location,
-                                                          server_object_ior);
-              return 0;
-            }
-        }
-      return -1;
-    }
-}
-
-// Returns information related to startup.
-
-int
-Server_Repository::get_startup_info (
-    const ACE_CString& POA_name,
-    ACE_CString& logical_server_name,
-    ACE_CString& startup_command,
-    ImplementationRepository::EnvironmentList& environment_vars,
-    ACE_CString& working_dir,
-    ImplementationRepository::ActivationMode& activation
-  )
-{
-  int rmode = OPTIONS::instance ()->repository_mode ();
-  if (rmode != Options::REPO_XML_FILE)
-    {
-      Server_Info* server = 0;
-      int retval = this->repository_.find (POA_name, server);
-
-      // Only fill in data if it was found
-      if (retval == 0)
-        {
-          ACE_ASSERT(server != 0);
-          server->get_startup_info (logical_server_name,
-                                    startup_command,
-                                    environment_vars,
-                                    working_dir,
-                                    activation);
-        }
-      return retval;
-    }
-  else
-    {
-      ACEXML_FileCharStream *fstm = 0;
-      ACE_NEW_RETURN (fstm,
-                      ACEXML_FileCharStream (),
-                      1);
-
-      const char* fname = OPTIONS::instance()->file_name().c_str();
-      if (fstm->open (fname) != 0)
-        {
-          ACE_ERROR((LM_ERROR, ACE_LIB_TEXT("Fail to open XML file: %s\n"), fname));
-          return 1;
-        }
-
-      this->handler_ = new XML_ContentHandler (POA_name.c_str ());
-
-      ACEXML_Parser parser;
-
-      ACEXML_InputSource input(fstm);
-
-      parser.setContentHandler (this->handler_);
-      parser.setDTDHandler (this->handler_);
-      parser.setErrorHandler (this->handler_);
-      parser.setEntityResolver (this->handler_);
-
-      ACEXML_TRY_NEW_ENV
-        {
-          parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
-          ACEXML_TRY_CHECK;
-        }
-      ACEXML_CATCH (ACEXML_Exception, ex)
-        {
-          ex.print();
-          return -1;
-        }
-      ACEXML_ENDTRY;
-
-      ACE_CString activation_mode;
-
-      this->handler_->get_startup_information (logical_server_name,
-                                               startup_command,
-                                               working_dir,
-                                               activation_mode);
-
-      activation = OPTIONS::instance ()->convert_mode (activation_mode.c_str ());
-
-      return 0;
-    }
-}
-
-
-// Returns information related to a running copy.
-
-int
-Server_Repository::get_running_info (const ACE_CString& POA_name,
-                                     ACE_CString& location,
-                                     ACE_CString& server_object_ior)
-{
-  int rmode = OPTIONS::instance ()->repository_mode ();
-
-  if (rmode != Options::REPO_XML_FILE)
-    {
-      Server_Info *server;
-      int retval = this->repository_.find (POA_name, server);
-
-      // Only fill in data if it was found
-      if (retval == 0)
-        {
-          ACE_ASSERT(server != 0);
-          server->get_running_info (location, server_object_ior);
-        }
-      return retval;
-    }
-  else
-    {
-      ACE_CString filename = OPTIONS::instance ()->file_name ();
-
-      FILE *fp = ACE_OS::fopen (filename.c_str(), "r");
-      ACE_ASSERT(fp != 0);
-
-      ACE_TCHAR buffer[4096];
-
-      while (ACE_OS::fgets (buffer, sizeof (buffer), fp))
-        {
-          ACE_TCHAR* found = ACE_OS::strstr (buffer, POA_name.c_str ());
-
-          if (found != 0)
-            {
-              /// Found an entry for the POA_name. So, we can proceed.
-              this->handler_->get_running_information (POA_name,
-                                                       location,
-                                                       server_object_ior);
-              return 0;
-            }
-        }
-      /// If control comes here.. implies, there is no entry for the
-      /// POA_name.
-      return -1;
-    }
-}
-
-
-// Checks the starting_up_ variable in the Server_Info and
-// returns the previous value or -1 if the POA_name wasn't found
-
-int
-Server_Repository::starting_up (const ACE_CString& POA_name,
-                                int new_value)
-{
-  int rmode = OPTIONS::instance ()->repository_mode ();
-
-  if (rmode != Options::REPO_XML_FILE)
-    {
-      Server_Info *server;
-      int retval = this->repository_.find (POA_name, server);
-
-      // Only fill in data if it was found
-      if (retval == 0)
-        {
-          ACE_ASSERT(server != 0);
-          retval = server->starting_up_ ? 1 : 0;
-          server->starting_up_ = new_value != 0;
-        }
-      return retval;
-    }
-  else
-    {
-      ACE_CString filename = OPTIONS::instance ()->file_name ();
-
-      FILE *fp = ACE_OS::fopen (filename.c_str(), "r");
-      ACE_ASSERT(fp != 0);
-
-      ACE_TCHAR buffer[4096];
-
-      while (ACE_OS::fgets (buffer, sizeof (buffer), fp))
-        {
-          ACE_TCHAR* found = ACE_OS::strstr (buffer, POA_name.c_str ());
-
-          if (found != 0)
-            {
-              int retval;
-              /// Found an entry for the POA_name. So, we can proceed.
-              this->handler_->get_startup_value (POA_name, retval);
-              this->handler_->set_startup_value (POA_name, new_value);
-              return retval;
-            }
-        }
-      /// If control comes here.. implies, there is no entry for the
-      /// POA_name.
-      return -1;
-    }
-}
-
-// Same as above but does not alter the value
-
-int
-Server_Repository::starting_up (const ACE_CString& POA_name)
-{
-  int rmode = OPTIONS::instance ()->repository_mode ();
-
-  if (rmode != Options::REPO_XML_FILE)
-    {
-      Server_Info *server;
-
-      int retval = this->repository_.find (POA_name, server);
-
-      // Only fill in data if it was found
-      if (retval == 0)
-        {
-          ACE_ASSERT(server != 0);
-          retval = server->starting_up_ != 0;
-        }
-
-      return retval;
-    }
-  else
-    {
-      ACE_CString filename = OPTIONS::instance ()->file_name ();
-
-      FILE *fp = ACE_OS::fopen (filename.c_str(), "r");
-      ACE_ASSERT(fp != 0);
-
-      ACE_TCHAR buffer[4096];
-
-      while (ACE_OS::fgets (buffer, sizeof (buffer), fp))
-        {
-          ACE_TCHAR* found = ACE_OS::strstr (buffer, POA_name.c_str ());
-
-          if (found != 0)
-            {
-              int retval;
-              /// Found an entry for the POA_name. So, we can proceed.
-              this->handler_->get_startup_value (POA_name, retval);
-              return retval;
-            }
-        }
-      /// If control comes here.. implies, there is no entry for the
-      /// POA_name.
-      return -1;
-    }
-}
-
-
-// Removes the server from the Repository.
-
-int
-Server_Repository::remove (const ACE_CString& POA_name)
-{
-  int rmode = OPTIONS::instance ()->repository_mode ();
-
-  if (rmode != Options::REPO_XML_FILE)
-    {
-      Repository_Configuration *config = OPTIONS::instance ()->config ();
-      ACE_ASSERT(config != 0);
-      // Remove the persistent configuration information
-      config->remove_section (this->servers_,
-                              POA_name.c_str(),
-                              1);
-      return this->repository_.unbind (POA_name);
-    }
-  else
-    {
-      ACE_CString filename = OPTIONS::instance ()->file_name ();
-
-      FILE *fp = ACE_OS::fopen (filename.c_str(), "r");
-      ACE_ASSERT(fp != 0);
-
-      /// Have a temporary file
-      CORBA::String_var temp_file = "temporary_file";
-
-      FILE *fp_temp = ACE_OS::fopen (temp_file.in (), "w");
-      ACE_ASSERT(fp_temp != 0);
-
-      ACE_TCHAR buffer[4096];
-
-      bool remove_section = false;
-      // int dtd_section = 0;
-
-      while (ACE_OS::fgets (buffer, sizeof (buffer), fp))
-        {
-          if (! remove_section)
-            {
-              ACE_TCHAR* found = ACE_OS::strstr (buffer, POA_name.c_str ());
-
-              if (found == 0)
-                {
-                  ACE_OS::fprintf (fp_temp, buffer);
-                }
-              else
-                {
-                  remove_section = true;
-                }
-            }
-          else
-            {
-              ACE_TCHAR* found = ACE_OS::strstr (buffer, "</SERVER_INFORMATION>");
-
-              if (found != 0)
-                remove_section = false;
-            }
-        }
-
-      ACE_OS::fclose (fp_temp);
-      ACE_OS::fclose (fp);
-
-      // Now copy the temporary file to the original file.
-      fp_temp = ACE_OS::fopen (temp_file.in (), "r");
-      ACE_ASSERT(fp_temp != 0);
-
-      fp = ACE_OS::fopen (filename.c_str(), "w");
-      ACE_ASSERT(fp != 0);
-
-      while (ACE_OS::fgets (buffer, sizeof (buffer), fp_temp))
-        {
-          ACE_OS::fprintf (fp, buffer);
-        }
-
-      ACE_OS::fclose (fp);
-      ACE_OS::fclose (fp_temp);
-      ACE_OS::unlink (temp_file.in ());
-      return 0;
-    }
-  /*
-            /// There is no support for DTD in the XML parser as of
-            /// now. Will uncomment this part when the support is
-            /// added.
-
-            if (dtd_section == 0)
-            {
-            found = ACE_OS::strstr (buffer, "]>");
-
-            if (found != 0)
-            {
-            dtd_section = 1;
-            remove_section = 0;
-            }
-
-            ACE_OS::fprintf (fp_temp,
-            buffer);
-            }
-            else
-            {
-            if (remove_section == 0)
-            {
-            found = ACE_OS::strstr (buffer, POA_name.c_str ());
-
-            if (found == 0)
-            {
-    ACE_OS::fprintf (fp_temp,
-            buffer);
-            }
-            else
-            {
-    remove_section = 1;
-            }
-            }
-            else
-            {
-    found = ACE_OS::strstr (buffer, "</SERVER_INFORMATION>");
-
-            if (found != 0)
-            remove_section = 0;
-            }
-            }
-
-            }
-            ACE_OS::fclose (fp_temp);
-            ACE_OS::fclose (fp);
-
-            // Now copy the temporary file to the original file.
-            fp_temp = ACE_OS::fopen (temp_file, "r");
-
-            fp = ACE_OS::fopen (filename, "w");
-
-            while (ACE_OS::fgets (buffer, 4096, fp_temp))
-            {
-            ACE_OS::fprintf (fp,
-            buffer);
-            }
-
-            ACE_OS::fclose (fp);
-            ACE_OS::fclose (fp_temp);
-            ACE_OS::unlink (temp_file);
-            }
-          */
-}
-
-int
-Server_Repository::write_to_xml (
-    const ACE_CString&,
-    const ACE_CString&,
-    const ACE_CString&,
-    const ImplementationRepository::EnvironmentList&,
-    const ACE_CString&,
-    const ImplementationRepository::ActivationMode&)
-{
-  /*
-    ACE_TCHAR *filename = "trial.xml";
-
-    ACE_Configuration_Heap *heap = 0;
-    ACE_NEW_RETURN (heap, ACE_Configuration_Heap, -1);
-
-    if (heap->open (filename) != 0)
-    {
-    ACE_ERROR ((LM_ERROR,
-    ACE_TEXT ("Error: Opening persistent heap file '%s'\n"),
-    filename));
-    }
-
-    heap->open_section (heap->root_section (),
-    "Trail_Servers",
-    1,
-
-  */
-  return 0;
-}
-
-
-// Returns a new iterator that travels over the repository.
-
-Server_Repository::HASH_IMR_MAP::ITERATOR *
-Server_Repository::new_iterator (void)
-{
-  HASH_IMR_MAP::ITERATOR *hash_iter = 0;
-  ACE_NEW_RETURN (hash_iter,
-    Server_Repository::HASH_IMR_MAP::ITERATOR (this->repository_),
-                  0);
-
-  return hash_iter;
-}
-
-
-// Returns the number of entries in the repository.
-
-size_t
-Server_Repository::get_repository_size (void)
-{
-  return this->repository_.current_size ();
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash_Map_Entry<ACE_CString, Server_Info *>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)
-// This template is already defined in TAO, but Sun/CC 5.0 is broken
-template class ACE_Equal_To<ACE_CString>;
-#endif /* __SUNPRO_CC */
-// Instantiate for ACE_WString because ACE_CString can be either
-// ACE_CString or ACE_WString.
-template class ACE_Equal_To<ACE_WString>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, Server_Info *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Server_Info *,ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)
-// This template is already defined in TAO, but Sun/CC 5.0 is broken
-#pragma instantiate ACE_Equal_To<ACE_CString>
-#endif /* __SUNPRO_CC */
-// Instantiate for ACE_WString because ACE_CString can be either
-// ACE_CString or ACE_WString.
-#pragma instantiate ACE_Equal_To<ACE_WString>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Server_Repository.h
deleted file mode 100644
index 75e0b484d38..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Repository.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Server_Repository.h
- *
- *  $Id$
- *
- *  This class implements the Repository for the Implementation Repository.
- *
- *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
- *  @author Priyanka Gontla <gontla_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef REPOSITORY_H
-#define REPOSITORY_H
-
-#include "Server_Info.h"
-
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Configuration.h"
-
-
-class XML_ContentHandler;
-
-
-/**
- * @class Server_Repository
- *
- * @brief Repository of Server_Infos.
- *
- * Handles the storage, updating, and startup of servers.
- */
-class Server_Repository
-{
-public:
-  typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                  Server_Info *,
-                                  ACE_Hash<ACE_CString>,
-                                  ACE_Equal_To<ACE_CString>,
-                                  ACE_Null_Mutex> HASH_IMR_MAP;
-
-  /// Initializes the Server Repository
-  int init (void);
-
-  /// Add a new server to the Repository
-  int add (const ACE_CString& POA_name,
-           const ACE_CString& logical_server_name,
-           const ACE_CString& startup_command,
-           const ImplementationRepository::EnvironmentList& environment_vars,
-           const ACE_CString& working_dir,
-           const ImplementationRepository::ActivationMode& activation);
-
-  /// Update the associated process information.
-  int update (const ACE_CString& POA_name,
-              const ACE_CString& location,
-              const ACE_CString& server_object_ior);
-
-  /// Returns information related to startup.
-  int get_startup_info (const ACE_CString& POA_name,
-                        ACE_CString& logical_server_name,
-                        ACE_CString& startup_command,
-                        ImplementationRepository::EnvironmentList& environment_vars,
-                        ACE_CString& working_dir,
-                        ImplementationRepository::ActivationMode& activation);
-
-  /// Returns information related to a running copy.
-  int get_running_info (const ACE_CString& POA_name,
-                        ACE_CString& location,
-                        ACE_CString& server_object_ior);
-
-  /// Checks the starting_up_ variable in the Server_Info and
-  /// returns the previous value or -1 if the POA_name wasn't found
-  int starting_up (const ACE_CString& POA_name, int new_value);
-
-  /// Same as above but does not alter the value.
-  int starting_up (const ACE_CString& POA_name);
-
-  /// Removes the server from the Repository.
-  int remove (const ACE_CString& POA_name);
-
-  /// Write into the xml file.
-  int write_to_xml (const ACE_CString& POA_name,
-                    const ACE_CString& logical_server_name,
-                    const ACE_CString& startup_command,
-                    const ImplementationRepository::EnvironmentList& environment_vars,
-                    const ACE_CString& working_dir,
-                    const ImplementationRepository::ActivationMode& activation);
-  /// Returns a new iterator that travels over the repository.
-  HASH_IMR_MAP::ITERATOR *new_iterator (void);
-
-  /// Returns the number of entries in the repository.
-  size_t get_repository_size (void);
-
-private:
-
-  HASH_IMR_MAP repository_;
-  ACE_Configuration_Section_Key servers_;
-  XML_ContentHandler *handler_;
-};
-
-
-#endif /* REPOSITORY_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_ContentHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/XML_ContentHandler.cpp
deleted file mode 100644
index b3a42b2c304..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/XML_ContentHandler.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-#include "XML_ContentHandler.h"
-
-
-ACE_RCSID (ImplRepo_Service,
-           XML_ContentHandler,
-           "$Id$")
-
-
-XML_ContentHandler::XML_ContentHandler (const char *server_name)
-  : server_name_ (server_name),
-    found_server_entry_ (false),
-    command_line_entry_ (false),
-    working_dir_entry_ (false),
-    environment_vars_entry_ (false),
-    activation_entry_ (false),
-    server_object_ior_entry_ (false),
-    location_entry_ (false),
-    startup_value_ (false)
-{
-  // no-op
-}
-
-XML_ContentHandler::~XML_ContentHandler (void)
-{
-  // no-op
-}
-
-void
-XML_ContentHandler::characters (const ACEXML_Char *cdata,
-                                int /* start */,
-                                int /* end */
-                                ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  if (ACE_OS::strcmp (cdata, this->server_name_.c_str ()) == 0)
-    {
-      this->found_server_entry_ = true;
-    }
-
-  if (this->command_line_entry_ )
-    {
-      this->command_line_ = cdata;
-      this->command_line_entry_ = false;
-    }
-  else if (this->working_dir_entry_ )
-    {
-      this->working_dir_ = cdata;
-      this->working_dir_entry_ = false;
-    }
-  else if (this->activation_entry_ )
-    {
-      this->activation_ = cdata;
-      this->activation_entry_ = false;
-    }
-  else if (this->environment_vars_entry_ )
-    {
-      this->environment_vars_ = cdata;
-      this->environment_vars_entry_ = false;
-    }
-  else if (this->location_entry_ )
-    {
-      this->location_ = cdata;
-      this->location_entry_ = false;
-    }
-  else if (this->server_object_ior_entry_ )
-    {
-      this->server_object_ior_ = cdata;
-      this->server_object_ior_entry_ = false;
-    }
-}
-
-void
-XML_ContentHandler::endDocument ( ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-}
-
-void
-XML_ContentHandler::endElement (const ACEXML_Char *,
-                                const ACEXML_Char *,
-                                const ACEXML_Char * /* qName */ ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-}
-
-void
-XML_ContentHandler::endPrefixMapping (const ACEXML_Char * /* prefix */ ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  //  cout << "* Event endPrefixMapping (" << prefix << ") ***************" << endl;
-}
-
-void
-XML_ContentHandler::ignorableWhitespace (const ACEXML_Char *,
-                                         int,
-                                         int ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  //  cout << "* Event ignorableWhitespace () ***************" << endl;
-}
-
-void
-XML_ContentHandler::processingInstruction (const ACEXML_Char * /* target */,
-                                           const ACEXML_Char * /* data */ ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  //  this->print_indent ();
-//   cout << "<?" << target << " "
-//        << data << "?>" << endl;
-}
-
-void
-XML_ContentHandler::setDocumentLocator (ACEXML_Locator *)
-{
-  //  cout << "* Event setDocumentLocator () ***************" << endl;
-}
-
-void
-XML_ContentHandler::skippedEntity (const ACEXML_Char * /* name */ ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  //  cout << "* Event skippedEntity (" << name << ") ***************" << endl;
-}
-
-void
-XML_ContentHandler::startDocument ( ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  //  cout << "* Event startDocument () ***************" << endl;
-}
-
-void
-XML_ContentHandler::startElement (const ACEXML_Char *,
-                                  const ACEXML_Char *,
-                                  const ACEXML_Char *qName,
-                                  ACEXML_Attributes * ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  if (this->found_server_entry_ )
-    {
-      if (ACE_OS::strcmp (qName, "Command_Line") == 0)
-        {
-          this->command_line_entry_ = true;
-        }
-      else if (ACE_OS::strcmp (qName, "WorkingDir") == 0)
-        {
-          this->working_dir_entry_ = true;
-        }
-      else if (ACE_OS::strcmp (qName, "Activation") == 0)
-        {
-          this->activation_entry_ = true;
-        }
-      else if (ACE_OS::strcmp (qName, "Command_Line") == 0)
-        {
-          this->environment_vars_entry_ = true;
-        }
-      else if (ACE_OS::strcmp (qName, "Location") == 0)
-        {
-          this->location_entry_ = true;
-        }
-      else if (ACE_OS::strcmp (qName, "Server_Object_IOR") == 0)
-        {
-          this->server_object_ior_entry_ = true;
-        }
-    }
-}
-
-void
-XML_ContentHandler::startPrefixMapping (const ACEXML_Char *,
-                                        const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-// *** Methods inherit from ACEXML_DTDHandler.
-
-void
-XML_ContentHandler::notationDecl (const ACEXML_Char *,
-                                       const ACEXML_Char *,
-                                       const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-void
-XML_ContentHandler::unparsedEntityDecl (const ACEXML_Char *,
-                                             const ACEXML_Char *,
-                                             const ACEXML_Char *,
-                                             const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-// Methods inherit from ACEXML_EnitityResolver.
-
-ACEXML_InputSource *
-XML_ContentHandler::resolveEntity (const ACEXML_Char *,
-                                   const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-  return 0;
-}
-
-// Methods inherit from ACEXML_ErrorHandler.
-
-  /*
-   * Receive notification of a recoverable error.
-   */
-void
-XML_ContentHandler::error (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-void
-XML_ContentHandler::fatalError (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-void
-XML_ContentHandler::warning (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-int
-XML_ContentHandler::get_startup_information (ACE_CString &logical_server_name,
-                                             ACE_CString &startup_command,
-                                             // ImplementationRepository::EnvironmentList
-                                             //&environment_vars,
-                                             ACE_CString &working_dir,
-                                             //ImplementationRepository::ActivationMode
-                                             ACE_CString &activation)
-{
-  startup_command = this->command_line_;
-
-  logical_server_name = this->server_name_;
-
-  working_dir = this->working_dir_;
-
-  activation = this->activation_;
-
-  return 0;
-}
-
-int
-XML_ContentHandler::get_running_information (ACE_CString POA_name,
-                                             ACE_CString &location,
-                                             ACE_CString &server_object_ior)
-{
-  if (ACE_OS::strcmp (POA_name.c_str (), this->server_name_.c_str ()) == 0)
-    {
-      location = this->location_;
-      server_object_ior = this->server_object_ior_;
-    }
-  return 0;
-}
-
-void
-XML_ContentHandler::set_startup_value (ACE_CString POA_name,
-                                       int new_value)
-{
-  this->server_name_ = POA_name;
-  this->startup_value_ = new_value != 0;
-}
-
-void
-XML_ContentHandler::get_startup_value (ACE_CString /* POA_name */,
-                                       int &new_value)
-{
-  new_value = this->startup_value_ ? 1 : 0;
-}
-
-void
-XML_ContentHandler::update_running_information (ACE_CString /* POA_name */,
-                                                ACE_CString location,
-                                                ACE_CString server_object_ior)
-{
-  this->location_ = location;
-  this->server_object_ior_ = server_object_ior;
-}
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_ContentHandler.h b/TAO/orbsvcs/ImplRepo_Service/XML_ContentHandler.h
deleted file mode 100644
index ee3e69beab7..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/XML_ContentHandler.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file   XML_ContentHandler.h
- *
- *  $Id$
- *
- *  @brief  This is a content handler which helps update the existing
- *  xml file used for store server configuration.
- *
- *  @author Priyanka Gontla <gontla_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef XML_CONTENTHANDLER_H
-#define XML_CONTENTHANDLER_H
-
-#include "ACEXML/common/DefaultHandler.h"
-
-/**
- * @class XML_ContentHandler
- *
- * @brief Implementation Repository
- *
- * This provides the interface to update the Server Configuration
- * which is in an xml file.
- *
- */
-class XML_ContentHandler : public ACEXML_DefaultHandler
-{
-public:
-  // = Constructor and destructor
-  XML_ContentHandler (const char *server_name);
-
-  virtual ~XML_ContentHandler (void);
-
-  // Methods inherit from ACEXML_ContentHandler.
-
-  /*
-   * Receive notification of character data.
-   */
-  virtual void characters (const ACEXML_Char *ch,
-                           int start,
-                           int length ACEXML_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the end of a document.
-   */
-  virtual void endDocument ( ACEXML_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the end of an element.
-   */
-  virtual void endElement (const ACEXML_Char *namespaceURI,
-                           const ACEXML_Char *localName,
-                           const ACEXML_Char *qName ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * End the scope of a prefix-URI mapping.
-   */
-  virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of ignorable whitespace in element content.
-   */
-  virtual void ignorableWhitespace (const ACEXML_Char *ch,
-                                    int start,
-                                    int length ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of a processing instruction.
-   */
-  virtual void processingInstruction (const ACEXML_Char *target,
-                                      const ACEXML_Char *data ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive an object for locating the origin of SAX document events.
-   */
-  virtual void setDocumentLocator (ACEXML_Locator *locator) ;
-
-  /*
-   * Receive notification of a skipped entity.
-   */
-  virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the beginning of a document.
-   */
-  virtual void startDocument ( ACEXML_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the beginning of an element.
-   */
-  virtual void startElement (const ACEXML_Char *namespaceURI,
-                             const ACEXML_Char *localName,
-                             const ACEXML_Char *qName,
-                             ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Begin the scope of a prefix-URI Namespace mapping.
-   */
-  virtual void startPrefixMapping (const ACEXML_Char *prefix,
-                                   const ACEXML_Char *uri ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  // *** Methods inherit from ACEXML_DTDHandler.
-
-  /*
-   * Receive notification of a notation declaration event.
-   */
-  virtual void notationDecl (const ACEXML_Char *name,
-                             const ACEXML_Char *publicId,
-                             const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of an unparsed entity declaration event.
-   */
-  virtual void unparsedEntityDecl (const ACEXML_Char *name,
-                                   const ACEXML_Char *publicId,
-                                   const ACEXML_Char *systemId,
-                                   const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  // Methods inherit from ACEXML_EnitityResolver.
-
-  /*
-   * Allow the application to resolve external entities.
-   */
-  virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId,
-                                             const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  // Methods inherit from ACEXML_ErrorHandler.
-
-  /*
-   * Receive notification of a recoverable error.
-   */
-  virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of a non-recoverable error.
-   */
-  virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of a warning.
-   */
-  virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  int get_startup_information (ACE_CString &logical_server_name,
-                               ACE_CString &startup_command,
-                               // ImplementationRepository::EnvironmentList
-                               //&environment_vars,
-                               ACE_CString &working_dir,
-                               //ImplementationRepository::ActivationMode
-                               ACE_CString &activation);
-
-  int get_running_information (ACE_CString POA_name,
-                               ACE_CString &location,
-                               ACE_CString &server_object_ior);
-
-  void update_running_information (ACE_CString POA_name,
-                                   ACE_CString location,
-                                   ACE_CString server_object_ior);
-
-  void set_startup_value (ACE_CString POA_name,
-                          int new_value);
-
-  void get_startup_value (ACE_CString POA_name,
-                          int &new_value);
-
-
- private:
-
-  // Holds the server_name
-  ACE_CString server_name_;
-
-  // Holds the command_line that is to be used to activate the
-  // server
-  ACE_CString command_line_;
-
-
-  ACE_CString activation_;
-
-  // Directory where it should be running
-  ACE_CString working_dir_;
-
-  // Environment variables if any
-  ACE_CString environment_vars_;
-
-  // IOR of the server
-  ACE_CString server_object_ior_;
-
-  // Hostname
-  ACE_CString location_;
-
-  // Checks to see if that particular entry exists.
-  bool found_server_entry_;
-  bool command_line_entry_;
-  bool working_dir_entry_;
-  bool environment_vars_entry_;
-  bool activation_entry_;
-  bool server_object_ior_entry_;
-  bool location_entry_;
-  bool startup_value_;
-};
-
-#endif /* XML_CONTENTHANDLER_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/repository.xml b/TAO/orbsvcs/ImplRepo_Service/repository.xml
index d8284ccf8eb..a0bf35ef009 100644
--- a/TAO/orbsvcs/ImplRepo_Service/repository.xml
+++ b/TAO/orbsvcs/ImplRepo_Service/repository.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0"?>
-<!DOCTYPE SERVER_REPOSITORY  [
-<!ELEMENT SERVER_INFORMATION (Server, Logical_Server*, StartupOptions, Location)>
-<!ELEMENT Server (#PCDATA)>
-<!ELEMENT Logical_Server (#PCDATA)>
-<!ELEMENT StartupOptions (Command_Line, Environment*, Working_Directory*, Activation*, Location)>
-<!ELEMENT Command_Line (#PCDATA)>
-<!ELEMENT Working_Directory (#PCDATA)>
-<!ELEMENT Activation (NORMAL | MANUAL | PER_CLIENT | AUTO_START)>
-<!ELEMENT Location (#PCDATA)>
-]>
-
-<SERVER_REPOSITORY>
-
-<SERVER_INFORMATION>
-<Server>airplane_server</Server>
-<StartupOptions>
-<Command_Line>./airplane_server</Command_Line>
-<Location>doc</Location>
-</SERVER_INFORMATION>
-
-</SERVER_REPOSITORY>
+<!DOCTYPE ImplementationRepository/>
+<ImplementationRepository>
+	<Servers name="test" activator="MYHOST" command_line="mysrv" working_dir="mydir" activation_mode="NORMAL" start_limit="1" partial_ior="" ior="">
+	</Servers>
+	<Servers name="test2" activator="MYHOST" command_line="" working_dir="" activation_mode="NORMAL" start_limit="1" partial_ior="" ior="">
+	</Servers>
+	<Activators name="MYHOST" token="1610927480" ior="IOR:010000002b00000049444c3a496d706c656d656e746174696f6e5265706f7369746f72792f416374697661746f723a312e300000010000000000000090000000010102cd150000004a555354414c49454e2e6f63697765622e636f6d00cd1f083900000014010f004e555000000017000000000100000000496d525f416374697661746f7200000000000100000054414f496d52416374697661746f7200000002000000000000000800000001cdcdcd004f4154010000001400000001cdcdcd01000100000000000901010000000000"/>
+</ImplementationRepository>
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp
index c10c54d5445..45b72a2790a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp
@@ -2,15 +2,14 @@
 // $Id$
 
 #include "tao_imr_i.h"
-#include "ace/OS_main.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   TAO_IMR_i tao_imr_i;
 
-  if (tao_imr_i.init (argc, argv) == -1)
+  if (tao_imr_i.init (argc, argv) != 0)
     return 1;
-  else
-    return tao_imr_i.run ();
+
+  return tao_imr_i.run ();
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 67500e37945..99da29e20cd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -2,35 +2,30 @@
 
 #include "tao_imr_i.h"
 
+#include "tao/PortableServer/POA.h"
+
 #include "tao/Stub.h"
 #include "tao/Profile.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_netdb.h"
 #include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_unistd.h"
-
-// How many servers should we get at once?
-const size_t IR_LIST_CHUNK = 10;
+#include "ace/OS.h"
 
 TAO_IMR_i::TAO_IMR_i (void)
-  : imr_locator_ (ImplementationRepository::Locator::_nil ()),
-    op_ (0)
+: imr_ (ImplementationRepository::Administration::_nil ())
 {
   // Nothing
 }
 
 TAO_IMR_i::~TAO_IMR_i (void)
 {
-  delete this->op_;
 }
 
 int
 TAO_IMR_i::run ()
 {
-  if (this->op_ == 0)
+  if (this->op_.get() == 0)
   {
     ACE_ERROR ((LM_ERROR, "Unknown operation"));
     return TAO_IMR_Op::UNKNOWN;
@@ -49,47 +44,46 @@ TAO_IMR_i::init (int argc, char **argv)
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  {
+    // Retrieve the ORB.
+    this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "tao_imr_i" ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
+    // Parse command line and verify parameters.
+    if (this->parse_args () == -1)
+      return -1;
 
-      // Get the ImplRepo object
-      CORBA::Object_var imr_locator =
-        orb_->resolve_initial_references ("ImplRepoService"
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    // Get the ImplRepo object
+    CORBA::Object_var obj =
+      orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      if (CORBA::is_nil (imr_locator.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Unable to resolve the ImR Locator.\n"));
-          ACE_OS::exit (-1);
-        }
+    if (CORBA::is_nil (obj.in ()))
+    {
+      ACE_ERROR ((LM_ERROR, "Unable to resolve the ImR Locator.\n"));
+      return -1;
+    }
 
-      exception_message = "While narrowing ImR Locator";
+    exception_message = "While narrowing ImR Locator";
 
-      this->imr_locator_ =
-        ImplementationRepository::Locator::_narrow
-            (imr_locator.in()
-             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    this->imr_ =
+      ImplementationRepository::Administration::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      this->op_->set_imr_locator (this->imr_locator_.in ());
-    }
-  ACE_CATCHANY
+    if (CORBA::is_nil (imr_.in ()))
     {
-      ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ACE_ERROR ((LM_ERROR, "Unable to narrow the ImR Locator.\n"));
       return -1;
     }
+
+    this->op_->set_imr(this->imr_.in ());
+  }
+  ACE_CATCHANY
+  {
+    ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message));
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+    return -1;
+  }
   ACE_ENDTRY;
 
   return 0;
@@ -104,17 +98,18 @@ TAO_IMR_i::parse_args (void)
   // Make sure one command was given
   if (this->argc_ < 2)
   {
+    ACE_ERROR((LM_ERROR, "Error: No operation specified.\n"));
     this->print_usage ();
     return -1;
   }
 
-  this->op_ = TAO_IMR_Op::make_op (this->argv_[1]);
+  this->op_.reset(TAO_IMR_Op::make_op (this->argv_[1]));
 
   // Check for unrecognized operation
 
-  if (this->op_ == 0)
+  if (this->op_.get() == 0)
   {
-    ACE_ERROR ((LM_ERROR, "ERROR: Unrecognized command: <%s>\n", this->argv_[1]));
+    ACE_ERROR((LM_ERROR, "Error: Unknown operation '%s'.\n", this->argv_[1]));
     this->print_usage ();
     return -1;
   }
@@ -130,18 +125,17 @@ void
 TAO_IMR_i::print_usage (void)
 {
   ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] command [command-arguments]\n"
-                        "  where [options] are ORB options\n"
-                        "  where command is one of the following:\n"
-                        "    activate  Activates a server through the IR\n"
-                        "    add       Add an entry to the IR\n"
-                        "    autostart Activates all AUTO_START servers\n"
-                        "    ior       Creates a simplified IOR\n"
-                        "    list      List the entries in the IR\n"
-                        "    remove    Remove an entry from the IR\n"
-                        "    shutdown  Shuts down a server through the IR\n"
-                        "    shutdown-repo  Shuts down the IR\n"
-                        "    update    Update an entry in the IR\n"
-                        "  where [command-arguments] depend on the command\n"));
+    "  where [options] are ORB options\n"
+    "  where command is one of the following:\n"
+    "    activate  Activates a server through the IR\n"
+    "    add       Add an entry to the IR\n"
+    "    autostart Activates all AUTO_START servers\n"
+    "    ior       Creates a simplified IOR\n"
+    "    list      List the entries in the IR\n"
+    "    remove    Remove an entry from the IR\n"
+    "    shutdown  Shuts down a server through the IR\n"
+    "    update    Update an entry in the IR\n"
+    "  where [command-arguments] depend on the command\n"));
 }
 
 
@@ -164,8 +158,6 @@ TAO_IMR_Op::make_op (const ACE_TCHAR *op_name)
     return new TAO_IMR_Op_Remove ();
   else if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("shutdown")) == 0)
     return new TAO_IMR_Op_Shutdown ();
-  else if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("shutdown-repo")) == 0)
-    return new TAO_IMR_Op_Shutdown_Repo ();
   else if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("update")) == 0)
     return new TAO_IMR_Op_Update ();
 
@@ -179,9 +171,9 @@ TAO_IMR_Op::~TAO_IMR_Op ()
 }
 
 void
-TAO_IMR_Op::set_imr_locator (ImplementationRepository::Locator_ptr imr_locator)
+TAO_IMR_Op::set_imr (ImplementationRepository::Administration_ptr imr)
 {
-  this->imr_locator_ = imr_locator;
+  this->imr_ = imr;
 }
 
 void
@@ -200,37 +192,40 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn
 
   // Print out information
   ACE_DEBUG ((LM_DEBUG, "Server <%s>\n", info.server.in ()));
+
   ACE_DEBUG ((LM_DEBUG,
-              "  Activator: %s\n"
-              "  Command Line: %s\n"
-              "  Working Directory: %s\n"
-              "  Activation Mode: %s\n",
-              info.startup.activator.in (),
-              info.startup.command_line.in (),
-              info.startup.working_directory.in (),
-              act));
+    "  Activator: %s\n"
+    "  Command Line: %s\n"
+    "  Working Directory: %s\n"
+    "  Activation Mode: %s\n"
+    "  Number of retries: %d\n",
+    info.startup.activator.in (),
+    info.startup.command_line.in (),
+    info.startup.working_directory.in (),
+    act,
+    info.startup.start_limit - 1));
   for (CORBA::ULong i = 0; i < info.startup.environment.length (); ++i)
     ACE_DEBUG ((LM_DEBUG, "Environment Variable: %s=%s \n",
-                info.startup.environment[i].name.in (),
-                info.startup.environment[i].value.in ()));
-
-  // @@ add logical server once implemented
-
+    info.startup.environment[i].name.in (),
+    info.startup.environment[i].value.in ()));
 
   if (info.startup.activation == ImplementationRepository::PER_CLIENT)
     ACE_DEBUG ((LM_DEBUG, "  No running info available for PER_CLIENT mode\n"));
-  else if (ACE_OS::strlen (info.location.in()) > 0)
+  else if (ACE_OS::strlen (info.partial_ior.in()) > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "  Running at endpoint: %s\n",
-                info.location.in ()));
-  else   // I am assuming that a blank location means currently not running.
+    "  Running at endpoint: %s\n",
+    info.partial_ior.in ()));
+  else   // I am assuming that a blank partial_ior means currently not running.
     ACE_DEBUG ((LM_DEBUG,
-                "  Not currently running\n"));
+    "  Not currently running\n"));
+
+  ACE_DEBUG ((LM_DEBUG, "\n"));
 }
 
 
 TAO_IMR_Op_Add::TAO_IMR_Op_Add (void)
-  : activation_ (ImplementationRepository::NORMAL)
+: activation_ (ImplementationRepository::NORMAL)
+, retry_count_ (0)
 {
   // Nothing
 }
@@ -242,9 +237,14 @@ TAO_IMR_Op_List::TAO_IMR_Op_List (void)
 }
 
 TAO_IMR_Op_Update::TAO_IMR_Op_Update (void)
-: set_command_line_ (0),
-  set_working_dir_ (0),
-  set_activation_ (0)
+: set_command_line_ (false)
+, set_environment_vars_(false)
+, set_working_dir_ (false)
+, set_activation_ (false)
+, activation_(ImplementationRepository::NORMAL)
+, set_retry_count_(false)
+, retry_count_ (0)
+, set_activator_ (false)
 {
   // Nothing
 }
@@ -253,13 +253,11 @@ void
 TAO_IMR_Op_Activate::print_usage (void)
 {
   ACE_ERROR ((LM_ERROR, "Activates a server\n"
-                        "\n"
-                        "Usage: tao_imr [options] activate <name> [command-arguments]\n"
-                        "  where [options] are ORB options\n"
-                        "  where <name> is the POA name used by the server object\n"
-                        "  where [command-arguments] can be\n"
-                        "    -l            Activator name.\n"
-                        "    -h            Displays this\n"));
+    "\n"
+    "Usage: tao_imr [options] activate <name>\n"
+    "  where [options] are ORB options\n"
+    "  where <name> is the POA name used by the server object\n"
+    "  -h Displays this\n"));
 }
 
 int
@@ -267,62 +265,63 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-    {
-      this->print_usage ();
-      return -1;
-    }
+  {
+    this->print_usage ();
+    return -1;
+  }
 
   // Skip both the program name and the "activate" command
-  ACE_Get_Opt get_opts (argc, argv, "l:h");
+  ACE_Get_Opt get_opts (argc, argv, "h");
 
   this->server_name_ = argv[1];
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
-      {
-      case 'l':
-        this->activator_ = get_opts.optarg;
-        break;
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
-      }
+  {
+    case 'h':  // display help
+      this->print_usage ();
+      return -1;
+    default:
+      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+      this->print_usage ();
+      return -1;
+  }
 
-  // Success
   return 0;
 }
 
 void
-TAO_IMR_Op_Add::setenv (ACE_TCHAR *opt)
+TAO_IMR_Op_Add::addenv (ACE_TCHAR *opt)
 {
-   CORBA::ULong length = this->environment_vars_.length ();
-
-   // Increase the length of the sequence
-   this->environment_vars_.length (length + 1);
-   ACE_CString tokens (opt);
-   int index = tokens.find ("=");
-   // Insert at position length since that is our new element
-   this->environment_vars_ [length].name =
-         CORBA::string_dup (tokens.substr (0, index).c_str ());
-   this->environment_vars_ [length].value =
-         CORBA::string_dup (tokens.substr (index + 1).c_str ());
+  CORBA::ULong length = this->environment_vars_.length ();
+
+  // Increase the length of the sequence
+  this->environment_vars_.length (length + 1);
+  ACE_CString tokens (opt);
+  int index = tokens.find ("=");
+  // Insert at position length since that is our new element
+  this->environment_vars_ [length].name =
+    CORBA::string_dup (tokens.substr (0, index).c_str ());
+  this->environment_vars_ [length].value =
+    CORBA::string_dup (tokens.substr (index + 1).c_str ());
 }
 
 void
 TAO_IMR_Op_Add::print_usage (void)
 {
-  ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] add <name> [command-arguments]\n"
-                        "  where [options] are ORB options\n"
-                        "  where <name> is the POA name used by the server object\n"
-                        "  where [command-arguments] can be\n"
-                        "    -l            Activator name. Defaults to local hostname.\n"
-                        "    -h            Displays this\n"
-                        "    -c command    Startup command\n"
-                        "    -w dir        Working directory\n"
-                        "    -e vars       Set environment variables\n"
-                        "    -a mode       Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n"));
+  ACE_ERROR ((LM_ERROR,
+    "Usage: tao_imr [options] add <name> [command-arguments]\n"
+    "  where [options] are ORB options\n"
+    "  where <name> is the POA name used by the server object\n"
+    "  where [command-arguments] can be\n"
+    "    -l            Activator name. Defaults to local hostname.\n"
+    "    -h            Displays this\n"
+    "    -c command    Startup command\n"
+    "    -w dir        Working directory\n"
+    "    -e name=value Set environment variables\n"
+    "    -a mode       Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n"
+    "    -r count      Set how many times to attempt restart. (default 0)\n"));
 }
 
 int
@@ -330,70 +329,82 @@ TAO_IMR_Op_Add::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-    {
-      this->print_usage ();
-      return -1;
-    }
+  {
+    this->print_usage ();
+    return -1;
+  }
 
- // Skip both the program name and the "add" command
-  ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:l:");
+  // Skip both the program name and the "add" command
+  ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:l:r:R:");
 
   this->server_name_ = argv[1];
-  if (this->server_name_.length() == 0)
+  if (this->server_name_.length() == 0 || this->server_name_[0] == '-')
   {
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Server name > must be at least one character long!\n"),-1);
+    ACE_ERROR((LM_ERROR, "ERROR : name is required.\n"));
+    this->print_usage ();
+    return -1;
   }
-    
+
   int c;
 
   while ((c = get_opts ()) != -1)
+  {
     switch (c)
+    {
+    case 'c':  // Command line arguments
+      this->command_line_ = get_opts.opt_arg ();
+      break;
+    case 'e':  // set environment variables
+      this->addenv( get_opts.opt_arg () ) ;
+      break;
+    case 'w':  // Working Directory
+      this->working_dir_ = get_opts.opt_arg ();
+      break;
+    case 'a':  // Activation Mode
+      if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0)
+        this->activation_ = ImplementationRepository::NORMAL;
+      else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0)
+        this->activation_ = ImplementationRepository::MANUAL;
+      else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0)
+        this->activation_ = ImplementationRepository::PER_CLIENT;
+      else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "AUTO_START") == 0)
+        this->activation_ = ImplementationRepository::AUTO_START;
+      else
+        ACE_ERROR_RETURN ((LM_ERROR,
+        "Unknown Activation Mode <%s>!\n",
+        get_opts.opt_arg ()),
+        -1);
+      break;
+    case 'l': /// hostname of the activator
+      this->activator_ = get_opts.optarg;
+      break;
+    case 'r':   // startup/ping Retry Count
+    case 'R':
       {
-      case 'c':  // Command line arguments
-        this->command_line_ = get_opts.opt_arg ();
-        break;
-      case 'e':  // set environment variables
-        this->setenv( get_opts.opt_arg () ) ;
-        break;
-      case 'w':  // Working Directory
-        this->working_dir_ = get_opts.opt_arg ();
-        break;
-      case 'a':  // Activation Mode
-        if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0)
-          this->activation_ = ImplementationRepository::NORMAL;
-        else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0)
-          this->activation_ = ImplementationRepository::MANUAL;
-        else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0)
-          this->activation_ = ImplementationRepository::PER_CLIENT;
-        else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "AUTO_START") == 0)
-          this->activation_ = ImplementationRepository::AUTO_START;
-        else
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unknown Activation Mode <%s>!\n",
-                             get_opts.opt_arg ()),
-                            -1);
-        break;
-      case 'l': /// hostname of the activator
-        this->activator_ = get_opts.optarg;
-        break;
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
+        int rc = ACE_OS::atoi(get_opts.optarg);
+        if (rc > 0)
+          this->retry_count_ = rc;
       }
+      break;
+    case 'h':  // display help
+      this->print_usage ();
+      return -1;
+    default:
+      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+      this->print_usage ();
+      return -1;
+    }
+  }
 
-  // Success
   return 0;
 }
 
 void
 TAO_IMR_Op_Autostart::print_usage (void)
 {
-  ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart [command-arguments]\n"
-                        "  where [options] are ORB options\n"
-                        "  where [command-arguments] can be\n"
-                        "    -h            Displays this\n"));
+  ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart\n"
+    "  where [options] are ORB options\n"
+    "  -h Displays this\n"));
 }
 
 int
@@ -406,14 +417,16 @@ TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv)
 
   while ((c = get_opts ()) != -1)
     switch (c)
-      {
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
-      }
+  {
+    case 'h':  // display help
+      this->print_usage ();
+      return -1;
+    default:
+      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+      this->print_usage ();
+      return -1;
+  }
 
-  // Success
   return 0;
 }
 
@@ -421,15 +434,15 @@ void
 TAO_IMR_Op_IOR::print_usage (void)
 {
   ACE_ERROR ((LM_ERROR, "Creates an IOR for a server that is registered with the IMR and uses\n"
-                        "the InterOperable Naming Service.  Please see the documentation for\n"
-                        "more information on which server configurations work with this command.\n"
-                        "\n"
-                        "Usage: tao_imr [options] ior <name> [command-arguments]\n"
-                        "  where [options] are ORB options\n"
-                        "  where <name> is the POA name of the server\n"
-                        "  where [command-arguments] can be\n"
-                        "    -f filename   filename to output the IOR to\n"
-                        "    -h            Displays this\n"));
+    "the InterOperable Naming Service.  Please see the documentation for\n"
+    "more information on which server configurations work with this command.\n"
+    "\n"
+    "Usage: tao_imr [options] ior <name> [command-arguments]\n"
+    "  where [options] are ORB options\n"
+    "  where <name> is the POA name of the server\n"
+    "  where [command-arguments] can be\n"
+    "    -f filename   filename to output the IOR to\n"
+    "    -h            Displays this\n"));
 }
 
 int
@@ -445,36 +458,29 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv)
   // Skip both the program name and the "ior" command
   ACE_Get_Opt get_opts (argc, argv, "hf:");
 
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'f':  // File name
-        this->filename_ = get_opts.opt_arg ();
-        break;
-      case 'h':  // display help
-      default:
-        this->print_usage();
-        return -1;
-      }
-
-  int remaining_index = get_opts.opt_ind();
-  if (get_opts.argc() - remaining_index > 1) {
-    ACE_DEBUG((LM_DEBUG, "Error : Too many arguments.\n\n"));
-    this->print_usage();
+  this->server_name_ = argv[1];
+  if (this->server_name_.length() == 0 || this->server_name_[0] == '-')
+  {
+    ACE_ERROR((LM_ERROR, "ERROR : name is required.\n"));
+    this->print_usage ();
     return -1;
   }
 
-  if (remaining_index < get_opts.argc()) {
-    this->server_name_ = get_opts.argv()[remaining_index];
-  }
+  int c;
 
-  if (this->server_name_.length() == 0) 
+  while ((c = get_opts ()) != -1)
+    switch (c)
   {
-    ACE_DEBUG((LM_DEBUG, "Error : Missing server name.\n\n"));
-    this->print_usage();
-    return -1;
+    case 'f':  // File name
+      this->filename_ = get_opts.opt_arg ();
+      break;
+    case 'h':  // display help
+      this->print_usage();
+      return -1;
+    default:
+      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+      this->print_usage ();
+      return -1;
   }
 
   return 0;
@@ -484,14 +490,14 @@ void
 TAO_IMR_Op_List::print_usage (void)
 {
   ACE_ERROR ((LM_ERROR, "Lists all or one of the servers in the Implementation Repository\n"
-                        "\n"
-                        "Usage: tao_imr [options] list [name] [command-arguments]\n"
-                        "  where [options] are ORB options\n"
-                        "  where [name] is the optional server name to search for\n"
-                        "  where [command-arguments] can be\n"
-                        "    -v            Verbose: Displays more info for each server when\n"
-                        "                  displaying more than one server\n"
-                        "    -h            Displays this\n"));
+    "\n"
+    "Usage: tao_imr [options] list [name] [command-arguments]\n"
+    "  where [options] are ORB options\n"
+    "  where [name] is the optional server name to search for\n"
+    "  where [command-arguments] can be\n"
+    "    -v            Verbose: Displays more info for each server when\n"
+    "                  displaying more than one server\n"
+    "    -h            Displays this\n"));
 }
 
 int
@@ -500,10 +506,10 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv)
   int server_flag = 0;
 
   if (argc > 1 && argv[1][0] != '-')
-    {
-      this->server_name_ = argv[1];
-      server_flag = 2; 
-    }
+  {
+    this->server_name_ = argv[1];
+    server_flag = 2;
+  }
 
   // Skip both the program name and the "list" command
   ACE_Get_Opt get_opts (argc, argv, "vh", server_flag);
@@ -512,17 +518,19 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv)
 
   while ((c = get_opts ()) != -1)
     switch (c)
-      {
-      case 'v': // verbose server display
-        this->verbose_server_information_ = 1;
-        break;
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
-      }
+  {
+    case 'v': // verbose server display
+      this->verbose_server_information_ = 1;
+      break;
+    case 'h':  // display help
+      this->print_usage ();
+      return -1;
+    default:
+      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+      this->print_usage ();
+      return -1;
+  }
 
-  // Success
   return 0;
 }
 
@@ -530,13 +538,11 @@ void
 TAO_IMR_Op_Remove::print_usage (void)
 {
   ACE_ERROR ((LM_ERROR, "Removes a server entry\n"
-                        "\n"
-                        "Usage: tao_imr [options] remove <name> [command-arguments]\n"
-                        "  where [options] are ORB options\n"
-                        "  where <name> is the POA name used by the server object\n"
-                        "  where [command-arguments] can be\n"
-                        "    -l            Activator name.\n"
-                        "    -h            Displays this\n"));
+    "\n"
+    "Usage: tao_imr [options] remove <name>\n"
+    "  where [options] are ORB options\n"
+    "  where <name> is the POA name used by the server object\n"
+    "  -h Displays this\n"));
 }
 
 int
@@ -544,30 +550,29 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-    {
-      this->print_usage ();
-      return -1;
-    }
+  {
+    this->print_usage ();
+    return -1;
+  }
 
   // Skip both the program name and the "remove" command
-  ACE_Get_Opt get_opts (argc, argv, "l:h");
+  ACE_Get_Opt get_opts (argc, argv, "h");
 
   this->server_name_ = argv[1];
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
-      {
-      case 'l': 
-        this->activator_ = get_opts.optarg;
-        break;
-      case 'h': 
-      default:
-        this->print_usage ();
-        return -1;
-      }
+  {
+    case 'h':
+      this->print_usage ();
+      return -1;
+    default:
+      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+      this->print_usage ();
+      return -1;
+  }
 
-  // Success
   return 0;
 }
 
@@ -575,13 +580,11 @@ void
 TAO_IMR_Op_Shutdown::print_usage (void)
 {
   ACE_ERROR ((LM_ERROR, "Shuts down a server\n"
-                        "\n"
-                        "Usage: tao_imr [options] shutdown <name> [command-arguments]\n"
-                        "  where [options] are ORB options\n"
-                        "  where <name> is the POA name used by the server object\n"
-                        "  where [command-arguments] can be\n"
-                        "    -l            Activator name.\n"
-                        "    -h            Displays this\n"));
+    "\n"
+    "Usage: tao_imr [options] shutdown <name>\n"
+    "  where [options] are ORB options\n"
+    "  where <name> is the name of the server object\n"
+    "  -h Displays this\n"));
 }
 
 int
@@ -589,94 +592,64 @@ TAO_IMR_Op_Shutdown::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-    {
-      this->print_usage ();
-      return -1;
-    }
+  {
+    this->print_usage ();
+    return -1;
+  }
 
   // Skip both the program name and the "shutdown" command
-  ACE_Get_Opt get_opts (argc, argv, "l:h");
+  ACE_Get_Opt get_opts (argc, argv, "h");
 
   this->server_name_ = argv[1];
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
-      {
-      case 'l':
-        this->activator_ = get_opts.optarg;
-        break;
-      case 'h': 
-      default:
-        this->print_usage ();
-        return -1;
-      }
-
-  // Success
-  return 0;
-}
-
-void
-TAO_IMR_Op_Shutdown_Repo::print_usage (void)
-{
-  ACE_ERROR ((LM_ERROR, "Shuts down the Implementation Repository\n"
- 	                "\n"
- 	                "Usage: tao_imr [options] shutdown-repo [command-arguments]\n"
- 	                "  where [options] are ORB options\n"
- 	                "  where [command-arguments] can be\n"
- 	                "    -h            Displays this\n"));
-}
-
-int
-TAO_IMR_Op_Shutdown_Repo::parse (int argc, ACE_TCHAR **argv)
-{
-  // Skip both the program name and the "shutdown" command
-  ACE_Get_Opt get_opts (argc, argv, "h");
-  int c;
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-        case 'h':  // display help
-        default:
-          this->print_usage ();
-        return -1;
-      }
+  {
+    case 'h':
+      this->print_usage ();
+      return -1;
+    default:
+      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+      this->print_usage ();
+      return -1;
+  }
 
-  // Success
   return 0;
 }
 
 void
-TAO_IMR_Op_Update::setenv (ACE_TCHAR *opt)
+TAO_IMR_Op_Update::addenv (ACE_TCHAR *opt)
 {
-   this->set_environment_vars_ = 1;
-   CORBA::ULong length = this->environment_vars_.length ();
-   // Increase the length of the sequence
-   this->environment_vars_.length (length + 1);
-   ACE_CString tokens (opt);
-   int index = tokens.find ("=");
-   // Insert at position length since that is our new element
-   this->environment_vars_ [length].name =
-         CORBA::string_dup (tokens.substr (0, index).c_str ());
-   this->environment_vars_ [length].value =
-         CORBA::string_dup (tokens.substr (index + 1).c_str ());
+  CORBA::ULong length = this->environment_vars_.length ();
+  // Increase the length of the sequence
+  this->environment_vars_.length (length + 1);
+  ACE_CString tokens (opt);
+  int index = tokens.find ("=");
+  // Insert at position length since that is our new element
+  this->environment_vars_ [length].name =
+    CORBA::string_dup (tokens.substr (0, index).c_str ());
+  this->environment_vars_ [length].value =
+    CORBA::string_dup (tokens.substr (index + 1).c_str ());
 }
 
 void
 TAO_IMR_Op_Update::print_usage (void)
 {
-  ACE_ERROR ((LM_ERROR, "Updates a server entry\n"
-                        "\n"
-                        "Usage: tao_imr [options] update <name> [command-arguments]\n"
-                        "  where [options] are ORB options\n"
-                        "  where <name> is the POA name used by the server object\n"
-                        "  where [command-arguments] can be\n"
-                        "    -l            Activator name.\n"
-                        "    -h            Displays this\n"
-                        "    -c command    Startup command\n"
-                        "    -w dir        Working directory\n"
-                        "    -e vars       Set environment variables\n"
-                        "    -a mode       Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n"));
+  ACE_ERROR ((LM_ERROR,
+    "Updates a server entry\n"
+    "\n"
+    "Usage: tao_imr [options] update <name> [command-arguments]\n"
+    "  where [options] are ORB options\n"
+    "  where <name> is the POA name used by the server object\n"
+    "  where [command-arguments] can be\n"
+    "    -h            Displays this\n"
+    "    -l            Activator name.\n"
+    "    -c command    Startup command\n"
+    "    -w dir        Working directory\n"
+    "    -e name=value Set environment variables\n"
+    "    -a mode       Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n"
+    "    -r count      Set the startup/ping retry count to count\n"));
 }
 
 int
@@ -684,55 +657,70 @@ TAO_IMR_Op_Update::parse (int argc, ACE_TCHAR **argv)
 {
   // Check for enough arguments (we need at least one for the server name)
   if (argc < 2)
-    {
-      this->print_usage ();
-      return -1;
-    }
+  {
+    ACE_ERROR((LM_ERROR, "Error: Must supply at least a server name.\n"));
+    this->print_usage ();
+    return -1;
+  }
 
   // Skip both the program name and the "update" command
-  ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:l:");
+  ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:r:R:l:");
 
   this->server_name_ = argv[1];
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
+  {
+    case 'c':  // Command line arguments
+      this->set_command_line_ = true;
+      this->command_line_ = get_opts.opt_arg ();
+      break;
+    case 'e':  // set environment variables
+      this->set_environment_vars_ = true;
+      this->addenv( get_opts.opt_arg () );
+      break;
+    case 'w':  // Working Directory
+      this->set_working_dir_ = true;
+      this->working_dir_ = get_opts.opt_arg ();
+      break;
+    case 'a':  // Activation Mode
+      this->set_activation_ = true;
+      if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0)
+        this->activation_ = ImplementationRepository::NORMAL;
+      else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0)
+        this->activation_ = ImplementationRepository::MANUAL;
+      else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0)
+        this->activation_ = ImplementationRepository::PER_CLIENT;
+      else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "AUTO_START") == 0)
+        this->activation_ = ImplementationRepository::AUTO_START;
+      else
+        ACE_ERROR_RETURN ((LM_ERROR,
+        "Unknown Activation Mode <%s>!\n",
+        get_opts.opt_arg ()),
+        -1);
+      break;
+    case 'r':
+    case 'R':   // startup/ping Retry Count
       {
-      case 'c':  // Command line arguments
-        this->set_command_line_ = 1;
-        this->command_line_ = get_opts.opt_arg ();
-        break;
-      case 'e':  // set environment variables
-        this->setenv( get_opts.opt_arg () );
-        break;
-      case 'w':  // Working Directory
-        this->set_working_dir_ = 1;
-        this->working_dir_ = get_opts.opt_arg ();
-        break;
-      case 'a':  // Activation Mode
-        this->set_activation_ = 1;
-        if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0)
-          this->activation_ = ImplementationRepository::NORMAL;
-        else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0)
-          this->activation_ = ImplementationRepository::MANUAL;
-        else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0)
-          this->activation_ = ImplementationRepository::PER_CLIENT;
-        else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "AUTO_START") == 0)
-          this->activation_ = ImplementationRepository::AUTO_START;
-        else
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unknown Activation Mode <%s>!\n",
-                             get_opts.opt_arg ()),
-                            -1);
-        break;
-      case 'l':
-        this->activator_ = get_opts.optarg;
-        break;
-      case 'h':  // display help
-      default:
-        this->print_usage ();
-        return -1;
+        this->set_retry_count_ = true;
+        int rc = ACE_OS::atoi(get_opts.optarg);
+        if (rc > 0)
+          this->retry_count_ = rc;
       }
+      break;
+    case 'l': /// hostname of the activator
+      this->activator_ = get_opts.optarg;
+      this->set_activator_ = true;
+      break;
+    case 'h':  // display help
+      this->print_usage ();
+      return -1;
+    default:
+      ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+      this->print_usage ();
+      return -1;
+  }
 
   return 0;
 }
@@ -745,53 +733,47 @@ TAO_IMR_Op_Update::parse (int argc, ACE_TCHAR **argv)
 int
 TAO_IMR_Op_Activate::run (void)
 {
+  ACE_ASSERT(! CORBA::is_nil(imr_));
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      if (this->activator_.length() == 0)
-        {
-          this->imr_locator_->activate_server (this->server_name_.c_str ()
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          this->imr_locator_->activate_server_in_activator (
-                this->server_name_.c_str (),
-                this->activator_.c_str ()
-                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_DEBUG ((LM_DEBUG,
-                  "Successfully Activated server <%s>\n",
-                  this->server_name_.c_str ()));
-    }
+  {
+    this->imr_->activate_server (this->server_name_.c_str() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_DEBUG ((LM_DEBUG,
+      "Successfully Activated server <%s>\n",
+      this->server_name_.c_str ()));
+  }
   ACE_CATCH (ImplementationRepository::CannotActivate, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Cannot activate server <%s>, reason: <%s>\n",
-                            this->server_name_.c_str (),
-                            ex.reason.in ()));
-      return TAO_IMR_Op::CANNOT_ACTIVATE;
-    }
+  {
+    ACE_ERROR ((LM_ERROR, "Cannot activate server <%s>, reason: <%s>\n",
+      this->server_name_.c_str (),
+      ex.reason.in ()));
+    return TAO_IMR_Op::CANNOT_ACTIVATE;
+  }
   ACE_CATCH (ImplementationRepository::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
-      return TAO_IMR_Op::NOT_FOUND;
-    }
+  {
+    ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
+    return TAO_IMR_Op::NOT_FOUND;
+  }
+  ACE_CATCH (PortableServer::ForwardRequest, ex)
+  {
+    ACE_RE_THROW;
+  }
   ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Activating Server");
-      return TAO_IMR_Op::UNKNOWN;
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Activating Server");
+    return TAO_IMR_Op::UNKNOWN;
+  }
   ACE_ENDTRY;
 
-  // Success
   return TAO_IMR_Op::NORMAL;
 }
 
 int
 TAO_IMR_Op_Add::run (void)
 {
+  ACE_ASSERT(! CORBA::is_nil(imr_));
+
   ImplementationRepository::StartupOptions startup_options;
 
   startup_options.command_line =
@@ -801,128 +783,102 @@ TAO_IMR_Op_Add::run (void)
   startup_options.working_directory =
     CORBA::string_dup (this->working_dir_.c_str ());
   startup_options.activation = this->activation_;
+  startup_options.start_limit = this->retry_count_ + 1;
 
   if (this->activator_.length() != 0)
-    {
-      startup_options.activator = CORBA::string_dup (this->activator_.c_str ());
-    }
+  {
+    startup_options.activator = CORBA::string_dup (this->activator_.c_str ());
+  }
   else
-    {
-      // else use the hostname on which tao_imr is run
-      char host_name[MAXHOSTNAMELEN + 1];
-      ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
-      startup_options.activator = CORBA::string_dup (host_name);
-    }
+  {
+    // else use the hostname on which tao_imr is run
+    char host_name[MAXHOSTNAMELEN + 1];
+    ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
+    startup_options.activator = CORBA::string_dup (host_name);
+  }
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      this->imr_locator_->register_server (this->server_name_.c_str (), 
-        startup_options ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  {
+    this->imr_->register_server (this->server_name_.c_str (),
+      startup_options ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "Successfully registered server <%s>\n",
-                  this->server_name_.c_str ()));
-    }
+    ACE_DEBUG ((LM_DEBUG,
+      "Successfully registered server <%s>\n",
+      this->server_name_.c_str ()));
+  }
   ACE_CATCH (ImplementationRepository::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Could not register server <%s>. Activator <%s> not found!\n",
-                  this->server_name_.c_str (),
-                  this->activator_.c_str()
-                  ));
-      return TAO_IMR_Op::ALREADY_REGISTERED;
-    }
+  {
+    ACE_ERROR ((LM_ERROR,
+      "Could not register server <%s>. Activator <%s> not found!\n",
+      this->server_name_.c_str (),
+      this->activator_.c_str()
+      ));
+    return TAO_IMR_Op::ALREADY_REGISTERED;
+  }
   ACE_CATCH (ImplementationRepository::AlreadyRegistered, ex)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Server <%s> already registered!\n",
-                  this->server_name_.c_str ()));
-      return TAO_IMR_Op::ALREADY_REGISTERED;
-    }
+  {
+    ACE_ERROR ((LM_ERROR,
+      "Server <%s> already registered!\n",
+      this->server_name_.c_str ()));
+    return TAO_IMR_Op::ALREADY_REGISTERED;
+  }
   ACE_CATCH (CORBA::NO_PERMISSION, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
-      return TAO_IMR_Op::NO_PERMISSION;
-    }
+  {
+    ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
+    return TAO_IMR_Op::NO_PERMISSION;
+  }
   ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Adding server");
-      return TAO_IMR_Op::UNKNOWN;
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Adding server");
+    return TAO_IMR_Op::UNKNOWN;
+  }
   ACE_ENDTRY;
 
-  // Success
   return TAO_IMR_Op::NORMAL;
 }
 
 int
 TAO_IMR_Op_Autostart::run (void)
 {
+  ACE_ASSERT(! CORBA::is_nil(imr_));
+
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      this->imr_locator_->list (0,
-                                server_list,
-                                server_iter
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  {
+    this->imr_->list (0,
+      server_list,
+      server_iter
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // Check for more to be displayed
-      if (!CORBA::is_nil (server_iter.in ()))
-        {
-          int flag = 1;
-
-          while (flag)
-            {
-              server_iter->next_n (IR_LIST_CHUNK,
-                                   server_list
-                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              CORBA::ULong list_length = server_list->length ();
-              if (list_length > 0)
-                {
-                  for (CORBA::ULong i = 0; i < list_length; i++)
-                    {
-                      ACE_TRY_EX (inside)
-                        {
-                          this->imr_locator_->activate_server_in_activator (
-                                server_list[i].server.in (),
-                                server_list[i].startup.activator.in()
-                                ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (inside);
-                        }
-                      ACE_CATCHANY
-                        {
-                          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                               server_list[i].server.in ());
-                          // Ignore exception
-                        }
-                      ACE_ENDTRY;
-                    }
-                }
-              else
-                {
-                  flag = 0;
-                }
-            }
-
-          // We are done with the iterator, so it can go away now.
-          server_iter->destroy ();
-        } else {
-          ACE_DEBUG((LM_DEBUG, "There were no servers to start.\n"));
-        }
-    }
-  ACE_CATCHANY
+    ACE_ASSERT(CORBA::is_nil(server_iter.in()));
+
+    CORBA::ULong len = server_list->length ();
+    for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "autostart");
-      return TAO_IMR_Op::UNKNOWN;
+      ACE_TRY_EX (inside)
+      {
+        this->imr_->activate_server(server_list[i].server.in() ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK_EX (inside);
+      }
+      ACE_CATCHANY
+      {
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, server_list[i].server.in ());
+        // Ignore exception
+      }
+      ACE_ENDTRY;
     }
+  }
+  ACE_CATCHANY
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "autostart");
+    return TAO_IMR_Op::UNKNOWN;
+  }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -931,78 +887,79 @@ TAO_IMR_Op_Autostart::run (void)
 int
 TAO_IMR_Op_IOR::run (void)
 {
-  // Todo : Most of this logic duplicates that in the POA.cpp 
+  ACE_ASSERT(! CORBA::is_nil(imr_));
+
+  // Create a corbaloc string
+  // Todo : Most of this logic duplicates that in the POA.cpp
   ACE_TRY_NEW_ENV
+  {
+    if (CORBA::is_nil (this->imr_)
+      || !this->imr_->_stubobj ()
+      || !this->imr_->_stubobj ()->profile_in_use ())
     {
-      if (CORBA::is_nil (this->imr_locator_)
-          || !this->imr_locator_->_stubobj ()
-          || !this->imr_locator_->_stubobj ()->profile_in_use ())
-        {
-          ACE_ERROR_RETURN ((
-              LM_ERROR,
-              ACE_TEXT ("Invalid ImR Locator IOR\n")
-            ),
-            -1
-          );
-        }
-
-      CORBA::String_var imr_str =
-        this->imr_locator_->_stubobj ()->
-        profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ACE_ERROR_RETURN ((
+        LM_ERROR,
+        ACE_TEXT ("Invalid ImR Locator IOR\n")
+        ), -1);
+    }
 
-      // Search for "corbaloc:" alone, without the protocol.  This code
-      // should be protocol neutral.
-      const char corbaloc[] = "corbaloc:";
-      char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc);
+    CORBA::String_var imr_str =
+      this->imr_->_stubobj ()->
+      profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      if (pos == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Could not parse IMR IOR\n"),
-                          -1);
+    // Search for "corbaloc:" alone, without the protocol.  This code
+    // should be protocol neutral.
+    const char corbaloc[] = "corbaloc:";
+    char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc);
+
+    if (pos == 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR\n"), -1);
+    }
+    else
+    {
+      pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
+      pos = ACE_OS::strchr (pos + 1,
+        this->imr_->_stubobj ()->profile_in_use ()->object_key_delimiter ());
+
+      if (pos)
+      {
+        *(pos + 1) = 0;  // Crop the string
+      }
       else
-        {
-          pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
-          pos = ACE_OS::strchr (pos + 1,
-                                this->imr_locator_->_stubobj ()->profile_in_use ()->object_key_delimiter ());
-
-          if (pos)
-            *(pos + 1) = 0;  // Crop the string
-          else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Could not parse IMR IOR\n"),
-                              -1);
-        }
-      ACE_CString ior (imr_str.in ());
-
-      // Add the key
-      ior += this->server_name_;
-
-      ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ()));
-
-      if (this->filename_.length () > 0)
-        {
-          FILE *file = ACE_OS::fopen (this->filename_.c_str (), "w");
-
-          if (file == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Error: Unable to open %s for writing: %p\n",
-                                 this->filename_.c_str ()),
-                                -1);
-            }
-
-          ACE_OS::fprintf (file,
-                           "%s",
-                           ior.c_str ());
-          ACE_OS::fclose (file);
-        }
+      {
+        ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR\n"), -1);
+      }
     }
-  ACE_CATCHANY
+    ACE_CString ior (imr_str.in ());
+
+    // Add the key
+    ior += this->server_name_;
+
+    ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ()));
+
+    if (this->filename_.length () > 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Ior");
-      return TAO_IMR_Op::UNKNOWN;
+      FILE *file = ACE_OS::fopen (this->filename_.c_str (), "w");
+
+      if (file == 0)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+          "Error: Unable to open %s for writing: %p\n",
+          this->filename_.c_str ()),
+          -1);
+      }
+
+      ACE_OS::fprintf (file, "%s", ior.c_str ());
+      ACE_OS::fclose (file);
     }
+  }
+  ACE_CATCHANY
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "IOR");
+    return TAO_IMR_Op::UNKNOWN;
+  }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -1011,81 +968,57 @@ TAO_IMR_Op_IOR::run (void)
 int
 TAO_IMR_Op_List::run (void)
 {
+  ACE_ASSERT(! CORBA::is_nil(imr_));
+
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
+  {
+    // If there is a server name, list only that server.  Otherwise, look
+    // at all of them.
+    if (this->server_name_.length () == 0)
     {
-      // If there is a server name, list only that server.  Otherwise, look
-      // at all of them.
-      if (this->server_name_.length () == 0)
-        {
-          this->imr_locator_->list (IR_LIST_CHUNK,
-                                    server_list.out(),
-                                    server_iter.out()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (server_list->length() == 0)
-          {
-            ACE_DEBUG((LM_DEBUG, "No servers found.\n"));
-            return TAO_IMR_Op::NORMAL;
-          }
-
-          for (CORBA::ULong i = 0; i < server_list->length (); i++)
-            this->display_server_information (server_list[i]);
-
-          // Check for more to be displayed
-          if (!CORBA::is_nil (server_iter.in ()))
-            {
-              int flag = 1;
-
-              while (flag)
-                {
-                  server_iter->next_n (IR_LIST_CHUNK,
-                                       server_list
-                                       ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-
-                  CORBA::ULong list_length = server_list->length ();
-                  if (list_length > 0)
-                    {
-                      for (CORBA::ULong i = 0; i < list_length; i++)
-                        this->display_server_information (server_list[i]);
-                    }
-                  else
-                   {
-                     flag = 0;
-                   }
-                }
-
-              // We are done with the iterator, so it can go away now.
-              server_iter->destroy ();
-            }
-        }
-      else
-        {
-          ImplementationRepository::ServerInformation_var server_information;
+      this->imr_->list (0,
+        server_list.out(),
+        server_iter.out()
+        ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-          this->imr_locator_->find (this->server_name_.c_str (), server_information ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      if (server_list->length() == 0)
+      {
+        ACE_DEBUG((LM_DEBUG, "No servers found.\n"));
+        return TAO_IMR_Op::NORMAL;
+      }
 
-          this->verbose_server_information_ = 1;
+      for (CORBA::ULong i = 0; i < server_list->length (); i++)
+        this->display_server_information (server_list[i]);
 
-          this->display_server_information (server_information.in ());
-        }
+      ACE_ASSERT (CORBA::is_nil (server_iter.in ()));
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+    else
     {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
-      return TAO_IMR_Op::NOT_FOUND;
+      ImplementationRepository::ServerInformation_var si;
+
+      this->imr_->find (this->server_name_.c_str (), si ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      this->verbose_server_information_ = 1;
+
+      this->display_server_information (si.in ());
     }
+  }
+  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  {
+    ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
+    return TAO_IMR_Op::NOT_FOUND;
+  }
   ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "List");
-      return TAO_IMR_Op::UNKNOWN;
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "List");
+    return TAO_IMR_Op::UNKNOWN;
+  }
   ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -1094,180 +1027,123 @@ TAO_IMR_Op_List::run (void)
 int
 TAO_IMR_Op_Remove::run (void)
 {
+  ACE_ASSERT(! CORBA::is_nil(imr_));
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      if (this->activator_.length() == 0)
-        {
-          this->imr_locator_->remove_server (this->server_name_.c_str ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          this->imr_locator_->remove_server_in_activator (
-              this->server_name_.c_str (),
-              this->activator_.c_str ()
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Successfully removed server <%s>\n",
-                  this->server_name_.c_str ()));
-    }
+  {
+    this->imr_->remove_server (this->server_name_.c_str() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n",
+      this->server_name_.c_str ()));
+  }
   ACE_CATCH (ImplementationRepository::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n",
-                  this->server_name_.c_str ()));
-      return TAO_IMR_Op::NOT_FOUND;
-    }
+  {
+    ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n",
+      this->server_name_.c_str ()));
+    return TAO_IMR_Op::NOT_FOUND;
+  }
   ACE_CATCH (CORBA::NO_PERMISSION, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
-      return TAO_IMR_Op::NO_PERMISSION;
-    }
+  {
+    ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
+    return TAO_IMR_Op::NO_PERMISSION;
+  }
   ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Removing Server");
-      return TAO_IMR_Op::UNKNOWN;
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Removing Server");
+    return TAO_IMR_Op::UNKNOWN;
+  }
   ACE_ENDTRY;
 
-  // Success
   return TAO_IMR_Op::NORMAL;
 }
 
 int
 TAO_IMR_Op_Shutdown::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      if (this->activator_.length() == 0)
-        {
-          this->imr_locator_->shutdown_server (this->server_name_.c_str ()
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          this->imr_locator_->shutdown_server_in_activator (
-                this->server_name_.c_str (),
-                this->activator_.c_str ()
-                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Successfully shut down server <%s>\n",
-                  this->server_name_.c_str ()));
-    }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
-      return TAO_IMR_Op::NOT_FOUND;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Server");
-      return TAO_IMR_Op::UNKNOWN;
-    }
-  ACE_ENDTRY;
+  ACE_ASSERT(! CORBA::is_nil(imr_));
 
-  // Success
-  return TAO_IMR_Op::NORMAL;
-}
-
-int
-TAO_IMR_Op_Shutdown_Repo::run (void)
-{
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      this->imr_locator_->shutdown_repo( ACE_ENV_SINGLE_ARG_PARAMETER ) ;
-      ACE_TRY_CHECK;
+  {
+    this->imr_->shutdown_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      ACE_DEBUG((LM_DEBUG,
- 	        "Successfully shut down Implementation Repository\n"));
-    }
+    ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n",
+      this->server_name_.c_str ()));
+  }
+  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  {
+    ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
+    return TAO_IMR_Op::NOT_FOUND;
+  }
   ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Repository");
-      return UNKNOWN;
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Server");
+    return TAO_IMR_Op::UNKNOWN;
+  }
   ACE_ENDTRY;
 
- // Success
- return NORMAL;
+  return TAO_IMR_Op::NORMAL;
 }
 
 int
 TAO_IMR_Op_Update::run (void)
 {
+  ACE_ASSERT(! CORBA::is_nil(imr_));
+
   ImplementationRepository::ServerInformation_var server_information;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      if (this->activator_.length() == 0) {
-        this->imr_locator_->find(this->server_name_.c_str (),
-                                  server_information.out() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      } else {
-        this->imr_locator_->find_in_activator (this->server_name_.c_str (), 
-                                  this->activator_.c_str(),
-                                  server_information.out() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
+  {
+    this->imr_->find(this->server_name_.c_str (),
+      server_information.out() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // Conditionally update the startup options
-      if (this->set_command_line_ == 1)
-        server_information->startup.command_line =
-          CORBA::string_dup (this->command_line_.c_str ());
+    // Conditionally update the startup options
+    if (this->set_command_line_)
+      server_information->startup.command_line =
+      CORBA::string_dup (this->command_line_.c_str ());
 
-      if (this->set_environment_vars_ == 1)
-        server_information->startup.environment = this->environment_vars_;
+    if (this->set_environment_vars_)
+      server_information->startup.environment = this->environment_vars_;
 
-      if (this->set_working_dir_ == 1)
-        server_information->startup.working_directory =
-          CORBA::string_dup (this->working_dir_.c_str ());
+    if (this->set_working_dir_)
+      server_information->startup.working_directory = CORBA::string_dup (this->working_dir_.c_str ());
 
-      if (this->set_activation_ == 1)
-        server_information->startup.activation = this->activation_;
+    if (this->set_activation_)
+      server_information->startup.activation = this->activation_;
 
-      // @@ Add logical server support here also
-      this->imr_locator_->reregister_server (this->server_name_.c_str (),
-                                             server_information->startup
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    if (this->set_retry_count_)
+      server_information->startup.start_limit = this->retry_count_ + 1;
 
-      // Now that we've reregistered the server, update the server
-      // information before we display it.
-      this->imr_locator_->find(this->server_name_.c_str (),
-                                server_information.out() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    if (this->set_activator_)
+      server_information->startup.activator = CORBA::string_dup(this->activator_.c_str());
 
-      this->display_server_information (server_information.in ());
-    }
+    this->imr_->reregister_server (this->server_name_.c_str (),
+      server_information->startup
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  }
   ACE_CATCH (ImplementationRepository::NotFound, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>\n", this->server_name_.c_str ()));
-      return TAO_IMR_Op::NOT_FOUND;
-    }
+  {
+    ACE_ERROR ((LM_ERROR, "Could not find server <%s>\n", this->server_name_.c_str ()));
+    return TAO_IMR_Op::NOT_FOUND;
+  }
   ACE_CATCH (CORBA::NO_PERMISSION, ex)
-    {
-      ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
-      return TAO_IMR_Op::NO_PERMISSION;
-    }
+  {
+    ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
+    return TAO_IMR_Op::NO_PERMISSION;
+  }
   ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Updating server");
-      return TAO_IMR_Op::UNKNOWN;
-    }
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Updating server");
+    return TAO_IMR_Op::UNKNOWN;
+  }
   ACE_ENDTRY;
 
-  // Success
   return TAO_IMR_Op::NORMAL;
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
index 51ebd996029..10573eeda31 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
@@ -15,9 +15,10 @@
 #ifndef TAO_IMR_I_H
 #define TAO_IMR_I_H
 
-#include "tao/PortableServer/ImR_LocatorC.h"
+#include "tao/PortableServer/ImplRepoC.h"
 #include "tao/corba.h"
 #include "ace/SString.h"
+#include "ace/Auto_Ptr.h"
 
 // Forward Declaration
 class TAO_IMR_Op;
@@ -61,10 +62,10 @@ private:
 
   /// Reference to our Locator interface of
   /// implementation repository.
-  ImplementationRepository::Locator_var imr_locator_;
+  ImplementationRepository::Administration_var imr_;
 
   /// What we need to do.
-  TAO_IMR_Op *op_;
+  ACE_Auto_Ptr<TAO_IMR_Op> op_;
 };
 
 
@@ -100,11 +101,11 @@ public:
   virtual int run (void) = 0;
 
   /// Sets the implrepo locator pointer
-  void set_imr_locator (ImplementationRepository::Locator_ptr imr);
+  void set_imr (ImplementationRepository::Administration_ptr imr);
 
 protected:
   /// Reference to our implementation repository.
-  ImplementationRepository::Locator_ptr imr_locator_;
+  ImplementationRepository::Administration_ptr imr_;
 
   // = Helper methods
 
@@ -132,9 +133,6 @@ protected:
 
   /// POA server name.
   ACE_CString server_name_;
-
-  /// The name of the activator 
-  ACE_CString activator_;
 };
 
 
@@ -155,7 +153,7 @@ public:
 
 protected:
   /// Sets one of the environment variables
-  void setenv (ACE_TCHAR *opt);
+  void addenv (ACE_TCHAR *opt);
 
   /// Prints a message about the usage.
   void print_usage (void);
@@ -177,6 +175,9 @@ protected:
 
   /// Hostname where the activator is running.
   ACE_CString activator_;
+
+  /// startup/ping Retry Count
+  int retry_count_;
 };
 
 
@@ -275,11 +276,7 @@ protected:
   /// Prints a message about the usage
   void print_usage (void);
 
-  /// POA server name.
   ACE_CString server_name_;
-
-  /// Hostname where the activator is running.
-  ACE_CString activator_;
 };
 
 
@@ -300,29 +297,9 @@ protected:
   /// Prints a message about the usage
   void print_usage (void);
 
-  /// POA server name.
   ACE_CString server_name_;
-
-  ACE_CString activator_;
 };
 
-/**
- * @class TAO_IMR_Op_Shutdown_Repo
- *
- * @brief Shutdown the repository
- *
- * Shutdown_repo is used to shutdown the repository via an IDL operation.
- */
-class TAO_IMR_Op_Shutdown_Repo : public TAO_IMR_Op
-{
-public:
-  virtual int parse (int argc, ACE_TCHAR **argv);
-  virtual int run (void);
-
-protected:
-  /// Prints a message about the usage
-  void print_usage (void);
-};
 
 /**
  * @class TAO_IMR_Op_Update
@@ -342,7 +319,7 @@ public:
 
 protected:
   /// Sets one environment variable.
-  void setenv (ACE_TCHAR *opt);
+  void addenv (ACE_TCHAR *opt);
 
   /// Prints a message about the usage.
   void print_usage (void);
@@ -350,34 +327,22 @@ protected:
   /// POA server name.
   ACE_CString server_name_;
 
-  /// True if the command_line_ needs to be updated.
-  int set_command_line_;
-
-  /// Startup command.
+  bool set_command_line_;
   ACE_CString command_line_;
 
-  /// True if the environment_vars_ needs to be updated.
-  int set_environment_vars_;
-
-  /// True if the working_dir_ needs to be updated.
-  int set_working_dir_;
-
-  /// Environment Variables.
+  bool set_environment_vars_;
   ImplementationRepository::EnvironmentList environment_vars_;
 
-  /// Working directory.
+  bool set_working_dir_;
   ACE_CString working_dir_;
 
-  /// True if the activation mode needs to be updated.
-  int set_activation_;
-
-  /// Activation mode (0 = NORMAL, 1 = MANUAL, 2 = PER_CLIENT, 3 = AUTO_START)
+  bool set_activation_;
   ImplementationRepository::ActivationMode activation_;
 
-  /// True if the location mode needs to be updated.
-  int set_location_;
+  bool set_retry_count_;
+  int retry_count_;
 
-  /// Hostname where the activator is running.
+  bool set_activator_;
   ACE_CString activator_;
 };
 
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index c1976869d18..f501af2db29 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -89,7 +89,7 @@ extern "C"
 void *
 TAO_LB_run_load_manager (void * orb_arg)
 {
-  CORBA::ORB_ptr orb = ACE_static_cast (CORBA::ORB_ptr, orb_arg);
+  CORBA::ORB_ptr orb = static_cast<CORBA::ORB_ptr> (orb_arg);
 
   // Only the main thread should handle signals.
   //
@@ -108,10 +108,10 @@ TAO_LB_run_load_manager (void * orb_arg)
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "TAO Load Manager");
 
-      return ACE_reinterpret_cast (void *, -1);
+      return reinterpret_cast<void *> (-1);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (ACE_reinterpret_cast (void *, -1));
+  ACE_CHECK_RETURN (reinterpret_cast<void *> (-1));
 
   return 0;
 }
@@ -277,6 +277,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       //    exception.
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
+
+      // Wait for the signal handler thread to finish
+      // before the process exits.
+      signal_handler.wait ();
 #endif  /* linux && ACE_HAS_THREADS */
 
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index f358baac632..b0bb0a36701 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -6,6 +6,7 @@
 
 #include "tao/ORB_Core.h"
 
+#include "ace/Reactor.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_strings.h"
@@ -111,7 +112,7 @@ extern "C"
 void *
 TAO_LB_run_load_monitor (void * orb_arg)
 {
-  CORBA::ORB_ptr orb = ACE_static_cast (CORBA::ORB_ptr, orb_arg);
+  CORBA::ORB_ptr orb = static_cast<CORBA::ORB_ptr> (orb_arg);
 
   // Only the main thread should handle signals.
   //
@@ -130,10 +131,10 @@ TAO_LB_run_load_monitor (void * orb_arg)
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "TAO Load Monitor");
 
-      return ACE_reinterpret_cast (void *, -1);
+      return reinterpret_cast<void *> (-1);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (ACE_reinterpret_cast (void *, -1));
+  ACE_CHECK_RETURN (reinterpret_cast<void *> (-1));
 
   return 0;
 }
@@ -385,6 +386,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       //    exception.
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
+
+      // Wait for the signal handler thread to finish
+      // before the process exits.
+      signal_handler.wait ();
 #endif  /* linux && ACE_HAS_THREADS */
 
       if (timer_id != -1 && reactor->cancel_timer (timer_id) == 0)
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index 84e7dac2baf..783b9024ebf 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -2,6 +2,8 @@
 #include "ace/Get_Opt.h"
 #include "orbsvcs/Log/BasicLogFactory_i.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (Basic_Logging_Service,
            Basic_Logging_Service,
@@ -9,7 +11,10 @@ ACE_RCSID (Basic_Logging_Service,
 
 
 Basic_Logging_Service::Basic_Logging_Service (void)
-  : basic_log_factory_name_ ("BasicLogFactory")
+  : service_name_ ("BasicLogFactory"),
+    ior_file_name_ (0),
+    pid_file_name_ (0),
+    bind_to_naming_service_ (1)
 {
   // No-Op.
 }
@@ -48,6 +53,49 @@ Basic_Logging_Service::init_ORB  (int& argc, char *argv []
 }
 
 int
+Basic_Logging_Service::parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:o:p:x"));
+  int opt;
+  
+  while ((opt = get_opt ()) != EOF)
+    {
+      switch (opt)
+    	{
+	case 'n':
+	  service_name_ = get_opt.opt_arg();
+	  break;
+		
+	case 'o':
+	  ior_file_name_ = get_opt.opt_arg();
+	  break;
+
+	case 'p':
+	  pid_file_name_ = get_opt.opt_arg();
+	  break;
+	  
+	case 'x':
+	  bind_to_naming_service_ = 0;
+	  break;
+
+	case '?':
+	default:
+	  ACE_DEBUG ((LM_DEBUG,
+		      "Usage: %s "
+                      "-n service_name "
+                      "-o ior_file_name "
+                      "-p pid_file_name "
+		      "-x [disable naming service bind] "
+		      "\n",
+		      argv[0]));
+	  return -1;
+	}
+    }
+
+  return 0;
+}
+
+int
 Basic_Logging_Service::startup (int argc, char *argv[]
                           ACE_ENV_ARG_DECL)
 {
@@ -59,9 +107,8 @@ Basic_Logging_Service::startup (int argc, char *argv[]
                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  // Resolve the naming service.
-  this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  if (this->parse_args (argc, argv) == -1)
+    return -1;
 
   // Activate the basic log factory
   // CORBA::Object_var obj =
@@ -78,21 +125,55 @@ Basic_Logging_Service::startup (int argc, char *argv[]
   ACE_DEBUG ((LM_DEBUG,
               "The Basic Log Factory IOR is <%s>\n", str.in ()));
 
-  // Register the Basic Log Factory.
-  ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
+  if (ior_file_name_ != 0)
+    {
+      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_LIB_TEXT("w"));
+      if (iorf == 0) {
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   "Cannot open output file for writing IOR: %s",
+			   ior_file_name_),
+			  -1);
+      }
+      
+      ACE_OS::fprintf (iorf, "%s\n", str.in ());
+      ACE_OS::fclose (iorf);
+    }
+
+  if (pid_file_name_ != 0)
+    {
+      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_LIB_TEXT("w"));
+      if (pidf != 0)
+	{
+	  ACE_OS::fprintf (pidf,
+			   "%ld\n",
+			   static_cast<long> (ACE_OS::getpid ()));
+	  ACE_OS::fclose (pidf);
+	}
+    }
+  
+  if (bind_to_naming_service_) 
+    {
+      // Resolve the naming service.
+      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
 
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (this->basic_log_factory_name_);
+      // Register the Basic Log Factory.
+      ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
 
-  this->naming_->rebind (name,
-                         obj.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+      CosNaming::Name name (1);
+      name.length (1);
+      name[0].id = CORBA::string_dup (this->service_name_);
+
+      this->naming_->rebind (name,
+			     obj.in ()
+			     ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+
+      ACE_DEBUG ((LM_DEBUG,
+		  "Registered with the naming service as: %s\n",
+		  this->service_name_));
+    }
 
-  ACE_DEBUG ((LM_DEBUG,
-              "Registered with the naming service as: %s\n",
-              this->basic_log_factory_name_));
   return 0;
 }
 
@@ -148,13 +229,16 @@ Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  // Unbind from the naming service.
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (this->basic_log_factory_name_);
+  if (bind_to_naming_service_) 
+    {
+      // Unbind from the naming service.
+      CosNaming::Name name (1);
+      name.length (1);
+      name[0].id = CORBA::string_dup (this->service_name_);
 
-  this->naming_->unbind (name
-                         ACE_ENV_ARG_PARAMETER);
+      this->naming_->unbind (name
+			     ACE_ENV_ARG_PARAMETER);
+    }
 
   // Shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
index d04d3d35c5b..7c488a1dd80 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
@@ -37,9 +37,6 @@ class Basic_Logging_Service
   virtual ~Basic_Logging_Service (void);
   // Destructor.
 
-  int parse_args (int argc, char *argv []);
-  // Parses the command line arguments.
-
   int startup (int argc, char *argv[]
                ACE_ENV_ARG_DECL);
   // Initializes the Telecom Log Service.
@@ -58,13 +55,13 @@ protected:
                  ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
+  int parse_args (int argc, char *argv []);
+  // Parses the command line arguments.
+
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Resolve the naming service.
 
   // = Data members
-  const char* basic_log_factory_name_;
-  // The Log Factory name.
-
   TAO_BasicLogFactory_i basic_log_factory_;
   // The Basic Log Factory.
 
@@ -77,5 +74,16 @@ protected:
   CosNaming::NamingContext_var naming_;
   // A naming context.
 
+  const char* service_name_;
+  // The name we use to bind with the NameService
+
+  const char* ior_file_name_;
+  // The name of the file were we output the Event_Service IOR.
+
+  const char* pid_file_name_;
+  // The name of a file where the process stores its pid
+
+  int bind_to_naming_service_;
+  // If true, bind to naming service
 };
 #endif /* BASIC_LOGGING_SERVICE_H */
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README
index 936c93a0c1d..aab3e4b715b 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README
@@ -9,4 +9,4 @@ To run the Basic Logging Service:
 2. execute the Basic_Logging_Service
    at $TAO_ROOT/orbsvcs/Logging_Service/BasicLogging_Service/Basic_Logging_Service
 
-The idl spec is $TAO_ROOT/orbsvcs/orbsvcs/DsLogAdmin.idl
\ No newline at end of file
+The idl spec is $TAO_ROOT/orbsvcs/orbsvcs/DsLogAdmin.idl
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index e804956eca5..5aefec86a75 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -3,6 +3,8 @@
 #include "orbsvcs/Log/EventLogFactory_i.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (Event_Logging_Service,
            Event_Logging_Service,
@@ -10,7 +12,10 @@ ACE_RCSID (Event_Logging_Service,
 
 
 Event_Logging_Service::Event_Logging_Service (void)
-  : event_log_factory_name_ ("EventLogFactory")
+  : service_name_ ("EventLogFactory"),
+    ior_file_name_ (0),
+    pid_file_name_ (0),
+    bind_to_naming_service_ (1)
 {
   // No-Op.
 }
@@ -49,6 +54,49 @@ Event_Logging_Service::init_ORB  (int& argc, char *argv []
 }
 
 int
+Event_Logging_Service::parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:o:p:x"));
+  int opt;
+  
+  while ((opt = get_opt ()) != EOF)
+    {
+      switch (opt)
+    	{
+	case 'n':
+	  service_name_ = get_opt.opt_arg();
+	  break;
+		
+	case 'o':
+	  ior_file_name_ = get_opt.opt_arg();
+	  break;
+
+	case 'p':
+	  pid_file_name_ = get_opt.opt_arg();
+	  break;
+	  
+	case 'x':
+	  bind_to_naming_service_ = 0;
+	  break;
+
+	case '?':
+	default:
+	  ACE_DEBUG ((LM_DEBUG,
+		      "Usage: %s "
+                      "-n service_name "
+                      "-o ior_file_name "
+                      "-p pid_file_name "
+		      "-x [disable naming service bind] "
+		      "\n",
+		      argv[0]));
+	  return -1;
+	}
+    }
+
+  return 0;
+}
+
+int
 Event_Logging_Service::startup (int argc, char *argv[]
                           ACE_ENV_ARG_DECL)
 {
@@ -60,9 +108,8 @@ Event_Logging_Service::startup (int argc, char *argv[]
                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  // Resolve the naming service.
-  this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  if (this->parse_args (argc, argv) == -1)
+    return -1;
 
   // Activate the event log factory
   // CORBA::Object_var obj =
@@ -79,21 +126,54 @@ Event_Logging_Service::startup (int argc, char *argv[]
   ACE_DEBUG ((LM_DEBUG,
               "The Event Log Factory IOR is <%s>\n", str.in ()));
 
-  // Register the Event Log Factory
-  ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
+  if (ior_file_name_ != 0)
+    {
+      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_LIB_TEXT("w"));
+      if (iorf == 0) {
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   "Cannot open output file for writing IOR: %s",
+			   ior_file_name_),
+			  -1);
+      }
+      
+      ACE_OS::fprintf (iorf, "%s\n", str.in ());
+      ACE_OS::fclose (iorf);
+    }
 
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (this->event_log_factory_name_);
+  if (pid_file_name_ != 0)
+    {
+      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_LIB_TEXT("w"));
+      if (pidf != 0)
+	{
+	  ACE_OS::fprintf (pidf,
+			   "%ld\n",
+			   static_cast<long> (ACE_OS::getpid ()));
+	  ACE_OS::fclose (pidf);
+	}
+    }
+  
+  if (bind_to_naming_service_) 
+    {
+      // Resolve the naming service.
+      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
 
-  this->naming_->rebind (name,
-                         obj.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+      // Register the Event Log Factory.
+      ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
 
-  ACE_DEBUG ((LM_DEBUG,
-              "Registered with the naming service as: %s\n",
-              this->event_log_factory_name_));
+      CosNaming::Name name (1);
+      name.length (1);
+      name[0].id = CORBA::string_dup (this->service_name_);
+
+      this->naming_->rebind (name,
+			     obj.in ()
+			     ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+
+      ACE_DEBUG ((LM_DEBUG,
+		  "Registered with the naming service as: %s\n",
+		  this->service_name_));
+    }
 
   return 0;
 }
@@ -150,13 +230,16 @@ Event_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  // Unbind from the naming service.
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (this->event_log_factory_name_);
+  if (bind_to_naming_service_)
+    {
+      // Unbind from the naming service.
+      CosNaming::Name name (1);
+      name.length (1);
+      name[0].id = CORBA::string_dup (this->service_name_);
 
-  this->naming_->unbind (name
-                         ACE_ENV_ARG_PARAMETER);
+      this->naming_->unbind (name
+			     ACE_ENV_ARG_PARAMETER);
+    }
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
index a5b383cfe45..ed459869d0c 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
@@ -38,9 +38,6 @@ class Event_Logging_Service
   virtual ~Event_Logging_Service (void);
   // Destructor.
 
-  int parse_args (int argc, char *argv []);
-  // Parses the command line arguments.
-
   int startup (int argc, char *argv[]
                ACE_ENV_ARG_DECL);
   // Initializes the Telecom EventLog Service.
@@ -59,13 +56,13 @@ protected:
                  ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
+  int parse_args (int argc, char *argv []);
+  // Parses the command line arguments.
+
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Resolve the naming service.
 
   // = Data members
-  const char* event_log_factory_name_;
-  // The Log Factory name.
-
   TAO_EventLogFactory_i event_log_factory_;
   // The Event Log Factory.
 
@@ -77,5 +74,17 @@ protected:
 
   CosNaming::NamingContext_var naming_;
   // A naming context.
+	
+  const char* service_name_;
+  // The name we use to bind with the NameService
+
+  const char* ior_file_name_;
+  // The name of the file were we output the Event_Service IOR.
+
+  const char* pid_file_name_;
+  // The name of a file where the process stores its pid
+
+  int bind_to_naming_service_;
+  // If true, bind to naming service
 };
 #endif /* EVENT_LOGGING_SERVICE_H */
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
index 8b4b5c56d5c..3821c88927a 100755
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
@@ -11,4 +11,4 @@ To run the Event Logging Service:
 
 
 The idl spec is $TAO_ROOT/orbsvcs/orbsvcs/DsEventLogAdmin.idl
-see also $TAO_ROOT/orbsvcs/orbsvcs/DsLogNotification.idl
\ No newline at end of file
+see also $TAO_ROOT/orbsvcs/orbsvcs/DsLogNotification.idl
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
index 14d699263cd..fe5796ea223 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
@@ -26,9 +26,10 @@ Notify_Logging_Service_SOURCES = \
   Notify_Logging_Service.h
 
 Notify_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(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)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Skel.la \
@@ -50,6 +51,8 @@ endif !BUILD_MINIMUM_CORBA
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index f3b735e39db..70d68573c51 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -4,8 +4,9 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
-#include "tao/IORTable/IORTable.h"
 #include "orbsvcs/Notify/Service.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (Notify_Logging_Service,
            Notify_Logging_Service,
@@ -13,7 +14,10 @@ ACE_RCSID (Notify_Logging_Service,
 
 
 Notify_Logging_Service::Notify_Logging_Service (void)
-: notify_factory_name_ (NOTIFY_KEY)
+  : service_name_ (NOTIFY_KEY),
+    ior_file_name_ (0),
+    pid_file_name_ (0),
+    bind_to_naming_service_ (1)
 {
   // No-Op.
 }
@@ -67,6 +71,49 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
 }
 
 int
+Notify_Logging_Service::parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:o:p:x"));
+  int opt;
+
+  while ((opt = get_opt ()) != EOF)
+    {
+      switch (opt)
+        {
+        case 'n':
+          service_name_ = get_opt.opt_arg();
+          break; 
+ 
+        case 'o':
+          ior_file_name_ = get_opt.opt_arg();
+          break;
+  
+        case 'p':
+          pid_file_name_ = get_opt.opt_arg();
+          break;
+ 
+        case 'x':
+          bind_to_naming_service_ = 0;
+          break;
+
+        case '?':              
+        default:
+          ACE_DEBUG ((LM_DEBUG,
+                      "Usage: %s "
+                      "-n service_name "
+                      "-o ior_file_name "
+                      "-p pid_file_name "
+                      "-x [disable naming service bind] "
+                      "\n",
+                      argv[0]));
+          return -1;            
+        }                       
+    }
+      
+  return 0;
+}
+
+int
 Notify_Logging_Service::init (int argc, char *argv[]
                           ACE_ENV_ARG_DECL)
 {
@@ -75,11 +122,10 @@ Notify_Logging_Service::init (int argc, char *argv[]
                       ACE_ENV_ARG_PARAMETER) != 0)
   return -1;
 
-  this->notify_service_->init (this->orb_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  if (this->parse_args (argc, argv) == -1)
+    return -1;
 
-  // Resolve the naming service.
-  resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->notify_service_->init (this->orb_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -99,23 +145,63 @@ Notify_Logging_Service::init (int argc, char *argv[]
 
   ACE_CHECK_RETURN (-1);
 
-  // Register the Factory
-  ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
-
-  CosNaming::Name_var name =
-    this->naming_->to_name (this->notify_factory_name_.c_str ()
-                            ACE_ENV_ARG_PARAMETER);
+  CORBA::String_var str =
+    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
+  ACE_DEBUG ((LM_DEBUG,
+              "The Notify Log Factory IOR is <%s>\n", str.in()));
 
-  this->naming_->rebind (name.in (),
-                         obj.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  if (ior_file_name_ != 0) 
+    {
+      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_LIB_TEXT("w"));
+      if (iorf == 0) 
+	{
+	  ACE_ERROR_RETURN ((LM_ERROR,
+			     "Cannot open output file for writing IOR: %s",
+			     ior_file_name_),
+			    -1);
+	}
+
+      ACE_OS::fprintf (iorf, "%s\n", str.in ());
+      ACE_OS::fclose (iorf);
+    }
 
-  ACE_DEBUG ((LM_DEBUG,
-              "Registered with the naming service as: %s\n",
-              this->notify_factory_name_.c_str()));
+  if (pid_file_name_ != 0)
+    {
+      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_LIB_TEXT("w"));
+      if (pidf != 0)
+	{
+	  ACE_OS::fprintf (pidf,
+			   "%ld\n",
+			   static_cast<long> (ACE_OS::getpid ()));
+	  ACE_OS::fclose (pidf);
+	}
+    }
+
+  if (bind_to_naming_service_) 
+    {
+      // Resolve the naming service.
+      resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+
+      // Register the Factory
+      ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
+
+      CosNaming::Name name (1);
+      name.length (1);
+      name[0].id = CORBA::string_dup (this->service_name_);
+      ACE_CHECK_RETURN (-1);
+
+      this->naming_->rebind (name,
+			     obj.in ()
+			     ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+
+      ACE_DEBUG ((LM_DEBUG,
+		  "Registered with the naming service as: %s\n",
+		  this->service_name_));
+    }
 
   return 0;
 }
@@ -133,7 +219,7 @@ Notify_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_ =
-    CosNaming::NamingContextExt::_narrow (naming_obj.in ()
+    CosNaming::NamingContext::_narrow (naming_obj.in ()
                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -174,14 +260,17 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CosNaming::Name_var name =
-    this->naming_->to_name (this->notify_factory_name_.c_str ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->naming_->unbind (name.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  if (bind_to_naming_service_) 
+    {
+      CosNaming::Name name (1);
+      name.length (1);
+      name[0].id = CORBA::string_dup (this->service_name_);
+      ACE_CHECK;
+
+      this->naming_->unbind (name
+			     ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
index 0ad7d2b30f6..5cb59012033 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
@@ -62,15 +62,15 @@ protected:
                 ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
-  TAO_Notify_Service* notify_service_;
+  int parse_args (int argc, char *argv[]);
+  // Parses the command line arguments.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Resolve the naming service.
 
-  // = Data members
+  TAO_Notify_Service* notify_service_;
 
-  ACE_CString notify_factory_name_;
-  // The Factory name.
+  // = Data members
 
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
   // The Factory.
@@ -84,8 +84,19 @@ protected:
   PortableServer::POA_var poa_;
   // Reference to the root poa.
 
-  CosNaming::NamingContextExt_var naming_;
+  CosNaming::NamingContext_var naming_;
   // A naming context.
 
+  const char* service_name_;
+  // The name we use to bind with the NameService
+
+  const char* ior_file_name_;
+  // The name of the file were we output the Event_Service IOR.
+
+  const char* pid_file_name_;
+  // The name of a file where the process stores its pid
+
+  int bind_to_naming_service_;
+  // If true, bind to naming service
 };
 #endif /* NOTIFY_SERVICE_H */
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
index 471c70f9582..9a4b6227249 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project: namingexe, core, dsnotifylogadmin_serv, iortable {
+project: namingexe, core, dsnotifylogadmin_serv {
   exename   = Notify_Logging_Service
   includes += $(TAO_ROOT)/orbsvcs
 }
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
index f36fb7379f6..9dfd86d5e40 100755
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
@@ -11,4 +11,4 @@ To run the Notify Logging Service:
 
 
 The idl spec is $TAO_ROOT/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl
-see also $TAO_ROOT/orbsvcs/orbsvcs/DsLogNotification.idl
\ No newline at end of file
+see also $TAO_ROOT/orbsvcs/orbsvcs/DsLogNotification.idl
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index 15e4ada0344..e1008732b7a 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -234,7 +234,7 @@ RTEvent_Logging_Service::run (int argc, char* argv[])
             {
               ACE_OS::fprintf (pidf,
                                "%ld\n",
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pidf);
             }
         }
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
index ef7a917070c..aa732eeb0ce 100644
--- a/TAO/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/Makefile.am
@@ -11,11 +11,8 @@ SUBDIRS = \
 	Naming_Service \
 	Logging_Service \
 	LoadBalancer \
-	LifeCycle_Service
-
-#	 ImplRepo_Service
-
-SUBDIRS += \
+	LifeCycle_Service \
+        ImplRepo_Service \
 	IFR_Service \
 	Fault_Notifier \
 	Fault_Detector \
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index cf629267ac2..d899de563d3 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -107,7 +107,7 @@ TAO_NT_Naming_Service::init (int argc,
         argv_save_[i] = ACE_OS::strdup (argv[i]);
 
       int j = 0;
-      for (i = argc; i < ACE_static_cast (int, (args.argc () + argc)); i++)
+      for (i = argc; i < static_cast<int> ((args.argc () + argc)); i++)
         argv_save_[i] = ACE_OS::strdup (args.argv ()[j++]);
 
       // Set the arg counter.
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 9dd785b891e..168a11289c7 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -3,8 +3,8 @@
 #include "Naming_Service.h"
 #include "ace/OS_main.h"
 
-#include <orbsvcs/Shutdown_Utilities.h>
-#include <tao/debug.h>
+#include "orbsvcs/Shutdown_Utilities.h"
+#include "tao/debug.h"
 
 class Naming_Svc_Shutdown : public Shutdown_Functor
 {
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index f7d4ab3cbb7..57cee4c14ed 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -107,7 +107,7 @@ TAO_NT_Notify_Service::init (int argc,
         argv_save_[i] = ACE_OS::strdup (argv[i]);
 
       int j = 0;
-      for (i = argc; i < ACE_static_cast (int, (args.argc () + argc)); i++)
+      for (i = argc; i < static_cast<int> ((args.argc () + argc)); i++)
         argv_save_[i] = ACE_OS::strdup (args.argv ()[j++]);
 
       // Set the arg counter.
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 0e1eaf79ed2..a7e7770a6f4 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -10,7 +10,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
 #include "ace/Dynamic_Service.h"
-#include "../orbsvcs/Notify/Service.h"
+#include "orbsvcs/Notify/Service.h"
 
 TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
   : notify_service_ (0),
@@ -90,7 +90,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 
   if (this->notify_service_ == 0)
   {
-          ACE_DEBUG ((LM_DEBUG, "Service not found! check conf. file\n"));
+      ACE_DEBUG ((LM_DEBUG, "Service not found! check conf.file\n"));
       return -1;
   }
 
@@ -139,24 +139,6 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 
   ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
 
-  // Write IOR to a file, if asked.
-  CORBA::String_var str =
-    this->orb_->object_to_string (this->notify_factory_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (this->ior_output_file_)
-    {
-      ACE_OS::fprintf (this->ior_output_file_,
-                       "%s",
-                       str.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-      this->ior_output_file_ = 0;
-  }
-  else if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "The Notification Event Channel Factory IOR is <%s>\n",
-                str.in ()));
-
   // Make it bootstrappable, if asked.
   if (this->bootstrap_)
     {
@@ -184,84 +166,78 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
         }
     }
 
+
   // Register with the Name service, if asked
   if (this->use_name_svc_)
-  {
-    // Register the Factory
-    ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
+    {
+      // Register the Factory
+      ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
 
 
-#if defined (TAO_NOTIFY_USE_NAMING_CONTEXT)
-    CosNaming::Name name (1);
-    name.length (1);
-    name[0].id =
-      CORBA::string_dup (this->notify_factory_name_.c_str ());
-#else
-    CosNaming::Name_var name =
-      this->naming_->to_name (this->notify_factory_name_.c_str ()
-                              ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
+      CosNaming::Name name (1);
+      name.length (1);
+      name[0].id =
+        CORBA::string_dup (this->notify_factory_name_.c_str ());
+      ACE_CHECK_RETURN (-1);
 
-    ACE_CHECK_RETURN (-1);
 
+      this->naming_->rebind (name,
+                            this->notify_factory_.in ()
+                            ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
 
-#if defined (TAO_NOTIFY_USE_NAMING_CONTEXT)
-    this->naming_->rebind (name,
-                           this->notify_factory_.in ()
-                           ACE_ENV_ARG_PARAMETER);
-#else
-    this->naming_->rebind (name.in (),
-                           this->notify_factory_.in ()
-                           ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
+      ACE_DEBUG ((LM_DEBUG,
+                  "Registered with the naming service as: %s\n",
+                  this->notify_factory_name_.c_str()));
 
-    ACE_CHECK_RETURN (-1);
+      if (this->register_event_channel_ == 1)
+        {
+          // create an event channel
+          CosNotifyChannelAdmin::ChannelID id;
 
-    ACE_DEBUG ((LM_DEBUG,
-                "Registered with the naming service as: %s\n",
-                this->notify_factory_name_.c_str()));
-
-    if (this->register_event_channel_ == 1)
-      {
-        // create an event channel
-        CosNotifyChannelAdmin::ChannelID id;
-
-        CosNotification::QoSProperties initial_qos;
-        CosNotification::AdminProperties initial_admin;
-
-        CosNotifyChannelAdmin::EventChannel_var ec =
-          this->notify_factory_->create_channel (initial_qos,
-                                                 initial_admin,
-                                                 id
-                                                 ACE_ENV_ARG_PARAMETER);
-#if defined (TAO_NOTIFY_USE_NAMING_CONTEXT)
-        name[0].id =
-          CORBA::string_dup (this->notify_channel_name_.c_str ());
-#else
-        name = this->naming_->to_name (
-          this->notify_channel_name_.c_str ()
-          ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
-        ACE_CHECK_RETURN (-1);
-
-
-#if defined (TAO_NOTIFY_USE_NAMING_CONTEXT)
-        this->naming_->rebind (name,
-                               ec.in ()
-                               ACE_ENV_ARG_PARAMETER);
-#else
-        this->naming_->rebind (name.in (),
-                               ec.in ()
-                               ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
-        ACE_CHECK_RETURN (-1);
+          CosNotification::QoSProperties initial_qos;
+          CosNotification::AdminProperties initial_admin;
+
+          CosNotifyChannelAdmin::EventChannel_var ec =
+            this->notify_factory_->create_channel (initial_qos,
+                                                  initial_admin,
+                                                  id
+                                                  ACE_ENV_ARG_PARAMETER);
+
+          name[0].id =
+            CORBA::string_dup (this->notify_channel_name_.c_str ());
+          ACE_CHECK_RETURN (-1);
+
+          this->naming_->rebind (name,
+                                ec.in ()
+                                ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
 
-        ACE_DEBUG ((LM_DEBUG,
-                    "Registered an Event Channel with the naming service as: %s\n",
-                    this->notify_channel_name_.c_str()));
+          ACE_DEBUG ((LM_DEBUG,
+                      "Registered an Event Channel with the naming service as: %s\n",
+                      this->notify_channel_name_.c_str()));
+
+        }
+    }
+
+  // Write IOR to a file, if asked.
+  // Note: do this last to ensure that we're up and running before the file is written
+  CORBA::String_var str =
+    this->orb_->object_to_string (this->notify_factory_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
 
-      }
+  if (this->ior_output_file_)
+    {
+      ACE_OS::fprintf (this->ior_output_file_,
+                       "%s",
+                       str.in ());
+      ACE_OS::fclose (this->ior_output_file_);
+      this->ior_output_file_ = 0;
   }
+  else if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "The Notification Event Channel Factory IOR is <%s>\n",
+                str.in ()));
 
   return 0;
 }
@@ -281,13 +257,8 @@ TAO_Notify_Service_Driver::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
                       -1);
 
   this->naming_ =
-#if defined (TAO_NOTIFY_USE_NAMING_CONTEXT)
-    CosNaming::NamingContext::_narrow (naming_obj.in ();
+    CosNaming::NamingContext::_narrow (naming_obj.in ()
                                        ACE_ENV_ARG_PARAMETER);
-#else
-    CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -319,26 +290,14 @@ TAO_Notify_Service_Driver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   if (this->use_name_svc_)
   {
     // Unbind from the naming service.
-#if defined (TAO_NOTIFY_USE_NAMING_CONTEXT)
     CosNaming::Name name (1);
     name.length (1);
     name[0].id =
       CORBA::string_dup (this->notify_factory_name_.c_str ());
-#else
-    CosNaming::Name_var name =
-      this->naming_->to_name (this->notify_factory_name_.c_str ()
-                              ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
-
     ACE_CHECK;
 
-#if defined (TAO_NOTIFY_USE_NAMING_CONTEXT)
     this->naming_->unbind (name
                            ACE_ENV_ARG_PARAMETER);
-#else
-    this->naming_->unbind (name.in ()
-                           ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
     ACE_CHECK;
   }
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index e0de0ef0a8e..a134b09061e 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -130,12 +130,7 @@ protected:
   PortableServer::POA_var poa_;
   // Reference to the root poa.
 
-#if defined (TAO_NOTIFY_USE_NAMING_CONTEXT)
   CosNaming::NamingContext_var naming_;
-#else
-  CosNaming::NamingContextExt_var naming_;
-#endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
-
   // A naming context.
 
   Worker worker_;
diff --git a/TAO/orbsvcs/PSS/PSDL.mpc b/TAO/orbsvcs/PSS/PSDL.mpc
index 79f64c2aef4..47fb7e22321 100644
--- a/TAO/orbsvcs/PSS/PSDL.mpc
+++ b/TAO/orbsvcs/PSS/PSDL.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : taolib {
+  requires += dummy
   sharedname    = TAO_PSDL
   dynamicflags += TAO_PSDL_BUILD_DLL
   source_files {
@@ -33,6 +34,7 @@ project : taolib {
 }
 
 project(*Datastore) : taolib {
+  requires += dummy
   sharedname = TAO_PSDL_Datastore
   dynamicflags += TAO_PSDL_BUILD_DLL
   source_files {
@@ -44,6 +46,7 @@ project(*Datastore) : taolib {
 }
 
 project(*Parser) : taoexe {
+  requires += dummy
   after += PSDL
   libs  += TAO_PSDL
   install = .
@@ -51,4 +54,4 @@ project(*Parser) : taoexe {
     Dump_Visitor.cpp
     psdl_tao.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/orbsvcs/PSS/PSDL_Datastore.cpp b/TAO/orbsvcs/PSS/PSDL_Datastore.cpp
index 0568c35ab08..9e910c0360b 100644
--- a/TAO/orbsvcs/PSS/PSDL_Datastore.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Datastore.cpp
@@ -26,8 +26,7 @@ TAO_PSDL_Datastore::TAO_PSDL_Datastore ()
 TAO_PSDL_Datastore::~TAO_PSDL_Datastore (void)
 {
   // delete allocator_;
-  //ACE_OS::free (ACE_const_cast (ACE_TCHAR *,
-  //                            this->index_file_));
+  // ACE_OS::free (const_cast<ACE_TCHAR *> (this->index_file_));
 }
 
 int
@@ -164,8 +163,7 @@ TAO_PSDL_Datastore::create_index (void)
   // 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_ = ACE_static_cast (NAME_OBJ_REF_MAP *,
-                                            name_obj_map);
+      this->obj_ref_map_ = static_cast<NAME_OBJ_REF_MAP *> (name_obj_map);
     }
   else
     {
diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
index 883674d990f..689a44642ae 100644
--- a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
@@ -457,13 +457,9 @@ TAO_PSDL_Interface_Visitor::print_class_for_interface (void)
   ps_sh->incr_indent (0);
 
   *ps_sh << "public:";  ps_sh->nl ();
-  *ps_sh << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)"
-    ;
+
   *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 << "#endif /* ! __GNUC__ || g++ >= 2.8 */";  ps_sh->nl ();
-
-
 
   *ps_sh << "static int _tao_class_id;";  ps_sh->nl ();
 
@@ -1904,7 +1900,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
   *ps_si << "(ptrdiff_t,";   ps_si->nl ();
   *ps_si << "&" << this->interface_name_ << "::_tao_class_id))";   ps_si->nl ();
-  *ps_si << "retv = ACE_reinterpret_cast (void*, this);";
+  *ps_si << "retv = reinterpret_cast<void*> (this);";
   ps_si->decr_indent (0);
   ps_si->nl ();
 
@@ -1917,7 +1913,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   *ps_si << "retv = ACE_reinterpret_cast (void *,";
   ps_si->incr_indent (0);
   ps_si->nl ();
-  *ps_si << "ACE_static_cast (CORBA::Object_ptr, this));";
+  *ps_si << "static_cast<CORBA::Object_ptr> (this));";
 
   ps_si->decr_indent (0);
   ps_si->decr_indent (0);
diff --git a/TAO/orbsvcs/PSS/PSDL_OctetSeq.cpp b/TAO/orbsvcs/PSS/PSDL_OctetSeq.cpp
index 8cedc9cb5ce..fb223b54ae9 100644
--- a/TAO/orbsvcs/PSS/PSDL_OctetSeq.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_OctetSeq.cpp
@@ -49,7 +49,7 @@ TAO_PSDL_OctetSeq::operator= (const TAO_PSDL_OctetSeq & rhs)
 
   this->allocator_ = rhs.allocator_;
   void * buf = this->allocator_->malloc (rhs.length_);
-  this->buffer_ = ACE_static_cast (CORBA::Octet *, buf);
+  this->buffer_ = static_cast<CORBA::Octet *> (buf);
   if (this->buffer_)
     {
       // Deep copy the buffer.
@@ -72,7 +72,7 @@ TAO_PSDL_OctetSeq::operator= (const CORBA::OctetSeq & rhs)
   const CORBA::ULong len = rhs.length ();
 
   void * buf = this->allocator_->malloc (len);
-  this->buffer_ = ACE_static_cast (CORBA::Octet *, buf);
+  this->buffer_ = static_cast<CORBA::Octet *> (buf);
   if (this->buffer_)
     {
       CORBA::Octet * dest = this->buffer_;
diff --git a/TAO/orbsvcs/PSS/PSDL_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Scope.cpp
index 2ebf0c03022..cbd962fc9aa 100644
--- a/TAO/orbsvcs/PSS/PSDL_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Scope.cpp
@@ -951,4 +951,8 @@ template class ACE_Array_Base <ACE_CString>;
 #pragma instantiate ACE_Array_Base <TAO_PSDL_Scope *>;
 #pragma instantiate ACE_Array_Base <ACE_CString>;
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template TAO_Singleton<TAO_PSDL_Scope, ACE_Thread_Mutex> *TAO_Singleton<TAO_PSDL_Scope, ACE_Thread_Mutex>::singleton_;
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
index c8330f55f47..20d21d2d669 100644
--- a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
@@ -121,17 +121,12 @@ TAO_PSDL_Struct_Visitor::visit_predefined_type (TAO_PSDL_Predefined_Type *predef
       *ps_sh << "{";
       ps_sh->nl ();
 
-      *ps_sh << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)";
-
-      ps_sh->incr_indent ();
       ps_sh->nl ();
 
       *ps_sh << "typedef " << this->struct_name_ << "_var _var_type;\n";
 
-      ps_sh->decr_indent ();
       ps_sh->nl ();
 
-      *ps_sh << "#endif /* ! __GNUC__ || g++ >= 2.8 */\n";
       ps_sh->nl ();
 
       *ps_sh << "static void _tao_any_destructor (void*);";
@@ -442,7 +437,7 @@ TAO_PSDL_Struct_Visitor::gen_code_for_si (void)
   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 << "ACE_static_cast (void *, tmp),"; 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 ();
diff --git a/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp
index 7db54983aee..0bde2955e69 100644
--- a/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.cpp
@@ -211,9 +211,7 @@ TAO_PSDL_Type_Dcl_Visitor::print_for_sequence_typedefs (ACE_CString identifier_t
   *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 << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)";   ps_sh->nl ();
   *ps_sh << "typedef " << identifier.c_str () << "_var _var_type;";   ps_sh->nl ();
-  *ps_sh << "#endif /* ! __GNUC__ || g++ >= 2.8 */";   ps_sh->nl ();
   ps_sh->nl ();
   ps_sh->nl ();
   *ps_sh << "};";   ps_sh->nl ();
@@ -253,7 +251,7 @@ TAO_PSDL_Type_Dcl_Visitor::print_for_sequence_typedefs (ACE_CString identifier_t
 
   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 ();
@@ -265,7 +263,7 @@ TAO_PSDL_Type_Dcl_Visitor::print_for_sequence_typedefs (ACE_CString identifier_t
 
   ps_sh->nl ();
   ps_sh->nl ();
-  
+
   *ps_sh << "private:";
 
   ps_sh->incr_indent (0);
@@ -277,7 +275,7 @@ TAO_PSDL_Type_Dcl_Visitor::print_for_sequence_typedefs (ACE_CString identifier_t
   ps_sh->nl ();
   ps_sh->nl ();
   ps_sh->nl ();
-  
+
   *ps_sh << "#endif /* end #if !defined */";   ps_sh->nl ();
   ps_sh->nl ();
   ps_sh->nl ();
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 3da4c4e1039..5f933987075 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -157,7 +157,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
             {
               ACE_OS::fprintf (pidf,
                                ACE_LIB_TEXT("%ld\n"),
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pidf);
             }
         }
diff --git a/TAO/orbsvcs/TAO_Service/README b/TAO/orbsvcs/TAO_Service/README
index 27a7166803a..799c4d1cb2f 100644
--- a/TAO/orbsvcs/TAO_Service/README
+++ b/TAO/orbsvcs/TAO_Service/README
@@ -27,10 +27,10 @@ To load Naming Service dynamically :
 ----------------------------------
 	
   dynamic TAO_Naming_Loader Service_Object * \
-          TAO_CosNaming:_make_TAO_Naming_Loader () "dummy -o ns.ior"
+          TAO_CosNaming_Serv:_make_TAO_Naming_Loader () "dummy -o ns.ior"
 
   So, here we want our service name to be TAO_Naming_Loader and its a
-  <Service_Object *> and the factory function is in TAO_CosNaming
+  <Service_Object *> and the factory function is in TAO_CosNaming_Serv
   DLL. We specify argv [0] to be "dummy" and the actual arguments
   start from argv [1] as in the usual case.
 
@@ -43,17 +43,18 @@ add these two entries when we want to load the event service.
 
 # Dynamically configure the default Event Service Factory
 dynamic CEC_Factory Service_Object * \
-	TAO_CosEvent:_make_TAO_CEC_Default_Factory () ""
+	TAO_CosEvent_Serv:_make_TAO_CEC_Default_Factory () ""
 
 # Dynamically configure the event service into the application process.
 dynamic TAO_CEC_Event_Loader Service_Object * \
-        TAO_CosEvent:_make_TAO_CEC_Event_Loader () "dummy -o foo.ref"
+        TAO_CosEvent_Serv:_make_TAO_CEC_Event_Loader () "dummy -o foo.ref"
 
 To load Trading Service dynamically:
 ---------------------------------
 
 #  Dynamically configure the trading service into the application process.
-dynamic TAO_Trading_Loader Service_Object * TAO_CosTrading:_make_TAO_Trading_Loader () "dummy -TSdumpior foo.ref"
+dynamic TAO_Trading_Loader Service_Object * \
+	TAO_CosTrading_Serv:_make_TAO_Trading_Loader () "dummy -TSdumpior foo.ref"
 
 To Remove a Service
 *******************
diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
index a3480850d81..b711c0e363b 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
@@ -23,8 +23,13 @@
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 #include "ace/Signal.h"
+#include "ace/Time_Value.h"
+#include "ace/Argv_Type_Converter.h"
+
+ACE_RCSID (TAO_Service,
+           TAO_Service,
+           "$Id$")
 
-ACE_RCSID(TAO_Service, TAO_Service, "$Id$")
 
 extern "C" void handler (int)
 {
@@ -32,14 +37,16 @@ extern "C" void handler (int)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
+      ACE_Argv_Type_Converter argcon (argc, argv);
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
+                         "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP);
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index bdd65e5223f..ece15d8bcb8 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -118,7 +118,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 TMCast::Group (address, uuid.to_string ()->c_str ()), TMCast::Group);
+  ACE_AUTO_PTR_RESET (group_, new ACE_TMCast::Group (address, uuid.to_string ()->c_str ()), ACE_TMCast::Group);
 
   int r = ACE_Thread_Manager::instance ()->spawn (
     &ReplicaController::listener_thunk, this);
@@ -190,12 +190,12 @@ listener ()
       }
     }
   }
-  catch (TMCast::Group::Failed const&)
+  catch (ACE_TMCast::Group::Failed const&)
   {
     ACE_DEBUG ((LM_DEBUG,
                 "Group failure. Perhaps, I am alone in the group.\n"));
   }
-  catch (TMCast::Group::InsufficienSpace const&)
+  catch (ACE_TMCast::Group::InsufficienSpace const&)
   {
     ACE_DEBUG ((LM_DEBUG, "Group::InsufficienSpace\n"));
   }
@@ -403,13 +403,13 @@ ReplicaController::send_reply (
           ACE_DEBUG ((LM_DEBUG, "Sent log record of length %i\n", size));
           break;
         }
-        catch (TMCast::Group::Aborted const&)
+        catch (ACE_TMCast::Group::Aborted const&)
         {
           ACE_DEBUG ((LM_DEBUG, "Retrying to send log record.\n"));
         }
       }
     }
-    catch (TMCast::Group::Failed const&)
+    catch (ACE_TMCast::Group::Failed const&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Group failure. Perhaps, I am alone in the group.\n"));
@@ -444,8 +444,7 @@ namespace
                                        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                            svc->context_data.get_buffer ()),
+    TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
                       svc->context_data.length ());
 
     CORBA::Boolean byte_order;
@@ -456,7 +455,7 @@ namespace
       ACE_THROW (CORBA::BAD_CONTEXT ());
     }
 
-    cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+    cdr.reset_byte_order (static_cast<int> (byte_order));
 
     // Funny, the following two lines should normally translate
     // just to one ctor call. But because we have to use this
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
index 551ae5fe5a9..07ae5071b8b 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
@@ -132,7 +132,7 @@ private:
   Log_ log_;
   CORBA::ORB_var orb_;
   PortableServer::POA_var root_poa_;
-  auto_ptr<TMCast::Group> group_;
+  auto_ptr<ACE_TMCast::Group> group_;
 };
 
 #endif  /* REPLICA_CONTROLLER_H */
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index de7704a453f..7a089b04d7e 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -79,7 +79,10 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
   load_list->length (1);
 
   load_list[0].id = CosLoadBalancing::RequestsPerSecond;
-  load_list[0].value = request_count / elapsed_time.msec () * 1000;
+  
+  // VC 7.1 gives a warning without an explicit cast.
+  load_list[0].value =
+    static_cast<CORBA::Float> (request_count / elapsed_time.msec () * 1000);
 
   // Strictly for debugging or
   ACE_DEBUG ((LM_DEBUG, "%f\n", load_list[0].value));
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
index 062735c6789..657dd165f49 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
@@ -59,7 +59,7 @@ public:
   /// LoadMonitor resides.
   /**
    * @return A "Load" sequence of length 1 that contains a LoadId
-   *         equal to CosLoadBalancing::CPU, and the average CPU
+   *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
   virtual CosLoadBalancing::LoadList * loads (
diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
index 55eaf45d865..47508dba78e 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      cout << "Starting Client " << number << endl;
+      ACE_DEBUG ((LM_DEBUG, "Starting Client %d\n", number));
 
       for (int i = 0; i < niterations; ++i)
         {
@@ -87,9 +87,9 @@ main (int argc, char *argv[])
 
           CORBA::Double price = stock->price ();
 
-          cout << "The price of a stock in \""
-               << full_name.in () << "\" is $"
-               << price << endl;
+          ACE_DEBUG ((LM_DEBUG, "The price of a stock in \"%s\" is $%f\n",
+                      full_name.in (),
+                      price));
         }
 
       //stockfactory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 07ed3993314..66d41596ce8 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -41,17 +41,17 @@ parse_args (int argc, char *argv[])
 
       case 'r':
         reject_threshold =
-          ACE_static_cast (CORBA::Float, ::atof (get_opts.opt_arg ()));
+          static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
         break;
 
       case 'c':
         critical_threshold =
-          ACE_static_cast (CORBA::Float, ::atof (get_opts.opt_arg ()));
+          static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
         break;
 
       case 'd':
         dampening =
-          ACE_static_cast (CORBA::Float, ::atof (get_opts.opt_arg ()));
+          static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
index f58a5f29118..c96507ed65c 100644
--- a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
+++ b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
@@ -2,14 +2,14 @@
 // $Id$
 
 project(*Consumer) : orbsvcsexe, dseventlogadmin, event_skel, naming {
-  exename = consumer
+  exename = Event_Consumer
   source_files {
     Event_Consumer.cpp
   }
 }
 
 project(*Supplier) : orbsvcsexe, dseventlogadmin, event_skel, naming {
-  exename = supplier
+  exename = Event_Supplier
   source_files {
     Event_Supplier.cpp
   }
diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
index 321de1e7566..9082517a64c 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
+++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
@@ -2,14 +2,14 @@
 // $Id$
 
 project(*Consumer) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming {
-  exename = consumer
+  exename = Notify_Consumer
   source_files {
     Notify_Consumer.cpp
   }
 }
 
 project(*Supplier) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming {
-  exename = supplier
+  exename = Notify_Supplier
   source_files {
     Notify_Supplier.cpp
   }
diff --git a/TAO/orbsvcs/examples/Log/README b/TAO/orbsvcs/examples/Log/README
index a1e76c8b379..aa5579fff01 100644
--- a/TAO/orbsvcs/examples/Log/README
+++ b/TAO/orbsvcs/examples/Log/README
@@ -1,4 +1,3 @@
-
 Logging Service
 ===============
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
index 7555dc62c61..b14e76f4e9e 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
@@ -2,14 +2,14 @@
 // $Id$
 
 project(*Consumer) : orbsvcsexe, rtevent, naming, rteventlogadmin {
-  exename = consumer
+  exename = RTEvent_Consumer
   source_files {
     RTEvent_Consumer.cpp
   }
 }
 
 project(*Supplier) : orbsvcsexe, rtevent, naming, rteventlogadmin {
-  exename = supplier
+  exename = RTEvent_Supplier
   source_files {
     RTEvent_Supplier.cpp
   }
diff --git a/TAO/orbsvcs/examples/ORT/ObjectReferenceFactory.idl b/TAO/orbsvcs/examples/ORT/ObjectReferenceFactory.idl
index 332cb29d223..0b7c8d10bee 100644
--- a/TAO/orbsvcs/examples/ORT/ObjectReferenceFactory.idl
+++ b/TAO/orbsvcs/examples/ORT/ObjectReferenceFactory.idl
@@ -5,7 +5,7 @@
 #ifndef OBJECT_REFERENCE_FACTORY_IDL
 #define OBJECT_REFERENCE_FACTORY_IDL
 
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
 
 module ORT
 {
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index 854519127e0..20ec718076c 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -26,8 +26,7 @@ Object_Factory_i::create_object (const char *interface_repository_id,
     PortableServer::string_to_ObjectId (stringified_object.in ());
 
   const PortableInterceptor::ObjectId *obj_id =
-    ACE_reinterpret_cast (const PortableInterceptor::ObjectId *,
-                          &id.in ());
+    reinterpret_cast<const PortableInterceptor::ObjectId *> (&id.in ());
   ACE_UNUSED_ARG(obj_id);
   ACE_UNUSED_ARG(interface_repository_id);
 /*
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index e39e49ddb32..659ee3ea336 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -6,7 +6,7 @@
 #define SERVER_IORINTERCEPTOR_H
 
 #include "GatewayC.h"
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/LocalObject.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 2683f611ed7..2cd91ec89cd 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -2866,7 +2866,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
               result = this->mcast_entry_map_.find (mcast_key, entry);
               if (result == 0)
                 {
-                  mcast_addr = ACE_dynamic_cast (ACE_INET_Addr *, entry->address ());
+                  mcast_addr = dynamic_cast<ACE_INET_Addr *> (entry->address ());
                   char str_addr [BUFSIZ];
                   result = mcast_addr->addr_to_string (str_addr, BUFSIZ);
                   if (result < 0)
@@ -3066,7 +3066,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
             {
               TAO_FlowSpec_Entry *mcast_entry = 0;
               ACE_INET_Addr *mcast_addr;
-              mcast_addr = ACE_dynamic_cast (ACE_INET_Addr *, forward_entry->address ());
+              mcast_addr = dynamic_cast<ACE_INET_Addr *> (forward_entry->address ());
               if (mcast_addr == 0)
                 ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect::Address missing in flowspec_entry\n"), 0);
               result = this->mcast_entry_map_.find (mcast_key, mcast_entry);
@@ -5231,7 +5231,7 @@ TAO_Tokenizer::parse (const char *string, char delimiter)
       else
         {
           substring = new_string.substring (pos);
-          pos = ACE_static_cast (int, new_string.length ());
+          pos = static_cast<int> (new_string.length ());
         }
       char *token = CORBA::string_dup (substring.c_str ());
       result = this->token_array_.set (token, count);
@@ -5281,7 +5281,7 @@ TAO_Tokenizer::token (void)
 int
 TAO_Tokenizer::num_tokens (void)
 {
-  return ACE_static_cast (int, this->num_tokens_);
+  return static_cast<int> (this->num_tokens_);
 }
 
 const char *
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index f53b3ddba1d..fc1dacd3ec2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -37,11 +37,6 @@
 #include "orbsvcs/AV/AV_Core.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/Null_MediaCtrlS.h"
-
-#if defined (TAO_ORBSVCS_HAS_Trader)
-#include "orbsvcs/Trader/Trader.h"
-#endif /* TAO_ORBSVCS_HAS_Trader */
-
 #include "orbsvcs/AV/FlowSpec_Entry.h"
 
 #define FLOWSPEC_MAX 5
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 08597e73734..05d7f1d7d6c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -411,8 +411,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
               }
           }
 
-        AVStreams::flowSpec new_flowspec (ACE_static_cast (CORBA::ULong,
-                                                   flow_spec_set.size ()));
+        AVStreams::flowSpec new_flowspec (static_cast<CORBA::ULong> (flow_spec_set.size ()));
         int i=0;
         TAO_AV_FlowSpecSetItor connect_end = address_flow_set.end ();
         TAO_AV_FlowSpecSetItor connect = address_flow_set.begin ();
@@ -1186,4 +1185,6 @@ TAO_AV_Core::get_control_flowname(const char *flowname)
 template class ACE_Singleton<TAO_AV_Core,ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<TAO_AV_Core,ACE_Null_Mutex>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> *ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 9bbfee56279..8bdc07e2f9a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -112,7 +112,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
                    "%s:%s:%ld",
                    "TAO_AV_Process_Semaphore",
                    this->host_,
-                   ACE_static_cast (long int, this->pid_));
+                   static_cast<long int> (this->pid_));
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) semaphore is %s\n",
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index 442f8b04d09..afc93eb5ddc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -556,7 +556,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (AC
                        "%s:%s:%ld",
                        "VDev",
                        this->host_,
-                       ACE_static_cast (long, this->pid_));
+                       static_cast<long> (this->pid_));
 
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name));
       // create the name
@@ -791,7 +791,7 @@ TAO_AV_Child_Process_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Proc
                    "%s:%s:%ld",
                    "Stream_Endpoint_A",
                    this->host_,
-                   ACE_static_cast (long, this->pid_));
+                   static_cast<long> (this->pid_));
 
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name));
   this->stream_endpoint_name_.length (1);
@@ -817,7 +817,7 @@ TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Proc
                    "%s:%s:%ld",
                    "Stream_Endpoint_B",
                    this->host_,
-                   ACE_static_cast (long, this->pid_));
+                   static_cast<long> (this->pid_));
 
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name));
   this->stream_endpoint_name_.length (1);
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index f29715633bf..997aed079b2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -199,7 +199,7 @@ TAO_FlowSpec_Entry::set_protocol (void)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::set_protocol address is not 0\n"));
-      ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_);
+      ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->address_);
       char buf[BUFSIZ];
       inet_addr->addr_to_string (buf,BUFSIZ);
       if (TAO_debug_level > 0)
@@ -469,7 +469,7 @@ TAO_FlowSpec_Entry::get_local_addr_str (void)
                         char [BUFSIZ],
                         0);
 
-        ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr *,this->local_addr_);
+        ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *> (this->local_addr_);
         inet_addr->addr_to_string (buf,BUFSIZ);
         ACE_CString cstring (buf, 0, 0);
 
@@ -650,7 +650,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
         case TAO_AV_Core::TAO_AV_TCP:
         case TAO_AV_Core::TAO_AV_SCTP_SEQ:
           {
-            ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_);
+            ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->address_);
             inet_addr->addr_to_string (address,BUFSIZ);
           }
           break;
@@ -699,7 +699,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
         case TAO_AV_Core::TAO_AV_TCP:
 	case TAO_AV_Core::TAO_AV_SCTP_SEQ:
           {
-            ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_);
+            ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->address_);
             control_port = inet_addr->get_port_number() + 1;
             ACE_INET_Addr *inet_control_addr;
             ACE_NEW_RETURN (inet_control_addr,
@@ -730,7 +730,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
         case TAO_AV_Core::TAO_AV_TCP:
 	case TAO_AV_Core::TAO_AV_SCTP_SEQ:
           {
-	    ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->peer_addr_);
+	    ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->peer_addr_);
             inet_addr->addr_to_string (address,BUFSIZ);
 	    //inet_addr->get_host_name (address, BUFSIZ);
 	    
@@ -777,7 +777,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
         case TAO_AV_Core::TAO_AV_TCP:
 	case TAO_AV_Core::TAO_AV_SCTP_SEQ:
           {
-            ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->control_address_);
+            ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->control_address_);
             control_port = inet_addr->get_port_number();
           }
           break;
@@ -932,7 +932,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void)
         case TAO_AV_Core::TAO_AV_SFP_UDP:
         case TAO_AV_Core::TAO_AV_USERDEFINED_UDP:
           {
-            ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_);
+            ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->address_);
             inet_addr->addr_to_string (address,BUFSIZ);
           }
           break;
@@ -979,7 +979,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void)
         case TAO_AV_Core::TAO_AV_TCP:
 	case TAO_AV_Core::TAO_AV_SCTP_SEQ:
           {
-            ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->control_address_);
+            ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->control_address_);
             control_port = inet_addr->get_port_number();
           }
           break;
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index 53b7e2f1489..02d46a85566 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -117,7 +117,7 @@ TAO_AV_UDP_MCast_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value
       if (i->length () > 0)
         {
           iov[iovcnt].iov_base = i->rd_ptr ();
-          iov[iovcnt].iov_len  = ACE_static_cast (u_long, i->length ());
+          iov[iovcnt].iov_len  = static_cast<u_long> (i->length ());
           iovcnt++;
 
           // The buffer is full make a OS call.  @@ TODO this should
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index b4420b21ee5..4ede89d151f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -491,7 +491,7 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address)
   if (TAO_debug_level > 0)
     {
         char buf [BUFSIZ];
-	ACE_INET_Addr *remote_addr = ACE_dynamic_cast (ACE_INET_Addr*, address);
+	ACE_INET_Addr *remote_addr = dynamic_cast<ACE_INET_Addr*> (address);
 	remote_addr->addr_to_string (buf,
 				     BUFSIZ);
 
@@ -502,12 +502,12 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address)
 
 
   ACE_INET_Addr *inet_addr =
-    ACE_dynamic_cast (ACE_INET_Addr*,address);
+    dynamic_cast<ACE_INET_Addr*> (address);
 
   this->peer_addr_ = *inet_addr;
 
   TAO_AV_UDP_QoS_Transport *transport =
-    ACE_dynamic_cast (TAO_AV_UDP_QoS_Transport*,this->transport_);
+    dynamic_cast<TAO_AV_UDP_QoS_Transport*> (this->transport_);
 
   if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
     {
@@ -624,7 +624,7 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk,
       if (i->length () > 0)
         {
           iov[iovcnt].iov_base = i->rd_ptr ();
-          iov[iovcnt].iov_len  = ACE_static_cast (u_long, i->length ());
+          iov[iovcnt].iov_len  = static_cast<u_long> (i->length ());
           iovcnt++;
 
           // The buffer is full make a OS call.  @@ TODO this should
@@ -1174,7 +1174,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
 
   if (entry->get_peer_addr () != 0)
     {
-      local_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->get_peer_addr ());
+      local_addr = dynamic_cast<ACE_INET_Addr*> (entry->get_peer_addr ());
     }
   else
     ACE_NEW_RETURN (local_addr,
@@ -1194,8 +1194,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
   handler->flowspec_entry (this->entry_);
   handler->av_core (this->av_core_);
 
-  ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,
-                                               entry->address ());
+  ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (entry->address ());
 
   ACE_QoS_Params qos_params;
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
index ebc49bc6147..8e99c0ad7da 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -25,6 +25,7 @@
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
 
 #include "ace/OS.h"
+#include "ace/Service_Config.h"
 #include "ace/QoS/QoS_Session_Factory.h"
 #include "ace/QoS/QoS_Decorator.h"
 #include "ace/QoS/SOCK_Dgram_Mcast_QoS.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index a9a8236c777..b35f2505e88 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -48,7 +48,7 @@ int
 TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data,
                                              const ACE_Addr &peer_address)
 {
-  int length = ACE_static_cast (int, data->length ());
+  int length = static_cast<int> (data->length ());
   int more = length;
   char *buf_ptr = data->rd_ptr ();
   char first_rtcp_packet = 1;
@@ -479,8 +479,7 @@ TAO_AV_RTCP_Object::handle_control_input (ACE_Message_Block *frame,
 int
 TAO_AV_RTCP_Object::handle_control_output (ACE_Message_Block *frame)
 {
-  TAO_AV_RTCP_Callback *cb = ACE_dynamic_cast (TAO_AV_RTCP_Callback*,
-                                               this->callback_);
+  TAO_AV_RTCP_Callback *cb = dynamic_cast<TAO_AV_RTCP_Callback*> (this->callback_);
 
   return cb->send_frame (frame);
 }
@@ -488,8 +487,7 @@ TAO_AV_RTCP_Object::handle_control_output (ACE_Message_Block *frame)
 void
 TAO_AV_RTCP_Object::ts_offset (ACE_UINT32 ts_offset)
 {
-  TAO_AV_RTCP_Callback *cb = ACE_dynamic_cast (TAO_AV_RTCP_Callback*,
-                                               this->callback_);
+  TAO_AV_RTCP_Callback *cb = dynamic_cast<TAO_AV_RTCP_Callback*> (this->callback_);
   cb->ts_offset (ts_offset);
 }
 
@@ -540,8 +538,7 @@ int
 TAO_AV_RTCP_Callback::send_report (int bye)
 {
   // get the RTCP control object in order to get the ssrc
-  TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*,
-                                               this->protocol_object_);
+  TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*> (this->protocol_object_);
   ACE_UINT32 my_ssrc = rtcp_prot_obj->ssrc ();
 
   RTCP_Packet *cp;
@@ -668,8 +665,7 @@ TAO_AV_RTCP_Callback::send_report (int bye)
 
   sdes.add_item (my_ssrc,
                  RTCP_SDES_CNAME,
-                 ACE_static_cast (unsigned char,
-                                  ACE_OS::strlen(this->output_.cname())),
+                 static_cast<unsigned char> (ACE_OS::strlen(this->output_.cname())),
                  this->output_.cname());
   if (bye)
     {
@@ -784,7 +780,7 @@ TAO_AV_RTCP_Callback::receive_frame (ACE_Message_Block *frame,
 {
   RTCP_Channel_In *c;
 
-  RTP_Packet packet (frame->rd_ptr(), ACE_static_cast (int, frame->length()));
+  RTP_Packet packet (frame->rd_ptr(), static_cast<int> (frame->length()));
 
   if (this->inputs_.find (packet.ssrc(), c) < 0)
     {
@@ -803,7 +799,7 @@ TAO_AV_RTCP_Callback::receive_frame (ACE_Message_Block *frame,
 int
 TAO_AV_RTCP_Callback::send_frame (ACE_Message_Block *frame)
 {
-  RTP_Packet packet (frame->rd_ptr(), ACE_static_cast (int, frame->length()));
+  RTP_Packet packet (frame->rd_ptr(), static_cast<int> (frame->length()));
   this->output_.updateStatistics (&packet);
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
index 9be17255e06..45f1012972e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
@@ -20,8 +20,7 @@ RTCP_Channel_In::RTCP_Channel_In (ACE_UINT32 ssrc,
    no_data_counter_ (0),
    data_since_last_report_ (0)
 {
-  const ACE_INET_Addr *const_inet_addr = ACE_dynamic_cast (const ACE_INET_Addr*,
-                                                           peer_addr);
+  const ACE_INET_Addr *const_inet_addr = dynamic_cast<const ACE_INET_Addr*> (peer_addr);
 
   ACE_INET_Addr *inet_addr;
   ACE_NEW (inet_addr,
@@ -226,7 +225,7 @@ RTCP_Channel_In::recv_rtp_packet(ACE_Message_Block *mb,
     ACE_DEBUG ((LM_DEBUG,
                 "RTCP_Channel_In::recv_rtp_packet - possible loop/collision detected"));
 
-  RTP_Packet data_packet(mb->rd_ptr (), ACE_static_cast (int, mb->length ()));
+  RTP_Packet data_packet(mb->rd_ptr (), static_cast<int> (mb->length ()));
 
   // make sure the packet is valid
   if (data_packet.is_valid ())
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 8c0d3625d6e..17683afab0e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -97,7 +97,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(ACE_UINT32 *ssrc_list,
     {
       size_t text_length = ACE_OS::strlen(text);
       memcpy(this->reason_, text, text_length);
-      this->reason_length_ = ACE_static_cast (unsigned char, text_length);
+      this->reason_length_ = static_cast<unsigned char> (text_length);
     }
   else
     this->reason_length_ = 0;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index 37b86fa9478..b29f5bfb890 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -349,7 +349,7 @@ TAO_AV_RTP_Object::handle_input (void)
   char *data_ptr;
   ACE_UINT16 length;
   RTP_Packet rtp_packet(this->frame_.rd_ptr (),
-                        ACE_static_cast (int,  this->frame_.length ()));
+                        static_cast<int> (this->frame_.length ()));
 
   rtp_packet.get_frame_info (&frame_info);
   rtp_packet.get_payload(&data_ptr, length);
@@ -388,8 +388,7 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame,
       if (frame_info->ssrc != 0)
         this->ssrc_ = frame_info->ssrc;
 
-      TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*,
-                                                            this->control_object_);
+      TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*> (this->control_object_);
       // set the ssrc on the control object so the RTCP traffic can be matched
       // to the RTP traffic
       rtcp_prot_obj->ssrc(this->ssrc_);
@@ -477,8 +476,7 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame,
   if (result < 0)
     ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP::send_frame failed\n"),result);
 
-  TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*,
-                                                        this->control_object_);
+  TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*> (this->control_object_);
   if (rtcp_prot_obj)
     rtcp_prot_obj->handle_control_output (&mb);
 
@@ -512,12 +510,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov,
       if (frame_info->ssrc != 0)
         this->ssrc_ = frame_info->ssrc;
 
-      TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*,
-                                                            this->control_object_);
+      TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*> (this->control_object_);
       // set the ssrc on the control object so the RTCP traffic can be matched
       // to the RTP traffic
       rtcp_prot_obj->ssrc(this->ssrc_);
-
+      ACE_UINT16 data_size = static_cast<ACE_UINT16> (iov[0].iov_len);
 
       ACE_NEW_RETURN (rtp_packet,
                       RTP_Packet (0,                            // padding
@@ -528,8 +525,8 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov,
                                   this->ssrc_,                  // ssrc
                                   csrc_count,                   // csrc count
                                   csrc_list,                    // csrc list
-                                  (char *)iov[0].iov_base,              // data
-                                  iov[0].iov_len),              // data size
+                                  (char *)iov[0].iov_base,      // data
+                                  data_size),                   // data size
                                   -1);
 
       frame_info->sequence_num ++;
@@ -575,6 +572,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov,
                       (now.sec () * samples_per_sec +
                        ((double)now.usec () * samples_per_usec) +
                        this->timestamp_offset_);
+      ACE_UINT16 data_size = static_cast<ACE_UINT16> (iov[0].iov_len);
 
       ACE_NEW_RETURN (rtp_packet,
                       RTP_Packet (0,                            // padding
@@ -585,8 +583,8 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov,
                                   this->ssrc_,                  // ssrc
                                   csrc_count,                   // csrc count
                                   csrc_list,                    // csrc list
-                                  (char *)iov[0].iov_base,              // data
-                                  iov[0].iov_len),              // data size
+                                  (char *)iov[0].iov_base,      // data
+                                  data_size),                   // data size
                                   -1);
 
       this->sequence_num_ ++;
@@ -669,7 +667,7 @@ TAO_AV_RTP_Object::set_policies (const TAO_AV_PolicyList &policy_list)
         case TAO_AV_PAYLOAD_TYPE_POLICY:
           {
             TAO_AV_Payload_Type_Policy *payload_policy =
-              ACE_static_cast (TAO_AV_Payload_Type_Policy *,policy);
+              static_cast<TAO_AV_Payload_Type_Policy *> (policy);
             if (payload_policy == 0)
               ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP_Object::send_frame:Payload policy not defined\n"),-1);
             this->format_ = payload_policy->value ();
@@ -678,7 +676,7 @@ TAO_AV_RTP_Object::set_policies (const TAO_AV_PolicyList &policy_list)
         case TAO_AV_SSRC_POLICY:
           {
             TAO_AV_SSRC_Policy *ssrc_policy =
-              ACE_static_cast (TAO_AV_SSRC_Policy *,policy);
+              static_cast<TAO_AV_SSRC_Policy *> (policy);
             if (ssrc_policy == 0)
               ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP_Object::send_frame:SSRC policy not defined\n"),-1);
             this->ssrc_ = ssrc_policy->value ();;
@@ -696,8 +694,7 @@ void
 TAO_AV_RTP_Object::control_object (TAO_AV_Protocol_Object *object)
 {
   this->control_object_ = object;
-  TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*,
-                                                        this->control_object_);
+  TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*> (this->control_object_);
   rtcp_prot_obj->ssrc (this->ssrc_);
   rtcp_prot_obj->ts_offset (this->timestamp_offset_);
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h
index 1af28588edd..14e17886ab0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h
@@ -53,6 +53,9 @@
 #include "orbsvcs/AV/AV_export.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
+#include "ace/Service_Config.h"
+
+
 #define RTP_PT_BVC              22      /* Berkeley video codec */
 
 /* RTP standard content encodings for video */
diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
index d357b0fc287..59a3ea87259 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
@@ -76,7 +76,7 @@ TAO_AV_SCTP_SEQ_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *
       if (i->length () > 0)
         {
           iov[iovcnt].iov_base = i->rd_ptr ();
-          iov[iovcnt].iov_len  = ACE_static_cast (u_long, i->length ());
+          iov[iovcnt].iov_len  = static_cast<u_long> (i->length ());
           iovcnt++;
 
           // The buffer is full make a OS call.  @@ TODO this should
@@ -478,7 +478,7 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry,
   else
     this->flowname_ = entry->flowname ();
   ACE_Addr *remote_addr = entry->address ();
-  ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr *,remote_addr);
+  ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *> (remote_addr);
   TAO_AV_SCTP_SEQ_Flow_Handler *handler = 0;
 
   ACE_Multihomed_INET_Addr remote_multi_addr;
@@ -492,7 +492,7 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry,
   ACE_INET_Addr *addr;
   if (entry->get_peer_addr () != 0)
     {
-      addr = ACE_dynamic_cast (ACE_INET_Addr *, entry->get_peer_addr ());
+      addr = dynamic_cast<ACE_INET_Addr *> (entry->get_peer_addr ());
     }
   else
     {
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index b6ca6136030..4ecdbe1e386 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -67,7 +67,7 @@ TAO_AV_TCP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *)
       if (i->length () > 0)
         {
           iov[iovcnt].iov_base = i->rd_ptr ();
-          iov[iovcnt].iov_len  = ACE_static_cast (u_long, i->length ());
+          iov[iovcnt].iov_len  = static_cast<u_long> (i->length ());
           iovcnt++;
 
           // The buffer is full make a OS call.  @@ TODO this should
@@ -416,7 +416,7 @@ TAO_AV_TCP_Connector::connect (TAO_FlowSpec_Entry *entry,
   else
   this->flowname_ = entry->flowname ();
   ACE_Addr *remote_addr = entry->address ();
-  ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr *,remote_addr);
+  ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *> (remote_addr);
   TAO_AV_TCP_Flow_Handler *handler;
   int result = this->connector_.connector_connect (handler,
                                                    *inet_addr);
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h
index 6d43733501b..51bb5235fd6 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h
@@ -15,10 +15,11 @@
 #define TAO_AV_TCP_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
 #include "Protocol_Factory.h"
 #include "FlowSpec_Entry.h"
 
+#include "ace/Service_Config.h"
+
 /**
  * @class TAO_AV_TCP_Factory
  * @brief
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 0c3e7bc36a2..c3ec44ba771 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -61,11 +61,9 @@ TAO_AV_UDP_Flow_Handler::set_remote_address (ACE_Addr *address)
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Flow_Handler::set_remote_address\n"));
 
-  ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,
-                                               address);
+  ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (address);
   this->peer_addr_ = *inet_addr;
-  TAO_AV_UDP_Transport *transport = ACE_dynamic_cast (TAO_AV_UDP_Transport*,
-                                                      this->transport_);
+  TAO_AV_UDP_Transport *transport = dynamic_cast<TAO_AV_UDP_Transport*> (this->transport_);
 
   return transport->set_remote_address (*inet_addr);
 }
@@ -224,7 +222,7 @@ TAO_AV_UDP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *)
       if (i->length () > 0)
         {
           iov[iovcnt].iov_base = i->rd_ptr ();
-          iov[iovcnt].iov_len  = ACE_static_cast (u_long, i->length ());
+          iov[iovcnt].iov_len  = static_cast<u_long> (i->length ());
           iovcnt++;
 
           // The buffer is full make a OS call.  @@ TODO this should
@@ -442,8 +440,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr,
     {
       flow_handler = this->entry_->control_handler ();
 
-      local_addr = ACE_dynamic_cast (ACE_INET_Addr*,
-                                     this->entry_->get_local_control_addr ());
+      local_addr = dynamic_cast<ACE_INET_Addr*> (this->entry_->get_local_control_addr ());
     }
   else
     {
@@ -610,13 +607,13 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
   if (flow_component == TAO_AV_Core::TAO_AV_CONTROL)
     {
       this->flowname_ = TAO_AV_Core::get_control_flowname (entry->flowname());
-    inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->control_address ());
+    inet_addr = dynamic_cast<ACE_INET_Addr*> (entry->control_address ());
     }
   else
     {
       this->flowname_ = entry->flowname ();
-      inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->address ());
-      control_inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->control_address ());
+      inet_addr = dynamic_cast<ACE_INET_Addr*> (entry->address ());
+      control_inet_addr = dynamic_cast<ACE_INET_Addr*> (entry->control_address ());
     }
 
   TAO_AV_Flow_Handler *flow_handler = 0;
@@ -630,8 +627,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
       flow_handler = this->entry_->control_handler ();
       flow_handler->set_remote_address (inet_addr);
 
-      local_addr = ACE_dynamic_cast (ACE_INET_Addr*,
-                                     this->entry_->get_local_control_addr ());
+      local_addr = dynamic_cast<ACE_INET_Addr*> (this->entry_->get_local_control_addr ());
     }
   else
     {
@@ -647,7 +643,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
 	  ACE_Addr *addr;
 	  if ((addr = entry->get_peer_addr ()) != 0)
 	    {
-	      local_addr = ACE_dynamic_cast (ACE_INET_Addr*,addr);
+	      local_addr = dynamic_cast<ACE_INET_Addr*> (addr);
 	      char buf [BUFSIZ];
 	      local_addr->addr_to_string (buf, BUFSIZ);
 	    }
@@ -675,8 +671,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
                   TAO_AV_Flow_Handler *control_flow_handler = 0;
 
                   if (entry->is_multicast ())
-                    control_inet_addr =  ACE_dynamic_cast (ACE_INET_Addr*,
-                                                           entry->control_address ()) ;
+                    control_inet_addr =  dynamic_cast<ACE_INET_Addr*> (entry->control_address ()) ;
                   else
                     {
 
@@ -698,7 +693,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
                                         ACE_INET_Addr ("0"),
                                         -1);
                       else
-                        control_inet_address_ = ACE_dynamic_cast (ACE_INET_Addr*,entry->control_address ());
+                        control_inet_address_ = dynamic_cast<ACE_INET_Addr*> (entry->control_address ());
                     }
 
                   TAO_AV_UDP_Connection_Setup::setup (control_flow_handler,
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h
index fc608667404..1c228004bcf 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h
@@ -15,9 +15,10 @@
 #define TAO_AV_UDP_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
 #include "Protocol_Factory.h"
 
+#include "ace/Service_Config.h"
+
 /**
  * @class TAO_AV_UDP_Factory
  * @brief
@@ -38,7 +39,7 @@ class TAO_AV_UDP_Flow_Handler;
 
 /**
  * @class TAO_AV_UDP_Transport
- * @brief A transport abstraction for udp sockets. 
+ * @brief A transport abstraction for udp sockets.
  *        Uses the ACE_SOCK_Dgram to send the data.
  */
 class TAO_AV_Export TAO_AV_UDP_Transport
@@ -92,7 +93,7 @@ public:
                         ACE_Time_Value *s = 0);
 
   TAO_AV_UDP_Flow_Handler *handler (void) { return this->handler_; }
-  
+
 protected:
   TAO_AV_UDP_Flow_Handler *handler_;
   ACE_Addr *addr_;
@@ -101,7 +102,7 @@ protected:
 
 /**
  * @class TAO_AV_UDP_Flow_Handler
- * @brief Flow Handler for UDP flows. 
+ * @brief Flow Handler for UDP flows.
  */
 class TAO_AV_Export TAO_AV_UDP_Flow_Handler
   :public virtual TAO_AV_Flow_Handler,
@@ -132,7 +133,7 @@ protected:
 
 /**
  * @class TAO_AV_UDP_Acceptor
- * @brief 
+ * @brief
  */
 class TAO_AV_Export TAO_AV_UDP_Acceptor
   :public TAO_AV_Acceptor
@@ -173,7 +174,7 @@ protected:
 
 /**
  * @class TAO_AV_UDP_Connector
- * @brief 
+ * @brief
  */
 class TAO_AV_Export TAO_AV_UDP_Connector
   :public TAO_AV_Connector
@@ -247,7 +248,7 @@ public:
 
   virtual int send_frame (const char*buf,
                           size_t len);
-  
+
   /// end the stream.
   virtual int destroy (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/pluggable_av_log b/TAO/orbsvcs/orbsvcs/AV/pluggable_av_log
deleted file mode 100644
index 2c02fb7c772..00000000000
--- a/TAO/orbsvcs/orbsvcs/AV/pluggable_av_log
+++ /dev/null
@@ -1,309 +0,0 @@
-Mon Aug  9 15:25:49 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/: 
-          Split the Transport files for different protocols like UDP and
-	  TCP seperate files. Also added a new Protocol_Factory.{h,cpp}
-	  which contains the factory information. Added new flow protocol
-	  classes and remodelled the architecture with true layering
-	  between the Protocol_Object and the Transport class. 
-
-Tue Aug  3 14:24:21 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp} : Defined the
-	  TAO_String_Hash_Key from Trader.{h,cpp} with TAO_Has_Trader
-	  flags so it gets defined if Trader is not defined. Added code to
-	  set the source ids for flow producers. Fixed a bug in
-	  add_producer code which wont add a second producer. 
-
-	* orbsvcs/orbsvcs/AV/Flows_T.{h,cpp}: Templatized the FDev by the
-	  concrete producer and consumer and also moved them to the
-	  separate files.
-
-	* orbsvcs/orbsvcs/AV/AV_Core.{h,cpp}: Moved the AV_Core class
-	  to this file.
-
-	* orbsvcs/orbsvcs/AV/AVStreams_i.i: Inlined all the small
-	  functions in TAO_AV_Qos class.
-
-	* orbsvcs/orbsvcs/AV/Transport.i: Moved all inline functions to
-	  this file.
-
-	* orbsvcs/orbsvcs/AV/Policy.h: Added a new send_frame on the
-	  protocol object to send iovecs. 
-
-	* orbsvcs/orbsvcs/AV/RTP.{h,cpp}: Added an implementation for
-	  send_frame using iovecs. Also fixed a bug in the creation of
-	  RTCP_Flow_Handler in the UDP_MCast_Connector.
-
-	* orbsvcs/orbsvcs/AV/FlowSpec_Entry.{h,i,cpp}: Moved all the
-	  FlowSpec_Entry class code to a separate file.
-	
-Mon Jul 26 18:27:56 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/RTCP.{h,cpp}: 
-	  These 2 new files contain all the classes for TAO AV's RTCP
-	  implementation. Applications now dont have to write RTCP
-	  code. The AV framework also gives hooks to get to the statistics
-	  for a particular section. There'll be one RTCP object per flow.
-
-	* orbsvcs/orbsvcs/AV/media-timer.h:
-	* orbsvcs/orbsvcs/AV/ntp-time.h:
-	  These files contain the media specific timestamp classes. These
-	  provide default implementations for RTCP. Application objects
-	  can override this behavior.
-
-	* orbsvcs/orbsvcs/AV/RTP.{h,cpp}:
-	  Added RTP over UDP Multicast classes. Now the RTP layer
-	  interacts with the source Manager to collect RTP statistics.
-
-	* orbsvcs/orbsvcs/AV/source.{h,cpp}:
-	  These files provide a RTP source class. Applications should
-	  derive if they want to extend the behavior.
-
-	* orbsvcs/orbsvcs/AV/Policy.{h,cpp}:
-	  Added a new TAO_AV_frame_info struct which contains information
-	  for a frame. This helps resolve the differences between the
-	  different framing layer protocols like RTP and SFP.
-	  
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}:
-	  Added support for RTP_UDP_MCAST.
-	
-Tue Jul 20 14:50:52 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/tests/AVStreams/:
-	  Changed the unit of fread in all ftp.cpp files from BUFSIZ to 1
-	  so that the entire file is transferred.
-	
-	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp: Updated destroy methods to
-	  called end_stream on the protocol object.
-
-	* orbsvcs/orbsvcs/AV/MCast.cpp: Added a multicast_loop disable by
-	  default. This should probably be moved as a policy. Also added
-	  code to set send and recv buf sizes to 80k by default. Again
-	  this should probably be a policy set by the application. Added a
-	  get_local_addr method to get the multicast address on which it
-	  is listening.
-	
-	* orbsvcs/orbsvcs/AV/Transport.{h,cpp}: Added set/get methods on
-	  the TAO_AV_Callback class for transport object.
-
-	* orbsvcs/orbsvcs/AV/sfp.cpp: Removed the commented call to
-	  TAO_SFP_Base::instance since this allowed the setting of the
-	  static variables. 
-	
-Thu Jul 15 22:43:51 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/Policy.i:
-	* orbsvcs/orbsvcs/AV/MCast.i:
-	  Moved all the inline methods to the new .i files.
-			
-	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-	* orbsvcs/orbsvcs/AV/MCast.cpp:
-	* orbsvcs/orbsvcs/AV/MCast.h:
-	* orbsvcs/orbsvcs/AV/Nil.cpp:
-	* orbsvcs/orbsvcs/AV/Nil.h
-	* orbsvcs/orbsvcs/AV/Policy.cpp:
-	* orbsvcs/orbsvcs/AV/Policy.h:
-	* orbsvcs/orbsvcs/AV/RTP.cpp:
-	* orbsvcs/orbsvcs/AV/RTP.h:
-	* orbsvcs/orbsvcs/AV/Transport.cpp:
-	* orbsvcs/orbsvcs/AV/sfp.cpp:
-	* orbsvcs/orbsvcs/AV/sfp.h: Fixed warnings in EGCS
-
-Wed Jul 14 20:29:06 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp: 
-	* orbsvcs/orbsvcs/AV/MCast.cpp:
-	* orbsvcs/orbsvcs/AV/Transport.cpp:Changed the inheritance
-	  structure.. Made the UDP_Flow_Handler classes have the
-	  SOCK_Dgram as a memebr rather than inheriting from it..
-	  Fixed warnings with g++ in other files listed below
-	* orbsvcs/orbsvcs/AV/Nill.cpp:
-	* orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp:
-	* orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp:
-	* orbsvcs/orbsvcs/AV/Policy.cpp:
-	* orbsvcs/orbsvcs/AV/sfp.cpp
-	* orbsvcs/orbsvcs/AV/RTP.cpp
-
-Wed Jul 14 00:27:00 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.{h,cpp}: 
-	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.{h,cpp}: 
-	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile:
-	  Added this directory and files for testing the multipoint
-	  binding in AVStreams in the full profile. This code is hardcoded
-	  with 2 servers and a single ftp program streaming a file. The
-	  servers store the streamed file received thru the multipoint
-	  binding as 2 different files. 
-	
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}:
-	  Added code so that the multipoint binding work in the full
-	  profile. Now the users can use full profile object like FDevs
-	  inside MMDevice to create flow producers and flow
-	  consumers. Right now the case of one multipoint source and
-	  multiple multipoint sinks has been tested with the Full
-	  profile. 
-	
-Tue Jul 13 12:18:44 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/tests/AVStreams/Multicast/Makefile: 
-	* orbsvcs/tests/AVStreams/Multicast/server.{h,cpp}: 
-	* orbsvcs/tests/AVStreams/Multicast/ftp.{h,cpp}: 
-	  Added all the new files to test the Multipoint binding in
-	  AVStreams. Two instances of server receive the same file from
-	  the ftp program and save them under 2 different filenames using
-	  the multipoint bindings of TAO_StreamCtrl in the light profile.
-	
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}: 
-	  Fixed a few a error in the multipoint bind_devs case. It works
-	  now with one multicast source and multiple multicast sinks in
-	  the light profile i.e with no FlowEndPoint interfaces.
-
-	* orbsvcs/orbsvcs/AV/MCast.cpp:
-	  Added code to set the local address on the TAO_FlowSpec_Entry
-	  upon accepting/connecting to a connection so that multiconnect
-	  call can extract the multicast address being used for this
-	  flow.
-			
-Mon Jul 12 16:15:20 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp: 
-	  Removed the flowname from the flowspec for start and stop and
-	  made use of the "empty flowspec will start all flows" feature of
-	  the Streamctrl.
-
-	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp: 
-	  Fixed the empty flowspec case for StreamCtrl::start,stop and
-	  destroy operations. Now the user can specify an empty flowspec
-	  and the operation will be done for all the flows.
-
-Sun Jul 11 20:10:13 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}: 
-	  Added code for the FlowEndPoint to make use of the Pluggable
-	  Data Protocols. Also fixed a few bugs in the full profile
-	  TAO_StreamCtrl::bind and other full profile classes like
-	  TAO_FlowConnection. Now the AV application can make use of FDev
-	  in MMDevices for each flow and automagically the appropriate
-	  protocols will be chosen depending on the common protocol
-	  between 2 flow endpoints. 
-
-	* orbsvcs/tests/AVStreams/Full_Profile/ftp.{h,cpp}:
-	* orbsvcs/tests/AVStreams/Full_Profile/server.{h,cpp}:
-	* orbsvcs/tests/AVStreams/Full_Profile/Makefile:
-	  Added a new test similar to the file transfer program under
-	  Pluggable directory. This test make use of the full profile
-	  classes. A FDev create flow consumers and flow producers and is
-	  added to the MMDevice. During streamconnection this fdev creates
-	  the consumer/producer depending on whether its a client or a
-	  server. The flow endpoint is also a base_streamendpoint ensuring
-	  that the pluggable data protocols can set the protocol object.
-
-Wed Jul  7 22:05:22 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/RTP.{h,cpp}: 
-	  Added RTP over UDP support to the pluggable data protocols
-	  framework in AV. The RTCP part is not complete yet.
-
-	* orbsvcs/orbsvcs/AV/Policy.{h,cpp}:
-	  Defines the policy class to resolve differences in behavior
-	  between the different framing protocols like SFP and RTP. For
-	  eg RTP needs the Payload Type for all frames whereas in SFP its
-	  optional. 
-
-	* orbsvcs/orbsvcs/AV/Nil.{h,cpp}:
-	  Defines Nil Framing protocols for TCP,UDP and UDP_MCast which
-	  just sends the frames over the underlying transport.
-
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}:
-	  The protocol specific upcalls have been removed and there is a
-	  generic upcall for setting the protocol object and getting the
-	  callback for a flow.
-
-	* orbsvcs/orbsvcs/AV/Transport.{h,cpp}:
-	* orbsvcs/orbsvcs/AV/sfp.{h,cpp}:
-	  All the transport handlers for udp,tcp,sfp now create protocol
-	  objects and makes an upcall to the application to set them.
-
-	* orbsvcs/tests/AVStreams/Pluggable/ftp.{h,cpp}:
-	  The application now uses a generic TAO_AV_Protocol_Object to
-	  send the frames except for RTP for which it sets the
-	  synchronization source and payload type policies.
-
-	* orbsvcs/tests/AVStreams/Pluggable/server.{h,cpp}:
-	  The server side defines a generic TAO_AV_Callback which is
-	  called by all the different framing protocols to give the
-	  received frame.
-	
-Sun Jul  4 17:59:10 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/MCast.cpp: 
-	  Added Multicast Pluggable Data Protocol classes.
-
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}:
-	* orbsvcs/orbsvcs/AV/Transport.{h,cpp}:
-	* orbsvcs/orbsvcs/AV/sfp.h:
-	  Added support for the Multicast data protocols.
-
-	* orbsvcs/tests/AVStreams/Pluggable/ftp.{h,cpp}: 
-	* orbsvcs/tests/AVStreams/Pluggable/server.{h,cpp}: 
-	  Added handler for Multicast Pluggable Data Protocol and if given
-	  a multicast address on the command line to ftp it will multicast
-	  the file to that address. 
-
-Sun Jul  4 13:59:05 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/tests/AVStreams/Pluggable/ftp.{h,cpp}: 
-	  This is a simple file transfer example to test the Pluggable
-	  Data protocols feature provided by the AV service. It currently
-	  implements handler for UDP,TCP and SFP_UDP. This streams a given
-	  file at the rate of 0.5kbytes/sec. 
-
-	* orbsvcs/tests/AVStreams/Pluggable/server.{h,cpp}: 
-	  This is the receiver side of the file transfer example and also
-	  provides protocol specific handler to receive data from the
-	  client and saves it to a file.
-	
-	* orbsvcs/orbsvcs/AV/sfp.{h,cpp}: 
-	  The SFP implementation has been remodelled similar to the GIOP
-	  implementation since it plays a similar role in AV framework as
-	  GIOP in the ORB. There is a TAO_SFP_Base class which contains
-	  only static methods and works on generic TAO_AV_Transport
-	  classes so that the SFP specific code can be reused for
-	  mappings over different transport like TCP and UDP. This design
-	  may not entirely work out since the mapping of SFP over
-	  different transport especially protocols like RTP may differ
-	  unlike GIOP which imposes a uniform restriction on the transport.
-	
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}: 
-	  The TAO_Client_StreamEndPoint and TAO_Server_StreamEndPoint have
-	  been renamed to TAO_StreamEndPoint_A and TAO_StreamEndPoint_B as
-	  there is no notion of client and server in the streaming model,
-	  rather both are identical except in the multicast case. Also
-	  they're distinguished for type identification to the user. 
-
-	  The TAO_StreamEndPoint class now makes use of the Pluggable Data
-	  Protocols to instantiate a given protocol handler and has hooks
-	  for the user to supply a user-defined handler. Right now the
-	  user has to supply different handlers for different protocols
-	  but can use the same code to send and receive data using the
-	  generic TAO_AV_Transport class interface.
-
-	  Also in the case of SFP the SFP_Object is the interface to be
-	  used by the sender and TAO_SFP_Callback is the interface on the
-	  receiver side to which the framework makes an upcall when a
-	  frame is received.
-		
-	* orbsvcs/orbsvcs/AV/Transport.{h,cpp}: 
-	  These new files contain all the classes necessary for the A/V
-	  Service's Pluggable Data protocols used by the
-	  TAO_StreamEndPoint classes. This architecture is very similar to
-	  the ORB Pluggable protocols architecture except for the Profile
-	  specific and ORB specific code. The equivalent of a Profile in
-	  AV is the TAO_AV_FlowSpec_Entry which can either be a forward or
-	  reverse entry.
-
-	  Currently this file contains the TCP and UDP Pluggable Data
-	  protocols implementation. It also contains the implementation of
-	  a TAO_AV_Core class similar in spirit to the ORB_Core class so
-	  as to centralize all the Pluggable Protocol data structures. 
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index 984b8a05e24..f82977a1b20 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -65,7 +65,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
       return;
     }
 
-  frame_header_len = ACE_static_cast (u_int, output_cdr.total_length ());
+  frame_header_len = static_cast<u_int> (output_cdr.total_length ());
   // fill in the default fragment message fields.
   fragment.magic_number [0] = 'F';
   fragment.magic_number [1] = 'R';
@@ -78,7 +78,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
       return;
     }
 
-  fragment_len = ACE_static_cast (u_int, output_cdr.total_length ());
+  fragment_len = static_cast<u_int> (output_cdr.total_length ());
   // fill in the default Start message fields.
   start.magic_number [0] = '=';
   start.magic_number [1] = 'S';
@@ -94,7 +94,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
       return;
     }
 
-  start_len = ACE_static_cast (u_int, output_cdr.total_length ());
+  start_len = static_cast<u_int> (output_cdr.total_length ());
   // fill in the default StartReply message fields.
   start_reply.magic_number [0] = '=';
   start_reply.magic_number [1] = 'S';
@@ -108,7 +108,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
       return;
     }
 
-  start_reply_len = ACE_static_cast (u_int, output_cdr.total_length ());
+  start_reply_len = static_cast<u_int> (output_cdr.total_length ());
 
   // fill in the default Credit message fields.
   credit.magic_number [0] = '=';
@@ -122,7 +122,7 @@ TAO_SFP_Base::TAO_SFP_Base (void)
       ACE_ERROR ((LM_ERROR, "TAO_SFP constructor\n"));
       return;
     }
-  credit_len = ACE_static_cast (u_int, output_cdr.total_length ());
+  credit_len = static_cast<u_int> (output_cdr.total_length ());
 }
 
 int
@@ -284,8 +284,7 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport,
       ACE_NEW_RETURN (new_node,
                       TAO_SFP_Fragment_Node,
                       0);
-      new_node->fragment_info_.frag_sz = ACE_static_cast (CORBA::ULong,
-                                                          data->length ());
+      new_node->fragment_info_.frag_sz = static_cast<CORBA::ULong> (data->length ());
       new_node->fragment_info_.frag_number = 0;
       if (state.frame_.source_ids.length () > 0)
         new_node->fragment_info_.source_id = state.frame_.source_ids [0];
@@ -597,12 +596,11 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport,
                             TAO_OutputCDR &stream,
                             ACE_Message_Block *mb)
 {
-  CORBA::ULong total_len = ACE_static_cast (CORBA::ULong,
-                                            stream.total_length ());
+  CORBA::ULong total_len = static_cast<CORBA::ULong> (stream.total_length ());
   if (mb != 0)
     {
       for (ACE_Message_Block *temp = mb;temp != 0;temp = temp->cont ())
-        total_len += ACE_static_cast (CORBA::ULong, temp->length ());
+        total_len += static_cast<CORBA::ULong> (temp->length ());
 
       char *buf = (char *) stream.buffer ();
       size_t offset = TAO_SFP_MESSAGE_SIZE_OFFSET;
@@ -613,14 +611,12 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport,
           offset = TAO_SFP_FRAGMENT_SIZE_OFFSET;
         }
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-      *ACE_reinterpret_cast (CORBA::ULong *, buf + offset) = total_len;
+      *reinterpret_cast<CORBA::ULong *> (buf + offset) = total_len;
 #else
       if (!stream.do_byte_swap ())
-        *ACE_reinterpret_cast (CORBA::ULong *,
-                               buf + offset) = total_len;
+        *reinterpret_cast<CORBA::ULong *> (buf + offset) = total_len;
       else
-        ACE_CDR::swap_4 (ACE_reinterpret_cast (char *,
-                                               &total_len),
+        ACE_CDR::swap_4 (reinterpret_cast<char *> (&total_len),
                          buf + offset);
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
     }
@@ -714,7 +710,7 @@ TAO_SFP_Base::read_start_message (TAO_AV_Transport *transport,
   char *buf = input.rd_ptr ();
   int n = transport->recv (buf,
                            start_len);
-  if (n != ACE_static_cast (int, start_len))
+  if (n != static_cast<int> (start_len))
     ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_start\n"),0);
   else
     {
@@ -734,7 +730,7 @@ TAO_SFP_Base::read_start_reply_message (TAO_AV_Transport *transport,
   char *buf = input.rd_ptr ();
   int n = transport->recv (buf,
                            start_reply_len);
-  if (n != ACE_static_cast (int, start_len))
+  if (n != static_cast<int> (start_len))
     ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_start_reply_message"),0);
   else
     {
@@ -753,7 +749,7 @@ TAO_SFP_Base::read_credit_message (TAO_AV_Transport *transport,
   char *buf = input.rd_ptr ();
   int n = transport->recv (buf,
                            credit_len);
-  if (n != ACE_static_cast (int, credit_len))
+  if (n != static_cast<int> (credit_len))
     ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_credit_message"),0);
   else
     {
@@ -772,7 +768,7 @@ TAO_SFP_Base::read_endofstream_message (TAO_AV_Transport *transport,
   char *buf = input.rd_ptr ();
   int n = transport->recv (buf,
                            frame_header_len);
-  if (n != ACE_static_cast (int, frame_header_len))
+  if (n != static_cast<int> (frame_header_len))
     ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0);
   else
     {
@@ -792,7 +788,7 @@ TAO_SFP_Base::peek_frame_header (TAO_AV_Transport *transport,
   int n = transport->recv (buf,
                            frame_header_len,
                            MSG_PEEK);
-  if (n != ACE_static_cast (int, frame_header_len))
+  if (n != static_cast<int> (frame_header_len))
     ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0);
   else
     {
@@ -812,7 +808,7 @@ TAO_SFP_Base::peek_fragment_header (TAO_AV_Transport *transport,
   int n = transport->recv (buf,
                            fragment_len,
                            MSG_PEEK);
-  if (n != ACE_static_cast (int, fragment_len))
+  if (n != static_cast<int> (fragment_len))
     ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0);
   else
     {
@@ -949,8 +945,7 @@ TAO_SFP_Object::send_frame (ACE_Message_Block *frame,
                 return 0;
             }
           size_t last_len,current_len;
-          int message_len = ACE_static_cast (int,
-                                             out_stream.total_length ());
+          int message_len = static_cast<int> (out_stream.total_length ());
           ACE_Message_Block *mb = frame;
           ACE_Message_Block *fragment_mb =
             this->get_fragment (mb,
@@ -1100,7 +1095,7 @@ TAO_SFP_Object::set_policies (const TAO_AV_PolicyList& policies)
         case TAO_AV_SFP_CREDIT_POLICY:
           {
             TAO_AV_SFP_Credit_Policy *credit_policy =
-              ACE_reinterpret_cast (TAO_AV_SFP_Credit_Policy*,policy);
+              reinterpret_cast<TAO_AV_SFP_Credit_Policy*> (policy);
             this->max_credit_ = credit_policy->value ();
           }
         default:
@@ -1374,6 +1369,8 @@ template class ACE_Singleton<TAO_SFP_Base, TAO_SYNCH_MUTEX>;
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *,ACE_Null_Mutex>
 
 #pragma instantiate ACE_Singleton<TAO_SFP_Base, TAO_SYNCH_MUTEX>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex> *ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SFP_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 6dc0902b62c..3f313dae277 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -20,4 +20,11 @@ project(CosConcurrency) : orbsvcslib, core, portableserver {
       Concurrency
     }
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosConcurrency.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 70caeb9f47f..7a4c3bea5b6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -19,6 +19,7 @@ project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
   Header_Files {
     CosEventCommC.h
     CosEventChannelAdminC.h
+    CosEvent/event_export.h
   }
 
   Inline_Files {
@@ -26,10 +27,17 @@ project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
     CosEventChannelAdminC.inl
   }
 
+  Template_Files {
+  }
+
   // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files{
+  Resource_Files {
     CosEvent.rc
   }
+
+  Pkgconfig_Files {
+    TAO_CosEvent.pc.in
+  }
 }
 
 
@@ -48,11 +56,25 @@ project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver
   Header_Files {
     CosEventCommS.h
     CosEventChannelAdminS.h
+    CosEventCommS_T.h
+    CosEventChannelAdminS_T.h
+    CosEvent/event_skel_export.h
   }
 
   Inline_Files {
     CosEventCommS.inl
     CosEventChannelAdminS.inl
+    CosEventCommS_T.inl
+    CosEventChannelAdminS_T.inl
+  }
+
+  Template_Files {
+    CosEventCommS_T.cpp
+    CosEventChannelAdminS_T.cpp
+  }
+
+  Pkgconfig_Files {
+    TAO_CosEvent_Skel.pc.in
   }
 }
 
@@ -88,4 +110,11 @@ project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_
       CosEvent/CEC_SupplierControl.cpp
     }
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosEvent_Serv.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index 180466d987e..9994b1bcac3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -2,12 +2,8 @@
 
 #include "CEC_ConsumerControl.h"
 
-#if ! defined (__ACE_INdLINE__)
-#include "CEC_ConsumerControl.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (CosEvent, 
-           CEC_ConsumerControl, 
+ACE_RCSID (CosEvent,
+           CEC_ConsumerControl,
            "$Id$")
 
 TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index f3a405d26c7..5f25b3fffd2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -91,9 +91,5 @@ public:
   virtual void successful_transmission (PortableServer::ServantBase* proxy);
 };
 
-#if defined (__ACE_INLINE__)
-#include "CEC_ConsumerControl.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_CEC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index 6be89cac48a..78da73b4007 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -34,13 +34,13 @@
 #include "CEC_Default_Factory.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent, 
-           CEC_Default_Factory, 
+ACE_RCSID (CosEvent,
+           CEC_Default_Factory,
            "$Id$")
 
 TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void)
 {
-    if (orbid_dupped_ != 0) 
+    if (orbid_dupped_ != 0)
       {
         ACE_OS::free (orbid_);
       }
@@ -49,7 +49,7 @@ TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void)
 int
 TAO_CEC_Default_Factory::init_svcs (void)
 {
-  return 
+  return
     ACE_Service_Config::static_svcs ()->insert (
         &ace_svc_desc_TAO_CEC_Default_Factory
       );
@@ -1346,9 +1346,9 @@ template class TAO_ESF_Copy_On_Write_Collection<
 template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPushConsumer>;
 template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>;
 template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>;
-template class ACE_Unbounded_Set_Ex<TAO_CEC_ProxyPushConsumer *>;
+template class ACE_Unbounded_Set<TAO_CEC_ProxyPushConsumer *>;
 template class ACE_Node<TAO_CEC_ProxyPushConsumer *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_CEC_ProxyPushConsumer *>;
+template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPushConsumer *>;
 template class ACE_RB_Tree<TAO_CEC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>, ACE_Null_Mutex>;
@@ -1390,9 +1390,9 @@ template class TAO_ESF_Copy_On_Write_Collection<
 template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPushSupplier>;
 template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>;
 template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>;
-template class ACE_Unbounded_Set_Ex<TAO_CEC_ProxyPushSupplier *>;
+template class ACE_Unbounded_Set<TAO_CEC_ProxyPushSupplier *>;
 template class ACE_Node<TAO_CEC_ProxyPushSupplier *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_CEC_ProxyPushSupplier *>;
+template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPushSupplier *>;
 template class ACE_RB_Tree<TAO_CEC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>, ACE_Null_Mutex>;
@@ -1411,9 +1411,9 @@ template class TAO_ESF_Copy_On_Write_Collection<
 template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullConsumer>;
 template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>;
 template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>;
-template class ACE_Unbounded_Set_Ex<TAO_CEC_ProxyPullConsumer *>;
+template class ACE_Unbounded_Set<TAO_CEC_ProxyPullConsumer *>;
 template class ACE_Node<TAO_CEC_ProxyPullConsumer *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_CEC_ProxyPullConsumer *>;
+template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPullConsumer *>;
 template class ACE_RB_Tree<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>;
@@ -1432,9 +1432,9 @@ template class TAO_ESF_Copy_On_Write_Collection<
 template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullSupplier>;
 template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>;
 template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>;
-template class ACE_Unbounded_Set_Ex<TAO_CEC_ProxyPullSupplier *>;
+template class ACE_Unbounded_Set<TAO_CEC_ProxyPullSupplier *>;
 template class ACE_Node<TAO_CEC_ProxyPullSupplier *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_CEC_ProxyPullSupplier *>;
+template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPullSupplier *>;
 template class ACE_RB_Tree<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
index d314e1785ca..80572e0054f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -1,4 +1,3 @@
-// $Id$
 /* -*- C++ -*- */
 //=============================================================================
 /**
@@ -25,6 +24,7 @@
 #include "CEC_Defaults.h"
 
 #include "ace/Service_Config.h"
+#include "ace/Time_Value.h"
 
 /**
  * @class TAO_CEC_Default_Factory
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index 858d3a7581d..ef98d25450d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -3,10 +3,6 @@
 #include "CEC_Dispatching.h"
 #include "CEC_ProxyPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "CEC_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$")
 
 TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index a6ba0f8a724..e6aff0650d3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -110,10 +110,6 @@ public:
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 };
 
-#if defined (__ACE_INLINE__)
-#include "CEC_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CEC_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 5a3cd81e26a..8ca9427e19e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -33,7 +33,7 @@ TAO_CEC_Dispatching_Task::svc (void)
                         "EC (%P|%t) getq error in Dispatching Queue\n"));
 
           TAO_CEC_Dispatch_Command *command =
-            ACE_dynamic_cast(TAO_CEC_Dispatch_Command*, mb);
+            dynamic_cast<TAO_CEC_Dispatch_Command*> (mb);
 
           if (command == 0)
             {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 55f9282abe2..62f4884fe88 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -105,7 +105,7 @@ public:
   {
   public:
     u_long operator() (PortableServer::ServantBase* const & ptr) const {
-      return ACE_reinterpret_cast(u_long, ptr);
+      return reinterpret_cast<u_long> (ptr);
     }
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index 78f11357d3e..5a7404c81e6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -25,9 +25,12 @@
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 #include "tao/debug.h"
 
-ACE_RCSID (CosEvent, Event_Loader, "$Id$")
+ACE_RCSID (CosEvent,
+           CEC_Event_Loader,
+           "$Id$")
 
 TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void)
 {
@@ -91,10 +94,11 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
 
       // Parse the options, check if we should bind with the naming
       // service and under what name...
-      ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("o:n:xrtd"));
+      ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:o:p:xrtd"));
       int opt;
       const ACE_TCHAR *service_name = ACE_LIB_TEXT("CosEventService");
       const ACE_TCHAR *ior_file = 0;
+      const ACE_TCHAR *pid_file = 0;
       this->bind_to_naming_service_ = 1;
       int use_rebind = 0;
 
@@ -109,12 +113,16 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
         {
           switch (opt)
             {
+            case 'n':
+              service_name = get_opt.opt_arg ();
+              break;
+
             case 'o':
               ior_file = get_opt.opt_arg ();
               break;
 
-            case 'n':
-              service_name = get_opt.opt_arg ();
+            case 'p':
+              pid_file = get_opt.opt_arg ();
               break;
 
             case 'x':
@@ -141,6 +149,8 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
               ACE_DEBUG ((LM_DEBUG,
                           "Usage: %s "
                           "-n service_name "
+                          "-o ior_file_name "
+                          "-p pid_file_name "
                           "-x [disable naming service bind] "
                           "-r [rebind, no AlreadyBound failures] "
                           "-t [enable typed event channel] "
@@ -151,6 +161,8 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
               ACE_DEBUG ((LM_DEBUG,
                           "Usage: %s "
                           "-n service_name "
+                          "-o ior_file_name "
+                          "-p pid_file_name "
                           "-x [disable naming service bind] "
                           "-r [rebind, no AlreadyBound failures] "
                           "\n",
@@ -207,9 +219,25 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
           CORBA::String_var ior =
             orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          FILE *file = ACE_OS::fopen (ior_file, ACE_LIB_TEXT("w"));
-          ACE_OS::fprintf (file, "%s\n", ior.in ());
-          ACE_OS::fclose (file);
+
+          FILE *iorf = ACE_OS::fopen (ior_file, ACE_LIB_TEXT("w"));
+          if (iorf != 0)
+            {
+              ACE_OS::fprintf (iorf, "%s\n", ior.in ());
+              ACE_OS::fclose (iorf);
+            }
+        }
+
+      if (pid_file != 0)
+        {
+          FILE *pidf = ACE_OS::fopen (pid_file, "w");
+          if (pidf != 0)
+            {
+              ACE_OS::fprintf (pidf,
+                               "%ld\n",
+                               static_cast<long> (ACE_OS::getpid ()));
+              ACE_OS::fclose (pidf);
+            }
         }
 
       // ****************************************************************
@@ -281,14 +309,17 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                                                 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              if (TAO_debug_level >= 10)
+              if (CORBA::is_nil(interface_repository.in () ))
                 {
-                  if (CORBA::is_nil(interface_repository.in () ))
+                  if (TAO_debug_level >= 10)
                     {
                       ACE_DEBUG ((LM_DEBUG, "***** CORBA::Repository::_narrow failed *****\n"));
-                      return CORBA::Object::_nil ();
                     }
-                  else
+                  return CORBA::Object::_nil ();
+                }
+              else
+                {
+                  if (TAO_debug_level >= 10)
                     {
                       ACE_DEBUG ((LM_DEBUG, "***** ...IFR connection completed *****\n"));
                     }
@@ -323,9 +354,25 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
               CORBA::String_var ior =
                 orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
-              FILE *file = ACE_OS::fopen (ior_file, "w");
-              ACE_OS::fprintf (file, "%s\n", ior.in ());
-              ACE_OS::fclose (file);
+
+              FILE *iorf = ACE_OS::fopen (ior_file, "w");
+              if (iorf != 0)
+                {
+                  ACE_OS::fprintf (iorf, "%s\n", ior.in ());
+                  ACE_OS::fclose (iorf);
+                }
+            }
+
+          if (pid_file != 0)
+            {
+              FILE *pidf = ACE_OS::fopen (pid_file, "w");
+              if (pidf != 0)
+                {
+                  ACE_OS::fprintf (pidf,
+                                   "%ld\n",
+                                   static_cast<long> (ACE_OS::getpid ()));
+                  ACE_OS::fclose (pidf);
+                }
             }
 
           // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
index 03853ad74fe..9225b7f38aa 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
@@ -3,10 +3,6 @@
 #include "CEC_Factory.h"
 #include "ace/Dynamic_Service.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "CEC_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(CosEvent, CEC_Factory, "$Id$")
 
 TAO_CEC_Factory::~TAO_CEC_Factory (void)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
index 7161eb63dfd..d60f0e8811a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -215,9 +215,5 @@ public:
       destroy_supplier_control (TAO_CEC_SupplierControl*) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "CEC_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_CEC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 3a29103cb96..ddeddeb2ece 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -2,10 +2,6 @@
 
 #include "CEC_MT_Dispatching.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "CEC_MT_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(CosEvent, CEC_MT_Dispatching, "$Id$")
 
 TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index d3a706ff5b8..c19647c53d1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -90,10 +90,6 @@ private:
   int active_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "CEC_MT_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CEC_MT_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index cadc6623315..e6b54a8e24a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -363,8 +363,3 @@ TAO_CEC_ProxyPushConsumer_Guard::
   this->event_channel_->destroy_proxy (this->proxy_);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
index 0a84bf5f77c..5367a8c4eda 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
@@ -2,10 +2,6 @@
 
 #include "CEC_Pulling_Strategy.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "CEC_Pulling_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(CosEvent, CEC_Pulling_Strategy, "$Id$")
 
 TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index b4c0c970545..4b2a60fce8e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -64,9 +64,5 @@ public:
 #endif /* 0 */
 };
 
-#if defined (__ACE_INLINE__)
-#include "CEC_Pulling_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_CEC_PULLING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index 795ba286da9..b9fe7ee6bce 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -23,8 +23,8 @@
 #include "CEC_Reactive_ConsumerControl.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent, 
-           CEC_Reactive_ConsumerControl, 
+ACE_RCSID (CosEvent,
+           CEC_Reactive_ConsumerControl,
            "$Id$")
 
 TAO_CEC_Reactive_ConsumerControl::
@@ -415,8 +415,3 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier
   ACE_ENDTRY;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 470f8a98292..4f14b03c058 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -190,8 +190,3 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
     }
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index 351b24a2fdc..8f75b183ce0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -24,8 +24,8 @@
 #include "CEC_Reactive_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (CosEvent, 
-           CEC_Reactive_SupplierControl, 
+ACE_RCSID (CosEvent,
+           CEC_Reactive_SupplierControl,
            "$Id$")
 
 TAO_CEC_Reactive_SupplierControl::
@@ -88,7 +88,7 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers (
   if (this->typed_event_channel_)
     {
       TAO_CEC_Ping_Typed_Push_Supplier push_worker (this);
-      
+
       this->typed_event_channel_->typed_supplier_admin ()->for_each (&push_worker
                                                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -473,8 +473,3 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer
   ACE_ENDTRY;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index 788cc6b7852..f8f3edccd29 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -2,10 +2,6 @@
 
 #include "CEC_SupplierControl.h"
 
-#if ! defined (__ACE_INdLINE__)
-#include "CEC_SupplierControl.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$")
 
 TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void)
@@ -66,8 +62,3 @@ TAO_CEC_SupplierControl::successful_transmission (PortableServer::ServantBase*)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 7875e543f34..242c3cd2172 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -106,9 +106,5 @@ public:
   virtual void successful_transmission (PortableServer::ServantBase* proxy);
 };
 
-#if defined (__ACE_INLINE__)
-#include "CEC_SupplierControl.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_CEC_SUPPLIERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index 1e5c3d7abdc..e3d4f923b2f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -223,11 +223,11 @@ TAO_CEC_TypedEventChannel::clear_ifr_cache (void)
       if (TAO_debug_level >= 10)
         {
           ACE_DEBUG ((LM_DEBUG, "***** Destroying operation %s from ifr cache *****\n",
-                      ACE_const_cast (char *, (*i).ext_id_)));
+                      const_cast<char *> ((*i).ext_id_)));
         }
 
       // Deallocate the operation
-      CORBA::string_free (ACE_const_cast (char *, (*i).ext_id_));
+      CORBA::string_free (const_cast<char *> ((*i).ext_id_));
 
       // Destroy the parameter
       delete ((*i).int_id_);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
index d503ac6da19..93aec091757 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
@@ -160,7 +160,7 @@ TAO_CEC_TypedEventChannel::supported_interface (void) const
 ACE_INLINE CORBA::RepositoryId
 TAO_CEC_TypedEventChannel::base_interfaces (CORBA::ULong index) const
 {
-  return ACE_const_cast (char *, this->base_interfaces_[index].in ());
+  return const_cast<char *> (this->base_interfaces_[index].in ());
 }
 
 ACE_INLINE CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index fb4e4778985..e64ee26c6e2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -415,8 +415,3 @@ TAO_CEC_TypedProxyPushConsumer_Guard::
   this->typed_event_channel_->destroy_proxy (this->proxy_);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index e4f299849b8..5aabc0ad101 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -22,4 +22,11 @@ project(CosLifeCycle) : orbsvcslib, core, naming, portableserver {
       LifeCycleServiceS.cpp
     }
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosLifeCycle.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.idl b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.idl
index f35a6df55df..b93e66a11b6 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.idl
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.idl
@@ -35,7 +35,7 @@
  */
 module CosLoadBalancing
 {
-  typeprefix CosLoadBalancing "omg.org";
+  typeprefix CosLoadBalancing "tao.lb";
 
   const IOP::ServiceId LOAD_MANAGED = 123456;  // @todo TBA by OMG
 
@@ -46,7 +46,7 @@ module CosLoadBalancing
   typedef unsigned long LoadId;
 
   // OMG defined LoadId constants.
-  const LoadId CPU = 0;
+  const LoadId LoadAverage = 0;
   const LoadId Disk = 1;
   const LoadId Memory = 2;
   const LoadId Network = 3;
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index af201560cbf..8081c8487ca 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -45,4 +45,11 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba,
       LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
     }
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosLoadBalancing.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index e0afb1f5e4b..614cab7ba66 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -19,16 +19,24 @@ project(CosNaming) : orbsvcslib, core {
   Header_Files {
     CosNamingC.h
     Naming/Naming_Client.h
+    Naming/naming_export.h
   }
 
   Inline_Files {
     CosNamingC.inl
   }
+
+  Template_Files {
+  }
  
   // explicit Resource_Files to avoid including _Skel & _Serv rc files.
   Resource_Files{
     CosNaming.rc
   }
+
+  Pkgconfig_Files {
+    TAO_CosNaming.pc.in
+  }
 }
 
 
@@ -45,10 +53,21 @@ project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver {
 
   Header_Files {
     CosNamingS.h
+    CosNamingS_T.h
+    Naming/naming_skel_export.h
   }
 
   Inline_Files {
     CosNamingS.inl
+    CosNamingS_T.inl
+  }
+
+  Template_Files {
+    CosNamingS_T.cpp
+  }
+
+  Pkgconfig_Files {
+    TAO_CosNaming_Skel.pc.in
   }
 }
  
@@ -80,7 +99,13 @@ project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging, svc_utils, i
   }
  
   Header_Files {
-    Naming/naming_export.h
-    Naming/Naming_Server.h
+    Naming/naming_serv_export.h
+  }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosNaming_Serv.pc.in
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index b9a0ee74906..c414501bdd8 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -34,6 +34,7 @@ project(CosNotification) : orbsvcslib, core, event {
     NotifyExtC.h
     Event_ForwarderC.h
     Notify/Notify_Extensions.h
+    Notify/notify_export.h
   }
 
   Inline_Files {
@@ -44,11 +45,17 @@ project(CosNotification) : orbsvcslib, core, event {
     NotifyExtC.inl
     Event_ForwarderC.inl
   }
- 
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
+
+  Template_Files {
+  }
+
   Resource_Files{
     CosNotification.rc
   }
+
+  Pkgconfig_Files {
+    TAO_CosNotification.pc.in
+  }
 }
 
 
@@ -75,6 +82,15 @@ project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, port
     CosNotifyChannelAdminS.h
     NotifyExtS.h
     Event_ForwarderS.h
+
+    CosNotificationS_T.h
+    CosNotifyCommS_T.h
+    CosNotifyFilterS_T.h
+    CosNotifyChannelAdminS_T.h
+    NotifyExtS_T.h
+    Event_ForwarderS_T.h
+
+    Notify/notify_skel_export.h
   }
 
   Inline_Files {
@@ -84,10 +100,30 @@ project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, port
     CosNotifyChannelAdminS.inl
     NotifyExtS.inl
     Event_ForwarderS.inl
+
+    CosNotificationS_T.inl
+    CosNotifyCommS_T.inl
+    CosNotifyFilterS_T.inl
+    CosNotifyChannelAdminS_T.inl
+    NotifyExtS_T.inl
+    Event_ForwarderS_T.inl
+  }
+
+  Template_Files {
+    CosNotificationS_T.cpp
+    CosNotifyCommS_T.cpp
+    CosNotifyFilterS_T.cpp
+    CosNotifyChannelAdminS_T.cpp
+    NotifyExtS_T.cpp
+    Event_ForwarderS_T.cpp
+  }
+
+  Pkgconfig_Files {
+    TAO_CosNotification_Skel.pc.in
   }
 }
 
-project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany, etcl {
+project(CosNotification_Serv) : orbsvcslib, svc_utils, core, notification_skel, dynamicany, etcl{
   sharedname   = TAO_CosNotification_Serv
   dynamicflags = TAO_NOTIFY_SERV_BUILD_DLL
   tagchecks   += Notify
@@ -102,6 +138,7 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany,
     Notify {
       Notify/Admin.cpp
       Notify/AdminProperties.cpp
+      Notify/Bit_Vector.cpp
       Notify/Buffering_Strategy.cpp
       Notify/Builder.cpp
       Notify/Consumer.cpp
@@ -109,6 +146,7 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany,
       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
@@ -125,6 +163,7 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany,
       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_Collection_Factory.cpp
@@ -134,6 +173,7 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany,
       Notify/Notify_EventChannelFactory_i.cpp
       Notify/Object.cpp
       Notify/Peer.cpp
+      Notify/Persistent_File_Allocator.cpp
       Notify/POA_Helper.cpp
       Notify/Properties.cpp
       Notify/PropertySeq.cpp
@@ -142,14 +182,23 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany,
       Notify/ProxyConsumer.cpp
       Notify/ProxySupplier.cpp
       Notify/QoSProperties.cpp
+      Notify/Random_File.cpp
       Notify/Reactive_Task.cpp
       Notify/Refcountable.cpp
+      Notify/Reconnection_Registry.cpp
+      Notify/Routing_Slip.cpp
+      Notify/Routing_Slip_Persistence_Manager.cpp
+      Notify/Routing_Slip_Queue.cpp
       Notify/Subscription_Change_Worker.cpp
       Notify/Supplier.cpp
       Notify/SupplierAdmin.cpp
+      Notify/Standard_Event_Persistence.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/Worker_Task.cpp
       Notify/Any/AnyEvent.cpp
       Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -170,4 +219,28 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany,
       Notify/Structured/StructuredPushSupplier.cpp
     }
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosNotification_Serv.pc.in
+  }
+
+}
+
+project(CosNotification_Persist) : notification_serv, acexml {
+  sharedname   = TAO_CosNotification_Persist
+  dynamicflags = TAO_NOTIFY_PERSIST_BUILD_DLL
+
+  IDL_Files {
+  }
+  Source_Files {
+      Notify/XML_Loader.cpp
+      Notify/XML_Saver.cpp
+      Notify/XML_Topology_Factory.cpp
+    }
+
+  Template_Files {
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl
index db0a937548b..b792ae547ff 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl
@@ -306,6 +306,8 @@ module CosNotifyChannelAdmin
       raises(CosEventChannelAdmin::AlreadyConnected);
   };
 
+#ifdef TAO_HAS_NOTIFY_PULL_INTERFACES
+
   /**
    * @interface ProxyPullSupplier
    *
@@ -533,6 +535,7 @@ module CosNotifyChannelAdmin
     void resume_connection()
       raises(ConnectionAlreadyActive, NotConnected);
   };
+#endif /* TAO_HAS_NOTIFY_PULL_INTERFACES */
 
   /**
    * @interface ProxyPushSupplier
diff --git a/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl b/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl
index ae841bf6106..e5787489790 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl
+++ b/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl
@@ -289,7 +289,9 @@ module CosNotifyComm
     void disconnect_sequence_push_consumer();
   };
 
-  /**
+#ifdef TAO_HAS_NOTIFY_PULL_INTERFACES
+
+/**
    * @interface SequencePullConsumer
    *
    * @brief Defines the interface used by pull-style consumers that
@@ -354,6 +356,8 @@ module CosNotifyComm
     void disconnect_sequence_pull_supplier();
   };
 
+#endif /* TAO_HAS_NOTIFY_PULL_INTERFACES */
+
   /**
    * @interface SequencePushSupplier
    *
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index adb61bcaa58..2fa121db12d 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -20,4 +20,11 @@ project(CosProperty) : orbsvcslib, core, portableserver {
       Property
     }
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosProperty.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index 95b5795f763..9bc724a4356 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -18,4 +18,11 @@ project(CosTime) : orbsvcslib, core, portableserver {
       Time
     }
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosTime.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index ad5a4009aed..e77afbb200c 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -23,6 +23,7 @@ project(CosTrading) : orbsvcslib, core {
     CosTradingC.h
     CosTradingReposC.h
     CosTradingDynamicC.h
+    Trader/trading_export.h
   }
 
   Inline_Files {
@@ -31,11 +32,17 @@ project(CosTrading) : orbsvcslib, core {
     CosTradingDynamicC.inl
   }
 
+  Template_Files {
+  }
+
   // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files{
+  Resource_Files {
     CosTrading.rc
   }
- 
+
+  Pkgconfig_Files {
+    TAO_CosTrading.pc.in
+  }
 }
 
 
@@ -56,15 +63,36 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
     CosTradingS.h
     CosTradingReposS.h
     CosTradingDynamicS.h
+
+    CosTradingS_T.h
+    CosTradingReposS_T.h
+    CosTradingDynamicS_T.h
+
+    Trader/trading_skel_export.h
   }
 
   Inline_Files {
     CosTradingS.inl
     CosTradingReposS.inl
     CosTradingDynamicS.inl
+
+    CosTradingS_T.inl
+    CosTradingReposS_T.inl
+    CosTradingDynamicS_T.inl
+  }
+
+  Template_Files {
+    CosTradingS_T.cpp
+    CosTradingReposS_T.cpp
+    CosTradingDynamicS_T.cpp
+  }
+
+  Pkgconfig_Files {
+    TAO_CosTrading_Skel.pc.in
   }
 }
 
+
 project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils {
   sharedname   = TAO_CosTrading_Serv
   dynamicflags = TAO_TRADING_SERV_BUILD_DLL
@@ -80,4 +108,14 @@ project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils
       Trader
     }
   }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_CosTrading_Serv.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index dd1aada4b96..8d46a2a34c5 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -17,16 +17,24 @@ project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
 
   Header_Files {
     DsEventLogAdminC.h
+    Log/eventlog_export.h
   }
 
   Inline_Files {
     DsEventLogAdminC.inl
   }
 
+  Template_Files {
+  }
+
   // explicit Resource_Files to avoid including _Skel & _Serv rc files.
   Resource_Files {
     DsEventLogAdmin.rc
   }
+
+  Pkgconfig_Files {
+    TAO_DsEventLogAdmin.pc.in
+  }
 }
 
 project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_skel, event_skel, portableserver {
@@ -42,10 +50,21 @@ project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_sk
 
   Header_Files {
     DsEventLogAdminS.h
+    DsEventLogAdminS_T.h
+    Log/eventlog_skel_export.h
   }
 
   Inline_Files {
     DsEventLogAdminS.inl
+    DsEventLogAdminS_T.inl
+  }
+
+  Template_Files {
+    DsEventLogAdminS_T.cpp
+  }
+
+  Pkgconfig_Files {
+    TAO_DsEventLogAdmin_Skel.pc.in
   }
 }
 
@@ -65,4 +84,14 @@ project(DsEventLogAdmin_Serv) : orbsvcslib, core, dseventlogadmin_skel, dslogadm
       Log/EventLog_i.cpp
     }
   }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_DsEventLogAdmin_Serv.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.idl b/TAO/orbsvcs/orbsvcs/DsLogAdmin.idl
index 5687ea89076..3d776a1943d 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.idl
@@ -14,7 +14,7 @@
 #ifndef DS_LOG_ADMIN_IDL
 #define DS_LOG_ADMIN_IDL
 
-#include "TimeBase.idl"
+#include "tao/TimeBase.pidl"
 // CORBA Time Service
 
 #pragma prefix "omg.org"
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index 5cff570713d..d96bff3f1dc 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -20,17 +20,25 @@ project(DsLogAdmin) : orbsvcslib, core {
   Header_Files {
     DsLogAdminC.h
     DsLogNotificationC.h
+    Log/log_export.h
   }
 
   Inline_Files {
     DsLogAdminC.inl
     DsLogNotificationC.inl
   }
+
+  Template_Files {
+  }
     
   // explicit Resource_Files to avoid including _Skel & _Serv rc files.
   Resource_Files {
     DsLogAdmin.rc
   }
+
+  Pkgconfig_Files {
+    TAO_DsLogAdmin.pc.in
+  }
 }
 
 
@@ -49,11 +57,28 @@ project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver {
   Header_Files {
     DsLogAdminS.h
     DsLogNotificationS.h
+
+    DsLogAdminS_T.h
+    DsLogNotificationS_T.h
+
+    Log/log_skel_export.h
   }
 
   Inline_Files {
     DsLogAdminS.inl
     DsLogNotificationS.inl
+
+    DsLogAdminS_T.inl
+    DsLogNotificationS_T.inl
+  }
+
+  Template_Files {
+    DsLogAdminS_T.cpp
+    DsLogNotificationS_T.cpp
+  }
+
+  Pkgconfig_Files {
+    TAO_DsLogAdmin_Skel.pc.in
   }
 }
 
@@ -77,7 +102,16 @@ project(DsLogAdmin_Serv) : orbsvcslib, core, dslogadmin_skel, dynamicany, etcl,
       Log/Log_Constraint_Interpreter.cpp
       Log/Log_Constraint_Visitors.cpp
       Log/Log_i.cpp
-      Log/PersistStore.cpp
     }
   }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_DsLogAdmin_Serv.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index 382b068ded9..6fa75656ae0 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -17,18 +17,27 @@ project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event
 
   Header_Files {
     DsNotifyLogAdminC.h
+    Log/notifylog_export.h
   }
 
   Inline_Files {
     DsNotifyLogAdminC.inl
-  }   
+  }
+
+  Template_Files {
+  }
 
   // explicit Resource_Files to avoid including _Skel & _Serv rc files.
   Resource_Files {
     DsNotifyLogAdmin.rc
   }
+
+  Pkgconfig_Files {
+    TAO_DsNotifyLogAdmin.pc.in
+  }
 }
 
+
 project(DsNotifyLogAdmin_Skel) : orbsvcslib, core, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver {
   sharedname   = TAO_DsNotifyLogAdmin_Skel
   dynamicflags = TAO_NOTIFYLOG_SKEL_BUILD_DLL
@@ -42,11 +51,22 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, core, dsnotifylogadmin, dseventloga
 
   Header_Files {
     DsNotifyLogAdminS.h
+    DsNotifyLogAdminS_T.h
+    Log/notifylog_skel_export.h
   }
 
   Inline_Files {
     DsNotifyLogAdminS.inl
+    DsNotifyLogAdminS_T.inl
   }   
+
+  Template_Files {
+    DsNotifyLogAdminS_T.cpp
+  }
+
+  Pkgconfig_Files {
+    TAO_DsNotifyLogAdmin_Skel.pc.in
+  }
 }
 
 
@@ -66,4 +86,14 @@ project(DsNotifyLogAdmin_Serv) : orbsvcslib, core, dsnotifylogadmin_skel, dsloga
       Log/NotifyLog_i.cpp
     }
   }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_DsNotifyLogAdmin_Serv.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index 12e6316ed47..55055171241 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -4,11 +4,6 @@
 #define TAO_ESF_COPY_ON_READ_CPP
 
 #include "ESF_Copy_On_Read.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "ESF_Copy_On_Read.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ESF_Worker.h"
 
 ACE_RCSID(ESF, ESF_Copy_On_Read, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index 98578fe4fb5..f0b704632f6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -58,10 +58,6 @@ private:
 
 // ****************************************************************
 
-#if defined (__ACE_INLINE__)
-#include "ESF_Copy_On_Read.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ESF_Copy_On_Read.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index e2b72adad2a..58c09ac03ed 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -9,6 +9,8 @@
 #include "ESF_Copy_On_Write.i"
 #endif /* __ACE_INLINE__ */
 
+#include "tao/Environment.h"
+
 ACE_RCSID(ESF, ESF_Copy_On_Write, "$Id$")
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index c6cf8c280f3..96f57baac44 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -19,7 +19,7 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg)
   if (arg != 0)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
-                            *ACE_static_cast(CORBA::Environment*, arg));
+                            *static_cast<CORBA::Environment*> (arg));
       this->target_->connected_i (this->object_
                                   ACE_ENV_ARG_PARAMETER);
     }
@@ -41,7 +41,7 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg)
   if (arg != 0)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
-                             *ACE_static_cast(CORBA::Environment*, arg));
+                             *static_cast<CORBA::Environment*> (arg));
       this->target_->reconnected_i (this->object_
                                     ACE_ENV_ARG_PARAMETER);
     }
@@ -62,7 +62,7 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg)
   if (arg != 0)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
-                             *ACE_static_cast(CORBA::Environment*, arg));
+                             *static_cast<CORBA::Environment*> (arg));
       this->target_->disconnected_i (this->object_
                                      ACE_ENV_ARG_PARAMETER);
     }
@@ -83,7 +83,7 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg)
   if (arg != 0)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
-                             *ACE_static_cast(CORBA::Environment*, arg));
+                             *static_cast<CORBA::Environment*> (arg));
       this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index c514674fda3..b2b99d61a83 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -3,12 +3,6 @@
 #ifndef TAO_ESF_PEER_ADMIN_CPP
 #define TAO_ESF_PEER_ADMIN_CPP
 
-
-
-#if ! defined (__ACE_INLINE__)
-#include "ESF_Peer_Admin.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ESF_Peer_Workers.h"
 
 ACE_RCSID(ESF, ESF_Peer_Admin, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 646fab48906..8cb50b3d57c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -92,10 +92,6 @@ public:
 
 // ****************************************************************
 
-#if defined (__ACE_INLINE__)
-#include "ESF_Peer_Admin.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ESF_Peer_Admin.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
index 2cb0b663040..798a34d0cb9 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
@@ -6,12 +6,8 @@
 #include "ESF_Proxy_Collection.h"
 #include "ESF_Worker.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ESF_Proxy_Collection.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (ESF, 
-           ESF_Proxy_Collection, 
+ACE_RCSID (ESF,
+           ESF_Proxy_Collection,
            "$Id$")
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index e9f6227e839..7777d37e830 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -157,10 +157,6 @@ public:
 
 // ****************************************************************
 
-#if defined (__ACE_INLINE__)
-#include "ESF_Proxy_Collection.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ESF_Proxy_Collection.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index 26e3de1dc7d..52f1a14c014 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -16,12 +16,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Unbounded_Set_Ex.h"
+#include "ace/Unbounded_Set.h"
 #include "ace/Containers.h"
 
 /// A concrete proxy collection.
 /**
- * Based on the ACE_Unbounded_Set_Ex<> collection, used a double
+ * Based on the ACE_Unbounded_Set<> collection, used a double
  * linked list internally.
  */
 template<class PROXY>
@@ -29,20 +29,20 @@ class TAO_ESF_Proxy_List
 {
 public:
   /// A typedef for the underlying implementaiton class
-  typedef ACE_Unbounded_Set_Ex<PROXY*> Implementation;
+  typedef ACE_Unbounded_Set<PROXY*> Implementation;
 
   /// A typedef for the underlying iterator
-  typedef ACE_Unbounded_Set_Ex_Iterator<PROXY*> Iterator;
+  typedef ACE_Unbounded_Set_Iterator<PROXY*> Iterator;
 
   /// Constructor
   TAO_ESF_Proxy_List (void);
 
   /// Return the first element in the collection, or end() if there
   /// are none
-  ACE_Unbounded_Set_Ex_Iterator<PROXY*> begin (void);
+  ACE_Unbounded_Set_Iterator<PROXY*> begin (void);
 
   /// Return one past the last element in the collection
-  ACE_Unbounded_Set_Ex_Iterator<PROXY*> end (void);
+  ACE_Unbounded_Set_Iterator<PROXY*> end (void);
 
   /// Return the number of elements in the collection
   size_t size (void) const;
@@ -65,7 +65,7 @@ public:
 
 private:
   /// The underlying implementation object
-  ACE_Unbounded_Set_Ex<PROXY*> impl_;
+  ACE_Unbounded_Set<PROXY*> impl_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
index f83bf2ad5a7..881283569ba 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
@@ -1,12 +1,12 @@
 // $Id$
 
-template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Ex_Iterator<PROXY*>
+template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*>
 TAO_ESF_Proxy_List<PROXY>::begin (void)
 {
   return this->impl_.begin ();
 }
 
-template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Ex_Iterator<PROXY*>
+template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*>
 TAO_ESF_Proxy_List<PROXY>::end (void)
 {
   return this->impl_.end ();
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
index c0adf25c221..6ffea97b026 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
@@ -5,10 +5,6 @@
 
 #include "ESF_Worker.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ESF_Worker.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(ESF, ESF_Worker, "$Id$")
 
 template<class Object>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
index 69563574aa9..0acfb7b660d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -49,10 +49,6 @@ public:
                      ACE_ENV_ARG_DECL) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ESF_Worker.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ESF_Worker.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc
index 9d8b3841373..3b405c3e215 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL.mpc
+++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc
@@ -14,4 +14,11 @@ project(ETCL) : orbsvcslib, core {
   Source_Files {
     ETCL
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_ETCL.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index e210c0b90dc..2a04884b7f0 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -5,7 +5,7 @@
 #include "ETCL_Constraint_Visitor.h"
 #include "ETCL_y.h"
 
-#include "tao/Any.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Managed_Types.h"
 #include "tao/Environment.h"
 #include "tao/CDR.h"
@@ -88,9 +88,25 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
         }
       else if (corba_type == CORBA::tk_enum)
         {
-          TAO_InputCDR cdr (any_ref._tao_get_cdr (),
-                            any_ref._tao_byte_order ());
-          (void) cdr.read_ulong (this->op_.uinteger_);
+          TAO::Any_Impl *impl = any->impl ();
+          
+          if (impl->encoded ())
+            {
+              TAO::Unknown_IDL_Type *unk =
+                dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+                
+              // We don't want unk's rd_ptr to move, in case we are shared by
+              // another Any, so we use this to copy the state, not the buffer.
+              TAO_InputCDR for_reading (unk->_tao_get_cdr ());
+              for_reading.read_ulong (this->op_.uinteger_);
+            }
+          else
+            {
+              TAO_OutputCDR out;
+              impl->marshal_value (out);
+              TAO_InputCDR in (out);
+              in.read_ulong (this->op_.uinteger_);
+            }
         }
       else
         {
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
index d7706d04b53..3427dc9774d 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
@@ -60,12 +60,12 @@ public:
 
   // = Constructors for each of the various types of literals.
 
-  TAO_ETCL_Literal_Constraint (CORBA::Any* any);
-  TAO_ETCL_Literal_Constraint (CORBA::ULong uinteger);
-  TAO_ETCL_Literal_Constraint (CORBA::Long integer);
-  TAO_ETCL_Literal_Constraint (CORBA::Boolean boolean);
-  TAO_ETCL_Literal_Constraint (CORBA::Double doub);
-  TAO_ETCL_Literal_Constraint (const char* str);
+  explicit TAO_ETCL_Literal_Constraint (CORBA::Any* any);
+  explicit TAO_ETCL_Literal_Constraint (CORBA::ULong uinteger);
+  explicit TAO_ETCL_Literal_Constraint (CORBA::Long integer);
+  explicit TAO_ETCL_Literal_Constraint (CORBA::Boolean boolean);
+  explicit TAO_ETCL_Literal_Constraint (CORBA::Double doub);
+  explicit TAO_ETCL_Literal_Constraint (const char* str);
 
   TAO_ETCL_Literal_Constraint (const TAO_ETCL_Literal_Constraint& lit);
   // Copy constructor
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i
index 848e058cd6d..93f2187496c 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i
@@ -82,7 +82,7 @@ TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (int sign,
      string_ (0)
 {
   this->integer_ =
-    ACE_dynamic_cast (TAO_ETCL_Integer_Literal*, integer);
+    dynamic_cast<TAO_ETCL_Integer_Literal*> (integer);
 }
 
 ACE_INLINE
@@ -91,7 +91,7 @@ TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (TAO_ETCL_Constraint *string)
      integer_ (0)
 {
   this->string_ =
-    ACE_dynamic_cast (TAO_ETCL_String_Literal*, string);
+    dynamic_cast<TAO_ETCL_String_Literal*> (string);
 }
 
 ACE_INLINE int
@@ -121,7 +121,7 @@ TAO_ETCL_Union_Pos::TAO_ETCL_Union_Pos (TAO_ETCL_Constraint *union_value,
   :  component_ (component)
 {
   this->union_value_ =
-    ACE_dynamic_cast (TAO_ETCL_Union_Value*, union_value);
+    dynamic_cast<TAO_ETCL_Union_Value*> (union_value);
 }
     
 ACE_INLINE TAO_ETCL_Union_Value *
@@ -144,7 +144,7 @@ TAO_ETCL_Component_Pos::TAO_ETCL_Component_Pos (TAO_ETCL_Constraint *integer,
   :  component_ (component)
 {
   this->integer_ =
-    ACE_dynamic_cast (TAO_ETCL_Integer_Literal*, integer);
+    dynamic_cast<TAO_ETCL_Integer_Literal*> (integer);
 }
 
 ACE_INLINE TAO_ETCL_Integer_Literal *
@@ -167,7 +167,7 @@ TAO_ETCL_Component_Assoc::TAO_ETCL_Component_Assoc (TAO_ETCL_Constraint *identif
   :  component_ (component)
 {
   this->identifier_ =
-    ACE_dynamic_cast (TAO_ETCL_Identifier*, identifier);
+    dynamic_cast<TAO_ETCL_Identifier*> (identifier);
 }
 
 ACE_INLINE TAO_ETCL_Identifier *
@@ -190,7 +190,7 @@ TAO_ETCL_Component_Array::TAO_ETCL_Component_Array (TAO_ETCL_Constraint *integer
   :  component_ (component)
 {
   this->integer_ =
-    ACE_dynamic_cast (TAO_ETCL_Integer_Literal*, integer);
+    dynamic_cast<TAO_ETCL_Integer_Literal*> (integer);
 }
 
 ACE_INLINE TAO_ETCL_Integer_Literal *
@@ -227,7 +227,7 @@ TAO_ETCL_Component::TAO_ETCL_Component (TAO_ETCL_Constraint *identifier,
   :  component_ (component)
 {
   this->identifier_ =
-    ACE_dynamic_cast (TAO_ETCL_Identifier*, identifier);
+    dynamic_cast<TAO_ETCL_Identifier*> (identifier);
 }
 
 ACE_INLINE TAO_ETCL_Identifier *
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl
index dd9532df920..d6414ef5131 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl
@@ -33,7 +33,7 @@ TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (int sign,
      string_ (0)
 {
   this->integer_ =
-    ACE_dynamic_cast (TAO_ETCL_Literal_Constraint*, integer);
+    dynamic_cast<TAO_ETCL_Literal_Constraint*> (integer);
 }
 
 ACE_INLINE
@@ -42,7 +42,7 @@ TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (TAO_ETCL_Constraint *string)
      integer_ (0)
 {
   this->string_ =
-    ACE_dynamic_cast (TAO_ETCL_Literal_Constraint*, string);
+    dynamic_cast<TAO_ETCL_Literal_Constraint*> (string);
 }
 
 ACE_INLINE int
@@ -72,7 +72,7 @@ TAO_ETCL_Union_Pos::TAO_ETCL_Union_Pos (TAO_ETCL_Constraint *union_value,
   :  component_ (component)
 {
   this->union_value_ =
-    ACE_dynamic_cast (TAO_ETCL_Union_Value*, union_value);
+    dynamic_cast<TAO_ETCL_Union_Value*> (union_value);
 }
     
 ACE_INLINE TAO_ETCL_Union_Value *
@@ -97,7 +97,7 @@ TAO_ETCL_Component_Pos::TAO_ETCL_Component_Pos (
   :  component_ (component)
 {
   this->integer_ =
-    ACE_dynamic_cast (TAO_ETCL_Literal_Constraint*, integer);
+    dynamic_cast<TAO_ETCL_Literal_Constraint*> (integer);
 }
 
 ACE_INLINE TAO_ETCL_Literal_Constraint *
@@ -122,7 +122,7 @@ TAO_ETCL_Component_Assoc::TAO_ETCL_Component_Assoc (
   :  component_ (component)
 {
   this->identifier_ =
-    ACE_dynamic_cast (TAO_ETCL_Identifier*, identifier);
+    dynamic_cast<TAO_ETCL_Identifier*> (identifier);
 }
 
 ACE_INLINE TAO_ETCL_Identifier *
@@ -147,7 +147,7 @@ TAO_ETCL_Component_Array::TAO_ETCL_Component_Array (
   :  component_ (component)
 {
   this->integer_ =
-    ACE_dynamic_cast (TAO_ETCL_Literal_Constraint*, integer);
+    dynamic_cast<TAO_ETCL_Literal_Constraint*> (integer);
 }
 
 ACE_INLINE TAO_ETCL_Literal_Constraint *
@@ -184,7 +184,7 @@ TAO_ETCL_Component::TAO_ETCL_Component (TAO_ETCL_Constraint *identifier,
   :  component_ (component)
 {
   this->identifier_ =
-    ACE_dynamic_cast (TAO_ETCL_Identifier*, identifier);
+    dynamic_cast<TAO_ETCL_Identifier*> (identifier);
 }
 
 ACE_INLINE TAO_ETCL_Identifier *
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index 0e781c19364..2ef2c864f4d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -67,20 +67,18 @@ ACE_ES_Dispatch_Request::make_copy (RtecEventComm::EventSet &dest) const
       // buffer, without owning it, thus it is not removed!
       // @@ TODO Check what happens in the collocated case.
       dest.replace (1, 1,
-                    ACE_const_cast(RtecEventComm::Event*,
-                                   &this->single_event_.event ()),
+                    const_cast<RtecEventComm::Event*> (&this->single_event_.event ()),
                     0);
     }
   else if (this->event_set_.size () == 1)
     {
       dest.replace (1, 1,
-                    ACE_const_cast(RtecEventComm::Event*,
-                                   &this->event_set_[0].event ()),
+                    const_cast<RtecEventComm::Event*> (&this->event_set_[0].event ()),
                     0);
     }
   else
     {
-      dest.length (ACE_static_cast (CORBA::ULong, this->event_set_.size ()));
+      dest.length (static_cast<CORBA::ULong> (this->event_set_.size ()));
 
       int c = 0;
       for (CORBA::ULong i = 0; i < this->event_set_.size (); ++i)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
index 1d4542b46cd..bc9c5d483b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
@@ -119,7 +119,7 @@ ACE_ES_Dispatch_Request::number_of_events (void) const
   if (this->use_single_event_)
     return 1;
   else
-    return ACE_static_cast (CORBA::ULong, this->event_set_.size ());
+    return static_cast<CORBA::ULong> (this->event_set_.size ());
 }
 
 ACE_INLINE RtecScheduler::OS_Priority
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp
index 1ef43a497d1..86b0590e956 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp
@@ -2,11 +2,3 @@
 
 #include "ECG_Address_Server_Base.h"
 
-#if !defined(__ACE_INLINE__)
-#include "ECG_Address_Server_Base.i"
-#endif /* __ACE_INLINE__ */
-
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
index 533e6ba7391..97f2cf073c3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
@@ -35,10 +35,5 @@ public:
   virtual int init (const char *arg) = 0;
 };
 
-
-#if defined(__ACE_INLINE__)
-#include "ECG_Address_Server_Base.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ECG_ADDRESS_SERVER_BASE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index b75bd1e1333..ada7a93c739 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -13,8 +13,8 @@
 #include "ECG_CDR_Message_Receiver.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event, 
-           ECG_CDR_Message_Receiver, 
+ACE_RCSID (Event,
+           ECG_CDR_Message_Receiver,
            "$Id$")
 
 
@@ -267,21 +267,21 @@ TAO_ECG_CDR_Message_Receiver::handle_input (
       if (errno == EWOULDBLOCK)
         return 0;
 
-      ACE_ERROR_RETURN ((LM_ERROR, "Error reading mcast fragment (%m)."),
+      ACE_ERROR_RETURN ((LM_ERROR, "Error reading mcast fragment (%m).\n"),
                         -1);
     }
 
   if (n == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: "
-                                  "read 0 bytes from socket."),
+                                  "read 0 bytes from socket.\n"),
                         0);
     }
 
   if (n < TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: "
-                                   "# of bytes read < mcast header size."),
+                                   "# of bytes read < mcast header size.\n"),
                          -1);
     }
 
@@ -357,10 +357,7 @@ TAO_ECG_CDR_Message_Receiver::handle_input (
         return 1;
     }
 
-  else
-    {
-      return this->process_fragment (from, header, data_buf, cdr_processor);
-    }
+  return this->process_fragment (from, header, data_buf, cdr_processor);
 }
 
 int
@@ -379,19 +376,19 @@ TAO_ECG_CDR_Message_Receiver::mark_received (const ACE_INET_Addr &from,
   if (request == 0)
     {
       ACE_DEBUG ((LM_WARNING, "Received mcast request with sequence"
-                              "below currently expected range."));
+                              "below currently expected range.\n"));
       return 0;
     }
   if (*request == &Request_Completed_)
     {
       ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment. "
-                           "(Request already complete)."));
+                           "(Request already complete).\n"));
       return 0;
     }
   if (*request != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Inconsistent fragments for "
-                                   "mcast request."),
+                                   "mcast request.\n"),
                          -1);
     }
 
@@ -418,13 +415,13 @@ TAO_ECG_CDR_Message_Receiver::process_fragment (
   if (request == 0)
     {
       ACE_DEBUG ((LM_WARNING, "Received mcast request with sequence "
-                              "below currently expected range."));
+                              "below currently expected range.\n"));
       return 0;
     }
   if (*request == &Request_Completed_)
     {
       ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment. "
-                           "(Request already complete)."));
+                           "(Request already complete).\n"));
       return 0;
     }
   if (*request == 0)
@@ -447,14 +444,14 @@ TAO_ECG_CDR_Message_Receiver::process_fragment (
                                      header.fragment_count) == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Received invalid mcast fragment."),
+                         "Received invalid mcast fragment.\n"),
                         -1);
     }
 
   // Check whether this fragment was already received.
   if ((*request)->test_received (header.fragment_id) == 1)
     {
-      ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment."));
+      ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment.\n"));
       return 0;
     }
 
@@ -502,7 +499,7 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from)
           || this->request_map_.bind (from, requests, entry) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR, "Unable to create hash map "
-                                       "entry for a new request."),
+                                       "entry for a new request.\n"),
                             0);
         }
       requests_aptr.release ();
@@ -521,7 +518,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
   if(this->byte_order != 0 && this->byte_order != 1)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Reading mcast packet header: byte "
-                                   "order is neither 0 nor 1, it is %d.",
+                                   "order is neither 0 nor 1, it is %d.\n",
                          this->byte_order),
                         -1);
     }
@@ -538,7 +535,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
       || a != 'A' || b != 'B' || c != 'C')
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Error reading magic bytes "
-                                   "in mcast packet header."),
+                                   "in mcast packet header.\n"),
                         -1);
     }
 
@@ -550,7 +547,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
       || !header_cdr.read_ulong (this->fragment_count))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                        "Error decoding mcast packet header."),
+                        "Error decoding mcast packet header.\n"),
                         -1);
     }
 
@@ -582,7 +579,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                         "Invalid mcast fragment: "
-                        "inconsistent header fields."),
+                        "inconsistent header fields.\n"),
                         -1);
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 002b5f888ff..98a17c5dc68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -22,7 +22,7 @@ TAO_ECG_CDR_Message_Sender::init (
       || endpoint_rptr->dgram ().get_handle () == ACE_INVALID_HANDLE)
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): "
-                            "nil or unitialized endpoint argument."));
+                            "nil or unitialized endpoint argument.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -38,7 +38,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
   if (this->endpoint_rptr_.get () == 0)
     {
       ACE_ERROR ((LM_ERROR, "Attempt to invoke send_message() "
-                            "on non-initialized sender object."));
+                            "on non-initialized sender object.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -201,7 +201,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
   CORBA::ULong header[TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE
                      / sizeof(CORBA::ULong)
                      + ACE_CDR::MAX_ALIGNMENT];
-  char* buf = ACE_reinterpret_cast(char*,header);
+  char* buf = reinterpret_cast<char*> (header);
   TAO_OutputCDR cdr (buf, sizeof(header));
   cdr.write_boolean (TAO_ENCAP_BYTE_ORDER);
   // Insert some known values in the padding bytes, so we can smoke
@@ -256,7 +256,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
   if (n > 0 && size_t(n) != expected_n)
     {
       ACE_DEBUG ((LM_ERROR, ("Sent only %d out of %d bytes "
-                              "for mcast fragment."),
+                              "for mcast fragment.\n"),
                   n,
                   expected_n));
     }
@@ -265,18 +265,18 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
     {
       if (errno == EWOULDBLOCK)
         {
-          ACE_DEBUG ((LM_ERROR, "Send of mcast fragment failed (%m)."));
+          ACE_DEBUG ((LM_ERROR, "Send of mcast fragment failed (%m).\n"));
           // @@ TODO Use a Event Channel specific exception
           ACE_THROW (CORBA::COMM_FAILURE ());
         }
       else
         {
-          ACE_DEBUG ((LM_WARNING, "Send of mcast fragment blocked (%m)."));
+          ACE_DEBUG ((LM_WARNING, "Send of mcast fragment blocked (%m).\n"));
         }
     }
   else if (n == 0)
     {
-      ACE_DEBUG ((LM_WARNING, "EOF on send of mcast fragment (%m)."));
+      ACE_DEBUG ((LM_WARNING, "EOF on send of mcast fragment (%m).\n"));
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index 8638f86a84c..de93ffeb41b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -39,7 +39,7 @@ TAO_ECG_Complex_Address_Server::init (const char *arg)
                                         "Unable to initialize address "
                                         "server: cannot find <@> separator "
                                         "in initialization string "
-                                        "as expected"),
+                                        "as expected\n"),
                             -1);
         }
       size_t len = location - data;
@@ -82,7 +82,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
     {
       if (this->default_addr_.set (mcast_addr) == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid "
-                                     "mcast address specified: %s.",
+                                     "mcast address specified: %s.\n",
                            mcast_addr),
                           -1);
       return 0;
@@ -94,7 +94,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
   if (*endptr != '\0')
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid "
-                                   "source/type specified: %s.",
+                                   "source/type specified: %s.\n",
                          key),
                         -1);
     }
@@ -103,7 +103,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
   if (addr.set (mcast_addr) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid "
-                                   "mcast address specified: %s.",
+                                   "mcast address specified: %s.\n",
                          mcast_addr),
                          -1);
     }
@@ -111,7 +111,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
   if (this->mcast_mapping_.bind (header_value, addr) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: error adding "
-                                   "new entry to the mapping."),
+                                   "new entry to the mapping.\n"),
                         -1);
     }
 
@@ -149,23 +149,19 @@ TAO_ECG_Complex_Address_Server::get_addr (
 void
 TAO_ECG_Complex_Address_Server::dump_content (void)
 {
-  cout << "Default address: "
-       << this->default_addr_.get_host_addr ()
-       << ":"
-       << this->default_addr_.get_port_number ()
-       << endl;
+  ACE_DEBUG ((LM_DEBUG, "Default address: %s:%d\n",
+              this->default_addr_.get_host_addr (),
+              this->default_addr_.get_port_number ()));
 
   for (MAP::iterator iter = this->mcast_mapping_.begin ();
        iter != this->mcast_mapping_.end ();
        iter++)
     {
       MAP::ENTRY & entry = *iter;
-      cout << entry.ext_id_
-           << " --> "
-           << entry.int_id_.get_host_addr ()
-           << ":"
-           << entry.int_id_.get_port_number ()
-           << endl;
+      ACE_DEBUG ((LM_DEBUG, "%d --> %s:%d\n",
+                  entry.ext_id_,
+                  this->default_addr_.get_host_addr (),
+                  this->default_addr_.get_port_number ()));
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index 1b54d487935..c08698cff1e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -2,10 +2,6 @@
 
 #include "ECG_ConsumerEC_Control.h"
 
-#if ! defined (__ACE_INdLINE__)
-#include "ECG_ConsumerEC_Control.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, ECG_ConsumerEventChannelControl, "$Id$")
 
 TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void)
@@ -41,8 +37,3 @@ TAO_ECG_ConsumerEC_Control::system_exception (TAO_EC_Gateway_IIOP *,
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
index fb768d8c3a9..62829a96c20 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
@@ -73,10 +73,6 @@ public:
                                  ACE_ENV_ARG_DECL_NOT_USED);
 };
 
-#if defined (__ACE_INLINE__)
-#include "ECG_ConsumerEC_Control.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ECG_ConsumerEC_Control_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.i b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index 773e41b0041..8f87c9c2a20 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -72,7 +72,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[])
                   ACE_ERROR ((LM_ERROR,
                                          "Unsupported <-ECGService> option "
                                          "value: <%s>. Ignoring this option "
-                                         "- using defaults instead.",
+                                         "- using defaults instead.\n",
                             opt));
                   result = -1;
                 }
@@ -98,7 +98,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[])
                   ACE_ERROR ((LM_ERROR,
                                   "Unsupported <-ECGAddressServer> "
                                   "option value: <%s>. Ignoring this "
-                                  "option - using defaults instead.",
+                                  "option - using defaults instead.\n",
                               opt));
                   result = -1;
                 }
@@ -136,7 +136,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[])
                   ACE_ERROR ((LM_ERROR,
                                   "Unsupported <-ECGHandler> "
                                   "option value: <%s>. Ignoring this "
-                                  "option - using defaults instead.",
+                                  "option - using defaults instead.\n",
                               opt));
                   result = -1;
                 }
@@ -152,7 +152,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[])
             {
               const char* opt = arg_shifter.get_current ();
               unsigned long tmp = ACE_OS::strtoul (opt, 0, 0) & 0xff;
-              this->ttl_value_ = ACE_static_cast (u_char, tmp);
+              this->ttl_value_ = static_cast<u_char> (tmp);
               arg_shifter.consume_arg ();
             }
         }
@@ -197,7 +197,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[])
           arg_shifter.ignore_arg ();
           ACE_DEBUG ((LM_WARNING,
                              "Ignoring <%s> option "
-                             "during initialization.",
+                             "during initialization.\n",
                       arg));
           result = -1;
         }
@@ -247,7 +247,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void)
     {
       ACE_DEBUG ((LM_ERROR,
                       "Configurations for mcast handler and "
-                      "address server do not match."));
+                      "address server do not match.\n"));
       return -1;
     }
 
@@ -258,7 +258,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void)
     {
       ACE_DEBUG ((LM_ERROR,
                       "Address server initializaton "
-                      "argument not specified."));
+                      "argument not specified.\n"));
       return -1;
     }
 
@@ -266,7 +266,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void)
       && this->ip_multicast_loop_ != 1)
     {
       ACE_DEBUG ((LM_ERROR,
-                  "IP MULTICAST LOOP option must have a boolean value."));
+                  "IP MULTICAST LOOP option must have a boolean value.\n"));
       return -1;
     }
 
@@ -274,7 +274,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void)
       && this->non_blocking_ != 1)
     {
       ACE_DEBUG ((LM_ERROR,
-                  "NON BLOCKING flag must have a boolean value."));
+                  "NON BLOCKING flag must have a boolean value.\n"));
       return -1;
     }
 
@@ -306,7 +306,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
     {
       ACE_ERROR ((LM_ERROR,
                              "Cannot open dgram "
-                             "for sending mcast messages."));
+                             "for sending mcast messages.\n"));
       return TAO_ECG_Refcounted_Endpoint ();
     }
 
@@ -325,7 +325,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
         {
           ACE_ERROR ((LM_ERROR,
                       "Error setting TTL option on dgram "
-                      "for sending mcast messages."));
+                      "for sending mcast messages.\n"));
           return TAO_ECG_Refcounted_Endpoint ();
         }
     }
@@ -337,7 +337,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
     {
       ACE_ERROR ((LM_ERROR,
                   "Error setting MULTICAST_LOOP option "
-                  "on dgram for sending mcast messages."));
+                  "on dgram for sending mcast messages.\n"));
       return TAO_ECG_Refcounted_Endpoint ();
     }
 
@@ -345,7 +345,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
       && dgram.enable(ACE_NONBLOCK) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  "Error setting NON BLOCKING option."));
+                  "Error setting NON BLOCKING option.\n"));
       return TAO_ECG_Refcounted_Endpoint ();
     }
 
@@ -405,7 +405,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
     {
       ACE_ERROR ((LM_ERROR,
                   "Cannot create address server: "
-                  "unknown address server type specified."));
+                  "unknown address server type specified.\n"));
       return 0;
     }
 }
@@ -465,7 +465,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
         {
           ACE_ERROR ((LM_ERROR,
                       "ERROR using address server argument "
-                      "in ACE_INET_Addr.set ()."));
+                      "in ACE_INET_Addr.set ().\n"));
           return TAO_ECG_Refcounted_Handler ();
         }
       if (h->open (ipaddr) != 0)
@@ -476,7 +476,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
     {
       ACE_ERROR ((LM_ERROR,
                   "Cannot create handler: unknown "
-                  "handler type specified."));
+                  "handler type specified.\n"));
       return handler;
     }
 
@@ -520,8 +520,7 @@ TAO_ECG_Mcast_Gateway::init_sender (
                                    ACE_ES_EVENT_ANY,
                                    0);
       RtecEventChannelAdmin::ConsumerQOS & qos =
-        ACE_const_cast (RtecEventChannelAdmin::ConsumerQOS &,
-                        consumer_qos_factory.get_ConsumerQOS ());
+        const_cast<RtecEventChannelAdmin::ConsumerQOS &> (consumer_qos_factory.get_ConsumerQOS ());
       qos.is_gateway = 1;
 
       sender->connect (qos ACE_ENV_ARG_PARAMETER);
@@ -558,8 +557,7 @@ TAO_ECG_Mcast_Gateway::init_receiver (
                                ACE_ES_EVENT_ANY,
                                0, 1);
   RtecEventChannelAdmin::SupplierQOS & qos =
-    ACE_const_cast (RtecEventChannelAdmin::SupplierQOS &,
-                    supplier_qos_factory.get_SupplierQOS ());
+    const_cast<RtecEventChannelAdmin::SupplierQOS &> (supplier_qos_factory.get_SupplierQOS ());
   qos.is_gateway = 1;
 
   receiver->connect (qos ACE_ENV_ARG_PARAMETER);
@@ -578,14 +576,14 @@ TAO_ECG_Mcast_Gateway::verify_args (CORBA::ORB_ptr orb,
     {
       ACE_ERROR ((LM_ERROR,
                   "Nil event channel argument passed to "
-                  "TAO_ECG_Mcast_Gateway::run()."));
+                  "TAO_ECG_Mcast_Gateway::run().\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
   if (CORBA::is_nil (orb))
     {
       ACE_ERROR ((LM_ERROR,
                   "Nil orb argument passed to "
-                  "TAO_ECG_Mcast_Gateway::run()."));
+                  "TAO_ECG_Mcast_Gateway::run().\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 }
@@ -610,7 +608,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
   if (!address_server_servant.in ())
     {
       ACE_DEBUG ((LM_ERROR,
-                  "Unable to create address server."));
+                  "Unable to create address server.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
index 3a38214b37c..f4c39d5f7b2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
@@ -7,7 +7,7 @@ TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void)
   , address_server_type_ (TAO_ECG_DEFAULT_ADDRESS_SERVER)
   , address_server_arg_ ((const char *) TAO_ECG_DEFAULT_ADDRESS_SERVER_ARG)
   , ttl_value_ (TAO_ECG_DEFAULT_TTL)
-  , nic_ (ACE_static_cast(const char *,TAO_ECG_DEFAULT_NIC))
+  , nic_ (static_cast<const char *> (TAO_ECG_DEFAULT_NIC))
   , ip_multicast_loop_ (TAO_ECG_DEFAULT_IP_MULTICAST_LOOP)
   , non_blocking_ (TAO_ECG_DEFAULT_NON_BLOCKING)
   , consumer_qos_ ()
@@ -21,7 +21,7 @@ TAO_ECG_Mcast_Gateway::Attributes::Attributes (void)
   , handler_type (TAO_ECG_DEFAULT_HANDLER)
   , service_type (TAO_ECG_DEFAULT_SERVICE)
   , ttl_value (TAO_ECG_DEFAULT_TTL)
-  , nic (ACE_static_cast(const char *,TAO_ECG_DEFAULT_NIC))
+  , nic (static_cast<const char *> (TAO_ECG_DEFAULT_NIC))
   , ip_multicast_loop (TAO_ECG_DEFAULT_IP_MULTICAST_LOOP)
   , non_blocking (TAO_ECG_DEFAULT_NON_BLOCKING)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index 7ff87f3f5b6..ac9c1e18bfe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -7,10 +7,6 @@
 
 #include "ace/Reactor.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ECG_Reactive_ConsumerEC_Control.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, ECG_Reactive_ConsumerEventChannelControl, "$Id$")
 
 TAO_ECG_Reactive_ConsumerEC_Control::
@@ -246,8 +242,3 @@ TAO_ECG_Reactive_ConsumerEC_Control_Adapter::handle_timeout (
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index 5f7a01f5346..387b2e9dcfc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -119,10 +119,6 @@ private:
   ACE_Reactor *reactor_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "ECG_Reactive_ConsumerEC_Control.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ECG_REACTIVE_CONSUMEREC_CONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
index da28d20b8e0..ae4c0aa8e57 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
@@ -5,10 +5,6 @@
 #include "ace/Reactor.h"
 #include "ace/os_include/os_fcntl.h"
 
-#if !defined(__ACE_INLINE__)
-#include "ECG_Simple_Mcast_EH.i"
-#endif /* __ACE_INLINE__ */
-
 TAO_ECG_Simple_Mcast_EH::TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv)
   : receiver_ (recv)
 {
@@ -35,14 +31,14 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr,
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to open mcast handler: "
                        "error using specified address %s "
-                       "in ACE_INET.set ().",
+                       "in ACE_INET.set ().\n",
                        mcast_addr),
                       -1);
 
   if (this->dgram_.subscribe (mcast_group, 1, net_if) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                       "Unable to open mcast handler: error "
-                      "subscribing to %s",
+                      "subscribing to %s\n",
                        mcast_addr),
                       -1);
 
@@ -55,7 +51,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr,
     {
       this->dgram_.close ();
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot register handler with reactor."),
+                         "Cannot register handler with reactor.\n"),
                         -1);
     }
 
@@ -78,13 +74,13 @@ TAO_ECG_Simple_Mcast_EH::shutdown (void)
   if (result != 0)
     ACE_ERROR ((LM_ERROR,
                 "Unable to deregister handler from reactor "
-                "on shutdown."));
+                "on shutdown.\n"));
 
   result = this->dgram_.close ();
   if (result != 0)
     ACE_ERROR ((LM_ERROR,
                 "Unable to close mcast receiving dgram "
-                "on shutdown."));
+                "on shutdown.\n"));
 
   this->receiver_ = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
index ca830cc49c6..e2922882f3b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
@@ -86,9 +86,5 @@ private:
   TAO_ECG_Dgram_Handler* receiver_;
 };
 
-#if defined(__ACE_INLINE__)
-#include "ECG_Simple_Mcast_EH.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ECG_SIMPLE_Mcast_EH_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index 016fac6849a..d57d733eefc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -31,7 +31,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr,
   if (this->dgram_.open (ipaddr, PF_INET, 0, reuse_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to open udp handler: "
-                       "error opening receiving dgram."),
+                       "error opening receiving dgram.\n"),
                        -1);
 
   if (!this->reactor ()
@@ -41,7 +41,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr,
     {
       this->dgram_.close ();
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot register handler with reactor."),
+                         "Cannot register handler with reactor.\n"),
                         -1);
     }
 
@@ -64,12 +64,12 @@ TAO_ECG_UDP_EH::shutdown (void)
   if (result != 0)
     ACE_ERROR ((LM_ERROR,
                 "Unable to deregister handler from reactor "
-                "on shutdown."));
+                "on shutdown.\n"));
 
   result = this->dgram_.close ();
   if (result != 0)
     ACE_ERROR ((LM_ERROR,
-                "Unable to close receiving dgram on shutdown."));
+                "Unable to close receiving dgram on shutdown.\n"));
 
   this->receiver_ = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 0fdccc40c53..73e309bcedf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -37,7 +37,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
     {
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::init(): "
-                  "<lcl_ec> argument is nil."));
+                  "<lcl_ec> argument is nil.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -58,7 +58,7 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub
     {
       ACE_ERROR ((LM_ERROR,
                   "Error initializing TAO_ECG_UDP_Receiver: "
-                  "init() hasn't been called before connect()."));
+                  "init() hasn't been called before connect().\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -66,7 +66,7 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub
     {
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::connect(): "
-                  "0-length publications argument."));
+                  "0-length publications argument.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -188,7 +188,7 @@ TAO_ECG_Event_CDR_Decoder::decode (TAO_InputCDR &cdr)
   if (!(cdr >> this->events))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Error decoding events cdr."),
+                         "Error decoding events cdr.\n"),
                         -1);
     }
   return 0;
@@ -207,7 +207,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
           ACE_ERROR ((LM_ERROR,
                       "TAO_ECG_UDP_Receiver::handle_input() "
                       "called but the Receiver is not connected "
-                      "to an event channel. Shutting down the Receiver."));
+                      "to an event channel. Shutting down the Receiver.\n"));
           this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -226,7 +226,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
       if (result == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                            "Error receiving multicasted events."),
+                            "Error receiving multicasted events.\n"),
                             0);
         }
 
@@ -238,7 +238,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
     {
       ACE_DEBUG ((LM_ERROR,
                   "Caught and swallowed EXCEPTION in "
-                  "ECG_UDP_Receiver::handle_input: %s",
+                  "ECG_UDP_Receiver::handle_input: %s\n",
                   ACE_ANY_EXCEPTION._info ().c_str ()));
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
index 3f6a64bb48c..39ff8265264 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
@@ -90,7 +90,7 @@ TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header,
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::get_addr() called but "
                   "nil Address Server was supplied during "
-                  "initialization through init()."));
+                  "initialization through init().\n"));
 
       ACE_THROW (CORBA::INTERNAL ());
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index fb5333fb463..ff3a295b1cc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_And_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_And_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_And_Filter, "$Id$")
 
 TAO_EC_And_Filter::
@@ -53,7 +49,7 @@ TAO_EC_And_Filter::end (void) const
 int
 TAO_EC_And_Filter::size (void) const
 {
-  return ACE_static_cast (CORBA::ULong, this->n_);
+  return static_cast<CORBA::ULong> (this->n_);
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index 9c5f47f99c3..cdf21b9d9fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -82,9 +82,5 @@ private:
   size_t n_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_And_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_AND_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 7eb7b9fac4f..1538ebd5264 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -20,12 +20,8 @@
 
 #include "tao/ORB_Core.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Basic_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Event, 
-           EC_Basic_Factory, 
+ACE_RCSID (Event,
+           EC_Basic_Factory,
            "$Id$")
 
 TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index eb94087485b..8ba827cf306 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -110,10 +110,6 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Basic_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_BASIC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index da2d0e66069..30605712f32 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Bitmask_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Bitmask_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Bitmask_Filter, "$Id$")
 
 TAO_EC_Bitmask_Filter::
@@ -27,13 +23,13 @@ TAO_EC_Bitmask_Filter::~TAO_EC_Bitmask_Filter (void)
 TAO_EC_Filter::ChildrenIterator
 TAO_EC_Bitmask_Filter::begin (void) const
 {
-  return ACE_const_cast(TAO_EC_Filter**,&this->child_);
+  return const_cast<TAO_EC_Filter**> (&this->child_);
 }
 
 TAO_EC_Filter::ChildrenIterator
 TAO_EC_Bitmask_Filter::end (void) const
 {
-  return ACE_const_cast(TAO_EC_Filter**,&this->child_) + 1;
+  return const_cast<TAO_EC_Filter**> (&this->child_) + 1;
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index 2842f163cbb..f999bb1d34f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -100,9 +100,5 @@ private:
   TAO_EC_Filter* child_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Bitmask_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_BITMASK_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index a18ada6b040..696320fde99 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Conjunction_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Conjunction_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Conjunction_Filter, "$Id$")
 
 const int bits_per_word = sizeof(TAO_EC_Conjunction_Filter::Word) * CHAR_BIT;
@@ -56,7 +52,7 @@ TAO_EC_Conjunction_Filter::all_received (void) const
        i != this->bitvec_ + this->nwords_;
        ++i)
     {
-      if (*i != ACE_static_cast(Word,~0))
+      if (*i != static_cast<Word> (~0))
         return 0;
     }
   return 1;
@@ -77,7 +73,7 @@ TAO_EC_Conjunction_Filter::end (void) const
 int
 TAO_EC_Conjunction_Filter::size (void) const
 {
-  return ACE_static_cast (int, this->n_);
+  return static_cast<int> (this->n_);
 }
 
 int
@@ -163,7 +159,7 @@ TAO_EC_Conjunction_Filter::clear (void)
     {
       *j = 0;
     }
-  int b = ACE_static_cast (int, this->n_ % bits_per_word);
+  int b = static_cast<int> (this->n_ % bits_per_word);
   Word last = ~0 << b;
   *j = last;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index 67353ac488a..f1f3a95f60f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -106,9 +106,5 @@ private:
   ChildrenIterator current_child_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Conjunction_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_CONJUNCTION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index d27e7203e8a..9c8edb3bdec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -8,12 +8,8 @@
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_ConsumerAdmin.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Event, 
-           EC_ConsumerAdmin, 
+ACE_RCSID (Event,
+           EC_ConsumerAdmin,
            "$Id$")
 
 TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 60b5edadb24..df1d376da28 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -72,10 +72,6 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_ConsumerAdmin.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_CONSUMERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index 0d0a8be8ed3..f0240c4a97a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_ConsumerControl.h"
 
-#if ! defined (__ACE_INdLINE__)
-#include "EC_ConsumerControl.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_ConsumerControl, "$Id$")
 
 TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 81fc7ea94c5..2ea9b266e35 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -71,10 +71,6 @@ public:
                                  ACE_ENV_ARG_DECL_NOT_USED);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_ConsumerControl.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_CONSUMERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 61adaf515d7..03c7369655f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -964,9 +964,9 @@ template class ACE_Node<ACE_Static_Svc_Descriptor*>;
 template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushConsumer>;
 template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>;
 template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>;
-template class ACE_Unbounded_Set_Ex<TAO_EC_ProxyPushConsumer *>;
+template class ACE_Unbounded_Set<TAO_EC_ProxyPushConsumer *>;
 template class ACE_Node<TAO_EC_ProxyPushConsumer *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_EC_ProxyPushConsumer *>;
+template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushConsumer *>;
 template class ACE_RB_Tree<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Reverse_Iterator<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>;
@@ -991,9 +991,9 @@ template class TAO_ESF_Copy_On_Write_Collection<
 template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushSupplier>;
 template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>;
 template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>;
-template class ACE_Unbounded_Set_Ex<TAO_EC_ProxyPushSupplier *>;
+template class ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier *>;
 template class ACE_Node<TAO_EC_ProxyPushSupplier *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_EC_ProxyPushSupplier *>;
+template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier *>;
 template class ACE_RB_Tree<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator_Base<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index ffed6d1632e..722417dad38 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -27,6 +27,7 @@
 
 #include "ace/Service_Config.h"
 #include "ace/SString.h"
+#include "ace/Time_Value.h"
 
 /**
  * @class TAO_EC_Default_Factory
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index 8a02369cdf4..ab836a8dcbf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -6,12 +6,7 @@
 #include "EC_Supplier_Filter.h"
 #include "ace/Synch_T.h"
 
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Default_ProxyConsumer.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Dd$")
+ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Id$")
 
 typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 853b7e04a93..58cd1d5d2e4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -75,10 +75,6 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Default_ProxyConsumer.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_DEFAULT_PROXYCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index e6f67b0085d..1265d53d656 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -6,10 +6,6 @@
 
 #include "ace/Reverse_Lock_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Default_ProxySupplier.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Event,
            EC_ProxySupplier,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index dfbe23bfd05..20685888574 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -72,10 +72,6 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Default_ProxySupplier.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_DEFAULT_PROXYSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 11e71c4b0ec..ffd6030faa8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Disjunction_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Disjunction_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Disjunction_Filter, "$Id$")
 
 TAO_EC_Disjunction_Filter::
@@ -53,7 +49,7 @@ TAO_EC_Disjunction_Filter::end (void) const
 int
 TAO_EC_Disjunction_Filter::size (void) const
 {
-  return ACE_static_cast (int, this->n_);
+  return static_cast<int> (this->n_);
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index d98ca3d312d..18f756efe73 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -83,9 +83,5 @@ private:
   size_t n_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Disjunction_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_DISJUNCTION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index c39e6ce5fbf..a38dcbbdce7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -3,10 +3,6 @@
 #include "EC_Dispatching.h"
 #include "EC_ProxySupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Dispatching, "$Id$")
 
 TAO_EC_Dispatching::~TAO_EC_Dispatching (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 54ea96405e4..d61d5039829 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -74,10 +74,6 @@ public:
                             ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index dcc485dc789..db1d0cef034 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -17,7 +17,7 @@ ACE_RCSID (Event,
 int
 TAO_EC_Queue::is_full_i (void)
 {
-  return ACE_static_cast (size_t, this->cur_count_) > this->high_water_mark_;
+  return static_cast<size_t> (this->cur_count_) > this->high_water_mark_;
 }
 
 // ****************************************************************
@@ -39,7 +39,7 @@ TAO_EC_Dispatching_Task::svc (void)
                         "EC (%P|%t) getq error in Dispatching Queue\n"));
 
           TAO_EC_Dispatch_Command *command =
-            ACE_dynamic_cast(TAO_EC_Dispatch_Command*, mb);
+            dynamic_cast<TAO_EC_Dispatch_Command*> (mb);
 
           if (command == 0)
             {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index e15f04e497d..fa498a4d514 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -4,10 +4,6 @@
 #include "EC_Default_Factory.h"
 #include "ace/Dynamic_Service.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Event_Channel.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Event_Channel, "$Id$")
 
 TAO_EC_Event_Channel::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index e0737db1c56..20ac3add3ba 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -52,10 +52,6 @@ public:
                         int own_factory = 0);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Event_Channel.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 1c141711388..015d6b83a17 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -3,10 +3,6 @@
 #include "EC_Factory.h"
 #include "ace/Dynamic_Service.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Factory, "$Id$")
 
 TAO_EC_Factory::~TAO_EC_Factory (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index f70a4e08ad7..c042c8f4150 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -156,10 +156,6 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index eb368de2dbb..6359f3b26ee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -145,7 +145,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[])
           arg_shifter.ignore_arg ();
           ACE_DEBUG ((LM_WARNING,
                              "Ignoring <%s> option "
-                             "during initialization.",
+                             "during initialization.\n",
                       arg));
           result = -1;
         }
@@ -161,7 +161,7 @@ TAO_EC_Gateway_IIOP_Factory::unsupported_option_value (const char * option_name,
   ACE_ERROR ((LM_ERROR,
               "EC_Gateway_IIOP_Factory -"
               "Unsupported <%s> option value: <%s>. "
-              "Ignoring this option - using defaults instead.",
+              "Ignoring this option - using defaults instead.\n",
               option_name,
               option_value));
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
index dd4cefb8cef..7acd83a534f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
@@ -20,6 +20,7 @@
 
 #include "ace/Time_Value.h"
 #include "ace/Service_Object.h"
+#include "ace/SString.h"
 
 #include /**/ "event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index 5463f77f0c1..4634f940e41 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -26,8 +26,7 @@ TAO_EC_Group_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
 {
   TAO_EC_QOS_Info event_info;
   // @@ yuck...
-  filter->push_scheduled_event (ACE_const_cast (RtecEventComm::EventSet&,
-                                                event),
+  filter->push_scheduled_event (const_cast<RtecEventComm::EventSet&> (event),
                                 event_info
                                 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index c19e079d950..03e5d7011dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -4,10 +4,6 @@
 #include "EC_QOS_Info.h"
 #include "ace/Log_Msg.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Kokyu_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Kokyu_Filter, "$Id$")
 
 TAO_EC_Kokyu_Filter::
@@ -154,7 +150,7 @@ TAO_EC_Kokyu_Filter::can_match (const RtecEventComm::EventHeader& header) const
   return this->body_->can_match (header);
 }
 
-/* 
+/*
     Kokyu_Filter
         |
         |body
@@ -171,7 +167,7 @@ TAO_EC_Kokyu_Filter::can_match (const RtecEventComm::EventHeader& header) const
 
 The entire hierarchy will have the same rt_info as the root. Only the root
 rt_info will be part of the dependency graph in the scheduler. The root
-rt_info will have a dependency on the consumer rt_info. 
+rt_info will have a dependency on the consumer rt_info.
 
 <--- shows dependency (oneway)
 
@@ -192,7 +188,7 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
   ACE_CHECK_RETURN (0);
 
 #ifdef EC_KOKYU_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "this->rt_info_ = %d, header.type = %d, qos_info.rt_info = %d\n",
               this->rt_info_, header.type, qos_info.rt_info));
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index 55d64cdb2c9..a737b93cb55 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -85,7 +85,7 @@ public:
                                 ACE_ENV_ARG_DECL);
   virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
                              ACE_ENV_ARG_DECL);
-  
+
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Kokyu_Filter
                               (const TAO_EC_Kokyu_Filter&))
@@ -125,9 +125,5 @@ private:
   RtecScheduler::Info_Type_t info_type_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Kokyu_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_KOKYU_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 5fce1a7cab8..a41b54cc85c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -164,7 +164,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
                   "can be established\n"));
 #endif
       TAO_EC_Kokyu_Filter* kokyu_filter =
-        ACE_dynamic_cast(TAO_EC_Kokyu_Filter*, filter);
+        dynamic_cast<TAO_EC_Kokyu_Filter*> (filter);
   
       //add the dependency between the root in the filter hierarchy and
       //the final consumer
@@ -305,8 +305,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
 
         //build a unique name using the cosumer_rt_info
         ACE_OS::sprintf (buf, "TIMEOUT:%umsec:%d",
-                         ACE_static_cast (u_int,
-                                          (e.header.creation_time / 10000)),
+                         static_cast<u_int> ((e.header.creation_time / 10000)),
                          h_consumer_rt_info);
         ACE_CString name = buf;
         
@@ -316,8 +315,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
         
         // Convert the time to the proper units....
         RtecScheduler::Period_t period =
-          ACE_static_cast (RtecScheduler::Period_t,
-                           e.header.creation_time);
+          static_cast<RtecScheduler::Period_t> (e.header.creation_time);
         
 #if 1 //by VS original code replaced with this
         RtecScheduler::RT_Info* consumer_rt_info_ptr;
@@ -471,8 +469,7 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
 
       char buf[64];
       ACE_OS::sprintf (buf, "TIMEOUT:%umsec",
-                       ACE_static_cast (u_int,
-                                        (e.header.creation_time / 10000)));
+                       static_cast<u_int> ((e.header.creation_time / 10000)));
       name = buf;
 
       return;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index dd857c059e8..48453663f23 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -61,7 +61,7 @@ TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
     {
       const RtecEventComm::Event& e = event[j];
       RtecEventComm::Event* buffer =
-        ACE_const_cast(RtecEventComm::Event*, &e);
+        const_cast<RtecEventComm::Event*> (&e);
       RtecEventComm::EventSet single_event (1, 1, buffer, 0);
 
       TAO_EC_QOS_Info qos_info;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index acf12ef62d9..5be3be22db3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_MT_Dispatching.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_MT_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_MT_Dispatching, "$Id$")
 
 TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index ff92d8c16f7..989bb21caf8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -85,9 +85,5 @@ private:
   int active_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_MT_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_MT_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 5b9cf65242b..6e6e6a0fde6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Masked_Type_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Masked_Type_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Masked_Type_Filter, "$Id$")
 
 TAO_EC_Masked_Type_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 22f8b41e94c..14a8392d558 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -86,9 +86,5 @@ private:
   CORBA::ULong type_value_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Masked_Type_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_MASKED_TYPE_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 6c71dd03171..de13c0f59a2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Negation_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Negation_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Negation_Filter, "$Id$")
 
 TAO_EC_Negation_Filter::
@@ -23,13 +19,13 @@ TAO_EC_Negation_Filter::~TAO_EC_Negation_Filter (void)
 TAO_EC_Filter::ChildrenIterator
 TAO_EC_Negation_Filter::begin (void) const
 {
-  return ACE_const_cast(TAO_EC_Filter**,&this->child_);
+  return const_cast<TAO_EC_Filter**> (&this->child_);
 }
 
 TAO_EC_Filter::ChildrenIterator
 TAO_EC_Negation_Filter::end (void) const
 {
-  return ACE_const_cast(TAO_EC_Filter**,&this->child_) + 1;
+  return const_cast<TAO_EC_Filter**> (&this->child_) + 1;
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index b63e3fc8a49..dc6619fcd94 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -79,9 +79,5 @@ private:
   TAO_EC_Filter* child_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Negation_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_NEGATION_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index e9df4b4298e..9414cb975d9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -19,10 +19,6 @@
 
 #include "tao/ORB_Core.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Null_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Null_Factory, "$Id$")
 
 TAO_EC_Null_Factory::TAO_EC_Null_Factory (void)
@@ -240,8 +236,3 @@ TAO_EC_Null_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x)
   delete x;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
index 9ce13b08d49..4214c4ddc83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -107,9 +107,5 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Null_Factory.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_NULL_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index d99b8ae69ea..5b032866004 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -28,7 +28,7 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
     {
       const RtecEventComm::Event& e = event[j];
       RtecEventComm::Event* buffer =
-        ACE_const_cast(RtecEventComm::Event*, &e);
+        const_cast<RtecEventComm::Event*> (&e);
       RtecEventComm::EventSet single_event (1, 1, buffer, 0);
 
       TAO_EC_QOS_Info event_info;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 3149420a6f1..4c5d9bed338 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -147,7 +147,7 @@ TAO_EC_Basic_ObserverStrategy::create_observer_list (
                  RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
   ACE_CHECK_RETURN (0);
 
-  int size = ACE_static_cast (int, this->observers_.current_size ());
+  int size = static_cast<int> (this->observers_.current_size ());
   RtecEventChannelAdmin::Observer_var *tmp;
   ACE_NEW_RETURN (tmp,
                   RtecEventChannelAdmin::Observer_var[size],
@@ -285,11 +285,10 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
 
   RtecEventChannelAdmin::DependencySet& dep = qos.dependencies;
 
-  dep.length (ACE_static_cast (CORBA::ULong, headers.current_size () + 1));
+  dep.length (static_cast<CORBA::ULong> (headers.current_size () + 1));
 
   dep[0].event.header.type = ACE_ES_DISJUNCTION_DESIGNATOR;
-  dep[0].event.header.source = ACE_static_cast (CORBA::ULong,
-                                                headers.current_size ());
+  dep[0].event.header.source = static_cast<CORBA::ULong> (headers.current_size ());
   dep[0].event.header.creation_time = ORBSVCS_Time::zero ();
   dep[0].rt_info = 0;
 
@@ -312,8 +311,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  qos.publications.length (ACE_static_cast (CORBA::ULong,
-                                            headers.current_size ()));
+  qos.publications.length (static_cast<CORBA::ULong> (headers.current_size ()));
 
   CORBA::ULong count = 0;
   for (HeadersIterator i = headers.begin (); i != headers.end (); ++i)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 53f7634ce00..2942b19527f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -10,10 +10,6 @@
 
 #include "ace/Sched_Params.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Priority_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Priority_Dispatching, "$Id$")
 
 TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index 717fad35865..68e7f4b927b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -81,9 +81,5 @@ private:
   RtecScheduler::Scheduler_var scheduler_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Priority_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_PRIORITY_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index d57458dac62..ce5fd2843e5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -62,7 +62,7 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event
     {
       const RtecEventComm::Event& e = event[j];
       RtecEventComm::Event* buffer =
-        ACE_const_cast(RtecEventComm::Event*, &e);
+        const_cast<RtecEventComm::Event*> (&e);
       RtecEventComm::EventSet single_event (1, 1, buffer, 0);
 
       TAO_EC_QOS_Info qos_info;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index ea22992bf90..2b895dbbb6e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -273,7 +273,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
   RtecEventComm::PushConsumer_var consumer =
     RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ());
 
-  this->pre_dispatch_hook (ACE_const_cast (RtecEventComm::EventSet&, event)
+  this->pre_dispatch_hook (const_cast<RtecEventComm::EventSet&> (event)
                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index 05d44206f14..3de61363002 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -3,10 +3,6 @@
 #include "EC_RTCORBA_Dispatching.h"
 #include "tao/RTCORBA/Priority_Mapping.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_RTCORBA_Dispatching.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_RTCORBA_Dispatching, "$Id$")
 
 TAO_EC_RTCORBA_Dispatching::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
index 2ba7369cec1..a4f80a3beb0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
@@ -75,9 +75,5 @@ private:
   TAO_EC_Dispatching_Task *tasks_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_RTCORBA_Dispatching.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_RTCORBA_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.inl b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 0278f49bfed..cc66a493b88 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -5,10 +5,6 @@
 
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_RTCORBA_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_RTCORBA_Factory, "$Id$")
 
 TAO_EC_RTCORBA_Factory::
@@ -273,6 +269,3 @@ TAO_EC_RTCORBA_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x)
   this->body_->destroy_supplier_control (x);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
index 2bdbc22ec38..ef07e07bec9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
@@ -115,9 +115,5 @@ protected:
   RTCORBA::ThreadpoolLanes lanes_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_RTCORBA_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_RTCORBA_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index b8f77c2d451..22b61364015 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -27,6 +27,9 @@ TAO_EC_Reactive_ConsumerControl::
     adapter_ (this),
     event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+    , timer_id_ (-1)
+#endif /* TAO_HAS_CORBA_MESSAGING != 0*/
 {
   this->reactor_ =
     this->orb_->orb_core ()->reactor ();
@@ -132,11 +135,11 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
         // Schedule the timer after these policies has been set, because the
         // handle_timeout uses these policies, if done in front, the channel
         // can crash when the timeout expires before initiazation is ready.
-        long id = this->reactor_->schedule_timer (&this->adapter_,
-                                                  0,
-                                                  this->rate_,
-                                                  this->rate_);
-        if (id == -1)
+        timer_id_ = this->reactor_->schedule_timer (&this->adapter_,
+                                                    0,
+                                                    this->rate_,
+                                                    this->rate_);
+        if (timer_id_ == -1)
           return -1;
       }
     }
@@ -153,9 +156,11 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
 int
 TAO_EC_Reactive_ConsumerControl::shutdown (void)
 {
-  int r =
-    this->reactor_->remove_handler (&this->adapter_,
-                                    ACE_Event_Handler::DONT_CALL);
+  int r = 0;
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+  r = this->reactor_->cancel_timer (timer_id_);
+#endif /* TAO_HAS_CORBA_MESSAGING */
   this->adapter_.reactor (0);
   return r;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 26f9df5c53a..4457d1f280f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -121,6 +121,11 @@ private:
 
   /// The ORB reactor
   ACE_Reactor *reactor_;
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+  /// The timer id
+  int timer_id_;
+#endif /* TAO_HAS_CORBA_MESSAGING */
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index f8e5e78df3a..ee376503697 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -3,10 +3,6 @@
 #include "EC_Reactive_Dispatching.h"
 #include "EC_ProxySupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Reactive_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Reactive_Dispatching, "$Id$")
 
 TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
index 9544dcd37ec..0900596c2c4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
@@ -55,10 +55,6 @@ public:
                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Reactive_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_REACTIVE_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index d7ff47bb870..a2e0577d317 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -27,6 +27,9 @@ TAO_EC_Reactive_SupplierControl::
     adapter_ (this),
     event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+    , timer_id_ (-1)
+#endif /* TAO_HAS_CORBA_MESSAGING != 0*/
 {
   this->reactor_ =
     this->orb_->orb_core ()->reactor ();
@@ -124,11 +127,11 @@ TAO_EC_Reactive_SupplierControl::activate (void)
         // Schedule the timer after these policies has been set, because the
         // handle_timeout uses these policies, if done in front, the channel
         // can crash when the timeout expires before initiazation is ready.
-        long id = this->reactor_->schedule_timer (&this->adapter_,
-                                                  0,
-                                                  this->rate_,
-                                                  this->rate_);
-        if (id == -1)
+        timer_id_ = this->reactor_->schedule_timer (&this->adapter_,
+                                                    0,
+                                                    this->rate_,
+                                                    this->rate_);
+        if (timer_id_ == -1)
           return -1;
       }
     }
@@ -145,9 +148,11 @@ TAO_EC_Reactive_SupplierControl::activate (void)
 int
 TAO_EC_Reactive_SupplierControl::shutdown (void)
 {
-  int r =
-    this->reactor_->remove_handler (&this->adapter_,
-                                    ACE_Event_Handler::DONT_CALL);
+  int r = 0;
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+  r = this->reactor_->cancel_timer (timer_id_);
+#endif /* TAO_HAS_CORBA_MESSAGING */
   this->adapter_.reactor (0);
   return r;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index 6ae7fb8594c..d51c1074240 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -131,6 +131,11 @@ private:
 
   /// The ORB reactor
   ACE_Reactor *reactor_;
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+  /// The timer id
+  int timer_id_;
+#endif /* TAO_HAS_CORBA_MESSAGING */
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
index 52c7eb79c11..984ca0f7a7d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
@@ -1,15 +1,10 @@
 // $Id$
 
 #include "EC_Reactive_Timeout_Generator.h"
-
 #include "ace/Reactor.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Reactive_Timeout_Generator.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Event, 
-           EC_Reactive_Timeout_Generator, 
+ACE_RCSID (Event,
+           EC_Reactive_Timeout_Generator,
            "$Id$")
 
 TAO_EC_Reactive_Timeout_Generator::
@@ -41,7 +36,7 @@ TAO_EC_Reactive_Timeout_Generator::schedule_timer (
       const ACE_Time_Value& interval)
 {
   return this->reactor_->schedule_timer (&this->event_handler_,
-                                         ACE_static_cast(void*,filter),
+                                         static_cast<void*> (filter),
                                          delta,
                                          interval);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
index e75afbcc5fc..299dffc482c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
@@ -32,7 +32,7 @@
  * Implements the Timeout_Generator using an ACE_Reactor. Usually
  * the same reactor that is used by the ORB where the EC runs.
  */
-class TAO_RTEvent_Export TAO_EC_Reactive_Timeout_Generator 
+class TAO_RTEvent_Export TAO_EC_Reactive_Timeout_Generator
   : public TAO_EC_Timeout_Generator
 {
 public:
@@ -60,10 +60,6 @@ private:
   TAO_EC_Timeout_Adapter event_handler_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Reactive_Timeout_Generator.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 9a484e2316b..514d483c9ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -4,10 +4,6 @@
 #include "EC_QOS_Info.h"
 #include "ace/Log_Msg.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Sched_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Sched_Filter, "$Id$")
 
 TAO_EC_Sched_Filter::
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index c1093401be5..af1d172d130 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -123,9 +123,5 @@ private:
   RtecScheduler::Info_Type_t info_type_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Sched_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_SCHED_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 6b2815e4897..2070df1c0d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -156,8 +156,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
       //    application?
       char buf[64];
       ACE_OS::sprintf (buf, "TIMEOUT:%u",
-                       ACE_static_cast (u_int,
-                                        (e.header.creation_time / 10000)));
+                       static_cast<u_int> ((e.header.creation_time / 10000)));
       ACE_CString name = buf;
 
       TAO_EC_QOS_Info qos_info;
@@ -167,8 +166,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
 
       // Convert the time to the proper units....
       RtecScheduler::Period_t period =
-        ACE_static_cast (RtecScheduler::Period_t,
-                         e.header.creation_time / 10);
+        static_cast<RtecScheduler::Period_t> (e.header.creation_time / 10);
 
       scheduler->set (qos_info.rt_info,
                       RtecScheduler::VERY_LOW_CRITICALITY,
@@ -296,8 +294,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
 
       char buf[64];
       ACE_OS::sprintf (buf, "TIMEOUT:%u",
-                       ACE_static_cast (u_int,
-                                        (e.header.creation_time / 10000)));
+                       static_cast<u_int> ((e.header.creation_time / 10000)));
       name = buf;
 
       return;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index b96abfd40a8..311f0a86447 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -3,10 +3,6 @@
 #include "EC_Scheduling_Strategy.h"
 #include "EC_QOS_Info.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Scheduling_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Scheduling_Strategy, "$Id$")
 
 TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 29c94f4f892..6f493dbffc9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -63,10 +63,6 @@ public:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Scheduling_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_SCHEDULING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 39d04fec297..73e4e6f86d2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -8,10 +8,6 @@
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_SupplierAdmin.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_SupplierAdmin, "$Id$")
 
 TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 91572785bc2..827614bc4c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -63,10 +63,6 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_SupplierAdmin.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_SUPPLIERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 4bbbf0f2d82..94c7a2f58b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_SupplierControl.h"
 
-#if ! defined (__ACE_INdLINE__)
-#include "EC_SupplierControl.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_SupplierControl, "$Id$")
 
 TAO_EC_SupplierControl::TAO_EC_SupplierControl (void)
@@ -41,8 +37,3 @@ TAO_EC_SupplierControl::system_exception (TAO_EC_ProxyPushConsumer *,
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index 1db1572fc32..0af5a03aeec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -69,10 +69,6 @@ public:
                                  ACE_ENV_ARG_DECL_NOT_USED);
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_SupplierControl.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_SUPPLIERCONTROL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index 049f8f88626..a090b438772 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Supplier_Filter_Builder.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Supplier_Filter_Builder.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Supplier_Filter_Builder, "$Id$")
 
 TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index 88a25804797..a22c516f9e6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -57,10 +57,6 @@ public:
 
 // ****************************************************************
 
-#if defined (__ACE_INLINE__)
-#include "EC_Supplier_Filter_Builder.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_FILTER_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 4373aef1b62..caa5d55a189 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -28,7 +28,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
   //              tv.sec (), tv.usec ()));
 
   TAO_EC_Timeout_Filter *filter =
-    ACE_static_cast(TAO_EC_Timeout_Filter*, ACE_const_cast(void*,vp));
+    static_cast<TAO_EC_Timeout_Filter*> (const_cast<void*> (vp));
 
   if (filter == 0)
     return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index 321f87bb6ef..3cf2b87baf0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -8,10 +8,6 @@
 #include "EC_Scheduling_Strategy.h"
 #include "EC_ProxyConsumer.h" // @@ MSVC 6 bug
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Trivial_Supplier_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Trivial_Supplier_Filter, "$Id$")
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 04f08fd85e8..db4fe238220 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -99,10 +99,6 @@ private:
   TAO_EC_Trivial_Supplier_Filter filter_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Trivial_Supplier_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_EC_TRIVIAL_SUPPLIER_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 04db9a3eb61..ef39e461f86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "EC_Type_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EC_Type_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, EC_Type_Filter, "$Id$")
 
 TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index 6b731dddec1..cded3117683 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -74,9 +74,5 @@ private:
   RtecEventComm::EventHeader header_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "EC_Type_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_EC_TYPE_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 65bbe15ddd5..6fd353f5ebd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -41,12 +41,12 @@ template class ACE_Map_Reverse_Iterator<RtecEventChannelAdmin::Observer_Handle,
 template class ACE_Node<ACE_ES_Consumer_Rep *>;
 template class ACE_Node<ACE_Push_Consumer_Proxy *>;
 template class ACE_Node<ACE_Push_Supplier_Proxy *>;
-template class ACE_Unbounded_Set_Ex<ACE_ES_Consumer_Rep *>;
-template class ACE_Unbounded_Set_Ex<ACE_Push_Consumer_Proxy *>;
-template class ACE_Unbounded_Set_Ex<ACE_Push_Supplier_Proxy *>;
-template class ACE_Unbounded_Set_Ex_Iterator<ACE_ES_Consumer_Rep *>;
-template class ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Consumer_Proxy *>;
-template class ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Supplier_Proxy *>;
+template class ACE_Unbounded_Set<ACE_ES_Consumer_Rep *>;
+template class ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *>;
+template class ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *>;
+template class ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *>;
 
 template class ACE_Auto_Basic_Ptr<ACE_Push_Supplier_Proxy>;
 template class ACE_Auto_Basic_Ptr<ACE_Push_Consumer_Proxy>;
@@ -78,12 +78,12 @@ template class ACE_Array_Iterator<TAO_EC_Event>;
 #pragma instantiate ACE_Node<ACE_ES_Consumer_Rep *>
 #pragma instantiate ACE_Node<ACE_Push_Consumer_Proxy *>
 #pragma instantiate ACE_Node<ACE_Push_Supplier_Proxy *>
-#pragma instantiate ACE_Unbounded_Set_Ex<ACE_ES_Consumer_Rep *>
-#pragma instantiate ACE_Unbounded_Set_Ex<ACE_Push_Consumer_Proxy *>
-#pragma instantiate ACE_Unbounded_Set_Ex<ACE_Push_Supplier_Proxy *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<ACE_ES_Consumer_Rep *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Consumer_Proxy *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Supplier_Proxy *>
+#pragma instantiate ACE_Unbounded_Set<ACE_ES_Consumer_Rep *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *>
 
 #pragma instantiate ACE_Auto_Basic_Ptr<ACE_Push_Supplier_Proxy>
 #pragma instantiate ACE_Auto_Basic_Ptr<ACE_Push_Consumer_Proxy>
@@ -273,7 +273,7 @@ public:
   { return ::new char[sizeof (Shutdown_Consumer)]; }
 
   void operator delete (void *buf)
-  { ::delete [] ACE_static_cast(char*,buf); }
+  { ::delete [] static_cast<char*> (buf); }
 #endif /* 0 */
 
   // The module that we report to.
@@ -302,7 +302,7 @@ public:
     { return ::new char[sizeof (Shutdown_Channel)]; }
 
   void operator delete (void *buf)
-    { ::delete [] ACE_static_cast(char*,buf); }
+    { ::delete [] static_cast<char*> (buf); }
 #endif
 
   ACE_EventChannel *channel_;
@@ -410,7 +410,7 @@ ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event
       // in another thread!). Other ORBs may do different things and
       // this may not work!
       RtecEventComm::EventSet& copy =
-        ACE_const_cast (RtecEventComm::EventSet&, event);
+        const_cast<RtecEventComm::EventSet&> (event);
 
       this->time_stamp (copy);
       this->supplier_module_->push (this, copy ACE_ENV_ARG_PARAMETER);
@@ -967,7 +967,7 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
   ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, interval);
 
   return this->timer_module ()->schedule_timer (preemption_priority,
-                                                ACE_const_cast(ACE_Command_Base*,act),
+                                                const_cast<ACE_Command_Base*> (act),
                                                 tv_delta,
                                                 tv_interval);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 30e0d418536..ec2ab2a4008 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -29,7 +29,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Unbounded_Set_Ex.h"
+#include "ace/Unbounded_Set.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -728,8 +728,8 @@ public:
   /// Free up dynamic resources.
   ~ACE_ES_Subscription_Info (void);
 
-  typedef ACE_Unbounded_Set_Ex_Iterator<ACE_ES_Consumer_Rep *> Subscriber_Set_Iterator;
-  typedef ACE_Unbounded_Set_Ex<ACE_ES_Consumer_Rep *> Subscriber_Set;
+  typedef ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *> Subscriber_Set_Iterator;
+  typedef ACE_Unbounded_Set<ACE_ES_Consumer_Rep *> Subscriber_Set;
 
 /**
  * @class Type_Subscribers
@@ -1020,8 +1020,8 @@ public:
   void fill_qos (RtecEventChannelAdmin::ConsumerQOS& c_qos);
 
 private:
-  typedef ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Consumer_Proxy *> Consumer_Iterator;
-  typedef ACE_Unbounded_Set_Ex<ACE_Push_Consumer_Proxy *> Consumers;
+  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *> Consumer_Iterator;
+  typedef ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *> Consumers;
 
   /// Protects access to all_consumers_.
   ACE_ES_MUTEX lock_;
@@ -1229,8 +1229,8 @@ private:
   /// Next module down stream.
   ACE_ES_Supplier_Module *down_;
 
-  typedef ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
-  typedef ACE_Unbounded_Set_Ex<ACE_Push_Supplier_Proxy *> Suppliers;
+  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
+  typedef ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *> Suppliers;
 
   /// All suppliers.
   Suppliers all_suppliers_;
@@ -1300,8 +1300,8 @@ public:
   void fill_qos (RtecEventChannelAdmin::SupplierQOS& s_qos);
 
 private:
-  typedef ACE_Unbounded_Set_Ex_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
-  typedef ACE_Unbounded_Set_Ex<ACE_Push_Supplier_Proxy *> Suppliers;
+  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
+  typedef ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *> Suppliers;
 
   /// All suppliers.
   Suppliers all_suppliers_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp
index 10cb9888350..795db6f4916 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.cpp
@@ -4,8 +4,4 @@
 
 #include "Local_ESTypes.h"
 
-#if !defined (__ACE_INLINE__)
-#include "Local_ESTypes.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Event, Local_ESTypes, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index 60d8ac8c459..cc7e66b9fb5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -38,10 +38,6 @@
 
 typedef RtecEventComm::Event RtecEventComm_Event;
 
-#if defined (__ACE_INLINE__)
-#include "Local_ESTypes.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ACE_LOCAL_ESTYPES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.i b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.i
deleted file mode 100644
index 8f8ef4cfe2d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.i
+++ /dev/null
@@ -1,5 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp
index a3780ab8ec9..88af47cb106 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp
@@ -40,4 +40,8 @@ template class ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,TAO_SYNCH_MUTEX>;
 #pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> >
 #pragma instantiate ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,TAO_SYNCH_MUTEX>
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template ACE_Singleton<ACE_ES_Dispatch_Request_Allocator, ACE_Thread_Mutex> *ACE_Singleton<ACE_ES_Dispatch_Request_Allocator, ACE_Thread_Mutex>::singleton_;
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index 951a933d70f..e6dd60806b1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -15,8 +15,12 @@
 #include "tao/Timeprobe.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Event, 
-           RT_Task, 
+#if defined (ACE_HAS_STHREADS)
+# include "ace/OS_NS_unistd.h"
+#endif /* ACE_HAS_STHREADS */
+
+ACE_RCSID (Event,
+           RT_Task,
            "$Id$")
 
 #if defined (ACE_ENABLE_TIMEPROBES)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
index 6416bfa411e..ad34f801560 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
@@ -78,7 +78,7 @@ TAO_EC_ST_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority_t,
                                         const ACE_Time_Value& interval)
 {
   return this->reactor_->schedule_timer (&this->timeout_handler_,
-                                         ACE_static_cast(void*,act),
+                                         static_cast<void*> (act),
                                          delta, interval);
 }
 
@@ -98,8 +98,7 @@ TAO_EC_ST_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority_t,
       act = 0;
     }
   else
-    act = ACE_reinterpret_cast (ACE_Command_Base *,
-                                ACE_const_cast (void *, vp));
+    act = reinterpret_cast<ACE_Command_Base *> (const_cast<void *> (vp));
 
   return result;
 }
@@ -214,7 +213,7 @@ TAO_EC_RPT_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority_t pr
 {
   ACE_Reactor& reactor = this->GetReactorTask (priority)->get_reactor ();
   return reactor.schedule_timer (&this->timeout_handler_,
-                                 ACE_static_cast(void*,act),
+                                 static_cast<void*> (act),
                                  delta, interval);
 }
 
@@ -235,8 +234,7 @@ TAO_EC_RPT_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority_t prio
       act = 0;
     }
   else
-    act = ACE_reinterpret_cast (ACE_Command_Base *,
-                                ACE_const_cast (void *, vp));
+    act = reinterpret_cast<ACE_Command_Base *> (const_cast<void *> (vp));
 
   return result;
 }
@@ -261,8 +259,7 @@ int
 TAO_EC_Timeout_Handler::handle_timeout (const ACE_Time_Value &,
                                         const void *vp)
 {
-  ACE_Command_Base *act = ACE_static_cast(ACE_Command_Base*,
-                                          ACE_const_cast(void*,vp));
+  ACE_Command_Base *act = static_cast<ACE_Command_Base*> (const_cast<void*> (vp));
 
   if (act == 0)
     ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Priority_Timer::handle_timeout: "
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index 344797268ef..0a9efb85457 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -7,7 +7,13 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba
   dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL
   tagchecks   += FTORB_Utils
 
+  // Since the PortableGroup_Simple_DS.idl file is shared between 3 libraries,
+  // we must generate using an export (for the PortableGroup library).
+  // However, we don't want to export it from this library or
+  // FTRT_EventChannel.
+  macros += TAO_PORTABLEGROUP_SIMPLE_HAS_DLL=0
   IDL_Files {
+    idlflags += -Wb,export_macro=TAO_PortableGroup_Simple_Export -Wb,export_include=orbsvcs/PortableGroup_Simple_export.h
     PortableGroup_Simple_DS.idl
   }
 
@@ -24,9 +30,28 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba
       FaultTolerance/FT_IOGR_Property.cpp
     }
   }
+
+  Header_Files {
+    PortableGroup_Simple_export.h
+    PortableGroup_Simple_DSS.h
+    PortableGroup_Simple_DSS_T.h
+    FaultTolerance/FT_ORB_Utils_export.h
+  }
+
+  Inline_Files {
+    PortableGroup_Simple_DSS_T.inl
+  }
+
+  Template_Files {
+    PortableGroup_Simple_DSS_T.cpp
+  }
+
+  Pkgconfig_Files {
+    TAO_FTORB_Utils.pc.in
+  }
 }
 
-project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup {
+project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup, interceptors {
   sharedname   = TAO_FT_ClientORB
   dynamicflags = TAO_FT_CLIENTORB_BUILD_DLL
   tagchecks   += FT_ClientORB
@@ -45,13 +70,19 @@ project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup {
        FaultTolerance/FT_ClientService_Activate.cpp
        FaultTolerance/FT_Endpoint_Selector_Factory.cpp
        FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
-       PortableGroup_Simple_DSC.cpp
        FaultTolerance/FT_Service_Callbacks.cpp
     }
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_FT_ClientORB.pc.in
+  }
 }
 
-project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup {
+project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup, interceptors {
   sharedname   = TAO_FT_ServerORB
   dynamicflags = TAO_FT_SERVERORB_BUILD_DLL
   tagchecks   += FT_ServerORB
@@ -66,8 +97,14 @@ project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup {
        FaultTolerance/FT_ServerPolicyFactory.cpp
        FaultTolerance/FT_ServerPolicy_i.cpp
        FaultTolerance/FT_ServerRequest_Interceptor.cpp
-       PortableGroup_Simple_DSC.cpp
        FaultTolerance/FT_ServerService_Activate.cpp
     }
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_FT_ServerORB.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl
index 3290d1f2225..950ee0e0b3a 100644
--- a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl
+++ b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl
@@ -25,7 +25,7 @@ module FTRT
   interface FaultListener {
     /// called by the replica which detect the loss of connection with its
     /// predecessor to the primary
-    oneway void replica_crashed(in Location location);
+    oneway void replica_crashed(in Location the_location);
   };
 
   interface ObjectGroupManager;
diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
index e9529e48959..144c2290bbe 100644
--- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
@@ -16,7 +16,7 @@
 #define FT_USES_PORTABLE_GROUP
 
 #ifdef FT_USES_PORTABLE_GROUP
-# include "orbsvcs/orbsvcs/PortableGroup.idl"
+# include "orbsvcs/PortableGroup.idl"
 #else // FT_USES_PORTABLE_GROUP
 #include "orbsvcs/CosNaming.idl" // 98-10-19.idl
 #endif // FT_USES_PORTABLE_GROUP
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index 049bddc9993..b1d216f8bbe 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -17,7 +17,6 @@ project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup, m
 
   Source_Files(ORBSVCS_COMPONENTS) {
     FaultTolerance {
-      FT_CORBAC.cpp
       FT_CORBAS.cpp
       FT_CORBAC.cpp
       FT_ReplicaS.cpp
@@ -30,4 +29,15 @@ project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup, m
       FT_ReplicationManagerC.cpp
     }
   }
+
+  Header_Files {
+    FaultTolerance/fault_tol_export.h
+  }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_FaultTolerance.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index ead7d5206c2..532b838dd79 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -85,7 +85,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
   if (TAO_debug_level > 0)
     {
       CORBA::ULong msecs =
-        ACE_static_cast(CORBA::ULong, microseconds / 1000);
+        static_cast<CORBA::ULong> (microseconds / 1000);
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
                   msecs));
@@ -180,7 +180,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
   if (TAO_debug_level > 0)
     {
       CORBA::ULong msecs =
-        ACE_static_cast(CORBA::ULong, microseconds / 1000);
+        static_cast<CORBA::ULong> (microseconds / 1000);
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
                   msecs));
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 719ae0c489d..dfe0a842ff7 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -205,16 +205,14 @@ namespace TAO
       // Grab the object group version
       // @@ NOTE: This involves an allocation and a dellocation. This is
       // really bad.
-      TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-        tp->component_data.get_buffer ()
-        ),
+      TAO_InputCDR cdr (reinterpret_cast<const char*> (tp->component_data.get_buffer ()),
         tp->component_data.length ());
       CORBA::Boolean byte_order;
 
       if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
         return;
 
-      cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+      cdr.reset_byte_order (static_cast<int> (byte_order));
 
       FT::TagFTGroupTaggedComponent gtc;
 
@@ -235,7 +233,7 @@ namespace TAO
         //ACE_THROW (CORBA::MARSHAL ());
 
       CORBA::ULong length =
-        ACE_static_cast (CORBA::ULong, ocdr.total_length ());
+        static_cast<CORBA::ULong> (ocdr.total_length ());
       sc.context_data.length (length);
       CORBA::Octet *buf = sc.context_data.get_buffer ();
 
@@ -324,7 +322,7 @@ namespace TAO
 
       // Make a *copy* of the CDR stream...
       CORBA::ULong length =
-        ACE_static_cast (CORBA::ULong, ocdr.total_length ());
+        static_cast<CORBA::ULong> (ocdr.total_length ());
       sc.context_data.length (length);
       CORBA::Octet *buf = sc.context_data.get_buffer ();
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index 0596352dba7..ddadd6e6cca 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -231,8 +231,7 @@ TAO_FT_IOGR_Property::set_primary (
   cdr << ACE_OutputCDR::from_boolean (val);
 
   // Get the length of the CDR stream
-  CORBA::ULong length = ACE_static_cast (CORBA::ULong,
-                                         cdr.total_length ());
+  CORBA::ULong length = static_cast<CORBA::ULong> (cdr.total_length ());
 
   // Set the length
   tagged_components.component_data.length (length);
@@ -289,8 +288,7 @@ TAO_FT_IOGR_Property::encode_properties (
     cdr << this->ft_group_tagged_component_->object_group_ref_version;
 
   // Get the length of the CDR stream
-  CORBA::ULong length = ACE_static_cast (CORBA::ULong,
-                                         cdr.total_length ());
+  CORBA::ULong length = static_cast<CORBA::ULong> (cdr.total_length ());
 
   // Set the length
   tagged_components.component_data.length (length);
@@ -377,10 +375,7 @@ TAO_FT_IOGR_Property::get_tagged_component (
       // Look for the primary
       if (pfile_tagged.get_component (tc) == 1)
         {
-          TAO_InputCDR cdr (ACE_reinterpret_cast (
-                                const char*,
-                                tc.component_data.get_buffer ()
-                                ),
+          TAO_InputCDR cdr (reinterpret_cast<const char*> (tc.component_data.get_buffer ()),
                             tc.component_data.length ());
           CORBA::Boolean byte_order;
 
@@ -388,7 +383,7 @@ TAO_FT_IOGR_Property::get_tagged_component (
             ACE_THROW_RETURN (CORBA::MARSHAL (),
                               0);
 
-          cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+          cdr.reset_byte_order (static_cast<int> (byte_order));
 
           if ((cdr >> fgtc) == 1)
             return 1;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index a24cec31365..2bcd5056f58 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -11,10 +11,6 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-#if !defined (__ACE_INLINE__)
-#include "tao/Invocation_Endpoint_Selectors.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (FaultTolerance,
            FT_Invocation_Endpoint_Selectors,
            "$Id$")
@@ -68,8 +64,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
 {
   // Grab the forwarded list
   TAO_MProfile *prof_list =
-    ACE_const_cast (TAO_MProfile *,
-                    r->stub ()->forward_profiles ());
+    const_cast<TAO_MProfile *> (r->stub ()->forward_profiles ());
 
   TAO_MProfile &basep = r->stub ()->base_profiles ();
 
@@ -122,8 +117,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_secondary (
 {
   // Grab the forwarded list
   TAO_MProfile *prof_list =
-    ACE_const_cast (TAO_MProfile *,
-                    r->stub ()->forward_profiles ());
+    const_cast<TAO_MProfile *> (r->stub ()->forward_profiles ());
 
   TAO_MProfile &basep =
     r->stub ()->base_profiles ();
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index ac1c48b375a..478b1f31d28 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -88,10 +88,6 @@ protected:
 
 };
 
-#if defined (__ACE_INLINE__)
-# include "FT_Invocation_Endpoint_Selectors.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif  /* FT_TAO_INVOCATION_ENDPOINT_SELECTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.inl
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index 59b35423f5a..75b0e06d821 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -83,7 +83,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
   if (TAO_debug_level > 0)
     {
       CORBA::ULong msecs =
-        ACE_static_cast(CORBA::ULong, microseconds / 1000);
+        static_cast<CORBA::ULong> (microseconds / 1000);
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
                   msecs));
@@ -178,7 +178,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
   if (TAO_debug_level > 0)
     {
       CORBA::ULong msecs =
-        ACE_static_cast(CORBA::ULong, microseconds / 1000);
+        static_cast<CORBA::ULong> (microseconds / 1000);
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
                   msecs));
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 07785dbf0f1..792633f19a1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -131,9 +131,7 @@ namespace TAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
-    TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                            svc.context_data.get_buffer ()
-                                            ),
+    TAO_InputCDR cdr (reinterpret_cast<const char*> (svc.context_data.get_buffer ()),
                       svc.context_data.length ());
 
     CORBA::Boolean byte_order;
@@ -141,7 +139,7 @@ namespace TAO
     if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
       return;
 
-    cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+    cdr.reset_byte_order (static_cast<int> (byte_order));
 
     FT::FTGroupVersionServiceContext fgvsc;
 
@@ -154,7 +152,7 @@ namespace TAO
         this->object_group_ref_version_)
       {
         ACE_ERROR ((LM_ERROR,
-                    "TAO-FT (%P|%t) - Wrong version information ",
+                    "TAO-FT (%P|%t) - Wrong version information "
                     "within the interceptor \n"));
       }
     else if (fgvsc.object_group_ref_version <
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 3b539e76378..2ebf219502d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -12,10 +12,6 @@
 #include "tao/Client_Strategy_Factory.h"
 #include "tao/CDR.h"
 
-#if !defined (__ACE_INLINE__)
-# include "FT_Service_Callbacks.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (FaultTolerance,
            FT_Service_Callbacks,
            "$Id$")
@@ -89,12 +85,10 @@ TAO_FT_Service_Callbacks::is_profile_equivalent (const TAO_Profile *this_p,
       (that_comp.get_component (that_tc) == 1))
     {
 
-      TAO_InputCDR this_cdr (ACE_reinterpret_cast (const char*,
-                                                   this_tc.component_data.get_buffer ()),
+      TAO_InputCDR this_cdr (reinterpret_cast<const char*> (this_tc.component_data.get_buffer ()),
                              this_tc.component_data.length ());
 
-      TAO_InputCDR that_cdr (ACE_reinterpret_cast (const char*,
-                                                   that_tc.component_data.get_buffer ()),
+      TAO_InputCDR that_cdr (reinterpret_cast<const char*> (that_tc.component_data.get_buffer ()),
                              that_tc.component_data.length ());
 
       CORBA::Boolean this_byte_order;
@@ -107,8 +101,8 @@ TAO_FT_Service_Callbacks::is_profile_equivalent (const TAO_Profile *this_p,
           return 0;
         }
 
-      this_cdr.reset_byte_order (ACE_static_cast (int, this_byte_order));
-      that_cdr.reset_byte_order (ACE_static_cast (int, that_byte_order));
+      this_cdr.reset_byte_order (static_cast<int> (this_byte_order));
+      that_cdr.reset_byte_order (static_cast<int> (that_byte_order));
 
 
       FT::TagFTGroupTaggedComponent this_group_component;
@@ -153,8 +147,7 @@ TAO_FT_Service_Callbacks::hash_ft (TAO_Profile *p,
     return 0;
 
   // extract the group component
-  TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                          tc.component_data.get_buffer ()),
+  TAO_InputCDR cdr (reinterpret_cast<const char*> (tc.component_data.get_buffer ()),
                     tc.component_data.length ());
 
   CORBA::Boolean byte_order;
@@ -163,7 +156,7 @@ TAO_FT_Service_Callbacks::hash_ft (TAO_Profile *p,
     return 0;
   }
 
-  cdr.reset_byte_order (ACE_static_cast(int,byte_order));
+  cdr.reset_byte_order (static_cast<int> (byte_order));
 
   FT::TagFTGroupTaggedComponent group_component;
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index b4f496ea24f..2ecba6fc49e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -107,9 +107,5 @@ private:
   CORBA::Boolean group_component_flag_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "FT_Service_Callbacks.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_FT_CALLBACKS_H*/
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.i
deleted file mode 100644
index ca0908bbcf6..00000000000
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.i
+++ /dev/null
@@ -1 +0,0 @@
-//$Id$
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.inl
deleted file mode 100644
index ca0908bbcf6..00000000000
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.inl
+++ /dev/null
@@ -1 +0,0 @@
-//$Id$
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index 8c11dd7090b..ab302ce4716 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -32,6 +32,9 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming, minimum_cor
       FtRtEvent/Utils
     }
   }
+
+  Template_Files {
+  }
 }
 
 project (FTRT_ClientORB) :  messaging, orbsvcslib, core {
@@ -48,6 +51,12 @@ project (FTRT_ClientORB) :  messaging, orbsvcslib, core {
       FtRtEvent/ClientORB
     }
   }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
 }
 
 project (FTRT_EventChannel) :  orbsvcslib, core, ftrtevent, utils, corba_messaging {
@@ -57,6 +66,10 @@ project (FTRT_EventChannel) :  orbsvcslib, core, ftrtevent, utils, corba_messagi
   includes    += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel
   after       += FTORB_Utils
 
+  // We don't want to export symbols from PortableGroup_Simple_DSC.cpp
+  // from this library or FTORB_Utils.
+  macros += TAO_PORTABLEGROUP_SIMPLE_HAS_DLL=0
+
   IDL_Files {
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index bfbb85102a8..14cd1f6dbec 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -72,7 +72,21 @@ FTRT_ClientORB_Interceptor::send_request (
 
     ACE_Message_Block mb;
     ACE_CDR::consolidate(&mb, cdr.begin());
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     sc.context_data.replace(mb.length(), &mb);
+#else
+    // If the replace method is not available, we will need
+    // to do the copy manually.  First, set the octet sequence length.
+    CORBA::ULong length = mb.length ();
+    sc.context_data.length (length);
+
+    // Now copy over each byte.
+    char* base = mb.data_block ()->base ();
+    for(CORBA::ULong i = 0; i < length; i++)
+      {
+        sc.context_data[i] = base[i];
+      }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
     ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
@@ -109,8 +123,7 @@ FTRT_ClientORB_Interceptor::receive_reply (
 
 
   const char * buf =
-    ACE_reinterpret_cast (const char *,
-    service_context->context_data.get_buffer ());
+    reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
 
   TAO_InputCDR cdr (buf,
     service_context->context_data.length ());
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
index b343c0e9af7..c9dee536cf3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
@@ -3,10 +3,14 @@
 #include "AMI_Replication_Strategy.h"
 #include "AMI_Primary_Replication_Strategy.h"
 
+#include "ace/Auto_Ptr.h"
+
+
 ACE_RCSID (EventChannel,
            AMI_Replication_Strategy,
            "$Id$")
 
+
 AMI_Replication_Strategy::AMI_Replication_Strategy(bool mt)
 : mt_(mt)
 {
@@ -62,4 +66,3 @@ int  AMI_Replication_Strategy::release (void)
 {
   return 0;
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
index 71c6ee1169e..1ac36e19653 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
@@ -10,7 +10,7 @@ int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor)
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
 
-  reactor_ = static_cast<ACE_Service_Object*>(acceptor)->reactor();
+  reactor_ = static_cast<ACE_Service_Object*> (acceptor)->reactor();
 
   if (reactor_->register_handler (this,
     ACE_Event_Handler::READ_MASK) == -1)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
index a6d1c784b87..c3fd2eae485 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
@@ -58,14 +58,14 @@ void Dynamic_Bitset::set(Dynamic_Bitset::size_type bit, bool val)
   size_type bit_pos = bit%BITS_PER_BLOCK;
   block mask = 1 << bit_pos;
   if (val == false)
-    mask ^= static_cast<block>(-1);
+    mask ^= static_cast<block> (-1);
   buffer_[block_pos] |= mask;
 }
 
 void Dynamic_Bitset::flip()
 {
   size_type len = ceil(bit_size_,BITS_PER_BLOCK);
-  block mask = static_cast<block>(-1);
+  block mask = static_cast<block> (-1);
   for (size_type i = 0; i < len; ++i)
     buffer_[i] ^= mask;
 }
@@ -76,7 +76,7 @@ void Dynamic_Bitset::resize(Dynamic_Bitset::size_type num_bits, bool value)
   if (len > this->buffer_size_) {
     Dynamic_Bitset tmp(num_bits);
     memcpy(tmp.buffer_, this->buffer_, this->buffer_size_*BYTES_PER_BLOCK);
-    block mask = static_cast<block>(-1);
+    block mask = static_cast<block> (-1);
 
     size_type block_pos = this->bit_size_/BITS_PER_BLOCK;
     size_type bit_pos = this->bit_size_%BITS_PER_BLOCK;
@@ -92,7 +92,7 @@ void Dynamic_Bitset::resize(Dynamic_Bitset::size_type num_bits, bool value)
 
 
     for (size_type i = block_pos +1; i < len; ++i) {
-      mask = value ? static_cast<block>(-1) : 0;
+      mask = value ? static_cast<block> (-1) : 0;
         tmp.buffer_[i] = mask;
     }
 
@@ -115,7 +115,7 @@ bool operator == (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs)
   for (i = 0; i < block_pos; ++i)
     if (lhs.buffer_[i] != rhs.buffer_[i])
       return false;
-  Dynamic_Bitset::block mask = static_cast<Dynamic_Bitset::block>(-1);
+  Dynamic_Bitset::block mask = static_cast<Dynamic_Bitset::block> (-1);
   mask >>= (Dynamic_Bitset::BITS_PER_BLOCK-bit_pos);
   return ((lhs.buffer_[i] ^ rhs.buffer_[i]) & mask ) == 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
index bec98e2e0ef..e2cf37a7509 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
@@ -13,7 +13,7 @@
 #define DYNAMIC_BITSET_H
 
 #include "ace/config-all.h"
-#include <memory.h>
+#include "ace/OS_NS_string.h"
 
 /**
  *
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl
index d9e0ffbb001..425e8cba0b4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl
@@ -22,7 +22,7 @@ Dynamic_Bitset::Dynamic_Bitset(const Dynamic_Bitset& other)
   , buffer_size_(other.buffer_size_)
   , bit_size_(other.bit_size_)
 {
-  memcpy(buffer_, other.buffer_, buffer_size_*BYTES_PER_BLOCK);
+  ACE_OS::memcpy(buffer_, other.buffer_, buffer_size_*BYTES_PER_BLOCK);
 }
 
 ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index d768218a862..aef9a1f62e5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -130,7 +130,7 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
     ACE_CHECK_RETURN(0);
 
     FtRtecEventChannelAdmin::EventChannel_var result;
-    activate_object_with_id(result.out(), persistent_poa_, this, object_id
+    activate_object_with_id(result.out(), persistent_poa_.in(), this, object_id
                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN(0);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index 5c9c7f79053..42578b7ec09 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -245,7 +245,7 @@ TAO_FTEC_Event_Channel_Impl::~TAO_FTEC_Event_Channel_Impl()
 TAO_FTEC_Basic_Factory*
 TAO_FTEC_Event_Channel_Impl::factory()
 {
-  return static_cast<TAO_FTEC_Basic_Factory*>(TAO_EC_Event_Channel_Base::factory());
+  return static_cast<TAO_FTEC_Basic_Factory*> (TAO_EC_Event_Channel_Base::factory());
 }
 
 
@@ -523,14 +523,14 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s
 
 TAO_FTEC_ConsumerAdmin* TAO_FTEC_Event_Channel_Impl::consumer_admin (void) const
 {
-  return static_cast<TAO_FTEC_ConsumerAdmin*>(TAO_EC_Event_Channel_Base::consumer_admin());
+  return static_cast<TAO_FTEC_ConsumerAdmin*> (TAO_EC_Event_Channel_Base::consumer_admin());
 }
 
 /// Access the supplier admin implementation, useful for controlling
 /// the activation...
 TAO_FTEC_SupplierAdmin* TAO_FTEC_Event_Channel_Impl::supplier_admin (void) const
 {
-  return static_cast<TAO_FTEC_SupplierAdmin*>(TAO_EC_Event_Channel_Base::supplier_admin());
+  return static_cast<TAO_FTEC_SupplierAdmin*> (TAO_EC_Event_Channel_Base::supplier_admin());
 }
 
 
@@ -541,16 +541,14 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_supplier(const FtRtecEventChannelAd
     PortableServer::POA_var poa = consumer_poa();
 
     const PortableServer::Servant servant = poa->id_to_servant(
-      ACE_reinterpret_cast(const PortableServer::ObjectId& ,id)
+      reinterpret_cast<const PortableServer::ObjectId&> (id)
       ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr obj =
-      ACE_reinterpret_cast (
-      POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr,
-      servant->_downcast ("IDL:RtecEventChannelAdmin/ProxyPushSupplier:1.0")
+      reinterpret_cast<POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr> (servant->_downcast ("IDL:RtecEventChannelAdmin/ProxyPushSupplier:1.0")
       );
 
-    return ACE_static_cast(TAO_FTEC_ProxyPushSupplier*, obj);
+    return static_cast<TAO_FTEC_ProxyPushSupplier*> (obj);
   }
   ACE_CATCHALL {
   }
@@ -565,17 +563,15 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAd
     PortableServer::POA_var poa= supplier_poa();
 
     const PortableServer::Servant servant = poa->id_to_servant(
-      ACE_reinterpret_cast(const PortableServer::ObjectId& ,id)
+      reinterpret_cast<const PortableServer::ObjectId&> (id)
       ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr obj =
-      ACE_reinterpret_cast (
-      POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr,
-      servant->_downcast ("IDL:RtecEventChannelAdmin/ProxyPushConsumer:1.0")
+      reinterpret_cast<POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr> (servant->_downcast ("IDL:RtecEventChannelAdmin/ProxyPushConsumer:1.0")
       );
 
-    return ACE_static_cast(TAO_FTEC_ProxyPushConsumer*, obj);
+    return static_cast<TAO_FTEC_ProxyPushConsumer*> (obj);
   }
   ACE_CATCHALL {
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index dedce884763..90733074d45 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -107,9 +107,11 @@ void TAO_FTEC_Group_Manager::create_group (
     Fault_Detector::instance()->my_location());
 
   GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
-  GroupInfoPublisherBase::Info_ptr info ( 
-    publisher->setup_info(impl_->info_list, impl_->my_position
-                    ACE_ENV_ARG_PARAMETER));
+  GroupInfoPublisherBase::Info_ptr info (
+    publisher->setup_info(impl_->info_list, 
+                          impl_->my_position,
+                          object_group_ref_version
+                          ACE_ENV_ARG_PARAMETER));
   ACE_CHECK;
 
   publisher->update_info(info);
@@ -142,7 +144,7 @@ void TAO_FTEC_Group_Manager::join_group (
   if (impl_->my_position == 0) {
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc);
-    add_member(info, IOGR_Maker::instance()->increment_ref_version()
+    add_member(info, IOGR_Maker::instance()->get_ref_version()+1
                ACE_ENV_ARG_PARAMETER);
   }
 }
@@ -166,8 +168,10 @@ void TAO_FTEC_Group_Manager::add_member (
   new_impl->info_list[pos] = info;
 
   GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
-  GroupInfoPublisherBase::Info_ptr group_info ( 
-    publisher->setup_info(new_impl->info_list, new_impl->my_position
+  GroupInfoPublisherBase::Info_ptr group_info (
+    publisher->setup_info(new_impl->info_list, 
+                          new_impl->my_position,
+                          object_group_ref_version
                     ACE_ENV_ARG_PARAMETER));
   ACE_CHECK;
 
@@ -192,9 +196,10 @@ void TAO_FTEC_Group_Manager::add_member (
       /// group_info = publisher->set_info(..) should be enough.
       /// However, GCC 2.96 is not happy with that.
 
-      GroupInfoPublisherBase::Info_ptr group_info1 ( 
+      GroupInfoPublisherBase::Info_ptr group_info1 (
         publisher->setup_info(new_impl->info_list,
-                              new_impl->my_position
+                              new_impl->my_position,
+                              object_group_ref_version
                               ACE_ENV_ARG_PARAMETER));
       ACE_CHECK;
       ACE_AUTO_PTR_RESET(group_info, group_info1.release(), GroupInfoPublisherBase::Info);
@@ -207,27 +212,57 @@ void TAO_FTEC_Group_Manager::add_member (
 
   if (last_one)
   {
-  // this is the last replica in the list
-  // synchornize the state with the newly joined replica.
-  FtRtecEventChannelAdmin::EventChannelState state;
-  get_state(state ACE_ENV_ARG_PARAMETER);
-
-  TAO_OutputCDR cdr;
-  cdr << state;
-
-  FTRT::State s;
-  if (cdr.begin()->cont()) {
-    ACE_Message_Block* blk;
-    ACE_NEW_THROW_EX(blk, ACE_Message_Block, CORBA::NO_MEMORY());
-    ACE_CDR::consolidate(blk, cdr.begin());
-    s.replace(blk->length(), blk);
-    blk->release();
-  }
-  else
-    s.replace(cdr.begin()->length(), cdr.begin());
+    // this is the last replica in the list
+    // synchornize the state with the newly joined replica.
+    FtRtecEventChannelAdmin::EventChannelState state;
+    get_state(state ACE_ENV_ARG_PARAMETER);
+
+    TAO_OutputCDR cdr;
+    cdr << state;
+
+    FTRT::State s;
+    if (cdr.begin()->cont()) {
+      ACE_Message_Block* blk;
+      ACE_NEW_THROW_EX(blk, ACE_Message_Block, CORBA::NO_MEMORY());
+      ACE_CDR::consolidate(blk, cdr.begin());
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      s.replace(blk->length(), blk);
+#else
+      // If the replace method is not available, we will need
+      // to do the copy manually.  First, set the octet sequence length.
+      CORBA::ULong length = blk->length ();
+      s.length (length);
+
+      // Now copy over each byte.
+      char* base = blk->data_block ()->base ();
+      for(CORBA::ULong i = 0; i < length; i++)
+      {
+        s[i] = base[i];
+      }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+
+      blk->release();
+    }
+    else {
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      s.replace(cdr.begin()->length(), cdr.begin());
+#else
+      // If the replace method is not available, we will need
+      // to do the copy manually.  First, set the octet sequence length.
+      CORBA::ULong length = cdr.begin ()->length ();
+      s.length (length);
+
+      // Now copy over each byte.
+      char* base = cdr.begin()->data_block ()->base ();
+      for(CORBA::ULong i = 0; i < length; i++)
+      {
+        s[i] = base[i];
+      }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+    }
 
     TAO_FTRTEC::Log(2, "Setting state\n");
-  info.ior->set_state(s ACE_ENV_ARG_PARAMETER);
+    info.ior->set_state(s ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
     info.ior->create_group(new_impl->info_list,
                            object_group_ref_version
@@ -260,7 +295,7 @@ void TAO_FTEC_Group_Manager::replica_crashed (
   TAO_FTRTEC::Log(1, "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()->increment_ref_version()
+    remove_member(location, IOGR_Maker::instance()->get_ref_version()+1
                   ACE_ENV_ARG_PARAMETER);
 }
 
@@ -283,8 +318,10 @@ void TAO_FTEC_Group_Manager::remove_member (
 
   GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
 
-  GroupInfoPublisherBase::Info_ptr info ( 
-    publisher->setup_info(impl_->info_list, impl_->my_position
+  GroupInfoPublisherBase::Info_ptr info (
+    publisher->setup_info(impl_->info_list, 
+                          impl_->my_position,
+                          object_group_ref_version
                           ACE_ENV_ARG_PARAMETER));
   ACE_CHECK;
   publisher->update_info(info);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index 74a81118204..90f14052e48 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -35,11 +35,11 @@ TAO_FTEC_ProxyPushConsumer::activate (
 {
   result = RtecEventChannelAdmin::ProxyPushConsumer::_nil();
   ACE_TRY {
-    object_id_ =      Request_Context_Repository().get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
+    object_id_ = Request_Context_Repository().get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
     PortableServer::POA_var poa = _default_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    activate_object_with_id(result,                            poa.in(),                            this,                            object_id_.in ()                            ACE_ENV_ARG_PARAMETER);
+    activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index 0522671688a..15bba1e940e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -53,7 +53,7 @@ public:
                  ACE_ENV_ARG_DECL);
 
   typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-    (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
 
   static const RollbackOperation rollback_obtain;
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
index f680af82ac5..ee0957e8ad6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
@@ -22,7 +22,7 @@ void FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid
               ACE_ENV_ARG_DECL)
 {
   poa_->activate_object_with_id(
-    ACE_reinterpret_cast(const PortableServer::ObjectId&, oid), 
+    reinterpret_cast<const PortableServer::ObjectId&> (oid), 
     servant_
     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index 9b809530f47..be00baca3d1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -127,15 +127,14 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state(
 
     typedef typename Proxy::Skeleton Skeleton;
     const PortableServer::Servant servant = poa_->id_to_servant(
-      ACE_reinterpret_cast(const PortableServer::ObjectId& ,proxy_state.object_id) 
+      reinterpret_cast<const PortableServer::ObjectId&> (proxy_state.object_id) 
       ACE_ENV_ARG_PARAMETER);
 
     ACE_CHECK;
-    Skeleton skeleton = ACE_reinterpret_cast(Skeleton,
-      servant->_downcast(proxy_ior->_interface_repository_id()));
+    Skeleton skeleton = reinterpret_cast<Skeleton> (servant->_downcast(proxy_ior->_interface_repository_id()));
     ACE_CHECK;
 
-    ACE_static_cast(Proxy* , skeleton)->set_state(proxy_state
+    static_cast<Proxy*> (skeleton)->set_state(proxy_state
                     ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index e10f0d406ba..0cb53c28f0b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -47,7 +47,7 @@ namespace FTRTEC {
     if (argc > 0 && ACE_OS::strcasecmp (argv[0], ACE_LIB_TEXT("sctp")) == 0)
     {
 #if (TAO_HAS_SCIOP == 1)
-      ACE_AUTO_PTR_RESET(detector_, detector, Fault_Detector)
+      ACE_AUTO_PTR_RESET(detector_, detector, Fault_Detector);
 #else
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) SCTP not enabled. ",
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
index 86de3d80b64..777cb73de7b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
@@ -15,11 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
+#include "ftrtec_export.h"
+
 #include "tao/orbconf.h"
 
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
-#include "ftrtec_export.h"
+#include "ace/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index f228a360c5f..0eb5c56343a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -137,9 +137,7 @@ void ForwardCtrlServerInterceptor::receive_request_service_contexts (
 FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_context
                                                ACE_ENV_ARG_DECL)
 {
-  Safe_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                            service_context->context_data.get_buffer ()
-                                            ),
+  Safe_InputCDR cdr (reinterpret_cast<const char*> (service_context->context_data.get_buffer ()),
                       service_context->context_data.length ());
 
   CORBA::Boolean byte_order;
@@ -147,7 +145,7 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO), 0);
 
-  cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+  cdr.reset_byte_order (static_cast<int> (byte_order));
 
   FT::FTGroupVersionServiceContext fgvsc;
 
@@ -215,7 +213,21 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
 
       ACE_Message_Block mb;
       ACE_CDR::consolidate(&mb, cdr.begin());
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       sc.context_data.replace(mb.length(), &mb);
+#else
+      // If the replace method is not available, we will need
+      // to do the copy manually.  First, set the octet sequence length.
+      CORBA::ULong length = mb.length ();
+      sc.context_data.length (length);
+
+      // Now copy over each byte.
+      char* base = mb.data_block ()->base ();
+      for(CORBA::ULong i = 0; i < length; i++)
+        {
+          sc.context_data[i] = base[i];
+        }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
       ri->add_reply_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(block2);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index ce5ea538e26..5ff419a69b0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -1,9 +1,11 @@
 // $Id$
-
+#include "ace/OS_NS_string.h"
+#include "ace/SString.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "FtEventServiceInterceptor.h"
 #include "Request_Context_Repository.h"
 #include "../Utils/Safe_InputCDR.h"
+#include "../Utils/Log.h"
 
 ACE_RCSID (EventChannel,
            FtEventServiceInterceptor,
@@ -57,7 +59,7 @@ CachedRequestTable::get_state(FtRtecEventChannelAdmin::CachedOptionResults& stat
     ++first)
   {
     TableImpl::ENTRY& entry = *first;
-    state[i].client_id = strdup(entry.ext_id_.c_str());
+    state[i].client_id = ACE_OS::strdup(entry.ext_id_.c_str());
     state[i].cached_result = entry.int_id_;
     ++i;
   }
@@ -84,8 +86,7 @@ retrieve_ft_request_context(
   ACE_CHECK;
 
   const char * buf =
-    ACE_reinterpret_cast (const char *,
-    service_context->context_data.get_buffer ());
+    reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
 
   Safe_InputCDR cdr (buf,
     service_context->context_data.length ());
@@ -95,7 +96,7 @@ retrieve_ft_request_context(
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     ACE_THROW (CORBA::BAD_PARAM ());
 
-  cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+  cdr.reset_byte_order (static_cast<int> (byte_order));
 
 
   if ((cdr >> ft_request_service_context) == 0)
@@ -122,8 +123,7 @@ get_transaction_depth_context(
   ACE_ENDTRY;
 
   const char * buf =
-    ACE_reinterpret_cast (const char *,
-    service_context->context_data.get_buffer ());
+    reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
   Safe_InputCDR cdr (buf,
     service_context->context_data.length ());
 
@@ -132,7 +132,7 @@ get_transaction_depth_context(
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), -1);
 
-  cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+  cdr.reset_byte_order (static_cast<int> (byte_order));
 
   FTRT::TransactionDepth result;
   if ((cdr >> result) == 0)
@@ -153,8 +153,7 @@ get_sequence_number_context(
   ACE_CHECK_RETURN(0);
 
   const char * buf =
-    ACE_reinterpret_cast (const char *,
-    service_context->context_data.get_buffer ());
+    reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
   Safe_InputCDR cdr (buf,
     service_context->context_data.length ());
 
@@ -163,7 +162,7 @@ get_sequence_number_context(
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
-  cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+  cdr.reset_byte_order (static_cast<int> (byte_order));
 
   if ((cdr >> result) == 0)
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
@@ -222,8 +221,10 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn
 {
   CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  if (ACE_OS::strcmp(operation.in(), "push") == 0)
+  if (ACE_OS::strcmp(operation.in(), "push") == 0) {
+    TAO_FTRTEC::Log(3, "Received push command\n");
     return;
+  }
 
   ACE_TRY_EX(block1) {
     FT::FTRequestServiceContext ft_request_service_context;
@@ -306,7 +307,7 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt
 
 void
 FtEventServiceInterceptor::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr 
+  PortableInterceptor::ServerRequestInfo_ptr
   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
   PortableInterceptor::ForwardRequest))
@@ -333,7 +334,3 @@ FtEventServiceInterceptor::set_state(const FtRtecEventChannelAdmin::CachedOption
 {
   request_table_.set_state(state);
 }
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 4607ee70075..b1fe1c99b87 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -13,6 +13,7 @@
 #ifndef FTEVENTSERVICEINTERCEPTOR_H
 #define FTEVENTSERVICEINTERCEPTOR_H
 #include "ace/Hash_Map_Manager_T.h"
+#include "ace/SString.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 #include "tao/ORB.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 8301bde4dc5..243fc0f2aa1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -7,6 +7,8 @@
 #include "FTEC_Become_Primary_Listener.h"
 #include "../Utils/Log.h"
 
+//#include "../Utils/log_obj_endpoints.h"
+
 ACE_RCSID (EventChannel,
            GroupInfoPublisher,
            "$Id$")
@@ -58,9 +60,12 @@ GroupInfoPublisherBase::backups() const
   return info_->backups;
 }
 
-GroupInfoPublisherBase::Info_ptr
+
+
+GroupInfoPublisherBase::Info*
 GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
-                                   int my_position
+                                   int my_position,
+                                   CORBA::ULong object_group_ref_version
                                    ACE_ENV_ARG_DECL)
 {
   Info_ptr result(new Info);
@@ -79,19 +84,22 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
   }
 
   CORBA::Object_var obj =
-    IOGR_Maker::instance()->make_iogr(iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(Info_ptr());
+    IOGR_Maker::instance()->make_iogr(iors,object_group_ref_version
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN(0);
 
   result->iogr =
     ::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(Info_ptr());
+  ACE_CHECK_RETURN(0);
 
+  ACE_DEBUG((LM_DEBUG, "In setup_info\n"));
+  //log_obj_endpoints(result->iogr.in());
 
   /// check if sucessor changed
   size_t successors_length = info_list.length() - my_position -1;
 
-  if (successors_length != info_->backups.length())  {
+  if (successors_length /*!= info_->backups.length() */)  {
     // successor changed, update successor
     iors.length(successors_length);
     for (i = 0; i < successors_length; ++i) {
@@ -100,23 +108,25 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
 
     obj =  IOGR_Maker::instance()->merge_iors(iors
       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(Info_ptr());
+    ACE_CHECK_RETURN(0);
 
     result->successor =
       FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(Info_ptr());
+    ACE_CHECK_RETURN(0);
   }
+  /*
   else {
     result->successor = info_->successor;
   }
-
+  
   if (!CORBA::is_nil(result->successor.in()))
   {
     CORBA::PolicyList_var pols;
     result->successor->_validate_connection (pols.out ());
   }
-
+  */
+ 
   // update backups
   result->backups.length(successors_length);
   for (i = 0; i < successors_length; ++i)  {
@@ -124,15 +134,15 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
       FtRtecEventChannelAdmin::EventChannel::_narrow(
       info_list[i+ my_position+1].ior.in()
       ACE_ENV_ARG_PARAMETER);
-    CORBA::PolicyList_var pols;
-    result->backups[i]->_validate_connection (pols.out ());
-    ACE_CHECK_RETURN(Info_ptr());
+    //CORBA::PolicyList_var pols;
+    //result->backups[i]->_validate_connection (pols.out ());
+    ACE_CHECK_RETURN(0);
   }
-  return result;
+  return result.release();
 }
 
 void
-GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr info)
+GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info)
 {
   if (info->primary) {
     if (!info_->primary) {
@@ -157,3 +167,12 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr info)
   info_ = info;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex> *ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex>::singleton_;
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index 574a89bf1c8..2c54702549e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -18,6 +18,7 @@
 #include "ace/Vector_T.h"
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
+#include "ace/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -49,11 +50,12 @@ public:
 
   const BackupList& backups() const;
 
-  Info_ptr setup_info(const FTRT::ManagerInfoList & info_list,
-              int my_position
+  Info* setup_info(const FTRT::ManagerInfoList & info_list,
+              int my_position,
+              CORBA::ULong object_group_ref_version
               ACE_ENV_ARG_DECL);
 
-  void update_info(Info_ptr info);
+  void update_info(Info_ptr& info);
 
   const PortableServer::ObjectId& object_id() const;
   const CosNaming::Name& name() const;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index 03ff6faf180..e5390fc7e05 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -7,7 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Object_KeyC.h"
 #include "tao/Tagged_Components.h"
-#include <algorithm>
 #include "../Utils/resolve_init.h"
 #include "../Utils/Safe_InputCDR.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
@@ -58,42 +57,36 @@ IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list
 
 
 CORBA::Object_ptr
-IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list
+IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list,
+                      CORBA::ULong object_group_ref_version
                       ACE_ENV_ARG_DECL)
 {
+  /// generate a new IOGR if the object group changes.
   CORBA::Object_var obj = merge_iors(list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(CORBA::Object::_nil());
 
-  set_tag_components(obj.in(), list[0]
+  FT::TagFTGroupTaggedComponent ft_tag_component(ft_tag_component_);
+  /// the generated IOGR should use a new object_group_ref_version 
+  ft_tag_component.object_group_ref_version = object_group_ref_version;
+  set_tag_components(obj.in(), list[0], ft_tag_component
                      ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN(CORBA::Object::_nil());
   return obj._retn();
 }
 
-
 void replace_key(char* ior, char* end_ior,
                 const TAO::ObjectKey& oldkey,
-                const TAO::ObjectKey& newkey)
-{
-  size_t keylen = oldkey.length();
-  ACE_ASSERT(keylen == newkey.length());
-
-  char* pos = ior;
-  const char* oldkey_begin = (const char*)oldkey.get_buffer();
-  const char* oldkey_end = oldkey_begin + keylen;
-
-  while ((pos = std::search(pos, end_ior,oldkey_begin, oldkey_end)) != end_ior) {
-    memcpy(pos, newkey.get_buffer(), keylen);
-    pos+= keylen;
-  }
-}
+                const TAO::ObjectKey& newkey);
+/// the definition of replace_key() is moved
+/// to replace_key.cpp.
 
 
 CORBA::Object_ptr
 IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
                        ACE_ENV_ARG_DECL)
 {
+  /// forge an IOGR whose object_key is the same with that of \a obj. 
   CORBA::Object_var merged;
   // make a copy of the object
   FtRtecEventChannelAdmin::EventChannel_var successor
@@ -140,7 +133,7 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
   else
     merged = CORBA::Object::_duplicate(obj);
 
-  set_tag_components(merged.in(), obj
+  set_tag_components(merged.in(), obj, ft_tag_component_
                      ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN(CORBA::Object::_nil ());
@@ -198,15 +191,14 @@ IOGR_Maker::copy_ft_group_component(CORBA::Object_ptr ior)
           // @@ NOTE: This involves an allocation and a dellocation. This is
           // really bad.
           Safe_InputCDR cdr (
-            ACE_reinterpret_cast (const char*,
-                                  tagged_components.component_data.get_buffer ()),
+            reinterpret_cast<const char*> (tagged_components.component_data.get_buffer ()),
             tagged_components.component_data.length ());
           CORBA::Boolean byte_order;
 
           if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
             return false;
 
-          cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+          cdr.reset_byte_order (static_cast<int> (byte_order));
 
           return (cdr >> ft_tag_component_) != 0;
        }
@@ -236,7 +228,7 @@ IOGR_Maker::set_ref_version(CORBA::ULong version)
 CORBA::ULong
 IOGR_Maker::increment_ref_version()
 {
-  ACE_DEBUG((LM_DEBUG, "new object_group_ref_version = %d\n", ft_tag_component_.object_group_ref_version+1));
+  ACE_DEBUG((LM_DEBUG, "new object_group_ref_version = %d\n", ft_tag_component_.            object_group_ref_version+1));
   return ++ft_tag_component_.object_group_ref_version;
 }
 
@@ -248,11 +240,14 @@ IOGR_Maker::get_ref_version() const
 
 
 void
-IOGR_Maker::set_tag_components(CORBA::Object_ptr merged, CORBA::Object_ptr primary
-                               ACE_ENV_ARG_DECL)
+IOGR_Maker::set_tag_components(
+  CORBA::Object_ptr merged, 
+  CORBA::Object_ptr primary,
+  FT::TagFTGroupTaggedComponent& ft_tag_component
+  ACE_ENV_ARG_DECL)
 {
     // set the primary
-    TAO_FT_IOGR_Property prop (ft_tag_component_);
+    TAO_FT_IOGR_Property prop (ft_tag_component);
 
 
     prop.remove_primary_tag(merged
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
index 99619a369d3..29b0e512316 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
@@ -39,7 +39,8 @@ public:
 
    /// Create a new IOGR (with FT_PRIMARY and FT_GROUP components) by merging
    /// the profiles lists in the supplied list of one or more object references.
-  CORBA::Object_ptr make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList&
+  CORBA::Object_ptr make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList&,
+                              CORBA::ULong object_group_ref_version
                               ACE_ENV_ARG_DECL);
 
   /// Make an new IOGR with obj as primary.
@@ -59,7 +60,9 @@ public:
   CORBA::ULong get_ref_version() const;
 
 private:
-  void set_tag_components(CORBA::Object_ptr merged, CORBA::Object_ptr primary
+  void set_tag_components(CORBA::Object_ptr merged, 
+                          CORBA::Object_ptr primary,
+                          FT::TagFTGroupTaggedComponent& ft_tag_component
                           ACE_ENV_ARG_DECL);
   TAO_IOP::TAO_IOR_Manipulation_var iorm_;
   FT::TagFTGroupTaggedComponent ft_tag_component_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
index 7869ab38378..5b2f764197e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -28,6 +28,6 @@ void ProxyConsumerStateWorker::work(TAO_EC_ProxyPushConsumer* object
             ACE_ENV_ARG_DECL_NOT_USED)
 {
   TAO_FTEC_ProxyPushConsumer* proxy =
-    static_cast<TAO_FTEC_ProxyPushConsumer*>(object);
+    static_cast<TAO_FTEC_ProxyPushConsumer*> (object);
   proxy->get_state(consumerStates_[index_++]);
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
index cb455699293..45b6c1f47d9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
@@ -30,6 +30,6 @@ void ProxySupplierStateWorker::work(TAO_EC_ProxyPushSupplier* object
             ACE_ENV_ARG_DECL_NOT_USED)
 {
   TAO_FTEC_ProxyPushSupplier* proxy =
-    static_cast<TAO_FTEC_ProxyPushSupplier*>(object);
+    static_cast<TAO_FTEC_ProxyPushSupplier*> (object);
   proxy->get_state(supplierStates_[index_++]);
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index ff87d8d02a4..737b88ccc8c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -9,12 +9,15 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/CDR.h"
 
+#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_strings.h"
 
+
 ACE_RCSID (EventChannel,
            Replication_Service,
            "$Id$")
 
+
 namespace FTRTEC
 {
   namespace {
@@ -104,6 +107,8 @@ namespace FTRTEC
 
   void Replication_Service::become_primary()
   {
+    TAO_FTRTEC::Log(3, "become_primary\n");
+
     Replication_Strategy* strategy =
       replication_strategy->make_primary_strategy();
 
@@ -129,8 +134,23 @@ namespace FTRTEC
 
     ACE_Message_Block mb;
     ACE_CDR::consolidate(&mb, cdr.begin());
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     FTRT::State state(mb.length(), &mb);
-    //FT::State state;
+#else
+    // If the form of the constructor is not available, we will need
+    // to do the copy manually.  First, set the octet sequence length.
+    FTRT::State state;
+    CORBA::ULong length = mb.length ();
+    state.length (length);
+
+    // Now copy over each byte.
+    char* base = mb.data_block ()->base ();
+    for(CORBA::ULong i = 0; i < length; i++)
+      {
+        state[i] = base[i];
+      }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+
 
     replication_strategy->replicate_request(
       state,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index 24615e80cc4..f01503ef6ae 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -46,7 +46,7 @@ namespace FTRTEC
     void check_validity(ACE_ENV_SINGLE_ARG_DECL);
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-      (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
 
    /**
     * Replicate a request.
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
index 7ed955e2d11..3e44f33ff41 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -39,7 +39,7 @@ public:
     virtual void check_validity(ACE_ENV_SINGLE_ARG_DECL);
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-      (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
 
   /**
    * Replicate a request.
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index acb344f9002..0481176c83a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -6,6 +6,7 @@
 
 #include "tao/Typecode.h"
 #include "tao/IOP_IORC.h"
+#include "ace/TSS_T.h"
 
 ACE_RCSID (EventChannel,
            Request_Context_Repository,
@@ -18,6 +19,7 @@ PortableInterceptor::SlotId seq_num_slot;
 PortableInterceptor::SlotId ft_request_service_context_slot;
 PortableInterceptor::SlotId transaction_depth_slot;
 CORBA::ORB_ptr orb;
+ACE_TSS<FtRtecEventChannelAdmin::ObjectId> oid;
 }
 
 
@@ -52,8 +54,9 @@ void Request_Context_Repository::generate_object_id(
 void
 Request_Context_Repository::set_object_id(
   const FtRtecEventChannelAdmin::ObjectId& object_id
-  ACE_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
+  /*
   PortableInterceptor::Current_var pic =
     resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
                                                ACE_ENV_ARG_PARAMETER);
@@ -65,22 +68,25 @@ Request_Context_Repository::set_object_id(
                 ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
+  */
+  *oid = object_id;
 }
 
 FtRtecEventChannelAdmin::ObjectId_var
 get_object_id(CORBA::Any_var a
               ACE_ENV_ARG_DECL)
 {
-  FtRtecEventChannelAdmin::ObjectId* object_id;
+  FtRtecEventChannelAdmin::ObjectId *object_id, *r;
   FtRtecEventChannelAdmin::ObjectId_var result;
 
   if ((a.in() >>= object_id) ==0)
     ACE_THROW_RETURN(CORBA::NO_MEMORY(), result);
 
-
-  ACE_NEW_THROW_EX(result,
+  ACE_NEW_THROW_EX(r,
                    FtRtecEventChannelAdmin::ObjectId(*object_id),
                    CORBA::NO_MEMORY());
+
+  result = r;
   return result;
 }
 
@@ -88,6 +94,7 @@ get_object_id(CORBA::Any_var a
 FtRtecEventChannelAdmin::ObjectId_var
 Request_Context_Repository::get_object_id(ACE_ENV_SINGLE_ARG_DECL)
 {
+  /*
   PortableInterceptor::Current_var pic =
     resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
                                                ACE_ENV_ARG_PARAMETER);
@@ -99,6 +106,12 @@ Request_Context_Repository::get_object_id(ACE_ENV_SINGLE_ARG_DECL)
 
   return ::get_object_id(a
                          ACE_ENV_ARG_PARAMETER);
+  */
+  FtRtecEventChannelAdmin::ObjectId *object_id;
+  ACE_NEW_THROW_EX(object_id,
+                   FtRtecEventChannelAdmin::ObjectId(*oid),
+                   CORBA::NO_MEMORY());
+  return FtRtecEventChannelAdmin::ObjectId_var(*object_id);
 }
 
 FtRtecEventChannelAdmin::ObjectId_var
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
index 113b448cbd4..e7937363813 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
@@ -54,8 +54,7 @@ SCTP_Connector::connect (ACE_SOCK_SEQPACK_Association &new_association,
     return -1;
 
   int result = ACE_OS::connect (new_association.get_handle (),
-                                ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+                                reinterpret_cast<sockaddr *> (remote_sap.get_addr ()),
                                 remote_sap.get_size ());
 
   return this->shared_connect_finish (new_association,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 1a890399027..f94e75c0152 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -80,7 +80,21 @@ TAO_Set_Update_Interceptor::send_request (
         sc->context_id = FTRT::FT_TRANSACTION_DEPTH;
 
         ACE_CDR::consolidate(&mb, cdr.begin());
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
         sc->context_data.replace(mb.length(), &mb);
+#else
+        // If the replace method is not available, we will need
+        // to do the copy manually.  First, set the octet sequence length.
+        CORBA::ULong length = mb.length ();
+        sc->context_data.length (length);
+
+        // Now copy over each byte.
+        char* base = mb.data_block ()->base ();
+        for(CORBA::ULong i = 0; i < length; i++)
+          {
+            sc->context_data[i] = base[i];
+          }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
         ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
@@ -102,7 +116,21 @@ TAO_Set_Update_Interceptor::send_request (
         sc->context_id = FTRT::FT_SEQUENCE_NUMBER;
 
         ACE_CDR::consolidate(&mb, cdr.begin());
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
         sc->context_data.replace(mb.length(), &mb);
+#else
+        // If the replace method is not available, we will need
+        // to do the copy manually.  First, set the octet sequence length.
+        CORBA::ULong length = mb.length ();
+        sc->context_data.length (length);
+
+        // Now copy over each byte.
+        char* base = mb.data_block ()->base ();
+        for(CORBA::ULong i = 0; i < length; i++)
+          {
+            sc->context_data[i] = base[i];
+          }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
         ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index f68d1cdcde8..ad2fba0b0f3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -106,7 +106,7 @@ class Interceptor_Destoryer : public TAO_ORB_Core
 {
 public:
   inline static void execute(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) {
-    static_cast<Interceptor_Destoryer*>(orb->orb_core())->do_it(ACE_ENV_SINGLE_ARG_PARAMETER);
+    static_cast<Interceptor_Destoryer*> (orb->orb_core())->do_it(ACE_ENV_SINGLE_ARG_PARAMETER);
   }
 private:
   Interceptor_Destoryer();
@@ -226,17 +226,17 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
 
   RtecEventChannelAdmin::EventChannel_var gateway;
 
-  activate_object_with_id(gateway.out(), impl_->poa, this, oid ACE_ENV_ARG_PARAMETER);
+  activate_object_with_id(gateway.out(), impl_->poa.in(), this, oid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(0);
   ++oid[9];
   activate_object_with_id(impl_->consumer_admin.out(),
-    impl_->poa,
+    impl_->poa.in(),
     &impl_->consumer_admin_servant,
     oid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(0);
   ++oid[9];
   activate_object_with_id(impl_->supplier_admin.out(),
-    impl_->poa,
+    impl_->poa.in(),
     &impl_->supplier_admin_servant,
     oid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(0);
@@ -326,7 +326,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
   memcpy(&local_oid[0], &remote_proxy_oid_ptr, sizeof(remote_proxy_oid_ptr));
 
   RtecEventChannelAdmin::ProxyPushSupplier_ptr result;
-  activate_object_with_id(result, impl_->poa,
+  activate_object_with_id(result, impl_->poa.in(),
                          &impl_->proxy_supplier_servant,
                          local_oid ACE_ENV_ARG_PARAMETER);
   return result;
@@ -356,7 +356,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
   memcpy(&local_oid[0], &remote_proxy_oid_ptr, sizeof(remote_proxy_oid_ptr));
 
   RtecEventChannelAdmin::ProxyPushConsumer_ptr result;
-  activate_object_with_id(result, impl_->poa,
+  activate_object_with_id(result, impl_->poa.in(),
                           &impl_->proxy_consumer_servant,
                           local_oid ACE_ENV_ARG_PARAMETER);
   return result;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index 4c498a713ea..217f701283e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -66,7 +66,7 @@ UUID::from_string (const char  *string_rep)
         return false;
       }
 
-      rep_.uuid[offset++] = static_cast<unsigned char>(r);
+      rep_.uuid[offset++] = static_cast<unsigned char> (r);
       string_rep += 2;
     }
 
@@ -79,12 +79,13 @@ UUID::from_string (const char  *string_rep)
   return true;
 }
 
+static const char *table = "0123456789abcdef";
+
 inline char *
 bytes_to_hex (const unsigned char *bytes,
               char  *dest,
               int   len)
 {
-  static const char *table = "0123456789abcdef";
   for (int i = 0; i < len; ++i)
   {
     *dest++ = table[bytes[i] >> 4];
@@ -129,7 +130,7 @@ UUID::create (unsigned char *buffer)
 
   // Days in years
   static ACE_UINT64 SecondsToJan1970 =
-    (static_cast<ACE_UINT64>(365)*(1970-1583) // Days in years
+    (static_cast<ACE_UINT64> (365)*(1970-1583) // Days in years
     + (1970-1583)/4 // Leap days
     - 3  // Allow for 1700, 1800, 1900 not leap years
     + 31  // Days in December 1583
@@ -153,7 +154,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/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
index bbd7f2e36c7..be09a2870a5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
@@ -14,12 +14,12 @@
 template<class T>
 void
 activate_object_with_id (T * &result,
-                         PortableServer::POA_var poa,
+                         PortableServer::POA_ptr poa,
                          PortableServer::ServantBase *servant,
                          const FtRtecEventComm::ObjectId &oid
                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 {
-  const PortableServer::ObjectId& id = ACE_reinterpret_cast(const PortableServer::ObjectId& ,oid);
+  const PortableServer::ObjectId& id = reinterpret_cast<const PortableServer::ObjectId&> (oid);
   poa->activate_object_with_id(id,
     servant ACE_ENV_ARG_PARAMETER);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc
index dbc1d9dd9e5..2cd7439e464 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -14,4 +14,7 @@ project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, mi
       IFRService
     }
   }
+
+  Template_Files {
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 084bdac4ec0..1bcc20308ff 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -1,15 +1,17 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "AliasDef_i.h"
 #include "Repository_i.h"
 #include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
 
-ACE_RCSID (IFRService, 
-           AliasDef_i, 
+
+ACE_RCSID (IFRService,
+           AliasDef_i,
            "$Id$")
 
+
 TAO_AliasDef_i::TAO_AliasDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -60,9 +62,13 @@ TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "original_type",
                                             original_type);
 
-  TAO_IDLType_i *impl = 
+  TAO_IDLType_i *impl =
     TAO_IFR_Service_Utils::path_to_idltype (original_type,
                                             this->repo_);
+  if (0 == impl)
+  {
+     ACE_THROW_RETURN ( CORBA::OBJECT_NOT_EXIST(), CORBA::TypeCode::_nil () );
+  }
 
   CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
@@ -94,7 +100,7 @@ TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "original_type",
                                             original_type);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (original_type,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index 9e18492a64b..d3a5a59a641 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -1,15 +1,17 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "ArrayDef_i.h"
 #include "Repository_i.h"
 #include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
 
-ACE_RCSID (IFRService, 
-           ArrayDef_i, 
+
+ACE_RCSID (IFRService,
+           ArrayDef_i,
            "$Id$")
 
+
 TAO_ArrayDef_i::TAO_ArrayDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_IDLType_i (repo)
@@ -108,7 +110,7 @@ TAO_ArrayDef_i::length_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                                              "length",
                                              length);
 
-  return ACE_static_cast (CORBA::ULong, length);
+  return static_cast<CORBA::ULong> (length);
 }
 
 void
@@ -183,7 +185,7 @@ TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "element_path",
                                             element_path);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (element_path,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -245,8 +247,8 @@ TAO_ArrayDef_i::destroy_element_type (
                                              "def_kind",
                                              kind);
 
-  CORBA::DefinitionKind def_kind = 
-    TAO_IFR_Service_Utils::path_to_def_kind (element_path, 
+  CORBA::DefinitionKind def_kind =
+    TAO_IFR_Service_Utils::path_to_def_kind (element_path,
                                              this->repo_);
 
   switch (def_kind)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index f8e25e5c3c9..c8322e6823b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "AttributeDef_i.h"
@@ -7,11 +6,14 @@
 #include "ExceptionDef_i.h"
 #include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
 
-ACE_RCSID (IFRService, 
-           AttributeDef_i, 
+
+ACE_RCSID (IFRService,
+           AttributeDef_i,
            "$Id$")
 
+
 TAO_AttributeDef_i::TAO_AttributeDef_i (
     TAO_Repository_i *repo
   )
@@ -91,7 +93,7 @@ TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "type_path",
                                             type_path);
 
-  TAO_IDLType_i *impl = 
+  TAO_IDLType_i *impl =
     TAO_IFR_Service_Utils::path_to_idltype (type_path,
                                             this->repo_);
 
@@ -119,7 +121,7 @@ TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "type_path",
                                             type_path);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (type_path,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -180,7 +182,7 @@ TAO_AttributeDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                                              "mode",
                                              mode);
 
-  return ACE_static_cast (CORBA::AttributeMode, mode);
+  return static_cast<CORBA::AttributeMode> (mode);
 }
 
 void
@@ -283,7 +285,7 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (path_queue.size ());
 
   CORBA::ExceptionDefSeq *get_ed_seq = 0;
   ACE_NEW_THROW_EX (get_ed_seq,
@@ -360,7 +362,7 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (path_queue.size ());
 
   CORBA::ExceptionDefSeq *put_ed_seq = 0;
   ACE_NEW_THROW_EX (put_ed_seq,
@@ -390,5 +392,3 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
 
   return retval._retn ();
 }
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index cd49e0ae4e2..ceb6aaf3daf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
@@ -11,10 +10,14 @@
 #include "ExtAttributeDef_i.h"
 #include "IFR_Service_Utils.h"
 
+#include "ace/SString.h"
+
+
 ACE_RCSID (IFRService,
            ComponentDef_i,
            "$Id$")
 
+
 // Specialization.
 template<>
 void
@@ -30,8 +33,7 @@ TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::UsesDescriptionSeq>::get_is_multiple
                              "is_multiple",
                              is_multiple);
   desc_seq[index].is_multiple =
-    ACE_static_cast (CORBA::Boolean,
-                     is_multiple);
+    static_cast<CORBA::Boolean> (is_multiple);
 }
 
 // Specialization.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index ca40188b501..25464717f07 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "ConstantDef_i.h"
@@ -9,11 +8,14 @@
 #include "tao/Any_Unknown_IDL_Type.h"
 
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
 
-ACE_RCSID (IFRService, 
+
+ACE_RCSID (IFRService,
            ConstantDef_i,
            "$Id$")
 
+
 TAO_ConstantDef_i::TAO_ConstantDef_i (
     TAO_Repository_i *repo
   )
@@ -137,7 +139,7 @@ TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "type_path",
                                             type_path);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (type_path,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -202,12 +204,13 @@ TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL)
                               length
                             );
 
-  char *data = ACE_static_cast (char *, ref);
+  char *data = static_cast<char *> (ref);
   ACE_Auto_Basic_Array_Ptr<char> safety (data);
 
   ACE_Message_Block mb (data,
                         length);
   mb.length (length);
+  TAO_InputCDR in_cdr (&mb);
 
   CORBA::Any *retval = 0;
   ACE_NEW_THROW_EX (retval,
@@ -218,8 +221,7 @@ TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL)
   TAO::Unknown_IDL_Type *impl = 0;
   ACE_NEW_THROW_EX (impl,
                     TAO::Unknown_IDL_Type (tc.in (),
-                                           &mb,
-                                           TAO_ENCAP_BYTE_ORDER),
+                                           in_cdr),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -247,7 +249,8 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value
                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_var my_tc = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var my_tc =
+    this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var val_tc = value.type ();
@@ -257,7 +260,23 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value
       return;
     }
 
-  ACE_Message_Block *mb = value._tao_get_cdr ();
+  ACE_Message_Block *mb = 0;
+  TAO::Any_Impl *impl = value.impl ();
+  
+  if (impl->encoded ())
+    {
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+        
+      mb = unk->_tao_get_cdr ().steal_contents ();
+    }
+  else
+    {
+      TAO_OutputCDR out;
+      impl->marshal_value (out);
+      TAO_InputCDR in (out);
+      mb = in.steal_contents ();
+    }
 
   CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -283,4 +302,3 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value
                                             mb->base (),
                                             mb->length ());
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index b98aa19dc88..2204768af19 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -1,15 +1,17 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "concrete_classes.h"
 #include "Repository_i.h"
 #include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
 
-ACE_RCSID (IFRService, 
+
+ACE_RCSID (IFRService,
            Contained_i,
            "$Id$")
-           
+
+
 const char *TAO_Contained_i::tmp_name_holder_ = 0;
 
 TAO_Contained_i::TAO_Contained_i (
@@ -143,7 +145,7 @@ TAO_Contained_i::id_i (const char *id
        == 0)
     {
       // Repository id already exists.
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, 
+      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2,
                                    CORBA::COMPLETED_NO));
     }
 
@@ -331,7 +333,7 @@ TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL)
                                             container_id.c_str (),
                                             container_path);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (container_path,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -375,6 +377,26 @@ TAO_Contained_i::containing_repository (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return this->repo_->repo_objref ();
 }
 
+CORBA::Contained::Description *
+TAO_Contained_i::describe (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // This will always be overridden by derived classes.
+  return 0;
+}
+
+CORBA::Contained::Description *
+TAO_Contained_i::describe_i (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // This will always be overridden by derived classes.
+  return 0;
+}
+
 void
 TAO_Contained_i::move (CORBA::Container_ptr new_container,
                        const char *new_name,
@@ -520,61 +542,32 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
 {
   CORBA::Repository_var my_repo = this->repo_->repo_objref ();
 
-  CORBA::DefinitionKind container_dk = 
+  CORBA::DefinitionKind container_dk =
     TAO_IFR_Service_Utils::reference_to_def_kind (new_container,
                                                   this->repo_);
 
   ACE_Configuration_Section_Key container_key;
-  TAO_Container_i *container_impl = 0;
-  TAO_Contained_i *contained_impl = 0;
 
   // Check that we're not trying to move to a different repository,
   // and set the container impl, used in each switch case below.
   if (container_dk == CORBA::dk_Repository)
     {
-      if (my_repo.in () != new_container)
-        {
-          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, 
-                                       CORBA::COMPLETED_NO));
-        }
-
       container_key = this->repo_->root_key ();
-
-      container_impl = this->repo_;
     }
   else
     {
-      // The only case where a container is not also a contained is
-      // CORBA::Repository, which is covered by the other IF branch, so
-      // we're ok here.
       ACE_TString container_path (
           TAO_IFR_Service_Utils::reference_to_path (new_container)
         );
-      contained_impl = 
-        TAO_IFR_Service_Utils::path_to_contained (container_path,
-                                                  this->repo_);
-
-      CORBA::Repository_var your_repo =
-        contained_impl->containing_repository (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (my_repo.in () != your_repo.in ())
-        {
-          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                       CORBA::COMPLETED_NO));
-        }
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
                                            container_path,
                                            container_key,
                                            0);
-
-      container_impl = 
-        TAO_IFR_Service_Utils::path_to_container (container_path,
-                                                  this->repo_);
     }
 
-  CORBA::DefinitionKind my_dk = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind my_dk =
+    this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -594,14 +587,20 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
   // Used for cleanup at the end of this function.
   ACE_Configuration_Section_Key old_section_key = this->section_key_;
 
-  CORBA::String_var container_id = 
-    contained_impl->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Contained_i as_contained (this->repo_);
+  as_contained.section_key (container_key);
+
+  CORBA::String_var container_id =
+    as_contained.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TString new_id (container_id.in ());
-  new_id = 
+  new_id =
     new_id.substr (0, new_id.rfind (':')) + "/" + new_name + ":" + new_version;
 
+  TAO_Container_i container_impl (this->repo_);
+  container_impl.section_key (container_key);
+
   ACE_TRY
     {
       // Call the appropriate create function.
@@ -612,7 +611,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           TAO_EnumDef_i impl (this->repo_);
           impl.section_key (this->section_key_);
 
-          CORBA::EnumMemberSeq_var members = 
+          CORBA::EnumMemberSeq_var members =
             impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -628,12 +627,17 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             }
 
           CORBA::EnumDef_var new_defn =
-            container_impl->create_enum_i (new_id.c_str (),
-                                           new_name,
-                                           new_version,
-                                           members.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+            container_impl.create_enum_i (new_id.c_str (),
+                                          new_name,
+                                          new_version,
+                                          members.in ()
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
+
+          ACE_TString new_path =
+            TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
+          container_impl.update_refs (new_path.c_str ());
+
           break;
         }
         case CORBA::dk_Alias:
@@ -641,24 +645,30 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           TAO_AliasDef_i impl (this->repo_);
           impl.section_key (this->section_key_);
 
-          CORBA::IDLType_var otype = 
+          CORBA::IDLType_var otype =
             impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          container_impl->create_alias_i (new_id.c_str (),
+          CORBA::AliasDef_var new_defn =
+            container_impl.create_alias_i (new_id.c_str (),
                                           new_name,
                                           new_version,
                                           otype.in ()
                                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
+
+          ACE_TString new_path =
+            TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
+          container_impl.update_refs (new_path.c_str ());
+
           break;
         }
         case CORBA::dk_Native:
         {
-          container_impl->create_native_i (new_id.c_str (),
-                                           new_name,
-                                           new_version
-                                           ACE_ENV_ARG_PARAMETER);
+          container_impl.create_native_i (new_id.c_str (),
+                                          new_name,
+                                          new_version
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -667,16 +677,22 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           TAO_ValueBoxDef_i impl (this->repo_);
           impl.section_key (this->section_key_);
 
-          CORBA::IDLType_var otype = 
+          CORBA::IDLType_var otype =
             impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          container_impl->create_value_box_i (new_id.c_str (),
+          CORBA::ValueBoxDef_var new_defn =
+            container_impl.create_value_box_i (new_id.c_str (),
                                               new_name,
                                               new_version,
                                               otype.in ()
                                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
+
+          ACE_TString new_path =
+            TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
+          container_impl.update_refs (new_path.c_str ());
+
           break;
         }
         case CORBA::dk_Struct:
@@ -684,7 +700,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           TAO_StructDef_i impl (this->repo_);
           impl.section_key (this->section_key_);
 
-          CORBA::StructMemberSeq_var members = 
+          CORBA::StructMemberSeq_var members =
             impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -700,13 +716,17 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             }
 
           CORBA::StructDef_var new_defn =
-            container_impl->create_struct_i (new_id.c_str (),
-                                             new_name,
-                                             new_version,
-                                             members.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+            container_impl.create_struct_i (new_id.c_str (),
+                                            new_name,
+                                            new_version,
+                                            members.in ()
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
+          ACE_TString new_path =
+            TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
+          container_impl.update_refs (new_path.c_str ());
+
           this->move_contents (new_defn.in ()
                                ACE_ENV_ARG_PARAMETER);
 
@@ -721,7 +741,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             impl.discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::UnionMemberSeq_var members = 
+          CORBA::UnionMemberSeq_var members =
             impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -737,14 +757,18 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             }
 
           CORBA::UnionDef_var new_defn =
-            container_impl->create_union_i (new_id.c_str (),
-                                            new_name,
-                                            new_version,
-                                            disc_type.in (),
-                                            members.in ()
-                                            ACE_ENV_ARG_PARAMETER);
+            container_impl.create_union_i (new_id.c_str (),
+                                           new_name,
+                                           new_version,
+                                           disc_type.in (),
+                                           members.in ()
+                                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
+          ACE_TString new_path =
+            TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
+          container_impl.update_refs (new_path.c_str ());
+
           this->move_contents (new_defn.in ()
                                ACE_ENV_ARG_PARAMETER);
 
@@ -753,10 +777,10 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
         case CORBA::dk_Module:
         {
           CORBA::ModuleDef_var new_defn =
-            container_impl->create_module_i (new_id.c_str (),
-                                             new_name,
-                                             new_version
-                                             ACE_ENV_ARG_PARAMETER);
+            container_impl.create_module_i (new_id.c_str (),
+                                            new_name,
+                                            new_version
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_contents (new_defn.in ()
@@ -769,16 +793,16 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           TAO_ExceptionDef_i impl (this->repo_);
           impl.section_key (this->section_key_);
 
-          CORBA::StructMemberSeq_var members = 
+          CORBA::StructMemberSeq_var members =
             impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ExceptionDef_var new_defn =
-            container_impl->create_exception_i (new_id.c_str (),
-                                                new_name,
-                                                new_version,
-                                                members.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+            container_impl.create_exception_i (new_id.c_str (),
+                                               new_name,
+                                               new_version,
+                                               members.in ()
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_contents (new_defn.in ()
@@ -796,13 +820,17 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           ACE_TRY_CHECK;
 
           CORBA::InterfaceDef_var new_defn =
-            container_impl->create_interface_i (new_id.c_str (),
-                                                new_name,
-                                                new_version,
-                                                bases.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+            container_impl.create_interface_i (new_id.c_str (),
+                                               new_name,
+                                               new_version,
+                                               bases.in ()
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
+          ACE_TString new_path =
+            TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
+          container_impl.update_refs (new_path.c_str ());
+
           this->move_contents (new_defn.in ()
                                ACE_ENV_ARG_PARAMETER);
 
@@ -813,19 +841,19 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           TAO_ConstantDef_i impl (this->repo_);
           impl.section_key (this->section_key_);
 
-          CORBA::IDLType_var type_def = 
+          CORBA::IDLType_var type_def =
             impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Any_var value = impl.value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          container_impl->create_constant_i (new_id.c_str (),
-                                             new_name,
-                                             new_version,
-                                             type_def.in (),
-                                             value.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+          container_impl.create_constant_i (new_id.c_str (),
+                                            new_name,
+                                            new_version,
+                                            type_def.in (),
+                                            value.in ()
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -834,11 +862,11 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           TAO_AttributeDef_i impl (this->repo_);
           impl.section_key (this->section_key_);
 
-          CORBA::IDLType_var type_def = 
+          CORBA::IDLType_var type_def =
             impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::AttributeMode mode = 
+          CORBA::AttributeMode mode =
             impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -881,15 +909,15 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           TAO_OperationDef_i impl (this->repo_);
           impl.section_key (this->section_key_);
 
-          CORBA::IDLType_var result = 
+          CORBA::IDLType_var result =
             impl.result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::OperationMode mode = 
+          CORBA::OperationMode mode =
             impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::ParDescriptionSeq_var params = 
+          CORBA::ParDescriptionSeq_var params =
             impl.params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -897,7 +925,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             impl.exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::ContextIdSeq_var contexts = 
+          CORBA::ContextIdSeq_var contexts =
             impl.contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -1020,7 +1048,7 @@ TAO_Contained_i::move_pre_process (CORBA::Container_ptr container,
                                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  char *container_path = 
+  char *container_path =
     TAO_IFR_Service_Utils::reference_to_path (container);
 
   ACE_Configuration_Section_Key container_key;
@@ -1116,7 +1144,7 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
                                                          "def_kind",
                                                          kind);
               CORBA::DefinitionKind def_kind =
-                ACE_static_cast (CORBA::DefinitionKind, kind);
+                static_cast<CORBA::DefinitionKind> (kind);
 
               TAO_Contained_i *impl = this->repo_->select_contained (def_kind);
               impl->section_key (defn_key);
@@ -1225,4 +1253,3 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
         }
     }
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
index 8bae05def86..390af7817a2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
@@ -155,14 +155,11 @@ public:
   virtual CORBA::Contained::Description *describe (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  // Pure virtual.
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe_i (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  // Pure virtual.
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void move (
       CORBA::Container_ptr new_container,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index ff57fd226d8..e19643e31d2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
@@ -10,14 +9,17 @@
 
 #include "tao/IFR_Client/IFR_ComponentsC.h"
 
-#include "tao/CDR.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
+
 
 ACE_RCSID (IFRService,
            Container_i,
            "$Id$")
 
+
 const char *TAO_Container_i::tmp_name_holder_ = 0;
 
 TAO_Container_i::TAO_Container_i (
@@ -154,7 +156,7 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
                                                      "def_kind",
                                                      kind);
           CORBA::DefinitionKind def_kind =
-            ACE_static_cast (CORBA::DefinitionKind, kind);
+            static_cast<CORBA::DefinitionKind> (kind);
 
           TAO_Contained_i *impl = this->repo_->select_contained (def_kind);
           impl->section_key (defn_key);
@@ -278,7 +280,7 @@ TAO_Container_i::lookup_i (const char *search_name
                                                          "def_kind",
                                                          kind);
 
-              def_kind = ACE_static_cast (CORBA::DefinitionKind, kind);
+              def_kind = static_cast<CORBA::DefinitionKind> (kind);
 
               if (def_kind == CORBA::dk_Interface
                   || def_kind == CORBA::dk_Value)
@@ -477,7 +479,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
                                                          kind);
 
               CORBA::DefinitionKind def_kind =
-                ACE_static_cast (CORBA::DefinitionKind, kind);
+                static_cast<CORBA::DefinitionKind> (kind);
 
               if (limit_type == CORBA::dk_all
                   || limit_type == def_kind)
@@ -525,7 +527,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (kind_queue.size ());
   retval->length (size);
 
   for (CORBA::ULong j = 0; j < size; ++j)
@@ -593,7 +595,7 @@ TAO_Container_i::lookup_name_i (const char *search_name,
                                exclude_inherited
                                ACE_ENV_ARG_PARAMETER);
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (kind_queue.size ());
 
   CORBA::ContainedSeq *holder;
   ACE_NEW_THROW_EX (holder,
@@ -669,7 +671,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
     }
   else
     {
-      ret_len = length < ACE_static_cast (CORBA::ULong, max_returned_objs)
+      ret_len = length < static_cast<CORBA::ULong> (max_returned_objs)
                 ? length
                 : max_returned_objs;
     }
@@ -819,7 +821,24 @@ TAO_Container_i::create_constant_i (const char *id,
                                             type_path);
 
   // Store the value.
-  ACE_Message_Block *mb = value._tao_get_cdr ();
+  ACE_Message_Block *mb = 0;
+  TAO::Any_Impl *impl = value.impl ();
+  
+  if (impl->encoded ())
+    {
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+        
+      mb = unk->_tao_get_cdr ().steal_contents ();
+    }
+  else
+    {
+      TAO_OutputCDR out;
+      impl->marshal_value (out);
+      TAO_InputCDR in (out);
+      mb = in.steal_contents ();
+    }
+
   CORBA::TypeCode_var val_tc = value.type ();
 
   CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1951,7 +1970,7 @@ TAO_Container_i::lookup_name_recursive (
                                                      kind);
 
           CORBA::DefinitionKind def_kind =
-            ACE_static_cast (CORBA::DefinitionKind, kind);
+            static_cast<CORBA::DefinitionKind> (kind);
 
           ACE_TString id;
           this->repo_->config ()->get_string_value (defn_key,
@@ -2245,9 +2264,6 @@ TAO_Container_i::store_label (ACE_Configuration_Section_Key key,
   CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  TAO_InputCDR cdr (value._tao_get_cdr (),
-                    value._tao_byte_order ());
-
   u_int result = 0;
   int default_label = 0;
 
@@ -2259,75 +2275,93 @@ TAO_Container_i::store_label (ACE_Configuration_Section_Key key,
     case CORBA::tk_char:
     {
       CORBA::Char x;
-      cdr.read_char (x);
-      result = ACE_static_cast (u_int, x);
+      value >>= CORBA::Any::to_char (x);
+      result = static_cast<u_int> (x);
       break;
     }
     case CORBA::tk_wchar:
     {
       CORBA::WChar x;
-      cdr.read_wchar (x);
-      result = ACE_static_cast (u_int, x);
+      value >>= CORBA::Any::to_wchar (x);
+      result = static_cast<u_int> (x);
       break;
     }
     case CORBA::tk_boolean:
     {
       CORBA::Boolean x;
-      cdr.read_boolean (x);
-      result = ACE_static_cast (u_int, x);
+      value >>= CORBA::Any::to_boolean (x);
+      result = static_cast<u_int> (x);
       break;
     }
     case CORBA::tk_short:
     {
       CORBA::Short x;
-      cdr.read_short (x);
-      result = ACE_static_cast (u_int, x);
+      value >>= x;
+      result = static_cast<u_int> (x);
       break;
     }
     case CORBA::tk_ushort:
     {
       CORBA::UShort x;
-      cdr.read_ushort (x);
-      result = ACE_static_cast (u_int, x);
+      value >>= x;
+      result = static_cast<u_int> (x);
       break;
     }
     case CORBA::tk_long:
     {
       CORBA::Long x;
-      cdr.read_long (x);
-      result = ACE_static_cast (u_int, x);
+      value >>= x;
+      result = static_cast<u_int> (x);
       break;
     }
     case CORBA::tk_ulong:
     {
       CORBA::ULong x;
-      cdr.read_ulong (x);
-      result = ACE_static_cast (u_int, x);
+      value >>= x;
+      result = static_cast<u_int> (x);
       break;
     }
 #if !defined (ACE_LACKS_LONGLONG_T)
     case CORBA::tk_longlong:
     {
       CORBA::LongLong x;
-      cdr.read_longlong (x);
+      value >>= x;
       // We could lose data here.
-      result = ACE_static_cast (u_int, x);
+      result = static_cast<u_int> (x);
       break;
     }
 #endif /* ACE_LACKS_LONGLONG_T */
     case CORBA::tk_ulonglong:
     {
       CORBA::ULongLong x;
-      cdr.read_ulonglong (x);
+      value >>= x;
       // We could lose data here.
-      result = ACE_static_cast (u_int, x);
+      result = static_cast<u_int> (x);
       break;
     }
     case CORBA::tk_enum:
     {
       CORBA::ULong x;
-      cdr.read_ulong (x);
-      result = ACE_static_cast (u_int, x);
+      TAO::Any_Impl *impl = value.impl ();
+      TAO_InputCDR in (static_cast<ACE_Message_Block *> (0));
+      
+      if (impl->encoded ())
+        {
+          TAO::Unknown_IDL_Type *unk =
+            dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+            
+          in = unk->_tao_get_cdr ();
+        }
+      else
+        {
+          TAO_OutputCDR out;
+          impl->marshal_value (out);
+          TAO_InputCDR tmp (out);
+          in = tmp;
+        }
+       
+      in.read_ulong (x);  
+      result = static_cast<u_int> (x);
       break;
     }
     default:
@@ -2353,10 +2387,17 @@ TAO_Container_i::update_refs (const char *path,
                               const char *name)
 {
   ACE_Configuration_Section_Key refs_key;
-  this->repo_->config ()->open_section (this->section_key_,
-                                        "refs",
-                                        1,
-                                        refs_key);
+  int status =
+    this->repo_->config ()->open_section (this->section_key_,
+                                          "refs",
+                                          0,
+                                          refs_key);
+
+  // If this container has no "refs" section, there is nothing to do.
+  if (status != 0)
+    {
+      return;
+    }
 
   u_int count = 0;
   this->repo_->config ()->get_integer_value (refs_key,
@@ -2381,12 +2422,25 @@ TAO_Container_i::update_refs (const char *path,
                                                 "name",
                                                 ref_name);
 
+      int pos = ref_name.find (this->repo_->extension ());
+
       // If one of the names has been mangled by move(), fix it.
-      if (ref_name.find (this->repo_->extension ()) != ACE_TString::npos)
+      if (pos != ACE_TString::npos)
         {
-          this->repo_->config ()->set_string_value (ref_key,
-                                                    "name",
-                                                    name);
+          // If we're just changing the path after doing a 'move',
+          // we don't want to change the name, so we've passed in 0.
+          if (name != 0)
+            {
+              this->repo_->config ()->set_string_value (ref_key,
+                                                        "name",
+                                                        name);
+            }
+          else
+            {
+              this->repo_->config ()->set_string_value (ref_key,
+                                                        "name",
+                                                        ref_name.substr (0, pos));
+            }
 
           this->repo_->config ()->set_string_value (ref_key,
                                                     "path",
@@ -2396,6 +2450,12 @@ TAO_Container_i::update_refs (const char *path,
         }
     }
 
+  // If we're just changing the path after doing a 'move', we're done.
+  if (name == 0)
+    {
+      return;
+    }
+
   // Add a new reference.
   ACE_Configuration_Section_Key new_key;
   char *stringified = TAO_IFR_Service_Utils::int_to_string (count);
@@ -2580,7 +2640,7 @@ TAO_Container_i::create_value_common (
                                       TAO_IFR_Service_Utils::tmp_key_,
                                       "def_kind",
                                       kind);
-          def_kind = ACE_static_cast (CORBA::DefinitionKind, kind);
+          def_kind = static_cast<CORBA::DefinitionKind> (kind);
 
           if (def_kind == CORBA::dk_Interface)
             {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
index 91e229c392e..d3ba81d83ec 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -409,6 +409,12 @@ public:
   static void tmp_name_holder (const char *name);
   // Accesses the static member.
 
+  void update_refs (
+      const char *path,
+      const char *name = 0
+    );
+  // Used with structs, unions and exceptions.
+
 protected:
    void store_label (
       ACE_Configuration_Section_Key key,
@@ -442,12 +448,6 @@ private:
       CORBA::Boolean exclude_inherited
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void update_refs (
-      const char *path,
-      const char *name
-    );
-  // Used with structs, unions and exceptions.
-
   ACE_TString create_value_common (
       CORBA::DefinitionKind container_kind,
       ACE_Configuration_Section_Key &container_key,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index 06dc6a1a075..a97939c8184 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -1,14 +1,17 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "EnumDef_i.h"
 #include "Repository_i.h"
 #include "IFR_Service_Utils.h"
 
-ACE_RCSID (IFRService, 
-           EnumDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           EnumDef_i,
            "$Id$")
 
+
 TAO_EnumDef_i::TAO_EnumDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index dbc17717d97..b81e87ba6d8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
@@ -6,13 +5,17 @@
 #include "EventDef_i.h"
 #include "IFR_Service_Utils_T.h"
 
-ACE_RCSID (IFRService, 
-           EventPortDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           EventPortDef_i,
            "$Id$")
 
+
 TAO_EventPortDef_i::TAO_EventPortDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
-    TAO_Contained_i (repo)   
+    TAO_Contained_i (repo)
 {
 }
 
@@ -20,7 +23,7 @@ TAO_EventPortDef_i::~TAO_EventPortDef_i (void)
 {
 }
 
-CORBA::ComponentIR::EventDef_ptr 
+CORBA::ComponentIR::EventDef_ptr
 TAO_EventPortDef_i::event (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -34,7 +37,7 @@ TAO_EventPortDef_i::event (
   return this->event_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::EventDef_ptr 
+CORBA::ComponentIR::EventDef_ptr
 TAO_EventPortDef_i::event_i (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -52,7 +55,7 @@ TAO_EventPortDef_i::event_i (
                                                 ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_EventPortDef_i::event (
     CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
@@ -68,7 +71,7 @@ TAO_EventPortDef_i::event (
                  ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_EventPortDef_i::event_i (
     CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL_NOT_USED
@@ -83,7 +86,7 @@ TAO_EventPortDef_i::event_i (
       return;
     }
 
-  const char *tmp = 
+  const char *tmp =
     TAO_IFR_Service_Utils::reference_to_path (event);
 
   ACE_Configuration_Section_Key new_key;
@@ -102,7 +105,7 @@ TAO_EventPortDef_i::event_i (
                                             holder);
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_EventPortDef_i::is_a (
     const char *event_id
     ACE_ENV_ARG_DECL
@@ -118,7 +121,7 @@ TAO_EventPortDef_i::is_a (
                        ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_EventPortDef_i::is_a_i (
     const char *event_id
     ACE_ENV_ARG_DECL
@@ -191,4 +194,3 @@ TAO_EventPortDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return CORBA::dk_none;
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 932031b6ca0..1c6fa2b4fd7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "ExceptionDef_i.h"
@@ -6,11 +5,13 @@
 #include "IDLType_i.h"
 #include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
 
-ACE_RCSID (IFRService, 
-           ExceptionDef_i, 
+ACE_RCSID (IFRService,
+           ExceptionDef_i,
            "$Id$")
 
+
 TAO_ExceptionDef_i::TAO_ExceptionDef_i (
     TAO_Repository_i *repo
   )
@@ -136,7 +137,7 @@ TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "name",
                                             name);
 
-  CORBA::StructMemberSeq_var members = 
+  CORBA::StructMemberSeq_var members =
     this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
@@ -218,13 +219,13 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
                                                      kind);
 
           CORBA::DefinitionKind def_kind =
-            ACE_static_cast (CORBA::DefinitionKind, kind);
+            static_cast<CORBA::DefinitionKind> (kind);
 
           kind_queue.enqueue_tail (def_kind);
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (kind_queue.size ());
 
   CORBA::StructMemberSeq *members = 0;
   ACE_NEW_THROW_EX (members,
@@ -330,7 +331,7 @@ TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members
                                                     "name",
                                                     name);
 
-          path = 
+          path =
             TAO_IFR_Service_Utils::reference_to_path (
                 members[i].type_def.in ()
               );
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index 68b79fda3f6..020ae781324 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "ExtAttributeDef_i.h"
@@ -6,10 +5,14 @@
 #include "ExceptionDef_i.h"
 #include "IFR_Service_Utils.h"
 
-ACE_RCSID (IFRService, 
-           ExtAttributeDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           ExtAttributeDef_i,
            "$Id$")
 
+
 TAO_ExtAttributeDef_i::TAO_ExtAttributeDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -55,7 +58,7 @@ TAO_ExtAttributeDef_i::get_exceptions_i (
   return safe_retval._retn ();
 }
 
-void 
+void
 TAO_ExtAttributeDef_i::get_exceptions (
     const CORBA::ExcDescriptionSeq &get_exceptions
     ACE_ENV_ARG_DECL
@@ -71,7 +74,7 @@ TAO_ExtAttributeDef_i::get_exceptions (
                           ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ExtAttributeDef_i::get_exceptions_i (
     const CORBA::ExcDescriptionSeq &get_exceptions
     ACE_ENV_ARG_DECL_NOT_USED
@@ -116,7 +119,7 @@ TAO_ExtAttributeDef_i::set_exceptions_i (
   return safe_retval._retn ();
 }
 
-void 
+void
 TAO_ExtAttributeDef_i::set_exceptions (
     const CORBA::ExcDescriptionSeq &set_exceptions
     ACE_ENV_ARG_DECL
@@ -132,7 +135,7 @@ TAO_ExtAttributeDef_i::set_exceptions (
                           ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ExtAttributeDef_i::set_exceptions_i (
     const CORBA::ExcDescriptionSeq &set_exceptions
     ACE_ENV_ARG_DECL_NOT_USED
@@ -176,7 +179,7 @@ TAO_ExtAttributeDef_i::describe_attribute_i (
   return safe_retval._retn ();
 }
 
-void 
+void
 TAO_ExtAttributeDef_i::fill_description (
     CORBA::ExtAttributeDescription &desc
     ACE_ENV_ARG_DECL
@@ -276,7 +279,7 @@ TAO_ExtAttributeDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
     }
 }
 
-void 
+void
 TAO_ExtAttributeDef_i::exceptions (const char *sub_section,
                                    const CORBA::ExcDescriptionSeq &exceptions)
 {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 547f64f983b..25da09c1ec8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
@@ -7,10 +6,14 @@
 #include "IFR_Service_Utils.h"
 #include "IFR_Service_Utils_T.h"
 
-ACE_RCSID (IFRService, 
-           ExtValueDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           ExtValueDef_i,
            "$Id$")
 
+
 TAO_ExtValueDef_i::TAO_ExtValueDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
@@ -49,20 +52,20 @@ TAO_ExtValueDef_i::ext_initializers_i (
                   CORBA::ExtInitializerSeq,
                   0);
   CORBA::ExtInitializerSeq_var retval = iseq;
-  
+
   ACE_Configuration_Section_Key initializers_key;
   int status =
     this->repo_->config ()->open_section (this->section_key_,
                                           "initializers",
                                           0,
                                           initializers_key);
-                                          
+
   if (status != 0)
     {
       iseq->length (0);
       return retval._retn ();
     }
-    
+
   CORBA::ULong count = 0;
   this->repo_->config ()->get_integer_value (initializers_key,
                                              "count",
@@ -72,7 +75,7 @@ TAO_ExtValueDef_i::ext_initializers_i (
   ACE_Configuration_Section_Key initializer_key, params_key, arg_key;
   ACE_TString holder;
   CORBA::ULong arg_count = 0;
-  
+
   for (CORBA::ULong i = 0; i < count; ++i)
     {
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -89,19 +92,19 @@ TAO_ExtValueDef_i::ext_initializers_i (
                                               "params",
                                               0,
                                               params_key);
-                                              
+
       if (status != 0)
         {
           retval[i].members.length (0);
           continue;
         }
-        
+
       this->repo_->config ()->get_integer_value (params_key,
                                                  "count",
                                                  arg_count);
       retval[i].members.length (arg_count);
       CORBA::Object_var obj;
-      
+
       for (CORBA::ULong j = 0; j < arg_count; ++j)
         {
           stringified = TAO_IFR_Service_Utils::int_to_string (j);
@@ -119,16 +122,16 @@ TAO_ExtValueDef_i::ext_initializers_i (
           TAO_IDLType_i *impl =
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
-          retval[i].members[j].type = 
+          retval[i].members[j].type =
             impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
-          
-          obj = 
+
+          obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
                                                       this->repo_
                                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
-          
+
           retval[i].members[j].type_def =
             CORBA::IDLType::_narrow (obj.in ()
                                      ACE_ENV_ARG_PARAMETER);
@@ -141,11 +144,11 @@ TAO_ExtValueDef_i::ext_initializers_i (
                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
-    
+
   return retval._retn ();
 }
 
-void 
+void
 TAO_ExtValueDef_i::ext_initializers (
     const CORBA::ExtInitializerSeq &ext_initializers
     ACE_ENV_ARG_DECL
@@ -161,7 +164,7 @@ TAO_ExtValueDef_i::ext_initializers (
                             ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ExtValueDef_i::ext_initializers_i (
     const CORBA::ExtInitializerSeq &ext_initializers
     ACE_ENV_ARG_DECL_NOT_USED
@@ -232,7 +235,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                   CORBA::ExtValueDef::ExtFullValueDescription,
                   0);
   CORBA::ExtValueDef::ExtFullValueDescription_var retval = fv_desc;
-  
+
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "name",
@@ -248,13 +251,11 @@ TAO_ExtValueDef_i::describe_ext_value_i (
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_abstract",
                                              val);
-  fv_desc->is_abstract = ACE_static_cast (CORBA::Boolean, 
-                                          val);
+  fv_desc->is_abstract = static_cast<CORBA::Boolean> (val);
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_custom",
                                              val);
-  fv_desc->is_custom = ACE_static_cast (CORBA::Boolean, 
-                                        val);
+  fv_desc->is_custom = static_cast<CORBA::Boolean> (val);
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "container_id",
                                             holder);
@@ -282,7 +283,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
   TAO_IDLType_i *idl_type = 0;
   CORBA::Object_var obj;
   ACE_Configuration_Section_Key params_key, excepts_key, except_def_key;
-  
+
   if (status == 0)
     {
       this->repo_->config ()->get_integer_value (ops_key,
@@ -290,7 +291,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                                                  count);
       fv_desc->operations.length (count);
       ACE_Configuration_Section_Key op_key, result_key, contexts_key;
-      
+
       for (i = 0; i < count; ++i)
         {
           stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -316,20 +317,19 @@ TAO_ExtValueDef_i::describe_ext_value_i (
           idl_type =
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
-          fv_desc->operations[i].result = 
+          fv_desc->operations[i].result =
             idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           this->repo_->config ()->get_integer_value (op_key,
                                                      "mode",
                                                      val);
-          fv_desc->operations[i].mode = ACE_static_cast (CORBA::OperationMode,
-                                                         val);
-          CORBA::TCKind kind = 
+          fv_desc->operations[i].mode = static_cast<CORBA::OperationMode> (val);
+          CORBA::TCKind kind =
             fv_desc->operations[i].result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
-          
-          if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY 
+
+          if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY
               && kind != CORBA::tk_void)
             {
               ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
@@ -338,7 +338,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
             }
 
           // Operation contexts.
-            
+
           TAO_IFR_Strseq_Utils<CORBA::ContextIdSeq>::fill_string_seq (
               "contexts",
               this->repo_->config (),
@@ -359,9 +359,9 @@ TAO_ExtValueDef_i::describe_ext_value_i (
               ACE_Configuration_Section_Key param_key;
               this->repo_->config ()->get_integer_value (params_key,
                                                         "count",
-                                                        param_count);                                                  
+                                                        param_count);
               fv_desc->operations[i].parameters.length (param_count);
-              
+
               for (j = 0; j < param_count; ++j)
                 {
                   stringified = TAO_IFR_Service_Utils::int_to_string (j);
@@ -372,19 +372,19 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                   this->repo_->config ()->get_string_value (param_key,
                                                             "name",
                                                             holder);
-                  fv_desc->operations[i].parameters[j].name = 
+                  fv_desc->operations[i].parameters[j].name =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (param_key,
                                                             "type_path",
                                                             holder);
-                  idl_type = 
+                  idl_type =
                     TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                             this->repo_);
                   fv_desc->operations[i].parameters[j].type =
                     idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_CHECK_RETURN (0);
-                  
-                  obj = 
+
+                  obj =
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
@@ -400,21 +400,20 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                   this->repo_->config ()->get_integer_value (param_key,
                                                              "mode",
                                                              val);
-                  fv_desc->operations[i].parameters[j].mode = 
-                    ACE_static_cast (CORBA::ParameterMode, 
-                                     val);
+                  fv_desc->operations[i].parameters[j].mode =
+                    static_cast<CORBA::ParameterMode> (val);
                 }
             }
 
           // Operation exceptions.
-          
+
           status =
             this->repo_->config ()->open_section (op_key,
                                                   "excepts",
                                                   0,
                                                   excepts_key);
           fv_desc->operations[i].exceptions.length (0);
-          
+
           if (status == 0)
             {
               CORBA::ULong excep_count = 0;
@@ -440,22 +439,22 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                   this->repo_->config ()->get_string_value (except_def_key,
                                                             "name",
                                                             holder);
-                  fv_desc->operations[i].exceptions[j].name = 
+                  fv_desc->operations[i].exceptions[j].name =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (except_def_key,
                                                             "id",
                                                             holder);
-                  fv_desc->operations[i].exceptions[j].id = 
+                  fv_desc->operations[i].exceptions[j].id =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (except_def_key,
                                                             "container_id",
                                                             holder);
-                  fv_desc->operations[i].exceptions[j].defined_in = 
+                  fv_desc->operations[i].exceptions[j].defined_in =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (except_def_key,
                                                             "version",
                                                             holder);
-                  fv_desc->operations[i].exceptions[j].version = 
+                  fv_desc->operations[i].exceptions[j].version =
                     holder.fast_rep ();
 
                   TAO_ExceptionDef_i impl (this->repo_);
@@ -464,14 +463,14 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                     impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_CHECK_RETURN (0);
                 }
-            }                          
+            }
         }
     }
-    
+
   // Attributes..
 
   fv_desc->attributes.length (0);
-  
+
   ACE_Configuration_Section_Key attrs_key;
   status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -509,15 +508,14 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                                                      "mode",
                                                      val);
           fv_desc->attributes[i].mode =
-            ACE_static_cast (CORBA::AttributeMode, 
-                             val);
+            static_cast<CORBA::AttributeMode> (val);
           this->repo_->config ()->get_string_value (attr_key,
                                                     "type_path",
                                                     holder);
 
           // Use the type path for 'defined_in' and 'type'.
 
-          idl_type = 
+          idl_type =
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->attributes[i].type =
@@ -552,7 +550,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
   // Members..
 
   fv_desc->members.length (0);
-  
+
   ACE_Configuration_Section_Key members_key;
   status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -595,27 +593,26 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                                                      "access",
                                                      val);
           fv_desc->members[i].access =
-            ACE_static_cast (CORBA::Visibility, 
-                             val);
+            static_cast<CORBA::Visibility> (val);
 
           // Use type path for 'type' and 'type_def',
 
           this->repo_->config ()->get_string_value (member_key,
                                                     "type_path",
                                                     holder);
-          idl_type = 
+          idl_type =
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->members[i].type =
             idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          obj = 
+          obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
                                                       this->repo_
                                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
-          
+
           fv_desc->members[i].type_def =
             CORBA::IDLType::_narrow (obj.in ()
                                      ACE_ENV_ARG_PARAMETER);
@@ -626,7 +623,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
   // Initializers
 
   fv_desc->initializers.length (0);
-  
+
   ACE_Configuration_Section_Key initializers_key;
   status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -640,8 +637,8 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                                                  "count",
                                                  count);
       fv_desc->initializers.length (count);
-      ACE_Configuration_Section_Key initializer_key, 
-                                    params_key, 
+      ACE_Configuration_Section_Key initializer_key,
+                                    params_key,
                                     arg_key,
                                     excepts_key;
 
@@ -682,19 +679,19 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                   this->repo_->config ()->get_string_value (arg_key,
                                                             "arg_name",
                                                             holder);
-                  fv_desc->initializers[i].members[j].name = 
+                  fv_desc->initializers[i].members[j].name =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (arg_key,
                                                             "arg_path",
                                                             holder);
-                  TAO_IDLType_i *impl = 
+                  TAO_IDLType_i *impl =
                     TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                              this->repo_);
                   fv_desc->initializers[i].members[j].type =
                     impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_CHECK_RETURN (0);
 
-                  obj = 
+                  obj =
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
@@ -716,14 +713,14 @@ TAO_ExtValueDef_i::describe_ext_value_i (
           ACE_CHECK_RETURN (0);
         }
     }
-                                          
+
   TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq (
       "supported",
       this->repo_->config (),
       this->section_key_,
       fv_desc->supported_interfaces
     );
-  
+
   TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq (
       "abstract_bases",
       this->repo_->config (),
@@ -734,19 +731,18 @@ TAO_ExtValueDef_i::describe_ext_value_i (
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_truncatable",
                                              val);
-  fv_desc->is_truncatable = ACE_static_cast (CORBA::Boolean,
-                                             val);
+  fv_desc->is_truncatable = static_cast<CORBA::Boolean> (val);
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "base_value",
                                             holder);
   fv_desc->base_value = holder.fast_rep ();
   fv_desc->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return retval._retn ();
 }
 
-CORBA::ExtAttributeDef_ptr 
+CORBA::ExtAttributeDef_ptr
 TAO_ExtValueDef_i::create_ext_attribute (
     const char *id,
     const char *name,
@@ -774,7 +770,7 @@ TAO_ExtValueDef_i::create_ext_attribute (
                                        ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ExtAttributeDef_ptr 
+CORBA::ExtAttributeDef_ptr
 TAO_ExtValueDef_i::create_ext_attribute_i (
     const char *id,
     const char *name,
@@ -791,7 +787,7 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
   ACE_Configuration_Section_Key new_key;
 
   // Common to all IR objects created in CORBA::Container.
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (CORBA::dk_Value,
                                           CORBA::dk_Attribute,
                                           this->section_key_,
@@ -904,7 +900,7 @@ TAO_ExtValueDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
     }
 }
 
-void 
+void
 TAO_ExtValueDef_i::exceptions (ACE_Configuration_Section_Key &key,
                                const char *sub_section,
                                const CORBA::ExcDescriptionSeq &exceptions)
@@ -939,7 +935,7 @@ TAO_ExtValueDef_i::exceptions (ACE_Configuration_Section_Key &key,
     }
 }
 
-void 
+void
 TAO_ExtValueDef_i::exceptions (ACE_Configuration_Section_Key &key,
                                const char *sub_section,
                                const CORBA::ExceptionDefSeq &exceptions)
@@ -965,7 +961,7 @@ TAO_ExtValueDef_i::exceptions (ACE_Configuration_Section_Key &key,
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      type_path = 
+      type_path =
         TAO_IFR_Service_Utils::reference_to_path (exceptions[i].in ());
 
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -974,4 +970,3 @@ TAO_ExtValueDef_i::exceptions (ACE_Configuration_Section_Key &key,
                                                 type_path);
     }
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index cf932d2a422..bf9bd299ca1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
@@ -10,10 +9,14 @@
 #include "AttributeDef_i.h"
 #include "IFR_Service_Utils_T.h"
 
-ACE_RCSID (IFRService, 
-           HomeDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           HomeDef_i,
            "$Id$")
 
+
 TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
@@ -229,7 +232,7 @@ TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL)
       return CORBA::ComponentIR::HomeDef::_nil ();
     }
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -281,7 +284,7 @@ TAO_HomeDef_i::supported_interfaces (
 
   return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
-    
+
 CORBA::InterfaceDefSeq *
 TAO_HomeDef_i::supported_interfaces_i (
     ACE_ENV_SINGLE_ARG_DECL
@@ -332,9 +335,9 @@ TAO_HomeDef_i::supported_interfaces_i (
     }
 
   return safe_retval._retn ();
-}   
+}
 
-void 
+void
 TAO_HomeDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
     ACE_ENV_ARG_DECL
@@ -348,9 +351,9 @@ TAO_HomeDef_i::supported_interfaces (
 
   this->supported_interfaces_i (supported_interfaces
                                 ACE_ENV_ARG_PARAMETER);
-} 
-   
-void 
+}
+
+void
 TAO_HomeDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
@@ -378,7 +381,7 @@ TAO_HomeDef_i::supported_interfaces_i (
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
-      path = 
+      path =
         TAO_IFR_Service_Utils::reference_to_path (
             supported_interfaces[i].in ()
           );
@@ -387,7 +390,7 @@ TAO_HomeDef_i::supported_interfaces_i (
                                                 path);
     }
 }
-      
+
 CORBA::ComponentIR::ComponentDef_ptr
 TAO_HomeDef_i::managed_component (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -408,7 +411,7 @@ TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL)
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "managed",
                                             path);
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -484,7 +487,7 @@ TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL)
                                    ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_HomeDef_i::primary_key (
     CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL
@@ -498,9 +501,9 @@ TAO_HomeDef_i::primary_key (
 
   this->primary_key_i (primary_key
                        ACE_ENV_ARG_PARAMETER);
-} 
-   
-void 
+}
+
+void
 TAO_HomeDef_i::primary_key_i (
     CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL_NOT_USED
@@ -519,7 +522,7 @@ TAO_HomeDef_i::primary_key_i (
                                             "primary_key",
                                             path);
 }
-      
+
 CORBA::ComponentIR::FactoryDef_ptr
 TAO_HomeDef_i::create_factory (const char *id,
                                const char *name,
@@ -614,7 +617,7 @@ TAO_HomeDef_i::create_finder_i (
                                                  ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Object_ptr 
+CORBA::Object_ptr
 TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
                               const char *id,
                               const char *name,
@@ -628,7 +631,7 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
   ACE_Configuration_Section_Key new_key;
 
   // Common to all IR objects created in CORBA::Container.
-  ACE_TString result_path = 
+  ACE_TString result_path =
     TAO_IFR_Service_Utils::create_common (CORBA::dk_Home,
                                           created_kind,
                                           this->section_key_,
@@ -726,7 +729,7 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
 
       for (i = 0; i < length; ++i)
         {
-          type_path = 
+          type_path =
             TAO_IFR_Service_Utils::reference_to_path (exceptions[i].in ());
 
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -744,7 +747,7 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
                                           ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_HomeDef_i::fill_op_desc_seq (ACE_Configuration_Section_Key &key,
                                  CORBA::OpDescriptionSeq &ods,
                                  const char *sub_section
@@ -781,7 +784,7 @@ TAO_HomeDef_i::fill_op_desc_seq (ACE_Configuration_Section_Key &key,
     }
 }
 
-void 
+void
 TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
                              CORBA::OperationDescription &od,
                              const char *sub_section
@@ -805,7 +808,7 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
   this->repo_->config ()->get_string_value (key,
                                             "result",
                                             result_path);
-  TAO_IDLType_i *result = 
+  TAO_IDLType_i *result =
     TAO_IFR_Service_Utils::path_to_idltype (result_path,
                                             this->repo_);
   od.result = result->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -835,7 +838,7 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
                            ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_HomeDef_i::fill_param_desc_seq (ACE_Configuration_Section_Key &key,
                                     CORBA::ParDescriptionSeq &pds,
                                     const char *sub_section
@@ -872,7 +875,7 @@ TAO_HomeDef_i::fill_param_desc_seq (ACE_Configuration_Section_Key &key,
     }
 }
 
-void 
+void
 TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
                                 CORBA::ParameterDescription &pd,
                                 const char *sub_section
@@ -896,7 +899,7 @@ TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
   pd.type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -910,11 +913,10 @@ TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
   this->repo_->config ()->get_integer_value (param_key,
                                              "mode",
                                              val);
-  pd.mode = ACE_static_cast (CORBA::ParameterMode,
-                             val);
+  pd.mode = static_cast<CORBA::ParameterMode> (val);
 }
 
-void 
+void
 TAO_HomeDef_i::fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
                                   CORBA::ExcDescriptionSeq &eds,
                                   const char *sub_section
@@ -951,7 +953,7 @@ TAO_HomeDef_i::fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
     }
 }
 
-void 
+void
 TAO_HomeDef_i::fill_exc_desc (ACE_Configuration_Section_Key &key,
                               CORBA::ExceptionDescription &ed,
                               const char *sub_section
@@ -983,7 +985,7 @@ TAO_HomeDef_i::fill_exc_desc (ACE_Configuration_Section_Key &key,
   ed.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_HomeDef_i::fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
                                    CORBA::ExtAttrDescriptionSeq &eads,
                                    const char *sub_section
@@ -1020,7 +1022,7 @@ TAO_HomeDef_i::fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
     }
 }
 
-void 
+void
 TAO_HomeDef_i::fill_attr_desc (ACE_Configuration_Section_Key &key,
                                CORBA::ExtAttributeDescription &ead,
                                const char *sub_section
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index 006b2eafd92..1bf55e161f7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -26,11 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:610
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:609
 
-#ifndef _TAO_IDL_ORIG_IFR_BASES_CPP_
-#define _TAO_IDL_ORIG_IFR_BASES_CPP_
+#ifndef _TAO_IDL_SERVER_IFR_BASES_CPP_
+#define _TAO_IDL_SERVER_IFR_BASES_CPP_
 
 
 #include "IFR_BaseS.h"
@@ -44,64 +44,47 @@
 #include "tao/Object_T.h"
 #include "tao/Typecode.h"
 #include "tao/DynamicC.h"
+#include "tao/CDR.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
+#include "tao/Any_Arg_Traits.h"
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
 #include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
-#include "ace/config-all.h"
+#include "ace/Malloc_Allocator.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BaseS.i"
+#include "IFR_BaseS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:436
-
-#if !defined (_CORBA_ANY__ARG_TRAITS_SS_)
-#define _CORBA_ANY__ARG_TRAITS_SS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
+  class  Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind
@@ -113,9 +96,9 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Contained>
+  class  Arg_Traits<CORBA::Contained>
     : public
         Object_Arg_Traits_T<
             CORBA::Contained_ptr,
@@ -127,15 +110,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:472
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Contained::Description>
+  class  Arg_Traits<CORBA::Contained::Description>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::Contained::Description,
@@ -149,9 +132,9 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_SS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Repository>
+  class  Arg_Traits<CORBA::Repository>
     : public
         Object_Arg_Traits_T<
             CORBA::Repository_ptr,
@@ -166,9 +149,9 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container>
+  class  Arg_Traits<CORBA::Container>
     : public
         Object_Arg_Traits_T<
             CORBA::Container_ptr,
@@ -180,15 +163,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container::DescriptionSeq>
+  class  Arg_Traits<CORBA::Container::DescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::Container::DescriptionSeq,
@@ -202,9 +185,9 @@ namespace TAO
 
 #if !defined (_CORBA_MODULEDEF__ARG_TRAITS_SS_)
 #define _CORBA_MODULEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ModuleDef>
+  class  Arg_Traits<CORBA::ModuleDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ModuleDef_ptr,
@@ -219,9 +202,9 @@ namespace TAO
 
 #if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_SS_)
 #define _CORBA_CONSTANTDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ConstantDef>
+  class  Arg_Traits<CORBA::ConstantDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ConstantDef_ptr,
@@ -236,9 +219,9 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_SS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::IDLType>
+  class  Arg_Traits<CORBA::IDLType>
     : public
         Object_Arg_Traits_T<
             CORBA::IDLType_ptr,
@@ -253,9 +236,9 @@ namespace TAO
 
 #if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_SS_)
 #define _CORBA_STRUCTDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::StructDef>
+  class  Arg_Traits<CORBA::StructDef>
     : public
         Object_Arg_Traits_T<
             CORBA::StructDef_ptr,
@@ -270,9 +253,9 @@ namespace TAO
 
 #if !defined (_CORBA_UNIONDEF__ARG_TRAITS_SS_)
 #define _CORBA_UNIONDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionDef>
+  class  Arg_Traits<CORBA::UnionDef>
     : public
         Object_Arg_Traits_T<
             CORBA::UnionDef_ptr,
@@ -287,9 +270,9 @@ namespace TAO
 
 #if !defined (_CORBA_ENUMDEF__ARG_TRAITS_SS_)
 #define _CORBA_ENUMDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumDef>
+  class  Arg_Traits<CORBA::EnumDef>
     : public
         Object_Arg_Traits_T<
             CORBA::EnumDef_ptr,
@@ -304,9 +287,9 @@ namespace TAO
 
 #if !defined (_CORBA_ALIASDEF__ARG_TRAITS_SS_)
 #define _CORBA_ALIASDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AliasDef>
+  class  Arg_Traits<CORBA::AliasDef>
     : public
         Object_Arg_Traits_T<
             CORBA::AliasDef_ptr,
@@ -321,9 +304,9 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDef>
+  class  Arg_Traits<CORBA::InterfaceDef>
     : public
         Object_Arg_Traits_T<
             CORBA::InterfaceDef_ptr,
@@ -335,15 +318,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
+  class  Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
@@ -357,9 +340,9 @@ namespace TAO
 
 #if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_SS_)
 #define _CORBA_EXCEPTIONDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDef>
+  class  Arg_Traits<CORBA::ExceptionDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ExceptionDef_ptr,
@@ -374,9 +357,9 @@ namespace TAO
 
 #if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_SS_)
 #define _CORBA_NATIVEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::NativeDef>
+  class  Arg_Traits<CORBA::NativeDef>
     : public
         Object_Arg_Traits_T<
             CORBA::NativeDef_ptr,
@@ -391,9 +374,9 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDef>
+  class  Arg_Traits<CORBA::ValueDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ValueDef_ptr,
@@ -405,15 +388,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
+  class  Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
@@ -427,9 +410,9 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_SS_)
 #define _CORBA_VALUEBOXDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueBoxDef>
+  class  Arg_Traits<CORBA::ValueBoxDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ValueBoxDef_ptr,
@@ -444,9 +427,9 @@ namespace TAO
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_SS_)
 #define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AbstractInterfaceDef>
+  class  Arg_Traits<CORBA::AbstractInterfaceDef>
     : public
         Object_Arg_Traits_T<
             CORBA::AbstractInterfaceDef_ptr,
@@ -458,15 +441,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq>
+  class  Arg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::AbstractInterfaceDefSeq,
@@ -480,9 +463,9 @@ namespace TAO
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_SS_)
 #define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::LocalInterfaceDef>
+  class  Arg_Traits<CORBA::LocalInterfaceDef>
     : public
         Object_Arg_Traits_T<
             CORBA::LocalInterfaceDef_ptr,
@@ -497,9 +480,9 @@ namespace TAO
 
 #if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_SS_)
 #define _CORBA_EXTVALUEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtValueDef>
+  class  Arg_Traits<CORBA::ExtValueDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ExtValueDef_ptr,
@@ -511,15 +494,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINEDSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContainedSeq>
+  class  Arg_Traits<CORBA::ContainedSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContainedSeq,
@@ -530,15 +513,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq>
+  class  Arg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
@@ -549,15 +532,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
+  class  Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
@@ -568,15 +551,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
+  class  Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
@@ -587,15 +570,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq>
+  class  Arg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
@@ -606,15 +589,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq>
+  class  Arg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
@@ -627,8 +610,9 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_IRObject_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -641,7 +625,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_IRObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -741,12 +725,12 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ServerRequestInfo
 {
@@ -757,52 +741,52 @@ public:
       POA_CORBA::IRObject *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::DefinitionKind result);
 
 private:
   TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
       const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &
     );
-
+  
 private:
   POA_CORBA::IRObject *_tao_impl;
-
+  
   ::CORBA::DefinitionKind _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_ServerRequest &_tao_server_request,
@@ -824,7 +808,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -838,11 +822,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -853,11 +837,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -881,7 +865,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (::CORBA::DefinitionKind result)
 {
   // Update the result.
@@ -889,7 +873,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (::CORBA::DefinitionKi
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_IRObject_destroy : public TAO_ServerRequestInfo
 {
@@ -900,49 +884,49 @@ public:
       POA_CORBA::IRObject *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_IRObject_destroy (
       const TAO_ServerRequestInfo_CORBA_IRObject_destroy &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_IRObject_destroy &
     );
-
+  
 private:
   POA_CORBA::IRObject *_tao_impl;
-
+  
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
     TAO_ServerRequest &_tao_server_request,
@@ -964,7 +948,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -978,11 +962,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -993,7 +977,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -1024,7 +1008,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker *
@@ -1032,7 +1016,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::the_TAO_IRObject_Strategized_
 {
   static POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -1054,7 +1038,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
@@ -1074,10 +1058,10 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::dispatch (
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-
+  
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-
+  
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -1087,29 +1071,29 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::dispatch (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-
+  
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-
+  
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
-
+  
   ACE_TRY
     {
       collocated_skel (servant,
@@ -1141,7 +1125,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1162,8 +1146,8 @@ CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer
         )
     );
@@ -1174,7 +1158,7 @@ CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_TAO_IRObject_ThruPOA_Proxy_Impl (void)
 {}
@@ -1182,7 +1166,7 @@ POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_TAO_IRObject_ThruPOA_Proxy_Impl (v
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
@@ -1195,9 +1179,9 @@ POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::DefinitionKind>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::IRObject_ptr,
+  ((TAO::Arg_Traits< CORBA::DefinitionKind>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::IRObject_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/IRObject:1.0"
           )
@@ -1208,7 +1192,7 @@ POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
@@ -1221,8 +1205,8 @@ POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::IRObject_ptr,
+  reinterpret_cast<
+      POA_CORBA::IRObject_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/IRObject:1.0"
         )
@@ -1237,7 +1221,7 @@ POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::IRObject::IRObject (void)
 {
@@ -1255,7 +1239,7 @@ POA_CORBA::IRObject::~IRObject (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::IRObject::_get_def_kind_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1265,16 +1249,16 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
   )
 {
   POA_CORBA::IRObject *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::IRObject *,
+    static_cast<
+        POA_CORBA::IRObject *> (
         _tao_servant
       );
   ::CORBA::DefinitionKind _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1366,23 +1350,30 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::IRObject::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1392,8 +1383,8 @@ void POA_CORBA::IRObject::destroy_skel (
   )
 {
   POA_CORBA::IRObject *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::IRObject *,
+    static_cast<
+        POA_CORBA::IRObject *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
@@ -1401,8 +1392,8 @@ void POA_CORBA::IRObject::destroy_skel (
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1498,7 +1489,7 @@ void POA_CORBA::IRObject::destroy_skel (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::IRObject::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -1650,13 +1641,13 @@ void* POA_CORBA::IRObject::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -1668,7 +1659,7 @@ const char* POA_CORBA::IRObject::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::IRObject::_dispatch (
     TAO_ServerRequest &req,
@@ -1683,7 +1674,7 @@ void POA_CORBA::IRObject::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::IRObject *
 POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1723,7 +1714,7 @@ POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_Contained_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1736,7 +1727,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Contained_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1867,12 +1858,12 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_Contained_Perfect_Hash_OpTable tao_CORBA_Contained_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_id_get : public TAO_ServerRequestInfo
 {
@@ -1928,7 +1919,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contained_id_get (
     TAO_ServerRequest &_tao_server_request,
@@ -2015,7 +2006,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::result (char * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_id_set : public TAO_ServerRequestInfo
 {
@@ -2070,7 +2061,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contained_id_set (
     TAO_ServerRequest &_tao_server_request,
@@ -2156,7 +2147,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestInfo
 {
@@ -2212,7 +2203,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Contained_name_get (
     TAO_ServerRequest &_tao_server_request,
@@ -2299,7 +2290,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::result (char * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_name_set : public TAO_ServerRequestInfo
 {
@@ -2354,7 +2345,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Contained_name_set (
     TAO_ServerRequest &_tao_server_request,
@@ -2440,7 +2431,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerRequestInfo
 {
@@ -2496,7 +2487,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_Contained_version_get (
     TAO_ServerRequest &_tao_server_request,
@@ -2583,7 +2574,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::result (char * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_version_set : public TAO_ServerRequestInfo
 {
@@ -2638,7 +2629,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_Contained_version_set (
     TAO_ServerRequest &_tao_server_request,
@@ -2724,7 +2715,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRequestInfo
 {
@@ -2780,7 +2771,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (
     TAO_ServerRequest &_tao_server_request,
@@ -2867,7 +2858,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (::CORBA::Container
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get : public TAO_ServerRequestInfo
 {
@@ -2923,7 +2914,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_ServerRequest &_tao_server_request,
@@ -3010,7 +3001,7 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (char * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get : public TAO_ServerRequestInfo
 {
@@ -3066,7 +3057,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_ServerRequest &_tao_server_request,
@@ -3153,7 +3144,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (::CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_describe : public TAO_ServerRequestInfo
 {
@@ -3209,7 +3200,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Contained_describe (
     TAO_ServerRequest &_tao_server_request,
@@ -3296,7 +3287,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::result (::CORBA::Contained::Desc
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Contained_move : public TAO_ServerRequestInfo
 {
@@ -3305,7 +3296,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl,
-      CORBA::Container_ptr new_container,
+      ::CORBA::Container_ptr new_container,
       const char * new_name,
       const char * new_version
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3349,19 +3340,19 @@ private:
 private:
   POA_CORBA::Contained *_tao_impl;
   
-  CORBA::Container_ptr new_container_;
+  ::CORBA::Container_ptr new_container_;
   const char * new_name_;
   const char * new_version_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Contained_move (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl,
-    CORBA::Container_ptr new_container,
+    ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3459,7 +3450,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker *
@@ -3542,7 +3533,7 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -3576,7 +3567,7 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3597,8 +3588,8 @@ CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer
         )
     );
@@ -3609,7 +3600,7 @@ CORBA__TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_TAO_Contained_ThruPOA_Proxy_Impl (void)
 {}
@@ -3617,7 +3608,7 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_TAO_Contained_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
@@ -3630,9 +3621,9 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::RepositoryId>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Contained_ptr,
+  ((TAO::Arg_Traits< CORBA::RepositoryId>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Contained_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Contained:1.0"
           )
@@ -3643,7 +3634,7 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
@@ -3656,20 +3647,20 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+  reinterpret_cast<
+      POA_CORBA::Contained_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
-        ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
@@ -3682,9 +3673,9 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Identifier>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Contained_ptr,
+  ((TAO::Arg_Traits< CORBA::Identifier>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Contained_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Contained:1.0"
           )
@@ -3695,7 +3686,7 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
@@ -3708,20 +3699,20 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+  reinterpret_cast<
+      POA_CORBA::Contained_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
-        ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
@@ -3734,9 +3725,9 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::VersionSpec>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Contained_ptr,
+  ((TAO::Arg_Traits< CORBA::VersionSpec>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Contained_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Contained:1.0"
           )
@@ -3747,7 +3738,7 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
@@ -3760,20 +3751,20 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+  reinterpret_cast<
+      POA_CORBA::Contained_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
-        ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
@@ -3786,9 +3777,9 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Container>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Contained_ptr,
+  ((TAO::Arg_Traits< CORBA::Container>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Contained_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Contained:1.0"
           )
@@ -3799,7 +3790,7 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
@@ -3812,9 +3803,9 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ScopedName>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Contained_ptr,
+  ((TAO::Arg_Traits< CORBA::ScopedName>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Contained_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Contained:1.0"
           )
@@ -3825,7 +3816,7 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
@@ -3838,9 +3829,9 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Repository>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Contained_ptr,
+  ((TAO::Arg_Traits< CORBA::Repository>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Contained_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Contained:1.0"
           )
@@ -3851,7 +3842,7 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
@@ -3864,9 +3855,9 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Contained::Description>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Contained_ptr,
+  ((TAO::Arg_Traits< CORBA::Contained::Description>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Contained_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Contained:1.0"
           )
@@ -3877,7 +3868,7 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
@@ -3890,15 +3881,15 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+  reinterpret_cast<
+      POA_CORBA::Contained_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->move (
-        ((TAO::Arg_Traits<CORBA::Container>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-        ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg ()
+        ((TAO::Arg_Traits< CORBA::Container>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+        ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -3909,7 +3900,7 @@ POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::Contained::Contained (void)
 {
@@ -3928,7 +3919,7 @@ POA_CORBA::Contained::~Contained (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::_get_id_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3938,16 +3929,16 @@ void POA_CORBA::Contained::_get_id_skel (
   )
 {
   POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   CORBA::String_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4040,23 +4031,30 @@ void POA_CORBA::Contained::_get_id_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::_set_id_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4065,15 +4063,15 @@ void POA_CORBA::Contained::_set_id_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Contained *_tao_impl =
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::String_var id;
+  ::CORBA::String_var id;
   
   if (!(
       (_tao_in >> id.out ())
@@ -4085,8 +4083,8 @@ POA_CORBA::Contained *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4185,7 +4183,7 @@ POA_CORBA::Contained *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::_get_name_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4195,16 +4193,16 @@ void POA_CORBA::Contained::_get_name_skel (
   )
 {
   POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   CORBA::String_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4297,23 +4295,30 @@ void POA_CORBA::Contained::_get_name_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::_set_name_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4322,15 +4327,15 @@ void POA_CORBA::Contained::_set_name_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Contained *_tao_impl =
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::String_var name;
+  ::CORBA::String_var name;
   
   if (!(
       (_tao_in >> name.out ())
@@ -4342,8 +4347,8 @@ POA_CORBA::Contained *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4442,7 +4447,7 @@ POA_CORBA::Contained *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::_get_version_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4452,16 +4457,16 @@ void POA_CORBA::Contained::_get_version_skel (
   )
 {
   POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   CORBA::String_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4554,23 +4559,30 @@ void POA_CORBA::Contained::_get_version_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::_set_version_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4579,15 +4591,15 @@ void POA_CORBA::Contained::_set_version_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Contained *_tao_impl =
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::String_var version;
+  ::CORBA::String_var version;
   
   if (!(
       (_tao_in >> version.out ())
@@ -4599,8 +4611,8 @@ POA_CORBA::Contained *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4699,7 +4711,7 @@ POA_CORBA::Contained *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::_get_defined_in_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4709,16 +4721,16 @@ void POA_CORBA::Contained::_get_defined_in_skel (
   )
 {
   POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   ::CORBA::Container_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4811,23 +4823,30 @@ void POA_CORBA::Contained::_get_defined_in_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::_get_absolute_name_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4837,16 +4856,16 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
   )
 {
   POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   CORBA::String_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4939,23 +4958,30 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::_get_containing_repository_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4965,16 +4991,16 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
   )
 {
   POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   ::CORBA::Repository_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5067,23 +5093,30 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::describe_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -5093,16 +5126,16 @@ void POA_CORBA::Contained::describe_skel (
   )
 {
   POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   ::CORBA::Contained::Description_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5195,23 +5228,30 @@ void POA_CORBA::Contained::describe_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Contained::move_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -5220,17 +5260,17 @@ void POA_CORBA::Contained::move_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Contained *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Contained *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Contained *_tao_impl =
+    static_cast<
+        POA_CORBA::Contained *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::Container_var new_container;
-  CORBA::String_var new_name;
-  CORBA::String_var new_version;
+  ::CORBA::Container_var new_container;
+  ::CORBA::String_var new_name;
+  ::CORBA::String_var new_version;
   
   if (!(
       (_tao_in >> new_container.out ()) &&
@@ -5244,8 +5284,8 @@ POA_CORBA::Contained *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5352,7 +5392,7 @@ POA_CORBA::Contained *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::Contained::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -5508,19 +5548,19 @@ void* POA_CORBA::Contained::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -5532,7 +5572,7 @@ const char* POA_CORBA::Contained::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::Contained::_dispatch (
     TAO_ServerRequest &req,
@@ -5547,7 +5587,7 @@ void POA_CORBA::Contained::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::Contained *
 POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -5587,7 +5627,7 @@ POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_Container_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -5600,7 +5640,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -5738,12 +5778,12 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_Container_Perfect_Hash_OpTable tao_CORBA_Container_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_lookup : public TAO_ServerRequestInfo
 {
@@ -5801,7 +5841,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Container_lookup (
     TAO_ServerRequest &_tao_server_request,
@@ -5898,7 +5938,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::result (::CORBA::Contained_ptr res
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_contents : public TAO_ServerRequestInfo
 {
@@ -5907,8 +5947,8 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
-      CORBA::DefinitionKind & limit_type,
-      const CORBA::Boolean & exclude_inherited
+      ::CORBA::DefinitionKind & limit_type,
+      const ::CORBA::Boolean & exclude_inherited
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -5952,20 +5992,20 @@ private:
 private:
   POA_CORBA::Container *_tao_impl;
   
-  const CORBA::DefinitionKind & limit_type_;
-  const CORBA::Boolean & exclude_inherited_;
+  const ::CORBA::DefinitionKind & limit_type_;
+  const ::CORBA::Boolean & exclude_inherited_;
   ::CORBA::ContainedSeq * _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Container_contents (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
-    CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited
+    ::CORBA::DefinitionKind & limit_type,
+    const ::CORBA::Boolean & exclude_inherited
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6061,7 +6101,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::result (::CORBA::ContainedSeq *
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_lookup_name : public TAO_ServerRequestInfo
 {
@@ -6071,9 +6111,9 @@ public:
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * search_name,
-      const CORBA::Long & levels_to_search,
-      CORBA::DefinitionKind & limit_type,
-      const CORBA::Boolean & exclude_inherited
+      const ::CORBA::Long & levels_to_search,
+      ::CORBA::DefinitionKind & limit_type,
+      const ::CORBA::Boolean & exclude_inherited
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -6118,23 +6158,23 @@ private:
   POA_CORBA::Container *_tao_impl;
   
   const char * search_name_;
-  const CORBA::Long & levels_to_search_;
-  const CORBA::DefinitionKind & limit_type_;
-  const CORBA::Boolean & exclude_inherited_;
+  const ::CORBA::Long & levels_to_search_;
+  const ::CORBA::DefinitionKind & limit_type_;
+  const ::CORBA::Boolean & exclude_inherited_;
   ::CORBA::ContainedSeq * _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_Container_lookup_name (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * search_name,
-    const CORBA::Long & levels_to_search,
-    CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited
+    const ::CORBA::Long & levels_to_search,
+    ::CORBA::DefinitionKind & limit_type,
+    const ::CORBA::Boolean & exclude_inherited
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6240,7 +6280,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (::CORBA::ContainedSeq
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_describe_contents : public TAO_ServerRequestInfo
 {
@@ -6249,9 +6289,9 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
-      CORBA::DefinitionKind & limit_type,
-      const CORBA::Boolean & exclude_inherited,
-      const CORBA::Long & max_returned_objs
+      ::CORBA::DefinitionKind & limit_type,
+      const ::CORBA::Boolean & exclude_inherited,
+      const ::CORBA::Long & max_returned_objs
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -6295,22 +6335,22 @@ private:
 private:
   POA_CORBA::Container *_tao_impl;
   
-  const CORBA::DefinitionKind & limit_type_;
-  const CORBA::Boolean & exclude_inherited_;
-  const CORBA::Long & max_returned_objs_;
+  const ::CORBA::DefinitionKind & limit_type_;
+  const ::CORBA::Boolean & exclude_inherited_;
+  const ::CORBA::Long & max_returned_objs_;
   ::CORBA::Container::DescriptionSeq * _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_CORBA_Container_describe_contents (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
-    CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    const CORBA::Long & max_returned_objs
+    ::CORBA::DefinitionKind & limit_type,
+    const ::CORBA::Boolean & exclude_inherited,
+    const ::CORBA::Long & max_returned_objs
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6411,7 +6451,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (::CORBA::Contai
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_module : public TAO_ServerRequestInfo
 {
@@ -6473,7 +6513,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA_Container_create_module (
     TAO_ServerRequest &_tao_server_request,
@@ -6582,7 +6622,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::result (::CORBA::ModuleDef_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_constant : public TAO_ServerRequestInfo
 {
@@ -6594,8 +6634,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
-      const CORBA::Any & value
+      ::CORBA::IDLType_ptr type,
+      const ::CORBA::Any & value
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -6642,13 +6682,13 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
-  const CORBA::Any & value_;
+  ::CORBA::IDLType_ptr type_;
+  const ::CORBA::Any & value_;
   ::CORBA::ConstantDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_CORBA_Container_create_constant (
     TAO_ServerRequest &_tao_server_request,
@@ -6657,8 +6697,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
+    ::CORBA::IDLType_ptr type,
+    const ::CORBA::Any & value
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6769,7 +6809,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::result (::CORBA::Constant
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_struct : public TAO_ServerRequestInfo
 {
@@ -6781,7 +6821,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members
+      const ::CORBA::StructMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -6828,12 +6868,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::StructMemberSeq & members_;
+  const ::CORBA::StructMemberSeq & members_;
   ::CORBA::StructDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA_Container_create_struct (
     TAO_ServerRequest &_tao_server_request,
@@ -6842,7 +6882,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members
+    const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6948,7 +6988,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::result (::CORBA::StructDef_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_union : public TAO_ServerRequestInfo
 {
@@ -6960,8 +7000,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members
+      ::CORBA::IDLType_ptr discriminator_type,
+      const ::CORBA::UnionMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -7008,13 +7048,13 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr discriminator_type_;
-  const CORBA::UnionMemberSeq & members_;
+  ::CORBA::IDLType_ptr discriminator_type_;
+  const ::CORBA::UnionMemberSeq & members_;
   ::CORBA::UnionDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_Container_create_union (
     TAO_ServerRequest &_tao_server_request,
@@ -7023,8 +7063,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
+    ::CORBA::IDLType_ptr discriminator_type,
+    const ::CORBA::UnionMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -7135,7 +7175,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::result (::CORBA::UnionDef_pt
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_enum : public TAO_ServerRequestInfo
 {
@@ -7147,7 +7187,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members
+      const ::CORBA::EnumMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -7194,12 +7234,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::EnumMemberSeq & members_;
+  const ::CORBA::EnumMemberSeq & members_;
   ::CORBA::EnumDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_Container_create_enum (
     TAO_ServerRequest &_tao_server_request,
@@ -7208,7 +7248,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members
+    const ::CORBA::EnumMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -7314,7 +7354,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::result (::CORBA::EnumDef_ptr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_alias : public TAO_ServerRequestInfo
 {
@@ -7326,7 +7366,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type
+      ::CORBA::IDLType_ptr original_type
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -7373,12 +7413,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr original_type_;
+  ::CORBA::IDLType_ptr original_type_;
   ::CORBA::AliasDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_Container_create_alias (
     TAO_ServerRequest &_tao_server_request,
@@ -7387,7 +7427,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type
+    ::CORBA::IDLType_ptr original_type
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -7493,7 +7533,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::result (::CORBA::AliasDef_pt
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_interface : public TAO_ServerRequestInfo
 {
@@ -7505,7 +7545,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces
+      const ::CORBA::InterfaceDefSeq & base_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -7552,12 +7592,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::InterfaceDefSeq & base_interfaces_;
+  const ::CORBA::InterfaceDefSeq & base_interfaces_;
   ::CORBA::InterfaceDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CORBA_Container_create_interface (
     TAO_ServerRequest &_tao_server_request,
@@ -7566,7 +7606,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
+    const ::CORBA::InterfaceDefSeq & base_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -7672,7 +7712,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::result (::CORBA::Interfa
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_value : public TAO_ServerRequestInfo
 {
@@ -7684,13 +7724,13 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::Boolean & is_custom,
-      const CORBA::Boolean & is_abstract,
-      CORBA::ValueDef_ptr base_value,
-      const CORBA::Boolean & is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers
+      const ::CORBA::Boolean & is_custom,
+      const ::CORBA::Boolean & is_abstract,
+      ::CORBA::ValueDef_ptr base_value,
+      const ::CORBA::Boolean & is_truncatable,
+      const ::CORBA::ValueDefSeq & abstract_base_values,
+      const ::CORBA::InterfaceDefSeq & supported_interfaces,
+      const ::CORBA::InitializerSeq & initializers
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -7737,18 +7777,18 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::Boolean & is_custom_;
-  const CORBA::Boolean & is_abstract_;
-  CORBA::ValueDef_ptr base_value_;
-  const CORBA::Boolean & is_truncatable_;
-  const CORBA::ValueDefSeq & abstract_base_values_;
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
-  const CORBA::InitializerSeq & initializers_;
+  const ::CORBA::Boolean & is_custom_;
+  const ::CORBA::Boolean & is_abstract_;
+  ::CORBA::ValueDef_ptr base_value_;
+  const ::CORBA::Boolean & is_truncatable_;
+  const ::CORBA::ValueDefSeq & abstract_base_values_;
+  const ::CORBA::InterfaceDefSeq & supported_interfaces_;
+  const ::CORBA::InitializerSeq & initializers_;
   ::CORBA::ValueDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_Container_create_value (
     TAO_ServerRequest &_tao_server_request,
@@ -7757,13 +7797,13 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::Boolean & is_custom,
-    const CORBA::Boolean & is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    const CORBA::Boolean & is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
+    const ::CORBA::Boolean & is_custom,
+    const ::CORBA::Boolean & is_abstract,
+    ::CORBA::ValueDef_ptr base_value,
+    const ::CORBA::Boolean & is_truncatable,
+    const ::CORBA::ValueDefSeq & abstract_base_values,
+    const ::CORBA::InterfaceDefSeq & supported_interfaces,
+    const ::CORBA::InitializerSeq & initializers
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -7899,7 +7939,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::result (::CORBA::ValueDef_pt
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_value_box : public TAO_ServerRequestInfo
 {
@@ -7911,7 +7951,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def
+      ::CORBA::IDLType_ptr original_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -7958,12 +7998,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr original_type_def_;
+  ::CORBA::IDLType_ptr original_type_def_;
   ::CORBA::ValueBoxDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CORBA_Container_create_value_box (
     TAO_ServerRequest &_tao_server_request,
@@ -7972,7 +8012,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def
+    ::CORBA::IDLType_ptr original_type_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -8078,7 +8118,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (::CORBA::ValueBo
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_exception : public TAO_ServerRequestInfo
 {
@@ -8090,7 +8130,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members
+      const ::CORBA::StructMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -8137,12 +8177,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::StructMemberSeq & members_;
+  const ::CORBA::StructMemberSeq & members_;
   ::CORBA::ExceptionDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CORBA_Container_create_exception (
     TAO_ServerRequest &_tao_server_request,
@@ -8151,7 +8191,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members
+    const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -8257,7 +8297,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::result (::CORBA::Excepti
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_native : public TAO_ServerRequestInfo
 {
@@ -8319,7 +8359,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA_Container_create_native (
     TAO_ServerRequest &_tao_server_request,
@@ -8428,7 +8468,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::result (::CORBA::NativeDef_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface : public TAO_ServerRequestInfo
 {
@@ -8440,7 +8480,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces
+      const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -8487,12 +8527,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::AbstractInterfaceDefSeq & base_interfaces_;
+  const ::CORBA::AbstractInterfaceDefSeq & base_interfaces_;
   ::CORBA::AbstractInterfaceDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface (
     TAO_ServerRequest &_tao_server_request,
@@ -8501,7 +8541,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
+    const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -8607,7 +8647,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (::CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_local_interface : public TAO_ServerRequestInfo
 {
@@ -8619,7 +8659,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces
+      const ::CORBA::InterfaceDefSeq & base_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -8666,12 +8706,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::InterfaceDefSeq & base_interfaces_;
+  const ::CORBA::InterfaceDefSeq & base_interfaces_;
   ::CORBA::LocalInterfaceDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestInfo_CORBA_Container_create_local_interface (
     TAO_ServerRequest &_tao_server_request,
@@ -8680,7 +8720,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
+    const ::CORBA::InterfaceDefSeq & base_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -8786,7 +8826,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (::CORBA::L
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Container_create_ext_value : public TAO_ServerRequestInfo
 {
@@ -8798,13 +8838,13 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::Boolean & is_custom,
-      const CORBA::Boolean & is_abstract,
-      CORBA::ValueDef_ptr base_value,
-      const CORBA::Boolean & is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::ExtInitializerSeq & initializers
+      const ::CORBA::Boolean & is_custom,
+      const ::CORBA::Boolean & is_abstract,
+      ::CORBA::ValueDef_ptr base_value,
+      const ::CORBA::Boolean & is_truncatable,
+      const ::CORBA::ValueDefSeq & abstract_base_values,
+      const ::CORBA::InterfaceDefSeq & supported_interfaces,
+      const ::CORBA::ExtInitializerSeq & initializers
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -8851,18 +8891,18 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::Boolean & is_custom_;
-  const CORBA::Boolean & is_abstract_;
-  CORBA::ValueDef_ptr base_value_;
-  const CORBA::Boolean & is_truncatable_;
-  const CORBA::ValueDefSeq & abstract_base_values_;
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
-  const CORBA::ExtInitializerSeq & initializers_;
+  const ::CORBA::Boolean & is_custom_;
+  const ::CORBA::Boolean & is_abstract_;
+  ::CORBA::ValueDef_ptr base_value_;
+  const ::CORBA::Boolean & is_truncatable_;
+  const ::CORBA::ValueDefSeq & abstract_base_values_;
+  const ::CORBA::InterfaceDefSeq & supported_interfaces_;
+  const ::CORBA::ExtInitializerSeq & initializers_;
   ::CORBA::ExtValueDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Container_create_ext_value::TAO_ServerRequestInfo_CORBA_Container_create_ext_value (
     TAO_ServerRequest &_tao_server_request,
@@ -8871,13 +8911,13 @@ TAO_ServerRequestInfo_CORBA_Container_create_ext_value::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::Boolean & is_custom,
-    const CORBA::Boolean & is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    const CORBA::Boolean & is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
+    const ::CORBA::Boolean & is_custom,
+    const ::CORBA::Boolean & is_abstract,
+    ::CORBA::ValueDef_ptr base_value,
+    const ::CORBA::Boolean & is_truncatable,
+    const ::CORBA::ValueDefSeq & abstract_base_values,
+    const ::CORBA::InterfaceDefSeq & supported_interfaces,
+    const ::CORBA::ExtInitializerSeq & initializers
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -9019,7 +9059,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_ext_value::result (::CORBA::ExtValu
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_Container_Strategized_Proxy_Broker *
@@ -9102,7 +9142,7 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -9136,7 +9176,7 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -9157,8 +9197,8 @@ CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_Container_Proxy_Broker_Factory_Initializer
         )
     );
@@ -9169,7 +9209,7 @@ CORBA__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::_TAO_Container_ThruPOA_Proxy_Impl (void)
 {}
@@ -9177,7 +9217,7 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::_TAO_Container_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
@@ -9190,21 +9230,21 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Contained>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::Contained>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->lookup (
-          ((TAO::Arg_Traits<CORBA::ScopedName>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< CORBA::ScopedName>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
@@ -9217,22 +9257,22 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ContainedSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->contents (
-          ((TAO::Arg_Traits<CORBA::DefinitionKind>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
+          ((TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
@@ -9245,24 +9285,24 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ContainedSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->lookup_name (
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Long>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::DefinitionKind>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< ::CORBA::Long>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
@@ -9275,23 +9315,23 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Container::DescriptionSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::Container::DescriptionSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->describe_contents (
-          ((TAO::Arg_Traits<CORBA::DefinitionKind>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::Long>::in_arg_val *) args[3])->arg ()
+          ((TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< ::CORBA::Long>::in_arg_val *) args[3])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
@@ -9304,23 +9344,23 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ModuleDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ModuleDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_module (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
@@ -9333,25 +9373,25 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ConstantDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ConstantDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_constant (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::Any>::in_arg_val *) args[5])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< ::CORBA::Any>::in_arg_val *) args[5])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
@@ -9364,24 +9404,24 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::StructDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::StructDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_struct (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::StructMemberSeq>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
@@ -9394,25 +9434,25 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::UnionDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::UnionDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_union (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::UnionMemberSeq>::in_arg_val *) args[5])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val *) args[5])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
@@ -9425,24 +9465,24 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::EnumDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::EnumDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_enum (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::EnumMemberSeq>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
@@ -9455,24 +9495,24 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::AliasDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::AliasDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_alias (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
@@ -9485,24 +9525,24 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InterfaceDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_interface (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
@@ -9515,30 +9555,30 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ValueDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ValueDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_value (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[5])->arg (),
-          ((TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val *) args[6])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[7])->arg (),
-          ((TAO::Arg_Traits<CORBA::ValueDefSeq>::in_arg_val *) args[8])->arg (),
-          ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[9])->arg (),
-          ((TAO::Arg_Traits<CORBA::InitializerSeq>::in_arg_val *) args[10])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[5])->arg (),
+          ((TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val *) args[6])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[7])->arg (),
+          ((TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val *) args[8])->arg (),
+          ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[9])->arg (),
+          ((TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val *) args[10])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
@@ -9551,24 +9591,24 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ValueBoxDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ValueBoxDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_value_box (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
@@ -9581,24 +9621,24 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExceptionDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ExceptionDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_exception (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::StructMemberSeq>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
@@ -9611,23 +9651,23 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::NativeDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::NativeDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_native (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
@@ -9640,24 +9680,24 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::AbstractInterfaceDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::AbstractInterfaceDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_abstract_interface (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::AbstractInterfaceDefSeq>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
@@ -9670,24 +9710,24 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::LocalInterfaceDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::LocalInterfaceDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_local_interface (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
@@ -9700,23 +9740,23 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExtValueDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ExtValueDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Container:1.0"
           )
       )->create_ext_value (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[5])->arg (),
-          ((TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val *) args[6])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[7])->arg (),
-          ((TAO::Arg_Traits<CORBA::ValueDefSeq>::in_arg_val *) args[8])->arg (),
-          ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[9])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExtInitializerSeq>::in_arg_val *) args[10])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[5])->arg (),
+          ((TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val *) args[6])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[7])->arg (),
+          ((TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val *) args[8])->arg (),
+          ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[9])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val *) args[10])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -9727,7 +9767,7 @@ POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::Container::Container (void)
 {
@@ -9746,7 +9786,7 @@ POA_CORBA::Container::~Container (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::lookup_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9755,14 +9795,14 @@ void POA_CORBA::Container::lookup_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::Contained_var _tao_retval;
-  CORBA::String_var search_name;
+  ::CORBA::String_var search_name;
   
   if (!(
       (_tao_in >> search_name.out ())
@@ -9774,8 +9814,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9871,23 +9911,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::contents_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9896,15 +9943,15 @@ void POA_CORBA::Container::contents_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::ContainedSeq_var _tao_retval;
-  CORBA::DefinitionKind limit_type;
-  CORBA::Boolean exclude_inherited;
+  ::CORBA::DefinitionKind limit_type;
+  ::CORBA::Boolean exclude_inherited;
   
   if (!(
       (_tao_in >> limit_type) &&
@@ -9917,8 +9964,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10018,23 +10065,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::lookup_name_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10043,17 +10097,17 @@ void POA_CORBA::Container::lookup_name_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::ContainedSeq_var _tao_retval;
-  CORBA::String_var search_name;
-  CORBA::Long levels_to_search;
-  CORBA::DefinitionKind limit_type;
-  CORBA::Boolean exclude_inherited;
+  ::CORBA::String_var search_name;
+  ::CORBA::Long levels_to_search;
+  ::CORBA::DefinitionKind limit_type;
+  ::CORBA::Boolean exclude_inherited;
   
   if (!(
       (_tao_in >> search_name.out ()) &&
@@ -10068,8 +10122,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10177,23 +10231,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::describe_contents_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10202,16 +10263,16 @@ void POA_CORBA::Container::describe_contents_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::Container::DescriptionSeq_var _tao_retval;
-  CORBA::DefinitionKind limit_type;
-  CORBA::Boolean exclude_inherited;
-  CORBA::Long max_returned_objs;
+  ::CORBA::DefinitionKind limit_type;
+  ::CORBA::Boolean exclude_inherited;
+  ::CORBA::Long max_returned_objs;
   
   if (!(
       (_tao_in >> limit_type) &&
@@ -10225,8 +10286,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10330,23 +10391,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_module_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10355,16 +10423,16 @@ void POA_CORBA::Container::create_module_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::ModuleDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -10378,8 +10446,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10483,23 +10551,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_constant_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10508,18 +10583,18 @@ void POA_CORBA::Container::create_constant_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::ConstantDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var type;
-  CORBA::Any value;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var type;
+  ::CORBA::Any value;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -10535,8 +10610,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10648,23 +10723,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_struct_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10673,17 +10755,17 @@ void POA_CORBA::Container::create_struct_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::StructDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::StructMemberSeq members;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::StructMemberSeq members;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -10698,8 +10780,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10807,23 +10889,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_union_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10832,18 +10921,18 @@ void POA_CORBA::Container::create_union_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::UnionDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var discriminator_type;
-  CORBA::UnionMemberSeq members;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var discriminator_type;
+  ::CORBA::UnionMemberSeq members;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -10859,8 +10948,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10972,23 +11061,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_enum_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10997,17 +11093,17 @@ void POA_CORBA::Container::create_enum_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::EnumDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::EnumMemberSeq members;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::EnumMemberSeq members;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -11022,8 +11118,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11131,23 +11227,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_alias_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -11156,17 +11259,17 @@ void POA_CORBA::Container::create_alias_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::AliasDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var original_type;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var original_type;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -11181,8 +11284,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11290,23 +11393,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_interface_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -11315,17 +11425,17 @@ void POA_CORBA::Container::create_interface_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::InterfaceDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::InterfaceDefSeq base_interfaces;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::InterfaceDefSeq base_interfaces;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -11340,8 +11450,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11449,23 +11559,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_value_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -11474,23 +11591,23 @@ void POA_CORBA::Container::create_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::ValueDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::Boolean is_custom;
-  CORBA::Boolean is_abstract;
-  CORBA::ValueDef_var base_value;
-  CORBA::Boolean is_truncatable;
-  CORBA::ValueDefSeq abstract_base_values;
-  CORBA::InterfaceDefSeq supported_interfaces;
-  CORBA::InitializerSeq initializers;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::Boolean is_custom;
+  ::CORBA::Boolean is_abstract;
+  ::CORBA::ValueDef_var base_value;
+  ::CORBA::Boolean is_truncatable;
+  ::CORBA::ValueDefSeq abstract_base_values;
+  ::CORBA::InterfaceDefSeq supported_interfaces;
+  ::CORBA::InitializerSeq initializers;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -11511,8 +11628,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11644,23 +11761,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_value_box_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -11669,17 +11793,17 @@ void POA_CORBA::Container::create_value_box_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::ValueBoxDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var original_type_def;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var original_type_def;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -11694,8 +11818,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11803,23 +11927,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_exception_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -11828,17 +11959,17 @@ void POA_CORBA::Container::create_exception_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::ExceptionDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::StructMemberSeq members;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::StructMemberSeq members;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -11853,8 +11984,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11962,23 +12093,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_native_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -11987,16 +12125,16 @@ void POA_CORBA::Container::create_native_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::NativeDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -12010,8 +12148,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12115,23 +12253,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_abstract_interface_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12140,17 +12285,17 @@ void POA_CORBA::Container::create_abstract_interface_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::AbstractInterfaceDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::AbstractInterfaceDefSeq base_interfaces;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::AbstractInterfaceDefSeq base_interfaces;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -12165,8 +12310,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12274,23 +12419,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_local_interface_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12299,17 +12451,17 @@ void POA_CORBA::Container::create_local_interface_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::LocalInterfaceDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::InterfaceDefSeq base_interfaces;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::InterfaceDefSeq base_interfaces;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -12324,8 +12476,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12433,23 +12585,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Container::create_ext_value_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12458,23 +12617,23 @@ void POA_CORBA::Container::create_ext_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::Container *> (
         _tao_servant
       );
   ::CORBA::ExtValueDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::Boolean is_custom;
-  CORBA::Boolean is_abstract;
-  CORBA::ValueDef_var base_value;
-  CORBA::Boolean is_truncatable;
-  CORBA::ValueDefSeq abstract_base_values;
-  CORBA::InterfaceDefSeq supported_interfaces;
-  CORBA::ExtInitializerSeq initializers;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::Boolean is_custom;
+  ::CORBA::Boolean is_abstract;
+  ::CORBA::ValueDef_var base_value;
+  ::CORBA::Boolean is_truncatable;
+  ::CORBA::ValueDefSeq abstract_base_values;
+  ::CORBA::InterfaceDefSeq supported_interfaces;
+  ::CORBA::ExtInitializerSeq initializers;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -12495,8 +12654,8 @@ POA_CORBA::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12628,23 +12787,30 @@ POA_CORBA::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::Container::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -12800,19 +12966,19 @@ void* POA_CORBA::Container::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -12824,7 +12990,7 @@ const char* POA_CORBA::Container::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::Container::_dispatch (
     TAO_ServerRequest &req,
@@ -12839,7 +13005,7 @@ void POA_CORBA::Container::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::Container *
 POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -12879,7 +13045,7 @@ POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_IDLType_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -12892,7 +13058,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_IDLType_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -12992,12 +13158,12 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 static TAO_CORBA_IDLType_Perfect_Hash_OpTable tao_CORBA_IDLType_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_IDLType_type_get : public TAO_ServerRequestInfo
 {
@@ -13053,7 +13219,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLType_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -13146,7 +13312,7 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::TypeCode_ptr result
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker *
@@ -13229,7 +13395,7 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -13263,7 +13429,7 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -13284,8 +13450,8 @@ CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer
         )
     );
@@ -13296,7 +13462,7 @@ CORBA__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_TAO_IDLType_ThruPOA_Proxy_Impl (void)
 {}
@@ -13304,7 +13470,7 @@ POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_TAO_IDLType_ThruPOA_Proxy_Impl (voi
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
@@ -13317,9 +13483,9 @@ POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::IDLType_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::IDLType_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/IDLType:1.0"
           )
@@ -13334,7 +13500,7 @@ POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::IDLType::IDLType (void)
 {
@@ -13353,7 +13519,7 @@ POA_CORBA::IDLType::~IDLType (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::IDLType::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13363,16 +13529,16 @@ void POA_CORBA::IDLType::_get_type_skel (
   )
 {
   POA_CORBA::IDLType *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::IDLType *,
+    static_cast<
+        POA_CORBA::IDLType *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13465,23 +13631,30 @@ void POA_CORBA::IDLType::_get_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::IDLType::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -13637,19 +13810,19 @@ void* POA_CORBA::IDLType::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -13661,7 +13834,7 @@ const char* POA_CORBA::IDLType::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::IDLType::_dispatch (
     TAO_ServerRequest &req,
@@ -13676,7 +13849,7 @@ void POA_CORBA::IDLType::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::IDLType *
 POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -13716,7 +13889,7 @@ POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_TypedefDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -13729,7 +13902,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -13861,7 +14034,7 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -13872,7 +14045,7 @@ static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker *
@@ -13955,7 +14128,7 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -13989,7 +14162,7 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -14010,8 +14183,8 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -14022,7 +14195,7 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_TAO_TypedefDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -14034,7 +14207,7 @@ POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_TAO_TypedefDef_ThruPOA_Proxy_Imp
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::TypedefDef::TypedefDef (void)
 {
@@ -14055,7 +14228,7 @@ POA_CORBA::TypedefDef::~TypedefDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::TypedefDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -14219,31 +14392,31 @@ void* POA_CORBA::TypedefDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
+      return static_cast<POA_CORBA::TypedefDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -14255,7 +14428,7 @@ const char* POA_CORBA::TypedefDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::TypedefDef::_dispatch (
     TAO_ServerRequest &req,
@@ -14270,7 +14443,7 @@ void POA_CORBA::TypedefDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::TypedefDef *
 POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14310,12 +14483,7 @@ POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1739
-
-#if 0 
-/* Useful at a later date.
-At present will be commented out */
-
+// be\be_visitor_root/root.cpp:1683
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -14930,11 +15098,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Basic_SArgument_T< \
-        CORBA::DefinitionKind \
-      >
-
 #if !defined (_CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_
 
@@ -14949,18 +15112,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::Container_ptr, \
-        CORBA::Container_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::Repository_ptr, \
-        CORBA::Repository_var \
-      >
-
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_TMPLINST_SS_
 
@@ -14976,12 +15127,6 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::Contained::Description, \
-        CORBA::Contained::Description_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::Container_ptr \
       >
@@ -15015,28 +15160,10 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::Contained_ptr, \
-        CORBA::Contained_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ContainedSeq, \
-        CORBA::ContainedSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Basic_SArgument_T< \
         CORBA::DefinitionKind \
       >
 
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ContainedSeq, \
-        CORBA::ContainedSeq_var \
-      >
-
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_
 
@@ -15052,85 +15179,31 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::Container::DescriptionSeq, \
-        CORBA::Container::DescriptionSeq_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ModuleDef_ptr, \
-        CORBA::ModuleDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ConstantDef_ptr, \
-        CORBA::ConstantDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::IDLType_ptr \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::StructDef_ptr, \
-        CORBA::StructDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::StructMemberSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::UnionDef_ptr, \
-        CORBA::UnionDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::UnionMemberSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::EnumDef_ptr, \
-        CORBA::EnumDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::EnumMemberSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::AliasDef_ptr, \
-        CORBA::AliasDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::InterfaceDef_ptr, \
-        CORBA::InterfaceDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::InterfaceDefSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ValueDef_ptr, \
-        CORBA::ValueDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::ValueDef_ptr \
       >
@@ -15146,47 +15219,11 @@ At present will be commented out */
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ValueBoxDef_ptr, \
-        CORBA::ValueBoxDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ExceptionDef_ptr, \
-        CORBA::ExceptionDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::NativeDef_ptr, \
-        CORBA::NativeDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::AbstractInterfaceDef_ptr, \
-        CORBA::AbstractInterfaceDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::AbstractInterfaceDefSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::LocalInterfaceDef_ptr, \
-        CORBA::LocalInterfaceDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ExtValueDef_ptr, \
-        CORBA::ExtValueDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::ExtInitializerSeq \
       >
@@ -15528,7 +15565,6 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-#endif /*if 0*/ 
-
 
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
index 4f4e5c79c8a..fd936e5a547 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:390
+// be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_ORIG_IFR_BASES_H_
-#define _TAO_IDL_ORIG_IFR_BASES_H_
+#ifndef _TAO_IDL_SERVER_IFR_BASES_H_
+#define _TAO_IDL_SERVER_IFR_BASES_H_
 
 #include /**/ "ace/pre.h"
 
@@ -44,9 +44,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,14 +53,14 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
   
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class IRObject;
   typedef IRObject *IRObject_ptr;
@@ -135,7 +133,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -152,7 +150,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -174,7 +172,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_IRObject_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -218,2003 +216,2025 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_IRObject_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_IRObject_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) {}
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class Contained;
-typedef Contained *Contained_ptr;
-
-class _TAO_Contained_ThruPOA_Proxy_Impl;
-class _TAO_Contained_Strategized_Proxy_Broker;
-
-class  Contained
-  : public virtual POA_CORBA::IRObject
-{
-protected:
-  Contained (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::Contained _stub_type;
-  typedef ::CORBA::Contained_ptr _stub_ptr_type;
-  typedef ::CORBA::Contained_var _stub_var_type;
-  
-  Contained (const Contained& rhs);
-  virtual ~Contained (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::Contained *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual char * id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_id_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual void id (
-      const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _set_id_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual char * name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_name_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual void name (
-      const char * name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _set_name_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual char * version (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_version_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual void version (
-      const char * version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _set_version_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Container_ptr defined_in (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_defined_in_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual char * absolute_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_absolute_name_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Repository_ptr containing_repository (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_containing_repository_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Contained::Description * describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void describe_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual void move (
-      CORBA::Container_ptr new_container,
-      const char * new_name,
-      const char * new_version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void move_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class  _TAO_Contained_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_Contained_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_Contained_Strategized_Proxy_Broker *
-  the_TAO_Contained_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class  _TAO_Contained_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_Contained_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void) {}
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_id (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _set_id (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_name (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _set_name (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_version (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _set_version (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  {
+  public:
+    _TAO_IRObject_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_defined_in (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_absolute_name (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_containing_repository (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class Contained;
+  typedef Contained *Contained_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  describe (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class _TAO_Contained_ThruPOA_Proxy_Impl;
+  class _TAO_Contained_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  move (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  Contained
+    : public virtual POA_CORBA::IRObject
+  {
+  protected:
+    Contained (void);
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class Container;
-typedef Container *Container_ptr;
-
-class _TAO_Container_ThruPOA_Proxy_Impl;
-class _TAO_Container_Strategized_Proxy_Broker;
-
-class  Container
-  : public virtual POA_CORBA::IRObject
-{
-protected:
-  Container (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::Container _stub_type;
-  typedef ::CORBA::Container_ptr _stub_ptr_type;
-  typedef ::CORBA::Container_var _stub_var_type;
-  
-  Container (const Container& rhs);
-  virtual ~Container (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::Container *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::Contained _stub_type;
+    typedef ::CORBA::Contained_ptr _stub_ptr_type;
+    typedef ::CORBA::Contained_var _stub_var_type;
+    
+    Contained (const Contained& rhs);
+    virtual ~Contained (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::Contained *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual char * id (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_id_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual void id (
+        const char * id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _set_id_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual char * name (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_name_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual void name (
+        const char * name
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _set_name_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual char * version (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_version_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual void version (
+        const char * version
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _set_version_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Container_ptr defined_in (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_defined_in_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual char * absolute_name (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_absolute_name_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Repository_ptr containing_repository (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_containing_repository_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Contained::Description * describe (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void describe_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual void move (
+        ::CORBA::Container_ptr new_container,
+        const char * new_name,
+        const char * new_version
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void move_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Contained_ptr lookup (
-      const char * search_name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void lookup_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void contents_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void lookup_name_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class  _TAO_Contained_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_Contained_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_Contained_Strategized_Proxy_Broker *
+    the_TAO_Contained_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void describe_contents_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_module_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr type,
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_constant_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_struct_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_union_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class  _TAO_Contained_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_Contained_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_id (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _set_id (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_name (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _set_name (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_version (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _set_version (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_defined_in (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_absolute_name (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_containing_repository (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    describe (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    move (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::EnumMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_enum_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr original_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_alias_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_interface_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class Container;
+  typedef Container *Container_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA::ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_value_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class _TAO_Container_ThruPOA_Proxy_Impl;
+  class _TAO_Container_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_value_box_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class  Container
+    : public virtual POA_CORBA::IRObject
+  {
+  protected:
+    Container (void);
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_exception_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::Container _stub_type;
+    typedef ::CORBA::Container_ptr _stub_ptr_type;
+    typedef ::CORBA::Container_var _stub_var_type;
+    
+    Container (const Container& rhs);
+    virtual ~Container (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::Container *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Contained_ptr lookup (
+        const char * search_name
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void lookup_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ContainedSeq * contents (
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void contents_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ContainedSeq * lookup_name (
+        const char * search_name,
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void lookup_name_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Container::DescriptionSeq * describe_contents (
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void describe_contents_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ModuleDef_ptr create_module (
+        const char * id,
+        const char * name,
+        const char * version
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_module_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ConstantDef_ptr create_constant (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_constant_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::StructDef_ptr create_struct (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::StructMemberSeq & members
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_struct_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::UnionDef_ptr create_union (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_union_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::EnumDef_ptr create_enum (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::EnumMemberSeq & members
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_enum_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::AliasDef_ptr create_alias (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::IDLType_ptr original_type
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_alias_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::InterfaceDef_ptr create_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::InterfaceDefSeq & base_interfaces
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_interface_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ValueDef_ptr create_value (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_value_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ValueBoxDef_ptr create_value_box (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::IDLType_ptr original_type_def
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_value_box_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ExceptionDef_ptr create_exception (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::StructMemberSeq & members
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_exception_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::NativeDef_ptr create_native (
+        const char * id,
+        const char * name,
+        const char * version
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_native_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_abstract_interface_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::InterfaceDefSeq & base_interfaces
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_local_interface_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ExtValueDef_ptr create_ext_value (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_ext_value_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_native_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_abstract_interface_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_local_interface_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class  _TAO_Container_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_Container_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_Container_Strategized_Proxy_Broker *
+    the_TAO_Container_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ExtValueDef_ptr create_ext_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA::ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::ExtInitializerSeq & initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_ext_value_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class  _TAO_Container_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_Container_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_Container_Strategized_Proxy_Broker *
-  the_TAO_Container_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class  _TAO_Container_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_Container_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) {}
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  lookup (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  contents (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  _TAO_Container_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_Container_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    lookup (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    contents (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    lookup_name (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    describe_contents (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_module (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_constant (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_struct (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_union (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_enum (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_alias (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_interface (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_value (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_value_box (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_exception (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_native (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_abstract_interface (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_local_interface (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_ext_value (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  lookup_name (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  describe_contents (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_module (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class IDLType;
+  typedef IDLType *IDLType_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_constant (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class _TAO_IDLType_ThruPOA_Proxy_Impl;
+  class _TAO_IDLType_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_struct (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  IDLType
+    : public virtual POA_CORBA::IRObject
+  {
+  protected:
+    IDLType (void);
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_union (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::IDLType _stub_type;
+    typedef ::CORBA::IDLType_ptr _stub_ptr_type;
+    typedef ::CORBA::IDLType_var _stub_var_type;
+    
+    IDLType (const IDLType& rhs);
+    virtual ~IDLType (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::IDLType *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual CORBA::TypeCode_ptr type (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_type_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_enum (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_alias (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_interface (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  _TAO_IDLType_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_IDLType_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_IDLType_Strategized_Proxy_Broker *
+    the_TAO_IDLType_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_value (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_value_box (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_exception (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_native (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_abstract_interface (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  _TAO_IDLType_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_IDLType_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_type (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_local_interface (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_ext_value (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class IDLType;
-typedef IDLType *IDLType_ptr;
-
-class _TAO_IDLType_ThruPOA_Proxy_Impl;
-class _TAO_IDLType_Strategized_Proxy_Broker;
-
-class  IDLType
-  : public virtual POA_CORBA::IRObject
-{
-protected:
-  IDLType (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::IDLType _stub_type;
-  typedef ::CORBA::IDLType_ptr _stub_ptr_type;
-  typedef ::CORBA::IDLType_var _stub_var_type;
-  
-  IDLType (const IDLType& rhs);
-  virtual ~IDLType (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::IDLType *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;
+  class TypedefDef;
+  typedef TypedefDef *TypedefDef_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_type_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
+  class _TAO_TypedefDef_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class  _TAO_IDLType_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_IDLType_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_IDLType_Strategized_Proxy_Broker *
-  the_TAO_IDLType_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class  _TAO_IDLType_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_IDLType_ThruPOA_Proxy_Impl (void);
+  class  TypedefDef
+    : public virtual POA_CORBA::Contained,
+      public virtual POA_CORBA::IDLType
+  {
+  protected:
+    TypedefDef (void);
   
-  virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void) {}
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::TypedefDef _stub_type;
+    typedef ::CORBA::TypedefDef_ptr _stub_ptr_type;
+    typedef ::CORBA::TypedefDef_var _stub_var_type;
+    
+    TypedefDef (const TypedefDef& rhs);
+    virtual ~TypedefDef (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::TypedefDef *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_defined_in_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_absolute_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_containing_repository_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    move_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_type_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_type (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class TypedefDef;
-typedef TypedefDef *TypedefDef_ptr;
-
-class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
-class _TAO_TypedefDef_Strategized_Proxy_Broker;
-
-class  TypedefDef
-  : public virtual POA_CORBA::Contained,
-    public virtual POA_CORBA::IDLType
-{
-protected:
-  TypedefDef (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::TypedefDef _stub_type;
-  typedef ::CORBA::TypedefDef_ptr _stub_ptr_type;
-  typedef ::CORBA::TypedefDef_var _stub_var_type;
-  
-  TypedefDef (const TypedefDef& rhs);
-  virtual ~TypedefDef (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::TypedefDef *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_defined_in_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_absolute_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_containing_repository_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class  _TAO_TypedefDef_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_TypedefDef_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_TypedefDef_Strategized_Proxy_Broker *
+    the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  static void
-  describe_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  move_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_type_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class  _TAO_TypedefDef_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_TypedefDef_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_TypedefDef_Strategized_Proxy_Broker *
-  the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class  _TAO_TypedefDef_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl,
-    public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void) {}static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_defined_in (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_absolute_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_containing_repository (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  _TAO_TypedefDef_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl,
+      public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void) {}static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_defined_in (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_absolute_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_containing_repository (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    move (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_type (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  move (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_type (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:946
+// be\be_codegen.cpp:997
 
 #include "IFR_BaseS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "IFR_BaseS.i"
+#include "IFR_BaseS.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -2224,3 +2244,4 @@ public:
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.i b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.i
deleted file mode 100644
index 4aa9842ef55..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.i
+++ /dev/null
@@ -1,802 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-ACE_INLINE void POA_CORBA::Contained::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Contained_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Contained::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Contained_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::Container::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Container_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Container::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Container_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::IDLType::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::IDLType_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::IDLType::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::IDLType_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::TypedefDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::TypedefDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::TypedefDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::TypedefDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::TypedefDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::TypedefDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::TypedefDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::TypedefDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::TypedefDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::TypedefDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::TypedefDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::TypedefDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::TypedefDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::TypedefDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
index 5d9994214d0..6c9a79646d5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:684
+// be\be_codegen.cpp:683
 
-#ifndef _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_BASES_T_CPP_
-#define _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_BASES_T_CPP_
+#ifndef _TAO_IDL_SERVER_IFR_BASES_T_CPP_
+#define _TAO_IDL_SERVER_IFR_BASES_T_CPP_
 
 #include "IFR_BaseS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BaseS_T.i"
+#include "IFR_BaseS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
index b944d7809d8..dcff2ee6c2e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
@@ -26,30 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:545
+// be\be_codegen.cpp:546
 
-#ifndef _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_BASES_T_H_
-#define _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_BASES_T_H_
+#ifndef _TAO_IDL_SERVER_IFR_BASES_T_H_
+#define _TAO_IDL_SERVER_IFR_BASES_T_H_
 
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+// be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -89,7 +86,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -99,7 +96,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -119,7 +116,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -159,7 +156,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -169,7 +166,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -179,7 +176,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -189,7 +186,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -200,7 +197,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -210,7 +207,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -221,7 +218,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -231,7 +228,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -242,7 +239,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -252,7 +249,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -262,7 +259,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -272,7 +269,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -282,10 +279,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -305,7 +302,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -345,7 +342,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -355,7 +352,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -365,7 +362,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -376,11 +373,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -388,13 +385,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -402,12 +399,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -415,7 +412,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -428,14 +425,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -443,13 +440,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -457,14 +454,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -472,13 +469,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -486,13 +483,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -500,13 +497,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -514,19 +511,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -534,13 +531,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -548,13 +545,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -562,7 +559,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -575,13 +572,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -589,13 +586,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -603,19 +600,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -633,7 +630,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -673,7 +670,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -683,7 +680,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -693,7 +690,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -713,7 +710,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -753,7 +750,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -763,7 +760,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -773,7 +770,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -783,7 +780,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -794,7 +791,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -804,7 +801,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -815,7 +812,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -825,7 +822,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -836,7 +833,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -846,7 +843,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -856,7 +853,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -866,7 +863,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -876,10 +873,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -889,7 +886,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -908,13 +905,12 @@ namespace POA_CORBA
     void operator= (const TypedefDef_tie &);
   };
 } // module CORBA
-#endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1043
+// be\be_codegen.cpp:1094
 
 #if defined (__ACE_INLINE__)
-#include "IFR_BaseS_T.i"
+#include "IFR_BaseS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
@@ -925,9 +921,10 @@ namespace POA_CORBA
 #pragma implementation ("IFR_BaseS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.i b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.i
deleted file mode 100644
index 7d0a2fe392f..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.i
+++ /dev/null
@@ -1,1525 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::IRObject_tie<T>::IRObject_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::IRObject_tie<T>::IRObject_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::IRObject_tie<T>::IRObject_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::IRObject_tie<T>::IRObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::IRObject_tie<T>::~IRObject_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::IRObject_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::IRObject_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::IRObject_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::IRObject_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::IRObject_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::IRObject_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->IRObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::IRObject_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::IRObject_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::Contained_tie<T>::Contained_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Contained_tie<T>::Contained_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Contained_tie<T>::Contained_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Contained_tie<T>::Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Contained_tie<T>::~Contained_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::Contained_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Contained_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Contained_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Contained_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Contained_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Contained_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->Contained::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::Contained_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::Contained_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::Contained_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::Contained_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::Contained_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::Contained_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::Contained_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::Contained_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::Container_tie<T>::Container_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Container_tie<T>::Container_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Container_tie<T>::Container_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Container_tie<T>::Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Container_tie<T>::~Container_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::Container_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Container_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Container_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Container_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Container_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Container_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->Container::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::Container_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::Container_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::Container_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::Container_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::Container_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::Container_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::Container_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::Container_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::Container_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::Container_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::Container_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::Container_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::Container_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::Container_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::Container_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::Container_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::Container_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::Container_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::Container_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::Container_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::IDLType_tie<T>::IDLType_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::IDLType_tie<T>::IDLType_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::IDLType_tie<T>::IDLType_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::IDLType_tie<T>::IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::IDLType_tie<T>::~IDLType_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::IDLType_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::IDLType_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::IDLType_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::IDLType_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::IDLType_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::IDLType_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->IDLType::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::IDLType_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::IDLType_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::IDLType_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::TypedefDef_tie<T>::TypedefDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::TypedefDef_tie<T>::TypedefDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::TypedefDef_tie<T>::TypedefDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::TypedefDef_tie<T>::TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::TypedefDef_tie<T>::~TypedefDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::TypedefDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::TypedefDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::TypedefDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::TypedefDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::TypedefDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::TypedefDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->TypedefDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::TypedefDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::TypedefDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::TypedefDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::TypedefDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::TypedefDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::TypedefDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::TypedefDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::TypedefDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::TypedefDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index bfade030759..2e72c40c80b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -26,11 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:610
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:609
 
-#ifndef _TAO_IDL_ORIG_IFR_BASICS_CPP_
-#define _TAO_IDL_ORIG_IFR_BASICS_CPP_
+#ifndef _TAO_IDL_SERVER_IFR_BASICS_CPP_
+#define _TAO_IDL_SERVER_IFR_BASICS_CPP_
 
 
 #include "IFR_BasicS.h"
@@ -44,64 +44,47 @@
 #include "tao/Object_T.h"
 #include "tao/Typecode.h"
 #include "tao/DynamicC.h"
+#include "tao/CDR.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
+#include "tao/Any_Arg_Traits.h"
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
 #include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
-#include "ace/config-all.h"
+#include "ace/Malloc_Allocator.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BasicS.i"
+#include "IFR_BasicS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:436
-
-#if !defined (_CORBA_ANY__ARG_TRAITS_SS_)
-#define _CORBA_ANY__ARG_TRAITS_SS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
+  class  Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind
@@ -113,9 +96,9 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Contained>
+  class  Arg_Traits<CORBA::Contained>
     : public
         Object_Arg_Traits_T<
             CORBA::Contained_ptr,
@@ -130,9 +113,9 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_SS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Repository>
+  class  Arg_Traits<CORBA::Repository>
     : public
         Object_Arg_Traits_T<
             CORBA::Repository_ptr,
@@ -147,9 +130,9 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container>
+  class  Arg_Traits<CORBA::Container>
     : public
         Object_Arg_Traits_T<
             CORBA::Container_ptr,
@@ -164,9 +147,9 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_SS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::IDLType>
+  class  Arg_Traits<CORBA::IDLType>
     : public
         Object_Arg_Traits_T<
             CORBA::IDLType_ptr,
@@ -178,15 +161,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:472
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
+  class  Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDef::FullInterfaceDescription,
@@ -197,15 +180,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
+  class  Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
@@ -216,15 +199,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq>
+  class  Arg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
@@ -235,15 +218,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExcDescriptionSeq>
+  class  Arg_Traits<CORBA::ExcDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExcDescriptionSeq,
@@ -254,15 +237,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq>
+  class  Arg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
@@ -273,15 +256,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq>
+  class  Arg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
@@ -295,9 +278,9 @@ namespace TAO
 
 #if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_SS_)
 #define _CORBA_PRIMITIVEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::PrimitiveDef>
+  class  Arg_Traits<CORBA::PrimitiveDef>
     : public
         Object_Arg_Traits_T<
             CORBA::PrimitiveDef_ptr,
@@ -312,9 +295,9 @@ namespace TAO
 
 #if !defined (_CORBA_STRINGDEF__ARG_TRAITS_SS_)
 #define _CORBA_STRINGDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::StringDef>
+  class  Arg_Traits<CORBA::StringDef>
     : public
         Object_Arg_Traits_T<
             CORBA::StringDef_ptr,
@@ -329,9 +312,9 @@ namespace TAO
 
 #if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_SS_)
 #define _CORBA_SEQUENCEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::SequenceDef>
+  class  Arg_Traits<CORBA::SequenceDef>
     : public
         Object_Arg_Traits_T<
             CORBA::SequenceDef_ptr,
@@ -346,9 +329,9 @@ namespace TAO
 
 #if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_SS_)
 #define _CORBA_ARRAYDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ArrayDef>
+  class  Arg_Traits<CORBA::ArrayDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ArrayDef_ptr,
@@ -363,9 +346,9 @@ namespace TAO
 
 #if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_SS_)
 #define _CORBA_WSTRINGDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::WstringDef>
+  class  Arg_Traits<CORBA::WstringDef>
     : public
         Object_Arg_Traits_T<
             CORBA::WstringDef_ptr,
@@ -380,9 +363,9 @@ namespace TAO
 
 #if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_SS_)
 #define _CORBA_FIXEDDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::FixedDef>
+  class  Arg_Traits<CORBA::FixedDef>
     : public
         Object_Arg_Traits_T<
             CORBA::FixedDef_ptr,
@@ -394,15 +377,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_SS_)
 #define _CORBA_PRIMITIVEKIND__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::PrimitiveKind>
+  class  Arg_Traits<CORBA::PrimitiveKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::PrimitiveKind
@@ -411,15 +394,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq>
+  class  Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
@@ -430,15 +413,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeMode>
+  class  Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::AttributeMode
@@ -450,9 +433,9 @@ namespace TAO
 
 #if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_SS_)
 #define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeDef>
+  class  Arg_Traits<CORBA::AttributeDef>
     : public
         Object_Arg_Traits_T<
             CORBA::AttributeDef_ptr,
@@ -464,15 +447,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:472
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtAttributeDescription>
+  class  Arg_Traits<CORBA::ExtAttributeDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtAttributeDescription,
@@ -486,9 +469,9 @@ namespace TAO
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_SS_)
 #define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtAttributeDef>
+  class  Arg_Traits<CORBA::ExtAttributeDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ExtAttributeDef_ptr,
@@ -500,15 +483,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
+  class  Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::OperationMode
@@ -517,15 +500,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq>
+  class  Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
@@ -536,15 +519,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
+  class  Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
@@ -558,9 +541,9 @@ namespace TAO
 
 #if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_SS_)
 #define _CORBA_OPERATIONDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationDef>
+  class  Arg_Traits<CORBA::OperationDef>
     : public
         Object_Arg_Traits_T<
             CORBA::OperationDef_ptr,
@@ -572,15 +555,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:472
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
+  class  Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
@@ -593,8 +576,9 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_Repository_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -607,7 +591,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -714,10 +698,10 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,  -1, -21,  -2, -24,  -2,  11,  12,  13,
-       14,  15,  16,  -1,  17,  18,  -1,  19,  20, -67,  -1,  23, -68,  26,
-       27,  28,  -1,  29,  30,  -1,  -1,  31,  32,  33,  34,  -1,  35,  36,
-       37,  38,  -1,  39,  -1,  40,  -1,  -1,  41,  42,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1, -21,  -2, -24,  -2,  11,  12,  13, 
+       14,  15,  16,  -1,  17,  18,  -1,  19,  20, -67,  -1,  23, -68,  26, 
+       27,  28,  -1,  29,  30,  -1,  -1,  31,  32,  33,  34,  -1,  35,  36, 
+       37,  38,  -1,  39,  -1,  40,  -1,  -1,  41,  42, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -755,12 +739,12 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_Repository_Perfect_Hash_OpTable tao_CORBA_Repository_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Repository_lookup_id : public TAO_ServerRequestInfo
 {
@@ -772,53 +756,53 @@ public:
       const char * search_id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::Contained_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Repository_lookup_id (
       const TAO_ServerRequestInfo_CORBA_Repository_lookup_id &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_Repository_lookup_id &
     );
-
+  
 private:
   POA_CORBA::Repository *_tao_impl;
-
+  
   const char * search_id_;
   ::CORBA::Contained_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Repository_lookup_id (
     TAO_ServerRequest &_tao_server_request,
@@ -842,15 +826,15 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= search_id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -864,11 +848,11 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -879,11 +863,11 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -907,7 +891,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (::CORBA::Contained_ptr result)
 {
   // Update the result.
@@ -915,7 +899,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (::CORBA::Contained_ptr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode : public TAO_ServerRequestInfo
 {
@@ -924,62 +908,62 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
-      CORBA::TypeCode_ptr tc
+      ::CORBA::TypeCode_ptr tc
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::TypeCode_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode (
       const TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode &
     );
-
+  
 private:
   POA_CORBA::Repository *_tao_impl;
-
-  CORBA::TypeCode_ptr tc_;
+  
+  ::CORBA::TypeCode_ptr tc_;
   CORBA::TypeCode_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
-    CORBA::TypeCode_ptr tc
+    ::CORBA::TypeCode_ptr tc
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -997,15 +981,15 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= tc_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -1019,11 +1003,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1034,11 +1018,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -1062,7 +1046,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
 {
   // Update the result.
@@ -1070,7 +1054,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::Ty
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Repository_get_primitive : public TAO_ServerRequestInfo
 {
@@ -1079,15 +1063,15 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
-      CORBA::PrimitiveKind & kind
+      ::CORBA::PrimitiveKind & kind
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
@@ -1123,18 +1107,18 @@ private:
 private:
   POA_CORBA::Repository *_tao_impl;
   
-  const CORBA::PrimitiveKind & kind_;
+  const ::CORBA::PrimitiveKind & kind_;
   ::CORBA::PrimitiveDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORBA_Repository_get_primitive (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
-    CORBA::PrimitiveKind & kind
+    ::CORBA::PrimitiveKind & kind
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1225,7 +1209,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (::CORBA::Primitive
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Repository_create_string : public TAO_ServerRequestInfo
 {
@@ -1234,7 +1218,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
-      const CORBA::ULong & bound
+      const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -1278,18 +1262,18 @@ private:
 private:
   POA_CORBA::Repository *_tao_impl;
   
-  const CORBA::ULong & bound_;
+  const ::CORBA::ULong & bound_;
   ::CORBA::StringDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORBA_Repository_create_string (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
-    const CORBA::ULong & bound
+    const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1380,7 +1364,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::result (::CORBA::StringDef
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Repository_create_wstring : public TAO_ServerRequestInfo
 {
@@ -1389,7 +1373,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
-      const CORBA::ULong & bound
+      const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -1433,18 +1417,18 @@ private:
 private:
   POA_CORBA::Repository *_tao_impl;
   
-  const CORBA::ULong & bound_;
+  const ::CORBA::ULong & bound_;
   ::CORBA::WstringDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_CORBA_Repository_create_wstring (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
-    const CORBA::ULong & bound
+    const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1535,7 +1519,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (::CORBA::WstringD
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Repository_create_sequence : public TAO_ServerRequestInfo
 {
@@ -1544,8 +1528,8 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
-      const CORBA::ULong & bound,
-      CORBA::IDLType_ptr element_type
+      const ::CORBA::ULong & bound,
+      ::CORBA::IDLType_ptr element_type
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -1589,20 +1573,20 @@ private:
 private:
   POA_CORBA::Repository *_tao_impl;
   
-  const CORBA::ULong & bound_;
-  CORBA::IDLType_ptr element_type_;
+  const ::CORBA::ULong & bound_;
+  ::CORBA::IDLType_ptr element_type_;
   ::CORBA::SequenceDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CORBA_Repository_create_sequence (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::IDLType_ptr element_type
+    const ::CORBA::ULong & bound,
+    ::CORBA::IDLType_ptr element_type
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1698,7 +1682,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (::CORBA::Sequenc
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Repository_create_array : public TAO_ServerRequestInfo
 {
@@ -1707,8 +1691,8 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
-      const CORBA::ULong & length,
-      CORBA::IDLType_ptr element_type
+      const ::CORBA::ULong & length,
+      ::CORBA::IDLType_ptr element_type
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -1752,20 +1736,20 @@ private:
 private:
   POA_CORBA::Repository *_tao_impl;
   
-  const CORBA::ULong & length_;
-  CORBA::IDLType_ptr element_type_;
+  const ::CORBA::ULong & length_;
+  ::CORBA::IDLType_ptr element_type_;
   ::CORBA::ArrayDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA_Repository_create_array (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
-    const CORBA::ULong & length,
-    CORBA::IDLType_ptr element_type
+    const ::CORBA::ULong & length,
+    ::CORBA::IDLType_ptr element_type
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1861,7 +1845,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::result (::CORBA::ArrayDef_p
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_Repository_create_fixed : public TAO_ServerRequestInfo
 {
@@ -1870,8 +1854,8 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
-      const CORBA::UShort & digits,
-      const CORBA::Short & scale
+      const ::CORBA::UShort & digits,
+      const ::CORBA::Short & scale
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -1915,20 +1899,20 @@ private:
 private:
   POA_CORBA::Repository *_tao_impl;
   
-  const CORBA::UShort & digits_;
-  const CORBA::Short & scale_;
+  const ::CORBA::UShort & digits_;
+  const ::CORBA::Short & scale_;
   ::CORBA::FixedDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA_Repository_create_fixed (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
-    const CORBA::UShort & digits,
-    const CORBA::Short & scale
+    const ::CORBA::UShort & digits,
+    const ::CORBA::Short & scale
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -2030,7 +2014,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (::CORBA::FixedDef_p
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker *
@@ -2113,7 +2097,7 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -2147,7 +2131,7 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -2168,8 +2152,8 @@ CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer
         )
     );
@@ -2180,7 +2164,7 @@ CORBA__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::_TAO_Repository_ThruPOA_Proxy_Impl (void)
 {}
@@ -2188,7 +2172,7 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::_TAO_Repository_ThruPOA_Proxy_Imp
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
@@ -2201,21 +2185,21 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Contained>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Repository_ptr,
+  ((TAO::Arg_Traits< CORBA::Contained>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Repository_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Repository:1.0"
           )
       )->lookup_id (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
@@ -2228,21 +2212,21 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Repository_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Repository_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Repository:1.0"
           )
       )->get_canonical_typecode (
-          ((TAO::Arg_Traits<CORBA::TypeCode>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< ::CORBA::TypeCode>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
@@ -2255,21 +2239,21 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::PrimitiveDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Repository_ptr,
+  ((TAO::Arg_Traits< CORBA::PrimitiveDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Repository_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Repository:1.0"
           )
       )->get_primitive (
-          ((TAO::Arg_Traits<CORBA::PrimitiveKind>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< CORBA::PrimitiveKind>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
@@ -2282,21 +2266,21 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::StringDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Repository_ptr,
+  ((TAO::Arg_Traits< CORBA::StringDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Repository_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Repository:1.0"
           )
       )->create_string (
-          ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
@@ -2309,21 +2293,21 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::WstringDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Repository_ptr,
+  ((TAO::Arg_Traits< CORBA::WstringDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Repository_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Repository:1.0"
           )
       )->create_wstring (
-          ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
@@ -2336,22 +2320,22 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::SequenceDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Repository_ptr,
+  ((TAO::Arg_Traits< CORBA::SequenceDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Repository_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Repository:1.0"
           )
       )->create_sequence (
-          ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[2])->arg ()
+          ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[2])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
@@ -2364,22 +2348,22 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ArrayDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Repository_ptr,
+  ((TAO::Arg_Traits< CORBA::ArrayDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Repository_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Repository:1.0"
           )
       )->create_array (
-          ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[2])->arg ()
+          ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[2])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
@@ -2392,15 +2376,15 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::FixedDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::Repository_ptr,
+  ((TAO::Arg_Traits< CORBA::FixedDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::Repository_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/Repository:1.0"
           )
       )->create_fixed (
-          ((TAO::Arg_Traits<CORBA::UShort>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Short>::in_arg_val *) args[2])->arg ()
+          ((TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< ::CORBA::Short>::in_arg_val *) args[2])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -2411,7 +2395,7 @@ POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::Repository::Repository (void)
 {
@@ -2431,7 +2415,7 @@ POA_CORBA::Repository::~Repository (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Repository::lookup_id_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2440,14 +2424,14 @@ void POA_CORBA::Repository::lookup_id_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Repository *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Repository *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Repository *_tao_impl =
+    static_cast<
+        POA_CORBA::Repository *> (
         _tao_servant
       );
   ::CORBA::Contained_var _tao_retval;
-  CORBA::String_var search_id;
+  ::CORBA::String_var search_id;
   
   if (!(
       (_tao_in >> search_id.out ())
@@ -2459,8 +2443,8 @@ POA_CORBA::Repository *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2556,23 +2540,30 @@ POA_CORBA::Repository *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Repository::get_canonical_typecode_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2581,14 +2572,14 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Repository *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Repository *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Repository *_tao_impl =
+    static_cast<
+        POA_CORBA::Repository *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
-  CORBA::TypeCode_var tc;
+  ::CORBA::TypeCode_var tc;
   
   if (!(
       (_tao_in >> tc.out ())
@@ -2600,8 +2591,8 @@ POA_CORBA::Repository *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2697,23 +2688,30 @@ POA_CORBA::Repository *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Repository::get_primitive_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2722,14 +2720,14 @@ void POA_CORBA::Repository::get_primitive_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Repository *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Repository *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Repository *_tao_impl =
+    static_cast<
+        POA_CORBA::Repository *> (
         _tao_servant
       );
   ::CORBA::PrimitiveDef_var _tao_retval;
-  CORBA::PrimitiveKind kind;
+  ::CORBA::PrimitiveKind kind;
   
   if (!(
       (_tao_in >> kind)
@@ -2741,8 +2739,8 @@ POA_CORBA::Repository *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2838,23 +2836,30 @@ POA_CORBA::Repository *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Repository::create_string_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2863,14 +2868,14 @@ void POA_CORBA::Repository::create_string_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Repository *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Repository *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Repository *_tao_impl =
+    static_cast<
+        POA_CORBA::Repository *> (
         _tao_servant
       );
   ::CORBA::StringDef_var _tao_retval;
-  CORBA::ULong bound;
+  ::CORBA::ULong bound;
   
   if (!(
       (_tao_in >> bound)
@@ -2882,8 +2887,8 @@ POA_CORBA::Repository *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2979,23 +2984,30 @@ POA_CORBA::Repository *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Repository::create_wstring_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3004,14 +3016,14 @@ void POA_CORBA::Repository::create_wstring_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Repository *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Repository *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Repository *_tao_impl =
+    static_cast<
+        POA_CORBA::Repository *> (
         _tao_servant
       );
   ::CORBA::WstringDef_var _tao_retval;
-  CORBA::ULong bound;
+  ::CORBA::ULong bound;
   
   if (!(
       (_tao_in >> bound)
@@ -3023,8 +3035,8 @@ POA_CORBA::Repository *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3120,23 +3132,30 @@ POA_CORBA::Repository *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Repository::create_sequence_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3145,15 +3164,15 @@ void POA_CORBA::Repository::create_sequence_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Repository *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Repository *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Repository *_tao_impl =
+    static_cast<
+        POA_CORBA::Repository *> (
         _tao_servant
       );
   ::CORBA::SequenceDef_var _tao_retval;
-  CORBA::ULong bound;
-  CORBA::IDLType_var element_type;
+  ::CORBA::ULong bound;
+  ::CORBA::IDLType_var element_type;
   
   if (!(
       (_tao_in >> bound) &&
@@ -3166,8 +3185,8 @@ POA_CORBA::Repository *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3267,23 +3286,30 @@ POA_CORBA::Repository *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Repository::create_array_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3292,15 +3318,15 @@ void POA_CORBA::Repository::create_array_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Repository *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Repository *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Repository *_tao_impl =
+    static_cast<
+        POA_CORBA::Repository *> (
         _tao_servant
       );
   ::CORBA::ArrayDef_var _tao_retval;
-  CORBA::ULong length;
-  CORBA::IDLType_var element_type;
+  ::CORBA::ULong length;
+  ::CORBA::IDLType_var element_type;
   
   if (!(
       (_tao_in >> length) &&
@@ -3313,8 +3339,8 @@ POA_CORBA::Repository *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3414,23 +3440,30 @@ POA_CORBA::Repository *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Repository::create_fixed_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3439,15 +3472,15 @@ void POA_CORBA::Repository::create_fixed_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::Repository *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::Repository *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Repository *_tao_impl =
+    static_cast<
+        POA_CORBA::Repository *> (
         _tao_servant
       );
   ::CORBA::FixedDef_var _tao_retval;
-  CORBA::UShort digits;
-  CORBA::Short scale;
+  ::CORBA::UShort digits;
+  ::CORBA::Short scale;
   
   if (!(
       (_tao_in >> digits) &&
@@ -3460,8 +3493,8 @@ POA_CORBA::Repository *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3561,23 +3594,30 @@ POA_CORBA::Repository *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::Repository::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -3737,25 +3777,25 @@ void* POA_CORBA::Repository::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Repository:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Repository_ptr, this);
+      return static_cast<POA_CORBA::Repository_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -3767,7 +3807,7 @@ const char* POA_CORBA::Repository::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::Repository::_dispatch (
     TAO_ServerRequest &req,
@@ -3782,7 +3822,7 @@ void POA_CORBA::Repository::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::Repository *
 POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3822,7 +3862,7 @@ POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ModuleDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -3835,7 +3875,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3986,7 +4026,7 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -3997,7 +4037,7 @@ static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker *
@@ -4080,7 +4120,7 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -4114,7 +4154,7 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -4135,8 +4175,8 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -4147,7 +4187,7 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_TAO_ModuleDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -4159,7 +4199,7 @@ POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_TAO_ModuleDef_ThruPOA_Proxy_Impl
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ModuleDef::ModuleDef (void)
 {
@@ -4180,7 +4220,7 @@ POA_CORBA::ModuleDef::~ModuleDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ModuleDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -4344,31 +4384,31 @@ void* POA_CORBA::ModuleDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ModuleDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ModuleDef_ptr, this);
+      return static_cast<POA_CORBA::ModuleDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -4380,7 +4420,7 @@ const char* POA_CORBA::ModuleDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ModuleDef::_dispatch (
     TAO_ServerRequest &req,
@@ -4395,7 +4435,7 @@ void POA_CORBA::ModuleDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ModuleDef *
 POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -4435,7 +4475,7 @@ POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ConstantDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -4448,7 +4488,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4584,12 +4624,12 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 static TAO_CORBA_ConstantDef_Perfect_Hash_OpTable tao_CORBA_ConstantDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ConstantDef_type_get : public TAO_ServerRequestInfo
 {
@@ -4645,7 +4685,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -4732,7 +4772,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::TypeCode_ptr re
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get : public TAO_ServerRequestInfo
 {
@@ -4788,7 +4828,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
@@ -4875,7 +4915,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (::CORBA::IDLType_p
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set : public TAO_ServerRequestInfo
 {
@@ -4884,7 +4924,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ConstantDef *tao_impl,
-      CORBA::IDLType_ptr type_def
+      ::CORBA::IDLType_ptr type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -4926,17 +4966,17 @@ private:
 private:
   POA_CORBA::ConstantDef *_tao_impl;
   
-  CORBA::IDLType_ptr type_def_;
+  ::CORBA::IDLType_ptr type_def_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ConstantDef *tao_impl,
-    CORBA::IDLType_ptr type_def
+    ::CORBA::IDLType_ptr type_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -5016,7 +5056,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ConstantDef_value_get : public TAO_ServerRequestInfo
 {
@@ -5072,7 +5112,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (
     TAO_ServerRequest &_tao_server_request,
@@ -5159,7 +5199,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Any * result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ConstantDef_value_set : public TAO_ServerRequestInfo
 {
@@ -5168,7 +5208,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ConstantDef *tao_impl,
-      const CORBA::Any & value
+      const ::CORBA::Any & value
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -5210,17 +5250,17 @@ private:
 private:
   POA_CORBA::ConstantDef *_tao_impl;
   
-  const CORBA::Any & value_;
+  const ::CORBA::Any & value_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_ConstantDef_value_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ConstantDef *tao_impl,
-    const CORBA::Any & value
+    const ::CORBA::Any & value
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -5306,7 +5346,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker *
@@ -5389,7 +5429,7 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -5423,7 +5463,7 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -5444,8 +5484,8 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -5456,7 +5496,7 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_TAO_ConstantDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -5464,7 +5504,7 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_TAO_ConstantDef_ThruPOA_Proxy_I
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_type (
@@ -5477,9 +5517,9 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ConstantDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ConstantDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ConstantDef:1.0"
           )
@@ -5490,7 +5530,7 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_type (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_type_def (
@@ -5503,9 +5543,9 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_type_def (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::IDLType>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ConstantDef_ptr,
+  ((TAO::Arg_Traits< CORBA::IDLType>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ConstantDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ConstantDef:1.0"
           )
@@ -5516,7 +5556,7 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_type_def (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_set_type_def (
@@ -5529,20 +5569,20 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_set_type_def (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ConstantDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ConstantDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
-        ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_value (
@@ -5555,9 +5595,9 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_value (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Any>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ConstantDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::Any>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ConstantDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ConstantDef:1.0"
           )
@@ -5568,7 +5608,7 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_value (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_set_value (
@@ -5581,13 +5621,13 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_set_value (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ConstantDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ConstantDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
-        ((TAO::Arg_Traits<CORBA::Any>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::Any>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -5598,7 +5638,7 @@ POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_set_value (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ConstantDef::ConstantDef (void)
 {
@@ -5618,7 +5658,7 @@ POA_CORBA::ConstantDef::~ConstantDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ConstantDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -5628,16 +5668,16 @@ void POA_CORBA::ConstantDef::_get_type_skel (
   )
 {
   POA_CORBA::ConstantDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ConstantDef *,
+    static_cast<
+        POA_CORBA::ConstantDef *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5730,23 +5770,30 @@ void POA_CORBA::ConstantDef::_get_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ConstantDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -5756,16 +5803,16 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
   )
 {
   POA_CORBA::ConstantDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ConstantDef *,
+    static_cast<
+        POA_CORBA::ConstantDef *> (
         _tao_servant
       );
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5858,23 +5905,30 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ConstantDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -5883,15 +5937,15 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ConstantDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ConstantDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ConstantDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ConstantDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::IDLType_var type_def;
+  ::CORBA::IDLType_var type_def;
   
   if (!(
       (_tao_in >> type_def.out ())
@@ -5903,8 +5957,8 @@ POA_CORBA::ConstantDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6003,7 +6057,7 @@ POA_CORBA::ConstantDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ConstantDef::_get_value_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6013,16 +6067,16 @@ void POA_CORBA::ConstantDef::_get_value_skel (
   )
 {
   POA_CORBA::ConstantDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ConstantDef *,
+    static_cast<
+        POA_CORBA::ConstantDef *> (
         _tao_servant
       );
   CORBA::Any_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6115,23 +6169,30 @@ void POA_CORBA::ConstantDef::_get_value_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ConstantDef::_set_value_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6140,15 +6201,15 @@ void POA_CORBA::ConstantDef::_set_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ConstantDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ConstantDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ConstantDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ConstantDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::Any value;
+  ::CORBA::Any value;
   
   if (!(
       (_tao_in >> value)
@@ -6160,8 +6221,8 @@ POA_CORBA::ConstantDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6260,7 +6321,7 @@ POA_CORBA::ConstantDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ConstantDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -6420,25 +6481,25 @@ void* POA_CORBA::ConstantDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ConstantDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ConstantDef_ptr, this);
+      return static_cast<POA_CORBA::ConstantDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -6450,7 +6511,7 @@ const char* POA_CORBA::ConstantDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ConstantDef::_dispatch (
     TAO_ServerRequest &req,
@@ -6465,7 +6526,7 @@ void POA_CORBA::ConstantDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ConstantDef *
 POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -6505,7 +6566,7 @@ POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_StructDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -6518,7 +6579,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_StructDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -6672,12 +6733,12 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_StructDef_Perfect_Hash_OpTable tao_CORBA_StructDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_StructDef_members_get : public TAO_ServerRequestInfo
 {
@@ -6733,7 +6794,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::TAO_ServerRequestInfo_CORBA_StructDef_members_get (
     TAO_ServerRequest &_tao_server_request,
@@ -6820,7 +6881,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (::CORBA::StructMember
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_StructDef_members_set : public TAO_ServerRequestInfo
 {
@@ -6829,7 +6890,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::StructDef *tao_impl,
-      const CORBA::StructMemberSeq & members
+      const ::CORBA::StructMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -6871,17 +6932,17 @@ private:
 private:
   POA_CORBA::StructDef *_tao_impl;
   
-  const CORBA::StructMemberSeq & members_;
+  const ::CORBA::StructMemberSeq & members_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_StructDef_members_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::StructDef *tao_impl,
-    const CORBA::StructMemberSeq & members
+    const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6967,7 +7028,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker *
@@ -7050,7 +7111,7 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -7084,7 +7145,7 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -7105,8 +7166,8 @@ CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -7117,7 +7178,7 @@ CORBA__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_TAO_StructDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -7125,7 +7186,7 @@ POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_TAO_StructDef_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_members (
@@ -7138,9 +7199,9 @@ POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_members (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::StructMemberSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::StructDef_ptr,
+  ((TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::StructDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/StructDef:1.0"
           )
@@ -7151,7 +7212,7 @@ POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_members (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_set_members (
@@ -7164,13 +7225,13 @@ POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_set_members (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::StructDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::StructDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
-        ((TAO::Arg_Traits<CORBA::StructMemberSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -7181,7 +7242,7 @@ POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_set_members (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::StructDef::StructDef (void)
 {
@@ -7204,7 +7265,7 @@ POA_CORBA::StructDef::~StructDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::StructDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -7214,16 +7275,16 @@ void POA_CORBA::StructDef::_get_members_skel (
   )
 {
   POA_CORBA::StructDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::StructDef *,
+    static_cast<
+        POA_CORBA::StructDef *> (
         _tao_servant
       );
   ::CORBA::StructMemberSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -7316,23 +7377,30 @@ void POA_CORBA::StructDef::_get_members_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::StructDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -7341,15 +7409,15 @@ void POA_CORBA::StructDef::_set_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::StructDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::StructDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::StructDef *_tao_impl =
+    static_cast<
+        POA_CORBA::StructDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::StructMemberSeq members;
+  ::CORBA::StructMemberSeq members;
   
   if (!(
       (_tao_in >> members)
@@ -7361,8 +7429,8 @@ POA_CORBA::StructDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -7461,7 +7529,7 @@ POA_CORBA::StructDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::StructDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -7633,43 +7701,43 @@ void* POA_CORBA::StructDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
+      return static_cast<POA_CORBA::TypedefDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/StructDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::StructDef_ptr, this);
+      return static_cast<POA_CORBA::StructDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -7681,7 +7749,7 @@ const char* POA_CORBA::StructDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::StructDef::_dispatch (
     TAO_ServerRequest &req,
@@ -7696,7 +7764,7 @@ void POA_CORBA::StructDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::StructDef *
 POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7736,7 +7804,7 @@ POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_UnionDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -7749,7 +7817,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_UnionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7908,12 +7976,12 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_UnionDef_Perfect_Hash_OpTable tao_CORBA_UnionDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get : public TAO_ServerRequestInfo
 {
@@ -7969,7 +8037,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -8056,7 +8124,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Type
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get : public TAO_ServerRequestInfo
 {
@@ -8112,7 +8180,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_ServerRequest &_tao_server_request,
@@ -8199,7 +8267,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (::CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set : public TAO_ServerRequestInfo
 {
@@ -8208,7 +8276,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::UnionDef *tao_impl,
-      CORBA::IDLType_ptr discriminator_type_def
+      ::CORBA::IDLType_ptr discriminator_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -8250,17 +8318,17 @@ private:
 private:
   POA_CORBA::UnionDef *_tao_impl;
   
-  CORBA::IDLType_ptr discriminator_type_def_;
+  ::CORBA::IDLType_ptr discriminator_type_def_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::UnionDef *tao_impl,
-    CORBA::IDLType_ptr discriminator_type_def
+    ::CORBA::IDLType_ptr discriminator_type_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -8340,7 +8408,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_UnionDef_members_get : public TAO_ServerRequestInfo
 {
@@ -8396,7 +8464,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::TAO_ServerRequestInfo_CORBA_UnionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
@@ -8483,7 +8551,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (::CORBA::UnionMemberSe
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_UnionDef_members_set : public TAO_ServerRequestInfo
 {
@@ -8492,7 +8560,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::UnionDef *tao_impl,
-      const CORBA::UnionMemberSeq & members
+      const ::CORBA::UnionMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -8534,17 +8602,17 @@ private:
 private:
   POA_CORBA::UnionDef *_tao_impl;
   
-  const CORBA::UnionMemberSeq & members_;
+  const ::CORBA::UnionMemberSeq & members_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_UnionDef_members_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::UnionDef *tao_impl,
-    const CORBA::UnionMemberSeq & members
+    const ::CORBA::UnionMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -8630,7 +8698,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker *
@@ -8713,7 +8781,7 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -8747,7 +8815,7 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -8768,8 +8836,8 @@ CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -8780,7 +8848,7 @@ CORBA__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_TAO_UnionDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -8788,7 +8856,7 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_TAO_UnionDef_ThruPOA_Proxy_Impl (v
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_discriminator_type (
@@ -8801,9 +8869,9 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_discriminator_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::UnionDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::UnionDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/UnionDef:1.0"
           )
@@ -8814,7 +8882,7 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_discriminator_type (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_discriminator_type_def (
@@ -8827,9 +8895,9 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_discriminator_type_def (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::IDLType>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::UnionDef_ptr,
+  ((TAO::Arg_Traits< CORBA::IDLType>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::UnionDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/UnionDef:1.0"
           )
@@ -8840,7 +8908,7 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_discriminator_type_def (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_set_discriminator_type_def (
@@ -8853,20 +8921,20 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_set_discriminator_type_def (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::UnionDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::UnionDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
-        ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_members (
@@ -8879,9 +8947,9 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_members (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::UnionMemberSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::UnionDef_ptr,
+  ((TAO::Arg_Traits< CORBA::UnionMemberSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::UnionDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/UnionDef:1.0"
           )
@@ -8892,7 +8960,7 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_members (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_set_members (
@@ -8905,13 +8973,13 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_set_members (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::UnionDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::UnionDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
-        ((TAO::Arg_Traits<CORBA::UnionMemberSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -8922,7 +8990,7 @@ POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_set_members (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::UnionDef::UnionDef (void)
 {
@@ -8945,7 +9013,7 @@ POA_CORBA::UnionDef::~UnionDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::UnionDef::_get_discriminator_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8955,16 +9023,16 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
   )
 {
   POA_CORBA::UnionDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::UnionDef *,
+    static_cast<
+        POA_CORBA::UnionDef *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9057,23 +9125,30 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9083,16 +9158,16 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
   )
 {
   POA_CORBA::UnionDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::UnionDef *,
+    static_cast<
+        POA_CORBA::UnionDef *> (
         _tao_servant
       );
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9185,23 +9260,30 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9210,15 +9292,15 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::UnionDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::UnionDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::UnionDef *_tao_impl =
+    static_cast<
+        POA_CORBA::UnionDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::IDLType_var discriminator_type_def;
+  ::CORBA::IDLType_var discriminator_type_def;
   
   if (!(
       (_tao_in >> discriminator_type_def.out ())
@@ -9230,8 +9312,8 @@ POA_CORBA::UnionDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9330,7 +9412,7 @@ POA_CORBA::UnionDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::UnionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9340,16 +9422,16 @@ void POA_CORBA::UnionDef::_get_members_skel (
   )
 {
   POA_CORBA::UnionDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::UnionDef *,
+    static_cast<
+        POA_CORBA::UnionDef *> (
         _tao_servant
       );
   ::CORBA::UnionMemberSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9442,23 +9524,30 @@ void POA_CORBA::UnionDef::_get_members_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::UnionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9467,15 +9556,15 @@ void POA_CORBA::UnionDef::_set_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::UnionDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::UnionDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::UnionDef *_tao_impl =
+    static_cast<
+        POA_CORBA::UnionDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::UnionMemberSeq members;
+  ::CORBA::UnionMemberSeq members;
   
   if (!(
       (_tao_in >> members)
@@ -9487,8 +9576,8 @@ POA_CORBA::UnionDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9587,7 +9676,7 @@ POA_CORBA::UnionDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::UnionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -9759,43 +9848,43 @@ void* POA_CORBA::UnionDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
+      return static_cast<POA_CORBA::TypedefDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/UnionDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::UnionDef_ptr, this);
+      return static_cast<POA_CORBA::UnionDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -9807,7 +9896,7 @@ const char* POA_CORBA::UnionDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::UnionDef::_dispatch (
     TAO_ServerRequest &req,
@@ -9822,7 +9911,7 @@ void POA_CORBA::UnionDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::UnionDef *
 POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -9862,7 +9951,7 @@ POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_EnumDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -9875,7 +9964,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_EnumDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10009,12 +10098,12 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 static TAO_CORBA_EnumDef_Perfect_Hash_OpTable tao_CORBA_EnumDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_EnumDef_members_get : public TAO_ServerRequestInfo
 {
@@ -10070,7 +10159,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::TAO_ServerRequestInfo_CORBA_EnumDef_members_get (
     TAO_ServerRequest &_tao_server_request,
@@ -10157,7 +10246,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (::CORBA::EnumMemberSeq
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_EnumDef_members_set : public TAO_ServerRequestInfo
 {
@@ -10166,7 +10255,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::EnumDef *tao_impl,
-      const CORBA::EnumMemberSeq & members
+      const ::CORBA::EnumMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -10208,17 +10297,17 @@ private:
 private:
   POA_CORBA::EnumDef *_tao_impl;
   
-  const CORBA::EnumMemberSeq & members_;
+  const ::CORBA::EnumMemberSeq & members_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_EnumDef_members_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::EnumDef *tao_impl,
-    const CORBA::EnumMemberSeq & members
+    const ::CORBA::EnumMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -10304,7 +10393,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker *
@@ -10387,7 +10476,7 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -10421,7 +10510,7 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -10442,8 +10531,8 @@ CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -10454,7 +10543,7 @@ CORBA__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_TAO_EnumDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -10462,7 +10551,7 @@ POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_TAO_EnumDef_ThruPOA_Proxy_Impl (voi
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_members (
@@ -10475,9 +10564,9 @@ POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_members (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::EnumMemberSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::EnumDef_ptr,
+  ((TAO::Arg_Traits< CORBA::EnumMemberSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::EnumDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/EnumDef:1.0"
           )
@@ -10488,7 +10577,7 @@ POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_members (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_set_members (
@@ -10501,13 +10590,13 @@ POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_set_members (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::EnumDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::EnumDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
-        ((TAO::Arg_Traits<CORBA::EnumMemberSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -10518,7 +10607,7 @@ POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_set_members (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::EnumDef::EnumDef (void)
 {
@@ -10540,7 +10629,7 @@ POA_CORBA::EnumDef::~EnumDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::EnumDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10550,16 +10639,16 @@ void POA_CORBA::EnumDef::_get_members_skel (
   )
 {
   POA_CORBA::EnumDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::EnumDef *,
+    static_cast<
+        POA_CORBA::EnumDef *> (
         _tao_servant
       );
   ::CORBA::EnumMemberSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10652,23 +10741,30 @@ void POA_CORBA::EnumDef::_get_members_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::EnumDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10677,15 +10773,15 @@ void POA_CORBA::EnumDef::_set_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::EnumDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::EnumDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::EnumDef *_tao_impl =
+    static_cast<
+        POA_CORBA::EnumDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::EnumMemberSeq members;
+  ::CORBA::EnumMemberSeq members;
   
   if (!(
       (_tao_in >> members)
@@ -10697,8 +10793,8 @@ POA_CORBA::EnumDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10797,7 +10893,7 @@ POA_CORBA::EnumDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::EnumDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -10965,37 +11061,37 @@ void* POA_CORBA::EnumDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
+      return static_cast<POA_CORBA::TypedefDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/EnumDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::EnumDef_ptr, this);
+      return static_cast<POA_CORBA::EnumDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -11007,7 +11103,7 @@ const char* POA_CORBA::EnumDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::EnumDef::_dispatch (
     TAO_ServerRequest &req,
@@ -11022,7 +11118,7 @@ void POA_CORBA::EnumDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::EnumDef *
 POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -11062,7 +11158,7 @@ POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_AliasDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -11075,7 +11171,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AliasDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -11209,12 +11305,12 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_AliasDef_Perfect_Hash_OpTable tao_CORBA_AliasDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get : public TAO_ServerRequestInfo
 {
@@ -11270,7 +11366,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
@@ -11357,7 +11453,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (::CORBA::IDL
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set : public TAO_ServerRequestInfo
 {
@@ -11366,7 +11462,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AliasDef *tao_impl,
-      CORBA::IDLType_ptr original_type_def
+      ::CORBA::IDLType_ptr original_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -11408,17 +11504,17 @@ private:
 private:
   POA_CORBA::AliasDef *_tao_impl;
   
-  CORBA::IDLType_ptr original_type_def_;
+  ::CORBA::IDLType_ptr original_type_def_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AliasDef *tao_impl,
-    CORBA::IDLType_ptr original_type_def
+    ::CORBA::IDLType_ptr original_type_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -11504,7 +11600,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker *
@@ -11587,7 +11683,7 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -11621,7 +11717,7 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -11642,8 +11738,8 @@ CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -11654,7 +11750,7 @@ CORBA__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_TAO_AliasDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -11662,7 +11758,7 @@ POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_TAO_AliasDef_ThruPOA_Proxy_Impl (v
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_original_type_def (
@@ -11675,9 +11771,9 @@ POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_original_type_def (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::IDLType>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::AliasDef_ptr,
+  ((TAO::Arg_Traits< CORBA::IDLType>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::AliasDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/AliasDef:1.0"
           )
@@ -11688,7 +11784,7 @@ POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_original_type_def (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_set_original_type_def (
@@ -11701,13 +11797,13 @@ POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_set_original_type_def (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::AliasDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::AliasDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
-        ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -11718,7 +11814,7 @@ POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_set_original_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::AliasDef::AliasDef (void)
 {
@@ -11740,7 +11836,7 @@ POA_CORBA::AliasDef::~AliasDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::AliasDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -11750,16 +11846,16 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
   )
 {
   POA_CORBA::AliasDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::AliasDef *,
+    static_cast<
+        POA_CORBA::AliasDef *> (
         _tao_servant
       );
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11852,23 +11948,30 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::AliasDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -11877,15 +11980,15 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::AliasDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::AliasDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::AliasDef *_tao_impl =
+    static_cast<
+        POA_CORBA::AliasDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::IDLType_var original_type_def;
+  ::CORBA::IDLType_var original_type_def;
   
   if (!(
       (_tao_in >> original_type_def.out ())
@@ -11897,8 +12000,8 @@ POA_CORBA::AliasDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11997,7 +12100,7 @@ POA_CORBA::AliasDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::AliasDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -12165,37 +12268,37 @@ void* POA_CORBA::AliasDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
+      return static_cast<POA_CORBA::TypedefDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/AliasDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::AliasDef_ptr, this);
+      return static_cast<POA_CORBA::AliasDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -12207,7 +12310,7 @@ const char* POA_CORBA::AliasDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::AliasDef::_dispatch (
     TAO_ServerRequest &req,
@@ -12222,7 +12325,7 @@ void POA_CORBA::AliasDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::AliasDef *
 POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -12262,7 +12365,7 @@ POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_NativeDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -12275,7 +12378,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_NativeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -12407,7 +12510,7 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -12418,7 +12521,7 @@ static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker *
@@ -12501,7 +12604,7 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -12535,7 +12638,7 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -12556,8 +12659,8 @@ CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -12568,7 +12671,7 @@ CORBA__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_TAO_NativeDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -12580,7 +12683,7 @@ POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_TAO_NativeDef_ThruPOA_Proxy_Impl
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::NativeDef::NativeDef (void)
 {
@@ -12602,7 +12705,7 @@ POA_CORBA::NativeDef::~NativeDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::NativeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -12770,37 +12873,37 @@ void* POA_CORBA::NativeDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
+      return static_cast<POA_CORBA::TypedefDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/NativeDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::NativeDef_ptr, this);
+      return static_cast<POA_CORBA::NativeDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -12812,7 +12915,7 @@ const char* POA_CORBA::NativeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::NativeDef::_dispatch (
     TAO_ServerRequest &req,
@@ -12827,7 +12930,7 @@ void POA_CORBA::NativeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::NativeDef *
 POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -12867,7 +12970,7 @@ POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -12880,7 +12983,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -12983,12 +13086,12 @@ TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable tao_CORBA_PrimitiveDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get : public TAO_ServerRequestInfo
 {
@@ -13044,7 +13147,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_ServerRequest &_tao_server_request,
@@ -13137,7 +13240,7 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (::CORBA::PrimitiveKin
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker *
@@ -13220,7 +13323,7 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -13254,7 +13357,7 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -13275,8 +13378,8 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -13287,7 +13390,7 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -13295,7 +13398,7 @@ POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_PrimitiveDef_ThruPOA_Proxy
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_get_kind (
@@ -13308,9 +13411,9 @@ POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_get_kind (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::PrimitiveKind>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::PrimitiveDef_ptr,
+  ((TAO::Arg_Traits< CORBA::PrimitiveKind>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::PrimitiveDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/PrimitiveDef:1.0"
           )
@@ -13325,7 +13428,7 @@ POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_get_kind (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::PrimitiveDef::PrimitiveDef (void)
 {
@@ -13345,7 +13448,7 @@ POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::PrimitiveDef::_get_kind_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13355,16 +13458,16 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
   )
 {
   POA_CORBA::PrimitiveDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::PrimitiveDef *,
+    static_cast<
+        POA_CORBA::PrimitiveDef *> (
         _tao_servant
       );
   ::CORBA::PrimitiveKind _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13456,23 +13559,30 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::PrimitiveDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -13632,25 +13742,25 @@ void* POA_CORBA::PrimitiveDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/PrimitiveDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::PrimitiveDef_ptr, this);
+      return static_cast<POA_CORBA::PrimitiveDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -13662,7 +13772,7 @@ const char* POA_CORBA::PrimitiveDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::PrimitiveDef::_dispatch (
     TAO_ServerRequest &req,
@@ -13677,7 +13787,7 @@ void POA_CORBA::PrimitiveDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::PrimitiveDef *
 POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -13717,7 +13827,7 @@ POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_StringDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -13730,7 +13840,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_StringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -13852,12 +13962,12 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_StringDef_Perfect_Hash_OpTable tao_CORBA_StringDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_StringDef_bound_get : public TAO_ServerRequestInfo
 {
@@ -13913,7 +14023,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::TAO_ServerRequestInfo_CORBA_StringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
@@ -14000,7 +14110,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (CORBA::ULong result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_StringDef_bound_set : public TAO_ServerRequestInfo
 {
@@ -14009,7 +14119,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::StringDef *tao_impl,
-      const CORBA::ULong & bound
+      const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -14051,17 +14161,17 @@ private:
 private:
   POA_CORBA::StringDef *_tao_impl;
   
-  const CORBA::ULong & bound_;
+  const ::CORBA::ULong & bound_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_StringDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::StringDef *tao_impl,
-    const CORBA::ULong & bound
+    const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -14147,7 +14257,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker *
@@ -14230,7 +14340,7 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -14264,7 +14374,7 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -14285,8 +14395,8 @@ CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -14297,7 +14407,7 @@ CORBA__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_TAO_StringDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -14305,7 +14415,7 @@ POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_TAO_StringDef_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_get_bound (
@@ -14318,9 +14428,9 @@ POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_get_bound (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::StringDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::ULong>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::StringDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/StringDef:1.0"
           )
@@ -14331,7 +14441,7 @@ POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_get_bound (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_set_bound (
@@ -14344,13 +14454,13 @@ POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_set_bound (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::StringDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::StringDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
-        ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -14361,7 +14471,7 @@ POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_set_bound (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::StringDef::StringDef (void)
 {
@@ -14381,7 +14491,7 @@ POA_CORBA::StringDef::~StringDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::StringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -14391,16 +14501,16 @@ void POA_CORBA::StringDef::_get_bound_skel (
   )
 {
   POA_CORBA::StringDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::StringDef *,
+    static_cast<
+        POA_CORBA::StringDef *> (
         _tao_servant
       );
   CORBA::ULong _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -14492,23 +14602,30 @@ void POA_CORBA::StringDef::_get_bound_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::StringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -14517,15 +14634,15 @@ void POA_CORBA::StringDef::_set_bound_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::StringDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::StringDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::StringDef *_tao_impl =
+    static_cast<
+        POA_CORBA::StringDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ULong bound;
+  ::CORBA::ULong bound;
   
   if (!(
       (_tao_in >> bound)
@@ -14537,8 +14654,8 @@ POA_CORBA::StringDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -14637,7 +14754,7 @@ POA_CORBA::StringDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::StringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -14797,25 +14914,25 @@ void* POA_CORBA::StringDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/StringDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::StringDef_ptr, this);
+      return static_cast<POA_CORBA::StringDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -14827,7 +14944,7 @@ const char* POA_CORBA::StringDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::StringDef::_dispatch (
     TAO_ServerRequest &req,
@@ -14842,7 +14959,7 @@ void POA_CORBA::StringDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::StringDef *
 POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14882,7 +14999,7 @@ POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_WstringDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -14895,7 +15012,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_WstringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -15017,12 +15134,12 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_WstringDef_Perfect_Hash_OpTable tao_CORBA_WstringDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_WstringDef_bound_get : public TAO_ServerRequestInfo
 {
@@ -15078,7 +15195,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
@@ -15165,7 +15282,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::ULong result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_WstringDef_bound_set : public TAO_ServerRequestInfo
 {
@@ -15174,7 +15291,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::WstringDef *tao_impl,
-      const CORBA::ULong & bound
+      const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -15216,17 +15333,17 @@ private:
 private:
   POA_CORBA::WstringDef *_tao_impl;
   
-  const CORBA::ULong & bound_;
+  const ::CORBA::ULong & bound_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_WstringDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::WstringDef *tao_impl,
-    const CORBA::ULong & bound
+    const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -15312,7 +15429,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker *
@@ -15395,7 +15512,7 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -15429,7 +15546,7 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -15450,8 +15567,8 @@ CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -15462,7 +15579,7 @@ CORBA__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_TAO_WstringDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -15470,7 +15587,7 @@ POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_TAO_WstringDef_ThruPOA_Proxy_Imp
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_get_bound (
@@ -15483,9 +15600,9 @@ POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_get_bound (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::WstringDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::ULong>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::WstringDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/WstringDef:1.0"
           )
@@ -15496,7 +15613,7 @@ POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_get_bound (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_set_bound (
@@ -15509,13 +15626,13 @@ POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_set_bound (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::WstringDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::WstringDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
-        ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -15526,7 +15643,7 @@ POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_set_bound (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::WstringDef::WstringDef (void)
 {
@@ -15546,7 +15663,7 @@ POA_CORBA::WstringDef::~WstringDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::WstringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -15556,16 +15673,16 @@ void POA_CORBA::WstringDef::_get_bound_skel (
   )
 {
   POA_CORBA::WstringDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::WstringDef *,
+    static_cast<
+        POA_CORBA::WstringDef *> (
         _tao_servant
       );
   CORBA::ULong _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -15657,23 +15774,30 @@ void POA_CORBA::WstringDef::_get_bound_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::WstringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -15682,15 +15806,15 @@ void POA_CORBA::WstringDef::_set_bound_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::WstringDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::WstringDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::WstringDef *_tao_impl =
+    static_cast<
+        POA_CORBA::WstringDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ULong bound;
+  ::CORBA::ULong bound;
   
   if (!(
       (_tao_in >> bound)
@@ -15702,8 +15826,8 @@ POA_CORBA::WstringDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -15802,7 +15926,7 @@ POA_CORBA::WstringDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::WstringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -15962,25 +16086,25 @@ void* POA_CORBA::WstringDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/WstringDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::WstringDef_ptr, this);
+      return static_cast<POA_CORBA::WstringDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -15992,7 +16116,7 @@ const char* POA_CORBA::WstringDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::WstringDef::_dispatch (
     TAO_ServerRequest &req,
@@ -16007,7 +16131,7 @@ void POA_CORBA::WstringDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::WstringDef *
 POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -16047,7 +16171,7 @@ POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_SequenceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -16060,7 +16184,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -16185,12 +16309,12 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 static TAO_CORBA_SequenceDef_Perfect_Hash_OpTable tao_CORBA_SequenceDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get : public TAO_ServerRequestInfo
 {
@@ -16246,7 +16370,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
@@ -16333,7 +16457,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::ULong result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set : public TAO_ServerRequestInfo
 {
@@ -16342,7 +16466,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::SequenceDef *tao_impl,
-      const CORBA::ULong & bound
+      const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -16384,17 +16508,17 @@ private:
 private:
   POA_CORBA::SequenceDef *_tao_impl;
   
-  const CORBA::ULong & bound_;
+  const ::CORBA::ULong & bound_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::SequenceDef *tao_impl,
-    const CORBA::ULong & bound
+    const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -16474,7 +16598,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_ServerRequestInfo
 {
@@ -16530,7 +16654,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -16617,7 +16741,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::TypeCod
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get : public TAO_ServerRequestInfo
 {
@@ -16673,7 +16797,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
@@ -16760,7 +16884,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (::CORBA::I
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set : public TAO_ServerRequestInfo
 {
@@ -16769,7 +16893,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::SequenceDef *tao_impl,
-      CORBA::IDLType_ptr element_type_def
+      ::CORBA::IDLType_ptr element_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -16811,17 +16935,17 @@ private:
 private:
   POA_CORBA::SequenceDef *_tao_impl;
   
-  CORBA::IDLType_ptr element_type_def_;
+  ::CORBA::IDLType_ptr element_type_def_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::SequenceDef *tao_impl,
-    CORBA::IDLType_ptr element_type_def
+    ::CORBA::IDLType_ptr element_type_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -16907,7 +17031,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker *
@@ -16990,7 +17114,7 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -17024,7 +17148,7 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -17045,8 +17169,8 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -17057,7 +17181,7 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_TAO_SequenceDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -17065,7 +17189,7 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_TAO_SequenceDef_ThruPOA_Proxy_I
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_bound (
@@ -17078,9 +17202,9 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_bound (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::SequenceDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::ULong>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::SequenceDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/SequenceDef:1.0"
           )
@@ -17091,7 +17215,7 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_bound (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_set_bound (
@@ -17104,20 +17228,20 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_set_bound (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::SequenceDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::SequenceDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
-        ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_element_type (
@@ -17130,9 +17254,9 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_element_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::SequenceDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::SequenceDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/SequenceDef:1.0"
           )
@@ -17143,7 +17267,7 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_element_type (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_element_type_def (
@@ -17156,9 +17280,9 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_element_type_def (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::IDLType>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::SequenceDef_ptr,
+  ((TAO::Arg_Traits< CORBA::IDLType>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::SequenceDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/SequenceDef:1.0"
           )
@@ -17169,7 +17293,7 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_element_type_def (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_set_element_type_def (
@@ -17182,13 +17306,13 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_set_element_type_def (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::SequenceDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::SequenceDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
-        ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -17199,7 +17323,7 @@ POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_set_element_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::SequenceDef::SequenceDef (void)
 {
@@ -17219,7 +17343,7 @@ POA_CORBA::SequenceDef::~SequenceDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::SequenceDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -17229,16 +17353,16 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
   )
 {
   POA_CORBA::SequenceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::SequenceDef *,
+    static_cast<
+        POA_CORBA::SequenceDef *> (
         _tao_servant
       );
   CORBA::ULong _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17330,23 +17454,30 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::SequenceDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -17355,15 +17486,15 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::SequenceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::SequenceDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::SequenceDef *_tao_impl =
+    static_cast<
+        POA_CORBA::SequenceDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ULong bound;
+  ::CORBA::ULong bound;
   
   if (!(
       (_tao_in >> bound)
@@ -17375,8 +17506,8 @@ POA_CORBA::SequenceDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17475,7 +17606,7 @@ POA_CORBA::SequenceDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::SequenceDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -17485,16 +17616,16 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
   )
 {
   POA_CORBA::SequenceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::SequenceDef *,
+    static_cast<
+        POA_CORBA::SequenceDef *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17587,23 +17718,30 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::SequenceDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -17613,16 +17751,16 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
   )
 {
   POA_CORBA::SequenceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::SequenceDef *,
+    static_cast<
+        POA_CORBA::SequenceDef *> (
         _tao_servant
       );
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17715,23 +17853,30 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::SequenceDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -17740,15 +17885,15 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::SequenceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::SequenceDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::SequenceDef *_tao_impl =
+    static_cast<
+        POA_CORBA::SequenceDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::IDLType_var element_type_def;
+  ::CORBA::IDLType_var element_type_def;
   
   if (!(
       (_tao_in >> element_type_def.out ())
@@ -17760,8 +17905,8 @@ POA_CORBA::SequenceDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17860,7 +18005,7 @@ POA_CORBA::SequenceDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::SequenceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -18020,25 +18165,25 @@ void* POA_CORBA::SequenceDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/SequenceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::SequenceDef_ptr, this);
+      return static_cast<POA_CORBA::SequenceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -18050,7 +18195,7 @@ const char* POA_CORBA::SequenceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::SequenceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -18065,7 +18210,7 @@ void POA_CORBA::SequenceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::SequenceDef *
 POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -18105,7 +18250,7 @@ POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ArrayDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -18118,7 +18263,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -18243,12 +18388,12 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_ArrayDef_Perfect_Hash_OpTable tao_CORBA_ArrayDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ArrayDef_length_get : public TAO_ServerRequestInfo
 {
@@ -18304,7 +18449,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (
     TAO_ServerRequest &_tao_server_request,
@@ -18391,7 +18536,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::ULong result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ArrayDef_length_set : public TAO_ServerRequestInfo
 {
@@ -18400,7 +18545,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ArrayDef *tao_impl,
-      const CORBA::ULong & length
+      const ::CORBA::ULong & length
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -18442,17 +18587,17 @@ private:
 private:
   POA_CORBA::ArrayDef *_tao_impl;
   
-  const CORBA::ULong & length_;
+  const ::CORBA::ULong & length_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_ArrayDef_length_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ArrayDef *tao_impl,
-    const CORBA::ULong & length
+    const ::CORBA::ULong & length
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -18532,7 +18677,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ServerRequestInfo
 {
@@ -18588,7 +18733,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -18675,7 +18820,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::TypeCode_p
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get : public TAO_ServerRequestInfo
 {
@@ -18731,7 +18876,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
@@ -18818,7 +18963,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (::CORBA::IDLT
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set : public TAO_ServerRequestInfo
 {
@@ -18827,7 +18972,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ArrayDef *tao_impl,
-      CORBA::IDLType_ptr element_type_def
+      ::CORBA::IDLType_ptr element_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -18869,17 +19014,17 @@ private:
 private:
   POA_CORBA::ArrayDef *_tao_impl;
   
-  CORBA::IDLType_ptr element_type_def_;
+  ::CORBA::IDLType_ptr element_type_def_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ArrayDef *tao_impl,
-    CORBA::IDLType_ptr element_type_def
+    ::CORBA::IDLType_ptr element_type_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -18965,7 +19110,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker *
@@ -19048,7 +19193,7 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -19082,7 +19227,7 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -19103,8 +19248,8 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -19115,7 +19260,7 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_TAO_ArrayDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -19123,7 +19268,7 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_TAO_ArrayDef_ThruPOA_Proxy_Impl (v
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_length (
@@ -19136,9 +19281,9 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_length (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ArrayDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::ULong>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ArrayDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ArrayDef:1.0"
           )
@@ -19149,7 +19294,7 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_length (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_set_length (
@@ -19162,20 +19307,20 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_set_length (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ArrayDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ArrayDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
-        ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_element_type (
@@ -19188,9 +19333,9 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_element_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ArrayDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ArrayDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ArrayDef:1.0"
           )
@@ -19201,7 +19346,7 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_element_type (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_element_type_def (
@@ -19214,9 +19359,9 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_element_type_def (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::IDLType>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ArrayDef_ptr,
+  ((TAO::Arg_Traits< CORBA::IDLType>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ArrayDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ArrayDef:1.0"
           )
@@ -19227,7 +19372,7 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_element_type_def (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_set_element_type_def (
@@ -19240,13 +19385,13 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_set_element_type_def (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ArrayDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ArrayDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
-        ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -19257,7 +19402,7 @@ POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_set_element_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ArrayDef::ArrayDef (void)
 {
@@ -19277,7 +19422,7 @@ POA_CORBA::ArrayDef::~ArrayDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ArrayDef::_get_length_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -19287,16 +19432,16 @@ void POA_CORBA::ArrayDef::_get_length_skel (
   )
 {
   POA_CORBA::ArrayDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ArrayDef *,
+    static_cast<
+        POA_CORBA::ArrayDef *> (
         _tao_servant
       );
   CORBA::ULong _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19388,23 +19533,30 @@ void POA_CORBA::ArrayDef::_get_length_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ArrayDef::_set_length_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -19413,15 +19565,15 @@ void POA_CORBA::ArrayDef::_set_length_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ArrayDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ArrayDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ArrayDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ArrayDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ULong length;
+  ::CORBA::ULong length;
   
   if (!(
       (_tao_in >> length)
@@ -19433,8 +19585,8 @@ POA_CORBA::ArrayDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19533,7 +19685,7 @@ POA_CORBA::ArrayDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ArrayDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -19543,16 +19695,16 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
   )
 {
   POA_CORBA::ArrayDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ArrayDef *,
+    static_cast<
+        POA_CORBA::ArrayDef *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19645,23 +19797,30 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ArrayDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -19671,16 +19830,16 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
   )
 {
   POA_CORBA::ArrayDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ArrayDef *,
+    static_cast<
+        POA_CORBA::ArrayDef *> (
         _tao_servant
       );
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19773,23 +19932,30 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ArrayDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -19798,15 +19964,15 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ArrayDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ArrayDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ArrayDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ArrayDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::IDLType_var element_type_def;
+  ::CORBA::IDLType_var element_type_def;
   
   if (!(
       (_tao_in >> element_type_def.out ())
@@ -19818,8 +19984,8 @@ POA_CORBA::ArrayDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19918,7 +20084,7 @@ POA_CORBA::ArrayDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ArrayDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -20078,25 +20244,25 @@ void* POA_CORBA::ArrayDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ArrayDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ArrayDef_ptr, this);
+      return static_cast<POA_CORBA::ArrayDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -20108,7 +20274,7 @@ const char* POA_CORBA::ArrayDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ArrayDef::_dispatch (
     TAO_ServerRequest &req,
@@ -20123,7 +20289,7 @@ void POA_CORBA::ArrayDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ArrayDef *
 POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -20163,7 +20329,7 @@ POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -20176,7 +20342,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -20330,12 +20496,12 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable tao_CORBA_ExceptionDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get : public TAO_ServerRequestInfo
 {
@@ -20391,7 +20557,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -20478,7 +20644,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::TypeCode_ptr r
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get : public TAO_ServerRequestInfo
 {
@@ -20534,7 +20700,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
@@ -20621,7 +20787,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (::CORBA::StructMem
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set : public TAO_ServerRequestInfo
 {
@@ -20630,7 +20796,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExceptionDef *tao_impl,
-      const CORBA::StructMemberSeq & members
+      const ::CORBA::StructMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -20672,17 +20838,17 @@ private:
 private:
   POA_CORBA::ExceptionDef *_tao_impl;
   
-  const CORBA::StructMemberSeq & members_;
+  const ::CORBA::StructMemberSeq & members_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExceptionDef *tao_impl,
-    const CORBA::StructMemberSeq & members
+    const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -20768,7 +20934,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker *
@@ -20851,7 +21017,7 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -20885,7 +21051,7 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -20906,8 +21072,8 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -20918,7 +21084,7 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -20926,7 +21092,7 @@ POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_ExceptionDef_ThruPOA_Proxy
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_type (
@@ -20939,9 +21105,9 @@ POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ExceptionDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ExceptionDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ExceptionDef:1.0"
           )
@@ -20952,7 +21118,7 @@ POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_type (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_members (
@@ -20965,9 +21131,9 @@ POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_members (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::StructMemberSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ExceptionDef_ptr,
+  ((TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ExceptionDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ExceptionDef:1.0"
           )
@@ -20978,7 +21144,7 @@ POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_members (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_set_members (
@@ -20991,13 +21157,13 @@ POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_set_members (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ExceptionDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ExceptionDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
-        ((TAO::Arg_Traits<CORBA::StructMemberSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -21008,7 +21174,7 @@ POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_set_members (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ExceptionDef::ExceptionDef (void)
 {
@@ -21029,7 +21195,7 @@ POA_CORBA::ExceptionDef::~ExceptionDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExceptionDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -21039,16 +21205,16 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
   )
 {
   POA_CORBA::ExceptionDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExceptionDef *,
+    static_cast<
+        POA_CORBA::ExceptionDef *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -21141,23 +21307,30 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExceptionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -21167,16 +21340,16 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
   )
 {
   POA_CORBA::ExceptionDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExceptionDef *,
+    static_cast<
+        POA_CORBA::ExceptionDef *> (
         _tao_servant
       );
   ::CORBA::StructMemberSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -21269,23 +21442,30 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExceptionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -21294,15 +21474,15 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ExceptionDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExceptionDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ExceptionDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ExceptionDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::StructMemberSeq members;
+  ::CORBA::StructMemberSeq members;
   
   if (!(
       (_tao_in >> members)
@@ -21314,8 +21494,8 @@ POA_CORBA::ExceptionDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -21414,7 +21594,7 @@ POA_CORBA::ExceptionDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ExceptionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -21578,31 +21758,31 @@ void* POA_CORBA::ExceptionDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ExceptionDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ExceptionDef_ptr, this);
+      return static_cast<POA_CORBA::ExceptionDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -21614,7 +21794,7 @@ const char* POA_CORBA::ExceptionDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ExceptionDef::_dispatch (
     TAO_ServerRequest &req,
@@ -21629,7 +21809,7 @@ void POA_CORBA::ExceptionDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ExceptionDef *
 POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -21669,7 +21849,7 @@ POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_AttributeDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -21682,7 +21862,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -21818,12 +21998,12 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_AttributeDef_Perfect_Hash_OpTable tao_CORBA_AttributeDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_AttributeDef_type_get : public TAO_ServerRequestInfo
 {
@@ -21879,7 +22059,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -21966,7 +22146,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::TypeCode_ptr r
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get : public TAO_ServerRequestInfo
 {
@@ -22022,7 +22202,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
@@ -22109,7 +22289,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (::CORBA::IDLType_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set : public TAO_ServerRequestInfo
 {
@@ -22118,7 +22298,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AttributeDef *tao_impl,
-      CORBA::IDLType_ptr type_def
+      ::CORBA::IDLType_ptr type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -22160,17 +22340,17 @@ private:
 private:
   POA_CORBA::AttributeDef *_tao_impl;
   
-  CORBA::IDLType_ptr type_def_;
+  ::CORBA::IDLType_ptr type_def_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AttributeDef *tao_impl,
-    CORBA::IDLType_ptr type_def
+    ::CORBA::IDLType_ptr type_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -22250,7 +22430,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ServerRequestInfo
 {
@@ -22306,7 +22486,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
@@ -22393,7 +22573,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (::CORBA::AttributeMod
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set : public TAO_ServerRequestInfo
 {
@@ -22402,7 +22582,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AttributeDef *tao_impl,
-      CORBA::AttributeMode & mode
+      ::CORBA::AttributeMode & mode
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -22444,17 +22624,17 @@ private:
 private:
   POA_CORBA::AttributeDef *_tao_impl;
   
-  const CORBA::AttributeMode & mode_;
+  const ::CORBA::AttributeMode & mode_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AttributeDef *tao_impl,
-    CORBA::AttributeMode & mode
+    ::CORBA::AttributeMode & mode
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -22540,7 +22720,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker *
@@ -22623,7 +22803,7 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -22657,7 +22837,7 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -22678,8 +22858,8 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -22690,7 +22870,7 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_TAO_AttributeDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -22698,7 +22878,7 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_TAO_AttributeDef_ThruPOA_Proxy
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_type (
@@ -22711,9 +22891,9 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::AttributeDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::AttributeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/AttributeDef:1.0"
           )
@@ -22724,7 +22904,7 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_type (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_type_def (
@@ -22737,9 +22917,9 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_type_def (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::IDLType>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::AttributeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::IDLType>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::AttributeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/AttributeDef:1.0"
           )
@@ -22750,7 +22930,7 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_type_def (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_type_def (
@@ -22763,20 +22943,20 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_type_def (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::AttributeDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::AttributeDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
-        ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_mode (
@@ -22789,9 +22969,9 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_mode (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::AttributeMode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::AttributeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::AttributeMode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::AttributeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/AttributeDef:1.0"
           )
@@ -22802,7 +22982,7 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_mode (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_mode (
@@ -22815,13 +22995,13 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_mode (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::AttributeDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::AttributeDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
-        ((TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -22832,7 +23012,7 @@ POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_mode (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::AttributeDef::AttributeDef (void)
 {
@@ -22852,7 +23032,7 @@ POA_CORBA::AttributeDef::~AttributeDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::AttributeDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -22862,16 +23042,16 @@ void POA_CORBA::AttributeDef::_get_type_skel (
   )
 {
   POA_CORBA::AttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::AttributeDef *,
+    static_cast<
+        POA_CORBA::AttributeDef *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -22964,23 +23144,30 @@ void POA_CORBA::AttributeDef::_get_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::AttributeDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -22990,16 +23177,16 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
   )
 {
   POA_CORBA::AttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::AttributeDef *,
+    static_cast<
+        POA_CORBA::AttributeDef *> (
         _tao_servant
       );
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -23092,23 +23279,30 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::AttributeDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -23117,15 +23311,15 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::AttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::AttributeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::AttributeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::AttributeDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::IDLType_var type_def;
+  ::CORBA::IDLType_var type_def;
   
   if (!(
       (_tao_in >> type_def.out ())
@@ -23137,8 +23331,8 @@ POA_CORBA::AttributeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -23237,7 +23431,7 @@ POA_CORBA::AttributeDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::AttributeDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -23247,16 +23441,16 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
   )
 {
   POA_CORBA::AttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::AttributeDef *,
+    static_cast<
+        POA_CORBA::AttributeDef *> (
         _tao_servant
       );
   ::CORBA::AttributeMode _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -23348,23 +23542,30 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::AttributeDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -23373,15 +23574,15 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::AttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::AttributeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::AttributeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::AttributeDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::AttributeMode mode;
+  ::CORBA::AttributeMode mode;
   
   if (!(
       (_tao_in >> mode)
@@ -23393,8 +23594,8 @@ POA_CORBA::AttributeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -23493,7 +23694,7 @@ POA_CORBA::AttributeDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::AttributeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -23653,25 +23854,25 @@ void* POA_CORBA::AttributeDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/AttributeDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::AttributeDef_ptr, this);
+      return static_cast<POA_CORBA::AttributeDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -23683,7 +23884,7 @@ const char* POA_CORBA::AttributeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::AttributeDef::_dispatch (
     TAO_ServerRequest &req,
@@ -23698,7 +23899,7 @@ void POA_CORBA::AttributeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::AttributeDef *
 POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -23738,7 +23939,7 @@ POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -23751,7 +23952,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -23892,12 +24093,12 @@ TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 static TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable tao_CORBA_ExtAttributeDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get : public TAO_ServerRequestInfo
 {
@@ -23953,7 +24154,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
@@ -24040,7 +24241,7 @@ TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::result (::CORBA:
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set : public TAO_ServerRequestInfo
 {
@@ -24049,7 +24250,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtAttributeDef *tao_impl,
-      const CORBA::ExcDescriptionSeq & get_exceptions
+      const ::CORBA::ExcDescriptionSeq & get_exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -24091,17 +24292,17 @@ private:
 private:
   POA_CORBA::ExtAttributeDef *_tao_impl;
   
-  const CORBA::ExcDescriptionSeq & get_exceptions_;
+  const ::CORBA::ExcDescriptionSeq & get_exceptions_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtAttributeDef *tao_impl,
-    const CORBA::ExcDescriptionSeq & get_exceptions
+    const ::CORBA::ExcDescriptionSeq & get_exceptions
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -24181,7 +24382,7 @@ TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get : public TAO_ServerRequestInfo
 {
@@ -24237,7 +24438,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
@@ -24324,7 +24525,7 @@ TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::result (::CORBA:
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set : public TAO_ServerRequestInfo
 {
@@ -24333,7 +24534,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtAttributeDef *tao_impl,
-      const CORBA::ExcDescriptionSeq & set_exceptions
+      const ::CORBA::ExcDescriptionSeq & set_exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -24375,17 +24576,17 @@ private:
 private:
   POA_CORBA::ExtAttributeDef *_tao_impl;
   
-  const CORBA::ExcDescriptionSeq & set_exceptions_;
+  const ::CORBA::ExcDescriptionSeq & set_exceptions_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtAttributeDef *tao_impl,
-    const CORBA::ExcDescriptionSeq & set_exceptions
+    const ::CORBA::ExcDescriptionSeq & set_exceptions
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -24465,7 +24666,7 @@ TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute : public TAO_ServerRequestInfo
 {
@@ -24521,7 +24722,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute (
     TAO_ServerRequest &_tao_server_request,
@@ -24614,7 +24815,7 @@ TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute::result (::CORBA:
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ExtAttributeDef_Strategized_Proxy_Broker *
@@ -24697,7 +24898,7 @@ POA_CORBA::_TAO_ExtAttributeDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -24731,7 +24932,7 @@ POA_CORBA::_TAO_ExtAttributeDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -24752,8 +24953,8 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExtAttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -24764,7 +24965,7 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -24772,7 +24973,7 @@ POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_TAO_ExtAttributeDef_ThruPOA
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_get_exceptions (
@@ -24785,9 +24986,9 @@ POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_get_exceptions (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExcDescriptionSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ExtAttributeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ExtAttributeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
           )
@@ -24798,7 +24999,7 @@ POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_get_exceptions (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_set_get_exceptions (
@@ -24811,20 +25012,20 @@ POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_set_get_exceptions (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ExtAttributeDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ExtAttributeDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
         )
     )->get_exceptions (
-        ((TAO::Arg_Traits<CORBA::ExcDescriptionSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_set_exceptions (
@@ -24837,9 +25038,9 @@ POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_set_exceptions (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExcDescriptionSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ExtAttributeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ExtAttributeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
           )
@@ -24850,7 +25051,7 @@ POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_set_exceptions (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_set_set_exceptions (
@@ -24863,20 +25064,20 @@ POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_set_set_exceptions (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ExtAttributeDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ExtAttributeDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
         )
     )->set_exceptions (
-        ((TAO::Arg_Traits<CORBA::ExcDescriptionSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::describe_attribute (
@@ -24889,9 +25090,9 @@ POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::describe_attribute (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExtAttributeDescription>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ExtAttributeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ExtAttributeDescription>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ExtAttributeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
           )
@@ -24906,7 +25107,7 @@ POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::describe_attribute (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ExtAttributeDef::ExtAttributeDef (void)
 {
@@ -24927,7 +25128,7 @@ POA_CORBA::ExtAttributeDef::~ExtAttributeDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -24937,16 +25138,16 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
   )
 {
   POA_CORBA::ExtAttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExtAttributeDef *,
+    static_cast<
+        POA_CORBA::ExtAttributeDef *> (
         _tao_servant
       );
   ::CORBA::ExcDescriptionSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25039,23 +25240,30 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -25064,15 +25272,15 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ExtAttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExtAttributeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ExtAttributeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ExtAttributeDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ExcDescriptionSeq get_exceptions;
+  ::CORBA::ExcDescriptionSeq get_exceptions;
   
   if (!(
       (_tao_in >> get_exceptions)
@@ -25084,8 +25292,8 @@ POA_CORBA::ExtAttributeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25184,7 +25392,7 @@ POA_CORBA::ExtAttributeDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -25194,16 +25402,16 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
   )
 {
   POA_CORBA::ExtAttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExtAttributeDef *,
+    static_cast<
+        POA_CORBA::ExtAttributeDef *> (
         _tao_servant
       );
   ::CORBA::ExcDescriptionSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25296,23 +25504,30 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -25321,15 +25536,15 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ExtAttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExtAttributeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ExtAttributeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ExtAttributeDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ExcDescriptionSeq set_exceptions;
+  ::CORBA::ExcDescriptionSeq set_exceptions;
   
   if (!(
       (_tao_in >> set_exceptions)
@@ -25341,8 +25556,8 @@ POA_CORBA::ExtAttributeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25441,7 +25656,7 @@ POA_CORBA::ExtAttributeDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -25451,16 +25666,16 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
   )
 {
   POA_CORBA::ExtAttributeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExtAttributeDef *,
+    static_cast<
+        POA_CORBA::ExtAttributeDef *> (
         _tao_servant
       );
   ::CORBA::ExtAttributeDescription_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25553,23 +25768,30 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ExtAttributeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -25733,31 +25955,31 @@ void* POA_CORBA::ExtAttributeDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/AttributeDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::AttributeDef_ptr, this);
+      return static_cast<POA_CORBA::AttributeDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ExtAttributeDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ExtAttributeDef_ptr, this);
+      return static_cast<POA_CORBA::ExtAttributeDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -25769,7 +25991,7 @@ const char* POA_CORBA::ExtAttributeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ExtAttributeDef::_dispatch (
     TAO_ServerRequest &req,
@@ -25784,7 +26006,7 @@ void POA_CORBA::ExtAttributeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ExtAttributeDef *
 POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -25824,7 +26046,7 @@ POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_OperationDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -25837,7 +26059,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_OperationDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -26032,12 +26254,12 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_OperationDef_Perfect_Hash_OpTable tao_CORBA_OperationDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_result_get : public TAO_ServerRequestInfo
 {
@@ -26093,7 +26315,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_get (
     TAO_ServerRequest &_tao_server_request,
@@ -26180,7 +26402,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (CORBA::TypeCode_ptr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get : public TAO_ServerRequestInfo
 {
@@ -26236,7 +26458,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_ServerRequest &_tao_server_request,
@@ -26323,7 +26545,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (::CORBA::IDLTyp
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set : public TAO_ServerRequestInfo
 {
@@ -26332,7 +26554,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
-      CORBA::IDLType_ptr result_def
+      ::CORBA::IDLType_ptr result_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -26374,17 +26596,17 @@ private:
 private:
   POA_CORBA::OperationDef *_tao_impl;
   
-  CORBA::IDLType_ptr result_def_;
+  ::CORBA::IDLType_ptr result_def_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
-    CORBA::IDLType_ptr result_def
+    ::CORBA::IDLType_ptr result_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -26464,7 +26686,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_params_get : public TAO_ServerRequestInfo
 {
@@ -26520,7 +26742,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::TAO_ServerRequestInfo_CORBA_OperationDef_params_get (
     TAO_ServerRequest &_tao_server_request,
@@ -26607,7 +26829,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (::CORBA::ParDescrip
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_params_set : public TAO_ServerRequestInfo
 {
@@ -26616,7 +26838,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
-      const CORBA::ParDescriptionSeq & params
+      const ::CORBA::ParDescriptionSeq & params
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -26658,17 +26880,17 @@ private:
 private:
   POA_CORBA::OperationDef *_tao_impl;
   
-  const CORBA::ParDescriptionSeq & params_;
+  const ::CORBA::ParDescriptionSeq & params_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA_OperationDef_params_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
-    const CORBA::ParDescriptionSeq & params
+    const ::CORBA::ParDescriptionSeq & params
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -26748,7 +26970,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_mode_get : public TAO_ServerRequestInfo
 {
@@ -26804,7 +27026,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
@@ -26891,7 +27113,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (::CORBA::OperationMod
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_mode_set : public TAO_ServerRequestInfo
 {
@@ -26900,7 +27122,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
-      CORBA::OperationMode & mode
+      ::CORBA::OperationMode & mode
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -26942,17 +27164,17 @@ private:
 private:
   POA_CORBA::OperationDef *_tao_impl;
   
-  const CORBA::OperationMode & mode_;
+  const ::CORBA::OperationMode & mode_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_OperationDef_mode_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
-    CORBA::OperationMode & mode
+    ::CORBA::OperationMode & mode
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -27032,7 +27254,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ServerRequestInfo
 {
@@ -27088,7 +27310,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_ServerRequest &_tao_server_request,
@@ -27175,7 +27397,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (::CORBA::ContextI
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set : public TAO_ServerRequestInfo
 {
@@ -27184,7 +27406,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
-      const CORBA::ContextIdSeq & contexts
+      const ::CORBA::ContextIdSeq & contexts
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -27226,17 +27448,17 @@ private:
 private:
   POA_CORBA::OperationDef *_tao_impl;
   
-  const CORBA::ContextIdSeq & contexts_;
+  const ::CORBA::ContextIdSeq & contexts_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
-    const CORBA::ContextIdSeq & contexts
+    const ::CORBA::ContextIdSeq & contexts
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -27316,7 +27538,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_ServerRequestInfo
 {
@@ -27372,7 +27594,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
@@ -27459,7 +27681,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (::CORBA::Except
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set : public TAO_ServerRequestInfo
 {
@@ -27468,7 +27690,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
-      const CORBA::ExceptionDefSeq & exceptions
+      const ::CORBA::ExceptionDefSeq & exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -27510,17 +27732,17 @@ private:
 private:
   POA_CORBA::OperationDef *_tao_impl;
   
-  const CORBA::ExceptionDefSeq & exceptions_;
+  const ::CORBA::ExceptionDefSeq & exceptions_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
-    const CORBA::ExceptionDefSeq & exceptions
+    const ::CORBA::ExceptionDefSeq & exceptions
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -27606,7 +27828,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker *
@@ -27689,7 +27911,7 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -27723,7 +27945,7 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -27744,8 +27966,8 @@ CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -27756,7 +27978,7 @@ CORBA__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_TAO_OperationDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -27764,7 +27986,7 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_TAO_OperationDef_ThruPOA_Proxy
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result (
@@ -27777,9 +27999,9 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::OperationDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::OperationDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/OperationDef:1.0"
           )
@@ -27790,7 +28012,7 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result_def (
@@ -27803,9 +28025,9 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result_def (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::IDLType>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::OperationDef_ptr,
+  ((TAO::Arg_Traits< CORBA::IDLType>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::OperationDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/OperationDef:1.0"
           )
@@ -27816,7 +28038,7 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result_def (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_result_def (
@@ -27829,20 +28051,20 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_result_def (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::OperationDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
-        ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_params (
@@ -27855,9 +28077,9 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_params (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ParDescriptionSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::OperationDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ParDescriptionSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::OperationDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/OperationDef:1.0"
           )
@@ -27868,7 +28090,7 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_params (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_params (
@@ -27881,20 +28103,20 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_params (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::OperationDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
-        ((TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_mode (
@@ -27907,9 +28129,9 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_mode (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::OperationMode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::OperationDef_ptr,
+  ((TAO::Arg_Traits< CORBA::OperationMode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::OperationDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/OperationDef:1.0"
           )
@@ -27920,7 +28142,7 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_mode (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_mode (
@@ -27933,20 +28155,20 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_mode (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::OperationDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
-        ((TAO::Arg_Traits<CORBA::OperationMode>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_contexts (
@@ -27959,9 +28181,9 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_contexts (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ContextIdSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::OperationDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ContextIdSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::OperationDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/OperationDef:1.0"
           )
@@ -27972,7 +28194,7 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_contexts (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_contexts (
@@ -27985,20 +28207,20 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_contexts (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::OperationDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
-        ((TAO::Arg_Traits<CORBA::ContextIdSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_exceptions (
@@ -28011,9 +28233,9 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_exceptions (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::OperationDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::OperationDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/OperationDef:1.0"
           )
@@ -28024,7 +28246,7 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_exceptions (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_exceptions (
@@ -28037,13 +28259,13 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_exceptions (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::OperationDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
-        ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -28054,7 +28276,7 @@ POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_exceptions (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::OperationDef::OperationDef (void)
 {
@@ -28074,7 +28296,7 @@ POA_CORBA::OperationDef::~OperationDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_get_result_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -28084,16 +28306,16 @@ void POA_CORBA::OperationDef::_get_result_skel (
   )
 {
   POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28186,23 +28408,30 @@ void POA_CORBA::OperationDef::_get_result_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_get_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -28212,16 +28441,16 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
   )
 {
   POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28314,23 +28543,30 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_set_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -28339,15 +28575,15 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::OperationDef *_tao_impl =
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::IDLType_var result_def;
+  ::CORBA::IDLType_var result_def;
   
   if (!(
       (_tao_in >> result_def.out ())
@@ -28359,8 +28595,8 @@ POA_CORBA::OperationDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28459,7 +28695,7 @@ POA_CORBA::OperationDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_get_params_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -28469,16 +28705,16 @@ void POA_CORBA::OperationDef::_get_params_skel (
   )
 {
   POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   ::CORBA::ParDescriptionSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28571,23 +28807,30 @@ void POA_CORBA::OperationDef::_get_params_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_set_params_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -28596,15 +28839,15 @@ void POA_CORBA::OperationDef::_set_params_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::OperationDef *_tao_impl =
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ParDescriptionSeq params;
+  ::CORBA::ParDescriptionSeq params;
   
   if (!(
       (_tao_in >> params)
@@ -28616,8 +28859,8 @@ POA_CORBA::OperationDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28716,7 +28959,7 @@ POA_CORBA::OperationDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -28726,16 +28969,16 @@ void POA_CORBA::OperationDef::_get_mode_skel (
   )
 {
   POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   ::CORBA::OperationMode _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28827,23 +29070,30 @@ void POA_CORBA::OperationDef::_get_mode_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -28852,15 +29102,15 @@ void POA_CORBA::OperationDef::_set_mode_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::OperationDef *_tao_impl =
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::OperationMode mode;
+  ::CORBA::OperationMode mode;
   
   if (!(
       (_tao_in >> mode)
@@ -28872,8 +29122,8 @@ POA_CORBA::OperationDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28972,7 +29222,7 @@ POA_CORBA::OperationDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_get_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -28982,16 +29232,16 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
   )
 {
   POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   ::CORBA::ContextIdSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29084,23 +29334,30 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_set_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -29109,15 +29366,15 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::OperationDef *_tao_impl =
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ContextIdSeq contexts;
+  ::CORBA::ContextIdSeq contexts;
   
   if (!(
       (_tao_in >> contexts)
@@ -29129,8 +29386,8 @@ POA_CORBA::OperationDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29229,7 +29486,7 @@ POA_CORBA::OperationDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_get_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -29239,16 +29496,16 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
   )
 {
   POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   ::CORBA::ExceptionDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29341,23 +29598,30 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::OperationDef::_set_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -29366,15 +29630,15 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::OperationDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::OperationDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::OperationDef *_tao_impl =
+    static_cast<
+        POA_CORBA::OperationDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ExceptionDefSeq exceptions;
+  ::CORBA::ExceptionDefSeq exceptions;
   
   if (!(
       (_tao_in >> exceptions)
@@ -29386,8 +29650,8 @@ POA_CORBA::OperationDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29486,7 +29750,7 @@ POA_CORBA::OperationDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::OperationDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -29646,25 +29910,25 @@ void* POA_CORBA::OperationDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::OperationDef_ptr, this);
+      return static_cast<POA_CORBA::OperationDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -29676,7 +29940,7 @@ const char* POA_CORBA::OperationDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::OperationDef::_dispatch (
     TAO_ServerRequest &req,
@@ -29691,7 +29955,7 @@ void POA_CORBA::OperationDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::OperationDef *
 POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -29731,7 +29995,7 @@ POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -29744,7 +30008,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -29903,12 +30167,12 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get : public TAO_ServerRequestInfo
 {
@@ -29964,7 +30228,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
@@ -30051,7 +30315,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (::CORBA::I
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set : public TAO_ServerRequestInfo
 {
@@ -30060,7 +30324,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::InterfaceDef *tao_impl,
-      const CORBA::InterfaceDefSeq & base_interfaces
+      const ::CORBA::InterfaceDefSeq & base_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -30102,17 +30366,17 @@ private:
 private:
   POA_CORBA::InterfaceDef *_tao_impl;
   
-  const CORBA::InterfaceDefSeq & base_interfaces_;
+  const ::CORBA::InterfaceDefSeq & base_interfaces_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::InterfaceDef *tao_impl,
-    const CORBA::InterfaceDefSeq & base_interfaces
+    const ::CORBA::InterfaceDefSeq & base_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -30192,7 +30456,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ServerRequestInfo
 {
@@ -30250,7 +30514,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a (
     TAO_ServerRequest &_tao_server_request,
@@ -30347,7 +30611,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Boolean result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface : public TAO_ServerRequestInfo
 {
@@ -30403,7 +30667,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_ServerRequest &_tao_server_request,
@@ -30490,7 +30754,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (::CORBA::In
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute : public TAO_ServerRequestInfo
 {
@@ -30502,8 +30766,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
-      CORBA::AttributeMode & mode
+      ::CORBA::IDLType_ptr type,
+      ::CORBA::AttributeMode & mode
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -30550,13 +30814,13 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
-  const CORBA::AttributeMode & mode_;
+  ::CORBA::IDLType_ptr type_;
+  const ::CORBA::AttributeMode & mode_;
   ::CORBA::AttributeDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute (
     TAO_ServerRequest &_tao_server_request,
@@ -30565,8 +30829,8 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode & mode
+    ::CORBA::IDLType_ptr type,
+    ::CORBA::AttributeMode & mode
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -30677,7 +30941,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (::CORBA::Attr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation : public TAO_ServerRequestInfo
 {
@@ -30689,11 +30953,11 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
-      CORBA::OperationMode & mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts
+      ::CORBA::IDLType_ptr result,
+      ::CORBA::OperationMode & mode,
+      const ::CORBA::ParDescriptionSeq & params,
+      const ::CORBA::ExceptionDefSeq & exceptions,
+      const ::CORBA::ContextIdSeq & contexts
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -30740,16 +31004,16 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr result_;
-  const CORBA::OperationMode & mode_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
-  const CORBA::ContextIdSeq & contexts_;
+  ::CORBA::IDLType_ptr result_;
+  const ::CORBA::OperationMode & mode_;
+  const ::CORBA::ParDescriptionSeq & params_;
+  const ::CORBA::ExceptionDefSeq & exceptions_;
+  const ::CORBA::ContextIdSeq & contexts_;
   ::CORBA::OperationDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation (
     TAO_ServerRequest &_tao_server_request,
@@ -30758,11 +31022,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode & mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
+    ::CORBA::IDLType_ptr result,
+    ::CORBA::OperationMode & mode,
+    const ::CORBA::ParDescriptionSeq & params,
+    const ::CORBA::ExceptionDefSeq & exceptions,
+    const ::CORBA::ContextIdSeq & contexts
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -30894,7 +31158,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (::CORBA::Oper
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker *
@@ -30977,7 +31241,7 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -31011,7 +31275,7 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -31032,8 +31296,8 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -31044,7 +31308,7 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -31052,7 +31316,7 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_InterfaceDef_ThruPOA_Proxy
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
@@ -31065,9 +31329,9 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::InterfaceDef_ptr,
+  ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::InterfaceDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/InterfaceDef:1.0"
           )
@@ -31078,7 +31342,7 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
@@ -31091,20 +31355,20 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::InterfaceDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::InterfaceDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
-        ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
@@ -31117,21 +31381,21 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::InterfaceDef_ptr,
+  ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::InterfaceDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/InterfaceDef:1.0"
           )
       )->is_a (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
@@ -31144,9 +31408,9 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::InterfaceDef_ptr,
+  ((TAO::Arg_Traits< CORBA::InterfaceDef::FullInterfaceDescription>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::InterfaceDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/InterfaceDef:1.0"
           )
@@ -31157,7 +31421,7 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
@@ -31170,25 +31434,25 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::AttributeDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::InterfaceDef_ptr,
+  ((TAO::Arg_Traits< CORBA::AttributeDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::InterfaceDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/InterfaceDef:1.0"
           )
       )->create_attribute (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val *) args[5])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val *) args[5])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
@@ -31201,21 +31465,21 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::OperationDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::InterfaceDef_ptr,
+  ((TAO::Arg_Traits< CORBA::OperationDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::InterfaceDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/InterfaceDef:1.0"
           )
       )->create_operation (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::OperationMode>::in_arg_val *) args[5])->arg (),
-          ((TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val *) args[6])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val *) args[7])->arg (),
-          ((TAO::Arg_Traits<CORBA::ContextIdSeq>::in_arg_val *) args[8])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val *) args[5])->arg (),
+          ((TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val *) args[6])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val *) args[7])->arg (),
+          ((TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val *) args[8])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -31226,7 +31490,7 @@ POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::InterfaceDef::InterfaceDef (void)
 {
@@ -31248,7 +31512,7 @@ POA_CORBA::InterfaceDef::~InterfaceDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -31258,16 +31522,16 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
   )
 {
   POA_CORBA::InterfaceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::InterfaceDef *,
+    static_cast<
+        POA_CORBA::InterfaceDef *> (
         _tao_servant
       );
   ::CORBA::InterfaceDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -31360,23 +31624,30 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -31385,15 +31656,15 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::InterfaceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::InterfaceDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::InterfaceDef *_tao_impl =
+    static_cast<
+        POA_CORBA::InterfaceDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::InterfaceDefSeq base_interfaces;
+  ::CORBA::InterfaceDefSeq base_interfaces;
   
   if (!(
       (_tao_in >> base_interfaces)
@@ -31405,8 +31676,8 @@ POA_CORBA::InterfaceDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -31505,7 +31776,7 @@ POA_CORBA::InterfaceDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::InterfaceDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -31514,14 +31785,14 @@ void POA_CORBA::InterfaceDef::is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::InterfaceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::InterfaceDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::InterfaceDef *_tao_impl =
+    static_cast<
+        POA_CORBA::InterfaceDef *> (
         _tao_servant
       );
   CORBA::Boolean _tao_retval = 0;
-  CORBA::String_var interface_id;
+  ::CORBA::String_var interface_id;
   
   if (!(
       (_tao_in >> interface_id.out ())
@@ -31533,8 +31804,8 @@ POA_CORBA::InterfaceDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -31629,23 +31900,30 @@ POA_CORBA::InterfaceDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::InterfaceDef::describe_interface_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -31655,16 +31933,16 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
   )
 {
   POA_CORBA::InterfaceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::InterfaceDef *,
+    static_cast<
+        POA_CORBA::InterfaceDef *> (
         _tao_servant
       );
   ::CORBA::InterfaceDef::FullInterfaceDescription_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -31757,23 +32035,30 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::InterfaceDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -31782,18 +32067,18 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::InterfaceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::InterfaceDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::InterfaceDef *_tao_impl =
+    static_cast<
+        POA_CORBA::InterfaceDef *> (
         _tao_servant
       );
   ::CORBA::AttributeDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var type;
-  CORBA::AttributeMode mode;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var type;
+  ::CORBA::AttributeMode mode;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -31809,8 +32094,8 @@ POA_CORBA::InterfaceDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -31922,23 +32207,30 @@ POA_CORBA::InterfaceDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::InterfaceDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -31947,21 +32239,21 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::InterfaceDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::InterfaceDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::InterfaceDef *_tao_impl =
+    static_cast<
+        POA_CORBA::InterfaceDef *> (
         _tao_servant
       );
   ::CORBA::OperationDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var result;
-  CORBA::OperationMode mode;
-  CORBA::ParDescriptionSeq params;
-  CORBA::ExceptionDefSeq exceptions;
-  CORBA::ContextIdSeq contexts;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var result;
+  ::CORBA::OperationMode mode;
+  ::CORBA::ParDescriptionSeq params;
+  ::CORBA::ExceptionDefSeq exceptions;
+  ::CORBA::ContextIdSeq contexts;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -31980,8 +32272,8 @@ POA_CORBA::InterfaceDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -32105,23 +32397,30 @@ POA_CORBA::InterfaceDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::InterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -32289,37 +32588,37 @@ void* POA_CORBA::InterfaceDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::InterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -32331,7 +32630,7 @@ const char* POA_CORBA::InterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::InterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -32346,7 +32645,7 @@ void POA_CORBA::InterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::InterfaceDef *
 POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -32386,7 +32685,7 @@ POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -32399,7 +32698,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -32500,12 +32799,12 @@ TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable tao_CORBA_InterfaceAttrExtension_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface : public TAO_ServerRequestInfo
 {
@@ -32561,7 +32860,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface (
     TAO_ServerRequest &_tao_server_request,
@@ -32648,7 +32947,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::resul
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute : public TAO_ServerRequestInfo
 {
@@ -32660,10 +32959,10 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
-      CORBA::AttributeMode & mode,
-      const CORBA::ExceptionDefSeq & get_exceptions,
-      const CORBA::ExceptionDefSeq & set_exceptions
+      ::CORBA::IDLType_ptr type,
+      ::CORBA::AttributeMode & mode,
+      const ::CORBA::ExceptionDefSeq & get_exceptions,
+      const ::CORBA::ExceptionDefSeq & set_exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -32710,15 +33009,15 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
-  const CORBA::AttributeMode & mode_;
-  const CORBA::ExceptionDefSeq & get_exceptions_;
-  const CORBA::ExceptionDefSeq & set_exceptions_;
+  ::CORBA::IDLType_ptr type_;
+  const ::CORBA::AttributeMode & mode_;
+  const ::CORBA::ExceptionDefSeq & get_exceptions_;
+  const ::CORBA::ExceptionDefSeq & set_exceptions_;
   ::CORBA::ExtAttributeDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute (
     TAO_ServerRequest &_tao_server_request,
@@ -32727,10 +33026,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::TAO_Ser
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
+    ::CORBA::IDLType_ptr type,
+    ::CORBA::AttributeMode & mode,
+    const ::CORBA::ExceptionDefSeq & get_exceptions,
+    const ::CORBA::ExceptionDefSeq & set_exceptions
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -32857,7 +33156,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::result
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_InterfaceAttrExtension_Strategized_Proxy_Broker *
@@ -32940,7 +33239,7 @@ POA_CORBA::_TAO_InterfaceAttrExtension_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -32974,7 +33273,7 @@ POA_CORBA::_TAO_InterfaceAttrExtension_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -32995,8 +33294,8 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer
         )
     );
@@ -33007,7 +33306,7 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Stub_Factory_Initializer_Scarecro
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl (void)
 {}
@@ -33015,7 +33314,7 @@ POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::_TAO_InterfaceAttrExt
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::describe_ext_interface (
@@ -33028,9 +33327,9 @@ POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::describe_ext_interfac
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::InterfaceAttrExtension_ptr,
+  ((TAO::Arg_Traits< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::InterfaceAttrExtension_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
           )
@@ -33041,7 +33340,7 @@ POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::describe_ext_interfac
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::create_ext_attribute (
@@ -33054,20 +33353,20 @@ POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::create_ext_attribute
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExtAttributeDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::InterfaceAttrExtension_ptr,
+  ((TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::InterfaceAttrExtension_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
           )
       )->create_ext_attribute (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val *) args[5])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val *) args[6])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val *) args[7])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val *) args[5])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val *) args[6])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val *) args[7])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -33078,7 +33377,7 @@ POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::create_ext_attribute
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::InterfaceAttrExtension::InterfaceAttrExtension (void)
 {
@@ -33096,7 +33395,7 @@ POA_CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -33106,16 +33405,16 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
   )
 {
   POA_CORBA::InterfaceAttrExtension *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::InterfaceAttrExtension *,
+    static_cast<
+        POA_CORBA::InterfaceAttrExtension *> (
         _tao_servant
       );
   ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -33208,23 +33507,30 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -33233,20 +33539,20 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::InterfaceAttrExtension *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::InterfaceAttrExtension *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::InterfaceAttrExtension *_tao_impl =
+    static_cast<
+        POA_CORBA::InterfaceAttrExtension *> (
         _tao_servant
       );
   ::CORBA::ExtAttributeDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var type;
-  CORBA::AttributeMode mode;
-  CORBA::ExceptionDefSeq get_exceptions;
-  CORBA::ExceptionDefSeq set_exceptions;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var type;
+  ::CORBA::AttributeMode mode;
+  ::CORBA::ExceptionDefSeq get_exceptions;
+  ::CORBA::ExceptionDefSeq set_exceptions;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -33264,8 +33570,8 @@ POA_CORBA::InterfaceAttrExtension *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -33385,23 +33691,30 @@ POA_CORBA::InterfaceAttrExtension *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -33553,13 +33866,13 @@ void* POA_CORBA::InterfaceAttrExtension::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceAttrExtension_ptr, this);
+      return static_cast<POA_CORBA::InterfaceAttrExtension_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -33571,7 +33884,7 @@ const char* POA_CORBA::InterfaceAttrExtension::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::InterfaceAttrExtension::_dispatch (
     TAO_ServerRequest &req,
@@ -33586,7 +33899,7 @@ void POA_CORBA::InterfaceAttrExtension::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::InterfaceAttrExtension *
 POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -33626,7 +33939,7 @@ POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -33639,7 +33952,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -33800,7 +34113,7 @@ TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 static TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable tao_CORBA_ExtInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -33811,7 +34124,7 @@ static TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable tao_CORBA_ExtInterfaceDef_
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ExtInterfaceDef_Strategized_Proxy_Broker *
@@ -33894,7 +34207,7 @@ POA_CORBA::_TAO_ExtInterfaceDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -33928,7 +34241,7 @@ POA_CORBA::_TAO_ExtInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -33949,8 +34262,8 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -33961,7 +34274,7 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -33973,7 +34286,7 @@ POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_TAO_ExtInterfaceDef_ThruPOA
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ExtInterfaceDef::ExtInterfaceDef (void)
 {
@@ -33997,7 +34310,7 @@ POA_CORBA::ExtInterfaceDef::~ExtInterfaceDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ExtInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -34173,49 +34486,49 @@ void* POA_CORBA::ExtInterfaceDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::InterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceAttrExtension_ptr, this);
+      return static_cast<POA_CORBA::InterfaceAttrExtension_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ExtInterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ExtInterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::ExtInterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -34227,7 +34540,7 @@ const char* POA_CORBA::ExtInterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ExtInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -34242,7 +34555,7 @@ void POA_CORBA::ExtInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ExtInterfaceDef *
 POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -34282,7 +34595,7 @@ POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -34295,7 +34608,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -34454,7 +34767,7 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -34465,7 +34778,7 @@ static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInt
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker *
@@ -34548,7 +34861,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -34582,7 +34895,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -34603,8 +34916,8 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -34615,7 +34928,7 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -34627,7 +34940,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_TAO_AbstractInterfaceD
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::AbstractInterfaceDef::AbstractInterfaceDef (void)
 {
@@ -34650,7 +34963,7 @@ POA_CORBA::AbstractInterfaceDef::~AbstractInterfaceDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -34822,43 +35135,43 @@ void* POA_CORBA::AbstractInterfaceDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::InterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::AbstractInterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::AbstractInterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -34870,7 +35183,7 @@ const char* POA_CORBA::AbstractInterfaceDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::AbstractInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -34885,7 +35198,7 @@ void POA_CORBA::AbstractInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::AbstractInterfaceDef *
 POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -34925,7 +35238,7 @@ POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -34938,7 +35251,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -35099,7 +35412,7 @@ TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_ExtAbstractInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -35110,7 +35423,7 @@ static TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_ExtAbstr
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker *
@@ -35193,7 +35506,7 @@ POA_CORBA::_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -35227,7 +35540,7 @@ POA_CORBA::_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -35248,8 +35561,8 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -35260,7 +35573,7 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -35272,7 +35585,7 @@ POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_TAO_ExtAbstractInte
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (void)
 {
@@ -35297,7 +35610,7 @@ POA_CORBA::ExtAbstractInterfaceDef::~ExtAbstractInterfaceDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -35477,55 +35790,55 @@ void* POA_CORBA::ExtAbstractInterfaceDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::InterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::AbstractInterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::AbstractInterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceAttrExtension_ptr, this);
+      return static_cast<POA_CORBA::InterfaceAttrExtension_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ExtAbstractInterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::ExtAbstractInterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -35537,7 +35850,7 @@ const char* POA_CORBA::ExtAbstractInterfaceDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ExtAbstractInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -35552,7 +35865,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ExtAbstractInterfaceDef *
 POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -35592,7 +35905,7 @@ POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -35605,7 +35918,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -35764,7 +36077,7 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig
 static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -35775,7 +36088,7 @@ static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterface
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker *
@@ -35858,7 +36171,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -35892,7 +36205,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -35913,8 +36226,8 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -35925,7 +36238,7 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -35937,7 +36250,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_TAO_LocalInterfaceDef_Thr
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::LocalInterfaceDef::LocalInterfaceDef (void)
 {
@@ -35960,7 +36273,7 @@ POA_CORBA::LocalInterfaceDef::~LocalInterfaceDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::LocalInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -36132,43 +36445,43 @@ void* POA_CORBA::LocalInterfaceDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::InterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/LocalInterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::LocalInterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::LocalInterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -36180,7 +36493,7 @@ const char* POA_CORBA::LocalInterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::LocalInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -36195,7 +36508,7 @@ void POA_CORBA::LocalInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::LocalInterfaceDef *
 POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -36235,7 +36548,7 @@ POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -36248,7 +36561,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -36409,7 +36722,7 @@ TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 static TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_ExtLocalInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -36420,7 +36733,7 @@ static TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_ExtLocalInt
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker *
@@ -36503,7 +36816,7 @@ POA_CORBA::_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -36537,7 +36850,7 @@ POA_CORBA::_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -36558,8 +36871,8 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -36570,7 +36883,7 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -36582,7 +36895,7 @@ POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_TAO_ExtLocalInterfaceD
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (void)
 {
@@ -36607,7 +36920,7 @@ POA_CORBA::ExtLocalInterfaceDef::~ExtLocalInterfaceDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -36787,55 +37100,55 @@ void* POA_CORBA::ExtLocalInterfaceDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::InterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/LocalInterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::LocalInterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::LocalInterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceAttrExtension_ptr, this);
+      return static_cast<POA_CORBA::InterfaceAttrExtension_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ExtLocalInterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::ExtLocalInterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -36847,7 +37160,7 @@ const char* POA_CORBA::ExtLocalInterfaceDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ExtLocalInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -36862,7 +37175,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ExtLocalInterfaceDef *
 POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -36902,12 +37215,7 @@ POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1739
-
-#if 0 
-/* Useful at a later date.
-At present will be commented out */
-
+// be\be_visitor_root/root.cpp:1683
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -37530,57 +37838,15 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::Contained_ptr, \
-        CORBA::Contained_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::PrimitiveDef_ptr, \
-        CORBA::PrimitiveDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Basic_SArgument_T< \
         CORBA::PrimitiveKind \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::StringDef_ptr, \
-        CORBA::StringDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::WstringDef_ptr, \
-        CORBA::WstringDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::SequenceDef_ptr, \
-        CORBA::SequenceDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::IDLType_ptr \
       >
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ArrayDef_ptr, \
-        CORBA::ArrayDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::FixedDef_ptr, \
-        CORBA::FixedDef_var \
-      >
-
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_
 
@@ -37595,12 +37861,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var \
-      >
-
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_
 
@@ -37616,57 +37876,21 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::StructMemberSeq, \
-        CORBA::StructMemberSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::StructMemberSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::UnionMemberSeq, \
-        CORBA::UnionMemberSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::UnionMemberSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::EnumMemberSeq, \
-        CORBA::EnumMemberSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::EnumMemberSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::InterfaceDefSeq, \
-        CORBA::InterfaceDefSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::InterfaceDefSeq \
       >
@@ -37686,29 +37910,11 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::InterfaceDef::FullInterfaceDescription, \
-        CORBA::InterfaceDef::FullInterfaceDescription_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::AttributeDef_ptr, \
-        CORBA::AttributeDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Basic_SArgument_T< \
         CORBA::AttributeMode \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::OperationDef_ptr, \
-        CORBA::OperationDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Basic_SArgument_T< \
         CORBA::OperationMode \
       >
@@ -37742,12 +37948,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::StructMemberSeq, \
-        CORBA::StructMemberSeq_var \
-      >
-
 #if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
 
@@ -37818,11 +38018,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Basic_SArgument_T< \
-        CORBA::PrimitiveKind \
-      >
-
 #if !defined (_CORBA_STRINGDEF__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_STRINGDEF__SARG_TRAITS_TMPLINST_SS_
 
@@ -37851,12 +38046,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var \
-      >
-
 #if !defined (_CORBA_ARRAYDEF__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_ARRAYDEF__SARG_TRAITS_TMPLINST_SS_
 
@@ -37871,12 +38060,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var \
-      >
-
 #if !defined (_CORBA_WSTRINGDEF__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_WSTRINGDEF__SARG_TRAITS_TMPLINST_SS_
 
@@ -37951,17 +38134,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Basic_SArgument_T< \
-        CORBA::AttributeMode \
-      >
-
 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
 
@@ -37991,28 +38163,10 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ExcDescriptionSeq, \
-        CORBA::ExcDescriptionSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::ExcDescriptionSeq \
       >
 
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ExcDescriptionSeq, \
-        CORBA::ExcDescriptionSeq_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ExtAttributeDescription, \
-        CORBA::ExtAttributeDescription_var \
-      >
-
 #if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_
 
@@ -38064,35 +38218,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ParDescriptionSeq, \
-        CORBA::ParDescriptionSeq_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Basic_SArgument_T< \
-        CORBA::OperationMode \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ContextIdSeq, \
-        CORBA::ContextIdSeq_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ExceptionDefSeq, \
-        CORBA::ExceptionDefSeq_var \
-      >
-
 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
 
@@ -38107,20 +38232,7 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, \
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ExtAttributeDef_ptr, \
-        CORBA::ExtAttributeDef_var \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-#endif /*if 0*/ 
-
 
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
index 869e91861e9..e7ce65c380a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
@@ -26,15 +26,16 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:390
+// be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_ORIG_IFR_BASICS_H_
-#define _TAO_IDL_ORIG_IFR_BASICS_H_
+#ifndef _TAO_IDL_SERVER_IFR_BASICS_H_
+#define _TAO_IDL_SERVER_IFR_BASICS_H_
 
 #include /**/ "ace/pre.h"
 
-#include "IFR_BaseS.h"
+#include "tao/ParameterModeS.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
+#include "IFR_BaseS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -45,9 +46,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -56,14 +55,14 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
   
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class Repository;
   typedef Repository *Repository_ptr;
@@ -136,7 +135,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::Contained_ptr lookup_id (
         const char * search_id
@@ -154,10 +153,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
-        CORBA::TypeCode_ptr tc
+        ::CORBA::TypeCode_ptr tc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -172,10 +171,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind
+        ::CORBA::PrimitiveKind kind
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -190,10 +189,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::StringDef_ptr create_string (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -208,10 +207,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::WstringDef_ptr create_wstring (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -226,11 +225,11 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::SequenceDef_ptr create_sequence (
-        CORBA::ULong bound,
-        CORBA::IDLType_ptr element_type
+        ::CORBA::ULong bound,
+        ::CORBA::IDLType_ptr element_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -245,11 +244,11 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ArrayDef_ptr create_array (
-        CORBA::ULong length,
-        CORBA::IDLType_ptr element_type
+        ::CORBA::ULong length,
+        ::CORBA::IDLType_ptr element_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -264,11 +263,11 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::FixedDef_ptr create_fixed (
-        CORBA::UShort digits,
-        CORBA::Short scale
+        ::CORBA::UShort digits,
+        ::CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -280,7 +279,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -289,7 +290,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -300,7 +301,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_skel (
@@ -311,7 +312,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     contents_skel (
@@ -322,7 +323,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_name_skel (
@@ -333,7 +334,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_contents_skel (
@@ -344,7 +345,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_module_skel (
@@ -355,7 +356,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_constant_skel (
@@ -366,7 +367,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_struct_skel (
@@ -377,7 +378,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_union_skel (
@@ -388,7 +389,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_enum_skel (
@@ -399,7 +400,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_alias_skel (
@@ -410,7 +411,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_interface_skel (
@@ -421,7 +422,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_skel (
@@ -432,7 +433,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_box_skel (
@@ -443,7 +444,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_exception_skel (
@@ -454,7 +455,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_native_skel (
@@ -465,7 +466,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_abstract_interface_skel (
@@ -476,7 +477,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_local_interface_skel (
@@ -487,7 +488,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_ext_value_skel (
@@ -503,7 +504,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_Repository_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -547,7 +548,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_Repository_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl
@@ -558,7 +559,7 @@ namespace POA_CORBA
     virtual ~_TAO_Repository_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     lookup_id (
@@ -572,7 +573,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     get_canonical_typecode (
@@ -586,7 +587,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     get_primitive (
@@ -600,7 +601,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_string (
@@ -614,7 +615,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_wstring (
@@ -628,7 +629,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_sequence (
@@ -642,7 +643,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_array (
@@ -656,7 +657,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_fixed (
@@ -679,7 +680,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -693,7 +694,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup (
@@ -707,7 +708,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     contents (
@@ -721,7 +722,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup_name (
@@ -735,7 +736,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe_contents (
@@ -749,7 +750,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_module (
@@ -763,7 +764,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_constant (
@@ -777,7 +778,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_struct (
@@ -791,7 +792,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_union (
@@ -805,7 +806,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_enum (
@@ -819,7 +820,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_alias (
@@ -833,7 +834,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_interface (
@@ -847,7 +848,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value (
@@ -861,7 +862,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value_box (
@@ -875,7 +876,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_exception (
@@ -889,7 +890,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_native (
@@ -903,7 +904,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_abstract_interface (
@@ -917,7 +918,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_local_interface (
@@ -931,7 +932,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_ext_value (
@@ -950,7 +951,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
@@ -1021,7 +1022,9 @@ namespace POA_CORBA
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
     
-    virtual const char* _interface_repository_id (void) const;static void
+    virtual const char* _interface_repository_id (void) const;
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1030,7 +1033,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -1041,7 +1044,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_skel (
@@ -1052,7 +1055,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     contents_skel (
@@ -1063,7 +1066,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_name_skel (
@@ -1074,7 +1077,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_contents_skel (
@@ -1085,7 +1088,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_module_skel (
@@ -1096,7 +1099,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_constant_skel (
@@ -1107,7 +1110,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_struct_skel (
@@ -1118,7 +1121,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_union_skel (
@@ -1129,7 +1132,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_enum_skel (
@@ -1140,7 +1143,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_alias_skel (
@@ -1151,7 +1154,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_interface_skel (
@@ -1162,7 +1165,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_skel (
@@ -1173,7 +1176,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_box_skel (
@@ -1184,7 +1187,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_exception_skel (
@@ -1195,7 +1198,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_native_skel (
@@ -1206,7 +1209,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_abstract_interface_skel (
@@ -1217,7 +1220,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_local_interface_skel (
@@ -1228,7 +1231,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_ext_value_skel (
@@ -1236,7 +1239,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1250,7 +1255,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1264,7 +1271,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1278,19 +1287,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1299,7 +1314,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -1310,7 +1325,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -1326,7 +1341,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_ModuleDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -1370,7 +1385,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_ModuleDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl,
@@ -1391,7 +1406,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -1405,7 +1420,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup (
@@ -1419,7 +1434,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     contents (
@@ -1433,7 +1448,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup_name (
@@ -1447,7 +1462,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe_contents (
@@ -1461,7 +1476,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_module (
@@ -1475,7 +1490,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_constant (
@@ -1489,7 +1504,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_struct (
@@ -1503,7 +1518,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_union (
@@ -1517,7 +1532,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_enum (
@@ -1531,7 +1546,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_alias (
@@ -1545,7 +1560,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_interface (
@@ -1559,7 +1574,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value (
@@ -1573,7 +1588,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value_box (
@@ -1587,7 +1602,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_exception (
@@ -1601,7 +1616,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_native (
@@ -1615,7 +1630,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_abstract_interface (
@@ -1629,7 +1644,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_local_interface (
@@ -1643,7 +1658,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_ext_value (
@@ -1744,7 +1759,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -1758,7 +1773,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -1777,7 +1792,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ConstantDef;
   typedef ConstantDef *ConstantDef_ptr;
@@ -1850,7 +1865,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1867,7 +1882,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1884,10 +1899,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1902,7 +1917,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::Any * value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1919,10 +1934,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void value (
-        const CORBA::Any & value
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1934,7 +1949,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1943,7 +1960,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -1951,7 +1968,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1965,7 +1984,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1979,7 +2000,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1993,19 +2016,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2014,7 +2043,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -2025,7 +2054,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -2041,7 +2070,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_ConstantDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -2085,7 +2114,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_ConstantDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
@@ -2096,7 +2125,7 @@ namespace POA_CORBA
     virtual ~_TAO_ConstantDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_type (
@@ -2110,7 +2139,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_type_def (
@@ -2124,7 +2153,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_type_def (
@@ -2138,7 +2167,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_value (
@@ -2152,7 +2181,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_value (
@@ -2175,7 +2204,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -2276,7 +2305,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -2290,7 +2319,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -2309,7 +2338,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class StructDef;
   typedef StructDef *StructDef_ptr;
@@ -2383,7 +2412,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2400,10 +2429,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void members (
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2415,7 +2444,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2424,7 +2455,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -2432,7 +2463,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2446,7 +2479,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2460,7 +2495,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2474,19 +2511,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2495,7 +2538,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -2506,7 +2549,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -2514,7 +2557,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2523,7 +2568,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_skel (
@@ -2534,7 +2579,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     contents_skel (
@@ -2545,7 +2590,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_name_skel (
@@ -2556,7 +2601,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_contents_skel (
@@ -2567,7 +2612,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_module_skel (
@@ -2578,7 +2623,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_constant_skel (
@@ -2589,7 +2634,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_struct_skel (
@@ -2600,7 +2645,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_union_skel (
@@ -2611,7 +2656,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_enum_skel (
@@ -2622,7 +2667,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_alias_skel (
@@ -2633,7 +2678,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_interface_skel (
@@ -2644,7 +2689,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_skel (
@@ -2655,7 +2700,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_box_skel (
@@ -2666,7 +2711,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_exception_skel (
@@ -2677,7 +2722,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_native_skel (
@@ -2688,7 +2733,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_abstract_interface_skel (
@@ -2699,7 +2744,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_local_interface_skel (
@@ -2710,7 +2755,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_ext_value_skel (
@@ -2726,7 +2771,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_StructDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -2770,7 +2815,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_StructDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
@@ -2782,7 +2827,7 @@ namespace POA_CORBA
     virtual ~_TAO_StructDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_members (
@@ -2796,7 +2841,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_members (
@@ -2819,7 +2864,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -2920,7 +2965,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -2934,7 +2979,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -2957,7 +3002,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup (
@@ -2971,7 +3016,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     contents (
@@ -2985,7 +3030,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup_name (
@@ -2999,7 +3044,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe_contents (
@@ -3013,7 +3058,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_module (
@@ -3027,7 +3072,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_constant (
@@ -3041,7 +3086,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_struct (
@@ -3055,7 +3100,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_union (
@@ -3069,7 +3114,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_enum (
@@ -3083,7 +3128,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_alias (
@@ -3097,7 +3142,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_interface (
@@ -3111,7 +3156,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value (
@@ -3125,7 +3170,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value_box (
@@ -3139,7 +3184,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_exception (
@@ -3153,7 +3198,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_native (
@@ -3167,7 +3212,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_abstract_interface (
@@ -3181,7 +3226,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_local_interface (
@@ -3195,7 +3240,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_ext_value (
@@ -3214,7 +3259,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class UnionDef;
   typedef UnionDef *UnionDef_ptr;
@@ -3288,7 +3333,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::TypeCode_ptr discriminator_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3305,7 +3350,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3322,10 +3367,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void discriminator_type_def (
-        CORBA::IDLType_ptr discriminator_type_def
+        ::CORBA::IDLType_ptr discriminator_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3340,7 +3385,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::UnionMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3357,10 +3402,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void members (
-        const CORBA::UnionMemberSeq & members
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3372,7 +3417,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3381,7 +3428,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -3389,7 +3436,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3403,7 +3452,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3417,7 +3468,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3431,19 +3484,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3452,7 +3511,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -3463,7 +3522,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -3471,7 +3530,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3480,7 +3541,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_skel (
@@ -3491,7 +3552,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     contents_skel (
@@ -3502,7 +3563,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_name_skel (
@@ -3513,7 +3574,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_contents_skel (
@@ -3524,7 +3585,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_module_skel (
@@ -3535,7 +3596,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_constant_skel (
@@ -3546,7 +3607,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_struct_skel (
@@ -3557,7 +3618,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_union_skel (
@@ -3568,7 +3629,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_enum_skel (
@@ -3579,7 +3640,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_alias_skel (
@@ -3590,7 +3651,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_interface_skel (
@@ -3601,7 +3662,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_skel (
@@ -3612,7 +3673,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_box_skel (
@@ -3623,7 +3684,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_exception_skel (
@@ -3634,7 +3695,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_native_skel (
@@ -3645,7 +3706,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_abstract_interface_skel (
@@ -3656,7 +3717,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_local_interface_skel (
@@ -3667,7 +3728,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_ext_value_skel (
@@ -3683,7 +3744,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_UnionDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -3727,7 +3788,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_UnionDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
@@ -3739,7 +3800,7 @@ namespace POA_CORBA
     virtual ~_TAO_UnionDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_discriminator_type (
@@ -3753,7 +3814,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_discriminator_type_def (
@@ -3767,7 +3828,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_discriminator_type_def (
@@ -3781,7 +3842,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_members (
@@ -3795,7 +3856,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_members (
@@ -3818,7 +3879,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -3919,7 +3980,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -3933,7 +3994,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -3956,7 +4017,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup (
@@ -3970,7 +4031,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     contents (
@@ -3984,7 +4045,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup_name (
@@ -3998,7 +4059,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe_contents (
@@ -4012,7 +4073,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_module (
@@ -4026,7 +4087,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_constant (
@@ -4040,7 +4101,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_struct (
@@ -4054,7 +4115,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_union (
@@ -4068,7 +4129,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_enum (
@@ -4082,7 +4143,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_alias (
@@ -4096,7 +4157,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_interface (
@@ -4110,7 +4171,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value (
@@ -4124,7 +4185,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value_box (
@@ -4138,7 +4199,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_exception (
@@ -4152,7 +4213,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_native (
@@ -4166,7 +4227,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_abstract_interface (
@@ -4180,7 +4241,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_local_interface (
@@ -4194,7 +4255,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_ext_value (
@@ -4213,7 +4274,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class EnumDef;
   typedef EnumDef *EnumDef_ptr;
@@ -4286,7 +4347,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::EnumMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4303,10 +4364,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void members (
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4318,7 +4379,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4327,7 +4390,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -4335,7 +4398,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4349,7 +4414,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4363,7 +4430,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4377,19 +4446,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4398,7 +4473,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -4409,7 +4484,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -4417,7 +4492,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4431,7 +4508,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_EnumDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -4475,7 +4552,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_EnumDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl
@@ -4486,7 +4563,7 @@ namespace POA_CORBA
     virtual ~_TAO_EnumDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_members (
@@ -4500,7 +4577,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_members (
@@ -4523,7 +4600,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -4624,7 +4701,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -4638,7 +4715,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -4666,7 +4743,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class AliasDef;
   typedef AliasDef *AliasDef_ptr;
@@ -4739,7 +4816,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::IDLType_ptr original_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4756,10 +4833,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void original_type_def (
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4771,7 +4848,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4780,7 +4859,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -4788,7 +4867,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4802,7 +4883,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4816,7 +4899,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4830,19 +4915,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4851,7 +4942,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -4862,7 +4953,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -4870,7 +4961,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -4884,7 +4977,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_AliasDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -4928,7 +5021,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_AliasDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl
@@ -4939,7 +5032,7 @@ namespace POA_CORBA
     virtual ~_TAO_AliasDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_original_type_def (
@@ -4953,7 +5046,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_original_type_def (
@@ -4976,7 +5069,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -5077,7 +5170,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -5091,7 +5184,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -5119,7 +5212,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class NativeDef;
   typedef NativeDef *NativeDef_ptr;
@@ -5189,7 +5282,9 @@ namespace POA_CORBA
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
     
-    virtual const char* _interface_repository_id (void) const;static void
+    virtual const char* _interface_repository_id (void) const;
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5198,7 +5293,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -5206,7 +5301,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5220,7 +5317,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5234,7 +5333,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5248,19 +5349,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5269,7 +5376,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -5280,7 +5387,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -5288,7 +5395,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5302,7 +5411,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_NativeDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -5346,7 +5455,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_NativeDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl
@@ -5366,7 +5475,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -5467,7 +5576,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -5481,7 +5590,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -5509,7 +5618,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class PrimitiveDef;
   typedef PrimitiveDef *PrimitiveDef_ptr;
@@ -5582,7 +5691,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::PrimitiveKind kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5596,7 +5705,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5605,7 +5716,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -5613,7 +5724,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5627,7 +5740,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_PrimitiveDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -5671,7 +5784,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_PrimitiveDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
@@ -5682,7 +5795,7 @@ namespace POA_CORBA
     virtual ~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_kind (
@@ -5705,7 +5818,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -5733,7 +5846,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class StringDef;
   typedef StringDef *StringDef_ptr;
@@ -5806,7 +5919,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5823,10 +5936,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void bound (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5838,7 +5951,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5847,7 +5962,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -5855,7 +5970,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -5869,7 +5986,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_StringDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -5913,7 +6030,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_StringDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
@@ -5924,7 +6041,7 @@ namespace POA_CORBA
     virtual ~_TAO_StringDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_bound (
@@ -5938,7 +6055,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_bound (
@@ -5961,7 +6078,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -5989,7 +6106,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class WstringDef;
   typedef WstringDef *WstringDef_ptr;
@@ -6062,7 +6179,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6079,10 +6196,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void bound (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6094,7 +6211,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -6103,7 +6222,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -6111,7 +6230,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -6125,7 +6246,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_WstringDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -6169,7 +6290,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_WstringDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
@@ -6180,7 +6301,7 @@ namespace POA_CORBA
     virtual ~_TAO_WstringDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_bound (
@@ -6194,7 +6315,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_bound (
@@ -6217,7 +6338,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -6245,7 +6366,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class SequenceDef;
   typedef SequenceDef *SequenceDef_ptr;
@@ -6318,7 +6439,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6335,10 +6456,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void bound (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6353,7 +6474,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6370,7 +6491,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6387,10 +6508,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void element_type_def (
-        CORBA::IDLType_ptr element_type_def
+        ::CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6402,7 +6523,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -6411,7 +6534,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -6419,7 +6542,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -6433,7 +6558,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_SequenceDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -6477,7 +6602,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_SequenceDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
@@ -6488,7 +6613,7 @@ namespace POA_CORBA
     virtual ~_TAO_SequenceDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_bound (
@@ -6502,7 +6627,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_bound (
@@ -6516,7 +6641,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_element_type (
@@ -6530,7 +6655,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_element_type_def (
@@ -6544,7 +6669,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_element_type_def (
@@ -6567,7 +6692,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -6595,7 +6720,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ArrayDef;
   typedef ArrayDef *ArrayDef_ptr;
@@ -6668,7 +6793,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::ULong length (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6685,10 +6810,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void length (
-        CORBA::ULong length
+        ::CORBA::ULong length
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6703,7 +6828,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6720,7 +6845,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6737,10 +6862,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void element_type_def (
-        CORBA::IDLType_ptr element_type_def
+        ::CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6752,7 +6877,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -6761,7 +6888,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -6769,7 +6896,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -6783,7 +6912,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_ArrayDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -6827,7 +6956,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_ArrayDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
@@ -6838,7 +6967,7 @@ namespace POA_CORBA
     virtual ~_TAO_ArrayDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_length (
@@ -6852,7 +6981,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_length (
@@ -6866,7 +6995,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_element_type (
@@ -6880,7 +7009,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_element_type_def (
@@ -6894,7 +7023,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_element_type_def (
@@ -6917,7 +7046,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -6945,7 +7074,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ExceptionDef;
   typedef ExceptionDef *ExceptionDef_ptr;
@@ -7019,7 +7148,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7036,7 +7165,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7053,10 +7182,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void members (
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7068,7 +7197,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -7077,7 +7208,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -7085,7 +7216,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -7099,7 +7232,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -7113,7 +7248,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -7127,19 +7264,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -7148,7 +7291,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -7159,7 +7302,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -7170,7 +7313,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_skel (
@@ -7181,7 +7324,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     contents_skel (
@@ -7192,7 +7335,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_name_skel (
@@ -7203,7 +7346,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_contents_skel (
@@ -7214,7 +7357,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_module_skel (
@@ -7225,7 +7368,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_constant_skel (
@@ -7236,7 +7379,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_struct_skel (
@@ -7247,7 +7390,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_union_skel (
@@ -7258,7 +7401,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_enum_skel (
@@ -7269,7 +7412,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_alias_skel (
@@ -7280,7 +7423,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_interface_skel (
@@ -7291,7 +7434,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_skel (
@@ -7302,7 +7445,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_box_skel (
@@ -7313,7 +7456,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_exception_skel (
@@ -7324,7 +7467,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_native_skel (
@@ -7335,7 +7478,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_abstract_interface_skel (
@@ -7346,7 +7489,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_local_interface_skel (
@@ -7357,7 +7500,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_ext_value_skel (
@@ -7373,7 +7516,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_ExceptionDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -7417,7 +7560,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_ExceptionDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl,
@@ -7429,7 +7572,7 @@ namespace POA_CORBA
     virtual ~_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_type (
@@ -7443,7 +7586,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_members (
@@ -7457,7 +7600,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_members (
@@ -7480,7 +7623,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -7581,7 +7724,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -7595,7 +7738,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -7609,7 +7752,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup (
@@ -7623,7 +7766,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     contents (
@@ -7637,7 +7780,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup_name (
@@ -7651,7 +7794,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe_contents (
@@ -7665,7 +7808,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_module (
@@ -7679,7 +7822,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_constant (
@@ -7693,7 +7836,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_struct (
@@ -7707,7 +7850,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_union (
@@ -7721,7 +7864,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_enum (
@@ -7735,7 +7878,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_alias (
@@ -7749,7 +7892,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_interface (
@@ -7763,7 +7906,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value (
@@ -7777,7 +7920,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value_box (
@@ -7791,7 +7934,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_exception (
@@ -7805,7 +7948,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_native (
@@ -7819,7 +7962,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_abstract_interface (
@@ -7833,7 +7976,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_local_interface (
@@ -7847,7 +7990,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_ext_value (
@@ -7866,7 +8009,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class AttributeDef;
   typedef AttributeDef *AttributeDef_ptr;
@@ -7939,7 +8082,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7956,7 +8099,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7973,10 +8116,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7991,7 +8134,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::AttributeMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -8008,10 +8151,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void mode (
-        CORBA::AttributeMode mode
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -8023,7 +8166,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8032,7 +8177,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -8040,7 +8185,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8054,7 +8201,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8068,7 +8217,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8082,19 +8233,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8103,7 +8260,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -8114,7 +8271,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -8130,7 +8287,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_AttributeDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -8174,7 +8331,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_AttributeDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
@@ -8185,7 +8342,7 @@ namespace POA_CORBA
     virtual ~_TAO_AttributeDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_type (
@@ -8199,7 +8356,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_type_def (
@@ -8213,7 +8370,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_type_def (
@@ -8227,7 +8384,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_mode (
@@ -8241,7 +8398,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_mode (
@@ -8264,7 +8421,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -8365,7 +8522,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -8379,7 +8536,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -8398,7 +8555,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ExtAttributeDef;
   typedef ExtAttributeDef *ExtAttributeDef_ptr;
@@ -8471,7 +8628,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -8488,10 +8645,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void get_exceptions (
-        const CORBA::ExcDescriptionSeq & get_exceptions
+        const ::CORBA::ExcDescriptionSeq & get_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -8506,7 +8663,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -8523,10 +8680,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void set_exceptions (
-        const CORBA::ExcDescriptionSeq & set_exceptions
+        const ::CORBA::ExcDescriptionSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -8541,7 +8698,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ExtAttributeDescription * describe_attribute (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -8555,7 +8712,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8564,7 +8723,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -8572,7 +8731,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8586,7 +8747,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8600,7 +8763,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8614,19 +8779,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8635,7 +8806,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -8646,7 +8817,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -8654,13 +8825,17 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_def_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8674,7 +8849,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -8696,7 +8873,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_ExtAttributeDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -8740,7 +8917,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_ExtAttributeDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl
@@ -8751,7 +8928,7 @@ namespace POA_CORBA
     virtual ~_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_get_exceptions (
@@ -8765,7 +8942,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_get_exceptions (
@@ -8779,7 +8956,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_set_exceptions (
@@ -8793,7 +8970,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_set_exceptions (
@@ -8807,7 +8984,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     describe_attribute (
@@ -8830,7 +9007,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -8931,7 +9108,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -8945,7 +9122,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -9013,7 +9190,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class OperationDef;
   typedef OperationDef *OperationDef_ptr;
@@ -9086,7 +9263,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::TypeCode_ptr result (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9103,7 +9280,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::IDLType_ptr result_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9120,10 +9297,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void result_def (
-        CORBA::IDLType_ptr result_def
+        ::CORBA::IDLType_ptr result_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -9138,7 +9315,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ParDescriptionSeq * params (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9155,10 +9332,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void params (
-        const CORBA::ParDescriptionSeq & params
+        const ::CORBA::ParDescriptionSeq & params
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -9173,7 +9350,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::OperationMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9190,10 +9367,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void mode (
-        CORBA::OperationMode mode
+        ::CORBA::OperationMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -9208,7 +9385,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ContextIdSeq * contexts (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9225,10 +9402,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void contexts (
-        const CORBA::ContextIdSeq & contexts
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -9243,7 +9420,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ExceptionDefSeq * exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9260,10 +9437,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void exceptions (
-        const CORBA::ExceptionDefSeq & exceptions
+        const ::CORBA::ExceptionDefSeq & exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -9275,7 +9452,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -9284,7 +9463,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -9292,7 +9471,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -9306,7 +9487,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -9320,7 +9503,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -9334,19 +9519,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -9355,7 +9546,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -9366,7 +9557,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -9382,7 +9573,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_OperationDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -9426,7 +9617,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_OperationDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
@@ -9437,7 +9628,7 @@ namespace POA_CORBA
     virtual ~_TAO_OperationDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_result (
@@ -9451,7 +9642,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_result_def (
@@ -9465,7 +9656,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_result_def (
@@ -9479,7 +9670,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_params (
@@ -9493,7 +9684,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_params (
@@ -9507,7 +9698,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_mode (
@@ -9521,7 +9712,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_mode (
@@ -9535,7 +9726,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_contexts (
@@ -9549,7 +9740,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_contexts (
@@ -9563,7 +9754,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_exceptions (
@@ -9577,7 +9768,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_exceptions (
@@ -9600,7 +9791,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -9701,7 +9892,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -9715,7 +9906,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -9734,7 +9925,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
@@ -9809,7 +10000,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9826,10 +10017,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -9844,7 +10035,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::Boolean is_a (
         const char * interface_id
@@ -9862,7 +10053,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9879,14 +10070,14 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -9901,17 +10092,17 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -9923,7 +10114,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -9932,7 +10125,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -9943,7 +10136,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_skel (
@@ -9954,7 +10147,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     contents_skel (
@@ -9965,7 +10158,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_name_skel (
@@ -9976,7 +10169,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_contents_skel (
@@ -9987,7 +10180,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_module_skel (
@@ -9998,7 +10191,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_constant_skel (
@@ -10009,7 +10202,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_struct_skel (
@@ -10020,7 +10213,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_union_skel (
@@ -10031,7 +10224,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_enum_skel (
@@ -10042,7 +10235,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_alias_skel (
@@ -10053,7 +10246,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_interface_skel (
@@ -10064,7 +10257,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_skel (
@@ -10075,7 +10268,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_box_skel (
@@ -10086,7 +10279,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_exception_skel (
@@ -10097,7 +10290,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_native_skel (
@@ -10108,7 +10301,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_abstract_interface_skel (
@@ -10119,7 +10312,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_local_interface_skel (
@@ -10130,7 +10323,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_ext_value_skel (
@@ -10138,7 +10331,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -10152,7 +10347,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -10166,7 +10363,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -10180,19 +10379,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -10201,7 +10406,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -10212,7 +10417,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -10220,7 +10425,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -10234,7 +10441,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_InterfaceDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -10278,7 +10485,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_InterfaceDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl,
@@ -10291,7 +10498,7 @@ namespace POA_CORBA
     virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_base_interfaces (
@@ -10305,7 +10512,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_base_interfaces (
@@ -10319,7 +10526,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     is_a (
@@ -10333,7 +10540,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     describe_interface (
@@ -10347,7 +10554,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_attribute (
@@ -10361,7 +10568,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_operation (
@@ -10384,7 +10591,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -10398,7 +10605,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup (
@@ -10412,7 +10619,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     contents (
@@ -10426,7 +10633,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup_name (
@@ -10440,7 +10647,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe_contents (
@@ -10454,7 +10661,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_module (
@@ -10468,7 +10675,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_constant (
@@ -10482,7 +10689,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_struct (
@@ -10496,7 +10703,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_union (
@@ -10510,7 +10717,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_enum (
@@ -10524,7 +10731,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_alias (
@@ -10538,7 +10745,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_interface (
@@ -10552,7 +10759,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value (
@@ -10566,7 +10773,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value_box (
@@ -10580,7 +10787,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_exception (
@@ -10594,7 +10801,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_native (
@@ -10608,7 +10815,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_abstract_interface (
@@ -10622,7 +10829,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_local_interface (
@@ -10636,7 +10843,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_ext_value (
@@ -10737,7 +10944,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -10751,7 +10958,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -10779,7 +10986,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class InterfaceAttrExtension;
   typedef InterfaceAttrExtension *InterfaceAttrExtension_ptr;
@@ -10852,7 +11059,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -10869,16 +11076,16 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        const CORBA::ExceptionDefSeq & get_exceptions,
-        const CORBA::ExceptionDefSeq & set_exceptions
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode,
+        const ::CORBA::ExceptionDefSeq & get_exceptions,
+        const ::CORBA::ExceptionDefSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -10898,7 +11105,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_InterfaceAttrExtension_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -10942,5089 +11149,5178 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl (void) {}
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  describe_ext_interface (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_ext_attribute (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class ExtInterfaceDef;
-typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
-
-class _TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl;
-class _TAO_ExtInterfaceDef_Strategized_Proxy_Broker;
-
-class  ExtInterfaceDef
-  : public virtual POA_CORBA::InterfaceDef,
-    public virtual POA_CORBA::InterfaceAttrExtension
-{
-protected:
-  ExtInterfaceDef (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::ExtInterfaceDef _stub_type;
-  typedef ::CORBA::ExtInterfaceDef_ptr _stub_ptr_type;
-  typedef ::CORBA::ExtInterfaceDef_var _stub_var_type;
-  
-  ExtInterfaceDef (const ExtInterfaceDef& rhs);
-  virtual ~ExtInterfaceDef (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::ExtInterfaceDef *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  lookup_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  lookup_name_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_module_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_constant_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_struct_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_union_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_enum_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_alias_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_value_box_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_exception_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_native_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_local_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_ext_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_defined_in_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_absolute_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_containing_repository_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  move_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_type_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  is_a_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_attribute_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_operation_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_ext_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_ext_attribute_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class  _TAO_ExtInterfaceDef_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_ExtInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_ExtInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_ExtInterfaceDef_Strategized_Proxy_Broker *
-  the_TAO_ExtInterfaceDef_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class  _TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl,
-    public virtual ::POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_module (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_constant (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_struct (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_union (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_enum (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_alias (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value_box (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_exception (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_native (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_abstract_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_local_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_ext_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_defined_in (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_absolute_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_containing_repository (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  move (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_type (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  is_a (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_attribute (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_operation (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_ext_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_ext_attribute (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class AbstractInterfaceDef;
-typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
-
-class _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
-class _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker;
-
-class  AbstractInterfaceDef
-  : public virtual POA_CORBA::InterfaceDef
-{
-protected:
-  AbstractInterfaceDef (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::AbstractInterfaceDef _stub_type;
-  typedef ::CORBA::AbstractInterfaceDef_ptr _stub_ptr_type;
-  typedef ::CORBA::AbstractInterfaceDef_var _stub_var_type;
-  
-  AbstractInterfaceDef (const AbstractInterfaceDef& rhs);
-  virtual ~AbstractInterfaceDef (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::AbstractInterfaceDef *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  lookup_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  lookup_name_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_module_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_constant_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_struct_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_union_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_enum_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_alias_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_value_box_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_exception_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_native_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_local_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_ext_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_defined_in_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_absolute_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_containing_repository_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  move_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_type_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  is_a_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_attribute_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_operation_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class  _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker *
-  the_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class  _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_module (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_constant (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_struct (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_union (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_enum (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_alias (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value_box (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_exception (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_native (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_abstract_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_local_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_ext_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_defined_in (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_absolute_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_containing_repository (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  move (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_type (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  is_a (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_attribute (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_operation (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class ExtAbstractInterfaceDef;
-typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
-
-class _TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl;
-class _TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker;
-
-class  ExtAbstractInterfaceDef
-  : public virtual POA_CORBA::AbstractInterfaceDef,
-    public virtual POA_CORBA::InterfaceAttrExtension
-{
-protected:
-  ExtAbstractInterfaceDef (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::ExtAbstractInterfaceDef _stub_type;
-  typedef ::CORBA::ExtAbstractInterfaceDef_ptr _stub_ptr_type;
-  typedef ::CORBA::ExtAbstractInterfaceDef_var _stub_var_type;
-  
-  ExtAbstractInterfaceDef (const ExtAbstractInterfaceDef& rhs);
-  virtual ~ExtAbstractInterfaceDef (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::ExtAbstractInterfaceDef *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  lookup_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  lookup_name_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_module_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_constant_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_struct_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_union_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_enum_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_alias_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_value_box_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_exception_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_native_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_local_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_ext_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_defined_in_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_absolute_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_containing_repository_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  move_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_type_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  is_a_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_attribute_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_operation_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_ext_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_ext_attribute_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class  _TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker *
-  the_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class  _TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl,
-    public virtual ::POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_module (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_constant (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_struct (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_union (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_enum (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_alias (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value_box (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_exception (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_native (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_abstract_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_local_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_ext_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_defined_in (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_absolute_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_containing_repository (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  move (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_type (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  is_a (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_attribute (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_operation (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_ext_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_ext_attribute (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class LocalInterfaceDef;
-typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
-
-class _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl;
-class _TAO_LocalInterfaceDef_Strategized_Proxy_Broker;
-
-class  LocalInterfaceDef
-  : public virtual POA_CORBA::InterfaceDef
-{
-protected:
-  LocalInterfaceDef (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::LocalInterfaceDef _stub_type;
-  typedef ::CORBA::LocalInterfaceDef_ptr _stub_ptr_type;
-  typedef ::CORBA::LocalInterfaceDef_var _stub_var_type;
-  
-  LocalInterfaceDef (const LocalInterfaceDef& rhs);
-  virtual ~LocalInterfaceDef (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::LocalInterfaceDef *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  lookup_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  lookup_name_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_module_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_constant_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_struct_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_union_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_enum_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_alias_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_value_box_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_exception_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_native_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_local_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_ext_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_defined_in_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_absolute_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_containing_repository_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  move_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_type_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  is_a_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_attribute_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_operation_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class  _TAO_LocalInterfaceDef_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_LocalInterfaceDef_Strategized_Proxy_Broker *
-  the_TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class  _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_module (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_constant (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_struct (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_union (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_enum (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_alias (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value_box (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_exception (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_native (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_abstract_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_local_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_ext_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_defined_in (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_absolute_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_containing_repository (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  move (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_type (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  is_a (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_attribute (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_operation (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class ExtLocalInterfaceDef;
-typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
-
-class _TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl;
-class _TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker;
-
-class  ExtLocalInterfaceDef
-  : public virtual POA_CORBA::LocalInterfaceDef,
-    public virtual POA_CORBA::InterfaceAttrExtension
-{
-protected:
-  ExtLocalInterfaceDef (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::ExtLocalInterfaceDef _stub_type;
-  typedef ::CORBA::ExtLocalInterfaceDef_ptr _stub_ptr_type;
-  typedef ::CORBA::ExtLocalInterfaceDef_var _stub_var_type;
-  
-  ExtLocalInterfaceDef (const ExtLocalInterfaceDef& rhs);
-  virtual ~ExtLocalInterfaceDef (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::ExtLocalInterfaceDef *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  {
+  public:
+    _TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    describe_ext_interface (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_ext_attribute (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  static void
-  lookup_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class ExtInterfaceDef;
+  typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  class _TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl;
+  class _TAO_ExtInterfaceDef_Strategized_Proxy_Broker;
   
-  static void
-  contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class  ExtInterfaceDef
+    : public virtual POA_CORBA::InterfaceDef,
+      public virtual POA_CORBA::InterfaceAttrExtension
+  {
+  protected:
+    ExtInterfaceDef (void);
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::ExtInterfaceDef _stub_type;
+    typedef ::CORBA::ExtInterfaceDef_ptr _stub_ptr_type;
+    typedef ::CORBA::ExtInterfaceDef_var _stub_var_type;
+    
+    ExtInterfaceDef (const ExtInterfaceDef& rhs);
+    virtual ~ExtInterfaceDef (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::ExtInterfaceDef *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_name_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_module_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_constant_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_struct_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_union_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_enum_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_alias_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_box_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_exception_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_native_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_abstract_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_local_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_ext_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_defined_in_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_absolute_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_containing_repository_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    move_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_type_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    is_a_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_attribute_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_operation_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_ext_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_ext_attribute_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  static void
-  lookup_name_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  describe_contents_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  class  _TAO_ExtInterfaceDef_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_ExtInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_ExtInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_ExtInterfaceDef_Strategized_Proxy_Broker *
+    the_TAO_ExtInterfaceDef_Strategized_Proxy_Broker (void);
+  };
   
-  static void
-  create_module_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
   
-  static void
-  create_constant_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_struct_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  class  _TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl,
+      public virtual ::POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_module (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_constant (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_struct (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_union (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_enum (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_alias (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value_box (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_exception (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_native (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_abstract_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_local_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_ext_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_defined_in (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_absolute_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_containing_repository (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    move (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_type (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    is_a (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_attribute (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_operation (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_ext_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_ext_attribute (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  static void
-  create_union_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  static void
-  create_enum_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class AbstractInterfaceDef;
+  typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  class _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
+  class _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker;
   
-  static void
-  create_alias_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class  AbstractInterfaceDef
+    : public virtual POA_CORBA::InterfaceDef
+  {
+  protected:
+    AbstractInterfaceDef (void);
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::AbstractInterfaceDef _stub_type;
+    typedef ::CORBA::AbstractInterfaceDef_ptr _stub_ptr_type;
+    typedef ::CORBA::AbstractInterfaceDef_var _stub_var_type;
+    
+    AbstractInterfaceDef (const AbstractInterfaceDef& rhs);
+    virtual ~AbstractInterfaceDef (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::AbstractInterfaceDef *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_name_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_module_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_constant_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_struct_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_union_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_enum_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_alias_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_box_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_exception_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_native_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_abstract_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_local_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_ext_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_defined_in_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_absolute_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_containing_repository_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    move_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_type_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    is_a_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_attribute_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_operation_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  static void
-  create_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  class  _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker *
+    the_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
+  };
   
-  static void
-  create_value_box_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
   
-  static void
-  create_exception_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_native_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  class  _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_module (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_constant (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_struct (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_union (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_enum (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_alias (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value_box (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_exception (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_native (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_abstract_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_local_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_ext_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_defined_in (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_absolute_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_containing_repository (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    move (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_type (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    is_a (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_attribute (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_operation (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  static void
-  create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  static void
-  create_local_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class ExtAbstractInterfaceDef;
+  typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_ext_value_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_defined_in_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_absolute_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_containing_repository_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class _TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl;
+  class _TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  class  ExtAbstractInterfaceDef
+    : public virtual POA_CORBA::AbstractInterfaceDef,
+      public virtual POA_CORBA::InterfaceAttrExtension
+  {
+  protected:
+    ExtAbstractInterfaceDef (void);
   
-  static void
-  describe_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::ExtAbstractInterfaceDef _stub_type;
+    typedef ::CORBA::ExtAbstractInterfaceDef_ptr _stub_ptr_type;
+    typedef ::CORBA::ExtAbstractInterfaceDef_var _stub_var_type;
+    
+    ExtAbstractInterfaceDef (const ExtAbstractInterfaceDef& rhs);
+    virtual ~ExtAbstractInterfaceDef (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::ExtAbstractInterfaceDef *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_name_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_module_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_constant_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_struct_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_union_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_enum_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_alias_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_box_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_exception_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_native_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_abstract_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_local_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_ext_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_defined_in_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_absolute_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_containing_repository_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    move_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_type_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    is_a_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_attribute_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_operation_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_ext_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_ext_attribute_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  move_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_type_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_base_interfaces_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  is_a_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  class  _TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker *
+    the_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker (void);
+  };
   
-  static void
-  describe_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
   
-  static void
-  create_attribute_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_operation_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  class  _TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl,
+      public virtual ::POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_module (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_constant (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_struct (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_union (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_enum (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_alias (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value_box (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_exception (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_native (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_abstract_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_local_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_ext_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_defined_in (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_absolute_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_containing_repository (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    move (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_type (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    is_a (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_attribute (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_operation (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_ext_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_ext_attribute (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  static void
-  describe_ext_interface_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  create_ext_attribute_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class  _TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker *
-  the_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class  _TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl,
-    public virtual ::POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class LocalInterfaceDef;
+  typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl;
+  class _TAO_LocalInterfaceDef_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  LocalInterfaceDef
+    : public virtual POA_CORBA::InterfaceDef
+  {
+  protected:
+    LocalInterfaceDef (void);
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  lookup_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::LocalInterfaceDef _stub_type;
+    typedef ::CORBA::LocalInterfaceDef_ptr _stub_ptr_type;
+    typedef ::CORBA::LocalInterfaceDef_var _stub_var_type;
+    
+    LocalInterfaceDef (const LocalInterfaceDef& rhs);
+    virtual ~LocalInterfaceDef (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::LocalInterfaceDef *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_name_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_module_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_constant_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_struct_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_union_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_enum_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_alias_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_box_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_exception_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_native_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_abstract_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_local_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_ext_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_defined_in_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_absolute_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_containing_repository_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    move_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_type_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    is_a_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_attribute_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_operation_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_contents (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_module (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_constant (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  _TAO_LocalInterfaceDef_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_LocalInterfaceDef_Strategized_Proxy_Broker *
+    the_TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_struct (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_union (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_enum (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_alias (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_module (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_constant (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_struct (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_union (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_enum (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_alias (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value_box (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_exception (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_native (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_abstract_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_local_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_ext_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_defined_in (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_absolute_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_containing_repository (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    move (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_type (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    is_a (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_attribute (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_operation (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_value_box (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_exception (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class ExtLocalInterfaceDef;
+  typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_native (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class _TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl;
+  class _TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_abstract_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  ExtLocalInterfaceDef
+    : public virtual POA_CORBA::LocalInterfaceDef,
+      public virtual POA_CORBA::InterfaceAttrExtension
+  {
+  protected:
+    ExtLocalInterfaceDef (void);
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_local_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::ExtLocalInterfaceDef _stub_type;
+    typedef ::CORBA::ExtLocalInterfaceDef_ptr _stub_ptr_type;
+    typedef ::CORBA::ExtLocalInterfaceDef_var _stub_var_type;
+    
+    ExtLocalInterfaceDef (const ExtLocalInterfaceDef& rhs);
+    virtual ~ExtLocalInterfaceDef (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::ExtLocalInterfaceDef *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    lookup_name_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_contents_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_module_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_constant_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_struct_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_union_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_enum_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_alias_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_value_box_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_exception_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_native_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_abstract_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_local_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_ext_value_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_defined_in_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_absolute_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_containing_repository_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    move_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_type_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_base_interfaces_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    is_a_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_attribute_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_operation_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_ext_interface_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    create_ext_attribute_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_ext_value (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_defined_in (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_absolute_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_containing_repository (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  move (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_type (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_base_interfaces (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  _TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker *
+    the_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  is_a (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_attribute (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_operation (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe_ext_interface (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class  _TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl,
+      public virtual ::POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl (void) {}static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    lookup_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_contents (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_module (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_constant (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_struct (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_union (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_enum (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_alias (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_value_box (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_exception (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_native (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_abstract_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_local_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_ext_value (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_defined_in (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_absolute_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_containing_repository (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    move (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_type (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_base_interfaces (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    is_a (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_attribute (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_operation (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe_ext_interface (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    create_ext_attribute (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  create_ext_attribute (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:946
+// be\be_codegen.cpp:997
 
 #include "IFR_BasicS_T.h"
-
 #if defined (__ACE_INLINE__)
-#include "IFR_BasicS.i"
+#include "IFR_BasicS.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -16034,3 +16330,4 @@ public:
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.i b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.i
deleted file mode 100644
index 1a0dec16c36..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.i
+++ /dev/null
@@ -1,19603 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-ACE_INLINE void POA_CORBA::Repository::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::Repository::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ModuleDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ModuleDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ModuleDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ModuleDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ModuleDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ModuleDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ModuleDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ModuleDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ModuleDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ModuleDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ModuleDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ConstantDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ConstantDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ConstantDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ConstantDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ConstantDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ConstantDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ConstantDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ConstantDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ConstantDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ConstantDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ConstantDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ConstantDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ConstantDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::StructDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::StructDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::StructDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::StructDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::StructDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::StructDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::StructDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::StructDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::StructDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::StructDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::StructDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StructDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::UnionDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::UnionDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::UnionDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::UnionDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::UnionDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::UnionDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::UnionDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::UnionDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::UnionDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::UnionDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::UnionDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::UnionDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::EnumDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::EnumDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::EnumDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::EnumDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::EnumDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::EnumDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::EnumDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::EnumDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::EnumDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::EnumDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::EnumDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::EnumDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::EnumDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::EnumDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::AliasDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AliasDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AliasDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AliasDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AliasDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AliasDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AliasDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AliasDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AliasDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AliasDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AliasDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AliasDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AliasDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AliasDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::NativeDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::NativeDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::NativeDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::NativeDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::NativeDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::NativeDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::NativeDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::NativeDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::NativeDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::NativeDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::NativeDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::NativeDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::NativeDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::NativeDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::PrimitiveDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::PrimitiveDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::PrimitiveDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::PrimitiveDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::PrimitiveDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::PrimitiveDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::StringDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::StringDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::StringDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::StringDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::StringDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::StringDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::WstringDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::WstringDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::WstringDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::WstringDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::WstringDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::WstringDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::SequenceDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::SequenceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::SequenceDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::SequenceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::SequenceDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::SequenceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ArrayDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ArrayDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ArrayDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ArrayDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ArrayDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ArrayDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ExceptionDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExceptionDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExceptionDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExceptionDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExceptionDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExceptionDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExceptionDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExceptionDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExceptionDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExceptionDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExceptionDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::AttributeDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AttributeDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AttributeDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AttributeDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AttributeDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AttributeDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AttributeDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AttributeDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AttributeDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AttributeDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AttributeDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AttributeDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AttributeDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAttributeDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtAttributeDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtAttributeDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtAttributeDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAttributeDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAttributeDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::AttributeDef_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::AttributeDef::_get_type_skel (
-      req,
-      (POA_CORBA::AttributeDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_type_def_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::AttributeDef_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::AttributeDef::_get_type_def_skel (
-      req,
-      (POA_CORBA::AttributeDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtAttributeDef::_set_type_def_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::AttributeDef_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::AttributeDef::_set_type_def_skel (
-      req,
-      (POA_CORBA::AttributeDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAttributeDef::_get_mode_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::AttributeDef_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::AttributeDef::_get_mode_skel (
-      req,
-      (POA_CORBA::AttributeDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtAttributeDef::_set_mode_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::AttributeDef_ptr impl = (POA_CORBA::ExtAttributeDef_ptr) obj;
-  POA_CORBA::AttributeDef::_set_mode_skel (
-      req,
-      (POA_CORBA::AttributeDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_type_def (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_type_def (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_set_type_def (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_type_def (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_get_mode (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_get_mode (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAttributeDef_ThruPOA_Proxy_Impl::_set_mode (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_set_mode (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::OperationDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::OperationDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::OperationDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::OperationDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::OperationDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::OperationDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::OperationDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::OperationDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::OperationDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::OperationDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::OperationDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::OperationDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::OperationDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::InterfaceDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::InterfaceDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::InterfaceDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::InterfaceDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::InterfaceDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::InterfaceDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::InterfaceDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::InterfaceDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::InterfaceDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::InterfaceDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::InterfaceDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::InterfaceDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtInterfaceDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtInterfaceDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtInterfaceDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtInterfaceDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtInterfaceDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtInterfaceDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtInterfaceDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtInterfaceDef::_get_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::_set_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::describe_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_operation_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::describe_ext_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtInterfaceDef::create_ext_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ExtInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::describe_ext_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::describe_ext_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl::create_ext_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::create_ext_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::describe_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_operation_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_get_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::_set_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::describe_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_operation_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::describe_ext_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef::create_ext_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ExtAbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::describe_ext_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::describe_ext_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl::create_ext_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::create_ext_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::describe_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_operation_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_get_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::_set_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::describe_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_operation_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::describe_ext_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef::create_ext_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ExtLocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::describe_ext_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::describe_ext_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl::create_ext_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::create_ext_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
index 529abbaf744..a39452faa2a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:684
+// be\be_codegen.cpp:683
 
-#ifndef _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_BASICS_T_CPP_
-#define _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_BASICS_T_CPP_
+#ifndef _TAO_IDL_SERVER_IFR_BASICS_T_CPP_
+#define _TAO_IDL_SERVER_IFR_BASICS_T_CPP_
 
 #include "IFR_BasicS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BasicS_T.i"
+#include "IFR_BasicS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
index 4ac122057c3..f7440300c4b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
@@ -26,30 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:545
+// be\be_codegen.cpp:546
 
-#ifndef _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_BASICS_T_H_
-#define _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_BASICS_T_H_
+#ifndef _TAO_IDL_SERVER_IFR_BASICS_T_H_
+#define _TAO_IDL_SERVER_IFR_BASICS_T_H_
 
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+// be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -89,7 +86,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -99,7 +96,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -109,7 +106,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -120,11 +117,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -132,13 +129,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -146,12 +143,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -159,7 +156,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -172,14 +169,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -187,13 +184,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -201,14 +198,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -216,13 +213,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -230,13 +227,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -244,13 +241,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -258,19 +255,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -278,13 +275,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -292,13 +289,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -306,7 +303,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -319,13 +316,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -333,13 +330,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -347,19 +344,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -367,7 +364,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup_id (
         const char * search_id
@@ -378,10 +375,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr get_canonical_typecode (
-        CORBA::TypeCode_ptr tc
+        ::CORBA::TypeCode_ptr tc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -389,10 +386,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind
+        ::CORBA::PrimitiveKind kind
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -400,10 +397,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StringDef_ptr create_string (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -411,10 +408,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::WstringDef_ptr create_wstring (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -422,11 +419,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::SequenceDef_ptr create_sequence (
-        CORBA::ULong bound,
-        CORBA::IDLType_ptr element_type
+        ::CORBA::ULong bound,
+        ::CORBA::IDLType_ptr element_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -434,11 +431,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ArrayDef_ptr create_array (
-        CORBA::ULong length,
-        CORBA::IDLType_ptr element_type
+        ::CORBA::ULong length,
+        ::CORBA::IDLType_ptr element_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -446,11 +443,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::FixedDef_ptr create_fixed (
-        CORBA::UShort digits,
-        CORBA::Short scale
+        ::CORBA::UShort digits,
+        ::CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -468,7 +465,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -508,7 +505,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -518,7 +515,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -528,7 +525,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -539,11 +536,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -551,13 +548,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -565,12 +562,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -578,7 +575,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -591,14 +588,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -606,13 +603,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -620,14 +617,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -635,13 +632,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -649,13 +646,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -663,13 +660,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -677,19 +674,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -697,13 +694,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -711,13 +708,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -725,7 +722,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -738,13 +735,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -752,13 +749,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -766,19 +763,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -786,7 +783,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -796,7 +793,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -807,7 +804,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -817,7 +814,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -828,7 +825,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -838,7 +835,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -849,7 +846,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -859,7 +856,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -869,7 +866,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -879,7 +876,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -889,10 +886,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -912,7 +909,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -952,7 +949,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -962,7 +959,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -972,7 +969,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -982,7 +979,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -993,7 +990,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1003,7 +1000,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -1014,7 +1011,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1024,7 +1021,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -1035,7 +1032,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1045,7 +1042,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1055,7 +1052,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1065,7 +1062,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1075,10 +1072,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1088,7 +1085,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1098,7 +1095,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1108,10 +1105,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1119,7 +1116,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Any * value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1129,10 +1126,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void value (
-        const CORBA::Any & value
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1150,7 +1147,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -1190,7 +1187,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1200,7 +1197,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1210,7 +1207,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1220,7 +1217,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -1231,7 +1228,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1241,7 +1238,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -1252,7 +1249,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1262,7 +1259,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -1273,7 +1270,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1283,7 +1280,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1293,7 +1290,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1303,7 +1300,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1313,10 +1310,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1326,7 +1323,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1336,7 +1333,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -1347,11 +1344,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1359,13 +1356,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1373,12 +1370,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1386,7 +1383,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -1399,14 +1396,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1414,13 +1411,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1428,14 +1425,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1443,13 +1440,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1457,13 +1454,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1471,13 +1468,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1485,19 +1482,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1505,13 +1502,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1519,13 +1516,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1533,7 +1530,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -1546,13 +1543,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1560,13 +1557,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1574,19 +1571,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1594,7 +1591,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1604,10 +1601,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void members (
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1625,7 +1622,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -1665,7 +1662,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1675,7 +1672,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1685,7 +1682,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1695,7 +1692,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -1706,7 +1703,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1716,7 +1713,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -1727,7 +1724,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1737,7 +1734,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -1748,7 +1745,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1758,7 +1755,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1768,7 +1765,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1778,7 +1775,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1788,10 +1785,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1801,7 +1798,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1811,7 +1808,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -1822,11 +1819,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1834,13 +1831,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1848,12 +1845,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1861,7 +1858,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -1874,14 +1871,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1889,13 +1886,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1903,14 +1900,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1918,13 +1915,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1932,13 +1929,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1946,13 +1943,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1960,19 +1957,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1980,13 +1977,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1994,13 +1991,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2008,7 +2005,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -2021,13 +2018,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2035,13 +2032,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2049,19 +2046,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2069,7 +2066,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr discriminator_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2079,7 +2076,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr discriminator_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2089,10 +2086,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void discriminator_type_def (
-        CORBA::IDLType_ptr discriminator_type_def
+        ::CORBA::IDLType_ptr discriminator_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2100,7 +2097,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2110,10 +2107,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void members (
-        const CORBA::UnionMemberSeq & members
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2131,7 +2128,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -2171,7 +2168,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2181,7 +2178,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2191,7 +2188,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2201,7 +2198,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -2212,7 +2209,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2222,7 +2219,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -2233,7 +2230,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2243,7 +2240,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -2254,7 +2251,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2264,7 +2261,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2274,7 +2271,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2284,7 +2281,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2294,10 +2291,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2307,7 +2304,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2317,7 +2314,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2327,10 +2324,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void members (
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2348,7 +2345,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -2388,7 +2385,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2398,7 +2395,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2408,7 +2405,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2418,7 +2415,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -2429,7 +2426,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2439,7 +2436,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -2450,7 +2447,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2460,7 +2457,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -2471,7 +2468,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2481,7 +2478,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2491,7 +2488,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2501,7 +2498,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2511,10 +2508,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2524,7 +2521,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2534,7 +2531,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr original_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2544,10 +2541,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void original_type_def (
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2565,7 +2562,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -2605,7 +2602,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2615,7 +2612,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2625,7 +2622,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2635,7 +2632,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -2646,7 +2643,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2656,7 +2653,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -2667,7 +2664,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2677,7 +2674,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -2688,7 +2685,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2698,7 +2695,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2708,7 +2705,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2718,7 +2715,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2728,10 +2725,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2741,7 +2738,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2761,7 +2758,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -2801,7 +2798,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2811,7 +2808,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2821,7 +2818,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2831,7 +2828,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::PrimitiveKind kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2851,7 +2848,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -2891,7 +2888,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2901,7 +2898,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2911,7 +2908,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2921,7 +2918,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2931,10 +2928,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void bound (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2952,7 +2949,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -2992,7 +2989,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3002,7 +2999,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3012,7 +3009,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3022,7 +3019,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3032,10 +3029,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void bound (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3053,7 +3050,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -3093,7 +3090,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3103,7 +3100,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3113,7 +3110,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3123,7 +3120,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3133,10 +3130,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void bound (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3144,7 +3141,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3154,7 +3151,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3164,10 +3161,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void element_type_def (
-        CORBA::IDLType_ptr element_type_def
+        ::CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3185,7 +3182,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -3225,7 +3222,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3235,7 +3232,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3245,7 +3242,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3255,7 +3252,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::ULong length (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3265,10 +3262,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void length (
-        CORBA::ULong length
+        ::CORBA::ULong length
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3276,7 +3273,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3286,7 +3283,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3296,10 +3293,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void element_type_def (
-        CORBA::IDLType_ptr element_type_def
+        ::CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3317,7 +3314,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -3357,7 +3354,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3367,7 +3364,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3377,7 +3374,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3387,7 +3384,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -3398,7 +3395,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3408,7 +3405,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -3419,7 +3416,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3429,7 +3426,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -3440,7 +3437,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3450,7 +3447,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3460,7 +3457,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3470,7 +3467,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3480,10 +3477,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3493,7 +3490,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -3504,11 +3501,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3516,13 +3513,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3530,12 +3527,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3543,7 +3540,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -3556,14 +3553,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3571,13 +3568,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3585,14 +3582,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3600,13 +3597,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3614,13 +3611,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3628,13 +3625,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3642,19 +3639,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3662,13 +3659,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3676,13 +3673,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3690,7 +3687,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -3703,13 +3700,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3717,13 +3714,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3731,19 +3728,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3751,7 +3748,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3761,7 +3758,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3771,10 +3768,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void members (
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3792,7 +3789,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -3832,7 +3829,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3842,7 +3839,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3852,7 +3849,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3862,7 +3859,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -3873,7 +3870,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3883,7 +3880,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -3894,7 +3891,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3904,7 +3901,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -3915,7 +3912,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3925,7 +3922,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3935,7 +3932,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3945,7 +3942,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3955,10 +3952,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3968,7 +3965,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3978,7 +3975,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3988,10 +3985,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3999,7 +3996,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4009,10 +4006,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void mode (
-        CORBA::AttributeMode mode
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4030,7 +4027,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -4070,7 +4067,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4080,7 +4077,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4090,7 +4087,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4100,7 +4097,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -4111,7 +4108,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4121,7 +4118,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -4132,7 +4129,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4142,7 +4139,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -4153,7 +4150,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4163,7 +4160,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4173,7 +4170,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4183,7 +4180,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4193,10 +4190,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4206,7 +4203,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4216,7 +4213,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4226,10 +4223,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4237,7 +4234,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4247,10 +4244,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void mode (
-        CORBA::AttributeMode mode
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4258,7 +4255,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExcDescriptionSeq * get_exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4268,10 +4265,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void get_exceptions (
-        const CORBA::ExcDescriptionSeq & get_exceptions
+        const ::CORBA::ExcDescriptionSeq & get_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4279,7 +4276,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExcDescriptionSeq * set_exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4289,10 +4286,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void set_exceptions (
-        const CORBA::ExcDescriptionSeq & set_exceptions
+        const ::CORBA::ExcDescriptionSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4300,7 +4297,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtAttributeDescription * describe_attribute (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4320,7 +4317,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -4360,7 +4357,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4370,7 +4367,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4380,7 +4377,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4390,7 +4387,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -4401,7 +4398,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4411,7 +4408,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -4422,7 +4419,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4432,7 +4429,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -4443,7 +4440,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4453,7 +4450,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4463,7 +4460,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4473,7 +4470,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4483,10 +4480,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4496,7 +4493,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr result (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4506,7 +4503,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr result_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4516,10 +4513,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void result_def (
-        CORBA::IDLType_ptr result_def
+        ::CORBA::IDLType_ptr result_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4527,7 +4524,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ParDescriptionSeq * params (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4537,10 +4534,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void params (
-        const CORBA::ParDescriptionSeq & params
+        const ::CORBA::ParDescriptionSeq & params
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4548,7 +4545,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::OperationMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4558,10 +4555,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void mode (
-        CORBA::OperationMode mode
+        ::CORBA::OperationMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4569,7 +4566,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContextIdSeq * contexts (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4579,10 +4576,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void contexts (
-        const CORBA::ContextIdSeq & contexts
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4590,7 +4587,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDefSeq * exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4600,10 +4597,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void exceptions (
-        const CORBA::ExceptionDefSeq & exceptions
+        const ::CORBA::ExceptionDefSeq & exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4621,7 +4618,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -4661,7 +4658,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4671,7 +4668,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4681,7 +4678,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -4692,11 +4689,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4704,13 +4701,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4718,12 +4715,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4731,7 +4728,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -4744,14 +4741,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4759,13 +4756,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4773,14 +4770,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4788,13 +4785,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4802,13 +4799,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4816,13 +4813,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4830,19 +4827,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4850,13 +4847,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4864,13 +4861,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4878,7 +4875,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -4891,13 +4888,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4905,13 +4902,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4919,19 +4916,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -4939,7 +4936,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4949,7 +4946,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -4960,7 +4957,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4970,7 +4967,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -4981,7 +4978,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4991,7 +4988,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -5002,7 +4999,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5012,7 +5009,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5022,7 +5019,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5032,7 +5029,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5042,10 +5039,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5055,7 +5052,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5065,7 +5062,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5075,10 +5072,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5086,7 +5083,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_a (
         const char * interface_id
@@ -5097,7 +5094,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5107,14 +5104,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5122,17 +5119,17 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5150,7 +5147,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -5190,7 +5187,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5200,16 +5197,16 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        const CORBA::ExceptionDefSeq & get_exceptions,
-        const CORBA::ExceptionDefSeq & set_exceptions
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode,
+        const ::CORBA::ExceptionDefSeq & get_exceptions,
+        const ::CORBA::ExceptionDefSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5227,7 +5224,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -5267,7 +5264,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5277,7 +5274,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5287,7 +5284,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -5298,11 +5295,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5310,13 +5307,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5324,12 +5321,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5337,7 +5334,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -5350,14 +5347,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5365,13 +5362,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5379,14 +5376,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5394,13 +5391,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5408,13 +5405,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5422,13 +5419,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5436,19 +5433,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5456,13 +5453,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5470,13 +5467,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5484,7 +5481,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -5497,13 +5494,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5511,13 +5508,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5525,19 +5522,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5545,7 +5542,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5555,7 +5552,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -5566,7 +5563,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5576,7 +5573,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -5587,7 +5584,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5597,7 +5594,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -5608,7 +5605,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5618,7 +5615,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5628,7 +5625,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5638,7 +5635,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5648,10 +5645,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5661,7 +5658,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5671,7 +5668,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5681,10 +5678,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5692,7 +5689,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_a (
         const char * interface_id
@@ -5703,7 +5700,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5713,14 +5710,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5728,17 +5725,17 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5746,7 +5743,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5756,16 +5753,16 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        const CORBA::ExceptionDefSeq & get_exceptions,
-        const CORBA::ExceptionDefSeq & set_exceptions
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode,
+        const ::CORBA::ExceptionDefSeq & get_exceptions,
+        const ::CORBA::ExceptionDefSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5783,7 +5780,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -5823,7 +5820,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5833,7 +5830,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5843,7 +5840,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -5854,11 +5851,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5866,13 +5863,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5880,12 +5877,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5893,7 +5890,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -5906,14 +5903,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5921,13 +5918,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5935,14 +5932,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5950,13 +5947,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5964,13 +5961,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5978,13 +5975,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -5992,19 +5989,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6012,13 +6009,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6026,13 +6023,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6040,7 +6037,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -6053,13 +6050,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6067,13 +6064,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6081,19 +6078,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6101,7 +6098,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6111,7 +6108,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -6122,7 +6119,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6132,7 +6129,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -6143,7 +6140,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6153,7 +6150,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -6164,7 +6161,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6174,7 +6171,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6184,7 +6181,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6194,7 +6191,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6204,10 +6201,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6217,7 +6214,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6227,7 +6224,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6237,10 +6234,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6248,7 +6245,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_a (
         const char * interface_id
@@ -6259,7 +6256,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6269,14 +6266,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6284,17 +6281,17 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6312,7 +6309,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -6352,7 +6349,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6362,7 +6359,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6372,7 +6369,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -6383,11 +6380,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6395,13 +6392,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6409,12 +6406,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6422,7 +6419,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -6435,14 +6432,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6450,13 +6447,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6464,14 +6461,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6479,13 +6476,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6493,13 +6490,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6507,13 +6504,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6521,19 +6518,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6541,13 +6538,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6555,13 +6552,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6569,7 +6566,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -6582,13 +6579,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6596,13 +6593,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6610,19 +6607,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6630,7 +6627,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6640,7 +6637,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -6651,7 +6648,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6661,7 +6658,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -6672,7 +6669,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6682,7 +6679,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -6693,7 +6690,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6703,7 +6700,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6713,7 +6710,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6723,7 +6720,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6733,10 +6730,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6746,7 +6743,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6756,7 +6753,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6766,10 +6763,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6777,7 +6774,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_a (
         const char * interface_id
@@ -6788,7 +6785,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6798,14 +6795,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6813,17 +6810,17 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6831,7 +6828,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6841,16 +6838,16 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        const CORBA::ExceptionDefSeq & get_exceptions,
-        const CORBA::ExceptionDefSeq & set_exceptions
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode,
+        const ::CORBA::ExceptionDefSeq & get_exceptions,
+        const ::CORBA::ExceptionDefSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6868,7 +6865,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -6908,7 +6905,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6918,7 +6915,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6928,7 +6925,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -6939,11 +6936,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6951,13 +6948,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6965,12 +6962,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -6978,7 +6975,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -6991,14 +6988,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7006,13 +7003,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7020,14 +7017,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7035,13 +7032,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7049,13 +7046,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7063,13 +7060,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7077,19 +7074,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7097,13 +7094,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7111,13 +7108,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7125,7 +7122,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -7138,13 +7135,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7152,13 +7149,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7166,19 +7163,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7186,7 +7183,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7196,7 +7193,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -7207,7 +7204,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7217,7 +7214,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -7228,7 +7225,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7238,7 +7235,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -7249,7 +7246,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7259,7 +7256,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7269,7 +7266,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7279,7 +7276,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7289,10 +7286,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7302,7 +7299,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7312,7 +7309,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7322,10 +7319,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7333,7 +7330,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_a (
         const char * interface_id
@@ -7344,7 +7341,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7354,14 +7351,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7369,17 +7366,17 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7397,7 +7394,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -7437,7 +7434,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7447,7 +7444,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7457,7 +7454,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -7468,11 +7465,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7480,13 +7477,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7494,12 +7491,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7507,7 +7504,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -7520,14 +7517,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7535,13 +7532,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7549,14 +7546,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7564,13 +7561,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7578,13 +7575,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7592,13 +7589,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7606,19 +7603,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7626,13 +7623,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7640,13 +7637,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7654,7 +7651,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -7667,13 +7664,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7681,13 +7678,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7695,19 +7692,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7715,7 +7712,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7725,7 +7722,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -7736,7 +7733,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7746,7 +7743,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -7757,7 +7754,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7767,7 +7764,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -7778,7 +7775,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7788,7 +7785,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7798,7 +7795,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7808,7 +7805,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7818,10 +7815,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7831,7 +7828,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7841,7 +7838,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7851,10 +7848,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7862,7 +7859,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_a (
         const char * interface_id
@@ -7873,7 +7870,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7883,14 +7880,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7898,17 +7895,17 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7916,7 +7913,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -7926,16 +7923,16 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        const CORBA::ExceptionDefSeq & get_exceptions,
-        const CORBA::ExceptionDefSeq & set_exceptions
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode,
+        const ::CORBA::ExceptionDefSeq & get_exceptions,
+        const ::CORBA::ExceptionDefSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -7952,13 +7949,12 @@ namespace POA_CORBA
     void operator= (const ExtLocalInterfaceDef_tie &);
   };
 } // module CORBA
-#endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1043
+// be\be_codegen.cpp:1094
 
 #if defined (__ACE_INLINE__)
-#include "IFR_BasicS_T.i"
+#include "IFR_BasicS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
@@ -7969,9 +7965,10 @@ namespace POA_CORBA
 #pragma implementation ("IFR_BasicS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.i b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.i
deleted file mode 100644
index 1593cc93ec0..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.i
+++ /dev/null
@@ -1,13528 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::Repository_tie<T>::Repository_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Repository_tie<T>::Repository_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Repository_tie<T>::Repository_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Repository_tie<T>::Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Repository_tie<T>::~Repository_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::Repository_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Repository_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Repository_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Repository_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Repository_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Repository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->Repository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::Repository_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::Repository_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::Repository_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::Repository_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::Repository_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::Repository_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::Repository_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::Repository_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::Repository_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::Repository_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::Repository_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::Repository_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::Repository_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::Repository_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::Repository_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::Repository_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::Repository_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::Repository_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::Repository_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup_id  (
-    const char * search_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_id (
-    search_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::Repository_tie<T>::get_canonical_typecode  (
-    CORBA::TypeCode_ptr tc
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->get_canonical_typecode (
-    tc
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::PrimitiveDef_ptr POA_CORBA::Repository_tie<T>::get_primitive  (
-    CORBA::PrimitiveKind kind
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->get_primitive (
-    kind
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StringDef_ptr POA_CORBA::Repository_tie<T>::create_string  (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_string (
-    bound
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::WstringDef_ptr POA_CORBA::Repository_tie<T>::create_wstring  (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_wstring (
-    bound
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::SequenceDef_ptr POA_CORBA::Repository_tie<T>::create_sequence  (
-    CORBA::ULong bound,
-    CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_sequence (
-    bound,
-    element_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ArrayDef_ptr POA_CORBA::Repository_tie<T>::create_array  (
-    CORBA::ULong length,
-    CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_array (
-    length,
-    element_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::FixedDef_ptr POA_CORBA::Repository_tie<T>::create_fixed  (
-    CORBA::UShort digits,
-    CORBA::Short scale
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_fixed (
-    digits,
-    scale
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ModuleDef_tie<T>::ModuleDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ModuleDef_tie<T>::ModuleDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ModuleDef_tie<T>::ModuleDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ModuleDef_tie<T>::ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ModuleDef_tie<T>::~ModuleDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ModuleDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ModuleDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ModuleDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ModuleDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ModuleDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ModuleDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ModuleDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ModuleDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ModuleDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ModuleDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ModuleDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ModuleDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ModuleDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ModuleDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ModuleDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ModuleDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ModuleDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ModuleDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ModuleDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ModuleDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ModuleDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ModuleDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ModuleDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ModuleDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ModuleDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ModuleDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ModuleDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ModuleDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ModuleDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ModuleDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ModuleDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ModuleDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ModuleDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstantDef_tie<T>::ConstantDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstantDef_tie<T>::ConstantDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstantDef_tie<T>::ConstantDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstantDef_tie<T>::ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstantDef_tie<T>::~ConstantDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ConstantDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstantDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstantDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ConstantDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstantDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstantDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ConstantDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ConstantDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ConstantDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ConstantDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ConstantDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ConstantDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ConstantDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ConstantDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ConstantDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ConstantDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::ConstantDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::type_def  (
-    CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->type_def (
-    type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Any * POA_CORBA::ConstantDef_tie<T>::value  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::value  (
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->value (
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::StructDef_tie<T>::StructDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::StructDef_tie<T>::StructDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::StructDef_tie<T>::StructDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::StructDef_tie<T>::StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::StructDef_tie<T>::~StructDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::StructDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::StructDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::StructDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::StructDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::StructDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::StructDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->StructDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::StructDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::StructDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::StructDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::StructDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::StructDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::StructDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::StructDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::StructDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::StructDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::StructDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::StructDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::StructDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::StructDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::StructDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::StructDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::StructDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::StructDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::StructDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::StructDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::StructDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::StructDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::StructDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::StructDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::StructDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::StructDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::StructDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::StructDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructMemberSeq * POA_CORBA::StructDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::members  (
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->members (
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::UnionDef_tie<T>::UnionDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::UnionDef_tie<T>::UnionDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::UnionDef_tie<T>::UnionDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::UnionDef_tie<T>::UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::UnionDef_tie<T>::~UnionDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::UnionDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::UnionDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::UnionDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::UnionDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::UnionDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::UnionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->UnionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::UnionDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::UnionDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::UnionDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::UnionDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::UnionDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::UnionDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::UnionDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::UnionDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::UnionDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::UnionDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::UnionDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::UnionDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::UnionDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::UnionDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::UnionDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::UnionDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::UnionDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::UnionDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::UnionDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::UnionDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::UnionDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::UnionDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::UnionDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::UnionDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::UnionDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::UnionDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->discriminator_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->discriminator_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
-    CORBA::IDLType_ptr discriminator_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->discriminator_type_def (
-    discriminator_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionMemberSeq * POA_CORBA::UnionDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::members  (
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->members (
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::EnumDef_tie<T>::EnumDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::EnumDef_tie<T>::EnumDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::EnumDef_tie<T>::EnumDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::EnumDef_tie<T>::EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::EnumDef_tie<T>::~EnumDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::EnumDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::EnumDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::EnumDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::EnumDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::EnumDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::EnumDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->EnumDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::EnumDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::EnumDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::EnumDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::EnumDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::EnumDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::EnumDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::EnumDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::EnumDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::EnumDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumMemberSeq * POA_CORBA::EnumDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::members  (
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->members (
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::AliasDef_tie<T>::AliasDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AliasDef_tie<T>::AliasDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AliasDef_tie<T>::AliasDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AliasDef_tie<T>::AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AliasDef_tie<T>::~AliasDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::AliasDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::AliasDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::AliasDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::AliasDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::AliasDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AliasDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->AliasDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::AliasDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AliasDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AliasDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AliasDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::AliasDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AliasDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::AliasDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::AliasDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::AliasDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::AliasDef_tie<T>::original_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->original_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::original_type_def  (
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->original_type_def (
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::NativeDef_tie<T>::NativeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::NativeDef_tie<T>::NativeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::NativeDef_tie<T>::NativeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::NativeDef_tie<T>::NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::NativeDef_tie<T>::~NativeDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::NativeDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::NativeDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::NativeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::NativeDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::NativeDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::NativeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->NativeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::NativeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::NativeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::NativeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::NativeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::NativeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::NativeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::NativeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::NativeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::NativeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::PrimitiveDef_tie<T>::PrimitiveDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PrimitiveDef_tie<T>::PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PrimitiveDef_tie<T>::PrimitiveDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PrimitiveDef_tie<T>::PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PrimitiveDef_tie<T>::~PrimitiveDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::PrimitiveDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::PrimitiveDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::PrimitiveDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::PrimitiveDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->PrimitiveDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::PrimitiveDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::PrimitiveDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::PrimitiveDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::PrimitiveKind POA_CORBA::PrimitiveDef_tie<T>::kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::StringDef_tie<T>::StringDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::StringDef_tie<T>::StringDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::StringDef_tie<T>::StringDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::StringDef_tie<T>::StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::StringDef_tie<T>::~StringDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::StringDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::StringDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::StringDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::StringDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::StringDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::StringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->StringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::StringDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::StringDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::StringDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::ULong POA_CORBA::StringDef_tie<T>::bound  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->bound (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::StringDef_tie<T>::bound  (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->bound (
-    bound
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::WstringDef_tie<T>::WstringDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::WstringDef_tie<T>::WstringDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::WstringDef_tie<T>::WstringDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::WstringDef_tie<T>::WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::WstringDef_tie<T>::~WstringDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::WstringDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::WstringDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::WstringDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::WstringDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::WstringDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::WstringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->WstringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::WstringDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::WstringDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::WstringDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::ULong POA_CORBA::WstringDef_tie<T>::bound  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->bound (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::WstringDef_tie<T>::bound  (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->bound (
-    bound
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::SequenceDef_tie<T>::SequenceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::SequenceDef_tie<T>::SequenceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::SequenceDef_tie<T>::SequenceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::SequenceDef_tie<T>::SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::SequenceDef_tie<T>::~SequenceDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::SequenceDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::SequenceDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::SequenceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::SequenceDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::SequenceDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::SequenceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->SequenceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::SequenceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::SequenceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::ULong POA_CORBA::SequenceDef_tie<T>::bound  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->bound (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::SequenceDef_tie<T>::bound  (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->bound (
-    bound
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::element_type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->element_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::SequenceDef_tie<T>::element_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->element_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::SequenceDef_tie<T>::element_type_def  (
-    CORBA::IDLType_ptr element_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->element_type_def (
-    element_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ArrayDef_tie<T>::ArrayDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ArrayDef_tie<T>::ArrayDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ArrayDef_tie<T>::ArrayDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ArrayDef_tie<T>::ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ArrayDef_tie<T>::~ArrayDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ArrayDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ArrayDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ArrayDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ArrayDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ArrayDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ArrayDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ArrayDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ArrayDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ArrayDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::ULong POA_CORBA::ArrayDef_tie<T>::length  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->length (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ArrayDef_tie<T>::length  (
-    CORBA::ULong length
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->length (
-    length
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::element_type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->element_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::ArrayDef_tie<T>::element_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->element_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ArrayDef_tie<T>::element_type_def  (
-    CORBA::IDLType_ptr element_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->element_type_def (
-    element_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ExceptionDef_tie<T>::ExceptionDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExceptionDef_tie<T>::ExceptionDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExceptionDef_tie<T>::ExceptionDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExceptionDef_tie<T>::ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExceptionDef_tie<T>::~ExceptionDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ExceptionDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExceptionDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExceptionDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ExceptionDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExceptionDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExceptionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ExceptionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ExceptionDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExceptionDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExceptionDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExceptionDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ExceptionDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExceptionDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ExceptionDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ExceptionDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ExceptionDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExceptionDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExceptionDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ExceptionDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ExceptionDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructMemberSeq * POA_CORBA::ExceptionDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::members  (
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->members (
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::AttributeDef_tie<T>::AttributeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AttributeDef_tie<T>::AttributeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AttributeDef_tie<T>::AttributeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AttributeDef_tie<T>::AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AttributeDef_tie<T>::~AttributeDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::AttributeDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::AttributeDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::AttributeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::AttributeDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::AttributeDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AttributeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->AttributeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::AttributeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AttributeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AttributeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AttributeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::AttributeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AttributeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::AttributeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::AttributeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::AttributeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::AttributeDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::type_def  (
-    CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->type_def (
-    type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeMode POA_CORBA::AttributeDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::mode  (
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->mode (
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAttributeDef_tie<T>::ExtAttributeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAttributeDef_tie<T>::ExtAttributeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAttributeDef_tie<T>::ExtAttributeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAttributeDef_tie<T>::ExtAttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAttributeDef_tie<T>::~ExtAttributeDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ExtAttributeDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtAttributeDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtAttributeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ExtAttributeDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtAttributeDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtAttributeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ExtAttributeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ExtAttributeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAttributeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtAttributeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAttributeDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtAttributeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAttributeDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtAttributeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAttributeDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ExtAttributeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtAttributeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ExtAttributeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ExtAttributeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAttributeDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ExtAttributeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
-    CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->type_def (
-    type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeMode POA_CORBA::ExtAttributeDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAttributeDef_tie<T>::mode  (
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->mode (
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->get_exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
-    const CORBA::ExcDescriptionSeq & get_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->get_exceptions (
-    get_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->set_exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
-    const CORBA::ExcDescriptionSeq & set_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->set_exceptions (
-    set_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtAttributeDescription * POA_CORBA::ExtAttributeDef_tie<T>::describe_attribute  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_attribute (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::OperationDef_tie<T>::OperationDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::OperationDef_tie<T>::OperationDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::OperationDef_tie<T>::OperationDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::OperationDef_tie<T>::OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::OperationDef_tie<T>::~OperationDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::OperationDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::OperationDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::OperationDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::OperationDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::OperationDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::OperationDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->OperationDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::OperationDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::OperationDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::OperationDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::OperationDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::OperationDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::OperationDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::OperationDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::OperationDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::OperationDef_tie<T>::result  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->result (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::OperationDef_tie<T>::result_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->result_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::result_def  (
-    CORBA::IDLType_ptr result_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->result_def (
-    result_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ParDescriptionSeq * POA_CORBA::OperationDef_tie<T>::params  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->params (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::params  (
-    const CORBA::ParDescriptionSeq & params
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->params (
-    params
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationMode POA_CORBA::OperationDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::mode  (
-    CORBA::OperationMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->mode (
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContextIdSeq * POA_CORBA::OperationDef_tie<T>::contexts  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contexts (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::contexts  (
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->contexts (
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDefSeq * POA_CORBA::OperationDef_tie<T>::exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::exceptions  (
-    const CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->exceptions (
-    exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceDef_tie<T>::InterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceDef_tie<T>::InterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceDef_tie<T>::InterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceDef_tie<T>::InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceDef_tie<T>::~InterfaceDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::InterfaceDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::InterfaceDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::InterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::InterfaceDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::InterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::InterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->InterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::InterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::InterfaceDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::InterfaceDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::InterfaceDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::InterfaceDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::InterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::InterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::InterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::InterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::InterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::InterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::InterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::InterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_interfaces (
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::InterfaceDef_tie<T>::is_a  (
-    const char * interface_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    interface_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::InterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceAttrExtension_tie<T>::InterfaceAttrExtension_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceAttrExtension_tie<T>::InterfaceAttrExtension_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceAttrExtension_tie<T>::InterfaceAttrExtension_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceAttrExtension_tie<T>::InterfaceAttrExtension_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::InterfaceAttrExtension_tie<T>::~InterfaceAttrExtension_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::InterfaceAttrExtension_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::InterfaceAttrExtension_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::InterfaceAttrExtension_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::InterfaceAttrExtension_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::InterfaceAttrExtension_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::InterfaceAttrExtension_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->InterfaceAttrExtension::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::InterfaceAttrExtension_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtAttributeDef_ptr POA_CORBA::InterfaceAttrExtension_tie<T>::create_ext_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode,
-    get_exceptions,
-    set_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtInterfaceDef_tie<T>::ExtInterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtInterfaceDef_tie<T>::ExtInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtInterfaceDef_tie<T>::ExtInterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtInterfaceDef_tie<T>::ExtInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtInterfaceDef_tie<T>::~ExtInterfaceDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ExtInterfaceDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtInterfaceDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ExtInterfaceDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ExtInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ExtInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ExtInterfaceDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExtInterfaceDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExtInterfaceDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ExtInterfaceDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtInterfaceDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtInterfaceDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtInterfaceDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ExtInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ExtInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ExtInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtInterfaceDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ExtInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_interfaces (
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ExtInterfaceDef_tie<T>::is_a  (
-    const char * interface_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    interface_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtAttributeDef_ptr POA_CORBA::ExtInterfaceDef_tie<T>::create_ext_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode,
-    get_exceptions,
-    set_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::AbstractInterfaceDef_tie<T>::AbstractInterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AbstractInterfaceDef_tie<T>::AbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AbstractInterfaceDef_tie<T>::AbstractInterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AbstractInterfaceDef_tie<T>::AbstractInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::AbstractInterfaceDef_tie<T>::~AbstractInterfaceDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::AbstractInterfaceDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::AbstractInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AbstractInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->AbstractInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::AbstractInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::AbstractInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_interfaces (
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::AbstractInterfaceDef_tie<T>::is_a  (
-    const char * interface_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    interface_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::AbstractInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::ExtAbstractInterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::ExtAbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::ExtAbstractInterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::ExtAbstractInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::~ExtAbstractInterfaceDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ExtAbstractInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ExtAbstractInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_interfaces (
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef_tie<T>::is_a  (
-    const char * interface_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    interface_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtAttributeDef_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::create_ext_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode,
-    get_exceptions,
-    set_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::LocalInterfaceDef_tie<T>::LocalInterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::LocalInterfaceDef_tie<T>::LocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::LocalInterfaceDef_tie<T>::LocalInterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::LocalInterfaceDef_tie<T>::LocalInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::LocalInterfaceDef_tie<T>::~LocalInterfaceDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::LocalInterfaceDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::LocalInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::LocalInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->LocalInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::LocalInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::LocalInterfaceDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::LocalInterfaceDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::LocalInterfaceDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::LocalInterfaceDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::LocalInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::LocalInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::LocalInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::LocalInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::LocalInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::LocalInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::LocalInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_interfaces (
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::LocalInterfaceDef_tie<T>::is_a  (
-    const char * interface_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    interface_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::LocalInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::ExtLocalInterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::ExtLocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::ExtLocalInterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::ExtLocalInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::~ExtLocalInterfaceDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ExtLocalInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ExtLocalInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtLocalInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_interfaces (
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef_tie<T>::is_a  (
-    const char * interface_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    interface_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtAttributeDef_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::create_ext_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode,
-    get_exceptions,
-    set_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index 5e5c62b1f8a..766daf322ca 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -26,11 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:610
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:609
 
-#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
-#define _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
+#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_CPP_
+#define _TAO_IDL_SERVER_IFR_COMPONENTSS_CPP_
 
 
 #include "IFR_ComponentsS.h"
@@ -44,6 +44,7 @@
 #include "tao/Object_T.h"
 #include "tao/Typecode.h"
 #include "tao/DynamicC.h"
+#include "tao/CDR.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -51,38 +52,38 @@
 #include "tao/Var_Size_Argument_T.h"
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
 #include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
-#include "ace/config-all.h"
+#include "ace/Malloc_Allocator.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ComponentsS.i"
+#include "IFR_ComponentsS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
+  class  Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind
@@ -94,9 +95,9 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_SS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Repository>
+  class  Arg_Traits<CORBA::Repository>
     : public
         Object_Arg_Traits_T<
             CORBA::Repository_ptr,
@@ -111,9 +112,9 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container>
+  class  Arg_Traits<CORBA::Container>
     : public
         Object_Arg_Traits_T<
             CORBA::Container_ptr,
@@ -128,9 +129,9 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_SS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::IDLType>
+  class  Arg_Traits<CORBA::IDLType>
     : public
         Object_Arg_Traits_T<
             CORBA::IDLType_ptr,
@@ -145,9 +146,9 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDef>
+  class  Arg_Traits<CORBA::InterfaceDef>
     : public
         Object_Arg_Traits_T<
             CORBA::InterfaceDef_ptr,
@@ -159,15 +160,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
+  class  Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
@@ -181,9 +182,9 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDef>
+  class  Arg_Traits<CORBA::ValueDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ValueDef_ptr,
@@ -195,15 +196,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
+  class  Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
@@ -214,15 +215,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
+  class  Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
@@ -233,15 +234,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
+  class  Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
@@ -252,15 +253,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq>
+  class  Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
@@ -271,15 +272,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
+  class  Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::OperationMode
@@ -288,15 +289,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq>
+  class  Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
@@ -307,15 +308,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
+  class  Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
@@ -329,9 +330,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::ComponentDef>
+  class  Arg_Traits<CORBA::ComponentIR::ComponentDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::ComponentDef_ptr,
@@ -346,9 +347,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::HomeDef>
+  class  Arg_Traits<CORBA::ComponentIR::HomeDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::HomeDef_ptr,
@@ -363,9 +364,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::EventDef>
+  class  Arg_Traits<CORBA::ComponentIR::EventDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::EventDef_ptr,
@@ -380,9 +381,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::ProvidesDef>
+  class  Arg_Traits<CORBA::ComponentIR::ProvidesDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::ProvidesDef_ptr,
@@ -397,9 +398,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::UsesDef>
+  class  Arg_Traits<CORBA::ComponentIR::UsesDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::UsesDef_ptr,
@@ -414,9 +415,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::EmitsDef>
+  class  Arg_Traits<CORBA::ComponentIR::EmitsDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::EmitsDef_ptr,
@@ -431,9 +432,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::PublishesDef>
+  class  Arg_Traits<CORBA::ComponentIR::PublishesDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::PublishesDef_ptr,
@@ -448,9 +449,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::ConsumesDef>
+  class  Arg_Traits<CORBA::ComponentIR::ConsumesDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::ConsumesDef_ptr,
@@ -465,9 +466,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::FactoryDef>
+  class  Arg_Traits<CORBA::ComponentIR::FactoryDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::FactoryDef_ptr,
@@ -482,9 +483,9 @@ namespace TAO
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_SS_)
 #define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ComponentIR::FinderDef>
+  class  Arg_Traits<CORBA::ComponentIR::FinderDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ComponentIR::FinderDef_ptr,
@@ -498,8 +499,9 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -512,7 +514,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -645,13 +647,13 @@ TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed char lookup[] =
     {
-        -7,   -3,  -12,   -2,    4,    5,    6,  -14,   -2, -100,   10,   11,  -17,   -2,
-      -103,  -99,  -22,   -2,   16,  -98,  -24,   -2,  -26,   -2,   19,   20,  -28,   -2,
-        21,  -31,   -4, -106, -103,   -1,  -36,   -2, -105, -102,   30,   -1, -102,   35,
-       -99,   38,   39,   40,   -1,   -1,   41,   -1,   -1,   -1,   42,   -1,  -45,   -2,
-        43,   44,  -95,  -47,   -3,  -93,   50,   -1,   51,   52,   53,   54,   55,   -1,
-        56,   -1,   57,   58,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-        -1,   -1,   -1,   60,   -1,  -61,   -2,  -93,
+        -7,   -3,  -12,   -2,    4,    5,    6,  -14,   -2, -100,   10,   11,  -17,   -2, 
+      -103,  -99,  -22,   -2,   16,  -98,  -24,   -2,  -26,   -2,   19,   20,  -28,   -2, 
+        21,  -31,   -4, -106, -103,   -1,  -36,   -2, -105, -102,   30,   -1, -102,   35, 
+       -99,   38,   39,   40,   -1,   -1,   41,   -1,   -1,   -1,   42,   -1,  -45,   -2, 
+        43,   44,  -95,  -47,   -3,  -93,   50,   -1,   51,   52,   53,   54,   55,   -1, 
+        56,   -1,   57,   58,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+        -1,   -1,   -1,   60,   -1,  -61,   -2,  -93, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -689,7 +691,7 @@ TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, un
 static TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_EventDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -700,7 +702,7 @@ static TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker *
@@ -708,7 +710,7 @@ POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker::the_TAO_EventDef
 {
   static POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -730,7 +732,7 @@ POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
@@ -750,10 +752,10 @@ POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker::dispatch (
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-
+  
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-
+  
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -763,29 +765,29 @@ POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker::dispatch (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-
+  
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-
+  
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
-
+  
   ACE_TRY
     {
       collocated_skel (servant,
@@ -817,7 +819,7 @@ POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -829,17 +831,17 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr
 int
 CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer =
+  CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer = 
     CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
 static int
 CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -850,7 +852,7 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -861,8 +863,8 @@ POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:97
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::EventDef::EventDef (void)
 {
@@ -885,35 +887,35 @@ POA_CORBA::ComponentIR::EventDef::~EventDef (void)
 {
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:162
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-
+  
   POA_CORBA::ComponentIR::EventDef *_tao_impl =
     (POA_CORBA::ComponentIR::EventDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-
+  
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -921,7 +923,7 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
 }
 
 void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -929,14 +931,14 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
 {
   POA_CORBA::ComponentIR::EventDef *_tao_impl =
     (POA_CORBA::ComponentIR::EventDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -944,7 +946,7 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
 }
 
 void POA_CORBA::ComponentIR::EventDef::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -954,30 +956,30 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   POA_CORBA::ComponentIR::EventDef *_tao_impl =
     (POA_CORBA::ComponentIR::EventDef *) _tao_servant;
-
-  CORBA::InterfaceDef_ptr _tao_retval =
+  
+  CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-
+  
   _tao_adapter->dispose (_tao_retval);
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -985,7 +987,7 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
 }
 
 void POA_CORBA::ComponentIR::EventDef::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1062,49 +1064,49 @@ void* POA_CORBA::ComponentIR::EventDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ValueDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ValueDef_ptr, this);
+      return static_cast<POA_CORBA::ValueDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ExtValueDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ExtValueDef_ptr, this);
+      return static_cast<POA_CORBA::ExtValueDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::EventDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::EventDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -1116,7 +1118,7 @@ const char* POA_CORBA::ComponentIR::EventDef::_interface_repository_id (void) co
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::EventDef::_dispatch (
     TAO_ServerRequest &req,
@@ -1131,7 +1133,7 @@ void POA_CORBA::ComponentIR::EventDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::EventDef *
 POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1171,7 +1173,7 @@ POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1184,7 +1186,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1326,12 +1328,12 @@ TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::lookup (const char *str, u
 static TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable tao_CORBA_ComponentIR_Container_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component : public TAO_ServerRequestInfo
 {
@@ -1343,8 +1345,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ComponentIR::ComponentDef_ptr base_component,
-      const CORBA::InterfaceDefSeq & supports_interfaces
+      ::CORBA::ComponentIR::ComponentDef_ptr base_component,
+      const ::CORBA::InterfaceDefSeq & supports_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -1391,13 +1393,13 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ComponentIR::ComponentDef_ptr base_component_;
-  const CORBA::InterfaceDefSeq & supports_interfaces_;
+  ::CORBA::ComponentIR::ComponentDef_ptr base_component_;
+  const ::CORBA::InterfaceDefSeq & supports_interfaces_;
   ::CORBA::ComponentIR::ComponentDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component::TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component (
     TAO_ServerRequest &_tao_server_request,
@@ -1406,8 +1408,8 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component::TAO_ServerRe
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces
+    ::CORBA::ComponentIR::ComponentDef_ptr base_component,
+    const ::CORBA::InterfaceDefSeq & supports_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1518,7 +1520,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component::result (::CO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home : public TAO_ServerRequestInfo
 {
@@ -1530,10 +1532,10 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ComponentIR::HomeDef_ptr base_home,
-      CORBA::ComponentIR::ComponentDef_ptr managed_component,
-      const CORBA::InterfaceDefSeq & supports_interfaces,
-      CORBA::ValueDef_ptr primary_key
+      ::CORBA::ComponentIR::HomeDef_ptr base_home,
+      ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
+      const ::CORBA::InterfaceDefSeq & supports_interfaces,
+      ::CORBA::ValueDef_ptr primary_key
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -1580,15 +1582,15 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ComponentIR::HomeDef_ptr base_home_;
-  CORBA::ComponentIR::ComponentDef_ptr managed_component_;
-  const CORBA::InterfaceDefSeq & supports_interfaces_;
-  CORBA::ValueDef_ptr primary_key_;
+  ::CORBA::ComponentIR::HomeDef_ptr base_home_;
+  ::CORBA::ComponentIR::ComponentDef_ptr managed_component_;
+  const ::CORBA::InterfaceDefSeq & supports_interfaces_;
+  ::CORBA::ValueDef_ptr primary_key_;
   ::CORBA::ComponentIR::HomeDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home::TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home (
     TAO_ServerRequest &_tao_server_request,
@@ -1597,10 +1599,10 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home::TAO_ServerRequest
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::HomeDef_ptr base_home,
-    CORBA::ComponentIR::ComponentDef_ptr managed_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
-    CORBA::ValueDef_ptr primary_key
+    ::CORBA::ComponentIR::HomeDef_ptr base_home,
+    ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
+    const ::CORBA::InterfaceDefSeq & supports_interfaces,
+    ::CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1721,7 +1723,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home::result (::CORBA::
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event : public TAO_ServerRequestInfo
 {
@@ -1733,13 +1735,13 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::Boolean & is_custom,
-      const CORBA::Boolean & is_abstract,
-      CORBA::ValueDef_ptr base_value,
-      const CORBA::Boolean & is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::ExtInitializerSeq & initializers
+      const ::CORBA::Boolean & is_custom,
+      const ::CORBA::Boolean & is_abstract,
+      ::CORBA::ValueDef_ptr base_value,
+      const ::CORBA::Boolean & is_truncatable,
+      const ::CORBA::ValueDefSeq & abstract_base_values,
+      const ::CORBA::InterfaceDefSeq & supported_interfaces,
+      const ::CORBA::ExtInitializerSeq & initializers
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -1786,18 +1788,18 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::Boolean & is_custom_;
-  const CORBA::Boolean & is_abstract_;
-  CORBA::ValueDef_ptr base_value_;
-  const CORBA::Boolean & is_truncatable_;
-  const CORBA::ValueDefSeq & abstract_base_values_;
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
-  const CORBA::ExtInitializerSeq & initializers_;
+  const ::CORBA::Boolean & is_custom_;
+  const ::CORBA::Boolean & is_abstract_;
+  ::CORBA::ValueDef_ptr base_value_;
+  const ::CORBA::Boolean & is_truncatable_;
+  const ::CORBA::ValueDefSeq & abstract_base_values_;
+  const ::CORBA::InterfaceDefSeq & supported_interfaces_;
+  const ::CORBA::ExtInitializerSeq & initializers_;
   ::CORBA::ComponentIR::EventDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event::TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event (
     TAO_ServerRequest &_tao_server_request,
@@ -1806,13 +1808,13 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event::TAO_ServerReques
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::Boolean & is_custom,
-    const CORBA::Boolean & is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    const CORBA::Boolean & is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
+    const ::CORBA::Boolean & is_custom,
+    const ::CORBA::Boolean & is_abstract,
+    ::CORBA::ValueDef_ptr base_value,
+    const ::CORBA::Boolean & is_truncatable,
+    const ::CORBA::ValueDefSeq & abstract_base_values,
+    const ::CORBA::InterfaceDefSeq & supported_interfaces,
+    const ::CORBA::ExtInitializerSeq & initializers
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1954,7 +1956,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event::result (::CORBA:
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_Container_Strategized_Proxy_Broker *
@@ -2037,7 +2039,7 @@ POA_CORBA::ComponentIR::_TAO_Container_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -2071,7 +2073,7 @@ POA_CORBA::ComponentIR::_TAO_Container_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -2092,8 +2094,8 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer
         )
     );
@@ -2104,7 +2106,7 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::_TAO_Container_ThruPOA_Proxy_Impl (void)
 {}
@@ -2112,7 +2114,7 @@ POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::_TAO_Container_ThruPO
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_component (
@@ -2125,25 +2127,25 @@ POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_component (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
           )
       )->create_component (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[5])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[5])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_home (
@@ -2156,27 +2158,27 @@ POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_home (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::HomeDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
           )
       )->create_home (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::ComponentIR::HomeDef>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::in_arg_val *) args[5])->arg (),
-          ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[6])->arg (),
-          ((TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val *) args[7])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val *) args[5])->arg (),
+          ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[6])->arg (),
+          ((TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val *) args[7])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_event (
@@ -2189,23 +2191,23 @@ POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_event (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::Container_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::Container_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
           )
       )->create_event (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[5])->arg (),
-          ((TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val *) args[6])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[7])->arg (),
-          ((TAO::Arg_Traits<CORBA::ValueDefSeq>::in_arg_val *) args[8])->arg (),
-          ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[9])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExtInitializerSeq>::in_arg_val *) args[10])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[5])->arg (),
+          ((TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val *) args[6])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[7])->arg (),
+          ((TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val *) args[8])->arg (),
+          ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[9])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val *) args[10])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -2216,7 +2218,7 @@ POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_event (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::Container::Container (void)
 {
@@ -2236,7 +2238,7 @@ POA_CORBA::ComponentIR::Container::~Container (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::Container::create_component_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2245,18 +2247,18 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::Container *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::ComponentDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::ComponentIR::ComponentDef_var base_component;
-  CORBA::InterfaceDefSeq supports_interfaces;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::ComponentIR::ComponentDef_var base_component;
+  ::CORBA::InterfaceDefSeq supports_interfaces;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -2272,8 +2274,8 @@ POA_CORBA::ComponentIR::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2385,23 +2387,30 @@ POA_CORBA::ComponentIR::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::Container::create_home_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2410,20 +2419,20 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::Container *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::HomeDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::ComponentIR::HomeDef_var base_home;
-  CORBA::ComponentIR::ComponentDef_var managed_component;
-  CORBA::InterfaceDefSeq supports_interfaces;
-  CORBA::ValueDef_var primary_key;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::ComponentIR::HomeDef_var base_home;
+  ::CORBA::ComponentIR::ComponentDef_var managed_component;
+  ::CORBA::InterfaceDefSeq supports_interfaces;
+  ::CORBA::ValueDef_var primary_key;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -2441,8 +2450,8 @@ POA_CORBA::ComponentIR::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2562,23 +2571,30 @@ POA_CORBA::ComponentIR::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::Container::create_event_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2587,23 +2603,23 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::Container *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::Container *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::Container *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::Container *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::EventDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::Boolean is_custom;
-  CORBA::Boolean is_abstract;
-  CORBA::ValueDef_var base_value;
-  CORBA::Boolean is_truncatable;
-  CORBA::ValueDefSeq abstract_base_values;
-  CORBA::InterfaceDefSeq supported_interfaces;
-  CORBA::ExtInitializerSeq initializers;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::Boolean is_custom;
+  ::CORBA::Boolean is_abstract;
+  ::CORBA::ValueDef_var base_value;
+  ::CORBA::Boolean is_truncatable;
+  ::CORBA::ValueDefSeq abstract_base_values;
+  ::CORBA::InterfaceDefSeq supported_interfaces;
+  ::CORBA::ExtInitializerSeq initializers;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -2624,8 +2640,8 @@ POA_CORBA::ComponentIR::Container *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2757,23 +2773,30 @@ POA_CORBA::ComponentIR::Container *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::Container::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -2933,25 +2956,25 @@ void* POA_CORBA::ComponentIR::Container::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::Container_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -2963,7 +2986,7 @@ const char* POA_CORBA::ComponentIR::Container::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::Container::_dispatch (
     TAO_ServerRequest &req,
@@ -2978,7 +3001,7 @@ void POA_CORBA::ComponentIR::Container::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::Container *
 POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3018,7 +3041,7 @@ POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -3031,7 +3054,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3185,7 +3208,7 @@ TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, u
 static TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_ModuleDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -3196,7 +3219,7 @@ static TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ComponentI
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_ModuleDef_Strategized_Proxy_Broker *
@@ -3279,7 +3302,7 @@ POA_CORBA::ComponentIR::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -3313,7 +3336,7 @@ POA_CORBA::ComponentIR::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3334,8 +3357,8 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -3346,7 +3369,7 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_TAO_ModuleDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -3358,7 +3381,7 @@ POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_TAO_ModuleDef_ThruPO
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::ModuleDef::ModuleDef (void)
 {
@@ -3381,7 +3404,7 @@ POA_CORBA::ComponentIR::ModuleDef::~ModuleDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -3553,43 +3576,43 @@ void* POA_CORBA::ComponentIR::ModuleDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ModuleDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ModuleDef_ptr, this);
+      return static_cast<POA_CORBA::ModuleDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::Container_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::ModuleDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::ModuleDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -3601,7 +3624,7 @@ const char* POA_CORBA::ComponentIR::ModuleDef::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::ModuleDef::_dispatch (
     TAO_ServerRequest &req,
@@ -3616,7 +3639,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::ModuleDef *
 POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3656,7 +3679,7 @@ POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -3669,7 +3692,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3822,7 +3845,7 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable tao_CORBA_ComponentIR_Repository_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -3833,7 +3856,7 @@ static TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable tao_CORBA_Component
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_Repository_Strategized_Proxy_Broker *
@@ -3916,7 +3939,7 @@ POA_CORBA::ComponentIR::_TAO_Repository_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -3950,7 +3973,7 @@ POA_CORBA::ComponentIR::_TAO_Repository_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3971,8 +3994,8 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer
         )
     );
@@ -3983,7 +4006,7 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecro
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::_TAO_Repository_ThruPOA_Proxy_Impl (void)
 {}
@@ -3995,7 +4018,7 @@ POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::_TAO_Repository_Thru
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::Repository::Repository (void)
 {
@@ -4017,7 +4040,7 @@ POA_CORBA::ComponentIR::Repository::~Repository (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::Repository::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -4185,37 +4208,37 @@ void* POA_CORBA::ComponentIR::Repository::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Repository:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Repository_ptr, this);
+      return static_cast<POA_CORBA::Repository_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::Container_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/Repository:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::Repository_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::Repository_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -4227,7 +4250,7 @@ const char* POA_CORBA::ComponentIR::Repository::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::Repository::_dispatch (
     TAO_ServerRequest &req,
@@ -4242,7 +4265,7 @@ void POA_CORBA::ComponentIR::Repository::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::Repository *
 POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -4282,7 +4305,7 @@ POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -4295,7 +4318,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4428,12 +4451,12 @@ TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_ProvidesDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get : public TAO_ServerRequestInfo
 {
@@ -4489,7 +4512,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -4576,7 +4599,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::result (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set : public TAO_ServerRequestInfo
 {
@@ -4585,7 +4608,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ProvidesDef *tao_impl,
-      CORBA::InterfaceDef_ptr interface_type
+      ::CORBA::InterfaceDef_ptr interface_type
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -4627,17 +4650,17 @@ private:
 private:
   POA_CORBA::ComponentIR::ProvidesDef *_tao_impl;
   
-  CORBA::InterfaceDef_ptr interface_type_;
+  ::CORBA::InterfaceDef_ptr interface_type_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ProvidesDef *tao_impl,
-    CORBA::InterfaceDef_ptr interface_type
+    ::CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -4723,7 +4746,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::target_i
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_ProvidesDef_Strategized_Proxy_Broker *
@@ -4806,7 +4829,7 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -4840,7 +4863,7 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -4861,8 +4884,8 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -4873,7 +4896,7 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -4881,7 +4904,7 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_Th
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_interface_type (
@@ -4894,9 +4917,9 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_interface_type
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InterfaceDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::ProvidesDef_ptr,
+  ((TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::ProvidesDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0"
           )
@@ -4907,7 +4930,7 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_interface_type
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_set_interface_type (
@@ -4920,13 +4943,13 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_set_interface_type
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::ProvidesDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::ProvidesDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0"
         )
     )->interface_type (
-        ((TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -4937,7 +4960,7 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_set_interface_type
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::ProvidesDef::ProvidesDef (void)
 {
@@ -4957,7 +4980,7 @@ POA_CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4967,16 +4990,16 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
   )
 {
   POA_CORBA::ComponentIR::ProvidesDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ProvidesDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::ProvidesDef *> (
         _tao_servant
       );
   ::CORBA::InterfaceDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5069,23 +5092,30 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -5094,15 +5124,15 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::ProvidesDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ProvidesDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::ProvidesDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::ProvidesDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::InterfaceDef_var interface_type;
+  ::CORBA::InterfaceDef_var interface_type;
   
   if (!(
       (_tao_in >> interface_type.out ())
@@ -5114,8 +5144,8 @@ POA_CORBA::ComponentIR::ProvidesDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5214,7 +5244,7 @@ POA_CORBA::ComponentIR::ProvidesDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -5374,25 +5404,25 @@ void* POA_CORBA::ComponentIR::ProvidesDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::ProvidesDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::ProvidesDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -5404,7 +5434,7 @@ const char* POA_CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::ProvidesDef::_dispatch (
     TAO_ServerRequest &req,
@@ -5419,7 +5449,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::ProvidesDef *
 POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -5459,7 +5489,7 @@ POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -5472,7 +5502,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -5607,12 +5637,12 @@ TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 static TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_UsesDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get : public TAO_ServerRequestInfo
 {
@@ -5668,7 +5698,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -5755,7 +5785,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::result (::CO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set : public TAO_ServerRequestInfo
 {
@@ -5764,7 +5794,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::UsesDef *tao_impl,
-      CORBA::InterfaceDef_ptr interface_type
+      ::CORBA::InterfaceDef_ptr interface_type
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -5806,17 +5836,17 @@ private:
 private:
   POA_CORBA::ComponentIR::UsesDef *_tao_impl;
   
-  CORBA::InterfaceDef_ptr interface_type_;
+  ::CORBA::InterfaceDef_ptr interface_type_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::UsesDef *tao_impl,
-    CORBA::InterfaceDef_ptr interface_type
+    ::CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -5896,7 +5926,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::target_is_a
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get : public TAO_ServerRequestInfo
 {
@@ -5952,7 +5982,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get (
     TAO_ServerRequest &_tao_server_request,
@@ -6039,7 +6069,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::result (CORBA::
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set : public TAO_ServerRequestInfo
 {
@@ -6048,7 +6078,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::UsesDef *tao_impl,
-      const CORBA::Boolean & is_multiple
+      const ::CORBA::Boolean & is_multiple
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -6090,17 +6120,17 @@ private:
 private:
   POA_CORBA::ComponentIR::UsesDef *_tao_impl;
   
-  const CORBA::Boolean & is_multiple_;
+  const ::CORBA::Boolean & is_multiple_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::UsesDef *tao_impl,
-    const CORBA::Boolean & is_multiple
+    const ::CORBA::Boolean & is_multiple
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6186,7 +6216,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_UsesDef_Strategized_Proxy_Broker *
@@ -6269,7 +6299,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -6303,7 +6333,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -6324,8 +6354,8 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -6336,7 +6366,7 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -6344,7 +6374,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Pr
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_interface_type (
@@ -6357,9 +6387,9 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_interface_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InterfaceDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::UsesDef_ptr,
+  ((TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::UsesDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0"
           )
@@ -6370,7 +6400,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_interface_type (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_set_interface_type (
@@ -6383,20 +6413,20 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_set_interface_type (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::UsesDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::UsesDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0"
         )
     )->interface_type (
-        ((TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_is_multiple (
@@ -6409,9 +6439,9 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_is_multiple (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::UsesDef_ptr,
+  ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::UsesDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0"
           )
@@ -6422,7 +6452,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_is_multiple (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_set_is_multiple (
@@ -6435,13 +6465,13 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_set_is_multiple (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::UsesDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::UsesDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0"
         )
     )->is_multiple (
-        ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -6452,7 +6482,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_set_is_multiple (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::UsesDef::UsesDef (void)
 {
@@ -6472,7 +6502,7 @@ POA_CORBA::ComponentIR::UsesDef::~UsesDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6482,16 +6512,16 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
   )
 {
   POA_CORBA::ComponentIR::UsesDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::UsesDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::UsesDef *> (
         _tao_servant
       );
   ::CORBA::InterfaceDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6584,23 +6614,30 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6609,15 +6646,15 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::UsesDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::UsesDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::UsesDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::UsesDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::InterfaceDef_var interface_type;
+  ::CORBA::InterfaceDef_var interface_type;
   
   if (!(
       (_tao_in >> interface_type.out ())
@@ -6629,8 +6666,8 @@ POA_CORBA::ComponentIR::UsesDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6729,7 +6766,7 @@ POA_CORBA::ComponentIR::UsesDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6739,16 +6776,16 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
   )
 {
   POA_CORBA::ComponentIR::UsesDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::UsesDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::UsesDef *> (
         _tao_servant
       );
   CORBA::Boolean _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6840,23 +6877,30 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6865,15 +6909,15 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::UsesDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::UsesDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::UsesDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::UsesDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::Boolean is_multiple;
+  ::CORBA::Boolean is_multiple;
   
   if (!(
       (_tao_in >> CORBA::Any::to_boolean (is_multiple))
@@ -6885,8 +6929,8 @@ POA_CORBA::ComponentIR::UsesDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6985,7 +7029,7 @@ POA_CORBA::ComponentIR::UsesDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -7145,25 +7189,25 @@ void* POA_CORBA::ComponentIR::UsesDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::UsesDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::UsesDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -7175,7 +7219,7 @@ const char* POA_CORBA::ComponentIR::UsesDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::UsesDef::_dispatch (
     TAO_ServerRequest &req,
@@ -7190,7 +7234,7 @@ void POA_CORBA::ComponentIR::UsesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::UsesDef *
 POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7230,7 +7274,7 @@ POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -7243,7 +7287,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7377,12 +7421,12 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::lookup (const char *str
 static TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_EventPortDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get : public TAO_ServerRequestInfo
 {
@@ -7438,7 +7482,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get (
     TAO_ServerRequest &_tao_server_request,
@@ -7525,7 +7569,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::result (::CORBA:
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set : public TAO_ServerRequestInfo
 {
@@ -7534,7 +7578,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::EventPortDef *tao_impl,
-      CORBA::ComponentIR::EventDef_ptr event
+      ::CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -7576,17 +7620,17 @@ private:
 private:
   POA_CORBA::ComponentIR::EventPortDef *_tao_impl;
   
-  CORBA::ComponentIR::EventDef_ptr event_;
+  ::CORBA::ComponentIR::EventDef_ptr event_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::EventPortDef *tao_impl,
-    CORBA::ComponentIR::EventDef_ptr event
+    ::CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -7666,7 +7710,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a : public TAO_ServerRequestInfo
 {
@@ -7724,7 +7768,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a (
     TAO_ServerRequest &_tao_server_request,
@@ -7827,7 +7871,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::result (CORBA::Boolea
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_EventPortDef_Strategized_Proxy_Broker *
@@ -7910,7 +7954,7 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -7944,7 +7988,7 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -7965,8 +8009,8 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -7977,7 +8021,7 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_TAO_EventPortDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -7985,7 +8029,7 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_TAO_EventPortDef_
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_event (
@@ -7998,9 +8042,9 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_event (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::EventPortDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::EventPortDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
           )
@@ -8011,7 +8055,7 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_event (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_set_event (
@@ -8024,20 +8068,20 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_set_event (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::EventPortDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::EventPortDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         )
     )->event (
-        ((TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::is_a (
@@ -8050,14 +8094,14 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::is_a (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::EventPortDef_ptr,
+  ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::EventPortDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
           )
       )->is_a (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -8068,7 +8112,7 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::is_a (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::EventPortDef::EventPortDef (void)
 {
@@ -8088,7 +8132,7 @@ POA_CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8098,16 +8142,16 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
   )
 {
   POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::EventPortDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::EventPortDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::EventDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8200,23 +8244,30 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8225,15 +8276,15 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::EventPortDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::EventPortDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ComponentIR::EventDef_var event;
+  ::CORBA::ComponentIR::EventDef_var event;
   
   if (!(
       (_tao_in >> event.out ())
@@ -8245,8 +8296,8 @@ POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8345,7 +8396,7 @@ POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8354,14 +8405,14 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::EventPortDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::EventPortDef *> (
         _tao_servant
       );
   CORBA::Boolean _tao_retval = 0;
-  CORBA::String_var event_id;
+  ::CORBA::String_var event_id;
   
   if (!(
       (_tao_in >> event_id.out ())
@@ -8373,8 +8424,8 @@ POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8469,23 +8520,30 @@ POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -8645,25 +8703,25 @@ void* POA_CORBA::ComponentIR::EventPortDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::EventPortDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::EventPortDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -8675,7 +8733,7 @@ const char* POA_CORBA::ComponentIR::EventPortDef::_interface_repository_id (void
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::EventPortDef::_dispatch (
     TAO_ServerRequest &req,
@@ -8690,7 +8748,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::EventPortDef *
 POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -8730,7 +8788,7 @@ POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -8743,7 +8801,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -8877,7 +8935,7 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, un
 static TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_EmitsDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -8888,7 +8946,7 @@ static TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_EmitsDef_Strategized_Proxy_Broker *
@@ -8971,7 +9029,7 @@ POA_CORBA::ComponentIR::_TAO_EmitsDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -9005,7 +9063,7 @@ POA_CORBA::ComponentIR::_TAO_EmitsDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -9026,8 +9084,8 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -9038,7 +9096,7 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_TAO_EmitsDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -9050,7 +9108,7 @@ POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_TAO_EmitsDef_ThruPOA_
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::EmitsDef::EmitsDef (void)
 {
@@ -9071,7 +9129,7 @@ POA_CORBA::ComponentIR::EmitsDef::~EmitsDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -9235,31 +9293,31 @@ void* POA_CORBA::ComponentIR::EmitsDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::EventPortDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::EventPortDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::EmitsDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::EmitsDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -9271,7 +9329,7 @@ const char* POA_CORBA::ComponentIR::EmitsDef::_interface_repository_id (void) co
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::EmitsDef::_dispatch (
     TAO_ServerRequest &req,
@@ -9286,7 +9344,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::EmitsDef *
 POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -9326,7 +9384,7 @@ POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -9339,7 +9397,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -9473,7 +9531,7 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str
 static TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_PublishesDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -9484,7 +9542,7 @@ static TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable tao_CORBA_Compone
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_PublishesDef_Strategized_Proxy_Broker *
@@ -9567,7 +9625,7 @@ POA_CORBA::ComponentIR::_TAO_PublishesDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -9601,7 +9659,7 @@ POA_CORBA::ComponentIR::_TAO_PublishesDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -9622,8 +9680,8 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -9634,7 +9692,7 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_TAO_PublishesDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -9646,7 +9704,7 @@ POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_TAO_PublishesDef_
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::PublishesDef::PublishesDef (void)
 {
@@ -9667,7 +9725,7 @@ POA_CORBA::ComponentIR::PublishesDef::~PublishesDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -9831,31 +9889,31 @@ void* POA_CORBA::ComponentIR::PublishesDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::EventPortDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::EventPortDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::PublishesDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::PublishesDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -9867,7 +9925,7 @@ const char* POA_CORBA::ComponentIR::PublishesDef::_interface_repository_id (void
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::PublishesDef::_dispatch (
     TAO_ServerRequest &req,
@@ -9882,7 +9940,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::PublishesDef *
 POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -9922,7 +9980,7 @@ POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -9935,7 +9993,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10069,7 +10127,7 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_ConsumesDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -10080,7 +10138,7 @@ static TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable tao_CORBA_Componen
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_ConsumesDef_Strategized_Proxy_Broker *
@@ -10163,7 +10221,7 @@ POA_CORBA::ComponentIR::_TAO_ConsumesDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -10197,7 +10255,7 @@ POA_CORBA::ComponentIR::_TAO_ConsumesDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -10218,8 +10276,8 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -10230,7 +10288,7 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -10242,7 +10300,7 @@ POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_TAO_ConsumesDef_Th
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::ConsumesDef::ConsumesDef (void)
 {
@@ -10263,7 +10321,7 @@ POA_CORBA::ComponentIR::ConsumesDef::~ConsumesDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -10427,31 +10485,31 @@ void* POA_CORBA::ComponentIR::ConsumesDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::EventPortDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::EventPortDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::ConsumesDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::ConsumesDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -10463,7 +10521,7 @@ const char* POA_CORBA::ComponentIR::ConsumesDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::ConsumesDef::_dispatch (
     TAO_ServerRequest &req,
@@ -10478,7 +10536,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::ConsumesDef *
 POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -10518,7 +10576,7 @@ POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -10531,7 +10589,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10702,12 +10760,12 @@ TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str
 static TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_ComponentDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get : public TAO_ServerRequestInfo
 {
@@ -10763,7 +10821,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get (
     TAO_ServerRequest &_tao_server_request,
@@ -10850,7 +10908,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::result
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set : public TAO_ServerRequestInfo
 {
@@ -10859,7 +10917,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl,
-      CORBA::ComponentIR::ComponentDef_ptr base_component
+      ::CORBA::ComponentIR::ComponentDef_ptr base_component
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -10901,17 +10959,17 @@ private:
 private:
   POA_CORBA::ComponentIR::ComponentDef *_tao_impl;
   
-  CORBA::ComponentIR::ComponentDef_ptr base_component_;
+  ::CORBA::ComponentIR::ComponentDef_ptr base_component_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl,
-    CORBA::ComponentIR::ComponentDef_ptr base_component
+    ::CORBA::ComponentIR::ComponentDef_ptr base_component
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -10991,7 +11049,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::target_
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get : public TAO_ServerRequestInfo
 {
@@ -11047,7 +11105,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
@@ -11134,7 +11192,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::r
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set : public TAO_ServerRequestInfo
 {
@@ -11143,7 +11201,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl,
-      const CORBA::InterfaceDefSeq & supported_interfaces
+      const ::CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -11185,17 +11243,17 @@ private:
 private:
   POA_CORBA::ComponentIR::ComponentDef *_tao_impl;
   
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
+  const ::CORBA::InterfaceDefSeq & supported_interfaces_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl,
-    const CORBA::InterfaceDefSeq & supported_interfaces
+    const ::CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -11275,7 +11333,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::t
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides : public TAO_ServerRequestInfo
 {
@@ -11287,7 +11345,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type
+      ::CORBA::InterfaceDef_ptr interface_type
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -11334,12 +11392,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::InterfaceDef_ptr interface_type_;
+  ::CORBA::InterfaceDef_ptr interface_type_;
   ::CORBA::ComponentIR::ProvidesDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides (
     TAO_ServerRequest &_tao_server_request,
@@ -11348,7 +11406,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::TAO_Server
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type
+    ::CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -11454,7 +11512,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::result (::
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses : public TAO_ServerRequestInfo
 {
@@ -11466,8 +11524,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
-      const CORBA::Boolean & is_multiple
+      ::CORBA::InterfaceDef_ptr interface_type,
+      const ::CORBA::Boolean & is_multiple
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -11514,13 +11572,13 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::InterfaceDef_ptr interface_type_;
-  const CORBA::Boolean & is_multiple_;
+  ::CORBA::InterfaceDef_ptr interface_type_;
+  const ::CORBA::Boolean & is_multiple_;
   ::CORBA::ComponentIR::UsesDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses (
     TAO_ServerRequest &_tao_server_request,
@@ -11529,8 +11587,8 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::TAO_ServerRequ
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
-    const CORBA::Boolean & is_multiple
+    ::CORBA::InterfaceDef_ptr interface_type,
+    const ::CORBA::Boolean & is_multiple
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -11641,7 +11699,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::result (::CORB
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits : public TAO_ServerRequestInfo
 {
@@ -11653,7 +11711,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ComponentIR::EventDef_ptr event
+      ::CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -11700,12 +11758,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ComponentIR::EventDef_ptr event_;
+  ::CORBA::ComponentIR::EventDef_ptr event_;
   ::CORBA::ComponentIR::EmitsDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits (
     TAO_ServerRequest &_tao_server_request,
@@ -11714,7 +11772,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::TAO_ServerReq
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::EventDef_ptr event
+    ::CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -11820,7 +11878,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::result (::COR
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes : public TAO_ServerRequestInfo
 {
@@ -11832,7 +11890,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ComponentIR::EventDef_ptr event
+      ::CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -11879,12 +11937,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ComponentIR::EventDef_ptr event_;
+  ::CORBA::ComponentIR::EventDef_ptr event_;
   ::CORBA::ComponentIR::PublishesDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes (
     TAO_ServerRequest &_tao_server_request,
@@ -11893,7 +11951,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::TAO_Serve
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::EventDef_ptr event
+    ::CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -11999,7 +12057,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::result (:
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes : public TAO_ServerRequestInfo
 {
@@ -12011,7 +12069,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ComponentIR::EventDef_ptr event
+      ::CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -12058,12 +12116,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ComponentIR::EventDef_ptr event_;
+  ::CORBA::ComponentIR::EventDef_ptr event_;
   ::CORBA::ComponentIR::ConsumesDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes (
     TAO_ServerRequest &_tao_server_request,
@@ -12072,7 +12130,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::TAO_Server
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::EventDef_ptr event
+    ::CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -12184,7 +12242,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::result (::
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_ComponentDef_Strategized_Proxy_Broker *
@@ -12267,7 +12325,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -12301,7 +12359,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -12322,8 +12380,8 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -12334,7 +12392,7 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -12342,7 +12400,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_base_component (
@@ -12355,9 +12413,9 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_base_componen
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::ComponentDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::ComponentDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
           )
@@ -12368,7 +12426,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_base_componen
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_set_base_component (
@@ -12381,20 +12439,20 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_set_base_componen
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::ComponentDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::ComponentDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
         )
     )->base_component (
-        ((TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_supported_interfaces (
@@ -12407,9 +12465,9 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_supported_int
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::ComponentDef_ptr,
+  ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::ComponentDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
           )
@@ -12420,7 +12478,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_supported_int
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_set_supported_interfaces (
@@ -12433,20 +12491,20 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_set_supported_int
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::ComponentDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::ComponentDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
         )
     )->supported_interfaces (
-        ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides (
@@ -12459,24 +12517,24 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::ProvidesDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::ComponentDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::ProvidesDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::ComponentDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
           )
       )->create_provides (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
@@ -12489,25 +12547,25 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::UsesDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::ComponentDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::UsesDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::ComponentDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
           )
       )->create_uses (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[5])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[5])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
@@ -12520,24 +12578,24 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::EmitsDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::ComponentDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::EmitsDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::ComponentDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
           )
       )->create_emits (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
@@ -12550,24 +12608,24 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::PublishesDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::ComponentDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::PublishesDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::ComponentDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
           )
       )->create_publishes (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
@@ -12580,17 +12638,17 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::ConsumesDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::ComponentDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::ConsumesDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::ComponentDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
           )
       )->create_consumes (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::in_arg_val *) args[4])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val *) args[4])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -12601,7 +12659,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::ComponentDef::ComponentDef (void)
 {
@@ -12626,7 +12684,7 @@ POA_CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12636,16 +12694,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
   )
 {
   POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ComponentDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::ComponentDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::ComponentDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12738,23 +12796,30 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12763,15 +12828,15 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ComponentDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::ComponentDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ComponentIR::ComponentDef_var base_component;
+  ::CORBA::ComponentIR::ComponentDef_var base_component;
   
   if (!(
       (_tao_in >> base_component.out ())
@@ -12783,8 +12848,8 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12883,7 +12948,7 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12893,16 +12958,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
   )
 {
   POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ComponentDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::ComponentDef *> (
         _tao_servant
       );
   ::CORBA::InterfaceDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12995,23 +13060,30 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13020,15 +13092,15 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ComponentDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::ComponentDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::InterfaceDefSeq supported_interfaces;
+  ::CORBA::InterfaceDefSeq supported_interfaces;
   
   if (!(
       (_tao_in >> supported_interfaces)
@@ -13040,8 +13112,8 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13140,7 +13212,7 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13149,17 +13221,17 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ComponentDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::ComponentDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::ProvidesDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::InterfaceDef_var interface_type;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::InterfaceDef_var interface_type;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -13174,8 +13246,8 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13283,23 +13355,30 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13308,18 +13387,18 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ComponentDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::ComponentDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::UsesDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::InterfaceDef_var interface_type;
-  CORBA::Boolean is_multiple;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::InterfaceDef_var interface_type;
+  ::CORBA::Boolean is_multiple;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -13335,8 +13414,8 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13448,23 +13527,30 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13473,17 +13559,17 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ComponentDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::ComponentDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::EmitsDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::ComponentIR::EventDef_var event;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::ComponentIR::EventDef_var event;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -13498,8 +13584,8 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13607,23 +13693,30 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13632,17 +13725,17 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ComponentDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::ComponentDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::PublishesDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::ComponentIR::EventDef_var event;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::ComponentIR::EventDef_var event;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -13657,8 +13750,8 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13766,23 +13859,30 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13791,17 +13891,17 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::ComponentDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::ComponentDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::ConsumesDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::ComponentIR::EventDef_var event;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::ComponentIR::EventDef_var event;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -13816,8 +13916,8 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13925,23 +14025,30 @@ POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -14121,55 +14228,55 @@ void* POA_CORBA::ComponentIR::ComponentDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::InterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceAttrExtension_ptr, this);
+      return static_cast<POA_CORBA::InterfaceAttrExtension_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ExtInterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ExtInterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::ExtInterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::ComponentDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::ComponentDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -14181,7 +14288,7 @@ const char* POA_CORBA::ComponentIR::ComponentDef::_interface_repository_id (void
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::ComponentDef::_dispatch (
     TAO_ServerRequest &req,
@@ -14196,7 +14303,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::ComponentDef *
 POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14236,7 +14343,7 @@ POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -14249,7 +14356,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -14444,7 +14551,7 @@ TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_FactoryDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -14455,7 +14562,7 @@ static TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable tao_CORBA_Component
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_FactoryDef_Strategized_Proxy_Broker *
@@ -14538,7 +14645,7 @@ POA_CORBA::ComponentIR::_TAO_FactoryDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -14572,7 +14679,7 @@ POA_CORBA::ComponentIR::_TAO_FactoryDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -14593,8 +14700,8 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -14605,7 +14712,7 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecro
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_TAO_FactoryDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -14617,7 +14724,7 @@ POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_TAO_FactoryDef_Thru
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::FactoryDef::FactoryDef (void)
 {
@@ -14638,7 +14745,7 @@ POA_CORBA::ComponentIR::FactoryDef::~FactoryDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -14802,31 +14909,31 @@ void* POA_CORBA::ComponentIR::FactoryDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::OperationDef_ptr, this);
+      return static_cast<POA_CORBA::OperationDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::FactoryDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::FactoryDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -14838,7 +14945,7 @@ const char* POA_CORBA::ComponentIR::FactoryDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::FactoryDef::_dispatch (
     TAO_ServerRequest &req,
@@ -14853,7 +14960,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::FactoryDef *
 POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14893,7 +15000,7 @@ POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -14906,7 +15013,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -15101,7 +15208,7 @@ TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, u
 static TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_FinderDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -15112,7 +15219,7 @@ static TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable tao_CORBA_ComponentI
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_FinderDef_Strategized_Proxy_Broker *
@@ -15195,7 +15302,7 @@ POA_CORBA::ComponentIR::_TAO_FinderDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -15229,7 +15336,7 @@ POA_CORBA::ComponentIR::_TAO_FinderDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -15250,8 +15357,8 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -15262,7 +15369,7 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_TAO_FinderDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -15274,7 +15381,7 @@ POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_TAO_FinderDef_ThruPO
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::FinderDef::FinderDef (void)
 {
@@ -15295,7 +15402,7 @@ POA_CORBA::ComponentIR::FinderDef::~FinderDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -15459,31 +15566,31 @@ void* POA_CORBA::ComponentIR::FinderDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::OperationDef_ptr, this);
+      return static_cast<POA_CORBA::OperationDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::FinderDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::FinderDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -15495,7 +15602,7 @@ const char* POA_CORBA::ComponentIR::FinderDef::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::FinderDef::_dispatch (
     TAO_ServerRequest &req,
@@ -15510,7 +15617,7 @@ void POA_CORBA::ComponentIR::FinderDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::FinderDef *
 POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -15550,7 +15657,7 @@ POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -15563,7 +15670,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -15736,12 +15843,12 @@ TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 static TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_HomeDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get : public TAO_ServerRequestInfo
 {
@@ -15797,7 +15904,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get (
     TAO_ServerRequest &_tao_server_request,
@@ -15884,7 +15991,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::result (::CORBA::
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set : public TAO_ServerRequestInfo
 {
@@ -15893,7 +16000,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
-      CORBA::ComponentIR::HomeDef_ptr base_home
+      ::CORBA::ComponentIR::HomeDef_ptr base_home
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -15935,17 +16042,17 @@ private:
 private:
   POA_CORBA::ComponentIR::HomeDef *_tao_impl;
   
-  CORBA::ComponentIR::HomeDef_ptr base_home_;
+  ::CORBA::ComponentIR::HomeDef_ptr base_home_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
-    CORBA::ComponentIR::HomeDef_ptr base_home
+    ::CORBA::ComponentIR::HomeDef_ptr base_home
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -16025,7 +16132,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get : public TAO_ServerRequestInfo
 {
@@ -16081,7 +16188,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
@@ -16168,7 +16275,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::result
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set : public TAO_ServerRequestInfo
 {
@@ -16177,7 +16284,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
-      const CORBA::InterfaceDefSeq & supported_interfaces
+      const ::CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -16219,17 +16326,17 @@ private:
 private:
   POA_CORBA::ComponentIR::HomeDef *_tao_impl;
   
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
+  const ::CORBA::InterfaceDefSeq & supported_interfaces_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
-    const CORBA::InterfaceDefSeq & supported_interfaces
+    const ::CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -16309,7 +16416,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::target
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get : public TAO_ServerRequestInfo
 {
@@ -16365,7 +16472,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get (
     TAO_ServerRequest &_tao_server_request,
@@ -16452,7 +16559,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::result (:
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set : public TAO_ServerRequestInfo
 {
@@ -16461,7 +16568,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
-      CORBA::ComponentIR::ComponentDef_ptr managed_component
+      ::CORBA::ComponentIR::ComponentDef_ptr managed_component
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -16503,17 +16610,17 @@ private:
 private:
   POA_CORBA::ComponentIR::HomeDef *_tao_impl;
   
-  CORBA::ComponentIR::ComponentDef_ptr managed_component_;
+  ::CORBA::ComponentIR::ComponentDef_ptr managed_component_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
-    CORBA::ComponentIR::ComponentDef_ptr managed_component
+    ::CORBA::ComponentIR::ComponentDef_ptr managed_component
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -16593,7 +16700,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::target_is
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get : public TAO_ServerRequestInfo
 {
@@ -16649,7 +16756,7 @@ private:
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
@@ -16736,7 +16843,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::result (::CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set : public TAO_ServerRequestInfo
 {
@@ -16745,7 +16852,7 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
-      CORBA::ValueDef_ptr primary_key
+      ::CORBA::ValueDef_ptr primary_key
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -16787,17 +16894,17 @@ private:
 private:
   POA_CORBA::ComponentIR::HomeDef *_tao_impl;
   
-  CORBA::ValueDef_ptr primary_key_;
+  ::CORBA::ValueDef_ptr primary_key_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
-    CORBA::ValueDef_ptr primary_key
+    ::CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -16877,7 +16984,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory : public TAO_ServerRequestInfo
 {
@@ -16889,8 +16996,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions
+      const ::CORBA::ParDescriptionSeq & params,
+      const ::CORBA::ExceptionDefSeq & exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -16937,13 +17044,13 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
+  const ::CORBA::ParDescriptionSeq & params_;
+  const ::CORBA::ExceptionDefSeq & exceptions_;
   ::CORBA::ComponentIR::FactoryDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory (
     TAO_ServerRequest &_tao_server_request,
@@ -16952,8 +17059,8 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::TAO_ServerReques
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions
+    const ::CORBA::ParDescriptionSeq & params,
+    const ::CORBA::ExceptionDefSeq & exceptions
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -17064,7 +17171,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::result (::CORBA:
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder : public TAO_ServerRequestInfo
 {
@@ -17076,8 +17183,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions
+      const ::CORBA::ParDescriptionSeq & params,
+      const ::CORBA::ExceptionDefSeq & exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -17124,13 +17231,13 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
+  const ::CORBA::ParDescriptionSeq & params_;
+  const ::CORBA::ExceptionDefSeq & exceptions_;
   ::CORBA::ComponentIR::FinderDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder (
     TAO_ServerRequest &_tao_server_request,
@@ -17139,8 +17246,8 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::TAO_ServerRequest
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions
+    const ::CORBA::ParDescriptionSeq & params,
+    const ::CORBA::ExceptionDefSeq & exceptions
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -17257,7 +17364,7 @@ TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::result (::CORBA::
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::ComponentIR::_TAO_HomeDef_Strategized_Proxy_Broker *
@@ -17340,7 +17447,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -17374,7 +17481,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -17395,8 +17502,8 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -17407,7 +17514,7 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Proxy_Impl (void)
 {}
@@ -17415,7 +17522,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Pr
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_base_home (
@@ -17428,9 +17535,9 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_base_home (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::HomeDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::HomeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::HomeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
           )
@@ -17441,7 +17548,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_base_home (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_base_home (
@@ -17454,20 +17561,20 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_base_home (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::HomeDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::HomeDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
         )
     )->base_home (
-        ((TAO::Arg_Traits<CORBA::ComponentIR::HomeDef>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_supported_interfaces (
@@ -17480,9 +17587,9 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_supported_interfac
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::HomeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::HomeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
           )
@@ -17493,7 +17600,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_supported_interfac
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_supported_interfaces (
@@ -17506,20 +17613,20 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_supported_interfac
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::HomeDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::HomeDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
         )
     )->supported_interfaces (
-        ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_managed_component (
@@ -17532,9 +17639,9 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_managed_component
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::HomeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::HomeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
           )
@@ -17545,7 +17652,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_managed_component
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_managed_component (
@@ -17558,20 +17665,20 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_managed_component
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::HomeDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::HomeDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
         )
     )->managed_component (
-        ((TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_primary_key (
@@ -17584,9 +17691,9 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_primary_key (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ValueDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::HomeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ValueDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::HomeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
           )
@@ -17597,7 +17704,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_primary_key (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_primary_key (
@@ -17610,20 +17717,20 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_primary_key (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ComponentIR::HomeDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ComponentIR::HomeDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
         )
     )->primary_key (
-        ((TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
@@ -17636,25 +17743,25 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::FactoryDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::HomeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::FactoryDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::HomeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
           )
       )->create_factory (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val *) args[5])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val *) args[5])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
@@ -17667,18 +17774,18 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ComponentIR::FinderDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ComponentIR::HomeDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ComponentIR::FinderDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ComponentIR::HomeDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
           )
       )->create_finder (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val *) args[5])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val *) args[5])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -17689,7 +17796,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ComponentIR::HomeDef::HomeDef (void)
 {
@@ -17714,7 +17821,7 @@ POA_CORBA::ComponentIR::HomeDef::~HomeDef (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -17724,16 +17831,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
   )
 {
   POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::HomeDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17826,23 +17933,30 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -17851,15 +17965,15 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::HomeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ComponentIR::HomeDef_var base_home;
+  ::CORBA::ComponentIR::HomeDef_var base_home;
   
   if (!(
       (_tao_in >> base_home.out ())
@@ -17871,8 +17985,8 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17971,7 +18085,7 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -17981,16 +18095,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
   )
 {
   POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   ::CORBA::InterfaceDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18083,23 +18197,30 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -18108,15 +18229,15 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::HomeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::InterfaceDefSeq supported_interfaces;
+  ::CORBA::InterfaceDefSeq supported_interfaces;
   
   if (!(
       (_tao_in >> supported_interfaces)
@@ -18128,8 +18249,8 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18228,7 +18349,7 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -18238,16 +18359,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
   )
 {
   POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::ComponentDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18340,23 +18461,30 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -18365,15 +18493,15 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::HomeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ComponentIR::ComponentDef_var managed_component;
+  ::CORBA::ComponentIR::ComponentDef_var managed_component;
   
   if (!(
       (_tao_in >> managed_component.out ())
@@ -18385,8 +18513,8 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18485,7 +18613,7 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -18495,16 +18623,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
   )
 {
   POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   ::CORBA::ValueDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18597,23 +18725,30 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -18622,15 +18757,15 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::HomeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::ValueDef_var primary_key;
+  ::CORBA::ValueDef_var primary_key;
   
   if (!(
       (_tao_in >> primary_key.out ())
@@ -18642,8 +18777,8 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18742,7 +18877,7 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -18751,18 +18886,18 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::HomeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::FactoryDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::ParDescriptionSeq params;
-  CORBA::ExceptionDefSeq exceptions;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::ParDescriptionSeq params;
+  ::CORBA::ExceptionDefSeq exceptions;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -18778,8 +18913,8 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18891,23 +19026,30 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:98
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -18916,18 +19058,18 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ComponentIR::HomeDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ComponentIR::HomeDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ComponentIR::HomeDef *> (
         _tao_servant
       );
   ::CORBA::ComponentIR::FinderDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::ParDescriptionSeq params;
-  CORBA::ExceptionDefSeq exceptions;
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::ParDescriptionSeq params;
+  ::CORBA::ExceptionDefSeq exceptions;
   
   if (!(
       (_tao_in >> id.out ()) &&
@@ -18943,8 +19085,8 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
   
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19056,23 +19198,30 @@ POA_CORBA::ComponentIR::HomeDef *_tao_impl =
 #endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
   
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -19252,55 +19401,55 @@ void* POA_CORBA::ComponentIR::HomeDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::InterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::InterfaceAttrExtension_ptr, this);
+      return static_cast<POA_CORBA::InterfaceAttrExtension_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ExtInterfaceDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ExtInterfaceDef_ptr, this);
+      return static_cast<POA_CORBA::ExtInterfaceDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ComponentIR::HomeDef_ptr, this);
+      return static_cast<POA_CORBA::ComponentIR::HomeDef_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -19312,7 +19461,7 @@ const char* POA_CORBA::ComponentIR::HomeDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ComponentIR::HomeDef::_dispatch (
     TAO_ServerRequest &req,
@@ -19327,7 +19476,7 @@ void POA_CORBA::ComponentIR::HomeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ComponentIR::HomeDef *
 POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -19367,12 +19516,7 @@ POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1739
-
-#if 0 
-/* Useful at a later date.
-At present will be commented out */
-
+// be\be_visitor_root/root.cpp:1683
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -20033,67 +20177,25 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::ComponentDef_ptr, \
-        CORBA::ComponentIR::ComponentDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::ComponentIR::ComponentDef_ptr \
       >
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::InterfaceDefSeq, \
-        CORBA::InterfaceDefSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::InterfaceDefSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::ProvidesDef_ptr, \
-        CORBA::ComponentIR::ProvidesDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::InterfaceDef_ptr \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::UsesDef_ptr, \
-        CORBA::ComponentIR::UsesDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::EmitsDef_ptr, \
-        CORBA::ComponentIR::EmitsDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::ComponentIR::EventDef_ptr \
       >
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::PublishesDef_ptr, \
-        CORBA::ComponentIR::PublishesDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::ConsumesDef_ptr, \
-        CORBA::ComponentIR::ConsumesDef_var \
-      >
-
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_TMPLINST_SS_
 
@@ -20109,46 +20211,16 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::HomeDef_ptr, \
-        CORBA::ComponentIR::HomeDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::ComponentIR::HomeDef_ptr \
       >
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::InterfaceDefSeq, \
-        CORBA::InterfaceDefSeq_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::ComponentDef_ptr, \
-        CORBA::ComponentIR::ComponentDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ValueDef_ptr, \
-        CORBA::ValueDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::ValueDef_ptr \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::FactoryDef_ptr, \
-        CORBA::ComponentIR::FactoryDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::ParDescriptionSeq \
       >
@@ -20158,12 +20230,6 @@ At present will be commented out */
         CORBA::ExceptionDefSeq \
       >
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::FinderDef_ptr, \
-        CORBA::ComponentIR::FinderDef_var \
-      >
-
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_TMPLINST_SS_
 
@@ -20179,24 +20245,6 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::ComponentDef_ptr, \
-        CORBA::ComponentIR::ComponentDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::HomeDef_ptr, \
-        CORBA::ComponentIR::HomeDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::EventDef_ptr, \
-        CORBA::ComponentIR::EventDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::ValueDefSeq \
       >
@@ -20220,12 +20268,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::InterfaceDef_ptr, \
-        CORBA::InterfaceDef_var \
-      >
-
 #if !defined (_CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_TMPLINST_SS_
 
@@ -20240,18 +20282,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::InterfaceDef_ptr, \
-        CORBA::InterfaceDef_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ComponentIR::EventDef_ptr, \
-        CORBA::ComponentIR::EventDef_var \
-      >
-
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_TMPLINST_SS_
 
@@ -20323,7 +20353,6 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-#endif /*if 0*/ 
-
 
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
index de9f0789325..2b58ba3c950 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:390
+// be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_H_
-#define _TAO_IDL_ORIG_IFR_COMPONENTSS_H_
+#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_H_
+#define _TAO_IDL_SERVER_IFR_COMPONENTSS_H_
 
 #include /**/ "ace/pre.h"
 
@@ -45,9 +45,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -56,21 +54,21 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
   
   
   // TAO_IDL - Generated from
-  // be/be_visitor_module/module_sh.cpp:49
+  // be\be_visitor_module/module_sh.cpp:49
   
   namespace ComponentIR
   {
     
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class EventDef;
     typedef EventDef *EventDef_ptr;
@@ -140,7 +138,9 @@ namespace POA_CORBA
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
       
-      virtual const char* _interface_repository_id (void) const;static void
+      virtual const char* _interface_repository_id (void) const;
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -149,7 +149,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -160,7 +160,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_skel (
@@ -171,7 +171,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       contents_skel (
@@ -182,7 +182,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_name_skel (
@@ -193,7 +193,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_contents_skel (
@@ -204,7 +204,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_module_skel (
@@ -215,7 +215,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_constant_skel (
@@ -226,7 +226,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_struct_skel (
@@ -237,7 +237,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_union_skel (
@@ -248,7 +248,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_enum_skel (
@@ -259,7 +259,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_alias_skel (
@@ -270,7 +270,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_interface_skel (
@@ -281,7 +281,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_skel (
@@ -292,7 +292,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_box_skel (
@@ -303,7 +303,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_exception_skel (
@@ -314,7 +314,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_native_skel (
@@ -325,7 +325,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_abstract_interface_skel (
@@ -336,7 +336,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_local_interface_skel (
@@ -347,7 +347,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_ext_value_skel (
@@ -355,7 +355,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -369,7 +371,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -383,7 +387,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -397,19 +403,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -418,7 +430,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -429,7 +441,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -437,13 +449,17 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_type_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_supported_interfaces_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -457,7 +473,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_initializers_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -471,7 +489,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_base_value_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -485,7 +505,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_abstract_base_values_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -499,7 +521,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_is_abstract_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -513,7 +537,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_is_custom_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -527,7 +553,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_is_truncatable_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -544,7 +572,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       is_a_skel (
@@ -555,7 +583,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_value_skel (
@@ -566,7 +594,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_member_skel (
@@ -577,7 +605,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_attribute_skel (
@@ -588,7 +616,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_operation_skel (
@@ -596,7 +624,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_ext_initializers_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -613,7 +643,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_ext_value_skel (
@@ -624,7 +654,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_ext_attribute_skel (
@@ -640,7 +670,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_EventDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -684,7 +714,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_EventDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl
@@ -704,7 +734,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -718,7 +748,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup (
@@ -732,7 +762,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       contents (
@@ -746,7 +776,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup_name (
@@ -760,7 +790,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_contents (
@@ -774,7 +804,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_module (
@@ -788,7 +818,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_constant (
@@ -802,7 +832,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_struct (
@@ -816,7 +846,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_union (
@@ -830,7 +860,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_enum (
@@ -844,7 +874,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_alias (
@@ -858,7 +888,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_interface (
@@ -872,7 +902,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value (
@@ -886,7 +916,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value_box (
@@ -900,7 +930,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_exception (
@@ -914,7 +944,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_native (
@@ -928,7 +958,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_abstract_interface (
@@ -942,7 +972,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_local_interface (
@@ -956,7 +986,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_ext_value (
@@ -1057,7 +1087,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -1071,7 +1101,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -1234,7 +1264,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       is_a (
@@ -1248,7 +1278,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_value (
@@ -1262,7 +1292,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value_member (
@@ -1276,7 +1306,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_attribute (
@@ -1290,7 +1320,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_operation (
@@ -1324,7 +1354,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_ext_value (
@@ -1338,7 +1368,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_ext_attribute (
@@ -1357,7 +1387,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class Container;
     typedef Container *Container_ptr;
@@ -1430,14 +1460,14 @@ namespace POA_CORBA
       virtual const char* _interface_repository_id (void) const;
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::ComponentDef_ptr create_component (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::ComponentDef_ptr base_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces
+          ::CORBA::ComponentIR::ComponentDef_ptr base_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1452,16 +1482,16 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::HomeDef_ptr create_home (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::HomeDef_ptr base_home,
-          CORBA::ComponentIR::ComponentDef_ptr managed_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces,
-          CORBA::ValueDef_ptr primary_key
+          ::CORBA::ComponentIR::HomeDef_ptr base_home,
+          ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces,
+          ::CORBA::ValueDef_ptr primary_key
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1476,19 +1506,19 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::EventDef_ptr create_event (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1500,7 +1530,9 @@ namespace POA_CORBA
           void *_tao_servant,
           void *_tao_servant_upcall
           ACE_ENV_ARG_DECL
-        );static void
+        );
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -1509,7 +1541,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -1520,7 +1552,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_skel (
@@ -1531,7 +1563,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       contents_skel (
@@ -1542,7 +1574,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_name_skel (
@@ -1553,7 +1585,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_contents_skel (
@@ -1564,7 +1596,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_module_skel (
@@ -1575,7 +1607,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_constant_skel (
@@ -1586,7 +1618,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_struct_skel (
@@ -1597,7 +1629,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_union_skel (
@@ -1608,7 +1640,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_enum_skel (
@@ -1619,7 +1651,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_alias_skel (
@@ -1630,7 +1662,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_interface_skel (
@@ -1641,7 +1673,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_skel (
@@ -1652,7 +1684,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_box_skel (
@@ -1663,7 +1695,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_exception_skel (
@@ -1674,7 +1706,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_native_skel (
@@ -1685,7 +1717,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_abstract_interface_skel (
@@ -1696,7 +1728,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_local_interface_skel (
@@ -1707,7 +1739,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_ext_value_skel (
@@ -1723,7 +1755,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_Container_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -1767,7 +1799,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_Container_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl
@@ -1778,7 +1810,7 @@ namespace POA_CORBA
       virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) {}
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_component (
@@ -1792,7 +1824,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_home (
@@ -1806,7 +1838,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_event (
@@ -1829,7 +1861,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -1843,7 +1875,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup (
@@ -1857,7 +1889,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       contents (
@@ -1871,7 +1903,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup_name (
@@ -1885,7 +1917,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_contents (
@@ -1899,7 +1931,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_module (
@@ -1913,7 +1945,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_constant (
@@ -1927,7 +1959,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_struct (
@@ -1941,7 +1973,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_union (
@@ -1955,7 +1987,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_enum (
@@ -1969,7 +2001,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_alias (
@@ -1983,7 +2015,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_interface (
@@ -1997,7 +2029,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value (
@@ -2011,7 +2043,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value_box (
@@ -2025,7 +2057,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_exception (
@@ -2039,7 +2071,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_native (
@@ -2053,7 +2085,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_abstract_interface (
@@ -2067,7 +2099,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_local_interface (
@@ -2081,7 +2113,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_ext_value (
@@ -2100,7 +2132,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class ModuleDef;
     typedef ModuleDef *ModuleDef_ptr;
@@ -2171,7 +2203,9 @@ namespace POA_CORBA
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
       
-      virtual const char* _interface_repository_id (void) const;static void
+      virtual const char* _interface_repository_id (void) const;
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -2180,7 +2214,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -2191,7 +2225,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_skel (
@@ -2202,7 +2236,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       contents_skel (
@@ -2213,7 +2247,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_name_skel (
@@ -2224,7 +2258,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_contents_skel (
@@ -2235,7 +2269,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_module_skel (
@@ -2246,7 +2280,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_constant_skel (
@@ -2257,7 +2291,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_struct_skel (
@@ -2268,7 +2302,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_union_skel (
@@ -2279,7 +2313,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_enum_skel (
@@ -2290,7 +2324,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_alias_skel (
@@ -2301,7 +2335,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_interface_skel (
@@ -2312,7 +2346,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_skel (
@@ -2323,7 +2357,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_box_skel (
@@ -2334,7 +2368,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_exception_skel (
@@ -2345,7 +2379,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_native_skel (
@@ -2356,7 +2390,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_abstract_interface_skel (
@@ -2367,7 +2401,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_local_interface_skel (
@@ -2378,7 +2412,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_ext_value_skel (
@@ -2386,7 +2420,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -2400,7 +2436,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -2414,7 +2452,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -2428,19 +2468,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -2449,7 +2495,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -2460,7 +2506,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -2471,7 +2517,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_component_skel (
@@ -2482,7 +2528,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_home_skel (
@@ -2493,7 +2539,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_event_skel (
@@ -2509,7 +2555,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_ModuleDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -2553,7 +2599,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_ModuleDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl,
@@ -2574,7 +2620,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -2588,7 +2634,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup (
@@ -2602,7 +2648,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       contents (
@@ -2616,7 +2662,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup_name (
@@ -2630,7 +2676,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_contents (
@@ -2644,7 +2690,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_module (
@@ -2658,7 +2704,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_constant (
@@ -2672,7 +2718,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_struct (
@@ -2686,7 +2732,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_union (
@@ -2700,7 +2746,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_enum (
@@ -2714,7 +2760,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_alias (
@@ -2728,7 +2774,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_interface (
@@ -2742,7 +2788,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value (
@@ -2756,7 +2802,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value_box (
@@ -2770,7 +2816,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_exception (
@@ -2784,7 +2830,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_native (
@@ -2798,7 +2844,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_abstract_interface (
@@ -2812,7 +2858,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_local_interface (
@@ -2826,7 +2872,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_ext_value (
@@ -2927,7 +2973,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -2941,7 +2987,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -2955,7 +3001,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_component (
@@ -2969,7 +3015,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_home (
@@ -2983,7 +3029,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_event (
@@ -3002,7 +3048,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class Repository;
     typedef Repository *Repository_ptr;
@@ -3073,7 +3119,9 @@ namespace POA_CORBA
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
       
-      virtual const char* _interface_repository_id (void) const;static void
+      virtual const char* _interface_repository_id (void) const;
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -3082,7 +3130,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -3093,7 +3141,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_skel (
@@ -3104,7 +3152,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       contents_skel (
@@ -3115,7 +3163,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_name_skel (
@@ -3126,7 +3174,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_contents_skel (
@@ -3137,7 +3185,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_module_skel (
@@ -3148,7 +3196,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_constant_skel (
@@ -3159,7 +3207,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_struct_skel (
@@ -3170,7 +3218,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_union_skel (
@@ -3181,7 +3229,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_enum_skel (
@@ -3192,7 +3240,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_alias_skel (
@@ -3203,7 +3251,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_interface_skel (
@@ -3214,7 +3262,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_skel (
@@ -3225,7 +3273,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_box_skel (
@@ -3236,7 +3284,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_exception_skel (
@@ -3247,7 +3295,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_native_skel (
@@ -3258,7 +3306,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_abstract_interface_skel (
@@ -3269,7 +3317,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_local_interface_skel (
@@ -3280,7 +3328,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_ext_value_skel (
@@ -3291,7 +3339,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_id_skel (
@@ -3302,7 +3350,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       get_canonical_typecode_skel (
@@ -3313,7 +3361,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       get_primitive_skel (
@@ -3324,7 +3372,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_string_skel (
@@ -3335,7 +3383,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_wstring_skel (
@@ -3346,7 +3394,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_sequence_skel (
@@ -3357,7 +3405,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_array_skel (
@@ -3368,7 +3416,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_fixed_skel (
@@ -3379,7 +3427,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_component_skel (
@@ -3390,7 +3438,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_home_skel (
@@ -3401,7 +3449,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_event_skel (
@@ -3417,7 +3465,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_Repository_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -3461,7 +3509,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_Repository_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl,
@@ -3482,7 +3530,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -3496,7 +3544,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup (
@@ -3510,7 +3558,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       contents (
@@ -3524,7 +3572,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup_name (
@@ -3538,7 +3586,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_contents (
@@ -3552,7 +3600,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_module (
@@ -3566,7 +3614,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_constant (
@@ -3580,7 +3628,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_struct (
@@ -3594,7 +3642,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_union (
@@ -3608,7 +3656,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_enum (
@@ -3622,7 +3670,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_alias (
@@ -3636,7 +3684,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_interface (
@@ -3650,7 +3698,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value (
@@ -3664,7 +3712,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value_box (
@@ -3678,7 +3726,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_exception (
@@ -3692,7 +3740,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_native (
@@ -3706,7 +3754,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_abstract_interface (
@@ -3720,7 +3768,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_local_interface (
@@ -3734,7 +3782,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_ext_value (
@@ -3748,7 +3796,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup_id (
@@ -3762,7 +3810,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       get_canonical_typecode (
@@ -3776,7 +3824,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       get_primitive (
@@ -3790,7 +3838,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_string (
@@ -3804,7 +3852,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_wstring (
@@ -3818,7 +3866,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_sequence (
@@ -3832,7 +3880,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_array (
@@ -3846,7 +3894,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_fixed (
@@ -3860,7 +3908,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_component (
@@ -3874,7 +3922,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_home (
@@ -3888,7 +3936,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_event (
@@ -3907,7 +3955,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class ProvidesDef;
     typedef ProvidesDef *ProvidesDef_ptr;
@@ -3980,7 +4028,7 @@ namespace POA_CORBA
       virtual const char* _interface_repository_id (void) const;
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::InterfaceDef_ptr interface_type (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3997,10 +4045,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void interface_type (
-          CORBA::InterfaceDef_ptr interface_type
+          ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4012,7 +4060,9 @@ namespace POA_CORBA
           void *_tao_servant,
           void *_tao_servant_upcall
           ACE_ENV_ARG_DECL
-        );static void
+        );
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4021,7 +4071,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -4029,7 +4079,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4043,7 +4095,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4057,7 +4111,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4071,19 +4127,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4092,7 +4154,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -4103,7 +4165,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -4119,7 +4181,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_ProvidesDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -4163,7 +4225,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_ProvidesDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
@@ -4174,7 +4236,7 @@ namespace POA_CORBA
       virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void) {}
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_interface_type (
@@ -4188,7 +4250,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_interface_type (
@@ -4211,7 +4273,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -4312,7 +4374,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -4326,7 +4388,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -4345,7 +4407,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class UsesDef;
     typedef UsesDef *UsesDef_ptr;
@@ -4418,7 +4480,7 @@ namespace POA_CORBA
       virtual const char* _interface_repository_id (void) const;
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::InterfaceDef_ptr interface_type (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4435,10 +4497,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void interface_type (
-          CORBA::InterfaceDef_ptr interface_type
+          ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4453,7 +4515,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual CORBA::Boolean is_multiple (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4470,10 +4532,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void is_multiple (
-          CORBA::Boolean is_multiple
+          ::CORBA::Boolean is_multiple
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4485,7 +4547,9 @@ namespace POA_CORBA
           void *_tao_servant,
           void *_tao_servant_upcall
           ACE_ENV_ARG_DECL
-        );static void
+        );
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4494,7 +4558,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -4502,7 +4566,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4516,7 +4582,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4530,7 +4598,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4544,19 +4614,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4565,7 +4641,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -4576,7 +4652,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -4592,7 +4668,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_UsesDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -4636,7 +4712,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_UsesDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
@@ -4647,7 +4723,7 @@ namespace POA_CORBA
       virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void) {}
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_interface_type (
@@ -4661,7 +4737,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_interface_type (
@@ -4675,7 +4751,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_is_multiple (
@@ -4689,7 +4765,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_is_multiple (
@@ -4712,7 +4788,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -4813,7 +4889,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -4827,7 +4903,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -4846,7 +4922,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class EventPortDef;
     typedef EventPortDef *EventPortDef_ptr;
@@ -4919,7 +4995,7 @@ namespace POA_CORBA
       virtual const char* _interface_repository_id (void) const;
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::EventDef_ptr event (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4936,10 +5012,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void event (
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4954,7 +5030,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual CORBA::Boolean is_a (
           const char * event_id
@@ -4969,7 +5045,9 @@ namespace POA_CORBA
           void *_tao_servant,
           void *_tao_servant_upcall
           ACE_ENV_ARG_DECL
-        );static void
+        );
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -4978,7 +5056,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -4986,7 +5064,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5000,7 +5080,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5014,7 +5096,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5028,19 +5112,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5049,7 +5139,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -5060,7 +5150,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -5076,7 +5166,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_EventPortDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -5120,7 +5210,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_EventPortDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
@@ -5131,7 +5221,7 @@ namespace POA_CORBA
       virtual ~_TAO_EventPortDef_ThruPOA_Proxy_Impl (void) {}
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_event (
@@ -5145,7 +5235,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_event (
@@ -5159,7 +5249,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       is_a (
@@ -5182,7 +5272,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -5283,7 +5373,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -5297,7 +5387,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -5316,7 +5406,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class EmitsDef;
     typedef EmitsDef *EmitsDef_ptr;
@@ -5386,7 +5476,9 @@ namespace POA_CORBA
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
       
-      virtual const char* _interface_repository_id (void) const;static void
+      virtual const char* _interface_repository_id (void) const;
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5395,7 +5487,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -5403,7 +5495,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5417,7 +5511,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5431,7 +5527,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5445,19 +5543,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5466,7 +5570,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -5477,7 +5581,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -5485,7 +5589,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_event_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5502,7 +5608,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       is_a_skel (
@@ -5518,7 +5624,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_EmitsDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -5562,7 +5668,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_EmitsDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl
@@ -5582,7 +5688,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -5683,7 +5789,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -5697,7 +5803,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -5731,7 +5837,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       is_a (
@@ -5750,7 +5856,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class PublishesDef;
     typedef PublishesDef *PublishesDef_ptr;
@@ -5820,7 +5926,9 @@ namespace POA_CORBA
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
       
-      virtual const char* _interface_repository_id (void) const;static void
+      virtual const char* _interface_repository_id (void) const;
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5829,7 +5937,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -5837,7 +5945,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5851,7 +5961,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5865,7 +5977,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5879,19 +5993,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5900,7 +6020,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -5911,7 +6031,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -5919,7 +6039,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_event_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -5936,7 +6058,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       is_a_skel (
@@ -5952,7 +6074,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_PublishesDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -5996,7 +6118,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_PublishesDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl
@@ -6016,7 +6138,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -6117,7 +6239,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -6131,7 +6253,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -6165,7 +6287,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       is_a (
@@ -6184,7 +6306,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class ConsumesDef;
     typedef ConsumesDef *ConsumesDef_ptr;
@@ -6254,7 +6376,9 @@ namespace POA_CORBA
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
       
-      virtual const char* _interface_repository_id (void) const;static void
+      virtual const char* _interface_repository_id (void) const;
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -6263,7 +6387,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -6271,7 +6395,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -6285,7 +6411,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -6299,7 +6427,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -6313,19 +6443,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -6334,7 +6470,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -6345,7 +6481,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -6353,7 +6489,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_event_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -6370,7 +6508,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       is_a_skel (
@@ -6386,7 +6524,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_ConsumesDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -6430,7 +6568,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_ConsumesDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl
@@ -6450,7 +6588,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -6551,7 +6689,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -6565,7 +6703,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -6599,7 +6737,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       is_a (
@@ -6618,7 +6756,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class ComponentDef;
     typedef ComponentDef *ComponentDef_ptr;
@@ -6691,7 +6829,7 @@ namespace POA_CORBA
       virtual const char* _interface_repository_id (void) const;
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6708,10 +6846,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void base_component (
-          CORBA::ComponentIR::ComponentDef_ptr base_component
+          ::CORBA::ComponentIR::ComponentDef_ptr base_component
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -6726,7 +6864,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -6743,10 +6881,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void supported_interfaces (
-          const CORBA::InterfaceDefSeq & supported_interfaces
+          const ::CORBA::InterfaceDefSeq & supported_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -6761,13 +6899,13 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::ProvidesDef_ptr create_provides (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::InterfaceDef_ptr interface_type
+          ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -6782,14 +6920,14 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::UsesDef_ptr create_uses (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::InterfaceDef_ptr interface_type,
-          CORBA::Boolean is_multiple
+          ::CORBA::InterfaceDef_ptr interface_type,
+          ::CORBA::Boolean is_multiple
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -6804,13 +6942,13 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::EmitsDef_ptr create_emits (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -6825,13 +6963,13 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::PublishesDef_ptr create_publishes (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -6846,13 +6984,13 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::ConsumesDef_ptr create_consumes (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -6864,7 +7002,9 @@ namespace POA_CORBA
           void *_tao_servant,
           void *_tao_servant_upcall
           ACE_ENV_ARG_DECL
-        );static void
+        );
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -6873,7 +7013,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -6884,7 +7024,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_skel (
@@ -6895,7 +7035,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       contents_skel (
@@ -6906,7 +7046,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_name_skel (
@@ -6917,7 +7057,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_contents_skel (
@@ -6928,7 +7068,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_module_skel (
@@ -6939,7 +7079,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_constant_skel (
@@ -6950,7 +7090,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_struct_skel (
@@ -6961,7 +7101,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_union_skel (
@@ -6972,7 +7112,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_enum_skel (
@@ -6983,7 +7123,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_alias_skel (
@@ -6994,7 +7134,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_interface_skel (
@@ -7005,7 +7145,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_skel (
@@ -7016,7 +7156,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_box_skel (
@@ -7027,7 +7167,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_exception_skel (
@@ -7038,7 +7178,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_native_skel (
@@ -7049,7 +7189,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_abstract_interface_skel (
@@ -7060,7 +7200,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_local_interface_skel (
@@ -7071,7 +7211,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_ext_value_skel (
@@ -7079,7 +7219,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -7093,7 +7235,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -7107,7 +7251,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -7121,19 +7267,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -7142,7 +7294,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -7153,7 +7305,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -7161,13 +7313,17 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_type_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_base_interfaces_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -7184,7 +7340,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       is_a_skel (
@@ -7195,7 +7351,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_interface_skel (
@@ -7206,7 +7362,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_attribute_skel (
@@ -7217,7 +7373,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_operation_skel (
@@ -7228,7 +7384,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_ext_interface_skel (
@@ -7239,7 +7395,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_ext_attribute_skel (
@@ -7255,7 +7411,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_ComponentDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -7299,7 +7455,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_ComponentDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl
@@ -7310,7 +7466,7 @@ namespace POA_CORBA
       virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void) {}
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_base_component (
@@ -7324,7 +7480,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_base_component (
@@ -7338,7 +7494,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_supported_interfaces (
@@ -7352,7 +7508,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_supported_interfaces (
@@ -7366,7 +7522,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_provides (
@@ -7380,7 +7536,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_uses (
@@ -7394,7 +7550,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_emits (
@@ -7408,7 +7564,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_publishes (
@@ -7422,7 +7578,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_consumes (
@@ -7445,7 +7601,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -7459,7 +7615,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup (
@@ -7473,7 +7629,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       contents (
@@ -7487,7 +7643,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup_name (
@@ -7501,7 +7657,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_contents (
@@ -7515,7 +7671,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_module (
@@ -7529,7 +7685,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_constant (
@@ -7543,7 +7699,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_struct (
@@ -7557,7 +7713,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_union (
@@ -7571,7 +7727,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_enum (
@@ -7585,7 +7741,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_alias (
@@ -7599,7 +7755,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_interface (
@@ -7613,7 +7769,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value (
@@ -7627,7 +7783,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value_box (
@@ -7641,7 +7797,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_exception (
@@ -7655,7 +7811,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_native (
@@ -7669,7 +7825,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_abstract_interface (
@@ -7683,7 +7839,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_local_interface (
@@ -7697,7 +7853,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_ext_value (
@@ -7798,7 +7954,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -7812,7 +7968,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -7855,7 +8011,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       is_a (
@@ -7869,7 +8025,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_interface (
@@ -7883,7 +8039,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_attribute (
@@ -7897,7 +8053,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_operation (
@@ -7911,7 +8067,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_ext_interface (
@@ -7925,7 +8081,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_ext_attribute (
@@ -7944,7 +8100,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class FactoryDef;
     typedef FactoryDef *FactoryDef_ptr;
@@ -8014,7 +8170,9 @@ namespace POA_CORBA
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
       
-      virtual const char* _interface_repository_id (void) const;static void
+      virtual const char* _interface_repository_id (void) const;
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8023,7 +8181,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -8031,7 +8189,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8045,7 +8205,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8059,7 +8221,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8073,19 +8237,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8094,7 +8264,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -8105,7 +8275,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -8113,13 +8283,17 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_result_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_result_def_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8133,7 +8307,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_params_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8147,7 +8323,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_mode_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8161,7 +8339,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_contexts_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8175,7 +8355,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_exceptions_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8197,7 +8379,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_FactoryDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -8241,7 +8423,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_FactoryDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl
@@ -8261,7 +8443,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -8362,7 +8544,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -8376,7 +8558,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -8504,7 +8686,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class FinderDef;
     typedef FinderDef *FinderDef_ptr;
@@ -8574,7 +8756,9 @@ namespace POA_CORBA
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
       
-      virtual const char* _interface_repository_id (void) const;static void
+      virtual const char* _interface_repository_id (void) const;
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8583,7 +8767,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -8591,7 +8775,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8605,7 +8791,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8619,7 +8807,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8633,19 +8823,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8654,7 +8850,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -8665,7 +8861,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -8673,13 +8869,17 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_result_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_result_def_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8693,7 +8893,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_params_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8707,7 +8909,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_mode_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8721,7 +8925,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_contexts_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8735,7 +8941,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_exceptions_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -8757,7 +8965,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_FinderDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -8801,7 +9009,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_FinderDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl
@@ -8821,7 +9029,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -8922,7 +9130,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -8936,7 +9144,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -9064,7 +9272,7 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_sh.cpp:90
+    // be\be_visitor_interface/interface_sh.cpp:87
     
     class HomeDef;
     typedef HomeDef *HomeDef_ptr;
@@ -9137,7 +9345,7 @@ namespace POA_CORBA
       virtual const char* _interface_repository_id (void) const;
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::HomeDef_ptr base_home (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9154,10 +9362,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void base_home (
-          CORBA::ComponentIR::HomeDef_ptr base_home
+          ::CORBA::ComponentIR::HomeDef_ptr base_home
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -9172,7 +9380,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9189,10 +9397,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void supported_interfaces (
-          const CORBA::InterfaceDefSeq & supported_interfaces
+          const ::CORBA::InterfaceDefSeq & supported_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -9207,7 +9415,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9224,10 +9432,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void managed_component (
-          CORBA::ComponentIR::ComponentDef_ptr managed_component
+          ::CORBA::ComponentIR::ComponentDef_ptr managed_component
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -9242,7 +9450,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual ::CORBA::ValueDef_ptr primary_key (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -9259,10 +9467,10 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       virtual void primary_key (
-          CORBA::ValueDef_ptr primary_key
+          ::CORBA::ValueDef_ptr primary_key
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -9277,14 +9485,14 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       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::ParDescriptionSeq & params,
+          const ::CORBA::ExceptionDefSeq & exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -9299,14 +9507,14 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/operation_sh.cpp:45
+      // be\be_visitor_operation/operation_sh.cpp:45
       
       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::ParDescriptionSeq & params,
+          const ::CORBA::ExceptionDefSeq & exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -9318,7 +9526,9 @@ namespace POA_CORBA
           void *_tao_servant,
           void *_tao_servant_upcall
           ACE_ENV_ARG_DECL
-        );static void
+        );
+      
+      static void
       _get_def_kind_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -9327,7 +9537,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       destroy_skel (
@@ -9338,7 +9548,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_skel (
@@ -9349,7 +9559,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       contents_skel (
@@ -9360,7 +9570,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       lookup_name_skel (
@@ -9371,7 +9581,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_contents_skel (
@@ -9382,7 +9592,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_module_skel (
@@ -9393,7 +9603,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_constant_skel (
@@ -9404,7 +9614,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_struct_skel (
@@ -9415,7 +9625,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_union_skel (
@@ -9426,7 +9636,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_enum_skel (
@@ -9437,7 +9647,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_alias_skel (
@@ -9448,7 +9658,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_interface_skel (
@@ -9459,7 +9669,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_skel (
@@ -9470,7 +9680,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_value_box_skel (
@@ -9481,7 +9691,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_exception_skel (
@@ -9492,7 +9702,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_native_skel (
@@ -9503,7 +9713,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_abstract_interface_skel (
@@ -9514,7 +9724,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_local_interface_skel (
@@ -9525,7 +9735,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_ext_value_skel (
@@ -9533,7 +9743,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_id_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -9547,7 +9759,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_name_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -9561,7 +9775,9 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_version_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -9575,19 +9791,25 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_defined_in_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_absolute_name_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_containing_repository_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -9596,7 +9818,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_skel (
@@ -9607,7 +9829,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       move_skel (
@@ -9615,13 +9837,17 @@ namespace POA_CORBA
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_type_skel (
           TAO_ServerRequest &req,
           void *obj,
           void *context
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );static void
+        );
+      
+      static void
       _get_base_interfaces_skel (
           TAO_ServerRequest &req,
           void *obj,
@@ -9638,7 +9864,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       is_a_skel (
@@ -9649,7 +9875,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_interface_skel (
@@ -9660,7 +9886,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_attribute_skel (
@@ -9671,7 +9897,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_operation_skel (
@@ -9682,7 +9908,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       describe_ext_interface_skel (
@@ -9693,7 +9919,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:1951
+      // be\be_interface.cpp:2026
       
       static void
       create_ext_attribute_skel (
@@ -9709,7 +9935,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+    // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
     
     class  _TAO_HomeDef_Strategized_Proxy_Broker
       : public virtual TAO::Collocation_Proxy_Broker
@@ -9753,7 +9979,7 @@ namespace POA_CORBA
     //
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+    // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
     
     class  _TAO_HomeDef_ThruPOA_Proxy_Impl
       : public virtual ::POA_CORBA::_TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl
@@ -9764,7 +9990,7 @@ namespace POA_CORBA
       virtual ~_TAO_HomeDef_ThruPOA_Proxy_Impl (void) {}
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_base_home (
@@ -9778,7 +10004,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_base_home (
@@ -9792,7 +10018,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_supported_interfaces (
@@ -9806,7 +10032,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_supported_interfaces (
@@ -9820,7 +10046,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_managed_component (
@@ -9834,7 +10060,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_managed_component (
@@ -9848,7 +10074,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _get_primary_key (
@@ -9862,7 +10088,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       _set_primary_key (
@@ -9876,7 +10102,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_factory (
@@ -9890,7 +10116,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_visitor_operation/proxy_impl_xh.cpp:24
+      // be\be_visitor_operation/proxy_impl_xh.cpp:24
       
       static void
       create_finder (
@@ -9913,7 +10139,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       destroy (
@@ -9927,7 +10153,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup (
@@ -9941,7 +10167,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       contents (
@@ -9955,7 +10181,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       lookup_name (
@@ -9969,7 +10195,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_contents (
@@ -9983,7 +10209,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_module (
@@ -9997,7 +10223,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_constant (
@@ -10011,7 +10237,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_struct (
@@ -10025,7 +10251,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_union (
@@ -10039,7 +10265,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_enum (
@@ -10053,7 +10279,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_alias (
@@ -10067,7 +10293,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_interface (
@@ -10081,7 +10307,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value (
@@ -10095,7 +10321,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_value_box (
@@ -10109,7 +10335,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_exception (
@@ -10123,7 +10349,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_native (
@@ -10137,7 +10363,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_abstract_interface (
@@ -10151,7 +10377,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_local_interface (
@@ -10165,7 +10391,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_ext_value (
@@ -10266,7 +10492,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe (
@@ -10280,7 +10506,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       move (
@@ -10323,7 +10549,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       is_a (
@@ -10337,7 +10563,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_interface (
@@ -10351,7 +10577,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_attribute (
@@ -10365,7 +10591,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_operation (
@@ -10379,7 +10605,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       describe_ext_interface (
@@ -10393,7 +10619,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // be/be_interface.cpp:2132
+      // be\be_interface.cpp:2214
       
       static void
       create_ext_attribute (
@@ -10412,25 +10638,25 @@ namespace POA_CORBA
     ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_module/module_sh.cpp:80
+  // be\be_visitor_module/module_sh.cpp:80
   
   } // module CORBA::ComponentIR
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:946
+// be\be_codegen.cpp:997
 
 #include "IFR_ComponentsS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "IFR_ComponentsS.i"
+#include "IFR_ComponentsS.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -10440,3 +10666,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.i b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.i
deleted file mode 100644
index f5c7574c64e..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.i
+++ /dev/null
@@ -1,14189 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_supported_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_supported_interfaces_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_supported_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_supported_interfaces_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_initializers_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_initializers_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_initializers_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_initializers_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_base_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_base_value_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_base_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_base_value_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_abstract_base_values_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_abstract_base_values_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_abstract_base_values_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_abstract_base_values_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_is_abstract_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_is_abstract_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_is_abstract_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_is_abstract_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_is_custom_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_is_custom_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_is_custom_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_is_custom_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_is_truncatable_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_is_truncatable_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_is_truncatable_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_is_truncatable_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::is_a_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::describe_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::describe_value_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_value_member_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::create_value_member_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::create_attribute_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_operation_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ValueDef::create_operation_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_get_ext_initializers_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ExtValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
-      req,
-      (POA_CORBA::ExtValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::_set_ext_initializers_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ExtValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
-      req,
-      (POA_CORBA::ExtValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::describe_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ExtValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ExtValueDef::describe_ext_value_skel (
-      req,
-      (POA_CORBA::ExtValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventDef::create_ext_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ExtValueDef_ptr impl = (POA_CORBA::ComponentIR::EventDef_ptr) obj;
-  POA_CORBA::ExtValueDef::create_ext_attribute_skel (
-      req,
-      (POA_CORBA::ExtValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_supported_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_supported_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_supported_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_supported_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_initializers (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_initializers (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_initializers (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_initializers (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_base_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_base_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_base_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_base_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_abstract_base_values (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_abstract_base_values (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_abstract_base_values (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_abstract_base_values (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_is_abstract (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_abstract (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_is_abstract (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_is_abstract (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_is_custom (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_custom (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_is_custom (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_is_custom (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_is_truncatable (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_truncatable (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_is_truncatable (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_is_truncatable (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::describe_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::describe_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_value_member (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_operation (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_get_ext_initializers (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_ext_initializers (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::_set_ext_initializers (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_ext_initializers (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::describe_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::describe_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventDef_ThruPOA_Proxy_Impl::create_ext_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_ext_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::Container::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Container::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Container_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_component_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::ComponentIR::Container::create_component_skel (
-      req,
-      (POA_CORBA::ComponentIR::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_home_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::ComponentIR::Container::create_home_skel (
-      req,
-      (POA_CORBA::ComponentIR::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef::create_event_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::Container_ptr impl = (POA_CORBA::ComponentIR::ModuleDef_ptr) obj;
-  POA_CORBA::ComponentIR::Container::create_event_skel (
-      req,
-      (POA_CORBA::ComponentIR::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_component (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_component (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_home (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_home (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::create_event (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_event (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::lookup_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Repository_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Repository::lookup_id_skel (
-      req,
-      (POA_CORBA::Repository_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::get_canonical_typecode_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Repository_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Repository::get_canonical_typecode_skel (
-      req,
-      (POA_CORBA::Repository_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::get_primitive_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Repository_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Repository::get_primitive_skel (
-      req,
-      (POA_CORBA::Repository_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_string_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Repository_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Repository::create_string_skel (
-      req,
-      (POA_CORBA::Repository_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_wstring_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Repository_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Repository::create_wstring_skel (
-      req,
-      (POA_CORBA::Repository_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_sequence_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Repository_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Repository::create_sequence_skel (
-      req,
-      (POA_CORBA::Repository_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_array_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Repository_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Repository::create_array_skel (
-      req,
-      (POA_CORBA::Repository_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_fixed_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Repository_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::Repository::create_fixed_skel (
-      req,
-      (POA_CORBA::Repository_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_component_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::ComponentIR::Container::create_component_skel (
-      req,
-      (POA_CORBA::ComponentIR::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_home_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::ComponentIR::Container::create_home_skel (
-      req,
-      (POA_CORBA::ComponentIR::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::Repository::create_event_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::Container_ptr impl = (POA_CORBA::ComponentIR::Repository_ptr) obj;
-  POA_CORBA::ComponentIR::Container::create_event_skel (
-      req,
-      (POA_CORBA::ComponentIR::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_component (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_component (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_home (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_home (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_Repository_ThruPOA_Proxy_Impl::create_event (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_Container_ThruPOA_Proxy_Impl::create_event (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::UsesDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_UsesDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EventPortDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_get_event_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::EventPortDef_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
-      req,
-      (POA_CORBA::ComponentIR::EventPortDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::_set_event_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::EventPortDef_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
-      req,
-      (POA_CORBA::ComponentIR::EventPortDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::EventPortDef_ptr impl = (POA_CORBA::ComponentIR::EmitsDef_ptr) obj;
-  POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
-      req,
-      (POA_CORBA::ComponentIR::EventPortDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_get_event (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_event (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_set_event (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_set_event (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_get_event_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::EventPortDef_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
-      req,
-      (POA_CORBA::ComponentIR::EventPortDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::_set_event_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::EventPortDef_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
-      req,
-      (POA_CORBA::ComponentIR::EventPortDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::EventPortDef_ptr impl = (POA_CORBA::ComponentIR::PublishesDef_ptr) obj;
-  POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
-      req,
-      (POA_CORBA::ComponentIR::EventPortDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_get_event (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_event (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_set_event (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_set_event (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_get_event_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::EventPortDef_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
-      req,
-      (POA_CORBA::ComponentIR::EventPortDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::_set_event_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::EventPortDef_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
-      req,
-      (POA_CORBA::ComponentIR::EventPortDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ComponentIR::EventPortDef_ptr impl = (POA_CORBA::ComponentIR::ConsumesDef_ptr) obj;
-  POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
-      req,
-      (POA_CORBA::ComponentIR::EventPortDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_get_event (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_get_event (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_set_event (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::_set_event (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::ComponentIR::_TAO_EventPortDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_get_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::_set_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::describe_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_operation_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::describe_ext_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef::create_ext_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ComponentIR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::describe_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_operation (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::describe_ext_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::describe_ext_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_ext_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::create_ext_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_result_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_result_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_result_def_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_result_def_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_set_result_def_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_result_def_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_params_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_params_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_set_params_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_params_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_mode_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_mode_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_set_mode_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_mode_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_contexts_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_contexts_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_set_contexts_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_contexts_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_get_exceptions_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_exceptions_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef::_set_exceptions_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_exceptions_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_result (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_result_def (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result_def (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_set_result_def (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_result_def (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_params (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_params (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_set_params (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_params (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_mode (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_mode (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_set_mode (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_mode (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_contexts (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_contexts (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_set_contexts (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_contexts (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_get_exceptions (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_exceptions (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_set_exceptions (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_exceptions (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_result_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_result_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_result_def_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_result_def_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_set_result_def_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_result_def_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_params_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_params_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_set_params_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_params_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_mode_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_mode_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_set_mode_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_mode_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_contexts_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_contexts_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_set_contexts_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_contexts_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_get_exceptions_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_exceptions_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::FinderDef::_set_exceptions_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::OperationDef_ptr impl = (POA_CORBA::ComponentIR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_exceptions_skel (
-      req,
-      (POA_CORBA::OperationDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_result (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_result_def (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_result_def (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_set_result_def (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_result_def (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_params (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_params (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_set_params (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_params (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_mode (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_mode (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_set_mode (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_mode (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_contexts (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_contexts (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_set_contexts (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_contexts (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_get_exceptions (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_get_exceptions (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_set_exceptions (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_set_exceptions (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_get_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::_set_base_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::describe_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_operation_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
-      req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::describe_ext_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ComponentIR::HomeDef::create_ext_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::InterfaceAttrExtension_ptr impl = (POA_CORBA::ComponentIR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
-      req,
-      (POA_CORBA::InterfaceAttrExtension_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_get_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_set_base_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::describe_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_operation (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::describe_ext_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::describe_ext_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::ComponentIR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_ext_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl::create_ext_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
index 9c7a67891d4..d20a648982b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:684
+// be\be_codegen.cpp:683
 
-#ifndef _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_COMPONENTSS_T_CPP_
-#define _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_COMPONENTSS_T_CPP_
+#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_T_CPP_
+#define _TAO_IDL_SERVER_IFR_COMPONENTSS_T_CPP_
 
 #include "IFR_ComponentsS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ComponentsS_T.i"
+#include "IFR_ComponentsS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
index 52c9dc7fbd1..37921e2eb38 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
@@ -26,36 +26,33 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:545
+// be\be_codegen.cpp:546
 
-#ifndef _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_COMPONENTSS_T_H_
-#define _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_COMPONENTSS_T_H_
+#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_T_H_
+#define _TAO_IDL_SERVER_IFR_COMPONENTSS_T_H_
 
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+// be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
 {
   
   // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+  // be\be_visitor_root/root_sth.cpp:116
   
   namespace ComponentIR
   {
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -95,7 +92,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -105,7 +102,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -115,7 +112,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained_ptr lookup (
           const char * search_name
@@ -126,11 +123,11 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -138,13 +135,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * lookup_name (
           const char * search_name,
-          CORBA::Long levels_to_search,
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::Long levels_to_search,
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -152,12 +149,12 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container::DescriptionSeq * describe_contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited,
-          CORBA::Long max_returned_objs
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited,
+          ::CORBA::Long max_returned_objs
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -165,7 +162,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ModuleDef_ptr create_module (
           const char * id,
@@ -178,14 +175,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ConstantDef_ptr create_constant (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          const CORBA::Any & value
+          ::CORBA::IDLType_ptr type,
+          const ::CORBA::Any & value
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -193,13 +190,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::StructDef_ptr create_struct (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -207,14 +204,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::UnionDef_ptr create_union (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr discriminator_type,
-          const CORBA::UnionMemberSeq & members
+          ::CORBA::IDLType_ptr discriminator_type,
+          const ::CORBA::UnionMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -222,13 +219,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::EnumDef_ptr create_enum (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::EnumMemberSeq & members
+          const ::CORBA::EnumMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -236,13 +233,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AliasDef_ptr create_alias (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type
+          ::CORBA::IDLType_ptr original_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -250,13 +247,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef_ptr create_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -264,19 +261,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDef_ptr create_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::InitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::InitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -284,13 +281,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueBoxDef_ptr create_value_box (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type_def
+          ::CORBA::IDLType_ptr original_type_def
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -298,13 +295,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExceptionDef_ptr create_exception (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -312,7 +309,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::NativeDef_ptr create_native (
           const char * id,
@@ -325,13 +322,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::AbstractInterfaceDefSeq & base_interfaces
+          const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -339,13 +336,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::LocalInterfaceDef_ptr create_local_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -353,19 +350,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtValueDef_ptr create_ext_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -373,7 +370,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -383,7 +380,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -394,7 +391,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -404,7 +401,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -415,7 +412,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -425,7 +422,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -436,7 +433,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -446,7 +443,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -456,7 +453,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -466,7 +463,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -476,10 +473,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -489,7 +486,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::TypeCode_ptr type (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -499,7 +496,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDefSeq * supported_interfaces (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -509,10 +506,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void supported_interfaces (
-          const CORBA::InterfaceDefSeq & supported_interfaces
+          const ::CORBA::InterfaceDefSeq & supported_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -520,7 +517,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InitializerSeq * initializers (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -530,10 +527,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void initializers (
-          const CORBA::InitializerSeq & initializers
+          const ::CORBA::InitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -541,7 +538,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDef_ptr base_value (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -551,10 +548,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void base_value (
-          CORBA::ValueDef_ptr base_value
+          ::CORBA::ValueDef_ptr base_value
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -562,7 +559,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDefSeq * abstract_base_values (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -572,10 +569,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void abstract_base_values (
-          const CORBA::ValueDefSeq & abstract_base_values
+          const ::CORBA::ValueDefSeq & abstract_base_values
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -583,7 +580,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_abstract (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -593,10 +590,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void is_abstract (
-          CORBA::Boolean is_abstract
+          ::CORBA::Boolean is_abstract
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -604,7 +601,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_custom (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -614,10 +611,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void is_custom (
-          CORBA::Boolean is_custom
+          ::CORBA::Boolean is_custom
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -625,7 +622,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_truncatable (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -635,10 +632,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void is_truncatable (
-          CORBA::Boolean is_truncatable
+          ::CORBA::Boolean is_truncatable
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -646,7 +643,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_a (
           const char * id
@@ -657,7 +654,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDef::FullValueDescription * describe_value (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -667,14 +664,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueMemberDef_ptr create_value_member (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          CORBA::Visibility access
+          ::CORBA::IDLType_ptr type,
+          ::CORBA::Visibility access
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -682,14 +679,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AttributeDef_ptr create_attribute (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          CORBA::AttributeMode mode
+          ::CORBA::IDLType_ptr type,
+          ::CORBA::AttributeMode mode
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -697,17 +694,17 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::OperationDef_ptr create_operation (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr result,
-          CORBA::OperationMode mode,
-          const CORBA::ParDescriptionSeq & params,
-          const CORBA::ExceptionDefSeq & exceptions,
-          const CORBA::ContextIdSeq & contexts
+          ::CORBA::IDLType_ptr result,
+          ::CORBA::OperationMode mode,
+          const ::CORBA::ParDescriptionSeq & params,
+          const ::CORBA::ExceptionDefSeq & exceptions,
+          const ::CORBA::ContextIdSeq & contexts
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -715,7 +712,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtInitializerSeq * ext_initializers (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -725,10 +722,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void ext_initializers (
-          const CORBA::ExtInitializerSeq & ext_initializers
+          const ::CORBA::ExtInitializerSeq & ext_initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -736,7 +733,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -746,16 +743,16 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          CORBA::AttributeMode mode,
-          const CORBA::ExceptionDefSeq & get_exceptions,
-          const CORBA::ExceptionDefSeq & set_exceptions
+          ::CORBA::IDLType_ptr type,
+          ::CORBA::AttributeMode mode,
+          const ::CORBA::ExceptionDefSeq & get_exceptions,
+          const ::CORBA::ExceptionDefSeq & set_exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -773,7 +770,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -813,7 +810,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -823,7 +820,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -833,7 +830,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained_ptr lookup (
           const char * search_name
@@ -844,11 +841,11 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -856,13 +853,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * lookup_name (
           const char * search_name,
-          CORBA::Long levels_to_search,
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::Long levels_to_search,
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -870,12 +867,12 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container::DescriptionSeq * describe_contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited,
-          CORBA::Long max_returned_objs
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited,
+          ::CORBA::Long max_returned_objs
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -883,7 +880,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ModuleDef_ptr create_module (
           const char * id,
@@ -896,14 +893,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ConstantDef_ptr create_constant (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          const CORBA::Any & value
+          ::CORBA::IDLType_ptr type,
+          const ::CORBA::Any & value
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -911,13 +908,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::StructDef_ptr create_struct (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -925,14 +922,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::UnionDef_ptr create_union (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr discriminator_type,
-          const CORBA::UnionMemberSeq & members
+          ::CORBA::IDLType_ptr discriminator_type,
+          const ::CORBA::UnionMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -940,13 +937,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::EnumDef_ptr create_enum (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::EnumMemberSeq & members
+          const ::CORBA::EnumMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -954,13 +951,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AliasDef_ptr create_alias (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type
+          ::CORBA::IDLType_ptr original_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -968,13 +965,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef_ptr create_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -982,19 +979,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDef_ptr create_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::InitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::InitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1002,13 +999,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueBoxDef_ptr create_value_box (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type_def
+          ::CORBA::IDLType_ptr original_type_def
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1016,13 +1013,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExceptionDef_ptr create_exception (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1030,7 +1027,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::NativeDef_ptr create_native (
           const char * id,
@@ -1043,13 +1040,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::AbstractInterfaceDefSeq & base_interfaces
+          const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1057,13 +1054,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::LocalInterfaceDef_ptr create_local_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1071,19 +1068,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtValueDef_ptr create_ext_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1091,14 +1088,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::ComponentDef_ptr create_component (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::ComponentDef_ptr base_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces
+          ::CORBA::ComponentIR::ComponentDef_ptr base_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1106,16 +1103,16 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::HomeDef_ptr create_home (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::HomeDef_ptr base_home,
-          CORBA::ComponentIR::ComponentDef_ptr managed_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces,
-          CORBA::ValueDef_ptr primary_key
+          ::CORBA::ComponentIR::HomeDef_ptr base_home,
+          ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces,
+          ::CORBA::ValueDef_ptr primary_key
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1123,19 +1120,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::EventDef_ptr create_event (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1153,7 +1150,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -1193,7 +1190,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1203,7 +1200,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1213,7 +1210,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained_ptr lookup (
           const char * search_name
@@ -1224,11 +1221,11 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1236,13 +1233,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * lookup_name (
           const char * search_name,
-          CORBA::Long levels_to_search,
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::Long levels_to_search,
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1250,12 +1247,12 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container::DescriptionSeq * describe_contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited,
-          CORBA::Long max_returned_objs
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited,
+          ::CORBA::Long max_returned_objs
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1263,7 +1260,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ModuleDef_ptr create_module (
           const char * id,
@@ -1276,14 +1273,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ConstantDef_ptr create_constant (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          const CORBA::Any & value
+          ::CORBA::IDLType_ptr type,
+          const ::CORBA::Any & value
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1291,13 +1288,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::StructDef_ptr create_struct (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1305,14 +1302,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::UnionDef_ptr create_union (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr discriminator_type,
-          const CORBA::UnionMemberSeq & members
+          ::CORBA::IDLType_ptr discriminator_type,
+          const ::CORBA::UnionMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1320,13 +1317,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::EnumDef_ptr create_enum (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::EnumMemberSeq & members
+          const ::CORBA::EnumMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1334,13 +1331,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AliasDef_ptr create_alias (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type
+          ::CORBA::IDLType_ptr original_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1348,13 +1345,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef_ptr create_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1362,19 +1359,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDef_ptr create_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::InitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::InitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1382,13 +1379,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueBoxDef_ptr create_value_box (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type_def
+          ::CORBA::IDLType_ptr original_type_def
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1396,13 +1393,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExceptionDef_ptr create_exception (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1410,7 +1407,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::NativeDef_ptr create_native (
           const char * id,
@@ -1423,13 +1420,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::AbstractInterfaceDefSeq & base_interfaces
+          const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1437,13 +1434,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::LocalInterfaceDef_ptr create_local_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1451,19 +1448,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtValueDef_ptr create_ext_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1471,7 +1468,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1481,7 +1478,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -1492,7 +1489,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1502,7 +1499,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -1513,7 +1510,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1523,7 +1520,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -1534,7 +1531,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1544,7 +1541,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1554,7 +1551,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1564,7 +1561,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1574,10 +1571,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1587,14 +1584,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::ComponentDef_ptr create_component (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::ComponentDef_ptr base_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces
+          ::CORBA::ComponentIR::ComponentDef_ptr base_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1602,16 +1599,16 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::HomeDef_ptr create_home (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::HomeDef_ptr base_home,
-          CORBA::ComponentIR::ComponentDef_ptr managed_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces,
-          CORBA::ValueDef_ptr primary_key
+          ::CORBA::ComponentIR::HomeDef_ptr base_home,
+          ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces,
+          ::CORBA::ValueDef_ptr primary_key
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1619,19 +1616,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::EventDef_ptr create_event (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1649,7 +1646,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -1689,7 +1686,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1699,7 +1696,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1709,7 +1706,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained_ptr lookup (
           const char * search_name
@@ -1720,11 +1717,11 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1732,13 +1729,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * lookup_name (
           const char * search_name,
-          CORBA::Long levels_to_search,
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::Long levels_to_search,
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1746,12 +1743,12 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container::DescriptionSeq * describe_contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited,
-          CORBA::Long max_returned_objs
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited,
+          ::CORBA::Long max_returned_objs
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1759,7 +1756,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ModuleDef_ptr create_module (
           const char * id,
@@ -1772,14 +1769,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ConstantDef_ptr create_constant (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          const CORBA::Any & value
+          ::CORBA::IDLType_ptr type,
+          const ::CORBA::Any & value
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1787,13 +1784,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::StructDef_ptr create_struct (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1801,14 +1798,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::UnionDef_ptr create_union (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr discriminator_type,
-          const CORBA::UnionMemberSeq & members
+          ::CORBA::IDLType_ptr discriminator_type,
+          const ::CORBA::UnionMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1816,13 +1813,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::EnumDef_ptr create_enum (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::EnumMemberSeq & members
+          const ::CORBA::EnumMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1830,13 +1827,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AliasDef_ptr create_alias (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type
+          ::CORBA::IDLType_ptr original_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1844,13 +1841,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef_ptr create_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1858,19 +1855,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDef_ptr create_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::InitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::InitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1878,13 +1875,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueBoxDef_ptr create_value_box (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type_def
+          ::CORBA::IDLType_ptr original_type_def
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1892,13 +1889,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExceptionDef_ptr create_exception (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1906,7 +1903,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::NativeDef_ptr create_native (
           const char * id,
@@ -1919,13 +1916,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::AbstractInterfaceDefSeq & base_interfaces
+          const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1933,13 +1930,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::LocalInterfaceDef_ptr create_local_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1947,19 +1944,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtValueDef_ptr create_ext_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1967,7 +1964,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained_ptr lookup_id (
           const char * search_id
@@ -1978,10 +1975,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::TypeCode_ptr get_canonical_typecode (
-          CORBA::TypeCode_ptr tc
+          ::CORBA::TypeCode_ptr tc
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1989,10 +1986,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::PrimitiveDef_ptr get_primitive (
-          CORBA::PrimitiveKind kind
+          ::CORBA::PrimitiveKind kind
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2000,10 +1997,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::StringDef_ptr create_string (
-          CORBA::ULong bound
+          ::CORBA::ULong bound
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2011,10 +2008,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::WstringDef_ptr create_wstring (
-          CORBA::ULong bound
+          ::CORBA::ULong bound
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2022,11 +2019,11 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::SequenceDef_ptr create_sequence (
-          CORBA::ULong bound,
-          CORBA::IDLType_ptr element_type
+          ::CORBA::ULong bound,
+          ::CORBA::IDLType_ptr element_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2034,11 +2031,11 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ArrayDef_ptr create_array (
-          CORBA::ULong length,
-          CORBA::IDLType_ptr element_type
+          ::CORBA::ULong length,
+          ::CORBA::IDLType_ptr element_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2046,11 +2043,11 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::FixedDef_ptr create_fixed (
-          CORBA::UShort digits,
-          CORBA::Short scale
+          ::CORBA::UShort digits,
+          ::CORBA::Short scale
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2058,14 +2055,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::ComponentDef_ptr create_component (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::ComponentDef_ptr base_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces
+          ::CORBA::ComponentIR::ComponentDef_ptr base_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2073,16 +2070,16 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::HomeDef_ptr create_home (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::HomeDef_ptr base_home,
-          CORBA::ComponentIR::ComponentDef_ptr managed_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces,
-          CORBA::ValueDef_ptr primary_key
+          ::CORBA::ComponentIR::HomeDef_ptr base_home,
+          ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces,
+          ::CORBA::ValueDef_ptr primary_key
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2090,19 +2087,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::EventDef_ptr create_event (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2120,7 +2117,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -2160,7 +2157,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2170,7 +2167,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2180,7 +2177,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2190,7 +2187,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -2201,7 +2198,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2211,7 +2208,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -2222,7 +2219,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2232,7 +2229,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -2243,7 +2240,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2253,7 +2250,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2263,7 +2260,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2273,7 +2270,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2283,10 +2280,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2296,7 +2293,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef_ptr interface_type (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2306,10 +2303,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void interface_type (
-          CORBA::InterfaceDef_ptr interface_type
+          ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2327,7 +2324,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -2367,7 +2364,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2377,7 +2374,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2387,7 +2384,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2397,7 +2394,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -2408,7 +2405,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2418,7 +2415,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -2429,7 +2426,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2439,7 +2436,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -2450,7 +2447,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2460,7 +2457,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2470,7 +2467,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2480,7 +2477,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2490,10 +2487,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2503,7 +2500,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef_ptr interface_type (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2513,10 +2510,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void interface_type (
-          CORBA::InterfaceDef_ptr interface_type
+          ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2524,7 +2521,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_multiple (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2534,10 +2531,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void is_multiple (
-          CORBA::Boolean is_multiple
+          ::CORBA::Boolean is_multiple
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2555,7 +2552,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -2595,7 +2592,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2605,7 +2602,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2615,7 +2612,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2625,7 +2622,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -2636,7 +2633,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2646,7 +2643,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -2657,7 +2654,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2667,7 +2664,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -2678,7 +2675,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2688,7 +2685,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2698,7 +2695,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2708,7 +2705,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2718,10 +2715,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2731,7 +2728,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::EventDef_ptr event (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2741,10 +2738,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void event (
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2752,7 +2749,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_a (
           const char * event_id
@@ -2773,7 +2770,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -2813,7 +2810,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2823,7 +2820,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2833,7 +2830,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2843,7 +2840,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -2854,7 +2851,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2864,7 +2861,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -2875,7 +2872,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2885,7 +2882,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -2896,7 +2893,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2906,7 +2903,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2916,7 +2913,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2926,7 +2923,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2936,10 +2933,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2949,7 +2946,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::EventDef_ptr event (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2959,10 +2956,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void event (
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2970,7 +2967,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_a (
           const char * event_id
@@ -2991,7 +2988,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -3031,7 +3028,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3041,7 +3038,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3051,7 +3048,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3061,7 +3058,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -3072,7 +3069,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3082,7 +3079,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -3093,7 +3090,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3103,7 +3100,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -3114,7 +3111,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3124,7 +3121,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3134,7 +3131,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3144,7 +3141,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3154,10 +3151,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3167,7 +3164,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::EventDef_ptr event (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3177,10 +3174,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void event (
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3188,7 +3185,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_a (
           const char * event_id
@@ -3209,7 +3206,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -3249,7 +3246,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3259,7 +3256,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3269,7 +3266,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3279,7 +3276,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -3290,7 +3287,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3300,7 +3297,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -3311,7 +3308,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3321,7 +3318,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -3332,7 +3329,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3342,7 +3339,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3352,7 +3349,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3362,7 +3359,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3372,10 +3369,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3385,7 +3382,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::EventDef_ptr event (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3395,10 +3392,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void event (
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3406,7 +3403,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_a (
           const char * event_id
@@ -3427,7 +3424,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -3467,7 +3464,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3477,7 +3474,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3487,7 +3484,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained_ptr lookup (
           const char * search_name
@@ -3498,11 +3495,11 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3510,13 +3507,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * lookup_name (
           const char * search_name,
-          CORBA::Long levels_to_search,
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::Long levels_to_search,
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3524,12 +3521,12 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container::DescriptionSeq * describe_contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited,
-          CORBA::Long max_returned_objs
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited,
+          ::CORBA::Long max_returned_objs
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3537,7 +3534,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ModuleDef_ptr create_module (
           const char * id,
@@ -3550,14 +3547,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ConstantDef_ptr create_constant (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          const CORBA::Any & value
+          ::CORBA::IDLType_ptr type,
+          const ::CORBA::Any & value
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3565,13 +3562,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::StructDef_ptr create_struct (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3579,14 +3576,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::UnionDef_ptr create_union (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr discriminator_type,
-          const CORBA::UnionMemberSeq & members
+          ::CORBA::IDLType_ptr discriminator_type,
+          const ::CORBA::UnionMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3594,13 +3591,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::EnumDef_ptr create_enum (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::EnumMemberSeq & members
+          const ::CORBA::EnumMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3608,13 +3605,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AliasDef_ptr create_alias (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type
+          ::CORBA::IDLType_ptr original_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3622,13 +3619,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef_ptr create_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3636,19 +3633,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDef_ptr create_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::InitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::InitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3656,13 +3653,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueBoxDef_ptr create_value_box (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type_def
+          ::CORBA::IDLType_ptr original_type_def
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3670,13 +3667,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExceptionDef_ptr create_exception (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3684,7 +3681,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::NativeDef_ptr create_native (
           const char * id,
@@ -3697,13 +3694,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::AbstractInterfaceDefSeq & base_interfaces
+          const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3711,13 +3708,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::LocalInterfaceDef_ptr create_local_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3725,19 +3722,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtValueDef_ptr create_ext_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3745,7 +3742,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3755,7 +3752,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -3766,7 +3763,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3776,7 +3773,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -3787,7 +3784,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3797,7 +3794,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -3808,7 +3805,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3818,7 +3815,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3828,7 +3825,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3838,7 +3835,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3848,10 +3845,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3861,7 +3858,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::TypeCode_ptr type (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3871,7 +3868,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDefSeq * base_interfaces (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3881,10 +3878,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void base_interfaces (
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3892,7 +3889,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_a (
           const char * interface_id
@@ -3903,7 +3900,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3913,14 +3910,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AttributeDef_ptr create_attribute (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          CORBA::AttributeMode mode
+          ::CORBA::IDLType_ptr type,
+          ::CORBA::AttributeMode mode
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3928,17 +3925,17 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::OperationDef_ptr create_operation (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr result,
-          CORBA::OperationMode mode,
-          const CORBA::ParDescriptionSeq & params,
-          const CORBA::ExceptionDefSeq & exceptions,
-          const CORBA::ContextIdSeq & contexts
+          ::CORBA::IDLType_ptr result,
+          ::CORBA::OperationMode mode,
+          const ::CORBA::ParDescriptionSeq & params,
+          const ::CORBA::ExceptionDefSeq & exceptions,
+          const ::CORBA::ContextIdSeq & contexts
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3946,7 +3943,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3956,16 +3953,16 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          CORBA::AttributeMode mode,
-          const CORBA::ExceptionDefSeq & get_exceptions,
-          const CORBA::ExceptionDefSeq & set_exceptions
+          ::CORBA::IDLType_ptr type,
+          ::CORBA::AttributeMode mode,
+          const ::CORBA::ExceptionDefSeq & get_exceptions,
+          const ::CORBA::ExceptionDefSeq & set_exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3973,7 +3970,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::ComponentDef_ptr base_component (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3983,10 +3980,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void base_component (
-          CORBA::ComponentIR::ComponentDef_ptr base_component
+          ::CORBA::ComponentIR::ComponentDef_ptr base_component
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -3994,7 +3991,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDefSeq * supported_interfaces (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4004,10 +4001,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void supported_interfaces (
-          const CORBA::InterfaceDefSeq & supported_interfaces
+          const ::CORBA::InterfaceDefSeq & supported_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4015,13 +4012,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::ProvidesDef_ptr create_provides (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::InterfaceDef_ptr interface_type
+          ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4029,14 +4026,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::UsesDef_ptr create_uses (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::InterfaceDef_ptr interface_type,
-          CORBA::Boolean is_multiple
+          ::CORBA::InterfaceDef_ptr interface_type,
+          ::CORBA::Boolean is_multiple
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4044,13 +4041,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::EmitsDef_ptr create_emits (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4058,13 +4055,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::PublishesDef_ptr create_publishes (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4072,13 +4069,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::ConsumesDef_ptr create_consumes (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4096,7 +4093,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -4136,7 +4133,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4146,7 +4143,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4156,7 +4153,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4166,7 +4163,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -4177,7 +4174,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4187,7 +4184,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -4198,7 +4195,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4208,7 +4205,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -4219,7 +4216,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4229,7 +4226,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4239,7 +4236,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4249,7 +4246,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4259,10 +4256,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4272,7 +4269,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::TypeCode_ptr result (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4282,7 +4279,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::IDLType_ptr result_def (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4292,10 +4289,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void result_def (
-          CORBA::IDLType_ptr result_def
+          ::CORBA::IDLType_ptr result_def
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4303,7 +4300,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ParDescriptionSeq * params (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4313,10 +4310,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void params (
-          const CORBA::ParDescriptionSeq & params
+          const ::CORBA::ParDescriptionSeq & params
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4324,7 +4321,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::OperationMode mode (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4334,10 +4331,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void mode (
-          CORBA::OperationMode mode
+          ::CORBA::OperationMode mode
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4345,7 +4342,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContextIdSeq * contexts (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4355,10 +4352,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void contexts (
-          const CORBA::ContextIdSeq & contexts
+          const ::CORBA::ContextIdSeq & contexts
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4366,7 +4363,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExceptionDefSeq * exceptions (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4376,10 +4373,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void exceptions (
-          const CORBA::ExceptionDefSeq & exceptions
+          const ::CORBA::ExceptionDefSeq & exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4397,7 +4394,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -4437,7 +4434,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4447,7 +4444,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4457,7 +4454,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4467,7 +4464,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -4478,7 +4475,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4488,7 +4485,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -4499,7 +4496,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4509,7 +4506,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -4520,7 +4517,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4530,7 +4527,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4540,7 +4537,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4550,7 +4547,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4560,10 +4557,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4573,7 +4570,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::TypeCode_ptr result (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4583,7 +4580,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::IDLType_ptr result_def (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4593,10 +4590,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void result_def (
-          CORBA::IDLType_ptr result_def
+          ::CORBA::IDLType_ptr result_def
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4604,7 +4601,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ParDescriptionSeq * params (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4614,10 +4611,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void params (
-          const CORBA::ParDescriptionSeq & params
+          const ::CORBA::ParDescriptionSeq & params
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4625,7 +4622,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::OperationMode mode (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4635,10 +4632,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void mode (
-          CORBA::OperationMode mode
+          ::CORBA::OperationMode mode
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4646,7 +4643,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContextIdSeq * contexts (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4656,10 +4653,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void contexts (
-          const CORBA::ContextIdSeq & contexts
+          const ::CORBA::ContextIdSeq & contexts
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4667,7 +4664,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExceptionDefSeq * exceptions (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4677,10 +4674,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void exceptions (
-          const CORBA::ExceptionDefSeq & exceptions
+          const ::CORBA::ExceptionDefSeq & exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4698,7 +4695,7 @@ namespace POA_CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+    // be\be_visitor_interface/tie_sh.cpp:87
     
     // TIE class: Refer to CORBA v2.2, Section 20.34.4
     template <class T>
@@ -4738,7 +4735,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::DefinitionKind def_kind (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4748,7 +4745,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void destroy (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -4758,7 +4755,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained_ptr lookup (
           const char * search_name
@@ -4769,11 +4766,11 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4781,13 +4778,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ContainedSeq * lookup_name (
           const char * search_name,
-          CORBA::Long levels_to_search,
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited
+          ::CORBA::Long levels_to_search,
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4795,12 +4792,12 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container::DescriptionSeq * describe_contents (
-          CORBA::DefinitionKind limit_type,
-          CORBA::Boolean exclude_inherited,
-          CORBA::Long max_returned_objs
+          ::CORBA::DefinitionKind limit_type,
+          ::CORBA::Boolean exclude_inherited,
+          ::CORBA::Long max_returned_objs
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4808,7 +4805,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ModuleDef_ptr create_module (
           const char * id,
@@ -4821,14 +4818,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ConstantDef_ptr create_constant (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          const CORBA::Any & value
+          ::CORBA::IDLType_ptr type,
+          const ::CORBA::Any & value
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4836,13 +4833,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::StructDef_ptr create_struct (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4850,14 +4847,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::UnionDef_ptr create_union (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr discriminator_type,
-          const CORBA::UnionMemberSeq & members
+          ::CORBA::IDLType_ptr discriminator_type,
+          const ::CORBA::UnionMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4865,13 +4862,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::EnumDef_ptr create_enum (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::EnumMemberSeq & members
+          const ::CORBA::EnumMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4879,13 +4876,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AliasDef_ptr create_alias (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type
+          ::CORBA::IDLType_ptr original_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4893,13 +4890,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef_ptr create_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4907,19 +4904,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDef_ptr create_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::InitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::InitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4927,13 +4924,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueBoxDef_ptr create_value_box (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr original_type_def
+          ::CORBA::IDLType_ptr original_type_def
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4941,13 +4938,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExceptionDef_ptr create_exception (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::StructMemberSeq & members
+          const ::CORBA::StructMemberSeq & members
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4955,7 +4952,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::NativeDef_ptr create_native (
           const char * id,
@@ -4968,13 +4965,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::AbstractInterfaceDefSeq & base_interfaces
+          const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4982,13 +4979,13 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::LocalInterfaceDef_ptr create_local_interface (
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -4996,19 +4993,19 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtValueDef_ptr create_ext_value (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5016,7 +5013,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * id (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5026,7 +5023,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void id (
           const char * id
@@ -5037,7 +5034,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5047,7 +5044,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void name (
           const char * name
@@ -5058,7 +5055,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * version (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5068,7 +5065,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void version (
           const char * version
@@ -5079,7 +5076,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Container_ptr defined_in (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5089,7 +5086,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       char * absolute_name (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5099,7 +5096,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Repository_ptr containing_repository (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5109,7 +5106,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::Contained::Description * describe (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5119,10 +5116,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void move (
-          CORBA::Container_ptr new_container,
+          ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5132,7 +5129,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::TypeCode_ptr type (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5142,7 +5139,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDefSeq * base_interfaces (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5152,10 +5149,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void base_interfaces (
-          const CORBA::InterfaceDefSeq & base_interfaces
+          const ::CORBA::InterfaceDefSeq & base_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5163,7 +5160,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       CORBA::Boolean is_a (
           const char * interface_id
@@ -5174,7 +5171,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5184,14 +5181,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::AttributeDef_ptr create_attribute (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          CORBA::AttributeMode mode
+          ::CORBA::IDLType_ptr type,
+          ::CORBA::AttributeMode mode
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5199,17 +5196,17 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::OperationDef_ptr create_operation (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr result,
-          CORBA::OperationMode mode,
-          const CORBA::ParDescriptionSeq & params,
-          const CORBA::ExceptionDefSeq & exceptions,
-          const CORBA::ContextIdSeq & contexts
+          ::CORBA::IDLType_ptr result,
+          ::CORBA::OperationMode mode,
+          const ::CORBA::ParDescriptionSeq & params,
+          const ::CORBA::ExceptionDefSeq & exceptions,
+          const ::CORBA::ContextIdSeq & contexts
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5217,7 +5214,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5227,16 +5224,16 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
           const char * id,
           const char * name,
           const char * version,
-          CORBA::IDLType_ptr type,
-          CORBA::AttributeMode mode,
-          const CORBA::ExceptionDefSeq & get_exceptions,
-          const CORBA::ExceptionDefSeq & set_exceptions
+          ::CORBA::IDLType_ptr type,
+          ::CORBA::AttributeMode mode,
+          const ::CORBA::ExceptionDefSeq & get_exceptions,
+          const ::CORBA::ExceptionDefSeq & set_exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5244,7 +5241,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::HomeDef_ptr base_home (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5254,10 +5251,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void base_home (
-          CORBA::ComponentIR::HomeDef_ptr base_home
+          ::CORBA::ComponentIR::HomeDef_ptr base_home
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5265,7 +5262,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::InterfaceDefSeq * supported_interfaces (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5275,10 +5272,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void supported_interfaces (
-          const CORBA::InterfaceDefSeq & supported_interfaces
+          const ::CORBA::InterfaceDefSeq & supported_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5286,7 +5283,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5296,10 +5293,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void managed_component (
-          CORBA::ComponentIR::ComponentDef_ptr managed_component
+          ::CORBA::ComponentIR::ComponentDef_ptr managed_component
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5307,7 +5304,7 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::CORBA::ValueDef_ptr primary_key (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -5317,10 +5314,10 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       void primary_key (
-          CORBA::ValueDef_ptr primary_key
+          ::CORBA::ValueDef_ptr primary_key
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5328,14 +5325,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::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::ParDescriptionSeq & params,
+          const ::CORBA::ExceptionDefSeq & exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5343,14 +5340,14 @@ namespace POA_CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+      // be\be_visitor_operation/tie_sh.cpp:60
       
       ::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::ParDescriptionSeq & params,
+          const ::CORBA::ExceptionDefSeq & exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -5368,13 +5365,12 @@ namespace POA_CORBA
     };
   } // module CORBA::ComponentIR
 } // module CORBA
-#endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1043
+// be\be_codegen.cpp:1094
 
 #if defined (__ACE_INLINE__)
-#include "IFR_ComponentsS_T.i"
+#include "IFR_ComponentsS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
@@ -5385,9 +5381,10 @@ namespace POA_CORBA
 #pragma implementation ("IFR_ComponentsS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.i b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.i
deleted file mode 100644
index 5b22562683f..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.i
+++ /dev/null
@@ -1,9068 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventDef_tie<T>::EventDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventDef_tie<T>::EventDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventDef_tie<T>::EventDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventDef_tie<T>::EventDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventDef_tie<T>::~EventDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::EventDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::EventDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::EventDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::EventDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::EventDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::EventDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->EventDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EventDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
-    const CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->supported_interfaces (
-    supported_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->initializers (
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
-    CORBA::ValueDef_ptr base_value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_value (
-    base_value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->abstract_base_values (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
-    const CORBA::ValueDefSeq & abstract_base_values
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->abstract_base_values (
-    abstract_base_values
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_abstract (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
-    CORBA::Boolean is_abstract
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_abstract (
-    is_abstract
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_custom (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
-    CORBA::Boolean is_custom
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_custom (
-    is_custom
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_truncatable (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
-    CORBA::Boolean is_truncatable
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_truncatable (
-    is_truncatable
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_a  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef::FullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_value  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueMemberDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_value_member  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::Visibility access
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_member (
-    id,
-    name,
-    version,
-    type,
-    access
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtInitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->ext_initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
-    const CORBA::ExtInitializerSeq & ext_initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->ext_initializers (
-    ext_initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_ext_value  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_ext_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtAttributeDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::create_ext_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode,
-    get_exceptions,
-    set_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Container_tie<T>::Container_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Container_tie<T>::Container_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Container_tie<T>::Container_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Container_tie<T>::Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Container_tie<T>::~Container_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::Container_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::Container_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::Container_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::Container_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::Container_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::Container_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->Container::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::Container_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::Container_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ComponentIR::Container_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::Container_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::Container_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ComponentIR::Container_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_component  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::ComponentIR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_component (
-    id,
-    name,
-    version,
-    base_component,
-    supports_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::HomeDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_home  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::ComponentIR::HomeDef_ptr base_home,
-    CORBA::ComponentIR::ComponentDef_ptr managed_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
-    CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_home (
-    id,
-    name,
-    version,
-    base_home,
-    managed_component,
-    supports_interfaces,
-    primary_key
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::Container_tie<T>::create_event  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_event (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::ModuleDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::ModuleDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::ModuleDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::~ModuleDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ModuleDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::ModuleDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ModuleDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::ModuleDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::ModuleDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ComponentIR::ModuleDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::ModuleDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ModuleDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_component  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::ComponentIR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_component (
-    id,
-    name,
-    version,
-    base_component,
-    supports_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::HomeDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_home  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::ComponentIR::HomeDef_ptr base_home,
-    CORBA::ComponentIR::ComponentDef_ptr managed_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
-    CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_home (
-    id,
-    name,
-    version,
-    base_home,
-    managed_component,
-    supports_interfaces,
-    primary_key
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::create_event  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_event (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Repository_tie<T>::Repository_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Repository_tie<T>::Repository_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Repository_tie<T>::Repository_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Repository_tie<T>::Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::Repository_tie<T>::~Repository_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::Repository_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::Repository_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::Repository_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::Repository_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::Repository_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::Repository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->Repository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::Repository_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::Repository_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::Repository_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::Repository_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ComponentIR::Repository_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup_id  (
-    const char * search_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_id (
-    search_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_canonical_typecode  (
-    CORBA::TypeCode_ptr tc
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->get_canonical_typecode (
-    tc
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::PrimitiveDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_primitive  (
-    CORBA::PrimitiveKind kind
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->get_primitive (
-    kind
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_string  (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_string (
-    bound
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::WstringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_wstring  (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_wstring (
-    bound
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::SequenceDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_sequence  (
-    CORBA::ULong bound,
-    CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_sequence (
-    bound,
-    element_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ArrayDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_array  (
-    CORBA::ULong length,
-    CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_array (
-    length,
-    element_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::FixedDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_fixed  (
-    CORBA::UShort digits,
-    CORBA::Short scale
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_fixed (
-    digits,
-    scale
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_component  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::ComponentIR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_component (
-    id,
-    name,
-    version,
-    base_component,
-    supports_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::HomeDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_home  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::ComponentIR::HomeDef_ptr base_home,
-    CORBA::ComponentIR::ComponentDef_ptr managed_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
-    CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_home (
-    id,
-    name,
-    version,
-    base_home,
-    managed_component,
-    supports_interfaces,
-    primary_key
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_event  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_event (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::ProvidesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::ProvidesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::ProvidesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::ProvidesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::~ProvidesDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ProvidesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::ProvidesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->interface_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
-    CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->interface_type (
-    interface_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::UsesDef_tie<T>::UsesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::UsesDef_tie<T>::UsesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::UsesDef_tie<T>::UsesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::UsesDef_tie<T>::UsesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::UsesDef_tie<T>::~UsesDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::UsesDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::UsesDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::UsesDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::UsesDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::UsesDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::UsesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->UsesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::UsesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::UsesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::UsesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::UsesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::UsesDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->interface_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
-    CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->interface_type (
-    interface_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_multiple (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
-    CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_multiple (
-    is_multiple
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::EventPortDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::EventPortDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::EventPortDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::EventPortDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::~EventPortDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->EventPortDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventPortDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventPortDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventPortDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
-    CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->event (
-    event
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef_tie<T>::is_a  (
-    const char * event_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    event_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::EmitsDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::EmitsDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::EmitsDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::EmitsDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::~EmitsDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->EmitsDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::EmitsDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EmitsDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::EmitsDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
-    CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->event (
-    event
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef_tie<T>::is_a  (
-    const char * event_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    event_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::PublishesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::PublishesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::PublishesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::PublishesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::~PublishesDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->PublishesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::PublishesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::PublishesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::PublishesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
-    CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->event (
-    event
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef_tie<T>::is_a  (
-    const char * event_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    event_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::ConsumesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::ConsumesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::ConsumesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::ConsumesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::~ConsumesDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ConsumesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::ConsumesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
-    CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->event (
-    event
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef_tie<T>::is_a  (
-    const char * event_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    event_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::ComponentDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::ComponentDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::ComponentDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::ComponentDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::~ComponentDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ComponentDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::ComponentDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ComponentDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_interfaces (
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef_tie<T>::is_a  (
-    const char * interface_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    interface_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtAttributeDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_ext_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode,
-    get_exceptions,
-    set_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_component (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
-    CORBA::ComponentIR::ComponentDef_ptr base_component
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_component (
-    base_component
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
-    const CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->supported_interfaces (
-    supported_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::ProvidesDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_provides  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_provides (
-    id,
-    name,
-    version,
-    interface_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::UsesDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_uses  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
-    CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_uses (
-    id,
-    name,
-    version,
-    interface_type,
-    is_multiple
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::EmitsDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_emits  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_emits (
-    id,
-    name,
-    version,
-    event
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::PublishesDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_publishes  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_publishes (
-    id,
-    name,
-    version,
-    event
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::ConsumesDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::create_consumes  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_consumes (
-    id,
-    name,
-    version,
-    event
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::FactoryDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::FactoryDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::FactoryDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::FactoryDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::~FactoryDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->FactoryDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::FactoryDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::FactoryDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->result (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->result_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
-    CORBA::IDLType_ptr result_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->result_def (
-    result_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->params (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
-    const CORBA::ParDescriptionSeq & params
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->params (
-    params
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationMode POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
-    CORBA::OperationMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->mode (
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contexts (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->contexts (
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
-    const CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->exceptions (
-    exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FinderDef_tie<T>::FinderDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FinderDef_tie<T>::FinderDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FinderDef_tie<T>::FinderDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FinderDef_tie<T>::FinderDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::FinderDef_tie<T>::~FinderDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::FinderDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::FinderDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::FinderDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::FinderDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::FinderDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::FinderDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->FinderDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::FinderDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::FinderDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::FinderDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->result (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->result_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
-    CORBA::IDLType_ptr result_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->result_def (
-    result_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->params (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
-    const CORBA::ParDescriptionSeq & params
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->params (
-    params
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationMode POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
-    CORBA::OperationMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->mode (
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contexts (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->contexts (
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
-    const CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->exceptions (
-    exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::HomeDef_tie<T>::HomeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::HomeDef_tie<T>::HomeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::HomeDef_tie<T>::HomeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::HomeDef_tie<T>::HomeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ComponentIR::HomeDef_tie<T>::~HomeDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ComponentIR::HomeDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::HomeDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::HomeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ComponentIR::HomeDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ComponentIR::HomeDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::HomeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->HomeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ComponentIR::HomeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ComponentIR::HomeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_interfaces (
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ComponentIR::HomeDef_tie<T>::is_a  (
-    const char * interface_id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    interface_id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtAttributeDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_ext_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode,
-    get_exceptions,
-    set_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::HomeDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_home (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
-    CORBA::ComponentIR::HomeDef_ptr base_home
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_home (
-    base_home
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
-    const CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->supported_interfaces (
-    supported_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->managed_component (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
-    CORBA::ComponentIR::ComponentDef_ptr managed_component
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->managed_component (
-    managed_component
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->primary_key (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
-    CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->primary_key (
-    primary_key
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::FactoryDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_factory  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_factory (
-    id,
-    name,
-    version,
-    params,
-    exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ComponentIR::FinderDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::create_finder  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_finder (
-    id,
-    name,
-    version,
-    params,
-    exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index 77bdc3081c0..b2fa906c681 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -26,11 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:610
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:609
 
-#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
-#define _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
+#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_CPP_
+#define _TAO_IDL_SERVER_IFR_EXTENDEDS_CPP_
 
 
 #include "IFR_ExtendedS.h"
@@ -44,6 +44,7 @@
 #include "tao/Object_T.h"
 #include "tao/Typecode.h"
 #include "tao/DynamicC.h"
+#include "tao/CDR.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -51,38 +52,38 @@
 #include "tao/Var_Size_Argument_T.h"
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
 #include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
-#include "ace/config-all.h"
+#include "ace/Malloc_Allocator.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ExtendedS.i"
+#include "IFR_ExtendedS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
+  class  Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind
@@ -94,9 +95,9 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_SS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Repository>
+  class  Arg_Traits<CORBA::Repository>
     : public
         Object_Arg_Traits_T<
             CORBA::Repository_ptr,
@@ -111,9 +112,9 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container>
+  class  Arg_Traits<CORBA::Container>
     : public
         Object_Arg_Traits_T<
             CORBA::Container_ptr,
@@ -128,9 +129,9 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_SS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::IDLType>
+  class  Arg_Traits<CORBA::IDLType>
     : public
         Object_Arg_Traits_T<
             CORBA::IDLType_ptr,
@@ -142,15 +143,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
+  class  Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
@@ -164,9 +165,9 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDef>
+  class  Arg_Traits<CORBA::ValueDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ValueDef_ptr,
@@ -178,15 +179,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:472
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDef::FullValueDescription>
+  class  Arg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDef::FullValueDescription,
@@ -197,15 +198,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
+  class  Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
@@ -216,15 +217,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
+  class  Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
@@ -235,15 +236,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:472
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
+  class  Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtValueDef::ExtFullValueDescription,
@@ -254,15 +255,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
+  class  Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
@@ -273,15 +274,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq>
+  class  Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
@@ -292,15 +293,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeMode>
+  class  Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::AttributeMode
@@ -312,9 +313,9 @@ namespace TAO
 
 #if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_SS_)
 #define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeDef>
+  class  Arg_Traits<CORBA::AttributeDef>
     : public
         Object_Arg_Traits_T<
             CORBA::AttributeDef_ptr,
@@ -329,9 +330,9 @@ namespace TAO
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_SS_)
 #define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtAttributeDef>
+  class  Arg_Traits<CORBA::ExtAttributeDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ExtAttributeDef_ptr,
@@ -343,15 +344,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:391
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
+  class  Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::OperationMode
@@ -360,15 +361,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq>
+  class  Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
@@ -379,15 +380,15 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:263
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
+  class  Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
@@ -401,9 +402,9 @@ namespace TAO
 
 #if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_SS_)
 #define _CORBA_OPERATIONDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationDef>
+  class  Arg_Traits<CORBA::OperationDef>
     : public
         Object_Arg_Traits_T<
             CORBA::OperationDef_ptr,
@@ -418,9 +419,9 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_SS_)
 #define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueMemberDef>
+  class  Arg_Traits<CORBA::ValueMemberDef>
     : public
         Object_Arg_Traits_T<
             CORBA::ValueMemberDef_ptr,
@@ -434,8 +435,9 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
+
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_FixedDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -448,7 +450,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_FixedDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -533,8 +535,8 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-       -1,  -8,  -3, -11,  -2,   5,  -1,   6,  -1,   7, -27, -26,  -1,  13,
-       -1,  14,  -1,  -1,  15,
+       -1,  -8,  -3, -11,  -2,   5,  -1,   6,  -1,   7, -27, -26,  -1,  13, 
+       -1,  14,  -1,  -1,  15, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -572,12 +574,12 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_FixedDef_Perfect_Hash_OpTable tao_CORBA_FixedDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_FixedDef_digits_get : public TAO_ServerRequestInfo
 {
@@ -588,52 +590,52 @@ public:
       POA_CORBA::FixedDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::UShort result);
 
 private:
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
       const TAO_ServerRequestInfo_CORBA_FixedDef_digits_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_FixedDef_digits_get &
     );
-
+  
 private:
   POA_CORBA::FixedDef *_tao_impl;
-
+  
   CORBA::UShort _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
     TAO_ServerRequest &_tao_server_request,
@@ -655,7 +657,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -669,11 +671,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -684,11 +686,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -712,7 +714,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::UShort result)
 {
   // Update the result.
@@ -720,7 +722,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::UShort result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_FixedDef_digits_set : public TAO_ServerRequestInfo
 {
@@ -729,59 +731,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::FixedDef *tao_impl,
-      const CORBA::UShort & digits
+      const ::CORBA::UShort & digits
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_set (
       const TAO_ServerRequestInfo_CORBA_FixedDef_digits_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_FixedDef_digits_set &
     );
-
+  
 private:
   POA_CORBA::FixedDef *_tao_impl;
-
-  const CORBA::UShort & digits_;
+  
+  const ::CORBA::UShort & digits_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_FixedDef_digits_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::FixedDef *tao_impl,
-    const CORBA::UShort & digits
+    const ::CORBA::UShort & digits
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -799,15 +801,15 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= digits_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -821,11 +823,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -836,7 +838,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -861,7 +863,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_FixedDef_scale_get : public TAO_ServerRequestInfo
 {
@@ -872,52 +874,52 @@ public:
       POA_CORBA::FixedDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::Short result);
 
 private:
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
       const TAO_ServerRequestInfo_CORBA_FixedDef_scale_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_FixedDef_scale_get &
     );
-
+  
 private:
   POA_CORBA::FixedDef *_tao_impl;
-
+  
   CORBA::Short _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
     TAO_ServerRequest &_tao_server_request,
@@ -939,7 +941,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -953,11 +955,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -968,11 +970,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -996,7 +998,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Short result)
 {
   // Update the result.
@@ -1004,7 +1006,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Short result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_FixedDef_scale_set : public TAO_ServerRequestInfo
 {
@@ -1013,59 +1015,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::FixedDef *tao_impl,
-      const CORBA::Short & scale
+      const ::CORBA::Short & scale
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_set (
       const TAO_ServerRequestInfo_CORBA_FixedDef_scale_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_FixedDef_scale_set &
     );
-
+  
 private:
   POA_CORBA::FixedDef *_tao_impl;
-
-  const CORBA::Short & scale_;
+  
+  const ::CORBA::Short & scale_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_FixedDef_scale_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::FixedDef *tao_impl,
-    const CORBA::Short & scale
+    const ::CORBA::Short & scale
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1083,15 +1085,15 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= scale_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -1105,11 +1107,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1120,7 +1122,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -1151,7 +1153,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker *
@@ -1159,7 +1161,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::the_TAO_FixedDef_Strategized_
 {
   static POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -1181,7 +1183,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
@@ -1201,10 +1203,10 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::dispatch (
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-
+  
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-
+  
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -1214,29 +1216,29 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::dispatch (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-
+  
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-
+  
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
-
+  
   ACE_TRY
     {
       collocated_skel (servant,
@@ -1268,7 +1270,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1280,17 +1282,17 @@ CORBA__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_FixedDef_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
 static int
 CORBA__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -1301,30 +1303,30 @@ CORBA__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_TAO_FixedDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_get_digits (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::UShort>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::FixedDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::UShort>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::FixedDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/FixedDef:1.0"
           )
@@ -1334,49 +1336,49 @@ POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_get_digits (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_set_digits (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::FixedDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::FixedDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
-        ((TAO::Arg_Traits<CORBA::UShort>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_get_scale (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Short>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::FixedDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::Short>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::FixedDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/FixedDef:1.0"
           )
@@ -1386,27 +1388,27 @@ POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_get_scale (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_set_scale (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::FixedDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::FixedDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
-        ((TAO::Arg_Traits<CORBA::Short>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::Short>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -1416,8 +1418,8 @@ POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_set_scale (
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:97
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::FixedDef::FixedDef (void)
 {
@@ -1436,8 +1438,8 @@ POA_CORBA::FixedDef::~FixedDef (void)
 {
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::FixedDef::_get_digits_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1447,44 +1449,44 @@ void POA_CORBA::FixedDef::_get_digits_skel (
   )
 {
   POA_CORBA::FixedDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::FixedDef *,
+    static_cast<
+        POA_CORBA::FixedDef *> (
         _tao_servant
       );
   CORBA::UShort _tao_retval = 0;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->digits (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -1492,7 +1494,7 @@ void POA_CORBA::FixedDef::_get_digits_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::UShort _tao_retval_info = _tao_retval;
@@ -1510,35 +1512,35 @@ void POA_CORBA::FixedDef::_get_digits_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -1546,25 +1548,32 @@ void POA_CORBA::FixedDef::_get_digits_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::FixedDef::_set_digits_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1573,16 +1582,16 @@ void POA_CORBA::FixedDef::_set_digits_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::FixedDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::FixedDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::FixedDef *_tao_impl =
+    static_cast<
+        POA_CORBA::FixedDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::UShort digits;
-
+  
+  ::CORBA::UShort digits;
+  
   if (!(
       (_tao_in >> digits)
       ))
@@ -1590,41 +1599,41 @@ POA_CORBA::FixedDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       digits
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->digits (
                   digits
                   ACE_ENV_ARG_PARAMETER
@@ -1633,7 +1642,7 @@ POA_CORBA::FixedDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -1649,35 +1658,35 @@ POA_CORBA::FixedDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -1685,15 +1694,15 @@ POA_CORBA::FixedDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::FixedDef::_get_scale_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1703,44 +1712,44 @@ void POA_CORBA::FixedDef::_get_scale_skel (
   )
 {
   POA_CORBA::FixedDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::FixedDef *,
+    static_cast<
+        POA_CORBA::FixedDef *> (
         _tao_servant
       );
   CORBA::Short _tao_retval = 0;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->scale (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -1748,7 +1757,7 @@ void POA_CORBA::FixedDef::_get_scale_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Short _tao_retval_info = _tao_retval;
@@ -1766,35 +1775,35 @@ void POA_CORBA::FixedDef::_get_scale_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -1802,25 +1811,32 @@ void POA_CORBA::FixedDef::_get_scale_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::FixedDef::_set_scale_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1829,16 +1845,16 @@ void POA_CORBA::FixedDef::_set_scale_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::FixedDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::FixedDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::FixedDef *_tao_impl =
+    static_cast<
+        POA_CORBA::FixedDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::Short scale;
-
+  
+  ::CORBA::Short scale;
+  
   if (!(
       (_tao_in >> scale)
       ))
@@ -1846,41 +1862,41 @@ POA_CORBA::FixedDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       scale
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->scale (
                   scale
                   ACE_ENV_ARG_PARAMETER
@@ -1889,7 +1905,7 @@ POA_CORBA::FixedDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -1905,35 +1921,35 @@ POA_CORBA::FixedDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -1941,42 +1957,42 @@ POA_CORBA::FixedDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:162
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::FixedDef::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-
+  
   POA_CORBA::FixedDef *_tao_impl =
     (POA_CORBA::FixedDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-
+  
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1984,7 +2000,7 @@ void POA_CORBA::FixedDef::_is_a_skel (
 }
 
 void POA_CORBA::FixedDef::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1992,14 +2008,14 @@ void POA_CORBA::FixedDef::_non_existent_skel (
 {
   POA_CORBA::FixedDef *_tao_impl =
     (POA_CORBA::FixedDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -2007,7 +2023,7 @@ void POA_CORBA::FixedDef::_non_existent_skel (
 }
 
 void POA_CORBA::FixedDef::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -2017,30 +2033,30 @@ void POA_CORBA::FixedDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   POA_CORBA::FixedDef *_tao_impl =
     (POA_CORBA::FixedDef *) _tao_servant;
-
-  CORBA::InterfaceDef_ptr _tao_retval =
+  
+  CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-
+  
   _tao_adapter->dispose (_tao_retval);
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -2048,7 +2064,7 @@ void POA_CORBA::FixedDef::_interface_skel (
 }
 
 void POA_CORBA::FixedDef::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -2056,14 +2072,14 @@ void POA_CORBA::FixedDef::_component_skel (
 {
   POA_CORBA::FixedDef *_tao_impl =
     (POA_CORBA::FixedDef *) _tao_object_reference;
-
+  
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -2109,27 +2125,27 @@ void* POA_CORBA::FixedDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/FixedDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::FixedDef_ptr, this);
+      return static_cast<POA_CORBA::FixedDef_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
-
+  
   return 0;
 }
 
@@ -2139,7 +2155,7 @@ const char* POA_CORBA::FixedDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::FixedDef::_dispatch (
     TAO_ServerRequest &req,
@@ -2154,17 +2170,17 @@ void POA_CORBA::FixedDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::FixedDef *
 POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -2181,10 +2197,10 @@ POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-
+  
   typedef ::CORBA::FixedDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -2194,7 +2210,7 @@ POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -2207,7 +2223,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -2303,9 +2319,9 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
 
   static const signed char lookup[] =
     {
-      -13,  -2, -15,  -2,   4,   5,  -1,  53,   8,  48,  12, -47, -46,  17,
-       -1,  18,  -1,  19,  20,  -1,  21,  -9,  -3,  22,  -6,  -2, -23,  -2,
-      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25,
+      -13,  -2, -15,  -2,   4,   5,  -1,  53,   8,  48,  12, -47, -46,  17, 
+       -1,  18,  -1,  19,  20,  -1,  21,  -9,  -3,  22,  -6,  -2, -23,  -2, 
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2343,12 +2359,12 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
 static TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable tao_CORBA_ValueMemberDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get : public TAO_ServerRequestInfo
 {
@@ -2359,52 +2375,52 @@ public:
       POA_CORBA::ValueMemberDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::TypeCode_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get &
     );
-
+  
 private:
   POA_CORBA::ValueMemberDef *_tao_impl;
-
+  
   CORBA::TypeCode_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_ServerRequest &_tao_server_request,
@@ -2426,7 +2442,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -2440,11 +2456,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2455,11 +2471,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -2483,7 +2499,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
 {
   // Update the result.
@@ -2491,7 +2507,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get : public TAO_ServerRequestInfo
 {
@@ -2502,52 +2518,52 @@ public:
       POA_CORBA::ValueMemberDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get &
     );
-
+  
 private:
   POA_CORBA::ValueMemberDef *_tao_impl;
-
+  
   ::CORBA::IDLType_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
@@ -2569,7 +2585,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -2583,11 +2599,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2598,11 +2614,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -2626,7 +2642,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (::CORBA::IDLType_ptr result)
 {
   // Update the result.
@@ -2634,7 +2650,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (::CORBA::IDLTyp
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set : public TAO_ServerRequestInfo
 {
@@ -2643,59 +2659,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueMemberDef *tao_impl,
-      CORBA::IDLType_ptr type_def
+      ::CORBA::IDLType_ptr type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set &
     );
-
+  
 private:
   POA_CORBA::ValueMemberDef *_tao_impl;
-
-  CORBA::IDLType_ptr type_def_;
+  
+  ::CORBA::IDLType_ptr type_def_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueMemberDef *tao_impl,
-    CORBA::IDLType_ptr type_def
+    ::CORBA::IDLType_ptr type_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -2713,15 +2729,15 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<=  this->type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -2735,11 +2751,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2750,7 +2766,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -2775,7 +2791,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ServerRequestInfo
 {
@@ -2786,52 +2802,52 @@ public:
       POA_CORBA::ValueMemberDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::Visibility result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get &
     );
-
+  
 private:
   POA_CORBA::ValueMemberDef *_tao_impl;
-
+  
   CORBA::Visibility _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_ServerRequest &_tao_server_request,
@@ -2853,7 +2869,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -2867,11 +2883,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2882,11 +2898,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -2910,7 +2926,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Visibility result)
 {
   // Update the result.
@@ -2918,7 +2934,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Visibility
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set : public TAO_ServerRequestInfo
 {
@@ -2927,59 +2943,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueMemberDef *tao_impl,
-      const CORBA::Visibility & access
+      const ::CORBA::Visibility & access
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set &
     );
-
+  
 private:
   POA_CORBA::ValueMemberDef *_tao_impl;
-
-  const CORBA::Visibility & access_;
+  
+  const ::CORBA::Visibility & access_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueMemberDef *tao_impl,
-    const CORBA::Visibility & access
+    const ::CORBA::Visibility & access
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -2997,15 +3013,15 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= access_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -3019,11 +3035,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -3034,7 +3050,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -3065,7 +3081,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker *
@@ -3073,7 +3089,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_ValueMemberDef_
 {
   static POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -3095,7 +3111,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
@@ -3115,10 +3131,10 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::dispatch (
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-
+  
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-
+  
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -3128,29 +3144,29 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::dispatch (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-
+  
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-
+  
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
-
+  
   ACE_TRY
     {
       collocated_skel (servant,
@@ -3182,7 +3198,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3194,17 +3210,17 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
 static int
 CORBA__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -3215,30 +3231,30 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_type (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::TypeCode>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueMemberDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueMemberDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueMemberDef:1.0"
           )
@@ -3248,23 +3264,23 @@ POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_type (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_type_def (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::IDLType>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueMemberDef_ptr,
+  ((TAO::Arg_Traits< CORBA::IDLType>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueMemberDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueMemberDef:1.0"
           )
@@ -3274,49 +3290,49 @@ POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_type_def (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_set_type_def (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueMemberDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueMemberDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
-        ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_access (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Visibility>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueMemberDef_ptr,
+  ((TAO::Arg_Traits< ::CORBA::Visibility>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueMemberDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueMemberDef:1.0"
           )
@@ -3326,27 +3342,27 @@ POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_access (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_set_access (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueMemberDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueMemberDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
-        ((TAO::Arg_Traits<CORBA::Visibility>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -3356,8 +3372,8 @@ POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_set_access (
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:97
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ValueMemberDef::ValueMemberDef (void)
 {
@@ -3376,8 +3392,8 @@ POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
 {
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueMemberDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3387,44 +3403,44 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
   )
 {
   POA_CORBA::ValueMemberDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueMemberDef *,
+    static_cast<
+        POA_CORBA::ValueMemberDef *> (
         _tao_servant
       );
   CORBA::TypeCode_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->type (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -3432,7 +3448,7 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
@@ -3451,35 +3467,35 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3487,25 +3503,32 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueMemberDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3515,44 +3538,44 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
   )
 {
   POA_CORBA::ValueMemberDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueMemberDef *,
+    static_cast<
+        POA_CORBA::ValueMemberDef *> (
         _tao_servant
       );
   ::CORBA::IDLType_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->type_def (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -3560,7 +3583,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
@@ -3579,35 +3602,35 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3615,25 +3638,32 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueMemberDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3642,16 +3672,16 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueMemberDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueMemberDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueMemberDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueMemberDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::IDLType_var type_def;
-
+  
+  ::CORBA::IDLType_var type_def;
+  
   if (!(
       (_tao_in >> type_def.out ())
       ))
@@ -3659,41 +3689,41 @@ POA_CORBA::ValueMemberDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       type_def.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->type_def (
                   type_def.in ()
                   ACE_ENV_ARG_PARAMETER
@@ -3702,7 +3732,7 @@ POA_CORBA::ValueMemberDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3718,35 +3748,35 @@ POA_CORBA::ValueMemberDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3754,15 +3784,15 @@ POA_CORBA::ValueMemberDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueMemberDef::_get_access_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3772,44 +3802,44 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
   )
 {
   POA_CORBA::ValueMemberDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueMemberDef *,
+    static_cast<
+        POA_CORBA::ValueMemberDef *> (
         _tao_servant
       );
   CORBA::Visibility _tao_retval = 0;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->access (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -3817,7 +3847,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Visibility _tao_retval_info = _tao_retval;
@@ -3835,35 +3865,35 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -3871,25 +3901,32 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval)
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueMemberDef::_set_access_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3898,16 +3935,16 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueMemberDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueMemberDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueMemberDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueMemberDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::Visibility access;
-
+  
+  ::CORBA::Visibility access;
+  
   if (!(
       (_tao_in >> access)
       ))
@@ -3915,41 +3952,41 @@ POA_CORBA::ValueMemberDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       access
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->access (
                   access
                   ACE_ENV_ARG_PARAMETER
@@ -3958,7 +3995,7 @@ POA_CORBA::ValueMemberDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3974,35 +4011,35 @@ POA_CORBA::ValueMemberDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -4010,42 +4047,42 @@ POA_CORBA::ValueMemberDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:162
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ValueMemberDef::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-
+  
   POA_CORBA::ValueMemberDef *_tao_impl =
     (POA_CORBA::ValueMemberDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-
+  
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -4053,7 +4090,7 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
 }
 
 void POA_CORBA::ValueMemberDef::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -4061,14 +4098,14 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
 {
   POA_CORBA::ValueMemberDef *_tao_impl =
     (POA_CORBA::ValueMemberDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -4076,7 +4113,7 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
 }
 
 void POA_CORBA::ValueMemberDef::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -4086,30 +4123,30 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   POA_CORBA::ValueMemberDef *_tao_impl =
     (POA_CORBA::ValueMemberDef *) _tao_servant;
-
-  CORBA::InterfaceDef_ptr _tao_retval =
+  
+  CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-
+  
   _tao_adapter->dispose (_tao_retval);
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -4117,7 +4154,7 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
 }
 
 void POA_CORBA::ValueMemberDef::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -4125,14 +4162,14 @@ void POA_CORBA::ValueMemberDef::_component_skel (
 {
   POA_CORBA::ValueMemberDef *_tao_impl =
     (POA_CORBA::ValueMemberDef *) _tao_object_reference;
-
+  
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -4178,27 +4215,27 @@ void* POA_CORBA::ValueMemberDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ValueMemberDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ValueMemberDef_ptr, this);
+      return static_cast<POA_CORBA::ValueMemberDef_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
-
+  
   return 0;
 }
 
@@ -4208,7 +4245,7 @@ const char* POA_CORBA::ValueMemberDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ValueMemberDef::_dispatch (
     TAO_ServerRequest &req,
@@ -4223,17 +4260,17 @@ void POA_CORBA::ValueMemberDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ValueMemberDef *
 POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -4250,10 +4287,10 @@ POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-
+  
   typedef ::CORBA::ValueMemberDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -4263,7 +4300,7 @@ POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ValueDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -4276,7 +4313,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4405,13 +4442,13 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-        -1,   -1,   -7,   -3,    4,    5,    6,  -12,   -2,  -98,   10,   11,  -14,   -2,
-       -98,  -94,  -17,   -2,   16,  -94,  -21,   -2,  -24,   -2,   19,   -1,  -26,   -2,
-       -29,   -4,   20,   -1, -103,   23,  -34,   -2, -105, -102,   28,   -1, -103,   33,
-       -99,   36,   37,   38,   -1,   -1,   -1,   -1,   -1,   -1,   39,   -1,  -42,   -2,
-        40,   41,  -95,  -44,   -3,  -93,   47,   -1,   48,   -1,   49,   50,   51,   -1,
-        52,   -1,   53,   -1,   -1,   -1,   -1,   -1,   54,   -1,   55,   -1,   -1,   -1,
-        -1,   -1,   -1,   56,   -1,  -57,   -2,  -93,
+        -1,   -1,   -7,   -3,    4,    5,    6,  -12,   -2,  -98,   10,   11,  -14,   -2, 
+       -98,  -94,  -17,   -2,   16,  -94,  -21,   -2,  -24,   -2,   19,   -1,  -26,   -2, 
+       -29,   -4,   20,   -1, -103,   23,  -34,   -2, -105, -102,   28,   -1, -103,   33, 
+       -99,   36,   37,   38,   -1,   -1,   -1,   -1,   -1,   -1,   39,   -1,  -42,   -2, 
+        40,   41,  -95,  -44,   -3,  -93,   47,   -1,   48,   -1,   49,   50,   51,   -1, 
+        52,   -1,   53,   -1,   -1,   -1,   -1,   -1,   54,   -1,   55,   -1,   -1,   -1, 
+        -1,   -1,   -1,   56,   -1,  -57,   -2,  -93, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4449,12 +4486,12 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_ValueDef_Perfect_Hash_OpTable tao_CORBA_ValueDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get : public TAO_ServerRequestInfo
 {
@@ -4465,52 +4502,52 @@ public:
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::InterfaceDefSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
       const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   ::CORBA::InterfaceDefSeq * _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
@@ -4532,7 +4569,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -4546,11 +4583,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -4561,11 +4598,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= *this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -4589,7 +4626,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (::CORBA::InterfaceDefSeq * result)
 {
   // Update the result.
@@ -4597,7 +4634,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (::CORBA::
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set : public TAO_ServerRequestInfo
 {
@@ -4606,59 +4643,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
-      const CORBA::InterfaceDefSeq & supported_interfaces
+      const ::CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set (
       const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
+  
+  const ::CORBA::InterfaceDefSeq & supported_interfaces_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
-    const CORBA::InterfaceDefSeq & supported_interfaces
+    const ::CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -4676,15 +4713,15 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<=  this->supported_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -4698,11 +4735,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -4713,7 +4750,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -4738,7 +4775,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ServerRequestInfo
 {
@@ -4749,52 +4786,52 @@ public:
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::InitializerSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
       const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   ::CORBA::InitializerSeq * _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_ServerRequest &_tao_server_request,
@@ -4816,7 +4853,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -4830,11 +4867,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -4845,11 +4882,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= *this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -4873,7 +4910,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (::CORBA::InitializerSeq * result)
 {
   // Update the result.
@@ -4881,7 +4918,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (::CORBA::Initiali
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set : public TAO_ServerRequestInfo
 {
@@ -4890,59 +4927,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
-      const CORBA::InitializerSeq & initializers
+      const ::CORBA::InitializerSeq & initializers
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set (
       const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
-  const CORBA::InitializerSeq & initializers_;
+  
+  const ::CORBA::InitializerSeq & initializers_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
-    const CORBA::InitializerSeq & initializers
+    const ::CORBA::InitializerSeq & initializers
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -4960,15 +4997,15 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<=  this->initializers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -4982,11 +5019,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -4997,7 +5034,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -5022,7 +5059,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ServerRequestInfo
 {
@@ -5033,52 +5070,52 @@ public:
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::ValueDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
       const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   ::CORBA::ValueDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_ServerRequest &_tao_server_request,
@@ -5100,7 +5137,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5114,11 +5151,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5129,11 +5166,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -5157,7 +5194,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (::CORBA::ValueDef_ptr result)
 {
   // Update the result.
@@ -5165,7 +5202,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (::CORBA::ValueDef_p
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set : public TAO_ServerRequestInfo
 {
@@ -5174,59 +5211,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
-      CORBA::ValueDef_ptr base_value
+      ::CORBA::ValueDef_ptr base_value
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set (
       const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
-  CORBA::ValueDef_ptr base_value_;
+  
+  ::CORBA::ValueDef_ptr base_value_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
-    CORBA::ValueDef_ptr base_value
+    ::CORBA::ValueDef_ptr base_value
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -5244,15 +5281,15 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<=  this->base_value_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5266,11 +5303,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5281,7 +5318,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -5306,7 +5343,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo
 {
@@ -5317,52 +5354,52 @@ public:
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::ValueDefSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
       const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   ::CORBA::ValueDefSeq * _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_ServerRequest &_tao_server_request,
@@ -5384,7 +5421,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5398,11 +5435,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5413,11 +5450,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= *this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -5441,7 +5478,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (::CORBA::ValueDefSeq * result)
 {
   // Update the result.
@@ -5449,7 +5486,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (::CORBA::
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set : public TAO_ServerRequestInfo
 {
@@ -5458,59 +5495,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
-      const CORBA::ValueDefSeq & abstract_base_values
+      const ::CORBA::ValueDefSeq & abstract_base_values
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set (
       const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
-  const CORBA::ValueDefSeq & abstract_base_values_;
+  
+  const ::CORBA::ValueDefSeq & abstract_base_values_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
-    const CORBA::ValueDefSeq & abstract_base_values
+    const ::CORBA::ValueDefSeq & abstract_base_values
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -5528,15 +5565,15 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<=  this->abstract_base_values_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5550,11 +5587,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5565,7 +5602,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -5590,7 +5627,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ServerRequestInfo
 {
@@ -5601,52 +5638,52 @@ public:
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::Boolean result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   CORBA::Boolean _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_ServerRequest &_tao_server_request,
@@ -5668,7 +5705,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5682,11 +5719,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5697,11 +5734,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-
+  
   return safe_result_any._retn ();
 }
 
@@ -5725,7 +5762,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Boolean result)
 {
   // Update the result.
@@ -5733,7 +5770,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Boolean res
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set : public TAO_ServerRequestInfo
 {
@@ -5742,59 +5779,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
-      const CORBA::Boolean & is_abstract
+      const ::CORBA::Boolean & is_abstract
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
-  const CORBA::Boolean & is_abstract_;
+  
+  const ::CORBA::Boolean & is_abstract_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
-    const CORBA::Boolean & is_abstract
+    const ::CORBA::Boolean & is_abstract
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -5812,15 +5849,15 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5834,11 +5871,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5849,7 +5886,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -5874,7 +5911,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ServerRequestInfo
 {
@@ -5885,52 +5922,52 @@ public:
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::Boolean result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   CORBA::Boolean _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_ServerRequest &_tao_server_request,
@@ -5952,7 +5989,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5966,11 +6003,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5981,11 +6018,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-
+  
   return safe_result_any._retn ();
 }
 
@@ -6009,7 +6046,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Boolean result)
 {
   // Update the result.
@@ -6017,7 +6054,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Boolean resul
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set : public TAO_ServerRequestInfo
 {
@@ -6026,59 +6063,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
-      const CORBA::Boolean & is_custom
+      const ::CORBA::Boolean & is_custom
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
-  const CORBA::Boolean & is_custom_;
+  
+  const ::CORBA::Boolean & is_custom_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
-    const CORBA::Boolean & is_custom
+    const ::CORBA::Boolean & is_custom
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6096,15 +6133,15 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -6118,11 +6155,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -6133,7 +6170,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -6158,7 +6195,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_ServerRequestInfo
 {
@@ -6169,52 +6206,52 @@ public:
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::Boolean result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   CORBA::Boolean _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_ServerRequest &_tao_server_request,
@@ -6236,7 +6273,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -6250,11 +6287,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -6265,11 +6302,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-
+  
   return safe_result_any._retn ();
 }
 
@@ -6293,7 +6330,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
 {
   // Update the result.
@@ -6301,7 +6338,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Boolean
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set : public TAO_ServerRequestInfo
 {
@@ -6310,59 +6347,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
-      const CORBA::Boolean & is_truncatable
+      const ::CORBA::Boolean & is_truncatable
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
-  const CORBA::Boolean & is_truncatable_;
+  
+  const ::CORBA::Boolean & is_truncatable_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
-    const CORBA::Boolean & is_truncatable
+    const ::CORBA::Boolean & is_truncatable
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6380,15 +6417,15 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -6402,11 +6439,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -6417,7 +6454,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -6442,7 +6479,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_a : public TAO_ServerRequestInfo
 {
@@ -6454,53 +6491,53 @@ public:
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::Boolean result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_a (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_a &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_is_a &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   const char * id_;
   CORBA::Boolean _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_is_a (
     TAO_ServerRequest &_tao_server_request,
@@ -6524,15 +6561,15 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -6546,11 +6583,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -6561,11 +6598,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-
+  
   return safe_result_any._retn ();
 }
 
@@ -6589,7 +6626,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Boolean result)
 {
   // Update the result.
@@ -6597,7 +6634,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Boolean result)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_describe_value : public TAO_ServerRequestInfo
 {
@@ -6608,52 +6645,52 @@ public:
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::ValueDef::FullValueDescription * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
       const TAO_ServerRequestInfo_CORBA_ValueDef_describe_value &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_describe_value &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   ::CORBA::ValueDef::FullValueDescription * _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
     TAO_ServerRequest &_tao_server_request,
@@ -6675,7 +6712,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -6689,11 +6726,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -6704,11 +6741,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= *this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -6732,7 +6769,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (::CORBA::ValueDef::FullValueDescription * result)
 {
   // Update the result.
@@ -6740,7 +6777,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (::CORBA::ValueDef::
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member : public TAO_ServerRequestInfo
 {
@@ -6752,61 +6789,61 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
-      const CORBA::Visibility & access
+      ::CORBA::IDLType_ptr type,
+      const ::CORBA::Visibility & access
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::ValueMemberDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member (
       const TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
-  const CORBA::Visibility & access_;
+  ::CORBA::IDLType_ptr type_;
+  const ::CORBA::Visibility & access_;
   ::CORBA::ValueMemberDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member (
     TAO_ServerRequest &_tao_server_request,
@@ -6815,8 +6852,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Visibility & access
+    ::CORBA::IDLType_ptr type,
+    const ::CORBA::Visibility & access
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -6838,31 +6875,31 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (5);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= access_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -6876,11 +6913,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -6891,11 +6928,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -6919,7 +6956,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (::CORBA::ValueMemberDef_ptr result)
 {
   // Update the result.
@@ -6927,7 +6964,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (::CORBA::Value
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute : public TAO_ServerRequestInfo
 {
@@ -6939,61 +6976,61 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
-      CORBA::AttributeMode & mode
+      ::CORBA::IDLType_ptr type,
+      ::CORBA::AttributeMode & mode
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::AttributeDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute (
       const TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
-  const CORBA::AttributeMode & mode_;
+  ::CORBA::IDLType_ptr type_;
+  const ::CORBA::AttributeMode & mode_;
   ::CORBA::AttributeDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute (
     TAO_ServerRequest &_tao_server_request,
@@ -7002,8 +7039,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode & mode
+    ::CORBA::IDLType_ptr type,
+    ::CORBA::AttributeMode & mode
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -7025,31 +7062,31 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (5);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -7063,11 +7100,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -7078,11 +7115,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -7106,7 +7143,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (::CORBA::AttributeDef_ptr result)
 {
   // Update the result.
@@ -7114,7 +7151,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (::CORBA::Attribut
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_create_operation : public TAO_ServerRequestInfo
 {
@@ -7126,67 +7163,67 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
-      CORBA::OperationMode & mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts
+      ::CORBA::IDLType_ptr result,
+      ::CORBA::OperationMode & mode,
+      const ::CORBA::ParDescriptionSeq & params,
+      const ::CORBA::ExceptionDefSeq & exceptions,
+      const ::CORBA::ContextIdSeq & contexts
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::OperationDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_operation (
       const TAO_ServerRequestInfo_CORBA_ValueDef_create_operation &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueDef_create_operation &
     );
-
+  
 private:
   POA_CORBA::ValueDef *_tao_impl;
-
+  
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr result_;
-  const CORBA::OperationMode & mode_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
-  const CORBA::ContextIdSeq & contexts_;
+  ::CORBA::IDLType_ptr result_;
+  const ::CORBA::OperationMode & mode_;
+  const ::CORBA::ParDescriptionSeq & params_;
+  const ::CORBA::ExceptionDefSeq & exceptions_;
+  const ::CORBA::ContextIdSeq & contexts_;
   ::CORBA::OperationDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_CORBA_ValueDef_create_operation (
     TAO_ServerRequest &_tao_server_request,
@@ -7195,11 +7232,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode & mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
+    ::CORBA::IDLType_ptr result,
+    ::CORBA::OperationMode & mode,
+    const ::CORBA::ParDescriptionSeq & params,
+    const ::CORBA::ExceptionDefSeq & exceptions,
+    const ::CORBA::ContextIdSeq & contexts
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -7224,43 +7261,43 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (8);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->result_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->params_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->contexts_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -7274,11 +7311,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -7289,11 +7326,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -7317,7 +7354,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (::CORBA::OperationDef_ptr result)
 {
   // Update the result.
@@ -7331,7 +7368,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (::CORBA::Operatio
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker *
@@ -7339,7 +7376,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::the_TAO_ValueDef_Strategized_
 {
   static POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -7361,7 +7398,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
@@ -7381,10 +7418,10 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::dispatch (
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-
+  
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-
+  
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -7394,29 +7431,29 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::dispatch (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-
+  
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-
+  
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
-
+  
   ACE_TRY
     {
       collocated_skel (servant,
@@ -7448,7 +7485,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -7460,17 +7497,17 @@ CORBA__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_ValueDef_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
 static int
 CORBA__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -7481,30 +7518,30 @@ CORBA__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_TAO_ValueDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_supported_interfaces (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
@@ -7514,49 +7551,49 @@ POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_supported_interfaces (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_supported_interfaces (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
-        ((TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_initializers (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::InitializerSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::InitializerSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
@@ -7566,49 +7603,49 @@ POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_initializers (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_initializers (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
-        ((TAO::Arg_Traits<CORBA::InitializerSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_base_value (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ValueDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ValueDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
@@ -7618,49 +7655,49 @@ POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_base_value (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_base_value (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
-        ((TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_abstract_base_values (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ValueDefSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ValueDefSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
@@ -7670,49 +7707,49 @@ POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_abstract_base_values (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_abstract_base_values (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
-        ((TAO::Arg_Traits<CORBA::ValueDefSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_abstract (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
@@ -7722,49 +7759,49 @@ POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_abstract (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_is_abstract (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
-        ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_custom (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
@@ -7774,49 +7811,49 @@ POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_custom (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_is_custom (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
-        ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_truncatable (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
@@ -7826,76 +7863,76 @@ POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_truncatable (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_is_truncatable (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
-        ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_a (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
       )->is_a (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::describe_value (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ValueDef::FullValueDescription>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ValueDef::FullValueDescription>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
@@ -7905,97 +7942,97 @@ POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::describe_value (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ValueMemberDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ValueMemberDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
       )->create_value_member (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::Visibility>::in_arg_val *) args[5])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val *) args[5])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::AttributeDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::AttributeDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
       )->create_attribute (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val *) args[5])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val *) args[5])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::OperationDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::OperationDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueDef:1.0"
           )
       )->create_operation (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::OperationMode>::in_arg_val *) args[5])->arg (),
-          ((TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val *) args[6])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val *) args[7])->arg (),
-          ((TAO::Arg_Traits<CORBA::ContextIdSeq>::in_arg_val *) args[8])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val *) args[5])->arg (),
+          ((TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val *) args[6])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val *) args[7])->arg (),
+          ((TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val *) args[8])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -8005,8 +8042,8 @@ POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:97
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ValueDef::ValueDef (void)
 {
@@ -8027,8 +8064,8 @@ POA_CORBA::ValueDef::~ValueDef (void)
 {
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8038,44 +8075,44 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   ::CORBA::InterfaceDefSeq_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->supported_interfaces (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -8083,7 +8120,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
@@ -8102,35 +8139,35 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -8138,25 +8175,32 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8165,16 +8209,16 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::InterfaceDefSeq supported_interfaces;
-
+  
+  ::CORBA::InterfaceDefSeq supported_interfaces;
+  
   if (!(
       (_tao_in >> supported_interfaces)
       ))
@@ -8182,41 +8226,41 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       supported_interfaces
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->supported_interfaces (
                   supported_interfaces
                   ACE_ENV_ARG_PARAMETER
@@ -8225,7 +8269,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8241,35 +8285,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -8277,15 +8321,15 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_get_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8295,44 +8339,44 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   ::CORBA::InitializerSeq_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->initializers (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -8340,7 +8384,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::InitializerSeq * _tao_retval_info = _tao_retval._retn ();
@@ -8359,35 +8403,35 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -8395,25 +8439,32 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_set_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8422,16 +8473,16 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::InitializerSeq initializers;
-
+  
+  ::CORBA::InitializerSeq initializers;
+  
   if (!(
       (_tao_in >> initializers)
       ))
@@ -8439,41 +8490,41 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       initializers
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->initializers (
                   initializers
                   ACE_ENV_ARG_PARAMETER
@@ -8482,7 +8533,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8498,35 +8549,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -8534,15 +8585,15 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_get_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8552,44 +8603,44 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   ::CORBA::ValueDef_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->base_value (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -8597,7 +8648,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
@@ -8616,35 +8667,35 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -8652,25 +8703,32 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_set_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8679,16 +8737,16 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::ValueDef_var base_value;
-
+  
+  ::CORBA::ValueDef_var base_value;
+  
   if (!(
       (_tao_in >> base_value.out ())
       ))
@@ -8696,41 +8754,41 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       base_value.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->base_value (
                   base_value.in ()
                   ACE_ENV_ARG_PARAMETER
@@ -8739,7 +8797,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8755,35 +8813,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -8791,15 +8849,15 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8809,44 +8867,44 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   ::CORBA::ValueDefSeq_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->abstract_base_values (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -8854,7 +8912,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::ValueDefSeq * _tao_retval_info = _tao_retval._retn ();
@@ -8873,35 +8931,35 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -8909,25 +8967,32 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -8936,16 +9001,16 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::ValueDefSeq abstract_base_values;
-
+  
+  ::CORBA::ValueDefSeq abstract_base_values;
+  
   if (!(
       (_tao_in >> abstract_base_values)
       ))
@@ -8953,41 +9018,41 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       abstract_base_values
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->abstract_base_values (
                   abstract_base_values
                   ACE_ENV_ARG_PARAMETER
@@ -8996,7 +9061,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -9012,35 +9077,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -9048,15 +9113,15 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_get_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9066,44 +9131,44 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   CORBA::Boolean _tao_retval = 0;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->is_abstract (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -9111,7 +9176,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Boolean _tao_retval_info = _tao_retval;
@@ -9129,35 +9194,35 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -9165,25 +9230,32 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_set_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9192,16 +9264,16 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::Boolean is_abstract;
-
+  
+  ::CORBA::Boolean is_abstract;
+  
   if (!(
       (_tao_in >> CORBA::Any::to_boolean (is_abstract))
       ))
@@ -9209,41 +9281,41 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       is_abstract
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->is_abstract (
                   is_abstract
                   ACE_ENV_ARG_PARAMETER
@@ -9252,7 +9324,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -9268,35 +9340,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -9304,15 +9376,15 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_get_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9322,44 +9394,44 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   CORBA::Boolean _tao_retval = 0;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->is_custom (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -9367,7 +9439,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Boolean _tao_retval_info = _tao_retval;
@@ -9385,35 +9457,35 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -9421,25 +9493,32 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_set_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9448,16 +9527,16 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::Boolean is_custom;
-
+  
+  ::CORBA::Boolean is_custom;
+  
   if (!(
       (_tao_in >> CORBA::Any::to_boolean (is_custom))
       ))
@@ -9465,41 +9544,41 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       is_custom
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->is_custom (
                   is_custom
                   ACE_ENV_ARG_PARAMETER
@@ -9508,7 +9587,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -9524,35 +9603,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -9560,15 +9639,15 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_get_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9578,44 +9657,44 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   CORBA::Boolean _tao_retval = 0;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->is_truncatable (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -9623,7 +9702,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Boolean _tao_retval_info = _tao_retval;
@@ -9641,35 +9720,35 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -9677,25 +9756,32 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::_set_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9704,16 +9790,16 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::Boolean is_truncatable;
-
+  
+  ::CORBA::Boolean is_truncatable;
+  
   if (!(
       (_tao_in >> CORBA::Any::to_boolean (is_truncatable))
       ))
@@ -9721,41 +9807,41 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       is_truncatable
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->is_truncatable (
                   is_truncatable
                   ACE_ENV_ARG_PARAMETER
@@ -9764,7 +9850,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -9780,35 +9866,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -9816,15 +9902,15 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9833,15 +9919,15 @@ void POA_CORBA::ValueDef::is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   CORBA::Boolean _tao_retval = 0;
-  CORBA::String_var id;
-
+  ::CORBA::String_var id;
+  
   if (!(
       (_tao_in >> id.out ())
       ))
@@ -9849,41 +9935,41 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_is_a _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       id.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->is_a (
                   id.in ()
                   ACE_ENV_ARG_PARAMETER
@@ -9892,7 +9978,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Boolean _tao_retval_info = _tao_retval;
@@ -9910,35 +9996,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -9946,25 +10032,32 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::describe_value_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -9974,44 +10067,44 @@ void POA_CORBA::ValueDef::describe_value_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   ::CORBA::ValueDef::FullValueDescription_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_describe_value _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->describe_value (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -10019,7 +10112,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::ValueDef::FullValueDescription * _tao_retval_info = _tao_retval._retn ();
@@ -10038,35 +10131,35 @@ void POA_CORBA::ValueDef::describe_value_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -10074,25 +10167,32 @@ void POA_CORBA::ValueDef::describe_value_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::create_value_member_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10101,19 +10201,19 @@ void POA_CORBA::ValueDef::create_value_member_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   ::CORBA::ValueMemberDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var type;
-  CORBA::Visibility access;
-
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var type;
+  ::CORBA::Visibility access;
+  
   if (!(
       (_tao_in >> id.out ()) &&
       (_tao_in >> name.out ()) &&
@@ -10125,58 +10225,58 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       id.in (),
-
+      
       name.in (),
-
+      
       version.in (),
-
+      
       type.in (),
-
+      
       access
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->create_value_member (
                   id.in (),
-
+                  
                   name.in (),
-
+                  
                   version.in (),
-
+                  
                   type.in (),
-
+                  
                   access
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -10184,7 +10284,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn ();
@@ -10203,35 +10303,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -10239,25 +10339,32 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10266,19 +10373,19 @@ void POA_CORBA::ValueDef::create_attribute_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   ::CORBA::AttributeDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var type;
-  CORBA::AttributeMode mode;
-
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var type;
+  ::CORBA::AttributeMode mode;
+  
   if (!(
       (_tao_in >> id.out ()) &&
       (_tao_in >> name.out ()) &&
@@ -10290,58 +10397,58 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       id.in (),
-
+      
       name.in (),
-
+      
       version.in (),
-
+      
       type.in (),
-
+      
       mode
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->create_attribute (
                   id.in (),
-
+                  
                   name.in (),
-
+                  
                   version.in (),
-
+                  
                   type.in (),
-
+                  
                   mode
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -10349,7 +10456,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
@@ -10368,35 +10475,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -10404,25 +10511,32 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -10431,22 +10545,22 @@ void POA_CORBA::ValueDef::create_operation_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueDef *> (
         _tao_servant
       );
   ::CORBA::OperationDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var result;
-  CORBA::OperationMode mode;
-  CORBA::ParDescriptionSeq params;
-  CORBA::ExceptionDefSeq exceptions;
-  CORBA::ContextIdSeq contexts;
-
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var result;
+  ::CORBA::OperationMode mode;
+  ::CORBA::ParDescriptionSeq params;
+  ::CORBA::ExceptionDefSeq exceptions;
+  ::CORBA::ContextIdSeq contexts;
+  
   if (!(
       (_tao_in >> id.out ()) &&
       (_tao_in >> name.out ()) &&
@@ -10461,70 +10575,70 @@ POA_CORBA::ValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueDef_create_operation _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       id.in (),
-
+      
       name.in (),
-
+      
       version.in (),
-
+      
       result.in (),
-
+      
       mode,
-
+      
       params,
-
+      
       exceptions,
-
+      
       contexts
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->create_operation (
                   id.in (),
-
+                  
                   name.in (),
-
+                  
                   version.in (),
-
+                  
                   result.in (),
-
+                  
                   mode,
-
+                  
                   params,
-
+                  
                   exceptions,
-
+                  
                   contexts
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -10532,7 +10646,7 @@ POA_CORBA::ValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
@@ -10551,35 +10665,35 @@ POA_CORBA::ValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -10587,52 +10701,59 @@ POA_CORBA::ValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:162
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ValueDef::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-
+  
   POA_CORBA::ValueDef *_tao_impl =
     (POA_CORBA::ValueDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-
+  
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -10640,7 +10761,7 @@ void POA_CORBA::ValueDef::_is_a_skel (
 }
 
 void POA_CORBA::ValueDef::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -10648,14 +10769,14 @@ void POA_CORBA::ValueDef::_non_existent_skel (
 {
   POA_CORBA::ValueDef *_tao_impl =
     (POA_CORBA::ValueDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -10663,7 +10784,7 @@ void POA_CORBA::ValueDef::_non_existent_skel (
 }
 
 void POA_CORBA::ValueDef::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -10673,30 +10794,30 @@ void POA_CORBA::ValueDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   POA_CORBA::ValueDef *_tao_impl =
     (POA_CORBA::ValueDef *) _tao_servant;
-
-  CORBA::InterfaceDef_ptr _tao_retval =
+  
+  CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-
+  
   _tao_adapter->dispose (_tao_retval);
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -10704,7 +10825,7 @@ void POA_CORBA::ValueDef::_interface_skel (
 }
 
 void POA_CORBA::ValueDef::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -10712,14 +10833,14 @@ void POA_CORBA::ValueDef::_component_skel (
 {
   POA_CORBA::ValueDef *_tao_impl =
     (POA_CORBA::ValueDef *) _tao_object_reference;
-
+  
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -10773,39 +10894,39 @@ void* POA_CORBA::ValueDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ValueDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ValueDef_ptr, this);
+      return static_cast<POA_CORBA::ValueDef_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
-
+  
   return 0;
 }
 
@@ -10815,7 +10936,7 @@ const char* POA_CORBA::ValueDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ValueDef::_dispatch (
     TAO_ServerRequest &req,
@@ -10830,17 +10951,17 @@ void POA_CORBA::ValueDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ValueDef *
 POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -10857,10 +10978,10 @@ POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-
+  
   typedef ::CORBA::ValueDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -10870,7 +10991,7 @@ POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -10883,7 +11004,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -11016,13 +11137,13 @@ TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed char lookup[] =
     {
-        -7,   -3,  -12,   -2,    4,    5,    6,  -14,   -2, -100,   10,   11,  -17,   -2,
-      -103,  -99,  -22,   -2,   16,  -98,  -24,   -2,  -26,   -2,   19,   20,  -28,   -2,
-        21,  -31,   -4, -106, -103,   -1,  -36,   -2, -105, -102,   30,   -1, -102,   35,
-       -99,   38,   39,   40,   -1,   -1,   41,   -1,   -1,   -1,   42,   -1,  -45,   -2,
-        43,   44,  -95,  -47,   -3,  -93,   50,   -1,   51,   52,   53,   54,   55,   -1,
-        56,   -1,   57,   58,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-        -1,   -1,   -1,   60,   -1,  -61,   -2,  -93,
+        -7,   -3,  -12,   -2,    4,    5,    6,  -14,   -2, -100,   10,   11,  -17,   -2, 
+      -103,  -99,  -22,   -2,   16,  -98,  -24,   -2,  -26,   -2,   19,   20,  -28,   -2, 
+        21,  -31,   -4, -106, -103,   -1,  -36,   -2, -105, -102,   30,   -1, -102,   35, 
+       -99,   38,   39,   40,   -1,   -1,   41,   -1,   -1,   -1,   42,   -1,  -45,   -2, 
+        43,   44,  -95,  -47,   -3,  -93,   50,   -1,   51,   52,   53,   54,   55,   -1, 
+        56,   -1,   57,   58,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+        -1,   -1,   -1,   60,   -1,  -61,   -2,  -93, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -11060,12 +11181,12 @@ TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 static TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable tao_CORBA_ExtValueDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get : public TAO_ServerRequestInfo
 {
@@ -11076,52 +11197,52 @@ public:
       POA_CORBA::ExtValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::ExtInitializerSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get (
       const TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get &
     );
-
+  
 private:
   POA_CORBA::ExtValueDef *_tao_impl;
-
+  
   ::CORBA::ExtInitializerSeq * _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get (
     TAO_ServerRequest &_tao_server_request,
@@ -11143,7 +11264,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -11157,11 +11278,11 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -11172,11 +11293,11 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= *this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -11200,7 +11321,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::result (::CORBA::ExtInitializerSeq * result)
 {
   // Update the result.
@@ -11208,7 +11329,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::result (::CORBA::E
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set : public TAO_ServerRequestInfo
 {
@@ -11217,59 +11338,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtValueDef *tao_impl,
-      const CORBA::ExtInitializerSeq & ext_initializers
+      const ::CORBA::ExtInitializerSeq & ext_initializers
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set (
       const TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set &
     );
-
+  
 private:
   POA_CORBA::ExtValueDef *_tao_impl;
-
-  const CORBA::ExtInitializerSeq & ext_initializers_;
+  
+  const ::CORBA::ExtInitializerSeq & ext_initializers_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set::TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtValueDef *tao_impl,
-    const CORBA::ExtInitializerSeq & ext_initializers
+    const ::CORBA::ExtInitializerSeq & ext_initializers
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -11287,15 +11408,15 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<=  this->ext_initializers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -11309,11 +11430,11 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -11324,7 +11445,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -11349,7 +11470,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set::target_is_a (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value : public TAO_ServerRequestInfo
 {
@@ -11360,52 +11481,52 @@ public:
       POA_CORBA::ExtValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::ExtValueDef::ExtFullValueDescription * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value (
       const TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value &
     );
-
+  
 private:
   POA_CORBA::ExtValueDef *_tao_impl;
-
+  
   ::CORBA::ExtValueDef::ExtFullValueDescription * _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value (
     TAO_ServerRequest &_tao_server_request,
@@ -11427,7 +11548,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -11441,11 +11562,11 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -11456,11 +11577,11 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= *this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -11484,7 +11605,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::result (::CORBA::ExtValueDef::ExtFullValueDescription * result)
 {
   // Update the result.
@@ -11492,7 +11613,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::result (::CORBA::Ext
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute : public TAO_ServerRequestInfo
 {
@@ -11504,65 +11625,65 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
-      CORBA::AttributeMode & mode,
-      const CORBA::ExceptionDefSeq & get_exceptions,
-      const CORBA::ExceptionDefSeq & set_exceptions
+      ::CORBA::IDLType_ptr type,
+      ::CORBA::AttributeMode & mode,
+      const ::CORBA::ExceptionDefSeq & get_exceptions,
+      const ::CORBA::ExceptionDefSeq & set_exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::ExtAttributeDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute (
       const TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute &
     );
-
+  
 private:
   POA_CORBA::ExtValueDef *_tao_impl;
-
+  
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
-  const CORBA::AttributeMode & mode_;
-  const CORBA::ExceptionDefSeq & get_exceptions_;
-  const CORBA::ExceptionDefSeq & set_exceptions_;
+  ::CORBA::IDLType_ptr type_;
+  const ::CORBA::AttributeMode & mode_;
+  const ::CORBA::ExceptionDefSeq & get_exceptions_;
+  const ::CORBA::ExceptionDefSeq & set_exceptions_;
   ::CORBA::ExtAttributeDef_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute (
     TAO_ServerRequest &_tao_server_request,
@@ -11571,10 +11692,10 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::TAO_ServerRequestI
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
+    ::CORBA::IDLType_ptr type,
+    ::CORBA::AttributeMode & mode,
+    const ::CORBA::ExceptionDefSeq & get_exceptions,
+    const ::CORBA::ExceptionDefSeq & set_exceptions
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -11598,39 +11719,39 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (7);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->get_exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->set_exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -11644,11 +11765,11 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -11659,11 +11780,11 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -11687,7 +11808,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (::CORBA::ExtAttributeDef_ptr result)
 {
   // Update the result.
@@ -11701,7 +11822,7 @@ TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (::CORBA::E
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker *
@@ -11709,7 +11830,7 @@ POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker::the_TAO_ExtValueDef_Strate
 {
   static POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -11731,7 +11852,7 @@ POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
@@ -11751,10 +11872,10 @@ POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker::dispatch (
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-
+  
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-
+  
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -11764,29 +11885,29 @@ POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker::dispatch (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-
+  
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-
+  
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
-
+  
   ACE_TRY
     {
       collocated_skel (servant,
@@ -11818,7 +11939,7 @@ POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -11830,17 +11951,17 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
 static int
 CORBA__TAO_ExtValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -11851,30 +11972,30 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_TAO_ExtValueDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_ext_initializers (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExtInitializerSeq>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ExtValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ExtInitializerSeq>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ExtValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ExtValueDef:1.0"
           )
@@ -11884,49 +12005,49 @@ POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_ext_initializers (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_ext_initializers (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ExtValueDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ExtValueDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ExtValueDef:1.0"
         )
     )->ext_initializers (
-        ((TAO::Arg_Traits<CORBA::ExtInitializerSeq>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::describe_ext_value (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ExtValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ExtValueDef::ExtFullValueDescription>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ExtValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ExtValueDef:1.0"
           )
@@ -11936,34 +12057,34 @@ POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::describe_ext_value (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_ext_attribute (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::ExtAttributeDef>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ExtValueDef_ptr,
+  ((TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ExtValueDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ExtValueDef:1.0"
           )
       )->create_ext_attribute (
-          ((TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits<CORBA::Identifier>::in_arg_val *) args[2])->arg (),
-          ((TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
-          ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[4])->arg (),
-          ((TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val *) args[5])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val *) args[6])->arg (),
-          ((TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val *) args[7])->arg ()
+          ((TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< CORBA::Identifier>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val *) args[3])->arg (),
+          ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[4])->arg (),
+          ((TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val *) args[5])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val *) args[6])->arg (),
+          ((TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val *) args[7])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -11973,8 +12094,8 @@ POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_ext_attribute (
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:97
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ExtValueDef::ExtValueDef (void)
 {
@@ -11996,8 +12117,8 @@ POA_CORBA::ExtValueDef::~ExtValueDef (void)
 {
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12007,44 +12128,44 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
   )
 {
   POA_CORBA::ExtValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExtValueDef *,
+    static_cast<
+        POA_CORBA::ExtValueDef *> (
         _tao_servant
       );
   ::CORBA::ExtInitializerSeq_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->ext_initializers (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -12052,7 +12173,7 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::ExtInitializerSeq * _tao_retval_info = _tao_retval._retn ();
@@ -12071,35 +12192,35 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -12107,25 +12228,32 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12134,16 +12262,16 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ExtValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExtValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ExtValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ExtValueDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::ExtInitializerSeq ext_initializers;
-
+  
+  ::CORBA::ExtInitializerSeq ext_initializers;
+  
   if (!(
       (_tao_in >> ext_initializers)
       ))
@@ -12151,41 +12279,41 @@ POA_CORBA::ExtValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       ext_initializers
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->ext_initializers (
                   ext_initializers
                   ACE_ENV_ARG_PARAMETER
@@ -12194,7 +12322,7 @@ POA_CORBA::ExtValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -12210,35 +12338,35 @@ POA_CORBA::ExtValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -12246,15 +12374,15 @@ POA_CORBA::ExtValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExtValueDef::describe_ext_value_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12264,44 +12392,44 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
   )
 {
   POA_CORBA::ExtValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExtValueDef *,
+    static_cast<
+        POA_CORBA::ExtValueDef *> (
         _tao_servant
       );
   ::CORBA::ExtValueDef::ExtFullValueDescription_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->describe_ext_value (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -12309,7 +12437,7 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::ExtValueDef::ExtFullValueDescription * _tao_retval_info = _tao_retval._retn ();
@@ -12328,35 +12456,35 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -12364,25 +12492,32 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -12391,21 +12526,21 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ExtValueDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ExtValueDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ExtValueDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ExtValueDef *> (
         _tao_servant
       );
   ::CORBA::ExtAttributeDef_var _tao_retval;
-  CORBA::String_var id;
-  CORBA::String_var name;
-  CORBA::String_var version;
-  CORBA::IDLType_var type;
-  CORBA::AttributeMode mode;
-  CORBA::ExceptionDefSeq get_exceptions;
-  CORBA::ExceptionDefSeq set_exceptions;
-
+  ::CORBA::String_var id;
+  ::CORBA::String_var name;
+  ::CORBA::String_var version;
+  ::CORBA::IDLType_var type;
+  ::CORBA::AttributeMode mode;
+  ::CORBA::ExceptionDefSeq get_exceptions;
+  ::CORBA::ExceptionDefSeq set_exceptions;
+  
   if (!(
       (_tao_in >> id.out ()) &&
       (_tao_in >> name.out ()) &&
@@ -12419,66 +12554,66 @@ POA_CORBA::ExtValueDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       id.in (),
-
+      
       name.in (),
-
+      
       version.in (),
-
+      
       type.in (),
-
+      
       mode,
-
+      
       get_exceptions,
-
+      
       set_exceptions
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->create_ext_attribute (
                   id.in (),
-
+                  
                   name.in (),
-
+                  
                   version.in (),
-
+                  
                   type.in (),
-
+                  
                   mode,
-
+                  
                   get_exceptions,
-
+                  
                   set_exceptions
                   ACE_ENV_ARG_PARAMETER
                 );
@@ -12486,7 +12621,7 @@ POA_CORBA::ExtValueDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::ExtAttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
@@ -12505,35 +12640,35 @@ POA_CORBA::ExtValueDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -12541,52 +12676,59 @@ POA_CORBA::ExtValueDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:162
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ExtValueDef::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-
+  
   POA_CORBA::ExtValueDef *_tao_impl =
     (POA_CORBA::ExtValueDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-
+  
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -12594,7 +12736,7 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
 }
 
 void POA_CORBA::ExtValueDef::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -12602,14 +12744,14 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
 {
   POA_CORBA::ExtValueDef *_tao_impl =
     (POA_CORBA::ExtValueDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -12617,7 +12759,7 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
 }
 
 void POA_CORBA::ExtValueDef::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -12627,30 +12769,30 @@ void POA_CORBA::ExtValueDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   POA_CORBA::ExtValueDef *_tao_impl =
     (POA_CORBA::ExtValueDef *) _tao_servant;
-
-  CORBA::InterfaceDef_ptr _tao_retval =
+  
+  CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-
+  
   _tao_adapter->dispose (_tao_retval);
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -12658,7 +12800,7 @@ void POA_CORBA::ExtValueDef::_interface_skel (
 }
 
 void POA_CORBA::ExtValueDef::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -12666,14 +12808,14 @@ void POA_CORBA::ExtValueDef::_component_skel (
 {
   POA_CORBA::ExtValueDef *_tao_impl =
     (POA_CORBA::ExtValueDef *) _tao_object_reference;
-
+  
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -12731,45 +12873,45 @@ void* POA_CORBA::ExtValueDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Container:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Container_ptr, this);
+      return static_cast<POA_CORBA::Container_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ValueDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ValueDef_ptr, this);
+      return static_cast<POA_CORBA::ValueDef_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ExtValueDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ExtValueDef_ptr, this);
+      return static_cast<POA_CORBA::ExtValueDef_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
-
+  
   return 0;
 }
 
@@ -12779,7 +12921,7 @@ const char* POA_CORBA::ExtValueDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ExtValueDef::_dispatch (
     TAO_ServerRequest &req,
@@ -12794,17 +12936,17 @@ void POA_CORBA::ExtValueDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ExtValueDef *
 POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -12821,10 +12963,10 @@ POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-
+  
   typedef ::CORBA::ExtValueDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -12834,7 +12976,7 @@ POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1461
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -12847,7 +12989,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /project/tangotmp/bala/work/ACE+TAO/final_merge/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -12941,9 +13083,9 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed char lookup[] =
     {
-      -13,  -2, -20,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15,
-       -1,  16,  -1,  17,  18,  -1,  19,  -1, -56,  22,  -9,  -3,  -6,  -2,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23,
+      -13,  -2, -20,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
+       -1,  16,  -1,  17,  18,  -1,  19,  -1, -56,  22,  -9,  -3,  -6,  -2, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12981,12 +13123,12 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 static TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable tao_CORBA_ValueBoxDef_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_ss.cpp:53
+// be\be_visitor_interface/interceptors_ss.cpp:53
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get : public TAO_ServerRequestInfo
 {
@@ -12997,52 +13139,52 @@ public:
       POA_CORBA::ValueBoxDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (::CORBA::IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
       const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get &
     );
-
+  
 private:
   POA_CORBA::ValueBoxDef *_tao_impl;
-
+  
   ::CORBA::IDLType_ptr _result;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
@@ -13064,7 +13206,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -13078,11 +13220,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -13093,11 +13235,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -13121,7 +13263,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (::CORBA::IDLType_ptr result)
 {
   // Update the result.
@@ -13129,7 +13271,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (::CORBA::
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:74
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set : public TAO_ServerRequestInfo
 {
@@ -13138,59 +13280,59 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueBoxDef *tao_impl,
-      CORBA::IDLType_ptr original_type_def
+      ::CORBA::IDLType_ptr original_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
       const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set &
     );
-
+  
 private:
   POA_CORBA::ValueBoxDef *_tao_impl;
-
-  CORBA::IDLType_ptr original_type_def_;
+  
+  ::CORBA::IDLType_ptr original_type_def_;
 };
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_ss.cpp:438
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueBoxDef *tao_impl,
-    CORBA::IDLType_ptr original_type_def
+    ::CORBA::IDLType_ptr original_type_def
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -13208,15 +13350,15 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<=  this->original_type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -13230,11 +13372,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -13245,7 +13387,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -13276,7 +13418,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_is_a (
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker *
@@ -13284,7 +13426,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_ValueBoxDef_Strate
 {
   static POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -13306,7 +13448,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
@@ -13326,10 +13468,10 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::dispatch (
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-
+  
   TAO_Collocated_Skeleton collocated_skel;
   TAO_Abstract_ServantBase *servant = 0;
-
+  
   if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
     {
       servant_upcall.prepare_for_upcall (
@@ -13339,29 +13481,29 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::dispatch (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant_upcall.pre_invoke_collocated_request (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
       ACE_CHECK;
-
+      
       servant = servant_upcall.servant ();
     }
   else
     {
       servant = obj->_servant ();
     }
-
+  
   int status = servant->_find (op,
                                collocated_skel,
                                strategy,
                                op_len);
-
+  
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
-
+  
   ACE_TRY
     {
       collocated_skel (servant,
@@ -13393,7 +13535,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:609
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -13405,17 +13547,17 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
 static int
 CORBA__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer
         )
     );
@@ -13426,30 +13568,30 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_original_type_def (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::IDLType>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::ValueBoxDef_ptr,
+  ((TAO::Arg_Traits< CORBA::IDLType>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::ValueBoxDef_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/ValueBoxDef:1.0"
           )
@@ -13459,27 +13601,27 @@ POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_original_type_def (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_set_original_type_def (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ValueBoxDef_ptr,
+  reinterpret_cast<
+      POA_CORBA::ValueBoxDef_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
-        ((TAO::Arg_Traits<CORBA::IDLType>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::IDLType>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -13489,8 +13631,8 @@ POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_set_original_type_def (
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:97
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::ValueBoxDef::ValueBoxDef (void)
 {
@@ -13511,8 +13653,8 @@ POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
 {
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13522,44 +13664,44 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
   )
 {
   POA_CORBA::ValueBoxDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueBoxDef *,
+    static_cast<
+        POA_CORBA::ValueBoxDef *> (
         _tao_servant
       );
   ::CORBA::IDLType_var _tao_retval;
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
               _tao_impl->original_type_def (
                   ACE_ENV_SINGLE_ARG_PARAMETER
                 );
@@ -13567,7 +13709,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
@@ -13586,35 +13728,35 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -13622,25 +13764,32 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
-  if (!(
-      (_tao_out << _tao_retval.in ())
-      ))
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
-
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_ss.cpp:98
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -13649,16 +13798,16 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ValueBoxDef *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ValueBoxDef *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ValueBoxDef *_tao_impl =
+    static_cast<
+        POA_CORBA::ValueBoxDef *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
-  CORBA::IDLType_var original_type_def;
-
+  
+  ::CORBA::IDLType_var original_type_def;
+  
   if (!(
       (_tao_in >> original_type_def.out ())
       ))
@@ -13666,41 +13815,41 @@ POA_CORBA::ValueBoxDef *_tao_impl =
       TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-
+  
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
         _tao_servant_upcall
       );
-
+    
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       original_type_def.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                             true  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
               _tao_impl->original_type_def (
                   original_type_def.in ()
                   ACE_ENV_ARG_PARAMETER
@@ -13709,7 +13858,7 @@ POA_CORBA::ValueBoxDef *_tao_impl =
 #if (TAO_HAS_INTERCEPTORS == 1)
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -13725,35 +13874,35 @@ POA_CORBA::ValueBoxDef *_tao_impl =
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
   && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
@@ -13761,42 +13910,42 @@ POA_CORBA::ValueBoxDef *_tao_impl =
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:162
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::ValueBoxDef::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-
+  
   POA_CORBA::ValueBoxDef *_tao_impl =
     (POA_CORBA::ValueBoxDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-
+  
   if (!(_tao_in >> value.out ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
     }
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -13804,7 +13953,7 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
 }
 
 void POA_CORBA::ValueBoxDef::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -13812,14 +13961,14 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
 {
   POA_CORBA::ValueBoxDef *_tao_impl =
     (POA_CORBA::ValueBoxDef *) _tao_servant;
-
+  
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -13827,7 +13976,7 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
 }
 
 void POA_CORBA::ValueBoxDef::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -13837,30 +13986,30 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   POA_CORBA::ValueBoxDef *_tao_impl =
     (POA_CORBA::ValueBoxDef *) _tao_servant;
-
-  CORBA::InterfaceDef_ptr _tao_retval =
+  
+  CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   CORBA::Boolean _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-
+  
   _tao_adapter->dispose (_tao_retval);
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -13868,7 +14017,7 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
 }
 
 void POA_CORBA::ValueBoxDef::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -13876,14 +14025,14 @@ void POA_CORBA::ValueBoxDef::_component_skel (
 {
   POA_CORBA::ValueBoxDef *_tao_impl =
     (POA_CORBA::ValueBoxDef *) _tao_object_reference;
-
+  
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << _tao_retval.in ()))
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -13937,39 +14086,39 @@ void* POA_CORBA::ValueBoxDef::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+      return static_cast<POA_CORBA::IRObject_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Contained:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Contained_ptr, this);
+      return static_cast<POA_CORBA::Contained_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
+      return static_cast<POA_CORBA::IDLType_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
+      return static_cast<POA_CORBA::TypedefDef_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ValueBoxDef:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ValueBoxDef_ptr, this);
+      return static_cast<POA_CORBA::ValueBoxDef_ptr> (this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
-
+  
   return 0;
 }
 
@@ -13979,7 +14128,7 @@ const char* POA_CORBA::ValueBoxDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:545
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::ValueBoxDef::_dispatch (
     TAO_ServerRequest &req,
@@ -13994,17 +14143,17 @@ void POA_CORBA::ValueBoxDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:493
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::ValueBoxDef *
 POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -14021,10 +14170,10 @@ POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-
+  
   typedef ::CORBA::ValueBoxDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -14034,12 +14183,7 @@ POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1739
-
-#if 0
-/* Useful at a later date.
-At present will be commented out */
-
+// be\be_visitor_root/root.cpp:1683
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -14517,45 +14661,21 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::InterfaceDefSeq, \
-        CORBA::InterfaceDefSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::InterfaceDefSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::InitializerSeq, \
-        CORBA::InitializerSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::InitializerSeq \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ValueDef_ptr, \
-        CORBA::ValueDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::ValueDef_ptr \
       >
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ValueDefSeq, \
-        CORBA::ValueDefSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::ValueDefSeq \
       >
@@ -14589,40 +14709,16 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ValueDef::FullValueDescription, \
-        CORBA::ValueDef::FullValueDescription_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ValueMemberDef_ptr, \
-        CORBA::ValueMemberDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Object_SArgument_T< \
         CORBA::IDLType_ptr \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::AttributeDef_ptr, \
-        CORBA::AttributeDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Basic_SArgument_T< \
         CORBA::AttributeMode \
       >
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::OperationDef_ptr, \
-        CORBA::OperationDef_var \
-      >
-
-# pragma instantiate \
     TAO::In_Basic_SArgument_T< \
         CORBA::OperationMode \
       >
@@ -14657,18 +14753,6 @@ At present will be commented out */
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ExtInitializerSeq, \
-        CORBA::ExtInitializerSeq_var \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_SArgument_T< \
         CORBA::ExtInitializerSeq \
       >
@@ -14701,18 +14785,6 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Var_Size_SArgument_T< \
-        CORBA::ExtValueDef::ExtFullValueDescription, \
-        CORBA::ExtValueDef::ExtFullValueDescription_var \
-      >
-
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::ExtAttributeDef_ptr, \
-        CORBA::ExtAttributeDef_var \
-      >
-
 #if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
 #define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
 
@@ -14829,14 +14901,7 @@ At present will be commented out */
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Ret_Object_SArgument_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /*if 0*/
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
index 8f815d1960a..2672e99b595 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:390
+// be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_H_
-#define _TAO_IDL_ORIG_IFR_EXTENDEDS_H_
+#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_H_
+#define _TAO_IDL_SERVER_IFR_EXTENDEDS_H_
 
 #include /**/ "ace/pre.h"
 
@@ -45,9 +45,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -56,14 +54,14 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
   
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class FixedDef;
   typedef FixedDef *FixedDef_ptr;
@@ -136,7 +134,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::UShort digits (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -153,10 +151,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void digits (
-        CORBA::UShort digits
+        ::CORBA::UShort digits
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -171,7 +169,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::Short scale (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -188,10 +186,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void scale (
-        CORBA::Short scale
+        ::CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -203,7 +201,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -212,7 +212,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -220,7 +220,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -234,7 +236,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_FixedDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -278,7 +280,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_FixedDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
@@ -289,7 +291,7 @@ namespace POA_CORBA
     virtual ~_TAO_FixedDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_digits (
@@ -303,7 +305,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_digits (
@@ -317,7 +319,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_scale (
@@ -331,7 +333,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_scale (
@@ -354,7 +356,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -382,7 +384,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ValueMemberDef;
   typedef ValueMemberDef *ValueMemberDef_ptr;
@@ -455,7 +457,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -472,7 +474,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -489,10 +491,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -507,7 +509,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::Visibility access (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -524,10 +526,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void access (
-        CORBA::Visibility access
+        ::CORBA::Visibility access
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -539,7 +541,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -548,7 +552,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -556,7 +560,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -570,7 +576,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -584,7 +592,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -598,19 +608,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -619,7 +635,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -630,7 +646,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -646,7 +662,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_ValueMemberDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -690,7 +706,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_ValueMemberDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
@@ -701,7 +717,7 @@ namespace POA_CORBA
     virtual ~_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_type (
@@ -715,7 +731,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_type_def (
@@ -729,7 +745,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_type_def (
@@ -743,7 +759,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_access (
@@ -757,7 +773,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_access (
@@ -780,7 +796,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -881,7 +897,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -895,7 +911,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -914,7 +930,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ValueDef;
   typedef ValueDef *ValueDef_ptr;
@@ -989,7 +1005,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1006,10 +1022,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void supported_interfaces (
-        const CORBA::InterfaceDefSeq & supported_interfaces
+        const ::CORBA::InterfaceDefSeq & supported_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1024,7 +1040,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::InitializerSeq * initializers (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1041,10 +1057,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void initializers (
-        const CORBA::InitializerSeq & initializers
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1059,7 +1075,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ValueDef_ptr base_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1076,10 +1092,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void base_value (
-        CORBA::ValueDef_ptr base_value
+        ::CORBA::ValueDef_ptr base_value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1094,7 +1110,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ValueDefSeq * abstract_base_values (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1111,10 +1127,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void abstract_base_values (
-        const CORBA::ValueDefSeq & abstract_base_values
+        const ::CORBA::ValueDefSeq & abstract_base_values
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1129,7 +1145,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::Boolean is_abstract (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1146,10 +1162,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void is_abstract (
-        CORBA::Boolean is_abstract
+        ::CORBA::Boolean is_abstract
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1164,7 +1180,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::Boolean is_custom (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1181,10 +1197,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void is_custom (
-        CORBA::Boolean is_custom
+        ::CORBA::Boolean is_custom
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1199,7 +1215,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::Boolean is_truncatable (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1216,10 +1232,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void is_truncatable (
-        CORBA::Boolean is_truncatable
+        ::CORBA::Boolean is_truncatable
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1234,7 +1250,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::Boolean is_a (
         const char * id
@@ -1252,7 +1268,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ValueDef::FullValueDescription * describe_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1269,14 +1285,14 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ValueMemberDef_ptr create_value_member (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::Visibility access
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::Visibility access
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1291,14 +1307,14 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1313,17 +1329,17 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1335,7 +1351,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1344,7 +1362,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -1355,7 +1373,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_skel (
@@ -1366,7 +1384,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     contents_skel (
@@ -1377,7 +1395,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_name_skel (
@@ -1388,7 +1406,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_contents_skel (
@@ -1399,7 +1417,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_module_skel (
@@ -1410,7 +1428,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_constant_skel (
@@ -1421,7 +1439,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_struct_skel (
@@ -1432,7 +1450,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_union_skel (
@@ -1443,7 +1461,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_enum_skel (
@@ -1454,7 +1472,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_alias_skel (
@@ -1465,7 +1483,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_interface_skel (
@@ -1476,7 +1494,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_skel (
@@ -1487,7 +1505,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_box_skel (
@@ -1498,7 +1516,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_exception_skel (
@@ -1509,7 +1527,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_native_skel (
@@ -1520,7 +1538,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_abstract_interface_skel (
@@ -1531,7 +1549,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_local_interface_skel (
@@ -1542,7 +1560,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_ext_value_skel (
@@ -1550,7 +1568,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1564,7 +1584,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1578,7 +1600,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1592,19 +1616,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1613,7 +1643,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -1624,7 +1654,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -1632,7 +1662,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -1646,7 +1678,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_ValueDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -1690,7 +1722,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_ValueDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl,
@@ -1703,7 +1735,7 @@ namespace POA_CORBA
     virtual ~_TAO_ValueDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_supported_interfaces (
@@ -1717,7 +1749,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_supported_interfaces (
@@ -1731,7 +1763,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_initializers (
@@ -1745,7 +1777,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_initializers (
@@ -1759,7 +1791,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_base_value (
@@ -1773,7 +1805,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_base_value (
@@ -1787,7 +1819,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_abstract_base_values (
@@ -1801,7 +1833,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_abstract_base_values (
@@ -1815,7 +1847,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_is_abstract (
@@ -1829,7 +1861,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_is_abstract (
@@ -1843,7 +1875,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_is_custom (
@@ -1857,7 +1889,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_is_custom (
@@ -1871,7 +1903,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_is_truncatable (
@@ -1885,7 +1917,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_is_truncatable (
@@ -1899,7 +1931,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     is_a (
@@ -1913,7 +1945,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     describe_value (
@@ -1927,7 +1959,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_value_member (
@@ -1941,7 +1973,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_attribute (
@@ -1955,7 +1987,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_operation (
@@ -1978,7 +2010,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -1992,7 +2024,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup (
@@ -2006,7 +2038,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     contents (
@@ -2020,7 +2052,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup_name (
@@ -2034,7 +2066,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe_contents (
@@ -2048,7 +2080,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_module (
@@ -2062,7 +2094,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_constant (
@@ -2076,7 +2108,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_struct (
@@ -2090,7 +2122,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_union (
@@ -2104,7 +2136,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_enum (
@@ -2118,7 +2150,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_alias (
@@ -2132,7 +2164,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_interface (
@@ -2146,7 +2178,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value (
@@ -2160,7 +2192,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value_box (
@@ -2174,7 +2206,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_exception (
@@ -2188,7 +2220,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_native (
@@ -2202,7 +2234,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_abstract_interface (
@@ -2216,7 +2248,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_local_interface (
@@ -2230,7 +2262,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_ext_value (
@@ -2331,7 +2363,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -2345,7 +2377,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -2373,7 +2405,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ExtValueDef;
   typedef ExtValueDef *ExtValueDef_ptr;
@@ -2446,7 +2478,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ExtInitializerSeq * ext_initializers (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2463,10 +2495,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void ext_initializers (
-        const CORBA::ExtInitializerSeq & ext_initializers
+        const ::CORBA::ExtInitializerSeq & ext_initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2481,7 +2513,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2498,16 +2530,16 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        const CORBA::ExceptionDefSeq & get_exceptions,
-        const CORBA::ExceptionDefSeq & set_exceptions
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode,
+        const ::CORBA::ExceptionDefSeq & get_exceptions,
+        const ::CORBA::ExceptionDefSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2519,7 +2551,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2528,7 +2562,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -2539,7 +2573,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_skel (
@@ -2550,7 +2584,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     contents_skel (
@@ -2561,7 +2595,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     lookup_name_skel (
@@ -2572,7 +2606,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_contents_skel (
@@ -2583,7 +2617,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_module_skel (
@@ -2594,7 +2628,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_constant_skel (
@@ -2605,7 +2639,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_struct_skel (
@@ -2616,7 +2650,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_union_skel (
@@ -2627,7 +2661,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_enum_skel (
@@ -2638,7 +2672,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_alias_skel (
@@ -2649,7 +2683,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_interface_skel (
@@ -2660,7 +2694,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_skel (
@@ -2671,7 +2705,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_box_skel (
@@ -2682,7 +2716,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_exception_skel (
@@ -2693,7 +2727,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_native_skel (
@@ -2704,7 +2738,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_abstract_interface_skel (
@@ -2715,7 +2749,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_local_interface_skel (
@@ -2726,7 +2760,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_ext_value_skel (
@@ -2734,7 +2768,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2748,7 +2784,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2762,7 +2800,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2776,19 +2816,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2797,7 +2843,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -2808,7 +2854,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -2816,13 +2862,17 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_supported_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2836,7 +2886,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_initializers_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2850,7 +2902,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_base_value_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2864,7 +2918,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_abstract_base_values_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2878,7 +2934,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_is_abstract_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2892,7 +2950,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_is_custom_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2906,7 +2966,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_is_truncatable_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -2923,7 +2985,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     is_a_skel (
@@ -2934,7 +2996,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_value_skel (
@@ -2945,7 +3007,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_value_member_skel (
@@ -2956,7 +3018,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_attribute_skel (
@@ -2967,7 +3029,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     create_operation_skel (
@@ -2983,7 +3045,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_ExtValueDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -3027,7 +3089,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_ExtValueDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl
@@ -3038,7 +3100,7 @@ namespace POA_CORBA
     virtual ~_TAO_ExtValueDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_ext_initializers (
@@ -3052,7 +3114,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_ext_initializers (
@@ -3066,7 +3128,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     describe_ext_value (
@@ -3080,7 +3142,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     create_ext_attribute (
@@ -3103,7 +3165,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -3117,7 +3179,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup (
@@ -3131,7 +3193,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     contents (
@@ -3145,7 +3207,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     lookup_name (
@@ -3159,7 +3221,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe_contents (
@@ -3173,7 +3235,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_module (
@@ -3187,7 +3249,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_constant (
@@ -3201,7 +3263,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_struct (
@@ -3215,7 +3277,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_union (
@@ -3229,7 +3291,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_enum (
@@ -3243,7 +3305,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_alias (
@@ -3257,7 +3319,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_interface (
@@ -3271,7 +3333,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value (
@@ -3285,7 +3347,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value_box (
@@ -3299,7 +3361,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_exception (
@@ -3313,7 +3375,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_native (
@@ -3327,7 +3389,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_abstract_interface (
@@ -3341,7 +3403,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_local_interface (
@@ -3355,7 +3417,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_ext_value (
@@ -3456,7 +3518,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -3470,7 +3532,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -3633,7 +3695,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     is_a (
@@ -3647,7 +3709,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe_value (
@@ -3661,7 +3723,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_value_member (
@@ -3675,7 +3737,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_attribute (
@@ -3689,7 +3751,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     create_operation (
@@ -3708,7 +3770,7 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ValueBoxDef;
   typedef ValueBoxDef *ValueBoxDef_ptr;
@@ -3781,7 +3843,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::IDLType_ptr original_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3798,10 +3860,10 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void original_type_def (
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3813,7 +3875,9 @@ namespace POA_CORBA
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
-      );static void
+      );
+    
+    static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3822,7 +3886,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -3830,7 +3894,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3844,7 +3910,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3858,7 +3926,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3872,19 +3942,25 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3893,7 +3969,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     describe_skel (
@@ -3904,7 +3980,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1951
+    // be\be_interface.cpp:2026
     
     static void
     move_skel (
@@ -3912,7 +3988,9 @@ namespace POA_CORBA
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );static void
+      );
+    
+    static void
     _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
@@ -3926,7 +4004,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class  _TAO_ValueBoxDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -3970,7 +4048,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class  _TAO_ValueBoxDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl
@@ -3981,7 +4059,7 @@ namespace POA_CORBA
     virtual ~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_original_type_def (
@@ -3995,7 +4073,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _set_original_type_def (
@@ -4018,7 +4096,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -4119,7 +4197,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     describe (
@@ -4133,7 +4211,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:2132
+    // be\be_interface.cpp:2214
     
     static void
     move (
@@ -4161,20 +4239,20 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:946
+// be\be_codegen.cpp:997
 
 #include "IFR_ExtendedS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "IFR_ExtendedS.i"
+#include "IFR_ExtendedS.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -4184,3 +4262,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.i b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.i
deleted file mode 100644
index e975c1cbc70..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.i
+++ /dev/null
@@ -1,4515 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-ACE_INLINE void POA_CORBA::FixedDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::FixedDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::FixedDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::FixedDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::FixedDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::FixedDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ValueMemberDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueMemberDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueMemberDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ValueMemberDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueMemberDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ValueMemberDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueMemberDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ValueMemberDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueMemberDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueMemberDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueMemberDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueMemberDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueMemberDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ValueDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ValueDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ValueDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ValueDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ExtValueDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::lookup_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::lookup_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::describe_contents_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_module_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_constant_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_struct_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_union_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_enum_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_alias_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_value_box_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_exception_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_native_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_abstract_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_local_interface_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_ext_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Container::create_ext_value_skel (
-      req,
-      (POA_CORBA::Container_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_supported_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_supported_interfaces_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_supported_interfaces_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_supported_interfaces_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_initializers_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_initializers_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_initializers_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_initializers_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_base_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_base_value_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_base_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_base_value_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_abstract_base_values_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_abstract_base_values_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_abstract_base_values_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_abstract_base_values_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_is_abstract_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_is_abstract_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_is_abstract_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_is_abstract_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_is_custom_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_is_custom_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_is_custom_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_is_custom_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ExtValueDef::_get_is_truncatable_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_get_is_truncatable_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ExtValueDef::_set_is_truncatable_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::_set_is_truncatable_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::is_a_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::is_a_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::describe_value_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::describe_value_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_value_member_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::create_value_member_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_attribute_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::create_attribute_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ExtValueDef::create_operation_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::ValueDef_ptr impl = (POA_CORBA::ExtValueDef_ptr) obj;
-  POA_CORBA::ValueDef::create_operation_skel (
-      req,
-      (POA_CORBA::ValueDef_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::lookup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::lookup_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::describe_contents (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_module (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_constant (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_struct (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_union (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_enum (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_alias (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_value_box (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_exception (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_native (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_abstract_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_local_interface (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_ext_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_ext_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_supported_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_supported_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_supported_interfaces (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_supported_interfaces (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_initializers (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_initializers (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_initializers (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_initializers (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_base_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_base_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_base_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_base_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_abstract_base_values (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_abstract_base_values (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_abstract_base_values (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_abstract_base_values (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_is_abstract (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_abstract (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_is_abstract (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_is_abstract (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_is_custom (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_custom (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_is_custom (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_is_custom (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_get_is_truncatable (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_get_is_truncatable (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::_set_is_truncatable (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_set_is_truncatable (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::is_a (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_a (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::describe_value (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::describe_value (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_value_member (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_attribute (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ExtValueDef_ThruPOA_Proxy_Impl::create_operation (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-ACE_INLINE void POA_CORBA::ValueBoxDef::_get_def_kind_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueBoxDef::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
-      req,
-      (POA_CORBA::IRObject_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueBoxDef::_get_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ValueBoxDef::_set_id_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueBoxDef::_get_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ValueBoxDef::_set_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueBoxDef::_get_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-ACE_INLINE void POA_CORBA::ValueBoxDef::_set_version_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueBoxDef::_get_defined_in_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueBoxDef::_get_absolute_name_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueBoxDef::_get_containing_repository_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueBoxDef::describe_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1951
-
-ACE_INLINE void POA_CORBA::ValueBoxDef::move_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
-      req,
-      (POA_CORBA::Contained_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}ACE_INLINE void POA_CORBA::ValueBoxDef::_get_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
-      req,
-      (POA_CORBA::IDLType_ptr) impl,
-      context
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_def_kind (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_get_def_kind (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_set_id (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_id (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_set_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_set_version (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_set_version (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_defined_in (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_defined_in (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_absolute_name (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_absolute_name (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_containing_repository (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_get_containing_repository (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::describe (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::move (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1260
-
-ACE_INLINE void
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_get_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_get_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
index 39dcdb06752..4036f1695cf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:684
+// be\be_codegen.cpp:683
 
-#ifndef _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_EXTENDEDS_T_CPP_
-#define _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_EXTENDEDS_T_CPP_
+#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_T_CPP_
+#define _TAO_IDL_SERVER_IFR_EXTENDEDS_T_CPP_
 
 #include "IFR_ExtendedS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ExtendedS_T.i"
+#include "IFR_ExtendedS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
index 026fda53d20..a956b073838 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
@@ -26,30 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:545
+// be\be_codegen.cpp:546
 
-#ifndef _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_EXTENDEDS_T_H_
-#define _TAO_IDL_______ORBSVCS_ORBSVCS_IFRSERVICE_ORIG_IFR_EXTENDEDS_T_H_
+#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_T_H_
+#define _TAO_IDL_SERVER_IFR_EXTENDEDS_T_H_
 
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+// be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -89,7 +86,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -99,7 +96,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -109,7 +106,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -119,7 +116,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::UShort digits (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -129,10 +126,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void digits (
-        CORBA::UShort digits
+        ::CORBA::UShort digits
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -140,7 +137,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Short scale (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -150,10 +147,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void scale (
-        CORBA::Short scale
+        ::CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -171,7 +168,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -211,7 +208,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -221,7 +218,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -231,7 +228,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -241,7 +238,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -252,7 +249,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -262,7 +259,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -273,7 +270,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -283,7 +280,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -294,7 +291,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -304,7 +301,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -314,7 +311,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -324,7 +321,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -334,10 +331,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -347,7 +344,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -357,7 +354,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -367,10 +364,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -378,7 +375,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Visibility access (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -388,10 +385,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void access (
-        CORBA::Visibility access
+        ::CORBA::Visibility access
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -409,7 +406,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -449,7 +446,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -459,7 +456,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -469,7 +466,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -480,11 +477,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -492,13 +489,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -506,12 +503,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -519,7 +516,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -532,14 +529,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -547,13 +544,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -561,14 +558,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -576,13 +573,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -590,13 +587,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -604,13 +601,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -618,19 +615,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -638,13 +635,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -652,13 +649,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -666,7 +663,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -679,13 +676,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -693,13 +690,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -707,19 +704,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -727,7 +724,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -737,7 +734,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -748,7 +745,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -758,7 +755,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -769,7 +766,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -779,7 +776,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -790,7 +787,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -800,7 +797,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -810,7 +807,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -820,7 +817,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -830,10 +827,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -843,7 +840,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -853,7 +850,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDefSeq * supported_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -863,10 +860,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void supported_interfaces (
-        const CORBA::InterfaceDefSeq & supported_interfaces
+        const ::CORBA::InterfaceDefSeq & supported_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -874,7 +871,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InitializerSeq * initializers (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -884,10 +881,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void initializers (
-        const CORBA::InitializerSeq & initializers
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -895,7 +892,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr base_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -905,10 +902,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void base_value (
-        CORBA::ValueDef_ptr base_value
+        ::CORBA::ValueDef_ptr base_value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -916,7 +913,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDefSeq * abstract_base_values (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -926,10 +923,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void abstract_base_values (
-        const CORBA::ValueDefSeq & abstract_base_values
+        const ::CORBA::ValueDefSeq & abstract_base_values
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -937,7 +934,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_abstract (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -947,10 +944,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void is_abstract (
-        CORBA::Boolean is_abstract
+        ::CORBA::Boolean is_abstract
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -958,7 +955,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_custom (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -968,10 +965,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void is_custom (
-        CORBA::Boolean is_custom
+        ::CORBA::Boolean is_custom
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -979,7 +976,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_truncatable (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -989,10 +986,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void is_truncatable (
-        CORBA::Boolean is_truncatable
+        ::CORBA::Boolean is_truncatable
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1000,7 +997,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_a (
         const char * id
@@ -1011,7 +1008,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef::FullValueDescription * describe_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1021,14 +1018,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueMemberDef_ptr create_value_member (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::Visibility access
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::Visibility access
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1036,14 +1033,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1051,17 +1048,17 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1079,7 +1076,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -1119,7 +1116,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1129,7 +1126,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1139,7 +1136,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -1150,11 +1147,11 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1162,13 +1159,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1176,12 +1173,12 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1189,7 +1186,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -1202,14 +1199,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1217,13 +1214,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1231,14 +1228,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1246,13 +1243,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1260,13 +1257,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1274,13 +1271,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1288,19 +1285,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1308,13 +1305,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1322,13 +1319,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1336,7 +1333,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -1349,13 +1346,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1363,13 +1360,13 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1377,19 +1374,19 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1397,7 +1394,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1407,7 +1404,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -1418,7 +1415,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1428,7 +1425,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -1439,7 +1436,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1449,7 +1446,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -1460,7 +1457,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1470,7 +1467,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1480,7 +1477,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1490,7 +1487,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1500,10 +1497,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1513,7 +1510,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1523,7 +1520,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InterfaceDefSeq * supported_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1533,10 +1530,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void supported_interfaces (
-        const CORBA::InterfaceDefSeq & supported_interfaces
+        const ::CORBA::InterfaceDefSeq & supported_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1544,7 +1541,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::InitializerSeq * initializers (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1554,10 +1551,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void initializers (
-        const CORBA::InitializerSeq & initializers
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1565,7 +1562,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef_ptr base_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1575,10 +1572,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void base_value (
-        CORBA::ValueDef_ptr base_value
+        ::CORBA::ValueDef_ptr base_value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1586,7 +1583,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDefSeq * abstract_base_values (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1596,10 +1593,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void abstract_base_values (
-        const CORBA::ValueDefSeq & abstract_base_values
+        const ::CORBA::ValueDefSeq & abstract_base_values
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1607,7 +1604,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_abstract (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1617,10 +1614,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void is_abstract (
-        CORBA::Boolean is_abstract
+        ::CORBA::Boolean is_abstract
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1628,7 +1625,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_custom (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1638,10 +1635,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void is_custom (
-        CORBA::Boolean is_custom
+        ::CORBA::Boolean is_custom
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1649,7 +1646,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_truncatable (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1659,10 +1656,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void is_truncatable (
-        CORBA::Boolean is_truncatable
+        ::CORBA::Boolean is_truncatable
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1670,7 +1667,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::Boolean is_a (
         const char * id
@@ -1681,7 +1678,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueDef::FullValueDescription * describe_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1691,14 +1688,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ValueMemberDef_ptr create_value_member (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::Visibility access
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::Visibility access
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1706,14 +1703,14 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1721,17 +1718,17 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1739,7 +1736,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtInitializerSeq * ext_initializers (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1749,10 +1746,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void ext_initializers (
-        const CORBA::ExtInitializerSeq & ext_initializers
+        const ::CORBA::ExtInitializerSeq & ext_initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1760,7 +1757,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1770,16 +1767,16 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        const CORBA::ExceptionDefSeq & get_exceptions,
-        const CORBA::ExceptionDefSeq & set_exceptions
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode,
+        const ::CORBA::ExceptionDefSeq & get_exceptions,
+        const ::CORBA::ExceptionDefSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1797,7 +1794,7 @@ namespace POA_CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
+  // be\be_visitor_interface/tie_sh.cpp:87
   
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -1837,7 +1834,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1847,7 +1844,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1857,7 +1854,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1867,7 +1864,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void id (
         const char * id
@@ -1878,7 +1875,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1888,7 +1885,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void name (
         const char * name
@@ -1899,7 +1896,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1909,7 +1906,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void version (
         const char * version
@@ -1920,7 +1917,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1930,7 +1927,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1940,7 +1937,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1950,7 +1947,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1960,10 +1957,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1973,7 +1970,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1983,7 +1980,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::IDLType_ptr original_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1993,10 +1990,10 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
+    // be\be_visitor_operation/tie_sh.cpp:60
     
     void original_type_def (
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2013,13 +2010,12 @@ namespace POA_CORBA
     void operator= (const ValueBoxDef_tie &);
   };
 } // module CORBA
-#endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1043
+// be\be_codegen.cpp:1094
 
 #if defined (__ACE_INLINE__)
-#include "IFR_ExtendedS_T.i"
+#include "IFR_ExtendedS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
@@ -2030,9 +2026,10 @@ namespace POA_CORBA
 #pragma implementation ("IFR_ExtendedS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.i b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.i
deleted file mode 100644
index a5c8f18583c..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.i
+++ /dev/null
@@ -1,3355 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::FixedDef_tie<T>::FixedDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::FixedDef_tie<T>::FixedDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::FixedDef_tie<T>::FixedDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::FixedDef_tie<T>::FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::FixedDef_tie<T>::~FixedDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::FixedDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::FixedDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::FixedDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::FixedDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::FixedDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::FixedDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->FixedDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::FixedDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::FixedDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::FixedDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::UShort POA_CORBA::FixedDef_tie<T>::digits  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->digits (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::FixedDef_tie<T>::digits  (
-    CORBA::UShort digits
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->digits (
-    digits
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Short POA_CORBA::FixedDef_tie<T>::scale  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->scale (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::FixedDef_tie<T>::scale  (
-    CORBA::Short scale
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->scale (
-    scale
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueMemberDef_tie<T>::ValueMemberDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueMemberDef_tie<T>::ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueMemberDef_tie<T>::ValueMemberDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueMemberDef_tie<T>::ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueMemberDef_tie<T>::~ValueMemberDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ValueMemberDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ValueMemberDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ValueMemberDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueMemberDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ValueMemberDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ValueMemberDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueMemberDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueMemberDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueMemberDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ValueMemberDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ValueMemberDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ValueMemberDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ValueMemberDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::ValueMemberDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::type_def  (
-    CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->type_def (
-    type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Visibility POA_CORBA::ValueMemberDef_tie<T>::access  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->access (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::access  (
-    CORBA::Visibility access
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->access (
-    access
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueDef_tie<T>::ValueDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueDef_tie<T>::ValueDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueDef_tie<T>::ValueDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueDef_tie<T>::ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueDef_tie<T>::~ValueDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ValueDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ValueDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ValueDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ValueDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ValueDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ValueDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ValueDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ValueDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ValueDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ValueDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ValueDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ValueDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ValueDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ValueDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ValueDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ValueDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ValueDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ValueDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ValueDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ValueDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ValueDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ValueDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ValueDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ValueDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ValueDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ValueDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ValueDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ValueDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ValueDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
-    const CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->supported_interfaces (
-    supported_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InitializerSeq * POA_CORBA::ValueDef_tie<T>::initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::initializers  (
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->initializers (
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ValueDef_tie<T>::base_value  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::base_value  (
-    CORBA::ValueDef_ptr base_value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_value (
-    base_value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDefSeq * POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->abstract_base_values (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
-    const CORBA::ValueDefSeq & abstract_base_values
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->abstract_base_values (
-    abstract_base_values
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_abstract  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_abstract (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::is_abstract  (
-    CORBA::Boolean is_abstract
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_abstract (
-    is_abstract
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_custom  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_custom (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::is_custom  (
-    CORBA::Boolean is_custom
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_custom (
-    is_custom
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_truncatable  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_truncatable (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::is_truncatable  (
-    CORBA::Boolean is_truncatable
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_truncatable (
-    is_truncatable
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_a  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef::FullValueDescription * POA_CORBA::ValueDef_tie<T>::describe_value  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueMemberDef_ptr POA_CORBA::ValueDef_tie<T>::create_value_member  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::Visibility access
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_member (
-    id,
-    name,
-    version,
-    type,
-    access
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::ValueDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::ValueDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtValueDef_tie<T>::ExtValueDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtValueDef_tie<T>::ExtValueDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtValueDef_tie<T>::ExtValueDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtValueDef_tie<T>::ExtValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ExtValueDef_tie<T>::~ExtValueDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ExtValueDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtValueDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtValueDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ExtValueDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ExtValueDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtValueDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ExtValueDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ExtValueDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained_ptr POA_CORBA::ExtValueDef_tie<T>::lookup  (
-    const char * search_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup (
-    search_name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExtValueDef_tie<T>::contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->contents (
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ContainedSeq * POA_CORBA::ExtValueDef_tie<T>::lookup_name  (
-    const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->lookup_name (
-    search_name,
-    levels_to_search,
-    limit_type,
-    exclude_inherited
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container::DescriptionSeq * POA_CORBA::ExtValueDef_tie<T>::describe_contents  (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_contents (
-    limit_type,
-    exclude_inherited,
-    max_returned_objs
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ModuleDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_module  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_module (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ConstantDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_constant  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_constant (
-    id,
-    name,
-    version,
-    type,
-    value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::StructDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_struct  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_struct (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::UnionDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_union  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_union (
-    id,
-    name,
-    version,
-    discriminator_type,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::EnumDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_enum  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_enum (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AliasDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_alias  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_alias (
-    id,
-    name,
-    version,
-    original_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueBoxDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_value_box  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_box (
-    id,
-    name,
-    version,
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExceptionDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_exception  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_exception (
-    id,
-    name,
-    version,
-    members
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::NativeDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_native  (
-    const char * id,
-    const char * name,
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_native (
-    id,
-    name,
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AbstractInterfaceDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_abstract_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_abstract_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::LocalInterfaceDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_local_interface  (
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_local_interface (
-    id,
-    name,
-    version,
-    base_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_ext_value  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_value (
-    id,
-    name,
-    version,
-    is_custom,
-    is_abstract,
-    base_value,
-    is_truncatable,
-    abstract_base_values,
-    supported_interfaces,
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtValueDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtValueDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtValueDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ExtValueDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ExtValueDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ExtValueDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ExtValueDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ExtValueDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InterfaceDefSeq * POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
-    const CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->supported_interfaces (
-    supported_interfaces
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::InitializerSeq * POA_CORBA::ExtValueDef_tie<T>::initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::initializers  (
-    const CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->initializers (
-    initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef_ptr POA_CORBA::ExtValueDef_tie<T>::base_value  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->base_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::base_value  (
-    CORBA::ValueDef_ptr base_value
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->base_value (
-    base_value
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDefSeq * POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->abstract_base_values (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
-    const CORBA::ValueDefSeq & abstract_base_values
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->abstract_base_values (
-    abstract_base_values
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_abstract (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
-    CORBA::Boolean is_abstract
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_abstract (
-    is_abstract
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_custom  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_custom (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::is_custom  (
-    CORBA::Boolean is_custom
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_custom (
-    is_custom
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_truncatable (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
-    CORBA::Boolean is_truncatable
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->is_truncatable (
-    is_truncatable
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_a  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->is_a (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueDef::FullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_value  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ValueMemberDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_value_member  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::Visibility access
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_value_member (
-    id,
-    name,
-    version,
-    type,
-    access
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::AttributeDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::OperationDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_operation  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_operation (
-    id,
-    name,
-    version,
-    result,
-    mode,
-    params,
-    exceptions,
-    contexts
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtInitializerSeq * POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->ext_initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
-    const CORBA::ExtInitializerSeq & ext_initializers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->ext_initializers (
-    ext_initializers
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_ext_value  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe_ext_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::ExtAttributeDef_ptr POA_CORBA::ExtValueDef_tie<T>::create_ext_attribute  (
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->create_ext_attribute (
-    id,
-    name,
-    version,
-    type,
-    mode,
-    get_exceptions,
-    set_exceptions
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueBoxDef_tie<T>::ValueBoxDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueBoxDef_tie<T>::ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueBoxDef_tie<T>::ValueBoxDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueBoxDef_tie<T>::ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ValueBoxDef_tie<T>::~ValueBoxDef_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ValueBoxDef_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ValueBoxDef_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ValueBoxDef_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueBoxDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ValueBoxDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::DefinitionKind POA_CORBA::ValueBoxDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueBoxDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::id  (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->id (
-    id
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueBoxDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::name  (
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->name (
-    name
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueBoxDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::version  (
-    const char * version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->version (
-    version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Container_ptr POA_CORBA::ValueBoxDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Repository_ptr POA_CORBA::ValueBoxDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Contained::Description * POA_CORBA::ValueBoxDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->move (
-    new_container,
-    new_name,
-    new_version
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ValueBoxDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::IDLType_ptr POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->original_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
-    CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->original_type_def (
-    original_type_def
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index e5dffde6134..504f63da55f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -116,9 +116,11 @@ TAO_IFR_Server::init_with_orb (int argc,
           return retval;
         }
 
-      if (use_multicast_server || OPTIONS::instance()->support_multicast_discovery ())
+      if (use_multicast_server
+          || OPTIONS::instance()->support_multicast_discovery ())
         {
-          retval = this->init_multicast_server (ACE_ENV_SINGLE_ARG_PARAMETER);
+          retval =
+            this->init_multicast_server (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (retval != 0)
@@ -126,9 +128,6 @@ TAO_IFR_Server::init_with_orb (int argc,
               return retval;
             }
         }
-      ACE_DEBUG ((LM_DEBUG,
-                  "The IFR IOR is: <%s>\n",
-                  this->ifr_ior_.in ()));
     }
   ACE_CATCHANY
     {
@@ -258,6 +257,9 @@ TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
 
           if (heap->open (filename))
             {
+              delete heap;
+              heap = 0;
+            
               ACE_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("Error:: Opening persistent heap file '%s'\n"),
@@ -698,7 +700,7 @@ TAO_IFR_Service_Utils::name_exists (
 
           if ((*checker) (defn_name.fast_rep ()) != 0)
             {
-              ACE_THROW (CORBA::BAD_PARAM (3,
+              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
                                            CORBA::COMPLETED_NO));
             }
         }
@@ -1163,8 +1165,7 @@ TAO_IFR_Service_Utils::fill_valuemember_seq (
       repo->config ()->get_integer_value (member_key,
                                           "access",
                                           access);
-      vm_seq[i].access = ACE_static_cast (CORBA::Visibility,
-                                          access);
+      vm_seq[i].access = static_cast<CORBA::Visibility> (access);
     }
 }
 
@@ -1208,8 +1209,7 @@ TAO_IFR_Service_Utils::path_to_def_kind (ACE_TString &path,
   repo->config ()->get_integer_value (TAO_IFR_Service_Utils::tmp_key_,
                                       "def_kind",
                                       kind);
-  return ACE_static_cast (CORBA::DefinitionKind,
-                          kind);
+  return static_cast<CORBA::DefinitionKind> (kind);
 }
 
 CORBA::DefinitionKind
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index 375388ba081..e55e9ed930f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -13,7 +13,7 @@
 //      Implement wrappers useful to IFR Service clients and servers.
 //
 // = AUTHORS
-//    Jeff Parsons <parsons@isis.vanderbilt.edu>
+//    Jeff Parsons <j.parsons@vanderbilt.edu>
 //    Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>
 //    Priyanka Gontla <pgontla@doc.ece.uci.edu>
 //
@@ -247,4 +247,5 @@ public:
 };
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_IFR_SERVICE_UTILS_H */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index 88eabe5e959..66601159633 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -7,10 +7,9 @@
 #include "IFR_Service_Utils.h"
 #include "Repository_i.h"
 
+#include "ace/SString.h"
+
 
-ACE_RCSID (IFRService,
-           IFR_Service_Utils_T,
-           "$Id$")
 
 template<typename T>
 void
@@ -69,7 +68,7 @@ TAO_IFR_Generic_Utils<T>::set_initializers (
     {
       return;
     }
-    
+
   ACE_Configuration_Section_Key initializers_key;
   config->open_section (key,
                         "initializers",
@@ -110,7 +109,7 @@ TAO_IFR_Generic_Utils<T>::set_initializers (
 
           for (CORBA::ULong j = 0; j < arg_count; ++j)
             {
-              char *stringified = 
+              char *stringified =
                 TAO_IFR_Service_Utils::int_to_string (j);
               config->open_section (params_key,
                                     stringified,
@@ -121,7 +120,7 @@ TAO_IFR_Generic_Utils<T>::set_initializers (
                   "arg_name",
                   initializers[i].members[j].name.in ()
                 );
-              arg_path = 
+              arg_path =
                 TAO_IFR_Service_Utils::reference_to_path (
                     initializers[i].members[j].type_def.in ()
                   );
@@ -161,8 +160,8 @@ TAO_IFR_Desc_Utils<T_desc,T_impl>::fill_desc_begin (
   ACE_CHECK;
 }
 
-template<typename T_strseq>                       
-void 
+template<typename T_strseq>
+void
 TAO_IFR_Strseq_Utils<T_strseq> ::fill_string_seq (
     const char *section_name,
     ACE_Configuration *config,
@@ -175,21 +174,21 @@ TAO_IFR_Strseq_Utils<T_strseq> ::fill_string_seq (
                                      section_name,
                                      0,
                                      section_key);
-                                    
+
   if (status != 0)
     {
       seq.length (0);
       return;
     }
-    
+
   CORBA::ULong count = 0;
   config->get_integer_value (section_key,
                              "count",
                              count);
-  seq.length (count);           
+  seq.length (count);
   char *stringified = 0;
   ACE_TString holder;
-                             
+
   for (CORBA::ULong i = 0; i < count; ++i)
     {
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -199,9 +198,9 @@ TAO_IFR_Strseq_Utils<T_strseq> ::fill_string_seq (
       seq[i] = holder.fast_rep ();
     }
 }
-                              
+
 template<typename T_desc_seq>
-void 
+void
 TAO_Port_Desc_Seq_Utils<T_desc_seq>::port_descriptions (
     T_desc_seq &desc_seq,
     ACE_Configuration *config,
@@ -275,7 +274,7 @@ TAO_Port_Desc_Seq_Utils<T_desc_seq>::port_descriptions (
 }
 
 template<typename T_desc_seq>
-void 
+void
 TAO_Port_Desc_Seq_Utils<T_desc_seq>::get_is_multiple (
     T_desc_seq &desc_seq,
     ACE_Configuration *config,
@@ -291,7 +290,7 @@ TAO_Port_Desc_Seq_Utils<T_desc_seq>::get_is_multiple (
 }
 
 template<typename T_desc_seq>
-void 
+void
 TAO_Port_Desc_Seq_Utils<T_desc_seq>::port_base_type (T_desc_seq &desc_seq,
                                                      ACE_TString &holder,
                                                      CORBA::ULong index)
@@ -327,7 +326,7 @@ TAO_Port_Utils<T>::create_entry (const char *id,
                                           sub_section
                                           ACE_ENV_ARG_PARAMETER);
 
-  const char *tmp = 
+  const char *tmp =
     TAO_IFR_Service_Utils::reference_to_path (port_base_type);
 
   ACE_Configuration_Section_Key base_type_key;
@@ -351,7 +350,7 @@ TAO_Port_Utils<T>::create_entry (const char *id,
                                       repo->config (),
                                       new_key);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
                                               repo
                                               ACE_ENV_ARG_PARAMETER);
@@ -374,4 +373,3 @@ TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean is_multiple,
 }
 
 #endif /* TAO_IFR_SERVICE_UTILS_T_CPP */
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index e5ef3269d7f..f5d6b529406 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -16,8 +16,7 @@ ACE_RCSID (IFR_Service,
 
 
 TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo)
-  : repo_ (repo),
-    section_key_ (ACE_Configuration_Section_Key ())
+  : repo_ (repo)
 {
 }
 
@@ -25,6 +24,16 @@ TAO_IRObject_i::~TAO_IRObject_i (void)
 {
 }
 
+CORBA::DefinitionKind
+TAO_IRObject_i::def_kind (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Will always be overridden by concrete classes.
+  return CORBA::dk_none;
+}
+
 void
 TAO_IRObject_i::section_key (ACE_Configuration_Section_Key &key)
 {
@@ -36,8 +45,7 @@ TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_POA_Current_Impl *pc_impl =
-    ACE_static_cast (TAO_POA_Current_Impl *,
-                     TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+    static_cast<TAO_POA_Current_Impl *> (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
   PortableServer::ObjectId object_id;
   int status = TAO_POA::parse_ir_object_key (pc_impl->object_key (),
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
index 6e0092351ee..f1cf5dc66f6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -59,8 +59,7 @@ public:
   virtual CORBA::DefinitionKind def_kind (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  // Pure virtual.
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index a3fc79484e2..e8725ba91a0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "InterfaceAttrExtension_i.h"
@@ -9,10 +8,15 @@
 #include "ExtAttributeDef_i.h"
 #include "IFR_Service_Utils.h"
 
-ACE_RCSID (IFRService, 
-           InterfaceAttrExtension_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           InterfaceAttrExtension_i,
            "$Id$")
 
+
+
 // =====================================================================
 
 TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i (
@@ -52,7 +56,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
                   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
                   0);
 
-  CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var retval = 
+  CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var retval =
     fifd;
 
   ACE_TString holder;
@@ -116,7 +120,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (key_queue.size ());
   fifd->operations.length (size);
 
   for (i = 0; i < size; ++i)
@@ -167,8 +171,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
         }
     }
 
-  size = ACE_static_cast (CORBA::ULong, 
-                          key_queue.size ());
+  size = static_cast<CORBA::ULong> (key_queue.size ());
   fifd->attributes.length (size);
 
   for (i = 0; i < size; ++i)
@@ -184,7 +187,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
       ACE_CHECK_RETURN (0);
     }
 
-  CORBA::InterfaceDefSeq_var bases = 
+  CORBA::InterfaceDefSeq_var bases =
     iface.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -218,7 +221,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
   return retval._retn ();
 }
 
-CORBA::ExtAttributeDef_ptr 
+CORBA::ExtAttributeDef_ptr
 TAO_InterfaceAttrExtension_i::create_ext_attribute (
     const char *id,
     const char *name,
@@ -245,8 +248,8 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute (
                                        set_exceptions
                                        ACE_ENV_ARG_PARAMETER);
 }
-  
-CORBA::ExtAttributeDef_ptr 
+
+CORBA::ExtAttributeDef_ptr
 TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
     const char *id,
     const char *name,
@@ -263,7 +266,7 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
   ACE_Configuration_Section_Key new_key;
 
   // Common to all IR objects created in CORBA::Container.
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (CORBA::dk_Interface,
                                           CORBA::dk_Attribute,
                                           this->section_key_,
@@ -314,4 +317,3 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
 
   return retval._retn ();
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index 7e313b4f5e8..a1ecd8af581 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "InterfaceDef_i.h"
@@ -8,10 +7,14 @@
 #include "IFR_Service_Utils.h"
 #include "IFR_Service_Utils_T.h"
 
-ACE_RCSID (IFRService, 
-           InterfaceDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           InterfaceDef_i,
            "$Id$")
 
+
 TAO_InterfaceDef_i::TAO_InterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -126,7 +129,7 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
   ifd.version = holder.fast_rep ();
 
   CORBA::ULong i = 0;
-  CORBA::InterfaceDefSeq_var bases = 
+  CORBA::InterfaceDefSeq_var bases =
     this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -213,7 +216,7 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
   this->base_interfaces_recursive (kind_queue,
                                    path_queue);
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (kind_queue.size ());
 
   CORBA::InterfaceDefSeq *seq = 0;
   ACE_NEW_THROW_EX (seq,
@@ -232,7 +235,7 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TString path;
       path_queue.dequeue_head (path);
 
-      CORBA::Object_var obj = 
+      CORBA::Object_var obj =
         TAO_IFR_Service_Utils::path_to_ir_object (path,
                                                   this->repo_
                                                   ACE_ENV_ARG_PARAMETER);
@@ -306,7 +309,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      inherited_path = 
+      inherited_path =
         TAO_IFR_Service_Utils::reference_to_path (base_interfaces[i].in ());
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
@@ -372,7 +375,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
     }
 
   // Is it one of our ancestors' types?
-  CORBA::InterfaceDefSeq_var bases = 
+  CORBA::InterfaceDefSeq_var bases =
     this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -489,7 +492,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (key_queue.size ());
   fifd->operations.length (size);
 
   for (i = 0; i < size; ++i)
@@ -540,7 +543,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  size = ACE_static_cast (CORBA::ULong, key_queue.size ());
+  size = static_cast<CORBA::ULong> (key_queue.size ());
   fifd->attributes.length (size);
 
   for (i = 0; i < size; ++i)
@@ -556,7 +559,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
       ACE_CHECK_RETURN (0);
     }
 
-  CORBA::InterfaceDefSeq_var bases = 
+  CORBA::InterfaceDefSeq_var bases =
     this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -640,7 +643,7 @@ TAO_InterfaceDef_i::create_attribute_i (
   ACE_Configuration_Section_Key new_key;
 
   // Common to all IR objects created in CORBA::Container.
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (CORBA::dk_Interface,
                                           CORBA::dk_Attribute,
                                           this->section_key_,
@@ -733,7 +736,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   ACE_Configuration_Section_Key new_key;
 
   // Common to all IR objects created in CORBA::Container.
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (CORBA::dk_Interface,
                                           CORBA::dk_Operation,
                                           this->section_key_,
@@ -749,11 +752,11 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
 
   // Get the TypeCode for the return type.
   ACE_TString result_path (TAO_IFR_Service_Utils::reference_to_path (result));
-  TAO_IDLType_i *result_impl = 
+  TAO_IDLType_i *result_impl =
     TAO_IFR_Service_Utils::path_to_idltype (result_path,
                                             this->repo_);
 
-  CORBA::TypeCode_var rettype = 
+  CORBA::TypeCode_var rettype =
     result_impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
 
@@ -852,7 +855,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
 
       for (i = 0; i < length; ++i)
         {
-          type_path = 
+          type_path =
             TAO_IFR_Service_Utils::reference_to_path (exceptions[i].in ());
 
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -1045,7 +1048,7 @@ TAO_InterfaceDef_i::name_clash (const char *name)
       return 1;
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
@@ -1105,7 +1108,7 @@ TAO_InterfaceDef_i::base_interfaces_recursive (
                                                      "def_kind",
                                                      kind);
 
-          def_kind = ACE_static_cast (CORBA::DefinitionKind, kind);
+          def_kind = static_cast<CORBA::DefinitionKind> (kind);
 
           kind_queue.enqueue_tail (def_kind);
         }
@@ -1255,5 +1258,3 @@ TAO_InterfaceDef_i::check_inherited (const char *name,
         }
     }
 }
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
index 995cf659c78..012996b39ee 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -1,13 +1,16 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "ModuleDef_i.h"
 #include "Repository_i.h"
 
-ACE_RCSID (IFRService, 
-           ModuleDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           ModuleDef_i,
            "$Id$")
 
+
 TAO_ModuleDef_i::TAO_ModuleDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -89,7 +92,6 @@ TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
-
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "container_id",
                                             container_id);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index a41abde934f..d5ec549fa53 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -1,13 +1,16 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "NativeDef_i.h"
 #include "Repository_i.h"
 
-ACE_RCSID (IFRService, 
-           NativeDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           NativeDef_i,
            "$Id$")
 
+
 TAO_NativeDef_i::TAO_NativeDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -57,4 +60,3 @@ TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                                        name.c_str ()
                                                        ACE_ENV_ARG_PARAMETER);
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index c493695ce55..5a521a51e04 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "OperationDef_i.h"
@@ -6,12 +5,16 @@
 #include "IDLType_i.h"
 #include "ExceptionDef_i.h"
 #include "IFR_Service_Utils.h"
+
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
+
 
-ACE_RCSID (IFRService, 
-           OperationDef_i, 
+ACE_RCSID (IFRService,
+           OperationDef_i,
            "$Id$")
 
+
 TAO_OperationDef_i::TAO_OperationDef_i (
     TAO_Repository_i *repo
   )
@@ -91,7 +94,7 @@ TAO_OperationDef_i::result_i (ACE_ENV_SINGLE_ARG_DECL)
                                             result_path);
 
 
-  TAO_IDLType_i *impl = 
+  TAO_IDLType_i *impl =
     TAO_IFR_Service_Utils::path_to_idltype (result_path,
                                             this->repo_);
 
@@ -119,7 +122,7 @@ TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "result",
                                             result_path);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (result_path,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -148,7 +151,7 @@ TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def
                                   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  char *result_path = 
+  char *result_path =
     TAO_IFR_Service_Utils::reference_to_path (result_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -207,7 +210,7 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (key_queue.size ());
 
   CORBA::ParDescriptionSeq *pd_seq = 0;
   ACE_NEW_THROW_EX (pd_seq,
@@ -241,21 +244,21 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
                                                  "mode",
                                                  mode);
 
-      retval[i].mode = ACE_static_cast (CORBA::ParameterMode, mode);
+      retval[i].mode = static_cast<CORBA::ParameterMode> (mode);
 
       ACE_TString type_path;
       this->repo_->config ()->get_string_value (key,
                                                 "type_path",
                                                 type_path);
 
-      TAO_IDLType_i *impl = 
+      TAO_IDLType_i *impl =
         TAO_IFR_Service_Utils::path_to_idltype (type_path,
                                                 this->repo_);
 
       retval[i].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::Object_var obj = 
+      CORBA::Object_var obj =
         TAO_IFR_Service_Utils::path_to_ir_object (type_path,
                                                   this->repo_
                                                   ACE_ENV_ARG_PARAMETER);
@@ -322,7 +325,7 @@ TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params
       this->repo_->config ()->set_string_value (param_key,
                                                 "name",
                                                 params[i].name.in ());
-      type_path = 
+      type_path =
         TAO_IFR_Service_Utils::reference_to_path (params[i].type_def.in ());
 
       this->repo_->config ()->set_string_value (param_key,
@@ -356,7 +359,7 @@ TAO_OperationDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                                              "mode",
                                              mode);
 
-  return ACE_static_cast (CORBA::OperationMode, mode);
+  return static_cast<CORBA::OperationMode> (mode);
 }
 
 void
@@ -426,12 +429,12 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
         {
           context_queue.enqueue_tail (context);
           ++index;
-          stringified = 
+          stringified =
             TAO_IFR_Service_Utils::int_to_string (index);
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, context_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (context_queue.size ());
 
   CORBA::ContextIdSeq *ci_seq = 0;
   ACE_NEW_THROW_EX (ci_seq,
@@ -541,7 +544,7 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (path_queue.size ());
 
   CORBA::ExceptionDefSeq *ed_seq = 0;
   ACE_NEW_THROW_EX (ed_seq,
@@ -635,13 +638,13 @@ TAO_OperationDef_i::make_description (
   od.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ContextIdSeq_var cid_seq = 
+  CORBA::ContextIdSeq_var cid_seq =
     this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   od.contexts = cid_seq.in ();
 
-  CORBA::ParDescriptionSeq_var pd_seq = 
+  CORBA::ParDescriptionSeq_var pd_seq =
     this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -680,7 +683,7 @@ TAO_OperationDef_i::make_description (
             }
         }
 
-      CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ());
+      CORBA::ULong size = static_cast<CORBA::ULong> (path_queue.size ());
 
       od.exceptions.length (size);
 
@@ -736,10 +739,9 @@ TAO_OperationDef_i::make_description (
     }
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_OperationDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index 542d0f31a68..b7f83ae5605 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -63,7 +63,7 @@ TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                                              "pkind",
                                              pkind);
 
-  switch (ACE_static_cast (CORBA::PrimitiveKind, pkind))
+  switch (static_cast<CORBA::PrimitiveKind> (pkind))
   {
     case CORBA::pk_null:
       return CORBA::TypeCode::_duplicate (CORBA::_tc_null);
@@ -135,6 +135,6 @@ TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                                              "pkind",
                                              pkind);
 
-  return ACE_static_cast (CORBA::PrimitiveKind, pkind);
+  return static_cast<CORBA::PrimitiveKind> (pkind);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index 85e4ccf22b4..597cf85946d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
@@ -6,10 +5,14 @@
 #include "IFR_ComponentsS.h"
 #include "IFR_Service_Utils_T.h"
 
-ACE_RCSID (IFRService, 
-           ProvidesDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           ProvidesDef_i,
            "$Id$")
 
+
 TAO_ProvidesDef_i::TAO_ProvidesDef_i (
     TAO_Repository_i *repo
   )
@@ -104,7 +107,7 @@ TAO_ProvidesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
                                        ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ProvidesDef_i::interface_type (
     CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL
@@ -120,12 +123,12 @@ TAO_ProvidesDef_i::interface_type (
                           ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ProvidesDef_i::interface_type_i (
     CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL_NOT_USED
   )
-  ACE_THROW_SPEC ((CORBA::SystemException)) 
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_value (this->section_key_,
                                         "base_type");
@@ -135,7 +138,7 @@ TAO_ProvidesDef_i::interface_type_i (
       return;
     }
 
-  const char *tmp = 
+  const char *tmp =
     TAO_IFR_Service_Utils::reference_to_path (interface_type);
 
   ACE_Configuration_Section_Key new_key;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index c57bd56ef5e..40a6ad707df 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
 // $Id$
 
 #include "concrete_classes.h"
@@ -13,6 +11,7 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Lock_Adapter_T.h"
+#include "ace/SString.h"
 
 
 ACE_RCSID (IFR_Service,
@@ -95,7 +94,7 @@ TAO_Repository_i::lookup_id_i (const char *search_id
                                     kind);
 
   CORBA::DefinitionKind def_kind =
-    ACE_static_cast (CORBA::DefinitionKind, kind);
+    static_cast<CORBA::DefinitionKind> (kind);
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (def_kind,
@@ -666,8 +665,7 @@ TAO_Repository_i::create_sections (void)
       for (u_int i = 0; i < num_pkinds; ++i)
         {
           ACE_Configuration_Section_Key key;
-          CORBA::PrimitiveKind pkind = ACE_static_cast (CORBA::PrimitiveKind,
-                                                        i);
+          CORBA::PrimitiveKind pkind = static_cast<CORBA::PrimitiveKind> (i);
 
           this->config_->open_section (this->pkinds_key_,
                                        this->pkind_to_string (pkind),
@@ -909,7 +907,7 @@ TAO_Repository_i::select_container (CORBA::DefinitionKind def_kind) const
     case CORBA::dk_LocalInterface:
       return this->ExtLocalInterfaceDef_servant_->_tied_object ();
     case CORBA::dk_Repository:
-      return ACE_const_cast (TAO_Repository_i *, this);
+      return const_cast<TAO_Repository_i *> (this);
     case CORBA::dk_Struct:
       return this->StructDef_servant_->_tied_object ();
     case CORBA::dk_Union:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index 46ee26abfb8..a510114bcc6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -1,15 +1,18 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "SequenceDef_i.h"
 #include "Repository_i.h"
 #include "IFR_Service_Utils.h"
+
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
+
 
-ACE_RCSID (IFRService, 
-           SequenceDef_i, 
+ACE_RCSID (IFRService,
+           SequenceDef_i,
            "$Id$")
 
+
 TAO_SequenceDef_i::TAO_SequenceDef_i (
     TAO_Repository_i *repo
   )
@@ -110,7 +113,7 @@ TAO_SequenceDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                                              "bound",
                                              bound);
 
-  return ACE_static_cast (CORBA::ULong, bound);
+  return static_cast<CORBA::ULong> (bound);
 }
 
 void
@@ -155,7 +158,7 @@ TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "element_path",
                                             element_path);
 
-  TAO_IDLType_i *impl = 
+  TAO_IDLType_i *impl =
     TAO_IFR_Service_Utils::path_to_idltype (element_path,
                                             this->repo_);
 
@@ -183,7 +186,7 @@ TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "element_path",
                                             element_path);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (element_path,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -215,7 +218,7 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
   this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  char *element_path = 
+  char *element_path =
     TAO_IFR_Service_Utils::reference_to_path (element_type_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -233,7 +236,7 @@ TAO_SequenceDef_i::destroy_element_type (
                                             "element_path",
                                             element_path);
 
-  CORBA::DefinitionKind def_kind = 
+  CORBA::DefinitionKind def_kind =
     TAO_IFR_Service_Utils::path_to_def_kind (element_path,
                                              this->repo_);
 
@@ -248,7 +251,7 @@ TAO_SequenceDef_i::destroy_element_type (
     case CORBA::dk_Array:
     case CORBA::dk_Sequence:
     {
-      TAO_IDLType_i *impl = 
+      TAO_IDLType_i *impl =
         TAO_IFR_Service_Utils::path_to_idltype (element_path,
                                                 this->repo_);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index 9920714050a..48f03cc741c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -1,13 +1,16 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
 #include "StringDef_i.h"
 
-ACE_RCSID (IFRService, 
-           StringDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           StringDef_i,
            "$Id$")
 
+
 TAO_StringDef_i::TAO_StringDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_IDLType_i (repo)
@@ -97,7 +100,7 @@ TAO_StringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                                              "bound",
                                              retval);
 
-  return ACE_static_cast (CORBA::ULong, retval);
+  return static_cast<CORBA::ULong> (retval);
 }
 
 void
@@ -123,4 +126,3 @@ TAO_StringDef_i::bound_i (CORBA::ULong bound
                                              "bound",
                                              bound);
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index 6e3d2bbddb4..8bd307d707d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -1,15 +1,19 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "StructDef_i.h"
+#include "RecursDef_i.h"
 #include "Repository_i.h"
 #include "IFR_Service_Utils.h"
+
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
+
 
-ACE_RCSID (IFRService, 
-           StructDef_i, 
+ACE_RCSID (IFRService,
+           StructDef_i,
            "$Id$")
 
+
 TAO_StructDef_i::TAO_StructDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -76,6 +80,25 @@ TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "id",
                                             id);
 
+  //---------------------------------------------------------------------------
+  // Have we already seen this structure definition at an outer scope?
+  // If yes, return a recursive type code to signal the nesting.
+  // If not, record this new structure id in our stack (it will automatically
+  // be removed when NowSeenThis goes out of scope).
+  //---------------------------------------------------------------------------
+
+  if (TAO_RecursiveDef_OuterScopes::SeenBefore( id ))
+    return this->repo_->tc_factory ()->
+                 create_recursive_tc ( id.c_str () ACE_ENV_ARG_PARAMETER);
+
+  TAO_RecursiveDef_OuterScopes NowSeenThis( id );
+
+  //---------------------------------------------------------------------------
+  // Create a new type code for this structure; the create_struct_tc() call
+  // that follows may recursivly call this method again if one of its children
+  // refers to a structure (which is the point of the above NowSeenThis stack).
+  //---------------------------------------------------------------------------
+
   ACE_TString name;
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "name",
@@ -160,13 +183,13 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
                                                      kind);
 
           CORBA::DefinitionKind def_kind =
-            ACE_static_cast (CORBA::DefinitionKind, kind);
+            static_cast<CORBA::DefinitionKind> (kind);
 
           kind_queue.enqueue_tail (def_kind);
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (kind_queue.size ());
 
   CORBA::StructMemberSeq *members = 0;
   ACE_NEW_THROW_EX (members,
@@ -208,6 +231,10 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 
       impl = TAO_IFR_Service_Utils::path_to_idltype (path,
                                                      this->repo_);
+      if (0 == impl)
+      {
+        ACE_THROW_RETURN ( CORBA::OBJECT_NOT_EXIST(), 0);
+      }
 
       retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -265,7 +292,7 @@ TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members
                                                 "name",
                                                 members[i].name.in ());
 
-      path = 
+      path =
         TAO_IFR_Service_Utils::reference_to_path (members[i].type_def.in ());
 
       this->repo_->config ()->set_string_value (member_key,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
index 4ec44496137..c97b5cc48a0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -1,13 +1,16 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
 #include "TypedefDef_i.h"
 
-ACE_RCSID (IFRService, 
-           TypedefDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           TypedefDef_i,
            "$Id$")
 
+
 TAO_TypedefDef_i::TAO_TypedefDef_i (
     TAO_Repository_i *repo
   )
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index 827a5049395..68d57c03519 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -1,7 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "UnionDef_i.h"
+#include "RecursDef_i.h"
 #include "Repository_i.h"
 #include "IFR_Service_Utils.h"
 
@@ -9,11 +9,14 @@
 #include "tao/CDR.h"
 
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
+
 
 ACE_RCSID (IFRService,
            UnionDef_i,
            "$Id$")
 
+
 TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
@@ -80,6 +83,25 @@ TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "id",
                                             id);
 
+  //---------------------------------------------------------------------------
+  // Have we already seen this union definition at an outer scope?
+  // If yes, return a recursive type code to signal the nesting.
+  // If not, record this new union id in our stack (it will automatically be
+  // removed when NowSeenThis goes out of scope).
+  //---------------------------------------------------------------------------
+
+  if (TAO_RecursiveDef_OuterScopes::SeenBefore( id ))
+    return this->repo_->tc_factory ()->
+                 create_recursive_tc ( id.c_str () ACE_ENV_ARG_PARAMETER);
+
+  TAO_RecursiveDef_OuterScopes NowSeenThis( id );
+
+  //---------------------------------------------------------------------------
+  // Create a new type code for this structure; the create_union_tc() call
+  // that follows may recursivly call this method again if one of its children
+  // refers to a union (which is the point of the above NowSeenThis stack).
+  //---------------------------------------------------------------------------
+
   ACE_TString name;
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "name",
@@ -122,6 +144,10 @@ TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL)
   TAO_IDLType_i *impl =
     TAO_IFR_Service_Utils::path_to_idltype (disc_path,
                                             this->repo_);
+  if (0 == impl)
+  {
+     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), CORBA::TypeCode::_nil () );
+  }
 
   return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
@@ -246,7 +272,7 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (key_queue.size ());
 
   CORBA::UnionMemberSeq *members = 0;
   ACE_NEW_THROW_EX (members,
@@ -292,6 +318,10 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 
       impl = TAO_IFR_Service_Utils::path_to_idltype (path,
                                                      this->repo_);
+      if (0 == impl)
+      {
+        ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), 0 );
+      }
 
       retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -353,7 +383,7 @@ TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members
                                                 "name",
                                                 members[i].name.in ());
 
-      member_path = 
+      member_path =
         TAO_IFR_Service_Utils::reference_to_path (members[i].type_def.in ());
 
       this->repo_->config ()->set_string_value (member_key,
@@ -389,7 +419,7 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
                                              "label",
                                              value);
 
-  CORBA::TypeCode_var tc = 
+  CORBA::TypeCode_var tc =
     this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -399,46 +429,43 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
   switch (kind)
   {
     case CORBA::tk_char:
-      member.label <<= CORBA::Any::from_char (ACE_static_cast (CORBA::Char,
-                                                               value));
+      member.label <<= CORBA::Any::from_char (static_cast<CORBA::Char> (value));
       break;
     case CORBA::tk_wchar:
-      member.label <<= CORBA::Any::from_wchar (ACE_static_cast (CORBA::WChar,
-                                                                value));
+      member.label <<= CORBA::Any::from_wchar (static_cast<CORBA::WChar> (value));
       break;
     case CORBA::tk_boolean:
-      member.label <<= CORBA::Any::from_boolean (ACE_static_cast (CORBA::Boolean,
-                                                                  value));
+      member.label <<= CORBA::Any::from_boolean (static_cast<CORBA::Boolean> (value));
       break;
     case CORBA::tk_short:
-      member.label <<= ACE_static_cast (CORBA::Short, value);
+      member.label <<= static_cast<CORBA::Short> (value);
       break;
     case CORBA::tk_ushort:
-      member.label <<= ACE_static_cast (CORBA::UShort, value);
+      member.label <<= static_cast<CORBA::UShort> (value);
       break;
     case CORBA::tk_long:
-      member.label <<= ACE_static_cast (CORBA::Long, value);
+      member.label <<= static_cast<CORBA::Long> (value);
       break;
     case CORBA::tk_ulong:
-      member.label <<= ACE_static_cast (CORBA::ULong, value);
+      member.label <<= static_cast<CORBA::ULong> (value);
       break;
 #if !defined (ACE_LACKS_LONGLONG_T)
     case CORBA::tk_longlong:
-      member.label <<= ACE_static_cast (CORBA::LongLong, value);
+      member.label <<= static_cast<CORBA::LongLong> (value);
       break;
 #endif /* ACE_LACKS_LONGLONG_T */
     case CORBA::tk_ulonglong:
-      member.label <<= ACE_static_cast (CORBA::ULongLong, value);
+      member.label <<= static_cast<CORBA::ULongLong> (value);
       break;
     case CORBA::tk_enum:
     {
       TAO_OutputCDR cdr;
-      cdr.write_ulong (ACE_static_cast (CORBA::ULong, value));
+      cdr.write_ulong (static_cast<CORBA::ULong> (value));
+      TAO_InputCDR in_cdr (cdr);
       TAO::Unknown_IDL_Type *impl = 0;
       ACE_NEW (impl,
                TAO::Unknown_IDL_Type (tc.in (),
-                                      cdr.begin (),
-                                      TAO_ENCAP_BYTE_ORDER));
+                                      in_cdr));
       member.label.replace (impl);
       break;
     }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index 62c52d80788..3caa8264b41 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -1,14 +1,17 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
 #include "UsesDef_i.h"
 #include "IFR_Service_Utils_T.h"
 
-ACE_RCSID (IFRService, 
-           UsesDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           UsesDef_i,
            "$Id$")
 
+
 TAO_UsesDef_i::TAO_UsesDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo)
@@ -103,7 +106,7 @@ TAO_UsesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
                                        ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_UsesDef_i::interface_type (
     CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL
@@ -119,12 +122,12 @@ TAO_UsesDef_i::interface_type (
                           ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_UsesDef_i::interface_type_i (
     CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL_NOT_USED
   )
-  ACE_THROW_SPEC ((CORBA::SystemException)) 
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_value (this->section_key_,
                                         "base_type");
@@ -134,7 +137,7 @@ TAO_UsesDef_i::interface_type_i (
       return;
     }
 
-  const char *tmp = 
+  const char *tmp =
     TAO_IFR_Service_Utils::reference_to_path (interface_type);
 
   ACE_Configuration_Section_Key new_key;
@@ -175,11 +178,10 @@ TAO_UsesDef_i::is_multiple_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_multiple",
                                              val);
-  return ACE_static_cast (CORBA::Boolean,
-                          val);
+  return static_cast<CORBA::Boolean> (val);
 }
 
-void 
+void
 TAO_UsesDef_i::is_multiple (
     CORBA::Boolean is_multiple
     ACE_ENV_ARG_DECL
@@ -195,15 +197,14 @@ TAO_UsesDef_i::is_multiple (
                        ACE_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_UsesDef_i::is_multiple_i (
-    CORBA::Boolean is_multiple 
+    CORBA::Boolean is_multiple
     ACE_ENV_ARG_DECL_NOT_USED
   )
-  ACE_THROW_SPEC ((CORBA::SystemException)) 
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
                                              "is_multiple",
                                              is_multiple);
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index 437425ccedc..3c7bf2f5440 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -1,15 +1,18 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "ValueBoxDef_i.h"
 #include "Repository_i.h"
 #include "IFR_Service_Utils.h"
+
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
+
 
-ACE_RCSID (IFRService, 
-           ValueBoxDef_i, 
+ACE_RCSID (IFRService,
+           ValueBoxDef_i,
            "$Id$")
 
+
 TAO_ValueBoxDef_i::TAO_ValueBoxDef_i (
     TAO_Repository_i *repo
   )
@@ -62,7 +65,7 @@ TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "boxed_type",
                                             boxed_type_path);
 
-  TAO_IDLType_i *impl = 
+  TAO_IDLType_i *impl =
     TAO_IFR_Service_Utils::path_to_idltype (boxed_type_path,
                                             this->repo_);
 
@@ -96,7 +99,7 @@ TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "boxed_type",
                                             boxed_type_path);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (boxed_type_path,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -125,12 +128,10 @@ TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def
                                         ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  char *boxed_type = 
+  char *boxed_type =
     TAO_IFR_Service_Utils::reference_to_path (original_type_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "boxed_type",
                                             boxed_type);
 }
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index 719a56c6e52..4d2ba44ff04 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
@@ -8,10 +7,14 @@
 #include "IFR_Service_Utils.h"
 #include "IFR_Service_Utils_T.h"
 
-ACE_RCSID (IFRService, 
-           ValueDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           ValueDef_i,
            "$Id$")
 
+
 TAO_ValueDef_i::TAO_ValueDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
@@ -92,16 +95,16 @@ TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                   CORBA::ValueDescription,
                   0);
   CORBA::ValueDescription_var safe_vd = vd;
-       
+
   this->fill_value_description (safe_vd.inout ()
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Contained::Description *cd = 0;
   ACE_NEW_RETURN (cd,
                   CORBA::Contained::Description,
                   0);
-                  
+
   cd->kind = CORBA::dk_Value;
   cd->value <<= safe_vd._retn ();
   return cd;
@@ -124,7 +127,7 @@ TAO_ValueDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// Since valuetype type codes may encapsultate the type code of a
-  /// base class, this call could be recursive, with the 
+  /// base class, this call could be recursive, with the
   /// ACE_Configuration_Section_Key replaced for each recursion. To
   /// avoid this problem, the recursion is moved to a static utility
   /// function.
@@ -154,20 +157,20 @@ TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
                   CORBA::InterfaceDefSeq,
                   0);
   CORBA::InterfaceDefSeq_var retval = seq;
-  
+
   ACE_Configuration_Section_Key supported_key;
   int status =
     this->repo_->config ()->open_section (this->section_key_,
                                           "supported",
                                           0,
                                           supported_key);
-                                          
+
   if (status != 0)
     {
       seq->length (0);
       return retval._retn ();
     }
-    
+
   CORBA::ULong count = 0;
   this->repo_->config ()->get_integer_value (supported_key,
                                              "count",
@@ -176,7 +179,7 @@ TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
   char *stringified = 0;
   ACE_TString holder;
   CORBA::Object_var obj;
-  
+
   for (CORBA::ULong i = 0; i < count; ++i)
     {
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -195,7 +198,7 @@ TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
-    
+
   return retval._retn ();
 }
 
@@ -240,14 +243,14 @@ TAO_ValueDef_i::supported_interfaces_i (
   CORBA::ULong kind = 0;
   CORBA::Boolean concrete_seen = 0;
   CORBA::DefinitionKind def_kind;
-  
+
   for (CORBA::ULong i = 0; i < count; ++i)
     {
-      supported_path = 
+      supported_path =
         TAO_IFR_Service_Utils::reference_to_path (
             supported_interfaces[i].in ()
           );
-          
+
       // Get the servant's key into the temporary key holder, because
       // the name clash checker for base interfaces is static, and has
       // no other way to know about a specific key.
@@ -260,8 +263,8 @@ TAO_ValueDef_i::supported_interfaces_i (
                                   "def_kind",
                                   kind
                                 );
-      def_kind = ACE_static_cast (CORBA::DefinitionKind, kind);
-      
+      def_kind = static_cast<CORBA::DefinitionKind> (kind);
+
       if (def_kind == CORBA::dk_Interface)
         {
           if (concrete_seen == 0)
@@ -274,8 +277,8 @@ TAO_ValueDef_i::supported_interfaces_i (
                                            CORBA::COMPLETED_NO));
               return;
             }
-        }                            
-      
+        }
+
       TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                           this->section_key_,
                                           this->repo_,
@@ -312,20 +315,20 @@ TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL)
                   CORBA::InitializerSeq,
                   0);
   CORBA::InitializerSeq_var retval = iseq;
-  
+
   ACE_Configuration_Section_Key initializers_key;
   int status =
     this->repo_->config ()->open_section (this->section_key_,
                                           "initializers",
                                           0,
                                           initializers_key);
-                                          
+
   if (status != 0)
     {
       iseq->length (0);
       return retval._retn ();
     }
-    
+
   CORBA::ULong count = 0;
   this->repo_->config ()->get_integer_value (initializers_key,
                                              "count",
@@ -335,7 +338,7 @@ TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_Configuration_Section_Key initializer_key, params_key, arg_key;
   ACE_TString holder;
   CORBA::ULong arg_count = 0;
-  
+
   for (CORBA::ULong i = 0; i < count; ++i)
     {
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -352,19 +355,19 @@ TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL)
                                               "params",
                                               0,
                                               params_key);
-                                              
+
       if (status != 0)
         {
           retval[i].members.length (0);
           continue;
         }
-        
+
       this->repo_->config ()->get_integer_value (params_key,
                                                  "count",
                                                  arg_count);
       retval[i].members.length (arg_count);
       CORBA::Object_var obj;
-      
+
       for (CORBA::ULong j = 0; j < arg_count; ++j)
         {
           stringified = TAO_IFR_Service_Utils::int_to_string (j);
@@ -382,23 +385,23 @@ TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL)
           TAO_IDLType_i *impl =
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
-          retval[i].members[j].type = 
+          retval[i].members[j].type =
             impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
-          
-          obj = 
+
+          obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
                                                       this->repo_
                                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
-          
+
           retval[i].members[j].type_def =
             CORBA::IDLType::_narrow (obj.in ()
                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
     }
-    
+
   return retval._retn ();
 }
 
@@ -448,16 +451,16 @@ TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
-  int status = 
+  int status =
     this->repo_->config ()->get_string_value (this->section_key_,
                                               "base_value",
                                               holder);
-                               
+
   if (status != 0)
     {
       return CORBA::ValueDef::_nil ();
     }
-    
+
   this->repo_->config ()->get_string_value (this->repo_->repo_ids_key (),
                                             holder.fast_rep (),
                                             holder);
@@ -496,10 +499,10 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value
                                             "base_value");
       return;
     }
-    
-  const char *base_path = 
+
+  const char *base_path =
     TAO_IFR_Service_Utils::reference_to_path (base_value);
-      
+
   // Get the servant's key into the temporary key holder, because
   // the name clash checker for base valuetypes is static, and has
   // no other way to know about a specific key.
@@ -515,7 +518,7 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value
                                       CORBA::dk_Value
                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-          
+
   this->repo_->config ()->set_string_value (
                               this->section_key_,
                               "base_value",
@@ -544,20 +547,20 @@ TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL)
                   CORBA::ValueDefSeq,
                   0);
   CORBA::ValueDefSeq_var retval = vd_seq;
-  
+
   ACE_Configuration_Section_Key bases_key;
   int status =
     this->repo_->config ()->open_section (this->section_key_,
                                           "abstract_bases",
                                           0,
                                           bases_key);
-                                          
+
   if (status != 0)
     {
       vd_seq->length (0);
       return retval._retn ();
     }
-    
+
   CORBA::ULong count = 0;
   this->repo_->config ()->get_integer_value (bases_key,
                                              "count",
@@ -566,7 +569,7 @@ TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL)
   char *stringified = 0;
   ACE_TString holder;
   CORBA::Object_var obj;
-  
+
   for (CORBA::ULong i = 0; i < count; ++i)
     {
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -585,7 +588,7 @@ TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL)
                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
-    
+
   return retval._retn ();
 }
 
@@ -616,12 +619,12 @@ TAO_ValueDef_i::abstract_base_values_i (
                                           "abstract_bases",
                                           0);
   CORBA::ULong count = abstract_base_values.length ();
-  
+
   if (count == 0)
     {
       return;
     }
-    
+
   ACE_Configuration_Section_Key bases_key;
   this->repo_->config ()->open_section (this->section_key_,
                                         "abstract_bases",
@@ -629,18 +632,18 @@ TAO_ValueDef_i::abstract_base_values_i (
                                         bases_key);
   this->repo_->config ()->set_integer_value (bases_key,
                                              "count",
-                                             count);                          
+                                             count);
   const char *base_id = 0;
   const char *base_path = 0;
   char *stringified = 0;
 
   for (CORBA::ULong i = 0; i < count; ++i)
     {
-      base_path = 
+      base_path =
         TAO_IFR_Service_Utils::reference_to_path (
             abstract_base_values[i].in ()
           );
-          
+
       // Get the servant's key into the temporary key holder, because
       // the name clash checker for base interfaces is static, and has
       // no other way to know about a specific key.
@@ -656,7 +659,7 @@ TAO_ValueDef_i::abstract_base_values_i (
                                           CORBA::dk_Value
                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       base_id = abstract_base_values[i]->_interface_repository_id ();
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->repo_->config ()->set_string_value (bases_key,
@@ -685,8 +688,7 @@ TAO_ValueDef_i::is_abstract_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_abstract",
                                              is_it);
-  return ACE_static_cast (CORBA::Boolean,
-                          is_it);
+  return static_cast<CORBA::Boolean> (is_it);
 }
 
 void
@@ -711,8 +713,7 @@ TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract
   this->repo_->config ()->set_integer_value (
                               this->section_key_,
                               "is_abstract",
-                              ACE_static_cast (CORBA::ULong,
-                                               is_abstract));
+                              static_cast<CORBA::ULong> (is_abstract));
 }
 
 CORBA::Boolean
@@ -735,8 +736,7 @@ TAO_ValueDef_i::is_custom_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_custom",
                                              is_it);
-  return ACE_static_cast (CORBA::Boolean,
-                          is_it);
+  return static_cast<CORBA::Boolean> (is_it);
 }
 
 void
@@ -761,8 +761,7 @@ TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom
   this->repo_->config ()->set_integer_value (
                               this->section_key_,
                               "is_custom",
-                              ACE_static_cast (CORBA::ULong,
-                                               is_custom));
+                              static_cast<CORBA::ULong> (is_custom));
 }
 
 CORBA::Boolean
@@ -785,8 +784,7 @@ TAO_ValueDef_i::is_truncatable_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_truncatable",
                                              is_it);
-  return ACE_static_cast (CORBA::Boolean,
-                          is_it);
+  return static_cast<CORBA::Boolean> (is_it);
 }
 
 void
@@ -811,8 +809,7 @@ TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable
   this->repo_->config ()->set_integer_value (
                               this->section_key_,
                               "is_truncatable",
-                              ACE_static_cast (CORBA::ULong,
-                                               is_truncatable));
+                              static_cast<CORBA::ULong> (is_truncatable));
 }
 
 CORBA::Boolean
@@ -866,12 +863,12 @@ TAO_ValueDef_i::is_a_i (const char *id
                                           "abstract_bases",
                                           0,
                                           bases_key);
-                                          
+
   if (status != 0)
     {
       return 0;
     }
-        
+
   CORBA::ULong count = 0;
   this->repo_->config ()->get_integer_value (bases_key,
                                              "count",
@@ -879,7 +876,7 @@ TAO_ValueDef_i::is_a_i (const char *id
   char *stringified = 0;
   ACE_Configuration_Section_Key base_key;
   CORBA::Boolean success = 0;
-                                             
+
   for (CORBA::ULong i = 0; i < count; ++i)
     {
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -898,7 +895,7 @@ TAO_ValueDef_i::is_a_i (const char *id
       success = impl.is_a_i (id
                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-      
+
       if (success)
         {
           return 1;
@@ -929,7 +926,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                   CORBA::ValueDef::FullValueDescription,
                   0);
   CORBA::ValueDef::FullValueDescription_var retval = fv_desc;
-  
+
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "name",
@@ -945,11 +942,11 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_abstract",
                                              val);
-  fv_desc->is_abstract = ACE_static_cast (CORBA::Boolean, val);
+  fv_desc->is_abstract = static_cast<CORBA::Boolean> (val);
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_custom",
                                              val);
-  fv_desc->is_custom = ACE_static_cast (CORBA::Boolean, val);
+  fv_desc->is_custom = static_cast<CORBA::Boolean> (val);
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "container_id",
                                             holder);
@@ -976,7 +973,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::ULong j = 0;
   TAO_IDLType_i *idl_type = 0;
   CORBA::Object_var obj;
-  
+
   if (status == 0)
     {
       this->repo_->config ()->get_integer_value (ops_key,
@@ -985,7 +982,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
       fv_desc->operations.length (count);
       ACE_Configuration_Section_Key op_key, result_key, contexts_key;
       ACE_Configuration_Section_Key params_key, excepts_key;
-      
+
       for (i = 0; i < count; ++i)
         {
           stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -1011,20 +1008,19 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
           idl_type =
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
-          fv_desc->operations[i].result = 
+          fv_desc->operations[i].result =
             idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           this->repo_->config ()->get_integer_value (op_key,
                                                      "mode",
                                                      val);
-          fv_desc->operations[i].mode = ACE_static_cast (CORBA::OperationMode,
-                                                         val);
-          CORBA::TCKind kind = 
+          fv_desc->operations[i].mode = static_cast<CORBA::OperationMode> (val);
+          CORBA::TCKind kind =
             fv_desc->operations[i].result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
-          
-          if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY 
+
+          if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY
               && kind != CORBA::tk_void)
             {
               ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
@@ -1033,7 +1029,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
             }
 
           // Operation contexts.
-            
+
           TAO_IFR_Strseq_Utils<CORBA::ContextIdSeq>::fill_string_seq (
               "contexts",
               this->repo_->config (),
@@ -1054,9 +1050,9 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
               ACE_Configuration_Section_Key param_key;
               this->repo_->config ()->get_integer_value (params_key,
                                                         "count",
-                                                        param_count);                                                  
+                                                        param_count);
               fv_desc->operations[i].parameters.length (param_count);
-              
+
               for (j = 0; j < param_count; ++j)
                 {
                   stringified = TAO_IFR_Service_Utils::int_to_string (j);
@@ -1067,19 +1063,19 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                   this->repo_->config ()->get_string_value (param_key,
                                                             "name",
                                                             holder);
-                  fv_desc->operations[i].parameters[j].name = 
+                  fv_desc->operations[i].parameters[j].name =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (param_key,
                                                             "type_path",
                                                             holder);
-                  idl_type = 
+                  idl_type =
                     TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                             this->repo_);
                   fv_desc->operations[i].parameters[j].type =
                     idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_CHECK_RETURN (0);
-                  
-                  obj = 
+
+                  obj =
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
@@ -1095,21 +1091,20 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                   this->repo_->config ()->get_integer_value (param_key,
                                                              "mode",
                                                              val);
-                  fv_desc->operations[i].parameters[j].mode = 
-                    ACE_static_cast (CORBA::ParameterMode, 
-                                     val);
+                  fv_desc->operations[i].parameters[j].mode =
+                    static_cast<CORBA::ParameterMode> (val);
                 }
             }
 
           // Operation exceptions.
-          
+
           status =
             this->repo_->config ()->open_section (op_key,
                                                   "excepts",
                                                   0,
                                                   excepts_key);
           fv_desc->operations[i].exceptions.length (0);
-          
+
           if (status == 0)
             {
               this->repo_->config ()->get_integer_value (excepts_key,
@@ -1126,7 +1121,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                                                             holder);
 
                   // Get the TAO_IDLType_i before 'holder' is clobbered.
-                  idl_type = 
+                  idl_type =
                     TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                             this->repo_);
                   this->repo_->config ()->expand_path (
@@ -1138,22 +1133,22 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                   this->repo_->config ()->get_string_value (except_def_key,
                                                             "name",
                                                             holder);
-                  fv_desc->operations[i].exceptions[j].name = 
+                  fv_desc->operations[i].exceptions[j].name =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (except_def_key,
                                                             "id",
                                                             holder);
-                  fv_desc->operations[i].exceptions[j].id = 
+                  fv_desc->operations[i].exceptions[j].id =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (except_def_key,
                                                             "container_id",
                                                             holder);
-                  fv_desc->operations[i].exceptions[j].defined_in = 
+                  fv_desc->operations[i].exceptions[j].defined_in =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (except_def_key,
                                                             "version",
                                                             holder);
-                  fv_desc->operations[i].exceptions[j].version = 
+                  fv_desc->operations[i].exceptions[j].version =
                     holder.fast_rep ();
 
                   // Use the TAO_IDLType_i fetched above.
@@ -1161,14 +1156,14 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                     idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_CHECK_RETURN (0);
                 }
-            }                          
+            }
         }
     }
-    
+
   // Attributes..
 
   fv_desc->attributes.length (0);
-  
+
   ACE_Configuration_Section_Key attrs_key;
   status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -1206,15 +1201,14 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                                                      "mode",
                                                      val);
           fv_desc->attributes[i].mode =
-            ACE_static_cast (CORBA::AttributeMode, 
-                             val);
+            static_cast<CORBA::AttributeMode> (val);
           this->repo_->config ()->get_string_value (attr_key,
                                                     "type_path",
                                                     holder);
 
           // Use the type path for 'defined_in' and 'type'.
 
-          idl_type = 
+          idl_type =
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->attributes[i].type =
@@ -1235,7 +1229,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
   // Members..
 
   fv_desc->members.length (0);
-  
+
   ACE_Configuration_Section_Key members_key;
   status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -1278,27 +1272,26 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                                                      "access",
                                                      val);
           fv_desc->members[i].access =
-            ACE_static_cast (CORBA::Visibility, 
-                             val);
+            static_cast<CORBA::Visibility> (val);
 
           // Use type path for 'type' and 'type_def',
 
           this->repo_->config ()->get_string_value (member_key,
                                                     "type_path",
                                                     holder);
-          idl_type = 
+          idl_type =
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->members[i].type =
             idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          obj = 
+          obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
                                                       this->repo_
                                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
-          
+
           fv_desc->members[i].type_def =
             CORBA::IDLType::_narrow (obj.in ()
                                      ACE_ENV_ARG_PARAMETER);
@@ -1309,7 +1302,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
   // Initializers
 
   fv_desc->initializers.length (0);
-  
+
   ACE_Configuration_Section_Key initializers_key;
   status =
     this->repo_->config ()->open_section (this->section_key_,
@@ -1361,12 +1354,12 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                   this->repo_->config ()->get_string_value (arg_key,
                                                             "arg_name",
                                                             holder);
-                  fv_desc->initializers[i].members[j].name = 
+                  fv_desc->initializers[i].members[j].name =
                     holder.fast_rep ();
                   this->repo_->config ()->get_string_value (arg_key,
                                                             "arg_path",
                                                             holder);
-                  obj = 
+                  obj =
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
@@ -1381,14 +1374,14 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
             }
         }
     }
-                                          
+
   TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq (
       "supported",
       this->repo_->config (),
       this->section_key_,
       fv_desc->supported_interfaces
     );
-  
+
   TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq (
       "abstract_bases",
       this->repo_->config (),
@@ -1399,15 +1392,14 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "is_truncatable",
                                              val);
-  fv_desc->is_truncatable = ACE_static_cast (CORBA::Boolean,
-                                             val);
+  fv_desc->is_truncatable = static_cast<CORBA::Boolean> (val);
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "base_value",
                                             holder);
   fv_desc->base_value = holder.fast_rep ();
   fv_desc->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return retval._retn ();
 }
 
@@ -1446,7 +1438,7 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
   ACE_Configuration_Section_Key new_key;
 
   // Common to all IR objects created in CORBA::Container.
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (CORBA::dk_Value,
                                           CORBA::dk_ValueMember,
                                           this->section_key_,
@@ -1527,7 +1519,7 @@ TAO_ValueDef_i::create_attribute_i (
   ACE_Configuration_Section_Key new_key;
 
   // Common to all IR objects created in CORBA::Container.
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (CORBA::dk_Value,
                                           CORBA::dk_Attribute,
                                           this->section_key_,
@@ -1617,7 +1609,7 @@ TAO_ValueDef_i::create_operation_i (
   ACE_Configuration_Section_Key new_key;
 
   // Common to all IR objects created in CORBA::Container.
-  ACE_TString path = 
+  ACE_TString path =
     TAO_IFR_Service_Utils::create_common (CORBA::dk_Value,
                                           CORBA::dk_Operation,
                                           this->section_key_,
@@ -1633,11 +1625,11 @@ TAO_ValueDef_i::create_operation_i (
 
   // Get the TypeCode for the return type.
   ACE_TString result_path (TAO_IFR_Service_Utils::reference_to_path (result));
-  TAO_IDLType_i *result_impl = 
+  TAO_IDLType_i *result_impl =
     TAO_IFR_Service_Utils::path_to_idltype (result_path,
                                             this->repo_);
 
-  CORBA::TypeCode_var rettype = 
+  CORBA::TypeCode_var rettype =
     result_impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
 
@@ -1741,7 +1733,7 @@ TAO_ValueDef_i::create_operation_i (
 
       for (i = 0; i < length; ++i)
         {
-          type_path = 
+          type_path =
             TAO_IFR_Service_Utils::reference_to_path (exceptions[i]);
 
           char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -1806,61 +1798,57 @@ TAO_ValueDef_i::name_clash (const char *name)
       return 1;
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
 void
-TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc 
+TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc
                                         ACE_ENV_ARG_DECL)
 {
   desc.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   desc.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   CORBA::ULong tmp = this->is_abstract_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  desc.is_abstract = ACE_static_cast (CORBA::Boolean,
-                                      tmp);
-                                     
+  desc.is_abstract = static_cast<CORBA::Boolean> (tmp);
+
   tmp = this->is_custom_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  desc.is_custom = ACE_static_cast (CORBA::Boolean,
-                                    tmp);
-    
+  desc.is_custom = static_cast<CORBA::Boolean> (tmp);
+
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "container_id",
-                                            holder);                               
+                                            holder);
   desc.defined_in = holder.fast_rep ();
-  
+
   desc.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq (
       "supported",
       this->repo_->config (),
       this->section_key_,
       desc.supported_interfaces
     );
-  
+
   TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq (
       "abstract_bases",
       this->repo_->config (),
       this->section_key_,
       desc.abstract_base_values
     );
-  
+
   tmp = this->is_truncatable_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  desc.is_truncatable = ACE_static_cast (CORBA::Boolean,
-                                         tmp);
-                                        
+  desc.is_truncatable = static_cast<CORBA::Boolean> (tmp);
+
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "base_value",
-                                            holder);                               
+                                            holder);
   desc.base_value = holder.fast_rep ();
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index 75193483c16..3d25b96ed3b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
@@ -6,10 +5,14 @@
 #include "IDLType_i.h"
 #include "IFR_Service_Utils_T.h"
 
-ACE_RCSID (IFRService, 
-           ValueMemberDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           ValueMemberDef_i,
            "$Id$")
 
+
 TAO_ValueMemberDef_i::TAO_ValueMemberDef_i (
     TAO_Repository_i *repo
   )
@@ -62,7 +65,7 @@ TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "type_path",
                                             holder);
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
                                               this->repo_
                                               ACE_ENV_ARG_PARAMETER);
@@ -76,8 +79,7 @@ TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
   this->repo_->config ()->get_integer_value  (this->section_key_,
                                               "access",
                                               val);
-  vm.access = ACE_static_cast (CORBA::Visibility,
-                               val);
+  vm.access = static_cast<CORBA::Visibility> (val);
 
   CORBA::Contained::Description *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -190,8 +192,7 @@ TAO_ValueMemberDef_i::access_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->repo_->config ()->get_integer_value (this->section_key_,
                                              "access",
                                              val);
-  return ACE_static_cast (CORBA::Visibility,
-                          val);
+  return static_cast<CORBA::Visibility> (val);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index ffcf5c1800b..7f8c8bcc350 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -1,13 +1,16 @@
-/* -*- C++ -*- */
 // $Id$
 
 #include "Repository_i.h"
 #include "WstringDef_i.h"
 
-ACE_RCSID (IFRService, 
-           WstringDef_i, 
+#include "ace/SString.h"
+
+
+ACE_RCSID (IFRService,
+           WstringDef_i,
            "$Id$")
 
+
 TAO_WstringDef_i::TAO_WstringDef_i (
     TAO_Repository_i *repo
   )
@@ -97,7 +100,7 @@ TAO_WstringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                                              "bound",
                                              retval);
 
-  return ACE_static_cast (CORBA::ULong, retval);
+  return static_cast<CORBA::ULong> (retval);
 }
 
 void
@@ -123,4 +126,3 @@ TAO_WstringDef_i::bound_i (CORBA::ULong bound
                                              "bound",
                                              bound);
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp b/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp
index 533a42596ea..622639d5723 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "concrete_classes.h"
+#include "Options.h"
 #include "IFR_Service_Utils_T.h"
 #include "ComponentRepository_i.h"
 #include "OperationDef_i.h"
@@ -427,4 +428,8 @@ template class TAO_IFR_Desc_Utils<CORBA::OperationDescription, TAO_OperationDef_
 #pragma instantiate TAO_IFR_Desc_Utils<CORBA::ValueMember, TAO_ValueMemberDef_i>
 #pragma instantiate TAO_IFR_Desc_Utils<CORBA::OperationDescription, TAO_OperationDef_i>
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template ACE_Singleton<Options, ACE_Null_Mutex> *ACE_Singleton<Options, ACE_Null_Mutex>::singleton_;
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 9d4e1856309..f2bda240f28 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -1,9 +1,10 @@
+// $Id$
+
 #include "IOR_Multicast.h"
 
 #include "tao/debug.h"
 
 #include "ace/SOCK_Connector.h"
-#include "ace/SString.h"
 
 ACE_RCSID (orbsvcs,
            IOR_Multicast,
@@ -16,9 +17,7 @@ TAO_IOR_Multicast::get_handle (void) const
 }
 
 TAO_IOR_Multicast::TAO_IOR_Multicast (void)
-  : service_id_ ((TAO_Service_ID) 0),
-    ior_ (0),
-    mcast_nic_ (0)
+  : service_id_ ((TAO_Service_ID) 0)
 {
 }
 
@@ -26,7 +25,6 @@ TAO_IOR_Multicast::TAO_IOR_Multicast (const char *ior,
                                       u_short port,
                                       const char *mcast_addr,
                                       TAO_Service_ID service_id)
-  : mcast_nic_ (0)
 {
   if (this->init (ior,
                   port,
@@ -37,8 +35,6 @@ TAO_IOR_Multicast::TAO_IOR_Multicast (const char *ior,
                 ACE_TEXT ("TAO_IOR_Multicast")));
 }
 
-// destructor
-
 TAO_IOR_Multicast::~TAO_IOR_Multicast (void)
 {
   if (this->mcast_dgram_.leave (this->mcast_addr_) == -1)
@@ -53,13 +49,8 @@ TAO_IOR_Multicast::init (const char *ior,
                          const char *mcast_addr,
                          TAO_Service_ID service_id)
 {
-  if (this->mcast_addr_.set (port,
-                             mcast_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "set"),
-                      -1);
-
+  if (this->mcast_addr_.set (port, mcast_addr) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set"), -1);
   return common_init (ior, service_id);
 }
 
@@ -69,15 +60,15 @@ TAO_IOR_Multicast::init (const char *ior,
                          TAO_Service_ID service_id)
 {
   // Look for a '@' incase a nic is specified.
-  this->mcast_nic_ = ACE_OS::strchr (mcast_addr, '@');
+  const char* tmpnic = ACE_OS::strchr (mcast_addr, '@');
 
   CORBA::String_var actual_mcast_addr;
   CORBA::ULong length_addr;
 
-  if (this->mcast_nic_ != 0)
+  if (tmpnic != 0)
     {
       // i.e. a nic name has been specified
-      length_addr = this->mcast_nic_ - mcast_addr + 1;
+      length_addr = tmpnic - mcast_addr + 1;
       actual_mcast_addr = CORBA::string_alloc (length_addr);
 
       ACE_OS::strncpy (actual_mcast_addr.inout (),
@@ -87,13 +78,12 @@ TAO_IOR_Multicast::init (const char *ior,
       actual_mcast_addr[length_addr - 1] = '\0';
 
       /// Save for use later.
-      this->mcast_nic_ = this->mcast_nic_ + 1;
+      this->mcast_nic_ = tmpnic + 1;
     }
   else
     {
       actual_mcast_addr =
-        CORBA::string_alloc (ACE_static_cast (CORBA::ULong,
-                                              ACE_OS::strlen (mcast_addr)));
+        CORBA::string_alloc (static_cast<CORBA::ULong> (ACE_OS::strlen (mcast_addr)));
 
       actual_mcast_addr = mcast_addr;
     }
@@ -128,15 +118,12 @@ TAO_IOR_Multicast::common_init (const char *ior,
     }
 
   // Use ACE_SOCK_Dgram_Mcast factory to subscribe to multicast group.
-  if (this->mcast_nic_ != 0)
+  if (this->mcast_nic_.length() != 0)
     {
       if (this->mcast_dgram_.subscribe (this->mcast_addr_,
                                         1,
-                                        ACE_TEXT_CHAR_TO_TCHAR(this->mcast_nic_)) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "subscribe"),
-                          -1);
+                                        ACE_TEXT_CHAR_TO_TCHAR(this->mcast_nic_.c_str())) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "subscribe"),-1);
     }
   else
     {
@@ -216,9 +203,6 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
                 service_name,
                 ACE_NTOHS (remote_port)));
 
-  // Our reply data.
-  ACE_CString ior (this->ior_);
-
   if (ACE_OS::strcmp (service_name,
                       "NameService") != 0
       && ACE_OS::strcmp (service_name,
@@ -230,9 +214,8 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
       && ACE_OS::strcmp (service_name,
                          "MCASTServer") != 0)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Unknown service requested.\n"),
-                        0);
+      ACE_ERROR_RETURN ((LM_ERROR, 
+        "IOR_Multicast::connect() Unknown service requested.\n"),0);
     }
 
   // Reply to the multicast message.
@@ -242,17 +225,14 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   ACE_SOCK_Stream stream;
 
   // Connect.
-  if (connector.connect (stream,
-                         peer_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "IOR_Multicast::connect failed\n"),
-                      0);
+  if (connector.connect (stream, peer_addr) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "IOR_Multicast::connect failed\n"), 0);
   // Send the IOR back to the client.  (Send iovec, which contains ior
   // length as the first element, and ior itself as the second.)
 
   // Length of ior to be sent.
   CORBA::Short data_len =
-    ACE_static_cast (CORBA::Short, ACE_HTONS (ior.length () + 1));
+    static_cast<CORBA::Short> (ACE_HTONS (this->ior_.length () + 1));
 
   // Vector to be sent.
   const int cnt = 2;
@@ -263,11 +243,10 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   iovp[0].iov_len  = sizeof (CORBA::Short);
 
   // The ior.
-  iovp[1].iov_base = ACE_const_cast (char*, ior.c_str ());
-  iovp[1].iov_len  = ACE_static_cast (u_long, ior.length () + 1);
+  iovp[1].iov_base = const_cast<char*> (this->ior_.c_str ());
+  iovp[1].iov_len  = static_cast<u_long> (this->ior_.length () + 1);
 
-  ssize_t result = stream.sendv_n (iovp,
-                                   cnt);
+  ssize_t result = stream.sendv_n (iovp, cnt);
   // Close the stream.
   stream.close ();
 
@@ -280,9 +259,11 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
                 "(%P|%t) ior_: <%s>\n"
                 "sent to %s:%u.\n"
                 "result from send = %d\n",
-                ior.c_str (),
+                this->ior_.c_str (),
                 peer_addr.get_host_name (),
                 peer_addr.get_port_number (),
                 result));
   return 0;
 }
+
+
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index 863106d7487..013fcebf5af 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -20,7 +20,6 @@
 
 #ifndef TAO_IOR_MULTICAST_H
 #define TAO_IOR_MULTICAST_H
-
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/svc_utils_export.h"
@@ -33,6 +32,7 @@
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "ace/Reactor.h"
+#include "ace/SString.h"
 
 class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler
 {
@@ -66,7 +66,7 @@ public:
   // Initialization method. Takes in "address:port" string as a
   // parameter.
 
-  ~TAO_IOR_Multicast (void);
+  virtual ~TAO_IOR_Multicast (void);
   // Destructor.
 
   virtual int handle_input (ACE_HANDLE n);
@@ -84,9 +84,6 @@ private:
                    TAO_Service_ID service_id);
   // Factor common functionality from the two init functions.
 
-  char buf_[BUFSIZ];
-  // temporary buffer.
-
   TAO_Service_ID service_id_;
   // Service id that we're waiting for.
 
@@ -96,7 +93,7 @@ private:
   ACE_INET_Addr mcast_addr_;
   // multicast address
 
-  const char *ior_;
+  ACE_CString ior_;
   // object reference to send in response to the multicast
 
   ACE_INET_Addr response_addr_;
@@ -105,9 +102,8 @@ private:
   ACE_SOCK_Dgram response_;
   // socket for response to the multicast
 
-  const char *mcast_nic_;
+  ACE_CString mcast_nic_;
 };
 
 #include /**/ "ace/post.h"
-
 #endif /* TAO_IOR_MULTICAST_H */
diff --git a/TAO/orbsvcs/orbsvcs/LB_ORT.idl b/TAO/orbsvcs/orbsvcs/LB_ORT.idl
index 58ab86ffa94..0134ff0cc96 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ORT.idl
+++ b/TAO/orbsvcs/orbsvcs/LB_ORT.idl
@@ -12,7 +12,7 @@
 #ifndef TAO_LB_ORT_IDL
 #define TAO_LB_ORT_IDL
 
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
 
 
 module TAO_LB
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index 3032e0d46e6..e3c8ec41e17 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -28,7 +28,7 @@ TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor (const char * l
         {
           // Couldn't determine hostname.  Use the current time
           // instead.
-          CORBA::ULong t = ACE_static_cast (CORBA::ULong, ACE_OS::time ());
+          CORBA::ULong t = static_cast<CORBA::ULong> (ACE_OS::time ());
 
           // A 64 byte buffer is more than enough to contain the
           // string representation of a 32 bit unsigned integer.
@@ -225,7 +225,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
 
   load_list->length (1);
 
-  load_list[0].id = CosLoadBalancing::CPU;
+  load_list[0].id = CosLoadBalancing::LoadAverage;
   load_list[0].value = load;
 
   return load_list._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
index ce0e3b6e62c..ee870fcb36d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -71,7 +71,7 @@ public:
   /// LoadMonitor resides.
   /**
    * @return A "Load" sequence of length 1 that contains a LoadId
-   *         equal to CosLoadBalancing::CPU, and the average CPU
+   *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
   virtual CosLoadBalancing::LoadList * loads (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index ec895f1af36..6548995ed0d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -2,6 +2,7 @@
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
 #include "ace/os_include/sys/os_loadavg.h"
@@ -16,9 +17,9 @@ double calc_cpu_loading (void)
   static unsigned long prev_idle = 0;
   static double prev_total = 0.0;
 
-  FILE *file_ptr = NULL;
-  char *item = NULL;
-  char *arg = NULL;
+  FILE *file_ptr = 0;
+  char *item = 0;
+  char *arg = 0;
   unsigned long delta_idle = 0;
   unsigned long user = 0;
   unsigned long nice = 0;
@@ -27,15 +28,15 @@ double calc_cpu_loading (void)
 
   double percent_cpu_load = 0.0;
 
-  if ((file_ptr = fopen("/proc/stat", "r")) == NULL)
+  if ((file_ptr = fopen("/proc/stat", "r")) == 0)
           return percent_cpu_load;
 
-  while ((fgets (buf, sizeof (buf), file_ptr)) != NULL)
+  while ((fgets (buf, sizeof (buf), file_ptr)) != 0)
   {
-    item = strtok (buf, " \t\n");
-    arg = strtok (NULL, "\n");
+    item = ACE_OS::strtok (buf, " \t\n");
+    arg = ACE_OS::strtok (0, "\n");
 
-    if (item == NULL || arg == NULL)
+    if (item == 0 || arg == 0)
             continue;
     if (item[0] == 'c' && strlen (item) == 3)
     {
@@ -77,7 +78,7 @@ TAO_LB_CPU_Utilization_Monitor::TAO_LB_CPU_Utilization_Monitor (const char * loc
         {
           // Couldn't determine hostname.  Use the current time
           // instead.
-          CORBA::ULong t = ACE_static_cast (CORBA::ULong, ACE_OS::time ());
+          CORBA::ULong t = static_cast<CORBA::ULong> (ACE_OS::time ());
 
           // A 64 byte buffer is more than enough to contain the
           // string representation of a 32 bit unsigned integer.
@@ -148,7 +149,7 @@ TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
 
   load_list->length (1);
 
-  load_list[0].id = CosLoadBalancing::CPU;
+  load_list[0].id = CosLoadBalancing::LoadAverage;
   load_list[0].value = load;
 
   ACE_DEBUG ((LM_DEBUG, "%2f\n", load_list[0].value));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index 6ad66ee8ada..71250afcba7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -68,7 +68,7 @@ public:
   /// LoadMonitor resides.
   /**
    * @return A "Load" sequence of length 1 that contains a LoadId
-   *         equal to CosLoadBalancing::CPU, and the average CPU
+   *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
   virtual CosLoadBalancing::LoadList * loads (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 7252318027a..c17363ad9d0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -21,7 +21,7 @@
 
 #include "orbsvcs/CosLoadBalancingC.h"
 #include "tao/LocalObject.h"
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 11c0c402b90..5a2131175f4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -6,12 +6,16 @@
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
+
 #include "ace/Null_Mutex.h"
+#include "ace/OS_NS_string.h"
+
 
 ACE_RCSID (LoadBalancing,
            LB_LeastLoaded,
            "$Id$")
 
+
 #if !defined (__ACE_INLINE__)
 #include "LB_LeastLoaded.inl"
 #endif /* defined INLINE */
@@ -438,8 +442,7 @@ TAO_LB_LeastLoaded::get_location (
                       // n == 0:  Use previously selected location.
                       // n == 1:  Use current location.
                       const CORBA::ULong n =
-                        ACE_static_cast (CORBA::ULong,
-                                         NUM_MEMBERS * ACE_OS::rand ()
+                        static_cast<CORBA::ULong> (NUM_MEMBERS * ACE_OS::rand ()
                                          / (RAND_MAX + 1.0));
 
                       ACE_ASSERT (n == 0 || n == 1);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index a9865acf8b7..3bca0f64e9a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -6,12 +6,16 @@
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
+
 #include "ace/Null_Mutex.h"
+#include "ace/OS_NS_string.h"
+
 
 ACE_RCSID (LoadBalancing,
            LB_LoadAverage,
            "$Id$")
 
+
 #if !defined (__ACE_INLINE__)
 #include "LB_LoadAverage.inl"
 #endif /* defined INLINE */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 32d63b54f0f..93e336d1f16 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -16,9 +16,12 @@
 #include "tao/ORB_Constants.h"
 
 #include "ace/Reactor.h"
-#include "ace/OS_NS_sys_time.h"
 #include "ace/Reverse_Lock_T.h"
+#include "ace/SString.h"
+#include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
+
 
 ACE_RCSID (LoadBalancing,
            LB_LoadManager,
@@ -925,8 +928,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
       // using the same POA.
       const ACE_Time_Value tv = ACE_OS::gettimeofday ();
       const CORBA::Long time =
-        ACE_static_cast (CORBA::Long,
-                         tv.msec ()); // Time in milliseconds.
+        static_cast<CORBA::Long> (tv.msec ()); // Time in milliseconds.
 
       char poa_name[] = "TAO_LB_LoadManager_POA - 0xZZZZZZZZ";
       char * astr =
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 8f0cc83f219..cfc89538248 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -7,12 +7,16 @@
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
+
 #include "ace/Null_Mutex.h"
+#include "ace/OS_NS_string.h"
+
 
 ACE_RCSID (LoadBalancing,
            LB_LoadMinimum,
            "$Id$")
 
+
 #if !defined (__ACE_INLINE__)
 #include "LB_LoadMinimum.inl"
 #endif /* defined INLINE */
@@ -208,11 +212,11 @@ TAO_LB_LoadMinimum::next_member (
 
   if (found_location)
     {
-/*            
+/*
        ACE_DEBUG ((LM_DEBUG,
                    "RETURNING REFERENCE FOR LOCATION \"%s\"\n",
                    location[0].id.in ()));
-*/                   
+*/
 
       return load_manager->get_member_ref (object_group,
                                            location
@@ -232,7 +236,7 @@ TAO_LB_LoadMinimum::next_member (
 /*
        ACE_DEBUG ((LM_DEBUG,
                    "CALLING RANDOM  REFERENCE FOR LOCATION \n"));
-*/                   
+*/
 
       return TAO_LB_Random::_tao_next_member (object_group,
                                               load_manager,
@@ -317,7 +321,7 @@ TAO_LB_LoadMinimum::analyze_loads (
     }
 
   avg_load.value = total_load.value / len;
-/*  
+/*
   ACE_DEBUG ((LM_DEBUG,
                       "AVERAGE LOAD == %f"
                       "\tMIN LOAD == %f\n",
@@ -333,13 +337,13 @@ TAO_LB_LoadMinimum::analyze_loads (
         {
           const PortableGroup::Location & loc = locations[j];
 
-         /* 
+         /*
           ACE_DEBUG ((LM_DEBUG,
                        "EFFECTIVE_LOAD == %f\n"
                        "AVERAGE       == %f\n",
                        tmp[i].value,
                        avg_load.value));
-        */ 
+        */
 
           if (tmp[j].value <= avg_load.value)
             {
@@ -377,12 +381,12 @@ TAO_LB_LoadMinimum::analyze_loads (
               }
               else if ((percent_diff > TAO_LB::LM_DEFAULT_DIFF_AVERAGE_CUTOFF)
                        && (percent_diff < 1))
-              { 
-/*                      
+              {
+/*
                 ACE_DEBUG ((LM_DEBUG,
                             "%P --- ALERTING LOCATION %u\n",
                             i));
-*/              
+*/
                 load_manager->enable_alert (loc
                                             ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK_EX (SECOND);
@@ -445,7 +449,7 @@ TAO_LB_LoadMinimum::get_location (
                             load
                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-/*          
+/*
           ACE_DEBUG ((LM_DEBUG,
                       "LOC == %u"
                       "\tMIN LOAD == %f\n"
@@ -497,8 +501,7 @@ TAO_LB_LoadMinimum::get_location (
                       // n == 0:  Use previously selected location.
                       // n == 1:  Use current location.
                       const CORBA::ULong n =
-                        ACE_static_cast (CORBA::ULong,
-                                         NUM_MEMBERS * ACE_OS::rand ()
+                        static_cast<CORBA::ULong> (NUM_MEMBERS * ACE_OS::rand ()
                                          / (RAND_MAX + 1.0));
 
                       ACE_ASSERT (n == 0 || n == 1);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index b056fc7622b..dff631c15fb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -1,13 +1,15 @@
 #include "LB_ObjectReferenceFactory.h"
 
-
 ACE_RCSID (LoadBalancing,
            LB_ObjectReferenceFactory,
            "$Id$")
 
 
 #include "tao/debug.h"
+
+#include "ace/SString.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
 
 
 // The number of different object groups to support.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index d7bab7a8e98..729ac23aca5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -22,9 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -33,6 +31,7 @@
 #include "ace/Array_Base.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
+#include "ace/SString.h"
 
 /**
  * @class TAO_LB_ObjectReferenceFactory
@@ -167,7 +166,7 @@ private:
 };
 
 
-#if defined (_MSC_VER) && (_MSC_VER >= 1200)
+#if defined (_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index c1e1bf9d684..b73c9045283 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -16,7 +16,7 @@ static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT;
 
 extern "C" void tao_lb_random_init_routine (void)
 {
-  ACE_OS::srand (ACE_static_cast (unsigned int, ACE_OS::time ()));
+  ACE_OS::srand (static_cast<unsigned int> (ACE_OS::time ()));
 }
 
 
@@ -145,11 +145,10 @@ TAO_LB_Random::_tao_next_member (
   //       random as the higher order bits.
 
   // Prevent integer arithmetic overflow.
-  const CORBA::Float flen = ACE_static_cast (CORBA::Float, len);
+  const CORBA::Float flen = static_cast<CORBA::Float> (len);
                                   
   const CORBA::ULong i =
-    ACE_static_cast (CORBA::ULong,
-                     flen * ACE_OS::rand () / (RAND_MAX + 1.0));
+    static_cast<CORBA::ULong> (flen * ACE_OS::rand () / (RAND_MAX + 1.0));
 
   ACE_ASSERT (i < len);
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index a4536839dbd..ee4d822d116 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -3,6 +3,8 @@
 
 #include "tao/debug.h"
 
+#include "ace/OS_NS_string.h"
+
 
 ACE_RCSID (LoadBalancing,
            LB_ServerRequestInterceptor,
@@ -62,8 +64,7 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
           // standard interpretive marshaling via a CDR encapsulation
           // Codec for efficiency reasons.
           const char * buf =
-            ACE_reinterpret_cast (const char *,
-                                  service_context->context_data.get_buffer ());
+            reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
           TAO_InputCDR cdr (buf,
                             service_context->context_data.length ());
 
@@ -71,7 +72,7 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
           if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
             ACE_THROW (CORBA::BAD_PARAM ());
 
-          cdr.reset_byte_order (ACE_static_cast (int, byte_order));
+          cdr.reset_byte_order (static_cast<int> (byte_order));
 
           CORBA::Object_var object_group;
           if (cdr >> object_group.out ())
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 2a96caf9700..4ef02981399 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -39,29 +39,27 @@ TAO_BasicLogFactory_i::activate (PortableServer::POA_ptr poa
 DsLogAdmin::BasicLog_ptr
 TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
                                CORBA::ULongLong max_rec_size,
-                               DsLogAdmin::LogId_out id
+                               DsLogAdmin::LogId_out id_out
                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidLogFullAction
                    ))
 {
-  // Get an id for this Log.
-  this->max_id_++;
+  DsLogAdmin::LogId id;
+
+  // Get an unique/unused id for this Log.
+  while (hash_map_.find ((id = this->next_id_++)) == 0)
+    ;
 
   DsLogAdmin::BasicLog_ptr basiclog =
-    this->create_with_id (this->max_id_,
+    this->create_with_id (id,
                           full_action,
                           max_rec_size
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
 
   // Set the id to return..
-  id = this->max_id_;
-
-  // Store the id in the LogIdList.
-  CORBA::ULong len = logid_list_.length ();
-  logid_list_.length (len + 1);
-  logid_list_[len] = id;
+  id_out = id;
 
   return basiclog;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 800174ac1e9..bd208d22b98 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -120,17 +120,20 @@ TAO_EventLogFactory_i::create (
     DsLogAdmin::LogFullActionType full_action,
     CORBA::ULongLong max_rec_size,
     const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
-    DsLogAdmin::LogId_out id
+    DsLogAdmin::LogId_out id_out
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidLogFullAction,
                    DsLogAdmin::InvalidThreshold))
 {
-  // Get an id for this Log.
-  this->max_id_++;
+  DsLogAdmin::LogId id;
+
+  // Get an unused/unique id for this Log.
+  while (hash_map_.find ((id = this->next_id_++)) == 0)
+    ;
 
   DsEventLogAdmin::EventLog_ptr eventlog =
-    this->create_with_id (this->max_id_,
+    this->create_with_id (id,
                           full_action,
                           max_rec_size,
                           thresholds
@@ -138,12 +141,7 @@ TAO_EventLogFactory_i::create (
   ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
 
   // Set the id to return..
-  id = this->max_id_;
-
-  // Store the id in the LogIdList.
-  CORBA::ULong len = logid_list_.length();
-  logid_list_.length(len+1);
-  logid_list_[len] = id;
+  id_out = id;
 
   return eventlog;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index b5618c41cb2..debb9bd168c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -5,7 +5,7 @@ ACE_RCSID (Log,
            "$Id$")
 
 TAO_LogMgr_i::TAO_LogMgr_i (void)
-  : max_id_ (0)
+  : next_id_ (0)
 {
   // No-Op.
 }
@@ -24,7 +24,7 @@ TAO_LogMgr_i::list_logs (ACE_ENV_SINGLE_ARG_DECL)
   DsLogAdmin::LogList* list;
 
   // Figure out the length of the list.
-  CORBA::ULong len = ACE_static_cast (CORBA::ULong, hash_map_.current_size ());
+  CORBA::ULong len = static_cast<CORBA::ULong> (hash_map_.current_size ());
 
   // Allocate the list of <len> length.
   ACE_NEW_THROW_EX (list,
@@ -87,13 +87,33 @@ TAO_LogMgr_i::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  DsLogAdmin::LogIdList* ret_val;
-  ACE_NEW_THROW_EX (ret_val,
-    DsLogAdmin::LogIdList (this->logid_list_),
-                     CORBA::NO_MEMORY ());
+  DsLogAdmin::LogIdList* list;
+
+  // Figure out the length of the list.
+  CORBA::ULong len = static_cast<CORBA::ULong> (hash_map_.current_size ());
+
+  // Allocate the list of <len> length.
+  ACE_NEW_THROW_EX (list,
+                    DsLogAdmin::LogIdList (len),
+                    CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
-  return ret_val;
+  list->length (len);
+
+  // Create an iterator
+  HASHMAP::ITERATOR iter (hash_map_);
+
+  // Iterate over and populate the list.
+  HASHMAP::ENTRY *hash_entry;
+
+  for (CORBA::ULong i = 0; i < len; i++)
+    {
+      iter.next (hash_entry);
+      iter.advance ();
+      (*list)[i] = hash_entry->ext_id_;
+    }
+
+  return list;
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index ce07c14d6c8..a02276e7d29 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -33,7 +33,7 @@
  *
  * @brief Factory of Logs. Contains list of Logs created.
  *
- * This factory base class is used to maintain a list of logs 
+ * This factory base class is used to maintain a list of logs
  * created by it. Logs can also be removed from the list.
  */
 class TAO_Log_Serv_Export TAO_LogMgr_i : public virtual POA_DsLogAdmin::LogMgr
@@ -77,16 +77,15 @@ protected:
 
   /// Define the HASHMAP.
   typedef ACE_Hash_Map_Manager <DsLogAdmin::LogId,
-    DsLogAdmin::Log_var,TAO_SYNCH_MUTEX> HASHMAP;
+				DsLogAdmin::Log_var,
+				TAO_SYNCH_MUTEX> HASHMAP;
 
   /// The map of Logs created.
   HASHMAP hash_map_;
 
-  /// The Max id assigned so far.
-  DsLogAdmin::LogId max_id_;
-
-  /// A list of the current log ids.
-  DsLogAdmin::LogIdList logid_list_;
+  /// The next log id to be assigned (if it hasn't already been
+  /// taken by create_by_id().
+  DsLogAdmin::LogId next_id_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index ddbb9953e8b..84623803467 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -3,6 +3,7 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "ace/OS_NS_sys_time.h"
 
 ACE_RCSID (Log,
@@ -100,9 +101,8 @@ TAO_LogRecordStore::log (DsLogAdmin::LogRecord &rec)
     }
 
   // Increment the number of records in the log
-  ++(this->num_records_);
-  this->current_size_ =
-    this->current_size_ + sizeof (rec);
+  ++this->num_records_;
+  this->current_size_ += log_record_size(rec);
 
   return 0;
 }
@@ -134,9 +134,8 @@ TAO_LogRecordStore::remove (DsLogAdmin::RecordId id)
       return -1;
     }
 
-  --(this->num_records_);
-  this->current_size_ =
-    this->current_size_ - sizeof (rec);
+  --this->num_records_;
+  this->current_size_ -= log_record_size(rec);
   // TODO: return ids to a reuse list.
 
   return 0;
@@ -170,13 +169,35 @@ TAO_LogRecordStore::purge_old_records (void)
 }
 
 
-
 TAO_LogRecordStore::LOG_RECORD_STORE &
 TAO_LogRecordStore::get_storage (void)
 {
   return rec_hash_;
 }
 
+size_t
+TAO_LogRecordStore::log_record_size (const DsLogAdmin::LogRecord &rec)
+{
+  size_t mb_size = 0;
+  TAO::Any_Impl *impl = rec.info.impl ();
+  
+  if (impl->encoded ())
+    {
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+        
+      mb_size = unk->_tao_get_cdr ().start ()->length ();
+    }
+  else
+    {
+      // If the Any is not encoded, it just has a stored value
+      // instead of a CDR stream, not sure what info would be
+      // useful here.
+    }
+  
+  return sizeof (rec) + mb_size;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash_Map_Entry<DsLogAdmin::RecordId,DsLogAdmin::LogRecord>;
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 55025c60e81..d2801398c56 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -118,6 +118,9 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
  protected:
 
+  /// The size of a LogRecord	 
+  size_t log_record_size(const DsLogAdmin::LogRecord &rec);
+
   /// Assigned to a new RecordId and then incremented
   /// @@ Should I have a list of reclaimed id's for when records are
   /// deleted?
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
index 1b109770505..06edd5a1eda 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
@@ -3,6 +3,7 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "ace/OS_NS_sys_time.h"
 
 ACE_RCSID (Log,
            LogRecordStore_persist,
@@ -30,7 +31,7 @@ TAO_LogRecordStore::~TAO_LogRecordStore (void)
 
 int
 TAO_LogRecordStore::open (void)
-{ 
+{
   // Open the persistent store supplying a filename.
   sprintf (this->file_name_, "%s.%d", PERSISTENT_LOG_FILE_NAME, logid_);
 
@@ -159,7 +160,7 @@ TAO_LogRecordStore::remove (DsLogAdmin::RecordId id)
 int
 TAO_LogRecordStore::purge_old_records (void)
 {
-  CORBA::ULongLong num_records_to_purge =  (this->num_records_) * ( (CORBA::ULongLong) 5 / (CORBA::ULongLong)100 );
+  CORBA::ULongLong num_records_to_purge = this->num_records_ * 5U / 100U;
 
   if (num_records_to_purge < 1)
     num_records_to_purge = 1;
@@ -169,24 +170,23 @@ TAO_LogRecordStore::purge_old_records (void)
   CORBA::ULong count = 0; // count of matches found.
 
   if (num_records_to_purge > 0 )
-  {
-    for (CORBA::ULong i = 0; i < num_records_to_purge; ++i)
     {
-        if (iter.next (hash_entry) == -1 || iter.advance () == -1)
+      for (CORBA::ULongLong i = 0; i < num_records_to_purge; ++i)
         {
-          break;
-        }
+          if (iter.next (hash_entry) == -1 || iter.advance () == -1)
+            break;
 
-        if (this->remove (hash_entry->int_id_.id) == 0)
-          count++;
+          if (this->remove (hash_entry->int_id_.id) == 0)
+            count++;
+        }
     }
-  }
+
   return count;
 }
 
 
 
-TAO_LogRecordStore::LOG_RECORD_STORE&
+TAO_LogRecordStore::LOG_RECORD_STORE &
 TAO_LogRecordStore::get_storage (void)
 {
   return rec_hash_;
@@ -206,7 +206,6 @@ template class ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::RecordId, DsLogAdmin::L
 template class ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>,
   ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>;
-template class ACE_Equal_To<DsLogAdmin::RecordId>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -222,6 +221,5 @@ ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>,
 ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Equal_To<DsLogAdmin::RecordId>
 
 #endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
index 0cac5583e9d..b9c6239025c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
@@ -30,6 +30,7 @@
 #include "orbsvcs/DsLogAdminC.h"
 #include "ace/Containers.h"
 #include "ace/Hash_Map_Manager.h"
+#include "ace/Null_Mutex.h"
 #include "log_serv_export.h"
 #include "PersistStore.h"
 
@@ -60,7 +61,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
                       = LOG_DEFAULT_MAX_REC_LIST_LEN);
 
   /// Destructor.
-  ~LogRecordStore (void);
+  ~TAO_LogRecordStore (void);
 
   /// Initialization.
   int open (void);
@@ -92,7 +93,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   /// id. Returns 0 on success, -1 on failure.
   int retrieve (DsLogAdmin::RecordId id, DsLogAdmin::LogRecord &rec);
 
-  /// update into storage. Returns 0 on success -1 on failure.
+  /// Update into storage. Returns 0 on success -1 on failure.
   int update (DsLogAdmin::LogRecord &rec);
 
   /// Remove the record with id <id> from the LogRecordStore. Returns 0 on
@@ -117,7 +118,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
 
   /// Get the underlying storage.
   /// @@ return a const ref? we don't want anyone to modify the storage.
-  LogRecordStore::LOG_RECORD_STORE& get_storage (void);
+  TAO_LogRecordStore::LOG_RECORD_STORE& get_storage (void);
 
  protected:
 
@@ -142,10 +143,10 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   CORBA::ULong max_rec_list_len_;
 
   /// The persistence storage.
-  PersistStore persist_store_;
+  TAO_PersistStore persist_store_;
 
   /// The hash of LogRecord ids to LogRecord 's.
-  LogRecordStore::LOG_RECORD_HASH_MAP rec_hash_;
+  TAO_LogRecordStore::LOG_RECORD_HASH_MAP rec_hash_;
 
   /// Persistent log file name.
   char file_name_[256];
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 59f18a7d98f..7e2f0363c72 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -25,13 +25,13 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (
   ACE_CString name2 = (ACE_CString)"time";
   ACE_CString name3 = (ACE_CString)"info";
 
-  CORBA::Any *value = 0;
+  CORBA::Any* value;
   ACE_NEW (value, CORBA::Any);
 
 #if defined (ACE_LACKS_LONGLONG_T)
   *value <<= ACE_U64_TO_U32 (this->rec_.id);
 #else
-  *value <<= ACE_static_cast (ACE_UINT32, (this->rec_.id));
+  *value <<= static_cast<ACE_UINT32> ((this->rec_.id));
 #endif
   if (value != 0)
     {
@@ -39,13 +39,13 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (
       this->property_lookup_.bind (name1, value);
     }
 
-  CORBA::Any *value2 = 0;
+  CORBA::Any* value2;
   ACE_NEW (value2, CORBA::Any);
 
 #if defined (ACE_LACKS_LONGLONG_T)
   *value2 <<= ACE_U64_TO_U32 (this->rec_.time)
 #else
-  *value2 <<= ACE_static_cast (ACE_UINT32, (this->rec_.time));
+  *value2 <<= static_cast<ACE_UINT32> ((this->rec_.time));
 #endif
   if (value2 != 0)
     {
@@ -53,7 +53,7 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (
       this->property_lookup_.bind (name2, value2);
     }
 
-  CORBA::Any *value3 = 0;
+  CORBA::Any* value3;
   ACE_NEW (value3, CORBA::Any);
 
   *value3 <<= this->rec_.info;
@@ -103,15 +103,12 @@ TAO_Log_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
   const char *name = ident->value ();
   ACE_CString key (name, 0, 0);
 
-  CORBA::Any *any = 0;
+  CORBA::Any_var any;
 
   if (this->property_lookup_.find (key, any) == 0)
     {
-      if (any != 0)
-        {
-          this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (any));
-          return_value = 0;
-        }
+      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (any.ptr ()));
+      return_value = 0;
     }
 
   return return_value;
@@ -196,13 +193,12 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
                     {
                       TAO_OutputCDR cdr;
                       cdr.write_ulong ((CORBA::ULong) disc_val);
-
+                      TAO_InputCDR in_cdr (cdr);
                       TAO::Unknown_IDL_Type *unk = 0;
                       ACE_NEW_RETURN (unk,
                                       TAO::Unknown_IDL_Type (
                                           disc_tc.in (),
-                                          cdr.begin (),
-                                          TAO_ENCAP_BYTE_ORDER
+                                          in_cdr
                                         ),
                                       -1);
 
@@ -282,7 +278,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
           // the nested component.
           if (nested == 0)
             {
-              TAO_ETCL_Literal_Constraint lit (this->current_member_);
+              TAO_ETCL_Literal_Constraint lit (this->current_member_.ptr ());
               this->queue_.enqueue_head (lit);
               return 0;
             }
@@ -382,7 +378,7 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
 
       if (comp == 0)
         {
-          TAO_ETCL_Literal_Constraint result (value);
+          TAO_ETCL_Literal_Constraint result (value.ptr ());
           this->queue_.enqueue_head (result);
           return 0;
         }
@@ -418,10 +414,9 @@ TAO_Log_Constraint_Visitor::visit_component_assoc (
 
   const char *name = assoc->identifier ()->value ();
   ACE_CString key (name, 0, 0);
-  CORBA::Any *any = 0;
+  CORBA::Any_var any;
 
-  if (this->property_lookup_.find (key, any) != 0
-      || any == 0)
+  if (this->property_lookup_.find (key, any) != 0)
     {
       return -1;
     }
@@ -430,19 +425,17 @@ TAO_Log_Constraint_Visitor::visit_component_assoc (
 
   if (comp == 0)
     {
-      TAO_ETCL_Literal_Constraint result (any);
+      TAO_ETCL_Literal_Constraint result (any.ptr ());
       this->queue_.enqueue_head (result);
       return 0;
     }
-  else
-    {
-      CORBA::Any *any_ptr = 0;
-      ACE_NEW_RETURN (any_ptr,
-                      CORBA::Any (*any),
-                      -1);
-      this->current_member_ = any_ptr;
-      return comp->accept (this);
-    }
+
+  CORBA::Any *any_ptr = 0;
+  ACE_NEW_RETURN (any_ptr,
+                  CORBA::Any (any.in ()),
+                  -1);
+  this->current_member_ = any_ptr;
+  return comp->accept (this);
 }
 
 int
@@ -522,7 +515,7 @@ TAO_Log_Constraint_Visitor::visit_component_array (
 
       if (comp == 0)
         {
-          TAO_ETCL_Literal_Constraint result (value);
+          TAO_ETCL_Literal_Constraint result (value.ptr ());
           this->queue_.enqueue_head (result);
           return 0;
         }
@@ -581,7 +574,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
             CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
-            TAO_ETCL_Literal_Constraint lit (disc_any);
+            TAO_ETCL_Literal_Constraint lit (disc_any.ptr ());
             this->queue_.enqueue_head (lit);
             return 0;
           }
@@ -1322,8 +1315,7 @@ TAO_Log_Constraint_Visitor::any_does_contain (
 
   *any >>= result;
 
-  TAO_ETCL_Literal_Constraint element (ACE_const_cast (CORBA::Any *,
-                                                       result));
+  TAO_ETCL_Literal_Constraint element (const_cast<CORBA::Any *> (result));
 
   return (item == element);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
index abba100cb81..074e3538f10 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
@@ -104,11 +104,14 @@ private:
 
 private:
 
+  typedef ACE_Hash_Map_Manager <ACE_CString,
+                                CORBA::Any_var,
+                                TAO_SYNCH_MUTEX> HASH_MAP;
+
+  typedef HASH_MAP::ENTRY HASH_ENTRY;
+        
   /// Used to lookup property name and values.
-  ACE_Hash_Map_Manager <ACE_CString, 
-                        CORBA::Any*,
-                        TAO_SYNCH_MUTEX> 
-  property_lookup_;
+  HASH_MAP property_lookup_;
 
   /// The result of a non_boolean operation.
   ACE_Unbounded_Queue<TAO_ETCL_Literal_Constraint> queue_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 0e1f1242ced..bc6a1d15b45 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -601,7 +601,7 @@ TAO_Log_i::query_i (const char *constraint,
   // Create an iterator
   TAO_LogRecordStore::LOG_RECORD_HASH_MAP_ITER iter (store);
 
-  CORBA::ULong len = ACE_static_cast (CORBA::ULong, store.current_size ());
+  CORBA::ULong len = static_cast<CORBA::ULong> (store.current_size ());
 
   // How many entries?
 
@@ -756,7 +756,7 @@ TAO_Log_i::match_i (const char *constraint,
   // Create an iterator
   TAO_LogRecordStore::LOG_RECORD_STORE_ITER iter (store);
 
-  CORBA::ULong len = ACE_static_cast (CORBA::ULong, store.current_size ());
+  CORBA::ULong len = static_cast<CORBA::ULong> (store.current_size ());
   // How many entries?
 
   // Iterate over and populate the list.
@@ -1236,6 +1236,9 @@ void
 TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  if (this->max_record_life_ == 0) {
+    return;
+  }
 
   TimeBase::TimeT time;
   ORBSVCS_Time::Time_Value_to_TimeT (time, ACE_OS::gettimeofday ());
@@ -1247,7 +1250,7 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
   static char out[256] = "";
 
   double temp1 = 
-    ACE_static_cast (double, ACE_UINT64_DBLCAST_ADAPTER (p_time));
+    static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (p_time));
 
   ACE_OS::sprintf (out, "time > %.0f", temp1);
 
@@ -1263,7 +1266,7 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
   // Create an iterator
   TAO_LogRecordStore::LOG_RECORD_STORE_ITER iter (store);
 
-  CORBA::ULong len = ACE_static_cast (CORBA::ULong, store.current_size ());
+  CORBA::ULong len = static_cast<CORBA::ULong> (store.current_size ());
   // How many entries?
 
   // Iterate over and populate the list.
@@ -1303,9 +1306,7 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
     {
       CORBA::ULongLong current_size = this->recordstore_.get_current_size ();
       const CORBA::UShort percent =
-        ACE_static_cast (
-          CORBA::UShort,
-          ((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U) /
+        static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U) /
            (double) ACE_UINT64_DBLCAST_ADAPTER (max_size)));
 
       while (current_threshold_ < this->thresholds_.length ()
@@ -1358,9 +1359,7 @@ TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     {
       CORBA::ULongLong current_size = this->recordstore_.get_current_size ();
       const CORBA::UShort percent =
-        ACE_static_cast (
-          CORBA::UShort,
-          (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) /
+        static_cast<CORBA::UShort> ((((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) /
             (double) ACE_UINT64_DBLCAST_ADAPTER (max_size)));
 
       this->current_threshold_ = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index c170bfc266a..b375bdd8a43 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -87,7 +87,7 @@ TAO_NotifyLogFactory_i::create (
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin,
-        DsLogAdmin::LogId_out id
+        DsLogAdmin::LogId_out id_out
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
@@ -98,11 +98,14 @@ TAO_NotifyLogFactory_i::create (
         CosNotification::UnsupportedAdmin
       ))
 {
-  // Get an id for this Log.
-  this->max_id_++;
+  DsLogAdmin::LogId id;
+
+  // Get an unused/unique id for this Log.
+  while (hash_map_.find ((id = this->next_id_++)) == 0)
+    ;
 
   DsNotifyLogAdmin::NotifyLog_ptr notifylog =
-    this->create_with_id (this->max_id_,
+    this->create_with_id (id,
                           full_action,
                           max_rec_size,
                           thresholds,
@@ -112,12 +115,7 @@ TAO_NotifyLogFactory_i::create (
   ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
 
   // Set the id to return..
-  id = this->max_id_;
-
-  // Store the id in the LogIdList.
-  CORBA::ULong len = logid_list_.length();
-  logid_list_.length(len+1);
-  logid_list_[len] = id;
+  id_out = id;
 
   return notifylog;
 }
@@ -185,7 +183,7 @@ TAO_NotifyLogFactory_i::create_with_id (
   ACE_CHECK_RETURN (notify_log._retn ());
 
   // Add to the Hash table..
-  if (hash_map_.bind (id, 
+  if (hash_map_.bind (id,
                       DsNotifyLogAdmin::NotifyLog::_duplicate (notify_log.in ())) == -1)
     ACE_THROW_RETURN (CORBA::INTERNAL (),
                       DsNotifyLogAdmin::NotifyLog::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index 88e58478c13..df5bda921c0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -59,8 +59,8 @@ TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
   CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   DsNotifyLogAdmin::NotifyLog_var log =
-    notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, ACE_static_cast(const CosNotification::QoSProperties, *qos),
-                               ACE_static_cast(const CosNotification::AdminProperties, *admin), id);
+    notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
+                               static_cast<const CosNotification::AdminProperties> (*admin), id);
 
   this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
@@ -82,8 +82,8 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
   CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   DsNotifyLogAdmin::NotifyLog_var log =
-    notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, ACE_static_cast(const CosNotification::QoSProperties, *qos),
-                               ACE_static_cast(const CosNotification::AdminProperties, *admin));
+    notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
+                               static_cast<const CosNotification::AdminProperties> (*admin));
 
   this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
index 89e7127cfa0..3f1b92bedaa 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
@@ -40,11 +40,11 @@ TAO_PersistStore::open (const char * file_name)
     return -1;
   }
 
-  // Open the persistnet log file for reading.
+  // Open the persistent log file for reading.
   this->read_persistent_file_ = ACE_OS::open (file_name,
                                           O_RDONLY);
 
-  if (this->write_persistent_file_ == ACE_INVALID_HANDLE) {
+  if (this->read_persistent_file_ == ACE_INVALID_HANDLE) {
     perror ("open:read");
     return -1;
   }
@@ -93,7 +93,7 @@ TAO_PersistStore::log (DsLogAdmin::LogRecord &rec)
   CORBA::TypeCode_ptr tc;
   ACE_Message_Block *mb;
   struct PersistentData data;
-  char *rd_ptr;
+  char *rd_ptr = NULL;
 
   // Check if we are allowed to write...
   if (max_size_ !=0 && current_size_ >= max_size_)
@@ -114,11 +114,16 @@ TAO_PersistStore::log (DsLogAdmin::LogRecord &rec)
   mb = rec.info._tao_get_cdr ();  // TAO extension
   data.byte_order = rec.info._tao_byte_order ();
 
-  // Get a pointer to the actual data in the ACE_Message_Block.
-  rd_ptr = mb->rd_ptr ();
+  if (mb != NULL) {
+    // Get a pointer to the actual data in the ACE_Message_Block.
+    rd_ptr = mb->rd_ptr ();
 
-  // Get the size of the actual data in the ACE_Message_Block.
-  data.mb_size = mb->length ();
+    // Get the size of the actual data in the ACE_Message_Block.
+    data.mb_size = mb->length ();
+  } else {
+    ACE_DEBUG((LM_INFO, "Skipped empty Any\n"));
+    data.mb_size = 0;
+  }
 
   // Store the first chunk of persistent data.
   // Get the kind of the CORBA::Any stored in the record.
@@ -134,9 +139,11 @@ TAO_PersistStore::log (DsLogAdmin::LogRecord &rec)
   ACE_OS::write (this->write_persistent_file_, (void*) tc, sizeof (CORBA::TypeCode));
   this->current_size_ += sizeof (CORBA::TypeCode);
 
-  // Write the actual message block data to the file.
-  ACE_OS::write (this->write_persistent_file_, (void*) rd_ptr, data.mb_size);
-  this->current_size_ += data.mb_size;
+  if (rd_ptr != NULL) {
+    // Write the actual message block data to the file.
+    ACE_OS::write (this->write_persistent_file_, (void*) rd_ptr, data.mb_size);
+    this->current_size_ += data.mb_size;
+  }
 
   // Unlock the mutex
   write_lock_.release();
@@ -154,8 +161,6 @@ TAO_PersistStore::log (DsLogAdmin::LogRecord &rec)
 int
 TAO_PersistStore::retrieve (DsLogAdmin::RecordId id, DsLogAdmin::LogRecord &rec)
 {
-  CORBA::TypeCode_var tc;
-  char *mb_data = NULL;
   int retval = -1;
   struct PersistentData data;
 
@@ -166,40 +171,46 @@ TAO_PersistStore::retrieve (DsLogAdmin::RecordId id, DsLogAdmin::LogRecord &rec)
                        (void*) &data,
                        sizeof (PersistentData)) > 0)
   {
-    tc = new CORBA::TypeCode (data.kind);
+    // Check to see if this id matches.
+    if (id != data.id)
+    {
+      // Skip record
+      ACE_OS::lseek(this->write_persistent_file_,
+		    sizeof (CORBA::TypeCode) + data.mb_size,
+		    SEEK_CUR);
+      continue;
+    }
+
+    CORBA::TypeCode_var tc = new CORBA::TypeCode (data.kind);
 
     ACE_OS::read (this->write_persistent_file_,
                   (void*) tc.in (),
                   sizeof (CORBA::TypeCode));
 
-    mb_data = new char[data.mb_size];
+    char *mb_data = new char[data.mb_size];
+
     ACE_OS::read (this->write_persistent_file_,
                   (void*) mb_data,
                   data.mb_size);
 
-    // Check to see if this id matches.
-    if (id == data.id)
-    {
-      // Create the message block.
-      ACE_Message_Block mb2 (mb_data, data.mb_size);
+    // Create the message block.
+    ACE_Message_Block mb2 (mb_data, data.mb_size);
 
-      // Set the write pointer
-      mb2.wr_ptr (data.mb_size);
+    // Set the write pointer
+    mb2.wr_ptr (data.mb_size);
 
-      rec.id = id;
-      rec.time = data.time;
+    rec.id = id;
+    rec.time = data.time;
 
-      TAO::Unknown_IDL_Type *unk = 0;
-      ACE_NEW_RETURN (unk,
-                      TAO::Unknown_IDL_Type (tc.in (),
-                                             &mb2,
-                                             data.byte_order),
-                      -1);
-      rec.info.replace (unk);
+    TAO::Unknown_IDL_Type *unk = 0;
+    ACE_NEW_RETURN (unk,
+		                TAO::Unknown_IDL_Type (tc.in (),
+					                                 TAO_InputCDR (&mb2)),
+		               -1);
+    rec.info.replace (unk);
 
-      retval = 1;
-      break;
-    }
+    retval = 1;
+    break;
   }
 
   return retval;
@@ -212,6 +223,5 @@ TAO_PersistStore::get_percentage_full (void)
   if (this->max_size_ == 0)
     return 0;
 
-  return ACE_static_cast (unsigned short,
-                          (100U * this->current_size_ / this->max_size_));
+  return static_cast<unsigned short> ((100U * this->current_size_ / this->max_size_));
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index 022ff15dfb6..3766c63094f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -18,10 +18,6 @@
 
 #include "ace/Auto_Ptr.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ConsumerAdmin.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Log,
            RTEventLogFactory_i,
            "$Id$")
@@ -124,7 +120,7 @@ TAO_RTEventLogFactory_i::init (PortableServer::POA_ptr poa,
 
   this->consumer_admin_ = this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  ACE_NEW_THROW_EX (this->notifier_, 
+  ACE_NEW_THROW_EX (this->notifier_,
                     TAO_RTEventLogNotification(this->event_channel_.in ()),
                     CORBA::NO_MEMORY ());
   return 0;
@@ -160,12 +156,12 @@ TAO_RTEventLogFactory_i::activate (PortableServer::POA_ptr poa
   return v_return._retn ();
 }
 
-RTEventLogAdmin::EventLog_ptr 
+RTEventLogAdmin::EventLog_ptr
 TAO_RTEventLogFactory_i::create (
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_rec_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
-        DsLogAdmin::LogId_out id
+        DsLogAdmin::LogId_out id_out
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
@@ -174,11 +170,14 @@ TAO_RTEventLogFactory_i::create (
         DsLogAdmin::InvalidThreshold
       ))
 {
-  // Get an id for this Log.
-  this->max_id_++;
+  DsLogAdmin::LogId id;
+
+  // Get an unused/unique id for this Log.
+  while (hash_map_.find ((id = this->next_id_++)) == 0)
+    ;
 
   RTEventLogAdmin::EventLog_ptr eventlog =
-    this->create_with_id (this->max_id_,
+    this->create_with_id (id,
                           full_action,
                           max_rec_size,
                           thresholds
@@ -186,17 +185,12 @@ TAO_RTEventLogFactory_i::create (
   ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
 
   // Set the id to return..
-  id = this->max_id_;
-
-  // Store the id in the LogIdList.
-  CORBA::ULong len = logid_list_.length();
-  logid_list_.length(len+1);
-  logid_list_[len] = id;
+  id_out = id;
 
   return eventlog;
 }
 
-RTEventLogAdmin::EventLog_ptr 
+RTEventLogAdmin::EventLog_ptr
 TAO_RTEventLogFactory_i::create_with_id (
         DsLogAdmin::LogId id,
         DsLogAdmin::LogFullActionType full_action,
@@ -230,14 +224,14 @@ TAO_RTEventLogFactory_i::create_with_id (
                                       this->notifier_,
                                       id,
                                       full_action,
-                                      max_size                              
+                                      max_size
                                       ),
                     CORBA::NO_MEMORY ());
 
   ACE_CHECK_RETURN (event_log._retn ());
 
   PortableServer::ServantBase_var safe_event_log_i = event_log_i;
-  // Transfer ownership to POA.  
+  // Transfer ownership to POA.
 
   event_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (event_log._retn ());
@@ -261,7 +255,7 @@ TAO_RTEventLogFactory_i::create_with_id (
   return event_log._retn ();
 }
 
-RtecEventChannelAdmin::ProxyPushSupplier_ptr 
+RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_RTEventLogFactory_i::obtain_push_supplier (
         ACE_ENV_SINGLE_ARG_DECL_NOT_USED
       )
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index e221ae641b5..af7aa28b003 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -1,41 +1,45 @@
 ##  Process this file with automake to create Makefile.in
 
 includedir = @includedir@/orbsvcs
+pkgconfigdatadir = ${prefix}/lib/pkgconfig
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
 
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 
-## Makefile.CosNaming.am 
+noinst_HEADERS =
+noinst_LTLIBRARIES =
+nobase_include_HEADERS =
+lib_LTLIBRARIES =
+CLEANFILES =
+BUILT_SOURCES =
 
-BUILT_SOURCES = \
+## Makefile.CosNaming.am
+
+BUILT_SOURCES += \
   CosNamingS_T.cpp \
   CosNamingC.inl \
-  CosNamingS_T.inl \
   CosNamingC.cpp \
-  CosNamingC.h \
-  CosNamingS_T.h
+  CosNamingC.h
 
-CLEANFILES = \
+CLEANFILES += \
   CosNamingS_T.cpp \
   CosNamingC.inl \
-  CosNamingS_T.inl \
   CosNamingC.cpp \
   CosNamingC.h \
-  CosNamingS_T.h \
   CosNaming-stamp
 
-CosNamingS_T.cpp CosNamingC.inl CosNamingS_T.inl CosNamingC.cpp CosNamingC.h CosNamingS_T.h: CosNaming-stamp
+CosNamingS_T.cpp CosNamingC.inl CosNamingC.cpp CosNamingC.h: CosNaming-stamp
 
 CosNaming-stamp: $(srcdir)/CosNaming.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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 $@
 
-lib_LTLIBRARIES = libTAO_CosNaming.la
+lib_LTLIBRARIES += libTAO_CosNaming.la
 
 libTAO_CosNaming_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -57,22 +61,22 @@ libTAO_CosNaming_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-nobase_include_HEADERS = \
-  Channel_Clients_T.h \
+nobase_include_HEADERS += \
   CosNamingC.h \
-  CosNamingS_T.h \
   Naming/Naming_Client.h \
-  Channel_Clients_T.i \
+  Naming/naming_export.h \
   CosNamingC.inl \
-  CosNamingS_T.inl \
-  Channel_Clients_T.cpp \
-  CosNamingS_T.cpp \
   CosNaming.idl
 
+pkgconfigdata_DATA = 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
+
 EXTRA_DIST = \
   CosNaming.rc
 
-## Makefile.CosProperty.am 
+## Makefile.CosProperty.am
 
 BUILT_SOURCES += \
   CosPropertyServiceS_T.cpp \
@@ -131,23 +135,25 @@ libTAO_CosProperty_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   CosPropertyServiceC.h \
   CosPropertyServiceS.h \
   CosPropertyServiceS_T.h \
   Property/CosPropertyService_i.h \
-  Channel_Clients_T.i \
   CosPropertyServiceC.inl \
   CosPropertyServiceS.inl \
   CosPropertyServiceS_T.inl \
-  Channel_Clients_T.cpp \
   CosPropertyServiceS_T.cpp \
   CosPropertyService.idl
 
 EXTRA_DIST += \
   CosProperty.rc
 
-## Makefile.AV.am 
+pkgconfigdata_DATA += 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
+
+## Makefile.AV.am
 
 BUILT_SOURCES += \
   AVStreamsS_T.cpp \
@@ -357,7 +363,7 @@ nobase_include_HEADERS += \
 EXTRA_DIST += \
   AV.rc
 
-## Makefile.CosConcurrency.am 
+## Makefile.CosConcurrency.am
 
 BUILT_SOURCES += \
   CosConcurrencyControlS_T.cpp \
@@ -420,7 +426,6 @@ libTAO_CosConcurrency_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Concurrency/CC_Lock.h \
   Concurrency/CC_LockSet.h \
   Concurrency/CC_LockSetFactory.h \
@@ -429,39 +434,38 @@ nobase_include_HEADERS += \
   CosConcurrencyControlC.h \
   CosConcurrencyControlS.h \
   CosConcurrencyControlS_T.h \
-  Channel_Clients_T.i \
   CosConcurrencyControlC.inl \
   CosConcurrencyControlS.inl \
   CosConcurrencyControlS_T.inl \
-  Channel_Clients_T.cpp \
   CosConcurrencyControlS_T.cpp \
   CosConcurrencyControl.idl
 
 EXTRA_DIST += \
   CosConcurrency.rc
 
-## Makefile.CosEvent.am 
+pkgconfigdata_DATA += 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
+
+## Makefile.CosEvent.am
 
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   CosEventChannelAdminS_T.cpp \
   CosEventChannelAdminC.inl \
-  CosEventChannelAdminS_T.inl \
   CosEventChannelAdminC.cpp \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminS_T.h
+  CosEventChannelAdminC.h
 
 CLEANFILES += \
   CosEventChannelAdminS_T.cpp \
   CosEventChannelAdminC.inl \
-  CosEventChannelAdminS_T.inl \
   CosEventChannelAdminC.cpp \
   CosEventChannelAdminC.h \
-  CosEventChannelAdminS_T.h \
   CosEventChannelAdmin-stamp
 
-CosEventChannelAdminS_T.cpp CosEventChannelAdminC.inl CosEventChannelAdminS_T.inl CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminS_T.h: CosEventChannelAdmin-stamp
+CosEventChannelAdminS_T.cpp CosEventChannelAdminC.inl CosEventChannelAdminC.cpp CosEventChannelAdminC.h: CosEventChannelAdmin-stamp
 
 CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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 -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
@@ -470,21 +474,17 @@ CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl
 BUILT_SOURCES += \
   CosEventCommS_T.cpp \
   CosEventCommC.inl \
-  CosEventCommS_T.inl \
   CosEventCommC.cpp \
-  CosEventCommC.h \
-  CosEventCommS_T.h
+  CosEventCommC.h
 
 CLEANFILES += \
   CosEventCommS_T.cpp \
   CosEventCommC.inl \
-  CosEventCommS_T.inl \
   CosEventCommC.cpp \
   CosEventCommC.h \
-  CosEventCommS_T.h \
   CosEventComm-stamp
 
-CosEventCommS_T.cpp CosEventCommC.inl CosEventCommS_T.inl CosEventCommC.cpp CosEventCommC.h CosEventCommS_T.h: CosEventComm-stamp
+CosEventCommS_T.cpp CosEventCommC.inl CosEventCommC.cpp CosEventCommC.h: CosEventComm-stamp
 
 CosEventComm-stamp: $(srcdir)/CosEventComm.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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 -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
@@ -493,21 +493,17 @@ CosEventComm-stamp: $(srcdir)/CosEventComm.idl
 BUILT_SOURCES += \
   CosTypedEventChannelAdminS_T.cpp \
   CosTypedEventChannelAdminC.inl \
-  CosTypedEventChannelAdminS_T.inl \
   CosTypedEventChannelAdminC.cpp \
-  CosTypedEventChannelAdminC.h \
-  CosTypedEventChannelAdminS_T.h
+  CosTypedEventChannelAdminC.h
 
 CLEANFILES += \
   CosTypedEventChannelAdminS_T.cpp \
   CosTypedEventChannelAdminC.inl \
-  CosTypedEventChannelAdminS_T.inl \
   CosTypedEventChannelAdminC.cpp \
   CosTypedEventChannelAdminC.h \
-  CosTypedEventChannelAdminS_T.h \
   CosTypedEventChannelAdmin-stamp
 
-CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS_T.inl CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminS_T.h: CosTypedEventChannelAdmin-stamp
+CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h: CosTypedEventChannelAdmin-stamp
 
 CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -516,21 +512,17 @@ CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl
 BUILT_SOURCES += \
   CosTypedEventCommS_T.cpp \
   CosTypedEventCommC.inl \
-  CosTypedEventCommS_T.inl \
   CosTypedEventCommC.cpp \
-  CosTypedEventCommC.h \
-  CosTypedEventCommS_T.h
+  CosTypedEventCommC.h
 
 CLEANFILES += \
   CosTypedEventCommS_T.cpp \
   CosTypedEventCommC.inl \
-  CosTypedEventCommS_T.inl \
   CosTypedEventCommC.cpp \
   CosTypedEventCommC.h \
-  CosTypedEventCommS_T.h \
   CosTypedEventComm-stamp
 
-CosTypedEventCommS_T.cpp CosTypedEventCommC.inl CosTypedEventCommS_T.inl CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommS_T.h: CosTypedEventComm-stamp
+CosTypedEventCommS_T.cpp CosTypedEventCommC.inl CosTypedEventCommC.cpp CosTypedEventCommC.h: CosTypedEventComm-stamp
 
 CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -562,40 +554,31 @@ libTAO_CosEvent_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
+  CosEvent/event_export.h \
   CosEventChannelAdminC.h \
-  CosEventChannelAdminS_T.h \
   CosEventCommC.h \
-  CosEventCommS_T.h \
   CosTypedEventChannelAdminC.h \
-  CosTypedEventChannelAdminS_T.h \
   CosTypedEventCommC.h \
-  CosTypedEventCommS_T.h \
-  Channel_Clients_T.i \
   CosEventChannelAdminC.inl \
-  CosEventChannelAdminS_T.inl \
   CosEventCommC.inl \
-  CosEventCommS_T.inl \
   CosTypedEventChannelAdminC.inl \
-  CosTypedEventChannelAdminS_T.inl \
   CosTypedEventCommC.inl \
-  CosTypedEventCommS_T.inl \
-  Channel_Clients_T.cpp \
-  CosEventChannelAdminS_T.cpp \
-  CosEventCommS_T.cpp \
-  CosTypedEventChannelAdminS_T.cpp \
-  CosTypedEventCommS_T.cpp \
   CosEventChannelAdmin.idl \
   CosEventComm.idl \
   CosTypedEventChannelAdmin.idl \
   CosTypedEventComm.idl
 
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosEvent.rc
 
-## Makefile.Svc_Utils.am 
+## Makefile.Svc_Utils.am
 
 BUILT_SOURCES += \
   RtecBaseS_T.cpp \
@@ -684,7 +667,6 @@ libTAO_Svc_Utils_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   IOR_Multicast.h \
   RtecBaseC.h \
   RtecBaseS.h \
@@ -694,7 +676,6 @@ nobase_include_HEADERS += \
   TimeBaseS.h \
   TimeBaseS_T.h \
   Time_Utilities.h \
-  Channel_Clients_T.i \
   RtecBaseC.inl \
   RtecBaseS.inl \
   RtecBaseS_T.inl \
@@ -702,16 +683,20 @@ nobase_include_HEADERS += \
   TimeBaseS.inl \
   TimeBaseS_T.inl \
   Time_Utilities.i \
-  Channel_Clients_T.cpp \
   RtecBaseS_T.cpp \
   TimeBaseS_T.cpp \
   RtecBase.idl \
   TimeBase.idl
 
+pkgconfigdata_DATA += 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
+
 EXTRA_DIST += \
   Svc_Utils.rc
 
-## Makefile.CosEvent_Skel.am 
+## Makefile.CosEvent_Skel.am
 
 if !BUILD_MINIMUM_CORBA
 
@@ -744,25 +729,41 @@ libTAO_CosEvent_Skel_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
+  CosEvent/event_skel_export.h \
   CosEventChannelAdminS.h \
+  CosEventChannelAdminS_T.h \
   CosEventCommS.h \
+  CosEventCommS_T.h \
   CosTypedEventChannelAdminS.h \
+  CosTypedEventChannelAdminS_T.h \
   CosTypedEventCommS.h \
-  Channel_Clients_T.i \
+  CosTypedEventCommS_T.h \
   CosEventChannelAdminS.inl \
+  CosEventChannelAdminS_T.inl \
   CosEventCommS.inl \
+  CosEventCommS_T.inl \
   CosTypedEventChannelAdminS.inl \
+  CosTypedEventChannelAdminS_T.inl \
   CosTypedEventCommS.inl \
-  Channel_Clients_T.cpp
+  CosTypedEventCommS_T.inl \
+  CosEventChannelAdminS_T.cpp \
+  CosEventCommS_T.cpp \
+  CosTypedEventChannelAdminS_T.cpp \
+  CosTypedEventCommS_T.cpp
+
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosEvent_Skel.rc
 
-## Makefile.CosEvent_Serv.am 
+## Makefile.CosEvent_Serv.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 CosEvent = \
@@ -825,7 +826,6 @@ libTAO_CosEvent_Serv_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   CosEvent/CEC_ConsumerAdmin.h \
   CosEvent/CEC_ConsumerControl.h \
   CosEvent/CEC_Default_Factory.h \
@@ -851,47 +851,37 @@ nobase_include_HEADERS += \
   CosEvent/CEC_TypedEventChannel.h \
   CosEvent/CEC_TypedProxyPushConsumer.h \
   CosEvent/CEC_TypedSupplierAdmin.h \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminS.h \
-  CosEventCommC.h \
-  CosEventCommS.h \
-  Channel_Clients_T.i \
   CosEvent/CEC_ConsumerAdmin.i \
-  CosEvent/CEC_ConsumerControl.i \
   CosEvent/CEC_Default_Factory.i \
-  CosEvent/CEC_Dispatching.i \
   CosEvent/CEC_Dispatching_Task.i \
   CosEvent/CEC_DynamicImplementation.i \
   CosEvent/CEC_EventChannel.i \
-  CosEvent/CEC_Factory.i \
-  CosEvent/CEC_MT_Dispatching.i \
   CosEvent/CEC_ProxyPullConsumer.i \
   CosEvent/CEC_ProxyPullSupplier.i \
   CosEvent/CEC_ProxyPushConsumer.i \
   CosEvent/CEC_ProxyPushSupplier.i \
-  CosEvent/CEC_Pulling_Strategy.i \
   CosEvent/CEC_Reactive_ConsumerControl.i \
   CosEvent/CEC_Reactive_Pulling_Strategy.i \
   CosEvent/CEC_Reactive_SupplierControl.i \
   CosEvent/CEC_SupplierAdmin.i \
-  CosEvent/CEC_SupplierControl.i \
   CosEvent/CEC_TypedConsumerAdmin.i \
   CosEvent/CEC_TypedEvent.i \
   CosEvent/CEC_TypedEventChannel.i \
   CosEvent/CEC_TypedProxyPushConsumer.i \
-  CosEvent/CEC_TypedSupplierAdmin.i \
-  CosEventChannelAdminC.inl \
-  CosEventChannelAdminS.inl \
-  CosEventCommC.inl \
-  CosEventCommS.inl \
-  Channel_Clients_T.cpp
+  CosEvent/CEC_TypedSupplierAdmin.i
+
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
   CosEvent_Serv.rc
 
-## Makefile.CosLifeCycle.am 
+## Makefile.CosLifeCycle.am
 
 BUILT_SOURCES += \
   CosLifeCycleS_T.cpp \
@@ -981,21 +971,18 @@ libTAO_CosLifeCycle_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   CosLifeCycleC.h \
   CosLifeCycleS.h \
   CosLifeCycleS_T.h \
   LifeCycleServiceC.h \
   LifeCycleServiceS.h \
   LifeCycleServiceS_T.h \
-  Channel_Clients_T.i \
   CosLifeCycleC.inl \
   CosLifeCycleS.inl \
   CosLifeCycleS_T.inl \
   LifeCycleServiceC.inl \
   LifeCycleServiceS.inl \
   LifeCycleServiceS_T.inl \
-  Channel_Clients_T.cpp \
   CosLifeCycleS_T.cpp \
   LifeCycleServiceS_T.cpp \
   CosLifeCycle.idl \
@@ -1004,7 +991,12 @@ nobase_include_HEADERS += \
 EXTRA_DIST += \
   CosLifeCycle.rc
 
-## Makefile.FTORB_Utils.am 
+pkgconfigdata_DATA += 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
+
+## Makefile.FTORB_Utils.am
 
 if !BUILD_MINIMUM_CORBA
 
@@ -1038,30 +1030,26 @@ FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl
 	@touch $@
 
 BUILT_SOURCES += \
-  PortableGroup_Simple_DSS_T.cpp \
   PortableGroup_Simple_DSC.inl \
   PortableGroup_Simple_DSS.inl \
   PortableGroup_Simple_DSS_T.inl \
   PortableGroup_Simple_DSC.cpp \
   PortableGroup_Simple_DSC.h \
-  PortableGroup_Simple_DSS.h \
-  PortableGroup_Simple_DSS_T.h
+  PortableGroup_Simple_DSS.h
 
 CLEANFILES += \
-  PortableGroup_Simple_DSS_T.cpp \
   PortableGroup_Simple_DSC.inl \
   PortableGroup_Simple_DSS.inl \
   PortableGroup_Simple_DSS_T.inl \
   PortableGroup_Simple_DSC.cpp \
   PortableGroup_Simple_DSC.h \
   PortableGroup_Simple_DSS.h \
-  PortableGroup_Simple_DSS_T.h \
   PortableGroup_Simple_DS-stamp
 
-PortableGroup_Simple_DSS_T.cpp PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSS.h PortableGroup_Simple_DSS_T.h: PortableGroup_Simple_DS-stamp
+PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSS.h: PortableGroup_Simple_DS-stamp
 
 PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/PortableGroup_Simple_DS.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_PortableGroup_Simple_Export -Wb,export_include=orbsvcs/PortableGroup_Simple_export.h $(srcdir)/PortableGroup_Simple_DS.idl
 	@touch $@
 
 FTORB_Utils = \
@@ -1079,6 +1067,7 @@ libTAO_FTORB_Utils_la_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_PORTABLEGROUP_SIMPLE_HAS_DLL=0 \
   -DTAO_FT_ORB_UTILS_BUILD_DLL
 
 libTAO_FTORB_Utils_la_SOURCES = \
@@ -1094,30 +1083,37 @@ libTAO_FTORB_Utils_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   FT_CORBA_ORBC.h \
   FT_CORBA_ORBS.h \
   FT_CORBA_ORBS_T.h \
   FaultTolerance/FT_IOGR_Property.h \
+  FaultTolerance/FT_ORB_Utils_export.h \
+  PortableGroup_Simple_export.h \
   PortableGroup_Simple_DSC.h \
+  PortableGroup_Simple_DSS.h \
   PortableGroup_Simple_DSS_T.h \
-  Channel_Clients_T.i \
   FT_CORBA_ORBC.inl \
   FT_CORBA_ORBS.inl \
   FT_CORBA_ORBS_T.inl \
   FaultTolerance/FT_IOGR_Property.i \
   PortableGroup_Simple_DSC.inl \
+  PortableGroup_Simple_DSS.inl \
   PortableGroup_Simple_DSS_T.inl \
-  Channel_Clients_T.cpp \
   FT_CORBA_ORBS_T.cpp \
-  PortableGroup_Simple_DSS_T.cpp \
   FT_CORBA_ORB.idl \
+  PortableGroup_Simple_DSS_T.cpp \
   PortableGroup_Simple_DS.idl
 
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
-## Makefile.PortableGroup.am 
+## Makefile.PortableGroup.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
@@ -1179,6 +1175,7 @@ miop-stamp: $(srcdir)/miop.idl
 	@touch $@
 
 PortableGroup = \
+  PortableGroup/MIOP.cpp \
   PortableGroup/PG_Default_Property_Validator.cpp \
   PortableGroup/PG_FactoryRegistry.cpp \
   PortableGroup/PG_Factory_Map.cpp \
@@ -1232,7 +1229,8 @@ libTAO_PortableGroup_la_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -DTAO_PORTABLEGROUP_BUILD_DLL
+  -DTAO_PORTABLEGROUP_BUILD_DLL \
+  -DTAO_PORTABLEGROUP_SIMPLE_BUILD_DLL
 
 libTAO_PortableGroup_la_SOURCES = \
   $(PortableGroup)
@@ -1250,7 +1248,7 @@ libTAO_PortableGroup_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
+  PortableGroup/MIOP.h \
   PortableGroup/PG_Default_Property_Validator.h \
   PortableGroup/PG_FactoryRegistry.h \
   PortableGroup/PG_Factory_Map.h \
@@ -1289,40 +1287,43 @@ nobase_include_HEADERS += \
   PortableGroup/UIPMC_Profile.h \
   PortableGroup/UIPMC_Transport.h \
   PortableGroup/UIPMC_Wait_Never.h \
+  PortableGroup/portablegroup_export.h \
   PortableGroupC.h \
   PortableGroupS.h \
   PortableGroupS_T.h \
   miopC.h \
   miopS.h \
   miopS_T.h \
-  Channel_Clients_T.i \
   PortableGroup/PG_Location_Equal_To.inl \
   PortableGroup/PG_Location_Hash.inl \
   PortableGroup/PG_Properties_Encoder.inl \
   PortableGroup/UIPMC_Acceptor.i \
-  PortableGroup/UIPMC_Connection_Handler.i \
   PortableGroup/UIPMC_Endpoint.i \
-  PortableGroup/UIPMC_Profile.i \
-  PortableGroup/UIPMC_Transport.i \
   PortableGroupC.inl \
   PortableGroupS.inl \
   PortableGroupS_T.inl \
   miopC.inl \
   miopS.inl \
   miopS_T.inl \
-  Channel_Clients_T.cpp \
   PortableGroupS_T.cpp \
   miopS_T.cpp \
   PortableGroup.idl \
   miop.idl
 
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
   PortableGroup.rc
 
-## Makefile.CosLoadBalancing.am 
+## Makefile.CosLoadBalancing.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_AMI
 if !BUILD_MINIMUM_CORBA
 
@@ -1356,7 +1357,6 @@ CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl
 	@touch $@
 
 BUILT_SOURCES += \
-  LB_ORTS_T.cpp \
   LB_ORTC.inl \
   LB_ORTS.inl \
   LB_ORTS_T.inl \
@@ -1366,7 +1366,6 @@ BUILT_SOURCES += \
   LB_ORTS_T.h
 
 CLEANFILES += \
-  LB_ORTS_T.cpp \
   LB_ORTC.inl \
   LB_ORTS.inl \
   LB_ORTS_T.inl \
@@ -1376,7 +1375,7 @@ CLEANFILES += \
   LB_ORTS_T.h \
   LB_ORT-stamp
 
-LB_ORTS_T.cpp LB_ORTC.inl LB_ORTS.inl LB_ORTS_T.inl LB_ORTC.cpp LB_ORTC.h LB_ORTS.h LB_ORTS_T.h: LB_ORT-stamp
+LB_ORTC.inl LB_ORTS.inl LB_ORTS_T.inl LB_ORTC.cpp LB_ORTC.h LB_ORTS.h LB_ORTS_T.h: LB_ORT-stamp
 
 LB_ORT-stamp: $(srcdir)/LB_ORT.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl
@@ -1443,11 +1442,11 @@ libTAO_CosLoadBalancing_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   CosLoadBalancingC.h \
   CosLoadBalancingS.h \
   CosLoadBalancingS_T.h \
   LB_ORTC.h \
+  LB_ORTS.h \
   LB_ORTS_T.h \
   LoadBalancing/LB_CPU_Load_Average_Monitor.h \
   LoadBalancing/LB_CPU_Utilization_Monitor.h \
@@ -1475,29 +1474,33 @@ nobase_include_HEADERS += \
   LoadBalancing/LB_Random.h \
   LoadBalancing/LB_RoundRobin.h \
   LoadBalancing/LB_ServerRequestInterceptor.h \
-  Channel_Clients_T.i \
   CosLoadBalancingC.inl \
   CosLoadBalancingS.inl \
   CosLoadBalancingS_T.inl \
   LB_ORTC.inl \
+  LB_ORTS.inl \
   LB_ORTS_T.inl \
   LoadBalancing/LB_LeastLoaded.inl \
   LoadBalancing/LB_LoadAlert.inl \
   LoadBalancing/LB_LoadAverage.inl \
   LoadBalancing/LB_LoadMinimum.inl \
-  Channel_Clients_T.cpp \
   CosLoadBalancingS_T.cpp \
-  LB_ORTS_T.cpp \
   CosLoadBalancing.idl \
   LB_ORT.idl
 
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 endif BUILD_AMI
+endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
   CosLoadBalancing.rc
 
-## Makefile.CosNaming_Skel.am 
+## Makefile.CosNaming_Skel.am
 
 lib_LTLIBRARIES += libTAO_CosNaming_Skel.la
 
@@ -1523,16 +1526,24 @@ libTAO_CosNaming_Skel_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   CosNamingS.h \
-  Channel_Clients_T.i \
+  CosNamingS_T.h \
+  Naming/naming_skel_export.h \
   CosNamingS.inl \
-  Channel_Clients_T.cpp
+  CosNamingS_T.inl \
+  CosNamingS_T.cpp
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
   CosNaming_Skel.rc
 
-## Makefile.CosNaming_Serv.am 
+## Makefile.CosNaming_Serv.am
+
+if BUILD_CORBA_MESSAGING
 
 Naming = \
   Naming/Entries.cpp \
@@ -1578,7 +1589,6 @@ libTAO_CosNaming_Serv_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Naming/Entries.h \
   Naming/Flat_File_Persistence.h \
   Naming/Hash_Naming_Context.h \
@@ -1592,36 +1602,36 @@ nobase_include_HEADERS += \
   Naming/Storable_Naming_Context.h \
   Naming/Storable_Naming_Context_Activator.h \
   Naming/Transient_Naming_Context.h \
-  Naming/naming_export.h \
-  Channel_Clients_T.i \
-  Naming/Storable.inl \
-  Channel_Clients_T.cpp
+  Naming/Storable.inl
+
+pkgconfigdata_DATA += 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_CORBA_MESSAGING
 
 EXTRA_DIST += \
   CosNaming_Serv.rc
 
-## Makefile.CosNotification.am 
+## Makefile.CosNotification.am
 
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   CosNotificationS_T.cpp \
   CosNotificationC.inl \
-  CosNotificationS_T.inl \
   CosNotificationC.cpp \
-  CosNotificationC.h \
-  CosNotificationS_T.h
+  CosNotificationC.h
 
 CLEANFILES += \
   CosNotificationS_T.cpp \
   CosNotificationC.inl \
-  CosNotificationS_T.inl \
   CosNotificationC.cpp \
   CosNotificationC.h \
-  CosNotificationS_T.h \
   CosNotification-stamp
 
-CosNotificationS_T.cpp CosNotificationC.inl CosNotificationS_T.inl CosNotificationC.cpp CosNotificationC.h CosNotificationS_T.h: CosNotification-stamp
+CosNotificationS_T.cpp CosNotificationC.inl CosNotificationC.cpp CosNotificationC.h: CosNotification-stamp
 
 CosNotification-stamp: $(srcdir)/CosNotification.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -1630,21 +1640,17 @@ CosNotification-stamp: $(srcdir)/CosNotification.idl
 BUILT_SOURCES += \
   CosNotifyChannelAdminS_T.cpp \
   CosNotifyChannelAdminC.inl \
-  CosNotifyChannelAdminS_T.inl \
   CosNotifyChannelAdminC.cpp \
-  CosNotifyChannelAdminC.h \
-  CosNotifyChannelAdminS_T.h
+  CosNotifyChannelAdminC.h
 
 CLEANFILES += \
   CosNotifyChannelAdminS_T.cpp \
   CosNotifyChannelAdminC.inl \
-  CosNotifyChannelAdminS_T.inl \
   CosNotifyChannelAdminC.cpp \
   CosNotifyChannelAdminC.h \
-  CosNotifyChannelAdminS_T.h \
   CosNotifyChannelAdmin-stamp
 
-CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminC.inl CosNotifyChannelAdminS_T.inl CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminS_T.h: CosNotifyChannelAdmin-stamp
+CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminC.inl CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h: CosNotifyChannelAdmin-stamp
 
 CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -1653,21 +1659,17 @@ CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl
 BUILT_SOURCES += \
   CosNotifyCommS_T.cpp \
   CosNotifyCommC.inl \
-  CosNotifyCommS_T.inl \
   CosNotifyCommC.cpp \
-  CosNotifyCommC.h \
-  CosNotifyCommS_T.h
+  CosNotifyCommC.h
 
 CLEANFILES += \
   CosNotifyCommS_T.cpp \
   CosNotifyCommC.inl \
-  CosNotifyCommS_T.inl \
   CosNotifyCommC.cpp \
   CosNotifyCommC.h \
-  CosNotifyCommS_T.h \
   CosNotifyComm-stamp
 
-CosNotifyCommS_T.cpp CosNotifyCommC.inl CosNotifyCommS_T.inl CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommS_T.h: CosNotifyComm-stamp
+CosNotifyCommS_T.cpp CosNotifyCommC.inl CosNotifyCommC.cpp CosNotifyCommC.h: CosNotifyComm-stamp
 
 CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -1676,21 +1678,17 @@ CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl
 BUILT_SOURCES += \
   CosNotifyFilterS_T.cpp \
   CosNotifyFilterC.inl \
-  CosNotifyFilterS_T.inl \
   CosNotifyFilterC.cpp \
-  CosNotifyFilterC.h \
-  CosNotifyFilterS_T.h
+  CosNotifyFilterC.h
 
 CLEANFILES += \
   CosNotifyFilterS_T.cpp \
   CosNotifyFilterC.inl \
-  CosNotifyFilterS_T.inl \
   CosNotifyFilterC.cpp \
   CosNotifyFilterC.h \
-  CosNotifyFilterS_T.h \
   CosNotifyFilter-stamp
 
-CosNotifyFilterS_T.cpp CosNotifyFilterC.inl CosNotifyFilterS_T.inl CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterS_T.h: CosNotifyFilter-stamp
+CosNotifyFilterS_T.cpp CosNotifyFilterC.inl CosNotifyFilterC.cpp CosNotifyFilterC.h: CosNotifyFilter-stamp
 
 CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -1699,21 +1697,17 @@ CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl
 BUILT_SOURCES += \
   Event_ForwarderS_T.cpp \
   Event_ForwarderC.inl \
-  Event_ForwarderS_T.inl \
   Event_ForwarderC.cpp \
-  Event_ForwarderC.h \
-  Event_ForwarderS_T.h
+  Event_ForwarderC.h
 
 CLEANFILES += \
   Event_ForwarderS_T.cpp \
   Event_ForwarderC.inl \
-  Event_ForwarderS_T.inl \
   Event_ForwarderC.cpp \
   Event_ForwarderC.h \
-  Event_ForwarderS_T.h \
   Event_Forwarder-stamp
 
-Event_ForwarderS_T.cpp Event_ForwarderC.inl Event_ForwarderS_T.inl Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderS_T.h: Event_Forwarder-stamp
+Event_ForwarderS_T.cpp Event_ForwarderC.inl Event_ForwarderC.cpp Event_ForwarderC.h: Event_Forwarder-stamp
 
 Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -1722,21 +1716,17 @@ Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl
 BUILT_SOURCES += \
   NotifyExtS_T.cpp \
   NotifyExtC.inl \
-  NotifyExtS_T.inl \
   NotifyExtC.cpp \
-  NotifyExtC.h \
-  NotifyExtS_T.h
+  NotifyExtC.h
 
 CLEANFILES += \
   NotifyExtS_T.cpp \
   NotifyExtC.inl \
-  NotifyExtS_T.inl \
   NotifyExtC.cpp \
   NotifyExtC.h \
-  NotifyExtS_T.h \
   NotifyExt-stamp
 
-NotifyExtS_T.cpp NotifyExtC.inl NotifyExtS_T.inl NotifyExtC.cpp NotifyExtC.h NotifyExtS_T.h: NotifyExt-stamp
+NotifyExtS_T.cpp NotifyExtC.inl NotifyExtC.cpp NotifyExtC.h: NotifyExt-stamp
 
 NotifyExt-stamp: $(srcdir)/NotifyExt.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -1772,40 +1762,20 @@ libTAO_CosNotification_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   CosNotificationC.h \
-  CosNotificationS_T.h \
   CosNotifyChannelAdminC.h \
-  CosNotifyChannelAdminS_T.h \
   CosNotifyCommC.h \
-  CosNotifyCommS_T.h \
   CosNotifyFilterC.h \
-  CosNotifyFilterS_T.h \
   Event_ForwarderC.h \
-  Event_ForwarderS_T.h \
   Notify/Notify_Extensions.h \
+  Notify/notify_export.h \
   NotifyExtC.h \
-  NotifyExtS_T.h \
-  Channel_Clients_T.i \
   CosNotificationC.inl \
-  CosNotificationS_T.inl \
   CosNotifyChannelAdminC.inl \
-  CosNotifyChannelAdminS_T.inl \
   CosNotifyCommC.inl \
-  CosNotifyCommS_T.inl \
   CosNotifyFilterC.inl \
-  CosNotifyFilterS_T.inl \
   Event_ForwarderC.inl \
-  Event_ForwarderS_T.inl \
   NotifyExtC.inl \
-  NotifyExtS_T.inl \
-  Channel_Clients_T.cpp \
-  CosNotificationS_T.cpp \
-  CosNotifyChannelAdminS_T.cpp \
-  CosNotifyCommS_T.cpp \
-  CosNotifyFilterS_T.cpp \
-  Event_ForwarderS_T.cpp \
-  NotifyExtS_T.cpp \
   CosNotification.idl \
   CosNotifyChannelAdmin.idl \
   CosNotifyComm.idl \
@@ -1813,12 +1783,17 @@ nobase_include_HEADERS += \
   Event_Forwarder.idl \
   NotifyExt.idl
 
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosNotification.rc
 
-## Makefile.ETCL.am 
+## Makefile.ETCL.am
 
 lib_LTLIBRARIES += libTAO_ETCL.la
 
@@ -1845,18 +1820,20 @@ libTAO_ETCL_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   ETCL/ETCL_Constraint.h \
   ETCL/ETCL_Interpreter.h \
   ETCL/ETCL_y.h \
-  Channel_Clients_T.i \
-  ETCL/ETCL_Constraint.i \
-  Channel_Clients_T.cpp
+  ETCL/ETCL_Constraint.i
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
   ETCL.rc
 
-## Makefile.CosNotification_Skel.am 
+## Makefile.CosNotification_Skel.am
 
 if !BUILD_MINIMUM_CORBA
 
@@ -1892,28 +1869,49 @@ libTAO_CosNotification_Skel_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   CosNotificationS.h \
+  CosNotificationS_T.h \
   CosNotifyChannelAdminS.h \
+  CosNotifyChannelAdminS_T.h \
   CosNotifyCommS.h \
+  CosNotifyCommS_T.h \
   CosNotifyFilterS.h \
+  CosNotifyFilterS_T.h \
   Event_ForwarderS.h \
+  Event_ForwarderS_T.h \
+  Notify/notify_skel_export.h \
   NotifyExtS.h \
-  Channel_Clients_T.i \
+  NotifyExtS_T.h \
   CosNotificationS.inl \
+  CosNotificationS_T.inl \
   CosNotifyChannelAdminS.inl \
+  CosNotifyChannelAdminS_T.inl \
   CosNotifyCommS.inl \
+  CosNotifyCommS_T.inl \
   CosNotifyFilterS.inl \
+  CosNotifyFilterS_T.inl \
   Event_ForwarderS.inl \
+  Event_ForwarderS_T.inl \
   NotifyExtS.inl \
-  Channel_Clients_T.cpp
+  NotifyExtS_T.inl \
+  CosNotificationS_T.cpp \
+  CosNotifyChannelAdminS_T.cpp \
+  CosNotifyCommS_T.cpp \
+  CosNotifyFilterS_T.cpp \
+  Event_ForwarderS_T.cpp \
+  NotifyExtS_T.cpp
+
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosNotification_Skel.rc
 
-## Makefile.CosNotification_Serv.am 
+## Makefile.CosNotification_Serv.am
 
 if !BUILD_MINIMUM_CORBA
 
@@ -1927,6 +1925,7 @@ Notify = \
   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 \
@@ -1934,6 +1933,7 @@ Notify = \
   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 \
@@ -1950,6 +1950,7 @@ Notify = \
   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 \
@@ -1960,6 +1961,7 @@ Notify = \
   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 \
@@ -1967,13 +1969,19 @@ Notify = \
   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/Batch_Buffering_Strategy.cpp \
   Notify/Sequence/SequenceProxyPushConsumer.cpp \
   Notify/Sequence/SequenceProxyPushSupplier.cpp \
   Notify/Sequence/SequencePushConsumer.cpp \
   Notify/Sequence/SequencePushSupplier.cpp \
+  Notify/Standard_Event_Persistence.cpp \
   Notify/Structured/StructuredEvent.cpp \
   Notify/Structured/StructuredProxyPushConsumer.cpp \
   Notify/Structured/StructuredProxyPushSupplier.cpp \
@@ -1985,6 +1993,9 @@ Notify = \
   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/Worker_Task.cpp
 
 lib_LTLIBRARIES += libTAO_CosNotification_Serv.la
@@ -2010,14 +2021,14 @@ libTAO_CosNotification_Serv_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   libTAO_CosNotification_Skel.la \
   libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   libTAO_CosNotification.la \
   libTAO_CosEvent.la \
+  libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Notify/Admin.h \
   Notify/AdminProperties.h \
   Notify/Any/AnyEvent.h \
@@ -2027,6 +2038,7 @@ nobase_include_HEADERS += \
   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 \
@@ -2034,6 +2046,7 @@ nobase_include_HEADERS += \
   Notify/CosNotify_Initializer.h \
   Notify/CosNotify_Service.h \
   Notify/Default_Factory.h \
+  Notify/Delivery_Request.h \
   Notify/ETCL_Filter.h \
   Notify/ETCL_FilterFactory.h \
   Notify/Event.h \
@@ -2050,6 +2063,8 @@ nobase_include_HEADERS += \
   Notify/Method_Request_Lookup.h \
   Notify/Method_Request_Shutdown.h \
   Notify/Method_Request_Updates.h \
+  Notify/Method_Request_Updates_T.h \
+  Notify/Name_Value_Pair.h \
   Notify/Notify_Constraint_Interpreter.h \
   Notify/Notify_Constraint_Visitors.h \
   Notify/Notify_Default_CO_Factory.h \
@@ -2060,20 +2075,30 @@ nobase_include_HEADERS += \
   Notify/Object.h \
   Notify/POA_Helper.h \
   Notify/Peer.h \
+  Notify/Persistent_File_Allocator.h \
   Notify/Properties.h \
   Notify/PropertySeq.h \
   Notify/Property_Boolean.h \
   Notify/Proxy.h \
   Notify/ProxyConsumer.h \
+  Notify/ProxyConsumer_T.h \
   Notify/ProxySupplier.h \
+  Notify/ProxySupplier_T.h \
+  Notify/Proxy_T.h \
   Notify/QoSProperties.h \
+  Notify/Random_File.h \
   Notify/Reactive_Task.h \
+  Notify/Reconnection_Registry.h \
   Notify/Refcountable.h \
+  Notify/Routing_Slip.h \
+  Notify/Routing_Slip_Persistence_Manager.h \
+  Notify/Routing_Slip_Queue.h \
   Notify/Sequence/Batch_Buffering_Strategy.h \
   Notify/Sequence/SequenceProxyPushConsumer.h \
   Notify/Sequence/SequenceProxyPushSupplier.h \
   Notify/Sequence/SequencePushConsumer.h \
   Notify/Sequence/SequencePushSupplier.h \
+  Notify/Standard_Event_Persistence.h \
   Notify/Structured/StructuredEvent.h \
   Notify/Structured/StructuredProxyPushConsumer.h \
   Notify/Structured/StructuredProxyPushSupplier.h \
@@ -2085,39 +2110,22 @@ nobase_include_HEADERS += \
   Notify/ThreadPool_Task.h \
   Notify/Timer_Queue.h \
   Notify/Timer_Reactor.h \
+  Notify/Topology_Loader.h \
+  Notify/Topology_Object.h \
+  Notify/Topology_Saver.h \
   Notify/Worker_Task.h \
-  Channel_Clients_T.i \
   Notify/Admin.inl \
   Notify/AdminProperties.inl \
-  Notify/Any/AnyEvent.inl \
-  Notify/Any/CosEC_ProxyPushConsumer.inl \
-  Notify/Any/CosEC_ProxyPushSupplier.inl \
-  Notify/Any/ProxyPushConsumer.inl \
-  Notify/Any/ProxyPushSupplier.inl \
-  Notify/Any/PushConsumer.inl \
-  Notify/Any/PushSupplier.inl \
   Notify/Buffering_Strategy.inl \
-  Notify/Builder.inl \
   Notify/Consumer.inl \
-  Notify/ConsumerAdmin.inl \
-  Notify/CosNotify_Service.inl \
-  Notify/Default_Factory.inl \
-  Notify/ETCL_Filter.inl \
-  Notify/ETCL_FilterFactory.inl \
+  Notify/Delivery_Request.inl \
   Notify/Event.inl \
-  Notify/EventChannel.inl \
-  Notify/EventChannelFactory.inl \
   Notify/EventType.inl \
-  Notify/EventTypeSeq.inl \
   Notify/Event_Manager.inl \
   Notify/FilterAdmin.inl \
   Notify/ID_Factory.inl \
   Notify/Method_Request.inl \
-  Notify/Method_Request_Dispatch.inl \
-  Notify/Method_Request_Event.inl \
-  Notify/Method_Request_Lookup.inl \
-  Notify/Method_Request_Shutdown.inl \
-  Notify/Method_Request_Updates.inl \
+  Notify/Method_Request_Updates_T.inl \
   Notify/Object.inl \
   Notify/POA_Helper.inl \
   Notify/Peer.inl \
@@ -2129,32 +2137,81 @@ nobase_include_HEADERS += \
   Notify/ProxySupplier.inl \
   Notify/QoSProperties.inl \
   Notify/Reactive_Task.inl \
-  Notify/Refcountable.inl \
-  Notify/Sequence/Batch_Buffering_Strategy.inl \
-  Notify/Sequence/SequenceProxyPushConsumer.inl \
-  Notify/Sequence/SequenceProxyPushSupplier.inl \
-  Notify/Sequence/SequencePushConsumer.inl \
-  Notify/Sequence/SequencePushSupplier.inl \
-  Notify/Structured/StructuredEvent.inl \
-  Notify/Structured/StructuredProxyPushConsumer.inl \
-  Notify/Structured/StructuredProxyPushSupplier.inl \
-  Notify/Structured/StructuredPushConsumer.inl \
-  Notify/Structured/StructuredPushSupplier.inl \
+  Notify/Routing_Slip.inl \
+  Notify/Routing_Slip_Queue.inl \
   Notify/Subscription_Change_Worker.inl \
   Notify/Supplier.inl \
-  Notify/SupplierAdmin.inl \
   Notify/ThreadPool_Task.inl \
-  Notify/Timer_Queue.inl \
-  Notify/Timer_Reactor.inl \
-  Notify/Worker_Task.inl \
-  Channel_Clients_T.cpp
+  Notify/Topology_Object.inl \
+  Notify/Method_Request_Updates_T.cpp \
+  Notify/ProxyConsumer_T.cpp \
+  Notify/ProxySupplier_T.cpp \
+  Notify/Proxy_T.cpp
+
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
 EXTRA_DIST += \
   CosNotification_Serv.rc
 
-## Makefile.CosTime.am 
+## Makefile.CosNotification_Persist.am
+
+if BUILD_ACEXML
+if !BUILD_MINIMUM_CORBA
+
+noinst_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
+
+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@
+
+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 \
+  libTAO_ETCL.la \
+  libTAO_CosNotification_Skel.la \
+  libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  libTAO_CosNotification.la \
+  libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+noinst_HEADERS += \
+  Notify/XML_Loader.h \
+  Notify/XML_Saver.h \
+  Notify/XML_Topology_Factory.h \
+  Channel_Clients_T.i \
+  Event_Utilities.i \
+  Scheduler_Factory.i \
+  Scheduler_Utilities.i \
+  Time_Utilities.i
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_ACEXML
+
+## Makefile.CosTime.am
 
 BUILT_SOURCES += \
   TimeServiceS_T.cpp \
@@ -2217,7 +2274,6 @@ libTAO_CosTime_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Time/TAO_TIO.h \
   Time/TAO_Time_Service_Clerk.h \
   Time/TAO_Time_Service_Server.h \
@@ -2226,37 +2282,36 @@ nobase_include_HEADERS += \
   TimeServiceC.h \
   TimeServiceS.h \
   TimeServiceS_T.h \
-  Channel_Clients_T.i \
   TimeServiceC.inl \
   TimeServiceS.inl \
   TimeServiceS_T.inl \
-  Channel_Clients_T.cpp \
   TimeServiceS_T.cpp \
   TimeService.idl
 
 EXTRA_DIST += \
   CosTime.rc
 
-## Makefile.CosTrading.am 
+pkgconfigdata_DATA += 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
+
+## Makefile.CosTrading.am
 
 BUILT_SOURCES += \
   CosTradingS_T.cpp \
   CosTradingC.inl \
-  CosTradingS_T.inl \
   CosTradingC.cpp \
-  CosTradingC.h \
-  CosTradingS_T.h
+  CosTradingC.h
 
 CLEANFILES += \
   CosTradingS_T.cpp \
   CosTradingC.inl \
-  CosTradingS_T.inl \
   CosTradingC.cpp \
   CosTradingC.h \
-  CosTradingS_T.h \
   CosTrading-stamp
 
-CosTradingS_T.cpp CosTradingC.inl CosTradingS_T.inl CosTradingC.cpp CosTradingC.h CosTradingS_T.h: CosTrading-stamp
+CosTradingS_T.cpp CosTradingC.inl CosTradingC.cpp CosTradingC.h: CosTrading-stamp
 
 CosTrading-stamp: $(srcdir)/CosTrading.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -2265,21 +2320,17 @@ CosTrading-stamp: $(srcdir)/CosTrading.idl
 BUILT_SOURCES += \
   CosTradingDynamicS_T.cpp \
   CosTradingDynamicC.inl \
-  CosTradingDynamicS_T.inl \
   CosTradingDynamicC.cpp \
-  CosTradingDynamicC.h \
-  CosTradingDynamicS_T.h
+  CosTradingDynamicC.h
 
 CLEANFILES += \
   CosTradingDynamicS_T.cpp \
   CosTradingDynamicC.inl \
-  CosTradingDynamicS_T.inl \
   CosTradingDynamicC.cpp \
   CosTradingDynamicC.h \
-  CosTradingDynamicS_T.h \
   CosTradingDynamic-stamp
 
-CosTradingDynamicS_T.cpp CosTradingDynamicC.inl CosTradingDynamicS_T.inl CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicS_T.h: CosTradingDynamic-stamp
+CosTradingDynamicS_T.cpp CosTradingDynamicC.inl CosTradingDynamicC.cpp CosTradingDynamicC.h: CosTradingDynamic-stamp
 
 CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -2288,21 +2339,17 @@ CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl
 BUILT_SOURCES += \
   CosTradingReposS_T.cpp \
   CosTradingReposC.inl \
-  CosTradingReposS_T.inl \
   CosTradingReposC.cpp \
-  CosTradingReposC.h \
-  CosTradingReposS_T.h
+  CosTradingReposC.h
 
 CLEANFILES += \
   CosTradingReposS_T.cpp \
   CosTradingReposC.inl \
-  CosTradingReposS_T.inl \
   CosTradingReposC.cpp \
   CosTradingReposC.h \
-  CosTradingReposS_T.h \
   CosTradingRepos-stamp
 
-CosTradingReposS_T.cpp CosTradingReposC.inl CosTradingReposS_T.inl CosTradingReposC.cpp CosTradingReposC.h CosTradingReposS_T.h: CosTradingRepos-stamp
+CosTradingReposS_T.cpp CosTradingReposC.inl CosTradingReposC.cpp CosTradingReposC.h: CosTradingRepos-stamp
 
 CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -2332,32 +2379,27 @@ libTAO_CosTrading_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   CosTradingC.h \
   CosTradingDynamicC.h \
-  CosTradingDynamicS_T.h \
   CosTradingReposC.h \
-  CosTradingReposS_T.h \
-  CosTradingS_T.h \
-  Channel_Clients_T.i \
+  Trader/trading_export.h \
   CosTradingC.inl \
   CosTradingDynamicC.inl \
-  CosTradingDynamicS_T.inl \
   CosTradingReposC.inl \
-  CosTradingReposS_T.inl \
-  CosTradingS_T.inl \
-  Channel_Clients_T.cpp \
-  CosTradingDynamicS_T.cpp \
-  CosTradingReposS_T.cpp \
-  CosTradingS_T.cpp \
   CosTrading.idl \
   CosTradingDynamic.idl \
   CosTradingRepos.idl
 
+
+pkgconfigdata_DATA += 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
+
 EXTRA_DIST += \
   CosTrading.rc
 
-## Makefile.CosTrading_Skel.am 
+## Makefile.CosTrading_Skel.am
 
 lib_LTLIBRARIES += libTAO_CosTrading_Skel.la
 
@@ -2385,20 +2427,32 @@ libTAO_CosTrading_Skel_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   CosTradingDynamicS.h \
+  CosTradingDynamicS_T.h \
   CosTradingReposS.h \
+  CosTradingReposS_T.h \
   CosTradingS.h \
-  Channel_Clients_T.i \
+  CosTradingS_T.h \
+  Trader/trading_skel_export.h \
   CosTradingDynamicS.inl \
+  CosTradingDynamicS_T.inl \
   CosTradingReposS.inl \
+  CosTradingReposS_T.inl \
   CosTradingS.inl \
-  Channel_Clients_T.cpp
+  CosTradingS_T.inl \
+  CosTradingDynamicS_T.cpp \
+  CosTradingReposS_T.cpp \
+  CosTradingS_T.cpp
+
+pkgconfigdata_DATA += 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.pc.in
 
 EXTRA_DIST += \
   CosTrading_Skel.rc
 
-## Makefile.CosTrading_Serv.am 
+## Makefile.CosTrading_Serv.am
 
 Trader = \
   Trader/Constraint_Interpreter.cpp \
@@ -2444,46 +2498,50 @@ libTAO_CosTrading_Serv_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Trader/Constraint_Interpreter.h \
   Trader/Constraint_Nodes.h \
   Trader/Constraint_Visitors.h \
   Trader/Interpreter.h \
   Trader/Interpreter_Utils.h \
+  Trader/Interpreter_Utils_T.h \
   Trader/Offer_Database.h \
   Trader/Offer_Iterators.h \
+  Trader/Offer_Iterators_T.h \
   Trader/Service_Type_Repository.h \
   Trader/Trader.h \
   Trader/Trader_Constraint_Visitors.h \
   Trader/Trader_Interfaces.h \
+  Trader/Trader_T.h \
   Trader/Trader_Utils.h \
   Trader/Trading_Loader.h \
-  Channel_Clients_T.i \
-  Channel_Clients_T.cpp
+  Trader/Interpreter_Utils_T.cpp \
+  Trader/Offer_Iterators_T.cpp \
+  Trader/Trader_T.cpp
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
   CosTrading_Serv.rc
 
-## Makefile.DsLogAdmin.am 
+## Makefile.DsLogAdmin.am
 
 BUILT_SOURCES += \
   DsLogAdminS_T.cpp \
   DsLogAdminC.inl \
-  DsLogAdminS_T.inl \
   DsLogAdminC.cpp \
-  DsLogAdminC.h \
-  DsLogAdminS_T.h
+  DsLogAdminC.h
 
 CLEANFILES += \
   DsLogAdminS_T.cpp \
   DsLogAdminC.inl \
-  DsLogAdminS_T.inl \
   DsLogAdminC.cpp \
   DsLogAdminC.h \
-  DsLogAdminS_T.h \
   DsLogAdmin-stamp
 
-DsLogAdminS_T.cpp DsLogAdminC.inl DsLogAdminS_T.inl DsLogAdminC.cpp DsLogAdminC.h DsLogAdminS_T.h: DsLogAdmin-stamp
+DsLogAdminS_T.cpp DsLogAdminC.inl DsLogAdminC.cpp DsLogAdminC.h: DsLogAdmin-stamp
 
 DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -2492,21 +2550,17 @@ DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl
 BUILT_SOURCES += \
   DsLogNotificationS_T.cpp \
   DsLogNotificationC.inl \
-  DsLogNotificationS_T.inl \
   DsLogNotificationC.cpp \
-  DsLogNotificationC.h \
-  DsLogNotificationS_T.h
+  DsLogNotificationC.h
 
 CLEANFILES += \
   DsLogNotificationS_T.cpp \
   DsLogNotificationC.inl \
-  DsLogNotificationS_T.inl \
   DsLogNotificationC.cpp \
   DsLogNotificationC.h \
-  DsLogNotificationS_T.h \
   DsLogNotification-stamp
 
-DsLogNotificationS_T.cpp DsLogNotificationC.inl DsLogNotificationS_T.inl DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationS_T.h: DsLogNotification-stamp
+DsLogNotificationS_T.cpp DsLogNotificationC.inl DsLogNotificationC.cpp DsLogNotificationC.h: DsLogNotification-stamp
 
 DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -2535,47 +2589,40 @@ libTAO_DsLogAdmin_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   DsLogAdminC.h \
-  DsLogAdminS_T.h \
   DsLogNotificationC.h \
-  DsLogNotificationS_T.h \
-  Channel_Clients_T.i \
+  Log/log_export.h \
   DsLogAdminC.inl \
-  DsLogAdminS_T.inl \
   DsLogNotificationC.inl \
-  DsLogNotificationS_T.inl \
-  Channel_Clients_T.cpp \
-  DsLogAdminS_T.cpp \
-  DsLogNotificationS_T.cpp \
   DsLogAdmin.idl \
   DsLogNotification.idl
 
+pkgconfigdata_DATA += 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
+
 EXTRA_DIST += \
   DsLogAdmin.rc
 
-## Makefile.DsEventLogAdmin.am 
+## Makefile.DsEventLogAdmin.am
 
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   DsEventLogAdminS_T.cpp \
   DsEventLogAdminC.inl \
-  DsEventLogAdminS_T.inl \
   DsEventLogAdminC.cpp \
-  DsEventLogAdminC.h \
-  DsEventLogAdminS_T.h
+  DsEventLogAdminC.h
 
 CLEANFILES += \
   DsEventLogAdminS_T.cpp \
   DsEventLogAdminC.inl \
-  DsEventLogAdminS_T.inl \
   DsEventLogAdminC.cpp \
   DsEventLogAdminC.h \
-  DsEventLogAdminS_T.h \
   DsEventLogAdmin-stamp
 
-DsEventLogAdminS_T.cpp DsEventLogAdminC.inl DsEventLogAdminS_T.inl DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminS_T.h: DsEventLogAdmin-stamp
+DsEventLogAdminS_T.cpp DsEventLogAdminC.inl DsEventLogAdminC.cpp DsEventLogAdminC.h: DsEventLogAdmin-stamp
 
 DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -2606,22 +2653,22 @@ libTAO_DsEventLogAdmin_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   DsEventLogAdminC.h \
-  DsEventLogAdminS_T.h \
-  Channel_Clients_T.i \
+  Log/eventlog_export.h \
   DsEventLogAdminC.inl \
-  DsEventLogAdminS_T.inl \
-  Channel_Clients_T.cpp \
-  DsEventLogAdminS_T.cpp \
   DsEventLogAdmin.idl
 
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
 EXTRA_DIST += \
   DsEventLogAdmin.rc
 
-## Makefile.DsLogAdmin_Skel.am 
+## Makefile.DsLogAdmin_Skel.am
 
 lib_LTLIBRARIES += libTAO_DsLogAdmin_Skel.la
 
@@ -2648,15 +2695,24 @@ libTAO_DsLogAdmin_Skel_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   DsLogAdminS.h \
+  DsLogAdminS_T.h \
   DsLogNotificationS.h \
-  Channel_Clients_T.i \
+  DsLogNotificationS_T.h \
+  Log/log_skel_export.h \
   DsLogAdminS.inl \
+  DsLogAdminS_T.inl \
   DsLogNotificationS.inl \
-  Channel_Clients_T.cpp
+  DsLogNotificationS_T.inl \
+  DsLogAdminS_T.cpp \
+  DsLogNotificationS_T.cpp
+
+pkgconfigdata_DATA += 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
 
-## Makefile.DsLogAdmin_Serv.am 
+## Makefile.DsLogAdmin_Serv.am
 
 DsLogAdmin = \
   Log/BasicLogFactory_i.cpp \
@@ -2667,8 +2723,7 @@ DsLogAdmin = \
   Log/LogRecordStore.cpp \
   Log/Log_Constraint_Interpreter.cpp \
   Log/Log_Constraint_Visitors.cpp \
-  Log/Log_i.cpp \
-  Log/PersistStore.cpp
+  Log/Log_i.cpp
 
 lib_LTLIBRARIES += libTAO_DsLogAdmin_Serv.la
 
@@ -2688,6 +2743,7 @@ libTAO_DsLogAdmin_Serv_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_DsLogAdmin_Serv_la_LIBADD = \
+  libTAO_Svc_Utils.la \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   libTAO_DsLogAdmin_Skel.la \
@@ -2697,7 +2753,6 @@ libTAO_DsLogAdmin_Serv_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Log/BasicLogFactory_i.h \
   Log/BasicLog_i.h \
   Log/Iterator_i.h \
@@ -2706,12 +2761,15 @@ nobase_include_HEADERS += \
   Log/LogRecordStore.h \
   Log/Log_Constraint_Interpreter.h \
   Log/Log_Constraint_Visitors.h \
-  Log/Log_i.h \
-  Log/PersistStore.h \
-  Channel_Clients_T.i \
-  Channel_Clients_T.cpp
+  Log/Log_i.h
+
 
-## Makefile.DsEventLogAdmin_Skel.am 
+pkgconfigdata_DATA += 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
+
+## Makefile.DsEventLogAdmin_Skel.am
 
 if !BUILD_MINIMUM_CORBA
 
@@ -2744,16 +2802,23 @@ libTAO_DsEventLogAdmin_Skel_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   DsEventLogAdminS.h \
-  Channel_Clients_T.i \
+  DsEventLogAdminS_T.h \
+  Log/eventlog_skel_export.h \
   DsEventLogAdminS.inl \
-  Channel_Clients_T.cpp
+  DsEventLogAdminS_T.inl \
+  DsEventLogAdminS_T.cpp
+
+pkgconfigdata_DATA += TAO_DsEventLogAdmin_Skel.pc
+
+TAO_DsEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_DsEventLogAdmin.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO_DsEventLogAdmin.pc.in
 
 endif !BUILD_MINIMUM_CORBA
 
-## Makefile.DsEventLogAdmin_Serv.am 
+## Makefile.DsEventLogAdmin_Serv.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 DsEventLogAdmin = \
@@ -2787,6 +2852,7 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   libTAO_DsLogAdmin_Serv.la \
+  libTAO_Svc_Utils.la \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   libTAO_DsEventLogAdmin_Skel.la \
@@ -2800,38 +2866,37 @@ libTAO_DsEventLogAdmin_Serv_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Log/EventLogConsumer.h \
   Log/EventLogFactory_i.h \
   Log/EventLogNotification.h \
-  Log/EventLog_i.h \
-  Channel_Clients_T.i \
-  Channel_Clients_T.cpp
+  Log/EventLog_i.h
+
+pkgconfigdata_DATA += 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.pc.in
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.DsNotifyLogAdmin.am 
+## Makefile.DsNotifyLogAdmin.am
 
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
   DsNotifyLogAdminS_T.cpp \
   DsNotifyLogAdminC.inl \
-  DsNotifyLogAdminS_T.inl \
   DsNotifyLogAdminC.cpp \
-  DsNotifyLogAdminC.h \
-  DsNotifyLogAdminS_T.h
+  DsNotifyLogAdminC.h
 
 CLEANFILES += \
   DsNotifyLogAdminS_T.cpp \
   DsNotifyLogAdminC.inl \
-  DsNotifyLogAdminS_T.inl \
   DsNotifyLogAdminC.cpp \
   DsNotifyLogAdminC.h \
-  DsNotifyLogAdminS_T.h \
   DsNotifyLogAdmin-stamp
 
-DsNotifyLogAdminS_T.cpp DsNotifyLogAdminC.inl DsNotifyLogAdminS_T.inl DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminS_T.h: DsNotifyLogAdmin-stamp
+DsNotifyLogAdminS_T.cpp DsNotifyLogAdminC.inl DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h: DsNotifyLogAdmin-stamp
 
 DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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
@@ -2864,22 +2929,22 @@ libTAO_DsNotifyLogAdmin_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   DsNotifyLogAdminC.h \
-  DsNotifyLogAdminS_T.h \
-  Channel_Clients_T.i \
+  Log/notifylog_export.h \
   DsNotifyLogAdminC.inl \
-  DsNotifyLogAdminS_T.inl \
-  Channel_Clients_T.cpp \
-  DsNotifyLogAdminS_T.cpp \
   DsNotifyLogAdmin.idl
 
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
 EXTRA_DIST += \
   DsNotifyLogAdmin.rc
 
-## Makefile.DsNotifyLogAdmin_Skel.am 
+## Makefile.DsNotifyLogAdmin_Skel.am
 
 if !BUILD_MINIMUM_CORBA
 
@@ -2916,15 +2981,21 @@ libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   DsNotifyLogAdminS.h \
-  Channel_Clients_T.i \
+  DsNotifyLogAdminS_T.h \
+  Log/notifylog_skel_export.h \
   DsNotifyLogAdminS.inl \
-  Channel_Clients_T.cpp
+  DsNotifyLogAdminS_T.inl \
+  DsNotifyLogAdminS_T.cpp
+
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
-## Makefile.DsNotifyLogAdmin_Serv.am 
+## Makefile.DsNotifyLogAdmin_Serv.am
 
 if !BUILD_MINIMUM_CORBA
 
@@ -2954,6 +3025,7 @@ libTAO_DsNotifyLogAdmin_Serv_la_LDFLAGS = \
 
 libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \
   libTAO_DsLogAdmin_Serv.la \
+  libTAO_Svc_Utils.la \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
   libTAO_DsNotifyLogAdmin_Skel.la \
@@ -2971,17 +3043,21 @@ libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Log/NotifyLogConsumer.h \
   Log/NotifyLogFactory_i.h \
   Log/NotifyLogNotification.h \
-  Log/NotifyLog_i.h \
-  Channel_Clients_T.i \
-  Channel_Clients_T.cpp
+  Log/NotifyLog_i.h
+
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 
-## Makefile.FTRT_ClientORB.am 
+## Makefile.FTRT_ClientORB.am
+
+if BUILD_CORBA_MESSAGING
 
 FTRT_ClientORB = \
   FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp \
@@ -3014,14 +3090,15 @@ libTAO_FTRT_ClientORB_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h \
   FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \
-  FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h \
-  Channel_Clients_T.i \
-  Channel_Clients_T.cpp
+  FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
+
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.RTEvent.am 
+## Makefile.RTEvent.am
+
+if BUILD_CORBA_MESSAGING
 
 BUILT_SOURCES += \
   RtecDefaultEventDataS_T.cpp \
@@ -3244,7 +3321,6 @@ libTAO_RTEvent_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Event/ECG_Adapters.h \
   Event/ECG_Address_Server_Base.h \
   Event/ECG_CDR_Message_Receiver.h \
@@ -3326,48 +3402,27 @@ nobase_include_HEADERS += \
   RtecUDPAdminC.h \
   RtecUDPAdminS.h \
   RtecUDPAdminS_T.h \
-  Channel_Clients_T.i \
-  Event/ECG_Address_Server_Base.i \
   Event/ECG_CDR_Message_Receiver.i \
   Event/ECG_CDR_Message_Sender.i \
   Event/ECG_Complex_Address_Server.i \
-  Event/ECG_ConsumerEC_Control.i \
   Event/ECG_Mcast_EH.i \
   Event/ECG_Mcast_Gateway.i \
-  Event/ECG_Reactive_ConsumerEC_Control.i \
   Event/ECG_Simple_Address_Server.i \
-  Event/ECG_Simple_Mcast_EH.i \
   Event/ECG_UDP_EH.i \
   Event/ECG_UDP_Out_Endpoint.i \
   Event/ECG_UDP_Receiver.i \
   Event/ECG_UDP_Sender.inl \
-  Event/EC_And_Filter.i \
-  Event/EC_Basic_Factory.i \
   Event/EC_Basic_Filter_Builder.i \
-  Event/EC_Bitmask_Filter.i \
   Event/EC_Busy_Lock.i \
-  Event/EC_Conjunction_Filter.i \
-  Event/EC_ConsumerAdmin.i \
-  Event/EC_ConsumerControl.i \
   Event/EC_Default_Factory.i \
-  Event/EC_Default_ProxyConsumer.i \
-  Event/EC_Default_ProxySupplier.i \
-  Event/EC_Disjunction_Filter.i \
-  Event/EC_Dispatching.i \
   Event/EC_Dispatching_Task.i \
-  Event/EC_Event_Channel.i \
   Event/EC_Event_Channel_Base.i \
-  Event/EC_Factory.i \
   Event/EC_Filter.i \
   Event/EC_Filter_Builder.i \
   Event/EC_Gateway_IIOP_Factory.i \
   Event/EC_Group_Scheduling.inl \
   Event/EC_Lifetime_Utils.i \
   Event/EC_Lifetime_Utils_T.i \
-  Event/EC_MT_Dispatching.i \
-  Event/EC_Masked_Type_Filter.i \
-  Event/EC_Negation_Filter.i \
-  Event/EC_Null_Factory.i \
   Event/EC_Null_Scheduling.i \
   Event/EC_ObserverStrategy.i \
   Event/EC_Per_Supplier_Filter.i \
@@ -3376,18 +3431,10 @@ nobase_include_HEADERS += \
   Event/EC_ProxySupplier.i \
   Event/EC_QOS_Info.i \
   Event/EC_Reactive_ConsumerControl.i \
-  Event/EC_Reactive_Dispatching.i \
   Event/EC_Reactive_SupplierControl.i \
-  Event/EC_Reactive_Timeout_Generator.i \
-  Event/EC_Scheduling_Strategy.i \
-  Event/EC_SupplierAdmin.i \
-  Event/EC_SupplierControl.i \
   Event/EC_Supplier_Filter.i \
-  Event/EC_Supplier_Filter_Builder.i \
   Event/EC_Timeout_Filter.i \
   Event/EC_Timeout_Generator.i \
-  Event/EC_Trivial_Supplier_Filter.i \
-  Event/EC_Type_Filter.i \
   Event_Utilities.i \
   RtecDefaultEventDataC.inl \
   RtecDefaultEventDataS.inl \
@@ -3401,7 +3448,7 @@ nobase_include_HEADERS += \
   RtecUDPAdminC.inl \
   RtecUDPAdminS.inl \
   RtecUDPAdminS_T.inl \
-  Channel_Clients_T.cpp \
+  Event/EC_Lifetime_Utils_T.cpp \
   RtecDefaultEventDataS_T.cpp \
   RtecEventChannelAdminS_T.cpp \
   RtecEventCommS_T.cpp \
@@ -3411,11 +3458,14 @@ nobase_include_HEADERS += \
   RtecEventComm.idl \
   RtecUDPAdmin.idl
 
+endif BUILD_CORBA_MESSAGING
+
 EXTRA_DIST += \
   RTEvent.rc
 
-## Makefile.FtRtEvent.am 
+## Makefile.FtRtEvent.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
@@ -3578,7 +3628,6 @@ libTAO_FtRtEvent_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   FTRTC.h \
   FTRTS.h \
   FTRTS_T.h \
@@ -3595,7 +3644,6 @@ nobase_include_HEADERS += \
   FtRtecEventCommC.h \
   FtRtecEventCommS.h \
   FtRtecEventCommS_T.h \
-  Channel_Clients_T.i \
   FTRTC.inl \
   FTRTS.inl \
   FTRTS_T.inl \
@@ -3612,7 +3660,6 @@ nobase_include_HEADERS += \
   FtRtecEventCommC.inl \
   FtRtecEventCommS.inl \
   FtRtecEventCommS_T.inl \
-  Channel_Clients_T.cpp \
   FTRTS_T.cpp \
   FTRT_GroupManagerS_T.cpp \
   FtRtecEventChannelAdminS_T.cpp \
@@ -3623,8 +3670,9 @@ nobase_include_HEADERS += \
   FtRtecEventComm.idl
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.FTRT_EventChannel.am 
+## Makefile.FTRT_EventChannel.am
 
 if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
@@ -3663,6 +3711,7 @@ FTRT_EventChannel = \
   FtRtEvent/EventChannel/Update_Manager.cpp \
   FtRtEvent/EventChannel/UpdateableHandler.cpp \
   FtRtEvent/EventChannel/create_persistent_poa.cpp \
+  FtRtEvent/EventChannel/replace_key.cpp \
   PortableGroup_Simple_DSC.cpp
 
 lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la
@@ -3675,6 +3724,7 @@ libTAO_FTRT_EventChannel_la_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel \
+  -DTAO_PORTABLEGROUP_SIMPLE_HAS_DLL=0 \
   -DTAO_FTRTEC_BUILD_DLL
 
 libTAO_FTRT_EventChannel_la_SOURCES = \
@@ -3743,8 +3793,9 @@ nobase_include_HEADERS += \
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_CORBA_MESSAGING
 
-## Makefile.FT_ClientORB.am 
+## Makefile.FT_ClientORB.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_ACE_UUID
 if !BUILD_MINIMUM_CORBA
 
@@ -3756,8 +3807,7 @@ FT_ClientORB = \
   FaultTolerance/FT_ClientService_Activate.cpp \
   FaultTolerance/FT_Endpoint_Selector_Factory.cpp \
   FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp \
-  FaultTolerance/FT_Service_Callbacks.cpp \
-  PortableGroup_Simple_DSC.cpp
+  FaultTolerance/FT_Service_Callbacks.cpp
 
 lib_LTLIBRARIES += libTAO_FT_ClientORB.la
 
@@ -3788,7 +3838,6 @@ libTAO_FT_ClientORB_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   FaultTolerance/FT_ClientORBInitializer.h \
   FaultTolerance/FT_ClientPolicyFactory.h \
   FaultTolerance/FT_ClientPolicy_i.h \
@@ -3797,17 +3846,20 @@ nobase_include_HEADERS += \
   FaultTolerance/FT_Endpoint_Selector_Factory.h \
   FaultTolerance/FT_Invocation_Endpoint_Selectors.h \
   FaultTolerance/FT_Service_Callbacks.h \
-  Channel_Clients_T.i \
-  FaultTolerance/FT_ClientPolicy_i.inl \
-  FaultTolerance/FT_Invocation_Endpoint_Selectors.inl \
-  FaultTolerance/FT_Service_Callbacks.i \
-  Channel_Clients_T.cpp
+  FaultTolerance/FT_ClientPolicy_i.inl
+
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
 endif BUILD_ACE_UUID
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.FT_ServerORB.am 
+## Makefile.FT_ServerORB.am
 
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 FT_ServerORB = \
@@ -3815,8 +3867,7 @@ FT_ServerORB = \
   FaultTolerance/FT_ServerPolicyFactory.cpp \
   FaultTolerance/FT_ServerPolicy_i.cpp \
   FaultTolerance/FT_ServerRequest_Interceptor.cpp \
-  FaultTolerance/FT_ServerService_Activate.cpp \
-  PortableGroup_Simple_DSC.cpp
+  FaultTolerance/FT_ServerService_Activate.cpp
 
 lib_LTLIBRARIES += libTAO_FT_ServerORB.la
 
@@ -3847,21 +3898,26 @@ libTAO_FT_ServerORB_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   FaultTolerance/FT_ServerORBInitializer.h \
   FaultTolerance/FT_ServerPolicyFactory.h \
   FaultTolerance/FT_ServerPolicy_i.h \
   FaultTolerance/FT_ServerRequest_Interceptor.h \
   FaultTolerance/FT_ServerService_Activate.h \
-  Channel_Clients_T.i \
-  FaultTolerance/FT_ServerPolicy_i.inl \
-  Channel_Clients_T.cpp
+  FaultTolerance/FT_ServerPolicy_i.inl
+
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.FaultTolerance.am 
+## Makefile.FaultTolerance.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
@@ -4040,11 +4096,11 @@ libTAO_FaultTolerance_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_FaultTolerance_la_LIBADD = \
+  libTAO_FT_ServerORB.la \
   libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   libTAO_CosNaming.la \
-  libTAO_FT_ServerORB.la \
   libTAO_FT_ClientORB.la \
   libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -4055,7 +4111,6 @@ libTAO_FaultTolerance_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   FT_CORBAC.h \
   FT_CORBAS.h \
   FT_CORBAS_T.h \
@@ -4071,7 +4126,7 @@ nobase_include_HEADERS += \
   FT_ReplicationManagerC.h \
   FT_ReplicationManagerS.h \
   FT_ReplicationManagerS_T.h \
-  Channel_Clients_T.i \
+  FaultTolerance/fault_tol_export.h \
   FT_CORBAC.inl \
   FT_CORBAS.inl \
   FT_CORBAS_T.inl \
@@ -4087,7 +4142,6 @@ nobase_include_HEADERS += \
   FT_ReplicationManagerC.inl \
   FT_ReplicationManagerS.inl \
   FT_ReplicationManagerS_T.inl \
-  Channel_Clients_T.cpp \
   FT_CORBAS_T.cpp \
   FT_FaultDetectorFactoryS_T.cpp \
   FT_NotifierS_T.cpp \
@@ -4099,13 +4153,109 @@ nobase_include_HEADERS += \
   FT_Replica.idl \
   FT_ReplicationManager.idl
 
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
 EXTRA_DIST += \
   FaultTolerance.rc
 
-## Makefile.IFRService.am 
+## Makefile.HTIOP.am
+
+BUILT_SOURCES += \
+  HTIOPS_T.cpp \
+  HTIOPC.inl \
+  HTIOPS.inl \
+  HTIOPS_T.inl \
+  HTIOPC.cpp \
+  HTIOPC.h \
+  HTIOPS.h \
+  HTIOPS_T.h
+
+CLEANFILES += \
+  HTIOPS_T.cpp \
+  HTIOPC.inl \
+  HTIOPS.inl \
+  HTIOPS_T.inl \
+  HTIOPC.cpp \
+  HTIOPC.h \
+  HTIOPS.h \
+  HTIOPS_T.h \
+  HTIOP-stamp
+
+HTIOPS_T.cpp HTIOPC.inl HTIOPS.inl HTIOPS_T.inl HTIOPC.cpp HTIOPC.h HTIOPS.h HTIOPS_T.h: HTIOP-stamp
+
+HTIOP-stamp: $(srcdir)/HTIOP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h $(srcdir)/HTIOP.idl
+	@touch $@
+
+HTIOP = \
+  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
+
+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)
+
+libTAO_HTIOP_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_HTIOP_la_LIBADD = \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  HTIOP/HTIOP_Acceptor.h \
+  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_Factory.h \
+  HTIOP/HTIOP_Profile.h \
+  HTIOP/HTIOP_Transport.h \
+  HTIOP/htiop_endpointsC.h \
+  HTIOPC.h \
+  HTIOPS.h \
+  HTIOPS_T.h \
+  HTIOP/HTIOP_Acceptor.i \
+  HTIOP/HTIOP_Endpoint.i \
+  HTIOP/htiop_endpointsC.inl \
+  HTIOPC.inl \
+  HTIOPS.inl \
+  HTIOPS_T.inl \
+  HTIOPS_T.cpp \
+  HTIOP.idl
+
+## Makefile.IFRService.am
 
 if !BUILD_MINIMUM_CORBA
 
@@ -4154,6 +4304,7 @@ IFRService = \
   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 \
@@ -4194,7 +4345,6 @@ libTAO_IFRService_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   IFRService/AbstractInterfaceDef_i.h \
   IFRService/AliasDef_i.h \
   IFRService/ArrayDef_i.h \
@@ -4223,11 +4373,16 @@ nobase_include_HEADERS += \
   IFRService/HomeDef_i.h \
   IFRService/IDLType_i.h \
   IFRService/IFR_BaseS.h \
+  IFRService/IFR_BaseS_T.h \
   IFRService/IFR_BasicS.h \
+  IFRService/IFR_BasicS_T.h \
   IFRService/IFR_ComponentsS.h \
+  IFRService/IFR_ComponentsS_T.h \
   IFRService/IFR_ExtendedS.h \
+  IFRService/IFR_ExtendedS_T.h \
   IFRService/IFR_Service_Loader.h \
   IFRService/IFR_Service_Utils.h \
+  IFRService/IFR_Service_Utils_T.h \
   IFRService/IRObject_i.h \
   IFRService/InterfaceAttrExtension_i.h \
   IFRService/InterfaceDef_i.h \
@@ -4239,6 +4394,7 @@ nobase_include_HEADERS += \
   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 \
@@ -4250,20 +4406,28 @@ nobase_include_HEADERS += \
   IFRService/ValueDef_i.h \
   IFRService/ValueMemberDef_i.h \
   IFRService/WstringDef_i.h \
-  Channel_Clients_T.i \
-  IFRService/IFR_BaseS.i \
-  IFRService/IFR_BasicS.i \
-  IFRService/IFR_ComponentsS.i \
-  IFRService/IFR_ExtendedS.i \
-  Channel_Clients_T.cpp
+  IFRService/IFR_BaseS.inl \
+  IFRService/IFR_BaseS_T.inl \
+  IFRService/IFR_BasicS.inl \
+  IFRService/IFR_BasicS_T.inl \
+  IFRService/IFR_ComponentsS.inl \
+  IFRService/IFR_ComponentsS_T.inl \
+  IFRService/IFR_ExtendedS.inl \
+  IFRService/IFR_ExtendedS_T.inl \
+  IFRService/IFR_BaseS_T.cpp \
+  IFRService/IFR_BasicS_T.cpp \
+  IFRService/IFR_ComponentsS_T.cpp \
+  IFRService/IFR_ExtendedS_T.cpp \
+  IFRService/IFR_Service_Utils_T.cpp
 
 endif !BUILD_MINIMUM_CORBA
 
 EXTRA_DIST += \
   IFRService.rc
 
-## Makefile.RTCORBAEvent.am 
+## Makefile.RTCORBAEvent.am
 
+if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 
 RTCORBAEvent = \
@@ -4300,17 +4464,13 @@ libTAO_RTCORBAEvent_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Event/EC_RTCORBA_Dispatching.h \
-  Event/EC_RTCORBA_Factory.h \
-  Channel_Clients_T.i \
-  Event/EC_RTCORBA_Dispatching.inl \
-  Event/EC_RTCORBA_Factory.inl \
-  Channel_Clients_T.cpp
+  Event/EC_RTCORBA_Factory.h
 
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
-## Makefile.RTCosScheduling.am 
+## Makefile.RTCosScheduling.am
 
 if BUILD_RT_CORBA
 if BUILD_INTERCEPTORS
@@ -4394,7 +4554,7 @@ nobase_include_HEADERS += \
 endif BUILD_INTERCEPTORS
 endif BUILD_RT_CORBA
 
-## Makefile.RTSched.am 
+## Makefile.RTSched.am
 
 BUILT_SOURCES += \
   RtecSchedulerS_T.cpp \
@@ -4465,7 +4625,6 @@ libTAO_RTSched_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   RtecSchedulerC.h \
   RtecSchedulerS.h \
   RtecSchedulerS_T.h \
@@ -4473,36 +4632,33 @@ nobase_include_HEADERS += \
   Sched/Config_Scheduler.h \
   Sched/DynSched.h \
   Sched/Reconfig_Sched_Utils.h \
+  Sched/Reconfig_Sched_Utils_T.h \
   Sched/Reconfig_Scheduler.h \
+  Sched/Reconfig_Scheduler_T.h \
   Sched/SchedEntry.h \
   Sched/Scheduler.h \
   Sched/Scheduler_Generic.h \
   Sched/Strategy_Scheduler.h \
   Scheduler_Factory.h \
   Scheduler_Utilities.h \
-  Channel_Clients_T.i \
   RtecSchedulerC.inl \
   RtecSchedulerS.inl \
   RtecSchedulerS_T.inl \
-  Runtime_Scheduler.i \
-  Sched/Config_Scheduler.i \
   Sched/DynSched.i \
-  Sched/Reconfig_Sched_Utils.i \
-  Sched/Reconfig_Scheduler.i \
   Sched/SchedEntry.i \
-  Sched/Scheduler.i \
-  Sched/Scheduler_Generic.i \
-  Sched/Strategy_Scheduler.i \
   Scheduler_Factory.i \
   Scheduler_Utilities.i \
-  Channel_Clients_T.cpp \
   RtecSchedulerS_T.cpp \
+  Sched/Reconfig_Sched_Utils_T.cpp \
+  Sched/Reconfig_Scheduler_T.cpp \
   RtecScheduler.idl
 
 EXTRA_DIST += \
   RTSched.rc
 
-## Makefile.RTOLDEvent.am 
+## Makefile.RTOLDEvent.am
+
+if BUILD_CORBA_MESSAGING
 
 RTOLDEvent = \
   Event/BCU.cpp \
@@ -4546,7 +4702,6 @@ libTAO_RTOLDEvent_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Event/BCU.h \
   Event/Dispatching_Modules.h \
   Event/Event_Channel.h \
@@ -4558,21 +4713,22 @@ nobase_include_HEADERS += \
   Event/RT_Task.h \
   Event/ReactorTask.h \
   Event/Timer_Module.h \
-  Channel_Clients_T.i \
   Event/Dispatching_Modules.i \
   Event/Event_Channel.i \
   Event/Event_Manip.i \
   Event/GPlot_File.i \
-  Event/Local_ESTypes.i \
   Event/Memory_Pools.i \
   Event/RT_Task.i \
-  Event/Timer_Module.i \
-  Channel_Clients_T.cpp
+  Event/Timer_Module.i
+
+endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
   RTOldEvent.rc
 
-## Makefile.RTEventLogAdmin.am 
+## Makefile.RTEventLogAdmin.am
+
+if BUILD_CORBA_MESSAGING
 
 BUILT_SOURCES += \
   RTEventLogAdminS_T.cpp \
@@ -4629,6 +4785,10 @@ libTAO_RTEventLogAdmin_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTEventLogAdmin_la_LIBADD = \
+  libTAO_DsLogAdmin_Serv.la \
+  libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  libTAO_DsLogAdmin_Skel.la \
   libTAO_DsLogAdmin.la \
   libTAO_RTOLDEvent.la \
   libTAO_RTSched.la \
@@ -4642,7 +4802,6 @@ libTAO_RTEventLogAdmin_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Log/RTEventLogConsumer.h \
   Log/RTEventLogFactory_i.h \
   Log/RTEventLogNotification.h \
@@ -4650,15 +4809,17 @@ nobase_include_HEADERS += \
   RTEventLogAdminC.h \
   RTEventLogAdminS.h \
   RTEventLogAdminS_T.h \
-  Channel_Clients_T.i \
   RTEventLogAdminC.inl \
   RTEventLogAdminS.inl \
   RTEventLogAdminS_T.inl \
-  Channel_Clients_T.cpp \
   RTEventLogAdminS_T.cpp \
   RTEventLogAdmin.idl
 
-## Makefile.RTKokyuEvent.am 
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RTKokyuEvent.am
+
+if BUILD_CORBA_MESSAGING
 
 RTKokyuEvent = \
   Event/EC_Kokyu_Dispatching.cpp \
@@ -4686,7 +4847,7 @@ libTAO_RTKokyuEvent_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_RTKokyuEvent_la_LIBADD = \
-  -lKokyu \
+  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
   libTAO_RTSched.la \
   libTAO_CosNaming.la \
   libTAO_RTEvent.la \
@@ -4698,21 +4859,21 @@ libTAO_RTKokyuEvent_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Event/EC_Kokyu_Dispatching.h \
   Event/EC_Kokyu_Factory.h \
   Event/EC_Kokyu_Filter.h \
   Event/EC_Kokyu_Filter_Builder.h \
   Event/EC_Kokyu_Scheduling.h \
-  Channel_Clients_T.i \
   Event/EC_Kokyu_Dispatching.i \
   Event/EC_Kokyu_Factory.i \
-  Event/EC_Kokyu_Filter.i \
   Event/EC_Kokyu_Filter_Builder.i \
-  Event/EC_Kokyu_Scheduling.i \
-  Channel_Clients_T.cpp
+  Event/EC_Kokyu_Scheduling.i
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RTSchedEvent.am
 
-## Makefile.RTSchedEvent.am 
+if BUILD_CORBA_MESSAGING
 
 RTSchedEvent = \
   Event/EC_Gateway_Sched.cpp \
@@ -4751,25 +4912,22 @@ libTAO_RTSchedEvent_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Event/EC_Gateway_Sched.h \
   Event/EC_Priority_Dispatching.h \
   Event/EC_Priority_Scheduling.h \
   Event/EC_Sched_Factory.h \
   Event/EC_Sched_Filter.h \
   Event/EC_Sched_Filter_Builder.h \
-  Channel_Clients_T.i \
-  Event/EC_Priority_Dispatching.i \
   Event/EC_Priority_Scheduling.i \
   Event/EC_Sched_Factory.i \
-  Event/EC_Sched_Filter.i \
-  Event/EC_Sched_Filter_Builder.i \
-  Channel_Clients_T.cpp
+  Event/EC_Sched_Filter_Builder.i
+
+endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
   RTSchedEvent.rc
 
-## Makefile.RT_Notification.am 
+## Makefile.RT_Notification.am
 
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
@@ -4814,21 +4972,13 @@ libTAO_RT_Notification_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   Notify/RT_Builder.h \
   Notify/RT_Factory.h \
   Notify/RT_Notify_Service.h \
   Notify/RT_POA_Helper.h \
   Notify/RT_Properties.h \
   Notify/Structured/RT_StructuredProxyPushSupplier.h \
-  Channel_Clients_T.i \
-  Notify/RT_Builder.inl \
-  Notify/RT_Factory.inl \
-  Notify/RT_Notify_Service.inl \
-  Notify/RT_POA_Helper.inl \
-  Notify/RT_Properties.inl \
-  Notify/Structured/RT_StructuredProxyPushSupplier.inl \
-  Channel_Clients_T.cpp
+  Notify/RT_Properties.inl
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_RT_CORBA
@@ -4836,13 +4986,12 @@ endif BUILD_RT_CORBA
 EXTRA_DIST += \
   RT_Notification.rc
 
-## Makefile.Security.am 
+## Makefile.Security.am
 
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 
 BUILT_SOURCES += \
-  CSIS_T.cpp \
   CSIC.inl \
   CSIS.inl \
   CSIS_T.inl \
@@ -4852,7 +5001,6 @@ BUILT_SOURCES += \
   CSIS_T.h
 
 CLEANFILES += \
-  CSIS_T.cpp \
   CSIC.inl \
   CSIS.inl \
   CSIS_T.inl \
@@ -4862,14 +5010,13 @@ CLEANFILES += \
   CSIS_T.h \
   CSI-stamp
 
-CSIS_T.cpp CSIC.inl CSIS.inl CSIS_T.inl CSIC.cpp CSIC.h CSIS.h CSIS_T.h: CSI-stamp
+CSIC.inl CSIS.inl CSIS_T.inl CSIC.cpp CSIC.h CSIS.h CSIS_T.h: CSI-stamp
 
 CSI-stamp: $(srcdir)/CSI.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl
 	@touch $@
 
 BUILT_SOURCES += \
-  CSIIOPS_T.cpp \
   CSIIOPC.inl \
   CSIIOPS.inl \
   CSIIOPS_T.inl \
@@ -4879,7 +5026,6 @@ BUILT_SOURCES += \
   CSIIOPS_T.h
 
 CLEANFILES += \
-  CSIIOPS_T.cpp \
   CSIIOPC.inl \
   CSIIOPS.inl \
   CSIIOPS_T.inl \
@@ -4889,14 +5035,13 @@ CLEANFILES += \
   CSIIOPS_T.h \
   CSIIOP-stamp
 
-CSIIOPS_T.cpp CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl CSIIOPC.cpp CSIIOPC.h CSIIOPS.h CSIIOPS_T.h: CSIIOP-stamp
+CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl CSIIOPC.cpp CSIIOPC.h CSIIOPS.h CSIIOPS_T.h: CSIIOP-stamp
 
 CSIIOP-stamp: $(srcdir)/CSIIOP.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl
 	@touch $@
 
 BUILT_SOURCES += \
-  GSSUPS_T.cpp \
   GSSUPC.inl \
   GSSUPS.inl \
   GSSUPS_T.inl \
@@ -4906,7 +5051,6 @@ BUILT_SOURCES += \
   GSSUPS_T.h
 
 CLEANFILES += \
-  GSSUPS_T.cpp \
   GSSUPC.inl \
   GSSUPS.inl \
   GSSUPS_T.inl \
@@ -4916,7 +5060,7 @@ CLEANFILES += \
   GSSUPS_T.h \
   GSSUP-stamp
 
-GSSUPS_T.cpp GSSUPC.inl GSSUPS.inl GSSUPS_T.inl GSSUPC.cpp GSSUPC.h GSSUPS.h GSSUPS_T.h: GSSUP-stamp
+GSSUPC.inl GSSUPS.inl GSSUPS_T.inl GSSUPC.cpp GSSUPC.h GSSUPS.h GSSUPS_T.h: GSSUP-stamp
 
 GSSUP-stamp: $(srcdir)/GSSUP.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl
@@ -5010,7 +5154,6 @@ SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl
 	@touch $@
 
 BUILT_SOURCES += \
-  SecurityLevel3S_T.cpp \
   SecurityLevel3C.inl \
   SecurityLevel3S.inl \
   SecurityLevel3S_T.inl \
@@ -5020,7 +5163,6 @@ BUILT_SOURCES += \
   SecurityLevel3S_T.h
 
 CLEANFILES += \
-  SecurityLevel3S_T.cpp \
   SecurityLevel3C.inl \
   SecurityLevel3S.inl \
   SecurityLevel3S_T.inl \
@@ -5030,7 +5172,7 @@ CLEANFILES += \
   SecurityLevel3S_T.h \
   SecurityLevel3-stamp
 
-SecurityLevel3S_T.cpp SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3S.h SecurityLevel3S_T.h: SecurityLevel3-stamp
+SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3S.h SecurityLevel3S_T.h: SecurityLevel3-stamp
 
 SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl
@@ -5089,10 +5231,12 @@ libTAO_Security_la_LIBADD = \
 nobase_include_HEADERS += \
   CSIC.h \
   CSIIOPC.h \
+  CSIIOPS.h \
   CSIIOPS_T.h \
+  CSIS.h \
   CSIS_T.h \
-  Channel_Clients_T.h \
   GSSUPC.h \
+  GSSUPS.h \
   GSSUPS_T.h \
   Security/CSI_Utils.h \
   Security/SL2_EstablishTrustPolicy.h \
@@ -5117,15 +5261,18 @@ nobase_include_HEADERS += \
   SecurityLevel2S.h \
   SecurityLevel2S_T.h \
   SecurityLevel3C.h \
+  SecurityLevel3S.h \
   SecurityLevel3S_T.h \
   SecurityS.h \
   SecurityS_T.h \
   CSIC.inl \
   CSIIOPC.inl \
+  CSIIOPS.inl \
   CSIIOPS_T.inl \
+  CSIS.inl \
   CSIS_T.inl \
-  Channel_Clients_T.i \
   GSSUPC.inl \
+  GSSUPS.inl \
   GSSUPS_T.inl \
   Security/SL3_SecurityCurrent.inl \
   Security/Security_Current.inl \
@@ -5137,16 +5284,12 @@ nobase_include_HEADERS += \
   SecurityLevel2S.inl \
   SecurityLevel2S_T.inl \
   SecurityLevel3C.inl \
+  SecurityLevel3S.inl \
   SecurityLevel3S_T.inl \
   SecurityS.inl \
   SecurityS_T.inl \
-  CSIIOPS_T.cpp \
-  CSIS_T.cpp \
-  Channel_Clients_T.cpp \
-  GSSUPS_T.cpp \
   SecurityLevel1S_T.cpp \
   SecurityLevel2S_T.cpp \
-  SecurityLevel3S_T.cpp \
   SecurityS_T.cpp \
   CSI.idl \
   CSIIOP.idl \
@@ -5162,7 +5305,7 @@ endif BUILD_CORBA_MESSAGING
 EXTRA_DIST += \
   Security.rc
 
-## Makefile.SSLIOP.am 
+## Makefile.SSLIOP.am
 
 if BUILD_INTERCEPTORS
 if BUILD_CORBA_MESSAGING
@@ -5222,6 +5365,7 @@ SSLIOP = \
   SSLIOP/SSLIOP_Transport.cpp \
   SSLIOP/SSLIOP_Util.cpp \
   SSLIOP/SSLIOP_X509.cpp \
+  SSLIOP/params_dup.c \
   SSLIOP/ssl_endpoints.cpp \
   SSLIOPC.cpp
 
@@ -5234,6 +5378,8 @@ libTAO_SSLIOP_la_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(SSL_ROOT)/include \
+  -I/usr/kerberos/include \
   -DACE_HAS_SSL=1 \
   -DTAO_SSLIOP_BUILD_DLL
 
@@ -5249,10 +5395,11 @@ libTAO_SSLIOP_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  -lssl \
+  -lcrypto
 
 nobase_include_HEADERS += \
-  Channel_Clients_T.h \
   SSLIOP/IIOP_SSL_Acceptor.h \
   SSLIOP/IIOP_SSL_Connection_Handler.h \
   SSLIOP/IIOP_SSL_Connector.h \
@@ -5281,8 +5428,8 @@ nobase_include_HEADERS += \
   SSLIOP/SSLIOP_X509.h \
   SSLIOP/ssl_endpoints.h \
   SSLIOPC.h \
+  SSLIOPS.h \
   SSLIOPS_T.h \
-  Channel_Clients_T.i \
   SSLIOP/IIOP_SSL_Connection_Handler.inl \
   SSLIOP/SSLIOP_Acceptor.i \
   SSLIOP/SSLIOP_Connection_Handler.i \
@@ -5290,12 +5437,10 @@ nobase_include_HEADERS += \
   SSLIOP/SSLIOP_Current.inl \
   SSLIOP/SSLIOP_Current_Impl.inl \
   SSLIOP/SSLIOP_Endpoint.i \
-  SSLIOP/SSLIOP_Profile.i \
   SSLIOP/ssl_endpoints.i \
   SSLIOPC.inl \
+  SSLIOPS.inl \
   SSLIOPS_T.inl \
-  Channel_Clients_T.cpp \
-  SSLIOPS_T.cpp \
   SSLIOP.idl
 
 endif BUILD_SSL
@@ -5307,6 +5452,8 @@ EXTRA_DIST += \
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
index 1b20d291bc5..2906191c6b3 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
@@ -824,28 +824,16 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se
       CORBA::Any any;
 
           util_data_.hrt_op_utilization =
-            ACE_static_cast (
-              CORBA::Double,
-              ACE_UINT64_DBLCAST_ADAPTER (hrt_op_time))
-            / ACE_static_cast (
-                CORBA::Double,
-                ACE_UINT64_DBLCAST_ADAPTER (interval));
+            static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (hrt_op_time))
+            / static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (interval));
 
           util_data_.srt_op_utilization =
-            ACE_static_cast (
-              CORBA::Double,
-              ACE_UINT64_DBLCAST_ADAPTER (srt_op_time))
-            / ACE_static_cast (
-                CORBA::Double,
-                ACE_UINT64_DBLCAST_ADAPTER (interval));
+            static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (srt_op_time))
+            / static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (interval));
 
           util_data_.queue_utilization =
-            ACE_static_cast (
-              CORBA::Double,
-              ACE_UINT64_DBLCAST_ADAPTER (queue_time))
-            / ACE_static_cast (
-                CORBA::Double,
-                ACE_UINT64_DBLCAST_ADAPTER (interval));
+            static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (queue_time))
+            / static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (interval));
 
           ACE_TRY_NEW_ENV
             {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
index d9fa7b9369f..fb71c6f1a4c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
@@ -91,7 +91,7 @@ TAO_NS_FlatFileStream::close()
   ACE_OS::flock_destroy (&filelock_, 0);
 #endif
   ACE_OS::fclose (fl_);  // even though flock_destroy closes the handle
-			 // we still need to destroy the FILE*
+                         // we still need to destroy the FILE*
 
   fl_ = 0;
   return 0;
@@ -181,15 +181,15 @@ TAO_NS_FlatFileStream::operator <<(
   ACE_OS::fprintf(this->fl_, "%d\n", type);
 
   ACE_CString id = record.id();
-  ACE_OS::fprintf(this->fl_, ACE_TEXT_ALWAYS_CHAR(ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n"),
+  ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT("\n%s\n"),
                   id.length(), id.c_str());
 
   ACE_CString kind = record.kind();
-  ACE_OS::fprintf(this->fl_, ACE_TEXT_ALWAYS_CHAR(ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n"),
+  ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("\n%s\n"),
                   kind.length(), kind.c_str());
 
   ACE_CString ref = record.ref();
-  ACE_OS::fprintf(this->fl_, ACE_TEXT_ALWAYS_CHAR(ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n"),
+  ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("\n%s\n"),
                   ref.length(), ref.c_str());
 
   ACE_OS::fflush(this->fl_);
@@ -211,7 +211,7 @@ TAO_NS_FlatFileStream::operator >>(
   size_t bufSize = 0;
 
   //id
-  fscanf(fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n", &bufSize);
+  fscanf(fl_, ACE_TEXT_ALWAYS_CHAR (ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("\n")), &bufSize);
   char *id = new char[bufSize+1];
   //char *id;
   //ACE_NEW_RETURN (id, char[bufSize+1], 1);
@@ -221,7 +221,7 @@ TAO_NS_FlatFileStream::operator >>(
   delete [] id;
 
   //kind
-  fscanf(fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n", &bufSize);
+  fscanf(fl_, ACE_TEXT_ALWAYS_CHAR (ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("\n")), &bufSize);
   char *kind = new char[bufSize+1];
   //char *kind;
   //ACE_NEW (kind, char[bufSize+1]);
@@ -232,7 +232,7 @@ TAO_NS_FlatFileStream::operator >>(
   delete [] kind;
 
    //ref
-  fscanf(fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n", &bufSize);
+  fscanf(fl_, ACE_TEXT_ALWAYS_CHAR (ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("\n")), &bufSize);
   char *ref = new char[bufSize+1];
   //char *ref;
   //ACE_NEW(ref, char[bufSize+1]);
@@ -275,13 +275,13 @@ TAO_NS_FlatFileStream::operator >>(
 
 TAO_Storable_Base *TAO_NS_FlatFileFactory::create_stream(
                                                        const ACE_CString & file,
-                                                       const char * mode)
+                                                       const ACE_TCHAR * mode)
 {
   ACE_TRACE("TAO_NS_FlatFileFactory::create_stream");
   TAO_Storable_Base *stream = 0;
 
   ACE_NEW_RETURN (stream,
-                  TAO_NS_FlatFileStream(file, ACE_TEXT_ALWAYS_CHAR(mode)),
+                  TAO_NS_FlatFileStream(file, ACE_TEXT_ALWAYS_CHAR (mode)),
                   0);
   return stream;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 199eeb15d4a..6caa0472771 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -71,9 +71,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
   CORBA::ULong name_len = name.length ();
   CosNaming::Name comp_name (name.maximum (),
                              name_len - 1,
-                             ACE_const_cast
-                             (CosNaming::NameComponent*,
-                              name.get_buffer ()));
+                             const_cast<CosNaming::NameComponent*> (name.get_buffer ()));
   ACE_TRY
     {
       // Resolve the name.
@@ -461,8 +459,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
           CosNaming::Name rest_of_name
             (n.maximum () - 1,
              n.length () - 1,
-             ACE_const_cast (CosNaming::NameComponent*,
-                             n.get_buffer ())
+             const_cast<CosNaming::NameComponent*> (n.get_buffer ())
              + 1);
 
           // If there are any exceptions, they will propagate up.
@@ -584,49 +581,48 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
       simple_name[0] = n[name_len - 1];
       return context->bind_new_context (simple_name ACE_ENV_ARG_PARAMETER);
     }
+
   // If we received a simple name, we need to bind it in this context.
-  else
-  {
-      // Stores our new Naming Context.
-      CosNaming::NamingContext_var result =
-      CosNaming::NamingContext::_nil ();
 
-      // Create new context.
-      result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  // Stores our new Naming Context.
+  CosNaming::NamingContext_var result =
+    CosNaming::NamingContext::_nil ();
 
-      // Bind the new context to the name.
-      ACE_TRY
-      {
-          bind_context (n,
-                        result.in ()
-                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-      }
-      ACE_CATCHANY
+  // Create new context.
+  result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+
+  // Bind the new context to the name.
+  ACE_TRY
+    {
+      bind_context (n,
+                    result.in ()
+                    ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      // If the bind() operation fails we must destroy the recently
+      // created context, should any exceptions be raised by the
+      // destroy() operation we want to ignore them.
       {
-          // If the bind() operation fails we must destroy the recently
-          // created context, should any exceptions be raised by the
-          // destroy() operation we want to ignore them.
+        ACE_DECLARE_NEW_CORBA_ENV;
+        ACE_TRY_EX(DESTROY)
           {
-              ACE_DECLARE_NEW_CORBA_ENV;
-              ACE_TRY_EX(DESTROY)
-              {
-                  result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX(DESTROY);
-              }
-              ACE_CATCHANY
-              {
-              }
-              ACE_ENDTRY;
+            result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+            ACE_TRY_CHECK_EX(DESTROY);
           }
-          // Re-raise the exception in bind_context()
-          ACE_RE_THROW;
+        ACE_CATCHANY
+          {
+          }
+        ACE_ENDTRY;
       }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-      return result._retn ();
-  }
+      // Re-raise the exception in bind_context()
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  return result._retn ();
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index 983f14dfcc6..5b06cdc83f9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -460,8 +460,7 @@ TAO_Naming_Context::to_url (const char * addr,
 
   // Allocate dynamic memory
   //
-  char *str_url = CORBA::string_alloc (ACE_static_cast (CORBA::ULong,
-                                                no_char + sizeof (prefix)));
+  char *str_url = CORBA::string_alloc (static_cast<CORBA::ULong> (no_char + sizeof (prefix)));
 
   // Copy 'prefix' to the return parameter.
   char *dest = ACE_OS::strcpy (str_url , prefix);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 19e68791e30..bb14c571b2b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -417,7 +417,7 @@ TAO_Naming_Server::init_with_orb (int argc,
         {
           ACE_OS::fprintf (pidf,
                            "%ld\n",
-                           ACE_static_cast (long, ACE_OS::getpid ()));
+                           static_cast<long> (ACE_OS::getpid ()));
           ACE_OS::fclose (pidf);
         }
     }
@@ -585,7 +585,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                 ACE_OS::getenv ("NameServicePort");
 
               if (port_number != 0)
-                port = ACE_static_cast (u_short, ACE_OS::atoi (port_number));
+                port = static_cast<u_short> (ACE_OS::atoi (port_number));
             }
 
           // Port wasn't specified on the command-line or in environment -
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 82705ace208..b7793665682 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -75,7 +75,7 @@ TAO_Persistent_Context_Index::bind (const char *poa_id,
   else
     {
       // Populate memory with data.
-      counter = ACE_reinterpret_cast (ACE_UINT32 *, ptr);
+      counter = reinterpret_cast<ACE_UINT32 *> (ptr);
       *counter = 0;
       char * poa_id_ptr = ptr + counter_len;
       ACE_OS::strcpy (poa_id_ptr, poa_id);
@@ -124,9 +124,7 @@ TAO_Persistent_Context_Index::TAO_Persistent_Context_Index
 TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index (void)
 {
   delete allocator_;
-  ACE_OS::free (ACE_reinterpret_cast (void *,
-                                      ACE_const_cast (ACE_TCHAR *,
-                                                      index_file_)));
+  ACE_OS::free (reinterpret_cast<void *> (const_cast<ACE_TCHAR *> (index_file_)));
 }
 
 ACE_Allocator*
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 2d6aff6f15f..97775258136 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -478,7 +478,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
   if (this->context_->current_size () > how_many)
     n = how_many;
   else
-    n = ACE_static_cast (CORBA::ULong, this->context_->current_size ());
+    n = static_cast<CORBA::ULong> (this->context_->current_size ());
 
   // Use hash iterator to populate a BindingList with bindings.
   bl->length (n);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/README b/TAO/orbsvcs/orbsvcs/Naming/README
index 936563ec548..5145337c611 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/README
+++ b/TAO/orbsvcs/orbsvcs/Naming/README
@@ -10,7 +10,7 @@ $TAO_ROOT/orbsvcs/Naming_Service.
 
 UTILITIES
 =========
-Naming_Utils.{h,cpp} contain utility classes that can simplify
+Naming_{Client,Server}.{h,cpp} contain utility classes that can simplify
 programs which play a role of Naming Service server or client.  See
 $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service.{h,cpp} and
 $TAO_ROOT/orbsvcs/tests/Simple_Naming/client.{h,cpp} for examples of
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index b3098abee20..8e9ff4254ae 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -1,7 +1,7 @@
 #include "Storable_Naming_Context.h"
 #include "Bindings_Iterator_T.h"
 
-#include <tao/debug.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
@@ -259,8 +259,7 @@ void TAO_Storable_Naming_Context::Write(TAO_Storable_Base& wrtr)
   ACE_TRACE("Write");
   TAO_NS_Persistence_Header header;
 
-  header.size (ACE_static_cast(unsigned int,
-                               storable_context_->current_size()));
+  header.size (static_cast<unsigned int> (storable_context_->current_size()));
   header.destroyed (destroyed_);
 
   wrtr << header;
@@ -547,7 +546,7 @@ TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void)
       // Now delete the file
       ACE_Auto_Ptr<TAO_Storable_Base>
         fl (
-          this->factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()),
+          this->factory_->create_stream(file_name.c_str(),
                                         ACE_TEXT("r"))
           );
       if (fl.get())
@@ -1017,8 +1016,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
           CosNaming::Name rest_of_name
             (n.maximum () - 1,
              n.length () - 1,
-             ACE_const_cast (CosNaming::NameComponent*,
-                             n.get_buffer ()) + 1);
+             const_cast<CosNaming::NameComponent*> (n.get_buffer ()) + 1);
 
           // If there are any exceptions, they will propagate up.
           return context->resolve (rest_of_name
@@ -1144,49 +1142,47 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
       ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
     }
   // If we received a simple name, we need to bind it in this context.
-  else
-  {
-    // This had been a read on the file so now we are done with it
-    flck.release();
 
-    // Stores our new Naming Context.
-    CosNaming::NamingContext_var result =
-      CosNaming::NamingContext::_nil ();
+  // This had been a read on the file so now we are done with it
+  flck.release();
 
-    // Create new context.
-    result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  // Stores our new Naming Context.
+  CosNaming::NamingContext_var result =
+    CosNaming::NamingContext::_nil ();
 
-    // Bind the new context to the name.
-    ACE_TRY
-      {
-        bind_context (n,
-                      result.in ()
-                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
+  // Create new context.
+  result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+
+  // Bind the new context to the name.
+  ACE_TRY
+    {
+      bind_context (n,
+                    result.in ()
+                    ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
       {
-        {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY_EX(DESTROY)
-            {
-              result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX(DESTROY);
-            }
-          ACE_CATCHANY
-            {
-              // Do nothing?
-            }
-          ACE_ENDTRY;
-        }
-        // Re-raise the exception in bind_context()
-        ACE_RE_THROW;
+        ACE_DECLARE_NEW_CORBA_ENV;
+        ACE_TRY_EX(DESTROY)
+          {
+            result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+            ACE_TRY_CHECK_EX(DESTROY);
+          }
+        ACE_CATCHANY
+          {
+            // Do nothing?
+          }
+        ACE_ENDTRY;
       }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-    return result._retn ();
-  }
+      // Re-raise the exception in bind_context()
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  return result._retn ();
 }
 
 void
@@ -1376,7 +1372,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
   if (this->context_->current_size () > how_many)
     n = how_many;
   else
-    n = ACE_static_cast (CORBA::ULong, this->context_->current_size ());
+    n = static_cast<CORBA::ULong> (this->context_->current_size ());
 
   // Use the hash map iterator to populate <bl> with bindings.
   bl->length (n);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
index c761c23661e..4ba07961c82 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -17,8 +17,8 @@
 #define TAO_STORABLE_NAMING_CONTEXT_ACTIVATOR_H
 #include /**/ "ace/pre.h"
 
-#include <tao/PortableServer/PortableServer.h>
-#include <tao/LocalObject.h>
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/LocalObject.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 88e6db290ab..1a30740b27b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -280,7 +280,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
   if (this->context_->current_size () > how_many)
     n = how_many;
   else
-    n = ACE_static_cast (CORBA::ULong, this->context_->current_size ());
+    n = static_cast<CORBA::ULong> (this->context_->current_size ());
 
   // Use the hash map iterator to populate <bl> with bindings.
   bl->length (n);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index c01902fea7e..b19dccf80b0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -14,11 +14,20 @@ ACE_RCSID (Notify,
 #include "Container_T.h"
 #include "Proxy.h"
 #include "EventChannel.h"
-
-TAO_Notify_Admin::TAO_Notify_Admin (void)
+#include "Topology_Saver.h"
+#include "Save_Persist_Worker_T.h"
+#include "Reconnect_Worker_T.h"
+#include "tao/debug.h"
+//#define DEBUG_LEVEL 9
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
+
+TAO_Notify_Admin::TAO_Notify_Admin ()
   : ec_ (0)
   , proxy_container_ (0)
   , filter_operator_ (CosNotifyChannelAdmin::OR_OP)
+  , is_default_ (false)
 {
   // Initialize all Admin objects to initially be subscribed for all events.
   // This is a reasonable default and is required to allow Cos Event consumers/suppliers to send/receive events,
@@ -31,13 +40,15 @@ TAO_Notify_Admin::~TAO_Notify_Admin ()
 }
 
 void
-TAO_Notify_Admin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL)
 {
-  this->ec_ = ec;
+  this->ec_ = dynamic_cast<TAO_Notify_EventChannel *> (parent);
+  ACE_ASSERT (this->ec_ != 0);
 
   this->ec_->_incr_refcnt ();
 
-  this->TAO_Notify_Object::init (ec);
+  // this-> on the following line confuses VC6
+  initialize (parent ACE_ENV_ARG_PARAMETER);
 
   ACE_NEW_THROW_EX (this->proxy_container_,
                     TAO_Notify_Proxy_Container (),
@@ -66,7 +77,7 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC
   // Adopt the Admin's subscription.
   TAO_Notify_EventTypeSeq added (this->subscribed_types_), removed;
 
-  added.init (subscribed_types, removed);
+  added.add_and_remove (subscribed_types, removed);
 
   subscribed_types = added;
 }
@@ -91,6 +102,105 @@ TAO_Notify_Admin::insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
   this->proxy_container_->insert (proxy ACE_ENV_ARG_PARAMETER);
 }
 
+void
+TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+{
+  bool changed = this->children_changed_;
+  this->children_changed_ = false;
+  this->self_changed_ = false;
+
+  if (is_persistent ())
+  {
+    TAO_Notify::NVPList attrs;
+    this->save_attrs(attrs);
+
+    const char* type = this->get_admin_type_name();
+
+    bool want_all_children =
+      saver.begin_object(this->id(), type, attrs, changed ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+
+    if (want_all_children || this->filter_admin_.is_changed ())
+    {
+      this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+    if (want_all_children || this->subscribed_types_.is_changed ())
+    {
+      this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    TAO_Notify::Save_Persist_Worker<TAO_Notify_Proxy> wrk(saver, want_all_children);
+    this->proxy_container_->collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+
+    saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER);
+  }
+}
+
+void
+TAO_Notify_Admin::save_attrs (TAO_Notify::NVPList& attrs)
+{
+  TAO_Notify_Object::save_attrs(attrs);
+  attrs.push_back(TAO_Notify::NVP("InterFilterGroupOperator", this->filter_operator_));
+  if (this->is_default_)
+    {
+      attrs.push_back (TAO_Notify::NVP ("default", "yes"));
+    }
+}
+
+void
+TAO_Notify_Admin::load_attrs(const TAO_Notify::NVPList& attrs)
+{
+  TAO_Notify_Object::load_attrs (attrs);
+  const char * value = 0;
+  if (attrs.find ("InterFilterGroupOperator", value))
+    {
+      this->filter_operator_ = static_cast <CosNotifyChannelAdmin::InterFilterGroupOperator> (ACE_OS::atoi (value));
+    }
+  if (attrs.find ("default", value))
+  {
+    this->is_default_ = (ACE_OS::strcmp (value, "yes") == 0);
+  }
+}
+
+TAO_Notify::Topology_Object*
+TAO_Notify_Admin::load_child (const ACE_CString &type,
+  CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL_NOT_USED)
+{
+  ACE_UNUSED_ARG (attrs);
+  TAO_Notify::Topology_Object* result = this;
+  if (type == "subscriptions")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Admin reload subscription %d\n")
+      , static_cast<int> (id)
+      ));
+    // since we initialized our subscribed types to everything
+    // in the constructor. we have to clear it out first.
+    this->subscribed_types_.reset();
+    result = &this->subscribed_types_;
+  }
+  else if (type == "filter_admin")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Admin reload filter_admin %d\n")
+      , static_cast<int> (id)
+      ));
+    result = & this->filter_admin_;
+  }
+  return result;
+}
+
+void
+TAO_Notify_Admin::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  TAO_Notify::Reconnect_Worker<TAO_Notify_Proxy> wrk;
+  this->proxy_container_->collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_ESF_Shutdown_Proxy<TAO_Notify_Proxy>;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index c2c384df821..3e67f4303ed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -22,7 +22,7 @@
 
 #include "FilterAdmin.h"
 #include "EventTypeSeq.h"
-#include "Object.h"
+#include "Topology_Object.h"
 
 class TAO_Notify_Proxy;
 class TAO_Notify_EventChannel;
@@ -35,7 +35,7 @@ template <class TYPE> class TAO_Notify_Container_T;
  *
  */
 
-class TAO_Notify_Serv_Export TAO_Notify_Admin : public virtual TAO_Notify_Object
+class TAO_Notify_Serv_Export TAO_Notify_Admin : public TAO_Notify::Topology_Parent
 {
   friend class TAO_Notify_Builder;
 public:
@@ -43,13 +43,13 @@ public:
   typedef CosNotifyChannelAdmin::AdminIDSeq_var SEQ_VAR;
 
   /// Constuctor
-  TAO_Notify_Admin (void);
+  TAO_Notify_Admin ();
 
   /// Destructor
   ~TAO_Notify_Admin ();
 
   /// Init
-  void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
+  void init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL);
 
   /// Insert the proxy in the <proxy_container_>.
   void insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL);
@@ -69,14 +69,28 @@ public:
   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator (void);
 
   /// Obtain the Admin's subscribed types.
-  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types 
+  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types
                          ACE_ENV_ARG_DECL);
 
+  TAO_Notify_EventChannel * event_channel () const;
   /// Shutdown
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
+    CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+  virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+
+  void set_default (bool is_default);
+  bool is_default () const;
+  virtual void load_attrs(const TAO_Notify::NVPList& attrs);
+
 protected:
-  typedef TAO_Notify_Container_T <TAO_Notify_Proxy> 
+  void save_attrs (TAO_Notify::NVPList& attrs);
+  virtual const char * get_admin_type_name (void) const = 0;
+
+protected:
+  typedef TAO_Notify_Container_T <TAO_Notify_Proxy>
     TAO_Notify_Proxy_Container;
 
   /// = Data Members
@@ -95,6 +109,8 @@ protected:
 
   /// Filter operator
   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator_;
+
+  bool is_default_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
index 8b6d8641eeb..f675842ad8c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
@@ -1,5 +1,13 @@
 // $Id$
 
+ACE_INLINE
+TAO_Notify_EventChannel *
+TAO_Notify_Admin::event_channel () const
+{
+  return this->ec_;
+}
+
+
 ACE_INLINE TAO_Notify_FilterAdmin&
 TAO_Notify_Admin::filter_admin (void)
 {
@@ -17,3 +25,17 @@ TAO_Notify_Admin::filter_operator (void)
 {
   return this->filter_operator_;
 }
+
+ACE_INLINE
+void
+TAO_Notify_Admin::set_default (bool is_default)
+{
+  this->is_default_ = is_default;
+}
+
+ACE_INLINE
+bool
+TAO_Notify_Admin::is_default (void) const
+{
+  return this->is_default_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index 1d373b8eac8..1c90b0e5248 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -6,8 +6,8 @@
 #include "AdminProperties.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify, 
-           TAO_Notify_AdminProperties, 
+ACE_RCSID (Notify,
+           TAO_Notify_AdminProperties,
            "$Id$")
 
 #include "orbsvcs/CosNotificationC.h"
@@ -43,6 +43,38 @@ TAO_Notify_AdminProperties::init (const CosNotification::PropertySeq& prop_seq)
   return 0;
 }
 
+void
+TAO_Notify_AdminProperties::init ()
+{
+  // This method should only be called once, (during topo load)
+  ACE_ASSERT(this->size() == 0);
+
+  if (this->max_global_queue_length_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->max_global_queue_length_.value();
+    this->add(this->max_global_queue_length_.name(), a);
+  }
+  if (this->max_consumers_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->max_consumers_.value();
+    this->add(this->max_consumers_.name(), a);
+  }
+  if (this->max_suppliers_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->max_suppliers_.value();
+    this->add(this->max_suppliers_.name(), a);
+  }
+  if (this->reject_new_events_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= CORBA::Any::from_boolean(this->reject_new_events_.value());
+    this->add(this->reject_new_events_.name(), a);
+  }
+}
+
 CORBA::Boolean
 TAO_Notify_AdminProperties::queue_full (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
index e7f51ebc5a0..5594add39b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
@@ -37,7 +37,7 @@
  * @brief The AdminProperties per EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_AdminProperties 
+class TAO_Notify_Serv_Export TAO_Notify_AdminProperties
   : public TAO_Notify_PropertySeq
 {
 public:
@@ -50,12 +50,21 @@ public:
   // Init
   int init (const CosNotification::PropertySeq& prop_seq);
 
-  // = Accessors
+  // finish initialization after values are set by topology load
+  void init ();
+
+  // = Const Accessors
   const TAO_Notify_Property_Long& max_global_queue_length (void) const;
   const TAO_Notify_Property_Long& max_consumers (void) const;
   const TAO_Notify_Property_Long& max_suppliers (void) const;
   const TAO_Notify_Property_Boolean& reject_new_events (void) const;
 
+  // = Non-const accessors
+  TAO_Notify_Property_Long & max_global_queue_length (void);
+  TAO_Notify_Property_Long & max_consumers (void);
+  TAO_Notify_Property_Long & max_suppliers (void);
+  TAO_Notify_Property_Boolean & reject_new_events (void);
+
   CORBA::Long& global_queue_length (void);
   TAO_SYNCH_MUTEX& global_queue_lock (void);
   TAO_SYNCH_CONDITION& global_queue_not_full_condition (void);
@@ -109,8 +118,8 @@ protected:
   TAO_Notify_Atomic_Property_Long suppliers_;
 };
 
-typedef ACE_Refcounted_Auto_Ptr<TAO_Notify_AdminProperties, 
-                                TAO_SYNCH_MUTEX> 
+typedef ACE_Refcounted_Auto_Ptr<TAO_Notify_AdminProperties,
+                                TAO_SYNCH_MUTEX>
   TAO_Notify_AdminProperties_var;
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
index 0eea011af97..36743cc9dc1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
@@ -6,24 +6,48 @@ TAO_Notify_AdminProperties::max_global_queue_length (void) const
   return this->max_global_queue_length_;
 }
 
+ACE_INLINE TAO_Notify_Property_Long&
+TAO_Notify_AdminProperties::max_global_queue_length (void)
+{
+  return this->max_global_queue_length_;
+}
+
 ACE_INLINE const TAO_Notify_Property_Long&
 TAO_Notify_AdminProperties::max_consumers (void) const
 {
   return this->max_consumers_;
 }
 
+ACE_INLINE TAO_Notify_Property_Long&
+TAO_Notify_AdminProperties::max_consumers (void)
+{
+  return this->max_consumers_;
+}
+
 ACE_INLINE const TAO_Notify_Property_Long&
 TAO_Notify_AdminProperties::max_suppliers (void) const
 {
   return this->max_suppliers_;
 }
 
+ACE_INLINE TAO_Notify_Property_Long&
+TAO_Notify_AdminProperties::max_suppliers (void)
+{
+  return this->max_suppliers_;
+}
+
 ACE_INLINE const TAO_Notify_Property_Boolean&
 TAO_Notify_AdminProperties::reject_new_events (void) const
 {
   return this->reject_new_events_;
 }
 
+ACE_INLINE TAO_Notify_Property_Boolean&
+TAO_Notify_AdminProperties::reject_new_events (void)
+{
+  return this->reject_new_events_;
+}
+
 ACE_INLINE CORBA::Long&
 TAO_Notify_AdminProperties::global_queue_length (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index c8c2464998c..de4b9b46faa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -2,15 +2,16 @@
 
 #include "AnyEvent.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "AnyEvent.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$")
 
 #include "../Consumer.h"
 #include "tao/debug.h"
 
+//#define DEBUG_LEVEL 10
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
+
 TAO_Notify_EventType TAO_Notify_AnyEvent_No_Copy::event_type_;
 
 TAO_Notify_AnyEvent_No_Copy::TAO_Notify_AnyEvent_No_Copy (const CORBA::Any &event)
@@ -22,18 +23,6 @@ TAO_Notify_AnyEvent_No_Copy::~TAO_Notify_AnyEvent_No_Copy ()
 {
 }
 
-TAO_Notify_Event*
-TAO_Notify_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_Notify_Event* copy;
-
-  ACE_NEW_THROW_EX (copy,
-                    TAO_Notify_AnyEvent (*this->event_),
-                    CORBA::NO_MEMORY ());
-
-  return copy;
-}
-
 const TAO_Notify_EventType&
 TAO_Notify_AnyEvent_No_Copy::type (void) const
 {
@@ -49,7 +38,7 @@ TAO_Notify_AnyEvent_No_Copy::convert (CosNotification::StructuredEvent& notifica
 CORBA::Boolean
 TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
 {
-  if (TAO_debug_level > 0)
+  if (DEBUG_LEVEL > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_AnyEvent::do_match ()\n"));
 
@@ -59,7 +48,7 @@ TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_EN
 void
 TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const
 {
-  if (TAO_debug_level > 0)
+  if (DEBUG_LEVEL > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_AnyEvent::push \n"));
 
@@ -98,6 +87,39 @@ TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSuppli
   forwarder->forward_any_no_filtering (*this->event_ ACE_ENV_ARG_PARAMETER);
 }
 
+void
+TAO_Notify_AnyEvent_No_Copy::marshal (TAO_OutputCDR & cdr) const
+{
+  static const ACE_CDR::Octet ANY_CODE = MARSHAL_ANY;
+  cdr.write_octet (ANY_CODE);
+  cdr << (*this->event_);
+}
+
+//static
+TAO_Notify_AnyEvent *
+TAO_Notify_AnyEvent_No_Copy::unmarshal (TAO_InputCDR & cdr)
+{
+  TAO_Notify_AnyEvent * event = 0;
+  CORBA::Any body;
+  if (cdr >> body)
+  {
+    event = new TAO_Notify_AnyEvent (body);
+  }
+  return event;
+}
+
+TAO_Notify_Event *
+TAO_Notify_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+{
+  TAO_Notify_Event * new_event;
+  ACE_NEW_THROW_EX (new_event,
+                    TAO_Notify_AnyEvent (*this->event_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+  return new_event;
+}
+
+
 /*****************************************************************************************************/
 
 TAO_Notify_AnyEvent::TAO_Notify_AnyEvent (const CORBA::Any &event)
@@ -110,3 +132,10 @@ TAO_Notify_AnyEvent::TAO_Notify_AnyEvent (const CORBA::Any &event)
 TAO_Notify_AnyEvent::~TAO_Notify_AnyEvent ()
 {
 }
+
+const TAO_Notify_Event *
+TAO_Notify_AnyEvent::queueable_copy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+{
+  return this;
+}
+
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index d97e7bc2b7e..3b56a9bedaf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,7 +26,7 @@
 #include "orbsvcs/CosNotificationC.h"
 
 class TAO_Notify_Consumer;
-
+class TAO_Notify_AnyEvent;
 /**
  * @class TAO_Notify_AnyEvent
  *
@@ -43,9 +43,6 @@ public:
   /// Destructor
   ~TAO_Notify_AnyEvent_No_Copy ();
 
-  /// Copy the event.
-  virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
-
   /// Get the event type.
   virtual const TAO_Notify_EventType& type (void) const;
 
@@ -69,7 +66,21 @@ public:
   /// Push event to the Event_Forwarder interface
   virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
+  /// marshal this event into a CDR buffer (for persistence)
+  virtual void marshal (TAO_OutputCDR & cdr) const;
+
+  /// unmarshal this event from a CDR buffer (for persistence)
+  /// \param code a code indicating what type of event to create.
+  /// \param cdr a CDR stream containing the marshalled data for the event.
+  /// \return the new event, or NULL if this is the wrong type of event.
+  static TAO_Notify_AnyEvent * unmarshal (TAO_InputCDR & cdr);
+
 protected:
+  /// returns a copy of this event allocated from the heap
+  virtual TAO_Notify_Event * copy (ACE_ENV_SINGLE_ARG_DECL) const;
+
+protected:
+
   /// Any Event
   const CORBA::Any* event_;
 
@@ -94,15 +105,14 @@ public:
   /// Destructor
   ~TAO_Notify_AnyEvent ();
 
+  /// return this
+  virtual const TAO_Notify_Event * queueable_copy (ACE_ENV_SINGLE_ARG_DECL)const;
+
 protected:
   /// Copy of the Event.
   CORBA::Any any_copy_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "AnyEvent.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_ANYEVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.inl
deleted file mode 100644
index 4920e03d422..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "AnyEvent.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index 0a613a94fed..6da0cae1abc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -2,10 +2,6 @@
 
 #include "CosEC_ProxyPushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "CosEC_ProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$Id$")
 
 #include "tao/debug.h"
@@ -31,13 +27,6 @@ TAO_Notify_CosEC_ProxyPushConsumer::release (void)
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer::push (TAO_Notify_Event_var &/*event*/)
-{
-  // This should never be called.
-  ACE_ASSERT (1);
-}
-
-void
 TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -80,10 +69,17 @@ TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSup
   this->connect (supplier ACE_ENV_ARG_PARAMETER);
 }
 
-void TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+void
+TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+const char *
+TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name (void) const
+{
+  return "ec_proxy_push_consumer";
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index 7cb9b02f115..769e17caf70 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -51,6 +51,8 @@ public:
   /// Release
   virtual void release (void);
 
+  virtual const char * get_proxy_type_name (void) const;
+
 protected:
   ///= CosNotifyChannelAdmin::ProxyPushConsumer methods
 
@@ -72,17 +74,14 @@ protected:
                      ));
 private:
   // Overloaded TAO_Notify_ProxyConsumer::push to get around Borland compiler warnings.
-  virtual void push (TAO_Notify_Event_var &event);
+  // I don't think this is necessary any more -- Dale.
+//  virtual void push (TAO_Notify_Event_var &event);
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "CosEC_ProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_COSEC_PROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.inl
deleted file mode 100644
index e787ced2266..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "CosEC_ProxyPushConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index e1cafd280c9..73db5b163a5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -2,10 +2,6 @@
 
 #include "CosEC_ProxyPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "CosEC_ProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
@@ -57,3 +53,9 @@ TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG
 {
   this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+const char *
+TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name (void) const
+{
+  return "ec_proxy_push_supplier";
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index 69acbdcdacc..4b0ac337244 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -56,6 +56,8 @@ public:
   /// Release
   virtual void release (void);
 
+  virtual const char * get_proxy_type_name (void) const;
+
   // = Interface methods
   virtual void connect_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer
@@ -79,10 +81,6 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "CosEC_ProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_COSEC_PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.inl
deleted file mode 100644
index c6551c656c4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "CosEC_ProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index aecb8951e81..692927519a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -2,16 +2,11 @@
 
 #include "ProxyPushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_ProxyPushConsumer, "$Id$")
 
 #include "tao/debug.h"
 #include "../AdminProperties.h"
-#include "../Method_Request_Lookup.h"
-#include "../Worker_Task.h"
+#include "../Properties.h"
 #include "AnyEvent.h"
 #include "PushSupplier.h"
 
@@ -43,13 +38,6 @@ TAO_Notify_ProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Notify_ProxyPushConsumer::push (TAO_Notify_Event_var &/*event*/)
-{
-  // This should never be called.
-  ACE_ASSERT (1);
-}
-
-void
 TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -67,10 +55,7 @@ TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
     }
 
   TAO_Notify_AnyEvent_No_Copy event (any);
-
-  TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
-
-  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
+  this->push_i (&event ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -90,6 +75,8 @@ TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSuppl
   ACE_CHECK;
 
   this->connect (supplier ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
@@ -98,4 +85,44 @@ void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_
                    ))
 {
   this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+const char *
+TAO_Notify_ProxyPushConsumer::get_proxy_type_name (void) const
+{
+  return "proxy_push_consumer";
+}
+
+void
+TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs)
+{
+  SuperClass::load_attrs(attrs);
+  ACE_CString ior;
+  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  {
+    CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
+    {
+      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CosNotifyComm::PushSupplier_var ps =
+        CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      // minor hack: suppress generating subscription updates during reload.
+      bool save_updates = this->updates_off_;
+      this->updates_off_ = true;
+      this->connect_any_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      this->updates_off_ = save_updates;
+    }
+    ACE_CATCHALL
+    {
+      ACE_ASSERT(0);
+    }
+    ACE_ENDTRY;
+  }
+}
+
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index 6c732c772ad..132220e166c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -41,6 +41,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushConsumer
                        POA_CosNotifyChannelAdmin::ProxyPushConsumer
                      >
 {
+ typedef TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::ProxyPushConsumer> SuperClass;
  friend class TAO_Notify_Builder;
 public:
   /// Constuctor
@@ -52,6 +53,11 @@ public:
   /// Release
   virtual void release (void);
 
+//  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual const char * get_proxy_type_name (void) const;
+
+  virtual void load_attrs (const TAO_Notify::NVPList& attrs);
+
 protected:
   ///= CosNotifyChannelAdmin::ProxyPushConsumer methods
 
@@ -79,16 +85,13 @@ protected:
 
 private:
   // Overloaded TAO_Notify_ProxyConsumer::push to get around Borland compiler warnings.
-  virtual void push (TAO_Notify_Event_var &event);
+  // I don't think this is necessary any more -- Dale.
+//  virtual void push (TAO_Notify_Event_var &event);
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "ProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.inl
deleted file mode 100644
index 32c8ecf4355..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "ProxyPushConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index c5e280e9b75..982ef04e1ee 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -2,14 +2,11 @@
 
 #include "ProxyPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_ProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
 #include "PushConsumer.h"
+#include "../Properties.h"
 
 TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier (void)
 {
@@ -48,6 +45,8 @@ TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsu
   ACE_CHECK;
 
   this->connect (consumer ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -57,6 +56,8 @@ TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
                    ))
 {
   this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyType
@@ -67,3 +68,36 @@ TAO_Notify_ProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return CosNotifyChannelAdmin::PUSH_ANY;
 }
+
+const char *
+TAO_Notify_ProxyPushSupplier::get_proxy_type_name (void) const
+{
+  return "proxy_push_supplier";
+}
+
+void
+TAO_Notify_ProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs)
+{
+  SuperClass::load_attrs(attrs);
+  ACE_CString ior;
+  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  {
+    CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
+    {
+      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CosNotifyComm::PushConsumer_var pc =
+        CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      this->connect_any_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+    ACE_CATCHANY
+    {
+      // if we can't reconnect, tough...
+    }
+    ACE_ENDTRY;
+  }
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index c24668ef7e8..f2a1af9cf02 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,6 +46,7 @@ TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>;
 class TAO_Notify_Serv_Export TAO_Notify_ProxyPushSupplier
   : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier>
 {
+  typedef TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier> SuperClass;
   friend class TAO_Notify_Builder;
 public:
   /// Constuctor
@@ -57,6 +58,10 @@ public:
   /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
+  virtual const char * get_proxy_type_name (void) const;
+
+  virtual void load_attrs (const TAO_Notify::NVPList& attrs);
+
   // = Interface methods
   virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
@@ -85,10 +90,6 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "ProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.inl
deleted file mode 100644
index dda279acbfc..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "ProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index d26302a2cee..07701320013 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -2,17 +2,14 @@
 
 #include "PushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "PushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Notify, 
-           TAO_Notify_PushConsumer, 
+ACE_RCSID (Notify,
+           TAO_Notify_PushConsumer,
            "$Id$")
 
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "orbsvcs/CosEventCommC.h"
 #include "../Event.h"
+#include "../Properties.h"
 
 TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy)
   :TAO_Notify_Consumer (proxy)
@@ -48,18 +45,6 @@ TAO_Notify_PushConsumer::release (void)
 }
 
 void
-TAO_Notify_PushConsumer::push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
-{
-  event->push (this ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Notify_PushConsumer::push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL)
-{
-  event->push (this ACE_ENV_ARG_PARAMETER);
-}
-
-void
 TAO_Notify_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
 {
   this->push_consumer_->push (payload ACE_ENV_ARG_PARAMETER);
@@ -74,3 +59,46 @@ TAO_Notify_PushConsumer::push (const CosNotification::StructuredEvent& event ACE
 
   this->push_consumer_->push (any ACE_ENV_ARG_PARAMETER);
 }
+
+/// Push a batch of events to this consumer.
+void
+TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL_NOT_USED)
+{
+  ACE_ASSERT(false);
+  ACE_UNUSED_ARG (event);
+  // TODO exception?
+}
+
+
+
+bool
+TAO_Notify_PushConsumer::get_ior (ACE_CString & iorstr) const
+{
+  bool result = false;
+  CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+  {
+    CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
+  }
+  ACE_CATCHANY
+  {
+    ACE_ASSERT(0);
+  }
+  ACE_ENDTRY;
+  return result;
+}
+
+void
+TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
+    ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_PushConsumer* tmp = dynamic_cast<TAO_Notify_PushConsumer*> (old_consumer);
+  ACE_ASSERT(tmp != 0);
+  this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->schedule_timer(false);
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index f5ca3aa8af9..37967cc8d3b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_PUSHCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -44,10 +44,7 @@ public:
   virtual void release (void);
 
   /// Push <event> to this consumer.
-  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
-
-  /// Push <event> to this consumer.
-  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
+//  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
@@ -55,14 +52,22 @@ public:
   /// Push <event> to this consumer.
   virtual void push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
 
+  /// Push a batch of events to this consumer.
+  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
+
+  /// Retrieve the ior of this peer
+  virtual bool get_ior (ACE_CString & iorstr) const;
+
+  /// on reconnect we need to move events from the old consumer
+  /// to the new one
+  virtual void reconnect_from_consumer (
+    TAO_Notify_Consumer* old_consumer
+    ACE_ENV_ARG_DECL);
+
 protected:
   /// The Consumer
   CosEventComm::PushConsumer_var push_consumer_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "PushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.inl
deleted file mode 100644
index e557d6a7eda..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "PushConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index c6d2ae4c48a..e7fd70cd7af 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -2,11 +2,8 @@
 
 #include "PushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "PushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_PushSupplier, "$Id$")
+#include "../Properties.h"
 
 TAO_Notify_PushSupplier::TAO_Notify_PushSupplier (TAO_Notify_ProxyConsumer* proxy)
   :TAO_Notify_Supplier (proxy)
@@ -40,3 +37,23 @@ TAO_Notify_PushSupplier::release (void)
   delete this;
   //@@ inform factory
 }
+bool
+TAO_Notify_PushSupplier::get_ior (ACE_CString & iorstr) const
+{
+  bool result = false;
+  CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+  {
+    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
+  }
+  ACE_CATCHANY
+  {
+    ACE_ASSERT(0);
+  }
+  ACE_ENDTRY;
+  return result;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index 9f9ab07131e..a0726ccda2e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_PUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,14 +46,13 @@ public:
   /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
+  /// Retrieve the ior of this peer
+  virtual bool get_ior (ACE_CString & iorstr) const;
+
 protected:
   /// The Supplier
   CosEventComm::PushSupplier_var push_supplier_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "PushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.inl
deleted file mode 100644
index 9f9bf75ff2f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "PushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index 55acfa6f5dc..83cef826e15 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -67,7 +67,7 @@ TAO_Notify_Buffering_Strategy::update_qos_properties (
 
       this->blocking_time_ =
 # if defined (ACE_CONFIG_WIN32_H)
-        ACE_Time_Value (ACE_static_cast (long, blocking_timeout.value ()));
+        ACE_Time_Value (static_cast<long> (blocking_timeout.value ()));
 # else
       ACE_Time_Value (blocking_timeout.value () / 1);
 # endif /* ACE_CONFIG_WIN32_H */
@@ -87,7 +87,7 @@ TAO_Notify_Buffering_Strategy::shutdown (void)
 }
 
 int
-TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request& method_request)
+TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable& method_request)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
@@ -174,7 +174,7 @@ TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request& method_reques
 }
 
 int
-TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request* &method_request, const ACE_Time_Value *abstime)
+TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request_Queueable* &method_request, const ACE_Time_Value *abstime)
 {
   ACE_Message_Block *mb;
 
@@ -194,7 +194,7 @@ TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request* &method_reque
   if (this->msg_queue_.dequeue (mb) == -1)
     return -1;
 
-  method_request = ACE_dynamic_cast (TAO_Notify_Method_Request*, mb);
+  method_request = dynamic_cast<TAO_Notify_Method_Request_Queueable*> (mb);
 
   if (method_request == 0)
     return -1;
@@ -210,7 +210,7 @@ TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request* &method_reque
 }
 
 int
-TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request& method_request)
+TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request_Queueable& method_request)
 {
   int result;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index fb2bdc4627c..a0205aec9e0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -29,7 +29,7 @@
 #include "Property_T.h"
 #include "AdminProperties.h"
 
-class TAO_Notify_Method_Request;
+class TAO_Notify_Method_Request_Queueable;
 class TAO_Notify_QoSProperties;
 
 typedef ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Notify_Message_Queue;
@@ -62,11 +62,11 @@ public:
 
   /// Enqueue according the enqueing strategy.
   /// Return -1 on error else the number of items in the queue.
-  int enqueue (TAO_Notify_Method_Request& method_request);
+  int enqueue (TAO_Notify_Method_Request_Queueable& method_request);
 
   /// Dequeue batch. This method will block for @a abstime if non-zero or else blocks till an item is available.
   /// Return -1 on error or if nothing is available, else the number of items actually dequeued (1).
-  int dequeue (TAO_Notify_Method_Request* &method_request,
+  int dequeue (TAO_Notify_Method_Request_Queueable* &method_request,
                const ACE_Time_Value *abstime);
 
   /// Shutdown
@@ -83,7 +83,7 @@ public:
 
 protected:
   /// Apply the Order Policy and queue. return -1 on error.
-  int queue (TAO_Notify_Method_Request& method_request);
+  int queue (TAO_Notify_Method_Request_Queueable& method_request);
 
   /// Discard as per the Discard Policy.
   int discard (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index be7c6fafeba..06723e313b9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -1,12 +1,8 @@
 // $Id$
 #include "Builder.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Builder.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Notify, 
-           Builder, 
+ACE_RCSID (Notify,
+           Builder,
            "$Id$")
 
 #include "ace/Dynamic_Service.h"
@@ -41,10 +37,10 @@ ACE_RCSID (Notify,
 #include "ETCL_FilterFactory.h"
 #include "Container_T.h"
 
-template <class PROXY_IMPL, 
-          class PROXY, 
-          class PROXY_PTR, 
-          class PROXY_VAR, 
+template <class PROXY_IMPL,
+          class PROXY,
+          class PROXY_PTR,
+          class PROXY_VAR,
           class PARENT>
 class TAO_Notify_Proxy_Builder_T
 {
@@ -83,6 +79,32 @@ public:
 
     return proxy_ret._retn ();
   }
+
+  PROXY_IMPL*
+  build (PARENT *parent, const CosNotifyChannelAdmin::ProxyID proxy_id
+         ACE_ENV_ARG_DECL)
+  {
+    TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
+
+    PROXY_IMPL* proxy = 0;
+    factory->create (proxy ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    PortableServer::ServantBase_var servant (proxy);
+
+    proxy->init (parent ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    proxy->activate (proxy, proxy_id ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    // insert proxy in admin container.
+    parent->insert (proxy ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+
+    return proxy;
+  }
+
 };
 
 // define the ProxyConsumer Builders.
@@ -183,21 +205,22 @@ TAO_Notify_Builder::build_event_channel_factory (PortableServer::POA_ptr poa ACE
   factory->create (ecf ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ecf_ret._retn ());
 
-  PortableServer::ServantBase_var servant_var (ecf);
-
-  ecf->TAO_Notify_EventChannelFactory::init (poa ACE_ENV_ARG_PARAMETER);
+//  PortableServer::ServantBase_var servant_var (ecf);
 
-  CORBA::Object_var obj = ecf->activate (ecf ACE_ENV_ARG_PARAMETER);
+  ecf->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ecf_ret._retn ());
-
-  ecf_ret = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+  ecf_ret = ecf->activate_self (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ecf_ret._retn ());
 
   return (ecf_ret._retn ());
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_Builder::build_event_channel (TAO_Notify_EventChannelFactory* ecf, const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin, CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_event_channel (
+  TAO_Notify_EventChannelFactory* ecf,
+  const CosNotification::QoSProperties & initial_qos,
+  const CosNotification::AdminProperties & initial_admin,
+  CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec_ret;
 
@@ -207,7 +230,7 @@ TAO_Notify_Builder::build_event_channel (TAO_Notify_EventChannelFactory* ecf, co
   factory->create (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ec_ret._retn ());
 
-  PortableServer::ServantBase_var servant_var (ec);
+//  PortableServer::ServantBase_var servant_var (ec);
 
   ec->init (ecf, initial_qos, initial_admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ec_ret._retn ());
@@ -228,8 +251,35 @@ TAO_Notify_Builder::build_event_channel (TAO_Notify_EventChannelFactory* ecf, co
   return ec_ret._retn ();
 }
 
+TAO_Notify_EventChannel *
+TAO_Notify_Builder::build_event_channel (
+  TAO_Notify_EventChannelFactory* ecf,
+  const CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
+
+  TAO_Notify_EventChannel* ec = 0;
+  factory->create (ec ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  ec->init (ecf ACE_ENV_ARG_PARAMETER); //, initial_qos, initial_admin
+  ACE_CHECK_RETURN (0);
+
+  // insert ec in ec container.
+  ecf->ec_container_->insert (ec ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  ec->activate (ec, id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return ec;
+}
+
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_Builder::build_consumer_admin (TAO_Notify_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_consumer_admin (
+    TAO_Notify_EventChannel* ec,
+    CosNotifyChannelAdmin::InterFilterGroupOperator op,
+    CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var ca_ret;
 
@@ -239,7 +289,7 @@ TAO_Notify_Builder::build_consumer_admin (TAO_Notify_EventChannel* ec, CosNotify
   factory->create (ca ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ca_ret._retn ());
 
-  PortableServer::ServantBase_var servant_var (ca);
+//  PortableServer::ServantBase_var servant_var (ca);
 
   ca->init (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ca_ret._retn ());
@@ -261,6 +311,31 @@ TAO_Notify_Builder::build_consumer_admin (TAO_Notify_EventChannel* ec, CosNotify
   return ca_ret._retn ();
 }
 
+TAO_Notify_ConsumerAdmin *
+TAO_Notify_Builder::build_consumer_admin (
+  TAO_Notify_EventChannel* ec,
+  const CosNotifyChannelAdmin::ChannelID id
+  ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
+  TAO_Notify_ConsumerAdmin * ca = 0;
+  factory->create (ca ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+//  PortableServer::ServantBase_var servant_var (ca);
+
+  ca->init (ec ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::Object_var obj = ca->activate (ca, id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  // insert admin in CA container.
+  ec->ca_container_->insert (ca ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  return ca;
+}
+
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
 {
@@ -272,7 +347,7 @@ TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotify
   factory->create (sa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (sa_ret._retn ());
 
-  PortableServer::ServantBase_var servant_var (sa);
+//  PortableServer::ServantBase_var servant_var (sa);
 
   sa->init (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (sa_ret._retn ());
@@ -294,6 +369,32 @@ TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotify
   return sa_ret._retn ();
 }
 
+TAO_Notify_SupplierAdmin *
+TAO_Notify_Builder::build_supplier_admin (
+  TAO_Notify_EventChannel* ec,
+  const CosNotifyChannelAdmin::ChannelID id
+  ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
+  TAO_Notify_SupplierAdmin * sa = 0;
+  factory->create (sa ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+//  PortableServer::ServantBase_var servant_var (ca);
+
+  sa->init (ec ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::Object_var obj = sa->activate (sa, id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  // insert admin in CA container.
+  ec->sa_container_->insert (sa ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return sa;
+}
+
 CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
                             , CosNotifyChannelAdmin::ClientType ctype
@@ -366,6 +467,76 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
     }
 }
 
+TAO_Notify_ProxyConsumer *
+TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
+                            , CosNotifyChannelAdmin::ClientType ctype
+                            , const CosNotifyChannelAdmin::ProxyID proxy_id
+                            ACE_ENV_ARG_DECL)
+{
+  switch (ctype)
+    {
+    case CosNotifyChannelAdmin::ANY_EVENT:
+      {
+        TAO_Notify_ProxyPushConsumer_Builder pb;
+        return pb.build (sa, proxy_id ACE_ENV_ARG_PARAMETER);
+      }
+    break;
+
+    case CosNotifyChannelAdmin::STRUCTURED_EVENT:
+      {
+        TAO_Notify_StructuredProxyPushConsumer_Builder pb;
+        return pb.build (sa, proxy_id ACE_ENV_ARG_PARAMETER);
+      }
+    break;
+
+    case CosNotifyChannelAdmin::SEQUENCE_EVENT:
+     {
+       TAO_Notify_SequenceProxyPushConsumer_Builder pb;
+       return pb.build (sa, proxy_id ACE_ENV_ARG_PARAMETER);
+     }
+      break;
+
+    default:
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
+                        0);
+                        }
+}
+
+TAO_Notify_ProxySupplier *
+TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
+                            , CosNotifyChannelAdmin::ClientType ctype
+                            , const CosNotifyChannelAdmin::ProxyID proxy_id
+                            ACE_ENV_ARG_DECL)
+{
+  switch (ctype)
+    {
+    case CosNotifyChannelAdmin::ANY_EVENT:
+      {
+        TAO_Notify_ProxyPushSupplier_Builder pb;
+        return pb.build (ca, proxy_id ACE_ENV_ARG_PARAMETER);
+      }
+      break;
+
+    case CosNotifyChannelAdmin::STRUCTURED_EVENT:
+      {
+        TAO_Notify_StructuredProxyPushSupplier_Builder pb;
+        return pb.build (ca, proxy_id ACE_ENV_ARG_PARAMETER);
+      }
+    break;
+
+    case CosNotifyChannelAdmin::SEQUENCE_EVENT:
+      {
+        TAO_Notify_SequenceProxyPushSupplier_Builder pb;
+        return pb.build (ca, proxy_id ACE_ENV_ARG_PARAMETER);
+      }
+      break;
+
+    default:
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
+                        0);
+    }
+}
+
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_Notify_Builder::build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index bcf5abd6bec..1811386d755 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -26,11 +26,14 @@
 #include "orbsvcs/NotifyExtC.h"
 
 #include "AdminProperties.h"
+#include "Topology_Object.h"
 
 class TAO_Notify_EventChannelFactory;
 class TAO_Notify_EventChannel;
 class TAO_Notify_SupplierAdmin;
 class TAO_Notify_ConsumerAdmin;
+class TAO_Notify_ProxyConsumer;
+class TAO_Notify_ProxySupplier;
 class TAO_Notify_FilterFactory;
 class TAO_Notify_Object;
 
@@ -66,6 +69,13 @@ public:
                        , CosNotifyChannelAdmin::ChannelID_out id
                        ACE_ENV_ARG_DECL);
 
+
+  virtual TAO_Notify_EventChannel *
+  build_event_channel (TAO_Notify_EventChannelFactory* ecf
+                       , const CosNotifyChannelAdmin::ChannelID id
+                       ACE_ENV_ARG_DECL);
+
+
   /// Build ConsumerAdmin
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr
   build_consumer_admin (TAO_Notify_EventChannel* ec
@@ -73,13 +83,31 @@ public:
                         , CosNotifyChannelAdmin::AdminID_out id
                         ACE_ENV_ARG_DECL);
 
+  /// Build ConsumerAdmin during topology restore
+  /// TODO: this returns a reference to the actual type
+  /// to accomodate loadable builder/factory there should
+  /// be an appropriate base class for it to return.
+  virtual TAO_Notify_ConsumerAdmin *
+  build_consumer_admin (TAO_Notify_EventChannel* ec
+                        , const CosNotifyChannelAdmin::AdminID id //CORBA::Long id          // note: an in parameter!
+                        ACE_ENV_ARG_DECL);
+
   /// Build SupplierAdmin
   virtual CosNotifyChannelAdmin::SupplierAdmin_ptr
-  build_supplier_admin (TAO_Notify_EventChannel* ec
+  build_supplier_admin (TAO_Notify_EventChannel * ec
                         , CosNotifyChannelAdmin::InterFilterGroupOperator op
                         , CosNotifyChannelAdmin::AdminID_out id
                         ACE_ENV_ARG_DECL);
 
+  /// Build ConsumerAdmin during topology restore
+  /// TODO: this returns a reference to the actual type
+  /// to accomodate loadable builder/factory there should
+  /// be an appropriate base class for it to return.
+  virtual TAO_Notify_SupplierAdmin *
+  build_supplier_admin (TAO_Notify_EventChannel * ec
+                        , const CosNotifyChannelAdmin::AdminID id //CORBA::Long id          // note: an in parameter!
+                        ACE_ENV_ARG_DECL);
+
   /// Build ProxyConsumer
   virtual CosNotifyChannelAdmin::ProxyConsumer_ptr
   build_proxy (TAO_Notify_SupplierAdmin* sa
@@ -88,6 +116,13 @@ public:
                , const CosNotification::QoSProperties & initial_qos
                ACE_ENV_ARG_DECL);
 
+  /// Reload ProxyConsumer
+  virtual TAO_Notify_ProxyConsumer *
+  build_proxy (TAO_Notify_SupplierAdmin* sa
+               , CosNotifyChannelAdmin::ClientType ctype
+               , const CosNotifyChannelAdmin::ProxyID proxy_id
+               ACE_ENV_ARG_DECL);
+
   /// Build ProxySupplier.
   virtual CosNotifyChannelAdmin::ProxySupplier_ptr
   build_proxy (TAO_Notify_ConsumerAdmin* ca
@@ -96,6 +131,13 @@ public:
                , const CosNotification::QoSProperties & initial_qos
                ACE_ENV_ARG_DECL);
 
+  /// Reload ProxySupplier.
+  virtual TAO_Notify_ProxySupplier *
+  build_proxy (TAO_Notify_ConsumerAdmin* ca
+               , CosNotifyChannelAdmin::ClientType ctype
+               , const CosNotifyChannelAdmin::ProxyID proxy_id
+               ACE_ENV_ARG_DECL);
+
   /// Build CosEC style ProxySupplier.
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
   build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL);
@@ -111,23 +153,19 @@ public:
 
   /// Apply Thread Pools.
   virtual void apply_thread_pool_concurrency (
-      TAO_Notify_Object& object, 
-      const NotifyExt::ThreadPoolParams& tp_params 
+      TAO_Notify_Object& object,
+      const NotifyExt::ThreadPoolParams& tp_params
       ACE_ENV_ARG_DECL
     );
 
   /// Apply Thread Pools with Lanes.
   virtual void apply_lane_concurrency (
-      TAO_Notify_Object& object, 
-      const NotifyExt::ThreadPoolLanesParams& tpl_params 
+      TAO_Notify_Object& object,
+      const NotifyExt::ThreadPoolLanesParams& tpl_params
       ACE_ENV_ARG_DECL
     );
 };
 
-#if defined (__ACE_INLINE__)
-#include "Builder.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.inl b/TAO/orbsvcs/orbsvcs/Notify/Builder.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 84506c169de..1b350eced06 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -6,21 +6,50 @@
 #include "Consumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_Notify_Consumer, "$Id$")
+ACE_RCSID (RT_Notify, TAO_Notify_Consumer, "$Id$")
 
+#include "Timer.h"
+#include "orbsvcs/Time_Utilities.h"
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "ace/Unbounded_Queue.h"
 #include "tao/debug.h"
+#include "Method_Request_Event.h"
+
+//#define DEBUG_LEVEL 10
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
+
+static const int DEFAULT_RETRY_TIMEOUT = 10;//120; // Note : This should be a config param or qos setting
 
 TAO_Notify_Consumer::TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy)
-  :proxy_ (proxy), event_collection_ (0), is_suspended_ (0)
+  : proxy_ (proxy)
+  , pending_events_ (0)
+  , is_suspended_ (0)
+  , pacing_ (proxy->qos_properties_.pacing_interval ())
+  , max_batch_size_ (CosNotification::MaximumBatchSize, 0)
+  , timer_id_ (-1)
+//  , buffering_strategy_ (0)
+  , timer_ (0)
 {
-  this->event_collection_ = new TAO_Notify_Event_Collection ();
+  ACE_NEW (
+    this->pending_events_ ,
+    TAO_Notify_Consumer::Request_Queue ()
+    );
+
+  this->timer_ = this->proxy ()->timer ();
 }
 
 TAO_Notify_Consumer::~TAO_Notify_Consumer ()
 {
-  delete this->event_collection_;
+  delete this->pending_events_;
+//  delete this->buffering_strategy_;
+  if (this->timer_ == 0)
+    {
+      this->cancel_timer ();
+      this->timer_->_decr_refcnt ();
+      this->timer_ = 0;
+    }
 }
 
 TAO_Notify_Proxy*
@@ -30,41 +59,511 @@ TAO_Notify_Consumer::proxy (void)
 }
 
 void
-TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Consumer::qos_changed (const TAO_Notify_QoSProperties& qos_properties)
 {
+  this->max_batch_size_ = qos_properties.maximum_batch_size ();
+
+/*
+//@@ todo: consider buffering strategy
+  if (this->max_batch_size_.is_valid ())
+    {// set the max batch size.
+      this->buffering_strategy_->batch_size (this->max_batch_size_.value ());
+    }
+*/
+
+  // Inform the buffering strategy of qos change.
+/*
+  this->buffering_strategy_->update_qos_properties (qos_properties);
+*/
+}
+
+void
+TAO_Notify_Consumer::resume (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->is_suspended_ = 0;
+
+  this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_Notify_Consumer::enqueue_request (
+  TAO_Notify_Method_Request_Event * request
+  ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_Event_var event_var;
+  request->event ()->queueable_copy (event_var ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  TAO_Notify_Method_Request_Event_Queueable * queue_entry;
+  ACE_NEW_THROW_EX (queue_entry,
+    TAO_Notify_Method_Request_Event_Queueable (*request, event_var),
+    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  if (DEBUG_LEVEL  > 3) ACE_DEBUG ( (LM_DEBUG,
+    ACE_TEXT ("Consumer %d: enqueue_request (%d) @%@.\n"),
+    static_cast<int> (this->proxy ()->id ()),
+    request->sequence (),
+    request
+    ));
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
+  this->pending_events_->enqueue_tail (queue_entry);
+}
+
+bool
+TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL)
+{
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock (), false);
+  if (! this->pending_events_->is_empty ())
+    {
+      if (DEBUG_LEVEL > 3)ACE_DEBUG ( (LM_DEBUG,
+        ACE_TEXT ("Consumer %d: enqueuing another event. %d\n"),
+        static_cast<int> (this->proxy ()->id ()),
+        request->sequence ()
+          ));
+      TAO_Notify_Event_var event_var;
+      request->event ()->queueable_copy (event_var ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (false);
+      TAO_Notify_Method_Request_Event_Queueable * queue_entry;
+      ACE_NEW_THROW_EX (queue_entry,
+        TAO_Notify_Method_Request_Event_Queueable (*request, event_var),
+        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (false);
+      this->pending_events_->enqueue_tail (queue_entry);
+      this->schedule_timer (false);
+      return true;
+    }
   if (this->is_suspended_ == 1)
-    return; // Do nothing if we're suspended.
+    {
+      if (DEBUG_LEVEL > 3) ACE_DEBUG ( (LM_DEBUG,
+        ACE_TEXT ("Suspended Consumer %d enqueing event. %d\n"),
+        static_cast<int> (this->proxy ()->id ()),
+        request->sequence ()
+        ));
+      TAO_Notify_Event_var event_var;
+      request->event ()->queueable_copy (event_var ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (false);
+      TAO_Notify_Method_Request_Event_Queueable * queue_entry;
+      ACE_NEW_THROW_EX (queue_entry,
+        TAO_Notify_Method_Request_Event_Queueable (*request, event_var),
+        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (false);
+      this->pending_events_->enqueue_tail (queue_entry);
+      this->schedule_timer (false);
+      return true;
+    }
+  return false;
+}
+
+void
+TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL)
+{
+  // Increment reference counts (safely) to prevent this object and its proxy
+  // from being deleted while the push is in progress.
+  TAO_Notify_Refcountable_Guard_T<TAO_Notify_Proxy> proxy_guard (this->proxy ());
+  TAO_Notify_Refcountable_Guard_T<TAO_Notify_Consumer> this_guard (this);
+  bool queued = enqueue_if_necessary (request ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  if (!queued)
+    {
+      DispatchStatus status = this->dispatch_request (request);
+      switch (status)
+      {
+        case DISPATCH_SUCCESS:
+        {
+          request->complete ();
+          break;
+        }
+        case DISPATCH_RETRY:
+        {
+          if (DEBUG_LEVEL > 1) ACE_DEBUG ( (LM_DEBUG,
+            ACE_TEXT ("Consumer %d enqueing event %d due to failed dispatch.\n"),
+            static_cast<int> (this->proxy ()->id ()),
+            request->sequence ()));
+          this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+          this->schedule_timer (true);
+          break;
+        }
+        case DISPATCH_DISCARD:
+        {
+          if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
+            ACE_TEXT ("(%P|%t) Consumer %d: Error during direct dispatch. Discarding event:%d.\n"),
+            static_cast<int> (this->proxy ()->id ()),
+            request->sequence ()
+            ));
+          request->complete ();
+          break;
+        }
+        case DISPATCH_FAIL:
+        {
+          if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
+            ACE_TEXT ("(%P|%t) Consumer %d: Failed during direct dispatch :%d. Discarding event.\n"),
+            static_cast<int> (this->proxy ()->id ()),
+            request->sequence ()
+            ));
+          request->complete ();
+          ACE_DECLARE_NEW_ENV;
+          ACE_TRY
+          {
+            this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+            ACE_TRY_CHECK;
+          }
+          ACE_CATCHANY
+          {
+            // todo is there something meaningful we can do here?
+            ;
+          }
+          ACE_ENDTRY;
+          break;
+        }
+      }
+    }
+}
+
+TAO_Notify_Consumer::DispatchStatus
+TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request)
+{
+  DispatchStatus result = DISPATCH_SUCCESS;
+  ACE_DECLARE_NEW_ENV;
+  ACE_TRY
+  {
+    request->event ()->push (this ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    if (DEBUG_LEVEL  > 8) ACE_DEBUG ( (LM_DEBUG,
+      ACE_TEXT ("Consumer %d dispatched single event %d.\n"),
+      static_cast<int> (this->proxy ()->id ()),
+      request->sequence ()
+      ));
+  }
+  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  {
+    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
+        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) OBJECT_NOT_EXIST %s\n"),
+        static_cast<int> (this->proxy ()->id ()),
+        ex._info ().c_str ()
+        ));
+    result = DISPATCH_FAIL;
+  }
+  ACE_CATCH (CORBA::TRANSIENT, ex)
+  {
+    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
+        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) Transient (minor=%d) %s\n"),
+        static_cast<int> (this->proxy ()->id ()),
+        ex.minor (),
+        ex._info ().c_str ()
+        ));
+    const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80u;
+    switch (ex.minor () & 0xfffff000u)
+      {
+      case CORBA::OMGVMCID:
+        switch (ex.minor () & 0x00000fffu)
+        {
+        case 2: // No usable profile
+        case 3: // Request cancelled
+        case 4: // POA destroyed
+          result = DISPATCH_FAIL;
+          break;
+        default:
+          result = DISPATCH_DISCARD;
+        }
+        break;
+
+      case TAO_DEFAULT_MINOR_CODE:
+      default:
+        switch (ex.minor () & BITS_5_THRU_12_MASK)
+          {
+          case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
+            result = DISPATCH_FAIL;
+            break;
+          case TAO_POA_DISCARDING:
+          case TAO_POA_HOLDING:
+          default:
+            result = DISPATCH_RETRY;
+          } break;
+            }
+
+  }
+  ACE_CATCH (CORBA::SystemException, ex)
+  {
+    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
+        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) SystemException %s\n"),
+        static_cast<int> (this->proxy ()->id ()),
+        ex._info ().c_str ()
+        ));
+    result = DISPATCH_DISCARD;
+  }
+  ACE_CATCHANY
+  {
+    ACE_ERROR ( (LM_ERROR,
+      ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) Caught unexpected exception pushing event to consumer.\n"),
+      static_cast<int> (this->proxy ()->id ())
+      ));
+    result = DISPATCH_DISCARD;
+  }
+  ACE_ENDTRY;
+
+  // for persistent events that haven't timed out
+  // convert "FAIL" & "DISCARD" to "RETRY"
+  // for transient events, convert RETRY to DISCARD (hey, best_effort.)
+  if (result == DISPATCH_FAIL || result == DISPATCH_DISCARD)
+  {
+    if (request->should_retry ())
+    {
+      result = DISPATCH_RETRY;
+    }
+  }
+  else if (result == DISPATCH_RETRY)
+  {
+    if (! request->should_retry ())
+    {
+      result = DISPATCH_DISCARD;
+    }
+  }
 
-  TAO_Notify_Event_Collection event_collection_copy;
+  return result;
+}
 
+TAO_Notify_Consumer::DispatchStatus
+TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
+{
+  ACE_DECLARE_NEW_ENV;
+  ACE_TRY
   {
-    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
-    event_collection_copy = *this->event_collection_; // Payload is never copied, this is a collection of _vars.
-    this->event_collection_->reset ();
+    this->push (batch ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
   }
+  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
+  {
+    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
+        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::dispatch_batch OBJECT_NOT_EXIST %s\n"),
+        static_cast<int> (this->proxy ()->id ()),
+        not_exist._info ().c_str ()
+        ));
+    return DISPATCH_FAIL;
+  }
+  ACE_CATCH (CORBA::SystemException, ex)
+  {
+    if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_ERROR,
+        ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::dispatch_batch SystemException %s\n"),
+        static_cast<int> (this->proxy ()->id ()),
+        ex._info ().c_str ()
+        ));
+    // @@todo what to return here?
+    return DISPATCH_RETRY;
+  }
+  ACE_CATCHANY
+  {
+    ACE_ERROR ( (LM_ERROR,
+      ACE_TEXT ("(%P|%t) Consumer %d: Caught unexpected exception pushing EventBatch to consumer.\n"),
+      static_cast<int> (this->proxy ()->id ())
+      ));
+    return DISPATCH_FAIL;
+  }
+  ACE_ENDTRY;
+  return DISPATCH_SUCCESS;
+}
 
-  TAO_Notify_ProxySupplier* proxy_supplier = this->proxy_supplier ();
+void
+TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+{
+  if (DEBUG_LEVEL  > 5) ACE_DEBUG ( (LM_DEBUG,
+    ACE_TEXT ("Consumer %d dispatching pending events.  Queue size: %d\n"),
+    static_cast<int> (this->proxy ()->id ()),
+    this->pending_events_->size ()
+    ));
 
-  TAO_Notify_Event_var event;
+  // lock ourselves in memory for the duration
+  TAO_Notify_Refcountable_Guard_T<TAO_Notify_Consumer> self_grd (this);
 
-  while (!event_collection_copy.is_empty ())
+  // dispatch events until: 1) the queue is empty; 2) the proxy shuts down, or 3) the dispatch fails
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
+  bool ok = true;
+  while (ok && !this->proxy_supplier ()->has_shutdown () && !this->pending_events_->is_empty ())
+  {
+    if (! dispatch_from_queue (*this->pending_events_, ace_mon))
     {
-      if (event_collection_copy.dequeue_head (event) == 0)
+      this->schedule_timer (true);
+      ok = false;
+    }
+  }
+}
+
+
+// virtual: this is the default, overridden for SequencePushConsumer
+bool
+TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon)
+{
+  bool result = true;
+  TAO_Notify_Method_Request_Event_Queueable * request;
+  if (requests.dequeue_head (request) == 0)
+  {
+    ace_mon.release ();
+    DispatchStatus status = this->dispatch_request (request);
+    switch (status)
+    {
+      case DISPATCH_SUCCESS:
+      {
+        request->complete ();
+        request->release ();
+        result = true;
+        ace_mon.acquire ();
+        break;
+      }
+      case DISPATCH_RETRY:
+      {
+        if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
+          ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"),
+          static_cast<int> (this->proxy ()->id ()),
+          request->sequence ()
+          ));
+        ace_mon.acquire ();
+        requests.enqueue_head (request); // put the failed event back where it was
+        result = false;
+        break;
+      }
+      case DISPATCH_DISCARD:
+      {
+        if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
+          ACE_TEXT ("(%P|%t) Consumer %d: Error during dispatch. Discarding event:%d.\n"),
+          static_cast<int> (this->proxy ()->id ()),
+          request->sequence ()
+          ));
+        request->complete ();
+        ace_mon.acquire ();
+        result = true;
+        break;
+      }
+      case DISPATCH_FAIL:
+      {
+        if (DEBUG_LEVEL  > 0) ACE_DEBUG ( (LM_DEBUG,
+          ACE_TEXT ("(%P|%t) Consumer %d: Failed. Discarding event %d.\n"),
+          static_cast<int> (this->proxy ()->id ()),
+          request->sequence ()
+          ));
+        request->complete ();
+        ace_mon.acquire ();
+        while (requests.dequeue_head (request) == 0)
+        {
+          ace_mon.release ();
+          request->complete ();
+          ace_mon.acquire ();
+        }
+        ace_mon.release ();
+        ACE_DECLARE_NEW_ENV;
+        ACE_TRY
+        {
+          this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+        ACE_CATCHANY
         {
-          proxy_supplier->push_no_filtering (event ACE_ENV_ARG_PARAMETER);
+          // todo is there something reasonable to do here?
         }
+        ACE_ENDTRY;
+        ace_mon.acquire ();
+        result = true;
+        break;
+      }
     }
+  }
+  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.
 void
-TAO_Notify_Consumer::resume (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Consumer::schedule_timer (bool is_error)
 {
-  this->is_suspended_ = 0;
+  if (this->timer_id_ != -1)
+  {
+    return; // We only want a single timeout scheduled.
+  }
+  // don't schedule timer if there's nothing that can be done
+  if (this->is_suspended ())
+  {
+    return;
+  }
 
-  this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_ASSERT (this->timer_ != 0);
+
+  // If we're scheduling the timer due to an error then we want to
+  // use the retry timeout, otherwise we'll assume that the pacing
+  // interval is sufficient for now.
+  ACE_Time_Value tv (DEFAULT_RETRY_TIMEOUT);
+
+  if (! is_error)
+  {
+    if (this->pacing_.is_valid ())
+    {
+      tv = ORBSVCS_Time::to_Time_Value (this->pacing_.value ());
+    }
+  }
+
+  if (DEBUG_LEVEL  > 5) ACE_DEBUG ( (LM_DEBUG,
+    ACE_TEXT ("Consumer %d: scheduling pacing/retry for %dms.\n"),
+      static_cast<int> (this->proxy ()->id ()),
+      tv.msec ()));
+
+  this->timer_id_ = this->timer_->schedule_timer (
+    this,
+    tv,
+    ACE_Time_Value::zero);
+  if (this->timer_id_ == -1)
+  {
+    ACE_ERROR ( (LM_ERROR,
+      ACE_TEXT ("TAO_Notify_Consumer %d::schedule_timer () Error scheduling timer.\n"),
+      static_cast<int> (this->proxy ()->id ())
+      ));
+  }
 }
 
 void
+TAO_Notify_Consumer::cancel_timer (void)
+{
+  if (this->timer_ != 0 && this->timer_id_ != -1)
+  {
+    if (DEBUG_LEVEL  > 5) ACE_DEBUG ( (LM_DEBUG,
+      ACE_TEXT ("Consumer %d canceling dispatch timer.\n"),
+      static_cast<int> (this->proxy ()->id ())
+      ));
+
+    this->timer_->cancel_timer (timer_id_);
+  }
+  this->timer_id_ = -1;
+}
+
+int
+TAO_Notify_Consumer::handle_timeout (const ACE_Time_Value&, const void*)
+{
+  TAO_Notify_Refcountable_Guard_T<TAO_Notify_Consumer> grd (this);
+  this->timer_id_ = -1;  // This must come first, because dispatch_pending may try to resched
+  ACE_DECLARE_NEW_ENV;
+  ACE_TRY
+    {
+      this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHALL
+    {
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+void
+TAO_Notify_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+{
+  if (this->timer_ == 0)
+    {
+      this->cancel_timer ();
+      this->timer_->_decr_refcnt ();
+      this->timer_ = 0;
+    }
+}
+
+
+void
 TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
                                      ACE_ENV_ARG_DECL)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index bac8a0cbded..1dea726c618 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_Notify_CONSUMER_H
-#define TAO_Notify_CONSUMER_H
+#ifndef TAO_NOTIFY_CONSUMER_H
+#define TAO_NOTIFY_CONSUMER_H
 
 #include /**/ "ace/pre.h"
 
@@ -25,18 +25,33 @@
 
 #include "Peer.h"
 #include "Event.h"
+#include "ace/Event_Handler.h"
 
 class TAO_Notify_ProxySupplier;
 class TAO_Notify_Proxy;
-
+class TAO_Notify_Method_Request_Event_Queueable;
+class TAO_Notify_Method_Request_Event;
 /**
  * @class TAO_Notify_Consumer
  *
  * @brief Astract Base class for wrapping consumer objects that connect to the EventChannel
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Consumer : public TAO_Notify_Peer
+class TAO_Notify_Serv_Export TAO_Notify_Consumer
+  : public TAO_Notify_Peer
+  , public ACE_Event_Handler    // to support timer
 {
+
+public:
+  /// Status returned from dispatch attempts
+  enum DispatchStatus {
+    DISPATCH_SUCCESS,
+    DISPATCH_RETRY,   // retry this message
+    DISPATCH_DISCARD, // discard this message
+    DISPATCH_FAIL};   // discard all messages and disconnect consumer
+
+  typedef ACE_Unbounded_Queue<TAO_Notify_Method_Request_Event_Queueable *> Request_Queue;
+
 public:
   /// Constuctor
   TAO_Notify_Consumer (TAO_Notify_ProxySupplier* proxy);
@@ -50,11 +65,8 @@ public:
   /// Access Base Proxy.
   virtual TAO_Notify_Proxy* proxy (void);
 
-  /// Push <event> to this consumer.
-  void push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
-
-  /// Push <event> to this consumer.
-  void push (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
+  /// Dispatch Event to consumer
+  void deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL) = 0;
@@ -62,6 +74,12 @@ public:
   /// Push <event> to this consumer.
   virtual void push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL) = 0;
 
+  /// Push a batch of events to this consumer.
+  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL) = 0;
+
+  /// Dispatch the batch of events to the attached consumer
+  DispatchStatus dispatch_batch (const CosNotification::EventBatch& batch);
+
   /// Dispatch the pending events
   void dispatch_pending (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -74,32 +92,92 @@ public:
   /// Resume Connection
   void resume (ACE_ENV_SINGLE_ARG_DECL);
 
+  /// Shutdown the consumer
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// on reconnect we need to move events from the old consumer
+  /// to the new one
+  virtual void reconnect_from_consumer (
+    TAO_Notify_Consumer* old_consumer
+    ACE_ENV_ARG_DECL) = 0;
+
+  /// Override, Peer::qos_changed
+  virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
+
 protected:
+  DispatchStatus dispatch_request (TAO_Notify_Method_Request_Event * request);
+
+  /**
+   * \brief Attempt to dispatch event from a queue.
+   *
+   * Called by dispatch_pending.  Deliver one or more events to the Consumer.
+   * If delivery fails, events are left in the queue (or discarded depending
+   * on QoS parameters.)
+   * Undelivered, undiscarded requests are left at the front of the queue.
+   * Overridden in sequence consumer to dispatch as an EventBatch.
+   * \return false if delivery failed and the request(s) cannot be discarded.
+   */
+  virtual bool dispatch_from_queue (
+    Request_Queue & requests,
+    ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon);
+
+  void enqueue_request(TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL);
+
+  /// Add request to a queue if necessary.
+  /// Overridden by sequence consumer to "always" put incoming events into the queue.
+  /// @returns true the request has been enqueued; false the request should be handled now.
+  virtual bool enqueue_if_necessary(
+    TAO_Notify_Method_Request_Event * request
+    ACE_ENV_ARG_DECL);
+
   // Dispatch updates
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
                                    const CosNotification::EventTypeSeq& removed
                                    ACE_ENV_ARG_DECL);
 
-  /// Push Implementation.
-  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL) = 0;
-
-  /// Push Implementation.
-  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL) = 0;
-
   /// Get the shared Proxy Lock
   TAO_SYNCH_MUTEX* proxy_lock (void);
 
+protected:
+  virtual int handle_timeout (const ACE_Time_Value& current_time,
+                              const void* act = 0);
+
+
+  /// Schedule timer
+  void schedule_timer (bool is_error = false);
+
+  /// Cancel timer
+  void cancel_timer (void);
+
+  ///= Protected Data Members
+protected:
   /// The Proxy that we associate with.
   TAO_Notify_ProxySupplier* proxy_;
 
   /// Events pending to be delivered.
-  TAO_Notify_Event_Collection* event_collection_;
+  Request_Queue * pending_events_;
 
   /// Suspended Flag.
   CORBA::Boolean is_suspended_;
 
   /// Interface that accepts offer_changes
   CosNotifyComm::NotifyPublish_var publish_;
+
+  /// The Pacing Interval
+  const TAO_Notify_Property_Time & pacing_;
+
+  /// Max. batch size.
+  TAO_Notify_Property_Long max_batch_size_;
+
+  /// Timer Id.
+  long timer_id_;
+
+// todo find some way to use this rather than Request_Queue
+//  /// The Buffering Strategy
+//  TAO_Notify_Batch_Buffering_Strategy* buffering_strategy_;
+//
+  /// The Timer Manager that we use.
+  TAO_Notify_Timer* timer_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -108,4 +186,4 @@ protected:
 
 #include /**/ "ace/post.h"
 
-#endif /* TAO_Notify_CONSUMER_H */
+#endif /* TAO_NOTIFY_CONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
index 77a5f12c554..5bbdbc22dff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "ProxySupplier.h"
+//#include "Method_Request.h"
+#include "Method_Request_Dispatch.h"
 
 ACE_INLINE TAO_SYNCH_MUTEX*
 TAO_Notify_Consumer::proxy_lock (void)
@@ -25,72 +27,3 @@ TAO_Notify_Consumer::suspend (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->is_suspended_ = 1;
 }
-
-ACE_INLINE void
-TAO_Notify_Consumer::push (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
-{
-  if (this->is_suspended_ == 1) // If we're suspended, queue for later delivery.
-    {
-      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
-
-      this->event_collection_->enqueue_head (event);
-
-      return;
-    }
-
-  ACE_TRY
-    {
-      this->push_i (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
-    {
-      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-}
-
-ACE_INLINE void
-TAO_Notify_Consumer::push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
-{
-  if (this->is_suspended_ == 1) // If we're suspended, queue for later delivery.
-    {
-      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
-
-      TAO_Notify_Event* event_copy = event->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      TAO_Notify_Event_Copy_var event_var (event_copy);
-
-      this->event_collection_->enqueue_head (event_var);
-
-      return;
-    }
-
-  ACE_TRY
-    {
-      this->push_i (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
-    {
-      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 5552b0df58b..3c51bcf6f56 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -2,12 +2,8 @@
 
 #include "ConsumerAdmin.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ConsumerAdmin.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (RT_Notify, 
-           TAO_Notify_ConsumerAdmin, 
+ACE_RCSID (RT_Notify,
+           TAO_Notify_ConsumerAdmin,
            "$Id$")
 
 #include "ace/Auto_Ptr.h"
@@ -20,6 +16,13 @@ ACE_RCSID (RT_Notify,
 #include "Builder.h"
 #include "Find_Worker_T.h"
 #include "Seq_Worker_T.h"
+#include "ProxySupplier.h"
+
+#include "tao/debug.h"
+//#define DEBUG_LEVEL 9
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
 
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxySupplier
@@ -30,9 +33,18 @@ TAO_Notify_ProxySupplier_Find_Worker;
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker;
 
 TAO_Notify_ConsumerAdmin::TAO_Notify_ConsumerAdmin (void)
+  : TAO_Notify_Admin ()
+{
+}
+
+const char *
+TAO_Notify_ConsumerAdmin::get_admin_type_name () const
 {
+  return "consumer_admin";
 }
 
+
+
 TAO_Notify_ConsumerAdmin::~TAO_Notify_ConsumerAdmin ()
 {
 }
@@ -83,6 +95,76 @@ TAO_Notify_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 }
 
+
+TAO_Notify::Topology_Object*
+TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
+  CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+{
+  TAO_Notify::Topology_Object* result = this;
+  if (type == "proxy_push_supplier")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
+      , static_cast<int> (id)
+      ));
+    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+  else if (type == "structured_proxy_push_supplier")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
+      , static_cast<int> (id)
+      ));
+    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+  else if (type == "sequence_proxy_push_supplier")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
+      , static_cast<int> (id)
+      ));
+    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+#if 0
+  else if (type == "ec_proxy_push_supplier")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
+      , static_cast<int> (id)
+      ));
+    result = this->load_proxy(id, attrs ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+#endif
+  else
+  {
+    result = TAO_Notify_Admin::load_child (type, id, attrs ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+  return result;
+}
+
+TAO_Notify::Topology_Object*
+TAO_Notify_ConsumerAdmin::load_proxy (
+  CORBA::Long id,
+  CosNotifyChannelAdmin::ClientType ctype,
+  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
+  TAO_Notify_ProxySupplier * proxy =
+    bld->build_proxy (this
+               , ctype
+               , id
+               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN(0);
+  ACE_ASSERT(proxy != 0);
+  proxy->load_attrs (attrs);
+  return proxy;
+}
+
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
                                                          CosNotifyChannelAdmin::ProxyID_out proxy_id
@@ -95,11 +177,16 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdm
 {
   CosNotification::QoSProperties initial_qos;
 
-  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
+  CosNotifyChannelAdmin::ProxySupplier_var proxy =
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
-                                                                                                                                                                , initial_qos
+                                                                , initial_qos
                                                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  return proxy._retn ();
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
@@ -114,11 +201,16 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC
                      , CosNotification::UnsupportedQoS
                      ))
 {
-  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
+  CosNotifyChannelAdmin::ProxySupplier_var proxy =
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
                                                                 , initial_qos
                                                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  return proxy._retn ();
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
@@ -127,7 +219,12 @@ TAO_Notify_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
+  CosEventChannelAdmin::ProxyPushSupplier_var proxy =
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  return proxy._retn ();
 }
 
 CosNotifyChannelAdmin::AdminID
@@ -217,12 +314,13 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS
                         CORBA::INTERNAL ());
     ACE_CHECK;
 
-    this->subscribed_types_.init (seq_added, seq_removed);
+    this->subscribed_types_.add_and_remove (seq_added, seq_removed);
 
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
     this->proxy_container_->collection()->for_each (&worker ACE_ENV_ARG_PARAMETER);
   }
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterID
@@ -231,7 +329,12 @@ TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
+  CosNotifyFilter::FilterID fid =
+    this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (fid);
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (fid);
+  return fid;
 }
 
 void
@@ -356,6 +459,24 @@ TAO_Notify_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosEventChannelAdmin::ProxyPullSupplier::_nil ());
 }
 
+TAO_Notify_ProxySupplier *
+TAO_Notify_ConsumerAdmin::find_proxy_supplier (
+    TAO_Notify::IdVec & id_path,
+    size_t position
+    ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_ProxySupplier * result = 0;
+  size_t path_size = id_path.size ();
+  if (position < path_size)
+  {
+    TAO_Notify_ProxySupplier_Find_Worker find_worker;
+    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], *this->proxy_container_ ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+    result = dynamic_cast <TAO_Notify_ProxySupplier *> (proxy);
+  }
+  return result;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 99964a7cd11..590ca84b5f2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -23,6 +23,7 @@
 #include "orbsvcs/NotifyExtS.h"
 
 #include "Admin.h"
+class TAO_Notify_ProxySupplier;
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -57,7 +58,25 @@ public:
   /// Release this object.
   virtual void release (void);
 
+  virtual const char * get_admin_type_name () const;
+
+  virtual TAO_Notify::Topology_Object* load_child (
+    const ACE_CString &type,
+    CORBA::Long id,
+    const TAO_Notify::NVPList& attrs
+    ACE_ENV_ARG_DECL);
+
+  TAO_Notify_ProxySupplier * find_proxy_supplier (
+      TAO_Notify::IdVec & id_path,
+      size_t position
+      ACE_ENV_ARG_DECL);
+
 protected:
+  TAO_Notify::Topology_Object *load_proxy (
+    CORBA::Long id,
+    CosNotifyChannelAdmin::ClientType ctype,
+    const TAO_Notify::NVPList& attrs
+    ACE_ENV_ARG_DECL);
 
   /// = NotifyExt::ConsumerAdmin methods
   virtual CosNotifyChannelAdmin::ProxySupplier_ptr
@@ -224,10 +243,6 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "ConsumerAdmin.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_CONSUMERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 4fcfbe8081e..da6c7459da9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -104,6 +104,11 @@ TAO_CosNotify_Service::init (int argc, char *argv[])
           task_per_proxy = 1;
           arg_shifter.consume_arg ();
         }
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-AllowReconnect")) == 0)
+      {
+        arg_shifter.consume_arg ();
+        TAO_Notify_PROPERTIES::instance()->allow_reconnect (true);
+      }
     }
 
   // Init the EC QoS
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index 680d8d2432f..d077b3b3c02 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -79,9 +79,5 @@ ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_CosNotify_Service)
 
 ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_EMO_Factory_OLD)
 
-#if defined (__ACE_INLINE__)
-#include "CosNotify_Service.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_COSNOTIFY_SERVICE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.inl b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index 7f50ca0368e..dd8202f59c4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -2,12 +2,8 @@
 
 #include "Default_Factory.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Default_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Notify, 
-           TAO_Notify_Default_Factory, 
+ACE_RCSID (Notify,
+           TAO_Notify_Default_Factory,
            "$Id$")
 
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
@@ -231,25 +227,25 @@ template class ACE_Unbounded_Set<int>;
 template class ACE_Unbounded_Set_Const_Iterator<int>;
 template class ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *>;
 
-template class TAO_ESF_Copy_On_Write<TAO_Notify_Proxy, TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_Notify_Peer, TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_Notify_Consumer, TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_Notify_Supplier, TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_Notify_EventChannel, TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_Notify_ProxyConsumer, TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_Notify_ProxySupplier, TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_Notify_ConsumerAdmin, TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write<TAO_Notify_SupplierAdmin, TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_Proxy, TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_Peer, TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_Consumer, TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_Supplier, TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_EventChannel, TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_ProxyConsumer, TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_ProxySupplier, TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_ConsumerAdmin, TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write<TAO_Notify_SupplierAdmin, TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>;
 
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer*>,TAO_SYNCH_MUTEX>;
-template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>,ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>,ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>,ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>,ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>,ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>,ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>,ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>,ACE_Unbounded_Set_Iterator<TAO_Notify_Peer*>,TAO_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>,ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy*>,TAO_SYNCH_MUTEX>;
 
 
 
@@ -263,48 +259,48 @@ template class TAO_ESF_Proxy_List<TAO_Notify_EventChannel>;
 template class TAO_ESF_Proxy_List<TAO_Notify_Peer>;
 template class TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>;
 
-template class ACE_Unbounded_Set_Ex<TAO_Notify_Peer *>;
-template class ACE_Unbounded_Set_Ex<TAO_Notify_Supplier *>;
-template class ACE_Unbounded_Set_Ex<TAO_Notify_Consumer *>;
-template class ACE_Unbounded_Set_Ex<TAO_Notify_ProxyConsumer *>;
-template class ACE_Unbounded_Set_Ex<TAO_Notify_ProxySupplier *>;
-template class ACE_Unbounded_Set_Ex<TAO_Notify_ConsumerAdmin *>;
-template class ACE_Unbounded_Set_Ex<TAO_Notify_SupplierAdmin *>;
-template class ACE_Unbounded_Set_Ex<TAO_Notify_EventChannel *>;
-template class ACE_Unbounded_Set_Ex<TAO_Notify_Proxy *>;
+template class ACE_Unbounded_Set<TAO_Notify_Peer *>;
+template class ACE_Unbounded_Set<TAO_Notify_Supplier *>;
+template class ACE_Unbounded_Set<TAO_Notify_Consumer *>;
+template class ACE_Unbounded_Set<TAO_Notify_ProxyConsumer *>;
+template class ACE_Unbounded_Set<TAO_Notify_ProxySupplier *>;
+template class ACE_Unbounded_Set<TAO_Notify_ConsumerAdmin *>;
+template class ACE_Unbounded_Set<TAO_Notify_SupplierAdmin *>;
+template class ACE_Unbounded_Set<TAO_Notify_EventChannel *>;
+template class ACE_Unbounded_Set<TAO_Notify_Proxy *>;
 //template class ACE_Unbounded_Set<int>;
 
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>;
-template class ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_Peer *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *>;
 template class ACE_Unbounded_Set_Iterator<int>;
 
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>;
-
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>;
-template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>;
-
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *> >;
-template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *> >;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>;
+
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>;
+
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Peer *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier *> >;
+template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *> >;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -341,26 +337,26 @@ template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Pr
 //#pragma instantiate ACE_Unbounded_Set<TAO_Notify_ProxySupplier *>
 
 #pragma instantiate ACE_Unbounded_Set_Const_Iterator<int>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *>
 
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Proxy, TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Peer, TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Consumer, TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Supplier, TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_EventChannel, TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_ProxyConsumer, TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_ProxySupplier, TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_ConsumerAdmin, TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_SupplierAdmin, TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Proxy, TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Peer, TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Consumer, TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_Supplier, TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_EventChannel, TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_ProxyConsumer, TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_ProxySupplier, TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_ConsumerAdmin, TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_SupplierAdmin, TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>
 
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin*>,ACE_SYNCH>#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin*>,ACE_SYNCH>
-#pragma instantitae TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer*>,ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>,ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>,ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>,ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>,ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin*>,ACE_SYNCH>#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>,ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin*>,ACE_SYNCH>
+#pragma instantitae TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>,ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>,ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>,ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>,ACE_Unbounded_Set_Iterator<TAO_Notify_Peer*>,ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>,ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy*>,ACE_SYNCH>
 
 
 
@@ -374,45 +370,45 @@ template class TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Pr
 #pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_Peer>
 #pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>
 
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_Peer *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_Supplier *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_Consumer *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_ProxyConsumer *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_ProxySupplier *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_ConsumerAdmin *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_SupplierAdmin *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_EventChannel *>
-#pragma instantiate ACE_Unbounded_Set_Ex<TAO_Notify_Proxy *>
-
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_Peer *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_Supplier *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_Consumer *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_ProxyConsumer *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_ProxySupplier *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_ConsumerAdmin *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_SupplierAdmin *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_EventChannel *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Notify_Proxy *>
+
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_Peer *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<int>
 
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>
-#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>
-
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxyConsumer *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Supplier *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ConsumerAdmin *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_SupplierAdmin *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_EventChannel *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Consumer *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Peer *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_ProxySupplier *> >
-#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Ex_Iterator<TAO_Notify_Proxy *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Peer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier *>, ACE_SYNCH>
+#pragma instantiate TAO_ESF_Copy_On_Write_Write_Guard<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier *>, ACE_SYNCH>
+
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxyConsumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxyConsumer *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Supplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_Supplier *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ConsumerAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_ConsumerAdmin *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_SupplierAdmin>, ACE_Unbounded_Set_Iterator<TAO_Notify_SupplierAdmin *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_EventChannel>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventChannel *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Consumer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Consumer *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Peer>, ACE_Unbounded_Set_Iterator<TAO_Notify_Peer *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_ProxySupplier>, ACE_Unbounded_Set_Iterator<TAO_Notify_ProxySupplier *> >
+#pragma instantiate TAO_ESF_Copy_On_Write_Collection<TAO_ESF_Proxy_List<TAO_Notify_Proxy>, ACE_Unbounded_Set_Iterator<TAO_Notify_Proxy *> >
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
index e82cab43b1b..9c6ac6f56a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -93,9 +93,5 @@ public:
 
 ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Default_Factory)
 
-#if defined (__ACE_INLINE__)
-#include "Default_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_DEFAULT_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index b1d89eb552a..bab9645bb05 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -2,10 +2,6 @@
 
 #include "ETCL_Filter.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ETCL_Filter.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_ETCL_Filter, "$Id$")
 
 #include "ace/Auto_Ptr.h"
@@ -272,8 +268,7 @@ TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
                       CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong current_size = ACE_static_cast (CORBA::ULong,
-                                this->constraint_expr_list_.current_size ());
+  CORBA::ULong current_size = static_cast<CORBA::ULong> (this->constraint_expr_list_.current_size ());
 
   // Create the list that goes out.
   CosNotifyFilter::ConstraintInfoSeq *infoseq_ptr;
@@ -298,8 +293,7 @@ TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
           // copy of the string. It wouldn't unless we coax it to use
           // the correct assignment operator.
           infoseq[index].constraint_expression =
-            ACE_static_cast (const CosNotifyFilter::ConstraintExp,
-                             entry->int_id_->constr_expr);
+            static_cast<const CosNotifyFilter::ConstraintExp> (entry->int_id_->constr_expr);
 
           infoseq[index].constraint_id = entry->ext_id_;
         }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index af16effffeb..40b3c622b34 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -168,9 +168,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "ETCL_Filter.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ETCL_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.inl b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index 4c01423eb95..2f63881f0de 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -2,10 +2,6 @@
 
 #include "ETCL_FilterFactory.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ETCL_FilterFactory.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_ETCL_FilterFactory, "$Id$")
 
 #include "ETCL_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 5c67cbb8f5a..4ddd43747e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -88,10 +88,6 @@ protected:
 
 ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory)
 
-#if defined (__ACE_INLINE__)
-#include "ETCL_FilterFactory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_ETCL_FILTERFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.inl b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
index b731ccf5f4d..c2da7349d99 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -6,16 +6,22 @@
 #include "Event.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify, 
-           TAO_Notify_Event, 
+ACE_RCSID (Notify,
+           TAO_Notify_Event,
            "$Id$")
 
 #include "tao/debug.h"
+#include "tao/CDR.h"
 #include "orbsvcs/CosNotificationC.h"
+// NOTE: unfortunately we must know about derived types to implement unmarshal
+#include "Any/AnyEvent.h"
+#include "Structured/StructuredEvent.h"
 
 TAO_Notify_Event::TAO_Notify_Event (void)
   :priority_ (CosNotification::Priority, CosNotification::DefaultPriority),
-   timeout_ (CosNotification::Timeout)
+   timeout_ (CosNotification::Timeout),
+   reliable_ (CosNotification::EventReliability, false),
+   event_on_heap_ (0)
 {
   //  if (TAO_debug_level > 0)
   //  ACE_DEBUG ((LM_DEBUG,"event:%x  created\n", this ));
@@ -26,6 +32,11 @@ TAO_Notify_Event::~TAO_Notify_Event ()
   // if (TAO_debug_level > 1)
   //  ACE_DEBUG ((LM_DEBUG,"event:%x  destroyed\n", this ));
 }
+void
+TAO_Notify_Event::release (void)
+{
+  delete this;
+}
 
 void
 TAO_Notify_Event::translate (const CORBA::Any& any, CosNotification::StructuredEvent& notification)
@@ -40,11 +51,37 @@ TAO_Notify_Event::translate (const CosNotification::StructuredEvent& notificatio
 {
   any <<= notification;   // is the typecode set by this operation or do we need to set it explicity.
 }
+/// Unmarshal an event from a CDR. (for persistence)
+//static
+TAO_Notify_Event *
+TAO_Notify_Event::unmarshal (TAO_InputCDR & cdr)
+{
+  TAO_Notify_Event * result = 0;
+  ACE_CDR::Octet code = 0;
+  if (cdr.read_octet (code))
+  {
+    switch (code)
+    {
+    case MARSHAL_ANY:
+      result = TAO_Notify_AnyEvent::unmarshal (cdr);
+      break;
+    case MARSHAL_STRUCTURED:
+      result = TAO_Notify_StructuredEvent::unmarshal (cdr);
+      break;
+    default:
+      ACE_ERROR ((LM_ERROR,
+        ACE_TEXT ("(%P|%t) TAO_Notify_Event::unmarshal: unknown event code %d\n"),
+        code));
+      break;
+    }
+  }
+  return result;
+}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Auto_Basic_Ptr<TAO_Notify_Event>;
-template class ACE_Refcounted_Auto_Ptr<const TAO_Notify_Event, TAO_SYNCH_MUTEX>;
+template class TAO_Notify_Refcountable_Guard_T<TAO_Notify_Event>;
 template class ACE_Unbounded_Queue<TAO_Notify_Event_var>;
 template class ACE_Node<TAO_Notify_Event_var>;
 template class ACE_Unbounded_Queue_Iterator<TAO_Notify_Event_var>;
@@ -52,7 +89,7 @@ template class ACE_Unbounded_Queue_Iterator<TAO_Notify_Event_var>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Notify_Event>
-#pragma instantiate ACE_Refcounted_Auto_Ptr<const TAO_Notify_Event, TAO_SYNCH_MUTEX>
+#pragma instantiate TAO_Notify_Refcountable_Guard_T<TAO_Notify_Event>;
 #pragma instantiate ACE_Unbounded_Queue<TAO_Notify_Event_var>
 #pragma instantiate ACE_Node<TAO_Notify_Event_var>
 #pragma instantiate ACE_Unbounded_Queue_Iterator<TAO_Notify_Event_var>
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index 66a8c40bff3..3bc2296490f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_Notify_EVENT_H
-#define TAO_Notify_EVENT_H
+#ifndef TAO_NOTIFY_EVENT_H
+#define TAO_NOTIFY_EVENT_H
 
 #include /**/ "ace/pre.h"
 
@@ -21,17 +21,56 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Copy_Disabled.h"
-#include "ace/Refcounted_Auto_Ptr.h"
+
+#include "Refcountable.h"
+#include "Refcountable_Guard_T.h"
 
 #include "orbsvcs/Event_ForwarderS.h"
 #include "orbsvcs/CosNotifyFilterC.h"
 #include "orbsvcs/CosNotificationC.h"
 
 #include "Property.h"
+#include "Property_Boolean.h"
 #include "Property_T.h"
 
 class TAO_Notify_Consumer;
 class TAO_Notify_EventType;
+class TAO_Notify_Event;
+
+typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_Event> TAO_Notify_Event_var_Base;
+
+/**
+ * @class TAO_Notify_Event_var
+ *
+ * @brief A Non-Copy version of the smart pointer that hides the constructors.
+ *
+ */
+class TAO_Notify_Event_var : public TAO_Notify_Event_var_Base
+{
+public:
+  /// Default Constructor
+  TAO_Notify_Event_var (void);
+
+protected:
+  /// Constructor
+  TAO_Notify_Event_var (const TAO_Notify_Event* event);
+};
+
+/**
+ * @class TAO_Notify_Event
+ *
+ * @brief A smart pointer that allows construction from a TAO_Notify_Event
+ *
+ */
+class TAO_Notify_Event_Copy_var : public TAO_Notify_Event_var
+{
+public:
+  /// Default Constructor
+  TAO_Notify_Event_Copy_var (void);
+
+  /// Constructor
+  TAO_Notify_Event_Copy_var (const TAO_Notify_Event* event);
+};
 
 /**
  * @class TAO_Notify_Event
@@ -39,17 +78,20 @@ class TAO_Notify_EventType;
  * @brief Base class abstraction for Events flowing through the EventChannel.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Event : private ACE_Copy_Disabled
+class TAO_Notify_Serv_Export TAO_Notify_Event
+    : public TAO_Notify_Refcountable
+    , private ACE_Copy_Disabled
 {
 public:
+  // Codes to distinguish marshaled events in persistent storage
+  enum {MARSHAL_ANY=1,MARSHAL_STRUCTURED=2};
   /// Constuctor
   TAO_Notify_Event (void);
 
   /// Destructor
   virtual ~TAO_Notify_Event ();
 
-  /// Copy the event.
-  virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+  virtual void release (void);
 
   /// Translate Any to Structured
   static void translate (const CORBA::Any& any, CosNotification::StructuredEvent& notification);
@@ -81,6 +123,15 @@ public:
   /// Push event to the Event_Forwarder interface
   virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
 
+  /// Return a pointer to a copy of this event on the heap
+  void queueable_copy (TAO_Notify_Event_var & ptr ACE_ENV_ARG_DECL) const;
+
+  /// marshal this event into a CDR buffer (for persistence)
+  virtual void marshal (TAO_OutputCDR & cdr) const = 0;
+
+  /// Unmarshal an event from a CDR. (for persistence)
+  static TAO_Notify_Event * unmarshal (TAO_InputCDR & cdr);
+
   ///= Accessors
   /// Priority
   const TAO_Notify_Property_Short& priority (void) const;
@@ -88,7 +139,14 @@ public:
   /// Timeout
   const TAO_Notify_Property_Time& timeout (void) const;
 
+  /// Reliable
+  const TAO_Notify_Property_Boolean& reliable(void) const;
+
 protected:
+
+  /// Return a pointer to a copy of this event on the heap
+  virtual TAO_Notify_Event * copy (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+
   /// = QoS properties
 
   /// Priority.
@@ -96,49 +154,17 @@ protected:
 
   /// Timeout.
   TAO_Notify_Property_Time timeout_;
-};
 
-typedef ACE_Refcounted_Auto_Ptr<const TAO_Notify_Event, TAO_SYNCH_MUTEX> TAO_Notify_Event_var_Base;
+  /// Reliability
+  TAO_Notify_Property_Boolean reliable_;
 
-/**
- * @class TAO_Notify_Event_var
- *
- * @brief A Non-Copy version of the ACE_Refcounted_Auto_Ptr that hides the constructors.
- *
- */
-class TAO_Notify_Event_var : public TAO_Notify_Event_var_Base
-{
-public:
-  /// Default Constructor
-  TAO_Notify_Event_var (void);
-
-protected:
-  /// Constructor
-  TAO_Notify_Event_var (TAO_Notify_Event* event);
-};
-
-/**
- * @class TAO_Notify_Event
- *
- * @brief A version of the ACE_Refcounted_Auto_Ptr that allows construction from a TAO_Notify_Event
- *
- */
-class TAO_Notify_Event_Copy_var : public TAO_Notify_Event_var
-{
-public:
-  /// Default Constructor
-  TAO_Notify_Event_Copy_var (void);
-
-  /// Constructor
-  TAO_Notify_Event_Copy_var (TAO_Notify_Event* event);
+  TAO_Notify_Event * event_on_heap_;
 };
 
-typedef ACE_Unbounded_Queue<TAO_Notify_Event_var> TAO_Notify_Event_Collection;
-
 #if defined (__ACE_INLINE__)
 #include "Event.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
 
-#endif /* TAO_Notify_EVENT_H */
+#endif /* TAO_NOTIFY_EVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
index 02006440911..b51106e8276 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
@@ -12,6 +12,12 @@ TAO_Notify_Event::timeout (void) const
   return this->timeout_;
 }
 
+ACE_INLINE const TAO_Notify_Property_Boolean&
+TAO_Notify_Event::reliable (void) const
+{
+  return this->reliable_;
+}
+
 /**********************************************************/
 
 ACE_INLINE
@@ -21,8 +27,8 @@ TAO_Notify_Event_var::TAO_Notify_Event_var (void)
 }
 
 ACE_INLINE
-TAO_Notify_Event_var::TAO_Notify_Event_var (TAO_Notify_Event* event)
-  : TAO_Notify_Event_var_Base (event)
+TAO_Notify_Event_var::TAO_Notify_Event_var (const TAO_Notify_Event* event)
+  : TAO_Notify_Event_var_Base (const_cast <TAO_Notify_Event *>(event))
 {
 }
 
@@ -35,7 +41,23 @@ TAO_Notify_Event_Copy_var::TAO_Notify_Event_Copy_var (void)
 }
 
 ACE_INLINE
-TAO_Notify_Event_Copy_var::TAO_Notify_Event_Copy_var (TAO_Notify_Event* event)
+TAO_Notify_Event_Copy_var::TAO_Notify_Event_Copy_var (const TAO_Notify_Event* event)
   : TAO_Notify_Event_var (event)
 {
 }
+
+ACE_INLINE
+void //const TAO_Notify_Event *
+TAO_Notify_Event::queueable_copy (TAO_Notify_Event_var & ptr ACE_ENV_ARG_DECL) const
+{
+  if (this->event_on_heap_ == 0)
+  {
+    TAO_Notify_Event * copied =
+      this->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
+    const_cast <TAO_Notify_Event *> (this)->event_on_heap_ = copied;
+    copied->event_on_heap_ = copied;
+  }
+  ptr = TAO_Notify_Event_Copy_var (this->event_on_heap_);
+}
+
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 3985ef9d899..7606224d57f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -2,10 +2,6 @@
 
 #include "EventChannel.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EventChannel.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "Container_T.h"
 #include "EventChannelFactory.h"
 #include "ConsumerAdmin.h"
@@ -16,6 +12,15 @@
 #include "Builder.h"
 #include "Find_Worker_T.h"
 #include "Seq_Worker_T.h"
+#include "Topology_Saver.h"
+#include "Save_Persist_Worker_T.h"
+#include "Reconnect_Worker_T.h"
+
+#include "tao/debug.h"
+//#define DEBUG_LEVEL 9
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
 
 ACE_RCSID(Notify, TAO_Notify_EventChannel, "$Id$")
 
@@ -54,7 +59,8 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
                            , const CosNotification::AdminProperties & initial_admin
                            ACE_ENV_ARG_DECL)
 {
-  this->TAO_Notify_Object::init (ecf);
+  // this-> on the following line confuses VC6
+  initialize (ecf ACE_ENV_ARG_PARAMETER);
 
   this->ecf_ = ecf;
 
@@ -109,16 +115,71 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
   this->set_admin (initial_admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CosNotifyChannelAdmin::AdminID id;
+  // Note originally default admins were allocated here, bt this caused problems
+  // attempting to save the topology changes before the Event Channel was completely
+  // constructed and linked to the ECF.
+  // Lazy evaluation also avoids creating unneded admins.
+}
+
+
+void
+TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent * parent
+                           ACE_ENV_ARG_DECL)
+{
+  // this-> on the following line confuses VC6
+  initialize (parent ACE_ENV_ARG_PARAMETER);
+
+  this->ecf_ = dynamic_cast <TAO_Notify_EventChannelFactory*>(parent);
+  ACE_ASSERT (this->ecf_ != 0);
+
+  this->ecf_->_incr_refcnt ();
+
+  // Init ca_container_
+  ACE_NEW_THROW_EX (this->ca_container_,
+                    TAO_Notify_ConsumerAdmin_Container (),
+                    CORBA::INTERNAL ());
+  ACE_CHECK;
+
+  this->ca_container_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 
-  // Set the default ConsumerAdmin.
-  this->default_consumer_admin_ = this->new_for_consumers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
+  // Init ca_container_
+  ACE_NEW_THROW_EX (this->sa_container_,
+                    TAO_Notify_SupplierAdmin_Container (),
+                    CORBA::INTERNAL ());
+  ACE_CHECK;
+
+  this->sa_container_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  TAO_Notify_AdminProperties* admin_properties = 0;
+
+  // Set the admin properties.
+  ACE_NEW_THROW_EX (admin_properties,
+                    TAO_Notify_AdminProperties (),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  this->admin_properties_ = admin_properties;
+
+  // create the event manager. @@ use factory
+  ACE_NEW_THROW_EX (this->event_manager_,
+                    TAO_Notify_Event_Manager (),
+                    CORBA::INTERNAL ());
+  ACE_CHECK;
+
+  this->event_manager_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  const CosNotification::QoSProperties &default_ec_qos =
+    TAO_Notify_PROPERTIES::instance ()->default_event_channel_qos_properties ();
+
+  this->set_qos (default_ec_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  // Set the default SupplierAdmin.
-  this->default_supplier_admin_ = this->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
 }
 
+
 void
 TAO_Notify_EventChannel::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
@@ -214,20 +275,63 @@ TAO_Notify_EventChannel::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
+  if (CORBA::is_nil (default_consumer_admin_.in ()))
+    {
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->default_admin_mutex_, CosNotifyChannelAdmin::ConsumerAdmin::_nil());
+      if (CORBA::is_nil (default_consumer_admin_.in ()))
+        {
+          CosNotifyChannelAdmin::AdminID id;
+          this->default_consumer_admin_ = this->new_for_consumers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil());
+          // Wish there was a better way to do this!
+          PortableServer::ServantBase * admin_servant =
+            this->poa_->reference_to_servant (
+              this->default_consumer_admin_.in ()
+              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil());
+          TAO_Notify_Admin * pAdmin = dynamic_cast <TAO_Notify_Admin *> (admin_servant);
+          ACE_ASSERT (pAdmin != 0); // if this assert triggers, we have mixed implementations?
+          if (pAdmin != 0)
+            {
+              pAdmin->set_default (true);
+            }
+        }
+    }
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (this->default_consumer_admin_.in ());
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
+  if (CORBA::is_nil (default_supplier_admin_.in ()))
+    {
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->default_admin_mutex_, CosNotifyChannelAdmin::SupplierAdmin::_nil());
+      if (CORBA::is_nil (default_supplier_admin_.in ()))
+        {
+          CosNotifyChannelAdmin::AdminID id;
+          this->default_supplier_admin_ = this->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil());
+          PortableServer::ServantBase * admin_servant =
+            this->poa_->poa()->reference_to_servant (
+              this->default_supplier_admin_.in ()
+              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+          TAO_Notify_Admin * pAdmin = dynamic_cast <TAO_Notify_Admin *> (admin_servant);
+          ACE_ASSERT (pAdmin != 0); // if this assert triggers, we have mixed implementations?
+          if (pAdmin != 0)
+            {
+              pAdmin->set_default (true);
+            }
+        }
+    }
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (this->default_supplier_admin_.in ());
 }
 
@@ -248,7 +352,12 @@ TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGr
                    ))
 
 {
-  return TAO_Notify_PROPERTIES::instance()->builder()->build_consumer_admin (this, op, id ACE_ENV_ARG_PARAMETER);
+  ::CosNotifyChannelAdmin::ConsumerAdmin_var ca =
+    TAO_Notify_PROPERTIES::instance()->builder()->build_consumer_admin (this, op, id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (ca._retn ());
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (ca._retn ());
+  return ca._retn ();
 }
 
 ::CosNotifyChannelAdmin::SupplierAdmin_ptr
@@ -260,7 +369,12 @@ TAO_Notify_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGr
                    CORBA::SystemException
                    ))
 {
-  return TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id ACE_ENV_ARG_PARAMETER);
+  ::CosNotifyChannelAdmin::SupplierAdmin_var sa =
+    TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (sa._retn ());
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (sa._retn ());
+  return sa._retn ();
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
@@ -337,21 +451,21 @@ TAO_Notify_EventChannel::get_admin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return CosEventChannelAdmin::ConsumerAdmin::_duplicate (this->default_consumer_admin_.in ());
+  return this->default_consumer_admin(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return CosEventChannelAdmin::SupplierAdmin::_duplicate (this->default_supplier_admin_.in ());
+  return this->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -367,6 +481,196 @@ TAO_Notify_EventChannel::validate_qos (const CosNotification::QoSProperties & /*
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
+void
+TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+{
+  bool changed = this->self_changed_;
+  this->self_changed_ = false;
+  this->children_changed_ = false;
+
+  if (is_persistent ())
+  {
+    TAO_Notify::NVPList attrs;
+    this->save_attrs(attrs);
+
+    bool want_all_children = saver.begin_object(
+      this->id(), "channel", attrs, changed ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+
+    TAO_Notify::Save_Persist_Worker<TAO_Notify_ConsumerAdmin> ca_wrk(saver, want_all_children);
+
+    ACE_ASSERT(this->ca_container_ != 0);
+    this->ca_container_->collection()->for_each(&ca_wrk ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+
+    TAO_Notify::Save_Persist_Worker<TAO_Notify_SupplierAdmin> sa_wrk(saver, want_all_children);
+    ACE_ASSERT(this->sa_container_ != 0);
+    this->sa_container_->collection()->for_each(&sa_wrk ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+
+    saver.end_object(this->id(), "channel" ACE_ENV_ARG_PARAMETER);
+  }
+}
+
+namespace {
+  template<class T>
+    void add_attr(TAO_Notify::NVPList& attrs, const T& prop) {
+      if (prop.is_valid())
+      {
+        attrs.push_back(TAO_Notify::NVP (prop));
+      }
+    }
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template void add_attr<TAO_Notify_Property_Boolean>(TAO_Notify::NVPList&,
+  const TAO_Notify_Property_Boolean&);
+template void add_attr<TAO_Notify_Property_T<int> >(TAO_Notify::NVPList&,
+  const TAO_Notify_Property_T<int>&);
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate void add_attr<TAO_Notify_Property_Boolean>(\
+  TAO_Notify::NVPList&, const TAO_Notify_Property_Boolean&)
+#pragma instantiate void add_attr<TAO_Notify_Property_T<int> >(\
+  TAO_Notify::NVPList&, const TAO_Notify_Property_T<int>&)
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+}
+
+void
+TAO_Notify_EventChannel::save_attrs(TAO_Notify::NVPList& attrs)
+{
+  TAO_Notify_Object::save_attrs(attrs);
+  add_attr(attrs, this->admin_properties_->max_global_queue_length());
+  add_attr(attrs, this->admin_properties_->max_consumers());
+  add_attr(attrs, this->admin_properties_->max_suppliers());
+  add_attr(attrs, this->admin_properties_->reject_new_events());
+}
+
+void
+TAO_Notify_EventChannel::load_attrs(const TAO_Notify::NVPList& attrs)
+{
+  TAO_Notify_Object::load_attrs(attrs);
+  attrs.load(this->admin_properties_->max_global_queue_length());
+  attrs.load(this->admin_properties_->max_consumers());
+  attrs.load(this->admin_properties_->max_suppliers());
+  attrs.load(this->admin_properties_->reject_new_events());
+  this->admin_properties_->init();
+}
+
+TAO_Notify::Topology_Object *
+TAO_Notify_EventChannel::load_child (const ACE_CString &type,
+                                                  CORBA::Long id,
+                                                  const TAO_Notify::NVPList& attrs
+                                                  ACE_ENV_ARG_DECL)
+{
+  TAO_Notify::Topology_Object* result = this;
+  if (type == "consumer_admin")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) EventChannel reload consumer_admin %d\n")
+      , static_cast<int> (id)
+      ));
+
+    // call special builder method to reload
+    TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
+    TAO_Notify_ConsumerAdmin * ca = bld->build_consumer_admin (
+      this,
+      id
+      ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN(0);
+    ca->load_attrs (attrs);
+    if (ca->is_default ())
+      {
+        CORBA::Object_var caob = this->poa_->servant_to_reference (ca ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN(0);
+        this->default_consumer_admin_ =
+          CosNotifyChannelAdmin::ConsumerAdmin::_narrow (
+          caob.in () ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN(0);
+      }
+    result = ca;
+  }
+  else if (type == "supplier_admin")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) EventChannel reload supplier_admin %d\n")
+      , static_cast<int> (id)
+      ));
+    TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
+
+    TAO_Notify_SupplierAdmin * sa = bld->build_supplier_admin (
+      this,
+      id
+      ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN(0);
+    sa->load_attrs (attrs);
+    if (sa->is_default ())
+      {
+        CORBA::Object_var saob = this->poa_->servant_to_reference (sa ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN(0);
+        this->default_supplier_admin_ =
+          CosNotifyChannelAdmin::SupplierAdmin::_narrow (
+          saob.in () ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN(0);
+      }
+    result = sa;
+  }
+  return result;
+}
+TAO_Notify_ProxyConsumer *
+TAO_Notify_EventChannel::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_ProxyConsumer * result = 0;
+  size_t path_size = id_path.size ();
+  if (position < path_size)
+  {
+    TAO_Notify_SupplierAdmin_Find_Worker find_worker;
+    TAO_Notify_SupplierAdmin * admin = find_worker.find (id_path[position], *this->sa_container_ ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+    ++position;
+    if (admin != 0)
+    {
+      result = admin->find_proxy_consumer (id_path, position
+        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN(0);
+    }
+  }
+  return result;
+}
+
+TAO_Notify_ProxySupplier *
+TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_ProxySupplier * result = 0;
+  size_t path_size = id_path.size ();
+  if (position < path_size)
+  {
+    TAO_Notify_ConsumerAdmin_Find_Worker find_worker;
+    TAO_Notify_ConsumerAdmin * admin = find_worker.find (id_path[position], *this->ca_container_ ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+    ++position;
+    if (admin != 0)
+    {
+      result = admin->find_proxy_supplier (id_path, position
+        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN(0);
+    }
+  }
+  return result;
+}
+
+
+void
+TAO_Notify_EventChannel::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  TAO_Notify::Reconnect_Worker<TAO_Notify_ConsumerAdmin> ca_wrk;
+  ACE_ASSERT(this->ca_container_ != 0);
+  this->ca_container_->collection()->for_each(&ca_wrk ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  TAO_Notify::Reconnect_Worker<TAO_Notify_SupplierAdmin> sa_wrk;
+  ACE_ASSERT(this->sa_container_ != 0);
+  this->sa_container_->collection()->for_each(&sa_wrk ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin
@@ -387,6 +691,11 @@ template class TAO_Notify_Container_T <TAO_Notify_SupplierAdmin>;
 template class TAO_ESF_Shutdown_Proxy<TAO_Notify_ConsumerAdmin>;
 template class TAO_ESF_Shutdown_Proxy<TAO_Notify_SupplierAdmin>;
 
+template class TAO_Notify::Save_Persist_Worker<TAO_Notify_ConsumerAdmin>;
+template class TAO_Notify::Save_Persist_Worker<TAO_Notify_SupplierAdmin>;
+template class TAO_Notify::Reconnect_Worker<TAO_Notify_ConsumerAdmin>;
+template class TAO_Notify::Reconnect_Worker<TAO_Notify_SupplierAdmin>;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin
@@ -407,4 +716,9 @@ template class TAO_ESF_Shutdown_Proxy<TAO_Notify_SupplierAdmin>;
 #pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_Notify_ConsumerAdmin>
 #pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_Notify_SupplierAdmin>
 
+#pragma instantiate Save_Persist_Worker<TAO_Notify_ConsumerAdmin>
+#pragma instantiate Save_Persist_Worker<TAO_Notify_SupplierAdmin>
+#pragma instantiate TAO_Notify::Reconnect_Worker<TAO_Notify_ConsumerAdmin>
+#pragma instantiate TAO_Notify::Reconnect_Worker<TAO_Notify_SupplierAdmin>
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index e334a2f03e5..5413a5b8e1b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -21,16 +21,18 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
-
+#include "Topology_Object.h"
 #include "Object.h"
 
 class TAO_Notify_ConsumerAdmin;
 class TAO_Notify_SupplierAdmin;
 class TAO_Notify_EventChannelFactory;
+class TAO_Notify_ProxyConsumer;
+class TAO_Notify_ProxySupplier;
 template <class TYPE> class TAO_Notify_Container_T;
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
+  #if (_MSC_VER >= 1200)
 #pragma warning(push)
 #endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
@@ -42,9 +44,9 @@ template <class TYPE> class TAO_Notify_Container_T;
  * @brief Implementation of CosNotifyChannelAdmin::EventChannel
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_EventChannel 
-  : public POA_CosNotifyChannelAdmin::EventChannel, 
-    public virtual TAO_Notify_Object
+class TAO_Notify_Serv_Export TAO_Notify_EventChannel
+  : public POA_CosNotifyChannelAdmin::EventChannel,
+    public TAO_Notify::Topology_Parent
 {
   friend class TAO_Notify_Builder;
 
@@ -64,6 +66,10 @@ public:
              , const CosNotification::AdminProperties & initial_admin
              ACE_ENV_ARG_DECL);
 
+  /// Init (for reload)
+  void init (TAO_Notify::Topology_Parent * parent
+             ACE_ENV_ARG_DECL);
+
   /// Remove ConsumerAdmin from its container.
   void remove (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
 
@@ -74,11 +80,30 @@ public:
   virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
   virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
 
+  // TAO_Notify::Topology_Parent
+
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
+                                                   CORBA::Long id,
+                                                   const TAO_Notify::NVPList& attrs
+                                                   ACE_ENV_ARG_DECL);
+  virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+
+  virtual TAO_Notify_Object::ID get_id () const {return id();}
+
+  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
+  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
+
   /// Release
   virtual void release (void);
 
   /// Shutdown
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void load_attrs(const TAO_Notify::NVPList& attrs);
+
+
+protected:
+  virtual void save_attrs(TAO_Notify::NVPList& attrs);
 
 protected:
   typedef TAO_Notify_Container_T <TAO_Notify_ConsumerAdmin> TAO_Notify_ConsumerAdmin_Container;
@@ -94,6 +119,8 @@ protected:
   /// SupplierAdmin Container.
   TAO_Notify_SupplierAdmin_Container *sa_container_;
 
+  TAO_SYNCH_MUTEX default_admin_mutex_;
+
   // Default Consumer Admin
   CosNotifyChannelAdmin::ConsumerAdmin_var default_consumer_admin_;
 
@@ -216,10 +243,6 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "EventChannel.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_EVENTCHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.inl b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index debe138d960..8613f38e5cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -2,21 +2,30 @@
 
 #include "EventChannelFactory.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EventChannelFactory.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$")
 
 #include "ace/Dynamic_Service.h"
 #include "Properties.h"
 #include "Factory.h"
 #include "Builder.h"
+#include "Topology_Saver.h"
+#include "Topology_Loader.h"
+#include "Save_Persist_Worker_T.h"
+#include "Reconnect_Worker_T.h"
+#include "Event_Persistence_Strategy.h"
+#include "Routing_Slip_Persistence_Manager.h"
+
 #include "EventChannel.h"
 #include "Container_T.h"
 #include "Find_Worker_T.h"
 #include "Seq_Worker_T.h"
 
+#include "tao/debug.h"
+//#define DEBUG_LEVEL 9
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
+
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_EventChannel
                              , CosNotifyChannelAdmin::EventChannel
                              , CosNotifyChannelAdmin::EventChannel_ptr
@@ -26,7 +35,12 @@ TAO_Notify_EventChannel_Find_Worker;
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_EventChannel> TAO_Notify_EventChannel_Seq_Worker;
 
 TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory (void)
-  :ec_container_ (0)
+  : ec_container_ (0)
+  , topology_save_seq_ (0)
+  , topology_factory_(0)
+  , reconnect_registry_(*this)
+  , loading_topology_ (false)
+
 {
 }
 
@@ -95,6 +109,17 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE
 
   // Make the Proxys acivate in this same POA.
   this->proxy_poa_ = this->object_poa_;
+
+  // Note topology factory is configured separately from the "builder" mediated
+  // objects since it is independant of the "style" of Notification Service.
+  this->topology_factory_ =
+    ACE_Dynamic_Service <TAO_Notify::Topology_Factory>::instance ("Topology_Factory");
+
+  this->load_topology (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->load_event_persistence (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 void
@@ -121,6 +146,7 @@ TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel A
 {
   this->ec_container_->remove (event_channel ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
@@ -152,11 +178,16 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_D
                    , CosNotification::UnsupportedAdmin
                    ))
 {
-  return TAO_Notify_PROPERTIES::instance()->builder()->build_event_channel (this
+  CosNotifyChannelAdmin::EventChannel_var ec =
+    TAO_Notify_PROPERTIES::instance()->builder()->build_event_channel (this
                                                                         , initial_qos
                                                                         , initial_admin
                                                                         , id
                                                                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (ec._retn ());
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (ec._retn ());
+  return ec._retn ();
 }
 
 CosNotifyChannelAdmin::ChannelIDSeq*
@@ -182,6 +213,337 @@ TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::Channe
   return find_worker.resolve (id, *this->ec_container_ ACE_ENV_ARG_PARAMETER);
 }
 
+void
+TAO_Notify_EventChannelFactory::set_topology_factory(TAO_Notify::Topology_Factory* f)
+{
+  ACE_DEBUG ((LM_DEBUG,
+    ACE_TEXT ("(%P,%t) Debug Topology_Factory installed in EventChannelFactory.\n")
+    ));
+  // If the above meessage appears when you don't expect it
+  // use svc.conf to install the topology factory rather
+  // than calling this method.
+  this->topology_factory_ = f;
+}
+
+void
+TAO_Notify_EventChannelFactory::load_topology (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->loading_topology_ = true;
+  if (this->topology_factory_ != 0)
+  {
+    auto_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader());
+    if (tl.get () != 0)
+    {
+      tl->load (this ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  }
+  else
+  {
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Topology persistence disabled.\n")));
+  }
+  this->loading_topology_ = false;
+}
+bool
+TAO_Notify_EventChannelFactory::is_persistent () const
+{
+  return true;
+}
+
+void
+TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+{
+  bool changed = this->self_changed_;
+  this->self_changed_ = false;
+  this->children_changed_ = false;
+
+  TAO_Notify::NVPList attrs; // ECF has no attributes
+
+  bool want_all_children =
+    saver.begin_object(0, "channel_factory", attrs, changed ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // for each deleted child
+  //  delete_child  // if the child has persistence.
+
+  TAO_Notify::Save_Persist_Worker<TAO_Notify_EventChannel> wrk(saver, want_all_children);
+
+  ACE_ASSERT(this->ec_container_ != 0);
+  this->ec_container_->collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (want_all_children || this->reconnect_registry_.is_changed ())
+  {
+    this->reconnect_registry_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+  }
+  saver.end_object(0, "channel_factory" ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_Notify_EventChannelFactory::load_event_persistence (ACE_ENV_SINGLE_ARG_DECL)
+{
+  TAO_Notify::Event_Persistence_Strategy * strategy =
+    ACE_Dynamic_Service <TAO_Notify::Event_Persistence_Strategy>::instance ("Event_Persistence");
+  if (strategy != 0)
+  {
+    if (this->topology_factory_ != 0)
+    {
+      TAO_Notify::Event_Persistence_Factory * factory = strategy->get_factory ();
+      if (factory != 0)
+      {
+        for (
+          TAO_Notify::Routing_Slip_Persistence_Manager * rspm = factory->first_reload_manager();
+          rspm != 0;
+          rspm = rspm->load_next ())
+        {
+          TAO_Notify::Routing_Slip_Ptr routing_slip = TAO_Notify::Routing_Slip::create (*this, rspm);
+          if (!routing_slip.null ())
+          {
+            this->routing_slip_restart_set_.insert (routing_slip);
+          }
+          else
+          {
+            //@@todo: tell the rspm it's an orphan, but we can't during reload
+            // we need collect these and come back later to remove them
+            ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%P|%t) Reload persistent event failed.\n")
+              ));
+          }
+        }
+      }
+    }
+    else
+    {
+      ACE_ERROR ((LM_ERROR,
+        ACE_TEXT ("(%P|%t) Notify Service: Configuration error.  Event Persistence requires Topology Persistence.\n")
+        ));
+      ACE_THROW (CORBA::PERSIST_STORE());
+      ACE_CHECK;
+    }
+  }
+}
+
+bool
+TAO_Notify_EventChannelFactory::change_to_parent (ACE_ENV_SINGLE_ARG_DECL)
+{
+  bool saving = false;
+  if (! this->loading_topology_)
+  {
+    // A null pointer means that saving of topology is disabled.
+    if (this->topology_factory_ != 0)
+    {
+      saving = true;
+      // seq is used to check save-in-progress
+      // if it changes while we're waiting for the lock
+      // then our change may have already been saved, so
+      // just return.  Caller will signal change again if necessary.
+      short seq = this->topology_save_seq_;
+      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->topology_save_lock_, CORBA::INTERNAL ());
+      ACE_CHECK_RETURN(false);
+      if (seq == this->topology_save_seq_)
+      {
+        auto_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver());
+        if (saver.get() != 0)
+        {
+          this->save_persistent(*saver ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN(false);
+          saver->close (ACE_ENV_SINGLE_ARG_PARAMETER);
+        }
+        this->topology_save_seq_ += 1;
+      }
+    }
+  }
+  return saving;
+}
+
+TAO_Notify::Topology_Object*
+TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type,
+                                        CORBA::Long id,
+                                        const TAO_Notify::
+                                        NVPList& attrs
+                                        ACE_ENV_ARG_DECL)
+{
+  // ignore anything but our valid children (ie channel)
+  TAO_Notify::Topology_Object * result = this;
+  if (type == "channel")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) EventChannelFactory reload channel %d\n")
+      , static_cast<int> (id)
+      ));
+
+    TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
+    TAO_Notify_EventChannel * ec = bld->build_event_channel(
+        this ,
+        id
+        ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN(0);
+
+    ec->load_attrs (attrs);
+
+    result = ec;
+  }
+  else if (type == TAO_Notify::REGISTRY_TYPE)
+  {
+    result = & this->reconnect_registry_;
+  }
+  return result;
+}
+
+void
+TAO_Notify_EventChannelFactory::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  // Reconnect all children first
+  TAO_Notify::Reconnect_Worker<TAO_Notify_EventChannel> wrk;
+
+  this->ec_container_->collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Then send reconnection announcement to registered clients
+  ACE_ASSERT (!CORBA::is_nil (this->channel_factory_.in ()));
+  this->reconnect_registry_.send_reconnect (this->channel_factory_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // reactivate events in-progress
+  Routing_Slip_Set::CONST_ITERATOR iter (this->routing_slip_restart_set_);
+  TAO_Notify::Routing_Slip_Ptr * routing_slip;
+  for (iter.first(); iter.next(routing_slip); iter.advance())
+  {
+    (*routing_slip)->reconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
+  }
+  this->routing_slip_restart_set_.reset ();
+}
+
+NotifyExt::ReconnectionRegistry::ReconnectionID
+TAO_Notify_EventChannelFactory::register_callback (
+    NotifyExt::ReconnectionCallback_ptr reconnection
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->reconnect_registry_.register_callback (
+    reconnection
+    ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_Notify_EventChannelFactory::unregister_callback (
+    NotifyExt::ReconnectionRegistry::ReconnectionID id
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->reconnect_registry_.unregister_callback (
+    id
+    ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Boolean
+TAO_Notify_EventChannelFactory::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return CORBA::Boolean (1);
+}
+
+void
+TAO_Notify_EventChannelFactory::save_topology (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+TAO_Notify_ProxyConsumer *
+TAO_Notify_EventChannelFactory::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_ProxyConsumer * result = 0;
+  size_t path_size = id_path.size ();
+
+  // EventChannelFactory only:  The first id is proably for the ECF itself
+  // if so, silently consume it.
+  if (position < path_size && id_path[position] == this->id_)
+  {
+    ++position;
+  }
+  if (position < path_size)
+  {
+    TAO_Notify_EventChannel_Find_Worker find_worker;
+
+    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], *this->ec_container_ ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+    ++position;
+    if (ec != 0)
+    {
+      result = ec->find_proxy_consumer (id_path, position
+        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN(0);
+    }
+  }
+  return result;
+}
+
+TAO_Notify_ProxySupplier *
+TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_ProxySupplier * result = 0;
+  size_t path_size = id_path.size ();
+
+  // EventChannelFactory only:  The first id is proably for the ECF itself
+  // if so, silently consume it.
+  if (position < path_size && id_path[position] == this->id_)
+  {
+    ++position;
+  }
+  if (position < path_size)
+  {
+    TAO_Notify_EventChannel_Find_Worker find_worker;
+    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], *this->ec_container_ ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+    ++position;
+    if (ec != 0)
+    {
+      result = ec->find_proxy_supplier (id_path, position
+        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN(0);
+    }
+  }
+  return result;
+}
+
+CosNotifyChannelAdmin::EventChannelFactory_ptr
+TAO_Notify_EventChannelFactory::activate_self (ACE_ENV_SINGLE_ARG_DECL)
+{
+  CORBA::Object_var obj = this->activate (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
+  this->channel_factory_
+    = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+                           CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_NEW_ENV
+  {
+    if (DEBUG_LEVEL > 9)
+    {
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_EventChannelFactory::activate_self") ));
+    }
+    this->reconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  }
+  ACE_CATCHANY
+  {
+    // ignore for now
+  }
+  ACE_ENDTRY;
+  return this->channel_factory_._retn();
+}
+
+
+TAO_Notify_Object::ID
+TAO_Notify_EventChannelFactory::get_id () const
+{
+  return id();
+}
+
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Notify_Find_Worker_T<TAO_Notify_EventChannel
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index c93fffd92a2..c6df6b73aa0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -22,8 +22,10 @@
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/NotifyExtS.h"
-
-#include "Object.h"
+#include "Topology_Object.h"
+#include "Topology_Factory.h"
+#include "Reconnection_Registry.h"
+#include "Routing_Slip.h"
 
 class TAO_Notify_EventChannel;
 template <class TYPE> class TAO_Notify_Container_T;
@@ -41,11 +43,13 @@ template <class TYPE> class TAO_Notify_Container_T;
  * @brief Implementation of CosNotifyChannelAdmin::EventChannelFactory
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory 
-  : public virtual POA_NotifyExt::EventChannelFactory, 
-    public virtual TAO_Notify_Object
+class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory
+  : public virtual POA_NotifyExt::EventChannelFactory
+  , public TAO_Notify::Topology_Parent
+
 {
   friend class TAO_Notify_Builder;
+  typedef ACE_Unbounded_Set <TAO_Notify::Routing_Slip_Ptr> Routing_Slip_Set;
 
 public:
   /// Constuctor
@@ -72,11 +76,49 @@ public:
       ACE_ENV_SINGLE_ARG_DECL
     );
 
-  /// shutdown
-  virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+
+  //////////////////////////
+  // The following methods are for
+  // unit testing and debugging
+
+  /// Use the registered Topology_Factory to create a loader, and
+  /// load the topology. If no Topology_Factory is registered
+  /// then nothing will be loaded.
+  void load_topology (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Use the passed in saver factory to generate topology saver objects.
+  /// Does not take ownership.
+  void set_topology_factory(TAO_Notify::Topology_Factory* sf);
+
+  //-- Topology_Parent
+
+  virtual bool is_persistent () const;
+
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual bool change_to_parent (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
+                                                   CORBA::Long id,
+                                                   const TAO_Notify::NVPList& attrs
+                                                   ACE_ENV_ARG_DECL);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// handle change notifications
+  bool handle_change (ACE_ENV_SINGLE_ARG_DECL);
+
+  void load_event_persistence (ACE_ENV_SINGLE_ARG_DECL);
+
+  virtual void save_topology (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
+  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
+  TAO_Notify_Object * follow_id_path (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
+  virtual TAO_Notify_Object::ID get_id () const;
+
 
  protected:
-  typedef TAO_Notify_Container_T<TAO_Notify_EventChannel> 
+  typedef TAO_Notify_Container_T<TAO_Notify_EventChannel>
     TAO_Notify_EventChannel_Container;
 
   /// = Data Members
@@ -86,21 +128,38 @@ public:
   /// The default filter factory.
   CosNotifyFilter::FilterFactory_var default_filter_factory_;
 
-  /// = NotifyExt method
+  /// = NotifyExt methods
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
+  /// shutdown
+  virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+
+  virtual
+  NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
+      NotifyExt::ReconnectionCallback_ptr reconnection
+      ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void unregister_callback (
+      NotifyExt::ReconnectionRegistry::ReconnectionID id
+      ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
   /// = CosNotifyChannelAdmin Methods
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr create_channel (
       const CosNotification::QoSProperties & initial_qos,
       const CosNotification::AdminProperties & initial_admin,
-      CosNotifyChannelAdmin::ChannelID_out id 
+      CosNotifyChannelAdmin::ChannelID_out id
       ACE_ENV_ARG_DECL
     )
-    ACE_THROW_SPEC ((CORBA::SystemException, 
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotification::UnsupportedQoS,
                      CosNotification::UnsupportedAdmin));
 
@@ -115,16 +174,26 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::ChannelNotFound));
+
+private:
+  TAO_SYNCH_MUTEX topology_save_lock_;
+
+  CosNotifyChannelAdmin::EventChannelFactory_var channel_factory_;
+
+  /// change-in-progress detector to avoid duplicates
+  short topology_save_seq_;
+  TAO_Notify::Topology_Factory* topology_factory_;
+  TAO_Notify::Reconnection_Registry reconnect_registry_;
+  bool loading_topology_;
+
+  Routing_Slip_Set routing_slip_restart_set_;
+
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "EventChannelFactory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_EVENTCHANNELFACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.inl b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index bcfae54e616..1b2e0a3a1ef 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -10,6 +10,8 @@
 #include "EventType.inl"
 #endif /* __ACE_INLINE__ */
 
+#include "Topology_Saver.h"
+
 ACE_RCSID (Notify,
            TAO_Notify_EventType,
            "$Id$")
@@ -139,3 +141,36 @@ TAO_Notify_EventType::dump (void) const
               this->event_type_.domain_name.in (),
               this->event_type_.type_name.in ()));
 }
+
+/// Initialize from an NVPList, return false on failure
+bool TAO_Notify_EventType::init(const TAO_Notify::NVPList& attrs)
+{
+  bool result = false;
+
+  ACE_CString domain;
+  ACE_CString type;
+  if (attrs.load("Domain", domain) && attrs.load("Type", type))
+  {
+    this->init_i(domain.c_str(), type.c_str());
+    result = true;
+  }
+  return result;
+
+}
+
+  // TAO_Notify::Topology_Object
+
+void
+TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+{
+  TAO_Notify::NVPList attrs;
+  bool changed = true;
+
+  attrs.push_back(TAO_Notify::NVP("Domain", this->event_type_.domain_name.in()));
+  attrs.push_back(TAO_Notify::NVP("Type", this->event_type_.type_name.in()));
+  saver.begin_object(0, "subscription", attrs, changed ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  saver.end_object(0, "subscription" ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index 3fcd875060d..2378fe6ba80 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -21,6 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotificationC.h"
+#include "Topology_Object.h"
 
 /**
  * @class TAO_Notify_EventType
@@ -31,7 +32,7 @@
  * It is used by the Event Manager as a key to find subscription lists.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_EventType
+class TAO_Notify_Serv_Export TAO_Notify_EventType : public TAO_Notify::Topology_Savable
 {
 public:
   /// Constuctor
@@ -41,7 +42,7 @@ public:
   // Constuctor
 
   /// Destructor
-  ~TAO_Notify_EventType ();
+  virtual ~TAO_Notify_EventType ();
 
   /// hash value
   u_long hash (void) const;
@@ -70,6 +71,13 @@ public:
   /// Helper to print contents.
   void dump (void) const;
 
+  /// Initialize from an NVPList, return false on failure
+  bool init(const TAO_Notify::NVPList& attrs);
+
+  // TAO_Notify::Topology_Object
+
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+
 protected:
   /// Init this object.
   void init_i (const char* domain_name, const char* type_name);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index 5161da17add..8a55665daa1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
 #include "EventTypeSeq.h"
+#include "Topology_Saver.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "EventTypeSeq.inl"
-#endif /* __ACE_INLINE__ */
+#include "tao/debug.h"
+//#define DEBUG_LEVEL 9
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
 
 ACE_RCSID(Notify, TAO_Notify_EventTypeSeq, "$Id$")
 
@@ -17,10 +20,25 @@ TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (const CosNotification::EventTy
   this->insert_seq (event_type_seq);
 }
 
+TAO_Notify_EventTypeSeq &
+TAO_Notify_EventTypeSeq::operator = (const TAO_Notify_EventTypeSeq & rhs)
+{
+  ACE_Unbounded_Set <TAO_Notify_EventType>::operator = (rhs);
+  return *this;
+}
+
+TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq & rhs)
+  : TAO_Notify_Object ()
+  , ACE_NESTED_CLASS (TAO_Notify,Topology_Savable ())
+  , ACE_Unbounded_Set <TAO_Notify_EventType> (rhs)
+  , TAO_Notify::Topology_Object ()
+{
+}
+
 void
 TAO_Notify_EventTypeSeq::populate (CosNotification::EventTypeSeq& event_type_seq) const
 {
-  event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size ()));
+  event_type_seq.length (static_cast<CORBA::ULong> (this->size ()));
 
   inherited::CONST_ITERATOR iter (*this);
 
@@ -39,10 +57,10 @@ TAO_Notify_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& eve
 
   if (this->find (special) == 0)
     {
-      event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size () - 1));
+      event_type_seq.length (static_cast<CORBA::ULong> (this->size () - 1));
     }
   else
-      event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size ()));
+      event_type_seq.length (static_cast<CORBA::ULong> (this->size ()));
 
   inherited::CONST_ITERATOR iter (*this);
 
@@ -103,7 +121,7 @@ TAO_Notify_EventTypeSeq::remove_seq (const TAO_Notify_EventTypeSeq& event_type_s
 }
 
 void
-TAO_Notify_EventTypeSeq::init (TAO_Notify_EventTypeSeq& seq_added, TAO_Notify_EventTypeSeq& seq_remove)
+TAO_Notify_EventTypeSeq::add_and_remove (TAO_Notify_EventTypeSeq& seq_added, TAO_Notify_EventTypeSeq& seq_remove)
 {
   const TAO_Notify_EventType& special = TAO_Notify_EventType::special ();
 
@@ -238,3 +256,58 @@ TAO_Notify_EventTypeSeq::dump (void) const
       ACE_DEBUG ((LM_DEBUG, ", "));
     }
 }
+
+  // TAO_Notify::Topology_Object
+void
+TAO_Notify_EventTypeSeq::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+{
+  bool changed = this->self_changed_;
+  this->self_changed_ = false;
+  this->children_changed_ = false;
+  TAO_Notify::NVPList attrs;
+
+  TAO_Notify_EventTypeSeq::ITERATOR iter (*this);
+  TAO_Notify_EventType* event_type;
+
+  if (this->size() != 0)
+  {
+    saver.begin_object(0, "subscriptions", attrs, changed ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+    for (iter.first (); iter.next (event_type) != 0; iter.advance ())
+    {
+      event_type->save_persistent(saver ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+// todo:
+//    for all deleted children
+//    {
+//      saver.delete_child(child_type, child_id);
+//    }
+    saver.end_object(0, "subscriptions" ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+  }
+}
+
+TAO_Notify::Topology_Object*
+TAO_Notify_EventTypeSeq::load_child (const ACE_CString &type, CORBA::Long id,
+  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL_NOT_USED)
+{
+  ACE_UNUSED_ARG (id);
+  TAO_Notify::Topology_Object *result = this;
+  TAO_Notify_EventType et;
+
+  if ((type == "subscription") && et.init(attrs))
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Event_Type reload subscription\n")
+      ));
+    inherited::insert(et);
+  }
+  return result;
+}
+
+void
+TAO_Notify_EventTypeSeq::release (void)
+{
+  delete this;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index 9f492e605e7..1a80b261ea1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -28,7 +28,9 @@
  * @brief Allows operations using the CosNotification::EventTypeSeq type.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_EventTypeSeq : public ACE_Unbounded_Set <TAO_Notify_EventType>
+class TAO_Notify_Serv_Export TAO_Notify_EventTypeSeq
+  : public ACE_Unbounded_Set <TAO_Notify_EventType>
+  , public TAO_Notify::Topology_Object
 {
  typedef ACE_Unbounded_Set <TAO_Notify_EventType> inherited;
 
@@ -36,9 +38,11 @@ public:
   /// Constructor
   TAO_Notify_EventTypeSeq (void);
   TAO_Notify_EventTypeSeq (const CosNotification::EventTypeSeq& event_type_seq);
+  TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq & rhs);
+  TAO_Notify_EventTypeSeq & operator = (const TAO_Notify_EventTypeSeq & rhs);
 
   /// Preprocess the types added and removed.
-  void init (TAO_Notify_EventTypeSeq& added, TAO_Notify_EventTypeSeq& removed);
+  void add_and_remove (TAO_Notify_EventTypeSeq& added, TAO_Notify_EventTypeSeq& removed);
 
   /// Populate this sequence with the intersection of rhs and lhs.
   void intersection (const TAO_Notify_EventTypeSeq& rhs, const TAO_Notify_EventTypeSeq& lhs);
@@ -64,11 +68,15 @@ public:
 
   /// Print the contents.
   void dump (void) const;
-};
 
-#if defined (__ACE_INLINE__)
-#include "EventTypeSeq.inl"
-#endif /* __ACE_INLINE__ */
+  // TAO_Notify::Topology_Object
+
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id,
+    const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+  virtual void release (void);
+
+};
 
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_EVENTTYPESEQ_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.inl b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index 9a03b6c3c96..ef8c778aa9d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -76,7 +76,7 @@ void
 TAO_Notify_Event_Manager::connect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
 {
   this->supplier_map_->connect (proxy_consumer ACE_ENV_ARG_PARAMETER);
-
+  ACE_CHECK;
   // Inform about subscription types.
   TAO_Notify_EventTypeSeq removed;
   proxy_consumer->types_changed (this->subscription_types (), removed ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index d6b64275843..2ed14807e59 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -8,6 +8,8 @@
 
 ACE_RCSID(Notify, FilterAdmin, "$Id$")
 
+#include "Topology_Saver.h"
+#include "Properties.h"
 #include "ace/Refcounted_Auto_Ptr.h"
 
 // Implementation skeleton constructor
@@ -102,7 +104,7 @@ TAO_Notify_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 
   CosNotifyFilter::FilterIDSeq_var list (list_ptr);
 
-  list->length (ACE_static_cast (CORBA::ULong, len));
+  list->length (static_cast<CORBA::ULong> (len));
 
   FILTER_LIST::ITERATOR iter (this->filter_list_);
   FILTER_LIST::ENTRY *entry;
@@ -128,6 +130,76 @@ TAO_Notify_FilterAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   this->filter_list_.unbind_all ();
 }
 
+void
+TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+{
+  if (this->filter_list_.current_size() == 0)
+    return;
+
+  bool changed = true;
+
+  TAO_Notify::NVPList attrs;
+  bool want_children = saver.begin_object(0, "filter_admin", attrs, changed ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  if (want_children)
+  {
+    FILTER_LIST::ITERATOR iter (this->filter_list_);
+    FILTER_LIST::ENTRY* entry;
+
+    TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
+    CORBA::ORB_var orb = properties->orb();
+    ACE_ASSERT(! CORBA::is_nil(orb.in()));
+
+    for (; iter.next(entry) != 0; iter.advance())
+    {
+      TAO_Notify::NVPList fattrs;
+      CORBA::Long id = entry->ext_id_;
+      CORBA::String_var ior = orb->object_to_string(entry->int_id_.in() ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+      fattrs.push_back(TAO_Notify::NVP("IOR", ior.in()));
+      saver.begin_object(id, "filter", fattrs, changed ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+      saver.end_object(id, "filter" ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  }
+
+  saver.end_object(0, "filter_admin" ACE_ENV_ARG_PARAMETER);
+}
+
+TAO_Notify::Topology_Object*
+TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id,
+  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+{
+  if (type == "filter")
+  {
+    TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
+    CORBA::ORB_var orb = properties->orb();
+    ACE_ASSERT(! CORBA::is_nil(orb.in()));
+    ACE_CString ior;
+    attrs.load("IOR", ior);
+
+    CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN(0);
+    CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN(0);
+    if (! CORBA::is_nil(filter.in()))
+    {
+      this->filter_ids_.set_last_used(id);
+      if (this->filter_list_.bind (id, filter) != 0)
+        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    }
+  }
+  return this;
+}
+
+void
+TAO_Notify_FilterAdmin::release (void)
+{
+  delete this;
+}
+
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>;
 template class ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Null_Mutex>;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index 4e40b0b5ac9..d6e20116940 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -22,6 +22,7 @@
 #include "ID_Factory.h"
 #include "Event.h"
 #include "notify_serv_export.h"
+#include "Topology_Object.h"
 
 /**
  * @class TAO_Notify_FilterAdmin
@@ -30,6 +31,7 @@
  *
  */
 class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
+  : public TAO_Notify::Topology_Object
 {
 
  public:
@@ -80,6 +82,13 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
                      CORBA::SystemException
                      ));
 
+
+  // TAO_Notify::Topology_Object
+
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id,
+    const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+  virtual void release (void);
  private:
   typedef ACE_Hash_Map_Manager <CosNotifyFilter::FilterID, CosNotifyFilter::Filter_var, ACE_SYNCH_NULL_MUTEX> FILTER_LIST;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index 3adfc211d53..43110f20672 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -18,7 +18,7 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Fin
 }
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> TYPE*
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
 {
   this->id_ = id;
 
@@ -29,7 +29,7 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (TAO_Noti
 }
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> INTERFACE_PTR
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
 {
   this->find (id, container ACE_ENV_ARG_PARAMETER);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
index 554a52395a7..abc1533da56 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -41,10 +41,10 @@ public:
   TAO_Notify_Find_Worker_T (void);
 
   /// Find the Type.
-  TYPE* find (TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
+  TYPE* find (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
 
   /// Find and resolve to the Interface.
-  INTERFACE_PTR resolve (TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
+  INTERFACE_PTR resolve (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
 
 protected:
   ///= TAO_ESF_Worker method
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
index 8e021520caf..b8bec81f68c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
@@ -9,6 +9,7 @@
 ACE_RCSID(Notify, TAO_Notify_ID_Factory, "$Id$")
 
 TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void)
+  : seed_ (0)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
index f3f6e3127b0..b9f0bd8aef5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h
@@ -41,8 +41,12 @@ public:
 
   TAO_Notify_Object::ID id (void);
 
+  void set_last_used (const TAO_Notify_Object::ID id);
+
 private:
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, TAO_Notify_Object::ID> seed_;
+  // Can't use atomic op, because we added the set_last_used() method.
+  TAO_Notify_Object::ID seed_;
+  TAO_SYNCH_MUTEX mtx_;
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
index 74a2d8582d6..f9fb1f5e89b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
@@ -3,5 +3,16 @@
 ACE_INLINE TAO_Notify_Object::ID
 TAO_Notify_ID_Factory::id (void)
 {
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mtx_, 0);
   return ++seed_;
 }
+
+ACE_INLINE void
+TAO_Notify_ID_Factory::set_last_used (const TAO_Notify_Object::ID id)
+{
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mtx_);
+  if (this->seed_ < id)
+  {
+    this->seed_ = id;
+  }
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index 56fd8d589e7..50e22647519 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -6,4 +6,19 @@
 #include "Method_Request.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Method_Request, "$Id$")
+ACE_RCSID(Notify, TAO_Notify_Method_Request_Queueable, "$Id$")
+
+TAO_Notify_Method_Request_Queueable *
+TAO_Notify_Method_Request_Queueable::copy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+{
+  return this;
+}
+
+TAO_Notify_Method_Request_Queueable::TAO_Notify_Method_Request_Queueable()
+{
+}
+
+TAO_Notify_Method_Request_Queueable::TAO_Notify_Method_Request_Queueable(const TAO_Notify_Event * event)
+{
+  this->init (event);
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index 6134050823d..248708a0eae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -5,8 +5,6 @@
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
  */
 
 #ifndef TAO_Notify_METHOD_REQUEST_H
@@ -26,41 +24,42 @@
 
 #include "Event.h"
 
-class TAO_Notify_Method_Request;
+class TAO_Notify_Method_Request_Queueable;
 
 /**
- * @class TAO_Notify_Method_Request_No_Copy
+ * @class TAO_Notify_Method_Request
  *
- * @brief Base class for Method Requests that do not copy the event.
+ * @brief Base class for Method Requests
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_No_Copy
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request
 {
 public:
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL) = 0;
 };
 
 /***********************************************************************/
 
 /**
- * @class TAO_Notify_Method_Request
+ * @class TAO_Notify_Method_Request_Queueable
  *
  * @brief Interface for NS method Requests
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request : public ACE_Message_Block
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Queueable
+  : public ACE_Message_Block
+  , public TAO_Notify_Method_Request
 {
 public:
   enum {PRIORITY_BASE = 32768};
 
-  void init (const TAO_Notify_Event_var& event);
+  TAO_Notify_Method_Request_Queueable();
+  TAO_Notify_Method_Request_Queueable(const TAO_Notify_Event * event);
 
-  /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
+  void init (const TAO_Notify_Event * event);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
index 66c35ce83d6..619cfbefa56 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
@@ -3,7 +3,7 @@
 #include "ace/OS_NS_sys_time.h"
 
 ACE_INLINE void
-TAO_Notify_Method_Request::init (const TAO_Notify_Event_var& event)
+TAO_Notify_Method_Request_Queueable::init (const TAO_Notify_Event * event)
 {
   // Set the parameters that affect queuing in the message queue.
   // The ACE_Message_Block priorities go from 0 (lowest) to ULONG_MAX
@@ -32,8 +32,7 @@ TAO_Notify_Method_Request::init (const TAO_Notify_Event_var& event)
       ACE_Time_Value current = ACE_OS::gettimeofday () +
 # if defined (ACE_CONFIG_WIN32_H)
         ACE_Time_Value (
-                        ACE_static_cast (long,
-                                         timeout.value ()));
+                        static_cast<long> (timeout.value ()));
 # else
       ACE_Time_Value (timeout.value () / 1);
 # endif /* ACE_CONFIG_WIN32_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 4322dbc6f29..359160773ef 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -2,10 +2,6 @@
 
 #include "Method_Request_Dispatch.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Dispatch.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$")
 
 #include "tao/debug.h"
@@ -13,120 +9,286 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$")
 #include "Consumer.h"
 #include "Admin.h"
 #include "ConsumerAdmin.h"
-
-TAO_Notify_Method_Request_Dispatch::TAO_Notify_Method_Request_Dispatch (const TAO_Notify_Event_var& event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
-  : TAO_Notify_Method_Request_Dispatch_Base (event, proxy_supplier, filtering)
+#include "EventChannelFactory.h"
+#include "ace/OS_NS_stdio.h"
+//#define DEBUG_LEVEL 10
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
+
+// Constuct from event
+TAO_Notify_Method_Request_Dispatch::TAO_Notify_Method_Request_Dispatch (
+      const TAO_Notify_Event * event,
+      TAO_Notify_ProxySupplier* proxy_supplier,
+      bool filtering)
+  : TAO_Notify_Method_Request_Event (event)
+  , proxy_supplier_ (proxy_supplier)
+  , filtering_ (filtering)
 {
-  this->init (event);
 }
 
-TAO_Notify_Method_Request_Dispatch::~TAO_Notify_Method_Request_Dispatch ()
+// Construct from a delivery rquest
+TAO_Notify_Method_Request_Dispatch::TAO_Notify_Method_Request_Dispatch (
+      const TAO_Notify::Delivery_Request_Ptr & delivery,
+      TAO_Notify_ProxySupplier* proxy_supplier,
+      bool filtering)
+  : TAO_Notify_Method_Request_Event (delivery)
+  , proxy_supplier_ (proxy_supplier)
+  , filtering_ (filtering)
 {
 }
 
-int
-TAO_Notify_Method_Request_Dispatch::execute (ACE_ENV_SINGLE_ARG_DECL)
+// Constuct construct from another method request+event
+// event is passed separately because we may be using a copy
+// of the one in the previous method request
+TAO_Notify_Method_Request_Dispatch::TAO_Notify_Method_Request_Dispatch (
+      const TAO_Notify_Method_Request_Event & request,
+      const TAO_Notify_Event * event,
+      TAO_Notify_ProxySupplier* proxy_supplier,
+      bool filtering)
+  : TAO_Notify_Method_Request_Event (request, event)
+  , proxy_supplier_ (proxy_supplier)
+  , filtering_ (filtering)
 {
-  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-/*********************************************************************************************************/
-
-TAO_Notify_Method_Request_Dispatch_No_Copy::TAO_Notify_Method_Request_Dispatch_No_Copy (const TAO_Notify_Event* event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
-  : TAO_Notify_Method_Request_Dispatch_No_Copy_Base (event, proxy_supplier, filtering)
+TAO_Notify_Method_Request_Dispatch::~TAO_Notify_Method_Request_Dispatch ()
 {
+#if 0
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%P|%t) Destroy TAO_Notify_Method_Request_Dispatch @%@\n"),
+              this));
+#endif
 }
 
-TAO_Notify_Method_Request_Dispatch_No_Copy:: ~TAO_Notify_Method_Request_Dispatch_No_Copy ()
+int TAO_Notify_Method_Request_Dispatch::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
+  if (this->proxy_supplier_->has_shutdown ())
+    return 0; // If we were shutdown while waiting in the queue, return with no action.
+
+  if (this->filtering_ == 1)
+    {
+      TAO_Notify_Admin* parent = this->proxy_supplier_->consumer_admin ();
+      CORBA::Boolean val =  this->proxy_supplier_->check_filters (this->event_,
+                                                                  parent->filter_admin (),
+                                                                  parent->filter_operator ()
+                                                                  ACE_ENV_ARG_PARAMETER);
+
+      if (TAO_debug_level > 1)
+        ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val));
+
+      // Filter failed - do nothing.
+      if (val == 0)
+        return 0;
+    }
+
+  ACE_TRY
+    {
+      TAO_Notify_Consumer* consumer = this->proxy_supplier_->consumer ();
+
+      if (consumer != 0)
+        {
+          consumer->deliver (this ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level > 0)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+        ACE_TEXT ("TAO_Notify_Method_Request_Dispatch::: error sending event.\n ")
+        );
+    }
+  ACE_ENDTRY;
+
+  return 0;
 }
 
-int
-TAO_Notify_Method_Request_Dispatch_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+/// Static method used to reconstruct a Method Request Dispatch
+TAO_Notify_Method_Request_Dispatch_Queueable *
+TAO_Notify_Method_Request_Dispatch::unmarshal (
+    TAO_Notify::Delivery_Request_Ptr & delivery_request,
+    TAO_Notify_EventChannelFactory &ecf,
+    TAO_InputCDR & cdr
+    ACE_ENV_ARG_DECL)
 {
-  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  bool ok = true;
+  TAO_Notify_Method_Request_Dispatch_Queueable * result = 0;
+  ACE_CString textpath;
+  CORBA::ULong count;
+  if (cdr.read_ulong (count))
+  {
+    TAO_Notify::IdVec id_path (count);
+    for (size_t nid = 0; ok && nid < count; ++nid)
+    {
+      TAO_Notify_Object::ID id = 0;
+      if ( cdr.read_long (id))
+      {
+        id_path.push_back (id);
+        char idbuf[20];
+        ACE_OS::snprintf (idbuf, sizeof(idbuf)-1, "/%d", static_cast<int> (id));
+        textpath += idbuf;
+      }
+      else
+      {
+        ok = false;
+      }
+    }
+
+    if (ok)
+    {
+      TAO_Notify_ProxySupplier* proxy_supplier = ecf.find_proxy_supplier (id_path,
+        0 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN(0);
+      if (proxy_supplier != 0)
+      {
+        if (DEBUG_LEVEL > 6) ACE_DEBUG ((LM_DEBUG,
+          ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch reload event for %s\n")
+          , textpath.c_str()
+          ));
+        ACE_NEW_NORETURN (result,
+          TAO_Notify_Method_Request_Dispatch_Queueable (delivery_request, proxy_supplier, true));
+      }
+      else
+      {
+        TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (id_path, 0 ACE_ENV_ARG_PARAMETER); //@@todo
+        if (proxy_consumer == 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+            ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch::unmarshal: unknown proxy id %s\n")
+            , textpath.c_str()
+            ));
+        }
+        else
+        {
+          ACE_ERROR ((LM_ERROR,
+            ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch::unmarshal: wrong type of proxy id %s\n")
+            , textpath.c_str()
+            ));
+        }
+      }
+    }
+    else
+    {
+      ACE_ERROR ((LM_ERROR,
+        ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch::unmarshal: Cant read proxy id path\n")
+        ));
+    }
+  }
+  return result;
 }
 
-TAO_Notify_Method_Request*
-TAO_Notify_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Notify_Method_Request* request;
+///////////////////////////////////////////////////////////////////////////////
 
-  TAO_Notify_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
-  TAO_Notify_Event_Copy_var event_var (event_copy);
+/*******************************************************************/
 
-  ACE_NEW_THROW_EX (request,
-                    TAO_Notify_Method_Request_Dispatch (event_var, this->proxy_supplier_, this->filtering_),
-                    CORBA::INTERNAL ());
+// Constuct construct from another method request+event
+// event is passed separately because we may be using a copy
+// of the one in the previous method request
+TAO_Notify_Method_Request_Dispatch_Queueable::TAO_Notify_Method_Request_Dispatch_Queueable (
+      const TAO_Notify_Method_Request_Event & request,
+      TAO_Notify_Event_var & event,
+      TAO_Notify_ProxySupplier* proxy_supplier,
+      bool filtering)
+  : TAO_Notify_Method_Request_Dispatch (request, event.get (), proxy_supplier, filtering)
+  , TAO_Notify_Method_Request_Queueable (event.get ())
+{
+#if 0
+  ACE_DEBUG ((LM_DEBUG,
+    ACE_TEXT ("(%P|%t) Construct Method_Request_Dispatch @%@\n"),
+    this));
+#endif
+}
 
-  return request;
+  /// Constuct construct from Delivery Request
+  /// should ONLY be used by unmarshall
+TAO_Notify_Method_Request_Dispatch_Queueable::TAO_Notify_Method_Request_Dispatch_Queueable (
+        const TAO_Notify::Delivery_Request_Ptr & request,
+        TAO_Notify_ProxySupplier* proxy_supplier,
+        bool filtering)
+  : TAO_Notify_Method_Request_Dispatch (request, request->event ().get (), proxy_supplier, filtering)
+  , TAO_Notify_Method_Request_Queueable (request->event ().get ())
+{
+#if 0
+  ACE_DEBUG ((LM_DEBUG,
+    ACE_TEXT ("(%P|%t) Construct unmarshalled Method_Request_Dispatch_Queueable  @%@\n"),
+    this));
+#endif
+}
+
+TAO_Notify_Method_Request_Dispatch_Queueable::~TAO_Notify_Method_Request_Dispatch_Queueable ()
+{
+#if 0
+  ACE_DEBUG ((LM_DEBUG,
+    ACE_TEXT ("(%P|%t) Destroy TAO_Notify_Method_Request_Dispatch_Queueable @%@\n"),
+    this));
+#endif
+}
+
+int
+TAO_Notify_Method_Request_Dispatch_Queueable::execute (ACE_ENV_SINGLE_ARG_DECL)
+{
+  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 /*********************************************************************************************************/
 
-TAO_Notify_Method_Request_Dispatch_No_Copy_Ex::TAO_Notify_Method_Request_Dispatch_No_Copy_Ex (const TAO_Notify_Event_var& event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
-  : TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base (event, proxy_supplier, filtering)
+TAO_Notify_Method_Request_Dispatch_No_Copy::TAO_Notify_Method_Request_Dispatch_No_Copy (
+      const TAO_Notify_Event* event,
+      TAO_Notify_ProxySupplier* proxy_supplier,
+      bool filtering)
+  : TAO_Notify_Method_Request_Dispatch (event, proxy_supplier, filtering)
 {
+#if 0
+    ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Construct Method_Request_Dispatch_No_Copy @%@\n"),
+      this));
+#endif
+}
+  /// Constuct construct from another method request
+TAO_Notify_Method_Request_Dispatch_No_Copy::TAO_Notify_Method_Request_Dispatch_No_Copy (
+      const TAO_Notify_Method_Request_Event & request,
+      TAO_Notify_ProxySupplier* proxy_supplier,
+      bool filtering)
+  : TAO_Notify_Method_Request_Dispatch (request, request.event (), proxy_supplier, filtering)
+{
+#if 0
+    ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Construct Method_Request_Dispatch_No_Copy @%@\n"),
+      this));
+#endif
 }
 
-TAO_Notify_Method_Request_Dispatch_No_Copy_Ex:: ~TAO_Notify_Method_Request_Dispatch_No_Copy_Ex ()
+TAO_Notify_Method_Request_Dispatch_No_Copy:: ~TAO_Notify_Method_Request_Dispatch_No_Copy ()
 {
+#if 0
+  ACE_DEBUG ((LM_DEBUG,
+    ACE_TEXT ("(%P|%t) Destroy Method_Request_Dispatch_No_Copy @%@\n"),
+    this));
+#endif
 }
 
 int
-TAO_Notify_Method_Request_Dispatch_No_Copy_Ex::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-TAO_Notify_Method_Request*
-TAO_Notify_Method_Request_Dispatch_No_Copy_Ex::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Queueable*
+TAO_Notify_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Notify_Method_Request* request;
+  TAO_Notify_Method_Request_Queueable* request;
+
+  TAO_Notify_Event_var event_var;
+  this->event_->queueable_copy (event_var ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
   ACE_NEW_THROW_EX (request,
-                    TAO_Notify_Method_Request_Dispatch (this->event_, this->proxy_supplier_, this->filtering_),
+                    TAO_Notify_Method_Request_Dispatch_Queueable (*this, event_var, this->proxy_supplier_.get(), this->filtering_),
+                    //TAO_Notify_Method_Request_Dispatch_Queueable (*this, event_var, this->proxy_supplier_, this->filtering_),
                     CORBA::INTERNAL ());
 
   return request;
 }
 
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var
-, TAO_Notify_ProxySupplier_Guard
-, const TAO_Notify_Event_var&
-, TAO_Notify_ProxySupplier*>;
-
-template class TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event*
-, TAO_Notify_ProxySupplier*
-, const TAO_Notify_Event*
-, TAO_Notify_ProxySupplier*>;
-
-template class TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var&
-, TAO_Notify_ProxySupplier*
-, const TAO_Notify_Event_var&
-, TAO_Notify_ProxySupplier*>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var
-, TAO_Notify_ProxySupplier_Guard
-, const TAO_Notify_Event_var&
-, TAO_Notify_ProxySupplier*>
-
-#pragma instantiate TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event*
-, TAO_Notify_ProxySupplier*
-, const TAO_Notify_Event*
-, TAO_Notify_ProxySupplier*>
-
-#pragma instantiate TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var&
-, TAO_Notify_ProxySupplier*
-, const TAO_Notify_Event_var&
-, TAO_Notify_ProxySupplier*>
-
-#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index 156dadf13e9..55e59b143eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -21,100 +21,148 @@
 
 #include "Method_Request.h"
 #include "Refcountable.h"
-#include "Method_Request_Dispatch_T.h"
+#include "Method_Request_Event.h"
 #include "ProxySupplier.h"
+#include "Delivery_Request.h"
+
+class TAO_Notify_EventChannelFactory;
+class TAO_InputCDR;
+class TAO_Notify_Method_Request_Dispatch_Queueable;
 
 /**
  * @class TAO_Notify_Method_Request_Dispatch
  *
- * @brief Dispatchs an event to a proxy supplier.
+ * @brief
  *
  */
-
-typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var
-                                         , TAO_Notify_ProxySupplier_Guard
-                                         , const TAO_Notify_Event_var&
-                                         , TAO_Notify_ProxySupplier*>  TAO_Notify_Method_Request_Dispatch_Base;
-
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch : public TAO_Notify_Method_Request_Dispatch_Base
-                                                       , public TAO_Notify_Method_Request
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch
+  : public TAO_Notify_Method_Request_Event
 {
 public:
-  /// Constuctor
-  TAO_Notify_Method_Request_Dispatch (const TAO_Notify_Event_var& event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
+  /// an arbitrary code (Octet) to identify this delivery method type in persistent storage
+  enum {persistence_code = 1};
+
+  /// Constuct from event
+  TAO_Notify_Method_Request_Dispatch (
+    const TAO_Notify_Event * event,
+    TAO_Notify_ProxySupplier* proxy_supplier,
+    bool filtering);
+
+  /// Construct from a delivery rquest
+  TAO_Notify_Method_Request_Dispatch (
+    const TAO_Notify::Delivery_Request_Ptr & delivery,
+    TAO_Notify_ProxySupplier* proxy_supplier,
+    bool filtering);
+
+  /// Constuct construct from another method request+event
+  /// event is passed separately because we may be using a copy
+  /// of the one in the previous method request
+  TAO_Notify_Method_Request_Dispatch (
+    const TAO_Notify_Method_Request_Event & request,
+    const TAO_Notify_Event * event,
+    TAO_Notify_ProxySupplier* proxy_supplier,
+    bool filtering);
 
+public:
   /// Destructor
-  ~TAO_Notify_Method_Request_Dispatch ();
+  virtual ~TAO_Notify_Method_Request_Dispatch ();
 
-  /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
-};
+  /// Static method used to reconstruct a Method Request Dispatch
+  static TAO_Notify_Method_Request_Dispatch_Queueable * unmarshal (
+    TAO_Notify::Delivery_Request_Ptr & delivery_request,
+    TAO_Notify_EventChannelFactory &ecf,
+    TAO_InputCDR & cdr
+    ACE_ENV_ARG_DECL);
 
-/*******************************************************************************************************/
+
+protected:
+  /// Execute the dispatch operation.
+  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+
+protected:
+  /// The Proxy
+  TAO_Notify_ProxySupplier_Guard proxy_supplier_;
+  //TAO_Notify_ProxySupplier* proxy_supplier_;
+
+  /// Flag is true if we want to do filtering else false.
+  bool filtering_;
+};
 
 /**
- * @class TAO_Notify_Method_Request_Dispatch_No_Copy
+ * @class TAO_Notify_Method_Request_Dispatch_Queueable
  *
  * @brief Dispatchs an event to a proxy supplier.
  *
  */
 
-typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event*
-                                         , TAO_Notify_ProxySupplier*
-                                         , const TAO_Notify_Event*
-                                         , TAO_Notify_ProxySupplier*>  TAO_Notify_Method_Request_Dispatch_No_Copy_Base;
-
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy : public TAO_Notify_Method_Request_Dispatch_No_Copy_Base
-                                                                 , public TAO_Notify_Method_Request_No_Copy
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_Queueable
+    : public TAO_Notify_Method_Request_Dispatch
+    , public TAO_Notify_Method_Request_Queueable
 {
 public:
-  /// Constuctor
-  TAO_Notify_Method_Request_Dispatch_No_Copy (const TAO_Notify_Event* event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
+  /// Construct construct from another method request+event
+  /// event is passed separately because we may be using a copy
+  /// of the one in the previous method request
+  TAO_Notify_Method_Request_Dispatch_Queueable (
+    const TAO_Notify_Method_Request_Event & request,
+    TAO_Notify_Event_var & event,
+    TAO_Notify_ProxySupplier* proxy_supplier,
+    bool filtering);
+
+  /// Constuct construct from Delivery Request
+  /// should ONLY be used by unmarshall
+  TAO_Notify_Method_Request_Dispatch_Queueable (
+    const TAO_Notify::Delivery_Request_Ptr & request,
+    TAO_Notify_ProxySupplier* proxy_supplier,
+    bool filtering);
 
   /// Destructor
-  ~TAO_Notify_Method_Request_Dispatch_No_Copy ();
+  ~TAO_Notify_Method_Request_Dispatch_Queueable ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
+private:
+  const TAO_Notify_Event_var event_var_;
+  TAO_Notify_ProxySupplier_Guard proxy_guard_;
 };
 
 /*******************************************************************************************************/
 
 /**
- * @class TAO_Notify_Method_Request_Dispatch_No_Copy_Ex
+ * @class TAO_Notify_Method_Request_Dispatch_No_Copy
  *
  * @brief Dispatchs an event to a proxy supplier.
  *
  */
-
-typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var&
-                                         , TAO_Notify_ProxySupplier*
-                                         , const TAO_Notify_Event_var&
-                                         , TAO_Notify_ProxySupplier*>  TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base;
-
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy_Ex : public TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base
-                                                                 , public TAO_Notify_Method_Request_No_Copy
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy
+    : public TAO_Notify_Method_Request_Dispatch
+    , public TAO_Notify_Method_Request
 {
 public:
-  /// Constuctor
-  TAO_Notify_Method_Request_Dispatch_No_Copy_Ex (const TAO_Notify_Event_var& event, TAO_Notify_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
+  /// Constuct from event
+  TAO_Notify_Method_Request_Dispatch_No_Copy (
+    const TAO_Notify_Event * event,
+    TAO_Notify_ProxySupplier* proxy_supplier,
+    bool filtering);
+
+  /// Constuct construct from another method request
+  TAO_Notify_Method_Request_Dispatch_No_Copy (
+    const TAO_Notify_Method_Request_Event & request,
+    TAO_Notify_ProxySupplier* proxy_supplier,
+    bool filtering);
 
   /// Destructor
-  ~TAO_Notify_Method_Request_Dispatch_No_Copy_Ex ();
+  ~TAO_Notify_Method_Request_Dispatch_No_Copy ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
+  /// Create a copy of this method request
+  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Dispatch.inl"
-#endif /* __ACE_INLINE__ */
+/*******************************************************************************************************/
 
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_DISPATCH_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp
deleted file mode 100644
index 4fc841ccc78..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-#ifndef TAO_Notify_Method_Request_Dispatch_T_CPP
-#define TAO_Notify_Method_Request_Dispatch_T_CPP
-
-#include "Method_Request_Dispatch_T.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Dispatch_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Notify,
-           TAO_Notify_Method_Request_Dispatch_T,
-           "$Id$")
-
-
-template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-TAO_Notify_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::TAO_Notify_Method_Request_Dispatch_T (EVENT_PARAM event, PROXY_PARAM proxy_supplier, CORBA::Boolean filtering)
-  :event_ (event), proxy_supplier_ (proxy_supplier), filtering_ (filtering)
-{
-}
-
-template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-TAO_Notify_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::~TAO_Notify_Method_Request_Dispatch_T ()
-{
-}
-
-#endif /* TAO_Notify_Method_Request_Dispatch_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
deleted file mode 100644
index 961db8c576b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- C++ -*- */
-/**
- *  @file Method_Request_Dispatch_T.h
- *
- *  $Id$
- *
- *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
- */
-
-#ifndef TAO_Notify_METHOD_REQUEST_DISPATCH_T_H
-#define TAO_Notify_METHOD_REQUEST_DISPATCH_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "notify_serv_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-#include "ace/CORBA_macros.h"
-
-/**
- * @class TAO_Notify_Method_Request_Dispatch_T
- *
- * @brief
- *
- */
-template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-class TAO_Notify_Method_Request_Dispatch_T
-{
-public:
-  /// Constuctor
-  TAO_Notify_Method_Request_Dispatch_T (EVENT_PARAM event, 
-                                        PROXY_PARAM proxy, 
-                                        CORBA::Boolean filtering);
-
-  /// Destructor
-  virtual ~TAO_Notify_Method_Request_Dispatch_T ();
-
-  /// Execute the dispatch operation.
-  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
-
-protected:
-  /// The Event
-  EVENT event_;
-
-  /// The Proxy
-  PROXY proxy_supplier_;
-
-  /// Flag is true if we want to do fintering else false.
-  CORBA::Boolean filtering_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Dispatch_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Method_Request_Dispatch_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Method_Request_Dispatch_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_Notify_METHOD_REQUEST_DISPATCH_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl
deleted file mode 100644
index 948d2595e1a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-
-#include "Admin.h"
-#include "Consumer.h"
-#include "tao/debug.h"
-
-template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> ACE_INLINE int
-TAO_Notify_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->proxy_supplier_->has_shutdown ())
-    return 0; // If we were shutdown while waiting in the queue, return with no action.
-
-  if (this->filtering_ == 1)
-    {
-      TAO_Notify_Admin* parent = this->proxy_supplier_->consumer_admin ();
-
-      CORBA::Boolean val =  this->proxy_supplier_->check_filters (this->event_,
-                                                                  parent->filter_admin (),
-                                                                  parent->filter_operator ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-
-      if (TAO_debug_level > 1)
-        ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val));
-
-      // Filter failed - do nothing.
-      if (val == 0)
-        return 0;
-    }
-
-  ACE_TRY
-    {
-      TAO_Notify_Consumer* consumer = this->proxy_supplier_->consumer ();
-
-      if (consumer != 0)
-        {
-          consumer->push (this->event_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Notify_Method_Request_Dispatch::: error sending event. \n ");
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index 011b566cc2b..5a5f0fd1c4b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -1,30 +1,98 @@
 // $Id$
 
 #include "Method_Request_Event.h"
+#include "Delivery_Request.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Event.inl"
-#endif /* __ACE_INLINE__ */
+ACE_RCSID (Notify, TAO_Notify_Method_Request_Event_Queueable, "$Id$")
 
-ACE_RCSID (Notify, TAO_Notify_Method_Request_Event, "$Id$")
+TAO_Notify_Method_Request_Event::TAO_Notify_Method_Request_Event (
+      const TAO_Notify_Event * event)
+  : event_ (event)
+{
+}
+
+TAO_Notify_Method_Request_Event::TAO_Notify_Method_Request_Event (
+      const TAO_Notify::Delivery_Request_Ptr & request)
+  : event_ (request->event ().get ())
+  , delivery_request_ (request)
+{
+}
+
+TAO_Notify_Method_Request_Event::TAO_Notify_Method_Request_Event (
+      const TAO_Notify_Method_Request_Event & rhs,
+      const TAO_Notify_Event * event)
+  : event_ (event)
+  , delivery_request_ (rhs.delivery_request_)
+{
+}
 
-TAO_Notify_Method_Request_Event::TAO_Notify_Method_Request_Event (const TAO_Notify_Event_var& event)
-  :event_ (event)
+TAO_Notify_Method_Request_Event::~TAO_Notify_Method_Request_Event()
 {
-  this->init (event);
 }
 
-TAO_Notify_Method_Request_Event::~TAO_Notify_Method_Request_Event ()
+void
+TAO_Notify_Method_Request_Event::complete ()
 {
+  if (this->delivery_request_.get () != 0)
+  {
+    this->delivery_request_->complete ();
+  }
 }
+
+
+unsigned long
+TAO_Notify_Method_Request_Event::sequence ()
+{
+  if (this->delivery_request_.get () != 0)
+  {
+    return this->delivery_request_->sequence ();
+  }
+  return 0;
+}
+
+bool
+TAO_Notify_Method_Request_Event::should_retry ()
+{
+  if (this->delivery_request_.get () != 0)
+  {
+    return this->delivery_request_->should_retry ();
+  }
+  return false;
+}
+
+/**********************************************************/
+
+
+TAO_Notify_Method_Request_Event_Queueable::TAO_Notify_Method_Request_Event_Queueable (
+      const TAO_Notify_Method_Request_Event & prev_request,
+      const TAO_Notify_Event_var & event_var)
+  : TAO_Notify_Method_Request_Queueable (event_var.get ())
+  , TAO_Notify_Method_Request_Event (prev_request, event_var.get ())
+  , event_var_ (event_var)
+{
+}
+
+TAO_Notify_Method_Request_Event_Queueable::TAO_Notify_Method_Request_Event_Queueable (
+    TAO_Notify::Delivery_Request_Ptr & request)
+  : TAO_Notify_Method_Request_Queueable (request->event ().get ())
+  , TAO_Notify_Method_Request_Event (request, request->event ().get ())
+  , event_var_ (request->event ())
+{
+}
+
+TAO_Notify_Method_Request_Event_Queueable::~TAO_Notify_Method_Request_Event_Queueable ()
+{
+}
+
 int
-TAO_Notify_Method_Request_Event::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Method_Request_Event_Queueable::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
+  ACE_ASSERT (false);
   return -1;
 }
 
-const TAO_Notify_Event_var&
-TAO_Notify_Method_Request_Event::event (void)
+const TAO_Notify_Event *
+TAO_Notify_Method_Request_Event::event() const
 {
   return this->event_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
index 2703fef2955..64d17d48f58 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -20,36 +20,82 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Method_Request.h"
+#include "Event.h"
+#include "ProxySupplier.h"
+#include "tao/Basic_Types.h"
+#include "ace/CORBA_macros.h"
+#include "Delivery_Request.h"
 
 /**
  * @class TAO_Notify_Method_Request_Event
  *
- * @brief A method request for storing events.
+ * @brief A base class for all Method Requests that are associated with events.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Event : public TAO_Notify_Method_Request
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Event
 {
 public:
-  /// Constuctor
-  TAO_Notify_Method_Request_Event (const TAO_Notify_Event_var& event);
+  /// Construct from event
+  TAO_Notify_Method_Request_Event (const TAO_Notify_Event *);
+
+  /// Construct from a delivery request
+  TAO_Notify_Method_Request_Event (
+    const TAO_Notify::Delivery_Request_Ptr & delivery_request);
 
+  /// Construct from another Method Request
+  /// Event is passed separately because it may be a copy of the one in request.
+  TAO_Notify_Method_Request_Event (const TAO_Notify_Method_Request_Event & rhs,
+    const TAO_Notify_Event * event);
+
+public:
   /// Destructor
   virtual ~TAO_Notify_Method_Request_Event ();
 
-  /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Obtain the event.
-  const TAO_Notify_Event_var& event (void);
+  const TAO_Notify_Event * event() const;
+  void complete ();
+  unsigned long sequence ();
+  bool should_retry ();
 
 protected:
-  /// The event.
-  const TAO_Notify_Event_var event_;
+
+  /// The Event
+  const TAO_Notify_Event * event_;
+
+  /// Pointer to the routing slip's delivery request (if any)
+  TAO_Notify::Delivery_Request_Ptr delivery_request_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Event.inl"
-#endif /* __ACE_INLINE__ */
+/***************************************************************/
+
+/**
+ * @class TAO_Notify_Method_Request_Event_Queueable
+ *
+ * @brief A method request for storing events.
+ *
+ */
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Event_Queueable
+  : public TAO_Notify_Method_Request_Queueable
+  , public TAO_Notify_Method_Request_Event
+{
+public:
+  /// Constuctor
+  /// Not the event_var is passed as a separate parameter to avoid throwing
+  /// exceptions from the constructor if it's necessary to copy the event.
+  TAO_Notify_Method_Request_Event_Queueable (
+    const TAO_Notify_Method_Request_Event & prev_request,
+    const TAO_Notify_Event_var & event_var);
+
+  TAO_Notify_Method_Request_Event_Queueable (
+    TAO_Notify::Delivery_Request_Ptr & request);
+
+  /// Destructor
+  virtual ~TAO_Notify_Method_Request_Event_Queueable ();
+
+  /// satisfy the pure virtual method.  Should never be called.
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+private:
+  TAO_Notify_Event_var event_var_;
+};
 
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_METHOD_REQUEST_EVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.inl
deleted file mode 100644
index 594304747ec..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "Method_Request_Event.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index a99adabdb47..34332749637 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -2,10 +2,6 @@
 
 #include "Method_Request_Lookup.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Lookup.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$")
 
 #include "tao/debug.h"
@@ -15,27 +11,182 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$")
 #include "Proxy.h"
 #include "Admin.h"
 #include "SupplierAdmin.h"
-
-TAO_Notify_Method_Request_Lookup::TAO_Notify_Method_Request_Lookup (const TAO_Notify_Event_var& event, TAO_Notify_ProxyConsumer* proxy_consumer)
-  : TAO_Notify_Method_Request_Lookup_Base (event, proxy_consumer)
+#include "Event_Manager.h"
+#include "Method_Request_Dispatch.h"
+#include "Delivery_Request.h"
+#include "EventChannelFactory.h"
+
+TAO_Notify_Method_Request_Lookup::TAO_Notify_Method_Request_Lookup (
+      const TAO_Notify_Event * event,
+      TAO_Notify_ProxyConsumer * proxy)
+  : TAO_Notify_Method_Request_Event (event)
+  , proxy_consumer_ (proxy)
 {
-  this->init (event);
 }
 
 TAO_Notify_Method_Request_Lookup::~TAO_Notify_Method_Request_Lookup ()
 {
 }
 
+void
+TAO_Notify_Method_Request_Lookup::work (
+  TAO_Notify_ProxySupplier* proxy_supplier
+  ACE_ENV_ARG_DECL)
+{
+  if (delivery_request_.get () == 0)
+  {
+    TAO_Notify_Method_Request_Dispatch_No_Copy request (*this, proxy_supplier, true);
+    proxy_supplier->deliver (request ACE_ENV_ARG_PARAMETER);
+  }
+  else
+  {
+    delivery_request_->dispatch (proxy_supplier, true ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+  }
+}
+
+int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (this->proxy_consumer_->has_shutdown ())
+    return 0; // If we were shutdown while waiting in the queue, return with no action.
+
+  TAO_Notify_SupplierAdmin* parent = this->proxy_consumer_->supplier_admin ();
+
+  CORBA::Boolean val =  this->proxy_consumer_->check_filters (this->event_,
+                                                             parent->filter_admin (),
+                                                             parent->filter_operator ()
+                                                             ACE_ENV_ARG_PARAMETER);
+
+  if (TAO_debug_level > 1)
+    ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val));
+
+  // Filter failed - do nothing.
+  if (val == 0)
+    return 0;
+
+  // The map of subscriptions.
+  TAO_Notify_Consumer_Map* map = this->proxy_consumer_->event_manager ()->consumer_map ();
+
+  TAO_Notify_Consumer_Map::ENTRY* entry = map->find (this->event_->type () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  TAO_Notify_ProxySupplier_Collection* consumers = 0;
+
+  if (entry != 0)
+  {
+    consumers = entry->collection ();
+
+    if (consumers != 0)
+      consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+
+    map->release (entry);
+  }
+
+  // Get the default consumers
+  consumers = map->broadcast_collection ();
+
+  if (consumers != 0)
+    consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+  this->complete ();
+  return 0;
+}
+
+/// Static method used to reconstruct a Method Request Dispatch
+TAO_Notify_Method_Request_Lookup_Queueable *
+TAO_Notify_Method_Request_Lookup::unmarshal (
+  TAO_Notify::Delivery_Request_Ptr & delivery_request,
+  TAO_Notify_EventChannelFactory &ecf,
+  TAO_InputCDR & cdr
+  ACE_ENV_ARG_DECL)
+{
+  bool ok = true;
+  TAO_Notify_Method_Request_Lookup_Queueable * result = 0;
+  CORBA::ULong count;
+  if (cdr.read_ulong (count))
+  {
+    TAO_Notify::IdVec id_path (count);
+    for (size_t nid = 0; ok && nid < count; ++nid)
+    {
+      TAO_Notify_Object::ID id = 0;
+      if ( cdr.read_long (id))
+      {
+        id_path.push_back (id);
+      }
+      else
+      {
+        ok = false;
+      }
+    }
+
+    if (ok)
+    {
+      TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (
+        id_path,
+        0 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN(0);
+      if (proxy_consumer != 0)
+      {
+        ACE_NEW_NORETURN (result,
+          TAO_Notify_Method_Request_Lookup_Queueable (delivery_request, proxy_consumer));
+      }
+      else
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Lookup_No_Copy::unmarshal: unknown proxy id\n")
+          ));
+      }
+    }
+    else
+    {
+      ACE_ERROR ((LM_ERROR,
+        ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Lookup_No_Copy::unmarshal: Cant read proxy id path\n")
+        ));
+    }
+  }
+  return result;
+
+}
+
+
+/****************************************************************/
+
+TAO_Notify_Method_Request_Lookup_Queueable::TAO_Notify_Method_Request_Lookup_Queueable (
+      const TAO_Notify_Event_var& event,
+      TAO_Notify_ProxyConsumer* proxy_consumer)
+  : TAO_Notify_Method_Request_Lookup (event.get (), proxy_consumer)
+  , TAO_Notify_Method_Request_Queueable (event.get ())
+  , event_var_ (event)
+  , proxy_guard_ (proxy_consumer)
+{
+}
+
+TAO_Notify_Method_Request_Lookup_Queueable::TAO_Notify_Method_Request_Lookup_Queueable (
+      TAO_Notify::Delivery_Request_Ptr & request,
+      TAO_Notify_ProxyConsumer * proxy_consumer)
+  : TAO_Notify_Method_Request_Lookup (request->event ().get (), proxy_consumer)
+  , TAO_Notify_Method_Request_Queueable (request->event ().get ())
+  , event_var_ (request->event ())
+  , proxy_guard_ (proxy_consumer)
+{
+}
+
+
+TAO_Notify_Method_Request_Lookup_Queueable::~TAO_Notify_Method_Request_Lookup_Queueable ()
+{
+}
+
 int
-TAO_Notify_Method_Request_Lookup::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_Queueable::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 /******************************************************************************************************/
 
-TAO_Notify_Method_Request_Lookup_No_Copy::TAO_Notify_Method_Request_Lookup_No_Copy (const TAO_Notify_Event* event, TAO_Notify_ProxyConsumer* proxy_consumer)
-  : TAO_Notify_Method_Request_Lookup_No_Copy_Base (event, proxy_consumer)
+TAO_Notify_Method_Request_Lookup_No_Copy::TAO_Notify_Method_Request_Lookup_No_Copy (
+        const TAO_Notify_Event* event,
+        TAO_Notify_ProxyConsumer* proxy_consumer)
+  : TAO_Notify_Method_Request_Lookup (event, proxy_consumer)
 {
 }
 
@@ -49,23 +200,22 @@ TAO_Notify_Method_Request_Lookup_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
   return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-TAO_Notify_Method_Request*
+TAO_Notify_Method_Request_Queueable*
 TAO_Notify_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Notify_Method_Request* request;
+  TAO_Notify_Method_Request_Queueable* request;
 
-  TAO_Notify_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Notify_Event_var event_var;
+  this->event_->queueable_copy (event_var ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  TAO_Notify_Event_Copy_var event_var (event_copy);
-
   ACE_NEW_THROW_EX (request,
-                    TAO_Notify_Method_Request_Lookup (event_var, this->proxy_consumer_),
+                    TAO_Notify_Method_Request_Lookup_Queueable (event_var, this->proxy_consumer_),
                     CORBA::INTERNAL ());
 
   return request;
 }
-
+#if 0
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event_var
@@ -89,5 +239,5 @@ template class TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event*
 , TAO_Notify_ProxyConsumer*
 , const TAO_Notify_Event*
 , TAO_Notify_ProxyConsumer*>
-
+#endif
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index 42bb57b38e7..66d9de69c7a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -20,57 +20,107 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "Method_Request.h"
+#include "Method_Request_Event.h"
+#include "ProxySupplier.h"
 #include "ProxyConsumer.h"
 #include "Consumer_Map.h"
-#include "Method_Request_Lookup_T.h"
+#include "Delivery_Request.h"
 
-class TAO_Notify_ProxyConsumer;
-
-typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event_var
-                                       , TAO_Notify_ProxyConsumer_Guard
-                                       , const TAO_Notify_Event_var&
-                                       , TAO_Notify_ProxyConsumer*>  TAO_Notify_Method_Request_Lookup_Base;
+class TAO_Notify_Method_Request_Lookup_Queueable;
+class TAO_Notify_Event;
 
 /**
  * @class TAO_Notify_Method_Request_Lookup
  *
- * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier.
+ * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup : public TAO_Notify_Method_Request_Lookup_Base
-                                                       , public TAO_Notify_Method_Request
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup
+  : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
+  , public TAO_Notify_Method_Request_Event
 {
 public:
+
+  /// an arbitrary code (Octet) to identify this type of request in persistent storage
+  enum {persistence_code = 2};
+
+  /// Destructor
+  virtual ~TAO_Notify_Method_Request_Lookup ();
+
+  /// Static method used to reconstruct a Method Request Dispatch
+  static TAO_Notify_Method_Request_Lookup_Queueable * unmarshal (
+    TAO_Notify::Delivery_Request_Ptr & delivery_request,
+    TAO_Notify_EventChannelFactory &ecf,
+    TAO_InputCDR & cdr
+    ACE_ENV_ARG_DECL);
+
+protected:
   /// Constuctor
-  TAO_Notify_Method_Request_Lookup (const TAO_Notify_Event_var& event, TAO_Notify_ProxyConsumer* proxy_consumer);
+  TAO_Notify_Method_Request_Lookup (const TAO_Notify_Event * event, TAO_Notify_ProxyConsumer * proxy);
+
+  /// Execute the dispatch operation.
+  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+
+  ///= TAO_ESF_Worker method
+  virtual void work (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+
+protected:
+
+  /// The Proxy
+  TAO_Notify_ProxyConsumer* proxy_consumer_;
+};
+
+/***************************************************************/
+
+/**
+ * @class TAO_Notify_Method_Request_Lookup_Queueable
+ *
+ * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier.
+ *
+ */
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_Queueable
+  : public TAO_Notify_Method_Request_Lookup
+  , public TAO_Notify_Method_Request_Queueable
+{
+public:
+  /// Constuctor from event
+  TAO_Notify_Method_Request_Lookup_Queueable (
+    const TAO_Notify_Event_var& event,
+    TAO_Notify_ProxyConsumer * proxy_consumer);
+
+  /// Constuctor from delivery request
+  TAO_Notify_Method_Request_Lookup_Queueable (
+    TAO_Notify::Delivery_Request_Ptr & request,
+    TAO_Notify_ProxyConsumer * proxy_consumer);
 
   /// Destructor
-  ~TAO_Notify_Method_Request_Lookup ();
+  ~TAO_Notify_Method_Request_Lookup_Queueable ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+
+private:
+  const TAO_Notify_Event_var event_var_;
+  TAO_Notify_ProxyConsumer_Guard proxy_guard_;
 };
 
 /*****************************************************************************************************************************/
 
-typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event*
-                                       , TAO_Notify_ProxyConsumer*
-                                       , const TAO_Notify_Event*
-                                       , TAO_Notify_ProxyConsumer*>  TAO_Notify_Method_Request_Lookup_No_Copy_Base;
-
 /**
  * @class TAO_Notify_Method_Request_Lookup_No_Copy
  *
  * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_No_Copy : public TAO_Notify_Method_Request_Lookup_No_Copy_Base
-                                                               , public TAO_Notify_Method_Request_No_Copy
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_No_Copy
+  : public TAO_Notify_Method_Request_Lookup
+  , public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
-  TAO_Notify_Method_Request_Lookup_No_Copy (const TAO_Notify_Event* event, TAO_Notify_ProxyConsumer* proxy_consumer);
+  TAO_Notify_Method_Request_Lookup_No_Copy (
+    const TAO_Notify_Event* event,
+    TAO_Notify_ProxyConsumer* proxy_consumer);
 
   /// Destructor
   ~TAO_Notify_Method_Request_Lookup_No_Copy ();
@@ -79,12 +129,8 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Lookup.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_LOOKUP_METHOD_REQUEST_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp
deleted file mode 100644
index 9492aba6155..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-#ifndef TAO_Notify_Method_Request_Lookup_T_CPP
-#define TAO_Notify_Method_Request_Lookup_T_CPP
-
-#include "Method_Request_Lookup_T.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Lookup_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Notify, TAO_Notify_Method_Request_Lookup_T, "$Id$")
-
-template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-TAO_Notify_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::TAO_Notify_Method_Request_Lookup_T (EVENT_PARAM event, PROXY_PARAM proxy_consumer)
-  :event_ (event), proxy_consumer_ (proxy_consumer)
-{
-}
-
-template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-TAO_Notify_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::~TAO_Notify_Method_Request_Lookup_T ()
-{
-}
-
-
-template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> void
-TAO_Notify_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::work (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
-{
-  proxy_supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
-}
-
-#endif /* TAO_Notify_Method_Request_Lookup_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
deleted file mode 100644
index f9f830b5d3e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- C++ -*- */
-/**
- *  @file Method_Request_Lookup_T.h
- *
- *  $Id$
- *
- *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
- */
-
-#ifndef TAO_Notify_METHOD_REQUEST_LOOKUP_T_H
-#define TAO_Notify_METHOD_REQUEST_LOOKUP_T_H
-#include /**/ "ace/pre.h"
-
-#include "notify_serv_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbsvcs/ESF/ESF_Worker.h"
-#include "ProxySupplier.h"
-
-/**
- * @class TAO_Notify_Method_Request_Lookup_T
- *
- * @brief
- *
- */
-template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
-{
-public:
-  /// Constuctor
-  TAO_Notify_Method_Request_Lookup_T (EVENT_PARAM event, PROXY_PARAM proxy);
-
-  /// Destructor
-  virtual ~TAO_Notify_Method_Request_Lookup_T ();
-
-  /// Execute the dispatch operation.
-  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
-
-protected:
-  ///= TAO_ESF_Worker method
-  virtual void work (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
-
-  /// The Event
-  EVENT event_;
-
-  /// The Proxy
-  PROXY proxy_consumer_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Lookup_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Method_Request_Lookup_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Method_Request_Lookup_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_Notify_METHOD_REQUEST_LOOKUP_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl
deleted file mode 100644
index 4367a6ca8e8..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-#include "tao/debug.h"
-#include "Event_Manager.h"
-
-template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> ACE_INLINE int
-TAO_Notify_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->proxy_consumer_->has_shutdown ())
-    return 0; // If we were shutdown while waiting in the queue, return with no action.
-
-  TAO_Notify_Admin* parent = this->proxy_consumer_->supplier_admin ();
-
-  CORBA::Boolean val =  this->proxy_consumer_->check_filters (this->event_,
-                                                             parent->filter_admin (),
-                                                             parent->filter_operator ()
-                                                             ACE_ENV_ARG_PARAMETER);
-
-  if (TAO_debug_level > 1)
-    ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val));
-
-  // Filter failed - do nothing.
-  if (val == 0)
-    return 0;
-
-  // The map of subscriptions.
-  TAO_Notify_Consumer_Map* map = this->proxy_consumer_->event_manager ()->consumer_map ();
-
-  TAO_Notify_Consumer_Map::ENTRY* entry = map->find (this->event_->type () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  TAO_Notify_ProxySupplier_Collection* consumers = 0;
-
-  if (entry != 0)
-  {
-    consumers = entry->collection ();
-
-    if (consumers != 0)
-      consumers->for_each (this ACE_ENV_ARG_PARAMETER);
-
-    map->release (entry);
-  }
-
-  // Get the default consumers
-  consumers = map->broadcast_collection ();
-
-  if (consumers != 0)
-    consumers->for_each (this ACE_ENV_ARG_PARAMETER);
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index f0d82aee866..69e6d0aa1ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -3,10 +3,6 @@
 #include "Method_Request_Shutdown.h"
 #include "ThreadPool_Task.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Shutdown.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Shutdown, "$Id$")
 
 TAO_Notify_Method_Request_Shutdown::TAO_Notify_Method_Request_Shutdown (TAO_Notify_ThreadPool_Task* task)
@@ -18,7 +14,7 @@ TAO_Notify_Method_Request_Shutdown::~TAO_Notify_Method_Request_Shutdown ()
 {
 }
 
-TAO_Notify_Method_Request*
+TAO_Notify_Method_Request_Queueable*
 TAO_Notify_Method_Request_Shutdown::copy (void)
 {
   return new TAO_Notify_Method_Request_Shutdown (this->task_);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
index 2491f9c2862..0b8259583e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -29,7 +29,7 @@ class TAO_Notify_ThreadPool_Task;
  * @brief Shutdown message for the ThreadPool_Task
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request
+class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request_Queueable
 {
 public:
   /// Constuctor
@@ -39,7 +39,7 @@ public:
   ~TAO_Notify_Method_Request_Shutdown ();
 
   /// Create a copy of this object.
-  TAO_Notify_Method_Request* copy (void);
+  TAO_Notify_Method_Request_Queueable* copy (void);
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
@@ -49,9 +49,5 @@ private:
   TAO_Notify_ThreadPool_Task* task_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Shutdown.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_METHOD_REQUEST_SHUTDOWN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index 231af05e8d2..bf2c0f0d23d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -2,10 +2,6 @@
 
 #include "Method_Request_Updates.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Method_Request_Updates.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates, "$Id$")
 
 #include "tao/debug.h"
@@ -39,10 +35,10 @@ TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No
 {
 }
 
-TAO_Notify_Method_Request*
+TAO_Notify_Method_Request_Queueable*
 TAO_Notify_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Notify_Method_Request* request;
+  TAO_Notify_Method_Request_Queueable* request;
 
   ACE_NEW_THROW_EX (request,
                     TAO_Notify_Method_Request_Updates (this->added_, this->removed_, this->proxy_),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index 25943a091de..05ac8f470e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -37,7 +37,7 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq
  *
  */
 class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base
-                                                        ,public TAO_Notify_Method_Request
+                                                        ,public TAO_Notify_Method_Request_Queueable
 {
 public:
   /// Constuctor
@@ -65,7 +65,7 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq&
  *
  */
 class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base
-                                                                ,public TAO_Notify_Method_Request_No_Copy
+                                                                ,public TAO_Notify_Method_Request
 {
 public:
   /// Constuctor
@@ -75,15 +75,11 @@ public:
   ~TAO_Notify_Method_Request_Updates_No_Copy ();
 
   /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-#include "Method_Request_Updates.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_METHOD_REQUEST_UPDATES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.inl
deleted file mode 100644
index bf5cc3848c2..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "Method_Request_Updates.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 55fe28b9c8b..16b3f160ed2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -55,9 +55,7 @@ TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void)
 }
 
 int
-TAO_Notify_Constraint_Visitor::bind_structured_event (
-    const CosNotification::StructuredEvent &s_event
-  )
+TAO_Notify_Constraint_Visitor::bind_structured_event (const CosNotification::StructuredEvent &s_event)
 {
   // The two sequences contained in a structured event are
   // copied into hash tables so iteration is done only once.
@@ -71,15 +69,12 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (
 
       int status =
         this->filterable_data_.bind (
-            name_str,
-            ACE_const_cast (CORBA::Any *,
-                            &s_event.filterable_data[index].value)
-          );
+                                     name_str,
+                                     const_cast<CORBA::Any *> (&s_event.filterable_data[index].value)
+                                     );
 
       if (status != 0)
-        {
-          return -1;
-        }
+        return -1;
     }
 
   length = s_event.header.variable_header.length ();
@@ -90,15 +85,12 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (
 
       int status =
         this->variable_header_.bind (
-            name_str,
-            ACE_const_cast (CORBA::Any *,
-                            &s_event.header.variable_header[index].value)
-          );
+                                     name_str,
+                                     const_cast<CORBA::Any *> (&s_event.header.variable_header[index].value)
+                                     );
 
       if (status != 0)
-        {
-          return -1;
-        }
+        return -1;
     }
 
   this->domain_name_ =
@@ -213,7 +205,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
           CORBA::TypeCode_var tc = this->current_value_->type ();
 
           switch (disc_val.expr_type ())
-          {
+            {
             case TAO_ETCL_INTEGER:
             case TAO_ETCL_SIGNED:
             case TAO_ETCL_UNSIGNED:
@@ -228,7 +220,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
                 ACE_TRY_CHECK;
 
                 switch (disc_kind)
-                {
+                  {
                   case CORBA::tk_boolean:
                     disc_any <<= CORBA::Any::from_boolean ((CORBA::Boolean) disc_val);
                     break;
@@ -248,14 +240,11 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
                     {
                       TAO_OutputCDR cdr;
                       cdr.write_ulong ((CORBA::ULong) disc_val);
-
+                      TAO_InputCDR in_cdr (cdr);
                       TAO::Unknown_IDL_Type *unk = 0;
                       ACE_NEW_RETURN (unk,
-                                      TAO::Unknown_IDL_Type (
-                                          disc_tc.in (),
-                                          cdr.begin (),
-                                          TAO_ENCAP_BYTE_ORDER
-                                        ),
+                                      TAO::Unknown_IDL_Type (disc_tc.in (),
+                                                             in_cdr),
                                       -1);
 
                       disc_any.replace (unk);
@@ -271,7 +260,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
                   case CORBA::tk_wchar:
                   default:
                     return -1;
-                }
+                  }
 
                 DynamicAny::DynAny_var dyn_any =
                   TAO_DynAnyFactory::make_dyn_any (disc_any
@@ -306,16 +295,14 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
                     ACE_TRY_CHECK;
 
                     if (ACE_OS::strcmp (name, member_name) == 0)
-                      {
-                        break;
-                      }
+                      break;
                   }
 
                 // If there's no match, member_label will throw
                 // CORBA::TypeCode::Bounds and the catch block will
                 // return -1;
                 this->current_value_ = tc->member_label (i
-                                                          ACE_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
                 break;
@@ -324,7 +311,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
             // shouldn't have any other type.
             default:
               return -1;
-          }
+            }
 
           TAO_ETCL_Constraint *nested = union_pos->component ();
 
@@ -334,19 +321,15 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
           // the nested component.
           if (nested == 0)
             {
-              TAO_ETCL_Literal_Constraint lit (this->current_value_);
+              TAO_ETCL_Literal_Constraint lit (this->current_value_.ptr ());
               this->queue_.enqueue_head (lit);
               return 0;
             }
           else
-            {
-              return nested->accept (this);
-            }
+            return nested->accept (this);
         }
       else
-        {
-          return -1;
-        }
+        return -1;
     }
   ACE_CATCHANY
     {
@@ -390,9 +373,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
             ACE_TRY_CHECK;
 
             if (success == 0)
-              {
-                return -1;
-              }
+              return -1;
 
             member =
               dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -412,18 +393,17 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
             ACE_TRY_CHECK;
 
             if (success == 0)
-              {
-                return -1;
-              }
+              return -1;
 
             member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             break;
           }
-        // @@@ (JP) I think enums and structs are the only two cases handled
-        // by Component_Pos, since arrays and sequences are handled by
-        // Component_Array, and unions are handled by Union_Pos.
+        // @@@ (JP) I think enums and structs are the only two cases
+        // handled by Component_Pos, since arrays and sequences are
+        // handled by Component_Array, and unions are handled by
+        // Union_Pos.
         default:
           return -1;
       }
@@ -435,7 +415,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
 
       if (comp == 0)
         {
-          TAO_ETCL_Literal_Constraint result (value);
+          TAO_ETCL_Literal_Constraint result (value.ptr ());
           this->queue_.enqueue_head (result);
           return 0;
         }
@@ -469,21 +449,15 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc (
     case FILTERABLE_DATA:
       if (this->filterable_data_.find (name, any) != 0
           || any == 0)
-        {
-          return -1;
-        }
-
+        return -1;
       break;
     case VARIABLE_HEADER:
       if (this->variable_header_.find (name, any) != 0
           || any == 0)
-        {
-          return -1;
-        }
-
+        return -1;
       break;
-    // Only the sequence members of CosNotification::StructuredEvent can be
-    // treated as associative arrays.
+    // Only the sequence members of CosNotification::StructuredEvent
+    // can be treated as associative arrays.
     default:
       return -1;
   }
@@ -506,26 +480,23 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc (
 
       return 0;
     }
-  else
-    {
-      ACE_NEW_RETURN (any_ptr,
-                      CORBA::Any (*any),
-                      -1);
-      this->current_value_ = any_ptr;
-      return comp->accept (this);
-    }
+
+  ACE_NEW_RETURN (any_ptr,
+                  CORBA::Any (*any),
+                  -1);
+  this->current_value_ = any_ptr;
+  return comp->accept (this);
 }
 
 int
-TAO_Notify_Constraint_Visitor::visit_component_array (
-    TAO_ETCL_Component_Array *array
-  )
+TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *array)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // If we are here (from visit_component) the Any containing the
-      // component as found in filterable_data_ will be in current_value_.
+      // component as found in filterable_data_ will be in
+      // current_value_.
       CORBA::TypeCode_var tc = this->current_value_->type ();
       CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
                                                        ACE_ENV_ARG_PARAMETER);
@@ -549,9 +520,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
             ACE_TRY_CHECK;
 
             if (success == 0)
-              {
-                return -1;
-              }
+              return -1;
 
             member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
@@ -570,9 +539,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
             ACE_TRY_CHECK;
 
             if (success == 0)
-              {
-                return -1;
-              }
+              return -1;
 
             member =
               dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -593,7 +560,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
 
       if (comp == 0)
         {
-          TAO_ETCL_Literal_Constraint result (value);
+          TAO_ETCL_Literal_Constraint result (value.ptr ());
           this->queue_.enqueue_head (result);
           return 0;
         }
@@ -619,16 +586,39 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
   ACE_TRY
     {
       CORBA::TypeCode_var tc = this->current_value_->type ();
+      tc = TAO_DynAnyFactory::strip_alias (tc.in () ACE_ENV_ARG_PARAMETER);
 
       switch (special->type ())
-      {
+        {
         case TAO_ETCL_LENGTH:
           {
-            // If the TCKind is not a sequence or an array, the
-            // call to length() will raise an exception, and the
-            // catch block will return -1;
-            CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            CORBA::ULong length;
+
+            switch (tc->kind ())
+              {
+              case CORBA::tk_sequence:
+                {
+                  TAO_DynSequence_i dyn_seq;
+                  dyn_seq.init (current_value_.in()
+                                ACE_ENV_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+
+                  DynamicAny::AnySeq_var any_seq =
+                    dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+
+                  length = any_seq->length ();
+                }
+              break;
+              case CORBA::tk_array:
+                {
+                  length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                }
+              break;
+              default:
+                return -1;
+              }
 
             TAO_ETCL_Literal_Constraint lit (length);
             this->queue_.enqueue_head (lit);
@@ -636,9 +626,8 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
           }
         case TAO_ETCL_DISCRIMINANT:
           {
-            // If the TCKind is not a union, the
-            // call to init() will raise an exception, and the
-            // catch block will return -1;
+            // If the TCKind is not a union, the call to init() will
+            // raise an exception, and the catch block will return -1;
             TAO_DynUnion_i dyn_union;
             dyn_union.init (this->current_value_.in ()
                             ACE_ENV_ARG_PARAMETER);
@@ -651,7 +640,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
             CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
-            TAO_ETCL_Literal_Constraint lit (disc_any);
+            TAO_ETCL_Literal_Constraint lit (disc_any.ptr ());
             this->queue_.enqueue_head (lit);
             return 0;
           }
@@ -675,7 +664,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
           }
         default:
           return -1;
-      }
+        }
     }
   ACE_CATCHANY
     {
@@ -699,19 +688,16 @@ TAO_Notify_Constraint_Visitor::visit_component (
   CORBA::Any *any_ptr = 0;
 
   if (this->implicit_ids_.find (component_name, this->implicit_id_) != 0)
-    {
-      this->implicit_id_ = TAO_Notify_Constraint_Visitor::EMPTY;
-    }
-
-  // If this component has no sub-component, only an identifier,
-  // then we just visit the identifier, which puts a literal on
-  // the queue to be handled upon returning from this method call.
-  // If there is a sub-component, we store the literal's value
-  // in our member _var for possible examination at a more
-  // nested level, and visit the sub-component. If the identifier
-  // matches one of the nested field names in
-  // CosNotification::StructuredEvent, we just visit the nested
-  // component, if any.
+    this->implicit_id_ = TAO_Notify_Constraint_Visitor::EMPTY;
+
+  // If this component has no sub-component, only an identifier, then
+  // we just visit the identifier, which puts a literal on the queue
+  // to be handled upon returning from this method call.  If there is
+  // a sub-component, we store the literal's value in our member _var
+  // for possible examination at a more nested level, and visit the
+  // sub-component. If the identifier matches one of the nested field
+  // names in CosNotification::StructuredEvent, we just visit the
+  // nested component, if any.
   if (this->implicit_id_ == TAO_Notify_Constraint_Visitor::EMPTY)
     {
       if (nested == 0)
@@ -730,9 +716,7 @@ TAO_Notify_Constraint_Visitor::visit_component (
           int result = identifier->accept (this);
 
           if (result != 0)
-            {
-              return result;
-            }
+            return result;
 
           TAO_ETCL_Literal_Constraint id;
           this->queue_.dequeue_head (id);
@@ -744,13 +728,11 @@ TAO_Notify_Constraint_Visitor::visit_component (
     }
 
   if (nested != 0)
-    {
-      return nested->accept (this);
-    }
+    return nested->accept (this);
   else
     {
       switch (this->implicit_id_)
-      {
+        {
         case TYPE_NAME:
           {
             TAO_ETCL_Literal_Constraint tn (this->type_name_.in ());
@@ -780,7 +762,7 @@ TAO_Notify_Constraint_Visitor::visit_component (
         // should have a nested component. otherwise, it's an error.
         default:
           return -1;
-      }
+        }
     }
 }
 
@@ -806,22 +788,18 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
   TAO_ETCL_Constraint *comp = def->component ();
 
   if (comp == 0)
-    {
-      return -1;
-    }
+    return -1;
 
   if (comp->accept (this) != 0)
-    {
-      return -1;
-    }
+    return -1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::TypeCode_var tc = this->current_value_->type ();
 
-      // If the current member is not a union, this call will
-      // throw BadKind and the catch block will return -1.
+      // If the current member is not a union, this call will throw
+      // BadKind and the catch block will return -1.
       CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -860,15 +838,13 @@ TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist)
       CORBA::Boolean result = 0;
 
       // For the two cases below, we don't want the item at the top of
-      // the queue, because it's the result of a hash table lookup. For
-      // an existence test, we want the key value, which is stored in
-      // the current_value_ member.
+      // the queue, because it's the result of a hash table
+      // lookup. For an existence test, we want the key value, which
+      // is stored in the current_value_ member.
       if (this->implicit_id_ == FILTERABLE_DATA
           || this->implicit_id_ == VARIABLE_HEADER)
         {
-          TAO_ETCL_Literal_Constraint current (
-                                          &this->current_value_.inout ()
-                                        );
+          TAO_ETCL_Literal_Constraint current (&this->current_value_.inout ());
           value = CORBA::string_dup ((const char *) current);
         }
 
@@ -1008,23 +984,17 @@ TAO_Notify_Constraint_Visitor::visit_or (
             }
         }
       else
-        {
-          return_value = 0;
-        }
+        return_value = 0;
     }
 
   if (return_value == 0)
-    {
-      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-    }
+    this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
 
   return return_value;
 }
 
 int
-TAO_Notify_Constraint_Visitor::visit_and (
-    TAO_ETCL_Binary_Expr *binary
-  )
+TAO_Notify_Constraint_Visitor::visit_and (TAO_ETCL_Binary_Expr *binary)
 {
   int return_value = -1;
   CORBA::Boolean result = 0;
@@ -1050,24 +1020,18 @@ TAO_Notify_Constraint_Visitor::visit_and (
             }
         }
       else
-        {
-          return_value = 0;
-        }
+        return_value = 0;
     }
 
   if (return_value == 0)
-    {
-      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-    }
+    this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
 
   return return_value;
 }
 
 int
-TAO_Notify_Constraint_Visitor::visit_binary_op (
-    TAO_ETCL_Binary_Expr *binary,
-    int op_type
-  )
+TAO_Notify_Constraint_Visitor::visit_binary_op (TAO_ETCL_Binary_Expr *binary,
+                                                int op_type)
 {
   int return_value = -1;
   TAO_ETCL_Constraint *lhs = binary->lhs ();
@@ -1135,9 +1099,7 @@ TAO_Notify_Constraint_Visitor::visit_binary_op (
 }
 
 int
-TAO_Notify_Constraint_Visitor::visit_twiddle (
-    TAO_ETCL_Binary_Expr *binary
-  )
+TAO_Notify_Constraint_Visitor::visit_twiddle (TAO_ETCL_Binary_Expr *binary)
 {
   int return_value = -1;
   TAO_ETCL_Constraint *lhs = binary->lhs ();
@@ -1165,15 +1127,12 @@ TAO_Notify_Constraint_Visitor::visit_twiddle (
 }
 
 int
-TAO_Notify_Constraint_Visitor::visit_in (
-    TAO_ETCL_Binary_Expr *binary
-  )
+TAO_Notify_Constraint_Visitor::visit_in (TAO_ETCL_Binary_Expr *binary)
 {
   int return_value = -1;
   TAO_ETCL_Constraint *lhs = binary->lhs ();
 
   // Determine if the left operand is contained in the right.
-
   if (lhs->accept (this) == 0)
     {
       TAO_ETCL_Literal_Constraint left;
@@ -1208,7 +1167,7 @@ TAO_Notify_Constraint_Visitor::visit_in (
               CORBA::Boolean result = 0;
 
               switch (kind)
-              {
+                {
                 case CORBA::tk_sequence:
                   result = this->sequence_does_contain (component,
                                                         left);
@@ -1231,7 +1190,7 @@ TAO_Notify_Constraint_Visitor::visit_in (
                   break;
                 default:
                   return return_value;
-              }
+                }
 
               this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
               return_value = 0;
@@ -1243,9 +1202,7 @@ TAO_Notify_Constraint_Visitor::visit_in (
 }
 
 int
-TAO_Notify_Constraint_Visitor::visit_preference (
-    TAO_ETCL_Preference *
-  )
+TAO_Notify_Constraint_Visitor::visit_preference (TAO_ETCL_Preference *)
 {
   // According to OMG 00-06-20 section 2.4.1, the Notification Service
   // does not use the preference operators. The method must be here
@@ -1255,17 +1212,19 @@ TAO_Notify_Constraint_Visitor::visit_preference (
 }
 
 CORBA::Boolean
-TAO_Notify_Constraint_Visitor::sequence_does_contain (
-    const CORBA::Any *any,
-    TAO_ETCL_Literal_Constraint &item
-  )
+TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
+                                                      TAO_ETCL_Literal_Constraint &item)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::TypeCode_var type = any->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+      CORBA::TypeCode_var base_type =
+        TAO_DynAnyFactory::strip_alias (type.in () ACE_ENV_ARG_PARAMETER);
+      CORBA::TypeCode_var content_type =
+        base_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind kind =
+        TAO_DynAnyFactory::unalias (content_type.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The literal and the array elements must be
@@ -1274,9 +1233,7 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (
                                                       kind);
 
       if (match == 0)
-        {
-          return 0;
-        }
+        return 0;
 
       TAO_DynSequence_i dyn_seq;
       dyn_seq.init (*any
@@ -1294,9 +1251,7 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (
           TAO_ETCL_Literal_Constraint element (&any_seq[i]);
 
           if (item == element)
-            {
-              return 1;
-            }
+            return 1;
         }
     }
   ACE_CATCHANY
@@ -1309,10 +1264,8 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (
 }
 
 CORBA::Boolean
-TAO_Notify_Constraint_Visitor::array_does_contain (
-    const CORBA::Any *any,
-    TAO_ETCL_Literal_Constraint &item
-  )
+TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
+                                                   TAO_ETCL_Literal_Constraint &item)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -1328,9 +1281,7 @@ TAO_Notify_Constraint_Visitor::array_does_contain (
                                                       kind);
 
       if (match == 0)
-        {
-          return 0;
-        }
+        return 0;
 
       TAO_DynArray_i dyn_array;
       dyn_array.init (*any
@@ -1348,9 +1299,7 @@ TAO_Notify_Constraint_Visitor::array_does_contain (
           TAO_ETCL_Literal_Constraint element (&any_seq[i]);
 
           if (item == element)
-            {
-              return 1;
-            }
+            return 1;
         }
     }
   ACE_CATCHANY
@@ -1363,10 +1312,8 @@ TAO_Notify_Constraint_Visitor::array_does_contain (
 }
 
 CORBA::Boolean
-TAO_Notify_Constraint_Visitor::struct_does_contain (
-    const CORBA::Any *any,
-    TAO_ETCL_Literal_Constraint &item
-  )
+TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
+                                                    TAO_ETCL_Literal_Constraint &item)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -1397,16 +1344,12 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (
                                                           kind);
 
           if (match == 0)
-            {
-              continue;
-            }
+            continue;
 
           TAO_ETCL_Literal_Constraint element (&members[i].value);
 
           if (item == element)
-            {
-              return 1;
-            }
+            return 1;
         }
     }
   ACE_CATCHANY
@@ -1419,10 +1362,8 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (
 }
 
 CORBA::Boolean
-TAO_Notify_Constraint_Visitor::union_does_contain (
-    const CORBA::Any *any,
-    TAO_ETCL_Literal_Constraint &item
-  )
+TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any,
+                                                   TAO_ETCL_Literal_Constraint &item)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -1450,9 +1391,7 @@ TAO_Notify_Constraint_Visitor::union_does_contain (
                                                       kind);
 
       if (match == 0)
-        {
-          return 0;
-        }
+        return 0;
 
       TAO_ETCL_Literal_Constraint element (&member.inout ());
 
@@ -1477,10 +1416,8 @@ TAO_Notify_Constraint_Visitor::any_does_contain (
 
   *any >>= result;
 
-  TAO_ETCL_Literal_Constraint element (ACE_const_cast (CORBA::Any *,
-                                                       result));
-
-  return (item == element);
+  TAO_ETCL_Literal_Constraint element (const_cast<CORBA::Any *> (result));
+  return item == element;
 }
 
 CORBA::Boolean
@@ -1491,38 +1428,34 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type,
   {
     case TAO_ETCL_STRING:
       if (tc_kind != CORBA::tk_string)
-        {
-          return 0;
-        }
+        return 0;
+      break;
     case TAO_ETCL_DOUBLE:
       if (tc_kind != CORBA::tk_double
           && tc_kind != CORBA::tk_float)
-        {
-          return 0;
-        }
+        return 0;
+      break;
     case TAO_ETCL_INTEGER:
     case TAO_ETCL_SIGNED:
       if (tc_kind != CORBA::tk_short
           && tc_kind != CORBA::tk_long
           && tc_kind != CORBA::tk_longlong)
-        {
-          return 0;
-        }
+        return 0;
+      break;
     case TAO_ETCL_UNSIGNED:
       if (tc_kind != CORBA::tk_ushort
           && tc_kind != CORBA::tk_ulong
           && tc_kind != CORBA::tk_ulonglong)
-        {
-          return 0;
-        }
+        return 0;
+      break;
     case TAO_ETCL_BOOLEAN:
       if (tc_kind != CORBA::tk_boolean)
-        {
-          return 0;
-        }
+        return 0;
+      break;
     default:
       return 0;
   }
+  return 1;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index 49c9b9b07a1..33e2bc9f7f0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -15,6 +15,8 @@
 
 ACE_RCSID(Notify, TAO_Notify_Object, "$Id$")
 
+
+
 TAO_Notify_Object::TAO_Notify_Object (void)
   : event_manager_ (0)
   , admin_properties_ (0)
@@ -42,7 +44,7 @@ TAO_Notify_Object::~TAO_Notify_Object ()
 }
 
 void
-TAO_Notify_Object::init (TAO_Notify_Object* parent)
+TAO_Notify_Object::initialize (TAO_Notify_Object* parent)
 {
   this->event_manager_ = parent->event_manager_;
   this->admin_properties_ = parent->admin_properties_;
@@ -66,6 +68,18 @@ TAO_Notify_Object::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
   return this->poa_->activate (servant, this->id_ ACE_ENV_ARG_PARAMETER);
 }
 
+/// Activate with existing id
+CORBA::Object_ptr
+TAO_Notify_Object::activate (
+    PortableServer::Servant servant,
+    CORBA::Long id
+    ACE_ENV_ARG_DECL)
+{
+  this->id_ = id;
+  return this->poa_->activate_with_id (servant, this->id_ ACE_ENV_ARG_PARAMETER);
+}
+
+
 void
 TAO_Notify_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
@@ -77,10 +91,10 @@ TAO_Notify_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CATCHANY
     {
       if (TAO_debug_level > 2)
-	{
-	  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t)\n");
-	  ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_));
-	}
+  {
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t)\n");
+    ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_));
+  }
       // Do not propagate any exceptions
     }
   ACE_ENDTRY;
@@ -133,7 +147,7 @@ TAO_Notify_Object::shutdown_proxy_poa (void)
         {
           this->proxy_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           delete this->proxy_poa_;
         }
       ACE_CATCHANY
@@ -268,6 +282,15 @@ TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   return properties._retn ();
 }
 
+bool
+TAO_Notify_Object::find_qos_property_value (
+  const char * name,
+  CosNotification::PropertyValue & value) const
+{
+  return this->qos_properties_.find (name, value);
+}
+
+
 void
 TAO_Notify_Object::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties*/)
 {
@@ -279,3 +302,60 @@ TAO_Notify_Object::timer (void)
 {
   return this->worker_task_->timer ();
 }
+
+namespace {
+  template<class T>
+    void add_qos_attr(TAO_Notify::NVPList& attrs, const T& prop) {
+      if (prop.is_valid())
+      {
+        attrs.push_back(TAO_Notify::NVP (prop));
+      }
+    }
+// Note : These instantiations have to be here because each namespace {}
+// is unique.
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template void add_qos_attr<TAO_Notify_Property_Boolean>(
+  TAO_Notify::NVPList&, const TAO_Notify_Property_Boolean&);
+template void add_qos_attr<TAO_Notify_Property_T<int> >(
+  TAO_Notify::NVPList&, const TAO_Notify_Property_T<int>&);
+template void add_qos_attr<TAO_Notify_Property_T<unsigned long long> >(
+  TAO_Notify::NVPList&, const TAO_Notify_Property_T<unsigned long long>&);
+template void add_qos_attr<TAO_Notify_Property_T<short> >(
+  TAO_Notify::NVPList&, const TAO_Notify_Property_T<short>&);
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate void add_qos_attr<TAO_Notify_Property_Boolean>(\
+  TAO_Notify::NVPList&, const TAO_Notify_Property_Boolean&)
+#pragma instantiate void add_qos_attr<TAO_Notify_Property_T<int> >(\
+  TAO_Notify::NVPList&, const TAO_Notify_Property_T<int>&)
+#pragma instantiate void add_qos_attr<TAO_Notify_Property_T<unsigned long long> >(\
+  TAO_Notify::NVPList&, const TAO_Notify_Property_T<unsigned long long>&)
+#pragma instantiate void add_qos_attr<TAO_Notify_Property_T<short> >(\
+  TAO_Notify::NVPList&, const TAO_Notify_Property_T<short>&)
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+} // namespace
+
+void
+TAO_Notify_Object::save_attrs (TAO_Notify::NVPList& attrs)
+{
+  add_qos_attr(attrs, this->qos_properties_.event_reliability ());
+  add_qos_attr(attrs, this->qos_properties_.connection_reliability ());
+  add_qos_attr(attrs, this->qos_properties_.priority ());
+  add_qos_attr(attrs, this->qos_properties_.timeout ());
+  add_qos_attr(attrs, this->qos_properties_.stop_time_supported ());
+  add_qos_attr(attrs, this->qos_properties_.maximum_batch_size ());
+  add_qos_attr(attrs, this->qos_properties_.pacing_interval ());
+}
+
+void
+TAO_Notify_Object::load_attrs(const TAO_Notify::NVPList& attrs)
+{
+  attrs.load (this->qos_properties_.event_reliability ());
+  attrs.load (this->qos_properties_.connection_reliability ());
+  attrs.load (this->qos_properties_.priority ());
+  attrs.load (this->qos_properties_.timeout ());
+  attrs.load (this->qos_properties_.stop_time_supported ());
+  attrs.load (this->qos_properties_.maximum_batch_size ());
+  attrs.load (this->qos_properties_.pacing_interval ());
+  this->qos_properties_.init ();
+}
+
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index cf1f1044fac..43bea7ac4d5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -27,6 +27,7 @@
 #include "QoSProperties.h"
 #include "AdminProperties.h"
 #include "Refcountable.h"
+#include "Name_Value_Pair.h"
 
 class TAO_Notify_POA_Helper;
 class TAO_Notify_Worker_Task;
@@ -54,11 +55,17 @@ public:
   virtual ~TAO_Notify_Object (void);
 
   /// This Object's ID
-  ID id (void);
+  ID id (void) const;
 
   /// Activate
   virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
 
+  /// Activate with existing id
+  virtual CORBA::Object_ptr activate (
+      PortableServer::Servant servant,
+      CORBA::Long id
+      ACE_ENV_ARG_DECL);
+
   /// Deactivate
   void deactivate (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -98,6 +105,10 @@ public:
   /// Get the QoS Properties.
   CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL);
 
+  bool find_qos_property_value (
+    const char * name,
+    CosNotification::PropertyValue & value)const;
+
   /// Obtain the Timer manager associated with this object.
   virtual TAO_Notify_Timer* timer (void);
 
@@ -107,9 +118,13 @@ public:
   /// Accessor for the Event Manager
   TAO_Notify_Event_Manager* event_manager (void);
 
+  /// Load our attributes. Each derived type should call the superclass
+  /// load first before loading its own attributes.
+  virtual void load_attrs(const TAO_Notify::NVPList& attrs);
+
 protected:
   /// Init this object with data from <rhs>.
-  void init (TAO_Notify_Object* parent);
+  void initialize (TAO_Notify_Object* parent);
 
   /// Shutdown the current worker task and delete it if we own it.
   void shutdown_worker_task (void);
@@ -123,6 +138,11 @@ protected:
   /// Notification that can be overridden by subclasses to be informed that <qos_properties_> have been modified.
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
+  /// Called by derived types to save their attributes. Each
+  /// derived type should call its superclass version before
+  /// saving its own attrs.
+  virtual void save_attrs(TAO_Notify::NVPList& attrs);
+
   ///= Protected data members.
 
   /// The event manager.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
index 9ba8797906a..3a20131bbec 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
@@ -1,7 +1,7 @@
 // $Id$
 
 ACE_INLINE CORBA::Long
-TAO_Notify_Object::id (void)
+TAO_Notify_Object::id (void) const
 {
   return id_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index fd0182a8dfc..6315d38f3e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -9,7 +9,10 @@
 ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$")
 
 #include "tao/debug.h"
-#include "ID_Factory.h"
+//#define DEBUG_LEVEL 10
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif // DEBUG_LEVEL
 
 TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void)
 {
@@ -81,7 +84,7 @@ TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char*
                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (TAO_debug_level > 0)
+  if (DEBUG_LEVEL > 0)
     ACE_DEBUG ((LM_DEBUG, "Created POA : %s\n", this->poa_->the_name ()));
   /*
   // Destroy the policies
@@ -125,13 +128,10 @@ TAO_Notify_POA_Helper::long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const
 CORBA::Object_ptr
 TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL)
 {
-  /// ID Factory for objects.
-  static TAO_Notify_ID_Factory id_factory;
-
   // Generate a new ID.
-  id = id_factory.id ();
+  id = this->id_factory_.id ();
 
-  if (TAO_debug_level > 0)
+  if (DEBUG_LEVEL > 0)
     ACE_DEBUG ((LM_DEBUG, "Activating object with id = %d in  POA : %s\n", id, this->poa_->the_name ()));
 
   // Convert CORBA::Long to ObjectId
@@ -148,6 +148,27 @@ TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& i
                                 ACE_ENV_ARG_PARAMETER);
 }
 
+CORBA::Object_ptr
+TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL)
+{
+  if (DEBUG_LEVEL > 0)
+    ACE_DEBUG ((LM_DEBUG, "Activating object with existing id = %d in  POA : %s\n", id, this->poa_->the_name ()));
+  this->id_factory_.set_last_used (id);
+
+  // Convert CORBA::Long to ObjectId
+  PortableServer::ObjectId_var oid =
+    this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+  poa_->activate_object_with_id (oid.in (),
+                                 servant
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+  return poa_->id_to_reference (oid.in ()
+                                ACE_ENV_ARG_PARAMETER);
+}
+
 void
 TAO_Notify_POA_Helper::deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const
 {
@@ -171,6 +192,20 @@ TAO_Notify_POA_Helper::id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const
                                 ACE_ENV_ARG_PARAMETER);
 }
 
+PortableServer::ServantBase *
+TAO_Notify_POA_Helper::reference_to_servant (CORBA::Object_ptr ptr ACE_ENV_ARG_DECL) const
+{
+  return poa_->reference_to_servant (ptr ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+TAO_Notify_POA_Helper::servant_to_reference (
+    PortableServer::ServantBase * servant  ACE_ENV_ARG_DECL) const
+{
+  return poa_->servant_to_reference (servant ACE_ENV_ARG_PARAMETER);
+}
+
+
 void
 TAO_Notify_POA_Helper::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
index 831b0dc163d..01c79ed3665 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -23,6 +23,7 @@
 #include "ace/Copy_Disabled.h"
 
 #include "tao/PortableServer/PortableServer.h"
+#include "ID_Factory.h"
 
 /**
  * @class TAO_Notify_POA_Helper
@@ -54,12 +55,20 @@ public:
   /// Activate Object, the POA will assign an ID and return its value.
   CORBA::Object_ptr activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL);
 
+  /// Activate Object, using existing ID
+  CORBA::Object_ptr activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL);
+
   /// Deactivate Object with ID
   void deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const;
 
   /// Convert ID to reference.
   CORBA::Object_ptr id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const;
 
+  /// Convert reference to pointer to servant
+  PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr ACE_ENV_ARG_DECL) const;
+
+  CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant  ACE_ENV_ARG_DECL) const;
+
 protected:
   /// Set default POA policies.
   virtual void set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL);
@@ -70,11 +79,15 @@ protected:
   /// Generate a unique id for each POA created.
   ACE_CString get_unique_id (void);
 
+  /// Convert id to ObjectID
+  PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const;
+
+protected:
   /// POA
   PortableServer::POA_var poa_;
 
-  /// Convert id to ObjectID
-  PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const;
+  /// ID Factory for objects.
+  TAO_Notify_ID_Factory id_factory_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index deaf6fc66ea..5778281bc71 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -66,6 +66,9 @@ public:
   /// Handle dispatch exceptions.
   void handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL);
 
+  /// Retrieve the ior of this peer
+  virtual bool get_ior (ACE_CString & iorstr) const = 0;
+
 protected:
   /// Implementation of Peer specific dispatch_updates
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index f9f7f9d567f..4ce068a7a2b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -42,4 +42,8 @@ template class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>;
 
 #pragma instantiate TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template class TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex> *TAO_Singleton<TAO_Notify_Properties, ACE_Thread_Mutex>::singleton_;
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 4542a14bff6..7801ed6dc99 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -62,6 +62,9 @@ public:
   CORBA::Boolean asynch_updates (void);
   void asynch_updates (CORBA::Boolean asynch_updates);
 
+  bool allow_reconnect (void);
+  void allow_reconnect (bool b);
+
   // Turn on/off update messages.
   CORBA::Boolean updates (void);
   void updates (CORBA::Boolean updates);
@@ -112,6 +115,9 @@ protected:
   /// True if send asynch updates.
   CORBA::Boolean asynch_updates_;
 
+  /// True if clients can reconnect to proxies.
+  bool allow_reconnect_;
+
   /// True if updates are enabled (default).
   CORBA::Boolean updates_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
index 2b83846458c..c8a7893f4d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
@@ -60,6 +60,18 @@ TAO_Notify_Properties::asynch_updates (CORBA::Boolean asynch_updates)
   this->asynch_updates_ = asynch_updates;
 }
 
+ACE_INLINE bool
+TAO_Notify_Properties::allow_reconnect (void)
+{
+  return this->allow_reconnect_;
+}
+
+ACE_INLINE void
+TAO_Notify_Properties::allow_reconnect (bool b)
+{
+  this->allow_reconnect_ = b;
+}
+
 ACE_INLINE CORBA::Boolean
 TAO_Notify_Properties::updates (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
index 77a4fbc7364..df5beffdb21 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
@@ -34,13 +34,12 @@ TAO_Notify_PropertySeq::init (const CosNotification::PropertySeq& prop_seq)
 }
 
 int
-TAO_Notify_PropertySeq::populate (CosNotification::PropertySeq_var& prop_seq)
+TAO_Notify_PropertySeq::populate (CosNotification::PropertySeq_var& prop_seq) const
 {
-  PROPERTY_MAP::ITERATOR iterator (this->property_map_);
+  PROPERTY_MAP::CONST_ITERATOR iterator (this->property_map_);
 
   int index = prop_seq->length ();
-  prop_seq->length (ACE_static_cast (CORBA::ULong,
-                        index + this->property_map_.current_size ()));
+  prop_seq->length (static_cast<CORBA::ULong> (index + this->property_map_.current_size ()));
 
   for (PROPERTY_MAP::ENTRY *entry = 0;
        iterator.next (entry) != 0;
@@ -52,3 +51,11 @@ TAO_Notify_PropertySeq::populate (CosNotification::PropertySeq_var& prop_seq)
 
   return 0;
 }
+
+void
+TAO_Notify_PropertySeq::add(const ACE_CString& name, const CORBA::Any& val)
+{
+  int ret = this->property_map_.rebind (name, val);
+  ACE_ASSERT(ret >= 0);
+  ACE_UNUSED_ARG (ret); // because the assert disappears in release builds
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
index ca241e7bbee..1325b724e81 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -48,7 +48,15 @@ public:
   int find (const char* name, CosNotification::PropertyValue& value) const;
 
   /// Return -1 on error.
-  int populate (CosNotification::PropertySeq_var& prop_seq);
+  int populate (CosNotification::PropertySeq_var& prop_seq) const;
+
+  /// return the number of properties available as a sequence
+  size_t size() const;
+
+protected:
+  /// Add the value. Used by subclasses to initialize the property map from their
+  /// member variables.
+  void add(const ACE_CString& name, const CORBA::Any& val);
 
 protected:
   /// Property Map.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
index 0998ec76b1b..b96345cb11a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
@@ -6,3 +6,11 @@ TAO_Notify_PropertySeq::find (const char* name, CosNotification::PropertyValue&
   ACE_CString str_name (name);
   return this->property_map_.find (str_name, value);
 }
+
+ACE_INLINE
+size_t
+TAO_Notify_PropertySeq::size() const
+{
+  return this->property_map_.current_size();
+}
+
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
index a0eeef05462..e2d8487d0d8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
@@ -57,6 +57,9 @@ public:
 
   void get (CosNotification::PropertySeq& prop_seq);
 
+  /// Return the name
+  const char * name (void) const;
+
   /// Return the value.
   CORBA::Boolean value (void) const;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
index f5522993d11..b1a469809bb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
@@ -37,6 +37,13 @@ TAO_Notify_Property_Boolean::operator!= (const CORBA::Boolean &rhs) const
   return (this->value_ != rhs);
 }
 
+ACE_INLINE
+const char *
+TAO_Notify_Property_Boolean::name (void) const
+{
+  return this->name_;
+}
+
 ACE_INLINE CORBA::Boolean
 TAO_Notify_Property_Boolean::value (void) const
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index ff39b43a068..b1b6b7c39f0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -57,9 +57,15 @@ public:
   /// Populate the Property Sequence with this valid value.
   void get (CosNotification::PropertySeq& prop_seq);
 
+  // assign a new value
+  void assign (const TYPE& value);
+
   /// Return the value.
   const TYPE& value (void) const;
 
+  /// Return the name
+  const char * name (void) const;
+
   /// Is the current value valid
   CORBA::Boolean is_valid (void) const;
 
@@ -125,6 +131,9 @@ public:
   /// Returns 0 on success, -1 on error
   int set (const TAO_Notify_PropertySeq& property_seq);
 
+  /// Return the name
+  const char * name (void) const;
+
   /// Return the value.
   const TYPE& value (void) const;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
index f014ab89b29..31d5290c72d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
@@ -8,6 +8,13 @@ TAO_Notify_PropertyBase_T<TYPE>::value (void) const
   return this->value_;
 }
 
+template <class TYPE> ACE_INLINE
+const char *
+TAO_Notify_PropertyBase_T<TYPE>::name (void) const
+{
+  return this->name_;
+}
+
 template <class TYPE> ACE_INLINE CORBA::Boolean
 TAO_Notify_PropertyBase_T<TYPE>::is_valid (void) const
 {
@@ -32,14 +39,33 @@ TAO_Notify_PropertyBase_T<TYPE>:: invalidate (void)
   this->valid_ = 0;
 }
 
+template <class TYPE> ACE_INLINE
+void
+TAO_Notify_PropertyBase_T<TYPE>:: assign (const TYPE& value)
+{
+  this->value_ = value;
+  this->valid_ = 1;
+}
+
+
+
 /******************************************************************************/
 
+template <class TYPE> ACE_INLINE
+const char *
+TAO_Notify_StructProperty_T<TYPE>::name (void) const
+{
+  return this->name_;
+}
+
 template <class TYPE> ACE_INLINE const TYPE&
 TAO_Notify_StructProperty_T<TYPE>::value (void) const
 {
   return this->value_;
 }
 
+
+
 template <class TYPE> ACE_INLINE CORBA::Boolean
 TAO_Notify_StructProperty_T<TYPE>::is_valid (void) const
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index 34e95f70911..f4a4869c12f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -14,6 +14,7 @@ ACE_RCSID(RT_Notify, TAO_Notify_Proxy, "$Id$")
 #include "Worker_Task.h"
 #include "Properties.h"
 #include "POA_Helper.h"
+#include "Topology_Saver.h"
 
 TAO_Notify_Proxy::TAO_Notify_Proxy (void)
   :updates_off_ (0)
@@ -29,8 +30,17 @@ TAO_Notify_Proxy::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
   // Set the POA that we use to return our <ref>
   this->poa_ = this->proxy_poa_;
+  return TAO_Notify_Object::activate (servant ACE_ENV_ARG_PARAMETER);
+}
 
-  return this->proxy_poa_->activate (servant, this->id_ ACE_ENV_ARG_PARAMETER);
+CORBA::Object_ptr
+TAO_Notify_Proxy::activate (PortableServer::Servant servant,
+                            CORBA::Long id
+                            ACE_ENV_ARG_DECL)
+{
+  // Set the POA that we use to return our <ref>
+  this->poa_ = this->proxy_poa_;
+  return TAO_Notify_Object::activate (servant, id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -113,3 +123,74 @@ TAO_Notify_Proxy::qos_changed (const TAO_Notify_QoSProperties& qos_properties)
   if (peer != 0)
     peer->qos_changed (qos_properties);
 }
+
+void
+TAO_Notify_Proxy::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+{
+  bool changed = this->children_changed_;
+  this->children_changed_ = false;
+  this->self_changed_ = false;
+
+  if (is_persistent ())
+  {
+    TAO_Notify::NVPList attrs;
+    this->save_attrs(attrs);
+
+    const char * type_name = this->get_proxy_type_name ();
+    bool want_all_children = saver.begin_object(this->id(), type_name, attrs, changed ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
+
+    if (want_all_children || this->filter_admin_.is_changed ())
+    {
+      this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    if (want_all_children || this->subscribed_types_.is_changed ())
+    {
+      this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    // todo: handle removed children
+
+    saver.end_object(this->id(), type_name ACE_ENV_ARG_PARAMETER);
+  }
+}
+
+void
+TAO_Notify_Proxy::save_attrs (TAO_Notify::NVPList& attrs)
+{
+  TAO_Notify_Object::save_attrs(attrs);
+  TAO_Notify_Peer * peer = this->peer();
+  if (peer != 0)
+  {
+    ACE_CString ior;
+    if (peer->get_ior(ior))
+    {
+      attrs.push_back (TAO_Notify::NVP("PeerIOR", ior));
+    }
+  }
+}
+
+TAO_Notify::Topology_Object*
+TAO_Notify_Proxy::load_child (const ACE_CString &type, CORBA::Long id,
+  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+{
+  ACE_UNUSED_ARG (id);
+  ACE_UNUSED_ARG (attrs);
+  TAO_Notify::Topology_Object* result = this;
+  if (type == "subscriptions")
+  {
+    // since we initialized our subscribed types to everything
+    // in the constructor. we have to clear it out first.
+    this->subscribed_types_.reset();
+    result = &this->subscribed_types_;
+    ACE_CHECK_RETURN(0);
+  }
+  else if (type == "filter_admin")
+  {
+    result = & this->filter_admin_;
+  }
+  return result;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index 59a4c347909..f98a571a2e0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Object.h"
+#include "Topology_Object.h"
 #include "EventTypeSeq.h"
 #include "FilterAdmin.h"
 #include "Admin.h"
@@ -35,7 +35,8 @@ class TAO_Notify_Peer;
  * @brief Base class proxy for all proxys in NS.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_Proxy : public virtual TAO_Notify_Object
+class TAO_Notify_Serv_Export TAO_Notify_Proxy
+  : public TAO_Notify::Topology_Parent
 {
   friend class TAO_Notify_Peer;
 
@@ -50,35 +51,33 @@ public:
   ~TAO_Notify_Proxy ();
 
   /// Activate
-  virtual CORBA::Object_ptr activate (PortableServer::Servant servant 
+  virtual CORBA::Object_ptr activate (PortableServer::Servant servant
                                       ACE_ENV_ARG_DECL);
 
+  /// Activate with a given ID
+  virtual CORBA::Object_ptr activate (
+      PortableServer::Servant servant,
+      CORBA::Long id
+      ACE_ENV_ARG_DECL);
+
   /// Deactivate
   void deactivate (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtain the Proxy's subscribed types.
-  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types 
+  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types
                          ACE_ENV_ARG_DECL);
 
   /// Check if this event passes the admin and proxy filters.
   CORBA::Boolean check_filters (
-      const TAO_Notify_Event* event, 
-      TAO_Notify_FilterAdmin& parent_filter_admin, 
-      CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
-      ACE_ENV_ARG_DECL
-    );
-
-  /// Check if this event passes the admin and proxy filters.
-  CORBA::Boolean check_filters (
-      const TAO_Notify_Event_var &event, 
-      TAO_Notify_FilterAdmin& parent_filter_admin, 
+      const TAO_Notify_Event* event,
+      TAO_Notify_FilterAdmin& parent_filter_admin,
       CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
       ACE_ENV_ARG_DECL
     );
 
   /// Inform this proxy that the following types are being advertised.
-  void types_changed (const TAO_Notify_EventTypeSeq& added, 
-                      const TAO_Notify_EventTypeSeq& removed 
+  void types_changed (const TAO_Notify_EventTypeSeq& added,
+                      const TAO_Notify_EventTypeSeq& removed
                       ACE_ENV_ARG_DECL);
 
   /// Have updates been turned off.
@@ -92,8 +91,8 @@ public:
 
   /// Implement the Obtain Types.
   virtual CosNotification::EventTypeSeq* obtain_types (
-      CosNotifyChannelAdmin::ObtainInfoMode mode, 
-      const TAO_Notify_EventTypeSeq& types 
+      CosNotifyChannelAdmin::ObtainInfoMode mode,
+      const TAO_Notify_EventTypeSeq& types
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -107,6 +106,15 @@ public:
   /// Override, TAO_Notify_Object::qos_changed
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
+  // TAO_Notify::Topology_Object
+
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_attrs(TAO_Notify::NVPList& attrs);
+  virtual const char * get_proxy_type_name (void) const = 0;
+
+  virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id,
+    const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+
 protected:
 
   /// Filter Administration
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
index e7bcc8907f5..ef84390455c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -7,15 +7,6 @@ TAO_Notify_Proxy::updates_off (void)
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_Notify_Proxy::check_filters (const TAO_Notify_Event_var &event
-                             , TAO_Notify_FilterAdmin& parent_filter_admin
-                             , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
-                             ACE_ENV_ARG_DECL)
-{
-  return this->check_filters (event.get (), parent_filter_admin, filter_operator ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Boolean
 TAO_Notify_Proxy::check_filters (const TAO_Notify_Event* event
                              , TAO_Notify_FilterAdmin& parent_filter_admin
                              , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index 1675a777de5..8accd58946f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -19,6 +19,12 @@ ACE_RCSID(RT_Notify, TAO_Notify_ProxyConsumer, "$Id$")
 #include "Worker_Task.h"
 #include "Properties.h"
 #include "SupplierAdmin.h"
+#include "EventChannel.h"
+#include "Routing_Slip.h"
+//#define DEBUG_LEVEL 10
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
 
 TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (void)
   : supplier_admin_ (0)
@@ -38,11 +44,12 @@ TAO_Notify_ProxyConsumer::peer (void)
 }
 
 void
-TAO_Notify_ProxyConsumer::init (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Object::init (supplier_admin);
+  TAO_Notify_Proxy::initialize (topology_parent ACE_ENV_ARG_PARAMETER);
 
-  this->supplier_admin_ = supplier_admin;
+  this->supplier_admin_ = dynamic_cast<TAO_Notify_SupplierAdmin *> (topology_parent);
+  ACE_ASSERT(this->supplier_admin_ != 0);
 
   this->supplier_admin_->_incr_refcnt ();
 
@@ -70,17 +77,30 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
     ACE_CHECK;
+    TAO_Notify_Supplier* deleted_supplier = 0;
 
     if (this->is_connected ())
       {
-        supplier->release ();
-        ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+        if (TAO_Notify_PROPERTIES::instance()->allow_reconnect())
+          {
+            deleted_supplier = this->supplier_;
+          }
+        else
+          {
+            supplier->release ();
+            ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          }
       }
 
-    supplier_ = supplier;
+    this->supplier_ = supplier;
 
     this->supplier_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types.
     ACE_CHECK;
+
+    if (deleted_supplier != 0)
+      {
+        deleted_supplier->_decr_refcnt();
+      }
   }
 
   // Inform QoS values.
@@ -97,6 +117,46 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
   // Increment the global supplier count
   ++supplier_count;
 }
+void
+TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event ACE_ENV_ARG_DECL)
+{
+  if (this->supports_reliable_events ())
+    {
+      TAO_Notify_Event_var pevent;
+      event->queueable_copy (pevent ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+      TAO_Notify::Routing_Slip_Ptr routing_slip =
+        TAO_Notify::Routing_Slip::create (pevent ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+      if (DEBUG_LEVEL > 0)
+        ACE_DEBUG((LM_DEBUG, ACE_TEXT ("ProxyConsumer routing event.\n")));
+      routing_slip->route (this, true ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+      routing_slip->wait_persist ();
+    }
+  else
+    {
+      TAO_Notify_Method_Request_Lookup_No_Copy request (event, this);
+      this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+}
+
+bool
+TAO_Notify_ProxyConsumer::supports_reliable_events () const
+{
+  bool reliable = false;
+  CosNotification::PropertyValue value;
+    if (this->find_qos_property_value (CosNotification::EventReliability, value))
+    {
+      CORBA::Long setting;
+      if (value >>= setting)
+      {
+        reliable = (setting == CosNotification::Persistent);
+      }
+    }
+  return reliable;
+}
 
 void
 TAO_Notify_ProxyConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 349c9c7b150..862ffcddedd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -47,8 +47,8 @@ public:
   /// Destructor
   ~TAO_Notify_ProxyConsumer ();
 
-  /// Init
-  void init (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL);
+  /// init: overrides Topology_Object method
+  virtual void init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
 
   /// Connect
   void connect (TAO_Notify_Supplier* supplier ACE_ENV_ARG_DECL)
@@ -79,6 +79,13 @@ public:
   TAO_Notify_SupplierAdmin* supplier_admin (void);
 
 protected:
+  /// Accept an event from the Supplier
+  void push_i (TAO_Notify_Event * event ACE_ENV_ARG_DECL);
+
+  /// Is this part of a reliable channel
+  bool supports_reliable_events () const;
+
+protected:
   ///= Data Members.
   /// The SA parent.
   TAO_Notify_SupplierAdmin* supplier_admin_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index d9e90b412cd..b5da6701dc9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -6,10 +6,6 @@
 #include "ProxyConsumer_T.h"
 #include "SupplierAdmin.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ProxyConsumer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_ProxyConsumer_T, "$Id$")
 
 #include "Event_Manager.h"
@@ -63,7 +59,7 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E
                         CORBA::INTERNAL ());
     ACE_CHECK;
 
-    this->subscribed_types_.init (seq_added, seq_removed);
+    this->subscribed_types_.add_and_remove (seq_added, seq_removed);
   }
 
   this->event_manager_->offer_change (this, seq_added, seq_removed ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index 6524ce1c0ab..f8ee14512bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -30,8 +30,8 @@
  *
  */
 template <class SERVANT_TYPE>
-class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T 
-  : public virtual TAO_Notify_Proxy_T <SERVANT_TYPE>, 
+class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T
+  : public virtual TAO_Notify_Proxy_T <SERVANT_TYPE>,
     public virtual TAO_Notify_ProxyConsumer
 {
 public:
@@ -71,10 +71,6 @@ public:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "ProxyConsumer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ProxyConsumer_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 3034ae07829..2b87323ca46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -31,7 +31,7 @@ TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier ()
 void
 TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Object::init (consumer_admin);
+  TAO_Notify_Proxy::initialize (consumer_admin ACE_ENV_ARG_PARAMETER);
 
   this->consumer_admin_ = consumer_admin;
 
@@ -68,16 +68,28 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
                         CORBA::INTERNAL ());
     ACE_CHECK;
 
+    TAO_Notify_Consumer * deleted_consumer = 0;
     if (this->is_connected ())
       {
-        consumer->release ();
-        ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+        if (TAO_Notify_PROPERTIES::instance()->allow_reconnect())
+          {
+            deleted_consumer = this->consumer_;
+          }
+        else
+          {
+            consumer->release ();
+            ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          }
       }
 
     consumer_ = consumer;
 
     this->consumer_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types.
     ACE_CHECK;
+    if (deleted_consumer != 0)
+      {
+        deleted_consumer->_decr_refcnt();
+      }
   }
 
   // Inform QoS values.
@@ -139,34 +151,8 @@ TAO_Notify_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_ProxySupplier::push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::deliver (TAO_Notify_Method_Request & request ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Method_Request_Dispatch_No_Copy request (event, this, 1);
-
-  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Notify_ProxySupplier::push (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
-{
-  TAO_Notify_Method_Request_Dispatch_No_Copy_Ex request (event, this, 1);
-
-  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Notify_ProxySupplier::push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
-{
-  TAO_Notify_Method_Request_Dispatch_No_Copy request (event, this, 0); // No filtering.
-
-  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Notify_ProxySupplier::push_no_filtering (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
-{
-  TAO_Notify_Method_Request_Dispatch_No_Copy_Ex request (event, this, 0); // No filtering.
-
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index 272c9c3f1ea..a099204f539 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -26,7 +26,7 @@
 
 class TAO_Notify_Consumer;
 class TAO_Notify_ConsumerAdmin;
-
+class TAO_Notify_Method_Request;
 /**
  * @class TAO_Notify_ProxySupplier
  *
@@ -57,16 +57,7 @@ public:
   void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Dispatch Event to consumer
-  virtual void push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
-
-  /// Dispatch Event to consumer
-  virtual void push (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
-
-  /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
-
-  /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void deliver (TAO_Notify_Method_Request & request ACE_ENV_ARG_DECL);
 
   /// Override TAO_Notify_Container_T::shutdown  method
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
@@ -89,6 +80,7 @@ public:
   /// The CA parent.
   TAO_Notify_ConsumerAdmin* consumer_admin (void);
 
+//  const char * get_proxy_type_name (void) const;
 protected:
 
   ///= Data Members.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index 86f2c82569b..23dad7b45b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -5,10 +5,6 @@
 
 #include "ProxySupplier_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "ProxySupplier_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_ProxySupplier_T, "$Id$")
 
 #include "Consumer.h"
@@ -115,7 +111,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica
                         CORBA::INTERNAL ());
     ACE_CHECK;
 
-    this->subscribed_types_.init (seq_added, seq_removed);
+    this->subscribed_types_.add_and_remove (seq_added, seq_removed);
   }
 
   this->event_manager_->subscription_change (this, seq_added, seq_removed ACE_ENV_ARG_PARAMETER);
@@ -140,6 +136,9 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG
   }
 
   this->consumer_->suspend (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 template <class SERVANT_TYPE> void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index ba545f61ff5..5c18d79424e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -146,10 +146,6 @@ protected:
   ));
 };
 
-#if defined (__ACE_INLINE__)
-#include "ProxySupplier_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ProxySupplier_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index d767751adc3..50cf9e72f0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -5,10 +5,6 @@
 #ifndef TAO_Notify_PROXY_T_CPP
 #define TAO_Notify_PROXY_T_CPP
 
-#if ! defined (__ACE_INLINE__)
-#include "Proxy_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Proxy_T, "$Id$")
 
 template <class SERVANT_TYPE>
@@ -99,7 +95,12 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_fi
                       CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
+  CosNotifyFilter::FilterID fid =
+    this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN(0);
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN(fid);
+  return fid;
 }
 
 template <class SERVANT_TYPE> void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index 7a2726c251c..b9b0e26ee0f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -143,10 +143,6 @@ template class TAO_Notify_Serv_Export
 TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
-#if defined (__ACE_INLINE__)
-#include "Proxy_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Proxy_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index 805ae87ff67..7af2da443ab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -10,18 +10,21 @@ ACE_RCSID(Notify, TAO_Notify_QoSProperties, "$Id$")
 
 #include "Property.h"
 
+
+
 TAO_Notify_QoSProperties::TAO_Notify_QoSProperties (void)
-  : priority_ (CosNotification::Priority)
+  :  event_reliability_(CosNotification::EventReliability)
+    , connection_reliability_(CosNotification::ConnectionReliability)
+    , priority_ (CosNotification::Priority)
     , timeout_ (CosNotification::Timeout)
     , stop_time_supported_ (CosNotification::StopTimeSupported)
     , maximum_batch_size_ (CosNotification::MaximumBatchSize)
+    , max_events_per_consumer_ (CosNotification::MaxEventsPerConsumer)
     , pacing_interval_ (CosNotification::PacingInterval)
     , thread_pool_ (NotifyExt::ThreadPool)
     , thread_pool_lane_ (NotifyExt::ThreadPoolLanes)
 {
-  unsupported_[0] = CosNotification::EventReliability;
-  unsupported_[1] = CosNotification::ConnectionReliability;
-  unsupported_[2] = CosNotification::StartTimeSupported;
+  unsupported_[0] = CosNotification::StartTimeSupported;
 }
 
 TAO_Notify_QoSProperties::~TAO_Notify_QoSProperties ()
@@ -39,6 +42,70 @@ TAO_Notify_QoSProperties::unsupported (ACE_CString& name)
 
   return 0;
 }
+void
+TAO_Notify_QoSProperties::init ()
+{
+  if (this->event_reliability_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->event_reliability_.value();
+    this->add(this->event_reliability_.name(), a);
+  }
+  if (this->connection_reliability_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->connection_reliability_.value();
+    this->add(this->connection_reliability_.name(), a);
+  }
+  if (this->priority_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->priority_.value();
+    this->add(this->priority_.name(), a);
+  }
+  if (this->timeout_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->timeout_.value();
+    this->add(this->timeout_.name(), a);
+  }
+  if (this->stop_time_supported_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= CORBA::Any::from_boolean (this->stop_time_supported_.value());
+    this->add(this->stop_time_supported_.name(), a);
+  }
+  if (this->maximum_batch_size_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->maximum_batch_size_.value();
+    this->add(this->maximum_batch_size_.name(), a);
+  }
+  if (this->pacing_interval_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->pacing_interval_.value();
+    this->add(this->pacing_interval_.name(), a);
+  }
+  if (this->max_events_per_consumer_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->max_events_per_consumer_.value();
+    this->add(this->max_events_per_consumer_.name(), a);
+  }
+  if (this->thread_pool_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->thread_pool_.value();
+    this->add(this->thread_pool_.name(), a);
+  }
+  if (this->thread_pool_lane_.is_valid())
+  {
+    CORBA::Any a;
+    a <<= this->thread_pool_lane_.value();
+    this->add(this->thread_pool_lane_.name(), a);
+  }
+}
 
 int
 TAO_Notify_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, CosNotification::PropertyErrorSeq& err_seq)
@@ -64,8 +131,10 @@ TAO_Notify_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, Co
     }
 
   if (prop_seq.length () > 0)
-  {
+    {
         // Now, init the supported properties
+        this->event_reliability_.set (*this);
+        this->connection_reliability_.set (*this);
         this->priority_.set (*this);
         this->timeout_.set (*this);
         this->stop_time_supported_.set (*this);
@@ -81,6 +150,8 @@ TAO_Notify_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, Co
 int
 TAO_Notify_QoSProperties::copy (TAO_Notify_QoSProperties& qos_properties)
 {
+  qos_properties.event_reliability_ = this->event_reliability_;
+  qos_properties.connection_reliability_ = this->connection_reliability_;
   qos_properties.priority_ = this->priority_;
   qos_properties.timeout_ = this->timeout_;
   qos_properties.stop_time_supported_ = this->stop_time_supported_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
index ba418a24cca..91572274252 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
@@ -43,6 +43,9 @@ public:
   /// Return 0 on success, 1 if unsupported properties were detected and -1 on error.
   int init (const CosNotification::PropertySeq& prop_seq, CosNotification::PropertyErrorSeq& err_seq);
 
+  /// This version initializes the base from our members
+  void init ();
+
   /// Populate <qos_properties> with all properties from this object. Returns -1 on error.
   int copy (TAO_Notify_QoSProperties& qos_properties);
 
@@ -61,18 +64,42 @@ public:
 
   /// Pacing Interval
   const TAO_Notify_Property_Time& pacing_interval (void) const;
+  ///= Accessors
+
+  const TAO_Notify_Property_Short& event_reliability (void) const;
+  const TAO_Notify_Property_Short& connection_reliability (void) const;
+  const TAO_Notify_Property_Short& priority (void) const;
+  const TAO_Notify_Property_Time& timeout (void) const;
+  const TAO_Notify_Property_Boolean& stop_time_supported (void) const;
+  const TAO_Notify_Property_Long& max_events_per_consumer (void) const;
+
+  // The non-const accessors are used during topology load
+  TAO_Notify_Property_Short& event_reliability (void);
+  TAO_Notify_Property_Short& connection_reliability (void);
+  TAO_Notify_Property_Short& priority (void);
+  TAO_Notify_Property_Time& timeout (void);
+  TAO_Notify_Property_Boolean& stop_time_supported (void);
+  TAO_Notify_Property_Long& maximum_batch_size (void);
+  TAO_Notify_Property_Time& pacing_interval (void);
+  TAO_Notify_Property_Long& max_events_per_consumer (void);
 
 protected:
   /// Return 1 if <value> is unsupported.
   int unsupported (ACE_CString& name);
 
-  enum {UNSUPPORTED_PROPERTY_COUNT = 3};
+  enum {UNSUPPORTED_PROPERTY_COUNT = 1};
 
   ///= Unsupported Properties.
   ACE_CString unsupported_[UNSUPPORTED_PROPERTY_COUNT];
 
   ///= Supported properties
 
+  /// Event Reliability
+  TAO_Notify_Property_Short event_reliability_;
+
+  /// Connection Reliability
+  TAO_Notify_Property_Short connection_reliability_;
+
   /// Priority
   TAO_Notify_Property_Short priority_;
 
@@ -85,6 +112,9 @@ protected:
   /// Maximum Batch Size
   TAO_Notify_Property_Long maximum_batch_size_;
 
+  /// Maximum Events (queue length) Per Consumer
+  TAO_Notify_Property_Long max_events_per_consumer_;
+
   /// Pacing Interval
   TAO_Notify_Property_Time pacing_interval_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
index 087ab21febe..14aab6a7866 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
@@ -1,5 +1,47 @@
 // $Id$
 
+ACE_INLINE
+const TAO_Notify_Property_Short&
+TAO_Notify_QoSProperties::event_reliability(void) const
+{
+  return this->event_reliability_;
+}
+
+ACE_INLINE
+const TAO_Notify_Property_Short&
+TAO_Notify_QoSProperties::connection_reliability(void) const
+{
+  return this->connection_reliability_;
+}
+
+ACE_INLINE
+const TAO_Notify_Property_Short&
+TAO_Notify_QoSProperties::priority(void) const
+{
+  return this->priority_;
+}
+
+ACE_INLINE
+const TAO_Notify_Property_Time&
+TAO_Notify_QoSProperties::timeout(void) const
+{
+  return this->timeout_;
+}
+
+ACE_INLINE
+const TAO_Notify_Property_Boolean&
+TAO_Notify_QoSProperties::stop_time_supported(void) const
+{
+  return this->stop_time_supported_;
+}
+
+ACE_INLINE
+const TAO_Notify_Property_Long&
+TAO_Notify_QoSProperties::max_events_per_consumer (void) const
+{
+  return this->max_events_per_consumer_;
+}
+
 ACE_INLINE const TAO_Notify_Property_ThreadPool&
 TAO_Notify_QoSProperties::thread_pool (void) const
 {
@@ -23,3 +65,58 @@ TAO_Notify_QoSProperties::pacing_interval (void) const
 {
   return this->pacing_interval_;
 }
+
+ACE_INLINE
+TAO_Notify_Property_Short&
+TAO_Notify_QoSProperties::event_reliability(void)
+{
+  return this->event_reliability_;
+}
+
+ACE_INLINE
+TAO_Notify_Property_Short&
+TAO_Notify_QoSProperties::connection_reliability(void)
+{
+  return this->connection_reliability_;
+}
+
+ACE_INLINE
+TAO_Notify_Property_Short&
+TAO_Notify_QoSProperties::priority(void)
+{
+  return this->priority_;
+}
+
+ACE_INLINE
+TAO_Notify_Property_Time&
+TAO_Notify_QoSProperties::timeout(void)
+{
+  return this->timeout_;
+}
+
+ACE_INLINE
+TAO_Notify_Property_Boolean&
+TAO_Notify_QoSProperties::stop_time_supported(void)
+{
+  return this->stop_time_supported_;
+}
+
+ACE_INLINE
+TAO_Notify_Property_Long&
+TAO_Notify_QoSProperties::max_events_per_consumer (void)
+{
+  return this->max_events_per_consumer_;
+}
+
+
+ACE_INLINE TAO_Notify_Property_Long&
+TAO_Notify_QoSProperties::maximum_batch_size (void)
+{
+  return this->maximum_batch_size_;
+}
+
+ACE_INLINE TAO_Notify_Property_Time&
+TAO_Notify_QoSProperties::pacing_interval (void)
+{
+  return this->pacing_interval_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index ecbcb9a205d..3c9d6beb3a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -10,12 +10,8 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "Object.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_Builder.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (RT_Notify, 
-           TAO_Notify_RT_Builder, 
+ACE_RCSID (RT_Notify,
+           TAO_Notify_RT_Builder,
            "$Id$")
 
 TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
index 29bc810667b..d8e5834d2e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -43,9 +43,5 @@ public:
   virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_Builder.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.inl
deleted file mode 100644
index 1ce3c730804..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "RT_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index b587353f0c4..014c4da3984 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "RT_Factory.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "RT_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "Structured/RT_StructuredProxyPushSupplier.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_RT_Factory, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
index 0a09a483bb8..79de7f0749d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
@@ -93,9 +93,5 @@ public:
 
 ACE_FACTORY_DECLARE (TAO_RT_Notify, TAO_Notify_RT_Factory)
 
-#if defined (__ACE_INLINE__)
-#include "RT_Factory.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.inl
deleted file mode 100644
index adb4497a7fa..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "RT_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index b62aa0fc326..9c1f31d8334 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -2,10 +2,6 @@
 
 #include "RT_Notify_Service.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_Notify_Service.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RT_Notify, TAO_Notify_RT_Notify_Service, "$Id$")
 
 #include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index fd84f39c0cc..5531ba67246 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -55,9 +55,5 @@ protected:
 
 ACE_FACTORY_DECLARE (TAO_RT_Notify,TAO_RT_Notify_Service)
 
-#if defined (__ACE_INLINE__)
-#include "RT_Notify_Service.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_NOTIFY_SERVICE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.inl
deleted file mode 100644
index 2274b4dbd69..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "RT_Notify_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 4a507f456f7..2631faef282 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -7,12 +7,8 @@
 #include "RT_Properties.h"
 #include "ace/SString.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_POA_Helper.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (RT_Notify, 
-           TAO_Notify_RT_POA_Helper, 
+ACE_RCSID (RT_Notify,
+           TAO_Notify_RT_POA_Helper,
            "$Id$")
 
 TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper ()
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index 24b3491f52c..23a14864aff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -56,9 +56,5 @@ public:
   void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_POA_Helper.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_POA_Helper_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.inl
deleted file mode 100644
index a06831e3235..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "RT_POA_Helper.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
index 9eafa07973a..8451193ea97 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "RT_Properties.h"
 
 ACE_INLINE RTCORBA::RTORB_ptr
 TAO_Notify_RT_Properties::rt_orb (void)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index 6f51070662e..5485f75fd79 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -40,7 +40,7 @@ TAO_Notify_Reactive_Task::shutdown (void)
 }
 
 void
-TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
 {
   method_request.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index f0b9451f074..4ef50649649 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -50,7 +50,7 @@ public:
   virtual void shutdown (void);
 
   /// Exec the request.
-  virtual void execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
+  virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
 
   /// The object used by clients to register timers. This method returns a Reactor based Timer.
   virtual TAO_Notify_Timer* timer (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
index 7d378105c84..b0d869ce2e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -3,11 +3,6 @@
 #include "Refcountable.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/Guard_T.h"
 
 ACE_RCSID(Notify, TAO_Notify_Refcountable, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index bd8a7d5423c..c38000882d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -40,7 +40,7 @@ public:
   /// Destructor
   virtual ~TAO_Notify_Refcountable ();
 
-  /// This method sigantures deliberately match the 
+  /// This method sigantures deliberately match the
   /// RefCounting methods required for ESF Proxy
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
@@ -56,10 +56,6 @@ protected:
   TAO_SYNCH_MUTEX lock_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_REFCOUNTABLE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
index ac1af0f4323..77d1e2a5db1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
@@ -31,16 +31,29 @@ class TAO_Notify_Refcountable_Guard_T
 {
 public:
   /// Constuctor
-  TAO_Notify_Refcountable_Guard_T (T* t);
+  TAO_Notify_Refcountable_Guard_T (T* t = 0);
+
+  /// Copy constructor
+  TAO_Notify_Refcountable_Guard_T (const TAO_Notify_Refcountable_Guard_T<T> & rhs);
 
   /// Destructor
   ~TAO_Notify_Refcountable_Guard_T ();
 
   /// Redirection operator
+  T * get (void) const;
+
+  /// Redirection operator
   T *operator-> (void) const;
 
   T &operator *() const;
 
+  TAO_Notify_Refcountable_Guard_T<T> & operator = (
+    const TAO_Notify_Refcountable_Guard_T<T> & rhs);
+
+private:
+  /// helper for exception safeness
+  /// @throws nothing
+  void swap (TAO_Notify_Refcountable_Guard_T & rhs);
 private:
   T* t_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
index 5e16e7d04f1..ad651ceb555 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
@@ -1,26 +1,77 @@
 // $Id$
 
+#include "ace/Log_Msg.h"
+
 template <class T> ACE_INLINE
 TAO_Notify_Refcountable_Guard_T<T>::TAO_Notify_Refcountable_Guard_T (T *t)
   : t_ (t)
 {
-  this->t_->_incr_refcnt ();
+  if (this->t_ != 0)
+    {
+      this->t_->_incr_refcnt ();
+    }
+}
+
+template <class T> ACE_INLINE
+TAO_Notify_Refcountable_Guard_T<T>::TAO_Notify_Refcountable_Guard_T (const TAO_Notify_Refcountable_Guard_T<T> &rhs)
+  : t_ (rhs.t_)
+{
+  if (this->t_ != 0)
+    {
+      this->t_->_incr_refcnt ();
+    }
 }
 
 template <class T> ACE_INLINE
 TAO_Notify_Refcountable_Guard_T<T>::~TAO_Notify_Refcountable_Guard_T ()
 {
-  this->t_->_decr_refcnt ();
+  if (this->t_ != 0)
+    {
+      this->t_->_decr_refcnt ();
+    }
+}
+
+template <class T> ACE_INLINE T*
+TAO_Notify_Refcountable_Guard_T<T>::get (void) const
+{
+  return this->t_;
 }
 
 template <class T> ACE_INLINE T*
 TAO_Notify_Refcountable_Guard_T<T>::operator-> (void) const
 {
+  ACE_ASSERT (this->t_ != 0);
   return this->t_;
 }
 
-template <class T> ACE_INLINE T&
+template <class T> ACE_INLINE
+T&
 TAO_Notify_Refcountable_Guard_T<T>::operator *(void) const
 {
+  ACE_ASSERT (this->t_ != 0);
   return *this->t_;
 }
+
+template <class T> ACE_INLINE
+TAO_Notify_Refcountable_Guard_T<T> &
+TAO_Notify_Refcountable_Guard_T<T>::operator = (
+  const TAO_Notify_Refcountable_Guard_T<T> & rhs)
+{
+  // note exception safe assignment. see Sutter's "Exceptional C++"
+  // note it's worth the following optimization to avoid threadsafe increment/decrement refcounters
+  if (this->t_ != rhs.t_) {
+    TAO_Notify_Refcountable_Guard_T<T> temp(rhs.t_);
+    swap (temp);
+}
+  return *this;
+}
+
+
+template <class T> ACE_INLINE
+void
+TAO_Notify_Refcountable_Guard_T<T>::swap (TAO_Notify_Refcountable_Guard_T & rhs)
+{
+  T* pt = rhs.t_;
+  rhs.t_ = this->t_;
+  this->t_ = pt;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
index 73bd444b95d..87c85962bdc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
@@ -4,10 +4,6 @@
 #include "../Method_Request_Event.h"
 #include "ace/Null_Condition.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Batch_Buffering_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_Batch_Buffering_Strategy, "$Id$")
 
 TAO_Notify_Batch_Buffering_Strategy::TAO_Notify_Batch_Buffering_Strategy (TAO_Notify_Message_Queue& msg_queue, TAO_Notify_AdminProperties_var& admin_properties, CORBA::Long batch_size)
@@ -78,7 +74,7 @@ TAO_Notify_Batch_Buffering_Strategy::dequeue_i (int max_deq_count, CosNotificati
 
       --this->global_queue_length_;
 
-      TAO_Notify_Method_Request_Event* mre = ACE_dynamic_cast (TAO_Notify_Method_Request_Event*, mb);
+      TAO_Notify_Method_Request_Event_Queueable* mre = dynamic_cast<TAO_Notify_Method_Request_Event_Queueable*> (mb);
 
       mre->event ()->convert (event_batch[deq_count]);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
index b49b367c654..069ad98a710 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_BATCH_BUFFERING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -52,9 +52,5 @@ protected:
   int dequeue_i (int max_deq_count, CosNotification::EventBatch& event_batch);
 };
 
-#if defined (__ACE_INLINE__)
-#include "Batch_Buffering_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_BATCH_BUFFERING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.inl
deleted file mode 100644
index 72a7bb34341..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "Batch_Buffering_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index af1faff9d17..11b50b7fd22 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -2,18 +2,13 @@
 
 #include "SequenceProxyPushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SequenceProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushConsumer, "$Id$")
 
 #include "tao/debug.h"
 #include "SequencePushSupplier.h"
 #include "../AdminProperties.h"
-#include "../Method_Request_Lookup.h"
-#include "../Worker_Task.h"
 #include "../Structured/StructuredEvent.h"
+#include "../Properties.h"
 
 TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer (void)
 :pacing_interval_ (CosNotification::PacingInterval)
@@ -60,6 +55,8 @@ TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyC
   ACE_CHECK;
 
   this->connect (supplier ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -83,10 +80,8 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat
       const CosNotification::StructuredEvent& notification = event_batch[i];
 
       TAO_Notify_StructuredEvent_No_Copy event (notification);
-
-      TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
-
-      this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
+      this->push_i (&event ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
 
@@ -97,4 +92,44 @@ TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (ACE_ENV
                    ))
 {
   this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+const char *
+TAO_Notify_SequenceProxyPushConsumer::get_proxy_type_name (void) const
+{
+  return "sequence_proxy_push_consumer";
+}
+
+void
+TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs)
+{
+  SuperClass::load_attrs(attrs);
+  ACE_CString ior;
+  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  {
+    CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
+    {
+      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CosNotifyComm::SequencePushSupplier_var ps =
+        CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      // minor hack: suppress generating subscription updates during reload.
+      bool save_updates = this->updates_off_;
+      this->updates_off_ = true;
+      this->connect_sequence_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      this->updates_off_ = save_updates;
+    }
+    ACE_CATCHANY
+    {
+      ACE_ASSERT(0);
+    }
+    ACE_ENDTRY;
+  }
+}
+
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index b6d77b5d187..f386ccb833f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,6 +40,7 @@
 class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushConsumer
   : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>
 {
+  typedef TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer> SuperClass;
   friend class TAO_Notify_Builder;
 public:
   /// Constuctor
@@ -51,6 +52,10 @@ public:
   /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
+  virtual const char * get_proxy_type_name (void) const;
+
+  virtual void load_attrs (const TAO_Notify::NVPList& attrs);
+
 protected:
   ///= Data Members
   TAO_Notify_Property_Time pacing_interval_;
@@ -89,10 +94,6 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "SequenceProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_SEQUENCEPROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.inl
deleted file mode 100644
index 5470ff89e39..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "SequenceProxyPushConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index ea5501c6872..8cf6ba6cc64 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -2,14 +2,11 @@
 
 #include "SequenceProxyPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SequenceProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
 #include "SequencePushConsumer.h"
+#include "../Properties.h"
 
 TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void)
 {
@@ -47,6 +44,8 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC
   ACE_CHECK;
 
   this->connect (consumer ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -57,6 +56,8 @@ TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (ACE_ENV
 
 {
   this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyType
@@ -67,3 +68,36 @@ TAO_Notify_SequenceProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return CosNotifyChannelAdmin::PUSH_SEQUENCE;
 }
+
+const char *
+TAO_Notify_SequenceProxyPushSupplier::get_proxy_type_name (void) const
+{
+  return "sequence_proxy_push_supplier";
+}
+
+void
+TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs)
+{
+  SuperClass::load_attrs(attrs);
+  ACE_CString ior;
+  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  {
+    CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
+    {
+      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CosNotifyComm::SequencePushConsumer_var pc =
+        CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      this->connect_sequence_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+    ACE_CATCHANY
+    {
+      // if we can't reconnect, tough
+    }
+    ACE_ENDTRY;
+  }
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 0e34de6a20b..f7e45752747 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,6 +46,7 @@ TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
 class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushSupplier
   : public virtual TAO_Notify_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>
 {
+  typedef TAO_Notify_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier> SuperClass;
   friend class TAO_Notify_Builder;
 
 public:
@@ -58,6 +59,10 @@ public:
   /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
+  virtual const char * get_proxy_type_name (void) const;
+
+  virtual void load_attrs (const TAO_Notify::NVPList& attrs);
+
   /// = Servant methods
   virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
@@ -86,10 +91,6 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "SequenceProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_SEQUENCEPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.inl
deleted file mode 100644
index 5f4ceeb6181..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "SequenceProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 56d7a13538d..28e43c87dba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -2,10 +2,6 @@
 
 #include "SequencePushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SequencePushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$")
 
 #include "ace/Reactor.h"
@@ -14,43 +10,57 @@ ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$")
 #include "../ProxySupplier.h"
 #include "../Worker_Task.h"
 #include "../Consumer.h"
+#include "../Method_Request_Dispatch.h"
 #include "../Method_Request_Event.h"
 #include "../Timer.h"
 #include "../Proxy.h"
+#include "../Properties.h"
+//#define DEBUG_LEVEL 10
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
 
 TAO_Notify_SequencePushConsumer::TAO_Notify_SequencePushConsumer (TAO_Notify_ProxySupplier* proxy)
-  : TAO_Notify_Consumer (proxy), pacing_interval_ (ACE_Time_Value::zero), timer_id_ (-1), buffering_strategy_ (0),
-    max_batch_size_ (CosNotification::MaximumBatchSize, 0), timer_ (0)
+  : TAO_Notify_Consumer (proxy)
 {
 }
 
 TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer ()
 {
-  delete this->buffering_strategy_;
 }
 
 void
-TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer, TAO_Notify_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::init (
+  CosNotifyComm::SequencePushConsumer_ptr push_consumer, TAO_Notify_AdminProperties_var& admin_properties
+#if 1
+  ACE_ENV_ARG_DECL_NOT_USED)
+#else //1
+  ACE_ENV_ARG_DECL)
+#endif
 {
-  this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (push_consumer);
+  set_consumer (push_consumer);
 
-  this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer);
+#if 1 //// @@ TODO: use buffering strategy in TAO_Notify_Consumer???
+  ACE_UNUSED_ARG ( admin_properties);
+#else //1
 
   ACE_NEW_THROW_EX (this->buffering_strategy_,
                     TAO_Notify_Batch_Buffering_Strategy (this->msg_queue_, admin_properties,
                                                      this->max_batch_size_.value ()),
                     CORBA::NO_MEMORY ());
-
-  this->timer_ = this->proxy ()->timer ();
+#endif // 1
 }
 
 void
-TAO_Notify_SequencePushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushConsumer::set_consumer (
+  CosNotifyComm::SequencePushConsumer_ptr push_consumer)
 {
-  this->cancel_timer ();
-  this->timer_->_decr_refcnt ();
+  this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (push_consumer);
+  this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer);
+
 }
 
+
 void
 TAO_Notify_SequencePushConsumer::release (void)
 {
@@ -58,89 +68,133 @@ TAO_Notify_SequencePushConsumer::release (void)
   //@@ inform factory
 }
 
-void
-TAO_Notify_SequencePushConsumer::qos_changed (const TAO_Notify_QoSProperties& qos_properties)
+bool
+TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon)
 {
-  this->max_batch_size_ = qos_properties.maximum_batch_size ();
-
-  if (this->max_batch_size_.is_valid ())
-    {// set the max batch size.
-      this->buffering_strategy_->batch_size (this->max_batch_size_.value ());
-    }
-
-  const TAO_Notify_Property_Time &pacing_interval = qos_properties.pacing_interval ();
-
-  if (pacing_interval.is_valid ())
+  bool result = true;
+  if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
+      ACE_TEXT ("(%P|%t) SequencePushConsumer dispatch queued requests. queue size:%u\n"),
+      requests.size ()));
+
+  long queue_size = requests.size ();
+  CORBA::Long max_batch_size = queue_size;
+  if (this->max_batch_size_.is_valid () )
     {
-      this->pacing_interval_ =
-# if defined (ACE_CONFIG_WIN32_H)
-        ACE_Time_Value (ACE_static_cast (long, pacing_interval.value ()));
-# else
-      ACE_Time_Value (pacing_interval.value () / 1);
-# endif /* ACE_CONFIG_WIN32_H */
+      max_batch_size = this->max_batch_size_.value ();
     }
+  CORBA::Long batch_size = queue_size;
+  if (batch_size > max_batch_size)
+  {
+    batch_size = max_batch_size;
+  }
+  if (batch_size > 0)
+  {
+    CosNotification::EventBatch batch (batch_size);
+    batch.length (batch_size);
+
+    Request_Queue completed;
+
+    CORBA::Long pos = 0;
+    TAO_Notify_Method_Request_Event_Queueable * request = 0;
+    while (pos < batch_size && requests.dequeue_head (request) == 0)
+    {
+  if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
+        ACE_TEXT ("(%P|%t) Sequence Dispatch Method_Request_Dispatch @%@\n"),
+        request));
 
-  // Inform the buffering strategy of qos change.
-  this->buffering_strategy_->update_qos_properties (qos_properties);
-}
+      const TAO_Notify_Event * ev = request->event ();
+      ev->convert (batch [pos]);
+      ++pos;
 
-void
-TAO_Notify_SequencePushConsumer::schedule_timer (void)
-{
-  // Schedule the timer.
-  if (this->pacing_interval_ != ACE_Time_Value::zero)
+      // note enqueue at head, use queue as stack.
+      completed.enqueue_head (request);
+    }
+    batch.length (pos);
+    ACE_ASSERT (pos > 0);
+
+    ace_mon.release ();
+    TAO_Notify_Consumer::DispatchStatus status =
+      this->dispatch_batch (batch);
+    ace_mon.acquire ();
+    switch (status)
     {
-      this->timer_id_ = this->timer_->schedule_timer (this, this->pacing_interval_, 0);
-
-      if (this->timer_id_ == -1)
-        this->pacing_interval_ = ACE_Time_Value::zero; // some error, revert to no pacing.
+      case DISPATCH_SUCCESS:
+      {
+        TAO_Notify_Method_Request_Event_Queueable * request = 0;
+        while (completed.dequeue_head (request) == 0)
+        {
+          request->complete ();
+          request->release ();
+        }
+        result = true;
+        break;
+      }
+      // TODO: we should distinguish between these (someday)
+      case DISPATCH_FAIL:
+      case DISPATCH_DISCARD:
+      {
+        TAO_Notify_Method_Request_Event_Queueable *  request = 0;
+        while (completed.dequeue_head (request) == 0)
+        {
+          if (request->should_retry ())
+          {
+            if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
+              ACE_TEXT ("(%P|%t) SequencePushConsumer: Failed to dispatch :%d. Will retry\n"),
+              request->sequence ()
+              ));
+            requests.enqueue_head (request);
+            result = false;
+          }
+          else
+          {
+            if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
+              ACE_TEXT ("(%P|%t) SequencePushConsumer: Failed to dispatch :%d. Discarding event.\n"),
+              request->sequence ()
+              ));
+            request->complete ();
+            request->release ();
+          }
+        }
+        break;
+      }
+      case DISPATCH_RETRY:
+      {
+        if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
+          ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"),
+          static_cast<int> (this->proxy ()->id ()),
+          request->sequence ()
+          ));
+        ace_mon.acquire ();
+        requests.enqueue_head (request); // put the failed event back where it was
+        result = false;
+        break;
+      }
     }
+  }
+  return result;
 }
 
-void
-TAO_Notify_SequencePushConsumer::cancel_timer (void)
+bool
+TAO_Notify_SequencePushConsumer::enqueue_if_necessary (
+    TAO_Notify_Method_Request_Event * request
+    ACE_ENV_ARG_DECL)
 {
-  timer_->cancel_timer (this->timer_id_);
+  if (DEBUG_LEVEL > 0)
+    ACE_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n"));
+  this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (false);
+
+  if (this->pacing_.is_valid ())
+  {
+    schedule_timer (false);
+  }
+  else
+  {
+    this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
+  }
+  return true;
 }
 
-void
-TAO_Notify_SequencePushConsumer::push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
-{
-  TAO_Notify_Event* copy = event->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_Notify_Event_Copy_var copy_var (copy);
-
-  this->push_i (copy_var ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Notify_SequencePushConsumer::push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL)
-{
-  TAO_Notify_Method_Request_Event* method_request;
-
-  ACE_NEW_THROW_EX (method_request,
-                    TAO_Notify_Method_Request_Event (event),
-                    CORBA::NO_MEMORY ());
-
-  int msg_count = this->buffering_strategy_->enqueue (*method_request);
-
-  if (msg_count == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "NS_Seq_Reactive_Task (%P|%t) - "
-                    "failed to enqueue\n"));
-      return;
-    }
-
-  if (this->pacing_interval_ == ACE_Time_Value::zero)
-    {
-      // If pacing is zero, there is no timer, hence dispatch immediately
-      this->handle_timeout (ACE_Time_Value::zero, 0);
-    }
-  else if (msg_count == 1)
-    this->schedule_timer ();
-}
 
 void
 TAO_Notify_SequencePushConsumer::push (const CORBA::Any& /*event*/ ACE_ENV_ARG_DECL_NOT_USED)
@@ -154,44 +208,41 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::StructuredEvent& /
   //NOP
 }
 
-int
-TAO_Notify_SequencePushConsumer::handle_timeout (const ACE_Time_Value& /*current_time*/,
-                                             const void* /*act*/)
-{
-  CosNotification::EventBatch event_batch;
-
-  int pending = 0;
-
-  int deq_count = this->buffering_strategy_->dequeue_available (event_batch, pending);
-
-  if (deq_count > 0)
-    {
-      TAO_Notify_Proxy_Guard ref_guard(this->proxy ()); // Protect this object from being destroyed in this scope.
-
-      this->push (event_batch);
 
-      if (pending)
-        this->schedule_timer ();
-    }
-
-  return 0;
+void
+TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_batch ACE_ENV_ARG_DECL)
+{
+  this->push_consumer_->push_structured_events (event_batch ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
-void
-TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_batch)
+bool
+TAO_Notify_SequencePushConsumer::get_ior (ACE_CString & iorstr) const
 {
-  ACE_TRY_NEW_ENV
-    {
-      this->push_consumer_->push_structured_events (event_batch ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
+  bool result = false;
+  CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance ()->orb ();
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+  {
+    CORBA::String_var ior = orb->object_to_string (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
+  }
   ACE_CATCHANY
-    {
-      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // we're scheduled to be destroyed. don't set the timer.
-      this->pacing_interval_ = ACE_Time_Value::zero;
-    }
+  {
+    ACE_ASSERT (0);
+  }
   ACE_ENDTRY;
+  return result;
+}
+
+void
+TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
+    ACE_ENV_ARG_DECL_NOT_USED)
+{
+  TAO_Notify_SequencePushConsumer* tmp = dynamic_cast<TAO_Notify_SequencePushConsumer *> (old_consumer);
+  ACE_ASSERT(tmp != 0);
+  this->set_consumer(tmp->push_consumer_.in());
+  this->schedule_timer(false);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index 6cbe894caa3..76ff5d049ed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_SEQUENCEPUSHCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,7 +38,8 @@ class TAO_Notify_Timer;
  * @brief
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_SequencePushConsumer : public ACE_Event_Handler, public TAO_Notify_Consumer
+class TAO_Notify_Serv_Export TAO_Notify_SequencePushConsumer
+  : public TAO_Notify_Consumer
 {
 public:
   /// Constuctor
@@ -50,16 +51,21 @@ public:
   /// Init the Consumer
   void init (CosNotifyComm::SequencePushConsumer_ptr push_consumer, TAO_Notify_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
 
-  /// Shutdown the consumer
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void set_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer);
 
   /// TAO_Notify_Destroy_Callback methods.
   virtual void release (void);
 
-  /// Push <event> to this consumer.
-  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
+  /// Add request to a queue if necessary.
+  /// for Sequence it's always necessary.
+  virtual bool enqueue_if_necessary(
+    TAO_Notify_Method_Request_Event * request
+    ACE_ENV_ARG_DECL);
+
+  virtual bool dispatch_from_queue (
+    Request_Queue & requests,
+    ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon);
 
-  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
@@ -67,51 +73,23 @@ public:
   // Push event.
   virtual void push (const CosNotification::StructuredEvent & event ACE_ENV_ARG_DECL);
 
-  /// Push <event> to this consumer.
-  virtual void push (const CosNotification::EventBatch& event);
-
-  /// Override, Peer::qos_changed
-  virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
-
-protected:
-  /// When the pacing interval is used, handle_timeout () is called by
-  /// the reactor.
-  virtual int handle_timeout (const ACE_Time_Value& current_time,
-                              const void* act = 0);
-
-  /// Schedule timer
-  void schedule_timer (void);
+  /// Push a batch of events to this consumer.
+  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
 
-  /// Cancel timer
-  void cancel_timer (void);
+  /// Retrieve the ior of this peer
+  virtual bool get_ior (ACE_CString & iorstr) const;
 
-  ///= Protected Data Members
+  /// on reconnect we need to move events from the old consumer
+  /// to the new one
+  virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
+    ACE_ENV_ARG_DECL);
 
-  /// The Pacing Interval
-  ACE_Time_Value pacing_interval_;
-
-  /// Timer Id.
-  long timer_id_;
+protected:
 
   /// The Consumer
   CosNotifyComm::SequencePushConsumer_var push_consumer_;
 
-  /// The Message queue.
-  TAO_Notify_Message_Queue msg_queue_;
-
-  /// The Buffering Strategy
-  TAO_Notify_Batch_Buffering_Strategy* buffering_strategy_;
-
-  /// Max. batch size.
-  TAO_Notify_Property_Long max_batch_size_;
-
-  /// The Timer Manager that we use.
-  TAO_Notify_Timer* timer_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "SequencePushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_SEQUENCEPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.inl
deleted file mode 100644
index d050292323e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "SequencePushConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index d7fe6a1d682..e394b2a8f37 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -2,12 +2,10 @@
 
 #include "SequencePushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SequencePushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_SequencePushSupplier, "$Id$")
 
+#include "../Properties.h"
+
 TAO_Notify_SequencePushSupplier::TAO_Notify_SequencePushSupplier (TAO_Notify_ProxyConsumer* proxy)
   :TAO_Notify_Supplier (proxy)
 {
@@ -31,3 +29,23 @@ TAO_Notify_SequencePushSupplier::release (void)
   delete this;
   //@@ inform factory
 }
+bool
+TAO_Notify_SequencePushSupplier::get_ior (ACE_CString & iorstr) const
+{
+  bool result = false;
+  CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+  {
+    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
+  }
+  ACE_CATCHANY
+  {
+    ACE_ASSERT(0);
+  }
+  ACE_ENDTRY;
+  return result;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index a74f32fe500..bfebfd33ea2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_SEQUENCEPUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -45,14 +45,13 @@ public:
   /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
 
+  /// Retrieve the ior of this peer
+  virtual bool get_ior (ACE_CString & iorstr) const;
+
 protected:
   /// The Supplier
   CosNotifyComm::SequencePushSupplier_var push_supplier_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "SequencePushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_SEQUENCEPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.inl
deleted file mode 100644
index 507cd0b85c6..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "SequencePushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 1dbaafc894d..44027df4771 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -4,10 +4,7 @@
 #include "tao/debug.h"
 
 #include "tao/debug.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "RT_StructuredProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
+#include "../Method_Request_Dispatch.h"
 
 ACE_RCSID (Notify, TAO_Notify_RT_StructuredProxyPushSupplier, "$Id$")
 
@@ -34,12 +31,19 @@ TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant ser
   return object._retn ();
 }
 
+CORBA::Object_ptr
+TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant ,
+                                                     CORBA::Long ACE_ENV_ARG_DECL_NOT_USED)
+{
+   return CORBA::Object::_nil ();
+}
+
 void
-TAO_Notify_RT_StructuredProxyPushSupplier::push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::deliver_request (TAO_Notify_Method_Request_Dispatch & request ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      event->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
+      request.event()->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -72,14 +76,3 @@ TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_E
   ACE_ENDTRY;
 }
 
-void
-TAO_Notify_RT_StructuredProxyPushSupplier::push (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
-{
-  this->push (event.get () ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
-{
-  this->push_no_filtering (event.get () ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index 9ba900c87a1..0c5459698a4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -20,6 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "StructuredProxyPushSupplier.h"
+class TAO_Notify_Method_Request;
 
 /**
  * @class TAO_Notify_RT_StructuredProxyPushSupplier
@@ -27,7 +28,8 @@
  * @brief
  *
  */
-class TAO_RT_Notify_Export TAO_Notify_RT_StructuredProxyPushSupplier : public virtual TAO_Notify_StructuredProxyPushSupplier
+class TAO_RT_Notify_Export TAO_Notify_RT_StructuredProxyPushSupplier :
+  public virtual TAO_Notify_StructuredProxyPushSupplier
 {
 public:
   /// Constuctor
@@ -39,26 +41,20 @@ public:
   /// Activate this object and obtain the Event_Forwarder interface.
   virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
 
-  /// Dispatch Event to consumer
-  virtual void push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
+  /// Dummy method to prevent hidden TAO_Notify_Proxy::activate warning.
+  virtual CORBA::Object_ptr activate (PortableServer::Servant servant,
+                                      CORBA::Long id ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer
-  virtual void push (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
+  void deliver_request (TAO_Notify_Method_Request_Dispatch & request ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
   virtual void push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
-  /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
-
 private:
   /// Our ref.
   Event_Forwarder::StructuredProxyPushSupplier_var event_forwarder_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_StructuredProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.inl
deleted file mode 100644
index 2387811a56a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "RT_StructuredProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index 1ce4ede4465..e226e837d4a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -2,10 +2,6 @@
 
 #include "StructuredEvent.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "StructuredEvent.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$")
 
 #include "../PropertySeq.h"
@@ -36,16 +32,36 @@ TAO_Notify_StructuredEvent_No_Copy::~TAO_Notify_StructuredEvent_No_Copy ()
 {
 }
 
-TAO_Notify_Event*
-TAO_Notify_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+void
+TAO_Notify_StructuredEvent_No_Copy::marshal (TAO_OutputCDR & cdr) const
 {
-  TAO_Notify_Event* copy;
+  static const ACE_CDR::Octet STRUCTURED_CODE = MARSHAL_STRUCTURED;
+  cdr.write_octet (STRUCTURED_CODE);
+  cdr << (*this->notification_);
+}
+
+//static
+TAO_Notify_StructuredEvent *
+TAO_Notify_StructuredEvent_No_Copy::unmarshal (TAO_InputCDR & cdr)
+{
+  TAO_Notify_StructuredEvent * event = 0;
+  CosNotification::StructuredEvent body;
+  if (cdr >> body)
+  {
+    event = new TAO_Notify_StructuredEvent (body);
+  }
+  return event;
+}
 
-  ACE_NEW_THROW_EX (copy,
+TAO_Notify_Event *
+TAO_Notify_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+{
+  TAO_Notify_Event * new_event;
+  ACE_NEW_THROW_EX (new_event,
                     TAO_Notify_StructuredEvent (*this->notification_),
                     CORBA::NO_MEMORY ());
-
-  return copy;
+  ACE_CHECK_RETURN (0);
+  return new_event;
 }
 
 CORBA::Boolean
@@ -119,3 +135,10 @@ TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (const CosNotification::S
 TAO_Notify_StructuredEvent::~TAO_Notify_StructuredEvent ()
 {
 }
+
+const TAO_Notify_Event *
+TAO_Notify_StructuredEvent::queueable_copy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)const
+{
+  return this;
+}
+
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index d6edc36aa28..a1623ec454f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -12,7 +12,7 @@
 #define TAO_Notify_STRUCTUREDEVENT_H
 
 #include /**/ "ace/pre.h"
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,6 +22,8 @@
 #include "../EventType.h"
 #include "orbsvcs/CosNotificationC.h"
 
+class TAO_Notify_StructuredEvent;
+
 /**
  * @class TAO_Notify_StructuredEvent_No_Copy
  *
@@ -38,8 +40,8 @@ public:
   /// Destructor
   ~TAO_Notify_StructuredEvent_No_Copy ();
 
-  /// Copy the event.
-  virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
+  /// marshal this event into a CDR buffer (for persistence)
+  virtual void marshal (TAO_OutputCDR & cdr) const;
 
   CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
 
@@ -64,7 +66,14 @@ public:
   /// Push event to the Event_Forwarder interface
   virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
+  /// unmarshal this event from a CDR buffer (for persistence)
+  /// \return the new event, or NULL if this is the wrong type of event.
+  static TAO_Notify_StructuredEvent * unmarshal (TAO_InputCDR & cdr);
+
 protected:
+  /// returns a copy of this event allocated on the heap
+  virtual TAO_Notify_Event * copy (ACE_ENV_SINGLE_ARG_DECL) const;
+
   /// Structured Event
   const CosNotification::StructuredEvent* notification_;
 
@@ -89,14 +98,13 @@ public:
   /// Destructor
   ~TAO_Notify_StructuredEvent ();
 
+  /// returns this
+  virtual const TAO_Notify_Event * queueable_copy (ACE_ENV_SINGLE_ARG_DECL)const;
+
 protected:
   /// Copy of the Event.
   CosNotification::StructuredEvent notification_copy;
 };
 
-#if defined (__ACE_INLINE__)
-#include "StructuredEvent.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_STRUCTUREDEVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.inl
deleted file mode 100644
index f92715e126c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.inl
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-#include "StructuredEvent.h"
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index b29fb8f0e6b..8aaf6235aac 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -2,10 +2,6 @@
 
 #include "StructuredProxyPushConsumer.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "StructuredProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$")
 
 #include "ace/Refcounted_Auto_Ptr.h"
@@ -14,8 +10,7 @@ ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$")
 #include "StructuredPushSupplier.h"
 #include "StructuredEvent.h"
 #include "../AdminProperties.h"
-#include "../Method_Request_Lookup.h"
-#include "../Worker_Task.h"
+#include "../Properties.h"
 
 TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void)
 {
@@ -59,8 +54,9 @@ TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNot
 
   supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
   this->connect (supplier ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -81,10 +77,7 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica
     }
 
   TAO_Notify_StructuredEvent_No_Copy event (notification);
-
-  TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
-
-  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
+  this->push_i (&event ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -94,4 +87,43 @@ TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE
                    ))
 {
   this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+}
+const char *
+TAO_Notify_StructuredProxyPushConsumer::get_proxy_type_name (void) const
+{
+  return "structured_proxy_push_consumer";
+}
+
+void
+TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs)
+{
+  SuperClass::load_attrs(attrs);
+  ACE_CString ior;
+  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  {
+    CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
+    {
+      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CosNotifyComm::StructuredPushSupplier_var ps =
+        CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      // minor hack: suppress generating subscription updates during reload.
+      bool save_updates = this->updates_off_;
+      this->updates_off_ = true;
+      this->connect_structured_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      this->updates_off_ = save_updates;
+    }
+    ACE_CATCHANY
+    {
+      // if we can't reconnect to peer, tough...
+    }
+    ACE_ENDTRY;
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 4d12ce3a297..17b7059a08d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,6 +40,7 @@
 class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer
   : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
 {
+  typedef TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer> SuperClass;
   friend class TAO_Notify_Builder;
 
 public:
@@ -52,6 +53,8 @@ public:
   /// Release
   virtual void release (void);
 
+  virtual void load_attrs (const TAO_Notify::NVPList& attrs);
+
 protected:
 
   // = interface methods
@@ -69,14 +72,14 @@ protected:
     CosEventChannelAdmin::AlreadyConnected
   ));
 
-virtual void push_structured_event (
-    const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosEventComm::Disconnected
-  ));
+  virtual void push_structured_event (
+      const CosNotification::StructuredEvent & notification
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      CosEventComm::Disconnected
+    ));
 
   virtual void disconnect_structured_push_consumer (
     ACE_ENV_SINGLE_ARG_DECL
@@ -84,16 +87,14 @@ virtual void push_structured_event (
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
+
+  virtual const char * get_proxy_type_name (void) const;
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "StructuredProxyPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_STRUCTUREDPROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.inl
deleted file mode 100644
index 0ae697976e7..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "StructuredProxyPushConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 4417d59682a..6cbe8d178b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -1,14 +1,13 @@
 // $Id$
 
 #include "StructuredProxyPushSupplier.h"
+
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/debug.h"
 
 #include "StructuredPushConsumer.h"
+#include "../Properties.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "StructuredProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushSupplier, "$Id$")
 
@@ -57,6 +56,8 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot
   ACE_CHECK;
 
   this->connect (consumer ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -67,4 +68,39 @@ TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (ACE
 
 {
   this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+const char *
+TAO_Notify_StructuredProxyPushSupplier::get_proxy_type_name (void) const
+{
+  return "structured_proxy_push_supplier";
+}
+
+void
+TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs)
+{
+  SuperClass::load_attrs(attrs);
+  ACE_CString ior;
+  if (attrs.load("PeerIOR", ior) && ior.length() > 0)
+  {
+    CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
+    {
+      CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      CosNotifyComm::StructuredPushConsumer_var pc =
+        CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      this->connect_structured_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+    ACE_CATCHANY
+    {
+      // if we can't connect... tough
+    }
+    ACE_ENDTRY;
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index b308766a4ce..6ed8e9f084c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -47,6 +47,7 @@ TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
 class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushSupplier
   : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
 {
+  typedef TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier> SuperClass;
   friend class TAO_Notify_Builder;
 
 public:
@@ -59,6 +60,8 @@ public:
   /// Release
   virtual void release (void);
 
+  virtual void load_attrs (const TAO_Notify::NVPList& attrs);
+
   /// = Servant methods
   // = interface methods
   virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
@@ -83,6 +86,7 @@ public:
     CORBA::SystemException
   ));
 
+  virtual const char * get_proxy_type_name (void) const;
 
 };
 
@@ -90,10 +94,6 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "StructuredProxyPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_STRUCTUREDPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.inl
deleted file mode 100644
index 1e0efbafba2..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "StructuredProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 185ffe305a1..df093040c74 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -1,14 +1,12 @@
 // $Id$
 #include "StructuredPushConsumer.h"
-#include "ace/Refcounted_Auto_Ptr.h"
-#include "../Event.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "StructuredPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$")
 
+#include "../Properties.h"
+#include "../Event.h"
+#include "ace/Refcounted_Auto_Ptr.h"
+
 TAO_Notify_StructuredPushConsumer::TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy)
   :TAO_Notify_Consumer (proxy)
 {
@@ -35,18 +33,6 @@ TAO_Notify_StructuredPushConsumer::release (void)
 }
 
 void
-TAO_Notify_StructuredPushConsumer::push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
-{
-  event->push (this ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Notify_StructuredPushConsumer::push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL)
-{
-  event->push (this ACE_ENV_ARG_PARAMETER);
-}
-
-void
 TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event ACE_ENV_ARG_DECL)
 {
   CosNotification::StructuredEvent notification;
@@ -61,3 +47,44 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent&
 {
   this->push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
 }
+
+/// Push a batch of events to this consumer.
+void
+TAO_Notify_StructuredPushConsumer::push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL_NOT_USED)
+{
+  ACE_ASSERT(false);
+  ACE_UNUSED_ARG (event);
+  // TODO exception?
+}
+
+void
+TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
+    ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_StructuredPushConsumer* tmp = dynamic_cast<TAO_Notify_StructuredPushConsumer *> (old_consumer);
+  ACE_ASSERT(tmp != 0);
+  this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  this->schedule_timer(false);
+}
+
+bool
+TAO_Notify_StructuredPushConsumer::get_ior (ACE_CString & iorstr) const
+{
+  bool result = false;
+  CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+  {
+    CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
+  }
+  ACE_CATCHANY
+  {
+    ACE_ASSERT(0);
+  }
+  ACE_ENDTRY;
+  return result;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index 1dca5c25440..64cf2fbd424 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_STRUCTUREDPUSHCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,10 +46,7 @@ public:
   virtual void release (void);
 
   /// Push <event> to this consumer.
-  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
-
-  /// Push <event> to this consumer.
-  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
+//  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
@@ -57,14 +54,23 @@ public:
   /// Push <event> to this consumer.
   virtual void push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
 
+  /// Push a batch of events to this consumer.
+  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
+
+  /// Retrieve the ior of this peer
+  virtual bool get_ior (ACE_CString & iorstr) const;
+
+  /// on reconnect we need to move events from the old consumer
+  /// to the new one
+  virtual void reconnect_from_consumer (
+    TAO_Notify_Consumer* old_consumer
+    ACE_ENV_ARG_DECL);
+
+
 protected:
   /// The Consumer
   CosNotifyComm::StructuredPushConsumer_var push_consumer_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "StructuredPushConsumer.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.inl
deleted file mode 100644
index 24e952b7ae8..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "StructuredPushConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 12e343f11b7..e93ce72b0bb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -2,11 +2,8 @@
 
 #include "StructuredPushSupplier.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "StructuredPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$")
+#include "../Properties.h"
 
 TAO_Notify_StructuredPushSupplier::TAO_Notify_StructuredPushSupplier (TAO_Notify_ProxyConsumer* proxy)
   :TAO_Notify_Supplier (proxy)
@@ -31,3 +28,24 @@ TAO_Notify_StructuredPushSupplier::release (void)
   delete this;
   //@@ inform factory
 }
+
+bool
+TAO_Notify_StructuredPushSupplier::get_ior (ACE_CString & iorstr) const
+{
+  bool result = false;
+  CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+  {
+    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
+  }
+  ACE_CATCHANY
+  {
+    ACE_ASSERT(0);
+  }
+  ACE_ENDTRY;
+  return result;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index f2329db3542..9468e99cbeb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -13,7 +13,7 @@
 #define TAO_Notify_STRUCTUREDPUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "../notify_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -45,14 +45,13 @@ public:
   /// Release
   virtual void release (void);
 
+  /// Retrieve the ior of this peer
+  virtual bool get_ior (ACE_CString & iorstr) const;
+
 protected:
   /// The Supplier
   CosNotifyComm::StructuredPushSupplier_var push_supplier_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "StructuredPushSupplier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.inl
deleted file mode 100644
index 12cb29daaef..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "StructuredPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 37823207801..c0437f84ead 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -2,23 +2,25 @@
 
 #include "SupplierAdmin.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "SupplierAdmin.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (RT_Notify, 
-           TAO_Notify_SupplierAdmin, 
+ACE_RCSID (RT_Notify,
+           TAO_Notify_SupplierAdmin,
            "$Id$")
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "Builder.h"
-#include "Proxy.h"
+#include "ProxyConsumer.h"
 #include "EventChannel.h"
 #include "Subscription_Change_Worker.h"
 #include "Find_Worker_T.h"
 #include "Seq_Worker_T.h"
 #include "Properties.h"
 
+#include "tao/debug.h"
+//#define DEBUG_LEVEL 9
+#ifndef DEBUG_LEVEL
+# define DEBUG_LEVEL TAO_debug_level
+#endif //DEBUG_LEVEL
+
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_Proxy
                              , CosNotifyChannelAdmin::ProxyConsumer
                              , CosNotifyChannelAdmin::ProxyConsumer_ptr
@@ -28,7 +30,14 @@ TAO_Notify_ProxyConsumer_Find_Worker;
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker;
 
 TAO_Notify_SupplierAdmin::TAO_Notify_SupplierAdmin (void)
+  : TAO_Notify_Admin ()
+{
+}
+
+const char *
+TAO_Notify_SupplierAdmin::get_admin_type_name () const
 {
+  return "supplier_admin";
 }
 
 TAO_Notify_SupplierAdmin::~TAO_Notify_SupplierAdmin ()
@@ -81,6 +90,65 @@ TAO_Notify_SupplierAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 }
 
+TAO_Notify::Topology_Object*
+TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
+  CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+{
+  TAO_Notify::Topology_Object* result = this;
+  if (type == "proxy_push_consumer")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
+      , static_cast<int> (id)
+      ));
+    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+  else if (type == "structured_proxy_push_consumer")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
+      , static_cast<int> (id)
+      ));
+    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+  else if (type == "sequence_proxy_push_consumer")
+  {
+    if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
+      , static_cast<int> (id)
+      ));
+    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+  else
+  {
+    result = TAO_Notify_Admin::load_child (type, id, attrs ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+  }
+  return result;
+}
+
+TAO_Notify::Topology_Object*
+TAO_Notify_SupplierAdmin::load_proxy (
+  CORBA::Long id,
+  CosNotifyChannelAdmin::ClientType ctype,
+  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
+  TAO_Notify_ProxyConsumer * proxy =
+    bld->build_proxy (this
+               , ctype
+               , id
+               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN(0);
+  ACE_ASSERT(proxy != 0);
+  proxy->load_attrs (attrs);
+  return proxy;
+}
+
+
 void
 TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -112,11 +180,16 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdm
 {
   CosNotification::QoSProperties initial_qos;
 
-  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
+  CosNotifyChannelAdmin::ProxyConsumer_var proxy =
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
                                                                 , initial_qos
                                                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  return proxy._retn ();
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
@@ -131,11 +204,16 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
+  CosNotifyChannelAdmin::ProxyConsumer_var proxy =
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id,
                                                                 initial_qos
                                                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  return proxy._retn ();
 }
 
 
@@ -145,7 +223,12 @@ TAO_Notify_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  return TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
+  CosEventChannelAdmin::ProxyPushConsumer_var proxy =
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (proxy._retn ());
+  return proxy._retn ();
 }
 
 CosNotifyChannelAdmin::AdminID
@@ -217,7 +300,7 @@ TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & ad
                         CORBA::INTERNAL ());
     ACE_CHECK;
 
-    this->subscribed_types_.init (seq_added, seq_removed);
+    this->subscribed_types_.add_and_remove (seq_added, seq_removed);
 
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
@@ -231,7 +314,12 @@ TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
+  CosNotifyFilter::FilterID fid =
+    this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (fid);
+  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (fid);
+  return fid;
 }
 
 void
@@ -317,6 +405,23 @@ TAO_Notify_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdm
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyChannelAdmin::ProxyConsumer::_nil ());
 }
 
+TAO_Notify_ProxyConsumer *
+TAO_Notify_SupplierAdmin::find_proxy_consumer (
+    TAO_Notify::IdVec & id_path,
+    size_t position
+    ACE_ENV_ARG_DECL)
+{
+  TAO_Notify_ProxyConsumer * result = 0;
+  size_t path_size = id_path.size ();
+  if (position < path_size)
+  {
+    TAO_Notify_ProxyConsumer_Find_Worker find_worker;
+    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], *this->proxy_container_ ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
+    result = dynamic_cast <TAO_Notify_ProxyConsumer *> (proxy);
+  }
+  return result;
+}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index bb1233eeae0..608fe7871e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -24,6 +24,8 @@
 
 #include "Admin.h"
 
+class TAO_Notify_ProxyConsumer;
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -37,8 +39,8 @@
  * @brief Implementation of CosNotifyChannelAdmin::SupplierAdmin
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin 
-  : public virtual POA_NotifyExt::SupplierAdmin, 
+class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin
+  : public virtual POA_NotifyExt::SupplierAdmin,
     public virtual TAO_Notify_Admin
 {
 public:
@@ -58,8 +60,27 @@ public:
   /// Release
   virtual void release (void);
 
+  virtual const char * get_admin_type_name () const;
+
+  virtual TAO_Notify::Topology_Object* load_child (
+    const ACE_CString &type,
+    CORBA::Long id,
+    const TAO_Notify::NVPList& attrs
+    ACE_ENV_ARG_DECL);
+
+  TAO_Notify_ProxyConsumer * find_proxy_consumer (
+      TAO_Notify::IdVec & id_path,
+      size_t position
+      ACE_ENV_ARG_DECL);
+
 protected:
 
+    TAO_Notify::Topology_Object *load_proxy (
+    CORBA::Long id,
+    CosNotifyChannelAdmin::ClientType ctype,
+    const TAO_Notify::NVPList& attrs
+    ACE_ENV_ARG_DECL);
+
   /// = NotifyExt::SupplierAdmin methods
   CosNotifyChannelAdmin::ProxyConsumer_ptr
   obtain_notification_push_consumer_with_qos (
@@ -103,7 +124,7 @@ protected:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::ProxyNotFound));
 
-  virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr 
+  virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr
   obtain_notification_pull_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id
@@ -112,7 +133,7 @@ protected:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::AdminLimitExceeded));
 
-  virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr 
+  virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr
   obtain_notification_push_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id
@@ -127,7 +148,7 @@ protected:
   virtual ::CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_qos (const CosNotification::QoSProperties& qos 
+  virtual void set_qos (const CosNotification::QoSProperties& qos
                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotification::UnsupportedQoS));
@@ -160,7 +181,7 @@ protected:
                      CosNotifyFilter::FilterNotFound));
 
   virtual ::CosNotifyFilter::Filter_ptr get_filter (
-      CosNotifyFilter::FilterID filter 
+      CosNotifyFilter::FilterID filter
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -189,10 +210,6 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-#include "SupplierAdmin.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_Notify_SUPPLIERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index a234e7882d6..1bbd9c1f7cf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -96,9 +96,9 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
 }
 
 void
-TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Method_Request& request_copy = *method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Notify_Method_Request_Queueable& request_copy = *method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   if (this->buffering_strategy_->enqueue (request_copy) == -1)
     {
@@ -111,7 +111,7 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request_No_Copy& method_r
 int
 TAO_Notify_ThreadPool_Task::svc (void)
 {
-  TAO_Notify_Method_Request* method_request;
+  TAO_Notify_Method_Request_Queueable* method_request;
 
   while (!shutdown_)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index c2f41442f98..83ef404dcaa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -59,7 +59,7 @@ public:
   void init (const NotifyExt::ThreadPoolParams& tp_params, TAO_Notify_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
 
   /// Queue the request
-  virtual void execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
+  virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
 
   /// Shutdown task
   virtual void shutdown (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
index 222420161e0..b083b78b6e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
@@ -2,10 +2,6 @@
 
 #include "Timer_Queue.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Timer_Queue.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Notify, TAO_Notify_Timer_Queue, "$Id$")
 
 TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
index 17410fdfd4a..b5fd2fd3842 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -59,9 +59,5 @@ protected:
   ACE_Timer_Heap timer_queue_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Timer_Queue.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_TIMER_QUEUE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.inl b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.inl
deleted file mode 100644
index eeaf18f3e5f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "Timer_Queue.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
index ea6ce77fee6..1a06bdb98de 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
@@ -2,10 +2,6 @@
 
 #include "Timer_Reactor.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Timer_Reactor.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Timer_Reactor, "$Id$")
 
 #include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
index 0ec20ac850e..cadb1b14071 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -54,9 +54,5 @@ protected:
   ACE_Reactor* reactor_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Timer_Reactor.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_TIMER_REACTOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.inl b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.inl
deleted file mode 100644
index ba9c8b4cae1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-#include "Timer_Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
index ce36af1612b..7c1e767bd0f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
@@ -2,10 +2,6 @@
 
 #include "Worker_Task.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Worker_Task.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Worker_Task, "$Id$")
 
 TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index 394e3651059..63169cbf1ea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -48,7 +48,7 @@ public:
 
   ///= Public method to be implemented by subclasses.
   /// Exec the request.
-  virtual void execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL) = 0;
+  virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL) = 0;
 
   /// Shutdown task
   virtual void shutdown (void) = 0;
@@ -63,9 +63,5 @@ protected:
   virtual ~TAO_Notify_Worker_Task ();
 };
 
-#if defined (__ACE_INLINE__)
-#include "Worker_Task.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_WORKER_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/NotifyExt.idl b/TAO/orbsvcs/orbsvcs/NotifyExt.idl
index 7c94e9bcb26..5e0d9ca9b69 100644
--- a/TAO/orbsvcs/orbsvcs/NotifyExt.idl
+++ b/TAO/orbsvcs/orbsvcs/NotifyExt.idl
@@ -83,12 +83,55 @@ module NotifyExt
       unsigned long max_request_buffer_size;
   };
 
-  /*
-   * Extend the EventChannelFactory to have a shutdown method.
+  /**
+   * \brief An interface which gets registered with a ReconnectionRegistry.
+   *
+   * A supplier or consumer must implement this interface in order to
+   * allow the Notification Service to attempt to reconnect to it after
+   * a failure.  The supplier or consumer must register its instance of
+   * this interface with the ReconnectionRegistry.
+   */
+  interface ReconnectionCallback
+  {
+    /// Perform operations to reconnect to the Notification Service
+    /// after a failure.
+    void reconnect (in Object new_connection);
+
+    /// Check to see if the ReconnectionCallba ck is alive
+    boolean is_alive ();
+  };
+
+  /**
+   * \brief An interface that handles registration of suppliers and consumers.
+   *
+   * This registry should be implemented by an EventChannelFactory and
+   * will call the appropriate reconnect methods for all ReconnectionCallback
+   * objects registered with it.
+   */
+  interface ReconnectionRegistry
+  {
+    typedef long ReconnectionID;
+    ReconnectionID register_callback(in ReconnectionCallback reconection);
+
+    void unregister_callback (in ReconnectionID id);
+
+    /// Check to see if the ReconnectionRegistry is alive
+    boolean is_alive ();
+  };
+
+  /**
+   * Extend the EventChannelFactory to have a shutdown method
+   * and a Reconnection Registry
    */
-  interface EventChannelFactory : CosNotifyChannelAdmin::EventChannelFactory
+  interface EventChannelFactory
+    : CosNotifyChannelAdmin::EventChannelFactory
+    , ReconnectionRegistry
   {
     void destroy ();
+    /// save topology: for diagnostic and testing purposes
+    /// Normal topology save is automatic when connectivity persistence
+    /// is configured.
+    void save_topology();
   };
 
   interface ConsumerAdmin : CosNotifyChannelAdmin::ConsumerAdmin
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.idl b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
index e2a76808691..ba592f8abcd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.idl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
@@ -22,15 +22,15 @@ module PortableGroup
   typeprefix PortableGroup "omg.org";
 
   /// MembershipStyle
-  const string PG_MEMBERSHIP_STYLE = 
+  const string PG_MEMBERSHIP_STYLE =
   "org.omg.PortableGroup.MembershipStyle";
 
   /// InitialNumberMembers
-  const string PG_INITIAL_NUMBER_MEMBERS = 
+  const string PG_INITIAL_NUMBER_MEMBERS =
   "org.omg.PortableGroup.InitialNumberMembers";
 
   /// MinimumNumberMembers
-  const string PG_MINIMUM_NUMBER_MEMBERS = 
+  const string PG_MINIMUM_NUMBER_MEMBERS =
   "org.omg.PortableGroup.MinimumNumberMembers";
 
   /// Factories
@@ -248,7 +248,7 @@ module PortableGroup
      * @param location where the factory formerly created objects.
      * @throws MemberNotPresent if no factory is available for the given role at this location.
      */
-    void unregister_factory(in RoleName role, in Location location)
+    void unregister_factory(in RoleName role, in Location the_location)
       raises (MemberNotFound);
 
     /**
@@ -265,7 +265,7 @@ module PortableGroup
      * This is not an error.
      * @param location where the factories formerly created objects.
      */
-    void unregister_factory_by_location(in Location location);
+    void unregister_factory_by_location(in Location the_location);
 
     /**
      * List all the factories that create objects that fill a given role
@@ -281,7 +281,7 @@ module PortableGroup
      * This is not an error.
      * @param location where the factories create objects.
      */
-    FactoryInfos list_factories_by_location(in Location location);
+    FactoryInfos list_factories_by_location(in Location the_location);
 
   }; // end of FactoryRegistry
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index ced7ee744db..5f29ed23284 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -4,7 +4,7 @@
 project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba {
   sharedname   = TAO_PortableGroup
   idlflags    += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h
-  dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL
+  dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL TAO_PORTABLEGROUP_SIMPLE_BUILD_DLL
   tagchecks   += PortableGroup
   after       += FTORB_Utils
 
@@ -27,4 +27,15 @@ project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_
       PortableGroup
     }
   }
+
+  Header_Files {
+    PortableGroup/portablegroup_export.h
+  }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_PortableGroup.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 9c7ac3849e6..1ab07283025 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -348,7 +348,7 @@ void TAO::PG_FactoryRegistry::register_factory (
           ACE_ERROR(( LM_ERROR,
                       "%s: Attempt to register duplicate location %s for role: %s\n" ,
                       this->identity_.c_str(),
-                      ACE_static_cast(const char *, info.the_location[0].id),
+                      static_cast<const char *> (info.the_location[0].id),
           role));
       ACE_THROW (PortableGroup::MemberAlreadyPresent() );
     }
@@ -365,9 +365,9 @@ void TAO::PG_FactoryRegistry::register_factory (
   ACE_DEBUG(( LM_DEBUG,
     "%s: Added factory: [%d] %s@%s \n",
       this->identity_.c_str(),
-      ACE_static_cast(int,length + 1),
+      static_cast<int> (length + 1),
       role,
-      ACE_static_cast(const char *, factory_info.the_location[0].id)
+      static_cast<const char *> (factory_info.the_location[0].id)
     ));
 
   METHOD_RETURN(TAO::PG_FactoryRegistry::register_factory);
@@ -399,7 +399,7 @@ void TAO::PG_FactoryRegistry::unregister_factory (
           "%s: Unregistering  factory %s@%s\n",
             this->identity_.c_str(),
             role,
-            ACE_static_cast(const char *, location[0].id)
+            static_cast<const char *> (location[0].id)
           ));
         if (length > 1)
         {
@@ -548,9 +548,9 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
         ACE_ERROR((LM_INFO,
           "%s: Unregister_factory_by_location: Removing: [%d] %s@%s\n",
           this->identity_.c_str(),
-          ACE_static_cast (int, nInfo),
+          static_cast<int> (nInfo),
           role.c_str(),
-          ACE_static_cast (const char *, location[0].id)
+          static_cast<const char *> (location[0].id)
           ));
         found = 1;
         if (length > 1)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index b1cf9eb3ec1..f0da337d804 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -393,7 +393,7 @@ TAO_PG_GenericFactory::populate_object_group (
 
       const PortableGroup::FactoryInfo &factory_info = factory_infos[j];
 
-      if (j < ACE_static_cast (CORBA::ULong, initial_number_members))
+      if (j < static_cast<CORBA::ULong> (initial_number_members))
         {
           PortableGroup::GenericFactory_ptr factory =
             factory_info.the_factory.in ();
@@ -534,8 +534,7 @@ TAO_PG_GenericFactory::process_criteria (
       // members or the desired number of initial members cannot
       // possibly be created.
 
-      if (factory_infos_count < ACE_static_cast (CORBA::ULong,
-                                                 initial_number_members))
+      if (factory_infos_count < static_cast<CORBA::ULong> (initial_number_members))
         {
           unmet_criteria[uc].nam = name;
           unmet_criteria[uc++].val = value2;
@@ -563,8 +562,7 @@ TAO_PG_GenericFactory::process_criteria (
   if (membership_style == PortableGroup::MEMB_INF_CTRL)
     {
       if (minimum_number_members < initial_number_members
-          || ACE_static_cast (CORBA::ULong,
-                              minimum_number_members) > factory_infos_count)
+          || static_cast<CORBA::ULong> (minimum_number_members) > factory_infos_count)
         {
           unmet_criteria[uc].nam = name;
           unmet_criteria[uc++].val = value3;
@@ -637,12 +635,11 @@ TAO_PG_GenericFactory::check_minimum_number_members (
                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      if (count >= ACE_static_cast (CORBA::ULong, minimum_number_members))
+      if (count >= static_cast<CORBA::ULong> (minimum_number_members))
         return;
 
       const CORBA::ULong gap =
-        ACE_static_cast (CORBA::ULong,
-                         minimum_number_members) - count;
+        static_cast<CORBA::ULong> (minimum_number_members) - count;
 
       CORBA::ULong creation_count = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index e5b47d0434c..d9f3e51eaea 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -13,7 +13,7 @@
 #ifndef TAO_PG_GROUP_FACTORY_H
 #define TAO_PG_GROUP_FACTORY_H
 
-#include /**/ <ace/pre.h>
+#include /**/ "ace/pre.h"
 
 #include <ace/ACE.h>
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 3a95a39877f..39b65b8768b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -344,7 +344,7 @@ TAO_PG_ObjectGroupManager::locations_of_members (
 
   TAO_PG_MemberInfo_Set & member_infos = group_entry->member_infos;
 
-  locations->length (ACE_static_cast (CORBA::ULong, member_infos.size ()));
+  locations->length (static_cast<CORBA::ULong> (member_infos.size ()));
 
   CORBA::ULong loc = 0;
   TAO_PG_MemberInfo_Set::iterator end = member_infos.end ();
@@ -376,7 +376,7 @@ TAO_PG_ObjectGroupManager::groups_at_location (
   TAO_PG_ObjectGroup_Array * groups;
   if (this->location_map_.find (the_location, groups) == 0)
     {
-      CORBA::ULong len = ACE_static_cast (CORBA::ULong, groups->size ());
+      CORBA::ULong len = static_cast<CORBA::ULong> (groups->size ());
 
       ogs->length (len);
 
@@ -655,7 +655,7 @@ TAO_PG_ObjectGroupManager::member_count (
                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return ACE_static_cast (CORBA::ULong, group_entry->member_infos.size ());
+  return static_cast<CORBA::ULong> (group_entry->member_infos.size ());
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index cd3af12150b..825572e1f5c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -451,8 +451,7 @@ TAO::PG_Object_Group::increment_version (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("%T %n (%P|%t) - Setting IOGR version to %u\n"),
-                  ACE_static_cast (unsigned,
-                                   this->tagged_component_.object_group_ref_version)
+                  static_cast<unsigned> (this->tagged_component_.object_group_ref_version)
                   ));
     }
 
@@ -503,8 +502,7 @@ TAO::PG_Object_Group::distribute_iogr (ACE_ENV_SINGLE_ARG_DECL)
                               "IOGR to %s member: %s@%s.\n",
                               (info->is_primary_ ? "Primary" : "Backup"),
                               this->role_.c_str (),
-                              ACE_static_cast (const char *,
-                                               info->location_[0].id)
+                              static_cast<const char *> (info->location_[0].id)
                               ));
                 }
               //        dump_ior ("group", "iogr", this->tagged_component_.object_group_ref_version, iogr);
@@ -827,10 +825,8 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
                                   ACE_TEXT ("PG (%P|%t) Replica Factory ")
                                   ACE_TEXT ("@ %s refused create_object ")
                                   ACE_TEXT ("request for type %s\n"),
-                                  ACE_static_cast (const char *,
-                                                   factory_info.the_location[0].id),
-                                  ACE_static_cast (const char *,
-                                                   this->type_id_.in ())
+                                  static_cast<const char *> (factory_info.the_location[0].id),
+                                  static_cast<const char *> (this->type_id_.in ())
                                   ));
                     }
                 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 1dd180acf08..09f8ebba42c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -372,6 +372,6 @@ namespace TAO
   };
 } // namespace TAO
 
-#include /**/ <ace/post.h>
+#include /**/ "ace/post.h"
 
 #endif // TAO_PG_OBJECT_GROUP_H_
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index 1411062912e..a22ccfe961d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -50,7 +50,7 @@ PortableServer::ObjectId * TAO::PG_Object_Group_Manipulator::convert_ogid_to_oid
   char oid_str[11];
   ACE_OS::snprintf (oid_str, sizeof(oid_str),
                    "%lu",
-                   ACE_static_cast (ACE_UINT32,ogid));
+                   static_cast<ACE_UINT32> (ogid));
   oid_str[sizeof(oid_str) - 1] = '\0';
 
   return PortableServer::string_to_ObjectId (oid_str);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 3d49398a974..ebd50b066be 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -26,9 +26,10 @@
 #include "portablegroup_export.h"
 #include "orbsvcs/PortableGroupS.h"
 
+#include "ace/SString.h"
+#include "ace/Null_Mutex.h"
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager_T.h"
-#include "ace/Null_Mutex.h"
 
 
 /// Forward declarations.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index 50f350c3e12..451313c3bf7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -73,13 +73,13 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
     // @@ TODO: fix this
     const CosNaming::NameComponent & nc = nsName[0];
 
-    this->set_property (ACE_static_cast (const char *, nc.id),
+    this->set_property (static_cast<const char *> (nc.id),
                         property.val
                         ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
 #if 0
-    ACE_CString name = ACE_static_cast (const char *, nc.id);
+    ACE_CString name = static_cast<const char *> (nc.id);
 
     const PortableGroup::Value * value_copy;
     ACE_NEW_THROW_EX (value_copy,
@@ -134,7 +134,7 @@ void TAO::PG_Property_Set::remove (const PortableGroup::Properties & property_se
     // note assumption one level name with no kind
     // @@ TODO: fix this
     const CosNaming::NameComponent & nc = nsName[0];
-    ACE_CString name = ACE_static_cast (const char *, nc.id);
+    ACE_CString name = static_cast<const char *> (nc.id);
 
     const PortableGroup::Value * deleted_value;
     if ( 0 == this->values_.unbind (name, deleted_value))
@@ -219,7 +219,7 @@ void TAO::PG_Property_Set::merge_properties (ValueMap & merged_values) const
     this->defaults_->merge_properties (merged_values);
   }
   // note AFICT ACE_Hash_Map does not support const iterators, hence the const cast.
-  ValueMap & mutable_values = ACE_const_cast (ValueMap &, this->values_);
+  ValueMap & mutable_values = const_cast<ValueMap &> (this->values_);
   for (ValueMapIterator it = mutable_values.begin ();
         it != mutable_values.end ();
         ++it)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
index 412f0d6747c..58047cef329 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
@@ -1,13 +1,19 @@
 #include "PG_Utils.h"
+
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
 #include "tao/Stub.h"
 #include "tao/Tagged_Components.h"
 #include "tao/CDR.h"
 
+#include "ace/OS_NS_string.h"
+
+
 ACE_RCSID (PortableGroup,
            PG_Utils,
            "$Id$")
+
+
 namespace TAO
 {
   /*static*/ CORBA::Boolean
@@ -37,8 +43,7 @@ namespace TAO
       return retval;
 
     // Get the length of the CDR stream
-    CORBA::ULong length = ACE_static_cast (CORBA::ULong,
-                                           cdr.total_length ());
+    CORBA::ULong length = static_cast<CORBA::ULong> (cdr.total_length ());
 
     // Set the length
     tagged_components.component_data.length (length);
@@ -107,9 +112,7 @@ namespace TAO
         // Look for the primary
         if (pfile_tagged.get_component (tc) == 1)
           {
-            TAO_InputCDR cdr (ACE_reinterpret_cast (
-                                  const char*,
-                                  tc.component_data.get_buffer ()),
+            TAO_InputCDR cdr (reinterpret_cast<const char*> (tc.component_data.get_buffer ()),
                             tc.component_data.length ());
 
             CORBA::Boolean byte_order;
@@ -119,7 +122,7 @@ namespace TAO
             if (!cdr.good_bit ())
               return 0;
 
-            cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+            cdr.reset_byte_order (static_cast<int> (byte_order));
 
             cdr >> tg;
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp
index 82beb1b6072..fdde0eed0ce 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp
@@ -100,14 +100,14 @@ TAO_POA_Hooks::find_group_component_in_profile (const TAO_Profile* profile,
   const CORBA::Octet *buf =
     tagged_component.component_data.get_buffer ();
 
-  TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf),
+  TAO_InputCDR in_cdr (reinterpret_cast<const char*> (buf),
                        tagged_component.component_data.length ());
 
   // Extract the Byte Order.
   CORBA::Boolean byte_order;
   if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     return -1;
-  in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
+  in_cdr.reset_byte_order (static_cast<int> (byte_order));
 
   if ((in_cdr >> group) == 0)
     return -1;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index dfce327b82a..a4928c25730 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -99,7 +99,7 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
 
       // Removed the constness of profile.  We're not changing
       // anything, but need to call a nonconst function.
-      TAO_Profile* nc_profile = ACE_const_cast (TAO_Profile *, profile);
+      TAO_Profile* nc_profile = const_cast<TAO_Profile *> (profile);
       nc_profile->endpoint ()->addr_to_string (buffer, MAX_ADDR_LENGTH);
 
       if (acceptor->open (&orb_core,
@@ -178,7 +178,7 @@ TAO_PortableGroup_Acceptor_Registry::find (const TAO_Profile* profile,
       // Since the endpoint routine is nonconst, need to
       // cast away the constness even though we're not
       // changing anything.
-      TAO_Profile *nc_profile = ACE_const_cast (TAO_Profile *,profile);
+      TAO_Profile *nc_profile = const_cast<TAO_Profile *> (profile);
       if (entry->endpoint->is_equivalent (nc_profile->endpoint ()))
         return 1;
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index f632dcd0e42..234c493816d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -4,10 +4,11 @@
 
 #include "PortableGroup_Loader.h"
 #include "PortableGroup_ORBInitializer.h"
+#include "ace/Dynamic_Service.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (PortableGroup, 
-           PortableGroup_Loader, 
+ACE_RCSID (PortableGroup,
+           PortableGroup_Loader,
            "$Id$")
 
 TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void)
@@ -19,7 +20,6 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
                                 char* /*argv*/ [])
 {
   ACE_TRACE ("TAO_PortableGroup_Loader::init");
-
   // Register the ORB initializer.
   ACE_TRY_NEW_ENV
     {
@@ -56,10 +56,17 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
 int
 TAO_PortableGroup_Loader::Initializer (void)
 {
-  ACE_Service_Config::static_svcs ()->
-    insert (&ace_svc_desc_TAO_PortableGroup_Loader);
+  ACE_Service_Config::process_directive (ace_svc_desc_TAO_PortableGroup_Loader);
+  TAO_PortableGroup_Loader *tmp =
+    ACE_Dynamic_Service<TAO_PortableGroup_Loader>::instance (
+      "PortableGroup_Loader");
 
-  return 0;
+  if (tmp != 0)
+    {
+      return tmp->init (0, 0);
+    }
+
+  return -1;
 }
 
 ACE_STATIC_SVC_DEFINE (TAO_PortableGroup_Loader,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index d77ace4801f..9760e1c4e64 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -121,7 +121,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_
       // reset it so that the request demarshals correctly.
       TAO_InputCDR &tao_in = request.incoming ();
       ACE_Message_Block *msgblk =
-          ACE_const_cast (ACE_Message_Block *, tao_in.start ());
+          const_cast<ACE_Message_Block *> (tao_in.start ());
       char *read_ptr = msgblk->rd_ptr ();
 
       // Iterate through the list of ObjectKeys.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index 2bd5d890996..19c52c01f6a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -18,8 +18,8 @@
 #include "UIPMC_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (PortableGroup, 
-           UIPMC_Acceptor, 
+ACE_RCSID (PortableGroup,
+           UIPMC_Acceptor,
            "$Id$")
 
 
@@ -90,16 +90,13 @@ TAO_UIPMC_Acceptor::open (TAO_ORB_Core *orb_core,
 {
   this->orb_core_ = orb_core;
 
-  if (this->init_uipmc_properties () != 0)
-    return -1;
-
   if (this->hosts_ != 0)
     {
       // The hostname cache has already been set!
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("UIPMC_Acceptor::open - "),
+                         ACE_TEXT ("UIPMC_Acceptor::open - ")
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }
@@ -108,10 +105,8 @@ TAO_UIPMC_Acceptor::open (TAO_ORB_Core *orb_core,
     return -1;
 
   if (major >=0 && minor >= 0)
-    this->version_.set_version (ACE_static_cast (CORBA::Octet,
-                                                 major),
-                                ACE_static_cast (CORBA::Octet,
-                                                 minor));
+    this->version_.set_version (static_cast<CORBA::Octet> (major),
+                                static_cast<CORBA::Octet> (minor));
   // Parse options
   if (this->parse_options (options) == -1)
     return -1;
@@ -178,8 +173,7 @@ TAO_UIPMC_Acceptor::open_i (const ACE_INET_Addr& addr,
                             ACE_Reactor *reactor)
 {
   ACE_NEW_RETURN (this->connection_handler_,
-                  TAO_UIPMC_Connection_Handler (this->orb_core_,
-                                                0 /* TAO_UIPMC_Properties */),
+                  TAO_UIPMC_Connection_Handler (this->orb_core_),
                   -1);
 
   this->connection_handler_->local_addr (addr);
@@ -307,7 +301,7 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
       if (j < option_count - 1)
         end = options.find (option_delimiter, begin);
       else
-        end = ACE_static_cast (int, len - begin); // Handle last endpoint differently
+        end = static_cast<int> (len - begin); // Handle last endpoint differently
 
       if (end == begin)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -319,7 +313,7 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
 
           int slot = opt.find ("=");
 
-          if (slot == ACE_static_cast (int, len - 1)
+          if (slot == static_cast<int> (len - 1)
               || slot == ACE_CString::npos)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) UIPMC option <%s> is ")
@@ -353,10 +347,3 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
     }
   return 0;
 }
-
-int
-TAO_UIPMC_Acceptor::init_uipmc_properties (void)
-{
-  // @@ Michael: We use UDP, so we do not set TCP settings.
-  return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
index 22f203370cb..a4a5c61647e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
@@ -115,10 +115,6 @@ protected:
   /// Parse protocol specific options.
   virtual int parse_options (const char *options);
 
-  /// Obtain uipmc properties that must be used by this acceptor, i.e.,
-  /// initialize <uipmc_properties_>.
-  int init_uipmc_properties (void);
-
 protected:
 
   /// Array of ACE_INET_Addr instances, each one corresponding to a
@@ -148,10 +144,6 @@ protected:
   /// ORB Core.
   TAO_ORB_Core *orb_core_;
 
-  /// UIPMC configuration properties to be used for all
-  /// connections opened by this acceptor.
-  TAO_UIPMC_Properties uipmc_properties_;
-
 private:
 
   TAO_UIPMC_Connection_Handler *connection_handler_;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 870c1dd57e4..3b4dfdfdabc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -19,10 +19,6 @@
 #include "UIPMC_Transport.h"
 #include "UIPMC_Endpoint.h"
 
-#if !defined (__ACE_INLINE__)
-# include "UIPMC_Connection_Handler.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID(tao, UIPMC_Connect, "$Id$")
 
 TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t)
@@ -30,8 +26,7 @@ TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *
     TAO_Connection_Handler (0),
     udp_socket_ (ACE_sap_any_cast (ACE_INET_Addr &)),
     mcast_socket_ (),
-    using_mcast_ (0),
-    uipmc_properties_ (0)
+    using_mcast_ (0)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -42,15 +37,12 @@ TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *
 }
 
 
-TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                            void *arg)
+TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (TAO_ORB_Core *orb_core)
   : TAO_UIPMC_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
     udp_socket_ (ACE_sap_any_cast (ACE_INET_Addr &)),
     mcast_socket_ (),
-    using_mcast_ (0),
-    uipmc_properties_ (ACE_static_cast
-                       (TAO_UIPMC_Properties *, arg))
+    using_mcast_ (0)
 {
   TAO_UIPMC_Transport* specific_transport = 0;
   ACE_NEW(specific_transport,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
index 46f8abcbd0b..36906b9aa17 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
@@ -39,25 +39,6 @@ class TAO_Pluggable_Messaging;
 // ****************************************************************
 
 /**
- * @class TAO_UIPMC_Properties
- *
- * @brief UIPMC properties specification for a set of
- *  connections.
- *
- */
-
-class TAO_PortableGroup_Export TAO_UIPMC_Properties
-{
-
-public:
-  int ttl;
-};
-
-
-
-// ****************************************************************
-
-/**
  * @class TAO_UIPMC_Connection_Handler
  *
  * @brief  Handles requests on a single connection.
@@ -78,8 +59,7 @@ public:
 
   /// Constructor. <arg> parameter is used by the Acceptor to pass the
   /// protocol configuration properties for this connection.
-  TAO_UIPMC_Connection_Handler (TAO_ORB_Core *orb_core,
-                               void *arg);
+  TAO_UIPMC_Connection_Handler (TAO_ORB_Core *orb_core);
 
 
   /// Destructor.
@@ -162,16 +142,7 @@ protected:
   virtual int release_os_resources (void);
   //@}
 
-private:
-
-  /// UIPMC configuration for this connection.
-  TAO_UIPMC_Properties *uipmc_properties_;
 };
 
-
-#if defined (__ACE_INLINE__)
-#include "UIPMC_Connection_Handler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_UIPMC_CONNECTION_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.i
deleted file mode 100644
index 7f2b3228624..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index efd15ccd74f..6118681e9c4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -108,8 +108,7 @@ TAO_UIPMC_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
     return -1;
 
   TAO_UIPMC_Endpoint *uipmc_endpoint =
-    ACE_dynamic_cast (TAO_UIPMC_Endpoint *,
-                      endpoint );
+    dynamic_cast<TAO_UIPMC_Endpoint *> (endpoint );
 
   if (uipmc_endpoint == 0)
     return -1;
@@ -143,8 +142,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *,
                                       ACE_Time_Value *)
 {
   TAO_UIPMC_Endpoint *uipmc_endpoint =
-    ACE_dynamic_cast (TAO_UIPMC_Endpoint *,
-                      desc.endpoint ());
+    dynamic_cast<TAO_UIPMC_Endpoint *> (desc.endpoint ());
 
   if (uipmc_endpoint == 0)
     return 0;
@@ -158,8 +156,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *,
     {
       TAO_UIPMC_Connection_Handler *svc_handler_i = 0;
       ACE_NEW_RETURN (svc_handler_i,
-                      TAO_UIPMC_Connection_Handler (this->orb_core (),
-                                                   0 /* TAO_UIPMC_Properties */),
+                      TAO_UIPMC_Connection_Handler (this->orb_core ()),
                       0);
 
       svc_handler_i->local_addr (ACE_sap_any_cast (ACE_INET_Addr &));
@@ -254,13 +251,6 @@ TAO_UIPMC_Connector::object_key_delimiter (void) const
 }
 
 int
-TAO_UIPMC_Connector::init_uipmc_properties (void)
-{
-  // @@ Michael: We have no TCP, so we have no TCP properties.
-  return 0;
-}
-
-int
 TAO_UIPMC_Connector::cancel_svc_handler (
   TAO_Connection_Handler * svc_handler)
 {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index 1a61217fe5f..ccb8ee68b7a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -70,19 +70,9 @@ protected:
 
   virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Obtain UIPMC properties that must be used by this connector, i.e.,
-  /// initialize <uipmc_properties_>.
-  int init_uipmc_properties (void);
-
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
-protected:
-
-  /// UIPMC configuration properties to be used for all
-  /// connections established by this connector.
-  TAO_UIPMC_Properties uipmc_properties_;
-
 private:
   // @@ Michael: UDP Addition
   ACE_Hash_Map_Manager_Ex < ACE_INET_Addr,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index 6f17ee9c687..04ef32df9ce 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -113,11 +113,9 @@ TAO_UIPMC_Endpoint::duplicate (void)
 CORBA::Boolean
 TAO_UIPMC_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 {
-  TAO_Endpoint *endpt = ACE_const_cast (TAO_Endpoint *,
-                                        other_endpoint);
+  TAO_Endpoint *endpt = const_cast<TAO_Endpoint *> (other_endpoint);
 
-  TAO_UIPMC_Endpoint *endpoint = ACE_dynamic_cast (TAO_UIPMC_Endpoint *,
-                                                   endpt);
+  TAO_UIPMC_Endpoint *endpoint = dynamic_cast<TAO_UIPMC_Endpoint *> (endpt);
   if (endpoint == 0)
     return 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
index bf301d061fe..2f8473c5a73 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
@@ -29,7 +29,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
       if (current_iov_len <= max_length)
         {
           // Return the full data portion.
-          block.iov_len = ACE_static_cast (u_long, current_iov_len);
+          block.iov_len = static_cast<u_long> (current_iov_len);
           block.iov_base = this->iov_[this->iov_index_].iov_base;
 
           // Go to the next block.
@@ -41,14 +41,13 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
         {
           // Let the caller use the first part of this
           // message block.
-          block.iov_len = ACE_static_cast (u_long, max_length);
+          block.iov_len = static_cast<u_long> (max_length);
           block.iov_base = this->iov_[this->iov_index_].iov_base;
 
           // Break up the block.
           this->iov_len_left_ = current_iov_len - max_length;
           this->iov_ptr_ =
-            ACE_reinterpret_cast (char *,
-                                  ACE_reinterpret_cast (char *, block.iov_base)
+            reinterpret_cast<char *> (reinterpret_cast<char *> (block.iov_base)
                                   + max_length);
           this->state_ = INTRA_BLOCK;
 
@@ -61,7 +60,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
       if (this->iov_len_left_ <= max_length)
         {
           // Return everything that's left in the block.
-          block.iov_len = ACE_static_cast (u_long, this->iov_len_left_);
+          block.iov_len = static_cast<u_long> (this->iov_len_left_);
           block.iov_base = this->iov_ptr_;
 
           // Go to the next block.
@@ -75,7 +74,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length,
       else
         {
           // Split a little more off the block.
-          block.iov_len = ACE_static_cast (u_long, this->iov_len_left_);
+          block.iov_len = static_cast<u_long> (this->iov_len_left_);
           block.iov_base = this->iov_ptr_;
 
           this->iov_len_left_ -= max_length;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index ecd5b159eff..d24c1a2f721 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -19,10 +19,6 @@ ACE_RCSID (PortableGroup,
            UIPMC_Profile,
            "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "UIPMC_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 static const char prefix_[] = "uipmc";
 
 // UIPMC doesn't support object keys, so send profiles by default in the GIOP 1.2 target
@@ -339,8 +335,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
     }
 
   CORBA::UShort mcast_port =
-      ACE_static_cast (CORBA::UShort,
-        ACE_OS::strtoul (ace_str.c_str () + pos, 0, 10));
+      static_cast<CORBA::UShort> (ACE_OS::strtoul (ace_str.c_str () + pos, 0, 10));
 
   //
   // Finally, set all of the fields of the profile.
@@ -359,7 +354,7 @@ CORBA::Boolean
 TAO_UIPMC_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 {
   const TAO_UIPMC_Profile *op =
-    ACE_dynamic_cast (const TAO_UIPMC_Profile *, other_profile);
+    dynamic_cast<const TAO_UIPMC_Profile *> (other_profile);
 
   if (op == 0)
     return 0;
@@ -415,7 +410,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                    1 /* colon separator */ +
                    5 /* port number */);
 
-  char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen));
+  char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen));
 
   ACE_OS::sprintf (buf,
                    "corbaloc:%s://1.0@%s:%d",
@@ -447,7 +442,7 @@ TAO_UIPMC_Profile::create_tagged_profile (void)
       this->create_profile_body (encap);
 
       CORBA::ULong length =
-        ACE_static_cast(CORBA::ULong,encap.total_length ());
+        static_cast<CORBA::ULong> (encap.total_length ());
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       // Place the message block in to the Sequence of Octets that we
@@ -504,14 +499,14 @@ TAO_UIPMC_Profile::decode_endpoints (void)
       const CORBA::Octet *buf =
         tagged_component.component_data.get_buffer ();
 
-      TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf),
+      TAO_InputCDR in_cdr (reinterpret_cast<const char*> (buf),
                            tagged_component.component_data.length ());
 
       // Extract the Byte Order.
       CORBA::Boolean byte_order;
       if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
         return -1;
-      in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
+      in_cdr.reset_byte_order (static_cast<int> (byte_order));
 
       // Extract endpoints sequence.
       TAO_UIPMCEndpointSequence endpoints;
@@ -593,8 +588,7 @@ TAO_UIPMC_Profile::update_cached_group_component (void)
 
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = IOP::TAG_GROUP;
-  tagged_component.component_data.length (ACE_static_cast (CORBA::ULong,
-                                                           length));
+  tagged_component.component_data.length (static_cast<CORBA::ULong> (length));
   CORBA::Octet *buf =
     tagged_component.component_data.get_buffer ();
 
@@ -678,8 +672,7 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile,
 //#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
 //  TAO_InputCDR cdr (profile.profile_data.mb ());
 //#else
-  TAO_InputCDR cdr (ACE_reinterpret_cast(const char*,
-                                         profile.profile_data.get_buffer ()),
+  TAO_InputCDR cdr (reinterpret_cast<const char*> (profile.profile_data.get_buffer ()),
                     profile.profile_data.length ());
 //#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
@@ -687,7 +680,7 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile,
   CORBA::Boolean byte_order;
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     return -1;
-  cdr.reset_byte_order (ACE_static_cast(int, byte_order));
+  cdr.reset_byte_order (static_cast<int> (byte_order));
 
   // Read and verify major, minor versions, ignoring UIPMC profiles
   // whose versions we don't understand.
@@ -736,13 +729,13 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile,
   const CORBA::Octet *buf =
     tagged_component.component_data.get_buffer ();
 
-  TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf),
+  TAO_InputCDR in_cdr (reinterpret_cast<const char*> (buf),
                        tagged_component.component_data.length ());
 
   // Extract the Byte Order.
   if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     return -1;
-  in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
+  in_cdr.reset_byte_order (static_cast<int> (byte_order));
 
   if ((in_cdr >> group) == 0)
     return -1;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index d36affa5d6a..e6c0bf96e39 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -153,9 +153,5 @@ private:
 
 };
 
-#if defined (__ACE_INLINE__)
-# include "UIPMC_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_PROFILE_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index bcdd093c8d8..586decbfffa 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -22,11 +22,6 @@
 #include "tao/GIOP_Message_Base.h"
 #include "tao/GIOP_Message_Lite.h"
 
-#if !defined (__ACE_INLINE__)
-# include "UIPMC_Transport.i"
-#endif /* ! __ACE_INLINE__ */
-
-
 ACE_RCSID (PortableGroup,
            UIPMC_Transport,
            "$Id$")
@@ -130,15 +125,15 @@ TAO_UIPMC_Transport::write_unique_id (TAO_OutputCDR &miop_hdr, unsigned long uni
 
   CORBA::Octet unique_id[MIOP_ID_DEFAULT_LENGTH];
 
-  unique_id[0] = ACE_static_cast (CORBA::Octet, unique & 0xff);
-  unique_id[1] = ACE_static_cast (CORBA::Octet, (unique & 0xff00) >> 8);
-  unique_id[2] = ACE_static_cast (CORBA::Octet, (unique & 0xff0000) >> 16);
-  unique_id[3] = ACE_static_cast (CORBA::Octet, (unique & 0xff000000) >> 24);
+  unique_id[0] = static_cast<CORBA::Octet> (unique & 0xff);
+  unique_id[1] = static_cast<CORBA::Octet> ((unique & 0xff00) >> 8);
+  unique_id[2] = static_cast<CORBA::Octet> ((unique & 0xff0000) >> 16);
+  unique_id[3] = static_cast<CORBA::Octet> ((unique & 0xff000000) >> 24);
 
-  unique_id[4] = ACE_static_cast (CORBA::Octet, counter & 0xff);
-  unique_id[5] = ACE_static_cast (CORBA::Octet, (counter & 0xff00) >> 8);
-  unique_id[6] = ACE_static_cast (CORBA::Octet, (counter & 0xff0000) >> 16);
-  unique_id[7] = ACE_static_cast (CORBA::Octet, (counter & 0xff000000) >> 24);
+  unique_id[4] = static_cast<CORBA::Octet> (counter & 0xff);
+  unique_id[5] = static_cast<CORBA::Octet> ((counter & 0xff00) >> 8);
+  unique_id[6] = static_cast<CORBA::Octet> ((counter & 0xff0000) >> 16);
+  unique_id[7] = static_cast<CORBA::Octet> ((counter & 0xff000000) >> 24);
 
   unique_id[8] = 0;
   unique_id[9] = 0;
@@ -239,8 +234,7 @@ TAO_UIPMC_Transport::send (iovec *iov, int iovcnt,
 
   miop_hdr.write_octet_array (miop_magic, 4);   // Magic
   miop_hdr.write_octet (0x10);                  // Version
-  CORBA::Octet *flags_field = ACE_reinterpret_cast (CORBA::Octet *,
-                                                    miop_hdr.current ()->wr_ptr ());
+  CORBA::Octet *flags_field = reinterpret_cast<CORBA::Octet *> (miop_hdr.current ()->wr_ptr ());
 
   // Write flags octet:
   //  Bit        Description
@@ -252,22 +246,20 @@ TAO_UIPMC_Transport::send (iovec *iov, int iovcnt,
   // Packet Length
   // NOTE: We can save pointers and write them later without byte swapping since
   //       in CORBA, the sender chooses the endian.
-  CORBA::UShort *packet_length = ACE_reinterpret_cast (CORBA::UShort *,
-                                                       miop_hdr.current ()->wr_ptr ());
+  CORBA::UShort *packet_length = reinterpret_cast<CORBA::UShort *> (miop_hdr.current ()->wr_ptr ());
   miop_hdr.write_short (0);
 
   // Packet number
-  CORBA::ULong *packet_number = ACE_reinterpret_cast (CORBA::ULong *,
-                                                      miop_hdr.current ()->wr_ptr ());
+  CORBA::ULong *packet_number = reinterpret_cast<CORBA::ULong *> (miop_hdr.current ()->wr_ptr ());
   miop_hdr.write_ulong (0);
 
   // Number of packets field
   miop_hdr.write_ulong (num_fragments);
 
   // UniqueId
-  ptrdiff_t unique_id = ACE_reinterpret_cast (ptrdiff_t, iov);
+  ptrdiff_t unique_id = reinterpret_cast<ptrdiff_t> (iov);
   this->write_unique_id (miop_hdr,
-                         ACE_static_cast (unsigned long, unique_id));
+                         static_cast<unsigned long> (unique_id));
 
   // Send the buffers.
   current_fragment = &fragments[0];
@@ -392,20 +384,20 @@ TAO_UIPMC_Transport::recv (char *buf,
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
   if (byte_order == ACE_CDR_BYTE_ORDER)
     {
-      id_length = *ACE_reinterpret_cast (ACE_CDR::ULong*, &buf[MIOP_ID_LENGTH_OFFSET]);
+      id_length = *reinterpret_cast<ACE_CDR::ULong*> (&buf[MIOP_ID_LENGTH_OFFSET]);
     }
   else
     {
       ACE_CDR::swap_4 (&buf[MIOP_ID_LENGTH_OFFSET],
-                       ACE_reinterpret_cast (char*, &id_length));
+                       reinterpret_cast<char*> (&id_length));
     }
 #else
-  id_length = *ACE_reinterpret_cast (ACE_CDR::ULong*, &buf[MIOP_ID_LENGTH_OFFSET]);
+  id_length = *reinterpret_cast<ACE_CDR::ULong*> (&buf[MIOP_ID_LENGTH_OFFSET]);
 #endif /* ACE_DISABLE_SWAP_ON_READ */
 
   // Make sure that the length field is legal.
   if (id_length > MIOP_MAX_LENGTH_ID ||
-      ACE_static_cast (ssize_t, MIOP_ID_CONTENT_OFFSET + id_length) > n)
+      static_cast<ssize_t> (MIOP_ID_CONTENT_OFFSET + id_length) > n)
     {
       if (TAO_debug_level > 0)
         {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 945f6067706..975cb5fbf54 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -123,9 +123,5 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "UIPMC_Transport.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_TRANSPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.i
deleted file mode 100644
index 81bf354f364..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-//$Id$
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index 7bc53a8f457..a640656a52a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -22,10 +22,16 @@ TAO_UIPMC_Wait_Never::register_handler (void)
   return -1;
 }
 
-int
-TAO_UIPMC_Wait_Never::non_blocking (void)
+bool
+TAO_UIPMC_Wait_Never::non_blocking (void) const
+{
+  return true;
+}
+
+bool
+TAO_UIPMC_Wait_Never::can_process_upcalls (void) const
 {
-  return 1;
+  return true;
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
index ee56d1b822a..799d09e2e64 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -46,7 +46,8 @@ public:
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
   virtual int register_handler (void);
-  virtual int non_blocking (void);
+  virtual bool non_blocking (void) const;
+  virtual bool can_process_upcalls (void) const;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index c8345528754..7774be75c22 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -696,7 +696,7 @@ CORBA::ULong
 TAO_PropertySet::get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return ACE_static_cast (CORBA::ULong, this->hash_table_.current_size ());
+  return static_cast<CORBA::ULong> (this->hash_table_.current_size ());
 }
 
 //  Returns all of the property names currently defined in the
@@ -1738,8 +1738,7 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
   if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
     return 0;
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong,
-                                       this->iterator_.map ().current_size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (this->iterator_.map ().current_size ());
 
   CORBA::ULong len = 0;
   if (how_many <= size)
@@ -1834,8 +1833,7 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
   if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
     return 0;
 
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong,
-                                      this->iterator_.map ().current_size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (this->iterator_.map ().current_size ());
 
   CORBA::ULong len;
   if (how_many <= size)
diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
index 7e27973fab9..f7f6b360f08 100644
--- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
@@ -16,4 +16,7 @@ project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, rtportableserver {
       Event/EC_RTCORBA_Factory.cpp
     }
   }
+
+  Template_Files {
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
index 4036357fd64..07ad8367cdf 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
@@ -457,9 +457,7 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request (
       // Convert the priority to an octet stream
       // (that is how service contexts send data)
       sc.context_data =
-        ACE_reinterpret_cast(
-          CORBA::OctetSeq &,
-          *this->codec_->encode (the_priority_as_any));
+        reinterpret_cast<CORBA::OctetSeq &> (*this->codec_->encode (the_priority_as_any));
       ACE_TRY_CHECK;
 
       // add the service context
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
index 9133a5d8df5..5ef02463424 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
@@ -465,8 +465,7 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
       ACE_CHECK;
 
       /// Make the shared memory a place for a lock list
-      this->lock_array_ = ACE_static_cast(CosSchedulingLockNode *,
-                                          this->mem_.malloc(CosSchedulingLockList_space));
+      this->lock_array_ = static_cast<CosSchedulingLockNode *> (this->mem_.malloc(CosSchedulingLockList_space));
       /// get the pointer to the list of locks and
       /// construct a lock list manager object
       if (this->lock_array_ == 0)
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
index 2fa91e392b5..a8d071fc9fd 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
@@ -22,8 +22,7 @@ ACE_INLINE u_long
 TAO::CosSchedulingObjectMap_Hash_Key::operator () (
   const COS_SCHEDULING_OBJECT_NAME_KEY &key) const
 {
-      u_long value;
-      value = key->_hash(LONG_MAX);
+      u_long value = key->_hash(ACE_UINT32_MAX);
       return value;
 }
 
@@ -31,5 +30,5 @@ ACE_INLINE u_long
 TAO::CosSchedulingInvocation_Hash_key::operator () (
   const COS_SCHEDULING_INVOCATION_KEY &key) const
 {
-  return ACE_static_cast(u_long, key);
+  return static_cast<u_long> (key);
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index 0d16633435e..30e925446a5 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -48,7 +48,6 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging {
       Event/EC_Basic_Factory.cpp
       Event/EC_Basic_Filter_Builder.cpp
       Event/EC_Bitmask_Filter.cpp
-      Event/EC_Busy_Lock.cpp
       Event/EC_Channel_Destroyer.cpp
       Event/EC_Conjunction_Filter.cpp
       Event/EC_ConsumerAdmin.cpp
@@ -69,7 +68,6 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging {
       Event/EC_Gateway_IIOP_Factory.cpp
       Event/EC_Group_Scheduling.cpp
       Event/EC_Lifetime_Utils.cpp
-      Event/EC_Lifetime_Utils_T.cpp
       Event/EC_Masked_Type_Filter.cpp
       Event/EC_MT_Dispatching.cpp
       Event/EC_Negation_Filter.cpp
@@ -98,4 +96,9 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging {
       Event/EC_UDP_Admin.cpp
     }
   }
+
+  Template_Files {
+    Event/EC_Busy_Lock.cpp
+    Event/EC_Lifetime_Utils_T.cpp
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index 24467ed2e42..3f21416f2b1 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -21,4 +21,7 @@ project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin_serv
       Log/RTEventLogNotification.cpp
     }
   }
+
+  Template_Files {
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
index 05c798afe81..65cc129d41c 100644
--- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
@@ -18,4 +18,7 @@ project(RTKokyuEvent) : orbsvcslib, core, rtevent, rtsched, kokyu {
       Event/EC_Kokyu_Scheduling.cpp
     }
   }
+
+  Template_Files {
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
index 5dc01d0f008..120580ea013 100644
--- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
@@ -25,9 +25,6 @@ project(RTOLDEvent) : orbsvcslib, core, rtevent, rtsched {
     }
   }
 
-  // Since the resource file for RTOLDEvent does
-  // not match the project name, we must explicitly list it.
-  Resource_Files {
-    RTOldEvent.rc
+  Template_Files {
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index da37af755ca..ef34a2ec2a6 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -22,6 +22,9 @@ project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils {
     }
   }
 
+  Template_Files {
+  }
+
   // To avoid picking up RTSchedEvent.rc as well, explicitly list the files.
   Resource_Files {
     RTSched.rc
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
index 9772d7c9422..d9573d62649 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
@@ -19,4 +19,7 @@ project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched {
       Event/EC_Sched_Filter_Builder.cpp
     }
   }
+
+  Template_Files {
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
index 4ccbf882a26..fe038ea6723 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
@@ -20,4 +20,7 @@ project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv {
       Notify/Structured/RT_StructuredProxyPushSupplier.cpp
     }
   }
+
+  Template_Files {
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 1d8f66b8315..57df6a30ee3 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -4,10 +4,6 @@
 #include "orbsvcs/Runtime_Scheduler.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Runtime_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (orbsvcs,
            Runtime_Scheduler,
            "$Id$")
@@ -131,10 +127,10 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
       || rt_info_[handle - 1].cached_execution_time != cached_time
       || rt_info_[handle - 1].period != period
       || rt_info_[handle - 1].criticality != criticality
-      || rt_info_[handle - 1].importance != ACE_static_cast (CORBA::Long, importance)
+      || rt_info_[handle - 1].importance != static_cast<CORBA::Long> (importance)
       || rt_info_[handle - 1].quantum != quantum
       || rt_info_[handle - 1].info_type != info_type
-      || rt_info_[handle - 1].threads != ACE_static_cast (CORBA::Long, threads))
+      || rt_info_[handle - 1].threads != static_cast<CORBA::Long> (threads))
     ACE_ERROR ((LM_ERROR,
                 "invalid data for RT_Info: %s\n",
                 (const char*)rt_info_[handle - 1].entry_point));
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 18243c7d367..caf18c8b441 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -279,9 +279,5 @@ private:
   // The array of precomputed RT_Info structures.
 };
 
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Runtime_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_RUNTIME_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i
deleted file mode 100644
index a21ea7f9897..00000000000
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.i
+++ /dev/null
@@ -1,5 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index 0a0436727cc..77799e6f58d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -20,4 +20,7 @@ project(SSLIOP) : orbsvcslib, core, security, ssl, interceptors {
       SSLIOP
     }
   }
+
+  Template_Files {
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
index 4ff4b3ce7cf..70e4efbad42 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
@@ -1,7 +1,5 @@
 #include "IIOP_SSL_Acceptor.h"
 
-#include "SSLIOP_Util.h"
-
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 
@@ -41,8 +39,7 @@ TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (CORBA::Boolean flag)
     base_acceptor_ (),
     creation_strategy_ (0),
     concurrency_strategy_ (0),
-    accept_strategy_ (0),
-    handler_state_ ()
+    accept_strategy_ (0)
 {
 }
 
@@ -67,14 +64,8 @@ int
 TAO::IIOP_SSL_Acceptor::open_i (const ACE_INET_Addr& addr,
                                 ACE_Reactor *reactor)
 {
-  if (SSLIOP::Util::setup_handler_state (this->orb_core_,
-                                         &(this->tcp_properties_),
-                                         this->handler_state_) != 0)
-      return -1;
-
   ACE_NEW_RETURN (this->creation_strategy_,
                   TAO_IIOP_SSL_CREATION_STRATEGY (this->orb_core_,
-                                                  &(this->handler_state_),
                                                   this->lite_flag_),
                   -1);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
index 4d8e9a03e30..4259597b460 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
@@ -24,7 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Connection_Handler.h"
 #include "tao/IIOP_Acceptor.h"
 
 namespace TAO
@@ -82,10 +81,6 @@ namespace TAO
     TAO_IIOP_SSL_ACCEPT_STRATEGY *accept_strategy_;
     //@}
 
-    /// State that will be passed to each SSLIOP connection handler upon
-    /// creation.
-    SSLIOP::Connection_Handler_State handler_state_;
-
   };
 
 } // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
index e7238c07a28..bd27221202e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
@@ -65,20 +65,13 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler (
 
 TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler (
   TAO_ORB_Core *orb_core,
-  CORBA::Boolean /*flag*/,
-  void *arg)
-  : TAO_IIOP_Connection_Handler (
-      orb_core,
-      (static_cast<TAO::SSLIOP::Connection_Handler_State *> (arg))->tcp_properties)
+  CORBA::Boolean /* flag */)
+  : TAO_IIOP_Connection_Handler (orb_core, 0)
 {
-  TAO::SSLIOP::Connection_Handler_State *s =
-  static_cast<TAO::SSLIOP::Connection_Handler_State *> (arg);
-
   IIOP_SSL_Transport* specific_transport = 0;
   ACE_NEW (specific_transport,
            IIOP_SSL_Transport (this,
                                orb_core,
-                               s->ssliop_current.in (),
                                0));
 
   // Delete the transport with TAO_IIOP_Connection_Handler.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index d4da8a87a43..0f9389753c7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -52,8 +52,7 @@ namespace TAO
     /// Constructor.
     IIOP_SSL_Connection_Handler (ACE_Thread_Manager* t = 0);
     IIOP_SSL_Connection_Handler (TAO_ORB_Core *orb_core,
-                                 CORBA::Boolean flag,
-                                 void *arg);
+                                 CORBA::Boolean flag);
 
     /// Destructor.
     ~IIOP_SSL_Connection_Handler (void);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index b2c65d931e1..9a1cb2190ac 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -1,7 +1,5 @@
 #include "IIOP_SSL_Connector.h"
 
-#include "SSLIOP_Util.h"
-
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Environment.h"
@@ -11,6 +9,7 @@
 #include "tao/Connect_Strategy.h"
 #include "tao/Wait_Strategy.h"
 #include "tao/Profile_Transport_Resolver.h"
+#include "tao/Transport.h"
 
 #include "ace/Strategies_T.h"
 
@@ -63,21 +62,12 @@ TAO::IIOP_SSL_Connector::open (TAO_ORB_Core *orb_core)
   if (this->create_connect_strategy () == -1)
     return -1;
 
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
-  if (TAO::SSLIOP::Util::setup_handler_state (orb_core,
-                                              &(this->tcp_properties_),
-                                              this->handler_state_) != 0)
-      return -1;
-
   // Our connect creation strategy
   CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
 
   ACE_NEW_RETURN (connect_creation_strategy,
                   CONNECT_CREATION_STRATEGY (orb_core->thr_mgr (),
                                              orb_core,
-                                             &(this->handler_state_),
                                              this->lite_flag_),
                   -1);
 
@@ -308,7 +298,7 @@ TAO::IIOP_SSL_Connector::cancel_svc_handler (
   TAO_Connection_Handler * svc_handler)
 {
   IIOP_SSL_Connection_Handler* handler=
-    dynamic_cast<IIOP_SSL_Connection_Handler*>(svc_handler);
+    dynamic_cast<IIOP_SSL_Connection_Handler*> (svc_handler);
 
   if (handler)
     {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
index ab1b6449ec6..87b3f5b280c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
@@ -24,7 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "SSLIOP_Connection_Handler.h"
 #include "tao/IIOP_Connector.h"
 
 namespace TAO
@@ -92,11 +91,6 @@ namespace TAO
 
     /// The connector initiating connection requests for IIOP_SSL.
     BASE_CONNECTOR base_connector_;
-
-    /// State that will be passed to each SSLIOP connection handler upon
-    /// creation.
-    TAO::SSLIOP::Connection_Handler_State handler_state_;
-
   };
 
 } // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
index 7c81753642a..9fa051b7821 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -1,5 +1,6 @@
 #include "IIOP_SSL_Transport.h"
 #include "IIOP_SSL_Connection_Handler.h"
+#include "SSLIOP_Util.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -15,13 +16,13 @@ ACE_RCSID (SSLIOP,
 TAO::IIOP_SSL_Transport::IIOP_SSL_Transport (
     IIOP_SSL_Connection_Handler *handler,
     TAO_ORB_Core *orb_core,
-    TAO::SSLIOP::Current_ptr current,
     CORBA::Boolean flag)
   : TAO_IIOP_Transport (handler,
                         orb_core,
-                        flag),
-    current_ (TAO::SSLIOP::Current::_duplicate (current))
+                        flag)
 {
+  this->current_ =
+    TAO::SSLIOP::Util::current (orb_core);
 }
 
 TAO::IIOP_SSL_Transport::~IIOP_SSL_Transport (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
index aa4cdedd41c..1cd2555976b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
@@ -59,7 +59,6 @@ namespace TAO
     /// Constructor.
     IIOP_SSL_Transport (IIOP_SSL_Connection_Handler *handler,
                         TAO_ORB_Core *orb_core,
-                        TAO::SSLIOP::Current_ptr current,
                         CORBA::Boolean flag = 0);
 
     /// Default destructor.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 49f67043231..79e31d76962 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -1,7 +1,6 @@
 #include "SSLIOP_Acceptor.h"
 #include "SSLIOP_Profile.h"
 #include "SSLIOP_Current.h"
-#include "SSLIOP_Util.h"
 
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
@@ -49,7 +48,6 @@ TAO::SSLIOP::Acceptor::Acceptor (::Security::QOP qop,
     creation_strategy_ (0),
     concurrency_strategy_ (0),
     accept_strategy_ (0),
-    handler_state_ (),
     timeout_ (timeout)
 {
   // --- CSIv1 ---
@@ -187,7 +185,7 @@ TAO::SSLIOP::Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
       pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
 
       this->orb_core_->codeset_manager ()->
-	set_codeset (pfile->tagged_components());
+        set_codeset (pfile->tagged_components());
 
       IOP::TaggedComponent component;
       component.tag = ::SSLIOP::TAG_SSL_SEC_TRANS;
@@ -470,14 +468,8 @@ TAO::SSLIOP::Acceptor::ssliop_open_i (TAO_ORB_Core *orb_core,
   // holes.
   static const int giop_lite = 0;
 
-  if (TAO::SSLIOP::Util::setup_handler_state (this->orb_core_,
-                                              &(this->tcp_properties_),
-                                              this->handler_state_) != 0)
-      return -1;
-
   ACE_NEW_RETURN (this->creation_strategy_,
                   CREATION_STRATEGY (this->orb_core_,
-                                     &(this->handler_state_),
                                      giop_lite),
                   -1);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index 35c7786ddc8..9884acced94 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -143,10 +143,6 @@ namespace TAO
        */
       CSIIOP::TLS_SEC_TRANS csiv2_component_;
 
-      /// State that will be passed to each SSLIOP connection handler upon
-      /// creation.
-      Connection_Handler_State handler_state_;
-
       /// The accept() timeout.
       /**
        * This timeout includes the overall time to complete the SSL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 980a4d6cf68..d5ce8d47143 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -1,5 +1,6 @@
 #include "SSLIOP_Connection_Handler.h"
 #include "SSLIOP_Endpoint.h"
+#include "SSLIOP_Util.h"
 
 #include "tao/debug.h"
 #include "tao/Base_Transport_Property.h"
@@ -9,6 +10,7 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Wait_Strategy.h"
+#include "tao/Protocols_Hooks.h"
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
 
@@ -26,8 +28,7 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler (
     ACE_Thread_Manager *t)
   : SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
-    current_ (),
-    tcp_properties_ (0)
+    current_ ()
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -39,18 +40,13 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler (
 
 TAO::SSLIOP::Connection_Handler::Connection_Handler (
     TAO_ORB_Core *orb_core,
-    CORBA::Boolean /* flag */, // SSLIOP does *not* support GIOPlite
-    void *arg)
+    CORBA::Boolean /* flag */) // SSLIOP does *not* support GIOPlite
   : SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
-    current_ (),
-    tcp_properties_ (0)
+    current_ ()
 {
-  TAO::SSLIOP::Connection_Handler_State *s =
-    static_cast<TAO::SSLIOP::Connection_Handler_State *> (arg);
-
-  this->tcp_properties_ = s->tcp_properties;
-  this->current_ = s->ssliop_current;
+  this->current_ =
+    TAO::SSLIOP::Util::current (orb_core);
 
   TAO::SSLIOP::Transport* specific_transport = 0;
   ACE_NEW (specific_transport,
@@ -60,7 +56,6 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler (
   this->transport (specific_transport);
 }
 
-
 TAO::SSLIOP::Connection_Handler::~Connection_Handler (void)
 {
   delete this->transport ();
@@ -75,16 +70,58 @@ TAO::SSLIOP::Connection_Handler::open_handler (void *v)
 int
 TAO::SSLIOP::Connection_Handler::open (void *)
 {
+  TAO_IIOP_Protocol_Properties protocol_properties;
+
+  // Initialize values from ORB params.
+  protocol_properties.send_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
+  protocol_properties.recv_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
+  protocol_properties.no_delay_ =
+    this->orb_core ()->orb_params ()->nodelay ();
+
+  TAO_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_hooks ();
+
+  int client =
+    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      if (client)
+        {
+          tph->client_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          tph->server_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
   if (this->set_socket_option (this->peer (),
-                               tcp_properties_->send_buffer_size,
-                               tcp_properties_->recv_buffer_size) == -1)
+                               protocol_properties.send_buffer_size_,
+                               protocol_properties.recv_buffer_size_) == -1)
     return -1;
 
 #if !defined (ACE_LACKS_TCP_NODELAY)
   if (this->peer ().set_option (ACE_IPPROTO_TCP,
                                 TCP_NODELAY,
-                                (void *) &this->tcp_properties_->no_delay,
-                                sizeof (int)) == -1)
+                                (void *) &protocol_properties.no_delay_,
+                                sizeof (protocol_properties.no_delay_)) == -1)
     return -1;
 #endif /* ! ACE_LACKS_TCP_NODELAY */
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 61b9b9eb86f..d27c9bec758 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -61,8 +61,7 @@ namespace TAO
        *        connection.
        */
       Connection_Handler (TAO_ORB_Core *orb_core,
-                          CORBA::Boolean flag,
-                          void *arg);
+                          CORBA::Boolean flag);
 
       /// Destructor.
       ~Connection_Handler (void);
@@ -135,21 +134,6 @@ namespace TAO
 
     // ****************************************************************
 
-    class Connection_Handler_State
-    {
-    public:
-
-      /// TCP configuration for the connection associated with the
-      /// connection handler.
-      TAO_IIOP_Properties *tcp_properties;
-
-      /// Reference to the (downcast) SSLIOP::Current object.
-      TAO::SSLIOP::Current_var ssliop_current;
-
-    };
-
-    // ****************************************************************
-
     /**
      * @class State_Guard
      *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index ba933c34608..0c7b47d751a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -1,7 +1,6 @@
 #include "SSLIOP_Connector.h"
 #include "SSLIOP_OwnCredentials.h"
 #include "SSLIOP_Profile.h"
-#include "SSLIOP_Util.h"
 #include "SSLIOP_X509.h"
 
 #include "orbsvcs/SecurityLevel2C.h"
@@ -57,8 +56,7 @@ TAO::SSLIOP::Connector::Connector (::Security::QOP qop)
   : TAO::IIOP_SSL_Connector (),
     qop_ (qop),
     connect_strategy_ (),
-    base_connector_ (),
-    handler_state_ ()
+    base_connector_ ()
 {
 }
 
@@ -76,11 +74,6 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core)
   if (this->ACE_NESTED_CLASS (TAO, IIOP_SSL_Connector)::open (orb_core) == -1)
     return -1;
 
-  if (TAO::SSLIOP::Util::setup_handler_state (orb_core,
-                                              &(this->tcp_properties_),
-                                              this->handler_state_) != 0)
-      return -1;
-
   // Our connect creation strategy
   CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
 
@@ -88,7 +81,6 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core)
                   CONNECT_CREATION_STRATEGY
                       (orb_core->thr_mgr (),
                        orb_core,
-                       &(this->handler_state_),
                        0 /* Forcibly disable TAO's GIOPlite feature.
                             It introduces a security hole. */),
                   -1);
@@ -169,7 +161,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
 
   // Flag that states whether any form of establishment of trust
   // should occur.
-  CORBA::Boolean establish_trust =
+  CORBA::Boolean const establish_trust =
     trust.trust_in_target || trust.trust_in_client;
 
   // @@ Should this be in a "policy validator?"
@@ -292,6 +284,110 @@ TAO::SSLIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
   return profile;
 }
 
+
+TAO_Profile *
+TAO::SSLIOP::Connector::make_secure_profile (ACE_ENV_SINGLE_ARG_DECL)
+{
+  // The endpoint should be of the form:
+  //    N.n@host:port/object_key
+  // or:
+  //    host:port/object_key
+
+  TAO_Profile *profile = 0;
+  ACE_NEW_THROW_EX (profile,
+                    TAO_SSLIOP_Profile (this->orb_core (),
+                                          1), // SSL component
+                    CORBA::NO_MEMORY (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO_DEFAULT_MINOR_CODE,
+                        ENOMEM),
+                      CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (0);
+
+  return profile;
+}
+
+
+
+TAO_Profile *
+TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint,
+                                       size_t &len
+                                       ACE_ENV_ARG_DECL)
+{
+   int ssl_only = 0;
+   if (this->check_prefix (endpoint) == 0)
+   {
+       ssl_only = 1;
+   }
+   else
+   {
+       if (this->TAO_IIOP_Connector::check_prefix (endpoint) != 0)
+         return 0;
+   }
+
+   // Determine the (first in a list of possibly > 1) endpoint address
+   const char *comma_pos = ACE_OS::strchr (endpoint,',');
+   const char *slash_pos = ACE_OS::strchr (endpoint,'/');
+   if (comma_pos == 0 && slash_pos == 0)
+   {
+       if (TAO_debug_level)
+       {
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT("(%P|%t) SSLIOP_Connector::corbaloc_scan warning: ")
+                        ACE_TEXT("supplied string contains no comma or slash: %s\n"),
+                        endpoint));
+       }
+       len = ACE_OS::strlen (endpoint);
+   }
+   else if (slash_pos != 0 || comma_pos > slash_pos)
+   {
+       // The endpoint address does not extend past the first '/' or ','
+       len = slash_pos - endpoint;
+   }
+   else
+   {
+       len = comma_pos - endpoint;
+   }
+
+   //Create the corresponding profile
+   TAO_Profile *ptmp = 0;
+   if (ssl_only)
+       ptmp = this->make_secure_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
+   else
+       ptmp = this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+   ACE_CHECK_RETURN (0);
+   return ptmp;
+}
+
+
+int
+TAO::SSLIOP::Connector::check_prefix (const char *endpoint)
+{
+  // Check for a valid string
+  if (!endpoint || !*endpoint) return -1;  // Failure
+
+  const char *protocol[] = { "ssliop", "sslioploc" };
+
+  size_t first_slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+
+  size_t len0 = ACE_OS::strlen (protocol[0]);
+  size_t len1 = ACE_OS::strlen (protocol[1]);
+
+  // Check for the proper prefix in the IOR.  If the proper prefix
+  // isn't in the IOR then it is not an IOR we can use.
+  if (first_slot == len0 && ACE_OS::strncmp (endpoint, protocol[0], len0) == 0)
+    return 0;
+
+  if (first_slot == len1 && ACE_OS::strncmp (endpoint, protocol[1], len1) == 0)
+    return 0;
+
+  // Failure: not an SSLIOP IOR
+  // DO NOT throw an exception here.
+  return -1;
+}
+
+
 TAO_Transport*
 TAO::SSLIOP::Connector::iiop_connect (
   TAO_SSLIOP_Endpoint *ssl_endpoint,
@@ -404,6 +500,42 @@ TAO::SSLIOP::Connector::ssliop_connect (
   TAO::SSLIOP::Connection_Handler *svc_handler = 0;
   TAO_Transport *transport = 0;
 
+  // Before we can check the cache to find an existing connection, we
+  // need to make sure the ssl_endpoint is fully initialized with the
+  // local security information. This endpoint initalized by the
+  // profile does not (and cannot) contain the desired QOP, trust, or
+  // credential information which is necesary to uniquely identify
+  // this connection.
+  if (!ssl_endpoint->credentials_set())
+    {
+      if (TAO_debug_level > 2)
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("TAO (%P|%t) Initializing SSLIOP_Endpoint \n")
+                    ));
+
+      if (this->base_connector_.creation_strategy ()->make_svc_handler (
+               svc_handler) != 0)
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_ERROR,
+                        ACE_TEXT ("TAO (%P|%t) Unable to create SSLIOP ")
+                        ACE_TEXT ("service handler.\n")));
+
+          return 0;
+        }
+
+      ACE_Auto_Basic_Ptr<TAO::SSLIOP::Connection_Handler>
+        safe_handler (svc_handler);
+      TAO::SSLIOP::OwnCredentials_var credentials =
+        this->retrieve_credentials (resolver->stub (),
+                                    svc_handler->peer ().ssl ()
+                                    ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      svc_handler = safe_handler.release ();
+      ssl_endpoint->set_sec_attrs (qop, trust, credentials.in());
+    }
+
   // Check the Cache first for connections
   if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (
         desc,
@@ -456,7 +588,8 @@ TAO::SSLIOP::Connector::ssliop_connect (
       // too late if another thread pick up the completion and
       // potentially deletes the handler before we get a chance to
       // increment the reference count.
-      if (this->base_connector_.creation_strategy ()->make_svc_handler (
+      if (svc_handler == 0 &&
+          this->base_connector_.creation_strategy ()->make_svc_handler (
                svc_handler) != 0)
         {
           if (TAO_debug_level > 0)
@@ -515,12 +648,6 @@ TAO::SSLIOP::Connector::ssliop_connect (
           ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
         }
 
-      TAO::SSLIOP::OwnCredentials_var credentials =
-        this->retrieve_credentials (resolver->stub (),
-                                    svc_handler->peer ().ssl ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
       svc_handler = safe_handler.release ();
 
       // Get the right synch options
@@ -613,10 +740,6 @@ TAO::SSLIOP::Connector::ssliop_connect (
                     remote_address.get_port_number (),
                     svc_handler->peer ().get_handle ()));
 
-      ssl_endpoint->qop (qop);
-      ssl_endpoint->trust (trust);
-      ssl_endpoint->credentials (credentials.in ());
-
       // Add the handler to Cache
       int retval =
         this->orb_core ()->
@@ -725,7 +848,7 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
       // Use the default certificate and private key, i.e. the one set
       // in the SSL_CTX that was used when creating the SSL data
       // structure.
-      
+
       /**
        * @todo Check if the CredentialsCurator contains a default set
        *       of SSLIOP OwnCredentials.
@@ -748,7 +871,7 @@ TAO::SSLIOP::Connector::cancel_svc_handler (
   TAO_Connection_Handler * svc_handler)
 {
   TAO::SSLIOP::Connection_Handler* handler=
-    dynamic_cast<TAO::SSLIOP::Connection_Handler*>(svc_handler);
+    dynamic_cast<TAO::SSLIOP::Connection_Handler*> (svc_handler);
 
   if (handler)
     {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index 9a3a5ddb1a2..dd4cfef6ec4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -8,8 +8,8 @@
  *
  *  SSLIOP specific connector processing
  *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- *  @author Ossama Othman <ossama@uci.edu>
+ *  @author Carlos O'Ryan
+ *  @author Ossama Othman
  */
 //=============================================================================
 
@@ -25,10 +25,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SSL/SSL_SOCK_Connector.h"
 #include "IIOP_SSL_Connector.h"
 #include "SSLIOP_Connection_Handler.h"
 
+#include "ace/SSL/SSL_SOCK_Connector.h"
+
 /// Forward declarations.
 class TAO_Base_Transport_Property;
 
@@ -70,19 +71,29 @@ namespace TAO
                                       ACE_ENV_ARG_DECL);
 
       virtual TAO_Profile *create_profile (TAO_InputCDR& cdr);
+      virtual int check_prefix (const char *endpoint);
+      virtual TAO_Profile * corbaloc_scan (const char *ior,
+                                           size_t &len
+                                           ACE_ENV_ARG_DECL);
+
       //@}
 
     protected:
 
       /**
-       * @name More TAO_Connector methods
+       * @name @c TAO_Connector Methods
+       *
+       * Methods required by the @c TAO_Connector base class.
        *
-       * Please check the documentation in Pluggable.h.
+       * @see @c TAO_Connector
        */
+      //@{
       virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
-
-      /// Cancel the passed cvs handler from the connector
       virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
+      //@}
+
+      /// SSL-specific profile
+      TAO_Profile * make_secure_profile (ACE_ENV_SINGLE_ARG_DECL);
 
       /// IIOP-specific connection establishment.
       /**
@@ -137,10 +148,6 @@ namespace TAO
       /// The connector initiating connection requests for IIOP.
       BASE_CONNECTOR base_connector_;
 
-      /// State that will be passed to each SSLIOP connection handler upon
-      /// creation.
-      Connection_Handler_State handler_state_;
-
     };
 
   }  // End SSLIOP namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 163f86e28e6..f15c836f00a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -2,6 +2,8 @@
 
 #include "tao/ORB_Constants.h"
 
+#include "ace/SString.h"
+
 
 ACE_RCSID (SSLIOP,
            SSLIOP_Credentials,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
index 1f95833d035..464646079d7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
@@ -6,6 +6,7 @@
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/dh.h>
+#include "params_dup.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -44,7 +45,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
         if (dsa != 0)
           {
             // Not exception safe!
-            ::EVP_PKEY_set1_DSA (p.in (), DSAparams_dup (dsa));
+            ::EVP_PKEY_set1_DSA (p.in (), DSAparams_dup_wrapper (dsa));
             ::DSA_free (dsa);
           }
       }
@@ -56,7 +57,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
         if (dh != 0)
           {
             // Not exception safe!
-            ::EVP_PKEY_set1_DH (p.in (), DHparams_dup (dh));
+            ::EVP_PKEY_set1_DH (p.in (), DHparams_dup_wrapper (dh));
             ::DH_free (dh);
           }
       }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index 3493cd303a9..e4aeefc2c09 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -3,6 +3,7 @@
 #include "tao/IIOP_Endpoint.h"
 
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -26,7 +27,8 @@ TAO_SSLIOP_Endpoint::TAO_SSLIOP_Endpoint (const ::SSLIOP::SSL *ssl_component,
     // Some compilers don't like the initialization
     trust_ (),
 #endif /* !VXWORKS && !__QNX__ */
-    credentials_ ()
+    credentials_ (),
+    credentials_set_ (0)
 {
   if (ssl_component != 0)
     {
@@ -152,18 +154,21 @@ TAO_SSLIOP_Endpoint::duplicate (void)
                                          0),
                   0);
 
-  endpoint->qop (this->qop_);
-  endpoint->trust (this->trust_);
-  endpoint->credentials (this->credentials_.in ());  // Shallow copy
+  if (this->credentials_set_)
+    endpoint->set_sec_attrs (this->qop_,this->trust_, this->credentials_.in());
 
   endpoint->iiop_endpoint (this->iiop_endpoint_, true);
-
+  endpoint->hash_val_ = this->hash_val_;
   return endpoint;
 }
 
 CORBA::ULong
 TAO_SSLIOP_Endpoint::hash (void)
 {
+  // there is actually the potential for a race of the inverse case,
+  // since setting the security attributes will reset the hash_val_,
+  // it is possible this test to pass, but then have the hash reset
+  // before the value is returned.
   if (this->hash_val_ != 0)
     return this->hash_val_;
 
@@ -219,3 +224,28 @@ TAO_SSLIOP_Endpoint::object_addr (void) const
 
   return this->object_addr_;
 }
+
+void
+TAO_SSLIOP_Endpoint::set_sec_attrs (::Security::QOP q,
+                                    const ::Security::EstablishTrust &t,
+                                    const TAO::SSLIOP::OwnCredentials_ptr c)
+{
+  if (this->credentials_set_)
+    return;
+
+  ACE_GUARD (TAO_SYNCH_MUTEX,
+             guard,
+             this->addr_lookup_lock_);
+
+  // double-check
+  if (this->credentials_set_)
+    return;
+
+  this->qop_ = q;
+  this->trust_ = t;
+  this->credentials_ = TAO::SSLIOP::OwnCredentials::_duplicate (c);
+  this->credentials_set_ = 1;
+
+  // reset the hash value to force a recomputation.
+  this->hash_val_ = 0;
+}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index fdd3490f063..54d41697a44 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -110,21 +110,19 @@ namespace TAO
       /// Return the SSLIOP-specific ACE_INET_Addr.
       const ACE_INET_Addr &object_addr (void) const;
 
-      /// Set the Quality-of-Protection settings for this endpoint.
-      void qop (::Security::QOP qop);
+      /// Set the Quality-of-Protection, establishment of trust, and
+      /// credentials for this endpoint. This is all done in one function
+      /// so that the guard may be used uniformly.
+      void set_sec_attrs (::Security::QOP qop,
+                          const ::Security::EstablishTrust &trust,
+                          TAO::SSLIOP::OwnCredentials_ptr creds);
 
       /// Get the Quality-of-Protection settings for this endpoint.
       ::Security::QOP qop (void) const;
 
-      /// Set the establishment of trust settings for this endpoint.
-      void trust (const ::Security::EstablishTrust &trust);
-
       /// Get the establishment of trust settings for this endpoint.
       ::Security::EstablishTrust trust (void) const;
 
-      /// Set the credentials for this endpoint.
-      void credentials (TAO::SSLIOP::OwnCredentials_ptr creds);
-
       /// Get the credentials for this endpoint.
       /**
        * @note This method does not follow C++ mapping memory
@@ -136,6 +134,15 @@ namespace TAO
       TAO::SSLIOP::OwnCredentials * credentials (void) const;
       //@}
 
+
+      /// Credentials are not supplied by the constructor, and it is
+      /// valid to have a nil credential, for instance if the
+      /// SSL_use_certificate() method returns 0. Therefore it is
+      /// necessary to have a new method to distinguish between a
+      /// credential that is nil because it has not been set, vs one
+      /// that was set to nil explicitly.
+      int credentials_set (void) const;
+
     private:
 
       /// Cache the SSL tagged component in a decoded format. Notice
@@ -171,6 +178,8 @@ namespace TAO
       /// SSLIOP-specific credentials for this endpoint object.
       TAO::SSLIOP::OwnCredentials_var credentials_;
 
+      /// A flag indicating that credentials_ was explicitly initialized
+      int credentials_set_;
     };
 
 //   }  // End SSLIOP namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
index 4fa34d67f41..9b9f9e4d585 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
@@ -41,40 +41,26 @@ TAO_SSLIOP_Endpoint::ssl_component (void) const
   return this->ssl_component_;
 }
 
-
-
-ACE_INLINE void
-TAO_SSLIOP_Endpoint::qop (::Security::QOP q)
-{
-  this->qop_ = q;
-}
-
 ACE_INLINE ::Security::QOP
 TAO_SSLIOP_Endpoint::qop (void) const
 {
   return this->qop_;
 }
 
-ACE_INLINE void
-TAO_SSLIOP_Endpoint::trust (const ::Security::EstablishTrust &t)
-{
-  this->trust_ = t;
-}
-
 ACE_INLINE ::Security::EstablishTrust
 TAO_SSLIOP_Endpoint::trust (void) const
 {
   return this->trust_;
 }
 
-ACE_INLINE void
-TAO_SSLIOP_Endpoint::credentials (const TAO::SSLIOP::OwnCredentials_ptr creds)
-{
-  this->credentials_ = TAO::SSLIOP::OwnCredentials::_duplicate (creds);
-}
-
 ACE_INLINE TAO::SSLIOP::OwnCredentials *
 TAO_SSLIOP_Endpoint::credentials (void) const
 {
   return this->credentials_.in ();
 }
+
+ACE_INLINE int
+TAO_SSLIOP_Endpoint::credentials_set (void) const
+{
+  return this->credentials_set_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index fbb32f89f96..1b01c15ecf1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -18,7 +18,7 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-static const char prefix_[] = "iiop";
+static const char *prefix_[] = {"iiop", "ssliop"};
 
 namespace TAO
 {
@@ -44,13 +44,18 @@ int
 TAO::SSLIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
   // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[0]) == 0)
+     || (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[1]) == 0);
 }
 
 const char *
 TAO::SSLIOP::Protocol_Factory::prefix (void) const
 {
-  return ::prefix_;
+   // Note: This method doesn't seem to be used anywhere. Moreover,
+   // keeping it may make things more confusing - a Factory can 
+   // well be handling multiple protocol prefixes, not just one!
+   // Shouldn't it be deprecated?
+  return ::prefix_[0];
 }
 
 char
@@ -72,6 +77,30 @@ TAO::SSLIOP::Protocol_Factory::make_acceptor (void)
   return acceptor;
 }
 
+
+// Parses a X509 path. Beware: This function modifies 
+// the buffer pointed to by arg!
+int
+TAO::SSLIOP::Protocol_Factory::parse_x509_file_path (char *arg, 
+                                                   char **path)
+{
+  ACE_ASSERT (arg!= 0);
+  ACE_ASSERT (path!= 0);
+  
+  char *lst = 0;
+  const char *type_name = ACE_OS::strtok_r (arg, ":", &lst);
+  *path = ACE_OS::strtok_r (0, "", &lst);
+
+  if (ACE_OS::strcasecmp (type_name, "ASN1") == 0)
+      return SSL_FILETYPE_ASN1;
+  
+  if (ACE_OS::strcasecmp (type_name, "PEM") == 0)
+      return SSL_FILETYPE_PEM;
+
+  return -1;
+}
+
+
 int
 TAO::SSLIOP::Protocol_Factory::init (int argc,
                                      char* argv[])
@@ -154,20 +183,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc,
           curarg++;
           if (curarg < argc)
             {
-              char *lasts = 0;
-              const char *type_name =
-                ACE_OS::strtok_r (argv[curarg], ":", &lasts);
-              certificate_path =
-                ACE_OS::strtok_r (0, ":", &lasts);
-
-              if (ACE_OS::strcasecmp (type_name, "ASN1") == 0)
-                {
-                  certificate_type = SSL_FILETYPE_ASN1;
-                }
-              else if (ACE_OS::strcasecmp (type_name, "PEM") == 0)
-                {
-                  certificate_type = SSL_FILETYPE_PEM;
-                }
+              certificate_type = parse_x509_file_path (argv[curarg], &certificate_path);
             }
         }
 
@@ -177,20 +193,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc,
           curarg++;
           if (curarg < argc)
             {
-              char *lasts = 0;
-              const char *type_name =
-                ACE_OS::strtok_r (argv[curarg], ":", &lasts);
-              private_key_path =
-                ACE_OS::strtok_r (0, ":", &lasts);
-
-              if (ACE_OS::strcasecmp (type_name, "ASN1") == 0)
-                {
-                  private_key_type = SSL_FILETYPE_ASN1;
-                }
-              else if (ACE_OS::strcasecmp (type_name, "PEM") == 0)
-                {
-                  private_key_type = SSL_FILETYPE_PEM;
-                }
+              private_key_type = parse_x509_file_path (argv[curarg], &private_key_path);
             }
         }
 
@@ -257,19 +260,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc,
           curarg++;
           if (curarg < argc)
             {
-              char *lasts = 0;
-              const char *type_name =
-                ACE_OS::strtok_r (argv[curarg], ":", &lasts);
-              dhparams_path = ACE_OS::strtok_r (0, ":", &lasts);
-
-              if (ACE_OS::strcasecmp (type_name, "ASN1") == 0)
-                {
-                  dhparams_type = SSL_FILETYPE_ASN1;
-                }
-              else if (ACE_OS::strcasecmp (type_name, "PEM") == 0)
-                {
-                  dhparams_type = SSL_FILETYPE_PEM;
-                }
+              dhparams_type = parse_x509_file_path (argv[curarg], &dhparams_path);
             }
         }
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
index 73a16174959..8429f0dc9ce 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
@@ -82,6 +82,19 @@ namespace TAO
 
     private:
 
+      /// Parse an X509 file path, which is expected to looks like:
+      ///   <X509Path> ::= <Prefix> ':' <Path>
+      ///   <Prefix>   ::= 'PEM' | 'ASN1'
+      ///   <Path>     ::= any-string
+      /// Returns either SSL_FILETYPE_ASN1, SSL_FILETYPE_PEM or -1
+      /// if the prefix can not be recognized. The *path will point
+      /// to the part of the original buffer, after the initial ':',
+      /// or will contain 0, if no path was specified.
+      /// 
+      /// Beware: This function modifies the buffer pointed to by arg!
+      /// 
+      static int parse_x509_file_path (char *arg, char **path);
+      
       /// Create and register the SSLIOP ORB initializer.
       int register_orb_initializer (
         CSIIOP::AssociationOptions csiv2_target_supports,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index 23642aaa94a..024be8f4f84 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -9,11 +9,6 @@ ACE_RCSID (SSLIOP,
            SSLIOP_Profile,
            "$Id$")
 
-
-#if !defined (__ACE_INLINE__)
-# include "SSLIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr & addr,
                                const TAO::ObjectKey & object_key,
                                const TAO_GIOP_Message_Version & version,
@@ -23,7 +18,8 @@ TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr & addr,
                       object_key,
                       version,
                       orb_core),
-  ssl_endpoint_ (ssl_component, 0)
+  ssl_endpoint_ (ssl_component, 0),
+  ssl_only_ (0)
 {
   this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
 }
@@ -41,7 +37,8 @@ TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const char * host,
                       addr,
                       version,
                       orb_core),
-  ssl_endpoint_ (ssl_component, 0)
+  ssl_endpoint_ (ssl_component, 0),
+  ssl_only_ (0)
 {
   this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
 }
@@ -49,14 +46,16 @@ TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const char * host,
 TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core,
                                const ::SSLIOP::SSL * ssl_component)
   : TAO_IIOP_Profile (orb_core),
-    ssl_endpoint_ (ssl_component, 0)
+    ssl_endpoint_ (ssl_component, 0),
+    ssl_only_ (0)
 {
   this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
 }
 
-TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core)
+TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core, int ssl_only)
   : TAO_IIOP_Profile (orb_core),
-    ssl_endpoint_ (0, 0)
+    ssl_endpoint_ (0, 0),
+    ssl_only_ (ssl_only)
 {
   this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
 }
@@ -340,4 +339,14 @@ TAO_SSLIOP_Profile::parse_string (const char * ior
    ACE_CHECK;
 
    this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
+
+   if( ssl_only_)
+   {
+      this->ssl_endpoint_.ssl_component_.port = this->endpoint_.port_;
+
+      // Note that the Security::NoProtection bit is cleared since we
+      // are sure the server supports SSL (we're told so)
+      ACE_CLR_BITS (this->ssl_endpoint_.ssl_component_.target_supports,
+            Security::NoProtection);
+   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
index 026765b860b..6dab11bcab0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -68,8 +68,10 @@
       TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core,
                           const ::SSLIOP::SSL * ssl_component);
 
-      /// Profile constructor, default.
-      TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core);
+      /// Profile constructor. ssl_only != 0 will force secure
+      /// connections, pnly.
+      TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core, int ssl_only = 0);
+
 
       // = Please see Profile.h for the documentation of these methods.
       virtual int decode (TAO_InputCDR& cdr);
@@ -153,16 +155,22 @@
        * rest of the SSL endpoint list is transmitted.
        */
       TAO_SSLIOP_Endpoint ssl_endpoint_;
+
+      /**
+       * Allways treat this endpoint as secure, even if the constructor
+       * did not explicitely specify a tagged component for SSL.
+       * @par
+       * Most likely the parse_string() will supply a subset of the
+       * attributes - port number, for instance.
+       */
+      int ssl_only_;
+
     };
 
 //   }  // End SSLIOP namespace.
 // }  // End TAO namespace.
 
 
-#if defined (__ACE_INLINE__)
-# include "SSLIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_SSLIOP_PROFILE_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.i
deleted file mode 100644
index 2ad999ebb73..00000000000
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index 2ae4d2713c8..bf25f0d70f9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -13,11 +13,9 @@ ACE_RCSID (SSLIOP,
 #include "tao/debug.h"
 
 
-int
-TAO::SSLIOP::Util::setup_handler_state (
-  TAO_ORB_Core *orb_core,
-  TAO_IIOP_Properties *tcp_properties,
-  TAO::SSLIOP::Connection_Handler_State &s)
+TAO::SSLIOP::Current_ptr
+TAO::SSLIOP::Util::current (
+  TAO_ORB_Core *orb_core)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -40,9 +38,7 @@ TAO::SSLIOP::Util::setup_handler_state (
       if (CORBA::is_nil (tao_current.in ()))
         ACE_TRY_THROW (CORBA::INV_OBJREF ());
 
-
-      s.tcp_properties = tcp_properties;
-      s.ssliop_current = tao_current;
+      return tao_current._retn ();
     }
   ACE_CATCHANY
     {
@@ -51,10 +47,10 @@ TAO::SSLIOP::Util::setup_handler_state (
                              "Could not resolve "
                              "\"SSLIOPCurrent\" object");
 
-      return -1;
+      return 0;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  ACE_CHECK_RETURN (0);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
index 29b9ffe1496..efe5dc406b1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
@@ -24,6 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "SSLIOP_Current.h"
 
 class TAO_ORB_Core;
 class TAO_IIOP_Properties;
@@ -32,8 +33,6 @@ namespace TAO
 {
   namespace SSLIOP
   {
-    class Connection_Handler_State;
-
     /**
      * @class Util
      *
@@ -47,12 +46,9 @@ namespace TAO
     {
     public:
 
-      /// Setup the state that will be passed to the connection handler
-      /// when the handler is constructed.
-      static int setup_handler_state (
-        TAO_ORB_Core *orb_core,
-        TAO_IIOP_Properties *tcp_properties,
-        Connection_Handler_State &state);
+      /// Access Current.
+      static TAO::SSLIOP::Current_ptr current (
+        TAO_ORB_Core *orb_core);
 
     };
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index a1bd57f1ae8..6eb207fbc6d 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -9,16 +9,11 @@
 
 #include "Config_Scheduler.h"
 
-#if defined (__ACE_INLINE__)
-#include "Config_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Sched, Config_Scheduler, "$Id$")
 
 ACE_Config_Scheduler::ACE_Config_Scheduler (void)
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
-  : scheduler_strategy_ (ACE_static_cast (RtecScheduler::Preemption_Priority_t,
-                                          TAO_MIN_CRITICAL_PRIORITY))
+  : scheduler_strategy_ (static_cast<RtecScheduler::Preemption_Priority_t> (TAO_MIN_CRITICAL_PRIORITY))
   , impl (new ACE_Strategy_Scheduler (scheduler_strategy_))
 #else
   : impl (new Scheduler_Generic)
@@ -272,7 +267,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   const char *anomaly_severity_msg = "NONE";
   CORBA::ULong anomaly_index = 0;
   CORBA::ULong anomaly_set_size =
-                    ACE_static_cast (CORBA::ULong, anomaly_set.size ());
+                    static_cast<CORBA::ULong> (anomaly_set.size ());
   if (anomalies.ptr () == 0)
     {
       anomalies =
@@ -389,7 +384,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
     }
   infos->length (impl->tasks ());
   for (RtecScheduler::handle_t handle = 1;
-       handle <= ACE_static_cast (RtecScheduler::handle_t, impl->tasks ());
+       handle <= static_cast<RtecScheduler::handle_t> (impl->tasks ());
        ++handle)
     {
       RtecScheduler::RT_Info* rt_info = 0;
@@ -397,7 +392,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
         {
         case BaseSchedImplType::SUCCEEDED:
           // We know that handles start at 1.
-          infos[ACE_static_cast (CORBA::ULong, handle - 1)] = *rt_info;
+          infos[static_cast<CORBA::ULong> (handle - 1)] = *rt_info;
           break;
         case BaseSchedImplType::FAILED:
         case BaseSchedImplType::ST_UNKNOWN_TASK:
@@ -418,8 +413,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   configs->length (impl->minimum_priority_queue () + 1);
   for (RtecScheduler::Preemption_Priority_t priority = 0;
        priority <=
-         ACE_static_cast (RtecScheduler::Preemption_Priority_t,
-                          impl->minimum_priority_queue ());
+         static_cast<RtecScheduler::Preemption_Priority_t> (impl->minimum_priority_queue ());
        ++priority)
     {
       RtecScheduler::Config_Info* config_info = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index abf9af35069..084a36a33f2 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -307,10 +307,6 @@ private:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "Config_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.i
deleted file mode 100644
index a21ea7f9897..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.i
+++ /dev/null
@@ -1,5 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 86c3113f068..b4bea6cb946 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -50,9 +50,9 @@ extern "C" int compare_entry_finish_times (const void *first, const void *second
   }
 
   const Task_Entry *first_entry =
-          * ACE_static_cast (const Task_Entry *const *, first);
+          * static_cast<const Task_Entry *const *> (first);
   const Task_Entry *second_entry =
-          * ACE_static_cast (const Task_Entry *const *, second);
+          * static_cast<const Task_Entry *const *> (second);
 
   // sort blank entries to the end
   if (! first_entry)
@@ -711,7 +711,7 @@ ACE_DynScheduler::schedule (
   else
   {
     // save the total number of registered RT_Infos
-    tasks (ACE_static_cast (u_int, rt_info_entries_.size ()));
+    tasks (static_cast<u_int> (rt_info_entries_.size ()));
   }
 
   // set up the task entry data structures
@@ -1276,10 +1276,9 @@ ACE_DynScheduler::calculate_utilization_params (void)
         (ordered_dispatch_entries_ [i]->task_entry ().effective_period () > 0))
     {
       utilization_ +=
-        ACE_static_cast (double,
-          ACE_UINT64_DBLCAST_ADAPTER (ordered_dispatch_entries_ [i]->
+        static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (ordered_dispatch_entries_ [i]->
             task_entry ().rt_info ()->worst_case_execution_time)) /
-        ACE_static_cast (double, ordered_dispatch_entries_ [i]->
+        static_cast<double> (ordered_dispatch_entries_ [i]->
             task_entry ().effective_period ());
     }
   }
@@ -1317,7 +1316,7 @@ ACE_DynScheduler::status_t
 ACE_DynScheduler::setup_task_entries (void)
 {
   // store number of tasks, based on registrations
-  tasks (ACE_static_cast (u_int, rt_info_entries_.size ()));
+  tasks (static_cast<u_int> (rt_info_entries_.size ()));
 
   // bail out if there are no tasks registered
   if (tasks () <= 0)
@@ -1380,9 +1379,7 @@ ACE_DynScheduler::setup_task_entries (void)
     // stored magic cookie are the same (see the definition of
     // ptrdiff_t in ACE to grok how this works portably).
     task_entries_ [i].rt_info ()->volatile_token =
-      ACE_static_cast (CORBA::ULongLong,
-                       ACE_reinterpret_cast (ptrdiff_t,
-                                             &(task_entries_ [i])));
+      static_cast<CORBA::ULongLong> (reinterpret_cast<ptrdiff_t> (&(task_entries_ [i])));
 
     // tie ordered task entry pointer to corresponding task entry
     ordered_task_entries_ [i] = &(task_entries_ [i]);
@@ -1725,7 +1722,7 @@ ACE_DynScheduler::schedule_threads (ACE_Unbounded_Set<RtecScheduler::Scheduling_
 ACE_DynScheduler::status_t
 ACE_DynScheduler::schedule_dispatches (ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set)
 {
-  dispatch_entry_count_ = ACE_static_cast (u_int, dispatch_entries_->size ());
+  dispatch_entry_count_ = static_cast<u_int> (dispatch_entries_->size ());
 
   ACE_NEW_RETURN (ordered_dispatch_entries_,
                   Dispatch_Entry * [dispatch_entry_count_],
@@ -1870,10 +1867,10 @@ ACE_DynScheduler::create_timeline ()
       // have to change when TimeBase.idl is finalized.
       const TimeBase::TimeT arrival =
         ordered_dispatch_entries_[i]->arrival () +
-        ACE_static_cast (ACE_UINT32, current_frame_offset);
+        static_cast<ACE_UINT32> (current_frame_offset);
       const TimeBase::TimeT deadline=
         ordered_dispatch_entries_[i]->deadline () +
-        ACE_static_cast (ACE_UINT32, current_frame_offset);
+        static_cast<ACE_UINT32> (current_frame_offset);
 
       ACE_NEW_RETURN (
         new_dispatch_entry,
@@ -2331,12 +2328,8 @@ ACE_DynScheduler::output_viewer_timeline (FILE *file)
             file, "%-11s  %9f  %9f  %8u  %8u  %11u  %11u\n",
             current_entry->dispatch_entry ().task_entry ().rt_info ()->
               entry_point.in (),
-                        ACE_static_cast (
-                          double,
-                          ACE_UINT64_DBLCAST_ADAPTER(current_accumulated_execution)) /
-                        ACE_static_cast (
-                          double,
-                          ACE_UINT64_DBLCAST_ADAPTER(current_completion)),
+                        static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER(current_accumulated_execution)) /
+                        static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER(current_completion)),
             0.0,
             ACE_U64_TO_U32 (current_entry->arrival ()),
             ACE_U64_TO_U32 (current_entry->deadline ()),
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index f5e75f3118e..3cbcdce2248 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -28,10 +28,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Sched_Utils.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Sched, Reconfig_Sched_Utils, "$Id$")
 
 ///////////////////////////
@@ -213,7 +209,7 @@ TAO_RT_Info_Tuple::~TAO_RT_Info_Tuple ()
 void
 TAO_RT_Info_Tuple::operator = (const RtecScheduler::RT_Info &info)
 {
-  ACE_static_cast (TAO_RT_Info_Ex, *this) = info;
+  static_cast<TAO_RT_Info_Ex> (*this) = info;
 }
 
 
@@ -958,16 +954,14 @@ TAO_Reconfig_Sched_Strategy_Base::comp_tuple_finish_times (const void *first, co
   // Convert the passed pointers: the double cast is needed to
   // make Sun C++ 4.2 happy.
   TAO_RT_Info_Tuple **first_tuple =
-    ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, first));
+    reinterpret_cast<TAO_RT_Info_Tuple **> (const_cast<void *> (first));
 
   //volatile_token is a TAO_Reconfig_Scheduler_Entry*, but we need to treat it as a void*
   void * first_entry = ACE_LONGLONG_TO_PTR (void *,
                          (*first_tuple)->volatile_token);
 
   TAO_RT_Info_Tuple **second_tuple =
-    ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, second));
+    reinterpret_cast<TAO_RT_Info_Tuple **> (const_cast<void *> (second));
 
   //volatile_token is a TAO_Reconfig_Scheduler_Entry*, but we need to treat it as a void*
   void * second_entry = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
@@ -983,12 +977,10 @@ int
 TAO_Reconfig_Sched_Strategy_Base::comp_entry_finish_times (const void *first, const void *second)
 {
   const TAO_Reconfig_Scheduler_Entry *first_entry =
-    * ACE_reinterpret_cast (const TAO_Reconfig_Scheduler_Entry *const *,
-                            first);
+    * reinterpret_cast<const TAO_Reconfig_Scheduler_Entry *const *> (first);
 
   const TAO_Reconfig_Scheduler_Entry *second_entry =
-    * ACE_reinterpret_cast (const TAO_Reconfig_Scheduler_Entry *const *,
-                            second);
+    * reinterpret_cast<const TAO_Reconfig_Scheduler_Entry *const *> (second);
 
   // sort blank entries to the end
   if (! first_entry)
@@ -1112,11 +1104,9 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const
   // Convert the passed pointers: the double cast is needed to
   // make Sun C++ 4.2 happy.
   TAO_Reconfig_Scheduler_Entry **first =
-    ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, s));
+    reinterpret_cast<TAO_Reconfig_Scheduler_Entry **> (const_cast<void *> (s));
   TAO_Reconfig_Scheduler_Entry **second =
-    ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, t));
+    reinterpret_cast<TAO_Reconfig_Scheduler_Entry **> (const_cast<void *> (t));
 
   // Check the converted pointers.
   if (first == 0 || *first == 0)
@@ -1167,16 +1157,14 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
     // Convert the passed pointers: the double cast is needed to
   // make Sun C++ 4.2 happy.
   TAO_RT_Info_Tuple **first =
-    ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, s));
+    reinterpret_cast<TAO_RT_Info_Tuple **> (const_cast<void *> (s));
 
   TAO_Reconfig_Scheduler_Entry * first_entry =
       ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
                            (*first)->volatile_token);
 
   TAO_RT_Info_Tuple **second =
-    ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, t));
+    reinterpret_cast<TAO_RT_Info_Tuple **> (const_cast<void *> (t));
 
   TAO_Reconfig_Scheduler_Entry * second_entry =
       ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
@@ -1316,11 +1304,9 @@ TAO_RMS_FAIR_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const
   // Convert the passed pointers: the double cast is needed to
   // make Sun C++ 4.2 happy.
   TAO_Reconfig_Scheduler_Entry **first =
-    ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, s));
+    reinterpret_cast<TAO_Reconfig_Scheduler_Entry **> (const_cast<void *> (s));
   TAO_Reconfig_Scheduler_Entry **second =
-    ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, t));
+    reinterpret_cast<TAO_Reconfig_Scheduler_Entry **> (const_cast<void *> (t));
 
   // Check the converted pointers.
   if (first == 0 || *first == 0)
@@ -1374,16 +1360,14 @@ TAO_RMS_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
     // Convert the passed pointers: the double cast is needed to
   // make Sun C++ 4.2 happy.
   TAO_RT_Info_Tuple **first =
-    ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, s));
+    reinterpret_cast<TAO_RT_Info_Tuple **> (const_cast<void *> (s));
 
   TAO_Reconfig_Scheduler_Entry * first_entry =
       ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
                            (*first)->volatile_token);
 
   TAO_RT_Info_Tuple **second =
-    ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, t));
+    reinterpret_cast<TAO_RT_Info_Tuple **> (const_cast<void *> (t));
 
   TAO_Reconfig_Scheduler_Entry * second_entry =
       ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
@@ -1546,11 +1530,9 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const v
   // Convert the passed pointers: the double cast is needed to
   // make Sun C++ 4.2 happy.
   TAO_Reconfig_Scheduler_Entry **first =
-    ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, s));
+    reinterpret_cast<TAO_Reconfig_Scheduler_Entry **> (const_cast<void *> (s));
   TAO_Reconfig_Scheduler_Entry **second =
-    ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, t));
+    reinterpret_cast<TAO_Reconfig_Scheduler_Entry **> (const_cast<void *> (t));
 
   // Check the converted pointers.
   if (first == 0 || *first == 0)
@@ -1604,16 +1586,14 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
   // Convert the passed pointers: the double cast is needed to
   // make Sun C++ 4.2 happy.
   TAO_RT_Info_Tuple **first =
-    ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, s));
+    reinterpret_cast<TAO_RT_Info_Tuple **> (const_cast<void *> (s));
 
   TAO_Reconfig_Scheduler_Entry * first_entry =
     ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
                          (*first)->volatile_token);
 
   TAO_RT_Info_Tuple **second =
-    ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, t));
+    reinterpret_cast<TAO_RT_Info_Tuple **> (const_cast<void *> (t));
 
   TAO_Reconfig_Scheduler_Entry * second_entry =
     ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index 225fa09960e..e0e814b5362 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -652,10 +652,6 @@ public:
   // on the operation characteristics of a representative scheduling entry.
 };
 
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Sched_Utils.i"
-#endif /* __ACE_INLINE__ */
-
 // Include the templates here.
 #include "Reconfig_Sched_Utils_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.i
deleted file mode 100644
index 360e91cb420..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.i
+++ /dev/null
@@ -1,17 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Sched_Utils.i
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index fbe66a8a334..d6c0fc79eee 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -26,10 +26,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "Reconfig_Sched_Utils_T.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Sched, Reconfig_Sched_Utils_T, "$Id$")
 
 ////////////////////////////////
@@ -58,7 +54,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
 {
   int result = 0;
 
-  /* WSOA merge - commented out 
+  /* WSOA merge - commented out
   // Call unconditional action method, which performs any necessary
   // modifications that are applied to each node unconditionally.
   if (this->unconditional_action (rse) < 0)
@@ -112,7 +108,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
               if (rt_info_map_.find ((*dependency_set) [i].rt_info,
                                      next_rt_info) != 0)
                 {
-                  ACE_ERROR_RETURN ((LM_ERROR, "RT_Info (%i) not found.\n", 
+                  ACE_ERROR_RETURN ((LM_ERROR, "RT_Info (%i) not found.\n",
                                      (*dependency_set) [i].rt_info), -1);
                 }
 
@@ -271,7 +267,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 precondition (TAO_Reconfig_Scheduler_Entry &rse)
 {
-  int result = 
+  int result =
     TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
       precondition (rse);
 
@@ -411,7 +407,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 precondition (TAO_Reconfig_Scheduler_Entry &rse)
 {
-  int result = 
+  int result =
     TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
       precondition (rse);
 
@@ -722,17 +718,17 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                       "Failed to access tuple under iterator"));
           return -1;
         }
-      
+
       // @TODO - check for conjunction nodes here and perform conjunctive
       // function on existing rate tuples.
 
 #ifdef SCHEDULER_LOGGING
-      ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", 
-                 successor.actual_rt_info ()->handle, 
+      ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n",
+                 successor.actual_rt_info ()->handle,
                  &successor,
                  (*tuple_ptr_ptr)));
 #endif
-      // Propagate tuples disjunctively. 
+      // Propagate tuples disjunctively.
       successor.insert_tuple (**tuple_ptr_ptr,
                               TAO_Reconfig_Scheduler_Entry::PROPAGATED);
 
@@ -755,18 +751,18 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                       "Failed to access tuple under iterator"));
           return -1;
         }
-      
+
       // @TODO - check for conjunction nodes here and perform conjunctive
       // function on existing rate tuples.
 
 #ifdef SCHEDULER_LOGGING
-      ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", 
-                 successor.actual_rt_info ()->handle, 
+      ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n",
+                 successor.actual_rt_info ()->handle,
                  &successor,
                  (*tuple_ptr_ptr)));
 #endif
 
-      // Propagate tuples disjunctively. 
+      // Propagate tuples disjunctively.
       successor.insert_tuple (**tuple_ptr_ptr,
                               TAO_Reconfig_Scheduler_Entry::PROPAGATED);
 
@@ -815,7 +811,7 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::visit (TAO_Reconfig
 {
   int result = 0;
 #ifdef SCHEDULER_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Priority_Visitor visiting %s[%d],crit=%d,period=%d\n",
               rse.actual_rt_info ()->entry_point.in(),
               rse.actual_rt_info ()->handle,
@@ -836,7 +832,7 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::visit (TAO_Reconfig
   else
     {
 #ifdef SCHEDULER_LOGGING
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Previous entry %s[%d],crit=%d,period=%d\n",
                   previous_entry_->actual_rt_info ()->entry_point.in(),
                   previous_entry_->actual_rt_info ()->handle,
@@ -921,6 +917,8 @@ TAO_Tuple_Admission_Visitor (const CORBA::Double & critical_utilization_threshol
                                const CORBA::Double & noncritical_utilization_threshold)
   : critical_utilization_ (0.0),
     noncritical_utilization_ (0.0),
+    total_critical_utilization_ (0.0),
+    total_noncritical_utilization_ (0.0),
     critical_utilization_threshold_ (critical_utilization_threshold),
     noncritical_utilization_threshold_ (noncritical_utilization_threshold)
 {
@@ -943,34 +941,30 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_RT_Info_Tuple &
   if (t.enabled_state () == RtecScheduler::RT_INFO_DISABLED
       || entry->enabled_state () == RtecScheduler::RT_INFO_DISABLED)
     {
-      return 0; 
+      return 0;
     }
 
   // Compute the current tuple's utilization.
   CORBA::Double delta_utilization =
-    (ACE_static_cast (CORBA::Double,
-                      t.threads) 
-     * ACE_static_cast (CORBA::Double,
-                        ACE_UINT64_DBLCAST_ADAPTER (entry->
+    (static_cast<CORBA::Double> (t.threads)
+     * static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (entry->
                                                       aggregate_exec_time ())))
-    / ACE_static_cast (CORBA::Double,
-                       t.period);
+    / static_cast<CORBA::Double> (t.period);
 
   // Subtract the previous tuple's utilization (if any) for the entry.
   if (entry->current_admitted_tuple ())
     {
       delta_utilization -=
-        (ACE_static_cast (CORBA::Double,
-                          entry->current_admitted_tuple ()->threads)
-         * ACE_static_cast (CORBA::Double,
-                            ACE_UINT64_DBLCAST_ADAPTER (entry->
+        (static_cast<CORBA::Double> (entry->current_admitted_tuple ()->threads)
+         * static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (entry->
                                                           aggregate_exec_time ())))
-        / ACE_static_cast (CORBA::Double,
-                           entry->current_admitted_tuple ()->period);
+        / static_cast<CORBA::Double> (entry->current_admitted_tuple ()->period);
     }
 
   if (RECONFIG_SCHED_STRATEGY::is_critical (t))
     {
+      this->total_critical_utilization_ += delta_utilization;
+
       if (this->critical_utilization_ + this->noncritical_utilization_
           +delta_utilization
           < this->critical_utilization_threshold_)
@@ -982,6 +976,7 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_RT_Info_Tuple &
     }
   else
     {
+      this->total_noncritical_utilization_ += delta_utilization;
       if (this->critical_utilization_ + this->noncritical_utilization_
           +delta_utilization
           < this->noncritical_utilization_threshold_)
@@ -991,7 +986,6 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_RT_Info_Tuple &
           entry->actual_rt_info ()->period = t.period;
 	}
     }
-
   return 0;
 }
 
@@ -1013,6 +1007,21 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::noncritical_utilization ()
   return this->noncritical_utilization_;
 }
 
+template <class RECONFIG_SCHED_STRATEGY> CORBA::Double
+TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::total_critical_utilization ()
+{
+  return this->total_critical_utilization_;
+}
+
+
+// Accessor for utilization by noncritical operations.
+
+template <class RECONFIG_SCHED_STRATEGY> CORBA::Double
+TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::total_noncritical_utilization ()
+{
+  return this->total_noncritical_utilization_;
+}
+
 // Accessor for utilization threshold for critical operations.
 
 template <class RECONFIG_SCHED_STRATEGY> CORBA::Double
@@ -1056,7 +1065,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
   ACE_UNUSED_ARG (di);
 
 #ifdef SCHEDULER_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Crit Prop_Visitor visiting %s[%d], successor is %s[%d]\n",
               entry.actual_rt_info ()->entry_point.in(),
               entry.actual_rt_info ()->handle,
@@ -1066,19 +1075,19 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
 
   if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED)
     {
-      RtecScheduler::Criticality_t entry_crit = 
+      RtecScheduler::Criticality_t entry_crit =
         entry.actual_rt_info ()->criticality;
-      RtecScheduler::Criticality_t succ_crit = 
+      RtecScheduler::Criticality_t succ_crit =
         successor.actual_rt_info ()->criticality;
       RtecScheduler::Criticality_t max_crit = entry_crit;
-      
+
       if (max_crit < succ_crit)
         max_crit = succ_crit;
 
       successor.actual_rt_info ()->criticality = max_crit;
 
 #ifdef SCHEDULER_LOGGING
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Successor's new criticality is %d\n",
                   successor.actual_rt_info ()->criticality));
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index 9ea96225a4c..a63f3dba239 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -416,6 +416,12 @@ public:
   CORBA::Double noncritical_utilization_threshold ();
   // Accessor for utilization by noncritical operations.
 
+  CORBA::Double total_critical_utilization ();
+  // Accessor for utilization by critical operations.
+
+  CORBA::Double total_noncritical_utilization ();
+  // Accessor for utilization by noncritical operations.
+
 private:
 
   CORBA::Double critical_utilization_;
@@ -424,6 +430,12 @@ private:
   CORBA::Double noncritical_utilization_;
   // Utilization by noncritical operations.
 
+  CORBA::Double total_critical_utilization_;
+  // Utilization by critical operations.
+
+  CORBA::Double total_noncritical_utilization_;
+  // Utilization by noncritical operations.
+
   CORBA::Double critical_utilization_threshold_;
   // Utilization by critical operations.
 
@@ -435,7 +447,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 class TAO_RSE_Criticality_Propagation_Visitor :
   public TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
   // = TITLE
-  //   A scheduler entry visitor that propagates criticality 
+  //   A scheduler entry visitor that propagates criticality
   //   from called to calling nodes in a topologically ordered
   //   graph.
   //
@@ -461,12 +473,6 @@ protected:
 
 };
 
-
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Sched_Utils_T.i"
-#endif /* __ACE_INLINE__ */
-
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Reconfig_Sched_Utils_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.i
deleted file mode 100644
index 329f9c7c7ce..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.i
+++ /dev/null
@@ -1,16 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Sched_Utils_T.i
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
index 13f8b3f5cf3..e8f3962e13c 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
@@ -26,10 +26,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Sched, Reconfig_Scheduler, "$Id$")
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
index 4e46f2f8a63..ba2cdcb82dd 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
@@ -31,13 +31,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 // Include the templates here.
 #include "Reconfig_Scheduler_T.h"
 
-
 #include /**/ "ace/post.h"
 #endif /* TAO_RECONFIG_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i
deleted file mode 100644
index c093d552760..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i
+++ /dev/null
@@ -1,16 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler.i
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index a6a16be05f2..5dc08986705 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -26,11 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler_T.i"
-#endif /* __ACE_INLINE__ */
-
-//#ifdef _DEBUG 
+//#ifdef _DEBUG
 //#define SCHEDULER_LOGGING 1
 //#endif
 
@@ -194,12 +190,12 @@ init (int config_count,
   int result = 0;
   int i = 0;
 
-/* WSOA merge - commented out 
+/* WSOA merge - commented out
   // Clear out the previous entries, if any.
   this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 */
-  
+
   // Re-map the RT_Info and dependency handle values if necessary.
   // Assumes that dependencies only refer to handles within the
   // current set: changing that assumption would require us to use
@@ -892,7 +888,7 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
             break;
 
             // Intentional fall-through to ignore non-volatile RT_Infos
-          case RtecScheduler::RT_INFO_NON_VOLATILE: 
+          case RtecScheduler::RT_INFO_NON_VOLATILE:
 
           default:                             // Ignore disabled RT_Infos.
             break;
@@ -1326,7 +1322,7 @@ recompute_scheduling (CORBA::Long minimum_priority,
   // If everything is already up to date, we're done.
   if (SCHED_ALL_STABLE == stability_flags_)
     {
-      
+
       // Must always provide a value for an out parameter
       ACE_NEW_THROW_EX (anomalies,
          RtecScheduler::Scheduling_Anomaly_Set (0),
@@ -1343,7 +1339,7 @@ recompute_scheduling (CORBA::Long minimum_priority,
     {
 
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "1_pre_crit_traverse.txt");
 #endif
@@ -1352,9 +1348,9 @@ recompute_scheduling (CORBA::Long minimum_priority,
       // topological ordering and identifying threads.
       crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "2_crit_dfs_traverse_i.txt");
 #endif
@@ -1362,25 +1358,25 @@ recompute_scheduling (CORBA::Long minimum_priority,
       // Propagate criticalities.
       propagate_criticalities_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "3_propagate_criticalities_i.txt");
 #endif
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "4_pre_traverse.txt");
 #endif
-      
+
       // Traverse dependency graph, assigning a topological ordering and identifying threads.
       dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "5_dfs_traverse_i.txt");
 #endif
@@ -1389,29 +1385,29 @@ recompute_scheduling (CORBA::Long minimum_priority,
       // for loops using the strongly connected components algorithm.
       detect_cycles_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
-                                                    "6_detect_cycles_i.txt");                                              
+                                                    "6_detect_cycles_i.txt");
 #endif
-      
+
       // Perform admission control for task delineator rate tuples.
       perform_admission_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "7_perform_admission_i.txt");
 #endif
-      
+
       // Propagate effective execution time and period, set total frame size.
       propagate_characteristics_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "8_propagate_characteristics_i.txt");
 #endif
@@ -1425,15 +1421,14 @@ recompute_scheduling (CORBA::Long minimum_priority,
       // last feasible priority.
       assign_priorities_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "9_assign_priorities_i.txt");
-#endif 
-      
-    }
+#endif
 
+    }
 
   // @@ TODO: record any scheduling anomalies in a set within the scheduler,
   //          storing the maximum severity level recorded so far.
@@ -1445,6 +1440,19 @@ recompute_scheduling (CORBA::Long minimum_priority,
       ACE_CHECK;
     }
 
+  ACE_DEBUG ((LM_DEBUG,
+              "cutil = %f, ncutil = %f\n",
+              this->critical_utilization_,
+              this->noncritical_utilization_));
+
+  if (this->critical_utilization_ > critical_utilization_threshold_ ||
+      this->noncritical_utilization_ > noncritical_utilization_threshold_)
+    {
+      CORBA::ULong len = anomalies->length ();
+      anomalies->length (len + 1);
+      anomalies[len].description = CORBA::string_dup("Utilization Bound exceeded");
+      anomalies[len].severity =  RtecScheduler::ANOMALY_ERROR;
+    }
 
   // Set stability flags last.
   this->stability_flags_ = SCHED_ALL_STABLE;
@@ -1482,7 +1490,7 @@ get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
     {
       // TODO - rethink this: is it more useful to only return the *enabled* RT_Infos?
       rt_info = (*info_iter).int_id_;
-      infos[ACE_static_cast (CORBA::ULong, rt_info->handle - 1)] = *rt_info;
+      infos[static_cast<CORBA::ULong> (rt_info->handle - 1)] = *rt_info;
     }
 
   return;
@@ -1514,14 +1522,14 @@ get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
          dependency_iter (this->called_dependency_set_map_);
        dependency_iter.done () == 0 && i < this->dependency_count_;
        ++dependency_iter)
-    {  
+    {
       dependency_set = (*dependency_iter).int_id_;
       for (u_int j = 0;
            j < dependency_set->length () && i < this->dependency_count_;
            ++i, ++j)
         {
           (* dependencies) [i] =  (*dependency_set) [j];
-          // For two-way calls, swap the handles (stored in reverse order in the called map) 
+          // For two-way calls, swap the handles (stored in reverse order in the called map)
           if ((* dependencies) [i].dependency_type == RtecBase::TWO_WAY_CALL)
             {
               (* dependencies) [i].rt_info =  (* dependency_set) [j].rt_info_depended_on;
@@ -1564,7 +1572,7 @@ get_config_info_set (RtecScheduler::Config_Info_Set_out configs
        ++config_iter)
     {
       config_info = (*config_iter).int_id_;
-      configs[ACE_static_cast (CORBA::ULong, config_info->preemption_priority)] = *config_info;
+      configs[static_cast<CORBA::ULong> (config_info->preemption_priority)] = *config_info;
     }
 
   return;
@@ -1684,7 +1692,7 @@ get_config_infos (RtecScheduler::Config_Info_Set_out configs
        ++config_iter)
     {
       config_info = (*config_iter).int_id_;
-      configs[ACE_static_cast (CORBA::ULong, config_info->preemption_priority)] = *config_info;
+      configs[static_cast<CORBA::ULong> (config_info->preemption_priority)] = *config_info;
     }
 }
 
@@ -1804,10 +1812,8 @@ create_i (const char *entry_point,
   new_sched_entry_ptr.release ();
 
   // Connect the entry to the RT_Info.
-  new_rt_info->volatile_token = 
-    ACE_static_cast (CORBA::ULongLong,
-                     ACE_reinterpret_cast (ptrdiff_t,
-                                           new_sched_entry));
+  new_rt_info->volatile_token =
+    static_cast<CORBA::ULongLong> (reinterpret_cast<ptrdiff_t> (new_sched_entry));
 
   // With everything safely registered in the map and tree, just
   // update the next handle and info counter and return the new info.
@@ -1892,12 +1898,12 @@ set_i (TAO_RT_Info_Ex *rt_info,
                             CORBA::NO_MEMORY ());
           ACE_CHECK;
 
-          
+
           // Make sure the new tuple is cleaned up if we exit abruptly.
           auto_ptr<TAO_RT_Info_Tuple> tuple_auto_ptr (tuple_ptr);
-  
-//          ACE_DEBUG((LM_DEBUG, "Tuple not found.  Inserting new tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", 
-//                     rt_info->handle, 
+
+//          ACE_DEBUG((LM_DEBUG, "Tuple not found.  Inserting new tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n",
+//                     rt_info->handle,
 //                     rse_ptr,
 //                     tuple_ptr));
           // Add the tuple to the entry's original tuple set
@@ -2037,7 +2043,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         enabled
                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       break;
 
     // In a one-way call, the called operation depends on the
@@ -2071,16 +2077,16 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
       ACE_THROW (RtecScheduler::INTERNAL ());
   }
 
- // Add the criticality dependency map entry. 
+ // Add the criticality dependency map entry.
  // If A---TW--->B and C---OW--->D, the add_dependency_calls
  // would look like this
  // add_dependency (A, B, TW)
  // add_dependency (D, C, OW)
  // Neither of the other two maps capture these dependencies
  // A depends on B and D depends on C.
- // The calling dependency map captures 
+ // The calling dependency map captures
  // A calls B and C calls D.
- // The called dependency map captures 
+ // The called dependency map captures
  // B called by A and D called by C.
 
  map_dependency_i (handle,                    // calling handle
@@ -2273,7 +2279,7 @@ map_dependency_i (RtecScheduler::handle_t key,
                   ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type,
-                  RtecScheduler::Dependency_Enabled_Type_t enabled                  
+                  RtecScheduler::Dependency_Enabled_Type_t enabled
                   ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
@@ -2336,7 +2342,7 @@ unmap_dependency_i (RtecScheduler::handle_t key,
   RtecScheduler::Dependency_Set *dependency_set = 0;
 
   // Try to unbind the matching dependency set from the passed map
-  // and if successful, destroy the 
+  // and if successful, destroy the
   if (dependency_map.find (key, dependency_set) == 0)
     {
       if (dependency_set)
@@ -2367,7 +2373,7 @@ unmap_dependency_i (RtecScheduler::handle_t key,
           if (!found)
             {
               ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-            } 
+            }
         }
       else
         {
@@ -2406,7 +2412,7 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
   RtecScheduler::Dependency_Set *dependency_set = 0;
 
   // Try to unbind the matching dependency set from the passed map
-  // and if successful, destroy the 
+  // and if successful, destroy the
   if (dependency_map.find (key, dependency_set) == 0)
     {
       if (dependency_set)
@@ -2502,11 +2508,10 @@ detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
   // Sort the pointers to entries in order of descending forward
   // finish times, which produces a reverse topological ordering,
   // with callers ahead of called nodes.
-  ACE_OS::qsort (ACE_reinterpret_cast (void *, entry_ptr_array_),
+  ACE_OS::qsort (reinterpret_cast<void *> (entry_ptr_array_),
                  this->rt_info_count_,
                  sizeof (TAO_Reconfig_Scheduler_Entry *),
-                 ACE_reinterpret_cast (COMP_FUNC,
-                                       RECONFIG_SCHED_STRATEGY::comp_entry_finish_times));
+                 reinterpret_cast<COMP_FUNC> (RECONFIG_SCHED_STRATEGY::comp_entry_finish_times));
 
   // Traverse entries in reverse topological order,
   // looking for strongly connected components (cycles).
@@ -2538,7 +2543,8 @@ detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
+                      CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
 #if defined (SCHEDULER_LOGGING)
@@ -2564,16 +2570,15 @@ perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
 
   // Sort the pointers to original tuples in ascending admission
   // order, according to the scheduling strategy's admission policy.
-  ACE_OS::qsort (ACE_reinterpret_cast (void *, tuple_ptr_array_),
+  ACE_OS::qsort (reinterpret_cast<void *> (tuple_ptr_array_),
            this->rt_info_tuple_count_,
            sizeof (TAO_RT_Info_Tuple *),
-           ACE_reinterpret_cast (COMP_FUNC,
-                                 RECONFIG_SCHED_STRATEGY::total_admission_comp));
+           reinterpret_cast<COMP_FUNC> (RECONFIG_SCHED_STRATEGY::total_admission_comp));
 
   // Traverse tuples in admission order, updating the associate tuple
   // for each thread delineator.
 #if defined (SCHEDULER_LOGGING)
-  ACE_Scheduler_Factory::log_scheduling_tuples(tuple_ptr_array_, 
+  ACE_Scheduler_Factory::log_scheduling_tuples(tuple_ptr_array_,
                                                this->rt_info_tuple_count_,
                                                "sorted_admit_tuples.txt");
 #endif
@@ -2590,11 +2595,12 @@ perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
+
   // Store the values accumulated by the visitor.
   this->noncritical_utilization_ =
-    admit_visitor.noncritical_utilization ();
+    admit_visitor.total_noncritical_utilization ();
   this->critical_utilization_ =
-    admit_visitor.critical_utilization ();
+    admit_visitor.total_critical_utilization ();
 }
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
@@ -2647,11 +2653,10 @@ propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL)
   // Sort the pointers to original tuples in ascending admission
   // order, according to the scheduling strategy's admission policy.
 
-  ACE_OS::qsort (ACE_reinterpret_cast (void *, tuple_ptr_array_),
+  ACE_OS::qsort (reinterpret_cast<void *> (tuple_ptr_array_),
                  this->rt_info_tuple_count_,
                  sizeof (TAO_RT_Info_Tuple *),
-                 ACE_reinterpret_cast (COMP_FUNC,
-                   RECONFIG_SCHED_STRATEGY::comp_tuple_finish_times ));
+                 reinterpret_cast<COMP_FUNC> (RECONFIG_SCHED_STRATEGY::comp_tuple_finish_times ));
 
   // Traverse entries in topological (ascending forward DFS
   // finish time) order, propagating aggregate execution
@@ -2736,7 +2741,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG, "Scheduler::entry ptr array before sorting is\n"));
   for (i = 0; i < this->rt_info_count_; ++i)
     {
-      RtecScheduler::RT_Info* rt_info_ptr = 
+      RtecScheduler::RT_Info* rt_info_ptr =
         this->entry_ptr_array_[i]->actual_rt_info ();
       ACE_DEBUG ((LM_DEBUG,
                   " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n ",
@@ -2745,24 +2750,23 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
                   rt_info_ptr->criticality,
                   rt_info_ptr->priority,
                   rt_info_ptr->preemption_priority,
-                  rt_info_ptr->preemption_subpriority));                  
+                  rt_info_ptr->preemption_subpriority));
     }
 #endif /* SCHEDULER_LOGGING */
 
   // Sort the pointers to entries in descending order
   // of static priority and static subpriority, according
   // to our given scheduling strategy.
-  ACE_OS::qsort (ACE_reinterpret_cast (void *, entry_ptr_array_),
+  ACE_OS::qsort (reinterpret_cast<void *> (entry_ptr_array_),
                  this->rt_info_count_,
                  sizeof (TAO_Reconfig_Scheduler_Entry *),
-                 ACE_reinterpret_cast (COMP_FUNC,
-                                       RECONFIG_SCHED_STRATEGY::total_priority_comp));
+                 reinterpret_cast<COMP_FUNC> (RECONFIG_SCHED_STRATEGY::total_priority_comp));
 
 #ifdef SCHEDULER_LOGGING
   ACE_DEBUG ((LM_DEBUG, "Scheduler::qsorted array is\n"));
   for (i = 0; i < this->rt_info_count_; ++i)
     {
-      RtecScheduler::RT_Info* rt_info_ptr = 
+      RtecScheduler::RT_Info* rt_info_ptr =
         this->entry_ptr_array_[i]->actual_rt_info ();
       ACE_DEBUG ((LM_DEBUG,
                   " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n ",
@@ -2771,7 +2775,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
                   rt_info_ptr->criticality,
                   rt_info_ptr->priority,
                   rt_info_ptr->preemption_priority,
-                  rt_info_ptr->preemption_subpriority));                  
+                  rt_info_ptr->preemption_subpriority));
     }
 #endif
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index 1bba80973f5..c8b82223a21 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -598,7 +598,8 @@ protected:
   // checks for loops, marks unresolved remote dependencies.
 
   void perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
+                     CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Compute aggregate execution times, then performs admission over
   // rate tuples.
@@ -758,11 +759,6 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
 // arrays.  This function expands the array eagerly, to minimize time
 // overhead for memory allocation (at a cost of some unused space).
 
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler_T.i"
-#endif /* __ACE_INLINE__ */
-
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Reconfig_Scheduler_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.i
deleted file mode 100644
index cf7d8543e8e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.i
+++ /dev/null
@@ -1,16 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_T.i
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
index f3640e8a829..f133d00e95f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
@@ -177,8 +177,7 @@ Task_Entry::effective_execution_time () const
 
   return ((rt_info_->info_type == RtecScheduler::OPERATION) ||
           (rt_info_->info_type == RtecScheduler::REMOTE_DEPENDANT))
-         ? ACE_static_cast (u_long,
-                            worst_case_execution_time * dispatches_.size ())
+         ? static_cast<u_long> (worst_case_execution_time * dispatches_.size ())
          : 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 9619eceb420..447c70230aa 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -21,10 +21,6 @@
 #include "Scheduler.h"
 #include "ace/OS_NS_stdio.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/Lock_Adapter_T.h"
 
 ACE_RCSID(Sched, Scheduler, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index abb37fc6cee..9400ba0ac67 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -293,10 +293,6 @@ private:
 
 typedef ACE_Scheduler Scheduler;
 
-#if defined (__ACE_INLINE__)
-#include "Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* SCHEDULER_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.i
deleted file mode 100644
index 57875ae26d1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.i
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-// EOF
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index f3a3877c13e..5be44333377 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -21,10 +21,6 @@
 #include "Scheduler_Generic.h"
 #include "ace/OS_NS_stdio.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler_Generic.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Sched, Scheduler_Generic, "$Id$")
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -232,7 +228,7 @@ Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *>
   status_t status = ACE_Scheduler::SUCCEEDED;
 
   // store number of tasks, based on registrations
-  tasks (ACE_static_cast (u_int, task_entries_.size ()));
+  tasks (static_cast<u_int> (task_entries_.size ()));
 
   if (output_level () > 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
index 7c039ca4002..5cfbf7b88d5 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
@@ -130,13 +130,7 @@ private:
     const Scheduler_Generic &))
 };
 
-
-#if defined (__ACE_INLINE__)
-#include "Scheduler_Generic.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* SCHEDULER_INTERNAL_H */
 
-
 // EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i
deleted file mode 100644
index 71e3695dc35..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-
-// EOF
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index bc42c024c84..49a3a9a9607 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -19,12 +19,8 @@
 #include "Strategy_Scheduler.h"
 #include "ace/Sched_Params.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Strategy_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Sched, 
-           Strategy_Scheduler, 
+ACE_RCSID (Sched,
+           Strategy_Scheduler,
            "$Id$")
 
 //////////////////////////////////////////////
@@ -843,8 +839,8 @@ int
 ACE_MUF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_MUF_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **> (arg1),
+                      ** static_cast<Dispatch_Entry **> (arg2));
 }
 
 
@@ -979,8 +975,8 @@ int
 ACE_RMS_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_RMS_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **> (arg1),
+                      ** static_cast<Dispatch_Entry **> (arg2));
 }
 
 
@@ -1123,8 +1119,8 @@ int
 ACE_MLF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_MLF_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **> (arg1),
+                      ** static_cast<Dispatch_Entry **> (arg2));
 }
 
 
@@ -1250,8 +1246,8 @@ int
 ACE_EDF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_EDF_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **> (arg1),
+                      ** static_cast<Dispatch_Entry **> (arg2));
 }
 
 // = Provides the dispatching queue type for the given dispatch entry.
@@ -1375,8 +1371,8 @@ int
 ACE_Criticality_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_Criticality_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **> (arg1),
+                      ** static_cast<Dispatch_Entry **> (arg2));
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index a31314b3fb7..2abc6e1fb05 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -491,12 +491,6 @@ private:
 
 };
 
-
-
-#if defined (__ACE_INLINE__)
-#include "Strategy_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* STRATEGY_SCHEDULER_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i
deleted file mode 100644
index c84e9e2da77..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Strategy_Scheduler.i
-//
-// = CREATION DATE
-//    22 December 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-
-// EOF
-
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 9b169d85ff7..30880150bf8 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -751,17 +751,15 @@ ACE_Scheduler_Factory::preemption_priority (void)
       // call the type conversion operator.  So, call it explicitly.
 #if defined (HPUX) && !defined (__GNUG__)
       const RtecScheduler::Preemption_Priority_t preemption_priority =
-        ACE_static_cast (RtecScheduler::Preemption_Priority_t,
-                         tss->operator RtecScheduler_Preemption_Priority_t ());
+        static_cast<RtecScheduler::Preemption_Priority_t> (tss->operator RtecScheduler_Preemption_Priority_t ());
 #else
       const RtecScheduler::Preemption_Priority_t preemption_priority =
-        ACE_static_cast (RtecScheduler::Preemption_Priority_t,
-                         tss->operator RtecScheduler::Preemption_Priority_t ());
+        static_cast<RtecScheduler::Preemption_Priority_t> (tss->operator RtecScheduler::Preemption_Priority_t ());
 #endif /* HPUX && !g++ */
       return preemption_priority;
     }
   else
-    return ACE_static_cast (RtecScheduler::Preemption_Priority_t, -1);
+    return static_cast<RtecScheduler::Preemption_Priority_t> (-1);
 }
 
 void
@@ -888,4 +886,6 @@ template class TAO_RSE_SCC_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYN
 #pragma instantiate TAO_RSE_Reverse_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>
 #pragma instantiate TAO_Tuple_Admission_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy>
 #pragma instantiate TAO_RSE_SCC_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<ACE_Scheduler_Factory_Data, ACE_Null_Mutex> *ACE_Singleton<ACE_Scheduler_Factory_Data, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc
index 2ce3fa5e8f4..257d9b1da26 100644
--- a/TAO/orbsvcs/orbsvcs/Security.mpc
+++ b/TAO/orbsvcs/orbsvcs/Security.mpc
@@ -32,4 +32,7 @@ project(Security) : orbsvcslib, corba_messaging, core, portableserver, intercept
       Security
     }
   }
+
+  Template_Files {
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
index c530661f515..d3d31499310 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
@@ -1,9 +1,19 @@
 // $Id$
 
-//ACE_RCSID(orbsvcs, Shutdown_Utilities, "$Id$")
-
 #include "Shutdown_Utilities.h"
 
+ACE_RCSID(orbsvcs,
+          Shutdown_Utilities,
+          "$Id$")
+
+Shutdown_Functor::Shutdown_Functor (void)
+{
+}
+
+Shutdown_Functor::~Shutdown_Functor (void)
+{
+}
+
 Service_Shutdown::Service_Shutdown (Shutdown_Functor& sf)
   : functor_(sf)
 {
@@ -25,21 +35,17 @@ Service_Shutdown::Service_Shutdown (Shutdown_Functor& sf, ACE_Sig_Set& which_sig
 // declared the largest signal held in sigset_t, but we can't.
 // So, for now, we'll make a possibly bold assumption that sigset_t
 // will be at least four bytes.  If somebody wants to use a signal
-// greater than that, then they'll have to redefine TAO_ORBSVCS_MAXSIG.
+// greater than that, then they'll have to redefine ACE_NSIG.
 //
 // It would be even nicer if the register_handler() method just took
 // an ACE_Sig_Set as an argument and handled all this stuff itself.
-// 
-#ifndef TAO_ORBSVCS_MAXSIG
-#  define TAO_ORBSVCS_MAXSIG 32
-#endif
-
+//
 void
 Service_Shutdown::set_signals (ACE_Sig_Set& which_signals)
 {
   // iterate over all the signals in which_signals and register them...
   int did_register = 0;
-  for (int i = 1; i < TAO_ORBSVCS_MAXSIG; i++)
+  for (int i = 1; i < ACE_NSIG; i++)
     if (which_signals.is_member (i))
       {
         if (this->shutdown_.register_handler (i, this) == -1)
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
index a5133521f90..77a53946532 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
@@ -9,7 +9,6 @@
 
 #include "orbsvcs/svc_utils_export.h"
 
-class TAO_Svc_Utils_Export Shutdown_Functor
 /**
  * \brief Abstract definition for a Functor that shuts down a particular service.
  *
@@ -19,16 +18,16 @@ class TAO_Svc_Utils_Export Shutdown_Functor
  * implementation of operator()(int which_signal) that actually performs
  * the shutdown.
  */
+class TAO_Svc_Utils_Export Shutdown_Functor
 {
 public:
   virtual void operator() (int which_signal) = 0;
 
 protected:
-  Shutdown_Functor() { }
-  virtual ~Shutdown_Functor() { }
+  Shutdown_Functor (void);
+  virtual ~Shutdown_Functor (void);
 };
 
-class TAO_Svc_Utils_Export Service_Shutdown : public ACE_Event_Handler
 /**
  * \brief Class that permits graceful shutdown of a service.
  *
@@ -39,6 +38,7 @@ class TAO_Svc_Utils_Export Service_Shutdown : public ACE_Event_Handler
  * This class can be used to capture signals and gracefully shut down
  * the service.
  */
+class TAO_Svc_Utils_Export Service_Shutdown : public ACE_Event_Handler
 {
 public:
   Service_Shutdown (Shutdown_Functor& sf);
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
index 1535374e9d8..3113e59562f 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
@@ -20,4 +20,11 @@ project(Svc_Utils) : orbsvcslib, core, portableserver {
     Time_Utilities.cpp
     IOR_Multicast.cpp
   }
+
+  Template_Files {
+  }
+
+  Pkgconfig_Files {
+    TAO_Svc_Utils.pc.in
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index be402ec48d6..2667b77f73a 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -140,12 +140,9 @@ TAO_Time_Service_Clerk::get_time (void)
 
   const ACE_Time_Value timeofday = ACE_OS::gettimeofday ();
 
-  return (CORBA::ULongLong) (ACE_static_cast (CORBA::ULongLong,
-                                              timeofday.sec ()) *
-                             ACE_static_cast (ACE_UINT32,
-                                              10000000) +
-                             ACE_static_cast (CORBA::ULongLong,
-                                              timeofday.usec () * 10))
+  return (CORBA::ULongLong) (static_cast<CORBA::ULongLong> (timeofday.sec ()) *
+                             static_cast<ACE_UINT32> (10000000) +
+                             static_cast<CORBA::ULongLong> (timeofday.usec () * 10))
     - this->update_timestamp_
     + this->time_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 9ef74fcc11b..07855b065aa 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -58,12 +58,9 @@ TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL)
   // Return the local time of the system as a UTO.
   ACE_NEW_THROW_EX (uto,
                     TAO_UTO ((TAO_Time_Base_Offset +
-                              ACE_static_cast (CORBA::ULongLong,
-                                               timeofday.sec ())) *
-                             ACE_static_cast (ACE_UINT32,
-                                              10000000) +
-                             ACE_static_cast  (CORBA::ULongLong,
-                                               timeofday.usec () * 10),
+                              static_cast<CORBA::ULongLong> (timeofday.sec ())) *
+                             static_cast<ACE_UINT32> (10000000) +
+                             static_cast<CORBA::ULongLong> (timeofday.usec () * 10),
                              0,
                              0),
                     CORBA::NO_MEMORY ());
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 432bcb383cb..467d95525d2 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -28,8 +28,7 @@ TAO_UTO::TAO_UTO (TimeBase::TimeT time,
   this->attr_utc_time_.inacchi = 0;
 #else
   this->attr_utc_time_.inacchi =
-    ACE_static_cast (CORBA::UShort,
-                     (inaccuracy >> 32U) & 0xFFFF);
+    static_cast<CORBA::UShort> ((inaccuracy >> 32U) & 0xFFFF);
 
 #endif /* ACE_LACKS_U_LONGLONG_T */
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index ae7a167fc70..caf8668ade4 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -119,7 +119,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 
       ACE_OS::tzset ();
       long arg = ACE_OS::timezone () / 60;
-      CORBA::Short goodarg = ACE_static_cast (CORBA::Short, arg);
+      CORBA::Short goodarg = static_cast<CORBA::Short> (arg);
       clerk_->time_displacement_factor (goodarg);
 
       // Set the inaccuracy.
@@ -133,12 +133,9 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
       // Record the current time in a timestamp to know when global
       // updation of time was done.
       clerk_->update_timestamp_ =
-        ACE_static_cast (CORBA::ULongLong,
-                         timeofday.sec ()) *
-        ACE_static_cast (ACE_UINT32,
-                         10000000) +
-        ACE_static_cast (CORBA::ULongLong,
-                         timeofday.usec () * 10);
+        static_cast<CORBA::ULongLong> (timeofday.sec ()) *
+        static_cast<ACE_UINT32> (10000000) +
+        static_cast<CORBA::ULongLong> (timeofday.usec () * 10);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index 0018ea15cf2..b0ee99afdbb 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -3,7 +3,7 @@
 #include "orbsvcs/Time_Utilities.h"
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/orbsvcs/Time_Utilities.i"
+# include "orbsvcs/Time_Utilities.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(orbsvcs, Time_Utilities, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
index 280f9fa6121..00e274c0ed0 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
@@ -40,8 +40,8 @@ ORBSVCS_Time::Time_Value_to_TimeT (TimeBase::TimeT& lhs,
                                    const ACE_Time_Value& rhs)
 {
   ACE_hrtime_t t =
-    ACE_static_cast (ACE_hrtime_t, rhs.sec ()) * ACE_U_ONE_SECOND_IN_NSECS +
-    ACE_static_cast (ACE_hrtime_t, rhs.usec ()) * 1000u;
+    static_cast<ACE_hrtime_t> (rhs.sec ()) * ACE_U_ONE_SECOND_IN_NSECS +
+    static_cast<ACE_hrtime_t> (rhs.usec ()) * 1000u;
 
   ORBSVCS_Time::hrtime_to_TimeT (lhs, t);
 }
@@ -54,9 +54,8 @@ ORBSVCS_Time::TimeT_to_Time_Value (ACE_Time_Value& lhs,
 
   ORBSVCS_Time::TimeT_to_hrtime (t, rhs);
 
-  lhs.set (ACE_static_cast(ACE_UINT32, t / ACE_U_ONE_SECOND_IN_NSECS),
-           ACE_static_cast(ACE_UINT32,
-                           (t % ACE_U_ONE_SECOND_IN_NSECS) / 1000));
+  lhs.set (static_cast<ACE_UINT32> (t / ACE_U_ONE_SECOND_IN_NSECS),
+           static_cast<ACE_UINT32> ((t % ACE_U_ONE_SECOND_IN_NSECS) / 1000));
 }
 
 ACE_INLINE ACE_Time_Value
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 39dad9545ed..bd2222c96aa 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -167,7 +167,7 @@ order_offer (TAO_Constraint_Evaluator& evaluator,
 
           if (expr_type == TAO_FIRST
               || (expr_type == TAO_WITH
-                  && ! ACE_static_cast (CORBA::Boolean, pref_info.value_)))
+                  && ! static_cast<CORBA::Boolean> (pref_info.value_)))
             this->offers_.enqueue_tail (pref_info);
           else
             this->offers_.enqueue_head (pref_info);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index bc01e59425f..2e1694763ab 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -6,7 +6,13 @@
 
 #include "tao/DynamicAny/DynSequence_i.h"
 
-ACE_RCSID(Trader, Constraint_Visitors, "$Id$")
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (Trader,
+           Constraint_Visitors,
+           "$Id$")
+
 
 TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void)
 {
@@ -357,7 +363,7 @@ visit_twiddle (TAO_Binary_Constraint* binary_twiddle)
   TAO_Constraint* left = binary_twiddle->left_operand (),
     *right = binary_twiddle->right_operand ();
 
-  // Determine if the left operand is a subTAO_String_Hash_Key of the right.
+  // Determine if the left operand is a substring of the right.
 
   if (left->accept (this) == 0)
     {
@@ -367,8 +373,8 @@ visit_twiddle (TAO_Binary_Constraint* binary_twiddle)
           TAO_Literal_Constraint& right_operand = this->queue_.get_right_operand ();
 
           CORBA::Boolean result = (CORBA::Boolean)
-            (ACE_OS::strstr ((const char*)left_operand,
-                             (const char*)right_operand) != 0);
+            (ACE_OS::strstr ((const char*)right_operand,
+                             (const char*)left_operand) != 0);
 
           this->queue_.dequeue_operand ();
           this->queue_.dequeue_operand ();
@@ -533,13 +539,13 @@ sequence_does_contain (CORBA::Any* sequence,
     case CORBA::tk_short:
       {
         CORBA::Long value = element;
-        return_value = ::TAO_find (*sequence, ACE_static_cast (CORBA::Short, value));
+        return_value = ::TAO_find (*sequence, static_cast<CORBA::Short> (value));
       }
     break;
     case CORBA::tk_ushort:
       {
         CORBA::ULong value = element;
-        return_value = ::TAO_find (*sequence, ACE_static_cast (CORBA::UShort, value));
+        return_value = ::TAO_find (*sequence, static_cast<CORBA::UShort> (value));
       }
       break;
     case CORBA::tk_long:
@@ -557,7 +563,7 @@ sequence_does_contain (CORBA::Any* sequence,
     case CORBA::tk_float:
       {
         CORBA::Double value = element;
-        return_value = ::TAO_find (*sequence, ACE_static_cast (CORBA::Float, value));
+        return_value = ::TAO_find (*sequence, static_cast<CORBA::Float> (value));
       }
       break;
     case CORBA::tk_double:
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index b5bce8c79a9..222c8f5cfa6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -305,7 +305,7 @@ generate_offer_id (const char *service_type_name, CORBA::ULong id)
 
   // hold portions of id string.
   CosTrading::OfferId offer_id =
-     CORBA::string_alloc (ACE_static_cast (CORBA::ULong, total_size));
+     CORBA::string_alloc (static_cast<CORBA::ULong> (total_size));
   char* return_value = 0;
   ACE_OS::sprintf (offer_id, "%016u%s", id, service_type_name);
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index a08cc671b42..7ccc48ba2c9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -54,7 +54,7 @@ TAO_Query_Only_Offer_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC((CORBA::SystemException,
                  CosTrading::UnknownMaxLeft))
 {
-  return ACE_static_cast (CORBA::ULong, this->offers_.size ());
+  return static_cast<CORBA::ULong> (this->offers_.size ());
 }
 
 CORBA::Boolean
@@ -65,8 +65,7 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
 {
   offers = new CosTrading::OfferSeq;
 
-  CORBA::ULong sequence_size = ACE_static_cast (CORBA::ULong,
-                                                this->offers_.size ());
+  CORBA::ULong sequence_size = static_cast<CORBA::ULong> (this->offers_.size ());
   CORBA::ULong offers_in_sequence = (n < sequence_size) ? n : sequence_size;
   offers->length (offers_in_sequence);
 
@@ -238,7 +237,7 @@ TAO_Offer_Id_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
-  return ACE_static_cast (CORBA::ULong, this->ids_.size ());
+  return static_cast<CORBA::ULong> (this->ids_.size ());
 }
 
 void
@@ -267,8 +266,7 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Calculate the number of Ids to be returned in this.
-  CORBA::ULong items_left = ACE_static_cast (CORBA::ULong,
-                                             this->ids_.size());
+  CORBA::ULong items_left = static_cast<CORBA::ULong> (this->ids_.size());
   int difference = items_left - n;
   CORBA::ULong returnable_items = (difference >= 0) ? n : items_left;
   CORBA::Boolean return_value = (CORBA::Boolean) (difference > 0);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index 7c3f5af8b47..df773105007 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -43,7 +43,7 @@ max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
-  return ACE_static_cast (CORBA::ULong, this->offer_ids_.size ());
+  return static_cast<CORBA::ULong> (this->offer_ids_.size ());
 }
 
 template <class MAP_LOCK_TYPE> CORBA::Boolean
@@ -57,7 +57,7 @@ next_n (CORBA::ULong n,
 
   CORBA::ULong max_possible_offers_in_sequence =
     (n <  this->offer_ids_.size ()) ? n :
-       ACE_static_cast (CORBA::ULong, this->offer_ids_.size ());
+       static_cast<CORBA::ULong> (this->offer_ids_.size ());
 
   ACE_NEW_THROW_EX (offers,
                     CosTrading::OfferSeq,
@@ -89,7 +89,7 @@ next_n (CORBA::ULong n,
   // Reset the length to the correct value
   offers->length (ret_offers);
 
-  return ACE_static_cast (CORBA::Boolean, ret_offers != 0);
+  return static_cast<CORBA::Boolean> (ret_offers != 0);
 }
 
 #endif /* TAO_REGISTER_OFFER_ITERATOR_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index cfd3f3e8139..925f7966f7a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -200,8 +200,7 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
-  CORBA::ULong length = ACE_static_cast (CORBA::ULong,
-                                         this->type_map_.current_size ());
+  CORBA::ULong length = static_cast<CORBA::ULong> (this->type_map_.current_size ());
   CosTrading::ServiceTypeName *types =
     CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq::allocbuf (length);
 
@@ -406,8 +405,7 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct
 
   // Count the total number of properties.
   CORBA::ULong num_props = 0;
-  CORBA::ULong num_types = ACE_static_cast (CORBA::ULong,
-                                            service_type_queue.size ());
+  CORBA::ULong num_types = static_cast<CORBA::ULong> (service_type_queue.size ());
 
   TAO_String_Queue::ITERATOR iterator (service_type_queue);
 
@@ -419,8 +417,7 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct
       Service_Type_Map::ENTRY *type_entry = 0;
 
       iterator.next (next_type_name);
-      TAO_String_Hash_Key hash_key (ACE_const_cast (const char *,
-                                                    *next_type_name));
+      TAO_String_Hash_Key hash_key (const_cast<const char *> (*next_type_name));
       this->type_map_.find (hash_key,
                             type_entry);
 
@@ -451,8 +448,7 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct
       Service_Type_Map::ENTRY *type_entry = 0;
 
       iterator.next (next_type_name);
-      TAO_String_Hash_Key hash_key (ACE_const_cast (const char *,
-                                                    *next_type_name));
+      TAO_String_Hash_Key hash_key (const_cast<const char *> (*next_type_name));
       this->type_map_.find (hash_key,
                             type_entry);
 
@@ -492,8 +488,7 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ
 
           const char *type_name =
             type_struct.super_types[i];
-          target.enqueue_tail (ACE_const_cast (char *,
-                                               type_name));
+          target.enqueue_tail (const_cast<char *> (type_name));
 
           this->collect_inheritance_hierarchy (next_type_struct,
                                                target);
@@ -514,14 +509,13 @@ validate_properties (Prop_Map &prop_map,
        i++)
     {
       const char *n = props[i].name;
-      if (TAO_Trader_Base::is_valid_identifier_name (n) == 0)
+      if (TAO_Trader_Base::is_valid_property_name (n) == 0)
         ACE_THROW (CosTrading::IllegalPropertyName (n));
       else
         {
           TAO_String_Hash_Key prop_name (n);
           CosTradingRepos::ServiceTypeRepository::PropStruct *prop_val =
-            ACE_const_cast (CosTradingRepos::ServiceTypeRepository::PropStruct *,
-                            &props[i]);
+            const_cast<CosTradingRepos::ServiceTypeRepository::PropStruct *> (&props[i]);
 
           if (prop_map.bind (prop_name,
                              prop_val) == 1)
@@ -684,8 +678,7 @@ update_type_map (const char *name,
   /*
   CORBA::ULong pslength = props.length ();
   CosTradingRepos::ServiceTypeRepository::PropStructSeq* pstructs =
-    ACE_const_cast (CosTradingRepos::ServiceTypeRepository::PropStructSeq*,
-                    &props);
+    const_cast<CosTradingRepos::ServiceTypeRepository::PropStructSeq*> (&props);
   CosTradingRepos::ServiceTypeRepository::PropStruct* psbuf =
     pstructs->get_buffer (1);
   type->type_struct_.props.replace (pslength,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 54ce76db8d1..01c3f44ac45 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -5,8 +5,8 @@
 #include "ace/Thread_Mutex.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/OS_NS_strings.h"
-#include "ace/os_include/os_ctype.h"
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_ctype.h"
 
 // The following #include is needed only for the instantiation pragmas.
 #include "Trader_Interfaces.h"
@@ -76,22 +76,22 @@ TAO_Trader_Base::trading_components (void) const
 }
 
 CORBA::Boolean
-TAO_Trader_Base::is_valid_identifier_name (const char* ident)
+TAO_Trader_Base::is_valid_property_name (const char* ident)
 {
-  int return_value = 0;
+  bool return_value = false;
 
   if (ident == 0)
     return return_value;
 
   size_t length = ACE_OS::strlen (ident);
-  if (length >= 1 && isalpha (ident[0]))
+  if (length >= 1 && ACE_OS::ace_isalpha (ident[0]))
     {
-      return_value = 1;
+      return_value = true;
       for (size_t i = 0; i < length; i++)
         {
-          if (! (isalnum (ident[i]) || ident[i] == '_'))
+          if (! (ACE_OS::ace_isalnum (ident[i]) || ident[i] == '_'))
             {
-              return_value = 0;
+              return_value = false;
               break;
             }
         }
@@ -100,6 +100,68 @@ TAO_Trader_Base::is_valid_identifier_name (const char* ident)
   return return_value;
 }
 
+CORBA::Boolean
+TAO_Trader_Base::is_valid_identifier_name (const char* ident)
+{
+  static char const * const double_colon = "::";
+
+  if (ident == 0)
+    return 0;
+
+  int return_value = 1;
+
+  // Allow scoped identifiers
+  CORBA::Boolean done = 0;
+  char const * pos =
+    ACE_OS::strstr (ident,
+                    double_colon);
+
+  do
+  {
+    if ('_' == ident[0])
+      {
+        // Treat escaped identifiers the same way as IDL
+        ++ident;
+      }
+
+    size_t length =
+      pos ? pos - ident : ACE_OS::strlen (ident);
+
+    if (length >= 1 && ACE_OS::ace_isalpha (ident[0]))
+      {
+        // First character must be alpha
+        for (size_t i = 0; i < length; ++i)
+          {
+            if (! (ACE_OS::ace_isalnum (ident[i])
+                   || ident[i] == '_'))
+              {
+                // Subsequent characters is not alpha, numeric, or '_'
+                return_value = 0;
+                break;
+              }
+          }
+      }
+    else
+      return_value = 0;
+
+    if (pos)
+      {
+        // More identifiers
+        ident = pos + 2;
+        pos = ACE_OS::strstr (ident, double_colon);
+      }
+    else
+      {
+        // Last or only identifier
+        done = 1;
+      }
+  }
+  while (!done);
+
+  return return_value;
+}
+
+
 TAO_Support_Attributes_i::
 TAO_Support_Attributes_i (TAO_Lockable &locker)
   : locker_ (locker),
@@ -608,26 +670,24 @@ TAO_Trader_Factory::manufacture_trader (void)
 #endif /* ACE_HAS_THREADS */
 
   TAO_TRADER* return_value = 0;
-  int components = ACE_static_cast (int, TAO_Trader_Base::LOOKUP);
+  int components = static_cast<int> (TAO_Trader_Base::LOOKUP);
 
   if (this->conformance_ >= TAO_TRADER_SIMPLE)
-    components |= ACE_static_cast (int, TAO_Trader_Base::REGISTER);
+    components |= static_cast<int> (TAO_Trader_Base::REGISTER);
 
   if (this->conformance_ >= TAO_TRADER_STANDALONE)
-    components |= ACE_static_cast (int, TAO_Trader_Base::ADMIN);
+    components |= static_cast<int> (TAO_Trader_Base::ADMIN);
 
   if (this->conformance_ >= TAO_TRADER_LINKED)
-    components |= ACE_static_cast (int, TAO_Trader_Base::LINK);
+    components |= static_cast<int> (TAO_Trader_Base::LINK);
 
   if (this->threadsafe_)
     ACE_NEW_RETURN (return_value,
-                    MT_TRADER (ACE_static_cast (TAO_Trader_Base::Trader_Components,
-                                                components)),
+                    MT_TRADER (static_cast<TAO_Trader_Base::Trader_Components> (components)),
                     0);
   else
     ACE_NEW_RETURN (return_value,
-                    TRADER (ACE_static_cast (TAO_Trader_Base::Trader_Components,
-                                             components)),
+                    TRADER (static_cast<TAO_Trader_Base::Trader_Components> (components)),
                     0);
 
   TAO_Import_Attributes_i &import_attributes =
@@ -728,8 +788,7 @@ TAO_Trader_Factory::parse_args (int& argc, ACE_TCHAR** argv)
           if (arg_shifter.is_parameter_next ())
             {
               CORBA::ULong value =
-                ACE_static_cast (CORBA::ULong,
-                                 ACE_OS::atoi (arg_shifter.get_current ()));
+                static_cast<CORBA::ULong> (ACE_OS::atoi (arg_shifter.get_current ()));
               arg_shifter.consume_arg ();
 
               if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("card")))
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 1dabb8587b5..8028730474f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -435,9 +435,27 @@ public:
    * Determine whether the identifier is a valid one (i.e., if the
    * first character is a letter, and the subsequent ones letter,
    * numbers, or underscores.)
+   *
+   * IDL identifier scoping and escaping rules apply.
    */
   static CORBA::Boolean is_valid_identifier_name (const char* ident);
 
+  /**
+   * Determine whether the identifier is a valid one (i.e., if the
+   * first character is a letter, and the subsequent ones letter,
+   * numbers, or underscores.)
+   */
+  static CORBA::Boolean is_valid_property_name (const char* ident);
+
+  /**
+   * Determine whether the link name is a valid one
+   * currently defined the same as property name.
+   */
+  static CORBA::Boolean is_valid_link_name (const char* ident)
+  {
+    return is_valid_property_name (ident);
+  }
+
 protected:
   // = Objects determining current configuration of a trader.
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 8124dac618e..806615c64f4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -384,7 +384,7 @@ fill_receptacles (const char* /* type */,
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong, pref_inter.num_offers ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (pref_inter.num_offers ());
   CORBA::ULong offers_in_sequence = (how_many < size) ? how_many : size;
   CORBA::ULong offers_in_iterator = size - offers_in_sequence;
 
@@ -957,11 +957,11 @@ _cxx_export (CORBA::Object_ptr reference,
   // No copying, no memory leaks. Violates the "in" parameter semantics
   // when this object is colocated with the client, however.
   //  CosTrading::PropertySeq* hack_seq =
-  //    ACE_const_cast (CosTrading::PropertySeq*, &properties);
+  //    const_cast<CosTrading::PropertySeq*> (&properties);
   //  CosTrading::Property* pbuf = hack_seq->get_buffer (1);
 
   //  CosTrading::PropertySeq* hack_seq =
-  //    ACE_const_cast (CosTrading::PropertySeq*, &properties);
+  //    const_cast<CosTrading::PropertySeq*> (&properties);
   //  CosTrading::Property* pbuf = hack_seq->get_buffer (0);
   //  offer->properties.replace (plength, plength, pbuf, 0);
   //  offer->properties._allocate_buffer (plength);
@@ -1059,7 +1059,7 @@ modify (const char *id,
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
 
   CosTrading::Offer* offer = offer_database.
-    lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type ACE_ENV_ARG_PARAMETER);
+    lookup_offer (const_cast<CosTrading::OfferId> (id), type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (offer != 0)
@@ -1168,7 +1168,7 @@ resolve (const CosTrading::TraderName &name
                   CosTrading::Register::RegisterNotSupported))
 {
   // Determine if the first link is a legal link name.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name[0]))
+  if (! TAO_Trader_Base::is_valid_link_name (name[0]))
     ACE_THROW_RETURN (CosTrading::Register::IllegalTraderName (name),
                       CosTrading::Register::_nil ());
 
@@ -1311,30 +1311,30 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
   if (ip_addr != 0)
     {
       pid_t pid = ACE_OS::getpid ();
-      this->stem_id_[0] = ACE_static_cast (CORBA::Octet, (ip_addr >> 24) & 0xff);
-      this->stem_id_[1] = ACE_static_cast (CORBA::Octet, (ip_addr >> 16) & 0xff);
-      this->stem_id_[2] = ACE_static_cast (CORBA::Octet, (ip_addr >> 8) & 0xff);
-      this->stem_id_[3] = ACE_static_cast (CORBA::Octet, ip_addr & 0xff);
-      this->stem_id_[4] = ACE_static_cast (CORBA::Octet, (pid >> 24) & 0xff);
-      this->stem_id_[5] = ACE_static_cast (CORBA::Octet, (pid >> 16) & 0xff);
-      this->stem_id_[6] = ACE_static_cast (CORBA::Octet, (pid >> 8) & 0xff);
-      this->stem_id_[7] = ACE_static_cast (CORBA::Octet, pid & 0xff);
+      this->stem_id_[0] = static_cast<CORBA::Octet> ((ip_addr >> 24) & 0xff);
+      this->stem_id_[1] = static_cast<CORBA::Octet> ((ip_addr >> 16) & 0xff);
+      this->stem_id_[2] = static_cast<CORBA::Octet> ((ip_addr >> 8) & 0xff);
+      this->stem_id_[3] = static_cast<CORBA::Octet> (ip_addr & 0xff);
+      this->stem_id_[4] = static_cast<CORBA::Octet> ((pid >> 24) & 0xff);
+      this->stem_id_[5] = static_cast<CORBA::Octet> ((pid >> 16) & 0xff);
+      this->stem_id_[6] = static_cast<CORBA::Octet> ((pid >> 8) & 0xff);
+      this->stem_id_[7] = static_cast<CORBA::Octet> (pid & 0xff);
     }
 
   // The default way -- eight random integers.
   else
     {
       size_t time_value = ACE_OS::time ();
-      ACE_OS::srand (ACE_static_cast (u_int, time_value));
-
-      this->stem_id_[0] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[1] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[2] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[3] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[4] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[5] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[6] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[7] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
+      ACE_OS::srand (static_cast<u_int> (time_value));
+
+      this->stem_id_[0] = static_cast<CORBA::Octet> (ACE_OS::rand () %  256);
+      this->stem_id_[1] = static_cast<CORBA::Octet> (ACE_OS::rand () %  256);
+      this->stem_id_[2] = static_cast<CORBA::Octet> (ACE_OS::rand () %  256);
+      this->stem_id_[3] = static_cast<CORBA::Octet> (ACE_OS::rand () %  256);
+      this->stem_id_[4] = static_cast<CORBA::Octet> (ACE_OS::rand () %  256);
+      this->stem_id_[5] = static_cast<CORBA::Octet> (ACE_OS::rand () %  256);
+      this->stem_id_[6] = static_cast<CORBA::Octet> (ACE_OS::rand () %  256);
+      this->stem_id_[7] = static_cast<CORBA::Octet> (ACE_OS::rand () %  256);
     }
 }
 
@@ -1680,7 +1680,7 @@ add_link (const char *name,
                   CosTrading::Link::LimitingFollowTooPermissive))
 {
   // Ensure the link name is valid.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
+  if (! TAO_Trader_Base::is_valid_link_name (name))
     ACE_THROW (CosTrading::Link::IllegalLinkName (name));
 
   // Ensure this isn't a duplicate link name.
@@ -1730,7 +1730,7 @@ remove_link (const char *name
                   CosTrading::Link::UnknownLinkName))
 {
   // Ensure the link name is valid.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
+  if (! TAO_Trader_Base::is_valid_link_name (name))
     ACE_THROW (CosTrading::Link::IllegalLinkName (name));
 
   // Ensure this isn't a duplicate link name.
@@ -1751,7 +1751,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
                    CosTrading::Link::UnknownLinkName))
 {
   // Ensure the link name is valid.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
+  if (! TAO_Trader_Base::is_valid_link_name (name))
     ACE_THROW_RETURN (CosTrading::Link::IllegalLinkName (name), 0);
 
   // Ensure this isn't a duplicate link name.
@@ -1795,7 +1795,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (ACE_ENV_SINGLE_ARG_DECL_NO
   size_t size = this->links_.current_size ();
   CORBA::ULong i = 0;
   CosTrading::LinkName* link_seq =
-    CosTrading::LinkNameSeq::allocbuf (ACE_static_cast (CORBA::ULong, size));
+    CosTrading::LinkNameSeq::allocbuf (static_cast<CORBA::ULong> (size));
 
   // Copy the link names into the buffer.
   for (ACE_TYPENAME Links::iterator links_iter (this->links_);
@@ -1820,7 +1820,7 @@ modify_link (const char *name,
                    CosTrading::Link::LimitingFollowTooPermissive))
 {
   // Ensure the link name is valid.
-  if (! TAO_Trader_Base::is_valid_identifier_name (name))
+  if (! TAO_Trader_Base::is_valid_link_name (name))
     ACE_THROW (CosTrading::Link::IllegalLinkName (name));
 
   // Ensure this isn't a duplicate link name.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index c7af45a8df1..a19e9fde8f3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -156,7 +156,7 @@ TAO_Policy_Creator::fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type)
               if (this->poltable_[i] == 0)
                 {
                   occupying_policy =
-                    ACE_static_cast (TAO_Policies::POLICY_TYPE, i);
+                    static_cast<TAO_Policies::POLICY_TYPE> (i);
                   break;
                 }
             }
@@ -339,7 +339,7 @@ TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
     {
       const CosTrading::Property& prop = this->props_[i];
 
-      if (! TAO_Trader_Base::is_valid_identifier_name (prop.name))
+      if (! TAO_Trader_Base::is_valid_property_name (prop.name))
         ACE_THROW (CosTrading::IllegalPropertyName (prop.name));
 
       TAO_String_Hash_Key prop_name = prop.name.in ();
@@ -1070,7 +1070,7 @@ TAO_Offer_Modifier (const char* type_name,
   for (i = 0; i < props_length; i++)
     {
       TAO_String_Hash_Key prop_name =
-        ACE_static_cast (const char*, prop_seq[i].name);
+        static_cast<const char*> (prop_seq[i].name);
       this->props_.bind (prop_name, &prop_seq[i]);
     }
 }
@@ -1102,8 +1102,8 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes
 
   for (i = 0; i < length; i++)
     {
-      const char* dname = ACE_static_cast (const char*,  deletes[i]);
-      if (! TAO_Trader_Base::is_valid_identifier_name (dname))
+      const char* dname = static_cast<const char*> (deletes[i]);
+      if (! TAO_Trader_Base::is_valid_property_name (dname))
         ACE_THROW (CosTrading::IllegalPropertyName (dname));
       else
         {
@@ -1121,7 +1121,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes
   for (i = 0; i < length; i++)
     {
       TAO_String_Hash_Key prop_name =
-        ACE_static_cast (const char *, deletes[i]);
+        static_cast<const char *> (deletes[i]);
       this->props_.unbind (prop_name);
     }
 }
@@ -1145,7 +1145,7 @@ merge_properties (const CosTrading::PropertySeq& modifies
   for (i = 0, length = modifies.length (); i < length; i++)
     {
       const char* mname = modifies[i].name;
-      if (TAO_Trader_Base::is_valid_identifier_name (mname))
+      if (TAO_Trader_Base::is_valid_property_name (mname))
         {
           TAO_String_Hash_Key prop_name (mname);
           if (this->readonly_.find (prop_name) == 0)
@@ -1207,7 +1207,7 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
       TAO_String_Hash_Key prop_name = modifies[i].name.in ();
 
       CosTrading::Property* prop =
-        ACE_const_cast (CosTrading::Property*, &modifies[i]);
+        const_cast<CosTrading::Property*> (&modifies[i]);
       if (this->props_.bind (prop_name, prop, entry) == 1)
         // We need to rebind here.
         entry->int_id_ = prop;
@@ -1215,8 +1215,7 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
 
   CORBA::ULong num_modified = 0,
     original_length = this->offer_->properties.length (),
-    total_length = ACE_static_cast (CORBA::ULong,
-                                    this->props_.current_size ());
+    total_length = static_cast<CORBA::ULong> (this->props_.current_size ());
 
   // Scrap the existing property sequence and begin a new one
   CosTrading::PropertySeq prop_seq (total_length);
@@ -1407,8 +1406,7 @@ CosTrading::PolicyNameSeq*
 TAO_Offer_Filter::limits_applied (void)
 {
   int i = 0;
-  CORBA::ULong size = ACE_static_cast (CORBA::ULong,
-                                       this->limits_.size ());
+  CORBA::ULong size = static_cast<CORBA::ULong> (this->limits_.size ());
   CosTrading::PolicyName* temp =
     CosTrading::PolicyNameSeq::allocbuf (size);
 
@@ -1442,7 +1440,7 @@ TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
           const char* pname = prop_seq[i];
 
           // Check for errors or duplicates
-          if (TAO_Trader_Base::is_valid_identifier_name (pname))
+          if (TAO_Trader_Base::is_valid_property_name (pname))
             {
               TAO_String_Hash_Key prop_name (pname);
               if (this->props_.insert (prop_name) == 1)
@@ -1477,7 +1475,7 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source,
   Prop_Queue prop_queue;
   CosTrading::PropertySeq& s_props = source->properties;
   CosTrading::PropertySeq& d_props = destination.properties;
-  CORBA::ULong length = ACE_static_cast (CORBA::ULong, s_props.length ()),
+  CORBA::ULong length = static_cast<CORBA::ULong> (s_props.length ()),
                elem = 0;
 
   destination.reference = CORBA::Object::_duplicate (source->reference.in ());
@@ -1500,7 +1498,7 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source,
 
       // Shove the matched properties into the destination property
       // sequence.
-      length = ACE_static_cast (CORBA::ULong, prop_queue.size ());
+      length = static_cast<CORBA::ULong> (prop_queue.size ());
       d_props.length (length);
       for (Prop_Queue::ITERATOR prop_iter (prop_queue);
            ! prop_iter.done ();
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 140a025fbe7..170b0f5d06f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -56,7 +56,7 @@ TAO_Trading_Loader::TAO_Trading_Loader (void)
       ACE_OS::sprintf (trader_name,
                        "%s_%ld",
                        host_name,
-                       ACE_static_cast (long, ACE_OS::getpid ()));
+                       static_cast<long> (ACE_OS::getpid ()));
 
       for (char *dot = 0;
            (dot = ACE_OS::strchr (trader_name, '.')) != 0;
@@ -144,8 +144,7 @@ TAO_Trading_Loader::fini (void)
 
               ACE_DEBUG ((LM_DEBUG,
                           "*** Removing link to %s.\n",
-                          ACE_static_cast (const char *,
-                                           link_name_seq[i])));
+                          static_cast<const char *> (link_name_seq[i])));
               our_link->remove_link (link_name_seq[i]
                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
@@ -333,14 +332,12 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
        i--)
     {
       // Avoid linking to ourselves.
-      if (ACE_OS::strcmp (ACE_static_cast (const char *,
-                                           link_name_seq[i]),
+      if (ACE_OS::strcmp (static_cast<const char *> (link_name_seq[i]),
                           this->name_.in ()) != 0)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "*** Getting info for link %s.\n",
-                      ACE_static_cast (const char *,
-                                       link_name_seq[i])));
+                      static_cast<const char *> (link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
             link_if->describe_link (link_name_seq[i]
                                     ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
index b099e9e6132..1b0832a570b 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
@@ -12,10 +12,21 @@ feature(ec_typed_events) {
   Header_Files {
     CosTypedEventCommS.h
     CosTypedEventChannelAdminS.h
+
+    CosTypedEventCommS_T.h
+    CosTypedEventChannelAdminS_T.h
   }
 
   Inline_Files {
     CosTypedEventCommS.inl
     CosTypedEventChannelAdminS.inl
+
+    CosTypedEventCommS_T.inl
+    CosTypedEventChannelAdminS_T.inl
+  }
+
+  Template_Files {
+    CosTypedEventCommS_T.cpp
+    CosTypedEventChannelAdminS_T.cpp
   }
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index 3c9926419a3..b68487ba367 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -130,7 +130,7 @@ main (int argc, char *argv[])
 
       const float usecs = 1.0 / rate * 1e6;
 
-      ACE_Time_Value tv (0, ACE_static_cast (const long, usecs));
+      ACE_Time_Value tv (0, static_cast<const long> (usecs));
 
       // const timespec ts = tv;
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index 8a53c745f2f..ed3756bffbe 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -38,17 +38,17 @@ parse_args (int argc, char *argv[])
 
       case 'r':
         reject_threshold =
-          ACE_static_cast (CORBA::Float, ::atof (get_opts.opt_arg ()));
+          static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
         break;
 
       case 'c':
         critical_threshold =
-          ACE_static_cast (CORBA::Float, ::atof (get_opts.opt_arg ()));
+          static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
         break;
 
       case 'd':
         dampening =
-          ACE_static_cast (CORBA::Float, ::atof (get_opts.opt_arg ()));
+          static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index 0e2c302e5f5..58c918139fa 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -61,7 +61,8 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
     this->last_time_ = current_time;
   }
 
-  const CORBA::Float request_count = this->interceptor_->request_count ();
+  const CORBA::Float request_count =
+    static_cast<CORBA::Float> (this->interceptor_->request_count ());
 
   CosLoadBalancing::LoadList * tmp;
   ACE_NEW_THROW_EX (tmp,
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
index 3e2bd11f9b2..13d5f213cb3 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
@@ -58,7 +58,7 @@ public:
   /// LoadMonitor resides.
   /**
    * @return A "Load" sequence of length 1 that contains a LoadId
-   *         equal to CosLoadBalancing::CPU, and the average CPU
+   *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
   virtual CosLoadBalancing::LoadList * loads (
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index df27fc516a6..94221caa7bd 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -46,7 +46,8 @@ parse_args (int argc, char *argv[])
         break;
 
       case 'r':
-        rate = ACE_OS::atoi (get_opts.opt_arg ());
+        rate =
+          static_cast<float> (ACE_OS::atoi (get_opts.opt_arg ()));
         break;
 
       case 'n':
@@ -128,7 +129,7 @@ main (int argc, char *argv[])
 
       // const float usecs = 1.0 / rate * 1e6;
 
-      // ACE_Time_Value tv (0, ACE_static_cast (const long, usecs));
+      // ACE_Time_Value tv (0, static_cast<const long> (usecs));
 
       // const timespec ts = tv;
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index 35a61e24a27..e34950d11d5 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -41,17 +41,17 @@ parse_args (int argc, char *argv[])
 
       case 'r':
         reject_threshold =
-          ACE_static_cast (CORBA::Float, ::atof (get_opts.opt_arg ()));
+          static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
         break;
 
       case 'c':
         critical_threshold =
-          ACE_static_cast (CORBA::Float, ::atof (get_opts.opt_arg ()));
+          static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
         break;
 
       case 'd':
         dampening =
-          ACE_static_cast (CORBA::Float, ::atof (get_opts.opt_arg ()));
+          static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index 4c5c942cff7..d4ef62e9781 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -22,11 +22,15 @@ Roundtrip::test_method (Test::Timestamp send_time,
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   CORBA::Long elapsed = 0;
+  
   while (elapsed < workload_in_usecs)
     {
-      // ACE_OS::sleep (0);
-      elapsed = (ACE_OS::gethrtime () - start) / this->gsf_;
+      elapsed =
+        static_cast<CORBA::Long> (
+            (ACE_OS::gethrtime () - start) / this->gsf_
+          );
     }
+    
   return send_time;
 }
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h
index da4cf1e2787..6cb1a65d988 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h
@@ -37,7 +37,7 @@ public:
   /**
    * @param client The client
    */
-  ACE_EXPLICIT Auto_Disconnect (Client *s = 0);
+  explicit Auto_Disconnect (Client *s = 0);
 
   /// Assignment operator
   Auto_Disconnect<Client>& operator= (Client *client);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
index 7a8bd639a72..d7140a3275c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
@@ -23,8 +23,8 @@ public:
   /**
    * @param client The client
    */
-  ACE_EXPLICIT Implicit_Deactivator (PortableServer::Servant servant = 0
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  explicit Implicit_Deactivator (PortableServer::Servant servant = 0
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   Implicit_Deactivator (Implicit_Deactivator& rhs);
   Implicit_Deactivator& operator= (Implicit_Deactivator& rhs);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h
index 88ad3d8d59c..99c3e4f4ddc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h
@@ -31,7 +31,7 @@ public:
    * @param s The contained servant.  The constructor assumes
    * ownership.
    */
-  ACE_EXPLICIT Servant_var (SERVANT *s = 0);
+  explicit Servant_var (SERVANT *s = 0);
 
   /// Copy constructor
   Servant_var (const Servant_var<SERVANT> &rhs);
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index de4512bf7da..a76993a7587 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -313,4 +313,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy  <Distributer_Receiver_StreamEn
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy  <Distributer_Sender_StreamEndPoint,   TAO_VDev, AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<Distributer_Receiver_StreamEndPoint, TAO_VDev, AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy  <Distributer_Receiver_StreamEndPoint, TAO_VDev, AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Distributer, ACE_Null_Mutex> *ACE_Singleton<Distributer, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
index 2495144eff1..90322ac6860 100755
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
@@ -33,7 +33,9 @@ print STDERR "\nReceiver 1 --> Receiver 2 --> Distributer --> Sender\n\n";
 
 print STDERR "Starting Naming Service\n";
 
-$NS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index 6fb8655f858..96876f4ee06 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -355,4 +355,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,
 #pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Sender, ACE_Null_Mutex> *ACE_Singleton<Sender, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 6ade36d8ef6..305fa236cf2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -360,4 +360,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Receiver_StreamEndPoint,TAO_VDe
 #pragma instantiate ACE_Singleton <Receiver,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Receiver, ACE_Null_Mutex> *ACE_Singleton<Receiver, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 0479869fb72..b349a8bc5d5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -517,4 +517,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,
 #pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Sender, ACE_Null_Mutex> *ACE_Singleton<Sender, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 7c6383e799c..920ae63318f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -514,4 +514,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy  <Distributer_Receiver_StreamEn
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy  <Distributer_Sender_StreamEndPoint,   TAO_VDev, AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<Distributer_Receiver_StreamEndPoint, TAO_VDev, AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy  <Distributer_Receiver_StreamEndPoint, TAO_VDev, AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Distributer, ACE_Null_Mutex> *ACE_Singleton<Distributer, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 83729b46c55..7f0336cc487 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -518,4 +518,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,
 #pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Sender, ACE_Null_Mutex> *ACE_Singleton<Sender, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 6f11e981b6d..678ac494302 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -400,4 +400,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_A,TAO_VDev,A
 #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Client, ACE_Null_Mutex> *ACE_Singleton<Client, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
index 242253d1740..24cecf2a964 100755
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
@@ -22,7 +22,9 @@ $debug = 0;
 unlink $nsior;
 
 # generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
+# the size of this file is limited by the maximum packet size
+# windows has a maximum size of 8KB
+$input = PerlACE::generate_test_file("test_input", 32000);
 
 @protocols = ("TCP",
  	      "UDP"
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 20db38b4e59..a0570b874a2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -172,7 +172,7 @@ Server::run (void)
     }
     ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init\n");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::run\n");
       return -1;
     }
   ACE_ENDTRY;
@@ -271,4 +271,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy <TAO_StreamEndPoint_B,TAO_VDev,
 s#pragma instantiate ACE_Singleton <Server,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B <TAO_StreamEndPoint_B,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy <TAO_StreamEndPoint_B,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Server, ACE_Null_Mutex> *ACE_Singleton<Server, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 0bed10e783d..f05a7b2221e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -329,7 +329,7 @@ Pong_Send_Callback::send_response (ACE_hrtime_t stamp)
 
   ACE_hrtime_t buf[2];
 
-  ACE_Message_Block mb (ACE_reinterpret_cast (char*,buf),
+  ACE_Message_Block mb (reinterpret_cast<char*> (buf),
                         sizeof(buf));
 
   buf[0] = stamp;
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index cbc8c86e533..81d539e236a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -444,4 +444,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,
 #pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Sender, ACE_Null_Mutex> *ACE_Singleton<Sender, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
index bcd2322dd0c..4ddaaf0c147 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
@@ -3,7 +3,7 @@
 <ACE_Svc_Conf>
  <!--  $Id$ -->
  <!--  -->
- <!-- static Advanced_Resource_Factory "-ORBresources global -ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null" -->
+ <!-- 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 id="Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 55c1b9ddf46..c890d602c08 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -395,4 +395,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_V
 #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Client, ACE_Null_Mutex> *ACE_Singleton<Client, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
index 9552c5f8c89..ddd33ac5d58 100755
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
@@ -19,7 +19,9 @@ $test1 = PerlACE::LocalFile ("test1");
 $test2 = PerlACE::LocalFile ("test2");
 
 # generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
+# the size of this file is limited by the maximum packet size
+# windows has a maximum size of 8KB
+$input = PerlACE::generate_test_file("test_input", 32000);
 
 unlink $nsior, $test1, $test2;
 
@@ -30,7 +32,9 @@ $CL  = new PerlACE::Process ("ftp", "-ORBSvcConf components_svc$PerlACE::svcconf
 
 print STDERR "Starting Naming Service\n";
 
-$NS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($nsior, 15) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 1bf6cfa74f0..15c8d49408e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -243,4 +243,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy <FTP_Server_StreamEndPoint,TAO_
 #pragma instantiate ACE_Singleton <Server,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Server, ACE_Null_Mutex> *ACE_Singleton<Server, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 034b677928a..43bc3abcc7d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -434,4 +434,6 @@ template class TAO_FDev<FTP_Client_Producer, TAO_FlowConsumer>;
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_FDev<FTP_Client_Producer, TAO_FlowConsumer>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Client, ACE_Null_Mutex> *ACE_Singleton<Client, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
index bbc47d41b8a..73fcc6e8f30 100755
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
@@ -30,7 +30,9 @@ $CL  = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $i
 
 print STDERR "Starting Naming Service\n";
 
-$NS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index c943eaa4c80..0e4c94adb13 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -295,4 +295,6 @@ template class TAO_FDev<TAO_FlowProducer, FTP_Server_FlowEndPoint>;
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>
 #pragma instantiate TAO_FDev<TAO_FlowProducer, FTP_Server_FlowEndPoint>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Server, ACE_Null_Mutex> *ACE_Singleton<Server, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index c1c3d09e16d..2995e25e9b5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -302,4 +302,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Receiver_StreamEndPoint,TAO_VDe
 #pragma instantiate ACE_Singleton <Receiver,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Receiver_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Receiver, ACE_Null_Mutex> *ACE_Singleton<Receiver, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index a0252998b88..732b2e62fb4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -440,4 +440,6 @@ template class ACE_Unbounded_Set_Iterator <TAO_AV_Protocol_Object*>;
 #pragma instantiate  ACE_Node <TAO_AV_Protocol_Object*>
 #pragma instantiate ACE_Unbounded_Set <TAO_AV_Protocol_Object*>
 #pragma instantiate ACE_Unbounded_Set_Iterator <TAO_AV_Protocol_Object*>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Sender, ACE_Null_Mutex> *ACE_Singleton<Sender, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 8762fdb61d7..55bfa9e1048 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -494,4 +494,6 @@ TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_Med
 TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate
 TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Client, ACE_Null_Mutex> *ACE_Singleton<Client, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
index c19b488104f..dcc578e1756 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
@@ -2,9 +2,13 @@
 #define TIMESTAMP_H
 #include /**/ "ace/pre.h"
 
+#include "export.h"
+
 #include "orbsvcs/AV/Protocol_Factory.h"
+
 #include "ace/Dynamic_Service.h"
-#include "export.h"
+#include "ace/Service_Config.h"
+
 
 // $Id$
 
@@ -55,10 +59,3 @@ ACE_FACTORY_DECLARE (TAO_TS, TimeStamp_Protocol_Factory)
 
 #include /**/ "ace/post.h"
 #endif /*TIMESTAMP_H*/
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index ad7efd60bf6..06e7ec131c1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -412,4 +412,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,
 #pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Sender, ACE_Null_Mutex> *ACE_Singleton<Sender, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/README b/TAO/orbsvcs/tests/AVStreams/README
index 442ede23384..6a6799b4747 100644
--- a/TAO/orbsvcs/tests/AVStreams/README
+++ b/TAO/orbsvcs/tests/AVStreams/README
@@ -20,6 +20,7 @@ developed at the Oregon Graduate Institute.
 
 Members of the TAO A/V Streaming team include the following
 
+Yamuna Krishnamurthy <yamuna@oomworks.com>
 Sumedh Mungee <sumedh@cs.wustl.edu>
 Seth Widoff <sbw1@cs.wustl.edu>
 Nagarajan Surendran <naga@cs.wustl.edu>
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index 2ad409534ab..ce2552d5887 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -378,4 +378,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy  <Distributer_Receiver_StreamEn
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy  <Distributer_Sender_StreamEndPoint,   TAO_VDev, AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<Distributer_Receiver_StreamEndPoint, TAO_VDev, AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy  <Distributer_Receiver_StreamEndPoint, TAO_VDev, AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Distributer, ACE_Null_Mutex> *ACE_Singleton<Distributer, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index cd5008b2fd7..947b35715d5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -140,7 +140,7 @@ Sender::init (int argc,
                    "r");
 
   if (this->input_file_ == 0)
-    ACE_ERROR_RETURN ((LM_DEBUG,
+    ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot open input file %s\n",
                        this->filename_.c_str ()),
                       -1);
@@ -197,6 +197,17 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
 
+      // If we have a receiver, send to it.
+      while (this->protocol_object_ == 0)
+        {
+          // Run the orb for the wait time so the sender can
+          // continue other orb requests.
+          ACE_Time_Value wait_time (5);
+          TAO_AV_CORE::instance ()->orb ()->run (wait_time
+                                                 ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
       // Continue to send data till the file is read to the end.
       while (1)
         {
@@ -263,19 +274,15 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
           // Start timer before sending the frame.
           elapsed_timer.start ();
 
-          // If we have a receiver, send to it.
-          if (this->protocol_object_)
-            {
-              // Send frame.
-              int result =
-                this->protocol_object_->send_frame (&this->mb_);
-
-              if (result < 0)
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "send failed:%p",
-                                   "Sender::pace_data send\n"),
-                                  -1);
-            }
+          // Send frame.
+          int result =
+            this->protocol_object_->send_frame (&this->mb_);
+
+          if (result < 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "send failed:%p",
+                               "Sender::pace_data send\n"),
+                               -1);
 
           ACE_DEBUG ((LM_DEBUG,
                       "Sender::pace_data frame %d was sent succesfully\n",
@@ -358,7 +365,7 @@ main (int argc,
       SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_Time_Value tv (20);
+      ACE_Time_Value tv (10);
       orb->run (tv);
       // Hack for now....
       ACE_OS::sleep (1);
@@ -382,4 +389,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,
 #pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Sender, ACE_Null_Mutex> *ACE_Singleton<Sender, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
index 1718051a07f..ca24062c27b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
@@ -53,8 +53,7 @@ Receiver_Stats::dump_results (const ACE_TCHAR *msg,
   ACE_UINT64 avg = this->sum_ / this->samples_count_;
   ACE_UINT64 dev =
 #if defined ACE_LACKS_LONGLONG_T
-    ACE_static_cast (ACE_U_LongLong,
-                     this->sum2_ / this->samples_count_)
+    static_cast<ACE_U_LongLong> (this->sum2_ / this->samples_count_)
     - avg * ACE_U64_TO_U32(avg);
 #else  /* ! ACE_LACKS_LONGLONG_T */
     this->sum2_ / this->samples_count_ - avg * avg;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
index d8bde72c0f5..bb24ced8125 100755
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
@@ -61,7 +61,9 @@ $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior
 
 print STDERR "Starting Naming Service\n";
 
-$NS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($nsior, 100) == -1)
 {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 4d4d0652cbb..f37db66cb27 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -499,4 +499,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,
 #pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Sender, ACE_Null_Mutex> *ACE_Singleton<Sender, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 2b082f116da..cbb57850a44 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -576,4 +576,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,
 #pragma instantiate ACE_Singleton <Sender,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Sender, ACE_Null_Mutex> *ACE_Singleton<Sender, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
index d788f935b44..ecf5bd1deb9 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
@@ -3,7 +3,10 @@
 
 project(*Client): taoclient, ifr_client {
   exename = client
+  IDL_Files {
+  }
+
   Source_Files  {
     client.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
index bf135b3dcb9..aefa2879889 100755
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
@@ -14,17 +14,10 @@ $status = 0;
 $ifr_service_bin = "../../IFR_Service";
 
 # The location of the tao_ifr utility binary
-if ($^O eq "MSWin32") 
-{
-   $tao_ifr_bin = "../../../../bin";
-}
-else 
-{
-   $tao_ifr_bin = $ifr_service_bin;
-}
+$tao_ifr_bin = "../../../../bin";
 
 # The location of the tao_idl utility binary
-$tao_idl_bin = "../../../../TAO/TAO_IDL";
+$tao_idl_bin = "../../../../bin";
 
 # The idl file to be used for the test
 $test_idl = PerlACE::LocalFile("test.idl");
@@ -40,7 +33,7 @@ _EOF_
 close(HANDLE);
 
 $TAO_IDL    = new PerlACE::Process("$tao_idl_bin/tao_idl");
-$TAO_IDL->Arguments("$test_idl");
+$TAO_IDL->Arguments("-Sc $test_idl");
 $result = $TAO_IDL->SpawnWaitKill (30);
 
 # Search one of the stub files for the munged for of the interface name
@@ -69,7 +62,7 @@ if ($result != 0)
 # Delete files created during IDL compilation
 unlink <test*.h>;
 unlink <test*.cpp>;
-unlink <test*.i>;
+unlink <test*.inl>;
    
 # The file name for the IFR service IOR
 $ifr_service_ior_file = PerlACE::LocalFile("ifr.ior");
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index a95c59b5348..80c9d22d553 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -54,6 +54,15 @@ Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
+  ACE_CATCH (CORBA::TRANSIENT, ex)
+    {
+      // A transient exception exception may be expected,
+      // so we won't print out the word exception but we
+      // will let the user know that a transient exception occurred
+      ACE_DEBUG ((LM_DEBUG,
+                  "CORBA::TRANSIENT in Test_i::try_and_create_POA\n"));
+      return 1;
+    }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
@@ -61,7 +70,6 @@ Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl
index 26d9a6aed1c..75d817be671 100755
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl
@@ -11,15 +11,8 @@ use PerlACE::Run_Test;
 # The location of the implementation repository binaries
 $imr_bin_path  = "../../ImplRepo_Service";
 
-# The location of the tao_imr IMR utility 
-if ($^O eq "MSWin32") 
-{
-   $tao_imr_bin_path = "../../../../bin";
-}
-else 
-{
-   $tao_imr_bin_path = $imr_bin_path;
-}
+# The location of the tao_imr IMR utility
+$tao_imr_bin_path = "../../../../bin";
 
 # IOR file names
 $imr_ior_file        = PerlACE::LocalFile("impl.ior");
@@ -41,32 +34,32 @@ sub test_body
    unlink $imr_ior_file;
    unlink $activator_ior_file;
    unlink $server_ior_file;
-   
+
    # Start the IMR locator to generate an IOR file for the server to use...
    $LOCATOR->Arguments("-o $imr_ior_file -ORBEndpoint iiop://:$port");
    $LOCATOR->Spawn ();
-   
-   if (PerlACE::waitforfile_timed ($imr_ior_file, 10) == -1) 
+
+   if (PerlACE::waitforfile_timed ($imr_ior_file, 10) == -1)
    {
       print STDERR "ERROR: cannot find $imr_ior_file\n";
       $LOCATOR->Kill ();
       return 1;
    }
-   
-   # ...then shut it down so that the server will not be able to contact it 
+
+   # ...then shut it down so that the server will not be able to contact it
    $LOCATOR->TerminateWaitKill (5);
-   
-   if ($imr_locator != 0) 
+
+   if ($imr_locator != 0)
    {
       print STDERR "ERROR: IMR returned $imr_locator\n";
       $status = 1;
    }
-   
+
    # Start our server
    $SERVER->Arguments("-o $server_ior_file -ORBInitRef ImplRepoService=file://$imr_ior_file -ORBUseIMR 1");
    $SERVER->Spawn ();
-   
-   if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1) 
+
+   if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1)
    {
       print STDERR "ERROR: cannot find $server_ior_file\n";
       $ACTIVATOR->Kill ();
@@ -74,31 +67,31 @@ sub test_body
       $SERVER->Kill ();
       return 1;
    }
-   
+
    # Use the client to ask the server to try and create a persitent POA
    # We expect this to 'fail' as the IMR is dead
    $CLIENT->Arguments("-k file://$server_ior_file");
    $result = $CLIENT->SpawnWaitKill (30);
-   
-   if ($result == 0) 
+
+   if ($result == 0)
    {
       print STDERR "ERROR: First create POA attempt succeeded when it shouldn't have done\n";
       $SERVER->Kill ();
       return 1;
    }
-   
+
    # Now we restart the IMR locator
    unlink $imr_ior_file;
    $LOCATOR->Arguments("-o $imr_ior_file -ORBEndpoint iiop://:$port");
    $LOCATOR->Spawn ();
-   
-   if (PerlACE::waitforfile_timed ($imr_ior_file, 10) == -1) 
+
+   if (PerlACE::waitforfile_timed ($imr_ior_file, 10) == -1)
    {
       print STDERR "ERROR: cannot find $imr_ior_file\n";
       $LOCATOR->Kill ();
       return 1;
    }
-   
+
    # Work out the IMR activator command line.
    # Use the '-a' switch if this is a regression for bug #1394, else not
    if ($use_tao_imr_util != 0)
@@ -106,22 +99,37 @@ sub test_body
       $activator_arguments = "-o $activator_ior_file -ORBInitRef ImplRepoService=file://$imr_ior_file";
    }
    else
-   {  
+   {
       $activator_arguments = "-o $activator_ior_file -a -ORBInitRef ImplRepoService=file://$imr_ior_file";
    }
-   
+
    # Start up the activator
    $ACTIVATOR->Arguments ($activator_arguments);
    $ACTIVATOR->Spawn ();
-   
-   if (PerlACE::waitforfile_timed ($activator_ior_file, 10) == -1) 
+
+   if (PerlACE::waitforfile_timed ($activator_ior_file, 10) == -1)
    {
       print STDERR "ERROR: cannot find $activator_ior_file\n";
       $ACTIVATOR->Kill ();
       $LOCATOR->Kill ();
       return 1;
    }
-   
+
+   ## Since we have restarted the locator, we need to restart
+   ## the server so that it can pick up the new locator IOR
+   unlink($server_ior_file);
+   $SERVER->Kill ();
+   $SERVER->Spawn ();
+
+   if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1)
+   {
+      print STDERR "ERROR: cannot find $server_ior_file\n";
+      $ACTIVATOR->Kill ();
+      $LOCATOR->Kill ();
+      $SERVER->Kill ();
+      return 1;
+   }
+
    # If this is just a regression for bug #1395 we need to register the POA
    # If it is a regression for enhancement bug #1394, we don't need to.
    if ($use_tao_imr_util != 0)
@@ -129,8 +137,8 @@ sub test_body
       # Add the persistent POA name to the IMR
       $TAO_IMR->Arguments("add MyPoa -ORBInitRef ImplRepoService=file://$imr_ior_file");
       $result = $TAO_IMR->SpawnWaitKill (30);
-      
-      if ($result != 0) 
+
+      if ($result != 0)
       {
          print STDERR "ERROR: tao_imr returned $result\n";
          $ACTIVATOR->Kill ();
@@ -138,12 +146,12 @@ sub test_body
          return 1;
       }
    }
-   
+
    # Use the client to tell the server to attempt to create the POA again
    $CLIENT->Arguments("-k file://$server_ior_file");
    $result = $CLIENT->SpawnWaitKill (30);
-   
-   if ($result != 0) 
+
+   if ($result != 0)
    {
       print STDERR "ERROR: Second create POA attempt failed when it should have succeeded\n";
       $SERVER->Kill ();
@@ -151,17 +159,17 @@ sub test_body
       $LOCATOR->Kill ();
       return 1;
    }
-   
+
    # Tidy up
    $SERVER->TerminateWaitKill (5);
    $ACTIVATOR->TerminateWaitKill (5);
    $LOCATOR->TerminateWaitKill (5);
    return 0;
-}   
+}
 
 # Run regression for bug #1395
 $use_tao_imr_util = 1;
-$test_result = test_body(); 
+$test_result = test_body();
 if ($test_result != 0)
 {
    print STDERR "ERROR: Regression test for Bug #1395 failed\n";
@@ -175,13 +183,13 @@ if ($test_result != 0)
 # Uncomment the following to activate regression after submission and ..
 # Run regression for bug #1394
 #$use_tao_imr_util = 0;
-#$test_result = test_body(); 
+#$test_result = test_body();
 #if ($test_result != 0)
 #{
-#   print STDERR "ERROR: Regression test for Bug #1394 failed\n";  
+#   print STDERR "ERROR: Regression test for Bug #1394 failed\n";
 #}
 
 unlink $imr_ior_file;
 unlink $activator_ior_file;
-unlink $server_ior_file;   
+unlink $server_ior_file;
 exit $test_result;
diff --git a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
index 946d75e1d5b..a14f27a1a35 100755
--- a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
@@ -9,50 +9,51 @@ use lib '../../../../bin';
 use PerlACE::Run_Test;
 
 # The location of the implementation repository binaries
-$ifr_bin_path  = "../../IFR_Service";
+$ifr_bin_path = "../../IFR_Service";
 
-# The location of the tao_ifr IFR utility 
-if ($^O eq "MSWin32") 
-{
-   $tao_ifr_bin_path = "../../../../bin";
-}
-else 
-{
-   $tao_ifr_bin_path = $ifr_bin_path;
-}
+# The location of the tao_ifr IFR utility
+$tao_ifr_bin_path = "../../../../bin";
 
 # IOR file names
-$ifr_ior_file        = PerlACE::LocalFile("ifr.ior");
+$ifr_ior_file = PerlACE::LocalFile("ifr.ior");
 
 # IDL File
-$idl_file            = PerlACE::LocalFile("test.idl");
+$idl_file = PerlACE::LocalFile("test.idl");
 
 #Log file
-$result_file         = PerlACE::LocalFile("test_result.log");
+$result_file = PerlACE::LocalFile("test_result.log");
 
-$IFRSERVICE    = new PerlACE::Process("$ifr_bin_path/IFR_Service");
+$IFRSERVICE = new PerlACE::Process("$ifr_bin_path/IFR_Service");
 $TAO_IFR    = new PerlACE::Process("$tao_ifr_bin_path/tao_ifr");
 
 sub test_body
 {
    unlink $ifr_ior_file;
-   
+
    # Start the IFR Service to generate an IOR file for the tao_ifr to use...
    $IFRSERVICE->Arguments("-o $ifr_ior_file ");
    $IFRSERVICE->Spawn ();
-   
-   if (PerlACE::waitforfile_timed ($ifr_ior_file, 10) == -1) 
+
+   if (PerlACE::waitforfile_timed ($ifr_ior_file, 10) == -1)
    {
       print STDERR "ERROR: cannot find $ifr_ior_file\n";
       $IFRSERVICE->Kill ();
       return 1;
    }
 
-   $TAO_IFR->Arguments("-ORBInitRef InterfaceRepository=file://$ifr_ior_file -Cw $idl_file &> $result_file");
-   $TAO_IFR->Spawn ();  
+   # Redirect STDERR to a log file so that
+   # we can make sure that we got a warning
+   open(SAVEERR, ">&STDERR");
+   open(STDERR, ">$result_file");
 
-   if (PerlACE::waitforfile_timed ($result_file, 10) == -1) 
-   {
+   $TAO_IFR->Arguments("-ORBInitRef InterfaceRepository=file://$ifr_ior_file -Cw $idl_file");
+   $TAO_IFR->SpawnWaitKill (30);
+
+   # Close the log file and restore STDERR
+   close(STDERR);
+   open(STDERR, ">&SAVEERR");
+
+   if (! -r $result_file) {
       print STDERR "ERROR: cannot find $result_file\n";
       $IFRSERVICE->Kill ();
       $TAO_IFR->Kill ();
@@ -66,17 +67,16 @@ sub test_body
        last if $match;
       }
    close FILE;
-   # Tidy up   
+   # Tidy up
    $IFRSERVICE->TerminateWaitKill (5);
-   $TAO_IFR->TerminateWaitKill (5);
    return $match ? 0 : -1;
-}   
+}
 
 # Run regression for bug #1436
 $test_result = test_body();
- 
+
 if ($test_result != 0)
-{   
+{
    print STDERR "ERROR: Regression test for Bug #1436 failed\n";
 }
 else
diff --git a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl
index 59ccd2b87a4..536258b9a52 100755
--- a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl
@@ -11,15 +11,8 @@ use PerlACE::Run_Test;
 # The location of the implementation repository binaries
 $imr_bin_path  = "../../ImplRepo_Service";
 
-# The location of the tao_imr IMR utility 
-if ($^O eq "MSWin32") 
-{
-   $tao_imr_bin_path = "../../../../bin";
-}
-else 
-{
-   $tao_imr_bin_path = $imr_bin_path;
-}
+# The location of the tao_imr IMR utility
+$tao_imr_bin_path = "../../../../bin";
 
 # IOR file names
 $imr_ior_file        = PerlACE::LocalFile("impl.ior");
@@ -45,60 +38,62 @@ sub test_body
    # Start the IMR locator to generate an IOR file for the server to use...
    $LOCATOR->Arguments("-o $imr_ior_file -ORBEndpoint iiop://:$port");
    $LOCATOR->Spawn ();
-   
-   if (PerlACE::waitforfile_timed ($imr_ior_file, 10) == -1) 
+
+   if (PerlACE::waitforfile_timed ($imr_ior_file, 10) == -1)
    {
       print STDERR "ERROR: cannot find $imr_ior_file\n";
       $LOCATOR->Kill ();
       return 1;
    }
-   
+
    # Set the activator arguments
    $activator_arguments = "-o $activator_ior_file -ORBInitRef ImplRepoService=file://$imr_ior_file";
-   
+
    # Start up the activator
    $ACTIVATOR->Arguments ($activator_arguments);
    $ACTIVATOR->Spawn ();
-   
-   if (PerlACE::waitforfile_timed ($activator_ior_file, 10) == -1) 
+
+   if (PerlACE::waitforfile_timed ($activator_ior_file, 10) == -1)
    {
       print STDERR "ERROR: cannot find $activator_ior_file\n";
       $ACTIVATOR->Kill ();
       $LOCATOR->Kill ();
       return 1;
    }
- 
-   # Add the persistent POA name to the IMR
-   $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_ior_file &> $log_file add \"\"");
+
+   # Redirect STDERR to a log file so that the ERROR
+   # message does not get printed to the terminal
+   open(SAVEERR, ">&STDERR");
+   open(STDERR, ">$log_file");
+
+   # Add the illegal persistent POA name to the IMR
+   $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_ior_file add \"\"");
    $result = $TAO_IMR->SpawnWaitKill (30);
-   
-   if (PerlACE::waitforfile_timed ($log_file, 10) == -1) 
-   {
-      print STDERR "ERROR: cannot find $log_file\n";
-      $ACTIVATOR->Kill ();
-      $LOCATOR->Kill ();
-      return 1;
-   }
 
-   $match = 0;
-   open (FILE, $log_file) or return -1;
-   while (<FILE>) {
-       $match = /must be at least one character long/;
-       last if $match;
-      }
-   close FILE;
+   # Close the log file and restore STDERR
+   close(STDERR);
+   open(STDERR, ">&SAVEERR");
+
+   # If the add of an empty string failed, then
+   # the test of the tao_imr succeeded.
+   if ($result != 0) {
+     $result = 0;
+   }
+   else {
+      $result = -1;
+   }
 
    # Tidy up
    $ACTIVATOR->TerminateWaitKill (5);
    $LOCATOR->TerminateWaitKill (5);
-   return $match ? 0 : -1;
-}   
+   return $result;
+}
 
 # Run regression for bug #1437
-$test_result = test_body(); 
+$test_result = test_body();
 
 if ($test_result != 0)
-{   
+{
    print STDERR "ERROR: Regression test for Bug #1437 failed\n";
 }
 else
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index fe4a1467fe1..fda16fbaa42 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -24,11 +24,14 @@
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_string.h"
+
 
 ACE_RCSID (Concurrency,
            CC_command,
            "$Id$")
 
+
 CC_Command::~CC_Command(void)
 {
 }
@@ -105,15 +108,15 @@ CC_Start_Cmd::~CC_Start_Cmd()
 
 int CC_Start_Cmd::execute(void)
 {
-  if(excep_)
+  if (excep_)
     {
-      printf("Exception: %s\n", excep_->_rep_id ());
+      printf ("Exception: %s\n", excep_->_rep_id ());
       delete excep_;
       excep_ = 0;
       return 0; // CC_FAIL
     }
 
-  printf("Executing start command (script file: %s)\n", cfg_name_);
+  printf ("Executing start command (script file: %s)\n", cfg_name_);
 
   char cmd_line[1024];
   int success = ACE_OS::sprintf(&cmd_line[0], "%s -c %s",
@@ -460,19 +463,19 @@ CC_Wait_Cmd::~CC_Wait_Cmd()
 
 int CC_Wait_Cmd::execute(void)
 {
-  if(excep_)
+  if (excep_)
     {
-      printf("Exception: %s\n", excep_->_rep_id ());
+      printf ("Exception: %s\n", excep_->_rep_id ());
       delete excep_;
       excep_ = 0;
       return 0; // CC_FAIL
     }
 
-  printf("Executing wait command\n");
+  printf ("Executing wait command\n");
+
+  printf ("%s", prompt_);
+  (void) ACE_OS::fgetc (stdin);
 
-  char s[1];
-  printf("%s", prompt_);
-  ACE_OS::gets(&s[0]);
   return 1; // CC_SUCCESS
 }
 
@@ -490,7 +493,7 @@ CC_Excep_Cmd::~CC_Excep_Cmd(void)
 int
 CC_Excep_Cmd::execute(void)
 {
-  printf("Executing excep command (expected: %s)\n", ex_);
+  printf ("Executing excep command (expected: %s)\n", ex_);
   // First we check to see if an exception has occured. If not we fail
   // because we expected to see one
   if(excep_==0)
@@ -505,7 +508,7 @@ CC_Excep_Cmd::execute(void)
     }
   else
     {
-      printf("Exception: %s\n", excep_->_rep_id ());
+      printf ("Exception: %s\n", excep_->_rep_id ());
       delete excep_;
       excep_ = 0;
       return 0; // CC_FAIL
@@ -539,7 +542,7 @@ CC_Print_Cmd::~CC_Print_Cmd(void)
 int
 CC_Print_Cmd::execute(void)
 {
-  printf("%s\n", msg_);
+  printf ("%s\n", msg_);
   return 1; // CC_SUCCESS
 }
 
@@ -562,13 +565,13 @@ CC_Lookup_Cmd::execute(void)
 {
   if(excep_)
     {
-      printf("Exception: %s\n", excep_->_rep_id ());
+      printf ("Exception: %s\n", excep_->_rep_id ());
       delete excep_;
       excep_ = 0;
       return 0; // CC_FAIL
     }
 
-  printf("Executing lookup command (lock set: %s)\n", name_);
+  printf ("Executing lookup command (lock set: %s)\n", name_);
 
   // Do the lookup if we haven't done it before
   if(cc_lockset_.in() == 0)
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 8559173030b..f88b2b65f7e 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -27,21 +27,21 @@ ACE_RCSID(Concurrency, CC_test_utils, "$Id$")
 char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
 {
   if (mode==CosConcurrencyControl::read)
-    return ACE_const_cast (char*, "read");
+    return const_cast<char*> ("read");
 
   if (mode==CosConcurrencyControl::write)
-    return  ACE_const_cast (char*, "write");
+    return  const_cast<char*> ("write");
 
   if (mode==CosConcurrencyControl::upgrade)
-    return ACE_const_cast (char*, "upgrade");
+    return const_cast<char*> ("upgrade");
 
   if (mode==CosConcurrencyControl::intention_read)
-    return ACE_const_cast (char*, "intention_read");
+    return const_cast<char*> ("intention_read");
 
   if (mode==CosConcurrencyControl::intention_write)
-    return ACE_const_cast (char*, "intention_write");
+    return const_cast<char*> ("intention_write");
 
-  return ACE_const_cast (char*, "unknown lock mode");
+  return const_cast<char*> ("unknown lock mode");
 }
 
 CosConcurrencyControl::LockSet_ptr
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 01af67d07b7..5dfccef2eb5 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -65,21 +65,21 @@ char *
 CC_Test::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
 {
   if (mode==CosConcurrencyControl::read)
-    return ACE_const_cast (char *, "read");
+    return const_cast<char *> ("read");
 
   if (mode==CosConcurrencyControl::write)
-    return ACE_const_cast (char *, "write");
+    return const_cast<char *> ("write");
 
   if (mode==CosConcurrencyControl::upgrade)
-    return ACE_const_cast (char *, "upgrade");
+    return const_cast<char *> ("upgrade");
 
   if (mode==CosConcurrencyControl::intention_read)
-    return ACE_const_cast (char *, "intension_read");
+    return const_cast<char *> ("intension_read");
 
   if (mode==CosConcurrencyControl::intention_write)
-    return ACE_const_cast (char *, "intension_write");
+    return const_cast<char *> ("intension_write");
 
-  return ACE_const_cast (char *, "unknown lock mode");
+  return const_cast<char *> ("unknown lock mode");
 }
 
 // ================================
@@ -232,7 +232,7 @@ Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
   ACE_TRY
     {
       CORBA::Object_var ccls_obj =
-        this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""),
+        this->naming_service_->get_obj_from_name (const_cast<char *> (""),
                                                   my_name_
                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -279,7 +279,7 @@ Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */)
   ACE_TRY
     {
       CORBA::Object_var ccls_obj =
-        this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), my_name_
+        this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_
                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index cb87203f303..e6237a44469 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -98,7 +98,7 @@ run_test (PortableServer::POA_ptr poa,
     ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  Task task (event_channel.in (), use_callbacks);
+  MTD_Task task (event_channel.in (), use_callbacks);
 
   if (task.activate (THR_BOUND|THR_NEW_LWP, 1) != 0)
     {
@@ -115,7 +115,7 @@ run_test (PortableServer::POA_ptr poa,
   ACE_CHECK;
 }
 
-Task::Task (CosEventChannelAdmin::EventChannel_ptr ec,
+MTD_Task::MTD_Task (CosEventChannelAdmin::EventChannel_ptr ec,
             int callbacks)
   :  event_channel (CosEventChannelAdmin::EventChannel::_duplicate (ec)),
      use_callbacks (callbacks)
@@ -124,7 +124,7 @@ Task::Task (CosEventChannelAdmin::EventChannel_ptr ec,
 
 
 int
-Task::svc ()
+MTD_Task::svc ()
 {
   for (int i = 0; i < 10; ++i)
     {
@@ -143,7 +143,7 @@ Task::svc ()
 }
 
 void
-Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
+MTD_Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 06a263e9178..1248ee1b8ff 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -24,10 +24,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class Task : public ACE_Task_Base
+class MTD_Task : public ACE_Task_Base
 {
 public:
-  Task (CosEventChannelAdmin::EventChannel_ptr ec,
+  MTD_Task (CosEventChannelAdmin::EventChannel_ptr ec,
         int use_callbacks);
   // Create the task...
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index a84b5e24821..f691b066ae6 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -94,7 +94,7 @@ Driver::run (int argc, char* argv[])
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pid);
             }
         }
@@ -191,7 +191,7 @@ Driver::push_consumer (void* /* consumer_cookie */,
                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   // int ID =
-  //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
+  //   (reinterpret_cast<Test_Consumer**> (consumer_cookie)
   //    - this->consumers_);
   //
   // ACE_DEBUG ((LM_DEBUG, "(%t) events received by consumer %d\n", ID));
@@ -221,6 +221,7 @@ Driver::push_consumer (void* /* consumer_cookie */,
 
   // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
 
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
   for (u_int i = 0; i < events.length (); ++i)
     {
       const RtecEventComm::Event& e = events[i];
@@ -275,6 +276,7 @@ Driver::push_consumer (void* /* consumer_cookie */,
             }
         }
     }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 }
 
 void
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 1ef30218a5f..d37de8a9a41 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -91,7 +91,7 @@ ECMS_Driver::run (int argc, char* argv[])
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pid);
             }
         }
@@ -251,16 +251,29 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
           ACE_hrtime_t t = ACE_OS::gethrtime ();
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, t);
 
-          if (i == ACE_static_cast (CORBA::Long, this->event_count_) - 1)
+          if (i == static_cast<CORBA::Long> (this->event_count_) - 1)
             event[0].header.type = ACE_ES_EVENT_SHUTDOWN;
           else if (i % 2 == 0)
             event[0].header.type = this->event_a_;
           else
             event[0].header.type = this->event_b_;
 
-         // We use replace to minimize the copies, this should result
+          // We use replace to minimize the copies, this should result
           // in just one memory allocation;
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
           event[0].data.payload.replace (mblen, mb);
+#else
+          // If the replace method is not available, we will need
+          // to do the copy manually.  First, set the octet sequence length.
+          event[0].data.payload.length (mblen);
+
+          // Now copy over each byte.
+          char* base = mb->data_block ()->base ();
+          for(CORBA::ULong i = 0; i < mblen; i++)
+            {
+              event[0].data.payload[i] = base[i];
+            }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
           supplier->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 2746a69f222..8d4344eb8ee 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -131,7 +131,7 @@ ECM_Driver::run (int argc, char* argv[])
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pid);
             }
         }
@@ -443,7 +443,7 @@ ECM_Driver::parse_config_file (void)
       if (this->skip_blanks (cfg, "reading federation port number"))
         return -1;
       fscanf (cfg, "%d", &port);
-      CORBA::UShort mcast_port = ACE_static_cast(CORBA::UShort, port);
+      CORBA::UShort mcast_port = static_cast<CORBA::UShort> (port);
 
       int ns, nc;
       if (this->skip_blanks (cfg, "reading supplier count"))
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.i b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.i
index bd62b00a8d6..f44811dcd02 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.i
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.i
@@ -30,7 +30,7 @@ ECM_Federation::supplier_types (void) const
 ACE_INLINE const char*
 ECM_Federation::supplier_name (CORBA::ULong i) const
 {
-  if (i < ACE_static_cast (ACE_CAST_CONST CORBA::ULong, this->supplier_types_))
+  if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_))
     return this->supplier_names_[i];
   return 0;
 }
@@ -38,7 +38,7 @@ ECM_Federation::supplier_name (CORBA::ULong i) const
 ACE_INLINE CORBA::ULong
 ECM_Federation::supplier_ipaddr (CORBA::ULong i) const
 {
-  if (i < ACE_static_cast (ACE_CAST_CONST CORBA::ULong, this->supplier_types_))
+  if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_))
     return this->supplier_ipaddr_[i];
   return 0;
 }
@@ -52,7 +52,7 @@ ECM_Federation::consumer_types (void) const
 ACE_INLINE const char*
 ECM_Federation::consumer_name (CORBA::ULong i) const
 {
-  if (i < ACE_static_cast (ACE_CAST_CONST CORBA::ULong, this->consumer_types_))
+  if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_))
     return this->consumer_names_[i];
   return 0;
 }
@@ -60,7 +60,7 @@ ECM_Federation::consumer_name (CORBA::ULong i) const
 ACE_INLINE CORBA::ULong
 ECM_Federation::consumer_ipaddr (CORBA::ULong i) const
 {
-  if (i < ACE_static_cast (ACE_CAST_CONST CORBA::ULong, this->consumer_types_))
+  if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_))
     return this->consumer_ipaddr_[i];
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 08196317846..05fb541d728 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -234,7 +234,7 @@ Test_ECG::run (int argc, char* argv[])
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pid);
             }
         }
@@ -927,7 +927,7 @@ Test_ECG::push_consumer (void *consumer_cookie,
                          ACE_ENV_ARG_DECL_NOT_USED)
 {
   int ID =
-    (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
+    (reinterpret_cast<Test_Consumer**> (consumer_cookie)
      - this->consumers_);
 
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) events received by consumer %d\n", ID));
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 5c4ef131935..609bf639245 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -99,7 +99,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pid);
             }
         }
@@ -225,7 +225,7 @@ ECT_Consumer_Driver::shutdown_consumer (void*
                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   // int ID =
-  //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
+  //   (reinterpret_cast<Test_Consumer**> (consumer_cookie)
   //    - this->consumers_);
   //
   // ACE_DEBUG ((LM_DEBUG, "(%t) events received by consumer %d\n", ID));
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index 3fdc0892859..0aaabaaa42e 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -3,10 +3,6 @@
 #include "ECT_Driver.h"
 #include "ace/High_Res_Timer.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ECT_Driver.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(EC_Throughput, ECT_Driver, "$Id$")
 
 ECT_Driver::~ECT_Driver (void)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index 89701525acc..4b72bb9906b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -36,8 +36,4 @@ public:
   // suppliers.
 };
 
-#if defined (__ACE_INLINE__)
-#include "ECT_Driver.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* ECT_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
deleted file mode 100644
index c5d7985bfbc..00000000000
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// $Id$
-//
-
-// ****************************************************************
-
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 4e687d7a67b..03e03b03d9d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -161,8 +161,21 @@ Test_Supplier::svc ()
 
       // We use replace to minimize the copies, this should result
       // in just one memory allocation;
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       event[0].data.payload.replace (this->event_size_,
                                      &mb);
+#else
+      // If the replace method is not available, we will need
+      // to do the copy manually.  First, set the octet sequence length.
+      event[0].data.payload.length (this->event_size_);
+
+      // Now copy over each byte.
+      char* base = mb.data_block ()->base ();
+      for(CORBA::ULong i = 0; i < (CORBA::ULong)this->event_size_; i++)
+        {
+          event[0].data.payload[i] = base[i];
+        }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
       ACE_hrtime_t test_start = ACE_OS::gethrtime ();
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index cf4ff7d1d1b..d2350ca9a04 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -111,7 +111,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pid);
             }
         }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 9d5395e9569..bfc6b680dbc 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -148,7 +148,7 @@ ECT_Throughput::run (int argc, char* argv[])
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
-                               ACE_static_cast (long, ACE_OS::getpid ()));
+                               static_cast<long> (ACE_OS::getpid ()));
               ACE_OS::fclose (pid);
             }
         }
@@ -367,7 +367,7 @@ ECT_Throughput::shutdown_consumer (void*
                                    ACE_ENV_ARG_DECL_NOT_USED)
 {
   // int ID =
-  //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
+  //   (reinterpret_cast<Test_Consumer**> (consumer_cookie)
   //    - this->consumers_);
   //
   // ACE_DEBUG ((LM_DEBUG, "(%t) events received by consumer %d\n", ID));
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
index 2837a6fa503..a1ff6f58f3c 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
@@ -5,7 +5,7 @@ ACE_BUILDDIR = $(top_builddir)/..
 TAO_ROOT = $(top_srcdir)
 TAO_BUILDDIR = $(top_builddir)
 
-## Makefile.ECT_Consumer.am 
+## Makefile.ECT_Consumer.am
 
 noinst_PROGRAMS = ECT_Consumer
 
@@ -23,8 +23,7 @@ ECT_Consumer_SOURCES = \
   ECT_Driver.cpp \
   ECT_Consumer.h \
   ECT_Consumer_Driver.h \
-  ECT_Driver.h \
-  ECT_Driver.i
+  ECT_Driver.h
 
 ECT_Consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \
@@ -41,7 +40,7 @@ ECT_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.ECT_Supplier.am 
+## Makefile.ECT_Supplier.am
 
 noinst_PROGRAMS += ECT_Supplier
 
@@ -77,7 +76,7 @@ ECT_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-## Makefile.ECT_Throughput.am 
+## Makefile.ECT_Throughput.am
 
 noinst_PROGRAMS += ECT_Throughput
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index abbf7f3dc6f..15960e52f28 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -30,10 +30,10 @@ if ($test != 0) {
 print STDERR "================ Collocated tests, multi threaded\n";
 
 $T = new PerlACE::Process ("ECT_Throughput",
-                           "-ORBSvcConf $ec_mt_conf" 
+                           "-ORBSvcConf $ec_mt_conf"
                            . " -m new -u 10000 -n 1 -t 0 -c 4");
 
-$test = $T->SpawnWaitKill (60);
+$test = $T->SpawnWaitKill (120);
 
 if ($test != 0) {
     print STDERR "ERROR: test returned $test\n";
@@ -48,12 +48,12 @@ unlink $ns_ior;
 
 $NS = new PerlACE::Process ("../../Naming_Service/Naming_Service",
                            "-o $ns_ior");
-                           
+
 $ES = new PerlACE::Process ("../../Event_Service/Event_Service",
                             "-ORBInitRef NameService=file://$ns_ior "
                             . " -ORBSvcConf $ec_conf "
                             . " -t NEW -s local");
-                            
+
 $C = new PerlACE::Process ("ECT_Consumer",
                            "-ORBInitRef NameService=file://$ns_ior "
                            . " -c 4 -s 1");
@@ -66,7 +66,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($ns_ior, 10) == -1) {
     print STDERR "ERROR: cannot find file <$ns_ior>\n";
-    $NS->Kill (); 
+    $NS->Kill ();
     exit 1;
 }
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index e80efa46881..4575366be4f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -114,7 +114,7 @@ EC_Driver::run_init (int &argc, char* argv[]
       if (pid != 0)
         {
           ACE_OS::fprintf (pid, "%ld\n",
-                           ACE_static_cast (long, ACE_OS::getpid ()));
+                           static_cast<long> (ACE_OS::getpid ()));
           ACE_OS::fclose (pid);
         }
     }
@@ -1092,13 +1092,13 @@ EC_Driver::cleanup_ec (void)
 int
 EC_Driver::decode_consumer_cookie (void* cookie) const
 {
-  return ACE_static_cast(EC_Consumer**,cookie) - this->consumers_;
+  return static_cast<EC_Consumer**> (cookie) - this->consumers_;
 }
 
 int
 EC_Driver::decode_supplier_cookie (void* cookie) const
 {
-  return ACE_static_cast(EC_Supplier**,cookie) - this->suppliers_;
+  return static_cast<EC_Supplier**> (cookie) - this->suppliers_;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/FT_App/.cvsignore b/TAO/orbsvcs/tests/FT_App/.cvsignore
deleted file mode 100644
index 8e4cf88d091..00000000000
--- a/TAO/orbsvcs/tests/FT_App/.cvsignore
+++ /dev/null
@@ -1,16 +0,0 @@
-*.dsp
-*.dsw
-*.ilk
-*.pdb
-*.plg
-*.ncb
-*.opt
-*.exe
-*.ior
-*.dat
-Release
-Debug
-FT_ReplicaC*
-FT_ReplicaS*
-FT_TestReplicaC*
-FT_TestReplicaS*
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index b52311f83be..28ee993d21d 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -7,6 +7,7 @@
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdio.h"
 
 class FTClientMain
 {
@@ -29,8 +30,8 @@ class FTClientMain
   /////////////////
   // implementation
 private:
-  void usage (ostream & out)const;
-  void commandUsage (ostream & out);
+  void usage (FILE* out)const;
+  void commandUsage (FILE* out);
   int pass (
     long & counter,         // inout
     int & more,             // out
@@ -56,8 +57,8 @@ private:
   int argc_;
   char ** argv_;
   const char * inFileName_;
-  ifstream inFile_;
-  istream *commandIn_;
+  FILE *inFile_;
+  FILE *commandIn_;
 
   enum Verbosity{
     SILENT,
@@ -76,7 +77,8 @@ private:
 
 
 FTClientMain::FTClientMain ()
-  : commandIn_(&cin)
+  : inFile_(0)
+  , commandIn_(stdin)
   , verbose_(NORMAL)
   , replica_pos_(0)
   , replica_name_("none")
@@ -85,64 +87,79 @@ FTClientMain::FTClientMain ()
 
 FTClientMain::~FTClientMain ()
 {
-  if (this->inFile_.is_open())
+  if (this->inFile_)
   {
-    this->inFile_.close();
+    ACE_OS::fclose (this->inFile_);
+	this->inFile_ = 0;
   }
 }
 
-void FTClientMain::commandUsage(ostream & out)
+void FTClientMain::commandUsage(FILE* out)
 {
-  out
-    << "Each command must be at the beginning of a separate line." << endl
-    << "Everything after the command (and operand if any) is ignored." << endl
-    << "Valid commands are:" << endl
-    << "  Access via method call:" << endl
-    << "    =N    set counter to N" << endl
-    << "    cN    get counter and compare to N (c stands for \"check\""<< endl
-    << "    +N    increment counter by N" << endl
-    << "    -N    decrement counter by N" << endl
-    << "  Access as attribute:" << endl
-    << "    >N    set attribute to N" << endl
-    << "    <     get attribite" << endl
-    << "  Try methods to be used by fault tolerant infrastructure: " << endl
-    << "    !     is_alive" << endl
-    << "    s     get_state" << endl
-    << "    S     set_state" << endl
-    << "    u     get_update" << endl
-    << "    U     set_update" << endl
-    << "  Simulate failure:" << endl
-    << "    dN    die on condition:" << endl
-    << "        d" << FT_TEST::TestReplica::NOT_YET << " don't die" << endl
-    << "        d" << FT_TEST::TestReplica::RIGHT_NOW << " immediately" << endl
-    << "        d" << FT_TEST::TestReplica::WHILE_IDLE << " while idle" << endl
-    << "      (FT_TestReplica interface)" << endl
-    << "        d" << FT_TEST::TestReplica::BEFORE_STATE_CHANGE << " before state change" << endl
-    << "        d" << FT_TEST::TestReplica::BEFORE_REPLICATION << " after state change, before replication" << endl
-    << "        d" << FT_TEST::TestReplica::BEFORE_REPLY << " after replication, before reply "<< endl
-    << "      (Monitorable interface)" << endl
-    << "        d" << FT_TEST::TestReplica::DURING_IS_ALIVE << " during is alive" << endl
-    << "        d" << FT_TEST::TestReplica::DENY_IS_ALIVE << " is_alive returns false" << endl
-    << "      (Updatable interface)" << endl
-    << "        d" << FT_TEST::TestReplica::DURING_GET_UPDATE << " during get update" << endl
-    << "        d" << FT_TEST::TestReplica::BEFORE_SET_UPDATE << " before set update" << endl
-    << "        d" << FT_TEST::TestReplica::AFTER_SET_UPDATE << " after set update" << endl
-    << "      (Checkpointable interface)" << endl
-    << "        d" << FT_TEST::TestReplica::DURING_GET_STATE << " during get state" << endl
-    << "        d" << FT_TEST::TestReplica::BEFORE_SET_STATE << " before set state" << endl
-    << "        d" << FT_TEST::TestReplica::AFTER_SET_STATE << " after set state" << endl
-    << " Logistics commands:" << endl
-    << "   #    ignore this line (comment)." << endl
-    << "   v    set verbosity:" << endl
-    << "     0 don't check counter value." << endl
-    << "     1 only display counter value mismatch." << endl
-    << "     2 display counter value after every command (default)." << endl
-    << "     3 display commands." << endl
-    << "     4 display method calls." << endl
-    << "   zN   sleep N seconds." << endl
-    << "   q    quit (end the client, not the replica(s).)" << endl
-    << "   q1   quit (end the client, and shutdown the currently active replica.)" << endl
-    << "   ?    help (this message)" << endl;
+  ACE_OS::fprintf (out,
+    "Each command must be at the beginning of a separate line.\n"
+    "Everything after the command (and operand if any) is ignored.\n"
+    "Valid commands are:\n"
+    "  Access via method call:\n"
+    "    =N    set counter to N\n"
+    "    cN    get counter and compare to N (c stands for \"check\"\n"
+    "    +N    increment counter by N\n"
+    "    -N    decrement counter by N\n"
+    "  Access as attribute:\n"
+    "    >N    set attribute to N\n"
+    "    <     get attribite\n"
+    "  Try methods to be used by fault tolerant infrastructure: \n"
+    "    !     is_alive\n"
+    "    s     get_state\n"
+    "    S     set_state\n"
+    "    u     get_update\n"
+    "    U     set_update\n"
+    "  Simulate failure:\n"
+    "    dN    die on condition:\n"
+    "        d%d don't die\n"
+    "        d%d immediately\n"
+    "        d%d while idle\n"
+    "      (FT_TestReplica interface)\n"
+    "        d%d before state change\n"
+    "        d%d after state change, before replication\n"
+    "        d%d after replication, before reply \n"
+    "      (Monitorable interface)\n"
+    "        d%d during is alive\n"
+    "        d%d is_alive returns false\n"
+    "      (Updatable interface)\n"
+    "        d%d during get update\n"
+    "        d%d before set update\n"
+    "        d%d after set update\n"
+    "      (Checkpointable interface)\n"
+    "        d%d during get state\n"
+    "        d%d before set state\n"
+    "        d%d after set state\n"
+    " Logistics commands:\n"
+    "   #    ignore this line (comment).\n"
+    "   v    set verbosity:\n"
+    "     0 don't check counter value.\n"
+    "     1 only display counter value mismatch.\n"
+    "     2 display counter value after every command (default).\n"
+    "     3 display commands.\n"
+    "     4 display method calls.\n"
+    "   zN   sleep N seconds.\n"
+    "   q    quit (end the client, not the replica(s).)\n"
+    "   q1   quit (end the client, and shutdown the currently active replica.)\n"
+    "   ?    help (this message)\n",
+	FT_TEST::TestReplica::NOT_YET,
+	FT_TEST::TestReplica::RIGHT_NOW,
+	FT_TEST::TestReplica::WHILE_IDLE,
+	FT_TEST::TestReplica::BEFORE_STATE_CHANGE,
+	FT_TEST::TestReplica::BEFORE_REPLICATION,
+	FT_TEST::TestReplica::BEFORE_REPLY,
+	FT_TEST::TestReplica::DURING_IS_ALIVE,
+	FT_TEST::TestReplica::DENY_IS_ALIVE,
+	FT_TEST::TestReplica::DURING_GET_UPDATE,
+	FT_TEST::TestReplica::BEFORE_SET_UPDATE,
+	FT_TEST::TestReplica::AFTER_SET_UPDATE,
+	FT_TEST::TestReplica::DURING_GET_STATE,
+	FT_TEST::TestReplica::BEFORE_SET_STATE,
+	FT_TEST::TestReplica::AFTER_SET_STATE);
 }
 
 int
@@ -164,15 +181,15 @@ FTClientMain::parse_args (int argc, char *argv[])
       case 'c':
       {
         this->inFileName_ = get_opts.opt_arg ();
-        this->inFile_.open(this->inFileName_);
-        if(this->inFile_.is_open() && this->inFile_.good())
+        this->inFile_ = ACE_OS::fopen (this->inFileName_, "r");
+        if(this->inFile_ && !ferror (this->inFile_))
         {
-          cout << "FT Client: Reading commands from " << this->inFileName_ << endl;
-          this->commandIn_ = & this->inFile_;
+          ACE_OS::fprintf (stdout, "FT Client: Reading commands from %s\n", this->inFileName_);
+          this->commandIn_ = this->inFile_;
         }
         else
         {
-          cout << "FT Client: Can't open input file: " << this->inFileName_ << endl;
+          ACE_OS::fprintf (stderr, "FT Client: Can't open input file: %s\n", this->inFileName_);
           result = -1;
         }
         break;
@@ -185,19 +202,18 @@ FTClientMain::parse_args (int argc, char *argv[])
 
       default:
       case '?':
-        usage(cerr);
+        usage(stderr);
         result = 1;
     }
   }
   return result;
 }
 
-void FTClientMain::usage(ostream & out)const
+void FTClientMain::usage(FILE* out)const
 {
-  out << "usage"
-      << " -c <command file>"
-      << " [-f <ior file>]..."
-      << endl;
+  ACE_OS::fprintf (out, "usage"
+      				    " -c <command file>"
+      				    " [-f <ior file>]...\n");
 }
 
 int FTClientMain::pass (
@@ -214,12 +230,18 @@ int FTClientMain::pass (
   ::FT::State_var update;
   unsigned long updateValue = 0;
 
-  while(more && result == 0 &&  ! this->commandIn_->eof())
+  while(more && result == 0 &&  !feof (this->commandIn_))
   {
     if (! retry || command.length () == 0 )
     {
       char buffer[1000];
-      this->commandIn_->getline(buffer, sizeof(buffer)-1);
+      char *str_ = ACE_OS::fgets (buffer, sizeof(buffer)-1, this->commandIn_);
+	  if ( str_ )
+	  {
+		str_ = ACE_OS::strrchr (str_, '\n');
+		if ( str_ )
+			*str_ = '\0';
+	  }
       command = buffer;
     }
     retry = 0;
@@ -233,7 +255,7 @@ int FTClientMain::pass (
 
       if (this->verbose_ >= NOISY)
       {
-        cout << "FT Client: " << command << endl;
+        ACE_OS::fprintf (stdout,  "FT Client: %s\n", command.c_str());
       }
 
       // turn echo on (based on verbose)
@@ -251,7 +273,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->set(" << operand << ");" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->set(%ld);\n", operand);
           }
           this->replica_->set(operand ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -262,18 +284,18 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->get();" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->get();\n");
           }
           long value = this->replica_->counter(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           if (value == operand)
           {
-            cout << "FT Client: Good: Read " << value << " expecting " << operand << endl;
+            ACE_OS::fprintf (stdout, "FT Client: Good: Read %ld expecting %ld\n", value, operand);
             counter = operand;
           }
           else
           {
-            cout << "FT Client: Error: Read " << value << " expecting " << operand << endl;
+            ACE_OS::fprintf (stdout, "FT Client: Error: Read %ld expecting %ld\n", value, operand);
           }
           echo = 0;
           break;
@@ -283,7 +305,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->counter(" << operand << ");" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->counter(%ld);\n", operand);
           }
           this->replica_->counter(operand ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -294,7 +316,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->increment(" << operand << ");" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", operand);
           }
           this->replica_->increment(operand ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -305,7 +327,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->increment(" << -operand << ");" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", -operand);
           }
           this->replica_->increment(-operand ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -316,11 +338,11 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->counter();" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->counter();\n");
           }
           long attribute = this->replica_->counter(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
-          cout << "FT Client: Attribute: " << attribute << endl;
+          ACE_OS::fprintf (stdout, "FT Client: Attribute: %ld\n", attribute);
           echo = 0;
           break;
         }
@@ -328,20 +350,20 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->is_alive();" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->is_alive();\n");
           }
           int alive = this->replica_->is_alive(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
-          cout << "FT Client: Is alive?  " << alive << endl;
+          ACE_OS::fprintf (stdout, "FT Client: Is alive?  %d\n", alive);
           break;
         }
         case 'd':
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->die(" << operand << ");" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->die(%ld);\n", operand);
           }
-          this->replica_->die(ACE_static_cast (FT_TEST::TestReplica::Bane, operand) ACE_ENV_ARG_PARAMETER);
+          this->replica_->die(static_cast<FT_TEST::TestReplica::Bane> (operand) ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           echo = 0;
           break;
@@ -350,7 +372,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->get_state();" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->get_state();\n");
           }
           state = this->replica_->get_state(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -363,7 +385,7 @@ int FTClientMain::pass (
           {
             if (this->verbose_ >= LOUD)
             {
-              cout << "FT Client: ->set_state(saved_state);" << endl;
+              ACE_OS::fprintf (stdout, "FT Client: ->set_state(saved_state);\n");
             }
             this->replica_->set_state (state.in ()
                                        ACE_ENV_ARG_PARAMETER);
@@ -372,7 +394,7 @@ int FTClientMain::pass (
           }
           else
           {
-            cout << "FT Client: Error: no saved state." << endl;
+            ACE_OS::fprintf (stdout, "FT Client: Error: no saved state.\n");
           }
           break;
         }
@@ -380,7 +402,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            cout << "FT Client: ->get_update();" << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ->get_update();\n");
           }
           update = this->replica_->get_update(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -393,7 +415,7 @@ int FTClientMain::pass (
           {
             if (this->verbose_ >= LOUD)
             {
-              cout << "FT Client: ->set_update(saved_update);" << endl;
+              ACE_OS::fprintf (stdout, "FT Client: ->set_update(saved_update);\n");
             }
             this->replica_->set_update(update.in () ACE_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (-1);
@@ -401,13 +423,13 @@ int FTClientMain::pass (
           }
           else
           {
-            cout << "FT Client: ERROR: No saved update information." << endl;
+            ACE_OS::fprintf (stdout, "FT Client: ERROR: No saved update information.\n");
           }
           break;
         }
         case 'v':
         {
-          this->verbose_ = ACE_static_cast(Verbosity, operand);
+          this->verbose_ = static_cast<Verbosity> (operand);
           break;
         }
         case 'z':
@@ -428,7 +450,7 @@ int FTClientMain::pass (
             {
               if (this->verbose_ >= LOUD)
               {
-                cout << "FT Client: ->shutdown();" << endl;
+                ACE_OS::fprintf (stdout, "FT Client: ->shutdown();\n");
               }
               this->replica_->shutdown( ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
@@ -440,7 +462,7 @@ int FTClientMain::pass (
             }
             ACE_CATCHANY
             {
-              cout << "FT Client: Ignoring expected exception during shutdown." << endl;
+              ACE_OS::fprintf (stdout, "FT Client: Ignoring expected exception during shutdown.\n");
               ; // ignore exception during shutdown
             }
             ACE_ENDTRY;
@@ -453,9 +475,9 @@ int FTClientMain::pass (
         {
           if (op != '?')
           {
-            cout << "FT Client: Unknown: " << command << endl;
+            ACE_OS::fprintf (stdout, "FT Client: Unknown: %s\n", command.c_str());
           }
-          commandUsage(cerr);
+          commandUsage(stderr);
           break;
         }
       }
@@ -463,7 +485,7 @@ int FTClientMain::pass (
       {
         if (this->verbose_ >= LOUD)
         {
-          cout << "FT Client: ->get();" << endl;
+          ACE_OS::fprintf (stdout, "FT Client: ->get();\n");
         }
 
         long value = this->replica_->get(ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -472,12 +494,12 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= NORMAL)
           {
-            cout << "FT Client: " << counter << endl;;
+            ACE_OS::fprintf (stdout, "FT Client: %ld\n", counter);
           }
         }
         else
         {
-          cout << "FT Client: Error: read " << value << " expecting " << counter << endl;
+          ACE_OS::fprintf (stdout, "FT Client: Error: read %ld expecting %ld\n", value, counter);
           result = -1;
         }
       }
@@ -502,12 +524,14 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL)
     }
     else
     {
-      cerr << "FT Client: Can't resolve IOR: " << this->replica_name_ << endl;
+      ACE_OS::fprintf (stderr, "FT Client: Can't resolve IOR: %s\n", this->replica_name_);
     }
   }
   else
   {
-    cerr << "***OUT_OF_REPLICAS*** " << this->replica_pos_ << endl;
+    ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** "
+                             ACE_SIZE_T_FORMAT_SPECIFIER
+                             "\n", this->replica_pos_);
   }
   return result;
 }
@@ -531,15 +555,15 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
 
     if (this->verbose_ >= NORMAL)
     {
-      cout << "FT Client: Initial counter " << counter << endl;
+      ACE_OS::fprintf (stdout, "FT Client: Initial counter %ld\n", counter);
     }
     if (ACE_OS::isatty(fileno(stdin)))
     {
-      cout << "FT Client: Commands(? for help):" << endl;
+      ACE_OS::fprintf (stdout, "FT Client: Commands(? for help):\n");
     }
 
     int more = 1;
-    while (more && result == 0 &&  ! this->commandIn_->eof())
+    while (more && result == 0 &&  !feof (this->commandIn_))
     {
       ACE_TRY_NEW_ENV
       {
@@ -548,7 +572,7 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
       }
       ACE_CATCH (CORBA::SystemException, sysex)
       {
-        cout << "FT Client: Caught system exception: " << endl;
+        ACE_OS::fprintf (stdout, "FT Client: Caught system exception: \n");
         ACE_PRINT_EXCEPTION (sysex, "FT Client");
 
         retry = 0;
@@ -558,33 +582,33 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (0);
         if (handled)
         {
-          cout << "FT Client: Recovering from fault." << endl;
-          cout << "FT Client:   Activate " << this->replica_name_ << endl;
+          ACE_OS::fprintf (stdout, "FT Client: Recovering from fault.\n");
+          ACE_OS::fprintf (stdout, "FT Client:   Activate %s\n", this->replica_name_);
           if (command.length () == 0)
           {
-            cout << "FT Client:   No command to retry." << endl;
+            ACE_OS::fprintf (stdout, "FT Client:   No command to retry.\n");
           }
           else if (command[0] == 'd')
           {
-            cout << "FT Client:   Not retrying \"die\" command." << endl;
+            ACE_OS::fprintf (stdout, "FT Client:   Not retrying \"die\" command.\n");
           }
           else if (sysex.completed () == CORBA::COMPLETED_YES)
           {
-            cout << "FT Client:   Last command completed.  No retry needed." << endl;
+            ACE_OS::fprintf (stdout, "FT Client:   Last command completed.  No retry needed.\n");
           }
           else
           {
             if (sysex.completed () == CORBA::COMPLETED_MAYBE)
             {
-              cout << "FT Client:   Last command may have completed.  Retrying anyway." << endl;
+              ACE_OS::fprintf (stdout, "FT Client:   Last command may have completed.  Retrying anyway.\n");
             }
             retry = 1;
-            cout << "FT Client:   Retrying command: " << command << endl;
+            ACE_OS::fprintf (stdout, "FT Client:   Retrying command: %s\n", command.c_str());
           }
         }
         if (! handled)
         {
-          cout << "FT Client: Exception not handled.  Rethrow. " << endl;
+          ACE_OS::fprintf (stdout, "FT Client: Exception not handled.  Rethrow. ");
           ACE_RE_THROW;
         }
       }
@@ -593,7 +617,7 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
   }
   else
   {
-    cerr << "FT Client: Can't connect to replica." << endl;
+    ACE_OS::fprintf (stderr, "FT Client: Can't connect to replica.\n");
   }
   return result;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index db1f0cd28a2..543c999a887 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -92,14 +92,14 @@ FTAPP::FT_Creator::parse_args (int argc, char *argv[])
 
       default:
       {
-        cerr << "Creator: Unknown argument -" << (char) c << endl;
-        usage(cerr);
+        ACE_OS::fprintf (stderr, "Creator: Unknown argument -%c\n", (char) c);
+        usage(stderr);
         result = 1;
         break;
       }
       case '?':
       {
-        usage(cerr);
+        usage(stderr);
         result = 1;
         break;
       }
@@ -108,25 +108,25 @@ FTAPP::FT_Creator::parse_args (int argc, char *argv[])
 
   if ( this->create_roles_.size() == 0 && this->unregister_roles_.size() == 0)
   {
-    cerr << "Creator: neither create (-t) nor kill (-u) specified.  Nothing to do." << endl;
-    usage (cerr);
+    ACE_OS::fprintf (stderr, "Creator: neither create (-t) nor kill (-u) specified.  Nothing to do.\n");
+    usage (stderr);
     result = -1;
   }
 
   return result;
 }
 
-void FTAPP::FT_Creator::usage(ostream & out)const
+void FTAPP::FT_Creator::usage(FILE* out)const
 {
-  out << "usage\n"
-      << " -r <role for objects to be created>\n"
-      << " -f <factory registry ior file> (if not specified, ReplicationManager is used.)\n"
-      << " -u <role to be unregistered (for testing factory registry)>\n"
-      << " -i (toggle write ior for each object (default false))\n"
-      << " -p <prefix for registration & file names>\n"
-      << " -g (toggle write iogr to file (default false))\n"
-      << " -n (toggle register iogr with name service (default true))\n"
-      ;
+  ACE_OS::fprintf (out, "usage\n"
+      				" -r <role for objects to be created>\n"
+      				" -f <factory registry ior file> (if not specified, ReplicationManager is used.)\n"
+      				" -u <role to be unregistered (for testing factory registry)>\n"
+      				" -i (toggle write ior for each object (default false))\n"
+      				" -p <prefix for registration & file names>\n"
+      				" -g (toggle write iogr to file (default false))\n"
+      				" -n (toggle register iogr with name service (default true))\n")
+      			   ;
 }
 
 
@@ -186,7 +186,7 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
   for ( nType = 0; result == 0 && nType < typeCount; ++nType)
   {
     const char * role = this->create_roles_[nType].c_str();
-    cout << endl << "Creator: Creating group of " << role << endl;
+    ACE_OS::fprintf (stdout, "\nCreator: Creating group of %s\n", role);
     PortableGroup::ObjectGroup_var group = this->creator_.create_group (
       role,
       this->write_iors_
@@ -206,13 +206,13 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
       FILE * iogr_file = fopen (iogr_filename, "w");
       if (iogr_file != 0)
       {
-        char const * siogr = ACE_static_cast (const char *, iogr.in ());
+        char const * siogr = static_cast<const char *> (iogr.in ());
         fwrite (siogr, 1, strlen(siogr), iogr_file);
         fclose (iogr_file);
       }
       else
       {
-        cerr << "Can't open iogr output file " << iogr_filename << endl;
+        ACE_OS::fprintf (stderr, "Can't open iogr output file %s\n", iogr_filename);
         result = 1;
       }
     }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 5d6c26321a5..912746e0fdb 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -22,6 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "TAO_Object_Group_Creator.h"
+#include "ace/OS_NS_stdio.h"
 
 namespace FTAPP
 {
@@ -52,7 +53,7 @@ namespace FTAPP
     /////////////////
     // implementation
   private:
-    void usage (ostream & out)const;
+    void usage (FILE* out)const;
 
     ////////////////////
     // forbidden methods
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 1c10cfed7aa..5bc817e59d7 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -595,7 +595,7 @@ void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * rep
     {
       ACE_ERROR (( LM_ERROR,
         "Remove replica %d mismatch.\n",
-        ACE_static_cast(int, id)
+        static_cast<int> (id)
         ));
     }
   }
@@ -603,8 +603,8 @@ void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * rep
   {
     ACE_ERROR (( LM_ERROR,
       "Attempt to remove invalid replica %d. Limit %d.\n",
-      ACE_static_cast(int, id),
-      ACE_static_cast(int, this->replicas_.size())
+      static_cast<int> (id),
+      static_cast<int> (this->replicas_.size())
       ));
   }
 }
@@ -681,7 +681,7 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
   (*factory_creation_id) <<= factory_id;
 
   ACE_ERROR ((LM_INFO,
-    "Created %s@%s#%d.\n", role, this->location_, ACE_static_cast(int, factory_id)
+    "Created %s@%s#%d.\n", role, this->location_, static_cast<int> (factory_id)
     ));
 
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index a2bc85e5f80..a87cb08afe6 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -30,6 +30,7 @@ class  FT_ReplicaFactory_i;
 #include <ace/Vector_T.h>
 #include "FT_TestReplicaS.h"
 #include <ace/Thread_Manager.h>
+#include <ace/SString.h>
 #include <orbsvcs/FT_ReplicationManagerC.h>
 
 /////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 0af57a70274..16f1f70eee4 100755
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -5,6 +5,7 @@
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdio.h"
 
 // A simple class for building a client that "controls' the
 // Replication Manager (right now it just shuts it down).
@@ -31,7 +32,7 @@ private:
 /////////////////////////////
 // Private implementation.
 private:
-  void usage (ostream & out) const;
+  void usage (FILE* out) const;
 
 /////////////////////////////
 // Data members.
@@ -135,13 +136,14 @@ int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[])
       }
 
       default:
-        cerr << argv[0] << ": Unknown argument -" << (char) c << endl;
-        this->usage(cerr);
+		ACE_OS::fprintf (stderr, "%s: Unknown argument - %c\n",
+        			             argv[0], c);
+        this->usage(stderr);
         result = -1;
         break;
 
       case '?':
-        this->usage(cerr);
+        this->usage(stderr);
         result = -1;
     }
   }
@@ -149,12 +151,11 @@ int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[])
   return result;
 }
 
-void TAO_FT_ReplicationManagerController::usage (ostream & out) const
+void TAO_FT_ReplicationManagerController::usage (FILE* out) const
 {
-  out << "usage"
-      << " -k <replication manager ior file>"
-      << " -x (shutdown the Replication Manager)"
-      << endl;
+  ACE_OS::fprintf (out, "usage"
+      					" -k <replication manager ior file>"
+      					" -x (shutdown the Replication Manager)\n");
 }
 
 int TAO_FT_ReplicationManagerController::run ()
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 2678c78cdd6..c18bbacf50e 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -20,6 +20,7 @@
 #include "FT_TestReplicaC.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
+#include "ace/OS_NS_stdio.h"
 
 //////////////////
 // TestReplica_i
@@ -39,10 +40,10 @@ namespace
   template<typename BUFFER>
   void storeLong(BUFFER & state, size_t offset, long value)
   {
-    state[offset    ] = ACE_static_cast (unsigned char, value >> 24);
-    state[offset + 1] = ACE_static_cast (unsigned char, value >> 16);
-    state[offset + 2] = ACE_static_cast (unsigned char, value >>  8);
-    state[offset + 3] = ACE_static_cast (unsigned char, value      );
+    state[offset    ] = static_cast<unsigned char> (value >> 24);
+    state[offset + 1] = static_cast<unsigned char> (value >> 16);
+    state[offset + 2] = static_cast<unsigned char> (value >>  8);
+    state[offset + 3] = static_cast<unsigned char> (value      );
   }
 
   /**
@@ -139,7 +140,8 @@ FT_TestReplica_i::~FT_TestReplica_i ()
 
 void FT_TestReplica_i::suicide(const char * note)
 {
-  cout << name_.c_str() << '@' << this->factory_->location() << '#' << this->factory_id_ << " Simulate FAULT_CODE fault: " << note << endl;
+  ACE_OS::fprintf (stdout, "%s@%s#%lu Simulate FAULT_CODE fault: %s\n",
+                   name_.c_str(), this->factory_->location(), this->factory_id_, note);
 
   // Tell the poa we aren't accepting future calls
   this->poa_->deactivate_object (this->object_id_.in ());
@@ -393,8 +395,8 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when
       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  cout << name_.c_str() << '@' << this->factory_->location()
-    << '#' << this->factory_id_ << " Received death threat: " << when << endl;
+  ACE_OS::fprintf (stdout, "%s@%s#%lu Received death threat: %d\n",
+                   name_.c_str(), this->factory_->location(), this->factory_id_, when);
 
   this->death_pending_ = when;
   KEVORKIAN(RIGHT_NOW, die)
@@ -403,8 +405,8 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when
 void FT_TestReplica_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  cout << name_.c_str() << '@' << this->factory_->location()
-    << '#' << this->factory_id_ << " Shut down requested" << endl;
+  ACE_OS::fprintf (stdout, "%s@%s#%lu Shut down requested\n",
+                   name_.c_str(), this->factory_->location(), this->factory_id_);
   this->death_pending_ = FT_TEST::TestReplica::CLEAN_EXIT;
 }
 
@@ -419,7 +421,7 @@ int FT_TestReplica_i::idle (int & result ACE_ENV_ARG_DECL)
       "%s@%s#%d: Simulated fault WHILE_IDLE",
       this->name_.c_str(),
       this->factory_->location(),
-      ACE_static_cast(int, this->factory_id_ )
+      static_cast<int> (this->factory_id_ )
       ));
     this->poa_->deactivate_object (this->object_id_.in ()
                  ACE_ENV_ARG_PARAMETER);
@@ -454,8 +456,8 @@ void FT_TestReplica_i::store(long counter)
     ACE_OS::fclose(f);
     if (this->verbose_)
     {
-      cout << name_.c_str() << '@' << this->factory_->location()
-        << '#' << this->factory_id_ << ": " << counter << endl;
+      ACE_OS::fprintf (stdout, "%s@%s#%lu :%ld\n",
+                       name_.c_str(), this->factory_->location(), this->factory_id_, counter);
     }
     delete[] buffer;
     buffer = 0;
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index 052b676c81f..77551ea21a0 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -13,13 +13,15 @@
 //
 #ifndef FT_TESTREPLICA_I_H_
 #define FT_TESTREPLICA_I_H_
-#include /**/ <ace/pre.h>
+#include /**/ "ace/pre.h"
 
 #include <ace/ACE.h>
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SString.h"
+
 #include "FT_TestReplicaS.h"
 
 ////////////////////
@@ -161,7 +163,7 @@ private:
   long load();
   /**
    * Store the persistent data.
-   * @param the data to be stored.
+   * @param value the data to be stored.
    */
   void store(long value);
 
@@ -191,7 +193,7 @@ private:
   unsigned long factory_id_;
 
   /**
-   * the factory that created thsi replica
+   * The factory that created this replica
    */
   FT_ReplicaFactory_i * factory_;
 
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 66e48bc950c..7b93fd77310 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
+#include "ace/OS_NS_stdio.h"
 
 ReplicationManagerFaultConsumerAdapter::ReplicationManagerFaultConsumerAdapter()
   : orb_(CORBA::ORB::_nil())
@@ -248,7 +249,7 @@ int ReplicationManagerFaultConsumerAdapter::init (
     size_t replicaCount = this->replica_iors_.size();
     ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("Number of replicas being monitored: (%u)\n"),
-      ACE_static_cast (unsigned int, replicaCount)
+      static_cast<unsigned int> (replicaCount)
     ));
     for (size_t nRep = 0; result == 0 && nRep < replicaCount; ++nRep)
     {
@@ -334,9 +335,12 @@ int ReplicationManagerFaultConsumerAdapter::init (
     // Signal that we are ready to go.
     if (result == 0 && this->readyFile_ != 0)
     {
-      ofstream ready (this->readyFile_, ios::out);
-      ready << "ready" << endl;
-      ready.close();
+	  FILE* ready = ACE_OS::fopen (this->readyFile_, "w");
+	  if (ready)
+	  {
+		ACE_OS::fprintf (ready, "ready\n");
+		ACE_OS::fclose (ready);
+	  }
     }
   }
 
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index 0d0833f7755..6b45d786a6e 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -13,6 +13,7 @@
 #include <orbsvcs/FT_NotifierC.h>
 #include <orbsvcs/FT_FaultDetectorFactoryC.h>
 #include <ace/Vector_T.h>
+#include <ace/SString.h>
 
 /////////////////////
 // Class declarations
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index d81d9fa061c..c766490fdfb 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -13,6 +13,8 @@
 #include <orbsvcs/CosNotifyChannelAdminS.h>
 #include <orbsvcs/FT_NotifierC.h>
 
+#include "ace/SString.h"
+
 //////////////////////
 // Forward references
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index f66171dec1a..a61f3ae1478 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
+#include "ace/OS_NS_stdio.h"
 
 StubFaultAnalyzer::StubFaultAnalyzer ()
   : readyFile_(0)
@@ -115,7 +116,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   this->factory_ = ::FT::FaultDetectorFactory::_narrow(detector_obj.in ());
   if (CORBA::is_nil(this->factory_.in ()))
   {
-    cerr << "Can't resolve Detector Factory IOR " << this->detector_ior_ << endl;
+    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n", this->detector_ior_);
     result = -1;
   }
 
@@ -125,7 +126,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   this->notifier_ = ::FT::FaultNotifier::_narrow(not_obj.in ());
   if (CORBA::is_nil(this->notifier_.in ()))
   {
-    cerr << "Can't resolve Notifier IOR " << this->notifier_ior_ << endl;
+    ACE_OS::fprintf (stderr, "Can't resolve Notifier IOR %s\n", this->notifier_ior_);
     result = -1;
   }
 
@@ -161,7 +162,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
       FT::PullMonitorable_var replica = FT::PullMonitorable::_narrow(rep_obj.in ());
       if (CORBA::is_nil(replica.in ()))
       {
-        cerr << "Can't resolve Replica IOR " << iorName << endl;
+        ACE_OS::fprintf (stderr, "Can't resolve Replica IOR %s\n", iorName);
         result = -1;
       }
       else
@@ -228,9 +229,12 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
     if (result == 0 && this->readyFile_ != 0)
     {
-      ofstream ready(this->readyFile_, ios::out);
-      ready << "ready" << endl;
-      ready.close();
+	  FILE *ready = ACE_OS::fopen (this->readyFile_, "w");
+	  if ( ready )
+	  {
+		ACE_OS::fprintf (ready, "ready\n");
+		ACE_OS::fclose (ready);
+	  }
     }
   }
   return result;
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 7da34e52cba..2a5067ad4a2 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -16,6 +16,7 @@
 #include <orbsvcs/FT_FaultDetectorFactoryC.h>
 
 #include "ace/Vector_T.h"
+#include "ace/SString.h"
 
 //////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 33c4491e7f1..3712953a2aa 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -248,7 +248,7 @@ void StubFaultConsumer::push_structured_event(
   const CosNotification::StructuredEvent &notification
   ACE_ENV_ARG_DECL_NOT_USED
   )
-  throw (CORBA::SystemException, CosEventComm::Disconnected)
+  ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
   ////////////////////////////////////////
   // keep track of how many we've received
@@ -258,10 +258,10 @@ void StubFaultConsumer::push_structured_event(
     "FaultConsumer:   Header EventType domain: %s\n"
     "FaultConsumer:   Header EventType type: %s\n"
     "FaultConsumer:   Header EventName: %s\n",
-    ACE_static_cast (unsigned int, this->notifications_),
-    ACE_static_cast (const char *, notification.header.fixed_header.event_type.domain_name),
-    ACE_static_cast (const char *, notification.header.fixed_header.event_type.type_name),
-    ACE_static_cast (const char *, notification.header.fixed_header.event_name)
+    static_cast<unsigned int> (this->notifications_),
+    static_cast<const char *> (notification.header.fixed_header.event_type.domain_name),
+    static_cast<const char *> (notification.header.fixed_header.event_type.type_name),
+    static_cast<const char *> (notification.header.fixed_header.event_name)
     ));
   const CosNotification::FilterableEventBody & filterable = notification.filterable_data;
 
@@ -270,7 +270,7 @@ void StubFaultConsumer::push_structured_event(
   {
     const CosNotification::Property & property = filterable[nProp];
 
-    const char * property_name = ACE_static_cast (const char *, property.name);
+    const char * property_name = static_cast<const char *> (property.name);
     const char * value = "<unknown>";
     if (property.value >>= value )
     {
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 374b2e7b588..4e8603710e1 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -13,6 +13,9 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include <orbsvcs/FT_NotifierC.h>
 
+#include "ace/SString.h"
+
+
 //////////////////////
 // Forward references
 
@@ -79,17 +82,17 @@ public:
       const CosNotification::StructuredEvent &notification
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
-      throw (CORBA::SystemException, CosEventComm::Disconnected);
+      ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType);
+      ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType));
 
    virtual void disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      throw (CORBA::SystemException);
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
   ////////////////////
   // Forbidden methods
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 47b2453d95e..d59c37c9025 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -196,7 +196,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   this->factory_ = ::FT::FaultDetectorFactory::_narrow(obj.in ());
   if (CORBA::is_nil(this->factory_.in ()))
   {
-    cerr << "Can't resolve Detector Factory IOR " << this->detector_ior_ << endl;
+    ACE_OS::fprintf (stderr, "Can't resolve Detector Factory IOR %s\n", this->detector_ior_);
     result = -1;
   }
   if (result == 0)
@@ -211,7 +211,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
       FT::PullMonitorable_var replica = FT::PullMonitorable::_narrow(obj.in ());
       if (CORBA::is_nil(replica.in ()))
       {
-        cerr << "Can't resolve Replica IOR " << iorName << endl;
+        ACE_OS::fprintf (stderr, "Can't resolve Replica IOR %s\n", iorName);
         result = -1;
       }
       else
@@ -362,9 +362,9 @@ void StubFaultNotifier::push_structured_fault (
     "FaultNotifier:   Header EventType domain: %s\n"
     "FaultNotifier:   Header EventType type: %s\n"
     "FaultNotifier:   Header EventName: %s\n",
-    ACE_static_cast (const char *, event.header.fixed_header.event_type.domain_name),
-    ACE_static_cast (const char *, event.header.fixed_header.event_type.type_name),
-    ACE_static_cast (const char *, event.header.fixed_header.event_name)
+    static_cast<const char *> (event.header.fixed_header.event_type.domain_name),
+    static_cast<const char *> (event.header.fixed_header.event_type.type_name),
+    static_cast<const char *> (event.header.fixed_header.event_name)
     ));
   const CosNotification::FilterableEventBody & filterable = event.filterable_data;
 
@@ -374,7 +374,7 @@ void StubFaultNotifier::push_structured_fault (
     const CosNotification::Property & property = filterable[nProp];
     ACE_ERROR ((LM_ERROR,
       "FaultNotifier:   Property Name: %s\n",
-      ACE_static_cast (const char *, property.name)
+      static_cast<const char *> (property.name)
       ));
     //@@ we could stand to decode more--just for completeness
   }
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index b939dbdf74b..612c5198fa1 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -14,6 +14,7 @@
 #include <orbsvcs/FT_NotifierS.h>
 #include <orbsvcs/FT_FaultDetectorFactoryC.h>
 #include <ace/Vector_T.h>
+#include <ace/SString.h>
 
 //////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 3939bb548ac..2ead6e7d91b 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -80,7 +80,7 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
           CORBA::ULong count = this->detector_infos_->length ();
           ACE_DEBUG ( (LM_DEBUG,
             "%T %n (%P|%t)Object_Group_Creator: found %u factories for FaultDetectors\n",
-             ACE_static_cast (unsigned, count)
+             static_cast<unsigned> (count)
              ));
         }
         else
@@ -379,7 +379,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
           }
           else if (factory_creation_id >>= long_id)
           {
-            ulong_id = ACE_static_cast (CORBA::ULong, long_id);
+            ulong_id = static_cast<CORBA::ULong> (long_id);
           }
           else
           {
@@ -394,7 +394,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
           ACE_OS::snprintf (replica_ior_filename, sizeof (replica_ior_filename)-1, "%s_%s_%lu.ior",
             role,
             loc_name,
-            ACE_static_cast (unsigned long, ulong_id));
+            static_cast<unsigned long> (ulong_id));
           replica_ior_filename[sizeof (replica_ior_filename)-1] = '\0';
 
           ACE_ERROR ( (LM_INFO,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
index 8dc4ef24e24..9e3939ae70a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, orbsvcsexe, iormanip, ftorb, messaging{
-  requires += interceptors
+project(*Server): taoserver, orbsvcsexe, iormanip, ftorb, messaging {
   idlflags += -DCORBA3 -I$(TAO_ROOT)
 
   Source_Files {
@@ -16,7 +15,6 @@ project(*Server): taoserver, orbsvcsexe, iormanip, ftorb, messaging{
 }
 
 project(*Client): taoclient, orbsvcsexe, iormanip, ftorb {
-  requires += interceptors
   idlflags += -DCORBA3 -I$(TAO_ROOT)
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 4c9d10a1936..e07dc2c309a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -67,7 +67,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
 /*  ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) receive_request_service_context called [%d] times \n",
               this->request_count_));
-	      */
+              */
 
   if (this->forward_request_thrown_ == true)
     {
@@ -77,8 +77,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
       ACE_CHECK;
 
       // extract the group component
-      TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                              svc->context_data.get_buffer ()),
+      TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
                         svc->context_data.length ());
 
       CORBA::Boolean byte_order;
@@ -88,7 +87,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
           return;
         }
 
-      cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+      cdr.reset_byte_order (static_cast<int> (byte_order));
 
       FT::TagFTGroupTaggedComponent group_component;
 
@@ -100,7 +99,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
       if (group_component.object_group_ref_version != 5)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Error occureed \n"));
+                      "(%P|%t) Error occurred \n"));
         }
 
     }
@@ -136,8 +135,7 @@ Server_Request_Interceptor::receive_request (
       ACE_CHECK;
 
       // extract the group component
-      TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                              svc->context_data.get_buffer ()),
+      TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
                         svc->context_data.length ());
 
       CORBA::Boolean byte_order;
@@ -147,11 +145,11 @@ Server_Request_Interceptor::receive_request (
           return;
         }
 
-      cdr.reset_byte_order (ACE_static_cast (int,byte_order));
+      cdr.reset_byte_order (static_cast<int> (byte_order));
 
       FT::TagFTGroupTaggedComponent group_component;
 
-	  cdr >> group_component.component_version;
+      cdr >> group_component.component_version;
       cdr >> group_component.group_domain_id.inout ();
       cdr >> group_component.object_group_id;
       cdr >> group_component.object_group_ref_version;
@@ -159,7 +157,7 @@ Server_Request_Interceptor::receive_request (
       if (group_component.object_group_ref_version != 5)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Error occureed \n"));
+                      "(%P|%t) Error occurred \n"));
         }
 
     }
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index bb03eff19a1..12e291c0f78 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -30,7 +30,7 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event
     TimeBase::TimeT elaps =
       time_val.sec () * 10000000 + time_val.usec ()* 10 - event[0].header.ec_send_time;
     event[0].data.any_value >>= x;
-    printf("Received data : %d,  single trip time = %d usec\n", x, static_cast<int>(elaps/10));
+    printf("Received data : %d,  single trip time = %d usec\n", x, static_cast<int> (elaps/10));
   }
 }
 
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 8fabe5d60d4..7d2ee304899 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "PushConsumer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
 
@@ -15,7 +16,7 @@
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
 ACE_RCSID (FtRtEvent,
-           PushConsumer,
+           consumer,
            "$Id$")
 
 CORBA::ORB_var orb;
@@ -147,4 +148,3 @@ int main(int argc, ACE_TCHAR** argv)
 
   return 0;
 }
-
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index bd0b1bf3238..14a770b53be 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -3,6 +3,7 @@
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "PushSupplier.h"
 #include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
index 037a604d364..b31e4dc99f5 100755
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
@@ -20,6 +20,12 @@ $ACTIVATOR = new PerlACE::Process("../../../ImplRepo_Service/ImR_Activator");
 $NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service");
 $TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr");
 
+# 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.
+
+$TAO_IMR->IgnoreExeSubDir (1);
+
 $TEST = new PerlACE::Process ("test");
 
 $imr_init_ref = "-ORBInitRef ImplRepoService=file://$imr_ior";
diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
index 099f5fdad62..3a175f364db 100755
--- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl
@@ -19,6 +19,12 @@ $IMR_LOCATOR = new PerlACE::Process ("../../../ImplRepo_Service/ImplRepo_Service
 $IMR_ACTIVATOR = new PerlACE::Process ("../../../ImplRepo_Service/ImR_Activator");
 $TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr");
 
+# 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.
+
+$TAO_IMR->IgnoreExeSubDir (1);
+
 ################################################################################
 
 $errors = 0;
@@ -30,7 +36,7 @@ unlink $pfile;
 ################################################################################
 ## Start the implementation Repository Locator
 
-$IMR_LOCATOR->Arguments ("-o $imr_locator_ior ");
+$IMR_LOCATOR->Arguments ("-p $pfile -o $imr_locator_ior -d 1");
 $IMR_LOCATOR->Spawn ();
 
 if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
@@ -41,7 +47,7 @@ if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
 
 ## Start the implementation Repository Activator
 
-$IMR_ACTIVATOR->Arguments ("-o $imr_activator_ior -d 0 -p $pfile -ORBInitRef ImplRepoService=file://$imr_locator_ior");
+$IMR_ACTIVATOR->Arguments ("-o $imr_activator_ior -d 1 -ORBInitRef ImplRepoService=file://$imr_locator_ior");
 $IMR_ACTIVATOR->Spawn ();
 
 if (PerlACE::waitforfile_timed ($imr_activator_ior, 10) == -1) {
@@ -57,9 +63,9 @@ if (PerlACE::waitforfile_timed ($imr_activator_ior, 10) == -1) {
 print "===== Adding a server\n";
 
 $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior"
-                  . " add Foo -c foobarbaz");
+		    . " add Foo -c foobarbaz");
 
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
+$taoimr = $TAO_IMR->SpawnWaitKill (10);
 
 if ($taoimr != 0) {
     print STDERR "ERROR: tao_imr (add) returned $taoimr\n";
@@ -69,9 +75,9 @@ if ($taoimr != 0) {
 print "===== Updating a server\n";
 
 $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior"
-                    . " update Foo -w foodir");
+                    . " update Foo -w foodir" );
 
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
+$taoimr = $TAO_IMR->SpawnWaitKill (10);
 
 if ($taoimr != 0) {
     print STDERR "ERROR: tao_imr (update) returned $taoimr\n";
@@ -83,7 +89,7 @@ print "===== Removing a server\n";
 $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior"
                     . " remove Foo");
 
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
+$taoimr = $TAO_IMR->SpawnWaitKill (10);
 
 if ($taoimr != 0) {
     print STDERR "ERROR: tao_imr (remove) returned $taoimr\n";
@@ -95,7 +101,7 @@ print "===== Readding a server\n";
 $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior"
                     . " add Foo -c foobarbaz");
 
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
+$taoimr = $TAO_IMR->SpawnWaitKill (10);
 
 if ($taoimr != 0) {
     print STDERR "ERROR: tao_imr (add) returned $taoimr\n";
@@ -114,19 +120,10 @@ if ($iserver != 0) {
 
 unlink $imr_locator_ior;
 
-$iserver = $IMR_ACTIVATOR->TerminateWaitKill (5);
-
-if ($iserver != 0) {
-    print STDERR "ERROR: IMR returned $iserver\n";
-    ++$errors;
-}
-
-unlink $imr_activator_ior;
-
 ################################################################################
 ## Restart the Implementation Repository in locked mode.
 
-$IMR_LOCATOR->Arguments ("-o $imr_locator_ior ");
+$IMR_LOCATOR->Arguments ("-l -p $pfile -o $imr_locator_ior -d 1");
 $IMR_LOCATOR->Spawn ();
 
 if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
@@ -135,27 +132,31 @@ if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
     exit 1;
 }
 
-$IMR_ACTIVATOR->Arguments ("-o $imr_activator_ior -d 0 -l -p $pfile -ORBInitRef ImplRepoService=file://$imr_locator_ior");
-$IMR_ACTIVATOR->Spawn ();
-
-if (PerlACE::waitforfile_timed ($imr_activator_ior, 10) == -1) {
-    print STDERR "ERROR: waiting for $imr_activator_ior\n";
-    $IMR_ACTIVATOR->Kill ();
-    $IMR_LOCATOR->Kill ();
-    exit 1;
-}
-
 ################################################################################
 ## Test out commands on the IMR
 
+print "===== Listing registered servers.\n";
+
+$TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior"
+                    . " list");
+
+$taoimr = $TAO_IMR->SpawnWaitKill (10);
+
+if ($taoimr != 0) {
+    print STDERR "ERROR: tao_imr (list) returned $taoimr\n";
+    ++$errors;
+}
+
 print "===== Adding a server (should fail)\n";
 
 $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior"
                     . " add Foo2 -c foobarbaz");
 
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
+$taoimr = $TAO_IMR->SpawnWaitKill (10);
 
-if ($taoimr != 2) {
+## Note : If you receive a 5 (NOT_FOUND) then it's likely that
+## persistence isn't working correctly.
+if ($taoimr != 2) {  # NO_PERMISSION
     print STDERR "ERROR: tao_imr (add) returned $taoimr\n";
     ++$errors;
 }
@@ -165,9 +166,9 @@ print "===== Updating a server (should fail)\n";
 $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior"
                     . " update Foo -w foodir");
 
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
+$taoimr = $TAO_IMR->SpawnWaitKill (10);
 
-if ($taoimr != 2) {
+if ($taoimr != 2) {  # NO_PERMISSION
     print STDERR "ERROR: tao_imr (update) returned $taoimr\n";
     ++$errors;
 }
@@ -177,9 +178,9 @@ print "===== Removing a server (should fail)\n";
 $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior"
                     . " remove Foo");
 
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
+$taoimr = $TAO_IMR->SpawnWaitKill (10);
 
-if ($taoimr != 2) {
+if ($taoimr != 2) {  # NO_PERMISSION
     print STDERR "ERROR: tao_imr (remove) returned $taoimr\n";
     ++$errors;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 8a56f595699..fd2b8d41330 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -59,7 +59,7 @@ Nestea_i::crush (CORBA::Long cans
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::crush %d cans\n", cans));
 
-  if (ACE_static_cast (ACE_UINT32, cans) > this->cans_)
+  if (static_cast<ACE_UINT32> (cans) > this->cans_)
     this->cans_ = 0;
   else
     this->cans_ -= cans;
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index ea222c7e56b..d6112ea7fa0 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -30,7 +30,7 @@ $imr_locator_ior = PerlACE::LocalFile ("imr_locator.ior");
 
 $refstyle = " -ORBobjrefstyle URL";
 
-$backing_store = "imr_backing_store";
+$backing_store = "imr_backing_store.xml";
 $nestea_dat = "nestea.dat";
 
 $protocol = "iiop";
@@ -41,7 +41,13 @@ $endpoint = "-ORBEndpoint " . "$protocol" . "://" . "$host" . ":" . $port;
 
 $IMR_LOCATOR = new PerlACE::Process ("../../ImplRepo_Service/ImplRepo_Service");
 $IMR_ACTIVATOR = new PerlACE::Process ("../../ImplRepo_Service/ImR_Activator");
-$TAO_IMR = new PerlACE::Process("$ACE_ROOT/bin/tao_imr");
+$TAO_IMR = new PerlACE::Process("../../../../bin/tao_imr");
+
+# 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.
+
+$TAO_IMR->IgnoreExeSubDir (1);
 
 $A_SVR = new PerlACE::Process (PerlACE::LocalFile ("airplane_server"));
 $A_CLI = new PerlACE::Process (PerlACE::LocalFile ("airplane_client"),
@@ -133,7 +139,7 @@ sub nt_service_test
     my $result = 0;
 
     # Just to show that it's possible, this test uses corbaloc instead of ior file.
-    my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService";
+    my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService"; 
 
     # 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.
@@ -239,7 +245,7 @@ sub airplane_ir_test
 
     my $imr_initref = "-ORBInitRef ImplRepoService=file://$imr_locator_ior";
 
-    $IMR_LOCATOR->Arguments ("-d 1 -o $imr_locator_ior");
+    $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior");
     $IMR_LOCATOR->Spawn ();
 
     if (PerlACE::waitforfile_timed ($imr_locator_ior, 5) == -1) {
@@ -248,7 +254,7 @@ sub airplane_ir_test
         return 1;
     }
 
-    $IMR_ACTIVATOR->Arguments ("-d 1 -o $imr_activator_ior $imr_initref");
+    $IMR_ACTIVATOR->Arguments ("-d 2 -o $imr_activator_ior $imr_initref");
     $IMR_ACTIVATOR->Spawn ();
 
     if (PerlACE::waitforfile_timed ($imr_activator_ior, 5) == -1) {
@@ -258,13 +264,13 @@ sub airplane_ir_test
     }
 
     $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \""
-                        . $A_SVR->Executable ()
-                       . " -ORBUseIMR 1 -o $airplane_ior $imr_initref\"");
+			 . $A_SVR->Executable ()
+			 . " -ORBUseIMR 1 -o $airplane_ior $imr_initref\"");
 
     $result = $TAO_IMR->SpawnWaitKill (5);
     if ($result != 0) {
         print STDERR "ERROR: tao_imr returned $result\n";
-        $IMR_ACTIVATOR->Kill ();
+	$IMR_ACTIVATOR->Kill ();
         $IMR_LOCATOR->Kill ();
         return 1;
     }
@@ -275,7 +281,7 @@ sub airplane_ir_test
     if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
         print STDERR "ERROR: cannot find $airplane_ior\n";
         $IMR_ACTIVATOR->Kill ();
-        $IMR_LOCATOR->Kill ();
+	$IMR_LOCATOR->Kill ();
         $A_SVR->Kill ();
         return 1;
     }
@@ -335,9 +341,9 @@ sub nestea_ir_test
     my $status = 0;
     my $result = 0;
 
-    my $imr_initref = "-ORBInitRef ImplRepoService=file://$imr_locator_ior";
+    my $imr_initref = "-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$imr_locator_ior";
 
-    $IMR_LOCATOR->Arguments ("-d 1 -o $imr_locator_ior");
+    $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior");
     $IMR_LOCATOR->Spawn ();
 
     if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
@@ -346,13 +352,13 @@ sub nestea_ir_test
       return 1;
     }
 
-    $IMR_ACTIVATOR->Arguments ("-d 1 -o $imr_activator_ior $imr_initref");
+    $IMR_ACTIVATOR->Arguments ("-d 2 -o $imr_activator_ior $imr_initref");
     $IMR_ACTIVATOR->Spawn ();
 
     if (PerlACE::waitforfile_timed ($imr_activator_ior, 30) == -1) {
         print STDERR "ERROR: cannot find $imr_activator_ior\n";
         $IMR_ACTIVATOR->Kill ();
-        $IMR_LOCATOR->Kill ();
+	$IMR_LOCATOR->Kill ();
         return 1;
     }
 
@@ -440,21 +446,23 @@ sub persistent_ir_test
 
     my $imr_initref = "-ORBInitRef ImplRepoService=file://$imr_locator_ior";
 
-    $IMR_LOCATOR->Arguments ("-d 1 -o $imr_locator_ior");
+    ## Be sure to start the ImR on a consistent endpoint, so that any created IORs
+    ## remain valid even if the ImR restarts.
+    $IMR_LOCATOR->Arguments ("-orbendpoint iiop://:8888 -x $backing_store -d 2 -o $imr_locator_ior");
     $IMR_LOCATOR->Spawn ();
     if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $implrepo_ior\n";
+      print STDERR "ERROR: cannot find $implrepo_ior\n";
       $IMR_LOCATOR->Kill ();
-        return 1;
+      return 1;
     }
 
-    $IMR_ACTIVATOR->Arguments ("-d 1 -o $imr_activator_ior -p $backing_store $imr_initref");
+    $IMR_ACTIVATOR->Arguments ("-d 2 -o $imr_activator_ior $imr_initref");
     $IMR_ACTIVATOR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($imr_activator_ior, 30) == -1) {
+    if (PerlACE::waitforfile_timed ($imr_activator_ior, 10) == -1) {
         print STDERR "ERROR: cannot find $imr_activator_ior\n";
         $IMR_ACTIVATOR->Kill ();
-        $IMR_LOCATOR->Kill ();
+	$IMR_LOCATOR->Kill ();
         return 1;
     }
 
@@ -466,6 +474,10 @@ sub persistent_ir_test
         return 1;
     }
 
+    ## This will write out the imr-ified IOR. Note : If you don't use -orbendpoint
+    ## when starting the ImR, then this IOR will no longer be valid when the ImR
+    ## restarts below. You can fix this by creating a new valid IOR, or starting
+    ## the ImR on a consistent endpoint. 
     $A_SVR->Arguments ("-o $airplane_ior -ORBUseIMR 1 $refstyle $imr_initref");
     $A_SVR->Spawn ();
 
@@ -476,14 +488,14 @@ sub persistent_ir_test
         return 1;
     }
 
-    $TAO_IMR->Arguments ("$imr_initref shutdown airplane_server");
-
     $result = $A_CLI->SpawnWaitKill (10);
     if ($result != 0) {
         print STDERR "ERROR: airplane client returned $result\n";
         $status = 1;
     }
 
+    $TAO_IMR->Arguments ("$imr_initref shutdown airplane_server");
+    
     $result = $TAO_IMR->SpawnWaitKill (10);
     if ($result != 0) {
         print STDERR "ERROR: tao_imr shutdown returned $result\n";
@@ -503,6 +515,7 @@ sub persistent_ir_test
         $status = 1;
     }
 
+    # Shutdown airplane_server
     $result = $TAO_IMR->SpawnWaitKill (10);
     if ($result != 0) {
         print STDERR "ERROR: tao_imr shutdown 2 returned $result\n";
@@ -513,21 +526,14 @@ sub persistent_ir_test
     # managed by perl, and we can't wait for it to die. So sleep a few secs.
     sleep(5);
 
-    my $implrepo = $IMR_ACTIVATOR->TerminateWaitKill (5);
-    if ($implrepo != 0) {
-        print STDERR "ERROR: IMR_Activator returned $implrepo\n";
-        $status = 1;
-    }
-
-    $implrepo = $IMR_LOCATOR->TerminateWaitKill (5);
+    my $implrepo = $IMR_LOCATOR->TerminateWaitKill (5);
     if ($implrepo != 0) {
         print STDERR "ERROR: IMR_Locator returned $implrepo\n";
         $status = 1;
     }
 
-    # Unlink so that we can wait on them again to know the servers started.
+    # Unlink so that we can wait on them again to know the server started.
     unlink $imr_locator_ior;
-    unlink $imr_activator_ior;
 
     print "Restarting Implementation Repository.\n";
     $IMR_LOCATOR->Spawn ();
@@ -537,15 +543,6 @@ sub persistent_ir_test
       return 1;
     }
 
-    # Should reload the server list without having to run tao_imr again.
-    $IMR_ACTIVATOR->Spawn ();
-    if (PerlACE::waitforfile_timed ($imr_activator_ior, 30) == -1) {
-        print STDERR "ERROR: cannot find $imr_activator_ior\n";
-        $IMR_ACTIVATOR->Kill ();
-        $IMR_LOCATOR->Kill ();
-        return 1;
-    }
-
     # Should cause the activator to spawn another server.
     $result = $A_CLI->SpawnWaitKill (20);
     if ($result != 0) {
@@ -553,6 +550,7 @@ sub persistent_ir_test
         $status = 1;
     }
 
+    # Shutdown airplane_server
     $result = $TAO_IMR->SpawnWaitKill (10);
     if ($result != 0) {
         print STDERR "ERROR: tao_imr shutdown 3 returned $result\n";
@@ -575,7 +573,7 @@ sub persistent_ir_test
         $status = 1;
     }
 
-    return $status;
+    return $status;   
 }
 
 ###############################################################################
@@ -586,7 +584,7 @@ sub both_ir_test
 
     my $imr_initref = "-ORBInitRef ImplRepoService=file://$imr_locator_ior";
 
-    $IMR_LOCATOR->Arguments ("-d 1 -o $imr_locator_ior $refstyle");
+    $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior $refstyle");
     $IMR_LOCATOR->Spawn ();
 
     if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) {
@@ -595,24 +593,24 @@ sub both_ir_test
         return 1;
     }
 
-    $IMR_ACTIVATOR->Arguments ("-o $imr_activator_ior $imr_initref $refstyle -d 1");
+    $IMR_ACTIVATOR->Arguments ("-o $imr_activator_ior $imr_initref $refstyle -d 2");
     $IMR_ACTIVATOR->Spawn ();
 
     if (PerlACE::waitforfile_timed ($imr_activator_ior, 10) == -1) {
         print STDERR "ERROR: cannot find $imr_activator_ior\n";
-        $IMR_ACTIVATOR->Kill ();
+	$IMR_ACTIVATOR->Kill ();
         $IMR_LOCATOR->Kill ();
         return 1;
     }
 
     $TAO_IMR->Arguments ("$imr_initref add nestea_server -c \""
-                         . $N_SVR->Executable ()
-                       . " -ORBUseIMR 1 $refstyle -o $nestea_ior $imr_initref\"");
+			 . $N_SVR->Executable ()
+			 . " -ORBUseIMR 1 $refstyle -o $nestea_ior $imr_initref\"");
     $TAO_IMR->SpawnWaitKill (10);
 
-    $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \""
-                        . $A_SVR->Executable ()
-                       . " -ORBUseIMR 1 $refstyle -o $airplane_ior $imr_initref\"");
+    $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \"" 
+			 . $A_SVR->Executable ()
+			 . " -ORBUseIMR 1 $refstyle -o $airplane_ior $imr_initref\"");
     $TAO_IMR->SpawnWaitKill (10);
 
     $N_SVR->Arguments (" -o $nestea_ior -ORBUseIMR 1 $refstyle $imr_initref");
@@ -623,7 +621,7 @@ sub both_ir_test
 
     if (PerlACE::waitforfile_timed ($nestea_ior, 10) == -1) {
         print STDERR "ERROR: cannot find $nestea_ior\n";
-        $IMR_ACTIVATOR->Kill ();
+	$IMR_ACTIVATOR->Kill ();
         $IMR_LOCATOR->Kill ();
         $A_SVR->Kill ();
         $N_SVR->Kill ();
@@ -633,7 +631,7 @@ sub both_ir_test
     if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
         print STDERR "ERROR: cannot find $airplane_ior\n";
         $IMR_ACTIVATOR->Kill ();
-        $IMR_LOCATOR->Kill ();
+	$IMR_LOCATOR->Kill ();
         $A_SVR->Kill ();
         $N_SVR->Kill ();
         return 1;
@@ -645,7 +643,7 @@ sub both_ir_test
     $A_CLI->Spawn ();
 
     $N_CLI->WaitKill (10);
-    $A_CLI->WaitKill (10);
+    $A_CLI->WaitKill (20);
 
     $TAO_IMR->Arguments ("$imr_initref shutdown nestea_server");
     $TAO_IMR->SpawnWaitKill (10);
@@ -677,42 +675,55 @@ sub both_ir_test
 
 # Parse the arguments
 
+$ret = 0;
+
+if ($#ARGV >= 0) {
 for ($i = 0; $i <= $#ARGV; $i++) {
     if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
         print "run_test test\n";
         print "\n";
         print "test               -- Runs a specific test:\n";
-        print "                         airplane, airplane_ir, nt_service, ",
+        print "                         airplane, airplane_ir, nt_service_ir, ",
                                        "nestea, nestea_ir,\n";
         print "                         both_ir, persistent_ir\n";
-        exit;
+        exit 1;
     }
     elsif ($ARGV[$i] eq "airplane") {
-        exit airplane_test ();
+        $ret = airplane_test ();
     }
     elsif ($ARGV[$i] eq "airplane_ir") {
-        exit airplane_ir_test ();
+        $ret = airplane_ir_test ();
     }
     elsif ($ARGV[$i] eq "nt_service_ir") {
-        exit nt_service_test ();
+        $ret = nt_service_test ();
     }
     elsif ($ARGV[$i] eq "nestea") {
-        exit nestea_test ();
+        $ret = nestea_test ();
     }
     elsif ($ARGV[$i] eq "nestea_ir") {
-        exit nestea_ir_test ();
+        $ret = nestea_ir_test ();
     }
     elsif ($ARGV[$i] eq "both_ir") {
-        exit both_ir_test ();
+        $ret = both_ir_test ();
     }
     elsif ($ARGV[$i] eq "persistent_ir") {
-        exit persistent_ir_test ();
+        $ret = persistent_ir_test ();
     }
     else {
         print "run_test: Unknown Option: ".$ARGV[$i]."\n";
     }
 }
+} else {
+  $ret = both_ir_test();
+}
 
-# if nothing else, run both_ir
 
-exit both_ir_test ();
+# Make sure the files are gone, so we can wait on them.
+unlink $airplane_ior;
+unlink $nestea_ior;
+unlink $imr_locator_ior;
+unlink $imr_activator_ior;
+unlink $backing_store;
+unlink $nestea.dat;
+
+exit $ret;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index 43b2507bcbd..62688c9f2d6 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -4,15 +4,16 @@
 #include "ifr_dii_client.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Application_Test, 
-           ifr_dii_client, 
+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")),
     op_name (CORBA::string_dup ("getCDinfo")),
-    lookup_by_name_ (0)
+    lookup_by_name_ (false),
+    debug_ (false)
 {
 }
 
@@ -44,9 +45,10 @@ IFR_DII_Client::init (int argc,
 
   if (CORBA::is_nil (this->target_.in ()))
   {
-     ACE_ERROR_RETURN ((LM_ERROR,
-                        "Unable to find interface repository in: file://iorfile\n"),
-                       -1);
+     ACE_ERROR_RETURN ((
+        LM_ERROR,
+        "Unable to find interface repository in: file://iorfile\n"),
+        -1);
   }
 
   if (this->parse_args (argc, argv) == -1)
@@ -60,20 +62,27 @@ IFR_DII_Client::init (int argc,
 int
 IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 {
+  int result = 0;
+
   if (this->lookup_by_name_)
     {
-       if (this->lookup_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
-         {
-            return -1;
-         }
+      result = this->lookup_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
+
+      if (result == -1)
+        {
+          return -1;
+        }
     }
   else
     {
-       if (this->find_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER))
-          return (-1);      
-
+      result = this->find_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
+
+      if (result == -1)
+        {
+          return (-1);
+        }
     }
 
   this->get_operation_def (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -92,29 +101,32 @@ int
 IFR_DII_Client::parse_args (int argc,
                             char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "n");
+  ACE_Get_Opt opts (argc, argv, "dn");
   int c;
 
   while ((c = opts ()) != -1)
     switch (c)
       {
-      case 'n':   // Select lookup by name.
-        this->lookup_by_name_ = 1;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage: %s"
-                           " [-n]"
-                           "\n",
-                           argv [0]),
-                          -1);
+        case 'd':
+          this->debug_ = true;
+          break;
+        case 'n':   // Select lookup by name.
+          this->lookup_by_name_ = true;
+          break;
+        case '?':
+        default:
+          ACE_ERROR_RETURN ((LM_ERROR,
+                            "usage: %s"
+                            " [-n]"
+                            "\n",
+                            argv [0]),
+                            -1);
       }
 
   return 0;
 }
 
-int 
+int
 IFR_DII_Client::find_interface_def (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->target_def_ =
@@ -122,11 +134,11 @@ IFR_DII_Client::find_interface_def (ACE_ENV_SINGLE_ARG_DECL)
 
 
   if (CORBA::is_nil (this->target_def_.in ()))
-  {
-     ACE_ERROR_RETURN ((LM_ERROR,
-                        "Unable to find interface def\n"),
-                       -1);
-  }
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                          "Unable to find interface def\n"),
+                        -1);
+    }
 
   return 0;
 }
@@ -147,9 +159,9 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
   // repository called "warehouse"?
   CORBA::ContainedSeq_var candidates =
     this->repo_->lookup_name (this->namespace_name.in (),
-                              -1,               // Unlimited level recursion.
-                              CORBA::dk_all,    // Any type of contained object.
-                              1                 // Exclude parents of interfaces.
+                              -1,            // Unlimited level recursion.
+                              CORBA::dk_all, // Any type of contained object.
+                              1              // Exclude parents of interfaces.
                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(-1);
 
@@ -259,7 +271,8 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
 
   this->req_->set_return_type (this->result_.in ());
 
-  CORBA::ParDescriptionSeq_var params = this->op_->params (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ParDescriptionSeq_var params =
+    this->op_->params (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = params->length ();
@@ -327,38 +340,72 @@ IFR_DII_Client::invoke_and_display (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::NVList_ptr args = this->req_->arguments ();
 
       const char *artist = 0;
-      *args->item (0)->value () >>= artist;
+
+# if (defined (_MSC_VER) && (_MSC_VER < 1310))
+      ACE_ASSERT ((*args->item (0)->value () >>= artist) == 1);
+# else
+      ACE_ASSERT ((*args->item (0)->value () >>= artist) == true);
+# endif  /* _MSC_VER <= 1310 */
+
+      ACE_ASSERT (ACE_OS::strcmp (artist, "the Beatles") == 0);
 
       const char *title = 0;
-      *args->item (1)->value () >>= title;
+
+# if (defined (_MSC_VER) && (_MSC_VER < 1310))
+      ACE_ASSERT ((*args->item (1)->value () >>= title) == 1);
+# else
+      ACE_ASSERT ((*args->item (1)->value () >>= title) == true);
+# endif  /* _MSC_VER <= 1310 */
+
+      const char *correct = "Sgt. Pepper's Lonely Hearts Club Band";
+      ACE_ASSERT (ACE_OS::strcmp (title, correct) == 0);
+      ACE_UNUSED_ARG (correct);
 
       CORBA::Float price = 0.0f;
-      *args->item (2)->value () >>= price;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("%s:\t%s\n")
-                  ACE_TEXT ("%s:\t%s\n")
-                  ACE_TEXT ("%s:\t$%2.2f\n"),
-                  args->item (0)->name (),
-                  artist,
-                  args->item (1)->name (),
-                  title,
-                  args->item (2)->name (),
-                  price));
 
-      CORBA::Boolean in_stock = 0;
+# if (defined (_MSC_VER) && (_MSC_VER < 1310))
+      ACE_ASSERT ((*args->item (2)->value () >>= price) == 1);
+# else
+      ACE_ASSERT ((*args->item (2)->value () >>= price) == true);
+# endif  /* _MSC_VER <= 1310 */
 
-      this->req_->return_value () >>= CORBA::Any::to_boolean (in_stock);
+      ACE_ASSERT (price == 13.49f);
 
-      if (in_stock)
+      if (this->debug_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("status: in stock\n")));
+                      ACE_TEXT ("%s:\t%s\n")
+                      ACE_TEXT ("%s:\t%s\n")
+                      ACE_TEXT ("%s:\t$%2.2f\n"),
+                      args->item (0)->name (),
+                      artist,
+                      args->item (1)->name (),
+                      title,
+                      args->item (2)->name (),
+                      price));
         }
-      else
+
+      CORBA::Boolean in_stock = 0;
+
+      CORBA::Boolean ret_status =
+        (this->req_->return_value () >>= CORBA::Any::to_boolean (in_stock));
+      ACE_UNUSED_ARG (ret_status);
+
+      ACE_ASSERT (ret_status == 1);
+      ACE_ASSERT (in_stock == 1);
+
+      if (this->debug_)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("status: out of stock\n")));
+          if (in_stock)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("status: in stock\n")));
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("status: out of stock\n")));
+            }
         }
     }
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index 8e8bf1ee3be..a362e0053cc 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -73,10 +73,13 @@ private:
   CORBA::String_var op_name;
   // Things that we will be searching for in the repository.
 
-  CORBA::Boolean lookup_by_name_;
+  bool lookup_by_name_;
   // Are we looking up info on the target object by querying the
   // IFR directly with the target's name, or indirectly
   // by calling _get_interface() on the target object?
+  
+  bool debug_;
+  // Display results and debugging info?
 };
 
 #endif /* IFR_DII_CLIENT_H */
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
index 6ddd8f3fee1..901935cfa40 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
@@ -27,6 +27,13 @@ for ($i = 0; $i <= $#ARGV; $i++) {
 }
 
 $TAO_IFR = new PerlACE::Process ("../../../../../bin/tao_ifr");
+
+# We want the tao_ifr 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.
+
+$TAO_IFR->IgnoreExeSubDir (1);
+
 $IFR     = new PerlACE::Process ("../../../IFR_Service/IFR_Service", " -o $ifr_iorfile");
 $SV      = new PerlACE::Process ("server", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile");
 $CL      = new PerlACE::Process ("client", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 3bfc171f83a..7cfe8d9c287 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -87,10 +87,6 @@ main (int argc, char *argv[])
                             -1);
         }
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "IOR is: <%s>\n",
-                  ior.in ()));
-
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index a8e20d8c503..9563b6c75f7 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -3,7 +3,13 @@
 
 #include "test_i.h"
 
-ACE_RCSID(Application_Test, test_i, "$Id$")
+#include "ace/SString.h"
+
+
+ACE_RCSID (Application_Test,
+           test_i,
+           "$Id$")
+
 
 CORBA::Boolean
 inventory_i::getCDinfo (const char * artist,
@@ -43,4 +49,3 @@ inventory_i::getCDinfo (const char * artist,
 
   return in_stock;
 }
-
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index 9233999a0e6..410ad1fd4f3 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -26,12 +26,6 @@ main (int argc, char *argv[])
           int status = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          const char *result_string = status ? "test failed" : "test ok";
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s\n",
-                      result_string));
-
           if (status == -1)
             {
               return 1;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 10187bcdc7b..c291082e7a4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -822,8 +822,39 @@ IDL3_Client::component_inheritance_test (
     ACE_ENV_ARG_DECL
   )
 {
+  CORBA::ComponentIR::ComponentDef_var comp_base =
+    comp_def->base_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  if (CORBA::is_nil (comp_base.in ()))
+    {
+      if (this->debug_)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "component_inheritance_test: "
+                      "base component is null\n"));
+        }
+
+      return -1;
+    }
+
+  CORBA::String_var str = comp_base->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  if (str.in () == 0 || ACE_OS::strcmp (str.in (), COMP_BASE_ID) != 0)
+    {
+      if (this->debug_)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "component_inheritance_test: "
+                      "bad id on base component\n"));
+        }
+
+      return -1;
+    }
+
   CORBA::InterfaceDefSeq_var supported =
-    comp_def->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
+    comp_base->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong length = supported->length ();
@@ -840,8 +871,6 @@ IDL3_Client::component_inheritance_test (
       return -1;
     }
 
-  CORBA::String_var str;
-  
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       str = supported[i].in ()->id (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -862,37 +891,6 @@ IDL3_Client::component_inheritance_test (
         }
     }
 
-  CORBA::ComponentIR::ComponentDef_var comp_base =
-    comp_def->base_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil (comp_base.in ()))
-    {
-      if (this->debug_)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "component_inheritance_test: "
-                      "base component is null\n"));
-        }
-
-      return -1;
-    }
-
-  str = comp_base->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (str.in () == 0 || ACE_OS::strcmp (str.in (), COMP_BASE_ID) != 0)
-    {
-      if (this->debug_)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "component_inheritance_test: "
-                      "bad id on base component\n"));
-        }
-
-      return -1;
-    }
-
   return 0;
 }
 
@@ -1657,7 +1655,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
     }
 
   CORBA::InterfaceDefSeq_var supported = 
-    hd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
+    bhd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong length = supported->length ();
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
index 9f1c56c3e03..80fb6ba003c 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
@@ -12,6 +12,7 @@ $status = 0;
 
 $ifr_iorfile= "if_repo.ior";
 $test_idl = PerlACE::LocalFile ("test.idl");
+$includes = "-I ../../../.. -I../../../../CIAO/ciao -I../../../../orbsvcs";
 
 # find the tao_ifr executable.
 # Its placement is dependent upon the OS and if MPC generated makefiles are used.
@@ -53,7 +54,7 @@ if (PerlACE::waitforfile_timed ($ifr_iorfile, 15) == -1) {
     exit 1;
 }
 
-$TAO_IFR->Arguments ("-ORBInitRef InterfaceRepository=file://$ifr_iorfile $test_idl");
+$TAO_IFR->Arguments ("-ORBInitRef InterfaceRepository=file://$ifr_iorfile $includes $test_idl");
 
 $tresult = $TAO_IFR->SpawnWaitKill (30);
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl
index be9a95c554d..d24e4b5bd13 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl
@@ -1,6 +1,11 @@
 // -*- C++ -*-
 // $Id$
 
+#ifndef INTERFACEREPO_IDL3_TEST
+#define INTERFACEREPO_IDL3_TEST
+
+#include <Components.idl>
+
 module help
 {
   exception doh {};
@@ -11,15 +16,15 @@ module help
 {
   interface c_supp1 {};
   interface c_supp2 {};
-  component c_base {};
+  component c_base supports c_supp1, c_supp2 {};
   valuetype v_base_base {};
   valuetype v_base : v_base_base {};
   interface v_supp1 {};
   abstract interface v_supp2 {};
-  home h_base manages c_base {};
   valuetype h_key {};
   interface h_supp1 {};
   interface h_supp2 {};
+  home h_base supports h_supp1, h_supp2 manages c_base {};
 };
 
 module help
@@ -34,8 +39,7 @@ module help
 
 module mod
 {
-  component test_component 
-    : help::c_base supports help::c_supp1, help::c_supp2
+  component test_component : help::c_base
   {
     attribute long c_attr1 
       getraises (help::doh) 
@@ -75,7 +79,7 @@ module mod
       raises (help::whups, help::doh);
   };
 
-  home test_home : help::h_base supports help::h_supp1, help::h_supp2 
+  home test_home : help::h_base
     manages test_component primarykey help::h_key 
   {
     factory create_tc (in string set_uid)
@@ -110,4 +114,5 @@ module mod
 
 };
 
+#endif /* INTERFACEREPO_IDL3_TEST */
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 49d6ba3361a..2a97279bcd0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -133,7 +133,9 @@ Admin_Client::run (void)
         {
           for (CORBA::ULong j = 0; j < this->iterations_; ++j)
             {
-              (this->*test_array_[this->which_test_])(ACE_ENV_SINGLE_ARG_PARAMETER);
+              (this->*test_array_[this->which_test_])(
+                  ACE_ENV_SINGLE_ARG_PARAMETER
+                );
               ACE_TRY_CHECK;
             }
         }
@@ -202,27 +204,33 @@ Admin_Client::parse_args (int argc,
 void
 Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== ARRAY TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== ARRAY TEST ==============\n\n")
+        ));
+    }
 
-  CORBA::IDLType_var atype = this->repo_->create_string (7
-                                                         ACE_ENV_ARG_PARAMETER);
+  CORBA::IDLType_var atype =
+    this->repo_->create_string (7 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ArrayDef_var avar = this->repo_->create_array (5,
-                                                        atype.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
+  CORBA::ArrayDef_var avar =
+    this->repo_->create_array (5,
+                               atype.in ()
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong bound = avar->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ArrayDef::length: %d\n"),
-                bound));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ArrayDef::length: %d\n"),
+                  bound));
+    }
 
   ACE_ASSERT (bound == 5);
 
@@ -233,9 +241,11 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ArrayDef::type::kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ArrayDef::type::kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_array);
 
@@ -245,36 +255,44 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ArrayDef::element_type::kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ArrayDef::element_type::kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_string);
 
-  CORBA::IDLType_var tdef = avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::IDLType_var tdef =
+    avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::DefinitionKind dk = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("ArrayDef::element_type_def::def_kind: %d\n"),
-        dk
-      ));
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("ArrayDef::element_type_def::def_kind: %d\n"),
+          dk
+        ));
+    }
 
   ACE_ASSERT (dk == CORBA::dk_String);
 
-  CORBA::StringDef_var pvar = CORBA::StringDef::_narrow (tdef.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
+  CORBA::StringDef_var pvar =
+    CORBA::StringDef::_narrow (tdef.in ()
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   bound = pvar->bound (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("StringDef::bound: %d\n"),
-                bound));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("StringDef::bound: %d\n"),
+                  bound));
+    }
 
   ACE_ASSERT (bound == 7);
 
@@ -287,8 +305,10 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ArrayDef::element_type_def (set)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ArrayDef::element_type_def (set)\n")));
+    }
 
   tc = avar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -296,9 +316,11 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ArrayDef::type::kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ArrayDef::type::kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_array);
 
@@ -308,9 +330,11 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ArrayDef::element_type_def::def_kind: %d\n"),
-                dk));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ArrayDef::element_type_def::def_kind: %d\n"),
+                  dk));
+    }
 
   ACE_ASSERT (dk == CORBA::dk_Primitive);
 
@@ -322,9 +346,11 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("PrimitiveDef::kind: %d\n"),
-                pkind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("PrimitiveDef::kind: %d\n"),
+                  pkind));
+    }
 
   ACE_ASSERT (pkind == CORBA::pk_short);
 
@@ -335,10 +361,13 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== ENUM TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== ENUM TEST ==============\n\n")
+        ));
+    }
 
   CORBA::EnumMemberSeq members (4);
   members.length (3);
@@ -347,72 +376,87 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
   members[1] = CORBA::string_dup ("ONE");
   members[2] = CORBA::string_dup ("TWO");
 
-  CORBA::EnumDef_var evar = this->repo_->create_enum ("IDL:my_enum:1.0",
-                                                      "my_enum",
-                                                      "1.0",
-                                                      members
-                                                      ACE_ENV_ARG_PARAMETER);
+  CORBA::EnumDef_var evar =
+    this->repo_->create_enum ("IDL:my_enum:1.0",
+                              "my_enum",
+                              "1.0",
+                              members
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var str = evar->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::id: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::id: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
 
   str = evar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
 
   str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::absolute_name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::absolute_name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_enum") == 0);
 
   str = evar->version (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::version: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::version: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
 
-  CORBA::DefinitionKind dkind = evar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind dkind =
+    evar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::def_kind: %d\n\n"),
-                dkind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::def_kind: %d\n\n"),
+                  dkind));
+    }
 
   ACE_ASSERT (dkind == CORBA::dk_Enum);
 
-  CORBA::Contained::Description_var desc = evar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Contained::Description_var desc =
+    evar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   dkind = desc->kind;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::describe::kind: %d\n"),
-                dkind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::describe::kind: %d\n"),
+                  dkind));
+    }
 
   ACE_ASSERT (dkind == CORBA::dk_Enum);
 
@@ -420,40 +464,50 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
   desc->value >>= td;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::describe::value::name: %s\n"),
-                td->name.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::describe::value::name: %s\n"),
+                  td->name.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (td->name, "my_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::describe::value::id: %s\n"),
-                td->id.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::describe::value::id: %s\n"),
+                  td->id.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (td->id, "IDL:my_enum:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_enum:1.0") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::describe::value::defined_in: %s\n"),
-                td->defined_in.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::describe::value::defined_in: %s\n"),
+                  td->defined_in.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (td->defined_in, ""));
+  ACE_ASSERT (ACE_OS::strcmp (td->defined_in, "") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::describe::value::version: %s\n"),
-                td->version.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::describe::value::version: %s\n"),
+                  td->version.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
 
   CORBA::TCKind kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::describe::value::type::kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::describe::value::type::kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_enum);
 
@@ -461,48 +515,56 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::describe::value::type::id: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::describe::value::type::id: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
 
   str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::describe::value::type::name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::describe::value::type::name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
 
   CORBA::ULong count = td->type->member_count ();
 
   if (this->debug_)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("EnumDef::describe::value::type::member_count: %d\n\n"),
-        count
-      ));
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("EnumDef::describe::value::type::member_count: %d\n\n"),
+          count
+        ));
+    }
 
   ACE_ASSERT (count == 3);
 
   CORBA::ULong i = 0;
 
-  for (i = 0; i < count; i++)
+  for (i = 0; i < count; ++i)
     {
       str = td->type->member_name (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("EnumDef::describe::value::type::")
-                    ACE_TEXT ("member_name[%d]: %s\n"),
-                    i,
-                    str.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("EnumDef::describe::value::type::")
+                      ACE_TEXT ("member_name[%d]: %s\n"),
+                      i,
+                      str.in ()));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i]));
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i]) == 0);
     }
 
 
@@ -517,27 +579,32 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nEnumDef::members (set)\n\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nEnumDef::members (set)\n\n")));
+    }
 
-  CORBA::EnumMemberSeq_var fellows = evar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::EnumMemberSeq_var fellows =
+    evar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   count = fellows->length ();
   const char *tmp = 0;
 
-  for (i = 0; i < count; i++)
+  for (i = 0; i < count; ++i)
     {
       tmp = fellows[i];
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("EnumDef::")
-                    ACE_TEXT ("members[%d]: %s\n"),
-                    i,
-                    tmp));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("EnumDef::")
+                      ACE_TEXT ("members[%d]: %s\n"),
+                      i,
+                      tmp));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (fellows[i], members[i]));
+      ACE_ASSERT (ACE_OS::strcmp (fellows[i], members[i]) == 0);
     }
 
   evar->name ("another_enum"
@@ -547,25 +614,31 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nEnumDef::name (set)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nEnumDef::name (set)\n")));
+    }
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "another_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "another_enum") == 0);
 
   str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("EnumDef::absolute_name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("EnumDef::absolute_name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::another_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "::another_enum") == 0);
 
   evar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -574,15 +647,18 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== ALIAS TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== ALIAS TEST ==============\n\n")
+        ));
+    }
 
   // This test also tests WstringDef and SequenceDef.
 
-  CORBA::IDLType_var sq_elem = this->repo_->create_wstring (7
-                                                            ACE_ENV_ARG_PARAMETER);
+  CORBA::IDLType_var sq_elem =
+    this->repo_->create_wstring (7 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::SequenceDef_var sq_var =
@@ -603,45 +679,55 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::id: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::id: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
 
   str = a_var->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
 
   str = a_var->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::absolute_name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::absolute_name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_alias"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_alias") == 0);
 
   str = a_var->version (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::version: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::version: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::version (set)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::version (set)\n")));
+    }
 
   a_var->version ("1.1"
                   ACE_ENV_ARG_PARAMETER);
@@ -651,11 +737,13 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::version: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::version: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.1"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.1") == 0);
 
   CORBA::TypeCode_var tc = a_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -664,32 +752,39 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nAliasDef::type::name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nAliasDef::type::name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
 
   CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::type::kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::type::kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_alias);
 
-  CORBA::TypeCode_var ct = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var ct =
+    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   kind = ct->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::type::content_type::kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::type::content_type::kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_sequence);
 
@@ -697,23 +792,28 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::type::content_type::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::type::content_type::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 5);
 
-  CORBA::TypeCode_var ct2 = ct->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var ct2 =
+    ct->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   kind = ct2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::type::content_type::")
-                ACE_TEXT ("content_type::kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::type::content_type::")
+                  ACE_TEXT ("content_type::kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_wstring);
 
@@ -721,40 +821,49 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::type::content_type::")
-                ACE_TEXT ("content_type::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::type::content_type::")
+                  ACE_TEXT ("content_type::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 7);
 
-  CORBA::Contained::Description_var desc = a_var->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Contained::Description_var desc =
+    a_var->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeDescription *td;
   desc->value >>= td;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nAliasDef::describe::value::name: %s\n"),
-                td->name.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nAliasDef::describe::value::name: %s\n"),
+                  td->name.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (td->name, "my_alias"));
+  ACE_ASSERT (ACE_OS::strcmp (td->name, "my_alias") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::describe::value::version: %s\n"),
-                td->version.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::describe::value::version: %s\n"),
+                  td->version.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.1"));
+  ACE_ASSERT (ACE_OS::strcmp (td->version, "1.1") == 0);
 
   kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::describe::value::type::kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::describe::value::type::kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_alias);
 
@@ -762,23 +871,28 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::describe::value::type::id: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::describe::value::type::id: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
 
   str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::describe::value::type::name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::describe::value::type::name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
 
-  CORBA::IDLType_var i_var = a_var->original_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::IDLType_var i_var =
+    a_var->original_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::SequenceDef_var seq_var =
@@ -790,9 +904,11 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("AliasDef::original_type_def::bound: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("AliasDef::original_type_def::bound: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 5);
 
@@ -803,10 +919,13 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== NATIVE TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== NATIVE TEST ==============\n\n")
+        ));
+    }
 
   CORBA::NativeDef_var nvar =
     this->repo_->create_native ("IDL:my_native:1.0",
@@ -819,49 +938,60 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("NativeDef::id: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("NativeDef::id: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_native:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_native:1.0") == 0);
 
   str = nvar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("NativeDef::name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("NativeDef::name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_native"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_native") == 0);
 
   str = nvar->version (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("NativeDef::version: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("NativeDef::version: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
 
   str = nvar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("NativeDef::absolute_name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("NativeDef::absolute_name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_native"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_native") == 0);
 
-  CORBA::DefinitionKind kind = nvar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind kind =
+    nvar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("NativeDef::def_kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("NativeDef::def_kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::dk_Native);
 
@@ -872,10 +1002,13 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== STRUCT TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== STRUCT TEST ==============\n\n")
+        ));
+    }
 
   CORBA::StructMemberSeq members (3);
   members.length (3);
@@ -926,27 +1059,31 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("StructDef::type::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("StructDef::type::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 3);
 
   CORBA::String_var str;
   CORBA::ULong i = 0;
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("StructDef::type::member_name[%d]: %s\n"),
-                    i,
-                    str.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("StructDef::type::member_name[%d]: %s\n"),
+                      i,
+                      str.in ()));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name));
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0);
     }
 
   CORBA::Contained::Description_var desc = 
@@ -957,25 +1094,31 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   desc->value >>= td;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nStructDef::describe::value::name: %s\n"),
-                td->name.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nStructDef::describe::value::name: %s\n"),
+                  td->name.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (td->name, "my_struct"));
+  ACE_ASSERT (ACE_OS::strcmp (td->name, "my_struct") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("StructDef::describe::value::id: %s\n"),
-                td->id.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("StructDef::describe::value::id: %s\n"),
+                  td->id.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (td->id, "IDL:my_struct:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_struct:1.0") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("StructDef::describe::value::version: %s\n"),
-                td->version.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("StructDef::describe::value::version: %s\n"),
+                  td->version.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
@@ -997,8 +1140,10 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nStructDef::members (set)\n\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nStructDef::members (set)\n\n")));
+    }
 
   CORBA::EnumMemberSeq def_members (2);
   def_members.length (2);
@@ -1013,23 +1158,35 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StructMemberSeq_var out_members = svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::StructMemberSeq_var out_members =
+    svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_members->length ();
+  int cmp_result = 0;
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
-                    i,
-                    out_members[i].name.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
+                      i,
+                      out_members[i].name.in ()));
+        }
 
       if (i == length - 1)
-        ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, "my_enum"));
+        {
+          cmp_result =
+            ACE_OS::strcmp (out_members[i].name, "my_enum");
+          ACE_ASSERT (cmp_result == 0);
+        }
       else
-        ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name));
+        {
+          cmp_result =
+            ACE_OS::strcmp (out_members[i].name, members[i].name);
+          ACE_ASSERT (cmp_result == 0);
+        }
     }
 
   CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum"
@@ -1040,11 +1197,13 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Repository::lookup::absolute_name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Repository::lookup::absolute_name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
 
   fox = svar->lookup ("my_enum"
                       ACE_ENV_ARG_PARAMETER);
@@ -1054,40 +1213,48 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("StructDef::lookup::absolute_name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("StructDef::lookup::absolute_name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
 
   CORBA::Container_var outer = fox->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::Contained_var schizo = CORBA::Contained::_narrow (outer.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
+  CORBA::Contained_var schizo =
+    CORBA::Contained::_narrow (outer.in ()
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   str = schizo->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("StructDef::lookup::defined_in::")
-                ACE_TEXT ("absolute_name: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("StructDef::lookup::defined_in::")
+                  ACE_TEXT ("absolute_name: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct") == 0);
 
-  CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all,
-                                                            0
-                                                            ACE_ENV_ARG_PARAMETER);
+  CORBA::ContainedSeq_var contents =
+    this->repo_->contents (CORBA::dk_all,
+                           0
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nRepository::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nRepository::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
   
@@ -1099,9 +1266,11 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   length = contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("StructDef::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("StructDef::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
@@ -1111,16 +1280,18 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
 
       if (i == 0)
         {
-          ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum"));
+          ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
         }
       else
         {
@@ -1138,24 +1309,28 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   length = contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nRepository::lookup_name::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nRepository::lookup_name::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
 
       // Can't use ACE_ASSERT here because we don't know the order
       // of the results of the search.
@@ -1171,13 +1346,15 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   length = cont_desc->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nRepository::describe_contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nRepository::describe_contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       CORBA::TypeDescription *td;
       cont_desc[i].value >>= td;
@@ -1186,36 +1363,22 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("Repository::describe_contents[%d]::id: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("Repository::describe_contents[%d]::id: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
 
       if (i == 0)
         {
-          if (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0"))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("struct_test::describe_contents -")
-                          ACE_TEXT ("incorrect repo id in item %d"),
-                          i));
-
-              return;
-            }
+          ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
         }
       else if (i == 1)
         {
-          if (ACE_OS::strcmp (str.in (), "IDL:my_struct:1.0"))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("struct_test::describe_contents -")
-                          ACE_TEXT ("incorrect repo id in item %d"),
-                          i));
-
-              return;
-            }
+          ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_struct:1.0") == 0);
         }
     }
 
@@ -1224,8 +1387,10 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nStructDef::name (set)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nStructDef::name (set)\n")));
+    }
 
   contents = svar->contents (CORBA::dk_all,
                              0
@@ -1235,32 +1400,36 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   length = contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("StructDef::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("StructDef::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
   const char *tmp = "::your_struct";
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
 
       // Whatever the scoped name now is, it must begin
       // with "::your_struct".
-      ACE_ASSERT (!ACE_OS::strncmp (str.in (),
-                                    tmp,
-                                    ACE_OS::strlen (tmp)));
+      cmp_result =
+        ACE_OS::strncmp (str.in (), tmp, ACE_OS::strlen (tmp));
+      ACE_ASSERT (cmp_result == 0);
     }
 
 #if defined (ACE_NDEBUG)
@@ -1277,10 +1446,13 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== UNION TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== UNION TEST ==============\n\n")
+        ));
+    }
 
   CORBA::EnumMemberSeq d_members (4);
   d_members.length (4);
@@ -1301,8 +1473,9 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::StructMemberSeq s_members (1);
   s_members.length (1);
   s_members[0].name = CORBA::string_dup ("string_in_struct");
-  s_members[0].type_def = this->repo_->create_string (6
-                                                      ACE_ENV_ARG_PARAMETER);
+  s_members[0].type_def =
+    this->repo_->create_string (6
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   s_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
@@ -1318,35 +1491,37 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
   u_members.length (4);
 
   u_members[0].name = CORBA::string_dup ("longval");
-  u_members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                      ACE_ENV_ARG_PARAMETER);
+  u_members[0].type_def =
+    this->repo_->get_primitive (CORBA::pk_long
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   u_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   CORBA::TypeCode_var d_type = d_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   TAO_OutputCDR maker2;
   maker2.write_ulong (3);  // THREE
+  TAO_InputCDR maker2_in (maker2);
   TAO::Unknown_IDL_Type *impl2 = 0;
   ACE_NEW (impl2,
            TAO::Unknown_IDL_Type (d_type.in (),
-                                  maker2.begin (),
-                                  TAO_ENCAP_BYTE_ORDER));
+                                  maker2_in));
   CORBA::Any any2;
   any2.replace (impl2);
   u_members[0].label = any2;
 
   u_members[1].name = CORBA::string_dup ("longval");
-  u_members[1].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                      ACE_ENV_ARG_PARAMETER);
+  u_members[1].type_def =
+    this->repo_->get_primitive (CORBA::pk_long
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   u_members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   TAO_OutputCDR maker0;
   maker0.write_ulong (2);  // TWO
+  TAO_InputCDR maker0_in (maker0);
   TAO::Unknown_IDL_Type *impl0 = 0;
   ACE_NEW (impl0,
            TAO::Unknown_IDL_Type (d_type.in (),
-                                  maker0.begin (),
-                                  TAO_ENCAP_BYTE_ORDER));
+                                  maker0_in));
   CORBA::Any any0;
   any0.replace (impl0);
   u_members[1].label = any0;
@@ -1357,18 +1532,19 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO_OutputCDR maker1;
   maker1.write_ulong (0); // ZERO
+  TAO_InputCDR maker1_in (maker1);
   TAO::Unknown_IDL_Type *impl1 = 0;
   ACE_NEW (impl1,
            TAO::Unknown_IDL_Type (d_type.in (),
-                                  maker1.begin (),
-                                  TAO_ENCAP_BYTE_ORDER));
+                                  maker1_in));
   CORBA::Any any1;
   any1.replace (impl1);
   u_members[2].label = any1;
 
   u_members[3].name = CORBA::string_dup ("stringval");
-  u_members[3].type_def = this->repo_->create_string (17
-                                                      ACE_ENV_ARG_PARAMETER);
+  u_members[3].type_def =
+    this->repo_->create_string (17
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   u_members[3].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   u_members[3].label <<= CORBA::Any::from_octet (0);   // default case (ONE)
@@ -1382,18 +1558,22 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var disc_tc = u_var->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var disc_tc =
+    u_var->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
    ACE_CHECK;
 
-  CORBA::ULong length = disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong length =
+    disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("UnionDef::discriminator_type::member_count: %d\n"),
-        length
-      ));
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("UnionDef::discriminator_type::member_count: %d\n"),
+          length
+        ));
+    }
 
   ACE_ASSERT (length == 4);
 
@@ -1404,9 +1584,11 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("UnionDef::type::member_count: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("UnionDef::type::member_count: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 3);
 
@@ -1414,63 +1596,74 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("UnionDef::type::default_index: %d\n\n"),
-                slot));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("UnionDef::type::default_index: %d\n\n"),
+                  slot));
+    }
 
   ACE_ASSERT (slot == 2);
 
   CORBA::String_var str;
   const char *tmp = 0;
 
-  for (CORBA::ULong i = 0; i < length; i++)
+  for (CORBA::ULong i = 0; i < length; ++i)
     {
       str = tc->member_name (i
                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("UnionDef::type::member_name[%d]: %s\n"),
-                    i,
-                    str.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("UnionDef::type::member_name[%d]: %s\n"),
+                      i,
+                      str.in ()));
+        }
 
       // Multiple labels for first member shifts index by 1.
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (), u_members[i + 1].name));
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), u_members[i + 1].name) == 0);
 
       CORBA::Any_var label = tc->member_label (i
                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      TAO_InputCDR cdr (label->_tao_get_cdr ());
+      TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
       CORBA::ULong val;
+      
+      TAO::Any_Impl *impl = label->impl ();
+      TAO_OutputCDR out;
+      impl->marshal_value (out);
+      TAO_InputCDR in (out);
 
       // If we're at the default index, it's in the label as octet 0,
       // so just assign the slot value to val.
       if (i != (CORBA::ULong) slot)
         {
-          cdr.read_ulong (val);
+          in.read_ulong (val);
           tmp = d_members[val];
         }
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("UnionDef::type::member_label[%d]: %s\n"),
-                    i,
-                    i == (CORBA::ULong) slot ? "default" : tmp));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("UnionDef::type::member_label[%d]: %s\n"),
+                      i,
+                      i == (CORBA::ULong) slot ? "default" : tmp));
+        }
 
       // Labels are not in order.
       switch (i)
-      {
-        case 0:
-          ACE_ASSERT (val == 3 || val == 2);
-          break;
-        case 1:
-          ACE_ASSERT (val == 0);
-          break;
-        default:
-          break;
-      }
+        {
+          case 0:
+            ACE_ASSERT (val == 3 || val == 2);
+            break;
+          case 1:
+            ACE_ASSERT (val == 0);
+            break;
+          default:
+            break;
+        }
     }
 
   u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1484,10 +1677,13 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== EXCEPTION TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== EXCEPTION TEST ==============\n\n")
+        ));
+    }
 
   CORBA::StructMemberSeq members (3);
   members.length (3);
@@ -1496,7 +1692,8 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  members[0].type =
+    members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   members[1].name = CORBA::string_dup ("bd_string");
@@ -1513,16 +1710,18 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   e_members[1] = CORBA::string_dup ("ONE");
 
   members[2].name = CORBA::string_dup ("my_exception_enum");
-  CORBA::EnumDef_var e_var = this->repo_->create_enum ("IDL:my_enum:1.0",
-                                                       "my_enum",
-                                                       "1.0",
-                                                       e_members
-                                                       ACE_ENV_ARG_PARAMETER);
+  CORBA::EnumDef_var e_var =
+    this->repo_->create_enum ("IDL:my_enum:1.0",
+                              "my_enum",
+                              "1.0",
+                              e_members
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
 
-  members[2].type = members[2].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  members[2].type =
+    members[2].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDef_var exvar =
@@ -1540,69 +1739,83 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ExceptionDef::type::member_count: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ExceptionDef::type::member_count: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 3);
 
   CORBA::String_var str;
   CORBA::ULong i = 0;
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("ExceptionDef::type::member_name[%d]: %s\n"),
-                    i,
-                    str.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("ExceptionDef::type::member_name[%d]: %s\n"),
+                      i,
+                      str.in ()));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name));
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0);
     }
 
-  CORBA::Contained::Description_var desc = exvar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Contained::Description_var desc =
+    exvar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDescription *ed;
   desc->value >>= ed;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nExceptionDef::describe::value::name: %s\n"),
-                ed->name.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nExceptionDef::describe::value::name: %s\n"),
+                  ed->name.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (ed->name, "my_exception"));
+  ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ExceptionDef::describe::value::id: %s\n"),
-                ed->id.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ExceptionDef::describe::value::id: %s\n"),
+                  ed->id.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (ed->id, "IDL:my_exception:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (ed->id, "IDL:my_exception:1.0") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ExceptionDef::describe::value::defined_in: %s\n"),
-                ed->defined_in.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ExceptionDef::describe::value::defined_in: %s\n"),
+                  ed->defined_in.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (ed->defined_in, ""));
+  ACE_ASSERT (ACE_OS::strcmp (ed->defined_in, "") == 0);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ExceptionDef::describe::value::version: %s\n"),
-                ed->version.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ExceptionDef::describe::value::version: %s\n"),
+                  ed->version.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (ed->version, "1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (ed->version, "1.0") == 0);
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
   members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  members[0].type =
+    members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   members[1].name = CORBA::string_dup ("array_mem");
@@ -1612,7 +1825,8 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[1].type_def = a_ptr;
-  members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  members[1].type =
+    members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   exvar->members (members
@@ -1620,8 +1834,10 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nExceptionDef::members (set)\n\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nExceptionDef::members (set)\n\n")));
+    }
 
   CORBA::EnumMemberSeq def_members (2);
   def_members.length (2);
@@ -1636,11 +1852,14 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StructMemberSeq_var out_members = exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::StructMemberSeq_var out_members =
+    exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
+  
   length = out_members->length ();
+  int cmp_result = 0;
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       if (this->debug_)
         ACE_DEBUG ((LM_DEBUG,
@@ -1649,34 +1868,54 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                     out_members[i].name.in ()));
 
       if (i == 2)
-        ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, "my_enum"));
+        {
+          cmp_result =
+            ACE_OS::strcmp (out_members[i].name, "my_enum");
+          ACE_ASSERT (cmp_result == 0);
+        }
       else
-        ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name));
+        {
+          cmp_result =
+            ACE_OS::strcmp (out_members[i].name, members[i].name);
+          ACE_ASSERT (cmp_result == 0);
+        }
     }
 
   a_ptr->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nArrayDef::destroy\n\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nArrayDef::destroy\n\n")));
+    }
 
   out_members = exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   length = out_members->length ();
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("ExceptionDef::members[%d]::name: %s\n"),
-                    i,
-                    out_members[i].name.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("ExceptionDef::members[%d]::name: %s\n"),
+                      i,
+                      out_members[i].name.in ()));
+        }
 
       if (i == 1)
-        ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, "my_enum"));
+        {
+          cmp_result =
+            ACE_OS::strcmp (out_members[i].name, "my_enum");
+          ACE_ASSERT (cmp_result == 0);
+        }
       else
-        ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name));
+        {
+          cmp_result =
+            ACE_OS::strcmp (out_members[i].name, members[i].name);
+          ACE_ASSERT (cmp_result == 0);
+        }
     }
 
   CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum"
@@ -1687,11 +1926,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nRepository::lookup: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nRepository::lookup: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_exception::my_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_exception::my_enum") == 0);
 
   fox = exvar->lookup ("my_enum"
                        ACE_ENV_ARG_PARAMETER);
@@ -1701,23 +1942,28 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ExceptionDef::lookup: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ExceptionDef::lookup: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_exception::my_enum"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_exception::my_enum") == 0);
 
-  CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all,
-                                                            0
-                                                            ACE_ENV_ARG_PARAMETER);
+  CORBA::ContainedSeq_var contents =
+    this->repo_->contents (CORBA::dk_all,
+                           0
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nRepository::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nRepository::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
@@ -1729,27 +1975,31 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   length = contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ExceptionDef::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ExceptionDef::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
 
       // Should be only the one member.
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_exception::my_enum"));
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_exception::my_enum") == 0);
     }
 
   contents = this->repo_->lookup_name ("my_enum",
@@ -1762,24 +2012,28 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   length = contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nRepository::lookup_name::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nRepository::lookup_name::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("Repository::lookup_name%d]::absolute_name: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("Repository::lookup_name%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
 
       // Can't use ACE_ASSERT here - order of search results is unknown.
     }
@@ -1794,16 +2048,20 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   length = cont_desc->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nRepository::describe_contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nRepository::describe_contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
   CORBA::TypeDescription *td;
-  for (i = 0; i < length; i++)
+  
+  for (i = 0; i < length; ++i)
     {
       CORBA::DefinitionKind kind = cont_desc[i].kind;
+      
       if (kind == CORBA::dk_Exception)
         {
           cont_desc[i].value >>= ed;
@@ -1813,22 +2071,26 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
           ACE_CHECK;
 
           if (this->debug_)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("Repository::describe_contents[%d]")
-                        ACE_TEXT ("::value::type::member_count: %d\n"),
-                        i,
-                        length));
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("Repository::describe_contents[%d]")
+                          ACE_TEXT ("::value::type::member_count: %d\n"),
+                          i,
+                          length));
+            }
 
           ACE_ASSERT (length == 2);
 
           if (this->debug_)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("Repository::describe_contents[%d]")
-                        ACE_TEXT ("::value::name: %s\n"),
-                        i,
-                        ed->name.in ()));
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("Repository::describe_contents[%d]")
+                          ACE_TEXT ("::value::name: %s\n"),
+                          i,
+                          ed->name.in ()));
+            }
 
-          ACE_ASSERT (!ACE_OS::strcmp (ed->name, "my_exception"));
+          ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0);
         }
       else
         {
@@ -1839,22 +2101,26 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
           ACE_CHECK;
 
           if (this->debug_)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("Repository::describe_contents[%d]")
-                        ACE_TEXT ("::value::type::member_count: %d\n"),
-                        i,
-                        length));
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("Repository::describe_contents[%d]")
+                          ACE_TEXT ("::value::type::member_count: %d\n"),
+                          i,
+                          length));
+            }
 
           ACE_ASSERT (length == 2);
 
           if (this->debug_)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("Repository::describe_contents[%d]")
-                        ACE_TEXT ("::value::name: %s\n"),
-                        i,
-                        td->name.in ()));
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("Repository::describe_contents[%d]")
+                          ACE_TEXT ("::value::name: %s\n"),
+                          i,
+                          td->name.in ()));
+            }
 
-          ACE_ASSERT (!ACE_OS::strcmp (td->name, "my_enum"));
+          ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0);
         }
     }
 
@@ -1863,8 +2129,10 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nExceptionDef::name (set)\n\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nExceptionDef::name (set)\n\n")));
+    }
 
   contents = exvar->contents (CORBA::dk_all,
                               0
@@ -1874,20 +2142,22 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   length = contents->length ();
   const char *tmp = "::your_exception";
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("ExceptionDef::contents[%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
 
-      ACE_ASSERT (!ACE_OS::strncmp (str.in (), tmp, ACE_OS::strlen (tmp)));
+      ACE_ASSERT (ACE_OS::strncmp (str.in (), tmp, ACE_OS::strlen (tmp)) == 0);
     }
 
 #if defined (ACE_NDEBUG)
@@ -1904,13 +2174,17 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== CONSTANT TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== CONSTANT TEST ==============\n\n")
+        ));
+    }
 
-  CORBA::IDLType_var ivar = this->repo_->get_primitive (CORBA::pk_string
-                                                        ACE_ENV_ARG_PARAMETER);
+  CORBA::IDLType_var ivar =
+    this->repo_->get_primitive (CORBA::pk_string
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Any any;
@@ -1932,21 +2206,27 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ConstantDef::type::kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ConstantDef::type::kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_string);
 
-  CORBA::IDLType_var tdef = cvar->type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::IDLType_var tdef =
+    cvar->type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::DefinitionKind def_kind = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind def_kind =
+    tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ConstantDef::type_def::def_kind: %d\n"),
-                def_kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ConstantDef::type_def::def_kind: %d\n"),
+                  def_kind));
+    }
 
   ACE_ASSERT (def_kind == CORBA::dk_Primitive);
 
@@ -1958,11 +2238,13 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   out_any >>= out_s;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ConstantDef::value (string): %s\n"),
-                out_s));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ConstantDef::value (string): %s\n"),
+                  out_s));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (out_s, s));
+  ACE_ASSERT (ACE_OS::strcmp (out_s, s) == 0);
 
   ivar = this->repo_->get_primitive (CORBA::pk_double
                                      ACE_ENV_ARG_PARAMETER);
@@ -1978,9 +2260,11 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nConstantDef::type_def (set)\n")
-                ACE_TEXT ("ConstantDef::value (set)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nConstantDef::type_def (set)\n")
+                  ACE_TEXT ("ConstantDef::value (set)\n")));
+    }
 
   out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -1989,9 +2273,11 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   out_any >>= out_double_val;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ConstantDef::value (double): %.5f\n"),
-                out_double_val));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ConstantDef::value (double): %.5f\n"),
+                  out_double_val));
+    }
 
   ACE_ASSERT (out_double_val == double_val);
 
@@ -2001,9 +2287,11 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
                   ACE_ENV_ARG_PARAMETER);
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nConstantDef::type_def (set)\n")
-                ACE_TEXT ("ConstantDef::value (set)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nConstantDef::type_def (set)\n")
+                  ACE_TEXT ("ConstantDef::value (set)\n")));
+    }
 
   CORBA::Short short_val = -65;
   any <<= short_val;
@@ -2018,9 +2306,11 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   out_any >>= out_short_val;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ConstantDef::value (short): %hd\n"),
-                out_short_val));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ConstantDef::value (short): %hd\n"),
+                  out_short_val));
+    }
 
   ACE_ASSERT (out_short_val == short_val);
 
@@ -2032,9 +2322,11 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nConstantDef::type_def (set)\n")
-                ACE_TEXT ("ConstantDef::value (set)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nConstantDef::type_def (set)\n")
+                  ACE_TEXT ("ConstantDef::value (set)\n")));
+    }
 
   CORBA::Float float_val = 2.33f;
   any <<= float_val;
@@ -2049,9 +2341,11 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   out_any >>= out_float_val;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ConstantDef::value (float): %.2f\n"),
-                out_float_val));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("ConstantDef::value (float): %.2f\n"),
+                  out_float_val));
+    }
 
   ACE_ASSERT (out_float_val == float_val);
 
@@ -2063,9 +2357,11 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nConstantDef::type_def (set)\n")
-                ACE_TEXT ("ConstantDef::value (set)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nConstantDef::type_def (set)\n")
+                  ACE_TEXT ("ConstantDef::value (set)\n")));
+    }
 
   CORBA::ULongLong ull_val = 1234567890;
   any <<= ull_val;
@@ -2101,10 +2397,13 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== INTERFACE TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== INTERFACE TEST ==============\n\n")
+        ));
+    }
 
   CORBA::ULong i, length;
 
@@ -2144,8 +2443,8 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StringDef_var p_string = this->repo_->create_string (5
-                                                              ACE_ENV_ARG_PARAMETER);
+  CORBA::StringDef_var p_string =
+    this->repo_->create_string (5 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::AttributeDef_var p_attr =
@@ -2208,63 +2507,74 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Contained::Description_var desc = p_op->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Contained::Description_var desc =
+    p_op->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::OperationDescription *od;
   desc->value >>= od;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("OperationDef::describe::value::")
-                ACE_TEXT ("defined_in: %s\n"),
-                od->defined_in.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("OperationDef::describe::value::")
+                  ACE_TEXT ("defined_in: %s\n"),
+                  od->defined_in.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0") == 0);
 
   CORBA::TypeCode_var result = od->result;
   CORBA::TCKind kind = result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("OperationDef::describe::result::")
-                ACE_TEXT ("kind: %d\n"),
-                kind));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("OperationDef::describe::result::")
+                  ACE_TEXT ("kind: %d\n"),
+                  kind));
+    }
 
   ACE_ASSERT (kind == CORBA::tk_long);
 
   length = od->parameters.length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nOperationDef::describe::parameters::")
-                ACE_TEXT ("length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nOperationDef::describe::parameters::")
+                  ACE_TEXT ("length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 3);
 
   const char *tmp = 0;
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       tmp = od->parameters[i].name;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OperationDef::describe::parameters[%d]::")
-                    ACE_TEXT ("name: %s\n"),
-                    i,
-                    tmp));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("OperationDef::describe::parameters[%d]::")
+                      ACE_TEXT ("name: %s\n"),
+                      i,
+                      tmp));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (tmp, names[i]));
+      ACE_ASSERT (ACE_OS::strcmp (tmp, names[i]) == 0);
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OperationDef::describe::parameters[%d]::")
-                    ACE_TEXT ("mode: %d\n"),
-                    i,
-                    od->parameters[i].mode));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("OperationDef::describe::parameters[%d]::")
+                      ACE_TEXT ("mode: %d\n"),
+                      i,
+                      od->parameters[i].mode));
+        }
 
       ACE_ASSERT (od->parameters[i].mode == modes[i]);
     }
@@ -2274,9 +2584,11 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::is_a (same class): %hd\n"),
-                is_it));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::is_a (same class): %hd\n"),
+                  is_it));
+    }
 
   ACE_ASSERT (is_it == 1);
 
@@ -2285,9 +2597,11 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("InterfaceDef::is_a (base class): %hd\n"),
-                is_it));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("InterfaceDef::is_a (base class): %hd\n"),
+                  is_it));
+    }
 
   ACE_ASSERT (is_it == 1);
 
@@ -2296,9 +2610,11 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("InterfaceDef::is_a (derived class): %hd\n"),
-                is_it));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("InterfaceDef::is_a (derived class): %hd\n"),
+                  is_it));
+    }
 
   ACE_ASSERT (is_it == 0);
 
@@ -2310,80 +2626,94 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::describe_interface::")
-                ACE_TEXT ("type::id: %s\n"),
-                str.in ()));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::describe_interface::")
+                  ACE_TEXT ("type::id: %s\n"),
+                  str.in ()));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:p_iface:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:p_iface:1.0") == 0);
 
   length = fifd->operations.length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::describe_interface::")
-                ACE_TEXT ("operations::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::describe_interface::")
+                  ACE_TEXT ("operations::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
   length = fifd->operations[0].contexts.length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::describe_interface::")
-                ACE_TEXT ("operations[3]::contexts::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::describe_interface::")
+                  ACE_TEXT ("operations[3]::contexts::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 3);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       tmp = fifd->operations[0].contexts[i];
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("InterfaceDef::describe_interface::")
-                    ACE_TEXT ("operations[0]::contexts[%d]: %s\n"),
-                    i,
-                    tmp));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("InterfaceDef::describe_interface::")
+                      ACE_TEXT ("operations[0]::contexts[%d]: %s\n"),
+                      i,
+                      tmp));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (tmp, contexts[i]));
+      ACE_ASSERT (ACE_OS::strcmp (tmp, contexts[i]) == 0);
     }
 
   length = fifd->operations[0].exceptions.length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::describe_interface::")
-                ACE_TEXT ("operations[0]::exceptions::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::describe_interface::")
+                  ACE_TEXT ("operations[0]::exceptions::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       const char *tmp = fifd->operations[0].exceptions[i].name;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("InterfaceDef::describe::operations[3]::")
-                    ACE_TEXT ("contexts[%d]: %s\n"),
-                    i,
-                    tmp));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("InterfaceDef::describe::operations[3]::")
+                      ACE_TEXT ("contexts[%d]: %s\n"),
+                      i,
+                      tmp));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (tmp, "if_exception"));
+      ACE_ASSERT (ACE_OS::strcmp (tmp, "if_exception") == 0);
     }
 
   tmp = fifd->attributes[0].defined_in;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::describe_interface::")
-                ACE_TEXT ("attributes::defined_in: %s\n"),
-                tmp));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::describe_interface::")
+                  ACE_TEXT ("attributes::defined_in: %s\n"),
+                  tmp));
+    }
 
-  ACE_ASSERT (!ACE_OS::strcmp (tmp, "IDL:gp_iface:1.0"));
+  ACE_ASSERT (ACE_OS::strcmp (tmp, "IDL:gp_iface:1.0") == 0);
 
   in_bases[0] = CORBA::InterfaceDef::_duplicate (p_ivar.in ());
 
@@ -2404,25 +2734,29 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
   length = ifd->base_interfaces.length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::describe::")
-                ACE_TEXT ("base_interfaces::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::describe::")
+                  ACE_TEXT ("base_interfaces::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
   const char *base_iface_id = 0;
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       base_iface_id = ifd->base_interfaces[i].in ();
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("InterfaceDef::describe::")
-                    ACE_TEXT ("base_interfaces[%d]: %s\n"),
-                    i,
-                    base_iface_id));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("InterfaceDef::describe::")
+                      ACE_TEXT ("base_interfaces[%d]: %s\n"),
+                      i,
+                      base_iface_id));
+        }
     }
 
   CORBA::InterfaceDefSeq_var out_bases =
@@ -2432,24 +2766,28 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
   length = out_bases->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::base_interfaces::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::base_interfaces::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = out_bases[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("InterfaceDef::base_interfaces[%d]::name: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("InterfaceDef::base_interfaces[%d]::name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
     }
 
   CORBA::ContainedSeq_var contents = ivar->contents (CORBA::dk_all,
@@ -2460,42 +2798,50 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
   length = contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 3);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = contents[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("InterfaceDef::contents[%d]::name: %s\n"),
-                    i,
-                    str.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("InterfaceDef::contents[%d]::name: %s\n"),
+                      i,
+                      str.in ()));
+        }
 
-      CORBA::Container_var cr = contents[i]->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Container_var cr =
+        contents[i]->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Contained_var cd = CORBA::Contained::_narrow (cr.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
+      CORBA::Contained_var cd =
+        CORBA::Contained::_narrow (cr.in ()
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       str = cd->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("InterfaceDef::contents[%d]::")
-                    ACE_TEXT ("defined_in::name: %s\n"),
-                    i,
-                    str.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("InterfaceDef::contents[%d]::")
+                      ACE_TEXT ("defined_in::name: %s\n"),
+                      i,
+                      str.in ()));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (), "p_iface")
-                  || !ACE_OS::strcmp (str.in (), "gp_iface"));
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), "p_iface") == 0
+                  || ACE_OS::strcmp (str.in (), "gp_iface") == 0);
     }
 
   ex_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2511,10 +2857,13 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== MOVE TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== MOVE TEST ==============\n\n")
+        ));
+    }
 
   CORBA::EnumMemberSeq e_members (2);
   e_members.length (2);
@@ -2522,21 +2871,23 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   e_members[0] = CORBA::string_dup ("ZERO");
   e_members[1] = CORBA::string_dup ("ONE");
 
-  CORBA::EnumDef_var e_var = this->repo_->create_enum ("IDL:o_enum:1.0",
-                                                       "o_enum",
-                                                       "1.0",
-                                                       e_members
-                                                       ACE_ENV_ARG_PARAMETER);
+  CORBA::EnumDef_var e_var =
+    this->repo_->create_enum ("IDL:o_enum:1.0",
+                              "o_enum",
+                              "1.0",
+                              e_members
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   e_members[0] = CORBA::string_dup ("TEN");
   e_members[1] = CORBA::string_dup ("ELEVEN");
 
-  CORBA::EnumDef_var e_var2 = this->repo_->create_enum ("IDL:i_enum:1.0",
-                                                        "i_enum",
-                                                        "1.0",
-                                                        e_members
-                                                        ACE_ENV_ARG_PARAMETER);
+  CORBA::EnumDef_var e_var2 = 
+    this->repo_->create_enum ("IDL:i_enum:1.0",
+                              "i_enum",
+                              "1.0",
+                              e_members
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::StructMemberSeq s_members (2);
@@ -2545,15 +2896,18 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   const char *s_names[] = {"s_string", "s_enum"};
 
   s_members[0].name = s_names[0];
-  s_members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
-                                                      ACE_ENV_ARG_PARAMETER);
+  s_members[0].type_def = 
+    this->repo_->get_primitive (CORBA::pk_string
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  s_members[0].type = s_members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  s_members[0].type =
+    s_members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   s_members[1].name = s_names[1];
   s_members[1].type_def = CORBA::EnumDef::_duplicate (e_var2.in ());
-  s_members[1].type = s_members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  s_members[1].type =
+    s_members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::StructDef_var s_var =
@@ -2600,45 +2954,53 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::UnionMemberSeq_var out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::UnionMemberSeq_var out_u_members =
+    u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = out_u_members->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("UnionDef::members::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("UnionDef::members::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
   CORBA::ULong i = 0;
   const char *tmp = 0;
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       tmp = out_u_members[i].name;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
-                    i,
-                    tmp));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
+                      i,
+                      tmp));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (tmp, u_members[i].name));
+      ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0);
     }
 
-  CORBA::ContainedSeq_var out_contents = u_var->contents (CORBA::dk_all,
-                                                          1
-                                                          ACE_ENV_ARG_PARAMETER);
+  CORBA::ContainedSeq_var out_contents =
+    u_var->contents (CORBA::dk_all,
+                     1
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nUnionDef::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nUnionDef::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 0);
 
@@ -2649,8 +3011,10 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nEnumDef::move (into union)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nEnumDef::move (into union)\n")));
+    }
 
   out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -2658,45 +3022,33 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   length = out_u_members->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nUnionDef::members::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nUnionDef::members::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       tmp = out_u_members[i].name;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
-                    i,
-                    tmp));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
+                      i,
+                      tmp));
+        }
 
       if (i == 0)
         {
-          if (ACE_OS::strcmp (tmp, "u_enum"))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("move_test::name -")
-                          ACE_TEXT ("incorrect name in item %d"),
-                          i));
-
-              return;
-            }
+          ACE_ASSERT (ACE_OS::strcmp (tmp, "u_enum") == 0);
         }
       else
         {
-          if (ACE_OS::strcmp (tmp, u_members[i].name))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("move_test::name -")
-                          ACE_TEXT ("incorrect name in item %d"),
-                          i));
-
-              return;
-            }
+          ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0);
         }
     }
 
@@ -2708,36 +3060,34 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   length = out_contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nUnionDef::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nUnionDef::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
   CORBA::String_var str;
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %s\n"),
-                    i,
-                    str.in ()));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
 
       if (i == 0)
         {
-          if (ACE_OS::strcmp (str.in (), "::the_union::u_enum"))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("move_test::contents -")
-                          ACE_TEXT ("incorrect scoped name in item %d"),
-                          i));
-
-              return;
-            }
+          ACE_ASSERT (ACE_OS::strcmp (str.in (), "::the_union::u_enum") == 0);
         }
     }
 
@@ -2754,9 +3104,11 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nEnumDef::move (into struct)\n")
-                ACE_TEXT ("StructDef::move (into union)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nEnumDef::move (into struct)\n")
+                  ACE_TEXT ("StructDef::move (into union)\n")));
+    }
 
   out_contents = this->repo_->contents (CORBA::dk_all,
                                         1
@@ -2766,9 +3118,11 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   length = out_contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nRepository::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nRepository::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
@@ -2778,23 +3132,27 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   length = out_u_members->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nUnionDef::members::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nUnionDef::members::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       tmp = out_u_members[i].name;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
-                    i,
-                    tmp));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("UnionDef::members[%d]::name: %s\n"),
+                      i,
+                      tmp));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (tmp, u_names[i]));
+      ACE_ASSERT (ACE_OS::strcmp (tmp, u_names[i]) == 0);
     }
 
   out_contents = u_var->contents (CORBA::dk_all,
@@ -2805,28 +3163,35 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   length = out_contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nUnionDef::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nUnionDef::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
   ACE_CString scoped ("::the_union::");
   CORBA::StructDef_var s_tmp;
+  int cmp_result = 0;
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %s\n"),
-                    i,
-                    str.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("UnionDef::contents[%d]::absolute_name: %s\n"),
+                      i,
+                      str.in ()));
+        }
+        
+      cmp_result =
+        ACE_OS::strcmp (str.in (), (scoped + u_names[i]).c_str ());
 
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (),
-                                   (scoped + u_names[i]).c_str ()));
+      ACE_ASSERT (cmp_result == 0);
 
       if (i == 1)
         {
@@ -2844,28 +3209,33 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   length = out_contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nStructDef::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nStructDef::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
   const char *base = "::the_union::u_struct";
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
-                    i,
-                    str.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("StructDef::contents[%d]::absolute_name: %s\n"),
+                      i,
+                      str.in ()));
+        }
+        
+      cmp_result =
+        ACE_OS::strncmp (str.in (), base, ACE_OS::strlen (base));
 
-      ACE_ASSERT (!ACE_OS::strncmp (str.in (),
-                                    base,
-                                    ACE_OS::strlen (base)));
+      ACE_ASSERT (cmp_result == 0);
     }
 
 #if defined (ACE_NDEBUG)
@@ -2873,29 +3243,34 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (base);
 #endif /* ACE_NDEBUG */
 
-  CORBA::StructMemberSeq_var out_s_members = s_tmp->members (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::StructMemberSeq_var out_s_members =
+    s_tmp->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_s_members->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nStructDef::members::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nStructDef::members::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 2);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       tmp = out_s_members[i].name;
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
-                    i,
-                    tmp));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
+                      i,
+                      tmp));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (tmp, s_names[i]));
+      ACE_ASSERT (ACE_OS::strcmp (tmp, s_names[i]) == 0);
    }
 
   u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2905,27 +3280,33 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 void
 Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== MODULE TEST ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== MODULE TEST ==============\n\n")
+        ));
+    }
 
-  CORBA::ModuleDef_var outer = this->repo_->create_module ("IDL:outer:1.0",
-                                                           "outer",
-                                                           "1.0"
-                                                           ACE_ENV_ARG_PARAMETER);
+  CORBA::ModuleDef_var outer =
+    this->repo_->create_module ("IDL:outer:1.0",
+                                "outer",
+                                "1.0"
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ModuleDef_var middle = outer->create_module ("IDL:outer/middle:1.0",
-                                                      "middle",
-                                                      "1.0"
-                                                      ACE_ENV_ARG_PARAMETER);
+  CORBA::ModuleDef_var middle =
+    outer->create_module ("IDL:outer/middle:1.0",
+                          "middle",
+                          "1.0"
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ModuleDef_var inner = middle->create_module ("IDL:outer/middle/inner:1.0",
-                                                      "inner",
-                                                      "1.0"
-                                                      ACE_ENV_ARG_PARAMETER);
+  CORBA::ModuleDef_var inner =
+    middle->create_module ("IDL:outer/middle/inner:1.0",
+                           "inner",
+                           "1.0"
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::InterfaceDefSeq in_bases (1);
@@ -2986,7 +3367,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
       par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ());
       par_seq[i].type = p_long->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      par_seq[i].mode = ACE_static_cast (CORBA::ParameterMode, i);
+      par_seq[i].mode = static_cast<CORBA::ParameterMode> (i);
 
       con_seq[i] = contexts[i];
     }
@@ -3029,14 +3410,18 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("ModuleDef::lookup (absolute)::absolute_name: %s\n"),
-        str.in ()
-      ));
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("ModuleDef::lookup (absolute)::absolute_name: %s\n"),
+          str.in ()
+        ));
+    }
+    
+  int cmp_result =
+    ACE_OS::strcmp (str.in (), "::outer::middle::inner::iface::op");
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (),
-                               "::outer::middle::inner::iface::op"));
+  ACE_ASSERT (cmp_result == 0);
 
   result = middle->lookup ("inner::iface::op"
                            ACE_ENV_ARG_PARAMETER);
@@ -3046,46 +3431,57 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("ModuleDef::lookup (relative)::absolute_name: %s\n"),
-        str.in ()
-      ));
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("ModuleDef::lookup (relative)::absolute_name: %s\n"),
+          str.in ()
+        ));
+    }
+    
+  cmp_result =
+    ACE_OS::strcmp (str.in (), "::outer::middle::inner::iface::op");
 
-  ACE_ASSERT (!ACE_OS::strcmp (str.in (),
-                               "::outer::middle::inner::iface::op"));
+  ACE_ASSERT (cmp_result == 0);
 
-  CORBA::ContainedSeq_var cseq = this->repo_->lookup_name ("op",
-                                                           -1,
-                                                           CORBA::dk_all,
-                                                           0
-                                                           ACE_ENV_ARG_PARAMETER);
+  CORBA::ContainedSeq_var cseq =
+    this->repo_->lookup_name ("op",
+                              -1,
+                              CORBA::dk_all,
+                              0
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cseq->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Repository::lookup_name::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Repository::lookup_name::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
+        
+      cmp_result =
+        ACE_OS::strcmp (str.in (), "::outer::middle::inner::iface::op");
 
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (),
-                                   "::outer::middle::inner::iface::op"));
+      ACE_ASSERT (cmp_result == 0);
     }
 
   cseq = middle->lookup_name ("attr",
@@ -3098,26 +3494,30 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
   length = cseq->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Repository::lookup_name::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Repository::lookup_name::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
-            i,
-            str.in ()
-          ));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
 
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::outer::p_iface::attr"));
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), "::outer::p_iface::attr") == 0);
     }
 
   iface->move (outer.in (),
@@ -3127,8 +3527,10 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nInterfaceDef::move (into outer module)\n")));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nInterfaceDef::move (into outer module)\n")));
+    }
 
   cseq = this->repo_->lookup_name ("op",
                                    -1,
@@ -3140,26 +3542,30 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
   length = cseq->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Repository::lookup_name::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Repository::lookup_name::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
-            i,
-            str.in ()
-          ));
-
-      ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::outer::iface::op"));
+        {
+          ACE_DEBUG ((
+              LM_DEBUG,
+              ACE_TEXT ("Repository::lookup_name[%d]::absolute_name: %s\n"),
+              i,
+              str.in ()
+            ));
+        }
+
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), "::outer::iface::op") == 0);
     }
 
   ex_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
index f03dc8416aa..aa3af160455 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
@@ -3,22 +3,21 @@
 
 #include "Admin_Client.h"
 
-ACE_RCSID(IFR_Test, client, "$Id$")
+ACE_RCSID (IFR_Test,
+           client,
+           "$Id$")
 
 int main (int argc, char *argv[])
 {
   Admin_Client admin_client;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\t IFR_Test \n\n"));
-
   int retval = admin_client.init (argc, 
                                   argv);
 
   if (retval == -1)
-    return 1;
-
-  retval = admin_client.run ();
+    {
+      return 1;
+    }
 
-  return retval;
+  return admin_client.run ();
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index 34a43bae08e..c29daa4ff2a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -14,7 +14,7 @@ ACE_RCSID (Latency_Test,
 const CORBA::ULong DEFAULT_NUMCALLS = 20000;
 
 Latency_Query_Client::Latency_Query_Client (void)
-  : debug_ (0),
+  : debug_ (false),
     do_dump_history_ (0),
     iterations_ (DEFAULT_NUMCALLS)
 {
@@ -107,15 +107,6 @@ Latency_Query_Client::run (void)
             {
               return -1;
             }
-/*
-          dk = this->tdef_->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (dk != CORBA::dk_Alias)
-            {
-              return -1;
-            }
-*/
         }
 
       ACE_Sample_History history (this->iterations_);
@@ -126,7 +117,6 @@ Latency_Query_Client::run (void)
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
           am = this->attr_->mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-//          dk = this->tdef_->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -135,28 +125,30 @@ Latency_Query_Client::run (void)
 
       ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
-      ACE_DEBUG ((LM_DEBUG, 
-                  "test finished\n"));
-      ACE_DEBUG ((LM_DEBUG, 
-                  "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, 
-                  "done\n"));
-
-      if (this->do_dump_history_)
+      if (this->debug_)
         {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats stats;
-      history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
+          ACE_DEBUG ((LM_DEBUG, 
+                      "test finished\n"));
+          ACE_DEBUG ((LM_DEBUG, 
+                      "High resolution timer calibration...."));
+          ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+          ACE_DEBUG ((LM_DEBUG, 
+                      "done\n"));
+
+          if (this->do_dump_history_)
+            {
+              history.dump_samples ("HISTORY", gsf);
+            }
 
-      ACE_Throughput_Stats::dump_throughput ("Total", 
-											                       gsf,
-                                             test_end - test_start,
-                                             stats.samples_count ());
+          ACE_Basic_Stats stats;
+          history.collect_basic_stats (stats);
+          stats.dump_results ("Total", gsf);
 
+          ACE_Throughput_Stats::dump_throughput ("Total", 
+											                           gsf,
+                                                 test_end - test_start,
+                                                 stats.samples_count ());
+        }
     }
   ACE_CATCHANY
     {
@@ -178,33 +170,35 @@ Latency_Query_Client::parse_args (int argc,
   int result = 0;
 
   while ((c = opts ()) != -1)
-    switch (c)
-      {
-      case 'd':
-        this->debug_ = 1;
-        break;
-      case 'h': 
-        this->do_dump_history_ = 1;
-        break;
-      case 'i': 
-        result = ACE_OS::atoi (opts.opt_arg ());
-
-        if (result > 0)
-          {
-            this->iterations_ = result;
-          }
-
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage: %s"
-                           " [-d]"
-                           " [-i iterations]"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
+    {
+      switch (c)
+        {
+        case 'd':
+          this->debug_ = true;
+          break;
+        case 'h': 
+          this->do_dump_history_ = true;
+          break;
+        case 'i': 
+          result = ACE_OS::atoi (opts.opt_arg ());
+
+          if (result > 0)
+            {
+              this->iterations_ = result;
+            }
+
+          break;
+        case '?':
+        default:
+          ACE_ERROR_RETURN ((LM_ERROR,
+                            "usage: %s"
+                            " [-d]"
+                            " [-i iterations]"
+                            "\n",
+                            argv [0]),
+                            -1);
+        }
+    }
 
   return 0;
 }
@@ -257,57 +251,7 @@ Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
                              CORBA::ATTR_NORMAL
                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-/*
-  CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:longtype:1.0"
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (! CORBA::is_nil (irobj.in ()))
-    {
-      this->tdef_ = CORBA::AliasDef::_narrow (irobj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      if (CORBA::is_nil (this->tdef_.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Latency_Query_Client::populate_ifr - "
-                             "AliasDef::_narrow returned null\n"),
-                            -1);
-        }
-
-      return 0;
-    }
-
-  CORBA::PrimitiveDef_var longdef = 
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
-  if (CORBA::is_nil (longdef.in ()))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Latency_Query_Client::populate_ifr - "
-                         "get_primitive returned null\n"),
-                        -1);
-    }
-
-  this->tdef_ = 
-    this->repo_->create_alias ("IDL:longtype:1.0",
-                               "longtype",
-                               "1.0",
-                               longdef.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil (this->tdef_.in ()))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Latency_Query_Client::populate_ifr - "
-                         "create_alias returned null\n"),
-                        -1);
-    }
-*/
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
index 589dc476a3a..fa223454637 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
@@ -52,10 +52,10 @@ private:
   // Put in something to query about.
 
 private:
-  CORBA::Boolean debug_;
+  bool debug_;
   // Toggle debugging output.
 
-  CORBA::Boolean do_dump_history_;
+  bool do_dump_history_;
   // Toggle saving of dump history.
 
   CORBA::ULong iterations_;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
index b718a900b2e..43c9155ebb1 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
@@ -12,9 +12,6 @@ main (int argc, char *argv[])
 {
   Latency_Query_Client client;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\t IFR Latency Test \n\n"));
-
   int retval = client.init (argc, 
                             argv);
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index 11073e423e1..10146a9a882 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -134,10 +134,13 @@ Ptest::parse_args (int argc,
 void
 Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== POPULATE ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== POPULATE ==============\n\n")
+        ));
+    }
 
   CORBA::StructMemberSeq members (2);
   members.length (2);
@@ -181,10 +184,13 @@ Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
 void
 Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT ("\n============== QUERY ==============\n\n")
-    ));
+  if (this->debug_)
+    {
+      ACE_DEBUG ((
+          LM_DEBUG,
+          ACE_TEXT ("\n============== QUERY ==============\n\n")
+        ));
+    }
 
   const char *members[] =
   {
@@ -193,71 +199,64 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
     "my_enum"
   };
 
-  CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all,
-                                                            0
-                                                            ACE_ENV_ARG_PARAMETER);
+  CORBA::ContainedSeq_var contents = 
+    this->repo_->contents (CORBA::dk_all,
+                           0
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = contents->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Repository::contents::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Repository::contents::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 1);
 
   CORBA::ULong i = 0;
 
-  CORBA::StructDef_var svar = CORBA::StructDef::_narrow (contents[i]
-                                                         ACE_ENV_ARG_PARAMETER);
+  CORBA::StructDef_var svar =
+    CORBA::StructDef::_narrow (contents[i]
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (svar.in ()));
 
-  CORBA::StructMemberSeq_var out_members = svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::StructMemberSeq_var out_members =
+    svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_members->length ();
 
   if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("\nStructDef::members::length: %d\n"),
-                length));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("\nStructDef::members::length: %d\n"),
+                  length));
+    }
 
   ACE_ASSERT (length == 3);
 
-  for (i = 0; i < length; i++)
+  for (i = 0; i < length; ++i)
     {
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
-                    i,
-                    out_members[i].name.in ()));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
+                      i,
+                      out_members[i].name.in ()));
+        }
 
       if (i == length - 1)
         {
-          if (ACE_OS::strcmp (out_members[i].name, "my_enum"))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("persistence_test::query::members -")
-                          ACE_TEXT ("incorrect local name in item %d"),
-                          i));
-
-              return;
-            }
+          ACE_ASSERT (ACE_OS::strcmp (out_members[i].name, "my_enum") == 0);
         }
       else
         {
-          if (ACE_OS::strcmp (out_members[i].name, members[i]))
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("persistence_test::query::members -")
-                          ACE_TEXT ("incorrect local name in item %d"),
-                          i));
-
-              return;
-            }
+          ACE_ASSERT (ACE_OS::strcmp (out_members[i].name, members[i]) == 0);
         }
     }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
index bb842b99d0a..8ded8407764 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
@@ -33,8 +33,6 @@ for ($i = 0; $i <= $#ARGV; $i++) {
 unlink $iorfile;
 unlink $backing_file;
 
-print STDERR "\t IFR Persistence Test\n\n";
-
 $IFR = new PerlACE::Process ("../../../IFR_Service/IFR_Service", " -o $iorfile" . " $persistent");
 $T   = new PerlACE::Process ("Persistence_Test");
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
index 27aa6d31b2a..2155c1c4c36 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
@@ -3,7 +3,9 @@
 
 #include "Ptest.h"
 
-ACE_RCSID(Persistence_Test, test, "$Id$")
+ACE_RCSID (Persistence_Test,
+           test,
+           "$Id$")
 
 int main (int argc, char *argv[])
 {
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index e774066e87a..2f6f2d7ad72 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -136,7 +136,7 @@ NContextExt_Client_i::get_name ()
           break;
 
         default:
-          cout << "shouldnt come here" << endl;
+          ACE_ERROR ((LM_ERROR, "shouldnt come here"));
           break;
         }
     }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
index ef95ff4c716..286f7e8cb1c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (CPU,
 const char * location = "MyLocation";
 
 const int MAX_RETRIES = 10;
-const CosLoadBalancing::LoadId LOAD_ID = CosLoadBalancing::CPU;
+const CosLoadBalancing::LoadId LOAD_ID = CosLoadBalancing::LoadAverage;
 
 int
 parse_args (int argc, char *argv[])
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 78b92cc6fc3..164156eed32 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -32,16 +32,14 @@ BasicLog_Test::~BasicLog_Test (void)
 int
 BasicLog_Test::init (int argc, char *argv[])
 {
-  this->argc_ = argc;
-  this->argv_ = argv;
-
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              "internet" ACE_ENV_ARG_PARAMETER);
+                              "internet"
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
@@ -49,7 +47,7 @@ BasicLog_Test::init (int argc, char *argv[])
                     "\nOrb initialized successfully\n"));
 
       // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
+      if (this->parse_args (argc, argv) == -1)
         return -1;
 
       // Initialize the factory
@@ -361,7 +359,7 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords
 
   ACE_DEBUG ((LM_ERROR,"The number of records in log is %d\n", ACE_U64_TO_U32(nrecords)));
 
-  ACE_RETURN(nrecords);
+  ACE_RETURN(static_cast<int> (nrecords));
 }
 
 int
@@ -544,9 +542,9 @@ BasicLog_Test::test_query(CORBA::ULong numberOfRecordsToWrite)
 
 
 int
-BasicLog_Test::parse_args (void)
+BasicLog_Test::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "di");
+  ACE_Get_Opt get_opts (argc, argv, "di");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -562,7 +560,7 @@ BasicLog_Test::parse_args (void)
                            " [-d]"
                            "\n"
                            "    -d: increase debug level\n",
-                           this->argv_ [0]),
+                           argv[0]),
                           -1);
       }
 
@@ -623,7 +621,8 @@ BasicLog_Test::destroy_log()
   ACE_ENDTRY;
 }
 
-int BasicLog_Test::test_log_destroy (void)
+int
+BasicLog_Test::test_log_destroy (void)
 {
 
   ACE_DEBUG ((LM_ERROR, "Testing destroy log\n"));
@@ -635,16 +634,24 @@ int BasicLog_Test::test_log_destroy (void)
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_INFO, "Wrote to log\n"));
     }
+  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+    {
+      ACE_DEBUG ((LM_ERROR,
+                  "Test of destroy log succeeded: "
+                  "caught CORBA::OBJECT_NOT_EXIST exception.\n"));
+      return 0;
+    }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Destroying log");
       ACE_DEBUG ((LM_ERROR,
-                  "Test of destroy log succeeded and caught exception.\n"));
-      return 0;
+                  "Test of destroy log failed: "
+                  "caught unexpected exception.\n"));
+      return -1;
     }
   ACE_ENDTRY;
   ACE_ERROR_RETURN ((LM_ERROR,
-                     "Test of destroy log failed and no exception thrown.\n"),
+                     "Test of destroy log failed: no exception thrown.\n"),
                     -1);
 }
 
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index 031c19ba769..cde2e00f5a0 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -114,7 +114,7 @@ private:
     init_factory (ACE_ENV_SINGLE_ARG_DECL);
 
   int
-    parse_args();
+    parse_args(int argc, char *argv[]);
   // command line argument parser
 
   int write_records(CORBA::ULongLong numberOfRecordsToWrite ACE_ENV_ARG_DECL_NOT_USED);
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
index 4a682cc2f5a..3213ff1542c 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, dslogadmin, naming, dynamicany, iortable, etcl {
-}
\ No newline at end of file
+    exename = client
+}
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/README b/TAO/orbsvcs/tests/Miop/McastHello/README
index d96228dc866..2b7205b555d 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/README
+++ b/TAO/orbsvcs/tests/Miop/McastHello/README
@@ -15,4 +15,20 @@ $ ./run_test.pl
 
 	the script returns 0 if the test was successful.
 
+The test has some unique features that should be noted by
+users. Firstly, server.cpp includes MIOP.h, which has some magic for
+loading MIOP protocol in static builds. Secondly, the svc.conf has
+a directive for loading the right protocol factory. Both of them are
+required for static builds in addition to linking with the
+TAO_PortableGroup library. 
+
+However for dynamic builds things are different
+
+. One need not include MIOP.h. Including MIOP.h will require linking
+  in the TAO_PortableGroup library
+
+. The entries in the svc.conf should have dynamic directives. In
+  svc.conf you would be required to remove commented parts and run
+  the test.
+
 */
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.conf b/TAO/orbsvcs/tests/Miop/McastHello/client.conf
deleted file mode 100644
index 75accdd4d58..00000000000
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index c0fa7328e6a..10180538dbf 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -2,8 +2,8 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
-
 #include "tao/Object_T.h"
+#include "orbsvcs/PortableGroup/MIOP.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl
index ef87c284d2d..316cf14a560 100755
--- a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl
+++ b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl
@@ -14,12 +14,9 @@ unlink $iorfile;
 unlink $iorfile_server2;
 $status = 0;
 
-$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
-$client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext");
-
-$SV1 = new PerlACE::Process ("server", "-o $iorfile -ORBsvcconf $server_conf");
-$SV2 = new PerlACE::Process ("server", "-o $iorfile_server2 -ORBsvcconf $server_conf");
-$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBsvcconf $client_conf");
+$SV1 = new PerlACE::Process ("server", "-o $iorfile");
+$SV2 = new PerlACE::Process ("server", "-o $iorfile_server2 ");
+$CL = new PerlACE::Process ("client", " -k file://$iorfile ");
 
 $SV1->Spawn ();
 $SV2->Spawn ();
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.conf b/TAO/orbsvcs/tests/Miop/McastHello/server.conf
deleted file mode 100644
index 38dd6e5896c..00000000000
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
-#static PortableGroup_Loader ""
-dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index 711a9f53f1c..c71f26760f2 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -3,6 +3,7 @@
 #include "McastHello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "orbsvcs/PortableGroup/MIOP.h"
 
 ACE_RCSID (McastHello,
            server,
@@ -78,6 +79,8 @@ main (int argc, char *argv[])
 
       // Get the group IOR.
       CORBA::String_var ior = CORBA::string_dup (group_ior);
+
+
       CORBA::Object_var group1 =
         orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index ec0758fbe6a..275567eab72 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -52,6 +52,8 @@ MultiTypes_SequencePushConsumer::MultiTypes_SequencePushConsumer (MultiTypes* cl
 {
 }
 
+// TODO: if the batch contains more than one event this counts only one received event
+// Since this should *never* happen, I'm not fixing it now.
 void
 MultiTypes_SequencePushConsumer::push_structured_events (const CosNotification::EventBatch & /*notifications*/
                                                          ACE_ENV_ARG_DECL_NOT_USED
@@ -359,7 +361,8 @@ MultiTypes::wait_for_all_consumers (int expected_count_per_consumer)
         break;
 
       {
-        if (this->orb_->work_pending ())
+        ACE_Time_Value tv (0,1000);
+        if (this->orb_->work_pending (tv))
           this->orb_->perform_work ();
       }
     }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
index a0f5568f540..79a85b158eb 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
@@ -78,7 +78,9 @@ $Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
                                 "-o $namingior");
 unlink $namingior;
 
-$Naming->Spawn ();
+if ($Naming->Spawn () == -1) {
+  exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($namingior, $startup_timeout) == -1) {
   print STDERR "ERROR: waiting for the naming service to start\n";
@@ -96,20 +98,20 @@ for $config (@test_configs)
                                           "-ORBSvcConf $config");
     unlink $notifyior;
     $Notification->Spawn ();
-    
+
     if (PerlACE::waitforfile_timed ($notifyior, $startup_timeout) == -1) {
       print STDERR "ERROR: waiting for the notify service to start\n";
       $Notification->Kill ();
       $Naming->Kill ();
       exit 1;
     }
-    
+
     for $name (@tests)
       {
         ## The MaxQueueLength and MaxEventsPerConsumer are not supported in the Reactive
         ## configuration, so we skip this test for now.
         ## The Notification should actually throw an exception for the property not supported.
-        if ($name->{name} eq "AdminProperties" 
+        if ($name->{name} eq "AdminProperties"
             && ($config eq "notify.reactive.conf" || $config eq "notify.rt.conf"))
           {
             next;
@@ -123,13 +125,13 @@ for $config (@test_configs)
 
         $status = $test->WaitKill ($experiment_timeout);
 
-        if ($status != 0) 
+        if ($status != 0)
           {
             print STDERR "ERROR: $name returned $status\n";
             break;
           }
       }
-    
+
     $Notification->Kill ();
   }
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
index c88d7dc082d..b842263a6f4 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
@@ -46,7 +46,7 @@ Any_String (const CORBA::Any& any)
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
-      ACE_static_cast(double, ACE_static_cast (CORBA::LongLong, ull));
+      static_cast<double> (static_cast<CORBA::LongLong> (ull));
 # else
               ull;
 # endif /* ACE_CONFIG_WIN32_H */
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/notify.conf b/TAO/orbsvcs/tests/Notify/Blocking/notify.conf
index 898f35bb38d..81d7ba362a7 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Blocking/notify.conf
@@ -2,4 +2,4 @@
 
 ## Load the static Cos Notification Service
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
-static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching -DispatchingThreads 1 -MTSourceEval"x
\ No newline at end of file
+static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching -DispatchingThreads 1 -MTSourceEval"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl
index d2c6c3d90cc..aa518f5ef55 100755
--- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl
@@ -30,8 +30,14 @@ $STC = new PerlACE::Process ("Structured_Consumer");
 
 $client_args = "-ORBInitRef NameService=iioploc://localhost:" .
                "$port/NameService";
-$NS->Spawn ();
-$TS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
+
+if ($TS->Spawn () == -1) {
+    $NS->Kill ();
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) {
     print STDERR "ERROR: waiting for the notify service to start\n";
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
index c88d7dc082d..b842263a6f4 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
@@ -46,7 +46,7 @@ Any_String (const CORBA::Any& any)
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
-      ACE_static_cast(double, ACE_static_cast (CORBA::LongLong, ull));
+      static_cast<double> (static_cast<CORBA::LongLong> (ull));
 # else
               ull;
 # endif /* ACE_CONFIG_WIN32_H */
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
index 4ab749ddb0a..dfe8731838e 100755
--- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
@@ -47,8 +47,14 @@ $SEC = new PerlACE::Process ("Sequence_Consumer");
 
 $client_args = "-ORBInitRef NameService=iioploc://localhost:" .
                "$port/NameService";
-$NS->Spawn ();
-$TS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
+
+if ($TS->Spawn () == -1) {
+    $NS->Kill ();
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) {
     print STDERR "ERROR: waiting for the notify service to start\n";
@@ -82,7 +88,7 @@ for($i = 0; $i <= $#policies; $i++) {
   }
 
   $STC->Arguments($client_args . " -d $discard_policy");
-  $client = $STC->SpawnWaitKill (60);
+  $client = $STC->SpawnWaitKill (200);
 
   $STS->Kill ();
   if ($client != 0) {
@@ -112,7 +118,7 @@ if ($status == 0) {
     }
 
     $SEC->Arguments($client_args . " -d $discard_policy");
-    $client = $SEC->SpawnWaitKill (60);
+    $client = $SEC->SpawnWaitKill (200);
 
     $SES->Kill ();
     if ($client != 0) {
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
index 7d47e3d10ad..f484f45ddbe 100755
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
@@ -37,7 +37,9 @@ $Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$s
 #$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
 
 unlink $naming_ior;
-$Naming->Spawn ();
+if ($Naming->Spawn () == -1) {
+  exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
   print STDERR "ERROR: waiting for the naming service to start\n";
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
index dc8b5123b32..732fb9bb9da 100755
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
@@ -10,44 +10,45 @@ use PerlACE::Run_Test;
 
 $experiment_timeout = 60;
 $startup_timeout = 60;
+$shutdown_timeout = 10;
 $notify_ior = PerlACE::LocalFile ("notify.ior");
 $naming_ior = PerlACE::LocalFile ("naming.ior");
 $supplier_ior = PerlACE::LocalFile ("supplier.ior");
 $status = 0;
 
-@tests = 
+@tests =
   (
    {
     description => "no threads",
-    config => "notify_nothreads$PerlACE::svcconf_ext", 
+    config => "notify_nothreads$PerlACE::svcconf_ext",
     supplier => " -c 10 -f",
     consumer => " -c 2 -f -e 48",
    },
    {
     description => "multi-threaded dispatching",
-    config => "notify_mtdispatching$PerlACE::svcconf_ext", 
+    config => "notify_mtdispatching$PerlACE::svcconf_ext",
     supplier => " ",
     consumer => " ",
    },
    {
     description => "multi-threaded proxy consumers",
-    config => "notify_mtsource$PerlACE::svcconf_ext", 
+    config => "notify_mtsource$PerlACE::svcconf_ext",
     supplier => " ",
     consumer => " -c 2 -f",
    },
    {
     description => "multi-threaded proxy suppliers",
-    config => "notify_mtlistener$PerlACE::svcconf_ext", 
+    config => "notify_mtlistener$PerlACE::svcconf_ext",
     supplier => " -c 10 -f",
     consumer => " -c 1 -e 60",
    },
   );
 
-@tests2 = 
+@tests2 =
   (
    {
     description => "multi-threaded dispatching",
-    config => "notify_mtdispatching$PerlACE::svcconf_ext", 
+    config => "notify_mtdispatching$PerlACE::svcconf_ext",
     supplier => " ",
     consumer => " ",
    }
@@ -77,6 +78,9 @@ if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
 
 for $test (@tests)
   {
+    $Supplier->Arguments ("-ORBInitRef NameService=file://$naming_ior ");
+    $Consumer->Arguments ("-ORBInitRef NameService=file://$naming_ior ");
+
     print STDERR "\nTesting $test->{description} ....\n\n";
 
     unlink $notify_ior;
@@ -84,20 +88,20 @@ for $test (@tests)
     $args = $Notification->Arguments ();
     print STDERR "Running Notification with arguments: $args\n";
     $Notification->Spawn ();
-    
+
     if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) {
       print STDERR "ERROR: waiting for the notify service to start\n";
       $Notification->Kill ();
       $Naming->Kill ();
       exit 1;
     }
-    
+
     unlink $supplier_ior;
     $Supplier->Arguments ($Supplier->Arguments () . $test->{supplier});
     $args = $Supplier->Arguments ();
     print STDERR "Running Supplier with arguments: $args\n";
     $Supplier->Spawn ();
-    
+
     if (PerlACE::waitforfile_timed ($supplier_ior, $startup_timeout) == -1) {
       print STDERR "ERROR: waiting for the supplier to start\n";
       $Supplier->Kill ();
@@ -105,13 +109,13 @@ for $test (@tests)
       $Naming->Kill ();
       exit 1;
     }
-    
+
     $Consumer->Arguments ($Consumer->Arguments () . $test->{consumer});
     $args = $Consumer->Arguments ();
     print STDERR "Running Consumer with arguments: $args\n";
     $status = $Consumer->SpawnWaitKill ($experiment_timeout);
 
-    if ($status != 0) 
+    if ($status != 0)
       {
         print STDERR "ERROR: Consumer returned $status\n";
         $Supplier->Kill ();
@@ -120,13 +124,13 @@ for $test (@tests)
         exit 1;
       }
 
-    $Supplier->Kill ();
+    $Supplier->WaitKill ($shutdown_timeout);
     unlink $supplier_ior;
 
     $Notification->Kill ();
     unlink $notify_ior;
   }
-    
+
 $Naming->Kill ();
 unlink $naming_ior;
 
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index 94fdf02c5c1..fa8e6915799 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -101,14 +101,14 @@ Notify_Sequence_Push_Consumer::push_structured_events (
                   else
                     {
                       if (current >
-                          ACE_static_cast (CORBA::Short, previous))
+                          static_cast<CORBA::Short> (previous))
                         {
                           this->done_ = 1;
                           ACE_ERROR ((LM_ERROR,
                                       ACE_TEXT ("ERROR: Priority Ordering failed\n")));
                         }
                     }
-                  previous = ACE_static_cast (long, current);
+                  previous = static_cast<long> (current);
                 }
             }
           else if (this->order_policy_ == CosNotification::DeadlineOrder)
@@ -125,7 +125,7 @@ Notify_Sequence_Push_Consumer::push_structured_events (
                   else
                     {
                       if (current <
-                          ACE_static_cast (TimeBase::TimeT, previous))
+                          static_cast<TimeBase::TimeT> (previous))
                         {
                           this->done_ = 1;
                           ACE_ERROR ((LM_ERROR,
@@ -133,7 +133,7 @@ Notify_Sequence_Push_Consumer::push_structured_events (
                         }
                     }
 # if defined (ACE_CONFIG_WIN32_H)
-                  previous = ACE_static_cast (long, current);
+                  previous = static_cast<long> (current);
 # else
                   // Convert ACE_ULong_Long to 32-bit integer
                   previous = (current / 1);
@@ -164,14 +164,14 @@ Notify_Sequence_Push_Consumer::push_structured_events (
                   else
                     {
                       if (current <
-                          ACE_static_cast (CORBA::ULong, previous))
+                          static_cast<CORBA::ULong> (previous))
                         {
                           this->done_ = 1;
                           ACE_ERROR ((LM_ERROR,
                                       ACE_TEXT ("ERROR: FIFO Ordering failed.\n")));
                         }
                     }
-                  previous = ACE_static_cast (long, current);
+                  previous = static_cast<long> (current);
                 }
             }
         }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 0e2973152ad..db220185da7 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -99,14 +99,14 @@ Notify_Structured_Push_Consumer::push_structured_event (
                   else
                     {
                       if (current >
-                          ACE_static_cast (CORBA::Short, previous))
+                          static_cast<CORBA::Short> (previous))
                         {
                           this->done_ = 1;
                           ACE_ERROR ((LM_ERROR,
                                       ACE_TEXT ("ERROR: Priority Ordering failed.\n")));
                         }
                     }
-                  previous = ACE_static_cast (long, current);
+                  previous = static_cast<long> (current);
                 }
             }
           else if (this->order_policy_ == CosNotification::DeadlineOrder)
@@ -123,7 +123,7 @@ Notify_Structured_Push_Consumer::push_structured_event (
                   else
                     {
                       if (current <
-                          ACE_static_cast (TimeBase::TimeT, previous))
+                          static_cast<TimeBase::TimeT> (previous))
                         {
                           this->done_ = 1;
                           ACE_ERROR ((LM_ERROR,
@@ -131,7 +131,7 @@ Notify_Structured_Push_Consumer::push_structured_event (
                         }
                     }
 # if defined (ACE_CONFIG_WIN32_H)
-                  previous = ACE_static_cast (long, current);
+                  previous = static_cast<long> (current);
 # else
                   // Convert ACE_ULong_Long to 32-bit integer
                   previous = (current / 1);
@@ -162,14 +162,14 @@ Notify_Structured_Push_Consumer::push_structured_event (
                   else
                     {
                       if (current <
-                          ACE_static_cast (CORBA::ULong, previous))
+                          static_cast<CORBA::ULong> (previous))
                         {
                           this->done_ = 1;
                           ACE_ERROR ((LM_ERROR,
                                       ACE_TEXT ("ERROR: FIFO Ordering failed.\n")));
                         }
                     }
-                  previous = ACE_static_cast (long, current);
+                  previous = static_cast<long> (current);
                 }
             }
         }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
index c88d7dc082d..b842263a6f4 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
@@ -46,7 +46,7 @@ Any_String (const CORBA::Any& any)
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
-      ACE_static_cast(double, ACE_static_cast (CORBA::LongLong, ull));
+      static_cast<double> (static_cast<CORBA::LongLong> (ull));
 # else
               ull;
 # endif /* ACE_CONFIG_WIN32_H */
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
index 9c98034a9d0..14d607abc42 100755
--- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
@@ -47,8 +47,14 @@ $SEC = new PerlACE::Process ("Sequence_Consumer");
 
 $client_args = "-ORBInitRef NameService=iioploc://localhost:" .
                "$port/NameService";
-$NS->Spawn ();
-$TS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
+
+if ($TS->Spawn () == -1) {
+    $NS->Kill ();
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) {
     print STDERR "ERROR: waiting for the notify service to start\n";
@@ -92,7 +98,7 @@ for($i = 0; $i <= $#policies; $i++) {
 }
 
 ## // pradeep: commented out priority policies temporarily till the sequences implementation is fixed.
-@policies_seq = ("fifo"); 
+@policies_seq = ("fifo");
 
 if ($status == 0) {
   for($i = 0; $i <= $#policies_seq; $i++) {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
index c88d7dc082d..b842263a6f4 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
@@ -46,7 +46,7 @@ Any_String (const CORBA::Any& any)
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
-      ACE_static_cast(double, ACE_static_cast (CORBA::LongLong, ull));
+      static_cast<double> (static_cast<CORBA::LongLong> (ull));
 # else
               ull;
 # endif /* ACE_CONFIG_WIN32_H */
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
index 7e18cde92f8..5f25db11995 100755
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
@@ -30,8 +30,14 @@ $SEC = new PerlACE::Process ("Sequence_Consumer");
 
 $client_args = "-ORBInitRef NameService=iioploc://localhost:" .
                "$port/NameService";
-$NS->Spawn ();
-$TS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
+
+if ($TS->Spawn () == -1) {
+    $NS->Kill ();
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) {
     print STDERR "ERROR: waiting for the notify service to start\n";
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index a6c6bac9662..c37050f53c7 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -182,7 +182,8 @@ SendEvents (void)
 
       ACE_TRY_NEW_ENV
         {
-cout << "Sending events" << endl;
+          ACE_DEBUG ((LM_DEBUG, "Sending events.\n"));
+
           supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
index c88d7dc082d..b842263a6f4 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
@@ -46,7 +46,7 @@ Any_String (const CORBA::Any& any)
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
-      ACE_static_cast(double, ACE_static_cast (CORBA::LongLong, ull));
+      static_cast<double> (static_cast<CORBA::LongLong> (ull));
 # else
               ull;
 # endif /* ACE_CONFIG_WIN32_H */
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
index 095235dd559..2079ccd1d2f 100755
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
@@ -30,8 +30,14 @@ $SEC = new PerlACE::Process ("Sequence_Consumer");
 
 $client_args = "-ORBInitRef NameService=iioploc://localhost:" .
                "$port/NameService";
-$NS->Spawn ();
-$TS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
+
+if ($TS->Spawn () == -1) {
+    $NS->Kill ();
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) {
     print STDERR "ERROR: waiting for the notify service to start\n";
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
index 739b6e0326a..00236af4af5 100755
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
@@ -32,8 +32,14 @@ $cargs = "-f -n100 -c2 ";
 print "*************** Running Structured Client Filter Test ****************\n";
 
 # Start Naming Service
-$NS->Spawn ();
-$TS->Spawn ();
+if ($NS->Spawn () == -1) {
+    exit 1;
+}
+
+if ($TS->Spawn () == -1) {
+    $NS->Kill ();
+    exit 1;
+}
 
 sleep 2;
 
@@ -65,6 +71,7 @@ $NS->Kill ();
 unlink $ior;
 unlink $notifyior;
 
+sleep 2;
 
 print "*************** Running Structured Client No Filters Test ****************\n";
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index d2706a70453..3aef9fadfda 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -122,7 +122,7 @@ Any_String (const CORBA::Any& any)
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
-      ACE_static_cast(double, ACE_static_cast (CORBA::LongLong, ull));
+      static_cast<double> (static_cast<CORBA::LongLong> (ull));
 # else
               ull;
 # endif /* ACE_CONFIG_WIN32_H */
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
index 9ad71678ee9..a2afe852aee 100755
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
@@ -77,6 +77,8 @@ foreach $ops (@ops)
     $TS->Kill ();
     $NS->Kill ();
 
+    sleep 2;
+
     unlink $ior;
     unlink $notifyior;
 
@@ -114,6 +116,8 @@ foreach $ops (@ops)
     $TS->Kill ();
     $NS->Kill ();
 
+    sleep 2;
+
     unlink $ior;
     unlink $notifyior;
   }
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
index d5c758f77b3..9314ad0aacd 100755
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
@@ -35,7 +35,9 @@ $Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$s
 #$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
 
 unlink $naming_ior;
-$Naming->Spawn ();
+if ($Naming->Spawn () == -1) {
+  exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
   print STDERR "ERROR: waiting for the naming service to start\n";
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index d942c85c1af..9441287f68b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -4,10 +4,6 @@
 
 #include "Consumer_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Consumer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Tests_Consumer_T, "$Id$")
 
 template <class Consumer_Traits>
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 4804b2ead14..82f23b0af2a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -86,10 +86,6 @@ protected:
       ));
 };
 
-#if defined (__ACE_INLINE__)
-#include "Consumer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Consumer_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.inl b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index 610e6b02e79..1f927ae6927 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -19,12 +19,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
-#include "ace/Task.h"
+#include "Driver_Base.h"
 
 #include "tao/ORB.h"
 
-#include "Driver_Base.h"
+#include "ace/Service_Config.h"
+#include "ace/Task.h"
+#include "ace/SString.h"
+
 
 class TAO_Notify_Tests_Command_Builder;
 class TAO_Notify_Tests_Activation_Manager;
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index f7b0065ef52..075b6ff1345 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -259,4 +259,7 @@ template class ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX>;
 
 #pragma instantiate ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX>
 
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<TAO_Notify_Tests_LookupManager, ACE_Thread_Mutex> *ACE_Singleton<TAO_Notify_Tests_LookupManager, ACE_Thread_Mutex>::singleton_;
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 279291b2db2..c078bdc6c35 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -5,12 +5,8 @@
 
 #include "Peer_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Peer_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Notify, 
-           TAO_Notify_Tests_Peer_T, 
+ACE_RCSID (Notify,
+           TAO_Notify_Tests_Peer_T,
            "$Id$")
 
 #include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index 8f1b20fd6c1..1d47655f069 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -109,10 +109,6 @@ protected:
    ACE_TYPENAME Proxy_Traits::ID proxy_id_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Peer_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Peer_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.inl b/TAO/orbsvcs/tests/Notify/lib/Peer_T.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 66d655dd9b6..efa4eb67f71 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -12,8 +12,8 @@
 #include "LookupManager.h"
 #include "Priority_Mapping.h"
 
-ACE_RCSID (RT_Notify, 
-           TAO_Notify_Tests_Periodic_Consumer, 
+ACE_RCSID (RT_Notify,
+           TAO_Notify_Tests_Periodic_Consumer,
            "$Id$")
 
 int WARMUP_COUNT = 10;
@@ -234,6 +234,8 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification
   // Eat CPU
   static CORBA::ULong prime_number = 9619;
 
+  (void)ACE::gcd (prime_number, prime_number/2 -1);
+
   for (CORBA::ULong load = this->load_; load != 0; --load)
     ACE::is_prime (prime_number,
                    2,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index f637105b924..fbefb088c45 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -352,3 +352,13 @@ TAO_Notify_Tests_Periodic_Supplier::dump_stats (ACE_TCHAR* msg, int dump_samples
 
   stats_.dump_samples (fname.c_str (), buf, dump_samples);
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+
+template ACE_Singleton<Base_Time, ACE_Thread_Mutex> *ACE_Singleton<Base_Time, ACE_Thread_Mutex>::singleton_;
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index ff8bf789324..3641ca65f32 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -4,10 +4,6 @@
 
 #include "Supplier_T.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Supplier_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Notify, TAO_Notify_Tests_Supplier_T, "$Id$")
 
 template <class Supplier_Traits>
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index bc27f0954bb..54d2faba200 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -87,10 +87,6 @@ protected:
       ));
 };
 
-#if defined (__ACE_INLINE__)
-#include "Supplier_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Supplier_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.inl b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
index 1f1fd62aed5..3be923f7f73 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
@@ -9,8 +9,7 @@ Task_Stats::diff_sec (ACE_UINT64 before, ACE_UINT64 after)
 #if defined ACE_LACKS_LONGLONG_T
     (after - before) / gsf_;
 #else  /* ! ACE_LACKS_LONGLONG_T */
-  ACE_static_cast (double,
-                   ACE_UINT64_DBLCAST_ADAPTER((after - before) / gsf_));
+  static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER((after - before) / gsf_));
 #endif /* ! ACE_LACKS_LONGLONG_T */
   seconds /= ACE_HR_SCALE_CONVERSION;
 
diff --git a/TAO/orbsvcs/tests/Notify/notify_tests.GNU b/TAO/orbsvcs/tests/Notify/notify_tests.GNU
deleted file mode 100644
index 55fd30cf018..00000000000
--- a/TAO/orbsvcs/tests/Notify/notify_tests.GNU
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Id$
-##################################################################
-# This GNU file is for Notify tests only. It is a collosal waste to
-# include the list of libraries in every makefile in the test.
-##################################################################
-LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_ObjRefTemplate -lTAO_Valuetype -lTAO
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
index c88d7dc082d..b842263a6f4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
@@ -46,7 +46,7 @@ Any_String (const CORBA::Any& any)
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
-      ACE_static_cast(double, ACE_static_cast (CORBA::LongLong, ull));
+      static_cast<double> (static_cast<CORBA::LongLong> (ull));
 # else
               ull;
 # endif /* ACE_CONFIG_WIN32_H */
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
index 7dbaa140fca..5f9ff405110 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
@@ -36,7 +36,9 @@ $SEC = new PerlACE::Process ("Sequence_Consumer");
 $client_args = "-ORBInitRef NameService=iioploc://localhost:" .
                "$port/NameService";
 $NS->Spawn ();
+print $NS->CommandLine ()."\n";
 $TS->Spawn ();
+print $TS->CommandLine ()."\n";
 
 if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) {
     print STDERR "ERROR: waiting for the notify service to start\n";
@@ -49,6 +51,7 @@ print "********* Running Structured Consumer with two " .
       "consumers and no filter *******\n";
 
 unlink $ior;
+print $STS->CommandLine ()."\n";
 $STS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($ior, 20) == -1) {
@@ -61,6 +64,7 @@ if (PerlACE::waitforfile_timed ($ior, 20) == -1) {
 
 if ($status == 0) {
   $STC->Arguments($client_args);
+  print $STC->CommandLine ()."\n";
   $client = $STC->SpawnWaitKill (60);
   print "\n";
 
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 88e2b054e22..bfc5efa2dd0 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -58,7 +58,7 @@ Client::init (int argc,
 
   if (CORBA::is_nil (this->propsetdef_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Couldnot resolve propsetdef in Naming server"),
+                       "Could not resolve propsetdef in Naming server"),
                       -1);
 
   return 0;
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
index f964cd99f21..92ea6cc74f6 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
@@ -29,13 +29,11 @@
 //
 
 Object1_impl::Object1_impl()
-  throw (CORBA::SystemException)
 {
 }
 
 
 Object1_impl::~Object1_impl()
-  throw (CORBA::SystemException)
 {
 }
 
@@ -44,7 +42,7 @@ void Object1_impl::method1(const char* activity,
     CORBA::Long seconds,
     char* &output
     ACE_ENV_ARG_DECL_NOT_USED)
-  throw (testSched::testSchedException)
+  ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException))
 {
   const int scale_factor = 2000;
   int work;
@@ -59,8 +57,6 @@ void Object1_impl::method1(const char* activity,
                    activity);
   ACE_DEBUG((LM_DEBUG,"%s",buf));
 
-
-
   if (ACE_OS::strcmp(activity,"Client1") == 0)
     {
        ACE_OS::sleep(5);
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
index 84c5d0c9b4f..c13c2fc78f4 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
@@ -29,18 +29,16 @@ class Object1_impl : public POA_testSched::Object1,
                      public PortableServer::RefCountServantBase
 {
   public:
-    Object1_impl()
-      throw (CORBA::SystemException);
+    Object1_impl();
 
-    virtual ~Object1_impl()
-      throw (CORBA::SystemException);
+    virtual ~Object1_impl();
 
     virtual void method1(const char *activity,
                          CORBA::Long seconds,
                          char *&output
                          ACE_ENV_ARG_DECL_WITH_DEFAULTS
                          )
-      throw (testSched::testSchedException);
+      ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException));
 };
 
 #endif /* Object1_I_H  */
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index ae46946ce65..c9f93d5baea 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -26,14 +26,15 @@
 #include "ace/Get_Opt.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdio.h"
 
-
-char *node_        = NULL;
-char *file_        = NULL;
-char *shared_file_ = NULL;
-char *object_      = NULL;
+const char *ior_output_file = "server.ior";
+char *node_        = 0;
+char *file_        = 0;
+char *shared_file_ = 0;
+char *object_      = 0;
 int num_threads_   = 5;
-int use_realtime_    = 1;
+int use_realtime_  = 1;
 
 // ORB Thread
 
@@ -105,13 +106,13 @@ parse_args (int argc, char *argv[])
 
         }
      }
-  if (node_ == NULL)
+  if (node_ == 0)
     node_ = ACE_OS::strdup("1");
-  if (file_ == NULL)
+  if (file_ == 0)
     file_ = ACE_OS::strdup("schedule.cfg");
-  if (shared_file_ == NULL)
+  if (shared_file_ == 0)
     shared_file_ = ACE_OS::strdup("Scheduling_Service_Shared_Memory");
-  if (object_ == NULL)
+  if (object_ == 0)
     object_ = ACE_OS::strdup("Server2");
 
   return 0;
@@ -199,9 +200,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       ACE_TRY_CHECK;
 
 
-      ofstream server_IOR_file ("server.ior");
-      server_IOR_file << testObject_IORString.in () << endl;
-
+      // If the ior_output_file exists, output the ior to it
+      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", testObject_IORString.in ());
+      ACE_OS::fclose (output_file);
 
       if (use_realtime_)
         {
@@ -220,8 +227,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
           ACE_ENDTRY;
         }
 
-
-      /// Activate the manager and run the event loop
+      // Activate the manager and run the event loop
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       // Need to set the main thread pthread scope and pthread policy to
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 2737124fdf9..793c624def1 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -18,10 +18,10 @@ ACE_RCSID (Sched_Conf,
 const char* service_name = "ScheduleService";
 
 const char* format_string = " {%-12s, %d, %d, %d, %d, %8d, "
-  " ACE_static_cast (RtecScheduler::Criticality_t, %d), "
-  " ACE_static_cast (RtecScheduler::Importance_t, %d), "
+  " static_cast<RtecScheduler::Criticality_t> (%d), "
+  " static_cast<RtecScheduler::Importance_t> (%d), "
   " %d, %d, %3d, %d, %d, "
-  "ACE_static_cast (RtecScheduler::Info_Type_t, %d)}\n";
+  "static_cast<RtecScheduler::Info_Type_t> (%d)}\n";
 
 int
 parse_args (int argc, char *argv [])
@@ -393,15 +393,15 @@ main (int argc, char *argv[])
           // initialize the RT_Info
           ACE_Scheduler_Factory::server ()->
             set (config_infos[i].handle,
-                 ACE_static_cast (RtecScheduler::Criticality_t, config_infos[i].criticality),
+                 static_cast<RtecScheduler::Criticality_t> (config_infos[i].criticality),
                  config_infos[i].worst_case_execution_time,
                  config_infos[i].typical_execution_time,
                  config_infos[i].cached_execution_time,
                  config_infos[i].period,
-                 ACE_static_cast (RtecScheduler::Importance_t, config_infos[i].importance),
+                 static_cast<RtecScheduler::Importance_t> (config_infos[i].importance),
                  config_infos[i].quantum,
                  config_infos[i].threads,
-                 ACE_static_cast (RtecScheduler::Info_Type_t, config_infos[i].info_type)
+                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type)
                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index fff85f45219..f0a0e311993 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -16,10 +16,10 @@ ACE_RCSID(Sched_Conf, Sched_Conf_Anomalies, "$Id$")
 const char* service_name = "ScheduleService";
 
 const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, "
-                            "ACE_static_cast (RtecScheduler::Criticality_t, %d), "
-                            "ACE_static_cast (RtecScheduler::Importance_t, %d), "
+                            "static_cast<RtecScheduler::Criticality_t> (%d), "
+                            "static_cast<RtecScheduler::Importance_t> (%d), "
                             "%d, %d, %3d, %d, %d, "
-                            "ACE_static_cast (RtecScheduler::Info_Type_t, %d)}\n";
+                            "static_cast<RtecScheduler::Info_Type_t> (%d)}\n";
 
 int
 parse_args (int argc, char *argv [])
@@ -244,18 +244,15 @@ main (int argc, char *argv[])
           // initialize the RT_Info
           ACE_Scheduler_Factory::server ()->
             set (config_infos[i].handle,
-                 ACE_static_cast (RtecScheduler::Criticality_t,
-                                  config_infos[i].criticality),
+                 static_cast<RtecScheduler::Criticality_t> (config_infos[i].criticality),
                  config_infos[i].worst_case_execution_time,
                  config_infos[i].typical_execution_time,
                  config_infos[i].cached_execution_time,
                  config_infos[i].period,
-                 ACE_static_cast (RtecScheduler::Importance_t,
-                                  config_infos[i].importance),
+                 static_cast<RtecScheduler::Importance_t> (config_infos[i].importance),
                  config_infos[i].quantum,
                  config_infos[i].threads,
-                 ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  config_infos[i].info_type)
+                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type)
                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index b6107a0a062..12692c53c26 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -93,9 +93,9 @@ main (int argc, char *argv[])
           ACE_ASSERT (rt_info->period ==
             infos [i].period);
           ACE_ASSERT (rt_info->criticality ==
-            ACE_static_cast (RtecScheduler::Criticality_t, infos [i].criticality));
+            static_cast<RtecScheduler::Criticality_t> (infos [i].criticality));
           ACE_ASSERT (rt_info->importance ==
-            ACE_static_cast (RtecScheduler::Importance_t, infos [i].importance));
+            static_cast<RtecScheduler::Importance_t> (infos [i].importance));
           ACE_ASSERT (rt_info->quantum ==
             infos [i].quantum);
           ACE_ASSERT (rt_info->threads ==
@@ -107,23 +107,20 @@ main (int argc, char *argv[])
           ACE_ASSERT (rt_info->preemption_priority ==
             infos [i].preemption_priority);
           ACE_ASSERT (rt_info->info_type ==
-            ACE_static_cast (RtecScheduler::Info_Type_t, infos [i].info_type));
+            static_cast<RtecScheduler::Info_Type_t> (infos [i].info_type));
 
           // Make sure the values in the scheduler's internal RT_Info are OK.
           // Scheduler will generate messages if any values don't match.
           runtime_scheduler->set (infos [i].handle,
-                                  ACE_static_cast (RtecScheduler::Criticality_t,
-                                                   infos [i].criticality),
+                                  static_cast<RtecScheduler::Criticality_t> (infos [i].criticality),
                                   infos [i].worst_case_execution_time,
                                   infos [i].typical_execution_time,
                                   infos [i].cached_execution_time,
                                   infos [i].period,
-                                  ACE_static_cast (RtecScheduler::Importance_t,
-                                                   infos [i].importance),
+                                  static_cast<RtecScheduler::Importance_t> (infos [i].importance),
                                   infos [i].quantum,
                                   infos [i].threads,
-                                  ACE_static_cast (RtecScheduler::Info_Type_t,
-                                                   infos [i].info_type)
+                                  static_cast<RtecScheduler::Info_Type_t> (infos [i].info_type)
                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
index 3c213283f2e..b0fa2c85cbd 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
@@ -10,37 +10,37 @@
 
 
 static ACE_Scheduler_Factory::POD_RT_Info infos[] = {
- {"high_20_S" , 1, 5000, 5000, 5000,   500000,  ACE_static_cast (RtecScheduler::Criticality_t, 3),  ACE_static_cast (RtecScheduler::Importance_t, 1),  0, 1,  15, 11, 0, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"high_20_S" , 1, 5000, 5000, 5000,   500000,  static_cast<RtecScheduler::Criticality_t> (3),  static_cast<RtecScheduler::Importance_t> (1),  0, 1,  15, 11, 0, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"low_20_S"  , 2, 5000, 5000, 5000,   500000,  ACE_static_cast (RtecScheduler::Criticality_t, 1),  ACE_static_cast (RtecScheduler::Importance_t, 3),  0, 1,   2, 11, 1, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"low_20_S"  , 2, 5000, 5000, 5000,   500000,  static_cast<RtecScheduler::Criticality_t> (1),  static_cast<RtecScheduler::Importance_t> (3),  0, 1,   2, 11, 1, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"high_10_S" , 3, 10000, 10000, 10000,  1000000,  ACE_static_cast (RtecScheduler::Criticality_t, 3),  ACE_static_cast (RtecScheduler::Importance_t, 1),  0, 1,  15, 8, 0, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"high_10_S" , 3, 10000, 10000, 10000,  1000000,  static_cast<RtecScheduler::Criticality_t> (3),  static_cast<RtecScheduler::Importance_t> (1),  0, 1,  15, 8, 0, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"low_10_S"  , 4, 10000, 10000, 10000,  1000000,  ACE_static_cast (RtecScheduler::Criticality_t, 1),  ACE_static_cast (RtecScheduler::Importance_t, 3),  0, 1,   2, 8, 1, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"low_10_S"  , 4, 10000, 10000, 10000,  1000000,  static_cast<RtecScheduler::Criticality_t> (1),  static_cast<RtecScheduler::Importance_t> (3),  0, 1,   2, 8, 1, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"high_05_S" , 5, 20000, 20000, 20000,  2000000,  ACE_static_cast (RtecScheduler::Criticality_t, 3),  ACE_static_cast (RtecScheduler::Importance_t, 1),  0, 1,  15, 5, 0, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"high_05_S" , 5, 20000, 20000, 20000,  2000000,  static_cast<RtecScheduler::Criticality_t> (3),  static_cast<RtecScheduler::Importance_t> (1),  0, 1,  15, 5, 0, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"low_05_S"  , 6, 20000, 20000, 20000,  2000000,  ACE_static_cast (RtecScheduler::Criticality_t, 1),  ACE_static_cast (RtecScheduler::Importance_t, 3),  0, 1,   2, 5, 1, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"low_05_S"  , 6, 20000, 20000, 20000,  2000000,  static_cast<RtecScheduler::Criticality_t> (1),  static_cast<RtecScheduler::Importance_t> (3),  0, 1,   2, 5, 1, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"high_01_S" , 7, 100000, 100000, 100000, 10000000,  ACE_static_cast (RtecScheduler::Criticality_t, 3),  ACE_static_cast (RtecScheduler::Importance_t, 1),  0, 0,  15, 2, 0, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"high_01_S" , 7, 100000, 100000, 100000, 10000000,  static_cast<RtecScheduler::Criticality_t> (3),  static_cast<RtecScheduler::Importance_t> (1),  0, 0,  15, 2, 0, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"low_01_S"  , 8, 100000, 100000, 100000, 10000000,  ACE_static_cast (RtecScheduler::Criticality_t, 1),  ACE_static_cast (RtecScheduler::Importance_t, 3),  0, 0,   2, 2, 1, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"low_01_S"  , 8, 100000, 100000, 100000, 10000000,  static_cast<RtecScheduler::Criticality_t> (1),  static_cast<RtecScheduler::Importance_t> (3),  0, 0,   2, 2, 1, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"high_20_C" , 9, 0, 0, 0,        0,  ACE_static_cast (RtecScheduler::Criticality_t, 3),  ACE_static_cast (RtecScheduler::Importance_t, 1),  0, 0,  15, 9, 0, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"high_20_C" , 9, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (3),  static_cast<RtecScheduler::Importance_t> (1),  0, 0,  15, 9, 0, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"low_20_C"  , 10, 0, 0, 0,        0,  ACE_static_cast (RtecScheduler::Criticality_t, 1),  ACE_static_cast (RtecScheduler::Importance_t, 3),  0, 0,   2, 9, 1, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"low_20_C"  , 10, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (1),  static_cast<RtecScheduler::Importance_t> (3),  0, 0,   2, 9, 1, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"high_10_C" , 11, 0, 0, 0,        0,  ACE_static_cast (RtecScheduler::Criticality_t, 3),  ACE_static_cast (RtecScheduler::Importance_t, 1),  0, 0,  15, 6, 0, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"high_10_C" , 11, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (3),  static_cast<RtecScheduler::Importance_t> (1),  0, 0,  15, 6, 0, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"low_10_C"  , 12, 0, 0, 0,        0,  ACE_static_cast (RtecScheduler::Criticality_t, 1),  ACE_static_cast (RtecScheduler::Importance_t, 3),  0, 0,   2, 6, 1, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"low_10_C"  , 12, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (1),  static_cast<RtecScheduler::Importance_t> (3),  0, 0,   2, 6, 1, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"high_05_C" , 13, 0, 0, 0,        0,  ACE_static_cast (RtecScheduler::Criticality_t, 3),  ACE_static_cast (RtecScheduler::Importance_t, 1),  0, 0,  15, 3, 0, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"high_05_C" , 13, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (3),  static_cast<RtecScheduler::Importance_t> (1),  0, 0,  15, 3, 0, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"low_05_C"  , 14, 0, 0, 0,        0,  ACE_static_cast (RtecScheduler::Criticality_t, 1),  ACE_static_cast (RtecScheduler::Importance_t, 3),  0, 0,   2, 3, 1, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"low_05_C"  , 14, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (1),  static_cast<RtecScheduler::Importance_t> (3),  0, 0,   2, 3, 1, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"high_01_C" , 15, 0, 0, 0,        0,  ACE_static_cast (RtecScheduler::Criticality_t, 3),  ACE_static_cast (RtecScheduler::Importance_t, 1),  0, 0,  15, 0, 0, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"high_01_C" , 15, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (3),  static_cast<RtecScheduler::Importance_t> (1),  0, 0,  15, 0, 0, static_cast<RtecScheduler::Info_Type_t> (0)}
 ,
- {"low_01_C"  , 16, 0, 0, 0,        0,  ACE_static_cast (RtecScheduler::Criticality_t, 1),  ACE_static_cast (RtecScheduler::Importance_t, 3),  0, 0,   2, 0, 1, ACE_static_cast (RtecScheduler::Info_Type_t, 0)}
+ {"low_01_C"  , 16, 0, 0, 0,        0,  static_cast<RtecScheduler::Criticality_t> (1),  static_cast<RtecScheduler::Importance_t> (3),  0, 0,   2, 0, 1, static_cast<RtecScheduler::Info_Type_t> (0)}
 
 };
 
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index a3e3c40cfdb..44eeca19e7d 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -2,12 +2,14 @@
 #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 char *ior = "file://test.ior";
+const char *cert_file = "cacert.pem";
 
 int
 parse_args (int argc, char *argv[])
@@ -41,6 +43,10 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
+      ACE_TString env ("SSL_CERT_FILE=");
+      env += cert_file;
+      ACE_OS::putenv (env.c_str ());
+
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl b/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
index 8c19e2c474c..c2806f6c246 100755
--- a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
@@ -16,7 +16,9 @@ unlink $file;
 $status = 0;
 
 # Set the SSL environment
-$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
+# This doesn't work on Windows.  For some reason,
+# environment variables aren't propagated to child processes.
+#$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
 
 $SV = new PerlACE::Process ("server",
 			    "-o $file -ORBSvcConf server$PerlACE::svcconf_ext");
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index cb55b47de58..a2a09539439 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -3,13 +3,14 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "ace/SString.h"
 
 ACE_RCSID (Big_Request,
            server,
            "$Id$")
 
 const char *ior_output_file = 0;
-
+const char *cert_file = "cacert.pem";
 
 int
 parse_args (int argc, char *argv[])
@@ -44,6 +45,10 @@ main (int argc, char * argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
+      ACE_TString env ("SSL_CERT_FILE=");
+      env += cert_file;
+      ACE_OS::putenv (env.c_str ());
+
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 983ce78144a..2ddfbc0be3d 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -1,17 +1,24 @@
 #include "ace/Log_Msg.h"
 #include "serverC.h"
 #include "client_i.h"
+#include "ace/SString.h"
 
 ACE_RCSID (Callback,
            client,
            "$Id$")
 
+const char *cert_file = "cacert.pem";
+
 int
 main (int argc, char *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
+      ACE_TString env ("SSL_CERT_FILE=");
+      env += cert_file;
+      ACE_OS::putenv (env.c_str ());
+
       //
       // Initialize the ORB
       //
diff --git a/TAO/orbsvcs/tests/Security/Callback/run_test.pl b/TAO/orbsvcs/tests/Security/Callback/run_test.pl
index b18cf0329fe..910425441aa 100755
--- a/TAO/orbsvcs/tests/Security/Callback/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Callback/run_test.pl
@@ -16,7 +16,9 @@ unlink $file;
 $status = 0;
 
 # Set the SSL environment
-$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
+# This doesn't work on Windows.  For some reason,
+# environment variables aren't propagated to child processes.
+#$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
 
 $SV = new PerlACE::Process ("server",
 			    "-o $file -ORBSvcConf server$PerlACE::svcconf_ext");
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index 9bce1428d73..881d7d2ca58 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -1,17 +1,24 @@
 #include "ace/Log_Msg.h"
 #include "server_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/SString.h"
 
 ACE_RCSID (Callback,
            server,
            "$Id$")
 
+const char *cert_file = "cacert.pem";
+
 int
 main (int argc, char *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
+      ACE_TString env ("SSL_CERT_FILE=");
+      env += cert_file;
+      ACE_OS::putenv (env.c_str ());
+
       //
       // Initialize the ORB
       //
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index e30b656e067..dd70e280f98 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/SString.h"
 #include "testC.h"
 
 ACE_RCSID (Send_File, 
@@ -10,6 +11,8 @@ ACE_RCSID (Send_File,
            "$Id$")
 
 const char *ior = "file://test.ior";
+const char *cert_file = "cacert.pem";
+
 CORBA::Boolean call_shutdown = 0;
 int wait_time = 10;
 
@@ -51,6 +54,10 @@ main (int argc, char *argv[])
 
   ACE_TRY
     {
+      ACE_TString env ("SSL_CERT_FILE=");
+      env += cert_file;
+      ACE_OS::putenv (env.c_str ());
+
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl b/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl
index a4810f3ec6b..512fc0883d9 100755
--- a/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl
@@ -22,7 +22,9 @@ $client_wait_time         = 15;
 $client_args = "-ORBSvcConf $client_conf -w $client_wait_time -k file://$iorfile";
 
 # Set the SSL environment
-$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
+# This doesn't work on Windows.  For some reason,
+# environment variables aren't propagated to child processes.
+#$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
 
 $SV = new PerlACE::Process ("server",
 			    "-o $iorfile " .
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index f731dee89db..c880f1e4858 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/SString.h"
 #include "test_i.h"
 
 ACE_RCSID (Send_File, 
@@ -10,6 +11,7 @@ ACE_RCSID (Send_File,
            "$Id$")
 
 const char *ior_output_file = 0;
+const char *cert_file = "cacert.pem";
 
 int
 parse_args (int argc, char *argv[])
@@ -43,6 +45,10 @@ main (int argc, char *argv[])
 
   ACE_TRY
     {
+      ACE_TString env ("SSL_CERT_FILE=");
+      env += cert_file;
+      ACE_OS::putenv (env.c_str ());
+
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index c2b447fab3a..1327787e434 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -56,8 +56,7 @@ Simple_Server_i::validate_protocol (ACE_ENV_SINGLE_ARG_DECL)
           // @@ Worst possible way to check. If SSLIOP had a tag
           // things would have been a  lot simpler.
           TAO::SSLIOP::Transport *ssl_t =
-            ACE_dynamic_cast (TAO::SSLIOP::Transport *,
-                              t);
+            dynamic_cast<TAO::SSLIOP::Transport *> (t);
 
           // There should be no SSL Transport
           if (ssl_t != 0)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 19a858e1241..82fe2335212 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -4,8 +4,10 @@
 #include "tao/debug.h"
 
 Client_Worker::Client_Worker (Simple_Server_ptr server,
+                              Another_One_ptr another,
                               int niterations)
   : server_ (Simple_Server::_duplicate(server)),
+    another_ (Another_One::_duplicate (another)),
     niterations_ (niterations)
 {
 }
@@ -22,6 +24,7 @@ Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TRY
         {
           this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
+          this->another_->test_method (j ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if(TAO_debug_level > 0)
             ACE_DEBUG (( LM_DEBUG,
@@ -48,7 +51,8 @@ Client_Worker::svc (void)
        for (int i = 0; i < this->niterations_; ++i)
          {
            this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
-           ACE_TRY_CHECK;
+           this->another_->test_method (i ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
            if (TAO_debug_level > 0)
              ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index 42c7f0195bc..65bd7f7fbb4 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -38,7 +38,9 @@ class Client_Worker : public ACE_Task_Base
   //
 
 public:
-  Client_Worker (Simple_Server_ptr server, int niterations);
+  Client_Worker (Simple_Server_ptr server,
+                 Another_One_ptr another,
+                 int niterations);
   // ctor
 
   virtual int svc (void);
@@ -52,6 +54,9 @@ private:
   Simple_Server_var server_;
   // The server.
 
+  Another_One_var another_;
+  // Another object served by the same server as server_.
+
   int niterations_;
   // The number of iterations on each client thread.
 };
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
index 48f43312e62..1e76f1acf6f 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*security server): orbsvcsexe, portableserver, ssl {
+project(*security server): orbsvcsexe, portableserver, ssl, iortable {
   Source_Files {
     Server_Worker.cpp
     test_i.cpp
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 5da628db89d..8ef6242213a 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -5,6 +5,8 @@
 
 
 const char *ior = "file://test.ior";
+char *another_ior = 0;
+
 int niterations = 5;
 int do_shutdown = 0;
 int nthreads = 5;
@@ -64,6 +66,12 @@ main (int argc, char *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
+      int len = ACE_OS::strlen(ior) + 1;
+      another_ior = new char[len + 1];
+      ACE_OS::strcpy(another_ior, ior);
+      another_ior[len-1] = '1';
+      another_ior[len] = '\0';
+
       // Get Object Reference using IOR file
       CORBA::Object_var object =
         orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
@@ -82,7 +90,19 @@ main (int argc, char *argv[])
         }
 
 
-      Client_Worker client (server.in (), niterations);
+      object =
+        orb->string_to_object (another_ior ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // Cast to Appropriate Type
+      Another_One_var another =
+        Another_One::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+
+      Client_Worker client (server.in (),
+                            another.in (),
+                            niterations);
 
       if (client.activate (THR_NEW_LWP | THR_JOINABLE, nthreads) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index 29c53ecb7b8..b05e356507c 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -1,25 +1,45 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "tao/IORTable/IORTable.h"
 #include "test_i.h"
 #include "Server_Worker.h"
 
 const char *ior_output_file = 0;
+char *another_output_file = 0;
+const char *ior_table_name = 0;
+char *another_table_name = 0;
 int nthreads = 4;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
+  ACE_Get_Opt get_opts (argc, argv, "i:o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
+      case 'i':
+        {
+          ior_table_name = get_opts.opt_arg ();
+          int len = ACE_OS::strlen(ior_table_name) + 1;
+          another_table_name = new char[len + 1];
+          ACE_OS::strcpy(another_table_name, ior_table_name);
+          another_table_name[len-1] = '1';
+          another_table_name[len] = '\0';
+          break;
+        }
       case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
+        {
+          ior_output_file = get_opts.opt_arg ();
+          int len = ACE_OS::strlen(ior_output_file) + 1;
+          another_output_file = new char[len + 1];
+          ACE_OS::strcpy(another_output_file, ior_output_file);
+          another_output_file[len-1] = '1';
+          another_output_file[len] = '\0';
+          break;
+        }
       case 'n':
         nthreads = ACE_OS::atoi (get_opts.opt_arg ());
         break;
@@ -28,6 +48,7 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
+                           "[-i <iortable name>]"
                            "-o <iorfile>"
                            "\n",
                            argv [0]),
@@ -71,17 +92,50 @@ main (int argc, char *argv[])
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
+      Another_One_i another_one_impl (orb.in());
 
       Simple_Server_var server =
         server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      Another_One_var another_one =
+        another_one_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       CORBA::String_var ior =
         orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      CORBA::String_var another_ior =
+        orb->object_to_string (another_one.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
+      ACE_DEBUG ((LM_DEBUG, "Activated another one as <%s>\n", another_ior.in ()));
+
+      if (ior_table_name != 0)
+        {
+          CORBA::Object_var table_object =
+             orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+
+          IORTable::Table_var adapter =
+             IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+
+          if (CORBA::is_nil (adapter.in ()))
+            {
+              ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
+              return -1;
+            }
+
+          adapter->bind ( ior_table_name, ior.in () ACE_ENV_ARG_PARAMETER);
+          adapter->bind ( another_table_name, another_ior.in() ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+        }
+
+
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
@@ -91,8 +145,20 @@ main (int argc, char *argv[])
                                "Cannot open output file for writing IOR: %s",
                                ior_output_file),
                               1);
+          ACE_DEBUG ((LM_DEBUG,"Wrote ior to %s\n",
+                      ior_output_file));
           ACE_OS::fprintf (output_file, "%s", ior.in ());
           ACE_OS::fclose (output_file);
+          output_file = ACE_OS::fopen (another_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               another_output_file),
+                              1);
+          ACE_DEBUG ((LM_DEBUG,"Wrote another ior to %s\n",
+                      another_output_file));
+          ACE_OS::fprintf (output_file, "%s", another_ior.in ());
+          ACE_OS::fclose (output_file);
         }
 
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
index aa227c3b110..3191d2be3e5 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
@@ -8,3 +8,8 @@ interface Simple_Server
 
   oneway void shutdown ();
 };
+
+interface Another_One
+{
+  long test_method (in long x);
+};
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index bb1a2f65639..ee3ebd33fa4 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -7,8 +7,8 @@
 #include "test_i.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (MT_Server, 
-           test_i, 
+ACE_RCSID (MT_Server,
+           test_i,
            "$Id$")
 
 CORBA::Long
@@ -16,7 +16,7 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n"));
+    ACE_DEBUG ((LM_DEBUG, "Simple_Server: Request in thread %t\n"));
   ACE_Time_Value tv (0, 15000);
   ACE_OS::sleep (tv);
   return x;
@@ -28,3 +28,16 @@ Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
+
+//---------------------------------------------------------------------------
+
+CORBA::Long
+Another_One_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG, "Another_One: Request in thread %t\n"));
+  ACE_Time_Value tv (0, 15000);
+  ACE_OS::sleep (tv);
+  return x;
+}
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index 65fa40ed8b2..e98f9db8850 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -42,6 +42,28 @@ private:
   // The ORB
 };
 
+
+class Another_One_i : public POA_Another_One
+{
+  // = TITLE
+  //   Simpler Server implementation
+  //
+  // = DESCRIPTION
+  //   Implements the Simple_Server interface in test.idl
+  //
+public:
+  Another_One_i (CORBA::ORB_ptr orb);
+  // ctor
+
+  // = The Simple_Server methods.
+  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  CORBA::ORB_var orb_;
+  // The ORB
+};
+
 #if defined(__ACE_INLINE__)
 #include "test_i.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.i b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.i
index 97524552ff4..9a32e7ec527 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.i
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.i
@@ -5,3 +5,9 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
+
+ACE_INLINE
+Another_One_i::Another_One_i (CORBA::ORB_ptr orb)
+  :  orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index ea861c51cd2..40877b8871f 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -4,12 +4,14 @@
 
 #include "FooC.h"
 #include "orbsvcs/SecurityC.h"
+#include "ace/SString.h"
 
 ACE_RCSID (Secure_Invocation,
            client,
            "$Id$")
 
 const char *ior = "file://test.ior";
+const char *cert_file = "cacert.pem";
 
 void
 insecure_invocation_test (CORBA::ORB_ptr orb,
@@ -137,6 +139,10 @@ main (int argc, char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
+      ACE_TString env ("SSL_CERT_FILE=");
+      env += cert_file;
+      ACE_OS::putenv (env.c_str ());
+
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
index 5aa928878ef..313d10bcfee 100755
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
@@ -17,7 +17,9 @@ unlink $file;
 $status = 0;
 
 # Set the SSL environment
-$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
+# This doesn't work on Windows.  For some reason,
+# environment variables aren't propagated to child processes.
+#$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
 
 $SV = new PerlACE::Process ("server",
 			    "-o $file -ORBSvcConf server$PerlACE::svcconf_ext");
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 64ab5c952a5..8b7ff656577 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -3,12 +3,14 @@
 #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 char *ior_output_file = 0;
+const char *cert_file = "cacert.pem";
 
 int
 parse_args (int argc, char *argv[])
@@ -40,6 +42,10 @@ main (int argc, char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
+      ACE_TString env ("SSL_CERT_FILE=");
+      env += cert_file;
+      ACE_OS::putenv (env.c_str ());
+
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -84,9 +90,9 @@ main (int argc, char *argv[])
       Foo_i *server_impl = 0;
 
       ACE_NEW_RETURN (server_impl,
-		      Foo_i (orb.in (),
-			     security_current.in ()),
-		      -1);
+                      Foo_i (orb.in (),
+                             security_current.in ()),
+                      -1);
 
       PortableServer::ServantBase_var owner_transfer (server_impl);
 
@@ -95,22 +101,24 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Sanity check on SSLIOP profile equivalence.
-      {
-        Foo_i server_impl2 (orb.in (), security_current.in ());
-        Foo::Bar_var server2 =
-          server_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        const CORBA::Boolean equivalent =
-          server->_is_equivalent (server2.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+      // Since the POA is reference counting the servants, this
+      // implementation must still exist when the POA is destroyed.
+      Foo_i server_impl2 (orb.in (), security_current.in ());
+      Foo::Bar_var server2 =
+        server_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-	// @@ A better thing would be to print out an error statement.
-        ACE_ASSERT (!equivalent);
+      const CORBA::Boolean equivalent =
+        server->_is_equivalent (server2.in ()
+                               ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-	ACE_UNUSED_ARG (equivalent);
-      }
+      if (equivalent)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "(%P|%t) ERROR: SSLIOP profile equivalence "
+                      "check failed.\n"));
+        }
 
       CORBA::String_var ior =
         orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/README b/TAO/orbsvcs/tests/Security/SecurityLevel1/README
deleted file mode 100644
index 9a6e98ac4ad..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/README
+++ /dev/null
@@ -1,39 +0,0 @@
-$Id$
-
-* README *
-
-	This test checks if the SecurityLevel 1 is working
-correctly. The Security Level1 has only one method
-'get_attributes'. In this test, when a client wants to access the
-server, the server checks if the client is authorized to do so by
-getting its attributes using the get_attributes method. It then compares
-those attribute values with its own set of values and makes a decision.
-
-	The server and client certificates and private keys are
-provided. The Certificate Authority's certificate is ca.pem.
-
-To Run Manually:
-
-1. Set the Environment Variable SSL_CERT_FILE to ca.pem
-
- $ export SSL_CERT_FILE=ca.pem
-
-2. Set SSL_CERT_DIR to this directory.
-
- $ export SSL_CERT_DIR=$PWD
-
-3. Start the server
-
-$ ./server -ORBSvcConf server.conf -o ior_file &
-
-4  Run the client
-$ ./client -ORBSvcConf client.conf -k file://ior_file
-
-The Password is 'trial' for both the certificates.
-
-	The client should print out 'AUTHORIZED' if the subject of the
-client certificate matches that of the dummy certificate created by
-the server.
-
-	Could also be run using the perl script provided.
-
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test.idl b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test.idl
deleted file mode 100644
index c260bbeae74..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- * @file SLevel1_Test.idl
- *
- * $Id$
- *
- * IDL fot the Security Level 1 test.
- *
- * @author Priyanka Gontla <pgontla@doc.ece.uci.edu>
- */
-//=============================================================================
-
-
-interface SLevel1_Server
-{
-  /// Exception that indicates that no security attributes were
-  /// available during the upcall.  If this exception is thrown,
-  /// then is most likely a problem with the underlying security
-  /// mechanism(s).
-  exception NoSecurityAttributes {};
-
-  /// Test method to authorize access to a client.
-  boolean authorize_level1 () raises (NoSecurityAttributes);
-
-  /// Shutdown the server.
-  oneway void shutdown ();
-
-};
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp
deleted file mode 100644
index 82ec1089532..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-#include "SLevel1_Test_i.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (SecurityLevel1,
-           SLevel1_Test_i,
-           "$Id$")
-
-
-SLevel1_Server_i::SLevel1_Server_i (CORBA::ORB_ptr orb,
-                                    SecurityLevel1::Current_ptr ss_current)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    ss_current_ (SecurityLevel1::Current::_duplicate (ss_current))
-{
-}
-
-CORBA::Boolean
-SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   SLevel1_Server::NoSecurityAttributes))
-{
-  // Lets first set the attributes that we want to get from the
-  // client.
-  Security::AttributeType desired_attribute;
-
-  // Who defines these attributes : OMG
-  desired_attribute.attribute_family.family_definer = 0;
-
-  // What category of attributes do we want: Privilege Attributes
-  desired_attribute.attribute_family.family = 1;
-
-  //  What is the attribute type whose value we want to know:
-  //  AccessId: the identity of the principal used for access
-  //  control
-  desired_attribute.attribute_type = Security::AccessId;
-
-  // Define the AttributeTypeList
-  Security::AttributeTypeList attribute_type_list;
-  attribute_type_list.length (1);
-  attribute_type_list[0] = desired_attribute;
-
-  // Get the desired security attributes. The in parameter describes
-  // the attribute type/s that we want and the return parameter is the
-  // value/s of the attribute type/s that we want.
-  Security::AttributeList_var attribute_list =
-    this->ss_current_->get_attributes (attribute_type_list
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
-
-  // Just a preliminary check to see if we received something or
-  // not. If we received some value, the length will not be zero.
-  const CORBA::ULong len = attribute_list->length ();
-
-  if (len == 0)
-    {
-      // The desired security attribute was not available.  This
-      // indicates a failure in the underlying security mechanism
-      // support.
-      ACE_THROW_RETURN (SLevel1_Server::NoSecurityAttributes (), 1);
-    }
-
-  // Now, that we received the value of our desired attribute, lets
-  // check if the value (in turn, the requesting client) has the
-  // criteria to access this method.
-  // @@  Assume X.509 certificates are in use.
-  const char x509[] = "x509";
-  Security::OID x509_defining_authority;
-  x509_defining_authority.length (sizeof (x509));
-
-  CORBA::Octet *buf =
-    x509_defining_authority.get_buffer ();
-
-  ACE_OS_String::memcpy (buf, x509, sizeof (x509));
-
-  X509 *peer;
-
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      Security::SecAttribute &attribute = attribute_list[i];
-
-      /*
-       *  Check if the value that is returned is indeed the
-       * Security::AccessId that we requested for and also check if
-       * the defining authority is the one that we want... else it is
-       * an error.
-       */
-      if (attribute.attribute_type.attribute_type == Security::AccessId
-          && x509_defining_authority == attribute.defining_authority)
-        {
-          // Obtain the underlying buffer from the
-          // SecAttribute.
-          CORBA::Octet *der_cert = attribute.value.get_buffer ();
-
-          // Convert the DER encoded X.509 certificate into OpenSSL's
-          // internal format.
-          peer = ::d2i_X509 (0,
-                             &der_cert,
-                             attribute.value.length ());
-
-          // This method creates a dummy certificate that
-          // we will use as the basis for checking the clients
-          // certificate.
-          X509 *x = create_check_cert ();
-
-          // Lets compare the subject name between the certificate
-          // that we received from the client and the certificate we
-          // just created.
-          int result = ::X509_subject_name_cmp(peer, x);
-
-          // Free these X509 pointers as we donot want them anymore.
-          ::X509_free (peer);
-          ::X509_free (x);
-
-          // If the subjects match, the client is authorized.
-          if (result == 0)
-            {
-              // Matched and hence authorized: hence return true.
-              return 0;
-            }
-          else
-            {
-              // Didnt match and hence the client is not authorized.
-              return 1;
-            }
-        }
-      else
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      "(%P|%t) WARNING: Unknown attribute type <%u> or "
-                      "defining authority in SecAttribute %u.\n",
-                      attribute.attribute_type,
-                      i));
-          return 1;
-        }
-    }
-
-  // shouldnt come here:
-  return 1;
-}
-
-X509 *
-SLevel1_Server_i::create_check_cert ()
-{
-  // Trial to set a name:
-  X509 *x = X509_new ();
-  X509_NAME *name=NULL;
-  X509_NAME_ENTRY *ne=NULL;
-
-  name=X509_NAME_new();
-
-  char *signed_country = ACE_const_cast (char *, "US");
-  unsigned char *country = ACE_reinterpret_cast (unsigned char *,
-                                                 signed_country);
-
-  char *signed_state = ACE_const_cast (char *, "CA");
-  unsigned char *state = ACE_reinterpret_cast (unsigned char *,
-                                                 signed_state);
-
-  char *signed_locality = ACE_const_cast (char *, "Irvine");
-  unsigned char *locality = ACE_reinterpret_cast (unsigned char *,
-                                                 signed_locality);
-
-  char *signed_org = ACE_const_cast (char *, "TAO+OCI");
-  unsigned char *org = ACE_reinterpret_cast (unsigned char *,
-                                             signed_org);
-
-  char *signed_orgunit = ACE_const_cast (char *, "OCI");
-  unsigned char *orgunit = ACE_reinterpret_cast (unsigned char *,
-                                                  signed_orgunit);
-
-  char *signed_name = ACE_const_cast (char *, "Priyanka");
-  unsigned char *common_name = ACE_reinterpret_cast (unsigned char *,
-                                                     signed_name);
-
-  char *signed_email = ACE_const_cast (char *, "pgontla@doc.ece.uci.edu");
-  unsigned char *email = ACE_reinterpret_cast (unsigned char *,
-                                                 signed_email);
-
-  ne=X509_NAME_ENTRY_create_by_NID(NULL,NID_countryName,
-                                   V_ASN1_APP_CHOOSE,country,-1);
-  X509_NAME_add_entry(name,ne,0,0);
-
-  ne=X509_NAME_ENTRY_create_by_NID(NULL,NID_stateOrProvinceName,
-                                   V_ASN1_APP_CHOOSE,state,-1);
-  X509_NAME_add_entry(name,ne,1,0);
-
-  ne=X509_NAME_ENTRY_create_by_NID(NULL,NID_localityName,
-                                   V_ASN1_APP_CHOOSE,locality,-1);
-  X509_NAME_add_entry(name,ne,2,0);
-
-  ne=X509_NAME_ENTRY_create_by_NID(NULL,NID_organizationName,
-                                   V_ASN1_APP_CHOOSE,org,-1);
-  X509_NAME_add_entry(name,ne,3,0);
-
-  ne=X509_NAME_ENTRY_create_by_NID(NULL,NID_organizationalUnitName,
-                                   V_ASN1_APP_CHOOSE,orgunit,-1);
-  X509_NAME_add_entry(name,ne,4,0);
-
-  X509_NAME_ENTRY_create_by_NID(&ne,NID_commonName,
-                                V_ASN1_APP_CHOOSE,common_name,-1);
-  X509_NAME_add_entry(name,ne,5,0);
-
-  ne=X509_NAME_ENTRY_create_by_NID(NULL,NID_pkcs9_emailAddress,
-                                   V_ASN1_APP_CHOOSE,email,-1);
-  X509_NAME_add_entry(name,ne,6,0);
-
-
-  /* finished with structure */
-  X509_NAME_ENTRY_free(ne);
-
-  X509_set_subject_name(x,name);
-  X509_set_issuer_name(x,name);
-
-  /* finished with structure */
-  X509_NAME_free(name);
-
-  return x;
-}
-
-void
-SLevel1_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
deleted file mode 100644
index 4243f3ab3dc..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file SLevel1_Test_i.h
- *
- * $Id$
- *
- * Implementation header for the Security Level1test.
- *
- * @author Priyanka Gontla <pgontla@doc.ece.uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SLEVEL1_TEST_I_H
-#define TAO_SLEVEL1_TEST_I_H
-
-#include "SLevel1_TestS.h"
-#include "orbsvcs/SecurityLevel1C.h"
-#include "openssl/x509.h"
-
-class SLevel1_Server_i : public POA_SLevel1_Server
-{
- public:
-  /// Constructor
-  SLevel1_Server_i (CORBA::ORB_ptr,
-                    SecurityLevel1::Current_ptr ss_current);
-
-  /// Simple method invoked to test if the client reached server etc.
-  CORBA::Boolean authorize_level1 (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     SLevel1_Server::NoSecurityAttributes));
-
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  X509 *create_check_cert ();
-
-  static int authorized_1;
-
- private:
-
-  /// Reference to the ORB.
-  CORBA::ORB_var orb_;
-
-  /// Reference to the "SecurityCurrent" object.
-  SecurityLevel1::Current_var ss_current_;
-
-};
-
-#endif /* TAO_SLEVEL1_TEST_I_H */
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
deleted file mode 100644
index 4ba28eda246..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*security server): taoexe, portableserver, orbsvcslib, ssl, security {
-  Source_Files {
-    SLevel1_Test_i.cpp
-    server.cpp
-  }
-}
-
-project(*security client): taoexe {
-  Source_Files {
-    SLevel1_TestC.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/ca.pem b/TAO/orbsvcs/tests/Security/SecurityLevel1/ca.pem
deleted file mode 100644
index a9e905f4e6c..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/ca.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.conf b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.conf
deleted file mode 100644
index 5847fa22a03..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $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/TAO/orbsvcs/tests/Security/SecurityLevel1/client.conf.xml b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.conf.xml
deleted file mode 100644
index 54eabcc60ca..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/SecurityLevel1/client.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
deleted file mode 100644
index 273aa5f2ecd..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-
-#include "SLevel1_TestC.h"
-
-ACE_RCSID (SecurityLevel1, 
-           client, 
-           "$Id$")
-
-const char *ior = "file://test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "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 sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv [])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      SLevel1_Server_var server =
-        SLevel1_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
-
-      CORBA::Boolean authorized =
-        server->authorize_level1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (authorized == 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "AUTHORIZED\n"));
-      else if (authorized == 1)
-        ACE_DEBUG ((LM_DEBUG,
-                    "DENIED: You Do NOT have enough privileges\n"));
-
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client_cert.pem b/TAO/orbsvcs/tests/Security/SecurityLevel1/client_cert.pem
deleted file mode 100644
index 0bebb696cfc..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client_key.pem b/TAO/orbsvcs/tests/Security/SecurityLevel1/client_key.pem
deleted file mode 100644
index 1428b501712..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl b/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl
deleted file mode 100755
index 1de16551f11..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl
+++ /dev/null
@@ -1,52 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-# $Id$
-
-use lib  '../../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$file = PerlACE::LocalFile ("test.ior");
-
-unlink $file;
-
-$status = 0;
-
-# Set the SSL environment
-$ENV{'SSL_CERT_FILE'} = 'ca.pem';
-
-$SV = new PerlACE::Process ("server",
-			    "-o $file -ORBSvcConf server$PerlACE::svcconf_ext");
-$CL = new PerlACE::Process ("client",
-			    "-ORBSvcConf client$PerlACE::svcconf_ext -k file://$file");
-
-print STDERR "\n\n==== Running SecurityLevel1 test\n";
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $file;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.conf b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.conf
deleted file mode 100644
index abfc48880d4..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT  -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.conf.xml b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.conf.xml
deleted file mode 100644
index f4517d605d7..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/SecurityLevel1/server.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT  -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
deleted file mode 100644
index add0040aaae..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-
-#include "SLevel1_Test_i.h"
-
-ACE_RCSID (SecurityLevel1,
-           server,
-           "$Id$")
-
-const char *ior_output_file = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "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
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      /// Our regular ORB Initialization.
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      /// Get a reference to the RootPOA.
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      /// Narrow down the reference to the currect interface.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      // Resolve reference to SecurityCurrent Object.
-      object = orb->resolve_initial_references ("SecurityCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Narrow it down to get the correct reference.
-      SecurityLevel1::Current_var ss_current =
-        SecurityLevel1::Current::_narrow (object.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (ss_current.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) ERROR: SecurityCurrent reference "
-                           "is nil.\n"),
-                          1);
-
-      SLevel1_Server_i level1_server (orb.in (), ss_current.in ());
-
-      SLevel1_Server_var server =
-        level1_server._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      if (ior_output_file != 0)
-        {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file for writing IOR: %s",
-                               ior_output_file),
-                              1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Start the ORB
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/server_cert.pem b/TAO/orbsvcs/tests/Security/SecurityLevel1/server_cert.pem
deleted file mode 100644
index 0fc394c24d7..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/server_key.pem b/TAO/orbsvcs/tests/Security/SecurityLevel1/server_key.pem
deleted file mode 100644
index 567a41da6dc..00000000000
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index a17974c2d1c..69eaa9993f4 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -175,7 +175,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
-                          ACE_static_cast (const char*, link_name_seq[i])));
+                          static_cast<const char*> (link_name_seq[i])));
             }
 
           CosTrading::Link::LinkInfo_var link_info =
@@ -192,7 +192,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Exporting offers to %s\n",
-                          ACE_static_cast (const char*, link_name_seq[i])));
+                          static_cast<const char*> (link_name_seq[i])));
             }
 
           this->export_to (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 5f17d483377..13f5084d1f6 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -79,7 +79,7 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
       if (this->verbose_)
         {
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
-                      ACE_static_cast (const char*, link_name_seq[0u])));
+                      static_cast<const char*> (link_name_seq[0u])));
         }
 
       CosTrading::Link::LinkInfo_var link_info =
@@ -109,8 +109,8 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
                 CosTrading::TraderName::allocbuf (2);
 
               ACE_DEBUG ((LM_DEBUG, "*** Query through %s to destination %s.\n",
-                          ACE_static_cast (const char*, link_name_seq[0u]),
-                          ACE_static_cast (const char*, link_name_seq2[i])));
+                          static_cast<const char*> (link_name_seq[0u]),
+                          static_cast<const char*> (link_name_seq2[i])));
 
               trader_name[0] = CORBA::string_dup (link_name_seq[0u]);
               trader_name[1] = CORBA::string_dup (link_name_seq2[i]);
@@ -212,7 +212,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
                 {
                   const char *policy_name = (*limits_applied_ptr)[j];
                   ACE_DEBUG ((LM_DEBUG, "%s\n",
-                              ACE_static_cast (const char*, policy_name)));
+                              static_cast<const char*> (policy_name)));
                 }
             }
         }
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 2a60d2a9798..c70370c4512 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -112,13 +112,13 @@ TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TRY
         {
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
-                      ACE_static_cast (const char*, link_name_seq[i])));
+                      static_cast<const char*> (link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
             link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
-                      ACE_static_cast (const char*, link_name_seq[i])));
+                      static_cast<const char*> (link_name_seq[i])));
 
           CosTrading::TypeRepository_var remote_repos =
             link_info->target->type_repos (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -224,8 +224,7 @@ TAO_Service_Type_Exporter::list_all_types (ACE_ENV_SINGLE_ARG_DECL)
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "type name: %s\n",
-                          ACE_static_cast (const char *,
-                                           type_names[index])));
+                          static_cast<const char *> (type_names[index])));
             }
         }
     }
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index dfd8d90740e..e13b3b0766b 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -9,11 +9,11 @@ ACE_RCSID(Trading, TT_Info, "$Id$")
 
 const char* TT_Info::INTERFACE_NAMES[] =
 {
-  "Remote_IO",
-  "Plotter",
-  "Printer",
-  "File_System",
-  "PostScript_Printer"
+  "TAO_Trader_Test::Remote_IO",
+  "TAO_Trader_Test::Plotter",
+  "TAO_Trader_Test::Printer",
+  "TAO_Trader_Test::File_System",
+  "TAO_Trader_Test::PostScript_Printer"
 };
 
 const char* TT_Info::REMOTE_IO_NAME = "Remote_IO";
@@ -131,12 +131,12 @@ const int TT_Info::NUM_QUERIES = 7;
 const char* TT_Info::QUERIES[][3] =
 {
   {INTERFACE_NAMES[REMOTE_IO], "", ""},
-  {INTERFACE_NAMES[REMOTE_IO], "Location ~ 'Cupples'", ""},
+  {INTERFACE_NAMES[REMOTE_IO], "'Cupples' ~ Location", ""},
   {INTERFACE_NAMES[PLOTTER], "'sbw1' in User_Queue", "min Cost_Per_Page"},
-  {INTERFACE_NAMES[PLOTTER], "Num_Colors > 1 and Location ~ 'Cupples'", "min Cost_Per_Page"},
+  {INTERFACE_NAMES[PLOTTER], "Num_Colors > 1 and 'Cupples' ~ Location", "min Cost_Per_Page"},
   {INTERFACE_NAMES[PRINTER], "Pages_Per_Sec > 3 and Color == TRUE", "with 'sbw1' in User_Queue"},
   {INTERFACE_NAMES[PRINTER], "Color == TRUE or Double_Sided == TRUE", "random"},
-  {INTERFACE_NAMES[PRINTER], "(Color or Double_Sided) and 'sbw1' in User_Queue", "with Location ~ 'Cupples'"}
+  {INTERFACE_NAMES[PRINTER], "(Color or Double_Sided) and 'sbw1' in User_Queue", "with 'Cupples' ~ Location"}
 };
 
 void
diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl
index 2ee0d0dce60..b6057f38645 100755
--- a/TAO/orbsvcs/tests/Trading/run_test.pl
+++ b/TAO/orbsvcs/tests/Trading/run_test.pl
@@ -22,7 +22,9 @@ $E = new PerlACE::Process ("export_test",
 $I = new PerlACE::Process ("import_test",
                            "-ORBInitRef TradingService=file://$ior -quiet");
 
-$TS->Spawn ();
+if ($TS->Spawn () == -1) {
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($ior, $sleeptime) == -1) {
     print STDERR "ERROR: waiting for trading service IOR file\n";
@@ -30,12 +32,15 @@ if (PerlACE::waitforfile_timed ($ior, $sleeptime) == -1) {
     exit 1;
 }
 
-$E->Spawn ();
+if ($E->Spawn () == -1) {
+    $TS->Kill ();
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($ready_file, 120) == -1) {
     print STDERR "ERROR: waiting for the export test to finish\n";
-    $E->Kill (); 
-    $TS->Kill (); 
+    $E->Kill ();
+    $TS->Kill ();
     exit 1;
 }
 
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 097a453a527..9a4fd95412e 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -63,12 +63,12 @@ main (int argc, char *argv [])
       if (ACE_OS::last_error () == EPERM)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
+                      "client (%P|%t): user is not superuser, "
                       "test runs in time-shared class\n"));
         }
       else
         ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
+                    "client (%P|%t): sched_params failed\n"));
     }
 
   ACE_TRY_NEW_ENV
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 2d0bd749394..c1ba6c7089b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -806,7 +806,23 @@ Cubit_Client::cube_octet_sequence (int,
 
       ACE_Message_Block mb (l);
       mb.wr_ptr (l);
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       Cubit::octet_seq input (l, &mb);
+#else
+      // If the form of the constructor is not available, we will need
+      // to do the copy manually.  First, set the octet sequence length.
+      Cubit::octet_seq input;
+      CORBA::ULong length = mb.length ();
+      input.length (length);
+
+      // Now copy over each byte.
+      char* base = mb.data_block ()->base ();
+      for(CORBA::ULong i = 0; i < length; i++)
+        {
+          input[i] = base[i];
+        }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+
 
       // Just set the first item, otherwise it is hard to compare the
       // results for longer sequences, i.e. more than just marshalling
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index 6edf35c7424..389f51d958d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -111,7 +111,7 @@ main (int argc, char **argv)
               "\n \t IDL_Cubit: Collocation test \n\n"));
 
   ACE_Thread_Manager tm;
-  tm.spawn (ACE_reinterpret_cast (ACE_THR_FUNC, &svr_worker),
+  tm.spawn (reinterpret_cast<ACE_THR_FUNC> (&svr_worker),
             &thread_barrier);
   thread_barrier.server_init_.wait ();
   ACE_OS::sleep (1);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 607dc2e63a9..0eb9786cb70 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -214,4 +214,6 @@ MT_Priority::grain (void)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Globals, ACE_Null_Mutex> *ACE_Singleton<Globals, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 0f79cc7403b..876035b66dc 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -19,7 +19,7 @@ ACE_round (ACE_timer_t t)
 #if defined (ACE_LACKS_FLOATING_POINT)
   return t;
 #else
-  return ACE_static_cast (ACE_UINT32, t);
+  return static_cast<ACE_UINT32> (t);
 #endif
 }
 
@@ -339,8 +339,7 @@ Client::get_low_priority_latency (void)
 ACE_timer_t
 Client::get_latency (u_int thread_id)
 {
-  return ACE_static_cast (ACE_timer_t,
-                          this->ts_->latency_ [thread_id]);
+  return static_cast<ACE_timer_t> (this->ts_->latency_ [thread_id]);
 }
 
 // Returns the jitter in usecs.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 603aca0fd87..90424b14d83 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -183,8 +183,8 @@ Server::activate_high_servant (void)
 
   char *high_second_argv[] =
     {orbendpoint,
-     ACE_const_cast (char *, "-ORBSndSock 32768 "),
-     ACE_const_cast (char *, "-ORBRcvSock 32768 "),
+     const_cast<char *> ("-ORBSndSock 32768 "),
+     const_cast<char *> ("-ORBRcvSock 32768 "),
      0};
   ACE_NEW_RETURN (this->high_argv_,
                   ACE_ARGV (this->argv_, high_second_argv),
@@ -227,7 +227,7 @@ Server::activate_high_servant (void)
 int
 Server::activate_low_servants (void)
 {
-  if (ACE_static_cast (int, this->num_low_priority_) > 0)
+  if (static_cast<int> (this->num_low_priority_) > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Creating %d servants starting at priority %d\n",
@@ -271,8 +271,8 @@ Server::activate_low_servants (void)
     {
       char *low_second_argv[] =
         {random_endpoint,
-         ACE_const_cast (char *, "-ORBSndSock 32768 "),
-         ACE_const_cast (char *, "-ORBRcvSock 32768 "),
+         const_cast<char *> ("-ORBSndSock 32768 "),
+         const_cast<char *> ("-ORBRcvSock 32768 "),
          0};
       ACE_NEW_RETURN (this->low_argv_,
                       ACE_ARGV (this->argv_,
@@ -383,7 +383,8 @@ main (int argc, char *argv[])
 
   // run the server.
   result = server.run ();
-  cout << __FILE__ << __LINE__ << endl;
+  ACE_DEBUG ((LM_DEBUG,
+			  "%s:%d\n", __FILE__, __LINE__));
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Error while running the servants\n"),
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index b7f7be24c58..bb4034051b9 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Advanced_Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
+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"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
index 18214a67aa1..3d76eda6597 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
@@ -5,7 +5,7 @@
  <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBResources tss -ORBInputCDRAllocator null -ORBConnectionCacheLock null"/>
+ <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"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index cf34a32640c..ac678fc1a15 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -64,12 +64,12 @@ main (int argc, char *argv[])
       if (ACE_OS::last_error () == EPERM)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
+                      "client (%P|%t): user is not superuser, "
                       "test runs in time-shared class\n"));
         }
       else
         ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
+                    "client (%P|%t): sched_params failed\n"));
     }
 
   ACE_TRY_NEW_ENV
diff --git a/TAO/performance-tests/Latency/AMI/run_test.pl b/TAO/performance-tests/Latency/AMI/run_test.pl
index 88eff11adac..692971538cc 100755
--- a/TAO/performance-tests/Latency/AMI/run_test.pl
+++ b/TAO/performance-tests/Latency/AMI/run_test.pl
@@ -29,7 +29,8 @@ if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+## Very slow machines need > 3 minutes to finish
+$client = $CL->SpawnWaitKill (210);
 $server = $SV->WaitKill (10);
 
 unlink $iorfile;
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
index db51b1eac45..dbdeba1795e 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
@@ -3,47 +3,31 @@
 //
 
 #include "Client_Task.h"
-#include "TestC.h"
 #include "ace/Stats.h"
 #include "ace/Sample_History.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/SString.h"
 
-Client_Task::Client_Task (const char *ior,
+Client_Task::Client_Task (Test::Roundtrip_ptr reference,
                           int iterations,
-                          CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr),
-    input_ (ior),
     niterations (iterations),
-    corb_ (CORBA::ORB::_duplicate (corb))
+    remote_ref_ (Test::Roundtrip::_duplicate (reference))
 
 {
 }
 
-
 int
 Client_Task::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      ACE_TString ior ("file://");
-      ior += input_;
-
-      CORBA::Object_var tmp =
-        this->corb_->string_to_object (ior.c_str()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var rt =
-        Test::Roundtrip::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (rt.in ()))
+      if (CORBA::is_nil (this->remote_ref_.in ()))
       {
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           "Nil Test::Roundtrip reference <%s>\n",
-                           ior.c_str()) ,1);
+                           "Nil Test::Roundtrip reference\n"),
+                          1);
       }
 
       //// Start Test ///////////////////////////////
@@ -51,7 +35,7 @@ Client_Task::svc (void)
 
       // Warm up the system
       for (int i=0; i < 1000; i++)
-        rt->test_method (test_time);
+        this->remote_ref_->test_method (test_time);
 
       // Start for actual Measurements
       ACE_Sample_History history (niterations);
@@ -61,7 +45,7 @@ Client_Task::svc (void)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) rt->test_method (start ACE_ENV_ARG_PARAMETER);
+          (void) this->remote_ref_->test_method (start ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -85,9 +69,10 @@ Client_Task::svc (void)
                                              stats.samples_count ());
 
       //shutdown the server ORB
-      rt->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->remote_ref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
+
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.h b/TAO/performance-tests/Latency/Collocation/Client_Task.h
index 358d98e408a..5fe9038a703 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.h
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.h
@@ -10,8 +10,9 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/ORB.h"
 
+#include "tao/ORB.h"
+#include "TestC.h"
 
 /// Implement a Task to run the client as a thread
 class Client_Task : public ACE_Task_Base
@@ -19,18 +20,17 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (Test::Roundtrip_ptr reference,
                int iterations,
-               CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
   int svc (void);
 
 private:
-  const char *input_;
+
   const int niterations;
-  CORBA::ORB_var corb_;
+  Test::Roundtrip_var remote_ref_;
 
 };
 
diff --git a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
index 9dd3667fa5d..f4c6d4c2719 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
@@ -3,14 +3,13 @@
 #include "Server_Task.h"
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
-#include "ace/Argv_Type_Converter.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Manual_Event.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
-const char *ior_file  = "test.ior";
-int niterations = 100;
+int niterations = 250000;
 
 int
 parse_args (int argc, char *argv[])
@@ -21,13 +20,10 @@ parse_args (int argc, char *argv[])
   while ((c = get_opts ()) != -1)
     switch (c)
       {
-      case 'k':
-        ior_file = get_opts.opt_arg ();
-        break;
       case 'n':
         niterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
-      case '?':
+
       default:
         // This is a hack but that is okay!
         return 0;
@@ -65,28 +61,22 @@ set_priority()
 int
 main (int argc, char *argv[])
 {
-  if (parse_args (argc,argv) == -1)
-    return -1;
-
   //Use Real-time Scheduling class if possible
   set_priority();
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-
+        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_Null_Mutex mutex;
-      ACE_Null_Condition wait_for_event (mutex);
-      Server_Task server_task (ior_file,
-                               sorb.in (),
+      if (parse_args (argc,argv) == -1)
+        return -1;
+
+      ACE_Manual_Event wait_for_event;
+
+      Server_Task server_task (sorb.in (),
                                wait_for_event,
                                ACE_Thread_Manager::instance ());
 
@@ -100,17 +90,11 @@ main (int argc, char *argv[])
       // Wait for the server thread to do some processing
       wait_for_event.wait ();
 
-      ACE_Argv_Type_Converter catc (argc, argv);
-      CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // Obtain the object reference
+      Test::Roundtrip_var reference = server_task.get_reference ();
 
-      Client_Task client_task (ior_file,
+      Client_Task client_task (reference.in (),
                                niterations,
-                               corb.in (),
                                ACE_Thread_Manager::instance ());
 
       if (client_task.activate (THR_NEW_LWP | THR_JOINABLE,
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
index 341a55d6651..33f309ff316 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
@@ -3,20 +3,22 @@
 //
 
 #include "Server_Task.h"
-#include "TestS.h"
 #include "Roundtrip.h"
 
-Server_Task::Server_Task (const char* ior_file,
-                          CORBA::ORB_ptr sorb,
-                          ACE_Null_Condition &cond,
+Server_Task::Server_Task (CORBA::ORB_ptr sorb,
+                          ACE_Manual_Event &cond,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr),
-    ior_file(ior_file),
     cond_ (cond),
     sorb_ (CORBA::ORB::_duplicate (sorb))
 {
 }
 
+Test::Roundtrip *
+Server_Task::get_reference ()
+{
+  return Test::Roundtrip::_duplicate (this->rt_var_.in ());
+}
 
 int
 Server_Task::svc (void)
@@ -50,38 +52,28 @@ Server_Task::svc (void)
 
      PortableServer::ServantBase_var owner_transfer(rt_impl);
 
-     Test::Roundtrip_var rt_var =
+     this->rt_var_ =
        rt_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
-     CORBA::String_var ior =
-       this->sorb_->object_to_string (rt_var.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
-
-     // Output the IOR to the <this->output_>
-     FILE *output_file= ACE_OS::fopen (this->ior_file,
-                                       "w");
-     if (output_file == 0)
-       ACE_ERROR_RETURN ((LM_ERROR,
-                          "Cannot open output file for writing IOR: %s",
-                          this->ior_file),
-                         1);
-
-     ACE_OS::fprintf (output_file, "%s", ior.in ());
-     ACE_OS::fclose (output_file);
+     if (CORBA::is_nil (this->rt_var_.in ()))
+      {
+        ACE_ERROR_RETURN ((LM_DEBUG,
+                           "Error activating Test::Roundtrip reference\n"),
+                          1);
+      }
 
      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
+     ACE_DEBUG ((LM_DEBUG, "Server_Task: Object Activation complete\n"));
+
      // Signal the main thread to spawn the client
      this->cond_.signal ();
 
      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
-     ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.h b/TAO/performance-tests/Latency/Collocation/Server_Task.h
index 1eabdc83191..f9f8a13cf28 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.h
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.h
@@ -7,34 +7,38 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Task.h"
+#include "ace/Manual_Event.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/ORB.h"
+#include "TestC.h"
 
 /// Implement a Task to run the server in a single thread
 class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char* ior_file,
-               CORBA::ORB_ptr sorb,
-               ACE_Null_Condition &cond,
+  Server_Task (CORBA::ORB_ptr sorb,
+               ACE_Manual_Event &cond,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
+
+  //Test::Roundtrip_prt get_reference ();
+  Test::Roundtrip * get_reference ();
 
 private:
 
-  const char* ior_file;
+  ACE_Manual_Event &cond_;
   /// Manual event to wake up the main thread to create a client
   /// thread.
-  ACE_Null_Condition &cond_;
 
   CORBA::ORB_var sorb_;
+  Test::Roundtrip_var rt_var_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/performance-tests/Latency/DII/run_test.pl b/TAO/performance-tests/Latency/DII/run_test.pl
index f0aa0bbfc35..087ea7f77fa 100755
--- a/TAO/performance-tests/Latency/DII/run_test.pl
+++ b/TAO/performance-tests/Latency/DII/run_test.pl
@@ -30,7 +30,7 @@ if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     exit 1;
 }
 
-$client = $CL->SpawnWaitKill (120);
+$client = $CL->SpawnWaitKill (240);
 $server = $SV->WaitKill (10);
 
 unlink $iorfile;
diff --git a/TAO/performance-tests/Latency/DII/svc.conf.xml b/TAO/performance-tests/Latency/DII/svc.conf.xml
index 072c235fe46..7188391fbb8 100644
--- a/TAO/performance-tests/Latency/DII/svc.conf.xml
+++ b/TAO/performance-tests/Latency/DII/svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  -->
  <!--  $Id$ -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
+ <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"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Latency/DSI/run_test.pl b/TAO/performance-tests/Latency/DSI/run_test.pl
index 643974f244b..4c0e2a7d652 100755
--- a/TAO/performance-tests/Latency/DSI/run_test.pl
+++ b/TAO/performance-tests/Latency/DSI/run_test.pl
@@ -30,7 +30,7 @@ if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     exit 1;
 }
 
-$client = $CL->SpawnWaitKill (120);
+$client = $CL->SpawnWaitKill (300);
 $server = $SV->WaitKill (10);
 
 unlink $iorfile;
diff --git a/TAO/performance-tests/Latency/DSI/svc.conf b/TAO/performance-tests/Latency/DSI/svc.conf
index 60ee1e2554f..557c16b5caf 100644
--- a/TAO/performance-tests/Latency/DSI/svc.conf
+++ b/TAO/performance-tests/Latency/DSI/svc.conf
@@ -1,6 +1,6 @@
 #
 # $Id$
 #
-static Advanced_Resource_Factory "-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
+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"
diff --git a/TAO/performance-tests/Latency/DSI/svc.conf.xml b/TAO/performance-tests/Latency/DSI/svc.conf.xml
index de29eb000ce..d35a5ac7473 100644
--- a/TAO/performance-tests/Latency/DSI/svc.conf.xml
+++ b/TAO/performance-tests/Latency/DSI/svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  -->
  <!--  $Id$ -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
+ <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"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Latency/Deferred/run_test.pl b/TAO/performance-tests/Latency/Deferred/run_test.pl
index b1b4c6fc069..2587c9119b7 100755
--- a/TAO/performance-tests/Latency/Deferred/run_test.pl
+++ b/TAO/performance-tests/Latency/Deferred/run_test.pl
@@ -30,7 +30,7 @@ if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     exit 1;
 }
 
-$client = $CL->SpawnWaitKill (120);
+$client = $CL->SpawnWaitKill (240);
 $server = $SV->WaitKill (10);
 
 unlink $iorfile;
diff --git a/TAO/performance-tests/Latency/Deferred/svc.conf b/TAO/performance-tests/Latency/Deferred/svc.conf
index e7c7bcb4a97..c15a02cf58f 100644
--- a/TAO/performance-tests/Latency/Deferred/svc.conf
+++ b/TAO/performance-tests/Latency/Deferred/svc.conf
@@ -1,6 +1,6 @@
 #
 # $Id$
 #
-static Advanced_Resource_Factory "-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
+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"
diff --git a/TAO/performance-tests/Latency/Deferred/svc.conf.xml b/TAO/performance-tests/Latency/Deferred/svc.conf.xml
index b3ab51c9799..a9d9071cbd8 100644
--- a/TAO/performance-tests/Latency/Deferred/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Deferred/svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  -->
  <!--  $Id$ -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
+ <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"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Latency/Thread_Pool/run_test.pl b/TAO/performance-tests/Latency/Thread_Pool/run_test.pl
index 85ca3dcaa29..88bb9458261 100755
--- a/TAO/performance-tests/Latency/Thread_Pool/run_test.pl
+++ b/TAO/performance-tests/Latency/Thread_Pool/run_test.pl
@@ -48,7 +48,7 @@ if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     exit 1;
 }
 
-$client = $CL->SpawnWaitKill (120);
+$client = $CL->SpawnWaitKill (480);
 $server = $SV->WaitKill (10);
 
 unlink $iorfile;
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index a0c3544bc95..c3a276474ba 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -87,7 +87,7 @@ parse_args (int argc, char **argv)
     switch (c)
       {
       case 'i':
-        iterations = ACE_static_cast (u_long, ACE_OS::atoi (get_opts.opt_arg ()));
+        iterations = static_cast<u_long> (ACE_OS::atoi (get_opts.opt_arg ()));
         break;
 
       case 'r':
diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc
index ac1fcb6415f..29762452fb7 100644
--- a/TAO/performance-tests/Protocols/Protocols.mpc
+++ b/TAO/performance-tests/Protocols/Protocols.mpc
@@ -3,8 +3,6 @@
 
 project(*Receiver): taoserver {
 
-  requires += dummy_label
-
   exename = receiver
 
   Source_Files {
@@ -14,8 +12,6 @@ project(*Receiver): taoserver {
 
 project(*Distributor): rt_server {
 
-  requires += dummy_label
-
   exename = distributor
 
   Source_Files {
@@ -25,8 +21,8 @@ project(*Distributor): rt_server {
 
 project(*Sender): rt_client {
 
-  requires += dummy_label
-
+  includes += ../../tests/RTCORBA/Diffserv
+  
   Source_Files {
     sender.cpp
     testC.cpp
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index 9ff40534e85..6c789d5489d 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -34,11 +34,11 @@ parse_args (int argc, char **argv)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage: %s\n"
                            "\t-f <ior_file> (defaults to %s)\n"
-			   "\t-k <ior> (defaults to %s)\n"
+                           "\t-k <ior> (defaults to %s)\n"
                            "\n",
                            argv[0],
                            ior_file,
-			   ior),
+                           ior),
                           -1);
       }
 
@@ -52,17 +52,17 @@ class test_i :
 public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa,
-	  RTCORBA::RTORB_ptr rtorb,
-	  CORBA::PolicyManager_ptr policy_manager,
-	  test_ptr receiver);
+          RTCORBA::RTORB_ptr rtorb,
+          CORBA::PolicyManager_ptr policy_manager,
+          test_ptr receiver);
 
   ~test_i (void);
 
   void start_test (CORBA::Long session_id,
-		   const char *protocol,
-		   CORBA::ULong invocation_rate,
-		   CORBA::ULong message_size,		  
-		   CORBA::ULong iterations
+                   const char *protocol,
+                   CORBA::ULong invocation_rate,
+                   CORBA::ULong message_size,
+                   CORBA::ULong iterations
                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -76,15 +76,15 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void oneway_method (CORBA::Long session_id,
-		      CORBA::ULong iteration,
-		      const ::test::octets &payload
-		      ACE_ENV_ARG_DECL)
+                      CORBA::ULong iteration,
+                      const ::test::octets &payload
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void twoway_method (CORBA::Long &session_id,
-		      CORBA::ULong &iteration,
-		      ::test::octets &payload
-		      ACE_ENV_ARG_DECL)
+                      CORBA::ULong &iteration,
+                      ::test::octets &payload
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (ACE_ENV_SINGLE_ARG_DECL)
@@ -98,16 +98,16 @@ private:
   RTCORBA::RTORB_var rtorb_;
   CORBA::PolicyManager_var policy_manager_;
   test_var receiver_;
-  
+
   CORBA::PolicyList base_protocol_policy_;
   CORBA::PolicyList test_protocol_policy_;
 };
 
 test_i::test_i (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa,
-		RTCORBA::RTORB_ptr rtorb,
-		CORBA::PolicyManager_ptr policy_manager,
-		test_ptr receiver)
+                RTCORBA::RTORB_ptr rtorb,
+                CORBA::PolicyManager_ptr policy_manager,
+                test_ptr receiver)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa)),
     rtorb_ (RTCORBA::RTORB::_duplicate (rtorb)),
@@ -116,7 +116,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 {
   // Base protocol is used for setting up and tearing down the test.
   this->base_protocol_policy_.length (1);
-  
+
   // Test protocol is the one being tested.
   this->test_protocol_policy_.length (1);
 
@@ -141,10 +141,10 @@ test_i::~test_i (void)
 
 void
 test_i::start_test (CORBA::Long session_id,
-		    const char *protocol,
-		    CORBA::ULong invocation_rate,
-		    CORBA::ULong message_size,		  
-		    CORBA::ULong iterations
+                    const char *protocol,
+                    CORBA::ULong invocation_rate,
+                    CORBA::ULong message_size,
+                    CORBA::ULong iterations
                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -158,7 +158,7 @@ test_i::start_test (CORBA::Long session_id,
   if (ACE_OS::strcmp (protocol, "DIOP") == 0)
     {
       if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "test protocol is DIOP\n"));
-      protocols[0].protocol_type = TAO_TAG_UDP_PROFILE;
+      protocols[0].protocol_type = TAO_TAG_DIOP_PROFILE;
     }
   else if (ACE_OS::strcmp (protocol, "SCIOP") == 0)
     {
@@ -188,32 +188,32 @@ test_i::start_test (CORBA::Long session_id,
 
     test_protocol_setup:
 
-      ACE_TRY
-	{
-	  // Send a message to ensure that the connection is setup.
-	  this->receiver_->oneway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_TRY_CHECK;
+      ACE_TRY_EX (B1)
+        {
+          // Send a message to ensure that the connection is setup.
+          this->receiver_->oneway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (B1);
 
-	  goto test_protocol_success;
-	}
+          goto test_protocol_success;
+        }
       ACE_CATCH (CORBA::TRANSIENT, exception)
-	{
-	  ++j;
-	  
-	  if (j < number_of_connection_attempts)
-	    {
-	      ACE_OS::sleep (1);
-	      goto test_protocol_setup;
-	    }
-	}
+        {
+          ++j;
+
+          if (j < number_of_connection_attempts)
+            {
+              ACE_OS::sleep (1);
+              goto test_protocol_setup;
+            }
+        }
       ACE_ENDTRY;
 
-      ACE_ERROR ((LM_ERROR, 
-		  "Cannot setup test protocol\n"));
+      ACE_ERROR ((LM_ERROR,
+                  "Cannot setup test protocol\n"));
 
       ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-				   CORBA::COMPLETED_NO));
-    }  
+                                   CORBA::COMPLETED_NO));
+    }
 
  test_protocol_success:
 
@@ -231,37 +231,37 @@ test_i::start_test (CORBA::Long session_id,
 
     base_protocol_setup:
 
-      ACE_TRY
-	{
-	  // Let the server know what to expect..
-	  this->receiver_->start_test (session_id,
-				       protocol,
-				       invocation_rate,
-				       message_size,
-				       iterations
-				       ACE_ENV_ARG_PARAMETER);
-	  ACE_TRY_CHECK;
-
-	  goto base_protocol_success;
-	}
+      ACE_TRY_EX (B2)
+        {
+          // Let the server know what to expect..
+          this->receiver_->start_test (session_id,
+                                       protocol,
+                                       invocation_rate,
+                                       message_size,
+                                       iterations
+                                       ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (B2);
+
+          goto base_protocol_success;
+        }
       ACE_CATCH (CORBA::TRANSIENT, exception)
-	{
-	  ACE_OS::sleep (1);
-
-	  if (k < number_of_connection_attempts)
-	    {
-	      ACE_OS::sleep (1);
-	      goto base_protocol_setup;
-	    }
-	}
+        {
+          ACE_OS::sleep (1);
+
+          if (k < number_of_connection_attempts)
+            {
+              ACE_OS::sleep (1);
+              goto base_protocol_setup;
+            }
+        }
       ACE_ENDTRY;
 
-      ACE_ERROR ((LM_ERROR, 
-		  "Cannot setup base protocol\n"));
+      ACE_ERROR ((LM_ERROR,
+                  "Cannot setup base protocol\n"));
 
       ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-				   CORBA::COMPLETED_NO));
-    }  
+                                   CORBA::COMPLETED_NO));
+    }
 
  base_protocol_success:
 
@@ -304,29 +304,29 @@ test_i::twoway_sync (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 test_i::oneway_method (CORBA::Long session_id,
-		       CORBA::ULong iteration,
-		       const ::test::octets &payload
-		       ACE_ENV_ARG_DECL)
+                       CORBA::ULong iteration,
+                       const ::test::octets &payload
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->receiver_->oneway_method (session_id,
-				  iteration,
-				  payload
-				  ACE_ENV_ARG_PARAMETER);
+                                  iteration,
+                                  payload
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 test_i::twoway_method (CORBA::Long &session_id,
-		       CORBA::ULong &iteration,
-		       ::test::octets &payload
-		       ACE_ENV_ARG_DECL)
+                       CORBA::ULong &iteration,
+                       ::test::octets &payload
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->receiver_->twoway_method (session_id,
-				  iteration,
-				  payload
-				  ACE_ENV_ARG_PARAMETER);
+                                  iteration,
+                                  payload
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -410,11 +410,11 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       test_i *servant =
-	new test_i (orb.in (),
-		    root_poa.in (),
-		    rtorb.in (),
-		    policy_manager.in (),		      
-		    receiver.in ());
+        new test_i (orb.in (),
+                    root_poa.in (),
+                    rtorb.in (),
+                    policy_manager.in (),
+                    receiver.in ());
       PortableServer::ServantBase_var safe_servant (servant);
       ACE_UNUSED_ARG (safe_servant);
 
@@ -434,7 +434,7 @@ main (int argc, char **argv)
         ACE_OS::fprintf (output_file,
                          "%s",
                          ior.in ());
-      ACE_ASSERT (result == ACE_OS::strlen (ior));
+      ACE_ASSERT (result == ACE_OS::strlen (ior.in ()));
       ACE_UNUSED_ARG (result);
 
       ACE_OS::fclose (output_file);
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index 4c574652212..752687fe1c8 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -131,7 +131,7 @@ test_i::start_test (CORBA::Long session_id,
 		    CORBA::ULong invocation_rate,
 		    CORBA::ULong message_size,		  
 		    CORBA::ULong iterations
-                    ACE_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -174,7 +174,7 @@ test_i::start_test (CORBA::Long session_id,
 }
 
 void
-test_i::end_test (ACE_ENV_SINGLE_ARG_DECL)
+test_i::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Record end time.
@@ -238,13 +238,13 @@ test_i::end_test (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-test_i::oneway_sync (ACE_ENV_SINGLE_ARG_DECL)
+test_i::oneway_sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-test_i::twoway_sync (ACE_ENV_SINGLE_ARG_DECL)
+test_i::twoway_sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -399,7 +399,7 @@ main (int argc, char **argv)
         ACE_OS::fprintf (output_file,
                          "%s",
                          ior.in ());
-      ACE_ASSERT (result == ACE_OS::strlen (ior));
+      ACE_ASSERT (result == ACE_OS::strlen (ior.in ()));
       ACE_UNUSED_ARG (result);
 
       ACE_OS::fclose (output_file);
diff --git a/TAO/performance-tests/Protocols/run_test.pl b/TAO/performance-tests/Protocols/run_test.pl
index 60b1fe3b730..dd3d00f0aeb 100755
--- a/TAO/performance-tests/Protocols/run_test.pl
+++ b/TAO/performance-tests/Protocols/run_test.pl
@@ -8,17 +8,14 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib '../../../bin';
 use PerlACE::Run_Test;
 
-$iterations = 5;
 $ORBdebuglevel = 0;
 $status = 0;
 
-$iorfile = "ior";
+$iorfile = "receiver.ior";
 unlink $iorfile;
 
-$protocol = "diop";
-
-$SV = new PerlACE::Process ("server", "-ORBdebuglevel $ORBdebuglevel -ORBEndpoint $protocol://");
-$CL = new PerlACE::Process ("client", "-ORBdebuglevel $ORBdebuglevel -x 1 -i $iterations");
+$SV = new PerlACE::Process ("receiver", "-ORBdebuglevel $ORBdebuglevel");
+$CL = new PerlACE::Process ("sender", "-ORBdebuglevel $ORBdebuglevel -a 0 -b 0 -c 0 -d 0 -e 0 -i 10 -k file://receiver.ior -m 0 -p IIOP -r 5 -s 100 -t 0 -x 1");
 
 $SV->Spawn ();
 
@@ -28,18 +25,18 @@ if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
     exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (5);
+$sender = $CL->SpawnWaitKill (60);
+$receiver = $SV->WaitKill (5);
 
 unlink $iorfile;
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
+if ($sender != 0) {
+    print STDERR "ERROR: sender returned $sender\n";
     $status = 1;
 }
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
+if ($receiver != 0) {
+    print STDERR "ERROR: receiver returned $receiver\n";
     $status = 1;
 }
 
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index af127eb9020..5558f0abcee 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -9,17 +9,22 @@
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_time.h"
 #include "tao/RTCORBA/RTCORBA.h"
+#include "tao/RTCORBA/RT_Policy_i.h"
+#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
+#include "tao/RTCORBA/Network_Priority_Mapping.h"
 #include "tao/ORB_Constants.h"
+#include "Custom_Network_Priority_Mapping.h"
+#include "Custom_Network_Priority_Mapping.cpp"
 #include "tao/debug.h"
 #include "testC.h"
 
 // Types of tests supported.
 enum Test_Type
-{
-  PACED,
-  THROUGHPUT,
-  LATENCY
-};
+  {
+    PACED,
+    THROUGHPUT,
+    LATENCY
+  };
 
 static const char *ior = "file://distributor.ior";
 static int shutdown_server = 0;
@@ -33,12 +38,14 @@ static CORBA::ULong message_size = 0;
 static const char *test_protocol = "IIOP";
 static int print_statistics = 1;
 static int number_of_connection_attempts = 20;
+static int enable_diffserv_code_points = 0;
+static RTCORBA::Priority corba_priority = RTCORBA::minPriority;
 static Test_Type test_type = PACED;
 
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:d:e:i:k:m:p:r:s:t:x:");
+  ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:k:m:p:r:s:t:x:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -48,6 +55,14 @@ parse_args (int argc, char **argv)
         test_type = static_cast<Test_Type> (ACE_OS::atoi (get_opts.opt_arg ()));
         break;
 
+      case 'b':
+        enable_diffserv_code_points = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case 'c':
+        corba_priority = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
       case 'd':
         do_dump_history = ACE_OS::atoi (get_opts.opt_arg ());
         break;
@@ -89,50 +104,54 @@ parse_args (int argc, char **argv)
         break;
 
       default:
-	{
-	  const char *test = 0;
-	  switch (test_type)
-	    {
-	    case PACED:
-	      test = "PACED";
-	      break;
-	    case THROUGHPUT:
-	      test = "THROUGHPUT";
-	      break;
-	    case LATENCY:
-	      test = "LATENCY";
-	      break;	     
-	    }
-
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "usage:  %s\n"
-			     "\t-a <test type> (defaults to %s [valid values are PACED(%d), THROUGHPUT(%d), and LATENCY(%d))\n"
-			     "\t-d <show history> (defaults to %d)\n"
-			     "\t-e <count missed end deadlines> (defaults to %d)\n"
-			     "\t-h <help: shows options menu>\n"
-			     "\t-i <iterations> (defaults to %d)\n"
-			     "\t-k <ior> (defaults to %s)\n"
-			     "\t-m <print missed invocations for paced workers> (defaults to %d)\n"
-			     "\t-p <test protocol> (defaults to %s [valid values are IIOP, DIOP, and SCIOP])\n"
-			     "\t-r <invocation rate> (defaults to %d)\n"
-			     "\t-s <message size> (defaults to %d)\n"
-			     "\t-t <print stats> (defaults to %d)\n"
-			     "\t-x <shutdown server> (defaults to %d)\n"
-			     "\n",
-			     argv[0],
-			     test, PACED, THROUGHPUT, LATENCY,			     
-			     do_dump_history,
-			     count_missed_end_deadlines,
-			     iterations,
-			     ior,
-			     print_missed_invocations,
-			     test_protocol,
-			     invocation_rate,
-			     message_size,
-			     print_statistics,
-			     shutdown_server),
-			    -1);
-	}
+        {
+          const char *test = 0;
+          switch (test_type)
+            {
+            case PACED:
+              test = "PACED";
+              break;
+            case THROUGHPUT:
+              test = "THROUGHPUT";
+              break;
+            case LATENCY:
+              test = "LATENCY";
+              break;
+            }
+
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "usage:  %s\n"
+                             "\t-a <test type> (defaults to %s [valid values are PACED(%d), THROUGHPUT(%d), and LATENCY(%d))\n"
+                             "\t-b <enable diffserv code points> (defaults to %d)\n"
+                             "\t-c <corba priority> (defaults to %d)\n"
+                             "\t-d <show history> (defaults to %d)\n"
+                             "\t-e <count missed end deadlines> (defaults to %d)\n"
+                             "\t-h <help: shows options menu>\n"
+                             "\t-i <iterations> (defaults to %d)\n"
+                             "\t-k <ior> (defaults to %s)\n"
+                             "\t-m <print missed invocations for paced workers> (defaults to %d)\n"
+                             "\t-p <test protocol> (defaults to %s [valid values are IIOP, DIOP, and SCIOP])\n"
+                             "\t-r <invocation rate> (defaults to %d)\n"
+                             "\t-s <message size> (defaults to %d)\n"
+                             "\t-t <print stats> (defaults to %d)\n"
+                             "\t-x <shutdown server> (defaults to %d)\n"
+                             "\n",
+                             argv[0],
+                             test, PACED, THROUGHPUT, LATENCY,
+                             enable_diffserv_code_points,
+                             corba_priority,
+                             do_dump_history,
+                             count_missed_end_deadlines,
+                             iterations,
+                             ior,
+                             print_missed_invocations,
+                             test_protocol,
+                             invocation_rate,
+                             message_size,
+                             print_statistics,
+                             shutdown_server),
+                            -1);
+        }
       }
 
   return 0;
@@ -142,13 +161,8 @@ double
 to_seconds (ACE_UINT64 hrtime,
             ACE_UINT32 sf)
 {
-  double seconds =
-#if defined ACE_LACKS_LONGLONG_T
-    hrtime / sf;
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  ACE_static_cast (double,
-                   ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
-#endif /* ! ACE_LACKS_LONGLONG_T */
+  double seconds = static_cast<double> (
+                     ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
   seconds /= ACE_HR_SCALE_CONVERSION;
 
   return seconds;
@@ -164,15 +178,16 @@ to_hrtime (double seconds,
 class Worker
 {
 public:
-  Worker (RTCORBA::RTORB_ptr rtorb,
-                CORBA::PolicyManager_ptr policy_manager,
-                test_ptr test);
+  Worker (CORBA::ORB_ptr orb,
+          RTCORBA::RTORB_ptr rtorb,
+          CORBA::PolicyManager_ptr policy_manager,
+          test_ptr test);
 
   void run (ACE_ENV_SINGLE_ARG_DECL);
 
   void print_stats (void);
 
-  void setup (void);
+  void setup (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -200,9 +215,10 @@ private:
   CORBA::Long session_id_;
 };
 
-Worker::Worker (RTCORBA::RTORB_ptr rtorb,
-		CORBA::PolicyManager_ptr policy_manager,
-		test_ptr test)
+Worker::Worker (CORBA::ORB_ptr orb,
+                RTCORBA::RTORB_ptr rtorb,
+                CORBA::PolicyManager_ptr policy_manager,
+                test_ptr test)
   : rtorb_ (RTCORBA::RTORB::_duplicate (rtorb)),
     policy_manager_ (CORBA::PolicyManager::_duplicate (policy_manager)),
     test_ (test::_duplicate (test)),
@@ -224,19 +240,28 @@ Worker::Worker (RTCORBA::RTORB_ptr rtorb,
 
   // Base protocol is used for setting up and tearing down the test.
   this->base_protocol_policy_.length (1);
-  
+
   // Test protocol is the one being tested.
   this->test_protocol_policy_.length (1);
 
+  RTCORBA::ProtocolProperties_var base_transport_protocol_properties =
+    TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::TAG_INTERNET_IOP,
+                                                                         orb->orb_core ());
+
+  RTCORBA::TCPProtocolProperties_var tcp_base_transport_protocol_properties =
+    RTCORBA::TCPProtocolProperties::_narrow (base_transport_protocol_properties.in ());
+
+  tcp_base_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
+
   RTCORBA::ProtocolList protocols;
   protocols.length (1);
   protocols[0].transport_protocol_properties =
-    RTCORBA::ProtocolProperties::_nil ();
+    base_transport_protocol_properties;
   protocols[0].orb_protocol_properties =
     RTCORBA::ProtocolProperties::_nil ();
 
   // IIOP is always used for the base protocol.
-  protocols[0].protocol_type = 0;
+  protocols[0].protocol_type = IOP::TAG_INTERNET_IOP;
 
   // User decides the test protocol.
   this->base_protocol_policy_[0] =
@@ -245,7 +270,7 @@ Worker::Worker (RTCORBA::RTORB_ptr rtorb,
   if (ACE_OS::strcmp (test_protocol, "DIOP") == 0)
     {
       if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "test protocol is DIOP\n"));
-      protocols[0].protocol_type = TAO_TAG_UDP_PROFILE;
+      protocols[0].protocol_type = TAO_TAG_DIOP_PROFILE;
     }
   else if (ACE_OS::strcmp (test_protocol, "SCIOP") == 0)
     {
@@ -255,9 +280,38 @@ Worker::Worker (RTCORBA::RTORB_ptr rtorb,
   else
     {
       if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "test protocol is IIOP\n"));
-      protocols[0].protocol_type = 0;
+      protocols[0].protocol_type = IOP::TAG_INTERNET_IOP;
+    }
+
+  RTCORBA::ProtocolProperties_var test_transport_protocol_properties =
+    TAO_Protocol_Properties_Factory::create_transport_protocol_property (protocols[0].protocol_type,
+                                                                         orb->orb_core ());
+
+  if (protocols[0].protocol_type == TAO_TAG_DIOP_PROFILE)
+    {
+      RTCORBA::UserDatagramProtocolProperties_var udp_test_transport_protocol_properties =
+        RTCORBA::UserDatagramProtocolProperties::_narrow (test_transport_protocol_properties.in ());
+
+      udp_test_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
+    }
+  else if (protocols[0].protocol_type == TAO_TAG_SCIOP_PROFILE)
+    {
+      RTCORBA::StreamControlProtocolProperties_var sctp_test_transport_protocol_properties =
+        RTCORBA::StreamControlProtocolProperties::_narrow (test_transport_protocol_properties.in ());
+
+      sctp_test_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
+    }
+  else if (protocols[0].protocol_type == IOP::TAG_INTERNET_IOP)
+    {
+      RTCORBA::TCPProtocolProperties_var tcp_test_transport_protocol_properties =
+        RTCORBA::TCPProtocolProperties::_narrow (test_transport_protocol_properties.in ());
+
+      tcp_test_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
     }
 
+  protocols[0].transport_protocol_properties =
+    test_transport_protocol_properties;
+
   this->test_protocol_policy_[0] =
     this->rtorb_->create_client_protocol_policy (protocols);
 }
@@ -274,105 +328,100 @@ Worker::print_stats (void)
   ACE_DEBUG ((LM_DEBUG,
               "\n************ Statistics ************\n\n"));
 
-  // 
+  //
   // Senders-side stats for PACED invocations are not too relevant
   // since we are doing one way calls.
   //
   if (test_type == PACED)
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "Rate = %d/sec; Iterations = %d; ",
-		  invocation_rate,
-		  iterations));
-      
+                  "Rate = %d/sec; Iterations = %d; ",
+                  invocation_rate,
+                  iterations));
+
       if (count_missed_end_deadlines)
-	ACE_DEBUG ((LM_DEBUG,
-		    "Deadlines made/missed[start,end]/%% = %d/%d[%d,%d]/%.2f%%; Effective Rate = %.2f\n",
-		    made_total_deadlines,
-		    missed_total_deadlines,
-		    this->missed_start_deadlines_,
-		    this->missed_end_deadlines_,
-		    made_total_deadlines * 100 / (double) iterations,
-		    made_total_deadlines / to_seconds (this->test_end_ - this->test_start_, gsf)));
+        ACE_DEBUG ((LM_DEBUG,
+                    "Deadlines made/missed[start,end]/%% = %d/%d[%d,%d]/%.2f%%; Effective Rate = %.2f\n",
+                    made_total_deadlines,
+                    missed_total_deadlines,
+                    this->missed_start_deadlines_,
+                    this->missed_end_deadlines_,
+                    made_total_deadlines * 100 / (double) iterations,
+                    made_total_deadlines / to_seconds (this->test_end_ - this->test_start_, gsf)));
       else
-	ACE_DEBUG ((LM_DEBUG,
-		    "Deadlines made/missed/%% = %d/%d/%.2f%%; Effective Rate = %.2f\n",
-		    made_total_deadlines,
-		    missed_total_deadlines,
-		    made_total_deadlines * 100 / (double) iterations,
-		    made_total_deadlines / to_seconds (this->test_end_ - this->test_start_, gsf)));
+        ACE_DEBUG ((LM_DEBUG,
+                    "Deadlines made/missed/%% = %d/%d/%.2f%%; Effective Rate = %.2f\n",
+                    made_total_deadlines,
+                    missed_total_deadlines,
+                    made_total_deadlines * 100 / (double) iterations,
+                    made_total_deadlines / to_seconds (this->test_end_ - this->test_start_, gsf)));
 
       if (print_missed_invocations)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "\nMissed start invocations are:\n"));
-	  
-	  for (CORBA::ULong j = 0;
-	       j < this->missed_start_deadlines_;
-	       ++j)
-	    {
-	      ACE_DEBUG ((LM_DEBUG,
-			  "%d ",
-			  this->missed_start_invocations_[j]));
-	    }
-	  
-	  ACE_DEBUG ((LM_DEBUG, "\n"));
-	  
-	  if (count_missed_end_deadlines)
-	    {
-	      ACE_DEBUG ((LM_DEBUG, "\nMissed end invocations are:\n"));
-	      
-	      for (CORBA::ULong j = 0;
-		   j < this->missed_end_deadlines_;
-		   ++j)
-		{
-		  ACE_DEBUG ((LM_DEBUG,
-			      "%d ",
-			      this->missed_end_invocations_[j]));
-		}
-	      
-	      ACE_DEBUG ((LM_DEBUG, "\n"));
-	    }
-	}
+        {
+          ACE_DEBUG ((LM_DEBUG, "\nMissed start invocations are:\n"));
+
+          for (CORBA::ULong j = 0;
+               j < this->missed_start_deadlines_;
+               ++j)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "%d ",
+                          this->missed_start_invocations_[j]));
+            }
+
+          ACE_DEBUG ((LM_DEBUG, "\n"));
+
+          if (count_missed_end_deadlines)
+            {
+              ACE_DEBUG ((LM_DEBUG, "\nMissed end invocations are:\n"));
+
+              for (CORBA::ULong j = 0;
+                   j < this->missed_end_deadlines_;
+                   ++j)
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                              "%d ",
+                              this->missed_end_invocations_[j]));
+                }
+
+              ACE_DEBUG ((LM_DEBUG, "\n"));
+            }
+        }
     }
 
   // Individual calls are relevant for the PACED and LATENCY tests.
-  if (test_type == PACED || 
+  if (test_type == PACED ||
       test_type == LATENCY)
     {
       if (do_dump_history)
-	{
-	  this->history_.dump_samples ("HISTORY", gsf);
-	}
-      
+        {
+          this->history_.dump_samples ("HISTORY", gsf);
+        }
+
       ACE_Basic_Stats stats;
       this->history_.collect_basic_stats (stats);
       stats.dump_results ("Total", gsf);
-      
+
       ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-					     this->test_end_ - this->test_start_,
-					     iterations);      
+                                             this->test_end_ - this->test_start_,
+                                             iterations);
     }
   else
     {
-      ACE_hrtime_t elapsed_time = 
-	this->test_end_ - this->test_start_;
+      ACE_hrtime_t elapsed_time =
+        this->test_end_ - this->test_start_;
 
       double seconds =
-# if defined ACE_LACKS_LONGLONG_T
-	elapsed_time / gsf;
-# else  /* ! ACE_LACKS_LONGLONG_T */
-      static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (elapsed_time / gsf));
-# endif /* ! ACE_LACKS_LONGLONG_T */
-      seconds /= ACE_HR_SCALE_CONVERSION;
-      
+        to_seconds (elapsed_time, gsf);
+
       ACE_hrtime_t bits = iterations;
       bits *= message_size * 8;
 
       ACE_DEBUG ((LM_DEBUG,
-		  "%Q bits sent in %5.1f seconds at a rate of %5.2f Mbps\n",
-		  bits,
-		  seconds,
-		  bits / seconds / 1000 / 1000));
+                  "%Q bits sent in %5.1f seconds at a rate of %5.2f Mbps\n",
+                  bits,
+                  seconds,
+                  ACE_UINT64_DBLCAST_ADAPTER (bits) / seconds / 1000 / 1000));
     }
 }
 
@@ -421,31 +470,31 @@ Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
 
     test_protocol_setup:
 
-      ACE_TRY
-	{
-	  // Send a message to ensure that the connection is setup.
-	  this->test_->oneway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_TRY_CHECK;
+      ACE_TRY_EX (B1)
+        {
+          // Send a message to ensure that the connection is setup.
+          this->test_->oneway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (B1);
 
-	  goto test_protocol_success;
-	}
+          goto test_protocol_success;
+        }
       ACE_CATCH (CORBA::TRANSIENT, exception)
-	{
-	  ++j;
-	  
-	  if (j < number_of_connection_attempts)
-	    {
-	      ACE_OS::sleep (1);
-	      goto test_protocol_setup;
-	    }
-	}
+        {
+          ++j;
+
+          if (j < number_of_connection_attempts)
+            {
+              ACE_OS::sleep (1);
+              goto test_protocol_setup;
+            }
+        }
       ACE_ENDTRY;
 
-      ACE_ERROR ((LM_ERROR, 
-		  "Cannot setup test protocol\n"));
+      ACE_ERROR ((LM_ERROR,
+                  "Cannot setup test protocol\n"));
 
       ACE_OS::exit (-1);
-    }  
+    }
 
  test_protocol_success:
 
@@ -463,36 +512,36 @@ Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
 
     base_protocol_setup:
 
-      ACE_TRY
-	{
-	  // Let the server know what to expect..
-	  this->test_->start_test (this->session_id_,
-				   test_protocol,
-				   invocation_rate,
-				   message_size,
-				   iterations
-				   ACE_ENV_ARG_PARAMETER);
-	  ACE_TRY_CHECK;
-
-	  goto base_protocol_success;
-	}
+      ACE_TRY_EX (B2)
+        {
+          // Let the server know what to expect..
+          this->test_->start_test (this->session_id_,
+                                   test_protocol,
+                                   invocation_rate,
+                                   message_size,
+                                   iterations
+                                   ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (B2);
+
+          goto base_protocol_success;
+        }
       ACE_CATCH (CORBA::TRANSIENT, exception)
-	{
-	  ACE_OS::sleep (1);
-
-	  if (k < number_of_connection_attempts)
-	    {
-	      ACE_OS::sleep (1);
-	      goto base_protocol_setup;
-	    }
-	}
+        {
+          ACE_OS::sleep (1);
+
+          if (k < number_of_connection_attempts)
+            {
+              ACE_OS::sleep (1);
+              goto base_protocol_setup;
+            }
+        }
       ACE_ENDTRY;
 
-      ACE_ERROR ((LM_ERROR, 
-		  "Cannot setup base protocol\n"));
+      ACE_ERROR ((LM_ERROR,
+                  "Cannot setup base protocol\n"));
 
       ACE_OS::exit (-1);
-    }  
+    }
 
  base_protocol_success:
 
@@ -507,7 +556,7 @@ Worker::run (ACE_ENV_SINGLE_ARG_DECL)
                                                CORBA::SET_OVERRIDE
                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   // Payload.
   ::test::octets_var payload (new ::test::octets);
   payload->length (message_size);
@@ -534,82 +583,83 @@ Worker::run (ACE_ENV_SINGLE_ARG_DECL)
 
       // For PACED and LATENCY, each sender call is individually
       // noted.
-      if (test_type == PACED || 
-	  test_type == LATENCY)
-	{
-	  time_before_call =
-	    ACE_OS::gethrtime ();
-	  
-	  // Pacing code.
-	  if (test_type == PACED)
-	    {
-	      deadline_for_current_call =
-		this->deadline_for_current_call (i);
-	      
-	      if (time_before_call > deadline_for_current_call)
-		{
-		  this->missed_start_deadline (i);
-		  continue;
-		}
-	    }
-	}
+      if (test_type == PACED ||
+          test_type == LATENCY)
+        {
+          time_before_call =
+            ACE_OS::gethrtime ();
+
+          // Pacing code.
+          if (test_type == PACED)
+            {
+              deadline_for_current_call =
+                this->deadline_for_current_call (i);
+
+              if (time_before_call > deadline_for_current_call)
+                {
+                  this->missed_start_deadline (i);
+                  continue;
+                }
+            }
+        }
 
       // Use oneways for PACING and THROUGHPUT.
-      if (test_type == PACED || 
-	  test_type == THROUGHPUT)
-	{
-	  this->test_->oneway_method (this->session_id_,
-				      i,
-				      payload.in ()
-				      ACE_ENV_ARG_PARAMETER);
-	  ACE_CHECK;
-	}
+      if (test_type == PACED ||
+          test_type == THROUGHPUT)
+        {
+          this->test_->oneway_method (this->session_id_,
+                                      i,
+                                      payload.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
       else
-	{
-	  // Use twoway calls for LATENCY.
-	  this->test_->twoway_method (this->session_id_,
-				      i,
-				      payload.inout ()
-				      ACE_ENV_ARG_PARAMETER);
-	  ACE_CHECK;	  
-	}
+        {
+          // Use twoway calls for LATENCY.
+          this->test_->twoway_method (this->session_id_,
+                                      i,
+                                      payload.inout ()
+                                      ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
 
       // For PACED and LATENCY, each sender call is individually
       // noted.
-      if (test_type == PACED || 
-	  test_type == LATENCY)
-	{
-	  ACE_hrtime_t time_after_call =
-	    ACE_OS::gethrtime ();
-
-	  if (test_type == LATENCY)	    
-	    this->history_.sample ((time_after_call - time_before_call) / 2);
-	  else
-	    this->history_.sample (time_after_call - time_before_call);
-	  
-	  if (test_type == PACED)
-	    {
-	      if (time_after_call > deadline_for_current_call)
-		{
-		  this->missed_end_deadline (i);
-		  continue;
-		}
-	      
-	      ACE_hrtime_t sleep_time =
-		deadline_for_current_call - time_after_call;
-	      
-	      ACE_OS::sleep (ACE_Time_Value (0,
-					     long (to_seconds (sleep_time, gsf) *
-						   ACE_ONE_SECOND_IN_USECS)));
-	    }
-	}
+      if (test_type == PACED ||
+          test_type == LATENCY)
+        {
+          ACE_hrtime_t time_after_call =
+            ACE_OS::gethrtime ();
+
+          if (test_type == LATENCY)
+            this->history_.sample ((time_after_call - time_before_call) / 2);
+          else
+            this->history_.sample (time_after_call - time_before_call);
+
+          if (test_type == PACED)
+            {
+              if (time_after_call > deadline_for_current_call)
+                {
+                  this->missed_end_deadline (i);
+                  continue;
+                }
+
+              ACE_hrtime_t sleep_time =
+                deadline_for_current_call - time_after_call;
+
+              ACE_OS::sleep (ACE_Time_Value (0,
+                                             long (to_seconds (sleep_time, gsf) *
+                                                   ACE_ONE_SECOND_IN_USECS)));
+            }
+        }
     }
 
   // This call is used to ensure that all the THROUGHPUT related data
   // has reached the server.
-  if (test_type == THROUGHPUT)
+  if (test_type == THROUGHPUT &&
+      ACE_OS::strcmp (test_protocol, "DIOP") != 0)
     {
-      this->test_->twoway_sync (ACE_ENV_ARG_PARAMETER);
+      this->test_->twoway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -623,7 +673,7 @@ Worker::run (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   // Tell server that the test is over.
-  this->test_->end_test (ACE_ENV_ARG_PARAMETER);
+  this->test_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -666,6 +716,31 @@ main (int argc, char **argv)
       if (parse_args_result != 0)
         return parse_args_result;
 
+      // Resolve the Network priority Mapping Manager
+      object =
+        orb->resolve_initial_references ("NetworkPriorityMappingManager"
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
+        RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()
+                                                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // Initialize the custom priority mapping
+      Custom_Network_Priority_Mapping *cnpm = 0;
+      ACE_NEW_RETURN  (cnpm,
+                       Custom_Network_Priority_Mapping,
+                       -1);
+
+      // Set the desired corba priority on the network mapping manager
+      cnpm->corba_priority (corba_priority);
+
+      // Load the custom network priority mapping object in the
+      // network priority mapping manager. The user can thus add his
+      // own priority mapping.
+      mapping_manager->mapping (cnpm);
+
       object =
         orb->string_to_object (ior
                                ACE_ENV_ARG_PARAMETER);
@@ -676,18 +751,19 @@ main (int argc, char **argv)
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Worker worker (rtorb.in (),
-		     policy_manager.in (),
-		     test.in ());
+      Worker worker (orb.in (),
+                     rtorb.in (),
+                     policy_manager.in (),
+                     test.in ());
 
       worker.setup (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-  
+
       worker.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (print_statistics)
-	worker.print_stats ();
+        worker.print_stats ();
 
       if (shutdown_server)
         {
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index d95a1c1b699..5a1b5a0af83 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -136,7 +136,7 @@ main (int argc, char *argv[])
         }
       else
         ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
+                    "client (%P|%t): sched_params failed\n"));
     }
 
   ACE_TRY_NEW_ENV
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index 8f2095c085a..d8094de1d7a 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -136,7 +136,7 @@ main (int argc, char *argv[])
         }
       else
         ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
+                    "client (%P|%t): sched_params failed\n"));
     }
 
   ACE_TRY_NEW_ENV
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 7f05eaffe9b..6ff62b839ee 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -9,6 +9,8 @@
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_string.h"
+
 
 ACE_RCSID (Reliable,
            client,
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index 04599b0790f..3981c21c94e 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -216,8 +216,7 @@ to_seconds (ACE_UINT64 hrtime,
 #if defined ACE_LACKS_LONGLONG_T
     hrtime / sf;
 #else  /* ! ACE_LACKS_LONGLONG_T */
-  ACE_static_cast (double,
-                   ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
+  static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
 #endif /* ! ACE_LACKS_LONGLONG_T */
   seconds /= ACE_HR_SCALE_CONVERSION;
 
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
index 1bd5a916d6b..d2f0ddb267b 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*AMH sequence server): server, strategies, valuetype, amh {
+project(*AMH sequence server): taoserver, strategies, valuetype, amh {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
 
-project(*AMH sequence client): taoexe, strategies, valuetype, amh {
+project(*AMH sequence client): taoclient, strategies, valuetype, amh {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
index 1cbc98f65fb..a954561d133 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*sequence server): taoexe, messaging, strategies {
+project(*sequence server): taoserver, messaging, strategies {
   idlflags += -GC
   requires += ami
 
@@ -12,8 +12,7 @@ project(*sequence server): taoexe, messaging, strategies {
   }
 }
 
-project(*sequence client): taoexe, messaging, strategies {
-  exename   = client
+project(*sequence client): taoclient, messaging, strategies {
   idlflags += -GC
   requires += ami
 
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index 7984c536efe..c1343244eab 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -7,8 +7,13 @@
 #include "ace/Sched_Params.h"
 #include "ace/Stats.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (AMI,
+           client,
+           "$Id$")
 
-ACE_RCSID(AMI_Latency, client, "$Id$")
 
 const char *ior = "file://test.ior";
 
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
index 10900fc5f8f..92392fd29ac 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(* sequence server): server, strategies, minimum_corba {
+project(* sequence server): taoserver, strategies, minimum_corba {
 
   Source_Files {
     Roundtrip.cpp
@@ -9,7 +9,7 @@ project(* sequence server): server, strategies, minimum_corba {
   }
 }
 
-project(* sequence client): server, strategies, dynamicinterface, minimum_corba {
+project(* sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
   exename  = client
 
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
index 072c235fe46..7188391fbb8 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  -->
  <!--  $Id$ -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
+ <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"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index 8aa01068f30..f0b080a54e7 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*sequence server) : server, strategies, dynamicinterface, minimum_corba {
+project(*sequence server) : taoserver, strategies, dynamicinterface, minimum_corba {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
-project(*sequence client): taoexe, strategies, minimum_corba {
+project(*sequence client): taoclient, strategies, minimum_corba {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf
index 60ee1e2554f..557c16b5caf 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf
+++ b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf
@@ -1,6 +1,6 @@
 #
 # $Id$
 #
-static Advanced_Resource_Factory "-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
+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"
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
index de29eb000ce..d35a5ac7473 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  -->
  <!--  $Id$ -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
+ <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"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 10900fc5f8f..92392fd29ac 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(* sequence server): server, strategies, minimum_corba {
+project(* sequence server): taoserver, strategies, minimum_corba {
 
   Source_Files {
     Roundtrip.cpp
@@ -9,7 +9,7 @@ project(* sequence server): server, strategies, minimum_corba {
   }
 }
 
-project(* sequence client): server, strategies, dynamicinterface, minimum_corba {
+project(* sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
   exename  = client
 
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf
index e7c7bcb4a97..c15a02cf58f 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf
@@ -1,6 +1,6 @@
 #
 # $Id$
 #
-static Advanced_Resource_Factory "-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
+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"
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
index b3ab51c9799..a9d9071cbd8 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  -->
  <!--  $Id$ -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
+ <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"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
index 4eefe93e57b..f57f84ab10e 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*sequence server) : server, strategies {
+project(*sequence server) : taoserver, strategies {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
 
-project(*sequence client): taoexe, strategies {
+project(*sequence client): taoclient, strategies {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
index 764859f1359..5b2a58bb6f0 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  -->
  <!--  $Id$ -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
+ <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"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
index 10508d27545..cb479a71683 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(* seq server): server, strategies {
+project(* seq server): taoserver, strategies {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
 
-project(* seq client): taoexe, strategies {
+project(* seq client): taoclient, strategies {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
index 515ffa2142a..524acbb2ecf 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(* sequence server): server, strategies {
+project(* sequence server): taoserver, strategies {
   Source_Files {
     Roundtrip.cpp
     Worker_Thread.cpp
@@ -9,7 +9,7 @@ project(* sequence server): server, strategies {
   }
 }
 
-project(* sequence client): taoexe, strategies {
+project(* sequence client): taoclient, strategies {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/performance-tests/Throughput/svc.conf b/TAO/performance-tests/Throughput/svc.conf
index 747d2483c82..0804ab1486e 100644
--- a/TAO/performance-tests/Throughput/svc.conf
+++ b/TAO/performance-tests/Throughput/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Advanced_Resource_Factory "-ORBresources global -ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"
+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"
diff --git a/TAO/performance-tests/Throughput/svc.conf.xml b/TAO/performance-tests/Throughput/svc.conf.xml
index 7631b250228..32eb197be90 100644
--- a/TAO/performance-tests/Throughput/svc.conf.xml
+++ b/TAO/performance-tests/Throughput/svc.conf.xml
@@ -5,7 +5,7 @@
  <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBresources global -ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"/>
+ <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"/>
 </ACE_Svc_Conf>
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 124f3822782..8ce6fafae99 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -17,9 +17,12 @@ endif
 
 ifndef TAO_IDL
   TAO_IDL = $(TAO_ROOT)/TAO_IDL/tao_idl
+  TAO_IDL_DEP = $(TAO_IDL)$(EXEEXT)
+else
+ifndef TAO_IDL_DEP
+  TAO_IDL_DEP = $(TAO_IDL)
+endif
 endif
-
-TAO_IDL_DEP = $(TAO_IDL)$(EXEEXT)
 
 ifeq (,$(findstring -L$(TAO_ROOT)/tao,$(LDFLAGS)))
   LDFLAGS += -L$(TAO_ROOT)/tao
diff --git a/TAO/tao-config.1.in b/TAO/tao-config.1.in
deleted file mode 100644
index ace12a91ac2..00000000000
--- a/TAO/tao-config.1.in
+++ /dev/null
@@ -1,56 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii tao-config.1
-.\"
-.TH tao-config 1 "DECEMBER 1998" "Library Configuration" "User Manuals"
-.SH NAME
-tao-config \- Display TAO Library Configuration
-.SH SYNOPSIS
-.B tao-config 
-.I OPTION 
-.B [
-.I OPTION
-.B ... ] 
-.B [
-.I LIBRARY
-.B ]
-.SH DESCRIPTION
-.B tao-config
-is a script that is used to display what compiler flags and libraries were
-used when TAO was built.
-.SH OPTIONS
-.IP --version
-TAO version information
-.IP --help
-display help message and exit
-.IP --cxx
-C++ compiler used for compiling
-.IP --cxxflags
-C++ pre-processor and compiler flags
-.IP --libs
-library linking information
-.IP --libs-only-L
-the -L/-R part of
-.I --libs
-.IP --libs-only-l
-the -l part of 
-.I --libs
-.SH LIBRARY
-.I LIBRARY
-refers to the library for which the specified configuration is desired.  Valid
-libraries are:
-.IP orbsvcs
-the TAO ORB services library
-.IP tao
-the TAO library
-.SH FILES
-.I @libdir@/taoConf.sh
-.RS
-Additional TAO related library configuration information.
-.RE
-.SH BUGS
-None.
-exists.
-.SH AUTHOR
-Ossama Othman <othman@cs.wustl.edu>
-.SH "SEE ALSO"
-.BR ace-config (1)
diff --git a/TAO/tao-config.in b/TAO/tao-config.in
deleted file mode 100644
index 757c80eb15c..00000000000
--- a/TAO/tao-config.in
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-
-set -e
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-
-bindir=@bindir@
-sbindir=@sbindir@
-libexecdir=@libexecdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-sharedstatedir=@sharedstatedir@
-localstatedir=@localstatedir@
-libdir=@libdir@
-infodir=@infodir@
-mandir=@mandir@
-includedir=@includedir@
-
-pkgdatadir=${datadir}/@PACKAGE@
-pkglibdir=${libdir}/@PACKAGE@
-pkgincludedir=${includedir}/@PACKAGE@
-
-usage()
-{
-    cat <<EOF
-Usage: tao-config OPTION [OPTIONS...] [LIBRARY]
-
-Generic options:
-  --version	output TAO version information
-  --help	display this help and exit
-
-Compilation support options:
-  --cxx         print C++ compiler used for compiling
-  --cxxflags	print C++ pre-processor and compiler flags
-  --libs	print library linking information
-  --libs-only-L	only print the -L/-R part of --libs
-  --libs-only-l only print the -l part of --libs
-
-Install directories TAO was configured with:
-  --prefix  --exec-prefix  --bindir  --sbindir  --libexecdir  --datadir
-  --sysconfdir  --sharedstatedir  --localstatedir  --libdir  --infodir
-  --mandir  --includedir
-
-Known values for LIBRARY are:
-
-    ace         (calls ace-config)
-    orbsvcs
-    tao
-
-If LIBRARY is none of these,
-    
-    ${libdir}/<LIBRARY>Conf.sh
-
-is looked in for the necessary information. 
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-cxx=false
-cxxflags=false
-libs_L=false
-libs_l=false
-
-# These values are only valid for TAO.
-the_compiler="@CXX@"
-the_libs="$the_libs @TAO_LIBDIR@ -lTAO @TAO_LIBS@"
-the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
-
-while test $# -gt 0; do
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case $1 in
-    --version)
-	echo @PACKAGE@ @VERSION@
-	exit 0
-	;;
-    --exec-prefix)
-	echo $exec_prefix
-	exit 0
-	;;
-    --prefix)
-	echo $prefix
-	exit 0
-	;;
-    --*dir)
-	dirname=\$`echo $1 | sed -e 's,^--,,'`
-	dirname=`eval echo $dirname`
-	test -z "$dirname" && exit 1
-	echo $dirname
-	exit 0
-	;;
-    --help)
-	usage 0
-	;;
-    --cxx)
-        cxx=true
-        ;;
-    --cxxflags)
-       	cxxflags=true
-       	;;
-    --libs)
-       	libs_L=true
-	libs_l=true
-       	;;
-    --libs-only-L)
-	libs_L=true
-	;;
-    --libs-only-l)
-	libs_l=true
-	;;
-    --*)
-	usage 1
-	;;
-    ace)
-        # The ACE compiler should be the same as TAO's compiler!
-        the_compiler="`ace-config --cxx tao`"
-        the_libs="$the_libs `ace-config --libs ace`"
-        the_flags="$the_flags `ace-config --cxxflags ace`"
-	;;
-    tao)
-# These are set before this option parsing loop begins.
-#       the_compiler="@CXX@"
-#       the_libs="$the_libs @TAO_LIBDIR@ @TAO_LIBS@"
-#       the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
-	;;
-    orbsvcs)
-        echo "Currently unsupported."
-        exit 1
-#      	the_libs="$the_libs @TAO_LIBDIR@ @ORBSVCS_LIBS@"
-#  	the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
-	;;
-    *)
-	cnf_sh=${libdir}/${1}Conf.sh
-	if test -f ${cnf_sh}; then
-	    . ${cnf_sh}
-	    up_name=`echo $1 | tr a-z A-Z`
-            cnf_compiler=\$${up_name}_COMPILER
-	    cnf_libdir=\$${up_name}_LIBDIR
-	    cnf_libs=\$${up_name}_LIBS
-	    cnf_flags=\$${up_name}_INCLUDEDIR
-            the_compiler="`eval echo $cnf_compiler`"
-	    the_libs="$the_libs `eval echo $cnf_libdir` `eval echo $cnf_libs`"
-	    the_flags="$the_flags `eval echo $cnf_flags`"
-	else
-	    echo Unknown library \`$1\' 1>&2
-	fi
-	;;
-    esac
-    shift
-done
-
-if $cxx; then
-    all_flags="$the_compiler"
-fi
-
-if $cxxflags; then
-    all_flags="$all_flags $the_flags"
-fi
-
-if $libs_L || $libs_l; then
-    all_flags="$all_flags $the_libs"
-fi
-
-if test -z "$all_flags" || test "x$all_flags" = "x "; then
-    exit 1
-fi
-
-# Straight out any possible duplicates, but be careful to
-# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz'
-other_flags=
-lib_L_flags=
-rev_libs=
-for i in $all_flags; do
-    case "$i" in
-    # a library, save it for later, in reverse order
-    -l*) rev_libs="$i $rev_libs" ;;
-    -L*|-R*)
-	if $libs_L; then
-	    case " $lib_L_flags " in
-	    *\ $i\ *) ;;			# already there
-	    *) lib_L_flags="$lib_L_flags $i" ;;	# add it to output
-	    esac 
-	fi;;
-    *)
-	case " $other_flags " in
-	*\ $i\ *) ;;				# already there
-	*) other_flags="$other_flags $i" ;;	# add it to output
-        esac ;;
-    esac
-done
-
-ord_libs=
-if $libs_l; then
-    for i in $rev_libs; do
-	case " $ord_libs " in
-	*\ $i\ *) ;;			# already there
-	*) ord_libs="$i $ord_libs" ;;	# add it to output in reverse order
-	esac
-    done
-fi
-
-echo $other_flags $lib_L_flags $ord_libs
-
-exit 0
diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp
index 98a3efb01d2..2a7ca91f360 100644
--- a/TAO/tao/Acceptor_Filter.cpp
+++ b/TAO/tao/Acceptor_Filter.cpp
@@ -1,22 +1,10 @@
 // $Id$
 
-
 #include "tao/Acceptor_Filter.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Acceptor_Filter.i"
-#endif /* __ACE_INLINE__ */
-
-
 ACE_RCSID(tao, Acceptor_Filter, "$Id$")
 
-
 TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h
index 88cb68d5fea..aab2bad47fb 100644
--- a/TAO/tao/Acceptor_Filter.h
+++ b/TAO/tao/Acceptor_Filter.h
@@ -62,9 +62,5 @@ public:
   virtual int encode_endpoints (TAO_MProfile &mprofile) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-# include "Acceptor_Filter.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ACCEPTOR_FILTER_H */
diff --git a/TAO/tao/Acceptor_Filter.i b/TAO/tao/Acceptor_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Acceptor_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index 60de99f4815..2286ae6c4fd 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -33,10 +33,6 @@
 #include "Transport.h"
 #include "debug.h"
 
-#if !defined(__ACE_INLINE__)
-#include "tao/Acceptor_Impl.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            Acceptor_Impl,
            "$Id$")
@@ -44,13 +40,10 @@ ACE_RCSID (tao,
 //////////////////////////////////////////////////////////////////////////////
 
 template <class SVC_HANDLER>
-TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (
-  TAO_ORB_Core *orb_core,
-  void *arg,
-  CORBA::Boolean flag)
+TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (TAO_ORB_Core *orb_core,
+                                                           CORBA::Boolean flag)
   : ACE_Creation_Strategy<SVC_HANDLER> (0, orb_core->reactor()),
     orb_core_ (orb_core),
-    arg_ (arg),
     lite_flag_ (flag)
 {
 }
@@ -65,8 +58,7 @@ TAO_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
 
       ACE_NEW_RETURN (sh,
                       SVC_HANDLER (this->orb_core_,
-                                   this->lite_flag_,
-                                   this->arg_),
+                                   this->lite_flag_),
                       -1);
     }
 
@@ -90,7 +82,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
   // Indicate that this transport was opened in the server role
   if (TAO_debug_level > 6)
     ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) - TAO_Concurrency_Strategy::activate_svc_handler "
+                "TAO (%P|%t) - Concurrency_Strategy::activate_svc_handler, "
                 "opened as TAO_SERVER_ROLE\n"));
 
   // Here the service handler has been created and the new connection
@@ -111,7 +103,8 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) Could not add the handler to Cache \n")));
+                      ACE_TEXT ("TAO (%P|%t) - Concurrency_Strategy::activate_svc_handler, ")
+                      ACE_TEXT ("could not add the handler to cache \n")));
         }
 
       return -1;
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
index 836150520c6..ac978b8167d 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -37,12 +37,9 @@ class TAO_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER>
 {
 public:
   /**
-   * Constructor. <arg> parameter is used to pass any special
-   * state/info to the service handler upon creation.  Currently used
-   * by IIOP and UIOP to pass protocol configuration properties.
+   * Constructor.
    */
   TAO_Creation_Strategy (TAO_ORB_Core *orb_core,
-                         void *arg = 0,
                          CORBA::Boolean flag = 0);
 
   /// Create a SVC_HANDLER  and set the ORB_Core pointer on it.
@@ -52,9 +49,6 @@ protected:
   /// Pointer to the ORB Core.
   TAO_ORB_Core *orb_core_;
 
-  /// Some info/state to be passed to the service handler we create.
-  void *arg_;
-
   /// Should we use the Lite version for any protocol?
   CORBA::Boolean lite_flag_;
 };
@@ -111,10 +105,6 @@ protected:
   TAO_ORB_Core *orb_core_;
 };
 
-#if defined(__ACE_INLINE__)
-#include "tao/Acceptor_Impl.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "tao/Acceptor_Impl.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Acceptor_Impl.i b/TAO/tao/Acceptor_Impl.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Acceptor_Impl.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 0508d97bbc8..df425a921c5 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -117,21 +117,10 @@ TAO_Acceptor_Registry::get_acceptor (CORBA::ULong tag)
 int
 TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                              ACE_Reactor *reactor,
-                             int ignore_address
+                             const TAO_EndpointSet &endpoint_set,
+                             bool ignore_address
                              ACE_ENV_ARG_DECL)
 {
-  // protocol_factories is in the following form
-  //   IOP1://addr1,addr2,...,addrN/;IOP2://addr1,...addrM/;...
-  TAO_EndpointSet endpoint_set = orb_core->orb_params ()->endpoints ();
-
-  // Check to see if there is an additional endpoint value defined
-  // as an environment property.
-  ACE_CString env_endpoint = ACE_OS::getenv ("TAO_ORBENDPOINT");
-  if (ACE_OS::strcmp (env_endpoint.c_str(), "") != 0)
-    {
-      endpoint_set.enqueue_tail (env_endpoint);
-    }
-
   if (endpoint_set.is_empty ()
       // No endpoints were specified, we let each protocol pick its
       // own default.
@@ -151,7 +140,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
   // Count the maximum number of endpoints in the set.  This will be
   // the maximum number of acceptors that need to be created.
   size_t acceptor_count = 0;
-  TAO_EndpointSetIterator endpts = endpoint_set.begin ();
+  TAO_EndpointSetIterator endpts (endpoint_set);
 
   for (ACE_CString *ep = 0;
        endpts.next (ep) != 0;
@@ -212,7 +201,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
       ACE_CHECK_RETURN (-1);
     }
 
-  TAO_EndpointSetIterator endpoints = endpoint_set.begin ();
+  TAO_EndpointSetIterator endpoints (endpoint_set);
 
   for (ACE_CString *endpoint = 0;
        endpoints.next (endpoint) != 0;
@@ -304,11 +293,6 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
         }
     }
 
-  // No longer need the endpoint set since all associated acceptors
-  // have been opened by now.  Reclaim the memory used by the endpoint
-  // set.
-  endpoint_set.reset ();
-
   return 0;
 }
 
@@ -506,8 +490,8 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                                ACE_Reactor *reactor,
                                ACE_CString &addrs,
                                TAO_ProtocolFactorySetItor &factory,
-                               int ignore_address
-                                ACE_ENV_ARG_DECL)
+                               bool ignore_address
+                               ACE_ENV_ARG_DECL)
 {
   ACE_CString options_tmp;
   this->extract_endpoint_options (addrs,
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index 6c3e0694ffa..3ee4358174b 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -25,6 +25,7 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/Exception.h"
+#include "tao/params.h"
 
 // Forward declarations.
 class ACE_Addr;
@@ -67,7 +68,8 @@ public:
   /// Initialize all registered acceptors.  Return -1 on error.
   int open (TAO_ORB_Core *orb_core,
             ACE_Reactor *reactor,
-            int ignore_address
+            const TAO_EndpointSet &endpoint_set,
+            bool ignore_address
             ACE_ENV_ARG_DECL);
 
   /// Close all open acceptors.
@@ -119,7 +121,7 @@ private:
               ACE_Reactor *reactor,
               ACE_CString &address,
               TAO_ProtocolFactorySetItor &factory,
-              int ignore_address
+              bool ignore_address
               ACE_ENV_ARG_DECL);
 
 private:
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index 4b9199cdcf1..f7eabbc56c0 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -1,17 +1,6 @@
 // $Id$
-#include "Object.h"
-#include "Adapter.h"
-#include "SystemException.h"
-#include "debug.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
 
-#if !defined (__ACE_INLINE__)
-# include "Adapter.i"
-#endif /* __ACE_INLINE__ */
+#include "Adapter.h"
 
 ACE_RCSID (tao,
            Adapter,
@@ -21,201 +10,3 @@ TAO_Adapter::~TAO_Adapter (void)
 {
 }
 
-// ****************************************************************
-
-TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc)
-  : orb_core_ (oc),
-    adapters_capacity_ (16), // @@ Make it configurable
-    adapters_count_ (0),
-    adapters_ (0)
-{
-  ACE_NEW (this->adapters_,
-           TAO_Adapter*[this->adapters_capacity_]);
-}
-
-TAO_Adapter_Registry::~TAO_Adapter_Registry (void)
-{
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    delete this->adapters_[i];
-
-  delete[] this->adapters_;
-}
-
-void
-TAO_Adapter_Registry::close (int wait_for_completion
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC (())
-{
-  ACE_TRY
-    {
-      for (size_t i = 0; i != this->adapters_count_; ++i)
-        {
-          this->adapters_[i]->close (wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 3)
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception in TAO_Adapter_Registry::close () \n");
-        }
-      return;
-    }
-  ACE_ENDTRY;
-
-  return;
-}
-
-void
-TAO_Adapter_Registry::check_close (int wait_for_completion
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC (())
-{
-  ACE_TRY
-    {
-      for (size_t i = 0; i != this->adapters_count_; ++i)
-        {
-          this->adapters_[i]->check_close (wait_for_completion
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHALL
-    {
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) Exception in TAO_Adapter_Registry::check_close () \n")));
-        }
-      return;
-    }
-  ACE_ENDTRY;
-
-  return;
-}
-void
-TAO_Adapter_Registry::insert (TAO_Adapter *adapter
-                              ACE_ENV_ARG_DECL)
-{
-  if (this->adapters_capacity_ == this->adapters_count_)
-    {
-      this->adapters_capacity_ *= 2;
-      TAO_Adapter **tmp;
-      ACE_NEW_THROW_EX (tmp,
-                        TAO_Adapter*[this->adapters_capacity_],
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-
-      for (size_t i = 0; i != this->adapters_count_; ++i)
-        tmp[i] = this->adapters_[i];
-      delete[] this->adapters_;
-      this->adapters_ = tmp;
-    }
-
-  int priority = adapter->priority ();
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    {
-      if (this->adapters_[i]->priority () >= priority)
-        {
-          for (size_t j = this->adapters_count_ + 1;
-               j > i;
-               --j)
-            {
-              this->adapters_[j] = this->adapters_[j - 1];
-            }
-          this->adapters_[i] = adapter;
-          this->adapters_count_++;
-          return;
-        }
-    }
-  this->adapters_[this->adapters_count_++] = adapter;
-}
-
-void
-TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key,
-                                TAO_ServerRequest &request,
-                                CORBA::Object_out forward_to
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    {
-      int r = this->adapters_[i]->dispatch (key,
-                                            request,
-                                            forward_to
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (r != TAO_Adapter::DS_MISMATCHED_KEY)
-        {
-          return;
-        }
-    }
-
-  if (CORBA::is_nil (forward_to))
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-}
-
-CORBA::Object_ptr
-TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub,
-                                                const TAO_MProfile &mprofile)
-{
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    {
-      CORBA::Object_ptr x =
-        this->adapters_[i]->create_collocated_object (stub,
-                                                      mprofile);
-      if (x != 0)
-        return x;
-    }
-  return 0;
-}
-
-CORBA::Long
-TAO_Adapter_Registry::initialize_collocated_object (TAO_Stub *stub,
-                                                    CORBA::Object_ptr obj)
-{
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    {
-      int retval =
-        this->adapters_[i]->initialize_collocated_object (stub,
-                                                          obj);
-      if (retval != 0)
-        return retval;
-    }
-  return 0;
-}
-
-TAO_Adapter *
-TAO_Adapter_Registry::find_adapter (const char *name) const
-{
-  for (TAO_Adapter **i = this->adapters_;
-       i != this->adapters_ + this->adapters_count_;
-       ++i)
-    if (ACE_OS::strcmp ((*i)->name (), name) == 0)
-      return *i;
-
-  return 0;
-
-}
-
-// ****************************************************************
-
-TAO_Adapter_Factory::~TAO_Adapter_Factory (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Adapter_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Adapter_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index a3723a868f3..e1d3afd1344 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -15,21 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Service_Object.h"
+#include "tao/SystemException.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
-
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
 
@@ -118,94 +109,6 @@ public:
                                                     CORBA::Object_ptr) = 0;
 };
 
-// ****************************************************************
-
-// @@ Move to its own file
-
-class TAO_Export TAO_Adapter_Registry
-{
-public:
-  TAO_Adapter_Registry (TAO_ORB_Core *orb_core);
-
-  /// Close the
-  ~TAO_Adapter_Registry (void);
-
-  /**
-   * 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
-   * POA while performing an upcall).
-   */
-  void close (int wait_for_completion
-              ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (());
-
-  /**
-   * Verify if the close() call can be invoked in the current
-   * context for *all* adapters.
-   * Raise the right exception if not.
-   */
-  void check_close (int wait_for_completion
-                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (());
-
-  /// Insert a new adapter into the registry.
-  void insert (TAO_Adapter *adapter
-               ACE_ENV_ARG_DECL);
-
-  /**
-   * Dispatch the request to all the adapters.
-   * It tries the adapters ordered by priority, stopping when the
-   * adapter returns a status different from DS_MISMATCHED_KEY
-   */
-  void dispatch (TAO::ObjectKey &key,
-                 TAO_ServerRequest &request,
-                 CORBA::Object_out forward_to
-                 ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Create a collocated object using the given profile and stub.
-  CORBA::Object_ptr create_collocated_object (TAO_Stub *,
-                                              const TAO_MProfile &);
-
-  /// Initialize a collocated object using the given stub and object
-  /// pointer for lazily evaluated object references.
-  CORBA::Long initialize_collocated_object (TAO_Stub *,
-                                            CORBA::Object_ptr o);
-
-  /// Fetch the adapter named @a name
-  TAO_Adapter *find_adapter (const char *name) const;
-
-private:
-  /// The ORB Core
-  TAO_ORB_Core *orb_core_;
-
-  /// A simple array of adapters.
-  size_t adapters_capacity_;
-  size_t adapters_count_;
-  TAO_Adapter **adapters_;
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Adapter_Factory : public ACE_Service_Object
-{
-public:
-  /// Destructor
-  virtual ~TAO_Adapter_Factory (void);
-
-  /// Create a new adapter
-  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0;
-};
-
-#if defined (__ACE_INLINE__)
-# include "Adapter.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 
-#endif /* TAO_OBJECT_ADAPTER_H */
+#endif /* TAO_ADAPTER_H */
diff --git a/TAO/tao/Adapter.i b/TAO/tao/Adapter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Adapter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 1ff27056605..c688e1b4cb6 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -8,6 +8,8 @@
 #include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
+#include "tao/SystemException.h"
+#include "tao/CDR.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
@@ -121,17 +123,6 @@ CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc)
     }
 }
 
-ACE_Message_Block *
-CORBA::Any::_tao_get_cdr (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->_tao_get_cdr ();
-    }
-
-  return 0;
-}
-
 int
 CORBA::Any::_tao_byte_order (void) const
 {
@@ -305,9 +296,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
     {
       TAO::Unknown_IDL_Type *impl = 0;
       ACE_NEW_RETURN (impl,
-                      TAO::Unknown_IDL_Type (tc.in (),
-                                             0,
-                                             cdr.byte_order ()),
+                      TAO::Unknown_IDL_Type (tc.in ()),
                       0);
 
       any.replace (impl);
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 3ce2ba28b44..7095dce85d2 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -161,7 +161,6 @@ namespace CORBA
     /// TAO extension.
     void _tao_set_typecode (const CORBA::TypeCode_ptr);
 
-    ACE_Message_Block *_tao_get_cdr (void) const;
     int _tao_byte_order (void) const;
 
     /// @deprecated
diff --git a/TAO/tao/AnySeq.pidl b/TAO/tao/AnySeq.pidl
index 40fef8fb6de..d0f5ad32c84 100644
--- a/TAO/tao/AnySeq.pidl
+++ b/TAO/tao/AnySeq.pidl
@@ -10,7 +10,7 @@
  *     tao_idl
  *        -o orig -Ge 1 -Sc -GT -GA
  *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
+ *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          AnySeq.pidl
diff --git a/TAO/tao/AnySeqA.cpp b/TAO/tao/AnySeqA.cpp
index f19bfcd2a7b..9ecd3361be1 100644
--- a/TAO/tao/AnySeqA.cpp
+++ b/TAO/tao/AnySeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "AnySeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_AnySeq[] =
 {
@@ -61,7 +63,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_AnySeq (
     sizeof (_oc_CORBA_AnySeq),
     (char *) &_oc_CORBA_AnySeq,
     0,
-    sizeof (CORBA::AnySeq)
+    0
   );
 
 namespace CORBA
@@ -71,7 +73,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -128,8 +130,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -144,5 +144,4 @@ CORBA::Boolean operator>>= (
         CORBA::AnySeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp
index 61de4eca805..22d1c2b3c41 100644
--- a/TAO/tao/AnySeqC.cpp
+++ b/TAO/tao/AnySeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "AnySeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "AnySeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ANYSEQ_CS_)
 #define _CORBA_ANYSEQ_CS_
@@ -104,7 +103,7 @@ void CORBA::AnySeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_AnySeq_CPP_
 #define _TAO_CDR_OP_CORBA_AnySeq_CPP_
@@ -176,7 +175,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -221,4 +220,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/AnySeqC.h b/TAO/tao/AnySeqC.h
index e8b78538149..00474554d60 100644
--- a/TAO/tao/AnySeqC.h
+++ b/TAO/tao/AnySeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_ANYSEQC_H_
 #define _TAO_IDL_ORIG_ANYSEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Any.h"
@@ -60,9 +61,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,13 +70,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ANYSEQ_CH_)
 #define _CORBA_ANYSEQ_CH_
@@ -125,17 +124,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AnySeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -143,7 +142,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::AnySeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::AnySeq*); // noncopying version
@@ -151,7 +150,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AnySeq *&); //
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AnySeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_AnySeq_H_
 #define _TAO_CDR_OP_CORBA_AnySeq_H_
@@ -168,13 +167,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_AnySeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "AnySeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -186,3 +185,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/AnySeqS.h b/TAO/tao/AnySeqS.h
index c77fc413703..d2865514183 100644
--- a/TAO/tao/AnySeqS.h
+++ b/TAO/tao/AnySeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_ANYSEQS_H_
 #define _TAO_IDL_ORIG_ANYSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Any_Array_Impl_T.cpp b/TAO/tao/Any_Array_Impl_T.cpp
index 22760549b42..de648b9cd5e 100644
--- a/TAO/tao/Any_Array_Impl_T.cpp
+++ b/TAO/tao/Any_Array_Impl_T.cpp
@@ -4,10 +4,11 @@
 #define TAO_ANY_ARRAY_IMPL_T_C
 
 #include "tao/Any_Array_Impl_T.h"
-#include "tao/Any.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Marshal.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
+#include "tao/SystemException.h"
 
 #include "ace/CORBA_macros.h"
 #include "ace/Auto_Ptr.h"
@@ -77,9 +78,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
 
       TAO::Any_Impl *impl = any.impl ();
 
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
+      if (!impl->encoded ())
         {
           TAO::Any_Array_Impl_T<T_slice, T_forany> *narrow_impl =
             dynamic_cast <TAO::Any_Array_Impl_T <T_slice, T_forany> *> (impl);
@@ -105,22 +104,18 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
           replacement
         );
 
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                                                            TAO_DEF_GIOP_MAJOR,
-                                                            TAO_DEF_GIOP_MINOR);
-
-      impl->assign_translator (any_tc,
-                               &cdr
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // We know this will work since the unencoded case is covered above.  
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+
+      // We don't want the rd_ptr of unk to move, in case it is
+      // shared by another Any. This copies the state, not the buffer.
+      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
+      CORBA::Boolean good_decode =
+        replacement->demarshal_value (for_reading);
 
-      if (result == 1)
+      if (good_decode)
         {
           _tao_elem = reinterpret_cast <T_slice*> (replacement->value_);
           const_cast<CORBA::Any &> (any).replace (replacement);
diff --git a/TAO/tao/Any_Basic_Impl.cpp b/TAO/tao/Any_Basic_Impl.cpp
index 66aeedb132c..d19fdc9ced8 100644
--- a/TAO/tao/Any_Basic_Impl.cpp
+++ b/TAO/tao/Any_Basic_Impl.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/Any_Basic_Impl.h"
 #include "tao/Typecode.h"
-#include "tao/Any.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 
@@ -54,9 +54,11 @@ namespace TAO
       case CORBA::tk_longlong:
         this->u_.ll = *static_cast<CORBA::LongLong *> (value);
         break;
+#if !defined (ACE_LACKS_LONGLONG_T)
       case CORBA::tk_ulonglong:
         this->u_.ull = *static_cast<CORBA::ULongLong *> (value);
         break;
+#endif
       case CORBA::tk_longdouble:
         this->u_.ld = *static_cast<CORBA::LongDouble *> (value);
         break;
@@ -104,9 +106,7 @@ namespace TAO
 
         TAO::Any_Impl *impl = any.impl ();
 
-        ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-        if (mb == 0)
+        if (!impl->encoded ())
           {
             TAO::Any_Basic_Impl *narrow_impl =
               dynamic_cast<TAO::Any_Basic_Impl *> (impl);
@@ -126,30 +126,28 @@ namespace TAO
 
         auto_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement);
 
-        TAO_InputCDR cdr (mb->data_block (),
-                          ACE_Message_Block::DONT_DELETE,
-                          mb->rd_ptr () - mb->base (),
-                          mb->wr_ptr () - mb->base (),
-                          impl->_tao_byte_order (),
-                          TAO_DEF_GIOP_MAJOR,
-                          TAO_DEF_GIOP_MINOR);
+        // We know this will work since the unencoded case is covered above.  
+        TAO::Unknown_IDL_Type *unk =
+          dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
         // Get the kind of the type where we are extracting in ie. the
         // aliased  type if there are any. Passing the aliased kind
         // will not help.
-        CORBA::TCKind tck =
-          tc->kind ();
-
+        CORBA::TCKind tck = tc->kind ();
+        
+        // We don't want the rd_ptr of unk to move, in case it is
+        // shared by another Any. This copies the state, not the buffer.
+        TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-        CORBA::Boolean result =
-          replacement->demarshal_value (cdr,
-                                        (CORBA::Long) tck);
+        CORBA::Boolean good_decode =
+          replacement->demarshal_value (for_reading,
+                                        static_cast<CORBA::Long> (tck));
 
-        if (result == 1)
+        if (good_decode)
           {
             Any_Basic_Impl::assign_value (_tao_elem,
                                           replacement,
-					  tck);
+					                                tck);
             const_cast<CORBA::Any &> (any).replace (replacement);
             replacement_safety.release ();
             return 1;
@@ -193,8 +191,10 @@ namespace TAO
         return cdr << CORBA::Any::from_octet (this->u_.o);
       case CORBA::tk_longlong:
         return cdr << this->u_.ll;
+#if !defined (ACE_LACKS_LONGLONG_T)
       case CORBA::tk_ulonglong:
         return cdr << this->u_.ull;
+#endif
       case CORBA::tk_longdouble:
         return cdr << this->u_.ld;
       case CORBA::tk_wchar:
@@ -238,8 +238,10 @@ namespace TAO
         return cdr >> CORBA::Any::to_octet (this->u_.o);
       case CORBA::tk_longlong:
         return cdr >> this->u_.ll;
+#if !defined (ACE_LACKS_LONGLONG_T)
       case CORBA::tk_ulonglong:
         return cdr >> this->u_.ull;
+#endif
       case CORBA::tk_longdouble:
         return cdr >> this->u_.ld;
       case CORBA::tk_wchar:
@@ -346,9 +348,11 @@ namespace TAO
       case CORBA::tk_longlong:
         *static_cast<CORBA::LongLong *> (dest) = src->u_.ll;
         break;
+#if !defined (ACE_LACKS_LONGLONG_T)
       case CORBA::tk_ulonglong:
         *static_cast<CORBA::ULongLong *> (dest) = src->u_.ull;
         break;
+#endif
       case CORBA::tk_longdouble:
         *static_cast<CORBA::LongDouble *> (dest) = src->u_.ld;
         break;
diff --git a/TAO/tao/Any_Basic_Impl.h b/TAO/tao/Any_Basic_Impl.h
index a77df3bfa2a..e58d8749170 100644
--- a/TAO/tao/Any_Basic_Impl.h
+++ b/TAO/tao/Any_Basic_Impl.h
@@ -79,7 +79,9 @@ namespace TAO
       CORBA::Char c;
       CORBA::Octet o;
       CORBA::LongLong ll;
+#if !defined (ACE_LACKS_LONGLONG_T)
       CORBA::ULongLong ull;
+#endif
       CORBA::LongDouble ld;
       CORBA::WChar wc;
     }u_;
diff --git a/TAO/tao/Any_Basic_Impl_T.cpp b/TAO/tao/Any_Basic_Impl_T.cpp
index adb1b4d0dcf..79bb6a1896b 100644
--- a/TAO/tao/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/Any_Basic_Impl_T.cpp
@@ -4,10 +4,10 @@
 #define TAO_ANY_BASIC_IMPL_T_C
 
 #include "tao/Any_Basic_Impl_T.h"
-#include "tao/Any.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Marshal.h"
 #include "tao/Environment.h"
-#include "tao/Exception.h"
+#include "tao/SystemException.h"
 #include "tao/CDR.h"
 
 #include "ace/CORBA_macros.h"
@@ -69,9 +69,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
 
       TAO::Any_Impl *impl = any.impl ();
 
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
+      if (!impl->encoded ())
         {
           TAO::Any_Basic_Impl_T<T> *narrow_impl =
             dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
@@ -90,17 +88,18 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
 
       auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
 
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                        TAO_DEF_GIOP_MAJOR,
-                        TAO_DEF_GIOP_MINOR);
+      // We know this will work since the unencoded case is covered above.  
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+
+      // We don't want the rd_ptr of unk to move, in case it is
+      // shared by another Any. This copies the state, not the buffer.
+      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
+      CORBA::Boolean good_decode =
+        replacement->demarshal_value (for_reading);
 
-      if (result == 1)
+      if (good_decode)
         {
           _tao_elem = replacement->value_;
           const_cast<CORBA::Any &> (any).replace (replacement);
diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp
index 2e453f93ede..be0ac30c674 100644
--- a/TAO/tao/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/Any_Dual_Impl_T.cpp
@@ -4,7 +4,7 @@
 #define TAO_ANY_DUAL_IMPL_T_C
 
 #include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Marshal.h"
 #include "tao/CORBA_String.h"
 #include "tao/Environment.h"
@@ -116,9 +116,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
 
       TAO::Any_Impl *impl = any.impl ();
 
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
+      if (!impl->encoded ())
         {
           TAO::Any_Dual_Impl_T<T> *narrow_impl =
             dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
@@ -145,22 +143,18 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
 
       auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
 
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                        TAO_DEF_GIOP_MAJOR,
-                        TAO_DEF_GIOP_MINOR);
-
-      impl->assign_translator (any_tc,
-                               &cdr
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // We know this will work since the unencoded case is covered above.  
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+
+      // We don't want the rd_ptr of unk to move, in case it is
+      // shared by another Any. This copies the state, not the buffer.
+      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
+      CORBA::Boolean good_decode =
+        replacement->demarshal_value (for_reading);
 
-      if (result == 1)
+      if (good_decode)
         {
           _tao_elem = replacement->value_;
           const_cast<CORBA::Any &> (any).replace (replacement);
diff --git a/TAO/tao/Any_Impl.cpp b/TAO/tao/Any_Impl.cpp
index 2a139aeeebc..8a81a18a9df 100644
--- a/TAO/tao/Any_Impl.cpp
+++ b/TAO/tao/Any_Impl.cpp
@@ -16,9 +16,11 @@ ACE_RCSID (tao,
 
 
 TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr tc)
+                         CORBA::TypeCode_ptr tc,
+                         bool encoded)
   : value_destructor_ (destructor)
   , type_ (CORBA::TypeCode::_duplicate (tc))
+  , encoded_ (encoded)
   , mutex_ ()
   , refcount_ (1)
 {
@@ -72,12 +74,6 @@ TAO::Any_Impl::type (CORBA::TypeCode_ptr tc)
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 }
 
-ACE_Message_Block *
-TAO::Any_Impl::_tao_get_cdr (void) const
-{
-  return 0;
-}
-
 int
 TAO::Any_Impl::_tao_byte_order (void) const
 {
@@ -134,13 +130,6 @@ TAO::Any_Impl::_tao_decode (TAO_InputCDR &
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-void
-TAO::Any_Impl::assign_translator (CORBA::TypeCode_ptr,
-                                  TAO_InputCDR *
-                                  ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
 CORBA::Boolean
 TAO::Any_Impl::to_object (CORBA::Object_ptr &) const
 {
@@ -158,3 +147,10 @@ TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const
 {
   return 0;
 }
+
+bool
+TAO::Any_Impl::encoded (void) const
+{
+  return this->encoded_;
+}
+
diff --git a/TAO/tao/Any_Impl.h b/TAO/tao/Any_Impl.h
index eeb417a8fc5..4802a25e6aa 100644
--- a/TAO/tao/Any_Impl.h
+++ b/TAO/tao/Any_Impl.h
@@ -77,7 +77,6 @@ namespace TAO
     CORBA::TypeCode_ptr _tao_get_typecode (void) const;
     void type (CORBA::TypeCode_ptr);
 
-    virtual ACE_Message_Block *_tao_get_cdr (void) const;
     virtual int _tao_byte_order (void) const;
 
     virtual void _add_ref (void);
@@ -90,21 +89,21 @@ namespace TAO
     virtual void _tao_decode (TAO_InputCDR &
                               ACE_ENV_ARG_DECL);
 
-    virtual void assign_translator (CORBA::TypeCode_ptr,
-                                    TAO_InputCDR *
-                                    ACE_ENV_ARG_DECL);
-
     virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
     virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
     virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
+    
+    bool encoded (void) const;
 
   protected:
     Any_Impl (_tao_destructor,
-              CORBA::TypeCode_ptr);
+              CORBA::TypeCode_ptr,
+              bool encoded = false);
     virtual ~Any_Impl (void);
 
     TAO::Any_Impl::_tao_destructor value_destructor_;
     CORBA::TypeCode_ptr type_;
+    bool encoded_;
 
   private:
     /// Lock for the refcount
diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp
index 7f432b92c30..dce88148265 100644
--- a/TAO/tao/Any_Impl_T.cpp
+++ b/TAO/tao/Any_Impl_T.cpp
@@ -4,7 +4,7 @@
 #define TAO_ANY_IMPL_T_C
 
 #include "tao/Any_Impl_T.h"
-#include "tao/Any.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Marshal.h"
 #include "tao/CDR.h"
 #include "tao/Environment.h"
@@ -76,9 +76,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
 
       TAO::Any_Impl *impl = any.impl ();
 
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
+      if (!impl->encoded ())
         {
           TAO::Any_Impl_T<T> *narrow_impl =
             dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
@@ -101,22 +99,18 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
 
       auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
 
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                        TAO_DEF_GIOP_MAJOR,
-                        TAO_DEF_GIOP_MINOR);
-
-      impl->assign_translator (any_tc,
-                               &cdr
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // We know this will work since the unencoded case is covered above.  
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+
+      // We don't want the rd_ptr of unk to move, in case it is
+      // shared by another Any. This copies the state, not the buffer.
+      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
+      CORBA::Boolean good_decode =
+        replacement->demarshal_value (for_reading);
 
-      if (result == 1)
+      if (good_decode)
         {
           _tao_elem = const_cast<T *> (replacement->value_);
           const_cast<CORBA::Any &> (any).replace (replacement);
diff --git a/TAO/tao/Any_Special_Impl_T.cpp b/TAO/tao/Any_Special_Impl_T.cpp
index 0255682cc26..00d2766e517 100644
--- a/TAO/tao/Any_Special_Impl_T.cpp
+++ b/TAO/tao/Any_Special_Impl_T.cpp
@@ -4,7 +4,7 @@
 #define TAO_ANY_SPECIAL_IMPL_T_C
 
 #include "tao/Any_Special_Impl_T.h"
-#include "tao/Any.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Marshal.h"
 #include "tao/Environment.h"
 #include "tao/Typecode.h"
@@ -52,7 +52,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
   if (bound > 0)
     {
       CORBA::TCKind kind = static_cast<CORBA::TCKind> (tc->kind_);
-      static CORBA::Long _oc_buffer [] =
+      CORBA::Long _oc_buffer [] =
         {
           TAO_ENCAP_BYTE_ORDER,
           static_cast<CORBA::Long> (bound)
@@ -121,12 +121,10 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
 
       TAO::Any_Impl *impl = any.impl ();
 
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
       typedef TAO::Any_Special_Impl_T<T, from_T, to_T>
         BOUNDED_TSTRING_ANY_IMPL;
 
-      if (mb == 0)
+      if (!impl->encoded ())
         {
           TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
             dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
@@ -151,23 +149,19 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
       auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
           replacement
         );
+        
+      // We know this will work since the unencoded case is covered above.  
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                                                            TAO_DEF_GIOP_MAJOR,
-                                                            TAO_DEF_GIOP_MINOR);
-
-      impl->assign_translator (tc,
-                               &cdr
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // We don't want the rd_ptr of unk to move, in case it is
+      // shared by another Any. This copies the state, not the buffer.
+      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
+      CORBA::Boolean good_decode =
+        replacement->demarshal_value (for_reading);
 
-      if (result == 1)
+      if (good_decode)
         {
           _tao_elem = replacement->value_;
           const_cast<CORBA::Any &> (any).replace (replacement);
diff --git a/TAO/tao/Any_SystemException.cpp b/TAO/tao/Any_SystemException.cpp
index 0f5794c2225..ea168a4f405 100644
--- a/TAO/tao/Any_SystemException.cpp
+++ b/TAO/tao/Any_SystemException.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Any_SystemException.h"
-#include "Any.h"
+#include "Any_Unknown_IDL_Type.h"
 #include "CDR.h"
 #include "Exception.h"
 #include "Environment.h"
@@ -100,9 +100,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
 
       TAO::Any_Impl *impl = any.impl ();
 
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
+      if (!impl->encoded ())
         {
           TAO::Any_SystemException *narrow_impl =
             dynamic_cast <TAO::Any_SystemException *> (impl);
@@ -127,22 +125,18 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
 
       auto_ptr<TAO::Any_SystemException > replacement_safety (replacement);
 
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                        TAO_DEF_GIOP_MAJOR,
-                        TAO_DEF_GIOP_MINOR);
-
-      impl->assign_translator (any_tc,
-                               &cdr
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // We know this will work since the unencoded case is covered above.  
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+
+      // We don't want the rd_ptr of unk to move, in case it is
+      // shared by another Any. This copies the state, not the buffer.
+      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
+      CORBA::Boolean good_decode =
+        replacement->demarshal_value (for_reading);
 
-      if (result == 1)
+      if (good_decode)
         {
           _tao_elem = replacement->value_;
           const_cast<CORBA::Any &> (any).replace (replacement);
diff --git a/TAO/tao/Any_Unknown_IDL_Type.cpp b/TAO/tao/Any_Unknown_IDL_Type.cpp
index 65b61162a2a..1154674fe69 100644
--- a/TAO/tao/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/Any_Unknown_IDL_Type.cpp
@@ -6,62 +6,38 @@
 #include "tao/SystemException.h"
 #include "tao/Marshal.h"
 #include "tao/Typecode.h"
-#include "tao/CDR.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (tao,
            Any_Unknown_IDL_Type,
            "$Id$")
-
-
+           
 TAO::Unknown_IDL_Type::Unknown_IDL_Type (
     CORBA::TypeCode_ptr tc,
-    const ACE_Message_Block *mb,
-    int byte_order,
-    ACE_Char_Codeset_Translator *ctrans,
-    ACE_WChar_Codeset_Translator *wtrans
+    TAO_InputCDR &cdr
   )
-  : TAO::Any_Impl (0, tc),
-    cdr_ (0),
-    byte_order_ (byte_order),
-    char_translator_ (ctrans),
-    wchar_translator_ (wtrans)
+  : TAO::Any_Impl (0, tc, true),
+    cdr_ (static_cast<ACE_Message_Block *> (0))
 {
-  if (mb != 0)
+  ACE_TRY_NEW_ENV
     {
-      ACE_NEW (this->cdr_,
-               ACE_Message_Block (*mb,
-                                  ACE_CDR::MAX_ALIGNMENT));
-
-      // Align the base pointer assuming that the incoming stream is also
-      // aligned the way we are aligned
-      char *start =
-        ACE_ptr_align_binary (mb->base (),
-                              ACE_CDR::MAX_ALIGNMENT);
-
-      size_t newrdpos =
-        mb->rd_ptr() - start;
-
-      size_t newwrpos =
-        mb->wr_ptr() - start;
-
-      if (newwrpos <= this->cdr_->space ())
-        {
-          // Notice that ACE_Message_Block::duplicate may leave the
-          // wr_ptr() with a higher value than what we actually want.
-          this->cdr_->rd_ptr (newrdpos);
-          this->cdr_->wr_ptr (newwrpos);
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO(%P|%t) - Unknown_IDL_Type::Unknown_IDL_Type "
-                      "Couldn't align read and write pointers \n"));
-        }
+      this->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
+  ACE_CATCH (CORBA::Exception, ex)
+    {
+    }
+  ACE_ENDTRY;
+}
+
+TAO::Unknown_IDL_Type::Unknown_IDL_Type (
+    CORBA::TypeCode_ptr tc
+  )
+  : TAO::Any_Impl (0, tc, true),
+    cdr_ (static_cast<ACE_Message_Block *> (0))
+{
 }
 
 TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void)
@@ -73,12 +49,13 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
 {
   ACE_TRY_NEW_ENV
     {
-      TAO_InputCDR input (this->cdr_,
-                          this->byte_order_);
-
+      // We don't want the rd_ptr to move, in case we are shared by
+      // another Any, so we use this to copy the state, not the buffer.
+      TAO_InputCDR for_reading (this->cdr_);
+    
       TAO::traverse_status status =
         TAO_Marshal_Object::perform_append (this->type_,
-                                            &input,
+                                            &for_reading,
                                             &cdr
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -100,18 +77,17 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
 const void *
 TAO::Unknown_IDL_Type::value (void) const
 {
-  return this->cdr_;
+  return this->cdr_.start ();
 }
 
 void
 TAO::Unknown_IDL_Type::free_value (void)
 {
   CORBA::release (this->type_);
-  delete this->cdr_;
 }
 
-ACE_Message_Block *
-TAO::Unknown_IDL_Type::_tao_get_cdr (void) const
+TAO_InputCDR &
+TAO::Unknown_IDL_Type::_tao_get_cdr (void)
 {
   return this->cdr_;
 }
@@ -119,7 +95,7 @@ TAO::Unknown_IDL_Type::_tao_get_cdr (void) const
 int
 TAO::Unknown_IDL_Type::_tao_byte_order (void) const
 {
-  return this->byte_order_;
+  return this->cdr_.byte_order ();
 }
 void
 TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
@@ -155,51 +131,28 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
   // space in the message block.
   size_t size = end - begin;
 
-  ACE_Message_Block::release (this->cdr_);
-  ACE_NEW (this->cdr_,
+  ACE_Message_Block *new_mb = 0;
+  ACE_NEW (new_mb,
            ACE_Message_Block (size + 2 * ACE_CDR::MAX_ALIGNMENT));
 
-  ACE_CDR::mb_align (this->cdr_);
+  ACE_CDR::mb_align (new_mb);
   ptrdiff_t offset = ptrdiff_t (begin) % ACE_CDR::MAX_ALIGNMENT;
 
   if (offset < 0)
-    offset += ACE_CDR::MAX_ALIGNMENT;
+    {
+      offset += ACE_CDR::MAX_ALIGNMENT;
+    }
 
-  this->cdr_->rd_ptr (offset);
-  this->cdr_->wr_ptr (offset + size);
+  new_mb->rd_ptr (offset);
+  new_mb->wr_ptr (offset + size);
 
-  ACE_OS::memcpy (this->cdr_->rd_ptr (),
+  ACE_OS::memcpy (new_mb->rd_ptr (),
                   begin,
                   size);
 
-  this->byte_order_ = cdr.byte_order ();
-
-  // Get character translators.
-  this->char_translator_ = cdr.char_translator();
-  this->wchar_translator_ = cdr.wchar_translator();
-}
-
-void
-TAO::Unknown_IDL_Type::assign_translator (CORBA::TypeCode_ptr tc,
-                                          TAO_InputCDR *cdr
-                                          ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  switch (kind)
-    {
-      case CORBA::tk_string:
-      case CORBA::tk_char:
-        cdr->char_translator (this->char_translator_);
-        break;
-      case CORBA::tk_wstring:
-      case CORBA::tk_wchar:
-        cdr->wchar_translator(this->wchar_translator_);
-        break;
-      default:
-        break;
-    }
+  this->cdr_.reset (new_mb, cdr.byte_order ());
+  this->cdr_.char_translator (cdr.char_translator ());
+  this->cdr_.wchar_translator (cdr.wchar_translator ());
 }
 
 CORBA::Boolean
@@ -228,13 +181,7 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
           return 0;
         }
 
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_,
-                           TAO_DEF_GIOP_MAJOR,
-                           TAO_DEF_GIOP_MINOR,
-                           0);
-
-      return stream >> obj;
+      return this->cdr_ >> obj;
     }
   ACE_CATCH (CORBA::Exception, ex)
     {
@@ -270,12 +217,6 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
           return 0;
         }
 
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_,
-                           TAO_DEF_GIOP_MAJOR,
-                           TAO_DEF_GIOP_MINOR,
-                           0);
-
       TAO_Valuetype_Adapter *adapter =
         ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
             TAO_ORB_Core::valuetype_adapter_name ()
@@ -287,8 +228,7 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
                             0);
         }
 
-      return adapter->stream_to_value (stream,
-                                       val);
+      return adapter->stream_to_value (this->cdr_, val);
     }
   ACE_CATCH (CORBA::Exception, ex)
     {
@@ -324,12 +264,6 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
           return 0;
         }
 
-      TAO_InputCDR stream (this->cdr_,
-                           this->byte_order_,
-                           TAO_DEF_GIOP_MAJOR,
-                           TAO_DEF_GIOP_MINOR,
-                           TAO_ORB_Core_instance ());
-
       TAO_Valuetype_Adapter *adapter =
         ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
             TAO_ORB_Core::valuetype_adapter_name ()
@@ -341,7 +275,7 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
                             0);
         }
 
-      return adapter->stream_to_abstract_base (stream,
+      return adapter->stream_to_abstract_base (this->cdr_,
                                                obj);
     }
   ACE_CATCH (CORBA::Exception, ex)
diff --git a/TAO/tao/Any_Unknown_IDL_Type.h b/TAO/tao/Any_Unknown_IDL_Type.h
index 720a7f30332..c764dc367e0 100644
--- a/TAO/tao/Any_Unknown_IDL_Type.h
+++ b/TAO/tao/Any_Unknown_IDL_Type.h
@@ -15,6 +15,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/Any_Impl.h"
+#include "tao/CDR.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,34 +37,28 @@ namespace TAO
   {
   public:
     Unknown_IDL_Type (CORBA::TypeCode_ptr,
-                      const ACE_Message_Block *mb = 0,
-                      int byte_order = TAO_ENCAP_BYTE_ORDER,
-                      ACE_Char_Codeset_Translator *ctrans = 0,
-                      ACE_WChar_Codeset_Translator *wtrans = 0);
+                      TAO_InputCDR &cdr);
+                  
+    Unknown_IDL_Type (CORBA::TypeCode_ptr);
+                      
     virtual ~Unknown_IDL_Type (void);
 
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     virtual const void *value (void) const;
     virtual void free_value (void);
 
-    virtual ACE_Message_Block *_tao_get_cdr (void) const;
+    virtual TAO_InputCDR &_tao_get_cdr (void);
     virtual int _tao_byte_order (void) const;
 
     virtual void _tao_decode (TAO_InputCDR &
                               ACE_ENV_ARG_DECL);
-    virtual void assign_translator (CORBA::TypeCode_ptr,
-                                    TAO_InputCDR *
-                                    ACE_ENV_ARG_DECL);
 
     virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
     virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
     virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
 
   private:
-    ACE_Message_Block *cdr_;
-    int byte_order_;
-    ACE_Char_Codeset_Translator *char_translator_;
-    ACE_WChar_Codeset_Translator *wchar_translator_;
+    mutable TAO_InputCDR cdr_;
   };
 }
 
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
index f28ca8f2107..53cdcaafd96 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -52,7 +52,7 @@ public:
                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
-  virtual void load_policy_validators (TAO_Policy_Validator &validator)
+  virtual void load_policy_validators (TAO_Policy_Validator &validator ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
 };
diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc
index f01b598b7d1..54b3d07fe05 100644
--- a/TAO/tao/BiDir_GIOP.mpc
+++ b/TAO/tao/BiDir_GIOP.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     BiDir_GIOP
   }
+
+  Pkgconfig_Files {
+    BiDir_GIOP/TAO_BiDirGIOP.pc.in
+  }
 }
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 945b3e00b14..8114dc49045 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -11,18 +11,14 @@ ACE_RCSID (BiDir_GIOP,
 
 
 // Set the flag to zero to start with
-int TAO_BiDirGIOP_Loader::validator_loaded_ = 0;
 int TAO_BiDirGIOP_Loader::is_activated_ = 0;
 
 TAO_BiDirGIOP_Loader::TAO_BiDirGIOP_Loader (void)
-  : validator_ (0)
 {
 }
 
 TAO_BiDirGIOP_Loader::~TAO_BiDirGIOP_Loader (void)
 {
-  /*  if (this->validator_)
-      delete this->validator_;*/
 }
 
 int
@@ -32,6 +28,8 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_UNUSED_ARG (orb);
+
   if (TAO_BiDirGIOP_Loader::is_activated_ == 0 && TAO_DEF_GIOP_MINOR >= 2)
     {
       PortableInterceptor::ORBInitializer_ptr tmp_orb_initializer =
@@ -55,19 +53,6 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      TAO_ORB_Core *orb_core =
-        orb->orb_core ();
-
-      ACE_NEW_THROW_EX (this->validator_,
-                        TAO_BiDirPolicy_Validator (*orb_core),
-                        CORBA::NO_MEMORY (
-                            CORBA::SystemException::_tao_minor_code (
-                                TAO_DEFAULT_MINOR_CODE,
-                                ENOMEM),
-                            CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (-1);
-
-
       TAO_BiDirGIOP_Loader::is_activated_ = 1;
     }
 
@@ -75,12 +60,31 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
 }
 
 void
-TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val)
+TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val
+                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Add our validator
-  if (!validator_loaded_)
-    val.add_validator (this->validator_);
+  // Is this true? Does the GIOP protocol version matter here?
+  if (TAO_DEF_GIOP_MINOR < 2)
+    return;
+
+  TAO_BiDirPolicy_Validator *validator = 0;
+  ACE_NEW_THROW_EX (validator,
+                    TAO_BiDirPolicy_Validator (val.orb_core ()),
+                    CORBA::NO_MEMORY (
+                        CORBA::SystemException::_tao_minor_code (
+                            TAO_DEFAULT_MINOR_CODE,
+                            ENOMEM),
+                        CORBA::COMPLETED_NO));
+  ACE_CHECK;
+
+  // We may be adding another TAO_BiDirPolicy_Validator instance for the
+  // same ORB (different POA). In cases where huge numbers of bi-directional POA instances
+  // are created, having a validator instance per POA may introduce additional delays in
+  // policy validation and hence, the overal policy creation time. Since this is out of the
+  // critical invocation processing path, I plan to keep the design simple and not try to
+  // avoid an ineficiency of such small proportions.
+  val.add_validator (validator);
 }
 
 int
@@ -89,24 +93,11 @@ TAO_BiDirGIOP_Loader::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_BiDirGIOP_Loader);
 }
 
-/*static */ int
-TAO_BiDirGIOP_Loader::validator_loaded (void)
-{
-  return validator_loaded_;
-}
-
-/*static */ void
-TAO_BiDirGIOP_Loader::validator_loaded (int f)
-{
-  // @@ TODO: Do we need synchronization?
-  validator_loaded_ = f;
-}
-
-
 ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader,
                        ACE_TEXT ("BiDirGIOP_Loader"),
                        ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (TAO_BiDirGIOP_Loader),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
+
 ACE_FACTORY_DEFINE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader)
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
index 8fa5d711a18..2d5fff19ff7 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -50,23 +50,15 @@ public:
                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void load_policy_validators (TAO_Policy_Validator &validator)
+  virtual void load_policy_validators (TAO_Policy_Validator &validator
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to force the initialization of the ORB code.
   static int Initializer (void);
 
-  /// Accessor for the <validator_loaded_> flag
-  static int validator_loaded (void);
-  static void validator_loaded (int f);
 private:
 
-  /// Our policy validator
-  TAO_BiDirPolicy_Validator *validator_;
-
-  /// Flag to indicate whether validator has been loaded
-  static int validator_loaded_;
-
   /// Flag to indicate whether the BiDirGIOP library has been
   /// activated.
   static int is_activated_;
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index 419f2a4f64b..1f8014b896f 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "BiDirGIOP.h"
@@ -38,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "BiDirPolicyC.i"
+#include "BiDirPolicyC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -90,12 +90,6 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*BiDirPolicy__TAO_BidirectionalPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 BiDirPolicy::BidirectionalPolicy::BidirectionalPolicy (void)
 {}
 
@@ -112,10 +106,10 @@ BiDirPolicy::BidirectionalPolicy::_narrow (
     {
       return BidirectionalPolicy::_nil ();
     }
-
+  
   BidirectionalPolicy_ptr proxy =
     dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-
+  
   return BidirectionalPolicy::_duplicate (proxy);
 }
 
@@ -129,10 +123,10 @@ BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
     {
       return BidirectionalPolicy::_nil ();
     }
-
+  
   BidirectionalPolicy_ptr proxy =
     dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-
+  
   return BidirectionalPolicy::_duplicate (proxy);
 }
 
@@ -143,7 +137,7 @@ BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -192,7 +186,7 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -205,7 +199,7 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         BiDirPolicy::BidirectionalPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         BiDirPolicy::BidirectionalPolicy
@@ -222,10 +216,10 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         BiDirPolicy::BidirectionalPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         BiDirPolicy::BidirectionalPolicy
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index cdc1291dc3f..13ba19032b5 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_BIDIRPOLICYC_H_
 #define _TAO_IDL_ORIG_BIDIRPOLICYC_H_
@@ -37,13 +37,15 @@
 #error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h"
 #endif /* !TAO_BIDIRGIOP_SAFE_INCLUDE */
 
-#include "tao/ORB.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "bidirgiop_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -63,9 +65,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -73,13 +73,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -89,43 +89,43 @@ namespace TAO
 
 namespace BiDirPolicy
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::UShort BidirectionalPolicyValue;
   typedef CORBA::UShort_out BidirectionalPolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const BiDirPolicy::BidirectionalPolicyValue NORMAL = 0U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const BiDirPolicy::BidirectionalPolicyValue BOTH = 1U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37U;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_
-
+  
   class BidirectionalPolicy;
   typedef BidirectionalPolicy *BidirectionalPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         BidirectionalPolicy
       >
     BidirectionalPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         BidirectionalPolicy
@@ -133,91 +133,91 @@ namespace BiDirPolicy
     BidirectionalPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_
-
+  
   class TAO_BiDirGIOP_Export BidirectionalPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef BidirectionalPolicy_ptr _ptr_type;
     typedef BidirectionalPolicy_var _var_type;
-
+    
     // The static operations.
     static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj);
-
+    
     static BidirectionalPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BidirectionalPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BidirectionalPolicy_ptr _nil (void)
     {
       return (BidirectionalPolicy_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual BiDirPolicy::BidirectionalPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     BidirectionalPolicy (void);
-
+    
     virtual ~BidirectionalPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     BidirectionalPolicy (const BidirectionalPolicy &);
-
+    
     void operator= (const BidirectionalPolicy &);
   };
 
@@ -237,19 +237,19 @@ namespace TAO
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_BiDirGIOP_Export Objref_Traits<BiDirPolicy::BidirectionalPolicy>
+  struct TAO_BiDirGIOP_Export Objref_Traits< ::BiDirPolicy::BidirectionalPolicy>
   {
-    static BiDirPolicy::BidirectionalPolicy_ptr duplicate (
-        BiDirPolicy::BidirectionalPolicy_ptr
+    static ::BiDirPolicy::BidirectionalPolicy_ptr duplicate (
+        ::BiDirPolicy::BidirectionalPolicy_ptr
       );
     static void release (
-        BiDirPolicy::BidirectionalPolicy_ptr
+        ::BiDirPolicy::BidirectionalPolicy_ptr
       );
-    static BiDirPolicy::BidirectionalPolicy_ptr nil (void);
+    static ::BiDirPolicy::BidirectionalPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        BiDirPolicy::BidirectionalPolicy_ptr p,
+        ::BiDirPolicy::BidirectionalPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -258,13 +258,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "BiDirPolicyC.i"
+#include "BiDirPolicyC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -275,3 +275,5 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index d3e6335fd42..8dcdeb2b341 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -18,7 +18,9 @@ TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies
                                           ACE_ENV_ARG_DECL)
 {
   CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP);
+    policies.get_cached_policy (TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   if (policy.in () == 0)
     return;
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
index e093209c603..0671cf2bbd1 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
@@ -20,16 +20,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -57,12 +54,10 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_BIDIR_ORB_INITIALIZER_H */
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
index e931fd20d5d..4f2dcc637d2 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
@@ -27,9 +27,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -48,7 +46,7 @@ public:
 };
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index ba1da1f88db..ff133474e61 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -6,16 +6,10 @@
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (TAO, 
-           BiDir_Policy_i, 
+ACE_RCSID (TAO,
+           BiDir_Policy_i,
            "$Id$")
 
-
-
-#if ! defined (__ACE_INLINE__)
-#include "BiDir_Policy_i.inl"
-#endif /* __ACE_INLINE__ */
-
 TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (
     const BiDirPolicy::BidirectionalPolicyValue  val)
   : ACE_NESTED_CLASS (CORBA, Object) ()
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
index 5c1ad66442c..1555b96dc9d 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
@@ -17,19 +17,15 @@
 #include /**/ "ace/pre.h"
 #include "bidirgiop_export.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #include "BiDirGIOP.h"
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -85,13 +81,7 @@ private:
   BiDirPolicy::BidirectionalPolicyValue value_;
 };
 
-
-
-#if defined (__ACE_INLINE__)
-#include "BiDir_Policy_i.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.inl b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
index 23128eda6e1..0029a3af050 100644
--- a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
+++ b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
@@ -1,22 +1,31 @@
---- orig/BiDirPolicyC.h	2003-11-03 21:04:56.000000000 -0600
-+++ BiDirPolicyC.h	2003-11-03 21:20:15.000000000 -0600
-@@ -48,7 +48,7 @@
+--- orig/BiDirPolicyC.h	2004-11-09 16:09:54.752499200 +0100
++++ BiDirPolicyC.h	2004-11-09 16:14:36.808075200 +0100
+@@ -33,6 +33,9 @@
+
+ #include /**/ "ace/pre.h"
+
++#ifndef TAO_BIDIRGIOP_SAFE_INCLUDE
++#error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h"
++#endif /* !TAO_BIDIRGIOP_SAFE_INCLUDE */
+
+ #include "ace/config-all.h"
+
+@@ -47,6 +50,8 @@
  #include "tao/Object.h"
  #include "tao/Objref_VarOut_T.h"
- 
--#include "PolicyC.h"
+
 +#include "tao/PolicyC.h"
- 
++
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
---- orig/BiDirPolicyC.cpp	2003-11-03 21:04:10.000000000 -0600
-+++ BiDirPolicyC.cpp	2003-11-03 21:19:02.000000000 -0600
+ #endif
+--- orig\BiDirPolicyC.cpp       2005-01-04 20:49:10.788272000 +0100
++++ BiDirPolicyC.cpp    2005-01-04 20:47:44.974878400 +0100
 @@ -29,7 +29,7 @@
- // be/be_codegen.cpp:302
- 
- 
+ // be\be_codegen.cpp:302
+
+
 -#include "BiDirPolicyC.h"
 +#include "BiDirGIOP.h"
+ #include "tao/CDR.h"
  #include "ace/OS_NS_string.h"
- 
- #if defined (__BORLANDC__)
diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp
index ea3718ffb63..289291f2f79 100644
--- a/TAO/tao/BooleanSeqA.cpp
+++ b/TAO/tao/BooleanSeqA.cpp
@@ -27,27 +27,29 @@
 
 #include "BooleanSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_BooleanSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f426f),
-  ACE_NTOHL (0x6f6c6561),
-  ACE_NTOHL (0x6e536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f426f), 
+  ACE_NTOHL (0x6f6c6561), 
+  ACE_NTOHL (0x6e536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/BooleanSeq:1.0
     11,
-  ACE_NTOHL (0x426f6f6c),
-  ACE_NTOHL (0x65616e53),
+  ACE_NTOHL (0x426f6f6c), 
+  ACE_NTOHL (0x65616e53), 
   ACE_NTOHL (0x65710000),  // name = BooleanSeq
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -63,7 +65,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_BooleanSeq (
     sizeof (_oc_CORBA_BooleanSeq),
     (char *) &_oc_CORBA_BooleanSeq,
     0,
-    sizeof (CORBA::BooleanSeq)
+    0
   );
 
 namespace CORBA
@@ -72,7 +74,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_BooleanSeq;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -109,8 +111,8 @@ CORBA::Boolean operator>>= (
     CORBA::BooleanSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::BooleanSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::BooleanSeq *&> (
       _tao_elem
     );
 }
@@ -130,8 +132,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -146,5 +146,4 @@ CORBA::Boolean operator>>= (
         CORBA::BooleanSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp
index c75130113a9..413c8a348ad 100644
--- a/TAO/tao/BooleanSeqC.cpp
+++ b/TAO/tao/BooleanSeqC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "BooleanSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "BooleanSeqC.i"
+#include "BooleanSeqC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -97,7 +96,7 @@ void CORBA::BooleanSeq::_tao_any_destructor (
   )
 {
   BooleanSeq * _tao_tmp_pointer =
-    ACE_static_cast (BooleanSeq *, _tao_void_pointer);
+    static_cast<BooleanSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -114,7 +113,7 @@ CORBA::Boolean operator<< (
     const CORBA::BooleanSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h
index 8360886b3c3..989fa5a1448 100644
--- a/TAO/tao/BooleanSeqC.h
+++ b/TAO/tao/BooleanSeqC.h
@@ -26,20 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_BOOLEANSEQC_H_
 #define _TAO_IDL_ORIG_BOOLEANSEQC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
@@ -58,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -166,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "BooleanSeqC.i"
+#include "BooleanSeqC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -184,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/BooleanSeqC.i b/TAO/tao/BooleanSeqC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/BooleanSeqC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/BooleanSeqS.h b/TAO/tao/BooleanSeqS.h
index 44d3b8c0c81..15722a68a49 100644
--- a/TAO/tao/BooleanSeqS.h
+++ b/TAO/tao/BooleanSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:411
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_BOOLEANSEQS_H_
 #define _TAO_IDL_ORIG_BOOLEANSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,20 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
 
+
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from 
-// .\be\be_codegen.cpp:1014
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -78,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl
index f86db553f7d..5ca345bc2d7 100644
--- a/TAO/tao/Bounds.pidl
+++ b/TAO/tao/Bounds.pidl
@@ -19,11 +19,7 @@
  *
  * and then:
  *
- * cp orig/BoundsC.{h,i,cpp} .
- *
- * Move the typecodes for exceptions in BoundsA.cpp to BoundsC.cpp.
- *
- * The code left in BoundsC.{h,i,cpp} is ready for use.
+ * cp orig/BoundsC.{h,inl,cpp} .
  *
  */
 #ifndef TAO_CORBA_BOUNDS_PIDL
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
index c43dea7e3c3..588a1817f2a 100644
--- a/TAO/tao/BoundsA.cpp
+++ b/TAO/tao/BoundsA.cpp
@@ -27,9 +27,11 @@
 
 #include "BoundsC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -39,12 +41,12 @@ TAO::Any_Dual_Impl_T<CORBA::Bounds>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -55,7 +57,7 @@ TAO::Any_Dual_Impl_T<CORBA::Bounds>::demarshal_value (
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -93,8 +95,8 @@ CORBA::Boolean operator>>= (
     CORBA::Bounds *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::Bounds *&,
+  return _tao_any >>= const_cast<
+      const CORBA::Bounds *&> (
       _tao_elem
     );
 }
@@ -114,8 +116,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -130,4 +130,4 @@ CORBA::Boolean operator>>= (
         CORBA::Bounds \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index e5c5c7f8c12..76d929580b0 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "BoundsC.h"
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.h"
+#include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -40,11 +40,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "BoundsC.i"
+#include "BoundsC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -52,7 +52,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::Bounds::Bounds (void)
@@ -85,21 +85,20 @@ CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp)
 void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer)
 {
   Bounds *_tao_tmp_pointer =
-    ACE_static_cast (Bounds*, _tao_void_pointer);
+    static_cast<Bounds *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 CORBA::Bounds *
 CORBA::Bounds::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (Bounds *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<Bounds *> (_tao_excp);
+}
+
+const CORBA::Bounds *
+CORBA::Bounds::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const Bounds *> (_tao_excp);
 }
 
 CORBA::Exception *CORBA::Bounds::_alloc (void)
@@ -135,7 +134,7 @@ void CORBA::Bounds::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -148,27 +147,33 @@ void CORBA::Bounds::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::Bounds::_type (void) const
+{
+  return ::CORBA::_tc_Bounds;
+}
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Bounds[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f426f),
-  ACE_NTOHL (0x756e6473),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f426f), 
+  ACE_NTOHL (0x756e6473), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Bounds:1.0
     7,
-  ACE_NTOHL (0x426f756e),
+  ACE_NTOHL (0x426f756e), 
   ACE_NTOHL (0x64730000),  // name = Bounds
   0, // member count
   };
@@ -178,7 +183,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds (
     sizeof (_oc_CORBA_Bounds),
     (char *) &_oc_CORBA_Bounds,
     0,
-    sizeof (CORBA::Bounds)
+    0
   );
 
 namespace CORBA
@@ -187,12 +192,6 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_Bounds;
 }
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::Bounds::_type (void) const
-{
-  return ::CORBA::_tc_Bounds;
-}
-
 // TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
 
@@ -221,10 +220,10 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
index 87a84d49b3a..1add5c5e0f8 100644
--- a/TAO/tao/BoundsC.h
+++ b/TAO/tao/BoundsC.h
@@ -26,20 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_BOUNDSC_H_
 #define _TAO_IDL_ORIG_BOUNDSC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -55,9 +57,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -90,8 +90,10 @@ namespace CORBA
     static void _tao_any_destructor (void *);
     
     static Bounds *_downcast (CORBA::Exception *);
+    static const Bounds *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -107,7 +109,7 @@ namespace CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
     
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
@@ -147,13 +149,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "BoundsC.i"
+#include "BoundsC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -165,3 +167,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &);
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/BoundsC.i b/TAO/tao/BoundsC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/BoundsC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 9b1af9b0e22..ccc993ff3b0 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -1,37 +1,5 @@
 // $Id$
 
-
-// Portions of this file are:
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-
-// CDR:         Encode/Decode basic machine data types
-//
-// Implementation of OMG "Common Data Representation" (CDR) ... there
-// are one routine each for byte/halfword/word/doubleword put/get,
-// which adjust to establish "natural" alignment (the bulk of the
-// code) and then put or get with byteswapping as needed.
-//
-// The implementation knows that native data formats are conformant
-// with OMG-IDL's (and hence CDR's) size requirements, and relies on
-// the fact that (for example) CORBA::Long is always four bytes long
-// even if the environment's "int" is a different size.
-//
-//      char, octet                       8 bits (1 byte)
-//      short, unsigned short            16 bits (2 bytes)
-//      long, unsigned long, float       32 bits (4 bytes)
-//      double, (unsigned) long long     64 bits (8 bytes)
-//      long double                     128 bits (16 bytes)
-//
-// Moreover, this "knows" that the native 'char' represents ISO
-// Latin/1 characters (an ASCII superset addressing Western European
-// characters) and that "double" and "float" comply with the IEEE
-// standards. (The "long double" may not be a native data type,
-// though.)
-//
-// THREADING NOTE: "CDR" is a data structure which must be protected
-// by external critical sections.
-
 #include "tao/CDR.h"
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Core.h"
@@ -43,8 +11,9 @@
 #endif /* ! __ACE_INLINE__ */
 
 
-ACE_RCSID(tao, CDR, "$Id$")
-
+ACE_RCSID (tao,
+           CDR,
+           "$Id$")
 
 
 #if defined (ACE_ENABLE_TIMEPROBES)
@@ -142,9 +111,11 @@ TAO_OutputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
     case EINVAL : // wchar from a GIOP 1.0
       ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO));
       ACE_NOTREACHED(break);
+#if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
       ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO));
       ACE_NOTREACHED(break);
+#endif
     case EACCES : // wchar but no codeset
       ACE_THROW(CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO));
       ACE_NOTREACHED(break);
@@ -170,10 +141,12 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
                                    CORBA::COMPLETED_YES));
       ACE_NOTREACHED(break);
 
+#if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
       ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
                                          CORBA::COMPLETED_YES));
       ACE_NOTREACHED(break);
+#endif
 
     default :
       ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES));
@@ -217,9 +190,11 @@ TAO_InputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
     case EINVAL : // wchar from a GIOP 1.0
       ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES));
       ACE_NOTREACHED(break);
+#if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
       ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES));
       ACE_NOTREACHED(break);
+#endif
     case EACCES : // wchar but no codeset
       ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES));
       ACE_NOTREACHED(break);
@@ -243,9 +218,11 @@ TAO_InputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
       ACE_THROW (CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO));
       ACE_NOTREACHED(break);
 
+#if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
       ACE_THROW (CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO));
       ACE_NOTREACHED(break);
+#endif
 
     default :
       ACE_THROW (CORBA::MARSHAL());
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
index a73f43bc43e..a01f912d1b2 100644
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CDR_Encaps_Codec.cpp
@@ -14,8 +14,10 @@
 #include "SystemException.h"
 #include "ORB_Constants.h"
 
+#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
+
 ACE_RCSID (tao,
            CDR_Encaps_Codec,
            "$Id$")
@@ -167,33 +169,27 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
 
   if ((cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
     {
-      ACE_Message_Block * mb = data._tao_get_cdr ();
+      TAO::Any_Impl *impl = data.impl ();
 
-      if (mb == 0)
+      if (impl->encoded ())
         {
-          ACE_NEW_THROW_EX (mb,
-                            ACE_Message_Block,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
+          TAO::Unknown_IDL_Type *unk =
+            dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
-          TAO_OutputCDR out;
-          CORBA::Any any (data);
-          any.impl ()->marshal_value (out);
+          // We don't want unk's rd_ptr to move, in case we are shared by
+          // another Any, so we use this to copy the state, not the buffer.
+          TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-          ACE_CDR::consolidate (mb, out.begin ());
+          TAO_Marshal_Object::perform_append (data._tao_get_typecode (),
+                                              &for_reading,
+                                              &cdr
+                                              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+        }
+      else
+        {
+          impl->marshal_value (cdr);
         }
-
-      TAO_InputCDR input (mb,
-                          data._tao_byte_order (),
-                          this->major_,
-                          this->minor_,
-                          this->orb_core_);
-
-      TAO_Marshal_Object::perform_append (data._tao_get_typecode (),
-                                          &input,
-                                          &cdr
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
 
       // TAO extension: replace the contents of the octet sequence with
       // the CDR stream.
@@ -267,8 +263,6 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
   //       rather than attempt to extract it from the CDR
   //       encapsulation.
 
-  CORBA::ULong sequence_length = data.length ();
-
   size_t rd_pos = mb.rd_ptr () - mb.base ();
   size_t wr_pos = mb.wr_ptr () - mb.base () + data.length ();
 
@@ -287,84 +281,27 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
     {
       cdr.reset_byte_order (static_cast<int> (byte_order));
 
-      // @@ (JP) The following code depends on the fact that
-      //         TAO_InputCDR does not contain chained message blocks,
-      //         otherwise <begin> and <end> could be part of
-      //         different buffers!
-
-      // This will be the start of a new message block.
-      char *begin = cdr.rd_ptr ();
-
-      // Skip over the next argument.
-      TAO::traverse_status status =
-        TAO_Marshal_Object::perform_skip (tc,
-                                          &cdr
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);  // @@ Should we throw a
-                             //    IOP::Codec::TypeMismatch exception
-                             //    here if this fails?
+      CORBA::Any * any = 0;
+      ACE_NEW_THROW_EX (any,
+                        CORBA::Any,
+                        CORBA::NO_MEMORY (
+                            CORBA::SystemException::_tao_minor_code (
+                                0,
+                                ENOMEM
+                              ),
+                            CORBA::COMPLETED_NO
+                          ));
+      ACE_CHECK_RETURN (0);
 
-      if (status == TAO::TRAVERSE_CONTINUE)
-        {
-          // This will be the end of the new message block.
-          char *end = cdr.rd_ptr ();
-          size_t size = end - begin;
-
-          // @@ I added the following check, but I'm not sure if it is
-          //    a valid check.  Can someone verify this?
-          //          -Ossama
-
-          // If the unaligned buffer size is not equal to the octet
-          // sequence length (minus the "byte order byte") then the
-          // TypeCode does not correspond to the data in the CDR
-          // encapsulation.  However, even if they do match it is
-          // still uncertain if the TypeCode corresponds to the data
-          // in the octet sequence.  With this test, it is only
-          // possible to determine if the TypeCode does *not* match
-          // the data, not if it does match.
-          if (size != sequence_length - 1)
-            {
-              ACE_THROW_RETURN (IOP::Codec::TypeMismatch (),
-                                0);
-            }
-
-          ptrdiff_t offset =
-            ptrdiff_t (begin) % ACE_CDR::MAX_ALIGNMENT;
-          if (offset < 0)
-            offset += ACE_CDR::MAX_ALIGNMENT;
-
-          mb.rd_ptr (offset);
-          mb.wr_ptr (offset + size);
-
-          CORBA::Any * any = 0;
-          ACE_NEW_THROW_EX (any,
-                            CORBA::Any,
-                            CORBA::NO_MEMORY (
-                                CORBA::SystemException::_tao_minor_code (
-                                    0,
-                                    ENOMEM
-                                  ),
-                                CORBA::COMPLETED_NO
-                              ));
-          ACE_CHECK_RETURN (0);
+      CORBA::Any_var safe_any = any;
 
-          CORBA::Any_var safe_any = any;
-
-          // Stick it into the Any.
-          TAO::Unknown_IDL_Type *unk = 0;
-          ACE_NEW_RETURN (unk,
-                          TAO::Unknown_IDL_Type (tc,
-                                                 &mb,
-                                                 cdr.byte_order ()),
-                          0);
-          any->replace (unk);
-          return safe_any._retn ();
-        }
-      else
-        {
-          ACE_THROW_RETURN (IOP::Codec::TypeMismatch (),
-                            0);
-        }
+      // Stick it into the Any.
+      TAO::Unknown_IDL_Type *unk = 0;
+      ACE_NEW_RETURN (unk,
+                      TAO::Unknown_IDL_Type (tc, cdr),
+                      0);
+      any->replace (unk);
+      return safe_any._retn ();
     }
 
   ACE_THROW_RETURN (IOP::Codec::FormatMismatch (),
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
index 0d8885193bf..9a3bb77ce01 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -3,20 +3,18 @@
  *
  * $Id$
  *
- * This file is used to generate CONV_FRAMEC.{h,i,cpp}, using the
+ * This file is used to generate CONV_FRAMEC.{h,inl,cpp}, using the
  * following command:
  *
  *   tao_idl
  *        -o orig -Ge 1 -GT -GA
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include="tao/TAO_Export.h"
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        CONV_FRAME.pidl
  *
- * Remember to patch the generated files using the patch command. Look
- * at diff/CONV_FRAME.diff for the patches.
- *
+ * The files are ready to use.
  */
 
 #ifndef TAO_CORBA_CONV_FRAME_PIDL
diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp
index 34dcdb62484..0580ac7cb9f 100644
--- a/TAO/tao/CONV_FRAMEA.cpp
+++ b/TAO/tao/CONV_FRAMEA.cpp
@@ -27,28 +27,30 @@
 
 #include "CONV_FRAMEC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f4e56),
-  ACE_NTOHL (0x5f465241),
-  ACE_NTOHL (0x4d452f43),
-  ACE_NTOHL (0x6f646553),
-  ACE_NTOHL (0x65744964),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x65744964), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
     10,
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x53657449),
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657449), 
   ACE_NTOHL (0x64000000),  // name = CodeSetId
     CORBA::tk_ulong,
 
@@ -59,7 +61,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (
     sizeof (_oc_CONV_FRAME_CodeSetId),
     (char *) &_oc_CONV_FRAME_CodeSetId,
     0,
-    sizeof (CONV_FRAME::CodeSetId)
+    0
   );
 
 namespace CONV_FRAME
@@ -69,26 +71,26 @@ namespace CONV_FRAME
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetIdSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f4e56),
-  ACE_NTOHL (0x5f465241),
-  ACE_NTOHL (0x4d452f43),
-  ACE_NTOHL (0x6f646553),
-  ACE_NTOHL (0x65744964),
-  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x65744964), 
+  ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
     13,
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x53657449),
-  ACE_NTOHL (0x64536571),
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657449), 
+  ACE_NTOHL (0x64536571), 
   ACE_NTOHL (0x0),  // name = CodeSetIdSeq
     CORBA::tk_sequence, // typecode kind
   84, // encapsulation length
@@ -97,19 +99,19 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetIdSeq[] =
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       37,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f4e56),
-      ACE_NTOHL (0x5f465241),
-      ACE_NTOHL (0x4d452f43),
-      ACE_NTOHL (0x6f646553),
-      ACE_NTOHL (0x65744964),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f4e56), 
+      ACE_NTOHL (0x5f465241), 
+      ACE_NTOHL (0x4d452f43), 
+      ACE_NTOHL (0x6f646553), 
+      ACE_NTOHL (0x65744964), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
             10,
-      ACE_NTOHL (0x436f6465),
-      ACE_NTOHL (0x53657449),
+      ACE_NTOHL (0x436f6465), 
+      ACE_NTOHL (0x53657449), 
       ACE_NTOHL (0x64000000),  // name = CodeSetId
             CORBA::tk_ulong,
 
@@ -123,7 +125,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetIdSeq (
     sizeof (_oc_CONV_FRAME_CodeSetIdSeq),
     (char *) &_oc_CONV_FRAME_CodeSetIdSeq,
     0,
-    sizeof (CONV_FRAME::CodeSetIdSeq)
+    0
   );
 
 namespace CONV_FRAME
@@ -133,81 +135,81 @@ namespace CONV_FRAME
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f4e56),
-  ACE_NTOHL (0x5f465241),
-  ACE_NTOHL (0x4d452f43),
-  ACE_NTOHL (0x6f646553),
-  ACE_NTOHL (0x6574436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x6574436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
     17,
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x53657443),
-  ACE_NTOHL (0x6f6d706f),
-  ACE_NTOHL (0x6e656e74),
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657443), 
+  ACE_NTOHL (0x6f6d706f), 
+  ACE_NTOHL (0x6e656e74), 
   ACE_NTOHL (0x0),  // name = CodeSetComponent
   2, // member count
     16,
-  ACE_NTOHL (0x6e617469),
-  ACE_NTOHL (0x76655f63),
-  ACE_NTOHL (0x6f64655f),
+  ACE_NTOHL (0x6e617469), 
+  ACE_NTOHL (0x76655f63), 
+  ACE_NTOHL (0x6f64655f), 
   ACE_NTOHL (0x73657400),  // name = native_code_set
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f4e56),
-    ACE_NTOHL (0x5f465241),
-    ACE_NTOHL (0x4d452f43),
-    ACE_NTOHL (0x6f646553),
-    ACE_NTOHL (0x65744964),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x65744964), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
         10,
-    ACE_NTOHL (0x436f6465),
-    ACE_NTOHL (0x53657449),
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657449), 
     ACE_NTOHL (0x64000000),  // name = CodeSetId
         CORBA::tk_ulong,
 
 
   21,
-  ACE_NTOHL (0x636f6e76),
-  ACE_NTOHL (0x65727369),
-  ACE_NTOHL (0x6f6e5f63),
-  ACE_NTOHL (0x6f64655f),
-  ACE_NTOHL (0x73657473),
+  ACE_NTOHL (0x636f6e76), 
+  ACE_NTOHL (0x65727369), 
+  ACE_NTOHL (0x6f6e5f63), 
+  ACE_NTOHL (0x6f64655f), 
+  ACE_NTOHL (0x73657473), 
   ACE_NTOHL (0x0),  // name = conversion_code_sets
     CORBA::tk_alias, // typecode kind for typedefs
   160, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f4e56),
-    ACE_NTOHL (0x5f465241),
-    ACE_NTOHL (0x4d452f43),
-    ACE_NTOHL (0x6f646553),
-    ACE_NTOHL (0x65744964),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x65744964), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
         13,
-    ACE_NTOHL (0x436f6465),
-    ACE_NTOHL (0x53657449),
-    ACE_NTOHL (0x64536571),
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657449), 
+    ACE_NTOHL (0x64536571), 
     ACE_NTOHL (0x0),  // name = CodeSetIdSeq
         CORBA::tk_sequence, // typecode kind
     84, // encapsulation length
@@ -216,19 +218,19 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         37,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f4e56),
-        ACE_NTOHL (0x5f465241),
-        ACE_NTOHL (0x4d452f43),
-        ACE_NTOHL (0x6f646553),
-        ACE_NTOHL (0x65744964),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f4e56), 
+        ACE_NTOHL (0x5f465241), 
+        ACE_NTOHL (0x4d452f43), 
+        ACE_NTOHL (0x6f646553), 
+        ACE_NTOHL (0x65744964), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
                 10,
-        ACE_NTOHL (0x436f6465),
-        ACE_NTOHL (0x53657449),
+        ACE_NTOHL (0x436f6465), 
+        ACE_NTOHL (0x53657449), 
         ACE_NTOHL (0x64000000),  // name = CodeSetId
                 CORBA::tk_ulong,
 
@@ -243,7 +245,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (
     sizeof (_oc_CONV_FRAME_CodeSetComponent),
     (char *) &_oc_CONV_FRAME_CodeSetComponent,
     0,
-    sizeof (CONV_FRAME::CodeSetComponent)
+    0
   );
 
 namespace CONV_FRAME
@@ -253,109 +255,109 @@ namespace CONV_FRAME
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f4e56),
-  ACE_NTOHL (0x5f465241),
-  ACE_NTOHL (0x4d452f43),
-  ACE_NTOHL (0x6f646553),
-  ACE_NTOHL (0x6574436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x6e666f3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x6574436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x6e666f3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
     21,
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x53657443),
-  ACE_NTOHL (0x6f6d706f),
-  ACE_NTOHL (0x6e656e74),
-  ACE_NTOHL (0x496e666f),
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657443), 
+  ACE_NTOHL (0x6f6d706f), 
+  ACE_NTOHL (0x6e656e74), 
+  ACE_NTOHL (0x496e666f), 
   ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
   2, // member count
     12,
-  ACE_NTOHL (0x466f7243),
-  ACE_NTOHL (0x68617244),
+  ACE_NTOHL (0x466f7243), 
+  ACE_NTOHL (0x68617244), 
   ACE_NTOHL (0x61746100),  // name = ForCharData
     CORBA::tk_struct, // typecode kind
   372, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f4e56),
-    ACE_NTOHL (0x5f465241),
-    ACE_NTOHL (0x4d452f43),
-    ACE_NTOHL (0x6f646553),
-    ACE_NTOHL (0x6574436f),
-    ACE_NTOHL (0x6d706f6e),
-    ACE_NTOHL (0x656e743a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x6574436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e743a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
         17,
-    ACE_NTOHL (0x436f6465),
-    ACE_NTOHL (0x53657443),
-    ACE_NTOHL (0x6f6d706f),
-    ACE_NTOHL (0x6e656e74),
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657443), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
     ACE_NTOHL (0x0),  // name = CodeSetComponent
     2, // member count
         16,
-    ACE_NTOHL (0x6e617469),
-    ACE_NTOHL (0x76655f63),
-    ACE_NTOHL (0x6f64655f),
+    ACE_NTOHL (0x6e617469), 
+    ACE_NTOHL (0x76655f63), 
+    ACE_NTOHL (0x6f64655f), 
     ACE_NTOHL (0x73657400),  // name = native_code_set
         CORBA::tk_alias, // typecode kind for typedefs
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       37,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f4e56),
-      ACE_NTOHL (0x5f465241),
-      ACE_NTOHL (0x4d452f43),
-      ACE_NTOHL (0x6f646553),
-      ACE_NTOHL (0x65744964),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f4e56), 
+      ACE_NTOHL (0x5f465241), 
+      ACE_NTOHL (0x4d452f43), 
+      ACE_NTOHL (0x6f646553), 
+      ACE_NTOHL (0x65744964), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
             10,
-      ACE_NTOHL (0x436f6465),
-      ACE_NTOHL (0x53657449),
+      ACE_NTOHL (0x436f6465), 
+      ACE_NTOHL (0x53657449), 
       ACE_NTOHL (0x64000000),  // name = CodeSetId
             CORBA::tk_ulong,
 
 
     21,
-    ACE_NTOHL (0x636f6e76),
-    ACE_NTOHL (0x65727369),
-    ACE_NTOHL (0x6f6e5f63),
-    ACE_NTOHL (0x6f64655f),
-    ACE_NTOHL (0x73657473),
+    ACE_NTOHL (0x636f6e76), 
+    ACE_NTOHL (0x65727369), 
+    ACE_NTOHL (0x6f6e5f63), 
+    ACE_NTOHL (0x6f64655f), 
+    ACE_NTOHL (0x73657473), 
     ACE_NTOHL (0x0),  // name = conversion_code_sets
         CORBA::tk_alias, // typecode kind for typedefs
     160, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       40,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f4e56),
-      ACE_NTOHL (0x5f465241),
-      ACE_NTOHL (0x4d452f43),
-      ACE_NTOHL (0x6f646553),
-      ACE_NTOHL (0x65744964),
-      ACE_NTOHL (0x5365713a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f4e56), 
+      ACE_NTOHL (0x5f465241), 
+      ACE_NTOHL (0x4d452f43), 
+      ACE_NTOHL (0x6f646553), 
+      ACE_NTOHL (0x65744964), 
+      ACE_NTOHL (0x5365713a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
             13,
-      ACE_NTOHL (0x436f6465),
-      ACE_NTOHL (0x53657449),
-      ACE_NTOHL (0x64536571),
+      ACE_NTOHL (0x436f6465), 
+      ACE_NTOHL (0x53657449), 
+      ACE_NTOHL (0x64536571), 
       ACE_NTOHL (0x0),  // name = CodeSetIdSeq
             CORBA::tk_sequence, // typecode kind
       84, // encapsulation length
@@ -364,19 +366,19 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           37,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f4e56),
-          ACE_NTOHL (0x5f465241),
-          ACE_NTOHL (0x4d452f43),
-          ACE_NTOHL (0x6f646553),
-          ACE_NTOHL (0x65744964),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f4e56), 
+          ACE_NTOHL (0x5f465241), 
+          ACE_NTOHL (0x4d452f43), 
+          ACE_NTOHL (0x6f646553), 
+          ACE_NTOHL (0x65744964), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
                     10,
-          ACE_NTOHL (0x436f6465),
-          ACE_NTOHL (0x53657449),
+          ACE_NTOHL (0x436f6465), 
+          ACE_NTOHL (0x53657449), 
           ACE_NTOHL (0x64000000),  // name = CodeSetId
                     CORBA::tk_ulong,
 
@@ -386,83 +388,83 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
 
 
   13,
-  ACE_NTOHL (0x466f7257),
-  ACE_NTOHL (0x63686172),
-  ACE_NTOHL (0x44617461),
+  ACE_NTOHL (0x466f7257), 
+  ACE_NTOHL (0x63686172), 
+  ACE_NTOHL (0x44617461), 
   ACE_NTOHL (0x0),  // name = ForWcharData
     CORBA::tk_struct, // typecode kind
   372, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f4e56),
-    ACE_NTOHL (0x5f465241),
-    ACE_NTOHL (0x4d452f43),
-    ACE_NTOHL (0x6f646553),
-    ACE_NTOHL (0x6574436f),
-    ACE_NTOHL (0x6d706f6e),
-    ACE_NTOHL (0x656e743a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x6574436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e743a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
         17,
-    ACE_NTOHL (0x436f6465),
-    ACE_NTOHL (0x53657443),
-    ACE_NTOHL (0x6f6d706f),
-    ACE_NTOHL (0x6e656e74),
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657443), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
     ACE_NTOHL (0x0),  // name = CodeSetComponent
     2, // member count
         16,
-    ACE_NTOHL (0x6e617469),
-    ACE_NTOHL (0x76655f63),
-    ACE_NTOHL (0x6f64655f),
+    ACE_NTOHL (0x6e617469), 
+    ACE_NTOHL (0x76655f63), 
+    ACE_NTOHL (0x6f64655f), 
     ACE_NTOHL (0x73657400),  // name = native_code_set
         CORBA::tk_alias, // typecode kind for typedefs
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       37,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f4e56),
-      ACE_NTOHL (0x5f465241),
-      ACE_NTOHL (0x4d452f43),
-      ACE_NTOHL (0x6f646553),
-      ACE_NTOHL (0x65744964),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f4e56), 
+      ACE_NTOHL (0x5f465241), 
+      ACE_NTOHL (0x4d452f43), 
+      ACE_NTOHL (0x6f646553), 
+      ACE_NTOHL (0x65744964), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
             10,
-      ACE_NTOHL (0x436f6465),
-      ACE_NTOHL (0x53657449),
+      ACE_NTOHL (0x436f6465), 
+      ACE_NTOHL (0x53657449), 
       ACE_NTOHL (0x64000000),  // name = CodeSetId
             CORBA::tk_ulong,
 
 
     21,
-    ACE_NTOHL (0x636f6e76),
-    ACE_NTOHL (0x65727369),
-    ACE_NTOHL (0x6f6e5f63),
-    ACE_NTOHL (0x6f64655f),
-    ACE_NTOHL (0x73657473),
+    ACE_NTOHL (0x636f6e76), 
+    ACE_NTOHL (0x65727369), 
+    ACE_NTOHL (0x6f6e5f63), 
+    ACE_NTOHL (0x6f64655f), 
+    ACE_NTOHL (0x73657473), 
     ACE_NTOHL (0x0),  // name = conversion_code_sets
         CORBA::tk_alias, // typecode kind for typedefs
     160, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       40,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f4e56),
-      ACE_NTOHL (0x5f465241),
-      ACE_NTOHL (0x4d452f43),
-      ACE_NTOHL (0x6f646553),
-      ACE_NTOHL (0x65744964),
-      ACE_NTOHL (0x5365713a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f4e56), 
+      ACE_NTOHL (0x5f465241), 
+      ACE_NTOHL (0x4d452f43), 
+      ACE_NTOHL (0x6f646553), 
+      ACE_NTOHL (0x65744964), 
+      ACE_NTOHL (0x5365713a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
             13,
-      ACE_NTOHL (0x436f6465),
-      ACE_NTOHL (0x53657449),
-      ACE_NTOHL (0x64536571),
+      ACE_NTOHL (0x436f6465), 
+      ACE_NTOHL (0x53657449), 
+      ACE_NTOHL (0x64536571), 
       ACE_NTOHL (0x0),  // name = CodeSetIdSeq
             CORBA::tk_sequence, // typecode kind
       84, // encapsulation length
@@ -471,19 +473,19 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           37,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f4e56),
-          ACE_NTOHL (0x5f465241),
-          ACE_NTOHL (0x4d452f43),
-          ACE_NTOHL (0x6f646553),
-          ACE_NTOHL (0x65744964),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f4e56), 
+          ACE_NTOHL (0x5f465241), 
+          ACE_NTOHL (0x4d452f43), 
+          ACE_NTOHL (0x6f646553), 
+          ACE_NTOHL (0x65744964), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
                     10,
-          ACE_NTOHL (0x436f6465),
-          ACE_NTOHL (0x53657449),
+          ACE_NTOHL (0x436f6465), 
+          ACE_NTOHL (0x53657449), 
           ACE_NTOHL (0x64000000),  // name = CodeSetId
                     CORBA::tk_ulong,
 
@@ -499,7 +501,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (
     sizeof (_oc_CONV_FRAME_CodeSetComponentInfo),
     (char *) &_oc_CONV_FRAME_CodeSetComponentInfo,
     0,
-    sizeof (CONV_FRAME::CodeSetComponentInfo)
+    0
   );
 
 namespace CONV_FRAME
@@ -509,75 +511,75 @@ namespace CONV_FRAME
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f4e56),
-  ACE_NTOHL (0x5f465241),
-  ACE_NTOHL (0x4d452f43),
-  ACE_NTOHL (0x6f646553),
-  ACE_NTOHL (0x6574436f),
-  ACE_NTOHL (0x6e746578),
-  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f4e56), 
+  ACE_NTOHL (0x5f465241), 
+  ACE_NTOHL (0x4d452f43), 
+  ACE_NTOHL (0x6f646553), 
+  ACE_NTOHL (0x6574436f), 
+  ACE_NTOHL (0x6e746578), 
+  ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
     15,
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x53657443),
-  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x53657443), 
+  ACE_NTOHL (0x6f6e7465), 
   ACE_NTOHL (0x78740000),  // name = CodeSetContext
   2, // member count
     10,
-  ACE_NTOHL (0x63686172),
-  ACE_NTOHL (0x5f646174),
+  ACE_NTOHL (0x63686172), 
+  ACE_NTOHL (0x5f646174), 
   ACE_NTOHL (0x61000000),  // name = char_data
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f4e56),
-    ACE_NTOHL (0x5f465241),
-    ACE_NTOHL (0x4d452f43),
-    ACE_NTOHL (0x6f646553),
-    ACE_NTOHL (0x65744964),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x65744964), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
         10,
-    ACE_NTOHL (0x436f6465),
-    ACE_NTOHL (0x53657449),
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657449), 
     ACE_NTOHL (0x64000000),  // name = CodeSetId
         CORBA::tk_ulong,
 
 
   11,
-  ACE_NTOHL (0x77636861),
-  ACE_NTOHL (0x725f6461),
+  ACE_NTOHL (0x77636861), 
+  ACE_NTOHL (0x725f6461), 
   ACE_NTOHL (0x74610000),  // name = wchar_data
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f4e56),
-    ACE_NTOHL (0x5f465241),
-    ACE_NTOHL (0x4d452f43),
-    ACE_NTOHL (0x6f646553),
-    ACE_NTOHL (0x65744964),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f4e56), 
+    ACE_NTOHL (0x5f465241), 
+    ACE_NTOHL (0x4d452f43), 
+    ACE_NTOHL (0x6f646553), 
+    ACE_NTOHL (0x65744964), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
         10,
-    ACE_NTOHL (0x436f6465),
-    ACE_NTOHL (0x53657449),
+    ACE_NTOHL (0x436f6465), 
+    ACE_NTOHL (0x53657449), 
     ACE_NTOHL (0x64000000),  // name = CodeSetId
         CORBA::tk_ulong,
 
@@ -589,7 +591,7 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (
     sizeof (_oc_CONV_FRAME_CodeSetContext),
     (char *) &_oc_CONV_FRAME_CodeSetContext,
     0,
-    sizeof (CONV_FRAME::CodeSetContext)
+    0
   );
 
 namespace CONV_FRAME
@@ -598,7 +600,7 @@ namespace CONV_FRAME
     &_tc_TAO_tc_CONV_FRAME_CodeSetContext;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -635,8 +637,8 @@ CORBA::Boolean operator>>= (
     CONV_FRAME::CodeSetIdSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CONV_FRAME::CodeSetIdSeq *&,
+  return _tao_any >>= const_cast<
+      const CONV_FRAME::CodeSetIdSeq *&> (
       _tao_elem
     );
 }
@@ -656,7 +658,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -693,8 +695,8 @@ CORBA::Boolean operator>>= (
     CONV_FRAME::CodeSetComponent *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CONV_FRAME::CodeSetComponent *&,
+  return _tao_any >>= const_cast<
+      const CONV_FRAME::CodeSetComponent *&> (
       _tao_elem
     );
 }
@@ -714,7 +716,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -751,8 +753,8 @@ CORBA::Boolean operator>>= (
     CONV_FRAME::CodeSetComponentInfo *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CONV_FRAME::CodeSetComponentInfo *&,
+  return _tao_any >>= const_cast<
+      const CONV_FRAME::CodeSetComponentInfo *&> (
       _tao_elem
     );
 }
@@ -772,7 +774,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -809,8 +811,8 @@ CORBA::Boolean operator>>= (
     CONV_FRAME::CodeSetContext *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CONV_FRAME::CodeSetContext *&,
+  return _tao_any >>= const_cast<
+      const CONV_FRAME::CodeSetContext *&> (
       _tao_elem
     );
 }
@@ -830,8 +832,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -876,5 +876,4 @@ CORBA::Boolean operator>>= (
         CONV_FRAME::CodeSetContext \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 75f6db7ecbf..e21fd458a8c 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "CONV_FRAMEC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "CONV_FRAMEC.i"
+#include "CONV_FRAMEC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -97,7 +96,7 @@ void CONV_FRAME::CodeSetIdSeq::_tao_any_destructor (
   )
 {
   CodeSetIdSeq * _tao_tmp_pointer =
-    ACE_static_cast (CodeSetIdSeq *, _tao_void_pointer);
+    static_cast<CodeSetIdSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -112,7 +111,7 @@ CONV_FRAME::CodeSetComponent::_tao_any_destructor (
   )
 {
   CodeSetComponent *_tao_tmp_pointer =
-    ACE_static_cast (CodeSetComponent *, _tao_void_pointer);
+    static_cast<CodeSetComponent *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -125,7 +124,7 @@ CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (
   )
 {
   CodeSetComponentInfo *_tao_tmp_pointer =
-    ACE_static_cast (CodeSetComponentInfo *, _tao_void_pointer);
+    static_cast<CodeSetComponentInfo *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -138,7 +137,7 @@ CONV_FRAME::CodeSetContext::_tao_any_destructor (
   )
 {
   CodeSetContext *_tao_tmp_pointer =
-    ACE_static_cast (CodeSetContext *, _tao_void_pointer);
+    static_cast<CodeSetContext *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -153,7 +152,7 @@ CORBA::Boolean operator<< (
     const CONV_FRAME::CodeSetIdSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -270,7 +269,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -399,4 +398,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 250170cfbcf..00586477862 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_CONV_FRAMEC_H_
 #define _TAO_IDL_ORIG_CONV_FRAMEC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -58,9 +61,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -321,13 +322,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSet
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "CONV_FRAMEC.i"
+#include "CONV_FRAMEC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -339,3 +340,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/CONV_FRAMEC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/CONV_FRAMES.cpp b/TAO/tao/CONV_FRAMES.cpp
deleted file mode 100644
index 985228fac4a..00000000000
--- a/TAO/tao/CONV_FRAMES.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAME.cpp
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "tao/CONV_FRAMES.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/CONV_FRAMES.i"
-#endif /* !defined INLINE */
diff --git a/TAO/tao/CONV_FRAMES.h b/TAO/tao/CONV_FRAMES.h
index 61c3b42cc53..c4106c6d5e1 100644
--- a/TAO/tao/CONV_FRAMES.h
+++ b/TAO/tao/CONV_FRAMES.h
@@ -1,50 +1,79 @@
-//=============================================================================
-/**
- *  @file   CONV_FRAMES.h
- *
- *  $Id$
- *
- * Generated from CONV_FRAME.pidl, that contains the OMG standarized
- * CONV_FRAME module.
- * The code was generated by the IDL compiler and then hand-crafted
- * to reduce the includes interdependencies.
- *
- *
- */
-//=============================================================================
-
-
-#ifndef TAO_CONV_FRAMES_H
-#define TAO_CONV_FRAMES_H
-#include /**/ "ace/pre.h"
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/CONV_FRAMEC.h"
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
 
+#ifndef _TAO_IDL_ORIG_CONV_FRAMES_H_
+#define _TAO_IDL_ORIG_CONV_FRAMES_H_
+
+#include /**/ "ace/pre.h"
+
+#include "CONV_FRAMEC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-namespace  POA_CONV_FRAME
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_CONV_FRAME
 {
-}
 
-#include "tao/CONV_FRAMES_T.h"
 
-#if defined (__ACE_INLINE__)
-#include "tao/CONV_FRAMES.i"
-#endif /* defined INLINE */
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module CONV_FRAME
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:999
+
+#include "CONV_FRAMES_T.h"
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include /**/ "ace/post.h"
-#endif /* TAO_CONV_FRAMES_H */
+#endif /* ifndef */
+
diff --git a/TAO/tao/CONV_FRAMES.i b/TAO/tao/CONV_FRAMES.i
deleted file mode 100644
index 1d2df31bd57..00000000000
--- a/TAO/tao/CONV_FRAMES.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/CONV_FRAMES_T.cpp b/TAO/tao/CONV_FRAMES_T.cpp
deleted file mode 100644
index ae8f02f0583..00000000000
--- a/TAO/tao/CONV_FRAMES_T.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAMES_T.h
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_CONV_FRAMES_T_CPP
-#define TAO_CONV_FRAMES_T_CPP
-
-#include "tao/CONV_FRAMES_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/CONV_FRAMES_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* TAO_CONV_FRAMES_T_CPP */
diff --git a/TAO/tao/CONV_FRAMES_T.h b/TAO/tao/CONV_FRAMES_T.h
index 776bf3b16ab..a0f8069f180 100644
--- a/TAO/tao/CONV_FRAMES_T.h
+++ b/TAO/tao/CONV_FRAMES_T.h
@@ -1,48 +1,58 @@
-//=============================================================================
-/**
- *  @file   CONV_FRAMES_T.h
- *
- *  $Id$
- *
- * Generated from CONV_FRAME.pidl, that contains the OMG standarized
- * CONV_FRAME module.
- * The code was generated by the IDL compiler and then hand-crafted
- * to reduce the includes interdependencies.
- *
- *
- */
-//=============================================================================
-
-
-#ifndef TAO_CONV_FRAMES_T_H
-#define TAO_CONV_FRAMES_T_H
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:547
+
+#ifndef _TAO_IDL_ORIG_CONV_FRAMES_T_H_
+#define _TAO_IDL_ORIG_CONV_FRAMES_T_H_
+
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
-#if defined (__ACE_INLINE__)
-#include "tao/CONV_FRAMES_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/CONV_FRAMES_T.cpp"
-#endif /* defined REQUIRED SOURCE */
+// TAO_IDL - Generated from
+// be\be_visitor_root/root_sth.cpp:116
 
+namespace POA_CONV_FRAME
+{
+} // module CONV_FRAME
 
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CONV_FRAMES_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1096
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
-#endif /* TAO_CONV_FRAMES_T_H */
+#endif /* ifndef */
+
diff --git a/TAO/tao/CONV_FRAMES_T.i b/TAO/tao/CONV_FRAMES_T.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/CONV_FRAMES_T.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index cd64090e2b4..8d54c22764a 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -1,301 +1,41 @@
 #include "CORBALOC_Parser.h"
 #include "ORB_Core.h"
 #include "Stub.h"
+#include "MProfile.h"
 #include "Connector_Registry.h"
-#include "SystemException.h"
+#include "Transport_Connector.h"
+#include "Protocol_Factory.h"
 #include "tao/debug.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_string.h"
+#include "ace/Vector_T.h"
+#include "ace/INET_Addr.h"
+#include "ace/os_include/os_netdb.h"
 
 #if !defined(__ACE_INLINE__)
 #include "CORBALOC_Parser.i"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (tao,
+ACE_RCSID (TAO,
            CORBALOC_Parser,
            "$Id$")
 
-
 TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void)
 {
 }
 
-static const char corbaloc_prefix[] = "corbaloc:";
-
-static const char* protocol_prefixes[] = {
-  "iiop",
-  "miop",
-  "rir",
-  "sciop",
-  "shmiop",
-  "uiop"
-};
+static const char prefix[] = "corbaloc:";
+static const size_t prefix_len = sizeof prefix - 1;
+static const char rir_token[] = "rir:/"; // includes key separator
+static const size_t rir_token_len = sizeof rir_token - 1;
+static const char iiop_token[] = "iiop:";
+static const char iiop_token_len = sizeof iiop_token - 1;
 
 int
 TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const
 {
   // Check if the prefix is 'corbaloc:' and return the result.
   return (ACE_OS::strncmp (ior_string,
-                           corbaloc_prefix,
-                           sizeof corbaloc_prefix - 1) == 0);
-}
-
-void
-TAO_CORBALOC_Parser::parse_string_count_helper (const char * s,
-                                                CORBA::ULong &addr_list_length,
-                                                CORBA::ULong &addr_count
-                                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  char object_key_delimiter = '/';
-
-  if (ACE_OS::strncmp (s, "uiop", 4) == 0)
-      object_key_delimiter = '|';
-
-  for (const char *i = s; *i != '\0'; ++i)
-    {
-      if (*i == ',')
-        {
-          // Increment the address count
-          ++addr_count;
-        }
-
-      if (*i == ':'
-          && *(i + 1) == '/'
-          && *(i + 2) == '/')
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR((LM_ERROR,
-                       ACE_TEXT ("TAO (%P|%t) Invalid Syntax: %s\n"),
-                       ACE_TEXT_CHAR_TO_TCHAR (s)));
-
-          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
-                                       CORBA::COMPLETED_NO));
-        }
-
-      if (*i == object_key_delimiter
-          && *(i+1) != object_key_delimiter)
-        {
-          // Indication that the next characters are to be
-          // assigned to key_string
-          return;
-        }
-
-      ++addr_list_length;
-    }
-}
-
-void
-TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr,
-                                        ACE_CString & key_string,
-                                        CORBA::ULong
-                                        &addr_list_length,
-                                        CORBA::ORB_ptr orb,
-                                        TAO_MProfile &mprofile
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::String_var end_point;
-  const char protocol_prefix[] = ":";
-  const char protocol_suffix_append[] = "://";
-  const char iiop_prefix[] = "iiop";
-  const char uiop_prefix[] = "uiop";
-  const char def_port[] = ":2809";
-
-  // Copy the cloc_name_ptr to cloc_name_cstring.
-  ACE_CString cloc_name_cstring (cloc_name_ptr,
-                                 addr_list_length,
-                                 0,
-                                 1);
-
-  // pos_colon is the position of the ':' in the iiop_id
-  // <iiop_id> = ":" | <iiop_prot_token>":"
-  int pos_colon = cloc_name_cstring.find (':', 0);
-
-  if (ACE_OS::strncmp (cloc_name_ptr,
-                       protocol_prefix,
-                       sizeof (protocol_prefix) - 1) == 0)
-    {
-      // If there is no protocol explicitly specified then default to
-      // "iiop".
-      end_point = CORBA::string_alloc (addr_list_length
-                                       + sizeof (iiop_prefix) - 1
-                                       + 1  // Object key separator
-                                       + 3  // "://"
-                                       + sizeof (def_port) - 1
-                                       + static_cast<CORBA::ULong> (
-                                             key_string.length ()));
-
-      // Copy the default <iiop> prefix.
-      ACE_OS::strcpy (end_point.inout (),
-                      iiop_prefix);
-
-      // Append '://'
-      ACE_OS::strcat (end_point.inout (),
-                      protocol_suffix_append);
-    }
-  else
-    {
-      // The case where the protocol to be used is explicitly
-      // specified.
-
-      // The space allocated for the default IIOP port is not needed
-      // for all protocols, but it is only 5 bytes.  No biggy.
-      end_point = CORBA::string_alloc (addr_list_length
-                                       + 1  // Object key separator
-                                       + 3  // "://"
-                                       + sizeof (def_port) - 1
-                                       + static_cast<CORBA::ULong> (
-                                             key_string.length ()));
-
-      ACE_CString prot_name = cloc_name_cstring.substring (0,
-                                                           pos_colon);
-
-      // Form the endpoint
-
-      // Example:
-      // prot_name.c_str () = iiop
-      ACE_OS::strcpy (end_point.inout (),
-                      prot_name.c_str ());;
-
-
-      // Example:
-      // The endpoint will now be of the form 'iiop'
-
-      ACE_OS::strcat (end_point.inout (),
-                      protocol_suffix_append);
-
-      // The endpoint will now be of the form 'iiop://'
-    }
-
-  ACE_CString addr =
-    cloc_name_cstring.substring (pos_colon + 1, -1);
-
-  ACE_OS::strcat (end_point.inout (),
-                  addr.c_str ());
-
-  // Check for an IIOP corbaloc IOR.  If the port number is not
-  // specified, append the default corbaloc port number (i.e. "2809")
-  if (ACE_OS::strncmp (end_point.in (),
-                       iiop_prefix,
-                       sizeof (iiop_prefix) - 1) == 0
-      && addr.find (':') == ACE_CString::npos)
-    ACE_OS::strcat (end_point.inout (), def_port);
-
-  // Example:
-  // The End_point will now be of the form
-  //    'iiop://1.0@doc.ece.uci.edu:12345'
-
-  if (ACE_OS::strncmp (cloc_name_ptr,
-                       uiop_prefix,
-                       sizeof (uiop_prefix) - 1) == 0)
-    {
-      // The separator for the uiop protocol is '|'. This should
-      // actually be later changed so that the separator is '/' as the
-      // other protocols.
-      ACE_OS::strcat (end_point.inout (), "|");
-    }
-  else
-    {
-      ACE_OS::strcat (end_point.inout (), "/");
-    }
-
-  // Append the key string.
-  ACE_OS::strcat (end_point.inout (),
-                  key_string.c_str ());
-
-  // Example: The End_point will now be of the form:
-  // 'iiop://1.0@doc.ece.uci.edu:12345/object_name'
-
-  // Call the mprofile helper which makes an mprofile for this
-  // endpoint and adds it to the big mprofile.
-  this->parse_string_mprofile_helper (end_point.in (),
-                                      orb,
-                                      mprofile
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_CORBALOC_Parser::parse_string_assign_helper (
-    ACE_CString &key_string,
-    ACE_CString &cloc_name,
-    CORBA::ORB_ptr orb,
-    TAO_MProfile &mprofile
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  char *cloc_name_ptr = 0;
-
-  // Tokenize using "," as the seperator
-  char *last_addr = 0;
-
-  cloc_name_ptr =
-    ACE_OS::strtok_r (const_cast<char *> (cloc_name.c_str ()),
-                      ",",
-                      &last_addr);
-
-  CORBA::ULong length;
-  while (cloc_name_ptr != 0)
-    {
-      length = static_cast<CORBA::ULong> (ACE_OS::strlen (cloc_name_ptr));
-      // Forms the endpoint and calls the mprofile_helper.
-      this->assign_key_string (cloc_name_ptr,
-                               key_string,
-                               length,
-                               orb,
-                               mprofile
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Get the next token.
-      cloc_name_ptr = ACE_OS::strtok_r ((char*)NULL,
-                                        ",",
-                                        &last_addr);
-    }
-}
-
-
-void
-TAO_CORBALOC_Parser::parse_string_mprofile_helper (
-    const char * end_point,
-    CORBA::ORB_ptr orb,
-    TAO_MProfile &mprofile
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_MProfile jth_mprofile;
-
-  TAO_Connector_Registry *conn_reg =
-    orb->orb_core ()->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  int retv =
-    conn_reg->make_mprofile (end_point,
-                             jth_mprofile
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (retv != 0)
-    {
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                      0,
-                      EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  TAO_MProfile *jth_mprofile_ptr = &jth_mprofile;
-
-  // Add this profile to the main mprofile.
-  int result = mprofile.add_profiles (jth_mprofile_ptr);
-
-  if (result == -1)
-    {
-      // The profile is not added.  Either way, go to the next
-      // endpoint.
-    }
+                           prefix,
+                           prefix_len) == 0);
 }
 
 CORBA::Object_ptr
@@ -316,176 +56,263 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
 
   if (!CORBA::is_nil (obj.in ()))
     {
-      // All is well, so release the stub object from its auto_ptr.
+      /// All is well, so release the stub object from its
+      /// auto_ptr.
       (void) safe_data.release ();
 
-      // Return the object reference to the application.
+      /// Return the object reference to the application.
       return obj._retn ();
     }
 
-  // Shouldn't come here: if so, return nil reference.
+  /// Shouldnt come here: if so, return nil reference.
   return CORBA::Object::_nil ();
 }
 
 CORBA::Object_ptr
-TAO_CORBALOC_Parser::parse_string_rir_helper (const char *& corbaloc_name,
+TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior,
                                               CORBA::ORB_ptr orb
                                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
-
-  // "rir" protocol. Pass the key string as an
-  // argument to the resolve_initial_references.
-  const char *key_string = corbaloc_name + sizeof ("rir:/") -1;
-
-  if (ACE_OS::strcmp (key_string, "") == 0)
-    {
-      // If the key string is empty, assume the default
-      // "NameService".
-      key_string =  "NameService";
-    }
+  // Pass the key string as an argument to resolve_initial_references.
+  // NameService is the default if an empty key string is supplied.
+  const char *objkey = ior + rir_token_len;
 
   CORBA::Object_var rir_obj =
-    orb->resolve_initial_references (key_string
+    orb->resolve_initial_references (*objkey == '\0' ? "NameService" :
+                                     objkey
                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return rir_obj._retn ();
 }
 
-int
-TAO_CORBALOC_Parser::check_prefix (const char *end_point
+CORBA::Object_ptr
+TAO_CORBALOC_Parser::parse_string (const char * ior,
+                                   CORBA::ORB_ptr orb
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  // The decomposition of a corbaloc string is in Section 13.6.10.
+  //
+  // following the "corbaloc:"
+  //  a comma separated list of <prot_addr> strings
+  //    for each,
+  // Separate out the key, delimited by '/'
+  // Split out the various parts of our corbaloc string, comma-delimited
+  // For each part
+  //   Determine the protocol
+  //     If rir, defer to another function and return the object
+  //     If iiop, make the profile with <endpoint>:<port>/<key>
+  //     If another protocol, use <remainder>/<key>
+  //   Search through the collection of protocols for the correct one
+  //     If not found, throw exception
+  //     If found, make our_connector from it.
+  //     our_connector->make_mprofile_unchecked (...);
+  //     object = this->make_stub_from_mprofile (...);
+  // Return the object
 
-  // This checks if the prefix is "rir:" or not. Returns a -1 if it is
-  // "rir:" else returns a zero;
-  // Check for a valid string
-  if (!end_point || !*end_point)
-    return -1; // Failure
-
-  const char *protocol[] = {"rir:"};
-  size_t slot = ACE_OS::strchr (end_point, '/') - end_point;
-  const char* colon_pos = ACE_OS::strchr (end_point, ':');
-  size_t colon_slot = colon_pos ? colon_pos - end_point : 0;
-  size_t len0 = ACE_OS::strlen (protocol[0]);
-
-  // Lets first check if it is a valid protocol:
-  if (colon_slot != 0)
-  {
-    size_t i;
-    const size_t protocol_prefixes_size =
-      sizeof(protocol_prefixes)/sizeof(protocol_prefixes[0]);
-
-    for (i = 0; i < protocol_prefixes_size ; ++i)
-    {
-      if (ACE_OS::strncmp (end_point,
-                         protocol_prefixes[i],
-                         colon_slot) == 0)
-         break;
-    }
-
-    if (i == protocol_prefixes_size)
+  // Skip the prefix.  We know it is there because this method is only
+  // called if match_prefix() returns 1.
+  ior += ACE_OS::strlen(prefix);
+
+  //  First check for rir
+  if (ACE_OS::strncmp (ior,rir_token,rir_token_len) == 0)
+    return this->parse_string_rir_helper (ior,orb
+                                          ACE_ENV_ARG_PARAMETER);
+
+  // set up space for parsed endpoints. there will be at least 1, and
+  // most likely commas will separate endpoints, although they could be
+  // part of an endpoint address for some protocols.
+  size_t max_endpoint_count = 1;
+  for (const char *comma = ACE_OS::strchr (ior,',');
+       comma;
+       comma = ACE_OS::strchr (comma+1,','))
+    max_endpoint_count++;
+
+  ACE_Array<parsed_endpoint> endpoints(max_endpoint_count);
+  endpoints.size (0);
+
+  // Get the Connector Registry from the ORB.
+  TAO_Connector_Registry *conn_reg =
+    orb->orb_core ()->connector_registry(ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  while (1) { // will loop on comma only.
+    size_t len = 0;
+    size_t ndx = endpoints.size();
+    endpoints.size(ndx+1);
+    int uiop_compatible = 0;
+    TAO_ConnectorSetIterator conn_iter = 0;
+    for (conn_iter = conn_reg->begin();
+         conn_iter != conn_reg->end() &&
+           endpoints[ndx].profile_ == 0;
+         conn_iter ++)
+      {
+        endpoints[ndx].profile_ =
+          (*conn_iter)->corbaloc_scan(ior,len
+                                      ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+        if (endpoints[ndx].profile_)
+          {
+            endpoints[ndx].obj_key_sep_ =
+              (*conn_iter)->object_key_delimiter();
+            uiop_compatible = (endpoints[ndx].obj_key_sep_ == '|');
+            this->make_canonical (ior,len,endpoints[ndx].prot_addr_
+                                   ACE_ENV_ARG_PARAMETER);
+            ior += len;
+            break;
+          }
+      }
+
+    if (endpoints[ndx].profile_ == 0)
+      {
+        if (TAO_debug_level)
+          ACE_ERROR ((LM_ERROR,
+                      "(%P|%t) TAO_CORBALOC_Parser::parse_string "
+                      "could not parse from %s",ior));
+        ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
+                                            CORBA::COMPLETED_NO),
+                          CORBA::Object::_nil ());
+      }
+    if (*ior == ',') // more endpoints follow
+      {
+        ior++;
+        continue;
+      }
+
+    if (*ior == '/') // found key separator
+      {
+        ior ++;
+        break;
+      }
+
+    if (uiop_compatible && *(ior - 1) == '|')
+      // Assume this is an old uiop style corbaloc. No need to warn here,
+      // the UIOP_Connector::corbaloc_scan already did.
+      break;
+
+    // anything else is a violation.
+    if (TAO_debug_level)
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) TAO_CORBALOC_Parser::parse_string "
+                  "could not parse from %s",ior));
+    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
+                                        CORBA::COMPLETED_NO),
+                      CORBA::Object::_nil ());
+  } // end of while
+
+  // At this point, ior points at the start of the object key
+  ACE_CString obj_key (*ior ? ior : (const char *)"NameService");
+
+  // now take the collection of endpoints along with the decoded key and
+  // mix them together to get the mprofile.
+  TAO_MProfile mprofile (endpoints.size());
+
+  for (size_t i = 0; i < endpoints.size(); i++)
     {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) ")
-                    ACE_TEXT ("no usable transport protocol ")
-                    ACE_TEXT ("was found.\n")));
-
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
-                                          CORBA::COMPLETED_NO),
-                        -1);
+      ACE_CString full_ep = endpoints[i].prot_addr_ +
+        endpoints[i].obj_key_sep_ +
+        obj_key;
+      const char * str = full_ep.c_str();
+      endpoints[i].profile_->parse_string (str
+                                                  ACE_ENV_ARG_PARAMETER);
+      if (mprofile.add_profile(endpoints[i].profile_) != -1)
+        endpoints[i].profile_ = 0;
     }
-  }
 
-  // Check for the proper prefix in the IOR.  If the proper prefix
-  // isn't in the IOR then it is not an IOR we can use.
-  if (slot == len0
-      && ACE_OS::strncasecmp (end_point, protocol[0], len0) == 0)
-    return 0;
+  CORBA::Object_ptr object = CORBA::Object::_nil ();
+  // Get an object stub out.
+  object = this->make_stub_from_mprofile (orb,
+                                          mprofile
+                                          ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return 1;
+  return object;
 }
 
-CORBA::Object_ptr
-TAO_CORBALOC_Parser::parse_string (const char * ior,
-                                   CORBA::ORB_ptr orb
-                                   ACE_ENV_ARG_DECL)
+void
+TAO_CORBALOC_Parser::make_canonical (const char *ior,
+                                     size_t prot_addr_len,
+                                     ACE_CString &canonical_endpoint
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // MProfile which consists of the profiles for each endpoint.
-  TAO_MProfile mprofile;
+  const char *separator = ACE_OS::strchr (ior, ':');
 
-  // Skip the prefix.  We know it is there because this method is only
-  // called if match_prefix() returns 1.
-  const char *corbaloc_name =
-    ior + sizeof corbaloc_prefix - 1;
+  // A special case for handling iiop
+  if (ior[0] != ':' && ACE_OS::strncmp (ior,iiop_token,iiop_token_len) != 0)
+    {
+      canonical_endpoint.set (separator+1,
+                              prot_addr_len - (separator - ior) - 1,1);
+      return;
+    }
 
-  CORBA::Object_ptr object = CORBA::Object::_nil ();
+  const char *addr_base = separator+1;
+  const char *addr_tail = ior + prot_addr_len;
+  // skip past version, if any
+  separator = ACE_OS::strchr (addr_base,'@');
+  if (separator != 0 && separator < addr_tail)
+    {
+      canonical_endpoint.set (addr_base,(separator - addr_base)+1,1);
+      addr_base = separator + 1;
+    }
+  else
+    canonical_endpoint.clear ();
 
-  // Number of endpoints
-  CORBA::ULong count_addr = 1;
+  ACE_CString raw_host;
+  ACE_CString raw_port;
+  separator = ACE_OS::strchr (addr_base,':');
+  if (separator != 0 && separator < addr_tail)
+    {
+      // we have a port number
+      if (separator - addr_base > 0)
+        raw_host.set (addr_base, (separator - addr_base),1);
+      raw_port.set (separator, (addr_tail - separator), 1);
+    }
+  else
+    {
+      // we must default port #
+      if (addr_base < addr_tail)
+        raw_host.set (addr_base, (addr_tail - addr_base),1);
+      raw_port.set (":2809");
+    }
 
-  // Length of obj_addr_list
-  CORBA::ULong addr_list_length = 0;
+  if (raw_host.length() == 0)
+    {
+      ACE_INET_Addr host_addr;
 
-  // If the protocol is not "rir:" and also is a valid protocol
-  int check_prefix_result = this->check_prefix (corbaloc_name
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      char tmp_host [MAXHOSTNAMELEN + 1];
 
-  if (check_prefix_result != 0)
-    {
-      // Count the length of the obj_addr_list and number of
-      // endpoints in the obj_addr_list
-      this->parse_string_count_helper (corbaloc_name,
-                                       addr_list_length,
-                                       count_addr
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      // Convert corbaloc_name to an ACE_CString
-      ACE_CString corbaloc_name_str (corbaloc_name, 0, 1);
-
-      // Get the key_string which is a substring of corbaloc_name_str
-      ACE_CString key_string =
-        corbaloc_name_str.substring (addr_list_length + 1);
-
-      // Copy the <obj_addr_list> to cloc_name.
-      ACE_CString cloc_name (corbaloc_name,
-                             addr_list_length,
-                             0,
-                             1);
-
-      // Get each endpoint: For each endpoint, make a MProfile and add
-      // it to the main MProfile whose reference is passed to the
-      // application
-      this->parse_string_assign_helper (key_string,
-                                        cloc_name,
-                                        orb,
-                                        mprofile
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      // Create the stub for the mprofile and get the object reference
-      // to it which is to be returned to the client application.
-      object = this->make_stub_from_mprofile (orb,
-                                              mprofile
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      // If no host is specified: assign the default host, i.e. the
+      // local host.
+      if (host_addr.get_host_name (tmp_host,
+                                   sizeof (tmp_host)) != 0)
+        {
+          // Can't get the IP address since the INET_Addr wasn't
+          // initialized.  Just throw an exception.
+
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT ("TAO (%P|%t) ")
+                        ACE_TEXT ("cannot determine hostname.\n")));
+
+          ACE_THROW (CORBA::INV_OBJREF
+                     (CORBA::SystemException::_tao_minor_code
+                      (0, EINVAL),
+                      CORBA::COMPLETED_NO));
+        }
+      else
+        {
+          canonical_endpoint += tmp_host;
+        }
     }
   else
     {
-      // RIR case:
-      object = this->parse_string_rir_helper (corbaloc_name,
-                                              orb
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      canonical_endpoint += raw_host;
     }
-  return object;
+
+  canonical_endpoint += raw_port;
 }
 
 ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser,
@@ -499,7 +326,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser,
 ACE_FACTORY_DEFINE (TAO, TAO_CORBALOC_Parser)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array_Base<char *>;
+template class ACE_Array_Base<TAO_CORBALOC_Parser::parsed_endpoint>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Array_Base<char *>
+#pragma instantiate ACE_Array_Base<TAO_CORBALOC_Parser::parsed_endpoint>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index 0d12aa87d95..254e54050f1 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -11,17 +11,21 @@
  */
 //=============================================================================
 
+
 #ifndef TAO_CORBALOC_PARSER_H
 #define TAO_CORBALOC_PARSER_H
-
 #include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
+
+#include "tao/IOR_Parser.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IOR_Parser.h"
+#include "tao/Profile.h"
+#include "ace/Service_Config.h"
+#include "ace/Array.h"
+#include "ace/SString.h"
 
 class TAO_MProfile;
 
@@ -51,78 +55,40 @@ public:
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
-  /// Checks the prefix to see if it is RIR.
-  virtual int check_prefix (const char *endpoint
-                            ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Helps count the length of the <obj_addr_list> and the number of
-  /// individual <obj_addr> in the <obj_addr_list>.
-  virtual void parse_string_count_helper (const char * corbaloc_name,
-                                          CORBA::ULong &addr_list_length,
-                                          CORBA::ULong &count_addr
-                                          ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * Creates a MProfile for the endpoint passed and each such mprofile
-   * is added to the big mprofile <mprofile_> from which a pointer to
-   * the Object represented by the key_string is obtained and passed
-   * to the application.
-   */
-  virtual void parse_string_mprofile_helper (const char * end_point,
-                                             CORBA::ORB_ptr orb,
-                                             TAO_MProfile &mprofile
-                                             ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   /**
    * Make a stub from the MProfile that is created in
    * parse_string_mprofile_helper. Using this stub, create an object
    * reference which is sent to the application.
    */
-  virtual CORBA::Object_ptr
-    make_stub_from_mprofile (CORBA::ORB_ptr orb,
-                             TAO_MProfile &mprofile
-                             ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Object_ptr make_stub_from_mprofile (CORBA::ORB_ptr orb,
+                                             TAO_MProfile &mprofile
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Gets the pointer to the key_string when the protocol used is RIR
-  virtual CORBA::Object_ptr
-    parse_string_rir_helper (const char * &corbaloc_name,
-                             CORBA::ORB_ptr orb
-                             ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Tokenizes the <obj_addr_list> using "," as the seperator. Assigns
-  /// individual endpoints to the elements of the ACE_Array_Base.
-  virtual void parse_string_assign_helper (
-                                           ACE_CString &key_string,
-                                           ACE_CString &cloc_name,
-                                           CORBA::ORB_ptr orb,
-                                           TAO_MProfile &mprofile
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Object_ptr parse_string_rir_helper (const char *corbaloc_name,
+                                             CORBA::ORB_ptr orb
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  /**
-   * Helps parse_string_assign_helper by assigning in the case when
-   * the protocol name is present and we have to append jsut the key
-   * string.
-   */
-  virtual void
-    assign_key_string(char * &cloc_name_ptr,
-                      ACE_CString &key_string,
-                      CORBA::ULong &addr_list_length,
-                      CORBA::ORB_ptr orb,
-                      TAO_MProfile &mprofile
-                      ACE_ENV_ARG_DECL_NOT_USED)
+  void make_canonical (const char *ior,
+                       size_t ior_len,
+                       ACE_CString &canonical_endpoint
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  struct parsed_endpoint {
+    parsed_endpoint () : profile_ (0) {}
+    ~parsed_endpoint () { delete this->profile_; }
+    TAO_Profile *profile_;
+    char obj_key_sep_;
+    ACE_CString prot_addr_;
+  };
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 43ebeb0c0b8..e330e093a26 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -13,6 +13,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
+#include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 
 
diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl
index dabacd3f29a..b6d9a4db9ca 100644
--- a/TAO/tao/CharSeq.pidl
+++ b/TAO/tao/CharSeq.pidl
@@ -10,7 +10,7 @@
  *     tao_idl
  *        -o orig -Ge 1 -Sc -GT -GA
  *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
+ *          -Wb,export_include=tao/TAO_Export.h
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          CharSeq.pidl
diff --git a/TAO/tao/CharSeqA.cpp b/TAO/tao/CharSeqA.cpp
index 0df0e608718..a49f833de0c 100644
--- a/TAO/tao/CharSeqA.cpp
+++ b/TAO/tao/CharSeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "CharSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_CharSeq[] =
 {
@@ -61,7 +63,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_CharSeq (
     sizeof (_oc_CORBA_CharSeq),
     (char *) &_oc_CORBA_CharSeq,
     0,
-    sizeof (CORBA::CharSeq)
+    0
   );
 
 namespace CORBA
@@ -71,7 +73,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -128,8 +130,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -144,5 +144,4 @@ CORBA::Boolean operator>>= (
         CORBA::CharSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp
index fb913a56024..9d8f0e78b85 100644
--- a/TAO/tao/CharSeqC.cpp
+++ b/TAO/tao/CharSeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "CharSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "CharSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_CHARSEQ_CS_)
 #define _CORBA_CHARSEQ_CS_
@@ -104,7 +103,7 @@ void CORBA::CharSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_CharSeq_CPP_
 #define _TAO_CDR_OP_CORBA_CharSeq_CPP_
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_CharSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h
index d37a0d789ef..7f73bd5f293 100644
--- a/TAO/tao/CharSeqC.h
+++ b/TAO/tao/CharSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_CHARSEQC_H_
 #define _TAO_IDL_ORIG_CHARSEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -59,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CHARSEQ_CH_)
 #define _CORBA_CHARSEQ_CH_
@@ -124,17 +123,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CharSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -142,7 +141,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::CharSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::CharSeq*); // noncopying version
@@ -150,7 +149,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::CharSeq *&); /
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::CharSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_CharSeq_H_
 #define _TAO_CDR_OP_CORBA_CharSeq_H_
@@ -167,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_CharSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
 #include "CharSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -185,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/CharSeqC.inl b/TAO/tao/CharSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/CharSeqC.inl
+++ b/TAO/tao/CharSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/CharSeqS.h b/TAO/tao/CharSeqS.h
index e0257f31304..d2c01c9b653 100644
--- a/TAO/tao/CharSeqS.h
+++ b/TAO/tao/CharSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_CHARSEQS_H_
 #define _TAO_IDL_ORIG_CHARSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
   
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:999
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 9bdb67d0b9e..21b71729c83 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -9,6 +9,7 @@
 #include "tao/SystemException.h"
 #include "tao/UTF16_BOM_Factory.h"
 #include "tao/debug.h"
+#include "tao/CDR.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Codeset_Registry.h"
@@ -27,10 +28,13 @@ ACE_RCSID (tao,
 //
 #define TAO_CODESET_ID_ISO8859_1 0x00010001U
 #define TAO_CODESET_ID_UNICODE   0x00010109U
+#define TAO_CODESET_ID_XOPEN_UTF_8 0x05010001U
 
 // These are the default codesets that TAO declares, of course they
 // will be different on each platform, once the complete support for
 // character sets is implemented
+
+//#define TAO_DEFAULT_CHAR_CODESET_ID  TAO_CODESET_ID_XOPEN_UTF_8
 #define TAO_DEFAULT_CHAR_CODESET_ID  TAO_CODESET_ID_ISO8859_1
 #define TAO_DEFAULT_WCHAR_CODESET_ID TAO_CODESET_ID_UNICODE
 
@@ -80,7 +84,7 @@ TAO_Codeset_Manager::~TAO_Codeset_Manager ()
 
   this->wchar_factories_.reset ();
 
-  delete this->utf16_bom_translator_;
+  // Note: do not delete utf16_bom_translator_  The service manager owns it
 }
 
 void
@@ -450,39 +454,39 @@ TAO_Codeset_Manager::init_codeset_factories_i (
   return 0;
 }
 
+
 TAO_Codeset_Translator_Factory *
 TAO_Codeset_Manager::get_char_trans (CONV_FRAME::CodeSetId tcs)
 {
   if (this->codeset_info_.ForCharData.native_code_set == tcs)
+    return 0;
+  return this->get_translator_i (this->char_factories_,tcs);
+}
+
+TAO_Codeset_Translator_Factory *
+TAO_Codeset_Manager::get_wchar_trans (CONV_FRAME::CodeSetId tcs)
+{
+  if (this->codeset_info_.ForWcharData.native_code_set == tcs)
     {
       if (tcs != ACE_CODESET_ID_ISO_UTF_16)
         return 0;
       else
         {
+          if (TAO_debug_level > 9)
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_LIB_TEXT("TAO (%P|%t) Using utf16 BOM translator\n")));
           if (this->utf16_bom_translator_ == 0)
             {
-              ACE_NEW_RETURN (this->utf16_bom_translator_,
-                              UTF16_BOM_Factory,
-                              0);
-              this->utf16_bom_translator_->init(0,0);
+              this->utf16_bom_translator_ =
+                ACE_Dynamic_Service <UTF16_BOM_Factory>::instance ("UTF16_BOM_Factory");
             }
           return this->utf16_bom_translator_;
         }
     }
-
-  return this->get_translator_i (this->char_factories_,tcs);
+  return this->get_translator_i (this->wchar_factories_,tcs);
 }
 
-TAO_Codeset_Translator_Factory *
-TAO_Codeset_Manager::get_wchar_trans (CONV_FRAME::CodeSetId tcs)
-{
-  if (this->codeset_info_.ForWcharData.native_code_set == tcs)
-    {
-      return 0;
-    }
 
-  return this->get_translator_i (this->wchar_factories_,tcs);
-}
 
 TAO_Codeset_Translator_Factory *
 TAO_Codeset_Manager::get_translator_i (TAO_CodesetFactorySet& factset,
diff --git a/TAO/tao/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset_Translator_Factory.cpp
index a2d660952df..58ee5fb5ada 100644
--- a/TAO/tao/Codeset_Translator_Factory.cpp
+++ b/TAO/tao/Codeset_Translator_Factory.cpp
@@ -9,7 +9,7 @@
 //    Codeset_Translator_Factory.cpp
 //
 // = DESCRIPTION
-//    The base for all the translator factories. Translator factories are 
+//    The base for all the translator factories. Translator factories are
 //    responsible for supplying the proper translator on demand.
 //
 // = AUTHORS
@@ -17,7 +17,8 @@
 //
 // ============================================================================
 
-#include "Codeset_Translator_Factory.h"
+#include "tao/Codeset_Translator_Factory.h"
+#include "tao/CDR.h"
 
 ACE_RCSID (tao,
            Codeset_Translator_Factory,
@@ -41,7 +42,7 @@ TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **)
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_InputCDR *cdr, 
+    TAO_InputCDR *cdr,
     ACE_Char_Codeset_Translator *trans
   ) const
 {
@@ -50,7 +51,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_OutputCDR *cdr, 
+    TAO_OutputCDR *cdr,
     ACE_Char_Codeset_Translator *trans
   ) const
 {
@@ -59,7 +60,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_InputCDR *cdr, 
+    TAO_InputCDR *cdr,
     ACE_WChar_Codeset_Translator *trans
   ) const
 {
@@ -68,7 +69,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_OutputCDR *cdr, 
+    TAO_OutputCDR *cdr,
     ACE_WChar_Codeset_Translator *trans
   ) const
 {
diff --git a/TAO/tao/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset_Translator_Factory_T.h
index d48b9b3b73e..658465917b1 100644
--- a/TAO/tao/Codeset_Translator_Factory_T.h
+++ b/TAO/tao/Codeset_Translator_Factory_T.h
@@ -38,7 +38,7 @@ class TAO_Codeset_Translator_Factory_T
 public:
 
   TAO_Codeset_Translator_Factory_T ();
-  ~TAO_Codeset_Translator_Factory_T ();
+  virtual ~TAO_Codeset_Translator_Factory_T ();
 
   /// initialize the factory service object. Instantiates the translator.
   int init( int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp
index 8978a842b44..3a4c9284555 100644
--- a/TAO/tao/Collocation_Resolver.cpp
+++ b/TAO/tao/Collocation_Resolver.cpp
@@ -3,14 +3,10 @@
 #include "tao/Collocation_Resolver.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao, 
-           Collocation_Resolver, 
+ACE_RCSID (tao,
+           Collocation_Resolver,
            "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "tao/Collocation_Resolver.i"
-#endif /* ! __ACE_INLINE__ */
-
 TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void)
 {
 }
diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h
index 595605c87d3..46c6466ff47 100644
--- a/TAO/tao/Collocation_Resolver.h
+++ b/TAO/tao/Collocation_Resolver.h
@@ -52,10 +52,6 @@ public:
                                         ACE_ENV_ARG_DECL) const = 0;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/Collocation_Resolver.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_COLLOCATION_RESOLVER_H */
diff --git a/TAO/tao/Collocation_Resolver.i b/TAO/tao/Collocation_Resolver.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Collocation_Resolver.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index fdfe3ef99e6..d8616c49558 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -211,14 +211,9 @@ int
 TAO_Connection_Handler::handle_input_eh (
   ACE_HANDLE h, ACE_Event_Handler *eh)
 {
-  if (this->transport ()->acts_as_server () && 
-      this->orb_core_->get_tss_resources ()->upcalls_temporarily_suspended_on_this_thread_)
+  // If we can't process upcalls just return
+  if (!this->transport ()->wait_strategy ()->can_process_upcalls ())
     {
-#if 0 // DON'T IMPLEMENT YET, BUT RECORD THE IDEA FOR POSTERITY
-      // ACE_Time_Value this->spin_prevention_backoff_delay_;
-      ACE_OS::usleep (this->spin_prevention_backoff_delay_);
-      this->spin_prevention_backoff_delay_ = 2 * this->spin_prevention_backoff_delay_ + 1;
-#endif
       if (TAO_debug_level > 6)
         ACE_DEBUG ((LM_DEBUG,
                     "(%P|%t) Connection_Handler[%d] - not going to handle_input "
@@ -229,12 +224,8 @@ TAO_Connection_Handler::handle_input_eh (
       return 0;
     }
 
-#if 0
-  this->spin_prevention_backoff_delay_ = 0;
-#endif
-
   int result = this->handle_input_internal (h, eh);
-  
+
   if (result == -1)
     {
       this->close_connection ();
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 357ea8ab768..cf43218186d 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Basic_Types.h"
+
 class TAO_ORB_Core;
 class TAO_ORB_Core_TSS_Resources;
 class TAO_Transport;
@@ -97,6 +99,12 @@ public:
   /// this handler
   virtual int close_handler (void);
 
+  /// Set the Diff-Serv codepoint on outgoing packets.  Only has
+  /// effect for remote protocols (e.g., IIOP); no effect for local
+  /// protocols (UIOP).  Default implementation is for local
+  /// protocols.  Remote protocols must overwrite implementation.
+  virtual int set_dscp_codepoint (CORBA::Boolean set_network_priority);
+
 protected:
 
   /// Return our TAO_ORB_Core pointer
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index 3562b10159a..d8cd7fafc4d 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -37,3 +37,9 @@ TAO_Connection_Handler::is_connecting (void)
 {
   return this->state_ == TAO_LF_Event::LFS_CONNECTION_WAIT;
 }
+
+ACE_INLINE int
+TAO_Connection_Handler::set_dscp_codepoint (CORBA::Boolean)
+{
+  return 0;
+}
diff --git a/TAO/tao/Connector_Impl.cpp b/TAO/tao/Connector_Impl.cpp
index 577427054c0..ad333727bce 100644
--- a/TAO/tao/Connector_Impl.cpp
+++ b/TAO/tao/Connector_Impl.cpp
@@ -7,23 +7,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-#if !defined(__ACE_INLINE__)
-#include "tao/Connector_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(tao, Connector_Impl, "$Id$")
 
-
 template <class SVC_HANDLER>
 TAO_Connect_Creation_Strategy<SVC_HANDLER>::
     TAO_Connect_Creation_Strategy (ACE_Thread_Manager* t,
                                    TAO_ORB_Core *orb_core,
-                                   void *arg,
                                    CORBA::Boolean flag)
     : ACE_Creation_Strategy <SVC_HANDLER> (t),
       orb_core_ (orb_core),
-      arg_ (arg),
       lite_flag_ (flag)
 {
 
@@ -35,8 +27,7 @@ TAO_Connect_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
   if (sh == 0)
     ACE_NEW_RETURN (sh,
                     SVC_HANDLER (this->orb_core_,
-                                 this->lite_flag_,
-                                 this->arg_),
+                                 this->lite_flag_),
                     -1);
 
   // We add to the #REFCOUNT# since the Connector needs this. See
diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h
index e9aaa3acbe3..535d357c209 100644
--- a/TAO/tao/Connector_Impl.h
+++ b/TAO/tao/Connector_Impl.h
@@ -42,12 +42,9 @@ class TAO_Connect_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER>
 {
 public:
 
-  /// Constructor. <arg> parameter is used to pass any special
-  /// state/info to the service handler upon creation.  Currently used
-  /// by IIOP and UIOP to pass protocol configuration properties.
+  /// Constructor.
   TAO_Connect_Creation_Strategy (ACE_Thread_Manager * = 0,
                                  TAO_ORB_Core* orb_core = 0,
-                                 void *arg = 0,
                                  CORBA::Boolean flag = 0);
 
   /// Makes TAO_*_Client_Connection_Handlers
@@ -59,9 +56,6 @@ private:
   /// Pointer to the ORB_Core on which we are activated
   TAO_ORB_Core* orb_core_;
 
-  /// Some info/state to be passed to the service handler we create.
-  void *arg_;
-
   /// Are we using GIOP lite?
   CORBA::Boolean lite_flag_;
 };
@@ -100,11 +94,6 @@ private:
 
 };
 
-
-#if defined(__ACE_INLINE__)
-#include "tao/Connector_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "tao/Connector_Impl.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Connector_Impl.inl b/TAO/tao/Connector_Impl.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Connector_Impl.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 57bc3f9d201..9c936f6da6c 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -52,7 +52,8 @@ TAO_Connector_Registry::get_connector (CORBA::ULong tag)
 int
 TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
 {
-  TAO_ProtocolFactorySet *pfs = orb_core->protocol_factories ();
+  TAO_ProtocolFactorySet *pfs =
+    orb_core->protocol_factories ();
 
   // The array containing the TAO_Connectors will never contain more
   // than the number of loaded protocols in the ORB core.
@@ -68,21 +69,25 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
        factory != end;
        ++factory)
     {
-      TAO_Connector * connector =
-        (*factory)->factory ()->make_connector ();
+      auto_ptr <TAO_Connector> connector (
+        (*factory)->factory ()->make_connector ());
 
-      if (connector && connector->open (orb_core) != 0)
+      if (connector.get ())
         {
-          delete connector;
-
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("TAO (%P|%t) unable to open connector for ")
-                             ACE_TEXT ("<%s>.\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())),
-                            -1);
+         if (connector->open (orb_core) != 0)
+           {
+             ACE_ERROR_RETURN ((LM_ERROR,
+                                ACE_LIB_TEXT ("TAO (%P|%t) unable to open connector for ")
+                                ACE_LIB_TEXT ("<%s>.\n"),
+                                ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())),
+                               -1);
+           }
+
+         this->connectors_[this->size_++] =
+           connector.release ();
         }
       else
-        this->connectors_[this->size_++] = connector;
+        return -1;
     }
 
   return 0;
@@ -183,10 +188,25 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
                       tag));
         }
 
+      TAO_ORB_Core *orb_core = cdr.orb_core ();
+      if (orb_core == 0)
+        {
+          orb_core = TAO_ORB_Core_instance ();
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_WARNING,
+                          ACE_LIB_TEXT ("TAO (%P|%t) - TAO_Connector_Registry")
+                          ACE_LIB_TEXT ("::create_profile: ")
+                          ACE_LIB_TEXT ("WARNING: extracting object from ")
+                          ACE_LIB_TEXT ("default ORB_Core\n")));
+            }
+        }
+
+
       TAO_Profile *pfile = 0;
       ACE_NEW_RETURN (pfile,
                       TAO_Unknown_Profile (tag,
-                                           cdr.orb_core ()),
+                                           orb_core),
                       0);
       if (pfile->decode (cdr) == -1)
         {
diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp
index fddfbcae045..53643ccffab 100644
--- a/TAO/tao/CurrentA.cpp
+++ b/TAO/tao/CurrentA.cpp
@@ -27,25 +27,27 @@
 
 #include "CurrentC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4375),
-  ACE_NTOHL (0x7272656e),
-  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4375), 
+  ACE_NTOHL (0x7272656e), 
+  ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
     8,
-  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x43757272), 
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -54,7 +56,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Current (
     sizeof (_oc_CORBA_Current),
     (char *) &_oc_CORBA_Current,
     0,
-    sizeof (CORBA::Current)
+    0
   );
 
 namespace CORBA
@@ -80,14 +82,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::Current>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -132,8 +134,6 @@ operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -148,5 +148,4 @@ operator>>= (
         CORBA::Current \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index dbd3f67136f..417e74ce188 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "CurrentC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -39,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "CurrentC.i"
+#include "CurrentC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -88,26 +87,20 @@ TAO::Objref_Traits<CORBA::Current>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 CORBA::Current::Current (void)
 {}
 
 CORBA::Current::~Current (void)
 {}
 
-void
+void 
 CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
-    ACE_static_cast (Current *, _tao_void_pointer);
+    static_cast<Current *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -121,10 +114,10 @@ CORBA::Current::_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -138,10 +131,10 @@ CORBA::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -152,7 +145,7 @@ CORBA::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -164,7 +157,7 @@ CORBA::Current::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -197,7 +190,7 @@ CORBA::Current::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -210,7 +203,7 @@ CORBA::Current::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         CORBA::Current
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::Current
@@ -227,10 +220,10 @@ CORBA::Current::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         CORBA::Current
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::Current
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index bae17f58713..351feaf0542 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -26,21 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_CURRENTC_H_
 #define _TAO_IDL_ORIG_CURRENTC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Object.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
+#include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -56,9 +59,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -66,13 +67,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -82,22 +83,22 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CURRENT__VAR_OUT_CH_)
 #define _CORBA_CURRENT__VAR_OUT_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Current
@@ -105,69 +106,69 @@ namespace CORBA
     Current_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CURRENT_CH_)
 #define _CORBA_CURRENT_CH_
-
+  
   class TAO_Export Current
     : public virtual CORBA::Object
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-
+    
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-
+    
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _nil (void)
     {
-      return (Current_ptr)0;
+      return static_cast<Current_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Current (void);
-
+    
     virtual ~Current (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-
+    
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
 // TAO_IDL - Generated from
@@ -184,19 +185,19 @@ namespace TAO
 
 #if !defined (_CORBA_CURRENT__TRAITS_CH_)
 #define _CORBA_CURRENT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::Current>
+  struct TAO_Export Objref_Traits< ::CORBA::Current>
   {
-    static CORBA::Current_ptr duplicate (
-        CORBA::Current_ptr
+    static ::CORBA::Current_ptr duplicate (
+        ::CORBA::Current_ptr
       );
     static void release (
-        CORBA::Current_ptr
+        ::CORBA::Current_ptr
       );
-    static CORBA::Current_ptr nil (void);
+    static ::CORBA::Current_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::Current_ptr p,
+        ::CORBA::Current_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -212,13 +213,13 @@ TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "CurrentC.i"
+#include "CurrentC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -229,3 +230,5 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &)
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/CurrentC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
index 5257b6b02b9..2b5ea0a0673 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -7,14 +7,8 @@ ACE_RCSID (tao,
            "$Id$")
 
 #include "tao/Object.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Default_Collocation_Resolver.i"
-#endif /* ! __ACE_INLINE__ */
-
 #include "ace/Log_Msg.h"
 
-
 CORBA::Boolean
 TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
                                                  ACE_ENV_ARG_DECL_NOT_USED) const
diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h
index 54d6e096d6d..3d42c2a7d64 100644
--- a/TAO/tao/Default_Collocation_Resolver.h
+++ b/TAO/tao/Default_Collocation_Resolver.h
@@ -46,10 +46,6 @@ public:
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Collocation_Resolver)
 
-#if defined (__ACE_INLINE__)
-# include "tao/Default_Collocation_Resolver.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_DEFAULT_COLLOCATION_RESOLVER_H */
diff --git a/TAO/tao/Default_Collocation_Resolver.i b/TAO/tao/Default_Collocation_Resolver.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Default_Collocation_Resolver.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
index 91b374a8fe1..cc426e44165 100644
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ b/TAO/tao/Default_Protocols_Hooks.cpp
@@ -1,16 +1,8 @@
-
-
 // $Id$
 
 #include "Default_Protocols_Hooks.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Default_Protocols_Hooks.i"
-#endif /* ! __ACE_INLINE__ */
-
 #include "ace/Log_Msg.h"
 
-
 ACE_RCSID (tao,
            Default_Protocols_Hooks,
            "$Id$")
@@ -26,26 +18,6 @@ TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core *
 {
 }
 
-int
-TAO_Default_Protocols_Hooks::call_client_protocols_hook (int &,
-                                                         int &,
-                                                         int &,
-                                                         int &,
-                                                         const char *)
-{
-  return 0;
-}
-
-int
-TAO_Default_Protocols_Hooks::call_server_protocols_hook (int &,
-                                                         int &,
-                                                         int &,
-                                                         int &,
-                                                         const char *)
-{
-  return 0;
-}
-
 void
 TAO_Default_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &,
                                                           CORBA::Policy *,
@@ -106,41 +78,88 @@ TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short
   return 0;
 }
 
-int
-TAO_Default_Protocols_Hooks::set_default_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void
+TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *,
+                                                 TAO_Service_Context &,
+                                                 CORBA::Boolean
+                                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
-  return 0;
 }
 
-int
-TAO_Default_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &
-                                                                 ACE_ENV_ARG_DECL_NOT_USED)
+CORBA::Boolean
+TAO_Default_Protocols_Hooks::set_client_network_priority (IOP::ProfileId,
+                                                          TAO_Stub *
+                                                          ACE_ENV_ARG_DECL_NOT_USED)
 {
-  return 0;
+  return false;
+}
+
+CORBA::Boolean
+TAO_Default_Protocols_Hooks::set_server_network_priority (IOP::ProfileId,
+                                                          CORBA::Policy *
+                                                          ACE_ENV_ARG_DECL_NOT_USED)
+{
+  return false;
 }
 
 void
-TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *,
-                                                 TAO_Service_Context &,
-                                                 CORBA::Boolean
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
-int
-TAO_Default_Protocols_Hooks::update_client_protocol_properties (TAO_Stub *,
-                                                                TAO_Transport *,
-                                                                const char *)
+void
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
-  return 0;
 }
 
-int
-TAO_Default_Protocols_Hooks::update_server_protocol_properties (CORBA::Policy *,
-                                                                TAO_Transport *,
-                                                                const char *)
+void
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+void
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+void
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+void
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+void
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+void
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+void
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+void
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &
+                                                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
-  return 0;
 }
 
 CORBA::Long
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
index fc8a3e7177b..ad0d440d7df 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -32,84 +32,86 @@ public:
   /// destructor
   virtual ~TAO_Default_Protocols_Hooks (void);
 
-  virtual void init_hooks (TAO_ORB_Core *orb_core
-                           ACE_ENV_ARG_DECL);
+  void init_hooks (TAO_ORB_Core *orb_core
+                   ACE_ENV_ARG_DECL);
+
+  CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
+                                              TAO_Stub *stub
+                                              ACE_ENV_ARG_DECL);
 
-  virtual int call_client_protocols_hook (int &send_buffer_size,
-                                          int &recv_buffer_size,
-                                          int &no_delay,
-                                          int &enable_network_priority,
-                                          const char *protocol_type);
+  CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
+                                              CORBA::Policy *policy
+                                              ACE_ENV_ARG_DECL);
 
-  virtual int call_server_protocols_hook (int &send_buffer_size,
-                                          int &recv_buffer_size,
-                                          int &no_delay,
-                                          int &enable_network_priority,
-                                          const char *protocol_type);
+  void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual int update_client_protocol_properties (TAO_Stub *stub,
-                                                 TAO_Transport *t,
-                                                 const char *protocol_type);
+  void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual int update_server_protocol_properties (CORBA::Policy *policy,
-                                                 TAO_Transport *t,
-                                                 const char *protocol_type);
+  void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual CORBA::Long get_dscp_codepoint (void);
+  void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual void rt_service_context (TAO_Stub *stub,
-                                   TAO_Service_Context &service_context,
-                                   CORBA::Boolean restart
-                                   ACE_ENV_ARG_DECL);
+  void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual void add_rt_service_context_hook (
-      TAO_Service_Context &service_context,
-      CORBA::Policy *model_policy,
-      CORBA::Short &client_priority
-      ACE_ENV_ARG_DECL
-    );
+  void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual void get_selector_hook (CORBA::Policy *model_policy,
-                                  CORBA::Boolean
-                                  &is_client_propagated,
-                                  CORBA::Short &server_priority);
+  void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
-                                               CORBA::Short p,
-                                               CORBA::Short &min_priority,
-                                               CORBA::Short &max_priority,
-                                               int &in_range);
+  void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual int get_thread_CORBA_priority (CORBA::Short &
-                                         ACE_ENV_ARG_DECL_NOT_USED);
+  void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual int get_thread_native_priority (CORBA::Short &
-                                          ACE_ENV_ARG_DECL_NOT_USED);
+  void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual int get_thread_CORBA_and_native_priority (
-      CORBA::Short &,
-      CORBA::Short &
-      ACE_ENV_ARG_DECL_NOT_USED
-    );
+  CORBA::Long get_dscp_codepoint (void);
 
-  virtual int set_thread_CORBA_priority (CORBA::Short
-                                         ACE_ENV_ARG_DECL_NOT_USED);
+  void rt_service_context (TAO_Stub *stub,
+                           TAO_Service_Context &service_context,
+                           CORBA::Boolean restart
+                           ACE_ENV_ARG_DECL);
 
-  virtual int set_thread_native_priority (CORBA::Short
-                                          ACE_ENV_ARG_DECL_NOT_USED);
+  void add_rt_service_context_hook (TAO_Service_Context &service_context,
+                                    CORBA::Policy *model_policy,
+                                    CORBA::Short &client_priority
+                                    ACE_ENV_ARG_DECL);
 
-  virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL);
+  void get_selector_hook (CORBA::Policy *model_policy,
+                          CORBA::Boolean
+                          &is_client_propagated,
+                          CORBA::Short &server_priority);
 
-  virtual int set_default_server_protocol_policy (
-      TAO_Acceptor_Registry &acceptor_registry
-      ACE_ENV_ARG_DECL
-    );
+  void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
+                                       CORBA::Short p,
+                                       CORBA::Short &min_priority,
+                                       CORBA::Short &max_priority,
+                                       int &in_range);
 
-};
+  int get_thread_CORBA_priority (CORBA::Short &
+                                 ACE_ENV_ARG_DECL);
 
-#if defined (__ACE_INLINE__)
-#include "tao/Default_Protocols_Hooks.i"
-#endif /* __ACE_INLINE__ */
+  int get_thread_native_priority (CORBA::Short &
+                                  ACE_ENV_ARG_DECL);
+
+  int get_thread_CORBA_and_native_priority (CORBA::Short &,
+                                            CORBA::Short &
+                                            ACE_ENV_ARG_DECL);
+
+  int set_thread_CORBA_priority (CORBA::Short
+                                 ACE_ENV_ARG_DECL);
+
+  int set_thread_native_priority (CORBA::Short
+                                  ACE_ENV_ARG_DECL);
+};
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Protocols_Hooks)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Protocols_Hooks)
diff --git a/TAO/tao/Default_Protocols_Hooks.i b/TAO/tao/Default_Protocols_Hooks.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Default_Protocols_Hooks.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index c799e6be17f..3cabff10e59 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -4,6 +4,7 @@
 #include "Thread_Lane_Resources.h"
 #include "Exception.h"
 #include "Environment.h"
+#include "ORB_Core.h"
 #include "ace/Log_Msg.h"
 
 
@@ -11,11 +12,6 @@ ACE_RCSID (tao,
            Default_Thread_Lane_Resources_Manager,
            "$Id$")
 
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Default_Thread_Lane_Resources_Manager.i"
-#endif /* ! __ACE_INLINE__ */
-
 TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
   : TAO_Thread_Lane_Resources_Manager (orb_core),
     lane_resources_ (0)
@@ -34,8 +30,19 @@ TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Ma
 int
 TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL)
 {
+  TAO_ORB_Parameters *params =
+    this->orb_core_->orb_params ();
+
+  TAO_EndpointSet endpoint_set;
+
+  params->get_endpoint_set (TAO_DEFAULT_LANE,
+                            endpoint_set);
+
+  bool ignore_address = false;
+
   int result =
-    this->lane_resources_->open_acceptor_registry (0
+    this->lane_resources_->open_acceptor_registry (endpoint_set,
+                                                   ignore_address
                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
index 9730fe9f5a9..9d78cf642ff 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -87,10 +87,6 @@ public:
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
 
-#if defined (__ACE_INLINE__)
-# include "tao/Default_Thread_Lane_Resources_Manager.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_DEFAULT_THREAD_LANE_RESOURCES_MANAGER_H */
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.i b/TAO/tao/Default_Thread_Lane_Resources_Manager.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Domain.mpc b/TAO/tao/Domain.mpc
index 23ef70eb3e4..6669d7e1877 100644
--- a/TAO/tao/Domain.mpc
+++ b/TAO/tao/Domain.mpc
@@ -25,4 +25,8 @@ project : taolib, core, ifr_client, portableserver {
 
   PIDL_Files {
   }
+
+  Pkgconfig_Files {
+    Domain/TAO_Domain.pc.in
+  }
 }
diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp
index 3abd24cb750..14234ef080c 100644
--- a/TAO/tao/DomainA.cpp
+++ b/TAO/tao/DomainA.cpp
@@ -27,29 +27,31 @@
 
 #include "DomainC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_DomainManager[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f446f),
-  ACE_NTOHL (0x6d61696e),
-  ACE_NTOHL (0x4d616e61),
-  ACE_NTOHL (0x6765723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f446f), 
+  ACE_NTOHL (0x6d61696e), 
+  ACE_NTOHL (0x4d616e61), 
+  ACE_NTOHL (0x6765723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
     14,
-  ACE_NTOHL (0x446f6d61),
-  ACE_NTOHL (0x696e4d61),
-  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x446f6d61), 
+  ACE_NTOHL (0x696e4d61), 
+  ACE_NTOHL (0x6e616765), 
   ACE_NTOHL (0x72000000),  // name = DomainManager
   };
 
@@ -58,7 +60,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
     sizeof (_oc_CORBA_DomainManager),
     (char *) &_oc_CORBA_DomainManager,
     0,
-    sizeof (CORBA::DomainManager)
+    0
   );
 
 namespace CORBA
@@ -68,28 +70,28 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e737472),
-  ACE_NTOHL (0x75637469),
-  ACE_NTOHL (0x6f6e506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e737472), 
+  ACE_NTOHL (0x75637469), 
+  ACE_NTOHL (0x6f6e506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ConstructionPolicy:1.0
     19,
-  ACE_NTOHL (0x436f6e73),
-  ACE_NTOHL (0x74727563),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x436f6e73), 
+  ACE_NTOHL (0x74727563), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = ConstructionPolicy
   };
 
@@ -98,7 +100,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
     sizeof (_oc_CORBA_ConstructionPolicy),
     (char *) &_oc_CORBA_ConstructionPolicy,
     0,
-    sizeof (CORBA::ConstructionPolicy)
+    0
   );
 
 namespace CORBA
@@ -108,27 +110,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_DomainManagerList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f446f),
-  ACE_NTOHL (0x6d61696e),
-  ACE_NTOHL (0x4d616e61),
-  ACE_NTOHL (0x6765724c),
-  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f446f), 
+  ACE_NTOHL (0x6d61696e), 
+  ACE_NTOHL (0x4d616e61), 
+  ACE_NTOHL (0x6765724c), 
+  ACE_NTOHL (0x6973743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
     18,
-  ACE_NTOHL (0x446f6d61),
-  ACE_NTOHL (0x696e4d61),
-  ACE_NTOHL (0x6e616765),
-  ACE_NTOHL (0x724c6973),
+  ACE_NTOHL (0x446f6d61), 
+  ACE_NTOHL (0x696e4d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x74000000),  // name = DomainManagerList
     CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
@@ -137,21 +139,21 @@ static const CORBA::Long _oc_CORBA_DomainManagerList[] =
     64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f446f),
-      ACE_NTOHL (0x6d61696e),
-      ACE_NTOHL (0x4d616e61),
-      ACE_NTOHL (0x6765723a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f446f), 
+      ACE_NTOHL (0x6d61696e), 
+      ACE_NTOHL (0x4d616e61), 
+      ACE_NTOHL (0x6765723a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
             14,
-      ACE_NTOHL (0x446f6d61),
-      ACE_NTOHL (0x696e4d61),
-      ACE_NTOHL (0x6e616765),
+      ACE_NTOHL (0x446f6d61), 
+      ACE_NTOHL (0x696e4d61), 
+      ACE_NTOHL (0x6e616765), 
       ACE_NTOHL (0x72000000),  // name = DomainManager
-
+      
     0U,
 
 };
@@ -161,7 +163,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList (
     sizeof (_oc_CORBA_DomainManagerList),
     (char *) &_oc_CORBA_DomainManagerList,
     0,
-    sizeof (CORBA::DomainManagerList)
+    0
   );
 
 namespace CORBA
@@ -280,7 +282,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -317,8 +319,8 @@ CORBA::Boolean operator>>= (
     CORBA::DomainManagerList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::DomainManagerList *&,
+  return _tao_any >>= const_cast<
+      const CORBA::DomainManagerList *&> (
       _tao_elem
     );
 }
@@ -338,8 +340,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -374,5 +374,4 @@ CORBA::Boolean operator>>= (
         CORBA::DomainManagerList \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 8da6882f61d..1ad53d24434 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -26,35 +26,34 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "DomainC.h"
-#include "IFR_Client_Adapter.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/Typecode.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
-#include "ORB_Core.h"
-#include "ParameterMode.h"
-#include "DynamicC.h"
-#include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
+#include "tao/ORB_Core.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/DynamicC.h"
+#include "ace/Dynamic_Service.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "DomainC.i"
+#include "DomainC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // TAO specific stuff.
 namespace CORBA
@@ -94,6 +93,8 @@ TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr
   return adapter->interfacedef_cdr_insert (cdr, this->x_);
 }
 
+
+
 // Arg traits specializations.
 namespace TAO
 {
@@ -133,7 +134,6 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
@@ -184,7 +184,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy (
-    CORBA::PolicyType policy_type
+    ::CORBA::PolicyType policy_type
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -201,8 +201,8 @@ TAO::Collocation_Proxy_Broker *
       CORBA_DomainManager_setup_collocation ();
     }
 
-  TAO::Arg_Traits<CORBA::Policy>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type);
+  TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type);
 
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -248,7 +248,7 @@ void
 CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   DomainManager *_tao_tmp_pointer =
-    ACE_static_cast (DomainManager *, _tao_void_pointer);
+    static_cast<DomainManager *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -382,8 +382,8 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ConstructionPolicy::make_domain_manager (
-    CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy
+    ::CORBA::InterfaceDef_ptr object_type,
+    ::CORBA::Boolean constr_policy
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -400,9 +400,9 @@ void CORBA::ConstructionPolicy::make_domain_manager (
       CORBA_ConstructionPolicy_setup_collocation ();
     }
 
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
+  TAO::Arg_Traits< ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy);
 
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -449,7 +449,7 @@ void
 CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstructionPolicy *_tao_tmp_pointer =
-    ACE_static_cast (ConstructionPolicy *, _tao_void_pointer);
+    static_cast<ConstructionPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -537,7 +537,7 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
@@ -587,7 +587,7 @@ void CORBA::DomainManagerList::_tao_any_destructor (
   )
 {
   DomainManagerList * _tao_tmp_pointer =
-    ACE_static_cast (DomainManagerList *, _tao_void_pointer);
+    static_cast<DomainManagerList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -611,21 +611,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::CORBA::DomainManager RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -647,21 +647,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -676,22 +676,22 @@ CORBA::Boolean operator<< (
     const CORBA::DomainManagerList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
             _tao_sequence[i].in ()->marshal (strm);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -701,7 +701,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -711,35 +711,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -794,7 +794,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         CORBA::DomainManager
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::DomainManager
@@ -819,7 +819,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         CORBA::ConstructionPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::ConstructionPolicy
@@ -914,6 +914,12 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::Policy_ptr, \
+        CORBA::Policy_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::DomainManager \
       >
@@ -922,7 +928,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         CORBA::DomainManager
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::DomainManager
@@ -947,7 +953,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         CORBA::ConstructionPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::ConstructionPolicy
@@ -997,4 +1003,4 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 4cbee563d39..69bc5db35eb 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -26,27 +26,29 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_DOMAINC_H_
 #define _TAO_IDL_ORIG_DOMAINC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
-
 #include "tao/PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -62,9 +64,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -73,7 +73,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -90,7 +90,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_DOMAINMANAGER__VAR_OUT_CH_)
 #define _CORBA_DOMAINMANAGER__VAR_OUT_CH_
@@ -150,7 +150,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr get_domain_policy (
-        CORBA::PolicyType policy_type
+        ::CORBA::PolicyType policy_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -214,7 +214,7 @@ namespace CORBA
   const CORBA::PolicyType SecConstruction = 11U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_
@@ -243,7 +243,7 @@ namespace CORBA
 #define _CORBA_CONSTRUCTIONPOLICY_CH_
   
   class TAO_Export ConstructionPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     friend class TAO::Narrow_Utils<ConstructionPolicy>;
@@ -274,8 +274,8 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void make_domain_manager (
-        CORBA::InterfaceDef_ptr object_type,
-        CORBA::Boolean constr_policy
+        ::CORBA::InterfaceDef_ptr object_type,
+        ::CORBA::Boolean constr_policy
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -426,17 +426,17 @@ namespace TAO
 #define _CORBA_DOMAINMANAGER__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::DomainManager>
+  struct TAO_Export Objref_Traits< ::CORBA::DomainManager>
   {
-    static CORBA::DomainManager_ptr duplicate (
-        CORBA::DomainManager_ptr
+    static ::CORBA::DomainManager_ptr duplicate (
+        ::CORBA::DomainManager_ptr
       );
     static void release (
-        CORBA::DomainManager_ptr
+        ::CORBA::DomainManager_ptr
       );
-    static CORBA::DomainManager_ptr nil (void);
+    static ::CORBA::DomainManager_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::DomainManager_ptr p,
+        ::CORBA::DomainManager_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -447,17 +447,17 @@ namespace TAO
 #define _CORBA_CONSTRUCTIONPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::ConstructionPolicy>
+  struct TAO_Export Objref_Traits< ::CORBA::ConstructionPolicy>
   {
-    static CORBA::ConstructionPolicy_ptr duplicate (
-        CORBA::ConstructionPolicy_ptr
+    static ::CORBA::ConstructionPolicy_ptr duplicate (
+        ::CORBA::ConstructionPolicy_ptr
       );
     static void release (
-        CORBA::ConstructionPolicy_ptr
+        ::CORBA::ConstructionPolicy_ptr
       );
-    static CORBA::ConstructionPolicy_ptr nil (void);
+    static ::CORBA::ConstructionPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ConstructionPolicy_ptr p,
+        ::CORBA::ConstructionPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -517,13 +517,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "DomainC.i"
+#include "DomainC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -535,3 +535,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
deleted file mode 100644
index 0465f5f00fb..00000000000
--- a/TAO/tao/DomainC.i
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_DOMAINMANAGER___CI_)
-#define _CORBA_DOMAINMANAGER___CI_
-
-ACE_INLINE
-CORBA::DomainManager::DomainManager (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_DomainManager_Proxy_Broker_ (0)
-{
-  this->CORBA_DomainManager_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::DomainManager::DomainManager (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_DomainManager_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_)
-#define _CORBA_CONSTRUCTIONPOLICY___CI_
-
-ACE_INLINE
-CORBA::ConstructionPolicy::ConstructionPolicy (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ConstructionPolicy_Proxy_Broker_ (0)
-{
-  this->CORBA_ConstructionPolicy_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ConstructionPolicy::ConstructionPolicy (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ConstructionPolicy_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl
index e1589d3d5bb..09b86cdcd59 100644
--- a/TAO/tao/DoubleSeq.pidl
+++ b/TAO/tao/DoubleSeq.pidl
@@ -10,7 +10,7 @@
  *     tao_idl
  *        -o orig -Ge 1 -Sc -GT -GA
  *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
+ *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          DoubleSeq.pidl
diff --git a/TAO/tao/DoubleSeqA.cpp b/TAO/tao/DoubleSeqA.cpp
index 05344968542..9b272995c23 100644
--- a/TAO/tao/DoubleSeqA.cpp
+++ b/TAO/tao/DoubleSeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "DoubleSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_DoubleSeq[] =
 {
@@ -62,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DoubleSeq (
     sizeof (_oc_CORBA_DoubleSeq),
     (char *) &_oc_CORBA_DoubleSeq,
     0,
-    sizeof (CORBA::DoubleSeq)
+    0
   );
 
 namespace CORBA
@@ -72,7 +74,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -129,8 +131,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -145,5 +145,4 @@ CORBA::Boolean operator>>= (
         CORBA::DoubleSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp
index a96c7b628a1..2997e7642d8 100644
--- a/TAO/tao/DoubleSeqC.cpp
+++ b/TAO/tao/DoubleSeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "DoubleSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "DoubleSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_DOUBLESEQ_CS_)
 #define _CORBA_DOUBLESEQ_CS_
@@ -104,7 +103,7 @@ void CORBA::DoubleSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_DoubleSeq_CPP_
 #define _TAO_CDR_OP_CORBA_DoubleSeq_CPP_
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h
index 81d525dd756..9a385a29432 100644
--- a/TAO/tao/DoubleSeqC.h
+++ b/TAO/tao/DoubleSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_DOUBLESEQC_H_
 #define _TAO_IDL_ORIG_DOUBLESEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -59,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_DOUBLESEQ_CH_)
 #define _CORBA_DOUBLESEQ_CH_
@@ -124,17 +123,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DoubleSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -142,7 +141,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::DoubleSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::DoubleSeq*); // noncopying version
@@ -150,7 +149,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DoubleSeq *&);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DoubleSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_DoubleSeq_H_
 #define _TAO_CDR_OP_CORBA_DoubleSeq_H_
@@ -167,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "DoubleSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -185,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/DoubleSeqS.h b/TAO/tao/DoubleSeqS.h
index 13a025b9fee..265b39c437f 100644
--- a/TAO/tao/DoubleSeqS.h
+++ b/TAO/tao/DoubleSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_DOUBLESEQS_H_
 #define _TAO_IDL_ORIG_DOUBLESEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp
index fccdb13a28c..04c35fd78a4 100644
--- a/TAO/tao/DynamicA.cpp
+++ b/TAO/tao/DynamicA.cpp
@@ -27,29 +27,31 @@
 
 #include "DynamicC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_Dynamic_ParameterList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d69632f),
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
-  ACE_NTOHL (0x724c6973),
-  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d69632f), 
+  ACE_NTOHL (0x50617261), 
+  ACE_NTOHL (0x6d657465), 
+  ACE_NTOHL (0x724c6973), 
+  ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ParameterList:1.0
     14,
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
-  ACE_NTOHL (0x724c6973),
+  ACE_NTOHL (0x50617261), 
+  ACE_NTOHL (0x6d657465), 
+  ACE_NTOHL (0x724c6973), 
   ACE_NTOHL (0x74000000),  // name = ParameterList
     CORBA::tk_sequence, // typecode kind
   236, // encapsulation length
@@ -58,61 +60,61 @@ static const CORBA::Long _oc_Dynamic_ParameterList[] =
     220, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x44796e61),
-      ACE_NTOHL (0x6d69632f),
-      ACE_NTOHL (0x50617261),
-      ACE_NTOHL (0x6d657465),
-      ACE_NTOHL (0x723a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x44796e61), 
+      ACE_NTOHL (0x6d69632f), 
+      ACE_NTOHL (0x50617261), 
+      ACE_NTOHL (0x6d657465), 
+      ACE_NTOHL (0x723a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
             10,
-      ACE_NTOHL (0x50617261),
-      ACE_NTOHL (0x6d657465),
+      ACE_NTOHL (0x50617261), 
+      ACE_NTOHL (0x6d657465), 
       ACE_NTOHL (0x72000000),  // name = Parameter
       2, // member count
             9,
-      ACE_NTOHL (0x61726775),
-      ACE_NTOHL (0x6d656e74),
+      ACE_NTOHL (0x61726775), 
+      ACE_NTOHL (0x6d656e74), 
       ACE_NTOHL (0x0),  // name = argument
             CORBA::tk_any,
 
       5,
-      ACE_NTOHL (0x6d6f6465),
+      ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5061),
-        ACE_NTOHL (0x72616d65),
-        ACE_NTOHL (0x7465724d),
-        ACE_NTOHL (0x6f64653a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5061), 
+        ACE_NTOHL (0x72616d65), 
+        ACE_NTOHL (0x7465724d), 
+        ACE_NTOHL (0x6f64653a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
         14,
-        ACE_NTOHL (0x50617261),
-        ACE_NTOHL (0x6d657465),
-        ACE_NTOHL (0x724d6f64),
+        ACE_NTOHL (0x50617261), 
+        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x724d6f64), 
         ACE_NTOHL (0x65000000),  // name = ParameterMode
         3, // member count
         9,
-        ACE_NTOHL (0x50415241),
-        ACE_NTOHL (0x4d5f494e),
+        ACE_NTOHL (0x50415241), 
+        ACE_NTOHL (0x4d5f494e), 
         ACE_NTOHL (0x0),  // name = PARAM_IN
         10,
-        ACE_NTOHL (0x50415241),
-        ACE_NTOHL (0x4d5f4f55),
+        ACE_NTOHL (0x50415241), 
+        ACE_NTOHL (0x4d5f4f55), 
         ACE_NTOHL (0x54000000),  // name = PARAM_OUT
         12,
-        ACE_NTOHL (0x50415241),
-        ACE_NTOHL (0x4d5f494e),
+        ACE_NTOHL (0x50415241), 
+        ACE_NTOHL (0x4d5f494e), 
         ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+        
 
     0U,
 
@@ -123,7 +125,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList (
     sizeof (_oc_Dynamic_ParameterList),
     (char *) &_oc_Dynamic_ParameterList,
     0,
-    sizeof (Dynamic::ParameterList)
+    0
   );
 
 namespace Dynamic
@@ -133,45 +135,45 @@ namespace Dynamic
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_Dynamic_ContextList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d69632f),
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x6578744c),
-  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d69632f), 
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x6578744c), 
+  ACE_NTOHL (0x6973743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Dynamic/ContextList:1.0
     12,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x6578744c),
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x6578744c), 
   ACE_NTOHL (0x69737400),  // name = ContextList
     CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5374),
-    ACE_NTOHL (0x72696e67),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5374), 
+    ACE_NTOHL (0x72696e67), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
         10,
-    ACE_NTOHL (0x53747269),
-    ACE_NTOHL (0x6e675365),
+    ACE_NTOHL (0x53747269), 
+    ACE_NTOHL (0x6e675365), 
     ACE_NTOHL (0x71000000),  // name = StringSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string,
+      CORBA::tk_string, 
       0U, // string length
       0U,
 
@@ -183,7 +185,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList (
     sizeof (_oc_Dynamic_ContextList),
     (char *) &_oc_Dynamic_ContextList,
     0,
-    sizeof (Dynamic::ContextList)
+    0
   );
 
 namespace Dynamic
@@ -193,26 +195,26 @@ namespace Dynamic
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_Dynamic_ExceptionList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d69632f),
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e4c6973),
-  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d69632f), 
+  ACE_NTOHL (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e4c6973), 
+  ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ExceptionList:1.0
     14,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e4c6973),
+  ACE_NTOHL (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x74000000),  // name = ExceptionList
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -228,7 +230,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList (
     sizeof (_oc_Dynamic_ExceptionList),
     (char *) &_oc_Dynamic_ExceptionList,
     0,
-    sizeof (Dynamic::ExceptionList)
+    0
   );
 
 namespace Dynamic
@@ -238,47 +240,47 @@ namespace Dynamic
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_Dynamic_RequestContext[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d69632f),
-  ACE_NTOHL (0x52657175),
-  ACE_NTOHL (0x65737443),
-  ACE_NTOHL (0x6f6e7465),
-  ACE_NTOHL (0x78743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d69632f), 
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737443), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Dynamic/RequestContext:1.0
     15,
-  ACE_NTOHL (0x52657175),
-  ACE_NTOHL (0x65737443),
-  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737443), 
+  ACE_NTOHL (0x6f6e7465), 
   ACE_NTOHL (0x78740000),  // name = RequestContext
     CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5374),
-    ACE_NTOHL (0x72696e67),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5374), 
+    ACE_NTOHL (0x72696e67), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
         10,
-    ACE_NTOHL (0x53747269),
-    ACE_NTOHL (0x6e675365),
+    ACE_NTOHL (0x53747269), 
+    ACE_NTOHL (0x6e675365), 
     ACE_NTOHL (0x71000000),  // name = StringSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string,
+      CORBA::tk_string, 
       0U, // string length
       0U,
 
@@ -290,7 +292,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext (
     sizeof (_oc_Dynamic_RequestContext),
     (char *) &_oc_Dynamic_RequestContext,
     0,
-    sizeof (Dynamic::RequestContext)
+    0
   );
 
 namespace Dynamic
@@ -299,7 +301,7 @@ namespace Dynamic
     &_tc_TAO_tc_Dynamic_RequestContext;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -336,8 +338,8 @@ CORBA::Boolean operator>>= (
     Dynamic::ParameterList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const Dynamic::ParameterList *&,
+  return _tao_any >>= const_cast<
+      const Dynamic::ParameterList *&> (
       _tao_elem
     );
 }
@@ -357,7 +359,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -394,8 +396,8 @@ CORBA::Boolean operator>>= (
     Dynamic::ExceptionList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const Dynamic::ExceptionList *&,
+  return _tao_any >>= const_cast<
+      const Dynamic::ExceptionList *&> (
       _tao_elem
     );
 }
@@ -415,8 +417,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -441,5 +441,4 @@ CORBA::Boolean operator>>= (
         Dynamic::ExceptionList \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc
index 9b3944a1ee1..a064db9ca07 100644
--- a/TAO/tao/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     DynamicAny
   }
+
+  Pkgconfig_Files {
+    DynamicAny/TAO_DynamicAny.pc.in
+  }
 }
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index 6a4e58536ea..9610c1ac243 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -117,11 +117,10 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
       {
         TAO_OutputCDR stream;
         stream << CORBA::Object::_nil ();
+        TAO_InputCDR in (stream);
         TAO::Unknown_IDL_Type *unk = 0;
         ACE_NEW (unk,
-                 TAO::Unknown_IDL_Type (tc,
-                                        stream.begin (),
-                                        TAO_ENCAP_BYTE_ORDER));
+                 TAO::Unknown_IDL_Type (tc, in));
         this->any_.replace (unk);
         break;
       }
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index e04bebb7421..60e29395a60 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -57,26 +57,23 @@ TAO_DynArray_i::init (const CORBA::Any & any
 
   this->init_common ();
 
-  // Get the CDR stream of the argument.
-  ACE_Message_Block* mb = any._tao_get_cdr ();
-  bool type_known = false;
+  // Get the CDR stream of the Any, if there isn't one, make one.
+  TAO::Any_Impl *impl = any.impl ();
+  TAO_OutputCDR out;
+  TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
 
-  if (mb == 0)
+  if (impl->encoded  ())
     {
-      ACE_NEW (mb,
-               ACE_Message_Block);
-      TAO_OutputCDR out;
-      any.impl ()->marshal_value (out);
-      ACE_CDR::consolidate (mb, out.begin ());
-      type_known = true;
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+        
+      cdr = unk->_tao_get_cdr ();
     }
-
-  TAO_InputCDR cdr (mb,
-                    any._tao_byte_order ());
-
-  if (type_known)
+  else
     {
-      mb->release ();
+      impl->marshal_value (out);
+      TAO_InputCDR tmp_in (out);
+      cdr = tmp_in;
     }
 
   CORBA::TypeCode_var field_tc =
@@ -86,12 +83,12 @@ TAO_DynArray_i::init (const CORBA::Any & any
   for (CORBA::ULong i = 0; i < numfields; ++i)
     {
       CORBA::Any field_any;
-      TAO::Unknown_IDL_Type *unk = 0;
-      ACE_NEW (unk,
+      TAO::Unknown_IDL_Type *field_unk = 0;
+      TAO_InputCDR unk_in (cdr);
+      ACE_NEW (field_unk,
                TAO::Unknown_IDL_Type (field_tc.in (),
-                                      cdr.start (),
-                                      cdr.byte_order ()));
-      field_any.replace (unk);
+                                      unk_in));
+      field_any.replace (field_unk);
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
@@ -419,26 +416,23 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
 
   if (equivalent)
     {
-      // Get the CDR stream of the argument.
-      ACE_Message_Block* mb = any._tao_get_cdr ();
-      bool type_known = false;
+      // Get the CDR stream of the Any,if there isn't one, make one.
+      TAO::Any_Impl *impl = any.impl ();
+      TAO_OutputCDR out;
+      TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
 
-      if (mb == 0)
+      if (impl->encoded ())
         {
-          ACE_NEW (mb,
-                   ACE_Message_Block);
-          TAO_OutputCDR out;
-          any.impl ()->marshal_value (out);
-          ACE_CDR::consolidate (mb, out.begin ());
-          type_known = true;
+          TAO::Unknown_IDL_Type *unk =
+            dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+            
+          cdr = unk->_tao_get_cdr ();
         }
-
-      TAO_InputCDR cdr (mb,
-                        any._tao_byte_order ());
-
-      if (type_known)
+      else
         {
-          mb->release ();
+          impl->marshal_value (out);
+          TAO_InputCDR tmp_in (out);
+          cdr = tmp_in;
         }
 
       CORBA::ULong length = ACE_static_cast (CORBA::ULong,
@@ -459,12 +453,12 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
           CORBA::Any field_any;
-          TAO::Unknown_IDL_Type *unk = 0;
-          ACE_NEW (unk,
+          TAO_InputCDR unk_in (cdr);
+          TAO::Unknown_IDL_Type *field_unk = 0;
+          ACE_NEW (field_unk,
                    TAO::Unknown_IDL_Type (field_tc.in (),
-                                          cdr.start (),
-                                          cdr.byte_order ()));
-          field_any.replace (unk);
+                                          unk_in));
+          field_any.replace (field_unk);
 
           this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
@@ -508,7 +502,6 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   TAO_OutputCDR out_cdr;
   CORBA::Any_var field_any;
   size_t length = this->da_members_.size ();
-  bool type_known = false;
 
   for (size_t i = 0; i < length; ++i)
     {
@@ -517,26 +510,22 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
         this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
+      TAO::Any_Impl *field_impl = field_any->impl ();
+      TAO_OutputCDR field_out;
+      TAO_InputCDR field_cdr (static_cast<ACE_Message_Block *> (0));
 
-      if (field_mb == 0)
+      if (field_impl->encoded ())
         {
-          ACE_NEW_THROW_EX (field_mb,
-                            ACE_Message_Block,
-                            CORBA::NO_MEMORY ());
-          TAO_OutputCDR out;
-          field_any->impl ()->marshal_value (out);
-          ACE_CDR::consolidate (field_mb, out.begin ());
-          type_known = true;
+          TAO::Unknown_IDL_Type *field_unk =
+            dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
+            
+          field_cdr = field_unk->_tao_get_cdr ();
         }
-
-      TAO_InputCDR field_cdr (field_mb,
-                              field_any->_tao_byte_order ());
-
-      if (type_known)
+      else
         {
-          field_mb->release ();
-          type_known = false;
+          field_impl->marshal_value (field_out);
+          TAO_InputCDR tmp_in (field_out);
+          field_cdr = tmp_in;
         }
 
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
@@ -557,8 +546,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   TAO::Unknown_IDL_Type *unk = 0;
   ACE_NEW_THROW_EX (unk,
                     TAO::Unknown_IDL_Type (this->type_.in (),
-                                           in_cdr.start (),
-                                           in_cdr.byte_order ()),
+                                           in_cdr),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 8d4a7414cf4..7b08240452a 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -513,11 +513,11 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
               value->marshal (cdr);
             }
 
+          TAO_InputCDR in (cdr);
           TAO::Unknown_IDL_Type *unk = 0;
           ACE_NEW (unk,
                    TAO::Unknown_IDL_Type (this->type_.in (),
-                                          cdr.begin (),
-                                          TAO_ENCAP_BYTE_ORDER));
+                                          in));
           this->any_.replace (unk);
         }
       else
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 38d1b5ac127..8e2b7314d18 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -50,28 +50,26 @@ TAO_DynEnum_i::init (const CORBA::Any &any
 
   this->type_ = tc;
 
-  ACE_Message_Block *mb = any._tao_get_cdr ();
-  bool type_known = false;
+  TAO::Any_Impl *impl = any.impl ();
 
-  if (mb == 0)
+  if (impl->encoded ())
     {
-      ACE_NEW (mb,
-               ACE_Message_Block);
-      TAO_OutputCDR out;
-      any.impl ()->marshal_value (out);
-      ACE_CDR::consolidate (mb, out.begin ());
-      type_known = true;
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+        
+      // We don't want unk's rd_ptr to move, in case we are shared by
+      // another Any, so we use this to copy the state, not the buffer.
+      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
+      for_reading.read_ulong (this->value_);
     }
-
-  TAO_InputCDR cdr (mb,
-                    any._tao_byte_order ());
-
-  if (type_known)
+  else
     {
-      mb->release ();
+      TAO_OutputCDR out;
+      impl->marshal_value (out);
+      TAO_InputCDR in (out);
+      in.read_ulong (this->value_);
     }
 
-  cdr.read_ulong (this->value_);
   this->init_common ();
 }
 
@@ -212,29 +210,26 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any
 
   if (kind == CORBA::tk_enum)
     {
-      // Get the CDR stream of the argument.
-      ACE_Message_Block* mb = any._tao_get_cdr ();
-      bool type_known = false;
+      // Get the CDR stream of the Any, if there isn't one, make one.
+      TAO::Any_Impl *impl = any.impl ();
 
-      if (mb == 0)
+      if (impl->encoded ())
         {
-          ACE_NEW (mb,
-                   ACE_Message_Block);
-          TAO_OutputCDR out;
-          any.impl ()->marshal_value (out);
-          ACE_CDR::consolidate (mb, out.begin ());
-          type_known = true;
+          TAO::Unknown_IDL_Type *unk =
+            dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+            
+          // We don't want unk's rd_ptr to move, in case we are shared by
+          // another Any, so we use this to copy the state, not the buffer.
+          TAO_InputCDR for_reading (unk->_tao_get_cdr ());
+          for_reading.read_ulong (this->value_);
         }
-
-      TAO_InputCDR cdr (mb,
-                        any._tao_byte_order ());
-
-      if (type_known)
+      else
         {
-          mb->release ();
+          TAO_OutputCDR out;
+          impl->marshal_value (out);
+          TAO_InputCDR in (out);
+          in.read_ulong (this->value_);
         }
-
-      cdr.read_ulong (this->value_);
     }
   else
     {
@@ -258,11 +253,11 @@ TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  TAO_InputCDR in_cdr (out_cdr);
   TAO::Unknown_IDL_Type *unk = 0;
   ACE_NEW_THROW_EX (unk,
                     TAO::Unknown_IDL_Type (this->type_.in (),
-                                           out_cdr.begin (),
-                                           TAO_ENCAP_BYTE_ORDER),
+                                           in_cdr),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -292,31 +287,27 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
   CORBA::Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ACE_Message_Block *mb = any->_tao_get_cdr ();
-  bool type_known = false;
+  TAO::Any_Impl *impl = any->impl ();
+  CORBA::ULong value;
 
-  if (mb == 0)
+  if (impl->encoded ())
     {
-      ACE_NEW_RETURN (mb,
-                      ACE_Message_Block,
-                      0);
-      TAO_OutputCDR out;
-      any->impl ()->marshal_value (out);
-      ACE_CDR::consolidate (mb, out.begin ());
-      type_known = true;
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+        
+      // We don't want unk's rd_ptr to move, in case we are shared by
+      // another Any, so we use this to copy the state, not the buffer.
+      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
+      for_reading.read_ulong (value);
     }
-
-  TAO_InputCDR cdr (mb,
-                    any->_tao_byte_order ());
-
-  if (type_known)
+  else
     {
-      mb->release ();
+      TAO_OutputCDR out;
+      impl->marshal_value (out);
+      TAO_InputCDR in (out);
+      in.read_ulong (value);
     }
 
-  CORBA::ULong value;
-  cdr.read_ulong (value);
-
   return value == this->value_;
 }
 
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 51a19b0a495..6af07a1b9a8 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -50,30 +50,26 @@ TAO_DynSequence_i::init (const CORBA::Any& any
 
   this->type_ = tc;
 
-  // Get the CDR stream of the argument.
-  ACE_Message_Block *mb = any._tao_get_cdr ();
-  bool type_known = false;
+  // Get the CDR stream of the Any, if there isn't one, make one.
+  TAO::Any_Impl *impl = any.impl ();
+  CORBA::ULong length;
+  TAO_OutputCDR out;
+  TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
 
-  if (mb == 0)
+  if (impl->encoded ())
     {
-      ACE_NEW (mb,
-               ACE_Message_Block);
-      TAO_OutputCDR out;
-      any.impl ()->marshal_value (out);
-      ACE_CDR::consolidate (mb, out.begin ());
-      type_known = true;
+      TAO::Unknown_IDL_Type *unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+        
+      cdr = unk->_tao_get_cdr ();
     }
-
-  TAO_InputCDR cdr (mb,
-                    any._tao_byte_order ());
-
-  if (type_known)
+  else
     {
-      mb->release ();
+      impl->marshal_value (out);
+      TAO_InputCDR tmp_in (out);
+      cdr = tmp_in;
     }
 
-  CORBA::ULong length;
-
   // If the any is a sequence, first 4 bytes of cdr hold the
   // length.
   cdr.read_ulong (length);
@@ -91,12 +87,12 @@ TAO_DynSequence_i::init (const CORBA::Any& any
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::Any field_any;
-      TAO::Unknown_IDL_Type *unk = 0;
-      ACE_NEW (unk,
+      TAO_InputCDR unk_in (cdr);
+      TAO::Unknown_IDL_Type *field_unk = 0;
+      ACE_NEW (field_unk,
                TAO::Unknown_IDL_Type (field_tc.in (),
-                                      cdr.start (),
-                                      cdr.byte_order ()));
-      field_any.replace (unk);
+                                      unk_in));
+      field_any.replace (field_unk);
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
@@ -565,28 +561,26 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
 
   if (equivalent)
     {
-      // Get the CDR stream of the argument.
-      ACE_Message_Block *mb = any._tao_get_cdr ();
-      bool type_known = false;
+      // Get the CDR stream of the Any, if there isn't one, make one.
+      TAO::Any_Impl *impl = any.impl ();
+      TAO_OutputCDR out;
+      TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
 
-      if (mb == 0)
+      if (impl->encoded ())
         {
-          ACE_NEW (mb,
-                   ACE_Message_Block);
-          TAO_OutputCDR out;
-          any.impl ()->marshal_value (out);
-          ACE_CDR::consolidate (mb, out.begin ());
-          type_known = true;
+          TAO::Unknown_IDL_Type *unk =
+            dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+            
+          cdr = unk->_tao_get_cdr ();
         }
-
-      TAO_InputCDR cdr (mb,
-                        any._tao_byte_order ());
-
-      if (type_known)
+      else
         {
-          mb->release ();
+          impl->marshal_value (out);
+          TAO_InputCDR tmp_in (out);
+          cdr = tmp_in;
         }
 
+
       CORBA::ULong arg_length;
 
       // If the any is a sequence, first 4 bytes of cdr hold the
@@ -606,12 +600,12 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
           CORBA::Any field_any;
-          TAO::Unknown_IDL_Type *unk = 0;
-          ACE_NEW (unk,
+          TAO_InputCDR unk_in (cdr);
+          TAO::Unknown_IDL_Type *field_unk = 0;
+          ACE_NEW (field_unk,
                    TAO::Unknown_IDL_Type (field_tc.in (),
-                                          cdr.start (),
-                                          cdr.byte_order ()));
-          field_any.replace (unk);
+                                          unk_in));
+          field_any.replace (field_unk);
 
           if (i < this->component_count_)
             {
@@ -668,15 +662,12 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   TAO_OutputCDR out_cdr;
-
   out_cdr.write_ulong (this->component_count_);
 
   CORBA::TypeCode_var field_tc =
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  bool type_known = false;
-
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       // Recursive step
@@ -684,26 +675,22 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
         this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
+      TAO::Any_Impl *field_impl = field_any->impl ();
+      TAO_OutputCDR field_out;
+      TAO_InputCDR field_cdr (static_cast<ACE_Message_Block *> (0));
 
-      if (field_mb == 0)
+      if (field_impl->encoded ())
         {
-          ACE_NEW_RETURN (field_mb,
-                          ACE_Message_Block,
-                          0);
-          TAO_OutputCDR out;
-          field_any->impl ()->marshal_value (out);
-          ACE_CDR::consolidate (field_mb, out.begin ());
-          type_known = true;
+          TAO::Unknown_IDL_Type *field_unk =
+            dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
+            
+          field_cdr = field_unk->_tao_get_cdr ();
         }
-
-      TAO_InputCDR field_cdr (field_mb,
-                              field_any->_tao_byte_order ());
-
-      if (type_known)
+      else
         {
-          field_mb->release ();
-          type_known = false;
+          field_impl->marshal_value (field_out);
+          TAO_InputCDR tmp_in (field_out);
+          field_cdr = tmp_in;
         }
 
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
@@ -724,8 +711,7 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   TAO::Unknown_IDL_Type *unk = 0;
   ACE_NEW_THROW_EX (unk,
                     TAO::Unknown_IDL_Type (this->type_.in (),
-                                           in_cdr.start (),
-                                           in_cdr.byte_order ()),
+                                           in_cdr),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index ee75bf1e13b..72c2a9071ab 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -43,8 +43,7 @@ TAO_DynStruct_i::init_common (void)
   this->container_is_destroying_ = 0;
   this->has_components_ = 1;
   this->destroyed_ = 0;
-  this->component_count_ = ACE_static_cast (CORBA::ULong,
-                                            this->da_members_.size ());
+  this->component_count_ = static_cast <CORBA::ULong> (this->da_members_.size ());
   this->current_position_ = this->component_count_ ? 0 : -1;
 }
 
@@ -86,26 +85,23 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
 
   this->init_common ();
 
-  // Get the CDR stream of the argument.
-  ACE_Message_Block *mb = any._tao_get_cdr ();
-  bool type_known = false;
+  // Get the CDR stream of the Any, if there isn't one, make one.
+  TAO::Any_Impl *impl = any.impl ();
+  TAO_OutputCDR out;
+  TAO_InputCDR in (static_cast<ACE_Message_Block *> (0));
+  TAO::Unknown_IDL_Type *unk = 0;
 
-  if (mb == 0)
+  if (impl->encoded ())
     {
-      ACE_NEW (mb,
-               ACE_Message_Block);
-      TAO_OutputCDR out;
-      any.impl ()->marshal_value (out);
-      ACE_CDR::consolidate (mb, out.begin ());
-      type_known = true;
-    }
+      unk = dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
-  TAO_InputCDR cdr (mb,
-                    any._tao_byte_order ());
-
-  if (type_known)
+      in = unk->_tao_get_cdr ();
+    }
+  else
     {
-      mb->release ();
+      impl->marshal_value (out);
+      TAO_InputCDR tmp_in (out);
+      in = tmp_in;
     }
 
   // If we have an exception type, unmarshal the repository ID.
@@ -116,7 +112,7 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
   if (kind == CORBA::tk_except)
     {
       CORBA::String_var str;
-      cdr >> str.out ();
+      in >> str.out ();
     }
 
   for (CORBA::ULong i = 0; i < numfields; i++)
@@ -127,11 +123,10 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
       ACE_CHECK;
 
       CORBA::Any field_any;
-      TAO::Unknown_IDL_Type *unk = 0;
+      TAO_InputCDR unk_in (in);
       ACE_NEW (unk,
                TAO::Unknown_IDL_Type (field_tc.in (),
-                                      cdr.start (),
-                                      cdr.byte_order ()));
+                                      unk_in));
       field_any.replace (unk);
 
       // This recursive step will call the correct constructor
@@ -143,7 +138,7 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                               &cdr
+                                               &in
                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
@@ -511,7 +506,7 @@ TAO_DynStruct_i::set_members_as_dyn_any (
       this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->da_members_[i] = 
+      this->da_members_[i] =
         values[i].value->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
@@ -536,37 +531,34 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
+  CORBA::Boolean equivalent =
     this->type_->equivalent (tc.in ()
                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
     {
-      // Get the CDR stream of the argument.
-      ACE_Message_Block* mb = any._tao_get_cdr ();
-      bool type_known = false;
+      // Get the CDR stream of the Any, if there isn't one, make one.
+      TAO::Any_Impl *impl = any.impl ();
+      TAO_OutputCDR out;
+      TAO_InputCDR in (static_cast<ACE_Message_Block *> (0));
+      TAO::Unknown_IDL_Type *unk = 0;
 
-      if (mb == 0)
+      if (impl->encoded ())
         {
-          ACE_NEW (mb,
-                   ACE_Message_Block);
-          TAO_OutputCDR out;
-          any.impl ()->marshal_value (out);
-          ACE_CDR::consolidate (mb, out.begin ());
-          type_known = true;
-        }
+          unk = dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
-      TAO_InputCDR cdr (mb,
-                        any._tao_byte_order ());
-
-      if (type_known)
+          in = unk->_tao_get_cdr ();
+        }
+      else
         {
-          mb->release ();
+          impl->marshal_value (out);
+          TAO_InputCDR tmp_in (out);
+          in = tmp_in;
         }
 
       // If we have an exception type, unmarshal the repository ID.
-      CORBA::TCKind kind = 
+      CORBA::TCKind kind =
         TAO_DynAnyFactory::unalias (this->type_.in ()
                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -574,7 +566,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
       if (kind == CORBA::tk_except)
         {
           CORBA::String_var str;
-          cdr >> str.out ();
+          in >> str.out ();
         }
 
       CORBA::TypeCode_var field_tc;
@@ -589,11 +581,11 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
           ACE_CHECK;
 
           CORBA::Any field_any;
+          TAO_InputCDR unk_in (in);
           TAO::Unknown_IDL_Type *unk = 0;
           ACE_NEW (unk,
                    TAO::Unknown_IDL_Type (field_tc.in (),
-                                          cdr.start (),
-                                          cdr.byte_order ()));
+                                          unk_in));
           field_any.replace (unk);
 
           this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -606,7 +598,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                                   &cdr
+                                                   &in
                                                    ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
@@ -643,43 +635,40 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
       out_cdr << this->type_->id ();
     }
 
-  bool type_known = false;
+  TAO::Any_Impl *field_impl = 0;
+  TAO::Unknown_IDL_Type *field_unk = 0;
+  TAO_InputCDR field_in_cdr (static_cast<ACE_Message_Block *> (0));
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      CORBA::TypeCode_var field_tc = 
+      CORBA::TypeCode_var field_tc =
         this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
-      CORBA::Any_var field_any = 
+      CORBA::Any_var field_any =
         this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
+      TAO_OutputCDR field_out_cdr;
+      field_impl = field_any->impl ();
 
-      if (field_mb == 0)
+      if (field_impl->encoded ())
         {
-          ACE_NEW_RETURN (field_mb,
-                          ACE_Message_Block,
-                          0);
-          TAO_OutputCDR out;
-          field_any->impl ()->marshal_value (out);
-          ACE_CDR::consolidate (field_mb, out.begin ());
-          type_known = true;
-        }
+          field_unk =
+            dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
 
-      TAO_InputCDR field_cdr (field_mb,
-                              field_any->_tao_byte_order ());
-
-      if (type_known)
+          field_in_cdr = field_unk->_tao_get_cdr ();
+        }
+      else
         {
-          field_mb->release ();
-          type_known = false;
+          field_impl->marshal_value (field_out_cdr);
+          TAO_InputCDR tmp (field_out_cdr);
+          field_in_cdr = tmp;
         }
 
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
-                                                 &field_cdr,
+                                                 &field_in_cdr,
                                                  &out_cdr
                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -696,8 +685,7 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   TAO::Unknown_IDL_Type *unk = 0;
   ACE_NEW_THROW_EX (unk,
                     TAO::Unknown_IDL_Type (this->type_.in (),
-                                           in_cdr.start (),
-                                           in_cdr.byte_order ()),
+                                           in_cdr),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -735,8 +723,7 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      rhs->seek (ACE_static_cast (CORBA::Long,
-                                  i)
+      rhs->seek (static_cast <CORBA::Long> (i)
                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
@@ -811,8 +798,7 @@ TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
       return DynamicAny::DynAny::_nil ();
     }
 
-  CORBA::ULong index = ACE_static_cast (CORBA::ULong,
-                                        this->current_position_);
+  CORBA::ULong index = static_cast <CORBA::ULong> (this->current_position_);
 
   this->set_flag (this->da_members_[index].in (),
                   0
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 9eee9336906..06536297cdf 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -138,38 +138,37 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  // Get the CDR stream of the argument.
-  ACE_Message_Block* mb = any._tao_get_cdr ();
-  bool type_known = false;
-
-  if (mb == 0)
-    {
-      ACE_NEW (mb,
-               ACE_Message_Block);
-      TAO_OutputCDR out;
-      any.impl ()->marshal_value (out);
-      ACE_CDR::consolidate (mb, out.begin ());
-      type_known = true;
-    }
-
-  TAO_InputCDR cdr (mb,
-                    any._tao_byte_order ());
-
-  if (type_known)
-    {
-      mb->release ();
-    }
-
   CORBA::TypeCode_var disc_tc =
     tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Any disc_any;
   TAO::Unknown_IDL_Type *unk = 0;
+
+  // Get a CDR stream - if the Any doesn't have one, make one.
+  TAO::Any_Impl *impl = any.impl ();
+  TAO_OutputCDR out;
+  TAO_InputCDR in (static_cast<ACE_Message_Block *> (0));
+
+  if (impl->encoded ())
+    {
+      TAO::Unknown_IDL_Type *tmp =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+    
+      in = tmp->_tao_get_cdr ();
+    }
+  else
+    {
+      impl->marshal_value (out);
+      TAO_InputCDR tmp_in (out);
+      in = tmp_in;
+    }
+    
+  TAO_InputCDR unk_in (in);
   ACE_NEW (unk,
            TAO::Unknown_IDL_Type (disc_tc.in (),
-                                  cdr.start (),
-                                  cdr.byte_order ()));
+                                  unk_in));
+
   disc_any.replace (unk);
 
   // Need this here because we might have been called from init().
@@ -187,7 +186,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
 
   // Move to the next field in the CDR stream.
   (void) TAO_Marshal_Object::perform_skip (disc_tc.in (),
-                                           &cdr
+                                           &in
                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -207,7 +206,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
   for (i = 0; i < count; ++i)
     {
       CORBA::Any_var label_any = tc->member_label (i
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       match = this->label_match (label_any.in (),
@@ -239,8 +238,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
       TAO::Unknown_IDL_Type *unk = 0;
       ACE_NEW (unk,
                TAO::Unknown_IDL_Type (member_tc.in (),
-                                      cdr.start (),
-                                      cdr.byte_order ()));
+                                      in));
       member_any.replace (unk);
 
       this->member_ =
@@ -283,8 +281,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
           TAO::Unknown_IDL_Type *unk = 0;
           ACE_NEW (unk,
                    TAO::Unknown_IDL_Type (default_tc.in (),
-                                          cdr.start (),
-                                          cdr.byte_order ()));
+                                          in));
           default_any.replace (unk);
 
           this->member_ =
@@ -776,73 +773,65 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
     this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ACE_Message_Block *disc_mb = disc_any->_tao_get_cdr ();
-  bool type_known = false;
+  TAO::Any_Impl *disc_any_impl = disc_any->impl ();
+  TAO_OutputCDR disc_out_cdr;
+  TAO_InputCDR disc_in_cdr (static_cast<ACE_Message_Block *> (0));
 
-  if (disc_mb == 0)
+  if (disc_any_impl->encoded ())
     {
-      ACE_NEW_RETURN (disc_mb,
-                      ACE_Message_Block,
-                      0);
-      TAO_OutputCDR out;
-      disc_any->impl ()->marshal_value (out);
-      ACE_CDR::consolidate (disc_mb, out.begin ());
-      type_known = true;
+      TAO::Unknown_IDL_Type *disc_unk =
+        dynamic_cast<TAO::Unknown_IDL_Type *> (disc_any_impl);
+        
+      disc_in_cdr = disc_unk->_tao_get_cdr ();
     }
-
-  TAO_InputCDR disc_cdr (disc_mb,
-                         disc_any->_tao_byte_order ());
-
-  if (type_known)
+  else
     {
-      disc_mb->release ();
-      type_known = false;
+      disc_any_impl->marshal_value (disc_out_cdr);
+      TAO_InputCDR disc_tmp_in_cdr (disc_out_cdr);
+      disc_in_cdr = disc_tmp_in_cdr;
     }
 
   (void) TAO_Marshal_Object::perform_append (disc_tc.in (),
-                                             &disc_cdr,
+                                             &disc_in_cdr,
                                              &out_cdr
                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Add the member to the CDR stream unless it has no active member.
   if (this->has_no_active_member () == 0)
-  {
-    CORBA::TypeCode_var member_tc = 
-      this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-   
-    CORBA::Any_var member_any = 
-      this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-   
-    ACE_Message_Block *member_mb = member_any->_tao_get_cdr ();
-
-    if (member_mb == 0)
-      {
-        ACE_NEW_RETURN (member_mb,
-                        ACE_Message_Block,
-                        0);
-        TAO_OutputCDR out;
-        member_any->impl ()->marshal_value (out);
-        ACE_CDR::consolidate (member_mb, out.begin ());
-        type_known = true;
-      }
-   
-    TAO_InputCDR member_cdr (member_mb,
-                             member_any->_tao_byte_order ());
-
-    if (type_known)
-      {
-        member_mb->release ();
-      }
-   
-    (void) TAO_Marshal_Object::perform_append (member_tc.in (),
-                                               &member_cdr,
-                                               &out_cdr
-                                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-  }
+    {
+      CORBA::TypeCode_var member_tc = 
+        this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+     
+      CORBA::Any_var member_any = 
+        this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+     
+      TAO::Any_Impl *member_any_impl = member_any->impl ();
+      TAO_OutputCDR member_out_cdr;
+      TAO_InputCDR member_in_cdr (static_cast<ACE_Message_Block *> (0));
+
+      if (member_any_impl->encoded ())
+        {
+          TAO::Unknown_IDL_Type *member_unk =
+            dynamic_cast<TAO::Unknown_IDL_Type *> (member_any_impl);
+            
+          member_in_cdr = member_unk->_tao_get_cdr ();
+        }
+      else
+        {
+          member_any_impl->marshal_value (member_out_cdr);
+          TAO_InputCDR member_tmp_in_cdr (member_out_cdr);
+          member_in_cdr = member_tmp_in_cdr;
+        }
+     
+      (void) TAO_Marshal_Object::perform_append (member_tc.in (),
+                                                &member_in_cdr,
+                                                &out_cdr
+                                                ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+    }
   
   // Make the Any.
   TAO_InputCDR in_cdr (out_cdr);
@@ -856,8 +845,7 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   TAO::Unknown_IDL_Type *unk = 0;
   ACE_NEW_THROW_EX (unk,
                     TAO::Unknown_IDL_Type (this->type_.in (),
-                                           in_cdr.start (),
-                                           in_cdr.byte_order ()),
+                                           in_cdr),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -1085,33 +1073,47 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
       {
         CORBA::ULong my_val;
         CORBA::ULong other_val;
-        ACE_Message_Block *mb = my_any._tao_get_cdr ();
-        bool type_known = false;
+        
+        TAO::Any_Impl *my_impl = my_any.impl ();
 
-        if (mb == 0)
+        if (my_impl->encoded ())
           {
-            ACE_NEW_RETURN (mb,
-                            ACE_Message_Block,
-                            0);
-            TAO_OutputCDR out;
-            my_any.impl ()->marshal_value (out);
-            ACE_CDR::consolidate (mb, out.begin ());
-            type_known = true;
+            TAO::Unknown_IDL_Type *my_unk =
+              dynamic_cast<TAO::Unknown_IDL_Type *> (my_impl);
+              
+            // We don't want unk's rd_ptr to move, in case we are shared by
+            // another Any, so we use this to copy the state, not the buffer.
+            TAO_InputCDR for_reading (my_unk->_tao_get_cdr ());
+            for_reading.read_ulong (my_val);
           }
-
-        TAO_InputCDR my_cdr (mb,
-                             my_any._tao_byte_order ());
-
-        if (type_known)
+        else
           {
-            mb->release ();
+            TAO_OutputCDR my_out;
+            my_impl->marshal_value (my_out);
+            TAO_InputCDR my_in (my_out);
+            my_in.read_ulong (my_val);
           }
 
-        my_cdr.read_ulong (my_val);
-        mb = other_any._tao_get_cdr ();
-        TAO_InputCDR other_cdr (mb,
-                                other_any._tao_byte_order ());
-        other_cdr.read_ulong (other_val);
+        TAO::Any_Impl *other_impl = other_any.impl ();
+        
+        if (other_impl->encoded ())
+          {
+            TAO::Unknown_IDL_Type *other_unk =
+              dynamic_cast<TAO::Unknown_IDL_Type *> (other_impl);
+              
+            // We don't want unk's rd_ptr to move, in case we are shared by
+            // another Any, so we use this to copy the state, not the buffer.
+            TAO_InputCDR for_reading (other_unk->_tao_get_cdr ());
+            for_reading.read_ulong (other_val);
+          }
+        else
+          {
+            TAO_OutputCDR other_out;
+            other_impl->marshal_value (other_out);
+            TAO_InputCDR other_in (other_out);
+            other_in.read_ulong (other_val);
+          }
+          
         return my_val == other_val;
       }
     // Cannot happen - we've covered all the legal discriminator types.
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index fd1ffe9666d..dfe3f405b2c 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "DynamicAny.h"
@@ -38,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "DynamicAnyC.i"
+#include "DynamicAnyC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -90,12 +90,6 @@ TAO::Objref_Traits<DynamicAny::DynAny>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynAny_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -129,14 +123,13 @@ DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::Invalid
 DynamicAny::DynAny::InvalidValue *
 DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (InvalidValue *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InvalidValue *> (_tao_excp);
+}
+
+const DynamicAny::DynAny::InvalidValue *
+DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidValue *> (_tao_excp);
 }
 
 CORBA::Exception *DynamicAny::DynAny::InvalidValue::_alloc (void)
@@ -214,14 +207,13 @@ DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMis
 DynamicAny::DynAny::TypeMismatch *
 DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (TypeMismatch *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<TypeMismatch *> (_tao_excp);
+}
+
+const DynamicAny::DynAny::TypeMismatch *
+DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const TypeMismatch *> (_tao_excp);
 }
 
 CORBA::Exception *DynamicAny::DynAny::TypeMismatch::_alloc (void)
@@ -325,18 +317,18 @@ DynamicAny::DynAny::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -397,12 +389,6 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynFixed_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynFixed::DynFixed (void)
 {}
 
@@ -462,22 +448,22 @@ DynamicAny::DynFixed::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynFixed:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -538,12 +524,6 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynEnum_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynEnum::DynEnum (void)
 {}
 
@@ -603,22 +583,22 @@ DynamicAny::DynEnum::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynEnum:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -777,12 +757,6 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynStruct_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynStruct::DynStruct (void)
 {}
 
@@ -842,22 +816,22 @@ DynamicAny::DynStruct::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynStruct:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -918,12 +892,6 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynUnion_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynUnion::DynUnion (void)
 {}
 
@@ -983,22 +951,22 @@ DynamicAny::DynUnion::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynUnion:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1150,12 +1118,6 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynSequence_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynSequence::DynSequence (void)
 {}
 
@@ -1215,22 +1177,22 @@ DynamicAny::DynSequence::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynSequence:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1291,12 +1253,6 @@ TAO::Objref_Traits<DynamicAny::DynArray>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynArray_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynArray::DynArray (void)
 {}
 
@@ -1356,22 +1312,22 @@ DynamicAny::DynArray::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynArray:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1432,12 +1388,6 @@ TAO::Objref_Traits<DynamicAny::DynValue>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynValue_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 DynamicAny::DynValue::DynValue (void)
 {}
 
@@ -1497,22 +1447,22 @@ DynamicAny::DynValue::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAny:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynValue:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1573,12 +1523,6 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*DynamicAny__TAO_DynAnyFactory_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -1612,14 +1556,13 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::
 DynamicAny::DynAnyFactory::InconsistentTypeCode *
 DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (InconsistentTypeCode *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InconsistentTypeCode *> (_tao_excp);
+}
+
+const DynamicAny::DynAnyFactory::InconsistentTypeCode *
+DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InconsistentTypeCode *> (_tao_excp);
 }
 
 CORBA::Exception *DynamicAny::DynAnyFactory::InconsistentTypeCode::_alloc (void)
@@ -1723,18 +1666,18 @@ DynamicAny::DynAnyFactory::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/DynamicAny/DynAnyFactory:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1789,12 +1732,12 @@ CORBA::Boolean operator<< (
     const DynamicAny::NameValuePairSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -1804,7 +1747,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -1821,7 +1764,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -1830,11 +1773,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -1845,7 +1788,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_ */
@@ -1861,12 +1804,12 @@ CORBA::Boolean operator<< (
     const DynamicAny::AnySeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -1876,7 +1819,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -1893,7 +1836,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -1902,11 +1845,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -1917,13 +1860,13 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -2502,4 +2445,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 686c7a586a8..f85f95dbfd0 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
 #define _TAO_IDL_ORIG_DYNAMICANYC_H_
@@ -38,13 +38,15 @@
 #error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
 #endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
 
-#include "tao/ORB.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "dynamicany_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
@@ -68,9 +70,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -79,7 +79,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -96,7 +96,7 @@ namespace DynamicAny
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNANY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNANY__VAR_OUT_CH_
@@ -146,7 +146,7 @@ namespace DynamicAny
     
     static DynAny_ptr _nil (void)
     {
-      return (DynAny_ptr)0;
+      return static_cast<DynAny_ptr> (0);
     }
     
     
@@ -168,8 +168,10 @@ namespace DynamicAny
       InvalidValue &operator= (const InvalidValue &);
       
       static InvalidValue *_downcast (CORBA::Exception *);
+      static const InvalidValue *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -185,7 +187,7 @@ namespace DynamicAny
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
@@ -207,8 +209,10 @@ namespace DynamicAny
       TypeMismatch &operator= (const TypeMismatch &);
       
       static TypeMismatch *_downcast (CORBA::Exception *);
+      static const TypeMismatch *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -224,7 +228,7 @@ namespace DynamicAny
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
@@ -243,25 +247,25 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void assign (
-        DynamicAny::DynAny_ptr dyn_any
+        ::DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void from_any (
-        const CORBA::Any & value
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -278,7 +282,7 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean equal (
-        DynamicAny::DynAny_ptr dyn_any
+        ::DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -309,117 +313,117 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_boolean (
-        CORBA::Boolean value
+        ::CORBA::Boolean value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_octet (
-        CORBA::Octet value
+        ::CORBA::Octet value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_char (
-        CORBA::Char value
+        ::CORBA::Char value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_short (
-        CORBA::Short value
+        ::CORBA::Short value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_ushort (
-        CORBA::UShort value
+        ::CORBA::UShort value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_long (
-        CORBA::Long value
+        ::CORBA::Long value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_ulong (
-        CORBA::ULong value
+        ::CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_float (
-        CORBA::Float value
+        ::CORBA::Float value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_double (
-        CORBA::Double value
+        ::CORBA::Double value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -430,87 +434,87 @@ namespace DynamicAny
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_reference (
-        CORBA::Object_ptr value
+        ::CORBA::Object_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_typecode (
-        CORBA::TypeCode_ptr value
+        ::CORBA::TypeCode_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_longlong (
-        CORBA::LongLong value
+        ::CORBA::LongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_ulonglong (
-        CORBA::ULongLong value
+        ::CORBA::ULongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_longdouble (
-        CORBA::LongDouble value
+        ::CORBA::LongDouble value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_wchar (
-        CORBA::WChar value
+        ::CORBA::WChar value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -521,48 +525,48 @@ namespace DynamicAny
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_any (
-        const CORBA::Any & value
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_dyn_any (
-        DynamicAny::DynAny_ptr value
+        ::DynamicAny::DynAny_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void insert_val (
-        CORBA::ValueBase * value
+        ::CORBA::ValueBase * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -572,9 +576,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -584,9 +588,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -596,9 +600,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -608,9 +612,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -620,9 +624,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -632,9 +636,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -644,9 +648,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -656,9 +660,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -668,9 +672,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -680,9 +684,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -692,9 +696,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -704,9 +708,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -716,9 +720,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -728,9 +732,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -740,9 +744,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -752,9 +756,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -764,9 +768,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -776,9 +780,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -788,9 +792,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -800,16 +804,16 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean seek (
-        CORBA::Long index
+        ::CORBA::Long index
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -853,8 +857,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -884,7 +888,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNFIXED__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNFIXED__VAR_OUT_CH_
@@ -913,7 +917,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNFIXED_CH_
   
   class TAO_DynamicAny_Export DynFixed
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynFixed_ptr _ptr_type;
@@ -934,7 +938,7 @@ namespace DynamicAny
     
     static DynFixed_ptr _nil (void)
     {
-      return (DynFixed_ptr)0;
+      return static_cast<DynFixed_ptr> (0);
     }
     
     
@@ -957,9 +961,9 @@ namespace DynamicAny
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -989,7 +993,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNENUM__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNENUM__VAR_OUT_CH_
@@ -1018,7 +1022,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNENUM_CH_
   
   class TAO_DynamicAny_Export DynEnum
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynEnum_ptr _ptr_type;
@@ -1039,7 +1043,7 @@ namespace DynamicAny
     
     static DynEnum_ptr _nil (void)
     {
-      return (DynEnum_ptr)0;
+      return static_cast<DynEnum_ptr> (0);
     }
     
     
@@ -1062,8 +1066,8 @@ namespace DynamicAny
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1080,12 +1084,12 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_as_ulong (
-        CORBA::ULong value
+        ::CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1115,7 +1119,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
+  // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * FieldName;
   typedef CORBA::String_var FieldName_var;
@@ -1274,7 +1278,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_
@@ -1303,7 +1307,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNSTRUCT_CH_
   
   class TAO_DynamicAny_Export DynStruct
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynStruct_ptr _ptr_type;
@@ -1324,7 +1328,7 @@ namespace DynamicAny
     
     static DynStruct_ptr _nil (void)
     {
-      return (DynStruct_ptr)0;
+      return static_cast<DynStruct_ptr> (0);
     }
     
     
@@ -1336,9 +1340,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1348,9 +1352,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1367,13 +1371,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_members (
-        const DynamicAny::NameValuePairSeq & value
+        const ::DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1390,13 +1394,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_members_as_dyn_any (
-        const DynamicAny::NameDynAnyPairSeq & value
+        const ::DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1426,7 +1430,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNUNION__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNUNION__VAR_OUT_CH_
@@ -1455,7 +1459,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNUNION_CH_
   
   class TAO_DynamicAny_Export DynUnion
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynUnion_ptr _ptr_type;
@@ -1476,7 +1480,7 @@ namespace DynamicAny
     
     static DynUnion_ptr _nil (void)
     {
-      return (DynUnion_ptr)0;
+      return static_cast<DynUnion_ptr> (0);
     }
     
     
@@ -1495,12 +1499,12 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_discriminator (
-        DynamicAny::DynAny_ptr d
+        ::DynamicAny::DynAny_ptr d
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1510,8 +1514,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1521,8 +1525,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1552,8 +1556,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1563,8 +1567,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1574,8 +1578,8 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1704,7 +1708,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_
@@ -1733,7 +1737,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNSEQUENCE_CH_
   
   class TAO_DynamicAny_Export DynSequence
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynSequence_ptr _ptr_type;
@@ -1754,7 +1758,7 @@ namespace DynamicAny
     
     static DynSequence_ptr _nil (void)
     {
-      return (DynSequence_ptr)0;
+      return static_cast<DynSequence_ptr> (0);
     }
     
     
@@ -1773,12 +1777,12 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_length (
-        CORBA::ULong len
+        ::CORBA::ULong len
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1795,13 +1799,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_elements (
-        const DynamicAny::AnySeq & value
+        const ::DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1818,13 +1822,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_elements_as_dyn_any (
-        const DynamicAny::DynAnySeq & value
+        const ::DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1854,7 +1858,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNARRAY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNARRAY__VAR_OUT_CH_
@@ -1883,7 +1887,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNARRAY_CH_
   
   class TAO_DynamicAny_Export DynArray
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynArray_ptr _ptr_type;
@@ -1904,7 +1908,7 @@ namespace DynamicAny
     
     static DynArray_ptr _nil (void)
     {
-      return (DynArray_ptr)0;
+      return static_cast<DynArray_ptr> (0);
     }
     
     
@@ -1923,13 +1927,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_elements (
-        const DynamicAny::AnySeq & value
+        const ::DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1946,13 +1950,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_elements_as_dyn_any (
-        const DynamicAny::DynAnySeq & value
+        const ::DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -1982,7 +1986,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNVALUE__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNVALUE__VAR_OUT_CH_
@@ -2011,7 +2015,7 @@ namespace DynamicAny
 #define _DYNAMICANY_DYNVALUE_CH_
   
   class TAO_DynamicAny_Export DynValue
-    : public virtual DynamicAny::DynAny
+    : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynValue_ptr _ptr_type;
@@ -2032,7 +2036,7 @@ namespace DynamicAny
     
     static DynValue_ptr _nil (void)
     {
-      return (DynValue_ptr)0;
+      return static_cast<DynValue_ptr> (0);
     }
     
     
@@ -2044,9 +2048,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2056,9 +2060,9 @@ namespace DynamicAny
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2075,13 +2079,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_members (
-        const DynamicAny::NameValuePairSeq & value
+        const ::DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2098,13 +2102,13 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_members_as_dyn_any (
-        const DynamicAny::NameDynAnyPairSeq & value
+        const ::DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAny::TypeMismatch
-        , DynamicAny::DynAny::InvalidValue
+        CORBA::SystemException,
+        ::DynamicAny::DynAny::TypeMismatch,
+        ::DynamicAny::DynAny::InvalidValue
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2134,7 +2138,7 @@ namespace DynamicAny
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_
@@ -2184,7 +2188,7 @@ namespace DynamicAny
     
     static DynAnyFactory_ptr _nil (void)
     {
-      return (DynAnyFactory_ptr)0;
+      return static_cast<DynAnyFactory_ptr> (0);
     }
     
     
@@ -2206,8 +2210,10 @@ namespace DynamicAny
       InconsistentTypeCode &operator= (const InconsistentTypeCode &);
       
       static InconsistentTypeCode *_downcast (CORBA::Exception *);
+      static const InconsistentTypeCode *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -2223,7 +2229,7 @@ namespace DynamicAny
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
@@ -2232,24 +2238,24 @@ namespace DynamicAny
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::DynamicAny::DynAny_ptr create_dyn_any (
-        const CORBA::Any & value
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAnyFactory::InconsistentTypeCode
+        CORBA::SystemException,
+        ::DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
-        CORBA::TypeCode_ptr type
+        ::CORBA::TypeCode_ptr type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , DynamicAny::DynAnyFactory::InconsistentTypeCode
+        CORBA::SystemException,
+        ::DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -2294,17 +2300,17 @@ namespace TAO
 #define _DYNAMICANY_DYNANY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAny>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAny>
   {
-    static DynamicAny::DynAny_ptr duplicate (
-        DynamicAny::DynAny_ptr
+    static ::DynamicAny::DynAny_ptr duplicate (
+        ::DynamicAny::DynAny_ptr
       );
     static void release (
-        DynamicAny::DynAny_ptr
+        ::DynamicAny::DynAny_ptr
       );
-    static DynamicAny::DynAny_ptr nil (void);
+    static ::DynamicAny::DynAny_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynAny_ptr p,
+        ::DynamicAny::DynAny_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2315,17 +2321,17 @@ namespace TAO
 #define _DYNAMICANY_DYNFIXED__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynFixed>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynFixed>
   {
-    static DynamicAny::DynFixed_ptr duplicate (
-        DynamicAny::DynFixed_ptr
+    static ::DynamicAny::DynFixed_ptr duplicate (
+        ::DynamicAny::DynFixed_ptr
       );
     static void release (
-        DynamicAny::DynFixed_ptr
+        ::DynamicAny::DynFixed_ptr
       );
-    static DynamicAny::DynFixed_ptr nil (void);
+    static ::DynamicAny::DynFixed_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynFixed_ptr p,
+        ::DynamicAny::DynFixed_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2336,17 +2342,17 @@ namespace TAO
 #define _DYNAMICANY_DYNENUM__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynEnum>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynEnum>
   {
-    static DynamicAny::DynEnum_ptr duplicate (
-        DynamicAny::DynEnum_ptr
+    static ::DynamicAny::DynEnum_ptr duplicate (
+        ::DynamicAny::DynEnum_ptr
       );
     static void release (
-        DynamicAny::DynEnum_ptr
+        ::DynamicAny::DynEnum_ptr
       );
-    static DynamicAny::DynEnum_ptr nil (void);
+    static ::DynamicAny::DynEnum_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynEnum_ptr p,
+        ::DynamicAny::DynEnum_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2357,17 +2363,17 @@ namespace TAO
 #define _DYNAMICANY_DYNSTRUCT__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynStruct>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynStruct>
   {
-    static DynamicAny::DynStruct_ptr duplicate (
-        DynamicAny::DynStruct_ptr
+    static ::DynamicAny::DynStruct_ptr duplicate (
+        ::DynamicAny::DynStruct_ptr
       );
     static void release (
-        DynamicAny::DynStruct_ptr
+        ::DynamicAny::DynStruct_ptr
       );
-    static DynamicAny::DynStruct_ptr nil (void);
+    static ::DynamicAny::DynStruct_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynStruct_ptr p,
+        ::DynamicAny::DynStruct_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2378,17 +2384,17 @@ namespace TAO
 #define _DYNAMICANY_DYNUNION__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynUnion>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynUnion>
   {
-    static DynamicAny::DynUnion_ptr duplicate (
-        DynamicAny::DynUnion_ptr
+    static ::DynamicAny::DynUnion_ptr duplicate (
+        ::DynamicAny::DynUnion_ptr
       );
     static void release (
-        DynamicAny::DynUnion_ptr
+        ::DynamicAny::DynUnion_ptr
       );
-    static DynamicAny::DynUnion_ptr nil (void);
+    static ::DynamicAny::DynUnion_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynUnion_ptr p,
+        ::DynamicAny::DynUnion_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2399,17 +2405,17 @@ namespace TAO
 #define _DYNAMICANY_DYNSEQUENCE__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynSequence>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynSequence>
   {
-    static DynamicAny::DynSequence_ptr duplicate (
-        DynamicAny::DynSequence_ptr
+    static ::DynamicAny::DynSequence_ptr duplicate (
+        ::DynamicAny::DynSequence_ptr
       );
     static void release (
-        DynamicAny::DynSequence_ptr
+        ::DynamicAny::DynSequence_ptr
       );
-    static DynamicAny::DynSequence_ptr nil (void);
+    static ::DynamicAny::DynSequence_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynSequence_ptr p,
+        ::DynamicAny::DynSequence_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2420,17 +2426,17 @@ namespace TAO
 #define _DYNAMICANY_DYNARRAY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynArray>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynArray>
   {
-    static DynamicAny::DynArray_ptr duplicate (
-        DynamicAny::DynArray_ptr
+    static ::DynamicAny::DynArray_ptr duplicate (
+        ::DynamicAny::DynArray_ptr
       );
     static void release (
-        DynamicAny::DynArray_ptr
+        ::DynamicAny::DynArray_ptr
       );
-    static DynamicAny::DynArray_ptr nil (void);
+    static ::DynamicAny::DynArray_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynArray_ptr p,
+        ::DynamicAny::DynArray_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2441,17 +2447,17 @@ namespace TAO
 #define _DYNAMICANY_DYNVALUE__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynValue>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynValue>
   {
-    static DynamicAny::DynValue_ptr duplicate (
-        DynamicAny::DynValue_ptr
+    static ::DynamicAny::DynValue_ptr duplicate (
+        ::DynamicAny::DynValue_ptr
       );
     static void release (
-        DynamicAny::DynValue_ptr
+        ::DynamicAny::DynValue_ptr
       );
-    static DynamicAny::DynValue_ptr nil (void);
+    static ::DynamicAny::DynValue_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynValue_ptr p,
+        ::DynamicAny::DynValue_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2462,17 +2468,17 @@ namespace TAO
 #define _DYNAMICANY_DYNANYFACTORY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAnyFactory>
+  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAnyFactory>
   {
-    static DynamicAny::DynAnyFactory_ptr duplicate (
-        DynamicAny::DynAnyFactory_ptr
+    static ::DynamicAny::DynAnyFactory_ptr duplicate (
+        ::DynamicAny::DynAnyFactory_ptr
       );
     static void release (
-        DynamicAny::DynAnyFactory_ptr
+        ::DynamicAny::DynAnyFactory_ptr
       );
-    static DynamicAny::DynAnyFactory_ptr nil (void);
+    static ::DynamicAny::DynAnyFactory_ptr nil (void);
     static CORBA::Boolean marshal (
-        DynamicAny::DynAnyFactory_ptr p,
+        ::DynamicAny::DynAnyFactory_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2521,13 +2527,13 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "DynamicAnyC.i"
+#include "DynamicAnyC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -2539,3 +2545,4 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/DynamicAny/DynamicAnyC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/DynamicAny/diffs/DynamicAny.diff b/TAO/tao/DynamicAny/diffs/DynamicAny.diff
index 232c87b148f..f5de7e6491c 100644
--- a/TAO/tao/DynamicAny/diffs/DynamicAny.diff
+++ b/TAO/tao/DynamicAny/diffs/DynamicAny.diff
@@ -1,60 +1,32 @@
---- orig/DynamicAnyC.h	Wed Feb  6 11:11:22 2002
-+++ DynamicAnyC.h	Wed Feb  6 11:17:29 2002
-@@ -22,6 +22,10 @@
- #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
- #define _TAO_IDL_ORIG_DYNAMICANYC_H_
+--- orig/DynamicAnyC.h	2004-11-24 08:54:01.902620800 +0100
++++ DynamicAnyC.h	2004-11-24 08:57:51.632956800 +0100
+@@ -34,6 +34,10 @@
+ #include /**/ "ace/pre.h"
+ 
  
 +#ifndef TAO_DYNAMICANY_SAFE_INCLUDE
 +#error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
 +#endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
 +
- #include "ace/pre.h"
- #include "tao/corba.h"
+ #include "ace/config-all.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+@@ -41,7 +45,6 @@
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+ #include "dynamicany_export.h"
+-#include "tao/Valuetype/ValueBase.h"
+ #include "tao/ORB.h"
+ #include "tao/SystemException.h"
+ #include "tao/Environment.h"
+--- orig/DynamicAnyC.cpp	2004-11-24 08:54:01.902620800 +0100
++++ DynamicAnyC.cpp	2004-11-24 08:58:10.009380800 +0100
+@@ -29,7 +29,7 @@
+ // be\be_codegen.cpp:301
  
-@@ -1650,7 +1654,7 @@
-         , DynamicAny::DynAny::InvalidValue
-       )) = 0;
-     
--    virtual ::TCKind current_member_kind (
-+    virtual CORBA::TCKind current_member_kind (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-@@ -1868,7 +1872,7 @@
-         CORBA::SystemException
-       )) = 0;
-     
--    virtual ::TCKind discriminator_kind (
-+    virtual CORBA::TCKind discriminator_kind (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-@@ -1894,7 +1898,7 @@
-         , DynamicAny::DynAny::InvalidValue
-       )) = 0;
-     
--    virtual ::TCKind member_kind (
-+    virtual CORBA::TCKind member_kind (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-@@ -2716,7 +2720,7 @@
-         , DynamicAny::DynAny::InvalidValue
-       )) = 0;
-     
--    virtual ::TCKind current_member_kind (
-+    virtual CORBA::TCKind current_member_kind (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
---- orig/DynamicAnyC.cpp	Wed Feb  6 11:11:22 2002
-+++ DynamicAnyC.cpp	Wed Feb  6 11:15:25 2002
-@@ -19,7 +19,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "DynamicAnyC.h"
 +#include "DynamicAny.h"
+ #include "tao/CDR.h"
+ #include "ace/OS_NS_string.h"
  
- #include "tao/Stub.h"
- #include "tao/Invocation.h"
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index e5a7d0eac32..abd5c387b97 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "DynamicC.h"
@@ -37,11 +37,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "DynamicC.i"
+#include "DynamicC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -96,7 +96,7 @@ void Dynamic::ParameterList::_tao_any_destructor (
   )
 {
   ParameterList * _tao_tmp_pointer =
-    ACE_static_cast (ParameterList *, _tao_void_pointer);
+    static_cast<ParameterList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -149,7 +149,7 @@ void Dynamic::ExceptionList::_tao_any_destructor (
   )
 {
   ExceptionList * _tao_tmp_pointer =
-    ACE_static_cast (ExceptionList *, _tao_void_pointer);
+    static_cast<ExceptionList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -166,7 +166,7 @@ CORBA::Boolean operator<< (
     const Dynamic::ParameterList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -238,7 +238,7 @@ CORBA::Boolean operator<< (
     const Dynamic::ExceptionList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -300,7 +300,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -420,4 +420,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index db73e5925e8..0f7761b42cc 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -26,28 +26,31 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_DYNAMICC_H_
 #define _TAO_IDL_ORIG_DYNAMICC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Typecode.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 
-#include "Dynamic_ParameterC.h"
-#include "StringSeqC.h"
+#include "tao/Dynamic_ParameterC.h"
+#include "tao/StringSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -62,9 +65,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -276,13 +277,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "DynamicC.i"
+#include "DynamicC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -294,3 +295,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/DynamicC.i b/TAO/tao/DynamicC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/DynamicC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc
index 6dbe854fd98..3c5a4cd6488 100644
--- a/TAO/tao/DynamicInterface.mpc
+++ b/TAO/tao/DynamicInterface.mpc
@@ -19,10 +19,14 @@ project : taolib, core, messaging, minimum_corba {
     DynamicInterface
   }
 
-  Resource_files {
+  Resource_Files {
     DynamicInterface
   }
 
   PIDL_Files {
   }
+
+  Pkgconfig_Files {
+    DynamicInterface/TAO_DynamicInterface.pc.in
+  }
 }
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index 210626bc3a2..18f9ca7e9d8 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -22,7 +22,8 @@ namespace TAO
   CORBA::Boolean
   NamedValue_Argument::demarshal (TAO_InputCDR &cdr)
   {
-    ACE_TRY_NEW_ENV
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
       {
         if (this->x_ !=0 && this->x_->value ()->impl ())
           {
@@ -36,6 +37,7 @@ namespace TAO
         return 0;
       }
     ACE_ENDTRY;
+    ACE_CHECK_RETURN (false);
 
     this->byte_order_ = cdr.byte_order ();
 
@@ -53,7 +55,8 @@ namespace TAO
   CORBA::Boolean
   NVList_Argument::marshal (TAO_OutputCDR &cdr)
   {
-    ACE_TRY_NEW_ENV
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
       {
         this->x_->_tao_encode (cdr,
                                CORBA::ARG_IN | CORBA::ARG_INOUT
@@ -65,6 +68,7 @@ namespace TAO
         return 0;
       }
     ACE_ENDTRY;
+    ACE_CHECK_RETURN (false);
 
     return 1;
   }
@@ -73,8 +77,8 @@ namespace TAO
   NVList_Argument::demarshal (TAO_InputCDR &cdr)
   {
 
-
-    ACE_TRY_NEW_ENV
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
       {
         // Now, get all the "return", "out", and "inout" parameters
         // from the response message body ... return parameter is
@@ -94,35 +98,40 @@ namespace TAO
         return 0;
       }
     ACE_ENDTRY;
+    ACE_CHECK_RETURN (false);
 
     return 1;
   }
 
   void
-  NVList_Argument::interceptor_paramlist (Dynamic::ParameterList *list)
+  NVList_Argument::interceptor_paramlist (Dynamic::ParameterList *lst)
   {
     const CORBA::ULong len = this->x_->count ();
-    list->length (len);
+    lst->length (len);
 
     for (CORBA::ULong i = 0; i < len; ++i)
       {
-        (*list)[i].argument <<= *this->x_->item (i)->value ();
+        if (!this->x_->item (i)->value ())
+          return;
+
+        (*lst)[i].argument.replace (
+          this->x_->item (i)->value ()->impl ());
 
         switch (this->x_->item (i)->flags ())
           {
           case CORBA::ARG_IN:
             {
-              (*list)[i].mode = CORBA::PARAM_IN;
+              (*lst)[i].mode = CORBA::PARAM_IN;
               break;
             }
           case CORBA::ARG_INOUT:
             {
-              (*list)[i].mode = CORBA::PARAM_INOUT;
+              (*lst)[i].mode = CORBA::PARAM_INOUT;
               break;
             }
           case CORBA::ARG_OUT:
             {
-              (*list)[i].mode = CORBA::PARAM_OUT;
+              (*lst)[i].mode = CORBA::PARAM_OUT;
               break;
             }
           default:
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 4e96ad4bff2..d0ebbf90dd9 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -106,8 +106,6 @@ namespace TAO
                              cdr.start ()->length (),
                              0);
 
-
-
     // Pull the exception ID out of the marshaling buffer.
     if (tmp_stream.read_string (buf.inout ()) == 0)
       {
@@ -138,8 +136,7 @@ namespace TAO
           ACE_NEW_RETURN (unk,
                           TAO::Unknown_IDL_Type (
                               tc.in (),
-                              cdr.start (),
-                              cdr.byte_order ()
+                              cdr
                             ),
                           TAO_INVOKE_FAILURE);
 
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 5db27983422..b84b24dbb3b 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -38,6 +38,9 @@
 #include "tao/Sequence.h"
 #include "tao/CDR.h"
 
+#include "ace/SString.h"
+
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
diff --git a/TAO/tao/Dynamic_Parameter.pidl b/TAO/tao/Dynamic_Parameter.pidl
index 967726e1f46..ebd34801121 100644
--- a/TAO/tao/Dynamic_Parameter.pidl
+++ b/TAO/tao/Dynamic_Parameter.pidl
@@ -26,11 +26,11 @@
 // Piece of module Dynamic generated separately for use by
 // template argument helper classes.
 
-#include <orb.idl>
-
 #ifndef _DYNAMIC_PARAMETER_IDL_
 #define _DYNAMIC_PARAMETER_IDL_
 
+#include <ParameterMode.pidl>
+
 module Dynamic
 {
   struct Parameter
diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp
index e6c2c3cc0c5..1b8a1e17db2 100644
--- a/TAO/tao/Dynamic_ParameterA.cpp
+++ b/TAO/tao/Dynamic_ParameterA.cpp
@@ -27,68 +27,70 @@
 
 #include "Dynamic_ParameterC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_Dynamic_Parameter[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x44796e61),
-  ACE_NTOHL (0x6d69632f),
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d69632f), 
+  ACE_NTOHL (0x50617261), 
+  ACE_NTOHL (0x6d657465), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
     10,
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x50617261), 
+  ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x72000000),  // name = Parameter
   2, // member count
     9,
-  ACE_NTOHL (0x61726775),
-  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x61726775), 
+  ACE_NTOHL (0x6d656e74), 
   ACE_NTOHL (0x0),  // name = argument
     CORBA::tk_any,
 
   5,
-  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5061),
-    ACE_NTOHL (0x72616d65),
-    ACE_NTOHL (0x7465724d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5061), 
+    ACE_NTOHL (0x72616d65), 
+    ACE_NTOHL (0x7465724d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
     14,
-    ACE_NTOHL (0x50617261),
-    ACE_NTOHL (0x6d657465),
-    ACE_NTOHL (0x724d6f64),
+    ACE_NTOHL (0x50617261), 
+    ACE_NTOHL (0x6d657465), 
+    ACE_NTOHL (0x724d6f64), 
     ACE_NTOHL (0x65000000),  // name = ParameterMode
     3, // member count
     9,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x50415241), 
+    ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x0),  // name = PARAM_IN
     10,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f4f55),
+    ACE_NTOHL (0x50415241), 
+    ACE_NTOHL (0x4d5f4f55), 
     ACE_NTOHL (0x54000000),  // name = PARAM_OUT
     12,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x50415241), 
+    ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
@@ -96,7 +98,7 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
     sizeof (_oc_Dynamic_Parameter),
     (char *) &_oc_Dynamic_Parameter,
     0,
-    sizeof (Dynamic::Parameter)
+    0
   );
 
 namespace Dynamic
@@ -105,7 +107,7 @@ namespace Dynamic
     &_tc_TAO_tc_Dynamic_Parameter;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -142,8 +144,8 @@ CORBA::Boolean operator>>= (
     Dynamic::Parameter *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const Dynamic::Parameter *&,
+  return _tao_any >>= const_cast<
+      const Dynamic::Parameter *&> (
       _tao_elem
     );
 }
@@ -163,8 +165,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -179,5 +179,4 @@ CORBA::Boolean operator>>= (
         Dynamic::Parameter \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp
index 9929690a4f9..b1af4faf993 100644
--- a/TAO/tao/Dynamic_ParameterC.cpp
+++ b/TAO/tao/Dynamic_ParameterC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Dynamic_ParameterC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Dynamic_ParameterC.i"
+#include "Dynamic_ParameterC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -59,7 +58,7 @@ Dynamic::Parameter::_tao_any_destructor (
   )
 {
   Parameter *_tao_tmp_pointer =
-    ACE_static_cast (Parameter *, _tao_void_pointer);
+    static_cast<Parameter *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -87,7 +86,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -126,4 +125,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h
index e740dbb6ca5..bdf8ff3f262 100644
--- a/TAO/tao/Dynamic_ParameterC.h
+++ b/TAO/tao/Dynamic_ParameterC.h
@@ -26,24 +26,28 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
 #define _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ParameterMode.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Any.h"
 #include "tao/VarOut_T.h"
 
+#include "tao/ParameterModeC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -57,9 +61,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -72,40 +74,40 @@
 
 namespace Dynamic
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Parameter;
-  
+
   typedef
     TAO_Var_Var_T<
         Parameter
       >
     Parameter_var;
-  
+
   typedef
     TAO_Out_T<
         Parameter,
         Parameter_var
       >
     Parameter_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export Parameter
   {
     typedef Parameter_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::Any argument;
     CORBA::ParameterMode mode;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter;
 
 // TAO_IDL - Generated from
@@ -136,13 +138,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "Dynamic_ParameterC.i"
+#include "Dynamic_ParameterC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -154,3 +156,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Dynamic_ParameterC.i b/TAO/tao/Dynamic_ParameterC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Dynamic_ParameterC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
index 88dad57dc35..4e214943836 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -109,14 +109,6 @@ protected:
   /// Cache the hash value
   CORBA::ULong hash_val_;
 
-private:
-
-  /// Endpoints should not be copied.
-  ACE_UNIMPLEMENTED_FUNC (TAO_Endpoint (const TAO_Endpoint&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Endpoint&))
-
-private:
-
   /// IOP tag, identifying the protocol for which this endpoint
   /// contains addressing info.
   CORBA::ULong tag_;
@@ -128,6 +120,11 @@ private:
    */
   CORBA::Short priority_;
 
+private:
+
+  /// Endpoints should not be copied.
+  ACE_UNIMPLEMENTED_FUNC (TAO_Endpoint (const TAO_Endpoint&))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Endpoint&))
 };
 
 
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 9a6cff3dd5c..5c3ac5d7a07 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -44,15 +44,9 @@ class ACE_Allocator;
 class TAO_OutputCDR;
 class TAO_InputCDR;
 
-#if defined (__Lynx__)
-
-// LynxOS uses macro THREAD_CANCELLED internally, so it must
-// be undefined to avoid compilation errors
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
-
-#endif /*__Lynx__ */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 // This is already done in orbconf.h. But this file is totally
 // decoupled from its contents that we have to do this here. Including
diff --git a/TAO/tao/FloatSeq.pidl b/TAO/tao/FloatSeq.pidl
index 2f315a21ae1..efebc5880b5 100644
--- a/TAO/tao/FloatSeq.pidl
+++ b/TAO/tao/FloatSeq.pidl
@@ -18,9 +18,9 @@
  *
  * and then:
  *
- * cp orig/FloatSeqC.{h,i,cpp} .
+ * cp orig/FloatSeqC.{h,inl,cpp} .
  *
- * The code left in FloatSeqC.{h,i,cpp} is ready for use.
+ * The code left in FloatSeqC.{h,inl,cpp} is ready for use.
  */
 // ================================================================
 
diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp
index ba36fa52e1b..18bea7d535e 100644
--- a/TAO/tao/FloatSeqA.cpp
+++ b/TAO/tao/FloatSeqA.cpp
@@ -27,26 +27,28 @@
 
 #include "FloatSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_FloatSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f466c),
-  ACE_NTOHL (0x6f617453),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f466c), 
+  ACE_NTOHL (0x6f617453), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/FloatSeq:1.0
     9,
-  ACE_NTOHL (0x466c6f61),
-  ACE_NTOHL (0x74536571),
+  ACE_NTOHL (0x466c6f61), 
+  ACE_NTOHL (0x74536571), 
   ACE_NTOHL (0x0),  // name = FloatSeq
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -62,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_FloatSeq (
     sizeof (_oc_CORBA_FloatSeq),
     (char *) &_oc_CORBA_FloatSeq,
     0,
-    sizeof (CORBA::FloatSeq)
+    0
   );
 
 namespace CORBA
@@ -71,7 +73,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_FloatSeq;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -108,8 +110,8 @@ CORBA::Boolean operator>>= (
     CORBA::FloatSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::FloatSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::FloatSeq *&> (
       _tao_elem
     );
 }
@@ -129,8 +131,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -145,5 +145,4 @@ CORBA::Boolean operator>>= (
         CORBA::FloatSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp
index 09cd1776e26..85598376a00 100644
--- a/TAO/tao/FloatSeqC.cpp
+++ b/TAO/tao/FloatSeqC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "FloatSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "FloatSeqC.i"
+#include "FloatSeqC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -97,7 +96,7 @@ void CORBA::FloatSeq::_tao_any_destructor (
   )
 {
   FloatSeq * _tao_tmp_pointer =
-    ACE_static_cast (FloatSeq *, _tao_void_pointer);
+    static_cast<FloatSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -114,7 +113,7 @@ CORBA::Boolean operator<< (
     const CORBA::FloatSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_FloatSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h
index 9f504dd44bc..c76ef31fdcd 100644
--- a/TAO/tao/FloatSeqC.h
+++ b/TAO/tao/FloatSeqC.h
@@ -26,20 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_FLOATSEQC_H_
 #define _TAO_IDL_ORIG_FLOATSEQC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
@@ -58,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -166,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_FloatSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "FloatSeqC.i"
+#include "FloatSeqC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -184,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/FloatSeqC.i b/TAO/tao/FloatSeqC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/FloatSeqC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/GIOPA.cpp b/TAO/tao/GIOPA.cpp
index 3ff72931a70..245cc9f4ab3 100644
--- a/TAO/tao/GIOPA.cpp
+++ b/TAO/tao/GIOPA.cpp
@@ -27,32 +27,34 @@
 
 #include "GIOPC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_GIOP_AddressingDisposition[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f416464),
-  ACE_NTOHL (0x72657373),
-  ACE_NTOHL (0x696e6744),
-  ACE_NTOHL (0x6973706f),
-  ACE_NTOHL (0x73697469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f416464), 
+  ACE_NTOHL (0x72657373), 
+  ACE_NTOHL (0x696e6744), 
+  ACE_NTOHL (0x6973706f), 
+  ACE_NTOHL (0x73697469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/AddressingDisposition:1.0
     22,
-  ACE_NTOHL (0x41646472),
-  ACE_NTOHL (0x65737369),
-  ACE_NTOHL (0x6e674469),
-  ACE_NTOHL (0x73706f73),
-  ACE_NTOHL (0x6974696f),
+  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x65737369), 
+  ACE_NTOHL (0x6e674469), 
+  ACE_NTOHL (0x73706f73), 
+  ACE_NTOHL (0x6974696f), 
   ACE_NTOHL (0x6e000000),  // name = AddressingDisposition
     CORBA::tk_short,
 
@@ -63,7 +65,7 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_AddressingDisposition (
     sizeof (_oc_GIOP_AddressingDisposition),
     (char *) &_oc_GIOP_AddressingDisposition,
     0,
-    sizeof (GIOP::AddressingDisposition)
+    0
   );
 
 namespace GIOP
@@ -73,31 +75,31 @@ namespace GIOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_GIOP_Version[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f566572),
-  ACE_NTOHL (0x73696f6e),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f566572), 
+  ACE_NTOHL (0x73696f6e), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/GIOP/Version:1.0
     8,
-  ACE_NTOHL (0x56657273),
+  ACE_NTOHL (0x56657273), 
   ACE_NTOHL (0x696f6e00),  // name = Version
   2, // member count
     6,
-  ACE_NTOHL (0x6d616a6f),
+  ACE_NTOHL (0x6d616a6f), 
   ACE_NTOHL (0x72000000),  // name = major
     CORBA::tk_octet,
 
   6,
-  ACE_NTOHL (0x6d696e6f),
+  ACE_NTOHL (0x6d696e6f), 
   ACE_NTOHL (0x72000000),  // name = minor
     CORBA::tk_octet,
 
@@ -108,7 +110,7 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_Version (
     sizeof (_oc_GIOP_Version),
     (char *) &_oc_GIOP_Version,
     0,
-    sizeof (GIOP::Version)
+    0
   );
 
 namespace GIOP
@@ -118,35 +120,35 @@ namespace GIOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f494f52),
-  ACE_NTOHL (0x41646472),
-  ACE_NTOHL (0x65737369),
-  ACE_NTOHL (0x6e67496e),
-  ACE_NTOHL (0x666f3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f494f52), 
+  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x65737369), 
+  ACE_NTOHL (0x6e67496e), 
+  ACE_NTOHL (0x666f3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
     18,
-  ACE_NTOHL (0x494f5241),
-  ACE_NTOHL (0x64647265),
-  ACE_NTOHL (0x7373696e),
-  ACE_NTOHL (0x67496e66),
+  ACE_NTOHL (0x494f5241), 
+  ACE_NTOHL (0x64647265), 
+  ACE_NTOHL (0x7373696e), 
+  ACE_NTOHL (0x67496e66), 
   ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
   2, // member count
     23,
-  ACE_NTOHL (0x73656c65),
-  ACE_NTOHL (0x63746564),
-  ACE_NTOHL (0x5f70726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x5f696e64),
+  ACE_NTOHL (0x73656c65), 
+  ACE_NTOHL (0x63746564), 
+  ACE_NTOHL (0x5f70726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x5f696e64), 
   ACE_NTOHL (0x65780000),  // name = selected_profile_index
     CORBA::tk_ulong,
 
@@ -156,43 +158,43 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
   432, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     24,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x494f523a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x494f523a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
         4,
     ACE_NTOHL (0x494f5200),  // name = IOR
     2, // member count
         8,
-    ACE_NTOHL (0x74797065),
+    ACE_NTOHL (0x74797065), 
     ACE_NTOHL (0x5f696400),  // name = type_id
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
     9,
-    ACE_NTOHL (0x70726f66),
-    ACE_NTOHL (0x696c6573),
+    ACE_NTOHL (0x70726f66), 
+    ACE_NTOHL (0x696c6573), 
     ACE_NTOHL (0x0),  // name = profiles
         CORBA::tk_alias, // typecode kind for typedefs
     344, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       37,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x65645072),
-      ACE_NTOHL (0x6f66696c),
-      ACE_NTOHL (0x65536571),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x65645072), 
+      ACE_NTOHL (0x6f66696c), 
+      ACE_NTOHL (0x65536571), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
             17,
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x65645072),
-      ACE_NTOHL (0x6f66696c),
-      ACE_NTOHL (0x65536571),
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x65645072), 
+      ACE_NTOHL (0x6f66696c), 
+      ACE_NTOHL (0x65536571), 
       ACE_NTOHL (0x0),  // name = TaggedProfileSeq
             CORBA::tk_sequence, // typecode kind
       264, // encapsulation length
@@ -201,19 +203,19 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
         248, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x494f502f),
-          ACE_NTOHL (0x54616767),
-          ACE_NTOHL (0x65645072),
-          ACE_NTOHL (0x6f66696c),
-          ACE_NTOHL (0x653a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x494f502f), 
+          ACE_NTOHL (0x54616767), 
+          ACE_NTOHL (0x65645072), 
+          ACE_NTOHL (0x6f66696c), 
+          ACE_NTOHL (0x653a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
                     14,
-          ACE_NTOHL (0x54616767),
-          ACE_NTOHL (0x65645072),
-          ACE_NTOHL (0x6f66696c),
+          ACE_NTOHL (0x54616767), 
+          ACE_NTOHL (0x65645072), 
+          ACE_NTOHL (0x6f66696c), 
           ACE_NTOHL (0x65000000),  // name = TaggedProfile
           2, // member count
                     4,
@@ -222,41 +224,41 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
           60, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             30,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x494f502f),
-            ACE_NTOHL (0x50726f66),
-            ACE_NTOHL (0x696c6549),
-            ACE_NTOHL (0x643a312e),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x494f502f), 
+            ACE_NTOHL (0x50726f66), 
+            ACE_NTOHL (0x696c6549), 
+            ACE_NTOHL (0x643a312e), 
             ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
                         10,
-            ACE_NTOHL (0x50726f66),
-            ACE_NTOHL (0x696c6549),
+            ACE_NTOHL (0x50726f66), 
+            ACE_NTOHL (0x696c6549), 
             ACE_NTOHL (0x64000000),  // name = ProfileId
                         CORBA::tk_ulong,
 
 
           13,
-          ACE_NTOHL (0x70726f66),
-          ACE_NTOHL (0x696c655f),
-          ACE_NTOHL (0x64617461),
+          ACE_NTOHL (0x70726f66), 
+          ACE_NTOHL (0x696c655f), 
+          ACE_NTOHL (0x64617461), 
           ACE_NTOHL (0x0),  // name = profile_data
                     CORBA::tk_alias, // typecode kind for typedefs
           76, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             31,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f4f63),
-            ACE_NTOHL (0x74657453),
-            ACE_NTOHL (0x65713a31),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f4f63), 
+            ACE_NTOHL (0x74657453), 
+            ACE_NTOHL (0x65713a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
                         9,
-            ACE_NTOHL (0x4f637465),
-            ACE_NTOHL (0x74536571),
+            ACE_NTOHL (0x4f637465), 
+            ACE_NTOHL (0x74536571), 
             ACE_NTOHL (0x0),  // name = OctetSeq
                         CORBA::tk_sequence, // typecode kind
             12, // encapsulation length
@@ -278,7 +280,7 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_IORAddressingInfo (
     sizeof (_oc_GIOP_IORAddressingInfo),
     (char *) &_oc_GIOP_IORAddressingInfo,
     0,
-    sizeof (GIOP::IORAddressingInfo)
+    0
   );
 
 namespace GIOP
@@ -288,25 +290,25 @@ namespace GIOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_GIOP_TargetAddress[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x2f546172),
-  ACE_NTOHL (0x67657441),
-  ACE_NTOHL (0x64647265),
-  ACE_NTOHL (0x73733a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x2f546172), 
+  ACE_NTOHL (0x67657441), 
+  ACE_NTOHL (0x64647265), 
+  ACE_NTOHL (0x73733a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/TargetAddress:1.0
   14,
-  ACE_NTOHL (0x54617267),
-  ACE_NTOHL (0x65744164),
-  ACE_NTOHL (0x64726573),
+  ACE_NTOHL (0x54617267), 
+  ACE_NTOHL (0x65744164), 
+  ACE_NTOHL (0x64726573), 
   ACE_NTOHL (0x73000000),  // name = TargetAddress
     CORBA::tk_short,
 
@@ -314,24 +316,24 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
   3, // member count
     ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value)
   11,
-  ACE_NTOHL (0x6f626a65),
-  ACE_NTOHL (0x63745f6b),
+  ACE_NTOHL (0x6f626a65), 
+  ACE_NTOHL (0x63745f6b), 
   ACE_NTOHL (0x65790000),  // name = object_key
     CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
         9,
-    ACE_NTOHL (0x4f637465),
-    ACE_NTOHL (0x74536571),
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
     ACE_NTOHL (0x0),  // name = OctetSeq
         CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
@@ -343,25 +345,25 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
 
   ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value)
   8,
-  ACE_NTOHL (0x70726f66),
+  ACE_NTOHL (0x70726f66), 
   ACE_NTOHL (0x696c6500),  // name = profile
     CORBA::tk_struct, // typecode kind
   248, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x54616767),
-    ACE_NTOHL (0x65645072),
-    ACE_NTOHL (0x6f66696c),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
         14,
-    ACE_NTOHL (0x54616767),
-    ACE_NTOHL (0x65645072),
-    ACE_NTOHL (0x6f66696c),
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
     ACE_NTOHL (0x65000000),  // name = TaggedProfile
     2, // member count
         4,
@@ -370,41 +372,41 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
     60, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       30,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x50726f66),
-      ACE_NTOHL (0x696c6549),
-      ACE_NTOHL (0x643a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x50726f66), 
+      ACE_NTOHL (0x696c6549), 
+      ACE_NTOHL (0x643a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
             10,
-      ACE_NTOHL (0x50726f66),
-      ACE_NTOHL (0x696c6549),
+      ACE_NTOHL (0x50726f66), 
+      ACE_NTOHL (0x696c6549), 
       ACE_NTOHL (0x64000000),  // name = ProfileId
             CORBA::tk_ulong,
 
 
     13,
-    ACE_NTOHL (0x70726f66),
-    ACE_NTOHL (0x696c655f),
-    ACE_NTOHL (0x64617461),
+    ACE_NTOHL (0x70726f66), 
+    ACE_NTOHL (0x696c655f), 
+    ACE_NTOHL (0x64617461), 
     ACE_NTOHL (0x0),  // name = profile_data
         CORBA::tk_alias, // typecode kind for typedefs
     76, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       31,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4f63),
-      ACE_NTOHL (0x74657453),
-      ACE_NTOHL (0x65713a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4f63), 
+      ACE_NTOHL (0x74657453), 
+      ACE_NTOHL (0x65713a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
             9,
-      ACE_NTOHL (0x4f637465),
-      ACE_NTOHL (0x74536571),
+      ACE_NTOHL (0x4f637465), 
+      ACE_NTOHL (0x74536571), 
       ACE_NTOHL (0x0),  // name = OctetSeq
             CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
@@ -422,29 +424,29 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
   556, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x47494f50),
-    ACE_NTOHL (0x2f494f52),
-    ACE_NTOHL (0x41646472),
-    ACE_NTOHL (0x65737369),
-    ACE_NTOHL (0x6e67496e),
-    ACE_NTOHL (0x666f3a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x47494f50), 
+    ACE_NTOHL (0x2f494f52), 
+    ACE_NTOHL (0x41646472), 
+    ACE_NTOHL (0x65737369), 
+    ACE_NTOHL (0x6e67496e), 
+    ACE_NTOHL (0x666f3a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0
         18,
-    ACE_NTOHL (0x494f5241),
-    ACE_NTOHL (0x64647265),
-    ACE_NTOHL (0x7373696e),
-    ACE_NTOHL (0x67496e66),
+    ACE_NTOHL (0x494f5241), 
+    ACE_NTOHL (0x64647265), 
+    ACE_NTOHL (0x7373696e), 
+    ACE_NTOHL (0x67496e66), 
     ACE_NTOHL (0x6f000000),  // name = IORAddressingInfo
     2, // member count
         23,
-    ACE_NTOHL (0x73656c65),
-    ACE_NTOHL (0x63746564),
-    ACE_NTOHL (0x5f70726f),
-    ACE_NTOHL (0x66696c65),
-    ACE_NTOHL (0x5f696e64),
+    ACE_NTOHL (0x73656c65), 
+    ACE_NTOHL (0x63746564), 
+    ACE_NTOHL (0x5f70726f), 
+    ACE_NTOHL (0x66696c65), 
+    ACE_NTOHL (0x5f696e64), 
     ACE_NTOHL (0x65780000),  // name = selected_profile_index
         CORBA::tk_ulong,
 
@@ -454,43 +456,43 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
     432, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       24,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x494f523a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x494f523a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
             4,
       ACE_NTOHL (0x494f5200),  // name = IOR
       2, // member count
             8,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x5f696400),  // name = type_id
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       9,
-      ACE_NTOHL (0x70726f66),
-      ACE_NTOHL (0x696c6573),
+      ACE_NTOHL (0x70726f66), 
+      ACE_NTOHL (0x696c6573), 
       ACE_NTOHL (0x0),  // name = profiles
             CORBA::tk_alias, // typecode kind for typedefs
       344, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         37,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x54616767),
-        ACE_NTOHL (0x65645072),
-        ACE_NTOHL (0x6f66696c),
-        ACE_NTOHL (0x65536571),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
+        ACE_NTOHL (0x65536571), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
                 17,
-        ACE_NTOHL (0x54616767),
-        ACE_NTOHL (0x65645072),
-        ACE_NTOHL (0x6f66696c),
-        ACE_NTOHL (0x65536571),
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
+        ACE_NTOHL (0x65536571), 
         ACE_NTOHL (0x0),  // name = TaggedProfileSeq
                 CORBA::tk_sequence, // typecode kind
         264, // encapsulation length
@@ -499,19 +501,19 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
           248, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             34,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x494f502f),
-            ACE_NTOHL (0x54616767),
-            ACE_NTOHL (0x65645072),
-            ACE_NTOHL (0x6f66696c),
-            ACE_NTOHL (0x653a312e),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x494f502f), 
+            ACE_NTOHL (0x54616767), 
+            ACE_NTOHL (0x65645072), 
+            ACE_NTOHL (0x6f66696c), 
+            ACE_NTOHL (0x653a312e), 
             ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
                         14,
-            ACE_NTOHL (0x54616767),
-            ACE_NTOHL (0x65645072),
-            ACE_NTOHL (0x6f66696c),
+            ACE_NTOHL (0x54616767), 
+            ACE_NTOHL (0x65645072), 
+            ACE_NTOHL (0x6f66696c), 
             ACE_NTOHL (0x65000000),  // name = TaggedProfile
             2, // member count
                         4,
@@ -520,41 +522,41 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
             60, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               30,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x494f502f),
-              ACE_NTOHL (0x50726f66),
-              ACE_NTOHL (0x696c6549),
-              ACE_NTOHL (0x643a312e),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x494f502f), 
+              ACE_NTOHL (0x50726f66), 
+              ACE_NTOHL (0x696c6549), 
+              ACE_NTOHL (0x643a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
                             10,
-              ACE_NTOHL (0x50726f66),
-              ACE_NTOHL (0x696c6549),
+              ACE_NTOHL (0x50726f66), 
+              ACE_NTOHL (0x696c6549), 
               ACE_NTOHL (0x64000000),  // name = ProfileId
                             CORBA::tk_ulong,
 
 
             13,
-            ACE_NTOHL (0x70726f66),
-            ACE_NTOHL (0x696c655f),
-            ACE_NTOHL (0x64617461),
+            ACE_NTOHL (0x70726f66), 
+            ACE_NTOHL (0x696c655f), 
+            ACE_NTOHL (0x64617461), 
             ACE_NTOHL (0x0),  // name = profile_data
                         CORBA::tk_alias, // typecode kind for typedefs
             76, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               31,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4f63),
-              ACE_NTOHL (0x74657453),
-              ACE_NTOHL (0x65713a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4f63), 
+              ACE_NTOHL (0x74657453), 
+              ACE_NTOHL (0x65713a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
                             9,
-              ACE_NTOHL (0x4f637465),
-              ACE_NTOHL (0x74536571),
+              ACE_NTOHL (0x4f637465), 
+              ACE_NTOHL (0x74536571), 
               ACE_NTOHL (0x0),  // name = OctetSeq
                             CORBA::tk_sequence, // typecode kind
               12, // encapsulation length
@@ -577,7 +579,7 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_TargetAddress (
     sizeof (_oc_GIOP_TargetAddress),
     (char *) &_oc_GIOP_TargetAddress,
     0,
-    sizeof (GIOP::TargetAddress)
+    0
   );
 
 namespace GIOP
@@ -586,7 +588,7 @@ namespace GIOP
     &_tc_TAO_tc_GIOP_TargetAddress;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -623,8 +625,8 @@ CORBA::Boolean operator>>= (
     GIOP::Version *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const GIOP::Version *&,
+  return _tao_any >>= const_cast<
+      const GIOP::Version *&> (
       _tao_elem
     );
 }
@@ -644,7 +646,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -681,8 +683,8 @@ CORBA::Boolean operator>>= (
     GIOP::IORAddressingInfo *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const GIOP::IORAddressingInfo *&,
+  return _tao_any >>= const_cast<
+      const GIOP::IORAddressingInfo *&> (
       _tao_elem
     );
 }
@@ -702,7 +704,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_union/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -739,8 +741,8 @@ CORBA::Boolean operator>>= (
     GIOP::TargetAddress *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const GIOP::TargetAddress *&,
+  return _tao_any >>= const_cast<
+      const GIOP::TargetAddress *&> (
       _tao_elem
     );
 }
@@ -760,8 +762,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -796,5 +796,4 @@ CORBA::Boolean operator>>= (
         GIOP::TargetAddress \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 60d228acfeb..776a61162c4 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -26,12 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "GIOPC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -39,11 +39,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "GIOPC.i"
+#include "GIOPC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -60,7 +60,7 @@ GIOP::Version::_tao_any_destructor (
   )
 {
   Version *_tao_tmp_pointer =
-    ACE_static_cast (Version *, _tao_void_pointer);
+    static_cast<Version *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -73,7 +73,7 @@ GIOP::IORAddressingInfo::_tao_any_destructor (
   )
 {
   IORAddressingInfo *_tao_tmp_pointer =
-    ACE_static_cast (IORAddressingInfo *, _tao_void_pointer);
+    static_cast<IORAddressingInfo *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -84,7 +84,7 @@ GIOP::TargetAddress::TargetAddress (void)
 {
   ACE_OS::memset (&this->disc_, 0, sizeof (this->disc_));
   ACE_OS::memset (&this->u_, 0, sizeof (this->u_));
-  this->disc_ = 0;
+  this->disc_ = -32768;
 }
 
 GIOP::TargetAddress::TargetAddress (const ::GIOP::TargetAddress &u)
@@ -151,7 +151,7 @@ GIOP::TargetAddress::~TargetAddress (void)
 void GIOP::TargetAddress::_tao_any_destructor (void *_tao_void_pointer)
 {
   TargetAddress *tmp =
-    ACE_static_cast (TargetAddress *, _tao_void_pointer);
+    static_cast<TargetAddress *> (_tao_void_pointer);
   delete tmp;
 }
 
@@ -228,6 +228,7 @@ void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
 {
   switch (this->disc_)
   {
+    
     case 0:
       delete this->u_.object_key_;
       this->u_.object_key_ = 0;
@@ -241,7 +242,7 @@ void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
       this->u_.ior_ = 0;
       break;
     default:
-      break;
+    break;
   }
 }
 
@@ -390,7 +391,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -481,4 +482,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index 7d8feec8158..fdc8914d3a8 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -26,23 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_GIOPC_H_
 #define _TAO_IDL_ORIG_GIOPC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/IOP_IORC.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/VarOut_T.h"
 
+#include "tao/IOPC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -57,9 +61,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -72,111 +74,111 @@
 
 namespace GIOP
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AddressingDisposition;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::Short KeyAddr = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::Short ProfileAddr = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::Short ReferenceAddr = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct Version;
-
+  
   typedef
     TAO_Fixed_Var_T<
         Version
       >
     Version_var;
-
+  
   typedef
     Version &
     Version_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_Export Version
   {
     typedef Version_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::Octet major;
     CORBA::Octet minor;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct IORAddressingInfo;
-
+  
   typedef
     TAO_Var_Var_T<
         IORAddressingInfo
       >
     IORAddressingInfo_var;
-
+  
   typedef
     TAO_Out_T<
         IORAddressingInfo,
         IORAddressingInfo_var
       >
     IORAddressingInfo_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_Export IORAddressingInfo
   {
     typedef IORAddressingInfo_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::ULong selected_profile_index;
     IOP::IOR ior;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORAddressingInfo;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   class TargetAddress;
-
+  
   typedef
     TAO_Var_Var_T<
         TargetAddress
       >
     TargetAddress_var;
-
+  
   typedef
     TAO_Out_T<
         TargetAddress,
@@ -186,7 +188,7 @@ namespace GIOP
 
 #if !defined (_GIOP_TARGETADDRESS_CH_)
 #define _GIOP_TARGETADDRESS_CH_
-
+  
   class TAO_Export TargetAddress
   {
   public:
@@ -194,69 +196,69 @@ namespace GIOP
     TargetAddress (const TargetAddress &);
     ~TargetAddress (void);
     static void _tao_any_destructor (void*);
-
+    
     TargetAddress &operator= (const TargetAddress &);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_union/discriminant_ch.cpp:114
-
+    
     void _d (CORBA::Short);
     CORBA::Short _d (void) const;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_union/union_ch.cpp:108
-
+    
     typedef TargetAddress_var _var_type;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_union_branch/public_ch.cpp:507
-
+    // be\be_visitor_union_branch/public_ch.cpp:514
+    
     void object_key (const CORBA::OctetSeq &);
     const CORBA::OctetSeq &object_key (void) const;
     CORBA::OctetSeq &object_key (void);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_union_branch/public_ch.cpp:615
-
+    // be\be_visitor_union_branch/public_ch.cpp:622
+    
     void profile (const IOP::TaggedProfile &);
     const IOP::TaggedProfile &profile (void) const;
     IOP::TaggedProfile &profile (void);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_union_branch/public_ch.cpp:615
-
+    // be\be_visitor_union_branch/public_ch.cpp:622
+    
     void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
     const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
     ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_union/union_ch.cpp:142
-
+    
     void _default (void);
   private:
     CORBA::Short disc_;
     CORBA::Short holder_;
-
+    
     union
     {
       // TAO_IDL - Generated from
-      // be\be_visitor_union_branch/private_ch.cpp:407
+      // be\be_visitor_union_branch/private_ch.cpp:412
       CORBA::OctetSeq *object_key_;
       // TAO_IDL - Generated from
-      // be\be_visitor_union_branch/private_ch.cpp:482
+      // be\be_visitor_union_branch/private_ch.cpp:487
       IOP::TaggedProfile *profile_;
       // TAO_IDL - Generated from
-      // be\be_visitor_union_branch/private_ch.cpp:482
+      // be\be_visitor_union_branch/private_ch.cpp:487
       ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
     } u_;
-
+    
     // TAO extension - frees any allocated storage.
     void _reset (CORBA::Short, CORBA::Boolean /* finalize */);
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TargetAddress;
 
 #endif /* end #if !defined */
@@ -317,13 +319,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "GIOPC.i"
+#include "GIOPC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -334,3 +336,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/GIOPC.i b/TAO/tao/GIOPC.i
deleted file mode 100644
index b4e29742513..00000000000
--- a/TAO/tao/GIOPC.i
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_union/union_ci.cpp:51
-
-// *************************************************************
-// Inline operations for union GIOP::TargetAddress
-// *************************************************************
-
-// TAO_IDL - Generated from
-// be\be_visitor_union/discriminant_ci.cpp:164
-
-ACE_INLINE
-void 
-GIOP::TargetAddress::_default ()
-{
-  this->disc_ = -32768;
-}
-
-// Accessor to set the discriminant.
-ACE_INLINE
-void
-GIOP::TargetAddress::_d (CORBA::Short discval)
-{
-  this->disc_ = discval;
-}
-
-// Accessor to get the discriminant.
-ACE_INLINE
-CORBA::Short
-GIOP::TargetAddress::_d (void) const
-{
-  return this->disc_;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_union_branch/public_ci.cpp:875
-
-// Accessor to set the member.
-ACE_INLINE
-void
-GIOP::TargetAddress::object_key (const CORBA::OctetSeq &val)
-{
-  // Set the discriminant value.
-  this->_reset (0, 0);
-  this->disc_ = 0;
-  ACE_NEW (
-      this->u_.object_key_,
-      CORBA::OctetSeq (val)
-    );
-}
-
-// Readonly get method.
-ACE_INLINE
-const CORBA::OctetSeq &
-GIOP::TargetAddress::object_key (void) const
-{
-  return *this->u_.object_key_;
-}
-
-// Read/write get method.
-ACE_INLINE
-CORBA::OctetSeq &
-GIOP::TargetAddress::object_key (void)
-{
-  return *this->u_.object_key_;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_union_branch/public_ci.cpp:1184
-
-// Accessor to set the member.
-ACE_INLINE
-void
-GIOP::TargetAddress::profile (const IOP::TaggedProfile &val)
-{
-  // Set the discriminant value.
-  this->_reset (1, 0);
-  this->disc_ = 1;
-  ACE_NEW (
-      this->u_.profile_,
-      IOP::TaggedProfile (val)
-    );
-}
-
-// Readonly get method.
-ACE_INLINE
-const IOP::TaggedProfile &
-GIOP::TargetAddress::profile (void) const
-{
-  return *this->u_.profile_;
-}
-
-// Read/write get method.
-ACE_INLINE
-IOP::TaggedProfile &
-GIOP::TargetAddress::profile (void)
-{
-  return *this->u_.profile_;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_union_branch/public_ci.cpp:1184
-
-// Accessor to set the member.
-ACE_INLINE
-void
-GIOP::TargetAddress::ior (const GIOP::IORAddressingInfo &val)
-{
-  // Set the discriminant value.
-  this->_reset (2, 0);
-  this->disc_ = 2;
-  ACE_NEW (
-      this->u_.ior_,
-      GIOP::IORAddressingInfo (val)
-    );
-}
-
-// Readonly get method.
-ACE_INLINE
-const GIOP::IORAddressingInfo &
-GIOP::TargetAddress::ior (void) const
-{
-  return *this->u_.ior_;
-}
-
-// Read/write get method.
-ACE_INLINE
-GIOP::IORAddressingInfo &
-GIOP::TargetAddress::ior (void)
-{
-  return *this->u_.ior_;
-}
-
diff --git a/TAO/tao/GIOPS.cpp b/TAO/tao/GIOPS.cpp
deleted file mode 100644
index 5839715167a..00000000000
--- a/TAO/tao/GIOPS.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- C++ -*- $Id$ */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   GIOPS.cpp
-//
-// = DESCRIPTION
-//   Generated from GIOP.pidl
-//
-// ================================================================
-
-#include "GIOPS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "GIOPS.i"
-#endif /* !defined INLINE */
diff --git a/TAO/tao/GIOPS.h b/TAO/tao/GIOPS.h
index 03f6c039f20..2799c6ce3fb 100644
--- a/TAO/tao/GIOPS.h
+++ b/TAO/tao/GIOPS.h
@@ -1,31 +1,80 @@
-/* -*- C++ -*- $Id$ */
-//=============================================================================
-/**
- *  @file   GIOPS.h
- *
- *  $Id$
- *
- * Generated from GIOP.pidl
- * The file is almost empty and only present to keep other IDL files
- * that include GIOP.pidl happy.
- *
- */
-//=============================================================================
-
-#ifndef TAO_IDL_GIOP1_2S_H
-#define TAO_IDL_GIOP1_2S_H
+// -*- C++ -*-
+//
+// $Id$
 
-#include "GIOPC.h"
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_GIOPS_H_
+#define _TAO_IDL_ORIG_GIOPS_H_
+
+#include /**/ "ace/pre.h"
 
+#include "tao/IOPS.h"
+#include "GIOPC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/GIOPS_T.h"
 
-#if defined (__ACE_INLINE__)
-#include "GIOPS.i"
-#endif /* defined INLINE */
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_GIOP
+{
 
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module GIOP
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:999
+
+#include "GIOPS_T.h"
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/GIOPS.i b/TAO/tao/GIOPS.i
deleted file mode 100644
index 47159b11f78..00000000000
--- a/TAO/tao/GIOPS.i
+++ /dev/null
@@ -1 +0,0 @@
-/* -*- C++ -*- $Id$ */
diff --git a/TAO/tao/GIOPS_T.cpp b/TAO/tao/GIOPS_T.cpp
deleted file mode 100644
index 5c82fa9f66b..00000000000
--- a/TAO/tao/GIOPS_T.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- C++ -*- $Id$ */
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   GIOPS_T.h
-//
-// = DESCRIPTION
-//   Generated from GIOP.pidl
-//   The file is almost empty and only present to keep other IDL files
-//   that include GIOP.pidl happy.
-// ================================================================
-#ifndef TAO_IDL_GIOP1_2S_T_CPP
-#define TAO_IDL_GIOP1_2S_T_CPP
-
-#include "GIOPS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "GIOPS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/GIOPS_T.h b/TAO/tao/GIOPS_T.h
index 8253a169eaa..00b7bc96ea7 100644
--- a/TAO/tao/GIOPS_T.h
+++ b/TAO/tao/GIOPS_T.h
@@ -1,33 +1,58 @@
-/* -*- C++ -*- $Id$ */
-//=============================================================================
-/**
- *  @file   GIOPS_T.h
- *
- *  $Id$
- *
- * Generated from GIOP.pidl
- * The file is almost empty and only present to keep other IDL files
- * that include GIOP.pidl happy.
- *
- */
-//=============================================================================
-
-#ifndef TAO_IDL_GIOP1_2S_T_H
-#define TAO_IDL_GIOP1_2S_T_H
-
-
-#if defined (__ACE_INLINE__)
-#include "GIOPS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "GIOPS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("GIOPS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:547
+
+#ifndef _TAO_IDL_ORIG_GIOPS_T_H_
+#define _TAO_IDL_ORIG_GIOPS_T_H_
+
+#include /**/ "ace/pre.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root_sth.cpp:116
+
+namespace POA_GIOP
+{
+} // module GIOP
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1096
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/GIOPS_T.i b/TAO/tao/GIOPS_T.i
deleted file mode 100644
index 47159b11f78..00000000000
--- a/TAO/tao/GIOPS_T.i
+++ /dev/null
@@ -1 +0,0 @@
-/* -*- C++ -*- $Id$ */
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index dfdd5db0474..d37a4f06f15 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -13,21 +13,14 @@
 #include "Codeset_Manager.h"
 #include "SystemException.h"
 
-#if !defined (__ACE_INLINE__)
-# include "GIOP_Message_Base.i"
-#endif /* __ACE_INLINE__ */
-
-
 ACE_RCSID (tao,
            GIOP_Message_Base,
            "$Id$")
 
-
 TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
                                               size_t /*input_cdr_size*/)
   : orb_core_ (orb_core)
-    , message_state_ (orb_core,
-                      this)
+    , message_state_ ()
     , out_stream_ (this->buffer_,
                    sizeof this->buffer_, /* ACE_CDR::DEFAULT_BUFSIZE */
                    TAO_ENCAP_BYTE_ORDER,
@@ -46,7 +39,6 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
 
 TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base (void)
 {
-
 }
 
 
@@ -299,7 +291,7 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
 
 TAO_Pluggable_Message_Type
 TAO_GIOP_Message_Base::message_type (
-    TAO_GIOP_Message_State &msg_state)
+                         const TAO_GIOP_Message_State &msg_state) const
 {
   // Convert to the right type of Pluggable Messaging message type.
 
@@ -336,13 +328,7 @@ TAO_GIOP_Message_Base::message_type (
 int
 TAO_GIOP_Message_Base::parse_incoming_messages (ACE_Message_Block &incoming)
 {
-
-  if (this->message_state_.parse_message_header (incoming) == -1)
-    {
-      return -1;
-    }
-
-  return 0;
+  return this->message_state_.parse_message_header (incoming);
 }
 
 ssize_t
@@ -372,9 +358,6 @@ int
 TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
                                              TAO_Queued_Data *&qd)
 {
-  TAO_GIOP_Message_State state (this->orb_core_,
-                                this);
-
   if (incoming.length () < TAO_GIOP_MESSAGE_HEADER_LEN)
     {
       if (incoming.length () > 0)
@@ -391,6 +374,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
       return 0;
     }
 
+  TAO_GIOP_Message_State state;
   if (state.parse_message_header (incoming) == -1)
     {
       return -1;
@@ -402,8 +386,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
 
   if (copying_len > incoming.length ())
     {
-      qd->missing_data_ =
-        copying_len - incoming.length ();
+      qd->missing_data_ = copying_len - incoming.length ();
 
       copying_len = incoming.length ();
     }
@@ -412,10 +395,8 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
                         copying_len);
 
   incoming.rd_ptr (copying_len);
-  qd->byte_order_ = state.byte_order_;
-  qd->major_version_ = state.giop_version_.major;
-  qd->minor_version_ = state.giop_version_.minor;
-  qd->msg_type_ = this->message_type (state);
+  this->init_queued_data (qd, state);
+
   return 1;
 }
 
@@ -440,8 +421,7 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
       // Move the rd_ptr () in the incoming message block..
       incoming.rd_ptr (TAO_GIOP_MESSAGE_HEADER_LEN - len);
 
-      TAO_GIOP_Message_State state (this->orb_core_,
-                                    this);
+      TAO_GIOP_Message_State state;
 
       // Parse the message header now...
       if (state.parse_message_header (*qd->msg_block_) == -1)
@@ -457,16 +437,14 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
 
       // Copy the pay load..
       // Calculate the bytes that needs to be copied in the queue...
-      size_t copy_len =
-        state.payload_size ();
+      size_t copy_len = state.payload_size ();
 
       // If the data that needs to be copied is more than that is
       // available to us ..
       if (copy_len > incoming.length ())
         {
           // Calculate the missing data..
-          qd->missing_data_ =
-            copy_len - incoming.length ();
+          qd->missing_data_ = copy_len - incoming.length ();
 
           // Set the actual possible copy_len that is available...
           copy_len = incoming.length ();
@@ -485,10 +463,7 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
       incoming.rd_ptr (copy_len);
 
       // Get the other details...
-      qd->byte_order_ = state.byte_order_;
-      qd->major_version_ = state.giop_version_.major;
-      qd->minor_version_ = state.giop_version_.minor;
-      qd->msg_type_ = this->message_type (state);
+      this->init_queued_data (qd, state);
     }
   else
     {
@@ -498,8 +473,7 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
       if (copy_len > incoming.length ())
         {
           // Calculate the missing data..
-          qd->missing_data_ =
-            copy_len - incoming.length ();
+          qd->missing_data_ = copy_len - incoming.length ();
 
           // Set the actual possible copy_len that is available...
           copy_len = incoming.length ();
@@ -515,54 +489,6 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
 
     }
 
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Base::consolidate_fragments (TAO_Queued_Data *dqd,
-                                              const TAO_Queued_Data *sqd)
-{
-  if (dqd->byte_order_ != sqd->byte_order_
-      || dqd->major_version_ != sqd->major_version_
-      || dqd->minor_version_ != sqd->minor_version_)
-    {
-      // Yes, print it out in all debug levels!. This is an error by
-      // CORBA 2.4 spec
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) incompatible fragments:")
-                  ACE_TEXT ("different GIOP versions or byte order\n")));
-      return -1;
-    }
-
-  // Skip the header in the incoming message
-  sqd->msg_block_->rd_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
-
-  // If we have a fragment header skip the header length too..
-  if (sqd->minor_version_ == 2 &&
-      sqd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)
-    sqd->msg_block_->rd_ptr (TAO_GIOP_MESSAGE_FRAGMENT_HEADER);
-
-  // Get the length of the incoming message block..
-  size_t incoming_length =
-    sqd->msg_block_->length ();
-
-  // Increase the size of the destination message block if we need
-  // to.
-  ACE_Message_Block *mb =
-    dqd->msg_block_;
-
-  // Check space before growing.
-  if (mb->space () < incoming_length)
-    {
-      ACE_CDR::grow (mb,
-                     mb->length () + incoming_length);
-    }
-
-  // Copy the data
-  dqd->msg_block_->copy (sqd->msg_block_->rd_ptr (),
-                         incoming_length);
   return 0;
 }
 
@@ -570,22 +496,7 @@ void
 TAO_GIOP_Message_Base::get_message_data (TAO_Queued_Data *qd)
 {
   // Get the message information
-  qd->byte_order_ =
-    this->message_state_.byte_order_;
-  qd->major_version_ =
-    this->message_state_.giop_version_.major;
-  qd->minor_version_ =
-    this->message_state_.giop_version_.minor;
-
-  //qd->more_fragments_ = this->message_state_.more_fragments_;
-
-  if (this->message_state_.more_fragments_)
-    qd->more_fragments_ = 1;
-  else
-    qd->more_fragments_ = 0;
-
-  qd->msg_type_=
-    this->message_type (this->message_state_);
+  this->init_queued_data (qd, this->message_state_);
 
   // Reset the message_state
   this->message_state_.reset ();
@@ -594,7 +505,6 @@ TAO_GIOP_Message_Base::get_message_data (TAO_Queued_Data *qd)
 int
 TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
                                                 TAO_Queued_Data *qd)
-
 {
   // Set the upcall thread
   this->orb_core_->lf_strategy ().set_upcall_thread (this->orb_core_->leader_follower ());
@@ -608,15 +518,15 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
                    generator_parser);
 
   // A buffer that we will use to initialise the CDR stream
-#if defined (ACE_HAS_PURIFY)
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
   char repbuf[ACE_CDR::DEFAULT_BUFSIZE] = { 0 };
 #else
   char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#endif /* ACE_HAS_PURIFY */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
 
   // Initialze an output CDR on the stack
   // NOTE: Don't jump to a conclusion as to why we are using the
-  // inpout_cdr and hence the  global pool here. These pools will move
+  // input_cdr and hence the  global pool here. These pools will move
   // to the lanes anyway at some point of time. Further, it would have
   // been awesome to have this in TSS. But for some reason the cloning
   // that happens when the ORB gets flow controlled while writing a
@@ -829,7 +739,7 @@ TAO_GIOP_Message_Base::generate_exception_reply (
       // Close the handle.
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ")
-                  ACE_TEXT ("generate_exception_reply ()")));
+                  ACE_TEXT ("generate_exception_reply ()\n")));
       return -1;
     }
   ACE_ENDTRY;
@@ -839,7 +749,7 @@ TAO_GIOP_Message_Base::generate_exception_reply (
 }
 
 int
-TAO_GIOP_Message_Base::write_protocol_header (TAO_GIOP_Message_Type t,
+TAO_GIOP_Message_Base::write_protocol_header (TAO_GIOP_Message_Type type,
                                               TAO_OutputCDR &msg)
 {
   // Reset the message type
@@ -868,7 +778,7 @@ TAO_GIOP_Message_Base::write_protocol_header (TAO_GIOP_Message_Type t,
   // version info , Bala
   header[6] = (TAO_ENCAP_BYTE_ORDER ^ msg.do_byte_swap ());
 
-  header[7] = CORBA::Octet(t);
+  header[7] = CORBA::Octet(type);
 
   static int header_size = sizeof (header) / sizeof (header[0]);
   msg.write_octet_array (header, header_size);
@@ -1143,9 +1053,10 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
         {
           status_info.status = TAO_GIOP_OBJECT_FORWARD;
           status_info.forward_location_var = forward_to;
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                      ACE_TEXT ("called: forwarding\n")));
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
+                        ACE_TEXT ("called: forwarding\n")));
         }
       else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
         {
@@ -1303,7 +1214,7 @@ void
 TAO_GIOP_Message_Base::set_state (
     CORBA::Octet def_major,
     CORBA::Octet def_minor,
-    TAO_GIOP_Message_Generator_Parser *&gen_parser)
+    TAO_GIOP_Message_Generator_Parser *&gen_parser) const
 {
   switch (def_major)
     {
@@ -1312,15 +1223,18 @@ TAO_GIOP_Message_Base::set_state (
         {
         case 0:
           gen_parser =
-            &this->tao_giop_impl_.tao_giop_10;
+            const_cast<TAO_GIOP_Message_Generator_Parser_10 *> (
+                                     &this->tao_giop_impl_.tao_giop_10);
           break;
         case 1:
           gen_parser =
-            &this->tao_giop_impl_.tao_giop_11;
+            const_cast<TAO_GIOP_Message_Generator_Parser_11 *> (
+                                     &this->tao_giop_impl_.tao_giop_11);
           break;
         case 2:
           gen_parser =
-            &this->tao_giop_impl_.tao_giop_12;
+            const_cast<TAO_GIOP_Message_Generator_Parser_12 *> (
+                                     &this->tao_giop_impl_.tao_giop_12);
           break;
         default:
           break;
@@ -1497,7 +1411,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
       int byte_order = ptr[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01;
 
       // Get the version info
-      // CORBA::Octet major = ptr[TAO_GIOP_VERSION_MAJOR_OFFSET];
+      CORBA::Octet major = ptr[TAO_GIOP_VERSION_MAJOR_OFFSET];
       CORBA::Octet minor = ptr[TAO_GIOP_VERSION_MINOR_OFFSET];
 
       // request/reply id.
@@ -1508,7 +1422,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
       if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST ||
           ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY)
         {
-          if (minor < 2)
+          if (major == 1 && minor < 2)
             {
               // @@ Only works if ServiceContextList is empty....
               tmp_id = (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN  + 4);
@@ -1589,7 +1503,7 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz)
 {
   // Get a node for the queue..
   TAO_Queued_Data *qd =
-    TAO_Queued_Data::get_queued_data (
+    TAO_Queued_Data::make_queued_data (
       this->orb_core_->transport_message_buffer_allocator ());
 
   // @@todo: We have a similar method in Transport.cpp. Need to see how
@@ -1625,3 +1539,30 @@ TAO_GIOP_Message_Base::header_length (void) const
 {
   return TAO_GIOP_MESSAGE_HEADER_LEN;
 }
+
+size_t
+TAO_GIOP_Message_Base::fragment_header_length (CORBA::Octet major,
+                                               CORBA::Octet minor) const
+{
+  TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
+
+  // Get the state information that we need to use
+  this->set_state (major,
+                   minor,
+                   generator_parser);
+
+  return generator_parser->fragment_header_length ();
+}
+
+void
+TAO_GIOP_Message_Base::init_queued_data (
+                               TAO_Queued_Data* qd,
+                               const TAO_GIOP_Message_State& state) const
+{
+  qd->byte_order_     = state.byte_order_;
+  qd->major_version_  = state.giop_version_.major;
+  qd->minor_version_  = state.giop_version_.minor;
+  qd->more_fragments_ = state.more_fragments_;
+  qd->request_id_     = state.request_id_;
+  qd->msg_type_       = this->message_type (state);
+}
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index d4142a28fdc..52e0ff0fdad 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -94,6 +94,11 @@ public:
   virtual int format_message (TAO_OutputCDR &cdr);
 
   /// Parse the incoming messages..
+  ///
+  /// \return -1 There was some error parsing the GIOP header
+  /// \return 0  The GIOP header was parsed correctly
+  /// \return 1  There was not enough data in the message block to
+  ///            parse the header
   virtual int parse_incoming_messages (ACE_Message_Block &message_block);
 
   /// Calculate the amount of data that is missing in the <incoming>
@@ -114,10 +119,6 @@ public:
   /// Get the details of the message parsed through the @a qd.
   virtual void get_message_data (TAO_Queued_Data *qd);
 
-  /// @@Bala:Docu??
-  virtual int consolidate_fragments (TAO_Queued_Data *dqd,
-                                     const TAO_Queued_Data *sqd);
-
   /// Process the request message that we have received on the
   /// connection
   virtual int process_request_message (TAO_Transport *transport,
@@ -140,6 +141,10 @@ public:
   /// Header length
   virtual size_t header_length (void) const;
 
+  /// The header length of a fragment
+  virtual size_t fragment_header_length (CORBA::Octet major,
+                                         CORBA::Octet minor) const;
+
   virtual TAO_OutputCDR &out_stream (void);
 protected:
 
@@ -158,7 +163,7 @@ protected:
   /// Set the state
   void set_state (CORBA::Octet major,
                   CORBA::Octet minor,
-                  TAO_GIOP_Message_Generator_Parser *&);
+                  TAO_GIOP_Message_Generator_Parser *&) const;
 
   /// Print out a debug messages..
   void dump_msg (const char *label,
@@ -171,7 +176,8 @@ protected:
   /// TAO_PLUGGABLE_MESSAGE_REPLY,
   /// TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
   /// TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR.
-  TAO_Pluggable_Message_Type message_type (TAO_GIOP_Message_State &state);
+  TAO_Pluggable_Message_Type message_type (
+                               const TAO_GIOP_Message_State &state) const;
 
 private:
 
@@ -221,6 +227,11 @@ private:
   /// node of size @a sz.
   TAO_Queued_Data *make_queued_data (size_t sz);
 
+  /// Initialize the TAO_Queued_Data from the relevant portions of
+  /// a GIOP_Message_State.
+  void init_queued_data (TAO_Queued_Data* qd,
+                         const TAO_GIOP_Message_State& state) const;
+
 private:
   /// Cached ORB_Core pointer...
   TAO_ORB_Core *orb_core_;
@@ -241,9 +252,5 @@ protected:
   TAO_OutputCDR out_stream_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Base.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_GIOP_MESSAGE_BASE_H*/
diff --git a/TAO/tao/GIOP_Message_Base.i b/TAO/tao/GIOP_Message_Base.i
deleted file mode 100644
index a589447a413..00000000000
--- a/TAO/tao/GIOP_Message_Base.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- C++ -*-
-//$Id$
-
-//
-// GIOP_Message_Base
-//
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp
index 007fde6de57..cc5fc953b2c 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp
@@ -7,10 +7,6 @@
 #include "tao/CDR.h"
 #include "ace/Log_Msg.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Generator_Parser.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            GIOP_Message_Gen_Parser,
            "$Id$")
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index 8f844d1437b..e5ace6e2579 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -96,6 +96,9 @@ public:
   /// request/response?
   virtual int is_ready_for_bidirectional (void);
 
+  /// The header length of a fragment
+  virtual size_t fragment_header_length (void) const = 0;
+
 protected:
 
   /// Marshall the reply status
@@ -104,9 +107,5 @@ protected:
 
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Generator_Parser.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.inl b/TAO/tao/GIOP_Message_Generator_Parser.inl
deleted file mode 100644
index ca0908bbcf6..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser.inl
+++ /dev/null
@@ -1 +0,0 @@
-//$Id$
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index eae1ef62b41..dad464a724c 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -13,10 +13,6 @@
 
 #include "ace/Log_Msg.h"
 
-#if !defined (__ACE_INLINE__)
-# include "GIOP_Message_Generator_Parser_10.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            GIOP_Message_Gen_Parser_10,
            "$Id$")
@@ -480,3 +476,9 @@ TAO_GIOP_Message_Generator_Parser_10::minor_version (void)
   // Any harm in hardcoding??
   return 0;
 }
+
+size_t
+TAO_GIOP_Message_Generator_Parser_10::fragment_header_length (void) const
+{
+  return 0;
+}
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h
index 6c78ad72163..848f83fffd2 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h
@@ -86,12 +86,9 @@ public:
   virtual CORBA::Octet major_version (void);
   virtual CORBA::Octet minor_version (void);
 
+  /// The header length of a fragment
+  virtual size_t fragment_header_length (void) const;
 };
 
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Generator_Parser_10.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_10_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.inl b/TAO/tao/GIOP_Message_Generator_Parser_10.inl
deleted file mode 100644
index 81bf354f364..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-//$Id$
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h
index 3e88dff0e18..fd4232fe1b8 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h
@@ -41,9 +41,5 @@ public:
 
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Generator_Parser_11.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.inl b/TAO/tao/GIOP_Message_Generator_Parser_11.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index cd0f2a63969..04daba08086 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -5,16 +5,13 @@
 #include "tao/operation_details.h"
 #include "tao/debug.h"
 #include "tao/Pluggable_Messaging_Utils.h"
+#include "tao/GIOP_Message_State.h"  
 #include "tao/TAO_Server_Request.h"
 #include "tao/TAOC.h"
 #include "tao/ORB_Core.h"
 #include "tao/Transport.h"
 #include "tao/CDR.h"
 
-#if !defined (__ACE_INLINE__)
-# include "GIOP_Message_Generator_Parser_12.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            GIOP_Message_Gen_Parser_12,
            "$Id$")
@@ -562,3 +559,9 @@ TAO_GIOP_Message_Generator_Parser_12::process_bidir_context (
 
   return transport->tear_listen_point_list (cdr);
 }
+
+size_t
+TAO_GIOP_Message_Generator_Parser_12::fragment_header_length (void) const
+{
+  return TAO_GIOP_MESSAGE_FRAGMENT_HEADER;
+}
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
index bfc2de68785..5fa4d531ba9 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -92,6 +92,9 @@ public:
   /// request/response?
   virtual int is_ready_for_bidirectional (void);
 
+  /// The header length of a fragment
+  virtual size_t fragment_header_length (void) const;
+
 private:
 
   /// Marshall the TargetSpecification
@@ -113,10 +116,5 @@ private:
                              TAO_Transport *transport);
 };
 
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Generator_Parser_12.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.inl b/TAO/tao/GIOP_Message_Generator_Parser_12.inl
deleted file mode 100644
index ca0908bbcf6..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.inl
+++ /dev/null
@@ -1 +0,0 @@
-//$Id$
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
index 18bb7936ffd..19c5c70d086 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
@@ -5,9 +5,22 @@ TAO_GIOP_Message_Generator_Parser_Impl::
     check_revision (CORBA::Octet incoming_major,
                     CORBA::Octet incoming_minor)
 {
-  if (incoming_major > TAO_DEF_GIOP_MAJOR ||
-      incoming_minor > TAO_DEF_GIOP_MINOR)
+  CORBA::UShort version_as_whole_num = incoming_major << 8 | incoming_minor;
+  CORBA::UShort max_allowable_version = TAO_DEF_GIOP_MAJOR << 8 | TAO_DEF_GIOP_MINOR;
+
+  // If it's greater than the max, we know it's not allowed.
+  if (version_as_whole_num > max_allowable_version)
     return 0;
 
-  return 1;
+  // If it's less than the max, though, we still have to check for
+  // each explicit version and only allow the ones we know work.
+  switch (version_as_whole_num)
+    {
+    case 0x0100:
+    case 0x0101:
+    case 0x0102:
+      return 1;
+    }
+
+  return 0;
 }
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 344e84a3388..96135ffeaa4 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -15,11 +15,6 @@
 #include "Codeset_Manager.h"
 #include "SystemException.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Lite.i"
-#endif /* __ACE_INLINE__ */
-
-
 ACE_RCSID (tao,
            GIOP_Message_Lite,
            "$Id$")
@@ -34,7 +29,7 @@ TAO_GIOP_Message_Lite::TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core,
   : orb_core_ (orb_core),
     message_type_ (0),
     message_size_ (0),
-    byte_order_ (ACE_CDR_BYTE_ORDER)
+    byte_order_ (TAO_ENCAP_BYTE_ORDER)
 {
 }
 
@@ -112,7 +107,7 @@ TAO_GIOP_Message_Lite::generate_locate_request_header (
   if (!this->write_protocol_header (TAO_GIOP_LOCATEREQUEST,
                                     cdr))
     {
-      if (TAO_debug_level > 3)
+      if (TAO_debug_level)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%P|%t) Error in writing GIOPLite header \n")));
@@ -126,7 +121,7 @@ TAO_GIOP_Message_Lite::generate_locate_request_header (
                                           spec,
                                           cdr))
     {
-      if (TAO_debug_level > 4)
+      if (TAO_debug_level)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) Error in writing locate request header \n")));
 
@@ -147,7 +142,7 @@ TAO_GIOP_Message_Lite::generate_reply_header (
   if (!this->write_protocol_header (TAO_GIOP_REPLY,
                                     cdr))
     {
-      if (TAO_debug_level > 3)
+      if (TAO_debug_level)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%P|%t) Error in writing GIOPLite header \n")));
@@ -253,11 +248,18 @@ TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream)
 int
 TAO_GIOP_Message_Lite::parse_incoming_messages (ACE_Message_Block &block)
 {
+  // Make sure we have enough bytes in the header to read all
+  // of the information.
+  if (block.length () < TAO_GIOP_LITE_HEADER_LEN)
+    {
+      return 1;
+    }
+
     // Get the read pointer
   char *rd_ptr = block.rd_ptr ();
 
-  // We dont need to do this sort of copy. But some compilers (read it
-  // as solaris ones) have a problem in deferencing from the
+  // We don't need to do this sort of copy. But some compilers (read it
+  // as SunCC) have a problem in deferencing from the
   // reinterpret_cast pointer of the <rd_ptr>, as the <rd_ptr> can be
   // on stack. So let us go ahead with this copying...
   char buf [4];
@@ -268,7 +270,7 @@ TAO_GIOP_Message_Lite::parse_incoming_messages (ACE_Message_Block &block)
 
   CORBA::ULong x = 0;
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
-  if (!(this->byte_order_ != ACE_CDR_BYTE_ORDER))
+  if (!(this->byte_order_ != TAO_ENCAP_BYTE_ORDER))
     {
       x = *ACE_reinterpret_cast (ACE_CDR::ULong*, buf);
     }
@@ -289,7 +291,7 @@ TAO_GIOP_Message_Lite::parse_incoming_messages (ACE_Message_Block &block)
 }
 
 TAO_Pluggable_Message_Type
-TAO_GIOP_Message_Lite::message_type (void)
+TAO_GIOP_Message_Lite::message_type (void) const
 {
   switch (this->message_type_)
     {
@@ -373,8 +375,7 @@ TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming,
 
   if (copying_len > incoming.length ())
     {
-      qd->missing_data_ =
-        copying_len - incoming.length ();
+      qd->missing_data_ = copying_len - incoming.length ();
 
       copying_len = incoming.length ();
     }
@@ -383,10 +384,8 @@ TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming,
                         copying_len);
 
   incoming.rd_ptr (copying_len);
-  qd->byte_order_ = TAO_ENCAP_BYTE_ORDER;
-  qd->major_version_ = TAO_DEF_GIOP_MAJOR;
-  qd->minor_version_ = TAO_DEF_GIOP_MINOR;
-  qd->msg_type_ = this->message_type ();
+  this->init_queued_data (qd);
+
   return 1;
 }
 
@@ -425,13 +424,12 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd,
       // Calculate the bytes that needs to be copied in the queue...
       size_t copy_len = this->message_size_;
 
-      // If teh data that needs to be copied is more than that is
+      // If the data that needs to be copied is more than that is
       // available to us ..
       if (copy_len > incoming.length ())
         {
           // Calculate the missing data..
-          qd->missing_data_ =
-            copy_len - incoming.length ();
+          qd->missing_data_ = copy_len - incoming.length ();
 
           // Set the actual possible copy_len that is available...
           copy_len = incoming.length ();
@@ -450,10 +448,7 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd,
       incoming.rd_ptr (copy_len);
 
       // Get the other details...
-      qd->byte_order_ = TAO_ENCAP_BYTE_ORDER;
-      qd->major_version_ = TAO_DEF_GIOP_MAJOR;
-      qd->minor_version_ = TAO_DEF_GIOP_MINOR;
-      qd->msg_type_ = this->message_type ();
+      this->init_queued_data (qd);
     }
   else
     {
@@ -463,8 +458,7 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd,
       if (copy_len > incoming.length ())
         {
           // Calculate the missing data..
-          qd->missing_data_ =
-            copy_len - incoming.length ();
+          qd->missing_data_ = copy_len - incoming.length ();
 
           // Set the actual possible copy_len that is available...
           copy_len = incoming.length ();
@@ -488,28 +482,13 @@ void
 TAO_GIOP_Message_Lite::get_message_data (TAO_Queued_Data *qd)
 {
   // Get the message information
-  qd->byte_order_ =
-    ACE_CDR_BYTE_ORDER;
-  qd->major_version_ =
-    TAO_DEF_GIOP_MAJOR;
-  qd->minor_version_ =
-    TAO_DEF_GIOP_MINOR;
-
-  qd->msg_type_=
-    this->message_type ();
+  this->init_queued_data (qd);
 
+  // Reset the message_state
   this->reset ();
 }
 
 int
-TAO_GIOP_Message_Lite::consolidate_fragments (TAO_Queued_Data * /*dqd*/,
-                                              const TAO_Queued_Data * /*sqd*/)
-{
-  // We dont know what fragments are???
-  return -1;
-}
-
-int
 TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
                                                 TAO_Queued_Data *qd)
 {
@@ -544,10 +523,11 @@ TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
   size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
   rd_pos += TAO_GIOP_LITE_HEADER_LEN;
 
-  this->dump_msg ("recv",
-                  ACE_reinterpret_cast (u_char *,
-                                        qd->msg_block_->rd_ptr ()),
-                  qd->msg_block_->length ());
+  if (TAO_debug_level > 0)
+    this->dump_msg ("recv",
+                    ACE_reinterpret_cast (u_char *,
+                                          qd->msg_block_->rd_ptr ()),
+                    qd->msg_block_->length ());
 
 
   // Create a input CDR stream.
@@ -598,16 +578,17 @@ TAO_GIOP_Message_Lite::process_reply_message (
   size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
   rd_pos += TAO_GIOP_LITE_HEADER_LEN;
 
-  this->dump_msg ("recv",
-                  ACE_reinterpret_cast (u_char *,
-                                        qd->msg_block_->rd_ptr ()),
-                  qd->msg_block_->length ());
+  if (TAO_debug_level > 0)
+    this->dump_msg ("recv",
+                    ACE_reinterpret_cast (u_char *,
+                                          qd->msg_block_->rd_ptr ()),
+                    qd->msg_block_->length ());
 
 
   // Create a empty buffer on stack
   // NOTE: We use the same data block in which we read the message and
   // we pass it on to the higher layers of the ORB. So we dont to any
-  // copies at all here. The same is alos done in the higher layers.
+  // copies at all here. The same is also done in the higher layers.
   TAO_InputCDR input_cdr (qd->msg_block_->data_block (),
                           ACE_Message_Block::DONT_DELETE,
                           rd_pos,
@@ -632,11 +613,11 @@ TAO_GIOP_Message_Lite::process_reply_message (
   // GIOP_REPLY or GIOP_LOCATE_REPLY to take action.
   switch (qd->msg_type_)
     {
-    case TAO_GIOP_REPLY:
+    case TAO_PLUGGABLE_MESSAGE_REPLY:
       // Should be taken care by the state specific parsing
       return this->parse_reply (input_cdr,
                                 params);
-    case TAO_GIOP_LOCATEREPLY:
+    case TAO_PLUGGABLE_MESSAGE_LOCATEREPLY:
       // We call parse_reply () here because, the message format for
       // the LOCATEREPLY & REPLY are same.
       return this->parse_reply (input_cdr,
@@ -685,7 +666,7 @@ TAO_GIOP_Message_Lite::generate_exception_reply (
 
 int
 TAO_GIOP_Message_Lite::write_protocol_header (
-    TAO_GIOP_Message_Type t,
+    TAO_GIOP_Message_Type type,
     TAO_OutputCDR &msg)
 {
   // Reset the message type
@@ -705,7 +686,7 @@ TAO_GIOP_Message_Lite::write_protocol_header (
   CORBA::ULong size = 0;
   msg.write_ulong (size);
 
-  msg.write_octet ((CORBA::Octet) t);
+  msg.write_octet ((CORBA::Octet) type);
 
   return 1;
 }
@@ -816,15 +797,16 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
                               ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
                               ACE_TEXT ("cannot send exception\n"),
                               ACE_TEXT ("process_request ()")));
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "TAO: ");
+                  ACE_PRINT_EXCEPTION (
+                      ACE_ANY_EXCEPTION,
+                      "TAO_GIOP_Message_Lite::process_request[2]");
                 }
             }
 
         }
       else if (TAO_debug_level > 0)
         {
-          // It is unfotunate that an exception (probably a system
+          // It is unfortunate that an exception (probably a system
           // exception) was thrown by the upcall code (even by the
           // user) when the client was not expecting a response.
           // However, in this case, we cannot close the connection
@@ -872,10 +854,13 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
               if (TAO_debug_level > 0)
                 {
                   ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
+                              ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_request[3], ")
+                              ACE_TEXT ("%p: ")
                               ACE_TEXT ("cannot send exception\n"),
                               ACE_TEXT ("process_request ()")));
-                  ACE_PRINT_EXCEPTION (exception, "TAO: ");
+                  ACE_PRINT_EXCEPTION (
+                      exception,
+                      "TAO_GIOP_Message_Lite::process_request[3]");
                 }
             }
         }
@@ -978,7 +963,8 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
           status_info.status = TAO_GIOP_OBJECT_FORWARD;
           status_info.forward_location_var = forward_to;
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("handle_locate has been called: forwarding\n")));
+                      ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ")
+                      ACE_TEXT ("called: forwarding\n")));
         }
       else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
         {
@@ -986,7 +972,8 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
           status_info.status = TAO_GIOP_OBJECT_HERE;
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO: (%P|%t) handle_locate() : found\n")));
+                        ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ")
+                        ACE_TEXT ("found\n")));
         }
       else
         {
@@ -996,14 +983,16 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
             {
               status_info.status = TAO_GIOP_OBJECT_FORWARD;
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("handle_locate has been called: forwarding\n")));
+                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ")
+                          ACE_TEXT ("forwarding\n")));
             }
           else
             {
               // Normal exception, so the object is not here
               status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("handle_locate has been called: not here\n")));
+                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ")
+                          ACE_TEXT ("not here\n")));
             }
         }
     }
@@ -1421,11 +1410,11 @@ TAO_GIOP_Message_Lite::send_reply_exception (
   // Create a new output CDR stream
   char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
 
-#if defined(ACE_HAS_PURIFY)
+#if defined(ACE_INITIALIZE_MEMORY_BEFORE_USE)
   (void) ACE_OS::memset (repbuf,
                          '\0',
                          sizeof repbuf);
-#endif /* ACE_HAS_PURIFY */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
   TAO_OutputCDR output (repbuf,
                         sizeof repbuf,
                         TAO_ENCAP_BYTE_ORDER,
@@ -1574,20 +1563,20 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label,
                                  const u_char *ptr,
                                  size_t len)
 {
-  static const char *names [] =
-  {
-    "Request",
-    "Reply",
-    "CancelRequest",
-    "LocateRequest",
-    "LocateReply",
-    "CloseConnection",
-    "MessageError"
-    "Fragment"
-  };
-
   if (TAO_debug_level >= 5)
     {
+      static const char *names [] =
+      {
+        "Request",
+        "Reply",
+        "CancelRequest",
+        "LocateRequest",
+        "LocateReply",
+        "CloseConnection",
+        "MessageError",
+        "Fragment"
+      };
+
       // Message name.
       const char *message_name = "UNKNOWN MESSAGE";
       u_long slot = ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET];
@@ -1638,7 +1627,7 @@ TAO_GIOP_Message_Lite::make_queued_data (size_t sz)
 {
   // Get a node for the queue..
   TAO_Queued_Data *qd =
-    TAO_Queued_Data::get_queued_data ();
+    TAO_Queued_Data::make_queued_data ();
 
   // Make a datablock for the size requested + something. The
   // "something" is required because we are going to align the data
@@ -1686,3 +1675,19 @@ TAO_GIOP_Message_Lite::header_length (void) const
 {
   return TAO_GIOP_LITE_HEADER_LEN;
 }
+
+size_t
+TAO_GIOP_Message_Lite::fragment_header_length (CORBA::Octet,
+                                               CORBA::Octet) const
+{
+  return 0;
+}
+
+void
+TAO_GIOP_Message_Lite::init_queued_data (TAO_Queued_Data* qd) const
+{
+  qd->byte_order_    = TAO_ENCAP_BYTE_ORDER;
+  qd->major_version_ = TAO_DEF_GIOP_MAJOR;
+  qd->minor_version_ = TAO_DEF_GIOP_MINOR;
+  qd->msg_type_      = this->message_type ();
+}
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index 3393e074da0..8ddaa6ef89b 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -90,6 +90,11 @@ public:
   virtual int format_message (TAO_OutputCDR &cdr);
 
   /// Parse the incoming messages..
+  ///
+  /// \return -1 There was some error parsing the GIOP header
+  /// \return 0  The GIOP header was parsed correctly
+  /// \return 1  There was not enough data in the message block to
+  ///            parse the header
   virtual int parse_incoming_messages (ACE_Message_Block &message_block);
 
   /// Get the message type. The return value would be one of the
@@ -98,7 +103,7 @@ public:
   /// TAO_PLUGGABLE_MESSAGE_REPLY,
   /// TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
   /// TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR.
-  TAO_Pluggable_Message_Type message_type (void);
+  TAO_Pluggable_Message_Type message_type (void) const;
 
 
   /// Calculate the amount of data that is missing in the <incoming>
@@ -119,10 +124,6 @@ public:
   /// Get the details of the message parsed through the <qd>.
   virtual void get_message_data (TAO_Queued_Data *qd);
 
-  /// @@Bala: Docu???
-  virtual int consolidate_fragments (TAO_Queued_Data *dqd,
-                                     const TAO_Queued_Data *sqd);
-
   /// Process the request message that we have received on the
   /// connection
   virtual int process_request_message (TAO_Transport *transport,
@@ -203,6 +204,10 @@ private:
   /// Header length
   virtual size_t header_length (void) const;
 
+  /// Fragment header length
+  virtual size_t fragment_header_length (CORBA::Octet major,
+                                         CORBA::Octet minor) const;
+
   virtual TAO_OutputCDR &out_stream (void);
 
 private:
@@ -249,6 +254,9 @@ private:
   int parse_locate_reply (TAO_InputCDR &input,
                           TAO_Pluggable_Reply_Params &params);
 
+  /// Initialize the relevant portions of a TAO_Queued_Data
+  void init_queued_data (TAO_Queued_Data* qd) const;
+
 private:
 
   /// Our copy of the ORB core...
@@ -267,12 +275,5 @@ private:
   TAO_OutputCDR cdr_;
 };
 
-
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Lite.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_GIOP_MESSAGE_LITE_H*/
diff --git a/TAO/tao/GIOP_Message_Lite.i b/TAO/tao/GIOP_Message_Lite.i
deleted file mode 100644
index ca0908bbcf6..00000000000
--- a/TAO/tao/GIOP_Message_Lite.i
+++ /dev/null
@@ -1 +0,0 @@
-//$Id$
diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp
index 90449d1b4f5..6100e1fb4fe 100644
--- a/TAO/tao/GIOP_Message_State.cpp
+++ b/TAO/tao/GIOP_Message_State.cpp
@@ -14,11 +14,8 @@ ACE_RCSID (tao,
            GIOP_Message_State,
            "$Id$")
 
-TAO_GIOP_Message_State::TAO_GIOP_Message_State (
-    TAO_ORB_Core * /*orb_core*/,
-    TAO_GIOP_Message_Base *base)
-  : base_ (base),
-    giop_version_ (TAO_DEF_GIOP_MAJOR,
+TAO_GIOP_Message_State::TAO_GIOP_Message_State (void)
+  : giop_version_ (TAO_DEF_GIOP_MAJOR,
                    TAO_DEF_GIOP_MINOR),
     byte_order_ (0),
     message_type_ (0),
@@ -36,11 +33,12 @@ TAO_GIOP_Message_State::parse_message_header (ACE_Message_Block &incoming)
   if (incoming.length () >= TAO_GIOP_MESSAGE_HEADER_LEN)
     {
       // Parse the GIOP header
-      if (this->parse_message_header_i (incoming) == -1)
-        return -1;
+      return this->parse_message_header_i (incoming);
     }
 
-  return 0;
+  // One indicates that we didn't have enough data in the message to
+  // parse the header
+  return 1;
 }
 
 int
@@ -73,7 +71,6 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming)
   // Get the message type
   this->message_type_ = buf[TAO_GIOP_MESSAGE_TYPE_OFFSET];
 
-
   // Get the size of the message..
   this->get_payload_size (buf);
 
@@ -99,13 +96,8 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming)
         }
     }
 
-  if (this->more_fragments_)
-    {
-      (void) this->parse_fragment_header (buf,
-                                          incoming.length ());
-    }
-
-  return 0;
+  // Get the request id
+  return this->parse_fragment_header (buf, incoming.length ());
 }
 
 
@@ -240,39 +232,38 @@ TAO_GIOP_Message_State::get_payload_size (char *rd_ptr)
 
 
 int
-TAO_GIOP_Message_State::parse_fragment_header (char *buf,
+TAO_GIOP_Message_State::parse_fragment_header (const char *buf,
                                                size_t length)
 {
-  size_t len =
-    TAO_GIOP_MESSAGE_FRAGMENT_HEADER + TAO_GIOP_MESSAGE_HEADER_LEN;
-
-  buf += TAO_GIOP_MESSAGE_HEADER_LEN;
-
   // By this point we are doubly sure that we have a more or less
   // valid GIOP message with a valid major revision number.
-  if (this->giop_version_.minor == 2 &&
-      this->message_type_ == TAO_GIOP_FRAGMENT &&
-      length > len)
+  if ((this->giop_version_.major > 1 || this->giop_version_.minor >= 2) &&
+      (this->more_fragments_ || this->message_type_ == TAO_GIOP_FRAGMENT))
     {
+      static const size_t len =
+        TAO_GIOP_MESSAGE_HEADER_LEN + TAO_GIOP_MESSAGE_FRAGMENT_HEADER;
+
+      // If there is not enough data in the header to get the request
+      // id, then we need to indicate that by returning 1.
+      if (length < len)
+        return 1;
+
       // Fragmented message in GIOP 1.2 should have a fragment header
-      // following the GIOP header.  Grab the rd_ptr to get that
-      // info.
+      // following the GIOP header.
+      buf += TAO_GIOP_MESSAGE_HEADER_LEN;
       this->request_id_ = this->read_ulong (buf);
-
-      // As we parsed the header
-      return 1;
     }
 
   return 0;
 }
 
 CORBA::ULong
-TAO_GIOP_Message_State::read_ulong (char *rd_ptr)
+TAO_GIOP_Message_State::read_ulong (const char *rd_ptr)
 {
   CORBA::ULong x = 0;
 
-  // We dont need to do this sort of copy. But some compilers (read it
-  // as solaris ones) have a problem in deferencing from the
+  // We don't need to do this sort of copy. But some compilers (read it
+  // as SunCC) have a problem in deferencing from the
   // reinterpret_cast pointer of the <rd_ptr>, as the <rd_ptr> can be
   // on stack. So let us go ahead with this copying...
   char buf [4];
diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h
index f902fa03a0e..16d9c11d14c 100644
--- a/TAO/tao/GIOP_Message_State.h
+++ b/TAO/tao/GIOP_Message_State.h
@@ -41,10 +41,14 @@ class TAO_Export TAO_GIOP_Message_State
 public:
 
   /// Ctor
-  TAO_GIOP_Message_State (TAO_ORB_Core *orb_core,
-                          TAO_GIOP_Message_Base *base);
+  TAO_GIOP_Message_State (void);
 
   /// Parse the message header.
+  ///
+  /// \return -1 There was some error parsing the GIOP header
+  /// \return 0  The GIOP header was parsed correctly
+  /// \return 1  There was not enough data in the message block to
+  ///            parse the header
   int parse_message_header (ACE_Message_Block &incoming);
 
   /// Return the message size
@@ -85,18 +89,14 @@ private:
 
   /// Parses the GIOP FRAGMENT_HEADER  information from the incoming
   /// stream.
-  int parse_fragment_header (char *buf,
+  int parse_fragment_header (const char *buf,
                              size_t length);
 
   /// Read the unsigned long from the buffer. The <buf> should just
   /// point to the next 4 bytes data that represent the ULong
-  CORBA::ULong read_ulong (char *buf);
+  CORBA::ULong read_ulong (const char *buf);
 
 private:
-
-  /// The GIOP base class..
-  TAO_GIOP_Message_Base *base_;
-
   // GIOP version information..
   TAO_GIOP_Message_Version giop_version_;
 
@@ -113,6 +113,9 @@ private:
   CORBA::ULong request_id_;
 
   /// (Requests and Replys)
+  /// A value of zero indicates that this message does not have any
+  /// fragments.  A value of non-zero indicates that it does have
+  /// fragments.
   CORBA::Octet more_fragments_;
 
   /// Missing data
diff --git a/TAO/tao/GIOP_Utils.cpp b/TAO/tao/GIOP_Utils.cpp
index e5cada746e1..464eaa8430e 100644
--- a/TAO/tao/GIOP_Utils.cpp
+++ b/TAO/tao/GIOP_Utils.cpp
@@ -5,10 +5,6 @@
 #include "tao/Transport.h"
 #include "tao/CDR.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Utils.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            GIOP_Utils,
            "$Id$")
diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h
index 22e27df36ae..b3d3ff167b3 100644
--- a/TAO/tao/GIOP_Utils.h
+++ b/TAO/tao/GIOP_Utils.h
@@ -9,7 +9,8 @@
  *   GIOP utility definitions
  *
  *
- *  @author  Chris Cleeland <cleeland@cs.wustl.edu>  Carlos O' Ryan <coryan@uci.edu>
+ *  @author  Chris Cleeland <cleeland@cs.wustl.edu>
+ *  @author  Carlos O' Ryan <coryan@uci.edu>
  */
 //=============================================================================
 
@@ -27,6 +28,7 @@
 #include "tao/IOP_IORC.h"
 
 class TAO_Transport;
+class ACE_Time_Value;
 
 /**
  * All GIOP messages include a header and message type.  Not
@@ -142,9 +144,5 @@ public:
                               ACE_Time_Value *max_wait_time = 0);
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Utils.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_GIOP_UTILS_H */
diff --git a/TAO/tao/GIOP_Utils.i b/TAO/tao/GIOP_Utils.i
deleted file mode 100644
index ca0908bbcf6..00000000000
--- a/TAO/tao/GIOP_Utils.i
+++ /dev/null
@@ -1 +0,0 @@
-//$Id$
diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc
index 2d2bf2ea84b..308c3515373 100644
--- a/TAO/tao/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     IFR_Client
   }
+
+  Pkgconfig_Files {
+    IFR_Client/TAO_IFR_Client.pc.in
+  }
 }
diff --git a/TAO/tao/IFR_Client/IFR_BaseA.cpp b/TAO/tao/IFR_Client/IFR_BaseA.cpp
index ccaccf9120b..51b828d4bd1 100644
--- a/TAO/tao/IFR_Client/IFR_BaseA.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseA.cpp
@@ -27,31 +27,33 @@
 
 #include "IFR_BaseC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ScopedName[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5363),
-  ACE_NTOHL (0x6f706564),
-  ACE_NTOHL (0x4e616d65),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5363), 
+  ACE_NTOHL (0x6f706564), 
+  ACE_NTOHL (0x4e616d65), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
     11,
-  ACE_NTOHL (0x53636f70),
-  ACE_NTOHL (0x65644e61),
+  ACE_NTOHL (0x53636f70), 
+  ACE_NTOHL (0x65644e61), 
   ACE_NTOHL (0x6d650000),  // name = ScopedName
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -60,7 +62,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ScopedName (
     sizeof (_oc_CORBA_ScopedName),
     (char *) &_oc_CORBA_ScopedName,
     0,
-    sizeof (CORBA::ScopedName)
+    0
   );
 
 namespace CORBA
@@ -70,180 +72,180 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_DefinitionKind[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4465),
-  ACE_NTOHL (0x66696e69),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x4b696e64),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4465), 
+  ACE_NTOHL (0x66696e69), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x4b696e64), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
   15,
-  ACE_NTOHL (0x44656669),
-  ACE_NTOHL (0x6e697469),
-  ACE_NTOHL (0x6f6e4b69),
+  ACE_NTOHL (0x44656669), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x6f6e4b69), 
   ACE_NTOHL (0x6e640000),  // name = DefinitionKind
   36, // member count
   8,
-  ACE_NTOHL (0x646b5f6e),
+  ACE_NTOHL (0x646b5f6e), 
   ACE_NTOHL (0x6f6e6500),  // name = dk_none
   7,
-  ACE_NTOHL (0x646b5f61),
+  ACE_NTOHL (0x646b5f61), 
   ACE_NTOHL (0x6c6c0000),  // name = dk_all
   13,
-  ACE_NTOHL (0x646b5f41),
-  ACE_NTOHL (0x74747269),
-  ACE_NTOHL (0x62757465),
+  ACE_NTOHL (0x646b5f41), 
+  ACE_NTOHL (0x74747269), 
+  ACE_NTOHL (0x62757465), 
   ACE_NTOHL (0x0),  // name = dk_Attribute
   12,
-  ACE_NTOHL (0x646b5f43),
-  ACE_NTOHL (0x6f6e7374),
+  ACE_NTOHL (0x646b5f43), 
+  ACE_NTOHL (0x6f6e7374), 
   ACE_NTOHL (0x616e7400),  // name = dk_Constant
   13,
-  ACE_NTOHL (0x646b5f45),
-  ACE_NTOHL (0x78636570),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x646b5f45), 
+  ACE_NTOHL (0x78636570), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = dk_Exception
   13,
-  ACE_NTOHL (0x646b5f49),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
+  ACE_NTOHL (0x646b5f49), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
   ACE_NTOHL (0x0),  // name = dk_Interface
   10,
-  ACE_NTOHL (0x646b5f4d),
-  ACE_NTOHL (0x6f64756c),
+  ACE_NTOHL (0x646b5f4d), 
+  ACE_NTOHL (0x6f64756c), 
   ACE_NTOHL (0x65000000),  // name = dk_Module
   13,
-  ACE_NTOHL (0x646b5f4f),
-  ACE_NTOHL (0x70657261),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x646b5f4f), 
+  ACE_NTOHL (0x70657261), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = dk_Operation
   11,
-  ACE_NTOHL (0x646b5f54),
-  ACE_NTOHL (0x79706564),
+  ACE_NTOHL (0x646b5f54), 
+  ACE_NTOHL (0x79706564), 
   ACE_NTOHL (0x65660000),  // name = dk_Typedef
   9,
-  ACE_NTOHL (0x646b5f41),
-  ACE_NTOHL (0x6c696173),
+  ACE_NTOHL (0x646b5f41), 
+  ACE_NTOHL (0x6c696173), 
   ACE_NTOHL (0x0),  // name = dk_Alias
   10,
-  ACE_NTOHL (0x646b5f53),
-  ACE_NTOHL (0x74727563),
+  ACE_NTOHL (0x646b5f53), 
+  ACE_NTOHL (0x74727563), 
   ACE_NTOHL (0x74000000),  // name = dk_Struct
   9,
-  ACE_NTOHL (0x646b5f55),
-  ACE_NTOHL (0x6e696f6e),
+  ACE_NTOHL (0x646b5f55), 
+  ACE_NTOHL (0x6e696f6e), 
   ACE_NTOHL (0x0),  // name = dk_Union
   8,
-  ACE_NTOHL (0x646b5f45),
+  ACE_NTOHL (0x646b5f45), 
   ACE_NTOHL (0x6e756d00),  // name = dk_Enum
   13,
-  ACE_NTOHL (0x646b5f50),
-  ACE_NTOHL (0x72696d69),
-  ACE_NTOHL (0x74697665),
+  ACE_NTOHL (0x646b5f50), 
+  ACE_NTOHL (0x72696d69), 
+  ACE_NTOHL (0x74697665), 
   ACE_NTOHL (0x0),  // name = dk_Primitive
   10,
-  ACE_NTOHL (0x646b5f53),
-  ACE_NTOHL (0x7472696e),
+  ACE_NTOHL (0x646b5f53), 
+  ACE_NTOHL (0x7472696e), 
   ACE_NTOHL (0x67000000),  // name = dk_String
   12,
-  ACE_NTOHL (0x646b5f53),
-  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x646b5f53), 
+  ACE_NTOHL (0x65717565), 
   ACE_NTOHL (0x6e636500),  // name = dk_Sequence
   9,
-  ACE_NTOHL (0x646b5f41),
-  ACE_NTOHL (0x72726179),
+  ACE_NTOHL (0x646b5f41), 
+  ACE_NTOHL (0x72726179), 
   ACE_NTOHL (0x0),  // name = dk_Array
   14,
-  ACE_NTOHL (0x646b5f52),
-  ACE_NTOHL (0x65706f73),
-  ACE_NTOHL (0x69746f72),
+  ACE_NTOHL (0x646b5f52), 
+  ACE_NTOHL (0x65706f73), 
+  ACE_NTOHL (0x69746f72), 
   ACE_NTOHL (0x79000000),  // name = dk_Repository
   11,
-  ACE_NTOHL (0x646b5f57),
-  ACE_NTOHL (0x73747269),
+  ACE_NTOHL (0x646b5f57), 
+  ACE_NTOHL (0x73747269), 
   ACE_NTOHL (0x6e670000),  // name = dk_Wstring
   9,
-  ACE_NTOHL (0x646b5f46),
-  ACE_NTOHL (0x69786564),
+  ACE_NTOHL (0x646b5f46), 
+  ACE_NTOHL (0x69786564), 
   ACE_NTOHL (0x0),  // name = dk_Fixed
   9,
-  ACE_NTOHL (0x646b5f56),
-  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x646b5f56), 
+  ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x0),  // name = dk_Value
   12,
-  ACE_NTOHL (0x646b5f56),
-  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x646b5f56), 
+  ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
   15,
-  ACE_NTOHL (0x646b5f56),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x4d656d62),
+  ACE_NTOHL (0x646b5f56), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x4d656d62), 
   ACE_NTOHL (0x65720000),  // name = dk_ValueMember
   10,
-  ACE_NTOHL (0x646b5f4e),
-  ACE_NTOHL (0x61746976),
+  ACE_NTOHL (0x646b5f4e), 
+  ACE_NTOHL (0x61746976), 
   ACE_NTOHL (0x65000000),  // name = dk_Native
   21,
-  ACE_NTOHL (0x646b5f41),
-  ACE_NTOHL (0x62737472),
-  ACE_NTOHL (0x61637449),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
+  ACE_NTOHL (0x646b5f41), 
+  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x61637449), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
   ACE_NTOHL (0x0),  // name = dk_AbstractInterface
   18,
-  ACE_NTOHL (0x646b5f4c),
-  ACE_NTOHL (0x6f63616c),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x646b5f4c), 
+  ACE_NTOHL (0x6f63616c), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
   13,
-  ACE_NTOHL (0x646b5f43),
-  ACE_NTOHL (0x6f6d706f),
-  ACE_NTOHL (0x6e656e74),
+  ACE_NTOHL (0x646b5f43), 
+  ACE_NTOHL (0x6f6d706f), 
+  ACE_NTOHL (0x6e656e74), 
   ACE_NTOHL (0x0),  // name = dk_Component
   8,
-  ACE_NTOHL (0x646b5f48),
+  ACE_NTOHL (0x646b5f48), 
   ACE_NTOHL (0x6f6d6500),  // name = dk_Home
   11,
-  ACE_NTOHL (0x646b5f46),
-  ACE_NTOHL (0x6163746f),
+  ACE_NTOHL (0x646b5f46), 
+  ACE_NTOHL (0x6163746f), 
   ACE_NTOHL (0x72790000),  // name = dk_Factory
   10,
-  ACE_NTOHL (0x646b5f46),
-  ACE_NTOHL (0x696e6465),
+  ACE_NTOHL (0x646b5f46), 
+  ACE_NTOHL (0x696e6465), 
   ACE_NTOHL (0x72000000),  // name = dk_Finder
   9,
-  ACE_NTOHL (0x646b5f45),
-  ACE_NTOHL (0x6d697473),
+  ACE_NTOHL (0x646b5f45), 
+  ACE_NTOHL (0x6d697473), 
   ACE_NTOHL (0x0),  // name = dk_Emits
   13,
-  ACE_NTOHL (0x646b5f50),
-  ACE_NTOHL (0x75626c69),
-  ACE_NTOHL (0x73686573),
+  ACE_NTOHL (0x646b5f50), 
+  ACE_NTOHL (0x75626c69), 
+  ACE_NTOHL (0x73686573), 
   ACE_NTOHL (0x0),  // name = dk_Publishes
   12,
-  ACE_NTOHL (0x646b5f43),
-  ACE_NTOHL (0x6f6e7375),
+  ACE_NTOHL (0x646b5f43), 
+  ACE_NTOHL (0x6f6e7375), 
   ACE_NTOHL (0x6d657300),  // name = dk_Consumes
   12,
-  ACE_NTOHL (0x646b5f50),
-  ACE_NTOHL (0x726f7669),
+  ACE_NTOHL (0x646b5f50), 
+  ACE_NTOHL (0x726f7669), 
   ACE_NTOHL (0x64657300),  // name = dk_Provides
   8,
-  ACE_NTOHL (0x646b5f55),
+  ACE_NTOHL (0x646b5f55), 
   ACE_NTOHL (0x73657300),  // name = dk_Uses
   9,
-  ACE_NTOHL (0x646b5f45),
-  ACE_NTOHL (0x76656e74),
+  ACE_NTOHL (0x646b5f45), 
+  ACE_NTOHL (0x76656e74), 
   ACE_NTOHL (0x0),  // name = dk_Event
   };
 
@@ -252,7 +254,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DefinitionKind (
     sizeof (_oc_CORBA_DefinitionKind),
     (char *) &_oc_CORBA_DefinitionKind,
     0,
-    sizeof (CORBA::DefinitionKind)
+    0
   );
 
 namespace CORBA
@@ -262,23 +264,23 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_IRObject[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4952),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4952), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/IRObject:1.0
     9,
-  ACE_NTOHL (0x49524f62),
-  ACE_NTOHL (0x6a656374),
+  ACE_NTOHL (0x49524f62), 
+  ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x0),  // name = IRObject
   };
 
@@ -287,7 +289,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_IRObject (
     sizeof (_oc_CORBA_IRObject),
     (char *) &_oc_CORBA_IRObject,
     0,
-    sizeof (CORBA::IRObject)
+    0
   );
 
 namespace CORBA
@@ -297,26 +299,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_VersionSpec[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5665),
-  ACE_NTOHL (0x7273696f),
-  ACE_NTOHL (0x6e537065),
-  ACE_NTOHL (0x633a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5665), 
+  ACE_NTOHL (0x7273696f), 
+  ACE_NTOHL (0x6e537065), 
+  ACE_NTOHL (0x633a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
     12,
-  ACE_NTOHL (0x56657273),
-  ACE_NTOHL (0x696f6e53),
+  ACE_NTOHL (0x56657273), 
+  ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -325,7 +327,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_VersionSpec (
     sizeof (_oc_CORBA_VersionSpec),
     (char *) &_oc_CORBA_VersionSpec,
     0,
-    sizeof (CORBA::VersionSpec)
+    0
   );
 
 namespace CORBA
@@ -335,207 +337,207 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Contained_Description[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e65642f),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e746169), 
+  ACE_NTOHL (0x6e65642f), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained/Description:1.0
     12,
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = Description
   2, // member count
     5,
-  ACE_NTOHL (0x6b696e64),
+  ACE_NTOHL (0x6b696e64), 
   ACE_NTOHL (0x0),  // name = kind
     CORBA::tk_enum, // typecode kind
   684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4465),
-    ACE_NTOHL (0x66696e69),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x4b696e64),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4465), 
+    ACE_NTOHL (0x66696e69), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x4b696e64), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
     15,
-    ACE_NTOHL (0x44656669),
-    ACE_NTOHL (0x6e697469),
-    ACE_NTOHL (0x6f6e4b69),
+    ACE_NTOHL (0x44656669), 
+    ACE_NTOHL (0x6e697469), 
+    ACE_NTOHL (0x6f6e4b69), 
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
     36, // member count
     8,
-    ACE_NTOHL (0x646b5f6e),
+    ACE_NTOHL (0x646b5f6e), 
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
     7,
-    ACE_NTOHL (0x646b5f61),
+    ACE_NTOHL (0x646b5f61), 
     ACE_NTOHL (0x6c6c0000),  // name = dk_all
     13,
-    ACE_NTOHL (0x646b5f41),
-    ACE_NTOHL (0x74747269),
-    ACE_NTOHL (0x62757465),
+    ACE_NTOHL (0x646b5f41), 
+    ACE_NTOHL (0x74747269), 
+    ACE_NTOHL (0x62757465), 
     ACE_NTOHL (0x0),  // name = dk_Attribute
     12,
-    ACE_NTOHL (0x646b5f43),
-    ACE_NTOHL (0x6f6e7374),
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6e7374), 
     ACE_NTOHL (0x616e7400),  // name = dk_Constant
     13,
-    ACE_NTOHL (0x646b5f45),
-    ACE_NTOHL (0x78636570),
-    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x78636570), 
+    ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Exception
     13,
-    ACE_NTOHL (0x646b5f49),
-    ACE_NTOHL (0x6e746572),
-    ACE_NTOHL (0x66616365),
+    ACE_NTOHL (0x646b5f49), 
+    ACE_NTOHL (0x6e746572), 
+    ACE_NTOHL (0x66616365), 
     ACE_NTOHL (0x0),  // name = dk_Interface
     10,
-    ACE_NTOHL (0x646b5f4d),
-    ACE_NTOHL (0x6f64756c),
+    ACE_NTOHL (0x646b5f4d), 
+    ACE_NTOHL (0x6f64756c), 
     ACE_NTOHL (0x65000000),  // name = dk_Module
     13,
-    ACE_NTOHL (0x646b5f4f),
-    ACE_NTOHL (0x70657261),
-    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x646b5f4f), 
+    ACE_NTOHL (0x70657261), 
+    ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Operation
     11,
-    ACE_NTOHL (0x646b5f54),
-    ACE_NTOHL (0x79706564),
+    ACE_NTOHL (0x646b5f54), 
+    ACE_NTOHL (0x79706564), 
     ACE_NTOHL (0x65660000),  // name = dk_Typedef
     9,
-    ACE_NTOHL (0x646b5f41),
-    ACE_NTOHL (0x6c696173),
+    ACE_NTOHL (0x646b5f41), 
+    ACE_NTOHL (0x6c696173), 
     ACE_NTOHL (0x0),  // name = dk_Alias
     10,
-    ACE_NTOHL (0x646b5f53),
-    ACE_NTOHL (0x74727563),
+    ACE_NTOHL (0x646b5f53), 
+    ACE_NTOHL (0x74727563), 
     ACE_NTOHL (0x74000000),  // name = dk_Struct
     9,
-    ACE_NTOHL (0x646b5f55),
-    ACE_NTOHL (0x6e696f6e),
+    ACE_NTOHL (0x646b5f55), 
+    ACE_NTOHL (0x6e696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Union
     8,
-    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x646b5f45), 
     ACE_NTOHL (0x6e756d00),  // name = dk_Enum
     13,
-    ACE_NTOHL (0x646b5f50),
-    ACE_NTOHL (0x72696d69),
-    ACE_NTOHL (0x74697665),
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x72696d69), 
+    ACE_NTOHL (0x74697665), 
     ACE_NTOHL (0x0),  // name = dk_Primitive
     10,
-    ACE_NTOHL (0x646b5f53),
-    ACE_NTOHL (0x7472696e),
+    ACE_NTOHL (0x646b5f53), 
+    ACE_NTOHL (0x7472696e), 
     ACE_NTOHL (0x67000000),  // name = dk_String
     12,
-    ACE_NTOHL (0x646b5f53),
-    ACE_NTOHL (0x65717565),
+    ACE_NTOHL (0x646b5f53), 
+    ACE_NTOHL (0x65717565), 
     ACE_NTOHL (0x6e636500),  // name = dk_Sequence
     9,
-    ACE_NTOHL (0x646b5f41),
-    ACE_NTOHL (0x72726179),
+    ACE_NTOHL (0x646b5f41), 
+    ACE_NTOHL (0x72726179), 
     ACE_NTOHL (0x0),  // name = dk_Array
     14,
-    ACE_NTOHL (0x646b5f52),
-    ACE_NTOHL (0x65706f73),
-    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x646b5f52), 
+    ACE_NTOHL (0x65706f73), 
+    ACE_NTOHL (0x69746f72), 
     ACE_NTOHL (0x79000000),  // name = dk_Repository
     11,
-    ACE_NTOHL (0x646b5f57),
-    ACE_NTOHL (0x73747269),
+    ACE_NTOHL (0x646b5f57), 
+    ACE_NTOHL (0x73747269), 
     ACE_NTOHL (0x6e670000),  // name = dk_Wstring
     9,
-    ACE_NTOHL (0x646b5f46),
-    ACE_NTOHL (0x69786564),
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x69786564), 
     ACE_NTOHL (0x0),  // name = dk_Fixed
     9,
-    ACE_NTOHL (0x646b5f56),
-    ACE_NTOHL (0x616c7565),
+    ACE_NTOHL (0x646b5f56), 
+    ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x0),  // name = dk_Value
     12,
-    ACE_NTOHL (0x646b5f56),
-    ACE_NTOHL (0x616c7565),
+    ACE_NTOHL (0x646b5f56), 
+    ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
     15,
-    ACE_NTOHL (0x646b5f56),
-    ACE_NTOHL (0x616c7565),
-    ACE_NTOHL (0x4d656d62),
+    ACE_NTOHL (0x646b5f56), 
+    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x4d656d62), 
     ACE_NTOHL (0x65720000),  // name = dk_ValueMember
     10,
-    ACE_NTOHL (0x646b5f4e),
-    ACE_NTOHL (0x61746976),
+    ACE_NTOHL (0x646b5f4e), 
+    ACE_NTOHL (0x61746976), 
     ACE_NTOHL (0x65000000),  // name = dk_Native
     21,
-    ACE_NTOHL (0x646b5f41),
-    ACE_NTOHL (0x62737472),
-    ACE_NTOHL (0x61637449),
-    ACE_NTOHL (0x6e746572),
-    ACE_NTOHL (0x66616365),
+    ACE_NTOHL (0x646b5f41), 
+    ACE_NTOHL (0x62737472), 
+    ACE_NTOHL (0x61637449), 
+    ACE_NTOHL (0x6e746572), 
+    ACE_NTOHL (0x66616365), 
     ACE_NTOHL (0x0),  // name = dk_AbstractInterface
     18,
-    ACE_NTOHL (0x646b5f4c),
-    ACE_NTOHL (0x6f63616c),
-    ACE_NTOHL (0x496e7465),
-    ACE_NTOHL (0x72666163),
+    ACE_NTOHL (0x646b5f4c), 
+    ACE_NTOHL (0x6f63616c), 
+    ACE_NTOHL (0x496e7465), 
+    ACE_NTOHL (0x72666163), 
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
     13,
-    ACE_NTOHL (0x646b5f43),
-    ACE_NTOHL (0x6f6d706f),
-    ACE_NTOHL (0x6e656e74),
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
     ACE_NTOHL (0x0),  // name = dk_Component
     8,
-    ACE_NTOHL (0x646b5f48),
+    ACE_NTOHL (0x646b5f48), 
     ACE_NTOHL (0x6f6d6500),  // name = dk_Home
     11,
-    ACE_NTOHL (0x646b5f46),
-    ACE_NTOHL (0x6163746f),
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x6163746f), 
     ACE_NTOHL (0x72790000),  // name = dk_Factory
     10,
-    ACE_NTOHL (0x646b5f46),
-    ACE_NTOHL (0x696e6465),
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x696e6465), 
     ACE_NTOHL (0x72000000),  // name = dk_Finder
     9,
-    ACE_NTOHL (0x646b5f45),
-    ACE_NTOHL (0x6d697473),
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x6d697473), 
     ACE_NTOHL (0x0),  // name = dk_Emits
     13,
-    ACE_NTOHL (0x646b5f50),
-    ACE_NTOHL (0x75626c69),
-    ACE_NTOHL (0x73686573),
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x75626c69), 
+    ACE_NTOHL (0x73686573), 
     ACE_NTOHL (0x0),  // name = dk_Publishes
     12,
-    ACE_NTOHL (0x646b5f43),
-    ACE_NTOHL (0x6f6e7375),
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6e7375), 
     ACE_NTOHL (0x6d657300),  // name = dk_Consumes
     12,
-    ACE_NTOHL (0x646b5f50),
-    ACE_NTOHL (0x726f7669),
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x726f7669), 
     ACE_NTOHL (0x64657300),  // name = dk_Provides
     8,
-    ACE_NTOHL (0x646b5f55),
+    ACE_NTOHL (0x646b5f55), 
     ACE_NTOHL (0x73657300),  // name = dk_Uses
     9,
-    ACE_NTOHL (0x646b5f45),
-    ACE_NTOHL (0x76656e74),
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x76656e74), 
     ACE_NTOHL (0x0),  // name = dk_Event
-
+    
   6,
-  ACE_NTOHL (0x76616c75),
+  ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
     CORBA::tk_any,
 
@@ -546,30 +548,30 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained_Description (
     sizeof (_oc_CORBA_Contained_Description),
     (char *) &_oc_CORBA_Contained_Description,
     0,
-    sizeof (CORBA::Contained::Description)
+    0
   );
 
 ::CORBA::TypeCode_ptr CORBA::Contained::_tc_Description =
   &_tc_TAO_tc_CORBA_Contained_Description;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Contained[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e65643a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e746169), 
+  ACE_NTOHL (0x6e65643a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
     10,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x61696e65),
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x61696e65), 
   ACE_NTOHL (0x64000000),  // name = Contained
   };
 
@@ -578,7 +580,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained (
     sizeof (_oc_CORBA_Contained),
     (char *) &_oc_CORBA_Contained,
     0,
-    sizeof (CORBA::Contained)
+    0
   );
 
 namespace CORBA
@@ -588,26 +590,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65665365),
-  ACE_NTOHL (0x713a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65665365), 
+  ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InterfaceDefSeq:1.0
     16,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x53657100),  // name = InterfaceDefSeq
     CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
@@ -616,21 +618,21 @@ static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
     64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f496e),
-      ACE_NTOHL (0x74657266),
-      ACE_NTOHL (0x61636544),
-      ACE_NTOHL (0x65663a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f496e), 
+      ACE_NTOHL (0x74657266), 
+      ACE_NTOHL (0x61636544), 
+      ACE_NTOHL (0x65663a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
             13,
-      ACE_NTOHL (0x496e7465),
-      ACE_NTOHL (0x72666163),
-      ACE_NTOHL (0x65446566),
+      ACE_NTOHL (0x496e7465), 
+      ACE_NTOHL (0x72666163), 
+      ACE_NTOHL (0x65446566), 
       ACE_NTOHL (0x0),  // name = InterfaceDef
-
+      
     0U,
 
 };
@@ -640,7 +642,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDefSeq (
     sizeof (_oc_CORBA_InterfaceDefSeq),
     (char *) &_oc_CORBA_InterfaceDefSeq,
     0,
-    sizeof (CORBA::InterfaceDefSeq)
+    0
   );
 
 namespace CORBA
@@ -650,24 +652,24 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65665365),
-  ACE_NTOHL (0x713a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c756544), 
+  ACE_NTOHL (0x65665365), 
+  ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueDefSeq:1.0
     12,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x53657100),  // name = ValueDefSeq
     CORBA::tk_sequence, // typecode kind
   72, // encapsulation length
@@ -676,19 +678,19 @@ static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
     56, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       31,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5661),
-      ACE_NTOHL (0x6c756544),
-      ACE_NTOHL (0x65663a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5661), 
+      ACE_NTOHL (0x6c756544), 
+      ACE_NTOHL (0x65663a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
             9,
-      ACE_NTOHL (0x56616c75),
-      ACE_NTOHL (0x65446566),
+      ACE_NTOHL (0x56616c75), 
+      ACE_NTOHL (0x65446566), 
       ACE_NTOHL (0x0),  // name = ValueDef
-
+      
     0U,
 
 };
@@ -698,7 +700,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDefSeq (
     sizeof (_oc_CORBA_ValueDefSeq),
     (char *) &_oc_CORBA_ValueDefSeq,
     0,
-    sizeof (CORBA::ValueDefSeq)
+    0
   );
 
 namespace CORBA
@@ -708,30 +710,30 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_AbstractInterfaceDefSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4162),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x6374496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65665365),
-  ACE_NTOHL (0x713a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4162), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x6374496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65665365), 
+  ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0
     24,
-  ACE_NTOHL (0x41627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x41627374), 
+  ACE_NTOHL (0x72616374), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x53657100),  // name = AbstractInterfaceDefSeq
     CORBA::tk_sequence, // typecode kind
   96, // encapsulation length
@@ -740,25 +742,25 @@ static const CORBA::Long _oc_CORBA_AbstractInterfaceDefSeq[] =
     80, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4162),
-      ACE_NTOHL (0x73747261),
-      ACE_NTOHL (0x6374496e),
-      ACE_NTOHL (0x74657266),
-      ACE_NTOHL (0x61636544),
-      ACE_NTOHL (0x65663a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4162), 
+      ACE_NTOHL (0x73747261), 
+      ACE_NTOHL (0x6374496e), 
+      ACE_NTOHL (0x74657266), 
+      ACE_NTOHL (0x61636544), 
+      ACE_NTOHL (0x65663a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
             21,
-      ACE_NTOHL (0x41627374),
-      ACE_NTOHL (0x72616374),
-      ACE_NTOHL (0x496e7465),
-      ACE_NTOHL (0x72666163),
-      ACE_NTOHL (0x65446566),
+      ACE_NTOHL (0x41627374), 
+      ACE_NTOHL (0x72616374), 
+      ACE_NTOHL (0x496e7465), 
+      ACE_NTOHL (0x72666163), 
+      ACE_NTOHL (0x65446566), 
       ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
-
+      
     0U,
 
 };
@@ -768,7 +770,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_AbstractInterfaceDefSeq (
     sizeof (_oc_CORBA_AbstractInterfaceDefSeq),
     (char *) &_oc_CORBA_AbstractInterfaceDefSeq,
     0,
-    sizeof (CORBA::AbstractInterfaceDefSeq)
+    0
   );
 
 namespace CORBA
@@ -778,29 +780,29 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_LocalInterfaceDefSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4c6f),
-  ACE_NTOHL (0x63616c49),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x44656653),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4c6f), 
+  ACE_NTOHL (0x63616c49), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44656653), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0
     21,
-  ACE_NTOHL (0x4c6f6361),
-  ACE_NTOHL (0x6c496e74),
-  ACE_NTOHL (0x65726661),
-  ACE_NTOHL (0x63654465),
-  ACE_NTOHL (0x66536571),
+  ACE_NTOHL (0x4c6f6361), 
+  ACE_NTOHL (0x6c496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x66536571), 
   ACE_NTOHL (0x0),  // name = LocalInterfaceDefSeq
     CORBA::tk_sequence, // typecode kind
   88, // encapsulation length
@@ -809,23 +811,23 @@ static const CORBA::Long _oc_CORBA_LocalInterfaceDefSeq[] =
     72, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       40,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4c6f),
-      ACE_NTOHL (0x63616c49),
-      ACE_NTOHL (0x6e746572),
-      ACE_NTOHL (0x66616365),
-      ACE_NTOHL (0x4465663a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4c6f), 
+      ACE_NTOHL (0x63616c49), 
+      ACE_NTOHL (0x6e746572), 
+      ACE_NTOHL (0x66616365), 
+      ACE_NTOHL (0x4465663a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
             18,
-      ACE_NTOHL (0x4c6f6361),
-      ACE_NTOHL (0x6c496e74),
-      ACE_NTOHL (0x65726661),
-      ACE_NTOHL (0x63654465),
+      ACE_NTOHL (0x4c6f6361), 
+      ACE_NTOHL (0x6c496e74), 
+      ACE_NTOHL (0x65726661), 
+      ACE_NTOHL (0x63654465), 
       ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
-
+      
     0U,
 
 };
@@ -835,7 +837,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_LocalInterfaceDefSeq (
     sizeof (_oc_CORBA_LocalInterfaceDefSeq),
     (char *) &_oc_CORBA_LocalInterfaceDefSeq,
     0,
-    sizeof (CORBA::LocalInterfaceDefSeq)
+    0
   );
 
 namespace CORBA
@@ -845,28 +847,28 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtInterfaceDefSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x74496e74),
-  ACE_NTOHL (0x65726661),
-  ACE_NTOHL (0x63654465),
-  ACE_NTOHL (0x66536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x66536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0
     19,
-  ACE_NTOHL (0x45787449),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x44656653),
+  ACE_NTOHL (0x45787449), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44656653), 
   ACE_NTOHL (0x65710000),  // name = ExtInterfaceDefSeq
     CORBA::tk_sequence, // typecode kind
   84, // encapsulation length
@@ -875,22 +877,22 @@ static const CORBA::Long _oc_CORBA_ExtInterfaceDefSeq[] =
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       38,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x74496e74),
-      ACE_NTOHL (0x65726661),
-      ACE_NTOHL (0x63654465),
-      ACE_NTOHL (0x663a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x74496e74), 
+      ACE_NTOHL (0x65726661), 
+      ACE_NTOHL (0x63654465), 
+      ACE_NTOHL (0x663a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDef:1.0
             16,
-      ACE_NTOHL (0x45787449),
-      ACE_NTOHL (0x6e746572),
-      ACE_NTOHL (0x66616365),
+      ACE_NTOHL (0x45787449), 
+      ACE_NTOHL (0x6e746572), 
+      ACE_NTOHL (0x66616365), 
       ACE_NTOHL (0x44656600),  // name = ExtInterfaceDef
-
+      
     0U,
 
 };
@@ -900,7 +902,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInterfaceDefSeq (
     sizeof (_oc_CORBA_ExtInterfaceDefSeq),
     (char *) &_oc_CORBA_ExtInterfaceDefSeq,
     0,
-    sizeof (CORBA::ExtInterfaceDefSeq)
+    0
   );
 
 namespace CORBA
@@ -910,26 +912,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtValueDefSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x7456616c),
-  ACE_NTOHL (0x75654465),
-  ACE_NTOHL (0x66536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x7456616c), 
+  ACE_NTOHL (0x75654465), 
+  ACE_NTOHL (0x66536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtValueDefSeq:1.0
     15,
-  ACE_NTOHL (0x45787456),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x44656653),
+  ACE_NTOHL (0x45787456), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x44656653), 
   ACE_NTOHL (0x65710000),  // name = ExtValueDefSeq
     CORBA::tk_sequence, // typecode kind
   76, // encapsulation length
@@ -938,20 +940,20 @@ static const CORBA::Long _oc_CORBA_ExtValueDefSeq[] =
     60, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x7456616c),
-      ACE_NTOHL (0x75654465),
-      ACE_NTOHL (0x663a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x7456616c), 
+      ACE_NTOHL (0x75654465), 
+      ACE_NTOHL (0x663a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef:1.0
             12,
-      ACE_NTOHL (0x45787456),
-      ACE_NTOHL (0x616c7565),
+      ACE_NTOHL (0x45787456), 
+      ACE_NTOHL (0x616c7565), 
       ACE_NTOHL (0x44656600),  // name = ExtValueDef
-
+      
     0U,
 
 };
@@ -961,7 +963,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtValueDefSeq (
     sizeof (_oc_CORBA_ExtValueDefSeq),
     (char *) &_oc_CORBA_ExtValueDefSeq,
     0,
-    sizeof (CORBA::ExtValueDefSeq)
+    0
   );
 
 namespace CORBA
@@ -971,32 +973,32 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtAbstractInterfaceDefSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x74416273),
-  ACE_NTOHL (0x74726163),
-  ACE_NTOHL (0x74496e74),
-  ACE_NTOHL (0x65726661),
-  ACE_NTOHL (0x63654465),
-  ACE_NTOHL (0x66536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74416273), 
+  ACE_NTOHL (0x74726163), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x66536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0
     27,
-  ACE_NTOHL (0x45787441),
-  ACE_NTOHL (0x62737472),
-  ACE_NTOHL (0x61637449),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x44656653),
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x61637449), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44656653), 
   ACE_NTOHL (0x65710000),  // name = ExtAbstractInterfaceDefSeq
     CORBA::tk_sequence, // typecode kind
   100, // encapsulation length
@@ -1005,26 +1007,26 @@ static const CORBA::Long _oc_CORBA_ExtAbstractInterfaceDefSeq[] =
     84, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       46,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x74416273),
-      ACE_NTOHL (0x74726163),
-      ACE_NTOHL (0x74496e74),
-      ACE_NTOHL (0x65726661),
-      ACE_NTOHL (0x63654465),
-      ACE_NTOHL (0x663a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x74416273), 
+      ACE_NTOHL (0x74726163), 
+      ACE_NTOHL (0x74496e74), 
+      ACE_NTOHL (0x65726661), 
+      ACE_NTOHL (0x63654465), 
+      ACE_NTOHL (0x663a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0
             24,
-      ACE_NTOHL (0x45787441),
-      ACE_NTOHL (0x62737472),
-      ACE_NTOHL (0x61637449),
-      ACE_NTOHL (0x6e746572),
-      ACE_NTOHL (0x66616365),
+      ACE_NTOHL (0x45787441), 
+      ACE_NTOHL (0x62737472), 
+      ACE_NTOHL (0x61637449), 
+      ACE_NTOHL (0x6e746572), 
+      ACE_NTOHL (0x66616365), 
       ACE_NTOHL (0x44656600),  // name = ExtAbstractInterfaceDef
-
+      
     0U,
 
 };
@@ -1034,7 +1036,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAbstractInterfaceDefSeq (
     sizeof (_oc_CORBA_ExtAbstractInterfaceDefSeq),
     (char *) &_oc_CORBA_ExtAbstractInterfaceDefSeq,
     0,
-    sizeof (CORBA::ExtAbstractInterfaceDefSeq)
+    0
   );
 
 namespace CORBA
@@ -1044,30 +1046,30 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtLocalInterfaceDefSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x744c6f63),
-  ACE_NTOHL (0x616c496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65665365),
-  ACE_NTOHL (0x713a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x744c6f63), 
+  ACE_NTOHL (0x616c496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65665365), 
+  ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0
     24,
-  ACE_NTOHL (0x4578744c),
-  ACE_NTOHL (0x6f63616c),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x4578744c), 
+  ACE_NTOHL (0x6f63616c), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x53657100),  // name = ExtLocalInterfaceDefSeq
     CORBA::tk_sequence, // typecode kind
   96, // encapsulation length
@@ -1076,25 +1078,25 @@ static const CORBA::Long _oc_CORBA_ExtLocalInterfaceDefSeq[] =
     80, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x744c6f63),
-      ACE_NTOHL (0x616c496e),
-      ACE_NTOHL (0x74657266),
-      ACE_NTOHL (0x61636544),
-      ACE_NTOHL (0x65663a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x744c6f63), 
+      ACE_NTOHL (0x616c496e), 
+      ACE_NTOHL (0x74657266), 
+      ACE_NTOHL (0x61636544), 
+      ACE_NTOHL (0x65663a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0
             21,
-      ACE_NTOHL (0x4578744c),
-      ACE_NTOHL (0x6f63616c),
-      ACE_NTOHL (0x496e7465),
-      ACE_NTOHL (0x72666163),
-      ACE_NTOHL (0x65446566),
+      ACE_NTOHL (0x4578744c), 
+      ACE_NTOHL (0x6f63616c), 
+      ACE_NTOHL (0x496e7465), 
+      ACE_NTOHL (0x72666163), 
+      ACE_NTOHL (0x65446566), 
       ACE_NTOHL (0x0),  // name = ExtLocalInterfaceDef
-
+      
     0U,
 
 };
@@ -1104,7 +1106,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtLocalInterfaceDefSeq (
     sizeof (_oc_CORBA_ExtLocalInterfaceDefSeq),
     (char *) &_oc_CORBA_ExtLocalInterfaceDefSeq,
     0,
-    sizeof (CORBA::ExtLocalInterfaceDefSeq)
+    0
   );
 
 namespace CORBA
@@ -1114,25 +1116,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ContainedSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e656453),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e746169), 
+  ACE_NTOHL (0x6e656453), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContainedSeq:1.0
     13,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x61696e65),
-  ACE_NTOHL (0x64536571),
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x61696e65), 
+  ACE_NTOHL (0x64536571), 
   ACE_NTOHL (0x0),  // name = ContainedSeq
     CORBA::tk_sequence, // typecode kind
   72, // encapsulation length
@@ -1141,19 +1143,19 @@ static const CORBA::Long _oc_CORBA_ContainedSeq[] =
     56, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       32,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f436f),
-      ACE_NTOHL (0x6e746169),
-      ACE_NTOHL (0x6e65643a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6e746169), 
+      ACE_NTOHL (0x6e65643a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
             10,
-      ACE_NTOHL (0x436f6e74),
-      ACE_NTOHL (0x61696e65),
+      ACE_NTOHL (0x436f6e74), 
+      ACE_NTOHL (0x61696e65), 
       ACE_NTOHL (0x64000000),  // name = Contained
-
+      
     0U,
 
 };
@@ -1163,7 +1165,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ContainedSeq (
     sizeof (_oc_CORBA_ContainedSeq),
     (char *) &_oc_CORBA_ContainedSeq,
     0,
-    sizeof (CORBA::ContainedSeq)
+    0
   );
 
 namespace CORBA
@@ -1173,75 +1175,75 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_StructMember[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5374),
-  ACE_NTOHL (0x72756374),
-  ACE_NTOHL (0x4d656d62),
-  ACE_NTOHL (0x65723a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5374), 
+  ACE_NTOHL (0x72756374), 
+  ACE_NTOHL (0x4d656d62), 
+  ACE_NTOHL (0x65723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
     13,
-  ACE_NTOHL (0x53747275),
-  ACE_NTOHL (0x63744d65),
-  ACE_NTOHL (0x6d626572),
+  ACE_NTOHL (0x53747275), 
+  ACE_NTOHL (0x63744d65), 
+  ACE_NTOHL (0x6d626572), 
   ACE_NTOHL (0x0),  // name = StructMember
   3, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   9,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f646566),
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x5f646566), 
   ACE_NTOHL (0x0),  // name = type_def
     CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4944),
-    ACE_NTOHL (0x4c547970),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4944), 
+    ACE_NTOHL (0x4c547970), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
         8,
-    ACE_NTOHL (0x49444c54),
+    ACE_NTOHL (0x49444c54), 
     ACE_NTOHL (0x79706500),  // name = IDLType
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMember (
@@ -1249,7 +1251,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMember (
     sizeof (_oc_CORBA_StructMember),
     (char *) &_oc_CORBA_StructMember,
     0,
-    sizeof (CORBA::StructMember)
+    0
   );
 
 namespace CORBA
@@ -1259,26 +1261,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5374),
-  ACE_NTOHL (0x72756374),
-  ACE_NTOHL (0x4d656d62),
-  ACE_NTOHL (0x65725365),
-  ACE_NTOHL (0x713a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5374), 
+  ACE_NTOHL (0x72756374), 
+  ACE_NTOHL (0x4d656d62), 
+  ACE_NTOHL (0x65725365), 
+  ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
     16,
-  ACE_NTOHL (0x53747275),
-  ACE_NTOHL (0x63744d65),
-  ACE_NTOHL (0x6d626572),
+  ACE_NTOHL (0x53747275), 
+  ACE_NTOHL (0x63744d65), 
+  ACE_NTOHL (0x6d626572), 
   ACE_NTOHL (0x53657100),  // name = StructMemberSeq
     CORBA::tk_sequence, // typecode kind
   264, // encapsulation length
@@ -1287,69 +1289,69 @@ static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
     248, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5374),
-      ACE_NTOHL (0x72756374),
-      ACE_NTOHL (0x4d656d62),
-      ACE_NTOHL (0x65723a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5374), 
+      ACE_NTOHL (0x72756374), 
+      ACE_NTOHL (0x4d656d62), 
+      ACE_NTOHL (0x65723a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
             13,
-      ACE_NTOHL (0x53747275),
-      ACE_NTOHL (0x63744d65),
-      ACE_NTOHL (0x6d626572),
+      ACE_NTOHL (0x53747275), 
+      ACE_NTOHL (0x63744d65), 
+      ACE_NTOHL (0x6d626572), 
       ACE_NTOHL (0x0),  // name = StructMember
       3, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       9,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x5f646566),
+      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x5f646566), 
       ACE_NTOHL (0x0),  // name = type_def
             CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4944),
-        ACE_NTOHL (0x4c547970),
-        ACE_NTOHL (0x653a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4944), 
+        ACE_NTOHL (0x4c547970), 
+        ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-        ACE_NTOHL (0x49444c54),
+        ACE_NTOHL (0x49444c54), 
         ACE_NTOHL (0x79706500),  // name = IDLType
-
+        
 
     0U,
 
@@ -1360,7 +1362,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMemberSeq (
     sizeof (_oc_CORBA_StructMemberSeq),
     (char *) &_oc_CORBA_StructMemberSeq,
     0,
-    sizeof (CORBA::StructMemberSeq)
+    0
   );
 
 namespace CORBA
@@ -1370,47 +1372,47 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Initializer[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x69746961),
-  ACE_NTOHL (0x6c697a65),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x69746961), 
+  ACE_NTOHL (0x6c697a65), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
     12,
-  ACE_NTOHL (0x496e6974),
-  ACE_NTOHL (0x69616c69),
+  ACE_NTOHL (0x496e6974), 
+  ACE_NTOHL (0x69616c69), 
   ACE_NTOHL (0x7a657200),  // name = Initializer
   2, // member count
     8,
-  ACE_NTOHL (0x6d656d62),
+  ACE_NTOHL (0x6d656d62), 
   ACE_NTOHL (0x65727300),  // name = members
     CORBA::tk_alias, // typecode kind for typedefs
   340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5374),
-    ACE_NTOHL (0x72756374),
-    ACE_NTOHL (0x4d656d62),
-    ACE_NTOHL (0x65725365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5374), 
+    ACE_NTOHL (0x72756374), 
+    ACE_NTOHL (0x4d656d62), 
+    ACE_NTOHL (0x65725365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
         16,
-    ACE_NTOHL (0x53747275),
-    ACE_NTOHL (0x63744d65),
-    ACE_NTOHL (0x6d626572),
+    ACE_NTOHL (0x53747275), 
+    ACE_NTOHL (0x63744d65), 
+    ACE_NTOHL (0x6d626572), 
     ACE_NTOHL (0x53657100),  // name = StructMemberSeq
         CORBA::tk_sequence, // typecode kind
     264, // encapsulation length
@@ -1419,94 +1421,94 @@ static const CORBA::Long _oc_CORBA_Initializer[] =
       248, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5374),
-        ACE_NTOHL (0x72756374),
-        ACE_NTOHL (0x4d656d62),
-        ACE_NTOHL (0x65723a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5374), 
+        ACE_NTOHL (0x72756374), 
+        ACE_NTOHL (0x4d656d62), 
+        ACE_NTOHL (0x65723a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
                 13,
-        ACE_NTOHL (0x53747275),
-        ACE_NTOHL (0x63744d65),
-        ACE_NTOHL (0x6d626572),
+        ACE_NTOHL (0x53747275), 
+        ACE_NTOHL (0x63744d65), 
+        ACE_NTOHL (0x6d626572), 
         ACE_NTOHL (0x0),  // name = StructMember
         3, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x5f646566),
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x5f646566), 
         ACE_NTOHL (0x0),  // name = type_def
                 CORBA::tk_objref, // typecode kind
         52, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4944),
-          ACE_NTOHL (0x4c547970),
-          ACE_NTOHL (0x653a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4944), 
+          ACE_NTOHL (0x4c547970), 
+          ACE_NTOHL (0x653a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                     8,
-          ACE_NTOHL (0x49444c54),
+          ACE_NTOHL (0x49444c54), 
           ACE_NTOHL (0x79706500),  // name = IDLType
-
+          
 
       0U,
 
 
   5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -1516,7 +1518,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Initializer (
     sizeof (_oc_CORBA_Initializer),
     (char *) &_oc_CORBA_Initializer,
     0,
-    sizeof (CORBA::Initializer)
+    0
   );
 
 namespace CORBA
@@ -1526,26 +1528,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_InitializerSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x69746961),
-  ACE_NTOHL (0x6c697a65),
-  ACE_NTOHL (0x72536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x69746961), 
+  ACE_NTOHL (0x6c697a65), 
+  ACE_NTOHL (0x72536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
     15,
-  ACE_NTOHL (0x496e6974),
-  ACE_NTOHL (0x69616c69),
-  ACE_NTOHL (0x7a657253),
+  ACE_NTOHL (0x496e6974), 
+  ACE_NTOHL (0x69616c69), 
+  ACE_NTOHL (0x7a657253), 
   ACE_NTOHL (0x65710000),  // name = InitializerSeq
     CORBA::tk_sequence, // typecode kind
   528, // encapsulation length
@@ -1554,41 +1556,41 @@ static const CORBA::Long _oc_CORBA_InitializerSeq[] =
     512, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f496e),
-      ACE_NTOHL (0x69746961),
-      ACE_NTOHL (0x6c697a65),
-      ACE_NTOHL (0x723a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f496e), 
+      ACE_NTOHL (0x69746961), 
+      ACE_NTOHL (0x6c697a65), 
+      ACE_NTOHL (0x723a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
             12,
-      ACE_NTOHL (0x496e6974),
-      ACE_NTOHL (0x69616c69),
+      ACE_NTOHL (0x496e6974), 
+      ACE_NTOHL (0x69616c69), 
       ACE_NTOHL (0x7a657200),  // name = Initializer
       2, // member count
             8,
-      ACE_NTOHL (0x6d656d62),
+      ACE_NTOHL (0x6d656d62), 
       ACE_NTOHL (0x65727300),  // name = members
             CORBA::tk_alias, // typecode kind for typedefs
       340, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         38,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5374),
-        ACE_NTOHL (0x72756374),
-        ACE_NTOHL (0x4d656d62),
-        ACE_NTOHL (0x65725365),
-        ACE_NTOHL (0x713a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5374), 
+        ACE_NTOHL (0x72756374), 
+        ACE_NTOHL (0x4d656d62), 
+        ACE_NTOHL (0x65725365), 
+        ACE_NTOHL (0x713a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
                 16,
-        ACE_NTOHL (0x53747275),
-        ACE_NTOHL (0x63744d65),
-        ACE_NTOHL (0x6d626572),
+        ACE_NTOHL (0x53747275), 
+        ACE_NTOHL (0x63744d65), 
+        ACE_NTOHL (0x6d626572), 
         ACE_NTOHL (0x53657100),  // name = StructMemberSeq
                 CORBA::tk_sequence, // typecode kind
         264, // encapsulation length
@@ -1597,94 +1599,94 @@ static const CORBA::Long _oc_CORBA_InitializerSeq[] =
           248, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             35,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f5374),
-            ACE_NTOHL (0x72756374),
-            ACE_NTOHL (0x4d656d62),
-            ACE_NTOHL (0x65723a31),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f5374), 
+            ACE_NTOHL (0x72756374), 
+            ACE_NTOHL (0x4d656d62), 
+            ACE_NTOHL (0x65723a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
                         13,
-            ACE_NTOHL (0x53747275),
-            ACE_NTOHL (0x63744d65),
-            ACE_NTOHL (0x6d626572),
+            ACE_NTOHL (0x53747275), 
+            ACE_NTOHL (0x63744d65), 
+            ACE_NTOHL (0x6d626572), 
             ACE_NTOHL (0x0),  // name = StructMember
             3, // member count
                         5,
-            ACE_NTOHL (0x6e616d65),
+            ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4964), 
+              ACE_NTOHL (0x656e7469), 
+              ACE_NTOHL (0x66696572), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                             11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
+              ACE_NTOHL (0x4964656e), 
+              ACE_NTOHL (0x74696669), 
               ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             5,
-            ACE_NTOHL (0x74797065),
+            ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
             9,
-            ACE_NTOHL (0x74797065),
-            ACE_NTOHL (0x5f646566),
+            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x5f646566), 
             ACE_NTOHL (0x0),  // name = type_def
                         CORBA::tk_objref, // typecode kind
             52, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               30,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4944),
-              ACE_NTOHL (0x4c547970),
-              ACE_NTOHL (0x653a312e),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4944), 
+              ACE_NTOHL (0x4c547970), 
+              ACE_NTOHL (0x653a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                             8,
-              ACE_NTOHL (0x49444c54),
+              ACE_NTOHL (0x49444c54), 
               ACE_NTOHL (0x79706500),  // name = IDLType
-
+              
 
           0U,
 
 
       5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -1697,7 +1699,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InitializerSeq (
     sizeof (_oc_CORBA_InitializerSeq),
     (char *) &_oc_CORBA_InitializerSeq,
     0,
-    sizeof (CORBA::InitializerSeq)
+    0
   );
 
 namespace CORBA
@@ -1707,52 +1709,52 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExceptionDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x696f6e44), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
     21,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = ExceptionDescription
   5, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -1761,73 +1763,73 @@ static const CORBA::Long _oc_CORBA_ExceptionDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -1838,7 +1840,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDescription (
     sizeof (_oc_CORBA_ExceptionDescription),
     (char *) &_oc_CORBA_ExceptionDescription,
     0,
-    sizeof (CORBA::ExceptionDescription)
+    0
   );
 
 namespace CORBA
@@ -1848,27 +1850,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x63446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x63446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
     18,
-  ACE_NTOHL (0x45786344),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e5365),
+  ACE_NTOHL (0x45786344), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e5365), 
   ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   476, // encapsulation length
@@ -1877,46 +1879,46 @@ static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
     460, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x63657074),
-      ACE_NTOHL (0x696f6e44),
-      ACE_NTOHL (0x65736372),
-      ACE_NTOHL (0x69707469),
-      ACE_NTOHL (0x6f6e3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x63657074), 
+      ACE_NTOHL (0x696f6e44), 
+      ACE_NTOHL (0x65736372), 
+      ACE_NTOHL (0x69707469), 
+      ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
             21,
-      ACE_NTOHL (0x45786365),
-      ACE_NTOHL (0x7074696f),
-      ACE_NTOHL (0x6e446573),
-      ACE_NTOHL (0x63726970),
-      ACE_NTOHL (0x74696f6e),
+      ACE_NTOHL (0x45786365), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e446573), 
+      ACE_NTOHL (0x63726970), 
+      ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = ExceptionDescription
       5, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       3,
@@ -1925,73 +1927,73 @@ static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273),
+      ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
@@ -2005,7 +2007,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExcDescriptionSeq (
     sizeof (_oc_CORBA_ExcDescriptionSeq),
     (char *) &_oc_CORBA_ExcDescriptionSeq,
     0,
-    sizeof (CORBA::ExcDescriptionSeq)
+    0
   );
 
 namespace CORBA
@@ -2015,49 +2017,49 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtInitializer[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x74496e69),
-  ACE_NTOHL (0x7469616c),
-  ACE_NTOHL (0x697a6572),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74496e69), 
+  ACE_NTOHL (0x7469616c), 
+  ACE_NTOHL (0x697a6572), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
     15,
-  ACE_NTOHL (0x45787449),
-  ACE_NTOHL (0x6e697469),
-  ACE_NTOHL (0x616c697a),
+  ACE_NTOHL (0x45787449), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
   ACE_NTOHL (0x65720000),  // name = ExtInitializer
   3, // member count
     8,
-  ACE_NTOHL (0x6d656d62),
+  ACE_NTOHL (0x6d656d62), 
   ACE_NTOHL (0x65727300),  // name = members
     CORBA::tk_alias, // typecode kind for typedefs
   340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5374),
-    ACE_NTOHL (0x72756374),
-    ACE_NTOHL (0x4d656d62),
-    ACE_NTOHL (0x65725365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5374), 
+    ACE_NTOHL (0x72756374), 
+    ACE_NTOHL (0x4d656d62), 
+    ACE_NTOHL (0x65725365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
         16,
-    ACE_NTOHL (0x53747275),
-    ACE_NTOHL (0x63744d65),
-    ACE_NTOHL (0x6d626572),
+    ACE_NTOHL (0x53747275), 
+    ACE_NTOHL (0x63744d65), 
+    ACE_NTOHL (0x6d626572), 
     ACE_NTOHL (0x53657100),  // name = StructMemberSeq
         CORBA::tk_sequence, // typecode kind
     264, // encapsulation length
@@ -2066,96 +2068,96 @@ static const CORBA::Long _oc_CORBA_ExtInitializer[] =
       248, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5374),
-        ACE_NTOHL (0x72756374),
-        ACE_NTOHL (0x4d656d62),
-        ACE_NTOHL (0x65723a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5374), 
+        ACE_NTOHL (0x72756374), 
+        ACE_NTOHL (0x4d656d62), 
+        ACE_NTOHL (0x65723a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
                 13,
-        ACE_NTOHL (0x53747275),
-        ACE_NTOHL (0x63744d65),
-        ACE_NTOHL (0x6d626572),
+        ACE_NTOHL (0x53747275), 
+        ACE_NTOHL (0x63744d65), 
+        ACE_NTOHL (0x6d626572), 
         ACE_NTOHL (0x0),  // name = StructMember
         3, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x5f646566),
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x5f646566), 
         ACE_NTOHL (0x0),  // name = type_def
                 CORBA::tk_objref, // typecode kind
         52, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4944),
-          ACE_NTOHL (0x4c547970),
-          ACE_NTOHL (0x653a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4944), 
+          ACE_NTOHL (0x4c547970), 
+          ACE_NTOHL (0x653a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                     8,
-          ACE_NTOHL (0x49444c54),
+          ACE_NTOHL (0x49444c54), 
           ACE_NTOHL (0x79706500),  // name = IDLType
-
+          
 
       0U,
 
 
   11,
-  ACE_NTOHL (0x65786365),
-  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x65786365), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e730000),  // name = exceptions
     CORBA::tk_alias, // typecode kind for typedefs
   556, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x63446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x63446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
         18,
-    ACE_NTOHL (0x45786344),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x45786344), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     476, // encapsulation length
@@ -2164,46 +2166,46 @@ static const CORBA::Long _oc_CORBA_ExtInitializer[] =
       460, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63657074),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63657074), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                 21,
-        ACE_NTOHL (0x45786365),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x45786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = ExceptionDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -2212,73 +2214,73 @@ static const CORBA::Long _oc_CORBA_ExtInitializer[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
@@ -2287,26 +2289,26 @@ static const CORBA::Long _oc_CORBA_ExtInitializer[] =
 
 
   5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -2316,7 +2318,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInitializer (
     sizeof (_oc_CORBA_ExtInitializer),
     (char *) &_oc_CORBA_ExtInitializer,
     0,
-    sizeof (CORBA::ExtInitializer)
+    0
   );
 
 namespace CORBA
@@ -2326,27 +2328,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtInitializerSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x74496e69),
-  ACE_NTOHL (0x7469616c),
-  ACE_NTOHL (0x697a6572),
-  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74496e69), 
+  ACE_NTOHL (0x7469616c), 
+  ACE_NTOHL (0x697a6572), 
+  ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtInitializerSeq:1.0
     18,
-  ACE_NTOHL (0x45787449),
-  ACE_NTOHL (0x6e697469),
-  ACE_NTOHL (0x616c697a),
-  ACE_NTOHL (0x65725365),
+  ACE_NTOHL (0x45787449), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
+  ACE_NTOHL (0x65725365), 
   ACE_NTOHL (0x71000000),  // name = ExtInitializerSeq
     CORBA::tk_sequence, // typecode kind
   1116, // encapsulation length
@@ -2355,43 +2357,43 @@ static const CORBA::Long _oc_CORBA_ExtInitializerSeq[] =
     1100, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       37,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x74496e69),
-      ACE_NTOHL (0x7469616c),
-      ACE_NTOHL (0x697a6572),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x74496e69), 
+      ACE_NTOHL (0x7469616c), 
+      ACE_NTOHL (0x697a6572), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
             15,
-      ACE_NTOHL (0x45787449),
-      ACE_NTOHL (0x6e697469),
-      ACE_NTOHL (0x616c697a),
+      ACE_NTOHL (0x45787449), 
+      ACE_NTOHL (0x6e697469), 
+      ACE_NTOHL (0x616c697a), 
       ACE_NTOHL (0x65720000),  // name = ExtInitializer
       3, // member count
             8,
-      ACE_NTOHL (0x6d656d62),
+      ACE_NTOHL (0x6d656d62), 
       ACE_NTOHL (0x65727300),  // name = members
             CORBA::tk_alias, // typecode kind for typedefs
       340, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         38,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5374),
-        ACE_NTOHL (0x72756374),
-        ACE_NTOHL (0x4d656d62),
-        ACE_NTOHL (0x65725365),
-        ACE_NTOHL (0x713a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5374), 
+        ACE_NTOHL (0x72756374), 
+        ACE_NTOHL (0x4d656d62), 
+        ACE_NTOHL (0x65725365), 
+        ACE_NTOHL (0x713a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
                 16,
-        ACE_NTOHL (0x53747275),
-        ACE_NTOHL (0x63744d65),
-        ACE_NTOHL (0x6d626572),
+        ACE_NTOHL (0x53747275), 
+        ACE_NTOHL (0x63744d65), 
+        ACE_NTOHL (0x6d626572), 
         ACE_NTOHL (0x53657100),  // name = StructMemberSeq
                 CORBA::tk_sequence, // typecode kind
         264, // encapsulation length
@@ -2400,96 +2402,96 @@ static const CORBA::Long _oc_CORBA_ExtInitializerSeq[] =
           248, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             35,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f5374),
-            ACE_NTOHL (0x72756374),
-            ACE_NTOHL (0x4d656d62),
-            ACE_NTOHL (0x65723a31),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f5374), 
+            ACE_NTOHL (0x72756374), 
+            ACE_NTOHL (0x4d656d62), 
+            ACE_NTOHL (0x65723a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
                         13,
-            ACE_NTOHL (0x53747275),
-            ACE_NTOHL (0x63744d65),
-            ACE_NTOHL (0x6d626572),
+            ACE_NTOHL (0x53747275), 
+            ACE_NTOHL (0x63744d65), 
+            ACE_NTOHL (0x6d626572), 
             ACE_NTOHL (0x0),  // name = StructMember
             3, // member count
                         5,
-            ACE_NTOHL (0x6e616d65),
+            ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4964), 
+              ACE_NTOHL (0x656e7469), 
+              ACE_NTOHL (0x66696572), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                             11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
+              ACE_NTOHL (0x4964656e), 
+              ACE_NTOHL (0x74696669), 
               ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             5,
-            ACE_NTOHL (0x74797065),
+            ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
             9,
-            ACE_NTOHL (0x74797065),
-            ACE_NTOHL (0x5f646566),
+            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x5f646566), 
             ACE_NTOHL (0x0),  // name = type_def
                         CORBA::tk_objref, // typecode kind
             52, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               30,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4944),
-              ACE_NTOHL (0x4c547970),
-              ACE_NTOHL (0x653a312e),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4944), 
+              ACE_NTOHL (0x4c547970), 
+              ACE_NTOHL (0x653a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                             8,
-              ACE_NTOHL (0x49444c54),
+              ACE_NTOHL (0x49444c54), 
               ACE_NTOHL (0x79706500),  // name = IDLType
-
+              
 
           0U,
 
 
       11,
-      ACE_NTOHL (0x65786365),
-      ACE_NTOHL (0x7074696f),
+      ACE_NTOHL (0x65786365), 
+      ACE_NTOHL (0x7074696f), 
       ACE_NTOHL (0x6e730000),  // name = exceptions
             CORBA::tk_alias, // typecode kind for typedefs
       556, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x5365713a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x5365713a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                 18,
-        ACE_NTOHL (0x45786344),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e5365),
+        ACE_NTOHL (0x45786344), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e5365), 
         ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                 CORBA::tk_sequence, // typecode kind
         476, // encapsulation length
@@ -2498,46 +2500,46 @@ static const CORBA::Long _oc_CORBA_ExtInitializerSeq[] =
           460, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             43,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f4578),
-            ACE_NTOHL (0x63657074),
-            ACE_NTOHL (0x696f6e44),
-            ACE_NTOHL (0x65736372),
-            ACE_NTOHL (0x69707469),
-            ACE_NTOHL (0x6f6e3a31),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f4578), 
+            ACE_NTOHL (0x63657074), 
+            ACE_NTOHL (0x696f6e44), 
+            ACE_NTOHL (0x65736372), 
+            ACE_NTOHL (0x69707469), 
+            ACE_NTOHL (0x6f6e3a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                         21,
-            ACE_NTOHL (0x45786365),
-            ACE_NTOHL (0x7074696f),
-            ACE_NTOHL (0x6e446573),
-            ACE_NTOHL (0x63726970),
-            ACE_NTOHL (0x74696f6e),
+            ACE_NTOHL (0x45786365), 
+            ACE_NTOHL (0x7074696f), 
+            ACE_NTOHL (0x6e446573), 
+            ACE_NTOHL (0x63726970), 
+            ACE_NTOHL (0x74696f6e), 
             ACE_NTOHL (0x0),  // name = ExceptionDescription
             5, // member count
                         5,
-            ACE_NTOHL (0x6e616d65),
+            ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4964), 
+              ACE_NTOHL (0x656e7469), 
+              ACE_NTOHL (0x66696572), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                             11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
+              ACE_NTOHL (0x4964656e), 
+              ACE_NTOHL (0x74696669), 
               ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             3,
@@ -2546,73 +2548,73 @@ static const CORBA::Long _oc_CORBA_ExtInitializerSeq[] =
             72, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x49643a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                             13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
+              ACE_NTOHL (0x5265706f), 
+              ACE_NTOHL (0x7369746f), 
+              ACE_NTOHL (0x72794964), 
               ACE_NTOHL (0x0),  // name = RepositoryId
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             11,
-            ACE_NTOHL (0x64656669),
-            ACE_NTOHL (0x6e65645f),
+            ACE_NTOHL (0x64656669), 
+            ACE_NTOHL (0x6e65645f), 
             ACE_NTOHL (0x696e0000),  // name = defined_in
                         CORBA::tk_alias, // typecode kind for typedefs
             72, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x49643a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                             13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
+              ACE_NTOHL (0x5265706f), 
+              ACE_NTOHL (0x7369746f), 
+              ACE_NTOHL (0x72794964), 
               ACE_NTOHL (0x0),  // name = RepositoryId
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             8,
-            ACE_NTOHL (0x76657273),
+            ACE_NTOHL (0x76657273), 
             ACE_NTOHL (0x696f6e00),  // name = version
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               34,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5665),
-              ACE_NTOHL (0x7273696f),
-              ACE_NTOHL (0x6e537065),
-              ACE_NTOHL (0x633a312e),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5665), 
+              ACE_NTOHL (0x7273696f), 
+              ACE_NTOHL (0x6e537065), 
+              ACE_NTOHL (0x633a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                             12,
-              ACE_NTOHL (0x56657273),
-              ACE_NTOHL (0x696f6e53),
+              ACE_NTOHL (0x56657273), 
+              ACE_NTOHL (0x696f6e53), 
               ACE_NTOHL (0x70656300),  // name = VersionSpec
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             5,
-            ACE_NTOHL (0x74797065),
+            ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
@@ -2621,26 +2623,26 @@ static const CORBA::Long _oc_CORBA_ExtInitializerSeq[] =
 
 
       5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -2653,7 +2655,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInitializerSeq (
     sizeof (_oc_CORBA_ExtInitializerSeq),
     (char *) &_oc_CORBA_ExtInitializerSeq,
     0,
-    sizeof (CORBA::ExtInitializerSeq)
+    0
   );
 
 namespace CORBA
@@ -2663,79 +2665,79 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_UnionMember[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f556e),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f556e), 
+  ACE_NTOHL (0x696f6e4d), 
+  ACE_NTOHL (0x656d6265), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
     12,
-  ACE_NTOHL (0x556e696f),
-  ACE_NTOHL (0x6e4d656d),
+  ACE_NTOHL (0x556e696f), 
+  ACE_NTOHL (0x6e4d656d), 
   ACE_NTOHL (0x62657200),  // name = UnionMember
   4, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   6,
-  ACE_NTOHL (0x6c616265),
+  ACE_NTOHL (0x6c616265), 
   ACE_NTOHL (0x6c000000),  // name = label
     CORBA::tk_any,
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   9,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f646566),
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x5f646566), 
   ACE_NTOHL (0x0),  // name = type_def
     CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4944),
-    ACE_NTOHL (0x4c547970),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4944), 
+    ACE_NTOHL (0x4c547970), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
         8,
-    ACE_NTOHL (0x49444c54),
+    ACE_NTOHL (0x49444c54), 
     ACE_NTOHL (0x79706500),  // name = IDLType
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMember (
@@ -2743,7 +2745,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMember (
     sizeof (_oc_CORBA_UnionMember),
     (char *) &_oc_CORBA_UnionMember,
     0,
-    sizeof (CORBA::UnionMember)
+    0
   );
 
 namespace CORBA
@@ -2753,26 +2755,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f556e),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x72536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f556e), 
+  ACE_NTOHL (0x696f6e4d), 
+  ACE_NTOHL (0x656d6265), 
+  ACE_NTOHL (0x72536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/UnionMemberSeq:1.0
     15,
-  ACE_NTOHL (0x556e696f),
-  ACE_NTOHL (0x6e4d656d),
-  ACE_NTOHL (0x62657253),
+  ACE_NTOHL (0x556e696f), 
+  ACE_NTOHL (0x6e4d656d), 
+  ACE_NTOHL (0x62657253), 
   ACE_NTOHL (0x65710000),  // name = UnionMemberSeq
     CORBA::tk_sequence, // typecode kind
   276, // encapsulation length
@@ -2781,73 +2783,73 @@ static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
     260, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f556e),
-      ACE_NTOHL (0x696f6e4d),
-      ACE_NTOHL (0x656d6265),
-      ACE_NTOHL (0x723a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f556e), 
+      ACE_NTOHL (0x696f6e4d), 
+      ACE_NTOHL (0x656d6265), 
+      ACE_NTOHL (0x723a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
             12,
-      ACE_NTOHL (0x556e696f),
-      ACE_NTOHL (0x6e4d656d),
+      ACE_NTOHL (0x556e696f), 
+      ACE_NTOHL (0x6e4d656d), 
       ACE_NTOHL (0x62657200),  // name = UnionMember
       4, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       6,
-      ACE_NTOHL (0x6c616265),
+      ACE_NTOHL (0x6c616265), 
       ACE_NTOHL (0x6c000000),  // name = label
             CORBA::tk_any,
 
       5,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       9,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x5f646566),
+      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x5f646566), 
       ACE_NTOHL (0x0),  // name = type_def
             CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4944),
-        ACE_NTOHL (0x4c547970),
-        ACE_NTOHL (0x653a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4944), 
+        ACE_NTOHL (0x4c547970), 
+        ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-        ACE_NTOHL (0x49444c54),
+        ACE_NTOHL (0x49444c54), 
         ACE_NTOHL (0x79706500),  // name = IDLType
-
+        
 
     0U,
 
@@ -2858,7 +2860,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMemberSeq (
     sizeof (_oc_CORBA_UnionMemberSeq),
     (char *) &_oc_CORBA_UnionMemberSeq,
     0,
-    sizeof (CORBA::UnionMemberSeq)
+    0
   );
 
 namespace CORBA
@@ -2868,25 +2870,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f456e),
-  ACE_NTOHL (0x756d4d65),
-  ACE_NTOHL (0x6d626572),
-  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f456e), 
+  ACE_NTOHL (0x756d4d65), 
+  ACE_NTOHL (0x6d626572), 
+  ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/EnumMemberSeq:1.0
     14,
-  ACE_NTOHL (0x456e756d),
-  ACE_NTOHL (0x4d656d62),
-  ACE_NTOHL (0x65725365),
+  ACE_NTOHL (0x456e756d), 
+  ACE_NTOHL (0x4d656d62), 
+  ACE_NTOHL (0x65725365), 
   ACE_NTOHL (0x71000000),  // name = EnumMemberSeq
     CORBA::tk_sequence, // typecode kind
   84, // encapsulation length
@@ -2895,20 +2897,20 @@ static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4964),
-      ACE_NTOHL (0x656e7469),
-      ACE_NTOHL (0x66696572),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4964), 
+      ACE_NTOHL (0x656e7469), 
+      ACE_NTOHL (0x66696572), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
             11,
-      ACE_NTOHL (0x4964656e),
-      ACE_NTOHL (0x74696669),
+      ACE_NTOHL (0x4964656e), 
+      ACE_NTOHL (0x74696669), 
       ACE_NTOHL (0x65720000),  // name = Identifier
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
     0U,
@@ -2920,7 +2922,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumMemberSeq (
     sizeof (_oc_CORBA_EnumMemberSeq),
     (char *) &_oc_CORBA_EnumMemberSeq,
     0,
-    sizeof (CORBA::EnumMemberSeq)
+    0
   );
 
 namespace CORBA
@@ -2930,230 +2932,230 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Container_Description[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e65722f),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e746169), 
+  ACE_NTOHL (0x6e65722f), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
     12,
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = Description
   3, // member count
     17,
-  ACE_NTOHL (0x636f6e74),
-  ACE_NTOHL (0x61696e65),
-  ACE_NTOHL (0x645f6f62),
-  ACE_NTOHL (0x6a656374),
+  ACE_NTOHL (0x636f6e74), 
+  ACE_NTOHL (0x61696e65), 
+  ACE_NTOHL (0x645f6f62), 
+  ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x0),  // name = contained_object
     CORBA::tk_objref, // typecode kind
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6e746169),
-    ACE_NTOHL (0x6e65643a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6e746169), 
+    ACE_NTOHL (0x6e65643a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
         10,
-    ACE_NTOHL (0x436f6e74),
-    ACE_NTOHL (0x61696e65),
+    ACE_NTOHL (0x436f6e74), 
+    ACE_NTOHL (0x61696e65), 
     ACE_NTOHL (0x64000000),  // name = Contained
-
+    
   5,
-  ACE_NTOHL (0x6b696e64),
+  ACE_NTOHL (0x6b696e64), 
   ACE_NTOHL (0x0),  // name = kind
     CORBA::tk_enum, // typecode kind
   684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4465),
-    ACE_NTOHL (0x66696e69),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x4b696e64),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4465), 
+    ACE_NTOHL (0x66696e69), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x4b696e64), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
     15,
-    ACE_NTOHL (0x44656669),
-    ACE_NTOHL (0x6e697469),
-    ACE_NTOHL (0x6f6e4b69),
+    ACE_NTOHL (0x44656669), 
+    ACE_NTOHL (0x6e697469), 
+    ACE_NTOHL (0x6f6e4b69), 
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
     36, // member count
     8,
-    ACE_NTOHL (0x646b5f6e),
+    ACE_NTOHL (0x646b5f6e), 
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
     7,
-    ACE_NTOHL (0x646b5f61),
+    ACE_NTOHL (0x646b5f61), 
     ACE_NTOHL (0x6c6c0000),  // name = dk_all
     13,
-    ACE_NTOHL (0x646b5f41),
-    ACE_NTOHL (0x74747269),
-    ACE_NTOHL (0x62757465),
+    ACE_NTOHL (0x646b5f41), 
+    ACE_NTOHL (0x74747269), 
+    ACE_NTOHL (0x62757465), 
     ACE_NTOHL (0x0),  // name = dk_Attribute
     12,
-    ACE_NTOHL (0x646b5f43),
-    ACE_NTOHL (0x6f6e7374),
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6e7374), 
     ACE_NTOHL (0x616e7400),  // name = dk_Constant
     13,
-    ACE_NTOHL (0x646b5f45),
-    ACE_NTOHL (0x78636570),
-    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x78636570), 
+    ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Exception
     13,
-    ACE_NTOHL (0x646b5f49),
-    ACE_NTOHL (0x6e746572),
-    ACE_NTOHL (0x66616365),
+    ACE_NTOHL (0x646b5f49), 
+    ACE_NTOHL (0x6e746572), 
+    ACE_NTOHL (0x66616365), 
     ACE_NTOHL (0x0),  // name = dk_Interface
     10,
-    ACE_NTOHL (0x646b5f4d),
-    ACE_NTOHL (0x6f64756c),
+    ACE_NTOHL (0x646b5f4d), 
+    ACE_NTOHL (0x6f64756c), 
     ACE_NTOHL (0x65000000),  // name = dk_Module
     13,
-    ACE_NTOHL (0x646b5f4f),
-    ACE_NTOHL (0x70657261),
-    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x646b5f4f), 
+    ACE_NTOHL (0x70657261), 
+    ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Operation
     11,
-    ACE_NTOHL (0x646b5f54),
-    ACE_NTOHL (0x79706564),
+    ACE_NTOHL (0x646b5f54), 
+    ACE_NTOHL (0x79706564), 
     ACE_NTOHL (0x65660000),  // name = dk_Typedef
     9,
-    ACE_NTOHL (0x646b5f41),
-    ACE_NTOHL (0x6c696173),
+    ACE_NTOHL (0x646b5f41), 
+    ACE_NTOHL (0x6c696173), 
     ACE_NTOHL (0x0),  // name = dk_Alias
     10,
-    ACE_NTOHL (0x646b5f53),
-    ACE_NTOHL (0x74727563),
+    ACE_NTOHL (0x646b5f53), 
+    ACE_NTOHL (0x74727563), 
     ACE_NTOHL (0x74000000),  // name = dk_Struct
     9,
-    ACE_NTOHL (0x646b5f55),
-    ACE_NTOHL (0x6e696f6e),
+    ACE_NTOHL (0x646b5f55), 
+    ACE_NTOHL (0x6e696f6e), 
     ACE_NTOHL (0x0),  // name = dk_Union
     8,
-    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x646b5f45), 
     ACE_NTOHL (0x6e756d00),  // name = dk_Enum
     13,
-    ACE_NTOHL (0x646b5f50),
-    ACE_NTOHL (0x72696d69),
-    ACE_NTOHL (0x74697665),
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x72696d69), 
+    ACE_NTOHL (0x74697665), 
     ACE_NTOHL (0x0),  // name = dk_Primitive
     10,
-    ACE_NTOHL (0x646b5f53),
-    ACE_NTOHL (0x7472696e),
+    ACE_NTOHL (0x646b5f53), 
+    ACE_NTOHL (0x7472696e), 
     ACE_NTOHL (0x67000000),  // name = dk_String
     12,
-    ACE_NTOHL (0x646b5f53),
-    ACE_NTOHL (0x65717565),
+    ACE_NTOHL (0x646b5f53), 
+    ACE_NTOHL (0x65717565), 
     ACE_NTOHL (0x6e636500),  // name = dk_Sequence
     9,
-    ACE_NTOHL (0x646b5f41),
-    ACE_NTOHL (0x72726179),
+    ACE_NTOHL (0x646b5f41), 
+    ACE_NTOHL (0x72726179), 
     ACE_NTOHL (0x0),  // name = dk_Array
     14,
-    ACE_NTOHL (0x646b5f52),
-    ACE_NTOHL (0x65706f73),
-    ACE_NTOHL (0x69746f72),
+    ACE_NTOHL (0x646b5f52), 
+    ACE_NTOHL (0x65706f73), 
+    ACE_NTOHL (0x69746f72), 
     ACE_NTOHL (0x79000000),  // name = dk_Repository
     11,
-    ACE_NTOHL (0x646b5f57),
-    ACE_NTOHL (0x73747269),
+    ACE_NTOHL (0x646b5f57), 
+    ACE_NTOHL (0x73747269), 
     ACE_NTOHL (0x6e670000),  // name = dk_Wstring
     9,
-    ACE_NTOHL (0x646b5f46),
-    ACE_NTOHL (0x69786564),
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x69786564), 
     ACE_NTOHL (0x0),  // name = dk_Fixed
     9,
-    ACE_NTOHL (0x646b5f56),
-    ACE_NTOHL (0x616c7565),
+    ACE_NTOHL (0x646b5f56), 
+    ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x0),  // name = dk_Value
     12,
-    ACE_NTOHL (0x646b5f56),
-    ACE_NTOHL (0x616c7565),
+    ACE_NTOHL (0x646b5f56), 
+    ACE_NTOHL (0x616c7565), 
     ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
     15,
-    ACE_NTOHL (0x646b5f56),
-    ACE_NTOHL (0x616c7565),
-    ACE_NTOHL (0x4d656d62),
+    ACE_NTOHL (0x646b5f56), 
+    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x4d656d62), 
     ACE_NTOHL (0x65720000),  // name = dk_ValueMember
     10,
-    ACE_NTOHL (0x646b5f4e),
-    ACE_NTOHL (0x61746976),
+    ACE_NTOHL (0x646b5f4e), 
+    ACE_NTOHL (0x61746976), 
     ACE_NTOHL (0x65000000),  // name = dk_Native
     21,
-    ACE_NTOHL (0x646b5f41),
-    ACE_NTOHL (0x62737472),
-    ACE_NTOHL (0x61637449),
-    ACE_NTOHL (0x6e746572),
-    ACE_NTOHL (0x66616365),
+    ACE_NTOHL (0x646b5f41), 
+    ACE_NTOHL (0x62737472), 
+    ACE_NTOHL (0x61637449), 
+    ACE_NTOHL (0x6e746572), 
+    ACE_NTOHL (0x66616365), 
     ACE_NTOHL (0x0),  // name = dk_AbstractInterface
     18,
-    ACE_NTOHL (0x646b5f4c),
-    ACE_NTOHL (0x6f63616c),
-    ACE_NTOHL (0x496e7465),
-    ACE_NTOHL (0x72666163),
+    ACE_NTOHL (0x646b5f4c), 
+    ACE_NTOHL (0x6f63616c), 
+    ACE_NTOHL (0x496e7465), 
+    ACE_NTOHL (0x72666163), 
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
     13,
-    ACE_NTOHL (0x646b5f43),
-    ACE_NTOHL (0x6f6d706f),
-    ACE_NTOHL (0x6e656e74),
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
     ACE_NTOHL (0x0),  // name = dk_Component
     8,
-    ACE_NTOHL (0x646b5f48),
+    ACE_NTOHL (0x646b5f48), 
     ACE_NTOHL (0x6f6d6500),  // name = dk_Home
     11,
-    ACE_NTOHL (0x646b5f46),
-    ACE_NTOHL (0x6163746f),
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x6163746f), 
     ACE_NTOHL (0x72790000),  // name = dk_Factory
     10,
-    ACE_NTOHL (0x646b5f46),
-    ACE_NTOHL (0x696e6465),
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x696e6465), 
     ACE_NTOHL (0x72000000),  // name = dk_Finder
     9,
-    ACE_NTOHL (0x646b5f45),
-    ACE_NTOHL (0x6d697473),
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x6d697473), 
     ACE_NTOHL (0x0),  // name = dk_Emits
     13,
-    ACE_NTOHL (0x646b5f50),
-    ACE_NTOHL (0x75626c69),
-    ACE_NTOHL (0x73686573),
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x75626c69), 
+    ACE_NTOHL (0x73686573), 
     ACE_NTOHL (0x0),  // name = dk_Publishes
     12,
-    ACE_NTOHL (0x646b5f43),
-    ACE_NTOHL (0x6f6e7375),
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6e7375), 
     ACE_NTOHL (0x6d657300),  // name = dk_Consumes
     12,
-    ACE_NTOHL (0x646b5f50),
-    ACE_NTOHL (0x726f7669),
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x726f7669), 
     ACE_NTOHL (0x64657300),  // name = dk_Provides
     8,
-    ACE_NTOHL (0x646b5f55),
+    ACE_NTOHL (0x646b5f55), 
     ACE_NTOHL (0x73657300),  // name = dk_Uses
     9,
-    ACE_NTOHL (0x646b5f45),
-    ACE_NTOHL (0x76656e74),
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x76656e74), 
     ACE_NTOHL (0x0),  // name = dk_Event
-
+    
   6,
-  ACE_NTOHL (0x76616c75),
+  ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
     CORBA::tk_any,
 
@@ -3164,35 +3166,35 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_Description (
     sizeof (_oc_CORBA_Container_Description),
     (char *) &_oc_CORBA_Container_Description,
     0,
-    sizeof (CORBA::Container::Description)
+    0
   );
 
 ::CORBA::TypeCode_ptr CORBA::Container::_tc_Description =
   &_tc_TAO_tc_CORBA_Container_Description;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e65722f),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e53),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e746169), 
+  ACE_NTOHL (0x6e65722f), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/Container/DescriptionSeq:1.0
     15,
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e53),
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x65710000),  // name = DescriptionSeq
     CORBA::tk_sequence, // typecode kind
   896, // encapsulation length
@@ -3201,224 +3203,224 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
     880, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       44,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f436f),
-      ACE_NTOHL (0x6e746169),
-      ACE_NTOHL (0x6e65722f),
-      ACE_NTOHL (0x44657363),
-      ACE_NTOHL (0x72697074),
-      ACE_NTOHL (0x696f6e3a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6e746169), 
+      ACE_NTOHL (0x6e65722f), 
+      ACE_NTOHL (0x44657363), 
+      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x696f6e3a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
             12,
-      ACE_NTOHL (0x44657363),
-      ACE_NTOHL (0x72697074),
+      ACE_NTOHL (0x44657363), 
+      ACE_NTOHL (0x72697074), 
       ACE_NTOHL (0x696f6e00),  // name = Description
       3, // member count
             17,
-      ACE_NTOHL (0x636f6e74),
-      ACE_NTOHL (0x61696e65),
-      ACE_NTOHL (0x645f6f62),
-      ACE_NTOHL (0x6a656374),
+      ACE_NTOHL (0x636f6e74), 
+      ACE_NTOHL (0x61696e65), 
+      ACE_NTOHL (0x645f6f62), 
+      ACE_NTOHL (0x6a656374), 
       ACE_NTOHL (0x0),  // name = contained_object
             CORBA::tk_objref, // typecode kind
       56, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6e746169),
-        ACE_NTOHL (0x6e65643a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6e746169), 
+        ACE_NTOHL (0x6e65643a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
                 10,
-        ACE_NTOHL (0x436f6e74),
-        ACE_NTOHL (0x61696e65),
+        ACE_NTOHL (0x436f6e74), 
+        ACE_NTOHL (0x61696e65), 
         ACE_NTOHL (0x64000000),  // name = Contained
-
+        
       5,
-      ACE_NTOHL (0x6b696e64),
+      ACE_NTOHL (0x6b696e64), 
       ACE_NTOHL (0x0),  // name = kind
             CORBA::tk_enum, // typecode kind
       684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         37,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4465),
-        ACE_NTOHL (0x66696e69),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x4b696e64),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4465), 
+        ACE_NTOHL (0x66696e69), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4b696e64), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
         15,
-        ACE_NTOHL (0x44656669),
-        ACE_NTOHL (0x6e697469),
-        ACE_NTOHL (0x6f6e4b69),
+        ACE_NTOHL (0x44656669), 
+        ACE_NTOHL (0x6e697469), 
+        ACE_NTOHL (0x6f6e4b69), 
         ACE_NTOHL (0x6e640000),  // name = DefinitionKind
         36, // member count
         8,
-        ACE_NTOHL (0x646b5f6e),
+        ACE_NTOHL (0x646b5f6e), 
         ACE_NTOHL (0x6f6e6500),  // name = dk_none
         7,
-        ACE_NTOHL (0x646b5f61),
+        ACE_NTOHL (0x646b5f61), 
         ACE_NTOHL (0x6c6c0000),  // name = dk_all
         13,
-        ACE_NTOHL (0x646b5f41),
-        ACE_NTOHL (0x74747269),
-        ACE_NTOHL (0x62757465),
+        ACE_NTOHL (0x646b5f41), 
+        ACE_NTOHL (0x74747269), 
+        ACE_NTOHL (0x62757465), 
         ACE_NTOHL (0x0),  // name = dk_Attribute
         12,
-        ACE_NTOHL (0x646b5f43),
-        ACE_NTOHL (0x6f6e7374),
+        ACE_NTOHL (0x646b5f43), 
+        ACE_NTOHL (0x6f6e7374), 
         ACE_NTOHL (0x616e7400),  // name = dk_Constant
         13,
-        ACE_NTOHL (0x646b5f45),
-        ACE_NTOHL (0x78636570),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x646b5f45), 
+        ACE_NTOHL (0x78636570), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = dk_Exception
         13,
-        ACE_NTOHL (0x646b5f49),
-        ACE_NTOHL (0x6e746572),
-        ACE_NTOHL (0x66616365),
+        ACE_NTOHL (0x646b5f49), 
+        ACE_NTOHL (0x6e746572), 
+        ACE_NTOHL (0x66616365), 
         ACE_NTOHL (0x0),  // name = dk_Interface
         10,
-        ACE_NTOHL (0x646b5f4d),
-        ACE_NTOHL (0x6f64756c),
+        ACE_NTOHL (0x646b5f4d), 
+        ACE_NTOHL (0x6f64756c), 
         ACE_NTOHL (0x65000000),  // name = dk_Module
         13,
-        ACE_NTOHL (0x646b5f4f),
-        ACE_NTOHL (0x70657261),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x646b5f4f), 
+        ACE_NTOHL (0x70657261), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = dk_Operation
         11,
-        ACE_NTOHL (0x646b5f54),
-        ACE_NTOHL (0x79706564),
+        ACE_NTOHL (0x646b5f54), 
+        ACE_NTOHL (0x79706564), 
         ACE_NTOHL (0x65660000),  // name = dk_Typedef
         9,
-        ACE_NTOHL (0x646b5f41),
-        ACE_NTOHL (0x6c696173),
+        ACE_NTOHL (0x646b5f41), 
+        ACE_NTOHL (0x6c696173), 
         ACE_NTOHL (0x0),  // name = dk_Alias
         10,
-        ACE_NTOHL (0x646b5f53),
-        ACE_NTOHL (0x74727563),
+        ACE_NTOHL (0x646b5f53), 
+        ACE_NTOHL (0x74727563), 
         ACE_NTOHL (0x74000000),  // name = dk_Struct
         9,
-        ACE_NTOHL (0x646b5f55),
-        ACE_NTOHL (0x6e696f6e),
+        ACE_NTOHL (0x646b5f55), 
+        ACE_NTOHL (0x6e696f6e), 
         ACE_NTOHL (0x0),  // name = dk_Union
         8,
-        ACE_NTOHL (0x646b5f45),
+        ACE_NTOHL (0x646b5f45), 
         ACE_NTOHL (0x6e756d00),  // name = dk_Enum
         13,
-        ACE_NTOHL (0x646b5f50),
-        ACE_NTOHL (0x72696d69),
-        ACE_NTOHL (0x74697665),
+        ACE_NTOHL (0x646b5f50), 
+        ACE_NTOHL (0x72696d69), 
+        ACE_NTOHL (0x74697665), 
         ACE_NTOHL (0x0),  // name = dk_Primitive
         10,
-        ACE_NTOHL (0x646b5f53),
-        ACE_NTOHL (0x7472696e),
+        ACE_NTOHL (0x646b5f53), 
+        ACE_NTOHL (0x7472696e), 
         ACE_NTOHL (0x67000000),  // name = dk_String
         12,
-        ACE_NTOHL (0x646b5f53),
-        ACE_NTOHL (0x65717565),
+        ACE_NTOHL (0x646b5f53), 
+        ACE_NTOHL (0x65717565), 
         ACE_NTOHL (0x6e636500),  // name = dk_Sequence
         9,
-        ACE_NTOHL (0x646b5f41),
-        ACE_NTOHL (0x72726179),
+        ACE_NTOHL (0x646b5f41), 
+        ACE_NTOHL (0x72726179), 
         ACE_NTOHL (0x0),  // name = dk_Array
         14,
-        ACE_NTOHL (0x646b5f52),
-        ACE_NTOHL (0x65706f73),
-        ACE_NTOHL (0x69746f72),
+        ACE_NTOHL (0x646b5f52), 
+        ACE_NTOHL (0x65706f73), 
+        ACE_NTOHL (0x69746f72), 
         ACE_NTOHL (0x79000000),  // name = dk_Repository
         11,
-        ACE_NTOHL (0x646b5f57),
-        ACE_NTOHL (0x73747269),
+        ACE_NTOHL (0x646b5f57), 
+        ACE_NTOHL (0x73747269), 
         ACE_NTOHL (0x6e670000),  // name = dk_Wstring
         9,
-        ACE_NTOHL (0x646b5f46),
-        ACE_NTOHL (0x69786564),
+        ACE_NTOHL (0x646b5f46), 
+        ACE_NTOHL (0x69786564), 
         ACE_NTOHL (0x0),  // name = dk_Fixed
         9,
-        ACE_NTOHL (0x646b5f56),
-        ACE_NTOHL (0x616c7565),
+        ACE_NTOHL (0x646b5f56), 
+        ACE_NTOHL (0x616c7565), 
         ACE_NTOHL (0x0),  // name = dk_Value
         12,
-        ACE_NTOHL (0x646b5f56),
-        ACE_NTOHL (0x616c7565),
+        ACE_NTOHL (0x646b5f56), 
+        ACE_NTOHL (0x616c7565), 
         ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
         15,
-        ACE_NTOHL (0x646b5f56),
-        ACE_NTOHL (0x616c7565),
-        ACE_NTOHL (0x4d656d62),
+        ACE_NTOHL (0x646b5f56), 
+        ACE_NTOHL (0x616c7565), 
+        ACE_NTOHL (0x4d656d62), 
         ACE_NTOHL (0x65720000),  // name = dk_ValueMember
         10,
-        ACE_NTOHL (0x646b5f4e),
-        ACE_NTOHL (0x61746976),
+        ACE_NTOHL (0x646b5f4e), 
+        ACE_NTOHL (0x61746976), 
         ACE_NTOHL (0x65000000),  // name = dk_Native
         21,
-        ACE_NTOHL (0x646b5f41),
-        ACE_NTOHL (0x62737472),
-        ACE_NTOHL (0x61637449),
-        ACE_NTOHL (0x6e746572),
-        ACE_NTOHL (0x66616365),
+        ACE_NTOHL (0x646b5f41), 
+        ACE_NTOHL (0x62737472), 
+        ACE_NTOHL (0x61637449), 
+        ACE_NTOHL (0x6e746572), 
+        ACE_NTOHL (0x66616365), 
         ACE_NTOHL (0x0),  // name = dk_AbstractInterface
         18,
-        ACE_NTOHL (0x646b5f4c),
-        ACE_NTOHL (0x6f63616c),
-        ACE_NTOHL (0x496e7465),
-        ACE_NTOHL (0x72666163),
+        ACE_NTOHL (0x646b5f4c), 
+        ACE_NTOHL (0x6f63616c), 
+        ACE_NTOHL (0x496e7465), 
+        ACE_NTOHL (0x72666163), 
         ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
         13,
-        ACE_NTOHL (0x646b5f43),
-        ACE_NTOHL (0x6f6d706f),
-        ACE_NTOHL (0x6e656e74),
+        ACE_NTOHL (0x646b5f43), 
+        ACE_NTOHL (0x6f6d706f), 
+        ACE_NTOHL (0x6e656e74), 
         ACE_NTOHL (0x0),  // name = dk_Component
         8,
-        ACE_NTOHL (0x646b5f48),
+        ACE_NTOHL (0x646b5f48), 
         ACE_NTOHL (0x6f6d6500),  // name = dk_Home
         11,
-        ACE_NTOHL (0x646b5f46),
-        ACE_NTOHL (0x6163746f),
+        ACE_NTOHL (0x646b5f46), 
+        ACE_NTOHL (0x6163746f), 
         ACE_NTOHL (0x72790000),  // name = dk_Factory
         10,
-        ACE_NTOHL (0x646b5f46),
-        ACE_NTOHL (0x696e6465),
+        ACE_NTOHL (0x646b5f46), 
+        ACE_NTOHL (0x696e6465), 
         ACE_NTOHL (0x72000000),  // name = dk_Finder
         9,
-        ACE_NTOHL (0x646b5f45),
-        ACE_NTOHL (0x6d697473),
+        ACE_NTOHL (0x646b5f45), 
+        ACE_NTOHL (0x6d697473), 
         ACE_NTOHL (0x0),  // name = dk_Emits
         13,
-        ACE_NTOHL (0x646b5f50),
-        ACE_NTOHL (0x75626c69),
-        ACE_NTOHL (0x73686573),
+        ACE_NTOHL (0x646b5f50), 
+        ACE_NTOHL (0x75626c69), 
+        ACE_NTOHL (0x73686573), 
         ACE_NTOHL (0x0),  // name = dk_Publishes
         12,
-        ACE_NTOHL (0x646b5f43),
-        ACE_NTOHL (0x6f6e7375),
+        ACE_NTOHL (0x646b5f43), 
+        ACE_NTOHL (0x6f6e7375), 
         ACE_NTOHL (0x6d657300),  // name = dk_Consumes
         12,
-        ACE_NTOHL (0x646b5f50),
-        ACE_NTOHL (0x726f7669),
+        ACE_NTOHL (0x646b5f50), 
+        ACE_NTOHL (0x726f7669), 
         ACE_NTOHL (0x64657300),  // name = dk_Provides
         8,
-        ACE_NTOHL (0x646b5f55),
+        ACE_NTOHL (0x646b5f55), 
         ACE_NTOHL (0x73657300),  // name = dk_Uses
         9,
-        ACE_NTOHL (0x646b5f45),
-        ACE_NTOHL (0x76656e74),
+        ACE_NTOHL (0x646b5f45), 
+        ACE_NTOHL (0x76656e74), 
         ACE_NTOHL (0x0),  // name = dk_Event
-
+        
       6,
-      ACE_NTOHL (0x76616c75),
+      ACE_NTOHL (0x76616c75), 
       ACE_NTOHL (0x65000000),  // name = value
             CORBA::tk_any,
 
@@ -3432,30 +3434,30 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     sizeof (_oc_CORBA_Container_DescriptionSeq),
     (char *) &_oc_CORBA_Container_DescriptionSeq,
     0,
-    sizeof (CORBA::Container::DescriptionSeq)
+    0
   );
 
 ::CORBA::TypeCode_ptr CORBA::Container::_tc_DescriptionSeq =
   &_tc_TAO_tc_CORBA_Container_DescriptionSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Container[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e65723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e746169), 
+  ACE_NTOHL (0x6e65723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container:1.0
     10,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x61696e65),
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x61696e65), 
   ACE_NTOHL (0x72000000),  // name = Container
   };
 
@@ -3464,7 +3466,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container (
     sizeof (_oc_CORBA_Container),
     (char *) &_oc_CORBA_Container,
     0,
-    sizeof (CORBA::Container)
+    0
   );
 
 namespace CORBA
@@ -3474,22 +3476,22 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_IDLType[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4944),
-  ACE_NTOHL (0x4c547970),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4944), 
+  ACE_NTOHL (0x4c547970), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
     8,
-  ACE_NTOHL (0x49444c54),
+  ACE_NTOHL (0x49444c54), 
   ACE_NTOHL (0x79706500),  // name = IDLType
   };
 
@@ -3498,7 +3500,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_IDLType (
     sizeof (_oc_CORBA_IDLType),
     (char *) &_oc_CORBA_IDLType,
     0,
-    sizeof (CORBA::IDLType)
+    0
   );
 
 namespace CORBA
@@ -3508,24 +3510,24 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_TypedefDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5479),
-  ACE_NTOHL (0x70656465),
-  ACE_NTOHL (0x66446566),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5479), 
+  ACE_NTOHL (0x70656465), 
+  ACE_NTOHL (0x66446566), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/TypedefDef:1.0
     11,
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x64656644),
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x64656644), 
   ACE_NTOHL (0x65660000),  // name = TypedefDef
   };
 
@@ -3534,7 +3536,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_TypedefDef (
     sizeof (_oc_CORBA_TypedefDef),
     (char *) &_oc_CORBA_TypedefDef,
     0,
-    sizeof (CORBA::TypedefDef)
+    0
   );
 
 namespace CORBA
@@ -3544,49 +3546,49 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_TypeDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5479),
-  ACE_NTOHL (0x70654465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5479), 
+  ACE_NTOHL (0x70654465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeDescription:1.0
     16,
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = TypeDescription
   5, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -3595,73 +3597,73 @@ static const CORBA::Long _oc_CORBA_TypeDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -3672,7 +3674,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_TypeDescription (
     sizeof (_oc_CORBA_TypeDescription),
     (char *) &_oc_CORBA_TypeDescription,
     0,
-    sizeof (CORBA::TypeDescription)
+    0
   );
 
 namespace CORBA
@@ -3705,7 +3707,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract (
         _tao_any,
         CORBA::_tc_DefinitionKind,
-        _tao_elem
+        _tao_elem 
       );
 }
 
@@ -3819,7 +3821,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3856,8 +3858,8 @@ CORBA::Boolean operator>>= (
     CORBA::Contained::Description *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::Contained::Description *&,
+  return _tao_any >>= const_cast<
+      const CORBA::Contained::Description *&> (
       _tao_elem
     );
 }
@@ -3877,7 +3879,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3914,8 +3916,8 @@ CORBA::Boolean operator>>= (
     CORBA::InterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::InterfaceDefSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceDefSeq *&> (
       _tao_elem
     );
 }
@@ -3935,7 +3937,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3972,8 +3974,8 @@ CORBA::Boolean operator>>= (
     CORBA::ValueDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ValueDefSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ValueDefSeq *&> (
       _tao_elem
     );
 }
@@ -3993,7 +3995,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4030,8 +4032,8 @@ CORBA::Boolean operator>>= (
     CORBA::AbstractInterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::AbstractInterfaceDefSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::AbstractInterfaceDefSeq *&> (
       _tao_elem
     );
 }
@@ -4051,7 +4053,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4088,8 +4090,8 @@ CORBA::Boolean operator>>= (
     CORBA::LocalInterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::LocalInterfaceDefSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::LocalInterfaceDefSeq *&> (
       _tao_elem
     );
 }
@@ -4109,7 +4111,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4146,8 +4148,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExtInterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExtInterfaceDefSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExtInterfaceDefSeq *&> (
       _tao_elem
     );
 }
@@ -4167,7 +4169,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4204,8 +4206,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExtValueDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExtValueDefSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExtValueDefSeq *&> (
       _tao_elem
     );
 }
@@ -4225,7 +4227,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4262,8 +4264,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExtAbstractInterfaceDefSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExtAbstractInterfaceDefSeq *&> (
       _tao_elem
     );
 }
@@ -4283,7 +4285,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4320,8 +4322,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExtLocalInterfaceDefSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExtLocalInterfaceDefSeq *&> (
       _tao_elem
     );
 }
@@ -4341,7 +4343,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4378,8 +4380,8 @@ CORBA::Boolean operator>>= (
     CORBA::ContainedSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ContainedSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ContainedSeq *&> (
       _tao_elem
     );
 }
@@ -4399,7 +4401,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4436,8 +4438,8 @@ CORBA::Boolean operator>>= (
     CORBA::StructMember *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::StructMember *&,
+  return _tao_any >>= const_cast<
+      const CORBA::StructMember *&> (
       _tao_elem
     );
 }
@@ -4457,7 +4459,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4494,8 +4496,8 @@ CORBA::Boolean operator>>= (
     CORBA::StructMemberSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::StructMemberSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::StructMemberSeq *&> (
       _tao_elem
     );
 }
@@ -4515,7 +4517,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4552,8 +4554,8 @@ CORBA::Boolean operator>>= (
     CORBA::Initializer *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::Initializer *&,
+  return _tao_any >>= const_cast<
+      const CORBA::Initializer *&> (
       _tao_elem
     );
 }
@@ -4573,7 +4575,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4610,8 +4612,8 @@ CORBA::Boolean operator>>= (
     CORBA::InitializerSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::InitializerSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::InitializerSeq *&> (
       _tao_elem
     );
 }
@@ -4631,7 +4633,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4668,8 +4670,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExceptionDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExceptionDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExceptionDescription *&> (
       _tao_elem
     );
 }
@@ -4689,7 +4691,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4726,8 +4728,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExcDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExcDescriptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExcDescriptionSeq *&> (
       _tao_elem
     );
 }
@@ -4747,7 +4749,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4784,8 +4786,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExtInitializer *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExtInitializer *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExtInitializer *&> (
       _tao_elem
     );
 }
@@ -4805,7 +4807,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4842,8 +4844,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExtInitializerSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExtInitializerSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExtInitializerSeq *&> (
       _tao_elem
     );
 }
@@ -4863,7 +4865,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4900,8 +4902,8 @@ CORBA::Boolean operator>>= (
     CORBA::UnionMember *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::UnionMember *&,
+  return _tao_any >>= const_cast<
+      const CORBA::UnionMember *&> (
       _tao_elem
     );
 }
@@ -4921,7 +4923,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4958,8 +4960,8 @@ CORBA::Boolean operator>>= (
     CORBA::UnionMemberSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::UnionMemberSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::UnionMemberSeq *&> (
       _tao_elem
     );
 }
@@ -4979,7 +4981,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5016,8 +5018,8 @@ CORBA::Boolean operator>>= (
     CORBA::EnumMemberSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::EnumMemberSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::EnumMemberSeq *&> (
       _tao_elem
     );
 }
@@ -5092,7 +5094,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5129,8 +5131,8 @@ CORBA::Boolean operator>>= (
     CORBA::Container::Description *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::Container::Description *&,
+  return _tao_any >>= const_cast<
+      const CORBA::Container::Description *&> (
       _tao_elem
     );
 }
@@ -5150,7 +5152,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5187,8 +5189,8 @@ CORBA::Boolean operator>>= (
     CORBA::Container::DescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::Container::DescriptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::Container::DescriptionSeq *&> (
       _tao_elem
     );
 }
@@ -5318,7 +5320,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5355,8 +5357,8 @@ CORBA::Boolean operator>>= (
     CORBA::TypeDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::TypeDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::TypeDescription *&> (
       _tao_elem
     );
 }
@@ -5376,8 +5378,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -5682,5 +5682,4 @@ CORBA::Boolean operator>>= (
         CORBA::TypeDescription \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 78ed2bb2abf..321fb128802 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IFR_BaseC.h"
@@ -39,6 +39,7 @@
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
+#include "tao/Any_Arg_Traits.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -46,37 +47,18 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BaseC.i"
+#include "IFR_BaseC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:582
-
-#if !defined (_CORBA_ANY__ARG_TRAITS_CS_)
-#define _CORBA_ANY__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
@@ -110,7 +92,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:618
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_
@@ -163,7 +145,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_
@@ -318,7 +300,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -388,7 +370,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
@@ -441,7 +423,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -494,7 +476,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_)
 #define _CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_
@@ -513,7 +495,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
@@ -532,7 +514,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
@@ -551,7 +533,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
@@ -570,7 +552,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
@@ -589,7 +571,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
@@ -675,7 +657,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_IRObject_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::DefinitionKind>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::DefinitionKind>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -717,7 +699,7 @@ void CORBA::IRObject::destroy (
       CORBA_IRObject_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -760,7 +742,7 @@ void
 CORBA::IRObject::_tao_any_destructor (void *_tao_void_pointer)
 {
   IRObject *_tao_tmp_pointer =
-    ACE_static_cast (IRObject *, _tao_void_pointer);
+    static_cast<IRObject *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -813,14 +795,14 @@ CORBA::IRObject::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -910,7 +892,7 @@ char * CORBA::Contained::id (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::RepositoryId>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -953,8 +935,8 @@ void CORBA::Contained::id (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -995,7 +977,7 @@ char * CORBA::Contained::name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Identifier>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::Identifier>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1038,8 +1020,8 @@ void CORBA::Contained::name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1080,7 +1062,7 @@ char * CORBA::Contained::version (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::VersionSpec>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::VersionSpec>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1123,8 +1105,8 @@ void CORBA::Contained::version (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1165,7 +1147,7 @@ void CORBA::Contained::version (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Container>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::Container>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1207,7 +1189,7 @@ char * CORBA::Contained::absolute_name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ScopedName>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ScopedName>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1249,7 +1231,7 @@ char * CORBA::Contained::absolute_name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Repository>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::Repository>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1280,7 +1262,7 @@ CORBA::Contained::Description::_tao_any_destructor (
   )
 {
   Description *_tao_tmp_pointer =
-    ACE_static_cast (Description *, _tao_void_pointer);
+    static_cast<Description *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1304,7 +1286,7 @@ CORBA::Contained::Description::_tao_any_destructor (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Contained::Description>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::Contained::Description>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1330,7 +1312,7 @@ CORBA::Contained::Description::_tao_any_destructor (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::Contained::move (
-    CORBA::Container_ptr new_container,
+    ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
     ACE_ENV_ARG_DECL
@@ -1349,10 +1331,10 @@ void CORBA::Contained::move (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::Container>::in_arg_val _tao_new_container (new_container);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_new_name (new_name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_new_version (new_version);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::Container>::in_arg_val _tao_new_container (new_container);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_new_name (new_name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_new_version (new_version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1400,7 +1382,7 @@ void
 CORBA::Contained::_tao_any_destructor (void *_tao_void_pointer)
 {
   Contained *_tao_tmp_pointer =
-    ACE_static_cast (Contained *, _tao_void_pointer);
+    static_cast<Contained *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1453,18 +1435,18 @@ CORBA::Contained::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1538,7 +1520,7 @@ void CORBA::InterfaceDefSeq::_tao_any_destructor (
   )
 {
   InterfaceDefSeq * _tao_tmp_pointer =
-    ACE_static_cast (InterfaceDefSeq *, _tao_void_pointer);
+    static_cast<InterfaceDefSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1594,7 +1576,7 @@ void CORBA::ValueDefSeq::_tao_any_destructor (
   )
 {
   ValueDefSeq * _tao_tmp_pointer =
-    ACE_static_cast (ValueDefSeq *, _tao_void_pointer);
+    static_cast<ValueDefSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1650,7 +1632,7 @@ void CORBA::AbstractInterfaceDefSeq::_tao_any_destructor (
   )
 {
   AbstractInterfaceDefSeq * _tao_tmp_pointer =
-    ACE_static_cast (AbstractInterfaceDefSeq *, _tao_void_pointer);
+    static_cast<AbstractInterfaceDefSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1706,7 +1688,7 @@ void CORBA::LocalInterfaceDefSeq::_tao_any_destructor (
   )
 {
   LocalInterfaceDefSeq * _tao_tmp_pointer =
-    ACE_static_cast (LocalInterfaceDefSeq *, _tao_void_pointer);
+    static_cast<LocalInterfaceDefSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1762,7 +1744,7 @@ void CORBA::ExtInterfaceDefSeq::_tao_any_destructor (
   )
 {
   ExtInterfaceDefSeq * _tao_tmp_pointer =
-    ACE_static_cast (ExtInterfaceDefSeq *, _tao_void_pointer);
+    static_cast<ExtInterfaceDefSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1818,7 +1800,7 @@ void CORBA::ExtValueDefSeq::_tao_any_destructor (
   )
 {
   ExtValueDefSeq * _tao_tmp_pointer =
-    ACE_static_cast (ExtValueDefSeq *, _tao_void_pointer);
+    static_cast<ExtValueDefSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1874,7 +1856,7 @@ void CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor (
   )
 {
   ExtAbstractInterfaceDefSeq * _tao_tmp_pointer =
-    ACE_static_cast (ExtAbstractInterfaceDefSeq *, _tao_void_pointer);
+    static_cast<ExtAbstractInterfaceDefSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1930,7 +1912,7 @@ void CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor (
   )
 {
   ExtLocalInterfaceDefSeq * _tao_tmp_pointer =
-    ACE_static_cast (ExtLocalInterfaceDefSeq *, _tao_void_pointer);
+    static_cast<ExtLocalInterfaceDefSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1986,7 +1968,7 @@ void CORBA::ContainedSeq::_tao_any_destructor (
   )
 {
   ContainedSeq * _tao_tmp_pointer =
-    ACE_static_cast (ContainedSeq *, _tao_void_pointer);
+    static_cast<ContainedSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2001,7 +1983,7 @@ CORBA::StructMember::_tao_any_destructor (
   )
 {
   StructMember *_tao_tmp_pointer =
-    ACE_static_cast (StructMember *, _tao_void_pointer);
+    static_cast<StructMember *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2052,7 +2034,7 @@ void CORBA::StructMemberSeq::_tao_any_destructor (
   )
 {
   StructMemberSeq * _tao_tmp_pointer =
-    ACE_static_cast (StructMemberSeq *, _tao_void_pointer);
+    static_cast<StructMemberSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2067,7 +2049,7 @@ CORBA::Initializer::_tao_any_destructor (
   )
 {
   Initializer *_tao_tmp_pointer =
-    ACE_static_cast (Initializer *, _tao_void_pointer);
+    static_cast<Initializer *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2118,7 +2100,7 @@ void CORBA::InitializerSeq::_tao_any_destructor (
   )
 {
   InitializerSeq * _tao_tmp_pointer =
-    ACE_static_cast (InitializerSeq *, _tao_void_pointer);
+    static_cast<InitializerSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2133,7 +2115,7 @@ CORBA::ExceptionDescription::_tao_any_destructor (
   )
 {
   ExceptionDescription *_tao_tmp_pointer =
-    ACE_static_cast (ExceptionDescription *, _tao_void_pointer);
+    static_cast<ExceptionDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2184,7 +2166,7 @@ void CORBA::ExcDescriptionSeq::_tao_any_destructor (
   )
 {
   ExcDescriptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (ExcDescriptionSeq *, _tao_void_pointer);
+    static_cast<ExcDescriptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2199,7 +2181,7 @@ CORBA::ExtInitializer::_tao_any_destructor (
   )
 {
   ExtInitializer *_tao_tmp_pointer =
-    ACE_static_cast (ExtInitializer *, _tao_void_pointer);
+    static_cast<ExtInitializer *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2250,7 +2232,7 @@ void CORBA::ExtInitializerSeq::_tao_any_destructor (
   )
 {
   ExtInitializerSeq * _tao_tmp_pointer =
-    ACE_static_cast (ExtInitializerSeq *, _tao_void_pointer);
+    static_cast<ExtInitializerSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2265,7 +2247,7 @@ CORBA::UnionMember::_tao_any_destructor (
   )
 {
   UnionMember *_tao_tmp_pointer =
-    ACE_static_cast (UnionMember *, _tao_void_pointer);
+    static_cast<UnionMember *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2316,7 +2298,7 @@ void CORBA::UnionMemberSeq::_tao_any_destructor (
   )
 {
   UnionMemberSeq * _tao_tmp_pointer =
-    ACE_static_cast (UnionMemberSeq *, _tao_void_pointer);
+    static_cast<UnionMemberSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2363,7 +2345,7 @@ void CORBA::EnumMemberSeq::_tao_any_destructor (
   )
 {
   EnumMemberSeq * _tao_tmp_pointer =
-    ACE_static_cast (EnumMemberSeq *, _tao_void_pointer);
+    static_cast<EnumMemberSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2436,8 +2418,8 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Contained>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ScopedName>::in_arg_val _tao_search_name (search_name);
+  TAO::Arg_Traits< CORBA::Contained>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ScopedName>::in_arg_val _tao_search_name (search_name);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2464,8 +2446,8 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::ContainedSeq * CORBA::Container::contents (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
+    ::CORBA::DefinitionKind limit_type,
+    ::CORBA::Boolean exclude_inherited
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2482,9 +2464,9 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ContainedSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
+  TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2513,9 +2495,9 @@ TAO::Collocation_Proxy_Broker *
 
 ::CORBA::ContainedSeq * CORBA::Container::lookup_name (
     const char * search_name,
-    CORBA::Long levels_to_search,
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited
+    ::CORBA::Long levels_to_search,
+    ::CORBA::DefinitionKind limit_type,
+    ::CORBA::Boolean exclude_inherited
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2532,11 +2514,11 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ContainedSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_search_name (search_name);
-  TAO::Arg_Traits<CORBA::Long>::in_arg_val _tao_levels_to_search (levels_to_search);
-  TAO::Arg_Traits<CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
+  TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_search_name (search_name);
+  TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search (levels_to_search);
+  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2571,7 +2553,7 @@ CORBA::Container::Description::_tao_any_destructor (
   )
 {
   Description *_tao_tmp_pointer =
-    ACE_static_cast (Description *, _tao_void_pointer);
+    static_cast<Description *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2622,7 +2604,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
   )
 {
   DescriptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (DescriptionSeq *, _tao_void_pointer);
+    static_cast<DescriptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2632,9 +2614,9 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::Container::DescriptionSeq * CORBA::Container::describe_contents (
-    CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs
+    ::CORBA::DefinitionKind limit_type,
+    ::CORBA::Boolean exclude_inherited,
+    ::CORBA::Long max_returned_objs
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2651,10 +2633,10 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Container::DescriptionSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
-  TAO::Arg_Traits<CORBA::Long>::in_arg_val _tao_max_returned_objs (max_returned_objs);
+  TAO::Arg_Traits< CORBA::Container::DescriptionSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
+  TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs (max_returned_objs);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2702,10 +2684,10 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ModuleDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::ModuleDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2737,8 +2719,8 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value
+    ::CORBA::IDLType_ptr type,
+    const ::CORBA::Any & value
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2755,12 +2737,12 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ConstantDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits<CORBA::Any>::in_arg_val _tao_value (value);
+  TAO::Arg_Traits< CORBA::ConstantDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2794,7 +2776,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members
+    const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2811,11 +2793,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::StructDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< CORBA::StructDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2848,8 +2830,8 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
+    ::CORBA::IDLType_ptr discriminator_type,
+    const ::CORBA::UnionMemberSeq & members
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2866,12 +2848,12 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::UnionDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_discriminator_type (discriminator_type);
-  TAO::Arg_Traits<CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< CORBA::UnionDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type (discriminator_type);
+  TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2905,7 +2887,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members
+    const ::CORBA::EnumMemberSeq & members
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2922,11 +2904,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::EnumDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< CORBA::EnumDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2959,7 +2941,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type
+    ::CORBA::IDLType_ptr original_type
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2976,11 +2958,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::AliasDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_original_type (original_type);
+  TAO::Arg_Traits< CORBA::AliasDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type (original_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3013,7 +2995,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
+    const ::CORBA::InterfaceDefSeq & base_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3030,11 +3012,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3067,13 +3049,13 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers
+    ::CORBA::Boolean is_custom,
+    ::CORBA::Boolean is_abstract,
+    ::CORBA::ValueDef_ptr base_value,
+    ::CORBA::Boolean is_truncatable,
+    const ::CORBA::ValueDefSeq & abstract_base_values,
+    const ::CORBA::InterfaceDefSeq & supported_interfaces,
+    const ::CORBA::InitializerSeq & initializers
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3090,17 +3072,17 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ValueDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits<CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits<CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
+  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
+  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3139,7 +3121,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def
+    ::CORBA::IDLType_ptr original_type_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3156,11 +3138,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ValueBoxDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
+  TAO::Arg_Traits< CORBA::ValueBoxDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3193,7 +3175,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members
+    const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3210,11 +3192,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExceptionDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< CORBA::ExceptionDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3263,10 +3245,10 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::NativeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::NativeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3298,7 +3280,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces
+    const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3315,11 +3297,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::AbstractInterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< CORBA::AbstractInterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3352,7 +3334,7 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces
+    const ::CORBA::InterfaceDefSeq & base_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3369,11 +3351,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::LocalInterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< CORBA::LocalInterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3406,13 +3388,13 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
+    ::CORBA::Boolean is_custom,
+    ::CORBA::Boolean is_abstract,
+    ::CORBA::ValueDef_ptr base_value,
+    ::CORBA::Boolean is_truncatable,
+    const ::CORBA::ValueDefSeq & abstract_base_values,
+    const ::CORBA::InterfaceDefSeq & supported_interfaces,
+    const ::CORBA::ExtInitializerSeq & initializers
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3429,17 +3411,17 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExtValueDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits<CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits<CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< CORBA::ExtValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
+  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
+  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3496,7 +3478,7 @@ void
 CORBA::Container::_tao_any_destructor (void *_tao_void_pointer)
 {
   Container *_tao_tmp_pointer =
-    ACE_static_cast (Container *, _tao_void_pointer);
+    static_cast<Container *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3549,18 +3531,18 @@ CORBA::Container::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3650,7 +3632,7 @@ CORBA::TypeCode_ptr CORBA::IDLType::type (
       CORBA_IDLType_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3697,7 +3679,7 @@ void
 CORBA::IDLType::_tao_any_destructor (void *_tao_void_pointer)
 {
   IDLType *_tao_tmp_pointer =
-    ACE_static_cast (IDLType *, _tao_void_pointer);
+    static_cast<IDLType *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3750,18 +3732,18 @@ CORBA::IDLType::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3857,7 +3839,7 @@ void
 CORBA::TypedefDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   TypedefDef *_tao_tmp_pointer =
-    ACE_static_cast (TypedefDef *, _tao_void_pointer);
+    static_cast<TypedefDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3910,26 +3892,26 @@ CORBA::TypedefDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3962,7 +3944,7 @@ CORBA::TypeDescription::_tao_any_destructor (
   )
 {
   TypeDescription *_tao_tmp_pointer =
-    ACE_static_cast (TypeDescription *, _tao_void_pointer);
+    static_cast<TypeDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -3982,7 +3964,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::DefinitionKind &_tao_enumv
   
   if (_tao_result == 1)
     {
-      _tao_enumval = ACE_static_cast (CORBA::DefinitionKind, _tao_temp);
+      _tao_enumval = static_cast<CORBA::DefinitionKind> (_tao_temp);
     }
   
   return _tao_result;
@@ -4007,9 +3989,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::IRObject RHS_SCOPED_NAME;
@@ -4066,9 +4048,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::Contained RHS_SCOPED_NAME;
@@ -4094,12 +4076,12 @@ CORBA::Boolean operator<< (
     const CORBA::InterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4112,7 +4094,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4129,7 +4111,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4138,11 +4120,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4153,7 +4135,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_CPP_ */
@@ -4169,12 +4151,12 @@ CORBA::Boolean operator<< (
     const CORBA::ValueDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4187,7 +4169,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4204,7 +4186,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4213,11 +4195,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4228,7 +4210,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_CPP_ */
@@ -4244,12 +4226,12 @@ CORBA::Boolean operator<< (
     const CORBA::AbstractInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4262,7 +4244,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4279,7 +4261,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4288,11 +4270,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4303,7 +4285,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_CPP_ */
@@ -4319,12 +4301,12 @@ CORBA::Boolean operator<< (
     const CORBA::LocalInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4337,7 +4319,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4354,7 +4336,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4363,11 +4345,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4378,7 +4360,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_CPP_ */
@@ -4394,12 +4376,12 @@ CORBA::Boolean operator<< (
     const CORBA::ExtInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4412,7 +4394,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4429,7 +4411,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4438,11 +4420,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4453,7 +4435,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_CPP_ */
@@ -4469,12 +4451,12 @@ CORBA::Boolean operator<< (
     const CORBA::ExtValueDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4487,7 +4469,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4504,7 +4486,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4513,11 +4495,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4528,7 +4510,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtValueDefSeq_CPP_ */
@@ -4544,12 +4526,12 @@ CORBA::Boolean operator<< (
     const CORBA::ExtAbstractInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4562,7 +4544,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4579,7 +4561,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4588,11 +4570,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4603,7 +4585,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_CPP_ */
@@ -4619,12 +4601,12 @@ CORBA::Boolean operator<< (
     const CORBA::ExtLocalInterfaceDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4637,7 +4619,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4654,7 +4636,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4663,11 +4645,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4678,7 +4660,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_CPP_ */
@@ -4694,23 +4676,25 @@ CORBA::Boolean operator<< (
     const CORBA::ContainedSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            _tao_sequence[i].in ()->marshal (strm);
+            TAO::Objref_Traits<CORBA::Contained>::marshal (
+                _tao_sequence[i].in (), strm
+              );
         }
       
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4727,7 +4711,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4736,11 +4720,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4751,7 +4735,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ContainedSeq_CPP_ */
@@ -4795,12 +4779,12 @@ CORBA::Boolean operator<< (
     const CORBA::StructMemberSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4810,7 +4794,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4827,7 +4811,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4836,11 +4820,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4851,7 +4835,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_CPP_ */
@@ -4890,12 +4874,12 @@ CORBA::Boolean operator<< (
     const CORBA::InitializerSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4905,7 +4889,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4922,7 +4906,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4931,11 +4915,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4946,7 +4930,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_InitializerSeq_CPP_ */
@@ -4991,12 +4975,12 @@ CORBA::Boolean operator<< (
     const CORBA::ExcDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5006,7 +4990,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -5023,7 +5007,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -5032,11 +5016,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5047,7 +5031,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_CPP_ */
@@ -5088,12 +5072,12 @@ CORBA::Boolean operator<< (
     const CORBA::ExtInitializerSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5103,7 +5087,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -5120,7 +5104,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -5129,11 +5113,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5144,7 +5128,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtInitializerSeq_CPP_ */
@@ -5190,12 +5174,12 @@ CORBA::Boolean operator<< (
     const CORBA::UnionMemberSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5205,7 +5189,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -5222,7 +5206,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -5231,11 +5215,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5246,7 +5230,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_CPP_ */
@@ -5262,12 +5246,12 @@ CORBA::Boolean operator<< (
     const CORBA::EnumMemberSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5277,7 +5261,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -5294,7 +5278,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -5303,11 +5287,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5319,7 +5303,7 @@ CORBA::Boolean operator>> (
   
   }
 
-return 0;
+return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_CPP_ */
@@ -5363,12 +5347,12 @@ CORBA::Boolean operator<< (
     const CORBA::Container::DescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5378,7 +5362,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -5395,7 +5379,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -5404,11 +5388,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5419,7 +5403,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_CPP_ */
@@ -5443,9 +5427,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::Container RHS_SCOPED_NAME;
@@ -5479,9 +5463,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::IDLType RHS_SCOPED_NAME;
@@ -5515,9 +5499,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::TypedefDef RHS_SCOPED_NAME;
@@ -5562,7 +5546,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -7076,6 +7060,11 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Basic_Argument_T< \
+        CORBA::DefinitionKind \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::IRObject \
       >
@@ -7113,6 +7102,18 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::Container_ptr, \
+        CORBA::Container_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::Repository_ptr, \
+        CORBA::Repository_var \
+      >
+
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_TMPLINST_CS_
 
@@ -7144,6 +7145,12 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::Contained::Description, \
+        CORBA::Contained::Description_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::Container_ptr \
       >
@@ -7205,6 +7212,18 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::Contained_ptr, \
+        CORBA::Contained_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ContainedSeq, \
+        CORBA::ContainedSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Basic_Argument_T< \
         CORBA::DefinitionKind \
       >
@@ -7269,31 +7288,85 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::Container::DescriptionSeq, \
+        CORBA::Container::DescriptionSeq_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ModuleDef_ptr, \
+        CORBA::ModuleDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ConstantDef_ptr, \
+        CORBA::ConstantDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::IDLType_ptr \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::StructDef_ptr, \
+        CORBA::StructDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::StructMemberSeq \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::UnionDef_ptr, \
+        CORBA::UnionDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::UnionMemberSeq \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::EnumDef_ptr, \
+        CORBA::EnumDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::EnumMemberSeq \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::AliasDef_ptr, \
+        CORBA::AliasDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::InterfaceDef_ptr, \
+        CORBA::InterfaceDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::InterfaceDefSeq \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ValueDef_ptr, \
+        CORBA::ValueDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::ValueDef_ptr \
       >
@@ -7309,11 +7382,47 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ValueBoxDef_ptr, \
+        CORBA::ValueBoxDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ExceptionDef_ptr, \
+        CORBA::ExceptionDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::NativeDef_ptr, \
+        CORBA::NativeDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::AbstractInterfaceDef_ptr, \
+        CORBA::AbstractInterfaceDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::AbstractInterfaceDefSeq \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::LocalInterfaceDef_ptr, \
+        CORBA::LocalInterfaceDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ExtValueDef_ptr, \
+        CORBA::ExtValueDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::ExtInitializerSeq \
       >
@@ -8386,4 +8495,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index c5f7c5e03bf..10665b05cb4 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -26,22 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_IFR_BASEC_H_
-#define _TAO_IDL_ORIG_IFR_BASEC_H_
+#ifndef _TAO_IDL_IFR_BASEC_H_
+#define _TAO_IDL_IFR_BASEC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ifr_client_export.h"
-#include "tao/Environment.h"
+#include "tao/ORB.h"
 #include "tao/SystemException.h"
+#include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
 #include "tao/Any.h"
@@ -64,9 +66,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -74,13 +74,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -90,22 +90,22 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
-
+  // be\be_visitor_typedef/typedef_ch.cpp:413
+  
   typedef char * ScopedName;
   typedef CORBA::String_var ScopedName_var;
   typedef CORBA::String_out ScopedName_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ScopedName;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum DefinitionKind
   {
     dk_none,
@@ -145,29 +145,29 @@ namespace CORBA
     dk_Uses,
     dk_Event
   };
-
+  
   typedef DefinitionKind &DefinitionKind_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DefinitionKind;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_IROBJECT__VAR_OUT_CH_)
 #define _CORBA_IROBJECT__VAR_OUT_CH_
-
+  
   class IRObject;
   typedef IRObject *IRObject_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         IRObject
       >
     IRObject_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         IRObject
@@ -175,13 +175,13 @@ namespace CORBA
     IRObject_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IROBJECT_CH_)
 #define _CORBA_IROBJECT_CH_
-
+  
   class TAO_IFR_Client_Export IRObject
     : public virtual CORBA::Object
   {
@@ -189,74 +189,74 @@ namespace CORBA
     friend class TAO::Narrow_Utils<IRObject>;
     typedef IRObject_ptr _ptr_type;
     typedef IRObject_var _var_type;
-
+    
     // The static operations.
     static IRObject_ptr _duplicate (IRObject_ptr obj);
-
+    
     static IRObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IRObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IRObject_ptr _nil (void)
     {
-      return (IRObject_ptr)0;
+      return static_cast<IRObject_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     IRObject (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IRObject_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     IRObject (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     IRObject (
         TAO_Stub *objref,
@@ -264,50 +264,50 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~IRObject (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     IRObject (const IRObject &);
-
+    
     void operator= (const IRObject &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IRObject;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
-
+  // be\be_visitor_typedef/typedef_ch.cpp:413
+  
   typedef char * VersionSpec;
   typedef CORBA::String_var VersionSpec_var;
   typedef CORBA::String_out VersionSpec_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_VersionSpec;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONTAINED__VAR_OUT_CH_)
 #define _CORBA_CONTAINED__VAR_OUT_CH_
-
+  
   class Contained;
   typedef Contained *Contained_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Contained
       >
     Contained_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Contained
@@ -315,22 +315,22 @@ namespace CORBA
     Contained_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_)
 #define _CORBA_REPOSITORY__VAR_OUT_CH_
-
+  
   class Repository;
   typedef Repository *Repository_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Repository
       >
     Repository_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Repository
@@ -338,22 +338,22 @@ namespace CORBA
     Repository_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONTAINER__VAR_OUT_CH_)
 #define _CORBA_CONTAINER__VAR_OUT_CH_
-
+  
   class Container;
   typedef Container *Container_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Container
       >
     Container_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Container
@@ -361,54 +361,54 @@ namespace CORBA
     Container_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINED_CH_)
 #define _CORBA_CONTAINED_CH_
-
+  
   class TAO_IFR_Client_Export Contained
-    : public virtual CORBA::IRObject
+    : public virtual ::CORBA::IRObject
   {
   public:
     friend class TAO::Narrow_Utils<Contained>;
     typedef Contained_ptr _ptr_type;
     typedef Contained_var _var_type;
-
+    
     // The static operations.
     static Contained_ptr _duplicate (Contained_ptr obj);
-
+    
     static Contained_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Contained_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Contained_ptr _nil (void)
     {
-      return (Contained_ptr)0;
+      return static_cast<Contained_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void id (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -416,20 +416,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void name (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -437,20 +437,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void version (
         const char * version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -458,87 +458,87 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-
+    
     struct Description;
-
+    
     typedef
       TAO_Var_Var_T<
           Description
         >
       Description_var;
-
+    
     typedef
       TAO_Out_T<
           Description,
           Description_var
         >
       Description_out;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:52
-
+    
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-
+      
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_Description;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void move (
-        CORBA::Container_ptr new_container,
+        ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -546,34 +546,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Contained (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Contained_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Contained (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Contained (
         TAO_Stub *objref,
@@ -581,38 +581,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Contained (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Contained (const Contained &);
-
+    
     void operator= (const Contained &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Contained;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_)
 #define _CORBA_MODULEDEF__VAR_OUT_CH_
-
+  
   class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ModuleDef
       >
     ModuleDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ModuleDef
@@ -620,22 +620,22 @@ namespace CORBA
     ModuleDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_)
 #define _CORBA_CONSTANTDEF__VAR_OUT_CH_
-
+  
   class ConstantDef;
   typedef ConstantDef *ConstantDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ConstantDef
       >
     ConstantDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ConstantDef
@@ -643,22 +643,22 @@ namespace CORBA
     ConstantDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_IDLTYPE__VAR_OUT_CH_)
 #define _CORBA_IDLTYPE__VAR_OUT_CH_
-
+  
   class IDLType;
   typedef IDLType *IDLType_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         IDLType
       >
     IDLType_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         IDLType
@@ -666,22 +666,22 @@ namespace CORBA
     IDLType_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_)
 #define _CORBA_STRUCTDEF__VAR_OUT_CH_
-
+  
   class StructDef;
   typedef StructDef *StructDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         StructDef
       >
     StructDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         StructDef
@@ -689,22 +689,22 @@ namespace CORBA
     StructDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_)
 #define _CORBA_UNIONDEF__VAR_OUT_CH_
-
+  
   class UnionDef;
   typedef UnionDef *UnionDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         UnionDef
       >
     UnionDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         UnionDef
@@ -712,22 +712,22 @@ namespace CORBA
     UnionDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_)
 #define _CORBA_ENUMDEF__VAR_OUT_CH_
-
+  
   class EnumDef;
   typedef EnumDef *EnumDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         EnumDef
       >
     EnumDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         EnumDef
@@ -735,22 +735,22 @@ namespace CORBA
     EnumDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_)
 #define _CORBA_ALIASDEF__VAR_OUT_CH_
-
+  
   class AliasDef;
   typedef AliasDef *AliasDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         AliasDef
       >
     AliasDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         AliasDef
@@ -758,22 +758,22 @@ namespace CORBA
     AliasDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_INTERFACEDEF__VAR_OUT_CH_
-
+  
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         InterfaceDef
       >
     InterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         InterfaceDef
@@ -781,15 +781,15 @@ namespace CORBA
     InterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
 #define _CORBA_INTERFACEDEFSEQ_CH_
-
+  
   class InterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         InterfaceDefSeq,
@@ -799,7 +799,7 @@ namespace CORBA
           >
       >
     InterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         InterfaceDefSeq,
@@ -810,7 +810,7 @@ namespace CORBA
           >
       >
     InterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export InterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -824,39 +824,39 @@ namespace CORBA
     InterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        InterfaceDef_ptr* buffer,
+        InterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     InterfaceDefSeq (const InterfaceDefSeq &);
     ~InterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef InterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_)
 #define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_
-
+  
   class ExceptionDef;
   typedef ExceptionDef *ExceptionDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExceptionDef
       >
     ExceptionDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExceptionDef
@@ -864,22 +864,22 @@ namespace CORBA
     ExceptionDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_)
 #define _CORBA_NATIVEDEF__VAR_OUT_CH_
-
+  
   class NativeDef;
   typedef NativeDef *NativeDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         NativeDef
       >
     NativeDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         NativeDef
@@ -887,22 +887,22 @@ namespace CORBA
     NativeDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEDEF__VAR_OUT_CH_
-
+  
   class ValueDef;
   typedef ValueDef *ValueDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ValueDef
       >
     ValueDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ValueDef
@@ -910,15 +910,15 @@ namespace CORBA
     ValueDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_VALUEDEFSEQ_CH_)
 #define _CORBA_VALUEDEFSEQ_CH_
-
+  
   class ValueDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ValueDefSeq,
@@ -928,7 +928,7 @@ namespace CORBA
           >
       >
     ValueDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ValueDefSeq,
@@ -939,7 +939,7 @@ namespace CORBA
           >
       >
     ValueDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ValueDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -953,39 +953,39 @@ namespace CORBA
     ValueDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ValueDef_ptr* buffer,
+        ValueDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ValueDefSeq (const ValueDefSeq &);
     ~ValueDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ValueDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEBOXDEF__VAR_OUT_CH_
-
+  
   class ValueBoxDef;
   typedef ValueBoxDef *ValueBoxDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ValueBoxDef
       >
     ValueBoxDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ValueBoxDef
@@ -993,22 +993,22 @@ namespace CORBA
     ValueBoxDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_
-
+  
   class AbstractInterfaceDef;
   typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         AbstractInterfaceDef
       >
     AbstractInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         AbstractInterfaceDef
@@ -1016,15 +1016,15 @@ namespace CORBA
     AbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-
+  
   class AbstractInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         AbstractInterfaceDefSeq,
@@ -1034,7 +1034,7 @@ namespace CORBA
           >
       >
     AbstractInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         AbstractInterfaceDefSeq,
@@ -1045,7 +1045,7 @@ namespace CORBA
           >
       >
     AbstractInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export AbstractInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1059,39 +1059,39 @@ namespace CORBA
     AbstractInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        AbstractInterfaceDef_ptr* buffer,
+        AbstractInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &);
     ~AbstractInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef AbstractInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AbstractInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_
-
+  
   class LocalInterfaceDef;
   typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         LocalInterfaceDef
       >
     LocalInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         LocalInterfaceDef
@@ -1099,15 +1099,15 @@ namespace CORBA
     LocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ_CH_
-
+  
   class LocalInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         LocalInterfaceDefSeq,
@@ -1117,7 +1117,7 @@ namespace CORBA
           >
       >
     LocalInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         LocalInterfaceDefSeq,
@@ -1128,7 +1128,7 @@ namespace CORBA
           >
       >
     LocalInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export LocalInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1142,39 +1142,39 @@ namespace CORBA
     LocalInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        LocalInterfaceDef_ptr* buffer,
+        LocalInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     LocalInterfaceDefSeq (const LocalInterfaceDefSeq &);
     ~LocalInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef LocalInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LocalInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_
-
+  
   class ExtInterfaceDef;
   typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExtInterfaceDef
       >
     ExtInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExtInterfaceDef
@@ -1182,15 +1182,15 @@ namespace CORBA
     ExtInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTINTERFACEDEFSEQ_CH_
-
+  
   class ExtInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ExtInterfaceDefSeq,
@@ -1200,7 +1200,7 @@ namespace CORBA
           >
       >
     ExtInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ExtInterfaceDefSeq,
@@ -1211,7 +1211,7 @@ namespace CORBA
           >
       >
     ExtInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1225,39 +1225,39 @@ namespace CORBA
     ExtInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtInterfaceDef_ptr* buffer,
+        ExtInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ExtInterfaceDefSeq (const ExtInterfaceDefSeq &);
     ~ExtInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTVALUEDEF__VAR_OUT_CH_
-
+  
   class ExtValueDef;
   typedef ExtValueDef *ExtValueDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExtValueDef
       >
     ExtValueDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExtValueDef
@@ -1265,15 +1265,15 @@ namespace CORBA
     ExtValueDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTVALUEDEFSEQ_CH_)
 #define _CORBA_EXTVALUEDEFSEQ_CH_
-
+  
   class ExtValueDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ExtValueDefSeq,
@@ -1283,7 +1283,7 @@ namespace CORBA
           >
       >
     ExtValueDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ExtValueDefSeq,
@@ -1294,7 +1294,7 @@ namespace CORBA
           >
       >
     ExtValueDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtValueDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1308,39 +1308,39 @@ namespace CORBA
     ExtValueDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtValueDef_ptr* buffer,
+        ExtValueDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ExtValueDefSeq (const ExtValueDefSeq &);
     ~ExtValueDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtValueDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtValueDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_
-
+  
   class ExtAbstractInterfaceDef;
   typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExtAbstractInterfaceDef
       >
     ExtAbstractInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExtAbstractInterfaceDef
@@ -1348,15 +1348,15 @@ namespace CORBA
     ExtAbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_
-
+  
   class ExtAbstractInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ExtAbstractInterfaceDefSeq,
@@ -1366,7 +1366,7 @@ namespace CORBA
           >
       >
     ExtAbstractInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ExtAbstractInterfaceDefSeq,
@@ -1377,7 +1377,7 @@ namespace CORBA
           >
       >
     ExtAbstractInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1391,39 +1391,39 @@ namespace CORBA
     ExtAbstractInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtAbstractInterfaceDef_ptr* buffer,
+        ExtAbstractInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &);
     ~ExtAbstractInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtAbstractInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAbstractInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_
-
+  
   class ExtLocalInterfaceDef;
   typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ExtLocalInterfaceDef
       >
     ExtLocalInterfaceDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ExtLocalInterfaceDef
@@ -1431,15 +1431,15 @@ namespace CORBA
     ExtLocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEFSEQ_CH_
-
+  
   class ExtLocalInterfaceDefSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ExtLocalInterfaceDefSeq,
@@ -1449,7 +1449,7 @@ namespace CORBA
           >
       >
     ExtLocalInterfaceDefSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ExtLocalInterfaceDefSeq,
@@ -1460,7 +1460,7 @@ namespace CORBA
           >
       >
     ExtLocalInterfaceDefSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1474,32 +1474,32 @@ namespace CORBA
     ExtLocalInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtLocalInterfaceDef_ptr* buffer,
+        ExtLocalInterfaceDef_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &);
     ~ExtLocalInterfaceDefSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtLocalInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtLocalInterfaceDefSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CONTAINEDSEQ_CH_)
 #define _CORBA_CONTAINEDSEQ_CH_
-
+  
   class ContainedSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ContainedSeq,
@@ -1509,7 +1509,7 @@ namespace CORBA
           >
       >
     ContainedSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ContainedSeq,
@@ -1520,7 +1520,7 @@ namespace CORBA
           >
       >
     ContainedSeq_out;
-
+  
   class TAO_IFR_Client_Export ContainedSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1534,75 +1534,75 @@ namespace CORBA
     ContainedSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        Contained_ptr* buffer,
+        Contained_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ContainedSeq (const ContainedSeq &);
     ~ContainedSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ContainedSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContainedSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct StructMember;
-
+  
   typedef
     TAO_Var_Var_T<
         StructMember
       >
     StructMember_var;
-
+  
   typedef
     TAO_Out_T<
         StructMember,
         StructMember_var
       >
     StructMember_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export StructMember
   {
     typedef StructMember_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMember;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
 #define _CORBA_STRUCTMEMBERSEQ_CH_
-
+  
   class StructMemberSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         StructMemberSeq,
         StructMember
       >
     StructMemberSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         StructMemberSeq,
@@ -1610,7 +1610,7 @@ namespace CORBA
         StructMember
       >
     StructMemberSeq_out;
-
+  
   class TAO_IFR_Client_Export StructMemberSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1623,74 +1623,74 @@ namespace CORBA
     StructMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        StructMember* buffer,
+        StructMember* buffer, 
         CORBA::Boolean release = 0
       );
     StructMemberSeq (const StructMemberSeq &);
     ~StructMemberSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef StructMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMemberSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct Initializer;
-
+  
   typedef
     TAO_Var_Var_T<
         Initializer
       >
     Initializer_var;
-
+  
   typedef
     TAO_Out_T<
         Initializer,
         Initializer_var
       >
     Initializer_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export Initializer
   {
     typedef Initializer_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     TAO_String_Manager name;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Initializer;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_INITIALIZERSEQ_CH_)
 #define _CORBA_INITIALIZERSEQ_CH_
-
+  
   class InitializerSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         InitializerSeq,
         Initializer
       >
     InitializerSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         InitializerSeq,
@@ -1698,7 +1698,7 @@ namespace CORBA
         Initializer
       >
     InitializerSeq_out;
-
+  
   class TAO_IFR_Client_Export InitializerSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1711,49 +1711,49 @@ namespace CORBA
     InitializerSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        Initializer* buffer,
+        Initializer* buffer, 
         CORBA::Boolean release = 0
       );
     InitializerSeq (const InitializerSeq &);
     ~InitializerSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef InitializerSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InitializerSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct ExceptionDescription;
-
+  
   typedef
     TAO_Var_Var_T<
         ExceptionDescription
       >
     ExceptionDescription_var;
-
+  
   typedef
     TAO_Out_T<
         ExceptionDescription,
         ExceptionDescription_var
       >
     ExceptionDescription_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export ExceptionDescription
   {
     typedef ExceptionDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -1761,27 +1761,27 @@ namespace CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDescription;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
 #define _CORBA_EXCDESCRIPTIONSEQ_CH_
-
+  
   class ExcDescriptionSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ExcDescriptionSeq,
         ExceptionDescription
       >
     ExcDescriptionSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ExcDescriptionSeq,
@@ -1789,7 +1789,7 @@ namespace CORBA
         ExceptionDescription
       >
     ExcDescriptionSeq_out;
-
+  
   class TAO_IFR_Client_Export ExcDescriptionSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1802,75 +1802,75 @@ namespace CORBA
     ExcDescriptionSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExceptionDescription* buffer,
+        ExceptionDescription* buffer, 
         CORBA::Boolean release = 0
       );
     ExcDescriptionSeq (const ExcDescriptionSeq &);
     ~ExcDescriptionSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExcDescriptionSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct ExtInitializer;
-
+  
   typedef
     TAO_Var_Var_T<
         ExtInitializer
       >
     ExtInitializer_var;
-
+  
   typedef
     TAO_Out_T<
         ExtInitializer,
         ExtInitializer_var
       >
     ExtInitializer_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export ExtInitializer
   {
     typedef ExtInitializer_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     CORBA::ExcDescriptionSeq exceptions;
     TAO_String_Manager name;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInitializer;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ_CH_)
 #define _CORBA_EXTINITIALIZERSEQ_CH_
-
+  
   class ExtInitializerSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ExtInitializerSeq,
         ExtInitializer
       >
     ExtInitializerSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ExtInitializerSeq,
@@ -1878,7 +1878,7 @@ namespace CORBA
         ExtInitializer
       >
     ExtInitializerSeq_out;
-
+  
   class TAO_IFR_Client_Export ExtInitializerSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1891,76 +1891,76 @@ namespace CORBA
     ExtInitializerSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtInitializer* buffer,
+        ExtInitializer* buffer, 
         CORBA::Boolean release = 0
       );
     ExtInitializerSeq (const ExtInitializerSeq &);
     ~ExtInitializerSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExtInitializerSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInitializerSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct UnionMember;
-
+  
   typedef
     TAO_Var_Var_T<
         UnionMember
       >
     UnionMember_var;
-
+  
   typedef
     TAO_Out_T<
         UnionMember,
         UnionMember_var
       >
     UnionMember_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export UnionMember
   {
     typedef UnionMember_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::Any label;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMember;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
 #define _CORBA_UNIONMEMBERSEQ_CH_
-
+  
   class UnionMemberSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         UnionMemberSeq,
         UnionMember
       >
     UnionMemberSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         UnionMemberSeq,
@@ -1968,7 +1968,7 @@ namespace CORBA
         UnionMember
       >
     UnionMemberSeq_out;
-
+  
   class TAO_IFR_Client_Export UnionMemberSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1981,39 +1981,39 @@ namespace CORBA
     UnionMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        UnionMember* buffer,
+        UnionMember* buffer, 
         CORBA::Boolean release = 0
       );
     UnionMemberSeq (const UnionMemberSeq &);
     ~UnionMemberSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef UnionMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMemberSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
 #define _CORBA_ENUMMEMBERSEQ_CH_
-
+  
   class EnumMemberSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         EnumMemberSeq,
         TAO_SeqElem_String_Manager
       >
     EnumMemberSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         EnumMemberSeq,
@@ -2021,7 +2021,7 @@ namespace CORBA
         TAO_SeqElem_String_Manager
       >
     EnumMemberSeq_out;
-
+  
   class TAO_IFR_Client_Export EnumMemberSeq
     : public
         TAO_Unbounded_String_Sequence
@@ -2032,61 +2032,61 @@ namespace CORBA
     EnumMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer,
+        char ** buffer, 
         CORBA::Boolean release = 0
       );
     EnumMemberSeq (const EnumMemberSeq &);
     ~EnumMemberSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef EnumMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnumMemberSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINER_CH_)
 #define _CORBA_CONTAINER_CH_
-
+  
   class TAO_IFR_Client_Export Container
-    : public virtual CORBA::IRObject
+    : public virtual ::CORBA::IRObject
   {
   public:
     friend class TAO::Narrow_Utils<Container>;
     typedef Container_ptr _ptr_type;
     typedef Container_var _var_type;
-
+    
     // The static operations.
     static Container_ptr _duplicate (Container_ptr obj);
-
+    
     static Container_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Container_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Container_ptr _nil (void)
     {
-      return (Container_ptr)0;
+      return static_cast<Container_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2094,84 +2094,84 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-
+    
     struct Description;
-
+    
     typedef
       TAO_Var_Var_T<
           Description
         >
       Description_var;
-
+    
     typedef
       TAO_Out_T<
           Description,
           Description_var
         >
       Description_out;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_structure/structure_ch.cpp:52
-
+    
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-
+      
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, Contained_var) contained_object;
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_Description;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-
+    
     class DescriptionSeq;
-
+    
     typedef
       TAO_VarSeq_Var_T<
           DescriptionSeq,
           Description
         >
       DescriptionSeq_var;
-
+    
     typedef
       TAO_Seq_Out_T<
           DescriptionSeq,
@@ -2179,7 +2179,7 @@ namespace CORBA
           Description
         >
       DescriptionSeq_out;
-
+    
     class TAO_IFR_Client_Export DescriptionSeq
       : public
           TAO_Unbounded_Sequence<
@@ -2192,40 +2192,40 @@ namespace CORBA
       DescriptionSeq (
           CORBA::ULong max,
           CORBA::ULong length,
-          Description* buffer,
+          Description* buffer, 
           CORBA::Boolean release = 0
         );
       DescriptionSeq (const DescriptionSeq &);
       ~DescriptionSeq (void);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       typedef DescriptionSeq_var _var_type;
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_DescriptionSeq;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ModuleDef_ptr create_module (
         const char * id,
         const char * name,
@@ -2235,144 +2235,144 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type
+        ::CORBA::IDLType_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::InitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::NativeDef_ptr create_native (
         const char * id,
         const char * name,
@@ -2382,82 +2382,82 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::AbstractInterfaceDefSeq & base_interfaces
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
         const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        const CORBA::InterfaceDefSeq & supported_interfaces,
-        const CORBA::ExtInitializerSeq & initializers
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Container (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Container_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Container (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Container (
         TAO_Stub *objref,
@@ -2465,94 +2465,94 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Container (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Container (const Container &);
-
+    
     void operator= (const Container &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Container;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IDLTYPE_CH_)
 #define _CORBA_IDLTYPE_CH_
-
+  
   class TAO_IFR_Client_Export IDLType
-    : public virtual CORBA::IRObject
+    : public virtual ::CORBA::IRObject
   {
   public:
     friend class TAO::Narrow_Utils<IDLType>;
     typedef IDLType_ptr _ptr_type;
     typedef IDLType_var _var_type;
-
+    
     // The static operations.
     static IDLType_ptr _duplicate (IDLType_ptr obj);
-
+    
     static IDLType_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IDLType_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IDLType_ptr _nil (void)
     {
-      return (IDLType_ptr)0;
+      return static_cast<IDLType_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     IDLType (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IDLType_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     IDLType (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     IDLType (
         TAO_Stub *objref,
@@ -2560,38 +2560,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~IDLType (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     IDLType (const IDLType &);
-
+    
     void operator= (const IDLType &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDLType;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_TYPEDEFDEF__VAR_OUT_CH_)
 #define _CORBA_TYPEDEFDEF__VAR_OUT_CH_
-
+  
   class TypedefDef;
   typedef TypedefDef *TypedefDef_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TypedefDef
       >
     TypedefDef_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TypedefDef
@@ -2599,69 +2599,69 @@ namespace CORBA
     TypedefDef_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPEDEFDEF_CH_)
 #define _CORBA_TYPEDEFDEF_CH_
-
+  
   class TAO_IFR_Client_Export TypedefDef
-    : public virtual CORBA::Contained,
-      public virtual CORBA::IDLType
+    : public virtual ::CORBA::Contained,
+      public virtual ::CORBA::IDLType
   {
   public:
     friend class TAO::Narrow_Utils<TypedefDef>;
     typedef TypedefDef_ptr _ptr_type;
     typedef TypedefDef_var _var_type;
-
+    
     // The static operations.
     static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
-
+    
     static TypedefDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypedefDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypedefDef_ptr _nil (void)
     {
-      return (TypedefDef_ptr)0;
+      return static_cast<TypedefDef_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     TypedefDef (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_TypedefDef_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     TypedefDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     TypedefDef (
         TAO_Stub *objref,
@@ -2669,48 +2669,48 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~TypedefDef (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TypedefDef (const TypedefDef &);
-
+    
     void operator= (const TypedefDef &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypedefDef;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct TypeDescription;
-
+  
   typedef
     TAO_Var_Var_T<
         TypeDescription
       >
     TypeDescription_var;
-
+  
   typedef
     TAO_Out_T<
         TypeDescription,
         TypeDescription_var
       >
     TypeDescription_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_IFR_Client_Export TypeDescription
   {
     typedef TypeDescription_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -2718,10 +2718,10 @@ namespace CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeDescription;
 
 // TAO_IDL - Generated from
@@ -2773,19 +2773,19 @@ namespace TAO
 
 #if !defined (_CORBA_IROBJECT__TRAITS_CH_)
 #define _CORBA_IROBJECT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::IRObject>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::IRObject>
   {
-    static CORBA::IRObject_ptr duplicate (
-        CORBA::IRObject_ptr
+    static ::CORBA::IRObject_ptr duplicate (
+        ::CORBA::IRObject_ptr
       );
     static void release (
-        CORBA::IRObject_ptr
+        ::CORBA::IRObject_ptr
       );
-    static CORBA::IRObject_ptr nil (void);
+    static ::CORBA::IRObject_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::IRObject_ptr p,
+        ::CORBA::IRObject_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2794,40 +2794,19 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINED__TRAITS_CH_)
 #define _CORBA_CONTAINED__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::Contained>
-  {
-    static CORBA::Contained_ptr duplicate (
-        CORBA::Contained_ptr
-      );
-    static void release (
-        CORBA::Contained_ptr
-      );
-    static CORBA::Contained_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::Contained_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY__TRAITS_CH_)
-#define _CORBA_REPOSITORY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::Repository>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Contained>
   {
-    static CORBA::Repository_ptr duplicate (
-        CORBA::Repository_ptr
+    static ::CORBA::Contained_ptr duplicate (
+        ::CORBA::Contained_ptr
       );
     static void release (
-        CORBA::Repository_ptr
+        ::CORBA::Contained_ptr
       );
-    static CORBA::Repository_ptr nil (void);
+    static ::CORBA::Contained_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::Repository_ptr p,
+        ::CORBA::Contained_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2836,61 +2815,19 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__TRAITS_CH_)
 #define _CORBA_CONTAINER__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::Container>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Container>
   {
-    static CORBA::Container_ptr duplicate (
-        CORBA::Container_ptr
+    static ::CORBA::Container_ptr duplicate (
+        ::CORBA::Container_ptr
       );
     static void release (
-        CORBA::Container_ptr
+        ::CORBA::Container_ptr
       );
-    static CORBA::Container_ptr nil (void);
+    static ::CORBA::Container_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::Container_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_MODULEDEF__TRAITS_CH_)
-#define _CORBA_MODULEDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ModuleDef>
-  {
-    static CORBA::ModuleDef_ptr duplicate (
-        CORBA::ModuleDef_ptr
-      );
-    static void release (
-        CORBA::ModuleDef_ptr
-      );
-    static CORBA::ModuleDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::ModuleDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTANTDEF__TRAITS_CH_)
-#define _CORBA_CONSTANTDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ConstantDef>
-  {
-    static CORBA::ConstantDef_ptr duplicate (
-        CORBA::ConstantDef_ptr
-      );
-    static void release (
-        CORBA::ConstantDef_ptr
-      );
-    static CORBA::ConstantDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::ConstantDef_ptr p,
+        ::CORBA::Container_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2899,334 +2836,19 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__TRAITS_CH_)
 #define _CORBA_IDLTYPE__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::IDLType>
-  {
-    static CORBA::IDLType_ptr duplicate (
-        CORBA::IDLType_ptr
-      );
-    static void release (
-        CORBA::IDLType_ptr
-      );
-    static CORBA::IDLType_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::IDLType_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTDEF__TRAITS_CH_)
-#define _CORBA_STRUCTDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::StructDef>
-  {
-    static CORBA::StructDef_ptr duplicate (
-        CORBA::StructDef_ptr
-      );
-    static void release (
-        CORBA::StructDef_ptr
-      );
-    static CORBA::StructDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::StructDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONDEF__TRAITS_CH_)
-#define _CORBA_UNIONDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::UnionDef>
-  {
-    static CORBA::UnionDef_ptr duplicate (
-        CORBA::UnionDef_ptr
-      );
-    static void release (
-        CORBA::UnionDef_ptr
-      );
-    static CORBA::UnionDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::UnionDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMDEF__TRAITS_CH_)
-#define _CORBA_ENUMDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::EnumDef>
-  {
-    static CORBA::EnumDef_ptr duplicate (
-        CORBA::EnumDef_ptr
-      );
-    static void release (
-        CORBA::EnumDef_ptr
-      );
-    static CORBA::EnumDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::EnumDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ALIASDEF__TRAITS_CH_)
-#define _CORBA_ALIASDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::AliasDef>
-  {
-    static CORBA::AliasDef_ptr duplicate (
-        CORBA::AliasDef_ptr
-      );
-    static void release (
-        CORBA::AliasDef_ptr
-      );
-    static CORBA::AliasDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::AliasDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__TRAITS_CH_)
-#define _CORBA_INTERFACEDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceDef>
-  {
-    static CORBA::InterfaceDef_ptr duplicate (
-        CORBA::InterfaceDef_ptr
-      );
-    static void release (
-        CORBA::InterfaceDef_ptr
-      );
-    static CORBA::InterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::InterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEF__TRAITS_CH_)
-#define _CORBA_EXCEPTIONDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExceptionDef>
-  {
-    static CORBA::ExceptionDef_ptr duplicate (
-        CORBA::ExceptionDef_ptr
-      );
-    static void release (
-        CORBA::ExceptionDef_ptr
-      );
-    static CORBA::ExceptionDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::ExceptionDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_NATIVEDEF__TRAITS_CH_)
-#define _CORBA_NATIVEDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::NativeDef>
-  {
-    static CORBA::NativeDef_ptr duplicate (
-        CORBA::NativeDef_ptr
-      );
-    static void release (
-        CORBA::NativeDef_ptr
-      );
-    static CORBA::NativeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::NativeDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__TRAITS_CH_)
-#define _CORBA_VALUEDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueDef>
-  {
-    static CORBA::ValueDef_ptr duplicate (
-        CORBA::ValueDef_ptr
-      );
-    static void release (
-        CORBA::ValueDef_ptr
-      );
-    static CORBA::ValueDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::ValueDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEBOXDEF__TRAITS_CH_)
-#define _CORBA_VALUEBOXDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueBoxDef>
-  {
-    static CORBA::ValueBoxDef_ptr duplicate (
-        CORBA::ValueBoxDef_ptr
-      );
-    static void release (
-        CORBA::ValueBoxDef_ptr
-      );
-    static CORBA::ValueBoxDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::ValueBoxDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::AbstractInterfaceDef>
-  {
-    static CORBA::AbstractInterfaceDef_ptr duplicate (
-        CORBA::AbstractInterfaceDef_ptr
-      );
-    static void release (
-        CORBA::AbstractInterfaceDef_ptr
-      );
-    static CORBA::AbstractInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::AbstractInterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_LOCALINTERFACEDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::LocalInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::IDLType>
   {
-    static CORBA::LocalInterfaceDef_ptr duplicate (
-        CORBA::LocalInterfaceDef_ptr
+    static ::CORBA::IDLType_ptr duplicate (
+        ::CORBA::IDLType_ptr
       );
     static void release (
-        CORBA::LocalInterfaceDef_ptr
+        ::CORBA::IDLType_ptr
       );
-    static CORBA::LocalInterfaceDef_ptr nil (void);
+    static ::CORBA::IDLType_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::LocalInterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTINTERFACEDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtInterfaceDef>
-  {
-    static CORBA::ExtInterfaceDef_ptr duplicate (
-        CORBA::ExtInterfaceDef_ptr
-      );
-    static void release (
-        CORBA::ExtInterfaceDef_ptr
-      );
-    static CORBA::ExtInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::ExtInterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTVALUEDEF__TRAITS_CH_)
-#define _CORBA_EXTVALUEDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtValueDef>
-  {
-    static CORBA::ExtValueDef_ptr duplicate (
-        CORBA::ExtValueDef_ptr
-      );
-    static void release (
-        CORBA::ExtValueDef_ptr
-      );
-    static CORBA::ExtValueDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::ExtValueDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAbstractInterfaceDef>
-  {
-    static CORBA::ExtAbstractInterfaceDef_ptr duplicate (
-        CORBA::ExtAbstractInterfaceDef_ptr
-      );
-    static void release (
-        CORBA::ExtAbstractInterfaceDef_ptr
-      );
-    static CORBA::ExtAbstractInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::ExtAbstractInterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtLocalInterfaceDef>
-  {
-    static CORBA::ExtLocalInterfaceDef_ptr duplicate (
-        CORBA::ExtLocalInterfaceDef_ptr
-      );
-    static void release (
-        CORBA::ExtLocalInterfaceDef_ptr
-      );
-    static CORBA::ExtLocalInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::ExtLocalInterfaceDef_ptr p,
+        ::CORBA::IDLType_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -3235,19 +2857,19 @@ namespace TAO
 
 #if !defined (_CORBA_TYPEDEFDEF__TRAITS_CH_)
 #define _CORBA_TYPEDEFDEF__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::TypedefDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::TypedefDef>
   {
-    static CORBA::TypedefDef_ptr duplicate (
-        CORBA::TypedefDef_ptr
+    static ::CORBA::TypedefDef_ptr duplicate (
+        ::CORBA::TypedefDef_ptr
       );
     static void release (
-        CORBA::TypedefDef_ptr
+        ::CORBA::TypedefDef_ptr
       );
-    static CORBA::TypedefDef_ptr nil (void);
+    static ::CORBA::TypedefDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::TypedefDef_ptr p,
+        ::CORBA::TypedefDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -3269,7 +2891,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr *); //
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr *); // non-copying
@@ -3291,49 +2913,49 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Contained::Description *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ModuleDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstantDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::EnumDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AliasDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr *); // non-copying
@@ -3348,21 +2970,21 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Int
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::NativeDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr *); // non-copying
@@ -3377,14 +2999,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueBoxDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr *); // non-copying
@@ -3399,7 +3021,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Abs
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AbstractInterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr *); // non-copying
@@ -3414,7 +3036,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Loc
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LocalInterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr *); // non-copying
@@ -3429,7 +3051,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr *); // non-copying
@@ -3444,7 +3066,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtValueDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr *); // non-copying
@@ -3459,7 +3081,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAbstractInterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr *); // non-copying
@@ -4097,13 +3719,13 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::T
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDescription &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IFR_BaseC.i"
+#include "IFR_BaseC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -4114,3 +3736,5 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.i b/TAO/tao/IFR_Client/IFR_BaseC.i
deleted file mode 100644
index c9810b999c0..00000000000
--- a/TAO/tao/IFR_Client/IFR_BaseC.i
+++ /dev/null
@@ -1,208 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_IROBJECT___CI_)
-#define _CORBA_IROBJECT___CI_
-
-ACE_INLINE
-CORBA::IRObject::IRObject (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_IRObject_Proxy_Broker_ (0)
-{
-  this->CORBA_IRObject_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::IRObject::IRObject (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_IRObject_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_CONTAINED___CI_)
-#define _CORBA_CONTAINED___CI_
-
-ACE_INLINE
-CORBA::Contained::Contained (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_Contained_Proxy_Broker_ (0)
-{
-  this->CORBA_Contained_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::Contained::Contained (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Contained_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_CONTAINER___CI_)
-#define _CORBA_CONTAINER___CI_
-
-ACE_INLINE
-CORBA::Container::Container (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_Container_Proxy_Broker_ (0)
-{
-  this->CORBA_Container_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::Container::Container (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Container_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_IDLTYPE___CI_)
-#define _CORBA_IDLTYPE___CI_
-
-ACE_INLINE
-CORBA::IDLType::IDLType (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_IDLType_Proxy_Broker_ (0)
-{
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::IDLType::IDLType (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_IDLType_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_TYPEDEFDEF___CI_)
-#define _CORBA_TYPEDEFDEF___CI_
-
-ACE_INLINE
-CORBA::TypedefDef::TypedefDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_TypedefDef_Proxy_Broker_ (0)
-{
-  this->CORBA_TypedefDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::TypedefDef::TypedefDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_TypedefDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h
index 2b97b5b099f..8d7651dd0fe 100644
--- a/TAO/tao/IFR_Client/IFR_BaseS.h
+++ b/TAO/tao/IFR_Client/IFR_BaseS.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:390
+// be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_ORIG_IFR_BASES_H_
-#define _TAO_IDL_ORIG_IFR_BASES_H_
+#ifndef _TAO_IDL_IFR_BASES_H_
+#define _TAO_IDL_IFR_BASES_H_
 
 #include /**/ "ace/pre.h"
 
@@ -44,9 +44,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,14 +53,14 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
   
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class IRObject;
   typedef IRObject *IRObject_ptr;
@@ -135,7 +133,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -152,7 +150,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -174,7 +172,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class TAO_IFR_Client_Export _TAO_IRObject_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -218,1997 +216,2019 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class TAO_IFR_Client_Export _TAO_IRObject_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_IRObject_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) {}
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class Contained;
-typedef Contained *Contained_ptr;
-
-class _TAO_Contained_ThruPOA_Proxy_Impl;
-class _TAO_Contained_Strategized_Proxy_Broker;
-
-class TAO_IFR_Client_Export Contained
-  : public virtual POA_CORBA::IRObject
-{
-protected:
-  Contained (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::Contained _stub_type;
-  typedef ::CORBA::Contained_ptr _stub_ptr_type;
-  typedef ::CORBA::Contained_var _stub_var_type;
-  
-  Contained (const Contained& rhs);
-  virtual ~Contained (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::Contained *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual char * id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_id_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual void id (
-      const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _set_id_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual char * name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_name_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual void name (
-      const char * name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _set_name_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual char * version (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_version_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual void version (
-      const char * version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _set_version_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Container_ptr defined_in (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_defined_in_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual char * absolute_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_absolute_name_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Repository_ptr containing_repository (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_containing_repository_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Contained::Description * describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void describe_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual void move (
-      CORBA::Container_ptr new_container,
-      const char * new_name,
-      const char * new_version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void move_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class TAO_IFR_Client_Export _TAO_Contained_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_Contained_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_Contained_Strategized_Proxy_Broker *
-  the_TAO_Contained_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class TAO_IFR_Client_Export _TAO_Contained_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_Contained_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void) {}
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_id (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _set_id (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_name (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _set_name (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_version (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _set_version (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  {
+  public:
+    _TAO_IRObject_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_defined_in (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_absolute_name (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_containing_repository (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class Contained;
+  typedef Contained *Contained_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  describe (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class _TAO_Contained_ThruPOA_Proxy_Impl;
+  class _TAO_Contained_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  move (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class TAO_IFR_Client_Export Contained
+    : public virtual POA_CORBA::IRObject
+  {
+  protected:
+    Contained (void);
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class Container;
-typedef Container *Container_ptr;
-
-class _TAO_Container_ThruPOA_Proxy_Impl;
-class _TAO_Container_Strategized_Proxy_Broker;
-
-class TAO_IFR_Client_Export Container
-  : public virtual POA_CORBA::IRObject
-{
-protected:
-  Container (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::Container _stub_type;
-  typedef ::CORBA::Container_ptr _stub_ptr_type;
-  typedef ::CORBA::Container_var _stub_var_type;
-  
-  Container (const Container& rhs);
-  virtual ~Container (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::Container *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::Contained _stub_type;
+    typedef ::CORBA::Contained_ptr _stub_ptr_type;
+    typedef ::CORBA::Contained_var _stub_var_type;
+    
+    Contained (const Contained& rhs);
+    virtual ~Contained (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::Contained *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual char * id (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_id_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual void id (
+        const char * id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _set_id_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual char * name (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_name_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual void name (
+        const char * name
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _set_name_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual char * version (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_version_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual void version (
+        const char * version
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _set_version_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Container_ptr defined_in (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_defined_in_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual char * absolute_name (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_absolute_name_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Repository_ptr containing_repository (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_containing_repository_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Contained::Description * describe (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void describe_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual void move (
+        ::CORBA::Container_ptr new_container,
+        const char * new_name,
+        const char * new_version
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void move_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Contained_ptr lookup (
-      const char * search_name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void lookup_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void contents_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void lookup_name_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class TAO_IFR_Client_Export _TAO_Contained_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_Contained_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_Contained_Strategized_Proxy_Broker *
+    the_TAO_Contained_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void describe_contents_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_module_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr type,
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_constant_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_struct_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_union_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class TAO_IFR_Client_Export _TAO_Contained_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_Contained_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_id (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _set_id (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_name (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _set_name (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_version (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _set_version (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_defined_in (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_absolute_name (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_containing_repository (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    describe (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    move (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::EnumMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_enum_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr original_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_alias_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_interface_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class Container;
+  typedef Container *Container_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA::ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_value_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class _TAO_Container_ThruPOA_Proxy_Impl;
+  class _TAO_Container_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_value_box_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class TAO_IFR_Client_Export Container
+    : public virtual POA_CORBA::IRObject
+  {
+  protected:
+    Container (void);
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_exception_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::Container _stub_type;
+    typedef ::CORBA::Container_ptr _stub_ptr_type;
+    typedef ::CORBA::Container_var _stub_var_type;
+    
+    Container (const Container& rhs);
+    virtual ~Container (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::Container *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Contained_ptr lookup (
+        const char * search_name
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void lookup_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ContainedSeq * contents (
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void contents_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ContainedSeq * lookup_name (
+        const char * search_name,
+        ::CORBA::Long levels_to_search,
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void lookup_name_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Container::DescriptionSeq * describe_contents (
+        ::CORBA::DefinitionKind limit_type,
+        ::CORBA::Boolean exclude_inherited,
+        ::CORBA::Long max_returned_objs
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void describe_contents_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ModuleDef_ptr create_module (
+        const char * id,
+        const char * name,
+        const char * version
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_module_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ConstantDef_ptr create_constant (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::IDLType_ptr type,
+        const ::CORBA::Any & value
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_constant_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::StructDef_ptr create_struct (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::StructMemberSeq & members
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_struct_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::UnionDef_ptr create_union (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::IDLType_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_union_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::EnumDef_ptr create_enum (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::EnumMemberSeq & members
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_enum_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::AliasDef_ptr create_alias (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::IDLType_ptr original_type
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_alias_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::InterfaceDef_ptr create_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::InterfaceDefSeq & base_interfaces
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_interface_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ValueDef_ptr create_value (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::InitializerSeq & initializers
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_value_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ValueBoxDef_ptr create_value_box (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::IDLType_ptr original_type_def
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_value_box_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ExceptionDef_ptr create_exception (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::StructMemberSeq & members
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_exception_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::NativeDef_ptr create_native (
+        const char * id,
+        const char * name,
+        const char * version
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_native_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_abstract_interface_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const ::CORBA::InterfaceDefSeq & base_interfaces
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_local_interface_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::ExtValueDef_ptr create_ext_value (
+        const char * id,
+        const char * name,
+        const char * version,
+        ::CORBA::Boolean is_custom,
+        ::CORBA::Boolean is_abstract,
+        ::CORBA::ValueDef_ptr base_value,
+        ::CORBA::Boolean is_truncatable,
+        const ::CORBA::ValueDefSeq & abstract_base_values,
+        const ::CORBA::InterfaceDefSeq & supported_interfaces,
+        const ::CORBA::ExtInitializerSeq & initializers
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void create_ext_value_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_native_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_abstract_interface_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_local_interface_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
+  class TAO_IFR_Client_Export _TAO_Container_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_Container_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_Container_Strategized_Proxy_Broker *
+    the_TAO_Container_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual ::CORBA::ExtValueDef_ptr create_ext_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA::ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::ExtInitializerSeq & initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void create_ext_value_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class TAO_IFR_Client_Export _TAO_Container_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_Container_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_Container_Strategized_Proxy_Broker *
-  the_TAO_Container_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class TAO_IFR_Client_Export _TAO_Container_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_Container_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) {}
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  lookup (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  contents (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class TAO_IFR_Client_Export _TAO_Container_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_Container_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    lookup (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    contents (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    lookup_name (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    describe_contents (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_module (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_constant (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_struct (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_union (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_enum (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_alias (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_interface (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_value (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_value_box (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_exception (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_native (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_abstract_interface (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_local_interface (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    create_ext_value (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  lookup_name (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  describe_contents (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_module (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class IDLType;
+  typedef IDLType *IDLType_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_constant (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class _TAO_IDLType_ThruPOA_Proxy_Impl;
+  class _TAO_IDLType_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_struct (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class TAO_IFR_Client_Export IDLType
+    : public virtual POA_CORBA::IRObject
+  {
+  protected:
+    IDLType (void);
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_union (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::IDLType _stub_type;
+    typedef ::CORBA::IDLType_ptr _stub_ptr_type;
+    typedef ::CORBA::IDLType_var _stub_var_type;
+    
+    IDLType (const IDLType& rhs);
+    virtual ~IDLType (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::IDLType *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual CORBA::TypeCode_ptr type (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    static void _get_type_skel (
+        TAO_ServerRequest &_tao_req,
+        void *_tao_servant,
+        void *_tao_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_enum (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_alias (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_interface (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class TAO_IFR_Client_Export _TAO_IDLType_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_IDLType_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_IDLType_Strategized_Proxy_Broker *
+    the_TAO_IDLType_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_value (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_value_box (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_exception (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_native (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_abstract_interface (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class TAO_IFR_Client_Export _TAO_IDLType_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_IDLType_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void) {}
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
+    static void
+    _get_type (
+        TAO_Abstract_ServantBase *servant,
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_local_interface (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  create_ext_value (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class IDLType;
-typedef IDLType *IDLType_ptr;
-
-class _TAO_IDLType_ThruPOA_Proxy_Impl;
-class _TAO_IDLType_Strategized_Proxy_Broker;
-
-class TAO_IFR_Client_Export IDLType
-  : public virtual POA_CORBA::IRObject
-{
-protected:
-  IDLType (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::IDLType _stub_type;
-  typedef ::CORBA::IDLType_ptr _stub_ptr_type;
-  typedef ::CORBA::IDLType_var _stub_var_type;
-  
-  IDLType (const IDLType& rhs);
-  virtual ~IDLType (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::IDLType *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;
+  class TypedefDef;
+  typedef TypedefDef *TypedefDef_ptr;
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_sh.cpp:45
-  
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-  
-  static void _get_type_skel (
-      TAO_ServerRequest &_tao_req,
-      void *_tao_servant,
-      void *_tao_servant_upcall
-      ACE_ENV_ARG_DECL
-    );static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
+  class _TAO_TypedefDef_Strategized_Proxy_Broker;
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class TAO_IFR_Client_Export _TAO_IDLType_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_IDLType_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_IDLType_Strategized_Proxy_Broker *
-  the_TAO_IDLType_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class TAO_IFR_Client_Export _TAO_IDLType_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_IDLType_ThruPOA_Proxy_Impl (void);
+  class TAO_IFR_Client_Export TypedefDef
+    : public virtual POA_CORBA::Contained,
+      public virtual POA_CORBA::IDLType
+  {
+  protected:
+    TypedefDef (void);
   
-  virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void) {}
+  public:
+    // Useful for template programming.
+    typedef ::CORBA::TypedefDef _stub_type;
+    typedef ::CORBA::TypedefDef_ptr _stub_ptr_type;
+    typedef ::CORBA::TypedefDef_var _stub_var_type;
+    
+    TypedefDef (const TypedefDef& rhs);
+    virtual ~TypedefDef (void);
+    
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+    
+    static void _is_a_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _non_existent_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _interface_skel (
+        TAO_ServerRequest &req,
+        void *servant,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    static void _component_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    virtual void _dispatch (
+        TAO_ServerRequest &req,
+        void *_servant_upcall
+        ACE_ENV_ARG_DECL
+      );
+    
+    ::CORBA::TypedefDef *_this (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    
+    static void
+    _get_def_kind_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    destroy_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_id_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _set_version_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_defined_in_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_absolute_name_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_containing_repository_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    describe_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2026
+    
+    static void
+    move_skel (
+        TAO_ServerRequest &req, 
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static void
+    _get_type_skel (
+        TAO_ServerRequest &req,
+        void *obj,
+        void *context
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/proxy_impl_xh.cpp:24
-  
-  static void
-  _get_type (
-      TAO_Abstract_ServantBase *servant,
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //               Strategized Proxy Broker Declaration 
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_sh.cpp:90
-
-class TypedefDef;
-typedef TypedefDef *TypedefDef_ptr;
-
-class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
-class _TAO_TypedefDef_Strategized_Proxy_Broker;
-
-class TAO_IFR_Client_Export TypedefDef
-  : public virtual POA_CORBA::Contained,
-    public virtual POA_CORBA::IDLType
-{
-protected:
-  TypedefDef (void);
-
-public:
-  // Useful for template programming.
-  typedef ::CORBA::TypedefDef _stub_type;
-  typedef ::CORBA::TypedefDef_ptr _stub_ptr_type;
-  typedef ::CORBA::TypedefDef_var _stub_var_type;
-  
-  TypedefDef (const TypedefDef& rhs);
-  virtual ~TypedefDef (void);
-  
-  virtual CORBA::Boolean _is_a (
-      const char* logical_type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual void* _downcast (
-      const char* logical_type_id
-    );
-  
-  static void _is_a_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _non_existent_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _interface_skel (
-      TAO_ServerRequest &req,
-      void *servant,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  static void _component_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  virtual void _dispatch (
-      TAO_ServerRequest &req,
-      void *_servant_upcall
-      ACE_ENV_ARG_DECL
-    );
-  
-  ::CORBA::TypedefDef *_this (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  virtual const char* _interface_repository_id (void) const;static void
-  _get_def_kind_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  destroy_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_id_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-  
-  static void
-  _set_version_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_defined_in_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_absolute_name_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_containing_repository_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  class TAO_IFR_Client_Export _TAO_TypedefDef_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
+  {
+  public: 
+    _TAO_TypedefDef_Strategized_Proxy_Broker (void);
+    
+    virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
+    
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    dispatch (
+        CORBA::Object_ptr obj,
+        CORBA::Object_out forward_obj,
+        TAO::Argument ** args,
+        int num_args,
+        const char * op,
+        size_t op_len,
+        TAO::Collocation_Strategy strategy
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::Exception));
+    
+    static _TAO_TypedefDef_Strategized_Proxy_Broker *
+    the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
+  //
+  //            End Strategized Proxy Broker Declaration 
+  ///////////////////////////////////////////////////////////////////////
   
-  static void
-  describe_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:1951
-  
-  static void
-  move_skel (
-      TAO_ServerRequest &req, 
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );static void
-  _get_type_skel (
-      TAO_ServerRequest &req,
-      void *obj,
-      void *context
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
-class TAO_IFR_Client_Export _TAO_TypedefDef_Strategized_Proxy_Broker
-  : public virtual TAO::Collocation_Proxy_Broker
-{
-public: 
-  _TAO_TypedefDef_Strategized_Proxy_Broker (void);
-  
-  virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
-  
-  TAO::Collocation_Strategy
-  get_strategy (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  void
-  dispatch (
-      CORBA::Object_ptr obj,
-      CORBA::Object_out forward_obj,
-      TAO::Argument ** args,
-      int num_args,
-      const char * op,
-      size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception));
-  
-  static _TAO_TypedefDef_Strategized_Proxy_Broker *
-  the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
-};
-
-//
-//            End Strategized Proxy Broker Declaration 
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-//                    ThruPOA Proxy Impl. Declaration
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
-class TAO_IFR_Client_Export _TAO_TypedefDef_ThruPOA_Proxy_Impl
-  : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl,
-    public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
-{
-public:
-  _TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
-  
-  virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void) {}static void
-  _get_def_kind (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  ///////////////////////////////////////////////////////////////////////
+  //                    ThruPOA Proxy Impl. Declaration
+  //
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  destroy (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_id (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-  
-  static void
-  _set_version (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_defined_in (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_absolute_name (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_containing_repository (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  describe (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+  class TAO_IFR_Client_Export _TAO_TypedefDef_ThruPOA_Proxy_Impl
+    : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl,
+      public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  {
+  public:
+    _TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
+    
+    virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void) {}static void
+    _get_def_kind (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    destroy (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_id (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    static void
+    _set_version (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_defined_in (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_absolute_name (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_containing_repository (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    describe (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // be\be_interface.cpp:2214
+    
+    static void
+    move (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));static void
+    _get_type (
+        TAO_Abstract_ServantBase *servant, 
+        TAO::Argument ** args,
+        int num_args
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+  };
   
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:2132
-  
-  static void
-  move (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));static void
-  _get_type (
-      TAO_Abstract_ServantBase *servant, 
-      TAO::Argument ** args,
-      int num_args
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-//
-//                ThruPOA  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
+  //
+  //                ThruPOA  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:946
+// be\be_codegen.cpp:997
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -2218,3 +2238,4 @@ public:
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index d380457b53f..4f15d777b8f 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -55,6 +55,7 @@
 #define _IFR_BASIC_IDL_
 
 #include "IFR_Base.pidl"
+#include "ParameterMode.pidl"
 
 module CORBA
 {
@@ -203,14 +204,14 @@ module CORBA
     attribute IDLType element_type_def;
   };
 
-  interface ArrayDef : IDLType 
+  interface ArrayDef : IDLType
   {
   attribute unsigned long length;
   readonly attribute TypeCode element_type;
   attribute IDLType element_type_def;
   };
 
-  interface ExceptionDef : Contained, Container 
+  interface ExceptionDef : Contained, Container
   {
     readonly attribute TypeCode type;
     attribute StructMemberSeq members;
@@ -218,20 +219,20 @@ module CORBA
 
   typedef sequence <ExceptionDef> ExceptionDefSeq;
 
-  enum AttributeMode 
+  enum AttributeMode
   {
-    ATTR_NORMAL, 
+    ATTR_NORMAL,
     ATTR_READONLY
   };
 
-  interface AttributeDef : Contained 
+  interface AttributeDef : Contained
   {
     readonly attribute TypeCode type;
     attribute IDLType type_def;
     attribute AttributeMode mode;
   };
 
-  struct AttributeDescription 
+  struct AttributeDescription
   {
     Identifier name;
     RepositoryId id;
@@ -241,7 +242,7 @@ module CORBA
     AttributeMode mode;
   };
 
-  struct ExtAttributeDescription 
+  struct ExtAttributeDescription
   {
     Identifier name;
     RepositoryId id;
@@ -253,7 +254,7 @@ module CORBA
     ExcDescriptionSeq put_exceptions;
   };
 
-  interface ExtAttributeDef : AttributeDef 
+  interface ExtAttributeDef : AttributeDef
   {
     // read/write interface
     attribute ExcDescriptionSeq get_exceptions;
@@ -262,22 +263,22 @@ module CORBA
     ExtAttributeDescription describe_attribute ();
   };
 
-  enum OperationMode 
+  enum OperationMode
   {
-    OP_NORMAL, 
+    OP_NORMAL,
     OP_ONEWAY
   };
 
 // Already defined in corbafwd.h, included from orb.idl
 /*
-  enum ParameterMode 
+  enum ParameterMode
   {
-    PARAM_IN, 
-    PARAM_OUT, 
+    PARAM_IN,
+    PARAM_OUT,
     PARAM_INOUT
   };
 */
-  struct ParameterDescription 
+  struct ParameterDescription
   {
     Identifier name;
     TypeCode type;
@@ -289,7 +290,7 @@ module CORBA
   typedef Identifier ContextIdentifier;
   typedef sequence <ContextIdentifier> ContextIdSeq;
 
-  interface OperationDef : Contained 
+  interface OperationDef : Contained
   {
     readonly attribute TypeCode result;
     attribute IDLType result_def;
@@ -299,7 +300,7 @@ module CORBA
     attribute ExceptionDefSeq exceptions;
   };
 
-  struct OperationDescription 
+  struct OperationDescription
   {
     Identifier name;
     RepositoryId id;
@@ -317,9 +318,9 @@ module CORBA
   typedef sequence <AttributeDescription> AttrDescriptionSeq;
   typedef sequence <ExtAttributeDescription> ExtAttrDescriptionSeq;
 
-  interface InterfaceDef : Container, 
-			   Contained, 
-			   IDLType 
+  interface InterfaceDef : Container,
+			   Contained,
+			   IDLType
   {
     // read/write interface
     attribute InterfaceDefSeq base_interfaces;
@@ -328,7 +329,7 @@ module CORBA
         in RepositoryId interface_id
       );
 
-    struct FullInterfaceDescription 
+    struct FullInterfaceDescription
     {
       Identifier name;
       RepositoryId id;
@@ -362,7 +363,7 @@ module CORBA
       );
   };
 
-  struct InterfaceDescription 
+  struct InterfaceDescription
   {
     Identifier name;
     RepositoryId id;
@@ -371,10 +372,10 @@ module CORBA
     RepositoryIdSeq base_interfaces;
   };
 
-  interface InterfaceAttrExtension 
+  interface InterfaceAttrExtension
   {
     // read interface
-    struct ExtFullInterfaceDescription 
+    struct ExtFullInterfaceDescription
     {
       Identifier name;
       RepositoryId id;
@@ -401,25 +402,25 @@ module CORBA
   };
 
   interface ExtInterfaceDef : InterfaceDef,
-			      InterfaceAttrExtension 
+			      InterfaceAttrExtension
   {
   };
 
-  interface AbstractInterfaceDef : InterfaceDef 
+  interface AbstractInterfaceDef : InterfaceDef
   {
   };
 
   interface ExtAbstractInterfaceDef : AbstractInterfaceDef,
-				      InterfaceAttrExtension 
+				      InterfaceAttrExtension
   {
   };
 
-  interface LocalInterfaceDef : InterfaceDef 
+  interface LocalInterfaceDef : InterfaceDef
   {
   };
 
   interface ExtLocalInterfaceDef : LocalInterfaceDef,
-				   InterfaceAttrExtension 
+				   InterfaceAttrExtension
   {
   };
 };
diff --git a/TAO/tao/IFR_Client/IFR_BasicA.cpp b/TAO/tao/IFR_Client/IFR_BasicA.cpp
index 6228edeeec2..b9fa3ec85ca 100644
--- a/TAO/tao/IFR_Client/IFR_BasicA.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicA.cpp
@@ -27,118 +27,120 @@
 
 #include "IFR_BasicC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_PrimitiveKind[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5072),
-  ACE_NTOHL (0x696d6974),
-  ACE_NTOHL (0x6976654b),
-  ACE_NTOHL (0x696e643a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5072), 
+  ACE_NTOHL (0x696d6974), 
+  ACE_NTOHL (0x6976654b), 
+  ACE_NTOHL (0x696e643a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PrimitiveKind:1.0
   14,
-  ACE_NTOHL (0x5072696d),
-  ACE_NTOHL (0x69746976),
-  ACE_NTOHL (0x654b696e),
+  ACE_NTOHL (0x5072696d), 
+  ACE_NTOHL (0x69746976), 
+  ACE_NTOHL (0x654b696e), 
   ACE_NTOHL (0x64000000),  // name = PrimitiveKind
   22, // member count
   8,
-  ACE_NTOHL (0x706b5f6e),
+  ACE_NTOHL (0x706b5f6e), 
   ACE_NTOHL (0x756c6c00),  // name = pk_null
   8,
-  ACE_NTOHL (0x706b5f76),
+  ACE_NTOHL (0x706b5f76), 
   ACE_NTOHL (0x6f696400),  // name = pk_void
   9,
-  ACE_NTOHL (0x706b5f73),
-  ACE_NTOHL (0x686f7274),
+  ACE_NTOHL (0x706b5f73), 
+  ACE_NTOHL (0x686f7274), 
   ACE_NTOHL (0x0),  // name = pk_short
   8,
-  ACE_NTOHL (0x706b5f6c),
+  ACE_NTOHL (0x706b5f6c), 
   ACE_NTOHL (0x6f6e6700),  // name = pk_long
   10,
-  ACE_NTOHL (0x706b5f75),
-  ACE_NTOHL (0x73686f72),
+  ACE_NTOHL (0x706b5f75), 
+  ACE_NTOHL (0x73686f72), 
   ACE_NTOHL (0x74000000),  // name = pk_ushort
   9,
-  ACE_NTOHL (0x706b5f75),
-  ACE_NTOHL (0x6c6f6e67),
+  ACE_NTOHL (0x706b5f75), 
+  ACE_NTOHL (0x6c6f6e67), 
   ACE_NTOHL (0x0),  // name = pk_ulong
   9,
-  ACE_NTOHL (0x706b5f66),
-  ACE_NTOHL (0x6c6f6174),
+  ACE_NTOHL (0x706b5f66), 
+  ACE_NTOHL (0x6c6f6174), 
   ACE_NTOHL (0x0),  // name = pk_float
   10,
-  ACE_NTOHL (0x706b5f64),
-  ACE_NTOHL (0x6f75626c),
+  ACE_NTOHL (0x706b5f64), 
+  ACE_NTOHL (0x6f75626c), 
   ACE_NTOHL (0x65000000),  // name = pk_double
   11,
-  ACE_NTOHL (0x706b5f62),
-  ACE_NTOHL (0x6f6f6c65),
+  ACE_NTOHL (0x706b5f62), 
+  ACE_NTOHL (0x6f6f6c65), 
   ACE_NTOHL (0x616e0000),  // name = pk_boolean
   8,
-  ACE_NTOHL (0x706b5f63),
+  ACE_NTOHL (0x706b5f63), 
   ACE_NTOHL (0x68617200),  // name = pk_char
   9,
-  ACE_NTOHL (0x706b5f6f),
-  ACE_NTOHL (0x63746574),
+  ACE_NTOHL (0x706b5f6f), 
+  ACE_NTOHL (0x63746574), 
   ACE_NTOHL (0x0),  // name = pk_octet
   7,
-  ACE_NTOHL (0x706b5f61),
+  ACE_NTOHL (0x706b5f61), 
   ACE_NTOHL (0x6e790000),  // name = pk_any
   12,
-  ACE_NTOHL (0x706b5f54),
-  ACE_NTOHL (0x79706543),
+  ACE_NTOHL (0x706b5f54), 
+  ACE_NTOHL (0x79706543), 
   ACE_NTOHL (0x6f646500),  // name = pk_TypeCode
   13,
-  ACE_NTOHL (0x706b5f50),
-  ACE_NTOHL (0x72696e63),
-  ACE_NTOHL (0x6970616c),
+  ACE_NTOHL (0x706b5f50), 
+  ACE_NTOHL (0x72696e63), 
+  ACE_NTOHL (0x6970616c), 
   ACE_NTOHL (0x0),  // name = pk_Principal
   10,
-  ACE_NTOHL (0x706b5f73),
-  ACE_NTOHL (0x7472696e),
+  ACE_NTOHL (0x706b5f73), 
+  ACE_NTOHL (0x7472696e), 
   ACE_NTOHL (0x67000000),  // name = pk_string
   10,
-  ACE_NTOHL (0x706b5f6f),
-  ACE_NTOHL (0x626a7265),
+  ACE_NTOHL (0x706b5f6f), 
+  ACE_NTOHL (0x626a7265), 
   ACE_NTOHL (0x66000000),  // name = pk_objref
   12,
-  ACE_NTOHL (0x706b5f6c),
-  ACE_NTOHL (0x6f6e676c),
+  ACE_NTOHL (0x706b5f6c), 
+  ACE_NTOHL (0x6f6e676c), 
   ACE_NTOHL (0x6f6e6700),  // name = pk_longlong
   13,
-  ACE_NTOHL (0x706b5f75),
-  ACE_NTOHL (0x6c6f6e67),
-  ACE_NTOHL (0x6c6f6e67),
+  ACE_NTOHL (0x706b5f75), 
+  ACE_NTOHL (0x6c6f6e67), 
+  ACE_NTOHL (0x6c6f6e67), 
   ACE_NTOHL (0x0),  // name = pk_ulonglong
   14,
-  ACE_NTOHL (0x706b5f6c),
-  ACE_NTOHL (0x6f6e6764),
-  ACE_NTOHL (0x6f75626c),
+  ACE_NTOHL (0x706b5f6c), 
+  ACE_NTOHL (0x6f6e6764), 
+  ACE_NTOHL (0x6f75626c), 
   ACE_NTOHL (0x65000000),  // name = pk_longdouble
   9,
-  ACE_NTOHL (0x706b5f77),
-  ACE_NTOHL (0x63686172),
+  ACE_NTOHL (0x706b5f77), 
+  ACE_NTOHL (0x63686172), 
   ACE_NTOHL (0x0),  // name = pk_wchar
   11,
-  ACE_NTOHL (0x706b5f77),
-  ACE_NTOHL (0x73747269),
+  ACE_NTOHL (0x706b5f77), 
+  ACE_NTOHL (0x73747269), 
   ACE_NTOHL (0x6e670000),  // name = pk_wstring
   14,
-  ACE_NTOHL (0x706b5f76),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x5f626173),
+  ACE_NTOHL (0x706b5f76), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x5f626173), 
   ACE_NTOHL (0x65000000),  // name = pk_value_base
   };
 
@@ -147,7 +149,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveKind (
     sizeof (_oc_CORBA_PrimitiveKind),
     (char *) &_oc_CORBA_PrimitiveKind,
     0,
-    sizeof (CORBA::PrimitiveKind)
+    0
   );
 
 namespace CORBA
@@ -157,24 +159,24 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Repository[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Repository:1.0
     11,
-  ACE_NTOHL (0x5265706f),
-  ACE_NTOHL (0x7369746f),
+  ACE_NTOHL (0x5265706f), 
+  ACE_NTOHL (0x7369746f), 
   ACE_NTOHL (0x72790000),  // name = Repository
   };
 
@@ -183,7 +185,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Repository (
     sizeof (_oc_CORBA_Repository),
     (char *) &_oc_CORBA_Repository,
     0,
-    sizeof (CORBA::Repository)
+    0
   );
 
 namespace CORBA
@@ -193,23 +195,23 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ModuleDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4d6f),
-  ACE_NTOHL (0x64756c65),
-  ACE_NTOHL (0x4465663a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4d6f), 
+  ACE_NTOHL (0x64756c65), 
+  ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDef:1.0
     10,
-  ACE_NTOHL (0x4d6f6475),
-  ACE_NTOHL (0x6c654465),
+  ACE_NTOHL (0x4d6f6475), 
+  ACE_NTOHL (0x6c654465), 
   ACE_NTOHL (0x66000000),  // name = ModuleDef
   };
 
@@ -218,7 +220,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ModuleDef (
     sizeof (_oc_CORBA_ModuleDef),
     (char *) &_oc_CORBA_ModuleDef,
     0,
-    sizeof (CORBA::ModuleDef)
+    0
   );
 
 namespace CORBA
@@ -228,50 +230,50 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ModuleDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4d6f),
-  ACE_NTOHL (0x64756c65),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4d6f), 
+  ACE_NTOHL (0x64756c65), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDescription:1.0
     18,
-  ACE_NTOHL (0x4d6f6475),
-  ACE_NTOHL (0x6c654465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x4d6f6475), 
+  ACE_NTOHL (0x6c654465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e000000),  // name = ModuleDescription
   4, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -280,69 +282,69 @@ static const CORBA::Long _oc_CORBA_ModuleDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -352,7 +354,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ModuleDescription (
     sizeof (_oc_CORBA_ModuleDescription),
     (char *) &_oc_CORBA_ModuleDescription,
     0,
-    sizeof (CORBA::ModuleDescription)
+    0
   );
 
 namespace CORBA
@@ -362,24 +364,24 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ConstantDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e737461),
-  ACE_NTOHL (0x6e744465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e737461), 
+  ACE_NTOHL (0x6e744465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDef:1.0
     12,
-  ACE_NTOHL (0x436f6e73),
-  ACE_NTOHL (0x74616e74),
+  ACE_NTOHL (0x436f6e73), 
+  ACE_NTOHL (0x74616e74), 
   ACE_NTOHL (0x44656600),  // name = ConstantDef
   };
 
@@ -388,7 +390,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstantDef (
     sizeof (_oc_CORBA_ConstantDef),
     (char *) &_oc_CORBA_ConstantDef,
     0,
-    sizeof (CORBA::ConstantDef)
+    0
   );
 
 namespace CORBA
@@ -398,51 +400,51 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ConstantDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e737461),
-  ACE_NTOHL (0x6e744465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e737461), 
+  ACE_NTOHL (0x6e744465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDescription:1.0
     20,
-  ACE_NTOHL (0x436f6e73),
-  ACE_NTOHL (0x74616e74),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x436f6e73), 
+  ACE_NTOHL (0x74616e74), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = ConstantDescription
   6, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -451,78 +453,78 @@ static const CORBA::Long _oc_CORBA_ConstantDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   6,
-  ACE_NTOHL (0x76616c75),
+  ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
     CORBA::tk_any,
 
@@ -533,7 +535,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstantDescription (
     sizeof (_oc_CORBA_ConstantDescription),
     (char *) &_oc_CORBA_ConstantDescription,
     0,
-    sizeof (CORBA::ConstantDescription)
+    0
   );
 
 namespace CORBA
@@ -543,23 +545,23 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_StructDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5374),
-  ACE_NTOHL (0x72756374),
-  ACE_NTOHL (0x4465663a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5374), 
+  ACE_NTOHL (0x72756374), 
+  ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StructDef:1.0
     10,
-  ACE_NTOHL (0x53747275),
-  ACE_NTOHL (0x63744465),
+  ACE_NTOHL (0x53747275), 
+  ACE_NTOHL (0x63744465), 
   ACE_NTOHL (0x66000000),  // name = StructDef
   };
 
@@ -568,7 +570,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_StructDef (
     sizeof (_oc_CORBA_StructDef),
     (char *) &_oc_CORBA_StructDef,
     0,
-    sizeof (CORBA::StructDef)
+    0
   );
 
 namespace CORBA
@@ -578,23 +580,23 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_UnionDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f556e),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f556e), 
+  ACE_NTOHL (0x696f6e44), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/UnionDef:1.0
     9,
-  ACE_NTOHL (0x556e696f),
-  ACE_NTOHL (0x6e446566),
+  ACE_NTOHL (0x556e696f), 
+  ACE_NTOHL (0x6e446566), 
   ACE_NTOHL (0x0),  // name = UnionDef
   };
 
@@ -603,7 +605,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionDef (
     sizeof (_oc_CORBA_UnionDef),
     (char *) &_oc_CORBA_UnionDef,
     0,
-    sizeof (CORBA::UnionDef)
+    0
   );
 
 namespace CORBA
@@ -613,22 +615,22 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_EnumDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f456e),
-  ACE_NTOHL (0x756d4465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f456e), 
+  ACE_NTOHL (0x756d4465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/EnumDef:1.0
     8,
-  ACE_NTOHL (0x456e756d),
+  ACE_NTOHL (0x456e756d), 
   ACE_NTOHL (0x44656600),  // name = EnumDef
   };
 
@@ -637,7 +639,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumDef (
     sizeof (_oc_CORBA_EnumDef),
     (char *) &_oc_CORBA_EnumDef,
     0,
-    sizeof (CORBA::EnumDef)
+    0
   );
 
 namespace CORBA
@@ -647,23 +649,23 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_AliasDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f416c),
-  ACE_NTOHL (0x69617344),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f416c), 
+  ACE_NTOHL (0x69617344), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AliasDef:1.0
     9,
-  ACE_NTOHL (0x416c6961),
-  ACE_NTOHL (0x73446566),
+  ACE_NTOHL (0x416c6961), 
+  ACE_NTOHL (0x73446566), 
   ACE_NTOHL (0x0),  // name = AliasDef
   };
 
@@ -672,7 +674,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_AliasDef (
     sizeof (_oc_CORBA_AliasDef),
     (char *) &_oc_CORBA_AliasDef,
     0,
-    sizeof (CORBA::AliasDef)
+    0
   );
 
 namespace CORBA
@@ -682,23 +684,23 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_NativeDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4e61),
-  ACE_NTOHL (0x74697665),
-  ACE_NTOHL (0x4465663a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4e61), 
+  ACE_NTOHL (0x74697665), 
+  ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/NativeDef:1.0
     10,
-  ACE_NTOHL (0x4e617469),
-  ACE_NTOHL (0x76654465),
+  ACE_NTOHL (0x4e617469), 
+  ACE_NTOHL (0x76654465), 
   ACE_NTOHL (0x66000000),  // name = NativeDef
   };
 
@@ -707,7 +709,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_NativeDef (
     sizeof (_oc_CORBA_NativeDef),
     (char *) &_oc_CORBA_NativeDef,
     0,
-    sizeof (CORBA::NativeDef)
+    0
   );
 
 namespace CORBA
@@ -717,25 +719,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_PrimitiveDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5072),
-  ACE_NTOHL (0x696d6974),
-  ACE_NTOHL (0x69766544),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5072), 
+  ACE_NTOHL (0x696d6974), 
+  ACE_NTOHL (0x69766544), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/PrimitiveDef:1.0
     13,
-  ACE_NTOHL (0x5072696d),
-  ACE_NTOHL (0x69746976),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x5072696d), 
+  ACE_NTOHL (0x69746976), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = PrimitiveDef
   };
 
@@ -744,7 +746,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveDef (
     sizeof (_oc_CORBA_PrimitiveDef),
     (char *) &_oc_CORBA_PrimitiveDef,
     0,
-    sizeof (CORBA::PrimitiveDef)
+    0
   );
 
 namespace CORBA
@@ -754,23 +756,23 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_StringDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5374),
-  ACE_NTOHL (0x72696e67),
-  ACE_NTOHL (0x4465663a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5374), 
+  ACE_NTOHL (0x72696e67), 
+  ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringDef:1.0
     10,
-  ACE_NTOHL (0x53747269),
-  ACE_NTOHL (0x6e674465),
+  ACE_NTOHL (0x53747269), 
+  ACE_NTOHL (0x6e674465), 
   ACE_NTOHL (0x66000000),  // name = StringDef
   };
 
@@ -779,7 +781,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_StringDef (
     sizeof (_oc_CORBA_StringDef),
     (char *) &_oc_CORBA_StringDef,
     0,
-    sizeof (CORBA::StringDef)
+    0
   );
 
 namespace CORBA
@@ -789,24 +791,24 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_WstringDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5773),
-  ACE_NTOHL (0x7472696e),
-  ACE_NTOHL (0x67446566),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5773), 
+  ACE_NTOHL (0x7472696e), 
+  ACE_NTOHL (0x67446566), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WstringDef:1.0
     11,
-  ACE_NTOHL (0x57737472),
-  ACE_NTOHL (0x696e6744),
+  ACE_NTOHL (0x57737472), 
+  ACE_NTOHL (0x696e6744), 
   ACE_NTOHL (0x65660000),  // name = WstringDef
   };
 
@@ -815,7 +817,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WstringDef (
     sizeof (_oc_CORBA_WstringDef),
     (char *) &_oc_CORBA_WstringDef,
     0,
-    sizeof (CORBA::WstringDef)
+    0
   );
 
 namespace CORBA
@@ -825,24 +827,24 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_SequenceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x7175656e),
-  ACE_NTOHL (0x63654465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x7175656e), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SequenceDef:1.0
     12,
-  ACE_NTOHL (0x53657175),
-  ACE_NTOHL (0x656e6365),
+  ACE_NTOHL (0x53657175), 
+  ACE_NTOHL (0x656e6365), 
   ACE_NTOHL (0x44656600),  // name = SequenceDef
   };
 
@@ -851,7 +853,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_SequenceDef (
     sizeof (_oc_CORBA_SequenceDef),
     (char *) &_oc_CORBA_SequenceDef,
     0,
-    sizeof (CORBA::SequenceDef)
+    0
   );
 
 namespace CORBA
@@ -861,23 +863,23 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ArrayDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4172),
-  ACE_NTOHL (0x72617944),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4172), 
+  ACE_NTOHL (0x72617944), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ArrayDef:1.0
     9,
-  ACE_NTOHL (0x41727261),
-  ACE_NTOHL (0x79446566),
+  ACE_NTOHL (0x41727261), 
+  ACE_NTOHL (0x79446566), 
   ACE_NTOHL (0x0),  // name = ArrayDef
   };
 
@@ -886,7 +888,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ArrayDef (
     sizeof (_oc_CORBA_ArrayDef),
     (char *) &_oc_CORBA_ArrayDef,
     0,
-    sizeof (CORBA::ArrayDef)
+    0
   );
 
 namespace CORBA
@@ -896,25 +898,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExceptionDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x696f6e44), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
     13,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e446566),
+  ACE_NTOHL (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e446566), 
   ACE_NTOHL (0x0),  // name = ExceptionDef
   };
 
@@ -923,7 +925,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDef (
     sizeof (_oc_CORBA_ExceptionDef),
     (char *) &_oc_CORBA_ExceptionDef,
     0,
-    sizeof (CORBA::ExceptionDef)
+    0
   );
 
 namespace CORBA
@@ -933,26 +935,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65665365),
-  ACE_NTOHL (0x713a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x696f6e44), 
+  ACE_NTOHL (0x65665365), 
+  ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExceptionDefSeq:1.0
     16,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e446566),
+  ACE_NTOHL (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e446566), 
   ACE_NTOHL (0x53657100),  // name = ExceptionDefSeq
     CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
@@ -961,21 +963,21 @@ static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
     64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x63657074),
-      ACE_NTOHL (0x696f6e44),
-      ACE_NTOHL (0x65663a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x63657074), 
+      ACE_NTOHL (0x696f6e44), 
+      ACE_NTOHL (0x65663a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
             13,
-      ACE_NTOHL (0x45786365),
-      ACE_NTOHL (0x7074696f),
-      ACE_NTOHL (0x6e446566),
+      ACE_NTOHL (0x45786365), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e446566), 
       ACE_NTOHL (0x0),  // name = ExceptionDef
-
+      
     0U,
 
 };
@@ -985,7 +987,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDefSeq (
     sizeof (_oc_CORBA_ExceptionDefSeq),
     (char *) &_oc_CORBA_ExceptionDefSeq,
     0,
-    sizeof (CORBA::ExceptionDefSeq)
+    0
   );
 
 namespace CORBA
@@ -995,35 +997,35 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_AttributeMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4174),
-  ACE_NTOHL (0x74726962),
-  ACE_NTOHL (0x7574654d),
-  ACE_NTOHL (0x6f64653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4174), 
+  ACE_NTOHL (0x74726962), 
+  ACE_NTOHL (0x7574654d), 
+  ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
   14,
-  ACE_NTOHL (0x41747472),
-  ACE_NTOHL (0x69627574),
-  ACE_NTOHL (0x654d6f64),
+  ACE_NTOHL (0x41747472), 
+  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x654d6f64), 
   ACE_NTOHL (0x65000000),  // name = AttributeMode
   2, // member count
   12,
-  ACE_NTOHL (0x41545452),
-  ACE_NTOHL (0x5f4e4f52),
+  ACE_NTOHL (0x41545452), 
+  ACE_NTOHL (0x5f4e4f52), 
   ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
   14,
-  ACE_NTOHL (0x41545452),
-  ACE_NTOHL (0x5f524541),
-  ACE_NTOHL (0x444f4e4c),
+  ACE_NTOHL (0x41545452), 
+  ACE_NTOHL (0x5f524541), 
+  ACE_NTOHL (0x444f4e4c), 
   ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
   };
 
@@ -1032,7 +1034,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeMode (
     sizeof (_oc_CORBA_AttributeMode),
     (char *) &_oc_CORBA_AttributeMode,
     0,
-    sizeof (CORBA::AttributeMode)
+    0
   );
 
 namespace CORBA
@@ -1042,25 +1044,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_AttributeDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4174),
-  ACE_NTOHL (0x74726962),
-  ACE_NTOHL (0x75746544),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4174), 
+  ACE_NTOHL (0x74726962), 
+  ACE_NTOHL (0x75746544), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDef:1.0
     13,
-  ACE_NTOHL (0x41747472),
-  ACE_NTOHL (0x69627574),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x41747472), 
+  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = AttributeDef
   };
 
@@ -1069,7 +1071,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDef (
     sizeof (_oc_CORBA_AttributeDef),
     (char *) &_oc_CORBA_AttributeDef,
     0,
-    sizeof (CORBA::AttributeDef)
+    0
   );
 
 namespace CORBA
@@ -1079,52 +1081,52 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_AttributeDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4174),
-  ACE_NTOHL (0x74726962),
-  ACE_NTOHL (0x75746544),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4174), 
+  ACE_NTOHL (0x74726962), 
+  ACE_NTOHL (0x75746544), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
     21,
-  ACE_NTOHL (0x41747472),
-  ACE_NTOHL (0x69627574),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x41747472), 
+  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x65446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = AttributeDescription
   6, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -1133,108 +1135,108 @@ static const CORBA::Long _oc_CORBA_AttributeDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   5,
-  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4174),
-    ACE_NTOHL (0x74726962),
-    ACE_NTOHL (0x7574654d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4174), 
+    ACE_NTOHL (0x74726962), 
+    ACE_NTOHL (0x7574654d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
     14,
-    ACE_NTOHL (0x41747472),
-    ACE_NTOHL (0x69627574),
-    ACE_NTOHL (0x654d6f64),
+    ACE_NTOHL (0x41747472), 
+    ACE_NTOHL (0x69627574), 
+    ACE_NTOHL (0x654d6f64), 
     ACE_NTOHL (0x65000000),  // name = AttributeMode
     2, // member count
     12,
-    ACE_NTOHL (0x41545452),
-    ACE_NTOHL (0x5f4e4f52),
+    ACE_NTOHL (0x41545452), 
+    ACE_NTOHL (0x5f4e4f52), 
     ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
     14,
-    ACE_NTOHL (0x41545452),
-    ACE_NTOHL (0x5f524541),
-    ACE_NTOHL (0x444f4e4c),
+    ACE_NTOHL (0x41545452), 
+    ACE_NTOHL (0x5f524541), 
+    ACE_NTOHL (0x444f4e4c), 
     ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDescription (
@@ -1242,7 +1244,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDescription (
     sizeof (_oc_CORBA_AttributeDescription),
     (char *) &_oc_CORBA_AttributeDescription,
     0,
-    sizeof (CORBA::AttributeDescription)
+    0
   );
 
 namespace CORBA
@@ -1252,53 +1254,53 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtAttributeDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x74417474),
-  ACE_NTOHL (0x72696275),
-  ACE_NTOHL (0x74654465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74417474), 
+  ACE_NTOHL (0x72696275), 
+  ACE_NTOHL (0x74654465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
     24,
-  ACE_NTOHL (0x45787441),
-  ACE_NTOHL (0x74747269),
-  ACE_NTOHL (0x62757465),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x74747269), 
+  ACE_NTOHL (0x62757465), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
   8, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -1307,132 +1309,132 @@ static const CORBA::Long _oc_CORBA_ExtAttributeDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   5,
-  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4174),
-    ACE_NTOHL (0x74726962),
-    ACE_NTOHL (0x7574654d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4174), 
+    ACE_NTOHL (0x74726962), 
+    ACE_NTOHL (0x7574654d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
     14,
-    ACE_NTOHL (0x41747472),
-    ACE_NTOHL (0x69627574),
-    ACE_NTOHL (0x654d6f64),
+    ACE_NTOHL (0x41747472), 
+    ACE_NTOHL (0x69627574), 
+    ACE_NTOHL (0x654d6f64), 
     ACE_NTOHL (0x65000000),  // name = AttributeMode
     2, // member count
     12,
-    ACE_NTOHL (0x41545452),
-    ACE_NTOHL (0x5f4e4f52),
+    ACE_NTOHL (0x41545452), 
+    ACE_NTOHL (0x5f4e4f52), 
     ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
     14,
-    ACE_NTOHL (0x41545452),
-    ACE_NTOHL (0x5f524541),
-    ACE_NTOHL (0x444f4e4c),
+    ACE_NTOHL (0x41545452), 
+    ACE_NTOHL (0x5f524541), 
+    ACE_NTOHL (0x444f4e4c), 
     ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+    
   15,
-  ACE_NTOHL (0x6765745f),
-  ACE_NTOHL (0x65786365),
-  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6765745f), 
+  ACE_NTOHL (0x65786365), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e730000),  // name = get_exceptions
     CORBA::tk_alias, // typecode kind for typedefs
   556, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x63446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x63446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
         18,
-    ACE_NTOHL (0x45786344),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x45786344), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     476, // encapsulation length
@@ -1441,46 +1443,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       460, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63657074),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63657074), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                 21,
-        ACE_NTOHL (0x45786365),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x45786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = ExceptionDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -1489,73 +1491,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
@@ -1564,29 +1566,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   15,
-  ACE_NTOHL (0x7075745f),
-  ACE_NTOHL (0x65786365),
-  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x7075745f), 
+  ACE_NTOHL (0x65786365), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e730000),  // name = put_exceptions
     CORBA::tk_alias, // typecode kind for typedefs
   556, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x63446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x63446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
         18,
-    ACE_NTOHL (0x45786344),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x45786344), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     476, // encapsulation length
@@ -1595,46 +1597,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       460, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63657074),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63657074), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                 21,
-        ACE_NTOHL (0x45786365),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x45786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = ExceptionDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -1643,73 +1645,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
@@ -1724,7 +1726,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAttributeDescription (
     sizeof (_oc_CORBA_ExtAttributeDescription),
     (char *) &_oc_CORBA_ExtAttributeDescription,
     0,
-    sizeof (CORBA::ExtAttributeDescription)
+    0
   );
 
 namespace CORBA
@@ -1734,26 +1736,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtAttributeDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x74417474),
-  ACE_NTOHL (0x72696275),
-  ACE_NTOHL (0x74654465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74417474), 
+  ACE_NTOHL (0x72696275), 
+  ACE_NTOHL (0x74654465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDef:1.0
     16,
-  ACE_NTOHL (0x45787441),
-  ACE_NTOHL (0x74747269),
-  ACE_NTOHL (0x62757465),
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x74747269), 
+  ACE_NTOHL (0x62757465), 
   ACE_NTOHL (0x44656600),  // name = ExtAttributeDef
   };
 
@@ -1762,7 +1764,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAttributeDef (
     sizeof (_oc_CORBA_ExtAttributeDef),
     (char *) &_oc_CORBA_ExtAttributeDef,
     0,
-    sizeof (CORBA::ExtAttributeDef)
+    0
   );
 
 namespace CORBA
@@ -1772,34 +1774,34 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_OperationMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f70),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x6f64653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f70), 
+  ACE_NTOHL (0x65726174), 
+  ACE_NTOHL (0x696f6e4d), 
+  ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
   14,
-  ACE_NTOHL (0x4f706572),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e4d6f64),
+  ACE_NTOHL (0x4f706572), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e4d6f64), 
   ACE_NTOHL (0x65000000),  // name = OperationMode
   2, // member count
   10,
-  ACE_NTOHL (0x4f505f4e),
-  ACE_NTOHL (0x4f524d41),
+  ACE_NTOHL (0x4f505f4e), 
+  ACE_NTOHL (0x4f524d41), 
   ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
   10,
-  ACE_NTOHL (0x4f505f4f),
-  ACE_NTOHL (0x4e455741),
+  ACE_NTOHL (0x4f505f4f), 
+  ACE_NTOHL (0x4e455741), 
   ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
   };
 
@@ -1808,7 +1810,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationMode (
     sizeof (_oc_CORBA_OperationMode),
     (char *) &_oc_CORBA_OperationMode,
     0,
-    sizeof (CORBA::OperationMode)
+    0
   );
 
 namespace CORBA
@@ -1818,114 +1820,114 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ParameterDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5061),
-  ACE_NTOHL (0x72616d65),
-  ACE_NTOHL (0x74657244),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5061), 
+  ACE_NTOHL (0x72616d65), 
+  ACE_NTOHL (0x74657244), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
     21,
-  ACE_NTOHL (0x50617261),
-  ACE_NTOHL (0x6d657465),
-  ACE_NTOHL (0x72446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x50617261), 
+  ACE_NTOHL (0x6d657465), 
+  ACE_NTOHL (0x72446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = ParameterDescription
   4, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   9,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f646566),
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x5f646566), 
   ACE_NTOHL (0x0),  // name = type_def
     CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4944),
-    ACE_NTOHL (0x4c547970),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4944), 
+    ACE_NTOHL (0x4c547970), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
         8,
-    ACE_NTOHL (0x49444c54),
+    ACE_NTOHL (0x49444c54), 
     ACE_NTOHL (0x79706500),  // name = IDLType
-
+    
   5,
-  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5061),
-    ACE_NTOHL (0x72616d65),
-    ACE_NTOHL (0x7465724d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5061), 
+    ACE_NTOHL (0x72616d65), 
+    ACE_NTOHL (0x7465724d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
     14,
-    ACE_NTOHL (0x50617261),
-    ACE_NTOHL (0x6d657465),
-    ACE_NTOHL (0x724d6f64),
+    ACE_NTOHL (0x50617261), 
+    ACE_NTOHL (0x6d657465), 
+    ACE_NTOHL (0x724d6f64), 
     ACE_NTOHL (0x65000000),  // name = ParameterMode
     3, // member count
     9,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x50415241), 
+    ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x0),  // name = PARAM_IN
     10,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f4f55),
+    ACE_NTOHL (0x50415241), 
+    ACE_NTOHL (0x4d5f4f55), 
     ACE_NTOHL (0x54000000),  // name = PARAM_OUT
     12,
-    ACE_NTOHL (0x50415241),
-    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x50415241), 
+    ACE_NTOHL (0x4d5f494e), 
     ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterDescription (
@@ -1933,7 +1935,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterDescription (
     sizeof (_oc_CORBA_ParameterDescription),
     (char *) &_oc_CORBA_ParameterDescription,
     0,
-    sizeof (CORBA::ParameterDescription)
+    0
   );
 
 namespace CORBA
@@ -1943,27 +1945,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5061),
-  ACE_NTOHL (0x72446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5061), 
+  ACE_NTOHL (0x72446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
     18,
-  ACE_NTOHL (0x50617244),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e5365),
+  ACE_NTOHL (0x50617244), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e5365), 
   ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   416, // encapsulation length
@@ -1972,108 +1974,108 @@ static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
     400, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5061),
-      ACE_NTOHL (0x72616d65),
-      ACE_NTOHL (0x74657244),
-      ACE_NTOHL (0x65736372),
-      ACE_NTOHL (0x69707469),
-      ACE_NTOHL (0x6f6e3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5061), 
+      ACE_NTOHL (0x72616d65), 
+      ACE_NTOHL (0x74657244), 
+      ACE_NTOHL (0x65736372), 
+      ACE_NTOHL (0x69707469), 
+      ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
             21,
-      ACE_NTOHL (0x50617261),
-      ACE_NTOHL (0x6d657465),
-      ACE_NTOHL (0x72446573),
-      ACE_NTOHL (0x63726970),
-      ACE_NTOHL (0x74696f6e),
+      ACE_NTOHL (0x50617261), 
+      ACE_NTOHL (0x6d657465), 
+      ACE_NTOHL (0x72446573), 
+      ACE_NTOHL (0x63726970), 
+      ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = ParameterDescription
       4, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       9,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x5f646566),
+      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x5f646566), 
       ACE_NTOHL (0x0),  // name = type_def
             CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4944),
-        ACE_NTOHL (0x4c547970),
-        ACE_NTOHL (0x653a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4944), 
+        ACE_NTOHL (0x4c547970), 
+        ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-        ACE_NTOHL (0x49444c54),
+        ACE_NTOHL (0x49444c54), 
         ACE_NTOHL (0x79706500),  // name = IDLType
-
+        
       5,
-      ACE_NTOHL (0x6d6f6465),
+      ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5061),
-        ACE_NTOHL (0x72616d65),
-        ACE_NTOHL (0x7465724d),
-        ACE_NTOHL (0x6f64653a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5061), 
+        ACE_NTOHL (0x72616d65), 
+        ACE_NTOHL (0x7465724d), 
+        ACE_NTOHL (0x6f64653a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
         14,
-        ACE_NTOHL (0x50617261),
-        ACE_NTOHL (0x6d657465),
-        ACE_NTOHL (0x724d6f64),
+        ACE_NTOHL (0x50617261), 
+        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x724d6f64), 
         ACE_NTOHL (0x65000000),  // name = ParameterMode
         3, // member count
         9,
-        ACE_NTOHL (0x50415241),
-        ACE_NTOHL (0x4d5f494e),
+        ACE_NTOHL (0x50415241), 
+        ACE_NTOHL (0x4d5f494e), 
         ACE_NTOHL (0x0),  // name = PARAM_IN
         10,
-        ACE_NTOHL (0x50415241),
-        ACE_NTOHL (0x4d5f4f55),
+        ACE_NTOHL (0x50415241), 
+        ACE_NTOHL (0x4d5f4f55), 
         ACE_NTOHL (0x54000000),  // name = PARAM_OUT
         12,
-        ACE_NTOHL (0x50415241),
-        ACE_NTOHL (0x4d5f494e),
+        ACE_NTOHL (0x50415241), 
+        ACE_NTOHL (0x4d5f494e), 
         ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+        
 
     0U,
 
@@ -2084,7 +2086,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ParDescriptionSeq (
     sizeof (_oc_CORBA_ParDescriptionSeq),
     (char *) &_oc_CORBA_ParDescriptionSeq,
     0,
-    sizeof (CORBA::ParDescriptionSeq)
+    0
   );
 
 namespace CORBA
@@ -2094,46 +2096,46 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ContextIdentifier[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746578),
-  ACE_NTOHL (0x74496465),
-  ACE_NTOHL (0x6e746966),
-  ACE_NTOHL (0x6965723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e746578), 
+  ACE_NTOHL (0x74496465), 
+  ACE_NTOHL (0x6e746966), 
+  ACE_NTOHL (0x6965723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
     18,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x65787449),
-  ACE_NTOHL (0x64656e74),
-  ACE_NTOHL (0x69666965),
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x65787449), 
+  ACE_NTOHL (0x64656e74), 
+  ACE_NTOHL (0x69666965), 
   ACE_NTOHL (0x72000000),  // name = ContextIdentifier
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -2143,7 +2145,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ContextIdentifier (
     sizeof (_oc_CORBA_ContextIdentifier),
     (char *) &_oc_CORBA_ContextIdentifier,
     0,
-    sizeof (CORBA::ContextIdentifier)
+    0
   );
 
 namespace CORBA
@@ -2153,25 +2155,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6e746578),
-  ACE_NTOHL (0x74496453),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6e746578), 
+  ACE_NTOHL (0x74496453), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
     13,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x65787449),
-  ACE_NTOHL (0x64536571),
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x65787449), 
+  ACE_NTOHL (0x64536571), 
   ACE_NTOHL (0x0),  // name = ContextIdSeq
     CORBA::tk_sequence, // typecode kind
   164, // encapsulation length
@@ -2180,40 +2182,40 @@ static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
     148, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       40,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f436f),
-      ACE_NTOHL (0x6e746578),
-      ACE_NTOHL (0x74496465),
-      ACE_NTOHL (0x6e746966),
-      ACE_NTOHL (0x6965723a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6e746578), 
+      ACE_NTOHL (0x74496465), 
+      ACE_NTOHL (0x6e746966), 
+      ACE_NTOHL (0x6965723a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
             18,
-      ACE_NTOHL (0x436f6e74),
-      ACE_NTOHL (0x65787449),
-      ACE_NTOHL (0x64656e74),
-      ACE_NTOHL (0x69666965),
+      ACE_NTOHL (0x436f6e74), 
+      ACE_NTOHL (0x65787449), 
+      ACE_NTOHL (0x64656e74), 
+      ACE_NTOHL (0x69666965), 
       ACE_NTOHL (0x72000000),  // name = ContextIdentifier
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -2226,7 +2228,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ContextIdSeq (
     sizeof (_oc_CORBA_ContextIdSeq),
     (char *) &_oc_CORBA_ContextIdSeq,
     0,
-    sizeof (CORBA::ContextIdSeq)
+    0
   );
 
 namespace CORBA
@@ -2236,25 +2238,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_OperationDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f70),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f70), 
+  ACE_NTOHL (0x65726174), 
+  ACE_NTOHL (0x696f6e44), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDef:1.0
     13,
-  ACE_NTOHL (0x4f706572),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e446566),
+  ACE_NTOHL (0x4f706572), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e446566), 
   ACE_NTOHL (0x0),  // name = OperationDef
   };
 
@@ -2263,7 +2265,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationDef (
     sizeof (_oc_CORBA_OperationDef),
     (char *) &_oc_CORBA_OperationDef,
     0,
-    sizeof (CORBA::OperationDef)
+    0
   );
 
 namespace CORBA
@@ -2273,52 +2275,52 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_OperationDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f70),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x696f6e44),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f70), 
+  ACE_NTOHL (0x65726174), 
+  ACE_NTOHL (0x696f6e44), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
     21,
-  ACE_NTOHL (0x4f706572),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x4f706572), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = OperationDescription
   9, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -2327,128 +2329,128 @@ static const CORBA::Long _oc_CORBA_OperationDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   7,
-  ACE_NTOHL (0x72657375),
+  ACE_NTOHL (0x72657375), 
   ACE_NTOHL (0x6c740000),  // name = result
     CORBA::tk_TypeCode,
 
   5,
-  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x65726174),
-    ACE_NTOHL (0x696f6e4d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x65726174), 
+    ACE_NTOHL (0x696f6e4d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
     14,
-    ACE_NTOHL (0x4f706572),
-    ACE_NTOHL (0x6174696f),
-    ACE_NTOHL (0x6e4d6f64),
+    ACE_NTOHL (0x4f706572), 
+    ACE_NTOHL (0x6174696f), 
+    ACE_NTOHL (0x6e4d6f64), 
     ACE_NTOHL (0x65000000),  // name = OperationMode
     2, // member count
     10,
-    ACE_NTOHL (0x4f505f4e),
-    ACE_NTOHL (0x4f524d41),
+    ACE_NTOHL (0x4f505f4e), 
+    ACE_NTOHL (0x4f524d41), 
     ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
     10,
-    ACE_NTOHL (0x4f505f4f),
-    ACE_NTOHL (0x4e455741),
+    ACE_NTOHL (0x4f505f4f), 
+    ACE_NTOHL (0x4e455741), 
     ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+    
   9,
-  ACE_NTOHL (0x636f6e74),
-  ACE_NTOHL (0x65787473),
+  ACE_NTOHL (0x636f6e74), 
+  ACE_NTOHL (0x65787473), 
   ACE_NTOHL (0x0),  // name = contexts
     CORBA::tk_alias, // typecode kind for typedefs
   236, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6e746578),
-    ACE_NTOHL (0x74496453),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6e746578), 
+    ACE_NTOHL (0x74496453), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
         13,
-    ACE_NTOHL (0x436f6e74),
-    ACE_NTOHL (0x65787449),
-    ACE_NTOHL (0x64536571),
+    ACE_NTOHL (0x436f6e74), 
+    ACE_NTOHL (0x65787449), 
+    ACE_NTOHL (0x64536571), 
     ACE_NTOHL (0x0),  // name = ContextIdSeq
         CORBA::tk_sequence, // typecode kind
     164, // encapsulation length
@@ -2457,40 +2459,40 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       148, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6e746578),
-        ACE_NTOHL (0x74496465),
-        ACE_NTOHL (0x6e746966),
-        ACE_NTOHL (0x6965723a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6e746578), 
+        ACE_NTOHL (0x74496465), 
+        ACE_NTOHL (0x6e746966), 
+        ACE_NTOHL (0x6965723a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                 18,
-        ACE_NTOHL (0x436f6e74),
-        ACE_NTOHL (0x65787449),
-        ACE_NTOHL (0x64656e74),
-        ACE_NTOHL (0x69666965),
+        ACE_NTOHL (0x436f6e74), 
+        ACE_NTOHL (0x65787449), 
+        ACE_NTOHL (0x64656e74), 
+        ACE_NTOHL (0x69666965), 
         ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
 
@@ -2498,28 +2500,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x70617261),
-  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x70617261), 
+  ACE_NTOHL (0x6d657465), 
   ACE_NTOHL (0x72730000),  // name = parameters
     CORBA::tk_alias, // typecode kind for typedefs
   496, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5061),
-    ACE_NTOHL (0x72446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5061), 
+    ACE_NTOHL (0x72446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
         18,
-    ACE_NTOHL (0x50617244),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x50617244), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     416, // encapsulation length
@@ -2528,135 +2530,135 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       400, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5061),
-        ACE_NTOHL (0x72616d65),
-        ACE_NTOHL (0x74657244),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5061), 
+        ACE_NTOHL (0x72616d65), 
+        ACE_NTOHL (0x74657244), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                 21,
-        ACE_NTOHL (0x50617261),
-        ACE_NTOHL (0x6d657465),
-        ACE_NTOHL (0x72446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x50617261), 
+        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x72446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = ParameterDescription
         4, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x5f646566),
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x5f646566), 
         ACE_NTOHL (0x0),  // name = type_def
                 CORBA::tk_objref, // typecode kind
         52, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4944),
-          ACE_NTOHL (0x4c547970),
-          ACE_NTOHL (0x653a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4944), 
+          ACE_NTOHL (0x4c547970), 
+          ACE_NTOHL (0x653a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                     8,
-          ACE_NTOHL (0x49444c54),
+          ACE_NTOHL (0x49444c54), 
           ACE_NTOHL (0x79706500),  // name = IDLType
-
+          
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5061),
-          ACE_NTOHL (0x72616d65),
-          ACE_NTOHL (0x7465724d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72616d65), 
+          ACE_NTOHL (0x7465724d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
           14,
-          ACE_NTOHL (0x50617261),
-          ACE_NTOHL (0x6d657465),
-          ACE_NTOHL (0x724d6f64),
+          ACE_NTOHL (0x50617261), 
+          ACE_NTOHL (0x6d657465), 
+          ACE_NTOHL (0x724d6f64), 
           ACE_NTOHL (0x65000000),  // name = ParameterMode
           3, // member count
           9,
-          ACE_NTOHL (0x50415241),
-          ACE_NTOHL (0x4d5f494e),
+          ACE_NTOHL (0x50415241), 
+          ACE_NTOHL (0x4d5f494e), 
           ACE_NTOHL (0x0),  // name = PARAM_IN
           10,
-          ACE_NTOHL (0x50415241),
-          ACE_NTOHL (0x4d5f4f55),
+          ACE_NTOHL (0x50415241), 
+          ACE_NTOHL (0x4d5f4f55), 
           ACE_NTOHL (0x54000000),  // name = PARAM_OUT
           12,
-          ACE_NTOHL (0x50415241),
-          ACE_NTOHL (0x4d5f494e),
+          ACE_NTOHL (0x50415241), 
+          ACE_NTOHL (0x4d5f494e), 
           ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+          
 
       0U,
 
 
   11,
-  ACE_NTOHL (0x65786365),
-  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x65786365), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e730000),  // name = exceptions
     CORBA::tk_alias, // typecode kind for typedefs
   556, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x63446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x63446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
         18,
-    ACE_NTOHL (0x45786344),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x45786344), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     476, // encapsulation length
@@ -2665,46 +2667,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       460, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63657074),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63657074), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                 21,
-        ACE_NTOHL (0x45786365),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x45786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = ExceptionDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -2713,73 +2715,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
@@ -2794,7 +2796,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationDescription (
     sizeof (_oc_CORBA_OperationDescription),
     (char *) &_oc_CORBA_OperationDescription,
     0,
-    sizeof (CORBA::OperationDescription)
+    0
   );
 
 namespace CORBA
@@ -2804,26 +2806,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x49645365),
-  ACE_NTOHL (0x713a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x49645365), 
+  ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
     16,
-  ACE_NTOHL (0x5265706f),
-  ACE_NTOHL (0x7369746f),
-  ACE_NTOHL (0x72794964),
+  ACE_NTOHL (0x5265706f), 
+  ACE_NTOHL (0x7369746f), 
+  ACE_NTOHL (0x72794964), 
   ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
     CORBA::tk_sequence, // typecode kind
   88, // encapsulation length
@@ -2832,21 +2834,21 @@ static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
     72, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x49643a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x49643a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
             13,
-      ACE_NTOHL (0x5265706f),
-      ACE_NTOHL (0x7369746f),
-      ACE_NTOHL (0x72794964),
+      ACE_NTOHL (0x5265706f), 
+      ACE_NTOHL (0x7369746f), 
+      ACE_NTOHL (0x72794964), 
       ACE_NTOHL (0x0),  // name = RepositoryId
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
     0U,
@@ -2858,7 +2860,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryIdSeq (
     sizeof (_oc_CORBA_RepositoryIdSeq),
     (char *) &_oc_CORBA_RepositoryIdSeq,
     0,
-    sizeof (CORBA::RepositoryIdSeq)
+    0
   );
 
 namespace CORBA
@@ -2868,27 +2870,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f70),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e53),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f70), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
     17,
-  ACE_NTOHL (0x4f704465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e536571),
+  ACE_NTOHL (0x4f704465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e536571), 
   ACE_NTOHL (0x0),  // name = OpDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   1956, // encapsulation length
@@ -2897,46 +2899,46 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
     1940, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4f70),
-      ACE_NTOHL (0x65726174),
-      ACE_NTOHL (0x696f6e44),
-      ACE_NTOHL (0x65736372),
-      ACE_NTOHL (0x69707469),
-      ACE_NTOHL (0x6f6e3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4f70), 
+      ACE_NTOHL (0x65726174), 
+      ACE_NTOHL (0x696f6e44), 
+      ACE_NTOHL (0x65736372), 
+      ACE_NTOHL (0x69707469), 
+      ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
             21,
-      ACE_NTOHL (0x4f706572),
-      ACE_NTOHL (0x6174696f),
-      ACE_NTOHL (0x6e446573),
-      ACE_NTOHL (0x63726970),
-      ACE_NTOHL (0x74696f6e),
+      ACE_NTOHL (0x4f706572), 
+      ACE_NTOHL (0x6174696f), 
+      ACE_NTOHL (0x6e446573), 
+      ACE_NTOHL (0x63726970), 
+      ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = OperationDescription
       9, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       3,
@@ -2945,128 +2947,128 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273),
+      ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       7,
-      ACE_NTOHL (0x72657375),
+      ACE_NTOHL (0x72657375), 
       ACE_NTOHL (0x6c740000),  // name = result
             CORBA::tk_TypeCode,
 
       5,
-      ACE_NTOHL (0x6d6f6465),
+      ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f70),
-        ACE_NTOHL (0x65726174),
-        ACE_NTOHL (0x696f6e4d),
-        ACE_NTOHL (0x6f64653a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e4d), 
+        ACE_NTOHL (0x6f64653a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
         14,
-        ACE_NTOHL (0x4f706572),
-        ACE_NTOHL (0x6174696f),
-        ACE_NTOHL (0x6e4d6f64),
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e4d6f64), 
         ACE_NTOHL (0x65000000),  // name = OperationMode
         2, // member count
         10,
-        ACE_NTOHL (0x4f505f4e),
-        ACE_NTOHL (0x4f524d41),
+        ACE_NTOHL (0x4f505f4e), 
+        ACE_NTOHL (0x4f524d41), 
         ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
         10,
-        ACE_NTOHL (0x4f505f4f),
-        ACE_NTOHL (0x4e455741),
+        ACE_NTOHL (0x4f505f4f), 
+        ACE_NTOHL (0x4e455741), 
         ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+        
       9,
-      ACE_NTOHL (0x636f6e74),
-      ACE_NTOHL (0x65787473),
+      ACE_NTOHL (0x636f6e74), 
+      ACE_NTOHL (0x65787473), 
       ACE_NTOHL (0x0),  // name = contexts
             CORBA::tk_alias, // typecode kind for typedefs
       236, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6e746578),
-        ACE_NTOHL (0x74496453),
-        ACE_NTOHL (0x65713a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6e746578), 
+        ACE_NTOHL (0x74496453), 
+        ACE_NTOHL (0x65713a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                 13,
-        ACE_NTOHL (0x436f6e74),
-        ACE_NTOHL (0x65787449),
-        ACE_NTOHL (0x64536571),
+        ACE_NTOHL (0x436f6e74), 
+        ACE_NTOHL (0x65787449), 
+        ACE_NTOHL (0x64536571), 
         ACE_NTOHL (0x0),  // name = ContextIdSeq
                 CORBA::tk_sequence, // typecode kind
         164, // encapsulation length
@@ -3075,40 +3077,40 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           148, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             40,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f436f),
-            ACE_NTOHL (0x6e746578),
-            ACE_NTOHL (0x74496465),
-            ACE_NTOHL (0x6e746966),
-            ACE_NTOHL (0x6965723a),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f436f), 
+            ACE_NTOHL (0x6e746578), 
+            ACE_NTOHL (0x74496465), 
+            ACE_NTOHL (0x6e746966), 
+            ACE_NTOHL (0x6965723a), 
             ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                         18,
-            ACE_NTOHL (0x436f6e74),
-            ACE_NTOHL (0x65787449),
-            ACE_NTOHL (0x64656e74),
-            ACE_NTOHL (0x69666965),
+            ACE_NTOHL (0x436f6e74), 
+            ACE_NTOHL (0x65787449), 
+            ACE_NTOHL (0x64656e74), 
+            ACE_NTOHL (0x69666965), 
             ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4964), 
+              ACE_NTOHL (0x656e7469), 
+              ACE_NTOHL (0x66696572), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                             11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
+              ACE_NTOHL (0x4964656e), 
+              ACE_NTOHL (0x74696669), 
               ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
 
@@ -3116,28 +3118,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
       11,
-      ACE_NTOHL (0x70617261),
-      ACE_NTOHL (0x6d657465),
+      ACE_NTOHL (0x70617261), 
+      ACE_NTOHL (0x6d657465), 
       ACE_NTOHL (0x72730000),  // name = parameters
             CORBA::tk_alias, // typecode kind for typedefs
       496, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5061),
-        ACE_NTOHL (0x72446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x5365713a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5061), 
+        ACE_NTOHL (0x72446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x5365713a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                 18,
-        ACE_NTOHL (0x50617244),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e5365),
+        ACE_NTOHL (0x50617244), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e5365), 
         ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                 CORBA::tk_sequence, // typecode kind
         416, // encapsulation length
@@ -3146,135 +3148,135 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           400, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             43,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f5061),
-            ACE_NTOHL (0x72616d65),
-            ACE_NTOHL (0x74657244),
-            ACE_NTOHL (0x65736372),
-            ACE_NTOHL (0x69707469),
-            ACE_NTOHL (0x6f6e3a31),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f5061), 
+            ACE_NTOHL (0x72616d65), 
+            ACE_NTOHL (0x74657244), 
+            ACE_NTOHL (0x65736372), 
+            ACE_NTOHL (0x69707469), 
+            ACE_NTOHL (0x6f6e3a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                         21,
-            ACE_NTOHL (0x50617261),
-            ACE_NTOHL (0x6d657465),
-            ACE_NTOHL (0x72446573),
-            ACE_NTOHL (0x63726970),
-            ACE_NTOHL (0x74696f6e),
+            ACE_NTOHL (0x50617261), 
+            ACE_NTOHL (0x6d657465), 
+            ACE_NTOHL (0x72446573), 
+            ACE_NTOHL (0x63726970), 
+            ACE_NTOHL (0x74696f6e), 
             ACE_NTOHL (0x0),  // name = ParameterDescription
             4, // member count
                         5,
-            ACE_NTOHL (0x6e616d65),
+            ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4964), 
+              ACE_NTOHL (0x656e7469), 
+              ACE_NTOHL (0x66696572), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                             11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
+              ACE_NTOHL (0x4964656e), 
+              ACE_NTOHL (0x74696669), 
               ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             5,
-            ACE_NTOHL (0x74797065),
+            ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
             9,
-            ACE_NTOHL (0x74797065),
-            ACE_NTOHL (0x5f646566),
+            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x5f646566), 
             ACE_NTOHL (0x0),  // name = type_def
                         CORBA::tk_objref, // typecode kind
             52, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               30,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4944),
-              ACE_NTOHL (0x4c547970),
-              ACE_NTOHL (0x653a312e),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4944), 
+              ACE_NTOHL (0x4c547970), 
+              ACE_NTOHL (0x653a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                             8,
-              ACE_NTOHL (0x49444c54),
+              ACE_NTOHL (0x49444c54), 
               ACE_NTOHL (0x79706500),  // name = IDLType
-
+              
             5,
-            ACE_NTOHL (0x6d6f6465),
+            ACE_NTOHL (0x6d6f6465), 
             ACE_NTOHL (0x0),  // name = mode
                         CORBA::tk_enum, // typecode kind
             116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
               36,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5061),
-              ACE_NTOHL (0x72616d65),
-              ACE_NTOHL (0x7465724d),
-              ACE_NTOHL (0x6f64653a),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x7465724d), 
+              ACE_NTOHL (0x6f64653a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
               14,
-              ACE_NTOHL (0x50617261),
-              ACE_NTOHL (0x6d657465),
-              ACE_NTOHL (0x724d6f64),
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x724d6f64), 
               ACE_NTOHL (0x65000000),  // name = ParameterMode
               3, // member count
               9,
-              ACE_NTOHL (0x50415241),
-              ACE_NTOHL (0x4d5f494e),
+              ACE_NTOHL (0x50415241), 
+              ACE_NTOHL (0x4d5f494e), 
               ACE_NTOHL (0x0),  // name = PARAM_IN
               10,
-              ACE_NTOHL (0x50415241),
-              ACE_NTOHL (0x4d5f4f55),
+              ACE_NTOHL (0x50415241), 
+              ACE_NTOHL (0x4d5f4f55), 
               ACE_NTOHL (0x54000000),  // name = PARAM_OUT
               12,
-              ACE_NTOHL (0x50415241),
-              ACE_NTOHL (0x4d5f494e),
+              ACE_NTOHL (0x50415241), 
+              ACE_NTOHL (0x4d5f494e), 
               ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+              
 
           0U,
 
 
       11,
-      ACE_NTOHL (0x65786365),
-      ACE_NTOHL (0x7074696f),
+      ACE_NTOHL (0x65786365), 
+      ACE_NTOHL (0x7074696f), 
       ACE_NTOHL (0x6e730000),  // name = exceptions
             CORBA::tk_alias, // typecode kind for typedefs
       556, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x5365713a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x5365713a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                 18,
-        ACE_NTOHL (0x45786344),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e5365),
+        ACE_NTOHL (0x45786344), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e5365), 
         ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                 CORBA::tk_sequence, // typecode kind
         476, // encapsulation length
@@ -3283,46 +3285,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           460, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             43,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f4578),
-            ACE_NTOHL (0x63657074),
-            ACE_NTOHL (0x696f6e44),
-            ACE_NTOHL (0x65736372),
-            ACE_NTOHL (0x69707469),
-            ACE_NTOHL (0x6f6e3a31),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f4578), 
+            ACE_NTOHL (0x63657074), 
+            ACE_NTOHL (0x696f6e44), 
+            ACE_NTOHL (0x65736372), 
+            ACE_NTOHL (0x69707469), 
+            ACE_NTOHL (0x6f6e3a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                         21,
-            ACE_NTOHL (0x45786365),
-            ACE_NTOHL (0x7074696f),
-            ACE_NTOHL (0x6e446573),
-            ACE_NTOHL (0x63726970),
-            ACE_NTOHL (0x74696f6e),
+            ACE_NTOHL (0x45786365), 
+            ACE_NTOHL (0x7074696f), 
+            ACE_NTOHL (0x6e446573), 
+            ACE_NTOHL (0x63726970), 
+            ACE_NTOHL (0x74696f6e), 
             ACE_NTOHL (0x0),  // name = ExceptionDescription
             5, // member count
                         5,
-            ACE_NTOHL (0x6e616d65),
+            ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4964), 
+              ACE_NTOHL (0x656e7469), 
+              ACE_NTOHL (0x66696572), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                             11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
+              ACE_NTOHL (0x4964656e), 
+              ACE_NTOHL (0x74696669), 
               ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             3,
@@ -3331,73 +3333,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             72, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x49643a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                             13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
+              ACE_NTOHL (0x5265706f), 
+              ACE_NTOHL (0x7369746f), 
+              ACE_NTOHL (0x72794964), 
               ACE_NTOHL (0x0),  // name = RepositoryId
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             11,
-            ACE_NTOHL (0x64656669),
-            ACE_NTOHL (0x6e65645f),
+            ACE_NTOHL (0x64656669), 
+            ACE_NTOHL (0x6e65645f), 
             ACE_NTOHL (0x696e0000),  // name = defined_in
                         CORBA::tk_alias, // typecode kind for typedefs
             72, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x49643a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                             13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
+              ACE_NTOHL (0x5265706f), 
+              ACE_NTOHL (0x7369746f), 
+              ACE_NTOHL (0x72794964), 
               ACE_NTOHL (0x0),  // name = RepositoryId
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             8,
-            ACE_NTOHL (0x76657273),
+            ACE_NTOHL (0x76657273), 
             ACE_NTOHL (0x696f6e00),  // name = version
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               34,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5665),
-              ACE_NTOHL (0x7273696f),
-              ACE_NTOHL (0x6e537065),
-              ACE_NTOHL (0x633a312e),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5665), 
+              ACE_NTOHL (0x7273696f), 
+              ACE_NTOHL (0x6e537065), 
+              ACE_NTOHL (0x633a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                             12,
-              ACE_NTOHL (0x56657273),
-              ACE_NTOHL (0x696f6e53),
+              ACE_NTOHL (0x56657273), 
+              ACE_NTOHL (0x696f6e53), 
               ACE_NTOHL (0x70656300),  // name = VersionSpec
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             5,
-            ACE_NTOHL (0x74797065),
+            ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
@@ -3415,7 +3417,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_OpDescriptionSeq (
     sizeof (_oc_CORBA_OpDescriptionSeq),
     (char *) &_oc_CORBA_OpDescriptionSeq,
     0,
-    sizeof (CORBA::OpDescriptionSeq)
+    0
   );
 
 namespace CORBA
@@ -3425,28 +3427,28 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4174),
-  ACE_NTOHL (0x74724465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4174), 
+  ACE_NTOHL (0x74724465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
     19,
-  ACE_NTOHL (0x41747472),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e53),
+  ACE_NTOHL (0x41747472), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   600, // encapsulation length
@@ -3455,46 +3457,46 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
     584, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       43,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4174),
-      ACE_NTOHL (0x74726962),
-      ACE_NTOHL (0x75746544),
-      ACE_NTOHL (0x65736372),
-      ACE_NTOHL (0x69707469),
-      ACE_NTOHL (0x6f6e3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4174), 
+      ACE_NTOHL (0x74726962), 
+      ACE_NTOHL (0x75746544), 
+      ACE_NTOHL (0x65736372), 
+      ACE_NTOHL (0x69707469), 
+      ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
             21,
-      ACE_NTOHL (0x41747472),
-      ACE_NTOHL (0x69627574),
-      ACE_NTOHL (0x65446573),
-      ACE_NTOHL (0x63726970),
-      ACE_NTOHL (0x74696f6e),
+      ACE_NTOHL (0x41747472), 
+      ACE_NTOHL (0x69627574), 
+      ACE_NTOHL (0x65446573), 
+      ACE_NTOHL (0x63726970), 
+      ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = AttributeDescription
       6, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       3,
@@ -3503,108 +3505,108 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273),
+      ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       5,
-      ACE_NTOHL (0x6d6f6465),
+      ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4174),
-        ACE_NTOHL (0x74726962),
-        ACE_NTOHL (0x7574654d),
-        ACE_NTOHL (0x6f64653a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4174), 
+        ACE_NTOHL (0x74726962), 
+        ACE_NTOHL (0x7574654d), 
+        ACE_NTOHL (0x6f64653a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
         14,
-        ACE_NTOHL (0x41747472),
-        ACE_NTOHL (0x69627574),
-        ACE_NTOHL (0x654d6f64),
+        ACE_NTOHL (0x41747472), 
+        ACE_NTOHL (0x69627574), 
+        ACE_NTOHL (0x654d6f64), 
         ACE_NTOHL (0x65000000),  // name = AttributeMode
         2, // member count
         12,
-        ACE_NTOHL (0x41545452),
-        ACE_NTOHL (0x5f4e4f52),
+        ACE_NTOHL (0x41545452), 
+        ACE_NTOHL (0x5f4e4f52), 
         ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
         14,
-        ACE_NTOHL (0x41545452),
-        ACE_NTOHL (0x5f524541),
-        ACE_NTOHL (0x444f4e4c),
+        ACE_NTOHL (0x41545452), 
+        ACE_NTOHL (0x5f524541), 
+        ACE_NTOHL (0x444f4e4c), 
         ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+        
 
     0U,
 
@@ -3615,7 +3617,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_AttrDescriptionSeq (
     sizeof (_oc_CORBA_AttrDescriptionSeq),
     (char *) &_oc_CORBA_AttrDescriptionSeq,
     0,
-    sizeof (CORBA::AttrDescriptionSeq)
+    0
   );
 
 namespace CORBA
@@ -3625,29 +3627,29 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtAttrDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x74417474),
-  ACE_NTOHL (0x72446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74417474), 
+  ACE_NTOHL (0x72446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
     22,
-  ACE_NTOHL (0x45787441),
-  ACE_NTOHL (0x74747244),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e5365),
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x74747244), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e5365), 
   ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   1772, // encapsulation length
@@ -3656,47 +3658,47 @@ static const CORBA::Long _oc_CORBA_ExtAttrDescriptionSeq[] =
     1756, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       46,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4578),
-      ACE_NTOHL (0x74417474),
-      ACE_NTOHL (0x72696275),
-      ACE_NTOHL (0x74654465),
-      ACE_NTOHL (0x73637269),
-      ACE_NTOHL (0x7074696f),
-      ACE_NTOHL (0x6e3a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4578), 
+      ACE_NTOHL (0x74417474), 
+      ACE_NTOHL (0x72696275), 
+      ACE_NTOHL (0x74654465), 
+      ACE_NTOHL (0x73637269), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e3a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
             24,
-      ACE_NTOHL (0x45787441),
-      ACE_NTOHL (0x74747269),
-      ACE_NTOHL (0x62757465),
-      ACE_NTOHL (0x44657363),
-      ACE_NTOHL (0x72697074),
+      ACE_NTOHL (0x45787441), 
+      ACE_NTOHL (0x74747269), 
+      ACE_NTOHL (0x62757465), 
+      ACE_NTOHL (0x44657363), 
+      ACE_NTOHL (0x72697074), 
       ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
       8, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       3,
@@ -3705,132 +3707,132 @@ static const CORBA::Long _oc_CORBA_ExtAttrDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273),
+      ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       5,
-      ACE_NTOHL (0x6d6f6465),
+      ACE_NTOHL (0x6d6f6465), 
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4174),
-        ACE_NTOHL (0x74726962),
-        ACE_NTOHL (0x7574654d),
-        ACE_NTOHL (0x6f64653a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4174), 
+        ACE_NTOHL (0x74726962), 
+        ACE_NTOHL (0x7574654d), 
+        ACE_NTOHL (0x6f64653a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
         14,
-        ACE_NTOHL (0x41747472),
-        ACE_NTOHL (0x69627574),
-        ACE_NTOHL (0x654d6f64),
+        ACE_NTOHL (0x41747472), 
+        ACE_NTOHL (0x69627574), 
+        ACE_NTOHL (0x654d6f64), 
         ACE_NTOHL (0x65000000),  // name = AttributeMode
         2, // member count
         12,
-        ACE_NTOHL (0x41545452),
-        ACE_NTOHL (0x5f4e4f52),
+        ACE_NTOHL (0x41545452), 
+        ACE_NTOHL (0x5f4e4f52), 
         ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
         14,
-        ACE_NTOHL (0x41545452),
-        ACE_NTOHL (0x5f524541),
-        ACE_NTOHL (0x444f4e4c),
+        ACE_NTOHL (0x41545452), 
+        ACE_NTOHL (0x5f524541), 
+        ACE_NTOHL (0x444f4e4c), 
         ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+        
       15,
-      ACE_NTOHL (0x6765745f),
-      ACE_NTOHL (0x65786365),
-      ACE_NTOHL (0x7074696f),
+      ACE_NTOHL (0x6765745f), 
+      ACE_NTOHL (0x65786365), 
+      ACE_NTOHL (0x7074696f), 
       ACE_NTOHL (0x6e730000),  // name = get_exceptions
             CORBA::tk_alias, // typecode kind for typedefs
       556, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x5365713a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x5365713a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                 18,
-        ACE_NTOHL (0x45786344),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e5365),
+        ACE_NTOHL (0x45786344), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e5365), 
         ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                 CORBA::tk_sequence, // typecode kind
         476, // encapsulation length
@@ -3839,46 +3841,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           460, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             43,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f4578),
-            ACE_NTOHL (0x63657074),
-            ACE_NTOHL (0x696f6e44),
-            ACE_NTOHL (0x65736372),
-            ACE_NTOHL (0x69707469),
-            ACE_NTOHL (0x6f6e3a31),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f4578), 
+            ACE_NTOHL (0x63657074), 
+            ACE_NTOHL (0x696f6e44), 
+            ACE_NTOHL (0x65736372), 
+            ACE_NTOHL (0x69707469), 
+            ACE_NTOHL (0x6f6e3a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                         21,
-            ACE_NTOHL (0x45786365),
-            ACE_NTOHL (0x7074696f),
-            ACE_NTOHL (0x6e446573),
-            ACE_NTOHL (0x63726970),
-            ACE_NTOHL (0x74696f6e),
+            ACE_NTOHL (0x45786365), 
+            ACE_NTOHL (0x7074696f), 
+            ACE_NTOHL (0x6e446573), 
+            ACE_NTOHL (0x63726970), 
+            ACE_NTOHL (0x74696f6e), 
             ACE_NTOHL (0x0),  // name = ExceptionDescription
             5, // member count
                         5,
-            ACE_NTOHL (0x6e616d65),
+            ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4964), 
+              ACE_NTOHL (0x656e7469), 
+              ACE_NTOHL (0x66696572), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                             11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
+              ACE_NTOHL (0x4964656e), 
+              ACE_NTOHL (0x74696669), 
               ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             3,
@@ -3887,73 +3889,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             72, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x49643a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                             13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
+              ACE_NTOHL (0x5265706f), 
+              ACE_NTOHL (0x7369746f), 
+              ACE_NTOHL (0x72794964), 
               ACE_NTOHL (0x0),  // name = RepositoryId
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             11,
-            ACE_NTOHL (0x64656669),
-            ACE_NTOHL (0x6e65645f),
+            ACE_NTOHL (0x64656669), 
+            ACE_NTOHL (0x6e65645f), 
             ACE_NTOHL (0x696e0000),  // name = defined_in
                         CORBA::tk_alias, // typecode kind for typedefs
             72, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x49643a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                             13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
+              ACE_NTOHL (0x5265706f), 
+              ACE_NTOHL (0x7369746f), 
+              ACE_NTOHL (0x72794964), 
               ACE_NTOHL (0x0),  // name = RepositoryId
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             8,
-            ACE_NTOHL (0x76657273),
+            ACE_NTOHL (0x76657273), 
             ACE_NTOHL (0x696f6e00),  // name = version
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               34,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5665),
-              ACE_NTOHL (0x7273696f),
-              ACE_NTOHL (0x6e537065),
-              ACE_NTOHL (0x633a312e),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5665), 
+              ACE_NTOHL (0x7273696f), 
+              ACE_NTOHL (0x6e537065), 
+              ACE_NTOHL (0x633a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                             12,
-              ACE_NTOHL (0x56657273),
-              ACE_NTOHL (0x696f6e53),
+              ACE_NTOHL (0x56657273), 
+              ACE_NTOHL (0x696f6e53), 
               ACE_NTOHL (0x70656300),  // name = VersionSpec
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             5,
-            ACE_NTOHL (0x74797065),
+            ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
@@ -3962,29 +3964,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
       15,
-      ACE_NTOHL (0x7075745f),
-      ACE_NTOHL (0x65786365),
-      ACE_NTOHL (0x7074696f),
+      ACE_NTOHL (0x7075745f), 
+      ACE_NTOHL (0x65786365), 
+      ACE_NTOHL (0x7074696f), 
       ACE_NTOHL (0x6e730000),  // name = put_exceptions
             CORBA::tk_alias, // typecode kind for typedefs
       556, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x63446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
-        ACE_NTOHL (0x5365713a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x63446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x5365713a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                 18,
-        ACE_NTOHL (0x45786344),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e5365),
+        ACE_NTOHL (0x45786344), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e5365), 
         ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                 CORBA::tk_sequence, // typecode kind
         476, // encapsulation length
@@ -3993,46 +3995,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           460, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             43,
-            ACE_NTOHL (0x49444c3a),
-            ACE_NTOHL (0x6f6d672e),
-            ACE_NTOHL (0x6f72672f),
-            ACE_NTOHL (0x434f5242),
-            ACE_NTOHL (0x412f4578),
-            ACE_NTOHL (0x63657074),
-            ACE_NTOHL (0x696f6e44),
-            ACE_NTOHL (0x65736372),
-            ACE_NTOHL (0x69707469),
-            ACE_NTOHL (0x6f6e3a31),
+            ACE_NTOHL (0x49444c3a), 
+            ACE_NTOHL (0x6f6d672e), 
+            ACE_NTOHL (0x6f72672f), 
+            ACE_NTOHL (0x434f5242), 
+            ACE_NTOHL (0x412f4578), 
+            ACE_NTOHL (0x63657074), 
+            ACE_NTOHL (0x696f6e44), 
+            ACE_NTOHL (0x65736372), 
+            ACE_NTOHL (0x69707469), 
+            ACE_NTOHL (0x6f6e3a31), 
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                         21,
-            ACE_NTOHL (0x45786365),
-            ACE_NTOHL (0x7074696f),
-            ACE_NTOHL (0x6e446573),
-            ACE_NTOHL (0x63726970),
-            ACE_NTOHL (0x74696f6e),
+            ACE_NTOHL (0x45786365), 
+            ACE_NTOHL (0x7074696f), 
+            ACE_NTOHL (0x6e446573), 
+            ACE_NTOHL (0x63726970), 
+            ACE_NTOHL (0x74696f6e), 
             ACE_NTOHL (0x0),  // name = ExceptionDescription
             5, // member count
                         5,
-            ACE_NTOHL (0x6e616d65),
+            ACE_NTOHL (0x6e616d65), 
             ACE_NTOHL (0x0),  // name = name
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               33,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4964),
-              ACE_NTOHL (0x656e7469),
-              ACE_NTOHL (0x66696572),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4964), 
+              ACE_NTOHL (0x656e7469), 
+              ACE_NTOHL (0x66696572), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                             11,
-              ACE_NTOHL (0x4964656e),
-              ACE_NTOHL (0x74696669),
+              ACE_NTOHL (0x4964656e), 
+              ACE_NTOHL (0x74696669), 
               ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             3,
@@ -4041,73 +4043,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             72, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x49643a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                             13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
+              ACE_NTOHL (0x5265706f), 
+              ACE_NTOHL (0x7369746f), 
+              ACE_NTOHL (0x72794964), 
               ACE_NTOHL (0x0),  // name = RepositoryId
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             11,
-            ACE_NTOHL (0x64656669),
-            ACE_NTOHL (0x6e65645f),
+            ACE_NTOHL (0x64656669), 
+            ACE_NTOHL (0x6e65645f), 
             ACE_NTOHL (0x696e0000),  // name = defined_in
                         CORBA::tk_alias, // typecode kind for typedefs
             72, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x49643a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x49643a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                             13,
-              ACE_NTOHL (0x5265706f),
-              ACE_NTOHL (0x7369746f),
-              ACE_NTOHL (0x72794964),
+              ACE_NTOHL (0x5265706f), 
+              ACE_NTOHL (0x7369746f), 
+              ACE_NTOHL (0x72794964), 
               ACE_NTOHL (0x0),  // name = RepositoryId
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             8,
-            ACE_NTOHL (0x76657273),
+            ACE_NTOHL (0x76657273), 
             ACE_NTOHL (0x696f6e00),  // name = version
                         CORBA::tk_alias, // typecode kind for typedefs
             68, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               34,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5665),
-              ACE_NTOHL (0x7273696f),
-              ACE_NTOHL (0x6e537065),
-              ACE_NTOHL (0x633a312e),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5665), 
+              ACE_NTOHL (0x7273696f), 
+              ACE_NTOHL (0x6e537065), 
+              ACE_NTOHL (0x633a312e), 
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                             12,
-              ACE_NTOHL (0x56657273),
-              ACE_NTOHL (0x696f6e53),
+              ACE_NTOHL (0x56657273), 
+              ACE_NTOHL (0x696f6e53), 
               ACE_NTOHL (0x70656300),  // name = VersionSpec
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             5,
-            ACE_NTOHL (0x74797065),
+            ACE_NTOHL (0x74797065), 
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
@@ -4125,7 +4127,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAttrDescriptionSeq (
     sizeof (_oc_CORBA_ExtAttrDescriptionSeq),
     (char *) &_oc_CORBA_ExtAttrDescriptionSeq,
     0,
-    sizeof (CORBA::ExtAttrDescriptionSeq)
+    0
   );
 
 namespace CORBA
@@ -4135,57 +4137,57 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65662f46),
-  ACE_NTOHL (0x756c6c49),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65662f46), 
+  ACE_NTOHL (0x756c6c49), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0
     25,
-  ACE_NTOHL (0x46756c6c),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x46756c6c), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = FullInterfaceDescription
   8, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -4194,94 +4196,94 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572),
-  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e730000),  // name = operations
     CORBA::tk_alias, // typecode kind for typedefs
   2036, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1956, // encapsulation length
@@ -4290,46 +4292,46 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
       1940, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f70),
-        ACE_NTOHL (0x65726174),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572),
-        ACE_NTOHL (0x6174696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -4338,128 +4340,128 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         7,
-        ACE_NTOHL (0x72657375),
+        ACE_NTOHL (0x72657375), 
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4f70),
-          ACE_NTOHL (0x65726174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572),
-          ACE_NTOHL (0x6174696f),
-          ACE_NTOHL (0x6e4d6f64),
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e),
-          ACE_NTOHL (0x4f524d41),
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f),
-          ACE_NTOHL (0x4e455741),
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+          
         9,
-        ACE_NTOHL (0x636f6e74),
-        ACE_NTOHL (0x65787473),
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f436f),
-          ACE_NTOHL (0x6e746578),
-          ACE_NTOHL (0x74496453),
-          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74),
-          ACE_NTOHL (0x65787449),
-          ACE_NTOHL (0x64536571),
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           164, // encapsulation length
@@ -4468,40 +4470,40 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             148, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f436f),
-              ACE_NTOHL (0x6e746578),
-              ACE_NTOHL (0x74496465),
-              ACE_NTOHL (0x6e746966),
-              ACE_NTOHL (0x6965723a),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74),
-              ACE_NTOHL (0x65787449),
-              ACE_NTOHL (0x64656e74),
-              ACE_NTOHL (0x69666965),
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
 
@@ -4509,28 +4511,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261),
-        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         496, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5061),
-          ACE_NTOHL (0x72446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           416, // encapsulation length
@@ -4539,135 +4541,135 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             400, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5061),
-              ACE_NTOHL (0x72616d65),
-              ACE_NTOHL (0x74657244),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261),
-              ACE_NTOHL (0x6d657465),
-              ACE_NTOHL (0x72446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065),
-              ACE_NTOHL (0x5f646566),
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4944),
-                ACE_NTOHL (0x4c547970),
-                ACE_NTOHL (0x653a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54),
+                ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
               5,
-              ACE_NTOHL (0x6d6f6465),
+              ACE_NTOHL (0x6d6f6465), 
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5061),
-                ACE_NTOHL (0x72616d65),
-                ACE_NTOHL (0x7465724d),
-                ACE_NTOHL (0x6f64653a),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261),
-                ACE_NTOHL (0x6d657465),
-                ACE_NTOHL (0x724d6f64),
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f4f55),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+                
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -4676,46 +4678,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -4724,73 +4726,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -4803,29 +4805,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x61747472),
-  ACE_NTOHL (0x69627574),
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   684, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4174),
-    ACE_NTOHL (0x74724465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4174), 
+    ACE_NTOHL (0x74724465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
         19,
-    ACE_NTOHL (0x41747472),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x41747472), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     600, // encapsulation length
@@ -4834,46 +4836,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       584, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4174),
-        ACE_NTOHL (0x74726962),
-        ACE_NTOHL (0x75746544),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4174), 
+        ACE_NTOHL (0x74726962), 
+        ACE_NTOHL (0x75746544), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
                 21,
-        ACE_NTOHL (0x41747472),
-        ACE_NTOHL (0x69627574),
-        ACE_NTOHL (0x65446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x41747472), 
+        ACE_NTOHL (0x69627574), 
+        ACE_NTOHL (0x65446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = AttributeDescription
         6, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -4882,135 +4884,135 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4174),
-          ACE_NTOHL (0x74726962),
-          ACE_NTOHL (0x7574654d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472),
-          ACE_NTOHL (0x69627574),
-          ACE_NTOHL (0x654d6f64),
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f4e4f52),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f524541),
-          ACE_NTOHL (0x444f4e4c),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+          
 
       0U,
 
 
   16,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f696e74),
-  ACE_NTOHL (0x65726661),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f696e74), 
+  ACE_NTOHL (0x65726661), 
   ACE_NTOHL (0x63657300),  // name = base_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -5019,28 +5021,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -5051,32 +5053,32 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription (
     sizeof (_oc_CORBA_InterfaceDef_FullInterfaceDescription),
     (char *) &_oc_CORBA_InterfaceDef_FullInterfaceDescription,
     0,
-    sizeof (CORBA::InterfaceDef::FullInterfaceDescription)
+    0
   );
 
 ::CORBA::TypeCode_ptr CORBA::InterfaceDef::_tc_FullInterfaceDescription =
   &_tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_InterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
     13,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = InterfaceDef
   };
 
@@ -5085,7 +5087,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef (
     sizeof (_oc_CORBA_InterfaceDef),
     (char *) &_oc_CORBA_InterfaceDef,
     0,
-    sizeof (CORBA::InterfaceDef)
+    0
   );
 
 namespace CORBA
@@ -5095,52 +5097,52 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDescription:1.0
     21,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = InterfaceDescription
   5, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -5149,94 +5151,94 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   16,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f696e74),
-  ACE_NTOHL (0x65726661),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f696e74), 
+  ACE_NTOHL (0x65726661), 
   ACE_NTOHL (0x63657300),  // name = base_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -5245,21 +5247,21 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
@@ -5272,7 +5274,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDescription (
     sizeof (_oc_CORBA_InterfaceDescription),
     (char *) &_oc_CORBA_InterfaceDescription,
     0,
-    sizeof (CORBA::InterfaceDescription)
+    0
   );
 
 namespace CORBA
@@ -5282,61 +5284,61 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   73,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636541),
-  ACE_NTOHL (0x74747245),
-  ACE_NTOHL (0x7874656e),
-  ACE_NTOHL (0x73696f6e),
-  ACE_NTOHL (0x2f457874),
-  ACE_NTOHL (0x46756c6c),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636541), 
+  ACE_NTOHL (0x74747245), 
+  ACE_NTOHL (0x7874656e), 
+  ACE_NTOHL (0x73696f6e), 
+  ACE_NTOHL (0x2f457874), 
+  ACE_NTOHL (0x46756c6c), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InterfaceAttrExtension/ExtFullInterfaceDescription:1.0
     28,
-  ACE_NTOHL (0x45787446),
-  ACE_NTOHL (0x756c6c49),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x45787446), 
+  ACE_NTOHL (0x756c6c49), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = ExtFullInterfaceDescription
   8, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -5345,94 +5347,94 @@ static const CORBA::Long _oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescri
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572),
-  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e730000),  // name = operations
     CORBA::tk_alias, // typecode kind for typedefs
   2036, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1956, // encapsulation length
@@ -5441,46 +5443,46 @@ static const CORBA::Long _oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescri
       1940, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f70),
-        ACE_NTOHL (0x65726174),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572),
-        ACE_NTOHL (0x6174696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -5489,128 +5491,128 @@ static const CORBA::Long _oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescri
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         7,
-        ACE_NTOHL (0x72657375),
+        ACE_NTOHL (0x72657375), 
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4f70),
-          ACE_NTOHL (0x65726174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572),
-          ACE_NTOHL (0x6174696f),
-          ACE_NTOHL (0x6e4d6f64),
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e),
-          ACE_NTOHL (0x4f524d41),
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f),
-          ACE_NTOHL (0x4e455741),
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+          
         9,
-        ACE_NTOHL (0x636f6e74),
-        ACE_NTOHL (0x65787473),
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f436f),
-          ACE_NTOHL (0x6e746578),
-          ACE_NTOHL (0x74496453),
-          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74),
-          ACE_NTOHL (0x65787449),
-          ACE_NTOHL (0x64536571),
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           164, // encapsulation length
@@ -5619,40 +5621,40 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             148, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f436f),
-              ACE_NTOHL (0x6e746578),
-              ACE_NTOHL (0x74496465),
-              ACE_NTOHL (0x6e746966),
-              ACE_NTOHL (0x6965723a),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74),
-              ACE_NTOHL (0x65787449),
-              ACE_NTOHL (0x64656e74),
-              ACE_NTOHL (0x69666965),
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
 
@@ -5660,28 +5662,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261),
-        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         496, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5061),
-          ACE_NTOHL (0x72446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           416, // encapsulation length
@@ -5690,135 +5692,135 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             400, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5061),
-              ACE_NTOHL (0x72616d65),
-              ACE_NTOHL (0x74657244),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261),
-              ACE_NTOHL (0x6d657465),
-              ACE_NTOHL (0x72446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065),
-              ACE_NTOHL (0x5f646566),
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4944),
-                ACE_NTOHL (0x4c547970),
-                ACE_NTOHL (0x653a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54),
+                ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
               5,
-              ACE_NTOHL (0x6d6f6465),
+              ACE_NTOHL (0x6d6f6465), 
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5061),
-                ACE_NTOHL (0x72616d65),
-                ACE_NTOHL (0x7465724d),
-                ACE_NTOHL (0x6f64653a),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261),
-                ACE_NTOHL (0x6d657465),
-                ACE_NTOHL (0x724d6f64),
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f4f55),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+                
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -5827,46 +5829,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -5875,73 +5877,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -5954,30 +5956,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x61747472),
-  ACE_NTOHL (0x69627574),
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   1860, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x74417474),
-    ACE_NTOHL (0x72446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74417474), 
+    ACE_NTOHL (0x72446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
         22,
-    ACE_NTOHL (0x45787441),
-    ACE_NTOHL (0x74747244),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x45787441), 
+    ACE_NTOHL (0x74747244), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1772, // encapsulation length
@@ -5986,47 +5988,47 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       1756, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         46,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x74417474),
-        ACE_NTOHL (0x72696275),
-        ACE_NTOHL (0x74654465),
-        ACE_NTOHL (0x73637269),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e3a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74417474), 
+        ACE_NTOHL (0x72696275), 
+        ACE_NTOHL (0x74654465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
                 24,
-        ACE_NTOHL (0x45787441),
-        ACE_NTOHL (0x74747269),
-        ACE_NTOHL (0x62757465),
-        ACE_NTOHL (0x44657363),
-        ACE_NTOHL (0x72697074),
+        ACE_NTOHL (0x45787441), 
+        ACE_NTOHL (0x74747269), 
+        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
         ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
         8, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -6035,132 +6037,132 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4174),
-          ACE_NTOHL (0x74726962),
-          ACE_NTOHL (0x7574654d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472),
-          ACE_NTOHL (0x69627574),
-          ACE_NTOHL (0x654d6f64),
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f4e4f52),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f524541),
-          ACE_NTOHL (0x444f4e4c),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+          
         15,
-        ACE_NTOHL (0x6765745f),
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6765745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -6169,46 +6171,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -6217,73 +6219,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -6292,29 +6294,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         15,
-        ACE_NTOHL (0x7075745f),
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x7075745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -6323,46 +6325,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -6371,73 +6373,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -6450,28 +6452,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   16,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f696e74),
-  ACE_NTOHL (0x65726661),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f696e74), 
+  ACE_NTOHL (0x65726661), 
   ACE_NTOHL (0x63657300),  // name = base_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -6480,28 +6482,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -6512,37 +6514,37 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceD
     sizeof (_oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription),
     (char *) &_oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription,
     0,
-    sizeof (CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription)
+    0
   );
 
 ::CORBA::TypeCode_ptr CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription =
   &_tc_TAO_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_InterfaceAttrExtension[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636541),
-  ACE_NTOHL (0x74747245),
-  ACE_NTOHL (0x7874656e),
-  ACE_NTOHL (0x73696f6e),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636541), 
+  ACE_NTOHL (0x74747245), 
+  ACE_NTOHL (0x7874656e), 
+  ACE_NTOHL (0x73696f6e), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InterfaceAttrExtension:1.0
     23,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65417474),
-  ACE_NTOHL (0x72457874),
-  ACE_NTOHL (0x656e7369),
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65417474), 
+  ACE_NTOHL (0x72457874), 
+  ACE_NTOHL (0x656e7369), 
   ACE_NTOHL (0x6f6e0000),  // name = InterfaceAttrExtension
   };
 
@@ -6551,7 +6553,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceAttrExtension (
     sizeof (_oc_CORBA_InterfaceAttrExtension),
     (char *) &_oc_CORBA_InterfaceAttrExtension,
     0,
-    sizeof (CORBA::InterfaceAttrExtension)
+    0
   );
 
 namespace CORBA
@@ -6561,26 +6563,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x74496e74),
-  ACE_NTOHL (0x65726661),
-  ACE_NTOHL (0x63654465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDef:1.0
     16,
-  ACE_NTOHL (0x45787449),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
+  ACE_NTOHL (0x45787449), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
   ACE_NTOHL (0x44656600),  // name = ExtInterfaceDef
   };
 
@@ -6589,7 +6591,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInterfaceDef (
     sizeof (_oc_CORBA_ExtInterfaceDef),
     (char *) &_oc_CORBA_ExtInterfaceDef,
     0,
-    sizeof (CORBA::ExtInterfaceDef)
+    0
   );
 
 namespace CORBA
@@ -6599,29 +6601,29 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_AbstractInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4162),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x6374496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4162), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x6374496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
     21,
-  ACE_NTOHL (0x41627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x41627374), 
+  ACE_NTOHL (0x72616374), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
   };
 
@@ -6630,7 +6632,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_AbstractInterfaceDef (
     sizeof (_oc_CORBA_AbstractInterfaceDef),
     (char *) &_oc_CORBA_AbstractInterfaceDef,
     0,
-    sizeof (CORBA::AbstractInterfaceDef)
+    0
   );
 
 namespace CORBA
@@ -6640,30 +6642,30 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtAbstractInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x74416273),
-  ACE_NTOHL (0x74726163),
-  ACE_NTOHL (0x74496e74),
-  ACE_NTOHL (0x65726661),
-  ACE_NTOHL (0x63654465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x74416273), 
+  ACE_NTOHL (0x74726163), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0
     24,
-  ACE_NTOHL (0x45787441),
-  ACE_NTOHL (0x62737472),
-  ACE_NTOHL (0x61637449),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
+  ACE_NTOHL (0x45787441), 
+  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x61637449), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
   ACE_NTOHL (0x44656600),  // name = ExtAbstractInterfaceDef
   };
 
@@ -6672,7 +6674,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAbstractInterfaceDef (
     sizeof (_oc_CORBA_ExtAbstractInterfaceDef),
     (char *) &_oc_CORBA_ExtAbstractInterfaceDef,
     0,
-    sizeof (CORBA::ExtAbstractInterfaceDef)
+    0
   );
 
 namespace CORBA
@@ -6682,27 +6684,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_LocalInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4c6f),
-  ACE_NTOHL (0x63616c49),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x66616365),
-  ACE_NTOHL (0x4465663a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4c6f), 
+  ACE_NTOHL (0x63616c49), 
+  ACE_NTOHL (0x6e746572), 
+  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
     18,
-  ACE_NTOHL (0x4c6f6361),
-  ACE_NTOHL (0x6c496e74),
-  ACE_NTOHL (0x65726661),
-  ACE_NTOHL (0x63654465),
+  ACE_NTOHL (0x4c6f6361), 
+  ACE_NTOHL (0x6c496e74), 
+  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x63654465), 
   ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
   };
 
@@ -6711,7 +6713,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_LocalInterfaceDef (
     sizeof (_oc_CORBA_LocalInterfaceDef),
     (char *) &_oc_CORBA_LocalInterfaceDef,
     0,
-    sizeof (CORBA::LocalInterfaceDef)
+    0
   );
 
 namespace CORBA
@@ -6721,29 +6723,29 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtLocalInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x744c6f63),
-  ACE_NTOHL (0x616c496e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636544),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x744c6f63), 
+  ACE_NTOHL (0x616c496e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636544), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0
     21,
-  ACE_NTOHL (0x4578744c),
-  ACE_NTOHL (0x6f63616c),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x4578744c), 
+  ACE_NTOHL (0x6f63616c), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = ExtLocalInterfaceDef
   };
 
@@ -6752,7 +6754,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtLocalInterfaceDef (
     sizeof (_oc_CORBA_ExtLocalInterfaceDef),
     (char *) &_oc_CORBA_ExtLocalInterfaceDef,
     0,
-    sizeof (CORBA::ExtLocalInterfaceDef)
+    0
   );
 
 namespace CORBA
@@ -6785,7 +6787,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::extract (
         _tao_any,
         CORBA::_tc_PrimitiveKind,
-        _tao_elem
+        _tao_elem 
       );
 }
 
@@ -6899,7 +6901,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6936,8 +6938,8 @@ CORBA::Boolean operator>>= (
     CORBA::ModuleDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ModuleDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ModuleDescription *&> (
       _tao_elem
     );
 }
@@ -7012,7 +7014,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7049,8 +7051,8 @@ CORBA::Boolean operator>>= (
     CORBA::ConstantDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ConstantDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ConstantDescription *&> (
       _tao_elem
     );
 }
@@ -7675,7 +7677,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7712,8 +7714,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExceptionDefSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExceptionDefSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExceptionDefSeq *&> (
       _tao_elem
     );
 }
@@ -7757,7 +7759,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract (
         _tao_any,
         CORBA::_tc_AttributeMode,
-        _tao_elem
+        _tao_elem 
       );
 }
 
@@ -7816,7 +7818,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7853,8 +7855,8 @@ CORBA::Boolean operator>>= (
     CORBA::AttributeDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::AttributeDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::AttributeDescription *&> (
       _tao_elem
     );
 }
@@ -7874,7 +7876,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7911,8 +7913,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExtAttributeDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExtAttributeDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExtAttributeDescription *&> (
       _tao_elem
     );
 }
@@ -8011,11 +8013,11 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract (
         _tao_any,
         CORBA::_tc_OperationMode,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8052,8 +8054,8 @@ CORBA::Boolean operator>>= (
     CORBA::ParameterDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ParameterDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ParameterDescription *&> (
       _tao_elem
     );
 }
@@ -8073,7 +8075,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8110,8 +8112,8 @@ CORBA::Boolean operator>>= (
     CORBA::ParDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ParDescriptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ParDescriptionSeq *&> (
       _tao_elem
     );
 }
@@ -8131,7 +8133,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8168,8 +8170,8 @@ CORBA::Boolean operator>>= (
     CORBA::ContextIdSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ContextIdSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ContextIdSeq *&> (
       _tao_elem
     );
 }
@@ -8244,7 +8246,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8281,8 +8283,8 @@ CORBA::Boolean operator>>= (
     CORBA::OperationDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::OperationDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::OperationDescription *&> (
       _tao_elem
     );
 }
@@ -8302,7 +8304,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8339,8 +8341,8 @@ CORBA::Boolean operator>>= (
     CORBA::RepositoryIdSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::RepositoryIdSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::RepositoryIdSeq *&> (
       _tao_elem
     );
 }
@@ -8360,7 +8362,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8397,8 +8399,8 @@ CORBA::Boolean operator>>= (
     CORBA::OpDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::OpDescriptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::OpDescriptionSeq *&> (
       _tao_elem
     );
 }
@@ -8418,7 +8420,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8455,8 +8457,8 @@ CORBA::Boolean operator>>= (
     CORBA::AttrDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::AttrDescriptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::AttrDescriptionSeq *&> (
       _tao_elem
     );
 }
@@ -8476,7 +8478,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8513,8 +8515,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExtAttrDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExtAttrDescriptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExtAttrDescriptionSeq *&> (
       _tao_elem
     );
 }
@@ -8589,7 +8591,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8626,8 +8628,8 @@ CORBA::Boolean operator>>= (
     CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::InterfaceDef::FullInterfaceDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceDef::FullInterfaceDescription *&> (
       _tao_elem
     );
 }
@@ -8647,7 +8649,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8684,8 +8686,8 @@ CORBA::Boolean operator>>= (
     CORBA::InterfaceDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::InterfaceDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceDescription *&> (
       _tao_elem
     );
 }
@@ -8760,7 +8762,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8797,8 +8799,8 @@ CORBA::Boolean operator>>= (
     CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&> (
       _tao_elem
     );
 }
@@ -9093,8 +9095,6 @@ operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -9529,5 +9529,4 @@ operator>>= (
         CORBA::InterfaceAttrExtension \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index b1b8ba7ad3e..1093fd76d6b 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IFR_BasicC.h"
@@ -39,6 +39,7 @@
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
+#include "tao/Any_Arg_Traits.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -46,51 +47,15 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_BasicC.i"
+#include "IFR_BasicC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:582
-
-#if !defined (_CORBA_ANY__ARG_TRAITS_CS_)
-#define _CORBA_ANY__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
-          >
-  {
-  };
-
-#endif /* end #if !defined */
 
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_CS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_CS_
@@ -109,23 +74,6 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Container_ptr,
-            CORBA::Container_var,
-            CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_CS_
   
@@ -144,7 +92,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:618
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
@@ -163,7 +111,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -180,64 +128,9 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ValueDef_ptr,
-            CORBA::ValueDef_var,
-            CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ValueDefSeq,
-            CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::AbstractInterfaceDefSeq,
-            CORBA::AbstractInterfaceDefSeq_var,
-            CORBA::AbstractInterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
@@ -256,26 +149,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InitializerSeq,
-            CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_
@@ -294,26 +168,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExtInitializerSeq,
-            CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
@@ -332,7 +187,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
@@ -453,7 +308,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_)
 #define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_
@@ -470,7 +325,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
@@ -489,7 +344,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
@@ -523,7 +378,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:618
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_
@@ -559,7 +414,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
@@ -576,7 +431,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
@@ -595,7 +450,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
@@ -631,7 +486,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:618
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
@@ -718,8 +573,8 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Repository_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Contained>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_search_id (search_id);
+  TAO::Arg_Traits< CORBA::Contained>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_search_id (search_id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -746,7 +601,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
-    CORBA::TypeCode_ptr tc
+    ::CORBA::TypeCode_ptr tc
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -763,8 +618,8 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       CORBA_Repository_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::TypeCode>::in_arg_val _tao_tc (tc);
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::in_arg_val _tao_tc (tc);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -791,7 +646,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::PrimitiveDef_ptr CORBA::Repository::get_primitive (
-    CORBA::PrimitiveKind kind
+    ::CORBA::PrimitiveKind kind
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -808,8 +663,8 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       CORBA_Repository_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::PrimitiveDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::PrimitiveKind>::in_arg_val _tao_kind (kind);
+  TAO::Arg_Traits< CORBA::PrimitiveDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::PrimitiveKind>::in_arg_val _tao_kind (kind);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -836,7 +691,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::StringDef_ptr CORBA::Repository::create_string (
-    CORBA::ULong bound
+    ::CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -853,8 +708,8 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       CORBA_Repository_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::StringDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_bound (bound);
+  TAO::Arg_Traits< CORBA::StringDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -881,7 +736,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::WstringDef_ptr CORBA::Repository::create_wstring (
-    CORBA::ULong bound
+    ::CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -898,8 +753,8 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       CORBA_Repository_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::WstringDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_bound (bound);
+  TAO::Arg_Traits< CORBA::WstringDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -926,8 +781,8 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::SequenceDef_ptr CORBA::Repository::create_sequence (
-    CORBA::ULong bound,
-    CORBA::IDLType_ptr element_type
+    ::CORBA::ULong bound,
+    ::CORBA::IDLType_ptr element_type
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -944,9 +799,9 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       CORBA_Repository_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::SequenceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_bound (bound);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
+  TAO::Arg_Traits< CORBA::SequenceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -974,8 +829,8 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::ArrayDef_ptr CORBA::Repository::create_array (
-    CORBA::ULong length,
-    CORBA::IDLType_ptr element_type
+    ::CORBA::ULong length,
+    ::CORBA::IDLType_ptr element_type
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -992,9 +847,9 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       CORBA_Repository_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ArrayDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_length (length);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
+  TAO::Arg_Traits< CORBA::ArrayDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_length (length);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1022,8 +877,8 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::FixedDef_ptr CORBA::Repository::create_fixed (
-    CORBA::UShort digits,
-    CORBA::Short scale
+    ::CORBA::UShort digits,
+    ::CORBA::Short scale
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1040,9 +895,9 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       CORBA_Repository_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::FixedDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::UShort>::in_arg_val _tao_digits (digits);
-  TAO::Arg_Traits<CORBA::Short>::in_arg_val _tao_scale (scale);
+  TAO::Arg_Traits< CORBA::FixedDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits (digits);
+  TAO::Arg_Traits< ::CORBA::Short>::in_arg_val _tao_scale (scale);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1091,7 +946,7 @@ void
 CORBA::Repository::_tao_any_destructor (void *_tao_void_pointer)
 {
   Repository *_tao_tmp_pointer =
-    ACE_static_cast (Repository *, _tao_void_pointer);
+    static_cast<Repository *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1144,22 +999,22 @@ CORBA::Repository::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Repository:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1255,7 +1110,7 @@ void
 CORBA::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ModuleDef *_tao_tmp_pointer =
-    ACE_static_cast (ModuleDef *, _tao_void_pointer);
+    static_cast<ModuleDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1308,26 +1163,26 @@ CORBA::ModuleDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ModuleDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1360,7 +1215,7 @@ CORBA::ModuleDescription::_tao_any_destructor (
   )
 {
   ModuleDescription *_tao_tmp_pointer =
-    ACE_static_cast (ModuleDescription *, _tao_void_pointer);
+    static_cast<ModuleDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1430,7 +1285,7 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
       CORBA_ConstantDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1472,7 +1327,7 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
       CORBA_ConstantDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1498,7 +1353,7 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ConstantDef::type_def (
-    CORBA::IDLType_ptr type_def
+    ::CORBA::IDLType_ptr type_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1515,8 +1370,8 @@ void CORBA::ConstantDef::type_def (
       CORBA_ConstantDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1557,7 +1412,7 @@ CORBA::Any * CORBA::ConstantDef::value (
       CORBA_ConstantDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Any>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Any>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1583,7 +1438,7 @@ CORBA::Any * CORBA::ConstantDef::value (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ConstantDef::value (
-    const CORBA::Any & value
+    const ::CORBA::Any & value
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1600,8 +1455,8 @@ void CORBA::ConstantDef::value (
       CORBA_ConstantDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::Any>::in_arg_val _tao_value (value);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1647,7 +1502,7 @@ void
 CORBA::ConstantDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstantDef *_tao_tmp_pointer =
-    ACE_static_cast (ConstantDef *, _tao_void_pointer);
+    static_cast<ConstantDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1700,22 +1555,22 @@ CORBA::ConstantDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1748,7 +1603,7 @@ CORBA::ConstantDescription::_tao_any_destructor (
   )
 {
   ConstantDescription *_tao_tmp_pointer =
-    ACE_static_cast (ConstantDescription *, _tao_void_pointer);
+    static_cast<ConstantDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1818,7 +1673,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_StructDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::StructMemberSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1844,7 +1699,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::StructDef::members (
-    const CORBA::StructMemberSeq & members
+    const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1861,8 +1716,8 @@ void CORBA::StructDef::members (
       CORBA_StructDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1909,7 +1764,7 @@ void
 CORBA::StructDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StructDef *_tao_tmp_pointer =
-    ACE_static_cast (StructDef *, _tao_void_pointer);
+    static_cast<StructDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1962,34 +1817,34 @@ CORBA::StructDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/StructDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2079,7 +1934,7 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
       CORBA_UnionDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2121,7 +1976,7 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
       CORBA_UnionDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2147,7 +2002,7 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::UnionDef::discriminator_type_def (
-    CORBA::IDLType_ptr discriminator_type_def
+    ::CORBA::IDLType_ptr discriminator_type_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2164,8 +2019,8 @@ void CORBA::UnionDef::discriminator_type_def (
       CORBA_UnionDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_discriminator_type_def (discriminator_type_def);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type_def (discriminator_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2206,7 +2061,7 @@ void CORBA::UnionDef::discriminator_type_def (
       CORBA_UnionDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::UnionMemberSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::UnionMemberSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2232,7 +2087,7 @@ void CORBA::UnionDef::discriminator_type_def (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::UnionDef::members (
-    const CORBA::UnionMemberSeq & members
+    const ::CORBA::UnionMemberSeq & members
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2249,8 +2104,8 @@ void CORBA::UnionDef::members (
       CORBA_UnionDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2297,7 +2152,7 @@ void
 CORBA::UnionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnionDef *_tao_tmp_pointer =
-    ACE_static_cast (UnionDef *, _tao_void_pointer);
+    static_cast<UnionDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2350,34 +2205,34 @@ CORBA::UnionDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/UnionDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2467,7 +2322,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_EnumDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::EnumMemberSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::EnumMemberSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2493,7 +2348,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::EnumDef::members (
-    const CORBA::EnumMemberSeq & members
+    const ::CORBA::EnumMemberSeq & members
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2510,8 +2365,8 @@ void CORBA::EnumDef::members (
       CORBA_EnumDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2557,7 +2412,7 @@ void
 CORBA::EnumDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EnumDef *_tao_tmp_pointer =
-    ACE_static_cast (EnumDef *, _tao_void_pointer);
+    static_cast<EnumDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2610,30 +2465,30 @@ CORBA::EnumDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/EnumDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2723,7 +2578,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_AliasDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2749,7 +2604,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::AliasDef::original_type_def (
-    CORBA::IDLType_ptr original_type_def
+    ::CORBA::IDLType_ptr original_type_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2766,8 +2621,8 @@ void CORBA::AliasDef::original_type_def (
       CORBA_AliasDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2813,7 +2668,7 @@ void
 CORBA::AliasDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AliasDef *_tao_tmp_pointer =
-    ACE_static_cast (AliasDef *, _tao_void_pointer);
+    static_cast<AliasDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2866,30 +2721,30 @@ CORBA::AliasDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AliasDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2984,7 +2839,7 @@ void
 CORBA::NativeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   NativeDef *_tao_tmp_pointer =
-    ACE_static_cast (NativeDef *, _tao_void_pointer);
+    static_cast<NativeDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3037,30 +2892,30 @@ CORBA::NativeDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/NativeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3150,7 +3005,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_PrimitiveDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::PrimitiveKind>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::PrimitiveKind>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3197,7 +3052,7 @@ void
 CORBA::PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   PrimitiveDef *_tao_tmp_pointer =
-    ACE_static_cast (PrimitiveDef *, _tao_void_pointer);
+    static_cast<PrimitiveDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3250,22 +3105,22 @@ CORBA::PrimitiveDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/PrimitiveDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3355,7 +3210,7 @@ CORBA::ULong CORBA::StringDef::bound (
       CORBA_StringDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ULong>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3381,7 +3236,7 @@ CORBA::ULong CORBA::StringDef::bound (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::StringDef::bound (
-    CORBA::ULong bound
+    ::CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3398,8 +3253,8 @@ void CORBA::StringDef::bound (
       CORBA_StringDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_bound (bound);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3445,7 +3300,7 @@ void
 CORBA::StringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StringDef *_tao_tmp_pointer =
-    ACE_static_cast (StringDef *, _tao_void_pointer);
+    static_cast<StringDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3498,22 +3353,22 @@ CORBA::StringDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/StringDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3603,7 +3458,7 @@ CORBA::ULong CORBA::WstringDef::bound (
       CORBA_WstringDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ULong>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3629,7 +3484,7 @@ CORBA::ULong CORBA::WstringDef::bound (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::WstringDef::bound (
-    CORBA::ULong bound
+    ::CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3646,8 +3501,8 @@ void CORBA::WstringDef::bound (
       CORBA_WstringDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_bound (bound);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3693,7 +3548,7 @@ void
 CORBA::WstringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   WstringDef *_tao_tmp_pointer =
-    ACE_static_cast (WstringDef *, _tao_void_pointer);
+    static_cast<WstringDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3746,22 +3601,22 @@ CORBA::WstringDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/WstringDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3851,7 +3706,7 @@ CORBA::ULong CORBA::SequenceDef::bound (
       CORBA_SequenceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ULong>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3877,7 +3732,7 @@ CORBA::ULong CORBA::SequenceDef::bound (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::SequenceDef::bound (
-    CORBA::ULong bound
+    ::CORBA::ULong bound
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3894,8 +3749,8 @@ void CORBA::SequenceDef::bound (
       CORBA_SequenceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_bound (bound);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3936,7 +3791,7 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
       CORBA_SequenceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3978,7 +3833,7 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
       CORBA_SequenceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4004,7 +3859,7 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::SequenceDef::element_type_def (
-    CORBA::IDLType_ptr element_type_def
+    ::CORBA::IDLType_ptr element_type_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4021,8 +3876,8 @@ void CORBA::SequenceDef::element_type_def (
       CORBA_SequenceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4068,7 +3923,7 @@ void
 CORBA::SequenceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   SequenceDef *_tao_tmp_pointer =
-    ACE_static_cast (SequenceDef *, _tao_void_pointer);
+    static_cast<SequenceDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -4121,22 +3976,22 @@ CORBA::SequenceDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -4226,7 +4081,7 @@ CORBA::ULong CORBA::ArrayDef::length (
       CORBA_ArrayDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ULong>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4252,7 +4107,7 @@ CORBA::ULong CORBA::ArrayDef::length (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ArrayDef::length (
-    CORBA::ULong length
+    ::CORBA::ULong length
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4269,8 +4124,8 @@ void CORBA::ArrayDef::length (
       CORBA_ArrayDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_length (length);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_length (length);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4311,7 +4166,7 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
       CORBA_ArrayDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4353,7 +4208,7 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
       CORBA_ArrayDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4379,7 +4234,7 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ArrayDef::element_type_def (
-    CORBA::IDLType_ptr element_type_def
+    ::CORBA::IDLType_ptr element_type_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4396,8 +4251,8 @@ void CORBA::ArrayDef::element_type_def (
       CORBA_ArrayDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4443,7 +4298,7 @@ void
 CORBA::ArrayDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ArrayDef *_tao_tmp_pointer =
-    ACE_static_cast (ArrayDef *, _tao_void_pointer);
+    static_cast<ArrayDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -4496,22 +4351,22 @@ CORBA::ArrayDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -4601,7 +4456,7 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
       CORBA_ExceptionDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4643,7 +4498,7 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
       CORBA_ExceptionDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::StructMemberSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4669,7 +4524,7 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ExceptionDef::members (
-    const CORBA::StructMemberSeq & members
+    const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4686,8 +4541,8 @@ void CORBA::ExceptionDef::members (
       CORBA_ExceptionDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4734,7 +4589,7 @@ void
 CORBA::ExceptionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionDef *_tao_tmp_pointer =
-    ACE_static_cast (ExceptionDef *, _tao_void_pointer);
+    static_cast<ExceptionDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -4787,26 +4642,26 @@ CORBA::ExceptionDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -4880,7 +4735,7 @@ void CORBA::ExceptionDefSeq::_tao_any_destructor (
   )
 {
   ExceptionDefSeq * _tao_tmp_pointer =
-    ACE_static_cast (ExceptionDefSeq *, _tao_void_pointer);
+    static_cast<ExceptionDefSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -4952,7 +4807,7 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
       CORBA_AttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4994,7 +4849,7 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
       CORBA_AttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5020,7 +4875,7 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::AttributeDef::type_def (
-    CORBA::IDLType_ptr type_def
+    ::CORBA::IDLType_ptr type_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -5037,8 +4892,8 @@ void CORBA::AttributeDef::type_def (
       CORBA_AttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5079,7 +4934,7 @@ void CORBA::AttributeDef::type_def (
       CORBA_AttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::AttributeMode>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::AttributeMode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5105,7 +4960,7 @@ void CORBA::AttributeDef::type_def (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::AttributeDef::mode (
-    CORBA::AttributeMode mode
+    ::CORBA::AttributeMode mode
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -5122,8 +4977,8 @@ void CORBA::AttributeDef::mode (
       CORBA_AttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5169,7 +5024,7 @@ void
 CORBA::AttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AttributeDef *_tao_tmp_pointer =
-    ACE_static_cast (AttributeDef *, _tao_void_pointer);
+    static_cast<AttributeDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -5222,22 +5077,22 @@ CORBA::AttributeDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -5270,7 +5125,7 @@ CORBA::AttributeDescription::_tao_any_destructor (
   )
 {
   AttributeDescription *_tao_tmp_pointer =
-    ACE_static_cast (AttributeDescription *, _tao_void_pointer);
+    static_cast<AttributeDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -5283,7 +5138,7 @@ CORBA::ExtAttributeDescription::_tao_any_destructor (
   )
 {
   ExtAttributeDescription *_tao_tmp_pointer =
-    ACE_static_cast (ExtAttributeDescription *, _tao_void_pointer);
+    static_cast<ExtAttributeDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -5353,7 +5208,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ExtAttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5379,7 +5234,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ExtAttributeDef::get_exceptions (
-    const CORBA::ExcDescriptionSeq & get_exceptions
+    const ::CORBA::ExcDescriptionSeq & get_exceptions
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -5396,8 +5251,8 @@ void CORBA::ExtAttributeDef::get_exceptions (
       CORBA_ExtAttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5438,7 +5293,7 @@ void CORBA::ExtAttributeDef::get_exceptions (
       CORBA_ExtAttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5464,7 +5319,7 @@ void CORBA::ExtAttributeDef::get_exceptions (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ExtAttributeDef::set_exceptions (
-    const CORBA::ExcDescriptionSeq & set_exceptions
+    const ::CORBA::ExcDescriptionSeq & set_exceptions
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -5481,8 +5336,8 @@ void CORBA::ExtAttributeDef::set_exceptions (
       CORBA_ExtAttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5523,7 +5378,7 @@ void CORBA::ExtAttributeDef::set_exceptions (
       CORBA_ExtAttributeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExtAttributeDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExtAttributeDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5570,7 +5425,7 @@ void
 CORBA::ExtAttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtAttributeDef *_tao_tmp_pointer =
-    ACE_static_cast (ExtAttributeDef *, _tao_void_pointer);
+    static_cast<ExtAttributeDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -5623,26 +5478,26 @@ CORBA::ExtAttributeDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -5675,7 +5530,7 @@ CORBA::ParameterDescription::_tao_any_destructor (
   )
 {
   ParameterDescription *_tao_tmp_pointer =
-    ACE_static_cast (ParameterDescription *, _tao_void_pointer);
+    static_cast<ParameterDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -5726,7 +5581,7 @@ void CORBA::ParDescriptionSeq::_tao_any_destructor (
   )
 {
   ParDescriptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (ParDescriptionSeq *, _tao_void_pointer);
+    static_cast<ParDescriptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -5773,7 +5628,7 @@ void CORBA::ContextIdSeq::_tao_any_destructor (
   )
 {
   ContextIdSeq * _tao_tmp_pointer =
-    ACE_static_cast (ContextIdSeq *, _tao_void_pointer);
+    static_cast<ContextIdSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -5845,7 +5700,7 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5887,7 +5742,7 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5913,7 +5768,7 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::OperationDef::result_def (
-    CORBA::IDLType_ptr result_def
+    ::CORBA::IDLType_ptr result_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -5930,8 +5785,8 @@ void CORBA::OperationDef::result_def (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_result_def (result_def);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result_def (result_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5972,7 +5827,7 @@ void CORBA::OperationDef::result_def (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ParDescriptionSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5998,7 +5853,7 @@ void CORBA::OperationDef::result_def (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::OperationDef::params (
-    const CORBA::ParDescriptionSeq & params
+    const ::CORBA::ParDescriptionSeq & params
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6015,8 +5870,8 @@ void CORBA::OperationDef::params (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6057,7 +5912,7 @@ void CORBA::OperationDef::params (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::OperationMode>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::OperationMode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6083,7 +5938,7 @@ void CORBA::OperationDef::params (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::OperationDef::mode (
-    CORBA::OperationMode mode
+    ::CORBA::OperationMode mode
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6100,8 +5955,8 @@ void CORBA::OperationDef::mode (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::OperationMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6142,7 +5997,7 @@ void CORBA::OperationDef::mode (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ContextIdSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ContextIdSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6168,7 +6023,7 @@ void CORBA::OperationDef::mode (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::OperationDef::contexts (
-    const CORBA::ContextIdSeq & contexts
+    const ::CORBA::ContextIdSeq & contexts
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6185,8 +6040,8 @@ void CORBA::OperationDef::contexts (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6227,7 +6082,7 @@ void CORBA::OperationDef::contexts (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6253,7 +6108,7 @@ void CORBA::OperationDef::contexts (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::OperationDef::exceptions (
-    const CORBA::ExceptionDefSeq & exceptions
+    const ::CORBA::ExceptionDefSeq & exceptions
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6270,8 +6125,8 @@ void CORBA::OperationDef::exceptions (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6317,7 +6172,7 @@ void
 CORBA::OperationDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   OperationDef *_tao_tmp_pointer =
-    ACE_static_cast (OperationDef *, _tao_void_pointer);
+    static_cast<OperationDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -6370,22 +6225,22 @@ CORBA::OperationDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/OperationDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -6418,7 +6273,7 @@ CORBA::OperationDescription::_tao_any_destructor (
   )
 {
   OperationDescription *_tao_tmp_pointer =
-    ACE_static_cast (OperationDescription *, _tao_void_pointer);
+    static_cast<OperationDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -6463,7 +6318,7 @@ void CORBA::RepositoryIdSeq::_tao_any_destructor (
   )
 {
   RepositoryIdSeq * _tao_tmp_pointer =
-    ACE_static_cast (RepositoryIdSeq *, _tao_void_pointer);
+    static_cast<RepositoryIdSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -6516,7 +6371,7 @@ void CORBA::OpDescriptionSeq::_tao_any_destructor (
   )
 {
   OpDescriptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (OpDescriptionSeq *, _tao_void_pointer);
+    static_cast<OpDescriptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -6569,7 +6424,7 @@ void CORBA::AttrDescriptionSeq::_tao_any_destructor (
   )
 {
   AttrDescriptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (AttrDescriptionSeq *, _tao_void_pointer);
+    static_cast<AttrDescriptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -6622,7 +6477,7 @@ void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor (
   )
 {
   ExtAttrDescriptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (ExtAttrDescriptionSeq *, _tao_void_pointer);
+    static_cast<ExtAttrDescriptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -6694,7 +6549,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6720,7 +6575,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::InterfaceDef::base_interfaces (
-    const CORBA::InterfaceDefSeq & base_interfaces
+    const ::CORBA::InterfaceDefSeq & base_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6737,8 +6592,8 @@ void CORBA::InterfaceDef::base_interfaces (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6780,8 +6635,8 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_interface_id (interface_id);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_interface_id (interface_id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6813,7 +6668,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
   )
 {
   FullInterfaceDescription *_tao_tmp_pointer =
-    ACE_static_cast (FullInterfaceDescription *, _tao_void_pointer);
+    static_cast<FullInterfaceDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -6837,7 +6692,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDef::FullInterfaceDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6866,8 +6721,8 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
+    ::CORBA::IDLType_ptr type,
+    ::CORBA::AttributeMode mode
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6884,12 +6739,12 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::AttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< CORBA::AttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6923,11 +6778,11 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
+    ::CORBA::IDLType_ptr result,
+    ::CORBA::OperationMode mode,
+    const ::CORBA::ParDescriptionSeq & params,
+    const ::CORBA::ExceptionDefSeq & exceptions,
+    const ::CORBA::ContextIdSeq & contexts
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -6944,15 +6799,15 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::OperationDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_result (result);
-  TAO::Arg_Traits<CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  TAO::Arg_Traits<CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
+  TAO::Arg_Traits< CORBA::OperationDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result (result);
+  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -7009,7 +6864,7 @@ void
 CORBA::InterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   InterfaceDef *_tao_tmp_pointer =
-    ACE_static_cast (InterfaceDef *, _tao_void_pointer);
+    static_cast<InterfaceDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -7062,30 +6917,30 @@ CORBA::InterfaceDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -7118,7 +6973,7 @@ CORBA::InterfaceDescription::_tao_any_destructor (
   )
 {
   InterfaceDescription *_tao_tmp_pointer =
-    ACE_static_cast (InterfaceDescription *, _tao_void_pointer);
+    static_cast<InterfaceDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -7177,7 +7032,7 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
   )
 {
   ExtFullInterfaceDescription *_tao_tmp_pointer =
-    ACE_static_cast (ExtFullInterfaceDescription *, _tao_void_pointer);
+    static_cast<ExtFullInterfaceDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -7201,7 +7056,7 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
       CORBA_InterfaceAttrExtension_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -7230,10 +7085,10 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
+    ::CORBA::IDLType_ptr type,
+    ::CORBA::AttributeMode mode,
+    const ::CORBA::ExceptionDefSeq & get_exceptions,
+    const ::CORBA::ExceptionDefSeq & set_exceptions
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -7250,14 +7105,14 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
       CORBA_InterfaceAttrExtension_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExtAttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
+  TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -7309,7 +7164,7 @@ void
 CORBA::InterfaceAttrExtension::_tao_any_destructor (void *_tao_void_pointer)
 {
   InterfaceAttrExtension *_tao_tmp_pointer =
-    ACE_static_cast (InterfaceAttrExtension *, _tao_void_pointer);
+    static_cast<InterfaceAttrExtension *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -7362,14 +7217,14 @@ CORBA::InterfaceAttrExtension::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -7465,7 +7320,7 @@ void
 CORBA::ExtInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtInterfaceDef *_tao_tmp_pointer =
-    ACE_static_cast (ExtInterfaceDef *, _tao_void_pointer);
+    static_cast<ExtInterfaceDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -7518,38 +7373,38 @@ CORBA::ExtInterfaceDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -7644,7 +7499,7 @@ void
 CORBA::AbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AbstractInterfaceDef *_tao_tmp_pointer =
-    ACE_static_cast (AbstractInterfaceDef *, _tao_void_pointer);
+    static_cast<AbstractInterfaceDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -7697,34 +7552,34 @@ CORBA::AbstractInterfaceDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -7820,7 +7675,7 @@ void
 CORBA::ExtAbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtAbstractInterfaceDef *_tao_tmp_pointer =
-    ACE_static_cast (ExtAbstractInterfaceDef *, _tao_void_pointer);
+    static_cast<ExtAbstractInterfaceDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -7873,42 +7728,42 @@ CORBA::ExtAbstractInterfaceDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -8003,7 +7858,7 @@ void
 CORBA::LocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   LocalInterfaceDef *_tao_tmp_pointer =
-    ACE_static_cast (LocalInterfaceDef *, _tao_void_pointer);
+    static_cast<LocalInterfaceDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -8056,34 +7911,34 @@ CORBA::LocalInterfaceDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -8179,7 +8034,7 @@ void
 CORBA::ExtLocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtLocalInterfaceDef *_tao_tmp_pointer =
-    ACE_static_cast (ExtLocalInterfaceDef *, _tao_void_pointer);
+    static_cast<ExtLocalInterfaceDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -8232,42 +8087,42 @@ CORBA::ExtLocalInterfaceDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -8307,7 +8162,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::PrimitiveKind &_tao_enumva
   
   if (_tao_result == 1)
     {
-      _tao_enumval = ACE_static_cast (CORBA::PrimitiveKind, _tao_temp);
+      _tao_enumval = static_cast<CORBA::PrimitiveKind> (_tao_temp);
     }
   
   return _tao_result;
@@ -8332,9 +8187,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::Repository RHS_SCOPED_NAME;
@@ -8368,9 +8223,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ModuleDef RHS_SCOPED_NAME;
@@ -8431,9 +8286,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ConstantDef RHS_SCOPED_NAME;
@@ -8498,9 +8353,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::StructDef RHS_SCOPED_NAME;
@@ -8534,9 +8389,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::UnionDef RHS_SCOPED_NAME;
@@ -8570,9 +8425,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::EnumDef RHS_SCOPED_NAME;
@@ -8606,9 +8461,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::AliasDef RHS_SCOPED_NAME;
@@ -8642,9 +8497,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::NativeDef RHS_SCOPED_NAME;
@@ -8678,9 +8533,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::PrimitiveDef RHS_SCOPED_NAME;
@@ -8714,9 +8569,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::StringDef RHS_SCOPED_NAME;
@@ -8750,9 +8605,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::WstringDef RHS_SCOPED_NAME;
@@ -8786,9 +8641,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::SequenceDef RHS_SCOPED_NAME;
@@ -8822,9 +8677,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ArrayDef RHS_SCOPED_NAME;
@@ -8858,9 +8713,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ExceptionDef RHS_SCOPED_NAME;
@@ -8886,23 +8741,25 @@ CORBA::Boolean operator<< (
     const CORBA::ExceptionDefSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            _tao_sequence[i].in ()->marshal (strm);
+            TAO::Objref_Traits<CORBA::ExceptionDef>::marshal (
+                _tao_sequence[i].in (), strm
+              );
         }
       
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -8919,7 +8776,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -8928,11 +8785,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -8943,7 +8800,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_CPP_ */
@@ -8964,7 +8821,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::AttributeMode &_tao_enumva
   
   if (_tao_result == 1)
     {
-      _tao_enumval = ACE_static_cast (CORBA::AttributeMode, _tao_temp);
+      _tao_enumval = static_cast<CORBA::AttributeMode> (_tao_temp);
     }
   
   return _tao_result;
@@ -8989,9 +8846,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::AttributeDef RHS_SCOPED_NAME;
@@ -9091,9 +8948,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ExtAttributeDef RHS_SCOPED_NAME;
@@ -9124,7 +8981,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationMode &_tao_enumva
   
   if (_tao_result == 1)
     {
-      _tao_enumval = ACE_static_cast (CORBA::OperationMode, _tao_temp);
+      _tao_enumval = static_cast<CORBA::OperationMode> (_tao_temp);
     }
   
   return _tao_result;
@@ -9171,12 +9028,12 @@ CORBA::Boolean operator<< (
     const CORBA::ParDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9186,7 +9043,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -9203,7 +9060,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -9212,11 +9069,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9227,7 +9084,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_CPP_ */
@@ -9243,12 +9100,12 @@ CORBA::Boolean operator<< (
     const CORBA::ContextIdSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9258,7 +9115,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -9275,7 +9132,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -9284,11 +9141,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9300,7 +9157,7 @@ CORBA::Boolean operator>> (
   
   }
 
-return 0;
+return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_CPP_ */
@@ -9324,9 +9181,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::OperationDef RHS_SCOPED_NAME;
@@ -9389,12 +9246,12 @@ CORBA::Boolean operator<< (
     const CORBA::RepositoryIdSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9404,7 +9261,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -9421,7 +9278,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -9430,11 +9287,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9446,7 +9303,7 @@ CORBA::Boolean operator>> (
   
   }
 
-return 0;
+return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_CPP_ */
@@ -9462,12 +9319,12 @@ CORBA::Boolean operator<< (
     const CORBA::OpDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9477,7 +9334,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -9494,7 +9351,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -9503,11 +9360,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9518,7 +9375,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_CPP_ */
@@ -9534,12 +9391,12 @@ CORBA::Boolean operator<< (
     const CORBA::AttrDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9549,7 +9406,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -9566,7 +9423,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -9575,11 +9432,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9590,7 +9447,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_CPP_ */
@@ -9606,12 +9463,12 @@ CORBA::Boolean operator<< (
     const CORBA::ExtAttrDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9621,7 +9478,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -9638,7 +9495,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -9647,11 +9504,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -9662,7 +9519,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_CPP_ */
@@ -9721,9 +9578,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::InterfaceDef RHS_SCOPED_NAME;
@@ -9821,9 +9678,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::InterfaceAttrExtension RHS_SCOPED_NAME;
@@ -9857,9 +9714,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ExtInterfaceDef RHS_SCOPED_NAME;
@@ -9893,9 +9750,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::AbstractInterfaceDef RHS_SCOPED_NAME;
@@ -9929,9 +9786,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ExtAbstractInterfaceDef RHS_SCOPED_NAME;
@@ -9965,9 +9822,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::LocalInterfaceDef RHS_SCOPED_NAME;
@@ -10001,9 +9858,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ExtLocalInterfaceDef RHS_SCOPED_NAME;
@@ -10019,19 +9876,10 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::DefinitionKind>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::DefinitionKind>;
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_TMPLINST_CS_
 
@@ -10122,24 +9970,6 @@ CORBA::Boolean operator>> (
         CORBA::Repository
       >;
 
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_
-
-  template class
-    TAO::Arg_Traits<
-        CORBA::Container
-      >;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::Container_ptr,
-        CORBA::Container_var,
-        CORBA::Container_out,
-        TAO::Objref_Traits<CORBA::Container>
-      >;
-
-#endif /* end #if !defined */
-
   template class
     TAO::Objref_Traits<
         CORBA::ModuleDef
@@ -10552,38 +10382,6 @@ CORBA::Boolean operator>> (
         CORBA::NativeDef
       >;
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_
-
-  template class
-    TAO::Arg_Traits<
-        CORBA::ValueDef
-      >;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::ValueDef_ptr,
-        CORBA::ValueDef_var,
-        CORBA::ValueDef_out,
-        TAO::Objref_Traits<CORBA::ValueDef>
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::ValueDefSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::ValueDefSeq,
-        CORBA::ValueDefSeq_var,
-        CORBA::ValueDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
   template class
     TAO::Objref_Traits<
         CORBA::AbstractInterfaceDef
@@ -10604,20 +10402,6 @@ CORBA::Boolean operator>> (
         CORBA::AbstractInterfaceDef
       >;
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::AbstractInterfaceDefSeq,
-        CORBA::AbstractInterfaceDefSeq_var,
-        CORBA::AbstractInterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
   template class
     TAO::Objref_Traits<
         CORBA::LocalInterfaceDef
@@ -10715,20 +10499,6 @@ CORBA::Boolean operator>> (
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
-  template class TAO::Arg_Traits<CORBA::InitializerSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::InitializerSeq,
-        CORBA::InitializerSeq_var,
-        CORBA::InitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
   template class TAO::Arg_Traits<CORBA::ExcDescriptionSeq>;
 
   template class
@@ -10743,20 +10513,6 @@ CORBA::Boolean operator>> (
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
-  template class TAO::Arg_Traits<CORBA::ExtInitializerSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::ExtInitializerSeq,
-        CORBA::ExtInitializerSeq_var,
-        CORBA::ExtInitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
   template class TAO::Arg_Traits<CORBA::UnionMemberSeq>;
 
   template class
@@ -11535,15 +11291,6 @@ CORBA::Boolean operator>> (
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::DefinitionKind>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::DefinitionKind>
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_TMPLINST_CS_
 
@@ -11563,16 +11310,58 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::Contained_ptr, \
+        CORBA::Contained_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::PrimitiveDef_ptr, \
+        CORBA::PrimitiveDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Basic_Argument_T< \
         CORBA::PrimitiveKind \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::StringDef_ptr, \
+        CORBA::StringDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::WstringDef_ptr, \
+        CORBA::WstringDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::SequenceDef_ptr, \
+        CORBA::SequenceDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::IDLType_ptr \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ArrayDef_ptr, \
+        CORBA::ArrayDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::FixedDef_ptr, \
+        CORBA::FixedDef_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::Repository \
       >
@@ -11592,24 +11381,6 @@ CORBA::Boolean operator>> (
         CORBA::Repository \
       >
 
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate \
-    TAO::Arg_Traits< \
-        CORBA::Container \
-      >
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::Container_ptr, \
-        CORBA::Container_var, \
-        CORBA::Container_out, \
-        TAO::Objref_Traits<CORBA::Container> \
-      >
-
-#endif /* end #if !defined */
-
 # pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::ModuleDef \
@@ -11631,6 +11402,12 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::IDLType_ptr, \
+        CORBA::IDLType_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::ConstantDef \
       >
@@ -11669,6 +11446,12 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::StructMemberSeq, \
+        CORBA::StructMemberSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::StructMemberSeq \
       >
@@ -11694,6 +11477,12 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::UnionMemberSeq, \
+        CORBA::UnionMemberSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::UnionMemberSeq \
       >
@@ -11719,6 +11508,12 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::EnumMemberSeq, \
+        CORBA::EnumMemberSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::EnumMemberSeq \
       >
@@ -11764,6 +11559,12 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::InterfaceDefSeq, \
+        CORBA::InterfaceDefSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::InterfaceDefSeq \
       >
@@ -11876,11 +11677,29 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::InterfaceDef::FullInterfaceDescription, \
+        CORBA::InterfaceDef::FullInterfaceDescription_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::AttributeDef_ptr, \
+        CORBA::AttributeDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Basic_Argument_T< \
         CORBA::AttributeMode \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::OperationDef_ptr, \
+        CORBA::OperationDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Basic_Argument_T< \
         CORBA::OperationMode \
       >
@@ -11974,38 +11793,6 @@ CORBA::Boolean operator>> (
         CORBA::NativeDef \
       >
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate \
-    TAO::Arg_Traits< \
-        CORBA::ValueDef \
-      >
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::ValueDef_ptr, \
-        CORBA::ValueDef_var, \
-        CORBA::ValueDef_out, \
-        TAO::Objref_Traits<CORBA::ValueDef> \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::ValueDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::ValueDefSeq, \
-        CORBA::ValueDefSeq_var, \
-        CORBA::ValueDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
 # pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::AbstractInterfaceDef \
@@ -12026,20 +11813,6 @@ CORBA::Boolean operator>> (
         CORBA::AbstractInterfaceDef \
       >
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::AbstractInterfaceDefSeq, \
-        CORBA::AbstractInterfaceDefSeq_var, \
-        CORBA::AbstractInterfaceDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
 # pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::LocalInterfaceDef \
@@ -12137,20 +11910,6 @@ CORBA::Boolean operator>> (
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
-# pragma instantiate TAO::Arg_Traits<CORBA::InitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::InitializerSeq, \
-        CORBA::InitializerSeq_var, \
-        CORBA::InitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
 # pragma instantiate TAO::Arg_Traits<CORBA::ExcDescriptionSeq>
 
 # pragma instantiate \
@@ -12165,20 +11924,6 @@ CORBA::Boolean operator>> (
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
-# pragma instantiate TAO::Arg_Traits<CORBA::ExtInitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::ExtInitializerSeq, \
-        CORBA::ExtInitializerSeq_var, \
-        CORBA::ExtInitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
 # pragma instantiate TAO::Arg_Traits<CORBA::UnionMemberSeq>
 
 # pragma instantiate \
@@ -12223,6 +11968,11 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Basic_Argument_T< \
+        CORBA::PrimitiveKind \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::PrimitiveDef \
       >
@@ -12534,6 +12284,11 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Basic_Argument_T< \
+        CORBA::AttributeMode \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::AttributeDef \
       >
@@ -12618,11 +12373,23 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ExcDescriptionSeq, \
+        CORBA::ExcDescriptionSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::ExcDescriptionSeq \
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ExtAttributeDescription, \
+        CORBA::ExtAttributeDescription_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::ExtAttributeDef \
       >
@@ -12762,6 +12529,29 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ParDescriptionSeq, \
+        CORBA::ParDescriptionSeq_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Basic_Argument_T< \
+        CORBA::OperationMode \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ContextIdSeq, \
+        CORBA::ContextIdSeq_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ExceptionDefSeq, \
+        CORBA::ExceptionDefSeq_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::OperationDef \
       >
@@ -12873,6 +12663,18 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, \
+        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ExtAttributeDef_ptr, \
+        CORBA::ExtAttributeDef_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::InterfaceAttrExtension \
       >
@@ -12893,4 +12695,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 31319ba79cc..dc162fad223 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -26,31 +26,34 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_IFR_BASICC_H_
-#define _TAO_IDL_ORIG_IFR_BASICC_H_
+#ifndef _TAO_IDL_IFR_BASICC_H_
+#define _TAO_IDL_IFR_BASICC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ifr_client_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
 #include "tao/Any.h"
-#include "tao/ParameterMode.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
 
+#include "tao/ParameterModeC.h"
 #include "IFR_BaseC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -66,9 +69,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -77,7 +78,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -94,7 +95,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_PRIMITIVEDEF__VAR_OUT_CH_)
 #define _CORBA_PRIMITIVEDEF__VAR_OUT_CH_
@@ -117,7 +118,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_STRINGDEF__VAR_OUT_CH_)
 #define _CORBA_STRINGDEF__VAR_OUT_CH_
@@ -140,7 +141,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_SEQUENCEDEF__VAR_OUT_CH_)
 #define _CORBA_SEQUENCEDEF__VAR_OUT_CH_
@@ -163,7 +164,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ARRAYDEF__VAR_OUT_CH_)
 #define _CORBA_ARRAYDEF__VAR_OUT_CH_
@@ -186,7 +187,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_WSTRINGDEF__VAR_OUT_CH_)
 #define _CORBA_WSTRINGDEF__VAR_OUT_CH_
@@ -209,7 +210,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_FIXEDDEF__VAR_OUT_CH_)
 #define _CORBA_FIXEDDEF__VAR_OUT_CH_
@@ -268,7 +269,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrimitiveKind;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_)
 #define _CORBA_REPOSITORY__VAR_OUT_CH_
@@ -297,7 +298,7 @@ namespace CORBA
 #define _CORBA_REPOSITORY_CH_
   
   class TAO_IFR_Client_Export Repository
-    : public virtual CORBA::Container
+    : public virtual ::CORBA::Container
   {
   public:
     friend class TAO::Narrow_Utils<Repository>;
@@ -319,7 +320,7 @@ namespace CORBA
     
     static Repository_ptr _nil (void)
     {
-      return (Repository_ptr)0;
+      return static_cast<Repository_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -339,7 +340,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
-        CORBA::TypeCode_ptr tc
+        ::CORBA::TypeCode_ptr tc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -350,7 +351,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind
+        ::CORBA::PrimitiveKind kind
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -361,7 +362,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::StringDef_ptr create_string (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -372,7 +373,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::WstringDef_ptr create_wstring (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -383,8 +384,8 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::SequenceDef_ptr create_sequence (
-        CORBA::ULong bound,
-        CORBA::IDLType_ptr element_type
+        ::CORBA::ULong bound,
+        ::CORBA::IDLType_ptr element_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -395,8 +396,8 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::ArrayDef_ptr create_array (
-        CORBA::ULong length,
-        CORBA::IDLType_ptr element_type
+        ::CORBA::ULong length,
+        ::CORBA::IDLType_ptr element_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -407,8 +408,8 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::FixedDef_ptr create_fixed (
-        CORBA::UShort digits,
-        CORBA::Short scale
+        ::CORBA::UShort digits,
+        ::CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -467,7 +468,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Repository;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_)
 #define _CORBA_MODULEDEF__VAR_OUT_CH_
@@ -496,8 +497,8 @@ namespace CORBA
 #define _CORBA_MODULEDEF_CH_
   
   class TAO_IFR_Client_Export ModuleDef
-    : public virtual CORBA::Container,
-      public virtual CORBA::Contained
+    : public virtual ::CORBA::Container,
+      public virtual ::CORBA::Contained
   {
   public:
     friend class TAO::Narrow_Utils<ModuleDef>;
@@ -519,7 +520,7 @@ namespace CORBA
     
     static ModuleDef_ptr _nil (void)
     {
-      return (ModuleDef_ptr)0;
+      return static_cast<ModuleDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -613,7 +614,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ModuleDescription;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_)
 #define _CORBA_CONSTANTDEF__VAR_OUT_CH_
@@ -642,7 +643,7 @@ namespace CORBA
 #define _CORBA_CONSTANTDEF_CH_
   
   class TAO_IFR_Client_Export ConstantDef
-    : public virtual CORBA::Contained
+    : public virtual ::CORBA::Contained
   {
   public:
     friend class TAO::Narrow_Utils<ConstantDef>;
@@ -664,7 +665,7 @@ namespace CORBA
     
     static ConstantDef_ptr _nil (void)
     {
-      return (ConstantDef_ptr)0;
+      return static_cast<ConstantDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -693,7 +694,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -714,7 +715,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void value (
-        const CORBA::Any & value
+        const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -812,7 +813,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstantDescription;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_)
 #define _CORBA_STRUCTDEF__VAR_OUT_CH_
@@ -841,8 +842,8 @@ namespace CORBA
 #define _CORBA_STRUCTDEF_CH_
   
   class TAO_IFR_Client_Export StructDef
-    : public virtual CORBA::TypedefDef,
-      public virtual CORBA::Container
+    : public virtual ::CORBA::TypedefDef,
+      public virtual ::CORBA::Container
   {
   public:
     friend class TAO::Narrow_Utils<StructDef>;
@@ -864,7 +865,7 @@ namespace CORBA
     
     static StructDef_ptr _nil (void)
     {
-      return (StructDef_ptr)0;
+      return static_cast<StructDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -883,7 +884,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void members (
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -942,7 +943,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_)
 #define _CORBA_UNIONDEF__VAR_OUT_CH_
@@ -971,8 +972,8 @@ namespace CORBA
 #define _CORBA_UNIONDEF_CH_
   
   class TAO_IFR_Client_Export UnionDef
-    : public virtual CORBA::TypedefDef,
-      public virtual CORBA::Container
+    : public virtual ::CORBA::TypedefDef,
+      public virtual ::CORBA::Container
   {
   public:
     friend class TAO::Narrow_Utils<UnionDef>;
@@ -994,7 +995,7 @@ namespace CORBA
     
     static UnionDef_ptr _nil (void)
     {
-      return (UnionDef_ptr)0;
+      return static_cast<UnionDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1023,7 +1024,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void discriminator_type_def (
-        CORBA::IDLType_ptr discriminator_type_def
+        ::CORBA::IDLType_ptr discriminator_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1044,7 +1045,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void members (
-        const CORBA::UnionMemberSeq & members
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1103,7 +1104,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_)
 #define _CORBA_ENUMDEF__VAR_OUT_CH_
@@ -1132,7 +1133,7 @@ namespace CORBA
 #define _CORBA_ENUMDEF_CH_
   
   class TAO_IFR_Client_Export EnumDef
-    : public virtual CORBA::TypedefDef
+    : public virtual ::CORBA::TypedefDef
   {
   public:
     friend class TAO::Narrow_Utils<EnumDef>;
@@ -1154,7 +1155,7 @@ namespace CORBA
     
     static EnumDef_ptr _nil (void)
     {
-      return (EnumDef_ptr)0;
+      return static_cast<EnumDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1173,7 +1174,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void members (
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1232,7 +1233,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnumDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_)
 #define _CORBA_ALIASDEF__VAR_OUT_CH_
@@ -1261,7 +1262,7 @@ namespace CORBA
 #define _CORBA_ALIASDEF_CH_
   
   class TAO_IFR_Client_Export AliasDef
-    : public virtual CORBA::TypedefDef
+    : public virtual ::CORBA::TypedefDef
   {
   public:
     friend class TAO::Narrow_Utils<AliasDef>;
@@ -1283,7 +1284,7 @@ namespace CORBA
     
     static AliasDef_ptr _nil (void)
     {
-      return (AliasDef_ptr)0;
+      return static_cast<AliasDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1302,7 +1303,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void original_type_def (
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1361,7 +1362,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AliasDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_)
 #define _CORBA_NATIVEDEF__VAR_OUT_CH_
@@ -1390,7 +1391,7 @@ namespace CORBA
 #define _CORBA_NATIVEDEF_CH_
   
   class TAO_IFR_Client_Export NativeDef
-    : public virtual CORBA::TypedefDef
+    : public virtual ::CORBA::TypedefDef
   {
   public:
     friend class TAO::Narrow_Utils<NativeDef>;
@@ -1412,7 +1413,7 @@ namespace CORBA
     
     static NativeDef_ptr _nil (void)
     {
-      return (NativeDef_ptr)0;
+      return static_cast<NativeDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1475,7 +1476,7 @@ namespace CORBA
 #define _CORBA_PRIMITIVEDEF_CH_
   
   class TAO_IFR_Client_Export PrimitiveDef
-    : public virtual CORBA::IDLType
+    : public virtual ::CORBA::IDLType
   {
   public:
     friend class TAO::Narrow_Utils<PrimitiveDef>;
@@ -1497,7 +1498,7 @@ namespace CORBA
     
     static PrimitiveDef_ptr _nil (void)
     {
-      return (PrimitiveDef_ptr)0;
+      return static_cast<PrimitiveDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1570,7 +1571,7 @@ namespace CORBA
 #define _CORBA_STRINGDEF_CH_
   
   class TAO_IFR_Client_Export StringDef
-    : public virtual CORBA::IDLType
+    : public virtual ::CORBA::IDLType
   {
   public:
     friend class TAO::Narrow_Utils<StringDef>;
@@ -1592,7 +1593,7 @@ namespace CORBA
     
     static StringDef_ptr _nil (void)
     {
-      return (StringDef_ptr)0;
+      return static_cast<StringDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1611,7 +1612,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void bound (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1676,7 +1677,7 @@ namespace CORBA
 #define _CORBA_WSTRINGDEF_CH_
   
   class TAO_IFR_Client_Export WstringDef
-    : public virtual CORBA::IDLType
+    : public virtual ::CORBA::IDLType
   {
   public:
     friend class TAO::Narrow_Utils<WstringDef>;
@@ -1698,7 +1699,7 @@ namespace CORBA
     
     static WstringDef_ptr _nil (void)
     {
-      return (WstringDef_ptr)0;
+      return static_cast<WstringDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1717,7 +1718,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void bound (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1782,7 +1783,7 @@ namespace CORBA
 #define _CORBA_SEQUENCEDEF_CH_
   
   class TAO_IFR_Client_Export SequenceDef
-    : public virtual CORBA::IDLType
+    : public virtual ::CORBA::IDLType
   {
   public:
     friend class TAO::Narrow_Utils<SequenceDef>;
@@ -1804,7 +1805,7 @@ namespace CORBA
     
     static SequenceDef_ptr _nil (void)
     {
-      return (SequenceDef_ptr)0;
+      return static_cast<SequenceDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1823,7 +1824,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void bound (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1854,7 +1855,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void element_type_def (
-        CORBA::IDLType_ptr element_type_def
+        ::CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1919,7 +1920,7 @@ namespace CORBA
 #define _CORBA_ARRAYDEF_CH_
   
   class TAO_IFR_Client_Export ArrayDef
-    : public virtual CORBA::IDLType
+    : public virtual ::CORBA::IDLType
   {
   public:
     friend class TAO::Narrow_Utils<ArrayDef>;
@@ -1941,7 +1942,7 @@ namespace CORBA
     
     static ArrayDef_ptr _nil (void)
     {
-      return (ArrayDef_ptr)0;
+      return static_cast<ArrayDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1960,7 +1961,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void length (
-        CORBA::ULong length
+        ::CORBA::ULong length
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1991,7 +1992,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void element_type_def (
-        CORBA::IDLType_ptr element_type_def
+        ::CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2050,7 +2051,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ArrayDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_)
 #define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_
@@ -2079,8 +2080,8 @@ namespace CORBA
 #define _CORBA_EXCEPTIONDEF_CH_
   
   class TAO_IFR_Client_Export ExceptionDef
-    : public virtual CORBA::Contained,
-      public virtual CORBA::Container
+    : public virtual ::CORBA::Contained,
+      public virtual ::CORBA::Container
   {
   public:
     friend class TAO::Narrow_Utils<ExceptionDef>;
@@ -2102,7 +2103,7 @@ namespace CORBA
     
     static ExceptionDef_ptr _nil (void)
     {
-      return (ExceptionDef_ptr)0;
+      return static_cast<ExceptionDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -2131,7 +2132,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void members (
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2266,7 +2267,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttributeMode;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ATTRIBUTEDEF__VAR_OUT_CH_)
 #define _CORBA_ATTRIBUTEDEF__VAR_OUT_CH_
@@ -2295,7 +2296,7 @@ namespace CORBA
 #define _CORBA_ATTRIBUTEDEF_CH_
   
   class TAO_IFR_Client_Export AttributeDef
-    : public virtual CORBA::Contained
+    : public virtual ::CORBA::Contained
   {
   public:
     friend class TAO::Narrow_Utils<AttributeDef>;
@@ -2317,7 +2318,7 @@ namespace CORBA
     
     static AttributeDef_ptr _nil (void)
     {
-      return (AttributeDef_ptr)0;
+      return static_cast<AttributeDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -2346,7 +2347,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2367,7 +2368,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void mode (
-        CORBA::AttributeMode mode
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2506,7 +2507,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAttributeDescription;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTATTRIBUTEDEF__VAR_OUT_CH_
@@ -2535,7 +2536,7 @@ namespace CORBA
 #define _CORBA_EXTATTRIBUTEDEF_CH_
   
   class TAO_IFR_Client_Export ExtAttributeDef
-    : public virtual CORBA::AttributeDef
+    : public virtual ::CORBA::AttributeDef
   {
   public:
     friend class TAO::Narrow_Utils<ExtAttributeDef>;
@@ -2557,7 +2558,7 @@ namespace CORBA
     
     static ExtAttributeDef_ptr _nil (void)
     {
-      return (ExtAttributeDef_ptr)0;
+      return static_cast<ExtAttributeDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -2576,7 +2577,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void get_exceptions (
-        const CORBA::ExcDescriptionSeq & get_exceptions
+        const ::CORBA::ExcDescriptionSeq & get_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2597,7 +2598,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_exceptions (
-        const CORBA::ExcDescriptionSeq & set_exceptions
+        const ::CORBA::ExcDescriptionSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2772,7 +2773,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
+  // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * ContextIdentifier;
   typedef CORBA::String_var ContextIdentifier_var;
@@ -2835,7 +2836,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextIdSeq;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_OPERATIONDEF__VAR_OUT_CH_)
 #define _CORBA_OPERATIONDEF__VAR_OUT_CH_
@@ -2864,7 +2865,7 @@ namespace CORBA
 #define _CORBA_OPERATIONDEF_CH_
   
   class TAO_IFR_Client_Export OperationDef
-    : public virtual CORBA::Contained
+    : public virtual ::CORBA::Contained
   {
   public:
     friend class TAO::Narrow_Utils<OperationDef>;
@@ -2886,7 +2887,7 @@ namespace CORBA
     
     static OperationDef_ptr _nil (void)
     {
-      return (OperationDef_ptr)0;
+      return static_cast<OperationDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -2915,7 +2916,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void result_def (
-        CORBA::IDLType_ptr result_def
+        ::CORBA::IDLType_ptr result_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2936,7 +2937,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void params (
-        const CORBA::ParDescriptionSeq & params
+        const ::CORBA::ParDescriptionSeq & params
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2957,7 +2958,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void mode (
-        CORBA::OperationMode mode
+        ::CORBA::OperationMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2978,7 +2979,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void contexts (
-        const CORBA::ContextIdSeq & contexts
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2999,7 +3000,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void exceptions (
-        const CORBA::ExceptionDefSeq & exceptions
+        const ::CORBA::ExceptionDefSeq & exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3310,7 +3311,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAttrDescriptionSeq;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_INTERFACEDEF__VAR_OUT_CH_
@@ -3339,9 +3340,9 @@ namespace CORBA
 #define _CORBA_INTERFACEDEF_CH_
   
   class TAO_IFR_Client_Export InterfaceDef
-    : public virtual CORBA::Container,
-      public virtual CORBA::Contained,
-      public virtual CORBA::IDLType
+    : public virtual ::CORBA::Container,
+      public virtual ::CORBA::Contained,
+      public virtual ::CORBA::IDLType
   {
   public:
     friend class TAO::Narrow_Utils<InterfaceDef>;
@@ -3363,7 +3364,7 @@ namespace CORBA
     
     static InterfaceDef_ptr _nil (void)
     {
-      return (InterfaceDef_ptr)0;
+      return static_cast<InterfaceDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -3382,7 +3383,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces
+        const ::CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3458,8 +3459,8 @@ namespace CORBA
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3473,11 +3474,11 @@ namespace CORBA
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3574,7 +3575,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDescription;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION__VAR_OUT_CH_)
 #define _CORBA_INTERFACEATTREXTENSION__VAR_OUT_CH_
@@ -3625,7 +3626,7 @@ namespace CORBA
     
     static InterfaceAttrExtension_ptr _nil (void)
     {
-      return (InterfaceAttrExtension_ptr)0;
+      return static_cast<InterfaceAttrExtension_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -3688,10 +3689,10 @@ namespace CORBA
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        const CORBA::ExceptionDefSeq & get_exceptions,
-        const CORBA::ExceptionDefSeq & set_exceptions
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode,
+        const ::CORBA::ExceptionDefSeq & get_exceptions,
+        const ::CORBA::ExceptionDefSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -3750,7 +3751,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceAttrExtension;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_
@@ -3779,8 +3780,8 @@ namespace CORBA
 #define _CORBA_EXTINTERFACEDEF_CH_
   
   class TAO_IFR_Client_Export ExtInterfaceDef
-    : public virtual CORBA::InterfaceDef,
-      public virtual CORBA::InterfaceAttrExtension
+    : public virtual ::CORBA::InterfaceDef,
+      public virtual ::CORBA::InterfaceAttrExtension
   {
   public:
     friend class TAO::Narrow_Utils<ExtInterfaceDef>;
@@ -3802,7 +3803,7 @@ namespace CORBA
     
     static ExtInterfaceDef_ptr _nil (void)
     {
-      return (ExtInterfaceDef_ptr)0;
+      return static_cast<ExtInterfaceDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -3859,7 +3860,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInterfaceDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_
@@ -3888,7 +3889,7 @@ namespace CORBA
 #define _CORBA_ABSTRACTINTERFACEDEF_CH_
   
   class TAO_IFR_Client_Export AbstractInterfaceDef
-    : public virtual CORBA::InterfaceDef
+    : public virtual ::CORBA::InterfaceDef
   {
   public:
     friend class TAO::Narrow_Utils<AbstractInterfaceDef>;
@@ -3910,7 +3911,7 @@ namespace CORBA
     
     static AbstractInterfaceDef_ptr _nil (void)
     {
-      return (AbstractInterfaceDef_ptr)0;
+      return static_cast<AbstractInterfaceDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -3967,7 +3968,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AbstractInterfaceDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_
@@ -3996,8 +3997,8 @@ namespace CORBA
 #define _CORBA_EXTABSTRACTINTERFACEDEF_CH_
   
   class TAO_IFR_Client_Export ExtAbstractInterfaceDef
-    : public virtual CORBA::AbstractInterfaceDef,
-      public virtual CORBA::InterfaceAttrExtension
+    : public virtual ::CORBA::AbstractInterfaceDef,
+      public virtual ::CORBA::InterfaceAttrExtension
   {
   public:
     friend class TAO::Narrow_Utils<ExtAbstractInterfaceDef>;
@@ -4019,7 +4020,7 @@ namespace CORBA
     
     static ExtAbstractInterfaceDef_ptr _nil (void)
     {
-      return (ExtAbstractInterfaceDef_ptr)0;
+      return static_cast<ExtAbstractInterfaceDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -4076,7 +4077,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAbstractInterfaceDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_
@@ -4105,7 +4106,7 @@ namespace CORBA
 #define _CORBA_LOCALINTERFACEDEF_CH_
   
   class TAO_IFR_Client_Export LocalInterfaceDef
-    : public virtual CORBA::InterfaceDef
+    : public virtual ::CORBA::InterfaceDef
   {
   public:
     friend class TAO::Narrow_Utils<LocalInterfaceDef>;
@@ -4127,7 +4128,7 @@ namespace CORBA
     
     static LocalInterfaceDef_ptr _nil (void)
     {
-      return (LocalInterfaceDef_ptr)0;
+      return static_cast<LocalInterfaceDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -4184,7 +4185,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LocalInterfaceDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_
@@ -4213,8 +4214,8 @@ namespace CORBA
 #define _CORBA_EXTLOCALINTERFACEDEF_CH_
   
   class TAO_IFR_Client_Export ExtLocalInterfaceDef
-    : public virtual CORBA::LocalInterfaceDef,
-      public virtual CORBA::InterfaceAttrExtension
+    : public virtual ::CORBA::LocalInterfaceDef,
+      public virtual ::CORBA::InterfaceAttrExtension
   {
   public:
     friend class TAO::Narrow_Utils<ExtLocalInterfaceDef>;
@@ -4236,7 +4237,7 @@ namespace CORBA
     
     static ExtLocalInterfaceDef_ptr _nil (void)
     {
-      return (ExtLocalInterfaceDef_ptr)0;
+      return static_cast<ExtLocalInterfaceDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -4457,17 +4458,17 @@ namespace TAO
 #define _CORBA_REPOSITORY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::Repository>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Repository>
   {
-    static CORBA::Repository_ptr duplicate (
-        CORBA::Repository_ptr
+    static ::CORBA::Repository_ptr duplicate (
+        ::CORBA::Repository_ptr
       );
     static void release (
-        CORBA::Repository_ptr
+        ::CORBA::Repository_ptr
       );
-    static CORBA::Repository_ptr nil (void);
+    static ::CORBA::Repository_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::Repository_ptr p,
+        ::CORBA::Repository_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4478,17 +4479,17 @@ namespace TAO
 #define _CORBA_MODULEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ModuleDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ModuleDef>
   {
-    static CORBA::ModuleDef_ptr duplicate (
-        CORBA::ModuleDef_ptr
+    static ::CORBA::ModuleDef_ptr duplicate (
+        ::CORBA::ModuleDef_ptr
       );
     static void release (
-        CORBA::ModuleDef_ptr
+        ::CORBA::ModuleDef_ptr
       );
-    static CORBA::ModuleDef_ptr nil (void);
+    static ::CORBA::ModuleDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ModuleDef_ptr p,
+        ::CORBA::ModuleDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4499,17 +4500,17 @@ namespace TAO
 #define _CORBA_CONSTANTDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ConstantDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ConstantDef>
   {
-    static CORBA::ConstantDef_ptr duplicate (
-        CORBA::ConstantDef_ptr
+    static ::CORBA::ConstantDef_ptr duplicate (
+        ::CORBA::ConstantDef_ptr
       );
     static void release (
-        CORBA::ConstantDef_ptr
+        ::CORBA::ConstantDef_ptr
       );
-    static CORBA::ConstantDef_ptr nil (void);
+    static ::CORBA::ConstantDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ConstantDef_ptr p,
+        ::CORBA::ConstantDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4520,17 +4521,17 @@ namespace TAO
 #define _CORBA_STRUCTDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::StructDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StructDef>
   {
-    static CORBA::StructDef_ptr duplicate (
-        CORBA::StructDef_ptr
+    static ::CORBA::StructDef_ptr duplicate (
+        ::CORBA::StructDef_ptr
       );
     static void release (
-        CORBA::StructDef_ptr
+        ::CORBA::StructDef_ptr
       );
-    static CORBA::StructDef_ptr nil (void);
+    static ::CORBA::StructDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::StructDef_ptr p,
+        ::CORBA::StructDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4541,17 +4542,17 @@ namespace TAO
 #define _CORBA_UNIONDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::UnionDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::UnionDef>
   {
-    static CORBA::UnionDef_ptr duplicate (
-        CORBA::UnionDef_ptr
+    static ::CORBA::UnionDef_ptr duplicate (
+        ::CORBA::UnionDef_ptr
       );
     static void release (
-        CORBA::UnionDef_ptr
+        ::CORBA::UnionDef_ptr
       );
-    static CORBA::UnionDef_ptr nil (void);
+    static ::CORBA::UnionDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::UnionDef_ptr p,
+        ::CORBA::UnionDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4562,17 +4563,17 @@ namespace TAO
 #define _CORBA_ENUMDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::EnumDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::EnumDef>
   {
-    static CORBA::EnumDef_ptr duplicate (
-        CORBA::EnumDef_ptr
+    static ::CORBA::EnumDef_ptr duplicate (
+        ::CORBA::EnumDef_ptr
       );
     static void release (
-        CORBA::EnumDef_ptr
+        ::CORBA::EnumDef_ptr
       );
-    static CORBA::EnumDef_ptr nil (void);
+    static ::CORBA::EnumDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::EnumDef_ptr p,
+        ::CORBA::EnumDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4583,17 +4584,17 @@ namespace TAO
 #define _CORBA_ALIASDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::AliasDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AliasDef>
   {
-    static CORBA::AliasDef_ptr duplicate (
-        CORBA::AliasDef_ptr
+    static ::CORBA::AliasDef_ptr duplicate (
+        ::CORBA::AliasDef_ptr
       );
     static void release (
-        CORBA::AliasDef_ptr
+        ::CORBA::AliasDef_ptr
       );
-    static CORBA::AliasDef_ptr nil (void);
+    static ::CORBA::AliasDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::AliasDef_ptr p,
+        ::CORBA::AliasDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4604,17 +4605,17 @@ namespace TAO
 #define _CORBA_INTERFACEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef>
   {
-    static CORBA::InterfaceDef_ptr duplicate (
-        CORBA::InterfaceDef_ptr
+    static ::CORBA::InterfaceDef_ptr duplicate (
+        ::CORBA::InterfaceDef_ptr
       );
     static void release (
-        CORBA::InterfaceDef_ptr
+        ::CORBA::InterfaceDef_ptr
       );
-    static CORBA::InterfaceDef_ptr nil (void);
+    static ::CORBA::InterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::InterfaceDef_ptr p,
+        ::CORBA::InterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4625,17 +4626,17 @@ namespace TAO
 #define _CORBA_EXCEPTIONDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExceptionDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef>
   {
-    static CORBA::ExceptionDef_ptr duplicate (
-        CORBA::ExceptionDef_ptr
+    static ::CORBA::ExceptionDef_ptr duplicate (
+        ::CORBA::ExceptionDef_ptr
       );
     static void release (
-        CORBA::ExceptionDef_ptr
+        ::CORBA::ExceptionDef_ptr
       );
-    static CORBA::ExceptionDef_ptr nil (void);
+    static ::CORBA::ExceptionDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ExceptionDef_ptr p,
+        ::CORBA::ExceptionDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4646,17 +4647,17 @@ namespace TAO
 #define _CORBA_NATIVEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::NativeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef>
   {
-    static CORBA::NativeDef_ptr duplicate (
-        CORBA::NativeDef_ptr
+    static ::CORBA::NativeDef_ptr duplicate (
+        ::CORBA::NativeDef_ptr
       );
     static void release (
-        CORBA::NativeDef_ptr
+        ::CORBA::NativeDef_ptr
       );
-    static CORBA::NativeDef_ptr nil (void);
+    static ::CORBA::NativeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::NativeDef_ptr p,
+        ::CORBA::NativeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4667,17 +4668,17 @@ namespace TAO
 #define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::AbstractInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef>
   {
-    static CORBA::AbstractInterfaceDef_ptr duplicate (
-        CORBA::AbstractInterfaceDef_ptr
+    static ::CORBA::AbstractInterfaceDef_ptr duplicate (
+        ::CORBA::AbstractInterfaceDef_ptr
       );
     static void release (
-        CORBA::AbstractInterfaceDef_ptr
+        ::CORBA::AbstractInterfaceDef_ptr
       );
-    static CORBA::AbstractInterfaceDef_ptr nil (void);
+    static ::CORBA::AbstractInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::AbstractInterfaceDef_ptr p,
+        ::CORBA::AbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4688,17 +4689,17 @@ namespace TAO
 #define _CORBA_LOCALINTERFACEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::LocalInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef>
   {
-    static CORBA::LocalInterfaceDef_ptr duplicate (
-        CORBA::LocalInterfaceDef_ptr
+    static ::CORBA::LocalInterfaceDef_ptr duplicate (
+        ::CORBA::LocalInterfaceDef_ptr
       );
     static void release (
-        CORBA::LocalInterfaceDef_ptr
+        ::CORBA::LocalInterfaceDef_ptr
       );
-    static CORBA::LocalInterfaceDef_ptr nil (void);
+    static ::CORBA::LocalInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::LocalInterfaceDef_ptr p,
+        ::CORBA::LocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4709,17 +4710,17 @@ namespace TAO
 #define _CORBA_EXTINTERFACEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef>
   {
-    static CORBA::ExtInterfaceDef_ptr duplicate (
-        CORBA::ExtInterfaceDef_ptr
+    static ::CORBA::ExtInterfaceDef_ptr duplicate (
+        ::CORBA::ExtInterfaceDef_ptr
       );
     static void release (
-        CORBA::ExtInterfaceDef_ptr
+        ::CORBA::ExtInterfaceDef_ptr
       );
-    static CORBA::ExtInterfaceDef_ptr nil (void);
+    static ::CORBA::ExtInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ExtInterfaceDef_ptr p,
+        ::CORBA::ExtInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4730,17 +4731,17 @@ namespace TAO
 #define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAbstractInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef>
   {
-    static CORBA::ExtAbstractInterfaceDef_ptr duplicate (
-        CORBA::ExtAbstractInterfaceDef_ptr
+    static ::CORBA::ExtAbstractInterfaceDef_ptr duplicate (
+        ::CORBA::ExtAbstractInterfaceDef_ptr
       );
     static void release (
-        CORBA::ExtAbstractInterfaceDef_ptr
+        ::CORBA::ExtAbstractInterfaceDef_ptr
       );
-    static CORBA::ExtAbstractInterfaceDef_ptr nil (void);
+    static ::CORBA::ExtAbstractInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ExtAbstractInterfaceDef_ptr p,
+        ::CORBA::ExtAbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4751,17 +4752,17 @@ namespace TAO
 #define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtLocalInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef>
   {
-    static CORBA::ExtLocalInterfaceDef_ptr duplicate (
-        CORBA::ExtLocalInterfaceDef_ptr
+    static ::CORBA::ExtLocalInterfaceDef_ptr duplicate (
+        ::CORBA::ExtLocalInterfaceDef_ptr
       );
     static void release (
-        CORBA::ExtLocalInterfaceDef_ptr
+        ::CORBA::ExtLocalInterfaceDef_ptr
       );
-    static CORBA::ExtLocalInterfaceDef_ptr nil (void);
+    static ::CORBA::ExtLocalInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ExtLocalInterfaceDef_ptr p,
+        ::CORBA::ExtLocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4772,17 +4773,17 @@ namespace TAO
 #define _CORBA_PRIMITIVEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::PrimitiveDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::PrimitiveDef>
   {
-    static CORBA::PrimitiveDef_ptr duplicate (
-        CORBA::PrimitiveDef_ptr
+    static ::CORBA::PrimitiveDef_ptr duplicate (
+        ::CORBA::PrimitiveDef_ptr
       );
     static void release (
-        CORBA::PrimitiveDef_ptr
+        ::CORBA::PrimitiveDef_ptr
       );
-    static CORBA::PrimitiveDef_ptr nil (void);
+    static ::CORBA::PrimitiveDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::PrimitiveDef_ptr p,
+        ::CORBA::PrimitiveDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4793,17 +4794,17 @@ namespace TAO
 #define _CORBA_STRINGDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::StringDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StringDef>
   {
-    static CORBA::StringDef_ptr duplicate (
-        CORBA::StringDef_ptr
+    static ::CORBA::StringDef_ptr duplicate (
+        ::CORBA::StringDef_ptr
       );
     static void release (
-        CORBA::StringDef_ptr
+        ::CORBA::StringDef_ptr
       );
-    static CORBA::StringDef_ptr nil (void);
+    static ::CORBA::StringDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::StringDef_ptr p,
+        ::CORBA::StringDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4814,17 +4815,17 @@ namespace TAO
 #define _CORBA_SEQUENCEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::SequenceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::SequenceDef>
   {
-    static CORBA::SequenceDef_ptr duplicate (
-        CORBA::SequenceDef_ptr
+    static ::CORBA::SequenceDef_ptr duplicate (
+        ::CORBA::SequenceDef_ptr
       );
     static void release (
-        CORBA::SequenceDef_ptr
+        ::CORBA::SequenceDef_ptr
       );
-    static CORBA::SequenceDef_ptr nil (void);
+    static ::CORBA::SequenceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::SequenceDef_ptr p,
+        ::CORBA::SequenceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4835,17 +4836,17 @@ namespace TAO
 #define _CORBA_ARRAYDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ArrayDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ArrayDef>
   {
-    static CORBA::ArrayDef_ptr duplicate (
-        CORBA::ArrayDef_ptr
+    static ::CORBA::ArrayDef_ptr duplicate (
+        ::CORBA::ArrayDef_ptr
       );
     static void release (
-        CORBA::ArrayDef_ptr
+        ::CORBA::ArrayDef_ptr
       );
-    static CORBA::ArrayDef_ptr nil (void);
+    static ::CORBA::ArrayDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ArrayDef_ptr p,
+        ::CORBA::ArrayDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4856,38 +4857,17 @@ namespace TAO
 #define _CORBA_WSTRINGDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::WstringDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::WstringDef>
   {
-    static CORBA::WstringDef_ptr duplicate (
-        CORBA::WstringDef_ptr
+    static ::CORBA::WstringDef_ptr duplicate (
+        ::CORBA::WstringDef_ptr
       );
     static void release (
-        CORBA::WstringDef_ptr
+        ::CORBA::WstringDef_ptr
       );
-    static CORBA::WstringDef_ptr nil (void);
+    static ::CORBA::WstringDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::WstringDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_FIXEDDEF__TRAITS_CH_)
-#define _CORBA_FIXEDDEF__TRAITS_CH_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::FixedDef>
-  {
-    static CORBA::FixedDef_ptr duplicate (
-        CORBA::FixedDef_ptr
-      );
-    static void release (
-        CORBA::FixedDef_ptr
-      );
-    static CORBA::FixedDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::FixedDef_ptr p,
+        ::CORBA::WstringDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4898,17 +4878,17 @@ namespace TAO
 #define _CORBA_ATTRIBUTEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::AttributeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AttributeDef>
   {
-    static CORBA::AttributeDef_ptr duplicate (
-        CORBA::AttributeDef_ptr
+    static ::CORBA::AttributeDef_ptr duplicate (
+        ::CORBA::AttributeDef_ptr
       );
     static void release (
-        CORBA::AttributeDef_ptr
+        ::CORBA::AttributeDef_ptr
       );
-    static CORBA::AttributeDef_ptr nil (void);
+    static ::CORBA::AttributeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::AttributeDef_ptr p,
+        ::CORBA::AttributeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4919,17 +4899,17 @@ namespace TAO
 #define _CORBA_EXTATTRIBUTEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAttributeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAttributeDef>
   {
-    static CORBA::ExtAttributeDef_ptr duplicate (
-        CORBA::ExtAttributeDef_ptr
+    static ::CORBA::ExtAttributeDef_ptr duplicate (
+        ::CORBA::ExtAttributeDef_ptr
       );
     static void release (
-        CORBA::ExtAttributeDef_ptr
+        ::CORBA::ExtAttributeDef_ptr
       );
-    static CORBA::ExtAttributeDef_ptr nil (void);
+    static ::CORBA::ExtAttributeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ExtAttributeDef_ptr p,
+        ::CORBA::ExtAttributeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4940,17 +4920,17 @@ namespace TAO
 #define _CORBA_OPERATIONDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::OperationDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::OperationDef>
   {
-    static CORBA::OperationDef_ptr duplicate (
-        CORBA::OperationDef_ptr
+    static ::CORBA::OperationDef_ptr duplicate (
+        ::CORBA::OperationDef_ptr
       );
     static void release (
-        CORBA::OperationDef_ptr
+        ::CORBA::OperationDef_ptr
       );
-    static CORBA::OperationDef_ptr nil (void);
+    static ::CORBA::OperationDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::OperationDef_ptr p,
+        ::CORBA::OperationDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4961,17 +4941,17 @@ namespace TAO
 #define _CORBA_INTERFACEATTREXTENSION__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceAttrExtension>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceAttrExtension>
   {
-    static CORBA::InterfaceAttrExtension_ptr duplicate (
-        CORBA::InterfaceAttrExtension_ptr
+    static ::CORBA::InterfaceAttrExtension_ptr duplicate (
+        ::CORBA::InterfaceAttrExtension_ptr
       );
     static void release (
-        CORBA::InterfaceAttrExtension_ptr
+        ::CORBA::InterfaceAttrExtension_ptr
       );
-    static CORBA::InterfaceAttrExtension_ptr nil (void);
+    static ::CORBA::InterfaceAttrExtension_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::InterfaceAttrExtension_ptr p,
+        ::CORBA::InterfaceAttrExtension_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -4980,7 +4960,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr *); // non-copying
@@ -5643,13 +5623,13 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::E
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocalInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IFR_BasicC.i"
+#include "IFR_BasicC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -5661,3 +5641,4 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocal
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.i b/TAO/tao/IFR_Client/IFR_BasicC.i
deleted file mode 100644
index 4528279bc0d..00000000000
--- a/TAO/tao/IFR_Client/IFR_BasicC.i
+++ /dev/null
@@ -1,892 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_REPOSITORY___CI_)
-#define _CORBA_REPOSITORY___CI_
-
-ACE_INLINE
-CORBA::Repository::Repository (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_Repository_Proxy_Broker_ (0)
-{
-  this->CORBA_Repository_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::Repository::Repository (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Repository_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_MODULEDEF___CI_)
-#define _CORBA_MODULEDEF___CI_
-
-ACE_INLINE
-CORBA::ModuleDef::ModuleDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ModuleDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ModuleDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ModuleDef::ModuleDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ModuleDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_CONSTANTDEF___CI_)
-#define _CORBA_CONSTANTDEF___CI_
-
-ACE_INLINE
-CORBA::ConstantDef::ConstantDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ConstantDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ConstantDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ConstantDef::ConstantDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ConstantDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_STRUCTDEF___CI_)
-#define _CORBA_STRUCTDEF___CI_
-
-ACE_INLINE
-CORBA::StructDef::StructDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_StructDef_Proxy_Broker_ (0)
-{
-  this->CORBA_StructDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::StructDef::StructDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_StructDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_UNIONDEF___CI_)
-#define _CORBA_UNIONDEF___CI_
-
-ACE_INLINE
-CORBA::UnionDef::UnionDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_UnionDef_Proxy_Broker_ (0)
-{
-  this->CORBA_UnionDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::UnionDef::UnionDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_UnionDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ENUMDEF___CI_)
-#define _CORBA_ENUMDEF___CI_
-
-ACE_INLINE
-CORBA::EnumDef::EnumDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_EnumDef_Proxy_Broker_ (0)
-{
-  this->CORBA_EnumDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::EnumDef::EnumDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_EnumDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ALIASDEF___CI_)
-#define _CORBA_ALIASDEF___CI_
-
-ACE_INLINE
-CORBA::AliasDef::AliasDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_AliasDef_Proxy_Broker_ (0)
-{
-  this->CORBA_AliasDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::AliasDef::AliasDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_AliasDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_NATIVEDEF___CI_)
-#define _CORBA_NATIVEDEF___CI_
-
-ACE_INLINE
-CORBA::NativeDef::NativeDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_NativeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_NativeDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::NativeDef::NativeDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_NativeDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_PRIMITIVEDEF___CI_)
-#define _CORBA_PRIMITIVEDEF___CI_
-
-ACE_INLINE
-CORBA::PrimitiveDef::PrimitiveDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_PrimitiveDef_Proxy_Broker_ (0)
-{
-  this->CORBA_PrimitiveDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::PrimitiveDef::PrimitiveDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_PrimitiveDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_STRINGDEF___CI_)
-#define _CORBA_STRINGDEF___CI_
-
-ACE_INLINE
-CORBA::StringDef::StringDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_StringDef_Proxy_Broker_ (0)
-{
-  this->CORBA_StringDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::StringDef::StringDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_StringDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_WSTRINGDEF___CI_)
-#define _CORBA_WSTRINGDEF___CI_
-
-ACE_INLINE
-CORBA::WstringDef::WstringDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_WstringDef_Proxy_Broker_ (0)
-{
-  this->CORBA_WstringDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::WstringDef::WstringDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_WstringDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_SEQUENCEDEF___CI_)
-#define _CORBA_SEQUENCEDEF___CI_
-
-ACE_INLINE
-CORBA::SequenceDef::SequenceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_SequenceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_SequenceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::SequenceDef::SequenceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_SequenceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ARRAYDEF___CI_)
-#define _CORBA_ARRAYDEF___CI_
-
-ACE_INLINE
-CORBA::ArrayDef::ArrayDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ArrayDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ArrayDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ArrayDef::ArrayDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ArrayDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXCEPTIONDEF___CI_)
-#define _CORBA_EXCEPTIONDEF___CI_
-
-ACE_INLINE
-CORBA::ExceptionDef::ExceptionDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ExceptionDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExceptionDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExceptionDef::ExceptionDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExceptionDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ATTRIBUTEDEF___CI_)
-#define _CORBA_ATTRIBUTEDEF___CI_
-
-ACE_INLINE
-CORBA::AttributeDef::AttributeDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_AttributeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_AttributeDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::AttributeDef::AttributeDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_AttributeDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF___CI_)
-#define _CORBA_EXTATTRIBUTEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtAttributeDef::ExtAttributeDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ExtAttributeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtAttributeDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDef::ExtAttributeDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtAttributeDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_OPERATIONDEF___CI_)
-#define _CORBA_OPERATIONDEF___CI_
-
-ACE_INLINE
-CORBA::OperationDef::OperationDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_OperationDef_Proxy_Broker_ (0)
-{
-  this->CORBA_OperationDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::OperationDef::OperationDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_OperationDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_INTERFACEDEF___CI_)
-#define _CORBA_INTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::InterfaceDef::InterfaceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_InterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_InterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::InterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_InterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_INTERFACEATTREXTENSION___CI_)
-#define _CORBA_INTERFACEATTREXTENSION___CI_
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::InterfaceAttrExtension (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_InterfaceAttrExtension_Proxy_Broker_ (0)
-{
-  this->CORBA_InterfaceAttrExtension_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::InterfaceAttrExtension (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_InterfaceAttrExtension_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTINTERFACEDEF___CI_)
-#define _CORBA_EXTINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtInterfaceDef::ExtInterfaceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ExtInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDef::ExtInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___CI_)
-#define _CORBA_ABSTRACTINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::AbstractInterfaceDef::AbstractInterfaceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_AbstractInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_AbstractInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDef::AbstractInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_AbstractInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___CI_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtAbstractInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_LOCALINTERFACEDEF___CI_)
-#define _CORBA_LOCALINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::LocalInterfaceDef::LocalInterfaceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_LocalInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_LocalInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDef::LocalInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_LocalInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF___CI_)
-#define _CORBA_EXTLOCALINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtLocalInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index d2abdc57ad9..c9c4e8da6ba 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -174,10 +174,28 @@ TAO_IFR_Client_Adapter_Impl::create_operation_list (
                TAO::Unknown_IDL_Type (params[i].type.in ()));
       value.replace (unk);
 
+      // Convert the parameter mode to an arg mode
+      CORBA::Flags flags = 0;
+      switch(params[i].mode)
+        {
+        case CORBA::PARAM_IN:
+          flags = CORBA::ARG_IN;
+          break;
+        case CORBA::PARAM_OUT:
+          flags = CORBA::ARG_OUT;
+          break;
+        case CORBA::PARAM_INOUT:
+          flags = CORBA::ARG_INOUT;
+          break;
+        default:
+          // Shouldn't happen
+          ACE_THROW (CORBA::INTERNAL());
+        }
+
       // Add an argument to the NVList.
       result->add_value (params[i].name.in (),
                          value,
-                         params[i].mode);
+                         flags);
    }
 }
 
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 6c306befb99..773abb04284 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -58,10 +58,10 @@
 
 module CORBA
 {
+  typeprefix CORBA "omg.org";
+
   module ComponentIR
   {
-    typeprefix ComponentIR "omg.org";
-
     interface ComponentDef;
     interface HomeDef;
 
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp b/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
index 5b395d93452..c1dfea94025 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
@@ -27,30 +27,32 @@
 
 #include "IFR_ComponentsC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_EventDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f4576),
-  ACE_NTOHL (0x656e7444),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4576), 
+  ACE_NTOHL (0x656e7444), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventDef:1.0
     9,
-  ACE_NTOHL (0x4576656e),
-  ACE_NTOHL (0x74446566),
+  ACE_NTOHL (0x4576656e), 
+  ACE_NTOHL (0x74446566), 
   ACE_NTOHL (0x0),  // name = EventDef
   };
 
@@ -59,7 +61,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EventDef (
     sizeof (_oc_CORBA_ComponentIR_EventDef),
     (char *) &_oc_CORBA_ComponentIR_EventDef,
     0,
-    sizeof (CORBA::ComponentIR::EventDef)
+    0
   );
 
 namespace CORBA
@@ -72,26 +74,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_Container[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f436f),
-  ACE_NTOHL (0x6e746169),
-  ACE_NTOHL (0x6e65723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f436f), 
+  ACE_NTOHL (0x6e746169), 
+  ACE_NTOHL (0x6e65723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/Container:1.0
     10,
-  ACE_NTOHL (0x436f6e74),
-  ACE_NTOHL (0x61696e65),
+  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x61696e65), 
   ACE_NTOHL (0x72000000),  // name = Container
   };
 
@@ -100,7 +102,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_Container (
     sizeof (_oc_CORBA_ComponentIR_Container),
     (char *) &_oc_CORBA_ComponentIR_Container,
     0,
-    sizeof (CORBA::ComponentIR::Container)
+    0
   );
 
 namespace CORBA
@@ -113,26 +115,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_ModuleDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f4d6f),
-  ACE_NTOHL (0x64756c65),
-  ACE_NTOHL (0x4465663a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4d6f), 
+  ACE_NTOHL (0x64756c65), 
+  ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0
     10,
-  ACE_NTOHL (0x4d6f6475),
-  ACE_NTOHL (0x6c654465),
+  ACE_NTOHL (0x4d6f6475), 
+  ACE_NTOHL (0x6c654465), 
   ACE_NTOHL (0x66000000),  // name = ModuleDef
   };
 
@@ -141,7 +143,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ModuleDef (
     sizeof (_oc_CORBA_ComponentIR_ModuleDef),
     (char *) &_oc_CORBA_ComponentIR_ModuleDef,
     0,
-    sizeof (CORBA::ComponentIR::ModuleDef)
+    0
   );
 
 namespace CORBA
@@ -154,27 +156,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_Repository[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/Repository:1.0
     11,
-  ACE_NTOHL (0x5265706f),
-  ACE_NTOHL (0x7369746f),
+  ACE_NTOHL (0x5265706f), 
+  ACE_NTOHL (0x7369746f), 
   ACE_NTOHL (0x72790000),  // name = Repository
   };
 
@@ -183,7 +185,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_Repository (
     sizeof (_oc_CORBA_ComponentIR_Repository),
     (char *) &_oc_CORBA_ComponentIR_Repository,
     0,
-    sizeof (CORBA::ComponentIR::Repository)
+    0
   );
 
 namespace CORBA
@@ -196,27 +198,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f5072),
-  ACE_NTOHL (0x6f766964),
-  ACE_NTOHL (0x65734465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5072), 
+  ACE_NTOHL (0x6f766964), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0
     12,
-  ACE_NTOHL (0x50726f76),
-  ACE_NTOHL (0x69646573),
+  ACE_NTOHL (0x50726f76), 
+  ACE_NTOHL (0x69646573), 
   ACE_NTOHL (0x44656600),  // name = ProvidesDef
   };
 
@@ -225,7 +227,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ProvidesDef (
     sizeof (_oc_CORBA_ComponentIR_ProvidesDef),
     (char *) &_oc_CORBA_ComponentIR_ProvidesDef,
     0,
-    sizeof (CORBA::ComponentIR::ProvidesDef)
+    0
   );
 
 namespace CORBA
@@ -238,54 +240,54 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f5072),
-  ACE_NTOHL (0x6f766964),
-  ACE_NTOHL (0x65734465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5072), 
+  ACE_NTOHL (0x6f766964), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0
     20,
-  ACE_NTOHL (0x50726f76),
-  ACE_NTOHL (0x69646573),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x50726f76), 
+  ACE_NTOHL (0x69646573), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
   5, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -294,95 +296,95 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   15,
-  ACE_NTOHL (0x696e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x655f7479),
+  ACE_NTOHL (0x696e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x655f7479), 
   ACE_NTOHL (0x70650000),  // name = interface_type
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -392,7 +394,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ProvidesDescription (
     sizeof (_oc_CORBA_ComponentIR_ProvidesDescription),
     (char *) &_oc_CORBA_ComponentIR_ProvidesDescription,
     0,
-    sizeof (CORBA::ComponentIR::ProvidesDescription)
+    0
   );
 
 namespace CORBA
@@ -405,25 +407,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_UsesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f5573),
-  ACE_NTOHL (0x65734465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5573), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0
     8,
-  ACE_NTOHL (0x55736573),
+  ACE_NTOHL (0x55736573), 
   ACE_NTOHL (0x44656600),  // name = UsesDef
   };
 
@@ -432,7 +434,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_UsesDef (
     sizeof (_oc_CORBA_ComponentIR_UsesDef),
     (char *) &_oc_CORBA_ComponentIR_UsesDef,
     0,
-    sizeof (CORBA::ComponentIR::UsesDef)
+    0
   );
 
 namespace CORBA
@@ -445,52 +447,52 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f5573),
-  ACE_NTOHL (0x65734465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5573), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0
     16,
-  ACE_NTOHL (0x55736573),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x55736573), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = UsesDescription
   6, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -499,100 +501,100 @@ static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   15,
-  ACE_NTOHL (0x696e7465),
-  ACE_NTOHL (0x72666163),
-  ACE_NTOHL (0x655f7479),
+  ACE_NTOHL (0x696e7465), 
+  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x655f7479), 
   ACE_NTOHL (0x70650000),  // name = interface_type
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f6d),
-  ACE_NTOHL (0x756c7469),
+  ACE_NTOHL (0x69735f6d), 
+  ACE_NTOHL (0x756c7469), 
   ACE_NTOHL (0x706c6500),  // name = is_multiple
     CORBA::tk_boolean,
 
@@ -603,7 +605,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_UsesDescription (
     sizeof (_oc_CORBA_ComponentIR_UsesDescription),
     (char *) &_oc_CORBA_ComponentIR_UsesDescription,
     0,
-    sizeof (CORBA::ComponentIR::UsesDescription)
+    0
   );
 
 namespace CORBA
@@ -616,28 +618,28 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f4576),
-  ACE_NTOHL (0x656e7450),
-  ACE_NTOHL (0x6f727444),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4576), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f727444), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0
     13,
-  ACE_NTOHL (0x4576656e),
-  ACE_NTOHL (0x74506f72),
-  ACE_NTOHL (0x74446566),
+  ACE_NTOHL (0x4576656e), 
+  ACE_NTOHL (0x74506f72), 
+  ACE_NTOHL (0x74446566), 
   ACE_NTOHL (0x0),  // name = EventPortDef
   };
 
@@ -646,7 +648,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EventPortDef (
     sizeof (_oc_CORBA_ComponentIR_EventPortDef),
     (char *) &_oc_CORBA_ComponentIR_EventPortDef,
     0,
-    sizeof (CORBA::ComponentIR::EventPortDef)
+    0
   );
 
 namespace CORBA
@@ -659,55 +661,55 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f4576),
-  ACE_NTOHL (0x656e7450),
-  ACE_NTOHL (0x6f727444),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4576), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f727444), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
     21,
-  ACE_NTOHL (0x4576656e),
-  ACE_NTOHL (0x74506f72),
-  ACE_NTOHL (0x74446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x4576656e), 
+  ACE_NTOHL (0x74506f72), 
+  ACE_NTOHL (0x74446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = EventPortDescription
   5, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -716,93 +718,93 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   6,
-  ACE_NTOHL (0x6576656e),
+  ACE_NTOHL (0x6576656e), 
   ACE_NTOHL (0x74000000),  // name = event
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -812,7 +814,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EventPortDescription (
     sizeof (_oc_CORBA_ComponentIR_EventPortDescription),
     (char *) &_oc_CORBA_ComponentIR_EventPortDescription,
     0,
-    sizeof (CORBA::ComponentIR::EventPortDescription)
+    0
   );
 
 namespace CORBA
@@ -825,26 +827,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_EmitsDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f456d),
-  ACE_NTOHL (0x69747344),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f456d), 
+  ACE_NTOHL (0x69747344), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0
     9,
-  ACE_NTOHL (0x456d6974),
-  ACE_NTOHL (0x73446566),
+  ACE_NTOHL (0x456d6974), 
+  ACE_NTOHL (0x73446566), 
   ACE_NTOHL (0x0),  // name = EmitsDef
   };
 
@@ -853,7 +855,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EmitsDef (
     sizeof (_oc_CORBA_ComponentIR_EmitsDef),
     (char *) &_oc_CORBA_ComponentIR_EmitsDef,
     0,
-    sizeof (CORBA::ComponentIR::EmitsDef)
+    0
   );
 
 namespace CORBA
@@ -866,28 +868,28 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_PublishesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f5075),
-  ACE_NTOHL (0x626c6973),
-  ACE_NTOHL (0x68657344),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5075), 
+  ACE_NTOHL (0x626c6973), 
+  ACE_NTOHL (0x68657344), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0
     13,
-  ACE_NTOHL (0x5075626c),
-  ACE_NTOHL (0x69736865),
-  ACE_NTOHL (0x73446566),
+  ACE_NTOHL (0x5075626c), 
+  ACE_NTOHL (0x69736865), 
+  ACE_NTOHL (0x73446566), 
   ACE_NTOHL (0x0),  // name = PublishesDef
   };
 
@@ -896,7 +898,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_PublishesDef (
     sizeof (_oc_CORBA_ComponentIR_PublishesDef),
     (char *) &_oc_CORBA_ComponentIR_PublishesDef,
     0,
-    sizeof (CORBA::ComponentIR::PublishesDef)
+    0
   );
 
 namespace CORBA
@@ -909,27 +911,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_ConsumesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f436f),
-  ACE_NTOHL (0x6e73756d),
-  ACE_NTOHL (0x65734465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f436f), 
+  ACE_NTOHL (0x6e73756d), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0
     12,
-  ACE_NTOHL (0x436f6e73),
-  ACE_NTOHL (0x756d6573),
+  ACE_NTOHL (0x436f6e73), 
+  ACE_NTOHL (0x756d6573), 
   ACE_NTOHL (0x44656600),  // name = ConsumesDef
   };
 
@@ -938,7 +940,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ConsumesDef (
     sizeof (_oc_CORBA_ComponentIR_ConsumesDef),
     (char *) &_oc_CORBA_ComponentIR_ConsumesDef,
     0,
-    sizeof (CORBA::ComponentIR::ConsumesDef)
+    0
   );
 
 namespace CORBA
@@ -951,28 +953,28 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7444),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7444), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0
     13,
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x74446566),
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x74446566), 
   ACE_NTOHL (0x0),  // name = ComponentDef
   };
 
@@ -981,7 +983,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ComponentDef (
     sizeof (_oc_CORBA_ComponentIR_ComponentDef),
     (char *) &_oc_CORBA_ComponentIR_ComponentDef,
     0,
-    sizeof (CORBA::ComponentIR::ComponentDef)
+    0
   );
 
 namespace CORBA
@@ -994,33 +996,33 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   57,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f5072),
-  ACE_NTOHL (0x6f766964),
-  ACE_NTOHL (0x65734465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5072), 
+  ACE_NTOHL (0x6f766964), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0
     23,
-  ACE_NTOHL (0x50726f76),
-  ACE_NTOHL (0x69646573),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e53),
+  ACE_NTOHL (0x50726f76), 
+  ACE_NTOHL (0x69646573), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x65710000),  // name = ProvidesDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   568, // encapsulation length
@@ -1029,48 +1031,48 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescriptionSeq[] =
     552, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       54,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f436f),
-      ACE_NTOHL (0x6d706f6e),
-      ACE_NTOHL (0x656e7449),
-      ACE_NTOHL (0x522f5072),
-      ACE_NTOHL (0x6f766964),
-      ACE_NTOHL (0x65734465),
-      ACE_NTOHL (0x73637269),
-      ACE_NTOHL (0x7074696f),
-      ACE_NTOHL (0x6e3a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e7449), 
+      ACE_NTOHL (0x522f5072), 
+      ACE_NTOHL (0x6f766964), 
+      ACE_NTOHL (0x65734465), 
+      ACE_NTOHL (0x73637269), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e3a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0
             20,
-      ACE_NTOHL (0x50726f76),
-      ACE_NTOHL (0x69646573),
-      ACE_NTOHL (0x44657363),
-      ACE_NTOHL (0x72697074),
+      ACE_NTOHL (0x50726f76), 
+      ACE_NTOHL (0x69646573), 
+      ACE_NTOHL (0x44657363), 
+      ACE_NTOHL (0x72697074), 
       ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
       5, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       3,
@@ -1079,95 +1081,95 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273),
+      ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       15,
-      ACE_NTOHL (0x696e7465),
-      ACE_NTOHL (0x72666163),
-      ACE_NTOHL (0x655f7479),
+      ACE_NTOHL (0x696e7465), 
+      ACE_NTOHL (0x72666163), 
+      ACE_NTOHL (0x655f7479), 
       ACE_NTOHL (0x70650000),  // name = interface_type
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -1180,7 +1182,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ProvidesDescriptionSeq (
     sizeof (_oc_CORBA_ComponentIR_ProvidesDescriptionSeq),
     (char *) &_oc_CORBA_ComponentIR_ProvidesDescriptionSeq,
     0,
-    sizeof (CORBA::ComponentIR::ProvidesDescriptionSeq)
+    0
   );
 
 namespace CORBA
@@ -1193,31 +1195,31 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f5573),
-  ACE_NTOHL (0x65734465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f5573), 
+  ACE_NTOHL (0x65734465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0
     19,
-  ACE_NTOHL (0x55736573),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e53),
+  ACE_NTOHL (0x55736573), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x65710000),  // name = UsesDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   580, // encapsulation length
@@ -1226,46 +1228,46 @@ static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescriptionSeq[] =
     564, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       50,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f436f),
-      ACE_NTOHL (0x6d706f6e),
-      ACE_NTOHL (0x656e7449),
-      ACE_NTOHL (0x522f5573),
-      ACE_NTOHL (0x65734465),
-      ACE_NTOHL (0x73637269),
-      ACE_NTOHL (0x7074696f),
-      ACE_NTOHL (0x6e3a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e7449), 
+      ACE_NTOHL (0x522f5573), 
+      ACE_NTOHL (0x65734465), 
+      ACE_NTOHL (0x73637269), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e3a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0
             16,
-      ACE_NTOHL (0x55736573),
-      ACE_NTOHL (0x44657363),
-      ACE_NTOHL (0x72697074),
+      ACE_NTOHL (0x55736573), 
+      ACE_NTOHL (0x44657363), 
+      ACE_NTOHL (0x72697074), 
       ACE_NTOHL (0x696f6e00),  // name = UsesDescription
       6, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       3,
@@ -1274,100 +1276,100 @@ static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273),
+      ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       15,
-      ACE_NTOHL (0x696e7465),
-      ACE_NTOHL (0x72666163),
-      ACE_NTOHL (0x655f7479),
+      ACE_NTOHL (0x696e7465), 
+      ACE_NTOHL (0x72666163), 
+      ACE_NTOHL (0x655f7479), 
       ACE_NTOHL (0x70650000),  // name = interface_type
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       12,
-      ACE_NTOHL (0x69735f6d),
-      ACE_NTOHL (0x756c7469),
+      ACE_NTOHL (0x69735f6d), 
+      ACE_NTOHL (0x756c7469), 
       ACE_NTOHL (0x706c6500),  // name = is_multiple
             CORBA::tk_boolean,
 
@@ -1381,7 +1383,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_UsesDescriptionSeq (
     sizeof (_oc_CORBA_ComponentIR_UsesDescriptionSeq),
     (char *) &_oc_CORBA_ComponentIR_UsesDescriptionSeq,
     0,
-    sizeof (CORBA::ComponentIR::UsesDescriptionSeq)
+    0
   );
 
 namespace CORBA
@@ -1394,33 +1396,33 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   58,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f4576),
-  ACE_NTOHL (0x656e7450),
-  ACE_NTOHL (0x6f727444),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e5365),
-  ACE_NTOHL (0x713a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4576), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f727444), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e5365), 
+  ACE_NTOHL (0x713a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0
     24,
-  ACE_NTOHL (0x4576656e),
-  ACE_NTOHL (0x74506f72),
-  ACE_NTOHL (0x74446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x4576656e), 
+  ACE_NTOHL (0x74506f72), 
+  ACE_NTOHL (0x74446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x53657100),  // name = EventPortDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   564, // encapsulation length
@@ -1429,49 +1431,49 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescriptionSeq[] =
     548, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       55,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f436f),
-      ACE_NTOHL (0x6d706f6e),
-      ACE_NTOHL (0x656e7449),
-      ACE_NTOHL (0x522f4576),
-      ACE_NTOHL (0x656e7450),
-      ACE_NTOHL (0x6f727444),
-      ACE_NTOHL (0x65736372),
-      ACE_NTOHL (0x69707469),
-      ACE_NTOHL (0x6f6e3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e7449), 
+      ACE_NTOHL (0x522f4576), 
+      ACE_NTOHL (0x656e7450), 
+      ACE_NTOHL (0x6f727444), 
+      ACE_NTOHL (0x65736372), 
+      ACE_NTOHL (0x69707469), 
+      ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
             21,
-      ACE_NTOHL (0x4576656e),
-      ACE_NTOHL (0x74506f72),
-      ACE_NTOHL (0x74446573),
-      ACE_NTOHL (0x63726970),
-      ACE_NTOHL (0x74696f6e),
+      ACE_NTOHL (0x4576656e), 
+      ACE_NTOHL (0x74506f72), 
+      ACE_NTOHL (0x74446573), 
+      ACE_NTOHL (0x63726970), 
+      ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = EventPortDescription
       5, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       3,
@@ -1480,93 +1482,93 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273),
+      ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       6,
-      ACE_NTOHL (0x6576656e),
+      ACE_NTOHL (0x6576656e), 
       ACE_NTOHL (0x74000000),  // name = event
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -1579,7 +1581,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_EventPortDescriptionSeq (
     sizeof (_oc_CORBA_ComponentIR_EventPortDescriptionSeq),
     (char *) &_oc_CORBA_ComponentIR_EventPortDescriptionSeq,
     0,
-    sizeof (CORBA::ComponentIR::EventPortDescriptionSeq)
+    0
   );
 
 namespace CORBA
@@ -1592,55 +1594,55 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7444),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7444), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ComponentDescription:1.0
     21,
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x74446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x74446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = ComponentDescription
   13, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -1649,122 +1651,122 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   15,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f636f6d),
-  ACE_NTOHL (0x706f6e65),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f636f6d), 
+  ACE_NTOHL (0x706f6e65), 
   ACE_NTOHL (0x6e740000),  // name = base_component
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   21,
-  ACE_NTOHL (0x73757070),
-  ACE_NTOHL (0x6f727465),
-  ACE_NTOHL (0x645f696e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636573),
+  ACE_NTOHL (0x73757070), 
+  ACE_NTOHL (0x6f727465), 
+  ACE_NTOHL (0x645f696e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636573), 
   ACE_NTOHL (0x0),  // name = supported_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -1773,57 +1775,57 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   20,
-  ACE_NTOHL (0x70726f76),
-  ACE_NTOHL (0x69646564),
-  ACE_NTOHL (0x5f696e74),
-  ACE_NTOHL (0x65726661),
+  ACE_NTOHL (0x70726f76), 
+  ACE_NTOHL (0x69646564), 
+  ACE_NTOHL (0x5f696e74), 
+  ACE_NTOHL (0x65726661), 
   ACE_NTOHL (0x63657300),  // name = provided_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   672, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     57,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6d706f6e),
-    ACE_NTOHL (0x656e7449),
-    ACE_NTOHL (0x522f5072),
-    ACE_NTOHL (0x6f766964),
-    ACE_NTOHL (0x65734465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e7449), 
+    ACE_NTOHL (0x522f5072), 
+    ACE_NTOHL (0x6f766964), 
+    ACE_NTOHL (0x65734465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0
         23,
-    ACE_NTOHL (0x50726f76),
-    ACE_NTOHL (0x69646573),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x50726f76), 
+    ACE_NTOHL (0x69646573), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x65710000),  // name = ProvidesDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     568, // encapsulation length
@@ -1832,48 +1834,48 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       552, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         54,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6d706f6e),
-        ACE_NTOHL (0x656e7449),
-        ACE_NTOHL (0x522f5072),
-        ACE_NTOHL (0x6f766964),
-        ACE_NTOHL (0x65734465),
-        ACE_NTOHL (0x73637269),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e3a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6d706f6e), 
+        ACE_NTOHL (0x656e7449), 
+        ACE_NTOHL (0x522f5072), 
+        ACE_NTOHL (0x6f766964), 
+        ACE_NTOHL (0x65734465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0
                 20,
-        ACE_NTOHL (0x50726f76),
-        ACE_NTOHL (0x69646573),
-        ACE_NTOHL (0x44657363),
-        ACE_NTOHL (0x72697074),
+        ACE_NTOHL (0x50726f76), 
+        ACE_NTOHL (0x69646573), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
         ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -1882,95 +1884,95 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         15,
-        ACE_NTOHL (0x696e7465),
-        ACE_NTOHL (0x72666163),
-        ACE_NTOHL (0x655f7479),
+        ACE_NTOHL (0x696e7465), 
+        ACE_NTOHL (0x72666163), 
+        ACE_NTOHL (0x655f7479), 
         ACE_NTOHL (0x70650000),  // name = interface_type
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
 
@@ -1978,33 +1980,33 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 
 
   16,
-  ACE_NTOHL (0x75736564),
-  ACE_NTOHL (0x5f696e74),
-  ACE_NTOHL (0x65726661),
+  ACE_NTOHL (0x75736564), 
+  ACE_NTOHL (0x5f696e74), 
+  ACE_NTOHL (0x65726661), 
   ACE_NTOHL (0x63657300),  // name = used_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   676, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     53,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6d706f6e),
-    ACE_NTOHL (0x656e7449),
-    ACE_NTOHL (0x522f5573),
-    ACE_NTOHL (0x65734465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e7449), 
+    ACE_NTOHL (0x522f5573), 
+    ACE_NTOHL (0x65734465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0
         19,
-    ACE_NTOHL (0x55736573),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x55736573), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x65710000),  // name = UsesDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     580, // encapsulation length
@@ -2013,46 +2015,46 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       564, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         50,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6d706f6e),
-        ACE_NTOHL (0x656e7449),
-        ACE_NTOHL (0x522f5573),
-        ACE_NTOHL (0x65734465),
-        ACE_NTOHL (0x73637269),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e3a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6d706f6e), 
+        ACE_NTOHL (0x656e7449), 
+        ACE_NTOHL (0x522f5573), 
+        ACE_NTOHL (0x65734465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0
                 16,
-        ACE_NTOHL (0x55736573),
-        ACE_NTOHL (0x44657363),
-        ACE_NTOHL (0x72697074),
+        ACE_NTOHL (0x55736573), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
         ACE_NTOHL (0x696f6e00),  // name = UsesDescription
         6, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -2061,100 +2063,100 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         15,
-        ACE_NTOHL (0x696e7465),
-        ACE_NTOHL (0x72666163),
-        ACE_NTOHL (0x655f7479),
+        ACE_NTOHL (0x696e7465), 
+        ACE_NTOHL (0x72666163), 
+        ACE_NTOHL (0x655f7479), 
         ACE_NTOHL (0x70650000),  // name = interface_type
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         12,
-        ACE_NTOHL (0x69735f6d),
-        ACE_NTOHL (0x756c7469),
+        ACE_NTOHL (0x69735f6d), 
+        ACE_NTOHL (0x756c7469), 
         ACE_NTOHL (0x706c6500),  // name = is_multiple
                 CORBA::tk_boolean,
 
@@ -2163,35 +2165,35 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 
 
   13,
-  ACE_NTOHL (0x656d6974),
-  ACE_NTOHL (0x735f6576),
-  ACE_NTOHL (0x656e7473),
+  ACE_NTOHL (0x656d6974), 
+  ACE_NTOHL (0x735f6576), 
+  ACE_NTOHL (0x656e7473), 
   ACE_NTOHL (0x0),  // name = emits_events
     CORBA::tk_alias, // typecode kind for typedefs
   668, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     58,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6d706f6e),
-    ACE_NTOHL (0x656e7449),
-    ACE_NTOHL (0x522f4576),
-    ACE_NTOHL (0x656e7450),
-    ACE_NTOHL (0x6f727444),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e7449), 
+    ACE_NTOHL (0x522f4576), 
+    ACE_NTOHL (0x656e7450), 
+    ACE_NTOHL (0x6f727444), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0
         24,
-    ACE_NTOHL (0x4576656e),
-    ACE_NTOHL (0x74506f72),
-    ACE_NTOHL (0x74446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x4576656e), 
+    ACE_NTOHL (0x74506f72), 
+    ACE_NTOHL (0x74446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x53657100),  // name = EventPortDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     564, // encapsulation length
@@ -2200,49 +2202,49 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       548, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         55,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6d706f6e),
-        ACE_NTOHL (0x656e7449),
-        ACE_NTOHL (0x522f4576),
-        ACE_NTOHL (0x656e7450),
-        ACE_NTOHL (0x6f727444),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6d706f6e), 
+        ACE_NTOHL (0x656e7449), 
+        ACE_NTOHL (0x522f4576), 
+        ACE_NTOHL (0x656e7450), 
+        ACE_NTOHL (0x6f727444), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
                 21,
-        ACE_NTOHL (0x4576656e),
-        ACE_NTOHL (0x74506f72),
-        ACE_NTOHL (0x74446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4576656e), 
+        ACE_NTOHL (0x74506f72), 
+        ACE_NTOHL (0x74446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = EventPortDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -2251,93 +2253,93 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         6,
-        ACE_NTOHL (0x6576656e),
+        ACE_NTOHL (0x6576656e), 
         ACE_NTOHL (0x74000000),  // name = event
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
 
@@ -2345,36 +2347,36 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 
 
   17,
-  ACE_NTOHL (0x7075626c),
-  ACE_NTOHL (0x69736865),
-  ACE_NTOHL (0x735f6576),
-  ACE_NTOHL (0x656e7473),
+  ACE_NTOHL (0x7075626c), 
+  ACE_NTOHL (0x69736865), 
+  ACE_NTOHL (0x735f6576), 
+  ACE_NTOHL (0x656e7473), 
   ACE_NTOHL (0x0),  // name = publishes_events
     CORBA::tk_alias, // typecode kind for typedefs
   668, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     58,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6d706f6e),
-    ACE_NTOHL (0x656e7449),
-    ACE_NTOHL (0x522f4576),
-    ACE_NTOHL (0x656e7450),
-    ACE_NTOHL (0x6f727444),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e7449), 
+    ACE_NTOHL (0x522f4576), 
+    ACE_NTOHL (0x656e7450), 
+    ACE_NTOHL (0x6f727444), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0
         24,
-    ACE_NTOHL (0x4576656e),
-    ACE_NTOHL (0x74506f72),
-    ACE_NTOHL (0x74446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x4576656e), 
+    ACE_NTOHL (0x74506f72), 
+    ACE_NTOHL (0x74446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x53657100),  // name = EventPortDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     564, // encapsulation length
@@ -2383,49 +2385,49 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       548, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         55,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6d706f6e),
-        ACE_NTOHL (0x656e7449),
-        ACE_NTOHL (0x522f4576),
-        ACE_NTOHL (0x656e7450),
-        ACE_NTOHL (0x6f727444),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6d706f6e), 
+        ACE_NTOHL (0x656e7449), 
+        ACE_NTOHL (0x522f4576), 
+        ACE_NTOHL (0x656e7450), 
+        ACE_NTOHL (0x6f727444), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
                 21,
-        ACE_NTOHL (0x4576656e),
-        ACE_NTOHL (0x74506f72),
-        ACE_NTOHL (0x74446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4576656e), 
+        ACE_NTOHL (0x74506f72), 
+        ACE_NTOHL (0x74446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = EventPortDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -2434,93 +2436,93 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         6,
-        ACE_NTOHL (0x6576656e),
+        ACE_NTOHL (0x6576656e), 
         ACE_NTOHL (0x74000000),  // name = event
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
 
@@ -2528,35 +2530,35 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 
 
   16,
-  ACE_NTOHL (0x636f6e73),
-  ACE_NTOHL (0x756d6573),
-  ACE_NTOHL (0x5f657665),
+  ACE_NTOHL (0x636f6e73), 
+  ACE_NTOHL (0x756d6573), 
+  ACE_NTOHL (0x5f657665), 
   ACE_NTOHL (0x6e747300),  // name = consumes_events
     CORBA::tk_alias, // typecode kind for typedefs
   668, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     58,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6d706f6e),
-    ACE_NTOHL (0x656e7449),
-    ACE_NTOHL (0x522f4576),
-    ACE_NTOHL (0x656e7450),
-    ACE_NTOHL (0x6f727444),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f436f), 
+    ACE_NTOHL (0x6d706f6e), 
+    ACE_NTOHL (0x656e7449), 
+    ACE_NTOHL (0x522f4576), 
+    ACE_NTOHL (0x656e7450), 
+    ACE_NTOHL (0x6f727444), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0
         24,
-    ACE_NTOHL (0x4576656e),
-    ACE_NTOHL (0x74506f72),
-    ACE_NTOHL (0x74446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x4576656e), 
+    ACE_NTOHL (0x74506f72), 
+    ACE_NTOHL (0x74446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x53657100),  // name = EventPortDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     564, // encapsulation length
@@ -2565,49 +2567,49 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       548, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         55,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f436f),
-        ACE_NTOHL (0x6d706f6e),
-        ACE_NTOHL (0x656e7449),
-        ACE_NTOHL (0x522f4576),
-        ACE_NTOHL (0x656e7450),
-        ACE_NTOHL (0x6f727444),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f436f), 
+        ACE_NTOHL (0x6d706f6e), 
+        ACE_NTOHL (0x656e7449), 
+        ACE_NTOHL (0x522f4576), 
+        ACE_NTOHL (0x656e7450), 
+        ACE_NTOHL (0x6f727444), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
                 21,
-        ACE_NTOHL (0x4576656e),
-        ACE_NTOHL (0x74506f72),
-        ACE_NTOHL (0x74446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4576656e), 
+        ACE_NTOHL (0x74506f72), 
+        ACE_NTOHL (0x74446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = EventPortDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -2616,93 +2618,93 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         6,
-        ACE_NTOHL (0x6576656e),
+        ACE_NTOHL (0x6576656e), 
         ACE_NTOHL (0x74000000),  // name = event
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
 
@@ -2710,30 +2712,30 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 
 
   11,
-  ACE_NTOHL (0x61747472),
-  ACE_NTOHL (0x69627574),
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   1860, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x74417474),
-    ACE_NTOHL (0x72446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74417474), 
+    ACE_NTOHL (0x72446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
         22,
-    ACE_NTOHL (0x45787441),
-    ACE_NTOHL (0x74747244),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x45787441), 
+    ACE_NTOHL (0x74747244), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1772, // encapsulation length
@@ -2742,47 +2744,47 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       1756, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         46,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x74417474),
-        ACE_NTOHL (0x72696275),
-        ACE_NTOHL (0x74654465),
-        ACE_NTOHL (0x73637269),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e3a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74417474), 
+        ACE_NTOHL (0x72696275), 
+        ACE_NTOHL (0x74654465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
                 24,
-        ACE_NTOHL (0x45787441),
-        ACE_NTOHL (0x74747269),
-        ACE_NTOHL (0x62757465),
-        ACE_NTOHL (0x44657363),
-        ACE_NTOHL (0x72697074),
+        ACE_NTOHL (0x45787441), 
+        ACE_NTOHL (0x74747269), 
+        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
         ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
         8, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -2791,132 +2793,132 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4174),
-          ACE_NTOHL (0x74726962),
-          ACE_NTOHL (0x7574654d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472),
-          ACE_NTOHL (0x69627574),
-          ACE_NTOHL (0x654d6f64),
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f4e4f52),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f524541),
-          ACE_NTOHL (0x444f4e4c),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+          
         15,
-        ACE_NTOHL (0x6765745f),
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6765745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -2925,46 +2927,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -2973,73 +2975,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -3048,29 +3050,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         15,
-        ACE_NTOHL (0x7075745f),
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x7075745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -3079,46 +3081,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -3127,73 +3129,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -3206,7 +3208,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -3217,7 +3219,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_ComponentDescription (
     sizeof (_oc_CORBA_ComponentIR_ComponentDescription),
     (char *) &_oc_CORBA_ComponentIR_ComponentDescription,
     0,
-    sizeof (CORBA::ComponentIR::ComponentDescription)
+    0
   );
 
 namespace CORBA
@@ -3230,27 +3232,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_FactoryDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f4661),
-  ACE_NTOHL (0x63746f72),
-  ACE_NTOHL (0x79446566),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x79446566), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0
     11,
-  ACE_NTOHL (0x46616374),
-  ACE_NTOHL (0x6f727944),
+  ACE_NTOHL (0x46616374), 
+  ACE_NTOHL (0x6f727944), 
   ACE_NTOHL (0x65660000),  // name = FactoryDef
   };
 
@@ -3259,7 +3261,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_FactoryDef (
     sizeof (_oc_CORBA_ComponentIR_FactoryDef),
     (char *) &_oc_CORBA_ComponentIR_FactoryDef,
     0,
-    sizeof (CORBA::ComponentIR::FactoryDef)
+    0
   );
 
 namespace CORBA
@@ -3272,26 +3274,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_FinderDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f4669),
-  ACE_NTOHL (0x6e646572),
-  ACE_NTOHL (0x4465663a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f4669), 
+  ACE_NTOHL (0x6e646572), 
+  ACE_NTOHL (0x4465663a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0
     10,
-  ACE_NTOHL (0x46696e64),
-  ACE_NTOHL (0x65724465),
+  ACE_NTOHL (0x46696e64), 
+  ACE_NTOHL (0x65724465), 
   ACE_NTOHL (0x66000000),  // name = FinderDef
   };
 
@@ -3300,7 +3302,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_FinderDef (
     sizeof (_oc_CORBA_ComponentIR_FinderDef),
     (char *) &_oc_CORBA_ComponentIR_FinderDef,
     0,
-    sizeof (CORBA::ComponentIR::FinderDef)
+    0
   );
 
 namespace CORBA
@@ -3313,25 +3315,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_HomeDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f486f),
-  ACE_NTOHL (0x6d654465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f486f), 
+  ACE_NTOHL (0x6d654465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0
     8,
-  ACE_NTOHL (0x486f6d65),
+  ACE_NTOHL (0x486f6d65), 
   ACE_NTOHL (0x44656600),  // name = HomeDef
   };
 
@@ -3340,7 +3342,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_HomeDef (
     sizeof (_oc_CORBA_ComponentIR_HomeDef),
     (char *) &_oc_CORBA_ComponentIR_HomeDef,
     0,
-    sizeof (CORBA::ComponentIR::HomeDef)
+    0
   );
 
 namespace CORBA
@@ -3353,52 +3355,52 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7449),
-  ACE_NTOHL (0x522f486f),
-  ACE_NTOHL (0x6d654465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7449), 
+  ACE_NTOHL (0x522f486f), 
+  ACE_NTOHL (0x6d654465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/HomeDescription:1.0
     16,
-  ACE_NTOHL (0x486f6d65),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x486f6d65), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = HomeDescription
   12, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -3407,169 +3409,169 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   10,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f686f6d),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f686f6d), 
   ACE_NTOHL (0x65000000),  // name = base_home
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   18,
-  ACE_NTOHL (0x6d616e61),
-  ACE_NTOHL (0x6765645f),
-  ACE_NTOHL (0x636f6d70),
-  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x6d616e61), 
+  ACE_NTOHL (0x6765645f), 
+  ACE_NTOHL (0x636f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
   ACE_NTOHL (0x74000000),  // name = managed_component
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   12,
-  ACE_NTOHL (0x7072696d),
-  ACE_NTOHL (0x6172795f),
+  ACE_NTOHL (0x7072696d), 
+  ACE_NTOHL (0x6172795f), 
   ACE_NTOHL (0x6b657900),  // name = primary_key
     CORBA::tk_struct, // typecode kind
   996, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5661),
-    ACE_NTOHL (0x6c756544),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e3a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5661), 
+    ACE_NTOHL (0x6c756544), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e3a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDescription:1.0
         17,
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x65446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x56616c75), 
+    ACE_NTOHL (0x65446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
     ACE_NTOHL (0x0),  // name = ValueDescription
     10, // member count
         5,
-    ACE_NTOHL (0x6e616d65),
+    ACE_NTOHL (0x6e616d65), 
     ACE_NTOHL (0x0),  // name = name
         CORBA::tk_alias, // typecode kind for typedefs
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4964),
-      ACE_NTOHL (0x656e7469),
-      ACE_NTOHL (0x66696572),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4964), 
+      ACE_NTOHL (0x656e7469), 
+      ACE_NTOHL (0x66696572), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
             11,
-      ACE_NTOHL (0x4964656e),
-      ACE_NTOHL (0x74696669),
+      ACE_NTOHL (0x4964656e), 
+      ACE_NTOHL (0x74696669), 
       ACE_NTOHL (0x65720000),  // name = Identifier
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
     3,
@@ -3578,108 +3580,108 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
     72, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x49643a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x49643a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
             13,
-      ACE_NTOHL (0x5265706f),
-      ACE_NTOHL (0x7369746f),
-      ACE_NTOHL (0x72794964),
+      ACE_NTOHL (0x5265706f), 
+      ACE_NTOHL (0x7369746f), 
+      ACE_NTOHL (0x72794964), 
       ACE_NTOHL (0x0),  // name = RepositoryId
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
     12,
-    ACE_NTOHL (0x69735f61),
-    ACE_NTOHL (0x62737472),
+    ACE_NTOHL (0x69735f61), 
+    ACE_NTOHL (0x62737472), 
     ACE_NTOHL (0x61637400),  // name = is_abstract
         CORBA::tk_boolean,
 
     10,
-    ACE_NTOHL (0x69735f63),
-    ACE_NTOHL (0x7573746f),
+    ACE_NTOHL (0x69735f63), 
+    ACE_NTOHL (0x7573746f), 
     ACE_NTOHL (0x6d000000),  // name = is_custom
         CORBA::tk_boolean,
 
     11,
-    ACE_NTOHL (0x64656669),
-    ACE_NTOHL (0x6e65645f),
+    ACE_NTOHL (0x64656669), 
+    ACE_NTOHL (0x6e65645f), 
     ACE_NTOHL (0x696e0000),  // name = defined_in
         CORBA::tk_alias, // typecode kind for typedefs
     72, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x49643a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x49643a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
             13,
-      ACE_NTOHL (0x5265706f),
-      ACE_NTOHL (0x7369746f),
-      ACE_NTOHL (0x72794964),
+      ACE_NTOHL (0x5265706f), 
+      ACE_NTOHL (0x7369746f), 
+      ACE_NTOHL (0x72794964), 
       ACE_NTOHL (0x0),  // name = RepositoryId
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
     8,
-    ACE_NTOHL (0x76657273),
+    ACE_NTOHL (0x76657273), 
     ACE_NTOHL (0x696f6e00),  // name = version
         CORBA::tk_alias, // typecode kind for typedefs
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5665),
-      ACE_NTOHL (0x7273696f),
-      ACE_NTOHL (0x6e537065),
-      ACE_NTOHL (0x633a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5665), 
+      ACE_NTOHL (0x7273696f), 
+      ACE_NTOHL (0x6e537065), 
+      ACE_NTOHL (0x633a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
             12,
-      ACE_NTOHL (0x56657273),
-      ACE_NTOHL (0x696f6e53),
+      ACE_NTOHL (0x56657273), 
+      ACE_NTOHL (0x696f6e53), 
       ACE_NTOHL (0x70656300),  // name = VersionSpec
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
     21,
-    ACE_NTOHL (0x73757070),
-    ACE_NTOHL (0x6f727465),
-    ACE_NTOHL (0x645f696e),
-    ACE_NTOHL (0x74657266),
-    ACE_NTOHL (0x61636573),
+    ACE_NTOHL (0x73757070), 
+    ACE_NTOHL (0x6f727465), 
+    ACE_NTOHL (0x645f696e), 
+    ACE_NTOHL (0x74657266), 
+    ACE_NTOHL (0x61636573), 
     ACE_NTOHL (0x0),  // name = supported_interfaces
         CORBA::tk_alias, // typecode kind for typedefs
     164, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       38,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x49645365),
-      ACE_NTOHL (0x713a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x49645365), 
+      ACE_NTOHL (0x713a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
             16,
-      ACE_NTOHL (0x5265706f),
-      ACE_NTOHL (0x7369746f),
-      ACE_NTOHL (0x72794964),
+      ACE_NTOHL (0x5265706f), 
+      ACE_NTOHL (0x7369746f), 
+      ACE_NTOHL (0x72794964), 
       ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
             CORBA::tk_sequence, // typecode kind
       88, // encapsulation length
@@ -3688,51 +3690,51 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         0U,
 
 
     21,
-    ACE_NTOHL (0x61627374),
-    ACE_NTOHL (0x72616374),
-    ACE_NTOHL (0x5f626173),
-    ACE_NTOHL (0x655f7661),
-    ACE_NTOHL (0x6c756573),
+    ACE_NTOHL (0x61627374), 
+    ACE_NTOHL (0x72616374), 
+    ACE_NTOHL (0x5f626173), 
+    ACE_NTOHL (0x655f7661), 
+    ACE_NTOHL (0x6c756573), 
     ACE_NTOHL (0x0),  // name = abstract_base_values
         CORBA::tk_alias, // typecode kind for typedefs
     164, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       38,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x49645365),
-      ACE_NTOHL (0x713a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x49645365), 
+      ACE_NTOHL (0x713a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
             16,
-      ACE_NTOHL (0x5265706f),
-      ACE_NTOHL (0x7369746f),
-      ACE_NTOHL (0x72794964),
+      ACE_NTOHL (0x5265706f), 
+      ACE_NTOHL (0x7369746f), 
+      ACE_NTOHL (0x72794964), 
       ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
             CORBA::tk_sequence, // typecode kind
       88, // encapsulation length
@@ -3741,82 +3743,82 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         0U,
 
 
     15,
-    ACE_NTOHL (0x69735f74),
-    ACE_NTOHL (0x72756e63),
-    ACE_NTOHL (0x61746162),
+    ACE_NTOHL (0x69735f74), 
+    ACE_NTOHL (0x72756e63), 
+    ACE_NTOHL (0x61746162), 
     ACE_NTOHL (0x6c650000),  // name = is_truncatable
         CORBA::tk_boolean,
 
     11,
-    ACE_NTOHL (0x62617365),
-    ACE_NTOHL (0x5f76616c),
+    ACE_NTOHL (0x62617365), 
+    ACE_NTOHL (0x5f76616c), 
     ACE_NTOHL (0x75650000),  // name = base_value
         CORBA::tk_alias, // typecode kind for typedefs
     72, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x49643a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x49643a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
             13,
-      ACE_NTOHL (0x5265706f),
-      ACE_NTOHL (0x7369746f),
-      ACE_NTOHL (0x72794964),
+      ACE_NTOHL (0x5265706f), 
+      ACE_NTOHL (0x7369746f), 
+      ACE_NTOHL (0x72794964), 
       ACE_NTOHL (0x0),  // name = RepositoryId
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
 
   10,
-  ACE_NTOHL (0x66616374),
-  ACE_NTOHL (0x6f726965),
+  ACE_NTOHL (0x66616374), 
+  ACE_NTOHL (0x6f726965), 
   ACE_NTOHL (0x73000000),  // name = factories
     CORBA::tk_alias, // typecode kind for typedefs
   2036, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1956, // encapsulation length
@@ -3825,46 +3827,46 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
       1940, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f70),
-        ACE_NTOHL (0x65726174),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572),
-        ACE_NTOHL (0x6174696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -3873,128 +3875,128 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         7,
-        ACE_NTOHL (0x72657375),
+        ACE_NTOHL (0x72657375), 
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4f70),
-          ACE_NTOHL (0x65726174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572),
-          ACE_NTOHL (0x6174696f),
-          ACE_NTOHL (0x6e4d6f64),
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e),
-          ACE_NTOHL (0x4f524d41),
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f),
-          ACE_NTOHL (0x4e455741),
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+          
         9,
-        ACE_NTOHL (0x636f6e74),
-        ACE_NTOHL (0x65787473),
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f436f),
-          ACE_NTOHL (0x6e746578),
-          ACE_NTOHL (0x74496453),
-          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74),
-          ACE_NTOHL (0x65787449),
-          ACE_NTOHL (0x64536571),
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           164, // encapsulation length
@@ -4003,40 +4005,40 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             148, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f436f),
-              ACE_NTOHL (0x6e746578),
-              ACE_NTOHL (0x74496465),
-              ACE_NTOHL (0x6e746966),
-              ACE_NTOHL (0x6965723a),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74),
-              ACE_NTOHL (0x65787449),
-              ACE_NTOHL (0x64656e74),
-              ACE_NTOHL (0x69666965),
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
 
@@ -4044,28 +4046,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261),
-        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         496, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5061),
-          ACE_NTOHL (0x72446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           416, // encapsulation length
@@ -4074,135 +4076,135 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             400, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5061),
-              ACE_NTOHL (0x72616d65),
-              ACE_NTOHL (0x74657244),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261),
-              ACE_NTOHL (0x6d657465),
-              ACE_NTOHL (0x72446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065),
-              ACE_NTOHL (0x5f646566),
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4944),
-                ACE_NTOHL (0x4c547970),
-                ACE_NTOHL (0x653a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54),
+                ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
               5,
-              ACE_NTOHL (0x6d6f6465),
+              ACE_NTOHL (0x6d6f6465), 
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5061),
-                ACE_NTOHL (0x72616d65),
-                ACE_NTOHL (0x7465724d),
-                ACE_NTOHL (0x6f64653a),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261),
-                ACE_NTOHL (0x6d657465),
-                ACE_NTOHL (0x724d6f64),
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f4f55),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+                
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -4211,46 +4213,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -4259,73 +4261,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -4338,93 +4340,1115 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   8,
-  ACE_NTOHL (0x66696e64),
+  ACE_NTOHL (0x66696e64), 
   ACE_NTOHL (0x65727300),  // name = finders
     CORBA::tk_alias, // typecode kind for typedefs
-  96, // encapsulation length
+  2036, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
-    16, // encapsulation length
+    1956, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      0xffffffff, // indirection
-      0xfffff7f4, // negative offset (-2060)
+      CORBA::tk_struct, // typecode kind
+      1940, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
+                21,
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x0),  // name = OperationDescription
+        9, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                CORBA::tk_alias, // typecode kind for typedefs
+        68, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          33,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                    11,
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x65720000),  // name = Identifier
+                    CORBA::tk_string, 
+          0U, // string length
+
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                CORBA::tk_alias, // typecode kind for typedefs
+        72, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          35,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                    13,
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x0),  // name = RepositoryId
+                    CORBA::tk_string, 
+          0U, // string length
+
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                CORBA::tk_alias, // typecode kind for typedefs
+        72, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          35,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                    13,
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x0),  // name = RepositoryId
+                    CORBA::tk_string, 
+          0U, // string length
+
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                CORBA::tk_alias, // typecode kind for typedefs
+        68, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          34,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                    12,
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
+          ACE_NTOHL (0x70656300),  // name = VersionSpec
+                    CORBA::tk_string, 
+          0U, // string length
+
+        7,
+        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x6c740000),  // name = result
+                CORBA::tk_TypeCode,
+
+        5,
+        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x0),  // name = mode
+                CORBA::tk_enum, // typecode kind
+        100, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+          36,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
+          14,
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x65000000),  // name = OperationMode
+          2, // member count
+          10,
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
+          10,
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
+          
+        9,
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x0),  // name = contexts
+                CORBA::tk_alias, // typecode kind for typedefs
+        236, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          35,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
+                    13,
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x0),  // name = ContextIdSeq
+                    CORBA::tk_sequence, // typecode kind
+          164, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_alias, // typecode kind for typedefs
+            148, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              40,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
+                            18,
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x72000000),  // name = ContextIdentifier
+                            CORBA::tk_alias, // typecode kind for typedefs
+              68, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                33,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                11,
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x65720000),  // name = Identifier
+                                CORBA::tk_string, 
+                0U, // string length
+
+
+            0U,
+
+
+        11,
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x72730000),  // name = parameters
+                CORBA::tk_alias, // typecode kind for typedefs
+        496, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
+                    18,
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
+                    CORBA::tk_sequence, // typecode kind
+          416, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            400, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
+                            21,
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x0),  // name = ParameterDescription
+              4, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            CORBA::tk_alias, // typecode kind for typedefs
+              68, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                33,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                11,
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x65720000),  // name = Identifier
+                                CORBA::tk_string, 
+                0U, // string length
+
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+              9,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x0),  // name = type_def
+                            CORBA::tk_objref, // typecode kind
+              52, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                30,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                8,
+                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x79706500),  // name = IDLType
+                
+              5,
+              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x0),  // name = mode
+                            CORBA::tk_enum, // typecode kind
+              116, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+                36,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+                14,
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x65000000),  // name = ParameterMode
+                3, // member count
+                9,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x0),  // name = PARAM_IN
+                10,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+                12,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+                
+
+            0U,
+
+
+        11,
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = exceptions
+                CORBA::tk_alias, // typecode kind for typedefs
+        556, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                    18,
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                    CORBA::tk_sequence, // typecode kind
+          476, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            460, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                            21,
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x0),  // name = ExceptionDescription
+              5, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            CORBA::tk_alias, // typecode kind for typedefs
+              68, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                33,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                11,
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x65720000),  // name = Identifier
+                                CORBA::tk_string, 
+                0U, // string length
+
+              3,
+              ACE_NTOHL (0x69640000),  // name = id
+                            CORBA::tk_alias, // typecode kind for typedefs
+              72, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                35,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                                13,
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x0),  // name = RepositoryId
+                                CORBA::tk_string, 
+                0U, // string length
+
+              11,
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x696e0000),  // name = defined_in
+                            CORBA::tk_alias, // typecode kind for typedefs
+              72, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                35,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                                13,
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x0),  // name = RepositoryId
+                                CORBA::tk_string, 
+                0U, // string length
+
+              8,
+              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x696f6e00),  // name = version
+                            CORBA::tk_alias, // typecode kind for typedefs
+              68, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                34,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
+                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                                12,
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
+                ACE_NTOHL (0x70656300),  // name = VersionSpec
+                                CORBA::tk_string, 
+                0U, // string length
+
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+
+            0U,
+
+
+
       0U,
 
 
   11,
-  ACE_NTOHL (0x6f706572),
-  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e730000),  // name = operations
     CORBA::tk_alias, // typecode kind for typedefs
-  96, // encapsulation length
+  2036, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
-    16, // encapsulation length
+    1956, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      0xffffffff, // indirection
-      0xfffff77c, // negative offset (-2180)
+      CORBA::tk_struct, // typecode kind
+      1940, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
+                21,
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x0),  // name = OperationDescription
+        9, // member count
+                5,
+        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x0),  // name = name
+                CORBA::tk_alias, // typecode kind for typedefs
+        68, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          33,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                    11,
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
+          ACE_NTOHL (0x65720000),  // name = Identifier
+                    CORBA::tk_string, 
+          0U, // string length
+
+        3,
+        ACE_NTOHL (0x69640000),  // name = id
+                CORBA::tk_alias, // typecode kind for typedefs
+        72, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          35,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                    13,
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x0),  // name = RepositoryId
+                    CORBA::tk_string, 
+          0U, // string length
+
+        11,
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x696e0000),  // name = defined_in
+                CORBA::tk_alias, // typecode kind for typedefs
+        72, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          35,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                    13,
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
+          ACE_NTOHL (0x0),  // name = RepositoryId
+                    CORBA::tk_string, 
+          0U, // string length
+
+        8,
+        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x696f6e00),  // name = version
+                CORBA::tk_alias, // typecode kind for typedefs
+        68, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          34,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
+          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                    12,
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
+          ACE_NTOHL (0x70656300),  // name = VersionSpec
+                    CORBA::tk_string, 
+          0U, // string length
+
+        7,
+        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x6c740000),  // name = result
+                CORBA::tk_TypeCode,
+
+        5,
+        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x0),  // name = mode
+                CORBA::tk_enum, // typecode kind
+        100, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+          36,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
+          14,
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x65000000),  // name = OperationMode
+          2, // member count
+          10,
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
+          10,
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
+          
+        9,
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x0),  // name = contexts
+                CORBA::tk_alias, // typecode kind for typedefs
+        236, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          35,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
+                    13,
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x0),  // name = ContextIdSeq
+                    CORBA::tk_sequence, // typecode kind
+          164, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_alias, // typecode kind for typedefs
+            148, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              40,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
+                            18,
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x72000000),  // name = ContextIdentifier
+                            CORBA::tk_alias, // typecode kind for typedefs
+              68, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                33,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                11,
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x65720000),  // name = Identifier
+                                CORBA::tk_string, 
+                0U, // string length
+
+
+            0U,
+
+
+        11,
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x72730000),  // name = parameters
+                CORBA::tk_alias, // typecode kind for typedefs
+        496, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
+                    18,
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
+                    CORBA::tk_sequence, // typecode kind
+          416, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            400, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
+                            21,
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x0),  // name = ParameterDescription
+              4, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            CORBA::tk_alias, // typecode kind for typedefs
+              68, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                33,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                11,
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x65720000),  // name = Identifier
+                                CORBA::tk_string, 
+                0U, // string length
+
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+              9,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x0),  // name = type_def
+                            CORBA::tk_objref, // typecode kind
+              52, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                30,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                8,
+                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x79706500),  // name = IDLType
+                
+              5,
+              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x0),  // name = mode
+                            CORBA::tk_enum, // typecode kind
+              116, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+                36,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+                14,
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x65000000),  // name = ParameterMode
+                3, // member count
+                9,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x0),  // name = PARAM_IN
+                10,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+                12,
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+                
+
+            0U,
+
+
+        11,
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e730000),  // name = exceptions
+                CORBA::tk_alias, // typecode kind for typedefs
+        556, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                    18,
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                    CORBA::tk_sequence, // typecode kind
+          476, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_struct, // typecode kind
+            460, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              43,
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                            21,
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x0),  // name = ExceptionDescription
+              5, // member count
+                            5,
+              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x0),  // name = name
+                            CORBA::tk_alias, // typecode kind for typedefs
+              68, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                33,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
+                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                11,
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
+                ACE_NTOHL (0x65720000),  // name = Identifier
+                                CORBA::tk_string, 
+                0U, // string length
+
+              3,
+              ACE_NTOHL (0x69640000),  // name = id
+                            CORBA::tk_alias, // typecode kind for typedefs
+              72, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                35,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                                13,
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x0),  // name = RepositoryId
+                                CORBA::tk_string, 
+                0U, // string length
+
+              11,
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x696e0000),  // name = defined_in
+                            CORBA::tk_alias, // typecode kind for typedefs
+              72, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                35,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
+                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                                13,
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
+                ACE_NTOHL (0x0),  // name = RepositoryId
+                                CORBA::tk_string, 
+                0U, // string length
+
+              8,
+              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x696f6e00),  // name = version
+                            CORBA::tk_alias, // typecode kind for typedefs
+              68, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                34,
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
+                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                                12,
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
+                ACE_NTOHL (0x70656300),  // name = VersionSpec
+                                CORBA::tk_string, 
+                0U, // string length
+
+              5,
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x0),  // name = type
+                            CORBA::tk_TypeCode,
+
+
+            0U,
+
+
+
       0U,
 
 
   11,
-  ACE_NTOHL (0x61747472),
-  ACE_NTOHL (0x69627574),
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   1860, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x74417474),
-    ACE_NTOHL (0x72446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74417474), 
+    ACE_NTOHL (0x72446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
         22,
-    ACE_NTOHL (0x45787441),
-    ACE_NTOHL (0x74747244),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x45787441), 
+    ACE_NTOHL (0x74747244), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1772, // encapsulation length
@@ -4433,47 +5457,47 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       1756, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         46,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x74417474),
-        ACE_NTOHL (0x72696275),
-        ACE_NTOHL (0x74654465),
-        ACE_NTOHL (0x73637269),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e3a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74417474), 
+        ACE_NTOHL (0x72696275), 
+        ACE_NTOHL (0x74654465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
                 24,
-        ACE_NTOHL (0x45787441),
-        ACE_NTOHL (0x74747269),
-        ACE_NTOHL (0x62757465),
-        ACE_NTOHL (0x44657363),
-        ACE_NTOHL (0x72697074),
+        ACE_NTOHL (0x45787441), 
+        ACE_NTOHL (0x74747269), 
+        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
         ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
         8, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -4482,132 +5506,132 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4174),
-          ACE_NTOHL (0x74726962),
-          ACE_NTOHL (0x7574654d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472),
-          ACE_NTOHL (0x69627574),
-          ACE_NTOHL (0x654d6f64),
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f4e4f52),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f524541),
-          ACE_NTOHL (0x444f4e4c),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+          
         15,
-        ACE_NTOHL (0x6765745f),
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6765745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -4616,46 +5640,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -4664,73 +5688,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -4739,29 +5763,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         15,
-        ACE_NTOHL (0x7075745f),
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x7075745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -4770,46 +5794,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -4818,73 +5842,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -4897,7 +5921,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -4908,7 +5932,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ComponentIR_HomeDescription (
     sizeof (_oc_CORBA_ComponentIR_HomeDescription),
     (char *) &_oc_CORBA_ComponentIR_HomeDescription,
     0,
-    sizeof (CORBA::ComponentIR::HomeDescription)
+    0
   );
 
 namespace CORBA
@@ -5195,7 +6219,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5232,8 +6256,8 @@ CORBA::Boolean operator>>= (
     CORBA::ComponentIR::ProvidesDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ComponentIR::ProvidesDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::ProvidesDescription *&> (
       _tao_elem
     );
 }
@@ -5308,7 +6332,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5345,8 +6369,8 @@ CORBA::Boolean operator>>= (
     CORBA::ComponentIR::UsesDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ComponentIR::UsesDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::UsesDescription *&> (
       _tao_elem
     );
 }
@@ -5421,7 +6445,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5458,8 +6482,8 @@ CORBA::Boolean operator>>= (
     CORBA::ComponentIR::EventPortDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ComponentIR::EventPortDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::EventPortDescription *&> (
       _tao_elem
     );
 }
@@ -5699,7 +6723,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5736,8 +6760,8 @@ CORBA::Boolean operator>>= (
     CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ComponentIR::ProvidesDescriptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::ProvidesDescriptionSeq *&> (
       _tao_elem
     );
 }
@@ -5757,7 +6781,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5794,8 +6818,8 @@ CORBA::Boolean operator>>= (
     CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ComponentIR::UsesDescriptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::UsesDescriptionSeq *&> (
       _tao_elem
     );
 }
@@ -5815,7 +6839,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5852,8 +6876,8 @@ CORBA::Boolean operator>>= (
     CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ComponentIR::EventPortDescriptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::EventPortDescriptionSeq *&> (
       _tao_elem
     );
 }
@@ -5873,7 +6897,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5910,8 +6934,8 @@ CORBA::Boolean operator>>= (
     CORBA::ComponentIR::ComponentDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ComponentIR::ComponentDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::ComponentDescription *&> (
       _tao_elem
     );
 }
@@ -6096,7 +7120,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -6133,8 +7157,8 @@ CORBA::Boolean operator>>= (
     CORBA::ComponentIR::HomeDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ComponentIR::HomeDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::HomeDescription *&> (
       _tao_elem
     );
 }
@@ -6154,8 +7178,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -6380,5 +7402,4 @@ CORBA::Boolean operator>>= (
         CORBA::ComponentIR::HomeDescription \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index a41531e4f0e..4a5d12bf681 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IFR_ComponentsC.h"
@@ -46,85 +46,15 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ComponentsC.i"
+#include "IFR_ComponentsC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:582
-
-#if !defined (_CORBA_ANY__ARG_TRAITS_CS_)
-#define _CORBA_ANY__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Container_ptr,
-            CORBA::Container_var,
-            CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::IDLType>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::IDLType_ptr,
-            CORBA::IDLType_var,
-            CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
@@ -144,7 +74,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -180,7 +110,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
@@ -199,64 +129,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::AbstractInterfaceDefSeq,
-            CORBA::AbstractInterfaceDefSeq_var,
-            CORBA::AbstractInterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::StructMemberSeq,
-            CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InitializerSeq,
-            CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
@@ -275,62 +148,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::UnionMemberSeq,
-            CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::EnumMemberSeq,
-            CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::PrimitiveKind>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::PrimitiveKind
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
@@ -349,41 +167,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeMode>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::AttributeMode
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::OperationMode
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
@@ -400,25 +184,6 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ContextIdSeq,
-            CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_CS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_CS_
@@ -663,7 +428,7 @@ void
 CORBA::ComponentIR::EventDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EventDef *_tao_tmp_pointer =
-    ACE_static_cast (EventDef *, _tao_void_pointer);
+    static_cast<EventDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -716,38 +481,38 @@ CORBA::ComponentIR::EventDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -824,8 +589,8 @@ TAO::Collocation_Proxy_Broker *
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces
+    ::CORBA::ComponentIR::ComponentDef_ptr base_component,
+    const ::CORBA::InterfaceDefSeq & supports_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -842,12 +607,12 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
+  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -881,10 +646,10 @@ TAO::Collocation_Proxy_Broker *
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::HomeDef_ptr base_home,
-    CORBA::ComponentIR::ComponentDef_ptr managed_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
-    CORBA::ValueDef_ptr primary_key
+    ::CORBA::ComponentIR::HomeDef_ptr base_home,
+    ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
+    const ::CORBA::InterfaceDefSeq & supports_interfaces,
+    ::CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -901,14 +666,14 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
-  TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
-  TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
+  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
+  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
+  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -944,13 +709,13 @@ TAO::Collocation_Proxy_Broker *
     const char * id,
     const char * name,
     const char * version,
-    CORBA::Boolean is_custom,
-    CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
-    CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::ExtInitializerSeq & initializers
+    ::CORBA::Boolean is_custom,
+    ::CORBA::Boolean is_abstract,
+    ::CORBA::ValueDef_ptr base_value,
+    ::CORBA::Boolean is_truncatable,
+    const ::CORBA::ValueDefSeq & abstract_base_values,
+    const ::CORBA::InterfaceDefSeq & supported_interfaces,
+    const ::CORBA::ExtInitializerSeq & initializers
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -967,17 +732,17 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits<CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits<CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
+  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
+  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1034,7 +799,7 @@ void
 CORBA::ComponentIR::Container::_tao_any_destructor (void *_tao_void_pointer)
 {
   Container *_tao_tmp_pointer =
-    ACE_static_cast (Container *, _tao_void_pointer);
+    static_cast<Container *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1087,22 +852,22 @@ CORBA::ComponentIR::Container::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1198,7 +963,7 @@ void
 CORBA::ComponentIR::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ModuleDef *_tao_tmp_pointer =
-    ACE_static_cast (ModuleDef *, _tao_void_pointer);
+    static_cast<ModuleDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1251,34 +1016,34 @@ CORBA::ComponentIR::ModuleDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ModuleDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1374,7 +1139,7 @@ void
 CORBA::ComponentIR::Repository::_tao_any_destructor (void *_tao_void_pointer)
 {
   Repository *_tao_tmp_pointer =
-    ACE_static_cast (Repository *, _tao_void_pointer);
+    static_cast<Repository *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1427,30 +1192,30 @@ CORBA::ComponentIR::Repository::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Repository:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/Repository:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1540,7 +1305,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_ProvidesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1566,7 +1331,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::ProvidesDef::interface_type (
-    CORBA::InterfaceDef_ptr interface_type
+    ::CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1583,8 +1348,8 @@ void CORBA::ComponentIR::ProvidesDef::interface_type (
       CORBA_ComponentIR_ProvidesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1630,7 +1395,7 @@ void
 CORBA::ComponentIR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProvidesDef *_tao_tmp_pointer =
-    ACE_static_cast (ProvidesDef *, _tao_void_pointer);
+    static_cast<ProvidesDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1683,22 +1448,22 @@ CORBA::ComponentIR::ProvidesDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1731,7 +1496,7 @@ CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor (
   )
 {
   ProvidesDescription *_tao_tmp_pointer =
-    ACE_static_cast (ProvidesDescription *, _tao_void_pointer);
+    static_cast<ProvidesDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1801,7 +1566,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1827,7 +1592,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::UsesDef::interface_type (
-    CORBA::InterfaceDef_ptr interface_type
+    ::CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1844,8 +1609,8 @@ void CORBA::ComponentIR::UsesDef::interface_type (
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1886,7 +1651,7 @@ CORBA::Boolean CORBA::ComponentIR::UsesDef::is_multiple (
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1912,7 +1677,7 @@ CORBA::Boolean CORBA::ComponentIR::UsesDef::is_multiple (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::UsesDef::is_multiple (
-    CORBA::Boolean is_multiple
+    ::CORBA::Boolean is_multiple
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1929,8 +1694,8 @@ void CORBA::ComponentIR::UsesDef::is_multiple (
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1976,7 +1741,7 @@ void
 CORBA::ComponentIR::UsesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   UsesDef *_tao_tmp_pointer =
-    ACE_static_cast (UsesDef *, _tao_void_pointer);
+    static_cast<UsesDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2029,22 +1794,22 @@ CORBA::ComponentIR::UsesDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2077,7 +1842,7 @@ CORBA::ComponentIR::UsesDescription::_tao_any_destructor (
   )
 {
   UsesDescription *_tao_tmp_pointer =
-    ACE_static_cast (UsesDescription *, _tao_void_pointer);
+    static_cast<UsesDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2147,7 +1912,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_EventPortDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2173,7 +1938,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::EventPortDef::event (
-    CORBA::ComponentIR::EventDef_ptr event
+    ::CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2190,8 +1955,8 @@ void CORBA::ComponentIR::EventPortDef::event (
       CORBA_ComponentIR_EventPortDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2233,8 +1998,8 @@ CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a (
       CORBA_ComponentIR_EventPortDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_event_id (event_id);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_event_id (event_id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2282,7 +2047,7 @@ void
 CORBA::ComponentIR::EventPortDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EventPortDef *_tao_tmp_pointer =
-    ACE_static_cast (EventPortDef *, _tao_void_pointer);
+    static_cast<EventPortDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2335,22 +2100,22 @@ CORBA::ComponentIR::EventPortDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2383,7 +2148,7 @@ CORBA::ComponentIR::EventPortDescription::_tao_any_destructor (
   )
 {
   EventPortDescription *_tao_tmp_pointer =
-    ACE_static_cast (EventPortDescription *, _tao_void_pointer);
+    static_cast<EventPortDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2458,7 +2223,7 @@ void
 CORBA::ComponentIR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EmitsDef *_tao_tmp_pointer =
-    ACE_static_cast (EmitsDef *, _tao_void_pointer);
+    static_cast<EmitsDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2511,26 +2276,26 @@ CORBA::ComponentIR::EmitsDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2625,7 +2390,7 @@ void
 CORBA::ComponentIR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   PublishesDef *_tao_tmp_pointer =
-    ACE_static_cast (PublishesDef *, _tao_void_pointer);
+    static_cast<PublishesDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2678,26 +2443,26 @@ CORBA::ComponentIR::PublishesDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2792,7 +2557,7 @@ void
 CORBA::ComponentIR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConsumesDef *_tao_tmp_pointer =
-    ACE_static_cast (ConsumesDef *, _tao_void_pointer);
+    static_cast<ConsumesDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2845,26 +2610,26 @@ CORBA::ComponentIR::ConsumesDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2954,7 +2719,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2980,7 +2745,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::ComponentDef::base_component (
-    CORBA::ComponentIR::ComponentDef_ptr base_component
+    ::CORBA::ComponentIR::ComponentDef_ptr base_component
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2997,8 +2762,8 @@ void CORBA::ComponentIR::ComponentDef::base_component (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3039,7 +2804,7 @@ void CORBA::ComponentIR::ComponentDef::base_component (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3065,7 +2830,7 @@ void CORBA::ComponentIR::ComponentDef::base_component (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::ComponentDef::supported_interfaces (
-    const CORBA::InterfaceDefSeq & supported_interfaces
+    const ::CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3082,8 +2847,8 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3111,7 +2876,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type
+    ::CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3128,11 +2893,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::ProvidesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< CORBA::ComponentIR::ProvidesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3165,8 +2930,8 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
-    CORBA::Boolean is_multiple
+    ::CORBA::InterfaceDef_ptr interface_type,
+    ::CORBA::Boolean is_multiple
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3183,12 +2948,12 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::UsesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
+  TAO::Arg_Traits< CORBA::ComponentIR::UsesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3222,7 +2987,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::EventDef_ptr event
+    ::CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3239,11 +3004,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::EmitsDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< CORBA::ComponentIR::EmitsDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3276,7 +3041,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::EventDef_ptr event
+    ::CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3293,11 +3058,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::PublishesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< CORBA::ComponentIR::PublishesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3330,7 +3095,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ComponentIR::EventDef_ptr event
+    ::CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3347,11 +3112,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::ConsumesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< CORBA::ComponentIR::ConsumesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3402,7 +3167,7 @@ void
 CORBA::ComponentIR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ComponentDef *_tao_tmp_pointer =
-    ACE_static_cast (ComponentDef *, _tao_void_pointer);
+    static_cast<ComponentDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3455,42 +3220,42 @@ CORBA::ComponentIR::ComponentDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3561,7 +3326,7 @@ void CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor (
   )
 {
   ProvidesDescriptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (ProvidesDescriptionSeq *, _tao_void_pointer);
+    static_cast<ProvidesDescriptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -3614,7 +3379,7 @@ void CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor (
   )
 {
   UsesDescriptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (UsesDescriptionSeq *, _tao_void_pointer);
+    static_cast<UsesDescriptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -3667,7 +3432,7 @@ void CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor (
   )
 {
   EventPortDescriptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (EventPortDescriptionSeq *, _tao_void_pointer);
+    static_cast<EventPortDescriptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -3682,7 +3447,7 @@ CORBA::ComponentIR::ComponentDescription::_tao_any_destructor (
   )
 {
   ComponentDescription *_tao_tmp_pointer =
-    ACE_static_cast (ComponentDescription *, _tao_void_pointer);
+    static_cast<ComponentDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -3757,7 +3522,7 @@ void
 CORBA::ComponentIR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FactoryDef *_tao_tmp_pointer =
-    ACE_static_cast (FactoryDef *, _tao_void_pointer);
+    static_cast<FactoryDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3810,26 +3575,26 @@ CORBA::ComponentIR::FactoryDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/OperationDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3924,7 +3689,7 @@ void
 CORBA::ComponentIR::FinderDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FinderDef *_tao_tmp_pointer =
-    ACE_static_cast (FinderDef *, _tao_void_pointer);
+    static_cast<FinderDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3977,26 +3742,26 @@ CORBA::ComponentIR::FinderDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/OperationDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -4086,7 +3851,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4112,7 +3877,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::HomeDef::base_home (
-    CORBA::ComponentIR::HomeDef_ptr base_home
+    ::CORBA::ComponentIR::HomeDef_ptr base_home
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4129,8 +3894,8 @@ void CORBA::ComponentIR::HomeDef::base_home (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4171,7 +3936,7 @@ void CORBA::ComponentIR::HomeDef::base_home (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4197,7 +3962,7 @@ void CORBA::ComponentIR::HomeDef::base_home (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::HomeDef::supported_interfaces (
-    const CORBA::InterfaceDefSeq & supported_interfaces
+    const ::CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4214,8 +3979,8 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4256,7 +4021,7 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4282,7 +4047,7 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::HomeDef::managed_component (
-    CORBA::ComponentIR::ComponentDef_ptr managed_component
+    ::CORBA::ComponentIR::ComponentDef_ptr managed_component
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4299,8 +4064,8 @@ void CORBA::ComponentIR::HomeDef::managed_component (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4341,7 +4106,7 @@ void CORBA::ComponentIR::HomeDef::managed_component (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4367,7 +4132,7 @@ void CORBA::ComponentIR::HomeDef::managed_component (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ComponentIR::HomeDef::primary_key (
-    CORBA::ValueDef_ptr primary_key
+    ::CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4384,8 +4149,8 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4413,8 +4178,8 @@ void CORBA::ComponentIR::HomeDef::primary_key (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions
+    const ::CORBA::ParDescriptionSeq & params,
+    const ::CORBA::ExceptionDefSeq & exceptions
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4431,12 +4196,12 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::FactoryDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< CORBA::ComponentIR::FactoryDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4470,8 +4235,8 @@ void CORBA::ComponentIR::HomeDef::primary_key (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions
+    const ::CORBA::ParDescriptionSeq & params,
+    const ::CORBA::ExceptionDefSeq & exceptions
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -4488,12 +4253,12 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ComponentIR::FinderDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< CORBA::ComponentIR::FinderDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4545,7 +4310,7 @@ void
 CORBA::ComponentIR::HomeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   HomeDef *_tao_tmp_pointer =
-    ACE_static_cast (HomeDef *, _tao_void_pointer);
+    static_cast<HomeDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -4598,42 +4363,42 @@ CORBA::ComponentIR::HomeDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -4666,7 +4431,7 @@ CORBA::ComponentIR::HomeDescription::_tao_any_destructor (
   )
 {
   HomeDescription *_tao_tmp_pointer =
-    ACE_static_cast (HomeDescription *, _tao_void_pointer);
+    static_cast<HomeDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -4689,9 +4454,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::EventDef RHS_SCOPED_NAME;
@@ -4725,9 +4490,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::Container RHS_SCOPED_NAME;
@@ -4761,9 +4526,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::ModuleDef RHS_SCOPED_NAME;
@@ -4797,9 +4562,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::Repository RHS_SCOPED_NAME;
@@ -4833,9 +4598,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::ProvidesDef RHS_SCOPED_NAME;
@@ -4898,9 +4663,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::UsesDef RHS_SCOPED_NAME;
@@ -4965,9 +4730,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::EventPortDef RHS_SCOPED_NAME;
@@ -5030,9 +4795,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::EmitsDef RHS_SCOPED_NAME;
@@ -5066,9 +4831,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::PublishesDef RHS_SCOPED_NAME;
@@ -5102,9 +4867,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::ConsumesDef RHS_SCOPED_NAME;
@@ -5138,9 +4903,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::ComponentDef RHS_SCOPED_NAME;
@@ -5166,12 +4931,12 @@ CORBA::Boolean operator<< (
     const CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5181,7 +4946,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -5198,7 +4963,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -5207,11 +4972,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5222,7 +4987,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_CPP_ */
@@ -5238,12 +5003,12 @@ CORBA::Boolean operator<< (
     const CORBA::ComponentIR::UsesDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5253,7 +5018,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -5270,7 +5035,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -5279,11 +5044,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5294,7 +5059,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_CPP_ */
@@ -5310,12 +5075,12 @@ CORBA::Boolean operator<< (
     const CORBA::ComponentIR::EventPortDescriptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5325,7 +5090,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -5342,7 +5107,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -5351,11 +5116,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -5366,7 +5131,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_CPP_ */
@@ -5435,9 +5200,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::FactoryDef RHS_SCOPED_NAME;
@@ -5471,9 +5236,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::FinderDef RHS_SCOPED_NAME;
@@ -5507,9 +5272,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ComponentIR::HomeDef RHS_SCOPED_NAME;
@@ -5568,55 +5333,10 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::DefinitionKind>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::DefinitionKind>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_
-
-  template class
-    TAO::Arg_Traits<
-        CORBA::Container
-      >;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::Container_ptr,
-        CORBA::Container_var,
-        CORBA::Container_out,
-        TAO::Objref_Traits<CORBA::Container>
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_
-
-  template class
-    TAO::Arg_Traits<
-        CORBA::IDLType
-      >;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::IDLType_ptr,
-        CORBA::IDLType_var,
-        CORBA::IDLType_out,
-        TAO::Objref_Traits<CORBA::IDLType>
-      >;
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_
 
@@ -5684,48 +5404,6 @@ CORBA::Boolean operator>> (
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
-  template class TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::AbstractInterfaceDefSeq,
-        CORBA::AbstractInterfaceDefSeq_var,
-        CORBA::AbstractInterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::StructMemberSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::StructMemberSeq,
-        CORBA::StructMemberSeq_var,
-        CORBA::StructMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::InitializerSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::InitializerSeq,
-        CORBA::InitializerSeq_var,
-        CORBA::InitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
   template class TAO::Arg_Traits<CORBA::ExtInitializerSeq>;
 
   template class
@@ -5740,43 +5418,6 @@ CORBA::Boolean operator>> (
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
-  template class TAO::Arg_Traits<CORBA::UnionMemberSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::UnionMemberSeq,
-        CORBA::UnionMemberSeq_var,
-        CORBA::UnionMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::EnumMemberSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::EnumMemberSeq,
-        CORBA::EnumMemberSeq_var,
-        CORBA::EnumMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::PrimitiveKind>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::PrimitiveKind>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
   template class TAO::Arg_Traits<CORBA::ExceptionDefSeq>;
 
   template class
@@ -5788,24 +5429,6 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::AttributeMode>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::AttributeMode>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::OperationMode>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::OperationMode>;
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
@@ -5820,20 +5443,6 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::ContextIdSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::ContextIdSeq,
-        CORBA::ContextIdSeq_var,
-        CORBA::ContextIdSeq_out
-      >;
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_TMPLINST_CS_
 
@@ -6591,51 +6200,6 @@ CORBA::Boolean operator>> (
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::DefinitionKind>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::DefinitionKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate \
-    TAO::Arg_Traits< \
-        CORBA::Container \
-      >
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::Container_ptr, \
-        CORBA::Container_var, \
-        CORBA::Container_out, \
-        TAO::Objref_Traits<CORBA::Container> \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate \
-    TAO::Arg_Traits< \
-        CORBA::IDLType \
-      >
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var, \
-        CORBA::IDLType_out, \
-        TAO::Objref_Traits<CORBA::IDLType> \
-      >
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_
 
@@ -6703,48 +6267,6 @@ CORBA::Boolean operator>> (
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
-# pragma instantiate TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::AbstractInterfaceDefSeq, \
-        CORBA::AbstractInterfaceDefSeq_var, \
-        CORBA::AbstractInterfaceDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::StructMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::StructMemberSeq, \
-        CORBA::StructMemberSeq_var, \
-        CORBA::StructMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::InitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::InitializerSeq, \
-        CORBA::InitializerSeq_var, \
-        CORBA::InitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
 # pragma instantiate TAO::Arg_Traits<CORBA::ExtInitializerSeq>
 
 # pragma instantiate \
@@ -6759,43 +6281,6 @@ CORBA::Boolean operator>> (
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
-# pragma instantiate TAO::Arg_Traits<CORBA::UnionMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::UnionMemberSeq, \
-        CORBA::UnionMemberSeq_var, \
-        CORBA::UnionMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::EnumMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::EnumMemberSeq, \
-        CORBA::EnumMemberSeq_var, \
-        CORBA::EnumMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::PrimitiveKind>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::PrimitiveKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
 # pragma instantiate TAO::Arg_Traits<CORBA::ExceptionDefSeq>
 
 # pragma instantiate \
@@ -6807,24 +6292,6 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::AttributeMode>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::AttributeMode>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::OperationMode>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::OperationMode>
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
@@ -6839,20 +6306,6 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::ContextIdSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::ContextIdSeq, \
-        CORBA::ContextIdSeq_var, \
-        CORBA::ContextIdSeq_out \
-      >
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_TMPLINST_CS_
 
@@ -6872,26 +6325,68 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::ComponentDef_ptr, \
+        CORBA::ComponentIR::ComponentDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::ComponentIR::ComponentDef_ptr \
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::InterfaceDefSeq, \
+        CORBA::InterfaceDefSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::InterfaceDefSeq \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::ProvidesDef_ptr, \
+        CORBA::ComponentIR::ProvidesDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::InterfaceDef_ptr \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::UsesDef_ptr, \
+        CORBA::ComponentIR::UsesDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::EmitsDef_ptr, \
+        CORBA::ComponentIR::EmitsDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::ComponentIR::EventDef_ptr \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::PublishesDef_ptr, \
+        CORBA::ComponentIR::PublishesDef_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::ConsumesDef_ptr, \
+        CORBA::ComponentIR::ConsumesDef_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::ComponentIR::ComponentDef \
       >
@@ -6930,16 +6425,34 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::HomeDef_ptr, \
+        CORBA::ComponentIR::HomeDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::ComponentIR::HomeDef_ptr \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ValueDef_ptr, \
+        CORBA::ValueDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::ValueDef_ptr \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::FactoryDef_ptr, \
+        CORBA::ComponentIR::FactoryDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::ParDescriptionSeq \
       >
@@ -6950,6 +6463,12 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::FinderDef_ptr, \
+        CORBA::ComponentIR::FinderDef_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::ComponentIR::HomeDef \
       >
@@ -7008,6 +6527,12 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ComponentIR::EventDef_ptr, \
+        CORBA::ComponentIR::EventDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::ValueDefSeq \
       >
@@ -7096,6 +6621,12 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::InterfaceDef_ptr, \
+        CORBA::InterfaceDef_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::ComponentIR::ProvidesDef \
       >
@@ -7531,4 +7062,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index a4f9abf3170..41e3b2718fc 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
-#define _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
+#ifndef _TAO_IDL_IFR_COMPONENTSC_H_
+#define _TAO_IDL_IFR_COMPONENTSC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ifr_client_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
@@ -48,7 +51,6 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
-
 #include "IFR_ExtendedC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -64,9 +66,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -75,7 +75,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -98,7 +98,7 @@ namespace CORBA
   {
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__VAR_OUT_CH_
@@ -121,7 +121,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_HOMEDEF__VAR_OUT_CH_
@@ -144,7 +144,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_EVENTDEF__VAR_OUT_CH_
@@ -173,7 +173,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_EVENTDEF_CH_
     
     class TAO_IFR_Client_Export EventDef
-      : public virtual CORBA::ExtValueDef
+      : public virtual ::CORBA::ExtValueDef
     {
     public:
       friend class TAO::Narrow_Utils<EventDef>;
@@ -195,7 +195,7 @@ namespace CORBA
       
       static EventDef_ptr _nil (void)
       {
-        return (EventDef_ptr)0;
+        return static_cast<EventDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -252,7 +252,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventDef;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_CONTAINER__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_CONTAINER__VAR_OUT_CH_
@@ -281,7 +281,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_CONTAINER_CH_
     
     class TAO_IFR_Client_Export Container
-      : public virtual CORBA::Container
+      : public virtual ::CORBA::Container
     {
     public:
       friend class TAO::Narrow_Utils<Container>;
@@ -303,7 +303,7 @@ namespace CORBA
       
       static Container_ptr _nil (void)
       {
-        return (Container_ptr)0;
+        return static_cast<Container_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -315,8 +315,8 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::ComponentDef_ptr base_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces
+          ::CORBA::ComponentIR::ComponentDef_ptr base_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -330,10 +330,10 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::HomeDef_ptr base_home,
-          CORBA::ComponentIR::ComponentDef_ptr managed_component,
-          const CORBA::InterfaceDefSeq & supports_interfaces,
-          CORBA::ValueDef_ptr primary_key
+          ::CORBA::ComponentIR::HomeDef_ptr base_home,
+          ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
+          const ::CORBA::InterfaceDefSeq & supports_interfaces,
+          ::CORBA::ValueDef_ptr primary_key
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -347,13 +347,13 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          CORBA::Boolean is_custom,
-          CORBA::Boolean is_abstract,
-          CORBA::ValueDef_ptr base_value,
-          CORBA::Boolean is_truncatable,
-          const CORBA::ValueDefSeq & abstract_base_values,
-          const CORBA::InterfaceDefSeq & supported_interfaces,
-          const CORBA::ExtInitializerSeq & initializers
+          ::CORBA::Boolean is_custom,
+          ::CORBA::Boolean is_abstract,
+          ::CORBA::ValueDef_ptr base_value,
+          ::CORBA::Boolean is_truncatable,
+          const ::CORBA::ValueDefSeq & abstract_base_values,
+          const ::CORBA::InterfaceDefSeq & supported_interfaces,
+          const ::CORBA::ExtInitializerSeq & initializers
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -412,7 +412,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Container;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_MODULEDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_MODULEDEF__VAR_OUT_CH_
@@ -441,8 +441,8 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_MODULEDEF_CH_
     
     class TAO_IFR_Client_Export ModuleDef
-      : public virtual CORBA::ModuleDef,
-        public virtual CORBA::ComponentIR::Container
+      : public virtual ::CORBA::ModuleDef,
+        public virtual ::CORBA::ComponentIR::Container
     {
     public:
       friend class TAO::Narrow_Utils<ModuleDef>;
@@ -464,7 +464,7 @@ namespace CORBA
       
       static ModuleDef_ptr _nil (void)
       {
-        return (ModuleDef_ptr)0;
+        return static_cast<ModuleDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -521,7 +521,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ModuleDef;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_REPOSITORY__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_REPOSITORY__VAR_OUT_CH_
@@ -550,8 +550,8 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_REPOSITORY_CH_
     
     class TAO_IFR_Client_Export Repository
-      : public virtual CORBA::Repository,
-        public virtual CORBA::ComponentIR::Container
+      : public virtual ::CORBA::Repository,
+        public virtual ::CORBA::ComponentIR::Container
     {
     public:
       friend class TAO::Narrow_Utils<Repository>;
@@ -573,7 +573,7 @@ namespace CORBA
       
       static Repository_ptr _nil (void)
       {
-        return (Repository_ptr)0;
+        return static_cast<Repository_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -630,7 +630,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Repository;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF__VAR_OUT_CH_
@@ -659,7 +659,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_PROVIDESDEF_CH_
     
     class TAO_IFR_Client_Export ProvidesDef
-      : public virtual CORBA::Contained
+      : public virtual ::CORBA::Contained
     {
     public:
       friend class TAO::Narrow_Utils<ProvidesDef>;
@@ -681,7 +681,7 @@ namespace CORBA
       
       static ProvidesDef_ptr _nil (void)
       {
-        return (ProvidesDef_ptr)0;
+        return static_cast<ProvidesDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -700,7 +700,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void interface_type (
-          CORBA::InterfaceDef_ptr interface_type
+          ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -797,7 +797,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProvidesDescription;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_USESDEF__VAR_OUT_CH_
@@ -826,7 +826,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_USESDEF_CH_
     
     class TAO_IFR_Client_Export UsesDef
-      : public virtual CORBA::Contained
+      : public virtual ::CORBA::Contained
     {
     public:
       friend class TAO::Narrow_Utils<UsesDef>;
@@ -848,7 +848,7 @@ namespace CORBA
       
       static UsesDef_ptr _nil (void)
       {
-        return (UsesDef_ptr)0;
+        return static_cast<UsesDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -867,7 +867,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void interface_type (
-          CORBA::InterfaceDef_ptr interface_type
+          ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -888,7 +888,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void is_multiple (
-          CORBA::Boolean is_multiple
+          ::CORBA::Boolean is_multiple
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -986,7 +986,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UsesDescription;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_EVENTPORTDEF__VAR_OUT_CH_
@@ -1015,7 +1015,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_EVENTPORTDEF_CH_
     
     class TAO_IFR_Client_Export EventPortDef
-      : public virtual CORBA::Contained
+      : public virtual ::CORBA::Contained
     {
     public:
       friend class TAO::Narrow_Utils<EventPortDef>;
@@ -1037,7 +1037,7 @@ namespace CORBA
       
       static EventPortDef_ptr _nil (void)
       {
-        return (EventPortDef_ptr)0;
+        return static_cast<EventPortDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -1056,7 +1056,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void event (
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1164,7 +1164,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventPortDescription;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_EMITSDEF__VAR_OUT_CH_
@@ -1193,7 +1193,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_EMITSDEF_CH_
     
     class TAO_IFR_Client_Export EmitsDef
-      : public virtual CORBA::ComponentIR::EventPortDef
+      : public virtual ::CORBA::ComponentIR::EventPortDef
     {
     public:
       friend class TAO::Narrow_Utils<EmitsDef>;
@@ -1215,7 +1215,7 @@ namespace CORBA
       
       static EmitsDef_ptr _nil (void)
       {
-        return (EmitsDef_ptr)0;
+        return static_cast<EmitsDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -1272,7 +1272,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmitsDef;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__VAR_OUT_CH_
@@ -1301,7 +1301,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_PUBLISHESDEF_CH_
     
     class TAO_IFR_Client_Export PublishesDef
-      : public virtual CORBA::ComponentIR::EventPortDef
+      : public virtual ::CORBA::ComponentIR::EventPortDef
     {
     public:
       friend class TAO::Narrow_Utils<PublishesDef>;
@@ -1323,7 +1323,7 @@ namespace CORBA
       
       static PublishesDef_ptr _nil (void)
       {
-        return (PublishesDef_ptr)0;
+        return static_cast<PublishesDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -1380,7 +1380,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PublishesDef;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF__VAR_OUT_CH_
@@ -1409,7 +1409,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_CONSUMESDEF_CH_
     
     class TAO_IFR_Client_Export ConsumesDef
-      : public virtual CORBA::ComponentIR::EventPortDef
+      : public virtual ::CORBA::ComponentIR::EventPortDef
     {
     public:
       friend class TAO::Narrow_Utils<ConsumesDef>;
@@ -1431,7 +1431,7 @@ namespace CORBA
       
       static ConsumesDef_ptr _nil (void)
       {
-        return (ConsumesDef_ptr)0;
+        return static_cast<ConsumesDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -1494,7 +1494,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_COMPONENTDEF_CH_
     
     class TAO_IFR_Client_Export ComponentDef
-      : public virtual CORBA::ExtInterfaceDef
+      : public virtual ::CORBA::ExtInterfaceDef
     {
     public:
       friend class TAO::Narrow_Utils<ComponentDef>;
@@ -1516,7 +1516,7 @@ namespace CORBA
       
       static ComponentDef_ptr _nil (void)
       {
-        return (ComponentDef_ptr)0;
+        return static_cast<ComponentDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -1535,7 +1535,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void base_component (
-          CORBA::ComponentIR::ComponentDef_ptr base_component
+          ::CORBA::ComponentIR::ComponentDef_ptr base_component
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1556,7 +1556,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void supported_interfaces (
-          const CORBA::InterfaceDefSeq & supported_interfaces
+          const ::CORBA::InterfaceDefSeq & supported_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1570,7 +1570,7 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          CORBA::InterfaceDef_ptr interface_type
+          ::CORBA::InterfaceDef_ptr interface_type
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1584,8 +1584,8 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          CORBA::InterfaceDef_ptr interface_type,
-          CORBA::Boolean is_multiple
+          ::CORBA::InterfaceDef_ptr interface_type,
+          ::CORBA::Boolean is_multiple
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1599,7 +1599,7 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1613,7 +1613,7 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1627,7 +1627,7 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          CORBA::ComponentIR::EventDef_ptr event
+          ::CORBA::ComponentIR::EventDef_ptr event
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -1891,7 +1891,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentDescription;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_FACTORYDEF__VAR_OUT_CH_
@@ -1920,7 +1920,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_FACTORYDEF_CH_
     
     class TAO_IFR_Client_Export FactoryDef
-      : public virtual CORBA::OperationDef
+      : public virtual ::CORBA::OperationDef
     {
     public:
       friend class TAO::Narrow_Utils<FactoryDef>;
@@ -1942,7 +1942,7 @@ namespace CORBA
       
       static FactoryDef_ptr _nil (void)
       {
-        return (FactoryDef_ptr)0;
+        return static_cast<FactoryDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -1999,7 +1999,7 @@ namespace CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FactoryDef;
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:611
+    // be\be_interface.cpp:598
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__VAR_OUT_CH_)
 #define _CORBA_COMPONENTIR_FINDERDEF__VAR_OUT_CH_
@@ -2028,7 +2028,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_FINDERDEF_CH_
     
     class TAO_IFR_Client_Export FinderDef
-      : public virtual CORBA::OperationDef
+      : public virtual ::CORBA::OperationDef
     {
     public:
       friend class TAO::Narrow_Utils<FinderDef>;
@@ -2050,7 +2050,7 @@ namespace CORBA
       
       static FinderDef_ptr _nil (void)
       {
-        return (FinderDef_ptr)0;
+        return static_cast<FinderDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -2113,7 +2113,7 @@ namespace CORBA
 #define _CORBA_COMPONENTIR_HOMEDEF_CH_
     
     class TAO_IFR_Client_Export HomeDef
-      : public virtual CORBA::ExtInterfaceDef
+      : public virtual ::CORBA::ExtInterfaceDef
     {
     public:
       friend class TAO::Narrow_Utils<HomeDef>;
@@ -2135,7 +2135,7 @@ namespace CORBA
       
       static HomeDef_ptr _nil (void)
       {
-        return (HomeDef_ptr)0;
+        return static_cast<HomeDef_ptr> (0);
       }
       
       static void _tao_any_destructor (void *);
@@ -2154,7 +2154,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void base_home (
-          CORBA::ComponentIR::HomeDef_ptr base_home
+          ::CORBA::ComponentIR::HomeDef_ptr base_home
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2175,7 +2175,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void supported_interfaces (
-          const CORBA::InterfaceDefSeq & supported_interfaces
+          const ::CORBA::InterfaceDefSeq & supported_interfaces
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2196,7 +2196,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void managed_component (
-          CORBA::ComponentIR::ComponentDef_ptr managed_component
+          ::CORBA::ComponentIR::ComponentDef_ptr managed_component
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2217,7 +2217,7 @@ namespace CORBA
       // be\be_visitor_operation/operation_ch.cpp:46
       
       virtual void primary_key (
-          CORBA::ValueDef_ptr primary_key
+          ::CORBA::ValueDef_ptr primary_key
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2231,8 +2231,8 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::ParDescriptionSeq & params,
-          const CORBA::ExceptionDefSeq & exceptions
+          const ::CORBA::ParDescriptionSeq & params,
+          const ::CORBA::ExceptionDefSeq & exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2246,8 +2246,8 @@ namespace CORBA
           const char * id,
           const char * name,
           const char * version,
-          const CORBA::ParDescriptionSeq & params,
-          const CORBA::ExceptionDefSeq & exceptions
+          const ::CORBA::ParDescriptionSeq & params,
+          const ::CORBA::ExceptionDefSeq & exceptions
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
@@ -2460,17 +2460,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ComponentDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ComponentDef>
   {
-    static CORBA::ComponentIR::ComponentDef_ptr duplicate (
-        CORBA::ComponentIR::ComponentDef_ptr
+    static ::CORBA::ComponentIR::ComponentDef_ptr duplicate (
+        ::CORBA::ComponentIR::ComponentDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::ComponentDef_ptr
+        ::CORBA::ComponentIR::ComponentDef_ptr
       );
-    static CORBA::ComponentIR::ComponentDef_ptr nil (void);
+    static ::CORBA::ComponentIR::ComponentDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::ComponentDef_ptr p,
+        ::CORBA::ComponentIR::ComponentDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2481,17 +2481,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_HOMEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::HomeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::HomeDef>
   {
-    static CORBA::ComponentIR::HomeDef_ptr duplicate (
-        CORBA::ComponentIR::HomeDef_ptr
+    static ::CORBA::ComponentIR::HomeDef_ptr duplicate (
+        ::CORBA::ComponentIR::HomeDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::HomeDef_ptr
+        ::CORBA::ComponentIR::HomeDef_ptr
       );
-    static CORBA::ComponentIR::HomeDef_ptr nil (void);
+    static ::CORBA::ComponentIR::HomeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::HomeDef_ptr p,
+        ::CORBA::ComponentIR::HomeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2502,17 +2502,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_EVENTDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EventDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventDef>
   {
-    static CORBA::ComponentIR::EventDef_ptr duplicate (
-        CORBA::ComponentIR::EventDef_ptr
+    static ::CORBA::ComponentIR::EventDef_ptr duplicate (
+        ::CORBA::ComponentIR::EventDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::EventDef_ptr
+        ::CORBA::ComponentIR::EventDef_ptr
       );
-    static CORBA::ComponentIR::EventDef_ptr nil (void);
+    static ::CORBA::ComponentIR::EventDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::EventDef_ptr p,
+        ::CORBA::ComponentIR::EventDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2523,17 +2523,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_CONTAINER__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::Container>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Container>
   {
-    static CORBA::ComponentIR::Container_ptr duplicate (
-        CORBA::ComponentIR::Container_ptr
+    static ::CORBA::ComponentIR::Container_ptr duplicate (
+        ::CORBA::ComponentIR::Container_ptr
       );
     static void release (
-        CORBA::ComponentIR::Container_ptr
+        ::CORBA::ComponentIR::Container_ptr
       );
-    static CORBA::ComponentIR::Container_ptr nil (void);
+    static ::CORBA::ComponentIR::Container_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::Container_ptr p,
+        ::CORBA::ComponentIR::Container_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2544,17 +2544,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_MODULEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ModuleDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ModuleDef>
   {
-    static CORBA::ComponentIR::ModuleDef_ptr duplicate (
-        CORBA::ComponentIR::ModuleDef_ptr
+    static ::CORBA::ComponentIR::ModuleDef_ptr duplicate (
+        ::CORBA::ComponentIR::ModuleDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::ModuleDef_ptr
+        ::CORBA::ComponentIR::ModuleDef_ptr
       );
-    static CORBA::ComponentIR::ModuleDef_ptr nil (void);
+    static ::CORBA::ComponentIR::ModuleDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::ModuleDef_ptr p,
+        ::CORBA::ComponentIR::ModuleDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2565,17 +2565,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_REPOSITORY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::Repository>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Repository>
   {
-    static CORBA::ComponentIR::Repository_ptr duplicate (
-        CORBA::ComponentIR::Repository_ptr
+    static ::CORBA::ComponentIR::Repository_ptr duplicate (
+        ::CORBA::ComponentIR::Repository_ptr
       );
     static void release (
-        CORBA::ComponentIR::Repository_ptr
+        ::CORBA::ComponentIR::Repository_ptr
       );
-    static CORBA::ComponentIR::Repository_ptr nil (void);
+    static ::CORBA::ComponentIR::Repository_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::Repository_ptr p,
+        ::CORBA::ComponentIR::Repository_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2586,17 +2586,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ProvidesDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ProvidesDef>
   {
-    static CORBA::ComponentIR::ProvidesDef_ptr duplicate (
-        CORBA::ComponentIR::ProvidesDef_ptr
+    static ::CORBA::ComponentIR::ProvidesDef_ptr duplicate (
+        ::CORBA::ComponentIR::ProvidesDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::ProvidesDef_ptr
+        ::CORBA::ComponentIR::ProvidesDef_ptr
       );
-    static CORBA::ComponentIR::ProvidesDef_ptr nil (void);
+    static ::CORBA::ComponentIR::ProvidesDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::ProvidesDef_ptr p,
+        ::CORBA::ComponentIR::ProvidesDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2607,17 +2607,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_USESDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::UsesDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::UsesDef>
   {
-    static CORBA::ComponentIR::UsesDef_ptr duplicate (
-        CORBA::ComponentIR::UsesDef_ptr
+    static ::CORBA::ComponentIR::UsesDef_ptr duplicate (
+        ::CORBA::ComponentIR::UsesDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::UsesDef_ptr
+        ::CORBA::ComponentIR::UsesDef_ptr
       );
-    static CORBA::ComponentIR::UsesDef_ptr nil (void);
+    static ::CORBA::ComponentIR::UsesDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::UsesDef_ptr p,
+        ::CORBA::ComponentIR::UsesDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2628,17 +2628,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EventPortDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventPortDef>
   {
-    static CORBA::ComponentIR::EventPortDef_ptr duplicate (
-        CORBA::ComponentIR::EventPortDef_ptr
+    static ::CORBA::ComponentIR::EventPortDef_ptr duplicate (
+        ::CORBA::ComponentIR::EventPortDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::EventPortDef_ptr
+        ::CORBA::ComponentIR::EventPortDef_ptr
       );
-    static CORBA::ComponentIR::EventPortDef_ptr nil (void);
+    static ::CORBA::ComponentIR::EventPortDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::EventPortDef_ptr p,
+        ::CORBA::ComponentIR::EventPortDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2649,17 +2649,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_EMITSDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EmitsDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EmitsDef>
   {
-    static CORBA::ComponentIR::EmitsDef_ptr duplicate (
-        CORBA::ComponentIR::EmitsDef_ptr
+    static ::CORBA::ComponentIR::EmitsDef_ptr duplicate (
+        ::CORBA::ComponentIR::EmitsDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::EmitsDef_ptr
+        ::CORBA::ComponentIR::EmitsDef_ptr
       );
-    static CORBA::ComponentIR::EmitsDef_ptr nil (void);
+    static ::CORBA::ComponentIR::EmitsDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::EmitsDef_ptr p,
+        ::CORBA::ComponentIR::EmitsDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2670,17 +2670,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::PublishesDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::PublishesDef>
   {
-    static CORBA::ComponentIR::PublishesDef_ptr duplicate (
-        CORBA::ComponentIR::PublishesDef_ptr
+    static ::CORBA::ComponentIR::PublishesDef_ptr duplicate (
+        ::CORBA::ComponentIR::PublishesDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::PublishesDef_ptr
+        ::CORBA::ComponentIR::PublishesDef_ptr
       );
-    static CORBA::ComponentIR::PublishesDef_ptr nil (void);
+    static ::CORBA::ComponentIR::PublishesDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::PublishesDef_ptr p,
+        ::CORBA::ComponentIR::PublishesDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2691,17 +2691,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ConsumesDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ConsumesDef>
   {
-    static CORBA::ComponentIR::ConsumesDef_ptr duplicate (
-        CORBA::ComponentIR::ConsumesDef_ptr
+    static ::CORBA::ComponentIR::ConsumesDef_ptr duplicate (
+        ::CORBA::ComponentIR::ConsumesDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::ConsumesDef_ptr
+        ::CORBA::ComponentIR::ConsumesDef_ptr
       );
-    static CORBA::ComponentIR::ConsumesDef_ptr nil (void);
+    static ::CORBA::ComponentIR::ConsumesDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::ConsumesDef_ptr p,
+        ::CORBA::ComponentIR::ConsumesDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2712,17 +2712,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_FACTORYDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::FactoryDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FactoryDef>
   {
-    static CORBA::ComponentIR::FactoryDef_ptr duplicate (
-        CORBA::ComponentIR::FactoryDef_ptr
+    static ::CORBA::ComponentIR::FactoryDef_ptr duplicate (
+        ::CORBA::ComponentIR::FactoryDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::FactoryDef_ptr
+        ::CORBA::ComponentIR::FactoryDef_ptr
       );
-    static CORBA::ComponentIR::FactoryDef_ptr nil (void);
+    static ::CORBA::ComponentIR::FactoryDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::FactoryDef_ptr p,
+        ::CORBA::ComponentIR::FactoryDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2733,17 +2733,17 @@ namespace TAO
 #define _CORBA_COMPONENTIR_FINDERDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::FinderDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FinderDef>
   {
-    static CORBA::ComponentIR::FinderDef_ptr duplicate (
-        CORBA::ComponentIR::FinderDef_ptr
+    static ::CORBA::ComponentIR::FinderDef_ptr duplicate (
+        ::CORBA::ComponentIR::FinderDef_ptr
       );
     static void release (
-        CORBA::ComponentIR::FinderDef_ptr
+        ::CORBA::ComponentIR::FinderDef_ptr
       );
-    static CORBA::ComponentIR::FinderDef_ptr nil (void);
+    static ::CORBA::ComponentIR::FinderDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ComponentIR::FinderDef_ptr p,
+        ::CORBA::ComponentIR::FinderDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -3079,13 +3079,13 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::C
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::HomeDescription &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IFR_ComponentsC.i"
+#include "IFR_ComponentsC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -3097,3 +3097,4 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Componen
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.i b/TAO/tao/IFR_Client/IFR_ComponentsC.i
deleted file mode 100644
index ab013f90d55..00000000000
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.i
+++ /dev/null
@@ -1,532 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF___CI_)
-#define _CORBA_COMPONENTIR_EVENTDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::EventDef::EventDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_EventDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_EventDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventDef::EventDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_EventDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_CONTAINER___CI_)
-#define _CORBA_COMPONENTIR_CONTAINER___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::Container::Container (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_Container_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_Container_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::Container::Container (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Container_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF___CI_)
-#define _CORBA_COMPONENTIR_MODULEDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::ModuleDef::ModuleDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ModuleDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ModuleDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ModuleDef::ModuleDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ModuleDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY___CI_)
-#define _CORBA_COMPONENTIR_REPOSITORY___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::Repository::Repository (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_Repository_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_Repository_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::Repository::Repository (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Repository_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF___CI_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDef::ProvidesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ProvidesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ProvidesDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDef::ProvidesDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ProvidesDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF___CI_)
-#define _CORBA_COMPONENTIR_USESDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDef::UsesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_UsesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_UsesDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDef::UsesDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_UsesDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___CI_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDef::EventPortDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_EventPortDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_EventPortDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDef::EventPortDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_EventPortDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF___CI_)
-#define _CORBA_COMPONENTIR_EMITSDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::EmitsDef::EmitsDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_EmitsDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_EmitsDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EmitsDef::EmitsDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_EmitsDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF___CI_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::PublishesDef::PublishesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_PublishesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_PublishesDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::PublishesDef::PublishesDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_PublishesDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF___CI_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::ConsumesDef::ConsumesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ConsumesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ConsumesDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ConsumesDef::ConsumesDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ConsumesDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___CI_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDef::ComponentDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ComponentDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ComponentDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDef::ComponentDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ComponentDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF___CI_)
-#define _CORBA_COMPONENTIR_FACTORYDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::FactoryDef::FactoryDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_FactoryDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_FactoryDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::FactoryDef::FactoryDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_FactoryDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF___CI_)
-#define _CORBA_COMPONENTIR_FINDERDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::FinderDef::FinderDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_FinderDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_FinderDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::FinderDef::FinderDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_FinderDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF___CI_)
-#define _CORBA_COMPONENTIR_HOMEDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDef::HomeDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_HomeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_HomeDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDef::HomeDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_HomeDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp b/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
index 3537f9a41c7..6776111afa5 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
@@ -27,27 +27,29 @@
 
 #include "IFR_ExtendedC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_FixedDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4669),
-  ACE_NTOHL (0x78656444),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4669), 
+  ACE_NTOHL (0x78656444), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/FixedDef:1.0
     9,
-  ACE_NTOHL (0x46697865),
-  ACE_NTOHL (0x64446566),
+  ACE_NTOHL (0x46697865), 
+  ACE_NTOHL (0x64446566), 
   ACE_NTOHL (0x0),  // name = FixedDef
   };
 
@@ -56,7 +58,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_FixedDef (
     sizeof (_oc_CORBA_FixedDef),
     (char *) &_oc_CORBA_FixedDef,
     0,
-    sizeof (CORBA::FixedDef)
+    0
   );
 
 namespace CORBA
@@ -66,47 +68,47 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ValueMember[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c75654d), 
+  ACE_NTOHL (0x656d6265), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
     12,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d656d),
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x654d656d), 
   ACE_NTOHL (0x62657200),  // name = ValueMember
   7, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -115,115 +117,115 @@ static const CORBA::Long _oc_CORBA_ValueMember[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   9,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f646566),
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x5f646566), 
   ACE_NTOHL (0x0),  // name = type_def
     CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4944),
-    ACE_NTOHL (0x4c547970),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4944), 
+    ACE_NTOHL (0x4c547970), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
         8,
-    ACE_NTOHL (0x49444c54),
+    ACE_NTOHL (0x49444c54), 
     ACE_NTOHL (0x79706500),  // name = IDLType
-
+    
   7,
-  ACE_NTOHL (0x61636365),
+  ACE_NTOHL (0x61636365), 
   ACE_NTOHL (0x73730000),  // name = access
     CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5669),
-    ACE_NTOHL (0x73696269),
-    ACE_NTOHL (0x6c697479),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5669), 
+    ACE_NTOHL (0x73696269), 
+    ACE_NTOHL (0x6c697479), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
         11,
-    ACE_NTOHL (0x56697369),
-    ACE_NTOHL (0x62696c69),
+    ACE_NTOHL (0x56697369), 
+    ACE_NTOHL (0x62696c69), 
     ACE_NTOHL (0x74790000),  // name = Visibility
         CORBA::tk_short,
 
@@ -235,7 +237,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMember (
     sizeof (_oc_CORBA_ValueMember),
     (char *) &_oc_CORBA_ValueMember,
     0,
-    sizeof (CORBA::ValueMember)
+    0
   );
 
 namespace CORBA
@@ -245,26 +247,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x72536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c75654d), 
+  ACE_NTOHL (0x656d6265), 
+  ACE_NTOHL (0x72536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
     15,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d656d),
-  ACE_NTOHL (0x62657253),
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x654d656d), 
+  ACE_NTOHL (0x62657253), 
   ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
     CORBA::tk_sequence, // typecode kind
   616, // encapsulation length
@@ -273,41 +275,41 @@ static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
     600, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5661),
-      ACE_NTOHL (0x6c75654d),
-      ACE_NTOHL (0x656d6265),
-      ACE_NTOHL (0x723a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5661), 
+      ACE_NTOHL (0x6c75654d), 
+      ACE_NTOHL (0x656d6265), 
+      ACE_NTOHL (0x723a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
             12,
-      ACE_NTOHL (0x56616c75),
-      ACE_NTOHL (0x654d656d),
+      ACE_NTOHL (0x56616c75), 
+      ACE_NTOHL (0x654d656d), 
       ACE_NTOHL (0x62657200),  // name = ValueMember
       7, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4964),
-        ACE_NTOHL (0x656e7469),
-        ACE_NTOHL (0x66696572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4964), 
+        ACE_NTOHL (0x656e7469), 
+        ACE_NTOHL (0x66696572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e),
-        ACE_NTOHL (0x74696669),
+        ACE_NTOHL (0x4964656e), 
+        ACE_NTOHL (0x74696669), 
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       3,
@@ -316,115 +318,115 @@ static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669),
-      ACE_NTOHL (0x6e65645f),
+      ACE_NTOHL (0x64656669), 
+      ACE_NTOHL (0x6e65645f), 
       ACE_NTOHL (0x696e0000),  // name = defined_in
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       8,
-      ACE_NTOHL (0x76657273),
+      ACE_NTOHL (0x76657273), 
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5665),
-        ACE_NTOHL (0x7273696f),
-        ACE_NTOHL (0x6e537065),
-        ACE_NTOHL (0x633a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5665), 
+        ACE_NTOHL (0x7273696f), 
+        ACE_NTOHL (0x6e537065), 
+        ACE_NTOHL (0x633a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273),
-        ACE_NTOHL (0x696f6e53),
+        ACE_NTOHL (0x56657273), 
+        ACE_NTOHL (0x696f6e53), 
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x74797065), 
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       9,
-      ACE_NTOHL (0x74797065),
-      ACE_NTOHL (0x5f646566),
+      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x5f646566), 
       ACE_NTOHL (0x0),  // name = type_def
             CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4944),
-        ACE_NTOHL (0x4c547970),
-        ACE_NTOHL (0x653a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4944), 
+        ACE_NTOHL (0x4c547970), 
+        ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-        ACE_NTOHL (0x49444c54),
+        ACE_NTOHL (0x49444c54), 
         ACE_NTOHL (0x79706500),  // name = IDLType
-
+        
       7,
-      ACE_NTOHL (0x61636365),
+      ACE_NTOHL (0x61636365), 
       ACE_NTOHL (0x73730000),  // name = access
             CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5669),
-        ACE_NTOHL (0x73696269),
-        ACE_NTOHL (0x6c697479),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5669), 
+        ACE_NTOHL (0x73696269), 
+        ACE_NTOHL (0x6c697479), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
                 11,
-        ACE_NTOHL (0x56697369),
-        ACE_NTOHL (0x62696c69),
+        ACE_NTOHL (0x56697369), 
+        ACE_NTOHL (0x62696c69), 
         ACE_NTOHL (0x74790000),  // name = Visibility
                 CORBA::tk_short,
 
@@ -439,7 +441,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMemberSeq (
     sizeof (_oc_CORBA_ValueMemberSeq),
     (char *) &_oc_CORBA_ValueMemberSeq,
     0,
-    sizeof (CORBA::ValueMemberSeq)
+    0
   );
 
 namespace CORBA
@@ -449,26 +451,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ValueMemberDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c75654d),
-  ACE_NTOHL (0x656d6265),
-  ACE_NTOHL (0x72446566),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c75654d), 
+  ACE_NTOHL (0x656d6265), 
+  ACE_NTOHL (0x72446566), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberDef:1.0
     15,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x654d656d),
-  ACE_NTOHL (0x62657244),
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x654d656d), 
+  ACE_NTOHL (0x62657244), 
   ACE_NTOHL (0x65660000),  // name = ValueMemberDef
   };
 
@@ -477,7 +479,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMemberDef (
     sizeof (_oc_CORBA_ValueMemberDef),
     (char *) &_oc_CORBA_ValueMemberDef,
     0,
-    sizeof (CORBA::ValueMemberDef)
+    0
   );
 
 namespace CORBA
@@ -487,54 +489,54 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   52,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65662f46),
-  ACE_NTOHL (0x756c6c56),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c756544), 
+  ACE_NTOHL (0x65662f46), 
+  ACE_NTOHL (0x756c6c56), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0
     21,
-  ACE_NTOHL (0x46756c6c),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x46756c6c), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = FullValueDescription
   15, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -543,106 +545,106 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f61),
-  ACE_NTOHL (0x62737472),
+  ACE_NTOHL (0x69735f61), 
+  ACE_NTOHL (0x62737472), 
   ACE_NTOHL (0x61637400),  // name = is_abstract
     CORBA::tk_boolean,
 
   10,
-  ACE_NTOHL (0x69735f63),
-  ACE_NTOHL (0x7573746f),
+  ACE_NTOHL (0x69735f63), 
+  ACE_NTOHL (0x7573746f), 
   ACE_NTOHL (0x6d000000),  // name = is_custom
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572),
-  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e730000),  // name = operations
     CORBA::tk_alias, // typecode kind for typedefs
   2036, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1956, // encapsulation length
@@ -651,46 +653,46 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
       1940, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f70),
-        ACE_NTOHL (0x65726174),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572),
-        ACE_NTOHL (0x6174696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -699,128 +701,128 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         7,
-        ACE_NTOHL (0x72657375),
+        ACE_NTOHL (0x72657375), 
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4f70),
-          ACE_NTOHL (0x65726174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572),
-          ACE_NTOHL (0x6174696f),
-          ACE_NTOHL (0x6e4d6f64),
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e),
-          ACE_NTOHL (0x4f524d41),
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f),
-          ACE_NTOHL (0x4e455741),
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+          
         9,
-        ACE_NTOHL (0x636f6e74),
-        ACE_NTOHL (0x65787473),
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f436f),
-          ACE_NTOHL (0x6e746578),
-          ACE_NTOHL (0x74496453),
-          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74),
-          ACE_NTOHL (0x65787449),
-          ACE_NTOHL (0x64536571),
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           164, // encapsulation length
@@ -829,40 +831,40 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             148, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f436f),
-              ACE_NTOHL (0x6e746578),
-              ACE_NTOHL (0x74496465),
-              ACE_NTOHL (0x6e746966),
-              ACE_NTOHL (0x6965723a),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74),
-              ACE_NTOHL (0x65787449),
-              ACE_NTOHL (0x64656e74),
-              ACE_NTOHL (0x69666965),
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
 
@@ -870,28 +872,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261),
-        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         496, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5061),
-          ACE_NTOHL (0x72446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           416, // encapsulation length
@@ -900,135 +902,135 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             400, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5061),
-              ACE_NTOHL (0x72616d65),
-              ACE_NTOHL (0x74657244),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261),
-              ACE_NTOHL (0x6d657465),
-              ACE_NTOHL (0x72446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065),
-              ACE_NTOHL (0x5f646566),
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4944),
-                ACE_NTOHL (0x4c547970),
-                ACE_NTOHL (0x653a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54),
+                ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
               5,
-              ACE_NTOHL (0x6d6f6465),
+              ACE_NTOHL (0x6d6f6465), 
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5061),
-                ACE_NTOHL (0x72616d65),
-                ACE_NTOHL (0x7465724d),
-                ACE_NTOHL (0x6f64653a),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261),
-                ACE_NTOHL (0x6d657465),
-                ACE_NTOHL (0x724d6f64),
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f4f55),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+                
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -1037,46 +1039,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -1085,73 +1087,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -1164,29 +1166,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x61747472),
-  ACE_NTOHL (0x69627574),
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   684, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4174),
-    ACE_NTOHL (0x74724465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4174), 
+    ACE_NTOHL (0x74724465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
         19,
-    ACE_NTOHL (0x41747472),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x41747472), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     600, // encapsulation length
@@ -1195,46 +1197,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       584, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4174),
-        ACE_NTOHL (0x74726962),
-        ACE_NTOHL (0x75746544),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4174), 
+        ACE_NTOHL (0x74726962), 
+        ACE_NTOHL (0x75746544), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
                 21,
-        ACE_NTOHL (0x41747472),
-        ACE_NTOHL (0x69627574),
-        ACE_NTOHL (0x65446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x41747472), 
+        ACE_NTOHL (0x69627574), 
+        ACE_NTOHL (0x65446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = AttributeDescription
         6, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -1243,133 +1245,133 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4174),
-          ACE_NTOHL (0x74726962),
-          ACE_NTOHL (0x7574654d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472),
-          ACE_NTOHL (0x69627574),
-          ACE_NTOHL (0x654d6f64),
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f4e4f52),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f524541),
-          ACE_NTOHL (0x444f4e4c),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+          
 
       0U,
 
 
   8,
-  ACE_NTOHL (0x6d656d62),
+  ACE_NTOHL (0x6d656d62), 
   ACE_NTOHL (0x65727300),  // name = members
     CORBA::tk_alias, // typecode kind for typedefs
   692, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5661),
-    ACE_NTOHL (0x6c75654d),
-    ACE_NTOHL (0x656d6265),
-    ACE_NTOHL (0x72536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5661), 
+    ACE_NTOHL (0x6c75654d), 
+    ACE_NTOHL (0x656d6265), 
+    ACE_NTOHL (0x72536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
         15,
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x654d656d),
-    ACE_NTOHL (0x62657253),
+    ACE_NTOHL (0x56616c75), 
+    ACE_NTOHL (0x654d656d), 
+    ACE_NTOHL (0x62657253), 
     ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
         CORBA::tk_sequence, // typecode kind
     616, // encapsulation length
@@ -1378,41 +1380,41 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       600, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5661),
-        ACE_NTOHL (0x6c75654d),
-        ACE_NTOHL (0x656d6265),
-        ACE_NTOHL (0x723a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5661), 
+        ACE_NTOHL (0x6c75654d), 
+        ACE_NTOHL (0x656d6265), 
+        ACE_NTOHL (0x723a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
                 12,
-        ACE_NTOHL (0x56616c75),
-        ACE_NTOHL (0x654d656d),
+        ACE_NTOHL (0x56616c75), 
+        ACE_NTOHL (0x654d656d), 
         ACE_NTOHL (0x62657200),  // name = ValueMember
         7, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -1421,115 +1423,115 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x5f646566),
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x5f646566), 
         ACE_NTOHL (0x0),  // name = type_def
                 CORBA::tk_objref, // typecode kind
         52, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4944),
-          ACE_NTOHL (0x4c547970),
-          ACE_NTOHL (0x653a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4944), 
+          ACE_NTOHL (0x4c547970), 
+          ACE_NTOHL (0x653a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                     8,
-          ACE_NTOHL (0x49444c54),
+          ACE_NTOHL (0x49444c54), 
           ACE_NTOHL (0x79706500),  // name = IDLType
-
+          
         7,
-        ACE_NTOHL (0x61636365),
+        ACE_NTOHL (0x61636365), 
         ACE_NTOHL (0x73730000),  // name = access
                 CORBA::tk_alias, // typecode kind for typedefs
         64, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5669),
-          ACE_NTOHL (0x73696269),
-          ACE_NTOHL (0x6c697479),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5669), 
+          ACE_NTOHL (0x73696269), 
+          ACE_NTOHL (0x6c697479), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
                     11,
-          ACE_NTOHL (0x56697369),
-          ACE_NTOHL (0x62696c69),
+          ACE_NTOHL (0x56697369), 
+          ACE_NTOHL (0x62696c69), 
           ACE_NTOHL (0x74790000),  // name = Visibility
                     CORBA::tk_short,
 
@@ -1539,28 +1541,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   13,
-  ACE_NTOHL (0x696e6974),
-  ACE_NTOHL (0x69616c69),
-  ACE_NTOHL (0x7a657273),
+  ACE_NTOHL (0x696e6974), 
+  ACE_NTOHL (0x69616c69), 
+  ACE_NTOHL (0x7a657273), 
   ACE_NTOHL (0x0),  // name = initializers
     CORBA::tk_alias, // typecode kind for typedefs
   604, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f496e),
-    ACE_NTOHL (0x69746961),
-    ACE_NTOHL (0x6c697a65),
-    ACE_NTOHL (0x72536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f496e), 
+    ACE_NTOHL (0x69746961), 
+    ACE_NTOHL (0x6c697a65), 
+    ACE_NTOHL (0x72536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
         15,
-    ACE_NTOHL (0x496e6974),
-    ACE_NTOHL (0x69616c69),
-    ACE_NTOHL (0x7a657253),
+    ACE_NTOHL (0x496e6974), 
+    ACE_NTOHL (0x69616c69), 
+    ACE_NTOHL (0x7a657253), 
     ACE_NTOHL (0x65710000),  // name = InitializerSeq
         CORBA::tk_sequence, // typecode kind
     528, // encapsulation length
@@ -1569,41 +1571,41 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       512, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f496e),
-        ACE_NTOHL (0x69746961),
-        ACE_NTOHL (0x6c697a65),
-        ACE_NTOHL (0x723a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f496e), 
+        ACE_NTOHL (0x69746961), 
+        ACE_NTOHL (0x6c697a65), 
+        ACE_NTOHL (0x723a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
                 12,
-        ACE_NTOHL (0x496e6974),
-        ACE_NTOHL (0x69616c69),
+        ACE_NTOHL (0x496e6974), 
+        ACE_NTOHL (0x69616c69), 
         ACE_NTOHL (0x7a657200),  // name = Initializer
         2, // member count
                 8,
-        ACE_NTOHL (0x6d656d62),
+        ACE_NTOHL (0x6d656d62), 
         ACE_NTOHL (0x65727300),  // name = members
                 CORBA::tk_alias, // typecode kind for typedefs
         340, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           38,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5374),
-          ACE_NTOHL (0x72756374),
-          ACE_NTOHL (0x4d656d62),
-          ACE_NTOHL (0x65725365),
-          ACE_NTOHL (0x713a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5374), 
+          ACE_NTOHL (0x72756374), 
+          ACE_NTOHL (0x4d656d62), 
+          ACE_NTOHL (0x65725365), 
+          ACE_NTOHL (0x713a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
                     16,
-          ACE_NTOHL (0x53747275),
-          ACE_NTOHL (0x63744d65),
-          ACE_NTOHL (0x6d626572),
+          ACE_NTOHL (0x53747275), 
+          ACE_NTOHL (0x63744d65), 
+          ACE_NTOHL (0x6d626572), 
           ACE_NTOHL (0x53657100),  // name = StructMemberSeq
                     CORBA::tk_sequence, // typecode kind
           264, // encapsulation length
@@ -1612,94 +1614,94 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             248, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5374),
-              ACE_NTOHL (0x72756374),
-              ACE_NTOHL (0x4d656d62),
-              ACE_NTOHL (0x65723a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5374), 
+              ACE_NTOHL (0x72756374), 
+              ACE_NTOHL (0x4d656d62), 
+              ACE_NTOHL (0x65723a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
                             13,
-              ACE_NTOHL (0x53747275),
-              ACE_NTOHL (0x63744d65),
-              ACE_NTOHL (0x6d626572),
+              ACE_NTOHL (0x53747275), 
+              ACE_NTOHL (0x63744d65), 
+              ACE_NTOHL (0x6d626572), 
               ACE_NTOHL (0x0),  // name = StructMember
               3, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065),
-              ACE_NTOHL (0x5f646566),
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4944),
-                ACE_NTOHL (0x4c547970),
-                ACE_NTOHL (0x653a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54),
+                ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
 
             0U,
 
 
         5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
 
@@ -1707,30 +1709,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   21,
-  ACE_NTOHL (0x73757070),
-  ACE_NTOHL (0x6f727465),
-  ACE_NTOHL (0x645f696e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636573),
+  ACE_NTOHL (0x73757070), 
+  ACE_NTOHL (0x6f727465), 
+  ACE_NTOHL (0x645f696e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636573), 
   ACE_NTOHL (0x0),  // name = supported_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -1739,51 +1741,51 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   21,
-  ACE_NTOHL (0x61627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x5f626173),
-  ACE_NTOHL (0x655f7661),
-  ACE_NTOHL (0x6c756573),
+  ACE_NTOHL (0x61627374), 
+  ACE_NTOHL (0x72616374), 
+  ACE_NTOHL (0x5f626173), 
+  ACE_NTOHL (0x655f7661), 
+  ACE_NTOHL (0x6c756573), 
   ACE_NTOHL (0x0),  // name = abstract_base_values
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -1792,60 +1794,60 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   15,
-  ACE_NTOHL (0x69735f74),
-  ACE_NTOHL (0x72756e63),
-  ACE_NTOHL (0x61746162),
+  ACE_NTOHL (0x69735f74), 
+  ACE_NTOHL (0x72756e63), 
+  ACE_NTOHL (0x61746162), 
   ACE_NTOHL (0x6c650000),  // name = is_truncatable
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f76616c),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f76616c), 
   ACE_NTOHL (0x75650000),  // name = base_value
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -1856,30 +1858,30 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef_FullValueDescription (
     sizeof (_oc_CORBA_ValueDef_FullValueDescription),
     (char *) &_oc_CORBA_ValueDef_FullValueDescription,
     0,
-    sizeof (CORBA::ValueDef::FullValueDescription)
+    0
   );
 
 ::CORBA::TypeCode_ptr CORBA::ValueDef::_tc_FullValueDescription =
   &_tc_TAO_tc_CORBA_ValueDef_FullValueDescription;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ValueDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65663a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c756544), 
+  ACE_NTOHL (0x65663a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
     9,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446566),
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65446566), 
   ACE_NTOHL (0x0),  // name = ValueDef
   };
 
@@ -1888,7 +1890,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef (
     sizeof (_oc_CORBA_ValueDef),
     (char *) &_oc_CORBA_ValueDef,
     0,
-    sizeof (CORBA::ValueDef)
+    0
   );
 
 namespace CORBA
@@ -1898,50 +1900,50 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ValueDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756544),
-  ACE_NTOHL (0x65736372),
-  ACE_NTOHL (0x69707469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c756544), 
+  ACE_NTOHL (0x65736372), 
+  ACE_NTOHL (0x69707469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDescription:1.0
     17,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65446573),
-  ACE_NTOHL (0x63726970),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65446573), 
+  ACE_NTOHL (0x63726970), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = ValueDescription
   10, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -1950,108 +1952,108 @@ static const CORBA::Long _oc_CORBA_ValueDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f61),
-  ACE_NTOHL (0x62737472),
+  ACE_NTOHL (0x69735f61), 
+  ACE_NTOHL (0x62737472), 
   ACE_NTOHL (0x61637400),  // name = is_abstract
     CORBA::tk_boolean,
 
   10,
-  ACE_NTOHL (0x69735f63),
-  ACE_NTOHL (0x7573746f),
+  ACE_NTOHL (0x69735f63), 
+  ACE_NTOHL (0x7573746f), 
   ACE_NTOHL (0x6d000000),  // name = is_custom
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   21,
-  ACE_NTOHL (0x73757070),
-  ACE_NTOHL (0x6f727465),
-  ACE_NTOHL (0x645f696e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636573),
+  ACE_NTOHL (0x73757070), 
+  ACE_NTOHL (0x6f727465), 
+  ACE_NTOHL (0x645f696e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636573), 
   ACE_NTOHL (0x0),  // name = supported_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -2060,51 +2062,51 @@ static const CORBA::Long _oc_CORBA_ValueDescription[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   21,
-  ACE_NTOHL (0x61627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x5f626173),
-  ACE_NTOHL (0x655f7661),
-  ACE_NTOHL (0x6c756573),
+  ACE_NTOHL (0x61627374), 
+  ACE_NTOHL (0x72616374), 
+  ACE_NTOHL (0x5f626173), 
+  ACE_NTOHL (0x655f7661), 
+  ACE_NTOHL (0x6c756573), 
   ACE_NTOHL (0x0),  // name = abstract_base_values
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -2113,56 +2115,56 @@ static const CORBA::Long _oc_CORBA_ValueDescription[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   15,
-  ACE_NTOHL (0x69735f74),
-  ACE_NTOHL (0x72756e63),
-  ACE_NTOHL (0x61746162),
+  ACE_NTOHL (0x69735f74), 
+  ACE_NTOHL (0x72756e63), 
+  ACE_NTOHL (0x61746162), 
   ACE_NTOHL (0x6c650000),  // name = is_truncatable
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f76616c),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f76616c), 
   ACE_NTOHL (0x75650000),  // name = base_value
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -2172,7 +2174,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDescription (
     sizeof (_oc_CORBA_ValueDescription),
     (char *) &_oc_CORBA_ValueDescription,
     0,
-    sizeof (CORBA::ValueDescription)
+    0
   );
 
 namespace CORBA
@@ -2182,56 +2184,56 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtValueDef_ExtFullValueDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   58,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x7456616c),
-  ACE_NTOHL (0x75654465),
-  ACE_NTOHL (0x662f4578),
-  ACE_NTOHL (0x7446756c),
-  ACE_NTOHL (0x6c56616c),
-  ACE_NTOHL (0x75654465),
-  ACE_NTOHL (0x73637269),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x7456616c), 
+  ACE_NTOHL (0x75654465), 
+  ACE_NTOHL (0x662f4578), 
+  ACE_NTOHL (0x7446756c), 
+  ACE_NTOHL (0x6c56616c), 
+  ACE_NTOHL (0x75654465), 
+  ACE_NTOHL (0x73637269), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef/ExtFullValueDescription:1.0
     24,
-  ACE_NTOHL (0x45787446),
-  ACE_NTOHL (0x756c6c56),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x44657363),
-  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x45787446), 
+  ACE_NTOHL (0x756c6c56), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x44657363), 
+  ACE_NTOHL (0x72697074), 
   ACE_NTOHL (0x696f6e00),  // name = ExtFullValueDescription
   15, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4964), 
+    ACE_NTOHL (0x656e7469), 
+    ACE_NTOHL (0x66696572), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
+    ACE_NTOHL (0x4964656e), 
+    ACE_NTOHL (0x74696669), 
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   3,
@@ -2240,106 +2242,106 @@ static const CORBA::Long _oc_CORBA_ExtValueDef_ExtFullValueDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f61),
-  ACE_NTOHL (0x62737472),
+  ACE_NTOHL (0x69735f61), 
+  ACE_NTOHL (0x62737472), 
   ACE_NTOHL (0x61637400),  // name = is_abstract
     CORBA::tk_boolean,
 
   10,
-  ACE_NTOHL (0x69735f63),
-  ACE_NTOHL (0x7573746f),
+  ACE_NTOHL (0x69735f63), 
+  ACE_NTOHL (0x7573746f), 
   ACE_NTOHL (0x6d000000),  // name = is_custom
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x64656669),
-  ACE_NTOHL (0x6e65645f),
+  ACE_NTOHL (0x64656669), 
+  ACE_NTOHL (0x6e65645f), 
   ACE_NTOHL (0x696e0000),  // name = defined_in
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   8,
-  ACE_NTOHL (0x76657273),
+  ACE_NTOHL (0x76657273), 
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5665),
-    ACE_NTOHL (0x7273696f),
-    ACE_NTOHL (0x6e537065),
-    ACE_NTOHL (0x633a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5665), 
+    ACE_NTOHL (0x7273696f), 
+    ACE_NTOHL (0x6e537065), 
+    ACE_NTOHL (0x633a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273),
-    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x56657273), 
+    ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572),
-  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e730000),  // name = operations
     CORBA::tk_alias, // typecode kind for typedefs
   2036, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f70),
-    ACE_NTOHL (0x44657363),
-    ACE_NTOHL (0x72697074),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465),
-    ACE_NTOHL (0x73637269),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x4f704465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1956, // encapsulation length
@@ -2348,46 +2350,46 @@ static const CORBA::Long _oc_CORBA_ExtValueDef_ExtFullValueDescription[] =
       1940, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f70),
-        ACE_NTOHL (0x65726174),
-        ACE_NTOHL (0x696f6e44),
-        ACE_NTOHL (0x65736372),
-        ACE_NTOHL (0x69707469),
-        ACE_NTOHL (0x6f6e3a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e3a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572),
-        ACE_NTOHL (0x6174696f),
-        ACE_NTOHL (0x6e446573),
-        ACE_NTOHL (0x63726970),
-        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4f706572), 
+        ACE_NTOHL (0x6174696f), 
+        ACE_NTOHL (0x6e446573), 
+        ACE_NTOHL (0x63726970), 
+        ACE_NTOHL (0x74696f6e), 
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -2396,128 +2398,128 @@ static const CORBA::Long _oc_CORBA_ExtValueDef_ExtFullValueDescription[] =
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         7,
-        ACE_NTOHL (0x72657375),
+        ACE_NTOHL (0x72657375), 
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4f70),
-          ACE_NTOHL (0x65726174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572),
-          ACE_NTOHL (0x6174696f),
-          ACE_NTOHL (0x6e4d6f64),
+          ACE_NTOHL (0x4f706572), 
+          ACE_NTOHL (0x6174696f), 
+          ACE_NTOHL (0x6e4d6f64), 
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e),
-          ACE_NTOHL (0x4f524d41),
+          ACE_NTOHL (0x4f505f4e), 
+          ACE_NTOHL (0x4f524d41), 
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f),
-          ACE_NTOHL (0x4e455741),
+          ACE_NTOHL (0x4f505f4f), 
+          ACE_NTOHL (0x4e455741), 
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-
+          
         9,
-        ACE_NTOHL (0x636f6e74),
-        ACE_NTOHL (0x65787473),
+        ACE_NTOHL (0x636f6e74), 
+        ACE_NTOHL (0x65787473), 
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f436f),
-          ACE_NTOHL (0x6e746578),
-          ACE_NTOHL (0x74496453),
-          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65713a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74),
-          ACE_NTOHL (0x65787449),
-          ACE_NTOHL (0x64536571),
+          ACE_NTOHL (0x436f6e74), 
+          ACE_NTOHL (0x65787449), 
+          ACE_NTOHL (0x64536571), 
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           164, // encapsulation length
@@ -2526,40 +2528,40 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             148, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f436f),
-              ACE_NTOHL (0x6e746578),
-              ACE_NTOHL (0x74496465),
-              ACE_NTOHL (0x6e746966),
-              ACE_NTOHL (0x6965723a),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f436f), 
+              ACE_NTOHL (0x6e746578), 
+              ACE_NTOHL (0x74496465), 
+              ACE_NTOHL (0x6e746966), 
+              ACE_NTOHL (0x6965723a), 
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74),
-              ACE_NTOHL (0x65787449),
-              ACE_NTOHL (0x64656e74),
-              ACE_NTOHL (0x69666965),
+              ACE_NTOHL (0x436f6e74), 
+              ACE_NTOHL (0x65787449), 
+              ACE_NTOHL (0x64656e74), 
+              ACE_NTOHL (0x69666965), 
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
 
@@ -2567,28 +2569,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261),
-        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x70617261), 
+        ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         496, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5061),
-          ACE_NTOHL (0x72446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x50617244), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           416, // encapsulation length
@@ -2597,135 +2599,135 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             400, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5061),
-              ACE_NTOHL (0x72616d65),
-              ACE_NTOHL (0x74657244),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261),
-              ACE_NTOHL (0x6d657465),
-              ACE_NTOHL (0x72446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x50617261), 
+              ACE_NTOHL (0x6d657465), 
+              ACE_NTOHL (0x72446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065),
-              ACE_NTOHL (0x5f646566),
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4944),
-                ACE_NTOHL (0x4c547970),
-                ACE_NTOHL (0x653a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54),
+                ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
               5,
-              ACE_NTOHL (0x6d6f6465),
+              ACE_NTOHL (0x6d6f6465), 
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5061),
-                ACE_NTOHL (0x72616d65),
-                ACE_NTOHL (0x7465724d),
-                ACE_NTOHL (0x6f64653a),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f64653a), 
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261),
-                ACE_NTOHL (0x6d657465),
-                ACE_NTOHL (0x724d6f64),
+                ACE_NTOHL (0x50617261), 
+                ACE_NTOHL (0x6d657465), 
+                ACE_NTOHL (0x724d6f64), 
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f4f55),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f4f55), 
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241),
-                ACE_NTOHL (0x4d5f494e),
+                ACE_NTOHL (0x50415241), 
+                ACE_NTOHL (0x4d5f494e), 
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-
+                
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -2734,46 +2736,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -2782,73 +2784,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -2861,30 +2863,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x61747472),
-  ACE_NTOHL (0x69627574),
+  ACE_NTOHL (0x61747472), 
+  ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   1860, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x74417474),
-    ACE_NTOHL (0x72446573),
-    ACE_NTOHL (0x63726970),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74417474), 
+    ACE_NTOHL (0x72446573), 
+    ACE_NTOHL (0x63726970), 
+    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
         22,
-    ACE_NTOHL (0x45787441),
-    ACE_NTOHL (0x74747244),
-    ACE_NTOHL (0x65736372),
-    ACE_NTOHL (0x69707469),
-    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x45787441), 
+    ACE_NTOHL (0x74747244), 
+    ACE_NTOHL (0x65736372), 
+    ACE_NTOHL (0x69707469), 
+    ACE_NTOHL (0x6f6e5365), 
     ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1772, // encapsulation length
@@ -2893,47 +2895,47 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       1756, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         46,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x74417474),
-        ACE_NTOHL (0x72696275),
-        ACE_NTOHL (0x74654465),
-        ACE_NTOHL (0x73637269),
-        ACE_NTOHL (0x7074696f),
-        ACE_NTOHL (0x6e3a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74417474), 
+        ACE_NTOHL (0x72696275), 
+        ACE_NTOHL (0x74654465), 
+        ACE_NTOHL (0x73637269), 
+        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6e3a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
                 24,
-        ACE_NTOHL (0x45787441),
-        ACE_NTOHL (0x74747269),
-        ACE_NTOHL (0x62757465),
-        ACE_NTOHL (0x44657363),
-        ACE_NTOHL (0x72697074),
+        ACE_NTOHL (0x45787441), 
+        ACE_NTOHL (0x74747269), 
+        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x44657363), 
+        ACE_NTOHL (0x72697074), 
         ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
         8, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -2942,132 +2944,132 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465),
+        ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4174),
-          ACE_NTOHL (0x74726962),
-          ACE_NTOHL (0x7574654d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472),
-          ACE_NTOHL (0x69627574),
-          ACE_NTOHL (0x654d6f64),
+          ACE_NTOHL (0x41747472), 
+          ACE_NTOHL (0x69627574), 
+          ACE_NTOHL (0x654d6f64), 
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f4e4f52),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f4e4f52), 
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452),
-          ACE_NTOHL (0x5f524541),
-          ACE_NTOHL (0x444f4e4c),
+          ACE_NTOHL (0x41545452), 
+          ACE_NTOHL (0x5f524541), 
+          ACE_NTOHL (0x444f4e4c), 
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-
+          
         15,
-        ACE_NTOHL (0x6765745f),
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6765745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -3076,46 +3078,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -3124,73 +3126,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -3199,29 +3201,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         15,
-        ACE_NTOHL (0x7075745f),
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x7075745f), 
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -3230,46 +3232,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -3278,73 +3280,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -3357,26 +3359,26 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   8,
-  ACE_NTOHL (0x6d656d62),
+  ACE_NTOHL (0x6d656d62), 
   ACE_NTOHL (0x65727300),  // name = members
     CORBA::tk_alias, // typecode kind for typedefs
   692, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5661),
-    ACE_NTOHL (0x6c75654d),
-    ACE_NTOHL (0x656d6265),
-    ACE_NTOHL (0x72536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5661), 
+    ACE_NTOHL (0x6c75654d), 
+    ACE_NTOHL (0x656d6265), 
+    ACE_NTOHL (0x72536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
         15,
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x654d656d),
-    ACE_NTOHL (0x62657253),
+    ACE_NTOHL (0x56616c75), 
+    ACE_NTOHL (0x654d656d), 
+    ACE_NTOHL (0x62657253), 
     ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
         CORBA::tk_sequence, // typecode kind
     616, // encapsulation length
@@ -3385,41 +3387,41 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       600, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5661),
-        ACE_NTOHL (0x6c75654d),
-        ACE_NTOHL (0x656d6265),
-        ACE_NTOHL (0x723a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5661), 
+        ACE_NTOHL (0x6c75654d), 
+        ACE_NTOHL (0x656d6265), 
+        ACE_NTOHL (0x723a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
                 12,
-        ACE_NTOHL (0x56616c75),
-        ACE_NTOHL (0x654d656d),
+        ACE_NTOHL (0x56616c75), 
+        ACE_NTOHL (0x654d656d), 
         ACE_NTOHL (0x62657200),  // name = ValueMember
         7, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         3,
@@ -3428,115 +3430,115 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         11,
-        ACE_NTOHL (0x64656669),
-        ACE_NTOHL (0x6e65645f),
+        ACE_NTOHL (0x64656669), 
+        ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 CORBA::tk_alias, // typecode kind for typedefs
         72, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x49643a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x49643a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                     13,
-          ACE_NTOHL (0x5265706f),
-          ACE_NTOHL (0x7369746f),
-          ACE_NTOHL (0x72794964),
+          ACE_NTOHL (0x5265706f), 
+          ACE_NTOHL (0x7369746f), 
+          ACE_NTOHL (0x72794964), 
           ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         8,
-        ACE_NTOHL (0x76657273),
+        ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           34,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5665),
-          ACE_NTOHL (0x7273696f),
-          ACE_NTOHL (0x6e537065),
-          ACE_NTOHL (0x633a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5665), 
+          ACE_NTOHL (0x7273696f), 
+          ACE_NTOHL (0x6e537065), 
+          ACE_NTOHL (0x633a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                     12,
-          ACE_NTOHL (0x56657273),
-          ACE_NTOHL (0x696f6e53),
+          ACE_NTOHL (0x56657273), 
+          ACE_NTOHL (0x696f6e53), 
           ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         5,
-        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065),
-        ACE_NTOHL (0x5f646566),
+        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x5f646566), 
         ACE_NTOHL (0x0),  // name = type_def
                 CORBA::tk_objref, // typecode kind
         52, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4944),
-          ACE_NTOHL (0x4c547970),
-          ACE_NTOHL (0x653a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4944), 
+          ACE_NTOHL (0x4c547970), 
+          ACE_NTOHL (0x653a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                     8,
-          ACE_NTOHL (0x49444c54),
+          ACE_NTOHL (0x49444c54), 
           ACE_NTOHL (0x79706500),  // name = IDLType
-
+          
         7,
-        ACE_NTOHL (0x61636365),
+        ACE_NTOHL (0x61636365), 
         ACE_NTOHL (0x73730000),  // name = access
                 CORBA::tk_alias, // typecode kind for typedefs
         64, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5669),
-          ACE_NTOHL (0x73696269),
-          ACE_NTOHL (0x6c697479),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5669), 
+          ACE_NTOHL (0x73696269), 
+          ACE_NTOHL (0x6c697479), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
                     11,
-          ACE_NTOHL (0x56697369),
-          ACE_NTOHL (0x62696c69),
+          ACE_NTOHL (0x56697369), 
+          ACE_NTOHL (0x62696c69), 
           ACE_NTOHL (0x74790000),  // name = Visibility
                     CORBA::tk_short,
 
@@ -3546,29 +3548,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   13,
-  ACE_NTOHL (0x696e6974),
-  ACE_NTOHL (0x69616c69),
-  ACE_NTOHL (0x7a657273),
+  ACE_NTOHL (0x696e6974), 
+  ACE_NTOHL (0x69616c69), 
+  ACE_NTOHL (0x7a657273), 
   ACE_NTOHL (0x0),  // name = initializers
     CORBA::tk_alias, // typecode kind for typedefs
   1196, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4578),
-    ACE_NTOHL (0x74496e69),
-    ACE_NTOHL (0x7469616c),
-    ACE_NTOHL (0x697a6572),
-    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4578), 
+    ACE_NTOHL (0x74496e69), 
+    ACE_NTOHL (0x7469616c), 
+    ACE_NTOHL (0x697a6572), 
+    ACE_NTOHL (0x5365713a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtInitializerSeq:1.0
         18,
-    ACE_NTOHL (0x45787449),
-    ACE_NTOHL (0x6e697469),
-    ACE_NTOHL (0x616c697a),
-    ACE_NTOHL (0x65725365),
+    ACE_NTOHL (0x45787449), 
+    ACE_NTOHL (0x6e697469), 
+    ACE_NTOHL (0x616c697a), 
+    ACE_NTOHL (0x65725365), 
     ACE_NTOHL (0x71000000),  // name = ExtInitializerSeq
         CORBA::tk_sequence, // typecode kind
     1116, // encapsulation length
@@ -3577,43 +3579,43 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       1100, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         37,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4578),
-        ACE_NTOHL (0x74496e69),
-        ACE_NTOHL (0x7469616c),
-        ACE_NTOHL (0x697a6572),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4578), 
+        ACE_NTOHL (0x74496e69), 
+        ACE_NTOHL (0x7469616c), 
+        ACE_NTOHL (0x697a6572), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
                 15,
-        ACE_NTOHL (0x45787449),
-        ACE_NTOHL (0x6e697469),
-        ACE_NTOHL (0x616c697a),
+        ACE_NTOHL (0x45787449), 
+        ACE_NTOHL (0x6e697469), 
+        ACE_NTOHL (0x616c697a), 
         ACE_NTOHL (0x65720000),  // name = ExtInitializer
         3, // member count
                 8,
-        ACE_NTOHL (0x6d656d62),
+        ACE_NTOHL (0x6d656d62), 
         ACE_NTOHL (0x65727300),  // name = members
                 CORBA::tk_alias, // typecode kind for typedefs
         340, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           38,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5374),
-          ACE_NTOHL (0x72756374),
-          ACE_NTOHL (0x4d656d62),
-          ACE_NTOHL (0x65725365),
-          ACE_NTOHL (0x713a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5374), 
+          ACE_NTOHL (0x72756374), 
+          ACE_NTOHL (0x4d656d62), 
+          ACE_NTOHL (0x65725365), 
+          ACE_NTOHL (0x713a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
                     16,
-          ACE_NTOHL (0x53747275),
-          ACE_NTOHL (0x63744d65),
-          ACE_NTOHL (0x6d626572),
+          ACE_NTOHL (0x53747275), 
+          ACE_NTOHL (0x63744d65), 
+          ACE_NTOHL (0x6d626572), 
           ACE_NTOHL (0x53657100),  // name = StructMemberSeq
                     CORBA::tk_sequence, // typecode kind
           264, // encapsulation length
@@ -3622,96 +3624,96 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             248, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f5374),
-              ACE_NTOHL (0x72756374),
-              ACE_NTOHL (0x4d656d62),
-              ACE_NTOHL (0x65723a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f5374), 
+              ACE_NTOHL (0x72756374), 
+              ACE_NTOHL (0x4d656d62), 
+              ACE_NTOHL (0x65723a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
                             13,
-              ACE_NTOHL (0x53747275),
-              ACE_NTOHL (0x63744d65),
-              ACE_NTOHL (0x6d626572),
+              ACE_NTOHL (0x53747275), 
+              ACE_NTOHL (0x63744d65), 
+              ACE_NTOHL (0x6d626572), 
               ACE_NTOHL (0x0),  // name = StructMember
               3, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065),
-              ACE_NTOHL (0x5f646566),
+              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4944),
-                ACE_NTOHL (0x4c547970),
-                ACE_NTOHL (0x653a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x653a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54),
+                ACE_NTOHL (0x49444c54), 
                 ACE_NTOHL (0x79706500),  // name = IDLType
-
+                
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x65786365), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         556, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4578),
-          ACE_NTOHL (0x63446573),
-          ACE_NTOHL (0x63726970),
-          ACE_NTOHL (0x74696f6e),
-          ACE_NTOHL (0x5365713a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x5365713a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344),
-          ACE_NTOHL (0x65736372),
-          ACE_NTOHL (0x69707469),
-          ACE_NTOHL (0x6f6e5365),
+          ACE_NTOHL (0x45786344), 
+          ACE_NTOHL (0x65736372), 
+          ACE_NTOHL (0x69707469), 
+          ACE_NTOHL (0x6f6e5365), 
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           476, // encapsulation length
@@ -3720,46 +3722,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             460, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x6f6d672e),
-              ACE_NTOHL (0x6f72672f),
-              ACE_NTOHL (0x434f5242),
-              ACE_NTOHL (0x412f4578),
-              ACE_NTOHL (0x63657074),
-              ACE_NTOHL (0x696f6e44),
-              ACE_NTOHL (0x65736372),
-              ACE_NTOHL (0x69707469),
-              ACE_NTOHL (0x6f6e3a31),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x6f6d672e), 
+              ACE_NTOHL (0x6f72672f), 
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e3a31), 
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365),
-              ACE_NTOHL (0x7074696f),
-              ACE_NTOHL (0x6e446573),
-              ACE_NTOHL (0x63726970),
-              ACE_NTOHL (0x74696f6e),
+              ACE_NTOHL (0x45786365), 
+              ACE_NTOHL (0x7074696f), 
+              ACE_NTOHL (0x6e446573), 
+              ACE_NTOHL (0x63726970), 
+              ACE_NTOHL (0x74696f6e), 
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 33,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f4964),
-                ACE_NTOHL (0x656e7469),
-                ACE_NTOHL (0x66696572),
-                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f4964), 
+                ACE_NTOHL (0x656e7469), 
+                ACE_NTOHL (0x66696572), 
+                ACE_NTOHL (0x3a312e30), 
                 ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                                 11,
-                ACE_NTOHL (0x4964656e),
-                ACE_NTOHL (0x74696669),
+                ACE_NTOHL (0x4964656e), 
+                ACE_NTOHL (0x74696669), 
                 ACE_NTOHL (0x65720000),  // name = Identifier
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               3,
@@ -3768,73 +3770,73 @@ TAO_ENCAP_BYTE_ORDER, // byte order
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               11,
-              ACE_NTOHL (0x64656669),
-              ACE_NTOHL (0x6e65645f),
+              ACE_NTOHL (0x64656669), 
+              ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             CORBA::tk_alias, // typecode kind for typedefs
               72, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 35,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5265),
-                ACE_NTOHL (0x706f7369),
-                ACE_NTOHL (0x746f7279),
-                ACE_NTOHL (0x49643a31),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5265), 
+                ACE_NTOHL (0x706f7369), 
+                ACE_NTOHL (0x746f7279), 
+                ACE_NTOHL (0x49643a31), 
                 ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                                 13,
-                ACE_NTOHL (0x5265706f),
-                ACE_NTOHL (0x7369746f),
-                ACE_NTOHL (0x72794964),
+                ACE_NTOHL (0x5265706f), 
+                ACE_NTOHL (0x7369746f), 
+                ACE_NTOHL (0x72794964), 
                 ACE_NTOHL (0x0),  // name = RepositoryId
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               8,
-              ACE_NTOHL (0x76657273),
+              ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
                             CORBA::tk_alias, // typecode kind for typedefs
               68, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 34,
-                ACE_NTOHL (0x49444c3a),
-                ACE_NTOHL (0x6f6d672e),
-                ACE_NTOHL (0x6f72672f),
-                ACE_NTOHL (0x434f5242),
-                ACE_NTOHL (0x412f5665),
-                ACE_NTOHL (0x7273696f),
-                ACE_NTOHL (0x6e537065),
-                ACE_NTOHL (0x633a312e),
+                ACE_NTOHL (0x49444c3a), 
+                ACE_NTOHL (0x6f6d672e), 
+                ACE_NTOHL (0x6f72672f), 
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x412f5665), 
+                ACE_NTOHL (0x7273696f), 
+                ACE_NTOHL (0x6e537065), 
+                ACE_NTOHL (0x633a312e), 
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                                 12,
-                ACE_NTOHL (0x56657273),
-                ACE_NTOHL (0x696f6e53),
+                ACE_NTOHL (0x56657273), 
+                ACE_NTOHL (0x696f6e53), 
                 ACE_NTOHL (0x70656300),  // name = VersionSpec
-                                CORBA::tk_string,
+                                CORBA::tk_string, 
                 0U, // string length
 
               5,
-              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -3843,26 +3845,26 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
                 CORBA::tk_alias, // typecode kind for typedefs
         68, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4964),
-          ACE_NTOHL (0x656e7469),
-          ACE_NTOHL (0x66696572),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4964), 
+          ACE_NTOHL (0x656e7469), 
+          ACE_NTOHL (0x66696572), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e),
-          ACE_NTOHL (0x74696669),
+          ACE_NTOHL (0x4964656e), 
+          ACE_NTOHL (0x74696669), 
           ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
 
@@ -3870,30 +3872,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   21,
-  ACE_NTOHL (0x73757070),
-  ACE_NTOHL (0x6f727465),
-  ACE_NTOHL (0x645f696e),
-  ACE_NTOHL (0x74657266),
-  ACE_NTOHL (0x61636573),
+  ACE_NTOHL (0x73757070), 
+  ACE_NTOHL (0x6f727465), 
+  ACE_NTOHL (0x645f696e), 
+  ACE_NTOHL (0x74657266), 
+  ACE_NTOHL (0x61636573), 
   ACE_NTOHL (0x0),  // name = supported_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -3902,51 +3904,51 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   21,
-  ACE_NTOHL (0x61627374),
-  ACE_NTOHL (0x72616374),
-  ACE_NTOHL (0x5f626173),
-  ACE_NTOHL (0x655f7661),
-  ACE_NTOHL (0x6c756573),
+  ACE_NTOHL (0x61627374), 
+  ACE_NTOHL (0x72616374), 
+  ACE_NTOHL (0x5f626173), 
+  ACE_NTOHL (0x655f7661), 
+  ACE_NTOHL (0x6c756573), 
   ACE_NTOHL (0x0),  // name = abstract_base_values
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49645365),
-    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49645365), 
+    ACE_NTOHL (0x713a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     88, // encapsulation length
@@ -3955,60 +3957,60 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x49643a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x49643a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f),
-        ACE_NTOHL (0x7369746f),
-        ACE_NTOHL (0x72794964),
+        ACE_NTOHL (0x5265706f), 
+        ACE_NTOHL (0x7369746f), 
+        ACE_NTOHL (0x72794964), 
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   15,
-  ACE_NTOHL (0x69735f74),
-  ACE_NTOHL (0x72756e63),
-  ACE_NTOHL (0x61746162),
+  ACE_NTOHL (0x69735f74), 
+  ACE_NTOHL (0x72756e63), 
+  ACE_NTOHL (0x61746162), 
   ACE_NTOHL (0x6c650000),  // name = is_truncatable
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x62617365),
-  ACE_NTOHL (0x5f76616c),
+  ACE_NTOHL (0x62617365), 
+  ACE_NTOHL (0x5f76616c), 
   ACE_NTOHL (0x75650000),  // name = base_value
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x49643a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
+    ACE_NTOHL (0x5265706f), 
+    ACE_NTOHL (0x7369746f), 
+    ACE_NTOHL (0x72794964), 
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -4019,31 +4021,31 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtValueDef_ExtFullValueDescription (
     sizeof (_oc_CORBA_ExtValueDef_ExtFullValueDescription),
     (char *) &_oc_CORBA_ExtValueDef_ExtFullValueDescription,
     0,
-    sizeof (CORBA::ExtValueDef::ExtFullValueDescription)
+    0
   );
 
 ::CORBA::TypeCode_ptr CORBA::ExtValueDef::_tc_ExtFullValueDescription =
   &_tc_TAO_tc_CORBA_ExtValueDef_ExtFullValueDescription;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ExtValueDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4578),
-  ACE_NTOHL (0x7456616c),
-  ACE_NTOHL (0x75654465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4578), 
+  ACE_NTOHL (0x7456616c), 
+  ACE_NTOHL (0x75654465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef:1.0
     12,
-  ACE_NTOHL (0x45787456),
-  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x45787456), 
+  ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x44656600),  // name = ExtValueDef
   };
 
@@ -4052,7 +4054,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtValueDef (
     sizeof (_oc_CORBA_ExtValueDef),
     (char *) &_oc_CORBA_ExtValueDef,
     0,
-    sizeof (CORBA::ExtValueDef)
+    0
   );
 
 namespace CORBA
@@ -4062,24 +4064,24 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ValueBoxDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5661),
-  ACE_NTOHL (0x6c756542),
-  ACE_NTOHL (0x6f784465),
-  ACE_NTOHL (0x663a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5661), 
+  ACE_NTOHL (0x6c756542), 
+  ACE_NTOHL (0x6f784465), 
+  ACE_NTOHL (0x663a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueBoxDef:1.0
     12,
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65426f78),
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65426f78), 
   ACE_NTOHL (0x44656600),  // name = ValueBoxDef
   };
 
@@ -4088,7 +4090,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueBoxDef (
     sizeof (_oc_CORBA_ValueBoxDef),
     (char *) &_oc_CORBA_ValueBoxDef,
     0,
-    sizeof (CORBA::ValueBoxDef)
+    0
   );
 
 namespace CORBA
@@ -4152,7 +4154,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4189,8 +4191,8 @@ CORBA::Boolean operator>>= (
     CORBA::ValueMember *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ValueMember *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ValueMember *&> (
       _tao_elem
     );
 }
@@ -4210,7 +4212,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4247,8 +4249,8 @@ CORBA::Boolean operator>>= (
     CORBA::ValueMemberSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ValueMemberSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ValueMemberSeq *&> (
       _tao_elem
     );
 }
@@ -4378,7 +4380,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4415,8 +4417,8 @@ CORBA::Boolean operator>>= (
     CORBA::ValueDef::FullValueDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ValueDef::FullValueDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ValueDef::FullValueDescription *&> (
       _tao_elem
     );
 }
@@ -4436,7 +4438,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4473,8 +4475,8 @@ CORBA::Boolean operator>>= (
     CORBA::ValueDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ValueDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ValueDescription *&> (
       _tao_elem
     );
 }
@@ -4549,7 +4551,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -4586,8 +4588,8 @@ CORBA::Boolean operator>>= (
     CORBA::ExtValueDef::ExtFullValueDescription *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ExtValueDef::ExtFullValueDescription *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ExtValueDef::ExtFullValueDescription *&> (
       _tao_elem
     );
 }
@@ -4662,8 +4664,6 @@ operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -4768,5 +4768,4 @@ operator>>= (
         CORBA::ValueDescription \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 444a2cfab77..396605173ba 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IFR_ExtendedC.h"
@@ -46,68 +46,15 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IFR_ExtendedC.i"
+#include "IFR_ExtendedC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:582
-
-#if !defined (_CORBA_ANY__ARG_TRAITS_CS_)
-#define _CORBA_ANY__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Container_ptr,
-            CORBA::Container_var,
-            CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_CS_
@@ -127,7 +74,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -163,7 +110,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:618
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_
@@ -182,7 +129,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
@@ -201,7 +148,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
@@ -220,26 +167,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::AbstractInterfaceDefSeq,
-            CORBA::AbstractInterfaceDefSeq_var,
-            CORBA::AbstractInterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:618
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_
@@ -258,7 +186,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
@@ -277,81 +205,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::StructMemberSeq,
-            CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::UnionMemberSeq,
-            CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::EnumMemberSeq,
-            CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::PrimitiveKind>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::PrimitiveKind
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
@@ -370,7 +224,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
@@ -421,7 +275,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
+  // be\be_visitor_arg_traits.cpp:574
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
@@ -438,7 +292,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
@@ -457,7 +311,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
@@ -577,7 +431,7 @@ CORBA::UShort CORBA::FixedDef::digits (
       CORBA_FixedDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::UShort>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::UShort>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -603,7 +457,7 @@ CORBA::UShort CORBA::FixedDef::digits (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::FixedDef::digits (
-    CORBA::UShort digits
+    ::CORBA::UShort digits
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -620,8 +474,8 @@ void CORBA::FixedDef::digits (
       CORBA_FixedDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::UShort>::in_arg_val _tao_digits (digits);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits (digits);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -662,7 +516,7 @@ CORBA::Short CORBA::FixedDef::scale (
       CORBA_FixedDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Short>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Short>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -688,7 +542,7 @@ CORBA::Short CORBA::FixedDef::scale (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::FixedDef::scale (
-    CORBA::Short scale
+    ::CORBA::Short scale
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -705,8 +559,8 @@ void CORBA::FixedDef::scale (
       CORBA_FixedDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::Short>::in_arg_val _tao_scale (scale);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Short>::in_arg_val _tao_scale (scale);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -752,7 +606,7 @@ void
 CORBA::FixedDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FixedDef *_tao_tmp_pointer =
-    ACE_static_cast (FixedDef *, _tao_void_pointer);
+    static_cast<FixedDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -805,22 +659,22 @@ CORBA::FixedDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/FixedDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -853,7 +707,7 @@ CORBA::ValueMember::_tao_any_destructor (
   )
 {
   ValueMember *_tao_tmp_pointer =
-    ACE_static_cast (ValueMember *, _tao_void_pointer);
+    static_cast<ValueMember *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -904,7 +758,7 @@ void CORBA::ValueMemberSeq::_tao_any_destructor (
   )
 {
   ValueMemberSeq * _tao_tmp_pointer =
-    ACE_static_cast (ValueMemberSeq *, _tao_void_pointer);
+    static_cast<ValueMemberSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -976,7 +830,7 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
       CORBA_ValueMemberDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::TypeCode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1018,7 +872,7 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
       CORBA_ValueMemberDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1044,7 +898,7 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueMemberDef::type_def (
-    CORBA::IDLType_ptr type_def
+    ::CORBA::IDLType_ptr type_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1061,8 +915,8 @@ void CORBA::ValueMemberDef::type_def (
       CORBA_ValueMemberDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1103,7 +957,7 @@ CORBA::Visibility CORBA::ValueMemberDef::access (
       CORBA_ValueMemberDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::Visibility>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Visibility>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1129,7 +983,7 @@ CORBA::Visibility CORBA::ValueMemberDef::access (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueMemberDef::access (
-    CORBA::Visibility access
+    ::CORBA::Visibility access
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1146,8 +1000,8 @@ void CORBA::ValueMemberDef::access (
       CORBA_ValueMemberDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::Visibility>::in_arg_val _tao_access (access);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1193,7 +1047,7 @@ void
 CORBA::ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueMemberDef *_tao_tmp_pointer =
-    ACE_static_cast (ValueMemberDef *, _tao_void_pointer);
+    static_cast<ValueMemberDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1246,22 +1100,22 @@ CORBA::ValueMemberDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1351,7 +1205,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1377,7 +1231,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueDef::supported_interfaces (
-    const CORBA::InterfaceDefSeq & supported_interfaces
+    const ::CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1394,8 +1248,8 @@ void CORBA::ValueDef::supported_interfaces (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1436,7 +1290,7 @@ void CORBA::ValueDef::supported_interfaces (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::InitializerSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InitializerSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1462,7 +1316,7 @@ void CORBA::ValueDef::supported_interfaces (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueDef::initializers (
-    const CORBA::InitializerSeq & initializers
+    const ::CORBA::InitializerSeq & initializers
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1479,8 +1333,8 @@ void CORBA::ValueDef::initializers (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1521,7 +1375,7 @@ void CORBA::ValueDef::initializers (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1547,7 +1401,7 @@ void CORBA::ValueDef::initializers (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueDef::base_value (
-    CORBA::ValueDef_ptr base_value
+    ::CORBA::ValueDef_ptr base_value
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1564,8 +1418,8 @@ void CORBA::ValueDef::base_value (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1606,7 +1460,7 @@ void CORBA::ValueDef::base_value (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ValueDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ValueDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1632,7 +1486,7 @@ void CORBA::ValueDef::base_value (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueDef::abstract_base_values (
-    const CORBA::ValueDefSeq & abstract_base_values
+    const ::CORBA::ValueDefSeq & abstract_base_values
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1649,8 +1503,8 @@ void CORBA::ValueDef::abstract_base_values (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1691,7 +1545,7 @@ CORBA::Boolean CORBA::ValueDef::is_abstract (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1717,7 +1571,7 @@ CORBA::Boolean CORBA::ValueDef::is_abstract (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueDef::is_abstract (
-    CORBA::Boolean is_abstract
+    ::CORBA::Boolean is_abstract
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1734,8 +1588,8 @@ void CORBA::ValueDef::is_abstract (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1776,7 +1630,7 @@ CORBA::Boolean CORBA::ValueDef::is_custom (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1802,7 +1656,7 @@ CORBA::Boolean CORBA::ValueDef::is_custom (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueDef::is_custom (
-    CORBA::Boolean is_custom
+    ::CORBA::Boolean is_custom
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1819,8 +1673,8 @@ void CORBA::ValueDef::is_custom (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1861,7 +1715,7 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1887,7 +1741,7 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueDef::is_truncatable (
-    CORBA::Boolean is_truncatable
+    ::CORBA::Boolean is_truncatable
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1904,8 +1758,8 @@ void CORBA::ValueDef::is_truncatable (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1947,8 +1801,8 @@ CORBA::Boolean CORBA::ValueDef::is_a (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1980,7 +1834,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
   )
 {
   FullValueDescription *_tao_tmp_pointer =
-    ACE_static_cast (FullValueDescription *, _tao_void_pointer);
+    static_cast<FullValueDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2004,7 +1858,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ValueDef::FullValueDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ValueDef::FullValueDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2033,8 +1887,8 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::Visibility access
+    ::CORBA::IDLType_ptr type,
+    ::CORBA::Visibility access
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2051,12 +1905,12 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ValueMemberDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits<CORBA::Visibility>::in_arg_val _tao_access (access);
+  TAO::Arg_Traits< CORBA::ValueMemberDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2090,8 +1944,8 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode
+    ::CORBA::IDLType_ptr type,
+    ::CORBA::AttributeMode mode
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2108,12 +1962,12 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::AttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< CORBA::AttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2147,11 +2001,11 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
-    CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts
+    ::CORBA::IDLType_ptr result,
+    ::CORBA::OperationMode mode,
+    const ::CORBA::ParDescriptionSeq & params,
+    const ::CORBA::ExceptionDefSeq & exceptions,
+    const ::CORBA::ContextIdSeq & contexts
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2168,15 +2022,15 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::OperationDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_result (result);
-  TAO::Arg_Traits<CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits<CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  TAO::Arg_Traits<CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
+  TAO::Arg_Traits< CORBA::OperationDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result (result);
+  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2233,7 +2087,7 @@ void
 CORBA::ValueDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueDef *_tao_tmp_pointer =
-    ACE_static_cast (ValueDef *, _tao_void_pointer);
+    static_cast<ValueDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2286,30 +2140,30 @@ CORBA::ValueDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2342,7 +2196,7 @@ CORBA::ValueDescription::_tao_any_destructor (
   )
 {
   ValueDescription *_tao_tmp_pointer =
-    ACE_static_cast (ValueDescription *, _tao_void_pointer);
+    static_cast<ValueDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2412,7 +2266,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExtInitializerSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2438,7 +2292,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ExtValueDef::ext_initializers (
-    const CORBA::ExtInitializerSeq & ext_initializers
+    const ::CORBA::ExtInitializerSeq & ext_initializers
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2455,8 +2309,8 @@ void CORBA::ExtValueDef::ext_initializers (
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers (ext_initializers);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers (ext_initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2486,7 +2340,7 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
   )
 {
   ExtFullValueDescription *_tao_tmp_pointer =
-    ACE_static_cast (ExtFullValueDescription *, _tao_void_pointer);
+    static_cast<ExtFullValueDescription *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -2510,7 +2364,7 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::ExtValueDef::ExtFullValueDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2539,10 +2393,10 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    const CORBA::ExceptionDefSeq & get_exceptions,
-    const CORBA::ExceptionDefSeq & set_exceptions
+    ::CORBA::IDLType_ptr type,
+    ::CORBA::AttributeMode mode,
+    const ::CORBA::ExceptionDefSeq & get_exceptions,
+    const ::CORBA::ExceptionDefSeq & set_exceptions
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2559,14 +2413,14 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::ExtAttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits<CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits<CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits<CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  TAO::Arg_Traits<CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
+  TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
+  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2620,7 +2474,7 @@ void
 CORBA::ExtValueDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtValueDef *_tao_tmp_pointer =
-    ACE_static_cast (ExtValueDef *, _tao_void_pointer);
+    static_cast<ExtValueDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2673,34 +2527,34 @@ CORBA::ExtValueDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2790,7 +2644,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ValueBoxDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2816,7 +2670,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::ValueBoxDef::original_type_def (
-    CORBA::IDLType_ptr original_type_def
+    ::CORBA::IDLType_ptr original_type_def
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -2833,8 +2687,8 @@ void CORBA::ValueBoxDef::original_type_def (
       CORBA_ValueBoxDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2880,7 +2734,7 @@ void
 CORBA::ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueBoxDef *_tao_tmp_pointer =
-    ACE_static_cast (ValueBoxDef *, _tao_void_pointer);
+    static_cast<ValueBoxDef *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2933,30 +2787,30 @@ CORBA::ValueBoxDef::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2999,9 +2853,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::FixedDef RHS_SCOPED_NAME;
@@ -3063,12 +2917,12 @@ CORBA::Boolean operator<< (
     const CORBA::ValueMemberSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -3078,7 +2932,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -3095,7 +2949,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -3104,11 +2958,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -3119,7 +2973,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_CPP_ */
@@ -3143,9 +2997,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ValueMemberDef RHS_SCOPED_NAME;
@@ -3228,9 +3082,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ValueDef RHS_SCOPED_NAME;
@@ -3352,9 +3206,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ExtValueDef RHS_SCOPED_NAME;
@@ -3388,9 +3242,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ValueBoxDef RHS_SCOPED_NAME;
@@ -3406,37 +3260,10 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::DefinitionKind>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::DefinitionKind>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_
-
-  template class
-    TAO::Arg_Traits<
-        CORBA::Container
-      >;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::Container_ptr,
-        CORBA::Container_var,
-        CORBA::Container_out,
-        TAO::Objref_Traits<CORBA::Container>
-      >;
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_
 
@@ -3718,20 +3545,6 @@ CORBA::Boolean operator>> (
         CORBA::ValueBoxDef
       >;
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::AbstractInterfaceDefSeq,
-        CORBA::AbstractInterfaceDefSeq_var,
-        CORBA::AbstractInterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
   template class
     TAO::Ret_Var_Size_Argument_T<
         CORBA::ExtInitializerSeq,
@@ -3819,48 +3632,6 @@ CORBA::Boolean operator>> (
         CORBA::ExtValueDef
       >;
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::StructMemberSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::StructMemberSeq,
-        CORBA::StructMemberSeq_var,
-        CORBA::StructMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::UnionMemberSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::UnionMemberSeq,
-        CORBA::UnionMemberSeq_var,
-        CORBA::UnionMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::EnumMemberSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::EnumMemberSeq,
-        CORBA::EnumMemberSeq_var,
-        CORBA::EnumMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
   template class
     TAO::Objref_Traits<
         CORBA::FixedDef
@@ -3881,15 +3652,6 @@ CORBA::Boolean operator>> (
         CORBA::FixedDef
       >;
 
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::PrimitiveKind>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::PrimitiveKind>;
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
@@ -4076,33 +3838,6 @@ CORBA::Boolean operator>> (
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::DefinitionKind>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::DefinitionKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate \
-    TAO::Arg_Traits< \
-        CORBA::Container \
-      >
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::Container_ptr, \
-        CORBA::Container_var, \
-        CORBA::Container_out, \
-        TAO::Objref_Traits<CORBA::Container> \
-      >
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_
 
@@ -4154,21 +3889,45 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::InterfaceDefSeq, \
+        CORBA::InterfaceDefSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::InterfaceDefSeq \
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::InitializerSeq, \
+        CORBA::InitializerSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::InitializerSeq \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ValueDef_ptr, \
+        CORBA::ValueDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::ValueDef_ptr \
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ValueDefSeq, \
+        CORBA::ValueDefSeq_var \
+      >
+
+# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::ValueDefSeq \
       >
@@ -4247,16 +4006,40 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ValueDef::FullValueDescription, \
+        CORBA::ValueDef::FullValueDescription_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ValueMemberDef_ptr, \
+        CORBA::ValueMemberDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Object_Argument_T< \
         CORBA::IDLType_ptr \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::AttributeDef_ptr, \
+        CORBA::AttributeDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Basic_Argument_T< \
         CORBA::AttributeMode \
       >
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::OperationDef_ptr, \
+        CORBA::OperationDef_var \
+      >
+
+# pragma instantiate \
     TAO::In_Basic_Argument_T< \
         CORBA::OperationMode \
       >
@@ -4311,6 +4094,12 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::IDLType_ptr, \
+        CORBA::IDLType_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::ValueBoxDef \
       >
@@ -4330,20 +4119,12 @@ CORBA::Boolean operator>> (
         CORBA::ValueBoxDef \
       >
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>
-
 # pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::AbstractInterfaceDefSeq, \
-        CORBA::AbstractInterfaceDefSeq_var, \
-        CORBA::AbstractInterfaceDefSeq_out \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ExtInitializerSeq, \
+        CORBA::ExtInitializerSeq_var \
       >
 
-#endif /* end #if !defined */
-
 # pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         CORBA::ExtInitializerSeq \
@@ -4394,6 +4175,18 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Ret_Var_Size_Argument_T< \
+        CORBA::ExtValueDef::ExtFullValueDescription, \
+        CORBA::ExtValueDef::ExtFullValueDescription_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::ExtAttributeDef_ptr, \
+        CORBA::ExtAttributeDef_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::ExtValueDef \
       >
@@ -4413,48 +4206,6 @@ CORBA::Boolean operator>> (
         CORBA::ExtValueDef \
       >
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::StructMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::StructMemberSeq, \
-        CORBA::StructMemberSeq_var, \
-        CORBA::StructMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::UnionMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::UnionMemberSeq, \
-        CORBA::UnionMemberSeq_var, \
-        CORBA::UnionMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::EnumMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::EnumMemberSeq, \
-        CORBA::EnumMemberSeq_var, \
-        CORBA::EnumMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
 # pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::FixedDef \
@@ -4475,15 +4226,6 @@ CORBA::Boolean operator>> (
         CORBA::FixedDef \
       >
 
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::PrimitiveKind>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::PrimitiveKind>
-
-#endif /* end #if !defined */
-
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
 #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
 
@@ -4669,4 +4411,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index 61c72d2bbc8..136ead76535 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
-#define _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
+#ifndef _TAO_IDL_IFR_EXTENDEDC_H_
+#define _TAO_IDL_IFR_EXTENDEDC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ifr_client_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
@@ -48,7 +51,6 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
-
 #include "IFR_BasicC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -64,9 +66,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -75,7 +75,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -92,7 +92,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_FIXEDDEF__VAR_OUT_CH_)
 #define _CORBA_FIXEDDEF__VAR_OUT_CH_
@@ -121,7 +121,7 @@ namespace CORBA
 #define _CORBA_FIXEDDEF_CH_
   
   class TAO_IFR_Client_Export FixedDef
-    : public virtual CORBA::IDLType
+    : public virtual ::CORBA::IDLType
   {
   public:
     friend class TAO::Narrow_Utils<FixedDef>;
@@ -143,7 +143,7 @@ namespace CORBA
     
     static FixedDef_ptr _nil (void)
     {
-      return (FixedDef_ptr)0;
+      return static_cast<FixedDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -162,7 +162,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void digits (
-        CORBA::UShort digits
+        ::CORBA::UShort digits
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -183,7 +183,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void scale (
-        CORBA::Short scale
+        ::CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -335,7 +335,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueMemberSeq;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEMEMBERDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEMEMBERDEF__VAR_OUT_CH_
@@ -364,7 +364,7 @@ namespace CORBA
 #define _CORBA_VALUEMEMBERDEF_CH_
   
   class TAO_IFR_Client_Export ValueMemberDef
-    : public virtual CORBA::Contained
+    : public virtual ::CORBA::Contained
   {
   public:
     friend class TAO::Narrow_Utils<ValueMemberDef>;
@@ -386,7 +386,7 @@ namespace CORBA
     
     static ValueMemberDef_ptr _nil (void)
     {
-      return (ValueMemberDef_ptr)0;
+      return static_cast<ValueMemberDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -415,7 +415,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void type_def (
-        CORBA::IDLType_ptr type_def
+        ::CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -436,7 +436,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void access (
-        CORBA::Visibility access
+        ::CORBA::Visibility access
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -495,7 +495,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueMemberDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEDEF__VAR_OUT_CH_
@@ -524,9 +524,9 @@ namespace CORBA
 #define _CORBA_VALUEDEF_CH_
   
   class TAO_IFR_Client_Export ValueDef
-    : public virtual CORBA::Container,
-      public virtual CORBA::Contained,
-      public virtual CORBA::IDLType
+    : public virtual ::CORBA::Container,
+      public virtual ::CORBA::Contained,
+      public virtual ::CORBA::IDLType
   {
   public:
     friend class TAO::Narrow_Utils<ValueDef>;
@@ -548,7 +548,7 @@ namespace CORBA
     
     static ValueDef_ptr _nil (void)
     {
-      return (ValueDef_ptr)0;
+      return static_cast<ValueDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -567,7 +567,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void supported_interfaces (
-        const CORBA::InterfaceDefSeq & supported_interfaces
+        const ::CORBA::InterfaceDefSeq & supported_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -588,7 +588,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void initializers (
-        const CORBA::InitializerSeq & initializers
+        const ::CORBA::InitializerSeq & initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -609,7 +609,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void base_value (
-        CORBA::ValueDef_ptr base_value
+        ::CORBA::ValueDef_ptr base_value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -630,7 +630,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void abstract_base_values (
-        const CORBA::ValueDefSeq & abstract_base_values
+        const ::CORBA::ValueDefSeq & abstract_base_values
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -651,7 +651,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void is_abstract (
-        CORBA::Boolean is_abstract
+        ::CORBA::Boolean is_abstract
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -672,7 +672,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void is_custom (
-        CORBA::Boolean is_custom
+        ::CORBA::Boolean is_custom
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -693,7 +693,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void is_truncatable (
-        CORBA::Boolean is_truncatable
+        ::CORBA::Boolean is_truncatable
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -776,8 +776,8 @@ namespace CORBA
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::Visibility access
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::Visibility access
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -791,8 +791,8 @@ namespace CORBA
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -806,11 +806,11 @@ namespace CORBA
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts
+        ::CORBA::IDLType_ptr result,
+        ::CORBA::OperationMode mode,
+        const ::CORBA::ParDescriptionSeq & params,
+        const ::CORBA::ExceptionDefSeq & exceptions,
+        const ::CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -912,7 +912,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDescription;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTVALUEDEF__VAR_OUT_CH_
@@ -941,7 +941,7 @@ namespace CORBA
 #define _CORBA_EXTVALUEDEF_CH_
   
   class TAO_IFR_Client_Export ExtValueDef
-    : public virtual CORBA::ValueDef
+    : public virtual ::CORBA::ValueDef
   {
   public:
     friend class TAO::Narrow_Utils<ExtValueDef>;
@@ -963,7 +963,7 @@ namespace CORBA
     
     static ExtValueDef_ptr _nil (void)
     {
-      return (ExtValueDef_ptr)0;
+      return static_cast<ExtValueDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -982,7 +982,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void ext_initializers (
-        const CORBA::ExtInitializerSeq & ext_initializers
+        const ::CORBA::ExtInitializerSeq & ext_initializers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1054,10 +1054,10 @@ namespace CORBA
         const char * id,
         const char * name,
         const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        const CORBA::ExceptionDefSeq & get_exceptions,
-        const CORBA::ExceptionDefSeq & set_exceptions
+        ::CORBA::IDLType_ptr type,
+        ::CORBA::AttributeMode mode,
+        const ::CORBA::ExceptionDefSeq & get_exceptions,
+        const ::CORBA::ExceptionDefSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1116,7 +1116,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtValueDef;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEBOXDEF__VAR_OUT_CH_
@@ -1145,7 +1145,7 @@ namespace CORBA
 #define _CORBA_VALUEBOXDEF_CH_
   
   class TAO_IFR_Client_Export ValueBoxDef
-    : public virtual CORBA::TypedefDef
+    : public virtual ::CORBA::TypedefDef
   {
   public:
     friend class TAO::Narrow_Utils<ValueBoxDef>;
@@ -1167,7 +1167,7 @@ namespace CORBA
     
     static ValueBoxDef_ptr _nil (void)
     {
-      return (ValueBoxDef_ptr)0;
+      return static_cast<ValueBoxDef_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1186,7 +1186,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void original_type_def (
-        CORBA::IDLType_ptr original_type_def
+        ::CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1295,17 +1295,17 @@ namespace TAO
 #define _CORBA_VALUEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef>
   {
-    static CORBA::ValueDef_ptr duplicate (
-        CORBA::ValueDef_ptr
+    static ::CORBA::ValueDef_ptr duplicate (
+        ::CORBA::ValueDef_ptr
       );
     static void release (
-        CORBA::ValueDef_ptr
+        ::CORBA::ValueDef_ptr
       );
-    static CORBA::ValueDef_ptr nil (void);
+    static ::CORBA::ValueDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ValueDef_ptr p,
+        ::CORBA::ValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1316,17 +1316,17 @@ namespace TAO
 #define _CORBA_VALUEBOXDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueBoxDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef>
   {
-    static CORBA::ValueBoxDef_ptr duplicate (
-        CORBA::ValueBoxDef_ptr
+    static ::CORBA::ValueBoxDef_ptr duplicate (
+        ::CORBA::ValueBoxDef_ptr
       );
     static void release (
-        CORBA::ValueBoxDef_ptr
+        ::CORBA::ValueBoxDef_ptr
       );
-    static CORBA::ValueBoxDef_ptr nil (void);
+    static ::CORBA::ValueBoxDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ValueBoxDef_ptr p,
+        ::CORBA::ValueBoxDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1337,17 +1337,17 @@ namespace TAO
 #define _CORBA_EXTVALUEDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtValueDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef>
   {
-    static CORBA::ExtValueDef_ptr duplicate (
-        CORBA::ExtValueDef_ptr
+    static ::CORBA::ExtValueDef_ptr duplicate (
+        ::CORBA::ExtValueDef_ptr
       );
     static void release (
-        CORBA::ExtValueDef_ptr
+        ::CORBA::ExtValueDef_ptr
       );
-    static CORBA::ExtValueDef_ptr nil (void);
+    static ::CORBA::ExtValueDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ExtValueDef_ptr p,
+        ::CORBA::ExtValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1358,17 +1358,17 @@ namespace TAO
 #define _CORBA_FIXEDDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::FixedDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
   {
-    static CORBA::FixedDef_ptr duplicate (
-        CORBA::FixedDef_ptr
+    static ::CORBA::FixedDef_ptr duplicate (
+        ::CORBA::FixedDef_ptr
       );
     static void release (
-        CORBA::FixedDef_ptr
+        ::CORBA::FixedDef_ptr
       );
-    static CORBA::FixedDef_ptr nil (void);
+    static ::CORBA::FixedDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::FixedDef_ptr p,
+        ::CORBA::FixedDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1379,17 +1379,17 @@ namespace TAO
 #define _CORBA_VALUEMEMBERDEF__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueMemberDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueMemberDef>
   {
-    static CORBA::ValueMemberDef_ptr duplicate (
-        CORBA::ValueMemberDef_ptr
+    static ::CORBA::ValueMemberDef_ptr duplicate (
+        ::CORBA::ValueMemberDef_ptr
       );
     static void release (
-        CORBA::ValueMemberDef_ptr
+        ::CORBA::ValueMemberDef_ptr
       );
-    static CORBA::ValueMemberDef_ptr nil (void);
+    static ::CORBA::ValueMemberDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::ValueMemberDef_ptr p,
+        ::CORBA::ValueMemberDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1544,13 +1544,13 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::V
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IFR_ExtendedC.i"
+#include "IFR_ExtendedC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -1562,3 +1562,4 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBox
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.i b/TAO/tao/IFR_Client/IFR_ExtendedC.i
deleted file mode 100644
index 25848a8f738..00000000000
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.i
+++ /dev/null
@@ -1,208 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_FIXEDDEF___CI_)
-#define _CORBA_FIXEDDEF___CI_
-
-ACE_INLINE
-CORBA::FixedDef::FixedDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_FixedDef_Proxy_Broker_ (0)
-{
-  this->CORBA_FixedDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::FixedDef::FixedDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_FixedDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_VALUEMEMBERDEF___CI_)
-#define _CORBA_VALUEMEMBERDEF___CI_
-
-ACE_INLINE
-CORBA::ValueMemberDef::ValueMemberDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ValueMemberDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ValueMemberDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ValueMemberDef::ValueMemberDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ValueMemberDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_VALUEDEF___CI_)
-#define _CORBA_VALUEDEF___CI_
-
-ACE_INLINE
-CORBA::ValueDef::ValueDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ValueDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ValueDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ValueDef::ValueDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ValueDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTVALUEDEF___CI_)
-#define _CORBA_EXTVALUEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtValueDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ExtValueDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtValueDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtValueDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtValueDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_VALUEBOXDEF___CI_)
-#define _CORBA_VALUEBOXDEF___CI_
-
-ACE_INLINE
-CORBA::ValueBoxDef::ValueBoxDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ValueBoxDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ValueBoxDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ValueBoxDef::ValueBoxDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ValueBoxDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp
index 06eed52c444..2f780dc1951 100644
--- a/TAO/tao/IIOPA.cpp
+++ b/TAO/tao/IIOPA.cpp
@@ -27,36 +27,38 @@
 
 #include "IIOPC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IIOP_ListenPoint[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x2f4c6973),
-  ACE_NTOHL (0x74656e50),
-  ACE_NTOHL (0x6f696e74),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x2f4c6973), 
+  ACE_NTOHL (0x74656e50), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
     12,
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x656e506f),
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x656e506f), 
   ACE_NTOHL (0x696e7400),  // name = ListenPoint
   2, // member count
     5,
-  ACE_NTOHL (0x686f7374),
+  ACE_NTOHL (0x686f7374), 
   ACE_NTOHL (0x0),  // name = host
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   5,
-  ACE_NTOHL (0x706f7274),
+  ACE_NTOHL (0x706f7274), 
   ACE_NTOHL (0x0),  // name = port
     CORBA::tk_ushort,
 
@@ -67,7 +69,7 @@ static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint (
     sizeof (_oc_IIOP_ListenPoint),
     (char *) &_oc_IIOP_ListenPoint,
     0,
-    sizeof (IIOP::ListenPoint)
+    0
   );
 
 namespace IIOP
@@ -77,26 +79,26 @@ namespace IIOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IIOP_ListenPointList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x2f4c6973),
-  ACE_NTOHL (0x74656e50),
-  ACE_NTOHL (0x6f696e74),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x2f4c6973), 
+  ACE_NTOHL (0x74656e50), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
     16,
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x656e506f),
-  ACE_NTOHL (0x696e744c),
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x656e506f), 
+  ACE_NTOHL (0x696e744c), 
   ACE_NTOHL (0x69737400),  // name = ListenPointList
     CORBA::tk_sequence, // typecode kind
   116, // encapsulation length
@@ -105,27 +107,27 @@ static const CORBA::Long _oc_IIOP_ListenPointList[] =
     100, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x49494f50),
-      ACE_NTOHL (0x2f4c6973),
-      ACE_NTOHL (0x74656e50),
-      ACE_NTOHL (0x6f696e74),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x49494f50), 
+      ACE_NTOHL (0x2f4c6973), 
+      ACE_NTOHL (0x74656e50), 
+      ACE_NTOHL (0x6f696e74), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
             12,
-      ACE_NTOHL (0x4c697374),
-      ACE_NTOHL (0x656e506f),
+      ACE_NTOHL (0x4c697374), 
+      ACE_NTOHL (0x656e506f), 
       ACE_NTOHL (0x696e7400),  // name = ListenPoint
       2, // member count
             5,
-      ACE_NTOHL (0x686f7374),
+      ACE_NTOHL (0x686f7374), 
       ACE_NTOHL (0x0),  // name = host
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       5,
-      ACE_NTOHL (0x706f7274),
+      ACE_NTOHL (0x706f7274), 
       ACE_NTOHL (0x0),  // name = port
             CORBA::tk_ushort,
 
@@ -139,7 +141,7 @@ static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList (
     sizeof (_oc_IIOP_ListenPointList),
     (char *) &_oc_IIOP_ListenPointList,
     0,
-    sizeof (IIOP::ListenPointList)
+    0
   );
 
 namespace IIOP
@@ -149,55 +151,55 @@ namespace IIOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x2f426944),
-  ACE_NTOHL (0x69724949),
-  ACE_NTOHL (0x4f505365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x65436f6e),
-  ACE_NTOHL (0x74657874),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x2f426944), 
+  ACE_NTOHL (0x69724949), 
+  ACE_NTOHL (0x4f505365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65436f6e), 
+  ACE_NTOHL (0x74657874), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0
     24,
-  ACE_NTOHL (0x42694469),
-  ACE_NTOHL (0x7249494f),
-  ACE_NTOHL (0x50536572),
-  ACE_NTOHL (0x76696365),
-  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x42694469), 
+  ACE_NTOHL (0x7249494f), 
+  ACE_NTOHL (0x50536572), 
+  ACE_NTOHL (0x76696365), 
+  ACE_NTOHL (0x436f6e74), 
   ACE_NTOHL (0x65787400),  // name = BiDirIIOPServiceContext
   1, // member count
     14,
-  ACE_NTOHL (0x6c697374),
-  ACE_NTOHL (0x656e5f70),
-  ACE_NTOHL (0x6f696e74),
+  ACE_NTOHL (0x6c697374), 
+  ACE_NTOHL (0x656e5f70), 
+  ACE_NTOHL (0x6f696e74), 
   ACE_NTOHL (0x73000000),  // name = listen_points
     CORBA::tk_alias, // typecode kind for typedefs
   192, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x49494f50),
-    ACE_NTOHL (0x2f4c6973),
-    ACE_NTOHL (0x74656e50),
-    ACE_NTOHL (0x6f696e74),
-    ACE_NTOHL (0x4c697374),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x49494f50), 
+    ACE_NTOHL (0x2f4c6973), 
+    ACE_NTOHL (0x74656e50), 
+    ACE_NTOHL (0x6f696e74), 
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
         16,
-    ACE_NTOHL (0x4c697374),
-    ACE_NTOHL (0x656e506f),
-    ACE_NTOHL (0x696e744c),
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x656e506f), 
+    ACE_NTOHL (0x696e744c), 
     ACE_NTOHL (0x69737400),  // name = ListenPointList
         CORBA::tk_sequence, // typecode kind
     116, // encapsulation length
@@ -206,27 +208,27 @@ static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
       100, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x49494f50),
-        ACE_NTOHL (0x2f4c6973),
-        ACE_NTOHL (0x74656e50),
-        ACE_NTOHL (0x6f696e74),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x49494f50), 
+        ACE_NTOHL (0x2f4c6973), 
+        ACE_NTOHL (0x74656e50), 
+        ACE_NTOHL (0x6f696e74), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
                 12,
-        ACE_NTOHL (0x4c697374),
-        ACE_NTOHL (0x656e506f),
+        ACE_NTOHL (0x4c697374), 
+        ACE_NTOHL (0x656e506f), 
         ACE_NTOHL (0x696e7400),  // name = ListenPoint
         2, // member count
                 5,
-        ACE_NTOHL (0x686f7374),
+        ACE_NTOHL (0x686f7374), 
         ACE_NTOHL (0x0),  // name = host
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         5,
-        ACE_NTOHL (0x706f7274),
+        ACE_NTOHL (0x706f7274), 
         ACE_NTOHL (0x0),  // name = port
                 CORBA::tk_ushort,
 
@@ -241,7 +243,7 @@ static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext (
     sizeof (_oc_IIOP_BiDirIIOPServiceContext),
     (char *) &_oc_IIOP_BiDirIIOPServiceContext,
     0,
-    sizeof (IIOP::BiDirIIOPServiceContext)
+    0
   );
 
 namespace IIOP
@@ -250,7 +252,7 @@ namespace IIOP
     &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -287,8 +289,8 @@ CORBA::Boolean operator>>= (
     IIOP::ListenPoint *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IIOP::ListenPoint *&,
+  return _tao_any >>= const_cast<
+      const IIOP::ListenPoint *&> (
       _tao_elem
     );
 }
@@ -308,7 +310,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -345,8 +347,8 @@ CORBA::Boolean operator>>= (
     IIOP::ListenPointList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IIOP::ListenPointList *&,
+  return _tao_any >>= const_cast<
+      const IIOP::ListenPointList *&> (
       _tao_elem
     );
 }
@@ -366,7 +368,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -403,8 +405,8 @@ CORBA::Boolean operator>>= (
     IIOP::BiDirIIOPServiceContext *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IIOP::BiDirIIOPServiceContext *&,
+  return _tao_any >>= const_cast<
+      const IIOP::BiDirIIOPServiceContext *&> (
       _tao_elem
     );
 }
@@ -424,8 +426,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -460,5 +460,4 @@ CORBA::Boolean operator>>= (
         IIOP::BiDirIIOPServiceContext \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 326745d27e9..31b347adc48 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IIOPC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IIOPC.i"
+#include "IIOPC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -50,20 +49,20 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 IIOP::ListenPoint::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   ListenPoint *_tao_tmp_pointer =
-    ACE_static_cast (ListenPoint *, _tao_void_pointer);
+    static_cast<ListenPoint *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IIOP_LISTENPOINTLIST_CS_)
@@ -110,22 +109,22 @@ void IIOP::ListenPointList::_tao_any_destructor (
   )
 {
   ListenPointList * _tao_tmp_pointer =
-    ACE_static_cast (ListenPointList *, _tao_void_pointer);
+    static_cast<ListenPointList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 IIOP::BiDirIIOPServiceContext::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   BiDirIIOPServiceContext *_tao_tmp_pointer =
-    ACE_static_cast (BiDirIIOPServiceContext *, _tao_void_pointer);
+    static_cast<BiDirIIOPServiceContext *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -163,21 +162,21 @@ CORBA::Boolean operator<< (
     const IIOP::ListenPointList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -187,7 +186,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -197,28 +196,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
@@ -246,7 +245,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -374,5 +373,4 @@ CORBA::Boolean operator>> (
         IIOP::BiDirIIOPServiceContext_var \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
index be1d39ae63d..c238bbac166 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -26,21 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IIOPC_H_
 #define _TAO_IDL_ORIG_IIOPC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Sequence_T.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
+#include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
@@ -58,9 +61,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -263,13 +264,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServ
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IIOPC.i"
+#include "IIOPC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -281,3 +282,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/IIOPC.i b/TAO/tao/IIOPC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/IIOPC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index b81421e9bbb..3f0b6b0211e 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -272,9 +272,6 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
 {
   this->orb_core_ = orb_core;
 
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
   if (this->hosts_ != 0)
     {
       // The hostname cache has already been set!
@@ -401,16 +398,13 @@ TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 {
   this->orb_core_ = orb_core;
 
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
   if (this->hosts_ != 0)
     {
       // The hostname cache has already been set!
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("IIOP_Acceptor::open_default - ")
+                         ACE_TEXT ("TAO (%P|%t) - ")
+                         ACE_TEXT ("IIOP_Acceptor::open_default, ")
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }
@@ -447,7 +441,6 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
 {
   ACE_NEW_RETURN (this->creation_strategy_,
                   CREATION_STRATEGY (this->orb_core_,
-                                     &(this->tcp_properties_),
                                      this->lite_flag_),
                   -1);
 
@@ -471,8 +464,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) IIOP_Acceptor::open_i ")
-                        ACE_TEXT ("- %p, "),
+                        ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
+                        ACE_TEXT ("%p, "),
                         ACE_TEXT ("cannot open acceptor\n")));
           return -1;
         }
@@ -492,7 +485,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
         {
           if (TAO_debug_level > 5)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) IIOP_Acceptor::open_i() ")
+                        ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
                         ACE_TEXT ("trying to listen on port %d\n"), p));
 
           // Now try to actually open on that port
@@ -513,7 +506,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) IIOP_Acceptor::open_i ")
+                        ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
                         ACE_TEXT ("cannot open acceptor in port range (%d,%d)")
                         ACE_TEXT ("- %p\n"),
                         requested_port, last_port, ACE_TEXT("")));
@@ -529,8 +522,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) IIOP_Acceptor::open_i ")
-                    ACE_TEXT ("- %p"),
+                    ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
+                    ACE_TEXT ("%p"),
                     ACE_TEXT ("cannot get local addr\n")));
       return -1;
     }
@@ -553,7 +546,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
       for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) IIOP_Acceptor::open_i - ")
+                      ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
                       ACE_TEXT ("listening on: <%s:%u>\n"),
                       ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]),
                       this->addrs_[i].get_port_number ()));
@@ -625,9 +618,9 @@ TAO_IIOP_Acceptor::dotted_decimal_address (ACE_INET_Addr &addr,
   if (tmp == 0 || result != 0)
     {
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) ")
-                    ACE_TEXT ("IIOP_Acceptor::dotted_decimal_address ")
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("TAO (%P|%t) - ")
+                    ACE_TEXT ("IIOP_Acceptor::dotted_decimal_address, ")
                     ACE_TEXT ("- %p, "),
                     ACE_TEXT ("cannot determine hostname\n")));
       return -1;
@@ -661,8 +654,8 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_WARNING,
-                      ACE_TEXT ("TAO (%P|%t) Unable to probe network ")
-                      ACE_TEXT ("interfaces.  Using default.\n")));
+                      ACE_TEXT ("TAO (%P|%t) - Unable to probe network ")
+                      ACE_TEXT ("interfaces. Using default.\n")));
         }
 
       if_cnt = 1; // Force the network interface count to be one.
@@ -775,7 +768,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) IIOP_Profile::decode - v%d.%d\n"),
+                      ACE_TEXT ("TAO (%P|%t) - IIOP_Profile::decode, v%d.%d\n"),
                       major,
                       minor));
         }
@@ -792,7 +785,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) TAO_IIOP_Acceptor::object_key - ")
+                      ACE_TEXT ("TAO (%P|%t) - TAO_IIOP_Acceptor::object_key, ")
                       ACE_TEXT ("error while decoding host/port\n")));
         }
       return -1;
@@ -919,70 +912,3 @@ TAO_IIOP_Acceptor::parse_options (const char *str)
 
   return 0;
 }
-
-int
-TAO_IIOP_Acceptor::init_tcp_properties (void)
-{
-  // @@ Currently (in the code below), we obtain protocol properties from
-  // ORB-level ServerProtocol, even though the policy may
-  // have been overridden on POA level.  That's because currently all
-  // endpoints (acceptors) are global.  Once endpoints become per POA,
-  // the code below will have to be changed to look at the POA-level
-  // ServerProtocol policy first.
-
-  // @@ Later we may want to factor some of the code below
-  // among different protocols and place it into TAO_Acceptor, for
-  // example.
-
-  // ServerProtocolProperties policy controls protocols configuration.
-  // Look for protocol properties in the effective ServerProtocolPolicy.
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // Initialize the parameters to their defaults.  If RTCORBA is loaded,
-  // the server_protocols_hook will override any of the values if they
-  // have been set by a ServerProtocolProperties policy.
-
-  int send_buffer_size = this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-  int no_delay = this->orb_core_->orb_params ()->nodelay ();
-  int enable_network_priority = 0;
-
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (tph != 0)
-    {
-      static const char protocol[] = "iiop";
-      const char *protocol_type = protocol;
-
-      const int hook_return =
-        tph->call_server_protocols_hook (send_buffer_size,
-                                         recv_buffer_size,
-                                         no_delay,
-                                         enable_network_priority,
-                                         protocol_type);
-
-      if (hook_return == -1)
-        return -1;
-    }
-
-  this->tcp_properties_.send_buffer_size =
-    send_buffer_size;
-  this->tcp_properties_.recv_buffer_size =
-    recv_buffer_size;
-  this->tcp_properties_.no_delay =
-    no_delay;
- this->tcp_properties_.enable_network_priority  =
-   enable_network_priority;
-
-
-  // @@ NOTE.  RTCORBA treats a combination of transport+messaging
-  // as a single protocol.  Keep this in mind for when we adopt
-  // RTCORBA approach to protocols configuration for nonRT use.  In
-  // particular, what are the semantics of independent variation of
-  // messaging and transport layers, when one transport appears in
-  // combination with several messaging protocols, for example.
-
-  return 0;
-}
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index b16b53fcf60..1faf926a88e 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -135,10 +135,6 @@ protected:
    */
   virtual int parse_options (const char *options);
 
-  /// Obtain tcp properties that must be used by this acceptor, i.e.,
-  /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
-
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
   int create_new_profile (const TAO::ObjectKey &object_key,
@@ -192,10 +188,6 @@ protected:
   /// ORB Core.
   TAO_ORB_Core *orb_core_;
 
-  /// TCP configuration properties to be used for all
-  /// connections opened by this acceptor.
-  TAO_IIOP_Properties tcp_properties_;
-
   /// Should we use GIOP lite??
   const bool lite_flag_;
 
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index c48e62962c8..5240293d8cd 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -9,10 +9,6 @@
 #include "Protocols_Hooks.h"
 #include "Wait_Strategy.h"
 
-#if !defined (__ACE_INLINE__)
-# include "IIOP_Connection_Handler.i"
-#endif /* ! __ACE_INLINE__ */
-
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
 
@@ -23,7 +19,7 @@ ACE_RCSID (tao,
 TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_IIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
-    dscp_codepoint_ (0)
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -36,12 +32,10 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t)
 
 TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
   TAO_ORB_Core *orb_core,
-  CORBA::Boolean flag,
-  void *arg)
+  CORBA::Boolean flag)
   : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
-    tcp_properties_ (*(static_cast<TAO_IIOP_Properties *> (arg))),
-    dscp_codepoint_ (0)
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
   TAO_IIOP_Transport* specific_transport = 0;
   ACE_NEW (specific_transport,
@@ -51,12 +45,10 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
   this->transport (specific_transport);
 }
 
-TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                          void *arg)
+TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core)
   : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
-    tcp_properties_ (*(static_cast<TAO_IIOP_Properties *> (arg))),
-    dscp_codepoint_ (0)
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
 }
 
@@ -74,17 +66,58 @@ TAO_IIOP_Connection_Handler::open_handler (void *v)
 int
 TAO_IIOP_Connection_Handler::open (void*)
 {
+  TAO_IIOP_Protocol_Properties protocol_properties;
+
+  // Initialize values from ORB params.
+  protocol_properties.send_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
+  protocol_properties.recv_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
+  protocol_properties.no_delay_ =
+    this->orb_core ()->orb_params ()->nodelay ();
+
+  TAO_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_hooks ();
+
+  bool client =
+    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      if (client)
+        {
+          tph->client_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          tph->server_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
   if (this->set_socket_option (this->peer (),
-                               this->tcp_properties_.send_buffer_size,
-                               this->tcp_properties_.recv_buffer_size) == -1)
+                               protocol_properties.send_buffer_size_,
+                               protocol_properties.recv_buffer_size_) == -1)
     return -1;
 
 #if !defined (ACE_LACKS_TCP_NODELAY)
-
   if (this->peer ().set_option (ACE_IPPROTO_TCP,
                                 TCP_NODELAY,
-                                (void *) &tcp_properties_.no_delay,
-                                sizeof (int)) == -1)
+                                (void *) &protocol_properties.no_delay_,
+                                sizeof (protocol_properties.no_delay_)) == -1)
     return -1;
 #endif /* ! ACE_LACKS_TCP_NODELAY */
 
@@ -105,6 +138,12 @@ TAO_IIOP_Connection_Handler::open (void*)
   if (this->peer ().get_local_addr (local_addr) == -1)
     return -1;
 
+  if (TAO_debug_level > 2)
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::open, ")
+                ACE_TEXT("The local addr is (%s) \n"),
+                local_addr. get_host_addr ()));
+
   if (local_addr.get_ip_address () == remote_addr.get_ip_address ()
       && local_addr.get_port_number () == remote_addr.get_port_number ())
     {
@@ -295,84 +334,28 @@ TAO_IIOP_Connection_Handler::process_listen_point_list (
   return 0;
 }
 
-void
-TAO_IIOP_Connection_Handler::update_protocol_properties (
-  int send_buffer_size,
-  int recv_buffer_size,
-  int no_delay,
-  int enable_network_priority)
-{
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::")
-                ACE_TEXT("update_protocol_properties, ")
-                ACE_TEXT("enable_network_priority = %d\n"),
-                enable_network_priority));
-
-  if (this->tcp_properties_.send_buffer_size != send_buffer_size)
-    this->tcp_properties_.send_buffer_size = send_buffer_size;
-
-  if (this->tcp_properties_.recv_buffer_size != recv_buffer_size)
-    this->tcp_properties_.recv_buffer_size = recv_buffer_size;
-
-  if (this->tcp_properties_.no_delay != no_delay)
-    this->tcp_properties_.no_delay = no_delay;
-
-  if (this->tcp_properties_.enable_network_priority != enable_network_priority)
-    this->tcp_properties_.enable_network_priority = enable_network_priority;
-
-}
-
 int
-TAO_IIOP_Connection_Handler::enable_network_priority (void)
+TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
 {
-  return this->tcp_properties_.enable_network_priority;
-}
+  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
 
-int
-TAO_IIOP_Connection_Handler::set_dscp_codepoint (void)
-{
-  int tos = 0;
-  if (this->enable_network_priority ())
+  if (set_network_priority)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          TAO_Protocols_Hooks *tph =
-            this->orb_core ()->get_protocols_hooks (
-              ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      TAO_Protocols_Hooks *tph =
+        this->orb_core ()->get_protocols_hooks ();
 
-          if (tph != 0)
-            {
-              CORBA::Long codepoint =
-                tph->get_dscp_codepoint ();
+      CORBA::Long codepoint =
+        tph->get_dscp_codepoint ();
 
-              tos = (int)(codepoint) << 2;
-            }
-        }
-      ACE_CATCHANY
-        {
-          if (TAO_debug_level > 0)
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "TAO_IIOP_Connection_Handler::"
-                                 "set_dscp_codepoint - "
-                                 "get_protocol_hooks");
-
-          return -1;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
+      tos = (int)(codepoint) << 2;
     }
-  else
-    tos = IPDSFIELD_DSCP_DEFAULT << 2;
 
   if (tos != this->dscp_codepoint_)
     {
-      const int ret = this->peer ().set_option (IPPROTO_IP,
-                                                IP_TOS,
-                                                (int *) &tos ,
-                                                (int) sizeof (tos));
+      int result = this->peer ().set_option (IPPROTO_IP,
+                                             IP_TOS,
+                                             (int *) &tos ,
+                                             (int) sizeof (tos));
 
       if (TAO_debug_level)
         {
@@ -380,11 +363,14 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (void)
                       "TAO (%P|%t) - IIOP_Connection_Handler::"
                       "set_dscp_codepoint -> dscp: %x; result: %d; %s\n",
                       tos,
-                      ret,
-                      ret == -1 ? "try running as superuser" : ""));
+                      result,
+                      result == -1 ? "try running as superuser" : ""));
         }
 
-      this->dscp_codepoint_ = tos;
+      // On successful setting of TOS field.
+      if (result == 0)
+        this->dscp_codepoint_ = tos;
+
     }
 
   return 0;
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index 869c73bfd48..5654472ea3e 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -46,30 +46,6 @@ class TAO_Pluggable_Messaging;
 // ****************************************************************
 
 /**
- * @class TAO_IIOP_Properties
- *
- * @brief TCP protocol properties specification for a set of
- *  connections.
- *
- */
-
-#define IPDSFIELD_DSCP_DEFAULT  0x00
-
-class TAO_Export TAO_IIOP_Properties
-{
-
-public:
-  int send_buffer_size;
-  int recv_buffer_size;
-  int no_delay;
-  int enable_network_priority;
-};
-
-
-
-// ****************************************************************
-
-/**
  * @class TAO_IIOP_Connection_Handler
  *
  * @brief  Handles requests on a single connection.
@@ -87,12 +63,9 @@ public:
 
   TAO_IIOP_Connection_Handler (ACE_Thread_Manager * = 0);
 
-  /// Constructor. @a arg parameter is used by the Acceptor to pass the
-  /// protocol configuration properties for this connection.
+  /// Constructor.
   TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag,
-                               void *arg);
-
+                               CORBA::Boolean flag);
 
   /// Destructor.
   ~TAO_IIOP_Connection_Handler (void);
@@ -126,18 +99,9 @@ public:
   /// Check if network priority needs to be enabled
   int enable_network_priority (void);
 
-  /// Set the Diff-Serv codepoint if the Policy dictates the setting of
-  /// Network Priority
-  int set_dscp_codepoint (void);
-
-  int set_dscp_codepoint (int tos);
+  /// Set Diff-Serv codepoint on outgoing packets.
+  int set_dscp_codepoint (CORBA::Boolean set_network_priority);
 
-  /// Update the tcp properties of the hanlder to the most recent
-  /// properties set after the last invocation
-  virtual void update_protocol_properties (int send_buffer_size,
-                                           int recv_buffer_size,
-                                           int no_delay,
-                                           int enable_network_priority);
   virtual int open_handler (void *);
 
 protected:
@@ -150,8 +114,7 @@ protected:
    * constructor just initializes its base class and sets all of its
    * contents to the default value, if any
    */
-  TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               void *arg);
+  TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   //@{
   /**
@@ -161,16 +124,10 @@ protected:
   //@}
 
 private:
-  /// TCP configuration for this connection.
-  TAO_IIOP_Properties tcp_properties_;
 
   /// Stores the type of service value.
   int dscp_codepoint_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "tao/IIOP_Connection_Handler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_IIOP_CONNECTION_HANDLER_H */
diff --git a/TAO/tao/IIOP_Connection_Handler.i b/TAO/tao/IIOP_Connection_Handler.i
deleted file mode 100644
index 7f2b3228624..00000000000
--- a/TAO/tao/IIOP_Connection_Handler.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 8deb1c31355..367f636c3a5 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -41,10 +41,10 @@ template class ACE_NonBlocking_Connect_Handler<TAO_IIOP_Connection_Handler>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 TAO_IIOP_Connector::TAO_IIOP_Connector (CORBA::Boolean flag)
-  : TAO_Connector (IOP::TAG_INTERNET_IOP),
-    lite_flag_ (flag),
-    connect_strategy_ (),
-    base_connector_ ()
+  : TAO_Connector (IOP::TAG_INTERNET_IOP)
+  , lite_flag_ (flag)
+  , connect_strategy_ ()
+  , base_connector_ ()
 {
 }
 
@@ -66,9 +66,6 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
   if (this->create_connect_strategy () == -1)
     return -1;
 
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
   /// Our connect creation strategy
   TAO_IIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
 
@@ -76,7 +73,6 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
                   TAO_IIOP_CONNECT_CREATION_STRATEGY
                       (orb_core->thr_mgr (),
                        orb_core,
-                       &(this->tcp_properties_),
                        this->lite_flag_),
                   -1);
 
@@ -147,6 +143,15 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
   const ACE_INET_Addr &remote_address =
     iiop_endpoint->object_addr ();
 
+  bool pn =
+    iiop_endpoint->is_preferred_network ();
+
+  ACE_INET_Addr local_addr;
+
+  if (pn)
+    local_addr.set ((u_short) 0,
+                    iiop_endpoint->preferred_network ());
+
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO (%P|%t) - IIOP_Connector::make_connection, "
@@ -172,11 +177,11 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
 
   TAO_IIOP_Connection_Handler *svc_handler = 0;
 
-  // Connect.
   int result =
     this->base_connector_.connect (svc_handler,
                                    remote_address,
-                                   synch_options);
+                                   synch_options,
+                                   local_addr);
 
   // The connect() method creates the service handler and bumps the
   // #REFCOUNT# up one extra.  There are four possibilities from
@@ -349,6 +354,8 @@ TAO_IIOP_Connector::check_prefix (const char *endpoint)
   static const char *protocol[] = { "iiop", "iioploc" };
 
   const size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+  if (slot == 0) // an empty string is valid for corbaloc.
+    return 0;
 
   const size_t len0 = ACE_OS::strlen (protocol[0]);
   const size_t len1 = ACE_OS::strlen (protocol[1]);
@@ -373,62 +380,6 @@ TAO_IIOP_Connector::object_key_delimiter (void) const
   return TAO_IIOP_Profile::object_key_delimiter_;
 }
 
-int
-TAO_IIOP_Connector::init_tcp_properties (void)
-{
-  // Connector protocol properties are obtained from ORB-level
-  // RTCORBA::ClientProtocolProperties policy override.
-  // If the override doesn't exist or doesn't contain the
-  // properties, we use ORB default.
-  //
-  // Currently, we do not use Object-level and Current-level policy
-  // overrides for protocol configuration because connection
-  // lookup and caching are not done based on protocol
-  // properties.
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // Initialize the settings to the ORB defaults.  If RT CORBA is enabled,
-  // it may override these.
-  int send_buffer_size = this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-  int no_delay = this->orb_core ()->orb_params ()->nodelay ();
-  int enable_network_priority = 0;
-
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (tph != 0)
-    {
-      static const char protocol[] = "iiop";
-      const char *protocol_type = protocol;
-
-      const int hook_result =
-        tph->call_client_protocols_hook (send_buffer_size,
-                                         recv_buffer_size,
-                                         no_delay,
-                                         enable_network_priority,
-                                         protocol_type);
-
-      if (hook_result == -1)
-        return -1;
-    }
-
-  // Extract and locally store properties of interest.
-  this->tcp_properties_.send_buffer_size =
-    send_buffer_size;
-  this->tcp_properties_.recv_buffer_size =
-    recv_buffer_size;
-  this->tcp_properties_.no_delay =
-    no_delay;
-  this->tcp_properties_.enable_network_priority  =
-    enable_network_priority;
-
-  return 0;
-}
-
-
 TAO_IIOP_Endpoint *
 TAO_IIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
 {
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 8b2bcefb164..2f7d91f769c 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -95,19 +95,11 @@ protected:
   /// Transport_Connector.h
   virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Obtain tcp properties that must be used by this connector, i.e.,
-  /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
-
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
 protected:
 
-  /// TCP configuration properties to be used for all
-  /// connections established by this connector.
-  TAO_IIOP_Properties tcp_properties_;
-
   /// Do we need to use a GIOP_Lite for sending messages?
   const bool lite_flag_;
 
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index 3f08ce0943a..0d5f3c9fe19 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -1,6 +1,7 @@
 #include "IIOP_Endpoint.h"
-#include "IOPC.h"
+#include "IOP_IORC.h"
 #include "debug.h"
+#include "ORB_Core.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
@@ -21,11 +22,13 @@ ACE_RCSID (tao,
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
   : TAO_Endpoint (IOP::TAG_INTERNET_IOP)
-    , host_ ()
-    , port_ (683) // default port (IANA assigned)
-    , object_addr_ (addr)
-    , object_addr_set_ (false)
-    , next_ (0)
+  , host_ ()
+  , port_ (683) // default port (IANA assigned)
+  , is_encodable_ (true)
+  , object_addr_set_ (false)
+  , object_addr_ (addr)
+  , preferred_path_ ()
+  , next_ (0)
 {
   this->set (addr, use_dotted_decimal_addresses);
 }
@@ -36,23 +39,25 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
                                       CORBA::Short priority)
   : TAO_Endpoint (IOP::TAG_INTERNET_IOP,
                   priority)
-    , host_ ()
-    , port_ (port)
-    , object_addr_ (addr)
-    , object_addr_set_ (false)
-    , next_ (0)
+  , host_ (host)
+  , port_ (port)
+  , is_encodable_ (true)
+  , object_addr_set_ (false)
+  , object_addr_ (addr)
+  , preferred_path_ ()
+  , next_ (0)
 {
-  if (host != 0)
-    this->host_ = host;
 }
 
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (void)
   : TAO_Endpoint (IOP::TAG_INTERNET_IOP)
-    , host_ ()
-    , port_ (683)  // default port (IANA assigned)
-    , object_addr_ ()
-    , object_addr_set_ (false)
-    , next_ (0)
+  , host_ ()
+  , port_ (683)  // default port (IANA assigned)
+  , is_encodable_ (true)
+  , object_addr_set_ (false)
+  , object_addr_ ()
+  , preferred_path_ ()
+  , next_ (0)
 {
 }
 
@@ -60,11 +65,13 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
                                       CORBA::UShort port,
                                       CORBA::Short priority)
   : TAO_Endpoint (IOP::TAG_INTERNET_IOP)
-    , host_ ()
-    , port_ (port)
-    , object_addr_ ()
-    , object_addr_set_ (false)
-    , next_ (0)
+  , host_ ()
+  , port_ (port)
+  , is_encodable_ (true)
+  , object_addr_set_ (false)
+  , object_addr_ ()
+  , preferred_path_ ()
+  , next_ (0)
 {
   if (host != 0)
     this->host_ = host;
@@ -76,6 +83,19 @@ TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint (void)
 {
 }
 
+TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &rhs)
+  : TAO_Endpoint (rhs.tag_,
+                  rhs.priority_)
+  , host_ (rhs.host_)
+  , port_ (rhs.port_)
+  , is_encodable_ (rhs.is_encodable_)
+  , object_addr_set_ (rhs.object_addr_set_)
+  , object_addr_ (rhs.object_addr_)
+  , preferred_path_  (rhs.preferred_path_)
+  , next_ (0)
+{
+}
+
 int
 TAO_IIOP_Endpoint::set (const ACE_INET_Addr &addr,
                         int use_dotted_decimal_addresses)
@@ -88,10 +108,8 @@ TAO_IIOP_Endpoint::set (const ACE_INET_Addr &addr,
       if (use_dotted_decimal_addresses == 0 && TAO_debug_level > 5)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) ")
-                      ACE_TEXT ("IIOP_Endpoint::set ")
-                      ACE_TEXT ("- %p "),
-                      ACE_TEXT ("cannot determine hostname\n")));
+                      ACE_TEXT ("TAO (%P|%t) - IIOP_Endpoint::set, ")
+                      ACE_TEXT ("- %p cannot determine hostname\n")));
         }
 
       const char *tmp = addr.get_host_addr ();
@@ -100,8 +118,7 @@ TAO_IIOP_Endpoint::set (const ACE_INET_Addr &addr,
           if (TAO_debug_level > 0)
             {
               ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t) ")
-                          ACE_TEXT ("IIOP_Endpoint::set ")
+                          ACE_TEXT ("TAO (%P|%t) - IIOP_Endpoint::set, ")
                           ACE_TEXT ("- %p "),
                           ACE_TEXT ("cannot determine hostname and hostaddr\n")));
             }
@@ -155,11 +172,9 @@ TAO_IIOP_Endpoint::duplicate (void)
 {
   TAO_IIOP_Endpoint *endpoint = 0;
 
+  // @@ NOTE: Not exception safe..
   ACE_NEW_RETURN (endpoint,
-                  TAO_IIOP_Endpoint (this->host_.in (),
-                                     this->port_,
-                                     this->object_addr_,
-                                     this->priority ()),
+                  TAO_IIOP_Endpoint (*this),
                   0);
 
   return endpoint;
@@ -215,6 +230,95 @@ TAO_IIOP_Endpoint::object_addr_i (void) const
     }
 }
 
+CORBA::ULong
+TAO_IIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc)
+{
+  ACE_CString tmp (
+    oc->orb_params ()->preferred_interfaces ());
+
+  ssize_t pos = 0;
+
+  pos = tmp.find (this->host_.in ());
+
+  TAO_IIOP_Endpoint *latest = this;
+
+  CORBA::ULong count = 0;
+
+  while (pos != ACE_CString::npos)
+    {
+      // Do we have a "," or an '\0'?
+      ssize_t new_pos = tmp.find (",",
+                                  pos + 1);
+
+      // Length of the preferred path
+      int length = 0;
+
+      if (new_pos == ACE_CString::npos)
+        length = tmp.length () - pos;
+      else
+        length = new_pos - pos;
+
+      ACE_CString rem_tmp = tmp.substr (pos, length);
+
+      // Search for the ":"
+      ssize_t col_pos = rem_tmp.find (":");
+
+      if (col_pos == ACE_CString::npos)
+        {
+          pos = tmp.find (latest->host_.in (),
+                          pos + length);
+          continue;
+        }
+
+      ACE_CString path = rem_tmp.substr (col_pos + 1);
+
+      latest->preferred_path_.host =
+        CORBA::string_dup (path.c_str ());
+
+      if (TAO_debug_level > 3)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) Adding path [%s] "
+                    " as preferred path for [%s] \n",
+                    path.c_str (), this->host_.in ()));
+
+      pos = tmp.find (latest->host_.in (),
+                      pos + length);
+
+      if (pos != ACE_CString::npos)
+        {
+          TAO_Endpoint *tmp_ep =
+            latest->duplicate ();
+
+          latest->next_ = dynamic_cast<TAO_IIOP_Endpoint *> (tmp_ep);
+
+          if (latest->next_ == 0) return count;
+
+          latest->is_encodable_ = true;
+
+          latest = latest->next_;
+          ++count;
+        }
+    }
+
+  if (tmp.length () != 0 &&
+      !oc->orb_params ()->enforce_pref_interfaces ())
+    {
+      TAO_Endpoint *tmp_ep = latest->duplicate ();
+
+      latest->next_ =
+        dynamic_cast<TAO_IIOP_Endpoint *> (tmp_ep);
+
+      if (latest->next_ == 0) return count;
+
+      latest->is_encodable_ = true;
+
+      latest->next_->preferred_path_.host = (const char *) 0;
+      ++count;
+    }
+
+  return count;
+}
+
 CORBA::Boolean
 TAO_IIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 {
@@ -258,3 +362,15 @@ TAO_IIOP_Endpoint::hash (void)
 
   return this->hash_val_;
 }
+
+bool
+TAO_IIOP_Endpoint::is_preferred_network (void) const
+{
+  return (this->preferred_path_.host.in () != 0);
+}
+
+const char *
+TAO_IIOP_Endpoint::preferred_network (void) const
+{
+  return this->preferred_path_.host.in ();
+}
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index d2c7d30459a..33d7429a916 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_IIOP_ENDPOINT_H
 #define TAO_IIOP_ENDPOINT_H
 
@@ -25,6 +24,7 @@
 
 #include "tao/Endpoint.h"
 #include "tao/CORBA_String.h"
+#include "tao/IIOP_EndpointsC.h"
 
 class TAO_IIOP_Connection_Handler;
 
@@ -64,6 +64,8 @@ public:
                      CORBA::UShort port,
                      CORBA::Short priority);
 
+
+
   /// Destructor.
   ~TAO_IIOP_Endpoint (void);
 
@@ -71,6 +73,7 @@ public:
   // Endpoint.h for their documentation.
 
   virtual TAO_Endpoint *next (void);
+
   virtual int addr_to_string (char *buffer, size_t length);
 
   /// Makes a copy of @c this
@@ -102,6 +105,12 @@ public:
   /// Set the port number.
   CORBA::UShort port (CORBA::UShort p);
 
+  /// Do we have a preferred local network for the target?
+  bool is_preferred_network (void) const;
+
+  /// Return the preferred network if any.
+  const char *preferred_network (void) const;
+
 private:
 
   /// Helper method for setting INET_Addr.
@@ -111,6 +120,18 @@ private:
   /// Helper method for object_addr () call.
   void object_addr_i (void) const;
 
+  /// Generate preferred interfaces from the options passed in by the
+  /// user.
+  CORBA::ULong preferred_interfaces (TAO_ORB_Core *oc);
+
+  /// Canonical copy constructor
+  /**
+   * In private section to prevent clients from invoking this
+   * accidentally. Clients should only use duplicate () to make a depp
+   * copy
+   */
+  TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &);
+
 private:
 
   /// String representing the host name.
@@ -119,17 +140,22 @@ private:
   /// TCP port number.
   CORBA::UShort port_;
 
+  /// Is this endpoint created encodable as part of the IOR?
+  bool is_encodable_;
+
+  /// Flag to indicate if the address has been resolved and set.
+  mutable bool object_addr_set_;
+
   /// Cached instance of ACE_INET_Addr for use in making
   /// invocations, etc.
   mutable ACE_INET_Addr object_addr_;
 
-  /// Flag to indicate if the address has been resolved and set.
-  mutable bool object_addr_set_;
+  /// Preferred path for this endpoint.
+  TAO::IIOP_Endpoint_Info preferred_path_;
 
   /// IIOP Endpoints can be stringed into a list.  Return the next
   /// endpoint in the list, if any.
   TAO_IIOP_Endpoint *next_;
-
 };
 
 
diff --git a/TAO/tao/IIOP_Endpoints.pidl b/TAO/tao/IIOP_Endpoints.pidl
index 18163b527d2..5e156dbf281 100644
--- a/TAO/tao/IIOP_Endpoints.pidl
+++ b/TAO/tao/IIOP_Endpoints.pidl
@@ -30,9 +30,6 @@
 //          -Wb,post_include="ace/post.h" \
 //          IIOP_Endpoints.pidl
 //
-//   Use the patch in diff/IIOP_Endpoints.diff to patch the generated
-//   code.
-//
 // ================================================================
 
 #ifndef _TAO_IIOP_ENDPOINTS_IDL_
diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp
index a28f8a7f92d..478a3bd9abd 100644
--- a/TAO/tao/IIOP_EndpointsA.cpp
+++ b/TAO/tao/IIOP_EndpointsA.cpp
@@ -27,43 +27,45 @@
 
 #include "IIOP_EndpointsC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IIOP_Endpoint_Info[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x5f456e64),
-  ACE_NTOHL (0x706f696e),
-  ACE_NTOHL (0x745f496e),
-  ACE_NTOHL (0x666f3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x5f456e64), 
+  ACE_NTOHL (0x706f696e), 
+  ACE_NTOHL (0x745f496e), 
+  ACE_NTOHL (0x666f3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
     19,
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x5f456e64),
-  ACE_NTOHL (0x706f696e),
-  ACE_NTOHL (0x745f496e),
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x5f456e64), 
+  ACE_NTOHL (0x706f696e), 
+  ACE_NTOHL (0x745f496e), 
   ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
   3, // member count
     5,
-  ACE_NTOHL (0x686f7374),
+  ACE_NTOHL (0x686f7374), 
   ACE_NTOHL (0x0),  // name = host
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   5,
-  ACE_NTOHL (0x706f7274),
+  ACE_NTOHL (0x706f7274), 
   ACE_NTOHL (0x0),  // name = port
     CORBA::tk_short,
 
   9,
-  ACE_NTOHL (0x7072696f),
-  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x7072696f), 
+  ACE_NTOHL (0x72697479), 
   ACE_NTOHL (0x0),  // name = priority
     CORBA::tk_short,
 
@@ -74,7 +76,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IIOP_Endpoint_Info (
     sizeof (_oc_TAO_IIOP_Endpoint_Info),
     (char *) &_oc_TAO_IIOP_Endpoint_Info,
     0,
-    sizeof (TAO::IIOP_Endpoint_Info)
+    0
   );
 
 namespace TAO
@@ -84,27 +86,27 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IIOPEndpointSequence[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x456e6470),
-  ACE_NTOHL (0x6f696e74),
-  ACE_NTOHL (0x53657175),
-  ACE_NTOHL (0x656e6365),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x456e6470), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x53657175), 
+  ACE_NTOHL (0x656e6365), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO/IIOPEndpointSequence:1.0
     21,
-  ACE_NTOHL (0x49494f50),
-  ACE_NTOHL (0x456e6470),
-  ACE_NTOHL (0x6f696e74),
-  ACE_NTOHL (0x53657175),
-  ACE_NTOHL (0x656e6365),
+  ACE_NTOHL (0x49494f50), 
+  ACE_NTOHL (0x456e6470), 
+  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x53657175), 
+  ACE_NTOHL (0x656e6365), 
   ACE_NTOHL (0x0),  // name = IIOPEndpointSequence
     CORBA::tk_sequence, // typecode kind
   140, // encapsulation length
@@ -113,34 +115,34 @@ static const CORBA::Long _oc_TAO_IIOPEndpointSequence[] =
     124, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       31,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x54414f2f),
-      ACE_NTOHL (0x49494f50),
-      ACE_NTOHL (0x5f456e64),
-      ACE_NTOHL (0x706f696e),
-      ACE_NTOHL (0x745f496e),
-      ACE_NTOHL (0x666f3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x54414f2f), 
+      ACE_NTOHL (0x49494f50), 
+      ACE_NTOHL (0x5f456e64), 
+      ACE_NTOHL (0x706f696e), 
+      ACE_NTOHL (0x745f496e), 
+      ACE_NTOHL (0x666f3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
             19,
-      ACE_NTOHL (0x49494f50),
-      ACE_NTOHL (0x5f456e64),
-      ACE_NTOHL (0x706f696e),
-      ACE_NTOHL (0x745f496e),
+      ACE_NTOHL (0x49494f50), 
+      ACE_NTOHL (0x5f456e64), 
+      ACE_NTOHL (0x706f696e), 
+      ACE_NTOHL (0x745f496e), 
       ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
       3, // member count
             5,
-      ACE_NTOHL (0x686f7374),
+      ACE_NTOHL (0x686f7374), 
       ACE_NTOHL (0x0),  // name = host
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       5,
-      ACE_NTOHL (0x706f7274),
+      ACE_NTOHL (0x706f7274), 
       ACE_NTOHL (0x0),  // name = port
             CORBA::tk_short,
 
       9,
-      ACE_NTOHL (0x7072696f),
-      ACE_NTOHL (0x72697479),
+      ACE_NTOHL (0x7072696f), 
+      ACE_NTOHL (0x72697479), 
       ACE_NTOHL (0x0),  // name = priority
             CORBA::tk_short,
 
@@ -154,7 +156,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IIOPEndpointSequence (
     sizeof (_oc_TAO_IIOPEndpointSequence),
     (char *) &_oc_TAO_IIOPEndpointSequence,
     0,
-    sizeof (TAO::IIOPEndpointSequence)
+    0
   );
 
 namespace TAO
@@ -163,7 +165,7 @@ namespace TAO
     &_tc_TAO_tc_TAO_IIOPEndpointSequence;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -200,8 +202,8 @@ CORBA::Boolean operator>>= (
     TAO::IIOP_Endpoint_Info *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO::IIOP_Endpoint_Info *&,
+  return _tao_any >>= const_cast<
+      const TAO::IIOP_Endpoint_Info *&> (
       _tao_elem
     );
 }
@@ -221,7 +223,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -258,8 +260,8 @@ CORBA::Boolean operator>>= (
     TAO::IIOPEndpointSequence *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO::IIOPEndpointSequence *&,
+  return _tao_any >>= const_cast<
+      const TAO::IIOPEndpointSequence *&> (
       _tao_elem
     );
 }
@@ -279,8 +281,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -305,5 +305,4 @@ CORBA::Boolean operator>>= (
         TAO::IIOPEndpointSequence \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp
index 38f684d391d..fac99a7040b 100644
--- a/TAO/tao/IIOP_EndpointsC.cpp
+++ b/TAO/tao/IIOP_EndpointsC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IIOP_EndpointsC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IIOP_EndpointsC.i"
+#include "IIOP_EndpointsC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -59,7 +58,7 @@ TAO::IIOP_Endpoint_Info::_tao_any_destructor (
   )
 {
   IIOP_Endpoint_Info *_tao_tmp_pointer =
-    ACE_static_cast (IIOP_Endpoint_Info *, _tao_void_pointer);
+    static_cast<IIOP_Endpoint_Info *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -110,7 +109,7 @@ void TAO::IIOPEndpointSequence::_tao_any_destructor (
   )
 {
   IIOPEndpointSequence * _tao_tmp_pointer =
-    ACE_static_cast (IIOPEndpointSequence *, _tao_void_pointer);
+    static_cast<IIOPEndpointSequence *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -152,7 +151,7 @@ CORBA::Boolean operator<< (
     const TAO::IIOPEndpointSequence &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -214,7 +213,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -311,4 +310,3 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h
index 9666b8691af..30ad5796ff9 100644
--- a/TAO/tao/IIOP_EndpointsC.h
+++ b/TAO/tao/IIOP_EndpointsC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_
 #define _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -58,9 +61,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -216,13 +217,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IIOP_EndpointsC.i"
+#include "IIOP_EndpointsC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -234,3 +235,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/IIOP_EndpointsC.i b/TAO/tao/IIOP_EndpointsC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/IIOP_EndpointsC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 724fcd451fc..3c254057dda 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -13,11 +13,6 @@ ACE_RCSID (tao,
            IIOP_Profile,
            "$Id$")
 
-
-#if !defined (__ACE_INLINE__)
-# include "IIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/os_include/os_netdb.h"
 
 static const char prefix_[] = "iiop";
@@ -64,7 +59,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
 TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core)
   : TAO_Profile (IOP::TAG_INTERNET_IOP,
                  orb_core,
-                 TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
+                 TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR,
+                                           TAO_DEF_GIOP_MINOR)),
     endpoint_ (),
     count_ (1)
 {
@@ -104,6 +100,9 @@ TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr)
       // Invalidate the object_addr_ until first access.
       this->endpoint_.object_addr_.set_type (-1);
 
+      this->count_ +=
+        this->endpoint_.preferred_interfaces (this->orb_core ());
+
       return 1;
     }
 
@@ -136,7 +135,15 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
 
   if (cp_pos == ior)
     {
-      // No hostname specified!  It is required by the spec.
+      // No hostname, however one is required by the spec when specifying a port.
+      // See formal-04-03-01, section 13.6.10.3
+      if (TAO_debug_level > 0)
+        {
+          ACE_DEBUG ((LM_ERROR,
+                   ACE_LIB_TEXT ("\nTAO (%P|%t) IIOP_Profile: ")
+                   ACE_LIB_TEXT ("Host address may be omited only when no port has been specified.\n")));
+        }
+
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      0,
@@ -301,7 +308,7 @@ TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp)
   endp->next_ = this->endpoint_.next_;
   this->endpoint_.next_ = endp;
 
-  this->count_++;
+  ++this->count_;
 }
 
 char *
@@ -381,6 +388,21 @@ TAO_IIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 int
 TAO_IIOP_Profile::encode_endpoints (void)
 {
+  CORBA::ULong actual_count = 0;
+
+  const TAO_IIOP_Endpoint *endpoint = &this->endpoint_;
+
+  // Count the number of endpoints that needs to be encoded
+  for (CORBA::ULong c = 0;
+       c != this->count_;
+       ++c)
+    {
+      if (endpoint->is_encodable_)
+        ++actual_count;
+
+      endpoint = endpoint->next_;
+    }
+
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
   // We include information for the head of the list
@@ -389,17 +411,20 @@ TAO_IIOP_Profile::encode_endpoints (void)
   // priority is not!
 
   TAO::IIOPEndpointSequence endpoints;
-  endpoints.length (this->count_);
+  endpoints.length (actual_count);
+
+  endpoint = &this->endpoint_;
 
-  const TAO_IIOP_Endpoint *endpoint = &this->endpoint_;
   for (CORBA::ULong i = 0;
-       i < this->count_;
+       i < actual_count;
        ++i)
     {
-      endpoints[i].host = endpoint->host ();
-      endpoints[i].port = endpoint->port ();
-      endpoints[i].priority = endpoint->priority ();
-
+      if (endpoint->is_encodable_)
+        {
+          endpoints[i].host = endpoint->host ();
+          endpoints[i].port = endpoint->port ();
+          endpoints[i].priority = endpoint->priority ();
+        }
       endpoint = endpoint->next_;
     }
 
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 2a3ecffb1bd..ee145ad9b53 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -102,10 +102,25 @@ protected:
    * one endpoint.
    *
    * Currently, a profile contains more than one endpoint, i.e.,
-   * list contains more than just the head, only when RTCORBA is enabled.
-   * However, in the near future, this will be used in nonRT
-   * mode as well, e.g., to support TAG_ALTERNATE_IIOP_ADDRESS
-   * feature.
+   * list contains more than just the head, only for two cases
+   * (1) when RTCORBA is enabled and
+   * (2) the ORB is initialized with -ORBPreferredInterfaces option.
+   * However, in the near future, this will be used in for mode as
+   * well, e.g., to support TAG_ALTERNATE_IIOP_ADDRESS  feature.
+   *
+   * This is probably as good a place to discuss how the list of
+   * endpoints is used for #2. If the ORB is configured to use
+   * preferred interfaces for invocation, TAO creates an endpoint per
+   * preferred interface. To be clear, every tuple
+   * <destination:target> will have an endpoint. What TAO essentially
+   * does is that creates it multiple endpoints so that the invocation
+   * code path can use existing iterating techniques to try one
+   * preferred interface after another (if the first did not work). If
+   * the ORB is configured with -ORBEnforcePreferredInterface set to
+   * false in addition to the ORBPreferredInterfaces option , TAO
+   * creates another endpoint with the preferred bit set to null, so
+   * that the invocation code can fall back to a TCP stack returned
+   * local address.
    * Addressing info of the default endpoint, i.e., head of the list,
    * is transmitted using standard IIOP ProfileBody components.  See
    * <encode_endpoints> method documentation above for how the rest of
@@ -117,9 +132,5 @@ protected:
   CORBA::ULong count_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/IIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* TAO_IIOP_PROFILE_H */
diff --git a/TAO/tao/IIOP_Profile.i b/TAO/tao/IIOP_Profile.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/tao/IIOP_Profile.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index cc77eb99222..64406f8b0a0 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -10,10 +10,6 @@
 #include "ORB_Core.h"
 #include "Thread_Lane_Resources.h"
 
-#if !defined (__ACE_INLINE__)
-# include "IIOP_Transport.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            IIOP_Transport,
            "$Id$")
@@ -75,6 +71,16 @@ TAO_IIOP_Transport::send (iovec *iov, int iovcnt,
                                                              max_wait_time);
   if (retval > 0)
     bytes_transferred = retval;
+  else
+    {
+      if (TAO_debug_level > 4)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::send, ")
+                      ACE_TEXT ("send failure - %m (%d)\n"),
+                      this->id (), errno));
+        }
+    }
 
   return retval;
 }
@@ -129,36 +135,6 @@ TAO_IIOP_Transport::send_request (TAO_Stub *stub,
                                   int message_semantics,
                                   ACE_Time_Value *max_wait_time)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (tph != 0)
-        {
-          const int result =
-            tph->update_client_protocol_properties (stub,
-                                                    this,
-                                                    "iiop");
-
-          if (result == -1)
-            return -1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO (%P|%t) - TAO_IIOP_Transport::send_request - "
-                             "get_protocol_hooks");
-
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
   if (this->ws_->sending_request (orb_core,
                                   message_semantics) == -1)
 
@@ -220,15 +196,6 @@ TAO_IIOP_Transport::send_message_shared (
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
 
-    if (TAO_debug_level > 6)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - ")
-                  ACE_TEXT ("IIOP_Transport::send_message_shared, ")
-                  ACE_TEXT ("enable_network_priority = %d\n"),
-                  this->connection_handler_->enable_network_priority ()));
-
-    this->connection_handler_->set_dscp_codepoint ();
-
     r = this->send_message_shared_i (stub, message_semantics,
                                      message_block, max_wait_time);
   }
@@ -425,16 +392,3 @@ TAO_IIOP_Transport::get_listen_point (
 
   return 1;
 }
-
-void
-TAO_IIOP_Transport::update_protocol_properties (int snd_buf_sz,
-                                                int rcv_buf_sz,
-                                                int no_delay,
-                                                int enable_nw_prio)
-{
-  this->connection_handler_->update_protocol_properties (
-      snd_buf_sz,
-      rcv_buf_sz,
-      no_delay,
-      enable_nw_prio);
-}
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index b2f3520d80c..258375b8b6a 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -145,11 +145,6 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
-
-#if defined (__ACE_INLINE__)
-#include "tao/IIOP_Transport.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_IIOP_TRANSPORT_H */
diff --git a/TAO/tao/IIOP_Transport.i b/TAO/tao/IIOP_Transport.i
deleted file mode 100644
index 81bf354f364..00000000000
--- a/TAO/tao/IIOP_Transport.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-//$Id$
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 8a26cddce86..ee210fd4ee1 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IOPC.h"
@@ -37,15 +37,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IOPC.i"
+#include "IOPC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
-
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index fb1bc775cf0..f4dc3fd309b 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -26,23 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IOPC_H_
 #define _TAO_IDL_ORIG_IOPC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "IOP_IORC.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 
-#include "IOP_CodecC.h"
+#include "tao/IOP_IORC.h"
+#include "tao/IOP_CodecC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -57,9 +61,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -76,13 +78,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IOPC.i"
+#include "IOPC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -94,3 +96,4 @@ namespace TAO
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/IOPC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/IOPS.cpp b/TAO/tao/IOPS.cpp
deleted file mode 100644
index b27ccb3ab18..00000000000
--- a/TAO/tao/IOPS.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
-
-#ifndef _TAO_IDL_IOPS_CPP_
-#define _TAO_IDL_IOPS_CPP_
-
-
-#include "IOPS.h"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/Operation_Table.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/PortableInterceptor.h"
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/PICurrent.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
-#include "tao/PortableServer/ServerInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include "ace/Dynamic_Service.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "IOPS.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
index 311449f7b68..e99ae6ee24a 100644
--- a/TAO/tao/IOPS.h
+++ b/TAO/tao/IOPS.h
@@ -37,9 +37,7 @@
 
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -65,11 +63,7 @@ namespace  POA_IOP
 
 #include "IOPS_T.h"
 
-#if defined (__ACE_INLINE__)
-#include "IOPS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/IOPS.i b/TAO/tao/IOPS.i
deleted file mode 100644
index e86a7e25a26..00000000000
--- a/TAO/tao/IOPS.i
+++ /dev/null
@@ -1,22 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/IOPS_T.cpp b/TAO/tao/IOPS_T.cpp
deleted file mode 100644
index c97b14d8efa..00000000000
--- a/TAO/tao/IOPS_T.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:705
-
-#ifndef _TAO_IDL_ORIG_IOPS_T_CPP_
-#define _TAO_IDL_ORIG_IOPS_T_CPP_
-
-#include "IOPS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "IOPS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h
index 9423b4ae0be..6bad875aab1 100644
--- a/TAO/tao/IOPS_T.h
+++ b/TAO/tao/IOPS_T.h
@@ -34,29 +34,15 @@
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:1111
 
-#if defined (__ACE_INLINE__)
-#include "IOPS_T.i"
-#endif /* defined INLINE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "IOPS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("IOPS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/IOPS_T.i b/TAO/tao/IOPS_T.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/IOPS_T.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc
index 5141059d624..4d59fed3776 100644
--- a/TAO/tao/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor.mpc
@@ -26,4 +26,8 @@ project : taolib, portableserver, objreftemplate, core {
   PIDL_Files {
     IORInterceptor
   }
+
+  Pkgconfig_Files {
+    IORInterceptor/TAO_IORInterceptor.pc.in
+  }
 }
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index faf9f44cd67..951b083ca6c 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -26,9 +26,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -164,7 +162,7 @@ private:
 # include "IORInfo.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl
index c20532343dd..b590b80fd65 100644
--- a/TAO/tao/IORInterceptor/IORInfo.pidl
+++ b/TAO/tao/IORInterceptor/IORInfo.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Sa -St -GT
+ *     -o orig -Gp -Gd -Ge 1 -Sa -St -GT -Sc
  *          -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_IORInterceptor_Export
  *          -Wb,export_include="iorinterceptor_export.h"
@@ -34,7 +34,7 @@
 #define _IORINFO_IDL_
 
 #include "tao/PortableInterceptor.pidl"
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
 
 module PortableInterceptor
 {
diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp
index 896032224e6..665c3b9c729 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ b/TAO/tao/IORInterceptor/IORInfoC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "IORInfoC.h"
@@ -43,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +51,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceFactory>
     : public
@@ -69,7 +69,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::IORInfo.
 
@@ -108,12 +108,6 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_IORInfo_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::IORInfo::IORInfo (void)
 {}
 
@@ -130,10 +124,10 @@ PortableInterceptor::IORInfo::_narrow (
     {
       return IORInfo::_nil ();
     }
-
+  
   IORInfo_ptr proxy =
     dynamic_cast<IORInfo_ptr> (_tao_objref);
-
+  
   return IORInfo::_duplicate (proxy);
 }
 
@@ -147,10 +141,10 @@ PortableInterceptor::IORInfo::_unchecked_narrow (
     {
       return IORInfo::_nil ();
     }
-
+  
   IORInfo_ptr proxy =
     dynamic_cast<IORInfo_ptr> (_tao_objref);
-
+  
   return IORInfo::_duplicate (proxy);
 }
 
@@ -161,7 +155,7 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -173,7 +167,7 @@ PortableInterceptor::IORInfo::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/IORInfo:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -206,7 +200,7 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -223,7 +217,7 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
         PortableInterceptor::ObjectReferenceFactory *,
         PortableInterceptor::ObjectReferenceFactory_var,
         PortableInterceptor::ObjectReferenceFactory_out,
-        TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory>
+        TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> 
       >;
 
 #endif /* end #if !defined */
@@ -237,7 +231,7 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         PortableInterceptor::IORInfo
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::IORInfo
@@ -272,10 +266,10 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         PortableInterceptor::IORInfo
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::IORInfo
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h
index 160cc0dd71e..6b63ded4a88 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.h
+++ b/TAO/tao/IORInterceptor/IORInfoC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IORINFOC_H_
 #define _TAO_IDL_ORIG_IORINFOC_H_
@@ -42,12 +42,13 @@
 
 #include "iorinterceptor_export.h"
 #include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PortableInterceptorC.h"
-#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -62,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -72,38 +71,38 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_
-
+  
   class IORInfo;
   typedef IORInfo *IORInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         IORInfo
       >
     IORInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         IORInfo
@@ -111,43 +110,43 @@ namespace PortableInterceptor
     IORInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO_CH_
-
+  
   class TAO_IORInterceptor_Export IORInfo
     : public virtual CORBA::Object
   {
   public:
     typedef IORInfo_ptr _ptr_type;
     typedef IORInfo_var _var_type;
-
+    
     // The static operations.
     static IORInfo_ptr _duplicate (IORInfo_ptr obj);
-
+    
     static IORInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInfo_ptr _nil (void)
     {
-      return (IORInfo_ptr)0;
+      return static_cast<IORInfo_ptr> (0);
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr get_effective_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -155,10 +154,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_ior_component (
         const ::IOP::TaggedComponent & a_component
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -166,10 +165,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_ior_component_to_profile (
         const ::IOP::TaggedComponent & a_component,
         ::IOP::ProfileId profile_id
@@ -178,50 +177,50 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::AdapterManagerId manager_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual PortableInterceptor::AdapterState state (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void current_factory (
         ::PortableInterceptor::ObjectReferenceFactory * current_factory
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -229,40 +228,40 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     IORInfo (void);
-
+    
     virtual ~IORInfo (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     IORInfo (const IORInfo &);
-
+    
     void operator= (const IORInfo &);
   };
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -270,7 +269,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInfo>
   {
@@ -291,13 +290,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "IORInfoC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -308,3 +307,5 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IORInterceptor/IORInfoC.inl b/TAO/tao/IORInterceptor/IORInfoC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.inl
+++ b/TAO/tao/IORInterceptor/IORInfoC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl
index 1013e104599..ece8347ace7 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor.pidl
+++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl
@@ -20,13 +20,16 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Sa -St -GT
+ *     -o orig -Gp -Gd -Ge 1 -Sa -St -Sc -GT
  *          -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/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index be51db89f4b..9c3811144e0 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
-#include "IORInterceptorC.h"
+#include "IORInterceptor.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +51,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::IORInterceptor.
 
@@ -90,12 +90,6 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_IORInterceptor_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::IORInterceptor::IORInterceptor (void)
 {}
 
@@ -112,10 +106,10 @@ PortableInterceptor::IORInterceptor::_narrow (
     {
       return IORInterceptor::_nil ();
     }
-
+  
   IORInterceptor_ptr proxy =
     dynamic_cast<IORInterceptor_ptr> (_tao_objref);
-
+  
   return IORInterceptor::_duplicate (proxy);
 }
 
@@ -129,10 +123,10 @@ PortableInterceptor::IORInterceptor::_unchecked_narrow (
     {
       return IORInterceptor::_nil ();
     }
-
+  
   IORInterceptor_ptr proxy =
     dynamic_cast<IORInterceptor_ptr> (_tao_objref);
-
+  
   return IORInterceptor::_duplicate (proxy);
 }
 
@@ -143,7 +137,7 @@ PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -155,11 +149,11 @@ PortableInterceptor::IORInterceptor::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/Interceptor:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0"
         ) ||
       !ACE_OS::strcmp (
@@ -192,7 +186,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -205,7 +199,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         PortableInterceptor::IORInterceptor
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::IORInterceptor
@@ -222,10 +216,10 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         PortableInterceptor::IORInterceptor
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::IORInterceptor
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index e7e07e8f806..fa945405ce6 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -26,13 +26,16 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_
 #define _TAO_IDL_ORIG_IORINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
+#ifndef TAO_IORINTERCEPTOR_SAFE_INCLUDE
+#error "You should not include IORInterceptorC.h directly, use IORInterceptor.h"
+#endif /* !TAO_IORINTERCEPTOR_SAFE_INCLUDE */
 
 #include "ace/config-all.h"
 
@@ -42,6 +45,7 @@
 
 #include "iorinterceptor_export.h"
 #include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -63,9 +67,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -73,38 +75,38 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
-
+  
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         IORInterceptor
       >
     IORInterceptor_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         IORInterceptor
@@ -112,43 +114,43 @@ namespace PortableInterceptor
     IORInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
-
+  
   class TAO_IORInterceptor_Export IORInterceptor
     : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef IORInterceptor_ptr _ptr_type;
     typedef IORInterceptor_var _var_type;
-
+    
     // The static operations.
     static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
-
+    
     static IORInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static IORInterceptor_ptr _nil (void)
     {
-      return (IORInterceptor_ptr)0;
+      return static_cast<IORInterceptor_ptr> (0);
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void establish_components (
         ::PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -156,10 +158,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void components_established (
         ::PortableInterceptor::IORInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -167,10 +169,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void adapter_manager_state_changed (
         ::PortableInterceptor::AdapterManagerId id,
         ::PortableInterceptor::AdapterState state
@@ -179,10 +181,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void adapter_state_changed (
         const ::PortableInterceptor::ObjectReferenceTemplateSeq & templates,
         ::PortableInterceptor::AdapterState state
@@ -191,40 +193,40 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     IORInterceptor (void);
-
+    
     virtual ~IORInterceptor (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     IORInterceptor (const IORInterceptor &);
-
+    
     void operator= (const IORInterceptor &);
   };
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -232,7 +234,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
   {
@@ -253,13 +255,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "IORInterceptorC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -270,3 +272,5 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.inl b/TAO/tao/IORInterceptor/IORInterceptorC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.inl
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index 39bf2af372e..986cc031d01 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "IORInterceptor_Adapter_Factory_Impl.h"
+#include "IORInterceptor_Adapter_Impl.h"
+
 #include "tao/ORB_Core.h"
 
 ACE_RCSID (IORInterceptor,
@@ -11,16 +13,16 @@ TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Imp
 {
 }
 
-TAO_IORInterceptor_Adapter * TAO_IORInterceptor_Adapter_Factory_Impl::create (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-  )
+TAO_IORInterceptor_Adapter *
+TAO_IORInterceptor_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_IORInterceptor_Adapter_Impl * new_iorinterceptor_adapter = 0;
-  ACE_NEW_RETURN (new_iorinterceptor_adapter,
-                  TAO_IORInterceptor_Adapter_Impl,
-                  0);
-  return new_iorinterceptor_adapter;
+  TAO_IORInterceptor_Adapter_Impl *nia = 0;
+  ACE_NEW_THROW_EX (nia,
+                    TAO_IORInterceptor_Adapter_Impl (),
+                    CORBA::NO_MEMORY ());
+
+  return nia;
 }
 
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index 33cb782f913..4b11bc97d9c 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -16,17 +16,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IORInterceptorC.h"
+#include "iorinterceptor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "iorinterceptor_export.h"
-#include "tao/IORInterceptor_Adapter_Factory.h"
-#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
 #include "ace/Service_Config.h"
-#include "IORInterceptor_List.h"
+#include "tao/IORInterceptor_Adapter_Factory.h"
+
+
+class TAO_IORInterceptor_Adapter;
 
 /**
  * @class TAO_IORInterceptor_Adapter_Factory_Impl
@@ -70,6 +69,10 @@ TAO_Requires_IORInterceptor_Initializer =
 
 #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
 
+#define TAO_IORINTERCEPTOR_SAFE_INCLUDE
+#include "tao/IORInterceptor/IORInterceptorC.h"
+#undef TAO_IORINTERCEPTOR_SAFE_INCLUDE
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IORINTERCEPTOR_ADAPTER_FACTORY_IMPL_H */
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 8a4a7f82b6f..b1781953411 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -16,16 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "IORInterceptorC.h"
+#include "iorinterceptor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "iorinterceptor_export.h"
 #include "tao/IORInterceptor_Adapter.h"
-#include "ace/Service_Config.h"
-#include "IORInterceptor_List.h"
+#include "tao/IORInterceptor/IORInterceptor_List.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 
 class TAO_POA;
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_List.h b/TAO/tao/IORInterceptor/IORInterceptor_List.h
index 05bd4f9d3c5..b1761f599a9 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_List.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_List.h
@@ -21,10 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IORInterceptorC.h"
-
 #include "tao/Interceptor_List.h"
 #include "tao/PortableServer/ORT_Adapter.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
+
 
 /**
  * @class TAO_IORInterceptor_List
diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc
index 37f3b5cead9..af964e2a3aa 100644
--- a/TAO/tao/IORManipulation.mpc
+++ b/TAO/tao/IORManipulation.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     IORManipulation
   }
+
+  Pkgconfig_Files {
+    IORManipulation/TAO_IORManip.pc.in
+  }
 }
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index 71ce086e877..8b1daf136d4 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IORManip_Loader.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 814806ebba5..7a9e1cf18f3 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -213,7 +213,9 @@ TAO_IOR_Manipulation_impl::remove_profiles (
 
   CORBA::Object_var new_obj = temp_obj;
 
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  // Exception safety is no longer an issue by this point so release
+  // the TAO_Stub from the TAO_Stub_Auto_Ptr.
+  stub = safe_stub.release ();
 
   // Clean up in case of errors.
   if (CORBA::is_nil (new_obj.in ()))
@@ -222,10 +224,6 @@ TAO_IOR_Manipulation_impl::remove_profiles (
                         CORBA::Object::_nil ());
     }
 
-  // Exception safety is no longer an issue by this point so release
-  // the TAO_Stub from the TAO_Stub_Auto_Ptr.
-  stub = safe_stub.release ();
-
   return new_obj._retn ();
 }
 
diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc
index 439e11e52a5..92010d7a90f 100644
--- a/TAO/tao/IORTable.mpc
+++ b/TAO/tao/IORTable.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     IORTable
   }
+
+  Pkgconfig_Files {
+    IORTable/TAO_IORTable.pc.in
+  }
 }
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index 3891d59cd18..3e1a8b2fcd8 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -22,6 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Adapter.h"
+#include "tao/Adapter_Factory.h"
 #include "ace/Service_Config.h"
 
 class TAO_IOR_Table_Impl;
diff --git a/TAO/tao/IORTable/diffs/IORTable.diff b/TAO/tao/IORTable/diffs/IORTable.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/IORTable/diffs/IORTable.diff
+++ /dev/null
diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp
index 02e44739a84..6c9a01c5336 100644
--- a/TAO/tao/IOR_Parser.cpp
+++ b/TAO/tao/IOR_Parser.cpp
@@ -3,10 +3,6 @@
 #include "tao/IOR_Parser.h"
 #include "ace/Dynamic_Service.h"
 
-#if !defined(__ACE_INLINE__)
-#include "tao/IOR_Parser.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(tao, IOR_Parser, "$Id$")
 
 TAO_IOR_Parser::~TAO_IOR_Parser (void)
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
index 9fa4bbb727a..1b4c2e0ab8e 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -62,9 +62,5 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/IOR_Parser.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_IOR_PARSER_H */
diff --git a/TAO/tao/IOR_Parser.i b/TAO/tao/IOR_Parser.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/IOR_Parser.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp
index 662ee3afbec..61999fb1a11 100644
--- a/TAO/tao/Incoming_Message_Queue.cpp
+++ b/TAO/tao/Incoming_Message_Queue.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (tao,
            "$Id$")
 
 TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core)
-  : queued_data_ (0),
+  : last_added_ (0),
     size_ (0),
     orb_core_ (orb_core)
 {
@@ -45,21 +45,21 @@ TAO_Incoming_Message_Queue::copy_tail (ACE_Message_Block &block)
     {
       // Check to see if the length of the incoming block is less than
       // that of the <missing_data_> of the tail.
-      if ((CORBA::Long)block.length () <= this->queued_data_->missing_data_)
+      if ((CORBA::Long)block.length () < this->last_added_->missing_data_)
         {
           n = block.length ();
         }
       else
         {
-          n = this->queued_data_->missing_data_;
+          n = this->last_added_->missing_data_;
         }
 
       // Do the copy
-      this->queued_data_->msg_block_->copy (block.rd_ptr (),
+      this->last_added_->msg_block_->copy (block.rd_ptr (),
                                             n);
 
       // Decerement the missing data
-      this->queued_data_->missing_data_ -= n;
+      this->last_added_->missing_data_ -= n;
     }
 
   return n;
@@ -68,17 +68,20 @@ TAO_Incoming_Message_Queue::copy_tail (ACE_Message_Block &block)
 TAO_Queued_Data *
 TAO_Incoming_Message_Queue::dequeue_head (void)
 {
+  if (this->size_ == 0)
+    return 0;
+
   // Get the node on the head of the queue...
-  TAO_Queued_Data *tmp =
-    this->queued_data_->next_;
+  TAO_Queued_Data *head = this->last_added_->next_;
 
   // Reset the head node..
-  this->queued_data_->next_ = tmp->next_;
+  this->last_added_->next_ = head->next_;
 
-  // Decrease the size
-  --this->size_;
+  // Decrease the size and reset last_added_ if empty
+  if (--this->size_ == 0)
+    this->last_added_ = 0;
 
- return tmp;
+  return head;
 }
 
 TAO_Queued_Data *
@@ -89,52 +92,158 @@ TAO_Incoming_Message_Queue::dequeue_tail (void)
     return 0;
 
   // Get the node on the head of the queue...
-  TAO_Queued_Data *tmp =
-    this->queued_data_->next_;
+  TAO_Queued_Data *head =
+    this->last_added_->next_;
 
-  while (tmp->next_ != this->queued_data_)
+  while (head->next_ != this->last_added_)
     {
-      tmp = tmp->next_;
+      head = head->next_;
     }
 
   // Put the head in tmp.
-  tmp->next_ = this->queued_data_->next_;
+  head->next_ = this->last_added_->next_;
 
-  TAO_Queued_Data *ret_qd = this->queued_data_;
+  TAO_Queued_Data *ret_qd = this->last_added_;
 
-  this->queued_data_ = tmp;
+  this->last_added_ = head;
 
   // Decrease the size
-  --this->size_;
+  if (--this->size_ == 0)
+    this->last_added_ = 0;
 
  return ret_qd;
 }
 
-
 int
 TAO_Incoming_Message_Queue::enqueue_tail (TAO_Queued_Data *nd)
 {
   if (this->size_ == 0)
     {
-      this->queued_data_ = nd;
-      this->queued_data_->next_ = this->queued_data_;
+      this->last_added_ = nd;
+      this->last_added_->next_ = this->last_added_;
     }
   else
     {
-      nd->next_ = this->queued_data_->next_;
-      this->queued_data_->next_ = nd;
-      this->queued_data_ = nd;
+      nd->next_ = this->last_added_->next_;
+      this->last_added_->next_ = nd;
+      this->last_added_ = nd;
     }
 
   ++ this->size_;
   return 0;
 }
 
+TAO_Queued_Data *
+TAO_Incoming_Message_Queue::find_fragment_chain (CORBA::Octet major,
+                                                 CORBA::Octet minor) const
+{
+  TAO_Queued_Data *found = 0;
+  if (this->last_added_ != 0)
+    {
+      TAO_Queued_Data *qd = this->last_added_->next_;
+
+      do {
+        if (qd->more_fragments_ &&
+            qd->major_version_ == major && qd->minor_version_ == minor)
+          {
+            found = qd;
+          }
+        else
+          {
+            qd = qd->next_;
+          }
+      } while (found == 0 && qd != this->last_added_->next_);
+    }
+
+  return found;
+}
+
+TAO_Queued_Data *
+TAO_Incoming_Message_Queue::find_fragment_chain (CORBA::ULong request_id) const
+{
+  TAO_Queued_Data *found = 0;
+  if (this->last_added_ != 0)
+    {
+      TAO_Queued_Data *qd = this->last_added_->next_;
+
+      do {
+        if (qd->more_fragments_ && qd->request_id_ == request_id)
+          {
+            found = qd;
+          }
+        else
+          {
+            qd = qd->next_;
+          }
+      } while (found == 0 && qd != this->last_added_->next_);
+    }
+
+  return found;
+}
+
 
 /************************************************************************/
 // Methods  for TAO_Queued_Data
 /************************************************************************/
 
+/*!
+  \brief Allocate and return a new empty message block of size \a new_size mimicking parameters of \a mb.
+
+  This function allocates a new aligned message block using the same
+  allocators and flags as found in \a mb.  The size of the new message
+  block is at least \a new_size; the size may be adjusted up in order
+  to accomodate alignment requirements and still fit \a new_size bytes
+  into the aligned buffer.
+
+  \param mb message block whose parameters should be mimicked
+  \param new_size size of the new message block (will be adjusted for proper alignment)
+  \return an aligned message block with rd_ptr sitting at correct alignment spot, 0 on failure
+
+  \author Thanks to Rich Seibel for helping implement the public API for ACE_Message_Block!
+ */
+static ACE_Message_Block*
+clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size)
+{
+  // Calculate the required size of the cloned block with alignment
+  size_t aligned_size = ACE_CDR::first_size (span_size + ACE_CDR::MAX_ALIGNMENT);
+
+  // Get the allocators
+  ACE_Allocator *data_allocator;
+  ACE_Allocator *data_block_allocator;
+  ACE_Allocator *message_block_allocator;
+  mb->access_allocators (data_allocator,
+                         data_block_allocator,
+                         message_block_allocator);
+
+  // Create a new Message Block
+  ACE_Message_Block *nb;
+  ACE_NEW_MALLOC_RETURN (nb,
+                         static_cast<ACE_Message_Block*> (
+                                         message_block_allocator->malloc (
+                                           sizeof (ACE_Message_Block))),
+                         ACE_Message_Block(aligned_size,
+                                           mb->msg_type(),
+                                           mb->cont(),
+                                           0, //we want the data block created
+                                           data_allocator,
+                                           mb->locking_strategy(),
+                                           mb->msg_priority(),
+                                           mb->msg_execution_time (),
+                                           mb->msg_deadline_time (),
+                                           data_block_allocator,
+                                           message_block_allocator),
+                         0);
+
+  ACE_CDR::mb_align (nb);
+
+  // Copy the flags over, but be SURE to clear the DONT_DELETE flag, since
+  // we just dynamically allocated the two things.
+  nb->set_flags (mb->flags());
+  nb->clr_flags (ACE_Message_Block::DONT_DELETE);
+
+  return nb;
+}
+
 TAO_Queued_Data::TAO_Queued_Data (ACE_Allocator *alloc)
   : msg_block_ (0),
     missing_data_ (0),
@@ -142,6 +251,7 @@ TAO_Queued_Data::TAO_Queued_Data (ACE_Allocator *alloc)
     major_version_ (0),
     minor_version_ (0),
     more_fragments_ (0),
+    request_id_ (0),
     msg_type_ (TAO_PLUGGABLE_MESSAGE_MESSAGERROR),
     next_ (0),
     allocator_ (alloc)
@@ -156,6 +266,7 @@ TAO_Queued_Data::TAO_Queued_Data (ACE_Message_Block *mb,
     major_version_ (0),
     minor_version_ (0),
     more_fragments_ (0),
+    request_id_ (0),
     msg_type_ (TAO_PLUGGABLE_MESSAGE_MESSAGERROR),
     next_ (0),
     allocator_ (alloc)
@@ -169,6 +280,7 @@ TAO_Queued_Data::TAO_Queued_Data (const TAO_Queued_Data &qd)
     major_version_ (qd.major_version_),
     minor_version_ (qd.minor_version_),
     more_fragments_ (qd.more_fragments_),
+    request_id_ (qd.request_id_),
     msg_type_ (qd.msg_type_),
     next_ (0),
     allocator_ (qd.allocator_)
@@ -177,7 +289,7 @@ TAO_Queued_Data::TAO_Queued_Data (const TAO_Queued_Data &qd)
 
 /*static*/
 TAO_Queued_Data *
-TAO_Queued_Data::get_queued_data (ACE_Allocator *alloc)
+TAO_Queued_Data::make_queued_data (ACE_Allocator *alloc)
 {
   TAO_Queued_Data *qd = 0;
 
@@ -284,3 +396,31 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd)
 
   return qd;
 }
+
+void
+TAO_Queued_Data::consolidate (void)
+{
+  // Is this a chain of fragments?
+  if (this->more_fragments_ && this->msg_block_->cont () != 0)
+    {
+      // Create a message block big enough to hold the entire chain
+      ACE_Message_Block *dest = clone_mb_nocopy_size (
+                                      this->msg_block_,
+                                      this->msg_block_->total_length ());
+
+      // Reset the cont() parameter.  We have cloned the message
+      // block but not the chain as we will no longer have chain.
+      dest->cont (0);
+
+      // Use ACE_CDR to consolidate the chain for us
+      ACE_CDR::consolidate (dest, this->msg_block_);
+
+      // free the original message block chain
+      this->msg_block_->release ();
+
+      // Set the message block to the new consolidated message block
+      this->msg_block_ = dest;
+      this->more_fragments_ = 0;
+    }
+}
+
diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h
index 9d600afb16e..0949b673e76 100644
--- a/TAO/tao/Incoming_Message_Queue.h
+++ b/TAO/tao/Incoming_Message_Queue.h
@@ -75,30 +75,67 @@ public:
   /// Return the length of the queue..
   CORBA::ULong queue_length (void);
 
-  /// Methods for sanity check. Checks to see whether the node on the
-  /// head or tail is complete or not and ready for further
-  /// processing.
+  /*!
+    @name Node Inspection Predicates
+
+    \brief These methods allow inspection of head and tail nodes for "completeness".
+
+    These methods check to see whether the node on the head or tail is
+    "complete" and ready for further processing.  See each method's
+    documentation for its definition of "complete".
+  */
+  //@{
+  /*!
+    "complete" == the GIOP message at the tail is not missing any data (it may be a complete GIOP Fragment, though)
+
+    \return -1 queue is empty
+    \return 0  tail is not "complete"
+    \return 1  tail is "complete"
+  */
   int is_tail_complete (void);
+
+  /*!
+
+    "complete" == the GIOP message at the head is not missing any data
+    AND, if it's the first message in a series of GIOP fragments, all
+    the fragments have been received, parsed, and placed into the
+    queue
+
+    \return -1 if queue is empty
+    \return 0  if head is not "complete"
+    \return 1  if head is "complete"
+   */
   int is_head_complete (void);
+  //@}
 
-  /// This method checks whether the last message that was queued up
-  /// was fragmented...
+  /*!
+    \brief Check to see if the message at the tail (complete or incomplete) is a GIOP Fragment.
+   */
   int is_tail_fragmented (void);
 
   /// Return the size of data that is missing in tail of the queue.
   size_t missing_data_tail (void) const;
 
+  /// Find the first fragment that matches the GIOP version
+  TAO_Queued_Data *find_fragment_chain (CORBA::Octet major,
+                                        CORBA::Octet minor) const;
+
+  /// Find the first fragment that matches the request id
+  TAO_Queued_Data *find_fragment_chain (CORBA::ULong request_id) const;
+
 private:
 
   friend class TAO_Transport;
 
-  /// Make a node for the queue.
-  TAO_Queued_Data *get_node (void);
-
 private:
+  /*!
+    \brief A circular linked list of messages awaiting processing.
 
-  /// A linked listof messages that await processing
-  TAO_Queued_Data *queued_data_;
+    \a last_message_added_ points to the most recent message added to
+    the list.  The earliest addition can be easily accessed via
+    \a last_message_added_->next_.
+   */
+  TAO_Queued_Data *last_added_;
 
   /// The size of the queue
   CORBA::ULong size_;
@@ -118,6 +155,11 @@ private:
  * stored in the queue. Such a node can be used by the incoming thread
  * from the reactor to dequeue and process the message by sending it
  * to the higher layers of the ORB.
+ *
+ * The ACE_Message_Block contained within this class may contain a chain
+ * of message blocks (usually when GIOP fragments are involved).  In that
+ * case consolidate () needs to be called prior to being sent to higher
+ * layers of the ORB when the GIOP fragment chain is complete.
  */
 
 class TAO_Export TAO_Queued_Data
@@ -132,24 +174,35 @@ public:
   /// Copy constructor.
   TAO_Queued_Data (const TAO_Queued_Data &qd);
 
-  /// Creation and deletion of a node in the queue.
-  static TAO_Queued_Data* get_queued_data (ACE_Allocator *alloc = 0);
+  /// Creation of a node in the queue.
+  static TAO_Queued_Data* make_queued_data (ACE_Allocator *alloc = 0);
 
+  /// Deletion of a node from the queue.
   static void release (TAO_Queued_Data *qd);
 
   /// Duplicate ourselves. This creates a copy of ourselves on the
   /// heap and returns a pointer to the duplicated node.
   static TAO_Queued_Data* duplicate (TAO_Queued_Data &qd);
 
+  /// Consolidate this fragments chained message blocks into one.
+  void consolidate (void);
+
 public:
   /// The message block that contains the message.
   ACE_Message_Block *msg_block_;
 
-  /// Data missing in the above message that hasn't been read or
-  /// processed yet.
+  /*!
+    @name Missing Data details
+
+    The \a missing_data_ member contains the number of bytes of
+    data missing from \a msg_block_.
+   */
+  //@{
+  /*! Data missing in the above message that hasn't been read or processed yet. */
   CORBA::Long missing_data_;
+  //@}
 
-  /// The byte order of the message that is stored in the node..
+  /// The byte order of the message that is stored in the node.
   CORBA::Octet byte_order_;
 
   /// Many protocols like GIOP have a major and minor version
@@ -164,6 +217,9 @@ public:
   /// queue already has more fragments that is missing..
   CORBA::Octet more_fragments_;
 
+  /// The fragment request id
+  CORBA::ULong request_id_;
+
   /// The message type of the message
   TAO_Pluggable_Message_Type msg_type_;
 
diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl
index d67bd485383..99bcb4978d3 100644
--- a/TAO/tao/Incoming_Message_Queue.inl
+++ b/TAO/tao/Incoming_Message_Queue.inl
@@ -18,7 +18,7 @@ TAO_Incoming_Message_Queue::is_tail_complete (void)
     return -1;
 
   if (this->size_ &&
-      this->queued_data_->missing_data_ == 0)
+      this->last_added_->missing_data_ == 0)
     return 1;
 
   return 0;
@@ -31,8 +31,8 @@ TAO_Incoming_Message_Queue::is_head_complete (void)
     return -1;
 
   if (this->size_  &&
-      this->queued_data_->next_->missing_data_ == 0 &&
-      this->queued_data_->next_->more_fragments_ == 0)
+      this->last_added_->next_->missing_data_ == 0 &&
+      !this->last_added_->next_->more_fragments_)
     return 1;
 
   return 0;
@@ -45,7 +45,7 @@ TAO_Incoming_Message_Queue::is_tail_fragmented (void)
     return 0;
 
   if (this->size_  &&
-      this->queued_data_->more_fragments_ == 1)
+      this->last_added_->more_fragments_)
     return 1;
 
   return 0;
@@ -55,19 +55,12 @@ ACE_INLINE size_t
 TAO_Incoming_Message_Queue::missing_data_tail (void) const
 {
   if (this->size_ != 0)
-    return this->queued_data_->missing_data_;
+    return this->last_added_->missing_data_;
 
   return 0;
 }
 
 
-
-ACE_INLINE TAO_Queued_Data *
-TAO_Incoming_Message_Queue::get_node (void)
-{
-  return TAO_Queued_Data::get_queued_data ();
-}
-
 /************************************************************************/
 // Methods  for TAO_Queued_Data
 /************************************************************************/
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 42a2075a302..01290c9cca3 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -8,10 +8,6 @@
 #include "ORB_Constants.h"
 #include "SystemException.h"
 
-#if !defined (__ACE_INLINE__)
-#include "tao/Invocation_Endpoint_Selectors.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            Invocation_Endpoint_Selectors,
            "$Id$")
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index 04eb197a961..776d6bc8411 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -97,9 +97,5 @@ public:
                                 ACE_ENV_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/Invocation_Endpoint_Selectors.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* TAO_INVOCATION_ENDPOINT_SELECTOR_H */
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.i b/TAO/tao/Invocation_Endpoint_Selectors.i
deleted file mode 100644
index 2ad999ebb73..00000000000
--- a/TAO/tao/Invocation_Endpoint_Selectors.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h
index 746da27fd02..af303857916 100644
--- a/TAO/tao/LF_CH_Event.h
+++ b/TAO/tao/LF_CH_Event.h
@@ -105,10 +105,6 @@ private:
   int prev_state_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "LF_Invocation_Event.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LF_CH_EVENT_H */
diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp
index 379e0c3293f..5dcd5a60402 100644
--- a/TAO/tao/LF_Invocation_Event.cpp
+++ b/TAO/tao/LF_Invocation_Event.cpp
@@ -1,10 +1,6 @@
 // -*- C++ -*-
 #include "LF_Invocation_Event.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Invocation_Event.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(tao,
           LF_Invocation_Event,
           "$Id$")
diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h
index d37ea2bf9a6..98a836f5506 100644
--- a/TAO/tao/LF_Invocation_Event.h
+++ b/TAO/tao/LF_Invocation_Event.h
@@ -77,10 +77,6 @@ private:
   int is_state_final (void);
 };
 
-#if defined (__ACE_INLINE__)
-# include "LF_Invocation_Event.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LF_INVOCATION_EVENT_H */
diff --git a/TAO/tao/LF_Invocation_Event.inl b/TAO/tao/LF_Invocation_Event.inl
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/tao/LF_Invocation_Event.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/tao/LF_Strategy.cpp b/TAO/tao/LF_Strategy.cpp
index 9b06634920c..2deb35e08eb 100644
--- a/TAO/tao/LF_Strategy.cpp
+++ b/TAO/tao/LF_Strategy.cpp
@@ -3,12 +3,8 @@
 
 #include "tao/LF_Strategy.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           LF_Strategy, 
+ACE_RCSID (tao,
+           LF_Strategy,
            "$Id$")
 
 TAO_LF_Strategy::~TAO_LF_Strategy (void)
diff --git a/TAO/tao/LF_Strategy.h b/TAO/tao/LF_Strategy.h
index ac84ad7ba6b..6b665bff5f1 100644
--- a/TAO/tao/LF_Strategy.h
+++ b/TAO/tao/LF_Strategy.h
@@ -68,10 +68,6 @@ public:
                                         TAO_Leader_Follower &) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/LF_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_LF_STRATEGY_H */
diff --git a/TAO/tao/LF_Strategy.inl b/TAO/tao/LF_Strategy.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/tao/LF_Strategy.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index 308f613abd8..cf05375db8a 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -6,6 +6,7 @@
 #include "tao/LF_Event_Binder.h"
 #include "tao/debug.h"
 #include "tao/Transport.h"
+#include "tao/GUIResource_Factory.h"
 #include "ace/OS_NS_sys_time.h"
 
 #include "ace/Reactor.h"
@@ -27,7 +28,12 @@ TAO_Leader_Follower::~TAO_Leader_Follower (void)
       delete follower;
     }
   // Hand the reactor back to the resource factory.
-  this->orb_core_->resource_factory ()->reclaim_reactor (this->reactor_);
+  // use GUI reactor factory if available
+  if ( this->orb_core_->gui_resource_factory () )
+    this->orb_core_->gui_resource_factory ()->reclaim_reactor (this->reactor_);
+  else
+    this->orb_core_->resource_factory ()->reclaim_reactor (this->reactor_);
+
   this->reactor_ = 0;
 }
 
@@ -116,8 +122,13 @@ TAO_Leader_Follower::reactor (void)
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), 0);
       if (this->reactor_ == 0)
         {
-          this->reactor_ =
-            this->orb_core_->resource_factory ()->get_reactor ();
+          // use GUI reactor factory if available
+          if ( this->orb_core_->gui_resource_factory () )
+            this->reactor_ =
+              this->orb_core_->gui_resource_factory ()->get_reactor ();
+          else
+            this->reactor_ =
+              this->orb_core_->resource_factory ()->get_reactor ();
         }
     }
   return this->reactor_;
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index f561d37ae0d..bba344b7c5a 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -139,13 +139,17 @@ CORBA::LocalObject::_request (const char *
 CORBA::Object_ptr
 CORBA::LocalObject::_get_component (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
+                                         CORBA::COMPLETED_NO),
+                    0);
 }
 
 CORBA::InterfaceDef_ptr
 CORBA::LocalObject::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
+                                         CORBA::COMPLETED_NO),
+                    0);
 }
 
 CORBA::ImplementationDef_ptr
@@ -162,11 +166,13 @@ CORBA::Policy_ptr
 CORBA::LocalObject::_get_policy (CORBA::PolicyType
                                  ACE_ENV_ARG_DECL)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
+                                         CORBA::COMPLETED_NO),
+                    0);
 }
 
 CORBA::Policy_ptr
-CORBA::LocalObject::_get_client_policy (CORBA::PolicyType
+CORBA::LocalObject::_get_cached_policy (TAO_Cached_Policy_Type
                                         ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -177,21 +183,27 @@ CORBA::LocalObject::_set_policy_overrides (const CORBA::PolicyList &,
                                            CORBA::SetOverrideType
                                            ACE_ENV_ARG_DECL)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
+                                         CORBA::COMPLETED_NO),
+                    0);
 }
 
 CORBA::PolicyList *
 CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &
                                            ACE_ENV_ARG_DECL)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
+                                         CORBA::COMPLETED_NO),
+                    0);
 }
 
 CORBA::Boolean
 CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out
                                           ACE_ENV_ARG_DECL)
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
+                                         CORBA::COMPLETED_NO),
+                    0);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index 37decb84104..662f1471ab8 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -118,7 +118,7 @@ namespace CORBA
                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /// Throws CORBA::NO_IMPLEMENT.
-    CORBA::Policy_ptr _get_client_policy (CORBA::PolicyType type
+    CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type
                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /// Throws CORBA::NO_IMPLEMENT.
diff --git a/TAO/tao/LongDoubleSeq.pidl b/TAO/tao/LongDoubleSeq.pidl
index 0f9789c56ad..22284450c45 100644
--- a/TAO/tao/LongDoubleSeq.pidl
+++ b/TAO/tao/LongDoubleSeq.pidl
@@ -10,7 +10,7 @@
  *     tao_idl
  *        -o orig -Ge 1 -Sc -GT -GA
  *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
+ *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          LongDoubleSeq.pidl
diff --git a/TAO/tao/LongDoubleSeqA.cpp b/TAO/tao/LongDoubleSeqA.cpp
index 9f3ef9f85f8..77596ff4c78 100644
--- a/TAO/tao/LongDoubleSeqA.cpp
+++ b/TAO/tao/LongDoubleSeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "LongDoubleSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_LongDoubleSeq[] =
 {
@@ -64,7 +66,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_LongDoubleSeq (
     sizeof (_oc_CORBA_LongDoubleSeq),
     (char *) &_oc_CORBA_LongDoubleSeq,
     0,
-    sizeof (CORBA::LongDoubleSeq)
+    0
   );
 
 namespace CORBA
@@ -74,7 +76,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -131,8 +133,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -147,5 +147,4 @@ CORBA::Boolean operator>>= (
         CORBA::LongDoubleSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp
index 52273dc6abb..df01e61cbed 100644
--- a/TAO/tao/LongDoubleSeqC.cpp
+++ b/TAO/tao/LongDoubleSeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "LongDoubleSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "LongDoubleSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_LONGDOUBLESEQ_CS_)
 #define _CORBA_LONGDOUBLESEQ_CS_
@@ -104,7 +103,7 @@ void CORBA::LongDoubleSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_
 #define _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h
index a555dd14de4..af02dd9db76 100644
--- a/TAO/tao/LongDoubleSeqC.h
+++ b/TAO/tao/LongDoubleSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_LONGDOUBLESEQC_H_
 #define _TAO_IDL_ORIG_LONGDOUBLESEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -59,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LONGDOUBLESEQ_CH_)
 #define _CORBA_LONGDOUBLESEQ_CH_
@@ -124,17 +123,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LongDoubleSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -142,7 +141,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongDoubleSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::LongDoubleSeq*); // noncopying version
@@ -150,7 +149,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongDoubleSeq
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongDoubleSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_LongDoubleSeq_H_
 #define _TAO_CDR_OP_CORBA_LongDoubleSeq_H_
@@ -167,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "LongDoubleSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -185,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/LongDoubleSeqS.h b/TAO/tao/LongDoubleSeqS.h
index 29768eca1fc..e032c4dcd9f 100644
--- a/TAO/tao/LongDoubleSeqS.h
+++ b/TAO/tao/LongDoubleSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_LONGDOUBLESEQS_H_
 #define _TAO_IDL_ORIG_LONGDOUBLESEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/LongLongSeq.pidl b/TAO/tao/LongLongSeq.pidl
index 18af58777e1..e064493d460 100644
--- a/TAO/tao/LongLongSeq.pidl
+++ b/TAO/tao/LongLongSeq.pidl
@@ -10,7 +10,7 @@
  *     tao_idl
  *        -o orig -Ge 1 -Sc -GT -GA
  *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
+ *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          LongLongSeq.pidl
diff --git a/TAO/tao/LongLongSeqA.cpp b/TAO/tao/LongLongSeqA.cpp
index 5b9963c7262..45498030c5f 100644
--- a/TAO/tao/LongLongSeqA.cpp
+++ b/TAO/tao/LongLongSeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "LongLongSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_LongLongSeq[] =
 {
@@ -63,7 +65,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_LongLongSeq (
     sizeof (_oc_CORBA_LongLongSeq),
     (char *) &_oc_CORBA_LongLongSeq,
     0,
-    sizeof (CORBA::LongLongSeq)
+    0
   );
 
 namespace CORBA
@@ -73,7 +75,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -130,8 +132,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -146,5 +146,4 @@ CORBA::Boolean operator>>= (
         CORBA::LongLongSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp
index 500fe02c505..1756c99a188 100644
--- a/TAO/tao/LongLongSeqC.cpp
+++ b/TAO/tao/LongLongSeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "LongLongSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "LongLongSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_LONGLONGSEQ_CS_)
 #define _CORBA_LONGLONGSEQ_CS_
@@ -104,7 +103,7 @@ void CORBA::LongLongSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_LongLongSeq_CPP_
 #define _TAO_CDR_OP_CORBA_LongLongSeq_CPP_
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h
index bf9d6055156..d7270bee161 100644
--- a/TAO/tao/LongLongSeqC.h
+++ b/TAO/tao/LongLongSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_LONGLONGSEQC_H_
 #define _TAO_IDL_ORIG_LONGLONGSEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -59,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LONGLONGSEQ_CH_)
 #define _CORBA_LONGLONGSEQ_CH_
@@ -124,17 +123,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LongLongSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -142,7 +141,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongLongSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::LongLongSeq*); // noncopying version
@@ -150,7 +149,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongLongSeq *&
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongLongSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_LongLongSeq_H_
 #define _TAO_CDR_OP_CORBA_LongLongSeq_H_
@@ -167,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "LongLongSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -185,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/LongLongSeqS.h b/TAO/tao/LongLongSeqS.h
index b8a5f3235e1..ae0dc2c662b 100644
--- a/TAO/tao/LongLongSeqS.h
+++ b/TAO/tao/LongLongSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_LONGLONGSEQS_H_
 #define _TAO_IDL_ORIG_LONGLONGSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/LongSeqA.cpp b/TAO/tao/LongSeqA.cpp
index 463952ccacb..61b8f0ce399 100644
--- a/TAO/tao/LongSeqA.cpp
+++ b/TAO/tao/LongSeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "LongSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_LongSeq[] =
 {
@@ -61,7 +63,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_LongSeq (
     sizeof (_oc_CORBA_LongSeq),
     (char *) &_oc_CORBA_LongSeq,
     0,
-    sizeof (CORBA::LongSeq)
+    0
   );
 
 namespace CORBA
@@ -71,7 +73,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -128,8 +130,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -144,5 +144,4 @@ CORBA::Boolean operator>>= (
         CORBA::LongSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp
index 8e0bb5d1a7a..4773d1f8cc6 100644
--- a/TAO/tao/LongSeqC.cpp
+++ b/TAO/tao/LongSeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "LongSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "LongSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_LONGSEQ_CS_)
 #define _CORBA_LONGSEQ_CS_
@@ -104,7 +103,7 @@ void CORBA::LongSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_LongSeq_CPP_
 #define _TAO_CDR_OP_CORBA_LongSeq_CPP_
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h
index 9d6d9f5f562..3ad6d008478 100644
--- a/TAO/tao/LongSeqC.h
+++ b/TAO/tao/LongSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_LONGSEQC_H_
 #define _TAO_IDL_ORIG_LONGSEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -59,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LONGSEQ_CH_)
 #define _CORBA_LONGSEQ_CH_
@@ -124,17 +123,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LongSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -142,7 +141,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::LongSeq*); // noncopying version
@@ -150,7 +149,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongSeq *&); /
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_LongSeq_H_
 #define _TAO_CDR_OP_CORBA_LongSeq_H_
@@ -167,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_LongSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
 #include "LongSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -185,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/LongSeqC.inl b/TAO/tao/LongSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/LongSeqC.inl
+++ b/TAO/tao/LongSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/LongSeqS.h b/TAO/tao/LongSeqS.h
index fba787dde8d..e4851fe42df 100644
--- a/TAO/tao/LongSeqS.h
+++ b/TAO/tao/LongSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_LONGSEQS_H_
 #define _TAO_IDL_ORIG_LONGSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index a7fdce409fd..ced53950c3d 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -1,19 +1,42 @@
+##  Process this file with automake to create Makefile.in
+##
 ## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc
 
 includedir = @includedir@/tao
+pkgconfigdatadir = @libdir@/pkgconfig
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+pkgconfigdata_DATA =
+lib_LTLIBRARIES =
+
+## Makefile.TAO.am
 
-## Makefile.TAO.am 
+lib_LTLIBRARIES += libTAO.la
+
+libTAO_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_BUILD_DLL
 
-ORB_Core = \
+libTAO_la_SOURCES = \
   Abstract_Servant_Base.cpp \
+  Acceptor_Filter.cpp \
+  Acceptor_Registry.cpp \
   Adapter.cpp \
+  Adapter_Factory.cpp \
+  Adapter_Registry.cpp \
   Any.cpp \
   AnySeqA.cpp \
   AnySeqC.cpp \
@@ -57,7 +80,9 @@ ORB_Core = \
   Collocated_Invocation.cpp \
   Collocation_Resolver.cpp \
   Connect_Strategy.cpp \
+  Connection_Handler.cpp \
   Connection_Purging_Strategy.cpp \
+  Connector_Registry.cpp \
   CurrentA.cpp \
   CurrentC.cpp \
   DLL_Parser.cpp \
@@ -76,6 +101,7 @@ ORB_Core = \
   Dynamic_ParameterA.cpp \
   Dynamic_ParameterC.cpp \
   Encodable.cpp \
+  Endpoint.cpp \
   Endpoint_Selector_Factory.cpp \
   Environment.cpp \
   Exception.cpp \
@@ -87,7 +113,31 @@ ORB_Core = \
   Flushing_Strategy.cpp \
   GIOPA.cpp \
   GIOPC.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_Lite.cpp \
+  GIOP_Message_Locate_Header.cpp \
+  GIOP_Message_State.cpp \
+  GIOP_Message_Version.cpp \
+  GIOP_Utils.cpp \
+  GUIResource_Factory.cpp \
   IFR_Client_Adapter.cpp \
+  IIOPA.cpp \
+  IIOPC.cpp \
+  IIOP_Acceptor.cpp \
+  IIOP_Connection_Handler.cpp \
+  IIOP_Connector.cpp \
+  IIOP_Endpoint.cpp \
+  IIOP_EndpointsA.cpp \
+  IIOP_EndpointsC.cpp \
+  IIOP_Factory.cpp \
+  IIOP_Lite_Factory.cpp \
+  IIOP_Profile.cpp \
+  IIOP_Transport.cpp \
   IOPC.cpp \
   IOP_CodecA.cpp \
   IOP_CodecC.cpp \
@@ -96,6 +146,7 @@ ORB_Core = \
   IORInterceptor_Adapter.cpp \
   IORInterceptor_Adapter_Factory.cpp \
   IOR_Parser.cpp \
+  Incoming_Message_Queue.cpp \
   Interceptor_List.cpp \
   Invocation_Adapter.cpp \
   Invocation_Base.cpp \
@@ -125,6 +176,8 @@ ORB_Core = \
   LongSeqC.cpp \
   MCAST_Parser.cpp \
   MProfile.cpp \
+  Managed_Types.cpp \
+  Marshal.cpp \
   Messaging_PolicyValueC.cpp \
   Messaging_SyncScopeC.cpp \
   Muxed_TMS.cpp \
@@ -136,6 +189,7 @@ ORB_Core = \
   ORB_Core_Auto_Ptr.cpp \
   ORB_Table.cpp \
   Object.cpp \
+  ObjectIdListA.cpp \
   ObjectIdListC.cpp \
   ObjectKey_Table.cpp \
   Object_KeyC.cpp \
@@ -149,8 +203,10 @@ ORB_Core = \
   PICurrent_Copy_Callback.cpp \
   PICurrent_ORBInitializer.cpp \
   PI_ForwardC.cpp \
-  ParameterMode.cpp \
+  ParameterModeC.cpp \
   Parser_Registry.cpp \
+  Pluggable_Messaging.cpp \
+  Pluggable_Messaging_Utils.cpp \
   PolicyA.cpp \
   PolicyC.cpp \
   PolicyFactory_Registry.cpp \
@@ -164,7 +220,9 @@ ORB_Core = \
   PortableInterceptorC.cpp \
   PredefinedType_Seq_Tmplinst.cpp \
   Principal.cpp \
+  Profile.cpp \
   Profile_Transport_Resolver.cpp \
+  Protocol_Factory.cpp \
   Protocols_Hooks.cpp \
   Queued_Message.cpp \
   Reactive_Connect_Strategy.cpp \
@@ -176,6 +234,7 @@ ORB_Core = \
   RequestInfo_Util.cpp \
   Request_Dispatcher.cpp \
   Resource_Factory.cpp \
+  Resume_Handle.cpp \
   Sequence.cpp \
   Server_Strategy_Factory.cpp \
   Service_Callbacks.cpp \
@@ -202,17 +261,23 @@ ORB_Core = \
   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 \
   TimeBaseA.cpp \
   TimeBaseC.cpp \
+  Transport.cpp \
+  Transport_Acceptor.cpp \
   Transport_Cache_Manager.cpp \
+  Transport_Connector.cpp \
   Transport_Descriptor_Interface.cpp \
   Transport_Mux_Strategy.cpp \
   Transport_Timer.cpp \
   TypeCodeFactory_Adapter.cpp \
   Typecode.cpp \
   Typecode_Constants.cpp \
+  Typecode_typesC.cpp \
   ULongLongSeqA.cpp \
   ULongLongSeqC.cpp \
   ULongSeqA.cpp \
@@ -234,85 +299,17 @@ ORB_Core = \
   Wait_Strategy.cpp \
   WrongTransactionA.cpp \
   WrongTransactionC.cpp \
+  append.cpp \
   debug.cpp \
-  operation_details.cpp \
-  params.cpp
-
-Pluggable_Protocols = \
-  Acceptor_Filter.cpp \
-  Acceptor_Registry.cpp \
-  Connection_Handler.cpp \
-  Connector_Registry.cpp \
-  Endpoint.cpp \
-  IIOPA.cpp \
-  IIOPC.cpp \
-  IIOP_Acceptor.cpp \
-  IIOP_Connection_Handler.cpp \
-  IIOP_Connector.cpp \
-  IIOP_Endpoint.cpp \
-  IIOP_EndpointsA.cpp \
-  IIOP_EndpointsC.cpp \
-  IIOP_Factory.cpp \
-  IIOP_Lite_Factory.cpp \
-  IIOP_Profile.cpp \
-  IIOP_Transport.cpp \
-  Incoming_Message_Queue.cpp \
-  Profile.cpp \
-  Protocol_Factory.cpp \
-  Resume_Handle.cpp \
-  Thread_Per_Connection_Handler.cpp \
-  Transport.cpp \
-  Transport_Acceptor.cpp \
-  Transport_Connector.cpp
-
-Pluggable_Messaging = \
-  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_Lite.cpp \
-  GIOP_Message_Locate_Header.cpp \
-  GIOP_Message_State.cpp \
-  GIOP_Message_Version.cpp \
-  GIOP_Utils.cpp \
-  Pluggable_Messaging.cpp \
-  Pluggable_Messaging_Utils.cpp \
-  Tagged_Profile.cpp \
-  target_specification.cpp
-
-Default_Resources = \
   default_client.cpp \
   default_resource.cpp \
   default_server.cpp \
-  qt_resource.cpp \
-  xt_resource.cpp
-
-Interpretive_Marshaling = \
-  Marshal.cpp \
-  append.cpp \
-  skip.cpp
-
-IDL_Compiler = \
-  Managed_Types.cpp
-
-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 = \
-  $(ORB_Core) \
-  $(Pluggable_Protocols) \
-  $(Pluggable_Messaging) \
-  $(Default_Resources) \
-  $(Interpretive_Marshaling) \
-  $(IDL_Compiler)
+  operation_details.cpp \
+  orb_typesA.cpp \
+  orb_typesC.cpp \
+  params.cpp \
+  skip.cpp \
+  target_specification.cpp
 
 libTAO_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
@@ -323,107 +320,192 @@ libTAO_la_LIBADD = \
 nobase_include_HEADERS = \
   Abstract_Servant_Base.h \
   Acceptor_Filter.h \
+  Acceptor_Impl.cpp \
   Acceptor_Impl.h \
   Acceptor_Registry.h \
+  Acceptor_Registry.i \
   Adapter.h \
+  Adapter_Factory.h \
+  Adapter_Registry.h \
   Allocator.h \
   Any.h \
+  Any.i \
+  AnySeq.pidl \
   AnySeqC.h \
+  AnySeqC.inl \
   AnySeqS.h \
+  Any_Arg_Traits.h \
+  Any_Array_Impl_T.cpp \
   Any_Array_Impl_T.h \
+  Any_Array_Impl_T.inl \
   Any_Basic_Impl.h \
+  Any_Basic_Impl_T.cpp \
   Any_Basic_Impl_T.h \
+  Any_Basic_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
   Any_Impl.h \
+  Any_Impl_T.cpp \
   Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Special_Impl_T.cpp \
   Any_Special_Impl_T.h \
+  Any_Special_Impl_T.inl \
   Any_SystemException.h \
   Any_Unknown_IDL_Type.h \
   Arg_Traits_T.h \
   Argument.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.i \
   Auto_Functor.h \
+  BD_String_Argument_T.cpp \
   BD_String_Argument_T.h \
+  BD_String_Argument_T.inl \
+  BD_String_SArgument_T.cpp \
   BD_String_SArgument_T.h \
+  BD_String_SArgument_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_SArgument_T.cpp \
   Basic_SArgument_T.h \
+  Basic_SArgument_T.inl \
   Basic_SArguments.h \
   Basic_Types.h \
   BiDir_Adapter.h \
   Bind_Dispatcher_Guard.h \
+  Bind_Dispatcher_Guard.i \
   Block_Flushing_Strategy.h \
   Blocked_Connect_Strategy.h \
+  BooleanSeq.pidl \
   BooleanSeqC.h \
+  BooleanSeqC.inl \
   BooleanSeqS.h \
+  Bounds.pidl \
   BoundsC.h \
+  BoundsC.inl \
+  Buffer_Allocator_T.cpp \
   Buffer_Allocator_T.h \
   Buffering_Constraint_Policy.h \
+  Buffering_Constraint_Policy.i \
   CDR.h \
+  CDR.i \
   CDR_Encaps_Codec.h \
+  CONV_FRAME.pidl \
   CONV_FRAMEC.h \
+  CONV_FRAMEC.inl \
   CONV_FRAMES.h \
   CONV_FRAMES_T.h \
   CORBALOC_Parser.h \
+  CORBALOC_Parser.i \
   CORBANAME_Parser.h \
+  CORBANAME_Parser.i \
   CORBA_String.h \
+  CORBA_String.inl \
   CORBA_methods.h \
   Cache_Entries.h \
+  Cache_Entries.inl \
+  CharSeq.pidl \
   CharSeqC.h \
+  CharSeqC.inl \
   CharSeqS.h \
   Cleanup_Func_Registry.h \
+  Cleanup_Func_Registry.inl \
   ClientRequestInfo.h \
+  ClientRequestInfo.inl \
   ClientRequestInfo_i.h \
+  ClientRequestInfo_i.inl \
   ClientRequestInterceptor_Adapter.h \
+  ClientRequestInterceptor_Adapter.inl \
   Client_Strategy_Factory.h \
   CodecFactory.h \
   CodecFactory_ORBInitializer.h \
   Codeset_Manager.h \
   Codeset_Translator_Factory.h \
+  Codeset_Translator_Factory_T.cpp \
   Codeset_Translator_Factory_T.h \
   Collocated_Invocation.h \
   Collocation_Proxy_Broker.h \
   Collocation_Resolver.h \
   Collocation_Strategy.h \
+  Condition.cpp \
   Condition.h \
+  Condition.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.i \
+  Current.pidl \
   CurrentC.h \
+  CurrentC.inl \
   DLL_Parser.h \
+  DLL_Parser.i \
   Default_Collocation_Resolver.h \
   Default_Endpoint_Selector_Factory.h \
   Default_Protocols_Hooks.h \
   Default_Stub_Factory.h \
   Default_Thread_Lane_Resources_Manager.h \
+  Domain.pidl \
   DomainC.h \
+  DomainC.inl \
+  DoubleSeq.pidl \
   DoubleSeqC.h \
+  DoubleSeqC.inl \
   DoubleSeqS.h \
+  Dynamic.pidl \
   DynamicC.h \
+  DynamicC.inl \
   Dynamic_Adapter.h \
+  Dynamic_Parameter.pidl \
   Dynamic_ParameterC.h \
+  Dynamic_ParameterC.inl \
   Encodable.h \
   Endpoint.h \
+  Endpoint.i \
   Endpoint_Selector_Factory.h \
   Environment.h \
+  Environment.i \
   Exception.h \
+  Exception.i \
   Exception_Data.h \
   Exclusive_TMS.h \
   FILE_Parser.h \
+  FILE_Parser.i \
   Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Fixed_Array_Argument_T.cpp \
   Fixed_Array_Argument_T.h \
+  Fixed_Array_Argument_T.inl \
+  Fixed_Array_SArgument_T.cpp \
   Fixed_Array_SArgument_T.h \
+  Fixed_Array_SArgument_T.inl \
+  Fixed_Size_Argument_T.cpp \
   Fixed_Size_Argument_T.h \
+  Fixed_Size_Argument_T.inl \
+  Fixed_Size_SArgument_T.cpp \
   Fixed_Size_SArgument_T.h \
+  Fixed_Size_SArgument_T.inl \
+  FloatSeq.pidl \
   FloatSeqC.h \
+  FloatSeqC.inl \
   FloatSeqS.h \
   Flushing_Strategy.h \
+  GIOP.pidl \
   GIOPC.h \
+  GIOPC.inl \
   GIOPS.h \
   GIOPS_T.h \
   GIOP_Message_Base.h \
@@ -432,214 +514,376 @@ nobase_include_HEADERS = \
   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_Lite.h \
   GIOP_Message_Locate_Header.h \
+  GIOP_Message_Locate_Header.i \
   GIOP_Message_State.h \
+  GIOP_Message_State.inl \
   GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
   GIOP_Utils.h \
+  GUIResource_Factory.h \
   IFR_Client_Adapter.h \
+  IIOP.pidl \
   IIOPC.h \
+  IIOPC.inl \
   IIOP_Acceptor.h \
+  IIOP_Acceptor.i \
   IIOP_Connection_Handler.h \
   IIOP_Connector.h \
   IIOP_Endpoint.h \
+  IIOP_Endpoint.i \
+  IIOP_Endpoints.pidl \
   IIOP_EndpointsC.h \
+  IIOP_EndpointsC.inl \
   IIOP_Factory.h \
   IIOP_Lite_Factory.h \
   IIOP_Profile.h \
   IIOP_Transport.h \
+  IOP.pidl \
   IOPC.h \
+  IOPC.inl \
   IOPS.h \
   IOPS_T.h \
+  IOP_Codec.pidl \
   IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOP_IOR.pidl \
   IOP_IORC.h \
+  IOP_IORC.i \
   IORInterceptor_Adapter.h \
   IORInterceptor_Adapter_Factory.h \
   IOR_Parser.h \
   Incoming_Message_Queue.h \
+  Incoming_Message_Queue.inl \
   Interceptor_List.h \
+  Interceptor_List.inl \
+  InterfaceDef.pidl \
+  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_Strategy.h \
   LF_Strategy_Complete.h \
+  LF_Strategy_Complete.inl \
   LRU_Connection_Purging_Strategy.h \
   Leader_Follower.h \
+  Leader_Follower.i \
   Leader_Follower_Flushing_Strategy.h \
   LocalObject.h \
+  LocalObject.i \
   LocateRequest_Invocation.h \
   LocateRequest_Invocation_Adapter.h \
+  LongDoubleSeq.pidl \
   LongDoubleSeqC.h \
+  LongDoubleSeqC.inl \
   LongDoubleSeqS.h \
+  LongLongSeq.pidl \
   LongLongSeqC.h \
+  LongLongSeqC.inl \
   LongLongSeqS.h \
+  LongSeq.pidl \
   LongSeqC.h \
+  LongSeqC.inl \
   LongSeqS.h \
   MCAST_Parser.h \
+  MCAST_Parser.i \
   MProfile.h \
+  MProfile.i \
   Managed_Types.h \
+  Managed_Types.i \
   Marshal.h \
+  Marshal.i \
+  Messaging_PolicyValue.pidl \
   Messaging_PolicyValueC.h \
+  Messaging_PolicyValueC.inl \
+  Messaging_SyncScope.pidl \
   Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.inl \
   Muxed_TMS.h \
   NVList.h \
+  NVList.i \
   New_Leader_Generator.h \
   OBV_Constants.h \
   ORB.h \
+  ORB.i \
   ORBInitInfo.h \
+  ORBInitInfo.inl \
   ORBInitializer_Registry.h \
   ORB_Constants.h \
   ORB_Core.h \
+  ORB_Core.i \
   ORB_Core_Auto_Ptr.h \
+  ORB_Core_Auto_Ptr.inl \
   ORB_Table.h \
+  ORB_Table.inl \
   Object.h \
+  Object.i \
+  ObjectIdList.pidl \
   ObjectIdListC.h \
+  ObjectIdListC.inl \
   ObjectKey_Table.h \
+  Object_Argument_T.cpp \
   Object_Argument_T.h \
+  Object_Argument_T.inl \
+  Object_Key.pidl \
   Object_KeyC.h \
+  Object_KeyC.inl \
   Object_Loader.h \
   Object_Proxy_Broker.h \
   Object_Proxy_Impl.h \
   Object_Ref_Table.h \
+  Object_SArgument_T.cpp \
   Object_SArgument_T.h \
+  Object_SArgument_T.inl \
+  Object_T.cpp \
   Object_T.h \
+  Objref_VarOut_T.cpp \
   Objref_VarOut_T.h \
+  OctetSeq.pidl \
   OctetSeqC.h \
+  OctetSeqC.inl \
   OctetSeqS.h \
   PICurrent.h \
+  PICurrent.inl \
   PICurrent_Copy_Callback.h \
   PICurrent_ORBInitializer.h \
+  PI_Forward.pidl \
   PI_ForwardC.h \
-  ParameterMode.h \
+  PI_ForwardC.inl \
+  ParameterMode.pidl \
+  ParameterModeC.h \
+  ParameterModeC.inl \
+  ParameterModeS.h \
   Parser_Registry.h \
+  Parser_Registry.i \
   Pluggable_Messaging.h \
   Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Policy.pidl \
   PolicyC.h \
+  PolicyC.inl \
   PolicyFactory_Registry.h \
   PolicyS.h \
+  Policy_Forward.pidl \
   Policy_ForwardC.h \
+  Policy_ForwardC.inl \
   Policy_Manager.h \
+  Policy_Manager.i \
   Policy_Set.h \
+  Policy_Set.i \
   Policy_Validator.h \
+  Pollable.pidl \
   PollableC.h \
+  PollableC.inl \
   PollableS.h \
   PollableS_T.h \
   PortableInterceptor.h \
+  PortableInterceptor.pidl \
   PortableInterceptorC.h \
+  PortableInterceptorC.inl \
   PortableInterceptorS.h \
   Principal.h \
+  Principal.i \
   Profile.h \
+  Profile.i \
   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_Message.h \
+  Queued_Message.inl \
   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.i \
   RequestInfo_Util.h \
   Request_Dispatcher.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.h \
+  Sequence.i \
+  Sequence_T.cpp \
   Sequence_T.h \
+  Sequence_T.i \
   Server_Strategy_Factory.h \
   Service_Callbacks.h \
   Service_Context.h \
+  Service_Context.inl \
+  Services.pidl \
   ServicesC.h \
+  ServicesC.inl \
   ServicesS.h \
   ServicesS_T.h \
   Services_Activate.h \
+  ShortSeq.pidl \
   ShortSeqC.h \
+  ShortSeqC.inl \
   ShortSeqS.h \
+  Special_Basic_Argument_T.cpp \
   Special_Basic_Argument_T.h \
+  Special_Basic_Argument_T.inl \
   Special_Basic_Arguments.h \
+  Special_Basic_SArgument_T.cpp \
   Special_Basic_SArgument_T.h \
+  Special_Basic_SArgument_T.inl \
   Special_Basic_SArguments.h \
+  StringSeq.pidl \
   StringSeqC.h \
+  StringSeqC.inl \
   StringSeqS.h \
   Stub.h \
+  Stub.i \
   Stub_Factory.h \
   Sync_Strategies.h \
   Synch_Invocation.h \
+  Synch_Invocation.inl \
   Synch_Queued_Message.h \
   Synch_Refcountable.h \
+  Synch_Refcountable.inl \
   Synch_Reply_Dispatcher.h \
   SystemException.h \
+  SystemException.inl \
+  TAO.pidl \
   TAOC.h \
+  TAOC.inl \
   TAOS.h \
   TAOS_T.h \
   TAO_Export.h \
   TAO_Internal.h \
   TAO_Server_Request.h \
+  TAO_Server_Request.i \
+  TAO_Singleton.cpp \
   TAO_Singleton.h \
+  TAO_Singleton.inl \
   TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
   TC_Constants_Forward.h \
   TSS_Resources.h \
   Tagged_Components.h \
+  Tagged_Components.i \
   Tagged_Profile.h \
+  Tagged_Profile.i \
   Thread_Lane_Resources.h \
   Thread_Lane_Resources_Manager.h \
   Thread_Per_Connection_Handler.h \
+  TimeBase.pidl \
   TimeBaseC.h \
+  TimeBaseC.inl \
   TimeBaseS.h \
   TimeBaseS_T.h \
   Timeprobe.h \
   Transport.h \
+  Transport.inl \
   Transport_Acceptor.h \
+  Transport_Acceptor.inl \
   Transport_Cache_Manager.h \
+  Transport_Cache_Manager.inl \
   Transport_Connector.h \
+  Transport_Connector.inl \
   Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
   Transport_Mux_Strategy.h \
   Transport_Timer.h \
   TypeCodeFactory_Adapter.h \
   Typecode.h \
+  Typecode.i \
   Typecode_Constants.h \
+  Typecode_types.pidl \
+  Typecode_typesC.h \
+  Typecode_typesC.inl \
+  Typecode_typesS.h \
+  UB_String_Argument_T.cpp \
   UB_String_Argument_T.h \
+  UB_String_Argument_T.inl \
   UB_String_Arguments.h \
+  UB_String_SArgument_T.cpp \
   UB_String_SArgument_T.h \
+  UB_String_SArgument_T.inl \
   UB_String_SArguments.h \
+  ULongLongSeq.pidl \
   ULongLongSeqC.h \
+  ULongLongSeqC.inl \
   ULongLongSeqS.h \
+  ULongSeq.pidl \
   ULongSeqC.h \
+  ULongSeqC.inl \
   ULongSeqS.h \
+  UShortSeq.pidl \
   UShortSeqC.h \
+  UShortSeqC.inl \
   UShortSeqS.h \
   UTF16_BOM_Factory.h \
   UTF16_BOM_Translator.h \
   UserException.h \
+  UserException.inl \
   Valuetype_Adapter.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_Array_SArgument_T.cpp \
   Var_Array_SArgument_T.h \
+  Var_Array_SArgument_T.inl \
+  Var_Size_Argument_T.cpp \
   Var_Size_Argument_T.h \
+  Var_Size_Argument_T.inl \
+  Var_Size_SArgument_T.cpp \
   Var_Size_SArgument_T.h \
+  Var_Size_SArgument_T.inl \
   Version.h \
+  WCharSeq.pidl \
   WCharSeqC.h \
+  WCharSeqC.inl \
   WCharSeqS.h \
+  WStringSeq.pidl \
   WStringSeqC.h \
+  WStringSeqC.inl \
   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 \
+  WrongTransactionC.inl \
   corba.h \
   corbafwd.h \
   debug.h \
@@ -650,312 +894,30 @@ nobase_include_HEADERS = \
   default_server.h \
   objectid.h \
   operation_details.h \
+  operation_details.i \
+  orb.idl \
+  orb_types.pidl \
+  orb_typesC.h \
+  orb_typesC.inl \
+  orb_typesS.h \
   orbconf.h \
   params.h \
-  qt_resource.h \
-  target_specification.h \
-  varbase.h \
-  xt_resource.h \
-  Acceptor_Filter.i \
-  Acceptor_Impl.i \
-  Acceptor_Registry.i \
-  Adapter.i \
-  Any.i \
-  AnySeqC.inl \
-  Any_Array_Impl_T.inl \
-  Any_Basic_Impl_T.inl \
-  Any_Dual_Impl_T.inl \
-  Any_Impl_T.inl \
-  Any_Special_Impl_T.inl \
-  Array_VarOut_T.inl \
-  Asynch_Reply_Dispatcher_Base.i \
-  BD_String_Argument_T.inl \
-  BD_String_SArgument_T.inl \
-  Base_Transport_Property.inl \
-  Basic_Argument_T.inl \
-  Basic_SArgument_T.inl \
-  Bind_Dispatcher_Guard.i \
-  BooleanSeqC.i \
-  BoundsC.i \
-  Buffering_Constraint_Policy.i \
-  CDR.i \
-  CONV_FRAMEC.i \
-  CONV_FRAMES.i \
-  CONV_FRAMES_T.i \
-  CORBALOC_Parser.i \
-  CORBANAME_Parser.i \
-  CORBA_String.inl \
-  Cache_Entries.inl \
-  CharSeqC.inl \
-  Cleanup_Func_Registry.inl \
-  ClientRequestInfo.inl \
-  ClientRequestInfo_i.inl \
-  ClientRequestInterceptor_Adapter.inl \
-  Collocation_Resolver.i \
-  Condition.inl \
-  Connection_Handler.inl \
-  Connection_Purging_Strategy.inl \
-  Connector_Impl.inl \
-  Connector_Registry.i \
-  CurrentC.i \
-  DLL_Parser.i \
-  Default_Collocation_Resolver.i \
-  Default_Protocols_Hooks.i \
-  Default_Thread_Lane_Resources_Manager.i \
-  DomainC.i \
-  DoubleSeqC.inl \
-  DynamicC.i \
-  Dynamic_ParameterC.i \
-  Endpoint.i \
-  Environment.i \
-  Exception.i \
-  FILE_Parser.i \
-  Fault_Tolerance_Service.i \
-  Fixed_Array_Argument_T.inl \
-  Fixed_Array_SArgument_T.inl \
-  Fixed_Size_Argument_T.inl \
-  Fixed_Size_SArgument_T.inl \
-  FloatSeqC.i \
-  GIOPC.i \
-  GIOPS.i \
-  GIOPS_T.i \
-  GIOP_Message_Base.i \
-  GIOP_Message_Generator_Parser.inl \
-  GIOP_Message_Generator_Parser_10.inl \
-  GIOP_Message_Generator_Parser_11.inl \
-  GIOP_Message_Generator_Parser_12.inl \
-  GIOP_Message_Generator_Parser_Impl.inl \
-  GIOP_Message_Lite.i \
-  GIOP_Message_Locate_Header.i \
-  GIOP_Message_State.inl \
-  GIOP_Message_Version.inl \
-  GIOP_Utils.i \
-  IIOPC.i \
-  IIOP_Acceptor.i \
-  IIOP_Connection_Handler.i \
-  IIOP_Endpoint.i \
-  IIOP_EndpointsC.i \
-  IIOP_Profile.i \
-  IIOP_Transport.i \
-  IOPC.i \
-  IOPS.i \
-  IOPS_T.i \
-  IOP_CodecC.i \
-  IOP_IORC.i \
-  IOR_Parser.i \
-  Incoming_Message_Queue.inl \
-  Interceptor_List.inl \
-  Invocation_Adapter.inl \
-  Invocation_Base.inl \
-  Invocation_Endpoint_Selectors.i \
-  LF_Event.inl \
-  LF_Event_Binder.inl \
-  LF_Event_Loop_Thread_Helper.inl \
-  LF_Follower.inl \
-  LF_Follower_Auto_Adder.inl \
-  LF_Follower_Auto_Ptr.inl \
-  LF_Invocation_Event.inl \
-  LF_Strategy.inl \
-  LF_Strategy_Complete.inl \
-  Leader_Follower.i \
-  LocalObject.i \
-  LongDoubleSeqC.inl \
-  LongLongSeqC.inl \
-  LongSeqC.inl \
-  MCAST_Parser.i \
-  MProfile.i \
-  Managed_Types.i \
-  Marshal.i \
-  Messaging_PolicyValueC.i \
-  Messaging_SyncScopeC.i \
-  NVList.i \
-  ORB.i \
-  ORBInitInfo.inl \
-  ORB_Core.i \
-  ORB_Core_Auto_Ptr.inl \
-  ORB_Table.inl \
-  Object.i \
-  ObjectIdListC.i \
-  Object_Argument_T.inl \
-  Object_KeyC.i \
-  Object_Loader.i \
-  Object_SArgument_T.inl \
-  Objref_VarOut_T.inl \
-  OctetSeqC.inl \
-  PICurrent.inl \
-  PI_ForwardC.inl \
-  Parser_Registry.i \
-  Pluggable_Messaging.i \
-  Pluggable_Messaging_Utils.i \
-  PolicyC.i \
-  Policy_ForwardC.i \
-  Policy_Manager.i \
-  Policy_Set.i \
-  PollableC.i \
-  PollableS.i \
-  PollableS_T.i \
-  PortableInterceptorC.i \
-  Principal.i \
-  Profile.i \
-  Profile_Transport_Resolver.inl \
-  Pseudo_VarOut_T.inl \
-  Queued_Message.inl \
-  Refcounted_ObjectKey.inl \
-  Reply_Dispatcher.i \
-  Resume_Handle.inl \
-  Seq_Out_T.inl \
-  Seq_Var_T.inl \
-  Sequence.i \
-  Sequence_T.i \
-  Service_Callbacks.i \
-  Service_Context.inl \
-  ServicesC.i \
-  ServicesS.i \
-  ServicesS_T.i \
-  ShortSeqC.i \
-  Special_Basic_Argument_T.inl \
-  Special_Basic_SArgument_T.inl \
-  StringSeqC.inl \
-  Stub.i \
-  Sync_Strategies.i \
-  Synch_Invocation.inl \
-  Synch_Refcountable.inl \
-  SystemException.inl \
-  TAOC.i \
-  TAOS.i \
-  TAOS_T.i \
-  TAO_Server_Request.i \
-  TAO_Singleton.inl \
-  TAO_Singleton_Manager.inl \
-  Tagged_Components.i \
-  Tagged_Profile.i \
-  Thread_Lane_Resources_Manager.i \
-  TimeBaseC.i \
-  TimeBaseS.i \
-  TimeBaseS_T.i \
-  Transport.inl \
-  Transport_Acceptor.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Connector.inl \
-  Transport_Descriptor_Interface.inl \
-  Typecode.i \
-  UB_String_Argument_T.inl \
-  UB_String_SArgument_T.inl \
-  ULongLongSeqC.inl \
-  ULongSeqC.i \
-  UShortSeqC.i \
-  UserException.inl \
-  VarOut_T.inl \
-  Var_Array_Argument_T.inl \
-  Var_Array_SArgument_T.inl \
-  Var_Size_Argument_T.inl \
-  Var_Size_SArgument_T.inl \
-  WCharSeqC.inl \
-  WStringSeqC.inl \
-  Wait_Strategy.inl \
-  WrongTransactionC.i \
-  corbafwd.i \
-  default_client.i \
-  default_resource.i \
-  default_server.i \
-  operation_details.i \
   params.i \
-  qt_resource.i \
+  target_specification.h \
   target_specification.i \
-  xt_resource.i \
-  Acceptor_Impl.cpp \
-  Any_Array_Impl_T.cpp \
-  Any_Basic_Impl_T.cpp \
-  Any_Dual_Impl_T.cpp \
-  Any_Impl_T.cpp \
-  Any_Special_Impl_T.cpp \
-  Array_VarOut_T.cpp \
-  BD_String_Argument_T.cpp \
-  BD_String_SArgument_T.cpp \
-  Basic_Argument_T.cpp \
-  Basic_SArgument_T.cpp \
-  Buffer_Allocator_T.cpp \
-  CONV_FRAMES_T.cpp \
-  Codeset_Translator_Factory_T.cpp \
-  Condition.cpp \
-  Connector_Impl.cpp \
-  Fixed_Array_Argument_T.cpp \
-  Fixed_Array_SArgument_T.cpp \
-  Fixed_Size_Argument_T.cpp \
-  Fixed_Size_SArgument_T.cpp \
-  GIOPS_T.cpp \
-  IOPS_T.cpp \
-  Object_Argument_T.cpp \
-  Object_SArgument_T.cpp \
-  Object_T.cpp \
-  Objref_VarOut_T.cpp \
-  PollableS_T.cpp \
-  Pseudo_VarOut_T.cpp \
-  Seq_Out_T.cpp \
-  Seq_Var_T.cpp \
-  Sequence_T.cpp \
-  ServicesS_T.cpp \
-  Special_Basic_Argument_T.cpp \
-  Special_Basic_SArgument_T.cpp \
-  TAOS_T.cpp \
-  TAO_Singleton.cpp \
-  TimeBaseS_T.cpp \
-  UB_String_Argument_T.cpp \
-  UB_String_SArgument_T.cpp \
-  VarOut_T.cpp \
-  Var_Array_Argument_T.cpp \
-  Var_Array_SArgument_T.cpp \
-  Var_Size_Argument_T.cpp \
-  Var_Size_SArgument_T.cpp \
-  orb.idl \
-  AnySeq.pidl \
-  BooleanSeq.pidl \
-  Bounds.pidl \
-  CONV_FRAME.pidl \
-  CharSeq.pidl \
-  Current.pidl \
-  Domain.pidl \
-  DoubleSeq.pidl \
-  Dynamic.pidl \
-  Dynamic_Parameter.pidl \
-  FloatSeq.pidl \
-  GIOP.pidl \
-  IIOP.pidl \
-  IIOP_Endpoints.pidl \
-  IOP.pidl \
-  IOP_Codec.pidl \
-  IOP_IOR.pidl \
-  InterfaceDef.pidl \
-  InvalidName.pidl \
-  LongDoubleSeq.pidl \
-  LongLongSeq.pidl \
-  LongSeq.pidl \
-  Messaging_PolicyValue.pidl \
-  Messaging_SyncScope.pidl \
-  ObjectIdList.pidl \
-  Object_Key.pidl \
-  OctetSeq.pidl \
-  PI_Forward.pidl \
-  Policy.pidl \
-  Policy_Forward.pidl \
-  Pollable.pidl \
-  PortableInterceptor.pidl \
-  Services.pidl \
-  ShortSeq.pidl \
-  StringSeq.pidl \
-  TAO.pidl \
-  TimeBase.pidl \
-  ULongLongSeq.pidl \
-  ULongSeq.pidl \
-  UShortSeq.pidl \
-  WCharSeq.pidl \
-  WStringSeq.pidl \
-  WrongTransaction.pidl
+  varbase.h
+
+pkgconfigdata_DATA += TAO.pc
+
+TAO.pc: ${top_builddir}/config.status ${srcdir}/TAO.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/TAO.pc.in
 
 EXTRA_DIST = \
+  TAO.pc.in \
   tao.rc
 
-## Makefile.BiDir_GIOP.am 
+
+## Makefile.BiDir_GIOP.am
 
 lib_LTLIBRARIES += libTAO_BiDirGIOP.la
 
@@ -983,20 +945,26 @@ libTAO_BiDirGIOP_la_LIBADD = \
 
 nobase_include_HEADERS += \
   BiDir_GIOP/BiDirGIOP.h \
+  BiDir_GIOP/BiDirPolicy.pidl \
   BiDir_GIOP/BiDirPolicyC.h \
+  BiDir_GIOP/BiDirPolicyC.inl \
   BiDir_GIOP/BiDirPolicy_Validator.h \
   BiDir_GIOP/BiDir_ORBInitializer.h \
   BiDir_GIOP/BiDir_PolicyFactory.h \
   BiDir_GIOP/BiDir_Policy_i.h \
-  BiDir_GIOP/bidirgiop_export.h \
-  BiDir_GIOP/BiDirPolicyC.i \
-  BiDir_GIOP/BiDir_Policy_i.inl \
-  BiDir_GIOP/BiDirPolicy.pidl
+  BiDir_GIOP/bidirgiop_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  BiDir_GIOP/TAO_BiDirGIOP.pc.in \
   BiDir_GIOP/TAO_BiDir_GIOP.rc
 
-## Makefile.PortableServer.am 
+
+## Makefile.PortableServer.am
 
 lib_LTLIBRARIES += libTAO_PortableServer.la
 
@@ -1013,16 +981,17 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/Default_Acceptor_Filter.cpp \
   PortableServer/Default_Policy_Validator.cpp \
   PortableServer/Default_Servant_Dispatcher.cpp \
-  PortableServer/ImR_LocatorC.cpp \
-  PortableServer/ImR_LocatorS.cpp \
+  PortableServer/ImplRepoA.cpp \
   PortableServer/ImplRepoC.cpp \
   PortableServer/ImplRepoS.cpp \
   PortableServer/ImplRepo_i.cpp \
   PortableServer/Key_Adapters.cpp \
+  PortableServer/Local_Servant_Base.cpp \
   PortableServer/ORB_Manager.cpp \
   PortableServer/ORT_Adapter.cpp \
   PortableServer/ORT_Adapter_Factory.cpp \
   PortableServer/Object_Adapter.cpp \
+  PortableServer/Object_Adapter_Factory.cpp \
   PortableServer/Operation_Table.cpp \
   PortableServer/PICurrent_Guard.cpp \
   PortableServer/POA.cpp \
@@ -1040,6 +1009,9 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/Servant_Base.cpp \
   PortableServer/Servant_Dispatcher.cpp \
   PortableServer/ServerInterceptorAdapter.cpp \
+  PortableServer/ServerObjectA.cpp \
+  PortableServer/ServerObjectC.cpp \
+  PortableServer/ServerObjectS.cpp \
   PortableServer/ServerRequestInfo.cpp
 
 libTAO_PortableServer_la_LDFLAGS = \
@@ -1051,69 +1023,81 @@ libTAO_PortableServer_la_LIBADD = \
 
 nobase_include_HEADERS += \
   PortableServer/Active_Object_Map.h \
+  PortableServer/Active_Object_Map.i \
   PortableServer/Collocated_Object_Proxy_Broker.h \
   PortableServer/Default_Acceptor_Filter.h \
   PortableServer/Default_Policy_Validator.h \
   PortableServer/Default_Servant_Dispatcher.h \
-  PortableServer/ImR_LocatorC.h \
-  PortableServer/ImR_LocatorS.h \
+  PortableServer/ImplRepo.pidl \
   PortableServer/ImplRepoC.h \
+  PortableServer/ImplRepoC.inl \
   PortableServer/ImplRepoS.h \
+  PortableServer/ImplRepoS.inl \
   PortableServer/ImplRepo_i.h \
   PortableServer/Key_Adapters.h \
+  PortableServer/Local_Servant_Base.h \
+  PortableServer/Local_Servant_Base.inl \
   PortableServer/ORB_Manager.h \
   PortableServer/ORT_Adapter.h \
   PortableServer/ORT_Adapter_Factory.h \
   PortableServer/Object_Adapter.h \
+  PortableServer/Object_Adapter.i \
+  PortableServer/Object_Adapter_Factory.h \
   PortableServer/Operation_Table.h \
   PortableServer/PICurrent_Guard.h \
   PortableServer/POA.h \
+  PortableServer/POA.i \
   PortableServer/POAManager.h \
+  PortableServer/POAManager.i \
   PortableServer/POA_Cached_Policies.h \
+  PortableServer/POA_Cached_Policies.i \
   PortableServer/POA_Policies.h \
   PortableServer/POA_Policy_Set.h \
+  PortableServer/POA_Policy_Set.i \
   PortableServer/PolicyS.h \
+  PortableServer/PolicyS.inl \
+  PortableServer/PolicyS_T.cpp \
   PortableServer/PolicyS_T.h \
+  PortableServer/PolicyS_T.inl \
   PortableServer/PortableGroup_Hooks.h \
   PortableServer/PortableServer.h \
+  PortableServer/PortableServer.pidl \
   PortableServer/PortableServerC.h \
+  PortableServer/PortableServerC.inl \
   PortableServer/PortableServerS.h \
   PortableServer/PortableServer_ORBInitializer.h \
   PortableServer/PortableServer_PolicyFactory.h \
+  PortableServer/PortableServer_include.pidl \
+  PortableServer/PortableServer_includeC.h \
+  PortableServer/PortableServer_includeS.h \
   PortableServer/Servant_Base.h \
+  PortableServer/Servant_Base.i \
   PortableServer/Servant_Dispatcher.h \
+  PortableServer/Servant_Location.h \
   PortableServer/ServerInterceptorAdapter.h \
+  PortableServer/ServerInterceptorAdapter.inl \
+  PortableServer/ServerObject.pidl \
+  PortableServer/ServerObjectC.h \
+  PortableServer/ServerObjectC.inl \
+  PortableServer/ServerObjectS.h \
+  PortableServer/ServerObjectS.inl \
   PortableServer/ServerRequestInfo.h \
+  PortableServer/ServerRequestInfo.inl \
   PortableServer/Upcall_Wrapper.h \
   PortableServer/poa_macros.h \
-  PortableServer/portableserver_export.h \
-  PortableServer/Active_Object_Map.i \
-  PortableServer/ImR_LocatorC.inl \
-  PortableServer/ImR_LocatorS.inl \
-  PortableServer/ImplRepoC.inl \
-  PortableServer/ImplRepoS.inl \
-  PortableServer/Key_Adapters.i \
-  PortableServer/Object_Adapter.i \
-  PortableServer/POA.i \
-  PortableServer/POAManager.i \
-  PortableServer/POA_Cached_Policies.i \
-  PortableServer/POA_Policies.i \
-  PortableServer/POA_Policy_Set.i \
-  PortableServer/PolicyS.inl \
-  PortableServer/PolicyS_T.inl \
-  PortableServer/PortableServerC.inl \
-  PortableServer/Servant_Base.i \
-  PortableServer/ServerInterceptorAdapter.inl \
-  PortableServer/ServerRequestInfo.inl \
-  PortableServer/PolicyS_T.cpp \
-  PortableServer/ImR_Locator.pidl \
-  PortableServer/ImplRepo.pidl \
-  PortableServer/PortableServer.pidl
+  PortableServer/portableserver_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  PortableServer/TAO_PortableServer.pc.in \
   PortableServer/TAO_PortableServer.rc
 
-## Makefile.IFR_Client.am 
+
+## Makefile.IFR_Client.am
 
 lib_LTLIBRARIES += libTAO_IFR_Client.la
 
@@ -1143,26 +1127,33 @@ libTAO_IFR_Client_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
+  IFR_Client/IFR_Base.pidl \
   IFR_Client/IFR_BaseC.h \
+  IFR_Client/IFR_BaseC.inl \
   IFR_Client/IFR_BaseS.h \
+  IFR_Client/IFR_Basic.pidl \
   IFR_Client/IFR_BasicC.h \
+  IFR_Client/IFR_BasicC.inl \
   IFR_Client/IFR_Client_Adapter_Impl.h \
+  IFR_Client/IFR_Components.pidl \
   IFR_Client/IFR_ComponentsC.h \
+  IFR_Client/IFR_ComponentsC.inl \
+  IFR_Client/IFR_Extended.pidl \
   IFR_Client/IFR_ExtendedC.h \
-  IFR_Client/ifr_client_export.h \
-  IFR_Client/IFR_BaseC.i \
-  IFR_Client/IFR_BasicC.i \
-  IFR_Client/IFR_ComponentsC.i \
-  IFR_Client/IFR_ExtendedC.i \
-  IFR_Client/IFR_Base.pidl \
-  IFR_Client/IFR_Basic.pidl \
-  IFR_Client/IFR_Components.pidl \
-  IFR_Client/IFR_Extended.pidl
+  IFR_Client/IFR_ExtendedC.inl \
+  IFR_Client/ifr_client_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  IFR_Client/TAO_IFR_Client.pc.in \
   IFR_Client/TAO_IFR_Client.rc
 
-## Makefile.Domain.am 
+
+## Makefile.Domain.am
 
 lib_LTLIBRARIES += libTAO_Domain.la
 
@@ -1187,16 +1178,23 @@ libTAO_Domain_la_LIBADD = \
 
 nobase_include_HEADERS += \
   Domain/DomainS.h \
-  Domain/DomainS_T.h \
-  Domain/domain_export.h \
   Domain/DomainS.i \
+  Domain/DomainS_T.cpp \
+  Domain/DomainS_T.h \
   Domain/DomainS_T.i \
-  Domain/DomainS_T.cpp
+  Domain/domain_export.h
+
+pkgconfigdata_DATA += TAO_Domain.pc
+
+TAO_Domain.pc: ${top_builddir}/config.status ${srcdir}/Domain/TAO_Domain.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/Domain/TAO_Domain.pc.in
 
 EXTRA_DIST += \
+  Domain/TAO_Domain.pc.in \
   Domain/TAO_Domain.rc
 
-## Makefile.DynamicAny.am 
+
+## Makefile.DynamicAny.am
 
 lib_LTLIBRARIES += libTAO_DynamicAny.la
 
@@ -1236,15 +1234,22 @@ nobase_include_HEADERS += \
   DynamicAny/DynStruct_i.h \
   DynamicAny/DynUnion_i.h \
   DynamicAny/DynamicAny.h \
+  DynamicAny/DynamicAny.pidl \
   DynamicAny/DynamicAnyC.h \
-  DynamicAny/dynamicany_export.h \
-  DynamicAny/DynamicAnyC.i \
-  DynamicAny/DynamicAny.pidl
+  DynamicAny/DynamicAnyC.inl \
+  DynamicAny/dynamicany_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  DynamicAny/TAO_DynamicAny.pc.in \
   DynamicAny/TAO_DynamicAny.rc
 
-## Makefile.Valuetype.am 
+
+## Makefile.Valuetype.am
 
 lib_LTLIBRARIES += libTAO_Valuetype.la
 
@@ -1273,30 +1278,34 @@ libTAO_Valuetype_la_LIBADD = \
 
 nobase_include_HEADERS += \
   Valuetype/AbstractBase.h \
+  Valuetype/AbstractBase.inl \
   Valuetype/AbstractBase_Invocation_Adapter.h \
+  Valuetype/AbstractBase_T.cpp \
   Valuetype/AbstractBase_T.h \
+  Valuetype/Sequence_T.cpp \
   Valuetype/Sequence_T.h \
+  Valuetype/Sequence_T.inl \
   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_Impl.h \
-  Valuetype/valuetype_export.h \
-  Valuetype/AbstractBase.inl \
-  Valuetype/Sequence_T.inl \
-  Valuetype/ValueBase.inl \
-  Valuetype/ValueFactory.inl \
-  Valuetype/ValueFactory_Map.inl \
-  Valuetype/Value_VarOut_T.inl \
-  Valuetype/AbstractBase_T.cpp \
-  Valuetype/Sequence_T.cpp \
-  Valuetype/Value_VarOut_T.cpp
+  Valuetype/valuetype_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  Valuetype/TAO_Valuetype.pc.in \
   Valuetype/TAO_Valuetype.rc
 
-## Makefile.Messaging.am 
+
+## Makefile.Messaging.am
 
 lib_LTLIBRARIES += libTAO_Messaging.la
 
@@ -1315,14 +1324,19 @@ libTAO_Messaging_la_SOURCES = \
   Messaging/Asynch_Timeout_Handler.cpp \
   Messaging/Connection_Timeout_Policy_i.cpp \
   Messaging/Messaging.cpp \
+  Messaging/MessagingA.cpp \
   Messaging/MessagingC.cpp \
   Messaging/MessagingS.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_RT_PolicyA.cpp \
   Messaging/Messaging_RT_PolicyC.cpp \
+  Messaging/Messaging_SyncScope_PolicyA.cpp \
   Messaging/Messaging_SyncScope_PolicyC.cpp \
+  Messaging/TAO_ExtA.cpp \
   Messaging/TAO_ExtC.cpp
 
 libTAO_Messaging_la_LDFLAGS = \
@@ -1338,43 +1352,50 @@ nobase_include_HEADERS += \
   Messaging/AMH_Response_Handler.h \
   Messaging/Asynch_Invocation.h \
   Messaging/Asynch_Invocation_Adapter.h \
+  Messaging/Asynch_Invocation_Adapter.inl \
   Messaging/Asynch_Reply_Dispatcher.h \
   Messaging/Asynch_Timeout_Handler.h \
   Messaging/Connection_Timeout_Policy_i.h \
   Messaging/Messaging.h \
+  Messaging/Messaging.pidl \
   Messaging/MessagingC.h \
+  Messaging/MessagingC.inl \
   Messaging/MessagingS.h \
+  Messaging/MessagingS.inl \
+  Messaging/MessagingS_T.cpp \
   Messaging/MessagingS_T.h \
+  Messaging/MessagingS_T.inl \
+  Messaging/Messaging_No_Impl.pidl \
   Messaging/Messaging_No_ImplC.h \
+  Messaging/Messaging_No_ImplC.inl \
   Messaging/Messaging_ORBInitializer.h \
   Messaging/Messaging_PolicyFactory.h \
   Messaging/Messaging_Policy_i.h \
-  Messaging/Messaging_RT_PolicyC.h \
-  Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/TAO_ExtC.h \
-  Messaging/messaging_export.h \
-  Messaging/Asynch_Invocation_Adapter.inl \
-  Messaging/Asynch_Reply_Dispatcher.i \
-  Messaging/MessagingC.i \
-  Messaging/MessagingS.i \
-  Messaging/MessagingS_T.i \
-  Messaging/Messaging_No_ImplC.i \
   Messaging/Messaging_Policy_i.i \
-  Messaging/Messaging_RT_PolicyC.i \
-  Messaging/Messaging_SyncScope_PolicyC.i \
-  Messaging/TAO_ExtC.i \
-  Messaging/MessagingS_T.cpp \
-  Messaging/Messaging.pidl \
-  Messaging/Messaging_No_Impl.pidl \
   Messaging/Messaging_RT_Policy.pidl \
+  Messaging/Messaging_RT_PolicyC.h \
+  Messaging/Messaging_RT_PolicyC.inl \
   Messaging/Messaging_SyncScope_Policy.pidl \
-  Messaging/TAO_Ext.pidl
+  Messaging/Messaging_SyncScope_PolicyC.h \
+  Messaging/Messaging_SyncScope_PolicyC.inl \
+  Messaging/TAO_Ext.pidl \
+  Messaging/TAO_ExtC.h \
+  Messaging/TAO_ExtC.inl \
+  Messaging/messaging_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  Messaging/TAO_Messaging.pc.in \
   Messaging/TAO_Messaging.rc
 
-## Makefile.DynamicInterface.am 
 
+## Makefile.DynamicInterface.am
+
+if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_DynamicInterface.la
@@ -1411,31 +1432,39 @@ libTAO_DynamicInterface_la_LIBADD = \
 
 nobase_include_HEADERS += \
   DynamicInterface/Context.h \
+  DynamicInterface/Context.inl \
   DynamicInterface/DII_Arguments.h \
+  DynamicInterface/DII_Arguments.inl \
   DynamicInterface/DII_CORBA_methods.h \
   DynamicInterface/DII_Invocation.h \
+  DynamicInterface/DII_Invocation.inl \
   DynamicInterface/DII_Invocation_Adapter.h \
   DynamicInterface/DII_Reply_Dispatcher.h \
   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 \
-  DynamicInterface/Context.inl \
-  DynamicInterface/DII_Arguments.inl \
-  DynamicInterface/DII_Invocation.inl \
-  DynamicInterface/ExceptionList.inl \
-  DynamicInterface/Request.inl \
-  DynamicInterface/Server_Request.inl
+  DynamicInterface/dynamicinterface_export.h
+
+pkgconfigdata_DATA += 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_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
+  DynamicInterface/TAO_DynamicInterface.pc.in \
   DynamicInterface/TAO_DynamicInterface.rc
 
-## Makefile.ObjRefTemplate.am 
+
+## Makefile.ObjRefTemplate.am
 
 lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
 
@@ -1447,9 +1476,11 @@ libTAO_ObjRefTemplate_la_CPPFLAGS = \
   -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/ObjectReferenceTemplateA.cpp \
   ObjRefTemplate/ObjectReferenceTemplateC.cpp \
   ObjRefTemplate/ObjectReferenceTemplate_i.cpp
 
@@ -1463,22 +1494,32 @@ libTAO_ObjRefTemplate_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
+  ObjRefTemplate/Default_ORT.pidl \
   ObjRefTemplate/Default_ORTC.h \
+  ObjRefTemplate/Default_ORTC.inl \
   ObjRefTemplate/ORT_Adapter_Factory_Impl.h \
   ObjRefTemplate/ORT_Adapter_Impl.h \
+  ObjRefTemplate/ObjectReferenceTemplate.h \
+  ObjRefTemplate/ObjectReferenceTemplate.pidl \
   ObjRefTemplate/ObjectReferenceTemplateC.h \
-  ObjRefTemplate/ObjectReferenceTemplate_i.h \
-  ObjRefTemplate/ort_export.h \
-  ObjRefTemplate/Default_ORTC.i \
   ObjRefTemplate/ObjectReferenceTemplateC.inl \
-  ObjRefTemplate/ObjectReferenceTemplate_i.inl \
-  ObjRefTemplate/Default_ORT.pidl \
-  ObjRefTemplate/ObjectReferenceTemplate.pidl
+  ObjRefTemplate/ObjectReferenceTemplate_i.h \
+  ObjRefTemplate/ObjectReferenceTemplate_include.pidl \
+  ObjRefTemplate/ObjectReferenceTemplate_includeC.h \
+  ObjRefTemplate/ObjectReferenceTemplate_includeS.h \
+  ObjRefTemplate/ort_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  ObjRefTemplate/TAO_ObjRefTemplate.pc.in \
   ObjRefTemplate/TAO_ObjRefTemplate.rc
 
-## Makefile.IORInterceptor.am 
+
+## Makefile.IORInterceptor.am
 
 lib_LTLIBRARIES += libTAO_IORInterceptor.la
 
@@ -1509,23 +1550,31 @@ libTAO_IORInterceptor_la_LIBADD = \
 
 nobase_include_HEADERS += \
   IORInterceptor/IORInfo.h \
+  IORInterceptor/IORInfo.inl \
+  IORInterceptor/IORInfo.pidl \
   IORInterceptor/IORInfoC.h \
+  IORInterceptor/IORInfoC.inl \
+  IORInterceptor/IORInterceptor.h \
+  IORInterceptor/IORInterceptor.pidl \
   IORInterceptor/IORInterceptorC.h \
+  IORInterceptor/IORInterceptorC.inl \
   IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
   IORInterceptor/IORInterceptor_Adapter_Impl.h \
   IORInterceptor/IORInterceptor_List.h \
-  IORInterceptor/iorinterceptor_export.h \
-  IORInterceptor/IORInfo.inl \
-  IORInterceptor/IORInfoC.inl \
-  IORInterceptor/IORInterceptorC.inl \
   IORInterceptor/IORInterceptor_List.inl \
-  IORInterceptor/IORInfo.pidl \
-  IORInterceptor/IORInterceptor.pidl
+  IORInterceptor/iorinterceptor_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  IORInterceptor/TAO_IORInterceptor.pc.in \
   IORInterceptor/TAO_IORInterceptor.rc
 
-## Makefile.IORManipulation.am 
+
+## Makefile.IORManipulation.am
 
 lib_LTLIBRARIES += libTAO_IORManip.la
 
@@ -1550,17 +1599,24 @@ libTAO_IORManip_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
+  IORManipulation/IOR.pidl \
   IORManipulation/IORC.h \
+  IORManipulation/IORC.i \
   IORManipulation/IORManip_Loader.h \
   IORManipulation/IORManipulation.h \
-  IORManipulation/ior_manip_export.h \
-  IORManipulation/IORC.i \
-  IORManipulation/IOR.pidl
+  IORManipulation/ior_manip_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  IORManipulation/TAO_IORManip.pc.in \
   IORManipulation/TAO_IORManip.rc
 
-## Makefile.IORTable.am 
+
+## Makefile.IORTable.am
 
 lib_LTLIBRARIES += libTAO_IORTable.la
 
@@ -1586,17 +1642,24 @@ libTAO_IORTable_la_LIBADD = \
 
 nobase_include_HEADERS += \
   IORTable/IORTable.h \
+  IORTable/IORTable.pidl \
   IORTable/IORTableC.h \
+  IORTable/IORTableC.i \
   IORTable/IOR_Table_Impl.h \
   IORTable/Table_Adapter.h \
-  IORTable/iortable_export.h \
-  IORTable/IORTableC.i \
-  IORTable/IORTable.pidl
+  IORTable/iortable_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  IORTable/TAO_IORTable.pc.in \
   IORTable/TAO_IORTable.rc
 
-## Makefile.RTCORBA.am 
+
+## Makefile.RTCORBA.am
 
 if BUILD_RT_CORBA
 
@@ -1654,10 +1717,15 @@ nobase_include_HEADERS += \
   RTCORBA/Multi_Priority_Mapping.h \
   RTCORBA/Network_Priority_Mapping.h \
   RTCORBA/Network_Priority_Mapping_Manager.h \
+  RTCORBA/Network_Priority_Mapping_Manager.i \
   RTCORBA/Priority_Mapping.h \
   RTCORBA/Priority_Mapping_Manager.h \
+  RTCORBA/Priority_Mapping_Manager.i \
   RTCORBA/RTCORBA.h \
+  RTCORBA/RTCORBA.pidl \
   RTCORBA/RTCORBAC.h \
+  RTCORBA/RTCORBAC.inl \
+  RTCORBA/RTCORBA_include.pidl \
   RTCORBA/RTCORBA_includeC.h \
   RTCORBA/RTCORBA_includeS.h \
   RTCORBA/RT_Current.h \
@@ -1675,39 +1743,26 @@ nobase_include_HEADERS += \
   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/rtcorba_export.h \
-  RTCORBA/rtcorba_typedefs.h \
-  RTCORBA/Continuous_Priority_Mapping.i \
-  RTCORBA/Direct_Priority_Mapping.i \
-  RTCORBA/Linear_Network_Priority_Mapping.i \
-  RTCORBA/Linear_Priority_Mapping.i \
-  RTCORBA/Multi_Priority_Mapping.i \
-  RTCORBA/Network_Priority_Mapping.i \
-  RTCORBA/Network_Priority_Mapping_Manager.i \
-  RTCORBA/Priority_Mapping.i \
-  RTCORBA/Priority_Mapping_Manager.i \
-  RTCORBA/RTCORBAC.i \
-  RTCORBA/RT_Current.i \
-  RTCORBA/RT_Invocation_Endpoint_Selectors.i \
-  RTCORBA/RT_Mutex.i \
-  RTCORBA/RT_ORB.i \
-  RTCORBA/RT_Policy_i.i \
-  RTCORBA/RT_Protocols_Hooks.i \
-  RTCORBA/RT_Thread_Lane_Resources_Manager.i \
-  RTCORBA/RT_Transport_Descriptor.inl \
-  RTCORBA/RT_Transport_Descriptor_Property.inl \
-  RTCORBA/Thread_Pool.i \
-  RTCORBA/RTCORBA.pidl \
-  RTCORBA/RTCORBA_include.pidl
+  RTCORBA/rtcorba_typedefs.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  RTCORBA/TAO_RTCORBA.pc.in \
   RTCORBA/TAO_RTCORBA.rc
 
-## Makefile.RTPortableServer.am 
+
+## Makefile.RTPortableServer.am
 
 if BUILD_RT_CORBA
 
@@ -1742,29 +1797,34 @@ libTAO_RTPortableServer_la_LIBADD = \
 
 nobase_include_HEADERS += \
   RTPortableServer/RTPortableServer.h \
+  RTPortableServer/RTPortableServer.pidl \
   RTPortableServer/RTPortableServerC.h \
+  RTPortableServer/RTPortableServerC.inl \
   RTPortableServer/RT_Acceptor_Filters.h \
   RTPortableServer/RT_Collocation_Resolver.h \
   RTPortableServer/RT_Object_Adapter_Factory.h \
   RTPortableServer/RT_POA.h \
+  RTPortableServer/RT_POA.i \
   RTPortableServer/RT_Policy_Validator.h \
   RTPortableServer/RT_Servant_Dispatcher.h \
-  RTPortableServer/rtportableserver_export.h \
-  RTPortableServer/RTPortableServerC.i \
-  RTPortableServer/RT_Acceptor_Filters.i \
-  RTPortableServer/RT_Collocation_Resolver.i \
-  RTPortableServer/RT_POA.i \
-  RTPortableServer/RTPortableServer.pidl
+  RTPortableServer/rtportableserver_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  RTPortableServer/TAO_RTPortableServer.pc.in \
   RTPortableServer/TAO_RTPortableServer.rc
 
-## Makefile.RTScheduler.am 
 
-if BUILD_RT_CORBA
+## Makefile.RTScheduler.am
+
 if BUILD_CORBA_MESSAGING
+if BUILD_RT_CORBA
 
 lib_LTLIBRARIES += libTAO_RTScheduler.la
 
@@ -1798,26 +1858,33 @@ nobase_include_HEADERS += \
   RTScheduling/Current.h \
   RTScheduling/Distributable_Thread.h \
   RTScheduling/RTScheduler.h \
+  RTScheduling/RTScheduler.pidl \
   RTScheduling/RTSchedulerC.h \
+  RTScheduling/RTSchedulerC.i \
   RTScheduling/RTScheduler_Initializer.h \
   RTScheduling/RTScheduler_Loader.h \
   RTScheduling/RTScheduler_Manager.h \
+  RTScheduling/RTScheduler_Manager.i \
+  RTScheduling/RTScheduler_include.pidl \
   RTScheduling/RTScheduler_includeC.h \
   RTScheduling/Request_Interceptor.h \
   RTScheduling/ThreadAction.h \
-  RTScheduling/rtscheduler_export.h \
-  RTScheduling/RTSchedulerC.i \
-  RTScheduling/RTScheduler_Manager.i \
-  RTScheduling/RTScheduler.pidl \
-  RTScheduling/RTScheduler_include.pidl
+  RTScheduling/rtscheduler_export.h
+
+pkgconfigdata_DATA += 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_CORBA_MESSAGING
 endif BUILD_RT_CORBA
+endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
+  RTScheduling/TAO_RTScheduler.pc.in \
   RTScheduling/TAO_RTScheduler.rc
 
-## Makefile.SmartProxies.am 
+
+## Makefile.SmartProxies.am
 
 lib_LTLIBRARIES += libTAO_SmartProxies.la
 
@@ -1840,13 +1907,20 @@ libTAO_SmartProxies_la_LIBADD = \
 
 nobase_include_HEADERS += \
   SmartProxies/Smart_Proxies.h \
-  SmartProxies/smartproxies_export.h \
-  SmartProxies/Smart_Proxies.inl
+  SmartProxies/Smart_Proxies.inl \
+  SmartProxies/smartproxies_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
-  SmartProxies/SmartProxies.rc
+  SmartProxies/SmartProxies.rc \
+  SmartProxies/TAO_SmartProxies.pc.in
+
 
-## Makefile.Strategies.am 
+## Makefile.Strategies.am
 
 lib_LTLIBRARIES += libTAO_Strategies.la
 
@@ -1905,20 +1979,25 @@ libTAO_Strategies_la_LIBADD = \
 
 nobase_include_HEADERS += \
   Strategies/DIOP_Acceptor.h \
+  Strategies/DIOP_Acceptor.i \
   Strategies/DIOP_Connection_Handler.h \
   Strategies/DIOP_Connector.h \
   Strategies/DIOP_Endpoint.h \
+  Strategies/DIOP_Endpoint.i \
   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/SCIOP_Acceptor.h \
+  Strategies/SCIOP_Acceptor.i \
   Strategies/SCIOP_Connection_Handler.h \
   Strategies/SCIOP_Connector.h \
   Strategies/SCIOP_Endpoint.h \
+  Strategies/SCIOP_Endpoint.i \
   Strategies/SCIOP_Factory.h \
   Strategies/SCIOP_Lite_Factory.h \
   Strategies/SCIOP_Profile.h \
@@ -1927,6 +2006,7 @@ nobase_include_HEADERS += \
   Strategies/SHMIOP_Connection_Handler.h \
   Strategies/SHMIOP_Connector.h \
   Strategies/SHMIOP_Endpoint.h \
+  Strategies/SHMIOP_Endpoint.i \
   Strategies/SHMIOP_Factory.h \
   Strategies/SHMIOP_Profile.h \
   Strategies/SHMIOP_Transport.h \
@@ -1934,44 +2014,176 @@ nobase_include_HEADERS += \
   Strategies/UIOP_Connection_Handler.h \
   Strategies/UIOP_Connector.h \
   Strategies/UIOP_Endpoint.h \
+  Strategies/UIOP_Endpoint.i \
   Strategies/UIOP_Factory.h \
   Strategies/UIOP_Lite_Factory.h \
   Strategies/UIOP_Profile.h \
   Strategies/UIOP_Transport.h \
   Strategies/advanced_resource.h \
   Strategies/sciop_endpoints.h \
+  Strategies/sciop_endpoints.i \
+  Strategies/sciop_endpoints.pidl \
   Strategies/strategies_export.h \
   Strategies/uiop_endpoints.h \
-  Strategies/DIOP_Acceptor.i \
-  Strategies/DIOP_Connection_Handler.i \
-  Strategies/DIOP_Endpoint.i \
-  Strategies/DIOP_Profile.i \
-  Strategies/DIOP_Transport.i \
-  Strategies/LF_Strategy_Null.inl \
-  Strategies/SCIOP_Acceptor.i \
-  Strategies/SCIOP_Connection_Handler.i \
-  Strategies/SCIOP_Endpoint.i \
-  Strategies/SCIOP_Profile.i \
-  Strategies/SCIOP_Transport.i \
-  Strategies/SHMIOP_Acceptor.i \
-  Strategies/SHMIOP_Connection_Handler.inl \
-  Strategies/SHMIOP_Endpoint.i \
-  Strategies/SHMIOP_Profile.i \
-  Strategies/SHMIOP_Transport.i \
-  Strategies/UIOP_Connection_Handler.inl \
-  Strategies/UIOP_Endpoint.i \
-  Strategies/UIOP_Profile.i \
-  Strategies/UIOP_Transport.i \
-  Strategies/advanced_resource.i \
-  Strategies/sciop_endpoints.i \
   Strategies/uiop_endpoints.i \
-  Strategies/sciop_endpoints.pidl \
   Strategies/uiop_endpoints.pidl
 
+pkgconfigdata_DATA += 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
+
 EXTRA_DIST += \
+  Strategies/TAO_Strategies.pc.in \
   Strategies/TAO_Strategies.rc
 
-## Makefile.TypeCodeFactory.am 
+
+## Makefile.TAO_FlResource.am
+
+if BUILD_ACE_FLREACTOR
+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) \
+  -DTAO_FLRESOURCE_BUILD_DLL
+
+libTAO_FlResource_la_SOURCES = \
+  FlResource_Factory.cpp \
+  FlResource_Loader.cpp
+
+libTAO_FlResource_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_FlResource_la_LIBADD = \
+  $(ACE_BUILDDIR)/ace//libACE_FlReactor.la \
+  libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  FlResource_Factory.h \
+  FlResource_Loader.h \
+  TAO_FlResource_Export.h
+
+endif BUILD_X11
+endif BUILD_GL
+endif BUILD_FL
+endif BUILD_ACE_FLREACTOR
+
+## Makefile.TAO_QtResource.am
+
+if BUILD_ACE_QTREACTOR
+if BUILD_QT
+
+lib_LTLIBRARIES += libTAO_QtResource.la
+
+libTAO_QtResource_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(QTDIR)/include \
+  -DQT_THREAD_SUPPORT \
+  -DTAO_QTRESOURCE_BUILD_DLL
+
+libTAO_QtResource_la_SOURCES = \
+  QtResource_Factory.cpp \
+  QtResource_Loader.cpp
+
+libTAO_QtResource_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_QtResource_la_LIBADD = \
+  $(ACE_BUILDDIR)/ace//libACE_QtReactor.la \
+  libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la \
+  -lqt-mt
+
+nobase_include_HEADERS += \
+  QtResource_Factory.h \
+  QtResource_Loader.h \
+  TAO_QtResource_Export.h
+
+endif BUILD_QT
+endif BUILD_ACE_QTREACTOR
+
+## Makefile.TAO_TkResource.am
+
+if BUILD_ACE_TKREACTOR
+if BUILD_TK
+
+lib_LTLIBRARIES += libTAO_TkResource.la
+
+libTAO_TkResource_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_TKRESOURCE_BUILD_DLL
+
+libTAO_TkResource_la_SOURCES = \
+  TkResource_Factory.cpp \
+  TkResource_Loader.cpp
+
+libTAO_TkResource_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_TkResource_la_LIBADD = \
+  $(ACE_BUILDDIR)/ace//libACE_TkReactor.la \
+  libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  TAO_TkResource_Export.h \
+  TkResource_Factory.h \
+  TkResource_Loader.h
+
+endif BUILD_TK
+endif BUILD_ACE_TKREACTOR
+
+## Makefile.TAO_XtResource.am
+
+if BUILD_ACE_XTREACTOR
+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) \
+  -DTAO_XTRESOURCE_BUILD_DLL
+
+libTAO_XtResource_la_SOURCES = \
+  XtResource_Factory.cpp \
+  XtResource_Loader.cpp
+
+libTAO_XtResource_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_XtResource_la_LIBADD = \
+  $(ACE_BUILDDIR)/ace//libACE_XtReactor.la \
+  libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_include_HEADERS += \
+  TAO_XtResource_Export.h \
+  XtResource_Factory.h \
+  XtResource_Loader.h
+
+endif BUILD_XT
+endif BUILD_X11
+endif BUILD_ACE_XTREACTOR
+
+## Makefile.TypeCodeFactory.am
 
 lib_LTLIBRARIES += libTAO_TypeCodeFactory.la
 
@@ -1997,18 +2209,25 @@ libTAO_TypeCodeFactory_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
+  TypeCodeFactory/TypeCodeFactory.pidl \
   TypeCodeFactory/TypeCodeFactoryC.h \
+  TypeCodeFactory/TypeCodeFactoryC.inl \
   TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h \
   TypeCodeFactory/TypeCodeFactory_Loader.h \
   TypeCodeFactory/TypeCodeFactory_i.h \
-  TypeCodeFactory/typecodefactory_export.h \
-  TypeCodeFactory/TypeCodeFactoryC.inl \
-  TypeCodeFactory/TypeCodeFactory.pidl
+  TypeCodeFactory/typecodefactory_export.h
+
+pkgconfigdata_DATA += 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
 
 EXTRA_DIST += \
+  TypeCodeFactory/TAO_TypeCodeFactory.pc.in \
   TypeCodeFactory/TypeCodeFactory.rc
 
-## Makefile.Utils.am 
+
+## Makefile.Utils.am
 
 lib_LTLIBRARIES += libTAO_Utils.la
 
@@ -2040,15 +2259,26 @@ nobase_include_HEADERS += \
   Utils/Implicit_Deactivator.h \
   Utils/ORB_Destroyer.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/utils_export.h \
-  Utils/PolicyList_Destroyer.inl \
-  Utils/Servant_Var.inl
+  Utils/utils_export.h
+
+pkgconfigdata_DATA += 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
+
+EXTRA_DIST += \
+  TAO_Utils.pc.in
+
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h
index e4764f75dcf..61e0814dd67 100644
--- a/TAO/tao/Managed_Types.h
+++ b/TAO/tao/Managed_Types.h
@@ -34,7 +34,7 @@
  * This class implements the generic string manager and is used in the C++
  * mapping of "struct" members that are of type "string". The difference
  * between this class and the CORBA::String_var class is that the default
- * conctructor initializes the underlying string to an empty string in this
+ * constructor initializes the underlying string to an empty string in this
  * class whereas it is a NUL string for the _var class.
  */
 class TAO_Export TAO_String_Manager
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
index 705b76b43b9..2f6db234f66 100644
--- a/TAO/tao/Messaging.mpc
+++ b/TAO/tao/Messaging.mpc
@@ -26,4 +26,8 @@ project : taolib, core, portableserver, valuetype {
   PIDL_Files {
     Messaging
   }
+
+  Pkgconfig_Files {
+    Messaging/TAO_Messaging.pc.in
+  }
 }
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 0f986e5b769..54a0c858293 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -46,42 +46,6 @@ namespace TAO
 
     Invocation_Status s = TAO_INVOKE_FAILURE;
 
-
-    this->write_header (tspec,
-                        cdr
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (s);
-
-    this->marshal_data (cdr
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (s);
-
-    // Register a reply dispatcher for this invocation. Use the
-    // preallocated reply dispatcher.
-    TAO_Bind_Dispatcher_Guard dispatch_guard (
-        this->details_.request_id (),
-        this->safe_rd_.get (),
-        this->resolver_.transport ()->tms ());
-
-    // Now that we have bound the reply dispatcher to the map, just
-    // loose ownership of the reply dispatcher.
-    this->safe_rd_.release ();
-
-    if (dispatch_guard.status () != 0)
-      {
-        // @@ What is the right way to handle this error? Do we need
-        // to call the interceptors in this case?
-        ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
-                                               CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    // Do not unbind during destruction. We need the entry to be
-    // there in the map since the reply dispatcher depends on
-    // that. This is also a trigger to loose the ownership of the
-    // reply dispatcher.
-    dispatch_guard.status (TAO_Bind_Dispatcher_Guard::NO_UNBIND);
-
 #if TAO_HAS_INTERCEPTORS == 1
     s =
       this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -96,6 +60,41 @@ namespace TAO
     // try block is to take care of the cases when things go wrong.
     ACE_TRY
       {
+        this->write_header (tspec,
+                            cdr
+                            ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN (s);
+
+        this->marshal_data (cdr
+                            ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN (s);
+
+        // Register a reply dispatcher for this invocation. Use the
+        // preallocated reply dispatcher.
+        TAO_Bind_Dispatcher_Guard dispatch_guard (
+          this->details_.request_id (),
+          this->safe_rd_.get (),
+          this->resolver_.transport ()->tms ());
+
+        // Now that we have bound the reply dispatcher to the map, just
+        // loose ownership of the reply dispatcher.
+        this->safe_rd_.release ();
+
+        if (dispatch_guard.status () != 0)
+          {
+            // @@ What is the right way to handle this error? Do we need
+            // to call the interceptors in this case?
+            ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
+                                               CORBA::COMPLETED_NO),
+                              TAO_INVOKE_FAILURE);
+          }
+
+        // Do not unbind during destruction. We need the entry to be
+        // there in the map since the reply dispatcher depends on
+        // that. This is also a trigger to loose the ownership of the
+        // reply dispatcher.
+        dispatch_guard.status (TAO_Bind_Dispatcher_Guard::NO_UNBIND);
+
         // Send it as a oneway request. It will make all the required
         // paraphernalia within the ORB to fire, like buffering if
         // send blocks etc.
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index 35116264075..3438ebe0b20 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -10,13 +10,8 @@
 
 #include "ace/CORBA_macros.h"
 
-#if !defined (__ACE_INLINE__)
-#include "Asynch_Reply_Dispatcher.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$")
 
-
 // Constructor.
 TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (
     const TAO_Reply_Handler_Skeleton &reply_handler_skel,
@@ -45,8 +40,8 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
   if (params.input_cdr_ == 0)
     return -1;
 
-  bool cont_dispatch =
-    this->try_dispatch_reply ();
+  if (!this->try_dispatch_reply ())
+    return 0;
 
   if (this->timeout_handler_)
     {
@@ -58,14 +53,6 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
       // AMI Timeout Handling End
     }
 
-  // A simple protocol that we follow. If the timeout had been handled
-  // by another thread, the last refcount for us will be held by the
-  // timeout handler. Hence the above call to remove_reference () will
-  // delete us. We then have to rely on the status of our stack
-  // variable to exit safely.
-  if (!cont_dispatch)
-    return 0;
-
   this->reply_status_ = params.reply_status_;
 
   // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
@@ -159,8 +146,8 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
 {
   ACE_TRY_NEW_ENV
     {
-      bool cont_dispatch =
-        this->try_dispatch_reply ();
+      if (!this->try_dispatch_reply ())
+        return;
 
       if (this->timeout_handler_)
         {
@@ -171,16 +158,6 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
           this->timeout_handler_ = 0;
         }
 
-      // AMI Timeout Handling End
-
-      // A simple protocol that we follow. If the timeout had been handled
-      // by another thread, the last refcount for us will be held by the
-      // timeout handler. Hence the above call to remove_reference () will
-      // delete us. We then have to rely on the status of our stack
-      // variable to exit safely.
-      if (!cont_dispatch)
-        return;
-
       // Generate a fake exception....
       CORBA::COMM_FAILURE comm_failure (0, CORBA::COMPLETED_MAYBE);
 
@@ -243,6 +220,15 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
       if (!this->try_dispatch_reply ())
         return;
 
+      // @@ This check probably is unnecessary..
+      if (this->timeout_handler_)
+        {
+          // If we had registered timeout handlers just cancel them and
+          // loose ownership of the handlers
+          this->timeout_handler_->remove_reference ();
+          this->timeout_handler_ = 0;
+        }
+
       // Turn into an output CDR
       TAO_InputCDR cdr (out_cdr);
 
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
index a9d890caa49..03a35ced0a3 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -69,10 +69,5 @@ private:
   TAO_Asynch_Timeout_Handler *timeout_handler_;
 };
 
-
-#if defined (__ACE_INLINE__)
-#include "Asynch_Reply_Dispatcher.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_ASYNCH_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.i b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index 6b22bf9d0b7..2c41b47dee5 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -56,18 +56,33 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
                                    bool &has_timeout,
                                    ACE_Time_Value &time_value)
 {
-  CORBA::Policy_var policy =
-    (stub == 0
-     ? orb_core->stubless_connection_timeout ()
-     : stub->connection_timeout ());
-
-  if (CORBA::is_nil (policy.in ()))
-    {
-      has_timeout = 0;
-      return;
-    }
   ACE_TRY_NEW_ENV
     {
+      CORBA::Policy_var policy = 0;
+
+      if (stub == 0)
+        {
+          policy =
+            orb_core->get_cached_policy_including_current (
+              TAO_CACHED_POLICY_CONNECTION_TIMEOUT
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          policy =
+            stub->get_cached_policy (
+              TAO_CACHED_POLICY_CONNECTION_TIMEOUT
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      if (CORBA::is_nil (policy.in ()))
+        {
+          has_timeout = 0;
+          return;
+        }
+
       TAO::ConnectionTimeoutPolicy_var p =
         TAO::ConnectionTimeoutPolicy::_narrow (
           policy.in ()
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
index eaacb08e57d..73f041dca16 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -23,9 +23,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -93,7 +91,7 @@ private:
 
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index 07aa84ee463..b0a00748339 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -4,14 +4,17 @@
 #include "Messaging.h"
 #include "Messaging_ORBInitializer.h"
 
-#include "ace/Auto_Ptr.h"
 #include "tao/Exception_Data.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (tao,
+#include "ace/Auto_Ptr.h"
+#include "ace/OS_NS_string.h"
+
+
+ACE_RCSID (Messaging,
            Messaging,
            "$Id$")
 
@@ -154,4 +157,3 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
   ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
                              CORBA::COMPLETED_YES));
 }
-
diff --git a/TAO/tao/Messaging/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl
index db86e054c7d..5bcfade5803 100644
--- a/TAO/tao/Messaging/Messaging.pidl
+++ b/TAO/tao/Messaging/Messaging.pidl
@@ -20,14 +20,14 @@
  *
  * after the file is generated a patch must be applied:
  *
- *   cp orig/Messaging{C,S,S_T}.{h,i,cpp} .
+ *   cp orig/Messaging{A,C,S,S_T}.{h,inl,cpp} .
  *   patch < diffs/Messaging.diff
  *
  * The patch eliminates cycles in the include dependencies.
  *
  * Note: to update the patch file after re-generating the code use:
  *
- *   for i in Messaging{C,S,S_T}.{h,i,cpp}; do
+ *   for i in Messaging{A,C,S,S_T}.{h,inl,cpp}; do
  *     diff -uBbw orig/$i $i;
  *   done > diffs/Messaging.diff
  */
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index 31b5a52dcc6..cb7a5b22039 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -26,14 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging.h"
 #include "tao/CDR.h"
 #include "tao/Object_T.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -41,11 +40,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "MessagingC.i"
+#include "MessagingC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -54,120 +53,27 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e48),
-  ACE_NTOHL (0x6f6c6465),
-  ACE_NTOHL (0x723a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
-    16,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e486f6c),
-  ACE_NTOHL (0x64657200),  // name = ExceptionHolder
-    0, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-3, // member count
-    20,
-  ACE_NTOHL (0x69735f73),
-  ACE_NTOHL (0x79737465),
-  ACE_NTOHL (0x6d5f6578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e00),  // name = is_system_exception
-    CORBA::tk_boolean,
-
-  1, // data member visibility marker
-
-  11,
-  ACE_NTOHL (0x62797465),
-  ACE_NTOHL (0x5f6f7264),
-  ACE_NTOHL (0x65720000),  // name = byte_order
-    CORBA::tk_boolean,
-
-  1, // data member visibility marker
-
-  20,
-  ACE_NTOHL (0x6d617273),
-  ACE_NTOHL (0x68616c65),
-  ACE_NTOHL (0x645f6578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465),
-    ACE_NTOHL (0x74536571),
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-  1, // data member visibility marker
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder (
-    CORBA::tk_value,
-    sizeof (_oc_Messaging_ExceptionHolder),
-    (char *) &_oc_Messaging_ExceptionHolder,
-    0,
-    sizeof (Messaging::ExceptionHolder)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ExceptionHolder =
-    &_tc_TAO_tc_Messaging_ExceptionHolder;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref (
+TAO::Value_Traits<Messaging::ExceptionHolder>::add_ref (
     Messaging::ExceptionHolder * p
   )
 {
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
-TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref (
+TAO::Value_Traits<Messaging::ExceptionHolder>::remove_ref (
     Messaging::ExceptionHolder * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<Messaging::ExceptionHolder>::release (
     Messaging::ExceptionHolder * p
@@ -179,11 +85,6 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::release (
 Messaging::ExceptionHolder *
 Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
 {
-  if (v == 0)
-    {
-      return 0;
-    }
-
   return dynamic_cast< ::Messaging::ExceptionHolder * > (v);
 }
 
@@ -197,8 +98,8 @@ void
 Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionHolder *_tao_tmp_pointer =
-    ACE_static_cast (
-        ExceptionHolder *,
+    static_cast<
+        ExceptionHolder *> (
         _tao_void_pointer
       );
   CORBA::remove_ref (_tao_tmp_pointer);
@@ -228,29 +129,29 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
         base,
         ExceptionHolder::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ExceptionHolder::_downcast (base);
@@ -268,20 +169,26 @@ Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
 {
 }
 
-const char*
+Messaging::ExceptionHolder_init *
+Messaging::ExceptionHolder_init::_downcast (CORBA::ValueFactoryBase *v)
+{
+  return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v);
+}
+
+const char* 
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
 }
 
 CORBA::ValueBase *
-Messaging::ExceptionHolder_init::create_for_unmarshal (void)
+Messaging::ExceptionHolder_init::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ValueBase *ret_val = 0;
-  ACE_NEW_RETURN (
+  ACE_NEW_THROW_EX (
       ret_val,
       OBV_Messaging::ExceptionHolder,
-      0
+      CORBA::NO_MEMORY ()
     );
   return ret_val;
 }
@@ -327,7 +234,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -351,11 +258,11 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation ()
 Messaging::ReplyHandler::~ReplyHandler (void)
 {}
 
-void
+void 
 Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyHandler *_tao_tmp_pointer =
-    ACE_static_cast (ReplyHandler *, _tao_void_pointer);
+    static_cast<ReplyHandler *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -396,7 +303,7 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -408,14 +315,14 @@ Messaging::ReplyHandler::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyHandler:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -440,44 +347,6 @@ Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ReplyHandler[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5265),
-  ACE_NTOHL (0x706c7948),
-  ACE_NTOHL (0x616e646c),
-  ACE_NTOHL (0x65723a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
-    13,
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x7948616e),
-  ACE_NTOHL (0x646c6572),
-  ACE_NTOHL (0x0),  // name = ReplyHandler
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyHandler),
-    (char *) &_oc_Messaging_ReplyHandler,
-    0,
-    sizeof (Messaging::ReplyHandler)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ReplyHandler =
-    &_tc_TAO_tc_Messaging_ReplyHandler;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
 
 OBV_Messaging::ExceptionHolder::ExceptionHolder (void)
@@ -499,7 +368,7 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_I
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:567
+// be\be_visitor_valuetype/field_cs.cpp:568
 
 // Accessor to set the member.
 void
@@ -517,7 +386,7 @@ OBV_Messaging::ExceptionHolder::is_system_exception (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:567
+// be\be_visitor_valuetype/field_cs.cpp:568
 
 // Accessor to set the member.
 void
@@ -535,7 +404,7 @@ OBV_Messaging::ExceptionHolder::byte_order (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:742
+// be\be_visitor_valuetype/field_cs.cpp:743
 
 // Accessor to set the member.
 void
@@ -559,120 +428,7 @@ OBV_Messaging::ExceptionHolder::marshaled_exception (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_cs.cpp:57
-
-
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ExceptionHolder>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
-{
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
-}
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder *_tao_elem
-  )
-{
-  CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ExceptionHolder>::insert (
-      _tao_any,
-      Messaging::ExceptionHolder::_tao_any_destructor,
-      Messaging::_tc_ExceptionHolder,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ExceptionHolder>::extract (
-        _tao_any,
-        Messaging::ExceptionHolder::_tao_any_destructor,
-        Messaging::_tc_ExceptionHolder,
-        _tao_elem
-      );
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyHandler>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyHandler_ptr _tao_elem
-  )
-{
-  Messaging::ReplyHandler_ptr _tao_objptr =
-    Messaging::ReplyHandler::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyHandler_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyHandler>::insert (
-      _tao_any,
-      Messaging::ReplyHandler::_tao_any_destructor,
-      Messaging::_tc_ReplyHandler,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyHandler_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyHandler>::extract (
-        _tao_any,
-        Messaging::ReplyHandler::_tao_any_destructor,
-        Messaging::_tc_ReplyHandler,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:490
+// be\be_valuetype.cpp:488
 
 void
 CORBA::add_ref (Messaging::ExceptionHolder * vt)
@@ -704,11 +460,8 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        ACE_const_cast (
-            Messaging::ExceptionHolder *,
-            _tao_valuetype
-          ),
-        (ptrdiff_t) &Messaging::ExceptionHolder::_downcast
+        const_cast<Messaging::ExceptionHolder *> (_tao_valuetype),
+        reinterpret_cast<ptrdiff_t> (&Messaging::ExceptionHolder::_downcast)
       );
 }
 
@@ -762,26 +515,26 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
-  if ((strm >> obj.inout ()) == 0)
+  
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
-
+  
   typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -793,18 +546,13 @@ CORBA::Boolean operator>> (
   template class
     TAO_Value_Var_T<
         Messaging::ExceptionHolder
-
+        
       >;
-
+  
   template class
     TAO_Value_Out_T<
         Messaging::ExceptionHolder
-
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        Messaging::ExceptionHolder
+        
       >;
 
   template class
@@ -816,7 +564,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         Messaging::ReplyHandler
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         Messaging::ReplyHandler
@@ -827,11 +575,6 @@ CORBA::Boolean operator>> (
         Messaging::ReplyHandler
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        Messaging::ReplyHandler
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -842,18 +585,13 @@ CORBA::Boolean operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         Messaging::ExceptionHolder \
-
+        
       >
-
+  
 # pragma instantiate \
     TAO_Value_Out_T< \
         Messaging::ExceptionHolder \
-
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ExceptionHolder \
+        
       >
 
 # pragma instantiate \
@@ -865,7 +603,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         Messaging::ReplyHandler
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         Messaging::ReplyHandler
@@ -876,9 +614,4 @@ CORBA::Boolean operator>> (
         Messaging::ReplyHandler \
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ReplyHandler \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index da218e55e7d..e5b19589378 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -26,14 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGC_H_
 #define _TAO_IDL_ORIG_MESSAGINGC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #ifndef TAO_MESSAGING_SAFE_INCLUDE
 #error "You should not include MessagingC.h directly, use Messaging.h"
@@ -44,13 +45,15 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/Valuetype/ValueFactory.h"
-#include "tao/Objref_VarOut_T.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
 #include "tao/Valuetype/Value_VarOut_T.h"
+#include "tao/Objref_VarOut_T.h"
 
 #include "tao/PollableC.h"
 #include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
@@ -71,9 +74,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -82,7 +83,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -99,7 +100,7 @@ namespace Messaging
 {
   
   // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:527
+  // be\be_valuetype.cpp:525
   
   
 
@@ -167,7 +168,7 @@ namespace Messaging
     virtual CORBA::OctetSeq &marshaled_exception (void) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:250
+    // be\be_visitor_valuetype/valuetype_ch.cpp:238
   
   protected:
     ExceptionHolder (void);
@@ -204,7 +205,10 @@ namespace Messaging
     
     static ExceptionHolder_init* _downcast (CORBA::ValueFactoryBase *);
     
-    virtual CORBA::ValueBase *create_for_unmarshal (void);
+    virtual CORBA::ValueBase *
+    create_for_unmarshal (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
     
     // TAO-specific extensions
   public:
@@ -222,7 +226,7 @@ namespace Messaging
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionHolder;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REPLYHANDLER__VAR_OUT_CH_)
 #define _MESSAGING_REPLYHANDLER__VAR_OUT_CH_
@@ -273,7 +277,7 @@ namespace Messaging
     
     static ReplyHandler_ptr _nil (void)
     {
-      return (ReplyHandler_ptr)0;
+      return static_cast<ReplyHandler_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -417,8 +421,8 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Messaging_Export Value_Traits<Messaging::ExceptionHolder>
   {
-    static void tao_add_ref (Messaging::ExceptionHolder *);
-    static void tao_remove_ref (Messaging::ExceptionHolder *);
+    static void add_ref (Messaging::ExceptionHolder *);
+    static void remove_ref (Messaging::ExceptionHolder *);
     static void release (Messaging::ExceptionHolder *);
   };
 
@@ -428,17 +432,17 @@ namespace TAO
 #define _MESSAGING_REPLYHANDLER__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyHandler>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyHandler>
   {
-    static Messaging::ReplyHandler_ptr duplicate (
-        Messaging::ReplyHandler_ptr
+    static ::Messaging::ReplyHandler_ptr duplicate (
+        ::Messaging::ReplyHandler_ptr
       );
     static void release (
-        Messaging::ReplyHandler_ptr
+        ::Messaging::ReplyHandler_ptr
       );
-    static Messaging::ReplyHandler_ptr nil (void);
+    static ::Messaging::ReplyHandler_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::ReplyHandler_ptr p,
+        ::Messaging::ReplyHandler_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -461,7 +465,7 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:434
+// be\be_valuetype.cpp:432
 
 namespace CORBA
 {
@@ -482,13 +486,13 @@ TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "MessagingC.i"
+#include "MessagingC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -500,3 +504,4 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Reply
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/MessagingC.i b/TAO/tao/Messaging/MessagingC.i
deleted file mode 100644
index 32030802a3d..00000000000
--- a/TAO/tao/Messaging/MessagingC.i
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
-
-ACE_INLINE
-Messaging::ExceptionHolder::ExceptionHolder (void)
-{}
-
-ACE_INLINE
-Messaging::ExceptionHolder::~ExceptionHolder (void)
-{}
-
-ACE_INLINE const char* 
-Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
-{
-  return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_MESSAGING_REPLYHANDLER___CI_)
-#define _MESSAGING_REPLYHANDLER___CI_
-
-ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ReplyHandler_Proxy_Broker_ (0)
-{
-  this->Messaging_ReplyHandler_setup_collocation ();
-}
-
-ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ReplyHandler_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 463beeaba52..20495ce97a6 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:631
+// be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_
 #define _TAO_IDL_ORIG_MESSAGINGS_CPP_
@@ -47,26 +47,25 @@
 #include "tao/CDR.h"
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
 #include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc_Allocator.h"
-#include "ace/config-all.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "MessagingS.i"
+#include "MessagingS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -75,7 +74,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1534
+// be\be_interface.cpp:1536
 
 class TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -278,7 +277,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -312,7 +311,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:631
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -333,8 +332,8 @@ Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (size_t)
 static int
 Messaging__TAO_ReplyHandler_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer
         )
     );
@@ -400,7 +399,7 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_Messaging::ReplyHandler *_tao_impl =
-    (POA_Messaging::ReplyHandler *) _tao_servant;
+    static_cast<POA_Messaging::ReplyHandler *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -430,7 +429,7 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
   )
 {
   POA_Messaging::ReplyHandler *_tao_impl =
-    (POA_Messaging::ReplyHandler *) _tao_servant;
+    static_cast<POA_Messaging::ReplyHandler *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -463,7 +462,7 @@ void POA_Messaging::ReplyHandler::_interface_skel (
     }
   
   POA_Messaging::ReplyHandler *_tao_impl =
-    (POA_Messaging::ReplyHandler *) _tao_servant;
+    static_cast<POA_Messaging::ReplyHandler *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -494,7 +493,7 @@ void POA_Messaging::ReplyHandler::_component_skel (
   )
 {
   POA_Messaging::ReplyHandler *_tao_impl =
-    (POA_Messaging::ReplyHandler *) _tao_object_reference;
+    static_cast<POA_Messaging::ReplyHandler *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -514,23 +513,17 @@ CORBA::Boolean POA_Messaging::ReplyHandler::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyHandler:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_Messaging::ReplyHandler::_downcast (
@@ -540,13 +533,13 @@ void* POA_Messaging::ReplyHandler::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/Messaging/ReplyHandler:1.0") == 0)
     {
-      return ACE_static_cast (POA_Messaging::ReplyHandler_ptr, this);
+      return static_cast<POA_Messaging::ReplyHandler_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
-      return ACE_static_cast (PortableServer::Servant, this);
+      return static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -558,7 +551,7 @@ const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:567
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_Messaging::ReplyHandler::_dispatch (
     TAO_ServerRequest &req,
@@ -573,7 +566,7 @@ void POA_Messaging::ReplyHandler::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:509
+// be\be_visitor_interface/interface_ss.cpp:527
 
 Messaging::ReplyHandler *
 POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -584,22 +577,14 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
   
-  if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -612,4 +597,14 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1683
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h
index 4b395602058..3e56fcfabeb 100644
--- a/TAO/tao/Messaging/MessagingS.h
+++ b/TAO/tao/Messaging/MessagingS.h
@@ -26,14 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:411
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_H_
 #define _TAO_IDL_ORIG_MESSAGINGS_H_
 
 #include /**/ "ace/pre.h"
 
-#include "Messaging.h"
+#include "tao/PollableS.h"
+#include "tao/Messaging/Messaging.h"
+#include "tao/OctetSeqS.h"
+#include "MessagingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -44,9 +47,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -59,105 +60,105 @@
 
 namespace POA_Messaging
 {
-  
-  
+
+
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:90
-  
+  // be\be_visitor_interface/interface_sh.cpp:87
+
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-  
+
   class _TAO_ReplyHandler_ThruPOA_Proxy_Impl;
   class _TAO_ReplyHandler_Direct_Proxy_Impl;
   class _TAO_ReplyHandler_Strategized_Proxy_Broker;
-  
+
   class TAO_Messaging_Export ReplyHandler
     : public virtual PortableServer::ServantBase
   {
   protected:
     ReplyHandler (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::Messaging::ReplyHandler _stub_type;
     typedef ::Messaging::ReplyHandler_ptr _stub_ptr_type;
     typedef ::Messaging::ReplyHandler_var _stub_var_type;
-    
+
     ReplyHandler (const ReplyHandler& rhs);
     virtual ~ReplyHandler (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::Messaging::ReplyHandler *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_Messaging_Export _TAO_ReplyHandler_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -170,31 +171,31 @@ namespace POA_Messaging
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-    
+
     static _TAO_ReplyHandler_Strategized_Proxy_Broker *
     the_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
+
   class TAO_Messaging_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_ReplyHandler_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void) {}
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
@@ -226,15 +227,15 @@ namespace POA_Messaging
 } // module Messaging
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1014
+// be\be_codegen.cpp:997
 
 #include "MessagingS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "MessagingS.i"
+#include "MessagingS.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -244,3 +245,4 @@ namespace POA_Messaging
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/MessagingS.i b/TAO/tao/Messaging/MessagingS.i
deleted file mode 100644
index 1d2df31bd57..00000000000
--- a/TAO/tao/Messaging/MessagingS.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/Messaging/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp
index 11c7922cde6..e6b0607477c 100644
--- a/TAO/tao/Messaging/MessagingS_T.cpp
+++ b/TAO/tao/Messaging/MessagingS_T.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:705
+// be\be_codegen.cpp:683
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
 #define _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
@@ -34,7 +34,7 @@
 #include "MessagingS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "MessagingS_T.i"
+#include "MessagingS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h
index 361b0ee3ce2..44c33204372 100644
--- a/TAO/tao/Messaging/MessagingS_T.h
+++ b/TAO/tao/Messaging/MessagingS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:566
+// be\be_codegen.cpp:546
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_H_
 #define _TAO_IDL_ORIG_MESSAGINGS_T_H_
@@ -34,9 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -44,7 +42,6 @@
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_Messaging
 {
   
@@ -98,13 +95,12 @@ namespace POA_Messaging
     void operator= (const ReplyHandler_tie &);
   };
 } // module Messaging
-#endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1111
+// be\be_codegen.cpp:1094
 
 #if defined (__ACE_INLINE__)
-#include "MessagingS_T.i"
+#include "MessagingS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
@@ -115,9 +111,10 @@ namespace POA_Messaging
 #pragma implementation ("MessagingS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Messaging/MessagingS_T.i b/TAO/tao/Messaging/MessagingS_T.i
deleted file mode 100644
index d796f9aad7f..00000000000
--- a/TAO/tao/Messaging/MessagingS_T.i
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::~ReplyHandler_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyHandler_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl
index c2c9edcd90b..f516a6528e9 100644
--- a/TAO/tao/Messaging/Messaging_No_Impl.pidl
+++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl
@@ -22,14 +22,14 @@
  *
  * after the file is generated a patch must be applied:
  *
- *   cp orig/Messaging_No_Impl{C,S,S_T}.{h,i,cpp} .
+ *   cp orig/Messaging_No_Impl{C,S}.{h,inl,cpp} .
  *   patch < diffs/Messaging.diff
  *
  * The patch eliminates cycles in the include dependencies.
  *
  * Note: to update the patch file after re-generating the code use:
  *
- *   for i in Messaging_No_Impl{C,S,S_T}.{h,i,cpp}; do
+ *   for i in Messaging_No_Impl{C,S}.{h,inl,cpp}; do
  *     diff -uBbw orig/$i $i;
  *   done > diffs/Messaging_No_Impl.diff
  */
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
index c6ba7f3fc9b..d9a76f35b35 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
@@ -26,14 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging_No_ImplC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -41,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Messaging_No_ImplC.i"
+#include "Messaging_No_ImplC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -54,160 +51,6 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_Priority[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-    9,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Priority (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_Priority),
-    (char *) &_oc_Messaging_Priority,
-    0,
-    sizeof (Messaging::Priority)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_Priority =
-    &_tc_TAO_tc_Messaging_Priority;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RebindMode[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x62696e64), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RebindMode:1.0
-    11,
-  ACE_NTOHL (0x52656269), 
-  ACE_NTOHL (0x6e644d6f), 
-  ACE_NTOHL (0x64650000),  // name = RebindMode
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindMode (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_RebindMode),
-    (char *) &_oc_Messaging_RebindMode,
-    0,
-    sizeof (Messaging::RebindMode)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RebindMode =
-    &_tc_TAO_tc_Messaging_RebindMode;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RoutingType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-    12,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
-  ACE_NTOHL (0x79706500),  // name = RoutingType
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingType (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_RoutingType),
-    (char *) &_oc_Messaging_RoutingType,
-    0,
-    sizeof (Messaging::RoutingType)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RoutingType =
-    &_tc_TAO_tc_Messaging_RoutingType;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_Ordering[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4f72), 
-  ACE_NTOHL (0x64657269), 
-  ACE_NTOHL (0x6e673a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Ordering:1.0
-    9,
-  ACE_NTOHL (0x4f726465), 
-  ACE_NTOHL (0x72696e67), 
-  ACE_NTOHL (0x0),  // name = Ordering
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Ordering (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_Ordering),
-    (char *) &_oc_Messaging_Ordering,
-    0,
-    sizeof (Messaging::Ordering)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_Ordering =
-    &_tc_TAO_tc_Messaging_Ordering;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RebindPolicy.
@@ -247,12 +90,6 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RebindPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RebindPolicy::RebindPolicy (void)
 {}
 
@@ -263,7 +100,7 @@ void
 Messaging::RebindPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RebindPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RebindPolicy *, _tao_void_pointer);
+    static_cast<RebindPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -320,22 +157,22 @@ Messaging::RebindPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RebindPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -356,127 +193,6 @@ Messaging::RebindPolicy::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RebindPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x62696e64), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RebindPolicy:1.0
-    13,
-  ACE_NTOHL (0x52656269), 
-  ACE_NTOHL (0x6e64506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = RebindPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RebindPolicy),
-    (char *) &_oc_Messaging_RebindPolicy,
-    0,
-    sizeof (Messaging::RebindPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RebindPolicy =
-    &_tc_TAO_tc_Messaging_RebindPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_PriorityRange[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74795261), 
-  ACE_NTOHL (0x6e67653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0
-    14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x52616e67), 
-  ACE_NTOHL (0x65000000),  // name = PriorityRange
-  2, // member count
-    4,
-  ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f5072), 
-    ACE_NTOHL (0x696f7269), 
-    ACE_NTOHL (0x74793a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-  4,
-  ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f5072), 
-    ACE_NTOHL (0x696f7269), 
-    ACE_NTOHL (0x74793a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PriorityRange (
-    CORBA::tk_struct,
-    sizeof (_oc_Messaging_PriorityRange),
-    (char *) &_oc_Messaging_PriorityRange,
-    0,
-    sizeof (Messaging::PriorityRange)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_PriorityRange =
-    &_tc_TAO_tc_Messaging_PriorityRange;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -486,7 +202,7 @@ Messaging::PriorityRange::_tao_any_destructor (
   )
 {
   PriorityRange *_tao_tmp_pointer =
-    ACE_static_cast (PriorityRange *, _tao_void_pointer);
+    static_cast<PriorityRange *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -530,12 +246,6 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RequestPriorityPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void)
 {}
 
@@ -546,7 +256,7 @@ void
 Messaging::RequestPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestPriorityPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RequestPriorityPolicy *, _tao_void_pointer);
+    static_cast<RequestPriorityPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -603,22 +313,22 @@ Messaging::RequestPriorityPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -640,48 +350,6 @@ Messaging::RequestPriorityPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74507269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RequestPriorityPolicy:1.0
-    22,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737450), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747950), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = RequestPriorityPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestPriorityPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RequestPriorityPolicy),
-    (char *) &_oc_Messaging_RequestPriorityPolicy,
-    0,
-    sizeof (Messaging::RequestPriorityPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RequestPriorityPolicy =
-    &_tc_TAO_tc_Messaging_RequestPriorityPolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::ReplyPriorityPolicy.
@@ -721,12 +389,6 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_ReplyPriorityPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void)
 {}
 
@@ -737,7 +399,7 @@ void
 Messaging::ReplyPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyPriorityPolicy *_tao_tmp_pointer =
-    ACE_static_cast (ReplyPriorityPolicy *, _tao_void_pointer);
+    static_cast<ReplyPriorityPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -794,22 +456,22 @@ Messaging::ReplyPriorityPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -831,47 +493,6 @@ Messaging::ReplyPriorityPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7950), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747950), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0
-    20,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79507269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79506f6c), 
-  ACE_NTOHL (0x69637900),  // name = ReplyPriorityPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyPriorityPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyPriorityPolicy),
-    (char *) &_oc_Messaging_ReplyPriorityPolicy,
-    0,
-    sizeof (Messaging::ReplyPriorityPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ReplyPriorityPolicy =
-    &_tc_TAO_tc_Messaging_ReplyPriorityPolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RequestStartTimePolicy.
@@ -911,12 +532,6 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RequestStartTimePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void)
 {}
 
@@ -927,7 +542,7 @@ void
 Messaging::RequestStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestStartTimePolicy *_tao_tmp_pointer =
-    ACE_static_cast (RequestStartTimePolicy *, _tao_void_pointer);
+    static_cast<RequestStartTimePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -984,22 +599,22 @@ Messaging::RequestStartTimePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1021,49 +636,6 @@ Messaging::RequestStartTimePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74537461), 
-  ACE_NTOHL (0x72745469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RequestStartTimePolicy:1.0
-    23,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737453), 
-  ACE_NTOHL (0x74617274), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = RequestStartTimePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestStartTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RequestStartTimePolicy),
-    (char *) &_oc_Messaging_RequestStartTimePolicy,
-    0,
-    sizeof (Messaging::RequestStartTimePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RequestStartTimePolicy =
-    &_tc_TAO_tc_Messaging_RequestStartTimePolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RequestEndTimePolicy.
@@ -1103,12 +675,6 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RequestEndTimePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void)
 {}
 
@@ -1119,7 +685,7 @@ void
 Messaging::RequestEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestEndTimePolicy *_tao_tmp_pointer =
-    ACE_static_cast (RequestEndTimePolicy *, _tao_void_pointer);
+    static_cast<RequestEndTimePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1176,22 +742,22 @@ Messaging::RequestEndTimePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1213,48 +779,6 @@ Messaging::RequestEndTimePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74456e64), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RequestEndTimePolicy:1.0
-    21,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737445), 
-  ACE_NTOHL (0x6e645469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = RequestEndTimePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestEndTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RequestEndTimePolicy),
-    (char *) &_oc_Messaging_RequestEndTimePolicy,
-    0,
-    sizeof (Messaging::RequestEndTimePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RequestEndTimePolicy =
-    &_tc_TAO_tc_Messaging_RequestEndTimePolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::ReplyStartTimePolicy.
@@ -1294,12 +818,6 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_ReplyStartTimePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void)
 {}
 
@@ -1310,7 +828,7 @@ void
 Messaging::ReplyStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyStartTimePolicy *_tao_tmp_pointer =
-    ACE_static_cast (ReplyStartTimePolicy *, _tao_void_pointer);
+    static_cast<ReplyStartTimePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1367,22 +885,22 @@ Messaging::ReplyStartTimePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1404,48 +922,6 @@ Messaging::ReplyStartTimePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7953), 
-  ACE_NTOHL (0x74617274), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0
-    21,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x72745469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = ReplyStartTimePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyStartTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyStartTimePolicy),
-    (char *) &_oc_Messaging_ReplyStartTimePolicy,
-    0,
-    sizeof (Messaging::ReplyStartTimePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ReplyStartTimePolicy =
-    &_tc_TAO_tc_Messaging_ReplyStartTimePolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::ReplyEndTimePolicy.
@@ -1485,12 +961,6 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_ReplyEndTimePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void)
 {}
 
@@ -1501,7 +971,7 @@ void
 Messaging::ReplyEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyEndTimePolicy *_tao_tmp_pointer =
-    ACE_static_cast (ReplyEndTimePolicy *, _tao_void_pointer);
+    static_cast<ReplyEndTimePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1558,22 +1028,22 @@ Messaging::ReplyEndTimePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1595,47 +1065,6 @@ Messaging::ReplyEndTimePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7945), 
-  ACE_NTOHL (0x6e645469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0
-    19,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79456e64), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = ReplyEndTimePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyEndTimePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_ReplyEndTimePolicy),
-    (char *) &_oc_Messaging_ReplyEndTimePolicy,
-    0,
-    sizeof (Messaging::ReplyEndTimePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_ReplyEndTimePolicy =
-    &_tc_TAO_tc_Messaging_ReplyEndTimePolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RelativeRequestTimeoutPolicy.
@@ -1675,12 +1104,6 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RelativeRequestTimeoutPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void)
 {}
 
@@ -1691,7 +1114,7 @@ void
 Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RelativeRequestTimeoutPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RelativeRequestTimeoutPolicy *, _tao_void_pointer);
+    static_cast<RelativeRequestTimeoutPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1748,22 +1171,22 @@ Messaging::RelativeRequestTimeoutPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1784,139 +1207,6 @@ Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x6c617469), 
-  ACE_NTOHL (0x76655265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x7454696d), 
-  ACE_NTOHL (0x656f7574), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0
-    29,
-  ACE_NTOHL (0x52656c61), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737454), 
-  ACE_NTOHL (0x696d656f), 
-  ACE_NTOHL (0x7574506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = RelativeRequestTimeoutPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RelativeRequestTimeoutPolicy),
-    (char *) &_oc_Messaging_RelativeRequestTimeoutPolicy,
-    0,
-    sizeof (Messaging::RelativeRequestTimeoutPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RelativeRequestTimeoutPolicy =
-    &_tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x6552616e), 
-  ACE_NTOHL (0x67653a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0
-    17,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
-  ACE_NTOHL (0x79706552), 
-  ACE_NTOHL (0x616e6765), 
-  ACE_NTOHL (0x0),  // name = RoutingTypeRange
-  2, // member count
-    4,
-  ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f526f), 
-    ACE_NTOHL (0x7574696e), 
-    ACE_NTOHL (0x67547970), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-        12,
-    ACE_NTOHL (0x526f7574), 
-    ACE_NTOHL (0x696e6754), 
-    ACE_NTOHL (0x79706500),  // name = RoutingType
-        CORBA::tk_short,
-
-
-  4,
-  ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f526f), 
-    ACE_NTOHL (0x7574696e), 
-    ACE_NTOHL (0x67547970), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
-        12,
-    ACE_NTOHL (0x526f7574), 
-    ACE_NTOHL (0x696e6754), 
-    ACE_NTOHL (0x79706500),  // name = RoutingType
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingTypeRange (
-    CORBA::tk_struct,
-    sizeof (_oc_Messaging_RoutingTypeRange),
-    (char *) &_oc_Messaging_RoutingTypeRange,
-    0,
-    sizeof (Messaging::RoutingTypeRange)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RoutingTypeRange =
-    &_tc_TAO_tc_Messaging_RoutingTypeRange;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1926,7 +1216,7 @@ Messaging::RoutingTypeRange::_tao_any_destructor (
   )
 {
   RoutingTypeRange *_tao_tmp_pointer =
-    ACE_static_cast (RoutingTypeRange *, _tao_void_pointer);
+    static_cast<RoutingTypeRange *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -1970,12 +1260,6 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RoutingPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RoutingPolicy::RoutingPolicy (void)
 {}
 
@@ -1986,7 +1270,7 @@ void
 Messaging::RoutingPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RoutingPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RoutingPolicy *, _tao_void_pointer);
+    static_cast<RoutingPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2043,22 +1327,22 @@ Messaging::RoutingPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RoutingPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2080,44 +1364,6 @@ Messaging::RoutingPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RoutingPolicy:1.0
-    14,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6750), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = RoutingPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RoutingPolicy),
-    (char *) &_oc_Messaging_RoutingPolicy,
-    0,
-    sizeof (Messaging::RoutingPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RoutingPolicy =
-    &_tc_TAO_tc_Messaging_RoutingPolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::MaxHopsPolicy.
@@ -2157,12 +1403,6 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_MaxHopsPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::MaxHopsPolicy::MaxHopsPolicy (void)
 {}
 
@@ -2173,7 +1413,7 @@ void
 Messaging::MaxHopsPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   MaxHopsPolicy *_tao_tmp_pointer =
-    ACE_static_cast (MaxHopsPolicy *, _tao_void_pointer);
+    static_cast<MaxHopsPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2230,22 +1470,22 @@ Messaging::MaxHopsPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/MaxHopsPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2267,44 +1507,6 @@ Messaging::MaxHopsPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4d61), 
-  ACE_NTOHL (0x78486f70), 
-  ACE_NTOHL (0x73506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/MaxHopsPolicy:1.0
-    14,
-  ACE_NTOHL (0x4d617848), 
-  ACE_NTOHL (0x6f707350), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = MaxHopsPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_MaxHopsPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_MaxHopsPolicy),
-    (char *) &_oc_Messaging_MaxHopsPolicy,
-    0,
-    sizeof (Messaging::MaxHopsPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_MaxHopsPolicy =
-    &_tc_TAO_tc_Messaging_MaxHopsPolicy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::QueueOrderPolicy.
@@ -2344,12 +1546,6 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_QueueOrderPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::QueueOrderPolicy::QueueOrderPolicy (void)
 {}
 
@@ -2360,7 +1556,7 @@ void
 Messaging::QueueOrderPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   QueueOrderPolicy *_tao_tmp_pointer =
-    ACE_static_cast (QueueOrderPolicy *, _tao_void_pointer);
+    static_cast<QueueOrderPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2417,22 +1613,22 @@ Messaging::QueueOrderPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/QueueOrderPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2454,921 +1650,6 @@ Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5175), 
-  ACE_NTOHL (0x6575654f), 
-  ACE_NTOHL (0x72646572), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/QueueOrderPolicy:1.0
-    17,
-  ACE_NTOHL (0x51756575), 
-  ACE_NTOHL (0x654f7264), 
-  ACE_NTOHL (0x6572506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = QueueOrderPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_QueueOrderPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_QueueOrderPolicy),
-    (char *) &_oc_Messaging_QueueOrderPolicy,
-    0,
-    sizeof (Messaging::QueueOrderPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_QueueOrderPolicy =
-    &_tc_TAO_tc_Messaging_QueueOrderPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RebindPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RebindPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RebindPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RebindPolicy_ptr _tao_objptr =
-    Messaging::RebindPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RebindPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RebindPolicy>::insert (
-      _tao_any,
-      Messaging::RebindPolicy::_tao_any_destructor,
-      Messaging::_tc_RebindPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RebindPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RebindPolicy>::extract (
-        _tao_any,
-        Messaging::RebindPolicy::_tao_any_destructor,
-        Messaging::_tc_RebindPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PriorityRange &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert_copy (
-      _tao_any,
-      Messaging::PriorityRange::_tao_any_destructor,
-      Messaging::_tc_PriorityRange,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::PriorityRange *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert (
-      _tao_any,
-      Messaging::PriorityRange::_tao_any_destructor,
-      Messaging::_tc_PriorityRange,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::PriorityRange *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const Messaging::PriorityRange *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::PriorityRange *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::extract (
-        _tao_any,
-        Messaging::PriorityRange::_tao_any_destructor,
-        Messaging::_tc_PriorityRange,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestPriorityPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RequestPriorityPolicy_ptr _tao_objptr =
-    Messaging::RequestPriorityPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestPriorityPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::insert (
-      _tao_any,
-      Messaging::RequestPriorityPolicy::_tao_any_destructor,
-      Messaging::_tc_RequestPriorityPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RequestPriorityPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::extract (
-        _tao_any,
-        Messaging::RequestPriorityPolicy::_tao_any_destructor,
-        Messaging::_tc_RequestPriorityPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyPriorityPolicy_ptr _tao_elem
-  )
-{
-  Messaging::ReplyPriorityPolicy_ptr _tao_objptr =
-    Messaging::ReplyPriorityPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyPriorityPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::insert (
-      _tao_any,
-      Messaging::ReplyPriorityPolicy::_tao_any_destructor,
-      Messaging::_tc_ReplyPriorityPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyPriorityPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::extract (
-        _tao_any,
-        Messaging::ReplyPriorityPolicy::_tao_any_destructor,
-        Messaging::_tc_ReplyPriorityPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestStartTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::RequestStartTimePolicy_ptr _tao_objptr =
-    Messaging::RequestStartTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestStartTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::insert (
-      _tao_any,
-      Messaging::RequestStartTimePolicy::_tao_any_destructor,
-      Messaging::_tc_RequestStartTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RequestStartTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::extract (
-        _tao_any,
-        Messaging::RequestStartTimePolicy::_tao_any_destructor,
-        Messaging::_tc_RequestStartTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestEndTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::RequestEndTimePolicy_ptr _tao_objptr =
-    Messaging::RequestEndTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestEndTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::insert (
-      _tao_any,
-      Messaging::RequestEndTimePolicy::_tao_any_destructor,
-      Messaging::_tc_RequestEndTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RequestEndTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::extract (
-        _tao_any,
-        Messaging::RequestEndTimePolicy::_tao_any_destructor,
-        Messaging::_tc_RequestEndTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyStartTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::ReplyStartTimePolicy_ptr _tao_objptr =
-    Messaging::ReplyStartTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyStartTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::insert (
-      _tao_any,
-      Messaging::ReplyStartTimePolicy::_tao_any_destructor,
-      Messaging::_tc_ReplyStartTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyStartTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::extract (
-        _tao_any,
-        Messaging::ReplyStartTimePolicy::_tao_any_destructor,
-        Messaging::_tc_ReplyStartTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyEndTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::ReplyEndTimePolicy_ptr _tao_objptr =
-    Messaging::ReplyEndTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyEndTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::insert (
-      _tao_any,
-      Messaging::ReplyEndTimePolicy::_tao_any_destructor,
-      Messaging::_tc_ReplyEndTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyEndTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::extract (
-        _tao_any,
-        Messaging::ReplyEndTimePolicy::_tao_any_destructor,
-        Messaging::_tc_ReplyEndTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRequestTimeoutPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RelativeRequestTimeoutPolicy_ptr _tao_objptr =
-    Messaging::RelativeRequestTimeoutPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRequestTimeoutPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::insert (
-      _tao_any,
-      Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
-      Messaging::_tc_RelativeRequestTimeoutPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RelativeRequestTimeoutPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::extract (
-        _tao_any,
-        Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
-        Messaging::_tc_RelativeRequestTimeoutPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::RoutingTypeRange &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert_copy (
-      _tao_any,
-      Messaging::RoutingTypeRange::_tao_any_destructor,
-      Messaging::_tc_RoutingTypeRange,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RoutingTypeRange *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert (
-      _tao_any,
-      Messaging::RoutingTypeRange::_tao_any_destructor,
-      Messaging::_tc_RoutingTypeRange,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RoutingTypeRange *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const Messaging::RoutingTypeRange *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::RoutingTypeRange *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::extract (
-        _tao_any,
-        Messaging::RoutingTypeRange::_tao_any_destructor,
-        Messaging::_tc_RoutingTypeRange,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RoutingPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RoutingPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RoutingPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RoutingPolicy_ptr _tao_objptr =
-    Messaging::RoutingPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RoutingPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RoutingPolicy>::insert (
-      _tao_any,
-      Messaging::RoutingPolicy::_tao_any_destructor,
-      Messaging::_tc_RoutingPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RoutingPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RoutingPolicy>::extract (
-        _tao_any,
-        Messaging::RoutingPolicy::_tao_any_destructor,
-        Messaging::_tc_RoutingPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::MaxHopsPolicy_ptr _tao_elem
-  )
-{
-  Messaging::MaxHopsPolicy_ptr _tao_objptr =
-    Messaging::MaxHopsPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::MaxHopsPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::insert (
-      _tao_any,
-      Messaging::MaxHopsPolicy::_tao_any_destructor,
-      Messaging::_tc_MaxHopsPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::MaxHopsPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::extract (
-        _tao_any,
-        Messaging::MaxHopsPolicy::_tao_any_destructor,
-        Messaging::_tc_MaxHopsPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::QueueOrderPolicy_ptr _tao_elem
-  )
-{
-  Messaging::QueueOrderPolicy_ptr _tao_objptr =
-    Messaging::QueueOrderPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::QueueOrderPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::insert (
-      _tao_any,
-      Messaging::QueueOrderPolicy::_tao_any_destructor,
-      Messaging::_tc_QueueOrderPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::QueueOrderPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::extract (
-        _tao_any,
-        Messaging::QueueOrderPolicy::_tao_any_destructor,
-        Messaging::_tc_QueueOrderPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
@@ -3415,7 +1696,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -3435,11 +1716,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RebindPolicy
-      >;
-
-  template class
     TAO_Fixed_Var_T<
         Messaging::PriorityRange
       >;
@@ -3450,11 +1726,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Dual_Impl_T<
-        Messaging::PriorityRange
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RequestPriorityPolicy
       >;
@@ -3470,11 +1741,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RequestPriorityPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::ReplyPriorityPolicy
       >;
@@ -3490,11 +1756,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::ReplyPriorityPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RequestStartTimePolicy
       >;
@@ -3510,11 +1771,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RequestStartTimePolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RequestEndTimePolicy
       >;
@@ -3530,11 +1786,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RequestEndTimePolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::ReplyStartTimePolicy
       >;
@@ -3550,11 +1801,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::ReplyStartTimePolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::ReplyEndTimePolicy
       >;
@@ -3570,11 +1816,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::ReplyEndTimePolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RelativeRequestTimeoutPolicy
       >;
@@ -3590,11 +1831,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RelativeRequestTimeoutPolicy
-      >;
-
-  template class
     TAO_Fixed_Var_T<
         Messaging::RoutingTypeRange
       >;
@@ -3605,11 +1841,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Dual_Impl_T<
-        Messaging::RoutingTypeRange
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::RoutingPolicy
       >;
@@ -3625,11 +1856,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::RoutingPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::MaxHopsPolicy
       >;
@@ -3645,11 +1871,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        Messaging::MaxHopsPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         Messaging::QueueOrderPolicy
       >;
@@ -3664,11 +1885,6 @@ CORBA::Boolean operator>> (
         Messaging::QueueOrderPolicy
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        Messaging::QueueOrderPolicy
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -3687,11 +1903,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RebindPolicy \
-      >
-
-# pragma instantiate \
     TAO_Fixed_Var_T< \
         Messaging::PriorityRange \
       >
@@ -3702,11 +1913,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        Messaging::PriorityRange \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RequestPriorityPolicy \
       >
@@ -3722,11 +1928,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RequestPriorityPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::ReplyPriorityPolicy \
       >
@@ -3742,11 +1943,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ReplyPriorityPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RequestStartTimePolicy \
       >
@@ -3762,11 +1958,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RequestStartTimePolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RequestEndTimePolicy \
       >
@@ -3782,11 +1973,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RequestEndTimePolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::ReplyStartTimePolicy \
       >
@@ -3802,11 +1988,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ReplyStartTimePolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::ReplyEndTimePolicy \
       >
@@ -3822,11 +2003,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::ReplyEndTimePolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RelativeRequestTimeoutPolicy \
       >
@@ -3842,11 +2018,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RelativeRequestTimeoutPolicy \
-      >
-
-# pragma instantiate \
     TAO_Fixed_Var_T< \
         Messaging::RoutingTypeRange \
       >
@@ -3857,11 +2028,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        Messaging::RoutingTypeRange \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::RoutingPolicy \
       >
@@ -3877,11 +2043,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RoutingPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::MaxHopsPolicy \
       >
@@ -3897,11 +2058,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::MaxHopsPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         Messaging::QueueOrderPolicy \
       >
@@ -3916,10 +2072,4 @@ CORBA::Boolean operator>> (
         Messaging::QueueOrderPolicy
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::QueueOrderPolicy \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
index ae675e406e1..53273c2d1cc 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_NO_IMPLC_H_
 #define _TAO_IDL_ORIG_MESSAGING_NO_IMPLC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -67,9 +70,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -78,7 +79,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -95,7 +96,7 @@ namespace Messaging
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_out;
@@ -106,7 +107,7 @@ namespace Messaging
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short RebindMode;
   typedef CORBA::Short_out RebindMode_out;
@@ -132,7 +133,7 @@ namespace Messaging
   const Messaging::RebindMode NO_RECONNECT = 2;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short RoutingType;
   typedef CORBA::Short_out RoutingType_out;
@@ -158,7 +159,7 @@ namespace Messaging
   const Messaging::RoutingType ROUTE_STORE_AND_FORWARD = 2;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::UShort Ordering;
   typedef CORBA::UShort_out Ordering_out;
@@ -194,7 +195,7 @@ namespace Messaging
   const CORBA::PolicyType REBIND_POLICY_TYPE = 23U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REBINDPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REBINDPOLICY__VAR_OUT_CH_
@@ -223,7 +224,7 @@ namespace Messaging
 #define _MESSAGING_REBINDPOLICY_CH_
   
   class TAO_Messaging_Export RebindPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RebindPolicy_ptr _ptr_type;
@@ -244,7 +245,7 @@ namespace Messaging
     
     static RebindPolicy_ptr _nil (void)
     {
-      return (RebindPolicy_ptr)0;
+      return static_cast<RebindPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -348,7 +349,7 @@ namespace Messaging
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityRange;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY__VAR_OUT_CH_
@@ -377,7 +378,7 @@ namespace Messaging
 #define _MESSAGING_REQUESTPRIORITYPOLICY_CH_
   
   class TAO_Messaging_Export RequestPriorityPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RequestPriorityPolicy_ptr _ptr_type;
@@ -398,7 +399,7 @@ namespace Messaging
     
     static RequestPriorityPolicy_ptr _nil (void)
     {
-      return (RequestPriorityPolicy_ptr)0;
+      return static_cast<RequestPriorityPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -470,7 +471,7 @@ namespace Messaging
   const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REPLYPRIORITYPOLICY__VAR_OUT_CH_
@@ -499,7 +500,7 @@ namespace Messaging
 #define _MESSAGING_REPLYPRIORITYPOLICY_CH_
   
   class TAO_Messaging_Export ReplyPriorityPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ReplyPriorityPolicy_ptr _ptr_type;
@@ -520,7 +521,7 @@ namespace Messaging
     
     static ReplyPriorityPolicy_ptr _nil (void)
     {
-      return (ReplyPriorityPolicy_ptr)0;
+      return static_cast<ReplyPriorityPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -592,7 +593,7 @@ namespace Messaging
   const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY__VAR_OUT_CH_
@@ -621,7 +622,7 @@ namespace Messaging
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY_CH_
   
   class TAO_Messaging_Export RequestStartTimePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RequestStartTimePolicy_ptr _ptr_type;
@@ -642,7 +643,7 @@ namespace Messaging
     
     static RequestStartTimePolicy_ptr _nil (void)
     {
-      return (RequestStartTimePolicy_ptr)0;
+      return static_cast<RequestStartTimePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -714,7 +715,7 @@ namespace Messaging
   const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY__VAR_OUT_CH_
@@ -743,7 +744,7 @@ namespace Messaging
 #define _MESSAGING_REQUESTENDTIMEPOLICY_CH_
   
   class TAO_Messaging_Export RequestEndTimePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RequestEndTimePolicy_ptr _ptr_type;
@@ -764,7 +765,7 @@ namespace Messaging
     
     static RequestEndTimePolicy_ptr _nil (void)
     {
-      return (RequestEndTimePolicy_ptr)0;
+      return static_cast<RequestEndTimePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -836,7 +837,7 @@ namespace Messaging
   const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY__VAR_OUT_CH_
@@ -865,7 +866,7 @@ namespace Messaging
 #define _MESSAGING_REPLYSTARTTIMEPOLICY_CH_
   
   class TAO_Messaging_Export ReplyStartTimePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ReplyStartTimePolicy_ptr _ptr_type;
@@ -886,7 +887,7 @@ namespace Messaging
     
     static ReplyStartTimePolicy_ptr _nil (void)
     {
-      return (ReplyStartTimePolicy_ptr)0;
+      return static_cast<ReplyStartTimePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -958,7 +959,7 @@ namespace Messaging
   const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_REPLYENDTIMEPOLICY__VAR_OUT_CH_
@@ -987,7 +988,7 @@ namespace Messaging
 #define _MESSAGING_REPLYENDTIMEPOLICY_CH_
   
   class TAO_Messaging_Export ReplyEndTimePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ReplyEndTimePolicy_ptr _ptr_type;
@@ -1008,7 +1009,7 @@ namespace Messaging
     
     static ReplyEndTimePolicy_ptr _nil (void)
     {
-      return (ReplyEndTimePolicy_ptr)0;
+      return static_cast<ReplyEndTimePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1080,7 +1081,7 @@ namespace Messaging
   const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__VAR_OUT_CH_
@@ -1109,7 +1110,7 @@ namespace Messaging
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_
   
   class TAO_Messaging_Export RelativeRequestTimeoutPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RelativeRequestTimeoutPolicy_ptr _ptr_type;
@@ -1130,7 +1131,7 @@ namespace Messaging
     
     static RelativeRequestTimeoutPolicy_ptr _nil (void)
     {
-      return (RelativeRequestTimeoutPolicy_ptr)0;
+      return static_cast<RelativeRequestTimeoutPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1234,7 +1235,7 @@ namespace Messaging
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RoutingTypeRange;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_ROUTINGPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_ROUTINGPOLICY__VAR_OUT_CH_
@@ -1263,7 +1264,7 @@ namespace Messaging
 #define _MESSAGING_ROUTINGPOLICY_CH_
   
   class TAO_Messaging_Export RoutingPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RoutingPolicy_ptr _ptr_type;
@@ -1284,7 +1285,7 @@ namespace Messaging
     
     static RoutingPolicy_ptr _nil (void)
     {
-      return (RoutingPolicy_ptr)0;
+      return static_cast<RoutingPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1356,7 +1357,7 @@ namespace Messaging
   const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_MAXHOPSPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_MAXHOPSPOLICY__VAR_OUT_CH_
@@ -1385,7 +1386,7 @@ namespace Messaging
 #define _MESSAGING_MAXHOPSPOLICY_CH_
   
   class TAO_Messaging_Export MaxHopsPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef MaxHopsPolicy_ptr _ptr_type;
@@ -1406,7 +1407,7 @@ namespace Messaging
     
     static MaxHopsPolicy_ptr _nil (void)
     {
-      return (MaxHopsPolicy_ptr)0;
+      return static_cast<MaxHopsPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1478,7 +1479,7 @@ namespace Messaging
   const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_QUEUEORDERPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_QUEUEORDERPOLICY__VAR_OUT_CH_
@@ -1507,7 +1508,7 @@ namespace Messaging
 #define _MESSAGING_QUEUEORDERPOLICY_CH_
   
   class TAO_Messaging_Export QueueOrderPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef QueueOrderPolicy_ptr _ptr_type;
@@ -1528,7 +1529,7 @@ namespace Messaging
     
     static QueueOrderPolicy_ptr _nil (void)
     {
-      return (QueueOrderPolicy_ptr)0;
+      return static_cast<QueueOrderPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -1610,17 +1611,17 @@ namespace TAO
 #define _MESSAGING_REBINDPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RebindPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RebindPolicy>
   {
-    static Messaging::RebindPolicy_ptr duplicate (
-        Messaging::RebindPolicy_ptr
+    static ::Messaging::RebindPolicy_ptr duplicate (
+        ::Messaging::RebindPolicy_ptr
       );
     static void release (
-        Messaging::RebindPolicy_ptr
+        ::Messaging::RebindPolicy_ptr
       );
-    static Messaging::RebindPolicy_ptr nil (void);
+    static ::Messaging::RebindPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RebindPolicy_ptr p,
+        ::Messaging::RebindPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1631,17 +1632,17 @@ namespace TAO
 #define _MESSAGING_REQUESTPRIORITYPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RequestPriorityPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RequestPriorityPolicy>
   {
-    static Messaging::RequestPriorityPolicy_ptr duplicate (
-        Messaging::RequestPriorityPolicy_ptr
+    static ::Messaging::RequestPriorityPolicy_ptr duplicate (
+        ::Messaging::RequestPriorityPolicy_ptr
       );
     static void release (
-        Messaging::RequestPriorityPolicy_ptr
+        ::Messaging::RequestPriorityPolicy_ptr
       );
-    static Messaging::RequestPriorityPolicy_ptr nil (void);
+    static ::Messaging::RequestPriorityPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RequestPriorityPolicy_ptr p,
+        ::Messaging::RequestPriorityPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1652,17 +1653,17 @@ namespace TAO
 #define _MESSAGING_REPLYPRIORITYPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyPriorityPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyPriorityPolicy>
   {
-    static Messaging::ReplyPriorityPolicy_ptr duplicate (
-        Messaging::ReplyPriorityPolicy_ptr
+    static ::Messaging::ReplyPriorityPolicy_ptr duplicate (
+        ::Messaging::ReplyPriorityPolicy_ptr
       );
     static void release (
-        Messaging::ReplyPriorityPolicy_ptr
+        ::Messaging::ReplyPriorityPolicy_ptr
       );
-    static Messaging::ReplyPriorityPolicy_ptr nil (void);
+    static ::Messaging::ReplyPriorityPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::ReplyPriorityPolicy_ptr p,
+        ::Messaging::ReplyPriorityPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1673,17 +1674,17 @@ namespace TAO
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RequestStartTimePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RequestStartTimePolicy>
   {
-    static Messaging::RequestStartTimePolicy_ptr duplicate (
-        Messaging::RequestStartTimePolicy_ptr
+    static ::Messaging::RequestStartTimePolicy_ptr duplicate (
+        ::Messaging::RequestStartTimePolicy_ptr
       );
     static void release (
-        Messaging::RequestStartTimePolicy_ptr
+        ::Messaging::RequestStartTimePolicy_ptr
       );
-    static Messaging::RequestStartTimePolicy_ptr nil (void);
+    static ::Messaging::RequestStartTimePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RequestStartTimePolicy_ptr p,
+        ::Messaging::RequestStartTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1694,17 +1695,17 @@ namespace TAO
 #define _MESSAGING_REQUESTENDTIMEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RequestEndTimePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RequestEndTimePolicy>
   {
-    static Messaging::RequestEndTimePolicy_ptr duplicate (
-        Messaging::RequestEndTimePolicy_ptr
+    static ::Messaging::RequestEndTimePolicy_ptr duplicate (
+        ::Messaging::RequestEndTimePolicy_ptr
       );
     static void release (
-        Messaging::RequestEndTimePolicy_ptr
+        ::Messaging::RequestEndTimePolicy_ptr
       );
-    static Messaging::RequestEndTimePolicy_ptr nil (void);
+    static ::Messaging::RequestEndTimePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RequestEndTimePolicy_ptr p,
+        ::Messaging::RequestEndTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1715,17 +1716,17 @@ namespace TAO
 #define _MESSAGING_REPLYSTARTTIMEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyStartTimePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyStartTimePolicy>
   {
-    static Messaging::ReplyStartTimePolicy_ptr duplicate (
-        Messaging::ReplyStartTimePolicy_ptr
+    static ::Messaging::ReplyStartTimePolicy_ptr duplicate (
+        ::Messaging::ReplyStartTimePolicy_ptr
       );
     static void release (
-        Messaging::ReplyStartTimePolicy_ptr
+        ::Messaging::ReplyStartTimePolicy_ptr
       );
-    static Messaging::ReplyStartTimePolicy_ptr nil (void);
+    static ::Messaging::ReplyStartTimePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::ReplyStartTimePolicy_ptr p,
+        ::Messaging::ReplyStartTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1736,17 +1737,17 @@ namespace TAO
 #define _MESSAGING_REPLYENDTIMEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyEndTimePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyEndTimePolicy>
   {
-    static Messaging::ReplyEndTimePolicy_ptr duplicate (
-        Messaging::ReplyEndTimePolicy_ptr
+    static ::Messaging::ReplyEndTimePolicy_ptr duplicate (
+        ::Messaging::ReplyEndTimePolicy_ptr
       );
     static void release (
-        Messaging::ReplyEndTimePolicy_ptr
+        ::Messaging::ReplyEndTimePolicy_ptr
       );
-    static Messaging::ReplyEndTimePolicy_ptr nil (void);
+    static ::Messaging::ReplyEndTimePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::ReplyEndTimePolicy_ptr p,
+        ::Messaging::ReplyEndTimePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1757,17 +1758,17 @@ namespace TAO
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RelativeRequestTimeoutPolicy>
   {
-    static Messaging::RelativeRequestTimeoutPolicy_ptr duplicate (
-        Messaging::RelativeRequestTimeoutPolicy_ptr
+    static ::Messaging::RelativeRequestTimeoutPolicy_ptr duplicate (
+        ::Messaging::RelativeRequestTimeoutPolicy_ptr
       );
     static void release (
-        Messaging::RelativeRequestTimeoutPolicy_ptr
+        ::Messaging::RelativeRequestTimeoutPolicy_ptr
       );
-    static Messaging::RelativeRequestTimeoutPolicy_ptr nil (void);
+    static ::Messaging::RelativeRequestTimeoutPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RelativeRequestTimeoutPolicy_ptr p,
+        ::Messaging::RelativeRequestTimeoutPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1778,17 +1779,17 @@ namespace TAO
 #define _MESSAGING_ROUTINGPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RoutingPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RoutingPolicy>
   {
-    static Messaging::RoutingPolicy_ptr duplicate (
-        Messaging::RoutingPolicy_ptr
+    static ::Messaging::RoutingPolicy_ptr duplicate (
+        ::Messaging::RoutingPolicy_ptr
       );
     static void release (
-        Messaging::RoutingPolicy_ptr
+        ::Messaging::RoutingPolicy_ptr
       );
-    static Messaging::RoutingPolicy_ptr nil (void);
+    static ::Messaging::RoutingPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RoutingPolicy_ptr p,
+        ::Messaging::RoutingPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1799,17 +1800,17 @@ namespace TAO
 #define _MESSAGING_MAXHOPSPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::MaxHopsPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::MaxHopsPolicy>
   {
-    static Messaging::MaxHopsPolicy_ptr duplicate (
-        Messaging::MaxHopsPolicy_ptr
+    static ::Messaging::MaxHopsPolicy_ptr duplicate (
+        ::Messaging::MaxHopsPolicy_ptr
       );
     static void release (
-        Messaging::MaxHopsPolicy_ptr
+        ::Messaging::MaxHopsPolicy_ptr
       );
-    static Messaging::MaxHopsPolicy_ptr nil (void);
+    static ::Messaging::MaxHopsPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::MaxHopsPolicy_ptr p,
+        ::Messaging::MaxHopsPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1820,17 +1821,17 @@ namespace TAO
 #define _MESSAGING_QUEUEORDERPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::QueueOrderPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::QueueOrderPolicy>
   {
-    static Messaging::QueueOrderPolicy_ptr duplicate (
-        Messaging::QueueOrderPolicy_ptr
+    static ::Messaging::QueueOrderPolicy_ptr duplicate (
+        ::Messaging::QueueOrderPolicy_ptr
       );
     static void release (
-        Messaging::QueueOrderPolicy_ptr
+        ::Messaging::QueueOrderPolicy_ptr
       );
-    static Messaging::QueueOrderPolicy_ptr nil (void);
+    static ::Messaging::QueueOrderPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::QueueOrderPolicy_ptr p,
+        ::Messaging::QueueOrderPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1944,13 +1945,13 @@ TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Messaging_No_ImplC.i"
+#include "Messaging_No_ImplC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -1962,3 +1963,4 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Routi
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.i b/TAO/tao/Messaging/Messaging_No_ImplC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Messaging/Messaging_No_ImplC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
index b892255d5da..9e12f86dd52 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -80,7 +80,7 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
     Messaging::SYNC_SCOPE_POLICY_TYPE,
 #endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-    TAO_BUFFERING_CONSTRAINT_POLICY_TYPE,
+    TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
 #endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 #if (TAO_HAS_REBIND_POLICY == 1)
     Messaging::REBIND_POLICY_TYPE,
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h
index c627d0f9d9a..371356c65ec 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h
@@ -28,9 +28,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -82,7 +80,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
index 50499dc94b0..2897a284bd5 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -38,7 +38,7 @@ TAO_Messaging_PolicyFactory::create_policy (
 #endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-  if (type == TAO_BUFFERING_CONSTRAINT_POLICY_TYPE)
+  if (type == TAO::BUFFERING_CONSTRAINT_POLICY_TYPE)
     return TAO_Buffering_Constraint_Policy::create (value
                                                     ACE_ENV_ARG_PARAMETER);
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h
index 4ef1cfac19a..174bea8630b 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h
@@ -29,9 +29,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -50,12 +48,10 @@ public:
 };
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_MESSAGING_POLICY_FACTORY_H */
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index c509c7f7f65..eeac1f611ee 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -58,18 +58,32 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
                                           bool &has_timeout,
                                           ACE_Time_Value &time_value)
 {
-  CORBA::Policy_var policy =
-    (stub == 0
-     ? orb_core->stubless_relative_roundtrip_timeout ()
-     : stub->relative_roundtrip_timeout ());
-
-  if (CORBA::is_nil (policy.in ()))
-    {
-      has_timeout = false;
-      return;
-    }
   ACE_TRY_NEW_ENV
     {
+      CORBA::Policy_var policy = 0;
+
+      if (stub == 0)
+        {
+          policy =
+            orb_core->get_cached_policy_including_current (
+              TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          policy =
+            stub->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT
+                                     ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      if (CORBA::is_nil (policy.in ()))
+        {
+          has_timeout = false;
+          return;
+        }
+
       Messaging::RelativeRoundtripTimeoutPolicy_var p =
         Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
           policy.in ()
@@ -217,17 +231,31 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
                              bool &has_synchronization,
                              Messaging::SyncScope &scope)
 {
-  CORBA::Policy_var policy =
-    (stub == 0 ? orb_core->stubless_sync_scope () : stub->sync_scope ());
-
-  if (CORBA::is_nil (policy.in ()))
-    {
-      has_synchronization = 0;
-      return;
-    }
-
   ACE_TRY_NEW_ENV
     {
+      CORBA::Policy_var policy = 0;
+
+      if (stub == 0)
+        {
+          policy =
+            orb_core->get_cached_policy_including_current (
+              TAO_CACHED_POLICY_SYNC_SCOPE
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          policy =
+            stub->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE
+                                     ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      if (CORBA::is_nil (policy.in ()))
+        {
+          has_synchronization = 0;
+          return;
+        }
       Messaging::SyncScopePolicy_var p =
         Messaging::SyncScopePolicy::_narrow (policy.in ());
       ACE_TRY_CHECK;
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index 56bb103fc18..25ee477009e 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -19,9 +19,7 @@
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -157,7 +155,7 @@ private:
 #include "Messaging_Policy_i.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
index a9aa2fd73d3..f8c27c89e00 100644
--- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
@@ -19,18 +19,7 @@
  *        -Wb,post_include="ace/post.h"
  *        Messaging_RT_Policy.pidl
  *
- * after the file is generated a patch must be applied:
- *
- *   cp orig/Messaging_RT_Policy{C,S,S_T}.{h,i,cpp} .
- *   patch < diffs/Messaging_RT_Policy.diff
- *
- * The patch eliminates cycles in the include dependencies.
- *
- * Note: to update the patch file after re-generating the code use:
- *
- *   for i in Messaging_RT_Policy{C,S,S_T}.{h,i,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/Messaging_RT_Policy.diff
+ *   The generated files are ready to use
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
index 0dc6d2c6603..596fb1f9885 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
@@ -26,13 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging_RT_PolicyC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -40,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Messaging_RT_PolicyC.i"
+#include "Messaging_RT_PolicyC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -53,59 +51,6 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_Timeout[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/Timeout:1.0
-    8,
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x6f757400),  // name = Timeout
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Timeout (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_Timeout),
-    (char *) &_oc_Messaging_Timeout,
-    0,
-    sizeof (Messaging::Timeout)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_Timeout =
-    &_tc_TAO_tc_Messaging_Timeout;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::RelativeRoundtripTimeoutPolicy.
@@ -145,12 +90,6 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_RelativeRoundtripTimeoutPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void)
 {}
 
@@ -161,7 +100,7 @@ void
 Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RelativeRoundtripTimeoutPolicy *_tao_tmp_pointer =
-    ACE_static_cast (RelativeRoundtripTimeoutPolicy *, _tao_void_pointer);
+    static_cast<RelativeRoundtripTimeoutPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -218,22 +157,22 @@ Messaging::RelativeRoundtripTimeoutPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -255,123 +194,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  57,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x6c617469), 
-  ACE_NTOHL (0x7665526f), 
-  ACE_NTOHL (0x756e6474), 
-  ACE_NTOHL (0x72697054), 
-  ACE_NTOHL (0x696d656f), 
-  ACE_NTOHL (0x7574506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0
-    31,
-  ACE_NTOHL (0x52656c61), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x526f756e), 
-  ACE_NTOHL (0x64747269), 
-  ACE_NTOHL (0x7054696d), 
-  ACE_NTOHL (0x656f7574), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = RelativeRoundtripTimeoutPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_RelativeRoundtripTimeoutPolicy),
-    (char *) &_oc_Messaging_RelativeRoundtripTimeoutPolicy,
-    0,
-    sizeof (Messaging::RelativeRoundtripTimeoutPolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_RelativeRoundtripTimeoutPolicy =
-    &_tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_objptr =
-    Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::insert (
-      _tao_any,
-      Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
-      Messaging::_tc_RelativeRoundtripTimeoutPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::extract (
-        _tao_any,
-        Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
-        Messaging::_tc_RelativeRoundtripTimeoutPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -390,11 +213,6 @@ operator>>= (
         Messaging::RelativeRoundtripTimeoutPolicy
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        Messaging::RelativeRoundtripTimeoutPolicy
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -412,10 +230,4 @@ operator>>= (
         Messaging::RelativeRoundtripTimeoutPolicy
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::RelativeRoundtripTimeoutPolicy \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
index 77d5c0fbe8a..56b2d500918 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_
 #define _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -60,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -88,7 +89,7 @@ namespace Messaging
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef TimeBase::TimeT Timeout;
   typedef TimeBase::TimeT_out Timeout_out;
@@ -104,7 +105,7 @@ namespace Messaging
   const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__VAR_OUT_CH_
@@ -133,7 +134,7 @@ namespace Messaging
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_
   
   class TAO_Messaging_Export RelativeRoundtripTimeoutPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef RelativeRoundtripTimeoutPolicy_ptr _ptr_type;
@@ -154,7 +155,7 @@ namespace Messaging
     
     static RelativeRoundtripTimeoutPolicy_ptr _nil (void)
     {
-      return (RelativeRoundtripTimeoutPolicy_ptr)0;
+      return static_cast<RelativeRoundtripTimeoutPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -236,17 +237,17 @@ namespace TAO
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RelativeRoundtripTimeoutPolicy>
   {
-    static Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate (
-        Messaging::RelativeRoundtripTimeoutPolicy_ptr
+    static ::Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate (
+        ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
       );
     static void release (
-        Messaging::RelativeRoundtripTimeoutPolicy_ptr
+        ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
       );
-    static Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void);
+    static ::Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
+        ::Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -262,13 +263,13 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRoundtri
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Messaging_RT_PolicyC.i"
+#include "Messaging_RT_PolicyC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -280,3 +281,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.i b/TAO/tao/Messaging/Messaging_RT_PolicyC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
index 469e8d1f9ac..1a1eabdcaaf 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
@@ -19,18 +19,7 @@
  *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
  *        Messaging_SyncScope_Policy.pidl
  *
- * after the file is generated a patch must be applied:
- *
- *   cp orig/Messaging_SyncScope_Policy{C,S}.{h,i,cpp} .
- *   patch < diffs/Messaging_SyncScope_Policy.diff
- *
- * The patch eliminates cycles in the include dependencies.
- *
- * Note: to update the patch file after re-generating the code use:
- *
- *   for i in Messaging_SyncScope_Policy{C,S}.{h,i,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/Messaging_SyncScope_Policy.diff
+ *   The generated files are ready to use
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
index 2258328fd35..698b46a7e97 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
@@ -26,13 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging_SyncScope_PolicyC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -40,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Messaging_SyncScope_PolicyC.i"
+#include "Messaging_SyncScope_PolicyC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -92,12 +90,6 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_SyncScopePolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 Messaging::SyncScopePolicy::SyncScopePolicy (void)
 {}
 
@@ -108,7 +100,7 @@ void
 Messaging::SyncScopePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   SyncScopePolicy *_tao_tmp_pointer =
-    ACE_static_cast (SyncScopePolicy *, _tao_void_pointer);
+    static_cast<SyncScopePolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -165,22 +157,22 @@ Messaging::SyncScopePolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/Messaging/SyncScopePolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -202,115 +194,7 @@ Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_Messaging_SyncScopePolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5379), 
-  ACE_NTOHL (0x6e635363), 
-  ACE_NTOHL (0x6f706550), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/SyncScopePolicy:1.0
-    16,
-  ACE_NTOHL (0x53796e63), 
-  ACE_NTOHL (0x53636f70), 
-  ACE_NTOHL (0x65506f6c), 
-  ACE_NTOHL (0x69637900),  // name = SyncScopePolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScopePolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_Messaging_SyncScopePolicy),
-    (char *) &_oc_Messaging_SyncScopePolicy,
-    0,
-    sizeof (Messaging::SyncScopePolicy)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_SyncScopePolicy =
-    &_tc_TAO_tc_Messaging_SyncScopePolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::SyncScopePolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::SyncScopePolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::SyncScopePolicy_ptr _tao_elem
-  )
-{
-  Messaging::SyncScopePolicy_ptr _tao_objptr =
-    Messaging::SyncScopePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::SyncScopePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::SyncScopePolicy>::insert (
-      _tao_any,
-      Messaging::SyncScopePolicy::_tao_any_destructor,
-      Messaging::_tc_SyncScopePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::SyncScopePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::SyncScopePolicy>::extract (
-        _tao_any,
-        Messaging::SyncScopePolicy::_tao_any_destructor,
-        Messaging::_tc_SyncScopePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -329,11 +213,6 @@ operator>>= (
         Messaging::SyncScopePolicy
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        Messaging::SyncScopePolicy
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -351,10 +230,4 @@ operator>>= (
         Messaging::SyncScopePolicy
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        Messaging::SyncScopePolicy \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
index bfd072dec95..7857451adc5 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_SYNCSCOPE_POLICYC_H_
 #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPE_POLICYC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -60,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -93,7 +94,7 @@ namespace Messaging
   const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY__VAR_OUT_CH_)
 #define _MESSAGING_SYNCSCOPEPOLICY__VAR_OUT_CH_
@@ -122,7 +123,7 @@ namespace Messaging
 #define _MESSAGING_SYNCSCOPEPOLICY_CH_
   
   class TAO_Messaging_Export SyncScopePolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef SyncScopePolicy_ptr _ptr_type;
@@ -143,7 +144,7 @@ namespace Messaging
     
     static SyncScopePolicy_ptr _nil (void)
     {
-      return (SyncScopePolicy_ptr)0;
+      return static_cast<SyncScopePolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -225,17 +226,17 @@ namespace TAO
 #define _MESSAGING_SYNCSCOPEPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<Messaging::SyncScopePolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::Messaging::SyncScopePolicy>
   {
-    static Messaging::SyncScopePolicy_ptr duplicate (
-        Messaging::SyncScopePolicy_ptr
+    static ::Messaging::SyncScopePolicy_ptr duplicate (
+        ::Messaging::SyncScopePolicy_ptr
       );
     static void release (
-        Messaging::SyncScopePolicy_ptr
+        ::Messaging::SyncScopePolicy_ptr
       );
-    static Messaging::SyncScopePolicy_ptr nil (void);
+    static ::Messaging::SyncScopePolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        Messaging::SyncScopePolicy_ptr p,
+        ::Messaging::SyncScopePolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -251,13 +252,13 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::SyncScopePolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Messaging_SyncScope_PolicyC.i"
+#include "Messaging_SyncScope_PolicyC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -269,3 +270,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Messaging/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl
index d06cb9f91cc..a70a56b4232 100644
--- a/TAO/tao/Messaging/TAO_Ext.pidl
+++ b/TAO/tao/Messaging/TAO_Ext.pidl
@@ -20,21 +20,9 @@
  *       -Wb,export_include=messaging_export.h
  *       -Wb,pre_include="ace/pre.h"
  *       -Wb,post_include="ace/post.h"
- *       -Wb,export_include="tao/corbafwd.h" -I$(TAO_ROOT) TAO_Ext.pidl
+ *       -I$(TAO_ROOT) TAO_Ext.pidl
  *
- *   2. Then patch the generated code.  The patch fixes the interface
- *   repository IDs, disables the code under certain configurations,
- *   and eliminates cycles in the include dependencies.
- *
- *   Apply patches using the following commands:
- *
- *   patch < diffs/TAO_ExtC.diff
- *
- *   @note The diffs were generated with these commands:
- *
- *   for i in TAO_ExtC{C,S}.{h,i,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/TAO_ExtC.diff
+ *   The generated files are ready to use
  */
 // ================================================================
 
@@ -50,10 +38,9 @@ module TAO
 {
   const CORBA::PolicyType CONNECTION_TIMEOUT_POLICY_TYPE = 0x54410008;
 
-    local interface ConnectionTimeoutPolicy : CORBA::Policy {
+  local interface ConnectionTimeoutPolicy : CORBA::Policy {
     readonly attribute TimeBase::TimeT relative_expiry;
-    };
-
+  };
 };
 
 #endif /* TAO_TAO_EXT_IDL */
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
index 0f031d2aa95..0c016867048 100644
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -26,13 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "TAO_ExtC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -40,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "TAO_ExtC.i"
+#include "TAO_ExtC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -92,12 +90,6 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*TAO__TAO_ConnectionTimeoutPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 TAO::ConnectionTimeoutPolicy::ConnectionTimeoutPolicy (void)
 {}
 
@@ -108,7 +100,7 @@ void
 TAO::ConnectionTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConnectionTimeoutPolicy *_tao_tmp_pointer =
-    ACE_static_cast (ConnectionTimeoutPolicy *, _tao_void_pointer);
+    static_cast<ConnectionTimeoutPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -165,22 +157,22 @@ TAO::ConnectionTimeoutPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -202,116 +194,7 @@ TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_TAO_ConnectionTimeoutPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x436f6e6e), 
-  ACE_NTOHL (0x65637469), 
-  ACE_NTOHL (0x6f6e5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x74506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/ConnectionTimeoutPolicy:1.0
-    24,
-  ACE_NTOHL (0x436f6e6e), 
-  ACE_NTOHL (0x65637469), 
-  ACE_NTOHL (0x6f6e5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x74506f6c), 
-  ACE_NTOHL (0x69637900),  // name = ConnectionTimeoutPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_ConnectionTimeoutPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_TAO_ConnectionTimeoutPolicy),
-    (char *) &_oc_TAO_ConnectionTimeoutPolicy,
-    0,
-    sizeof (TAO::ConnectionTimeoutPolicy)
-  );
-
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr _tc_ConnectionTimeoutPolicy =
-    &_tc_TAO_tc_TAO_ConnectionTimeoutPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::ConnectionTimeoutPolicy_ptr _tao_elem
-  )
-{
-  TAO::ConnectionTimeoutPolicy_ptr _tao_objptr =
-    TAO::ConnectionTimeoutPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::ConnectionTimeoutPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::insert (
-      _tao_any,
-      TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
-      TAO::_tc_ConnectionTimeoutPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::ConnectionTimeoutPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::extract (
-        _tao_any,
-        TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
-        TAO::_tc_ConnectionTimeoutPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -330,11 +213,6 @@ operator>>= (
         TAO::ConnectionTimeoutPolicy
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        TAO::ConnectionTimeoutPolicy
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -352,10 +230,4 @@ operator>>= (
         TAO::ConnectionTimeoutPolicy
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        TAO::ConnectionTimeoutPolicy \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
index 738074f3f37..b56aa9d341f 100644
--- a/TAO/tao/Messaging/TAO_ExtC.h
+++ b/TAO/tao/Messaging/TAO_ExtC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_TAO_EXTC_H_
 #define _TAO_IDL_ORIG_TAO_EXTC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -60,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -93,7 +94,7 @@ namespace TAO
   const CORBA::PolicyType CONNECTION_TIMEOUT_POLICY_TYPE = 1413545992U;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_TAO_CONNECTIONTIMEOUTPOLICY__VAR_OUT_CH_)
 #define _TAO_CONNECTIONTIMEOUTPOLICY__VAR_OUT_CH_
@@ -122,7 +123,7 @@ namespace TAO
 #define _TAO_CONNECTIONTIMEOUTPOLICY_CH_
   
   class TAO_Messaging_Export ConnectionTimeoutPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ConnectionTimeoutPolicy_ptr _ptr_type;
@@ -143,7 +144,7 @@ namespace TAO
     
     static ConnectionTimeoutPolicy_ptr _nil (void)
     {
-      return (ConnectionTimeoutPolicy_ptr)0;
+      return static_cast<ConnectionTimeoutPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -225,17 +226,17 @@ namespace TAO
 #define _TAO_CONNECTIONTIMEOUTPOLICY__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Messaging_Export Objref_Traits<TAO::ConnectionTimeoutPolicy>
+  struct TAO_Messaging_Export Objref_Traits< ::TAO::ConnectionTimeoutPolicy>
   {
-    static TAO::ConnectionTimeoutPolicy_ptr duplicate (
-        TAO::ConnectionTimeoutPolicy_ptr
+    static ::TAO::ConnectionTimeoutPolicy_ptr duplicate (
+        ::TAO::ConnectionTimeoutPolicy_ptr
       );
     static void release (
-        TAO::ConnectionTimeoutPolicy_ptr
+        ::TAO::ConnectionTimeoutPolicy_ptr
       );
-    static TAO::ConnectionTimeoutPolicy_ptr nil (void);
+    static ::TAO::ConnectionTimeoutPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        TAO::ConnectionTimeoutPolicy_ptr p,
+        ::TAO::ConnectionTimeoutPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -251,13 +252,13 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolic
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "TAO_ExtC.i"
+#include "TAO_ExtC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -269,3 +270,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::Connec
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging/TAO_ExtC.i b/TAO/tao/Messaging/TAO_ExtC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Messaging/TAO_ExtC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
index 2993198aadb..5774394ccd6 100644
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ b/TAO/tao/Messaging/diffs/Messaging.diff
@@ -1,152 +1,35 @@
---- orig/MessagingC.h	Wed Sep  4 19:44:07 2002
-+++ MessagingC.h	Wed Sep  4 19:40:25 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+--- orig/MessagingC.h	2005-02-07 11:55:22.321433600 +0100
++++ MessagingC.h	2005-02-07 11:52:07.681555200 +0100
+@@ -36,6 +36,10 @@
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -27,7 +27,12 @@
- #define _TAO_IDL_ORIG_MESSAGINGC_H_
+ #include "ace/config-all.h"
  
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
-+
-+#ifndef TAO_MESSAGING_SAFE_INCLUDE 
++#ifndef TAO_MESSAGING_SAFE_INCLUDE
 +#error "You should not include MessagingC.h directly, use Messaging.h"
 +#endif /* !TAO_MESSAGING_SAFE_INCLUDE */
 +
- 
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
-@@ -37,6 +42,9 @@
- #include "Messaging_SyncScope_PolicyC.h"
- #include "Messaging_RT_PolicyC.h"
- #include "Messaging_No_ImplC.h"
-+#include "tao/ValueBase.h"
-+#include "tao/ValueFactory.h"
-+
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -682,6 +690,7 @@
- #if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
- #define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
- 
-+#if 0
- TAO_Messaging_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
-     const Messaging::ExceptionHolder::_tao_seq_Octet &
-@@ -691,6 +700,8 @@
-     Messaging::ExceptionHolder::_tao_seq_Octet &
-   );
- 
-+#endif /*if 0*/
-+
- #endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ */
- 
- 
---- orig/MessagingC.i	Wed Sep  4 19:44:07 2002
-+++ MessagingC.i	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingC.cpp	Wed Sep  4 19:44:07 2002
-+++ MessagingC.cpp	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+--- orig/MessagingC.cpp	2005-02-07 11:55:22.321433600 +0100
++++ MessagingC.cpp	2005-02-07 11:52:41.349968000 +0100
+@@ -29,7 +29,7 @@
+ // be\be_codegen.cpp:302
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -23,7 +23,7 @@
- // TAO_IDL - Generated from
- // be/be_codegen.cpp:315
  
 -#include "MessagingC.h"
 +#include "Messaging.h"
+ #include "tao/CDR.h"
+ #include "tao/Object_T.h"
+ #include "tao/ORB_Core.h"
+--- orig/MessagingA.cpp	2005-02-07 11:55:22.321433600 +0100
++++ MessagingA.cpp	2005-02-07 12:00:18.076708800 +0100
+@@ -25,7 +25,7 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
- #include "tao/Stub.h"
- #include "tao/Invocation.h"
---- orig/MessagingS.h	Wed Sep  4 19:44:07 2002
-+++ MessagingS.h	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -27,10 +27,7 @@
- #define _TAO_IDL_ORIG_MESSAGINGS_H_
- 
- #include "ace/pre.h"
--#include "Messaging_SyncScope_PolicyS.h"
--#include "Messaging_RT_PolicyS.h"
--#include "Messaging_No_ImplS.h"
 -#include "MessagingC.h"
 +#include "Messaging.h"
- 
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
---- orig/MessagingS.i	Wed Sep  4 19:44:07 2002
-+++ MessagingS.i	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingS.cpp	Wed Sep  4 19:44:07 2002
-+++ MessagingS.cpp	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingS_T.h	Wed Sep  4 19:44:07 2002
-+++ MessagingS_T.h	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingS_T.i	Wed Sep  4 19:44:07 2002
-+++ MessagingS_T.i	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingS_T.cpp	Wed Sep  4 19:44:07 2002
-+++ MessagingS_T.cpp	Wed Sep  4 15:10:24 2002
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+ #include "tao/Typecode.h"
+ #include "tao/CDR.h"
+ #include "tao/Any.h"
diff --git a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
index 4a462ef74b8..9a3fa46b6eb 100644
--- a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
+++ b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
@@ -1,6 +1,6 @@
---- orig/Messaging_No_ImplC.h	2003-11-03 21:07:08.000000000 -0600
-+++ Messaging_No_ImplC.h	2003-11-03 21:08:32.000000000 -0600
-@@ -50,6 +50,11 @@
+--- orig/Messaging_No_ImplC.h	2005-02-07 11:50:46.665059200 +0100
++++ Messaging_No_ImplC.h	2005-02-07 11:53:22.098561600 +0100
+@@ -52,6 +52,11 @@
  #include "tao/PolicyC.h"
  #include "tao/PollableC.h"
  
diff --git a/TAO/tao/Messaging/diffs/Messaging_RT_Policy.diff b/TAO/tao/Messaging/diffs/Messaging_RT_Policy.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/Messaging/diffs/Messaging_RT_Policy.diff
+++ /dev/null
diff --git a/TAO/tao/Messaging/diffs/Messaging_SyncScope_Policy.diff b/TAO/tao/Messaging/diffs/Messaging_SyncScope_Policy.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/Messaging/diffs/Messaging_SyncScope_Policy.diff
+++ /dev/null
diff --git a/TAO/tao/Messaging/diffs/TAO_ExtC.diff b/TAO/tao/Messaging/diffs/TAO_ExtC.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/Messaging/diffs/TAO_ExtC.diff
+++ /dev/null
diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp
index 8646177cc0f..33787c24ac3 100644
--- a/TAO/tao/Messaging_PolicyValueA.cpp
+++ b/TAO/tao/Messaging_PolicyValueA.cpp
@@ -27,71 +27,73 @@
 
 #include "Messaging_PolicyValueC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_Messaging_PolicyValue[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
     12,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = PolicyValue
   2, // member count
     6,
-  ACE_NTOHL (0x70747970),
+  ACE_NTOHL (0x70747970), 
   ACE_NTOHL (0x65000000),  // name = ptype
     CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f506f), 
+    ACE_NTOHL (0x6c696379), 
+    ACE_NTOHL (0x54797065), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
         11,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63795479),
+    ACE_NTOHL (0x506f6c69), 
+    ACE_NTOHL (0x63795479), 
     ACE_NTOHL (0x70650000),  // name = PolicyType
         CORBA::tk_ulong,
 
 
   7,
-  ACE_NTOHL (0x7076616c),
+  ACE_NTOHL (0x7076616c), 
   ACE_NTOHL (0x75650000),  // name = pvalue
     CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
         9,
-    ACE_NTOHL (0x4f637465),
-    ACE_NTOHL (0x74536571),
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
     ACE_NTOHL (0x0),  // name = OctetSeq
         CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
@@ -108,7 +110,7 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue (
     sizeof (_oc_Messaging_PolicyValue),
     (char *) &_oc_Messaging_PolicyValue,
     0,
-    sizeof (Messaging::PolicyValue)
+    0
   );
 
 namespace Messaging
@@ -118,27 +120,27 @@ namespace Messaging
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
     15,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
-  ACE_NTOHL (0x6c756553),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x6c756553), 
   ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
     CORBA::tk_sequence, // typecode kind
   264, // encapsulation length
@@ -147,62 +149,62 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
     248, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       38,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x4d657373),
-      ACE_NTOHL (0x6167696e),
-      ACE_NTOHL (0x672f506f),
-      ACE_NTOHL (0x6c696379),
-      ACE_NTOHL (0x56616c75),
-      ACE_NTOHL (0x653a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x4d657373), 
+      ACE_NTOHL (0x6167696e), 
+      ACE_NTOHL (0x672f506f), 
+      ACE_NTOHL (0x6c696379), 
+      ACE_NTOHL (0x56616c75), 
+      ACE_NTOHL (0x653a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
             12,
-      ACE_NTOHL (0x506f6c69),
-      ACE_NTOHL (0x63795661),
+      ACE_NTOHL (0x506f6c69), 
+      ACE_NTOHL (0x63795661), 
       ACE_NTOHL (0x6c756500),  // name = PolicyValue
       2, // member count
             6,
-      ACE_NTOHL (0x70747970),
+      ACE_NTOHL (0x70747970), 
       ACE_NTOHL (0x65000000),  // name = ptype
             CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f506f),
-        ACE_NTOHL (0x6c696379),
-        ACE_NTOHL (0x54797065),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f506f), 
+        ACE_NTOHL (0x6c696379), 
+        ACE_NTOHL (0x54797065), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
                 11,
-        ACE_NTOHL (0x506f6c69),
-        ACE_NTOHL (0x63795479),
+        ACE_NTOHL (0x506f6c69), 
+        ACE_NTOHL (0x63795479), 
         ACE_NTOHL (0x70650000),  // name = PolicyType
                 CORBA::tk_ulong,
 
 
       7,
-      ACE_NTOHL (0x7076616c),
+      ACE_NTOHL (0x7076616c), 
       ACE_NTOHL (0x75650000),  // name = pvalue
             CORBA::tk_alias, // typecode kind for typedefs
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         31,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f63),
-        ACE_NTOHL (0x74657453),
-        ACE_NTOHL (0x65713a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f63), 
+        ACE_NTOHL (0x74657453), 
+        ACE_NTOHL (0x65713a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
                 9,
-        ACE_NTOHL (0x4f637465),
-        ACE_NTOHL (0x74536571),
+        ACE_NTOHL (0x4f637465), 
+        ACE_NTOHL (0x74536571), 
         ACE_NTOHL (0x0),  // name = OctetSeq
                 CORBA::tk_sequence, // typecode kind
         12, // encapsulation length
@@ -222,7 +224,7 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq (
     sizeof (_oc_Messaging_PolicyValueSeq),
     (char *) &_oc_Messaging_PolicyValueSeq,
     0,
-    sizeof (Messaging::PolicyValueSeq)
+    0
   );
 
 namespace Messaging
@@ -231,7 +233,7 @@ namespace Messaging
     &_tc_TAO_tc_Messaging_PolicyValueSeq;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -268,8 +270,8 @@ CORBA::Boolean operator>>= (
     Messaging::PolicyValue *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const Messaging::PolicyValue *&,
+  return _tao_any >>= const_cast<
+      const Messaging::PolicyValue *&> (
       _tao_elem
     );
 }
@@ -289,7 +291,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -326,8 +328,8 @@ CORBA::Boolean operator>>= (
     Messaging::PolicyValueSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const Messaging::PolicyValueSeq *&,
+  return _tao_any >>= const_cast<
+      const Messaging::PolicyValueSeq *&> (
       _tao_elem
     );
 }
@@ -347,8 +349,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -373,5 +373,4 @@ CORBA::Boolean operator>>= (
         Messaging::PolicyValueSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index 40fb1733d5c..19b15c675cf 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -26,23 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging_PolicyValueC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/ORB_Core.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Messaging_PolicyValueC.i"
+#include "Messaging_PolicyValueC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -59,7 +59,7 @@ Messaging::PolicyValue::_tao_any_destructor (
   )
 {
   PolicyValue *_tao_tmp_pointer =
-    ACE_static_cast (PolicyValue *, _tao_void_pointer);
+    static_cast<PolicyValue *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -110,7 +110,7 @@ void Messaging::PolicyValueSeq::_tao_any_destructor (
   )
 {
   PolicyValueSeq * _tao_tmp_pointer =
-    ACE_static_cast (PolicyValueSeq *, _tao_void_pointer);
+    static_cast<PolicyValueSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -150,7 +150,7 @@ CORBA::Boolean operator<< (
     const Messaging::PolicyValueSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -212,7 +212,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -309,4 +309,3 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index 87b0427442a..73f7937ffdd 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -26,23 +26,30 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
 #define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/IOP_IORC.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
+#include "tao/Sequence_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/VarOut_T.h"
 
-#include "tao/PolicyC.h"
+#include "tao/IOP_IORC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -57,9 +64,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -224,13 +229,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Messaging_PolicyValueC.i"
+#include "Messaging_PolicyValueC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -242,3 +247,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging_PolicyValueC.i b/TAO/tao/Messaging_PolicyValueC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Messaging_PolicyValueC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
index d421c1d3850..e730328941d 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Messaging_SyncScopeC.h"
@@ -37,15 +37,14 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Messaging_SyncScopeC.i"
+#include "Messaging_SyncScopeC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
-
diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h
index 4bbc538c50e..e41d6af6997 100644
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ b/TAO/tao/Messaging_SyncScopeC.h
@@ -26,20 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
 #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Basic_Types.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -55,9 +57,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -111,13 +111,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "Messaging_SyncScopeC.i"
+#include "Messaging_SyncScopeC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -129,3 +129,4 @@ namespace TAO
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Messaging_SyncScopeC.i b/TAO/tao/Messaging_SyncScopeC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Messaging_SyncScopeC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index a49d6a35bd1..bc703ef1535 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -59,8 +59,11 @@ static const char ior_prefix[] = "IOR:";
 
 // = Static initialization.
 
-// Count of the number of ORBs.
-int CORBA::ORB::orb_init_count_ = 0;
+namespace
+{
+  // Count of the number of ORBs.
+  int orb_init_count = 0;
+}
 
 // ****************************************************************
 
@@ -1284,19 +1287,19 @@ CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
 // ****************************************************************
 
 void
-CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
 {
   // This method should be invoked atomically.  It is the caller's
   // responsibility to ensure that this condition is satisfied.
 
   // Prevent multiple initializations.
-  if (CORBA::ORB::orb_init_count_ != 0)
+  if (orb_init_count != 0)
     {
       return;
     }
   else
     {
-      ++CORBA::ORB::orb_init_count_;
+      ++orb_init_count;
     }
 
   // initialize the system TypeCodes
@@ -1453,25 +1456,28 @@ CORBA::ORB_init (int &argc,
   ACE_UNUSED_ARG(ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
 
   // Use this string variable to hold the orbid
-  ACE_CString orbid_string = orbid;
+  ACE_CString orbid_string (orbid);
 
   // Copy command line parameter not to use original.
   ACE_Argv_Type_Converter command_line(argc, argv);
 
-  // Using ACE_Static_Object_Lock::instance() precludes <ORB_init>
-  // from being called within a static object CTOR.
-  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard,
-                            *ACE_Static_Object_Lock::instance (),
-                            CORBA::ORB::_nil ()));
-
-  // Make sure TAO's singleton manager is initialized.
-  if (TAO_Singleton_Manager::instance ()->init () == -1)
-    {
-      return CORBA::ORB::_nil ();
-    }
-
-  CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+  {
+    // Using ACE_Static_Object_Lock::instance() precludes ORB_init()
+    // from being called within a static object CTOR.
+    ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
+                              guard,
+                              *ACE_Static_Object_Lock::instance (),
+                              CORBA::ORB::_nil ()));
+
+    // Make sure TAO's singleton manager is initialized.
+    if (TAO_Singleton_Manager::instance ()->init () == -1)
+      {
+        return CORBA::ORB::_nil ();
+      }
+
+    TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+  }
 
   // Make sure the following is done after the global ORB
   // initialization since we need to have exceptions initialized.
@@ -1539,17 +1545,23 @@ CORBA::ORB_init (int &argc,
     }
 
   // Get ORB Core
-  TAO_ORB_Core *oc =
-    TAO_ORB_Table::instance ()->find (orbid_string.c_str ());
+  TAO_ORB_Core_Auto_Ptr oc (
+    TAO::ORB_Table::instance ()->find (orbid_string.c_str ()));
 
-  // The ORB was initialized already, just return that one!
-  if (oc != 0)
+  // The ORB was already initialized.  Just return that one.
+  if (oc.get () != 0)
     {
+      ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
+                                guard,
+                                *ACE_Static_Object_Lock::instance (),
+                                CORBA::ORB::_nil ()));
+
       if (oc->has_shutdown ())
         {
           // As defined by the CORBA 2.3 specification, throw a
-          // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB
-          // has shutdown by the time an ORB function is called.
+          // CORBA::BAD_INV_ORDER exception with minor code 4 if the
+          // ORB has shutdown by the time an ORB function is
+          // called.
 
           // @@ Does the BAD_INV_ORDER exception apply here?
           //       -Ossama
@@ -1561,28 +1573,31 @@ CORBA::ORB_init (int &argc,
 
       return CORBA::ORB::_duplicate (oc->orb ());
     }
-
-  // An ORB corresponding to the desired ORBid doesn't exist so create
-  // a new one.
-  ACE_NEW_THROW_EX (oc,
-                    TAO_ORB_Core (orbid_string.c_str ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
-
-  // The ORB table increases the reference count on the ORB Core so do
-  // not release it here.  Allow the TAO_ORB_Core_Auto_Ptr do decrease
-  // the reference on the ORB Core when it goes out of scope.
-  TAO_ORB_Core_Auto_Ptr safe_oc (oc);
+  else
+    {
+      // An ORB corresponding to the desired ORBid doesn't exist so create
+      // a new one.
+      TAO_ORB_Core * tmp;
+      ACE_NEW_THROW_EX (tmp,
+                        TAO_ORB_Core (orbid_string.c_str ()),
+                        CORBA::NO_MEMORY (
+                          CORBA::SystemException::_tao_minor_code (0,
+                                                                   ENOMEM),
+                          CORBA::COMPLETED_NO));
+      ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+
+      // The ORB table increases the reference count on the ORB Core
+      // so do not release it here.  Allow the TAO_ORB_Core_Auto_Ptr
+      // do decrease the reference on the ORB Core when it goes out of
+      // scope.
+      oc.reset (tmp);
+    }
 
   // Initialize the Service Configurator.  This must occur before the
   // ORBInitializer::pre_init() method is invoked on each registered
   // ORB initializer.
-  int result = TAO_Internal::open_services (command_line.get_argc (),
-                                            command_line.get_TCHAR_argv ());
+  int result = TAO::ORB::open_services (command_line.get_argc (),
+                                        command_line.get_TCHAR_argv ());
 
   // Check for errors returned from <TAO_Internal::open_services>.
   if (result != 0 && errno != ENOENT)
@@ -1600,9 +1615,9 @@ CORBA::ORB_init (int &argc,
     }
 
   // Run the registered ORB initializers, and initialize the ORB_Core.
-  TAO_ORBInitInfo *orb_init_info_temp;
+  TAO_ORBInitInfo * orb_init_info_temp;
   ACE_NEW_THROW_EX (orb_init_info_temp,
-                    TAO_ORBInitInfo (safe_oc.get (),
+                    TAO_ORBInitInfo (oc.get (),
                                      command_line.get_argc(),
                                      command_line.get_ASCII_argv()),
                     CORBA::NO_MEMORY (
@@ -1619,14 +1634,14 @@ CORBA::ORB_init (int &argc,
 
   // Call the ORBInitializer::pre_init() on each registered ORB
   // initializer.
-  TAO_ORBInitializer_Registry::instance ()->pre_init (orb_init_info.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+  TAO::ORBInitializer_Registry::instance ()->pre_init (orb_init_info.in ()
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Initialize the ORB Core instance.
-  result = safe_oc->init (command_line.get_argc(),
-                          command_line.get_ASCII_argv()
-                          ACE_ENV_ARG_PARAMETER);
+  result = oc->init (command_line.get_argc(),
+                     command_line.get_ASCII_argv()
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Check for errors and return nil pseudo-reference on error.
@@ -1640,8 +1655,8 @@ CORBA::ORB_init (int &argc,
 
   // Call the ORBInitializer::post_init() on each registered ORB
   // initializer.
-  TAO_ORBInitializer_Registry::instance ()->post_init (orb_init_info.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+  TAO::ORBInitializer_Registry::instance ()->post_init (orb_init_info.in ()
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -1661,8 +1676,8 @@ CORBA::ORB_init (int &argc,
     }
 
   // Before returning remember to store the ORB into the table...
-  if (TAO_ORB_Table::instance ()->bind (orbid_string.c_str (),
-                                        safe_oc.get ()) != 0)
+  if (TAO::ORB_Table::instance ()->bind (orbid_string.c_str (),
+                                         oc.get ()) != 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (0,
                                        CORBA::COMPLETED_NO),
                       CORBA::ORB::_nil ());
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 325afa29502..5a094b44b97 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -24,6 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "orb_typesC.h"
 #include "objectid.h"
 #include "Policy_ForwardC.h"
 #include "OBV_Constants.h"
@@ -52,6 +53,7 @@ class TAO_OutputCDR;
 class TAO_Stub;
 class TAO_Valuetype_Adapter;
 class TAO_Acceptor_Filter;
+class TAO_SeqElem_String_Manager;
 
 // ****************************************************************
 
@@ -72,20 +74,7 @@ namespace CORBA
   class Context;
   typedef Context * Context_ptr;
 
-  // Used at present only in Typecode_Constants.cpp, to make _tc_ORBid.
   // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
-  typedef char * ORBid;
-  typedef String_var ORBid_var;
-  typedef String_out ORBid_out;
-  extern TAO_Export TypeCode_ptr _tc_ORBid;
-
-  // A couple of string typedefs used by various libs and services.
-  typedef char * Identifier;
-  typedef String_var Identifier_var;
-  typedef String_out Identifier_out;
-  typedef char * RepositoryId;
-  typedef String_var RepositoryId_var;
-  typedef String_out RepositoryId_out;
 
   typedef
     TAO_MngSeq_Var_T<
@@ -559,10 +548,6 @@ namespace CORBA
     /// Resolve the POA.
     CORBA::Object_ptr resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL);
 
-    /// Initialize the ORB globals correctly, i.e., only when they
-    /// haven't been initialized yet.
-    static void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL);
-
     // Reference counting...
     CORBA::ULong _incr_refcnt (void);
     CORBA::ULong _decr_refcnt (void);
@@ -655,22 +640,9 @@ namespace CORBA
     /// ORB.
     CORBA::ULong refcount_;
 
-    /// Count of the number of times that @c ORB_init() has been
-    /// called.
-    /**
-     * This must be protected by @c ACE_Static_Object_Lock.
-     */
-    static int orb_init_count_;
-
     /// The ORB_Core that created us....
     TAO_ORB_Core *orb_core_;
 
-    /// @note No freaking clue why this is in the ORB??
-#if 0
-    /// If non-0 then this is the Factory for OBV unmarshaling
-    TAO_ValueFactory_Map *valuetype_factory_map_;
-#endif /**/
-
     /// Decides whether to use the URL notation or to use IOR notation.
     CORBA::Boolean use_omg_ior_format_;
 
@@ -684,6 +656,17 @@ namespace CORBA
   };
 }  // End namespace CORBA
 
+namespace TAO
+{
+  namespace ORB
+  {
+    /// Initialize the ORB globals correctly, i.e., only when they
+    /// haven't been initialized yet.
+    void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL);
+  }
+}
+
+
 #if defined (__ACE_INLINE__)
 # include "tao/ORB.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h
index cd4a6c0a3df..ef3bb89cc46 100644
--- a/TAO/tao/ORBInitInfo.h
+++ b/TAO/tao/ORBInitInfo.h
@@ -26,9 +26,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -206,10 +204,8 @@ public:
    * TAO_ORBInitInfo-specific methods and types.
    */
   //@{
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_ORBInitInfo_ptr _ptr_type;
   typedef TAO_ORBInitInfo_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
 
   static TAO_ORBInitInfo_ptr _duplicate (TAO_ORBInitInfo_ptr obj);
 
@@ -295,7 +291,7 @@ namespace TAO
 #include "ORBInitInfo.inl"
 #endif  /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 4a7aa25a200..286d3bd2362 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -7,6 +7,7 @@
 #include "SystemException.h"
 
 #include "ace/Static_Object_Lock.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 
 ACE_RCSID (tao,
@@ -21,49 +22,56 @@ PortableInterceptor::register_orb_initializer (
   PortableInterceptor::ORBInitializer_ptr init
   ACE_ENV_ARG_DECL)
 {
-  // Using ACE_Static_Object_Lock::instance() precludes
-  // <register_orb_initializer> from being called within a static
-  // object CTOR.
-  ACE_MT (ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX,
-                     guard,
-                     *ACE_Static_Object_Lock::instance ()));
-
-  // Make sure TAO's singleton manager is initialized.
-  if (TAO_Singleton_Manager::instance ()->init () == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) register_orb_initializer: ")
-                  ACE_TEXT ("Unable to pre-initialize TAO\n")));
-    }
-
-  CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  {
+    // Using ACE_Static_Object_Lock::instance() precludes
+    // register_orb_initializer() from being called within a static
+    // object CTOR.
+    ACE_MT (ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX,
+                       guard,
+                       *ACE_Static_Object_Lock::instance ()));
+
+    // Make sure TAO's singleton manager is initialized.
+    if (TAO_Singleton_Manager::instance ()->init () == -1)
+      {
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) register_orb_initializer: ")
+                    ACE_TEXT ("Unable to pre-initialize TAO\n")));
+      }
+
+    TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
+  }
 
   // Make sure the following is done after the global ORB
   // initialization since we need to have exceptions initialized.
 
-  TAO_ORBInitializer_Registry::instance ()->register_orb_initializer (
+  TAO::ORBInitializer_Registry::instance ()->register_orb_initializer (
     init
     ACE_ENV_ARG_PARAMETER);
 }
 
 // ------------------------------------------------------------------
 
-TAO_ORBInitializer_Registry::TAO_ORBInitializer_Registry (void)
-  : initializers_ ()
+TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
+  : lock_ (),
+    initializers_ ()
 {
 }
 
 void
-TAO_ORBInitializer_Registry::register_orb_initializer (
+TAO::ORBInitializer_Registry::register_orb_initializer (
   PortableInterceptor::ORBInitializer_ptr init
   ACE_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (init))
     {
+      ACE_GUARD (TAO_SYNCH_MUTEX,
+                 guard,
+                 this->lock_);
+
       // Increase the length of the ORBInitializer array by one.
-      const size_t cur_len = this->initializers_.size ();
-      const size_t new_len = cur_len + 1;
+      size_t const cur_len = this->initializers_.size ();
+      size_t const new_len = cur_len + 1;
       if (this->initializers_.size (new_len) != 0)
         ACE_THROW (CORBA::INTERNAL ());
 
@@ -80,11 +88,15 @@ TAO_ORBInitializer_Registry::register_orb_initializer (
 }
 
 void
-TAO_ORBInitializer_Registry::pre_init (
+TAO::ORBInitializer_Registry::pre_init (
   PortableInterceptor::ORBInitInfo_ptr info
   ACE_ENV_ARG_DECL)
 {
-  const size_t initializer_count = this->initializers_.size ();
+  ACE_GUARD (TAO_SYNCH_MUTEX,
+             guard,
+             this->lock_);
+
+  size_t const initializer_count (this->initializers_.size ());
   for (size_t i = 0; i < initializer_count; ++i)
     {
       this->initializers_[i]->pre_init (info
@@ -94,11 +106,15 @@ TAO_ORBInitializer_Registry::pre_init (
 }
 
 void
-TAO_ORBInitializer_Registry::post_init (
+TAO::ORBInitializer_Registry::post_init (
   PortableInterceptor::ORBInitInfo_ptr info
   ACE_ENV_ARG_DECL)
 {
-  const size_t initializer_count = this->initializers_.size ();
+  ACE_GUARD (TAO_SYNCH_MUTEX,
+             guard,
+             this->lock_);
+
+  size_t const initializer_count (this->initializers_.size ());
   for (size_t i = 0; i < initializer_count; ++i)
     {
       this->initializers_[i]->post_init (info
@@ -107,25 +123,25 @@ TAO_ORBInitializer_Registry::post_init (
     }
 }
 
-TAO_ORBInitializer_Registry *
-TAO_ORBInitializer_Registry::instance (void)
+TAO::ORBInitializer_Registry *
+TAO::ORBInitializer_Registry::instance (void)
 {
   return
-    TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>::instance ();
+    TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX>::instance ();
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>;
+template class TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX>;
 template class ACE_Array_Base<PortableInterceptor::ORBInitializer_var>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>
+#pragma instantiate TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX>
 #pragma instantiate ACE_Array_Base<PortableInterceptor::ORBInitializer_var>
 
 #elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 
-template TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>::singleton_;
+template TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX>::singleton_;
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
index 7ca80da1c2a..e20773440a7 100644
--- a/TAO/tao/ORBInitializer_Registry.h
+++ b/TAO/tao/ORBInitializer_Registry.h
@@ -24,6 +24,8 @@
 #include "Objref_VarOut_T.h"
 #include "Environment.h"
 
+#include "ace/Thread_Mutex.h"
+
 namespace PortableInterceptor
 {
   class ORBInitializer;
@@ -46,71 +48,77 @@ namespace PortableInterceptor
     );
 }
 
-/**
- * @class TAO_ORBInitializer_Registry
- *
- * @brief Global list that contains all portable interceptor ORB
- *        initializers.
- *
- * @note This class should be instantiated via its instance() method.
- *       Normally this would be enforced by making the constructor
- *       protected but that forces a friend declaration 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 should only be one!
- */
-class TAO_ORBInitializer_Registry
+namespace TAO
 {
-  friend void PortableInterceptor::register_orb_initializer (
+  /**
+   * @class ORBInitializer_Registry
+   *
+   * @brief Global list that contains all portable interceptor ORB
+   *        initializers.
+   *
+   * @note This class should be instantiated via its instance()
+   *       method.  Normally this would be enforced by making the
+   *       constructor protected but that forces a friend declaration
+   *       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
+   *       should only be one!
+   */
+  class ORBInitializer_Registry
+  {
+    friend void PortableInterceptor::register_orb_initializer (
                   PortableInterceptor::ORBInitializer_ptr init
                   ACE_ENV_ARG_DECL);
 
-  friend CORBA::ORB_ptr CORBA::ORB_init (int &,
-                                         char *argv[],
-                                         const char *,
-                                         CORBA::Environment &);
+    friend CORBA::ORB_ptr CORBA::ORB_init (int &,
+                                           char *argv[],
+                                           const char *,
+                                           CORBA::Environment &);
 
-public:
-  /// Only allow this class to be instantiated as a singleton
-  /// instance, so declare the constructor as protected.
-  /**
-   * @note See the note in the class description for an explanation of
-   *       why this constructor is not protected.
-   */
-  TAO_ORBInitializer_Registry (void);
-
-protected:
-  /// Register an ORBInitializer with the underlying ORBInitializer
-  /// array.
-  void register_orb_initializer (
-    PortableInterceptor::ORBInitializer_ptr init
-    ACE_ENV_ARG_DECL);
-
-  /// Begin initialization of all registered ORBInitializers before
-  /// the ORB itself is initialized.
-  void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 ACE_ENV_ARG_DECL);
-
-  /// Complete initialization of all registered ORBInitializers after
-  /// the ORB has been initialized.
-  void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  ACE_ENV_ARG_DECL);
+  public:
+
+    /// Only allow this class to be instantiated as a singleton
+    /// instance, so declare the constructor as protected.
+    /**
+     * @note See the note in the class description for an explanation of
+     *       why this constructor is not protected.
+     */
+    ORBInitializer_Registry (void);
+
+  protected:
+
+    /// Register an ORBInitializer with the underlying ORBInitializer
+    /// array.
+    void register_orb_initializer (PortableInterceptor::ORBInitializer_ptr init
+                                   ACE_ENV_ARG_DECL);
 
-  /// Return a unique singleton instance.
-  static TAO_ORBInitializer_Registry *instance (void);
+    /// Begin initialization of all registered ORBInitializers before
+    /// the ORB itself is initialized.
+    void pre_init (PortableInterceptor::ORBInitInfo_ptr info
+                   ACE_ENV_ARG_DECL);
 
-private:
-  /// Prevent copying
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_ORBInitializer_Registry (const TAO_ORBInitializer_Registry &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_ORBInitializer_Registry &))
+    /// Complete initialization of all registered ORBInitializers after
+    /// the ORB has been initialized.
+    void post_init (PortableInterceptor::ORBInitInfo_ptr info
+                    ACE_ENV_ARG_DECL);
 
-private:
+    /// Return a unique singleton instance.
+    static ORBInitializer_Registry * instance (void);
 
-  /// Dynamic array containing registered ORBInitializers.
-  ACE_Array_Base<PortableInterceptor::ORBInitializer_var> initializers_;
-};
+  private:
+    // Prevent copying
+    ORBInitializer_Registry (const ORBInitializer_Registry &);
+    void operator= (const ORBInitializer_Registry &);
+
+  private:
+
+    TAO_SYNCH_MUTEX lock_;
+
+    /// Dynamic array containing registered ORBInitializers.
+    ACE_Array_Base<PortableInterceptor::ORBInitializer_var> initializers_;
+  };
+}
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h
index 585914e1604..1efe5541709 100644
--- a/TAO/tao/ORB_Constants.h
+++ b/TAO/tao/ORB_Constants.h
@@ -171,7 +171,7 @@ const CORBA::ULong TAO_TAG_SHMEM_PROFILE = 0x54414f02U;
 // const CORBA::ULong TAO_TAG_MSGQ_PROFILE = 0x54414f03U;
 
 /// UDP
-const CORBA::ULong TAO_TAG_UDP_PROFILE = 0x54414f04U;
+const CORBA::ULong TAO_TAG_DIOP_PROFILE = 0x54414f04U;
 
 /// Unreliable IP Multicast
 const CORBA::ULong TAO_TAG_UIPMC_PROFILE = 0x54414f0CU;
@@ -185,6 +185,9 @@ const CORBA::ULong TAO_TAG_NSKFS_PROFILE = 0x00003039U;
 /// Tandem (HP) Pathsend Protocol
 const CORBA::ULong TAO_TAG_NSKPW_PROFILE = 0x0000303AU;
 
+// Default DiffServ CodePoint.
+const int IPDSFIELD_DSCP_DEFAULT = 0x00;
+
 /**
  * @name Minor Code Encoding
  *
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index f32effcf875..8b4a5d76f7f 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -28,16 +28,21 @@
 #include "TAOC.h"
 #include "Endpoint_Selector_Factory.h"
 #include "Client_Strategy_Factory.h"
+#include "Adapter_Factory.h"
+#include "Adapter.h"
+#include "GUIResource_Factory.h"
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 # include "ClientRequestInfo.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1  */
 
+#include "ace/Reactor.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Static_Object_Lock.h"
 
+
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 // Needed to set ACE_LOG_MSG::msg_ostream()
 // FUZZ: disable check_for_streams_include
@@ -109,8 +114,8 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
     typecodefactory_adapter_name_ ("TypeCodeFactory_Adapter"),
     iorinterceptor_adapter_factory_name_ ("IORInterceptor_Adapter_Factory"),
     valuetype_adapter_name_ ("Valuetype_Adapter"),
-    poa_factory_name_ ("TAO_POA"),
-    poa_factory_directive_ ("dynamic TAO_POA Service_Object * TAO_PortableServer:_make_TAO_Object_Adapter_Factory()")
+    poa_factory_name_ ("TAO_Object_Adapter_Factory"),
+    poa_factory_directive_ ("dynamic TAO_Object_Adapter_Factory Service_Object * TAO_PortableServer:_make_TAO_Object_Adapter_Factory()")
 {
 }
 
@@ -118,7 +123,6 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
 
 TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
   : protocols_hooks_ (0),
-    protocols_hooks_checked_ (false),
     lock_ (),
     thread_lane_resources_manager_ (0),
     collocation_resolver_ (0),
@@ -250,18 +254,6 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
   CORBA::release (this->orb_);
 }
 
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-CORBA::Policy_ptr
-TAO_ORB_Core::default_buffering_constraint (void) const
-{
-  return this->default_policies_->
-              get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
-}
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-
 int
 TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 {
@@ -323,21 +315,27 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
   int std_profile_components = 0;
 #endif /* TAO_STD_PROFILE_COMPONENTS */
 
+  // Copy command line parameter not to use original.
+  ACE_Argv_Type_Converter command_line (argc, argv);
+
+  ACE_Arg_Shifter arg_shifter (command_line.get_argc (),
+                               command_line.get_TCHAR_argv ());
+
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    monitor,
+                    this->lock_,
+                    -1);
+
   // Pick up the value of the use_implrepo_ flag from an environment variable
   // called "TAO_USE_IMR". Do it here so that it can be overridden by
   // the "-ORBUseIMR" command line argument.
   //
-  char* use_IMR_env_var_value = ACE_OS::getenv  ("TAO_USE_IMR") ;
+  char* const use_IMR_env_var_value = ACE_OS::getenv  ("TAO_USE_IMR") ;
   if  (use_IMR_env_var_value != 0)
     {
       this->use_implrepo_ = ACE_OS::atoi  (use_IMR_env_var_value) ;
     }
 
-  // Copy command line parameter not to use original.
-  ACE_Argv_Type_Converter command_line(argc, argv);
-
-  ACE_Arg_Shifter arg_shifter (command_line.get_argc(),
-                               command_line.get_TCHAR_argv());
 
   while (arg_shifter.is_anything_left ())
     {
@@ -357,34 +355,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBEndpoint"))))
-        {
-          // Each "endpoint" is of the form:
-          //
-          //   protocol://V.v@addr1,addr2,...,addrN
-          //
-          // or:
-          //
-          //   protocol://addr1,addr2,...,addrN
-          //
-          // where "V.v" is an optional protocol version for each
-          // addr.  All endpoint strings should be of the above
-          // form(s).
-          //
-          // Multiple sets of endpoint may be seperated by a semi-colon `;'.
-          // For example:
-          //
-          //   corbaloc:space:2001,1.2@odyssey:2010;uiop://foo,bar
-          //
-          // All endpoint strings should be of the above form(s).
-
-          this->set_endpoint_helper (ACE_TEXT_ALWAYS_CHAR(current_arg)
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNameServicePort"))))
         {
           // Specify the port number for the NameService.
@@ -557,59 +527,28 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBPreconnect"))))
+                (ACE_TEXT("-ORBPreferredInterfaces"))))
         {
-#if 0
-          /*
-           *
-           *  TODO: Needs to go. Leaving it around for things to
-           *  settle down.
-           */
-          // Get a string which describes the connections we want to
-          // cache up-front, thus reducing the latency of the first call.
-          //
-          // For example,  specify -ORBpreconnect once for each
-          // protocol:
-          //
-          //   -ORBpreconnect iiop://tango:10015,watusi:10016
-          //   -ORBpreconnect busX_iop://board1:0x07450000,board2,0x08450000
-          //
-          // Or chain all possible endpoint designations together:
-          //
-          //   -ORBpreconnect iiop://tango:10015,watusi:10016/;
-          //              busX_iop://board1:0x07450000,board2,0x08450000/
-          //
-          // The old style command line only works for IIOP:
-          //    -ORBpreconnect tango:10015,tango:10015,watusi:10016
-
-          ACE_CString preconnections (ACE_TEXT_ALWAYS_CHAR(current_arg));
-
-
-          if (this->orb_params ()->preconnects (preconnections) != 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("(%P|%t)\n")
-                          ACE_TEXT ("Invalid preconnect(s)")
-                          ACE_TEXT ("specified:\n%s\n"),
-                          preconnections.c_str ()));
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (
+          if (this->orb_params ()->preferred_interfaces (
+                ACE_TEXT_ALWAYS_CHAR (current_arg)) == false)
+            ACE_THROW_RETURN (CORBA::INTERNAL (
                                   CORBA::SystemException::_tao_minor_code (
                                     TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                    EINVAL),
+                                    0),
                                   CORBA::COMPLETED_NO),
                                 -1);
-            }
-#endif /*if 0*/
-
-          // validate_connection() supports the same functionality as
-          // the -ORBPreconnect option, and more.  Multiple
-          // preconnections are also provided by validate_connection()
-          // via "banded connections."
-          ACE_ERROR ((LM_WARNING,
-                      ACE_TEXT ("(%P|%t) -ORBPreconnect is ")
-                      ACE_TEXT ("deprecated.\n")
-                      ACE_TEXT ("(%P|%t) Use validate_connection()")
-                      ACE_TEXT ("at runtime, instead.\n")));
+
+          arg_shifter.consume_arg ();
+        }
+      else if ((current_arg = arg_shifter.get_the_parameter
+                (ACE_TEXT("-ORBEnforcePreferredInterfaces"))))
+        {
+          if (ACE_OS::strcasecmp (current_arg,
+                                  ACE_TEXT("YES")) == 0)
+            this->orb_params ()->enforce_pref_interfaces (true);
+          else if (ACE_OS::strcasecmp (current_arg,
+                                       ACE_TEXT("NO")) == 0)
+            this->orb_params ()->enforce_pref_interfaces (false);
 
           arg_shifter.consume_arg ();
         }
@@ -798,6 +737,35 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter
+                (ACE_TEXT("-ORBEndpoint"))))
+        {
+          // Each "endpoint" is of the form:
+          //
+          //   protocol://V.v@addr1,addr2,...,addrN
+          //
+          // or:
+          //
+          //   protocol://addr1,addr2,...,addrN
+          //
+          // where "V.v" is an optional protocol version for each
+          // addr.  All endpoint strings should be of the above
+          // form(s).
+          //
+          // Multiple sets of endpoint may be seperated by a semi-colon `;'.
+          // For example:
+          //
+          //   corbaloc:space:2001,1.2@odyssey:2010;uiop://foo,bar
+          //
+          // All endpoint strings should be of the above form(s).
+
+          this->set_endpoint_helper (TAO_DEFAULT_LANE,
+                                     ACE_TEXT_ALWAYS_CHAR (current_arg)
+                                     ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+
+          arg_shifter.consume_arg ();
+        }
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBListenEndpoints"))))
         {
           // This option is similar to the -ORBEndPoint option. May be
@@ -805,13 +773,39 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           // now, I (Priyanka) am leaving so that both options can be
           // used.
 
-          this->set_endpoint_helper (ACE_TEXT_ALWAYS_CHAR(current_arg)
+          this->set_endpoint_helper (TAO_DEFAULT_LANE,
+                                     ACE_TEXT_ALWAYS_CHAR (current_arg)
                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter
+                (ACE_TEXT("-ORBLaneEndpoint"))) ||
+               (current_arg = arg_shifter.get_the_parameter
+                (ACE_TEXT("-ORBLaneListenEndpoints"))))
+        {
+          // This option is similar to the -ORBEndPoint option but
+          // specifies endpoints for each lane.
+
+          if (arg_shifter.is_option_next ())
+            return -1;
+
+          ACE_CString lane (ACE_TEXT_ALWAYS_CHAR (current_arg));
+          arg_shifter.consume_arg ();
+
+          if(arg_shifter.is_option_next ())
+            return -1;
+
+          ACE_CString endpoints (ACE_TEXT_ALWAYS_CHAR (arg_shifter.get_current ()));
+          arg_shifter.consume_arg ();
+
+          this->set_endpoint_helper (lane,
+                                     endpoints
+                                     ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+        }
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNoProprietaryActivation"))))
         {
           // This option can be used to set to not use any proprietary
@@ -884,6 +878,34 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
         arg_shifter.ignore_arg ();
     }
 
+  const char *env_endpoint =
+    ACE_OS::getenv ("TAO_ORBENDPOINT");
+
+  if (env_endpoint != 0)
+    {
+      int result =
+        this->orb_params ()->add_endpoints (TAO_DEFAULT_LANE,
+                                            env_endpoint);
+
+      if (result != 0)
+        {
+          if (TAO_debug_level > 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          ACE_TEXT ("ERROR: Environment variable TAO_ORBENDPOINT set to invalid value ")
+                          ACE_TEXT ("<%s>.\n"),
+                          env_endpoint));
+            }
+
+          ACE_THROW_RETURN (CORBA::BAD_PARAM (
+                              CORBA::SystemException::_tao_minor_code (
+                                TAO_ORB_CORE_INIT_LOCATION_CODE,
+                                EINVAL),
+                              CORBA::COMPLETED_NO),
+                            -1);
+        }
+    }
+
 #if defined (SIGPIPE) && !defined (ACE_LACKS_UNIX_SIGNALS)
   // There's really no way to deal with this in a portable manner, so
   // we just have to suck it up and get preprocessor conditional and
@@ -1078,24 +1100,13 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
   // Initialize the flushing strategy
   this->flushing_strategy_ = trf->create_flushing_strategy ();
 
-  // Now that we have a complete list of available protocols and their
-  // related factory objects, set default policies and initialize the
-  // registries!
-
-  // Set ORB-level policy defaults.
-  TAO_Protocols_Hooks *tph =
-    this->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  int status = 0;
-
-  if (tph)
-    {
-      status = tph->set_default_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
+  // Look in the service repository for an instance of the Protocol Hooks.
+  this->protocols_hooks_ =
+    ACE_Dynamic_Service<TAO_Protocols_Hooks>::instance
+    (TAO_ORB_Core_Static_Resources::instance ()->protocols_hooks_name_.c_str());
 
-  if (status != 0)
+  // Must have valid protocol hooks.
+  if (this->protocols_hooks_ == 0)
     ACE_THROW_RETURN (CORBA::INITIALIZE (
                         CORBA::SystemException::_tao_minor_code (
                           TAO_ORB_CORE_INIT_LOCATION_CODE,
@@ -1103,6 +1114,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                         CORBA::COMPLETED_NO),
                       -1);
 
+  // Initialize the protocols hooks instance.
+  this->protocols_hooks_->init_hooks (this
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
   // Look for BiDirectional library here. If the user has svc.conf
   // file, load the library at this point.
   int ret = this->bidirectional_giop_init (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1178,7 +1194,7 @@ TAO_ORB_Core::fini (void)
   if (this->thread_lane_resources_manager_ != 0)
     this->thread_lane_resources_manager_->finalize ();
 
-  (void) TAO_Internal::close_services ();
+  (void) TAO::ORB::close_services ();
 
   // Destroy the object_key table
   this->object_key_table_.destroy ();
@@ -1217,6 +1233,20 @@ TAO_ORB_Core::set_resource_factory (const char *resource_factory_name)
 }
 
 void
+TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory)
+{
+  if (TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ != 0)
+    {
+
+      ACE_DEBUG ((LM_WARNING,
+                  "TAO (%P|%t) - Deleting old gui_resource_factory.\n"));
+      delete TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
+    }
+
+  TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ = gui_resource_factory;
+}
+
+void
 TAO_ORB_Core::dynamic_adapter_name (const char *name)
 {
   TAO_ORB_Core_Static_Resources::instance ()->dynamic_adapter_name_ = name;
@@ -1293,6 +1323,13 @@ TAO_ORB_Core::resource_factory (void)
   return this->resource_factory_;
 }
 
+TAO::GUIResource_Factory *
+TAO_ORB_Core::gui_resource_factory (void)
+{
+  return TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
+}
+
+
 TAO_Thread_Lane_Resources_Manager &
 TAO_ORB_Core::thread_lane_resources_manager (void)
 {
@@ -1385,43 +1422,11 @@ TAO_ORB_Core::set_protocols_hooks (const char *protocols_hooks_name)
   // Is synchronization necessary?
   TAO_ORB_Core_Static_Resources::instance ()->protocols_hooks_name_ =
     protocols_hooks_name;
-
-  // Probably we need to reset the
-  // TAO_ORB_Core::protocols_hooks_checked_ flag. Not sure how to do
-  // it though.
 }
 
 TAO_Protocols_Hooks *
-TAO_ORB_Core::get_protocols_hooks (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::get_protocols_hooks (void)
 {
-  // Check if there is a cached reference.
-  if (this->protocols_hooks_ == 0 &&
-      this->protocols_hooks_checked_ == false)
-    {
-      // We need synchronization here since this is called in the
-      // critical path where more than one thread could be active on
-      // different handlers.
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        ace_mon,
-                        this->lock_,
-                        0);
-
-      // If not, look in the service repository for an instance.
-      this->protocols_hooks_ =
-        ACE_Dynamic_Service<TAO_Protocols_Hooks>::instance
-        (TAO_ORB_Core_Static_Resources::instance ()->protocols_hooks_name_.c_str());
-
-      if (this->protocols_hooks_)
-        {
-          // Initialize the protocols hooks instance.
-          this->protocols_hooks_->init_hooks (this
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-        }
-
-      this->protocols_hooks_checked_ = true;
-    }
-
   return this->protocols_hooks_;
 }
 
@@ -1688,11 +1693,12 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
 }
 
 void
-TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator)
+TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator
+                                      ACE_ENV_ARG_DECL)
 {
   // Call the BiDir library if it has been loaded
   if (this->bidir_adapter_)
-    this->bidir_adapter_->load_policy_validators (validator);
+    this->bidir_adapter_->load_policy_validators (validator ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
@@ -1706,16 +1712,14 @@ TAO_ORB_Core::create_object (TAO_Stub *stub)
   // but we are stuck in platforms without exceptions!
   CORBA::Object_ptr x;
   {
-    // @@ Ossama: maybe we need another lock for the table, to
-    //    reduce contention on the Static_Object_Lock below, if so
-    //    then we need to use that lock in the ORB_init() function.
-    ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard,
-                              *ACE_Static_Object_Lock::instance (),
-                              0));
-
-    TAO_ORB_Table *table = TAO_ORB_Table::instance ();
-    const TAO_ORB_Table::Iterator end = table->end ();
-    for (TAO_ORB_Table::Iterator i = table->begin (); i != end; ++i)
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                      guard,
+                      this->lock_,
+                      CORBA::Object::_nil ());
+
+    TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
+    const TAO::ORB_Table::Iterator end = table->end ();
+    for (TAO::ORB_Table::Iterator i = table->begin (); i != end; ++i)
       {
         TAO_ORB_Core *other_core = (*i).int_id_;
 
@@ -1751,20 +1755,21 @@ TAO_ORB_Core::initialize_object (TAO_Stub *stub,
     // @@ Ossama: maybe we need another lock for the table, to
     //    reduce contention on the Static_Object_Lock below, if so
     //    then we need to use that lock in the ORB_init() function.
-    ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard,
-                              *ACE_Static_Object_Lock::instance (),
+    ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                              guard,
+                              this->lock_,
                               0));
 
-    TAO_ORB_Table *table = TAO_ORB_Table::instance ();
-    TAO_ORB_Table::Iterator end = table->end ();
-    for (TAO_ORB_Table::Iterator i = table->begin (); i != end; ++i)
+    TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
+    TAO::ORB_Table::Iterator const end = table->end ();
+    for (TAO::ORB_Table::Iterator i = table->begin (); i != end; ++i)
       {
-        TAO_ORB_Core *other_core = (*i).int_id_;
+        TAO_ORB_Core * const other_core = (*i).int_id_;
 
         if (this->is_collocation_enabled (other_core,
                                           mprofile))
           {
-            TAO_Adapter_Registry *ar =
+            TAO_Adapter_Registry * const ar =
               other_core->adapter_registry ();
 
             return ar->initialize_collocated_object (stub,
@@ -1921,6 +1926,10 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
       // Otherwise just continue..
     }
 
+  if (this->has_shutdown () == 1 &&
+      this->server_factory_->activate_server_connections ())
+      this->tm_.wait ();
+
   if (TAO_debug_level > 2)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -2028,11 +2037,7 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL)
 
   // Now remove it from the ORB table so that it's ORBid may be
   // reused.
-  {
-    ACE_MT (ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard,
-                       *ACE_Static_Object_Lock::instance ()));
-    TAO_ORB_Table::instance ()->unbind (this->orbid_);
-  }
+  TAO::ORB_Table::instance ()->unbind (this->orbid_);
 }
 
 void
@@ -2223,17 +2228,17 @@ TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-TAO_ORB_Core::set_endpoint_helper (const char *current_arg
+TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane,
+                                   const ACE_CString &endpoints
                                    ACE_ENV_ARG_DECL)
 {
-  ACE_CString endpts (current_arg);
-
-  if (this->orb_params ()->endpoints (endpts) != 0)
+  if (this->orb_params ()->add_endpoints (lane,
+                                          endpoints) != 0)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t)\n")
                   ACE_TEXT ("Invalid endpoint(s) specified:\n%s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(endpts.c_str ())));
+                  ACE_TEXT_CHAR_TO_TCHAR(endpoints.c_str ())));
       ACE_THROW_RETURN (CORBA::BAD_PARAM (
                            CORBA::SystemException::_tao_minor_code (
                               TAO_ORB_CORE_INIT_LOCATION_CODE,
@@ -2576,39 +2581,6 @@ TAO_ORB_Core::set_sync_scope_hook (Sync_Scope_Hook hook)
   TAO_ORB_Core_Static_Resources::instance ()-> sync_scope_hook_ = hook;
 }
 
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-
-CORBA::Policy_ptr
-TAO_ORB_Core::stubless_sync_scope (void)
-{
-  CORBA::Policy_var result;
-
-  // No need to lock, the object is in TSS storage....
-  TAO_Policy_Current &policy_current =
-    this->policy_current ();
-  result = policy_current.get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE);
-
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
-  if (CORBA::is_nil (result.in ()))
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->policy_manager ();
-      if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (
-                   TAO_CACHED_POLICY_SYNC_SCOPE);
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    result = this->default_policies_->get_cached_policy (
-               TAO_CACHED_POLICY_SYNC_SCOPE);
-
-  return result._retn ();
-}
-
-#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
-
 void
 TAO_ORB_Core::call_timeout_hook (TAO_Stub *stub,
                                  bool &has_timeout,
@@ -2634,43 +2606,6 @@ TAO_ORB_Core::set_timeout_hook (Timeout_Hook hook)
   return;
 }
 
-CORBA::Policy_ptr
-TAO_ORB_Core::stubless_relative_roundtrip_timeout (void)
-{
-  CORBA::Policy_var result;
-
-#if (TAO_HAS_CORBA_MESSAGING == 1 \
-     && TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-
-  // No need to lock, the object is in TSS storage....
-  TAO_Policy_Current &policy_current =
-    this->policy_current ();
-  result = policy_current.get_cached_policy (
-             TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
-
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
-  if (CORBA::is_nil (result.in ()))
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->policy_manager ();
-      if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (
-          TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    result = this->default_policies_->get_cached_policy (
-               TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1
-          && TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-  return result._retn ();
-}
-
-
 void
 TAO_ORB_Core::connection_timeout (TAO_Stub *stub,
                                   bool &has_timeout,
@@ -2695,60 +2630,103 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook)
   TAO_ORB_Core_Static_Resources::instance ()->connection_timeout_hook_ = hook;
 }
 
+#if (TAO_HAS_CORBA_MESSAGING == 1)
+
 CORBA::Policy_ptr
-TAO_ORB_Core::stubless_connection_timeout (void)
+TAO_ORB_Core::get_policy (CORBA::PolicyType type
+                          ACE_ENV_ARG_DECL)
 {
   CORBA::Policy_var result;
 
-#if (TAO_HAS_CORBA_MESSAGING == 1 \
-     && TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
+  TAO_Policy_Manager *policy_manager =
+    this->policy_manager ();
+  if (policy_manager != 0)
+    {
+      result = policy_manager->get_policy (type
+                                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    }
 
-  // No need to lock, the object is in TSS storage....
+  if (CORBA::is_nil (result.in ()))
+    {
+      result =
+        this->get_default_policies ()->get_policy (type
+                                                   ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    }
+
+  return result._retn ();
+}
+
+CORBA::Policy_ptr
+TAO_ORB_Core::get_policy_including_current (CORBA::PolicyType type
+                                            ACE_ENV_ARG_DECL)
+{
   TAO_Policy_Current &policy_current =
     this->policy_current ();
-  result = policy_current.get_cached_policy (
-             TAO_CACHED_POLICY_CONNECTION_TIMEOUT);
 
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
+  CORBA::Policy_var result =
+    policy_current.get_policy (type
+                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
   if (CORBA::is_nil (result.in ()))
     {
-      TAO_Policy_Manager *policy_manager =
-        this->policy_manager ();
-      if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (
-          TAO_CACHED_POLICY_CONNECTION_TIMEOUT);
+      result = this->get_policy (type
+                                 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
-  if (CORBA::is_nil (result.in ()))
-    result = this->default_policies_->get_cached_policy (
-               TAO_CACHED_POLICY_CONNECTION_TIMEOUT);
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1
-          && TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1 */
-
   return result._retn ();
 }
 
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
 CORBA::Policy_ptr
-TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type)
+TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type
+                                 ACE_ENV_ARG_DECL)
 {
   CORBA::Policy_var result;
 
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
   TAO_Policy_Manager *policy_manager =
     this->policy_manager ();
   if (policy_manager != 0)
-    result = policy_manager->get_cached_policy (type);
+    {
+      result =
+        policy_manager->get_cached_policy (type
+                                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    }
 
   if (CORBA::is_nil (result.in ()))
-    result = this->get_default_policies ()->get_cached_policy (type);
+    {
+      result =
+        this->get_default_policies ()->get_cached_policy (type
+                                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    }
+
+  return result._retn ();
+}
+
+CORBA::Policy_ptr
+TAO_ORB_Core::get_cached_policy_including_current (
+    TAO_Cached_Policy_Type type
+    ACE_ENV_ARG_DECL)
+{
+  TAO_Policy_Current &policy_current =
+    this->policy_current ();
+
+  CORBA::Policy_var result =
+    policy_current.get_cached_policy (type
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK (CORBA::Policy::_nil ());
+
+  if (CORBA::is_nil (result.in ()))
+    {
+      result =
+        this->get_cached_policy (type
+                                 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    }
 
   return result._retn ();
 }
@@ -2780,6 +2758,10 @@ TAO_ORB_Core::add_interceptor (
     }
   else
     {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("ERROR: ORB Core unable to find the ")
+                  ACE_TEXT ("IORInterceptor Adapter Factory instance")));
       ACE_THROW (CORBA::INTERNAL ());
     }
 }
@@ -2872,7 +2854,7 @@ TAO_ORB_Core_instance (void)
 {
   // @@ This is a slight violation of layering, we should use
   //    TAO_ORB_Core_instance(), but that breaks during startup.
-  TAO_ORB_Table *orb_table = TAO_ORB_Table::instance ();
+  TAO::ORB_Table * const orb_table = TAO::ORB_Table::instance ();
   if (orb_table->first_orb () == 0)
     {
       ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard,
@@ -2956,16 +2938,16 @@ TAO_ORB_Core::init_ref_map ()
 }
 
 void
-TAO_ORB_Core::set_default (const char *orb_id)
+TAO_ORB_Core::set_default (const char * orb_id)
 {
-  TAO_ORB_Table *table = TAO_ORB_Table::instance ();
+  TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
   table->set_default (orb_id);
 }
 
 void
-TAO_ORB_Core::not_default (const char *orb_id)
+TAO_ORB_Core::not_default (const char * orb_id)
 {
-  TAO_ORB_Table *table = TAO_ORB_Table::instance ();
+  TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
   table->not_default (orb_id);
 }
 
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 2a879aa4216..41df609aa27 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -36,7 +36,7 @@
 #include "tao/Messaging_SyncScopeC.h"
 #include "tao/Object.h"
 #include "tao/Invocation_Utils.h"
-#include "tao/Adapter.h"
+#include "tao/Adapter_Registry.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "Interceptor_List.h"
@@ -104,6 +104,10 @@ class TAO_ClientRequestInfo;
 class TAO_Transport_Sync_Strategy;
 class TAO_Sync_Strategy;
 class TAO_Policy_Validator;
+namespace TAO
+{
+  class GUIResource_Factory;
+}
 
 namespace CORBA
 {
@@ -189,7 +193,6 @@ public:
   /// current thread.
   TAO_ClientRequestInfo *client_request_info_;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 };
 
 
@@ -212,7 +215,6 @@ public:
 class TAO_Export TAO_ORB_Core
 {
   friend class TAO_ORB_Core_Auto_Ptr;
-  friend class TAO_ORB_Table;
   friend CORBA::ORB_ptr CORBA::ORB_init (int &,
                                          char *argv[],
                                          const char *,
@@ -293,7 +295,7 @@ public:
    * No-Collocation is a special case of collocation.
    */
   static
-  TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
+TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
                                                   ACE_ENV_ARG_DECL);
   //@}
 
@@ -375,6 +377,9 @@ public:
   /// Returns pointer to the resource factory.
   TAO_Resource_Factory *resource_factory (void);
 
+  /// Returns pointer to the factory for creating gui resources
+  TAO::GUIResource_Factory *gui_resource_factory (void);
+
   /// Returns pointer to the client factory.
   TAO_Client_Strategy_Factory *client_factory (void);
 
@@ -412,6 +417,13 @@ public:
   /// Sets the value of TAO_ORB_Core::resource_factory_
   static void set_resource_factory (const char *resource_factory_name);
 
+  /** Sets the value of TAO_ORB_Core::gui_resource_factory_.
+   *
+   *  Sets the value of gui_resource_factory in TSS. ORB_Core is responsible
+   *  for releasing this factory if needed.
+   */
+  static void set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory);
+
   /// Sets the value of TAO_ORB_Core::protocols_hooks_
   static void set_protocols_hooks (const char *protocols_hooks_name);
 
@@ -428,7 +440,7 @@ public:
   static const ACE_CString &poa_factory_name (void);
 
   /// Gets the value of TAO_ORB_Core::protocols_hooks__
-  TAO_Protocols_Hooks * get_protocols_hooks (ACE_ENV_SINGLE_ARG_DECL);
+  TAO_Protocols_Hooks * get_protocols_hooks (void);
 
   /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_.
   static void dynamic_adapter_name (const char *name);
@@ -460,6 +472,7 @@ public:
   /// Gets the value of TAO_ORB_Core::valuetype_adapter_name.
   static const char *valuetype_adapter_name (void);
 
+
   /// See if we have a collocated address, if yes, return the POA
   /// associated with the address.
   int is_collocated (const TAO_MProfile& mprofile);
@@ -542,9 +555,26 @@ public:
   /// Accessor method for the default_policies_
   TAO_Policy_Set *get_default_policies (void);
 
-  /// Get a cached policy.  First, check the ORB-level Policy
-  /// Manager, and then check the ORB defaults.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
+  /// Get a policy.  First, check the ORB-level Policy Manager, then
+  /// check the ORB defaults.
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType type
+                                ACE_ENV_ARG_DECL);
+
+  /// Get a policy.  First, check the thread current, then check the
+  /// ORB-level Policy Manager, then check the ORB defaults.
+  CORBA::Policy_ptr get_policy_including_current (CORBA::PolicyType type
+                                                  ACE_ENV_ARG_DECL);
+
+  /// Get a cached policy.  First, check the ORB-level Policy Manager,
+  /// then check the ORB defaults.
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL);
+
+  /// Get a cached policy.  First, check the thread current, then
+  /// check the ORB-level Policy Manager, then check the ORB defaults.
+  CORBA::Policy_ptr get_cached_policy_including_current (
+      TAO_Cached_Policy_Type type
+      ACE_ENV_ARG_DECL);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -604,12 +634,6 @@ public:
 
   static void set_timeout_hook (Timeout_Hook hook);
 
-
-  /// Access to the RoundtripTimeoutPolicy policy set on the thread or
-  /// on the ORB.  In this method, we do not consider the stub since
-  /// we do not have access to it.
-  CORBA::Policy_ptr stubless_relative_roundtrip_timeout (void);
-
   /// Invoke the timeout hook if present.
   /**
    * The timeout hook is used to determine if the timeout policy is
@@ -626,13 +650,6 @@ public:
   /// Define the Timeout_Hook signature
   static void connection_timeout_hook (Timeout_Hook hook);
 
-
-  /// Access to the connection timeout policy set on the thread or
-  /// on the ORB.  In this method, we do not consider the stub since
-  /// we do not have access to it.
-  CORBA::Policy_ptr stubless_connection_timeout (void);
-
-
   void call_sync_scope_hook (TAO_Stub *stub,
                              bool &has_synchronization,
                              Messaging::SyncScope &scope);
@@ -643,16 +660,11 @@ public:
                                    TAO_Stub *,
                                    bool &,
                                    Messaging::SyncScope &);
-  static void set_sync_scope_hook (Sync_Scope_Hook hook);
 
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-  CORBA::Policy_ptr stubless_sync_scope (void);
-#endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
+  static void set_sync_scope_hook (Sync_Scope_Hook hook);
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-  CORBA::Policy_ptr default_buffering_constraint (void) const;
-
   /// This strategy will buffer messages.
   //@{
   TAO_Eager_Buffering_Sync_Strategy &eager_buffering_sync_strategy (void);
@@ -667,10 +679,6 @@ public:
   /// Handle to the factory for protocols_hooks_..
   TAO_Protocols_Hooks *protocols_hooks_;
 
-  /// Flag to check whether the protocols hooks have been checked or
-  /// not.
-  bool protocols_hooks_checked_;
-
   /// Obtain the TSS resources of this orb.
   TAO_ORB_Core_TSS_Resources* get_tss_resources (void);
 
@@ -968,7 +976,8 @@ public:
 
   /// Call the libraries to handover the validators if they havent
   /// registered yet with the list of validators.
-  void load_policy_validators (TAO_Policy_Validator &validator);
+  void load_policy_validators (TAO_Policy_Validator &validator
+                               ACE_ENV_ARG_DECL);
 
   /// Return the flushing strategy
   /**
@@ -1059,7 +1068,8 @@ protected:
   /// Pointer to the list of protocol loaded into this ORB instance.
   /// Helper method to hold the common code part for -ORBEndpoint and
   /// -ORBListenEndpoint options.
-  int set_endpoint_helper (const char *current_arg
+  int set_endpoint_helper (const ACE_CString &lane,
+                           const ACE_CString &endpoints
                            ACE_ENV_ARG_DECL);
 
 private:
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index 5045df1f7a4..a678a26da19 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -16,8 +16,9 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
-TAO_ORB_Table::TAO_ORB_Table (void)
-  : first_orb_not_default_ (0),
+TAO::ORB_Table::ORB_Table (void)
+  : lock_ (),
+    first_orb_not_default_ (false),
     table_ (TAO_DEFAULT_ORB_TABLE_SIZE),
     first_orb_ (0),
     orbs_ (0),
@@ -25,10 +26,10 @@ TAO_ORB_Table::TAO_ORB_Table (void)
 {
 }
 
-TAO_ORB_Table::~TAO_ORB_Table (void)
+TAO::ORB_Table::~ORB_Table (void)
 {
-  const Iterator end = this->end ();
-  for (Iterator i = this->begin (); i != end; ++i)
+  Iterator const end (this->end ());
+  for (Iterator i (this->begin ()); i != end; ++i)
     {
       // Deallocate the ORBid.
       CORBA::string_free (const_cast<char *> ((*i).ext_id_));
@@ -40,28 +41,28 @@ TAO_ORB_Table::~TAO_ORB_Table (void)
   this->table_.close ();
 }
 
-TAO_ORB_Table::Iterator
-TAO_ORB_Table::begin (void)
+TAO::ORB_Table::Iterator
+TAO::ORB_Table::begin (void)
 {
   return this->table_.begin ();
 }
 
-TAO_ORB_Table::Iterator
-TAO_ORB_Table::end (void)
+TAO::ORB_Table::Iterator
+TAO::ORB_Table::end (void)
 {
   return this->table_.end ();
 }
 
 TAO_ORB_Core* const *
-TAO_ORB_Table::get_orbs (size_t& num_orbs)
+TAO::ORB_Table::get_orbs (size_t& num_orbs)
 {
   num_orbs = this->num_orbs_;
   return this->orbs_;
 }
 
 int
-TAO_ORB_Table::bind (const char *orb_id,
-                     TAO_ORB_Core *orb_core)
+TAO::ORB_Table::bind (char const * orb_id,
+                      TAO_ORB_Core * orb_core)
 {
   // Make sure that the supplied ORB core pointer is valid,
   // i.e. non-zero.
@@ -71,8 +72,14 @@ TAO_ORB_Table::bind (const char *orb_id,
       return -1;
     };
 
-  CORBA::String_var id = CORBA::string_dup (orb_id);
-  int result = this->table_.bind (id.in (), orb_core);
+  CORBA::String_var id (CORBA::string_dup (orb_id));
+
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    guard,
+                    this->lock_,
+                    -1);
+
+  int const result = this->table_.bind (id.in (), orb_core);
 
   if (result == 0)
     {
@@ -104,17 +111,34 @@ TAO_ORB_Table::bind (const char *orb_id,
 }
 
 TAO_ORB_Core *
-TAO_ORB_Table::find (const char *orb_id)
+TAO::ORB_Table::find (char const * orb_id)
 {
-  TAO_ORB_Core *found = 0;
+  TAO_ORB_Core * found = 0;
+
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    guard,
+                    this->lock_,
+                    0);
+
   this->table_.find (orb_id, found);
+
+  // Maintain ownership of the ORB_Core.
+  if (found != 0)
+    (void) found->_incr_refcnt ();
+
   return found;
 }
 
 int
-TAO_ORB_Table::unbind (const char *orb_id)
+TAO::ORB_Table::unbind (const char *orb_id)
 {
-  Table::ENTRY *entry = 0;
+  Table::ENTRY * entry = 0;
+
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    guard,
+                    this->lock_,
+                    -1);
+
   int result = this->table_.find (orb_id, entry);
 
   if (result == 0)
@@ -123,7 +147,7 @@ TAO_ORB_Table::unbind (const char *orb_id)
       // before unbinding the entry since the entry is deallocated
       // during the call to unbind().
       CORBA::string_free (const_cast<char *> (entry->ext_id_));
-      TAO_ORB_Core *orb_core = entry->int_id_;
+      TAO_ORB_Core * const orb_core = entry->int_id_;
 
       result = this->table_.unbind (entry);
 
@@ -134,8 +158,8 @@ TAO_ORB_Table::unbind (const char *orb_id)
 
       if (orb_core == this->first_orb_)
         {
-          Iterator begin = this->begin ();
-          Iterator end = this->end ();
+          Iterator const begin (this->begin ());
+          Iterator const end (this->end ());
 
           if (begin != end)
             {
@@ -154,22 +178,31 @@ TAO_ORB_Table::unbind (const char *orb_id)
 }
 
 void
-TAO_ORB_Table::set_default (const char *orb_id)
+TAO::ORB_Table::set_default (char const  * orb_id)
 {
+  ACE_GUARD (TAO_SYNCH_MUTEX,
+             guard,
+             this->lock_);
+
   this->table_.find (orb_id, this->first_orb_);
 }
 
 void
-TAO_ORB_Table::not_default (const char *orb_id)
+TAO::ORB_Table::not_default (char const * orb_id)
 {
   // @@  This method now works for restricted cases. Should work on
-  // generalizing it. It works if the first ORB that is registered
-  // decides to not want be the default ORB. Should generalize it to
-  // handle all cases.
+  //     generalizing it. It works if the first ORB that is registered
+  //     decides to not want be the default ORB. Should generalize it
+  //     to handle all cases.
+
+
+  ACE_GUARD (TAO_SYNCH_MUTEX,
+             guard,
+             this->lock_);
 
-  //check if there is a default ORB already and if
-  // it is *not* the same as the orb_id thats passed in.. we dont have
-  // to do anything.
+  // Check if there is a default ORB already and if it is *not* the
+  // same as the orb_id thats passed in.  We don't have to do
+  // anything.
   if (this->first_orb_ != 0)
     {
       if (ACE_OS::strcmp (this->first_orb_->orbid (), orb_id) != 0)
@@ -181,28 +214,28 @@ TAO_ORB_Table::not_default (const char *orb_id)
         {
           // The ORB with orbid 'orb_id' is the default now. We need
           // to change it.
-          this->first_orb_not_default_ = 1;
+          this->first_orb_not_default_ = true;
         }
     }
 }
 
 /// Accessor to the underlying table_
-ACE_Hash_Map_Manager_Ex<const char *,TAO_ORB_Core *,ACE_Hash<const char *>,ACE_Equal_To<const char *>,ACE_Null_Mutex> *
-TAO_ORB_Table::table (void)
+TAO::ORB_Table::Table *
+TAO::ORB_Table::table (void)
 {
   return &this->table_;
 }
 
-TAO_ORB_Table *
-TAO_ORB_Table::instance (void)
+TAO::ORB_Table *
+TAO::ORB_Table::instance (void)
 {
-  return TAO_Singleton<TAO_ORB_Table, TAO_SYNCH_MUTEX>::instance ();
+  return TAO_Singleton<TAO::ORB_Table, TAO_SYNCH_MUTEX>::instance ();
 }
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_Singleton<TAO_ORB_Table,TAO_SYNCH_MUTEX>;
+template class TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>;
 
 template class ACE_Hash_Map_Entry<const char *, TAO_ORB_Core *>;
 template class ACE_Hash_Map_Manager_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
@@ -212,7 +245,7 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_ORB_Core *, AC
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_Singleton<TAO_ORB_Table,TAO_SYNCH_MUTEX>
+#pragma instantiate TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>
 
 #pragma instantiate ACE_Hash_Map_Entry<const char *, TAO_ORB_Core *>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
@@ -222,6 +255,6 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_ORB_Core *, AC
 
 #elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 
-template TAO_Singleton<TAO_ORB_Table,TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ORB_Table,TAO_SYNCH_MUTEX>::singleton_;
+template TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX> * TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>::singleton_;
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index 97a37403fe2..30eca509c82 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -23,101 +23,123 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
+
 #include "ace/Hash_Map_Manager_T.h"
+#include "ace/Thread_Mutex.h"
 #include "ace/Null_Mutex.h"
 
+
 // Forward declarations.
 class TAO_ORB_Core;
 
-/**
- * @class TAO_ORB_Table
- *
- * @brief Keep a table with all the ORBs in the system.
- *
- * CORBA::ORB_init() is supposed to return the same ORB if the
- * user specifies the same ORBid, either in the ORB_init()
- * parameter or in the -ORBid option.
- * This class is used to implement that feature.
- * It is also useful when trying to determine if an object
- * reference is collocated or not.
- *
- * @note This class should be instantiated via its instance() method.
- *       Normally this would be enforced by making the constructor
- *       protected but that forces a friend declaration 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 should only be one!
- */
-class TAO_Export TAO_ORB_Table
+namespace TAO
 {
-public:
-
-  /// Constructor
   /**
-   * @note See the note in the class description for an explanation of
-   *       why this constructor is not protected.
+   * @class ORB_Table
+   *
+   * @brief Keep a table with all the ORBs in the system.
+   *
+   * CORBA::ORB_init() is supposed to return the same ORB if the
+   * user specifies the same ORBid, either in the ORB_init()
+   * parameter or in the -ORBid option.
+   * This class is used to implement that feature.
+   * It is also useful when trying to determine if an object
+   * reference is collocated or not.
+   *
+   * @note This class should be instantiated via its instance()
+   *       method.  Normally this would be enforced by making the
+   *       constructor protected but that forces a friend declaration
+   *       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
+   *       should only be one!
    */
-  TAO_ORB_Table (void);
+  class TAO_Export ORB_Table
+  {
+  public:
+
+    /// Constructor
+    /**
+     * @note See the note in the class description for an explanation
+     *       of why this constructor is not protected.
+     */
+    ORB_Table (void);
+
+    /// destructor
+    ~ORB_Table (void);
+
+    typedef ACE_Hash_Map_Manager_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> Table;
+    typedef Table::iterator Iterator;
+
+    /// The canonical ACE_Map methods.
+    //@{
+    Iterator begin (void);
+    Iterator end (void);
+    int bind (const char *orb_id, TAO_ORB_Core *orb_core);
+
+    /**
+     * @note The caller must decrease the reference count on the
+     *       returned ORB_Core, i.e. the callers "owns" it.
+     */
+    TAO_ORB_Core* find (const char *orb_id);
+
+    int unbind (const char *orb_id);
+    //@}
 
-  /// destructor
-  ~TAO_ORB_Table (void);
+    TAO_ORB_Core * const * get_orbs (size_t& num_orbs);
 
-  typedef ACE_Hash_Map_Manager_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> Table;
-  typedef Table::iterator Iterator;
+    /// Obtain the first ORB for the @c ORB_Core_instance()
+    /// implementation.
+    TAO_ORB_Core * first_orb (void);
 
-  /// The canonical ACE_Map methods.
-  //@{
-  Iterator begin (void);
-  Iterator end (void);
-  int bind (const char *orb_id, TAO_ORB_Core *orb_core);
-  TAO_ORB_Core* find (const char *orb_id);
-  int unbind (const char *orb_id);
-  TAO_ORB_Core* const * get_orbs( size_t& num_orbs );
-  //@}
+    /// Return a unique instance
+    static ORB_Table * instance (void);
 
-  /// Obtain the first ORB for the ORB_Core_instance() implementation
-  TAO_ORB_Core *first_orb (void);
+    /// Set the ORB related to the orb_id as the default ORB and not the
+    /// ORB that is first binded.
+    void set_default (char const * orb_id);
 
-  /// Return a unique instance
-  static TAO_ORB_Table *instance (void);
+    /// Method the ORB invokes to specify that it doesnt want to be the
+    /// default ORB if there are more than one ORB registered.
+    void not_default (char const * orb_id);
 
-  /// Set the ORB related to the orb_id as the default ORB and not the
-  /// ORB that is first binded.
-  void set_default (const char *orb_id);
+    /// Accessor to the underlying table_
+    Table * table (void);
 
-  /// Method the ORB invokes to specify that it doesnt want to be the
-  /// default ORB if there are more than one ORB registered.
-  void not_default (const char *orb_id);
+  private:
 
-  /// Accessor to the underlying table_
-  Table * table (void);
+    // Prevent copying
+    ORB_Table (const ORB_Table &);
+    void operator= (const ORB_Table &);
 
-private:
+    /// Update our list of orbs
+    void update_orbs (void);
 
-  /// Prevent copying
-  ACE_UNIMPLEMENTED_FUNC (TAO_ORB_Table (const TAO_ORB_Table &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_ORB_Table &))
+  private:
 
-private:
+    /// Lock used to synchronize access to the internal state.
+    TAO_SYNCH_MUTEX lock_;
 
-  /// Update our list of orbs
-  void update_orbs();
+    /// Variable to check if the first ORB decides not to be the
+    /// default.
+    bool first_orb_not_default_;
 
-  /// Variable to check if the first ORB decides not to be the default
-  bool first_orb_not_default_;
+    /// The underlying table.
+    Table table_;
 
-  /// The implementation.
-  Table table_;
+    /// The first ORB created by the user
+    TAO_ORB_Core * first_orb_;
 
-  /// The first ORB created by the user
-  TAO_ORB_Core *first_orb_;
+    /// List of orbs for get_orbs call
+    TAO_ORB_Core ** orbs_;
 
-  /// List of orbs for get_orbs call
-  TAO_ORB_Core **orbs_;
-  size_t       num_orbs_;
+    /// Number of ORBs in the table.
+    size_t num_orbs_;
 
-};
+  };
+}
 
 #if defined (__ACE_INLINE__)
 # include "tao/ORB_Table.inl"
diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl
index f1aedccc4df..f8f1f2d9937 100644
--- a/TAO/tao/ORB_Table.inl
+++ b/TAO/tao/ORB_Table.inl
@@ -3,7 +3,7 @@
 // $Id$
 
 ACE_INLINE TAO_ORB_Core *
-TAO_ORB_Table::first_orb (void)
+TAO::ORB_Table::first_orb (void)
 {
   return this->first_orb_;
 }
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
index 8f84ef9c4aa..77150719a80 100644
--- a/TAO/tao/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate.mpc
@@ -26,4 +26,8 @@ project : valuetype, portableserver, core {
   PIDL_Files {
     ObjRefTemplate
   }
+
+  Pkgconfig_Files {
+    ObjRefTemplate/TAO_ObjRefTemplate.pc.in
+  }
 }
diff --git a/TAO/tao/ObjRefTemplate/Default_ORT.pidl b/TAO/tao/ObjRefTemplate/Default_ORT.pidl
index fa23ac6cb41..e227364fa13 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORT.pidl
+++ b/TAO/tao/ObjRefTemplate/Default_ORT.pidl
@@ -10,7 +10,7 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Ge 1 -GT -Sc
+ *        -o orig -Ge 1 -GT -Sc -GA
  *        -I../..
  *        -Wb,export_macro=TAO_ORT_Export \
  *        -Wb,export_include="ort_export.h" \
@@ -23,7 +23,7 @@
 #ifndef TAO_DEFAULT_ORT_PIDL
 #define TAO_DEFAULT_ORT_PIDL
 
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
 
 module TAO_Default_ORT
 {
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
index 60aeb7eed9d..1b94789b36e 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
@@ -26,25 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Default_ORTC.h"
 #include "tao/CDR.h"
 #include "tao/Valuetype/ValueFactory.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Default_ORTC.i"
+#include "Default_ORTC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -53,55 +51,9 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x44656661),
-  ACE_NTOHL (0x756c745f),
-  ACE_NTOHL (0x4f52542f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x6174653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0
-    24,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-    0, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate (
-    CORBA::tk_value,
-    sizeof (_oc_TAO_Default_ORT_ObjectReferenceTemplate),
-    (char *) &_oc_TAO_Default_ORT_ObjectReferenceTemplate,
-    0,
-    sizeof (TAO_Default_ORT::ObjectReferenceTemplate)
-  );
-
-namespace TAO_Default_ORT
-{
-  ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate =
-    &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::add_ref (
     TAO_Default_ORT::ObjectReferenceTemplate * p
@@ -110,7 +62,7 @@ TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::add_ref (
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::remove_ref (
     TAO_Default_ORT::ObjectReferenceTemplate * p
@@ -119,7 +71,7 @@ TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::remove_ref (
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::release (
     TAO_Default_ORT::ObjectReferenceTemplate * p
@@ -131,11 +83,6 @@ TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::release (
 TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
 {
-  if (v == 0)
-    {
-      return 0;
-    }
-
   return dynamic_cast< ::TAO_Default_ORT::ObjectReferenceTemplate * > (v);
 }
 
@@ -149,8 +96,8 @@ void
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceTemplate *_tao_tmp_pointer =
-    ACE_static_cast (
-        ObjectReferenceTemplate *,
+    static_cast<
+        ObjectReferenceTemplate *> (
         _tao_void_pointer
       );
   CORBA::remove_ref (_tao_tmp_pointer);
@@ -180,29 +127,29 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
@@ -231,65 +178,7 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_Ob
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_cs.cpp:57
-
-
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
-{
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
-}
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_Default_ORT::ObjectReferenceTemplate *_tao_elem
-  )
-{
-  CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_Default_ORT::ObjectReferenceTemplate **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::insert (
-      _tao_any,
-      TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
-      TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::extract (
-        _tao_any,
-        TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
-        TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-        _tao_elem
-      );
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:490
+// be\be_valuetype.cpp:488
 
 void
 CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
@@ -321,11 +210,8 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        ACE_const_cast (
-            TAO_Default_ORT::ObjectReferenceTemplate *,
-            _tao_valuetype
-          ),
-        (ptrdiff_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast
+        const_cast<TAO_Default_ORT::ObjectReferenceTemplate *> (_tao_valuetype),
+        reinterpret_cast<ptrdiff_t> (&TAO_Default_ORT::ObjectReferenceTemplate::_downcast)
       );
 }
 
@@ -358,7 +244,7 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -370,18 +256,13 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
   template class
     TAO_Value_Var_T<
         TAO_Default_ORT::ObjectReferenceTemplate
-
+        
       >;
-
+  
   template class
     TAO_Value_Out_T<
         TAO_Default_ORT::ObjectReferenceTemplate
-
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        TAO_Default_ORT::ObjectReferenceTemplate
+        
       >;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -394,18 +275,13 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
 # pragma instantiate \
     TAO_Value_Var_T< \
         TAO_Default_ORT::ObjectReferenceTemplate \
-
+        
       >
-
+  
 # pragma instantiate \
     TAO_Value_Out_T< \
         TAO_Default_ORT::ObjectReferenceTemplate \
-
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        TAO_Default_ORT::ObjectReferenceTemplate \
+        
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h
index 7588135a1a8..28ba3dadab4 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.h
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h
@@ -26,21 +26,29 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_
 #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ort_export.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Valuetype/Value_VarOut_T.h"
 
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -55,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,22 +76,22 @@
 
 namespace TAO_Default_ORT
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_valuetype.cpp:527
-
-
+  
+  
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
-
+  
   class ObjectReferenceTemplate;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceTemplate
       >
     ObjectReferenceTemplate_var;
-
+  
   typedef
     TAO_Value_Out_T<
         ObjectReferenceTemplate
@@ -93,61 +99,61 @@ namespace TAO_Default_ORT
     ObjectReferenceTemplate_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
-
+  
   class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual PortableInterceptor::ObjectReferenceTemplate
   {
   public:
     typedef ObjectReferenceTemplate_var _var_type;
-
+    
     static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
-
+    
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceTemplate *&
       );
-
+    
     virtual const char* _tao_obv_repository_id (void) const;
-
+    
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:250
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:238
+  
   protected:
     ObjectReferenceTemplate (void);
-
+    
     virtual ~ObjectReferenceTemplate (void);
-
+    
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-
+    
   private:
     ObjectReferenceTemplate (const ObjectReferenceTemplate &);
     void operator= (const ObjectReferenceTemplate &);
-
+    
   protected:
     virtual CORBA::Boolean
     _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0;
-
+    
     virtual CORBA::Boolean
     _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
 
 // TAO_IDL - Generated from
@@ -160,33 +166,33 @@ namespace TAO_Default_ORT
 
 namespace OBV_TAO_Default_ORT
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
-
+  
   // OBV_ class
   class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual TAO_Default_ORT::ObjectReferenceTemplate
   {
   public:
-
+    
   protected:
     ObjectReferenceTemplate (void);
     virtual ~ObjectReferenceTemplate (void);
-
+    
   protected:
     virtual CORBA::Boolean
     _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &);
-
+    
     virtual CORBA::Boolean
     _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
-
+    
     CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &);
     CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
-
+  
   private:
   };
 
@@ -202,7 +208,7 @@ namespace TAO
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_ORT_Export Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>
   {
@@ -237,13 +243,13 @@ TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT
 TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "Default_ORTC.i"
+#include "Default_ORTC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -254,3 +260,5 @@ TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::Objec
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.i b/TAO/tao/ObjRefTemplate/Default_ORTC.i
deleted file mode 100644
index dcda17bcba3..00000000000
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.i
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
-
-ACE_INLINE
-TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
-{}
-
-ACE_INLINE
-TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
-{}
-
-ACE_INLINE const char* 
-TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
-{
-  return "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0";
-}
-
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
index 57f66060391..fc72cf9aea8 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
@@ -75,8 +75,11 @@ static TAO_Module_Initializer
   TAO_Requires_ORTFactory_Initializer =
     TAO::ORT_Adapter_Factory_Impl::Initializer ();
 
-  #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
+#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
 
+#define TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
+#undef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ORT_ADAPTER_FACTORY_IMPL_H */
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index c89354ab9ab..062f8cd8577 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -6,110 +6,113 @@
 #include "tao/ORB_Constants.h"
 #include "tao/CORBA_methods.h"
 
-ACE_RCSID (ORT,
+
+ACE_RCSID (ObjRefTemplate,
            ORT_Adapter_Impl,
            "$Id$")
 
-namespace TAO
+
+TAO::ORT_Adapter_Impl::~ORT_Adapter_Impl (void)
+{
+}
+
+char *
+TAO::ORT_Adapter_Impl::tao_server_id (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // No need to duplicate, the ort_template_ method has to do the duplicate
+  return this->ort_template_->server_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+char *
+TAO::ORT_Adapter_Impl::tao_orb_id (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // No need to duplicate, the ort_template_ method has to do the duplicate
+  return this->ort_template_->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+PortableInterceptor::AdapterName *
+TAO::ORT_Adapter_Impl::tao_adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // No need to duplicate, the ort_template_ method has to do the duplicate
+  return this->ort_template_->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+TAO::ORT_Adapter_Impl::make_object (const char *repo_id,
+                                    const PortableInterceptor::ObjectId &id
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->ort_factory_->make_object (repo_id,
+                                          id
+                                          ACE_ENV_ARG_PARAMETER);
+}
+
+PortableInterceptor::ObjectReferenceTemplate *
+TAO::ORT_Adapter_Impl::get_adapter_template (void)
+{
+  CORBA::add_ref (this->ort_template_.in ());
+
+  return this->ort_template_;
+}
+
+PortableInterceptor::ObjectReferenceFactory *
+TAO::ORT_Adapter_Impl::get_obj_ref_factory (void)
+{
+  CORBA::add_ref (this->ort_factory_.in ());
+
+  return this->ort_factory_;
+}
+
+int
+TAO::ORT_Adapter_Impl::set_obj_ref_factory (
+  PortableInterceptor::ObjectReferenceFactory *cf
+  ACE_ENV_ARG_DECL_NOT_USED)
+{
+  this->ort_factory_ = cf;
+
+  CORBA::add_ref (this->ort_factory_.in ());
+
+  return 0;
+}
+
+void
+TAO::ORT_Adapter_Impl::release (
+  PortableInterceptor::ObjectReferenceTemplate * t)
+{
+  CORBA::remove_ref (t);
+}
+
+int
+TAO::ORT_Adapter_Impl::activate (
+  const char *server_id,
+  const char *orb_id,
+  PortableInterceptor::AdapterName *adapter_name,
+  PortableServer::POA_ptr poa
+  ACE_ENV_ARG_DECL)
 {
-  ORT_Adapter_Impl::ORT_Adapter_Impl (void)
-    : tao_ort_template_ (0)
-  {
-  }
-
-  ORT_Adapter_Impl::~ORT_Adapter_Impl (void)
-  {
-  }
-
-  char *
-  ORT_Adapter_Impl::tao_server_id (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // No need to duplicate, the ort_template_ method has to do the duplicate
-    return this->ort_template_->server_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  }
-
-  char *
-  ORT_Adapter_Impl::tao_orb_id (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // No need to duplicate, the ort_template_ method has to do the duplicate
-    return this->ort_template_->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  }
-
-  PortableInterceptor::AdapterName *
-  ORT_Adapter_Impl::tao_adapter_name (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // No need to duplicate, the ort_template_ method has to do the duplicate
-    return this->ort_template_->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  }
-
-  CORBA::Object_ptr
-  ORT_Adapter_Impl::make_object (const char *repo_id,
-                                 const PortableInterceptor::ObjectId &id
-                                 ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    return this->ort_factory_->make_object (repo_id,
-                                            id
-                                            ACE_ENV_ARG_PARAMETER);
-  }
-
-  PortableInterceptor::ObjectReferenceTemplate *
-  ORT_Adapter_Impl::get_adapter_template (void)
-  {
-    CORBA::add_ref (ort_template_.in ());
-
-    return ort_template_;
-  }
-
-  PortableInterceptor::ObjectReferenceFactory *
-  ORT_Adapter_Impl::get_obj_ref_factory (void)
-  {
-    CORBA::add_ref (ort_factory_.in ());
-
-    return ort_factory_;
-  }
-
-  int
-  ORT_Adapter_Impl::set_obj_ref_factory (
-    PortableInterceptor::ObjectReferenceFactory *cf
-    ACE_ENV_ARG_DECL_NOT_USED)
-  {
-    ort_factory_ = cf;
-
-    CORBA::add_ref (ort_factory_.in ());
-
-    return 0;
-  }
-
-  int
-  ORT_Adapter_Impl::activate (const char *server_id,
-                              const char *orb_id,
-                              PortableInterceptor::AdapterName *adapter_name,
-                              PortableServer::POA_ptr poa
-                              ACE_ENV_ARG_DECL)
-  {
-    // No need to lock here, there is one instance for each POA and
-    // when the POA creates and actives an ORT_Adapter it will lock
-    // itself. Create an ObjectReferenceTemplate for this POA.
-
-    ACE_NEW_THROW_EX (this->tao_ort_template_,
-                      ObjectReferenceTemplate (server_id,
-                                               orb_id,
-                                               adapter_name,
-                                               poa),
-                      CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (-1);
-
-    this->ort_template_ = this->tao_ort_template_;
-
-    // Must increase ref count since this->obj_ref_factory_ will
-    // decrease it upon destruction.
-    CORBA::add_ref (this->ort_template_.in ());
-    this->ort_factory_ = this->ort_template_;
-
-    return 0;
-  }
+  // No need to lock here, there is one instance for each POA and
+  // when the POA creates and actives an ORT_Adapter it will lock
+  // itself. Create an ObjectReferenceTemplate for this POA.
+
+  ObjectReferenceTemplate * t;
+  ACE_NEW_THROW_EX (t,
+                    ObjectReferenceTemplate (server_id,
+                                             orb_id,
+                                             adapter_name,
+                                             poa),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (-1);
+
+  this->ort_template_ = t;
+
+  // Must increase ref count since this->ort_factory_ will
+  // decrease it upon destruction.
+  CORBA::add_ref (t);
+  this->ort_factory_ = t;
+
+  return 0;
 }
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
index 9fc3181c25b..93f624821e0 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
@@ -27,9 +27,7 @@
 #include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -44,7 +42,9 @@ namespace TAO
     : public ORT_Adapter
   {
   public:
-    ORT_Adapter_Impl (void);
+
+    /// Destructor
+    virtual ~ORT_Adapter_Impl (void);
 
     /// Activate this adapter
     virtual int activate (const char *server_id,
@@ -53,17 +53,22 @@ namespace TAO
                           PortableServer::POA_ptr poa
                           ACE_ENV_ARG_DECL);
 
-    /// Set a different ort_factory to be used.
-    virtual int set_obj_ref_factory (
-      PortableInterceptor::ObjectReferenceFactory *current_factory
-      ACE_ENV_ARG_DECL);
-
     /// Accessor methods to ObjectReferenceTemplate template
     virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void);
 
     /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
     virtual PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void);
 
+    /// Set a different ort_factory to be used.
+    virtual int set_obj_ref_factory (
+      PortableInterceptor::ObjectReferenceFactory * current_factory
+      ACE_ENV_ARG_DECL);
+
+    /**
+     * @see @c TAO::ORT_Adapter for details.
+     */
+    virtual void release (PortableInterceptor::ObjectReferenceTemplate * ort);
+
     /**
      * @name Adapter methods for PortableInterceptor::ObjectReferenceTemplate
      * Methods
@@ -94,29 +99,20 @@ namespace TAO
     ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management via
-     * reference counting.
-     */
-    virtual ~ORT_Adapter_Impl (void);
-
   private:
-    /// The ORT Template, this is the factory and its identify
+
+    /// The ORT Template, this is the factory and its identity.
     PortableInterceptor::ObjectReferenceTemplate_var ort_template_;
 
-    /// The ORT Factory
+    /// The ORT Factory.
     PortableInterceptor::ObjectReferenceFactory_var ort_factory_;
 
-    /// TAO specific ORT Template
-    ObjectReferenceTemplate* tao_ort_template_;
   };
 
 }
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
+
+#if defined(_MSC_VER)
+# pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 34e55bb51a4..2f65f2588cb 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -11,7 +11,7 @@
  * using the following command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -GT -Sc
+ *        -o orig -Gp -Gd -Ge 1 -GT -Sc -GA
  *        -I$(TAO_ROOT)
  *        -Wb,export_macro=TAO_ORT_Export
  *        -Wb,export_include=ort_export.h
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index 7ae8e3c69bc..d2662989b53 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -26,18 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
-#include "ObjectReferenceTemplateC.h"
+#include "ObjectReferenceTemplate.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Valuetype/ValueFactory.h"
 #include "tao/ORB_Core.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
@@ -51,18 +48,18 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_ORT_Export Arg_Traits<CORBA::StringSeq>
     : public
@@ -79,58 +76,9 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
-  ACE_NTOHL (0x72793a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
-    23,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
-  ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
-    2, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory (
-    CORBA::tk_value,
-    sizeof (_oc_PortableInterceptor_ObjectReferenceFactory),
-    (char *) &_oc_PortableInterceptor_ObjectReferenceFactory,
-    0,
-    sizeof (PortableInterceptor::ObjectReferenceFactory)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory =
-    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceFactory;
-}
-
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref (
     PortableInterceptor::ObjectReferenceFactory * p
@@ -139,7 +87,7 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref (
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::remove_ref (
     PortableInterceptor::ObjectReferenceFactory * p
@@ -148,7 +96,7 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::remove_ref (
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::release (
     PortableInterceptor::ObjectReferenceFactory * p
@@ -160,11 +108,6 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::release (
 PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
 {
-  if (v == 0)
-    {
-      return 0;
-    }
-
   return dynamic_cast< ::PortableInterceptor::ObjectReferenceFactory * > (v);
 }
 
@@ -199,29 +142,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
         base,
         ObjectReferenceFactory::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceFactory::_downcast (base);
@@ -229,58 +172,9 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
 
-static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  60,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x6174653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
-    24,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-    2, // value modifier
-  CORBA::tk_null, // no stateful base valuetype
-
-3, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate (
-    CORBA::tk_value,
-    sizeof (_oc_PortableInterceptor_ObjectReferenceTemplate),
-    (char *) &_oc_PortableInterceptor_ObjectReferenceTemplate,
-    0,
-    sizeof (PortableInterceptor::ObjectReferenceTemplate)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate =
-    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplate;
-}
-
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref (
     PortableInterceptor::ObjectReferenceTemplate * p
@@ -289,7 +183,7 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref (
   CORBA::add_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::remove_ref (
     PortableInterceptor::ObjectReferenceTemplate * p
@@ -298,7 +192,7 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::remove_ref (
   CORBA::remove_ref (p);
 }
 
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
 void
 TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::release (
     PortableInterceptor::ObjectReferenceTemplate * p
@@ -310,11 +204,6 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::release (
 PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
 {
-  if (v == 0)
-    {
-      return 0;
-    }
-
   return dynamic_cast< ::PortableInterceptor::ObjectReferenceTemplate * > (v);
 }
 
@@ -349,37 +238,37 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
   return retval;
 }
 
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
@@ -435,260 +324,7 @@ void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  63,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
-  ACE_NTOHL (0x65713a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
-    27,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
-  ACE_NTOHL (0x65710000),  // name = ObjectReferenceTemplateSeq
-    CORBA::tk_sequence, // typecode kind
-  124, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_value, // typecode kind
-    480, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      60,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x506f7274),
-      ACE_NTOHL (0x61626c65),
-      ACE_NTOHL (0x496e7465),
-      ACE_NTOHL (0x72636570),
-      ACE_NTOHL (0x746f722f),
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63745265),
-      ACE_NTOHL (0x66657265),
-      ACE_NTOHL (0x6e636554),
-      ACE_NTOHL (0x656d706c),
-      ACE_NTOHL (0x6174653a),
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
-            24,
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63745265),
-      ACE_NTOHL (0x66657265),
-      ACE_NTOHL (0x6e636554),
-      ACE_NTOHL (0x656d706c),
-      ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
-            2, // value modifier
-      CORBA::tk_null, // no stateful base valuetype
-
-3, // member count
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_ObjectReferenceTemplateSeq),
-    (char *) &_oc_PortableInterceptor_ObjectReferenceTemplateSeq,
-    0,
-    sizeof (PortableInterceptor::ObjectReferenceTemplateSeq)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq =
-    &_tc_TAO_tc_PortableInterceptor_ObjectReferenceTemplateSeq;
-}
-
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:57
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
-{
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
-}
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceFactory *_tao_elem
-  )
-{
-  CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceFactory **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::insert (
-      _tao_any,
-      PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor,
-      PortableInterceptor::_tc_ObjectReferenceFactory,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceFactory *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::extract (
-        _tao_any,
-        PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor,
-        PortableInterceptor::_tc_ObjectReferenceFactory,
-        _tao_elem
-      );
-}
-
-
-
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:57
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
-{
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
-}
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplate *_tao_elem
-  )
-{
-  CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplate **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::insert (
-      _tao_any,
-      PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor,
-      PortableInterceptor::_tc_ObjectReferenceTemplate,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplate *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::extract (
-        _tao_any,
-        PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor,
-        PortableInterceptor::_tc_ObjectReferenceTemplate,
-        _tao_elem
-      );
-}
-
-
-
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert_copy (
-      _tao_any,
-      PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
-      PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplateSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert (
-      _tao_any,
-      PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
-      PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ObjectReferenceTemplateSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::extract (
-        _tao_any,
-        PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
-        PortableInterceptor::_tc_ObjectReferenceTemplateSeq,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+// be\be_valuetype.cpp:488
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt)
@@ -709,7 +345,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceFactory * vt)
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -720,11 +356,8 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        const_cast<
-            PortableInterceptor::ObjectReferenceFactory *> (
-            _tao_valuetype
-          ),
-        (ptrdiff_t) &PortableInterceptor::ObjectReferenceFactory::_downcast
+        const_cast<PortableInterceptor::ObjectReferenceFactory *> (_tao_valuetype),
+        reinterpret_cast<ptrdiff_t> (&PortableInterceptor::ObjectReferenceFactory::_downcast)
       );
 }
 
@@ -740,7 +373,7 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
+// be\be_valuetype.cpp:488
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
@@ -761,7 +394,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -772,11 +405,8 @@ operator<< (
   return
     CORBA::ValueBase::_tao_marshal (
         strm,
-        const_cast<
-            PortableInterceptor::ObjectReferenceTemplate *> (
-            _tao_valuetype
-          ),
-        (ptrdiff_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast
+        const_cast<PortableInterceptor::ObjectReferenceTemplate *> (_tao_valuetype),
+        reinterpret_cast<ptrdiff_t> (&PortableInterceptor::ObjectReferenceTemplate::_downcast)
       );
 }
 
@@ -792,7 +422,7 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
@@ -803,21 +433,21 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-
+      CORBA::Boolean _tao_marshal_flag = true;
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-
+      
       return _tao_marshal_flag;
     }
-
-  return 0;
+  
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -826,7 +456,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -834,37 +464,37 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
-
+      
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-
+      CORBA::Boolean _tao_marshal_flag = true;
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
-  return 0;
+  
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -890,18 +520,13 @@ CORBA::Boolean operator>> (
   template class
     TAO_Value_Var_T<
         PortableInterceptor::ObjectReferenceFactory
-
+        
       >;
-
+  
   template class
     TAO_Value_Out_T<
         PortableInterceptor::ObjectReferenceFactory
-
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableInterceptor::ObjectReferenceFactory
+        
       >;
 
   template class
@@ -918,18 +543,13 @@ CORBA::Boolean operator>> (
   template class
     TAO_Value_Var_T<
         PortableInterceptor::ObjectReferenceTemplate
-
+        
       >;
-
+  
   template class
     TAO_Value_Out_T<
         PortableInterceptor::ObjectReferenceTemplate
-
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableInterceptor::ObjectReferenceTemplate
+        
       >;
 
   template class
@@ -977,11 +597,6 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-  template class
-    TAO::Any_Dual_Impl_T<
-        PortableInterceptor::ObjectReferenceTemplateSeq
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
@@ -1006,18 +621,13 @@ CORBA::Boolean operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         PortableInterceptor::ObjectReferenceFactory \
-
+        
       >
-
+  
 # pragma instantiate \
     TAO_Value_Out_T< \
         PortableInterceptor::ObjectReferenceFactory \
-
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableInterceptor::ObjectReferenceFactory \
+        
       >
 
 # pragma instantiate \
@@ -1034,18 +644,13 @@ CORBA::Boolean operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         PortableInterceptor::ObjectReferenceTemplate \
-
+        
       >
-
+  
 # pragma instantiate \
     TAO_Value_Out_T< \
         PortableInterceptor::ObjectReferenceTemplate \
-
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableInterceptor::ObjectReferenceTemplate \
+        
       >
 
 # pragma instantiate \
@@ -1087,9 +692,4 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableInterceptor::ObjectReferenceTemplateSeq \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
index d2a256eac7d..a9196b2c12b 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -26,13 +26,16 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 
 #include /**/ "ace/pre.h"
 
+#ifndef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
+#error "You should not include ObjectReferenceTemplateC.h directly, use ObjectReferenceTemplate.h"
+#endif /* !TAO_OBJREF_TEMPLATE_SAFE_INCLUDE */
 
 #include "ace/config-all.h"
 
@@ -44,6 +47,7 @@
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Valuetype/Sequence_T.h"
@@ -67,9 +71,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -78,26 +80,26 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527
-
-
+  // be\be_valuetype.cpp:525
+  
+  
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_
-
+  
   class ObjectReferenceFactory;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceFactory
       >
     ObjectReferenceFactory_var;
-
+  
   typedef
     TAO_Value_Out_T<
         ObjectReferenceFactory
@@ -105,78 +107,78 @@ namespace PortableInterceptor
     ObjectReferenceFactory_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
+  // be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
-
+  
   class TAO_ORT_Export ObjectReferenceFactory
     : public virtual CORBA::ValueBase
   {
   public:
     typedef ObjectReferenceFactory_var _var_type;
-
+    
     static ObjectReferenceFactory* _downcast (CORBA::ValueBase *);
-
+    
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceFactory *&
       );
-
+    
     virtual const char* _tao_obv_repository_id (void) const;
-
+    
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:391
+    
   public:
     virtual CORBA::Object_ptr make_object (
         const char *, const ::PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:238
+  
   protected:
     ObjectReferenceFactory (void);
-
+    
     virtual ~ObjectReferenceFactory (void);
-
-
+    
+    
   private:
     ObjectReferenceFactory (const ObjectReferenceFactory &);
     void operator= (const ObjectReferenceFactory &);
-
+    
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527
-
-
+  // be\be_valuetype.cpp:525
+  
+  
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
-
+  
   class ObjectReferenceTemplate;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceTemplate
       >
     ObjectReferenceTemplate_var;
-
+  
   typedef
     TAO_Value_Out_T<
         ObjectReferenceTemplate
@@ -184,87 +186,87 @@ namespace PortableInterceptor
     ObjectReferenceTemplate_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
+  // be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
-
+  
   class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual ObjectReferenceFactory
   {
   public:
     typedef ObjectReferenceTemplate_var _var_type;
-
+    
     static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
-
+    
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceTemplate *&
       );
-
+    
     virtual const char* _tao_obv_repository_id (void) const;
-
+    
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:391
+    
   public:
     virtual char * server_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:391
+    
   public:
     virtual char * orb_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:391
+    
   public:
     virtual ::PortableInterceptor::AdapterName * adapter_name (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250
-
+    // be\be_visitor_valuetype/valuetype_ch.cpp:238
+  
   protected:
     ObjectReferenceTemplate (void);
-
+    
     virtual ~ObjectReferenceTemplate (void);
-
-
+    
+    
   private:
     ObjectReferenceTemplate (const ObjectReferenceTemplate &);
     void operator= (const ObjectReferenceTemplate &);
-
+    
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-
+  
   class ObjectReferenceTemplateSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ObjectReferenceTemplateSeq,
@@ -274,7 +276,7 @@ namespace PortableInterceptor
           >
       >
     ObjectReferenceTemplateSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ObjectReferenceTemplateSeq,
@@ -285,7 +287,7 @@ namespace PortableInterceptor
           >
       >
     ObjectReferenceTemplateSeq_out;
-
+  
   class TAO_ORT_Export ObjectReferenceTemplateSeq
     : public
         TAO_Unbounded_Valuetype_Sequence<
@@ -299,38 +301,38 @@ namespace PortableInterceptor
     ObjectReferenceTemplateSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ObjectReferenceTemplate ** buffer,
+        ObjectReferenceTemplate ** buffer, 
         CORBA::Boolean release = 0
       );
     ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
     ~ObjectReferenceTemplateSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ObjectReferenceTemplateSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:55
+// be\be_visitor_valuetype/obv_module.cpp:55
 
 namespace OBV_PortableInterceptor
 {
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -338,7 +340,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory>
   {
@@ -351,7 +353,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate>
   {
@@ -364,21 +366,21 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
+// be\be_visitor_valuetype/any_op_ch.cpp:54
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
+// be\be_visitor_valuetype/any_op_ch.cpp:54
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_ORT_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version
 TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version
@@ -386,7 +388,7 @@ TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableIntercept
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:434
+// be\be_valuetype.cpp:432
 
 namespace CORBA
 {
@@ -395,13 +397,13 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
 TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:434
+// be\be_valuetype.cpp:432
 
 namespace CORBA
 {
@@ -410,13 +412,13 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
 TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
@@ -433,13 +435,13 @@ TAO_ORT_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "ObjectReferenceTemplateC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -450,3 +452,5 @@ TAO_ORT_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
index 6781d2368a2..c900a647347 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
+// be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
 PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory (void)
@@ -44,7 +44,7 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
 }
 
 // TAO_IDL - Generated from 
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
+// be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
@@ -59,4 +59,3 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0";
 }
-
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index 2cb41452672..8665d81f97d 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -8,10 +8,6 @@ ACE_RCSID (ORT,
            ObjectReferenceTemplate_i,
            "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "ObjectReferenceTemplate_i.inl"
-#endif /* ! __ACE_INLINE__ */
-
 namespace TAO
 {
   ObjectReferenceTemplate::ObjectReferenceTemplate (
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
index 776e7e95d06..4b5d97aecb8 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
@@ -28,9 +28,7 @@
 #include "tao/PortableServer/PortableServerC.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -93,8 +91,8 @@ namespace TAO
     /// Destructor
     /**
      * Protected destructor to enforce proper memory management via
-   * reference counting.
-   */
+     * reference counting.
+     */
     ~ObjectReferenceTemplate (void);
 
   private:
@@ -104,14 +102,10 @@ namespace TAO
     PortableServer::POA_var poa_;
   };
 }
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-# include "ObjectReferenceTemplate_i.inl"
-#endif /* ! __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_OBJECT_REFERENCE_TEMPLATE_I_H */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.inl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.inl
deleted file mode 100644
index 2ad999ebb73..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index bb64bcd766e..f9562ce762d 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -80,9 +80,9 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy,
 CORBA::Object::Object (IOP::IOR *ior,
                        TAO_ORB_Core *orb_core)
   : servant_ (0)
+    , proxy_broker_ (0)
     , is_collocated_ (0)
     , is_local_ (0)
-    , proxy_broker_ (0)
     , is_evaluated_ (0)
     , ior_ (ior)
     , orb_core_ (orb_core)
@@ -503,15 +503,15 @@ CORBA::Object::_get_policy (
 }
 
 CORBA::Policy_ptr
-CORBA::Object::_get_client_policy (
-  CORBA::PolicyType type
+CORBA::Object::_get_cached_policy (
+  TAO_Cached_Policy_Type type
   ACE_ENV_ARG_DECL)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
   if (this->protocol_proxy_)
-    return this->_stubobj ()->get_client_policy (type
-                                                 ACE_ENV_ARG_PARAMETER);
+    return this->protocol_proxy_->get_cached_policy (type
+                                                     ACE_ENV_ARG_PARAMETER);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index abe40a97ce6..63736473fb5 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -213,7 +213,8 @@ namespace CORBA
     CORBA::Policy_ptr _get_policy (CORBA::PolicyType type
                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-
+    CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::Object_ptr _set_policy_overrides (
       const CORBA::PolicyList & policies,
@@ -245,10 +246,8 @@ namespace CORBA
     //@}
 
     // Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef Object_ptr _ptr_type;
     typedef Object_var _var_type;
-#endif /* __GNUC__ */
 
     //@} End of CORBA specific methods
 
@@ -287,12 +286,6 @@ namespace CORBA
     /// return value when finished with it.
     virtual TAO::ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
 
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-    CORBA::Policy_ptr _get_client_policy (CORBA::PolicyType type
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-#endif /*TAO_HAS_CORBA_MESSAGING*/
-
     /// Constructor
     Object (TAO_Stub *p,
             CORBA::Boolean collocated = 0,
@@ -361,13 +354,6 @@ namespace CORBA
 
   private:
 
-    /// Flag to indicate collocation.  It is 0 except for collocated
-    /// objects.
-    CORBA::Boolean is_collocated_;
-
-    /// Specify whether this is a local object or not.
-    CORBA::Boolean is_local_;
-
     /// Pointer to the Proxy Broker
     /**
      * This cached pointer instance takes care of routing the call for
@@ -376,8 +362,15 @@ namespace CORBA
      */
     TAO::Object_Proxy_Broker *proxy_broker_;
 
+    /// Flag to indicate collocation.  It is 0 except for collocated
+    /// objects.
+    CORBA::Boolean is_collocated_;
+
+    /// Specify whether this is a local object or not.
+    CORBA::Boolean is_local_;
+
     /// Flag to indicate whether the IOP::IOR has been evaluated fully.
-    Boolean is_evaluated_;
+    CORBA::Boolean is_evaluated_;
 
     /// If the IOR hasnt been evaluated fully, then the contents of
     /// the IOR that we received  should be in here!
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index b434038ed11..fdcf9939609 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -7,9 +7,10 @@
 ACE_INLINE
 CORBA::Object::Object (int)
   : servant_ (0),
-    is_collocated_ (0),
-    is_local_ (1),
-    is_evaluated_ (1),
+    proxy_broker_ (0),
+    is_collocated_ (false),
+    is_local_ (true),
+    is_evaluated_ (true),
     ior_ (),
     orb_core_ (0),
     protocol_proxy_ (0),
diff --git a/TAO/tao/ObjectIdList.pidl b/TAO/tao/ObjectIdList.pidl
index 7f3c87f875c..78af05ccc7a 100644
--- a/TAO/tao/ObjectIdList.pidl
+++ b/TAO/tao/ObjectIdList.pidl
@@ -14,7 +14,7 @@
  *   command used for this is:
  *
  *     tao_idl.exe
- *        -o orig -Sa -Ge 1 -GT
+ *        -o orig -Sa -Ge 1 -GT -GA -Sc
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
@@ -23,9 +23,10 @@
  *
  * and then:
  *
- * cp orig/ObjectIdListC.{h,i,cpp} .
+ * cp orig/ObjectIdListC.{h,inl,cpp} .
+ * cp orig/ObjectIdListA.cpp .
  *
- * The code left in ObjectIdListC.{h,i,cpp} is ready for use.
+ * The code is ready for use.
   */
 
 #ifndef TAO_CORBA_ORB_OBJECTIDLIST_PIDL
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
index 08d8f82bdc8..a2a41a59509 100644
--- a/TAO/tao/ObjectIdListC.cpp
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -26,22 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "ObjectIdListC.h"
-#include "tao/Typecode.h"
+#include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ObjectIdListC.i"
+#include "ObjectIdListC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -49,45 +49,6 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ORB_ObjectId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f52), 
-  ACE_NTOHL (0x425f4f62), 
-  ACE_NTOHL (0x6a656374), 
-  ACE_NTOHL (0x49643a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0
-    13,
-  ACE_NTOHL (0x4f52425f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x0),  // name = ORB_ObjectId
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectId (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ORB_ObjectId),
-    (char *) &_oc_CORBA_ORB_ObjectId,
-    0,
-    sizeof (CORBA::ORB_ObjectId)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ORB_ObjectId =
-    &_tc_TAO_tc_CORBA_ORB_ObjectId;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -127,71 +88,6 @@ CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f52), 
-  ACE_NTOHL (0x425f4f62), 
-  ACE_NTOHL (0x6a656374), 
-  ACE_NTOHL (0x49644c69), 
-  ACE_NTOHL (0x73743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB_ObjectIdList:1.0
-    17,
-  ACE_NTOHL (0x4f52425f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x0),  // name = ORB_ObjectIdList
-    CORBA::tk_sequence, // typecode kind
-  88, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    72, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4f52), 
-      ACE_NTOHL (0x425f4f62), 
-      ACE_NTOHL (0x6a656374), 
-      ACE_NTOHL (0x49643a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0
-            13,
-      ACE_NTOHL (0x4f52425f), 
-      ACE_NTOHL (0x4f626a65), 
-      ACE_NTOHL (0x63744964), 
-      ACE_NTOHL (0x0),  // name = ORB_ObjectId
-            CORBA::tk_string, 
-      0U, // string length
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ORB_ObjectIdList),
-    (char *) &_oc_CORBA_ORB_ObjectIdList,
-    0,
-    sizeof (CORBA::ORB_ObjectIdList)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ORB_ObjectIdList =
-    &_tc_TAO_tc_CORBA_ORB_ObjectIdList;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_
@@ -202,7 +98,7 @@ CORBA::Boolean operator<< (
     const CORBA::ORB_ObjectIdList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -265,7 +161,7 @@ return 0;
 #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -310,4 +206,3 @@ return 0;
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h
index 8c51f28c859..cf0def03950 100644
--- a/TAO/tao/ObjectIdListC.h
+++ b/TAO/tao/ObjectIdListC.h
@@ -26,21 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_OBJECTIDLISTC_H_
 #define _TAO_IDL_ORIG_OBJECTIDLISTC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Sequence_T.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+#include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 
@@ -57,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -72,34 +73,34 @@
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:376
-
+  
   typedef char * ORB_ObjectId;
   typedef CORBA::String_var ORB_ObjectId_var;
   typedef CORBA::String_out ORB_ObjectId_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORB_ObjectId;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
 #define _CORBA_ORB_OBJECTIDLIST_CH_
-
+  
   class ORB_ObjectIdList;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ORB_ObjectIdList,
         TAO_SeqElem_String_Manager
       >
     ORB_ObjectIdList_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ORB_ObjectIdList,
@@ -107,7 +108,7 @@ namespace CORBA
         TAO_SeqElem_String_Manager
       >
     ORB_ObjectIdList_out;
-
+  
   class TAO_Export ORB_ObjectIdList
     : public
         TAO_Unbounded_String_Sequence
@@ -118,20 +119,20 @@ namespace CORBA
     ORB_ObjectIdList (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer,
+        char ** buffer, 
         CORBA::Boolean release = 0
       );
     ORB_ObjectIdList (const ORB_ObjectIdList &);
     ~ORB_ObjectIdList (void);
-
+    
     typedef ORB_ObjectIdList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORB_ObjectIdList;
 
 // TAO_IDL - Generated from
@@ -165,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "ObjectIdListC.i"
+#include "ObjectIdListC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -183,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/ObjectIdListC.i b/TAO/tao/ObjectIdListC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/ObjectIdListC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl
index acd5610ea25..59bcb1ec683 100644
--- a/TAO/tao/Object_Key.pidl
+++ b/TAO/tao/Object_Key.pidl
@@ -8,10 +8,13 @@
 //     tao_idl
 //        -o orig -Ge 1 -St -GT -Gp -Gd -Sc
 //          -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
 
 module TAO
 {
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 7c673f39ba0..1c6d6c3a8d1 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Object_KeyC.h"
@@ -38,7 +38,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Object_KeyC.i"
+#include "Object_KeyC.inl"
 #endif /* !defined INLINE */
 
 #include "ace/ACE.h"
@@ -46,7 +46,7 @@
 #include "ace/os_include/os_ctype.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -54,7 +54,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_OBJECTKEY_CS_)
@@ -175,7 +175,7 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet>
        cp < eos && i < seq.length ();
        ++i)
     {
-      if (*cp == '%')
+      if (*cp == '%' || *cp == '\\')
         {
           // This is an escaped non-printable,
           // so we decode the hex values into
@@ -224,7 +224,7 @@ TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key,
       ACE_Message_Block::DONT_DELETE))
       {
         TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &key);
+          static_cast <TAO_Unbounded_Sequence<CORBA::Octet>*> (&key);
         oseq->replace (_tao_seq_len, strm.start ());
         oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
         strm.skip_bytes (_tao_seq_len);
@@ -253,28 +253,28 @@ CORBA::Boolean operator<< (
     const TAO::ObjectKey &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (TAO::ObjectKey *)&_tao_sequence);
-        if (oseq->mb ())
-          return strm.write_octet_array_mb (oseq->mb ());
+        TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = 
+          static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (const_cast<TAO::ObjectKey *> (&_tao_sequence));
+        if (_tao_octet_seq->mb ())
+          return strm.write_octet_array_mb (_tao_octet_seq->mb ());
         else
           return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
       }
-
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-
+  
   return 0;
 }
 
@@ -284,7 +284,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -294,18 +294,18 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
-
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       if (ACE_BIT_DISABLED (strm.start ()->flags (),
       ACE_Message_Block::DONT_DELETE))
@@ -315,8 +315,8 @@ CORBA::Boolean operator>> (
         strm.orb_core ()->resource_factory ()->
         input_cdr_allocator_type_locked () == 1)
         {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+            static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (&_tao_sequence);
           oseq->replace (_tao_seq_len, strm.start ());
           oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
           strm.skip_bytes (_tao_seq_len);
@@ -326,18 +326,18 @@ CORBA::Boolean operator>> (
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -381,4 +381,4 @@ CORBA::Boolean operator>> (
         CORBA::Octet \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 8c048d7682c..d4d092fb66b 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -26,19 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_OBJECT_KEYC_H_
 #define _TAO_IDL_ORIG_OBJECT_KEYC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -56,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,22 +73,22 @@
 
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_TAO_OBJECTKEY_CH_)
 #define _TAO_OBJECTKEY_CH_
-
+  
   class ObjectKey;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         ObjectKey,
         CORBA::Octet
       >
     ObjectKey_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ObjectKey,
@@ -94,7 +96,7 @@ namespace TAO
         CORBA::Octet
       >
     ObjectKey_out;
-
+  
   class TAO_Export ObjectKey
     : public
         TAO_Unbounded_Sequence<
@@ -107,12 +109,12 @@ namespace TAO
     ObjectKey (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Octet* buffer,
+        CORBA::Octet* buffer, 
         CORBA::Boolean release = 0
       );
     ObjectKey (const ObjectKey &);
     ~ObjectKey (void);
-
+    
     typedef ObjectKey_var _var_type;
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -176,13 +178,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_TAO_ObjectKey_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Object_KeyC.i"
+#include "Object_KeyC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -194,3 +196,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Object_KeyC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp
index 20d7daf1619..0ae0e4ec4e5 100644
--- a/TAO/tao/Object_Loader.cpp
+++ b/TAO/tao/Object_Loader.cpp
@@ -3,12 +3,8 @@
 #include "Object_Loader.h"
 #include "ace/Dynamic_Service.h"
 
-#if !defined(__ACE_INLINE__)
-#include "Object_Loader.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           Object_Loader, 
+ACE_RCSID (tao,
+           Object_Loader,
            "$Id$")
 
 TAO_Object_Loader::~TAO_Object_Loader (void)
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index f5293c48b40..fd9279e1fd0 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -60,9 +60,5 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-# include "Object_Loader.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_OBJECT_LOADER_H */
diff --git a/TAO/tao/Object_Loader.i b/TAO/tao/Object_Loader.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Object_Loader.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp
index 53bf34d07fb..69ad710c664 100644
--- a/TAO/tao/Object_T.cpp
+++ b/TAO/tao/Object_T.cpp
@@ -58,7 +58,7 @@ namespace TAO
     ACE_CATCHANY
       {
         // Swallow the exception
-        return 0;
+        return T::_nil ();
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (proxy);
@@ -77,20 +77,28 @@ namespace TAO
         return T::_nil ();
       }
 
+    if (obj->_is_local ())
+      {
+        return T::_duplicate (dynamic_cast<T *> (obj));
+      }
+
     T_ptr proxy = Narrow_Utils<T>::lazy_evaluation (obj);
 
     if (!CORBA::is_nil (proxy))
       {
         return proxy;
       }
-
+      
     TAO_Stub* stub = obj->_stubobj ();
 
-    if (stub != 0)
+    if (stub == 0)
       {
-        stub->_incr_refcnt ();
+        // If we're here, we have been passed a bogus objref.
+        ACE_THROW_RETURN (CORBA::BAD_PARAM (), T::_nil ());
       }
 
+    stub->_incr_refcnt ();
+
     bool collocated =
       !CORBA::is_nil (stub->servant_orb_var ().ptr ())
       && stub->optimize_collocation_objects ()
diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h
index 7a8eb17414b..57c11c5950a 100644
--- a/TAO/tao/Object_T.h
+++ b/TAO/tao/Object_T.h
@@ -23,9 +23,6 @@ namespace CORBA
 {
   class Object;
   typedef Object *Object_ptr;
-
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
 }
 
 namespace TAO
@@ -46,11 +43,6 @@ namespace TAO
                          Proxy_Broker_Factory
                          ACE_ENV_ARG_DECL);
 
-    static T_ptr narrow (CORBA::AbstractBase_ptr,
-                         const char *repo_id,
-                         Proxy_Broker_Factory
-                         ACE_ENV_ARG_DECL);
-
     // Version used the operators.
     static T_ptr unchecked_narrow (CORBA::Object_ptr,
                                    Proxy_Broker_Factory);
@@ -60,8 +52,6 @@ namespace TAO
                                    Proxy_Broker_Factory
                                    ACE_ENV_ARG_DECL);
 
-    // static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr,
-    //                              Proxy_Broker_Factory);
   private:
     // Code for lazily evaluated IORs.
     static T_ptr lazy_evaluation (CORBA::Object_ptr);
diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp
index 7da5ea26bc6..0a93b48c86a 100644
--- a/TAO/tao/Objref_VarOut_T.cpp
+++ b/TAO/tao/Objref_VarOut_T.cpp
@@ -5,10 +5,6 @@
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Environment.h"
 
-#if !defined (__ACE_INLINE__)
-#include "tao/Objref_VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            Objref_VarOut_T,
            "$Id$")
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index f0d0fcf2407..f3fc6ac260f 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -125,10 +125,6 @@ private:
   T *& ptr_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "tao/Objref_VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "tao/Objref_VarOut_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Objref_VarOut_T.inl b/TAO/tao/Objref_VarOut_T.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/tao/Objref_VarOut_T.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl
index 59b6b8c4fe1..3a72d7af4a1 100644
--- a/TAO/tao/OctetSeq.pidl
+++ b/TAO/tao/OctetSeq.pidl
@@ -8,7 +8,7 @@
 //   The command used to generate code is:
 //
 //     tao_idl
-//        -o orig -Ge 1 -GT -GA
+//        -o orig -Ge 1 -GT -GA -Sc
 //          -Wb,export_macro=TAO_Export
 //          -Wb,pre_include="ace/pre.h"
 //          -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp
index 14ab3cbcf38..194118dbb4f 100644
--- a/TAO/tao/OctetSeqA.cpp
+++ b/TAO/tao/OctetSeqA.cpp
@@ -27,26 +27,28 @@
 
 #include "OctetSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_OctetSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f63),
-  ACE_NTOHL (0x74657453),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f63), 
+  ACE_NTOHL (0x74657453), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
     9,
-  ACE_NTOHL (0x4f637465),
-  ACE_NTOHL (0x74536571),
+  ACE_NTOHL (0x4f637465), 
+  ACE_NTOHL (0x74536571), 
   ACE_NTOHL (0x0),  // name = OctetSeq
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -62,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (
     sizeof (_oc_CORBA_OctetSeq),
     (char *) &_oc_CORBA_OctetSeq,
     0,
-    sizeof (CORBA::OctetSeq)
+    0
   );
 
 namespace CORBA
@@ -71,7 +73,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_OctetSeq;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -108,8 +110,8 @@ CORBA::Boolean operator>>= (
     CORBA::OctetSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::OctetSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::OctetSeq *&> (
       _tao_elem
     );
 }
@@ -129,8 +131,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -145,5 +145,4 @@ CORBA::Boolean operator>>= (
         CORBA::OctetSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 9cd587047be..0814db202a2 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -26,13 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "OctetSeqC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -40,10 +39,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "OctetSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -52,7 +51,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_OCTETSEQ_CS_)
 #define _CORBA_OCTETSEQ_CS_
@@ -105,7 +104,7 @@ void CORBA::OctetSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_
 #define _TAO_CDR_OP_CORBA_OctetSeq_CPP_
@@ -123,10 +122,10 @@ CORBA::Boolean operator<< (
       
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-          static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> ((CORBA::OctetSeq *)&_tao_sequence);
-        if (oseq->mb ())
-          return strm.write_octet_array_mb (oseq->mb ());
+        TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = 
+          static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (const_cast<CORBA::OctetSeq *> (&_tao_sequence));
+        if (_tao_octet_seq->mb ())
+          return strm.write_octet_array_mb (_tao_octet_seq->mb ());
         else
           return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
       }
@@ -199,7 +198,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -244,4 +243,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index c07810ba7c7..ae8f301d14b 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -26,21 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_OCTETSEQC_H_
 #define _TAO_IDL_ORIG_OCTETSEQC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Sequence_T.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
+#include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 
@@ -57,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -68,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_OCTETSEQ_CH_)
 #define _CORBA_OCTETSEQ_CH_
@@ -130,17 +131,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -160,7 +161,7 @@ namespace TAO
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
@@ -168,7 +169,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_
 #define _TAO_CDR_OP_CORBA_OctetSeq_H_
@@ -185,13 +186,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "OctetSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -203,3 +204,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/OctetSeqC.inl b/TAO/tao/OctetSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/OctetSeqC.inl
+++ b/TAO/tao/OctetSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/OctetSeqS.h b/TAO/tao/OctetSeqS.h
index 574cbf97971..0c1085ace36 100644
--- a/TAO/tao/OctetSeqS.h
+++ b/TAO/tao/OctetSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_OCTETSEQS_H_
 #define _TAO_IDL_ORIG_OCTETSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
index 5256404e9dc..38303527995 100644
--- a/TAO/tao/PI_Forward.pidl
+++ b/TAO/tao/PI_Forward.pidl
@@ -23,7 +23,7 @@
  *
  * cp orig/PI_ForwardC.{h,i,cpp} .
  *
- * The code left in PI_ForwardC.{h,i,cpp} is ready for use.
+ * The code left in PI_ForwardC.{h,i,cpp}
  *
  */
 
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
index ab3fc77daa3..6dce7050f76 100644
--- a/TAO/tao/PI_ForwardC.cpp
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "PI_ForwardC.h"
@@ -43,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -52,7 +52,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ServerId[] =
 {
@@ -83,7 +83,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerId (
     sizeof (_oc_PortableInterceptor_ServerId),
     (char *) &_oc_PortableInterceptor_ServerId,
     0,
-    sizeof (PortableInterceptor::ServerId)
+    0
   );
 
 namespace PortableInterceptor
@@ -93,7 +93,7 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ORBId[] =
 {
@@ -122,7 +122,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBId (
     sizeof (_oc_PortableInterceptor_ORBId),
     (char *) &_oc_PortableInterceptor_ORBId,
     0,
-    sizeof (PortableInterceptor::ORBId)
+    0
   );
 
 namespace PortableInterceptor
@@ -132,7 +132,7 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_AdapterName[] =
 {
@@ -185,7 +185,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterName (
     sizeof (_oc_PortableInterceptor_AdapterName),
     (char *) &_oc_PortableInterceptor_AdapterName,
     0,
-    sizeof (PortableInterceptor::AdapterName)
+    0
   );
 
 namespace PortableInterceptor
@@ -195,7 +195,7 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ObjectId[] =
 {
@@ -248,7 +248,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectId (
     sizeof (_oc_PortableInterceptor_ObjectId),
     (char *) &_oc_PortableInterceptor_ObjectId,
     0,
-    sizeof (PortableInterceptor::ObjectId)
+    0
   );
 
 namespace PortableInterceptor
@@ -258,7 +258,7 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
 {
@@ -293,7 +293,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterManagerId (
     sizeof (_oc_PortableInterceptor_AdapterManagerId),
     (char *) &_oc_PortableInterceptor_AdapterManagerId,
     0,
-    sizeof (PortableInterceptor::AdapterManagerId)
+    0
   );
 
 namespace PortableInterceptor
@@ -303,7 +303,7 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
 {
@@ -336,7 +336,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterState (
     sizeof (_oc_PortableInterceptor_AdapterState),
     (char *) &_oc_PortableInterceptor_AdapterState,
     0,
-    sizeof (PortableInterceptor::AdapterState)
+    0
   );
 
 namespace PortableInterceptor
@@ -346,11 +346,10 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index 9f876afd852..45e79cdee3d 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_PI_FORWARDC_H_
 #define _TAO_IDL_ORIG_PI_FORWARDC_H_
@@ -44,8 +44,8 @@
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 
-#include "OctetSeqC.h"
-#include "StringSeqC.h"
+#include "tao/OctetSeqC.h"
+#include "tao/StringSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -60,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,88 +69,88 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:376
+  // be\be_visitor_typedef/typedef_ch.cpp:376
   
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
   typedef CORBA::String_out ServerId_out;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:376
+  // be\be_visitor_typedef/typedef_ch.cpp:376
   
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
   typedef CORBA::String_out ORBId_out;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:435
+  // be\be_visitor_typedef/typedef_ch.cpp:435
   
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
   typedef CORBA::StringSeq_out AdapterName_out;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:435
+  // be\be_visitor_typedef/typedef_ch.cpp:435
   
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:342
   
   typedef CORBA::Long AdapterManagerId;
   typedef CORBA::Long_out AdapterManagerId_out;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:342
   
   typedef CORBA::Short AdapterState;
   typedef CORBA::Short_out AdapterState_out;
   
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -160,13 +158,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "PI_ForwardC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -178,3 +176,4 @@ namespace TAO
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/PI_ForwardC.inl b/TAO/tao/PI_ForwardC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/PI_ForwardC.inl
+++ b/TAO/tao/PI_ForwardC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/ParameterMode.cpp b/TAO/tao/ParameterMode.cpp
deleted file mode 100644
index bdf3eb44645..00000000000
--- a/TAO/tao/ParameterMode.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-#include "tao/ParameterMode.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (tao,
-           ParameterMode,
-           "$Id$")
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const CORBA::ParameterMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
-
-  if (_tao_result == 1)
-    {
-      _tao_enumval = static_cast<CORBA::ParameterMode> (_tao_temp);
-    }
-
-  return _tao_result;
-}
diff --git a/TAO/tao/ParameterMode.h b/TAO/tao/ParameterMode.h
deleted file mode 100644
index a2648df1595..00000000000
--- a/TAO/tao/ParameterMode.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     ParameterMode.h
- *
- *  $Id$
- *
- *  This enum is used only in the IDL structs Dynamic::Parameter and
- *  CORBA::ParameterDescription.
- *
- *  @author  Jeff Parsons
- */
-//=============================================================================
-
-#ifndef CORBA_PARAMETERMODE_H
-#define CORBA_PARAMETERMODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-namespace CORBA
-{
-  enum ParameterMode
-    {
-      PARAM_IN,
-      PARAM_OUT,
-      PARAM_INOUT
-    };
-}
-
-TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &);
-
-TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
-
-#include /**/ "ace/post.h"
-
-#endif  /* CORBA_PARAMETERMODE_H */
diff --git a/TAO/tao/Pluggable_Messaging.cpp b/TAO/tao/Pluggable_Messaging.cpp
index 0b5ca334c38..c63880b3fa4 100644
--- a/TAO/tao/Pluggable_Messaging.cpp
+++ b/TAO/tao/Pluggable_Messaging.cpp
@@ -2,12 +2,8 @@
 
 #include "Pluggable_Messaging.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/Pluggable_Messaging.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           Pluggable_Messaging, 
+ACE_RCSID (tao,
+           Pluggable_Messaging,
            "$Id$")
 
 TAO_Pluggable_Messaging::~TAO_Pluggable_Messaging (void)
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index c47d1101c9d..86989c0865b 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -141,10 +141,6 @@ public:
   virtual int consolidate_node (TAO_Queued_Data *qd,
                                 ACE_Message_Block &incoming) = 0;
 
-  /// @@Bala:Docu??
-  virtual int consolidate_fragments (TAO_Queued_Data *dqd,
-                                     const TAO_Queued_Data *sqd) = 0;
-
   /// Parse the request message, make an upcall and send the reply back
   /// to the "request initiator"
   virtual int process_request_message (TAO_Transport *transport,
@@ -174,14 +170,14 @@ public:
   /// Header length
   virtual size_t header_length (void) const = 0;
 
+  /// Fragment header length
+  virtual size_t fragment_header_length (CORBA::Octet major,
+                                         CORBA::Octet minor) const = 0;
+
   /// Accessor for the output CDR stream
   virtual TAO_OutputCDR &out_stream (void) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/Pluggable_Messaging.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /*TAO_PLUGGABLE_MESSAGING_H*/
diff --git a/TAO/tao/Pluggable_Messaging.i b/TAO/tao/Pluggable_Messaging.i
deleted file mode 100644
index d770714e772..00000000000
--- a/TAO/tao/Pluggable_Messaging.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-
-//$Id$
diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h
index d85c44770bd..9a7b421ecbf 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.h
+++ b/TAO/tao/Pluggable_Messaging_Utils.h
@@ -118,29 +118,28 @@ public:
 // keeping off. I dont want to add something for the kick of it :-)
 enum TAO_Pluggable_Header_Type
 {
-  // = TITLE
-  // = DESCRIPTION
-  //
   TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER = 0,
   TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER
 };
 
 
+/**
+ * Provide an external interface for the users of this pluggable
+ * messaging framework to denote  existing message types. This has
+ * an inspiration from GIOP. So if anybody wants to add more message
+ * types you are welcome but please do not change the numbering
+ * scheme as this would affect GIOP.
+ *
+ * @note
+ * We may not need everything here. It would be good if we
+ * have only the following messages TAO_PLUGGABLE_MESSAGE_REQUEST,
+ * TAO_PLUGGABLE_MESSAGE_REPLY,
+ * TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
+ * TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR.  Changes will be made once
+ * the rest of the stuff gets ready to roll
+ */
 enum TAO_Pluggable_Message_Type
 {
-  // = DESCRIPTION
-  //   Provide an external interface for the users of this pluggable
-  //   messaging framework to denote  existing message types. This has
-  //   an inspiration from GIOP. So if anybody wants to add more message
-  //   types you are welcome but please do not change the numbering
-  //   scheme as this would affect GIOP.
-
-  //   NOTE: We may not need evrything here. It would be good if we
-  //   have only the following messages TAO_PLUGGABLE_MESSAGE_REQUEST,
-  //   TAO_PLUGGABLE_MESSAGE_REPLY,
-  //   TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
-  //   TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR.  Changes will be made once
-  //   the rest of the stuff gets ready to roll.
   TAO_PLUGGABLE_MESSAGE_REQUEST = 0,                // sent by client.
   TAO_PLUGGABLE_MESSAGE_REPLY = 1,                  // by server.
   TAO_PLUGGABLE_MESSAGE_CANCELREQUEST = 2,          // by client.
@@ -154,31 +153,32 @@ enum TAO_Pluggable_Message_Type
 // @@ Bala: This is a hopeless GIOPism.
 // @@ Carlos: Agreed.
 
+/**
+ * Provide an external interface for the users of this pluggable
+ * messaging framework to denote  existing Exception types. This has
+ * an inspiration from GIOP. So if anybody wants to add more message
+ * types you are welcome but please do not change the numbering
+ * scheme as this would affect GIOP.
+ */
 enum TAO_Pluggable_Message_Exception_Type
 {
-  // = DESCRIPTION
-  //   Provide an external interface for the users of this pluggable
-  //   messaging framework to denote  existing Exception types. This has
-  //   an inspiration from GIOP. So if anybody wants to add more message
-  //   types you are welcome but please do not change the numbering
-  //   scheme as this would affect GIOP.
+  /// Request completed successfully
   TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION = 0,
-  // Request completed successfully
 
+  /// Request terminated with user exception
   TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION,
-  // Request terminated with user exception
 
+  /// Request terminated with system exception
   TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION,
-  // Request terminated with system exception
 
+  /// Reply is a location forward type
   TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD,
-  // Reply is a location forward type
 
+  /// PLUGGABLE_MESSAGE 1.2, Reply is a location forward perm type..
   TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM,
-  // PLUGGABLE_MESSAGE 1.2, Reply is a location forward perm type..
 
+  /// GIOP1.2,
   TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE
-  // GIOP1.2,
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
index 0e4d144950c..8e13b1367cc 100644
--- a/TAO/tao/Policy.pidl
+++ b/TAO/tao/Policy.pidl
@@ -37,9 +37,6 @@
  *   for i in Policy{S,S_T}.{h,i,cpp}; do
  *     diff -wBbu orig/$i PortableServer/$i;
  *   done >> diffs/Policy.diff
- *
- * Move the typecodes for exceptions in PolicyA.cpp to
- * PolicyC.cpp.
  */
 
 #ifndef TAO_CORBA_POLICY_PIDL
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
index 8e78add1e30..6e63292b4f3 100644
--- a/TAO/tao/PolicyA.cpp
+++ b/TAO/tao/PolicyA.cpp
@@ -27,30 +27,32 @@
 
 #include "PolicyC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x4572726f),
-  ACE_NTOHL (0x72436f64),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x4572726f), 
+  ACE_NTOHL (0x72436f64), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
     16,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63794572),
-  ACE_NTOHL (0x726f7243),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794572), 
+  ACE_NTOHL (0x726f7243), 
   ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
     CORBA::tk_short,
 
@@ -61,7 +63,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyErrorCode (
     sizeof (_oc_CORBA_PolicyErrorCode),
     (char *) &_oc_CORBA_PolicyErrorCode,
     0,
-    sizeof (CORBA::PolicyErrorCode)
+    0
   );
 
 namespace CORBA
@@ -70,25 +72,23 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_PolicyErrorCode;
 }
 
-
-
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Policy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
     7,
-  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = Policy
   };
 
@@ -97,7 +97,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy (
     sizeof (_oc_CORBA_Policy),
     (char *) &_oc_CORBA_Policy,
     0,
-    sizeof (CORBA::Policy)
+    0
   );
 
 namespace CORBA
@@ -107,25 +107,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_PolicyManager[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x4d616e61),
-  ACE_NTOHL (0x6765723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x4d616e61), 
+  ACE_NTOHL (0x6765723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyManager:1.0
     14,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63794d61),
-  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794d61), 
+  ACE_NTOHL (0x6e616765), 
   ACE_NTOHL (0x72000000),  // name = PolicyManager
   };
 
@@ -134,7 +134,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyManager (
     sizeof (_oc_CORBA_PolicyManager),
     (char *) &_oc_CORBA_PolicyManager,
     0,
-    sizeof (CORBA::PolicyManager)
+    0
   );
 
 namespace CORBA
@@ -144,25 +144,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x43757272),
-  ACE_NTOHL (0x656e743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyCurrent:1.0
     14,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63794375),
-  ACE_NTOHL (0x7272656e),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794375), 
+  ACE_NTOHL (0x7272656e), 
   ACE_NTOHL (0x74000000),  // name = PolicyCurrent
   };
 
@@ -171,7 +171,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyCurrent (
     sizeof (_oc_CORBA_PolicyCurrent),
     (char *) &_oc_CORBA_PolicyCurrent,
     0,
-    sizeof (CORBA::PolicyCurrent)
+    0
   );
 
 namespace CORBA
@@ -180,7 +180,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_PolicyCurrent;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -190,12 +190,12 @@ TAO::Any_Dual_Impl_T<CORBA::PolicyError>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -206,7 +206,7 @@ TAO::Any_Dual_Impl_T<CORBA::PolicyError>::demarshal_value (
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -244,8 +244,8 @@ CORBA::Boolean operator>>= (
     CORBA::PolicyError *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::PolicyError *&,
+  return _tao_any >>= const_cast<
+      const CORBA::PolicyError *&> (
       _tao_elem
     );
 }
@@ -265,7 +265,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -275,12 +275,12 @@ TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -291,7 +291,7 @@ TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::demarshal_value (
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -329,8 +329,8 @@ CORBA::Boolean operator>>= (
     CORBA::InvalidPolicies *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::InvalidPolicies *&,
+  return _tao_any >>= const_cast<
+      const CORBA::InvalidPolicies *&> (
       _tao_elem
     );
 }
@@ -543,8 +543,6 @@ operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -599,4 +597,4 @@ operator>>= (
         CORBA::PolicyCurrent \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index addf34ef1fd..79bc0dfae8a 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -26,13 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "PolicyC.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
-#include "tao/SystemException.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
 #include "tao/Typecode.h"
@@ -45,11 +44,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "PolicyC.i"
+#include "PolicyC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -57,7 +56,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
 #define _CORBA_POLICY__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_Export Arg_Traits<CORBA::Policy>
     : public
@@ -74,7 +73,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PolicyError::PolicyError (void)
@@ -109,21 +108,20 @@ CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp)
 void CORBA::PolicyError::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyError *_tao_tmp_pointer =
-    ACE_static_cast (PolicyError*, _tao_void_pointer);
+    static_cast<PolicyError *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 CORBA::PolicyError *
 CORBA::PolicyError::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (PolicyError *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<PolicyError *> (_tao_excp);
+}
+
+const CORBA::PolicyError *
+CORBA::PolicyError::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const PolicyError *> (_tao_excp);
 }
 
 CORBA::Exception *CORBA::PolicyError::_alloc (void)
@@ -159,7 +157,7 @@ void CORBA::PolicyError::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -172,7 +170,7 @@ void CORBA::PolicyError::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -192,48 +190,54 @@ CORBA::PolicyError::PolicyError (
   this->reason = _tao_reason;
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const
+{
+  return ::CORBA::_tc_PolicyError;
+}
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_PolicyError[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x4572726f),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x4572726f), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyError:1.0
     12,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63794572),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794572), 
   ACE_NTOHL (0x726f7200),  // name = PolicyError
   1, // member count
     7,
-  ACE_NTOHL (0x72656173),
+  ACE_NTOHL (0x72656173), 
   ACE_NTOHL (0x6f6e0000),  // name = reason
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4572726f),
-    ACE_NTOHL (0x72436f64),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f506f), 
+    ACE_NTOHL (0x6c696379), 
+    ACE_NTOHL (0x4572726f), 
+    ACE_NTOHL (0x72436f64), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
         16,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794572),
-    ACE_NTOHL (0x726f7243),
+    ACE_NTOHL (0x506f6c69), 
+    ACE_NTOHL (0x63794572), 
+    ACE_NTOHL (0x726f7243), 
     ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
         CORBA::tk_short,
 
@@ -245,7 +249,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyError (
     sizeof (_oc_CORBA_PolicyError),
     (char *) &_oc_CORBA_PolicyError,
     0,
-    sizeof (CORBA::PolicyError)
+    0
   );
 
 namespace CORBA
@@ -254,79 +258,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_PolicyError;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f496e),
-  ACE_NTOHL (0x76616c69),
-  ACE_NTOHL (0x64506f6c),
-  ACE_NTOHL (0x69636965),
-  ACE_NTOHL (0x733a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0
-    16,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696450),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x69657300),  // name = InvalidPolicies
-  1, // member count
-    8,
-  ACE_NTOHL (0x696e6469),
-  ACE_NTOHL (0x63657300),  // name = indices
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5553),
-    ACE_NTOHL (0x686f7274),
-    ACE_NTOHL (0x5365713a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/UShortSeq:1.0
-        10,
-    ACE_NTOHL (0x5553686f),
-    ACE_NTOHL (0x72745365),
-    ACE_NTOHL (0x71000000),  // name = UShortSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_ushort,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InvalidPolicies (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_InvalidPolicies),
-    (char *) &_oc_CORBA_InvalidPolicies,
-    0,
-    sizeof (CORBA::InvalidPolicies)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_InvalidPolicies =
-    &_tc_TAO_tc_CORBA_InvalidPolicies;
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const
-{
-  return ::CORBA::_tc_PolicyError;
-}
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::InvalidPolicies::InvalidPolicies (void)
@@ -361,21 +293,20 @@ CORBA::InvalidPolicies::operator= (const ::CORBA::InvalidPolicies &_tao_excp)
 void CORBA::InvalidPolicies::_tao_any_destructor (void *_tao_void_pointer)
 {
   InvalidPolicies *_tao_tmp_pointer =
-    ACE_static_cast (InvalidPolicies*, _tao_void_pointer);
+    static_cast<InvalidPolicies *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 CORBA::InvalidPolicies *
 CORBA::InvalidPolicies::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (InvalidPolicies *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InvalidPolicies *> (_tao_excp);
+}
+
+const CORBA::InvalidPolicies *
+CORBA::InvalidPolicies::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidPolicies *> (_tao_excp);
 }
 
 CORBA::Exception *CORBA::InvalidPolicies::_alloc (void)
@@ -411,7 +342,7 @@ void CORBA::InvalidPolicies::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -424,7 +355,7 @@ void CORBA::InvalidPolicies::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -451,6 +382,72 @@ CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f496e), 
+  ACE_NTOHL (0x76616c69), 
+  ACE_NTOHL (0x64506f6c), 
+  ACE_NTOHL (0x69636965), 
+  ACE_NTOHL (0x733a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0
+    16,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x69657300),  // name = InvalidPolicies
+  1, // member count
+    8,
+  ACE_NTOHL (0x696e6469), 
+  ACE_NTOHL (0x63657300),  // name = indices
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    32,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5553), 
+    ACE_NTOHL (0x686f7274), 
+    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/UShortSeq:1.0
+        10,
+    ACE_NTOHL (0x5553686f), 
+    ACE_NTOHL (0x72745365), 
+    ACE_NTOHL (0x71000000),  // name = UShortSeq
+        CORBA::tk_sequence, // typecode kind
+    12, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_ushort,
+
+      0U,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_InvalidPolicies (
+    CORBA::tk_except,
+    sizeof (_oc_CORBA_InvalidPolicies),
+    (char *) &_oc_CORBA_InvalidPolicies,
+    0,
+    0
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_InvalidPolicies =
+    &_tc_TAO_tc_CORBA_InvalidPolicies;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::Policy.
@@ -491,7 +488,7 @@ TAO::Objref_Traits<CORBA::Policy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -510,19 +507,19 @@ CORBA::PolicyType CORBA::Policy::policy_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
     {
       CORBA_Policy_setup_collocation ();
     }
-
-  TAO::Arg_Traits<CORBA::PolicyType>::ret_val _tao_retval;
-
+  
+  TAO::Arg_Traits< CORBA::PolicyType>::ret_val _tao_retval;
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -531,10 +528,10 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       16,
       this->the_TAO_Policy_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -552,19 +549,19 @@ CORBA::PolicyType CORBA::Policy::policy_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
     {
       CORBA_Policy_setup_collocation ();
     }
-
-  TAO::Arg_Traits<CORBA::Policy>::ret_val _tao_retval;
-
+  
+  TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -573,10 +570,10 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       4,
       this->the_TAO_Policy_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -594,19 +591,19 @@ void CORBA::Policy::destroy (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
     {
       CORBA_Policy_setup_collocation ();
     }
-
-  TAO::Arg_Traits<void>::ret_val _tao_retval;
-
+  
+  TAO::Arg_Traits< void>::ret_val _tao_retval;
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -615,7 +612,7 @@ void CORBA::Policy::destroy (
       7,
       this->the_TAO_Policy_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -639,11 +636,11 @@ CORBA::Policy::CORBA_Policy_setup_collocation ()
 CORBA::Policy::~Policy (void)
 {}
 
-void
+void 
 CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
 {
   Policy *_tao_tmp_pointer =
-    ACE_static_cast (Policy *, _tao_void_pointer);
+    static_cast<Policy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -684,7 +681,7 @@ CORBA::Policy::_duplicate (Policy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -767,23 +764,17 @@ TAO::Objref_Traits<CORBA::PolicyManager>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_PolicyManager_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 CORBA::PolicyManager::PolicyManager (void)
 {}
 
 CORBA::PolicyManager::~PolicyManager (void)
 {}
 
-void
+void 
 CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyManager *_tao_tmp_pointer =
-    ACE_static_cast (PolicyManager *, _tao_void_pointer);
+    static_cast<PolicyManager *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -797,10 +788,10 @@ CORBA::PolicyManager::_narrow (
     {
       return PolicyManager::_nil ();
     }
-
+  
   PolicyManager_ptr proxy =
     dynamic_cast<PolicyManager_ptr> (_tao_objref);
-
+  
   return PolicyManager::_duplicate (proxy);
 }
 
@@ -814,10 +805,10 @@ CORBA::PolicyManager::_unchecked_narrow (
     {
       return PolicyManager::_nil ();
     }
-
+  
   PolicyManager_ptr proxy =
     dynamic_cast<PolicyManager_ptr> (_tao_objref);
-
+  
   return PolicyManager::_duplicate (proxy);
 }
 
@@ -828,7 +819,7 @@ CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -912,23 +903,17 @@ TAO::Objref_Traits<CORBA::PolicyCurrent>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_PolicyCurrent_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 CORBA::PolicyCurrent::PolicyCurrent (void)
 {}
 
 CORBA::PolicyCurrent::~PolicyCurrent (void)
 {}
 
-void
+void 
 CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyCurrent *_tao_tmp_pointer =
-    ACE_static_cast (PolicyCurrent *, _tao_void_pointer);
+    static_cast<PolicyCurrent *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -942,10 +927,10 @@ CORBA::PolicyCurrent::_narrow (
     {
       return PolicyCurrent::_nil ();
     }
-
+  
   PolicyCurrent_ptr proxy =
     dynamic_cast<PolicyCurrent_ptr> (_tao_objref);
-
+  
   return PolicyCurrent::_duplicate (proxy);
 }
 
@@ -959,10 +944,10 @@ CORBA::PolicyCurrent::_unchecked_narrow (
     {
       return PolicyCurrent::_nil ();
     }
-
+  
   PolicyCurrent_ptr proxy =
     dynamic_cast<PolicyCurrent_ptr> (_tao_objref);
-
+  
   return PolicyCurrent::_duplicate (proxy);
 }
 
@@ -973,7 +958,7 @@ CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1165,26 +1150,26 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::CORBA::Policy RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -1221,7 +1206,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         CORBA::Policy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::Policy
@@ -1241,7 +1226,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         CORBA::PolicyManager
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::PolicyManager
@@ -1256,7 +1241,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         CORBA::PolicyCurrent
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::PolicyCurrent
@@ -1283,6 +1268,12 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
+    TAO::Ret_Object_Argument_T< \
+        CORBA::Policy_ptr, \
+        CORBA::Policy_var \
+      >
+
+# pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::Policy \
       >
@@ -1291,7 +1282,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         CORBA::Policy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::Policy
@@ -1311,7 +1302,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         CORBA::PolicyManager
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::PolicyManager
@@ -1326,10 +1317,10 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         CORBA::PolicyCurrent
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::PolicyCurrent
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 1d4c2b5815f..1944fad144c 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -26,27 +26,30 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_POLICYC_H_
 #define _TAO_IDL_ORIG_POLICYC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Environment.h"
-#include "tao/UserException.h"
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/SystemException.h"
+#include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
-#include "UShortSeqC.h"
-#include "CurrentC.h"
+#include "tao/UShortSeqC.h"
+#include "tao/CurrentC.h"
+#include "tao/Policy_ForwardC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -61,9 +64,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,13 +72,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -87,65 +88,67 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::Short PolicyErrorCode;
   typedef CORBA::Short_out PolicyErrorCode_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyErrorCode;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode BAD_POLICY = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_POLICYERROR_CH_)
 #define _CORBA_POLICYERROR_CH_
-
+  
   class TAO_Export PolicyError : public CORBA::UserException
   {
   public:
-
+    
     CORBA::PolicyErrorCode reason;
     PolicyError (void);
     PolicyError (const PolicyError &);
     ~PolicyError (void);
 
     PolicyError &operator= (const PolicyError &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static PolicyError *_downcast (CORBA::Exception *);
+    static const PolicyError *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -154,54 +157,56 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     PolicyError (
         ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason
       );
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
-
+    // be\be_visitor_exception/exception_ch.cpp:127
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_INVALIDPOLICIES_CH_)
 #define _CORBA_INVALIDPOLICIES_CH_
-
+  
   class TAO_Export InvalidPolicies : public CORBA::UserException
   {
   public:
-
+    
     CORBA::UShortSeq indices;
     InvalidPolicies (void);
     InvalidPolicies (const InvalidPolicies &);
     ~InvalidPolicies (void);
 
     InvalidPolicies &operator= (const InvalidPolicies &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static InvalidPolicies *_downcast (CORBA::Exception *);
+    static const InvalidPolicies *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -210,47 +215,47 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     InvalidPolicies (
         const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices
       );
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
-
+    // be\be_visitor_exception/exception_ch.cpp:127
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
-
+  
   class Policy;
   typedef Policy *Policy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Policy
       >
     Policy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Policy
@@ -258,13 +263,13 @@ namespace CORBA
     Policy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
-
+  
   class TAO_Export Policy
     : public virtual CORBA::Object
   {
@@ -272,65 +277,65 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Policy>;
     typedef Policy_ptr _ptr_type;
     typedef Policy_var _var_type;
-
+    
     // The static operations.
     static Policy_ptr _duplicate (Policy_ptr obj);
-
+    
     static Policy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Policy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Policy_ptr _nil (void)
     {
       return (Policy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -344,21 +349,21 @@ namespace CORBA
 
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Policy (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Policy_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Policy (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Policy (
         TAO_Stub *objref,
@@ -366,38 +371,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Policy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Policy (const Policy &);
-
+    
     void operator= (const Policy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_)
 #define _CORBA_POLICYMANAGER__VAR_OUT_CH_
-
+  
   class PolicyManager;
   typedef PolicyManager *PolicyManager_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PolicyManager
       >
     PolicyManager_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PolicyManager
@@ -405,110 +410,110 @@ namespace CORBA
     PolicyManager_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYMANAGER_CH_)
 #define _CORBA_POLICYMANAGER_CH_
-
+  
   class TAO_Export PolicyManager
     : public virtual CORBA::Object
   {
   public:
     typedef PolicyManager_ptr _ptr_type;
     typedef PolicyManager_var _var_type;
-
+    
     // The static operations.
     static PolicyManager_ptr _duplicate (PolicyManager_ptr obj);
-
+    
     static PolicyManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyManager_ptr _nil (void)
     {
       return (PolicyManager_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
+        const ::CORBA::PolicyTypeSeq & ts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add
+        const ::CORBA::PolicyList & policies,
+        ::CORBA::SetOverrideType set_add
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , CORBA::InvalidPolicies
+        CORBA::SystemException,
+        ::CORBA::InvalidPolicies
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PolicyManager (void);
-
+    
     virtual ~PolicyManager (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyManager (const PolicyManager &);
-
+    
     void operator= (const PolicyManager &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
 #define _CORBA_POLICYCURRENT__VAR_OUT_CH_
-
+  
   class PolicyCurrent;
   typedef PolicyCurrent *PolicyCurrent_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PolicyCurrent
       >
     PolicyCurrent_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PolicyCurrent
@@ -516,70 +521,70 @@ namespace CORBA
     PolicyCurrent_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYCURRENT_CH_)
 #define _CORBA_POLICYCURRENT_CH_
-
+  
   class TAO_Export PolicyCurrent
-    : public virtual CORBA::PolicyManager,
-      public virtual CORBA::Current
+    : public virtual ::CORBA::PolicyManager,
+      public virtual ::CORBA::Current
   {
   public:
     typedef PolicyCurrent_ptr _ptr_type;
     typedef PolicyCurrent_var _var_type;
-
+    
     // The static operations.
     static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj);
-
+    
     static PolicyCurrent_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyCurrent_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyCurrent_ptr _nil (void)
     {
       return (PolicyCurrent_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PolicyCurrent (void);
-
+    
     virtual ~PolicyCurrent (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyCurrent (const PolicyCurrent &);
-
+    
     void operator= (const PolicyCurrent &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyCurrent;
 
 // TAO_IDL - Generated from
@@ -607,19 +612,19 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__TRAITS_CH_)
 #define _CORBA_POLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::Policy>
+  struct TAO_Export Objref_Traits< ::CORBA::Policy>
   {
-    static CORBA::Policy_ptr duplicate (
-        CORBA::Policy_ptr
+    static ::CORBA::Policy_ptr duplicate (
+        ::CORBA::Policy_ptr
       );
     static void release (
-        CORBA::Policy_ptr
+        ::CORBA::Policy_ptr
       );
-    static CORBA::Policy_ptr nil (void);
+    static ::CORBA::Policy_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::Policy_ptr p,
+        ::CORBA::Policy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -628,19 +633,19 @@ namespace TAO
 
 #if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_)
 #define _CORBA_POLICYMANAGER__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::PolicyManager>
+  struct TAO_Export Objref_Traits< ::CORBA::PolicyManager>
   {
-    static CORBA::PolicyManager_ptr duplicate (
-        CORBA::PolicyManager_ptr
+    static ::CORBA::PolicyManager_ptr duplicate (
+        ::CORBA::PolicyManager_ptr
       );
     static void release (
-        CORBA::PolicyManager_ptr
+        ::CORBA::PolicyManager_ptr
       );
-    static CORBA::PolicyManager_ptr nil (void);
+    static ::CORBA::PolicyManager_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::PolicyManager_ptr p,
+        ::CORBA::PolicyManager_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -649,19 +654,19 @@ namespace TAO
 
 #if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
 #define _CORBA_POLICYCURRENT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::PolicyCurrent>
+  struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
   {
-    static CORBA::PolicyCurrent_ptr duplicate (
-        CORBA::PolicyCurrent_ptr
+    static ::CORBA::PolicyCurrent_ptr duplicate (
+        ::CORBA::PolicyCurrent_ptr
       );
     static void release (
-        CORBA::PolicyCurrent_ptr
+        ::CORBA::PolicyCurrent_ptr
       );
-    static CORBA::PolicyCurrent_ptr nil (void);
+    static ::CORBA::PolicyCurrent_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::PolicyCurrent_ptr p,
+        ::CORBA::PolicyCurrent_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -725,13 +730,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr )
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "PolicyC.i"
+#include "PolicyC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -742,3 +747,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
deleted file mode 100644
index 3a3e130f088..00000000000
--- a/TAO/tao/PolicyC.i
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_POLICY___CI_)
-#define _CORBA_POLICY___CI_
-
-ACE_INLINE
-CORBA::Policy::Policy (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_Policy_Proxy_Broker_ (0)
-{
-  this->CORBA_Policy_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::Policy::Policy (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Policy_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/PolicyFactory_Registry.h b/TAO/tao/PolicyFactory_Registry.h
index 1bd5151fd55..4ca44e31975 100644
--- a/TAO/tao/PolicyFactory_Registry.h
+++ b/TAO/tao/PolicyFactory_Registry.h
@@ -91,7 +91,7 @@ public:
     ACE_ENV_ARG_DECL);
 
   /// Construct a policy of the given type with the information
-  /// contained in the CORBA::Any <value>.
+  /// contained in the CORBA::Any @a value.
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any &value
                                    ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
index 0a4aca61ee6..5c38aac4bd5 100644
--- a/TAO/tao/Policy_ForwardA.cpp
+++ b/TAO/tao/Policy_ForwardA.cpp
@@ -26,30 +26,31 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Policy_ForwardC.h"
-#include "tao/SystemException.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_PolicyType[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
     11,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795479),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795479), 
   ACE_NTOHL (0x70650000),  // name = PolicyType
     CORBA::tk_ulong,
 
@@ -60,7 +61,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType (
     sizeof (_oc_CORBA_PolicyType),
     (char *) &_oc_CORBA_PolicyType,
     0,
-    sizeof (CORBA::PolicyType)
+    0
   );
 
 namespace CORBA
@@ -70,24 +71,24 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_PolicyList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
     11,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63794c69),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794c69), 
   ACE_NTOHL (0x73740000),  // name = PolicyList
     CORBA::tk_sequence, // typecode kind
   68, // encapsulation length
@@ -96,18 +97,18 @@ static const CORBA::Long _oc_CORBA_PolicyList[] =
     52, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       29,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f506f),
-      ACE_NTOHL (0x6c696379),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f506f), 
+      ACE_NTOHL (0x6c696379), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
             7,
-      ACE_NTOHL (0x506f6c69),
+      ACE_NTOHL (0x506f6c69), 
       ACE_NTOHL (0x63790000),  // name = Policy
-
+      
     0U,
 
 };
@@ -117,7 +118,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
     sizeof (_oc_CORBA_PolicyList),
     (char *) &_oc_CORBA_PolicyList,
     0,
-    sizeof (CORBA::PolicyList)
+    0
   );
 
 namespace CORBA
@@ -127,25 +128,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
     14,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795479),
-  ACE_NTOHL (0x70655365),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795479), 
+  ACE_NTOHL (0x70655365), 
   ACE_NTOHL (0x71000000),  // name = PolicyTypeSeq
     CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
@@ -154,18 +155,18 @@ static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
     64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f506f),
-      ACE_NTOHL (0x6c696379),
-      ACE_NTOHL (0x54797065),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f506f), 
+      ACE_NTOHL (0x6c696379), 
+      ACE_NTOHL (0x54797065), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
             11,
-      ACE_NTOHL (0x506f6c69),
-      ACE_NTOHL (0x63795479),
+      ACE_NTOHL (0x506f6c69), 
+      ACE_NTOHL (0x63795479), 
       ACE_NTOHL (0x70650000),  // name = PolicyType
             CORBA::tk_ulong,
 
@@ -179,7 +180,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
     sizeof (_oc_CORBA_PolicyTypeSeq),
     (char *) &_oc_CORBA_PolicyTypeSeq,
     0,
-    sizeof (CORBA::PolicyTypeSeq)
+    0
   );
 
 namespace CORBA
@@ -189,37 +190,37 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_SetOverrideType[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x744f7665),
-  ACE_NTOHL (0x72726964),
-  ACE_NTOHL (0x65547970),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x744f7665), 
+  ACE_NTOHL (0x72726964), 
+  ACE_NTOHL (0x65547970), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0
   16,
-  ACE_NTOHL (0x5365744f),
-  ACE_NTOHL (0x76657272),
-  ACE_NTOHL (0x69646554),
+  ACE_NTOHL (0x5365744f), 
+  ACE_NTOHL (0x76657272), 
+  ACE_NTOHL (0x69646554), 
   ACE_NTOHL (0x79706500),  // name = SetOverrideType
   2, // member count
   13,
-  ACE_NTOHL (0x5345545f),
-  ACE_NTOHL (0x4f564552),
-  ACE_NTOHL (0x52494445),
+  ACE_NTOHL (0x5345545f), 
+  ACE_NTOHL (0x4f564552), 
+  ACE_NTOHL (0x52494445), 
   ACE_NTOHL (0x0),  // name = SET_OVERRIDE
   13,
-  ACE_NTOHL (0x4144445f),
-  ACE_NTOHL (0x4f564552),
-  ACE_NTOHL (0x52494445),
+  ACE_NTOHL (0x4144445f), 
+  ACE_NTOHL (0x4f564552), 
+  ACE_NTOHL (0x52494445), 
   ACE_NTOHL (0x0),  // name = ADD_OVERRIDE
   };
 
@@ -228,7 +229,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
     sizeof (_oc_CORBA_SetOverrideType),
     (char *) &_oc_CORBA_SetOverrideType,
     0,
-    sizeof (CORBA::SetOverrideType)
+    0
   );
 
 namespace CORBA
@@ -237,7 +238,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_SetOverrideType;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -274,8 +275,8 @@ CORBA::Boolean operator>>= (
     CORBA::PolicyList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::PolicyList *&,
+  return _tao_any >>= const_cast<
+      const CORBA::PolicyList *&> (
       _tao_elem
     );
 }
@@ -295,7 +296,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -332,8 +333,8 @@ CORBA::Boolean operator>>= (
     CORBA::PolicyTypeSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::PolicyTypeSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::PolicyTypeSeq *&> (
       _tao_elem
     );
 }
@@ -377,12 +378,10 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
         _tao_any,
         CORBA::_tc_SetOverrideType,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -417,4 +416,4 @@ CORBA::Boolean operator>>= (
         CORBA::SetOverrideType \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 11609fa1252..882e487259b 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "Policy_ForwardC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "Policy_ForwardC.i"
+#include "Policy_ForwardC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -50,7 +49,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_POLICYLIST_CS_)
@@ -100,13 +99,13 @@ void CORBA::PolicyList::_tao_any_destructor (
   )
 {
   PolicyList * _tao_tmp_pointer =
-    ACE_static_cast (PolicyList *, _tao_void_pointer);
+    static_cast<PolicyList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_POLICYTYPESEQ_CS_)
@@ -153,7 +152,7 @@ void CORBA::PolicyTypeSeq::_tao_any_destructor (
   )
 {
   PolicyTypeSeq * _tao_tmp_pointer =
-    ACE_static_cast (PolicyTypeSeq *, _tao_void_pointer);
+    static_cast<PolicyTypeSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -170,13 +169,13 @@ CORBA::Boolean operator<< (
     const CORBA::PolicyList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-
+      CORBA::Boolean _tao_marshal_flag = true;
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
@@ -184,11 +183,11 @@ CORBA::Boolean operator<< (
                 _tao_sequence[i].in (), strm
               );
         }
-
+      
       return _tao_marshal_flag;
     }
-
-  return 0;
+  
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -197,7 +196,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -205,31 +204,31 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
-
+      
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-
+      CORBA::Boolean _tao_marshal_flag = true;
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
-  return 0;
+  
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyList_CPP_ */
@@ -245,15 +244,15 @@ CORBA::Boolean operator<< (
     const CORBA::PolicyTypeSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
-  return 0;
+  
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -262,7 +261,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -270,24 +269,24 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
-
+      
       // Retrieve all the elements.
       return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+    
     }
-
-  return 0;
+  
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_ */
@@ -305,17 +304,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
-      _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp);
+      _tao_enumval = static_cast<CORBA::SetOverrideType> (_tao_temp);
     }
-
+  
   return _tao_result;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -443,4 +442,4 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum
         CORBA::PolicyType \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 516e4a032d9..84aa61ae939 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -26,14 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_POLICY_FORWARDC_H_
 #define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Sequence_T.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -41,6 +42,7 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/Environment.h"
+#include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -58,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -75,7 +75,7 @@ namespace CORBA
 {
 
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
 
   typedef CORBA::ULong PolicyType;
   typedef CORBA::ULong_out PolicyType_out;
@@ -86,7 +86,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
@@ -203,38 +203,38 @@ namespace CORBA
     PolicyTypeSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::ULong* buffer,
+        CORBA::ULong* buffer, 
         CORBA::Boolean release = 0
       );
     PolicyTypeSeq (const PolicyTypeSeq &);
     ~PolicyTypeSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef PolicyTypeSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum SetOverrideType
   {
     SET_OVERRIDE,
     ADD_OVERRIDE
   };
-
+  
   typedef SetOverrideType &SetOverrideType_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType;
 
 // TAO_IDL - Generated from
@@ -248,31 +248,10 @@ namespace CORBA
 // Traits specializations.
 namespace TAO
 {
-
-#if !defined (_CORBA_POLICY__TRAITS_CH_)
-#define _CORBA_POLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::Policy>
-  {
-    static CORBA::Policy_ptr duplicate (
-        CORBA::Policy_ptr
-      );
-    static void release (
-        CORBA::Policy_ptr
-      );
-    static CORBA::Policy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        CORBA::Policy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
+// be\be_visitor_interface_fwd/any_op_ch.cpp:63
 
 TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
@@ -348,13 +327,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideT
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "Policy_ForwardC.i"
+#include "Policy_ForwardC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -365,3 +344,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/Policy_ForwardC.i b/TAO/tao/Policy_ForwardC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/Policy_ForwardC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index f51c5b3b936..1f5597a475b 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -50,8 +50,11 @@ public:
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL);
 
+  /// Obtain a single cached policy.
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL);
 
   // = The CORBA::PolicyManager operations
 
@@ -67,9 +70,6 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::InvalidPolicies));
 
-  /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
-
 private:
   /// Protect access
   TAO_SYNCH_MUTEX mutex_;
@@ -88,8 +88,11 @@ public:
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL);
 
+  /// Obtain a single cached policy.
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL);
 
   // = The CORBA::PolicyManager operations
 
@@ -101,9 +104,6 @@ public:
                              CORBA::SetOverrideType set_add
                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
-
 private:
   /// The implementation.
   TAO_Policy_Set manager_impl_;
@@ -122,8 +122,11 @@ public:
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (
       CORBA::PolicyType policy
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL);
 
+  /// Obtain a single cached policy.
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL);
 
   // = The CORBA::PolicyManager operations
 
@@ -141,9 +144,6 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::InvalidPolicies));
 
-  /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
-
   // = Set and get the implementation.
   TAO_Policy_Current_Impl &implementation (void) const;
   TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &);
diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
index 19dd100823d..56505e6a2b0 100644
--- a/TAO/tao/Policy_Manager.i
+++ b/TAO/tao/Policy_Manager.i
@@ -8,41 +8,36 @@ TAO_Policy_Manager::TAO_Policy_Manager (void)
 
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Manager::get_policy (
-      CORBA::PolicyType policy
-      ACE_ENV_ARG_DECL)
+  CORBA::PolicyType policy
+  ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::PolicyList *
-TAO_Policy_Manager::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-                       CORBA::SystemException
-                       ))
+TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
+                                          ACE_ENV_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_Policy_Manager::set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-                       CORBA::SystemException,
-                       CORBA::InvalidPolicies
-                       ))
+TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies,
+                                          CORBA::SetOverrideType set_add
+                                          ACE_ENV_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException,
+                      CORBA::InvalidPolicies))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type)
+TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL)
 {
 
   // @@ Previous code used a "double-checked locking hack" to check
@@ -52,7 +47,8 @@ TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type)
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
 
-  return this->impl_.get_cached_policy (type);
+  return this->impl_.get_cached_policy (type
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -79,9 +75,11 @@ TAO_Policy_Current_Impl::get_policy (
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type)
+TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type
+                                            ACE_ENV_ARG_DECL)
 {
-  return this->manager_impl_.get_cached_policy (type);
+  return this->manager_impl_.get_cached_policy (type
+                                                ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -121,9 +119,11 @@ TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies,
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type)
+TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL)
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_cached_policy (type);
+  return impl.get_cached_policy (type
+                                 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index 518901ec37d..e7a8aed0c41 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -319,7 +319,7 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
 
 CORBA::Policy_ptr
 TAO_Policy_Set::get_policy (CORBA::PolicyType type
-                                     ACE_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   const CORBA::ULong length = this->policy_list_.length ();
 
@@ -353,7 +353,8 @@ TAO_Policy_Set::get_cached_const_policy (TAO_Cached_Policy_Type type) const
 }
 
 CORBA::Policy_ptr
-TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type)
+TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
+                                   ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (type != TAO_CACHED_POLICY_UNCACHED
       && type < TAO_CACHED_POLICY_MAX_CACHED)
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index d54cbf9e7f9..0e3b8e6bc24 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -87,7 +87,8 @@ public:
   CORBA::Policy_ptr get_cached_const_policy (TAO_Cached_Policy_Type type) const;
 
   /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL);
 
   /// Utility method to set a single policy.
   void set_policy (const CORBA::Policy_ptr policy
@@ -101,7 +102,6 @@ public:
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_Policy_Set operator=(const TAO_Policy_Set&))
-//  ACE_UNIMPLEMENTED_FUNC (TAO_Policy_Set(const TAO_Policy_Set&))
 
   /// Remove and destroy all the policy objects owned by this policy
   /// manager.
@@ -130,4 +130,3 @@ private:
 #include /**/ "ace/post.h"
 
 #endif /* TAO_POLICY_SET_H */
-
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index 4e78e8223db..cd51a8a1426 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -25,6 +25,12 @@ TAO_Policy_Validator::~TAO_Policy_Validator (void)
     }
 }
 
+TAO_ORB_Core & 
+TAO_Policy_Validator::orb_core() const
+{ 
+  return this->orb_core_;
+}
+
 void
 TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator)
 {
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index 52f91e4847f..2c1afd96800 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -89,6 +89,11 @@ public:
   void add_validator (TAO_Policy_Validator *validator);
 
 
+ /**
+  * Accessor for the stored ORB core reference
+  */
+ TAO_ORB_Core & orb_core() const;
+
 protected:
   virtual void validate_impl (TAO_Policy_Set &policies
                               ACE_ENV_ARG_DECL) = 0;
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index acd5203ec22..6756fe3eb4e 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -26,11 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "PollableC.h"
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -39,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "PollableC.i"
+#include "PollableC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -88,15 +87,9 @@ TAO::Objref_Traits<CORBA::Pollable>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_Pollable_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 CORBA::Pollable::Pollable (void)
 {}
 
@@ -113,10 +106,10 @@ CORBA::Pollable::_narrow (
     {
       return Pollable::_nil ();
     }
-
+  
   Pollable_ptr proxy =
     dynamic_cast<Pollable_ptr> (_tao_objref);
-
+  
   return Pollable::_duplicate (proxy);
 }
 
@@ -130,10 +123,10 @@ CORBA::Pollable::_unchecked_narrow (
     {
       return Pollable::_nil ();
     }
-
+  
   Pollable_ptr proxy =
     dynamic_cast<Pollable_ptr> (_tao_objref);
-
+  
   return Pollable::_duplicate (proxy);
 }
 
@@ -144,7 +137,7 @@ CORBA::Pollable::_duplicate (Pollable_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -225,15 +218,9 @@ TAO::Objref_Traits<CORBA::DIIPollable>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_DIIPollable_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 CORBA::DIIPollable::DIIPollable (void)
 {}
 
@@ -250,10 +237,10 @@ CORBA::DIIPollable::_narrow (
     {
       return DIIPollable::_nil ();
     }
-
+  
   DIIPollable_ptr proxy =
     dynamic_cast<DIIPollable_ptr> (_tao_objref);
-
+  
   return DIIPollable::_duplicate (proxy);
 }
 
@@ -267,10 +254,10 @@ CORBA::DIIPollable::_unchecked_narrow (
     {
       return DIIPollable::_nil ();
     }
-
+  
   DIIPollable_ptr proxy =
     dynamic_cast<DIIPollable_ptr> (_tao_objref);
-
+  
   return DIIPollable::_duplicate (proxy);
 }
 
@@ -281,7 +268,7 @@ CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -366,16 +353,10 @@ TAO::Objref_Traits<CORBA::PollableSet>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_PollableSet_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
@@ -408,14 +389,13 @@ CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::N
 CORBA::PollableSet::NoPossiblePollable *
 CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (NoPossiblePollable *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<NoPossiblePollable *> (_tao_excp);
+}
+
+const CORBA::PollableSet::NoPossiblePollable *
+CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const NoPossiblePollable *> (_tao_excp);
 }
 
 CORBA::Exception *CORBA::PollableSet::NoPossiblePollable::_alloc (void)
@@ -460,7 +440,7 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode (
 
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
@@ -493,14 +473,13 @@ CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::Unkn
 CORBA::PollableSet::UnknownPollable *
 CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (UnknownPollable *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<UnknownPollable *> (_tao_excp);
+}
+
+const CORBA::PollableSet::UnknownPollable *
+CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const UnknownPollable *> (_tao_excp);
 }
 
 CORBA::Exception *CORBA::PollableSet::UnknownPollable::_alloc (void)
@@ -561,10 +540,10 @@ CORBA::PollableSet::_narrow (
     {
       return PollableSet::_nil ();
     }
-
+  
   PollableSet_ptr proxy =
     dynamic_cast<PollableSet_ptr> (_tao_objref);
-
+  
   return PollableSet::_duplicate (proxy);
 }
 
@@ -578,10 +557,10 @@ CORBA::PollableSet::_unchecked_narrow (
     {
       return PollableSet::_nil ();
     }
-
+  
   PollableSet_ptr proxy =
     dynamic_cast<PollableSet_ptr> (_tao_objref);
-
+  
   return PollableSet::_duplicate (proxy);
 }
 
@@ -592,7 +571,7 @@ CORBA::PollableSet::_duplicate (PollableSet_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -637,7 +616,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -650,7 +629,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         CORBA::PollableSet
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::PollableSet
@@ -665,7 +644,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         CORBA::Pollable
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::Pollable
@@ -680,7 +659,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         CORBA::DIIPollable
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::DIIPollable
@@ -697,7 +676,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         CORBA::PollableSet
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::PollableSet
@@ -712,7 +691,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         CORBA::Pollable
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::Pollable
@@ -727,10 +706,10 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         CORBA::DIIPollable
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::DIIPollable
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index cf49db5e05d..28669184ca0 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -26,22 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_POLLABLEC_H_
 #define _TAO_IDL_ORIG_POLLABLEC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Environment.h"
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/SystemException.h"
-#include "tao/UserException.h"
+#include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
@@ -58,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -68,13 +68,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -84,22 +84,22 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:603
 
 #if !defined (_CORBA_POLLABLESET__VAR_OUT_CH_)
 #define _CORBA_POLLABLESET__VAR_OUT_CH_
-
+  
   class PollableSet;
   typedef PollableSet *PollableSet_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PollableSet
       >
     PollableSet_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PollableSet
@@ -107,22 +107,22 @@ namespace CORBA
     PollableSet_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:603
 
 #if !defined (_CORBA_POLLABLE__VAR_OUT_CH_)
 #define _CORBA_POLLABLE__VAR_OUT_CH_
-
+  
   class Pollable;
   typedef Pollable *Pollable_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Pollable
       >
     Pollable_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Pollable
@@ -130,102 +130,102 @@ namespace CORBA
     Pollable_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLLABLE_CH_)
 #define _CORBA_POLLABLE_CH_
-
+  
   class TAO_Export Pollable
     : public virtual CORBA::Object
   {
   public:
     typedef Pollable_ptr _ptr_type;
     typedef Pollable_var _var_type;
-
+    
     // The static operations.
     static Pollable_ptr _duplicate (Pollable_ptr obj);
-
+    
     static Pollable_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Pollable_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Pollable_ptr _nil (void)
     {
       return (Pollable_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean is_ready (
-        CORBA::ULong timeout
+        ::CORBA::ULong timeout
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::PollableSet_ptr create_pollable_set (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Pollable (void);
-
+    
     virtual ~Pollable (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Pollable (const Pollable &);
-
+    
     void operator= (const Pollable &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:603
 
 #if !defined (_CORBA_DIIPOLLABLE__VAR_OUT_CH_)
 #define _CORBA_DIIPOLLABLE__VAR_OUT_CH_
-
+  
   class DIIPollable;
   typedef DIIPollable *DIIPollable_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         DIIPollable
       >
     DIIPollable_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         DIIPollable
@@ -233,118 +233,120 @@ namespace CORBA
     DIIPollable_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_DIIPOLLABLE_CH_)
 #define _CORBA_DIIPOLLABLE_CH_
-
+  
   class TAO_Export DIIPollable
-    : public virtual CORBA::Pollable
+    : public virtual ::CORBA::Pollable
   {
   public:
     typedef DIIPollable_ptr _ptr_type;
     typedef DIIPollable_var _var_type;
-
+    
     // The static operations.
     static DIIPollable_ptr _duplicate (DIIPollable_ptr obj);
-
+    
     static DIIPollable_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static DIIPollable_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static DIIPollable_ptr _nil (void)
     {
       return (DIIPollable_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     DIIPollable (void);
-
+    
     virtual ~DIIPollable (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     DIIPollable (const DIIPollable &);
-
+    
     void operator= (const DIIPollable &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLLABLESET_CH_)
 #define _CORBA_POLLABLESET_CH_
-
+  
   class TAO_Export PollableSet
     : public virtual CORBA::Object
   {
   public:
     typedef PollableSet_ptr _ptr_type;
     typedef PollableSet_var _var_type;
-
+    
     // The static operations.
     static PollableSet_ptr _duplicate (PollableSet_ptr obj);
-
+    
     static PollableSet_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PollableSet_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PollableSet_ptr _nil (void)
     {
       return (PollableSet_ptr)0;
     }
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_
-
+    
     class TAO_Export NoPossiblePollable : public CORBA::UserException
     {
     public:
-
+      
       NoPossiblePollable (void);
       NoPossiblePollable (const NoPossiblePollable &);
       ~NoPossiblePollable (void);
 
       NoPossiblePollable &operator= (const NoPossiblePollable &);
-
+      
       static NoPossiblePollable *_downcast (CORBA::Exception *);
+      static const NoPossiblePollable *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -353,37 +355,39 @@ namespace CORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_
-
+    
     class TAO_Export UnknownPollable : public CORBA::UserException
     {
     public:
-
+      
       UnknownPollable (void);
       UnknownPollable (const UnknownPollable &);
       ~UnknownPollable (void);
 
       UnknownPollable &operator= (const UnknownPollable &);
-
+      
       static UnknownPollable *_downcast (CORBA::Exception *);
+      static const UnknownPollable *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -392,94 +396,94 @@ namespace CORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::DIIPollable_ptr create_dii_pollable (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_pollable (
-        CORBA::Pollable_ptr potential
+        ::CORBA::Pollable_ptr potential
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Pollable_ptr poll (
-        CORBA::ULong timeout
+        ::CORBA::ULong timeout
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , CORBA::PollableSet::NoPossiblePollable
+        CORBA::SystemException,
+        ::CORBA::PollableSet::NoPossiblePollable
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void remove (
-        CORBA::Pollable_ptr potential
+        ::CORBA::Pollable_ptr potential
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , CORBA::PollableSet::UnknownPollable
+        CORBA::SystemException,
+        ::CORBA::PollableSet::UnknownPollable
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::UShort number_left (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PollableSet (void);
-
+    
     virtual ~PollableSet (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PollableSet (const PollableSet &);
-
+    
     void operator= (const PollableSet &);
   };
 
@@ -499,19 +503,19 @@ namespace TAO
 
 #if !defined (_CORBA_POLLABLESET__TRAITS_CH_)
 #define _CORBA_POLLABLESET__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::PollableSet>
+  struct TAO_Export Objref_Traits< ::CORBA::PollableSet>
   {
-    static CORBA::PollableSet_ptr duplicate (
-        CORBA::PollableSet_ptr
+    static ::CORBA::PollableSet_ptr duplicate (
+        ::CORBA::PollableSet_ptr
       );
     static void release (
-        CORBA::PollableSet_ptr
+        ::CORBA::PollableSet_ptr
       );
-    static CORBA::PollableSet_ptr nil (void);
+    static ::CORBA::PollableSet_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::PollableSet_ptr p,
+        ::CORBA::PollableSet_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -520,19 +524,19 @@ namespace TAO
 
 #if !defined (_CORBA_POLLABLE__TRAITS_CH_)
 #define _CORBA_POLLABLE__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::Pollable>
+  struct TAO_Export Objref_Traits< ::CORBA::Pollable>
   {
-    static CORBA::Pollable_ptr duplicate (
-        CORBA::Pollable_ptr
+    static ::CORBA::Pollable_ptr duplicate (
+        ::CORBA::Pollable_ptr
       );
     static void release (
-        CORBA::Pollable_ptr
+        ::CORBA::Pollable_ptr
       );
-    static CORBA::Pollable_ptr nil (void);
+    static ::CORBA::Pollable_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::Pollable_ptr p,
+        ::CORBA::Pollable_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -541,19 +545,19 @@ namespace TAO
 
 #if !defined (_CORBA_DIIPOLLABLE__TRAITS_CH_)
 #define _CORBA_DIIPOLLABLE__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::DIIPollable>
+  struct TAO_Export Objref_Traits< ::CORBA::DIIPollable>
   {
-    static CORBA::DIIPollable_ptr duplicate (
-        CORBA::DIIPollable_ptr
+    static ::CORBA::DIIPollable_ptr duplicate (
+        ::CORBA::DIIPollable_ptr
       );
     static void release (
-        CORBA::DIIPollable_ptr
+        ::CORBA::DIIPollable_ptr
       );
-    static CORBA::DIIPollable_ptr nil (void);
+    static ::CORBA::DIIPollable_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::DIIPollable_ptr p,
+        ::CORBA::DIIPollable_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -562,13 +566,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "PollableC.i"
+#include "PollableC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -579,3 +583,5 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/PollableC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp
deleted file mode 100644
index 5a1966ffab7..00000000000
--- a/TAO/tao/PollableS.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- 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 "PollableS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "PollableS.i"
-#endif /* !defined INLINE */
-
diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h
index 4ac1bfc2025..ea72c919713 100644
--- a/TAO/tao/PollableS.h
+++ b/TAO/tao/PollableS.h
@@ -1,37 +1,79 @@
-/* -*- C++ -*- $Id$ */
+// -*- 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.
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_POLLABLES_H_
 #define _TAO_IDL_ORIG_POLLABLES_H_
 
-#include "PollableC.h"
+#include /**/ "ace/pre.h"
 
+#include "PollableC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "PollableS_T.h"
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_CORBA
+{
 
-#if defined (__ACE_INLINE__)
-#include "PollableS.i"
-#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:999
+
+#include "PollableS_T.h"
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PollableS.i b/TAO/tao/PollableS.i
deleted file mode 100644
index d41d475fa1a..00000000000
--- a/TAO/tao/PollableS.i
+++ /dev/null
@@ -1,9 +0,0 @@
-/* -*- 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
-
diff --git a/TAO/tao/PollableS_T.cpp b/TAO/tao/PollableS_T.cpp
deleted file mode 100644
index 327232a8c0e..00000000000
--- a/TAO/tao/PollableS_T.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- 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
-
-#ifndef _TAO_IDL_ORIG_POLLABLES_T_CPP_
-#define _TAO_IDL_ORIG_POLLABLES_T_CPP_
-
-#include "PollableS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "PollableS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/PollableS_T.h b/TAO/tao/PollableS_T.h
index 74c5ed64307..901c6efb19c 100644
--- a/TAO/tao/PollableS_T.h
+++ b/TAO/tao/PollableS_T.h
@@ -1,39 +1,58 @@
-/* -*- 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.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:547
 
 #ifndef _TAO_IDL_ORIG_POLLABLES_T_H_
 #define _TAO_IDL_ORIG_POLLABLES_T_H_
 
+#include /**/ "ace/pre.h"
+
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
-#if defined (__ACE_INLINE__)
-#include "PollableS_T.i"
-#endif /* defined INLINE */
+// TAO_IDL - Generated from
+// be\be_visitor_root/root_sth.cpp:116
 
+namespace POA_CORBA
+{
+} // module CORBA
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "PollableS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1096
 
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("PollableS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PollableS_T.i b/TAO/tao/PollableS_T.i
deleted file mode 100644
index d41d475fa1a..00000000000
--- a/TAO/tao/PollableS_T.i
+++ /dev/null
@@ -1,9 +0,0 @@
-/* -*- 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
-
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 9a7d5978800..c79f679a116 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -23,6 +23,7 @@
  *
  *  tao_idl
  *     -o orig -Gp -Gd -Ge 1 -GT -GA -Sc
+ *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,export_macro=TAO_Export
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
@@ -30,8 +31,6 @@
  *
  * Patches for changes to the generated code are available in the
  * `diffs' directory.
- * Move the typecodes for exceptions in PortableIntercaptorA.cpp to
- * PortableInterceptorC.cpp.
  */
 
 // File: PortableInterceptor.idl
@@ -127,7 +126,7 @@ module PortableInterceptor {
     readonly attribute ServerId server_id;
     readonly attribute ORBId orb_id;
     readonly attribute AdapterName adapter_name;
-    readonly attribute CORBA::OctetSeq object_id;
+    readonly attribute ObjectId object_id;
     readonly attribute CORBA::OctetSeq adapter_id;
     readonly attribute CORBA::RepositoryId target_most_derived_interface;
     CORBA::Policy get_server_policy (in CORBA::PolicyType type);
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
index 05450612758..47ece2898c3 100644
--- a/TAO/tao/PortableInterceptorA.cpp
+++ b/TAO/tao/PortableInterceptorA.cpp
@@ -27,31 +27,33 @@
 
 #include "PortableInterceptorC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_Interceptor[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f723a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Interceptor:1.0
     12,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
   ACE_NTOHL (0x746f7200),  // name = Interceptor
   };
 
@@ -60,7 +62,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Interceptor (
     sizeof (_oc_PortableInterceptor_Interceptor),
     (char *) &_oc_PortableInterceptor_Interceptor,
     0,
-    sizeof (PortableInterceptor::Interceptor)
+    0
   );
 
 namespace PortableInterceptor
@@ -70,27 +72,27 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x79537461),
-  ACE_NTOHL (0x7475733a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
+  ACE_NTOHL (0x7475733a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ReplyStatus:1.0
     12,
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x79537461),
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
   ACE_NTOHL (0x74757300),  // name = ReplyStatus
     CORBA::tk_short,
 
@@ -101,7 +103,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus (
     sizeof (_oc_PortableInterceptor_ReplyStatus),
     (char *) &_oc_PortableInterceptor_ReplyStatus,
     0,
-    sizeof (PortableInterceptor::ReplyStatus)
+    0
   );
 
 namespace PortableInterceptor
@@ -111,25 +113,25 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x536c6f74),
-  ACE_NTOHL (0x49643a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x536c6f74), 
+  ACE_NTOHL (0x49643a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/SlotId:1.0
     7,
-  ACE_NTOHL (0x536c6f74),
+  ACE_NTOHL (0x536c6f74), 
   ACE_NTOHL (0x49640000),  // name = SlotId
     CORBA::tk_ulong,
 
@@ -140,7 +142,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId (
     sizeof (_oc_PortableInterceptor_SlotId),
     (char *) &_oc_PortableInterceptor_SlotId,
     0,
-    sizeof (PortableInterceptor::SlotId)
+    0
   );
 
 namespace PortableInterceptor
@@ -149,28 +151,65 @@ namespace PortableInterceptor
     &_tc_TAO_tc_PortableInterceptor_SlotId;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_PortableInterceptor_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_Current),
+    (char *) &_oc_PortableInterceptor_Current,
+    0,
+    0
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_Current =
+    &_tc_TAO_tc_PortableInterceptor_Current;
+}
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
 static const CORBA::Long _oc_PortableInterceptor_RequestInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x52657175),
-  ACE_NTOHL (0x65737449),
-  ACE_NTOHL (0x6e666f3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737449), 
+  ACE_NTOHL (0x6e666f3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/RequestInfo:1.0
     12,
-  ACE_NTOHL (0x52657175),
-  ACE_NTOHL (0x65737449),
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737449), 
   ACE_NTOHL (0x6e666f00),  // name = RequestInfo
   };
 
@@ -179,7 +218,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_RequestInfo (
     sizeof (_oc_PortableInterceptor_RequestInfo),
     (char *) &_oc_PortableInterceptor_RequestInfo,
     0,
-    sizeof (PortableInterceptor::RequestInfo)
+    0
   );
 
 namespace PortableInterceptor
@@ -189,31 +228,31 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ClientRequestInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x436c6965),
-  ACE_NTOHL (0x6e745265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x74496e66),
-  ACE_NTOHL (0x6f3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0
     18,
-  ACE_NTOHL (0x436c6965),
-  ACE_NTOHL (0x6e745265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x74496e66),
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
   ACE_NTOHL (0x6f000000),  // name = ClientRequestInfo
   };
 
@@ -222,7 +261,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInfo (
     sizeof (_oc_PortableInterceptor_ClientRequestInfo),
     (char *) &_oc_PortableInterceptor_ClientRequestInfo,
     0,
-    sizeof (PortableInterceptor::ClientRequestInfo)
+    0
   );
 
 namespace PortableInterceptor
@@ -232,31 +271,31 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ServerRequestInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65725265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x74496e66),
-  ACE_NTOHL (0x6f3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x6f3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0
     18,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65725265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x74496e66),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
   ACE_NTOHL (0x6f000000),  // name = ServerRequestInfo
   };
 
@@ -265,7 +304,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInfo (
     sizeof (_oc_PortableInterceptor_ServerRequestInfo),
     (char *) &_oc_PortableInterceptor_ServerRequestInfo,
     0,
-    sizeof (PortableInterceptor::ServerRequestInfo)
+    0
   );
 
 namespace PortableInterceptor
@@ -275,35 +314,35 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ClientRequestInterceptor[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   61,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x436c6965),
-  ACE_NTOHL (0x6e745265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x74496e74),
-  ACE_NTOHL (0x65726365),
-  ACE_NTOHL (0x70746f72),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0
     25,
-  ACE_NTOHL (0x436c6965),
-  ACE_NTOHL (0x6e745265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x74496e74),
-  ACE_NTOHL (0x65726365),
-  ACE_NTOHL (0x70746f72),
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
   ACE_NTOHL (0x0),  // name = ClientRequestInterceptor
   };
 
@@ -312,7 +351,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor (
     sizeof (_oc_PortableInterceptor_ClientRequestInterceptor),
     (char *) &_oc_PortableInterceptor_ClientRequestInterceptor,
     0,
-    sizeof (PortableInterceptor::ClientRequestInterceptor)
+    0
   );
 
 namespace PortableInterceptor
@@ -322,35 +361,35 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ServerRequestInterceptor[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   61,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65725265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x74496e74),
-  ACE_NTOHL (0x65726365),
-  ACE_NTOHL (0x70746f72),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0
     25,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65725265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x74496e74),
-  ACE_NTOHL (0x65726365),
-  ACE_NTOHL (0x70746f72),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
   ACE_NTOHL (0x0),  // name = ServerRequestInterceptor
   };
 
@@ -359,7 +398,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor (
     sizeof (_oc_PortableInterceptor_ServerRequestInterceptor),
     (char *) &_oc_PortableInterceptor_ServerRequestInterceptor,
     0,
-    sizeof (PortableInterceptor::ServerRequestInterceptor)
+    0
   );
 
 namespace PortableInterceptor
@@ -369,29 +408,29 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_PolicyFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63794661),
-  ACE_NTOHL (0x63746f72),
-  ACE_NTOHL (0x793a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x793a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/PolicyFactory:1.0
     14,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63794661),
-  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63794661), 
+  ACE_NTOHL (0x63746f72), 
   ACE_NTOHL (0x79000000),  // name = PolicyFactory
   };
 
@@ -400,7 +439,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_PolicyFactory (
     sizeof (_oc_PortableInterceptor_PolicyFactory),
     (char *) &_oc_PortableInterceptor_PolicyFactory,
     0,
-    sizeof (PortableInterceptor::PolicyFactory)
+    0
   );
 
 namespace PortableInterceptor
@@ -410,32 +449,32 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_ObjectId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   57,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x6e697449),
-  ACE_NTOHL (0x6e666f2f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f2f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0
     9,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
   ACE_NTOHL (0x0),  // name = ObjectId
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -444,34 +483,34 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId (
     sizeof (_oc_PortableInterceptor_ORBInitInfo_ObjectId),
     (char *) &_oc_PortableInterceptor_ORBInitInfo_ObjectId,
     0,
-    sizeof (PortableInterceptor::ORBInitInfo::ObjectId)
+    0
   );
 
 ::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_ObjectId =
   &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x6e697449),
-  ACE_NTOHL (0x6e666f3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0
     12,
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
   ACE_NTOHL (0x6e666f00),  // name = ORBInitInfo
   };
 
@@ -480,7 +519,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo (
     sizeof (_oc_PortableInterceptor_ORBInitInfo),
     (char *) &_oc_PortableInterceptor_ORBInitInfo,
     0,
-    sizeof (PortableInterceptor::ORBInitInfo)
+    0
   );
 
 namespace PortableInterceptor
@@ -490,29 +529,29 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ORBInitializer[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x6e697469),
-  ACE_NTOHL (0x616c697a),
-  ACE_NTOHL (0x65723a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
+  ACE_NTOHL (0x65723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitializer:1.0
     15,
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x6e697469),
-  ACE_NTOHL (0x616c697a),
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
   ACE_NTOHL (0x65720000),  // name = ORBInitializer
   };
 
@@ -521,7 +560,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitializer (
     sizeof (_oc_PortableInterceptor_ORBInitializer),
     (char *) &_oc_PortableInterceptor_ORBInitializer,
     0,
-    sizeof (PortableInterceptor::ORBInitializer)
+    0
   );
 
 namespace PortableInterceptor
@@ -599,7 +638,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -609,12 +648,12 @@ TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -625,7 +664,7 @@ TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::demarshal_value (
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -663,8 +702,8 @@ CORBA::Boolean operator>>= (
     PortableInterceptor::ForwardRequest *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableInterceptor::ForwardRequest *&,
+  return _tao_any >>= const_cast<
+      const PortableInterceptor::ForwardRequest *&> (
       _tao_elem
     );
 }
@@ -684,7 +723,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -694,12 +733,12 @@ TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -710,7 +749,7 @@ TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::demarshal_value (
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -748,8 +787,8 @@ CORBA::Boolean operator>>= (
     PortableInterceptor::InvalidSlot *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableInterceptor::InvalidSlot *&,
+  return _tao_any >>= const_cast<
+      const PortableInterceptor::InvalidSlot *&> (
       _tao_elem
     );
 }
@@ -1321,7 +1360,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -1372,8 +1411,8 @@ CORBA::Boolean operator>>= (
     PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableInterceptor::ORBInitInfo::DuplicateName *&,
+  return _tao_any >>= const_cast<
+      const PortableInterceptor::ORBInitInfo::DuplicateName *&> (
       _tao_elem
     );
 }
@@ -1393,7 +1432,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -1444,8 +1483,8 @@ CORBA::Boolean operator>>= (
     PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableInterceptor::ORBInitInfo::InvalidName *&,
+  return _tao_any >>= const_cast<
+      const PortableInterceptor::ORBInitInfo::InvalidName *&> (
       _tao_elem
     );
 }
@@ -1534,8 +1573,6 @@ operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -1680,4 +1717,4 @@ operator>>= (
         PortableInterceptor::ORBInitializer \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 7b515073623..6e123dd3682 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -26,14 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "PortableInterceptorC.h"
 #include "tao/CDR.h"
+#include "tao/ORB_Core.h"
 #include "tao/Typecode.h"
-#include "tao/PolicyC.h"
-#include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -41,11 +40,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "PortableInterceptorC.i"
+#include "PortableInterceptorC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -90,26 +89,20 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_Interceptor_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::Interceptor::Interceptor (void)
 {}
 
 PortableInterceptor::Interceptor::~Interceptor (void)
 {}
 
-void
+void 
 PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   Interceptor *_tao_tmp_pointer =
-    ACE_static_cast (Interceptor *, _tao_void_pointer);
+    static_cast<Interceptor *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -123,10 +116,10 @@ PortableInterceptor::Interceptor::_narrow (
     {
       return Interceptor::_nil ();
     }
-
+  
   Interceptor_ptr proxy =
     dynamic_cast<Interceptor_ptr> (_tao_objref);
-
+  
   return Interceptor::_duplicate (proxy);
 }
 
@@ -140,10 +133,10 @@ PortableInterceptor::Interceptor::_unchecked_narrow (
     {
       return Interceptor::_nil ();
     }
-
+  
   Interceptor_ptr proxy =
     dynamic_cast<Interceptor_ptr> (_tao_objref);
-
+  
   return Interceptor::_duplicate (proxy);
 }
 
@@ -154,7 +147,7 @@ PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -198,7 +191,7 @@ PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
@@ -235,21 +228,20 @@ PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::For
 void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer)
 {
   ForwardRequest *_tao_tmp_pointer =
-    ACE_static_cast (ForwardRequest*, _tao_void_pointer);
+    static_cast<ForwardRequest *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableInterceptor::ForwardRequest *
 PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/ForwardRequest:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (ForwardRequest *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<ForwardRequest *> (_tao_excp);
+}
+
+const PortableInterceptor::ForwardRequest *
+PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const ForwardRequest *> (_tao_excp);
 }
 
 CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void)
@@ -285,7 +277,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -298,11 +290,12 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
+
 // TAO_IDL - Generated from
 // be\be_visitor_exception/exception_ctor.cpp:66
 
@@ -319,53 +312,60 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
   this->permanent = _tao_permanent;
 }
 
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const
+{
+  return ::PortableInterceptor::_tc_ForwardRequest;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x466f7277),
-  ACE_NTOHL (0x61726452),
-  ACE_NTOHL (0x65717565),
-  ACE_NTOHL (0x73743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ForwardRequest:1.0
     15,
-  ACE_NTOHL (0x466f7277),
-  ACE_NTOHL (0x61726452),
-  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   2, // member count
     8,
-  ACE_NTOHL (0x666f7277),
+  ACE_NTOHL (0x666f7277), 
   ACE_NTOHL (0x61726400),  // name = forward
     CORBA::tk_objref,
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f62),
-    ACE_NTOHL (0x6a656374),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f62), 
+    ACE_NTOHL (0x6a656374), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
         7,
-    ACE_NTOHL (0x4f626a65),
+    ACE_NTOHL (0x4f626a65), 
     ACE_NTOHL (0x63740000),  // name = Object
-
+    
   10,
-  ACE_NTOHL (0x7065726d),
-  ACE_NTOHL (0x616e656e),
+  ACE_NTOHL (0x7065726d), 
+  ACE_NTOHL (0x616e656e), 
   ACE_NTOHL (0x74000000),  // name = permanent
     CORBA::tk_boolean,
 
@@ -376,7 +376,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest (
     sizeof (_oc_PortableInterceptor_ForwardRequest),
     (char *) &_oc_PortableInterceptor_ForwardRequest,
     0,
-    sizeof (PortableInterceptor::ForwardRequest)
+    0
   );
 
 namespace PortableInterceptor
@@ -385,14 +385,7 @@ namespace PortableInterceptor
     &_tc_TAO_tc_PortableInterceptor_ForwardRequest;
 }
 
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const
-{
-  return ::PortableInterceptor::_tc_ForwardRequest;
-}
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
@@ -425,21 +418,20 @@ PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::Invali
 void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_pointer)
 {
   InvalidSlot *_tao_tmp_pointer =
-    ACE_static_cast (InvalidSlot*, _tao_void_pointer);
+    static_cast<InvalidSlot *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableInterceptor::InvalidSlot *
 PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/InvalidSlot:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (InvalidSlot *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InvalidSlot *> (_tao_excp);
+}
+
+const PortableInterceptor::InvalidSlot *
+PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidSlot *> (_tao_excp);
 }
 
 CORBA::Exception *PortableInterceptor::InvalidSlot::_alloc (void)
@@ -475,7 +467,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -488,32 +480,38 @@ void PortableInterceptor::InvalidSlot::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
+{
+  return ::PortableInterceptor::_tc_InvalidSlot;
+}
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696453),
-  ACE_NTOHL (0x6c6f743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696453), 
+  ACE_NTOHL (0x6c6f743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/InvalidSlot:1.0
     12,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696453),
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696453), 
   ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
   0, // member count
   };
@@ -523,7 +521,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (
     sizeof (_oc_PortableInterceptor_InvalidSlot),
     (char *) &_oc_PortableInterceptor_InvalidSlot,
     0,
-    sizeof (PortableInterceptor::InvalidSlot)
+    0
   );
 
 namespace PortableInterceptor
@@ -533,50 +531,6 @@ namespace PortableInterceptor
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_PortableInterceptor_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x43757272),
-  ACE_NTOHL (0x656e743a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Current:1.0
-    8,
-  ACE_NTOHL (0x43757272),
-  ACE_NTOHL (0x656e7400),  // name = Current
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_Current),
-    (char *) &_oc_PortableInterceptor_Current,
-    0,
-    sizeof (PortableInterceptor::Current)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_Current =
-    &_tc_TAO_tc_PortableInterceptor_Current;
-}
-
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
-{
-  return ::PortableInterceptor::_tc_InvalidSlot;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::Current.
@@ -613,26 +567,20 @@ TAO::Objref_Traits<PortableInterceptor::Current>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_Current_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::Current::Current (void)
 {}
 
 PortableInterceptor::Current::~Current (void)
 {}
 
-void
+void 
 PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
-    ACE_static_cast (Current *, _tao_void_pointer);
+    static_cast<Current *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -646,10 +594,10 @@ PortableInterceptor::Current::_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -663,10 +611,10 @@ PortableInterceptor::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -677,7 +625,7 @@ PortableInterceptor::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -762,26 +710,20 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_RequestInfo_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::RequestInfo::RequestInfo (void)
 {}
 
 PortableInterceptor::RequestInfo::~RequestInfo (void)
 {}
 
-void
+void 
 PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestInfo *_tao_tmp_pointer =
-    ACE_static_cast (RequestInfo *, _tao_void_pointer);
+    static_cast<RequestInfo *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -795,10 +737,10 @@ PortableInterceptor::RequestInfo::_narrow (
     {
       return RequestInfo::_nil ();
     }
-
+  
   RequestInfo_ptr proxy =
     dynamic_cast<RequestInfo_ptr> (_tao_objref);
-
+  
   return RequestInfo::_duplicate (proxy);
 }
 
@@ -812,10 +754,10 @@ PortableInterceptor::RequestInfo::_unchecked_narrow (
     {
       return RequestInfo::_nil ();
     }
-
+  
   RequestInfo_ptr proxy =
     dynamic_cast<RequestInfo_ptr> (_tao_objref);
-
+  
   return RequestInfo::_duplicate (proxy);
 }
 
@@ -826,7 +768,7 @@ PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -907,26 +849,20 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_ClientRequestInfo_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 {}
 
 PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
 {}
 
-void
+void 
 PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientRequestInfo *_tao_tmp_pointer =
-    ACE_static_cast (ClientRequestInfo *, _tao_void_pointer);
+    static_cast<ClientRequestInfo *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -940,10 +876,10 @@ PortableInterceptor::ClientRequestInfo::_narrow (
     {
       return ClientRequestInfo::_nil ();
     }
-
+  
   ClientRequestInfo_ptr proxy =
     dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
-
+  
   return ClientRequestInfo::_duplicate (proxy);
 }
 
@@ -957,10 +893,10 @@ PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
     {
       return ClientRequestInfo::_nil ();
     }
-
+  
   ClientRequestInfo_ptr proxy =
     dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
-
+  
   return ClientRequestInfo::_duplicate (proxy);
 }
 
@@ -971,7 +907,7 @@ PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1056,26 +992,20 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_ServerRequestInfo_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 {}
 
 PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
 {}
 
-void
+void 
 PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerRequestInfo *_tao_tmp_pointer =
-    ACE_static_cast (ServerRequestInfo *, _tao_void_pointer);
+    static_cast<ServerRequestInfo *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1089,10 +1019,10 @@ PortableInterceptor::ServerRequestInfo::_narrow (
     {
       return ServerRequestInfo::_nil ();
     }
-
+  
   ServerRequestInfo_ptr proxy =
     dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
-
+  
   return ServerRequestInfo::_duplicate (proxy);
 }
 
@@ -1106,10 +1036,10 @@ PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
     {
       return ServerRequestInfo::_nil ();
     }
-
+  
   ServerRequestInfo_ptr proxy =
     dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
-
+  
   return ServerRequestInfo::_duplicate (proxy);
 }
 
@@ -1120,7 +1050,7 @@ PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1205,26 +1135,20 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_ClientRequestInterceptor_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 {}
 
 PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
 {}
 
-void
+void 
 PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientRequestInterceptor *_tao_tmp_pointer =
-    ACE_static_cast (ClientRequestInterceptor *, _tao_void_pointer);
+    static_cast<ClientRequestInterceptor *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1238,10 +1162,10 @@ PortableInterceptor::ClientRequestInterceptor::_narrow (
     {
       return ClientRequestInterceptor::_nil ();
     }
-
+  
   ClientRequestInterceptor_ptr proxy =
     dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref);
-
+  
   return ClientRequestInterceptor::_duplicate (proxy);
 }
 
@@ -1255,10 +1179,10 @@ PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
     {
       return ClientRequestInterceptor::_nil ();
     }
-
+  
   ClientRequestInterceptor_ptr proxy =
     dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref);
-
+  
   return ClientRequestInterceptor::_duplicate (proxy);
 }
 
@@ -1269,7 +1193,7 @@ PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestIntercep
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1354,26 +1278,20 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_ServerRequestInterceptor_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 {}
 
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 {}
 
-void
+void 
 PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerRequestInterceptor *_tao_tmp_pointer =
-    ACE_static_cast (ServerRequestInterceptor *, _tao_void_pointer);
+    static_cast<ServerRequestInterceptor *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1387,10 +1305,10 @@ PortableInterceptor::ServerRequestInterceptor::_narrow (
     {
       return ServerRequestInterceptor::_nil ();
     }
-
+  
   ServerRequestInterceptor_ptr proxy =
     dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref);
-
+  
   return ServerRequestInterceptor::_duplicate (proxy);
 }
 
@@ -1404,10 +1322,10 @@ PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     {
       return ServerRequestInterceptor::_nil ();
     }
-
+  
   ServerRequestInterceptor_ptr proxy =
     dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref);
-
+  
   return ServerRequestInterceptor::_duplicate (proxy);
 }
 
@@ -1418,7 +1336,7 @@ PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestIntercep
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1467,17 +1385,6 @@ PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// Hand-crafted.
-::CORBA::Policy_ptr
-PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
-                                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
-
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::PolicyFactory.
@@ -1514,26 +1421,20 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_PolicyFactory_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::PolicyFactory::PolicyFactory (void)
 {}
 
 PortableInterceptor::PolicyFactory::~PolicyFactory (void)
 {}
 
-void
+void 
 PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyFactory *_tao_tmp_pointer =
-    ACE_static_cast (PolicyFactory *, _tao_void_pointer);
+    static_cast<PolicyFactory *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1547,10 +1448,10 @@ PortableInterceptor::PolicyFactory::_narrow (
     {
       return PolicyFactory::_nil ();
     }
-
+  
   PolicyFactory_ptr proxy =
     dynamic_cast<PolicyFactory_ptr> (_tao_objref);
-
+  
   return PolicyFactory::_duplicate (proxy);
 }
 
@@ -1564,10 +1465,10 @@ PortableInterceptor::PolicyFactory::_unchecked_narrow (
     {
       return PolicyFactory::_nil ();
     }
-
+  
   PolicyFactory_ptr proxy =
     dynamic_cast<PolicyFactory_ptr> (_tao_objref);
-
+  
   return PolicyFactory::_duplicate (proxy);
 }
 
@@ -1578,7 +1479,7 @@ PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1659,16 +1560,10 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_ORBInitInfo_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
@@ -1703,21 +1598,20 @@ PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInte
 void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor (void *_tao_void_pointer)
 {
   DuplicateName *_tao_tmp_pointer =
-    ACE_static_cast (DuplicateName*, _tao_void_pointer);
+    static_cast<DuplicateName *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableInterceptor::ORBInitInfo::DuplicateName *
 PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (DuplicateName *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<DuplicateName *> (_tao_excp);
+}
+
+const PortableInterceptor::ORBInitInfo::DuplicateName *
+PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const DuplicateName *> (_tao_excp);
 }
 
 CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void)
@@ -1776,38 +1670,45 @@ PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
   this->name = CORBA::string_dup (_tao_name);
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_type (void) const
+{
+  return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName;
+}
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
 static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_DuplicateName[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   62,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x6e697449),
-  ACE_NTOHL (0x6e666f2f),
-  ACE_NTOHL (0x4475706c),
-  ACE_NTOHL (0x69636174),
-  ACE_NTOHL (0x654e616d),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f2f), 
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x654e616d), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0
     14,
-  ACE_NTOHL (0x4475706c),
-  ACE_NTOHL (0x69636174),
-  ACE_NTOHL (0x654e616d),
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x654e616d), 
   ACE_NTOHL (0x65000000),  // name = DuplicateName
   1, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -1816,19 +1717,13 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName
     sizeof (_oc_PortableInterceptor_ORBInitInfo_DuplicateName),
     (char *) &_oc_PortableInterceptor_ORBInitInfo_DuplicateName,
     0,
-    sizeof (PortableInterceptor::ORBInitInfo::DuplicateName)
+    0
   );
 
 ::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
   &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_type (void) const
-{
-  return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName;
-}
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
@@ -1861,21 +1756,20 @@ PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterc
 void PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor (void *_tao_void_pointer)
 {
   InvalidName *_tao_tmp_pointer =
-    ACE_static_cast (InvalidName*, _tao_void_pointer);
+    static_cast<InvalidName *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableInterceptor::ORBInitInfo::InvalidName *
 PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (InvalidName *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InvalidName *> (_tao_excp);
+}
+
+const PortableInterceptor::ORBInitInfo::InvalidName *
+PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidName *> (_tao_excp);
 }
 
 CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void)
@@ -1918,31 +1812,37 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_type (void) const
+{
+  return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName;
+}
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_InvalidName[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x72636570),
-  ACE_NTOHL (0x746f722f),
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x6e697449),
-  ACE_NTOHL (0x6e666f2f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c69644e),
-  ACE_NTOHL (0x616d653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x6e666f2f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69644e), 
+  ACE_NTOHL (0x616d653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0
     12,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c69644e),
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69644e), 
   ACE_NTOHL (0x616d6500),  // name = InvalidName
   0, // member count
   };
@@ -1952,29 +1852,23 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName (
     sizeof (_oc_PortableInterceptor_ORBInitInfo_InvalidName),
     (char *) &_oc_PortableInterceptor_ORBInitInfo_InvalidName,
     0,
-    sizeof (PortableInterceptor::ORBInitInfo::InvalidName)
+    0
   );
 
 ::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_InvalidName =
   &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName;
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_type (void) const
-{
-  return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName;
-}
-
 PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 {}
 
 PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
 {}
 
-void
+void 
 PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   ORBInitInfo *_tao_tmp_pointer =
-    ACE_static_cast (ORBInitInfo *, _tao_void_pointer);
+    static_cast<ORBInitInfo *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1988,10 +1882,10 @@ PortableInterceptor::ORBInitInfo::_narrow (
     {
       return ORBInitInfo::_nil ();
     }
-
+  
   ORBInitInfo_ptr proxy =
     dynamic_cast<ORBInitInfo_ptr> (_tao_objref);
-
+  
   return ORBInitInfo::_duplicate (proxy);
 }
 
@@ -2005,10 +1899,10 @@ PortableInterceptor::ORBInitInfo::_unchecked_narrow (
     {
       return ORBInitInfo::_nil ();
     }
-
+  
   ORBInitInfo_ptr proxy =
     dynamic_cast<ORBInitInfo_ptr> (_tao_objref);
-
+  
   return ORBInitInfo::_duplicate (proxy);
 }
 
@@ -2019,7 +1913,7 @@ PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2063,6 +1957,18 @@ PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
   return 0;
 }
 
+// Hand-crafted.
+
+::CORBA::Policy_ptr
+PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
+                                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CORBA::PolicyError))
+{
+  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
+                    CORBA::Policy::_nil ());
+}
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
@@ -2100,26 +2006,20 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*PortableInterceptor__TAO_ORBInitializer_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 PortableInterceptor::ORBInitializer::ORBInitializer (void)
 {}
 
 PortableInterceptor::ORBInitializer::~ORBInitializer (void)
 {}
 
-void
+void 
 PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer)
 {
   ORBInitializer *_tao_tmp_pointer =
-    ACE_static_cast (ORBInitializer *, _tao_void_pointer);
+    static_cast<ORBInitializer *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2133,10 +2033,10 @@ PortableInterceptor::ORBInitializer::_narrow (
     {
       return ORBInitializer::_nil ();
     }
-
+  
   ORBInitializer_ptr proxy =
     dynamic_cast<ORBInitializer_ptr> (_tao_objref);
-
+  
   return ORBInitializer::_duplicate (proxy);
 }
 
@@ -2150,10 +2050,10 @@ PortableInterceptor::ORBInitializer::_unchecked_narrow (
     {
       return ORBInitializer::_nil ();
     }
-
+  
   ORBInitializer_ptr proxy =
     dynamic_cast<ORBInitializer_ptr> (_tao_objref);
-
+  
   return ORBInitializer::_duplicate (proxy);
 }
 
@@ -2164,7 +2064,7 @@ PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2285,7 +2185,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -2298,7 +2198,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::Interceptor
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::Interceptor
@@ -2313,7 +2213,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::Current
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::Current
@@ -2328,7 +2228,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::RequestInfo
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::RequestInfo
@@ -2343,7 +2243,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::ClientRequestInfo
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::ClientRequestInfo
@@ -2358,7 +2258,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::ServerRequestInfo
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::ServerRequestInfo
@@ -2373,7 +2273,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::ClientRequestInterceptor
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::ClientRequestInterceptor
@@ -2388,7 +2288,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::ServerRequestInterceptor
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::ServerRequestInterceptor
@@ -2403,7 +2303,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::PolicyFactory
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::PolicyFactory
@@ -2418,7 +2318,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::ORBInitInfo
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::ORBInitInfo
@@ -2433,7 +2333,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         PortableInterceptor::ORBInitializer
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         PortableInterceptor::ORBInitializer
@@ -2450,7 +2350,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::Interceptor
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::Interceptor
@@ -2465,7 +2365,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::Current
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::Current
@@ -2480,7 +2380,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::RequestInfo
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::RequestInfo
@@ -2495,7 +2395,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::ClientRequestInfo
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::ClientRequestInfo
@@ -2510,7 +2410,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::ServerRequestInfo
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::ServerRequestInfo
@@ -2525,7 +2425,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::ClientRequestInterceptor
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::ClientRequestInterceptor
@@ -2540,7 +2440,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::ServerRequestInterceptor
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::ServerRequestInterceptor
@@ -2555,7 +2455,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::PolicyFactory
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::PolicyFactory
@@ -2570,7 +2470,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::ORBInitInfo
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::ORBInitInfo
@@ -2585,10 +2485,10 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         PortableInterceptor::ORBInitializer
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         PortableInterceptor::ORBInitializer
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 98d3b4e9bdb..2692cee4995 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -26,28 +26,34 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
+#include "tao/Any.h"
 #include "tao/Objref_VarOut_T.h"
 
-#include "PI_ForwardC.h"
+#include "tao/PI_ForwardC.h"
+#include "tao/CurrentC.h"
 #include "tao/Messaging_SyncScopeC.h"
 #include "tao/IOP_CodecC.h"
+#include "tao/IOP_IORC.h"
 #include "tao/PolicyC.h"
-#include "tao/CurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -62,9 +68,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -72,7 +76,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// Hand crafted, keeps DynamicC.h and Typecode.h out of header files.
+// Hand crafted, keep DynamicC.h out of header files.
 namespace Dynamic
 {
   class ParameterList;
@@ -82,7 +86,7 @@ namespace Dynamic
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -99,32 +103,32 @@ namespace PortableInterceptor
 {
 
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
 
   const PortableInterceptor::AdapterState HOLDING = 0;
 
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
 
   const PortableInterceptor::AdapterState ACTIVE = 1;
 
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
 
   const PortableInterceptor::AdapterState DISCARDING = 2;
 
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
 
   const PortableInterceptor::AdapterState INACTIVE = 3;
 
   // TAO_IDL - Generated from
-  // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
 
   const PortableInterceptor::AdapterState NON_EXISTENT = 4;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_
@@ -251,6 +255,8 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
 
     static ForwardRequest *_downcast (CORBA::Exception *);
+    static const ForwardRequest *_downcast (CORBA::Exception const *);
+
     static CORBA::Exception *_alloc (void);
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -276,7 +282,7 @@ namespace PortableInterceptor
       );
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
 
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
@@ -364,6 +370,8 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
 
     static InvalidSlot *_downcast (CORBA::Exception *);
+    static const InvalidSlot *_downcast (CORBA::Exception const *);
+
     static CORBA::Exception *_alloc (void);
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -381,7 +389,7 @@ namespace PortableInterceptor
       );
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
 
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
@@ -394,7 +402,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_
@@ -423,7 +431,7 @@ namespace PortableInterceptor
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
 
   class TAO_Export Current
-    : public virtual CORBA::Current
+    : public virtual ::CORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
@@ -453,25 +461,25 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Any * get_slot (
-        PortableInterceptor::SlotId id
+        ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::InvalidSlot
+        CORBA::SystemException,
+        ::PortableInterceptor::InvalidSlot
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void set_slot (
-        PortableInterceptor::SlotId id,
-        const CORBA::Any & data
+        ::PortableInterceptor::SlotId id,
+        const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::InvalidSlot
+        CORBA::SystemException,
+        ::PortableInterceptor::InvalidSlot
       )) = 0;
 
     // TAO_IDL - Generated from
@@ -506,7 +514,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_
@@ -675,19 +683,19 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Any * get_slot (
-        PortableInterceptor::SlotId id
+        ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::InvalidSlot
+        CORBA::SystemException,
+        ::PortableInterceptor::InvalidSlot
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::IOP::ServiceContext * get_request_service_context (
-        IOP::ServiceId id
+        ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -698,7 +706,7 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::IOP::ServiceContext * get_reply_service_context (
-        IOP::ServiceId id
+        ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -737,7 +745,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestInfo;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
@@ -766,7 +774,7 @@ namespace PortableInterceptor
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
 
   class TAO_Export ClientRequestInfo
-    : public virtual PortableInterceptor::RequestInfo
+    : public virtual ::PortableInterceptor::RequestInfo
   {
   public:
     typedef ClientRequestInfo_ptr _ptr_type;
@@ -846,7 +854,7 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::IOP::TaggedComponent * get_effective_component (
-        IOP::ComponentId id
+        ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -857,7 +865,7 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
-        IOP::ComponentId id
+        ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -868,7 +876,7 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr get_request_policy (
-        CORBA::PolicyType type
+        ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -879,8 +887,8 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void add_request_service_context (
-        const IOP::ServiceContext & service_context,
-        CORBA::Boolean replace
+        const ::IOP::ServiceContext & service_context,
+        ::CORBA::Boolean replace
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -919,7 +927,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInfo;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
@@ -948,7 +956,7 @@ namespace PortableInterceptor
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
 
   class TAO_Export ServerRequestInfo
-    : public virtual PortableInterceptor::RequestInfo
+    : public virtual ::PortableInterceptor::RequestInfo
   {
   public:
     typedef ServerRequestInfo_ptr _ptr_type;
@@ -1017,7 +1025,7 @@ namespace PortableInterceptor
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
-    virtual ::CORBA::OctetSeq * object_id (
+    virtual ::PortableInterceptor::ObjectId * object_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1048,7 +1056,7 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr get_server_policy (
-        CORBA::PolicyType type
+        ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1059,13 +1067,13 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void set_slot (
-        PortableInterceptor::SlotId id,
-        const CORBA::Any & data
+        ::PortableInterceptor::SlotId id,
+        const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::InvalidSlot
+        CORBA::SystemException,
+        ::PortableInterceptor::InvalidSlot
       )) = 0;
 
     // TAO_IDL - Generated from
@@ -1083,8 +1091,8 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void add_reply_service_context (
-        const IOP::ServiceContext & service_context,
-        CORBA::Boolean replace
+        const ::IOP::ServiceContext & service_context,
+        ::CORBA::Boolean replace
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1123,7 +1131,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInfo;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
@@ -1152,7 +1160,7 @@ namespace PortableInterceptor
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
 
   class TAO_Export ClientRequestInterceptor
-    : public virtual PortableInterceptor::Interceptor
+    : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef ClientRequestInterceptor_ptr _ptr_type;
@@ -1182,19 +1190,19 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void send_request (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void send_poll (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1205,7 +1213,7 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void receive_reply (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1216,24 +1224,24 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void receive_exception (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void receive_other (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
 
     // TAO_IDL - Generated from
@@ -1268,7 +1276,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
@@ -1297,7 +1305,7 @@ namespace PortableInterceptor
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
 
   class TAO_Export ServerRequestInterceptor
-    : public virtual PortableInterceptor::Interceptor
+    : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef ServerRequestInterceptor_ptr _ptr_type;
@@ -1328,13 +1336,13 @@ namespace PortableInterceptor
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
 
     virtual void tao_ft_interception_point (
-        PortableInterceptor::ServerRequestInfo_ptr ,
-        CORBA::OctetSeq_out
+        ::PortableInterceptor::ServerRequestInfo_ptr ri,
+        ::CORBA::OctetSeq_out
         ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
         )) {}
 
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
@@ -1342,31 +1350,31 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr ri
+        ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void receive_request (
-        PortableInterceptor::ServerRequestInfo_ptr ri
+        ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void send_reply (
-        PortableInterceptor::ServerRequestInfo_ptr ri
+        ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1377,24 +1385,24 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void send_exception (
-        PortableInterceptor::ServerRequestInfo_ptr ri
+        ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr ri
+        ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
 
     // TAO_IDL - Generated from
@@ -1429,7 +1437,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
@@ -1484,19 +1492,6 @@ namespace PortableInterceptor
 
     static void _tao_any_destructor (void *);
 
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr create_policy (
-        CORBA::PolicyType type,
-        const CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , CORBA::PolicyError
-      )) = 0;
-
     // Hand-crafted addition.
     virtual ::CORBA::Policy_ptr _create_policy (
         CORBA::PolicyType type
@@ -1508,6 +1503,19 @@ namespace PortableInterceptor
       ));
 
     // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+
+    virtual ::CORBA::Policy_ptr create_policy (
+        ::CORBA::PolicyType type,
+        const ::CORBA::Any & value
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::CORBA::PolicyError
+      )) = 0;
+
+    // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
 
     virtual CORBA::Boolean _is_a (
@@ -1539,7 +1547,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyFactory;
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
@@ -1562,7 +1570,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
@@ -1649,6 +1657,8 @@ namespace PortableInterceptor
       static void _tao_any_destructor (void *);
 
       static DuplicateName *_downcast (CORBA::Exception *);
+      static const DuplicateName *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -1673,7 +1683,7 @@ namespace PortableInterceptor
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -1694,18 +1704,20 @@ namespace PortableInterceptor
     class TAO_Export InvalidName : public CORBA::UserException
     {
     public:
-
+      
       InvalidName (void);
       InvalidName (const InvalidName &);
       ~InvalidName (void);
 
       InvalidName &operator= (const InvalidName &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static InvalidName *_downcast (CORBA::Exception *);
+      static const InvalidName *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -1714,184 +1726,184 @@ namespace PortableInterceptor
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
-
+      // be\be_visitor_exception/exception_ch.cpp:127
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_InvalidName;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::StringSeq * arguments (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * orb_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::CodecFactory_ptr codec_factory (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void register_initial_reference (
         const char * id,
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ORBInitInfo::InvalidName
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr resolve_initial_references (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ORBInitInfo::InvalidName
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_client_request_interceptor (
-        PortableInterceptor::ClientRequestInterceptor_ptr interceptor
+        ::PortableInterceptor::ClientRequestInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ORBInitInfo::DuplicateName
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_server_request_interceptor (
-        PortableInterceptor::ServerRequestInterceptor_ptr interceptor
+        ::PortableInterceptor::ServerRequestInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ORBInitInfo::DuplicateName
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_ior_interceptor (
-        PortableInterceptor::IORInterceptor_ptr interceptor
+        ::PortableInterceptor::IORInterceptor_ptr interceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ORBInitInfo::DuplicateName
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual PortableInterceptor::SlotId allocate_slot_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void register_policy_factory (
-        CORBA::PolicyType type,
-        PortableInterceptor::PolicyFactory_ptr policy_factory
+        ::CORBA::PolicyType type,
+        ::PortableInterceptor::PolicyFactory_ptr policy_factory
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     ORBInitInfo (void);
-
+    
     virtual ~ORBInitInfo (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ORBInitInfo (const ORBInitInfo &);
-
+    
     void operator= (const ORBInitInfo &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitInfo;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_
-
+  
   class ORBInitializer;
   typedef ORBInitializer *ORBInitializer_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ORBInitializer
       >
     ORBInitializer_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ORBInitializer
@@ -1899,91 +1911,91 @@ namespace PortableInterceptor
     ORBInitializer_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
-
+  
   class TAO_Export ORBInitializer
     : public virtual CORBA::Object
   {
   public:
     typedef ORBInitializer_ptr _ptr_type;
     typedef ORBInitializer_var _var_type;
-
+    
     // The static operations.
     static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
-
+    
     static ORBInitializer_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitializer_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitializer_ptr _nil (void)
     {
       return (ORBInitializer_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void pre_init (
-        PortableInterceptor::ORBInitInfo_ptr info
+        ::PortableInterceptor::ORBInitInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void post_init (
-        PortableInterceptor::ORBInitInfo_ptr info
+        ::PortableInterceptor::ORBInitInfo_ptr info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     ORBInitializer (void);
-
+    
     virtual ~ORBInitializer (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ORBInitializer (const ORBInitializer &);
-
+    
     void operator= (const ORBInitializer &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitializer;
 
 // TAO_IDL - Generated from
@@ -2000,19 +2012,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::Interceptor>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::Interceptor>
   {
-    static PortableInterceptor::Interceptor_ptr duplicate (
-        PortableInterceptor::Interceptor_ptr
+    static ::PortableInterceptor::Interceptor_ptr duplicate (
+        ::PortableInterceptor::Interceptor_ptr
       );
     static void release (
-        PortableInterceptor::Interceptor_ptr
+        ::PortableInterceptor::Interceptor_ptr
       );
-    static PortableInterceptor::Interceptor_ptr nil (void);
+    static ::PortableInterceptor::Interceptor_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::Interceptor_ptr p,
+        ::PortableInterceptor::Interceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2021,19 +2033,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::Current>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::Current>
   {
-    static PortableInterceptor::Current_ptr duplicate (
-        PortableInterceptor::Current_ptr
+    static ::PortableInterceptor::Current_ptr duplicate (
+        ::PortableInterceptor::Current_ptr
       );
     static void release (
-        PortableInterceptor::Current_ptr
+        ::PortableInterceptor::Current_ptr
       );
-    static PortableInterceptor::Current_ptr nil (void);
+    static ::PortableInterceptor::Current_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::Current_ptr p,
+        ::PortableInterceptor::Current_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2042,19 +2054,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::RequestInfo>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::RequestInfo>
   {
-    static PortableInterceptor::RequestInfo_ptr duplicate (
-        PortableInterceptor::RequestInfo_ptr
+    static ::PortableInterceptor::RequestInfo_ptr duplicate (
+        ::PortableInterceptor::RequestInfo_ptr
       );
     static void release (
-        PortableInterceptor::RequestInfo_ptr
+        ::PortableInterceptor::RequestInfo_ptr
       );
-    static PortableInterceptor::RequestInfo_ptr nil (void);
+    static ::PortableInterceptor::RequestInfo_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::RequestInfo_ptr p,
+        ::PortableInterceptor::RequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2063,19 +2075,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInfo>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
   {
-    static PortableInterceptor::ClientRequestInfo_ptr duplicate (
-        PortableInterceptor::ClientRequestInfo_ptr
+    static ::PortableInterceptor::ClientRequestInfo_ptr duplicate (
+        ::PortableInterceptor::ClientRequestInfo_ptr
       );
     static void release (
-        PortableInterceptor::ClientRequestInfo_ptr
+        ::PortableInterceptor::ClientRequestInfo_ptr
       );
-    static PortableInterceptor::ClientRequestInfo_ptr nil (void);
+    static ::PortableInterceptor::ClientRequestInfo_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::ClientRequestInfo_ptr p,
+        ::PortableInterceptor::ClientRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2084,19 +2096,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInfo>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
-    static PortableInterceptor::ServerRequestInfo_ptr duplicate (
-        PortableInterceptor::ServerRequestInfo_ptr
+    static ::PortableInterceptor::ServerRequestInfo_ptr duplicate (
+        ::PortableInterceptor::ServerRequestInfo_ptr
       );
     static void release (
-        PortableInterceptor::ServerRequestInfo_ptr
+        ::PortableInterceptor::ServerRequestInfo_ptr
       );
-    static PortableInterceptor::ServerRequestInfo_ptr nil (void);
+    static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::ServerRequestInfo_ptr p,
+        ::PortableInterceptor::ServerRequestInfo_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2105,19 +2117,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInterceptor>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor>
   {
-    static PortableInterceptor::ClientRequestInterceptor_ptr duplicate (
-        PortableInterceptor::ClientRequestInterceptor_ptr
+    static ::PortableInterceptor::ClientRequestInterceptor_ptr duplicate (
+        ::PortableInterceptor::ClientRequestInterceptor_ptr
       );
     static void release (
-        PortableInterceptor::ClientRequestInterceptor_ptr
+        ::PortableInterceptor::ClientRequestInterceptor_ptr
       );
-    static PortableInterceptor::ClientRequestInterceptor_ptr nil (void);
+    static ::PortableInterceptor::ClientRequestInterceptor_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::ClientRequestInterceptor_ptr p,
+        ::PortableInterceptor::ClientRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2126,19 +2138,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInterceptor>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
   {
-    static PortableInterceptor::ServerRequestInterceptor_ptr duplicate (
-        PortableInterceptor::ServerRequestInterceptor_ptr
+    static ::PortableInterceptor::ServerRequestInterceptor_ptr duplicate (
+        ::PortableInterceptor::ServerRequestInterceptor_ptr
       );
     static void release (
-        PortableInterceptor::ServerRequestInterceptor_ptr
+        ::PortableInterceptor::ServerRequestInterceptor_ptr
       );
-    static PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
+    static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::ServerRequestInterceptor_ptr p,
+        ::PortableInterceptor::ServerRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2147,19 +2159,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::PolicyFactory>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
   {
-    static PortableInterceptor::PolicyFactory_ptr duplicate (
-        PortableInterceptor::PolicyFactory_ptr
+    static ::PortableInterceptor::PolicyFactory_ptr duplicate (
+        ::PortableInterceptor::PolicyFactory_ptr
       );
     static void release (
-        PortableInterceptor::PolicyFactory_ptr
+        ::PortableInterceptor::PolicyFactory_ptr
       );
-    static PortableInterceptor::PolicyFactory_ptr nil (void);
+    static ::PortableInterceptor::PolicyFactory_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::PolicyFactory_ptr p,
+        ::PortableInterceptor::PolicyFactory_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2168,19 +2180,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitInfo>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo>
   {
-    static PortableInterceptor::ORBInitInfo_ptr duplicate (
-        PortableInterceptor::ORBInitInfo_ptr
+    static ::PortableInterceptor::ORBInitInfo_ptr duplicate (
+        ::PortableInterceptor::ORBInitInfo_ptr
       );
     static void release (
-        PortableInterceptor::ORBInitInfo_ptr
+        ::PortableInterceptor::ORBInitInfo_ptr
       );
-    static PortableInterceptor::ORBInitInfo_ptr nil (void);
+    static ::PortableInterceptor::ORBInitInfo_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::ORBInitInfo_ptr p,
+        ::PortableInterceptor::ORBInitInfo_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2189,19 +2201,19 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitializer>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitializer>
   {
-    static PortableInterceptor::ORBInitializer_ptr duplicate (
-        PortableInterceptor::ORBInitializer_ptr
+    static ::PortableInterceptor::ORBInitializer_ptr duplicate (
+        ::PortableInterceptor::ORBInitializer_ptr
       );
     static void release (
-        PortableInterceptor::ORBInitializer_ptr
+        ::PortableInterceptor::ORBInitializer_ptr
       );
-    static PortableInterceptor::ORBInitializer_ptr nil (void);
+    static ::PortableInterceptor::ORBInitializer_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableInterceptor::ORBInitializer_ptr p,
+        ::PortableInterceptor::ORBInitializer_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2282,13 +2294,6 @@ TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_pt
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:65
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::IORInterceptor *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr); // copying
@@ -2331,20 +2336,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::IORInterceptor_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::IORInterceptor_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "PortableInterceptorC.i"
+#include "PortableInterceptorC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -2355,3 +2353,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::IORIn
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/PortableInterceptorC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/PortableInterceptorS.h b/TAO/tao/PortableInterceptorS.h
index a4f47c8a4f3..333ac399b58 100644
--- a/TAO/tao/PortableInterceptorS.h
+++ b/TAO/tao/PortableInterceptorS.h
@@ -15,22 +15,64 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_PORTABLEINTERCEPTORS_H_
-#define _TAO_IDL_PORTABLEINTERCEPTORS_H_
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORS_H_
+#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORS_H_
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-all.h"
+#include "PortableInterceptorC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PortableInterceptorC.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_PortableInterceptor
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module PortableInterceptor
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
index a007761a246..a839d48bc48 100644
--- a/TAO/tao/PortableServer.mpc
+++ b/TAO/tao/PortableServer.mpc
@@ -26,4 +26,8 @@ project : taolib, core {
   PIDL_Files {
     PortableServer
   }
+
+  Pkgconfig_Files {
+    PortableServer/TAO_PortableServer.pc.in
+  }
 }
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index 5f7e7fa9a25..1ea5b05fcee 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -3,7 +3,10 @@
 #include "Default_Acceptor_Filter.h"
 #include "tao/Transport_Acceptor.h"
 
-ACE_RCSID (PortableServer, Default_Acceptor_Filter, "$Id$")
+ACE_RCSID (PortableServer,
+           Default_Acceptor_Filter,
+           "$Id$")
+
 
 TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
 {
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
index 9e7bf2e1bf5..d6a859d0e3d 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -9,7 +9,8 @@
  *   Default strategy for populating mprofile
  *
  *
- *  @author  Marina Spivak <marina@cs.wustl.edu>  Carlos O'Ryan <coryan@uci.edu>
+ *  @author  Marina Spivak <marina@cs.wustl.edu>
+ *  @author  Carlos O'Ryan <coryan@uci.edu>
  */
 //=============================================================================
 
@@ -19,20 +20,12 @@
 #include /**/ "ace/pre.h"
 
 #include "portableserver_export.h"
-#include "tao/Acceptor_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
+#include "tao/Acceptor_Filter.h"
 
 class TAO_Acceptor;
 
@@ -44,7 +37,8 @@ class TAO_Acceptor;
  * Default strategy for populating mprofile: all available
  * endpoints are included.
  */
-class TAO_PortableServer_Export TAO_Default_Acceptor_Filter : public TAO_Acceptor_Filter
+class TAO_PortableServer_Export TAO_Default_Acceptor_Filter
+  : public TAO_Acceptor_Filter
 {
 public:
   TAO_Default_Acceptor_Filter (void);
@@ -61,9 +55,5 @@ public:
   int encode_endpoints (TAO_MProfile &mprofile);
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
-#endif /* TAO_POA_H */
+#endif /* TAO_DEFAULT_ACCEPTOR_FILTER_H */
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index 134465b45fa..5154b386325 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -27,7 +27,10 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
 {
 #if (TAO_HAS_MINIMUM_POA == 0)
   CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_SERVANT_RETENTION);
+    policies.get_cached_policy (TAO_CACHED_POLICY_SERVANT_RETENTION
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   PortableServer::ServantRetentionPolicy_var srp =
     PortableServer::ServantRetentionPolicy::_narrow (policy.in ()
                                                      ACE_ENV_ARG_PARAMETER);
@@ -36,7 +39,11 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
     srp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  policy = policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING);
+  policy = 
+    policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   PortableServer::RequestProcessingPolicy_var rpp =
     PortableServer::RequestProcessingPolicy::_narrow (policy.in ()
                                                       ACE_ENV_ARG_PARAMETER);
@@ -58,7 +65,12 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
       ACE_THROW (PortableServer::POA::InvalidPolicy ());
 
 
-  policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS);
+  policy = 
+    policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS
+                                ACE_ENV_ARG_PARAMETER);
+
+  ACE_CHECK;
+
   PortableServer::IdUniquenessPolicy_var iup =
     PortableServer::IdUniquenessPolicy::_narrow (policy.in ()
                                                  ACE_ENV_ARG_PARAMETER);
@@ -68,7 +80,11 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
   ACE_CHECK;
 
 
-  policy = policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION);
+  policy = 
+    policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   PortableServer::ImplicitActivationPolicy_var iap =
     PortableServer::ImplicitActivationPolicy::_narrow (policy.in ()
                                                        ACE_ENV_ARG_PARAMETER);
@@ -77,7 +93,11 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
     iap->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT);
+  policy = 
+    policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   PortableServer::IdAssignmentPolicy_var idap =
     PortableServer::IdAssignmentPolicy::_narrow (policy.in ()
                                                  ACE_ENV_ARG_PARAMETER);
@@ -86,7 +106,6 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
     idap->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-
   // USE_DEFAULT_SERVANT requires the MULTIPLE_ID policy.
   if (request_processing == PortableServer::USE_DEFAULT_SERVANT)
     if (id_uniqueness != PortableServer::MULTIPLE_ID)
diff --git a/TAO/tao/PortableServer/ImplRepo.pidl b/TAO/tao/PortableServer/ImplRepo.pidl
index d1d90a08506..d28309ac66f 100644
--- a/TAO/tao/PortableServer/ImplRepo.pidl
+++ b/TAO/tao/PortableServer/ImplRepo.pidl
@@ -10,29 +10,19 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl -o orig -ci C.i -si S.i -st S_T.i -Gp -Gd -Ge 1 -Sc -GT -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include=portableserver_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl
+ *   tao_idl -Gp -Gd -Ge 1 -Sc -GT -o orig
+ *       -Wb,export_macro=TAO_PortableServer_Export
+ *       -Wb,export_include=portableserver_export.h
+ *       -Wb,pre_include="ace/pre.h"
+ *       -Wb,post_include="ace/post.h" ImplRepo.pidl
  *
  */
 //=============================================================================
 
+#include "tao/PortableServer/ServerObject.pidl"
+
 module ImplementationRepository
 {
-  /**
-   * @brief Server Side IR Object
-   *
-   * This object, which exists on the servers that use the
-   * Implementation Repository (IR), is used to control or check the
-   * status of the server by the IR.
-   */
-  interface ServerObject
-  {
-    /// Check the liveness of a server.
-    void ping ();
-
-    /// Try to shutdown the server gracefully.
-    void shutdown ();
-  };
-
   // = Exceptions
 
   /// Object already bound in the Implementation Repository
@@ -54,10 +44,6 @@ module ImplementationRepository
     string value;
   };
 
-  /// This is used in places that require a partial IOR with
-  /// just the ObjectKey missing.
-  typedef string Address;
-
   /// Complete Environment.
   typedef sequence<EnvironmentVariable> EnvironmentList;
 
@@ -81,28 +67,43 @@ module ImplementationRepository
 
     /// Name of the activator
     string activator;
+
+    /// Number of retries allowed
+    long start_limit;
   };
 
-  /// All the information about one server.
   struct ServerInformation
   {
-    /// The logical server this server is part of.
-    string logical_server;
-
     /// Server name.
     string server;
 
     /// How to start up the server.
     StartupOptions startup;
 
-    /// Where the server is located currently.
-    Address location;
+    /// This is used in places that require a partial IOR with
+    /// just the ObjectKey missing.
+    string partial_ior;
   };
 
   typedef sequence <ServerInformation> ServerInformationList;
 
-  /// Forward declaration.
-  interface ServerInformationIterator;
+  /**
+    * @brief The Server Information Iterator Interface
+    *
+    * Interface for iterating over servers returned with
+    * Administration::list ().
+    */
+  interface ServerInformationIterator
+  {
+    /// This operation returns at most the requested number of
+    /// servers.
+    /// If how_many == 0, then returns all servers
+    boolean next_n (in unsigned long how_many,
+                    out ServerInformationList servers);
+
+    /// This operation destroys the iterator.
+    void destroy ();
+  };
 
   /**
     * @brief The Implementation Repository Administration Interface
@@ -112,7 +113,7 @@ module ImplementationRepository
     */
   interface Administration
   {
-    /// Activate server that is named @a server.
+    /// Activate server that is named <server>.
     ///
     /// The <NotFound> exception is raised when <server> is not found
     /// in the Implementation Repository.  The <CannotActivate> exception
@@ -121,10 +122,6 @@ module ImplementationRepository
     void activate_server (in string server)
       raises (NotFound, CannotActivate);
 
-    string activate_server_with_startup (in string server,
-                                         in long check_startup)
-      raises (NotFound, CannotActivate);
-
     /// Register the <options> to specify how the <server> should be
     /// restarted when a client asks for it.
     ///
@@ -162,13 +159,13 @@ module ImplementationRepository
       raises (NotFound);
 
     /// Used to notify the Implementation Repository that <server> is alive
-    /// and well at <addr>.
+    /// and well at <partial_ior>.
     ///
     /// The <NotFound> exception is raised when <server> is not found
     /// in the Implementation Repository.
     void server_is_running (in string server,
-                               in Address addr,
-                               in ServerObject server_object)
+                            in string partial_ior,
+                            in ServerObject server_object)
       raises (NotFound);
 
     /// Used to tell the Implementation Repository that <server> is shutting
@@ -176,6 +173,7 @@ module ImplementationRepository
     ///
     /// The <NotFound> exception is raised when <server> is not found
     /// in the Implementation Repository.
+
     void server_is_shutting_down (in string server)
       raises (NotFound);
 
@@ -183,36 +181,16 @@ module ImplementationRepository
     ///
     /// The <NotFound> exception is raised when <server> is not found
     /// in the Implementation Repository.
-    void find (in string server,
-               out ServerInformation info)
+    void find (in string server, out ServerInformation info)
       raises (NotFound);
 
     /// Returns at most <how_many> servers in <server_list>.  If there
     /// are additional servers, they can be received through the
     /// <server_iterator>.  If there are no more servers, then
     /// <server_iterator> is null.
+    /// If how_many == 0, then returns all servers.
     void list (in unsigned long how_many,
                out ServerInformationList server_list,
                out ServerInformationIterator server_iterator);
-
-    /// Shuts down the repository
-    void shutdown_repo() ;
-
-    string find_ior (in string object_name)
-      raises (NotFound);
-
-  };
-
-  /// Interface for iterating over servers returned with
-  /// Administration::list ().
-  interface ServerInformationIterator
-  {
-    /// This operation returns at most the requested number of
-    /// servers.
-    boolean next_n (in unsigned long how_many,
-                    out ServerInformationList server_list);
-
-    /// This operation destroys the iterator.
-    void destroy ();
   };
 };
diff --git a/TAO/tao/PortableServer/ImplRepo_i.h b/TAO/tao/PortableServer/ImplRepo_i.h
index d67f3d7f57d..fa15f3c0646 100644
--- a/TAO/tao/PortableServer/ImplRepo_i.h
+++ b/TAO/tao/PortableServer/ImplRepo_i.h
@@ -18,7 +18,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ImplRepoS.h"
+#include "tao/PortableServer/ServerObjectS.h"
 #include "tao/ORB.h"
 
 /**
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index ba8d96e1f34..ccc6fb3b61b 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -5,10 +5,6 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Key_Adapters.i"
-#endif /* __ACE_INLINE__ */
-
 ////////////////////////////////////////////////////////////////////////////////
 
 TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h
index 6bd1b654074..76aa08c087a 100644
--- a/TAO/tao/PortableServer/Key_Adapters.h
+++ b/TAO/tao/PortableServer/Key_Adapters.h
@@ -116,10 +116,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#if defined (__ACE_INLINE__)
-# include "Key_Adapters.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_KEY_ADAPTERS_H */
diff --git a/TAO/tao/PortableServer/Key_Adapters.i b/TAO/tao/PortableServer/Key_Adapters.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/PortableServer/Key_Adapters.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h
index 883da9bf760..cd2b8bae0f7 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ b/TAO/tao/PortableServer/ORT_Adapter.h
@@ -85,6 +85,11 @@ namespace TAO
     virtual PortableInterceptor::ObjectReferenceFactory *
       get_obj_ref_factory (void) = 0;
 
+    /// Release any references on @c ObjectReferenceTemplate @a t.
+    virtual void release (
+      PortableInterceptor::ObjectReferenceTemplate * t) = 0;
+
+
     // @@ Johnny, we won't be needing the exception specification
     //    below for long.  Once bug 1852 is fixed, we can the
     //    exception specification and the "tao/SystemException.h"
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 185cf4a12c6..84c2ee6dffd 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -409,16 +409,6 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
   else
     ++iterator;
 
-  // A recursive thread lock without using a recursive thread lock.
-  // Non_Servant_Upcall has a magic constructor and destructor.  We
-  // unlock the Object_Adapter lock for the duration of the adapter
-  // activator(s) upcalls; reacquiring once the upcalls complete.
-  // Even though we are releasing the lock, other threads will not be
-  // able to make progress since
-  // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-  Non_Servant_Upcall non_servant_upcall (*parent);
-  ACE_UNUSED_ARG (non_servant_upcall);
-
   for (;
        iterator != end;
        ++iterator)
@@ -591,10 +581,6 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   this->orb_core_.thread_lane_resources_manager ().open_default_resources (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  // Set the default Server Protocol Policy.
-  this->set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
   TAO_POA_Policy_Set policies (this->default_poa_policies ());
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -615,6 +601,17 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
+  // If any of the policy objects specified are not valid for the ORB
+  // implementation, if conflicting policy objects are specified, or
+  // if any of the specified policy objects require prior
+  // administrative action that has not been performed, an
+  // InvalidPolicy exception is raised containing the index in the
+  // policies parameter value of the first offending policy object.
+  policies.validate_policies (this->validator (),
+                              this->orb_core_
+                              ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   // Construct a new POA
   TAO_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME);
   this->root_ =
@@ -651,24 +648,6 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Object_Adapter::set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Thread_Lane_Resources &default_lane_resources =
-    this->orb_core_.thread_lane_resources_manager ().default_lane_resources ();
-
-  TAO_Acceptor_Registry &acceptor_registry =
-    default_lane_resources.acceptor_registry ();
-
-  TAO_Protocols_Hooks *protocols_hooks =
-    this->orb_core_.get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  protocols_hooks->set_default_server_protocol_policy (acceptor_registry
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
 TAO_Object_Adapter::close (int wait_for_completion
                            ACE_ENV_ARG_DECL)
 {
@@ -838,41 +817,26 @@ CORBA::Object_ptr
 TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
                                               const TAO_MProfile &mp)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_ServantBase *sb =
-        this->get_collocated_servant (mp
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  TAO_ServantBase *sb = this->get_collocated_servant (mp);
 
-      // Set the servant ORB.  Do not duplicate the ORB here since
-      // TAO_Stub::servant_orb() duplicates it.
-      stub->servant_orb (this->orb_core_.orb ());
+  // Set the servant ORB.  Do not duplicate the ORB here since
+  // TAO_Stub::servant_orb() duplicates it.
+  stub->servant_orb (this->orb_core_.orb ());
 
-      // It is ok to create a collocated object even when <sb> is
-      // zero.
-      CORBA::Object_ptr x;
-      ACE_NEW_RETURN (x,
-                      CORBA::Object (stub,
-                                     1,
-                                     sb),
-                      CORBA::Object::_nil ());
+  // It is ok to create a collocated object even when <sb> is
+  // zero.
+  CORBA::Object_ptr x;
+  ACE_NEW_RETURN (x,
+      CORBA::Object (stub,
+          1,
+          sb),
+      CORBA::Object::_nil ());
 
-      // Here we set the strategized Proxy Broker.
-      x->_proxy_broker (the_tao_collocated_object_proxy_broker ());
+  // Here we set the strategized Proxy Broker.
+  x->_proxy_broker (the_tao_collocated_object_proxy_broker ());
 
-      // Success.
-      return x;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore the exception and continue with the next one.
-    }
-  ACE_ENDTRY;
-
-  // Failure.
-  return CORBA::Object::_nil ();
+  // Success.
+  return x;
 }
 
 CORBA::Long
@@ -881,45 +845,27 @@ TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub,
 {
   // @@ What about forwarding.  With this approach we are never
   //    forwarded  when we use collocation!
-  const TAO_MProfile &mp =
-    stub->base_profiles ();
+  const TAO_MProfile &mp = stub->base_profiles ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      TAO_ServantBase *sb =
-        this->get_collocated_servant (mp
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  TAO_ServantBase *sb = this->get_collocated_servant (mp);
 
-      // Set the servant ORB.  Do not duplicate the ORB here since
-      // TAO_Stub::servant_orb() duplicates it.
-      stub->servant_orb (this->orb_core_.orb ());
+  // Set the servant ORB.  Do not duplicate the ORB here since
+  // TAO_Stub::servant_orb() duplicates it.
+  stub->servant_orb (this->orb_core_.orb ());
 
-      // It is ok to set the object as a collocated object even when
-      // <sb> is zero.
-      obj->set_collocated_servant (sb);
+  // It is ok to set the object as a collocated object even when
+  // <sb> is zero.
+  obj->set_collocated_servant (sb);
 
-      // Here we set the strategized Proxy Broker.
-      obj->_proxy_broker (the_tao_collocated_object_proxy_broker ());
+  // Here we set the strategized Proxy Broker.
+  obj->_proxy_broker (the_tao_collocated_object_proxy_broker ());
 
-     // Success.
-     return 0;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore exceptions..
-    }
-  ACE_ENDTRY;
-
-  // Failure.
-  return -1;
+  // Success.
+  return 0;
 }
 
 TAO_ServantBase *
-TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp
-                                            ACE_ENV_ARG_DECL)
+TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp)
 {
   for (TAO_PHandle j = 0;
        j != mp.profile_count ();
@@ -935,10 +881,18 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp
 
       TAO_ServantBase *servant = 0;
 
-      this->find_servant (objkey.in (),
-                          servant
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ACE_DECLARE_NEW_CORBA_ENV;
+      ACE_TRY
+        {
+          this->find_servant (objkey.in (),
+              servant
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+        }
+      ACE_ENDTRY;
 
       return servant;
     }
@@ -946,67 +900,6 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp
   return 0;
 }
 
-
-// ****************************************************************
-
-TAO_Object_Adapter_Factory::TAO_Object_Adapter_Factory (void)
-{
-}
-
-TAO_Adapter*
-TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
-{
-  return new TAO_Object_Adapter (orb_core->server_factory ()->
-                                    active_object_map_creation_parameters (),
-                                 *orb_core);
-}
-
-int
-TAO_Object_Adapter_Factory::init (int /* argc */,
-                                  ACE_TCHAR* /* argv */ [])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      /// Register the Messaging ORBInitializer.
-      PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      ACE_NEW_THROW_EX (temp_orb_initializer,
-                        TAO_PortableServer_ORBInitializer,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
-
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_orb_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P | %t) Caught exception:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Object_Adapter_Factory)
-ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory,
-                       ACE_TEXT ("TAO_POA"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Object_Adapter_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
 // ****************************************************************
 
 TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void)
@@ -1265,7 +1158,7 @@ TAO_Object_Adapter::Non_Servant_Upcall::Non_Servant_Upcall (TAO_POA &poa)
   // Adjust the nesting level.
   this->object_adapter_.non_servant_upcall_nesting_level_++;
 
-  // Release the Object Adapter lock.
+  // We always release
   this->object_adapter_.lock ().release ();
 }
 
@@ -1274,12 +1167,11 @@ TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void)
   // Reacquire the Object Adapter lock.
   this->object_adapter_.lock ().acquire ();
 
+  this->object_adapter_.non_servant_upcall_nesting_level_--;
+
   // We are done with this nested upcall.
   this->object_adapter_.non_servant_upcall_in_progress_ = this->previous_;
 
-  // Adjust the nesting level.
-  this->object_adapter_.non_servant_upcall_nesting_level_--;
-
   // If we are at the outer nested upcall.
   if (this->object_adapter_.non_servant_upcall_nesting_level_ == 0)
     {
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index a14c04293dc..b6aadc05d8a 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -28,6 +28,7 @@
 #include "Active_Object_Map.h"
 
 #include "tao/Adapter.h"
+#include "tao/Adapter_Factory.h"
 #include "tao/Server_Strategy_Factory.h"
 
 // Local Object
@@ -43,6 +44,8 @@
 // Policy Set
 #include "POA_Policy_Set.h"
 
+#include "Servant_Location.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -52,16 +55,6 @@
 
 // ****************************************************************
 
-enum TAO_SERVANT_LOCATION
-{
-  TAO_SERVANT_FOUND,
-  TAO_DEFAULT_SERVANT,
-  TAO_SERVANT_MANAGER,
-  TAO_SERVANT_NOT_FOUND
-};
-
-// ****************************************************************
-
 // Forward declaration
 class TAO_POA;
 class TAO_POA_Manager;
@@ -377,8 +370,6 @@ protected:
   int unbind_persistent_poa (const poa_name &folded_name,
                              const poa_name &system_name);
 
-  void set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_DECL);
-
   static ACE_Lock *create_lock (int enable_locking,
                                 TAO_SYNCH_MUTEX &thread_lock);
 
@@ -848,8 +839,7 @@ public:
 private:
 
   /// Helper method to get collocated servant
-  TAO_ServantBase *get_collocated_servant (const TAO_MProfile &mp
-                                           ACE_ENV_ARG_DECL);
+  TAO_ServantBase *get_collocated_servant (const TAO_MProfile &mp);
 
 private:
 
@@ -880,25 +870,6 @@ private:
 
 // ****************************************************************
 
-class TAO_PortableServer_Export TAO_Object_Adapter_Factory : public TAO_Adapter_Factory
-{
-public:
-  /// Constructor
-  TAO_Object_Adapter_Factory (void);
-
-  // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
-  // details.
-  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
-
-  virtual int init (int argc,
-                    ACE_TCHAR* argv[]);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_Object_Adapter_Factory)
-ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory)
-
-// ****************************************************************
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 5ee4eb96c18..99a3c4c3118 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -8,8 +8,8 @@ ACE_RCSID (PortableServer,
 // ImplRepo related.
 //
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-# include "tao/PortableServer/ImR_LocatorC.h"
 # include "tao/PortableServer/ImplRepo_i.h"
+# include "tao/PortableServer/ImplRepoC.h"
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 #include "tao/StringSeqC.h"
@@ -48,8 +48,8 @@ ACE_RCSID (PortableServer,
 #endif /* ! __ACE_INLINE__ */
 
 // This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
-// It's an array of octets representing ^t^a^o/0 in octal.
-CORBA::Octet
+// It's an array of constant octets representing ^t^a^o/0 in octal.
+CORBA::Octet const
 TAO_POA::objectkey_prefix [TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
   024, // octal for ^t
   001, // octal for ^a
@@ -386,14 +386,6 @@ TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
   // lead to reference deadlock, i.e., POA holds object A, but POA
   // cannot die because object A hold POA.
   {
-    // A recursive thread lock without using a recursive thread lock.
-    // Non_Servant_Upcall has a magic constructor and destructor.  We
-    // unlock the Object_Adapter lock for the duration of the servant
-    // activator upcalls; reacquiring once the upcalls complete.  Even
-    // though we are releasing the lock, other threads will not be
-    // able to make progress since
-    // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-
     //
     // If new things are added to this cleanup code, make sure to move
     // the minimum CORBA #define after the declaration of
@@ -402,6 +394,14 @@ TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
+    // A recursive thread lock without using a recursive thread lock.
+    // Non_Servant_Upcall has a magic constructor and destructor.  We
+    // unlock the Object_Adapter lock for the duration of the servant
+    // activator upcalls; reacquiring once the upcalls complete.  Even
+    // though we are releasing the lock, other threads will not be
+    // able to make progress since
+    // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
+
     TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
     ACE_UNUSED_ARG (non_servant_upcall);
 
@@ -417,17 +417,6 @@ TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
 
   }
 
-  if (this->ort_adapter_ != 0)
-  {
-    TAO::ORT_Adapter_Factory *ort_factory =
-      this->ORT_adapter_factory ();
-
-    ort_factory->destroy (this->ort_adapter_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->ort_adapter_ = 0;
-  }
-
   CORBA::release (this);
 }
 
@@ -617,16 +606,6 @@ TAO_POA::find_POA (const char *adapter_name,
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  // A recursive thread lock without using a recursive thread lock.
-  // Non_Servant_Upcall has a magic constructor and destructor.  We
-  // unlock the Object_Adapter lock for the duration of the servant
-  // activator upcalls; reacquiring once the upcalls complete.  Even
-  // though we are releasing the lock, other threads will not be able
-  // to make progress since
-  // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-  TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-  ACE_UNUSED_ARG (non_servant_upcall);
-
   TAO_POA *poa = this->find_POA_i (adapter_name,
                                    activate_it
                                    ACE_ENV_ARG_PARAMETER);
@@ -658,6 +637,18 @@ TAO_POA::find_POA_i (const ACE_CString &child_name,
               this->check_poa_manager_state (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK_RETURN (0);
 
+              // A recursive thread lock without using a recursive
+              // thread lock. Non_Servant_Upcall has a magic
+              // constructor and destructor.  We unlock the
+              // Object_Adapter lock for the duration of the servant
+              // activator upcalls; reacquiring once the upcalls
+              // complete.  Even though we are releasing the lock,
+              // other threads will not be able to make progress since
+              // <Object_Adapter::non_servant_upcall_in_progress_> has
+              // been set.
+              TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
+              ACE_UNUSED_ARG (non_servant_upcall);
+
               CORBA::Boolean success =
                 this->adapter_activator_->unknown_adapter (this,
                                                            child_name.c_str ()
@@ -733,43 +724,49 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
         }
     }
 
-  TAO::ORT_Array array_obj_ref_template;
+  TAO::ORT_Array array_obj_ref_template (1);
 
   CORBA::ULong i = 0;
 
   // Gather all ObjectReferenceTemplates and change all adapter states
-  // to inactivate
+  // to INACTIVE.
   for (CHILDREN::iterator iterator = this->children_.begin ();
        iterator != this->children_.end ();
        ++iterator)
     {
-      TAO_POA *child_poa = (*iterator).int_id_;
+      TAO_POA * const child_poa = (*iterator).int_id_;
 
-      // Get the adapter template related to the ChildPOA
-      PortableInterceptor::ObjectReferenceTemplate *child_at =
-        child_poa->get_adapter_template_i ();
+      TAO::ORT_Adapter * const adapter = child_poa->ORT_adapter_i ();
 
-      // In case no ORT library is linked we get zero
-      if (child_at != 0)
+      // In case no ORT library is linked we get zero.
+      if (adapter != 0)
         {
+          // Get the ObjectReferenceTemplate for the child POA.
+          PortableInterceptor::ObjectReferenceTemplate * const ort =
+            adapter->get_adapter_template ();
+
           // Add it to the sequence of object reference templates that
           // will be destroyed.
-          array_obj_ref_template.size (i + 1);
+          array_obj_ref_template.size (1);
 
-          array_obj_ref_template[i] = child_at;
+          array_obj_ref_template[0] = ort;
         }
 
       child_poa->adapter_state_ =
         PortableInterceptor::INACTIVE;
 
+      // Notify the state changes to the IORInterceptors
+      this->adapter_state_changed (array_obj_ref_template,
+                                   PortableInterceptor::INACTIVE
+                                   ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      if (adapter != 0)
+        adapter->release (array_obj_ref_template[0]);
+
       ++i;
     }
 
-  // Notify the state changes to the IORInterceptors
-  this->adapter_state_changed (array_obj_ref_template,
-                               PortableInterceptor::INACTIVE
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   // Destroy all child POA's now.
   for (CHILDREN::iterator destroy_iterator = this->children_.begin ();
@@ -842,17 +839,21 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
     {
       TAO::ORT_Array my_array_obj_ref_template;
 
-      // Get the adapter template
-      PortableInterceptor::ObjectReferenceTemplate *adapter =
-        this->get_adapter_template_i ();
+      TAO::ORT_Adapter * const ort_adapter =
+        this->ORT_adapter_i ();
 
-      if (adapter != 0)
+      // In case no ORT library is linked we get zero.
+      if (ort_adapter != 0)
         {
-          // Add it to the sequence of object reference templates, we just notify
-          // for ourselves that we are now non_existent, our childs will do it
-          // for themselves.
-          array_obj_ref_template.size (1);
-          array_obj_ref_template[0] = adapter;
+          // Get the ObjectReferenceTemplate.
+          PortableInterceptor::ObjectReferenceTemplate * const ort =
+            ort_adapter->get_adapter_template ();
+
+          // Add it to the sequence of object reference templates, we
+          // just notify for ourselves that we are now non_existent,
+          // our childs will do it for themselves.
+          my_array_obj_ref_template.size (1);
+          my_array_obj_ref_template[0] = ort;
         }
 
       // According to the ORT spec, after a POA is destroyed, its state
@@ -868,10 +869,24 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
       this->adapter_state_ = PortableInterceptor::NON_EXISTENT;
 
-      this->adapter_state_changed (array_obj_ref_template,
+      this->adapter_state_changed (my_array_obj_ref_template,
                                    this->adapter_state_
                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
+
+      if (ort_adapter != 0)
+        {
+          ort_adapter->release (my_array_obj_ref_template[0]);
+
+          TAO::ORT_Adapter_Factory *ort_factory =
+            this->ORT_adapter_factory ();
+
+          ort_factory->destroy (ort_adapter
+                                ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          this->ort_adapter_ = 0;
+        }
     }
   else
     {
@@ -2504,13 +2519,11 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference
 
       return user_id._retn ();
     }
-  else
-    {
-      // Otherwise, it is the NON_RETAIN policy.  Therefore, the
-      // system id is the id (and no conversion/transformation is
-      // needed).
-      return new PortableServer::ObjectId (system_id);
-    }
+
+  // Otherwise, it is the NON_RETAIN policy.  Therefore, the
+  // system id is the id (and no conversion/transformation is
+  // needed).
+  return new PortableServer::ObjectId (system_id);
 }
 
 PortableServer::Servant
@@ -3945,6 +3958,25 @@ TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
   if (CORBA::is_nil (imr.in ()))
       return;
 
+  ImplementationRepository::Administration_var imr_locator;
+  {
+        // A recursive thread lock without using a recursive thread lock.
+        // Non_Servant_Upcall has a magic constructor and destructor.  We
+        // unlock the Object_Adapter lock for the duration of the servant
+        // activator upcalls; reacquiring once the upcalls complete.  Even
+        // though we are releasing the lock, other threads will not be able
+        // to make progress since
+        // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
+        TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
+        ACE_UNUSED_ARG (non_servant_upcall);
+
+        imr_locator = ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+  }
+
+  if (CORBA::is_nil(imr_locator.in ()))
+      return;
+
   TAO_POA *root_poa = this->object_adapter ().root_poa ();
   ACE_NEW_THROW_EX (this->server_object_,
                     ServerObject_i (this->orb_core_.orb (),
@@ -3979,7 +4011,7 @@ TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
 
   if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ())
     {
-      ACE_ERROR ((LM_ERROR, "Invalid ServerObject, bailing out.\n"));
+      ACE_ERROR ((LM_ERROR, "Invalid ImR ServerObject, bailing out.\n"));
       return;
     }
 
@@ -3998,37 +4030,29 @@ TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_CString partial_ior(ior.in (), (pos - ior.in()) + 1);
 
-  ImplementationRepository::Locator_var imr_locator =
-    ImplementationRepository::Locator::_narrow (imr.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil(imr_locator.in ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "Couldnt narrow down the ImR interface\n"));
-      return;
-    }
-
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "Informing IMR that we are running at: %s\n",
                 ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str())));
 
-  char host_name[MAXHOSTNAMELEN + 1];
-  ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
-
   ACE_TRY
     {
-      // Relies on the fact that host_name will be same for the activator
-      // We must pass this separately, because it is NOT possible to parse
-      // the hostname from the ior portably. On some platforms the hostname
-      // will be like 'foo.bar.com' and on others it will just be 'foo'
-      imr_locator->server_is_running_in_activator (this->name().c_str (),
-                                      host_name,
+      // A recursive thread lock without using a recursive thread lock.
+      // Non_Servant_Upcall has a magic constructor and destructor.  We
+      // unlock the Object_Adapter lock for the duration of the servant
+      // activator upcalls; reacquiring once the upcalls complete.  Even
+      // though we are releasing the lock, other threads will not be able
+      // to make progress since
+      // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
+      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
+
+      imr_locator->server_is_running (this->name().c_str (),
                                       partial_ior.c_str(),
                                       svr.in()
                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
+
+      ACE_UNUSED_ARG (non_servant_upcall);
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
@@ -4052,35 +4076,43 @@ TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_POA::imr_notify_shutdown (void)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Notifing IMR of Shutdown\n"));
-
-  char host_name[MAXHOSTNAMELEN + 1];
-  ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
-
   // Notify the Implementation Repository about shutting down.
+
   CORBA::Object_var imr = this->orb_core ().implrepo_service ();
 
-  // Check to see if there was an imr returned.  If none, return ourselves.
+  // Check to see if there was an imr returned.  If none, return
+  // ourselves.
   if (CORBA::is_nil (imr.in ()))
     return;
 
   ACE_TRY_NEW_ENV
     {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "Notifing IMR of Shutdown server:%s\n", this->the_name()));
+
+      // A recursive thread lock without using a recursive thread lock.
+      // Non_Servant_Upcall has a magic constructor and destructor.  We
+      // unlock the Object_Adapter lock for the duration of the servant
+      // activator upcalls; reacquiring once the upcalls complete.  Even
+      // though we are releasing the lock, other threads will not be able
+      // to make progress since
+      // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
+      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
+      ACE_UNUSED_ARG (non_servant_upcall);
+
       // Get the IMR's administrative object and call shutting_down on it
-      ImplementationRepository::Locator_var imr_locator =
-        ImplementationRepository::Locator::_narrow (imr.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+      ImplementationRepository::Administration_var imr_locator =
+        ImplementationRepository::Administration::_narrow (imr.in ()
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      imr_locator->server_is_shutting_down_in_activator (this->the_name (),
-                                                         host_name
+      imr_locator->server_is_shutting_down (this->the_name ()
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "POA::imr_notify_shutdown()");
       // Ignore exceptions
     }
   ACE_ENDTRY;
@@ -4121,7 +4153,7 @@ TAO_POA::ORT_adapter_i (void)
           ort_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (!ort_adapter_)
+      if (!this->ort_adapter_)
         return 0;
 
       // @todo We have to look at this, we activate it but hold the POA lock,
@@ -4230,7 +4262,9 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref
       PortableServer::NotAGroupObject
     ))
 {
-  TAO_POA_PortableGroup_Hooks *hooks = this->orb_core_.portable_group_poa_hooks ();
+  TAO_POA_PortableGroup_Hooks * hooks =
+    this->orb_core_.portable_group_poa_hooks ();
+
   if (hooks == 0)
     {
       ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 6de036d8770..98624282bef 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  Header file for CORBA's ORB type.
+ *  Header file for CORBA Portable Object Adapter (POA) related
+ *  types.
  *
  *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
  */
@@ -490,7 +491,7 @@ public:
     TAO_OBJECTKEY_PREFIX_SIZE = 4
   };
 
-  static CORBA::Octet objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE];
+  static CORBA::Octet const objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE];
 
   const TAO_Object_Adapter::poa_name &folded_name (void) const;
 
@@ -850,6 +851,7 @@ protected:
   static TAO_POA_Policy_Set &default_poa_policies (void);
 
 protected:
+
   /// Accessor methods to ObjectReferenceTemplate
   PortableInterceptor::ObjectReferenceTemplate *
     get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
@@ -868,7 +870,6 @@ protected:
     PortableInterceptor::ObjectReferenceFactory *current_factory
     ACE_ENV_ARG_DECL);
 
-
   TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant &servant
                                          ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/PortableServer/POA_Policies.cpp b/TAO/tao/PortableServer/POA_Policies.cpp
index 4c521d2984e..b9517b4d302 100644
--- a/TAO/tao/PortableServer/POA_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Policies.cpp
@@ -4,10 +4,6 @@
 
 #include "tao/ORB_Constants.h"
 
-#if !defined (__ACE_INLINE__)
-# include "POA_Policies.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID(PortableServer, POA_Policies, "$Id$")
 
 
diff --git a/TAO/tao/PortableServer/POA_Policies.h b/TAO/tao/PortableServer/POA_Policies.h
index 5173642bf78..38d79f8d9bd 100644
--- a/TAO/tao/PortableServer/POA_Policies.h
+++ b/TAO/tao/PortableServer/POA_Policies.h
@@ -284,9 +284,5 @@ protected:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__ACE_INLINE__)
-# include "POA_Policies.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_POA_POLICIES_H */
diff --git a/TAO/tao/PortableServer/POA_Policies.i b/TAO/tao/PortableServer/POA_Policies.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/tao/PortableServer/POA_Policies.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index 6c840f56e73..cdc2c6267c3 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -10,7 +10,11 @@
 # include "POA_Policy_Set.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (PortableServer, POA, "$Id$")
+
+ACE_RCSID (PortableServer,
+           POA_Policy_Set,
+           "$Id$")
+
 
 TAO_POA_Policy_Set::TAO_POA_Policy_Set ()
   :
@@ -60,7 +64,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
 {
   // Just give a last chance for all the unloaded validators in other
   // libraries to be registered
-  orb_core.load_policy_validators (validator);
+  orb_core.load_policy_validators (validator ACE_ENV_ARG_PARAMETER);
 
   // Validate that all of the specified policies make sense.
   validator.validate (this->impl_  ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index 8aff0c8a11b..29bd33efd65 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -51,7 +51,8 @@ public:
   CORBA::ULong num_policies (void) const;
 
   /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL);
 
   void merge_policies (const CORBA::PolicyList &policies
                        ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i
index b0a9ec35c10..e62bf36a1d3 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.i
+++ b/TAO/tao/PortableServer/POA_Policy_Set.i
@@ -13,9 +13,11 @@ TAO_POA_Policy_Set::get_policy_by_index (CORBA::ULong index)
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type)
+TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL)
 {
-  return this->impl_.get_cached_policy (type);
+  return this->impl_.get_cached_policy (type
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
index 1bc94beb745..01dfaa34975 100644
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ b/TAO/tao/PortableServer/PolicyS_T.cpp
@@ -25,8 +25,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from
-// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:720
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:683
 
 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
 #define _TAO_IDL_ORIG_POLICYS_T_CPP_
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index dceb6d07e98..07d9445660a 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:581
+// be\be_codegen.cpp:546
 
 #ifndef _TAO_IDL_ORIG_POLICYS_T_H_
 #define _TAO_IDL_ORIG_POLICYS_T_H_
@@ -34,23 +34,20 @@
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
-// TAO_IDL - Generated from
-// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
-
+  // be\be_visitor_interface/tie_sh.cpp:87
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  Policy_tie : public Policy
@@ -70,7 +67,7 @@ namespace POA_CORBA
     // ctor with T*, ownership flag and a POA
     ~Policy_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -82,56 +79,55 @@ namespace POA_CORBA
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
-
+    // be\be_visitor_operation/tie_sh.cpp:60
+    
     CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
-
+    // be\be_visitor_operation/tie_sh.cpp:60
+    
     ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
-
+    // be\be_visitor_operation/tie_sh.cpp:60
+    
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+  
   private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     Policy_tie (const Policy_tie &);
     void operator= (const Policy_tie &);
   };
 } // module CORBA
-#endif /* ACE_HAS_USING_KEYWORD */
 
-// TAO_IDL - Generated from
-// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1193
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:1094
 
 #if defined (__ACE_INLINE__)
 #include "PolicyS_T.inl"
@@ -145,9 +141,10 @@ namespace POA_CORBA
 #pragma implementation ("PolicyS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl
index 0305db45663..42c4ad90eac 100644
--- a/TAO/tao/PortableServer/PolicyS_T.inl
+++ b/TAO/tao/PortableServer/PolicyS_T.inl
@@ -27,9 +27,7 @@
 
 
 // TAO_IDL - Generated from
-// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
-
-#if defined (ACE_HAS_USING_KEYWORD)
+// be\be_visitor_interface/tie_si.cpp:96
 
 template <class T> ACE_INLINE
 POA_CORBA::Policy_tie<T>::Policy_tie (T &t)
@@ -122,7 +120,7 @@ POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from 
-// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+// be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
@@ -138,7 +136,7 @@ CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
 }
 
 // TAO_IDL - Generated from 
-// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+// be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
@@ -154,7 +152,7 @@ template <class T> ACE_INLINE
 }
 
 // TAO_IDL - Generated from 
-// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+// be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_CORBA::Policy_tie<T>::destroy  (
@@ -169,5 +167,3 @@ void POA_CORBA::Policy_tie<T>::destroy  (
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
index 0b7c8bd99d8..6e5786aea12 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -13,6 +13,7 @@
 
 #include "PortableServer.h"
 #include "Object_Adapter.h"
+#include "Object_Adapter_Factory.h"
 
 ACE_RCSID (PortableServer,
            PortableServer,
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index cc94da26878..448ef21aa35 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableServerC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 0c80f145555..4cb8946e355 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "Servant_Base.h"
-#include "POA.h"
-#include "Operation_Table.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Operation_Table.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Core.h"
@@ -139,13 +139,6 @@ TAO_ServantBase::_find (const char *opname,
   return this->optable_->find (opname, skelfunc, st, length);
 }
 
-/*int
-TAO_ServantBase::_bind (const char *opname,
-                        const TAO_Skeleton skel_ptr)
-{
-  return this->optable_->bind (opname, skel_ptr);
-}
-*/
 TAO_Stub *
 TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
 {
@@ -337,8 +330,8 @@ TAO_RefCountServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     delete this;
 }
 
-long
-TAO_RefCountServantBase::_ref_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+CORBA::ULong
+TAO_RefCountServantBase::_refcount_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
 {
   return this->ref_count_.value ();
 }
@@ -512,10 +505,3 @@ TAO_ServantBase_var::_retn (void)
   return retval;
 }
 
-void
-TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &,
-                                  void *
-                                  ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 607ee1b389f..fd5e912b736 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -56,7 +56,7 @@ public:
   virtual CORBA::Boolean _is_a (const char *logical_type_id
                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  /// Default <_non_existent>: always returns false.
+  /// Default _non_existent: always returns false.
   virtual CORBA::Boolean _non_existent (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
@@ -66,7 +66,7 @@ public:
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
-  /// Default <_get_component>: always returns CORBA::Object::_nil().
+  /// Default _get_component: always returns CORBA::Object::_nil().
   virtual CORBA::Object_ptr _get_component (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
@@ -82,7 +82,7 @@ public:
    * type to the most derived type, demarshall all the parameters from
    * the request and finally invokes the operation, storing the
    * results and out parameters (if any) or the exceptions thrown into
-   * <request>.
+   * @a request.
    */
   virtual void _dispatch (TAO_ServerRequest &request,
                           void *servant_upcall
@@ -99,12 +99,11 @@ public:
                      TAO::Collocation_Strategy st,
                      const unsigned int length = 0);
 
+protected:
 
   /// Get this interface's repository id (TAO specific).
   virtual const char *_interface_repository_id (void) const = 0;
 
-protected:
-
   /// Default constructor, only derived classes can be created.
   TAO_ServantBase (TAO_Operation_Table * optable = 0);
 
@@ -114,7 +113,6 @@ protected:
   /// Assignment operator.
   TAO_ServantBase &operator= (const TAO_ServantBase &);
 
-
   virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
                                             void *servant_upcall,
                                             void *derived_this
@@ -125,13 +123,6 @@ protected:
                                              void *derived_this
                                              ACE_ENV_ARG_DECL);
 
-
-  /// Register a CORBA IDL operation name.
-  /*
-    virtual int _bind (const char *opname,
-                       const TAO_Skeleton skel_ptr);
-  */
-
 protected:
 
   /// The operation table for this servant.  It is initialized by the
@@ -186,10 +177,9 @@ public:
   virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
 
   /**
-   * Returns the current reference count value.  This method is
-   * non-standard and is only here to simplify debugging.
+   * Returns the current reference count value.
    */
-  virtual long _ref_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  virtual CORBA::ULong _refcount_value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
 protected:
 
@@ -207,7 +197,14 @@ protected:
 private:
 
   /// Reference counter.
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> ref_count_;
+  ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> ref_count_;
+};
+
+class TAO_PortableServer_Export TAO_Servant_Hash
+{
+public:
+  /// Returns hash value.
+  u_long operator () (PortableServer::Servant servant) const;
 };
 
 /**
@@ -222,7 +219,6 @@ private:
  */
 class TAO_PortableServer_Export TAO_ServantBase_var
 {
-
 public:
   TAO_ServantBase_var (void);
 
@@ -251,39 +247,6 @@ private:
   TAO_ServantBase *ptr_;
 };
 
-class TAO_PortableServer_Export TAO_Servant_Hash
-{
-public:
-  /// Returns hash value.
-  u_long operator () (PortableServer::Servant servant) const;
-};
-
-/**
- * @class TAO_Local_ServantBase
- *
- * @brief Base class for local servants.
- *
- * This servant does not register with the POA and does not
- * produce a valid stub, i.e., object references of this servant
- * cannot be exported.  The (collocated) stubs of these servants
- * will always be direct, i.e., call directly to the servant and
- * don't call through the POA since this servant is not
- * registered with the POA.
- */
-class TAO_PortableServer_Export TAO_Local_ServantBase
-  : public virtual TAO_ServantBase
-{
-protected:
-  /// This is an auxiliar method for _this().  Make sure *not* to
-  /// register with the default POA.
-  TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  /// Throws CORBA::BAD_OPERATION exception.
-  void _dispatch (TAO_ServerRequest &request,
-                  void *servant_upcall
-                  ACE_ENV_ARG_DECL);
-};
-
 #if defined (__ACE_INLINE__)
 # include "Servant_Base.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i
index 9283d6c56e6..b48403a8e3c 100644
--- a/TAO/tao/PortableServer/Servant_Base.i
+++ b/TAO/tao/PortableServer/Servant_Base.i
@@ -7,32 +7,3 @@ TAO_Servant_Hash::operator () (PortableServer::Servant servant) const
 {
   return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (servant));
 }
-
-ACE_INLINE TAO_Stub *
-TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
-{
-#if 0
-  PortableServer::ObjectId_var invalid_oid =
-    PortableServer::string_to_ObjectId ("invalid");
-
-  TAO::ObjectKey tmp_key (invalid_oid->length (),
-                          invalid_oid->length (),
-                          invalid_oid->get_buffer (),
-                          0);
-
-  // It is ok to use TAO_ORB_Core_instance here since the locality
-  // constrained servant does not really register with a POA or get
-  // exported remotely.
-  //
-  // The correct thing to do is to probably use ORB of the default
-  // POA. The unfortunate part is that calling default_POA() requires
-  // the creation of a local stub, hence causing a infinite loop.
-  return
-    TAO_ORB_Core_instance ()->orb ()->create_stub_object (
-      tmp_key,
-      this->_interface_repository_id ()
-      ACE_ENV_ARG_PARAMETER);
-#else
-  return 0;
-#endif
-}
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 8d0280f1a96..1daa1beab44 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -9,6 +9,7 @@
 #include "tao/Client_Strategy_Factory.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
+#include "tao/PolicyC.h"
 
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
@@ -30,9 +31,9 @@ TAO_Profile::TAO_Profile (CORBA::ULong tag,
                           const TAO::ObjectKey &obj_key,
                           const TAO_GIOP_Message_Version &version)
   : version_ (version)
-    , are_policies_parsed_ (0)
     , stub_ (0)
     , policy_list_ (0)
+    , are_policies_parsed_ (false)
     , addressing_mode_ (0)
     , tagged_profile_ (0)
     , ref_object_key_ (0)
@@ -54,9 +55,9 @@ TAO_Profile::TAO_Profile (CORBA::ULong tag,
                           TAO_ORB_Core *orb_core,
                           const TAO_GIOP_Message_Version &version)
   : version_ (version)
-    , are_policies_parsed_ (0)
     , stub_ (0)
     , policy_list_ (0)
+    , are_policies_parsed_ (false)
     , addressing_mode_ (0)
     , tagged_profile_ (0)
     , ref_object_key_ (0)
@@ -288,7 +289,7 @@ TAO_Profile::create_tagged_profile (void)
       this->create_profile_body (encap);
 
       CORBA::ULong length =
-        ACE_static_cast(CORBA::ULong,encap.total_length ());
+        static_cast <CORBA::ULong> (encap.total_length ());
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       // Place the message block in to the Sequence of Octets that we
@@ -380,8 +381,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
       (*policy_list)[i]->_tao_encode (out_CDR);
 
       length = out_CDR.total_length ();
-      policy_value_seq[i].pvalue.length (ACE_static_cast (CORBA::ULong,
-                                                          length));
+      policy_value_seq[i].pvalue.length (static_cast <CORBA::ULong>(length));
 
       buf = policy_value_seq[i].pvalue.get_buffer ();
 
@@ -408,8 +408,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
 
   length = out_cdr.total_length ();
 
-  tagged_component.component_data.length (ACE_static_cast (CORBA::ULong,
-                                                           length));
+  tagged_component.component_data.length (static_cast <CORBA::ULong>(length));
   buf = tagged_component.component_data.get_buffer ();
 
   for (const ACE_Message_Block *iterator = out_cdr.begin ();
@@ -456,7 +455,7 @@ TAO_Profile::policies (ACE_ENV_SINGLE_ARG_DECL)
           const CORBA::Octet *buf =
             tagged_component.component_data.get_buffer ();
 
-          TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char *, buf),
+          TAO_InputCDR in_cdr (reinterpret_cast <const char *> (buf),
                                tagged_component.component_data.length ());
 
           // Extract the Byte Order
@@ -467,7 +466,7 @@ TAO_Profile::policies (ACE_ENV_SINGLE_ARG_DECL)
               return *(stub_->base_profiles ().policy_list_);
             }
 
-          in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
+          in_cdr.reset_byte_order (static_cast <int> (byte_order));
 
           // Now we take out the Messaging::PolicyValueSeq out from the
           // CDR.
@@ -503,15 +502,14 @@ TAO_Profile::policies (ACE_ENV_SINGLE_ARG_DECL)
                       buf = policy_value_seq[i].pvalue.get_buffer ();
 
                       TAO_InputCDR in_cdr (
-                        ACE_reinterpret_cast (const char*, buf),
+                        reinterpret_cast <const char*>  (buf),
                         policy_value_seq[i].pvalue.length ());
 
 
                       if (!(in_cdr >> ACE_InputCDR::to_boolean (byte_order)))
                         ACE_TRY_THROW (CORBA::INV_OBJREF ());
 
-                      in_cdr.reset_byte_order (ACE_static_cast (int,
-                                                                byte_order));
+                      in_cdr.reset_byte_order (static_cast <int> (byte_order));
 
                       policy->_tao_decode (in_cdr);
                       (*pl)[i] = policy._retn ();
@@ -844,7 +842,7 @@ CORBA::Boolean
 TAO_Unknown_Profile::do_is_equivalent (const TAO_Profile* other_profile)
 {
   const TAO_Unknown_Profile * op =
-    ACE_dynamic_cast (const TAO_Unknown_Profile *, other_profile);
+    dynamic_cast <const TAO_Unknown_Profile *> (other_profile);
 
   return (CORBA::Boolean) (op == 0 ? 0 : this->body_ == op->body_);
 }
@@ -862,8 +860,8 @@ CORBA::ULong
 TAO_Unknown_Profile::hash (CORBA::ULong max
                            ACE_ENV_ARG_DECL_NOT_USED)
 {
-  return (ACE::hash_pjw (ACE_reinterpret_cast (const char*,
-                                               this->body_.get_buffer ()),
+  return (ACE::hash_pjw (reinterpret_cast <const char*>
+                                          (this->body_.get_buffer ()),
                          this->body_.length ()) % max);
 }
 
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 4a2e5227c05..de87556f881 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -215,7 +215,7 @@ public:
 
   /// Verify profile equivalance.
   /**
-   * Two profiles are equivalent @e iff their tag, object_key, version
+   * Two profiles are equivalent if their tag, object_key, version
    * and all endpoints are the same.
    *
    * @see do_is_equivalent_i()
@@ -239,7 +239,7 @@ protected:
   /// Decode the protocol specific profile details.
   virtual int decode_profile (TAO_InputCDR &cdr) = 0;
 
-  /// Creates an encapsulation of the ProfileBody struct in the <cdr>
+  /// Creates an encapsulation of the ProfileBody struct in the @a cdr
   virtual void create_profile_body (TAO_OutputCDR &cdr) const = 0;
 
   /**
@@ -285,7 +285,7 @@ protected:
 
 private:
 
-  /// this object keeps ownership of this object
+  /// This object keeps ownership of this object
   TAO_MProfile *forward_to_i (void);
 
   /// Verify that the current ORB's configuration supports tagged
@@ -308,10 +308,6 @@ protected:
   /// The tagged components
   TAO_Tagged_Components tagged_components_;
 
-  /// Flag indicating whether the lazy decoding of the client exposed
-  /// policies has taken place.
-  CORBA::Boolean are_policies_parsed_;
-
   /// Pointer to the TAO_Stub to which this profile is related.
   TAO_Stub *stub_;
 
@@ -324,6 +320,10 @@ protected:
   // PolicyList object. The life cycle of this object is managed
   // by the TAO_MProfile class.
 
+  /// Flag indicating whether the lazy decoding of the client exposed
+  /// policies has taken place.
+  CORBA::Boolean are_policies_parsed_;
+
   /// The current addressing mode.
   /// This may be changed if a remote server sends back an address mode
   /// exception.
@@ -342,7 +342,7 @@ private:
   /// Pointer to the ORB core
   TAO_ORB_Core *orb_core_;
 
-  /// the TAO_MProfile which contains the profiles for the forwarded
+  /// The TAO_MProfile which contains the profiles for the forwarded
   /// object.
   TAO_MProfile* forward_to_;
 
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 2dadf94bb98..131e85d8904 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -153,9 +153,6 @@ namespace TAO
     /// The profile that has been selected for this invocation.
     TAO_Profile *profile_;
 
-    /// Has the transport been idle?
-    mutable bool is_released_;
-
     /// List of inconsistent policies
     /**
      * If current effective policies cause the invocation to raise
@@ -176,8 +173,11 @@ namespace TAO
      */
     CORBA::PolicyList *inconsistent_policies_;
 
+    /// Has the transport been idle?
+    mutable bool is_released_;
+
     /// Should we block while trying to make a connection
-    const bool blocked_;
+    bool const blocked_;
   };
 } // TAO namespace end
 
diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl
index 69b8c78e9e7..250eceb9889 100644
--- a/TAO/tao/Profile_Transport_Resolver.inl
+++ b/TAO/tao/Profile_Transport_Resolver.inl
@@ -3,16 +3,16 @@
 namespace TAO
 {
   ACE_INLINE
-  Profile_Transport_Resolver::
-      Profile_Transport_Resolver (CORBA::Object *p,
-                                  TAO_Stub *stub,
-                                  bool block)
+  Profile_Transport_Resolver::Profile_Transport_Resolver (
+    CORBA::Object *p,
+    TAO_Stub *stub,
+    bool block)
     : obj_ (p)
       , stub_ (stub)
       , transport_ (0)
       , profile_ (0)
-      , is_released_ (false)
       , inconsistent_policies_ (0)
+      , is_released_ (false)
       , blocked_ (block)
   {
   }
diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp
index 16020c118d0..fe6aee07028 100644
--- a/TAO/tao/Protocols_Hooks.cpp
+++ b/TAO/tao/Protocols_Hooks.cpp
@@ -7,6 +7,49 @@ ACE_RCSID (tao,
            Protocols_Hooks, 
            "$Id$")
 
+TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void)
+  : send_buffer_size_ (0),
+    recv_buffer_size_ (0),
+    keep_alive_ (0),
+    dont_route_ (0),
+    no_delay_ (0),
+    enable_network_priority_ (0)
+{
+}
+  
+TAO_UIOP_Protocol_Properties::TAO_UIOP_Protocol_Properties (void)
+  : send_buffer_size_ (0),
+    recv_buffer_size_ (0)
+{
+}
+  
+TAO_SHMIOP_Protocol_Properties::TAO_SHMIOP_Protocol_Properties (void)
+  : send_buffer_size_ (0),
+    recv_buffer_size_ (0),
+    keep_alive_ (0),
+    dont_route_ (0),
+    no_delay_ (0),
+    preallocate_buffer_size_ (0),
+    mmap_filename_ (),
+    mmap_lockname_ ()
+{
+}
+  
+TAO_DIOP_Protocol_Properties::TAO_DIOP_Protocol_Properties (void)
+  : enable_network_priority_ (0)
+{
+}
+  
+TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties (void)
+  : send_buffer_size_ (0),
+    recv_buffer_size_ (0),
+    keep_alive_ (0),
+    dont_route_ (0),
+    no_delay_ (0),
+    enable_network_priority_ (0)
+{
+}
+  
 /// destructor
 TAO_Protocols_Hooks::~TAO_Protocols_Hooks (void)
 {
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index d6a325df4da..775abbde250 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -24,6 +24,8 @@
 
 #include "TAO_Export.h"
 #include "Basic_Types.h"
+#include "IOP_IORC.h"
+#include "ace/SString.h"
 
 namespace CORBA
 {
@@ -40,6 +42,69 @@ class TAO_Connection_Handler;
 class TAO_Transport;
 class TAO_Stub;
 
+class TAO_Export TAO_IIOP_Protocol_Properties
+{
+public:
+
+  TAO_IIOP_Protocol_Properties (void);
+
+  CORBA::Long send_buffer_size_;
+  CORBA::Long recv_buffer_size_;
+  int keep_alive_;
+  int dont_route_;
+  int no_delay_;
+  CORBA::Boolean enable_network_priority_;
+};
+
+class TAO_Export TAO_UIOP_Protocol_Properties
+{
+public:
+
+  TAO_UIOP_Protocol_Properties (void);
+
+  CORBA::Long send_buffer_size_;
+  CORBA::Long recv_buffer_size_;
+};
+
+class TAO_Export TAO_SHMIOP_Protocol_Properties
+{
+public:
+
+  TAO_SHMIOP_Protocol_Properties (void);
+
+  CORBA::Long send_buffer_size_;
+  CORBA::Long recv_buffer_size_;
+  int keep_alive_;
+  int dont_route_;
+  int no_delay_;
+  CORBA::Long preallocate_buffer_size_;
+  ACE_CString mmap_filename_;
+  ACE_CString mmap_lockname_;
+};
+
+class TAO_Export TAO_DIOP_Protocol_Properties
+{
+public:
+
+  TAO_DIOP_Protocol_Properties (void);
+
+  CORBA::Boolean enable_network_priority_;
+};
+
+class TAO_Export TAO_SCIOP_Protocol_Properties
+{
+public:
+
+  TAO_SCIOP_Protocol_Properties (void);
+
+  CORBA::Long send_buffer_size_;
+  CORBA::Long recv_buffer_size_;
+  int keep_alive_;
+  int dont_route_;
+  int no_delay_;
+  CORBA::Boolean enable_network_priority_;
+};
+
 class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object
 {
 public:
@@ -50,29 +115,43 @@ public:
   virtual void init_hooks (TAO_ORB_Core *orb_core
                            ACE_ENV_ARG_DECL) = 0;
 
-  virtual int call_client_protocols_hook (int &send_buffer_size,
-                                          int &recv_buffer_size,
-                                          int &no_delay,
-                                          int &enable_network_priority,
-                                          const char *protocol_type) = 0;
+  virtual CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
+                                                      TAO_Stub *stub
+                                                      ACE_ENV_ARG_DECL) = 0;
+
+  virtual CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
+                                                      CORBA::Policy *policy
+                                                      ACE_ENV_ARG_DECL) = 0;
 
-  virtual int call_server_protocols_hook (int &send_buffer_size,
-                                          int &recv_buffer_size,
-                                          int &no_delay,
-                                          int &enable_network_priority,
-                                          const char *protocol_type) = 0;
+  virtual void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
 
-  virtual int update_client_protocol_properties (
-    TAO_Stub *stub,
-    TAO_Transport *t,
-    const char *protocol_type) = 0;
+  virtual void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
 
+  virtual void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
 
-  virtual int update_server_protocol_properties (
-    CORBA::Policy *policy,
-    TAO_Transport *t,
-    const char *protocol_type) = 0;
+  virtual void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
 
+  virtual void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
+
+  virtual void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
+
+  virtual void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
+
+  virtual void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
+
+  virtual void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
+
+  virtual void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
+                                                        ACE_ENV_ARG_DECL) = 0;
 
   virtual CORBA::Long get_dscp_codepoint (void) = 0;
 
@@ -106,34 +185,23 @@ public:
    */
   //@{
   virtual int get_thread_CORBA_priority (CORBA::Short &
-                                         ACE_ENV_ARG_DECL_NOT_USED) = 0;
+                                         ACE_ENV_ARG_DECL) = 0;
 
   virtual int get_thread_native_priority (CORBA::Short &
-                                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
+                                          ACE_ENV_ARG_DECL) = 0;
 
   virtual int get_thread_CORBA_and_native_priority (
     CORBA::Short &,
     CORBA::Short &
-    ACE_ENV_ARG_DECL_NOT_USED) = 0;
+    ACE_ENV_ARG_DECL) = 0;
 
   virtual int set_thread_CORBA_priority (CORBA::Short
-                                         ACE_ENV_ARG_DECL_NOT_USED) = 0;
+                                         ACE_ENV_ARG_DECL) = 0;
 
   virtual int set_thread_native_priority (CORBA::Short
-                                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
+                                          ACE_ENV_ARG_DECL) = 0;
 
   //@}
-
-  /// Sets the default_policies for ORB.
-  /// 1. Sets ORB-level policy defaults for this ORB.  Currently sets
-  /// default RTCORBA policies: ClientProtocolPolicy.
-  virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  /// Sets the default ServerProtocolPolicy.
-  virtual int set_default_server_protocol_policy (
-    TAO_Acceptor_Registry &acceptor_registry
-    ACE_ENV_ARG_DECL) = 0;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index c4fdd42c254..bdc0131b322 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -36,8 +36,6 @@
 
 #include /**/ "ace/pre.h"
 
-//#include "tao/CORBA_methods.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
index ebf39bedab6..1f4e661efcd 100644
--- a/TAO/tao/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA.mpc
@@ -28,4 +28,8 @@ project : taolib, core {
   PIDL_Files {
     RTCORBA
   }
+
+  Pkgconfig_Files {
+    RTCORBA/TAO_RTCORBA.pc.in
+  }
 }
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
index 8431babd2ab..9c548fafaf6 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -6,11 +6,7 @@
 
 #include "ace/Sched_Params.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Continuous_Priority_Mapping.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id: ")
+ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id$")
 
 TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
   :  policy_ (policy)
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
index f4cdc20ee7e..a227587ae57 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
@@ -69,10 +69,6 @@ private:
   int max_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "Continuous_Priority_Mapping.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.i b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
index f17830a022b..e415bde990a 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -7,11 +7,9 @@
 #include "Direct_Priority_Mapping.h"
 #include "ace/Sched_Params.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Direct_Priority_Mapping.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(Strategies, Direct_Priority_Mapping, "$Id$")
+ACE_RCSID(RTCORBA,
+          Direct_Priority_Mapping,
+          "$Id$")
 
 TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long)
 {
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
index a7722afe1e1..1195b6e4f4d 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
@@ -50,10 +50,6 @@ public:
 private:
 };
 
-#if defined (__ACE_INLINE__)
-# include "Direct_Priority_Mapping.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.i b/TAO/tao/RTCORBA/Direct_Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
index 0d06f2f09dd..084c47418b2 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
@@ -11,10 +11,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/Log_Msg.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Linear_Network_Priority_Mapping.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID (RTCORBA,
            Linear_Network_Priority_Mapping,
            "$Id$")
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
index 6c7e4a0e6f2..34783c3b1c5 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
@@ -52,10 +52,6 @@ public:
                            RTCORBA::Priority &corba_priority);
 };
 
-#if defined (__ACE_INLINE__)
-# include "Linear_Network_Priority_Mapping.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.i b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
index 5f715d71ccc..c793c7cfa0d 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -9,12 +9,8 @@
 #include "ace/Sched_Params.h"
 #include "ace/Log_Msg.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Linear_Priority_Mapping.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (Strategies, 
-           Linear_Priority_Mapping, 
+ACE_RCSID (RTCORBA,
+           Linear_Priority_Mapping,
            "$Id$")
 
 TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy)
@@ -32,7 +28,7 @@ CORBA::Boolean
 TAO_Linear_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
                                         RTCORBA::NativePriority &native_priority)
 {
-  if (corba_priority < RTCORBA::minPriority 
+  if (corba_priority < RTCORBA::minPriority
            // The line below will always be false unless the value of
            // RTCORBA::maxPriority, which is now assigned the value of
            // 32767, is changed in RTCORBA.pidl.
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
index 82643816e9d..bee37377c26 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
@@ -67,10 +67,6 @@ private:
   int max_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "Linear_Priority_Mapping.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.i b/TAO/tao/RTCORBA/Linear_Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
index 62f5a55efce..2704acc9628 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -10,9 +10,9 @@
 #include "ace/Log_Msg.h"
 #include "ace/Sched_Params.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/RTCORBA/Multi_Priority_Mapping.i"
-#endif /* ! __ACE_INLINE__ */
+ACE_RCSID (RTCORBA,
+           Multi_Priority_Mapping,
+           "$Id$")
 
 TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (int base_native_priority,
                                                         int base_corba_priority,
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
index 36f234ad117..6d5b3623dc7 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
@@ -87,10 +87,6 @@ private:
   // The range
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/RTCORBA/Multi_Priority_Mapping.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #endif /* TAO_MULTI_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.i b/TAO/tao/RTCORBA/Multi_Priority_Mapping.i
deleted file mode 100644
index f6ab28fc250..00000000000
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-// Multi_Priority_Mapping.i,v 1.0
-
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
index d3977e8a2e9..cc7eb22da38 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
@@ -4,11 +4,9 @@
 
 #include "Network_Priority_Mapping.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Network_Priority_Mapping.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Network_Priority_Mapping, "$Id$")
+ACE_RCSID(RTCORBA,
+          Network_Priority_Mapping,
+          "$Id$")
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
index 78cf8fc60b3..5c847b1f984 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
@@ -5,7 +5,7 @@
  *
  *  $Id$
  *
- *  Class that declares the Network Priority Mapping 
+ *  Class that declares the Network Priority Mapping
  *  that can be overriden to provide different mappings
  *
  *
@@ -51,10 +51,6 @@ public:
 	      RTCORBA::Priority &corba_priority) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-# include "Network_Priority_Mapping.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.i b/TAO/tao/RTCORBA/Network_Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
index cde5018be9b..bd9a33202cd 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   Network_Priority_Mapping_Manager.h
@@ -23,13 +24,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 #include "Network_Priority_Mapping.h"
 #include "tao/LocalObject.h"
 
@@ -63,10 +57,8 @@ public:
   RTCORBA::NetworkPriorityMapping *mapping (void);
 
 public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_Network_Priority_Mapping_Manager_ptr _ptr_type;
   typedef TAO_Network_Priority_Mapping_Manager_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
 
   // the static operations
   static TAO_Network_Priority_Mapping_Manager_ptr _duplicate (
@@ -99,7 +91,8 @@ private:
   TAO_Network_Priority_Mapping *mapping_;
 };
 
-class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager_var : public TAO_Base_var
+class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager_var
+  : private TAO_Base_var
 {
 public:
   TAO_Network_Priority_Mapping_Manager_var (void); // default constructor
@@ -156,10 +149,6 @@ private:
 #include "Network_Priority_Mapping_Manager.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp
index 30aca4f4e96..99ad2c6bbfd 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp
@@ -6,11 +6,9 @@
 
 #include "Priority_Mapping.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Priority_Mapping.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Priority_Mapping, "$Id$")
+ACE_RCSID(RTCORBA,
+          Priority_Mapping,
+          "$Id$")
 
 TAO_Priority_Mapping::~TAO_Priority_Mapping (void)
 {
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.h b/TAO/tao/RTCORBA/Priority_Mapping.h
index 313b95446ca..0e1bcbce46e 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping.h
@@ -51,10 +51,6 @@ public:
                 RTCORBA::Priority &corba_priority) = 0;
 };
 
-#if defined (__ACE_INLINE__)
-# include "Priority_Mapping.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.i b/TAO/tao/RTCORBA/Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTCORBA/Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index 08b5771b289..3b5d06c7808 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -23,13 +23,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 #include "Priority_Mapping.h"
 #include "tao/LocalObject.h"
 
@@ -60,10 +53,8 @@ public:
   RTCORBA::PriorityMapping *mapping (void);
 
 public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_Priority_Mapping_Manager_ptr _ptr_type;
   typedef TAO_Priority_Mapping_Manager_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
 
   // the static operations
   static TAO_Priority_Mapping_Manager_ptr _duplicate (TAO_Priority_Mapping_Manager_ptr obj);
@@ -94,7 +85,8 @@ private:
   TAO_Priority_Mapping *mapping_;
 };
 
-class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager_var : public TAO_Base_var
+class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager_var
+  : private TAO_Base_var
 {
 public:
   TAO_Priority_Mapping_Manager_var (void); // default constructor
@@ -151,10 +143,6 @@ private:
 #include "Priority_Mapping_Manager.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
index 47554523c2d..1f2f0e3ce93 100644
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA/RTCORBA.pidl
@@ -18,7 +18,7 @@
  *     3.  Added RT_ORB::create_tcp_protocol_properties which seems
  *         to come and go from the formal specification, but is needed.
  *
- *   This file was used to generate the code in RTCORBAC.{h,i,cpp}.
+ *   This file was 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
@@ -43,7 +43,7 @@
  *
  * Note: The diffs were generated with these commands:
  *
- *   for i in RTCORBAC.{h,i,cpp}; do
+ *   for i in RTCORBAC.{h,inl,cpp}; do
  *     diff -wBbu orig/$i $i
  *   done > diffs/RTCORBA.diff
  *
@@ -52,7 +52,6 @@
 #ifndef _RT_CORBA_IDL_
 #define _RT_CORBA_IDL_
 
-#include <orb.idl>
 #include <IOP.pidl>
 #include <TimeBase.pidl>
 
@@ -167,11 +166,31 @@ module RTCORBA
   // Communication over Shared Memory.
   local interface SharedMemoryProtocolProperties : ProtocolProperties
   {
+    attribute long send_buffer_size;
+    attribute long recv_buffer_size;
+    attribute boolean keep_alive;
+    attribute boolean dont_route;
+    attribute boolean no_delay;
     attribute long preallocate_buffer_size;
     attribute string mmap_filename;
     attribute string mmap_lockname;
   };
 
+  local interface UserDatagramProtocolProperties : ProtocolProperties
+  {
+    attribute boolean enable_network_priority;
+  };
+
+  local interface StreamControlProtocolProperties : ProtocolProperties
+  {
+    attribute long send_buffer_size;
+    attribute long recv_buffer_size;
+    attribute boolean keep_alive;
+    attribute boolean dont_route;
+    attribute boolean no_delay;
+    attribute boolean enable_network_priority;
+  };
+
   // End of TAO-specific interfaces.
 
   // PriorityBandedConnectionPolicy.
@@ -226,7 +245,32 @@ module RTCORBA
                                                      in boolean keep_alive,
                                                      in boolean dont_route,
                                                      in boolean no_delay,
-						     in boolean enable_network_priority);
+                                                     in boolean enable_network_priority);
+
+    UnixDomainProtocolProperties create_unix_domain_protocol_properties(
+                                                     in long send_buffer_size,
+                                                     in long recv_buffer_size);
+
+    SharedMemoryProtocolProperties create_shared_memory_protocol_properties(
+                                                     in long send_buffer_size,
+                                                     in long recv_buffer_size,
+                                                     in boolean keep_alive,
+                                                     in boolean dont_route,
+                                                     in boolean no_delay,
+                                                     in long preallocate_buffer_size,
+                                                     in string mmap_filename,
+                                                     in string mmap_lockname);
+
+    UserDatagramProtocolProperties create_user_datagram_protocol_properties(
+                                                     in boolean enable_network_priority);
+
+    StreamControlProtocolProperties create_stream_control_protocol_properties(
+                                                     in long send_buffer_size,
+                                                     in long recv_buffer_size,
+                                                     in boolean keep_alive,
+                                                     in boolean dont_route,
+                                                     in boolean no_delay,
+                                                     in boolean enable_network_priority);
 
     // Threadpool creation/destruction.
     exception InvalidThreadpool {};
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index 78f244e4bcf..d54c0cc9cde 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be/be_codegen.cpp:303
 
 
 #include "RTCORBA.h"
@@ -45,18 +45,17 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "RTCORBAC.i"
+#include "RTCORBAC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be/be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
-
 //////////////////////////////////////////////////////
 // CDR Encoding Support hand crafted
 
@@ -74,28 +73,27 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
   return 1;
 }
 
-
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_NativePriority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x4e617469),
-  ACE_NTOHL (0x76655072),
-  ACE_NTOHL (0x696f7269),
-  ACE_NTOHL (0x74793a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x4e617469), 
+  ACE_NTOHL (0x76655072), 
+  ACE_NTOHL (0x696f7269), 
+  ACE_NTOHL (0x74793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/NativePriority:1.0
     15,
-  ACE_NTOHL (0x4e617469),
-  ACE_NTOHL (0x76655072),
-  ACE_NTOHL (0x696f7269),
+  ACE_NTOHL (0x4e617469), 
+  ACE_NTOHL (0x76655072), 
+  ACE_NTOHL (0x696f7269), 
   ACE_NTOHL (0x74790000),  // name = NativePriority
     CORBA::tk_short,
 
@@ -116,24 +114,24 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_Priority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
     9,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
   ACE_NTOHL (0x0),  // name = Priority
     CORBA::tk_short,
 
@@ -154,26 +152,26 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_NetworkPriority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x4e657477),
-  ACE_NTOHL (0x6f726b50),
-  ACE_NTOHL (0x72696f72),
-  ACE_NTOHL (0x6974793a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x4e657477), 
+  ACE_NTOHL (0x6f726b50), 
+  ACE_NTOHL (0x72696f72), 
+  ACE_NTOHL (0x6974793a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/NetworkPriority:1.0
     16,
-  ACE_NTOHL (0x4e657477),
-  ACE_NTOHL (0x6f726b50),
-  ACE_NTOHL (0x72696f72),
+  ACE_NTOHL (0x4e657477), 
+  ACE_NTOHL (0x6f726b50), 
+  ACE_NTOHL (0x72696f72), 
   ACE_NTOHL (0x69747900),  // name = NetworkPriority
     CORBA::tk_long,
 
@@ -194,26 +192,26 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4964),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4964), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolId:1.0
     13,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4964),
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4964), 
   ACE_NTOHL (0x0),  // name = ThreadpoolId
     CORBA::tk_ulong,
 
@@ -234,64 +232,64 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4c61),
-  ACE_NTOHL (0x6e653a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x6e653a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
     15,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4c61),
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
   ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
   3, // member count
     14,
-  ACE_NTOHL (0x6c616e65),
-  ACE_NTOHL (0x5f707269),
-  ACE_NTOHL (0x6f726974),
+  ACE_NTOHL (0x6c616e65), 
+  ACE_NTOHL (0x5f707269), 
+  ACE_NTOHL (0x6f726974), 
   ACE_NTOHL (0x79000000),  // name = lane_priority
     CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x5254434f),
-    ACE_NTOHL (0x5242412f),
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
         9,
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
 
   15,
-  ACE_NTOHL (0x73746174),
-  ACE_NTOHL (0x69635f74),
-  ACE_NTOHL (0x68726561),
+  ACE_NTOHL (0x73746174), 
+  ACE_NTOHL (0x69635f74), 
+  ACE_NTOHL (0x68726561), 
   ACE_NTOHL (0x64730000),  // name = static_threads
     CORBA::tk_ulong,
 
   16,
-  ACE_NTOHL (0x64796e61),
-  ACE_NTOHL (0x6d69635f),
-  ACE_NTOHL (0x74687265),
+  ACE_NTOHL (0x64796e61), 
+  ACE_NTOHL (0x6d69635f), 
+  ACE_NTOHL (0x74687265), 
   ACE_NTOHL (0x61647300),  // name = dynamic_threads
     CORBA::tk_ulong,
 
@@ -311,21 +309,21 @@ namespace RTCORBA
     &_tc_TAO_tc_RTCORBA_ThreadpoolLane;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 RTCORBA::ThreadpoolLane::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   ThreadpoolLane *_tao_tmp_pointer =
-    ACE_static_cast (ThreadpoolLane *, _tao_void_pointer);
+    static_cast<ThreadpoolLane *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CS_)
 #define _RTCORBA_THREADPOOLLANES_CS_
@@ -371,33 +369,33 @@ void RTCORBA::ThreadpoolLanes::_tao_any_destructor (
   )
 {
   ThreadpoolLanes * _tao_tmp_pointer =
-    ACE_static_cast (ThreadpoolLanes *, _tao_void_pointer);
+    static_cast<ThreadpoolLanes *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4c61),
-  ACE_NTOHL (0x6e65733a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x6e65733a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0
     16,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c4c61),
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
   ACE_NTOHL (0x6e657300),  // name = ThreadpoolLanes
     CORBA::tk_sequence, // typecode kind
   228, // encapsulation length
@@ -406,58 +404,58 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
     212, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       39,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x5254434f),
-      ACE_NTOHL (0x5242412f),
-      ACE_NTOHL (0x54687265),
-      ACE_NTOHL (0x6164706f),
-      ACE_NTOHL (0x6f6c4c61),
-      ACE_NTOHL (0x6e653a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x5254434f), 
+      ACE_NTOHL (0x5242412f), 
+      ACE_NTOHL (0x54687265), 
+      ACE_NTOHL (0x6164706f), 
+      ACE_NTOHL (0x6f6c4c61), 
+      ACE_NTOHL (0x6e653a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
             15,
-      ACE_NTOHL (0x54687265),
-      ACE_NTOHL (0x6164706f),
-      ACE_NTOHL (0x6f6c4c61),
+      ACE_NTOHL (0x54687265), 
+      ACE_NTOHL (0x6164706f), 
+      ACE_NTOHL (0x6f6c4c61), 
       ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
       3, // member count
             14,
-      ACE_NTOHL (0x6c616e65),
-      ACE_NTOHL (0x5f707269),
-      ACE_NTOHL (0x6f726974),
+      ACE_NTOHL (0x6c616e65), 
+      ACE_NTOHL (0x5f707269), 
+      ACE_NTOHL (0x6f726974), 
       ACE_NTOHL (0x79000000),  // name = lane_priority
             CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x5254434f),
-        ACE_NTOHL (0x5242412f),
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
                 9,
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
 
       15,
-      ACE_NTOHL (0x73746174),
-      ACE_NTOHL (0x69635f74),
-      ACE_NTOHL (0x68726561),
+      ACE_NTOHL (0x73746174), 
+      ACE_NTOHL (0x69635f74), 
+      ACE_NTOHL (0x68726561), 
       ACE_NTOHL (0x64730000),  // name = static_threads
             CORBA::tk_ulong,
 
       16,
-      ACE_NTOHL (0x64796e61),
-      ACE_NTOHL (0x6d69635f),
-      ACE_NTOHL (0x74687265),
+      ACE_NTOHL (0x64796e61), 
+      ACE_NTOHL (0x6d69635f), 
+      ACE_NTOHL (0x74687265), 
       ACE_NTOHL (0x61647300),  // name = dynamic_threads
             CORBA::tk_ulong,
 
@@ -481,38 +479,38 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_PriorityModel[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x4d6f6465),
-  ACE_NTOHL (0x6c3a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c3a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModel:1.0
   14,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
   ACE_NTOHL (0x6c000000),  // name = PriorityModel
   2, // member count
   18,
-  ACE_NTOHL (0x434c4945),
-  ACE_NTOHL (0x4e545f50),
-  ACE_NTOHL (0x524f5041),
-  ACE_NTOHL (0x47415445),
+  ACE_NTOHL (0x434c4945), 
+  ACE_NTOHL (0x4e545f50), 
+  ACE_NTOHL (0x524f5041), 
+  ACE_NTOHL (0x47415445), 
   ACE_NTOHL (0x44000000),  // name = CLIENT_PROPAGATED
   16,
-  ACE_NTOHL (0x53455256),
-  ACE_NTOHL (0x45525f44),
-  ACE_NTOHL (0x45434c41),
+  ACE_NTOHL (0x53455256), 
+  ACE_NTOHL (0x45525f44), 
+  ACE_NTOHL (0x45434c41), 
   ACE_NTOHL (0x52454400),  // name = SERVER_DECLARED
   };
 
@@ -531,7 +529,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::PriorityModelPolicy.
 
@@ -571,7 +569,7 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_PriorityModelPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -582,11 +580,11 @@ RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void)
 {}
 
-void
+void 
 RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityModelPolicy *_tao_tmp_pointer =
-    ACE_static_cast (PriorityModelPolicy *, _tao_void_pointer);
+    static_cast<PriorityModelPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -600,10 +598,10 @@ RTCORBA::PriorityModelPolicy::_narrow (
     {
       return PriorityModelPolicy::_nil ();
     }
-
+  
   PriorityModelPolicy_ptr proxy =
     dynamic_cast<PriorityModelPolicy_ptr> (_tao_objref);
-
+  
   return PriorityModelPolicy::_duplicate (proxy);
 }
 
@@ -617,10 +615,10 @@ RTCORBA::PriorityModelPolicy::_unchecked_narrow (
     {
       return PriorityModelPolicy::_nil ();
     }
-
+  
   PriorityModelPolicy_ptr proxy =
     dynamic_cast<PriorityModelPolicy_ptr> (_tao_objref);
-
+  
   return PriorityModelPolicy::_duplicate (proxy);
 }
 
@@ -631,7 +629,7 @@ RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -680,28 +678,28 @@ RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_PriorityModelPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x4d6f6465),
-  ACE_NTOHL (0x6c506f6c),
-  ACE_NTOHL (0x6963793a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x6963793a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0
     20,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x4d6f6465),
-  ACE_NTOHL (0x6c506f6c),
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c506f6c), 
   ACE_NTOHL (0x69637900),  // name = PriorityModelPolicy
   };
 
@@ -720,7 +718,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::ThreadpoolPolicy.
 
@@ -760,7 +758,7 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_ThreadpoolPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -771,11 +769,11 @@ RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void)
 {}
 
-void
+void 
 RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ThreadpoolPolicy *_tao_tmp_pointer =
-    ACE_static_cast (ThreadpoolPolicy *, _tao_void_pointer);
+    static_cast<ThreadpoolPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -789,10 +787,10 @@ RTCORBA::ThreadpoolPolicy::_narrow (
     {
       return ThreadpoolPolicy::_nil ();
     }
-
+  
   ThreadpoolPolicy_ptr proxy =
     dynamic_cast<ThreadpoolPolicy_ptr> (_tao_objref);
-
+  
   return ThreadpoolPolicy::_duplicate (proxy);
 }
 
@@ -806,10 +804,10 @@ RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
     {
       return ThreadpoolPolicy::_nil ();
     }
-
+  
   ThreadpoolPolicy_ptr proxy =
     dynamic_cast<ThreadpoolPolicy_ptr> (_tao_objref);
-
+  
   return ThreadpoolPolicy::_duplicate (proxy);
 }
 
@@ -820,7 +818,7 @@ RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -869,28 +867,28 @@ RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_ThreadpoolPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0
     17,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164706f),
-  ACE_NTOHL (0x6f6c506f),
-  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = ThreadpoolPolicy
   };
 
@@ -909,7 +907,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::ProtocolProperties.
 
@@ -949,7 +947,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_ProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -960,11 +958,11 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void)
 RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
-void
+void 
 RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProtocolProperties *_tao_tmp_pointer =
-    ACE_static_cast (ProtocolProperties *, _tao_void_pointer);
+    static_cast<ProtocolProperties *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -978,10 +976,10 @@ RTCORBA::ProtocolProperties::_narrow (
     {
       return ProtocolProperties::_nil ();
     }
-
+  
   ProtocolProperties_ptr proxy =
     dynamic_cast<ProtocolProperties_ptr> (_tao_objref);
-
+  
   return ProtocolProperties::_duplicate (proxy);
 }
 
@@ -995,10 +993,10 @@ RTCORBA::ProtocolProperties::_unchecked_narrow (
     {
       return ProtocolProperties::_nil ();
     }
-
+  
   ProtocolProperties_ptr proxy =
     dynamic_cast<ProtocolProperties_ptr> (_tao_objref);
-
+  
   return ProtocolProperties::_duplicate (proxy);
 }
 
@@ -1009,7 +1007,7 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1054,28 +1052,28 @@ RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_ProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x50726f70),
-  ACE_NTOHL (0x65727469),
-  ACE_NTOHL (0x65733a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
     19,
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x50726f70),
-  ACE_NTOHL (0x65727469),
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
   ACE_NTOHL (0x65730000),  // name = ProtocolProperties
   };
 
@@ -1094,110 +1092,110 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_Protocol[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
     9,
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
   ACE_NTOHL (0x0),  // name = Protocol
   3, // member count
     14,
-  ACE_NTOHL (0x70726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x5f747970),
+  ACE_NTOHL (0x70726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x5f747970), 
   ACE_NTOHL (0x65000000),  // name = protocol_type
     CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x50726f66),
-    ACE_NTOHL (0x696c6549),
-    ACE_NTOHL (0x643a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x643a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
         10,
-    ACE_NTOHL (0x50726f66),
-    ACE_NTOHL (0x696c6549),
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
     ACE_NTOHL (0x64000000),  // name = ProfileId
         CORBA::tk_ulong,
 
 
   24,
-  ACE_NTOHL (0x6f72625f),
-  ACE_NTOHL (0x70726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x5f70726f),
-  ACE_NTOHL (0x70657274),
+  ACE_NTOHL (0x6f72625f), 
+  ACE_NTOHL (0x70726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x5f70726f), 
+  ACE_NTOHL (0x70657274), 
   ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
     CORBA::tk_objref, // typecode kind
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     43,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x5254434f),
-    ACE_NTOHL (0x5242412f),
-    ACE_NTOHL (0x50726f74),
-    ACE_NTOHL (0x6f636f6c),
-    ACE_NTOHL (0x50726f70),
-    ACE_NTOHL (0x65727469),
-    ACE_NTOHL (0x65733a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x65733a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
         19,
-    ACE_NTOHL (0x50726f74),
-    ACE_NTOHL (0x6f636f6c),
-    ACE_NTOHL (0x50726f70),
-    ACE_NTOHL (0x65727469),
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
     ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-
+    
   30,
-  ACE_NTOHL (0x7472616e),
-  ACE_NTOHL (0x73706f72),
-  ACE_NTOHL (0x745f7072),
-  ACE_NTOHL (0x6f746f63),
-  ACE_NTOHL (0x6f6c5f70),
-  ACE_NTOHL (0x726f7065),
-  ACE_NTOHL (0x72746965),
+  ACE_NTOHL (0x7472616e), 
+  ACE_NTOHL (0x73706f72), 
+  ACE_NTOHL (0x745f7072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c5f70), 
+  ACE_NTOHL (0x726f7065), 
+  ACE_NTOHL (0x72746965), 
   ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
     CORBA::tk_objref, // typecode kind
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     43,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x5254434f),
-    ACE_NTOHL (0x5242412f),
-    ACE_NTOHL (0x50726f74),
-    ACE_NTOHL (0x6f636f6c),
-    ACE_NTOHL (0x50726f70),
-    ACE_NTOHL (0x65727469),
-    ACE_NTOHL (0x65733a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x65733a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
         19,
-    ACE_NTOHL (0x50726f74),
-    ACE_NTOHL (0x6f636f6c),
-    ACE_NTOHL (0x50726f70),
-    ACE_NTOHL (0x65727469),
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
     ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol (
@@ -1214,21 +1212,21 @@ namespace RTCORBA
     &_tc_TAO_tc_RTCORBA_Protocol;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 RTCORBA::Protocol::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   Protocol *_tao_tmp_pointer =
-    ACE_static_cast (Protocol *, _tao_void_pointer);
+    static_cast<Protocol *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CS_)
 #define _RTCORBA_PROTOCOLLIST_CS_
@@ -1274,33 +1272,33 @@ void RTCORBA::ProtocolList::_tao_any_destructor (
   )
 {
   ProtocolList * _tao_tmp_pointer =
-    ACE_static_cast (ProtocolList *, _tao_void_pointer);
+    static_cast<ProtocolList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ProtocolList:1.0
     13,
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x4c697374), 
   ACE_NTOHL (0x0),  // name = ProtocolList
     CORBA::tk_sequence, // typecode kind
   400, // encapsulation length
@@ -1309,104 +1307,104 @@ static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
     384, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x5254434f),
-      ACE_NTOHL (0x5242412f),
-      ACE_NTOHL (0x50726f74),
-      ACE_NTOHL (0x6f636f6c),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x5254434f), 
+      ACE_NTOHL (0x5242412f), 
+      ACE_NTOHL (0x50726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
             9,
-      ACE_NTOHL (0x50726f74),
-      ACE_NTOHL (0x6f636f6c),
+      ACE_NTOHL (0x50726f74), 
+      ACE_NTOHL (0x6f636f6c), 
       ACE_NTOHL (0x0),  // name = Protocol
       3, // member count
             14,
-      ACE_NTOHL (0x70726f74),
-      ACE_NTOHL (0x6f636f6c),
-      ACE_NTOHL (0x5f747970),
+      ACE_NTOHL (0x70726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x5f747970), 
       ACE_NTOHL (0x65000000),  // name = protocol_type
             CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x50726f66),
-        ACE_NTOHL (0x696c6549),
-        ACE_NTOHL (0x643a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x643a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
                 10,
-        ACE_NTOHL (0x50726f66),
-        ACE_NTOHL (0x696c6549),
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
         ACE_NTOHL (0x64000000),  // name = ProfileId
                 CORBA::tk_ulong,
 
 
       24,
-      ACE_NTOHL (0x6f72625f),
-      ACE_NTOHL (0x70726f74),
-      ACE_NTOHL (0x6f636f6c),
-      ACE_NTOHL (0x5f70726f),
-      ACE_NTOHL (0x70657274),
+      ACE_NTOHL (0x6f72625f), 
+      ACE_NTOHL (0x70726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x5f70726f), 
+      ACE_NTOHL (0x70657274), 
       ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
             CORBA::tk_objref, // typecode kind
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x5254434f),
-        ACE_NTOHL (0x5242412f),
-        ACE_NTOHL (0x50726f74),
-        ACE_NTOHL (0x6f636f6c),
-        ACE_NTOHL (0x50726f70),
-        ACE_NTOHL (0x65727469),
-        ACE_NTOHL (0x65733a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x65733a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
                 19,
-        ACE_NTOHL (0x50726f74),
-        ACE_NTOHL (0x6f636f6c),
-        ACE_NTOHL (0x50726f70),
-        ACE_NTOHL (0x65727469),
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
         ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-
+        
       30,
-      ACE_NTOHL (0x7472616e),
-      ACE_NTOHL (0x73706f72),
-      ACE_NTOHL (0x745f7072),
-      ACE_NTOHL (0x6f746f63),
-      ACE_NTOHL (0x6f6c5f70),
-      ACE_NTOHL (0x726f7065),
-      ACE_NTOHL (0x72746965),
+      ACE_NTOHL (0x7472616e), 
+      ACE_NTOHL (0x73706f72), 
+      ACE_NTOHL (0x745f7072), 
+      ACE_NTOHL (0x6f746f63), 
+      ACE_NTOHL (0x6f6c5f70), 
+      ACE_NTOHL (0x726f7065), 
+      ACE_NTOHL (0x72746965), 
       ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
             CORBA::tk_objref, // typecode kind
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x5254434f),
-        ACE_NTOHL (0x5242412f),
-        ACE_NTOHL (0x50726f74),
-        ACE_NTOHL (0x6f636f6c),
-        ACE_NTOHL (0x50726f70),
-        ACE_NTOHL (0x65727469),
-        ACE_NTOHL (0x65733a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x65733a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
                 19,
-        ACE_NTOHL (0x50726f74),
-        ACE_NTOHL (0x6f636f6c),
-        ACE_NTOHL (0x50726f70),
-        ACE_NTOHL (0x65727469),
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
         ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-
+        
 
     0U,
 
@@ -1427,7 +1425,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::ServerProtocolPolicy.
 
@@ -1467,7 +1465,7 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_ServerProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1478,11 +1476,11 @@ RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
 {}
 
-void
+void 
 RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerProtocolPolicy *_tao_tmp_pointer =
-    ACE_static_cast (ServerProtocolPolicy *, _tao_void_pointer);
+    static_cast<ServerProtocolPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1496,10 +1494,10 @@ RTCORBA::ServerProtocolPolicy::_narrow (
     {
       return ServerProtocolPolicy::_nil ();
     }
-
+  
   ServerProtocolPolicy_ptr proxy =
     dynamic_cast<ServerProtocolPolicy_ptr> (_tao_objref);
-
+  
   return ServerProtocolPolicy::_duplicate (proxy);
 }
 
@@ -1513,10 +1511,10 @@ RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
     {
       return ServerProtocolPolicy::_nil ();
     }
-
+  
   ServerProtocolPolicy_ptr proxy =
     dynamic_cast<ServerProtocolPolicy_ptr> (_tao_objref);
-
+  
   return ServerProtocolPolicy::_duplicate (proxy);
 }
 
@@ -1527,7 +1525,7 @@ RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1576,30 +1574,30 @@ RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_ServerProtocolPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65725072),
-  ACE_NTOHL (0x6f746f63),
-  ACE_NTOHL (0x6f6c506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0
     21,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65725072),
-  ACE_NTOHL (0x6f746f63),
-  ACE_NTOHL (0x6f6c506f),
-  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = ServerProtocolPolicy
   };
 
@@ -1618,7 +1616,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::ClientProtocolPolicy.
 
@@ -1658,7 +1656,7 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_ClientProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1669,11 +1667,11 @@ RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
 {}
 
-void
+void 
 RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientProtocolPolicy *_tao_tmp_pointer =
-    ACE_static_cast (ClientProtocolPolicy *, _tao_void_pointer);
+    static_cast<ClientProtocolPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1687,10 +1685,10 @@ RTCORBA::ClientProtocolPolicy::_narrow (
     {
       return ClientProtocolPolicy::_nil ();
     }
-
+  
   ClientProtocolPolicy_ptr proxy =
     dynamic_cast<ClientProtocolPolicy_ptr> (_tao_objref);
-
+  
   return ClientProtocolPolicy::_duplicate (proxy);
 }
 
@@ -1704,10 +1702,10 @@ RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
     {
       return ClientProtocolPolicy::_nil ();
     }
-
+  
   ClientProtocolPolicy_ptr proxy =
     dynamic_cast<ClientProtocolPolicy_ptr> (_tao_objref);
-
+  
   return ClientProtocolPolicy::_duplicate (proxy);
 }
 
@@ -1718,7 +1716,7 @@ RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1767,30 +1765,30 @@ RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_ClientProtocolPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x436c6965),
-  ACE_NTOHL (0x6e745072),
-  ACE_NTOHL (0x6f746f63),
-  ACE_NTOHL (0x6f6c506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0
     21,
-  ACE_NTOHL (0x436c6965),
-  ACE_NTOHL (0x6e745072),
-  ACE_NTOHL (0x6f746f63),
-  ACE_NTOHL (0x6f6c506f),
-  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = ClientProtocolPolicy
   };
 
@@ -1809,7 +1807,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::PrivateConnectionPolicy.
 
@@ -1849,7 +1847,7 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_PrivateConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1860,11 +1858,11 @@ RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
 {}
 
-void
+void 
 RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PrivateConnectionPolicy *_tao_tmp_pointer =
-    ACE_static_cast (PrivateConnectionPolicy *, _tao_void_pointer);
+    static_cast<PrivateConnectionPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -1878,10 +1876,10 @@ RTCORBA::PrivateConnectionPolicy::_narrow (
     {
       return PrivateConnectionPolicy::_nil ();
     }
-
+  
   PrivateConnectionPolicy_ptr proxy =
     dynamic_cast<PrivateConnectionPolicy_ptr> (_tao_objref);
-
+  
   return PrivateConnectionPolicy::_duplicate (proxy);
 }
 
@@ -1895,10 +1893,10 @@ RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
     {
       return PrivateConnectionPolicy::_nil ();
     }
-
+  
   PrivateConnectionPolicy_ptr proxy =
     dynamic_cast<PrivateConnectionPolicy_ptr> (_tao_objref);
-
+  
   return PrivateConnectionPolicy::_duplicate (proxy);
 }
 
@@ -1909,7 +1907,7 @@ RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1958,30 +1956,30 @@ RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_PrivateConnectionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x50726976),
-  ACE_NTOHL (0x61746543),
-  ACE_NTOHL (0x6f6e6e65),
-  ACE_NTOHL (0x6374696f),
-  ACE_NTOHL (0x6e506f6c),
-  ACE_NTOHL (0x6963793a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726976), 
+  ACE_NTOHL (0x61746543), 
+  ACE_NTOHL (0x6f6e6e65), 
+  ACE_NTOHL (0x6374696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x6963793a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0
     24,
-  ACE_NTOHL (0x50726976),
-  ACE_NTOHL (0x61746543),
-  ACE_NTOHL (0x6f6e6e65),
-  ACE_NTOHL (0x6374696f),
-  ACE_NTOHL (0x6e506f6c),
+  ACE_NTOHL (0x50726976), 
+  ACE_NTOHL (0x61746543), 
+  ACE_NTOHL (0x6f6e6e65), 
+  ACE_NTOHL (0x6374696f), 
+  ACE_NTOHL (0x6e506f6c), 
   ACE_NTOHL (0x69637900),  // name = PrivateConnectionPolicy
   };
 
@@ -2000,7 +1998,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::TCPProtocolProperties.
 
@@ -2040,7 +2038,7 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_TCPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2051,11 +2049,11 @@ RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void)
 {}
 
-void
+void 
 RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   TCPProtocolProperties *_tao_tmp_pointer =
-    ACE_static_cast (TCPProtocolProperties *, _tao_void_pointer);
+    static_cast<TCPProtocolProperties *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2069,10 +2067,10 @@ RTCORBA::TCPProtocolProperties::_narrow (
     {
       return TCPProtocolProperties::_nil ();
     }
-
+  
   TCPProtocolProperties_ptr proxy =
     dynamic_cast<TCPProtocolProperties_ptr> (_tao_objref);
-
+  
   return TCPProtocolProperties::_duplicate (proxy);
 }
 
@@ -2086,10 +2084,10 @@ RTCORBA::TCPProtocolProperties::_unchecked_narrow (
     {
       return TCPProtocolProperties::_nil ();
     }
-
+  
   TCPProtocolProperties_ptr proxy =
     dynamic_cast<TCPProtocolProperties_ptr> (_tao_objref);
-
+  
   return TCPProtocolProperties::_duplicate (proxy);
 }
 
@@ -2100,7 +2098,7 @@ RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2149,30 +2147,30 @@ RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_TCPProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x54435050),
-  ACE_NTOHL (0x726f746f),
-  ACE_NTOHL (0x636f6c50),
-  ACE_NTOHL (0x726f7065),
-  ACE_NTOHL (0x72746965),
-  ACE_NTOHL (0x733a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54435050), 
+  ACE_NTOHL (0x726f746f), 
+  ACE_NTOHL (0x636f6c50), 
+  ACE_NTOHL (0x726f7065), 
+  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x733a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0
     22,
-  ACE_NTOHL (0x54435050),
-  ACE_NTOHL (0x726f746f),
-  ACE_NTOHL (0x636f6c50),
-  ACE_NTOHL (0x726f7065),
-  ACE_NTOHL (0x72746965),
+  ACE_NTOHL (0x54435050), 
+  ACE_NTOHL (0x726f746f), 
+  ACE_NTOHL (0x636f6c50), 
+  ACE_NTOHL (0x726f7065), 
+  ACE_NTOHL (0x72746965), 
   ACE_NTOHL (0x73000000),  // name = TCPProtocolProperties
   };
 
@@ -2191,7 +2189,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::GIOPProtocolProperties.
 
@@ -2231,7 +2229,7 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_GIOPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2242,11 +2240,11 @@ RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void)
 {}
 
-void
+void 
 RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   GIOPProtocolProperties *_tao_tmp_pointer =
-    ACE_static_cast (GIOPProtocolProperties *, _tao_void_pointer);
+    static_cast<GIOPProtocolProperties *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2260,10 +2258,10 @@ RTCORBA::GIOPProtocolProperties::_narrow (
     {
       return GIOPProtocolProperties::_nil ();
     }
-
+  
   GIOPProtocolProperties_ptr proxy =
     dynamic_cast<GIOPProtocolProperties_ptr> (_tao_objref);
-
+  
   return GIOPProtocolProperties::_duplicate (proxy);
 }
 
@@ -2277,10 +2275,10 @@ RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
     {
       return GIOPProtocolProperties::_nil ();
     }
-
+  
   GIOPProtocolProperties_ptr proxy =
     dynamic_cast<GIOPProtocolProperties_ptr> (_tao_objref);
-
+  
   return GIOPProtocolProperties::_duplicate (proxy);
 }
 
@@ -2291,7 +2289,7 @@ RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2340,30 +2338,30 @@ RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_GIOPProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x50726f70),
-  ACE_NTOHL (0x65727469),
-  ACE_NTOHL (0x65733a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0
     23,
-  ACE_NTOHL (0x47494f50),
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x50726f70),
-  ACE_NTOHL (0x65727469),
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
   ACE_NTOHL (0x65730000),  // name = GIOPProtocolProperties
   };
 
@@ -2382,7 +2380,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::UnixDomainProtocolProperties.
 
@@ -2422,7 +2420,7 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_UnixDomainProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2433,11 +2431,11 @@ RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void)
 {}
 
-void
+void 
 RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnixDomainProtocolProperties *_tao_tmp_pointer =
-    ACE_static_cast (UnixDomainProtocolProperties *, _tao_void_pointer);
+    static_cast<UnixDomainProtocolProperties *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2451,10 +2449,10 @@ RTCORBA::UnixDomainProtocolProperties::_narrow (
     {
       return UnixDomainProtocolProperties::_nil ();
     }
-
+  
   UnixDomainProtocolProperties_ptr proxy =
     dynamic_cast<UnixDomainProtocolProperties_ptr> (_tao_objref);
-
+  
   return UnixDomainProtocolProperties::_duplicate (proxy);
 }
 
@@ -2468,10 +2466,10 @@ RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
     {
       return UnixDomainProtocolProperties::_nil ();
     }
-
+  
   UnixDomainProtocolProperties_ptr proxy =
     dynamic_cast<UnixDomainProtocolProperties_ptr> (_tao_objref);
-
+  
   return UnixDomainProtocolProperties::_duplicate (proxy);
 }
 
@@ -2482,7 +2480,7 @@ RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2531,34 +2529,34 @@ RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_UnixDomainProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x556e6978),
-  ACE_NTOHL (0x446f6d61),
-  ACE_NTOHL (0x696e5072),
-  ACE_NTOHL (0x6f746f63),
-  ACE_NTOHL (0x6f6c5072),
-  ACE_NTOHL (0x6f706572),
-  ACE_NTOHL (0x74696573),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x556e6978), 
+  ACE_NTOHL (0x446f6d61), 
+  ACE_NTOHL (0x696e5072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c5072), 
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x74696573), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0
     29,
-  ACE_NTOHL (0x556e6978),
-  ACE_NTOHL (0x446f6d61),
-  ACE_NTOHL (0x696e5072),
-  ACE_NTOHL (0x6f746f63),
-  ACE_NTOHL (0x6f6c5072),
-  ACE_NTOHL (0x6f706572),
-  ACE_NTOHL (0x74696573),
+  ACE_NTOHL (0x556e6978), 
+  ACE_NTOHL (0x446f6d61), 
+  ACE_NTOHL (0x696e5072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c5072), 
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x74696573), 
   ACE_NTOHL (0x0),  // name = UnixDomainProtocolProperties
   };
 
@@ -2577,7 +2575,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::SharedMemoryProtocolProperties.
 
@@ -2617,7 +2615,7 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_SharedMemoryProtocolProperties_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2628,11 +2626,11 @@ RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void)
 {}
 
-void
+void 
 RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   SharedMemoryProtocolProperties *_tao_tmp_pointer =
-    ACE_static_cast (SharedMemoryProtocolProperties *, _tao_void_pointer);
+    static_cast<SharedMemoryProtocolProperties *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -2646,10 +2644,10 @@ RTCORBA::SharedMemoryProtocolProperties::_narrow (
     {
       return SharedMemoryProtocolProperties::_nil ();
     }
-
+  
   SharedMemoryProtocolProperties_ptr proxy =
     dynamic_cast<SharedMemoryProtocolProperties_ptr> (_tao_objref);
-
+  
   return SharedMemoryProtocolProperties::_duplicate (proxy);
 }
 
@@ -2663,10 +2661,10 @@ RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
     {
       return SharedMemoryProtocolProperties::_nil ();
     }
-
+  
   SharedMemoryProtocolProperties_ptr proxy =
     dynamic_cast<SharedMemoryProtocolProperties_ptr> (_tao_objref);
-
+  
   return SharedMemoryProtocolProperties::_duplicate (proxy);
 }
 
@@ -2677,7 +2675,7 @@ RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolPropert
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2726,34 +2724,34 @@ RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_SharedMemoryProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x53686172),
-  ACE_NTOHL (0x65644d65),
-  ACE_NTOHL (0x6d6f7279),
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x50726f70),
-  ACE_NTOHL (0x65727469),
-  ACE_NTOHL (0x65733a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x53686172), 
+  ACE_NTOHL (0x65644d65), 
+  ACE_NTOHL (0x6d6f7279), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0
     31,
-  ACE_NTOHL (0x53686172),
-  ACE_NTOHL (0x65644d65),
-  ACE_NTOHL (0x6d6f7279),
-  ACE_NTOHL (0x50726f74),
-  ACE_NTOHL (0x6f636f6c),
-  ACE_NTOHL (0x50726f70),
-  ACE_NTOHL (0x65727469),
+  ACE_NTOHL (0x53686172), 
+  ACE_NTOHL (0x65644d65), 
+  ACE_NTOHL (0x6d6f7279), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
   ACE_NTOHL (0x65730000),  // name = SharedMemoryProtocolProperties
   };
 
@@ -2772,26 +2770,416 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for RTCORBA::UserDatagramProtocolProperties.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+RTCORBA::UserDatagramProtocolProperties_ptr
+TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::duplicate (
+    RTCORBA::UserDatagramProtocolProperties_ptr p
+  )
+{
+  return RTCORBA::UserDatagramProtocolProperties::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::release (
+    RTCORBA::UserDatagramProtocolProperties_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+RTCORBA::UserDatagramProtocolProperties_ptr
+TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::nil (void)
+{
+  return RTCORBA::UserDatagramProtocolProperties::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::marshal (
+    RTCORBA::UserDatagramProtocolProperties_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*RTCORBA__TAO_UserDatagramProtocolProperties_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+RTCORBA::UserDatagramProtocolProperties::UserDatagramProtocolProperties (void)
+{}
+
+RTCORBA::UserDatagramProtocolProperties::~UserDatagramProtocolProperties (void)
+{}
+
+void 
+RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
+{
+  UserDatagramProtocolProperties *_tao_tmp_pointer =
+    static_cast<UserDatagramProtocolProperties *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+RTCORBA::UserDatagramProtocolProperties_ptr
+RTCORBA::UserDatagramProtocolProperties::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return UserDatagramProtocolProperties::_nil ();
+    }
+  
+  UserDatagramProtocolProperties_ptr proxy =
+    dynamic_cast<UserDatagramProtocolProperties_ptr> (_tao_objref);
+  
+  return UserDatagramProtocolProperties::_duplicate (proxy);
+}
+
+RTCORBA::UserDatagramProtocolProperties_ptr
+RTCORBA::UserDatagramProtocolProperties::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return UserDatagramProtocolProperties::_nil ();
+    }
+  
+  UserDatagramProtocolProperties_ptr proxy =
+    dynamic_cast<UserDatagramProtocolProperties_ptr> (_tao_objref);
+  
+  return UserDatagramProtocolProperties::_duplicate (proxy);
+}
+
+RTCORBA::UserDatagramProtocolProperties_ptr
+RTCORBA::UserDatagramProtocolProperties::_duplicate (UserDatagramProtocolProperties_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+RTCORBA::UserDatagramProtocolProperties::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* RTCORBA::UserDatagramProtocolProperties::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0";
+}
+
+CORBA::Boolean
+RTCORBA::UserDatagramProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_RTCORBA_UserDatagramProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  55,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x55736572), 
+  ACE_NTOHL (0x44617461), 
+  ACE_NTOHL (0x6772616d), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0
+    31,
+  ACE_NTOHL (0x55736572), 
+  ACE_NTOHL (0x44617461), 
+  ACE_NTOHL (0x6772616d), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65730000),  // name = UserDatagramProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_UserDatagramProtocolProperties),
+    (char *) &_oc_RTCORBA_UserDatagramProtocolProperties,
+    0,
+    sizeof (RTCORBA::UserDatagramProtocolProperties)
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_UserDatagramProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for RTCORBA::StreamControlProtocolProperties.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+RTCORBA::StreamControlProtocolProperties_ptr
+TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::duplicate (
+    RTCORBA::StreamControlProtocolProperties_ptr p
+  )
+{
+  return RTCORBA::StreamControlProtocolProperties::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::release (
+    RTCORBA::StreamControlProtocolProperties_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+RTCORBA::StreamControlProtocolProperties_ptr
+TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::nil (void)
+{
+  return RTCORBA::StreamControlProtocolProperties::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::marshal (
+    RTCORBA::StreamControlProtocolProperties_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*RTCORBA__TAO_StreamControlProtocolProperties_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+RTCORBA::StreamControlProtocolProperties::StreamControlProtocolProperties (void)
+{}
+
+RTCORBA::StreamControlProtocolProperties::~StreamControlProtocolProperties (void)
+{}
+
+void 
+RTCORBA::StreamControlProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
+{
+  StreamControlProtocolProperties *_tao_tmp_pointer =
+    static_cast<StreamControlProtocolProperties *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+RTCORBA::StreamControlProtocolProperties_ptr
+RTCORBA::StreamControlProtocolProperties::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return StreamControlProtocolProperties::_nil ();
+    }
+  
+  StreamControlProtocolProperties_ptr proxy =
+    dynamic_cast<StreamControlProtocolProperties_ptr> (_tao_objref);
+  
+  return StreamControlProtocolProperties::_duplicate (proxy);
+}
+
+RTCORBA::StreamControlProtocolProperties_ptr
+RTCORBA::StreamControlProtocolProperties::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return StreamControlProtocolProperties::_nil ();
+    }
+  
+  StreamControlProtocolProperties_ptr proxy =
+    dynamic_cast<StreamControlProtocolProperties_ptr> (_tao_objref);
+  
+  return StreamControlProtocolProperties::_duplicate (proxy);
+}
+
+RTCORBA::StreamControlProtocolProperties_ptr
+RTCORBA::StreamControlProtocolProperties::_duplicate (StreamControlProtocolProperties_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+RTCORBA::StreamControlProtocolProperties::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* RTCORBA::StreamControlProtocolProperties::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0";
+}
+
+CORBA::Boolean
+RTCORBA::StreamControlProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_RTCORBA_StreamControlProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  56,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x53747265), 
+  ACE_NTOHL (0x616d436f), 
+  ACE_NTOHL (0x6e74726f), 
+  ACE_NTOHL (0x6c50726f), 
+  ACE_NTOHL (0x746f636f), 
+  ACE_NTOHL (0x6c50726f), 
+  ACE_NTOHL (0x70657274), 
+  ACE_NTOHL (0x6965733a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0
+    32,
+  ACE_NTOHL (0x53747265), 
+  ACE_NTOHL (0x616d436f), 
+  ACE_NTOHL (0x6e74726f), 
+  ACE_NTOHL (0x6c50726f), 
+  ACE_NTOHL (0x746f636f), 
+  ACE_NTOHL (0x6c50726f), 
+  ACE_NTOHL (0x70657274), 
+  ACE_NTOHL (0x69657300),  // name = StreamControlProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_StreamControlProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_StreamControlProtocolProperties),
+    (char *) &_oc_RTCORBA_StreamControlProtocolProperties,
+    0,
+    sizeof (RTCORBA::StreamControlProtocolProperties)
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_StreamControlProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_StreamControlProtocolProperties;
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
     13,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
   ACE_NTOHL (0x0),  // name = PriorityBand
   2, // member count
     4,
@@ -2800,41 +3188,41 @@ static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x5254434f),
-    ACE_NTOHL (0x5242412f),
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
         9,
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
 
   5,
-  ACE_NTOHL (0x68696768),
+  ACE_NTOHL (0x68696768), 
   ACE_NTOHL (0x0),  // name = high
     CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x5254434f),
-    ACE_NTOHL (0x5242412f),
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
         9,
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
@@ -2855,21 +3243,21 @@ namespace RTCORBA
     &_tc_TAO_tc_RTCORBA_PriorityBand;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 RTCORBA::PriorityBand::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   PriorityBand *_tao_tmp_pointer =
-    ACE_static_cast (PriorityBand *, _tao_void_pointer);
+    static_cast<PriorityBand *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CS_)
 #define _RTCORBA_PRIORITYBANDS_CS_
@@ -2915,33 +3303,33 @@ void RTCORBA::PriorityBands::_tao_any_destructor (
   )
 {
   PriorityBands * _tao_tmp_pointer =
-    ACE_static_cast (PriorityBands *, _tao_void_pointer);
+    static_cast<PriorityBands *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
-  ACE_NTOHL (0x733a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x733a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0
     14,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
   ACE_NTOHL (0x73000000),  // name = PriorityBands
     CORBA::tk_sequence, // typecode kind
   252, // encapsulation length
@@ -2950,20 +3338,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
     236, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       37,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x5254434f),
-      ACE_NTOHL (0x5242412f),
-      ACE_NTOHL (0x5072696f),
-      ACE_NTOHL (0x72697479),
-      ACE_NTOHL (0x42616e64),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x5254434f), 
+      ACE_NTOHL (0x5242412f), 
+      ACE_NTOHL (0x5072696f), 
+      ACE_NTOHL (0x72697479), 
+      ACE_NTOHL (0x42616e64), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
             13,
-      ACE_NTOHL (0x5072696f),
-      ACE_NTOHL (0x72697479),
-      ACE_NTOHL (0x42616e64),
+      ACE_NTOHL (0x5072696f), 
+      ACE_NTOHL (0x72697479), 
+      ACE_NTOHL (0x42616e64), 
       ACE_NTOHL (0x0),  // name = PriorityBand
       2, // member count
             4,
@@ -2972,41 +3360,41 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x5254434f),
-        ACE_NTOHL (0x5242412f),
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
                 9,
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
 
       5,
-      ACE_NTOHL (0x68696768),
+      ACE_NTOHL (0x68696768), 
       ACE_NTOHL (0x0),  // name = high
             CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x5254434f),
-        ACE_NTOHL (0x5242412f),
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
                 9,
-        ACE_NTOHL (0x5072696f),
-        ACE_NTOHL (0x72697479),
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
@@ -3031,7 +3419,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::PriorityBandedConnectionPolicy.
 
@@ -3071,7 +3459,7 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_PriorityBandedConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3082,11 +3470,11 @@ RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
 {}
 
-void
+void 
 RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityBandedConnectionPolicy *_tao_tmp_pointer =
-    ACE_static_cast (PriorityBandedConnectionPolicy *, _tao_void_pointer);
+    static_cast<PriorityBandedConnectionPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3100,10 +3488,10 @@ RTCORBA::PriorityBandedConnectionPolicy::_narrow (
     {
       return PriorityBandedConnectionPolicy::_nil ();
     }
-
+  
   PriorityBandedConnectionPolicy_ptr proxy =
     dynamic_cast<PriorityBandedConnectionPolicy_ptr> (_tao_objref);
-
+  
   return PriorityBandedConnectionPolicy::_duplicate (proxy);
 }
 
@@ -3117,10 +3505,10 @@ RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
     {
       return PriorityBandedConnectionPolicy::_nil ();
     }
-
+  
   PriorityBandedConnectionPolicy_ptr proxy =
     dynamic_cast<PriorityBandedConnectionPolicy_ptr> (_tao_objref);
-
+  
   return PriorityBandedConnectionPolicy::_duplicate (proxy);
 }
 
@@ -3131,7 +3519,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPol
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -3180,34 +3568,34 @@ RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_PriorityBandedConnectionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6e6e6563),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63793a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6e6e6563), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0
     31,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x42616e64),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6e6e6563),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6e6e6563), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = PriorityBandedConnectionPolicy
   };
 
@@ -3226,7 +3614,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::Current.
 
@@ -3266,7 +3654,7 @@ TAO::Objref_Traits<RTCORBA::Current>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3277,11 +3665,11 @@ RTCORBA::Current::Current (void)
 RTCORBA::Current::~Current (void)
 {}
 
-void
+void 
 RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
-    ACE_static_cast (Current *, _tao_void_pointer);
+    static_cast<Current *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3295,10 +3683,10 @@ RTCORBA::Current::_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -3312,10 +3700,10 @@ RTCORBA::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -3326,7 +3714,7 @@ RTCORBA::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -3375,22 +3763,22 @@ RTCORBA::Current::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x43757272),
-  ACE_NTOHL (0x656e743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/Current:1.0
     8,
-  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x43757272), 
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -3409,7 +3797,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::Mutex.
 
@@ -3449,7 +3837,7 @@ TAO::Objref_Traits<RTCORBA::Mutex>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_Mutex_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3460,11 +3848,11 @@ RTCORBA::Mutex::Mutex (void)
 RTCORBA::Mutex::~Mutex (void)
 {}
 
-void
+void 
 RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer)
 {
   Mutex *_tao_tmp_pointer =
-    ACE_static_cast (Mutex *, _tao_void_pointer);
+    static_cast<Mutex *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3478,10 +3866,10 @@ RTCORBA::Mutex::_narrow (
     {
       return Mutex::_nil ();
     }
-
+  
   Mutex_ptr proxy =
     dynamic_cast<Mutex_ptr> (_tao_objref);
-
+  
   return Mutex::_duplicate (proxy);
 }
 
@@ -3495,10 +3883,10 @@ RTCORBA::Mutex::_unchecked_narrow (
     {
       return Mutex::_nil ();
     }
-
+  
   Mutex_ptr proxy =
     dynamic_cast<Mutex_ptr> (_tao_objref);
-
+  
   return Mutex::_duplicate (proxy);
 }
 
@@ -3509,7 +3897,7 @@ RTCORBA::Mutex::_duplicate (Mutex_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -3554,22 +3942,22 @@ RTCORBA::Mutex::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_Mutex[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x4d757465),
-  ACE_NTOHL (0x783a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x4d757465), 
+  ACE_NTOHL (0x783a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/Mutex:1.0
     6,
-  ACE_NTOHL (0x4d757465),
+  ACE_NTOHL (0x4d757465), 
   ACE_NTOHL (0x78000000),  // name = Mutex
   };
 
@@ -3588,7 +3976,7 @@ namespace RTCORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// be/be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::RTORB.
 
@@ -3628,13 +4016,13 @@ TAO::Objref_Traits<RTCORBA::RTORB>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*RTCORBA__TAO_RTORB_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
   : CORBA::UserException (
@@ -3666,7 +4054,7 @@ RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound
 void RTCORBA::RTORB::MutexNotFound::_tao_any_destructor (void *_tao_void_pointer)
 {
   MutexNotFound *_tao_tmp_pointer =
-    ACE_static_cast (MutexNotFound*, _tao_void_pointer);
+    static_cast<MutexNotFound*> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -3675,7 +4063,7 @@ RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *_tao_excp)
 {
   if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (MutexNotFound *, _tao_excp);
+      return dynamic_cast<MutexNotFound *> (_tao_excp);
     }
   else
     {
@@ -3726,36 +4114,31 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::RTCORBA::RTORB::_tc_MutexNotFound;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_RTORB_MutexNotFound[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x52544f52),
-  ACE_NTOHL (0x422f4d75),
-  ACE_NTOHL (0x7465784e),
-  ACE_NTOHL (0x6f74466f),
-  ACE_NTOHL (0x756e643a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x422f4d75), 
+  ACE_NTOHL (0x7465784e), 
+  ACE_NTOHL (0x6f74466f), 
+  ACE_NTOHL (0x756e643a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0
     14,
-  ACE_NTOHL (0x4d757465),
-  ACE_NTOHL (0x784e6f74),
-  ACE_NTOHL (0x466f756e),
+  ACE_NTOHL (0x4d757465), 
+  ACE_NTOHL (0x784e6f74), 
+  ACE_NTOHL (0x466f756e), 
   ACE_NTOHL (0x64000000),  // name = MutexNotFound
   0, // member count
   };
@@ -3771,8 +4154,8 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound (
 ::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_MutexNotFound =
   &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound;
 
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
   : CORBA::UserException (
@@ -3804,7 +4187,7 @@ RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThr
 void RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor (void *_tao_void_pointer)
 {
   InvalidThreadpool *_tao_tmp_pointer =
-    ACE_static_cast (InvalidThreadpool*, _tao_void_pointer);
+    static_cast<InvalidThreadpool*> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -3813,7 +4196,7 @@ RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *_tao_excp)
 {
   if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", _tao_excp->_rep_id ()))
     {
-      return ACE_dynamic_cast (InvalidThreadpool *, _tao_excp);
+      return dynamic_cast<InvalidThreadpool *> (_tao_excp);
     }
   else
     {
@@ -3864,38 +4247,33 @@ void RTCORBA::RTORB::InvalidThreadpool::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::RTCORBA::RTORB::_tc_InvalidThreadpool;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_RTORB_InvalidThreadpool[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x52544f52),
-  ACE_NTOHL (0x422f496e),
-  ACE_NTOHL (0x76616c69),
-  ACE_NTOHL (0x64546872),
-  ACE_NTOHL (0x65616470),
-  ACE_NTOHL (0x6f6f6c3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x422f496e), 
+  ACE_NTOHL (0x76616c69), 
+  ACE_NTOHL (0x64546872), 
+  ACE_NTOHL (0x65616470), 
+  ACE_NTOHL (0x6f6f6c3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0
     18,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696454),
-  ACE_NTOHL (0x68726561),
-  ACE_NTOHL (0x64706f6f),
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696454), 
+  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x64706f6f), 
   ACE_NTOHL (0x6c000000),  // name = InvalidThreadpool
   0, // member count
   };
@@ -3917,11 +4295,11 @@ RTCORBA::RTORB::RTORB (void)
 RTCORBA::RTORB::~RTORB (void)
 {}
 
-void
+void 
 RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer)
 {
   RTORB *_tao_tmp_pointer =
-    ACE_static_cast (RTORB *, _tao_void_pointer);
+    static_cast<RTORB *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3935,10 +4313,10 @@ RTCORBA::RTORB::_narrow (
     {
       return RTORB::_nil ();
     }
-
+  
   RTORB_ptr proxy =
     dynamic_cast<RTORB_ptr> (_tao_objref);
-
+  
   return RTORB::_duplicate (proxy);
 }
 
@@ -3952,10 +4330,10 @@ RTCORBA::RTORB::_unchecked_narrow (
     {
       return RTORB::_nil ();
     }
-
+  
   RTORB_ptr proxy =
     dynamic_cast<RTORB_ptr> (_tao_objref);
-
+  
   return RTORB::_duplicate (proxy);
 }
 
@@ -3966,7 +4344,7 @@ RTCORBA::RTORB::_duplicate (RTORB_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -4011,22 +4389,22 @@ RTCORBA::RTORB::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be/be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_RTORB[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254434f),
-  ACE_NTOHL (0x5242412f),
-  ACE_NTOHL (0x52544f52),
-  ACE_NTOHL (0x423a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x423a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/RTORB:1.0
     6,
-  ACE_NTOHL (0x52544f52),
+  ACE_NTOHL (0x52544f52), 
   ACE_NTOHL (0x42000000),  // name = RTORB
   };
 
@@ -4044,8 +4422,8 @@ namespace RTCORBA
     &_tc_TAO_tc_RTCORBA_RTORB;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -4081,8 +4459,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::ThreadpoolLane *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const RTCORBA::ThreadpoolLane *&,
+  return _tao_any >>= const_cast<
+      const RTCORBA::ThreadpoolLane *&> (
       _tao_elem
     );
 }
@@ -4102,8 +4480,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -4139,8 +4517,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::ThreadpoolLanes *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const RTCORBA::ThreadpoolLanes *&,
+  return _tao_any >>= const_cast<
+      const RTCORBA::ThreadpoolLanes *&> (
       _tao_elem
     );
 }
@@ -4161,7 +4539,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
+// be/be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -4184,12 +4562,12 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
         _tao_any,
         RTCORBA::_tc_PriorityModel,
-        _tao_elem
+        _tao_elem 
       );
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -4258,7 +4636,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -4327,7 +4705,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -4395,8 +4773,8 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:54
 
 
 
@@ -4446,8 +4824,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::Protocol *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const RTCORBA::Protocol *&,
+  return _tao_any >>= const_cast<
+      const RTCORBA::Protocol *&> (
       _tao_elem
     );
 }
@@ -4467,8 +4845,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:54
 
 
 
@@ -4518,8 +4896,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::ProtocolList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const RTCORBA::ProtocolList *&,
+  return _tao_any >>= const_cast<
+      const RTCORBA::ProtocolList *&> (
       _tao_elem
     );
 }
@@ -4540,7 +4918,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -4609,7 +4987,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -4678,7 +5056,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -4747,7 +5125,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -4816,7 +5194,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -4885,7 +5263,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -4954,7 +5332,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -5023,7 +5401,145 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_cs.cpp:54
+// be/be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::UserDatagramProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::UserDatagramProtocolProperties_ptr _tao_objptr =
+    RTCORBA::UserDatagramProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::UserDatagramProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_UserDatagramProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::UserDatagramProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_UserDatagramProtocolProperties,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::StreamControlProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::StreamControlProtocolProperties_ptr _tao_objptr =
+    RTCORBA::StreamControlProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::StreamControlProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::StreamControlProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_StreamControlProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::StreamControlProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::StreamControlProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_StreamControlProtocolProperties,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be/be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -5059,8 +5575,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::PriorityBand *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const RTCORBA::PriorityBand *&,
+  return _tao_any >>= const_cast<
+      const RTCORBA::PriorityBand *&> (
       _tao_elem
     );
 }
@@ -5080,8 +5596,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// be/be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -5117,8 +5633,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::PriorityBands *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const RTCORBA::PriorityBands *&,
+  return _tao_any >>= const_cast<
+      const RTCORBA::PriorityBands *&> (
       _tao_elem
     );
 }
@@ -5139,7 +5655,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -5208,7 +5724,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -5277,7 +5793,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -5346,7 +5862,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// be/be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -5414,8 +5930,8 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -5465,8 +5981,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::RTORB::MutexNotFound *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const RTCORBA::RTORB::MutexNotFound *&,
+  return _tao_any >>= const_cast<
+      const RTCORBA::RTORB::MutexNotFound *&> (
       _tao_elem
     );
 }
@@ -5486,8 +6002,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
+// TAO_IDL - Generated from 
+// be/be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -5537,8 +6053,8 @@ CORBA::Boolean operator>>= (
     RTCORBA::RTORB::InvalidThreadpool *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const RTCORBA::RTORB::InvalidThreadpool *&,
+  return _tao_any >>= const_cast<
+      const RTCORBA::RTORB::InvalidThreadpool *&> (
       _tao_elem
     );
 }
@@ -5559,7 +6075,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
+// be/be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -5584,7 +6100,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be/be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_
 #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_
@@ -5594,21 +6110,21 @@ CORBA::Boolean operator<< (
     const RTCORBA::ThreadpoolLanes &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -5618,7 +6134,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -5628,35 +6144,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
+// be/be_visitor_enum/cdr_op_cs.cpp:51
 
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::PriorityModel &_tao_enumval)
 {
@@ -5668,17 +6184,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enum
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
-      _tao_enumval = ACE_static_cast (RTCORBA::PriorityModel, _tao_temp);
+      _tao_enumval = static_cast<RTCORBA::PriorityModel> (_tao_temp);
     }
-
+  
   return _tao_result;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
+// be/be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -5701,7 +6217,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be/be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_
 #define _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_
@@ -5711,21 +6227,21 @@ CORBA::Boolean operator<< (
     const RTCORBA::PriorityBands &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -5735,7 +6251,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -5745,35 +6261,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be/be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -5840,7 +6356,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::PriorityModelPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::PriorityModelPolicy
@@ -5860,7 +6376,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::ThreadpoolPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::ThreadpoolPolicy
@@ -5880,7 +6396,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::ProtocolProperties
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::ProtocolProperties
@@ -5955,7 +6471,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::ServerProtocolPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::ServerProtocolPolicy
@@ -5975,7 +6491,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::ClientProtocolPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::ClientProtocolPolicy
@@ -5995,7 +6511,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::PrivateConnectionPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::PrivateConnectionPolicy
@@ -6015,7 +6531,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::TCPProtocolProperties
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::TCPProtocolProperties
@@ -6035,7 +6551,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::GIOPProtocolProperties
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::GIOPProtocolProperties
@@ -6055,7 +6571,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::UnixDomainProtocolProperties
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::UnixDomainProtocolProperties
@@ -6075,7 +6591,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::SharedMemoryProtocolProperties
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::SharedMemoryProtocolProperties
@@ -6087,6 +6603,46 @@ CORBA::Boolean operator>> (
       >;
 
   template class
+    TAO::Objref_Traits<
+        RTCORBA::UserDatagramProtocolProperties
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::UserDatagramProtocolProperties
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::UserDatagramProtocolProperties
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::UserDatagramProtocolProperties
+      >;
+
+  template class
+    TAO::Objref_Traits<
+        RTCORBA::StreamControlProtocolProperties
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::StreamControlProtocolProperties
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::StreamControlProtocolProperties
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::StreamControlProtocolProperties
+      >;
+
+  template class
     TAO_Fixed_Var_T<
         RTCORBA::PriorityBand
       >;
@@ -6144,7 +6700,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::PriorityBandedConnectionPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::PriorityBandedConnectionPolicy
@@ -6164,7 +6720,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::Current
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::Current
@@ -6184,7 +6740,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::Mutex
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::Mutex
@@ -6214,7 +6770,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         RTCORBA::RTORB
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTCORBA::RTORB
@@ -6290,7 +6846,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::PriorityModelPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::PriorityModelPolicy
@@ -6310,7 +6866,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::ThreadpoolPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::ThreadpoolPolicy
@@ -6330,7 +6886,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::ProtocolProperties
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::ProtocolProperties
@@ -6405,7 +6961,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::ServerProtocolPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::ServerProtocolPolicy
@@ -6425,7 +6981,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::ClientProtocolPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::ClientProtocolPolicy
@@ -6445,7 +7001,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::PrivateConnectionPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::PrivateConnectionPolicy
@@ -6465,7 +7021,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::TCPProtocolProperties
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::TCPProtocolProperties
@@ -6485,7 +7041,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::GIOPProtocolProperties
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::GIOPProtocolProperties
@@ -6505,7 +7061,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::UnixDomainProtocolProperties
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::UnixDomainProtocolProperties
@@ -6525,7 +7081,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::SharedMemoryProtocolProperties
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::SharedMemoryProtocolProperties
@@ -6537,6 +7093,46 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO::Objref_Traits< \
+        RTCORBA::UserDatagramProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::UserDatagramProtocolProperties
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::UserDatagramProtocolProperties
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::UserDatagramProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        RTCORBA::StreamControlProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::StreamControlProtocolProperties
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::StreamControlProtocolProperties
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::StreamControlProtocolProperties \
+      >
+
+# pragma instantiate \
     TAO_Fixed_Var_T< \
         RTCORBA::PriorityBand \
       >
@@ -6594,7 +7190,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::PriorityBandedConnectionPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::PriorityBandedConnectionPolicy
@@ -6614,7 +7210,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::Current
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::Current
@@ -6634,7 +7230,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::Mutex
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::Mutex
@@ -6664,7 +7260,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         RTCORBA::RTORB
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTCORBA::RTORB
@@ -6675,5 +7271,4 @@ CORBA::Boolean operator>> (
         RTCORBA::RTORB \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index d0bb3877591..5603ff1398f 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -26,14 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be/be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_RTCORBAC_H_
-#define _TAO_IDL_ORIG_RTCORBAC_H_
+#ifndef _TAO_IDL_RTCORBAC_H_
+#define _TAO_IDL_RTCORBAC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #ifndef TAO_RTCORBA_SAFE_INCLUDE
 #error "You should not include RTCORBAC.h directly, use RTCORBA.h"
@@ -45,8 +46,9 @@
 
 #include "rtcorba_export.h"
 #include "rtcorba_typedefs.h"
-#include "tao/Encodable.h"
+#include "tao/ORB.h"
 #include "tao/TimeBaseC.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
@@ -54,8 +56,12 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
+#include "tao/Encodable.h"
 #include "tao/PolicyC.h"
 
+#include "tao/IOPC.h"
+#include "tao/TimeBaseC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -79,125 +85,125 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be/be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be/be_visitor_module/module_ch.cpp:48
 
 namespace RTCORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  // be/be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::Short NativePriority;
   typedef CORBA::Short_out NativePriority_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  // be/be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
+  // be/be_visitor_constant/constant_ch.cpp:52
+  
   const RTCORBA::Priority minPriority = 0;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
+  // be/be_visitor_constant/constant_ch.cpp:52
+  
   const RTCORBA::Priority maxPriority = 32767;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  // be/be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::Long NetworkPriority;
   typedef CORBA::Long_out NetworkPriority_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NetworkPriority;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  // be/be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::ULong ThreadpoolId;
   typedef CORBA::ULong_out ThreadpoolId_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolId;
-
+  
   // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-
+  // be/be_type.cpp:258
+  
   struct ThreadpoolLane;
-
+  
   typedef
     TAO_Fixed_Var_T<
         ThreadpoolLane
       >
     ThreadpoolLane_var;
-
+  
   typedef
     ThreadpoolLane &
     ThreadpoolLane_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-
+  // be/be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_RTCORBA_Export ThreadpoolLane
   {
     typedef ThreadpoolLane_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     RTCORBA::Priority lane_priority;
     CORBA::ULong static_threads;
     CORBA::ULong dynamic_threads;
   };
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLane;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
+  // be/be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CH_)
 #define _RTCORBA_THREADPOOLLANES_CH_
-
+  
   class ThreadpoolLanes;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         ThreadpoolLanes,
         ThreadpoolLane
       >
     ThreadpoolLanes_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ThreadpoolLanes,
@@ -205,7 +211,7 @@ namespace RTCORBA
         ThreadpoolLane
       >
     ThreadpoolLanes_out;
-
+  
   class TAO_RTCORBA_Export ThreadpoolLanes
     : public
         TAO_Unbounded_Sequence<
@@ -218,60 +224,60 @@ namespace RTCORBA
     ThreadpoolLanes (
         CORBA::ULong max,
         CORBA::ULong length,
-        ThreadpoolLane* buffer,
+        ThreadpoolLane* buffer, 
         CORBA::Boolean release = 0
       );
     ThreadpoolLanes (const ThreadpoolLanes &);
     ~ThreadpoolLanes (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ThreadpoolLanes_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
+  // be/be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-
+  // be/be_visitor_enum/enum_ch.cpp:57
+  
   enum PriorityModel
   {
     CLIENT_PROPAGATED,
     SERVER_DECLARED
   };
-
+  
   typedef PriorityModel &PriorityModel_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModel;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_
-
+  
   class PriorityModelPolicy;
   typedef PriorityModelPolicy *PriorityModelPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PriorityModelPolicy
       >
     PriorityModelPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PriorityModelPolicy
@@ -279,131 +285,131 @@ namespace RTCORBA
     PriorityModelPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export PriorityModelPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef PriorityModelPolicy_ptr _ptr_type;
     typedef PriorityModelPolicy_var _var_type;
-
+    
     // The static operations.
     static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj);
-
+    
     static PriorityModelPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PriorityModelPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PriorityModelPolicy_ptr _nil (void)
     {
       return (PriorityModelPolicy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PriorityModel priority_model (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::Priority server_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PriorityModelPolicy (void);
-
+    
     virtual ~PriorityModelPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PriorityModelPolicy (const PriorityModelPolicy &);
-
+    
     void operator= (const PriorityModelPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
+  // be/be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_
-
+  
   class ThreadpoolPolicy;
   typedef ThreadpoolPolicy *ThreadpoolPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ThreadpoolPolicy
       >
     ThreadpoolPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ThreadpoolPolicy
@@ -411,116 +417,116 @@ namespace RTCORBA
     ThreadpoolPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_)
 #define _RTCORBA_THREADPOOLPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export ThreadpoolPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ThreadpoolPolicy_ptr _ptr_type;
     typedef ThreadpoolPolicy_var _var_type;
-
+    
     // The static operations.
     static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj);
-
+    
     static ThreadpoolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ThreadpoolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ThreadpoolPolicy_ptr _nil (void)
     {
       return (ThreadpoolPolicy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::ThreadpoolId threadpool (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     ThreadpoolPolicy (void);
-
+    
     virtual ~ThreadpoolPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ThreadpoolPolicy (const ThreadpoolPolicy &);
-
+    
     void operator= (const ThreadpoolPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #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
@@ -528,13 +534,13 @@ namespace RTCORBA
     ProtocolProperties_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // 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
     , public virtual TAO_Encodable
@@ -542,112 +548,112 @@ namespace RTCORBA
   public:
     typedef ProtocolProperties_ptr _ptr_type;
     typedef ProtocolProperties_var _var_type;
-
+    
     // The static operations.
     static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
-
+    
     static ProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ProtocolProperties_ptr _nil (void)
     {
       return (ProtocolProperties_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
     // CDR Encoder/Decoder methods. (handcrafted)
     virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
     virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
   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 &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolProperties;
-
+  
   // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-
+  // be/be_type.cpp:258
+  
   struct Protocol;
-
+  
   typedef
     TAO_Var_Var_T<
         Protocol
       >
     Protocol_var;
-
+  
   typedef
     TAO_Out_T<
         Protocol,
         Protocol_var
       >
     Protocol_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-
+  // be/be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_RTCORBA_Export Protocol
   {
     typedef Protocol_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     IOP::ProfileId protocol_type;
     RTCORBA::ProtocolProperties_var orb_protocol_properties;
     RTCORBA::ProtocolProperties_var transport_protocol_properties;
   };
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Protocol;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
+  // be/be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CH_)
 #define _RTCORBA_PROTOCOLLIST_CH_
-
+  
   class ProtocolList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ProtocolList,
         Protocol
       >
     ProtocolList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ProtocolList,
@@ -655,7 +661,7 @@ namespace RTCORBA
         Protocol
       >
     ProtocolList_out;
-
+  
   class TAO_RTCORBA_Export ProtocolList
     : public
         TAO_Unbounded_Sequence<
@@ -668,44 +674,44 @@ namespace RTCORBA
     ProtocolList (
         CORBA::ULong max,
         CORBA::ULong length,
-        Protocol* buffer,
+        Protocol* buffer, 
         CORBA::Boolean release = 0
       );
     ProtocolList (const ProtocolList &);
     ~ProtocolList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ProtocolList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolList;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
+  // be/be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_
-
+  
   class ServerProtocolPolicy;
   typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerProtocolPolicy
       >
     ServerProtocolPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerProtocolPolicy
@@ -713,121 +719,121 @@ namespace RTCORBA
     ServerProtocolPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export ServerProtocolPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ServerProtocolPolicy_ptr _ptr_type;
     typedef ServerProtocolPolicy_var _var_type;
-
+    
     // The static operations.
     static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
-
+    
     static ServerProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerProtocolPolicy_ptr _nil (void)
     {
       return (ServerProtocolPolicy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     ServerProtocolPolicy (void);
-
+    
     virtual ~ServerProtocolPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerProtocolPolicy (const ServerProtocolPolicy &);
-
+    
     void operator= (const ServerProtocolPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
+  // be/be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_
-
+  
   class ClientProtocolPolicy;
   typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ClientProtocolPolicy
       >
     ClientProtocolPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ClientProtocolPolicy
@@ -835,121 +841,121 @@ namespace RTCORBA
     ClientProtocolPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export ClientProtocolPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef ClientProtocolPolicy_ptr _ptr_type;
     typedef ClientProtocolPolicy_var _var_type;
-
+    
     // The static operations.
     static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
-
+    
     static ClientProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientProtocolPolicy_ptr _nil (void)
     {
       return (ClientProtocolPolicy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     ClientProtocolPolicy (void);
-
+    
     virtual ~ClientProtocolPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ClientProtocolPolicy (const ClientProtocolPolicy &);
-
+    
     void operator= (const ClientProtocolPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
+  // be/be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_
-
+  
   class PrivateConnectionPolicy;
   typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PrivateConnectionPolicy
       >
     PrivateConnectionPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PrivateConnectionPolicy
@@ -957,106 +963,106 @@ namespace RTCORBA
     PrivateConnectionPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export PrivateConnectionPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef PrivateConnectionPolicy_ptr _ptr_type;
     typedef PrivateConnectionPolicy_var _var_type;
-
+    
     // The static operations.
     static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
-
+    
     static PrivateConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PrivateConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PrivateConnectionPolicy_ptr _nil (void)
     {
       return (PrivateConnectionPolicy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PrivateConnectionPolicy (void);
-
+    
     virtual ~PrivateConnectionPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PrivateConnectionPolicy (const PrivateConnectionPolicy &);
-
+    
     void operator= (const PrivateConnectionPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_
-
+  
   class TCPProtocolProperties;
   typedef TCPProtocolProperties *TCPProtocolProperties_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TCPProtocolProperties
       >
     TCPProtocolProperties_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TCPProtocolProperties
@@ -1064,212 +1070,212 @@ namespace RTCORBA
     TCPProtocolProperties_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export TCPProtocolProperties
-    : public virtual RTCORBA::ProtocolProperties
+    : public virtual ::RTCORBA::ProtocolProperties
   {
   public:
     typedef TCPProtocolProperties_ptr _ptr_type;
     typedef TCPProtocolProperties_var _var_type;
-
+    
     // The static operations.
     static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj);
-
+    
     static TCPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TCPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TCPProtocolProperties_ptr _nil (void)
     {
       return (TCPProtocolProperties_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_buffer_size (
-        CORBA::Long send_buffer_size
+        ::CORBA::Long send_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void recv_buffer_size (
-        CORBA::Long recv_buffer_size
+        ::CORBA::Long recv_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean keep_alive (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void keep_alive (
-        CORBA::Boolean keep_alive
+        ::CORBA::Boolean keep_alive
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean dont_route (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void dont_route (
-        CORBA::Boolean dont_route
+        ::CORBA::Boolean dont_route
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean no_delay (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void no_delay (
-        CORBA::Boolean no_delay
+        ::CORBA::Boolean no_delay
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean enable_network_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void enable_network_priority (
-        CORBA::Boolean enable_network_priority
+        ::CORBA::Boolean enable_network_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     TCPProtocolProperties (void);
-
+    
     virtual ~TCPProtocolProperties (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TCPProtocolProperties (const TCPProtocolProperties &);
-
+    
     void operator= (const TCPProtocolProperties &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_
-
+  
   class GIOPProtocolProperties;
   typedef GIOPProtocolProperties *GIOPProtocolProperties_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         GIOPProtocolProperties
       >
     GIOPProtocolProperties_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         GIOPProtocolProperties
@@ -1277,86 +1283,86 @@ namespace RTCORBA
     GIOPProtocolProperties_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export GIOPProtocolProperties
-    : public virtual RTCORBA::ProtocolProperties
+    : public virtual ::RTCORBA::ProtocolProperties
   {
   public:
     typedef GIOPProtocolProperties_ptr _ptr_type;
     typedef GIOPProtocolProperties_var _var_type;
-
+    
     // The static operations.
     static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj);
-
+    
     static GIOPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static GIOPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static GIOPProtocolProperties_ptr _nil (void)
     {
       return (GIOPProtocolProperties_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     GIOPProtocolProperties (void);
-
+    
     virtual ~GIOPProtocolProperties (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     GIOPProtocolProperties (const GIOPProtocolProperties &);
-
+    
     void operator= (const GIOPProtocolProperties &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_
-
+  
   class UnixDomainProtocolProperties;
   typedef UnixDomainProtocolProperties *UnixDomainProtocolProperties_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         UnixDomainProtocolProperties
       >
     UnixDomainProtocolProperties_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         UnixDomainProtocolProperties
@@ -1364,128 +1370,128 @@ namespace RTCORBA
     UnixDomainProtocolProperties_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export UnixDomainProtocolProperties
-    : public virtual RTCORBA::ProtocolProperties
+    : public virtual ::RTCORBA::ProtocolProperties
   {
   public:
     typedef UnixDomainProtocolProperties_ptr _ptr_type;
     typedef UnixDomainProtocolProperties_var _var_type;
-
+    
     // The static operations.
     static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj);
-
+    
     static UnixDomainProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static UnixDomainProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static UnixDomainProtocolProperties_ptr _nil (void)
     {
       return (UnixDomainProtocolProperties_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void send_buffer_size (
-        CORBA::Long send_buffer_size
+        ::CORBA::Long send_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void recv_buffer_size (
-        CORBA::Long recv_buffer_size
+        ::CORBA::Long recv_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     UnixDomainProtocolProperties (void);
-
+    
     virtual ~UnixDomainProtocolProperties (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     UnixDomainProtocolProperties (const UnixDomainProtocolProperties &);
-
+    
     void operator= (const UnixDomainProtocolProperties &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_
-
+  
   class SharedMemoryProtocolProperties;
   typedef SharedMemoryProtocolProperties *SharedMemoryProtocolProperties_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         SharedMemoryProtocolProperties
       >
     SharedMemoryProtocolProperties_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         SharedMemoryProtocolProperties
@@ -1493,74 +1499,179 @@ namespace RTCORBA
     SharedMemoryProtocolProperties_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export SharedMemoryProtocolProperties
-    : public virtual RTCORBA::ProtocolProperties
+    : public virtual ::RTCORBA::ProtocolProperties
   {
   public:
     typedef SharedMemoryProtocolProperties_ptr _ptr_type;
     typedef SharedMemoryProtocolProperties_var _var_type;
-
+    
     // The static operations.
     static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj);
-
+    
     static SharedMemoryProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static SharedMemoryProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static SharedMemoryProtocolProperties_ptr _nil (void)
     {
       return (SharedMemoryProtocolProperties_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Long send_buffer_size (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void send_buffer_size (
+        ::CORBA::Long send_buffer_size
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Long recv_buffer_size (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void recv_buffer_size (
+        ::CORBA::Long recv_buffer_size
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Boolean keep_alive (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void keep_alive (
+        ::CORBA::Boolean keep_alive
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Boolean dont_route (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void dont_route (
+        ::CORBA::Boolean dont_route
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Boolean no_delay (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void no_delay (
+        ::CORBA::Boolean no_delay
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Long preallocate_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void preallocate_buffer_size (
-        CORBA::Long preallocate_buffer_size
+        ::CORBA::Long preallocate_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * mmap_filename (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void mmap_filename (
         const char * mmap_filename
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1568,20 +1679,20 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * mmap_lockname (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void mmap_lockname (
         const char * mmap_lockname
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1589,85 +1700,406 @@ namespace RTCORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     SharedMemoryProtocolProperties (void);
-
+    
     virtual ~SharedMemoryProtocolProperties (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     SharedMemoryProtocolProperties (const SharedMemoryProtocolProperties &);
-
+    
     void operator= (const SharedMemoryProtocolProperties &);
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties;
+  
+  // TAO_IDL - Generated from
+  // be/be_interface.cpp:601
+
+#if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__VAR_OUT_CH_)
+#define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__VAR_OUT_CH_
+  
+  class UserDatagramProtocolProperties;
+  typedef UserDatagramProtocolProperties *UserDatagramProtocolProperties_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        UserDatagramProtocolProperties
+      >
+    UserDatagramProtocolProperties_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        UserDatagramProtocolProperties
+      >
+    UserDatagramProtocolProperties_out;
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be/be_visitor_interface/interface_ch.cpp:54
 
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties;
+#if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES_CH_)
+#define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES_CH_
+  
+  class TAO_RTCORBA_Export UserDatagramProtocolProperties
+    : public virtual ::RTCORBA::ProtocolProperties
+  {
+  public:
+    typedef UserDatagramProtocolProperties_ptr _ptr_type;
+    typedef UserDatagramProtocolProperties_var _var_type;
+    
+    // The static operations.
+    static UserDatagramProtocolProperties_ptr _duplicate (UserDatagramProtocolProperties_ptr obj);
+    
+    static UserDatagramProtocolProperties_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static UserDatagramProtocolProperties_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static UserDatagramProtocolProperties_ptr _nil (void)
+    {
+      return (UserDatagramProtocolProperties_ptr)0;
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Boolean enable_network_priority (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void enable_network_priority (
+        ::CORBA::Boolean enable_network_priority
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
+  protected:
+    // Abstract or local interface only.
+    UserDatagramProtocolProperties (void);
+    
+    virtual ~UserDatagramProtocolProperties (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    UserDatagramProtocolProperties (const UserDatagramProtocolProperties &);
+    
+    void operator= (const UserDatagramProtocolProperties &);
+  };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
-  // be\be_type.cpp:258
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UserDatagramProtocolProperties;
+  
+  // TAO_IDL - Generated from
+  // be/be_interface.cpp:601
 
-  struct PriorityBand;
+#if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__VAR_OUT_CH_)
+#define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__VAR_OUT_CH_
+  
+  class StreamControlProtocolProperties;
+  typedef StreamControlProtocolProperties *StreamControlProtocolProperties_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        StreamControlProtocolProperties
+      >
+    StreamControlProtocolProperties_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        StreamControlProtocolProperties
+      >
+    StreamControlProtocolProperties_out;
 
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:54
+
+#if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES_CH_)
+#define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES_CH_
+  
+  class TAO_RTCORBA_Export StreamControlProtocolProperties
+    : public virtual ::RTCORBA::ProtocolProperties
+  {
+  public:
+    typedef StreamControlProtocolProperties_ptr _ptr_type;
+    typedef StreamControlProtocolProperties_var _var_type;
+    
+    // The static operations.
+    static StreamControlProtocolProperties_ptr _duplicate (StreamControlProtocolProperties_ptr obj);
+    
+    static StreamControlProtocolProperties_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static StreamControlProtocolProperties_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static StreamControlProtocolProperties_ptr _nil (void)
+    {
+      return (StreamControlProtocolProperties_ptr)0;
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Long send_buffer_size (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void send_buffer_size (
+        ::CORBA::Long send_buffer_size
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Long recv_buffer_size (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void recv_buffer_size (
+        ::CORBA::Long recv_buffer_size
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Boolean keep_alive (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void keep_alive (
+        ::CORBA::Boolean keep_alive
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Boolean dont_route (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void dont_route (
+        ::CORBA::Boolean dont_route
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Boolean no_delay (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void no_delay (
+        ::CORBA::Boolean no_delay
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Boolean enable_network_priority (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void enable_network_priority (
+        ::CORBA::Boolean enable_network_priority
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
+  protected:
+    // Abstract or local interface only.
+    StreamControlProtocolProperties (void);
+    
+    virtual ~StreamControlProtocolProperties (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    StreamControlProtocolProperties (const StreamControlProtocolProperties &);
+    
+    void operator= (const StreamControlProtocolProperties &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StreamControlProtocolProperties;
+  
+  // TAO_IDL - Generated from
+  // be/be_type.cpp:258
+  
+  struct PriorityBand;
+  
   typedef
     TAO_Fixed_Var_T<
         PriorityBand
       >
     PriorityBand_var;
-
+  
   typedef
     PriorityBand &
     PriorityBand_out;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-
+  // be/be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_RTCORBA_Export PriorityBand
   {
     typedef PriorityBand_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     RTCORBA::Priority low;
     RTCORBA::Priority high;
   };
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBand;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
+  // be/be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CH_)
 #define _RTCORBA_PRIORITYBANDS_CH_
-
+  
   class PriorityBands;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         PriorityBands,
         PriorityBand
       >
     PriorityBands_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         PriorityBands,
@@ -1675,7 +2107,7 @@ namespace RTCORBA
         PriorityBand
       >
     PriorityBands_out;
-
+  
   class TAO_RTCORBA_Export PriorityBands
     : public
         TAO_Unbounded_Sequence<
@@ -1688,44 +2120,44 @@ namespace RTCORBA
     PriorityBands (
         CORBA::ULong max,
         CORBA::ULong length,
-        PriorityBand* buffer,
+        PriorityBand* buffer, 
         CORBA::Boolean release = 0
       );
     PriorityBands (const PriorityBands &);
     ~PriorityBands (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef PriorityBands_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBands;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
+  // be/be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_
-
+  
   class PriorityBandedConnectionPolicy;
   typedef PriorityBandedConnectionPolicy *PriorityBandedConnectionPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PriorityBandedConnectionPolicy
       >
     PriorityBandedConnectionPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PriorityBandedConnectionPolicy
@@ -1733,116 +2165,116 @@ namespace RTCORBA
     PriorityBandedConnectionPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
-
+  
   class TAO_RTCORBA_Export PriorityBandedConnectionPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef PriorityBandedConnectionPolicy_ptr _ptr_type;
     typedef PriorityBandedConnectionPolicy_var _var_type;
-
+    
     // The static operations.
     static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj);
-
+    
     static PriorityBandedConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PriorityBandedConnectionPolicy_ptr _nil (void)
     {
       return (PriorityBandedConnectionPolicy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PriorityBands * priority_bands (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PriorityBandedConnectionPolicy (void);
-
+    
     virtual ~PriorityBandedConnectionPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &);
-
+    
     void operator= (const PriorityBandedConnectionPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_CURRENT__VAR_OUT_CH_)
 #define _RTCORBA_CURRENT__VAR_OUT_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Current
@@ -1850,107 +2282,107 @@ namespace RTCORBA
     Current_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_CURRENT_CH_)
 #define _RTCORBA_CURRENT_CH_
-
+  
   class TAO_RTCORBA_Export Current
-    : public virtual CORBA::Current
+    : public virtual ::CORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-
+    
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-
+    
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _nil (void)
     {
       return (Current_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::Priority the_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void the_priority (
-        RTCORBA::Priority the_priority
+        ::RTCORBA::Priority the_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Current (void);
-
+    
     virtual ~Current (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-
+    
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_MUTEX__VAR_OUT_CH_)
 #define _RTCORBA_MUTEX__VAR_OUT_CH_
-
+  
   class Mutex;
   typedef Mutex *Mutex_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Mutex
       >
     Mutex_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Mutex
@@ -1958,117 +2390,117 @@ namespace RTCORBA
     Mutex_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_MUTEX_CH_)
 #define _RTCORBA_MUTEX_CH_
-
+  
   class TAO_RTCORBA_Export Mutex
     : public virtual CORBA::Object
   {
   public:
     typedef Mutex_ptr _ptr_type;
     typedef Mutex_var _var_type;
-
+    
     // The static operations.
     static Mutex_ptr _duplicate (Mutex_ptr obj);
-
+    
     static Mutex_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Mutex_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Mutex_ptr _nil (void)
     {
       return (Mutex_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void lock (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void unlock (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean try_lock (
-        TimeBase::TimeT max_wait
+        ::TimeBase::TimeT max_wait
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Mutex (void);
-
+    
     virtual ~Mutex (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Mutex (const Mutex &);
-
+    
     void operator= (const Mutex &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Mutex;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be/be_interface.cpp:601
 
 #if !defined (_RTCORBA_RTORB__VAR_OUT_CH_)
 #define _RTCORBA_RTORB__VAR_OUT_CH_
-
+  
   class RTORB;
   typedef RTORB *RTORB_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         RTORB
       >
     RTORB_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         RTORB
@@ -2076,79 +2508,79 @@ namespace RTCORBA
     RTORB_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // be/be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_RTORB_CH_)
 #define _RTCORBA_RTORB_CH_
-
+  
   class TAO_RTCORBA_Export RTORB
     : public virtual CORBA::Object
   {
   public:
     typedef RTORB_ptr _ptr_type;
     typedef RTORB_var _var_type;
-
+    
     // The static operations.
     static RTORB_ptr _duplicate (RTORB_ptr obj);
-
+    
     static RTORB_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RTORB_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RTORB_ptr _nil (void)
     {
       return (RTORB_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::Mutex_ptr create_mutex (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy_mutex (
-        RTCORBA::Mutex_ptr the_mutex
+        ::RTCORBA::Mutex_ptr the_mutex
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_MUTEXNOTFOUND_CH_)
 #define _RTCORBA_RTORB_MUTEXNOTFOUND_CH_
-
+    
     class TAO_RTCORBA_Export MutexNotFound : public CORBA::UserException
     {
     public:
-
+      
       MutexNotFound (void);
       MutexNotFound (const MutexNotFound &);
       ~MutexNotFound (void);
 
       MutexNotFound &operator= (const MutexNotFound &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static MutexNotFound *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2160,83 +2592,140 @@ namespace RTCORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
-
+      // be/be_visitor_exception/exception_ch.cpp:125
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    // be/be_visitor_typecode/typecode_decl.cpp:44
+    
     static ::CORBA::TypeCode_ptr _tc_MutexNotFound;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::Mutex_ptr create_named_mutex (
         const char * name,
-        CORBA::Boolean_out created_flag
+        ::CORBA::Boolean_out created_flag
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::Mutex_ptr open_named_mutex (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , RTCORBA::RTORB::MutexNotFound
+        CORBA::SystemException,
+        ::RTCORBA::RTORB::MutexNotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties (
-        CORBA::Long send_buffer_size,
-        CORBA::Long recv_buffer_size,
-        CORBA::Boolean keep_alive,
-        CORBA::Boolean dont_route,
-        CORBA::Boolean no_delay,
-        CORBA::Boolean enable_network_priority
+        ::CORBA::Long send_buffer_size,
+        ::CORBA::Long recv_buffer_size,
+        ::CORBA::Boolean keep_alive,
+        ::CORBA::Boolean dont_route,
+        ::CORBA::Boolean no_delay,
+        ::CORBA::Boolean enable_network_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties (
+        ::CORBA::Long send_buffer_size,
+        ::CORBA::Long recv_buffer_size
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::RTCORBA::SharedMemoryProtocolProperties_ptr create_shared_memory_protocol_properties (
+        ::CORBA::Long send_buffer_size,
+        ::CORBA::Long recv_buffer_size,
+        ::CORBA::Boolean keep_alive,
+        ::CORBA::Boolean dont_route,
+        ::CORBA::Boolean no_delay,
+        ::CORBA::Long preallocate_buffer_size,
+        const char * mmap_filename,
+        const char * mmap_lockname
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::RTCORBA::UserDatagramProtocolProperties_ptr create_user_datagram_protocol_properties (
+        ::CORBA::Boolean enable_network_priority
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::RTCORBA::StreamControlProtocolProperties_ptr create_stream_control_protocol_properties (
+        ::CORBA::Long send_buffer_size,
+        ::CORBA::Long recv_buffer_size,
+        ::CORBA::Boolean keep_alive,
+        ::CORBA::Boolean dont_route,
+        ::CORBA::Boolean no_delay,
+        ::CORBA::Boolean enable_network_priority
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be/be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_INVALIDTHREADPOOL_CH_)
 #define _RTCORBA_RTORB_INVALIDTHREADPOOL_CH_
-
+    
     class TAO_RTCORBA_Export InvalidThreadpool : public CORBA::UserException
     {
     public:
-
+      
       InvalidThreadpool (void);
       InvalidThreadpool (const InvalidThreadpool &);
       ~InvalidThreadpool (void);
 
       InvalidThreadpool &operator= (const InvalidThreadpool &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static InvalidThreadpool *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2248,174 +2737,174 @@ namespace RTCORBA
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
-
+      // be/be_visitor_exception/exception_ch.cpp:125
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    // be/be_visitor_typecode/typecode_decl.cpp:44
+    
     static ::CORBA::TypeCode_ptr _tc_InvalidThreadpool;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::ThreadpoolId create_threadpool (
-        CORBA::ULong stacksize,
-        CORBA::ULong static_threads,
-        CORBA::ULong dynamic_threads,
-        RTCORBA::Priority default_priority,
-        CORBA::Boolean allow_request_buffering,
-        CORBA::ULong max_buffered_requests,
-        CORBA::ULong max_request_buffer_size
+        ::CORBA::ULong stacksize,
+        ::CORBA::ULong static_threads,
+        ::CORBA::ULong dynamic_threads,
+        ::RTCORBA::Priority default_priority,
+        ::CORBA::Boolean allow_request_buffering,
+        ::CORBA::ULong max_buffered_requests,
+        ::CORBA::ULong max_request_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes (
-        CORBA::ULong stacksize,
-        const RTCORBA::ThreadpoolLanes & lanes,
-        CORBA::Boolean allow_borrowing,
-        CORBA::Boolean allow_request_buffering,
-        CORBA::ULong max_buffered_requests,
-        CORBA::ULong max_request_buffer_size
+        ::CORBA::ULong stacksize,
+        const ::RTCORBA::ThreadpoolLanes & lanes,
+        ::CORBA::Boolean allow_borrowing,
+        ::CORBA::Boolean allow_request_buffering,
+        ::CORBA::ULong max_buffered_requests,
+        ::CORBA::ULong max_request_buffer_size
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy_threadpool (
-        RTCORBA::ThreadpoolId threadpool
+        ::RTCORBA::ThreadpoolId threadpool
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , RTCORBA::RTORB::InvalidThreadpool
+        CORBA::SystemException,
+        ::RTCORBA::RTORB::InvalidThreadpool
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
-        RTCORBA::PriorityModel priority_model,
-        RTCORBA::Priority server_priority
+        ::RTCORBA::PriorityModel priority_model,
+        ::RTCORBA::Priority server_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
-        RTCORBA::ThreadpoolId threadpool
+        ::RTCORBA::ThreadpoolId threadpool
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
-        const RTCORBA::PriorityBands & priority_bands
+        const ::RTCORBA::PriorityBands & priority_bands
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
-        const RTCORBA::ProtocolList & protocols
+        const ::RTCORBA::ProtocolList & protocols
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
-        const RTCORBA::ProtocolList & protocols
+        const ::RTCORBA::ProtocolList & protocols
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
+    // be/be_visitor_operation/operation_ch.cpp:46
+    
     virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
+    // be/be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     RTORB (void);
-
+    
     virtual ~RTORB (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     RTORB (const RTORB &);
-
+    
     void operator= (const RTORB &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RTORB;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be/be_visitor_module/module_ch.cpp:66
 
 } // module RTCORBA
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:59
+// be/be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -2423,19 +2912,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityModelPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityModelPolicy>
   {
-    static RTCORBA::PriorityModelPolicy_ptr duplicate (
-        RTCORBA::PriorityModelPolicy_ptr
+    static ::RTCORBA::PriorityModelPolicy_ptr duplicate (
+        ::RTCORBA::PriorityModelPolicy_ptr
       );
     static void release (
-        RTCORBA::PriorityModelPolicy_ptr
+        ::RTCORBA::PriorityModelPolicy_ptr
       );
-    static RTCORBA::PriorityModelPolicy_ptr nil (void);
+    static ::RTCORBA::PriorityModelPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::PriorityModelPolicy_ptr p,
+        ::RTCORBA::PriorityModelPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2444,19 +2933,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY__TRAITS_CH_)
 #define _RTCORBA_THREADPOOLPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ThreadpoolPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ThreadpoolPolicy>
   {
-    static RTCORBA::ThreadpoolPolicy_ptr duplicate (
-        RTCORBA::ThreadpoolPolicy_ptr
+    static ::RTCORBA::ThreadpoolPolicy_ptr duplicate (
+        ::RTCORBA::ThreadpoolPolicy_ptr
       );
     static void release (
-        RTCORBA::ThreadpoolPolicy_ptr
+        ::RTCORBA::ThreadpoolPolicy_ptr
       );
-    static RTCORBA::ThreadpoolPolicy_ptr nil (void);
+    static ::RTCORBA::ThreadpoolPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::ThreadpoolPolicy_ptr p,
+        ::RTCORBA::ThreadpoolPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2465,19 +2954,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ProtocolProperties>
   {
-    static RTCORBA::ProtocolProperties_ptr duplicate (
-        RTCORBA::ProtocolProperties_ptr
+    static ::RTCORBA::ProtocolProperties_ptr duplicate (
+        ::RTCORBA::ProtocolProperties_ptr
       );
     static void release (
-        RTCORBA::ProtocolProperties_ptr
+        ::RTCORBA::ProtocolProperties_ptr
       );
-    static RTCORBA::ProtocolProperties_ptr nil (void);
+    static ::RTCORBA::ProtocolProperties_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::ProtocolProperties_ptr p,
+        ::RTCORBA::ProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2486,19 +2975,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ServerProtocolPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ServerProtocolPolicy>
   {
-    static RTCORBA::ServerProtocolPolicy_ptr duplicate (
-        RTCORBA::ServerProtocolPolicy_ptr
+    static ::RTCORBA::ServerProtocolPolicy_ptr duplicate (
+        ::RTCORBA::ServerProtocolPolicy_ptr
       );
     static void release (
-        RTCORBA::ServerProtocolPolicy_ptr
+        ::RTCORBA::ServerProtocolPolicy_ptr
       );
-    static RTCORBA::ServerProtocolPolicy_ptr nil (void);
+    static ::RTCORBA::ServerProtocolPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::ServerProtocolPolicy_ptr p,
+        ::RTCORBA::ServerProtocolPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2507,19 +2996,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ClientProtocolPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ClientProtocolPolicy>
   {
-    static RTCORBA::ClientProtocolPolicy_ptr duplicate (
-        RTCORBA::ClientProtocolPolicy_ptr
+    static ::RTCORBA::ClientProtocolPolicy_ptr duplicate (
+        ::RTCORBA::ClientProtocolPolicy_ptr
       );
     static void release (
-        RTCORBA::ClientProtocolPolicy_ptr
+        ::RTCORBA::ClientProtocolPolicy_ptr
       );
-    static RTCORBA::ClientProtocolPolicy_ptr nil (void);
+    static ::RTCORBA::ClientProtocolPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::ClientProtocolPolicy_ptr p,
+        ::RTCORBA::ClientProtocolPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2528,19 +3017,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PrivateConnectionPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PrivateConnectionPolicy>
   {
-    static RTCORBA::PrivateConnectionPolicy_ptr duplicate (
-        RTCORBA::PrivateConnectionPolicy_ptr
+    static ::RTCORBA::PrivateConnectionPolicy_ptr duplicate (
+        ::RTCORBA::PrivateConnectionPolicy_ptr
       );
     static void release (
-        RTCORBA::PrivateConnectionPolicy_ptr
+        ::RTCORBA::PrivateConnectionPolicy_ptr
       );
-    static RTCORBA::PrivateConnectionPolicy_ptr nil (void);
+    static ::RTCORBA::PrivateConnectionPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::PrivateConnectionPolicy_ptr p,
+        ::RTCORBA::PrivateConnectionPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2549,19 +3038,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::TCPProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::TCPProtocolProperties>
   {
-    static RTCORBA::TCPProtocolProperties_ptr duplicate (
-        RTCORBA::TCPProtocolProperties_ptr
+    static ::RTCORBA::TCPProtocolProperties_ptr duplicate (
+        ::RTCORBA::TCPProtocolProperties_ptr
       );
     static void release (
-        RTCORBA::TCPProtocolProperties_ptr
+        ::RTCORBA::TCPProtocolProperties_ptr
       );
-    static RTCORBA::TCPProtocolProperties_ptr nil (void);
+    static ::RTCORBA::TCPProtocolProperties_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::TCPProtocolProperties_ptr p,
+        ::RTCORBA::TCPProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2570,19 +3059,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::GIOPProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::GIOPProtocolProperties>
   {
-    static RTCORBA::GIOPProtocolProperties_ptr duplicate (
-        RTCORBA::GIOPProtocolProperties_ptr
+    static ::RTCORBA::GIOPProtocolProperties_ptr duplicate (
+        ::RTCORBA::GIOPProtocolProperties_ptr
       );
     static void release (
-        RTCORBA::GIOPProtocolProperties_ptr
+        ::RTCORBA::GIOPProtocolProperties_ptr
       );
-    static RTCORBA::GIOPProtocolProperties_ptr nil (void);
+    static ::RTCORBA::GIOPProtocolProperties_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::GIOPProtocolProperties_ptr p,
+        ::RTCORBA::GIOPProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2591,19 +3080,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::UnixDomainProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::UnixDomainProtocolProperties>
   {
-    static RTCORBA::UnixDomainProtocolProperties_ptr duplicate (
-        RTCORBA::UnixDomainProtocolProperties_ptr
+    static ::RTCORBA::UnixDomainProtocolProperties_ptr duplicate (
+        ::RTCORBA::UnixDomainProtocolProperties_ptr
       );
     static void release (
-        RTCORBA::UnixDomainProtocolProperties_ptr
+        ::RTCORBA::UnixDomainProtocolProperties_ptr
       );
-    static RTCORBA::UnixDomainProtocolProperties_ptr nil (void);
+    static ::RTCORBA::UnixDomainProtocolProperties_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::UnixDomainProtocolProperties_ptr p,
+        ::RTCORBA::UnixDomainProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2612,19 +3101,61 @@ namespace TAO
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::SharedMemoryProtocolProperties>
+  {
+    static ::RTCORBA::SharedMemoryProtocolProperties_ptr duplicate (
+        ::RTCORBA::SharedMemoryProtocolProperties_ptr
+      );
+    static void release (
+        ::RTCORBA::SharedMemoryProtocolProperties_ptr
+      );
+    static ::RTCORBA::SharedMemoryProtocolProperties_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::RTCORBA::SharedMemoryProtocolProperties_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
 
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__TRAITS_CH_)
+#define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::UserDatagramProtocolProperties>
+  {
+    static ::RTCORBA::UserDatagramProtocolProperties_ptr duplicate (
+        ::RTCORBA::UserDatagramProtocolProperties_ptr
+      );
+    static void release (
+        ::RTCORBA::UserDatagramProtocolProperties_ptr
+      );
+    static ::RTCORBA::UserDatagramProtocolProperties_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::RTCORBA::UserDatagramProtocolProperties_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__TRAITS_CH_)
+#define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__TRAITS_CH_
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::StreamControlProtocolProperties>
   {
-    static RTCORBA::SharedMemoryProtocolProperties_ptr duplicate (
-        RTCORBA::SharedMemoryProtocolProperties_ptr
+    static ::RTCORBA::StreamControlProtocolProperties_ptr duplicate (
+        ::RTCORBA::StreamControlProtocolProperties_ptr
       );
     static void release (
-        RTCORBA::SharedMemoryProtocolProperties_ptr
+        ::RTCORBA::StreamControlProtocolProperties_ptr
       );
-    static RTCORBA::SharedMemoryProtocolProperties_ptr nil (void);
+    static ::RTCORBA::StreamControlProtocolProperties_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::SharedMemoryProtocolProperties_ptr p,
+        ::RTCORBA::StreamControlProtocolProperties_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2633,19 +3164,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityBandedConnectionPolicy>
   {
-    static RTCORBA::PriorityBandedConnectionPolicy_ptr duplicate (
-        RTCORBA::PriorityBandedConnectionPolicy_ptr
+    static ::RTCORBA::PriorityBandedConnectionPolicy_ptr duplicate (
+        ::RTCORBA::PriorityBandedConnectionPolicy_ptr
       );
     static void release (
-        RTCORBA::PriorityBandedConnectionPolicy_ptr
+        ::RTCORBA::PriorityBandedConnectionPolicy_ptr
       );
-    static RTCORBA::PriorityBandedConnectionPolicy_ptr nil (void);
+    static ::RTCORBA::PriorityBandedConnectionPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::PriorityBandedConnectionPolicy_ptr p,
+        ::RTCORBA::PriorityBandedConnectionPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2654,19 +3185,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_CURRENT__TRAITS_CH_)
 #define _RTCORBA_CURRENT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Current>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Current>
   {
-    static RTCORBA::Current_ptr duplicate (
-        RTCORBA::Current_ptr
+    static ::RTCORBA::Current_ptr duplicate (
+        ::RTCORBA::Current_ptr
       );
     static void release (
-        RTCORBA::Current_ptr
+        ::RTCORBA::Current_ptr
       );
-    static RTCORBA::Current_ptr nil (void);
+    static ::RTCORBA::Current_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::Current_ptr p,
+        ::RTCORBA::Current_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2675,19 +3206,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_MUTEX__TRAITS_CH_)
 #define _RTCORBA_MUTEX__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Mutex>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Mutex>
   {
-    static RTCORBA::Mutex_ptr duplicate (
-        RTCORBA::Mutex_ptr
+    static ::RTCORBA::Mutex_ptr duplicate (
+        ::RTCORBA::Mutex_ptr
       );
     static void release (
-        RTCORBA::Mutex_ptr
+        ::RTCORBA::Mutex_ptr
       );
-    static RTCORBA::Mutex_ptr nil (void);
+    static ::RTCORBA::Mutex_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::Mutex_ptr p,
+        ::RTCORBA::Mutex_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2696,19 +3227,19 @@ namespace TAO
 
 #if !defined (_RTCORBA_RTORB__TRAITS_CH_)
 #define _RTCORBA_RTORB__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::RTORB>
+  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::RTORB>
   {
-    static RTCORBA::RTORB_ptr duplicate (
-        RTCORBA::RTORB_ptr
+    static ::RTCORBA::RTORB_ptr duplicate (
+        ::RTCORBA::RTORB_ptr
       );
     static void release (
-        RTCORBA::RTORB_ptr
+        ::RTCORBA::RTORB_ptr
       );
-    static RTCORBA::RTORB_ptr nil (void);
+    static ::RTCORBA::RTORB_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTCORBA::RTORB_ptr p,
+        ::RTCORBA::RTORB_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -2717,7 +3248,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be/be_visitor_structure/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLane &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLane*); // noncopying version
@@ -2725,7 +3256,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLane *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be/be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLanes &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLanes*); // noncopying version
@@ -2733,34 +3264,34 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLanes *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
+// be/be_visitor_enum/any_op_ch.cpp:51
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModel);
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModel &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be/be_visitor_structure/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::Protocol &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Protocol*); // noncopying version
@@ -2768,7 +3299,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::Protocol *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be/be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ProtocolList &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolList*); // noncopying version
@@ -2776,56 +3307,70 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ProtocolList *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr &);
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface/any_op_ch.cpp:52
+
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr); // copying
+TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr *); // non-copying
+TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr &);
+
+// TAO_IDL - Generated from
+// be/be_visitor_structure/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBand &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBand*); // noncopying version
@@ -2833,7 +3378,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBand *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be/be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBands &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBands*); // noncopying version
@@ -2841,35 +3386,35 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBands *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Current_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Mutex_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be/be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+// be/be_visitor_exception/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::MutexNotFound &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::MutexNotFound*); // noncopying version
@@ -2877,7 +3422,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::MutexNotFound *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+// be/be_visitor_exception/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::InvalidThreadpool*); // noncopying version
@@ -2885,13 +3430,13 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
+// be/be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::ThreadpoolLane &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::ThreadpoolLane &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be/be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
 #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
@@ -2908,19 +3453,19 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
+// be/be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityModel &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityModel &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
+// be/be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityBand &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityBand &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be/be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_H_
 #define _TAO_CDR_OP_RTCORBA_PriorityBands_H_
@@ -2937,10 +3482,10 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be/be_codegen.cpp:964
 
 #if defined (__ACE_INLINE__)
-#include "RTCORBAC.i"
+#include "RTCORBAC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -2954,3 +3499,5 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/RTCORBA/RTCORBAC.i b/TAO/tao/RTCORBA/RTCORBAC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/RTCORBA/RTCORBAC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index 80a4d36d132..9bc7068f28c 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -14,11 +14,7 @@
 
 #include "ace/Thread.h"
 
-#if !defined (__ACE_INLINE__)
-#include "RT_Current.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (TAO,
+ACE_RCSID (RTCORBA,
            RT_Current,
            "$Id$")
 
@@ -35,13 +31,14 @@ RTCORBA::Priority
 TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  RTCORBA::Priority priority;
+  TAO_Protocols_Hooks *tph =
+    this->orb_core_->get_protocols_hooks ();
 
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  RTCORBA::Priority priority;
 
-  int result = tph->get_thread_CORBA_priority (priority
-                                               ACE_ENV_ARG_PARAMETER);
+  int result =
+    tph->get_thread_CORBA_priority (priority
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == -1)
@@ -56,11 +53,12 @@ TAO_RT_Current::the_priority (RTCORBA::Priority the_priority
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Protocols_Hooks *tph =
+    this->orb_core_->get_protocols_hooks ();
 
-  int result = tph->set_thread_CORBA_priority (the_priority
-                                               ACE_ENV_ARG_PARAMETER);
+  int result =
+    tph->set_thread_CORBA_priority (the_priority
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == -1)
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index 13b772ee54d..eed5b7e39f9 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -30,9 +30,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -72,12 +70,7 @@ private:
 
 };
 
-
-#if defined (__ACE_INLINE__)
-# include "RT_Current.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_Current.i b/TAO/tao/RTCORBA/RT_Current.i
deleted file mode 100644
index 5c1113b7585..00000000000
--- a/TAO/tao/RTCORBA/RT_Current.i
+++ /dev/null
@@ -1,4 +0,0 @@
-//
-// $Id$
-//
-
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index 2b9cfc163ce..b8e4d6d2ee2 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -8,26 +8,26 @@
 
 #include "RT_Stub.h"
 
-ACE_RCSID (RTCORBA, 
-           RT_Endpoint_Utils, 
+ACE_RCSID (RTCORBA,
+           RT_Endpoint_Utils,
            "$Id$")
 
 // ****************************************************************
 
 CORBA::Policy *
-TAO_RT_Endpoint_Utils::priority_bands_policy (TAO::Profile_Transport_Resolver &r
-                                              ACE_ENV_ARG_DECL)
+TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type,
+                               TAO::Profile_Transport_Resolver &r
+                               ACE_ENV_ARG_DECL)
 {
-  CORBA::Policy *bands_policy = CORBA::Policy::_nil ();
+  CORBA::Policy *policy = CORBA::Policy::_nil ();
 
   TAO_RT_Stub *rt_stub = dynamic_cast<TAO_RT_Stub *> (r.stub ());
 
   ACE_TRY
     {
-      bands_policy =
-        rt_stub->effective_priority_banded_connection (
-                     ACE_ENV_SINGLE_ARG_PARAMETER
-                   );
+      policy =
+        rt_stub->get_cached_policy (type
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
@@ -36,7 +36,8 @@ TAO_RT_Endpoint_Utils::priority_bands_policy (TAO::Profile_Transport_Resolver &r
         {
           CORBA::PolicyList *p = r.inconsistent_policies ();
           p->length (1);
-          (*p)[0u] = rt_stub->priority_banded_connection ();
+          (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type
+                                                           ACE_ENV_ARG_PARAMETER);
         }
 
       ACE_RE_THROW;
@@ -44,44 +45,7 @@ TAO_RT_Endpoint_Utils::priority_bands_policy (TAO::Profile_Transport_Resolver &r
   ACE_ENDTRY;
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
-  return bands_policy;
-}
-
-/*static*/ CORBA::Policy *
-TAO_RT_Endpoint_Utils::client_protocol_policy (
-    TAO::Profile_Transport_Resolver &r
-    ACE_ENV_ARG_DECL)
-{
-  CORBA::Policy *retval = 0;
-
-  TAO_RT_Stub *rt_stub = dynamic_cast<TAO_RT_Stub *> (r.stub ());
-
-  if (rt_stub == 0)
-    {
-      return 0;
-    }
-
-  ACE_TRY
-    {
-      retval =
-        rt_stub->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::INV_POLICY, ex)
-    {
-      if (r.inconsistent_policies ())
-        {
-          CORBA::PolicyList *p = r.inconsistent_policies ();
-          p->length (1);
-          (*p)[0u] = rt_stub->client_protocol ();
-        }
-
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return retval;
+  return policy;
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
index 8f07301babb..d918ef4a12b 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
@@ -43,15 +43,10 @@ namespace TAO
 class TAO_RTCORBA_Export TAO_RT_Endpoint_Utils
 {
 public:
-  static CORBA::Policy *priority_bands_policy (
-      TAO::Profile_Transport_Resolver &r
-      ACE_ENV_ARG_DECL
-    );
-
-  static CORBA::Policy *client_protocol_policy (
-      TAO::Profile_Transport_Resolver &r
-      ACE_ENV_ARG_DECL
-    );
+  static 
+  CORBA::Policy *policy (TAO_Cached_Policy_Type type,
+                         TAO::Profile_Transport_Resolver &r
+                         ACE_ENV_ARG_DECL);
 
 private:
   /// ctor.
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 944dbeddb83..757beea5e38 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -18,11 +18,6 @@
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/ORB_Core.h"
 
-#if !defined (__ACE_INLINE__)
-#include "RT_Invocation_Endpoint_Selectors.i"
-#endif /* __ACE_INLINE__ */
-
-
 ACE_RCSID (RTCORBA,
            RT_Invocation_Endpoint_Selectors,
            "$Id$")
@@ -37,8 +32,9 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint (
     ACE_THROW (CORBA::INTERNAL ());
 
   CORBA::Policy_var client_protocol_policy_base =
-    TAO_RT_Endpoint_Utils::client_protocol_policy (*r
-                                                   ACE_ENV_ARG_PARAMETER);
+    TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL,
+                                   *r
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (client_protocol_policy_base.ptr () == 0)
@@ -173,27 +169,17 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
   TAO_RT_Stub *rt_stub =
     dynamic_cast <TAO_RT_Stub *> (r.stub ());
 
-  if (rt_stub == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Unexpected error narrowing stub to TAO_RT_Stub"));
-
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                           CORBA::SystemException::_tao_minor_code (
-                              TAO_DEFAULT_MINOR_CODE,
-                              EINVAL),
-                           CORBA::COMPLETED_NO),
-                        0);
-    }
-
   // Get the priority model policy.
   CORBA::Policy_var priority_model_policy =
-    rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
+    rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the bands policy.
   CORBA::Policy_var bands_policy =
-    TAO_RT_Endpoint_Utils::priority_bands_policy (r
-                                                  ACE_ENV_ARG_PARAMETER);
+    TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION,
+                                   r
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int all_endpoints_are_valid = 0;
@@ -206,7 +192,6 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
   // If the priority model policy is not set.
   if (priority_model_policy.ptr () == 0)
     {
-
       // Bands without priority model do not make sense.
       if (bands_policy.ptr () != 0)
         {
@@ -232,8 +217,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
     {
       // Get the protocol hooks.
       TAO_Protocols_Hooks *protocol_hooks =
-        r.stub ()->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        r.stub ()->orb_core ()->get_protocols_hooks ();
 
       CORBA::Short server_priority = 0;
       CORBA::Boolean is_client_propagated = 0;
@@ -350,7 +334,12 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
           TAO_RT_Transport_Descriptor
             rt_transport_descriptor (ep);
 
-          if (rt_stub->private_connection ())
+          CORBA::Policy_var private_connection_policy =
+            rt_stub->get_cached_policy (TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION
+                                        ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          if (!CORBA::is_nil (private_connection_policy.in ()))
             {
               private_connection_descriptor_property.init
                 (ACE_static_cast (long,
@@ -373,7 +362,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
             r.try_connect (&rt_transport_descriptor,
                            val
                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          ACE_CHECK_RETURN (0);
 
           // Check if the invocation has completed.
           if (status == true)
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
index d06f83a5b20..539cc86f44b 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
@@ -66,10 +66,6 @@ protected:
                              ACE_ENV_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-# include "RT_Invocation_Endpoint_Selectors.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.i b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index 69b2959f82b..93117952560 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -6,7 +6,9 @@
 #include "RT_ORB.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(TAO, RT_Mutex, "$Id$")
+ACE_RCSID(RTCORBA,
+          RT_Mutex,
+          "$Id$")
 
 TAO_RT_Mutex::TAO_RT_Mutex (void)
 {
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index 33c0d8985e4..c12409e8cd0 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -33,9 +33,7 @@
 #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -110,7 +108,7 @@ protected:
 };
 #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_Mutex.i b/TAO/tao/RTCORBA/RT_Mutex.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/tao/RTCORBA/RT_Mutex.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 3a7668facc8..e853862a9e4 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -13,11 +13,9 @@
 #include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
 #include "ace/Sched_Params.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_ORB.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(TAO, RT_ORB, "$Id$")
+ACE_RCSID(RTCORBA,
+          RT_ORB,
+          "$Id$")
 
 TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core),
@@ -244,9 +242,9 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException ))
 {
-  TAO_TCP_Properties *tmp;
+  TAO_TCP_Protocol_Properties *tmp;
   ACE_NEW_THROW_EX (tmp,
-                    TAO_TCP_Properties (send_buffer_size,
+                    TAO_TCP_Protocol_Properties (send_buffer_size,
                                         recv_buffer_size,
                                         keep_alive,
                                         dont_route,
@@ -259,6 +257,99 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
   return tmp;
 }
 
+RTCORBA::UnixDomainProtocolProperties_ptr 
+TAO_RT_ORB::create_unix_domain_protocol_properties (
+                                                    CORBA::Long send_buffer_size,
+                                                    CORBA::Long recv_buffer_size
+                                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO_UnixDomain_Protocol_Properties *tmp;
+  ACE_NEW_THROW_EX (tmp,
+                    TAO_UnixDomain_Protocol_Properties (
+                                               send_buffer_size,
+                                               recv_buffer_size),
+                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                      CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (RTCORBA::UnixDomainProtocolProperties::_nil ());
+
+  return tmp;
+}
+
+RTCORBA::SharedMemoryProtocolProperties_ptr 
+TAO_RT_ORB::create_shared_memory_protocol_properties (
+                                                      CORBA::Long send_buffer_size,
+                                                      CORBA::Long recv_buffer_size,
+                                                      CORBA::Boolean keep_alive,
+                                                      CORBA::Boolean dont_route,
+                                                      CORBA::Boolean no_delay,
+                                                      CORBA::Long preallocate_buffer_size,
+                                                      const char *mmap_filename,
+                                                      const char *mmap_lockname
+                                                      ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO_SharedMemory_Protocol_Properties *tmp;
+  ACE_NEW_THROW_EX (tmp,
+                    TAO_SharedMemory_Protocol_Properties (send_buffer_size,                                                          
+                                                          recv_buffer_size,
+                                                          keep_alive,
+                                                          dont_route,
+                                                          no_delay,
+                                                          preallocate_buffer_size,
+                                                          mmap_filename,
+                                                          mmap_lockname),
+                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                      CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (RTCORBA::SharedMemoryProtocolProperties::_nil ());
+  
+  return tmp;
+}
+
+RTCORBA::UserDatagramProtocolProperties_ptr 
+TAO_RT_ORB::create_user_datagram_protocol_properties (
+                                                      CORBA::Boolean enable_network_priority
+                                                      ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO_UserDatagram_Protocol_Properties *tmp;
+  ACE_NEW_THROW_EX (tmp,
+                    TAO_UserDatagram_Protocol_Properties (
+                                                 enable_network_priority),
+                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                      CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (RTCORBA::UserDatagramProtocolProperties::_nil ());
+
+  return tmp;
+}
+
+RTCORBA::StreamControlProtocolProperties_ptr 
+TAO_RT_ORB::create_stream_control_protocol_properties (
+                                                       CORBA::Long send_buffer_size,
+                                                       CORBA::Long recv_buffer_size,
+                                                       CORBA::Boolean keep_alive,
+                                                       CORBA::Boolean dont_route,
+                                                       CORBA::Boolean no_delay,
+                                                       CORBA::Boolean enable_network_priority
+                                                       ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO_StreamControl_Protocol_Properties *tmp;
+  ACE_NEW_THROW_EX (tmp,
+                    TAO_StreamControl_Protocol_Properties (
+                                                  send_buffer_size,
+                                                  recv_buffer_size,
+                                                  keep_alive,
+                                                  dont_route,
+                                                  no_delay,
+                                                  enable_network_priority),
+                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                      CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (RTCORBA::StreamControlProtocolProperties::_nil ());
+  
+  return tmp;
+}
+
 RTCORBA::ThreadpoolId
 TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                CORBA::ULong static_threads,
@@ -401,11 +492,17 @@ TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protoco
 }
 
 TAO_Thread_Pool_Manager &
-TAO_RT_ORB::tp_manager (void)
+TAO_RT_ORB::tp_manager (void) const
 {
   return *this->tp_manager_;
 }
 
+TAO_ORB_Core *
+TAO_RT_ORB::orb_core (void) const
+{
+  return this->orb_core_;
+}
+
 /* static */
 int
 TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb)
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index dc1c275f057..9b5daea2202 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -33,9 +33,7 @@
 #endif
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -149,7 +147,7 @@ public:
    * Create and return a TCPProtocolProperties instance with the specified
    * parameters.
    */
-  virtual RTCORBA::TCPProtocolProperties_ptr
+  RTCORBA::TCPProtocolProperties_ptr
   create_tcp_protocol_properties (
                                   CORBA::Long send_buffer_size,
                                   CORBA::Long recv_buffer_size,
@@ -160,6 +158,43 @@ public:
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException ));
 
+  RTCORBA::UnixDomainProtocolProperties_ptr
+  create_unix_domain_protocol_properties (
+                                          CORBA::Long send_buffer_size,
+                                          CORBA::Long recv_buffer_size
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  RTCORBA::SharedMemoryProtocolProperties_ptr
+  create_shared_memory_protocol_properties (
+                                            CORBA::Long send_buffer_size,
+                                            CORBA::Long recv_buffer_size,
+                                            CORBA::Boolean keep_alive,
+                                            CORBA::Boolean dont_route,
+                                            CORBA::Boolean no_delay,
+                                            CORBA::Long preallocate_buffer_size,
+                                            const char *mmap_filename,
+                                            const char *mmap_lockname
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  RTCORBA::UserDatagramProtocolProperties_ptr
+  create_user_datagram_protocol_properties (
+                                            CORBA::Boolean enable_network_priority
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  RTCORBA::StreamControlProtocolProperties_ptr
+  create_stream_control_protocol_properties (
+                                             CORBA::Long send_buffer_size,
+                                             CORBA::Long recv_buffer_size,
+                                             CORBA::Boolean keep_alive,
+                                             CORBA::Boolean dont_route,
+                                             CORBA::Boolean no_delay,
+                                             CORBA::Boolean enable_network_priority
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
   /// Create a RTCORBA threadpool to manage a set of threads without lanes.
   virtual RTCORBA::ThreadpoolId
   create_threadpool (CORBA::ULong stacksize,
@@ -243,8 +278,11 @@ public:
                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// Reference to our creating ORB Core.
+  TAO_ORB_Core *orb_core (void) const;
+
   /// Get the Thread Pool Manager.
-  TAO_Thread_Pool_Manager &tp_manager (void);
+  TAO_Thread_Pool_Manager &tp_manager (void) const;
 
   /**
    * This method changes the scheduling policy of the calling thread
@@ -268,7 +306,7 @@ protected:
   /// reference counted object.
   virtual ~TAO_RT_ORB (void);
 
-  /// Reference to our creating ORB.
+  /// Reference to our creating ORB Core.
   TAO_ORB_Core *orb_core_;
 
   /// mutex_mgr_ manages the names associated with named mutexes.
@@ -278,11 +316,7 @@ protected:
   TAO_Thread_Pool_Manager *tp_manager_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_ORB.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_ORB.i b/TAO/tao/RTCORBA/RT_ORB.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/tao/RTCORBA/RT_ORB.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index bd85054a4d8..ec3e48e2520 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -35,8 +35,8 @@ ACE_RCSID (RTCORBA,
 #include "ace/Svc_Conf.h"
 #include "ace/Sched_Params.h"
 
-static const char *rt_poa_factory_name = "TAO_RT_POA";
-static const char *rt_poa_factory_directive = "dynamic TAO_RT_POA Service_Object * TAO_RTPortableServer:_make_TAO_RT_Object_Adapter_Factory()";
+static const char *rt_poa_factory_name = "TAO_RT_Object_Adapter_Factory";
+static const char *rt_poa_factory_directive = "dynamic TAO_RT_Object_Adapter_Factory Service_Object * TAO_RTPortableServer:_make_TAO_RT_Object_Adapter_Factory()";
 
 TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type,
                                               int network_priority_mapping_type,
@@ -81,14 +81,6 @@ TAO_RT_ORBInitializer::pre_init (
   TAO_ORB_Core::set_poa_factory (rt_poa_factory_name,
                                  rt_poa_factory_directive);
 
-  // Sets the client_protocol policy.
-  TAO_RT_Protocols_Hooks::set_client_protocols_hook
-    (TAO_ClientProtocolPolicy::hook);
-
-  // Sets the server_protocol policy.
-  TAO_RT_Protocols_Hooks::set_server_protocols_hook
-    (TAO_ServerProtocolPolicy::hook);
-
   // Create the initial priority mapping instance.
   TAO_Priority_Mapping *pm;
   switch (this->priority_mapping_type_)
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index 88950e2394d..d64f3a8ccf9 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -34,9 +34,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -123,7 +121,7 @@ private:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h
index 5be40291ac2..078bdfdd440 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.h
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h
@@ -33,9 +33,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -58,7 +56,7 @@ public:
                      CORBA::PolicyError));
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index c2bd94a1566..d66dfa8efb5 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -11,16 +11,10 @@
 
 #include "ace/OS_NS_string.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_Policy_i.i"
-#endif /* __ACE_INLINE__ */
-
-
 ACE_RCSID (RTCORBA,
            RT_Policy_i,
            "$Id$")
 
-
 // ****************************************************************
 
 TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (RTCORBA::PriorityModel priority_model,
@@ -148,8 +142,7 @@ TAO_PriorityModelPolicy::_tao_scope (void) const
   // copied to the list of client exposed policies.
   return ACE_static_cast (TAO_Policy_Scope,
                           TAO_POLICY_ORB_SCOPE |
-                          TAO_POLICY_POA_SCOPE |
-                          TAO_POLICY_CLIENT_EXPOSED);
+                          TAO_POLICY_POA_SCOPE);
 }
 
 // ****************************************************************
@@ -533,180 +526,6 @@ TAO_ServerProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
-int
-TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
-                                int &send_buffer_size,
-                                int &recv_buffer_size,
-                                int &no_delay,
-                                int &enable_network_priority,
-                                const char *protocol_type)
-{
-  RTCORBA::ProtocolProperties_var properties =
-    RTCORBA::ProtocolProperties::_nil ();
-
-  // ServerProtocolProperties policy controls protocols configuration.
-  // Look for protocol properties in the effective ServerProtocolPolicy.
-  CORBA::Policy_var policy =
-    orb_core->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      RTCORBA::ServerProtocolPolicy_var server_protocols_policy;
-      TAO_ServerProtocolPolicy *server_protocols = 0;
-
-      if (!CORBA::is_nil (policy.in ()))
-        {
-          server_protocols_policy =
-            RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          server_protocols =
-            ACE_dynamic_cast (TAO_ServerProtocolPolicy *,
-                              server_protocols_policy.in ());
-
-          if (server_protocols != 0)
-            {
-              RTCORBA::ProtocolList & protocols =
-                server_protocols->protocols_rep ();
-
-              // Find protocol properties.
-              for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-                {
-                  if (protocols[j].protocol_type == IOP::TAG_INTERNET_IOP)
-                    {
-                      properties =
-                        RTCORBA::ProtocolProperties::_narrow (
-                          protocols[j].transport_protocol_properties.in ()
-                          ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
-
-                      if (ACE_OS::strcmp (protocol_type,
-                                          "iiop") == 0)
-                        break;
-                    }
-                  else if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE)
-                    {
-                      properties =
-                        RTCORBA::ProtocolProperties::_narrow (
-                          protocols[j].transport_protocol_properties.in ()
-                          ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
-
-                        if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
-                          break;
-                    }
-                }
-            }
-        }
-
-      if (CORBA::is_nil (properties.in ()))
-        {
-          // TCP/UIOP/SHMIOP Properties were not specified in the
-          // effective policy.
-          // We must use ORB defaults.
-          policy = orb_core->get_default_policies ()->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
-
-          if (!CORBA::is_nil (policy.in ()))
-            {
-              server_protocols_policy =
-                RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              server_protocols =
-                ACE_dynamic_cast (TAO_ServerProtocolPolicy *,
-                                  server_protocols_policy.in ());
-
-              if (!CORBA::is_nil (server_protocols))
-                {
-                  // Find protocol properties for IIOP.
-                  RTCORBA::ProtocolList & protocols =
-                    server_protocols->protocols_rep ();
-
-                  for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-                    {
-                      if (protocols[j].protocol_type == IOP::TAG_INTERNET_IOP)
-                        {
-                          properties =
-                            RTCORBA::ProtocolProperties::_narrow (
-                              protocols[j].transport_protocol_properties.in ()
-                              ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
-
-                          if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-                            break;
-                        }
-                      else if (protocols[j].protocol_type ==
-                                 TAO_TAG_UIOP_PROFILE)
-                        {
-                          properties =
-                            RTCORBA::ProtocolProperties::_narrow (
-                              protocols[j].transport_protocol_properties.in ()
-                              ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
-
-                          if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-      if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-        {
-          RTCORBA::TCPProtocolProperties_var tcp_properties =
-            RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          send_buffer_size =
-            tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          recv_buffer_size =
-            tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          enable_network_priority =
-            tcp_properties->enable_network_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
-        {
-          RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
-            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (!CORBA::is_nil (uiop_properties.in ()))
-            {
-              // Extract and locally store properties of interest.
-              send_buffer_size =
-                uiop_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-              recv_buffer_size =
-                uiop_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_ServerProtocolPolicy::hook");
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
 TAO_Cached_Policy_Type
 TAO_ServerProtocolPolicy::_tao_cached_type (void) const
 {
@@ -818,177 +637,6 @@ TAO_ClientProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
-int
-TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
-                                int &send_buffer_size,
-                                int &recv_buffer_size,
-                                int &no_delay,
-                                int &enable_network_priority,
-                                const char *protocol_type)
-{
-  RTCORBA::ProtocolProperties_var properties =
-    RTCORBA::ProtocolProperties::_nil ();
-
-  // Check ORB-level override for properties.
-  CORBA::Policy_var policy =
-    orb_core->policy_manager ()->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      RTCORBA::ClientProtocolPolicy_var client_protocols_policy;
-      TAO_ClientProtocolPolicy *client_protocols = 0;
-
-      if (!CORBA::is_nil (policy.in ()))
-        {
-          client_protocols_policy =
-            RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          client_protocols =
-            ACE_dynamic_cast (TAO_ClientProtocolPolicy *,
-                              client_protocols_policy.in ());
-
-          if (client_protocols != 0)
-            {
-              //TAO_ClientProtocolPolicy
-              RTCORBA::ProtocolList & protocols =
-                client_protocols->protocols_rep ();
-
-              for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-                {
-                  if (protocols[j].protocol_type == IOP::TAG_INTERNET_IOP)
-                    {
-                      properties =
-                        RTCORBA::ProtocolProperties::_narrow (
-                          protocols[j].transport_protocol_properties.in ()
-                          ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
-
-                      if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-                        break;
-                    }
-                  else if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE)
-                    {
-                      properties =
-                        RTCORBA::ProtocolProperties::_narrow (
-                          protocols[j].transport_protocol_properties.in ()
-                          ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
-
-                      if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
-                        break;
-                    }
-                }
-            }
-        }
-
-      if (CORBA::is_nil (properties.in ()))
-        {
-          // No tcp/uiop properties in ORB-level override.  Use ORB
-          // defaults.  ORB defaults should never be null - they were
-          // initialized by the ORB_Core.
-          policy =
-            orb_core->get_default_policies ()->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
-
-          if (!CORBA::is_nil (policy.in ()))
-            {
-              client_protocols_policy =
-                RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              client_protocols =
-                ACE_dynamic_cast (TAO_ClientProtocolPolicy *,
-                                  client_protocols_policy.in ());
-
-              if (client_protocols != 0)
-                {
-                  RTCORBA::ProtocolList & protocols =
-                    client_protocols->protocols_rep ();
-
-                  for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-                    {
-                      if (protocols[j].protocol_type == IOP::TAG_INTERNET_IOP)
-                        {
-                          properties =
-                            RTCORBA::ProtocolProperties::_narrow (
-                              protocols[j].transport_protocol_properties.in ()
-                              ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
-
-                          if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-                            break;
-                        }
-                      else if (protocols[j].protocol_type ==
-                                 TAO_TAG_UIOP_PROFILE)
-                        {
-                          properties =
-                            RTCORBA::ProtocolProperties::_narrow (
-                              protocols[j].transport_protocol_properties.in ()
-                              ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
-
-                          if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-      if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-        {
-          RTCORBA::TCPProtocolProperties_var tcp_properties =
-            RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          send_buffer_size =
-            tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          recv_buffer_size =
-            tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          enable_network_priority =
-            tcp_properties->enable_network_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-        }
-
-      if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
-        {
-          RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
-            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (!CORBA::is_nil (uiop_properties.in ()))
-            {
-              // Extract and locally store properties of interest.
-              send_buffer_size =
-                uiop_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-              recv_buffer_size =
-                uiop_properties->recv_buffer_size ();
-              ACE_TRY_CHECK;
-            }
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_ClientProtocolPolicy::hook");
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
 TAO_Cached_Policy_Type
 TAO_ClientProtocolPolicy::_tao_cached_type (void) const
 {
@@ -1041,7 +689,7 @@ TAO_ClientProtocolPolicy::_tao_decode (TAO_InputCDR &in_cdr)
 
       this->protocols_[i].transport_protocol_properties =
         TAO_Protocol_Properties_Factory::create_transport_protocol_property
-        (this->protocols_[i].protocol_type);
+        (this->protocols_[i].protocol_type, in_cdr.orb_core ());
 
       if (is_read_ok
           && (this->protocols_[i].orb_protocol_properties.ptr () != 0))
@@ -1066,12 +714,12 @@ TAO_ClientProtocolPolicy::protocols_rep (void)
 
 // ****************************************************************
 
-TAO_TCP_Properties::TAO_TCP_Properties (CORBA::Long send_buffer_size,
-                                        CORBA::Long recv_buffer_size,
-                                        CORBA::Boolean keep_alive,
-                                        CORBA::Boolean dont_route,
-                                        CORBA::Boolean no_delay,
-                                        CORBA::Boolean enable_network_priority)
+TAO_TCP_Protocol_Properties::TAO_TCP_Protocol_Properties (CORBA::Long send_buffer_size,
+                                                          CORBA::Long recv_buffer_size,
+                                                          CORBA::Boolean keep_alive,
+                                                          CORBA::Boolean dont_route,
+                                                          CORBA::Boolean no_delay,
+                                                          CORBA::Boolean enable_network_priority)
   : send_buffer_size_ (send_buffer_size),
     recv_buffer_size_ (recv_buffer_size),
     keep_alive_ (keep_alive),
@@ -1081,101 +729,101 @@ TAO_TCP_Properties::TAO_TCP_Properties (CORBA::Long send_buffer_size,
 {
 }
 
-TAO_TCP_Properties::~TAO_TCP_Properties (void)
+TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties (void)
 {
 }
 
 CORBA::Long
-TAO_TCP_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
 }
 
 void
-TAO_TCP_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
+                                               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_TCP_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
 }
 
 void
-TAO_TCP_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
+                                               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
 CORBA::Boolean
-TAO_TCP_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->keep_alive_;
 }
 
 void
-TAO_TCP_Properties::keep_alive (CORBA::Boolean keep_alive
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
+                                         ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->keep_alive_ = keep_alive;
 }
 
 CORBA::Boolean
-TAO_TCP_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->dont_route_;
 }
 
 void
-TAO_TCP_Properties::dont_route (CORBA::Boolean dont_route
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::dont_route (CORBA::Boolean dont_route
+                                         ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->dont_route_ = dont_route;
 }
 
-CORBA::Boolean TAO_TCP_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->no_delay_;
 }
 
 void
-TAO_TCP_Properties::no_delay (CORBA::Boolean no_delay
-                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::no_delay (CORBA::Boolean no_delay
+                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->no_delay_ = no_delay;
 }
 
 CORBA::Boolean
-TAO_TCP_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->enable_network_priority_;
 }
 
 void
-TAO_TCP_Properties::enable_network_priority (CORBA::Boolean enable
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
+                                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->enable_network_priority_ = enable;
 }
 
 CORBA::Boolean
-TAO_TCP_Properties::_tao_encode (TAO_OutputCDR & out_cdr)
+TAO_TCP_Protocol_Properties::_tao_encode (TAO_OutputCDR & out_cdr)
 {
   return ((out_cdr << this->send_buffer_size_)
           &&
@@ -1189,7 +837,7 @@ TAO_TCP_Properties::_tao_encode (TAO_OutputCDR & out_cdr)
 }
 
 CORBA::Boolean
-TAO_TCP_Properties::_tao_decode (TAO_InputCDR &in_cdr)
+TAO_TCP_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
 {
   return ((in_cdr >> this->send_buffer_size_)
           &&
@@ -1204,7 +852,7 @@ TAO_TCP_Properties::_tao_decode (TAO_InputCDR &in_cdr)
 
 // ****************************************************************
 
-TAO_Unix_Domain_Properties::TAO_Unix_Domain_Properties
+TAO_UnixDomain_Protocol_Properties::TAO_UnixDomain_Protocol_Properties
 (CORBA::Long send_buffer_size,
  CORBA::Long recv_buffer_size)
   : send_buffer_size_ (send_buffer_size),
@@ -1212,50 +860,49 @@ TAO_Unix_Domain_Properties::TAO_Unix_Domain_Properties
 {
 }
 
-TAO_Unix_Domain_Properties::~TAO_Unix_Domain_Properties (void)
+TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties (void)
 {
 }
 
 CORBA::Long
-TAO_Unix_Domain_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UnixDomain_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
 }
 
 void
-TAO_Unix_Domain_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_UnixDomain_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
+                                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_Unix_Domain_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UnixDomain_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
 }
 
 void
-TAO_Unix_Domain_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_UnixDomain_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
+                                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
-
 CORBA::Boolean
-TAO_Unix_Domain_Properties::_tao_encode (TAO_OutputCDR &out_cdr)
+TAO_UnixDomain_Protocol_Properties::_tao_encode (TAO_OutputCDR &out_cdr)
 {
   return ((out_cdr << this->send_buffer_size_)
           && (out_cdr << this->recv_buffer_size_));
 }
 
 CORBA::Boolean
-TAO_Unix_Domain_Properties::_tao_decode (TAO_InputCDR &in_cdr)
+TAO_UnixDomain_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
 {
   return ((in_cdr >> this->send_buffer_size_)
           && (in_cdr >> this->recv_buffer_size_));
@@ -1263,67 +910,164 @@ TAO_Unix_Domain_Properties::_tao_decode (TAO_InputCDR &in_cdr)
 
 // ****************************************************************
 
-TAO_SMEM_Properties::TAO_SMEM_Properties (void)
-  : preallocate_buffer_size_ (0),
-    mmap_filename_ (),
-    mmap_lockname_ ()
+TAO_SharedMemory_Protocol_Properties::TAO_SharedMemory_Protocol_Properties (CORBA::Long send_buffer_size,
+                                                                            CORBA::Long recv_buffer_size,
+                                                                            CORBA::Boolean keep_alive,
+                                                                            CORBA::Boolean dont_route,
+                                                                            CORBA::Boolean no_delay,
+                                                                            CORBA::Long preallocate_buffer_size,
+                                                                            const char *mmap_filename,
+                                                                            const char *mmap_lockname)
+  : send_buffer_size_ (send_buffer_size),
+    recv_buffer_size_ (recv_buffer_size),
+    keep_alive_ (keep_alive),
+    dont_route_ (dont_route),
+    no_delay_ (no_delay),
+    preallocate_buffer_size_ (preallocate_buffer_size),
+    mmap_filename_ (mmap_filename),
+    mmap_lockname_ (mmap_lockname)
+{
+}
+
+TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties (void)
+{
+}
+
+
+CORBA::Long
+TAO_SharedMemory_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->send_buffer_size_;
+}
+
+void
+TAO_SharedMemory_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
+                                                        ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->send_buffer_size_ = send_buffer_size;
+}
+
+CORBA::Long
+TAO_SharedMemory_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->recv_buffer_size_;
+}
+
+void
+TAO_SharedMemory_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
+                                                        ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->recv_buffer_size_ = recv_buffer_size;
+}
+
+CORBA::Boolean
+TAO_SharedMemory_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->keep_alive_;
+}
+
+void
+TAO_SharedMemory_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
+                                                  ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  this->keep_alive_ = keep_alive;
 }
 
-TAO_SMEM_Properties::~TAO_SMEM_Properties (void)
+CORBA::Boolean
+TAO_SharedMemory_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  return this->dont_route_;
 }
 
+void
+TAO_SharedMemory_Protocol_Properties::dont_route (CORBA::Boolean dont_route
+                                                  ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->dont_route_ = dont_route;
+}
+
+CORBA::Boolean
+TAO_SharedMemory_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->no_delay_;
+}
+
+void
+TAO_SharedMemory_Protocol_Properties::no_delay (CORBA::Boolean no_delay
+                                                ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->no_delay_ = no_delay;
+}
 
 CORBA::Long
-TAO_SMEM_Properties::preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->preallocate_buffer_size_;
 }
 
 void
-TAO_SMEM_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size
+                                                               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->preallocate_buffer_size_ = preallocate_buffer_size;
 }
 
 char *
-TAO_SMEM_Properties::mmap_filename (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::mmap_filename (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_filename_.rep ();
 }
 
 void
-TAO_SMEM_Properties::mmap_filename (const char * mmap_filename
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::mmap_filename (const char * mmap_filename
+                                                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_filename_.set (mmap_filename);
 }
 
 char *
-TAO_SMEM_Properties::mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_lockname_.rep ();
 }
 
 void
-TAO_SMEM_Properties::mmap_lockname (const char * mmap_lockname
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::mmap_lockname (const char * mmap_lockname
+                                                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_lockname_.set (mmap_lockname);
 }
 
 CORBA::Boolean
-TAO_SMEM_Properties::_tao_encode (TAO_OutputCDR &out_cdr)
+TAO_SharedMemory_Protocol_Properties::_tao_encode (TAO_OutputCDR &out_cdr)
 {
-  return ((out_cdr << this->preallocate_buffer_size_)
+  return ((out_cdr << this->send_buffer_size_)
+          &&
+          (out_cdr << this->recv_buffer_size_)
+          &&
+          (out_cdr.write_boolean (this->keep_alive_))
+          &&
+          (out_cdr.write_boolean (this->dont_route_))
+          &&
+          (out_cdr.write_boolean (this->no_delay_))
+          &&
+          (out_cdr << this->preallocate_buffer_size_)
           &&
           (out_cdr << this->mmap_filename_)
           &&
@@ -1331,9 +1075,19 @@ TAO_SMEM_Properties::_tao_encode (TAO_OutputCDR &out_cdr)
 }
 
 CORBA::Boolean
-TAO_SMEM_Properties::_tao_decode (TAO_InputCDR &in_cdr)
+TAO_SharedMemory_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
 {
-  return ((in_cdr >> this->preallocate_buffer_size_)
+  return ((in_cdr >> this->send_buffer_size_)
+          &&
+          (in_cdr >> this->recv_buffer_size_)
+          &&
+          (in_cdr.read_boolean (this->keep_alive_))
+          &&
+          (in_cdr.read_boolean (this->dont_route_))
+          &&
+          (in_cdr.read_boolean (this->no_delay_))
+          &&
+          (in_cdr >> this->preallocate_buffer_size_)
           &&
           (in_cdr >> this->mmap_filename_)
           &&
@@ -1342,49 +1096,291 @@ TAO_SMEM_Properties::_tao_decode (TAO_InputCDR &in_cdr)
 
 // ****************************************************************
 
-TAO_GIOP_Properties::TAO_GIOP_Properties (void)
+TAO_UserDatagram_Protocol_Properties::TAO_UserDatagram_Protocol_Properties (CORBA::Boolean enable_network_priority)
+  : enable_network_priority_ (enable_network_priority)
+{
+}
+
+TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties (void)
+{
+}
+
+CORBA::Boolean
+TAO_UserDatagram_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->enable_network_priority_;
+}
+
+void
+TAO_UserDatagram_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
+                                                               ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  this->enable_network_priority_ = enable;
 }
 
-TAO_GIOP_Properties::~TAO_GIOP_Properties (void)
+CORBA::Boolean
+TAO_UserDatagram_Protocol_Properties::_tao_encode (TAO_OutputCDR &)
 {
+  return true;
 }
 
 CORBA::Boolean
-TAO_GIOP_Properties::_tao_encode (TAO_OutputCDR &)
+TAO_UserDatagram_Protocol_Properties::_tao_decode (TAO_InputCDR &)
+{
+  return true;
+}
+
+// ****************************************************************
+
+TAO_StreamControl_Protocol_Properties::TAO_StreamControl_Protocol_Properties (CORBA::Long send_buffer_size,
+                                                                              CORBA::Long recv_buffer_size,
+                                                                              CORBA::Boolean keep_alive,
+                                                                              CORBA::Boolean dont_route,
+                                                                              CORBA::Boolean no_delay,
+                                                                              CORBA::Boolean enable_network_priority)
+  : send_buffer_size_ (send_buffer_size),
+    recv_buffer_size_ (recv_buffer_size),
+    keep_alive_ (keep_alive),
+    dont_route_ (dont_route),
+    no_delay_ (no_delay),
+    enable_network_priority_ (enable_network_priority)
+{
+}
+
+TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties (void)
+{
+}
+
+CORBA::Long
+TAO_StreamControl_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->send_buffer_size_;
+}
+
+void
+TAO_StreamControl_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
+                                                         ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->send_buffer_size_ = send_buffer_size;
+}
+
+CORBA::Long
+TAO_StreamControl_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->recv_buffer_size_;
+}
+
+void
+TAO_StreamControl_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
+                                                         ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->recv_buffer_size_ = recv_buffer_size;
+}
+
+CORBA::Boolean
+TAO_StreamControl_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->keep_alive_;
+}
+
+void
+TAO_StreamControl_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
+                                                   ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->keep_alive_ = keep_alive;
+}
+
+CORBA::Boolean
+TAO_StreamControl_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->dont_route_;
+}
+
+void
+TAO_StreamControl_Protocol_Properties::dont_route (CORBA::Boolean dont_route
+                                                   ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->dont_route_ = dont_route;
+}
+
+CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->no_delay_;
+}
+
+void
+TAO_StreamControl_Protocol_Properties::no_delay (CORBA::Boolean no_delay
+                                                 ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->no_delay_ = no_delay;
+}
+
+CORBA::Boolean
+TAO_StreamControl_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->enable_network_priority_;
+}
+
+void
+TAO_StreamControl_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
+                                                                ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->enable_network_priority_ = enable;
+}
+
+CORBA::Boolean
+TAO_StreamControl_Protocol_Properties::_tao_encode (TAO_OutputCDR & out_cdr)
+{
+  return ((out_cdr << this->send_buffer_size_)
+          &&
+          (out_cdr << this->recv_buffer_size_)
+          &&
+          (out_cdr.write_boolean (this->keep_alive_))
+          &&
+          (out_cdr.write_boolean (this->dont_route_))
+          &&
+          (out_cdr.write_boolean (this->no_delay_)));
+}
+
+CORBA::Boolean
+TAO_StreamControl_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
+{
+  return ((in_cdr >> this->send_buffer_size_)
+          &&
+          (in_cdr >> this->recv_buffer_size_)
+          &&
+          (in_cdr.read_boolean (this->keep_alive_))
+          &&
+          (in_cdr.read_boolean (this->dont_route_))
+          &&
+          (in_cdr.read_boolean (this->no_delay_)));
+}
+
+// ****************************************************************
+
+TAO_GIOP_Protocol_Properties::TAO_GIOP_Protocol_Properties (void)
+{
+}
+
+TAO_GIOP_Protocol_Properties::~TAO_GIOP_Protocol_Properties (void)
+{
+}
+
+CORBA::Boolean
+TAO_GIOP_Protocol_Properties::_tao_encode (TAO_OutputCDR &)
 {
   return 1;
 }
 
 CORBA::Boolean
-TAO_GIOP_Properties::_tao_decode (TAO_InputCDR &)
+TAO_GIOP_Protocol_Properties::_tao_decode (TAO_InputCDR &)
 {
   return 1;
 }
 
 // ****************************************************************
 
-RTCORBA::ProtocolProperties*
-TAO_Protocol_Properties_Factory::create_transport_protocol_property (
-  IOP::ProfileId id)
+RTCORBA::ProtocolProperties *
+TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::ProfileId id,
+                                                                     TAO_ORB_Core *orb_core)
 {
   RTCORBA::ProtocolProperties* property = 0;
 
   if (id == IOP::TAG_INTERNET_IOP)
+    {
+      int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
+      int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
+      int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0;
+      CORBA::Boolean keep_alive = 1;
+      CORBA::Boolean dont_route = 0;
+      CORBA::Boolean enable_network_priority = 0;
+
+      ACE_NEW_RETURN (property,
+                      TAO_TCP_Protocol_Properties (send_buffer_size,
+                                                   recv_buffer_size,
+                                                   keep_alive,
+                                                   dont_route,
+                                                   no_delay,
+                                                   enable_network_priority),
+                      0);
+    }
 
-    ACE_NEW_RETURN (property,
-                    TAO_TCP_Properties,
-                    0);
-
-  else if(id == TAO_TAG_SHMEM_PROFILE)
-    ACE_NEW_RETURN (property,
-                    TAO_SMEM_Properties,
-                    0);
+  else if (id == TAO_TAG_SHMEM_PROFILE)
+    {
+      int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
+      int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
+      int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0;
+      CORBA::Boolean keep_alive = 1;
+      CORBA::Boolean dont_route = 0;
+      CORBA::Long preallocate_buffer_size = 0;
+      const char *mmap_filename = "";
+      const char *mmap_lockname = "";
+
+      ACE_NEW_RETURN (property,
+                      TAO_SharedMemory_Protocol_Properties (send_buffer_size,
+                                                            recv_buffer_size,
+                                                            keep_alive,
+                                                            dont_route,
+                                                            no_delay,
+                                                            preallocate_buffer_size,
+                                                            mmap_filename,
+                                                            mmap_lockname),
+                      0);
+    }
 
   else if (id == TAO_TAG_UIOP_PROFILE)
-    ACE_NEW_RETURN (property,
-                    TAO_Unix_Domain_Properties,
-                    0);
+    {
+      int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
+      int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
+
+      ACE_NEW_RETURN (property,
+                      TAO_UnixDomain_Protocol_Properties (send_buffer_size,
+                                                          recv_buffer_size),
+                      0);
+    }
+
+  else if (id == TAO_TAG_DIOP_PROFILE)
+    {
+      CORBA::Boolean enable_network_priority = 0;
+
+      ACE_NEW_RETURN (property,
+                      TAO_UserDatagram_Protocol_Properties (enable_network_priority),
+                      0);
+    }
+
+  else if (id == TAO_TAG_SCIOP_PROFILE)
+    {
+      int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
+      int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
+      int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0;
+      CORBA::Boolean keep_alive = 1;
+      CORBA::Boolean dont_route = 0;
+      CORBA::Boolean enable_network_priority = 0;
+
+      ACE_NEW_RETURN (property,
+                      TAO_StreamControl_Protocol_Properties (send_buffer_size,
+                                                             recv_buffer_size,
+                                                             keep_alive,
+                                                             dont_route,
+                                                             no_delay,
+                                                             enable_network_priority),
+                      0);
+    }
+
   return property;
 }
 
@@ -1395,7 +1391,7 @@ TAO_Protocol_Properties_Factory::create_orb_protocol_property (IOP::ProfileId id
 
   if (id == IOP::TAG_INTERNET_IOP)
     ACE_NEW_RETURN (property,
-                    TAO_GIOP_Properties,
+                    TAO_GIOP_Protocol_Properties,
                     0);
 
   // Right now the only supported ORB protocol is GIOP
@@ -1406,9 +1402,9 @@ TAO_Protocol_Properties_Factory::create_orb_protocol_property (IOP::ProfileId id
   // should be considered.
   else
     ACE_NEW_RETURN (property,
-                    TAO_GIOP_Properties,
+                    TAO_GIOP_Protocol_Properties,
                     0);
-   return property;
+  return property;
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index a68f25e42da..689ee8e961e 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -33,9 +33,7 @@
 #include "ace/SString.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -341,13 +339,6 @@ public:
   void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  static int hook (TAO_ORB_Core *orb_core,
-                   int &send_buffer_size,
-                   int &recv_buffer_size,
-                   int &no_delay,
-                   int &enable_network_priority,
-                   const char *protocol_type);
-
   // Return the cached policy type for this policy.
   TAO_Cached_Policy_Type _tao_cached_type (void) const;
 
@@ -409,13 +400,6 @@ public:
   CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  static int hook (TAO_ORB_Core *orb_core,
-                   int &send_buffer_size,
-                   int &recv_buffer_size,
-                   int &no_delay,
-                   int &enable_network_priority,
-                   const char* protocol_type);
-
   void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -458,26 +442,24 @@ private:
 //*************************************************************************
 
 /**
- * @class TAO_TCP_Properties
+ * @class TAO_TCP_Protocol_Properties
  *
  * @brief RTCORBA::TCPProtocolProperties implementation
  *
  * Stores TCP Protocol configuration properties.
  */
-class TAO_RTCORBA_Export TAO_TCP_Properties
+class TAO_RTCORBA_Export TAO_TCP_Protocol_Properties
   : public RTCORBA::TCPProtocolProperties,
     public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
-  TAO_TCP_Properties (CORBA::Long send_buffer_size =
-                      ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                      CORBA::Long recv_buffer_size =
-                      ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                      CORBA::Boolean keep_alive = 1,
-                      CORBA::Boolean dont_route = 0,
-                      CORBA::Boolean no_delay = 1,
-                      CORBA::Boolean enable_network_priority = 0);
+  TAO_TCP_Protocol_Properties (CORBA::Long send_buffer_size,
+                               CORBA::Long recv_buffer_size,
+                               CORBA::Boolean keep_alive,
+                               CORBA::Boolean dont_route,
+                               CORBA::Boolean no_delay,
+                               CORBA::Boolean enable_network_priority);
 
   CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -514,13 +496,6 @@ public:
                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-
-  /// This method writes a CDR representation of TCPProtocolProperties.
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-
-  /// This method reads the object state from a CDR representation.
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
   CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -528,11 +503,17 @@ public:
                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// This method writes a CDR representation of TCPProtocolProperties.
+  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
+
+  /// This method reads the object state from a CDR representation.
+  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
+
 protected:
 
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_TCP_Properties (void);
+  virtual ~TAO_TCP_Protocol_Properties (void);
 
 private:
   // = Attributes.
@@ -548,22 +529,22 @@ private:
 //*************************************************************************
 
 /**
- * @class TAO_Unix_Domain_Properties
+ * @class TAO_UnixDomain_Protocol_Properties
  *
  * @brief RTCORBA::UnixDomainProtocolProperties implementation.
  *
  * Stores Unix Domain Sockets (Local IPC) Protocol configuration
  * properties.
  */
-class TAO_RTCORBA_Export TAO_Unix_Domain_Properties
+class TAO_RTCORBA_Export TAO_UnixDomain_Protocol_Properties
   : public RTCORBA::UnixDomainProtocolProperties,
     public TAO_Local_RefCounted_Object
 {
 public:
 
   /// Constructor
-  TAO_Unix_Domain_Properties (CORBA::Long send_buffer_size = ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
-                              CORBA::Long recv_buffer_size = ACE_DEFAULT_MAX_SOCKET_BUFSIZ);
+  TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size,
+                                      CORBA::Long recv_buffer_size);
 
   CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -602,7 +583,7 @@ protected:
 
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_Unix_Domain_Properties (void);
+  virtual ~TAO_UnixDomain_Protocol_Properties (void);
 
 private:
 
@@ -614,23 +595,68 @@ private:
 //*************************************************************************
 
 /**
- * @class TAO_SMEM_Properties
+ * @class TAO_SharedMemory_Protocol_Properties
  *
  * @brief RTCORBA::SharedMemoryProtocolProperties implementation.
  *
  * Stores Shared Memory Protocol configuration
  * properties.
  */
-class TAO_RTCORBA_Export TAO_SMEM_Properties
+class TAO_RTCORBA_Export TAO_SharedMemory_Protocol_Properties
   : public RTCORBA::SharedMemoryProtocolProperties,
     public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
-  TAO_SMEM_Properties (void);
+  TAO_SharedMemory_Protocol_Properties (CORBA::Long send_buffer_size,
+                                        CORBA::Long recv_buffer_size,
+                                        CORBA::Boolean keep_alive,
+                                        CORBA::Boolean dont_route,
+                                        CORBA::Boolean no_delay,
+                                        CORBA::Long preallocate_buffer_size,
+                                        const char *mmap_filename,
+                                        const char *mmap_lockname);
 
   // = IDL interface methods.
 
+  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void send_buffer_size (CORBA::Long send_buffer_size
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void recv_buffer_size (CORBA::Long recv_buffer_size
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void keep_alive (CORBA::Boolean keep_alive
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void dont_route (CORBA::Boolean dont_route
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void no_delay (CORBA::Boolean no_delay
+                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
   CORBA::Long preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -654,7 +680,7 @@ public:
 
   /**
    * This method writes the CDR encapsulation of an instance of
-   * SMEMProperties. This Protocol Property in TAO specific,
+   * SharedMemoryProperties. This Protocol Property in TAO specific,
    * so there is no order of encapsulation specified in the
    * RT CORBA Spec. The current implementation encodes the field
    * according to the order of declaration.
@@ -662,7 +688,7 @@ public:
   CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
 
   /**
-   * This method reads an instance of SMEMProperties from
+   * This method reads an instance of SharedMemoryProperties from
    * a CDR encapsulation. This Protocol Property in TAO specific,
    * so there is no order of encapsulation specified in the
    * RT CORBA Spec. The current implementation expect the field
@@ -674,11 +700,16 @@ protected:
 
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_SMEM_Properties (void);
+  virtual ~TAO_SharedMemory_Protocol_Properties (void);
 
 private:
 
   // = Attributes.
+  CORBA::Long send_buffer_size_;
+  CORBA::Long recv_buffer_size_;
+  CORBA::Boolean keep_alive_;
+  CORBA::Boolean dont_route_;
+  CORBA::Boolean no_delay_;
   CORBA::Long preallocate_buffer_size_;
   ACE_CString mmap_filename_;
   ACE_CString mmap_lockname_;
@@ -686,7 +717,136 @@ private:
 
 //*************************************************************************
 
-class TAO_RTCORBA_Export TAO_GIOP_Properties
+/**
+ * @class TAO_UserDatagram_Protocol_Properties
+ *
+ * @brief RTCORBA::UserDatagramProtocolProperties implementation
+ *
+ * Stores UserDatagram Protocol configuration properties.
+ */
+class TAO_RTCORBA_Export TAO_UserDatagram_Protocol_Properties
+  : public RTCORBA::UserDatagramProtocolProperties,
+    public TAO_Local_RefCounted_Object
+{
+public:
+  /// Constructor.
+  TAO_UserDatagram_Protocol_Properties (CORBA::Boolean enable_network_priority);
+
+  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void enable_network_priority (CORBA::Boolean enable
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  /// This method writes a CDR representation of UserDatagramProtocolProperties.
+  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
+
+  /// This method reads the object state from a CDR representation.
+  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
+
+protected:
+
+  /// Protected destructor to enforce proper memory management of this
+  /// reference counted object.
+  virtual ~TAO_UserDatagram_Protocol_Properties (void);
+
+private:
+  // = Attributes.
+
+  CORBA::Boolean enable_network_priority_;
+};
+
+//*************************************************************************
+
+/**
+ * @class TAO_StreamControl_Protocol_Properties
+ *
+ * @brief RTCORBA::StreamControlProtocolProperties implementation
+ *
+ * Stores StreamControl Protocol configuration properties.
+ */
+class TAO_RTCORBA_Export TAO_StreamControl_Protocol_Properties
+  : public RTCORBA::StreamControlProtocolProperties,
+    public TAO_Local_RefCounted_Object
+{
+public:
+  /// Constructor.
+  TAO_StreamControl_Protocol_Properties (CORBA::Long send_buffer_size,
+                                         CORBA::Long recv_buffer_size,
+                                         CORBA::Boolean keep_alive,
+                                         CORBA::Boolean dont_route,
+                                         CORBA::Boolean no_delay,
+                                         CORBA::Boolean enable_network_priority);
+
+  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void send_buffer_size (CORBA::Long send_buffer_size
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void recv_buffer_size (CORBA::Long recv_buffer_size
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void keep_alive (CORBA::Boolean keep_alive
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void dont_route (CORBA::Boolean dont_route
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void no_delay (CORBA::Boolean no_delay
+                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void enable_network_priority (CORBA::Boolean enable
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  /// This method writes a CDR representation of StreamControlProtocolProperties.
+  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
+
+  /// This method reads the object state from a CDR representation.
+  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
+
+protected:
+
+  /// Protected destructor to enforce proper memory management of this
+  /// reference counted object.
+  virtual ~TAO_StreamControl_Protocol_Properties (void);
+
+private:
+  // = Attributes.
+
+  CORBA::Long send_buffer_size_;
+  CORBA::Long recv_buffer_size_;
+  CORBA::Boolean keep_alive_;
+  CORBA::Boolean dont_route_;
+  CORBA::Boolean no_delay_;
+  CORBA::Boolean enable_network_priority_;
+};
+
+//*************************************************************************
+
+class TAO_RTCORBA_Export TAO_GIOP_Protocol_Properties
   : public RTCORBA::GIOPProtocolProperties,
     public TAO_Local_RefCounted_Object
 {
@@ -700,10 +860,10 @@ protected:
 
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  virtual ~TAO_GIOP_Properties ();
+  virtual ~TAO_GIOP_Protocol_Properties ();
 
   friend class TAO_Protocol_Properties_Factory;
-  TAO_GIOP_Properties (void);
+  TAO_GIOP_Protocol_Properties (void);
 };
 
 //*************************************************************************
@@ -719,7 +879,9 @@ public:
    * properties: one describes the transport protocol and the other
    * describes the ORB messaging protocol.
    */
-  static RTCORBA::ProtocolProperties *create_transport_protocol_property (IOP::ProfileId id);
+  static RTCORBA::ProtocolProperties *create_transport_protocol_property (
+      IOP::ProfileId id,
+      TAO_ORB_Core *orb_core);
 
   /**
    * Creates the proper orb ProtocolProperties subclass for
@@ -728,17 +890,13 @@ public:
    * properties: one describes the transport protocol and the other
    * describes the ORB messaging protocol.
    */
-  static RTCORBA::ProtocolProperties*create_orb_protocol_property (IOP::ProfileId id);
+  static RTCORBA::ProtocolProperties *create_orb_protocol_property (IOP::ProfileId id);
 
 protected:
   TAO_Protocol_Properties_Factory (void);
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_Policy_i.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.i b/TAO/tao/RTCORBA/RT_Policy_i.i
deleted file mode 100644
index 6318deb79a0..00000000000
--- a/TAO/tao/RTCORBA/RT_Policy_i.i
+++ /dev/null
@@ -1,2 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index d78920ec478..7493930e3be 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -16,24 +16,17 @@
 #include "tao/Transport_Acceptor.h"
 #include "tao/Transport_Connector.h"
 #include "tao/Policy_Set.h"
-#include "tao/IIOP_Transport.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (RTCORBA,
            RT_Protocols_Hooks,
            "$Id$")
 
 
-TAO_RT_Protocols_Hooks::Client_Protocols_Hook
-  TAO_RT_Protocols_Hooks::client_protocols_hook_ = 0;
-TAO_RT_Protocols_Hooks::Server_Protocols_Hook
-  TAO_RT_Protocols_Hooks::server_protocols_hook_ = 0;
-
 TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void)
 {
 }
@@ -50,10 +43,8 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
 
   // Save a reference to the priority mapping manager.
   CORBA::Object_var obj =
-    orb_core->object_ref_table ().resolve_initial_references (
-                                      TAO_OBJID_PRIORITYMAPPINGMANAGER
-                                      ACE_ENV_ARG_PARAMETER
-                                    );
+    orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
+                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->mapping_manager_ =
@@ -63,10 +54,8 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
 
   // Save a reference to the priority mapping manager.
   CORBA::Object_var object =
-    orb_core->object_ref_table ().resolve_initial_references (
-                                      TAO_OBJID_NETWORKPRIORITYMAPPINGMANAGER
-                                      ACE_ENV_ARG_PARAMETER
-                                    );
+    orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_NETWORKPRIORITYMAPPINGMANAGER
+                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->network_mapping_manager_ =
@@ -75,10 +64,8 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
   ACE_CHECK;
 
   object =
-    this->orb_core_->object_ref_table ().resolve_initial_references (
-                                             "RTCurrent"
-                                             ACE_ENV_ARG_PARAMETER
-                                           );
+    this->orb_core_->object_ref_table ().resolve_initial_references ("RTCurrent"
+                                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->current_ =
@@ -88,313 +75,439 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
 
 }
 
-int
-TAO_RT_Protocols_Hooks::call_client_protocols_hook (
-    int &send_buffer_size,
-    int &recv_buffer_size,
-    int &no_delay,
-    int &enable_network_priority,
-    const char *protocol_type
-  )
+RTCORBA::ProtocolProperties_ptr
+TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag,
+                                                    CORBA::Policy_ptr policy
+                                                    ACE_ENV_ARG_DECL)
 {
-  if (TAO_RT_Protocols_Hooks::client_protocols_hook_ == 0)
-    return -1;
+  if (CORBA::is_nil (policy))
+    return 0;
+
+  RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
+    RTCORBA::ServerProtocolPolicy::_narrow (policy
+                                            ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  if (CORBA::is_nil (server_protocol_policy.in ()))
+    return 0;
+
+  TAO_ServerProtocolPolicy *server_protocols =
+    ACE_dynamic_cast (TAO_ServerProtocolPolicy *,
+                      server_protocol_policy.in ());
 
-  (*TAO_RT_Protocols_Hooks::client_protocols_hook_) (this->orb_core_,
-                                                     send_buffer_size,
-                                                     recv_buffer_size,
-                                                     no_delay,
-                                                     enable_network_priority,
-                                                     protocol_type);
+  if (server_protocols == 0)
+    return 0;
+
+  // TAO_ServerProtocolPolicy
+  RTCORBA::ProtocolList &protocols =
+    server_protocols->protocols_rep ();
+
+  for (CORBA::ULong j = 0; j < protocols.length (); ++j)
+    {
+      if (protocols[j].protocol_type == protocol_tag)
+        {
+          return RTCORBA::ProtocolProperties::_duplicate (protocols[j].transport_protocol_properties.in ());
+        }
+    }
 
   return 0;
 }
 
-void
-TAO_RT_Protocols_Hooks::set_client_protocols_hook (Client_Protocols_Hook hook)
+RTCORBA::ProtocolProperties_ptr
+TAO_RT_Protocols_Hooks::client_protocol_properties (IOP::ProfileId protocol_tag,
+                                                    CORBA::Policy_ptr policy
+                                                    ACE_ENV_ARG_DECL)
 {
-  TAO_RT_Protocols_Hooks::client_protocols_hook_ = hook;
-  // Saving the hook pointer so that we can use it later when needed.
-}
+  if (CORBA::is_nil (policy))
+    return 0;
 
-int
-TAO_RT_Protocols_Hooks::call_server_protocols_hook (
-    int &send_buffer_size,
-    int &recv_buffer_size,
-    int &no_delay,
-    int &enable_network_priority,
-    const char *protocol_type
-  )
-{
-  if (TAO_RT_Protocols_Hooks::server_protocols_hook_ == 0)
-    {
-      return -1;
-    }
+  RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
+    RTCORBA::ClientProtocolPolicy::_narrow (policy
+                                            ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
-  int result_value =
-    (*TAO_RT_Protocols_Hooks::server_protocols_hook_) (this->orb_core_,
-                                                       send_buffer_size,
-                                                       recv_buffer_size,
-                                                       no_delay,
-                                                       enable_network_priority,
-                                                       protocol_type);
+  if (CORBA::is_nil (client_protocol_policy.in ()))
+    return 0;
 
-  if (result_value != 0)
+  TAO_ClientProtocolPolicy *client_protocols =
+    ACE_dynamic_cast (TAO_ClientProtocolPolicy *,
+                      client_protocol_policy.in ());
+
+  if (client_protocols == 0)
+    return 0;
+
+  // TAO_ClientProtocolPolicy
+  RTCORBA::ProtocolList &protocols =
+    client_protocols->protocols_rep ();
+
+  for (CORBA::ULong j = 0; j < protocols.length (); ++j)
     {
-      return -1;
+      if (protocols[j].protocol_type == protocol_tag)
+        {
+          return RTCORBA::ProtocolProperties::_duplicate (protocols[j].transport_protocol_properties.in ());
+        }
     }
 
   return 0;
 }
 
-void
-TAO_RT_Protocols_Hooks::set_server_protocols_hook (Server_Protocols_Hook hook)
+RTCORBA::ProtocolProperties_ptr
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
+                                                                 ACE_ENV_ARG_DECL)
 {
-  TAO_RT_Protocols_Hooks::server_protocols_hook_ = hook;
-  // Saving the hook pointer so that we can use it later when needed.
+  CORBA::Policy_var policy =
+    this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
+                                        ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return this->server_protocol_properties (protocol_tag,
+                                           policy.in ()
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
-int
-TAO_RT_Protocols_Hooks::update_client_protocol_properties (
-    TAO_Stub *stub,
-    TAO_Transport *transport,
-    const char *protocol_type
-  )
+RTCORBA::ProtocolProperties_ptr
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
+                                                                 ACE_ENV_ARG_DECL)
 {
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_RT_Protocols_Hooks::"
-                "get_effective_client_protocol_properties\n"));
+  CORBA::Policy_var policy =
+    this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL
+                                        ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
-  ACE_TRY_NEW_ENV
-    {
-      RTCORBA::ProtocolProperties_var properties =
-        RTCORBA::ProtocolProperties::_nil ();
+  return this->client_protocol_properties (protocol_tag,
+                                           policy.in ()
+                                           ACE_ENV_ARG_PARAMETER);
+}
+
+RTCORBA::ProtocolProperties_ptr
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_object_level (IOP::ProfileId protocol_tag,
+                                                                    TAO_Stub *stub
+                                                                    ACE_ENV_ARG_DECL)
+{
+  CORBA::Policy_var policy =
+    stub->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL
+                             ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return this->client_protocol_properties (protocol_tag,
+                                           policy.in ()
+                                           ACE_ENV_ARG_PARAMETER);
+}
 
-      TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *,
-                                               stub);
+void
+TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Properties &to,
+                                                     RTCORBA::ProtocolProperties_ptr from
+                                                     ACE_ENV_ARG_DECL)
+{
+  RTCORBA::TCPProtocolProperties_var protocol_properties =
+    RTCORBA::TCPProtocolProperties::_narrow (from
+                                             ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  to.send_buffer_size_ = protocol_properties->send_buffer_size ();
+  to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
+  to.keep_alive_ = protocol_properties->keep_alive ();
+  to.dont_route_ = protocol_properties->dont_route ();
+  to.no_delay_ = protocol_properties->no_delay ();
+  to.enable_network_priority_ = protocol_properties->enable_network_priority ();
+}
 
-      CORBA::Policy* policy = rt_stub->client_protocol ();
+void
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->server_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-      RTCORBA::ClientProtocolPolicy_var client_protocols_policy;
-      TAO_ClientProtocolPolicy *client_protocols = 0;
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
 
-      if (!CORBA::is_nil (policy))
-        {
-          client_protocols_policy =
-            RTCORBA::ClientProtocolPolicy::_narrow (policy
+void
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->client_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_UIOP_Protocol_Properties &to,
+                                                     RTCORBA::ProtocolProperties_ptr from
+                                                     ACE_ENV_ARG_DECL)
+{
+  RTCORBA::UnixDomainProtocolProperties_var protocol_properties =
+    RTCORBA::UnixDomainProtocolProperties::_narrow (from
                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+  ACE_CHECK;
 
-          client_protocols =
-            ACE_dynamic_cast (TAO_ClientProtocolPolicy *,
-                              client_protocols_policy.in ());
+  to.send_buffer_size_ = protocol_properties->send_buffer_size ();
+  to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
+}
 
-          if (client_protocols != 0)
-            {
-              // TAO_ClientProtocolPolicy
-              RTCORBA::ProtocolList & protocols =
-                client_protocols->protocols_rep ();
-
-              for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-                {
-                  if (protocols[j].protocol_type == IOP::TAG_INTERNET_IOP)
-                    {
-                      properties =
-                        RTCORBA::ProtocolProperties::_narrow (
-                            protocols[j].transport_protocol_properties.in ()
-                            ACE_ENV_ARG_PARAMETER
-                          );
-                      ACE_TRY_CHECK;
-
-                      if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-                        {
-                          break;
-                        }
-                    }
-                }
-            }
+void
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->server_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-          if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-            {
-              if (!CORBA::is_nil (properties.in ()))
-                {
-                  RTCORBA::TCPProtocolProperties_var tcp_properties =
-                    RTCORBA::TCPProtocolProperties::_narrow (
-                        properties.in ()
-                        ACE_ENV_ARG_PARAMETER
-                      );
-                  ACE_TRY_CHECK;
-
-                  const int send_buffer_size =
-                    tcp_properties->send_buffer_size (
-                                        ACE_ENV_SINGLE_ARG_PARAMETER
-                                      );
-                  ACE_TRY_CHECK;
-
-                  const int recv_buffer_size =
-                    tcp_properties->recv_buffer_size (
-                                        ACE_ENV_SINGLE_ARG_PARAMETER
-                                      );
-                  ACE_TRY_CHECK;
-
-                  const int no_delay =
-                    tcp_properties->no_delay (
-                                        ACE_ENV_SINGLE_ARG_PARAMETER
-                                      );
-                  ACE_TRY_CHECK;
-
-                  const int enable_network_priority =
-                    tcp_properties->enable_network_priority (
-                                        ACE_ENV_SINGLE_ARG_PARAMETER
-                                      );
-                  ACE_TRY_CHECK;
-
-                  TAO_IIOP_Transport *iiop_transport =
-                    ACE_dynamic_cast (TAO_IIOP_Transport *,
-                                      transport);
-
-                  iiop_transport->update_protocol_properties (
-                                      send_buffer_size,
-                                      recv_buffer_size,
-                                      no_delay,
-                                      enable_network_priority
-                                    );
-                }
-            }
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_RT_Protocols_Hooks::"
-                             "get_effective_client_protocol_properties");
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
 
-      return -1;
-    }
-  ACE_ENDTRY;
+void
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->client_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-  return 0;
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
-int
-TAO_RT_Protocols_Hooks::update_server_protocol_properties (
-    CORBA::Policy *policy,
-    TAO_Transport *transport,
-    const char *protocol_type
-  )
+void
+TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SHMIOP_Protocol_Properties &to,
+                                                     RTCORBA::ProtocolProperties_ptr from
+                                                     ACE_ENV_ARG_DECL)
 {
+  RTCORBA::SharedMemoryProtocolProperties_var protocol_properties =
+    RTCORBA::SharedMemoryProtocolProperties::_narrow (from
+                                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_RT_Protocols_Hooks::"
-                "get_effective_server_protocol_properties\n"));
+  to.preallocate_buffer_size_ = protocol_properties->preallocate_buffer_size ();
+  to.mmap_filename_ = protocol_properties->mmap_filename ();
+  to.mmap_lockname_ = protocol_properties->mmap_lockname ();
+}
 
-  ACE_TRY_NEW_ENV
-    {
-      RTCORBA::ProtocolProperties_var properties =
-        RTCORBA::ProtocolProperties::_nil ();
+void
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->server_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-      RTCORBA::ServerProtocolPolicy_var server_protocols_policy;
-      TAO_ServerProtocolPolicy *server_protocols = 0;
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
 
-      if (!CORBA::is_nil (policy))
-        {
-          server_protocols_policy =
-            RTCORBA::ServerProtocolPolicy::_narrow (policy
-                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+void
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->client_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-          server_protocols =
-            ACE_dynamic_cast (TAO_ServerProtocolPolicy *,
-                              server_protocols_policy.in ());
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+}
 
-          if (server_protocols != 0)
-            {
-              // TAO_ServerProtocolPolicy
-              RTCORBA::ProtocolList & protocols =
-                server_protocols->protocols_rep ();
-
-              for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-                {
-                  if (protocols[j].protocol_type == IOP::TAG_INTERNET_IOP)
-                    {
-                      properties =
-                        RTCORBA::ProtocolProperties::_narrow (
-                          protocols[j].transport_protocol_properties.in ()
-                          ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
-
-                      if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-                        {
-                          break;
-                        }
-                    }
-                }
-            }
+void
+TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_DIOP_Protocol_Properties &to,
+                                                     RTCORBA::ProtocolProperties_ptr from
+                                                     ACE_ENV_ARG_DECL)
+{
+  RTCORBA::UserDatagramProtocolProperties_var protocol_properties =
+    RTCORBA::UserDatagramProtocolProperties::_narrow (from
+                                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-          if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-            {
-              if (!CORBA::is_nil (properties.in ()))
-                {
-                  RTCORBA::TCPProtocolProperties_var tcp_properties =
-                    RTCORBA::TCPProtocolProperties::_narrow (
-                        properties.in ()
-                        ACE_ENV_ARG_PARAMETER
-                      );
-                  ACE_TRY_CHECK;
-
-                  const int send_buffer_size =
-                    tcp_properties->send_buffer_size (
-                                        ACE_ENV_SINGLE_ARG_PARAMETER
-                                      );
-                  ACE_TRY_CHECK;
-
-                  const int recv_buffer_size =
-                    tcp_properties->recv_buffer_size (
-                                        ACE_ENV_SINGLE_ARG_PARAMETER
-                                      );
-                  ACE_TRY_CHECK;
-
-                  const int no_delay =
-                    tcp_properties->no_delay (
-                                        ACE_ENV_SINGLE_ARG_PARAMETER
-                                      );
-                  ACE_TRY_CHECK;
-
-                  const int enable_network_priority =
-                    tcp_properties->enable_network_priority (
-                                        ACE_ENV_SINGLE_ARG_PARAMETER
-                                      );
-                  ACE_TRY_CHECK;
-
-                  TAO_IIOP_Transport *iiop_transport =
-                    ACE_dynamic_cast (TAO_IIOP_Transport *,
-                                      transport);
-
-                  iiop_transport->update_protocol_properties (
-                                      send_buffer_size,
-                                      recv_buffer_size,
-                                      no_delay,
-                                      enable_network_priority
-                                    );
-                }
-            }
-        }
+  to.enable_network_priority_ = protocol_properties->enable_network_priority ();
+}
+
+void
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->server_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->client_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SCIOP_Protocol_Properties &to,
+                                                     RTCORBA::ProtocolProperties_ptr from
+                                                     ACE_ENV_ARG_DECL)
+{
+  RTCORBA::StreamControlProtocolProperties_var protocol_properties =
+    RTCORBA::StreamControlProtocolProperties::_narrow (from
+                                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  to.send_buffer_size_ = protocol_properties->send_buffer_size ();
+  to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
+  to.keep_alive_ = protocol_properties->keep_alive ();
+  to.dont_route_ = protocol_properties->dont_route ();
+  to.no_delay_ = protocol_properties->no_delay ();
+  to.enable_network_priority_ = protocol_properties->enable_network_priority ();
+}
+
+void
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->server_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &to
+                                                                 ACE_ENV_ARG_DECL)
+{
+  RTCORBA::ProtocolProperties_var from =
+    this->client_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE
+                                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (!CORBA::is_nil (from.in ()))
+    this->extract_protocol_properties (to,
+                                       from.in ()
+                                       ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Boolean
+TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag,
+                                              RTCORBA::ProtocolProperties_ptr protocol_properties
+                                              ACE_ENV_ARG_DECL)
+{
+  if (CORBA::is_nil (protocol_properties))
+      return false;
+
+  if (protocol_tag == IOP::TAG_INTERNET_IOP)
+    {
+      RTCORBA::TCPProtocolProperties_var tcp_protocol_properties =
+        RTCORBA::TCPProtocolProperties::_narrow (protocol_properties
+                                                 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (false);
+
+      return tcp_protocol_properties->enable_network_priority ();
     }
-  ACE_CATCHANY
+
+  if (protocol_tag == TAO_TAG_DIOP_PROFILE)
     {
-      if (TAO_debug_level > 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_RT_Protocols_Hooks::"
-                             "get_effective_client_protocol_properties");
+      RTCORBA::UserDatagramProtocolProperties_var udp_protocol_properties =
+        RTCORBA::UserDatagramProtocolProperties::_narrow (protocol_properties
+                                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (false);
 
-      return -1;
+      return udp_protocol_properties->enable_network_priority ();
     }
-  ACE_ENDTRY;
 
-  return 0;
+  if (protocol_tag == TAO_TAG_SCIOP_PROFILE)
+    {
+      RTCORBA::StreamControlProtocolProperties_var sctp_protocol_properties =
+        RTCORBA::StreamControlProtocolProperties::_narrow (protocol_properties
+                                                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (false);
+
+      return sctp_protocol_properties->enable_network_priority ();
+    }
+
+  return false;
+}
+
+CORBA::Boolean
+TAO_RT_Protocols_Hooks::set_client_network_priority (IOP::ProfileId protocol_tag,
+                                                     TAO_Stub *stub
+                                                     ACE_ENV_ARG_DECL)
+{
+  if (protocol_tag != IOP::TAG_INTERNET_IOP &&
+      protocol_tag != TAO_TAG_DIOP_PROFILE &&
+      protocol_tag != TAO_TAG_SCIOP_PROFILE)
+    return false;
+
+  RTCORBA::ProtocolProperties_var protocol_properties =
+    this->client_protocol_properties_at_object_level (protocol_tag,
+                                                      stub
+                                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (false);
+
+  return this->set_network_priority (protocol_tag,
+                                     protocol_properties.in ()
+                                     ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Boolean
+TAO_RT_Protocols_Hooks::set_server_network_priority (IOP::ProfileId protocol_tag,
+                                                     CORBA::Policy *policy
+                                                     ACE_ENV_ARG_DECL)
+{
+  if (protocol_tag != IOP::TAG_INTERNET_IOP &&
+      protocol_tag != TAO_TAG_DIOP_PROFILE &&
+      protocol_tag != TAO_TAG_SCIOP_PROFILE)
+    return false;
+
+  RTCORBA::ProtocolProperties_var protocol_properties =
+    this->server_protocol_properties (protocol_tag,
+                                      policy
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (false);
+
+  return this->set_network_priority (protocol_tag,
+                                     protocol_properties.in ()
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Long
@@ -461,28 +574,27 @@ TAO_RT_Protocols_Hooks::rt_service_context (
   // again. We can use the already existing one.
   if (!restart)
     {
-      TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *,
-                                               stub);
-      CORBA::Policy *priority_model_policy =
-        rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      if (priority_model_policy)
-        {
+      TAO_RT_Stub *rt_stub =
+        ACE_dynamic_cast (TAO_RT_Stub *,
+                          stub);
 
-          CORBA::Policy *priority_model_policy =
-            rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+      CORBA::Policy_var priority_model_policy =
+        rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
+                                    ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
+      if (!CORBA::is_nil (priority_model_policy.in ()))
+        {
           CORBA::Short client_priority;
+
           int status =
             this->get_thread_CORBA_priority (client_priority
                                              ACE_ENV_ARG_PARAMETER);
           if (status == -1)
             ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
 
-
           this->add_rt_service_context_hook (service_context,
-                                             priority_model_policy,
+                                             priority_model_policy.in (),
                                              client_priority
                                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
@@ -704,133 +816,6 @@ TAO_RT_Protocols_Hooks::set_thread_native_priority (
   return 0;
 }
 
-int
-TAO_RT_Protocols_Hooks::set_default_policies (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Set RTCORBA policy defaults.
-  // Set RTCORBA::ServerProtocolPolicy and
-  // RTCORBA::ClientProtocolPolicy defaults to include all protocols
-  // that were loaded into this ORB.
-  // First, create a protocol list.
-
-  TAO_ProtocolFactorySet *pfs = this->orb_core_->protocol_factories ();
-
-  RTCORBA::ProtocolList protocols;
-  protocols.length (ACE_static_cast (CORBA::ULong, pfs->size ()));
-
-  int i = 0;
-  for (TAO_ProtocolFactorySetItor factory = pfs->begin ();
-       factory != pfs->end ();
-       ++factory, ++i)
-    {
-      CORBA::ULong protocol_type = (*factory)->factory ()->tag ();
-      protocols[i].protocol_type = protocol_type;
-      protocols[i].orb_protocol_properties =
-        RTCORBA::ProtocolProperties::_nil ();
-      // @@ Later, we will likely migrate to using RTCORBA protocol
-      // policies for configuration of protocols in nonRT use cases.
-      // Then, the code below will change to each protocol factory
-      // being responsible for creation of its own default protocol
-      // properties.
-      protocols[i].transport_protocol_properties =
-        TAO_Protocol_Properties_Factory::create_transport_protocol_property
-        (protocol_type);
-    }
-
-  // Set ServerProtocolPolicy.
-  TAO_ServerProtocolPolicy *server_protocol_policy = 0;
-  ACE_NEW_RETURN (server_protocol_policy,
-                  TAO_ServerProtocolPolicy (protocols),
-                  -1);
-
-  RTCORBA::ServerProtocolPolicy_var safe_server_protocol_policy =
-    server_protocol_policy;
-
-  this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Set ClientProtocolPolicy.
-  // NOTE: ClientProtocolPolicy default is used ONLY for protocol
-  // configuration (not protocol preference) IF there is no ORB-level
-  // override.  It is not used when computing effective policy value
-  // for preferencing protocols.
-  TAO_ClientProtocolPolicy *client_protocol_policy = 0;
-  ACE_NEW_RETURN (client_protocol_policy,
-                  TAO_ClientProtocolPolicy (protocols),
-                  -1);
-
-  RTCORBA::ClientProtocolPolicy_var safe_client_protocol_policy =
-    client_protocol_policy;
-
-  this->orb_core_->get_default_policies ()->set_policy (
-                                                client_protocol_policy
-                                                ACE_ENV_ARG_PARAMETER
-                                              );
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-TAO_RT_Protocols_Hooks::set_default_server_protocol_policy (
-    TAO_Acceptor_Registry &acceptor_registry
-    ACE_ENV_ARG_DECL
-  )
-{
-  RTCORBA::ProtocolList protocols;
-
-  TAO_AcceptorSetIterator end =
-    acceptor_registry.end ();
-
-  for (TAO_AcceptorSetIterator acceptor =
-         acceptor_registry.begin ();
-       acceptor != end;
-       ++acceptor)
-    {
-      if (*acceptor == 0)
-        continue;
-
-      CORBA::ULong current_length =
-        protocols.length ();
-
-      protocols.length (current_length + 1);
-
-      protocols[current_length].protocol_type =
-        (*acceptor)->tag ();
-
-      protocols[current_length].orb_protocol_properties =
-        RTCORBA::ProtocolProperties::_nil ();
-
-      // @@ Later, we will likely migrate to using RTCORBA protocol
-      // policies for configuration of protocols in nonRT use cases.
-      // Then, the code below will change to each protocol factory
-      // being responsible for creation of its own default protocol
-      // properties.
-      protocols[current_length].transport_protocol_properties =
-        TAO_Protocol_Properties_Factory::create_transport_protocol_property (
-            (*acceptor)->tag ()
-          );
-    }
-
-  // Set ServerProtocolPolicy.
-  TAO_ServerProtocolPolicy *server_protocol_policy = 0;
-  ACE_NEW_RETURN (server_protocol_policy,
-                  TAO_ServerProtocolPolicy (protocols),
-                  -1);
-
-  RTCORBA::ServerProtocolPolicy_var safe_server_protocol_policy =
-    server_protocol_policy;
-
-  this->orb_core_->get_default_policies ()->set_policy (
-                                                server_protocol_policy
-                                                ACE_ENV_ARG_PARAMETER
-                                              );
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
 ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks,
                        ACE_TEXT ("RT_Protocols_Hooks"),
                        ACE_SVC_OBJ_T,
@@ -842,7 +827,7 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-  template class ACE_Dynamic_Service<TAO_RT_Protocols_Hooks>;
+template class ACE_Dynamic_Service<TAO_RT_Protocols_Hooks>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index bcb13cb9640..f5bc260e298 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -42,95 +42,69 @@ public:
   virtual ~TAO_RT_Protocols_Hooks (void);
 
   /// Initialize the protocols hooks instance.
-  virtual void init_hooks (TAO_ORB_Core *orb_core
-                           ACE_ENV_ARG_DECL);
+  void init_hooks (TAO_ORB_Core *orb_core
+                   ACE_ENV_ARG_DECL);
 
-  /// Invoke the client_protocols hook if present.
-  /**
-   * The timeout hook is used to determine if the client_protocols policy is
-   * set and with what value.  If the ORB is compiled without support
-   * for RTCORBA this feature does not take effect
-   * @param tcp_properties returns the Protocol List set
-   */
-  virtual int call_client_protocols_hook (int &send_buffer_size,
-                                          int &recv_buffer_size,
-                                          int &no_delay,
-                                          int &enable_network_priority,
-                                          const char *protocol_type);
-
-  /// Define the Client_Protocols_TCP_Hook signature
-  typedef int (*Client_Protocols_Hook) (TAO_ORB_Core *,
-                                        int &send_buffer_size,
-                                        int &recv_buffer_size,
-                                        int &no_delay,
-                                        int &enable_network_priority,
-                                        const char *);
-
-  static void set_client_protocols_hook (Client_Protocols_Hook hook);
-
-  /// The hook to be set for the ClientProtocolPolicy.
-  static Client_Protocols_Hook client_protocols_hook_;
-
-  /// Invoke the server_protocols hook if present.
-  /**
-   * The timeout hook is used to determine if the client_protocols policy is
-   * set and with what value.  If the ORB is compiled without support
-   * for RTCORBA this feature does not take effect
-   * @param tcp_properties returns the Protocol List set
-   */
-  virtual int call_server_protocols_hook (int &send_buffer_size,
-                                          int &recv_buffer_size,
-                                          int &no_delay,
-                                          int &enable_network_priority,
-                                          const char *protocol_type);
+  CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
+                                              TAO_Stub *stub
+                                              ACE_ENV_ARG_DECL);
 
-  /// Define the Server_Protocols_Hook signature
-  typedef int (*Server_Protocols_Hook) (TAO_ORB_Core *,
-                                        int &,
-                                        int &,
-                                        int &,
-                                        int &,
-                                        const char *);
+  CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
+                                              CORBA::Policy *policy
+                                              ACE_ENV_ARG_DECL);
 
-  static void set_server_protocols_hook (Server_Protocols_Hook hook);
-  //  static void set_server_protocols_uiop_hook (Server_Protocols_UIOP_Hook hook);
+  void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  /// The hook to be set for the ServerProtocolPolicy.
-  static Server_Protocols_Hook server_protocols_hook_;
+  void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
+  void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
+  void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual int update_client_protocol_properties (TAO_Stub *stub,
-                                                 TAO_Transport *t,
-                                                 const char *protocol_type);
+  void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
+  void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual int update_server_protocol_properties (CORBA::Policy *server_policy,
-                                                 TAO_Transport *t,
-                                                 const char *protocol_type);
+  void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual CORBA::Long get_dscp_codepoint (void);
+  void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual void rt_service_context (TAO_Stub *stub,
-                                   TAO_Service_Context &service_context,
-                                   CORBA::Boolean restart
-                                   ACE_ENV_ARG_DECL);
+  void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
-                                            CORBA::Policy *model_policy,
-                                            CORBA::Short &client_priority
-                                            ACE_ENV_ARG_DECL);
+  void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
+                                                ACE_ENV_ARG_DECL);
 
-  virtual void get_selector_hook (CORBA::Policy *model_policy,
-                                  CORBA::Boolean
-                                  &is_client_propagated,
-                                  CORBA::Short &server_priority);
+  CORBA::Long get_dscp_codepoint (void);
 
-  virtual void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
-                                               CORBA::Short priority,
-                                               CORBA::Short &min_priority,
-                                               CORBA::Short &max_priority,
-                                               int &in_range);
+  void rt_service_context (TAO_Stub *stub,
+                           TAO_Service_Context &service_context,
+                           CORBA::Boolean restart
+                           ACE_ENV_ARG_DECL);
+
+  void add_rt_service_context_hook (TAO_Service_Context &service_context,
+                                    CORBA::Policy *model_policy,
+                                    CORBA::Short &client_priority
+                                    ACE_ENV_ARG_DECL);
+
+  void get_selector_hook (CORBA::Policy *model_policy,
+                          CORBA::Boolean
+                          &is_client_propagated,
+                          CORBA::Short &server_priority);
+
+  void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
+                                       CORBA::Short priority,
+                                       CORBA::Short &min_priority,
+                                       CORBA::Short &max_priority,
+                                       int &in_range);
 
   /**
    * Accessor and modifier to the current thread priority, used to
@@ -138,32 +112,68 @@ public:
    * some critical components.
    */
   //@{
-  virtual int get_thread_CORBA_priority (CORBA::Short &
-                                         ACE_ENV_ARG_DECL_NOT_USED);
+  int get_thread_CORBA_priority (CORBA::Short &
+                                 ACE_ENV_ARG_DECL);
 
-  virtual int get_thread_native_priority (CORBA::Short &
-                                          ACE_ENV_ARG_DECL_NOT_USED);
+  int get_thread_native_priority (CORBA::Short &
+                                  ACE_ENV_ARG_DECL);
 
-  virtual int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                                    CORBA::Short &
-                                                    ACE_ENV_ARG_DECL_NOT_USED);
+  int get_thread_CORBA_and_native_priority (CORBA::Short &,
+                                            CORBA::Short &
+                                            ACE_ENV_ARG_DECL);
 
-  virtual int set_thread_CORBA_priority (CORBA::Short
-                                         ACE_ENV_ARG_DECL_NOT_USED);
+  int set_thread_CORBA_priority (CORBA::Short
+                                 ACE_ENV_ARG_DECL);
 
-  virtual int set_thread_native_priority (CORBA::Short
-                                          ACE_ENV_ARG_DECL_NOT_USED);
+  int set_thread_native_priority (CORBA::Short
+                                  ACE_ENV_ARG_DECL);
 
   //@}
 
-  /// 1. Sets ORB-level policy defaults for this ORB.  Currently sets
-  /// default RTCORBA policies: ClientProtocolPolicy.
-  virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL);
+protected:
+
+  RTCORBA::ProtocolProperties_ptr server_protocol_properties (IOP::ProfileId protocol_tag,
+                                                              CORBA::Policy_ptr policy
+                                                              ACE_ENV_ARG_DECL);
 
-  int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
-                                          ACE_ENV_ARG_DECL);
+  RTCORBA::ProtocolProperties_ptr client_protocol_properties (IOP::ProfileId protocol_tag,
+                                                              CORBA::Policy_ptr policy
+                                                              ACE_ENV_ARG_DECL);
+
+  RTCORBA::ProtocolProperties_ptr server_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
+                                                                           ACE_ENV_ARG_DECL);
+
+  RTCORBA::ProtocolProperties_ptr client_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
+                                                                           ACE_ENV_ARG_DECL);
+
+  RTCORBA::ProtocolProperties_ptr client_protocol_properties_at_object_level (IOP::ProfileId protocol_tag,
+                                                                              TAO_Stub *stub
+                                                                              ACE_ENV_ARG_DECL);
+
+  void extract_protocol_properties (TAO_IIOP_Protocol_Properties &to,
+                                    RTCORBA::ProtocolProperties_ptr from
+                                    ACE_ENV_ARG_DECL);
+
+  void extract_protocol_properties (TAO_UIOP_Protocol_Properties &to,
+                                    RTCORBA::ProtocolProperties_ptr from
+                                    ACE_ENV_ARG_DECL);
+
+  void extract_protocol_properties (TAO_SHMIOP_Protocol_Properties &to,
+                                    RTCORBA::ProtocolProperties_ptr from
+                                    ACE_ENV_ARG_DECL);
+
+  void extract_protocol_properties (TAO_DIOP_Protocol_Properties &to,
+                                    RTCORBA::ProtocolProperties_ptr from
+                                    ACE_ENV_ARG_DECL);
+
+  void extract_protocol_properties (TAO_SCIOP_Protocol_Properties &to,
+                                    RTCORBA::ProtocolProperties_ptr from
+                                    ACE_ENV_ARG_DECL);
+
+  CORBA::Boolean set_network_priority (IOP::ProfileId protocol_tag,
+                                       RTCORBA::ProtocolProperties_ptr protocol_properties
+                                       ACE_ENV_ARG_DECL);
 
-protected:
   TAO_ORB_Core *orb_core_;
 
   // Save a reference to the priority mapping manager.
@@ -173,10 +183,6 @@ protected:
   RTCORBA::Current_var current_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_Protocols_Hooks.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
 
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.i b/TAO/tao/RTCORBA/RT_Protocols_Hooks.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index f81b3c697ab..8edb28797ea 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -123,8 +123,6 @@ TAO_RT_Stub::exposed_client_protocol (CORBA::Policy_ptr policy)
   this->client_protocol_policy_ = CORBA::Policy::_duplicate (policy);
 }
 
-
-
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 CORBA::Policy_ptr
@@ -146,23 +144,24 @@ TAO_RT_Stub::get_policy (CORBA::PolicyType type
 }
 
 CORBA::Policy_ptr
-TAO_RT_Stub::get_client_policy (CORBA::PolicyType type
+TAO_RT_Stub::get_cached_policy (TAO_Cached_Policy_Type type
                                 ACE_ENV_ARG_DECL)
 {
   // If we are dealing with a client exposed policy, check if any
   // value came in the IOR/reconcile IOR value and overrides.
-  if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
+  if (type == TAO_CACHED_POLICY_PRIORITY_MODEL)
     return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
+  if (type == TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION)
     return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
+  if (type == TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL)
     return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  return this->TAO_Stub::get_client_policy (type ACE_ENV_ARG_PARAMETER);
+  return this->TAO_Stub::get_cached_policy (type ACE_ENV_ARG_PARAMETER);
 }
 
+
 TAO_Stub *
 TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
                                    CORBA::SetOverrideType set_add
@@ -194,117 +193,13 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
 CORBA::Policy *
-TAO_RT_Stub::private_connection (void)
-{
-  CORBA::Policy *result = 0;
-
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-  if (this->policies_ != 0)
-    result = this->policies_->get_cached_policy (TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION);
-
-  // No need to lock, the object is in TSS storage....
-  if (result == 0)
-    {
-      TAO_Policy_Current &policy_current =
-        this->orb_core_->policy_current ();
-      result = policy_current.get_cached_policy (TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION);
-    }
-
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
-  if (result == 0)
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION);
-    }
-
-  if (result == 0)
-    result = this->orb_core_->get_default_policies ()->get_cached_policy (TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION);
-
-  return result;
-}
-
-CORBA::Policy *
-TAO_RT_Stub::client_protocol (void)
-{
-  CORBA::Policy *result = 0;
-
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-  if (this->policies_ != 0)
-    result = this->policies_->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
-
-  // No need to lock, the object is in TSS storage....
-  if (result == 0)
-    {
-      TAO_Policy_Current &policy_current =
-        this->orb_core_->policy_current ();
-      result = policy_current.get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
-    }
-
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
-  if (result == 0)
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
-    }
-
-  // No default is used for client priority policy (default creates
-  // conflict in case the policy is also set for the object on the
-  // server side).
-
-  return result;
-}
-
-CORBA::Policy *
-TAO_RT_Stub::priority_banded_connection (void)
-{
-  CORBA::Policy *result = 0;
-
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-  if (this->policies_ != 0)
-    result = this->policies_->get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
-
-  // No need to lock, the object is in TSS storage....
-  if (result == 0)
-    {
-      TAO_Policy_Current &policy_current =
-        this->orb_core_->policy_current ();
-      result = policy_current.get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
-    }
-
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
-  if (result == 0)
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        result = policy_manager->get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
-    }
-
-  if (result == 0)
-    result = this->orb_core_->get_default_policies ()->get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
-
-  return result;
-}
-
-CORBA::Policy *
 TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get effective override.
   CORBA::Policy_var override =
-    this->priority_banded_connection ();
+    this->TAO_Stub::get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
+                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   // Get the value from the ior.
   CORBA::Policy_var exposed =
@@ -355,7 +250,9 @@ TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get effective override.
   CORBA::Policy_var override =
-    this->client_protocol ();
+    this->TAO_Stub::get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL
+                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   // Get the value from the ior.
   CORBA::Policy_var exposed =
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index a6595e92b12..6ed231f6714 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -47,7 +47,6 @@ class TAO_RTCORBA_Export TAO_RT_Stub : public TAO_Stub
 {
 public:
 
-  // -- Ctor/Dtor --
   TAO_RT_Stub (const char *repository_id,
                const TAO_MProfile &profiles,
                TAO_ORB_Core *orb_core);
@@ -63,21 +62,27 @@ public:
    * types.
    */
   CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL);
 
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
+                                       ACE_ENV_ARG_DECL);
 
+  TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
+                                  CORBA::SetOverrideType set_add
+                                  ACE_ENV_ARG_DECL);
 
-  CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+#endif /* TAO_HAS_CORBA_MESSAGING */
 
+private:
 
-  virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
-                                             CORBA::SetOverrideType set_add
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  /// Helper method used to parse the policies.
+  void parse_policies (ACE_ENV_SINGLE_ARG_DECL);
 
-#endif /* TAO_HAS_CORBA_MESSAGING */
+  void exposed_priority_model (CORBA::Policy_ptr policy);
 
-  /// Creates a Stub Object.
+  void exposed_priority_banded_connection (CORBA::Policy_ptr policy);
+
+  void exposed_client_protocol (CORBA::Policy_ptr policy);
 
   /// Returns the CORBA::Policy (which will be narrowed to be
   /// used as RTCORBA::PriorityModelPolicy) exported
@@ -94,13 +99,6 @@ public:
   /// in object's IOR.
   CORBA::Policy_ptr exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL);
 
-
-  CORBA::Policy *private_connection (void);
-
-  CORBA::Policy *priority_banded_connection (void);
-
-  CORBA::Policy *client_protocol (void);
-
   // = Methods for obtaining effective policies.
   //
   //   Effective policy is the one that would be used if a request
@@ -108,25 +106,8 @@ public:
   //   override for a given policy type, and then reconciling it with
   //   the policy value exported in the Object's IOR.
 
-  CORBA::Policy *
-  effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  CORBA::Policy *
-  effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-
-
-private:
-
-  /// Helper method used to parse the policies.
-  void parse_policies (ACE_ENV_SINGLE_ARG_DECL);
-
-  void exposed_priority_model (CORBA::Policy_ptr policy);
-
-  void exposed_priority_banded_connection (CORBA::Policy_ptr policy);
-
-  void exposed_client_protocol (CORBA::Policy_ptr policy);
-
-private:
+  CORBA::Policy *effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Policy *effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL);
 
   // The following attribute are used to cache
   // the different kind of policies and avoid to
@@ -141,8 +122,6 @@ private:
 
   CORBA::Boolean are_policies_parsed_;
 
-
-
 private:
   // = Disallow copy constructor and assignment operator.
   ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub (const TAO_RT_Stub &))
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index 134c253e80f..19c1067280a 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -4,8 +4,8 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID (RTCORBA, 
-           RT_Thread_Lane_Resources_Manager, 
+ACE_RCSID (RTCORBA,
+           RT_Thread_Lane_Resources_Manager,
            "$Id$")
 
 #include "tao/ORB_Core.h"
@@ -15,10 +15,6 @@ ACE_RCSID (RTCORBA,
 #include "tao/LF_Follower.h"
 #include "tao/Leader_Follower.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i"
-#endif /* ! __ACE_INLINE__ */
-
 TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
   : TAO_Thread_Lane_Resources_Manager (orb_core),
     default_lane_resources_ (0),
@@ -46,8 +42,19 @@ TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (voi
 int
 TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL)
 {
+  TAO_ORB_Parameters *params =
+    this->orb_core_->orb_params ();
+
+  TAO_EndpointSet endpoint_set;
+
+  params->get_endpoint_set (TAO_DEFAULT_LANE,
+                            endpoint_set);
+
+  bool ignore_address = false;
+
   int result =
-    this->default_lane_resources_->open_acceptor_registry (0
+    this->default_lane_resources_->open_acceptor_registry (endpoint_set,
+                                                           ignore_address
                                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index 7bd164d7db0..17e5684f435 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -98,10 +98,6 @@ public:
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
 ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
 
-#if defined (__ACE_INLINE__)
-# include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
index b0bfd2cc1de..0c158812e9f 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
@@ -1,7 +1,5 @@
 // $Id$
 
-#include "RT_Transport_Descriptor.h"
-
 ACE_INLINE
 TAO_RT_Transport_Descriptor::TAO_RT_Transport_Descriptor (TAO_Endpoint *endpoint,
                                                           CORBA::Boolean flag)
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
index a56bdbda7f0..c6646a943fb 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
@@ -1,7 +1,5 @@
 // $Id$
 
-#include "RT_Transport_Descriptor_Property.h"
-
 ACE_INLINE
 TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void)
   : next_ (0)
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index d49742a5f7c..ce5cc9e5721 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -17,11 +17,6 @@ ACE_RCSID (RTCORBA,
 #include "tao/Leader_Follower.h"
 #include "ace/Auto_Ptr.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Thread_Pool.i"
-#endif /* ! __ACE_INLINE__ */
-
-
 TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator (
   TAO_Thread_Lane &lane)
   : lane_ (lane)
@@ -217,10 +212,45 @@ TAO_Thread_Lane::open (ACE_ENV_SINGLE_ARG_DECL)
   this->validate_and_map_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
+  // Create a string with the pool:thread id.
+  char pool_lane_id[10];
+  ACE_OS::sprintf (pool_lane_id,
+                   "%d:%d",
+                   this->pool ().id (),
+                   this->id ());
+
+  TAO_ORB_Parameters *params =
+    this->pool ().manager ().orb_core ().orb_params ();
+
+  TAO_EndpointSet endpoint_set;
+  bool ignore_address;
+
+  // Get the endpoints for this lane.
+  params->get_endpoint_set (pool_lane_id,
+                            endpoint_set);
+
+  if (endpoint_set.is_empty ())
+    {
+      // If endpoints are not specified for this lane, use the
+      // endpoints specified for the default lane but ignore their
+      // addresses.
+      params->get_endpoint_set (TAO_DEFAULT_LANE,
+                                endpoint_set);
+
+      ignore_address = true;
+    }
+  else
+    {
+      // If endpoints are specified for this lane, use them with thier
+      // addresses.
+      ignore_address = false;
+    }
+
   // Open the acceptor registry.
   int result = 0;
   result =
-    this->resources_.open_acceptor_registry (1
+    this->resources_.open_acceptor_registry (endpoint_set,
+                                             ignore_address
                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index 5fab56c5540..557a68613fc 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -399,10 +399,6 @@ private:
   ACE_SYNCH_MUTEX lock_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "Thread_Pool.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTCORBA/Thread_Pool.i b/TAO/tao/RTCORBA/Thread_Pool.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTCORBA/Thread_Pool.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTCORBA/diffs/RTCORBA.diff b/TAO/tao/RTCORBA/diffs/RTCORBA.diff
index e4810dd618a..711f4cc1fcd 100644
--- a/TAO/tao/RTCORBA/diffs/RTCORBA.diff
+++ b/TAO/tao/RTCORBA/diffs/RTCORBA.diff
@@ -1,101 +1,83 @@
---- orig/RTCORBAC.h	Wed Feb  6 13:37:48 2002
-+++ RTCORBAC.h	Wed Feb  6 13:44:01 2002
-@@ -23,15 +23,26 @@
- #define _TAO_IDL_ORIG_RTCORBAC_H_
-
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/orbconf.h"
-
+// -*- C++ -*-
+--- orig/RTCORBAC.h     2004-09-16 12:52:02.885009600 +0200
++++ RTCORBAC.h  2004-09-16 12:36:01.362408000 +0200
+@@ -36,12 +36,18 @@
+ 
+ #include "ace/config-all.h"
+ 
++#ifndef TAO_RTCORBA_SAFE_INCLUDE
++#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
++#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
++
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
-
+ 
  #include "rtcorba_export.h"
--#include "IOPC.h"
--#include "TimeBaseC.h"
-+#include "tao/IOPC.h"
++#include "rtcorba_typedefs.h"
+ #include "tao/ORB.h"
 +#include "tao/TimeBaseC.h"
+ #include "tao/SystemException.h"
+ #include "tao/Environment.h"
+ #include "tao/Object.h"
+@@ -50,6 +56,8 @@
+ #include "tao/Seq_Var_T.h"
+ #include "tao/Seq_Out_T.h"
+ #include "tao/VarOut_T.h"
++#include "tao/Encodable.h"
 +#include "tao/PolicyC.h"
-+
-+// Forward references.
-+class TAO_Priority_Mapping_Manager;
-+class TAO_Priority_Mapping_Manager_var;
-+class TAO_Priority_Mapping_Manager_out;
-+class TAO_Priority_Mapping;
-+
-+#ifndef TAO_RTCORBA_SAFE_INCLUDE
-+#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
-+#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
-
+ 
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -58,6 +69,15 @@
-
- TAO_NAMESPACE  RTCORBA
- {
-+  // TAO-specific
-+  typedef TAO_Priority_Mapping_Manager PriorityMappingManager;
-+  typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr;
-+  typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var;
-+  typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out;
-+
-+  typedef TAO_Priority_Mapping PriorityMapping;
-+  // End TAO-specific
-+
-   typedef CORBA::Short NativePriority;
-   typedef CORBA::Short_out NativePriority_out;
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority;
-@@ -674,6 +694,7 @@
-
+@@ -532,6 +540,7 @@
+   
    class TAO_RTCORBA_Export ProtocolProperties
-     : public virtual CORBA_Object
+     : public virtual CORBA::Object
 +    , public virtual TAO_Encodable
    {
    public:
-   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-@@ -705,6 +726,11 @@
-
+     typedef ProtocolProperties_ptr _ptr_type;
+@@ -568,6 +577,9 @@
      virtual const char* _interface_repository_id (void) const;
-
-+    // CDR Encoder/Decoder methods.
-+
+     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+   
++    // CDR Encoder/Decoder methods. (handcrafted)
 +    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
 +    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-+
    protected:
+     // Abstract or local interface only.
      ProtocolProperties (void);
-
---- orig/RTCORBAC.cpp	Wed Feb  6 13:37:48 2002
-+++ RTCORBAC.cpp	Wed Feb  6 13:41:48 2002
-@@ -19,7 +19,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
-
+--- orig/RTCORBAC.cpp   2004-09-16 12:52:02.885009600 +0200
++++ RTCORBAC.cpp        2004-09-16 12:36:36.643139200 +0200
+@@ -29,7 +29,7 @@
+ // be/be_codegen.cpp:303
+ 
+ 
 -#include "RTCORBAC.h"
 +#include "RTCORBA.h"
-
- #include "tao/Stub.h"
- #include "tao/Invocation.h"
-@@ -39,6 +39,21 @@
- #include "RTCORBAC.i"
- #endif /* !defined INLINE */
-
+ #include "tao/CDR.h"
+ #include "tao/Typecode.h"
+ #include "tao/Any_Impl_T.h"
+@@ -56,6 +56,22 @@
+ {
+ }
+ 
 +//////////////////////////////////////////////////////
-+// CDR Encoding Support
++// CDR Encoding Support hand crafted
 +
 +CORBA::Boolean
 +RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &)
 +{
 +  return 1;
 +}
++// TAO_IDL - Generated from
++// be/be_visitor_arg_traits.cpp:60
 +
 +CORBA::Boolean
 +RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
 +{
 +  return 1;
 +}
-+
- static const CORBA::Long _oc_RTCORBA_NativePriority[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
+ 
+ // TAO_IDL - Generated from
+ // be/be_visitor_typecode/typecode_defn.cpp:290
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
index f3386bb07e8..db280bc5b09 100644
--- a/TAO/tao/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer.mpc
@@ -26,4 +26,8 @@ project : taolib, core, rtcorba, portableserver {
   PIDL_Files {
     RTPortableServer
   }
+
+  Pkgconfig_Files {
+    RTPortableServer/TAO_RTPortableServer.pc.in
+  }
 }
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
index 5315cdf0a24..2487ab3fc8a 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
@@ -27,24 +27,26 @@
 
 #include "RTPortableServerC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_RTPortableServer_POA[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x5254506f),
-  ACE_NTOHL (0x72746162),
-  ACE_NTOHL (0x6c655365),
-  ACE_NTOHL (0x72766572),
-  ACE_NTOHL (0x2f504f41),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254506f), 
+  ACE_NTOHL (0x72746162), 
+  ACE_NTOHL (0x6c655365), 
+  ACE_NTOHL (0x72766572), 
+  ACE_NTOHL (0x2f504f41), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTPortableServer/POA:1.0
     4,
   ACE_NTOHL (0x504f4100),  // name = POA
@@ -55,7 +57,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTPortableServer_POA (
     sizeof (_oc_RTPortableServer_POA),
     (char *) &_oc_RTPortableServer_POA,
     0,
-    sizeof (RTPortableServer::POA)
+    0
   );
 
 namespace RTPortableServer
@@ -133,8 +135,6 @@ operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -149,5 +149,4 @@ operator>>= (
         RTPortableServer::POA \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 69a012e8ad5..63edacd946e 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -26,12 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "RTPortableServerC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -39,11 +39,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "RTPortableServerC.i"
+#include "RTPortableServerC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -91,23 +91,17 @@ TAO::Objref_Traits<RTPortableServer::POA>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*RTPortableServer__TAO_POA_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTPortableServer::POA::POA (void)
 {}
 
 RTPortableServer::POA::~POA (void)
 {}
 
-void
+void 
 RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *_tao_tmp_pointer =
-    ACE_static_cast (POA *, _tao_void_pointer);
+    static_cast<POA *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -121,10 +115,10 @@ RTPortableServer::POA::_narrow (
     {
       return POA::_nil ();
     }
-
+  
   POA_ptr proxy =
     dynamic_cast<POA_ptr> (_tao_objref);
-
+  
   return POA::_duplicate (proxy);
 }
 
@@ -138,10 +132,10 @@ RTPortableServer::POA::_unchecked_narrow (
     {
       return POA::_nil ();
     }
-
+  
   POA_ptr proxy =
     dynamic_cast<POA_ptr> (_tao_objref);
-
+  
   return POA::_duplicate (proxy);
 }
 
@@ -152,7 +146,7 @@ RTPortableServer::POA::_duplicate (POA_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -201,7 +195,7 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -214,7 +208,7 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         RTPortableServer::POA
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTPortableServer::POA
@@ -231,10 +225,10 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         RTPortableServer::POA
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTPortableServer::POA
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index bd290881d44..d648ef41913 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
 #define _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "rtportableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
@@ -60,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +71,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -86,22 +87,22 @@ namespace TAO
 
 namespace RTPortableServer
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:603
 
 #if !defined (_RTPORTABLESERVER_POA__VAR_OUT_CH_)
 #define _RTPORTABLESERVER_POA__VAR_OUT_CH_
-
+  
   class POA;
   typedef POA *POA_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         POA
       >
     POA_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         POA
@@ -109,126 +110,126 @@ namespace RTPortableServer
     POA_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTPORTABLESERVER_POA_CH_)
 #define _RTPORTABLESERVER_POA_CH_
-
+  
   class TAO_RTPortableServer_Export POA
-    : public virtual PortableServer::POA
+    : public virtual ::PortableServer::POA
   {
   public:
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
-
+    
     // The static operations.
     static POA_ptr _duplicate (POA_ptr obj);
-
+    
     static POA_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static POA_ptr _nil (void)
     {
       return (POA_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr create_reference_with_priority (
         const char * intf,
-        RTCORBA::Priority priority
+        ::RTCORBA::Priority priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr create_reference_with_id_and_priority (
-        const PortableServer::ObjectId & oid,
+        const ::PortableServer::ObjectId & oid,
         const char * intf,
-        RTCORBA::Priority priority
+        ::RTCORBA::Priority priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ObjectId * activate_object_with_priority (
-        PortableServer::Servant p_servant,
-        RTCORBA::Priority priority
+        ::PortableServer::Servant p_servant,
+        ::RTCORBA::Priority priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ServantAlreadyActive
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ServantAlreadyActive,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void activate_object_with_id_and_priority (
-        const PortableServer::ObjectId & oid,
-        PortableServer::Servant p_servant,
-        RTCORBA::Priority priority
+        const ::PortableServer::ObjectId & oid,
+        ::PortableServer::Servant p_servant,
+        ::RTCORBA::Priority priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ServantAlreadyActive
-        , PortableServer::POA::ObjectAlreadyActive
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ServantAlreadyActive,
+        ::PortableServer::POA::ObjectAlreadyActive,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     POA (void);
-
+    
     virtual ~POA (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     POA (const POA &);
-
+    
     void operator= (const POA &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
 
 // TAO_IDL - Generated from
@@ -245,19 +246,19 @@ namespace TAO
 
 #if !defined (_RTPORTABLESERVER_POA__TRAITS_CH_)
 #define _RTPORTABLESERVER_POA__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTPortableServer_Export Objref_Traits<RTPortableServer::POA>
+  struct TAO_RTPortableServer_Export Objref_Traits< ::RTPortableServer::POA>
   {
-    static RTPortableServer::POA_ptr duplicate (
-        RTPortableServer::POA_ptr
+    static ::RTPortableServer::POA_ptr duplicate (
+        ::RTPortableServer::POA_ptr
       );
     static void release (
-        RTPortableServer::POA_ptr
+        ::RTPortableServer::POA_ptr
       );
-    static RTPortableServer::POA_ptr nil (void);
+    static ::RTPortableServer::POA_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTPortableServer::POA_ptr p,
+        ::RTPortableServer::POA_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -273,13 +274,13 @@ TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::PO
 TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPortableServer::POA_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "RTPortableServerC.i"
+#include "RTPortableServerC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -290,3 +291,5 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.i b/TAO/tao/RTPortableServer/RTPortableServerC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServerC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
index eeaed35df3d..0ebc6f73ac2 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -8,11 +8,7 @@
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "RT_Acceptor_Filters.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
+ACE_RCSID (RTPortableServer,
            RT_Acceptor_Filter,
            "$Id$")
 
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
index 438cf3f3b3a..2a8cfe9fea0 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
@@ -31,15 +31,6 @@
 #include "tao/RTCORBA/RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 class TAO_Acceptor;
 
 /**
@@ -72,14 +63,6 @@ private:
   RTCORBA::ProtocolList &protocols_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "RT_Acceptor_Filters.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.i b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.i
deleted file mode 100644
index f4f84bd4f2e..00000000000
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.i
+++ /dev/null
@@ -1,3 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index 45bf620a40f..7487e128b7d 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -4,7 +4,9 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-ACE_RCSID(RTCORBA, RT_Collocation_Resolver, "$Id$")
+ACE_RCSID(RTPortableServer,
+          RT_Collocation_Resolver,
+          "$Id$")
 
 #include "tao/ORB_Core.h"
 #include "tao/Object.h"
@@ -14,10 +16,6 @@ ACE_RCSID(RTCORBA, RT_Collocation_Resolver, "$Id$")
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/Profile.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/RTPortableServer/RT_Collocation_Resolver.i"
-#endif /* ! __ACE_INLINE__ */
-
 CORBA::Boolean
 TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
                                             ACE_ENV_ARG_DECL) const
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
index 3fe8a0375d7..99d89bff36d 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
@@ -47,10 +47,6 @@ public:
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
 ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
 
-#if defined (__ACE_INLINE__)
-# include "tao/RTPortableServer/RT_Collocation_Resolver.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.i b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
index 7034fb69872..bcfa7a8dbe6 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -10,7 +10,7 @@
 #include "RT_Policy_Validator.h"
 #include "RT_Collocation_Resolver.h"
 
-ACE_RCSID (TAO_RTPortableServer,
+ACE_RCSID (RTPortableServer,
            RT_Object_Adapter_Factory,
            "$Id$")
 
@@ -61,7 +61,7 @@ TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
 
 ACE_FACTORY_DEFINE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory)
 ACE_STATIC_SVC_DEFINE (TAO_RT_Object_Adapter_Factory,
-                       ACE_TEXT ("TAO_RT_POA"),
+                       ACE_TEXT ("TAO_RT_Object_Adapter_Factory"),
                        ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (TAO_RT_Object_Adapter_Factory),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
index fc7d74d5ca6..3b682007428 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
@@ -15,7 +15,7 @@
 
 #include "rtportableserver_export.h"
 
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Object_Adapter_Factory.h"
 #include "tao/orbconf.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index a52d3fd0cac..10c586283d2 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -17,6 +17,8 @@
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Acceptor_Registry.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Thread_Lane_Resources_Manager.h"
 
 #include "tao/RTCORBA/RT_Policy_i.h"
 
@@ -102,7 +104,9 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
 {
   {
     CORBA::Policy_var policy =
-      policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
+      policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
+                                  ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK;
 
     RTCORBA::PriorityModelPolicy_var priority_model =
       RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
@@ -173,7 +177,10 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
     {
       // Check if we have bands.
       CORBA::Policy_var bands =
-        this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
+        this->policies ().get_cached_policy (
+          TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
+          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
         = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
@@ -249,7 +256,9 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
 
   // Server protocol policy.
   CORBA::Policy_var protocol =
-    this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
+    this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
+                                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
     RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
@@ -269,9 +278,30 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
   if (this->thread_pool_ == 0 ||
       !this->thread_pool_->with_lanes ())
     {
-      TAO_Acceptor_Registry *acceptor_registry =
-        TAO_POA_RT_Policy_Validator::extract_acceptor_registry (this->orb_core_,
-                                                                this->thread_pool_);
+      TAO_Acceptor_Registry *acceptor_registry = 0;
+
+      if (this->thread_pool_ == 0)
+        {
+          TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager =
+            this->orb_core_.thread_lane_resources_manager ();
+
+          TAO_Thread_Lane_Resources &resources =
+            thread_lane_resources_manager.default_lane_resources ();
+
+          acceptor_registry =
+            &resources.acceptor_registry ();
+        }
+      else
+        {
+          TAO_Thread_Lane **lanes =
+            this->thread_pool_->lanes ();
+
+          TAO_Thread_Lane_Resources &resources =
+            lanes[0]->resources ();
+
+          acceptor_registry =
+            &resources.acceptor_registry ();
+        }
 
       return
         this->TAO_POA::create_stub_object (object_key,
@@ -311,7 +341,10 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
   // the acceptors in the thread lanes that matches the bands in this
   // POA.  If there are no bands, all the thread lanes are used.
   CORBA::Policy_var bands =
-    this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
+    this->policies ().get_cached_policy (
+      TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
+      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
   RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
     = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
@@ -923,25 +956,6 @@ TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL)
   return this->TAO_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Policy *
-TAO_RT_POA::server_protocol (void)
-{
-  CORBA::Policy *result =
-    this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
-
-  if (result == 0)
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_.policy_manager ();
-
-      if (policy_manager != 0)
-        result =
-          policy_manager->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
-    }
-
-  return result;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 9fbb2603074..197857215b9 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -269,8 +269,6 @@ public:
 
   void *thread_pool (void) const;
 
-  CORBA::Policy *server_protocol (void);
-
 protected:
 
   /// Template method for creating new POA's of this type.
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index c5560a9901f..cdea3350ccd 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -14,16 +14,12 @@
 #include "tao/Policy_Set.h"
 #include "tao/Transport_Acceptor.h"
 
-
-
 ACE_RCSID (RTPortableServer,
            RT_Policy_Validator,
            "$Id$")
 
-
 TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core)
   : TAO_Policy_Validator (orb_core),
-    acceptor_registry_ (0),
     thread_pool_ (0)
 {
   // No-Op.
@@ -34,16 +30,6 @@ TAO_POA_RT_Policy_Validator::~TAO_POA_RT_Policy_Validator (void)
   // No-Op.
 }
 
-TAO_Acceptor_Registry *
-TAO_POA_RT_Policy_Validator::acceptor_registry (void)
-{
-  if (this->acceptor_registry_ == 0)
-    this->acceptor_registry_ =
-      TAO_POA_RT_Policy_Validator::extract_acceptor_registry (this->orb_core_,
-                                                              this->thread_pool_);
-  return this->acceptor_registry_;
-}
-
 void
 TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies
                                             ACE_ENV_ARG_DECL)
@@ -51,9 +37,6 @@ TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies
   this->validate_thread_pool (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->validate_lifespan (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
   this->validate_server_protocol (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -79,7 +62,26 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
   // specified in the RTCORBA::ServerProtocolPolicy.  This ensure we
   // will be able to create non-nil object references.
   CORBA::Policy_var protocol =
-    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
+    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (CORBA::is_nil (protocol.in ()))
+    {
+      // If the server protocol policy has not been specified, then
+      // add a server policy that reflects the protocols supported by
+      // the acceptor registries of the POA's thread pool.
+      protocol =
+        TAO_POA_RT_Policy_Validator::server_protocol_policy_from_thread_pool (this->thread_pool_,
+                                                                              this->orb_core_);
+
+      if (!CORBA::is_nil (protocol.in ()))
+        {
+          // If so, we'll use that policy.
+          policies.set_policy (protocol.in () ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+    }
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
     RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
@@ -93,28 +95,64 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
   RTCORBA::ProtocolList &protocols =
     server_protocol->protocols_rep ();
 
-  TAO_Acceptor_Registry *acceptor_registry =
-    this->acceptor_registry ();
-
   for (CORBA::ULong j = 0; j < protocols.length (); ++j)
     {
       int found = 0;
       CORBA::ULong protocol_type = protocols[j].protocol_type;
-      for (TAO_AcceptorSetIterator a = acceptor_registry->begin ();
-           a != acceptor_registry->end ();
-           ++a)
+
+      if (this->thread_pool_)
         {
-          if ((*a)->tag () == protocol_type)
+          TAO_Thread_Lane **lanes =
+            this->thread_pool_->lanes ();
+
+          for (CORBA::ULong i = 0;
+               i != this->thread_pool_->number_of_lanes ();
+               ++i)
             {
-              found = 1;
-              break;
+              TAO_Thread_Lane_Resources &resources =
+                lanes[i]->resources ();
+
+              TAO_Acceptor_Registry &acceptor_registry =
+                resources.acceptor_registry ();
+
+              for (TAO_AcceptorSetIterator a = acceptor_registry.begin ();
+                   a != acceptor_registry.end ();
+                   ++a)
+                {
+                  if ((*a)->tag () == protocol_type)
+                    {
+                      found = 1;
+                      break;
+                    }
+                }
+            }
+        }
+      else
+        {
+          TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager =
+            this->orb_core_.thread_lane_resources_manager ();
+
+          TAO_Thread_Lane_Resources &resources =
+            thread_lane_resources_manager.default_lane_resources ();
+
+          TAO_Acceptor_Registry &acceptor_registry =
+            resources.acceptor_registry ();
+
+          for (TAO_AcceptorSetIterator a = acceptor_registry.begin ();
+               a != acceptor_registry.end ();
+               ++a)
+            {
+              if ((*a)->tag () == protocol_type)
+                {
+                  found = 1;
+                  break;
+                }
             }
         }
 
       if (!found)
         ACE_THROW (PortableServer::POA::InvalidPolicy ());
     }
-
 }
 
 void
@@ -128,7 +166,9 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
     TAO_POA_Cached_Policies::NOT_SPECIFIED;
 
   CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
+    policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   RTCORBA::PriorityModelPolicy_var priority_model =
     RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
@@ -166,7 +206,9 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
     }
 
   policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
+    policies.get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
     = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()
@@ -330,46 +372,24 @@ TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies
 }
 
 void
-TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies
-                                                ACE_ENV_ARG_DECL)
-{
-  // If this POA is using a RTCORBA thread pool, make sure the
-  // lifespan policy is not persistent since we cannot support it
-  // right now.
-  if (this->thread_pool_ != 0)
-    {
-      CORBA::Policy_var policy =
-        policies.get_cached_policy (TAO_CACHED_POLICY_LIFESPAN);
-      PortableServer::LifespanPolicy_var lifespan_policy =
-        PortableServer::LifespanPolicy::_narrow (policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      PortableServer::LifespanPolicyValue lifespan =
-        lifespan_policy->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (lifespan == PortableServer::PERSISTENT)
-        {
-          ACE_THROW (PortableServer::POA::InvalidPolicy ());
-        }
-    }
-}
-
-void
 TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
                                                   ACE_ENV_ARG_DECL)
 {
   // Check if the user has specified the priority model policy.
   CORBA::Policy_var priority_model =
-    policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
+    policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   if (CORBA::is_nil (priority_model.in ()))
     {
       // If not, check if the priority model policy has been specified
       // at the ORB level.
       priority_model =
-        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
+        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
+                                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
       if (!CORBA::is_nil (priority_model.in ()))
         {
           // If so, we'll use that policy.
@@ -380,14 +400,20 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
 
   // Check if the user has specified the server protocol policy.
   CORBA::Policy_var server_protocol =
-    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
+    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   if (CORBA::is_nil (server_protocol.in ()))
     {
       // If not, check if the server protocol policy has been
       // specified at the ORB level.
       server_protocol =
-        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
+        this->orb_core_.get_cached_policy (
+          TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
+          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
       if (!CORBA::is_nil (server_protocol.in ()))
         {
           // If so, we'll use that policy.
@@ -398,14 +424,19 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
 
   // Check if the user has specified the thread pool policy.
   CORBA::Policy_var thread_pool =
-    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
+    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   if (CORBA::is_nil (thread_pool.in ()))
     {
       // If not, check if the thread pool policy has been specified at
       // the ORB level.
       thread_pool =
-        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
+        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
+                                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
       if (!CORBA::is_nil (thread_pool.in ()))
         {
           // If so, we'll use that policy.
@@ -416,13 +447,115 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
 }
 
 /* static */
+RTCORBA::ServerProtocolPolicy_ptr
+TAO_POA_RT_Policy_Validator::server_protocol_policy_from_thread_pool (TAO_Thread_Pool *thread_pool,
+                                                                      TAO_ORB_Core &orb_core)
+{
+  RTCORBA::ProtocolList protocols;
+
+  if (thread_pool)
+    {
+      TAO_Thread_Lane **lanes =
+        thread_pool->lanes ();
+
+      for (CORBA::ULong i = 0;
+           i != thread_pool->number_of_lanes ();
+           ++i)
+        {
+          TAO_Thread_Lane_Resources &resources =
+            lanes[i]->resources ();
+
+          TAO_Acceptor_Registry &acceptor_registry =
+            resources.acceptor_registry ();
+
+          TAO_POA_RT_Policy_Validator::server_protocol_policy_from_acceptor_registry (protocols,
+                                                                                      acceptor_registry,
+                                                                                      orb_core);
+        }
+    }
+  else
+    {
+      TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager =
+        orb_core.thread_lane_resources_manager ();
+
+      TAO_Thread_Lane_Resources &resources =
+        thread_lane_resources_manager.default_lane_resources ();
+
+      TAO_Acceptor_Registry &acceptor_registry =
+        resources.acceptor_registry ();
+
+      TAO_POA_RT_Policy_Validator::server_protocol_policy_from_acceptor_registry (protocols,
+                                                                                  acceptor_registry,
+                                                                                  orb_core);
+    }
+
+  // Set ServerProtocolPolicy.
+  TAO_ServerProtocolPolicy *server_protocol_policy = 0;
+  ACE_NEW_RETURN (server_protocol_policy,
+                  TAO_ServerProtocolPolicy (protocols),
+                  0);
+
+  return server_protocol_policy;
+}
+
+/* static */
+void
+TAO_POA_RT_Policy_Validator::server_protocol_policy_from_acceptor_registry (RTCORBA::ProtocolList &protocols,
+                                                                            TAO_Acceptor_Registry &acceptor_registry,
+                                                                            TAO_ORB_Core &orb_core)
+{
+  TAO_AcceptorSetIterator end =
+    acceptor_registry.end ();
+
+  for (TAO_AcceptorSetIterator acceptor =
+         acceptor_registry.begin ();
+       acceptor != end;
+       ++acceptor)
+    {
+      if (*acceptor == 0)
+        continue;
+
+      CORBA::ULong current_length =
+        protocols.length ();
+
+      // Make sure that this protocol is not already in the protocol
+      // list.
+      bool protocol_already_present = false;
+      for (CORBA::ULong i = 0;
+           i < current_length && !protocol_already_present;
+           ++i)
+        {
+          if (protocols[i].protocol_type == (*acceptor)->tag ())
+            protocol_already_present = true;
+        }
+
+      if (protocol_already_present)
+        continue;
+
+      protocols.length (current_length + 1);
+
+      protocols[current_length].protocol_type =
+        (*acceptor)->tag ();
+
+      protocols[current_length].orb_protocol_properties =
+        RTCORBA::ProtocolProperties::_nil ();
+
+      protocols[current_length].transport_protocol_properties =
+        TAO_Protocol_Properties_Factory::create_transport_protocol_property ((*acceptor)->tag (),
+                                                                             &orb_core);
+    }
+}
+
+/* static */
 TAO_Thread_Pool *
 TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
                                                   TAO_Policy_Set &policies
                                                   ACE_ENV_ARG_DECL)
 {
   CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
+    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
 
   RTCORBA::ThreadpoolPolicy_var thread_pool_policy =
     RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()
@@ -469,41 +602,4 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
   return thread_pool;
 }
 
-/* static */
-TAO_Acceptor_Registry *
-TAO_POA_RT_Policy_Validator::extract_acceptor_registry (TAO_ORB_Core &orb_core,
-                                                        TAO_Thread_Pool *thread_pool)
-{
-  TAO_Acceptor_Registry *acceptor_registry = 0;
-
-  // If <thread_pool_> != 0, it means that we have a RT thread pool.
-  if (thread_pool)
-    {
-      TAO_Thread_Lane **lanes =
-        thread_pool->lanes ();
-
-      // All the lanes have similar acceptor registries.  Therefore,
-      // looking at the first lane should suffice.
-      TAO_Thread_Lane_Resources &resources =
-        lanes[0]->resources ();
-
-      acceptor_registry =
-        &resources.acceptor_registry ();
-    }
-  else
-    // We are dealing with the default thread pool.
-    {
-      TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager =
-        orb_core.thread_lane_resources_manager ();
-
-      TAO_Thread_Lane_Resources &resources =
-        thread_lane_resources_manager.default_lane_resources ();
-
-      acceptor_registry =
-        &resources.acceptor_registry ();
-    }
-
-  return acceptor_registry;
-}
-
 #endif /* TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
index a8c07df255d..2c282de4271 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
@@ -26,6 +26,7 @@
 
 #include "rtportableserver_export.h"
 #include "tao/Policy_Validator.h"
+#include "tao/RTCORBA/RTCORBA.h"
 
 class TAO_ORB_Core;
 class TAO_Acceptor_Registry;
@@ -41,13 +42,17 @@ public:
   /// Destructor.
   ~TAO_POA_RT_Policy_Validator (void);
 
+  static RTCORBA::ServerProtocolPolicy_ptr server_protocol_policy_from_thread_pool (TAO_Thread_Pool *thread_pool,
+                                                                                    TAO_ORB_Core &orb_core);
+
+  static void server_protocol_policy_from_acceptor_registry (RTCORBA::ProtocolList &protocols,
+                                                             TAO_Acceptor_Registry &acceptor_registry,
+                                                             TAO_ORB_Core &orb_core);
+
   static TAO_Thread_Pool *extract_thread_pool (TAO_ORB_Core &orb_core,
                                                TAO_Policy_Set &policies
                                                ACE_ENV_ARG_DECL);
 
-  static TAO_Acceptor_Registry *extract_acceptor_registry (TAO_ORB_Core &orb_core,
-                                                           TAO_Thread_Pool *thread_pool);
-
 protected:
 
   /**
@@ -80,13 +85,6 @@ private:
   void validate_thread_pool (TAO_Policy_Set &policies
                              ACE_ENV_ARG_DECL);
 
-  void validate_lifespan (TAO_Policy_Set &policies
-                          ACE_ENV_ARG_DECL);
-
-  TAO_Acceptor_Registry *acceptor_registry (void);
-
-  TAO_Acceptor_Registry *acceptor_registry_;
-
   TAO_Thread_Pool *thread_pool_;
 
 };
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 80db1f6b779..5ca6b1c1e94 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -77,23 +77,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
 
   // Remember current thread's priority.
   TAO_Protocols_Hooks *tph =
-    poa.orb_core ().get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (req.transport ()->tag () == IOP::TAG_INTERNET_IOP)
-    {
-      CORBA::Policy_var policy = poa.server_protocol ();
-
-      int result =
-        tph->update_server_protocol_properties (
-          policy.in (),
-          req.transport (),
-          "iiop");
-
-      if (result != 0)
-        ACE_ERROR((LM_ERROR,
-                   "Error in getting the effective protocol properties\n"));
-    }
+    poa.orb_core ().get_protocols_hooks ();
 
   const char *priority_model;
   RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
@@ -265,6 +249,23 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
             }
         }
     }
+
+  CORBA::Policy_var policy =
+    poa.policies ().get_cached_policy (
+      TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
+      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  CORBA::Boolean set_server_network_priority =
+    tph->set_server_network_priority (req.transport ()->tag (),
+                                      policy.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  TAO_Connection_Handler *connection_handler =
+    req.transport ()->connection_handler ();
+
+  connection_handler->set_dscp_codepoint (set_server_network_priority);
 }
 
 void
@@ -306,8 +307,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &poa,
 
   // Remember current thread's priority.
   TAO_Protocols_Hooks *tph =
-    poa.orb_core ().get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    poa.orb_core ().get_protocols_hooks ();
 
   if (tph->get_thread_CORBA_and_native_priority (pre_invoke_state.original_CORBA_priority_,
                                                  pre_invoke_state.original_native_priority_
@@ -349,8 +349,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_POA &poa,
           // Reset the priority of the current thread back to its original
           // value.
           TAO_Protocols_Hooks *tph =
-            poa.orb_core ().get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            poa.orb_core ().get_protocols_hooks ();
 
           if (tph->set_thread_native_priority (
                  pre_invoke_state.original_native_priority_
diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc
index f8f7ef78a37..69b42366b9b 100644
--- a/TAO/tao/RTScheduler.mpc
+++ b/TAO/tao/RTScheduler.mpc
@@ -26,4 +26,8 @@ project : taolib, rtcorba, portableserver, core, corba_messaging {
   PIDL_Files {
     RTScheduling
   }
+
+  Pkgconfig_Files {
+    RTScheduling/TAO_RTScheduler.pc.in
+  }
 }
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 215385f708c..8e915a6dfb1 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -561,7 +561,7 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start,
                              stack_size) == -1)
     {
       ACE_ERROR((LM_ERROR,
-                 "Error in Spawning\n"));
+                 "Unable to activate DistributableThread\n"));
 
       RTScheduling::DistributableThread::_nil ();
     }
@@ -728,16 +728,9 @@ TAO_RTScheduler_Current_i::name (void)
   return CORBA::string_dup (this->name_.in ());
 }
 
-#if defined (__Lynx__)
-
-// LynxOS uses macro THREAD_CANCELLED internally, so it must
-// be undefined to avoid compilation errors
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
-
-#endif /*__Lynx__ */
-
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 void
 TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index 8a7118cd9ce..3486c4bef7c 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -1,14 +1,27 @@
-//$Id$
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   Current.h
+ *
+ *  $Id$
+ *
+ *  @author
+ */
+//=============================================================================
+
+
 #ifndef TAO_RTSCHEDULER_CURRENT_H
 #define TAO_RTSCHEDULER_CURRENT_H
+
 #include /**/ "ace/pre.h"
 
 #include "rtscheduler_export.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "RTScheduler.h"
 #include "tao/LocalObject.h"
 #include "ace/Hash_Map_Manager_T.h"
@@ -152,10 +165,8 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
    * @name Reference Related Methods
    */
   //@{
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_RTScheduler_Current_ptr _ptr_type;
   typedef TAO_RTScheduler_Current_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
 
   static TAO_RTScheduler_Current_ptr _duplicate (TAO_RTScheduler_Current_ptr obj);
 
@@ -184,7 +195,8 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
 /**
  * @class TAO_RTScheduler_Current_var
  */
-class TAO_RTScheduler_Export TAO_RTScheduler_Current_var : public TAO_Base_var
+class TAO_RTScheduler_Export TAO_RTScheduler_Current_var
+  : private TAO_Base_var
 {
 public:
 
@@ -372,4 +384,5 @@ public:
 };
 
 #include /**/ "ace/post.h"
-#endif /*TAO_RTSCHEDULER_CURRENT_H*/
+
+#endif /* TAO_RTSCHEDULER_CURRENT_H*/
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
index 026af472bee..ecb45489a13 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -46,10 +46,8 @@ public:
   RTScheduling::Scheduler_ptr rtscheduler (void);
 
 public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_RTScheduler_Manager_ptr _ptr_type;
   typedef TAO_RTScheduler_Manager_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
 
   // the static operations
   static TAO_RTScheduler_Manager_ptr _duplicate (TAO_RTScheduler_Manager_ptr obj);
@@ -80,7 +78,8 @@ private:
   RTScheduling::Scheduler_var rtscheduler_;
 };
 
-class TAO_RTScheduler_Export TAO_RTScheduler_Manager_var : public TAO_Base_var
+class TAO_RTScheduler_Export TAO_RTScheduler_Manager_var
+  : private TAO_Base_var
 {
 public:
   TAO_RTScheduler_Manager_var (void); // default constructor
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index 541262b7ff3..c19332acb84 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -4,8 +4,10 @@
 #include "Profile_Transport_Resolver.h"
 #include "Stub.h"
 #include "Transport.h"
+#include "Connection_Handler.h"
 #include "operation_details.h"
 #include "ORB_Core.h"
+#include "Protocols_Hooks.h"
 #include "debug.h"
 
 ACE_RCSID (tao,
@@ -106,6 +108,8 @@ namespace TAO
                                    TAO_OutputCDR &out_stream
                                    ACE_ENV_ARG_DECL)
   {
+    this->resolver_.transport ()->clear_translators (0,
+                                                     &out_stream);
     // Send the request for the header
     if (this->resolver_.transport ()->generate_request_header (this->details_,
                                                                spec,
@@ -137,6 +141,20 @@ namespace TAO
                                    ACE_Time_Value *max_wait_time
                                    ACE_ENV_ARG_DECL)
   {
+    TAO_Protocols_Hooks *tph =
+      this->resolver_.stub ()->orb_core ()->get_protocols_hooks ();
+
+    CORBA::Boolean set_client_network_priority =
+      tph->set_client_network_priority (this->resolver_.transport ()->tag (),
+                                        this->resolver_.stub ()
+                                        ACE_ENV_ARG_PARAMETER);
+    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+
+    TAO_Connection_Handler *connection_handler =
+      this->resolver_.transport ()->connection_handler ();
+
+    connection_handler->set_dscp_codepoint (set_client_network_priority);
+
     const int retval =
       this->resolver_.transport ()->send_request (
         this->resolver_.stub (),
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index c5d69c476e3..dbfbeb51b7d 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -4,10 +4,6 @@
 #include "Environment.h"
 #include "Invocation_Utils.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/Service_Callbacks.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            Service_Callbacks,
            "$Id$")
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 767fbbff4a9..e4c338b835a 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -105,10 +105,6 @@ public:
       ACE_ENV_ARG_DECL);
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/Service_Callbacks.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /*TAO_SERVICE_CALLBACK_H*/
diff --git a/TAO/tao/Service_Callbacks.i b/TAO/tao/Service_Callbacks.i
deleted file mode 100644
index ca0908bbcf6..00000000000
--- a/TAO/tao/Service_Callbacks.i
+++ /dev/null
@@ -1 +0,0 @@
-//$Id$
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
index fe7e69b5bfc..877d4946eeb 100644
--- a/TAO/tao/Services.pidl
+++ b/TAO/tao/Services.pidl
@@ -9,7 +9,7 @@
 //
 //     tao_idl
 //        -o orig -Ge 1 -GT -GA
-//          -Wb,export_macro=TAO_Export
+//          -Wb,export_macro="tao/TAO_Export"
 //          -Wb,pre_include="ace/pre.h"
 //          -Wb,post_include="ace/post.h"
 //          Services.pidl
diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp
index 564a5af65c2..3ba20f81ae4 100644
--- a/TAO/tao/ServicesA.cpp
+++ b/TAO/tao/ServicesA.cpp
@@ -27,27 +27,29 @@
 
 #include "ServicesC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ServiceType[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x65547970),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65547970), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ServiceType:1.0
     12,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636554),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636554), 
   ACE_NTOHL (0x79706500),  // name = ServiceType
     CORBA::tk_ushort,
 
@@ -58,7 +60,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceType (
     sizeof (_oc_CORBA_ServiceType),
     (char *) &_oc_CORBA_ServiceType,
     0,
-    sizeof (CORBA::ServiceType)
+    0
   );
 
 namespace CORBA
@@ -68,25 +70,25 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ServiceOption[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x654f7074),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x654f7074), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
     14,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6963654f),
-  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6963654f), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e000000),  // name = ServiceOption
     CORBA::tk_ulong,
 
@@ -97,7 +99,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOption (
     sizeof (_oc_CORBA_ServiceOption),
     (char *) &_oc_CORBA_ServiceOption,
     0,
-    sizeof (CORBA::ServiceOption)
+    0
   );
 
 namespace CORBA
@@ -107,27 +109,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x65446574),
-  ACE_NTOHL (0x61696c54),
-  ACE_NTOHL (0x7970653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65446574), 
+  ACE_NTOHL (0x61696c54), 
+  ACE_NTOHL (0x7970653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
     18,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636544),
-  ACE_NTOHL (0x65746169),
-  ACE_NTOHL (0x6c547970),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636544), 
+  ACE_NTOHL (0x65746169), 
+  ACE_NTOHL (0x6c547970), 
   ACE_NTOHL (0x65000000),  // name = ServiceDetailType
     CORBA::tk_ulong,
 
@@ -138,7 +140,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailType (
     sizeof (_oc_CORBA_ServiceDetailType),
     (char *) &_oc_CORBA_ServiceDetailType,
     0,
-    sizeof (CORBA::ServiceDetailType)
+    0
   );
 
 namespace CORBA
@@ -148,76 +150,76 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ServiceDetail[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x65446574),
-  ACE_NTOHL (0x61696c3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65446574), 
+  ACE_NTOHL (0x61696c3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
     14,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636544),
-  ACE_NTOHL (0x65746169),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636544), 
+  ACE_NTOHL (0x65746169), 
   ACE_NTOHL (0x6c000000),  // name = ServiceDetail
   2, // member count
     20,
-  ACE_NTOHL (0x73657276),
-  ACE_NTOHL (0x6963655f),
-  ACE_NTOHL (0x64657461),
-  ACE_NTOHL (0x696c5f74),
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x64657461), 
+  ACE_NTOHL (0x696c5f74), 
   ACE_NTOHL (0x79706500),  // name = service_detail_type
     CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5365), 
+    ACE_NTOHL (0x72766963), 
+    ACE_NTOHL (0x65446574), 
+    ACE_NTOHL (0x61696c54), 
+    ACE_NTOHL (0x7970653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
         18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636544), 
+    ACE_NTOHL (0x65746169), 
+    ACE_NTOHL (0x6c547970), 
     ACE_NTOHL (0x65000000),  // name = ServiceDetailType
         CORBA::tk_ulong,
 
 
   15,
-  ACE_NTOHL (0x73657276),
-  ACE_NTOHL (0x6963655f),
-  ACE_NTOHL (0x64657461),
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x64657461), 
   ACE_NTOHL (0x696c0000),  // name = service_detail
     CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f63),
-    ACE_NTOHL (0x74657453),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
         9,
-    ACE_NTOHL (0x4f637465),
-    ACE_NTOHL (0x74536571),
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
     ACE_NTOHL (0x0),  // name = OctetSeq
         CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
@@ -234,7 +236,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail (
     sizeof (_oc_CORBA_ServiceDetail),
     (char *) &_oc_CORBA_ServiceDetail,
     0,
-    sizeof (CORBA::ServiceDetail)
+    0
   );
 
 namespace CORBA
@@ -244,27 +246,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ServiceOptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x654f7074),
-  ACE_NTOHL (0x696f6e53),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x654f7074), 
+  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceOptionSeq:1.0
     17,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6963654f),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e536571),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6963654f), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e536571), 
   ACE_NTOHL (0x0),  // name = ServiceOptionSeq
     CORBA::tk_sequence, // typecode kind
   84, // encapsulation length
@@ -273,19 +275,19 @@ static const CORBA::Long _oc_CORBA_ServiceOptionSeq[] =
     68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5365),
-      ACE_NTOHL (0x72766963),
-      ACE_NTOHL (0x654f7074),
-      ACE_NTOHL (0x696f6e3a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5365), 
+      ACE_NTOHL (0x72766963), 
+      ACE_NTOHL (0x654f7074), 
+      ACE_NTOHL (0x696f6e3a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
             14,
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x6963654f),
-      ACE_NTOHL (0x7074696f),
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x6963654f), 
+      ACE_NTOHL (0x7074696f), 
       ACE_NTOHL (0x6e000000),  // name = ServiceOption
             CORBA::tk_ulong,
 
@@ -299,7 +301,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOptionSeq (
     sizeof (_oc_CORBA_ServiceOptionSeq),
     (char *) &_oc_CORBA_ServiceOptionSeq,
     0,
-    sizeof (CORBA::ServiceOptionSeq)
+    0
   );
 
 namespace CORBA
@@ -309,27 +311,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ServiceDetailSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x65446574),
-  ACE_NTOHL (0x61696c53),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65446574), 
+  ACE_NTOHL (0x61696c53), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailSeq:1.0
     17,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636544),
-  ACE_NTOHL (0x65746169),
-  ACE_NTOHL (0x6c536571),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636544), 
+  ACE_NTOHL (0x65746169), 
+  ACE_NTOHL (0x6c536571), 
   ACE_NTOHL (0x0),  // name = ServiceDetailSeq
     CORBA::tk_sequence, // typecode kind
   296, // encapsulation length
@@ -338,70 +340,70 @@ static const CORBA::Long _oc_CORBA_ServiceDetailSeq[] =
     280, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f5365),
-      ACE_NTOHL (0x72766963),
-      ACE_NTOHL (0x65446574),
-      ACE_NTOHL (0x61696c3a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5365), 
+      ACE_NTOHL (0x72766963), 
+      ACE_NTOHL (0x65446574), 
+      ACE_NTOHL (0x61696c3a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
             14,
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x69636544),
-      ACE_NTOHL (0x65746169),
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x69636544), 
+      ACE_NTOHL (0x65746169), 
       ACE_NTOHL (0x6c000000),  // name = ServiceDetail
       2, // member count
             20,
-      ACE_NTOHL (0x73657276),
-      ACE_NTOHL (0x6963655f),
-      ACE_NTOHL (0x64657461),
-      ACE_NTOHL (0x696c5f74),
+      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x6963655f), 
+      ACE_NTOHL (0x64657461), 
+      ACE_NTOHL (0x696c5f74), 
       ACE_NTOHL (0x79706500),  // name = service_detail_type
             CORBA::tk_alias, // typecode kind for typedefs
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5365),
-        ACE_NTOHL (0x72766963),
-        ACE_NTOHL (0x65446574),
-        ACE_NTOHL (0x61696c54),
-        ACE_NTOHL (0x7970653a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5365), 
+        ACE_NTOHL (0x72766963), 
+        ACE_NTOHL (0x65446574), 
+        ACE_NTOHL (0x61696c54), 
+        ACE_NTOHL (0x7970653a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
                 18,
-        ACE_NTOHL (0x53657276),
-        ACE_NTOHL (0x69636544),
-        ACE_NTOHL (0x65746169),
-        ACE_NTOHL (0x6c547970),
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636544), 
+        ACE_NTOHL (0x65746169), 
+        ACE_NTOHL (0x6c547970), 
         ACE_NTOHL (0x65000000),  // name = ServiceDetailType
                 CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x73657276),
-      ACE_NTOHL (0x6963655f),
-      ACE_NTOHL (0x64657461),
+      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x6963655f), 
+      ACE_NTOHL (0x64657461), 
       ACE_NTOHL (0x696c0000),  // name = service_detail
             CORBA::tk_alias, // typecode kind for typedefs
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         31,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f63),
-        ACE_NTOHL (0x74657453),
-        ACE_NTOHL (0x65713a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f63), 
+        ACE_NTOHL (0x74657453), 
+        ACE_NTOHL (0x65713a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
                 9,
-        ACE_NTOHL (0x4f637465),
-        ACE_NTOHL (0x74536571),
+        ACE_NTOHL (0x4f637465), 
+        ACE_NTOHL (0x74536571), 
         ACE_NTOHL (0x0),  // name = OctetSeq
                 CORBA::tk_sequence, // typecode kind
         12, // encapsulation length
@@ -421,7 +423,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailSeq (
     sizeof (_oc_CORBA_ServiceDetailSeq),
     (char *) &_oc_CORBA_ServiceDetailSeq,
     0,
-    sizeof (CORBA::ServiceDetailSeq)
+    0
   );
 
 namespace CORBA
@@ -431,54 +433,54 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ServiceInformation[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x65496e66),
-  ACE_NTOHL (0x6f726d61),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65496e66), 
+  ACE_NTOHL (0x6f726d61), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
     19,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636549),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636549), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
   ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
   2, // member count
     16,
-  ACE_NTOHL (0x73657276),
-  ACE_NTOHL (0x6963655f),
-  ACE_NTOHL (0x6f707469),
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x6f707469), 
   ACE_NTOHL (0x6f6e7300),  // name = service_options
     CORBA::tk_alias, // typecode kind for typedefs
   164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x654f7074),
-    ACE_NTOHL (0x696f6e53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5365), 
+    ACE_NTOHL (0x72766963), 
+    ACE_NTOHL (0x654f7074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceOptionSeq:1.0
         17,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x6963654f),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x6963654f), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x0),  // name = ServiceOptionSeq
         CORBA::tk_sequence, // typecode kind
     84, // encapsulation length
@@ -487,19 +489,19 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] =
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5365),
-        ACE_NTOHL (0x72766963),
-        ACE_NTOHL (0x654f7074),
-        ACE_NTOHL (0x696f6e3a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5365), 
+        ACE_NTOHL (0x72766963), 
+        ACE_NTOHL (0x654f7074), 
+        ACE_NTOHL (0x696f6e3a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
                 14,
-        ACE_NTOHL (0x53657276),
-        ACE_NTOHL (0x6963654f),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x6963654f), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e000000),  // name = ServiceOption
                 CORBA::tk_ulong,
 
@@ -508,29 +510,29 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] =
 
 
   16,
-  ACE_NTOHL (0x73657276),
-  ACE_NTOHL (0x6963655f),
-  ACE_NTOHL (0x64657461),
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x64657461), 
   ACE_NTOHL (0x696c7300),  // name = service_details
     CORBA::tk_alias, // typecode kind for typedefs
   376, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c53),
-    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5365), 
+    ACE_NTOHL (0x72766963), 
+    ACE_NTOHL (0x65446574), 
+    ACE_NTOHL (0x61696c53), 
+    ACE_NTOHL (0x65713a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailSeq:1.0
         17,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c536571),
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636544), 
+    ACE_NTOHL (0x65746169), 
+    ACE_NTOHL (0x6c536571), 
     ACE_NTOHL (0x0),  // name = ServiceDetailSeq
         CORBA::tk_sequence, // typecode kind
     296, // encapsulation length
@@ -539,70 +541,70 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] =
       280, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f5365),
-        ACE_NTOHL (0x72766963),
-        ACE_NTOHL (0x65446574),
-        ACE_NTOHL (0x61696c3a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5365), 
+        ACE_NTOHL (0x72766963), 
+        ACE_NTOHL (0x65446574), 
+        ACE_NTOHL (0x61696c3a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
                 14,
-        ACE_NTOHL (0x53657276),
-        ACE_NTOHL (0x69636544),
-        ACE_NTOHL (0x65746169),
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636544), 
+        ACE_NTOHL (0x65746169), 
         ACE_NTOHL (0x6c000000),  // name = ServiceDetail
         2, // member count
                 20,
-        ACE_NTOHL (0x73657276),
-        ACE_NTOHL (0x6963655f),
-        ACE_NTOHL (0x64657461),
-        ACE_NTOHL (0x696c5f74),
+        ACE_NTOHL (0x73657276), 
+        ACE_NTOHL (0x6963655f), 
+        ACE_NTOHL (0x64657461), 
+        ACE_NTOHL (0x696c5f74), 
         ACE_NTOHL (0x79706500),  // name = service_detail_type
                 CORBA::tk_alias, // typecode kind for typedefs
         76, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f5365),
-          ACE_NTOHL (0x72766963),
-          ACE_NTOHL (0x65446574),
-          ACE_NTOHL (0x61696c54),
-          ACE_NTOHL (0x7970653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f5365), 
+          ACE_NTOHL (0x72766963), 
+          ACE_NTOHL (0x65446574), 
+          ACE_NTOHL (0x61696c54), 
+          ACE_NTOHL (0x7970653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
                     18,
-          ACE_NTOHL (0x53657276),
-          ACE_NTOHL (0x69636544),
-          ACE_NTOHL (0x65746169),
-          ACE_NTOHL (0x6c547970),
+          ACE_NTOHL (0x53657276), 
+          ACE_NTOHL (0x69636544), 
+          ACE_NTOHL (0x65746169), 
+          ACE_NTOHL (0x6c547970), 
           ACE_NTOHL (0x65000000),  // name = ServiceDetailType
                     CORBA::tk_ulong,
 
 
         15,
-        ACE_NTOHL (0x73657276),
-        ACE_NTOHL (0x6963655f),
-        ACE_NTOHL (0x64657461),
+        ACE_NTOHL (0x73657276), 
+        ACE_NTOHL (0x6963655f), 
+        ACE_NTOHL (0x64657461), 
         ACE_NTOHL (0x696c0000),  // name = service_detail
                 CORBA::tk_alias, // typecode kind for typedefs
         76, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           31,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x434f5242),
-          ACE_NTOHL (0x412f4f63),
-          ACE_NTOHL (0x74657453),
-          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x412f4f63), 
+          ACE_NTOHL (0x74657453), 
+          ACE_NTOHL (0x65713a31), 
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
                     9,
-          ACE_NTOHL (0x4f637465),
-          ACE_NTOHL (0x74536571),
+          ACE_NTOHL (0x4f637465), 
+          ACE_NTOHL (0x74536571), 
           ACE_NTOHL (0x0),  // name = OctetSeq
                     CORBA::tk_sequence, // typecode kind
           12, // encapsulation length
@@ -623,7 +625,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceInformation (
     sizeof (_oc_CORBA_ServiceInformation),
     (char *) &_oc_CORBA_ServiceInformation,
     0,
-    sizeof (CORBA::ServiceInformation)
+    0
   );
 
 namespace CORBA
@@ -632,7 +634,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_ServiceInformation;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -669,8 +671,8 @@ CORBA::Boolean operator>>= (
     CORBA::ServiceDetail *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ServiceDetail *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ServiceDetail *&> (
       _tao_elem
     );
 }
@@ -690,7 +692,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -727,8 +729,8 @@ CORBA::Boolean operator>>= (
     CORBA::ServiceOptionSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ServiceOptionSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ServiceOptionSeq *&> (
       _tao_elem
     );
 }
@@ -748,7 +750,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -785,8 +787,8 @@ CORBA::Boolean operator>>= (
     CORBA::ServiceDetailSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ServiceDetailSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ServiceDetailSeq *&> (
       _tao_elem
     );
 }
@@ -806,7 +808,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -843,8 +845,8 @@ CORBA::Boolean operator>>= (
     CORBA::ServiceInformation *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ServiceInformation *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ServiceInformation *&> (
       _tao_elem
     );
 }
@@ -864,8 +866,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -910,5 +910,4 @@ CORBA::Boolean operator>>= (
         CORBA::ServiceInformation \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 0df850c41cf..1b73e8ef277 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -26,23 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "ServicesC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/ORB_Core.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ServicesC.i"
+#include "ServicesC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -59,7 +59,7 @@ CORBA::ServiceDetail::_tao_any_destructor (
   )
 {
   ServiceDetail *_tao_tmp_pointer =
-    ACE_static_cast (ServiceDetail *, _tao_void_pointer);
+    static_cast<ServiceDetail *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -110,7 +110,7 @@ void CORBA::ServiceOptionSeq::_tao_any_destructor (
   )
 {
   ServiceOptionSeq * _tao_tmp_pointer =
-    ACE_static_cast (ServiceOptionSeq *, _tao_void_pointer);
+    static_cast<ServiceOptionSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -163,7 +163,7 @@ void CORBA::ServiceDetailSeq::_tao_any_destructor (
   )
 {
   ServiceDetailSeq * _tao_tmp_pointer =
-    ACE_static_cast (ServiceDetailSeq *, _tao_void_pointer);
+    static_cast<ServiceDetailSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -178,7 +178,7 @@ CORBA::ServiceInformation::_tao_any_destructor (
   )
 {
   ServiceInformation *_tao_tmp_pointer =
-    ACE_static_cast (ServiceInformation *, _tao_void_pointer);
+    static_cast<ServiceInformation *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -216,7 +216,7 @@ CORBA::Boolean operator<< (
     const CORBA::ServiceOptionSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -274,7 +274,7 @@ CORBA::Boolean operator<< (
     const CORBA::ServiceDetailSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -359,7 +359,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -526,4 +526,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
index 4a5d08499e3..ffa6f7f68e1 100644
--- a/TAO/tao/ServicesC.h
+++ b/TAO/tao/ServicesC.h
@@ -26,27 +26,29 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_SERVICESC_H_
 #define _TAO_IDL_ORIG_SERVICESC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/VarOut_T.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
 
-#include "OctetSeqC.h"
+#include "tao/OctetSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -61,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -383,13 +383,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInfor
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "ServicesC.i"
+#include "ServicesC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -401,3 +401,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/ServicesC.i b/TAO/tao/ServicesC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/ServicesC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/ServicesS.cpp b/TAO/tao/ServicesS.cpp
deleted file mode 100644
index 3dc704cad8c..00000000000
--- a/TAO/tao/ServicesS.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:631
-
-#ifndef _TAO_IDL_ORIG_SERVICESS_CPP_
-#define _TAO_IDL_ORIG_SERVICESS_CPP_
-
-
-#include "ServicesS.h"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/Operation_Table.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/Typecode.h"
-#include "tao/DynamicC.h"
-#include "tao/PortableInterceptor.h"
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/PortableServer/PICurrent_Guard.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
-#include "tao/PortableServer/ServerInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-#include "ace/config-all.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "ServicesS.i"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1680
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/ServicesS.h b/TAO/tao/ServicesS.h
index 920ebac9c08..0dcb52963c9 100644
--- a/TAO/tao/ServicesS.h
+++ b/TAO/tao/ServicesS.h
@@ -26,28 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:411
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_SERVICESS_H_
 #define _TAO_IDL_ORIG_SERVICESS_H_
 
 #include /**/ "ace/pre.h"
 
-#include "OctetSeqS.h"
+#include "tao/OctetSeqS.h"
 #include "ServicesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -60,23 +55,19 @@
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:1014
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
 
 #include "ServicesS_T.h"
 
-#if defined (__ACE_INLINE__)
-#include "ServicesS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -86,3 +77,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/ServicesS.i b/TAO/tao/ServicesS.i
deleted file mode 100644
index 1d2df31bd57..00000000000
--- a/TAO/tao/ServicesS.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/ServicesS_T.cpp b/TAO/tao/ServicesS_T.cpp
deleted file mode 100644
index 42772a3eb2c..00000000000
--- a/TAO/tao/ServicesS_T.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:705
-
-#ifndef _TAO_IDL_ORIG_SERVICESS_T_CPP_
-#define _TAO_IDL_ORIG_SERVICESS_T_CPP_
-
-#include "ServicesS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ServicesS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/ServicesS_T.h b/TAO/tao/ServicesS_T.h
index d24670f6a4e..d56fe84f45a 100644
--- a/TAO/tao/ServicesS_T.h
+++ b/TAO/tao/ServicesS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:566
+// be\be_codegen.cpp:546
 
 #ifndef _TAO_IDL_ORIG_SERVICESS_T_H_
 #define _TAO_IDL_ORIG_SERVICESS_T_H_
@@ -34,40 +34,25 @@
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
 {
 } // module CORBA
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:1111
-
-#if defined (__ACE_INLINE__)
-#include "ServicesS_T.i"
-#endif /* defined INLINE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ServicesS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
 
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ServicesS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1094
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/ServicesS_T.i b/TAO/tao/ServicesS_T.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/ServicesS_T.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp
index 92b62c6ba24..d726cffce46 100644
--- a/TAO/tao/ShortSeqA.cpp
+++ b/TAO/tao/ShortSeqA.cpp
@@ -27,26 +27,28 @@
 
 #include "ShortSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ShortSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5368),
-  ACE_NTOHL (0x6f727453),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5368), 
+  ACE_NTOHL (0x6f727453), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ShortSeq:1.0
     9,
-  ACE_NTOHL (0x53686f72),
-  ACE_NTOHL (0x74536571),
+  ACE_NTOHL (0x53686f72), 
+  ACE_NTOHL (0x74536571), 
   ACE_NTOHL (0x0),  // name = ShortSeq
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -62,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ShortSeq (
     sizeof (_oc_CORBA_ShortSeq),
     (char *) &_oc_CORBA_ShortSeq,
     0,
-    sizeof (CORBA::ShortSeq)
+    0
   );
 
 namespace CORBA
@@ -71,7 +73,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_ShortSeq;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -108,8 +110,8 @@ CORBA::Boolean operator>>= (
     CORBA::ShortSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ShortSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ShortSeq *&> (
       _tao_elem
     );
 }
@@ -129,8 +131,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -145,5 +145,4 @@ CORBA::Boolean operator>>= (
         CORBA::ShortSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp
index ad8535f8696..1a3e8fe82bf 100644
--- a/TAO/tao/ShortSeqC.cpp
+++ b/TAO/tao/ShortSeqC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "ShortSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ShortSeqC.i"
+#include "ShortSeqC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -97,7 +96,7 @@ void CORBA::ShortSeq::_tao_any_destructor (
   )
 {
   ShortSeq * _tao_tmp_pointer =
-    ACE_static_cast (ShortSeq *, _tao_void_pointer);
+    static_cast<ShortSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -114,7 +113,7 @@ CORBA::Boolean operator<< (
     const CORBA::ShortSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h
index ea3c5ee413f..d055abe73af 100644
--- a/TAO/tao/ShortSeqC.h
+++ b/TAO/tao/ShortSeqC.h
@@ -26,20 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_SHORTSEQC_H_
 #define _TAO_IDL_ORIG_SHORTSEQC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
@@ -58,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -166,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "ShortSeqC.i"
+#include "ShortSeqC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -184,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/ShortSeqC.i b/TAO/tao/ShortSeqC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/ShortSeqC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/ShortSeqS.h b/TAO/tao/ShortSeqS.h
index 10428ca5329..17d9ae90fd7 100644
--- a/TAO/tao/ShortSeqS.h
+++ b/TAO/tao/ShortSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:411
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_SHORTSEQS_H_
 #define _TAO_IDL_ORIG_SHORTSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,21 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from 
-// .\be\be_codegen.cpp:1014
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -79,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc
index 60db5a9c004..4cda4747077 100644
--- a/TAO/tao/SmartProxies.mpc
+++ b/TAO/tao/SmartProxies.mpc
@@ -25,4 +25,8 @@ project : taolib, core {
 
   PIDL_Files {
   }
+
+  Pkgconfig_Files {
+    SmartProxies/TAO_SmartProxies.pc.in
+  }
 }
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index a3e381bacd1..d4ae5aa3c54 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -1,4 +1,5 @@
 //$Id$
+
 project : taolib, core {
   sharedname   = TAO_Strategies
   dynamicflags = TAO_STRATEGIES_BUILD_DLL
@@ -26,4 +27,8 @@ project : taolib, core {
   PIDL_Files {
     Strategies
   }
+
+  Pkgconfig_Files {
+    Strategies/TAO_Strategies.pc.in
+  }
 }
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index f8312d1acfe..1130801d00d 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -27,7 +27,7 @@ ACE_RCSID (Strategies,
            "$Id$")
 
 TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag)
-  : TAO_Acceptor (TAO_TAG_UDP_PROFILE),
+  : TAO_Acceptor (TAO_TAG_DIOP_PROFILE),
     addrs_ (0),
     hosts_ (0),
     endpoint_count_ (0),
@@ -137,7 +137,7 @@ TAO_DIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
   for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i)
     {
       pfile = mprofile.get_profile (i);
-      if (pfile->tag () == TAO_TAG_UDP_PROFILE)
+      if (pfile->tag () == TAO_TAG_DIOP_PROFILE)
       {
         iiop_profile = ACE_dynamic_cast (TAO_DIOP_Profile *,
                                          pfile);
@@ -237,9 +237,6 @@ TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core,
 {
   this->orb_core_ = orb_core;
 
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
   if (this->hosts_ != 0)
     {
       // The hostname cache has already been set!
@@ -351,9 +348,6 @@ TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 {
   this->orb_core_ = orb_core;
 
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
   if (this->hosts_ != 0)
     {
       // The hostname cache has already been set!
@@ -384,7 +378,7 @@ TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
   // address.
   ACE_INET_Addr addr;
 
-  if (addr.set (ACE_DEFAULT_SERVER_PORT,
+  if (addr.set (static_cast<unsigned short> (0),
                 ACE_static_cast(ACE_UINT32, INADDR_ANY),
                 1) != 0)
     return -1;
@@ -399,8 +393,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
 {
   ACE_NEW_RETURN (this->connection_handler_,
                   TAO_DIOP_Connection_Handler (this->orb_core_,
-                                               this->lite_flag_,
-                                               0 /* TAO_DIOP_Properties */),
+                                               this->lite_flag_),
                   -1);
 
   this->connection_handler_->local_addr (addr);
@@ -416,11 +409,25 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
   // Connection handler ownership now belongs to the Reactor.
   this->connection_handler_->remove_reference ();
 
+  ACE_INET_Addr address;
+
+  // We do this make sure the port number the endpoint is listening on
+  // gets set in the addr.
+  if (this->connection_handler_->dgram ().get_local_addr (address) != 0)
+    {
+      if (TAO_debug_level > 0)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("TAO (%P|%t) DIOP_Acceptor::open_i ")
+                    ACE_TEXT ("- %p"),
+                    ACE_TEXT ("cannot get local addr\n")));
+      return -1;
+    }
+
   // Set the port for each addr.  If there is more than one network
   // interface then the endpoint created on each interface will be on
   // the same port.  This is how a wildcard socket bind() is supposed
   // to work.
-  u_short port = addr.get_port_number ();
+  u_short port = address.get_port_number ();
   for (size_t j = 0; j < this->endpoint_count_; ++j)
     this->addrs_[j].set_port_number (port, 1);
 
@@ -744,11 +751,4 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
-int
-TAO_DIOP_Acceptor::init_tcp_properties (void)
-{
-  // @@ Michael: We use UDP, so we do not set TCP settings.
-  return 0;
-}
-
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
index 5a5368eab3a..4ff200dc543 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -127,10 +127,6 @@ protected:
   /// Parse protocol specific options.
   virtual int parse_options (const char *options);
 
-  /// Obtain tcp properties that must be used by this acceptor, i.e.,
-  /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
-
   /// Helper method to add a new profile to the mprofile for
   /// each endpoint.
   int create_new_profile (const TAO::ObjectKey &object_key,
@@ -171,10 +167,6 @@ protected:
   /// ORB Core.
   TAO_ORB_Core *orb_core_;
 
-  /// TCP configuration properties to be used for all
-  /// connections opened by this acceptor.
-  TAO_DIOP_Properties tcp_properties_;
-
   /// Should we use GIOP lite??
   CORBA::Boolean lite_flag_;
 
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 8854b94696e..c768a46dc58 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -13,21 +13,21 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Base_Transport_Property.h"
+#include "tao/Protocols_Hooks.h"
 #include "tao/Resume_Handle.h"
 
 #include "DIOP_Transport.h"
 #include "DIOP_Endpoint.h"
 
-#if !defined (__ACE_INLINE__)
-# include "DIOP_Connection_Handler.i"
-#endif /* ! __ACE_INLINE__ */
+#include "ace/os_include/netinet/os_tcp.h"
+#include "ace/os_include/os_netdb.h"
 
 ACE_RCSID(tao, DIOP_Connect, "$Id$")
 
 TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_DIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
-    tcp_properties_ (0)
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -39,16 +39,14 @@ TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t)
 
 
 TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                          CORBA::Boolean flag,
-                                                          void *arg)
+                                                          CORBA::Boolean flag)
   : TAO_DIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
-    tcp_properties_ (ACE_static_cast
-                     (TAO_DIOP_Properties *, arg))
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
   TAO_DIOP_Transport* specific_transport = 0;
-  ACE_NEW(specific_transport,
-          TAO_DIOP_Transport(this, orb_core, flag));
+  ACE_NEW (specific_transport,
+           TAO_DIOP_Transport(this, orb_core, flag));
 
   // store this pointer (indirectly increment ref count)
   this->transport (specific_transport);
@@ -113,9 +111,45 @@ TAO_DIOP_Connection_Handler::open_handler (void *v)
 int
 TAO_DIOP_Connection_Handler::open (void*)
 {
+  // Currently, the DIOP properties are not used.  This code is here
+  // for consistency with other protocols.
+  TAO_DIOP_Protocol_Properties protocol_properties;
+
+  TAO_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_hooks ();
+
+  bool client =
+    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      if (client)
+        {
+          tph->client_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          tph->server_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
   this->udp_socket_.open (this->local_addr_);
 
-  if(TAO_debug_level > 5)
+  if (TAO_debug_level > 5)
   {
      ACE_DEBUG ((LM_DEBUG,
                  ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open -")
@@ -218,7 +252,49 @@ TAO_DIOP_Connection_Handler::close (u_long)
 int
 TAO_DIOP_Connection_Handler::release_os_resources (void)
 {
-  return this->peer().close ();
+  return this->peer ().close ();
+}
+
+int
+TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
+{
+  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
+
+  if (set_network_priority)
+    {
+      TAO_Protocols_Hooks *tph =
+        this->orb_core ()->get_protocols_hooks ();
+
+      CORBA::Long codepoint =
+        tph->get_dscp_codepoint ();
+
+      tos = (int)(codepoint) << 2;
+    }
+
+  if (tos != this->dscp_codepoint_)
+    {
+      int result = this->dgram ().set_option (IPPROTO_IP,
+                                              IP_TOS,
+                                              (int *) &tos ,
+                                              (int) sizeof (tos));
+
+      if (TAO_debug_level)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - DIOP_Connection_Handler::"
+                      "set_dscp_codepoint -> dscp: %x; result: %d; %s\n",
+                      tos,
+                      result,
+                      result == -1 ? "try running as superuser" : ""));
+        }
+
+      // On successful setting of TOS field.
+      if (result == 0)
+        this->dscp_codepoint_ = tos;
+
+    }
+
+  return 0;
 }
 
 // ****************************************************************
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
index 064b40fe48e..933a1f4254d 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -39,27 +39,6 @@ class TAO_Pluggable_Messaging;
 // ****************************************************************
 
 /**
- * @class TAO_DIOP_Properties
- *
- * @brief TCP protocol properties specification for a set of
- *  connections.
- *
- */
-
-class TAO_Strategies_Export TAO_DIOP_Properties
-{
-
-public:
-  int send_buffer_size;
-  int recv_buffer_size;
-  int no_delay;
-};
-
-
-
-// ****************************************************************
-
-/**
  * @class TAO_DIOP_Connection_Handler
  *
  * @brief  Handles requests on a single connection.
@@ -78,12 +57,9 @@ public:
 
   TAO_DIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
-  /// Constructor. <arg> parameter is used by the Acceptor to pass the
-  /// protocol configuration properties for this connection.
+  /// Constructor.
   TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag,
-                               void *arg);
-
+                               CORBA::Boolean flag);
 
   /// Destructor.
   ~TAO_DIOP_Connection_Handler (void);
@@ -151,6 +127,9 @@ public:
   //@}
   // DIOP Additions - End
 
+  /// Set Diff-Serv codepoint on outgoing packets.
+  int set_dscp_codepoint (CORBA::Boolean set_network_priority);
+
 protected:
 
   //@{
@@ -177,14 +156,10 @@ protected:
   // DIOP Additions - End
 
 private:
-  /// TCP configuration for this connection.
-  TAO_DIOP_Properties *tcp_properties_;
+  /// Stores the type of service value.
+  int dscp_codepoint_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "DIOP_Connection_Handler.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.i b/TAO/tao/Strategies/DIOP_Connection_Handler.i
deleted file mode 100644
index 7f2b3228624..00000000000
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index a082ce439ed..54cc6fc956e 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -42,7 +42,7 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_DIOP_Connecti
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 TAO_DIOP_Connector::TAO_DIOP_Connector (CORBA::Boolean flag)
-  : TAO_Connector (TAO_TAG_UDP_PROFILE),
+  : TAO_Connector (TAO_TAG_DIOP_PROFILE),
     lite_flag_ (flag)
 {
 }
@@ -134,8 +134,7 @@ TAO_DIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       TAO_DIOP_Connection_Handler *svc_handler_i = 0;
       ACE_NEW_RETURN (svc_handler_i,
                       TAO_DIOP_Connection_Handler (this->orb_core (),
-                                                   this->lite_flag_,
-                                                   0 /* TAO_DIOP_Properties */),
+                                                   this->lite_flag_),
                       0);
 
       svc_handler_i->local_addr (ACE_sap_any_cast (ACE_INET_Addr &));
@@ -235,17 +234,10 @@ TAO_DIOP_Connector::object_key_delimiter (void) const
   return TAO_DIOP_Profile::object_key_delimiter_;
 }
 
-int
-TAO_DIOP_Connector::init_tcp_properties (void)
-{
-  // @@ Michael: We have not TCP, so we have no TCP properties.
-  return 0;
-}
-
 TAO_DIOP_Endpoint *
 TAO_DIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
 {
-  if (endpoint->tag () != TAO_TAG_UDP_PROFILE)
+  if (endpoint->tag () != TAO_TAG_DIOP_PROFILE)
     return 0;
 
   TAO_DIOP_Endpoint *diop_endpoint =
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index 389875fa03a..5cec9dbd0c8 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -85,19 +85,11 @@ protected:
   virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
   //@}
 
-  /// Obtain tcp properties that must be used by this connector, i.e.,
-  /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
-
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
 protected:
 
-  /// TCP configuration properties to be used for all
-  /// connections established by this connector.
-  TAO_DIOP_Properties tcp_properties_;
-
   /// Do we need to use a GIOP_Lite for sending messages?
   CORBA::Boolean lite_flag_;
 
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index deeb5daba00..9ac0cdde44f 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -28,7 +28,7 @@ ACE_RCSID (Strategies,
 TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
 
-  : TAO_Endpoint (TAO_TAG_UDP_PROFILE)
+  : TAO_Endpoint (TAO_TAG_DIOP_PROFILE)
     , host_ ()
     , port_ (0)
     , object_addr_ (addr)
@@ -42,7 +42,7 @@ TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
                                       CORBA::UShort port,
                                       const ACE_INET_Addr &addr,
                                       CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_UDP_PROFILE,
+  : TAO_Endpoint (TAO_TAG_DIOP_PROFILE,
                   priority)
     , host_ ()
     , port_ (port)
@@ -55,7 +55,7 @@ TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
 }
 
 TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (void)
-  : TAO_Endpoint (TAO_TAG_UDP_PROFILE),
+  : TAO_Endpoint (TAO_TAG_DIOP_PROFILE),
     host_ (),
     port_ (0),
     object_addr_ (),
@@ -67,7 +67,7 @@ TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (void)
 TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
                                       CORBA::UShort port,
                                       CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_UDP_PROFILE),
+  : TAO_Endpoint (TAO_TAG_DIOP_PROFILE),
     host_ (),
     port_ (port),
     object_addr_ (),
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.i b/TAO/tao/Strategies/DIOP_Endpoint.i
index 1297351cf13..3bd443220b5 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.i
+++ b/TAO/tao/Strategies/DIOP_Endpoint.i
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-
-
 ACE_INLINE const char *
 TAO_DIOP_Endpoint::host (void) const
 {
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
index 8146d185a54..ef5755dde44 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -18,7 +18,7 @@ ACE_RCSID (Strategies,
 static const char prefix_[] = "diop";
 
 TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_UDP_PROFILE),
+  :  TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE),
      major_ (TAO_DEF_GIOP_MAJOR),
      minor_ (TAO_DEF_GIOP_MINOR)
 {
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 6f7d708307a..e301e3b3aa1 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -16,16 +16,10 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
 
-
 ACE_RCSID (Strategies,
            DIOP_Profile,
            "$Id$")
 
-
-#if !defined (__ACE_INLINE__)
-# include "DIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 static const char prefix_[] = "diop";
 
 const char TAO_DIOP_Profile::object_key_delimiter_ = '/';
@@ -41,7 +35,7 @@ TAO_DIOP_Profile::TAO_DIOP_Profile (const ACE_INET_Addr &addr,
                                     const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_UDP_PROFILE,
+  : TAO_Profile (TAO_TAG_DIOP_PROFILE,
                  orb_core,
                  object_key,
                  version),
@@ -57,7 +51,7 @@ TAO_DIOP_Profile::TAO_DIOP_Profile (const char* host,
                                     const ACE_INET_Addr &addr,
                                     const TAO_GIOP_Message_Version &version,
                                     TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_UDP_PROFILE,
+  : TAO_Profile (TAO_TAG_DIOP_PROFILE,
                  orb_core,
                  object_key,
                  version),
@@ -67,7 +61,7 @@ TAO_DIOP_Profile::TAO_DIOP_Profile (const char* host,
 }
 
 TAO_DIOP_Profile::TAO_DIOP_Profile (TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_UDP_PROFILE,
+  : TAO_Profile (TAO_TAG_DIOP_PROFILE,
                  orb_core,
                  TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
     endpoint_ (),
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index e9adca53cbe..e51bb10e95f 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -122,10 +122,6 @@ protected:
   CORBA::ULong count_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "DIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/DIOP_Profile.i b/TAO/tao/Strategies/DIOP_Profile.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/tao/Strategies/DIOP_Profile.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 1887f9e3993..ed8b55bf661 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -22,16 +22,12 @@
 #include "tao/GIOP_Message_Base.h"
 #include "tao/GIOP_Message_Lite.h"
 
-#if !defined (__ACE_INLINE__)
-# include "DIOP_Transport.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID (tao, DIOP_Transport, "$Id$")
 
 TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean flag)
-  : TAO_Transport (TAO_TAG_UDP_PROFILE,
+  : TAO_Transport (TAO_TAG_DIOP_PROFILE,
                    orb_core)
   , connection_handler_ (handler)
   , messaging_object_ (0)
@@ -260,6 +256,7 @@ TAO_DIOP_Transport::send_request (TAO_Stub *stub,
                           max_wait_time) == -1)
 
     return -1;
+
   this->first_request_sent();
 
   return 0;
@@ -299,7 +296,29 @@ TAO_DIOP_Transport::send_message (TAO_OutputCDR &stream,
   return 1;
 }
 
+int
+TAO_DIOP_Transport::send_message_shared (TAO_Stub *stub,
+                                         int message_semantics,
+                                         const ACE_Message_Block *message_block,
+                                         ACE_Time_Value *max_wait_time)
+{
+  int result;
+
+  {
+    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
 
+    result =
+      this->send_message_shared_i (stub, message_semantics,
+                                   message_block, max_wait_time);
+  }
+
+  if (result == -1)
+    {
+      this->close_connection ();
+    }
+
+  return result;
+}
 
 int
 TAO_DIOP_Transport::messaging_init (CORBA::Octet major,
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index e19b75a623f..63c79700296 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -87,6 +87,10 @@ protected:
                         size_t len,
                         const ACE_Time_Value *s = 0);
 
+  virtual int send_message_shared (TAO_Stub *stub,
+                                   int message_semantics,
+                                   const ACE_Message_Block *message_block,
+                                   ACE_Time_Value *max_wait_time);
 
   virtual int register_handler (void);
 
@@ -131,10 +135,6 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "DIOP_Transport.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/DIOP_Transport.i b/TAO/tao/Strategies/DIOP_Transport.i
deleted file mode 100644
index 81bf354f364..00000000000
--- a/TAO/tao/Strategies/DIOP_Transport.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-//$Id$
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index a32a631e276..8ebda1efd8c 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -108,8 +108,8 @@ TAO_SCIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
 
 int
 TAO_SCIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
-                                       TAO_MProfile &mprofile,
-                                       CORBA::Short priority)
+                                        TAO_MProfile &mprofile,
+                                        CORBA::Short priority)
 {
   // Adding this->endpoint_count_ to the TAO_MProfile.
   int count = mprofile.profile_count ();
@@ -149,8 +149,8 @@ TAO_SCIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
 
 int
 TAO_SCIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
-                                          TAO_MProfile &mprofile,
-                                          CORBA::Short priority)
+                                           TAO_MProfile &mprofile,
+                                           CORBA::Short priority)
 {
   CORBA::ULong index = 0;
   TAO_SCIOP_Profile *sciop_profile = 0;
@@ -245,9 +245,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
 
   this->orb_core_ = orb_core;
 
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
   if (this->hosts_ != 0)
     {
       // The hostname cache has already been set!
@@ -485,9 +482,6 @@ TAO_SCIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 {
   this->orb_core_ = orb_core;
 
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
   if (this->hosts_ != 0)
     {
       // The hostname cache has already been set!
@@ -531,7 +525,6 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
 {
   ACE_NEW_RETURN (this->creation_strategy_,
                   TAO_SCIOP_CREATION_STRATEGY (this->orb_core_,
-                                              &(this->tcp_properties_),
                                               this->lite_flag_),
                   -1);
 
@@ -1061,71 +1054,4 @@ TAO_SCIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
-int
-TAO_SCIOP_Acceptor::init_tcp_properties (void)
-{
-  // @@ Currently (in the code below), we obtain protocol properties from
-  // ORB-level ServerProtocol, even though the policy may
-  // have been overridden on POA level.  That's because currently all
-  // endpoints (acceptors) are global.  Once endpoints become per POA,
-  // the code below will have to be changed to look at the POA-level
-  // ServerProtocol policy first.
-
-  // @@ Later we may want to factor some of the code below
-  // among different protocols and place it into TAO_Acceptor, for
-  // example.
-
-  // ServerProtocolProperties policy controls protocols configuration.
-  // Look for protocol properties in the effective ServerProtocolPolicy.
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // Initialize the parameters to their defaults.  If RTCORBA is loaded,
-  // the server_protocols_hook will override any of the values if they
-  // have been set by a ServerProtocolProperties policy.
-
-  int send_buffer_size = this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-  int no_delay = this->orb_core_->orb_params ()->nodelay ();
-  int enable_network_priority = 0;
-
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (tph != 0)
-    {
-      const char protocol [] = "sciop";
-      const char *protocol_type = protocol;
-
-      int hook_return =
-        tph->call_server_protocols_hook (send_buffer_size,
-                                         recv_buffer_size,
-                                         no_delay,
-                                         enable_network_priority,
-                                         protocol_type);
-
-      if (hook_return == -1)
-        return -1;
-    }
-
-  this->tcp_properties_.send_buffer_size =
-    send_buffer_size;
-  this->tcp_properties_.recv_buffer_size =
-    recv_buffer_size;
-  this->tcp_properties_.no_delay =
-    no_delay;
- this->tcp_properties_.enable_network_priority  =
-   enable_network_priority;
-
-
-  // @@ NOTE.  RTCORBA treats a combination of transport+messaging
-  // as a single protocol.  Keep this in mind for when we adopt
-  // RTCORBA approach to protocols configuration for nonRT use.  In
-  // particular, what are the semantics of independent variation of
-  // messaging and transport layers, when one transport appears in
-  // combination with several messaging protocols, for example.
-
-  return 0;
-}
-
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index a706df851a4..a62f9e9d395 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -203,10 +203,6 @@ protected:
   /// ORB Core.
   TAO_ORB_Core *orb_core_;
 
-  /// TCP configuration properties to be used for all
-  /// connections opened by this acceptor.
-  TAO_SCIOP_Properties tcp_properties_;
-
   /// Should we use GIOP lite??
   CORBA::Boolean lite_flag_;
 
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 60d586cef75..f1a4ea66cbb 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -28,20 +28,14 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Wait_Strategy.h"
 
-#if !defined (__ACE_INLINE__)
-# include "SCIOP_Connection_Handler.i"
-#endif /* ! __ACE_INLINE__ */
-
-
 ACE_RCSID (tao,
            SCIOP_Connection_Handler,
            "$Id$")
 
-
 TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_SCIOP_SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
-    dscp_codepoint_ (0)
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -53,12 +47,10 @@ TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *
 
 
 TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                          CORBA::Boolean flag,
-                                                          void *arg)
+                                                            CORBA::Boolean flag)
   : TAO_SCIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
-    tcp_properties_ (*(ACE_static_cast
-                     (TAO_SCIOP_Properties *, arg)))
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
   TAO_SCIOP_Transport* specific_transport = 0;
   ACE_NEW (specific_transport,
@@ -68,13 +60,10 @@ TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_co
   this->transport (specific_transport);
 }
 
-TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                          void *arg)
+TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core)
   : TAO_SCIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
-    tcp_properties_ (*(ACE_static_cast
-                       (TAO_SCIOP_Properties *, arg))),
-    dscp_codepoint_ (0)
+    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
 {
 }
 
@@ -93,17 +82,58 @@ TAO_SCIOP_Connection_Handler::open_handler (void *v)
 int
 TAO_SCIOP_Connection_Handler::open (void*)
 {
+  TAO_SCIOP_Protocol_Properties protocol_properties;
+
+  // Initialize values from ORB params.
+  protocol_properties.send_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
+  protocol_properties.recv_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
+  protocol_properties.no_delay_ =
+    this->orb_core ()->orb_params ()->nodelay ();
+
+  TAO_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_hooks ();
+
+  bool client =
+    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      if (client)
+        {
+          tph->client_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          tph->server_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
   if (this->set_socket_option (this->peer (),
-                               this->tcp_properties_.send_buffer_size,
-                               this->tcp_properties_.recv_buffer_size) == -1)
+                               protocol_properties.send_buffer_size_,
+                               protocol_properties.recv_buffer_size_) == -1)
     return -1;
 
 #if !defined (ACE_LACKS_TCP_NODELAY)
-
   if (this->peer ().set_option (IPPROTO_SCTP,
                                 SCTP_NODELAY,
-                                (void *) &tcp_properties_.no_delay,
-                                sizeof (int)) == -1)
+                                (void *) &protocol_properties.no_delay_,
+                                sizeof (protocol_properties.no_delay_)) == -1)
     return -1;
 #endif /* ! ACE_LACKS_TCP_NODELAY */
 
@@ -124,6 +154,13 @@ TAO_SCIOP_Connection_Handler::open (void*)
   if (this->peer ().get_local_addr (local_addr) == -1)
     return -1;
 
+
+  if (TAO_debug_level > 2)
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("TAO(%P|%t) - SCIOP_Connection_Handler::open, ")
+                ACE_TEXT("The local addr is (%s) \n"),
+                local_addr. get_host_addr ()));
+
   if (local_addr.get_ip_address () == remote_addr.get_ip_address ()
       && local_addr.get_port_number () == remote_addr.get_port_number ())
     {
@@ -303,111 +340,43 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list (
   return 0;
 }
 
-void
-TAO_SCIOP_Connection_Handler::update_protocol_properties (
-   int send_buffer_size,
-   int recv_buffer_size,
-   int no_delay,
-   int enable_network_priority)
-  /* @todo Properties should be those of SCIOP ilk.
-  TimeBase::TimeT rto_initial,
-  TimeBase::TimeT rto_min,
-  TimeBase::TimeT rto_max,
-  CORBA::Float rto_alpha,
-  CORBA::Float rto_beta,
-  TimeBase::TimeT valid_cookie_life,
-  CORBA::Short association_max_retrans,
-  CORBA::Short path_max_retrans,
-  CORBA::Short max_init_retransmits,
-  TimeBase::TimeT hb_interval,
-  CORBA::Short association_max_retrans)
-  */
-{
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_SCIOP_Connection_Handler::update_protocol_properties\n"
-                "enable_network_priority = %d\n",
-                enable_network_priority));
-
-  if (this->tcp_properties_.send_buffer_size != send_buffer_size)
-    this->tcp_properties_.send_buffer_size = send_buffer_size;
-
-  if (this->tcp_properties_.recv_buffer_size != recv_buffer_size)
-    this->tcp_properties_.recv_buffer_size = recv_buffer_size;
-
-  if (this->tcp_properties_.no_delay != no_delay)
-    this->tcp_properties_.no_delay = no_delay;
-
-  if (this->tcp_properties_.enable_network_priority != enable_network_priority)
-    this->tcp_properties_.enable_network_priority = enable_network_priority;
-
-}
-
 int
-TAO_SCIOP_Connection_Handler::enable_network_priority (void)
+TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
 {
-  return this->tcp_properties_.enable_network_priority;
-}
+  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
 
-int
-TAO_SCIOP_Connection_Handler::set_dscp_codepoint (void)
-{
-  int tos;
-  if (this->enable_network_priority ())
+  if (set_network_priority)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          TAO_Protocols_Hooks *tph =
-            this->orb_core ()->get_protocols_hooks (
-              ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      TAO_Protocols_Hooks *tph =
+        this->orb_core ()->get_protocols_hooks ();
 
-          if (tph != 0)
-            {
-              CORBA::Long codepoint =
-                tph->get_dscp_codepoint ();
+      CORBA::Long codepoint =
+        tph->get_dscp_codepoint ();
 
-              tos = (int)(codepoint) << 2;
-            }
-        }
-      ACE_CATCHANY
-        {
-          if (TAO_debug_level > 0)
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "TAO_SCIOP_Connection_Handler::"
-                                 "set_dscp_codepoint - "
-                                 "get_protocol_hooks");
-
-          return -1;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
+      tos = (int)(codepoint) << 2;
     }
-  else
-    tos = IPDSFIELD_DSCP_DEFAULT << 2;
 
   if (tos != this->dscp_codepoint_)
     {
-      int ret = this->peer ().set_option (IPPROTO_SCTP,
-                                          IP_TOS,
-                                          (int *) &tos ,
-                                          (int) sizeof (tos));
+      int result = this->peer ().set_option (IPPROTO_IP,
+                                             IP_TOS,
+                                             (int *) &tos ,
+                                             (int) sizeof (tos));
 
-      if(TAO_debug_level)
+      if (TAO_debug_level)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) - SCIOP_Connection_Handler::"
-                      "set_dscp_codepoint, failed to set Diffserv"
-                      " codepoint - try running as superuser\n"));
-
-          ACE_DEBUG((LM_DEBUG,
-                     "TAO (%P|%t) - SCIOP_Connection_Handler::"
-                     "set_dscp_codepoint, set tos: ret: %d %x\n",
-                     ret, tos));
+                      "set_dscp_codepoint -> dscp: %x; result: %d; %s\n",
+                      tos,
+                      result,
+                      result == -1 ? "try running as superuser" : ""));
         }
 
-      this->dscp_codepoint_ = tos;
+      // On successful setting of TOS field.
+      if (result == 0)
+        this->dscp_codepoint_ = tos;
+
     }
 
   return 0;
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
index 7af9afeb349..741bb4762e4 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
@@ -50,44 +50,6 @@ class TAO_Pluggable_Messaging;
 // ****************************************************************
 
 /**
- * @class TAO_SCIOP_Properties
- *
- * @brief TCP protocol properties specification for a set of
- *  connections.
- *
- */
-
-#define IPDSFIELD_DSCP_DEFAULT  0x00
-
-class TAO_Strategies_Export TAO_SCIOP_Properties
-{
-
-public:
-  int send_buffer_size;
-  int recv_buffer_size;
-  int no_delay;
-  int enable_network_priority;
-
-  /*
-  TimeBase::TimeT rto_initial;
-  TimeBase::TimeT rto_min;
-  TimeBase::TimeT rto_max;
-  float rto_alpha;
-  float rto_beta;
-  TimeBase::TimeT valid_cookie_life;
-  short associaion_max_retrans;
-  short path_max_retrans;
-  short max_init_retransmits;
-  TimeBase::TimeT hb_interval;
-  short desired_streams;
-  */
-};
-
-
-
-// ****************************************************************
-
-/**
  * @class TAO_SCIOP_Connection_Handler
  *
  * @brief  Handles requests on a single connection.
@@ -106,12 +68,9 @@ public:
 
   TAO_SCIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
-  /// Constructor. <arg> parameter is used by the Acceptor to pass the
-  /// protocol configuration properties for this connection.
+  /// Constructor.
   TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag,
-                               void *arg);
-
+                                CORBA::Boolean flag);
 
   /// Destructor.
   ~TAO_SCIOP_Connection_Handler (void);
@@ -149,20 +108,8 @@ public:
   /// Process the <listen_list>
   int process_listen_point_list (IIOP::ListenPointList &listen_list);
 
-    ///Check if network priority needs to be enabled
-  int enable_network_priority (void);
-
-  ///Set the Diff-Serv codepoint if the Policy dicates the setting of Network Priority
-  int set_dscp_codepoint (void);
-
-  int set_dscp_codepoint (int tos);
-
-  /// Update the tcp properties of the hanlder to the most recent
-  /// properties set after the last invocation
-  virtual void update_protocol_properties (int send_buffer_size,
-                                           int recv_buffer_size,
-                                           int no_delay,
-                                           int enable_network_priority);
+  /// Set Diff-Serv codepoint on outgoing packets.
+  int set_dscp_codepoint (CORBA::Boolean set_network_priority);
 
 protected:
 
@@ -174,8 +121,7 @@ protected:
    * constructor just initializes its base class and sets all of its
    * contents to the default value, if any
    */
-  TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               void *arg);
+  TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core);
 
   //@{
   /**
@@ -186,17 +132,11 @@ protected:
   //@}
 
 private:
-  /// TCP configuration for this connection.
-  TAO_SCIOP_Properties tcp_properties_;
 
   /// Stores the type of service value.
   int dscp_codepoint_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "SCIOP_Connection_Handler.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_SCIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.i b/TAO/tao/Strategies/SCIOP_Connection_Handler.i
deleted file mode 100644
index aa25cd5a09f..00000000000
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 2911873f0cd..1f476dc6185 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -85,9 +85,6 @@ TAO_SCIOP_Connector::open (TAO_ORB_Core *orb_core)
   if (this->create_connect_strategy () == -1)
     return -1;
 
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
   /// Our connect creation strategy
   TAO_SCIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
 
@@ -95,7 +92,6 @@ TAO_SCIOP_Connector::open (TAO_ORB_Core *orb_core)
                   TAO_SCIOP_CONNECT_CREATION_STRATEGY
                       (orb_core->thr_mgr (),
                        orb_core,
-                       &(this->tcp_properties_),
                        this->lite_flag_),
                   -1);
 
@@ -161,16 +157,25 @@ TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
 
   TAO_Transport *transport = 0;
 
-  while (tao_endpoint != 0) {
-    TAO_SCIOP_Endpoint *sciop_endpoint = this->remote_endpoint (tao_endpoint);
-    if (sciop_endpoint != 0) {
-      transport = make_connection_i (r, desc, timeout, sciop_endpoint);
-      if (transport) {
-        break;
-      }
+  // @@ ATL folks, is this while loop needed?
+  // TAO_Default_Endpoint_Selector has this code already, i.e., the
+  // loop.
+  while (tao_endpoint != 0)
+    {
+      TAO_SCIOP_Endpoint *sciop_endpoint =
+        this->remote_endpoint (tao_endpoint);
+
+      if (sciop_endpoint != 0)
+        {
+          transport =
+            this->make_connection_i (r, desc, timeout, sciop_endpoint);
+          if (transport)
+            {
+              break;
+            }
+        }
+      tao_endpoint = tao_endpoint->next();
     }
-    tao_endpoint = tao_endpoint->next();
-  }
 
   return transport;
 }
@@ -216,9 +221,20 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
                      remote_address.get_ip_address()))
     return 0;
 
-  int result = this->base_connector_.connect (svc_handler,
-                                              multihomed,
-                                              synch_options);
+  ACE_Multihomed_INET_Addr local_address;
+
+  bool pn =
+    sciop_endpoint->is_preferred_network ();
+
+  if (pn)
+    local_addr.set ((u_short) 0,
+                    sciop_endpoint->preferred_network ());
+
+  int result =
+    this->base_connector_.connect (svc_handler,
+                                   multihomed,
+                                   synch_options,
+                                   local_address);
 
   // This call creates the service handler and bumps the #REFCOUNT# up
   // one extra.  There are three possibilities: (a) connection
@@ -413,61 +429,6 @@ TAO_SCIOP_Connector::object_key_delimiter (void) const
   return TAO_SCIOP_Profile::object_key_delimiter_;
 }
 
-int
-TAO_SCIOP_Connector::init_tcp_properties (void)
-{
-  // Connector protocol properties are obtained from ORB-level
-  // RTCORBA::ClientProtocolProperties policy override.
-  // If the override doesn't exist or doesn't contain the
-  // properties, we use ORB default.
-  //
-  // Currently, we do not use Object-level and Current-level policy
-  // overrides for protocol configuration because connection
-  // lookup and caching are not done based on protocol
-  // properties.
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // Initialize the settings to the ORB defaults.  If RT CORBA is enabled,
-  // it may override these.
-  int send_buffer_size = this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-  int no_delay = this->orb_core ()->orb_params ()->nodelay ();
-  int enable_network_priority = 0;
-
-  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (tph != 0)
-    {
-      const char protocol [] = "sciop";
-      const char *protocol_type = protocol;
-
-      int hook_result =
-        tph->call_client_protocols_hook (send_buffer_size,
-                                         recv_buffer_size,
-                                         no_delay,
-                                         enable_network_priority,
-                                         protocol_type);
-
-      if(hook_result == -1)
-        return -1;
-    }
-
-  // Extract and locally store properties of interest.
-  this->tcp_properties_.send_buffer_size =
-    send_buffer_size;
-  this->tcp_properties_.recv_buffer_size =
-    recv_buffer_size;
-  this->tcp_properties_.no_delay =
-    no_delay;
-  this->tcp_properties_.enable_network_priority  =
-    enable_network_priority;
-
-  return 0;
-}
-
-
 TAO_SCIOP_Endpoint *
 TAO_SCIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
 {
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
index f307f27bc00..dd6aa57d8c2 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -96,19 +96,11 @@ protected:
   /// Transport_Connector.h
   virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Obtain tcp properties that must be used by this connector, i.e.,
-  /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
-
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
 protected:
 
-  /// TCP configuration properties to be used for all
-  /// connections established by this connector.
-  TAO_SCIOP_Properties tcp_properties_;
-
   /// Do we need to use a GIOP_Lite for sending messages?
   CORBA::Boolean lite_flag_;
 
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index 16ef07973b9..b6806457b62 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -11,6 +11,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/Synch.h"
 #include "ace/OS_NS_stdio.h"
+#include "ORB_Core.h"
 
 ACE_RCSID (Strategies,
            SCIOP_Endpoint,
@@ -25,11 +26,13 @@ ACE_RCSID (Strategies,
 TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
   : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
-    , host_ ()
-    , port_ (683)  // default port (IANA assigned)
-    , object_addr_ (addr)
-    , object_addr_set_ (0)
-    , next_ (0)
+  , host_ ()
+  , port_ (683)  // default port (IANA assigned)
+  , object_addr_ (addr)
+  , object_addr_set_ (0)
+  , preferred_path_ ()
+  , is_encodable_ (true)
+  , next_ (0)
 {
   this->set (addr, use_dotted_decimal_addresses);
 }
@@ -40,39 +43,40 @@ TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const char *host,
                                         CORBA::Short priority)
   : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE,
                   priority)
-    , host_ ()
-    , port_ (port)
-    , object_addr_ (addr)
-    , object_addr_set_ (0)
-    , next_ (0)
+  , host_ (host)
+  , port_ (port)
+  , object_addr_ (addr)
+  , object_addr_set_ (0)
+  , preferred_path_ ()
+  , is_encodable_ (true)
+  , next_ (0)
 {
-  if (host != 0)
-    this->host_ = host;
 }
 
 TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (void)
   : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
-    , host_ ()
-    , port_ (683)  // default port (IANA assigned)
-    , object_addr_ ()
-    , object_addr_set_ (0)
-    , next_ (0)
+  , host_ ()
+  , port_ (683)  // default port (IANA assigned)
+  , object_addr_ ()
+  , object_addr_set_ (0)
+  , preferred_path_ ()
+  , is_encodable_ (true)
+  , next_ (0)
 {
 }
 
 TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const char *host,
-                                      CORBA::UShort port,
-                                      CORBA::Short priority)
+                                        CORBA::UShort port,
+                                        CORBA::Short priority)
   : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
-    , host_ ()
-    , port_ (port)
-    , object_addr_ ()
-    , object_addr_set_ (0)
-    , next_ (0)
+  , host_ (host)
+  , port_ (port)
+  , object_addr_ ()
+  , object_addr_set_ (0)
+  , preferred_path_ ()
+  , is_encodable_ (true)
+  , next_ (0)
 {
-  if (host != 0)
-    this->host_ = host;
-
   this->priority (priority);
 }
 
@@ -80,6 +84,19 @@ TAO_SCIOP_Endpoint::~TAO_SCIOP_Endpoint (void)
 {
 }
 
+TAO_SCIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_SCIOP_Endpoint &rhs)
+  : TAO_Endpoint (rhs.tag_,
+                  rhs.priority_)
+  , host_ (rhs.host_)
+  , port_ (rhs.port_)
+  , object_addr_ (rhs.object_addr_)
+  , object_addr_set_ (rhs.object_addr_set_)
+  , preferred_path_  (rhs.preferred_path_)
+  , is_encodable_ (rhs.is_encodable_)
+  , next_ (0)
+{
+}
+
 int
 TAO_SCIOP_Endpoint::set (const ACE_INET_Addr &addr,
                         int use_dotted_decimal_addresses)
@@ -148,11 +165,9 @@ TAO_SCIOP_Endpoint::duplicate (void)
 {
   TAO_SCIOP_Endpoint *endpoint = 0;
 
+  // @@NOTE: Not at all exception safe
   ACE_NEW_RETURN (endpoint,
-                  TAO_SCIOP_Endpoint (this->host_.in (),
-                                      this->port_,
-                                      this->object_addr_,
-                                      this->priority ()),
+                  TAO_SCIOP_Endpoint (*this),
                   0);
 
   return endpoint;
@@ -252,4 +267,101 @@ TAO_SCIOP_Endpoint::object_addr_i (void) const
     }
 }
 
+CORBA::ULong
+TAO_SCIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc)
+{
+  ACE_CString tmp (
+    oc->orb_params ()->preferred_interfaces ());
+
+  ssize_t pos = 0;
+
+  pos = tmp.find (this->host_.in ());
+
+  TAO_IIOP_Endpoint *latest = this;
+
+  CORBA::ULong count = 0;
+
+  while (pos != ACE_CString::npos)
+    {
+      // Do we have a "," or an '\0'?
+      ssize_t new_pos = tmp.find (",",
+                                  pos + 1);
+
+      // Length of the preferred path
+      int length = 0;
+
+      if (new_pos == ACE_CString::npos)
+        length = tmp.length () - pos;
+      else
+        length = new_pos - pos;
+
+      ACE_CString rem_tmp = tmp.substr (pos, length);
+
+      // Search for the ":"
+      ssize_t col_pos = rem_tmp.find (":");
+
+      if (col_pos == ACE_CString::npos)
+        {
+          pos = tmp.find (latest->host_.in (),
+                          pos + length);
+          continue;
+        }
+
+      ACE_CString path = rem_tmp.substr (col_pos + 1);
+
+      latest->preferred_path_.host =
+        CORBA::string_dup (path.c_str ());
+
+      if (TAO_debug_level > 3)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) Adding path [%s] "
+                    " as preferred path for [%s] \n",
+                    path.c_str (), this->host_.in ()));
+
+      pos = tmp.find (latest->host_.in (),
+                      pos + length);
+
+      if (pos != ACE_CString::npos)
+        {
+          TAO_Endpoint *tmp_ep =
+            latest->duplicate ();
+
+          latest->next_ = dynamic_cast<TAO_SCIOP_Endpoint *> (tmp_ep);
+
+          if (latest->next_ == 0) return count;
+
+          latest = latest->next_;
+          ++count;
+        }
+    }
+
+  if (tmp.length () != 0 &&
+      !oc->orb_params ()->enforce_pref_interfaces ())
+    {
+      TAO_Endpoint *tmp_ep = latest->duplicate ();
+
+      latest->next_ =
+        dynamic_cast<TAO_SCIOP_Endpoint *> (tmp_ep);
+
+      if (latest->next_ == 0) return count;
+
+      latest->next_->preferred_path_.host = (const char *) 0;
+      ++count;
+    }
+
+  return count;
+}
+
+bool
+TAO_SCIOP_Endpoint::is_preferred_network (void) const
+{
+  return (this->preferred_path_.host.in () != 0);
+}
+
+const char *
+TAO_SCIOP_Endpoint::preferred_network (void) const
+{
+  return this->preferred_path_.host.in ();
+}
+
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h
index c36d809202f..d131b3ca61f 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.h
@@ -107,6 +107,12 @@ public:
   /// Set the port number.
   CORBA::UShort port (CORBA::UShort p);
 
+  /// Do we have a preferred local network for the target?
+  bool is_preferred_network (void) const;
+
+  /// Return the preferred network if any.
+  const char *preferred_network (void) const;
+
 private:
 
   /// Helper method for setting INET_Addr.
@@ -116,6 +122,19 @@ private:
   /// Helper method for object_addr ().
   void object_addr_i (void) const;
 
+  /// Generate preferred interfaces from the options passed in by the
+  /// user.
+  CORBA::ULong preferred_interfaces (TAO_ORB_Core *oc);
+
+  /// Canonical copy constructor
+  /**
+   * In private section to prevent clients from invoking this
+   * accidentally. Clients should only use duplicate () to make a depp
+   * copy
+   */
+  TAO_SCIOP_Endpoint (const TAO_SCIOP_Endpoint &);
+
+
   /// String representing the host name.
   CORBA::String_var host_;
 
@@ -129,10 +148,15 @@ private:
   /// Flag to indicate if the address has been resolved and set.
   mutable int object_addr_set_;
 
+  /// Preferred path for this endpoint.
+  TAO::IIOP_Endpoint_Info preferred_path_;
+
+  /// Is this endpoint created encodable as part of the IOR?
+  bool is_encodable_;
+
   /// SCIOP Endpoints can be stringed into a list.  Return the next
   /// endpoint in the list, if any.
   TAO_SCIOP_Endpoint *next_;
-
 };
 
 
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index d01935260ac..06b991b58c7 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -16,10 +16,6 @@ ACE_RCSID(Strategies,
           SCIOP_Profile,
           "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "SCIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 static const char prefix_[] = "sciop";
 
 const char TAO_SCIOP_Profile::object_key_delimiter_ = '/';
@@ -89,7 +85,6 @@ int
 TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 {
   // Decode multiple endpoints, starting with the primary (endpoint_)
-
   CORBA::StringSeq endpointSeq;
   cdr >> endpointSeq;
 
@@ -106,15 +101,20 @@ TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 
   // Add multiple endpoints > 1
 
-  for (int i=endpointSeq.length() - 1; i > 0 ; i--) {
-    TAO_SCIOP_Endpoint *endpoint = 0;
-    ACE_NEW_RETURN (endpoint,
-                    TAO_SCIOP_Endpoint (endpointSeq[i].in(),
-                                        this->endpoint_.port_,
-                                        this->endpoint_.priority()),
-                    -1);
-    this->add_endpoint (endpoint);
-  }
+  for (int i=endpointSeq.length() - 1; i > 0 ; i--)
+    {
+      TAO_SCIOP_Endpoint *endpoint = 0;
+      ACE_NEW_RETURN (endpoint,
+                      TAO_SCIOP_Endpoint (endpointSeq[i].in(),
+                                          this->endpoint_.port_,
+                                          this->endpoint_.priority()),
+                      -1);
+
+      this->count_ +=
+        endpoint->preferred_interfaces (this->orb_core ());
+
+      this->add_endpoint (endpoint);
+    }
 
   // SCIOR has a max_streams variable
   // We are ignoring it for now since ACE SCTP code fixes at 1 anyway.
@@ -404,6 +404,21 @@ TAO_SCIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
 int
 TAO_SCIOP_Profile::encode_endpoints (void)
 {
+  CORBA::ULong actual_count = 0;
+
+  const TAO_SCIOP_Endpoint *endpoint = &this->endpoint_;
+
+  // Count the number of endpoints that needs to be encoded
+  for (CORBA::ULong c = 0;
+       c != this->count_;
+       ++c)
+    {
+      if (endpoint->is_encodable_)
+        ++actual_count;
+
+      endpoint = endpoint->next_;
+    }
+
   // Create a data structure and fill it with endpoint info for wire
   // transfer.
   // We include information for the head of the list
@@ -412,16 +427,20 @@ TAO_SCIOP_Profile::encode_endpoints (void)
   // priority is not!
 
   TAO_SCIOPEndpointSequence endpoints;
-  endpoints.length (this->count_);
+  endpoints.length (actual_count);
+
+  endpoint = &this->endpoint_;
 
-  const TAO_SCIOP_Endpoint *endpoint = &this->endpoint_;
   for (CORBA::ULong i = 0;
        i < this->count_;
        ++i)
     {
-      endpoints[i].host = endpoint->host ();
-      endpoints[i].port = endpoint->port ();
-      endpoints[i].priority = endpoint->priority ();
+      if (endpoint->is_encodable_)
+        {
+          endpoints[i].host = endpoint->host ();
+          endpoints[i].port = endpoint->port ();
+          endpoints[i].priority = endpoint->priority ();
+        }
 
       endpoint = endpoint->next_;
     }
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index 8076034ef79..5310af754b0 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -103,10 +103,25 @@ protected:
    * one endpoint.
    *
    * Currently, a profile contains more than one endpoint, i.e.,
-   * list contains more than just the head, only when RTCORBA is enabled.
-   * However, in the near future, this will be used in nonRT
-   * mode as well, e.g., to support TAG_ALTERNATE_SCIOP_ADDRESS
-   * feature.
+   * list contains more than just the head, only for two cases
+   * (1) when RTCORBA is enabled and
+   * (2) the ORB is initialized with -ORBPreferredInterfaces option.
+   * However, in the near future, this will be used in for mode as
+   * well, e.g., to support TAG_ALTERNATE_IIOP_ADDRESS  feature.
+   *
+   * This is probably as good a place to discuss how the list of
+   * endpoints is used for #2. If the ORB is configured to use
+   * preferred interfaces for invocation, TAO creates an endpoint per
+   * preferred interface. To be clear, every tuple
+   * <destination:target> will have an endpoint. What TAO essentially
+   * does is that creates it multiple endpoints so that the invocation
+   * code path can use existing iterating techniques to try one
+   * preferred interface after another (if the first did not work). If
+   * the ORB is configured with -ORBEnforcePreferredInterface set to
+   * false in addition to the ORBPreferredInterfaces option , TAO
+   * creates another endpoint with the preferred bit set to null, so
+   * that the invocation code can fall back to a SCTP stack returned
+   * local address.
    * Addressing info of the default endpoint, i.e., head of the list,
    * is transmitted using standard SCIOP ProfileBody components.  See
    * <encode_endpoints> method documentation above for how the rest of
@@ -118,10 +133,6 @@ protected:
   CORBA::ULong count_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "SCIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_SCIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SCIOP_Profile.i b/TAO/tao/Strategies/SCIOP_Profile.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/tao/Strategies/SCIOP_Profile.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index f5664f2e4af..0fbaca58cda 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -23,16 +23,10 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Adapter.h"
 
-#if !defined (__ACE_INLINE__)
-# include "SCIOP_Transport.i"
-#endif /* ! __ACE_INLINE__ */
-
-
 ACE_RCSID (tao,
            SCIOP_Transport,
            "$Id$")
 
-
 TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean )
@@ -144,37 +138,6 @@ TAO_SCIOP_Transport::send_request (TAO_Stub *stub,
                                   int message_semantics,
                                   ACE_Time_Value *max_wait_time)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (tph != 0)
-        {
-
-          int result =
-            tph->update_client_protocol_properties (stub,
-                                                    this,
-                                                    "sciop");
-
-          if (result == -1)
-            return -1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO (%P|%t) - TAO_SCIOP_Transport::send_request - "
-                             "get_protocol_hooks");
-
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
   if (this->ws_->sending_request (orb_core,
                                   message_semantics) == -1)
 
@@ -231,16 +194,6 @@ TAO_SCIOP_Transport::send_message_shared (TAO_Stub *stub,
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
 
-    if (TAO_debug_level > 6)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - ")
-                  ACE_TEXT ("SCIOP_Transport::send_message_shared, ")
-                  ACE_TEXT ("enable_network_priority = %d\n"),
-                  this->connection_handler_->enable_network_priority ()));
-
-    if (this->connection_handler_ != 0)
-      this->connection_handler_->set_dscp_codepoint ();
-
     r = this->send_message_shared_i (stub, message_semantics,
                                      message_block, max_wait_time);
   }
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index 6f159a4f387..e51f42b5778 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -137,11 +137,6 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
-
-#if defined (__ACE_INLINE__)
-#include "SCIOP_Transport.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_SCIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SCIOP_Transport.i b/TAO/tao/Strategies/SCIOP_Transport.i
deleted file mode 100644
index abffb63d92a..00000000000
--- a/TAO/tao/Strategies/SCIOP_Transport.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index ec57d039b4e..aa1b119062c 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -13,10 +13,6 @@
 #include "tao/Codeset_Manager.h"
 #include "tao/CDR.h"
 
-#if !defined(__ACE_INLINE__)
-#include "SHMIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/os_include/os_netdb.h"
 #include "ace/os_include/os_ctype.h"
 
@@ -155,8 +151,7 @@ TAO_SHMIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
       pfile = mprofile.get_profile (i);
       if (pfile->tag () == TAO_TAG_SHMEM_PROFILE)
       {
-        shmiop_profile = ACE_dynamic_cast (TAO_SHMIOP_Profile *,
-                                           pfile);
+        shmiop_profile = dynamic_cast <TAO_SHMIOP_Profile *>(pfile);
         break;
       }
     }
@@ -190,7 +185,7 @@ int
 TAO_SHMIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 {
   const TAO_SHMIOP_Endpoint *endp =
-    ACE_dynamic_cast(const TAO_SHMIOP_Endpoint *, endpoint);
+    dynamic_cast <const TAO_SHMIOP_Endpoint *> (endpoint);
 
   // Make sure the dynamically cast pointer is valid.
   if (endp == 0)
@@ -226,10 +221,8 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core,
                            const char *options)
 {
   if (major >=0 && minor >= 0)
-    this->version_.set_version (ACE_static_cast (CORBA::Octet,
-                                                 major),
-                                ACE_static_cast (CORBA::Octet,
-                                                 minor));
+    this->version_.set_version (static_cast <CORBA::Octet>(major),
+                                static_cast <CORBA::Octet>(minor));
   // Parse options
   if (this->parse_options (options) == -1)
     return -1;
@@ -252,10 +245,8 @@ TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
                                    const char *options)
 {
   if (major >=0 && minor >= 0)
-    this->version_.set_version (ACE_static_cast (CORBA::Octet,
-                                                 major),
-                                ACE_static_cast (CORBA::Octet,
-                                                 minor));
+    this->version_.set_version (static_cast <CORBA::Octet>(major),
+                                static_cast <CORBA::Octet>(minor));
 
   // Parse options
   if (this->parse_options (options) == -1)
@@ -264,7 +255,6 @@ TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
   // @@ Until we can support multihomed machines correctly we must
   //    pick the "default interface" and only listen on that IP
   //    address.
-
   this->host_ = this->address_.get_host_name ();
 
   return this->open_i (orb_core,
@@ -289,7 +279,6 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
 
   ACE_NEW_RETURN (this->creation_strategy_,
                   TAO_SHMIOP_CREATION_STRATEGY (this->orb_core_,
-                                                0,
                                                 this->lite_flag_),
                   -1);
 
@@ -302,7 +291,6 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
                   -1);
 
   // We only accept connection on localhost.
-  //  ACE_INET_Addr local_addr (addr.get_port_number (), ACE_TEXT ("localhost"));
   if (this->base_acceptor_.open (this->address_,
                                  reactor,
                                  this->creation_strategy_,
@@ -310,8 +298,8 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
                                  this->concurrency_strategy_) == -1)
     {
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) SHMIOP_Acceptor::open_i - %p\n\n"),
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, %p\n\n"),
                     ACE_TEXT ("cannot open acceptor")));
       return -1;
     }
@@ -326,35 +314,61 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
   if (this->base_acceptor_.acceptor ().get_local_addr (this->address_) != 0)
     {
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) SHMIOP_Acceptor::open_i - %p\n\n"),
-                    ACE_TEXT ("cannot get local addr")));
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, %p\n\n"),
+                    ACE_TEXT ("cannot get local addr\n")));
       return -1;
     }
 
-  // This will be the actualy host name of the original endpoint.
-  ACE_TCHAR tmp_host[MAXHOSTNAMELEN+1];
-  if (this->address_.get_host_name (tmp_host,
-                                    sizeof tmp_host) != 0)
+  // If the ORB is instructed to use dotted decimal addresses, we respect that
+  // also for shmiop
+  if (orb_core->orb_params ()->use_dotted_decimal_addresses ())
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) SHMIOP_Acceptor::open_i - %p\n\n"),
-                    ACE_TEXT ("cannot cache hostname")));
-      return -1;
+      // Get the ip address, we get the remote addr to put in the IOR, don't
+      // calls get_host_addr() directly on address_, we then get the internal
+      // address back
+      const char *tmp = this->address_.get_remote_addr().get_host_addr ();
+
+      if (tmp == 0)
+        {
+          if (TAO_debug_level > 0)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("TAO (%P|%t) - ")
+                        ACE_TEXT ("SHMIOP_Acceptor::open_i, ")
+                        ACE_TEXT ("- %p, "),
+                        ACE_TEXT ("cannot determine hostname\n")));
+          return -1;
+        }
+
+      this->host_ = tmp;
+    }
+  else
+    {
+      // This will be the actualy host name of the original endpoint.
+      ACE_TCHAR tmp_host[MAXHOSTNAMELEN+1];
+
+      if (this->address_.get_host_name (tmp_host,
+                                        sizeof tmp_host) != 0)
+        {
+          if (TAO_debug_level > 0)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, - %p\n"),
+                        ACE_TEXT ("cannot cache hostname\n")));
+          return -1;
+        }
+      this->host_ = ACE_TEXT_ALWAYS_CHAR(tmp_host);
     }
-  this->host_ = ACE_TEXT_ALWAYS_CHAR(tmp_host);
 
-  (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
   // This avoids having child processes acquire the listen socket thereby
   // denying the server the opportunity to restart on a well-known endpoint.
   // This does not affect the aberrent behavior on Win32 platforms.
+  (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
 
   if (TAO_debug_level > 5)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("\nTAO (%P|%t) SHMIOP_Acceptor::open_i - ")
-                  ACE_TEXT ("listening on %s using: <localhost:%u>\n"),
+                  ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, ")
+                  ACE_TEXT ("listening on : <%s:%u>\n"),
                   ACE_TEXT_CHAR_TO_TCHAR(this->host_.c_str ()),
                   this->address_.get_port_number ()));
     }
@@ -370,7 +384,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
   TAO_InputCDR cdr (profile.profile_data.mb ());
 #else
-  TAO_InputCDR cdr (ACE_reinterpret_cast(char*,profile.profile_data.get_buffer ()),
+  TAO_InputCDR cdr (reinterpret_cast<char*>(profile.profile_data.get_buffer ()),
                     profile.profile_data.length ());
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
@@ -384,7 +398,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
     if (TAO_debug_level > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) SHMIOP_Profile::decode - v%d.%d\n"),
+                    ACE_TEXT ("TAO (%P|%t) - SHMIOP_Profile::decode, v%d.%d\n"),
                     major,
                     minor));
       }
@@ -400,9 +414,9 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
     {
       if (TAO_debug_level > 0)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) TAO_SHMIOP_Acceptor::object_key - ")
-                      ACE_TEXT ("error while decoding host/port")));
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::object_key, ")
+                      ACE_TEXT ("error while decoding host/port\n")));
         }
       return -1;
     }
@@ -471,8 +485,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
       if (j < option_count - 1)
         end = options.find (option_delimiter, begin);
       else
-        end = ACE_static_cast (int,
-                               len - begin); // Handle last endpoint differently
+        end = static_cast <int>(len - begin); // Handle last endpoint differently
 
       if (end == begin)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -484,7 +497,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
 
           int slot = opt.find ("=");
 
-          if (slot == ACE_static_cast (int, len - 1)
+          if (slot == static_cast <int> (len - 1)
               || slot == ACE_CString::npos)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) SHMIOP option <%s> is ")
@@ -505,7 +518,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP endpoint format: ")
-                                 ACE_TEXT ("endpoint priorities no longer supported. \n")),
+                                 ACE_TEXT ("endpoint priorities no longer supported.\n")),
                                 -1);
             }
           else
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index e1a2b8f04db..ef369ad0f9c 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -36,7 +36,7 @@
 #include "ace/Acceptor.h"
 #include "ace/MEM_Acceptor.h"
 #include "tao/GIOP_Message_Version.h"
-// TAO SHMIOP_Acceptor concrete call defination
+// TAO SHMIOP_Acceptor concrete call definitions
 
 /**
  * @class TAO_SHMIOP_Acceptor
@@ -148,10 +148,6 @@ private:
   CORBA::Boolean lite_flag_;
 };
 
-#if defined(__ACE_INLINE__)
-#include "SHMIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.i b/TAO/tao/Strategies/SHMIOP_Acceptor.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index cc3a4ae8b9d..c37dff54de1 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -15,18 +15,14 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "SHMIOP_Endpoint.h"
 #include "tao/Resume_Handle.h"
-
-#if !defined (__ACE_INLINE__)
-# include "SHMIOP_Connection_Handler.inl"
-#endif /* ! __ACE_INLINE__ */
+#include "tao/Protocols_Hooks.h"
 
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
-#include "ace/os_include/netinet/os_tcp.h"
 
 ACE_RCSID (Strategies,
-	   SHMIOP_Connection_Handler,
-	   "$Id$")
+           SHMIOP_Connection_Handler,
+           "$Id$")
 
 TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_SHMIOP_SVC_HANDLER (t, 0 , 0),
@@ -42,8 +38,7 @@ TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager
 
 
 TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                              CORBA::Boolean flag,
-                                                              void *)
+                                                              CORBA::Boolean flag)
   : TAO_SHMIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core)
 {
@@ -70,21 +65,60 @@ TAO_SHMIOP_Connection_Handler::open_handler (void *v)
 int
 TAO_SHMIOP_Connection_Handler::open (void*)
 {
+  TAO_SHMIOP_Protocol_Properties protocol_properties;
+
+  // Initialize values from ORB params.
+  protocol_properties.send_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
+  protocol_properties.recv_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
+  protocol_properties.no_delay_ =
+    this->orb_core ()->orb_params ()->nodelay ();
+
+  TAO_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_hooks ();
+
+  bool client =
+    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      if (client)
+        {
+          tph->client_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          tph->server_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
   if (this->set_socket_option (this->peer (),
-                               this->orb_core ()->orb_params ()->sock_sndbuf_size (),
-                               this->orb_core ()->orb_params ()->sock_rcvbuf_size ())
-      == -1)
+                               protocol_properties.send_buffer_size_,
+                               protocol_properties.recv_buffer_size_) == -1)
     return -1;
-#if !defined (ACE_LACKS_TCP_NODELAY)
-
-  int nodelay =
-    this->orb_core ()->orb_params ()->nodelay ();
 
+#if !defined (ACE_LACKS_TCP_NODELAY)
   if (this->peer ().set_option (ACE_IPPROTO_TCP,
                                 TCP_NODELAY,
-                                (void *) &nodelay,
-                                sizeof (int)) == -1)
+                                (void *) &protocol_properties.no_delay_,
+                                sizeof (protocol_properties.no_delay_)) == -1)
     return -1;
+
 #endif /* ! ACE_LACKS_TCP_NODELAY */
 
   if (this->transport ()->wait_strategy ()->non_blocking ())
@@ -97,14 +131,14 @@ TAO_SHMIOP_Connection_Handler::open (void*)
   // completely connected.
   ACE_INET_Addr addr;
 
-  ACE_TCHAR client[MAXHOSTNAMELEN + 16];
+  ACE_TCHAR local_as_string[MAXHOSTNAMELEN + 16];
 
   // Get the peername.
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
 
   // Verify that we can resolve the peer hostname.
-  else if (addr.addr_to_string (client, sizeof (client)) == -1)
+  else if (addr.addr_to_string (local_as_string, sizeof (local_as_string)) == -1)
     return -1;
 
   if (TAO_debug_level > 0)
@@ -112,7 +146,7 @@ TAO_SHMIOP_Connection_Handler::open (void*)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) SHMIOP connection from client")
                   ACE_TEXT ("<%s> on %d\n"),
-                  client, this->peer ().get_handle ()));
+                  local_as_string, this->peer ().get_handle ()));
     }
 
   // Set that the transport is now connected, if fails we return -1
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
index 152b8ad66c8..fbfa34bc1fc 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -50,12 +50,9 @@ public:
   /// Constructor.
   TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
-  /// Constructor. <arg> parameter is used by the Acceptor to pass the
-  /// protocol configuration properties for this connection.
+  /// Constructor.
   TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag,
-                               void *arg);
-
+                                 CORBA::Boolean flag);
 
   /// Destructor.
   ~TAO_SHMIOP_Connection_Handler (void);
@@ -106,12 +103,6 @@ private:
 
 };
 
-
-
-#if defined (__ACE_INLINE__)
-#include "SHMIOP_Connection_Handler.inl"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.inl b/TAO/tao/Strategies/SHMIOP_Connection_Handler.inl
deleted file mode 100644
index 7f2b3228624..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index eb1c042934b..28eb945a4f7 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -77,7 +77,6 @@ TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
                   TAO_SHMIOP_CONNECT_CREATION_STRATEGY
                       (orb_core->thr_mgr (),
                        orb_core,
-                       0,
                        this->lite_flag_),
                   -1);
 
@@ -119,8 +118,7 @@ TAO_SHMIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
     return -1;
 
   TAO_SHMIOP_Endpoint *shmiop_endpoint =
-    ACE_dynamic_cast (TAO_SHMIOP_Endpoint *,
-                      endpoint );
+    dynamic_cast <TAO_SHMIOP_Endpoint *>(endpoint);
   if (shmiop_endpoint == 0)
     return -1;
 
@@ -134,7 +132,7 @@ TAO_SHMIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
      {
        if (TAO_debug_level > 0)
          {
-           ACE_DEBUG ((LM_DEBUG,
+           ACE_ERROR ((LM_ERROR,
                        ACE_TEXT ("TAO (%P|%t) SHMIOP connection failed.\n")
                        ACE_TEXT ("TAO (%P|%t) This is most likely ")
                        ACE_TEXT ("due to a hostname lookup ")
@@ -151,11 +149,11 @@ TAO_SHMIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 TAO_Transport *
 TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
                                        TAO_Transport_Descriptor_Interface &desc,
-                                       ACE_Time_Value *max_wait_time)
+                                       ACE_Time_Value *timeout)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) SHMIOP_Connector::make_connection - ")
+                  ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ")
                   ACE_TEXT ("looking for SHMIOP connection.\n")));
 
   TAO_SHMIOP_Endpoint *shmiop_endpoint =
@@ -169,13 +167,15 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
 
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) SHMIOP_Connector::connect ")
-                ACE_TEXT ("making a new connection \n")));
+                "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
+                "making a new connection to <%s:%d>\n",
+                ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
+                shmiop_endpoint->port ()));
 
   // Get the right synch options
   ACE_Synch_Options synch_options;
 
-  this->active_connect_strategy_->synch_options (max_wait_time,
+  this->active_connect_strategy_->synch_options (timeout,
                                                  synch_options);
 
   TAO_SHMIOP_Connection_Handler *svc_handler = 0;
@@ -202,8 +202,8 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       // Give users a clue to the problem.
       if (TAO_debug_level > 0)
         {
-          ACE_DEBUG ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) SHMIOP_Connector::make_connection, ")
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ")
                       ACE_TEXT ("connection to <%s:%u> failed (%p)\n"),
                       ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
                       shmiop_endpoint->port (),
@@ -262,8 +262,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
                     "TAO (%P|%t) - SHMIOP_Connector [%d]::make_connection, "
-                    "could not register the transport "
-                    "in the reactor.\n",
+                    "could not register the transport in the reactor.\n",
                     transport->id ()));
 
       return 0;
@@ -275,7 +274,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
 TAO_Profile *
 TAO_SHMIOP_Connector::create_profile (TAO_InputCDR& cdr)
 {
-  TAO_Profile *pfile;
+  TAO_Profile *pfile = 0;
   ACE_NEW_RETURN (pfile,
                   TAO_SHMIOP_Profile (this->orb_core ()),
                   0);
@@ -352,8 +351,7 @@ TAO_SHMIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
     return 0;
 
   TAO_SHMIOP_Endpoint *shmiop_endpoint =
-    ACE_dynamic_cast (TAO_SHMIOP_Endpoint *,
-                      endpoint );
+    dynamic_cast <TAO_SHMIOP_Endpoint *>(endpoint);
   if (shmiop_endpoint == 0)
     return 0;
 
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
index f0c332dc03e..8d2ca160b58 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -102,14 +102,21 @@ TAO_SHMIOP_Endpoint::set (const ACE_INET_Addr &addr,
   if (use_dotted_decimal_addresses
       || addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
     {
+      if (use_dotted_decimal_addresses == 0 && TAO_debug_level > 5)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) - SHMIOP_Endpoint::set, ")
+                      ACE_TEXT ("- %p cannot determine hostname\n")));
+        }
+
       const char *tmp = addr.get_host_addr ();
       if (tmp == 0)
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\n\nTAO (%P|%t) ")
+                        ACE_TEXT ("TAO (%P|%t) - ")
                         ACE_TEXT ("SHMIOP_Endpoint::set ")
-                        ACE_TEXT ("- %p\n\n"),
+                        ACE_TEXT ("- %p\n"),
                         ACE_TEXT ("cannot determine hostname")));
           return -1;
         }
@@ -174,11 +181,8 @@ TAO_SHMIOP_Endpoint::duplicate (void)
 CORBA::Boolean
 TAO_SHMIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
 {
-  TAO_Endpoint *endpt = ACE_const_cast (TAO_Endpoint *,
-                                        other_endpoint);
-
-  TAO_SHMIOP_Endpoint *endpoint = ACE_dynamic_cast (TAO_SHMIOP_Endpoint *,
-                                                    endpt);
+  const TAO_SHMIOP_Endpoint *endpoint = dynamic_cast <const TAO_SHMIOP_Endpoint *>
+                                                     (other_endpoint);
 
   if (endpoint == 0)
     return 0;
@@ -225,8 +229,7 @@ TAO_SHMIOP_Endpoint::object_addr (void) const
       // We need to modify the object_addr_ in this method.  Do so
       // using a  non-const copy of the <this> pointer.
       TAO_SHMIOP_Endpoint *endpoint =
-        ACE_const_cast (TAO_SHMIOP_Endpoint *,
-                        this);
+        const_cast <TAO_SHMIOP_Endpoint *>(this);
 
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                         guard,
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h
index 141f0a93ae6..c44a9f6705f 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h
@@ -80,12 +80,12 @@ public:
    * Please check the documentation in Endpoint.h for details.
    */
   //@{
-  /// Return a copy of <this>
+  /// Return a copy of @c this
   virtual TAO_Endpoint *next (void);
   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
+  /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
   /// endpoints are equivalent iff their port and host are the same.
   CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 4bffe984ea4..8576e88d261 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -16,10 +16,6 @@ ACE_RCSID (Strategies,
            SHMIOP_Profile,
            "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "SHMIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/os_include/os_netdb.h"
 
 static const char prefix_[] = "shmiop";
@@ -175,7 +171,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
   if (ACE_OS::strspn (tmp.in (), "1234567890") == length)
     {
       this->endpoint_.port_ =
-        ACE_static_cast (CORBA::UShort, ACE_OS::atoi (tmp.in ()));
+        static_cast <CORBA::UShort> (ACE_OS::atoi (tmp.in ()));
     }
   else
     {
@@ -271,7 +267,7 @@ CORBA::Boolean
 TAO_SHMIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 {
   const TAO_SHMIOP_Profile *op =
-    ACE_dynamic_cast (const TAO_SHMIOP_Profile *, other_profile);
+    dynamic_cast <const TAO_SHMIOP_Profile *> (other_profile);
 
   if (op == 0)
     return 0;
@@ -351,7 +347,7 @@ TAO_SHMIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                    1 /* object key separator */ +
                    ACE_OS::strlen (key.in ()));
 
-  char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen));
+  char * buf = CORBA::string_alloc (static_cast <CORBA::ULong> (buflen));
 
   static const char digits [] = "0123456789";
 
@@ -437,8 +433,7 @@ TAO_SHMIOP_Profile::encode_endpoints (void)
 
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = TAO_TAG_ENDPOINTS;
-  tagged_component.component_data.length (ACE_static_cast (CORBA::ULong,
-                                                           length));
+  tagged_component.component_data.length (static_cast <CORBA::ULong>(length));
   CORBA::Octet *buf =
     tagged_component.component_data.get_buffer ();
 
@@ -470,14 +465,14 @@ TAO_SHMIOP_Profile::decode_endpoints (void)
       const CORBA::Octet *buf =
         tagged_component.component_data.get_buffer ();
 
-      TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf),
+      TAO_InputCDR in_cdr (reinterpret_cast <const char*> (buf),
                            tagged_component.component_data.length ());
 
       // Extract the Byte Order.
       CORBA::Boolean byte_order;
       if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
         return -1;
-      in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
+      in_cdr.reset_byte_order (static_cast<int> (byte_order));
 
       // Extract endpoints sequence.
       TAO::IIOPEndpointSequence endpoints;
@@ -514,6 +509,4 @@ TAO_SHMIOP_Profile::decode_endpoints (void)
   return 0;
 }
 
-
-
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index e7bc47ffe83..b7f367aea82 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -122,10 +122,6 @@ private:
   CORBA::ULong count_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "SHMIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.i b/TAO/tao/Strategies/SHMIOP_Profile.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Profile.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index aaebc6860cf..35ac575d819 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -19,11 +19,6 @@
 #include "tao/GIOP_Message_Base.h"
 #include "tao/GIOP_Message_Lite.h"
 
-
-#if !defined (__ACE_INLINE__)
-# include "SHMIOP_Transport.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$")
 
 TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler,
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index 02c67c63116..a8655d8c1db 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -116,12 +116,6 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
-
-
-#if defined (__ACE_INLINE__)
-#include "SHMIOP_Transport.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.i b/TAO/tao/Strategies/SHMIOP_Transport.i
deleted file mode 100644
index 81bf354f364..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Transport.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-//$Id$
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 5f3401d6ff3..afe3cce5866 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -224,9 +224,6 @@ TAO_UIOP_Acceptor::open (TAO_ORB_Core *orb_core,
 {
   this->orb_core_ = orb_core;
 
-  if (this->init_uiop_properties () != 0)
-    return -1;
-
   if (address == 0)
     return -1;
 
@@ -250,9 +247,6 @@ TAO_UIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 {
   this->orb_core_ = orb_core;
 
-  if (this->init_uiop_properties () != 0)
-    return -1;
-
   if (major >= 0 && minor >= 0)
     this->version_.set_version (static_cast<CORBA::Octet> (major),
                                 static_cast<CORBA::Octet> (minor));
@@ -276,7 +270,6 @@ TAO_UIOP_Acceptor::open_i (const char *rendezvous,
 {
   ACE_NEW_RETURN (this->creation_strategy_,
                   TAO_UIOP_CREATION_STRATEGY (this->orb_core_,
-                                              &(this->uiop_properties_),
                                               this->lite_flag_),
                   -1);
 
@@ -511,54 +504,4 @@ TAO_UIOP_Acceptor::parse_options (const char *str)
   return 0;
 }
 
-int
-TAO_UIOP_Acceptor::init_uiop_properties (void)
-{
-  // @@ Currently (in the code below), we obtain protocol properties from
-  // ORB-level ServerProtocol, even though the policy may
-  // have been overridden on POA level.  That's because currently all
-  // endpoints (acceptors) are global.  Once endpoints become per POA,
-  // the code below will have to be changed to look at the POA-level
-  // ServerProtocol policy first.
-
-  // ServerProtocolProperties policy controls protocols configuration.
-  // Look for protocol properties in the effective
-  // ServerProtocolPolicy.
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // Initialize the settings to the ORB defaults.  If RT CORBA is enabled,
-  // it may override these.
-  int send_buffer_size = this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-  int no_delay = 0;
-  int enable_network_priority = 0;
-
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (tph != 0)
-    {
-      static const char protocol[] = "uiop";
-      const char *protocol_type = protocol;
-
-      int hook_result =
-        tph->call_server_protocols_hook (send_buffer_size,
-                                         recv_buffer_size,
-                                         no_delay,
-                                         enable_network_priority,
-                                         protocol_type);
-
-      if(hook_result == -1)
-        return -1;
-    }
-
-  // Extract and locally store properties of interest.
-  this->uiop_properties_.send_buffer_size =
-    send_buffer_size;
-  this->uiop_properties_.recv_buffer_size =
-   recv_buffer_size;
-
-  return 0;
-}
-
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
index d6feeb9c678..7610ce7f277 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ b/TAO/tao/Strategies/UIOP_Acceptor.h
@@ -133,9 +133,6 @@ private:
 
   /// Should we use GIOP lite??
   const bool lite_flag_;
-
-  /// Properties for all connections accepted by this acceptor.
-  TAO_UIOP_Properties uiop_properties_;
 };
 
 # endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index f3ad70d0fcd..ebe3bb32c4e 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -17,11 +17,7 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Resume_Handle.h"
 #include "tao/Thread_Lane_Resources.h"
-
-#if !defined (__ACE_INLINE__)
-# include "UIOP_Connection_Handler.inl"
-#endif /* ! __ACE_INLINE__ */
-
+#include "tao/Protocols_Hooks.h"
 
 ACE_RCSID (Strategies,
            UIOP_Connection_Handler,
@@ -30,8 +26,7 @@ ACE_RCSID (Strategies,
 
 TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_UIOP_SVC_HANDLER (t, 0 , 0),
-    TAO_Connection_Handler (0),
-    uiop_properties_ (0)
+    TAO_Connection_Handler (0)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -44,15 +39,13 @@ TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t)
 
 TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (
   TAO_ORB_Core *orb_core,
-  CORBA::Boolean flag,
-  void *arg)
+  CORBA::Boolean flag)
   : TAO_UIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    TAO_Connection_Handler (orb_core),
-    uiop_properties_ (static_cast<TAO_UIOP_Properties *> (arg))
+    TAO_Connection_Handler (orb_core)
 {
   TAO_UIOP_Transport* specific_transport = 0;
   ACE_NEW (specific_transport,
-           TAO_UIOP_Transport(this, orb_core, flag));
+           TAO_UIOP_Transport (this, orb_core, flag));
 
   // store this pointer (indirectly increment ref count)
   this->transport (specific_transport);
@@ -73,9 +66,49 @@ TAO_UIOP_Connection_Handler::open_handler (void *v)
 int
 TAO_UIOP_Connection_Handler::open (void*)
 {
+  TAO_UIOP_Protocol_Properties protocol_properties;
+
+  // Initialize values from ORB params.
+  protocol_properties.send_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
+  protocol_properties.recv_buffer_size_ =
+    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
+
+  TAO_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_hooks ();
+
+  bool client =
+    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      if (client)
+        {
+          tph->client_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          tph->server_protocol_properties_at_orb_level (
+            protocol_properties
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
   if (this->set_socket_option (this->peer (),
-                               this->uiop_properties_->send_buffer_size,
-                               this->uiop_properties_->recv_buffer_size) == -1)
+                               protocol_properties.send_buffer_size_,
+                               protocol_properties.recv_buffer_size_) == -1)
     return -1;
 
   if (this->transport ()->wait_strategy ()->non_blocking ())
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h
index 8dd9459919d..ca14c8aeb4a 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h
@@ -37,20 +37,6 @@
 // Forward Decls
 class TAO_Pluggable_Messaging;
 
-/**
- * @class TAO_UIOP_Properties
- *
- * @brief Unix Domain Sockets protocol properties specification for a
- *  set of connections.
- */
-class TAO_Strategies_Export TAO_UIOP_Properties
-{
-public:
-
-  int send_buffer_size;
-  int recv_buffer_size;
-};
-
 // ****************************************************************
 
 /**
@@ -69,17 +55,13 @@ public:
 
   TAO_UIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
-  /// Constructor. <arg> parameter is used by the Acceptor to pass the
-  /// protocol configuration properties for this connection.
+  /// Constructor.
   TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag,
-                               void *arg);
-
+                               CORBA::Boolean flag);
 
   /// Destructor.
   ~TAO_UIOP_Connection_Handler (void);
 
-
   //@{
   /**
    * Connection_Handler overloads
@@ -108,7 +90,6 @@ public:
   /// Add ourselves to Cache.
   int add_transport_to_cache (void);
 
-
 protected:
 
   //@{
@@ -117,19 +98,8 @@ protected:
    */
   virtual int release_os_resources (void);
   //@}
-
-private:
-
-  /// TCP configuration for this connection.
-  TAO_UIOP_Properties *uiop_properties_;
 };
 
-
-
-#if defined (__ACE_INLINE__)
-#include "UIOP_Connection_Handler.inl"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.inl b/TAO/tao/Strategies/UIOP_Connection_Handler.inl
deleted file mode 100644
index 7f2b3228624..00000000000
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.inl
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 9d1b9692ad9..9258c6ddf11 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -68,9 +68,6 @@ TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
   if (this->create_connect_strategy () == -1)
     return -1;
 
-  if (this->init_uiop_properties () != 0)
-    return -1;
-
   // Our connect creation strategy
   TAO_UIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
 
@@ -78,7 +75,6 @@ TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
                   TAO_UIOP_CONNECT_CREATION_STRATEGY
                       (orb_core->thr_mgr (),
                        orb_core,
-                       &(this->uiop_properties_),
                        this->lite_flag_),
                   -1);
 
@@ -105,7 +101,37 @@ TAO_UIOP_Connector::close (void)
   return this->base_connector_.close ();
 }
 
+TAO_Profile *
+TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len
+                                   ACE_ENV_ARG_DECL)
+{
+  if (this->check_prefix (str) != 0)
+    return 0;
 
+  const char *separator = ACE_OS::strchr (str,'|');
+  if (separator == 0)
+    {
+      if (TAO_debug_level)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) TAO_UIOP_CONNECTOR::corbaloc_scan error: "
+                    "explicit terminating charactor '|' is missing from <%s>",
+                    str));
+      return 0;
+    }
+  if (*(separator+1) != ',' && *(separator+1) != '/')
+    {
+      if (TAO_debug_level)
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) TAO_UIOP_CONNECTOR::corbaloc_scan warning: "
+                    "terminating charactor '|' should be followed by a ','"
+                    "or a '/' in <%s>",
+                    str));
+    }
+  len = (separator - str) + 1;
+  return this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+               
 int
 TAO_UIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 {
@@ -375,51 +401,6 @@ TAO_UIOP_Connector::object_key_delimiter (void) const
   return TAO_UIOP_Profile::object_key_delimiter_;
 }
 
-int
-TAO_UIOP_Connector::init_uiop_properties (void)
-{
-  // Connector protocol properties are obtained from ORB-level
-  // RTCORBA::ClientProtocolProperties policy override.
-  // If the override doesn't exist or doesn't contain the
-  // properties, we use ORB default.
-  //
-  // Currently, we do not use Object-level and Current-level policy
-  // overrides for protocol configuration because connection
-  // lookup and caching are not done based on protocol
-  // properties.
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  int send_buffer_size = this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-  int no_delay = 0;
-  int enable_network_priority = 0;
-
-  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (tph != 0)
-    {
-      static const char protocol[] = "uiop";
-      const char *protocol_type = protocol;
-      const int hook_result =
-        tph->call_client_protocols_hook (send_buffer_size,
-                                         recv_buffer_size,
-                                         no_delay,
-                                         enable_network_priority,
-                                         protocol_type);
-
-      if(hook_result == -1)
-        return -1;
-    }
-
-    // Extract and locally store properties of interest.
-    this->uiop_properties_.send_buffer_size = send_buffer_size;
-    this->uiop_properties_.recv_buffer_size = recv_buffer_size;
-
-  return 0;
-}
-
 TAO_UIOP_Endpoint *
 TAO_UIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
 {
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index ba23060bd9d..e53b09b3295 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -35,7 +35,6 @@
 #include "tao/Resource_Factory.h"
 #include "tao/Connector_Impl.h"
 
-
 class TAO_UIOP_Endpoint;
 class TAO_Endpoint;
 
@@ -72,6 +71,9 @@ public:
 
   virtual int check_prefix (const char *endpoint);
 
+  virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len
+                                      ACE_ENV_ARG_DECL);
+  
   virtual char object_key_delimiter (void) const;
 
   /// Cancel the passed cvs handler from the connector
@@ -110,9 +112,6 @@ protected:
 
   virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Obtains uiop properties that must be used by this connector, i.e.,
-  /// initializes <uiop_properties_>.
-  int init_uiop_properties (void);
   //@}
 
 private:
@@ -130,10 +129,6 @@ private:
 
   /// Do we need to use a GIOP_Lite for sending messages?
   const bool lite_flag_;
-
-  /// UIOP configuration properties for all connections established by
-  /// this connector.
-  TAO_UIOP_Properties uiop_properties_;
 };
 
 # endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.i b/TAO/tao/Strategies/UIOP_Endpoint.i
index b89b850aacf..337bbae6a76 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.i
+++ b/TAO/tao/Strategies/UIOP_Endpoint.i
@@ -16,5 +16,4 @@ TAO_UIOP_Endpoint::rendezvous_point (void) const
   return this->object_addr_.get_path_name ();
 }
 
-
 #endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 7a24e0745e1..a04757d7225 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -12,17 +12,12 @@
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
-
+#include "ace/os_include/os_ctype.h"
 
 ACE_RCSID (Strategies,
            UIOP_Profile,
            "$Id$")
 
-
-#if !defined (__ACE_INLINE__)
-# include "UIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 static const char prefix_[] = "uiop";
 
 const char TAO_UIOP_Profile::object_key_delimiter_ = '|';
@@ -101,6 +96,43 @@ void
 TAO_UIOP_Profile::parse_string_i (const char *string
                                   ACE_ENV_ARG_DECL)
 {
+  if (!string || !*string)
+    {
+      ACE_THROW (CORBA::INV_OBJREF (
+                   CORBA::SystemException::_tao_minor_code (
+                     0,
+                     EINVAL),
+                   CORBA::COMPLETED_NO));
+    }
+
+  // Remove the "N.n@" version prefix, if it exists, and verify the
+  // version is one that we accept.
+
+  // Check for version
+  if (isdigit (string [0]) &&
+      string[1] == '.' &&
+      isdigit (string [2]) &&
+      string[3] == '@')
+    {
+      // @@ This may fail for non-ascii character sets [but take that
+      // with a grain of salt]
+      this->version_.set_version ((char) (string [0] - '0'),
+                                  (char) (string [2] - '0'));
+      string += 4;
+      // Skip over the "N.n@"
+    }
+
+  if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
+      this->version_.minor  > TAO_DEF_GIOP_MINOR)
+    {
+      ACE_THROW (CORBA::INV_OBJREF (
+                   CORBA::SystemException::_tao_minor_code (
+                     0,
+                     EINVAL),
+                   CORBA::COMPLETED_NO));
+    }
+
+
   // Pull off the "rendezvous point" part of the objref
   // Copy the string because we are going to modify it...
   CORBA::String_var copy (string);
@@ -148,7 +180,7 @@ CORBA::Boolean
 TAO_UIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 {
   const TAO_UIOP_Profile *op =
-    ACE_dynamic_cast (const TAO_UIOP_Profile *, other_profile);
+    dynamic_cast <const TAO_UIOP_Profile *> (other_profile);
 
   if (op == 0)
     return 0;
@@ -356,14 +388,14 @@ TAO_UIOP_Profile::decode_endpoints (void)
       const CORBA::Octet *buf =
         tagged_component.component_data.get_buffer ();
 
-      TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf),
+      TAO_InputCDR in_cdr (reinterpret_cast <const char*>(buf),
                            tagged_component.component_data.length ());
 
       // Extract the Byte Order.
       CORBA::Boolean byte_order;
       if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
         return -1;
-      in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
+      in_cdr.reset_byte_order (static_cast<int>(byte_order));
 
       // Extract endpoints sequence.
       TAO_UIOPEndpointSequence endpoints;
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index 008e4650edb..069c5105965 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -120,10 +120,6 @@ private:
   CORBA::ULong count_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "UIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 # endif  /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Profile.i b/TAO/tao/Strategies/UIOP_Profile.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/tao/Strategies/UIOP_Profile.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index 9170a538447..936d3bfbc22 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -17,15 +17,10 @@
 #include "tao/GIOP_Message_Base.h"
 #include "tao/GIOP_Message_Lite.h"
 
-#if !defined (__ACE_INLINE__)
-# include "UIOP_Transport.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID (Strategies,
            UIOP_Transport,
            "$Id$")
 
-
 TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
                                         TAO_ORB_Core *orb_core,
                                         CORBA::Boolean flag)
diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h
index 3fcdafbc21e..aefcb26ecbc 100644
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ b/TAO/tao/Strategies/UIOP_Transport.h
@@ -110,12 +110,6 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
-
-
-#if defined (__ACE_INLINE__)
-#include "UIOP_Transport.i"
-#endif /* __ACE_INLINE__ */
-
 # endif  /* TAO_HAS_UIOP == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Strategies/UIOP_Transport.i b/TAO/tao/Strategies/UIOP_Transport.i
deleted file mode 100644
index 81bf354f364..00000000000
--- a/TAO/tao/Strategies/UIOP_Transport.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-//$Id$
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 6de37510307..8f33d43c0a7 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -1,11 +1,7 @@
 // $Id$
-
+#include "ace/Service_Config.h"
 #include "advanced_resource.h"
 
-#if !defined (__ACE_INLINE__)
-# include "advanced_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
 #include "UIOP_Factory.h"
 #include "SHMIOP_Factory.h"
 #include "DIOP_Factory.h"
@@ -23,14 +19,13 @@
 #include "tao/LF_Follower.h"
 #include "tao/Leader_Follower.h"
 #include "tao/StringSeqC.h"
+#include "tao/ORB_Core.h"
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Service_Config.h"
 #include "ace/Select_Reactor.h"
-#include "ace/FlReactor.h"
-#include "ace/TkReactor.h"
 #include "ace/WFMO_Reactor.h"
 #include "ace/Msg_WFMO_Reactor.h"
 #include "ace/TP_Reactor.h"
@@ -43,6 +38,7 @@ ACE_RCSID(Strategies, advanced_resource, "$Id$")
 
 TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 {
+
   TAO_ORB_Core::set_resource_factory ("Advanced_Resource_Factory");
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_Advanced_Resource_Factory);
 
@@ -104,6 +100,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
   }
   this->options_processed_ = 1;
 
+
   // If the default resource factory exists, then disable it.
   // This causes any directives for the "Resource_Factory" to
   // report warnings.
@@ -154,19 +151,6 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
                                        ACE_TEXT("select_st")) == 0)
             this->reactor_type_ = TAO_REACTOR_SELECT_ST;
           else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("fl")) == 0)
-#if defined(ACE_HAS_FL)
-            this->reactor_type_ = TAO_REACTOR_FL;
-#else
-            this->report_unsupported_error (ACE_TEXT("FlReactor"));
-#endif /* ACE_HAS_FL */
-          else if (ACE_OS::strcasecmp (current_arg, ACE_TEXT("tk_reactor")) == 0)
-#if defined(ACE_HAS_TK)
-            this->reactor_type_ = TAO_REACTOR_TK;
-#else
-            this->report_unsupported_error (ACE_TEXT("TkReactor"));
-#endif /* ACE_HAS_TK */
-          else if (ACE_OS::strcasecmp (current_arg,
                                        ACE_TEXT("wfmo")) == 0)
 #if defined(ACE_WIN32)
             this->reactor_type_ = TAO_REACTOR_WFMO;
@@ -184,6 +168,16 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
           else if (ACE_OS::strcasecmp (current_arg,
                                        ACE_TEXT("tp")) == 0)
             this->reactor_type_ = TAO_REACTOR_TP;
+          else if (ACE_OS::strcasecmp (current_arg,
+                                       ACE_TEXT("fl")) == 0)
+            this->report_option_value_error (
+                ACE_TEXT("FlReactor not supported by Advanced_Resources_Factory. Please use TAO_FlResource_Loader instead."),
+                         current_arg);
+          else if (ACE_OS::strcasecmp (current_arg,
+                                       ACE_TEXT("tk")) == 0)
+            this->report_option_value_error (
+                ACE_TEXT("TkReactor not supported by Advanced_Resources_Factory. Please use TAO_TkResource_Loader instead."),
+                         current_arg);
           else
             this->report_option_value_error (ACE_TEXT("-ORBReactorType"), current_arg);
 
@@ -280,7 +274,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Advanced_Resource_Factory: -ORBReactorThreadQueue ")
                 ACE_TEXT ("option can only be used with -ORBReactorType ")
-                ACE_TEXT ("tp (default).\n")));
+                ACE_TEXT ("tp.\n")));
   // Explicitely set the default only if not set.
   else if (this->threadqueue_type_ == TAO_THREAD_QUEUE_NOT_SET)
     this->threadqueue_type_ = TAO_THREAD_QUEUE_LIFO;
@@ -309,6 +303,7 @@ TAO_Advanced_Resource_Factory::load_default_protocols (void)
 int
 TAO_Advanced_Resource_Factory::init_protocol_factories (void)
 {
+
   // If the default resource factory exists, then disable it.
   // This causes any directives for the "Resource_Factory" to
   // report warnings.
@@ -622,6 +617,8 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
  return 0;
 }
 
+
+
 TAO_ProtocolFactorySet *
 TAO_Advanced_Resource_Factory::get_protocol_factories (void)
 {
@@ -654,18 +651,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
                       0);
       break;
 
-    case TAO_REACTOR_FL:
-#if defined(ACE_HAS_FL)
-      ACE_NEW_RETURN (impl, ACE_FlReactor, 0);
-#endif /* ACE_HAS_FL */
-      break;
-
-    case TAO_REACTOR_TK:
-#if defined(ACE_HAS_TK)
-      ACE_NEW_RETURN (impl, ACE_TkReactor, 0);
-#endif /* ACE_HAS_TK */
-      break;
-
     case TAO_REACTOR_WFMO:
 #if defined(ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
       ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0);
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index 656b1d84816..17c1279003c 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -11,7 +11,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #include "tao/ORB_Core.h"
 
 class TAO_Connection_Purging_Strategy;
@@ -31,6 +30,7 @@ public:
  * factory can return resource instances which are, e.g., global,
  * stored in thread-specific storage, stored in shared memory,
  * etc.
+ *
  */
 class TAO_Strategies_Export TAO_Advanced_Resource_Factory : public TAO_Default_Resource_Factory
 {
@@ -57,15 +57,13 @@ public:
   enum
   {
     /// Use ACE_Token
-    TAO_REACTOR_SELECT_MT,
+    TAO_REACTOR_SELECT_MT = 1,
 
     /// Use ACE_Noop_Token
-    TAO_REACTOR_SELECT_ST,
-    TAO_REACTOR_FL,
-    TAO_REACTOR_TK,
-    TAO_REACTOR_WFMO,
-    TAO_REACTOR_MSGWFMO,
-    TAO_REACTOR_TP
+    TAO_REACTOR_SELECT_ST = 2,
+    TAO_REACTOR_WFMO      = 3,
+    TAO_REACTOR_MSGWFMO   = 4,
+    TAO_REACTOR_TP        = 5
   };
 
   /// Thread queueing Strategy
@@ -134,10 +132,6 @@ protected:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "advanced_resource.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_Advanced_Resource_Factory)
 ACE_FACTORY_DECLARE (TAO_Strategies, TAO_Advanced_Resource_Factory)
 
diff --git a/TAO/tao/Strategies/advanced_resource.i b/TAO/tao/Strategies/advanced_resource.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Strategies/advanced_resource.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Strategies/sciop_endpoints.h b/TAO/tao/Strategies/sciop_endpoints.h
index 3d4ebdc5b93..96f0bbf95da 100644
--- a/TAO/tao/Strategies/sciop_endpoints.h
+++ b/TAO/tao/Strategies/sciop_endpoints.h
@@ -47,10 +47,7 @@ class TAO_SCIOP_Endpoint_Info_var;
 
 struct TAO_Strategies_Export TAO_SCIOP_Endpoint_Info
 {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_SCIOP_Endpoint_Info_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
 
   static void _tao_any_destructor (void*);
 
@@ -134,10 +131,7 @@ public:
   ~TAO_SCIOPEndpointSequence (void);
   static void _tao_any_destructor (void*);
 
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_SCIOPEndpointSequence_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
 };
 
 #endif /* end #if !defined */
diff --git a/TAO/tao/Strategies/uiop_endpoints.h b/TAO/tao/Strategies/uiop_endpoints.h
index 2520396fc5a..78c78caccd1 100644
--- a/TAO/tao/Strategies/uiop_endpoints.h
+++ b/TAO/tao/Strategies/uiop_endpoints.h
@@ -49,10 +49,7 @@ class TAO_UIOP_Endpoint_Info_var;
 
 struct TAO_Strategies_Export TAO_UIOP_Endpoint_Info
 {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_UIOP_Endpoint_Info_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
 
   static void _tao_any_destructor (void*);
 
@@ -135,10 +132,7 @@ public:
   ~TAO_UIOPEndpointSequence (void);
   static void _tao_any_destructor (void*);
 
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_UIOPEndpointSequence_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
 };
 
 #endif /* end #if !defined */
diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl
index d1ca2e3b097..92f8fc2d879 100644
--- a/TAO/tao/StringSeq.pidl
+++ b/TAO/tao/StringSeq.pidl
@@ -14,8 +14,6 @@
 //          -Wb,post_include="ace/post.h"
 //          StringSeq.pidl
 //
-//   Patches for changes to the generated code are available in the
-//   `diffs' directory.
 // ================================================================
 
 
diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp
index a3e9ca18a58..846debd86bb 100644
--- a/TAO/tao/StringSeqA.cpp
+++ b/TAO/tao/StringSeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "StringSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_StringSeq[] =
 {
@@ -62,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (
     sizeof (_oc_CORBA_StringSeq),
     (char *) &_oc_CORBA_StringSeq,
     0,
-    sizeof (CORBA::StringSeq)
+    0
   );
 
 namespace CORBA
@@ -72,7 +74,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -129,8 +131,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -145,4 +145,4 @@ CORBA::Boolean operator>>= (
         CORBA::StringSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 10ff244c508..4fde6dfa205 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "StringSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "StringSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_STRINGSEQ_CS_)
 #define _CORBA_STRINGSEQ_CS_
@@ -98,7 +97,7 @@ void CORBA::StringSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_StringSeq_CPP_
 #define _TAO_CDR_OP_CORBA_StringSeq_CPP_
@@ -171,7 +170,7 @@ return 0;
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -216,4 +215,3 @@ return 0;
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index 69ad64c2a3f..78a6e5d5608 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_STRINGSEQC_H_
 #define _TAO_IDL_ORIG_STRINGSEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -59,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_STRINGSEQ_CH_)
 #define _CORBA_STRINGSEQ_CH_
@@ -122,17 +121,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -140,7 +139,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
@@ -148,7 +147,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_StringSeq_H_
 #define _TAO_CDR_OP_CORBA_StringSeq_H_
@@ -165,13 +164,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "StringSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -183,3 +182,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/StringSeqS.h b/TAO/tao/StringSeqS.h
index 5a31faeb7ff..ab0335d7429 100644
--- a/TAO/tao/StringSeqS.h
+++ b/TAO/tao/StringSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_STRINGSEQS_H_
 #define _TAO_IDL_ORIG_STRINGSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index eedc383446b..95a9634eb1f 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -469,73 +469,70 @@ private:
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
+// Some policies can only be set locally on the client, while others
+// can only be exported in the IOR by the server, and yet others can
+// be set by both by client and server.  Furthermore, reconciliation
+// between client-set values and the ones exported in the IOR is
+// policy-specific.  Therefore, with the current state of things, it
+// isn't possible to write generic code for <get_policy> that will
+// work for any policy type.  Currently, we take specific action for
+// each of the known client-exposed policies (above), and simply look
+// up effective override for any other policy type (below).  Later, if
+// there is a need/desire for generic code, it can be done by pushing
+// the smarts into the policies implementations, and will involve
+// modifying PolicyC* and friends, e.g., to add methods for policy
+// specific reconciliation, etc.
+
 CORBA::Policy_ptr
 TAO_Stub::get_policy (CORBA::PolicyType type
                       ACE_ENV_ARG_DECL)
 {
-  // Some policies can only be set locally on the client, while others
-  // can only be exported in the IOR by the server, and yet others can
-  // be set by both by client and server.  Furthermore, reconciliation
-  // between client-set values and the ones exported in the IOR is
-  // policy-specific.  Therefore, with the current state of things, it
-  // isn't possible to write generic code for <get_policy> that will
-  // work for any policy type.
-  // Currently, we take specific action
-  // for each of the known client-exposed policies (above), and simply
-  // look up effective override for any other policy type (below).
-  // Later, if there is a need/desire for generic code, it can be
-  // done by pushing the smarts into the policies
-  // implementations, and will involve modifying PolicyC* and friends,
-  // e.g., to add methods for policy specific reconciliation, etc.
-
-  return this->get_client_policy (type
-                                  ACE_ENV_ARG_PARAMETER);
+  // No need to lock, the stub only changes its policies at
+  // construction time...
+
+  CORBA::Policy_var result;
+  if (this->policies_ != 0)
+    {
+      result =
+        this->policies_->get_policy (type
+                                     ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK (CORBA::Policy::_nil ());
+    }
+
+  if (CORBA::is_nil (result.in ()))
+    {
+      result =
+        this->orb_core_->get_policy_including_current (type
+                                                       ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK (CORBA::Policy::_nil ());
+    }
+
+  return result._retn ();
 }
 
 CORBA::Policy_ptr
-TAO_Stub::get_client_policy (CORBA::PolicyType type
+TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type
                              ACE_ENV_ARG_DECL)
 {
   // No need to lock, the stub only changes its policies at
   // construction time...
 
-
   CORBA::Policy_var result;
   if (this->policies_ != 0)
     {
-      result = this->policies_->get_policy (type
+      result =
+        this->policies_->get_cached_policy (type
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
 
-  if (CORBA::is_nil (result.in ()))
-    {
-      TAO_Policy_Current &policy_current = this->orb_core_->policy_current ();
-      result = policy_current.get_policy (type
-                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
 
-  if (CORBA::is_nil (result.in ()))
-    {
-      // @@ Must lock, but is is harder to implement than just modifying
-      //    this call: the ORB does take a lock to modify the policy
-      //    manager
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        {
-          result = policy_manager->get_policy (type
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-        }
     }
 
   if (CORBA::is_nil (result.in ()))
     {
-      result = this->orb_core_->
-              get_default_policies ()->get_policy (type
-                                                    ACE_ENV_ARG_PARAMETER);
+      result =
+        this->orb_core_->get_cached_policy_including_current (type
+                                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -555,14 +552,14 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
     {
       policy_manager->set_policy_overrides (policies,
                                             set_add
-                                             ACE_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else if (this->policies_ == 0)
     {
       policy_manager->set_policy_overrides (policies,
                                             CORBA::SET_OVERRIDE
-                                             ACE_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
@@ -573,13 +570,13 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 
       policy_manager->set_policy_overrides (policies,
                                             set_add
-                                             ACE_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (),
                                                  this->base_profiles_
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   stub->policies_ = policy_manager.release ();
@@ -624,169 +621,6 @@ TAO_Stub::sync_strategy (void)
   return this->orb_core_->transport_sync_strategy ();
 }
 
-#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-
-CORBA::Policy_ptr
-TAO_Stub::relative_roundtrip_timeout (void)
-{
-  CORBA::Policy_var p;
-
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-  if (this->policies_ != 0)
-    p = this->policies_->get_cached_policy (
-          TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
-
-  // No need to lock, the object is in TSS storage....
-  if (CORBA::is_nil (p.in ()))
-    {
-      TAO_Policy_Current &policy_current =
-        this->orb_core_->policy_current ();
-      p = policy_current.get_cached_policy (
-            TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
-    }
-
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
-  if (CORBA::is_nil (p.in ()))
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        p = policy_manager->get_cached_policy (
-              TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
-    }
-
-  if (CORBA::is_nil (p.in ()))
-    p = this->orb_core_->get_default_policies ()->get_cached_policy (
-          TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT);
-
-  return p._retn ();
-}
-
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-
-CORBA::Policy_ptr
-TAO_Stub::sync_scope (void)
-{
-  CORBA::Policy_var p;
-
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-  if (this->policies_ != 0)
-    p = this->policies_->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE);
-
-  // If there are no cached policies, look at the thread or ORB level
-  // for the policy.
-  if (CORBA::is_nil (p.in ()))
-    p = this->orb_core_->stubless_sync_scope ();
-
-  return p._retn ();
-}
-
-#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
-
-
-#if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
-CORBA::Policy_ptr
-TAO_Stub::connection_timeout (void)
-{
-  CORBA::Policy_var p;
-
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-  if (this->policies_ != 0)
-    p = this->policies_->get_cached_policy (
-          TAO_CACHED_POLICY_CONNECTION_TIMEOUT);
-
-  // No need to lock, the object is in TSS storage....
-  if (CORBA::is_nil (p.in ()))
-    {
-      TAO_Policy_Current &policy_current =
-        this->orb_core_->policy_current ();
-      p = policy_current.get_cached_policy (
-            TAO_CACHED_POLICY_CONNECTION_TIMEOUT);
-    }
-
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
-  if (CORBA::is_nil (p.in ()))
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        p = policy_manager->get_cached_policy (
-              TAO_CACHED_POLICY_CONNECTION_TIMEOUT);
-    }
-
-  if (CORBA::is_nil (p.in ()))
-    p = this->orb_core_->get_default_policies ()->get_cached_policy (
-          TAO_CACHED_POLICY_CONNECTION_TIMEOUT);
-
-  return p._retn ();
-}
-
-#endif /* TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1 */
-
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-CORBA::Policy_ptr
-TAO_Stub::buffering_constraint (void)
-{
-  CORBA::Policy_var p;
-
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-
-  if (this->policies_ != 0)
-    {
-      p =
-        this->policies_->get_cached_policy (
-          TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
-    }
-
-  // No need to lock, the object is in TSS storage....
-  if (CORBA::is_nil (p.in ()))
-    {
-      TAO_Policy_Current &policy_current =
-        this->orb_core_->policy_current ();
-
-      p =
-        policy_current.get_cached_policy (
-          TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
-    }
-
-  // @@ Must lock, but is is harder to implement than just modifying
-  //    this call: the ORB does take a lock to modify the policy
-  //    manager
-  if (CORBA::is_nil (p.in ()))
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        {
-          p =
-            policy_manager->get_cached_policy (
-              TAO_CACHED_POLICY_BUFFERING_CONSTRAINT);
-        }
-    }
-
-  if (CORBA::is_nil (p.in ()))
-    p = this->orb_core_->default_buffering_constraint ();
-
-  return p._retn ();
-}
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 45fb155b548..e75e1024816 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -77,56 +77,21 @@ public:
    * types.
    */
   virtual CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        ACE_ENV_ARG_DECL);
 
-
-  virtual CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type
-                                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
+                                               ACE_ENV_ARG_DECL);
 
   virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
                                           CORBA::SetOverrideType set_add
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          ACE_ENV_ARG_DECL);
 
-  virtual CORBA::PolicyList * get_policy_overrides (
+  virtual CORBA::PolicyList *get_policy_overrides (
     const CORBA::PolicyTypeSeq & types
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
-
-  // = Methods for obtaining effective overrides.
-  //
-  //   Same functionality as <get_client_policy>, but more efficient.
-  //   Each of the methods below returns effective override for the
-  //   corresponding policy.  The effective override is obtained by
-  //   first checking for an override of the given policy type at the
-  //   Object scope, then at the Current scope, then at the ORB scope,
-  //   and, finally, ORB default values are checked.
-
-#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-
-  CORBA::Policy_ptr relative_roundtrip_timeout (void);
-
-#endif  /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-
-  CORBA::Policy_ptr sync_scope (void);
-
-#endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-  CORBA::Policy_ptr buffering_constraint (void);
-
-#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-#if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
-
-  CORBA::Policy_ptr connection_timeout (void);
-
-#endif  /* TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1 */
-
   /// Return the sync strategy to be used in by the transport.
   /// Selection will be based on the SyncScope policies.
   TAO_Sync_Strategy &sync_strategy (void);
diff --git a/TAO/tao/Sync_Strategies.cpp b/TAO/tao/Sync_Strategies.cpp
index 994f9ff0fb9..4ef50337355 100644
--- a/TAO/tao/Sync_Strategies.cpp
+++ b/TAO/tao/Sync_Strategies.cpp
@@ -8,10 +8,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_time.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/Sync_Strategies.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            Sync_Strategies,
            "$Id$")
@@ -66,17 +62,33 @@ TAO_Eager_Buffering_Sync_Strategy::buffering_constraints_reached (
   must_flush = 0;
   set_timer = 0;
 
-  CORBA::Policy_var bcp_policy = stub->buffering_constraint ();
-  TAO::BufferingConstraintPolicy_var bcp =
-    TAO::BufferingConstraintPolicy::_narrow (bcp_policy.in());
-
-  TAO_Buffering_Constraint_Policy *buffering_constraint_policy =
-    dynamic_cast<TAO_Buffering_Constraint_Policy *> (bcp.in ());
+  TAO_Buffering_Constraint_Policy *buffering_constraint_policy = 0;
 
-  if (buffering_constraint_policy == 0)
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::Policy_var bcp_policy =
+        stub->get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT
+                                 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      TAO::BufferingConstraintPolicy_var bcp =
+        TAO::BufferingConstraintPolicy::_narrow (bcp_policy.in ()
+                                                 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      buffering_constraint_policy =
+        dynamic_cast<TAO_Buffering_Constraint_Policy *> (bcp.in ());
+
+      if (buffering_constraint_policy == 0)
+        {
+          return 1;
+        }
+    }
+  ACE_CATCHANY
     {
       return 1;
     }
+  ACE_ENDTRY;
 
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint_policy->get_buffering_constraint (buffering_constraint);
diff --git a/TAO/tao/Sync_Strategies.h b/TAO/tao/Sync_Strategies.h
index 141620f1215..da20530bb0a 100644
--- a/TAO/tao/Sync_Strategies.h
+++ b/TAO/tao/Sync_Strategies.h
@@ -145,7 +145,7 @@ private:
 /**
  * If the queue is empty the transport will try to send immediately.
  */
-class TAO_Export TAO_Delayed_Buffering_Sync_Strategy 
+class TAO_Export TAO_Delayed_Buffering_Sync_Strategy
   : public TAO_Eager_Buffering_Sync_Strategy
 {
 public:
@@ -154,10 +154,6 @@ public:
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
-#if defined (__ACE_INLINE__)
-# include "tao/Sync_Strategies.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_SYNC_STRATEGIES_H */
diff --git a/TAO/tao/Sync_Strategies.i b/TAO/tao/Sync_Strategies.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/tao/Sync_Strategies.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index b6e08c6d4eb..fef4a9676e6 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -56,42 +56,8 @@ namespace TAO
     this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
-    TAO_OutputCDR &cdr =
-      this->resolver_.transport ()->out_stream ();
-
     Invocation_Status s = TAO_INVOKE_FAILURE;
 
-    this->write_header (tspec,
-                        cdr
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (s);
-
-    this->marshal_data (cdr
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (s);
-
-
-    // Register a reply dispatcher for this invocation. Use the
-    // preallocated reply dispatcher.
-    TAO_Bind_Dispatcher_Guard dispatch_guard (
-         this->details_.request_id (),
-         &rd,
-         this->resolver_.transport ()->tms ());
-
-    if (dispatch_guard.status () != 0)
-      {
-        // @@ What is the right way to handle this error? Why should
-        // we close the connection?
-        this->resolver_.transport ()->close_connection ();
-
-        ACE_THROW_RETURN (
-            CORBA::INTERNAL (
-                0,
-                CORBA::COMPLETED_NO),
-            s);
-      }
-
-
 #if TAO_HAS_INTERCEPTORS == 1
     // Start the interception point here..
     s =
@@ -102,13 +68,46 @@ namespace TAO
       return s;
 #endif /*TAO_HAS_INTERCEPTORS */
 
-    countdown.update ();
-
     // We have started the interception flow. We need to call the
     // ending interception flow if things go wrong. The purpose of the
     // try block is to do just this.
     ACE_TRY
       {
+        TAO_OutputCDR &cdr =
+          this->resolver_.transport ()->out_stream ();
+
+        this->write_header (tspec,
+                            cdr
+                            ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN (s);
+
+        this->marshal_data (cdr
+                            ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN (s);
+
+
+        // Register a reply dispatcher for this invocation. Use the
+        // preallocated reply dispatcher.
+        TAO_Bind_Dispatcher_Guard dispatch_guard (
+          this->details_.request_id (),
+          &rd,
+          this->resolver_.transport ()->tms ());
+
+        if (dispatch_guard.status () != 0)
+          {
+            // @@ What is the right way to handle this error? Why should
+            // we close the connection?
+            this->resolver_.transport ()->close_connection ();
+
+            ACE_THROW_RETURN (
+              CORBA::INTERNAL (
+                               0,
+                               CORBA::COMPLETED_NO),
+              s);
+          }
+
+        countdown.update ();
+
         s = this->send_message (cdr,
                                 TAO_Transport::TAO_TWOWAY_REQUEST,
                                 max_wait_time
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index fcef1f108db..165f09e3bca 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -511,7 +511,7 @@ CORBA::SystemException::_tao_get_omg_exception_description (
     {
       "Unlisted user exception received by client.",    // 1
       "Non-standard SystemException not supported.",    // 2
-      "An unkown user exception received by a portable interceptor." // 3
+      "An unknown user exception received by a portable interceptor." // 3
     };
 
   static const char *BAD_PARAM_TABLE[] =
@@ -532,7 +532,7 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "Invalid object id passed to POA::create_reference_by_id.",  // 14
       "Bad name argument in TypeCode operation.",                  // 15
       "Bad RepositoryId argument in TypeCode operation.",          // 16
-      "Invalid member namein TypeCode operation.",                 // 17
+      "Invalid member name in TypeCode operation.",                 // 17
       "Duplicate label value in create_union_tc.",                 // 18
       "Incompatible TypeCode of label and discriminator in create_union_tc.", // 19
       "Supplied discriminator type illegitimate in create_union_tc.", // 20
@@ -554,9 +554,11 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "Illegal IDL property search string.",  // 36
       "Illegal IDL context name.",            // 37
       "Non-empty IDL context.",               // 38
-      "Servant not found [ServantManager].",  // 39
+      "Unsupported RMI/IDL customer value type stream format.",  // 39
       "ORB output stream does not support ValueOutputStream interface.", // 40
-      "ORB input stream does not support ValueInputStream interface."    // 41
+      "ORB input stream does not support ValueInputStream interface.",    // 41
+      "Character support limited to ISO 8859-1 for this object reference", // 42
+      "Attempt to add a Pollable to a second PollableSet."
     };
 
   static const char *IMP_LIMIT_TABLE[] =
@@ -583,8 +585,11 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "NVList passed to ServerRequest::arguments does not describe all parameters passed by client.", // 3
       "Attempt to marshal Local object.", // 4
       "wchar or wstring data erroneously sent by client over GIOP 1.0 connection.", // 5
-      "wchar or wstring data erroneously returned by server over GIOP 1.0 connection." //6
-      "Unsupported RMI/IDL custom value type stream format." // 7
+      "wchar or wstring data erroneously returned by server over GIOP 1.0 connection.", //6
+      "Unsupported RMI/IDL custom value type stream format.", // 7
+      "Custom data not compatible with ValueHandler read operation.", // 8
+      "Codeset service contexts with different values recieved on the same connection." // 9
+
     };
 
   static const char *BAD_TYPECODE_TABLE[] =
@@ -602,7 +607,8 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "Attempt to use DII on Local object.",        // 4
       "Biomolecular Sequence Analysis iterator cannot be reset.",         // 5
       "Biomolecular Sequence Analysis metadata is not available as XML.", // 6
-      "Genomic Maps iterator cannot be rest."       // 7
+      "Genomic Maps iterator cannot be rest.",       // 7
+      "Operation not implemented in local object"   // 8
     };
 
   static const char *NO_RESOURCE_TABLE[] =
@@ -621,7 +627,7 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "Attempt to set a servant manager after one has already been set.", // 6
       "ServerRequest::arguments called more than once or after a call to ServerRequest::set_exception.", // 7
       "ServerRequest::ctx called more than once or before ServerRequest::arguments or after ServerRequest::ctx, ServerRequest::set_result or ServerRequest::set_exception.", // 8
-      "ServerRequest::result called more than once or before ServerRequest::arguments or after ServerRequest::set_result or ServerRequest::set_exception.", // 9
+      "ServerRequest::set_result called more than once or before ServerRequest::arguments or after ServerRequest::set_result or ServerRequest::set_exception.", // 9
       "Attempt to send a DII request after it was sent previously.", // 10
       "Attempt to poll a DII request or to retrieve its result before the request was sent.", // 11
       "Attempt to poll a DII request or to retrieve its result after the result was retrieved previously.", // 12
@@ -629,12 +635,22 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "Invalid portable interceptor call",                 // 14
       "Service context add failed in portable interceptor because a service context with the given id already exists.", // 15
       "Registration of PolicyFactory failed because a factory already exists for the given type.", // 16
-      "POA cannot create POAs while undergoing destruction." // 17
+      "POA cannot create POAs while undergoing destruction.", // 17
+      "Attempt to reassign priority.", // 18
+      "An OTS/XA integration xa_start call returned XAER_OUTSIDE.", // 19
+      "An OTS/XA integration xa_call returned XAER_PROTO.", // 20
+      "Transaction context of request & client threads do not match in interceptor.", // 21
+      "Poller has not returned any response yet.", // 22
+      "Registration of TaggedProfileFactory failed because a factory already exists for the given id.", // 23
+      "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[] =
     {
-      "Request discarded due to resource exhaustion in POA, or because POA is in discarding state.", // 1
+      "Request discarded because of resource exhaustion in POA, or because POA is in discarding state.", // 1
       "No usable profile in IOR.",                            // 2
       "Request cancelled.",                                   // 3
       "POA destroyed."                                        // 4
@@ -642,12 +658,12 @@ CORBA::SystemException::_tao_get_omg_exception_description (
 
   static const char *OBJ_ADAPTER_TABLE[] =
     {
-      "System exception in POA::unknown_adapter.",              // 1
+      "System exception in AdapterActivator::unknown_adapter.",              // 1
       "Incorrect servant type returned by servant manager",     // 2
       "No default servant available [POA policy].",             // 3
       "No servant manager available [POA policy].",             // 4
       "Violation of POA policy by ServantActivator::incarnate.",// 5
-      "Exception in PortableInterceptor::IORInterceptor::components_established.", // 6
+      "Exception in PortableInterceptor::IORInterceptor.components_established.", // 6
       "Null servant returned by servant manager."               // 7
     };
 
@@ -660,16 +676,53 @@ CORBA::SystemException::_tao_get_omg_exception_description (
   static const char *OBJECT_NOT_EXIST_TABLE[] =
     {
       "Attempt to pass an unactivated (unregistered) value as an object reference.", // 1
-      "POAManager::incarnate failed to create POA." // 2
+      "Failed to create or locate Object Adapter.", // 2
+      "Biomolecular Sequence Analysis Service is no longer available.", // 3
+      "Object Adapter inactive.", // 4
+      "This Poller has already delivered a reply to some client." // 5
     };
 
   static const char *INV_POLICY_TABLE[] =
     {
-      "Unable to reconcile IOR specified policy with the effective policy override." // 1
+      "Unable to reconcile IOR specified policy with the effective policy override.", // 1
       "Invalid PolicyType.", // 2
       "No PolicyFactory has been registered for the given PolicyType." // 3
     };
 
+  static const char *ACTIVITY_COMPLETED_TABLE[] =
+    {
+      "Activity context completed through timeout, or in some way other then requested." // 1
+    };
+
+  static const char *ACTIVITY_REQUIRED_TABLE[] =
+    {
+      "Calling thread lacks required activity context." // 1
+    };
+
+  static const char *BAD_OPERATION_TABLE[] =
+    {
+      "ServantManager returned wrong servant type.", // 1
+      "Operation or attribute not known to target object." // 2
+    };
+
+  static const char *BAD_CONTEXT_TABLE[] =
+    {
+      "IDL context not found.", // 1
+      "No matching IDL context property." // 2
+    };
+
+  static const char *CODESET_INCOMPATIBLE_TABLE[] =
+    {
+      "Codeset negotiation failed.", // 1
+      "Codeset delivered in CodeSetContext is not supported by server as transmission codeset." // 2
+    };
+
+  static const char *INTF_REPOS_TABLE[] =
+    {
+      "Interface Repository not available.", // 1
+      "No entry for requested interface in Interface Repository." // 2
+    };
+
   if (minor_code == 0)
     return "*unknown description*";
 
@@ -735,6 +788,30 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *))
     return INV_POLICY_TABLE[minor_code];
 
+  if (exc._is_a ("IDL:omg.org/CORBA/ACTIVITY_COMPLETED:1.0")
+      && minor_code < sizeof ACTIVITY_COMPLETED_TABLE / sizeof (char *))
+    return ACTIVITY_COMPLETED_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/ACTIVITY_REQUIRED:1.0")
+      && minor_code < sizeof ACTIVITY_REQUIRED_TABLE / sizeof (char *))
+    return ACTIVITY_REQUIRED_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/BAD_OPERATION:1.0")
+      && minor_code < sizeof BAD_OPERATION_TABLE / sizeof (char *))
+    return BAD_OPERATION_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/BAD_CONTEXT:1.0")
+      && minor_code < sizeof BAD_CONTEXT_TABLE / sizeof (char *))
+    return BAD_CONTEXT_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/CODESET_INCOMPATIBLE:1.0")
+      && minor_code < sizeof CODESET_INCOMPATIBLE_TABLE / sizeof (char *))
+    return CODESET_INCOMPATIBLE_TABLE[minor_code];
+
+  if (exc._is_a ("IDL:omg.org/CORBA/INTF_REPOS:1.0")
+      && minor_code < sizeof INTF_REPOS_TABLE / sizeof (char *))
+    return INTF_REPOS_TABLE[minor_code];
+
 #else
   ACE_UNUSED_ARG (exc);
   ACE_UNUSED_ARG (minor_code);
@@ -882,16 +959,9 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
   return;
 }
 
-#if defined (__Lynx__)
-
-// LynxOS uses macro THREAD_CANCELLED internally, so it must
-// be undefined to avoid compilation errors
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
-
-#endif /*__Lynx__ */
-
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 // List of standard/system exceptions ... used to create static
 // storage for their typecodes, then later to initialize that storage
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index eda4e0f4a8d..27d237d3e83 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -32,15 +32,9 @@
 class TAO_OutputCDR;
 class TAO_InputCDR;
 
-#if defined (__Lynx__)
-
-// LynxOS uses macro THREAD_CANCELLED internally, so it must
-// be undefined to avoid compilation errors
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
-
-#endif /*__Lynx__ */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 // This is already done in orbconf.h. But this file is totally
 // decoupled from its contents that we have to do this here. Including
diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl
index 3912d55bb65..cf3f4492196 100644
--- a/TAO/tao/TAO.pidl
+++ b/TAO/tao/TAO.pidl
@@ -21,23 +21,7 @@
  *       -Wb,post_include="ace/post.h"
  *       TAO.pidl
  *
- *   2. Then patch the generated code.  The patch fixes the interface
- *   repository IDs, disables the code under certain configurations,
- *   and eliminates cycles in the include dependencies.
- *
- *   Apply patches using the following commands:
- *
- *   patch < diffs/TAOC.h.diff
- *   patch < diffs/TAOC.i.diff
- *   patch < diffs/TAOC.cpp.diff
- *
- *   @note The diffs were generated with these commands:
- *
- *   * Note: to update the patch file after re-generating the code use:
- *
- *   for i in TAO{C,S,S_T}.{h,i,cpp}; do
- *     diff -uBbw orig/$i $i;
-  *   done > diffs/TAO.diff
+ * 2. The files are ready to use
  */
 // ================================================================
 
diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp
index 425dec8231b..a17fa7630fb 100644
--- a/TAO/tao/TAOA.cpp
+++ b/TAO/tao/TAOA.cpp
@@ -27,32 +27,34 @@
 
 #include "TAOC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x74616f2f),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e744d),
-  ACE_NTOHL (0x6f64653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x74616f2f), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e744d), 
+  ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
     24,
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e744d),
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e744d), 
   ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
     CORBA::tk_ushort,
 
@@ -63,7 +65,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode (
     sizeof (_oc_TAO_BufferingConstraintMode),
     (char *) &_oc_TAO_BufferingConstraintMode,
     0,
-    sizeof (TAO::BufferingConstraintMode)
+    0
   );
 
 namespace TAO
@@ -73,87 +75,87 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_BufferingConstraint[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x74616f2f),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x74616f2f), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraint:1.0
     20,
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
   ACE_NTOHL (0x696e7400),  // name = BufferingConstraint
   4, // member count
     5,
-  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x6d6f6465), 
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x74616f2f),
-    ACE_NTOHL (0x54414f2f),
-    ACE_NTOHL (0x42756666),
-    ACE_NTOHL (0x6572696e),
-    ACE_NTOHL (0x67436f6e),
-    ACE_NTOHL (0x73747261),
-    ACE_NTOHL (0x696e744d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x74616f2f), 
+    ACE_NTOHL (0x54414f2f), 
+    ACE_NTOHL (0x42756666), 
+    ACE_NTOHL (0x6572696e), 
+    ACE_NTOHL (0x67436f6e), 
+    ACE_NTOHL (0x73747261), 
+    ACE_NTOHL (0x696e744d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
         24,
-    ACE_NTOHL (0x42756666),
-    ACE_NTOHL (0x6572696e),
-    ACE_NTOHL (0x67436f6e),
-    ACE_NTOHL (0x73747261),
-    ACE_NTOHL (0x696e744d),
+    ACE_NTOHL (0x42756666), 
+    ACE_NTOHL (0x6572696e), 
+    ACE_NTOHL (0x67436f6e), 
+    ACE_NTOHL (0x73747261), 
+    ACE_NTOHL (0x696e744d), 
     ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
         CORBA::tk_ushort,
 
 
   8,
-  ACE_NTOHL (0x74696d65),
+  ACE_NTOHL (0x74696d65), 
   ACE_NTOHL (0x6f757400),  // name = timeout
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
 
   14,
-  ACE_NTOHL (0x6d657373),
-  ACE_NTOHL (0x6167655f),
-  ACE_NTOHL (0x636f756e),
+  ACE_NTOHL (0x6d657373), 
+  ACE_NTOHL (0x6167655f), 
+  ACE_NTOHL (0x636f756e), 
   ACE_NTOHL (0x74000000),  // name = message_count
     CORBA::tk_ulong,
 
   14,
-  ACE_NTOHL (0x6d657373),
-  ACE_NTOHL (0x6167655f),
-  ACE_NTOHL (0x62797465),
+  ACE_NTOHL (0x6d657373), 
+  ACE_NTOHL (0x6167655f), 
+  ACE_NTOHL (0x62797465), 
   ACE_NTOHL (0x73000000),  // name = message_bytes
     CORBA::tk_ulong,
 
@@ -164,7 +166,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint (
     sizeof (_oc_TAO_BufferingConstraint),
     (char *) &_oc_TAO_BufferingConstraint,
     0,
-    sizeof (TAO::BufferingConstraint)
+    0
   );
 
 namespace TAO
@@ -174,30 +176,30 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x74616f2f),
-  ACE_NTOHL (0x54414f2f),
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e7450),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x793a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x74616f2f), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e7450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:tao/TAO/BufferingConstraintPolicy:1.0
     26,
-  ACE_NTOHL (0x42756666),
-  ACE_NTOHL (0x6572696e),
-  ACE_NTOHL (0x67436f6e),
-  ACE_NTOHL (0x73747261),
-  ACE_NTOHL (0x696e7450),
-  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e7450), 
+  ACE_NTOHL (0x6f6c6963), 
   ACE_NTOHL (0x79000000),  // name = BufferingConstraintPolicy
   };
 
@@ -206,7 +208,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy (
     sizeof (_oc_TAO_BufferingConstraintPolicy),
     (char *) &_oc_TAO_BufferingConstraintPolicy,
     0,
-    sizeof (TAO::BufferingConstraintPolicy)
+    0
   );
 
 namespace TAO
@@ -215,7 +217,7 @@ namespace TAO
     &_tc_TAO_tc_TAO_BufferingConstraintPolicy;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -252,8 +254,8 @@ CORBA::Boolean operator>>= (
     TAO::BufferingConstraint *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO::BufferingConstraint *&,
+  return _tao_any >>= const_cast<
+      const TAO::BufferingConstraint *&> (
       _tao_elem
     );
 }
@@ -342,8 +344,6 @@ operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -368,5 +368,4 @@ operator>>= (
         TAO::BufferingConstraintPolicy \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 317c0fafc71..bdc8ee96460 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "TAOC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -39,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "TAOC.i"
+#include "TAOC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,16 +50,16 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 TAO::BufferingConstraint::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   BufferingConstraint *_tao_tmp_pointer =
-    ACE_static_cast (BufferingConstraint *, _tao_void_pointer);
+    static_cast<BufferingConstraint *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -101,26 +100,20 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*TAO__TAO_BufferingConstraintPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
 {}
 
 TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 {}
 
-void
+void 
 TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   BufferingConstraintPolicy *_tao_tmp_pointer =
-    ACE_static_cast (BufferingConstraintPolicy *, _tao_void_pointer);
+    static_cast<BufferingConstraintPolicy *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -134,10 +127,10 @@ TAO::BufferingConstraintPolicy::_narrow (
     {
       return BufferingConstraintPolicy::_nil ();
     }
-
+  
   BufferingConstraintPolicy_ptr proxy =
     dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref);
-
+  
   return BufferingConstraintPolicy::_duplicate (proxy);
 }
 
@@ -151,10 +144,10 @@ TAO::BufferingConstraintPolicy::_unchecked_narrow (
     {
       return BufferingConstraintPolicy::_nil ();
     }
-
+  
   BufferingConstraintPolicy_ptr proxy =
     dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref);
-
+  
   return BufferingConstraintPolicy::_duplicate (proxy);
 }
 
@@ -165,7 +158,7 @@ TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -241,7 +234,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -264,7 +257,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         TAO::BufferingConstraintPolicy
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         TAO::BufferingConstraintPolicy
@@ -291,10 +284,10 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         TAO::BufferingConstraintPolicy
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         TAO::BufferingConstraintPolicy
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 8b6258bfd93..c1e1fd6a10c 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -26,27 +26,31 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_TAOC_H_
 #define _TAO_IDL_ORIG_TAOC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
 
-#include "PolicyC.h"
-#include "TimeBaseC.h"
-#include "Messaging_SyncScopeC.h"
+#include "tao/PolicyC.h"
+#include "tao/TimeBaseC.h"
+#include "tao/Messaging_SyncScopeC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -61,9 +65,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,13 +73,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -87,92 +89,92 @@ namespace TAO
 
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::UShort BufferingConstraintMode;
   typedef CORBA::UShort_out BufferingConstraintMode_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct BufferingConstraint;
-
+  
   typedef
     TAO_Fixed_Var_T<
         BufferingConstraint
       >
     BufferingConstraint_var;
-
+  
   typedef
     BufferingConstraint &
     BufferingConstraint_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_Export BufferingConstraint
   {
     typedef BufferingConstraint_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO::BufferingConstraintMode mode;
     TimeBase::TimeT timeout;
     CORBA::ULong message_count;
     CORBA::ULong message_bytes;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_
-
+  
   class BufferingConstraintPolicy;
   typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         BufferingConstraintPolicy
       >
     BufferingConstraintPolicy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         BufferingConstraintPolicy
@@ -180,109 +182,109 @@ namespace TAO
     BufferingConstraintPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_
-
+  
   class TAO_Export BufferingConstraintPolicy
-    : public virtual CORBA::Policy
+    : public virtual ::CORBA::Policy
   {
   public:
     typedef BufferingConstraintPolicy_ptr _ptr_type;
     typedef BufferingConstraintPolicy_var _var_type;
-
+    
     // The static operations.
     static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
-
+    
     static BufferingConstraintPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BufferingConstraintPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static BufferingConstraintPolicy_ptr _nil (void)
     {
       return (BufferingConstraintPolicy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::TAO::BufferingConstraint buffering_constraint (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     BufferingConstraintPolicy (void);
-
+    
     virtual ~BufferingConstraintPolicy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     BufferingConstraintPolicy (const BufferingConstraintPolicy &);
-
+    
     void operator= (const BufferingConstraintPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
 
 // TAO_IDL - Generated from
@@ -299,19 +301,19 @@ namespace TAO
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<TAO::BufferingConstraintPolicy>
+  struct TAO_Export Objref_Traits< ::TAO::BufferingConstraintPolicy>
   {
-    static TAO::BufferingConstraintPolicy_ptr duplicate (
-        TAO::BufferingConstraintPolicy_ptr
+    static ::TAO::BufferingConstraintPolicy_ptr duplicate (
+        ::TAO::BufferingConstraintPolicy_ptr
       );
     static void release (
-        TAO::BufferingConstraintPolicy_ptr
+        ::TAO::BufferingConstraintPolicy_ptr
       );
-    static TAO::BufferingConstraintPolicy_ptr nil (void);
+    static ::TAO::BufferingConstraintPolicy_ptr nil (void);
     static CORBA::Boolean marshal (
-        TAO::BufferingConstraintPolicy_ptr p,
+        ::TAO::BufferingConstraintPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -341,13 +343,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConst
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "TAOC.i"
+#include "TAOC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -358,3 +360,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/TAOC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/TAOS.cpp b/TAO/tao/TAOS.cpp
deleted file mode 100644
index 57f12c82b72..00000000000
--- a/TAO/tao/TAOS.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- 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 "TAOS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TAOS.i"
-#endif /* !defined INLINE */
-
diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h
index 3dcfe52ff45..2fe5cb3554b 100644
--- a/TAO/tao/TAOS.h
+++ b/TAO/tao/TAOS.h
@@ -1,41 +1,82 @@
-/* -*- C++ -*- $Id$ */
+// -*- 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.
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_TMP_TAOS_H_
-#define _TAO_IDL_TMP_TAOS_H_
+#ifndef _TAO_IDL_ORIG_TAOS_H_
+#define _TAO_IDL_ORIG_TAOS_H_
 
-#include "tao/corbafwd.h"
+#include /**/ "ace/pre.h"
+
+#include "tao/PolicyS.h"
+#include "tao/TimeBaseS.h"
+#include "tao/Messaging_SyncScopeS.h"
+#include "TAOC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-namespace  POA_TAO
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_TAO
 {
-}
 
 
-#include "TAOS_T.h"
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
 
-#if defined (__ACE_INLINE__)
-#include "TAOS.i"
-#endif /* defined INLINE */
+} // module TAO
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+#include "TAOS_T.h"
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/TAOS.i b/TAO/tao/TAOS.i
deleted file mode 100644
index d41d475fa1a..00000000000
--- a/TAO/tao/TAOS.i
+++ /dev/null
@@ -1,9 +0,0 @@
-/* -*- 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
-
diff --git a/TAO/tao/TAOS_T.cpp b/TAO/tao/TAOS_T.cpp
deleted file mode 100644
index e72a85dc605..00000000000
--- a/TAO/tao/TAOS_T.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- 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
-
-#ifndef _TAO_IDL_TMP_TAOS_T_CPP_
-#define _TAO_IDL_TMP_TAOS_T_CPP_
-
-#include "TAOS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TAOS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/TAOS_T.h b/TAO/tao/TAOS_T.h
index a866e7ce751..60856d4df0b 100644
--- a/TAO/tao/TAOS_T.h
+++ b/TAO/tao/TAOS_T.h
@@ -1,39 +1,58 @@
-/* -*- 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.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:546
+
+#ifndef _TAO_IDL_ORIG_TAOS_T_H_
+#define _TAO_IDL_ORIG_TAOS_T_H_
 
-#ifndef _TAO_IDL_TMP_TAOS_T_H_
-#define _TAO_IDL_TMP_TAOS_T_H_
+#include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
-#if defined (__ACE_INLINE__)
-#include "TAOS_T.i"
-#endif /* defined INLINE */
+// TAO_IDL - Generated from
+// be\be_visitor_root/root_sth.cpp:116
 
+namespace POA_TAO
+{
+} // module TAO
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "TAOS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1094
 
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("TAOS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/TAOS_T.i b/TAO/tao/TAOS_T.i
deleted file mode 100644
index d41d475fa1a..00000000000
--- a/TAO/tao/TAOS_T.i
+++ /dev/null
@@ -1,9 +0,0 @@
-/* -*- 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
-
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 3fc4a4652db..c1e6ffe1497 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -11,6 +11,7 @@
 #include "FILE_Parser.h"
 #include "DLL_Parser.h"
 #include "ORB_Core.h"
+#include "Adapter_Factory.h"
 #include "Default_Stub_Factory.h"
 #include "Default_Endpoint_Selector_Factory.h"
 #include "Default_Protocols_Hooks.h"
@@ -24,7 +25,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Env_Value_T.h"
 #include "ace/ACE.h"
-#include "ace/Static_Object_Lock.h"
+#include "ace/Atomic_Op.h"
 #include "ace/OS_NS_stdio.h"
 
 
@@ -33,37 +34,62 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP) && \
-    defined (TAO_DEFAULT_RESOURCE_FACTORY_ARGS)
-const char *TAO_Internal::resource_factory_args_ =
-            TAO_DEFAULT_RESOURCE_FACTORY_ARGS;
-#else
-const char *TAO_Internal::resource_factory_args_ = 0;
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP &&
-          TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
-
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP) && \
-    defined (TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS)
-const char *TAO_Internal::server_strategy_factory_args_ =
-            TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS;
-#else
-const char *TAO_Internal::server_strategy_factory_args_ = 0;
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP &&
-          TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS */
-
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP) && \
-    defined (TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS)
-const char *TAO_Internal::client_strategy_factory_args_ =
-            TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS;
-#else
-const char *TAO_Internal::client_strategy_factory_args_ = 0;
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP &&
-          TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS */
-
-int TAO_Internal::service_open_count_ = 0;
+#ifndef TAO_DEFAULT_RESOURCE_FACTORY_ARGS
+#  define TAO_DEFAULT_RESOURCE_FACTORY_ARGS 0
+#endif  /* !TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
+
+#ifndef TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS
+#  define TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS 0
+#endif  /* !TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS */
+
+#ifndef TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS
+#  define TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS 0
+#endif  /* !TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
+
+
+namespace
+{
+  /**
+   * Initialize the ACE Service Configurator.  This is a one-shot
+   * method, i.e., it can be called multiple times but it will only do
+   * its work once.  It does, however, track the number of times it's
+   * called (see @c open_services()).  It is fully thread-safe.
+   *
+   * @return @c 0 if successful, @c -1 with @c errno set if failure.
+   *
+   * @note You can provide your program a set of default `svc.conf'
+   *       entries by setting @a ignore_default_svc_conf_file to
+   *       non-zero and use @c default_svc_conf_entries() before
+   *       calling @c open_services().  In addition, you can @a
+   *       skip_service_config_open altogether, which used to be
+   *       important when the ORB is linked in via the
+   *       ACE_Service_Configurator, since the
+   *       ACE_Service_Configurator was non-reentrant.  However, the
+   *       ACE_Service_Configurator is now reentrant meaning that it
+   *       is really no longer necessary to do so.
+   */
+  int open_services_i (int & argc,
+                       char ** argv,
+                       bool ignore_default_svc_conf_file = false,
+                       bool skip_service_config_open = false);
+
+  /// Number of times open_services() has been called.  Incremented by
+  /// open_services(), and decremented by close_services().
+  /**
+   * @note In/decrement operations are atomic.
+   */
+  ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> service_open_count (0);
+
+  char const * resource_factory_args =
+    TAO_DEFAULT_RESOURCE_FACTORY_ARGS;
+  char const * server_strategy_factory_args =
+    TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS;
+  char const * client_strategy_factory_args =
+    TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS;
+}
 
 int
-TAO_Internal::open_services (int &argc, ACE_TCHAR **argv)
+TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
 {
   // Construct an argument vector specific to the Service
   // Configurator.
@@ -71,27 +97,31 @@ TAO_Internal::open_services (int &argc, ACE_TCHAR **argv)
 
   // Be certain to copy the program name so that service configurator
   // has something to skip!
-  ACE_CString argv0 = "";
+  ACE_CString argv0 ("");
 
   if (argc > 0 && argv != 0)
     {
-      argv0 = ACE_TEXT_ALWAYS_CHAR(argv[0]);
+      argv0 = ACE_TEXT_ALWAYS_CHAR (argv[0]);
     }
 
   CORBA::ULong len = 0;
   svc_config_argv.length (1);
   svc_config_argv[0] = argv0.c_str ();
 
-  // Should we skip the <ACE_Service_Config::open> method, e.g., if we
+  // Should we skip the ACE_Service_Config::open() method, e.g., if we
   // already being configured by the ACE Service Configurator.
-  int skip_service_config_open = 0;
+  //
+  //   @@ This is no longer needed since the Service Configurator is
+  //      now reentrant.
+  //         -Ossama
+  bool skip_service_config_open = false;
 
 #if defined (TAO_DEBUG) && !defined (ACE_HAS_WINCE)
   // Make it a little easier to debug programs using this code.
   {
     TAO_debug_level = ACE_Env_Value<u_int> ("TAO_ORB_DEBUG", 0);
 
-    char *value = ACE_OS::getenv ("TAO_ORB_DEBUG");
+    char * const value = ACE_OS::getenv ("TAO_ORB_DEBUG");
 
     if (value != 0)
       {
@@ -103,7 +133,8 @@ TAO_Internal::open_services (int &argc, ACE_TCHAR **argv)
           }
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_debug_level == %d\n"), TAO_debug_level));
+                    ACE_TEXT ("TAO_debug_level == %d\n"),
+                    TAO_debug_level));
       }
   }
 #endif  /* TAO_DEBUG && !ACE_HAS_WINCE */
@@ -118,13 +149,13 @@ TAO_Internal::open_services (int &argc, ACE_TCHAR **argv)
 
       // Start with the parameterless flags.
       if (arg_shifter.cur_arg_strncasecmp
-          (ACE_TEXT("-ORBSkipServiceConfigOpen")) == 0)
+          (ACE_TEXT ("-ORBSkipServiceConfigOpen")) == 0)
         {
-          skip_service_config_open = 1;
+          skip_service_config_open = true;
 
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-ORBDebug")) == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT ("-ORBDebug")) == 0)
         {
           // later, replace all of these
           // warning this turns on a daemon
@@ -132,14 +163,14 @@ TAO_Internal::open_services (int &argc, ACE_TCHAR **argv)
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBDebugLevel"))))
+                (ACE_TEXT ("-ORBDebugLevel"))))
         {
           TAO_debug_level =
             ACE_OS::atoi (current_arg);
 
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-ORBDaemon")) == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT ("-ORBDaemon")) == 0)
         {
           // Be a daemon
 
@@ -151,7 +182,7 @@ TAO_Internal::open_services (int &argc, ACE_TCHAR **argv)
           arg_shifter.consume_arg ();
         }
       // Continue with flags that accept parameters.
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBSvcConfDirective"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective"))))
         {
           len = svc_config_argv.length ();
           svc_config_argv.length (len + 2);  // 2 arguments to add
@@ -165,12 +196,12 @@ TAO_Internal::open_services (int &argc, ACE_TCHAR **argv)
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBSvcConf"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf"))))
         {
           // Specify the name of the svc.conf file to be used.
 
           // Proceeds only if the configuration file exists.
-          FILE *conf_file = ACE_OS::fopen (current_arg, ACE_TEXT("r"));
+          FILE * const conf_file = ACE_OS::fopen (current_arg, ACE_TEXT ("r"));
 
           if (conf_file == 0)
             {
@@ -199,7 +230,7 @@ TAO_Internal::open_services (int &argc, ACE_TCHAR **argv)
 
           arg_shifter.consume_arg();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBServiceConfigLoggerKey"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey"))))
         {
           len = svc_config_argv.length ();
           svc_config_argv.length (len + 2);  // 2 arguments to add
@@ -219,86 +250,92 @@ TAO_Internal::open_services (int &argc, ACE_TCHAR **argv)
     }
 
   int svc_config_argc = svc_config_argv.length ();
-  return TAO_Internal::open_services_i (svc_config_argc,
-                                        svc_config_argv.get_buffer (),
-                                        0,  // @@ What about this argument?
-                                        skip_service_config_open);
+  return open_services_i (svc_config_argc,
+                          svc_config_argv.get_buffer (),
+                          0,  // @@ What about this argument?
+                          skip_service_config_open);
 }
 
+int
+TAO::ORB::close_services (void)
+{
+  --service_open_count;  // Atomic!
+
+  return 0;
+}
 
 void
-TAO_Internal::default_svc_conf_entries (const char *resource_factory_args,
-                                        const char *server_strategy_factory_args,
-                                        const char *client_strategy_factory_args)
+TAO::ORB::default_svc_conf_entries (char const * rf_args,
+                                    char const * ssf_args,
+                                    char const * csf_args)
 {
-  TAO_Internal::resource_factory_args_ = resource_factory_args;
-  TAO_Internal::server_strategy_factory_args_ = server_strategy_factory_args;
-  TAO_Internal::client_strategy_factory_args_ = client_strategy_factory_args;
+  resource_factory_args        = rf_args;
+  server_strategy_factory_args = ssf_args;
+  client_strategy_factory_args = csf_args;
 }
 
-int
-TAO_Internal::open_services_i (int &argc,
-                               char **argv,
-                               int ignore_default_svc_conf_file,
-                               int skip_service_config_open)
+// -----------------------------------------------------
+namespace
 {
-  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                            guard, *ACE_Static_Object_Lock::instance (),
-                            -1));
-
+  int
+  open_services_i (int & argc,
+                   char ** argv,
+                   bool ignore_default_svc_conf_file,
+                   bool skip_service_config_open)
+  {
 #if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-  ignore_default_svc_conf_file = 1;
+    ignore_default_svc_conf_file = true;
 #endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
 
-  if (TAO_Internal::service_open_count_++ == 0)
-    {
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Default_Resource_Factory);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Default_Client_Strategy_Factory);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Default_Server_Strategy_Factory);
-
-      // Configure the IIOP factory. You do *NOT*
-      // need modify this code to add your own protocol, instead
-      // simply add the following to your svc.conf file:
-      //
-      // dynamic PN_Factory Service_Object * LIB:_make_PN_Protocol_Factory() ""
-      // static Resource_Factory "-ORBProtocolFactory PN_Factory"
-      //
-      // where PN is the name of your protocol and LIB is the base
-      // name of the shared library that implements the protocol.
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_IIOP_Protocol_Factory);
-
-      // add descriptor to list of static objects.
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_MCAST_Parser);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_CORBANAME_Parser);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_CORBALOC_Parser);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_FILE_Parser);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_DLL_Parser);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Default_Stub_Factory);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Default_Endpoint_Selector_Factory);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Default_Protocols_Hooks);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Default_Thread_Lane_Resources_Manager_Factory);
-      ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Default_Collocation_Resolver);
-
-      int result = 0;
-
-      if (skip_service_config_open == 0)
-        {
+    if (service_open_count++ == 0)  // Atomic increment
+      {
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_Default_Resource_Factory);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_Default_Client_Strategy_Factory);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_Default_Server_Strategy_Factory);
+
+        // Configure the IIOP factory. You do *NOT* need modify this
+        // code to add your own protocol, instead simply add the
+        // following to your svc.conf file:
+        //
+        // dynamic PN_Factory Service_Object * LIB:_make_PN_Protocol_Factory() ""
+        // static Resource_Factory "-ORBProtocolFactory PN_Factory"
+        //
+        // where PN is the name of your protocol and LIB is the base
+        // name of the shared library that implements the protocol.
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_IIOP_Protocol_Factory);
+
+        // add descriptor to list of static objects.
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_MCAST_Parser);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_CORBANAME_Parser);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_CORBALOC_Parser);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_FILE_Parser);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_DLL_Parser);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_Default_Stub_Factory);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_Default_Endpoint_Selector_Factory);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_Default_Protocols_Hooks);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_Default_Thread_Lane_Resources_Manager_Factory);
+        ACE_Service_Config::process_directive (
+          ace_svc_desc_TAO_Default_Collocation_Resolver);
+
+        int result = 0;
+
+        if (!skip_service_config_open)
+          {
             // Copy command line parameter not to use original.
-            ACE_Argv_Type_Converter command_line(argc, argv);
+            ACE_Argv_Type_Converter command_line (argc, argv);
 
             result =
               ACE_Service_Config::open (command_line.get_argc(),
@@ -306,110 +343,78 @@ TAO_Internal::open_services_i (int &argc,
                                         ACE_DEFAULT_LOGGER_KEY,
                                         0, // Don't ignore static services.
                                         ignore_default_svc_conf_file);
-        }
-
-      // If available, allow the Adapter Factory to setup.
-      ACE_Service_Object *adapter_factory =
-        ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (
-            TAO_ORB_Core::poa_factory_name ().c_str()
-          );
-
-      if (adapter_factory != 0)
-        {
-          adapter_factory->init (0, 0);
-        }
+          }
 
-      // Handle RTCORBA library special case.  Since RTCORBA needs
-      // its init method call to register several hooks, call it here
-      // if it hasn't already been called.
-      ACE_Service_Object *rt_loader =
-        ACE_Dynamic_Service<ACE_Service_Object>::instance ("RT_ORB_Loader");
+        // If available, allow the Adapter Factory to setup.
+        ACE_Service_Object *adapter_factory =
+          ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (
+            TAO_ORB_Core::poa_factory_name ().c_str());
 
-      if (rt_loader != 0)
-        {
-          rt_loader->init (0, 0);
-        }
+        if (adapter_factory != 0)
+          {
+            adapter_factory->init (0, 0);
+          }
 
-      ACE_Service_Object *rtscheduler_loader =
-        ACE_Dynamic_Service<ACE_Service_Object>::instance ("RTScheduler_Loader");
+        // Handle RTCORBA library special case.  Since RTCORBA needs
+        // its init method call to register several hooks, call it
+        // here if it hasn't already been called.
+        ACE_Service_Object * const rt_loader =
+          ACE_Dynamic_Service<ACE_Service_Object>::instance ("RT_ORB_Loader");
 
-      if (rtscheduler_loader != 0)
-        {
-                rtscheduler_loader->init (0, 0);
-        }
+        if (rt_loader != 0)
+          {
+            rt_loader->init (0, 0);
+          }
 
-      // @@ What the heck do these things do and do we need to avoid
-      // calling them if we're not invoking the svc.conf file?
-      if (TAO_Internal::resource_factory_args_ != 0)
-        {
-          ACE_Service_Config::process_directive (
-              ACE_TEXT_CHAR_TO_TCHAR (
-                  TAO_Internal::resource_factory_args_
-                )
-            );
-        }
+        ACE_Service_Object * const rtscheduler_loader =
+          ACE_Dynamic_Service<ACE_Service_Object>::instance ("RTScheduler_Loader");
 
-      if (TAO_Internal::client_strategy_factory_args_ != 0)
-        {
-          ACE_Service_Config::process_directive (
-              ACE_TEXT_CHAR_TO_TCHAR (
-                  TAO_Internal::client_strategy_factory_args_
-                )
-            );
-        }
+        if (rtscheduler_loader != 0)
+          {
+            rtscheduler_loader->init (0, 0);
+          }
 
-      if (TAO_Internal::server_strategy_factory_args_ != 0)
-        {
-          ACE_Service_Config::process_directive (
-              ACE_TEXT_CHAR_TO_TCHAR (
-                  TAO_Internal::server_strategy_factory_args_
-                )
-            );
-        }
+        // @@ What the heck do these things do and do we need to avoid
+        //    calling them if we're not invoking the svc.conf file?
+        // @@ They are needed for platforms that have no file system,
+        //    like VxWorks.
+        if (resource_factory_args != 0)
+          {
+            ACE_Service_Config::process_directive (
+              ACE_TEXT_CHAR_TO_TCHAR (resource_factory_args));
+          }
 
-      return result;
-    }
-  else
-    {
-      return 0;
-    }
-}
+        if (client_strategy_factory_args != 0)
+          {
+            ACE_Service_Config::process_directive (
+              ACE_TEXT_CHAR_TO_TCHAR (client_strategy_factory_args));
+          }
 
-TAO_Internal::TAO_Internal (void)
-{
-}
+        if (server_strategy_factory_args != 0)
+          {
+            ACE_Service_Config::process_directive (
+              ACE_TEXT_CHAR_TO_TCHAR (server_strategy_factory_args));
+          }
 
-int
-TAO_Internal::close_services (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard,
-                            *ACE_Static_Object_Lock::instance (), -1));
-  --service_open_count_;
-  return 0;
+        return result;
+      }
+    else
+      {
+        return 0;
+      }
+  }
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
 template class ACE_Dynamic_Service<ACE_Service_Object>;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<ACE_Service_Object>
-
+#  pragma instantiate ACE_Dynamic_Service<ACE_Service_Object>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #if defined (TAO_DEBUG) && !defined (ACE_HAS_WINCE)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Env_Value<int>;
+#  if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Env_Value<u_int>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Env_Value<int>
-#pragma instantiate ACE_Env_Value<u_int>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /*defined TAO_DEBUG && !defined (ACE_HAS_WINCE) */
+#  elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#    pragma instantiate ACE_Env_Value<u_int>
+#  endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* TAO_DEBUG && !ACE_HAS_WINCE */
diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h
index eccd7ef77ec..f814c3a8c2d 100644
--- a/TAO/tao/TAO_Internal.h
+++ b/TAO/tao/TAO_Internal.h
@@ -17,77 +17,52 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-/**
- * @class TAO_Internal
- *
- * @brief This class encapsulates some private behaviors and global data
- * structures used internal to TAO.  No application should EVER
- * see this class.
- */
-class TAO_Export TAO_Internal
-{
-public:
-  /// Extract ACE Service Configurator arguments from the given
-  /// argument vector, and initialize the ACE Service Configurator.
-  /// This method should be called before the ORB Core is initialized,
-  /// and before any ORBInitializers are invoked.
-  static int open_services (int &argc, ACE_TCHAR **argv);
-
-  /**
-   * The complement to open_services(), this will perform appropriate
-   * ACE Service Configurator closure operations.  It should be called
-   * as many times as open_services(), and will only actually close
-   * things down on the last call.  It is fully thread-safe.  Return 0
-   * if successful, -1 with errno set if failure.
-   */
-  static int close_services (void);
-
-  /// Set default `svc.conf' content.  This call has no effect if This
-  /// function must be called before first ORB initialization.
-  static void default_svc_conf_entries (const char *resource_factory_args,
-                                        const char *server_strategy_factory_args,
-                                        const char *client_strategy_factory_args);
-
-private:
-  /// Private constructor prevents this class from being
-  /// instantiated.
-  TAO_Internal (void);
 
+namespace TAO
+{
   /**
-   * Initialize the ACE Service Configurator.  This is a one-shot
-   * method, i.e., it can be called multiple times but it will only do
-   * its work once.  It does, however, track the number of times it's
-   * called (see open_services()).  It is fully thread-safe.  Return 0
-   * if successful, -1 with errno set if failure.  You can provide
-   * your program a set of default `svc.conf' entries by setting
-   * @a ignore_default_svc_conf_file to non-zero and use
-   * default_svc_conf_entries() before calling open_services().
-   * In addition, you can @a skip_service_config_open altogether,
-   * which is important if the ORB is linked in via the
-   * ACE_Service_Configurator, which is non-reentrant.
+   * @namespace ORB
+   *
+   * @brief This @c namespace encapsulates some private behaviors and
+   *        global data structures used internal to TAO.  No
+   *        application should EVER see them which is why they are not
+   *        exported.
    */
-  static int open_services_i (int &argc,
-                              char **argv,
-                              int ignore_default_svc_conf_file = 0,
-                              int skip_service_config_open = 0);
+  namespace ORB
+  {
+    /// Extract ACE Service Configurator arguments from the given
+    /// argument vector, and initialize the ACE Service Configurator.
+    /**
+     * @note This method should be called before the ORB Core is
+     *       initialized, and before any ORBInitializers are invoked.
+     */
+    int open_services (int& argc, ACE_TCHAR** argv);
 
-private:
-  /// Number of times open_services() has been called.  Incremented by
-  /// open_services(), and decremented by close_services().  Access to
-  /// this is protected via the \param ACE_Static_Object_Lock.
-  static int service_open_count_;
+    /**
+     * The complement to @c open_services(), this will perform
+     * appropriate ACE Service Configurator closure operations.  It
+     * should be called as many times as @c open_services(), and will
+     * only actually close things down on the last call.  It is fully
+     * thread-safe.
+     * @return @c 0 if successful, @c -1 with @c errno set if
+     *         failure.
+     */
+    int close_services (void);
 
+    /// Set default @c `svc.conf' content.  This call has no effect if
+    /// This function must be called before first ORB initialization.
+    void default_svc_conf_entries (char const * rf_args,
+                                   char const * ssf_args,
+                                   char const * csf_args);
 
-  static const char *resource_factory_args_;
-  static const char *server_strategy_factory_args_;
-  static const char *client_strategy_factory_args_;
-};
+  }
+}
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index d0e1acf739f..1085b0e68bb 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -1,28 +1,33 @@
 // $Id$
 
 #include "TSS_Resources.h"
+#include "GUIResource_Factory.h"
 
 ACE_RCSID (tao,
            TSS_Resources,
            "$Id$")
 
 TAO_TSS_Resources::TAO_TSS_Resources (void)
-  :  poa_current_impl_ (0),
-     rtscheduler_current_impl_ (0),
-     rtscheduler_previous_current_impl_ (0),
-     default_environment_ (&this->tss_environment_)
+  :  poa_current_impl_ (0)
+     , rtscheduler_current_impl_ (0)
+     , rtscheduler_previous_current_impl_ (0)
+     , default_environment_ (&this->tss_environment_)
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
   , policy_current_ (&this->initial_policy_current_)
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
+     , gui_resource_factory_ (0)
 
 {
 }
 
 TAO_TSS_Resources::~TAO_TSS_Resources (void)
 {
+  if (gui_resource_factory_)
+    delete gui_resource_factory_;
+  gui_resource_factory_ = 0;
 }
 
 // ****************************************************************
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index d08e5c4ac35..fa67eead299 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -25,8 +25,13 @@
 
 #include "tao/TAO_Singleton.h"
 #include "tao/Environment.h"
+#include "tao/TAO_Export.h"
 
-
+// Forward declarations
+namespace TAO
+{
+  class GUIResource_Factory;
+}
 /**
  * @class TAO_TSS_Resources
  *
@@ -88,7 +93,12 @@ public:
   TAO_Policy_Current_Impl * policy_current_;
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
+  /** A factory for creating GUIReactors.
+   *
+   * GUIResource_Factory has to be stored in TSS, as GUIReactor are operational
+   * only in within the context of GUI event loops.
+   */
+  TAO::GUIResource_Factory *gui_resource_factory_;
 };
 
 /**
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index 1ca22a258e7..2357bf457f7 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -348,7 +348,8 @@ TAO_Thread_Lane_Resources::ami_response_handler_allocator (void)
 }
 
 int
-TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address
+TAO_Thread_Lane_Resources::open_acceptor_registry (const TAO_EndpointSet &endpoint_set,
+                                                   bool ignore_address
                                                    ACE_ENV_ARG_DECL)
 {
   // Access the acceptor registry.
@@ -357,6 +358,7 @@ TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address
   // Open it.
   int result = ar.open (&this->orb_core_,
                         this->leader_follower ().reactor (),
+                        endpoint_set,
                         ignore_address
                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index d3a92da8d45..eef311676c8 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -24,6 +24,7 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/orbconf.h"
+#include "params.h"
 
 class ACE_Allocator;
 class TAO_ORB_Core;
@@ -63,7 +64,8 @@ public:
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Open the acceptor registry.
-  int open_acceptor_registry (int ignore_address
+  int open_acceptor_registry (const TAO_EndpointSet &endpoint_set,
+                              bool ignore_address
                               ACE_ENV_ARG_DECL);
 
   /// Finalize resources.
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp
index 7999dad9565..d3864856d85 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp
@@ -6,14 +6,10 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao, 
-           Thread_Lane_Resources_Manager, 
+ACE_RCSID (tao,
+           Thread_Lane_Resources_Manager,
            "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "tao/Thread_Lane_Resources_Manager.i"
-#endif /* ! __ACE_INLINE__ */
-
 TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
   : orb_core_ (&orb_core),
     lf_strategy_ (0)
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
index 26891ce85c4..feee9fe7056 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -106,10 +106,6 @@ public:
 
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/Thread_Lane_Resources_Manager.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_THREAD_LANE_RESOURCES_MANAGER_H */
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.i b/TAO/tao/Thread_Lane_Resources_Manager.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Thread_Lane_Resources_Manager.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl
index afa20b97b1a..e9ab1f5d6c9 100644
--- a/TAO/tao/TimeBase.pidl
+++ b/TAO/tao/TimeBase.pidl
@@ -18,13 +18,7 @@
  *        -Wb,post_include="ace/post.h"
  *        TimeBase.pidl
  *
- * after the file is generated a patch must be applied.  The patch
- * eliminates cycles in the include dependencies.  The changes are
- * required because the generated code is part of the TAO library, it
- * hardly makes any sense to change the IDL compiler to support
- * changes that are very occasional.
- *
- *
+ * After that the files are ready for use
  */
 //=============================================================================
 
@@ -49,7 +43,7 @@ module TimeBase
   /**
    * In other words each TimeT is 10^-7 seconds.
    * When used for absolute time 0 is to October 15, 1582. Please read
-   * the spec for further details. 
+   * the spec for further details.
    */
   typedef unsigned long long TimeT;
 
diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp
index 54a9df5c9a3..7e37b1933ae 100644
--- a/TAO/tao/TimeBaseA.cpp
+++ b/TAO/tao/TimeBaseA.cpp
@@ -27,25 +27,27 @@
 
 #include "TimeBaseC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_TimeT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f54696d),
-  ACE_NTOHL (0x65543a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f54696d), 
+  ACE_NTOHL (0x65543a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
     6,
-  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x54696d65), 
   ACE_NTOHL (0x54000000),  // name = TimeT
     CORBA::tk_ulonglong,
 
@@ -56,7 +58,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT (
     sizeof (_oc_TimeBase_TimeT),
     (char *) &_oc_TimeBase_TimeT,
     0,
-    sizeof (TimeBase::TimeT)
+    0
   );
 
 namespace TimeBase
@@ -66,40 +68,40 @@ namespace TimeBase
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f496e61),
-  ACE_NTOHL (0x63637572),
-  ACE_NTOHL (0x61637954),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f496e61), 
+  ACE_NTOHL (0x63637572), 
+  ACE_NTOHL (0x61637954), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
     12,
-  ACE_NTOHL (0x496e6163),
-  ACE_NTOHL (0x63757261),
+  ACE_NTOHL (0x496e6163), 
+  ACE_NTOHL (0x63757261), 
   ACE_NTOHL (0x63795400),  // name = InaccuracyT
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
@@ -111,7 +113,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT (
     sizeof (_oc_TimeBase_InaccuracyT),
     (char *) &_oc_TimeBase_InaccuracyT,
     0,
-    sizeof (TimeBase::InaccuracyT)
+    0
   );
 
 namespace TimeBase
@@ -121,22 +123,22 @@ namespace TimeBase
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_TdfT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f546466),
-  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f546466), 
+  ACE_NTOHL (0x543a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
     5,
-  ACE_NTOHL (0x54646654),
+  ACE_NTOHL (0x54646654), 
   ACE_NTOHL (0x0),  // name = TdfT
     CORBA::tk_short,
 
@@ -147,7 +149,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT (
     sizeof (_oc_TimeBase_TdfT),
     (char *) &_oc_TimeBase_TdfT,
     0,
-    sizeof (TimeBase::TdfT)
+    0
   );
 
 namespace TimeBase
@@ -157,52 +159,52 @@ namespace TimeBase
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_UtcT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f557463),
-  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f557463), 
+  ACE_NTOHL (0x543a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
     5,
-  ACE_NTOHL (0x55746354),
+  ACE_NTOHL (0x55746354), 
   ACE_NTOHL (0x0),  // name = UtcT
   4, // member count
     5,
-  ACE_NTOHL (0x74696d65),
+  ACE_NTOHL (0x74696d65), 
   ACE_NTOHL (0x0),  // name = time
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
 
   8,
-  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x696e6163), 
   ACE_NTOHL (0x636c6f00),  // name = inacclo
     CORBA::tk_ulong,
 
   8,
-  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x696e6163), 
   ACE_NTOHL (0x63686900),  // name = inacchi
     CORBA::tk_ushort,
 
@@ -212,16 +214,16 @@ static const CORBA::Long _oc_TimeBase_UtcT[] =
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f546466),
-    ACE_NTOHL (0x543a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f546466), 
+    ACE_NTOHL (0x543a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
         5,
-    ACE_NTOHL (0x54646654),
+    ACE_NTOHL (0x54646654), 
     ACE_NTOHL (0x0),  // name = TdfT
         CORBA::tk_short,
 
@@ -233,7 +235,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT (
     sizeof (_oc_TimeBase_UtcT),
     (char *) &_oc_TimeBase_UtcT,
     0,
-    sizeof (TimeBase::UtcT)
+    0
   );
 
 namespace TimeBase
@@ -243,66 +245,66 @@ namespace TimeBase
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TimeBase_IntervalT[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x54696d65),
-  ACE_NTOHL (0x42617365),
-  ACE_NTOHL (0x2f496e74),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6c543a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x42617365), 
+  ACE_NTOHL (0x2f496e74), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6c543a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
     10,
-  ACE_NTOHL (0x496e7465),
-  ACE_NTOHL (0x7276616c),
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x7276616c), 
   ACE_NTOHL (0x54000000),  // name = IntervalT
   2, // member count
     12,
-  ACE_NTOHL (0x6c6f7765),
-  ACE_NTOHL (0x725f626f),
+  ACE_NTOHL (0x6c6f7765), 
+  ACE_NTOHL (0x725f626f), 
   ACE_NTOHL (0x756e6400),  // name = lower_bound
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
 
   12,
-  ACE_NTOHL (0x75707065),
-  ACE_NTOHL (0x725f626f),
+  ACE_NTOHL (0x75707065), 
+  ACE_NTOHL (0x725f626f), 
   ACE_NTOHL (0x756e6400),  // name = upper_bound
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
@@ -314,7 +316,7 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (
     sizeof (_oc_TimeBase_IntervalT),
     (char *) &_oc_TimeBase_IntervalT,
     0,
-    sizeof (TimeBase::IntervalT)
+    0
   );
 
 namespace TimeBase
@@ -323,7 +325,7 @@ namespace TimeBase
     &_tc_TAO_tc_TimeBase_IntervalT;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -360,8 +362,8 @@ CORBA::Boolean operator>>= (
     TimeBase::UtcT *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TimeBase::UtcT *&,
+  return _tao_any >>= const_cast<
+      const TimeBase::UtcT *&> (
       _tao_elem
     );
 }
@@ -381,7 +383,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -418,8 +420,8 @@ CORBA::Boolean operator>>= (
     TimeBase::IntervalT *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TimeBase::IntervalT *&,
+  return _tao_any >>= const_cast<
+      const TimeBase::IntervalT *&> (
       _tao_elem
     );
 }
@@ -439,8 +441,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -465,5 +465,4 @@ CORBA::Boolean operator>>= (
         TimeBase::IntervalT \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index 683a23dffad..848c25e0e5c 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "TimeBaseC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "TimeBaseC.i"
+#include "TimeBaseC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -50,28 +49,29 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 TimeBase::UtcT::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   UtcT *_tao_tmp_pointer =
-    ACE_static_cast (UtcT *, _tao_void_pointer);
+    static_cast<UtcT *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 TimeBase::IntervalT::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
-  IntervalT *_tao_tmp_pointer = static_cast<IntervalT *> (_tao_void_pointer);
+  IntervalT *_tao_tmp_pointer =
+    static_cast<IntervalT *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -126,7 +126,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -172,4 +172,4 @@ CORBA::Boolean operator>> (
         TimeBase::IntervalT \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index d7baa55ef8c..67c69d339af 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -26,20 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_TIMEBASEC_H_
 #define _TAO_IDL_ORIG_TIMEBASEC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/VarOut_T.h"
 
@@ -56,9 +58,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -213,13 +213,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::IntervalT
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "TimeBaseC.i"
+#include "TimeBaseC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -231,3 +231,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/TimeBaseC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/TimeBaseS.cpp b/TAO/tao/TimeBaseS.cpp
deleted file mode 100644
index 884b09e27c5..00000000000
--- a/TAO/tao/TimeBaseS.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#ifndef _TAO_IDL_ORIG_TIMEBASES_CPP_
-#define _TAO_IDL_ORIG_TIMEBASES_CPP_
-
-#include "TimeBaseS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TimeBaseS.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/TimeBaseS.h b/TAO/tao/TimeBaseS.h
index 24e75cb8ef9..e17b9d4feee 100644
--- a/TAO/tao/TimeBaseS.h
+++ b/TAO/tao/TimeBaseS.h
@@ -15,25 +15,65 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
 #ifndef _TAO_IDL_ORIG_TIMEBASES_H_
 #define _TAO_IDL_ORIG_TIMEBASES_H_
 
 #include /**/ "ace/pre.h"
+
 #include "TimeBaseC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_TimeBase
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module TimeBase
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:999
+
 #include "TimeBaseS_T.h"
 
-#if defined (__ACE_INLINE__)
-#include "TimeBaseS.i"
-#endif /* defined INLINE */
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/TimeBaseS.i b/TAO/tao/TimeBaseS.i
deleted file mode 100644
index 1d2df31bd57..00000000000
--- a/TAO/tao/TimeBaseS.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/TimeBaseS_T.cpp b/TAO/tao/TimeBaseS_T.cpp
deleted file mode 100644
index 5597b10a284..00000000000
--- a/TAO/tao/TimeBaseS_T.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:705
-
-#ifndef _TAO_IDL_ORIG_TIMEBASES_T_CPP_
-#define _TAO_IDL_ORIG_TIMEBASES_T_CPP_
-
-#include "TimeBaseS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TimeBaseS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/TimeBaseS_T.h b/TAO/tao/TimeBaseS_T.h
index 25e0aacd8b6..11c6736f660 100644
--- a/TAO/tao/TimeBaseS_T.h
+++ b/TAO/tao/TimeBaseS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:566
+// be\be_codegen.cpp:547
 
 #ifndef _TAO_IDL_ORIG_TIMEBASES_T_H_
 #define _TAO_IDL_ORIG_TIMEBASES_T_H_
@@ -34,40 +34,25 @@
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_TimeBase
 {
 } // module TimeBase
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:1111
-
-#if defined (__ACE_INLINE__)
-#include "TimeBaseS_T.i"
-#endif /* defined INLINE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "TimeBaseS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
 
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("TimeBaseS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1096
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/TimeBaseS_T.i b/TAO/tao/TimeBaseS_T.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/TimeBaseS_T.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index df1e0ffcfe9..d0386a9744e 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -19,6 +19,7 @@
 #include "Codeset_Manager.h"
 #include "Codeset_Translator_Factory.h"
 #include "debug.h"
+#include "CDR.h"
 
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_stdio.h"
@@ -128,6 +129,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   , wchar_translator_ (0)
   , tcs_set_ (0)
   , first_request_ (1)
+  , partial_message_ (0)
 {
   TAO_Client_Strategy_Factory *cf =
     this->orb_core_->client_factory ();
@@ -157,6 +159,10 @@ TAO_Transport::~TAO_Transport (void)
       this->purge_entry();
     }
 
+  // Release the partial message block, however we may
+  // have never allocated one.
+  ACE_Message_Block::release (this->partial_message_);
+
   // By the time the destructor is reached here all the connection stuff
   // *must* have been cleaned up.
   ACE_ASSERT (this->head_ == 0);
@@ -1276,6 +1282,26 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh,
         this->messaging_object ()->header_length ();
     }
 
+  // If we have a partial message, copy it into our message block
+  // and clear out the partial message.
+  if (this->partial_message_ != 0 && this->partial_message_->length () != 0)
+    {
+      if (message_block.copy (this->partial_message_->rd_ptr (),
+                              this->partial_message_->length ()) == 0)
+        {
+          recv_size -= this->partial_message_->length ();
+          this->partial_message_->reset ();
+        }
+      else
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "TAO (%P|%t) - Transport[%d]::handle_input, "
+                             "unable to copy the partial message\n",
+                             this->id ()),
+                             -1);
+        }
+    }
+
   // Saving the size of the received buffer in case any one needs to
   // get the size of the message thats received in the
   // context. Obviously the value will be changed for each recv call
@@ -1285,7 +1311,7 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh,
 
   // Read the message into the  message block that we have created on
   // the stack.
-  ssize_t n = this->recv (message_block.rd_ptr (),
+  ssize_t n = this->recv (message_block.wr_ptr (),
                           recv_size,
                           max_wait_time);
 
@@ -1324,27 +1350,32 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh,
       return retval;
     }
 
-  // Make a node of the message block..
-  TAO_Queued_Data qd (&message_block,
-                      this->orb_core_->transport_message_buffer_allocator ());
+  if (message_block.length () > 0)
+    {
+      // Make a node of the message block..
+      TAO_Queued_Data qd (&message_block,
+                          this->orb_core_->transport_message_buffer_allocator ());
 
-  // Extract the data for the node..
-  this->messaging_object ()->get_message_data (&qd);
+      // Extract the data for the node..
+      this->messaging_object ()->get_message_data (&qd);
 
-  // Check whether the message was fragmented..
-  if (qd.more_fragments_ ||
-      (qd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
-    {
-      // Duplicate the node that we have as the node is on stack..
-      TAO_Queued_Data *nqd =
-        TAO_Queued_Data::duplicate (qd);
+      // Check whether the message was fragmented..
+      if (qd.more_fragments_ ||
+          (qd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
+        {
+          // Duplicate the node that we have as the node is on stack..
+          TAO_Queued_Data *nqd =
+            TAO_Queued_Data::duplicate (qd);
 
-      return this->consolidate_fragments (nqd, rh);
+          return this->consolidate_fragments (nqd, rh);
+        }
+
+      // Process the message
+      return this->process_parsed_messages (&qd,
+                                            rh);
     }
 
-  // Process the message
-  return this->process_parsed_messages (&qd,
-                                        rh);
+  return 0;
 }
 
 int
@@ -1354,9 +1385,47 @@ TAO_Transport::parse_consolidate_messages (ACE_Message_Block &block,
 {
   // Parse the incoming message for validity. The check needs to be
   // performed by the messaging objects.
-  if (this->parse_incoming_messages (block) == -1)
+  switch (this->parse_incoming_messages (block))
     {
+    // An error has occurred during message parsing
+    case -1:
       return -1;
+
+    // This message block does not contain enough data to
+    // parse the header.  We do not need to grow the partial
+    // message block since we are guaranteed that it can hold
+    // at least a GIOP header plus a GIOP fragment header.
+    case 1:
+      if (this->partial_message_ == 0)
+        {
+          this->allocate_partial_message_block ();
+        }
+
+      if (this->partial_message_ != 0 &&
+          this->partial_message_->copy (block.rd_ptr (),
+                                        block.length ()) == 0)
+        {
+          block.rd_ptr (block.length ());
+          return 0;
+        }
+      else
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "TAO (%P|%t) - Transport[%d]::parse_consolidate_messages, "
+                             "unable to save the partial message\n",
+                             this->id ()),
+                             -1);
+        }
+
+    case 0: // The normal case
+      break;
+
+    default:
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "TAO (%P|%t) - Transport[%d]::parse_consolidate_messages, "
+                         "impossible return value from parse_incoming_messages\n",
+                         this->id ()),
+                         -1);
     }
 
   // Check whether we have a complete message for processing
@@ -1396,18 +1465,15 @@ TAO_Transport::parse_incoming_messages (ACE_Message_Block &block)
       int retval =
         this->messaging_object ()->parse_incoming_messages (block);
 
-      if (retval == -1)
+      if (retval == -1 && TAO_debug_level > 2)
         {
-          if (TAO_debug_level > 2)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::parse_incoming_messages, "
-                          "error in incoming message\n",
-                          this->id ()));
-            }
-
-          return -1;
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Transport[%d]::parse_incoming_messages, "
+                      "error in incoming message\n",
+                      this->id ()));
         }
+
+      return retval;
     }
 
   return 0;
@@ -1510,40 +1576,98 @@ TAO_Transport::consolidate_message (ACE_Message_Block &incoming,
   // in the queue as they would have been taken care before. Put
   // ourselves in the queue and  then try processing one of the
   // messages..
-  if ((missing_data > 0
-       ||this->incoming_message_queue_.queue_length ())
-      && this->incoming_message_queue_.is_tail_fragmented () == 0)
+  if (missing_data >= 0 ||
+      this->incoming_message_queue_.queue_length () != 0)
     {
-      if (TAO_debug_level > 4)
+      if (missing_data == 0 ||
+          !this->incoming_message_queue_.is_tail_fragmented ())
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                      "queueing up the message\n",
-                      this->id ()));
-        }
+          if (TAO_debug_level > 4)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "TAO (%P|%t) - Transport[%d]::consolidate_message, "
+                          "queueing up the message\n",
+                          this->id ()));
+            }
 
-      // Get a queued data
-      TAO_Queued_Data *qd =
-        this->make_queued_data (incoming);
+          // Get a queued data
+          TAO_Queued_Data *qd =
+            this->make_queued_data (incoming);
 
-      // Add the missing data to the queue
-      qd->missing_data_ = missing_data;
+          // Add the missing data to the queue
+          qd->missing_data_ = missing_data;
 
-      // Get the rest of the messaging data
-      this->messaging_object ()->get_message_data (qd);
+          // Get the rest of the messaging data
+          this->messaging_object ()->get_message_data (qd);
 
-      // Add it to the tail of the queue..
-      this->incoming_message_queue_.enqueue_tail (qd);
+          // If this is a full GIOP fragment, then we need only
+          // to consolidate the fragments
+          if (missing_data == 0 &&
+              (qd->more_fragments_ ||
+               qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
+            {
+              this->consolidate_fragments (qd, rh);
+            }
+          else
+            {
+              // Add it to the tail of the queue..
+              this->incoming_message_queue_.enqueue_tail (qd);
 
-      if (this->incoming_message_queue_.is_head_complete ())
+              if (this->incoming_message_queue_.is_head_complete ())
+                {
+                  return this->process_queue_head (rh);
+                }
+            }
+        }
+      else
         {
-          return this->process_queue_head (rh);
+          // This block of code will only come into play when GIOP
+          // message fragmentation is employed.  If we have a fragment
+          // in the message queue, we can only chain message blocks
+          // onto the TAO_Queued_Data for that fragment.  Unless we have
+          // a full GIOP fragment, and since we know we're missing data,
+          // we need to save what we have until we can read in some more of
+          // the fragment until we get it all.  This bit of data could be
+          // larger than what the partial message block can hold, so we may
+          // need to grow the partial message block.
+          if (this->partial_message_ == 0)
+            {
+              this->allocate_partial_message_block ();
+            }
+
+          if (this->partial_message_ != 0)
+            {
+              const size_t incoming_length = incoming.length ();
+              ACE_CDR::grow (this->partial_message_,
+                             incoming_length);
+              if (this->partial_message_->copy (incoming.rd_ptr (),
+                                                incoming_length) == 0)
+                {
+                  incoming.rd_ptr (incoming_length);
+                }
+              else
+                {
+                  ACE_ERROR_RETURN ((LM_ERROR,
+                                     "TAO (%P|%t) - Transport[%d]::consolidate_message, "
+                                     "unable to save the partial message\n",
+                                     this->id ()),
+                                     -1);
+                }
+            }
+          else
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "TAO (%P|%t) - Transport[%d]::consolidate_message, "
+                                 "unable to allocate the partial message\n",
+                                 this->id ()),
+                                 -1);
+            }
         }
 
       return 0;
     }
 
-  // We dont have any missing data. Just make a queued_data node with
+  // We don't have any missing data. Just make a queued_data node with
   // the existing message block and send it to the higher layers of
   // the ORB.
   TAO_Queued_Data pqd (&incoming,
@@ -1556,10 +1680,10 @@ TAO_Transport::consolidate_message (ACE_Message_Block &incoming,
   if (pqd.more_fragments_ ||
       (pqd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
     {
-      // Duplicate the queued data as it is on stack..
-      TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (pqd);
+        // Duplicate the queued data as it is on stack..
+        TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (pqd);
 
-      return this->consolidate_fragments (nqd, rh);
+        return this->consolidate_fragments (nqd, rh);
     }
 
   // Now we have a full message in our buffer. Just go ahead and
@@ -1569,42 +1693,148 @@ TAO_Transport::consolidate_message (ACE_Message_Block &incoming,
 }
 
 int
-TAO_Transport::consolidate_fragments (TAO_Queued_Data *qd,
+TAO_Transport::consolidate_fragments (TAO_Queued_Data *queueable_message,
                                       TAO_Resume_Handle &rh)
 {
-  // If we have received a fragment message then we have to
-  // consolidate <qd> with the last message in queue
-  // @@todo: this piece of logic follows GIOP a bit... Need to revisit
-  // if we have protocols other than GIOP
+  // Get the version numbers
+  CORBA::Octet major  = queueable_message->major_version_;
+  CORBA::Octet minor  = queueable_message->minor_version_;
+  CORBA::UShort whole = major << 8 | minor;
 
-  // @@todo: Fragments now have too much copying overhead. Need to get
-  // them out if we want to have some reasonable performance metrics
-  // in future.. Post 1.2 seems a nice time..
-  if (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)
+  switch(whole)
     {
-      TAO_Queued_Data *tqd =
-        this->incoming_message_queue_.dequeue_tail ();
-
-      tqd->more_fragments_ = qd->more_fragments_;
-      tqd->missing_data_ = qd->missing_data_;
-
-      if (this->messaging_object ()->consolidate_fragments (tqd, qd) == -1)
+    case 0x0100:
+      if (!queueable_message->more_fragments_)
         {
-          return -1;
+          this->incoming_message_queue_.enqueue_tail (queueable_message);
         }
+      else
+        {
+          // Fragments aren't supported in 1.0.  This is an error and
+          // we should reject it somehow.  What do we do here?  Do we throw
+          // an exception to the receiving side?  Do we throw an exception
+          // to the sending side?
+          //
+          // At the very least, we need to log the fact that we received
+          // nonsense.
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT("TAO (%P|%t) - ")
+                             ACE_TEXT("TAO_Transport::enqueue_incoming_message ")
+                             ACE_TEXT("detected a fragmented GIOP 1.0 message\n")),
+                            -1);
+        }
+      break;
+    case 0x0101:
+      {
+        // One note is that TAO_Queued_Data contains version numbers,
+        // but doesn't indicate the actual protocol to which those
+        // version numbers refer.  That's not a problem, though, because
+        // instances of TAO_Queued_Data live in a queue, and that queue
+        // lives in a particular instance of a Transport, and the
+        // transport instance has an association with a particular
+        // messaging_object.  The concrete messaging object embodies a
+        // messaging protocol, and must cover all versions of that
+        // protocol.  Therefore, we just need to cover the bases of all
+        // versions of that one protocol.
+
+        // In 1.1, fragments kinda suck because they don't have they're
+        // own message-specific header.  Therefore, we have to find the
+        // fragment based on the major and minor version.
+        TAO_Queued_Data* fragment_message_chain =
+            this->incoming_message_queue_.find_fragment_chain (major, minor);
+
+        // Deal with the fragment and the queueable message
+        this->process_fragment (fragment_message_chain,
+                                queueable_message,
+                                major, minor, rh);
+        break;
+      }
+    case 0x0102:
+      {
+        // In 1.2, we get a little more context.  There's a
+        // FRAGMENT message-specific header, and inside that is the
+        // request id with which the fragment is associated.
+        TAO_Queued_Data* fragment_message_chain =
+            this->incoming_message_queue_.find_fragment_chain (
+                                  queueable_message->request_id_);
+
+        // Deal with the fragment and the queueable message
+        this->process_fragment (fragment_message_chain,
+                                queueable_message,
+                                major, minor, rh);
+        break;
+      }
+    default:
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT("TAO (%P|%t) - ")
+                  ACE_TEXT("TAO_Transport::consolidate_fragments ")
+                  ACE_TEXT("can not handle a GIOP %d.%d ")
+                  ACE_TEXT("message\n"), major, minor));
+      ACE_HEX_DUMP ((LM_DEBUG,
+                     queueable_message->msg_block_->rd_ptr (),
+                     queueable_message->msg_block_->length ()));
+      return -1;
+    }
 
-      TAO_Queued_Data::release (qd);
-      this->incoming_message_queue_.enqueue_tail (tqd);
-      this->process_queue_head (rh);
+  return 0;
+}
+
+void
+TAO_Transport::process_fragment (TAO_Queued_Data* fragment_message_chain,
+                                 TAO_Queued_Data* queueable_message,
+                                 CORBA::Octet major,
+                                 CORBA::Octet minor,
+                                 TAO_Resume_Handle &rh)
+{
+  // No fragment was found
+  if (fragment_message_chain == 0)
+    {
+      this->incoming_message_queue_.enqueue_tail (queueable_message);
     }
   else
     {
-      // if we dont have a fragment already in the queue just add it in
-      // the queue
-      this->incoming_message_queue_.enqueue_tail (qd);
-    }
+      if (fragment_message_chain->major_version_ != major ||
+          fragment_message_chain->minor_version_ != minor)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT("TAO (%P|%t) - ")
+                    ACE_TEXT("TAO_Transport::process_fragment ")
+                    ACE_TEXT("GIOP versions do not match ")
+                    ACE_TEXT("(%d.%d != %d.%d\n"),
+                    fragment_message_chain->major_version_,
+                    fragment_message_chain->minor_version_,
+                    major, minor));
+
+      // Find the last message block in the continuation
+      ACE_Message_Block* mb = fragment_message_chain->msg_block_;
+      while (mb->cont () != 0)
+        mb = mb->cont ();
+
+      // Add the current message block to the end of the chain
+      // after adjusting the read pointer to skip the header(s)
+      const size_t header_adjustment =
+         this->messaging_object ()->header_length () +
+         this->messaging_object ()->fragment_header_length (major, minor);
+      queueable_message->msg_block_->rd_ptr(header_adjustment);
+      mb->cont (queueable_message->msg_block_);
+
+      // Remove our reference to the message block.  At this point
+      // the message block of the fragment head owns it as part of a
+      // chain
+      queueable_message->msg_block_ = 0;
+
+      if (!queueable_message->more_fragments_)
+        {
+          // This is the end of the fragments for this request
+          fragment_message_chain->consolidate ();
 
-  return 0;
+          // Process the queue head to make sure that the newly
+          // consolidated fragments get handled
+          this->process_queue_head (rh);
+        }
+
+      // Get rid of the queuable message
+      TAO_Queued_Data::release (queueable_message);
+    }
 }
 
 int
@@ -1921,7 +2151,7 @@ TAO_Transport::make_queued_data (ACE_Message_Block &incoming)
 {
   // Get an instance of TAO_Queued_Data
   TAO_Queued_Data *qd =
-    TAO_Queued_Data::get_queued_data (
+    TAO_Queued_Data::make_queued_data (
       this->orb_core_->transport_message_buffer_allocator ());
 
   // Get the flag for the details of the data block...
@@ -2109,6 +2339,21 @@ TAO_Transport::assign_translators (TAO_InputCDR *inp, TAO_OutputCDR *outp)
     }
 }
 
+void
+TAO_Transport::clear_translators (TAO_InputCDR *inp, TAO_OutputCDR *outp)
+{
+  if (inp)
+    {
+      inp->char_translator (0);
+      inp->wchar_translator (0);
+    }
+  if (outp)
+    {
+      outp->char_translator (0);
+      outp->wchar_translator (0);
+    }
+}
+
 ACE_Event_Handler::Reference_Count
 TAO_Transport::add_reference (void)
 {
@@ -2179,6 +2424,19 @@ TAO_Transport::post_open (size_t id)
   return true;
 }
 
+void
+TAO_Transport::allocate_partial_message_block (void)
+{
+  if (this->partial_message_ == 0)
+    {
+      // This value must be at least large enough to hold a GIOP message
+      // header plus a GIOP fragment header
+      const size_t partial_message_size = 16;
+      ACE_NEW (this->partial_message_,
+               ACE_Message_Block (partial_message_size));
+    }
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Reverse_Lock<ACE_Lock>;
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index e02f53e25ea..5c2d01ecf87 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -46,7 +46,7 @@ struct iovec;
 namespace TAO
 {
   /**
-   * @NOTE: Should this be in TAO namespace. Seems like a candidate
+   * @note Should this be in TAO namespace. Seems like a candidate
    * that should be in the transport
    */
   enum Connection_Role
@@ -298,16 +298,6 @@ public:
   TAO::Connection_Role opened_as (void) const;
   void opened_as (TAO::Connection_Role);
 
-  /**
-   * Predicate that returns true if it is valid for this transport to act in a server
-   * role.  This would, for example, be true if opened_as() == TAO_SERVER_ROLE
-   * or bidirectional_flag() == 1.
-   *
-   * \return 0 cannot act in server role
-   * \return 1 can acts in server role
-   */
-  bool acts_as_server (void) const;
-
   /// Get and Set the purging order. The purging strategy uses the set
   /// version to set the purging order.
   unsigned long purging_order (void) const;
@@ -739,6 +729,11 @@ public:
   /// and output CDRs.
   void assign_translators (TAO_InputCDR *, TAO_OutputCDR *);
 
+  /// It is necessary to clear the codeset translator when a CDR stream
+  /// is used for more than one GIOP message. This is required since the
+  /// header must not be translated, whereas the body must be.
+  void clear_translators (TAO_InputCDR *, TAO_OutputCDR *);
+
   /// Return true if the tcs has been set
   CORBA::Boolean is_tcs_set() const;
 
@@ -857,6 +852,18 @@ private:
   /// Assume the lock is held
   void send_connection_closed_notifications_i (void);
 
+  /// Process a non-version specific fragment by either consolidating
+  /// the fragments or enqueuing the queueable message
+  void process_fragment (TAO_Queued_Data* fragment_message,
+                         TAO_Queued_Data* queueable_message,
+                         CORBA::Octet major,
+                         CORBA::Octet minor,
+                         TAO_Resume_Handle &rh);
+
+  /// Allocate a partial message block and store it in our
+  /// partial_message_ data member.
+  void allocate_partial_message_block (void);
+
   /// Prohibited
   ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport&))
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Transport&))
@@ -983,6 +990,9 @@ private:
   /// first request. After that, the translators are fixed for the life of the
   /// connection.
   CORBA::Boolean first_request_;
+
+  /// Holds the partial GIOP message (if there is one)
+  ACE_Message_Block* partial_message_;
 };
 
 /**
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index be8b82bdac1..7b90286f074 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -50,13 +50,6 @@ TAO_Transport::opened_as (TAO::Connection_Role role)
   this->opening_connection_role_ = role;
 }
 
-ACE_INLINE bool
-TAO_Transport::acts_as_server (void) const
-{
-  return (this->opened_as () == TAO::TAO_SERVER_ROLE ||
-          this->bidirectional_flag_ == 1) ? true : false;
-}
-
 ACE_INLINE TAO_Transport_Cache_Manager::HASH_MAP_ENTRY *
 TAO_Transport::cache_map_entry (void)
 {
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index 94e937d3947..dbeaa8552d3 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -19,14 +19,14 @@ ACE_RCSID (tao,
 
 
 TAO_Transport_Cache_Manager::TAO_Transport_Cache_Manager (TAO_ORB_Core &orb_core)
-  : percent_ (orb_core.resource_factory ()->purge_percentage ()),
-    purging_strategy_ (orb_core.resource_factory ()->create_purging_strategy ()),
-    cache_map_ (static_cast<size_t> (ACE::max_handles ())),
-    condition_ (0),
-    cache_lock_ (0),
-    muxed_number_ (orb_core.resource_factory ()->max_muxed_connections ()),
-    no_waiting_threads_ (0),
-    last_entry_returned_ (0)
+  : percent_ (orb_core.resource_factory ()->purge_percentage ())
+  , purging_strategy_ (orb_core.resource_factory ()->create_purging_strategy ())
+  , cache_map_ (orb_core.resource_factory ()->cache_maximum ())
+  , condition_ (0)
+  , cache_lock_ (0)
+  , muxed_number_ (orb_core.resource_factory ()->max_muxed_connections ())
+  , no_waiting_threads_ (0)
+  , last_entry_returned_ (0)
 {
   if (orb_core.resource_factory ()->locked_transport_cache ())
     {
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 7ef578dfd72..9a2c55c9883 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -36,6 +36,30 @@ TAO_Connector::~TAO_Connector (void)
   delete this->active_connect_strategy_;
 }
 
+TAO_Profile *
+TAO_Connector::corbaloc_scan (const char *str,
+                              size_t &len
+                              ACE_ENV_ARG_DECL)
+{
+  if (this->check_prefix (str) != 0)
+    return 0;
+  const char *comma_pos = ACE_OS::strchr (str,',');
+  const char *slash_pos = ACE_OS::strchr (str,'/');
+  if (comma_pos == 0 && slash_pos == 0)
+    {
+      if (TAO_debug_level)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT("(%P|%t) TAO_CONNECTOR::corbaloc_scan warning: ")
+                    ACE_TEXT("supplied string contains no comma or slash: %s\n"),
+                    str));
+      len = ACE_OS::strlen (str);
+    }
+  else if (comma_pos == 0 || comma_pos > slash_pos)
+    len = (slash_pos - str);
+  else len = comma_pos - str;
+  return this->make_profile(ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
 int
 TAO_Connector::make_mprofile (const char *string,
                               TAO_MProfile &mprofile
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index 73347185874..e05a3c1eed3 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -75,12 +75,22 @@ public:
   CORBA::ULong tag (void) const;
 
   /// Parse a string containing a URL style IOR and return an
-  /// MProfile.
+  /// MProfile.  Verify that ior is in the correct format.
   int make_mprofile (
       const char *ior,
       TAO_MProfile &mprofile
       ACE_ENV_ARG_DECL);
 
+  /// Helper function to assist corbaloc parsing. The default simply validates
+  /// the protocol identifyier 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
+  /// empty profile of the correct type, obtained from make_profile().
+  virtual TAO_Profile * corbaloc_scan (const char *ior,
+                                       size_t &len
+                                       ACE_ENV_ARG_DECL);
+
   ///  Initialize object and register with reactor.
   virtual int open (
       TAO_ORB_Core *orb_core) = 0;
diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc
index 031535adc89..2b4b00c59bb 100644
--- a/TAO/tao/TypeCodeFactory.mpc
+++ b/TAO/tao/TypeCodeFactory.mpc
@@ -26,4 +26,8 @@ project : taolib, core, ifr_client {
   PIDL_Files {
     TypeCodeFactory
   }
+
+  Pkgconfig_Files {
+    TypeCodeFactory/TAO_TypeCodeFactory.pc.in
+  }
 }
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index c186db28aa4..d5c7725b71d 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -6,9 +6,10 @@
 #include "tao/Marshal.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
-#include "tao/Any_Impl.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/SystemException.h"
 
+#include "ace/SString.h"
 #include "ace/Containers_T.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
@@ -188,7 +189,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
               raw_default_index = i;
               // Only the multiple labels that come before the
               // default label affect its adjusted value.
-              default_index = ACE_static_cast (CORBA::Long, i - dups);
+              default_index = static_cast<CORBA::Long> (i - dups);
             }
         }
       else
@@ -254,7 +255,8 @@ TAO_TypeCodeFactory_i::create_union_tc (
             }
         }
 
-      CORBA::TCKind kind = discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind kind =
+        discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       if (index == raw_default_index)
         {
@@ -269,7 +271,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
           CORBA::Boolean good_label =
             members[index].label.impl ()->marshal_value (cdr);
 
-          if (good_label == 0)
+          if (!good_label)
             {
               return CORBA::TypeCode::_nil ();
             }
@@ -561,7 +563,7 @@ TAO_TypeCodeFactory_i::create_recursive_tc (
   // value -1 goes where the TCKind would go for any
   // other embedded typecode.
   CORBA::TCKind rec_kind =
-    ACE_static_cast (CORBA::TCKind, max_neg);
+    static_cast<CORBA::TCKind> (max_neg);
 
   return this->assemble_tc (cdr,
                             rec_kind,
@@ -770,9 +772,28 @@ TAO_TypeCodeFactory_i::compute_default_label (
 #endif /* ACE_LACKS_LONGLONG_T */
             case CORBA::tk_enum:
             {
-              TAO_InputCDR cdr (members[i].label._tao_get_cdr (),
-                                members[i].label._tao_byte_order ());
-              cdr.read_ulong (u.enum_val);
+              TAO::Any_Impl *impl = members[i].label.impl ();
+              TAO_InputCDR for_reading (static_cast<ACE_Message_Block *> (0));
+              
+              if (impl->encoded ())
+                {
+                  TAO::Unknown_IDL_Type *unk =
+                    dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+                    
+                  // We don't want unk's rd_ptr to move, in case
+                  // we are shared by another Any, so we use this
+                  // to copy the state, not the buffer.
+                  for_reading = unk->_tao_get_cdr ();
+                }
+              else
+                {
+                  TAO_OutputCDR out;
+                  impl->marshal_value (out);
+                  TAO_InputCDR tmp (out);
+                  for_reading = tmp;
+                }
+                
+              for_reading.read_ulong (u.enum_val);
 
               if (u.enum_val == dv.enum_val)
                 {
@@ -1425,9 +1446,28 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA::UnionMemberSeq &members
               break;
             case CORBA::tk_enum:
             {
-              TAO_InputCDR cdr (members[i].label._tao_get_cdr (),
-                                members[i].label._tao_byte_order ());
-              cdr.read_ulong (s.enum_val);
+              TAO::Any_Impl *impl = members[i].label.impl ();
+              TAO_InputCDR for_reading (static_cast<ACE_Message_Block *> (0));
+              
+              if (impl->encoded ())
+                {
+                  TAO::Unknown_IDL_Type *unk =
+                    dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+                    
+                  // We don't want unk's rd_ptr to move, in case
+                  // we are shared by another Any, so we use this
+                  // to copy the state, not the buffer.
+                  for_reading = unk->_tao_get_cdr ();
+                }
+              else
+                {
+                  TAO_OutputCDR out;
+                  impl->marshal_value (out);
+                  TAO_InputCDR tmp (out);
+                  for_reading = tmp;
+                }
+                
+              for_reading.read_ulong (s.enum_val);
 
               if (checker.insert (s.enum_val) != 0)
                 {
@@ -1504,12 +1544,10 @@ TAO_TypeCodeFactory_i::update_map (
   )
 {
   ptrdiff_t unaligned_offset =
-    ACE_static_cast (ptrdiff_t,
-                     cdr.total_length ());
+    static_cast<ptrdiff_t> (cdr.total_length ());
 
   CORBA::Long aligned_offset =
-    ACE_static_cast (CORBA::Long,
-                     ACE_align_binary (unaligned_offset,
+    static_cast<CORBA::Long> (ACE_align_binary (unaligned_offset,
                                        sizeof (CORBA::Long)));
 
   CORBA::TypeCode::OFFSET_MAP *member_offset_map = member_tc->offset_map ();
@@ -1522,11 +1560,10 @@ TAO_TypeCodeFactory_i::update_map (
   // For anything except the immediate product of create_recursive_tc,
   // the insertion of a member will include an encap length.
   CORBA::Long member_encap_len_bytes =
-    member_tc->kind_ == ~0 ? 0 : ACE_static_cast (CORBA::Long,
-                                                  sizeof (CORBA::Long));
+    member_tc->kind_ == ~0 ? 0 : static_cast<CORBA::Long> (sizeof (CORBA::Long));
 
   CORBA::Long tc_kind_bytes =
-    ACE_static_cast (CORBA::Long, sizeof (CORBA::TCKind));
+    static_cast<CORBA::Long> (sizeof (CORBA::TCKind));
 
   for (CORBA::TypeCode::OFFSET_MAP_ITERATOR iter (*member_offset_map);
        ! iter.done ();
@@ -1572,8 +1609,7 @@ TAO_TypeCodeFactory_i::update_map (
           else
             {
               const char *slot =
-                member_tc->buffer_ + ACE_static_cast (ptrdiff_t,
-                                                      *list_entry);
+                member_tc->buffer_ + static_cast<ptrdiff_t> (*list_entry);
 
               CORBA::Long recursion_offset =
                 -1 * (aligned_offset
@@ -1584,24 +1620,18 @@ TAO_TypeCodeFactory_i::update_map (
                       + tc_kind_bytes);             // Top level TCKind.
 
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-              *ACE_reinterpret_cast (CORBA::Long *,
-                                     ACE_const_cast (char *,
-                                                     slot)) =
+              *reinterpret_cast<CORBA::Long *> (const_cast<char *> (slot)) =
                 recursion_offset;
 #else
               if (! cdr.do_byte_swap ())
                 {
-                  *ACE_reinterpret_cast (CORBA::Long *,
-                                         ACE_const_cast (char *,
-                                                         slot)) =
+                  *reinterpret_cast<CORBA::Long *> (const_cast<char *> (slot)) =
                     recursion_offset;
                 }
               else
                 {
-                  ACE_CDR::swap_4 (ACE_reinterpret_cast (char *,
-                                                         &recursion_offset),
-                                   ACE_const_cast (char *,
-                                                   slot));
+                  ACE_CDR::swap_4 (reinterpret_cast<char *> (&recursion_offset),
+                                   const_cast<char *> (slot));
                 }
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
             }
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 22f40bb19f0..680ae5f94b6 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -21,6 +21,7 @@
 #include "Any_Unknown_IDL_Type.h"
 #include "ORB_Constants.h"
 #include "SystemException.h"
+#include "orb_typesC.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
     || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -2812,10 +2813,10 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n
         }
 
       TAO::Unknown_IDL_Type *impl = 0;
+      TAO_InputCDR in (out);
       ACE_NEW_THROW_EX (impl,
                         TAO::Unknown_IDL_Type (label_tc,
-                                               out.begin (),
-                                               ACE_CDR_BYTE_ORDER),
+                                               in),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -3677,35 +3678,6 @@ namespace TAO
   }
 }
 
-/*static*/ CORBA::TypeCode_ptr
-CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
-{
-  if (tc)
-    {
-      if (tc->orb_owns_)
-        {
-          tc->_incr_refcnt ();
-          return tc;
-        }
-      else
-        {
-          CORBA::TypeCode_ptr tmp = 0;
-          ACE_NEW_RETURN (tmp,
-              CORBA::TypeCode (static_cast<CORBA::TCKind> (tc->kind_),
-                               tc->length_,
-                               tc->buffer_,
-                               true,
-                               0,
-                               tc->parent_),
-                          0);
-
-          return tmp;
-        }
-    }
-
-  return 0;
-}
-
 // ****************************************************************
 
 CORBA::Boolean
@@ -3825,27 +3797,6 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
   return 1;
 }
 
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const CORBA::TCKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm, CORBA::TCKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
-
-  if (_tao_result == 1)
-    {
-      _tao_enumval = ACE_static_cast (CORBA::TCKind, _tao_temp);
-    }
-
-  return _tao_result;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash_Map_Entry<const char *,
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index a853dd4a39d..6a639b38ccb 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -36,6 +36,9 @@
 #include "tao/TC_Constants_Forward.h"
 #include "tao/OBV_Constants.h"
 #include "tao/CORBA_methods.h"
+#include "tao/Sequence_T.h"
+#include "tao/Typecode_typesC.h"
+#include "tao/TAO_Export.h"
 
 // Forward declarations.
 class TAO_InputCDR;
@@ -48,70 +51,11 @@ namespace TAO
 
 namespace CORBA
 {
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
+   class TypeCode;
+   typedef TypeCode *TypeCode_ptr;
 
-  typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
-  typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
-
-  enum TCKind
-  {
-    // = Kinds of typecodes.
-
-    // Do not change these enum values, or duplicate them if you need
-    // to add values.  They are used to index tables, and if you
-    // change the values you'll need to find and update all of those
-    // tables.  The values are also part of the Common Data
-    // Representation, and hence are part of IIOP and other ORB
-    // protocols.
-
-    tk_null               = 0,
-    tk_void               = 1,
-    tk_short              = 2,
-    tk_long               = 3,
-    tk_ushort             = 4,
-    tk_ulong              = 5,
-    tk_float              = 6,
-    tk_double             = 7,
-    tk_boolean            = 8,
-    tk_char               = 9,
-    tk_octet              = 10,
-    tk_any                = 11,
-    tk_TypeCode           = 12,
-    tk_Principal          = 13,
-    tk_objref             = 14,
-    tk_struct             = 15,
-    tk_union              = 16,
-    tk_enum               = 17,
-    tk_string             = 18,
-    tk_sequence           = 19,
-    tk_array              = 20,
-    tk_alias              = 21,
-    tk_except             = 22,
-
-    tk_longlong           = 23,
-    tk_ulonglong          = 24,
-    tk_longdouble         = 25,
-    tk_wchar              = 26,
-    tk_wstring            = 27,
-    tk_fixed              = 28,
-    tk_value              = 29,
-    tk_value_box          = 30,
-    tk_native             = 31,
-    tk_abstract_interface = 32,
-    tk_local_interface    = 33,
-    tk_component          = 34,
-    tk_home               = 35,
-    tk_event              = 36,
-
-    // This symbol is not defined by CORBA 3.0.  It's used to speed up
-    // dispatch based on TCKind values, and lets many important ones
-    // just be table lookups.  It must always be the last enum value!!
-
-    TC_KIND_COUNT
-  };
-
-  typedef TCKind &TCKind_out;
+   typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
+   typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
 
   /**
    * @class TypeCode
@@ -190,7 +134,6 @@ namespace CORBA
 
     /// Duplicates i.e., increments ref count.
     static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc);
-    static void _release (CORBA::TypeCode_ptr tc);
 
     /// Returns a NULL typecode.
     static CORBA::TypeCode_ptr _nil (void);
@@ -291,16 +234,19 @@ namespace CORBA
      * parent
      */
     TypeCode (CORBA::TCKind kind,
-              size_t length,
-              const char *buffer,
-              CORBA::Boolean orb_owns_tc,
-              CORBA::ULong size,
-              CORBA::TypeCode_ptr parent = 0);
+                    size_t length,
+                    const char *buffer,
+                    CORBA::Boolean orb_owns_tc,
+                    CORBA::ULong size,
+                    CORBA::TypeCode_ptr parent = 0);
 
     /// destructor
     ~TypeCode (void);
 
-
+    /// These are used to indicate the status of marshaling.
+    // Reference counting operations.
+    CORBA::ULong _incr_refcnt (void);
+    CORBA::ULong _decr_refcnt (void);
 
     // = Following three are deprecated
 
@@ -402,12 +348,8 @@ namespace CORBA
     // Useful for template programming.
 
   private:
-
     // = All the private/helper methods
-    /// These are used to indicate the status of marshaling.
-    // Reference counting operations.
-    CORBA::ULong _incr_refcnt (void);
-    CORBA::ULong _decr_refcnt (void);
+
     /**
      * equal() and equivalent() must both recurse, but their
      * behavior is somewhat different (as defined in CORBA 2.3).
@@ -622,13 +564,19 @@ namespace TAO
   };
 
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::TypeCode>
+  struct TAO_Export Objref_Traits< ::CORBA::TypeCode>
   {
-    static CORBA::TypeCode_ptr duplicate (CORBA::TypeCode_ptr);
-    static void release (CORBA::TypeCode_ptr);
-    static CORBA::TypeCode_ptr nil (void);
-    static CORBA::Boolean marshal (CORBA::TypeCode_ptr p,
-                                   TAO_OutputCDR & cdr);
+    static ::CORBA::TypeCode_ptr duplicate (
+        ::CORBA::TypeCode_ptr
+      );
+    static void release (
+        ::CORBA::TypeCode_ptr
+      );
+    static ::CORBA::TypeCode_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::TypeCode_ptr p,
+        TAO_OutputCDR & cdr
+      );
   };
 
   /**
@@ -688,6 +636,15 @@ namespace TAO
   };
 }  // End TAO namespace
 
+// Workaround for a Visual Studio .NET bug where this class is not
+// properly imported by an application if typedef'd or subclassed,
+// resulting in 'multiply defined' link errors. The export macro
+// here forces an explicit import by the application. Please see
+// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+  template class TAO_Export TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
 // --------------------------------------------------------------
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
@@ -695,12 +652,6 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
                                       CORBA::TypeCode *&x);
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &,
-                                      const CORBA::TCKind &);
-
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &,
-                                      CORBA::TCKind &);
-
 #if defined (__ACE_INLINE__)
 # include "tao/Typecode.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
index 7b49dd5c5ad..6c6f85e2fd2 100644
--- a/TAO/tao/Typecode.i
+++ b/TAO/tao/Typecode.i
@@ -9,7 +9,6 @@ CORBA::TypeCode::_incr_refcnt (void)
   return this->refcount_++;
 }
 
-
 ACE_INLINE CORBA::ULong
 CORBA::TypeCode::_decr_refcnt (void)
 {
@@ -23,16 +22,12 @@ CORBA::TypeCode::_decr_refcnt (void)
   return 0;
 }
 
-/*static*/ ACE_INLINE void
-CORBA::TypeCode::_release (CORBA::TypeCode_ptr tc)
+ACE_INLINE CORBA::TypeCode_ptr
+CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
 {
   if (tc)
-    {
-      if (tc->orb_owns_ == false)
-        return;
-
-      tc->_decr_refcnt ();
-    }
+    tc->_incr_refcnt ();
+  return tc;
 }
 
 ACE_INLINE CORBA::TypeCode_ptr
@@ -132,5 +127,7 @@ CORBA::is_nil (CORBA::TypeCode_ptr obj)
 ACE_INLINE void
 CORBA::release (CORBA::TypeCode_ptr obj)
 {
-  CORBA::TypeCode::_release (obj);
+  if (obj)
+    obj->_decr_refcnt ();
 }
+
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index d842c153221..021f2815601 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -96,7 +96,6 @@ namespace CORBA
   // Some more typecodes in the CORBA namespace. We keep adding
   // to this list as we find more and more things being introduced
   // to the CORBA namespace.
-  TypeCode_ptr  _tc_ORBid = 0;
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
      TypeCode_ptr  _tc_NamedValue = 0;
@@ -311,30 +310,6 @@ namespace TAO
                               1,
                               sizeof (CORBA::TypeCode::BadKind)));
 
-    static const CORBA::Long _oc_CORBA_ORBid[] =
-    {
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      28, ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4f52),
-      ACE_NTOHL (0x4269643a),
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ORBid:1.0
-      6,
-      ACE_NTOHL (0x4f524269),
-      ACE_NTOHL (0x64000000),  // name = ORBid
-      CORBA::tk_string,
-      0, // string length
-    };
-
-    ACE_NEW (CORBA::_tc_ORBid,
-             CORBA::TypeCode (CORBA::tk_alias,
-                              sizeof (_oc_CORBA_ORBid),
-                              (char *) &_oc_CORBA_ORBid,
-                              0,
-                              sizeof (CORBA::ORBid)));
-
   #if (TAO_HAS_MINIMUM_CORBA == 0)
 
     static const CORBA::Long _oc_corba_NamedValue[] =
@@ -495,8 +470,6 @@ namespace TAO
 
     CORBA::release (CORBA::TypeCode::_tc_BadKind);
 
-    CORBA::release (CORBA::_tc_ORBid);
-
   #if (TAO_HAS_MINIMUM_CORBA == 0)
 
     CORBA::release (CORBA::_tc_NamedValue);
diff --git a/TAO/tao/ULongLongSeqA.cpp b/TAO/tao/ULongLongSeqA.cpp
index e94a3f5f9f2..18b0e481b5a 100644
--- a/TAO/tao/ULongLongSeqA.cpp
+++ b/TAO/tao/ULongLongSeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "ULongLongSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ULongLongSeq[] =
 {
@@ -64,7 +66,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ULongLongSeq (
     sizeof (_oc_CORBA_ULongLongSeq),
     (char *) &_oc_CORBA_ULongLongSeq,
     0,
-    sizeof (CORBA::ULongLongSeq)
+    0
   );
 
 namespace CORBA
@@ -74,7 +76,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -131,8 +133,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -147,5 +147,4 @@ CORBA::Boolean operator>>= (
         CORBA::ULongLongSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp
index 76ef2292145..b536857964e 100644
--- a/TAO/tao/ULongLongSeqC.cpp
+++ b/TAO/tao/ULongLongSeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "ULongLongSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "ULongLongSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_ULONGLONGSEQ_CS_)
 #define _CORBA_ULONGLONGSEQ_CS_
@@ -104,7 +103,7 @@ void CORBA::ULongLongSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_
 #define _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h
index 01c3cb9341f..cd37efb8b0f 100644
--- a/TAO/tao/ULongLongSeqC.h
+++ b/TAO/tao/ULongLongSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_ULONGLONGSEQC_H_
 #define _TAO_IDL_ORIG_ULONGLONGSEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -59,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ULONGLONGSEQ_CH_)
 #define _CORBA_ULONGLONGSEQ_CH_
@@ -124,17 +123,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ULongLongSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -142,7 +141,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::ULongLongSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongLongSeq*); // noncopying version
@@ -150,7 +149,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongLongSeq *
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongLongSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_ULongLongSeq_H_
 #define _TAO_CDR_OP_CORBA_ULongLongSeq_H_
@@ -167,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "ULongLongSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -185,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/ULongLongSeqC.inl b/TAO/tao/ULongLongSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/ULongLongSeqC.inl
+++ b/TAO/tao/ULongLongSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/ULongLongSeqS.h b/TAO/tao/ULongLongSeqS.h
index 64d7e2feb87..823320e2f57 100644
--- a/TAO/tao/ULongLongSeqS.h
+++ b/TAO/tao/ULongLongSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_ULONGLONGSEQS_H_
 #define _TAO_IDL_ORIG_ULONGLONGSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp
index 361baf4aff0..dcae28f1e63 100644
--- a/TAO/tao/ULongSeqA.cpp
+++ b/TAO/tao/ULongSeqA.cpp
@@ -27,26 +27,28 @@
 
 #include "ULongSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ULongSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f554c),
-  ACE_NTOHL (0x6f6e6753),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f554c), 
+  ACE_NTOHL (0x6f6e6753), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ULongSeq:1.0
     9,
-  ACE_NTOHL (0x554c6f6e),
-  ACE_NTOHL (0x67536571),
+  ACE_NTOHL (0x554c6f6e), 
+  ACE_NTOHL (0x67536571), 
   ACE_NTOHL (0x0),  // name = ULongSeq
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -62,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ULongSeq (
     sizeof (_oc_CORBA_ULongSeq),
     (char *) &_oc_CORBA_ULongSeq,
     0,
-    sizeof (CORBA::ULongSeq)
+    0
   );
 
 namespace CORBA
@@ -71,7 +73,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_ULongSeq;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -108,8 +110,8 @@ CORBA::Boolean operator>>= (
     CORBA::ULongSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::ULongSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::ULongSeq *&> (
       _tao_elem
     );
 }
@@ -129,8 +131,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -145,5 +145,4 @@ CORBA::Boolean operator>>= (
         CORBA::ULongSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp
index 7196334371f..9d8b43281e3 100644
--- a/TAO/tao/ULongSeqC.cpp
+++ b/TAO/tao/ULongSeqC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "ULongSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ULongSeqC.i"
+#include "ULongSeqC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -97,7 +96,7 @@ void CORBA::ULongSeq::_tao_any_destructor (
   )
 {
   ULongSeq * _tao_tmp_pointer =
-    ACE_static_cast (ULongSeq *, _tao_void_pointer);
+    static_cast<ULongSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -114,7 +113,7 @@ CORBA::Boolean operator<< (
     const CORBA::ULongSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h
index c15eda5ca82..7de33124933 100644
--- a/TAO/tao/ULongSeqC.h
+++ b/TAO/tao/ULongSeqC.h
@@ -26,20 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_ULONGSEQC_H_
 #define _TAO_IDL_ORIG_ULONGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
@@ -58,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -166,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ULongSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "ULongSeqC.i"
+#include "ULongSeqC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -184,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/ULongSeqC.i b/TAO/tao/ULongSeqC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/ULongSeqC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/ULongSeqS.h b/TAO/tao/ULongSeqS.h
index 291cad079f8..292028c2617 100644
--- a/TAO/tao/ULongSeqS.h
+++ b/TAO/tao/ULongSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:411
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_ULONGSEQS_H_
 #define _TAO_IDL_ORIG_ULONGSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,22 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1014
+// be\be_codegen.cpp:997
 
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -80,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp
index 4ac3c33892f..9d928bed612 100644
--- a/TAO/tao/UShortSeqA.cpp
+++ b/TAO/tao/UShortSeqA.cpp
@@ -27,26 +27,28 @@
 
 #include "UShortSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_UShortSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5553),
-  ACE_NTOHL (0x686f7274),
-  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5553), 
+  ACE_NTOHL (0x686f7274), 
+  ACE_NTOHL (0x5365713a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/UShortSeq:1.0
     10,
-  ACE_NTOHL (0x5553686f),
-  ACE_NTOHL (0x72745365),
+  ACE_NTOHL (0x5553686f), 
+  ACE_NTOHL (0x72745365), 
   ACE_NTOHL (0x71000000),  // name = UShortSeq
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -62,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_UShortSeq (
     sizeof (_oc_CORBA_UShortSeq),
     (char *) &_oc_CORBA_UShortSeq,
     0,
-    sizeof (CORBA::UShortSeq)
+    0
   );
 
 namespace CORBA
@@ -71,7 +73,7 @@ namespace CORBA
     &_tc_TAO_tc_CORBA_UShortSeq;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -108,8 +110,8 @@ CORBA::Boolean operator>>= (
     CORBA::UShortSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::UShortSeq *&,
+  return _tao_any >>= const_cast<
+      const CORBA::UShortSeq *&> (
       _tao_elem
     );
 }
@@ -129,8 +131,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -145,5 +145,4 @@ CORBA::Boolean operator>>= (
         CORBA::UShortSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp
index 4597fa1f108..f3cf5dcfc09 100644
--- a/TAO/tao/UShortSeqC.cpp
+++ b/TAO/tao/UShortSeqC.cpp
@@ -26,23 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "UShortSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "UShortSeqC.i"
+#include "UShortSeqC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -97,7 +96,7 @@ void CORBA::UShortSeq::_tao_any_destructor (
   )
 {
   UShortSeq * _tao_tmp_pointer =
-    ACE_static_cast (UShortSeq *, _tao_void_pointer);
+    static_cast<UShortSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -114,7 +113,7 @@ CORBA::Boolean operator<< (
     const CORBA::UShortSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h
index 0a7cf275a8b..d0f5dfe4930 100644
--- a/TAO/tao/UShortSeqC.h
+++ b/TAO/tao/UShortSeqC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_USHORTSEQC_H_
 #define _TAO_IDL_ORIG_USHORTSEQC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -57,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -72,22 +73,22 @@
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_USHORTSEQ_CH_)
 #define _CORBA_USHORTSEQ_CH_
-
+  
   class UShortSeq;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         UShortSeq,
         CORBA::UShort
       >
     UShortSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         UShortSeq,
@@ -95,7 +96,7 @@ namespace CORBA
         CORBA::UShort
       >
     UShortSeq_out;
-
+  
   class TAO_Export UShortSeq
     : public
         TAO_Unbounded_Sequence<
@@ -108,22 +109,22 @@ namespace CORBA
     UShortSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::UShort* buffer,
+        CORBA::UShort* buffer, 
         CORBA::Boolean release = 0
       );
     UShortSeq (const UShortSeq &);
     ~UShortSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef UShortSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UShortSeq;
 
 // TAO_IDL - Generated from
@@ -177,13 +178,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "UShortSeqC.i"
+#include "UShortSeqC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -195,3 +196,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/UShortSeqC.i b/TAO/tao/UShortSeqC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/UShortSeqC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/UShortSeqS.h b/TAO/tao/UShortSeqS.h
index a5ad94c61c9..4ab4043b33d 100644
--- a/TAO/tao/UShortSeqS.h
+++ b/TAO/tao/UShortSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:411
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_USHORTSEQS_H_
 #define _TAO_IDL_ORIG_USHORTSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,21 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1014
+// be\be_codegen.cpp:997
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -79,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/UTF16_BOM_Factory.cpp b/TAO/tao/UTF16_BOM_Factory.cpp
index 3330fcfaeac..9bf0443682a 100644
--- a/TAO/tao/UTF16_BOM_Factory.cpp
+++ b/TAO/tao/UTF16_BOM_Factory.cpp
@@ -18,14 +18,19 @@
 // ============================================================================
 
 #include "UTF16_BOM_Factory.h"
+#include "ace/OS_NS_strings.h"
+#include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
+// Instantiate templates that allow discovery of this factory
+// via the Service Manager.
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_Codeset_Translator_Factory_T<UTF16_BOM_Translator>;
+template class ACE_Dynamic_Service<UTF16_BOM_Factory>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_Codeset_Translator_Factory_T<UTF16_BOM_Translator>
+#pragma instantiate ACE_Dynamic_Service<UTF16_BOM_Factory>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
@@ -37,3 +42,106 @@ ACE_STATIC_SVC_DEFINE (UTF16_BOM_Factory,
                        | ACE_Service_Type::DELETE_OBJ,
                        0)
 ACE_FACTORY_DEFINE (TAO, UTF16_BOM_Factory)
+ACE_STATIC_SVC_REQUIRE (UTF16_BOM_Factory)
+
+UTF16_BOM_Factory::UTF16_BOM_Factory ()
+  : translator_ (0)
+  , forceBE_ (false)
+{
+}
+
+UTF16_BOM_Factory::~UTF16_BOM_Factory ()
+{
+  delete this->translator_;
+}
+
+int
+UTF16_BOM_Factory::init (int argc, ACE_TCHAR *argv[])
+{
+  TAO_Codeset_Translator_Factory::init (argc, argv);
+
+  for (int narg = 0; narg < argc;)
+  {
+    int consumed = parse_one_arg (argc - narg, &argv[narg]);
+    if (consumed > 0)
+    {
+      narg += consumed;
+    }
+    else
+    {
+      ACE_ERROR ((LM_ERROR,
+        ACE_TEXT ("(%P|%t)UTF16_BOM_Factory parameter error: %s\n")
+        ACE_TEXT ("Usage: UTF16_BOM_Factory \"-forceBE\"\n")
+        , argv[narg]
+        ));
+      return -1;
+    }
+  }
+  return 0;
+}
+
+int
+UTF16_BOM_Factory::parse_one_arg (int argc, ACE_TCHAR *argv[])
+{
+  int consumed = 0;
+  if ((argc > 0) && (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-forcebe")) == 0))
+  {
+    this->forceBE_ = true;
+    consumed = 1;
+  }
+  return consumed;
+}
+
+CONV_FRAME::CodeSetId
+UTF16_BOM_Factory::ncs () const
+{
+  create_translator();
+  return this->translator_->ncs();
+}
+
+CONV_FRAME::CodeSetId
+UTF16_BOM_Factory::tcs () const
+{
+  create_translator();
+  return this->translator_->tcs();
+}
+
+// Assign either a reference to the existing translator or a new translator
+// for input CDR streams
+void
+UTF16_BOM_Factory::assign (TAO_InputCDR *cdr) const
+{
+  if (cdr)
+    {
+      create_translator ();
+      this->assign_i (cdr, this->translator_);
+    }
+}
+
+// Assign either a reference to the existing translator or a new translator
+// for output CDR streams
+void
+UTF16_BOM_Factory::assign (TAO_OutputCDR *cdr) const
+{
+  if (cdr)
+    {
+      create_translator ();
+      this->assign_i (cdr, this->translator_);
+    }
+}
+
+void
+UTF16_BOM_Factory::create_translator () const
+{
+  if (this->translator_ == 0)
+  {
+    UTF16_BOM_Factory * pthis = const_cast<UTF16_BOM_Factory *> (this);
+    ACE_NEW (pthis->translator_, UTF16_BOM_Translator (this->forceBE_));
+    if (this->translator_ == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+        ACE_TEXT ("(%P|%t) UTF16_BOM_Factory cannot create UTF16_BOM_Translator\n")
+        ));
+    }
+  }
+}
diff --git a/TAO/tao/UTF16_BOM_Factory.h b/TAO/tao/UTF16_BOM_Factory.h
index 50d7c6f3cb7..98261fe35cc 100644
--- a/TAO/tao/UTF16_BOM_Factory.h
+++ b/TAO/tao/UTF16_BOM_Factory.h
@@ -26,7 +26,37 @@
 
 #include "UTF16_BOM_Translator.h"
 
-typedef TAO_Export TAO_Codeset_Translator_Factory_T<UTF16_BOM_Translator> UTF16_BOM_Factory;
+class TAO_Export UTF16_BOM_Factory : public  TAO_Codeset_Translator_Factory
+{
+public:
+  UTF16_BOM_Factory ();
+  virtual ~UTF16_BOM_Factory ();
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+
+  /// ncs returns the translator's native codeset ID.
+  CONV_FRAME::CodeSetId ncs () const;
+  /// tcs returns the translator's transmission codeset ID.
+  CONV_FRAME::CodeSetId tcs () const;
+
+  /// Assign the translator to the input CDR. The inherited assign_i is used
+  /// to assign either a char or wchar translator, depending on the base type
+  /// of NCS_TO_TCS. A null input CDR is permitted, in which case assign is a
+  /// no-op.
+  virtual void assign (TAO_InputCDR *) const;
+  /// Assign the translator to the output CDR. The inherited assign_i is used
+  /// to assign either a char or wchar translator, depending on the base type
+  /// of NCS_TO_TCS. A null output CDR is permitted, in which case assign is a
+  /// no-op.
+  virtual void assign (TAO_OutputCDR *) const;
+
+private:
+  void create_translator () const;
+  int parse_one_arg (int argc, ACE_TCHAR *argv[]);
+
+private:
+  UTF16_BOM_Translator *translator_;
+  bool forceBE_;    // force big endian wchar, warray, & wstring
+};
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, UTF16_BOM_Factory)
 ACE_FACTORY_DECLARE (TAO, UTF16_BOM_Factory)
diff --git a/TAO/tao/UTF16_BOM_Translator.cpp b/TAO/tao/UTF16_BOM_Translator.cpp
index 10318168834..716bbde3f2a 100644
--- a/TAO/tao/UTF16_BOM_Translator.cpp
+++ b/TAO/tao/UTF16_BOM_Translator.cpp
@@ -14,7 +14,8 @@
 
 #include "UTF16_BOM_Translator.h"
 #include "ace/OS_Memory.h"
-
+#include "tao/debug.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (tao,
            UTF16_BOM_Translator,
@@ -32,14 +33,15 @@ static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU;
 /////////////////////////////
 // UTF16_BOM_Translator implementation
 
-UTF16_BOM_Translator::UTF16_BOM_Translator (void)
+UTF16_BOM_Translator::UTF16_BOM_Translator (bool forceBE)
+  : forceBE_(forceBE)
 {
-
+  if (TAO_debug_level > 1)
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT ("(%P|%t)UTF16_BOM_Translator:forceBE %d\n"), this->forceBE_?1:0 ));
 }
 
 UTF16_BOM_Translator::~UTF16_BOM_Translator (void)
 {
-
 }
 
 // = Documented in $ACE_ROOT/ace/CDR_Stream.h
@@ -249,27 +251,43 @@ ACE_CDR::Boolean
 UTF16_BOM_Translator::write_wchar (ACE_OutputCDR &cdr,
                                    ACE_CDR::WChar x)
 {
-  return this->write_wchar_i (cdr, x, 1);
+  return this->write_wchar_i (cdr, x, true);
 }
 
 ACE_CDR::Boolean
 UTF16_BOM_Translator::write_wchar_i (ACE_OutputCDR &cdr,
                                      ACE_CDR::WChar x,
-                                     int use_BOM)
+                                     bool allow_BOM)
 {
   if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1
       && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1)
     {
       int len = 0;
       ACE_CDR::UShort buffer[2];
-      if (use_BOM)
+
+      if( allow_BOM && cdr.byte_order())
         {
           len = 2;
-          buffer[0] = ACE_UNICODE_BOM_CORRECT;
-          buffer[1] = static_cast<ACE_CDR::Short> (x);
+#if defined (ACE_LITTLE_ENDIAN)
+          if (this->forceBE_)
+            {
+              // force both the byte order mark and the data to Big Endian order
+              buffer[0] = ACE_UNICODE_BOM_SWAPPED;
+              ACE_CDR::swap_2 (reinterpret_cast<const char *> (&x),
+                              reinterpret_cast<char *> (&buffer[1]));
+            }
+          else
+#endif
+            {
+              // store both the byte order mark and the data in native order
+              buffer[0] = ACE_UNICODE_BOM_CORRECT;
+              buffer[1] = static_cast<ACE_CDR::Short> (x);
+            }
         }
       else
         {
+          // not using a byte order mark
+          // force it to be big endian w/o BOM
           len = 1;
           if (cdr.byte_order ())
             ACE_CDR::swap_2 (reinterpret_cast<const char *> (&x),
@@ -304,17 +322,35 @@ UTF16_BOM_Translator::write_wstring (ACE_OutputCDR & cdr,
                                      ACE_CDR::ULong len,
                                      const ACE_CDR::WChar *x)
 {
+  // we'll accept a null pointer but only for an empty string
+  ACE_ASSERT (x != 0 || len == 0);
   if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1
       && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1)
     {
-      ACE_CDR::ULong l = (len+1) * ACE_UTF16_CODEPOINT_SIZE;
-      if (this->write_4 (cdr, &l) &&
-          this->write_2 (cdr, &ACE_UNICODE_BOM_CORRECT) &&
-          x != 0)
-        return this->write_wchar_array_i (cdr, x, len);
+      if (len == 0) // for zero length strings, only write a length of
+                    // zero. The BOM is not needed in this case.
+        return this->write_4(cdr, &len);
+
+      if (this->forceBE_ && cdr.byte_order())
+        {
+          ACE_CDR::ULong l = (len+1) * ACE_UTF16_CODEPOINT_SIZE;
+          if (this->write_4 (cdr, &l) &&
+              this->write_2 (cdr, &ACE_UNICODE_BOM_SWAPPED) &&
+              x != 0)
+            return this->write_swapped_wchar_array_i (cdr, x, len);
+        }
+      else
+        {
+          ACE_CDR::ULong l = (len+1) * ACE_UTF16_CODEPOINT_SIZE;
+          if (this->write_4 (cdr, &l) &&
+              this->write_2 (cdr, &ACE_UNICODE_BOM_CORRECT) &&
+              x != 0)
+            return this->write_wchar_array_i (cdr, x, len);
+        }
     }
   else
     {
+      // pre GIOP 1.2:  include null terminator in length
       ACE_CDR::ULong l = len + 1;
       if (this->write_4 (cdr, &l))
         if (x != 0)
@@ -338,7 +374,7 @@ UTF16_BOM_Translator::write_wchar_array (ACE_OutputCDR & cdr,
       && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1)
     {
       for (size_t i = 0; i < length; ++i)
-        if (this->write_wchar_i (cdr, x[i]) == 0)
+        if (this->write_wchar_i (cdr, x[i], false) == 0)
           return 0;
 
       return 1;
@@ -371,3 +407,28 @@ UTF16_BOM_Translator::write_wchar_array_i (ACE_OutputCDR & cdr,
   return 1;
 
 }
+
+ACE_CDR::Boolean
+UTF16_BOM_Translator::write_swapped_wchar_array_i (ACE_OutputCDR & cdr,
+                                           const ACE_CDR::WChar *x,
+                                           ACE_CDR::ULong length)
+{
+  if (length == 0)
+    return 1;
+  char* buf;
+  static const size_t align = ACE_CDR::SHORT_ALIGN;
+  if (cdr.adjust (ACE_UTF16_CODEPOINT_SIZE * length, align, buf)
+      != 0)
+    {
+      return 0;
+    }
+
+  ACE_UTF16_T *sb = reinterpret_cast<ACE_UTF16_T *> (buf);
+
+  for (size_t i = 0; i < length; ++i)
+    {
+      ACE_CDR::swap_2 (reinterpret_cast<const char*> (&x[i]),
+                       reinterpret_cast<char *> (&sb[i]));
+    }
+  return 1;
+}
diff --git a/TAO/tao/UTF16_BOM_Translator.h b/TAO/tao/UTF16_BOM_Translator.h
index 88602c0f3ba..9a6e534cd9a 100644
--- a/TAO/tao/UTF16_BOM_Translator.h
+++ b/TAO/tao/UTF16_BOM_Translator.h
@@ -39,8 +39,9 @@
 class TAO_Export UTF16_BOM_Translator : public ACE_WChar_Codeset_Translator
 {
 public:
-  /// A do nothing constructor.
-  UTF16_BOM_Translator (void);
+  /// constructor
+  /// @param forceBE: true forces all wchar, warray, and wstrings to big-endian byte order
+  UTF16_BOM_Translator (bool forceBE);
 
   /// Virtual destruction
   virtual ~UTF16_BOM_Translator (void);
@@ -74,10 +75,18 @@ private:
                                         const ACE_CDR::WChar *,
                                         ACE_CDR::ULong);
 
+  ACE_CDR::Boolean write_swapped_wchar_array_i (ACE_OutputCDR & cdr,
+                                            const ACE_CDR::WChar *x,
+                                            ACE_CDR::ULong length);
+
+
   ACE_CDR::Boolean write_wchar_i (ACE_OutputCDR &,
                                   ACE_CDR::WChar ,
-                                  int use_BOM = 0);
+                                  bool allow_BOM);
 
+private:
+  /// if this flag is true, force wchar's to big endian order
+  bool forceBE_;
 
 };
 
diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc
index b57ba25bc19..fa0b92d3964 100644
--- a/TAO/tao/Utils.mpc
+++ b/TAO/tao/Utils.mpc
@@ -30,4 +30,7 @@ project : taolib, core, portableserver {
   PIDL_Files {
   }
 
+  Pkgconfig_Files {
+    TAO_Utils.pc.in
+  }
 }
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 6c340121e4e..18299880b5a 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -3,7 +3,9 @@
 
 #include "RIR_Narrow.h"
 #include "tao/SystemException.h"
-#include <stdexcept>
+#if defined (ACE_HAS_EXCEPTIONS)
+  #include <stdexcept>
+#endif
 
 ACE_RCSID (Utils,
            RIR_Narror,
@@ -47,7 +49,8 @@ TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object
 
   if (CORBA::is_nil (narrowed_object.in ()))
   {
-    ACE_THROW (CORBA::INV_OBJREF ());
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (),
+                      T::_nil ());
   }
   return narrowed_object._retn ();
 }
diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc
index 4cecf92a5f3..3d05f7a1d48 100644
--- a/TAO/tao/Valuetype.mpc
+++ b/TAO/tao/Valuetype.mpc
@@ -25,4 +25,8 @@ project : taolib, core {
 
   PIDL_Files {
   }
+
+  Pkgconfig_Files {
+    Valuetype/TAO_Valuetype.pc.in
+  }
 }
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index 320ecaa395b..3ad0c0c7b5f 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -37,8 +37,6 @@ CORBA::is_nil (CORBA::AbstractBase_ptr obj)
 
 // ************************************************************
 
-int CORBA::AbstractBase::_tao_class_id = 0;
-
 CORBA::AbstractBase::AbstractBase (void)
   : is_objref_ (0)
   , concrete_stubobj_ (0)
@@ -174,25 +172,36 @@ CORBA::AbstractBase::_to_value (void)
 CORBA::Boolean
 operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
 {
-  CORBA::Boolean discriminator = 0;
+  CORBA::Boolean discriminator = true;
+  
+  // We marshal a null abstract interface ptr as a discriminator
+  // plus null object reference (see CORBA::Object::marshal()
+  // and operator << for CORBA::Object).
+  if (CORBA::is_nil (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 ();
+    }
 
   if (abs->_is_objref ())
     {
-      discriminator = 1;
-
       if (strm << ACE_OutputCDR::from_boolean (discriminator))
         {
           TAO_Stub *stubobj = abs->_stubobj ();
 
           if (stubobj == 0)
             {
-              return 0;
+              return false;
             }
 
           // STRING, a type ID hint
           if ((strm << stubobj->type_id.in ()) == 0)
             {
-              return 0;
+              return false;
             }
 
           const TAO_MProfile& mprofile = stubobj->base_profiles ();
@@ -201,7 +210,7 @@ operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
 
           if ((strm << profile_count) == 0)
             {
-              return 0;
+              return false;
             }
 
           // @@ The MProfile should be locked during this iteration, is there
@@ -212,7 +221,7 @@ operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
 
               if (p->encode (strm) == 0)
                 {
-                  return 0;
+                  return false;
                 }
             }
 
@@ -221,11 +230,11 @@ operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
     }
   else
     {
-      discriminator = 0;
+      discriminator = false;
 
       if (strm << ACE_OutputCDR::from_boolean (discriminator))
         {
-          CORBA::Boolean retval = 1;
+          CORBA::Boolean retval = true;
 
           CORBA::ULong value_tag = TAO_OBV_GIOP_Flags::Value_tag_base
                                    | TAO_OBV_GIOP_Flags::Type_info_single;
@@ -248,7 +257,7 @@ operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
         }
     }
 
-  return 0;
+  return false;
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index 2c73a281074..ae6dd2f4524 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -68,8 +68,6 @@ namespace CORBA
     typedef CORBA::AbstractBase_ptr _ptr_type;
     typedef CORBA::AbstractBase_var _var_type;
 
-    static int _tao_class_id;
-
     static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj
                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index eb0524252fe..c8025ec12ed 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -87,7 +87,7 @@ CORBA::ValueBase::_tao_marshal (TAO_OutputCDR &strm,
                                 CORBA::ValueBase *this_,
                                 ptrdiff_t /* formal_type_id */)
 {
-  CORBA::Boolean retval = 1;
+  CORBA::Boolean retval = true;
   // %! yet much to do ... look for +++ !
 
   // 1. Is 'this' yet marshalled ? (->1a)
@@ -176,9 +176,9 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
                                           new_object,
                                           0);
 
-  if (retval == 0)
+  if (!retval)
     {
-      return 0;
+      return false;
     }
 
   if (factory.in () != 0)
@@ -212,7 +212,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
                                       const char * const repo_id)
 { // %! dont leak on error case !
   // %! postconditions
-  CORBA::Boolean retval = 1;
+  CORBA::Boolean retval = true;
   factory = 0;
   // %! yet much to do ... look for +++ !
 
@@ -228,7 +228,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
 
   if (!strm.read_ulong (value_tag))
     {
-      return 0;
+      return false;
     }
 
   if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
@@ -247,7 +247,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("!CORBA::ValueBase::_tao_unmarshal_pre ")
                   ACE_TEXT ("not value_tag\n")));
-      return 0;
+      return false;
     }
 
   // 3. if (chunking) read and record the blocksize-tag.
@@ -280,19 +280,20 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
      CORBA::String_var repo_id_stream;
 
      // It would be more efficient not to copy the string %!)
-     if (strm.read_string (repo_id_stream.inout ()) == 0)
+     if (!strm.read_string (repo_id_stream.inout ()))
      {
-        return 0;
+        return false;
      }
 
-     factory = orb_core->orb ()->lookup_value_factory (repo_id_stream.in ());
+     factory =
+      orb_core->orb ()->lookup_value_factory (repo_id_stream.in ());
   }
 
   if (factory == 0) // %! except.!
     {
       ACE_DEBUG ((LM_ERROR,
                   ACE_TEXT ("(%N:%l) OBV factory is null !!!\n")));
-      return 0;
+      return false;
     }
 
   return retval;
@@ -301,7 +302,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
 CORBA::Boolean
 CORBA::ValueBase::_tao_unmarshal_post (TAO_InputCDR &)
 {
-  CORBA::Boolean retval = 1;
+  CORBA::Boolean retval = true;
 
   // (... called from T::_tao_unmarshal)
   // 7. if (chunking) check the last blocksize tag for correct value.  +++
diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl
index b33cb762640..3b7d66658b5 100644
--- a/TAO/tao/Valuetype/ValueBase.inl
+++ b/TAO/tao/Valuetype/ValueBase.inl
@@ -61,11 +61,11 @@ TAO_OBV_GIOP_Flags::is_indirection (CORBA::ULong value)
 ACE_INLINE CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_block_size (CORBA::ULong value)
 {
-  return ( 0 < value && value < 0x7fffff00L);
+  return (0 < value && value < 0x7FFFFF00L);
 }
 
 ACE_INLINE CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
 {
-  return (0x80000000L < tag  && tag <= 0xFFFFFFFFL);
+  return (0x80000000L < tag);
 }
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
index cf0f39e5e55..95b9b2c4912 100644
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -1,12 +1,7 @@
 #include "ValueFactory.h"
 #include "ace/Guard_T.h"
 
-#if !defined (__ACE_INLINE__)
-# include "ValueFactory.inl"
-#endif /* ! __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
+ACE_RCSID (Valuetype,
            ValueFactory,
            "$Id$")
 
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index 68c209c634d..97d9f54e833 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -124,10 +124,6 @@ namespace TAO
     factory->_remove_ref (); }
 
 
-#if defined (__ACE_INLINE__)
-# include "ValueFactory.inl"
-#endif /* __ACE_INLINE__) */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_VALUEFACTORY_H */
diff --git a/TAO/tao/Valuetype/ValueFactory.inl b/TAO/tao/Valuetype/ValueFactory.inl
deleted file mode 100644
index bf195e7d4ae..00000000000
--- a/TAO/tao/Valuetype/ValueFactory.inl
+++ /dev/null
@@ -1,4 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp
index 9682c36eaea..a8eac3ec938 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.cpp
+++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp
@@ -2,11 +2,7 @@
 #include "ValueFactory.h"
 #include "tao/CORBA_String.h"
 
-#if !defined (__ACE_INLINE__)
-# include "ValueFactory_Map.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
+ACE_RCSID (Valuetype,
            ValueFactory_Map,
            "$Id$")
 
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h
index 16b613add41..d1927f6ce65 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.h
+++ b/TAO/tao/Valuetype/ValueFactory_Map.h
@@ -91,11 +91,6 @@ TAO_VALUETYPE_SINGLETON_DECLARE (TAO_Singleton,
                                  TAO_ValueFactory_Map,
                                  TAO_SYNCH_MUTEX)
 
-
-#if defined (__ACE_INLINE__)
-# include "ValueFactory_Map.inl"
-#endif /* __ACE_INLINE__) */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_VALUEFACTORY_MAP_H */
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.inl b/TAO/tao/Valuetype/ValueFactory_Map.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Valuetype/ValueFactory_Map.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index a235bf8fee3..507177e74d8 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -7,11 +7,6 @@
 #include "tao/Valuetype/Value_CORBA_methods.h"
 
 
-ACE_RCSID (Valuetype,
-           Value_VarOut_T,
-           "$Id$")
-
-
 template<typename T>
 void
 TAO::Value_Traits<T>::add_ref (T * p)
@@ -58,9 +53,8 @@ TAO_Value_Var_T<T>::ptr (void) const
 }
 
 template <typename T>
-TAO_Value_Var_T<T>::TAO_Value_Var_T (
-    const TAO_Value_Var_T<T> & p
-  )
+TAO_Value_Var_T<T>::TAO_Value_Var_T (const TAO_Value_Var_T<T> & p)
+  : TAO_Base_var ()
 {
   TAO::Value_Traits<T>::add_ref (p.ptr ());
   this->ptr_ = p.ptr ();
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
index 25e2af286dd..9813e89452c 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -15,10 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
+#include "ace/config-all.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/varbase.h"
+
 namespace TAO
 {
   /**
@@ -46,7 +50,7 @@ namespace TAO
  *
  */
 template <typename T>
-class TAO_Value_Var_T
+class TAO_Value_Var_T : private TAO_Base_var
 {
 public:
   TAO_Value_Var_T (void);
@@ -76,7 +80,15 @@ public:
   T * ptr (void) const;
 
 private:
+
+  // Prevent widening assignment.
+  TAO_Value_Var_T (const TAO_Base_var &);
+  void operator= (const TAO_Base_var &);
+
+private:
+
   T * ptr_;
+
 };
 
 /**
@@ -107,10 +119,6 @@ private:
   T *& ptr_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "Value_VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Value_VarOut_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.inl b/TAO/tao/Valuetype/Value_VarOut_T.inl
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/tao/Valuetype/Value_VarOut_T.inl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 53a774ca8b1..4b6f00813de 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -3,5 +3,5 @@
 
 #define TAO_MAJOR_VERSION 1
 #define TAO_MINOR_VERSION 4
-#define TAO_BETA_VERSION 2
-#define TAO_VERSION "1.4.2"
+#define TAO_BETA_VERSION 4
+#define TAO_VERSION "1.4.4"
diff --git a/TAO/tao/WCharSeqA.cpp b/TAO/tao/WCharSeqA.cpp
index 1d37bf33aae..bbfb145e7f1 100644
--- a/TAO/tao/WCharSeqA.cpp
+++ b/TAO/tao/WCharSeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "WCharSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_WCharSeq[] =
 {
@@ -62,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WCharSeq (
     sizeof (_oc_CORBA_WCharSeq),
     (char *) &_oc_CORBA_WCharSeq,
     0,
-    sizeof (CORBA::WCharSeq)
+    0
   );
 
 namespace CORBA
@@ -72,7 +74,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -129,8 +131,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -145,5 +145,4 @@ CORBA::Boolean operator>>= (
         CORBA::WCharSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp
index 77eb0f61aca..a1a24890566 100644
--- a/TAO/tao/WCharSeqC.cpp
+++ b/TAO/tao/WCharSeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "WCharSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "WCharSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_WCHARSEQ_CS_)
 #define _CORBA_WCHARSEQ_CS_
@@ -104,7 +103,7 @@ void CORBA::WCharSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_WCharSeq_CPP_
 #define _TAO_CDR_OP_CORBA_WCharSeq_CPP_
@@ -162,7 +161,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -207,4 +206,3 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h
index bde7d5ef51c..7b86ea87b48 100644
--- a/TAO/tao/WCharSeqC.h
+++ b/TAO/tao/WCharSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_WCHARSEQC_H_
 #define _TAO_IDL_ORIG_WCHARSEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -59,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_WCHARSEQ_CH_)
 #define _CORBA_WCHARSEQ_CH_
@@ -124,17 +123,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WCharSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -142,7 +141,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::WCharSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::WCharSeq*); // noncopying version
@@ -150,7 +149,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WCharSeq *&);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WCharSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_WCharSeq_H_
 #define _TAO_CDR_OP_CORBA_WCharSeq_H_
@@ -167,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_WCharSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "WCharSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -185,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/WCharSeqC.inl b/TAO/tao/WCharSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/WCharSeqC.inl
+++ b/TAO/tao/WCharSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/WCharSeqS.h b/TAO/tao/WCharSeqS.h
index 92982cb9109..8fe84e8689e 100644
--- a/TAO/tao/WCharSeqS.h
+++ b/TAO/tao/WCharSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_WCHARSEQS_H_
 #define _TAO_IDL_ORIG_WCHARSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/WStringSeqA.cpp b/TAO/tao/WStringSeqA.cpp
index 4a84b62b325..0b036df1be0 100644
--- a/TAO/tao/WStringSeqA.cpp
+++ b/TAO/tao/WStringSeqA.cpp
@@ -27,10 +27,12 @@
 
 #include "WStringSeqC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_WStringSeq[] =
 {
@@ -63,7 +65,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (
     sizeof (_oc_CORBA_WStringSeq),
     (char *) &_oc_CORBA_WStringSeq,
     0,
-    sizeof (CORBA::WStringSeq)
+    0
   );
 
 namespace CORBA
@@ -73,7 +75,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -130,8 +132,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -146,5 +146,4 @@ CORBA::Boolean operator>>= (
         CORBA::WStringSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp
index 04fbfbbfbf2..3b1993086ee 100644
--- a/TAO/tao/WStringSeqC.cpp
+++ b/TAO/tao/WStringSeqC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "WStringSeqC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,10 +38,10 @@
 
 #if !defined (__ACE_INLINE__)
 #include "WStringSeqC.inl"
-#endif /* !defined __ACE_INLINE__ */
+#endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_WSTRINGSEQ_CS_)
 #define _CORBA_WSTRINGSEQ_CS_
@@ -98,7 +97,7 @@ void CORBA::WStringSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_CPP_
 #define _TAO_CDR_OP_CORBA_WStringSeq_CPP_
@@ -171,7 +170,7 @@ return 0;
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -216,4 +215,3 @@ return 0;
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h
index cf60409f74e..70cb1b57899 100644
--- a/TAO/tao/WStringSeqC.h
+++ b/TAO/tao/WStringSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_WSTRINGSEQC_H_
 #define _TAO_IDL_ORIG_WSTRINGSEQC_H_
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -59,9 +60,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +69,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_WSTRINGSEQ_CH_)
 #define _CORBA_WSTRINGSEQ_CH_
@@ -122,17 +121,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq;
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -140,7 +139,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
@@ -148,7 +147,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&)
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_
 #define _TAO_CDR_OP_CORBA_WStringSeq_H_
@@ -165,13 +164,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "WStringSeqC.inl"
-#endif /* defined __ACE_INLINE__ */
+#endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -183,3 +182,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/WStringSeqC.inl b/TAO/tao/WStringSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/WStringSeqC.inl
+++ b/TAO/tao/WStringSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/WStringSeqS.h b/TAO/tao/WStringSeqS.h
index 6e5a50e293b..a1959b1cc55 100644
--- a/TAO/tao/WStringSeqS.h
+++ b/TAO/tao/WStringSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_WSTRINGSEQS_H_
 #define _TAO_IDL_ORIG_WSTRINGSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index 539d3cfe76d..cf06846b4e2 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -85,4 +85,17 @@ namespace TAO
     return base::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_ == true))
+      return false;
+
+    return true;
+  }
 }
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
index 2c6c452f655..bfc9f56640e 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -50,6 +50,8 @@ namespace TAO
 
     virtual int wait (ACE_Time_Value *max_wait_time,
                       TAO_Synch_Reply_Dispatcher &rd);
+
+    virtual bool can_process_upcalls (void) const;
   };
 }
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index 71b7009bd78..393dacadef7 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -6,8 +6,8 @@
 #include "tao/Transport.h"
 #include "tao/Synch_Reply_Dispatcher.h"
 
-ACE_RCSID (tao, 
-           Wait_On_Leader_Follower, 
+ACE_RCSID (tao,
+           Wait_On_Leader_Follower,
            "$Id$")
 
 TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower (TAO_Transport *transport)
@@ -30,10 +30,10 @@ TAO_Wait_On_Leader_Follower::register_handler (void)
   return 1;
 }
 
-int
-TAO_Wait_On_Leader_Follower::non_blocking (void)
+bool
+TAO_Wait_On_Leader_Follower::non_blocking (void) const
 {
-  return 1;
+  return true;
 }
 
 int
@@ -61,3 +61,9 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time,
                                          this->transport_,
                                          max_wait_time);
 }
+
+bool
+TAO_Wait_On_Leader_Follower::can_process_upcalls (void) const
+{
+  return true;
+}
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index 2ccf6c066fa..367a7496d07 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -51,7 +51,8 @@ public:
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
   virtual int register_handler (void);
-  virtual int non_blocking (void);
+  virtual bool non_blocking (void) const;
+  virtual bool can_process_upcalls (void) const;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index 25e8a21c8f9..deba786785b 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -7,8 +7,8 @@
 
 #include "ace/Reactor.h"
 
-ACE_RCSID (tao, 
-           Wait_On_Reactor, 
+ACE_RCSID (tao,
+           Wait_On_Reactor,
            "$Id$")
 
 TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport)
@@ -48,8 +48,8 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time,
         }
 
       // Did we timeout? If so, stop running the loop.
-      if (result == 0 
-          && max_wait_time != 0 
+      if (result == 0
+          && max_wait_time != 0
           && *max_wait_time == ACE_Time_Value::zero)
         {
           break;
@@ -103,8 +103,14 @@ TAO_Wait_On_Reactor::register_handler (void)
   return 1;
 }
 
-int
-TAO_Wait_On_Reactor::non_blocking (void)
+bool
+TAO_Wait_On_Reactor::non_blocking (void) const
 {
-  return 1;
+  return true;
+}
+
+bool
+TAO_Wait_On_Reactor::can_process_upcalls (void) const
+{
+  return true;
 }
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
index 58b1508584e..c8af5477fba 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.h
@@ -43,7 +43,8 @@ public:
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
   virtual int register_handler (void);
-  virtual int non_blocking (void);
+  virtual bool non_blocking (void) const;
+  virtual bool can_process_upcalls (void) const;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index b1bff062486..6d5ae896527 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -5,8 +5,8 @@
 #include "tao/Resume_Handle.h"
 #include "tao/Synch_Reply_Dispatcher.h"
 
-ACE_RCSID (tao, 
-           Wait_On_Read, 
+ACE_RCSID (tao,
+           Wait_On_Read,
            "$Id$")
 
 // Constructor.
@@ -75,8 +75,14 @@ TAO_Wait_On_Read::register_handler (void)
   return 0;
 }
 
-int
-TAO_Wait_On_Read::non_blocking (void)
+bool
+TAO_Wait_On_Read::non_blocking (void) const
 {
   return 0;
 }
+
+bool
+TAO_Wait_On_Read::can_process_upcalls (void) const
+{
+  return true;
+}
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index 37a7fd032b3..d2de502871f 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -42,7 +42,8 @@ public:
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
   virtual int register_handler (void);
-  virtual int non_blocking (void);
+  virtual bool non_blocking (void) const;
+  virtual bool can_process_upcalls (void) const;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index 1dbce84b49b..b38dc77b7a9 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -50,7 +50,7 @@ public:
   virtual int sending_request (TAO_ORB_Core *orb_core,
                                int two_way);
 
-  /// Base class virtual method. Wait till the <reply_received> flag is
+  /// Base class virtual method. Wait till the @c reply_received flag is
   /// true or the time expires.
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd) = 0;
@@ -61,7 +61,17 @@ public:
 
   /// Returns a value to indicate whether the transport needs to set
   /// the socket on which it is waiting to non-blocking mode or not.
-  virtual int non_blocking (void) = 0;
+  virtual bool non_blocking (void) const = 0;
+
+  /// Flag that indicates whether we can process requests while
+  /// waiting for the reply.
+  /**
+   * This flag is to check whether the thread can process upcalls
+   * while waiting for the reply. Some wait strategies, like
+   * Wait_On_LF_No_Upcall does not allow the client threads to process
+   * requests while waiting for the reply.
+   */
+  virtual bool can_process_upcalls (void) const = 0;
 
   /// Get method for the flag
   int is_registered (void);
diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl
index a189dbe29c6..292af6c7908 100644
--- a/TAO/tao/WrongTransaction.pidl
+++ b/TAO/tao/WrongTransaction.pidl
@@ -19,7 +19,7 @@
  *
  * and then:
  *
- * patch < diffs/WrongTransaction.diff
+ * cp orig/WrongTransactionC.{h,inl,cpp} .
  *
  */
 #ifndef TAO_CORBA_WRONGTRANSACTION_PIDL
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index acec61525a9..3e8018321cb 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -27,50 +27,11 @@
 
 #include "WrongTransactionC.h"
 #include "tao/Typecode.h"
-#include "tao/SystemException.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_CORBA_WrongTransaction[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5772),
-  ACE_NTOHL (0x6f6e6754),
-  ACE_NTOHL (0x72616e73),
-  ACE_NTOHL (0x61637469),
-  ACE_NTOHL (0x6f6e3a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/WrongTransaction:1.0
-    17,
-  ACE_NTOHL (0x57726f6e),
-  ACE_NTOHL (0x67547261),
-  ACE_NTOHL (0x6e736163),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = WrongTransaction
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_WrongTransaction),
-    (char *) &_oc_CORBA_WrongTransaction,
-    0,
-    sizeof (CORBA::WrongTransaction)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_WrongTransaction =
-    &_tc_TAO_tc_CORBA_WrongTransaction;
-}
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -80,12 +41,12 @@ TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -96,7 +57,7 @@ TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -134,8 +95,8 @@ CORBA::Boolean operator>>= (
     CORBA::WrongTransaction *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::WrongTransaction *&,
+  return _tao_any >>= const_cast<
+      const CORBA::WrongTransaction *&> (
       _tao_elem
     );
 }
@@ -155,8 +116,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -171,4 +130,4 @@ CORBA::Boolean operator>>= (
         CORBA::WrongTransaction \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index d6b3f067135..2f9a0ad1257 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "WrongTransactionC.h"
@@ -40,11 +40,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "WrongTransactionC.i"
+#include "WrongTransactionC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -52,7 +52,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::WrongTransaction::WrongTransaction (void)
@@ -85,21 +85,20 @@ CORBA::WrongTransaction::operator= (const ::CORBA::WrongTransaction &_tao_excp)
 void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer)
 {
   WrongTransaction *_tao_tmp_pointer =
-    ACE_static_cast (WrongTransaction*, _tao_void_pointer);
+    static_cast<WrongTransaction *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 CORBA::WrongTransaction *
 CORBA::WrongTransaction::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (WrongTransaction *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<WrongTransaction *> (_tao_excp);
+}
+
+const CORBA::WrongTransaction *
+CORBA::WrongTransaction::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const WrongTransaction *> (_tao_excp);
 }
 
 CORBA::Exception *CORBA::WrongTransaction::_alloc (void)
@@ -135,7 +134,7 @@ void CORBA::WrongTransaction::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -148,22 +147,57 @@ void CORBA::WrongTransaction::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::CORBA::_tc_WrongTransaction;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_CORBA_WrongTransaction[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5772), 
+  ACE_NTOHL (0x6f6e6754), 
+  ACE_NTOHL (0x72616e73), 
+  ACE_NTOHL (0x61637469), 
+  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/WrongTransaction:1.0
+    17,
+  ACE_NTOHL (0x57726f6e), 
+  ACE_NTOHL (0x67547261), 
+  ACE_NTOHL (0x6e736163), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x0),  // name = WrongTransaction
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction (
+    CORBA::tk_except,
+    sizeof (_oc_CORBA_WrongTransaction),
+    (char *) &_oc_CORBA_WrongTransaction,
+    0,
+    0
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_WrongTransaction =
+    &_tc_TAO_tc_CORBA_WrongTransaction;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
@@ -191,10 +225,10 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 85afaff5e3b..2f8be3d1c85 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -26,20 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
 #define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -55,9 +57,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -90,8 +90,10 @@ namespace CORBA
     static void _tao_any_destructor (void *);
     
     static WrongTransaction *_downcast (CORBA::Exception *);
+    static const WrongTransaction *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -107,7 +109,7 @@ namespace CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
     
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
@@ -147,13 +149,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransac
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:963
 
 #if defined (__ACE_INLINE__)
-#include "WrongTransactionC.i"
+#include "WrongTransactionC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -165,3 +167,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &)
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/WrongTransactionC.i b/TAO/tao/WrongTransactionC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/WrongTransactionC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index 3111bc36f50..9f90343bd48 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -25,7 +25,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Typecode.h"
 #include "tao/Marshal.h"
-#include "tao/Any_Impl.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 
@@ -556,34 +556,27 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
 
         case CORBA::tk_enum:
           {
-            ACE_Message_Block *mb = any->_tao_get_cdr ();
             CORBA::ULong d;
-            bool type_known = false;
+            TAO::Any_Impl *impl = any->impl ();
 
-            if (mb == 0)
+            if (impl->encoded ())
               {
-                ACE_NEW_RETURN (mb,
-                                ACE_Message_Block,
-                                TAO::TRAVERSE_STOP);
-                TAO_OutputCDR out;
-                any->impl ()->marshal_value (out);
-                ACE_CDR::consolidate (mb, out.begin ());
-                type_known = true;
+                TAO::Unknown_IDL_Type *unk =
+                  dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+                  
+                // We don't want unk's rd_ptr to move, in case 
+                // we are shared by another Any, so we use this
+                // to copy the state, not the buffer.
+                TAO_InputCDR for_reading (unk->_tao_get_cdr ());
+
+                for_reading.read_ulong (d);
               }
-
-            TAO_InputCDR cdr (mb->data_block (),
-                              ACE_Message_Block::DONT_DELETE,
-                              mb->rd_ptr () - mb->base (),
-                              mb->wr_ptr () - mb->base (),
-                              any->_tao_byte_order (),
-                              TAO_DEF_GIOP_MAJOR,
-                              TAO_DEF_GIOP_MINOR);
-
-            cdr.read_ulong (d);
-
-            if (type_known)
+            else
               {
-                mb->release ();
+                TAO_OutputCDR out;
+                impl->marshal_value (out);
+                TAO_InputCDR cdr (out);
+                cdr.read_ulong (d);
               }
 
             if (d == enum_v)
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
index 4cd76686e81..bb988ed34ba 100644
--- a/TAO/tao/corbafwd.cpp
+++ b/TAO/tao/corbafwd.cpp
@@ -2,10 +2,6 @@
 
 #include "corbafwd.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/corbafwd.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            corbafwd,
            "$Id$")
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index c7f391bea44..0cff519fb79 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -27,7 +27,6 @@
 
 #include "tao/ORB_Constants.h"
 
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -36,12 +35,6 @@
 #include "tao/OBV_Constants.h"
 #include "tao/CORBA_methods.h"
 
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/corbafwd.i"
-#endif /* ! __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CORBAFWD_H */
diff --git a/TAO/tao/corbafwd.i b/TAO/tao/corbafwd.i
deleted file mode 100644
index 2ad999ebb73..00000000000
--- a/TAO/tao/corbafwd.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index ef6ab5c28fb..c70262d05df 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -15,14 +15,9 @@
 #include "ace/Lock_Adapter_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* ! __ACE_INLINE__ */
-
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (tao,
            default_client,
            "$Id$")
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 6dd566dd682..613eabecd0b 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -31,7 +31,7 @@
  * options so that everything operates as if there were no
  * dynamically-linkable strategies.
  */
-class TAO_Export TAO_Default_Client_Strategy_Factory 
+class TAO_Export TAO_Default_Client_Strategy_Factory
   : public TAO_Client_Strategy_Factory
 {
 public:
@@ -111,10 +111,6 @@ private:
   Lock_Type muxed_strategy_lock_type_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Client_Strategy_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
 
diff --git a/TAO/tao/default_client.i b/TAO/tao/default_client.i
deleted file mode 100644
index da77e5c9936..00000000000
--- a/TAO/tao/default_client.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 57a1aed7da4..9451a53d4bd 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -21,10 +21,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/Auto_Ptr.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/default_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID (tao,
            default_resource,
            "$Id$")
@@ -179,7 +175,8 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
             char **endPtr =0;
             ncs = ACE_OS::strtoul(ACE_TEXT_ALWAYS_CHAR(argv[curarg]),
                                   endPtr, 0);
-  }
+          }
+
         // Validate the CodesetId
         if (ACE_Codeset_Registry::get_max_bytes(ncs) == 0)
           {
@@ -264,23 +261,23 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
             ACE_TCHAR* name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("lru")) == 0)
+                                    ACE_TEXT ("lru")) == 0)
               this->connection_purging_type_ =
                 TAO_Resource_Factory::LRU;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("lfu")) == 0)
+                                         ACE_TEXT ("lfu")) == 0)
               this->connection_purging_type_ =
                 TAO_Resource_Factory::LFU;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("fifo")) == 0)
+                                         ACE_TEXT ("fifo")) == 0)
               this->connection_purging_type_ =
                 TAO_Resource_Factory::FIFO;
             else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
+                                         ACE_TEXT ("null")) == 0)
               this->connection_purging_type_ =
                   TAO_Resource_Factory::NOOP;
             else
-              this->report_option_value_error (ACE_TEXT("-ORBConnectionCachingStrategy"), name);
+              this->report_option_value_error (ACE_TEXT ("-ORBConnectionCachingStrategy"), name);
           }
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
@@ -972,7 +969,7 @@ TAO_Default_Resource_Factory::create_purging_strategy (void)
     {
       ACE_NEW_RETURN (strategy,
                       TAO_LRU_Connection_Purging_Strategy (
-                                           this->cache_maximum ()),
+                          this->cache_maximum ()),
                       0);
     }
   else
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 2e7cdeb7950..92b3b48ac72 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -28,6 +28,8 @@ class TAO_Object_Adapter;
 class TAO_IOR_Parser;
 class TAO_LF_Strategy;
 
+class ACE_Reactor_Impl;
+
 /**
  * @class TAO_Default_Resource_Factory
  *
@@ -243,10 +245,6 @@ private:
   Resource_Usage resource_usage_strategy_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "tao/default_resource.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Resource_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Resource_Factory)
 
diff --git a/TAO/tao/default_resource.i b/TAO/tao/default_resource.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/tao/default_resource.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index 42e52eb00c4..9e3da844ee4 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -1,21 +1,14 @@
 // $Id$
 
 #include "tao/default_server.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/default_client.i"
-#endif /* ! __ACE_INLINE__ */
-
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (tao,
            default_server,
            "$Id$")
 
-
 TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
   : activate_server_connections_ (0),
     thread_flags_ (THR_BOUND | THR_DETACHED),
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 1f4d488cb9d..d4c88f15aa2 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -15,13 +15,16 @@
 #define TAO_DEFAULT_SERVER_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
+
+#include "tao/Server_Strategy_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Server_Strategy_Factory.h"
+#include "ace/Service_Config.h"
+#include "ace/Time_Value.h"
+
 
 /**
  * @class TAO_Default_Server_Strategy_Factory
@@ -31,7 +34,7 @@
  * This design gives substantial freedom for experimentation.
  *
  */
-class TAO_Export TAO_Default_Server_Strategy_Factory 
+class TAO_Export TAO_Default_Server_Strategy_Factory
   : public TAO_Server_Strategy_Factory
 {
 public:
@@ -82,10 +85,6 @@ protected:
   ACE_Time_Value thread_per_connection_timeout_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/default_server.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Server_Strategy_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
 
diff --git a/TAO/tao/default_server.i b/TAO/tao/default_server.i
deleted file mode 100644
index da77e5c9936..00000000000
--- a/TAO/tao/default_server.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/diffs/CONV_FRAME.diff b/TAO/tao/diffs/CONV_FRAME.diff
deleted file mode 100644
index e54b6797542..00000000000
--- a/TAO/tao/diffs/CONV_FRAME.diff
+++ /dev/null
@@ -1,1068 +0,0 @@
---- orig/CONV_FRAMEC.h	2003-12-24 12:44:13.000000000 -0600
-+++ CONV_FRAMEC.h	2003-12-24 12:20:01.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,18 +33,13 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "tao/ORB.h"
-+#include "tao/CDR.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "TAO_Export.h"
--#include "tao/CDR.h"
--#include "tao/Environment.h"
--#include "tao/Sequence_T.h"
--#include "tao/Seq_Var_T.h"
--#include "tao/Seq_Out_T.h"
-+#include "tao/Sequence.h"
- #include "tao/VarOut_T.h"
- 
- #if defined (TAO_EXPORT_MACRO)
-@@ -83,11 +78,6 @@
-   typedef CORBA::ULong_out CodeSetId_out;
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId;
--  
--  // TAO_IDL - Generated from
-   // be/be_type.cpp:258
-   
-   struct CodeSetComponent;
-@@ -151,11 +141,6 @@
-   };
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
--  
--  // TAO_IDL - Generated from
-   // be/be_type.cpp:258
-   
-   struct CodeSetComponentInfo;
-@@ -186,11 +171,6 @@
-   };
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
--  
--  // TAO_IDL - Generated from
-   // be/be_type.cpp:258
-   
-   struct CodeSetContext;
-@@ -217,10 +197,7 @@
-     CONV_FRAME::CodeSetId wchar_data;
-   };
-   
--  // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
-   
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext;
- 
- // TAO_IDL - Generated from
- // be/be_visitor_module/module_ch.cpp:66
---- orig/CONV_FRAMEC.i	2003-12-24 12:44:13.000000000 -0600
-+++ CONV_FRAMEC.i	2003-12-23 19:11:35.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/CONV_FRAMEC.cpp	2003-12-24 12:44:13.000000000 -0600
-+++ CONV_FRAMEC.cpp	2003-12-24 12:25:38.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -28,9 +28,7 @@
- // TAO_IDL - Generated from
- // be/be_codegen.cpp:338
- 
--
- #include "CONV_FRAMEC.h"
--#include "tao/Typecode.h"
- 
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-@@ -48,146 +46,6 @@
- {
- }
- 
--
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_CONV_FRAME_CodeSetId[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  37,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x434f4e56), 
--  ACE_NTOHL (0x5f465241), 
--  ACE_NTOHL (0x4d452f43), 
--  ACE_NTOHL (0x6f646553), 
--  ACE_NTOHL (0x65744964), 
--  ACE_NTOHL (0x3a312e30), 
--  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
--    10,
--  ACE_NTOHL (0x436f6465), 
--  ACE_NTOHL (0x53657449), 
--  ACE_NTOHL (0x64000000),  // name = CodeSetId
--    CORBA::tk_ulong,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (
--    CORBA::tk_alias,
--    sizeof (_oc_CONV_FRAME_CodeSetId),
--    (char *) &_oc_CONV_FRAME_CodeSetId,
--    0,
--    sizeof (CONV_FRAME::CodeSetId)
--  );
--
--namespace CONV_FRAME
--{
--  ::CORBA::TypeCode_ptr _tc_CodeSetId =
--    &_tc_TAO_tc_CONV_FRAME_CodeSetId;
--}
--
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  44,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x434f4e56), 
--  ACE_NTOHL (0x5f465241), 
--  ACE_NTOHL (0x4d452f43), 
--  ACE_NTOHL (0x6f646553), 
--  ACE_NTOHL (0x6574436f), 
--  ACE_NTOHL (0x6d706f6e), 
--  ACE_NTOHL (0x656e743a), 
--  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
--    17,
--  ACE_NTOHL (0x436f6465), 
--  ACE_NTOHL (0x53657443), 
--  ACE_NTOHL (0x6f6d706f), 
--  ACE_NTOHL (0x6e656e74), 
--  ACE_NTOHL (0x0),  // name = CodeSetComponent
--  2, // member count
--    16,
--  ACE_NTOHL (0x6e617469), 
--  ACE_NTOHL (0x76655f63), 
--  ACE_NTOHL (0x6f64655f), 
--  ACE_NTOHL (0x73657400),  // name = native_code_set
--    CORBA::tk_alias, // typecode kind for typedefs
--  68, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    37,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x6f6d672e), 
--    ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x434f4e56), 
--    ACE_NTOHL (0x5f465241), 
--    ACE_NTOHL (0x4d452f43), 
--    ACE_NTOHL (0x6f646553), 
--    ACE_NTOHL (0x65744964), 
--    ACE_NTOHL (0x3a312e30), 
--    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
--        10,
--    ACE_NTOHL (0x436f6465), 
--    ACE_NTOHL (0x53657449), 
--    ACE_NTOHL (0x64000000),  // name = CodeSetId
--        CORBA::tk_ulong,
--
--
--  21,
--  ACE_NTOHL (0x636f6e76), 
--  ACE_NTOHL (0x65727369), 
--  ACE_NTOHL (0x6f6e5f63), 
--  ACE_NTOHL (0x6f64655f), 
--  ACE_NTOHL (0x73657473), 
--  ACE_NTOHL (0x0),  // name = conversion_code_sets
--    CORBA::tk_sequence, // typecode kind
--  84, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_alias, // typecode kind for typedefs
--    68, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      37,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x6f6d672e), 
--      ACE_NTOHL (0x6f72672f), 
--      ACE_NTOHL (0x434f4e56), 
--      ACE_NTOHL (0x5f465241), 
--      ACE_NTOHL (0x4d452f43), 
--      ACE_NTOHL (0x6f646553), 
--      ACE_NTOHL (0x65744964), 
--      ACE_NTOHL (0x3a312e30), 
--      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
--            10,
--      ACE_NTOHL (0x436f6465), 
--      ACE_NTOHL (0x53657449), 
--      ACE_NTOHL (0x64000000),  // name = CodeSetId
--            CORBA::tk_ulong,
--
--
--    0U,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (
--    CORBA::tk_struct,
--    sizeof (_oc_CONV_FRAME_CodeSetComponent),
--    (char *) &_oc_CONV_FRAME_CodeSetComponent,
--    0,
--    sizeof (CONV_FRAME::CodeSetComponent)
--  );
--
--namespace CONV_FRAME
--{
--  ::CORBA::TypeCode_ptr _tc_CodeSetComponent =
--    &_tc_TAO_tc_CONV_FRAME_CodeSetComponent;
--}
--
- // TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
- 
-@@ -245,221 +103,7 @@
- 
- #endif /* end #if !defined */
- 
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
- 
--static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  48,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x434f4e56), 
--  ACE_NTOHL (0x5f465241), 
--  ACE_NTOHL (0x4d452f43), 
--  ACE_NTOHL (0x6f646553), 
--  ACE_NTOHL (0x6574436f), 
--  ACE_NTOHL (0x6d706f6e), 
--  ACE_NTOHL (0x656e7449), 
--  ACE_NTOHL (0x6e666f3a), 
--  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
--    21,
--  ACE_NTOHL (0x436f6465), 
--  ACE_NTOHL (0x53657443), 
--  ACE_NTOHL (0x6f6d706f), 
--  ACE_NTOHL (0x6e656e74), 
--  ACE_NTOHL (0x496e666f), 
--  ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
--  2, // member count
--    12,
--  ACE_NTOHL (0x466f7243), 
--  ACE_NTOHL (0x68617244), 
--  ACE_NTOHL (0x61746100),  // name = ForCharData
--    CORBA::tk_struct, // typecode kind
--  296, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    44,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x6f6d672e), 
--    ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x434f4e56), 
--    ACE_NTOHL (0x5f465241), 
--    ACE_NTOHL (0x4d452f43), 
--    ACE_NTOHL (0x6f646553), 
--    ACE_NTOHL (0x6574436f), 
--    ACE_NTOHL (0x6d706f6e), 
--    ACE_NTOHL (0x656e743a), 
--    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
--        17,
--    ACE_NTOHL (0x436f6465), 
--    ACE_NTOHL (0x53657443), 
--    ACE_NTOHL (0x6f6d706f), 
--    ACE_NTOHL (0x6e656e74), 
--    ACE_NTOHL (0x0),  // name = CodeSetComponent
--    2, // member count
--        16,
--    ACE_NTOHL (0x6e617469), 
--    ACE_NTOHL (0x76655f63), 
--    ACE_NTOHL (0x6f64655f), 
--    ACE_NTOHL (0x73657400),  // name = native_code_set
--        CORBA::tk_alias, // typecode kind for typedefs
--    68, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      37,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x6f6d672e), 
--      ACE_NTOHL (0x6f72672f), 
--      ACE_NTOHL (0x434f4e56), 
--      ACE_NTOHL (0x5f465241), 
--      ACE_NTOHL (0x4d452f43), 
--      ACE_NTOHL (0x6f646553), 
--      ACE_NTOHL (0x65744964), 
--      ACE_NTOHL (0x3a312e30), 
--      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
--            10,
--      ACE_NTOHL (0x436f6465), 
--      ACE_NTOHL (0x53657449), 
--      ACE_NTOHL (0x64000000),  // name = CodeSetId
--            CORBA::tk_ulong,
--
--
--    21,
--    ACE_NTOHL (0x636f6e76), 
--    ACE_NTOHL (0x65727369), 
--    ACE_NTOHL (0x6f6e5f63), 
--    ACE_NTOHL (0x6f64655f), 
--    ACE_NTOHL (0x73657473), 
--    ACE_NTOHL (0x0),  // name = conversion_code_sets
--        CORBA::tk_sequence, // typecode kind
--    84, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      CORBA::tk_alias, // typecode kind for typedefs
--      68, // encapsulation length
--        TAO_ENCAP_BYTE_ORDER, // byte order
--        37,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x6f6d672e), 
--        ACE_NTOHL (0x6f72672f), 
--        ACE_NTOHL (0x434f4e56), 
--        ACE_NTOHL (0x5f465241), 
--        ACE_NTOHL (0x4d452f43), 
--        ACE_NTOHL (0x6f646553), 
--        ACE_NTOHL (0x65744964), 
--        ACE_NTOHL (0x3a312e30), 
--        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
--                10,
--        ACE_NTOHL (0x436f6465), 
--        ACE_NTOHL (0x53657449), 
--        ACE_NTOHL (0x64000000),  // name = CodeSetId
--                CORBA::tk_ulong,
--
--
--      0U,
--
--
--  13,
--  ACE_NTOHL (0x466f7257), 
--  ACE_NTOHL (0x63686172), 
--  ACE_NTOHL (0x44617461), 
--  ACE_NTOHL (0x0),  // name = ForWcharData
--    CORBA::tk_struct, // typecode kind
--  296, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    44,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x6f6d672e), 
--    ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x434f4e56), 
--    ACE_NTOHL (0x5f465241), 
--    ACE_NTOHL (0x4d452f43), 
--    ACE_NTOHL (0x6f646553), 
--    ACE_NTOHL (0x6574436f), 
--    ACE_NTOHL (0x6d706f6e), 
--    ACE_NTOHL (0x656e743a), 
--    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
--        17,
--    ACE_NTOHL (0x436f6465), 
--    ACE_NTOHL (0x53657443), 
--    ACE_NTOHL (0x6f6d706f), 
--    ACE_NTOHL (0x6e656e74), 
--    ACE_NTOHL (0x0),  // name = CodeSetComponent
--    2, // member count
--        16,
--    ACE_NTOHL (0x6e617469), 
--    ACE_NTOHL (0x76655f63), 
--    ACE_NTOHL (0x6f64655f), 
--    ACE_NTOHL (0x73657400),  // name = native_code_set
--        CORBA::tk_alias, // typecode kind for typedefs
--    68, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      37,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x6f6d672e), 
--      ACE_NTOHL (0x6f72672f), 
--      ACE_NTOHL (0x434f4e56), 
--      ACE_NTOHL (0x5f465241), 
--      ACE_NTOHL (0x4d452f43), 
--      ACE_NTOHL (0x6f646553), 
--      ACE_NTOHL (0x65744964), 
--      ACE_NTOHL (0x3a312e30), 
--      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
--            10,
--      ACE_NTOHL (0x436f6465), 
--      ACE_NTOHL (0x53657449), 
--      ACE_NTOHL (0x64000000),  // name = CodeSetId
--            CORBA::tk_ulong,
--
--
--    21,
--    ACE_NTOHL (0x636f6e76), 
--    ACE_NTOHL (0x65727369), 
--    ACE_NTOHL (0x6f6e5f63), 
--    ACE_NTOHL (0x6f64655f), 
--    ACE_NTOHL (0x73657473), 
--    ACE_NTOHL (0x0),  // name = conversion_code_sets
--        CORBA::tk_sequence, // typecode kind
--    84, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      CORBA::tk_alias, // typecode kind for typedefs
--      68, // encapsulation length
--        TAO_ENCAP_BYTE_ORDER, // byte order
--        37,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x6f6d672e), 
--        ACE_NTOHL (0x6f72672f), 
--        ACE_NTOHL (0x434f4e56), 
--        ACE_NTOHL (0x5f465241), 
--        ACE_NTOHL (0x4d452f43), 
--        ACE_NTOHL (0x6f646553), 
--        ACE_NTOHL (0x65744964), 
--        ACE_NTOHL (0x3a312e30), 
--        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
--                10,
--        ACE_NTOHL (0x436f6465), 
--        ACE_NTOHL (0x53657449), 
--        ACE_NTOHL (0x64000000),  // name = CodeSetId
--                CORBA::tk_ulong,
--
--
--      0U,
--
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (
--    CORBA::tk_struct,
--    sizeof (_oc_CONV_FRAME_CodeSetComponentInfo),
--    (char *) &_oc_CONV_FRAME_CodeSetComponentInfo,
--    0,
--    sizeof (CONV_FRAME::CodeSetComponentInfo)
--  );
--
--namespace CONV_FRAME
--{
--  ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo =
--    &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo;
--}
- 
- // TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
-@@ -475,96 +119,6 @@
- }
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  42,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x434f4e56), 
--  ACE_NTOHL (0x5f465241), 
--  ACE_NTOHL (0x4d452f43), 
--  ACE_NTOHL (0x6f646553), 
--  ACE_NTOHL (0x6574436f), 
--  ACE_NTOHL (0x6e746578), 
--  ACE_NTOHL (0x743a312e), 
--  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
--    15,
--  ACE_NTOHL (0x436f6465), 
--  ACE_NTOHL (0x53657443), 
--  ACE_NTOHL (0x6f6e7465), 
--  ACE_NTOHL (0x78740000),  // name = CodeSetContext
--  2, // member count
--    10,
--  ACE_NTOHL (0x63686172), 
--  ACE_NTOHL (0x5f646174), 
--  ACE_NTOHL (0x61000000),  // name = char_data
--    CORBA::tk_alias, // typecode kind for typedefs
--  68, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    37,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x6f6d672e), 
--    ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x434f4e56), 
--    ACE_NTOHL (0x5f465241), 
--    ACE_NTOHL (0x4d452f43), 
--    ACE_NTOHL (0x6f646553), 
--    ACE_NTOHL (0x65744964), 
--    ACE_NTOHL (0x3a312e30), 
--    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
--        10,
--    ACE_NTOHL (0x436f6465), 
--    ACE_NTOHL (0x53657449), 
--    ACE_NTOHL (0x64000000),  // name = CodeSetId
--        CORBA::tk_ulong,
--
--
--  11,
--  ACE_NTOHL (0x77636861), 
--  ACE_NTOHL (0x725f6461), 
--  ACE_NTOHL (0x74610000),  // name = wchar_data
--    CORBA::tk_alias, // typecode kind for typedefs
--  68, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    37,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x6f6d672e), 
--    ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x434f4e56), 
--    ACE_NTOHL (0x5f465241), 
--    ACE_NTOHL (0x4d452f43), 
--    ACE_NTOHL (0x6f646553), 
--    ACE_NTOHL (0x65744964), 
--    ACE_NTOHL (0x3a312e30), 
--    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
--        10,
--    ACE_NTOHL (0x436f6465), 
--    ACE_NTOHL (0x53657449), 
--    ACE_NTOHL (0x64000000),  // name = CodeSetId
--        CORBA::tk_ulong,
--
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (
--    CORBA::tk_struct,
--    sizeof (_oc_CONV_FRAME_CodeSetContext),
--    (char *) &_oc_CONV_FRAME_CodeSetContext,
--    0,
--    sizeof (CONV_FRAME::CodeSetContext)
--  );
--
--namespace CONV_FRAME
--{
--  ::CORBA::TypeCode_ptr _tc_CodeSetContext =
--    &_tc_TAO_tc_CONV_FRAME_CodeSetContext;
--}
--
--// TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
- 
- void 
---- orig/CONV_FRAMEA.h	2003-12-24 12:44:13.000000000 -0600
-+++ CONV_FRAMEA.h	2003-12-24 12:22:49.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,6 +33,18 @@
- 
- #include /**/ "ace/pre.h"
- 
-+// ==== Handcrafted
-+namespace CONV_FRAME
-+{
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext;
-+}
-+
- // TAO_IDL - Generated from
- // be/be_visitor_structure/any_op_ch.cpp:52
- 
---- orig/CONV_FRAMEA.cpp	2003-12-24 12:44:13.000000000 -0600
-+++ CONV_FRAMEA.cpp	2003-12-24 12:25:23.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -29,6 +29,454 @@
- #include "CONV_FRAMEA.h"
- #include "tao/Typecode.h"
- #include "tao/Any_Dual_Impl_T.h"
-+#include "tao/Typecode.h"
-+
-+// ==== Handcrafted
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_CONV_FRAME_CodeSetId[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  37,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x434f4e56),
-+  ACE_NTOHL (0x5f465241),
-+  ACE_NTOHL (0x4d452f43),
-+  ACE_NTOHL (0x6f646553),
-+  ACE_NTOHL (0x65744964),
-+  ACE_NTOHL (0x3a312e30),
-+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-+    10,
-+  ACE_NTOHL (0x436f6465),
-+  ACE_NTOHL (0x53657449),
-+  ACE_NTOHL (0x64000000),  // name = CodeSetId
-+    CORBA::tk_ulong,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (
-+    CORBA::tk_alias,
-+    sizeof (_oc_CONV_FRAME_CodeSetId),
-+    (char *) &_oc_CONV_FRAME_CodeSetId,
-+    0,
-+    sizeof (CONV_FRAME::CodeSetId)
-+  );
-+
-+namespace CONV_FRAME
-+{
-+  ::CORBA::TypeCode_ptr _tc_CodeSetId =
-+    &_tc_TAO_tc_CONV_FRAME_CodeSetId;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  44,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x434f4e56),
-+  ACE_NTOHL (0x5f465241),
-+  ACE_NTOHL (0x4d452f43),
-+  ACE_NTOHL (0x6f646553),
-+  ACE_NTOHL (0x6574436f),
-+  ACE_NTOHL (0x6d706f6e),
-+  ACE_NTOHL (0x656e743a),
-+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-+    17,
-+  ACE_NTOHL (0x436f6465),
-+  ACE_NTOHL (0x53657443),
-+  ACE_NTOHL (0x6f6d706f),
-+  ACE_NTOHL (0x6e656e74),
-+  ACE_NTOHL (0x0),  // name = CodeSetComponent
-+  2, // member count
-+    16,
-+  ACE_NTOHL (0x6e617469),
-+  ACE_NTOHL (0x76655f63),
-+  ACE_NTOHL (0x6f64655f),
-+  ACE_NTOHL (0x73657400),  // name = native_code_set
-+    CORBA::tk_alias, // typecode kind for typedefs
-+  68, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    37,
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x6f6d672e),
-+    ACE_NTOHL (0x6f72672f),
-+    ACE_NTOHL (0x434f4e56),
-+    ACE_NTOHL (0x5f465241),
-+    ACE_NTOHL (0x4d452f43),
-+    ACE_NTOHL (0x6f646553),
-+    ACE_NTOHL (0x65744964),
-+    ACE_NTOHL (0x3a312e30),
-+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-+        10,
-+    ACE_NTOHL (0x436f6465),
-+    ACE_NTOHL (0x53657449),
-+    ACE_NTOHL (0x64000000),  // name = CodeSetId
-+        CORBA::tk_ulong,
-+
-+
-+  21,
-+  ACE_NTOHL (0x636f6e76),
-+  ACE_NTOHL (0x65727369),
-+  ACE_NTOHL (0x6f6e5f63),
-+  ACE_NTOHL (0x6f64655f),
-+  ACE_NTOHL (0x73657473),
-+  ACE_NTOHL (0x0),  // name = conversion_code_sets
-+    CORBA::tk_sequence, // typecode kind
-+  84, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    CORBA::tk_alias, // typecode kind for typedefs
-+    68, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      37,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x6f6d672e),
-+      ACE_NTOHL (0x6f72672f),
-+      ACE_NTOHL (0x434f4e56),
-+      ACE_NTOHL (0x5f465241),
-+      ACE_NTOHL (0x4d452f43),
-+      ACE_NTOHL (0x6f646553),
-+      ACE_NTOHL (0x65744964),
-+      ACE_NTOHL (0x3a312e30),
-+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-+            10,
-+      ACE_NTOHL (0x436f6465),
-+      ACE_NTOHL (0x53657449),
-+      ACE_NTOHL (0x64000000),  // name = CodeSetId
-+            CORBA::tk_ulong,
-+
-+
-+    0U,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (
-+    CORBA::tk_struct,
-+    sizeof (_oc_CONV_FRAME_CodeSetComponent),
-+    (char *) &_oc_CONV_FRAME_CodeSetComponent,
-+    0,
-+    sizeof (CONV_FRAME::CodeSetComponent)
-+  );
-+
-+namespace CONV_FRAME
-+{
-+  ::CORBA::TypeCode_ptr _tc_CodeSetComponent =
-+    &_tc_TAO_tc_CONV_FRAME_CodeSetComponent;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  48,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x434f4e56),
-+  ACE_NTOHL (0x5f465241),
-+  ACE_NTOHL (0x4d452f43),
-+  ACE_NTOHL (0x6f646553),
-+  ACE_NTOHL (0x6574436f),
-+  ACE_NTOHL (0x6d706f6e),
-+  ACE_NTOHL (0x656e7449),
-+  ACE_NTOHL (0x6e666f3a),
-+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
-+    21,
-+  ACE_NTOHL (0x436f6465),
-+  ACE_NTOHL (0x53657443),
-+  ACE_NTOHL (0x6f6d706f),
-+  ACE_NTOHL (0x6e656e74),
-+  ACE_NTOHL (0x496e666f),
-+  ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
-+  2, // member count
-+    12,
-+  ACE_NTOHL (0x466f7243),
-+  ACE_NTOHL (0x68617244),
-+  ACE_NTOHL (0x61746100),  // name = ForCharData
-+    CORBA::tk_struct, // typecode kind
-+  296, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    44,
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x6f6d672e),
-+    ACE_NTOHL (0x6f72672f),
-+    ACE_NTOHL (0x434f4e56),
-+    ACE_NTOHL (0x5f465241),
-+    ACE_NTOHL (0x4d452f43),
-+    ACE_NTOHL (0x6f646553),
-+    ACE_NTOHL (0x6574436f),
-+    ACE_NTOHL (0x6d706f6e),
-+    ACE_NTOHL (0x656e743a),
-+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-+        17,
-+    ACE_NTOHL (0x436f6465),
-+    ACE_NTOHL (0x53657443),
-+    ACE_NTOHL (0x6f6d706f),
-+    ACE_NTOHL (0x6e656e74),
-+    ACE_NTOHL (0x0),  // name = CodeSetComponent
-+    2, // member count
-+        16,
-+    ACE_NTOHL (0x6e617469),
-+    ACE_NTOHL (0x76655f63),
-+    ACE_NTOHL (0x6f64655f),
-+    ACE_NTOHL (0x73657400),  // name = native_code_set
-+        CORBA::tk_alias, // typecode kind for typedefs
-+    68, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      37,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x6f6d672e),
-+      ACE_NTOHL (0x6f72672f),
-+      ACE_NTOHL (0x434f4e56),
-+      ACE_NTOHL (0x5f465241),
-+      ACE_NTOHL (0x4d452f43),
-+      ACE_NTOHL (0x6f646553),
-+      ACE_NTOHL (0x65744964),
-+      ACE_NTOHL (0x3a312e30),
-+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-+            10,
-+      ACE_NTOHL (0x436f6465),
-+      ACE_NTOHL (0x53657449),
-+      ACE_NTOHL (0x64000000),  // name = CodeSetId
-+            CORBA::tk_ulong,
-+
-+
-+    21,
-+    ACE_NTOHL (0x636f6e76),
-+    ACE_NTOHL (0x65727369),
-+    ACE_NTOHL (0x6f6e5f63),
-+    ACE_NTOHL (0x6f64655f),
-+    ACE_NTOHL (0x73657473),
-+    ACE_NTOHL (0x0),  // name = conversion_code_sets
-+        CORBA::tk_sequence, // typecode kind
-+    84, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      CORBA::tk_alias, // typecode kind for typedefs
-+      68, // encapsulation length
-+        TAO_ENCAP_BYTE_ORDER, // byte order
-+        37,
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x6f6d672e),
-+        ACE_NTOHL (0x6f72672f),
-+        ACE_NTOHL (0x434f4e56),
-+        ACE_NTOHL (0x5f465241),
-+        ACE_NTOHL (0x4d452f43),
-+        ACE_NTOHL (0x6f646553),
-+        ACE_NTOHL (0x65744964),
-+        ACE_NTOHL (0x3a312e30),
-+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-+                10,
-+        ACE_NTOHL (0x436f6465),
-+        ACE_NTOHL (0x53657449),
-+        ACE_NTOHL (0x64000000),  // name = CodeSetId
-+                CORBA::tk_ulong,
-+
-+
-+      0U,
-+
-+
-+  13,
-+  ACE_NTOHL (0x466f7257),
-+  ACE_NTOHL (0x63686172),
-+  ACE_NTOHL (0x44617461),
-+  ACE_NTOHL (0x0),  // name = ForWcharData
-+    CORBA::tk_struct, // typecode kind
-+  296, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    44,
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x6f6d672e),
-+    ACE_NTOHL (0x6f72672f),
-+    ACE_NTOHL (0x434f4e56),
-+    ACE_NTOHL (0x5f465241),
-+    ACE_NTOHL (0x4d452f43),
-+    ACE_NTOHL (0x6f646553),
-+    ACE_NTOHL (0x6574436f),
-+    ACE_NTOHL (0x6d706f6e),
-+    ACE_NTOHL (0x656e743a),
-+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-+        17,
-+    ACE_NTOHL (0x436f6465),
-+    ACE_NTOHL (0x53657443),
-+    ACE_NTOHL (0x6f6d706f),
-+    ACE_NTOHL (0x6e656e74),
-+    ACE_NTOHL (0x0),  // name = CodeSetComponent
-+    2, // member count
-+        16,
-+    ACE_NTOHL (0x6e617469),
-+    ACE_NTOHL (0x76655f63),
-+    ACE_NTOHL (0x6f64655f),
-+    ACE_NTOHL (0x73657400),  // name = native_code_set
-+        CORBA::tk_alias, // typecode kind for typedefs
-+    68, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      37,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x6f6d672e),
-+      ACE_NTOHL (0x6f72672f),
-+      ACE_NTOHL (0x434f4e56),
-+      ACE_NTOHL (0x5f465241),
-+      ACE_NTOHL (0x4d452f43),
-+      ACE_NTOHL (0x6f646553),
-+      ACE_NTOHL (0x65744964),
-+      ACE_NTOHL (0x3a312e30),
-+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-+            10,
-+      ACE_NTOHL (0x436f6465),
-+      ACE_NTOHL (0x53657449),
-+      ACE_NTOHL (0x64000000),  // name = CodeSetId
-+            CORBA::tk_ulong,
-+
-+
-+    21,
-+    ACE_NTOHL (0x636f6e76),
-+    ACE_NTOHL (0x65727369),
-+    ACE_NTOHL (0x6f6e5f63),
-+    ACE_NTOHL (0x6f64655f),
-+    ACE_NTOHL (0x73657473),
-+    ACE_NTOHL (0x0),  // name = conversion_code_sets
-+        CORBA::tk_sequence, // typecode kind
-+    84, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      CORBA::tk_alias, // typecode kind for typedefs
-+      68, // encapsulation length
-+        TAO_ENCAP_BYTE_ORDER, // byte order
-+        37,
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x6f6d672e),
-+        ACE_NTOHL (0x6f72672f),
-+        ACE_NTOHL (0x434f4e56),
-+        ACE_NTOHL (0x5f465241),
-+        ACE_NTOHL (0x4d452f43),
-+        ACE_NTOHL (0x6f646553),
-+        ACE_NTOHL (0x65744964),
-+        ACE_NTOHL (0x3a312e30),
-+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-+                10,
-+        ACE_NTOHL (0x436f6465),
-+        ACE_NTOHL (0x53657449),
-+        ACE_NTOHL (0x64000000),  // name = CodeSetId
-+                CORBA::tk_ulong,
-+
-+
-+      0U,
-+
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (
-+    CORBA::tk_struct,
-+    sizeof (_oc_CONV_FRAME_CodeSetComponentInfo),
-+    (char *) &_oc_CONV_FRAME_CodeSetComponentInfo,
-+    0,
-+    sizeof (CONV_FRAME::CodeSetComponentInfo)
-+  );
-+
-+namespace CONV_FRAME
-+{
-+  ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo =
-+    &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  42,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x434f4e56),
-+  ACE_NTOHL (0x5f465241),
-+  ACE_NTOHL (0x4d452f43),
-+  ACE_NTOHL (0x6f646553),
-+  ACE_NTOHL (0x6574436f),
-+  ACE_NTOHL (0x6e746578),
-+  ACE_NTOHL (0x743a312e),
-+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
-+    15,
-+  ACE_NTOHL (0x436f6465),
-+  ACE_NTOHL (0x53657443),
-+  ACE_NTOHL (0x6f6e7465),
-+  ACE_NTOHL (0x78740000),  // name = CodeSetContext
-+  2, // member count
-+    10,
-+  ACE_NTOHL (0x63686172),
-+  ACE_NTOHL (0x5f646174),
-+  ACE_NTOHL (0x61000000),  // name = char_data
-+    CORBA::tk_alias, // typecode kind for typedefs
-+  68, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    37,
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x6f6d672e),
-+    ACE_NTOHL (0x6f72672f),
-+    ACE_NTOHL (0x434f4e56),
-+    ACE_NTOHL (0x5f465241),
-+    ACE_NTOHL (0x4d452f43),
-+    ACE_NTOHL (0x6f646553),
-+    ACE_NTOHL (0x65744964),
-+    ACE_NTOHL (0x3a312e30),
-+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-+        10,
-+    ACE_NTOHL (0x436f6465),
-+    ACE_NTOHL (0x53657449),
-+    ACE_NTOHL (0x64000000),  // name = CodeSetId
-+        CORBA::tk_ulong,
-+
-+
-+  11,
-+  ACE_NTOHL (0x77636861),
-+  ACE_NTOHL (0x725f6461),
-+  ACE_NTOHL (0x74610000),  // name = wchar_data
-+    CORBA::tk_alias, // typecode kind for typedefs
-+  68, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    37,
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x6f6d672e),
-+    ACE_NTOHL (0x6f72672f),
-+    ACE_NTOHL (0x434f4e56),
-+    ACE_NTOHL (0x5f465241),
-+    ACE_NTOHL (0x4d452f43),
-+    ACE_NTOHL (0x6f646553),
-+    ACE_NTOHL (0x65744964),
-+    ACE_NTOHL (0x3a312e30),
-+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-+        10,
-+    ACE_NTOHL (0x436f6465),
-+    ACE_NTOHL (0x53657449),
-+    ACE_NTOHL (0x64000000),  // name = CodeSetId
-+        CORBA::tk_ulong,
-+
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (
-+    CORBA::tk_struct,
-+    sizeof (_oc_CONV_FRAME_CodeSetContext),
-+    (char *) &_oc_CONV_FRAME_CodeSetContext,
-+    0,
-+    sizeof (CONV_FRAME::CodeSetContext)
-+  );
-+
-+namespace CONV_FRAME
-+{
-+  ::CORBA::TypeCode_ptr _tc_CodeSetContext =
-+    &_tc_TAO_tc_CONV_FRAME_CodeSetContext;
-+}
- 
- // TAO_IDL - Generated from 
- // be/be_visitor_structure/any_op_cs.cpp:54
diff --git a/TAO/tao/diffs/Current.diff b/TAO/tao/diffs/Current.diff
deleted file mode 100644
index 63ab738c40a..00000000000
--- a/TAO/tao/diffs/Current.diff
+++ /dev/null
@@ -1,187 +0,0 @@
---- orig/CurrentC.h	2003-12-24 12:45:50.000000000 -0600
-+++ CurrentC.h	2003-12-24 12:27:34.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,17 +33,12 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "tao/ORB.h"
-+#include "tao/Object.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "TAO_Export.h"
--#include "tao/CDR.h"
--#include "tao/Environment.h"
--#include "tao/Object.h"
--#include "tao/Objref_VarOut_T.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -167,10 +162,7 @@
- 
- #endif /* end #if !defined */
-   
--  // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
-   
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
- 
- // TAO_IDL - Generated from
- // be/be_visitor_module/module_ch.cpp:66
---- orig/CurrentC.i	2003-12-24 12:45:50.000000000 -0600
-+++ CurrentC.i	2003-12-23 19:11:35.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/CurrentC.cpp	2003-12-24 12:45:50.000000000 -0600
-+++ CurrentC.cpp	2003-12-24 12:28:57.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -30,7 +30,6 @@
- 
- 
- #include "CurrentC.h"
--#include "tao/Typecode.h"
- #include "ace/OS_NS_string.h"
- 
- #if defined (__BORLANDC__)
-@@ -196,40 +195,6 @@
- }
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_CORBA_Current[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  30,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x412f4375), 
--  ACE_NTOHL (0x7272656e), 
--  ACE_NTOHL (0x743a312e), 
--  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
--    8,
--  ACE_NTOHL (0x43757272), 
--  ACE_NTOHL (0x656e7400),  // name = Current
--  };
--
--static CORBA::TypeCode _tc_TAO_tc_CORBA_Current (
--    CORBA::tk_objref,
--    sizeof (_oc_CORBA_Current),
--    (char *) &_oc_CORBA_Current,
--    0,
--    sizeof (CORBA::Current)
--  );
--
--namespace CORBA
--{
--  ::CORBA::TypeCode_ptr _tc_Current =
--    &_tc_TAO_tc_CORBA_Current;
--}
--
--// TAO_IDL - Generated from
- // be/be_visitor_root/root.cpp:1725
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
---- orig/CurrentA.h	2003-12-24 12:45:50.000000000 -0600
-+++ CurrentA.h	2003-12-24 12:27:40.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,6 +33,15 @@
- 
- #include /**/ "ace/pre.h"
- 
-+// ======= Handcrafted
-+namespace CORBA
-+{
-+  // TAO_IDL - Generated from
-+  // be/be_visitor_typecode/typecode_decl.cpp:44
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
-+}
-+
- // TAO_IDL - Generated from
- // be/be_visitor_interface/any_op_ch.cpp:52
- 
---- orig/CurrentA.cpp	2003-12-24 12:45:50.000000000 -0600
-+++ CurrentA.cpp	2003-12-24 12:28:48.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -30,6 +30,41 @@
- #include "tao/Typecode.h"
- #include "tao/Any_Impl_T.h"
- 
-+
-+// ======= Handcrafted
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+static const CORBA::Long _oc_CORBA_Current[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  30,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x434f5242),
-+  ACE_NTOHL (0x412f4375),
-+  ACE_NTOHL (0x7272656e),
-+  ACE_NTOHL (0x743a312e),
-+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
-+    8,
-+  ACE_NTOHL (0x43757272),
-+  ACE_NTOHL (0x656e7400),  // name = Current
-+  };
-+
-+static CORBA::TypeCode _tc_TAO_tc_CORBA_Current (
-+    CORBA::tk_objref,
-+    sizeof (_oc_CORBA_Current),
-+    (char *) &_oc_CORBA_Current,
-+    0,
-+    sizeof (CORBA::Current)
-+  );
-+
-+namespace CORBA
-+{
-+  ::CORBA::TypeCode_ptr _tc_Current =
-+    &_tc_TAO_tc_CORBA_Current;
-+}
-+
- // TAO_IDL - Generated from
- // be/be_visitor_interface/any_op_cs.cpp:50
- 
diff --git a/TAO/tao/diffs/GIOP.diff b/TAO/tao/diffs/GIOP.diff
deleted file mode 100644
index 2291bfc3a83..00000000000
--- a/TAO/tao/diffs/GIOP.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- orig/GIOPC.h	2003-04-27 11:09:17.000000000 -0500
-+++ ./GIOPC.h	2003-04-27 11:15:10.000000000 -0500
-@@ -30,20 +30,17 @@
- 
- #ifndef _TAO_IDL_ORIG_GIOPC_H_
- #define _TAO_IDL_ORIG_GIOPC_H_
--
- #include "ace/pre.h"
- 
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--
--#include "tao/TAO_Export.h"
--
--#include "IOPC.h"
--#include "OctetSeqC.h"
-+#include "tao/IOP_IORC.h"
-+#include "tao/VarOut_T.h"
-+#include "tao/Any_T.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
---- orig/GIOPC.cpp	2003-04-27 11:09:17.000000000 -0500
-+++ ./GIOPC.cpp	2003-04-27 11:16:07.000000000 -0500
-@@ -30,16 +30,6 @@
- 
- 
- #include "GIOPC.h"
--#include "tao/Stub.h"
--#include "tao/Invocation.h"
--#include "tao/PortableInterceptor.h"
--
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#include "tao/ClientRequestInfo_i.h"
--#include "tao/ClientInterceptorAdapter.h"
--#endif  /* TAO_HAS_INTERCEPTORS == 1 */
--
- 
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/diffs/GIOPS.cpp.diff b/TAO/tao/diffs/GIOPS.cpp.diff
deleted file mode 100644
index b70e55ba4f2..00000000000
--- a/TAO/tao/diffs/GIOPS.cpp.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- orig/GIOPS.cpp	Thu Jan 10 11:45:43 2002
-+++ GIOPS.cpp	Tue Sep 12 18:04:48 2000
-@@ -1,52 +1,22 @@
--// -*- C++ -*-
-+/* -*- C++ -*- $Id$ */
- //
--// $Id$
--
--// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--//       Center for Distributed Object Computing
--//       Washington University
--//       St. Louis, MO
--//       USA
--//       http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--//       Distributed Object Computing Laboratory
--//       University of California at Irvine
--//       Irvine, CA
--//       USA
--//       http://doc.ece.uci.edu/
-+// $Id$
- //
--// Information about TAO is available at:
--//     http://www.cs.wustl.edu/~schmidt/TAO.html
--
--#ifndef _TAO_IDL_GIOPS_CPP_
--#define _TAO_IDL_GIOPS_CPP_
-+// ================================================================
-+//
-+// = LIBRARY
-+//   TAO
-+//
-+// = FILENAME
-+//   GIOPS.cpp
-+//
-+// = DESCRIPTION
-+//   Generated from GIOP.pidl
-+//
-+// ================================================================
- 
- #include "GIOPS.h"
- 
--#include "tao/PortableServer/Object_Adapter.h"
--#include "tao/PortableServer/Operation_Table.h"
--#include "tao/TAO_Server_Request.h"
--#include "tao/ORB_Core.h"
--#include "tao/Stub.h"
--#include "tao/IFR_Client_Adapter.h"
--#include "tao/PortableInterceptor.h"
--
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#include "tao/PICurrent.h"
--#include "tao/PortableServer/ServerRequestInfo.h"
--#include "tao/PortableServer/ServerInterceptorAdapter.h"
--#endif  /* TAO_HAS_INTERCEPTORS == 1 */
--
--#include "ace/Dynamic_Service.h"
--#if defined (__BORLANDC__)
--#pragma option -w-rvl -w-rch -w-ccc -w-aus
--#endif /* __BORLANDC__ */
--
- #if !defined (__ACE_INLINE__)
- #include "GIOPS.i"
- #endif /* !defined INLINE */
--
--
--#endif /* ifndef */
diff --git a/TAO/tao/diffs/GIOPS.h.diff b/TAO/tao/diffs/GIOPS.h.diff
deleted file mode 100644
index 4dac3131285..00000000000
--- a/TAO/tao/diffs/GIOPS.h.diff
+++ /dev/null
@@ -1,89 +0,0 @@
---- orig/GIOPS.h	Thu Jan 10 11:45:43 2002
-+++ GIOPS.h	Fri Dec 15 14:06:47 2000
-@@ -1,29 +1,20 @@
--// -*- C++ -*-
--//
--// $Id$
--
--// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--//       Center for Distributed Object Computing
--//       Washington University
--//       St. Louis, MO
--//       USA
--//       http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--//       Distributed Object Computing Laboratory
--//       University of California at Irvine
--//       Irvine, CA
--//       USA
--//       http://doc.ece.uci.edu/
--//
--// Information about TAO is available at:
--//     http://www.cs.wustl.edu/~schmidt/TAO.html
-+/* -*- C++ -*- $Id$ */
-+//=============================================================================
-+/**
-+ *  @file   GIOPS.h
-+ *
-+ *  $Id$
-+ *
-+ * Generated from GIOP.pidl
-+ * The file is almost empty and only present to keep other IDL files
-+ * that include GIOP.pidl happy.
-+ *
-+ */
-+//=============================================================================
- 
--#ifndef _TAO_IDL_GIOPS_H_
--#define _TAO_IDL_GIOPS_H_
-+#ifndef TAO_IDL_GIOP1_2S_H
-+#define TAO_IDL_GIOP1_2S_H
- 
--#include "ace/pre.h"
--#include "IOPS.h"
- #include "GIOPC.h"
- 
- 
-@@ -31,40 +22,10 @@
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "tao/PortableServer/PortableServer.h"
--#include "tao/PortableServer/Servant_Base.h"
--#include "tao/PortableServer/Collocated_Object.h"
--#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
--#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
--#if defined(_MSC_VER)
--#if (_MSC_VER >= 1200)
--#pragma warning(push)
--#endif /* _MSC_VER >= 1200 */
--#pragma warning(disable:4250)
--#endif /* _MSC_VER */
--
--#if defined (__BORLANDC__)
--#pragma option push -w-rvl -w-rch -w-ccc -w-inl
--#endif /* __BORLANDC__ */
--
--TAO_NAMESPACE  POA_GIOP
--{
--}
--TAO_NAMESPACE_CLOSE // module GIOP
--
--#include "GIOPS_T.h"
-+#include "tao/GIOPS_T.h"
- 
- #if defined (__ACE_INLINE__)
- #include "GIOPS.i"
- #endif /* defined INLINE */
- 
--#if defined(_MSC_VER) && (_MSC_VER >= 1200)
--#pragma warning(pop)
--#endif /* _MSC_VER */
--
--#if defined (__BORLANDC__)
--#pragma option pop
--#endif /* __BORLANDC__ */
--
--#include "ace/post.h"
- #endif /* ifndef */
diff --git a/TAO/tao/diffs/GIOPS.i.diff b/TAO/tao/diffs/GIOPS.i.diff
deleted file mode 100644
index b97701de0ac..00000000000
--- a/TAO/tao/diffs/GIOPS.i.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- orig/GIOPS.i	Thu Jan 10 11:45:43 2002
-+++ GIOPS.i	Tue Sep 12 18:04:48 2000
-@@ -1,21 +1 @@
--// -*- C++ -*-
--//
--// $Id$
--
--// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--//       Center for Distributed Object Computing
--//       Washington University
--//       St. Louis, MO
--//       USA
--//       http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--//       Distributed Object Computing Laboratory
--//       University of California at Irvine
--//       Irvine, CA
--//       USA
--//       http://doc.ece.uci.edu/
--//
--// Information about TAO is available at:
--//     http://www.cs.wustl.edu/~schmidt/TAO.html
--
-+/* -*- C++ -*- $Id$ */
diff --git a/TAO/tao/diffs/GIOPS_T.cpp.diff b/TAO/tao/diffs/GIOPS_T.cpp.diff
deleted file mode 100644
index 5eadc43f56a..00000000000
--- a/TAO/tao/diffs/GIOPS_T.cpp.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- orig/GIOPS_T.cpp	Thu Jan 10 11:45:43 2002
-+++ GIOPS_T.cpp	Tue Sep 12 18:04:48 2000
-@@ -1,26 +1,19 @@
--// -*- C++ -*-
-+/* -*- C++ -*- $Id$ */
-+// ================================================================
- //
--// $Id$
--
--// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--//       Center for Distributed Object Computing
--//       Washington University
--//       St. Louis, MO
--//       USA
--//       http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--//       Distributed Object Computing Laboratory
--//       University of California at Irvine
--//       Irvine, CA
--//       USA
--//       http://doc.ece.uci.edu/
-+// = LIBRARY
-+//   TAO
- //
--// Information about TAO is available at:
--//     http://www.cs.wustl.edu/~schmidt/TAO.html
--
--#ifndef _TAO_IDL_GIOPS_T_CPP_
--#define _TAO_IDL_GIOPS_T_CPP_
-+// = FILENAME
-+//   GIOPS_T.h
-+//
-+// = DESCRIPTION
-+//   Generated from GIOP.pidl
-+//   The file is almost empty and only present to keep other IDL files
-+//   that include GIOP.pidl happy.
-+// ================================================================
-+#ifndef TAO_IDL_GIOP1_2S_T_CPP
-+#define TAO_IDL_GIOP1_2S_T_CPP
- 
- #include "GIOPS_T.h"
- 
diff --git a/TAO/tao/diffs/GIOPS_T.h.diff b/TAO/tao/diffs/GIOPS_T.h.diff
deleted file mode 100644
index d7e1925657f..00000000000
--- a/TAO/tao/diffs/GIOPS_T.h.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- orig/GIOPS_T.h	Thu Jan 10 11:45:43 2002
-+++ GIOPS_T.h	Fri Dec 15 14:06:47 2000
-@@ -1,41 +1,20 @@
--// -*- C++ -*-
--//
--// $Id$
--
--// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--//       Center for Distributed Object Computing
--//       Washington University
--//       St. Louis, MO
--//       USA
--//       http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--//       Distributed Object Computing Laboratory
--//       University of California at Irvine
--//       Irvine, CA
--//       USA
--//       http://doc.ece.uci.edu/
--//
--// Information about TAO is available at:
--//     http://www.cs.wustl.edu/~schmidt/TAO.html
--
--#ifndef _TAO_IDL_GIOPS_T_H_
--#define _TAO_IDL_GIOPS_T_H_
--
--#include "ace/pre.h"
--#if defined(_MSC_VER)
--#if (_MSC_VER >= 1200)
--#pragma warning(push)
--#endif /* _MSC_VER >= 1200 */
--#pragma warning(disable:4250)
--#endif /* _MSC_VER */
--
--#if defined (ACE_HAS_USING_KEYWORD)
--TAO_NAMESPACE  POA_GIOP
--{
--}
--TAO_NAMESPACE_CLOSE // module GIOP
--#endif /* ACE_HAS_USING_KEYWORD */
-+/* -*- C++ -*- $Id$ */
-+//=============================================================================
-+/**
-+ *  @file   GIOPS_T.h
-+ *
-+ *  $Id$
-+ *
-+ * Generated from GIOP.pidl
-+ * The file is almost empty and only present to keep other IDL files
-+ * that include GIOP.pidl happy.
-+ *
-+ */
-+//=============================================================================
-+
-+#ifndef TAO_IDL_GIOP1_2S_T_H
-+#define TAO_IDL_GIOP1_2S_T_H
-+
- 
- #if defined (__ACE_INLINE__)
- #include "GIOPS_T.i"
-@@ -51,9 +30,4 @@
- #pragma implementation ("GIOPS_T.cpp")
- #endif /* defined REQUIRED PRAGMA */
- 
--#if defined(_MSC_VER) && (_MSC_VER >= 1200)
--#pragma warning(pop)
--#endif /* _MSC_VER */
--
--#include "ace/post.h"
- #endif /* ifndef */
diff --git a/TAO/tao/diffs/GIOPS_T.i.diff b/TAO/tao/diffs/GIOPS_T.i.diff
deleted file mode 100644
index 27f779ada9e..00000000000
--- a/TAO/tao/diffs/GIOPS_T.i.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- orig/GIOPS_T.i	Thu Jan 10 11:45:43 2002
-+++ GIOPS_T.i	Tue Sep 12 18:04:48 2000
-@@ -1,21 +1 @@
--// -*- C++ -*-
--//
--// $Id$
--
--// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--//       Center for Distributed Object Computing
--//       Washington University
--//       St. Louis, MO
--//       USA
--//       http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--//       Distributed Object Computing Laboratory
--//       University of California at Irvine
--//       Irvine, CA
--//       USA
--//       http://doc.ece.uci.edu/
--//
--// Information about TAO is available at:
--//     http://www.cs.wustl.edu/~schmidt/TAO.html
--
-+/* -*- C++ -*- $Id$ */
diff --git a/TAO/tao/diffs/IIOP.diff b/TAO/tao/diffs/IIOP.diff
deleted file mode 100644
index a09c7909fb0..00000000000
--- a/TAO/tao/diffs/IIOP.diff
+++ /dev/null
@@ -1,590 +0,0 @@
---- orig/IIOPC.h	2003-12-24 12:43:32.000000000 -0600
-+++ IIOPC.h	2003-12-24 12:40:19.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,16 +33,13 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "tao/ORB.h"
-+#include "tao/Sequence_T.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "tao/TAO_Export.h"
--#include "tao/CDR.h"
--#include "tao/Environment.h"
--#include "tao/Sequence_T.h"
-+#include "CDR.h"
- #include "tao/Seq_Var_T.h"
- #include "tao/Seq_Out_T.h"
- #include "tao/VarOut_T.h"
-@@ -106,10 +103,6 @@
-     CORBA::UShort port;
-   };
-   
--  // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPoint;
-   
-   // TAO_IDL - Generated from
-   // be/be_visitor_sequence/sequence_ch.cpp:101
-@@ -159,10 +152,6 @@
- 
- #endif /* end #if !defined */
-   
--  // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList;
-   
-   // TAO_IDL - Generated from
-   // be/be_type.cpp:258
-@@ -193,10 +182,6 @@
-     IIOP::ListenPointList listen_points;
-   };
-   
--  // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext;
- 
- // TAO_IDL - Generated from
- // be/be_visitor_module/module_ch.cpp:66
---- orig/IIOPC.i	2003-12-24 12:43:31.000000000 -0600
-+++ IIOPC.i	2003-12-23 19:11:35.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/IIOPC.cpp	2003-12-24 12:43:32.000000000 -0600
-+++ IIOPC.cpp	2003-12-24 12:41:36.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -30,7 +30,6 @@
- 
- 
- #include "IIOPC.h"
--#include "tao/Typecode.h"
- 
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-@@ -49,52 +48,6 @@
- }
- 
- 
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IIOP_ListenPoint[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  33,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x49494f50), 
--  ACE_NTOHL (0x2f4c6973), 
--  ACE_NTOHL (0x74656e50), 
--  ACE_NTOHL (0x6f696e74), 
--  ACE_NTOHL (0x3a312e30), 
--  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
--    12,
--  ACE_NTOHL (0x4c697374), 
--  ACE_NTOHL (0x656e506f), 
--  ACE_NTOHL (0x696e7400),  // name = ListenPoint
--  2, // member count
--    5,
--  ACE_NTOHL (0x686f7374), 
--  ACE_NTOHL (0x0),  // name = host
--    CORBA::tk_string, 
--  0U, // string length
--  5,
--  ACE_NTOHL (0x706f7274), 
--  ACE_NTOHL (0x0),  // name = port
--    CORBA::tk_ushort,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint (
--    CORBA::tk_struct,
--    sizeof (_oc_IIOP_ListenPoint),
--    (char *) &_oc_IIOP_ListenPoint,
--    0,
--    sizeof (IIOP::ListenPoint)
--  );
--
--namespace IIOP
--{
--  ::CORBA::TypeCode_ptr _tc_ListenPoint =
--    &_tc_TAO_tc_IIOP_ListenPoint;
--}
- 
- // TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
-@@ -163,180 +116,6 @@
- #endif /* end #if !defined */
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IIOP_ListenPointList[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  37,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x49494f50), 
--  ACE_NTOHL (0x2f4c6973), 
--  ACE_NTOHL (0x74656e50), 
--  ACE_NTOHL (0x6f696e74), 
--  ACE_NTOHL (0x4c697374), 
--  ACE_NTOHL (0x3a312e30), 
--  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
--    16,
--  ACE_NTOHL (0x4c697374), 
--  ACE_NTOHL (0x656e506f), 
--  ACE_NTOHL (0x696e744c), 
--  ACE_NTOHL (0x69737400),  // name = ListenPointList
--    CORBA::tk_sequence, // typecode kind
--  116, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_struct, // typecode kind
--    100, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      33,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x6f6d672e), 
--      ACE_NTOHL (0x6f72672f), 
--      ACE_NTOHL (0x49494f50), 
--      ACE_NTOHL (0x2f4c6973), 
--      ACE_NTOHL (0x74656e50), 
--      ACE_NTOHL (0x6f696e74), 
--      ACE_NTOHL (0x3a312e30), 
--      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
--            12,
--      ACE_NTOHL (0x4c697374), 
--      ACE_NTOHL (0x656e506f), 
--      ACE_NTOHL (0x696e7400),  // name = ListenPoint
--      2, // member count
--            5,
--      ACE_NTOHL (0x686f7374), 
--      ACE_NTOHL (0x0),  // name = host
--            CORBA::tk_string, 
--      0U, // string length
--      5,
--      ACE_NTOHL (0x706f7274), 
--      ACE_NTOHL (0x0),  // name = port
--            CORBA::tk_ushort,
--
--
--    0U,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList (
--    CORBA::tk_alias,
--    sizeof (_oc_IIOP_ListenPointList),
--    (char *) &_oc_IIOP_ListenPointList,
--    0,
--    sizeof (IIOP::ListenPointList)
--  );
--
--namespace IIOP
--{
--  ::CORBA::TypeCode_ptr _tc_ListenPointList =
--    &_tc_TAO_tc_IIOP_ListenPointList;
--}
--
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  45,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x49494f50), 
--  ACE_NTOHL (0x2f426944), 
--  ACE_NTOHL (0x69724949), 
--  ACE_NTOHL (0x4f505365), 
--  ACE_NTOHL (0x72766963), 
--  ACE_NTOHL (0x65436f6e), 
--  ACE_NTOHL (0x74657874), 
--  ACE_NTOHL (0x3a312e30), 
--  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0
--    24,
--  ACE_NTOHL (0x42694469), 
--  ACE_NTOHL (0x7249494f), 
--  ACE_NTOHL (0x50536572), 
--  ACE_NTOHL (0x76696365), 
--  ACE_NTOHL (0x436f6e74), 
--  ACE_NTOHL (0x65787400),  // name = BiDirIIOPServiceContext
--  1, // member count
--    14,
--  ACE_NTOHL (0x6c697374), 
--  ACE_NTOHL (0x656e5f70), 
--  ACE_NTOHL (0x6f696e74), 
--  ACE_NTOHL (0x73000000),  // name = listen_points
--    CORBA::tk_alias, // typecode kind for typedefs
--  192, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    37,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x6f6d672e), 
--    ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x49494f50), 
--    ACE_NTOHL (0x2f4c6973), 
--    ACE_NTOHL (0x74656e50), 
--    ACE_NTOHL (0x6f696e74), 
--    ACE_NTOHL (0x4c697374), 
--    ACE_NTOHL (0x3a312e30), 
--    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
--        16,
--    ACE_NTOHL (0x4c697374), 
--    ACE_NTOHL (0x656e506f), 
--    ACE_NTOHL (0x696e744c), 
--    ACE_NTOHL (0x69737400),  // name = ListenPointList
--        CORBA::tk_sequence, // typecode kind
--    116, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      CORBA::tk_struct, // typecode kind
--      100, // encapsulation length
--        TAO_ENCAP_BYTE_ORDER, // byte order
--        33,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x6f6d672e), 
--        ACE_NTOHL (0x6f72672f), 
--        ACE_NTOHL (0x49494f50), 
--        ACE_NTOHL (0x2f4c6973), 
--        ACE_NTOHL (0x74656e50), 
--        ACE_NTOHL (0x6f696e74), 
--        ACE_NTOHL (0x3a312e30), 
--        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
--                12,
--        ACE_NTOHL (0x4c697374), 
--        ACE_NTOHL (0x656e506f), 
--        ACE_NTOHL (0x696e7400),  // name = ListenPoint
--        2, // member count
--                5,
--        ACE_NTOHL (0x686f7374), 
--        ACE_NTOHL (0x0),  // name = host
--                CORBA::tk_string, 
--        0U, // string length
--        5,
--        ACE_NTOHL (0x706f7274), 
--        ACE_NTOHL (0x0),  // name = port
--                CORBA::tk_ushort,
--
--
--      0U,
--
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext (
--    CORBA::tk_struct,
--    sizeof (_oc_IIOP_BiDirIIOPServiceContext),
--    (char *) &_oc_IIOP_BiDirIIOPServiceContext,
--    0,
--    sizeof (IIOP::BiDirIIOPServiceContext)
--  );
--
--namespace IIOP
--{
--  ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext =
--    &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext;
--}
--
--// TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
- 
- void 
---- orig/IIOPA.h	2003-12-24 12:43:32.000000000 -0600
-+++ IIOPA.h	2003-12-24 12:40:28.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,6 +33,15 @@
- 
- #include /**/ "ace/pre.h"
- 
-+// ==== Hancrafted
-+namespace IIOP
-+{
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPoint;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext;
-+}
- // TAO_IDL - Generated from
- // be/be_visitor_structure/any_op_ch.cpp:52
- 
---- orig/IIOPA.cpp	2003-12-24 12:43:32.000000000 -0600
-+++ IIOPA.cpp	2003-12-24 12:41:32.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -30,6 +30,229 @@
- #include "tao/Typecode.h"
- #include "tao/Any_Dual_Impl_T.h"
- 
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IIOP_ListenPoint[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  33,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x49494f50),
-+  ACE_NTOHL (0x2f4c6973),
-+  ACE_NTOHL (0x74656e50),
-+  ACE_NTOHL (0x6f696e74),
-+  ACE_NTOHL (0x3a312e30),
-+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-+    12,
-+  ACE_NTOHL (0x4c697374),
-+  ACE_NTOHL (0x656e506f),
-+  ACE_NTOHL (0x696e7400),  // name = ListenPoint
-+  2, // member count
-+    5,
-+  ACE_NTOHL (0x686f7374),
-+  ACE_NTOHL (0x0),  // name = host
-+    CORBA::tk_string,
-+  0U, // string length
-+  5,
-+  ACE_NTOHL (0x706f7274),
-+  ACE_NTOHL (0x0),  // name = port
-+    CORBA::tk_ushort,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint (
-+    CORBA::tk_struct,
-+    sizeof (_oc_IIOP_ListenPoint),
-+    (char *) &_oc_IIOP_ListenPoint,
-+    0,
-+    sizeof (IIOP::ListenPoint)
-+  );
-+
-+namespace IIOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_ListenPoint =
-+    &_tc_TAO_tc_IIOP_ListenPoint;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IIOP_ListenPointList[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  37,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x49494f50),
-+  ACE_NTOHL (0x2f4c6973),
-+  ACE_NTOHL (0x74656e50),
-+  ACE_NTOHL (0x6f696e74),
-+  ACE_NTOHL (0x4c697374),
-+  ACE_NTOHL (0x3a312e30),
-+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
-+    16,
-+  ACE_NTOHL (0x4c697374),
-+  ACE_NTOHL (0x656e506f),
-+  ACE_NTOHL (0x696e744c),
-+  ACE_NTOHL (0x69737400),  // name = ListenPointList
-+    CORBA::tk_sequence, // typecode kind
-+  116, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    CORBA::tk_struct, // typecode kind
-+    100, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      33,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x6f6d672e),
-+      ACE_NTOHL (0x6f72672f),
-+      ACE_NTOHL (0x49494f50),
-+      ACE_NTOHL (0x2f4c6973),
-+      ACE_NTOHL (0x74656e50),
-+      ACE_NTOHL (0x6f696e74),
-+      ACE_NTOHL (0x3a312e30),
-+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-+            12,
-+      ACE_NTOHL (0x4c697374),
-+      ACE_NTOHL (0x656e506f),
-+      ACE_NTOHL (0x696e7400),  // name = ListenPoint
-+      2, // member count
-+            5,
-+      ACE_NTOHL (0x686f7374),
-+      ACE_NTOHL (0x0),  // name = host
-+            CORBA::tk_string,
-+      0U, // string length
-+      5,
-+      ACE_NTOHL (0x706f7274),
-+      ACE_NTOHL (0x0),  // name = port
-+            CORBA::tk_ushort,
-+
-+
-+    0U,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList (
-+    CORBA::tk_alias,
-+    sizeof (_oc_IIOP_ListenPointList),
-+    (char *) &_oc_IIOP_ListenPointList,
-+    0,
-+    sizeof (IIOP::ListenPointList)
-+  );
-+
-+namespace IIOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_ListenPointList =
-+    &_tc_TAO_tc_IIOP_ListenPointList;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  45,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x49494f50),
-+  ACE_NTOHL (0x2f426944),
-+  ACE_NTOHL (0x69724949),
-+  ACE_NTOHL (0x4f505365),
-+  ACE_NTOHL (0x72766963),
-+  ACE_NTOHL (0x65436f6e),
-+  ACE_NTOHL (0x74657874),
-+  ACE_NTOHL (0x3a312e30),
-+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0
-+    24,
-+  ACE_NTOHL (0x42694469),
-+  ACE_NTOHL (0x7249494f),
-+  ACE_NTOHL (0x50536572),
-+  ACE_NTOHL (0x76696365),
-+  ACE_NTOHL (0x436f6e74),
-+  ACE_NTOHL (0x65787400),  // name = BiDirIIOPServiceContext
-+  1, // member count
-+    14,
-+  ACE_NTOHL (0x6c697374),
-+  ACE_NTOHL (0x656e5f70),
-+  ACE_NTOHL (0x6f696e74),
-+  ACE_NTOHL (0x73000000),  // name = listen_points
-+    CORBA::tk_alias, // typecode kind for typedefs
-+  192, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    37,
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x6f6d672e),
-+    ACE_NTOHL (0x6f72672f),
-+    ACE_NTOHL (0x49494f50),
-+    ACE_NTOHL (0x2f4c6973),
-+    ACE_NTOHL (0x74656e50),
-+    ACE_NTOHL (0x6f696e74),
-+    ACE_NTOHL (0x4c697374),
-+    ACE_NTOHL (0x3a312e30),
-+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
-+        16,
-+    ACE_NTOHL (0x4c697374),
-+    ACE_NTOHL (0x656e506f),
-+    ACE_NTOHL (0x696e744c),
-+    ACE_NTOHL (0x69737400),  // name = ListenPointList
-+        CORBA::tk_sequence, // typecode kind
-+    116, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      CORBA::tk_struct, // typecode kind
-+      100, // encapsulation length
-+        TAO_ENCAP_BYTE_ORDER, // byte order
-+        33,
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x6f6d672e),
-+        ACE_NTOHL (0x6f72672f),
-+        ACE_NTOHL (0x49494f50),
-+        ACE_NTOHL (0x2f4c6973),
-+        ACE_NTOHL (0x74656e50),
-+        ACE_NTOHL (0x6f696e74),
-+        ACE_NTOHL (0x3a312e30),
-+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
-+                12,
-+        ACE_NTOHL (0x4c697374),
-+        ACE_NTOHL (0x656e506f),
-+        ACE_NTOHL (0x696e7400),  // name = ListenPoint
-+        2, // member count
-+                5,
-+        ACE_NTOHL (0x686f7374),
-+        ACE_NTOHL (0x0),  // name = host
-+                CORBA::tk_string,
-+        0U, // string length
-+        5,
-+        ACE_NTOHL (0x706f7274),
-+        ACE_NTOHL (0x0),  // name = port
-+                CORBA::tk_ushort,
-+
-+
-+      0U,
-+
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext (
-+    CORBA::tk_struct,
-+    sizeof (_oc_IIOP_BiDirIIOPServiceContext),
-+    (char *) &_oc_IIOP_BiDirIIOPServiceContext,
-+    0,
-+    sizeof (IIOP::BiDirIIOPServiceContext)
-+  );
-+
-+namespace IIOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext =
-+    &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext;
-+}
-+
-+
- // TAO_IDL - Generated from 
- // be/be_visitor_structure/any_op_cs.cpp:54
- 
diff --git a/TAO/tao/diffs/IIOP_Endpoints.diff b/TAO/tao/diffs/IIOP_Endpoints.diff
deleted file mode 100644
index b1c0c59f650..00000000000
--- a/TAO/tao/diffs/IIOP_Endpoints.diff
+++ /dev/null
@@ -1,396 +0,0 @@
---- orig/IIOP_EndpointsC.h	2003-12-24 13:29:44.000000000 -0600
-+++ IIOP_EndpointsC.h	2003-12-24 13:07:01.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,15 +33,12 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "tao/ORB.h"
-+#include "tao/CDR.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "tao/TAO_Export.h"
--#include "tao/CDR.h"
--#include "tao/Environment.h"
- #include "tao/Sequence_T.h"
- #include "tao/Seq_Var_T.h"
- #include "tao/Seq_Out_T.h"
-@@ -108,11 +105,6 @@
-   };
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOP_Endpoint_Info;
--  
--  // TAO_IDL - Generated from
-   // be/be_visitor_sequence/sequence_ch.cpp:101
- 
- #if !defined (_TAO_IIOPENDPOINTSEQUENCE_CH_)
-@@ -161,11 +153,6 @@
- #endif /* end #if !defined */
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOPEndpointSequence;
--
--// TAO_IDL - Generated from
- // be/be_visitor_module/module_ch.cpp:66
- 
- } // module TAO
---- orig/IIOP_EndpointsC.i	2003-12-24 13:29:44.000000000 -0600
-+++ IIOP_EndpointsC.i	2003-12-23 19:41:59.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/IIOP_EndpointsC.cpp	2003-12-24 13:29:44.000000000 -0600
-+++ IIOP_EndpointsC.cpp	2003-12-24 13:08:05.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -50,60 +50,6 @@
- 
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_TAO_IIOP_Endpoint_Info[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  31,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x54414f2f), 
--  ACE_NTOHL (0x49494f50), 
--  ACE_NTOHL (0x5f456e64), 
--  ACE_NTOHL (0x706f696e), 
--  ACE_NTOHL (0x745f496e), 
--  ACE_NTOHL (0x666f3a31), 
--  ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
--    19,
--  ACE_NTOHL (0x49494f50), 
--  ACE_NTOHL (0x5f456e64), 
--  ACE_NTOHL (0x706f696e), 
--  ACE_NTOHL (0x745f496e), 
--  ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
--  3, // member count
--    5,
--  ACE_NTOHL (0x686f7374), 
--  ACE_NTOHL (0x0),  // name = host
--    CORBA::tk_string, 
--  0U, // string length
--  5,
--  ACE_NTOHL (0x706f7274), 
--  ACE_NTOHL (0x0),  // name = port
--    CORBA::tk_short,
--
--  9,
--  ACE_NTOHL (0x7072696f), 
--  ACE_NTOHL (0x72697479), 
--  ACE_NTOHL (0x0),  // name = priority
--    CORBA::tk_short,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_TAO_IIOP_Endpoint_Info (
--    CORBA::tk_struct,
--    sizeof (_oc_TAO_IIOP_Endpoint_Info),
--    (char *) &_oc_TAO_IIOP_Endpoint_Info,
--    0,
--    sizeof (TAO::IIOP_Endpoint_Info)
--  );
--
--namespace TAO
--{
--  ::CORBA::TypeCode_ptr _tc_IIOP_Endpoint_Info =
--    &_tc_TAO_tc_TAO_IIOP_Endpoint_Info;
--}
--
--// TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
- 
- void 
-@@ -170,86 +116,6 @@
- #endif /* end #if !defined */
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_TAO_IIOPEndpointSequence[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  33,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x54414f2f), 
--  ACE_NTOHL (0x49494f50), 
--  ACE_NTOHL (0x456e6470), 
--  ACE_NTOHL (0x6f696e74), 
--  ACE_NTOHL (0x53657175), 
--  ACE_NTOHL (0x656e6365), 
--  ACE_NTOHL (0x3a312e30), 
--  ACE_NTOHL (0x0),  // repository ID = IDL:TAO/IIOPEndpointSequence:1.0
--    21,
--  ACE_NTOHL (0x49494f50), 
--  ACE_NTOHL (0x456e6470), 
--  ACE_NTOHL (0x6f696e74), 
--  ACE_NTOHL (0x53657175), 
--  ACE_NTOHL (0x656e6365), 
--  ACE_NTOHL (0x0),  // name = IIOPEndpointSequence
--    CORBA::tk_sequence, // typecode kind
--  140, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_struct, // typecode kind
--    124, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      31,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x54414f2f), 
--      ACE_NTOHL (0x49494f50), 
--      ACE_NTOHL (0x5f456e64), 
--      ACE_NTOHL (0x706f696e), 
--      ACE_NTOHL (0x745f496e), 
--      ACE_NTOHL (0x666f3a31), 
--      ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
--            19,
--      ACE_NTOHL (0x49494f50), 
--      ACE_NTOHL (0x5f456e64), 
--      ACE_NTOHL (0x706f696e), 
--      ACE_NTOHL (0x745f496e), 
--      ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
--      3, // member count
--            5,
--      ACE_NTOHL (0x686f7374), 
--      ACE_NTOHL (0x0),  // name = host
--            CORBA::tk_string, 
--      0U, // string length
--      5,
--      ACE_NTOHL (0x706f7274), 
--      ACE_NTOHL (0x0),  // name = port
--            CORBA::tk_short,
--
--      9,
--      ACE_NTOHL (0x7072696f), 
--      ACE_NTOHL (0x72697479), 
--      ACE_NTOHL (0x0),  // name = priority
--            CORBA::tk_short,
--
--
--    0U,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_TAO_IIOPEndpointSequence (
--    CORBA::tk_alias,
--    sizeof (_oc_TAO_IIOPEndpointSequence),
--    (char *) &_oc_TAO_IIOPEndpointSequence,
--    0,
--    sizeof (TAO::IIOPEndpointSequence)
--  );
--
--namespace TAO
--{
--  ::CORBA::TypeCode_ptr _tc_IIOPEndpointSequence =
--    &_tc_TAO_tc_TAO_IIOPEndpointSequence;
--}
--
--// TAO_IDL - Generated from
- // be/be_visitor_sequence/cdr_op_cs.cpp:95
- 
- #if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_
---- orig/IIOP_EndpointsA.h	2003-12-24 13:29:44.000000000 -0600
-+++ IIOP_EndpointsA.h	2003-12-24 13:06:56.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,6 +33,14 @@
- 
- #include /**/ "ace/pre.h"
- 
-+// ====== Handcrafted
-+namespace TAO
-+{
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOP_Endpoint_Info;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOPEndpointSequence;
-+}
-+
- // TAO_IDL - Generated from
- // be/be_visitor_structure/any_op_ch.cpp:52
- 
---- orig/IIOP_EndpointsA.cpp	2003-12-24 13:29:44.000000000 -0600
-+++ IIOP_EndpointsA.cpp	2003-12-24 13:08:01.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -30,6 +30,141 @@
- #include "tao/Typecode.h"
- #include "tao/Any_Dual_Impl_T.h"
- 
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_TAO_IIOP_Endpoint_Info[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  31,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x54414f2f),
-+  ACE_NTOHL (0x49494f50),
-+  ACE_NTOHL (0x5f456e64),
-+  ACE_NTOHL (0x706f696e),
-+  ACE_NTOHL (0x745f496e),
-+  ACE_NTOHL (0x666f3a31),
-+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
-+    19,
-+  ACE_NTOHL (0x49494f50),
-+  ACE_NTOHL (0x5f456e64),
-+  ACE_NTOHL (0x706f696e),
-+  ACE_NTOHL (0x745f496e),
-+  ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
-+  3, // member count
-+    5,
-+  ACE_NTOHL (0x686f7374),
-+  ACE_NTOHL (0x0),  // name = host
-+    CORBA::tk_string,
-+  0U, // string length
-+  5,
-+  ACE_NTOHL (0x706f7274),
-+  ACE_NTOHL (0x0),  // name = port
-+    CORBA::tk_short,
-+
-+  9,
-+  ACE_NTOHL (0x7072696f),
-+  ACE_NTOHL (0x72697479),
-+  ACE_NTOHL (0x0),  // name = priority
-+    CORBA::tk_short,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_TAO_IIOP_Endpoint_Info (
-+    CORBA::tk_struct,
-+    sizeof (_oc_TAO_IIOP_Endpoint_Info),
-+    (char *) &_oc_TAO_IIOP_Endpoint_Info,
-+    0,
-+    sizeof (TAO::IIOP_Endpoint_Info)
-+  );
-+
-+namespace TAO
-+{
-+  ::CORBA::TypeCode_ptr _tc_IIOP_Endpoint_Info =
-+    &_tc_TAO_tc_TAO_IIOP_Endpoint_Info;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_TAO_IIOPEndpointSequence[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  33,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x54414f2f),
-+  ACE_NTOHL (0x49494f50),
-+  ACE_NTOHL (0x456e6470),
-+  ACE_NTOHL (0x6f696e74),
-+  ACE_NTOHL (0x53657175),
-+  ACE_NTOHL (0x656e6365),
-+  ACE_NTOHL (0x3a312e30),
-+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO/IIOPEndpointSequence:1.0
-+    21,
-+  ACE_NTOHL (0x49494f50),
-+  ACE_NTOHL (0x456e6470),
-+  ACE_NTOHL (0x6f696e74),
-+  ACE_NTOHL (0x53657175),
-+  ACE_NTOHL (0x656e6365),
-+  ACE_NTOHL (0x0),  // name = IIOPEndpointSequence
-+    CORBA::tk_sequence, // typecode kind
-+  140, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    CORBA::tk_struct, // typecode kind
-+    124, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      31,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x54414f2f),
-+      ACE_NTOHL (0x49494f50),
-+      ACE_NTOHL (0x5f456e64),
-+      ACE_NTOHL (0x706f696e),
-+      ACE_NTOHL (0x745f496e),
-+      ACE_NTOHL (0x666f3a31),
-+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:TAO/IIOP_Endpoint_Info:1.0
-+            19,
-+      ACE_NTOHL (0x49494f50),
-+      ACE_NTOHL (0x5f456e64),
-+      ACE_NTOHL (0x706f696e),
-+      ACE_NTOHL (0x745f496e),
-+      ACE_NTOHL (0x666f0000),  // name = IIOP_Endpoint_Info
-+      3, // member count
-+            5,
-+      ACE_NTOHL (0x686f7374),
-+      ACE_NTOHL (0x0),  // name = host
-+            CORBA::tk_string,
-+      0U, // string length
-+      5,
-+      ACE_NTOHL (0x706f7274),
-+      ACE_NTOHL (0x0),  // name = port
-+            CORBA::tk_short,
-+
-+      9,
-+      ACE_NTOHL (0x7072696f),
-+      ACE_NTOHL (0x72697479),
-+      ACE_NTOHL (0x0),  // name = priority
-+            CORBA::tk_short,
-+
-+
-+    0U,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_TAO_IIOPEndpointSequence (
-+    CORBA::tk_alias,
-+    sizeof (_oc_TAO_IIOPEndpointSequence),
-+    (char *) &_oc_TAO_IIOPEndpointSequence,
-+    0,
-+    sizeof (TAO::IIOPEndpointSequence)
-+  );
-+
-+namespace TAO
-+{
-+  ::CORBA::TypeCode_ptr _tc_IIOPEndpointSequence =
-+    &_tc_TAO_tc_TAO_IIOPEndpointSequence;
-+}
-+
- // TAO_IDL - Generated from 
- // be/be_visitor_structure/any_op_cs.cpp:54
- 
diff --git a/TAO/tao/diffs/IOP.diff b/TAO/tao/diffs/IOP.diff
deleted file mode 100644
index 8dd513110d6..00000000000
--- a/TAO/tao/diffs/IOP.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- orig/IOPC.h	Fri Apr  5 18:57:33 2002
-+++ IOPC.h	Fri Apr  5 18:45:26 2002
-@@ -23,13 +23,16 @@
- #define _TAO_IDL_IOPC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
- #include "tao/TAO_Export.h"
-+#include "Exception.h"
-+#include "Object.h"
-+#include "Any.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff
index 515ac3665f8..720a4a431c9 100644
--- a/TAO/tao/diffs/OctetSeq.diff
+++ b/TAO/tao/diffs/OctetSeq.diff
@@ -1,152 +1,21 @@
---- orig/OctetSeqC.h	2004-01-12 12:01:14.000000000 -0600
-+++ OctetSeqC.h	2004-01-12 12:13:43.000000000 -0600
-@@ -33,15 +33,13 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "tao/ORB.h"
-+#include "tao/Sequence.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
- #include "tao/CDR.h"
--#include "tao/Environment.h"
--#include "tao/Sequence_T.h"
- #include "tao/Seq_Var_T.h"
- #include "tao/Seq_Out_T.h"
- 
-@@ -131,11 +129,6 @@
- #endif /* end #if !defined */
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq;
--
--// TAO_IDL - Generated from
- // be/be_visitor_module/module_ch.cpp:66
- 
- } // module CORBA
---- orig/OctetSeqC.cpp	2004-01-12 12:01:14.000000000 -0600
-+++ OctetSeqC.cpp	2004-01-12 12:14:03.000000000 -0600
-@@ -103,47 +103,7 @@
- 
- #endif /* end #if !defined */
- 
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_CORBA_OctetSeq[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  31,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x412f4f63), 
--  ACE_NTOHL (0x74657453), 
--  ACE_NTOHL (0x65713a31), 
--  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
--    9,
--  ACE_NTOHL (0x4f637465), 
--  ACE_NTOHL (0x74536571), 
--  ACE_NTOHL (0x0),  // name = OctetSeq
--    CORBA::tk_sequence, // typecode kind
--  12, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_octet,
--
--    0U,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (
--    CORBA::tk_alias,
--    sizeof (_oc_CORBA_OctetSeq),
--    (char *) &_oc_CORBA_OctetSeq,
--    0,
--    sizeof (CORBA::OctetSeq)
--  );
- 
--namespace CORBA
--{
--  ::CORBA::TypeCode_ptr _tc_OctetSeq =
--    &_tc_TAO_tc_CORBA_OctetSeq;
--}
- 
- // TAO_IDL - Generated from
- // be/be_visitor_sequence/cdr_op_cs.cpp:95
---- orig/OctetSeqA.h	2004-01-12 12:01:14.000000000 -0600
-+++ OctetSeqA.h	2004-01-12 12:13:40.000000000 -0600
-@@ -40,6 +40,15 @@
- #endif
- #define TAO_EXPORT_MACRO TAO_Export
- 
-+//======= Handcrafted
-+namespace CORBA
-+{
-+  // TAO_IDL - Generated from
-+  // be/be_visitor_typecode/typecode_decl.cpp:44
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq;
-+}
+--- orig/OctetSeqC.h	2004-11-24 10:45:07.787692800 +0100
++++ OctetSeqC.h	2004-11-24 10:46:21.874224000 +0100
+@@ -148,6 +148,18 @@
+ {
+ }
+ 
++// Workaround for a Visual Studio .NET bug where this class is not
++// properly imported by an application if typedef'd or subclassed,
++// resulting in 'multiply defined' link errors. The export macro
++// here forces an explicit import by the application. Please see
++// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
++// The problem stems from use of the type below in PortableServer,
++// but we put the instantiation here because the application will
++// need to see it in *C.h to avoid the error.
++#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
++  template class TAO_Export TAO_Unbounded_Sequence<CORBA::OctetSeq>;
++#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 +
  // TAO_IDL - Generated from
- // be/be_visitor_sequence/any_op_ch.cpp:52
- 
---- orig/OctetSeqA.cpp	2004-01-12 12:01:14.000000000 -0600
-+++ OctetSeqA.cpp	2004-01-12 12:15:04.000000000 -0600
-@@ -30,6 +30,50 @@
- #include "tao/Typecode.h"
- #include "tao/Any_Dual_Impl_T.h"
- 
-+
-+// ======== Handcrafted
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_CORBA_OctetSeq[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  31,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x434f5242),
-+  ACE_NTOHL (0x412f4f63),
-+  ACE_NTOHL (0x74657453),
-+  ACE_NTOHL (0x65713a31),
-+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-+    9,
-+  ACE_NTOHL (0x4f637465),
-+  ACE_NTOHL (0x74536571),
-+  ACE_NTOHL (0x0),  // name = OctetSeq
-+    CORBA::tk_sequence, // typecode kind
-+  12, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    CORBA::tk_octet,
-+
-+    0U,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (
-+    CORBA::tk_alias,
-+    sizeof (_oc_CORBA_OctetSeq),
-+    (char *) &_oc_CORBA_OctetSeq,
-+    0,
-+    sizeof (CORBA::OctetSeq)
-+  );
-+
-+namespace CORBA
-+{
-+  ::CORBA::TypeCode_ptr _tc_OctetSeq =
-+    &_tc_TAO_tc_CORBA_OctetSeq;
-+}
-+
- // TAO_IDL - Generated from 
- // be/be_visitor_sequence/any_op_cs.cpp:54
+ // be\be_visitor_sequence/any_op_ch.cpp:52
  
diff --git a/TAO/tao/diffs/Policy.diff b/TAO/tao/diffs/Policy.diff
index 204d31997e2..bffdb569967 100644
--- a/TAO/tao/diffs/Policy.diff
+++ b/TAO/tao/diffs/Policy.diff
@@ -1,5 +1,5 @@
---- orig/PolicyC.h	2003-12-23 21:01:14.000000000 -0600
-+++ PolicyC.h	2003-12-23 21:29:08.000000000 -0600
+--- orig/PolicyC.h	2004-11-17 09:35:42.238198400 +0100
++++ PolicyC.h	2004-11-17 09:35:50.159588800 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,33 +8,7 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,23 +33,13 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "tao/ORB.h"
-+#include "tao/CurrentC.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "tao/TAO_Export.h"
--#include "tao/CDR.h"
--#include "tao/Environment.h"
--#include "tao/Object.h"
--#include "tao/Sequence_T.h"
--#include "tao/Objref_VarOut_T.h"
--#include "tao/Seq_Var_T.h"
--#include "tao/Seq_Out_T.h"
--
--#include "CurrentC.h"
--#include "Policy_ForwardC.h"
-+#include "tao/Exception.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -369,6 +359,15 @@
+@@ -334,6 +334,15 @@
      
      virtual const char* _interface_repository_id (void) const;
      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
@@ -50,8 +24,8 @@
    private:
      TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
    
---- orig/PolicyC.i	2003-12-23 21:01:14.000000000 -0600
-+++ PolicyC.i	2003-12-23 21:29:08.000000000 -0600
+--- orig/PolicyC.cpp	2004-11-17 09:35:42.238198400 +0100
++++ PolicyC.cpp	2004-11-17 09:55:41.000000000 +0100
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -60,19 +34,9 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
---- orig/PolicyC.cpp	2003-12-23 21:01:14.000000000 -0600
-+++ PolicyC.cpp	2003-12-23 21:29:08.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -1262,6 +1262,35 @@
- 
- #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__CPP_ */
+@@ -1118,6 +1118,34 @@
+     }
+ }
  
 +// Hand crafted.
 +//
@@ -102,7 +66,6 @@
 +}
 +// ****************************************************************
 +
-+
  // TAO_IDL - Generated from
- // be/be_visitor_interface/cdr_op_cs.cpp:63
+ // be\be_visitor_interface/cdr_op_cs.cpp:63
  
diff --git a/TAO/tao/diffs/Policy_Forward.diff b/TAO/tao/diffs/Policy_Forward.diff
index 45dbdd0cf80..1739675e21d 100644
--- a/TAO/tao/diffs/Policy_Forward.diff
+++ b/TAO/tao/diffs/Policy_Forward.diff
@@ -1,19 +1,18 @@
---- orig/Policy_ForwardC.h	Fri Apr  5 18:57:34 2002
-+++ Policy_ForwardC.h	Fri Apr  5 18:43:52 2002
-@@ -23,13 +23,15 @@
- #define _TAO_IDL_POLICY_FORWARDC_H_
+--- orig/Policy_ForwardC.h	2004-11-24 14:19:29.301641600 +0100
++++ Policy_ForwardC.h	2004-11-24 14:53:14.000000000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
  
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -41,7 +41,6 @@
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
  #include "tao/TAO_Export.h"
-+#include "Sequence.h"
-+#include "CDR.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
+-#include "tao/ORB.h"
+ #include "tao/Environment.h"
+ #include "tao/Sequence_T.h"
+ #include "tao/Objref_VarOut_T.h"
diff --git a/TAO/tao/diffs/PortableInterceptor.diff b/TAO/tao/diffs/PortableInterceptor.diff
index 3c6138d5b8e..a492ae7c8f5 100644
--- a/TAO/tao/diffs/PortableInterceptor.diff
+++ b/TAO/tao/diffs/PortableInterceptor.diff
@@ -1,49 +1,22 @@
---- orig/PortableInterceptorC.h	2003-12-24 08:19:51.000000000 -0600
-+++ PortableInterceptorC.h	2004-01-01 00:05:09.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
+--- orig/PortableInterceptorC.h	2004-12-11 16:46:29.861737600 +0100
++++ PortableInterceptorC.h	2004-12-11 16:47:24.019612800 +0100
+@@ -50,10 +50,10 @@
  
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -31,24 +31,16 @@
- #ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
- #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
- 
--#include "tao/ORB.h"
-+#include /**/ "ace/pre.h"
-+
-+#include "PI_ForwardC.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
--
--#include "tao/CDR.h"
--#include "tao/Environment.h"
--#include "tao/Object.h"
--#include "tao/Any.h"
--#include "tao/Objref_VarOut_T.h"
--
--#include "PI_ForwardC.h"
--#include "CurrentC.h"
--#include "DynamicC.h"
--#include "Messaging_SyncScopeC.h"
--#include "IOP_CodecC.h"
--#include "IOP_IORC.h"
-+#include "tao/Messaging_SyncScopeC.h"
-+#include "tao/IOP_CodecC.h"
+ #include "tao/PI_ForwardC.h"
+ #include "tao/CurrentC.h"
+-#include "tao/DynamicC.h"
+ #include "tao/Messaging_SyncScopeC.h"
+ #include "tao/IOP_CodecC.h"
+ #include "tao/IOP_IORC.h"
 +#include "tao/PolicyC.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -73,6 +65,15 @@
+@@ -76,6 +76,15 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
-+// Hand crafted, keeps DynamicC.h and Typecode.h out of header files.
++// Hand crafted, keep DynamicC.h out of header files.
 +namespace Dynamic
 +{
 +  class ParameterList;
@@ -53,35 +26,34 @@
 +}
 +
  // TAO_IDL - Generated from 
- // be/be_visitor_root/root_ch.cpp:63
+ // be\be_visitor_root/root_ch.cpp:62
  
-@@ -1292,16 +1293,19 @@
+@@ -1324,17 +1333,19 @@
      
      // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
+     // be\be_visitor_operation/operation_ch.cpp:46
 +#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
      
      virtual void tao_ft_interception_point (
--        PortableInterceptor::ServerRequestInfo_ptr ri,
--        CORBA::OctetSeq_out os
+         ::PortableInterceptor::ServerRequestInfo_ptr ri,
+-        ::CORBA::OctetSeq_out os
 -        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-+        PortableInterceptor::ServerRequestInfo_ptr ,
-+        CORBA::OctetSeq_out 
++        ::CORBA::OctetSeq_out
 +        ACE_ENV_ARG_DECL_NOT_USED
        )
        ACE_THROW_SPEC ((
-         CORBA::SystemException
-         , PortableInterceptor::ForwardRequest
+         CORBA::SystemException,
+         ::PortableInterceptor::ForwardRequest
 -      )) = 0;
 +        )) {}
-+
-+#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
      
++#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
      // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
-@@ -1462,6 +1466,16 @@
-         , CORBA::PolicyError
-       )) = 0;
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
+@@ -1481,6 +1492,16 @@
+     
+     static void _tao_any_destructor (void *);
      
 +    // Hand-crafted addition.
 +    virtual ::CORBA::Policy_ptr _create_policy (
@@ -94,66 +66,12 @@
 +      ));
 +
      // TAO_IDL - Generated from
-     // be/be_visitor_interface/interface_ch.cpp:196
+     // be\be_visitor_operation/operation_ch.cpp:46
      
-@@ -2121,27 +2135,6 @@
- 
- #endif /* end #if !defined */
- 
--#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
--#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
--  
--  ACE_TEMPLATE_SPECIALIZATION
--  struct TAO_Export Objref_Traits<PortableInterceptor::IORInterceptor>
--  {
--    static PortableInterceptor::IORInterceptor_ptr tao_duplicate (
--        PortableInterceptor::IORInterceptor_ptr
--      );
--    static void tao_release (
--        PortableInterceptor::IORInterceptor_ptr
--      );
--    static PortableInterceptor::IORInterceptor_ptr tao_nil (void);
--    static CORBA::Boolean tao_marshal (
--        PortableInterceptor::IORInterceptor_ptr p,
--        TAO_OutputCDR & cdr
--      );
--  };
--
--#endif /* end #if !defined */
--
- #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
- #define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
-   
-@@ -2229,5 +2222,6 @@
- #pragma option pop
- #endif /* __BORLANDC__ */
- 
--#endif /* ifndef */
-+#include /**/ "ace/post.h"
- 
-+#endif /* ifndef */
---- orig/PortableInterceptorC.i	2003-12-24 08:19:51.000000000 -0600
-+++ PortableInterceptorC.i	2003-12-23 21:29:08.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/PortableInterceptorC.cpp	2003-12-24 08:19:51.000000000 -0600
-+++ PortableInterceptorC.cpp	2003-12-23 21:29:08.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -1801,6 +1801,18 @@
-     &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor;
+--- orig/PortableInterceptorC.cpp	2004-12-11 16:46:29.861737600 +0100
++++ PortableInterceptorC.cpp	2004-12-11 16:18:27.762998400 +0100
+@@ -1957,6 +1957,18 @@
+   return 0;
  }
  
 +// Hand-crafted.
@@ -169,5 +87,5 @@
 +}
 +
  // TAO_IDL - Generated from
- // be/be_visitor_interface/interface_cs.cpp:60
+ // be\be_visitor_interface/interface_cs.cpp:60
  
diff --git a/TAO/tao/diffs/StringSeq.diff b/TAO/tao/diffs/StringSeq.diff
deleted file mode 100644
index b1a11be744e..00000000000
--- a/TAO/tao/diffs/StringSeq.diff
+++ /dev/null
@@ -1,1228 +0,0 @@
---- StringSeqC.h.old	Fri Mar  2 23:51:36 2001
-+++ StringSeqC.h	Sat Mar  3 11:28:11 2001
-@@ -19,17 +19,18 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_STRINGSEQC_H_
--#define _TAO_IDL_STRINGSEQC_H_
-+#ifndef _TAO_IDL_CORBA_STRINGSEQC_H_
-+#define _TAO_IDL_CORBA_STRINGSEQC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+
-+#include "corbafwd.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "corbafwd.h"
-+#include "Sequence.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -54,20 +55,17 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
--TAO_NAMESPACE  CORBA
--{
--
- #if !defined (_CORBA_STRINGSEQ_CH_)
- #define _CORBA_STRINGSEQ_CH_
- 
--  class StringSeq;
--  class StringSeq_var;
-+  class CORBA_StringSeq;
-+  class CORBA_StringSeq_var;
-   
-   // *************************************************************
--  // StringSeq
-+  // CORBA::StringSeq
-   // *************************************************************
-   
--  class TAO_Export StringSeq : public 
-+  class TAO_Export CORBA_StringSeq : public 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-     TAO_Unbounded_String_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -75,20 +73,20 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-   {
-   public:
--    StringSeq (void); // default ctor
--    StringSeq (CORBA::ULong max); // uses max size
--    StringSeq (
-+    CORBA_StringSeq (void); // default ctor
-+    CORBA_StringSeq (CORBA::ULong max); // uses max size
-+    CORBA_StringSeq (
-       CORBA::ULong max, 
-       CORBA::ULong length, 
-       char * *buffer, 
-       CORBA::Boolean release = 0
-     );
--    StringSeq (const StringSeq &); // copy ctor
--    ~StringSeq (void);
-+    CORBA_StringSeq (const CORBA_StringSeq &); // copy ctor
-+    ~CORBA_StringSeq (void);
-     static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--    typedef StringSeq_var _var_type;
-+    typedef CORBA_StringSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   };
-@@ -103,35 +101,35 @@
-   // class CORBA::StringSeq_var
-   // *************************************************************
- 
--  class TAO_Export StringSeq_var
-+  class TAO_Export CORBA_StringSeq_var
-   {
-   public:
--    StringSeq_var (void); // default constructor
--    StringSeq_var (StringSeq *);
--    StringSeq_var (const StringSeq_var &); // copy constructor
--    ~StringSeq_var (void); // destructor
-+    CORBA_StringSeq_var (void); // default constructor
-+    CORBA_StringSeq_var (CORBA_StringSeq *);
-+    CORBA_StringSeq_var (const CORBA_StringSeq_var &); // copy constructor
-+    ~CORBA_StringSeq_var (void); // destructor
-     
--    StringSeq_var &operator= (StringSeq *);
--    StringSeq_var &operator= (const StringSeq_var &);
--    StringSeq *operator-> (void);
--    const StringSeq *operator-> (void) const;
-+    CORBA_StringSeq_var &operator= (CORBA_StringSeq *);
-+    CORBA_StringSeq_var &operator= (const CORBA_StringSeq_var &);
-+    CORBA_StringSeq *operator-> (void);
-+    const CORBA_StringSeq *operator-> (void) const;
-     
--    operator const StringSeq &() const;
--    operator StringSeq &();
--    operator StringSeq &() const;
--    operator StringSeq *&(); // variable-size base types only
-+    operator const CORBA_StringSeq &() const;
-+    operator CORBA_StringSeq &();
-+    operator CORBA_StringSeq &() const;
-+    operator CORBA_StringSeq *&(); // variable-size base types only
-     
-     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-     
-     // in, inout, out, _retn 
--    const StringSeq &in (void) const;
--    StringSeq &inout (void);
--    StringSeq *&out (void);
--    StringSeq *_retn (void);
--    StringSeq *ptr (void) const;
-+    const CORBA_StringSeq &in (void) const;
-+    CORBA_StringSeq &inout (void);
-+    CORBA_StringSeq *&out (void);
-+    CORBA_StringSeq *_retn (void);
-+    CORBA_StringSeq *ptr (void) const;
- 
-   private:
--    StringSeq *ptr_;
-+    CORBA_StringSeq *ptr_;
-   };
- 
- 
-@@ -141,42 +139,39 @@
- #if !defined (_CORBA_STRINGSEQ___OUT_CH_)
- #define _CORBA_STRINGSEQ___OUT_CH_
- 
--  class TAO_Export StringSeq_out
-+  class TAO_Export CORBA_StringSeq_out
-   {
-   public:
--    StringSeq_out (StringSeq *&);
--    StringSeq_out (StringSeq_var &);
--    StringSeq_out (const StringSeq_out &);
--    StringSeq_out &operator= (const StringSeq_out &);
--    StringSeq_out &operator= (StringSeq *);
--    operator StringSeq *&();
--    StringSeq *&ptr (void);
--    StringSeq *operator-> (void);
-+    CORBA_StringSeq_out (CORBA_StringSeq *&);
-+    CORBA_StringSeq_out (CORBA_StringSeq_var &);
-+    CORBA_StringSeq_out (const CORBA_StringSeq_out &);
-+    CORBA_StringSeq_out &operator= (const CORBA_StringSeq_out &);
-+    CORBA_StringSeq_out &operator= (CORBA_StringSeq *);
-+    operator CORBA_StringSeq *&();
-+    CORBA_StringSeq *&ptr (void);
-+    CORBA_StringSeq *operator-> (void);
-     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-     
-   private:
--    StringSeq *&ptr_;
-+    CORBA_StringSeq *&ptr_;
-     // assignment from T_var not allowed
--    void operator= (const StringSeq_var &);
-+    void operator= (const CORBA_StringSeq_var &);
-   };
- 
- 
- #endif /* end #if !defined */
- 
--  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StringSeq;
--
--
- #if !defined (_CORBA_WSTRINGSEQ_CH_)
- #define _CORBA_WSTRINGSEQ_CH_
- 
--  class WStringSeq;
--  class WStringSeq_var;
-+  class CORBA_WStringSeq;
-+  class CORBA_WStringSeq_var;
-   
-   // *************************************************************
--  // WStringSeq
-+  // CORBA::WStringSeq
-   // *************************************************************
-   
--  class TAO_Export WStringSeq : public 
-+  class TAO_Export CORBA_WStringSeq : public 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-     TAO_Unbounded_WString_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -184,20 +179,20 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-   {
-   public:
--    WStringSeq (void); // default ctor
--    WStringSeq (CORBA::ULong max); // uses max size
--    WStringSeq (
-+    CORBA_WStringSeq (void); // default ctor
-+    CORBA_WStringSeq (CORBA::ULong max); // uses max size
-+    CORBA_WStringSeq (
-       CORBA::ULong max, 
-       CORBA::ULong length, 
-       CORBA::WChar * *buffer, 
-       CORBA::Boolean release = 0
-     );
--    WStringSeq (const WStringSeq &); // copy ctor
--    ~WStringSeq (void);
-+    CORBA_WStringSeq (const CORBA_WStringSeq &); // copy ctor
-+    ~CORBA_WStringSeq (void);
-     static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--    typedef WStringSeq_var _var_type;
-+    typedef CORBA_WStringSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   };
-@@ -209,38 +204,38 @@
- #define _CORBA_WSTRINGSEQ___VAR_CH_
- 
-   // *************************************************************
--  // class CORBA::WStringSeq_var
-+  // class CORBA_WStringSeq_var
-   // *************************************************************
- 
--  class TAO_Export WStringSeq_var
-+  class TAO_Export CORBA_WStringSeq_var
-   {
-   public:
--    WStringSeq_var (void); // default constructor
--    WStringSeq_var (WStringSeq *);
--    WStringSeq_var (const WStringSeq_var &); // copy constructor
--    ~WStringSeq_var (void); // destructor
-+    CORBA_WStringSeq_var (void); // default constructor
-+    CORBA_WStringSeq_var (CORBA_WStringSeq *);
-+    CORBA_WStringSeq_var (const CORBA_WStringSeq_var &); // copy constructor
-+    ~CORBA_WStringSeq_var (void); // destructor
-     
--    WStringSeq_var &operator= (WStringSeq *);
--    WStringSeq_var &operator= (const WStringSeq_var &);
--    WStringSeq *operator-> (void);
--    const WStringSeq *operator-> (void) const;
-+    CORBA_WStringSeq_var &operator= (CORBA_WStringSeq *);
-+    CORBA_WStringSeq_var &operator= (const CORBA_WStringSeq_var &);
-+    CORBA_WStringSeq *operator-> (void);
-+    const CORBA_WStringSeq *operator-> (void) const;
-     
--    operator const WStringSeq &() const;
--    operator WStringSeq &();
--    operator WStringSeq &() const;
--    operator WStringSeq *&(); // variable-size base types only
-+    operator const CORBA_WStringSeq &() const;
-+    operator CORBA_WStringSeq &();
-+    operator CORBA_WStringSeq &() const;
-+    operator CORBA_WStringSeq *&(); // variable-size base types only
-     
-     TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-     
-     // in, inout, out, _retn 
--    const WStringSeq &in (void) const;
--    WStringSeq &inout (void);
--    WStringSeq *&out (void);
--    WStringSeq *_retn (void);
--    WStringSeq *ptr (void) const;
-+    const CORBA_WStringSeq &in (void) const;
-+    CORBA_WStringSeq &inout (void);
-+    CORBA_WStringSeq *&out (void);
-+    CORBA_WStringSeq *_retn (void);
-+    CORBA_WStringSeq *ptr (void) const;
- 
-   private:
--    WStringSeq *ptr_;
-+    CORBA_WStringSeq *ptr_;
-   };
- 
- 
-@@ -250,44 +245,38 @@
- #if !defined (_CORBA_WSTRINGSEQ___OUT_CH_)
- #define _CORBA_WSTRINGSEQ___OUT_CH_
- 
--  class TAO_Export WStringSeq_out
-+  class TAO_Export CORBA_WStringSeq_out
-   {
-   public:
--    WStringSeq_out (WStringSeq *&);
--    WStringSeq_out (WStringSeq_var &);
--    WStringSeq_out (const WStringSeq_out &);
--    WStringSeq_out &operator= (const WStringSeq_out &);
--    WStringSeq_out &operator= (WStringSeq *);
--    operator WStringSeq *&();
--    WStringSeq *&ptr (void);
--    WStringSeq *operator-> (void);
-+    CORBA_WStringSeq_out (CORBA_WStringSeq *&);
-+    CORBA_WStringSeq_out (CORBA_WStringSeq_var &);
-+    CORBA_WStringSeq_out (const CORBA_WStringSeq_out &);
-+    CORBA_WStringSeq_out &operator= (const CORBA_WStringSeq_out &);
-+    CORBA_WStringSeq_out &operator= (CORBA_WStringSeq *);
-+    operator CORBA_WStringSeq *&();
-+    CORBA_WStringSeq *&ptr (void);
-+    CORBA_WStringSeq *operator-> (void);
-     TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-     
-   private:
--    WStringSeq *&ptr_;
-+    CORBA_WStringSeq *&ptr_;
-     // assignment from T_var not allowed
--    void operator= (const WStringSeq_var &);
-+    void operator= (const CORBA_WStringSeq_var &);
-   };
- 
- 
- #endif /* end #if !defined */
- 
--  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WStringSeq;
--
--
--}
--TAO_NAMESPACE_CLOSE // module CORBA
--
- // Proxy Broker Factory function pointer declarations.
- 
--TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
--TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
--TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
--TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
-+TAO_Export void operator<<= (CORBA::Any &, const CORBA_StringSeq &); // copying version
-+TAO_Export void operator<<= (CORBA::Any &, CORBA_StringSeq*); // noncopying version
-+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StringSeq *&); // deprecated
-+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_StringSeq *&);
-+TAO_Export void operator<<= (CORBA::Any &, const CORBA_WStringSeq &); // copying version
-+TAO_Export void operator<<= (CORBA::Any &, CORBA_WStringSeq*); // noncopying version
-+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_WStringSeq *&); // deprecated
-+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_WStringSeq *&);
- 
- #ifndef __ACE_INLINE__
- 
-@@ -297,11 +286,11 @@
- 
- TAO_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const CORBA::StringSeq &
-+    const CORBA_StringSeq &
-   );
- TAO_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    CORBA::StringSeq &
-+    CORBA_StringSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
-@@ -312,11 +301,11 @@
- 
- TAO_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const CORBA::WStringSeq &
-+    const CORBA_WStringSeq &
-   );
- TAO_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    CORBA::WStringSeq &
-+    CORBA_WStringSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
---- StringSeqC.i.old	Fri Mar  2 23:51:36 2001
-+++ StringSeqC.i	Sat Mar  3 11:28:19 2001
-@@ -28,40 +28,40 @@
- // *************************************************************
- 
- ACE_INLINE
--CORBA::StringSeq_var::StringSeq_var (void) // default constructor
-+CORBA_StringSeq_var::CORBA_StringSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--CORBA::StringSeq_var::StringSeq_var (StringSeq *p)
-+CORBA_StringSeq_var::CORBA_StringSeq_var (CORBA_StringSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--CORBA::StringSeq_var::StringSeq_var (const ::CORBA::StringSeq_var &p) // copy constructor
-+CORBA_StringSeq_var::CORBA_StringSeq_var (const ::CORBA_StringSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::CORBA::StringSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::CORBA_StringSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--CORBA::StringSeq_var::~StringSeq_var (void) // destructor
-+CORBA_StringSeq_var::~CORBA_StringSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE CORBA::StringSeq_var &
--CORBA::StringSeq_var::operator= (StringSeq *p)
-+ACE_INLINE CORBA_StringSeq_var &
-+CORBA_StringSeq_var::operator= (CORBA_StringSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::CORBA::StringSeq_var &
--CORBA::StringSeq_var::operator= (const ::CORBA::StringSeq_var &p)
-+ACE_INLINE ::CORBA_StringSeq_var &
-+CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p)
- {
-   if (this != &p)
-     {
-@@ -72,12 +72,12 @@
-         }
-       else
-         {
--          StringSeq *deep_copy =
--            new StringSeq (*p.ptr_);
-+          CORBA_StringSeq *deep_copy =
-+            new CORBA_StringSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              StringSeq *tmp = deep_copy;
-+              CORBA_StringSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -88,80 +88,80 @@
-   return *this;
- }
- 
--ACE_INLINE const ::CORBA::StringSeq *
--CORBA::StringSeq_var::operator-> (void) const
-+ACE_INLINE const ::CORBA_StringSeq *
-+CORBA_StringSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::StringSeq *
--CORBA::StringSeq_var::operator-> (void)
-+ACE_INLINE ::CORBA_StringSeq *
-+CORBA_StringSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--CORBA::StringSeq_var::operator const ::CORBA::StringSeq &() const // cast
-+CORBA_StringSeq_var::operator const ::CORBA_StringSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--CORBA::StringSeq_var::operator ::CORBA::StringSeq &() // cast 
-+CORBA_StringSeq_var::operator ::CORBA_StringSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--CORBA::StringSeq_var::operator ::CORBA::StringSeq &() const // cast 
-+CORBA_StringSeq_var::operator ::CORBA_StringSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--CORBA::StringSeq_var::operator ::CORBA::StringSeq *&() // cast 
-+CORBA_StringSeq_var::operator ::CORBA_StringSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_String_Manager
--CORBA::StringSeq_var::operator[] (CORBA::ULong index)
-+CORBA_StringSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::CORBA::StringSeq &
--CORBA::StringSeq_var::in (void) const
-+ACE_INLINE const ::CORBA_StringSeq &
-+CORBA_StringSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::StringSeq &
--CORBA::StringSeq_var::inout (void)
-+ACE_INLINE ::CORBA_StringSeq &
-+CORBA_StringSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::CORBA::StringSeq *&
--CORBA::StringSeq_var::out (void)
-+ACE_INLINE ::CORBA_StringSeq *&
-+CORBA_StringSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::StringSeq *
--CORBA::StringSeq_var::_retn (void)
-+ACE_INLINE ::CORBA_StringSeq *
-+CORBA_StringSeq_var::_retn (void)
- {
--  ::CORBA::StringSeq *tmp = this->ptr_;
-+  ::CORBA_StringSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::CORBA::StringSeq *
--CORBA::StringSeq_var::ptr (void) const
-+ACE_INLINE ::CORBA_StringSeq *
-+CORBA_StringSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
-@@ -171,14 +171,14 @@
- // *************************************************************
- 
- ACE_INLINE
--CORBA::StringSeq_out::StringSeq_out (StringSeq *&p)
-+CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--CORBA::StringSeq_out::StringSeq_out (StringSeq_var &p) // constructor from _var
-+CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -186,44 +186,44 @@
- }
- 
- ACE_INLINE
--CORBA::StringSeq_out::StringSeq_out (const ::CORBA::StringSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (StringSeq_out&, p).ptr_)
-+CORBA_StringSeq_out::CORBA_StringSeq_out (const ::CORBA_StringSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (CORBA_StringSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::CORBA::StringSeq_out &
--CORBA::StringSeq_out::operator= (const ::CORBA::StringSeq_out &p)
-+ACE_INLINE ::CORBA_StringSeq_out &
-+CORBA_StringSeq_out::operator= (const ::CORBA_StringSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (StringSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (CORBA_StringSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::CORBA::StringSeq_out &
--CORBA::StringSeq_out::operator= (StringSeq *p)
-+ACE_INLINE ::CORBA_StringSeq_out &
-+CORBA_StringSeq_out::operator= (CORBA_StringSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--CORBA::StringSeq_out::operator ::CORBA::StringSeq *&() // cast
-+CORBA_StringSeq_out::operator ::CORBA_StringSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::StringSeq *&
--CORBA::StringSeq_out::ptr (void) // ptr
-+ACE_INLINE ::CORBA_StringSeq *&
-+CORBA_StringSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::StringSeq *
--CORBA::StringSeq_out::operator-> (void)
-+ACE_INLINE ::CORBA_StringSeq *
-+CORBA_StringSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_String_Manager
--CORBA::StringSeq_out::operator[] (CORBA::ULong index)
-+CORBA_StringSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
-@@ -240,40 +240,40 @@
- // *************************************************************
- 
- ACE_INLINE
--CORBA::WStringSeq_var::WStringSeq_var (void) // default constructor
-+CORBA_WStringSeq_var::CORBA_WStringSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--CORBA::WStringSeq_var::WStringSeq_var (WStringSeq *p)
-+CORBA_WStringSeq_var::CORBA_WStringSeq_var (CORBA_WStringSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--CORBA::WStringSeq_var::WStringSeq_var (const ::CORBA::WStringSeq_var &p) // copy constructor
-+CORBA_WStringSeq_var::CORBA_WStringSeq_var (const ::CORBA_WStringSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::CORBA::WStringSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::CORBA_WStringSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--CORBA::WStringSeq_var::~WStringSeq_var (void) // destructor
-+CORBA_WStringSeq_var::~CORBA_WStringSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE CORBA::WStringSeq_var &
--CORBA::WStringSeq_var::operator= (WStringSeq *p)
-+ACE_INLINE CORBA_WStringSeq_var &
-+CORBA_WStringSeq_var::operator= (CORBA_WStringSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::CORBA::WStringSeq_var &
--CORBA::WStringSeq_var::operator= (const ::CORBA::WStringSeq_var &p)
-+ACE_INLINE ::CORBA_WStringSeq_var &
-+CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p)
- {
-   if (this != &p)
-     {
-@@ -284,12 +284,12 @@
-         }
-       else
-         {
--          WStringSeq *deep_copy =
--            new WStringSeq (*p.ptr_);
-+          CORBA_WStringSeq *deep_copy =
-+            new CORBA_WStringSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              WStringSeq *tmp = deep_copy;
-+              CORBA_WStringSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -300,80 +300,80 @@
-   return *this;
- }
- 
--ACE_INLINE const ::CORBA::WStringSeq *
--CORBA::WStringSeq_var::operator-> (void) const
-+ACE_INLINE const ::CORBA_WStringSeq *
-+CORBA_WStringSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::WStringSeq *
--CORBA::WStringSeq_var::operator-> (void)
-+ACE_INLINE ::CORBA_WStringSeq *
-+CORBA_WStringSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--CORBA::WStringSeq_var::operator const ::CORBA::WStringSeq &() const // cast
-+CORBA_WStringSeq_var::operator const ::CORBA_WStringSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() // cast 
-+CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() const // cast 
-+CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--CORBA::WStringSeq_var::operator ::CORBA::WStringSeq *&() // cast 
-+CORBA_WStringSeq_var::operator ::CORBA_WStringSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_WString_Manager
--CORBA::WStringSeq_var::operator[] (CORBA::ULong index)
-+CORBA_WStringSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::CORBA::WStringSeq &
--CORBA::WStringSeq_var::in (void) const
-+ACE_INLINE const ::CORBA_WStringSeq &
-+CORBA_WStringSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::WStringSeq &
--CORBA::WStringSeq_var::inout (void)
-+ACE_INLINE ::CORBA_WStringSeq &
-+CORBA_WStringSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::CORBA::WStringSeq *&
--CORBA::WStringSeq_var::out (void)
-+ACE_INLINE ::CORBA_WStringSeq *&
-+CORBA_WStringSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::WStringSeq *
--CORBA::WStringSeq_var::_retn (void)
-+ACE_INLINE ::CORBA_WStringSeq *
-+CORBA_WStringSeq_var::_retn (void)
- {
--  ::CORBA::WStringSeq *tmp = this->ptr_;
-+  ::CORBA_WStringSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::CORBA::WStringSeq *
--CORBA::WStringSeq_var::ptr (void) const
-+ACE_INLINE ::CORBA_WStringSeq *
-+CORBA_WStringSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
-@@ -383,14 +383,14 @@
- // *************************************************************
- 
- ACE_INLINE
--CORBA::WStringSeq_out::WStringSeq_out (WStringSeq *&p)
-+CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--CORBA::WStringSeq_out::WStringSeq_out (WStringSeq_var &p) // constructor from _var
-+CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -398,44 +398,44 @@
- }
- 
- ACE_INLINE
--CORBA::WStringSeq_out::WStringSeq_out (const ::CORBA::WStringSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (WStringSeq_out&, p).ptr_)
-+CORBA_WStringSeq_out::CORBA_WStringSeq_out (const ::CORBA_WStringSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (CORBA_WStringSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::CORBA::WStringSeq_out &
--CORBA::WStringSeq_out::operator= (const ::CORBA::WStringSeq_out &p)
-+ACE_INLINE ::CORBA_WStringSeq_out &
-+CORBA_WStringSeq_out::operator= (const ::CORBA_WStringSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (WStringSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (CORBA_WStringSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::CORBA::WStringSeq_out &
--CORBA::WStringSeq_out::operator= (WStringSeq *p)
-+ACE_INLINE ::CORBA_WStringSeq_out &
-+CORBA_WStringSeq_out::operator= (CORBA_WStringSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--CORBA::WStringSeq_out::operator ::CORBA::WStringSeq *&() // cast
-+CORBA_WStringSeq_out::operator ::CORBA_WStringSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::WStringSeq *&
--CORBA::WStringSeq_out::ptr (void) // ptr
-+ACE_INLINE ::CORBA_WStringSeq *&
-+CORBA_WStringSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::WStringSeq *
--CORBA::WStringSeq_out::operator-> (void)
-+ACE_INLINE ::CORBA_WStringSeq *
-+CORBA_WStringSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_WString_Manager
--CORBA::WStringSeq_out::operator[] (CORBA::ULong index)
-+CORBA_WStringSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
-@@ -464,11 +464,11 @@
- 
- CORBA::Boolean TAO_Export operator<< (
-     TAO_OutputCDR &,
--    const CORBA::WStringSeq &
-+    const CORBA_WStringSeq &
-   );
- CORBA::Boolean TAO_Export operator>> (
-     TAO_InputCDR &,
--    CORBA::WStringSeq &
-+    CORBA_WStringSeq &
-   );
- 
- #endif /* _TAO_CDR_OP_CORBA_WStringSeq_I_ */
---- StringSeqC.cpp.old	Fri Mar  2 23:51:36 2001
-+++ StringSeqC.cpp	Sat Mar  3 11:28:29 2001
-@@ -21,10 +21,6 @@
- 
- #include "StringSeqC.h"
- 
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#endif  /* TAO_HAS_INTERCEPTORS == 1 */
--
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus
- #endif /* __BORLANDC__ */
-@@ -33,6 +29,9 @@
- #include "StringSeqC.i"
- #endif /* !defined INLINE */
- 
-+#include "Any.h"
-+#include "CDR.h"
-+#include "Typecode.h"
- 
- #if !defined (_CORBA_STRINGSEQ_CS_)
- #define _CORBA_STRINGSEQ_CS_
-@@ -41,40 +40,40 @@
- // CORBA::StringSeq
- // *************************************************************
- 
--CORBA::StringSeq::StringSeq (void)
-+CORBA_StringSeq::CORBA_StringSeq (void)
- {}
--CORBA::StringSeq::StringSeq (CORBA::ULong max) // uses max size
--  : 
-+CORBA_StringSeq::CORBA_StringSeq (CORBA::ULong max) // uses max size
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_String_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (max)
- {}
--CORBA::StringSeq::StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
--  : 
-+CORBA_StringSeq::CORBA_StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_String_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (max, length, buffer, release)
- {}
--CORBA::StringSeq::StringSeq (const StringSeq &seq) // copy ctor
--  : 
-+CORBA_StringSeq::CORBA_StringSeq (const CORBA_StringSeq &seq) // copy ctor
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_String_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (seq)
- {}
--CORBA::StringSeq::~StringSeq (void) // dtor
-+CORBA_StringSeq::~CORBA_StringSeq (void) // dtor
- {}
--void CORBA::StringSeq::_tao_any_destructor (void *x)
-+void CORBA_StringSeq::_tao_any_destructor (void *x)
- {
--  StringSeq *tmp = ACE_static_cast (StringSeq*,x);
-+  CORBA_StringSeq *tmp = ACE_static_cast (CORBA_StringSeq*,x);
-   delete tmp;
- }
- 
-@@ -89,12 +88,12 @@
-   CORBA::tk_sequence, // typecode kind
-   16, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_string, 
-+    CORBA::tk_string,
-     0U, // string length
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA::StringSeq));
-+static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA_StringSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (CORBA)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
-@@ -107,40 +106,40 @@
- // CORBA::WStringSeq
- // *************************************************************
- 
--CORBA::WStringSeq::WStringSeq (void)
-+CORBA_WStringSeq::CORBA_WStringSeq (void)
- {}
--CORBA::WStringSeq::WStringSeq (CORBA::ULong max) // uses max size
--  : 
-+CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max) // uses max size
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_WString_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_WString_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (max)
- {}
--CORBA::WStringSeq::WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
--  : 
-+CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_WString_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_WString_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (max, length, buffer, release)
- {}
--CORBA::WStringSeq::WStringSeq (const WStringSeq &seq) // copy ctor
--  : 
-+CORBA_WStringSeq::CORBA_WStringSeq (const CORBA_WStringSeq &seq) // copy ctor
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_WString_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_WString_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (seq)
- {}
--CORBA::WStringSeq::~WStringSeq (void) // dtor
-+CORBA_WStringSeq::~CORBA_WStringSeq (void) // dtor
- {}
--void CORBA::WStringSeq::_tao_any_destructor (void *x)
-+void CORBA_WStringSeq::_tao_any_destructor (void *x)
- {
--  WStringSeq *tmp = ACE_static_cast (WStringSeq*,x);
-+  CORBA_WStringSeq *tmp = ACE_static_cast (CORBA_WStringSeq*,x);
-   delete tmp;
- }
- 
-@@ -155,19 +154,20 @@
-   CORBA::tk_sequence, // typecode kind
-   16, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_wstring, 
-+    CORBA::tk_wstring,
-     0U, // string length
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA::WStringSeq));
-+static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA_WStringSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (CORBA)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
- TAO_NAMESPACE_END
-+
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const CORBA::StringSeq &_tao_elem
-+    const CORBA_StringSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -181,7 +181,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, CORBA::StringSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, CORBA_StringSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -191,19 +191,19 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      CORBA::StringSeq::_tao_any_destructor
-+      CORBA_StringSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StringSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const CORBA::StringSeq*&,
-+      const CORBA_StringSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StringSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-@@ -217,15 +217,15 @@
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const CORBA::StringSeq*,
-+          const CORBA_StringSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      CORBA::StringSeq *tmp;
--      ACE_NEW_RETURN (tmp, CORBA::StringSeq, 0);
-+      CORBA_StringSeq *tmp;
-+      ACE_NEW_RETURN (tmp, CORBA_StringSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -236,7 +236,7 @@
-             CORBA::_tc_StringSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            CORBA::StringSeq::_tao_any_destructor
-+            CORBA_StringSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -256,7 +256,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const CORBA::WStringSeq &_tao_elem
-+    const CORBA_WStringSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -270,7 +270,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, CORBA::WStringSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, CORBA_WStringSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -280,19 +280,19 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      CORBA::WStringSeq::_tao_any_destructor
-+      CORBA_WStringSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WStringSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WStringSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const CORBA::WStringSeq*&,
-+      const CORBA_WStringSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::WStringSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-@@ -306,15 +306,15 @@
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const CORBA::WStringSeq*,
-+          const CORBA_WStringSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      CORBA::WStringSeq *tmp;
--      ACE_NEW_RETURN (tmp, CORBA::WStringSeq, 0);
-+      CORBA_WStringSeq *tmp;
-+      ACE_NEW_RETURN (tmp, CORBA_WStringSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -325,7 +325,7 @@
-             CORBA::_tc_WStringSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            CORBA::WStringSeq::_tao_any_destructor
-+            CORBA_WStringSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -345,7 +345,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const CORBA::StringSeq &_tao_sequence
-+    const CORBA_StringSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -363,7 +363,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    CORBA::StringSeq &_tao_sequence
-+    CORBA_StringSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -372,7 +372,7 @@
-     // set the length of the sequence
-     _tao_sequence.length (_tao_seq_len);
-     // If length is 0 we return true.
--    if (0 >= _tao_seq_len) 
-+    if (0 >= _tao_seq_len)
-       return 1;
-     // retrieve all the elements
-     CORBA::Boolean _tao_marshal_flag = 1;
-@@ -387,7 +387,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const CORBA::WStringSeq &_tao_sequence
-+    const CORBA_WStringSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -405,7 +405,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    CORBA::WStringSeq &_tao_sequence
-+    CORBA_WStringSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -414,7 +414,7 @@
-     // set the length of the sequence
-     _tao_sequence.length (_tao_seq_len);
-     // If length is 0 we return true.
--    if (0 >= _tao_seq_len) 
-+    if (0 >= _tao_seq_len)
-       return 1;
-     // retrieve all the elements
-     CORBA::Boolean _tao_marshal_flag = 1;
-@@ -426,4 +426,3 @@
-   }
-   return 0; // error
- }
--
diff --git a/TAO/tao/diffs/TAO.diff b/TAO/tao/diffs/TAO.diff
deleted file mode 100644
index 0bfa834bc0b..00000000000
--- a/TAO/tao/diffs/TAO.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- orig/TAOC.h	2003-11-08 21:52:21.000000000 -0600
-+++ TAOC.h	2003-11-08 21:52:16.000000000 -0600
-@@ -33,19 +33,12 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "tao/ORB.h"
-+#include "PolicyC.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "tao/CDR.h"
--#include "tao/Environment.h"
--#include "tao/Object.h"
--#include "tao/Objref_VarOut_T.h"
--#include "tao/VarOut_T.h"
--
--#include "PolicyC.h"
- #include "TimeBaseC.h"
- #include "Messaging_SyncScopeC.h"
- 
diff --git a/TAO/tao/diffs/TimeBaseC.cpp.diff b/TAO/tao/diffs/TimeBaseC.cpp.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseC.cpp.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseC.h.diff b/TAO/tao/diffs/TimeBaseC.h.diff
deleted file mode 100644
index cad81366a02..00000000000
--- a/TAO/tao/diffs/TimeBaseC.h.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- orig/TimeBaseC.h	Mon Apr  2 10:04:55 2001
-+++ TimeBaseC.h	Mon Apr  2 10:10:14 2001
-@@ -23,7 +23,9 @@
- #define _TAO_IDL_ORIG_TIMEBASEC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
-+#include "tao/CDR.h"
-+#include "tao/Any.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
diff --git a/TAO/tao/diffs/TimeBaseC.i.diff b/TAO/tao/diffs/TimeBaseC.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseC.i.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseS.cpp.diff b/TAO/tao/diffs/TimeBaseS.cpp.diff
deleted file mode 100644
index 4195ebb2ae6..00000000000
--- a/TAO/tao/diffs/TimeBaseS.cpp.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- orig/TimeBaseS.cpp	Mon Apr  2 10:04:55 2001
-+++ TimeBaseS.cpp	Mon Apr  2 10:07:40 2001
-@@ -23,21 +23,6 @@
- #define _TAO_IDL_ORIG_TIMEBASES_CPP_
- 
- #include "TimeBaseS.h"
--#include "tao/PortableServer/Object_Adapter.h"
--#include "tao/PortableServer/Operation_Table.h"
--#include "tao/TAO_Server_Request.h"
--#include "tao/ORB_Core.h"
--#include "tao/Stub.h"
--#include "tao/IFR_Client_Adapter.h"
--#include "ace/Dynamic_Service.h"
--
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#endif  /* TAO_HAS_INTERCEPTORS == 1 */
--
--#if defined (__BORLANDC__)
--#pragma option -w-rvl -w-rch -w-ccc -w-aus
--#endif /* __BORLANDC__ */
- 
- #if !defined (__ACE_INLINE__)
- #include "TimeBaseS.i"
diff --git a/TAO/tao/diffs/TimeBaseS.h.diff b/TAO/tao/diffs/TimeBaseS.h.diff
deleted file mode 100644
index 9afae67fa71..00000000000
--- a/TAO/tao/diffs/TimeBaseS.h.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- orig/TimeBaseS.h	Mon Apr  2 10:04:55 2001
-+++ TimeBaseS.h	Mon Apr  2 18:53:35 2001
-@@ -30,42 +30,11 @@
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "tao/PortableServer/PortableServer.h"
--#include "tao/PortableServer/Servant_Base.h"
--#include "tao/PortableServer/Collocated_Object.h"
--#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
--#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
--#include "tao/PortableServer/ServerRequestInfo.h"
--
--#if defined(_MSC_VER)
--#if (_MSC_VER >= 1200)
--#pragma warning(push)
--#endif /* _MSC_VER >= 1200 */
--#pragma warning(disable:4250)
--#endif /* _MSC_VER */
--
--#if defined (__BORLANDC__)
--#pragma option push -w-rvl -w-rch -w-ccc -w-inl
--#endif /* __BORLANDC__ */
--
--TAO_NAMESPACE  POA_TimeBase
--{
--}
--TAO_NAMESPACE_CLOSE
--
- #include "TimeBaseS_T.h"
- 
- #if defined (__ACE_INLINE__)
- #include "TimeBaseS.i"
- #endif /* defined INLINE */
--
--#if defined(_MSC_VER) && (_MSC_VER >= 1200)
--#pragma warning(pop)
--#endif /* _MSC_VER */
--
--#if defined (__BORLANDC__)
--#pragma option pop
--#endif /* __BORLANDC__ */
- 
- #include "ace/post.h"
- #endif /* ifndef */
diff --git a/TAO/tao/diffs/TimeBaseS.i.diff b/TAO/tao/diffs/TimeBaseS.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseS.i.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseS_T.cpp.diff b/TAO/tao/diffs/TimeBaseS_T.cpp.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseS_T.cpp.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseS_T.h.diff b/TAO/tao/diffs/TimeBaseS_T.h.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseS_T.h.diff
+++ /dev/null
diff --git a/TAO/tao/diffs/TimeBaseS_T.i.diff b/TAO/tao/diffs/TimeBaseS_T.i.diff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tao/diffs/TimeBaseS_T.i.diff
+++ /dev/null
diff --git a/TAO/tao/extra_core.mpb b/TAO/tao/extra_core.mpb
index eeb2801d5b6..e9d60aa6db1 100644
--- a/TAO/tao/extra_core.mpb
+++ b/TAO/tao/extra_core.mpb
@@ -3,20 +3,16 @@
 
 feature(!minimum_corba) {
   Source_Files(TAO_COMPONENTS) {
-    ORB_Core {
-      ServicesC.cpp
-      NVList.cpp
-      Dynamic_Adapter.cpp
-    }
+    ServicesC.cpp
+    NVList.cpp
+    Dynamic_Adapter.cpp
   }
 }
 
 feature(corba_messaging) {
   Source_Files(TAO_COMPONENTS) {
-    ORB_Core {
-      Policy_Manager.cpp
-      Buffering_Constraint_Policy.cpp
-      Messaging_PolicyValueC.cpp
-     }
+    Policy_Manager.cpp
+    Buffering_Constraint_Policy.cpp
+    Messaging_PolicyValueC.cpp
   }
 }
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index c8438735aef..ea2b03bdbf4 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -33,58 +33,14 @@
 
 #include <tao/Policy.pidl>
 #include <tao/Services.pidl>
+#include <tao/ParameterMode.pidl>
+#include <tao/orb_types.pidl>
+#include <tao/Typecode_types.pidl>
 
 #pragma prefix "omg.org"
 
 module CORBA
 {
-  interface TypeCode;
-
-  enum TCKind
-  {
-    tk_null,
-    tk_void,
-    tk_short,
-    tk_long,
-    tk_ushort,
-    tk_ulong,
-    tk_float,
-    tk_double,
-    tk_boolean,
-    tk_char,
-    tk_octet,
-    tk_any,
-    tk_TypeCode,
-    tk_Principal,
-    tk_objref,
-    tk_struct,
-    tk_union,
-    tk_enum,
-    tk_string,
-    tk_sequence,
-    tk_array,
-    tk_alias,
-    tk_except,
-    tk_longlong,
-    tk_ulonglong,
-    tk_longdouble,
-    tk_wchar,
-    tk_wstring,
-    tk_fixed,
-    tk_value,
-    tk_value_box,
-    tk_native,
-    tk_abstract_interface,
-    tk_local_interface,
-    tk_component,
-    tk_home
-  };
-
-  typedef string  ORBid;
-  typedef unsigned long Flags;
-  typedef string Identifier;
-  typedef string RepositoryId;
-
   struct NamedValue
   {
     Identifier name;
@@ -100,13 +56,6 @@ module CORBA
     SYSTEM_EXCEPTION
   };
 
-  enum ParameterMode
-  {
-    PARAM_IN,
-    PARAM_OUT,
-    PARAM_INOUT
-  };
-
   typedef short ValueModifier;
   const ValueModifier VM_NONE = 0;
   const ValueModifier VM_CUSTOM = 1;
@@ -116,9 +65,6 @@ module CORBA
   typedef short Visibility;
   const Visibility PRIVATE_MEMBER = 0;
   const Visibility PUBLIC_MEMBER = 1;
-
-  typedef string ObjectId;
-  typedef sequence <ObjectId> ObjectIdList;
 };
 
 #endif /* TAO_ORB_IDL */
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 58989df1f2a..d011a434e87 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -319,6 +319,11 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #define TAO_DEFAULT_ROOTPOA_NAME   ""
 #endif /* TAO_DEFAULT_ROOTPOA_NAME */
 
+// The default lane name used when storing endpoints.
+#if !defined (TAO_DEFAULT_LANE)
+#define TAO_DEFAULT_LANE "default lane"
+#endif /* TAO_DEFAULT_LANE */
+
 // Minimum CORBA
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 # define TAO_HAS_MINIMUM_CORBA 0
@@ -362,6 +367,19 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #  endif  /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif  /* !TAO_HAS_UIOP */
 
+// NSKPW and NSKFS are Pluggable Protocols used on the Tandem
+// platform.  These are disabled by default.
+
+#if defined (TAO_HAS_NSKPW)
+#define TAO_DEF_NSKPW_MAJOR 1
+#define TAO_DEF_NSKPW_MINOR 2
+#endif
+
+#if defined (TAO_HAS_NSKFS)
+#define TAO_DEF_NSKFS_MAJOR 1
+#define TAO_DEF_NSKFS_MINOR 2
+#endif
+
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 # if !defined (TAO_HAS_SHMIOP)
 #   define TAO_HAS_SHMIOP 1
@@ -717,26 +735,10 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 # define TAO_HAS_EXTENDED_FT_INTERCEPTORS 0
 #endif  /* !TAO_HAS_EXTENEDED_FT_INTERCEPTORS */
 
-// Define the policy types as literals, so they can be used in switch
-// statements
-
-#define TAO_CLIENT_PRIORITY_POLICY_TYPE 0x54410000
-#define TAO_BUFFERING_CONSTRAINT_POLICY_TYPE 0x54410001
-#define TAO_CONNECTION_TIMEOUT_POLICY_TYPE 0x54410008
-
-//  #define TAO_RT_PRIORITY_MODEL_POLICY_TYPE 0x54410002
-//  #define TAO_RT_THREADPOOL_POLICY_TYPE 0x54410003
-//  #define TAO_RT_PRIVATE_CONNECTION_POLICY_TYPE 0x54410006
-//  #define TAO_RT_PRIORITY_BANDED_CONNECTION_POLICY_TYPE 0x54410007
-//  #define TAO_RT_SERVER_PROTOCOL_POLICY_TYPE 0x54410004
-//  #define TAO_RT_CLIENT_PROTOCOL_POLICY_TYPE 0x54410005
-
-#define TAO_RT_PRIORITY_MODEL_POLICY_TYPE 40
-#define TAO_RT_THREADPOOL_POLICY_TYPE 41
+// 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
-#define TAO_RT_CLIENT_PROTOCOL_POLICY_TYPE 43
-#define TAO_RT_PRIVATE_CONNECTION_POLICY_TYPE 44
-#define TAO_RT_PRIORITY_BANDED_CONNECTION_POLICY_TYPE 45
 
 /// Policies that are accessed on the critical path and need to be
 /// incur minimal retrieval overhead.
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 1d19ecf5aac..562156fbae1 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -15,21 +15,23 @@ ACE_RCSID (tao,
 
 
 TAO_ORB_Parameters::TAO_ORB_Parameters (void)
-  : endpoints_list_ (),
-    mcast_discovery_endpoint_ (),
-    default_init_ref_ (TAO_DEFAULT_INIT_REFERENCE_INITIALIZER),
-    sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
-    sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
-    nodelay_ (1),
-    cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF),
-    use_lite_protocol_ (0),
-    use_dotted_decimal_addresses_ (0),
-    std_profile_components_ (1),
-    ace_sched_policy_ (ACE_SCHED_OTHER),
-    sched_policy_ (THR_SCHED_DEFAULT),
-    scope_policy_ (THR_SCOPE_PROCESS),
-    single_read_optimization_ (1),
-    disable_rt_collocation_resolver_ (false)
+  : endpoints_map_ (10)
+  , mcast_discovery_endpoint_ ()
+  , default_init_ref_ (TAO_DEFAULT_INIT_REFERENCE_INITIALIZER)
+  , sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ)
+  , sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ)
+  , nodelay_ (1)
+  , cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF)
+  , use_lite_protocol_ (0)
+  , use_dotted_decimal_addresses_ (0)
+  , std_profile_components_ (1)
+  , ace_sched_policy_ (ACE_SCHED_OTHER)
+  , sched_policy_ (THR_SCHED_DEFAULT)
+  , scope_policy_ (THR_SCOPE_PROCESS)
+  , single_read_optimization_ (1)
+  , pref_network_ ()
+  , disable_rt_collocation_resolver_ (false)
+  , enforce_preferred_interfaces_ (false)
 {
   for (int i = 0; i != TAO_NO_OF_MCAST_SERVICES; ++i)
     {
@@ -41,9 +43,72 @@ TAO_ORB_Parameters::~TAO_ORB_Parameters (void)
 {
 }
 
+void
+TAO_ORB_Parameters::get_endpoint_set (const ACE_CString &lane,
+                                      TAO_EndpointSet &endpoint_set)
+{
+  ACE_CString endpoints;
+
+  // Look for the lane in the endpoints map.
+  int result =
+    this->endpoints_map_.find (lane, endpoints);
+
+  // If lane is not in the map, <endpoint_set> remains empty
+  if (result != 0)
+    return;
+
+  // At this point, the parsing should not fail since they have been
+  // parsed successfully before.
+  result =
+    this->parse_and_add_endpoints (endpoints,
+                                   endpoint_set);
+  ACE_ASSERT (result == 0);
+}
+
 int
-TAO_ORB_Parameters::parse_endpoints (ACE_CString &endpoints,
-                                     TAO_EndpointSet &endpoints_list)
+TAO_ORB_Parameters::add_endpoints (const ACE_CString &lane,
+                                   const ACE_CString &additional_endpoints)
+{
+  TAO_EndpointSet endpoint_set;
+
+  // Parse the additional endpoints.
+  int result =
+    this->parse_and_add_endpoints (additional_endpoints,
+                                   endpoint_set);
+
+  // Parse failure.
+  if (result != 0)
+    return result;
+
+  // Look for the lane in the endpoints map.
+  ACE_CString existing_endpoints;
+  result =
+    this->endpoints_map_.find (lane, existing_endpoints);
+
+  // Create the resultant endpoints string.
+  ACE_CString new_endpoints;
+  if (result == 0)
+    new_endpoints =
+      existing_endpoints +
+      ";" +
+      additional_endpoints;
+  else
+    new_endpoints =
+      additional_endpoints;
+
+  result =
+    this->endpoints_map_.rebind (lane,
+                                 new_endpoints);
+
+  if (result == -1)
+    return result;
+
+  return 0;
+}
+
+int
+TAO_ORB_Parameters::parse_and_add_endpoints (const ACE_CString &endpoints,
+                                             TAO_EndpointSet &endpoint_set)
 {
   // Parse the string into seperate endpoints, where `endpoints' is of
   // the form:
@@ -106,7 +171,7 @@ TAO_ORB_Parameters::parse_endpoints (ACE_CString &endpoints,
           if (check_offset > 0 &&
               check_offset != endpt.npos)
             {
-              endpoints_list.enqueue_tail (endpt);
+              endpoint_set.enqueue_tail (endpt);
               // Insert endpoint into list
             }
           else
@@ -126,3 +191,51 @@ TAO_ORB_Parameters::parse_endpoints (ACE_CString &endpoints,
 
   return status;
 }
+
+bool
+TAO_ORB_Parameters::preferred_interfaces (const char *s)
+{
+  ACE_CString tmp (s);
+
+  ssize_t index = 0;
+  int comma = 0;
+  while ((index = tmp.find (",", index)) != ACE_CString::npos)
+    {
+      ++comma;
+      ++index;
+    }
+
+  index = 0;
+
+  int colon = 0;
+  while ((index = tmp.find (":", index)) != ACE_CString::npos)
+    {
+      ++colon;
+      ++index;
+    }
+
+  if (colon != (comma + 1))
+    return false;
+
+  this->pref_network_ = tmp;
+
+  return true;
+}
+
+const char *
+TAO_ORB_Parameters::preferred_interfaces (void) const
+{
+  return this->pref_network_.c_str ();
+}
+
+void
+TAO_ORB_Parameters::enforce_pref_interfaces (bool p)
+{
+  this->enforce_preferred_interfaces_ = p;
+}
+
+bool
+TAO_ORB_Parameters::enforce_pref_interfaces (void) const
+{
+  return this->enforce_preferred_interfaces_;
+}
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index 2394f5ee9e9..ace616f791f 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -16,6 +16,8 @@
 
 #include /**/ "ace/pre.h"
 #include "ace/Unbounded_Queue.h"
+#include "ace/Hash_Map_Manager.h"
+#include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,7 +40,13 @@ class TAO_Reverse_Active_Object_Map_Impl;
 //    in ACE so we do not have to worry about increasing TAO's
 //    footprint by using this container.
 typedef ACE_Unbounded_Queue<ACE_CString> TAO_EndpointSet;
-typedef ACE_Unbounded_Queue_Iterator<ACE_CString> TAO_EndpointSetIterator;
+typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator;
+typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+                                ACE_CString,
+                                ACE_Hash<ACE_CString>,
+                                ACE_Equal_To<ACE_CString>,
+                                ACE_Null_Mutex>
+  TAO_EndpointMap;
 
 
 // -------------------------------------------------------------------
@@ -66,9 +74,10 @@ public:
 
   /// Specifies the endpoints on which this server is willing to
   /// listen for requests.
-  int endpoints (ACE_CString &endpoints);
-  TAO_EndpointSet &endpoints (void);
-  void add_endpoint (ACE_CString &endpoint);
+  int add_endpoints (const ACE_CString &lane,
+                     const ACE_CString &endpoints);
+  void get_endpoint_set (const ACE_CString &lane,
+                         TAO_EndpointSet &endpoint_set);
 
   /// Set/Get the port of services locatable through multicast.
   CORBA::UShort service_port (TAO_MCAST_SERVICEID service_id) const;
@@ -159,6 +168,13 @@ public:
   bool disable_rt_collocation_resolver (void) const;
   void disable_rt_collocation_resolver (bool);
 
+  /// Accepts the list of preferred interfaces and does a simple
+  /// semantic check on the string
+  bool preferred_interfaces (const char *s);
+  const char *preferred_interfaces (void) const;
+
+  void enforce_pref_interfaces (bool p);
+  bool enforce_pref_interfaces (void) const;
 private:
   // Each "endpoint" is of the form:
   //
@@ -176,16 +192,14 @@ private:
   //   iiop://space:2001,odyssey:2010;uiop://foo,bar
   //
   // All preconnect or endpoint strings should be of the above form(s).
-
-  int parse_endpoints (ACE_CString &endpoints,
-                       TAO_EndpointSet &endpoints_list);
+  int parse_and_add_endpoints (const ACE_CString &endpoints,
+                               TAO_EndpointSet &endpoint_set);
 
   /// List of endpoints used to pre-establish connections.
   // TAO_EndpointSet preconnects_list_;
 
-  /// List of endpoints this server is willing to accept requests
-  /// on.
-  TAO_EndpointSet endpoints_list_;
+  /// Map of endpoints this server is willing to accept requests on.
+  TAO_EndpointMap endpoints_map_;
 
   /// Port numbers of the configured services.
   CORBA::UShort service_port_[TAO_NO_OF_MCAST_SERVICES];
@@ -250,6 +264,9 @@ private:
   /// Single read optimization.
   int single_read_optimization_;
 
+  /// Preferred network interfaces as a string
+  ACE_CString pref_network_;
+
   /// Default collocation resolver
   /**
    * The vanilla ORB has only one collocation resolver. But if the
@@ -262,6 +279,8 @@ private:
    * loaded if the RTORB is used.
    */
   bool disable_rt_collocation_resolver_;
+
+  bool enforce_preferred_interfaces_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index f82bd737255..0a5190d8912 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -1,23 +1,5 @@
 // -*- C++ -*-
 // $Id$
-ACE_INLINE TAO_EndpointSet &
-TAO_ORB_Parameters::endpoints (void)
-{
-  return this->endpoints_list_;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::endpoints (ACE_CString &endpoints)
-{
-  return this->parse_endpoints (endpoints, this->endpoints ());
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::add_endpoint (ACE_CString &endpoint)
-{
-  this->endpoints ().enqueue_tail (endpoint);
-}
-
 ACE_INLINE int
 TAO_ORB_Parameters::sock_rcvbuf_size (void) const
 {
diff --git a/TAO/tao/qt_resource.cpp b/TAO/tao/qt_resource.cpp
deleted file mode 100644
index 5207f41c981..00000000000
--- a/TAO/tao/qt_resource.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//$Id$
-#include "tao/qt_resource.h"
-
-#if defined (ACE_HAS_QT)
-
-#if !defined (__ACE_INLINE__)
-# include "qt_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
-QApplication *TAO_QtResource_Factory::qapp_ = 0 ;
-
-ACE_Reactor_Impl *
-TAO_QtResource_Factory::allocate_reactor_impl (void) const
-{
-  if (this->qapp_ == 0) 
-    return 0;
-
-  ACE_Reactor_Impl *impl = 0; 
-
-  ACE_NEW_RETURN(impl, 
-                 ACE_QtReactor (qapp_), 
-                 0);
-  return impl;
-}
-
-void 
-TAO_QtResource_Factory::set_context (QApplication *qapp)
-{
-  TAO_QtResource_Factory::qapp_ = qapp;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_QtResource_Factory,
-                       ACE_TEXT ("QtResource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_QtResource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_QtResource_Factory)
-
-#endif /* ACE_HAS_QT */
diff --git a/TAO/tao/qt_resource.h b/TAO/tao/qt_resource.h
deleted file mode 100644
index 6e7a84c5b15..00000000000
--- a/TAO/tao/qt_resource.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   qt_resource.h
- *
- *  $Id$
- *
- *  @author Hamish Friedlander <ullexco@wave.co.nz>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef _TAO_QTRESOURCE_H
-#define _TAO_QTRESOURCE_H
-#include /**/ "ace/pre.h"
-
-#include "tao/default_resource.h"
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_QT)
-#include "ace/QtReactor.h"
-
-
-/**
- * @class TAO_QtResource_Factory
- *
- * @brief TAO's default resource factory
- *
- * Using a <{resource source specifier}> as a discriminator, the
- * factory can return resource instances which are, e.g., global,
- * stored in thread-specific storage, stored in shared memory,
- * etc.
- */
-class TAO_Export TAO_QtResource_Factory : public TAO_Default_Resource_Factory
-{
-
-public:
-  TAO_QtResource_Factory (void);
-
-  /// Set the context used to create the QtReactor
-  static void set_context (QApplication *qapp) ;
-
-protected:
-  /// Obtain the reactor implementation
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-
-private:
-  static QApplication *qapp_ ;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/qt_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_QtResource_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_QtResource_Factory)
-
-#endif /*ACE_HAS_QT */
-#include /**/ "ace/post.h"
-#endif /* QTRESOURCE_H */
diff --git a/TAO/tao/qt_resource.i b/TAO/tao/qt_resource.i
deleted file mode 100644
index 633d38ff2aa..00000000000
--- a/TAO/tao/qt_resource.i
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-ACE_INLINE 
-TAO_QtResource_Factory::TAO_QtResource_Factory (void)
-{
-}
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index 15108839291..bf9ed47dac2 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -24,7 +24,7 @@
 #include "Valuetype_Adapter.h"
 #include "ORB_Core.h"
 #include "Typecode.h"
-#include "Any_Impl.h"
+#include "Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "SystemException.h"
 
@@ -500,34 +500,27 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
 
         case CORBA::tk_enum:
           {
-            ACE_Message_Block *mb = any->_tao_get_cdr ();
             CORBA::ULong d;
-            bool type_known = false;
+            TAO::Any_Impl *impl = any->impl ();
 
-            if (mb == 0)
+            if (impl->encoded ())
               {
-                ACE_NEW_RETURN (mb,
-                                ACE_Message_Block,
-                                TAO::TRAVERSE_STOP);
-                TAO_OutputCDR out;
-                any->impl ()->marshal_value (out);
-                ACE_CDR::consolidate (mb, out.begin ());
-                type_known = true;
+                TAO::Unknown_IDL_Type *unk =
+                  dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+                  
+                // We don't want unk's rd_ptr to move, in case 
+                // we are shared by another Any, so we use this
+                // to copy the state, not the buffer.
+                TAO_InputCDR for_reading (unk->_tao_get_cdr ());
+
+                for_reading.read_ulong (d);
               }
-
-            TAO_InputCDR cdr (mb->data_block (),
-                              ACE_Message_Block::DONT_DELETE,
-                              mb->rd_ptr () - mb->base (),
-                              mb->wr_ptr () - mb->base (),
-                              any->_tao_byte_order (),
-                              TAO_DEF_GIOP_MAJOR,
-                              TAO_DEF_GIOP_MINOR);
-
-            cdr.read_ulong (d);
-
-            if (type_known)
+            else
               {
-                mb->release ();
+                TAO_OutputCDR out;
+                impl->marshal_value (out);
+                TAO_InputCDR cdr (out);
+                cdr.read_ulong (d);
               }
 
             if (d == enum_v)
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 34819bd2bfd..2d279cf2d1b 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_core {
+project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
   sharedname   = TAO
   dynamicflags = TAO_BUILD_DLL
 
@@ -7,291 +7,624 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
   // custom build type and comes from the taoidldefaults base project.
 
   Source_Files(TAO_COMPONENTS) {
-    Pluggable_Protocols {
-      Transport_Acceptor.cpp
-      Transport_Connector.cpp
-      Transport.cpp
-      Incoming_Message_Queue.cpp
-      Resume_Handle.cpp
-      Profile.cpp
-      Endpoint.cpp
-      Connector_Registry.cpp
-      Connection_Handler.cpp
-      Thread_Per_Connection_Handler.cpp
-      Acceptor_Registry.cpp
-      Protocol_Factory.cpp
-      Acceptor_Filter.cpp
-      IIOP_Factory.cpp
-      IIOP_Lite_Factory.cpp
-      IIOP_Profile.cpp
-      IIOP_Transport.cpp
-      IIOP_Connector.cpp
-      IIOP_Acceptor.cpp
-      IIOP_Connection_Handler.cpp
-      IIOP_Endpoint.cpp
-      IIOP_EndpointsC.cpp
-      IIOP_EndpointsA.cpp
-      IIOPC.cpp
-      IIOPA.cpp
-    }
-
-    Pluggable_Messaging {
-      Pluggable_Messaging.cpp
-      Pluggable_Messaging_Utils.cpp
-      GIOP_Message_Base.cpp
-      GIOP_Message_Lite.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_Utils.cpp
-      GIOP_Message_Locate_Header.cpp
-      target_specification.cpp
-      GIOP_Message_State.cpp
-      GIOP_Message_Version.cpp
-      Tagged_Profile.cpp
-    }
-    Default_Resources {
-      default_client.cpp
-      default_server.cpp
-      default_resource.cpp
-      xt_resource.cpp
-      qt_resource.cpp
-    }
-    Interpretive_Marshaling {
-      append.cpp
-      Marshal.cpp
-      skip.cpp
-    }
-    IDL_Compiler {
-      Managed_Types.cpp
-    }
-    ORB_Core {
-      Any.cpp
-      Any_Basic_Impl.cpp
-      Any_Impl.cpp
-      Any_Unknown_IDL_Type.cpp
-      Any_SystemException.cpp
-      CORBA_String.cpp
-      CurrentC.cpp
-      CurrentA.cpp
-      Exception.cpp
-      SystemException.cpp
-      UserException.cpp
-      WrongTransactionC.cpp
-      WrongTransactionA.cpp
-      Environment.cpp
-      Object.cpp
-      LocalObject.cpp
-      ObjectIdListC.cpp
-      ORB.cpp
-      Policy_ForwardC.cpp
-      Policy_ForwardA.cpp
-      PolicyC.cpp
-      PolicyA.cpp
-      Policy_Validator.cpp
-      Encodable.cpp
-      Abstract_Servant_Base.cpp
-      Object_Proxy_Broker.cpp
-      Remote_Object_Proxy_Broker.cpp
-      Object_Proxy_Impl.cpp
-      DomainC.cpp
-      DomainA.cpp
-      TimeBaseC.cpp
-      TimeBaseA.cpp
-      Principal.cpp
-      Sequence.cpp
-      MProfile.cpp
-      Stub.cpp
-      Typecode.cpp
-      CDR.cpp
-      Client_Strategy_Factory.cpp
-      debug.cpp
-      Object_KeyC.cpp
-      Protocols_Hooks.cpp
-      Default_Protocols_Hooks.cpp
-      Messaging_SyncScopeC.cpp
-      Invocation_Base.cpp
-      Invocation_Adapter.cpp
-      LocateRequest_Invocation_Adapter.cpp
-      Profile_Transport_Resolver.cpp
-      Remote_Invocation.cpp
-      Collocated_Invocation.cpp
-      Synch_Invocation.cpp
-      LocateRequest_Invocation.cpp
-      Invocation_Endpoint_Selectors.cpp
-      operation_details.cpp
-      ClientRequestInfo.cpp
-      ClientRequestInfo_i.cpp
-      RequestInfo_Util.cpp
-      ClientRequestInterceptor_Adapter.cpp
-      PI_ForwardC.cpp
-      PortableInterceptorC.cpp
-      PortableInterceptorA.cpp
-      PICurrent.cpp
-      PICurrent_Copy_Callback.cpp
-      PICurrent_ORBInitializer.cpp
-      DynamicC.cpp
-      DynamicA.cpp
-      Dynamic_ParameterC.cpp
-      Dynamic_ParameterA.cpp
-      ParameterMode.cpp
-      AnySeqA.cpp
-      AnySeqC.cpp
-      BooleanSeqA.cpp
-      BooleanSeqC.cpp
-      CharSeqA.cpp
-      CharSeqC.cpp
-      DoubleSeqA.cpp
-      DoubleSeqC.cpp
-      FloatSeqA.cpp
-      FloatSeqC.cpp
-      LongDoubleSeqA.cpp
-      LongDoubleSeqC.cpp
-      LongLongSeqA.cpp
-      LongLongSeqC.cpp
-      LongSeqA.cpp
-      LongSeqC.cpp
-      OctetSeqA.cpp
-      OctetSeqC.cpp
-      ShortSeqA.cpp
-      ShortSeqC.cpp
-      StringSeqA.cpp
-      StringSeqC.cpp
-      ULongLongSeqA.cpp
-      ULongLongSeqC.cpp
-      ULongSeqA.cpp
-      ULongSeqC.cpp
-      UShortSeqA.cpp
-      UShortSeqC.cpp
-      WCharSeqA.cpp
-      WCharSeqC.cpp
-      WStringSeqA.cpp
-      WStringSeqC.cpp
-      Codeset_Manager.cpp
-      Codeset_Translator_Factory.cpp
-      UTF16_BOM_Translator.cpp
-      UTF16_BOM_Factory.cpp
-      ORB_Core.cpp
-      ORB_Core_Auto_Ptr.cpp
-      Collocation_Resolver.cpp
-      Default_Collocation_Resolver.cpp
-      Stub_Factory.cpp
-      ORB_Table.cpp
-      LF_Follower.cpp
-      LF_Follower_Auto_Ptr.cpp
-      LF_Follower_Auto_Adder.cpp
-      Leader_Follower.cpp
-      Leader_Follower_Flushing_Strategy.cpp
-      LF_Event.cpp
-      LF_Invocation_Event.cpp
-      LF_CH_Event.cpp
-      LF_Event_Binder.cpp
-      LF_Event_Loop_Thread_Helper.cpp
-      LF_Strategy.cpp
-      LF_Strategy_Complete.cpp
-      params.cpp
-      Resource_Factory.cpp
-      Server_Strategy_Factory.cpp
-      Sync_Strategies.cpp
-      TAO_Internal.cpp
-      TAO_Server_Request.cpp
-      Typecode_Constants.cpp
-      PredefinedType_Seq_Tmplinst.cpp
-      TypeCodeFactory_Adapter.cpp
-      Wait_Strategy.cpp
-      Wait_On_Read.cpp
-      Wait_On_Reactor.cpp
-      Wait_On_Leader_Follower.cpp
-      Wait_On_LF_No_Upcall.cpp
-      Transport_Mux_Strategy.cpp
-      Exclusive_TMS.cpp
-      Muxed_TMS.cpp
-      Reply_Dispatcher.cpp
-      Synch_Reply_Dispatcher.cpp
-      Synch_Refcountable.cpp
-      Asynch_Reply_Dispatcher_Base.cpp
-      IOP_IORC.cpp
-      IOP_IORA.cpp
-      IOP_CodecC.cpp
-      IOP_CodecA.cpp
-      IOPC.cpp
-      PollableC.cpp
-      CONV_FRAMEC.cpp
-      CONV_FRAMEA.cpp
-      Tagged_Components.cpp
-      Service_Context.cpp
-      GIOPC.cpp
-      GIOPA.cpp
-      BoundsC.cpp
-      BoundsA.cpp
-      TAOC.cpp
-      TAOA.cpp
-      Object_Loader.cpp
-      TAO_Singleton_Manager.cpp
-      Adapter.cpp
-      Services_Activate.cpp
-      Service_Callbacks.cpp
-      Parser_Registry.cpp
-      IOR_Parser.cpp
-      DLL_Parser.cpp
-      FILE_Parser.cpp
-      CORBALOC_Parser.cpp
-      CORBANAME_Parser.cpp
-      MCAST_Parser.cpp
-      Bind_Dispatcher_Guard.cpp
-      Fault_Tolerance_Service.cpp
-      Interceptor_List.cpp
-      IORInterceptor_Adapter.cpp
-      IORInterceptor_Adapter_Factory.cpp
-      IFR_Client_Adapter.cpp
-      ORBInitInfo.cpp
-      ORBInitializer_Registry.cpp
-      PolicyFactory_Registry.cpp
-      Cache_Entries.cpp
-      Base_Transport_Property.cpp
-      Transport_Cache_Manager.cpp
-      Cleanup_Func_Registry.cpp
-      Transport_Descriptor_Interface.cpp
-      Object_Ref_Table.cpp
-      BiDir_Adapter.cpp
-      CodecFactory.cpp
-      CodecFactory_ORBInitializer.cpp
-      CDR_Encaps_Codec.cpp
-      Endpoint_Selector_Factory.cpp
-      Flushing_Strategy.cpp
-      Block_Flushing_Strategy.cpp
-      Reactive_Flushing_Strategy.cpp
-      Connect_Strategy.cpp
-      Blocked_Connect_Strategy.cpp
-      Reactive_Connect_Strategy.cpp
-      LF_Connect_Strategy.cpp
-      Queued_Message.cpp
-      Synch_Queued_Message.cpp
-      Asynch_Queued_Message.cpp
-      Transport_Timer.cpp
-      Connection_Purging_Strategy.cpp
-      LRU_Connection_Purging_Strategy.cpp
-      Policy_Set.cpp
-      Default_Endpoint_Selector_Factory.cpp
-      Thread_Lane_Resources.cpp
-      Thread_Lane_Resources_Manager.cpp
-      Default_Thread_Lane_Resources_Manager.cpp
-      Default_Stub_Factory.cpp
-      Request_Dispatcher.cpp
-      Valuetype_Adapter.cpp
-      ObjectKey_Table.cpp
-      Refcounted_ObjectKey.cpp
-      TSS_Resources.cpp
-      Argument.cpp
-      Basic_Arguments.cpp
-      Special_Basic_Arguments.cpp
-    }
+    Abstract_Servant_Base.cpp
+    Acceptor_Filter.cpp
+    Acceptor_Registry.cpp
+    Adapter.cpp
+    Adapter_Factory.cpp
+    Adapter_Registry.cpp
+    Any.cpp
+    Any_Basic_Impl.cpp
+    Any_Impl.cpp
+    Any_SystemException.cpp
+    Any_Unknown_IDL_Type.cpp
+    AnySeqA.cpp
+    AnySeqC.cpp
+    append.cpp
+    Argument.cpp
+    Asynch_Queued_Message.cpp
+    Asynch_Reply_Dispatcher_Base.cpp
+    Base_Transport_Property.cpp
+    Basic_Arguments.cpp
+    BiDir_Adapter.cpp
+    Bind_Dispatcher_Guard.cpp
+    Block_Flushing_Strategy.cpp
+    Blocked_Connect_Strategy.cpp
+    BooleanSeqA.cpp
+    BooleanSeqC.cpp
+    BoundsA.cpp
+    BoundsC.cpp
+    Cache_Entries.cpp
+    CDR.cpp
+    CDR_Encaps_Codec.cpp
+    CharSeqA.cpp
+    CharSeqC.cpp
+    Cleanup_Func_Registry.cpp
+    Client_Strategy_Factory.cpp
+    ClientRequestInfo.cpp
+    ClientRequestInfo_i.cpp
+    ClientRequestInterceptor_Adapter.cpp
+    CodecFactory.cpp
+    CodecFactory_ORBInitializer.cpp
+    Codeset_Manager.cpp
+    Codeset_Translator_Factory.cpp
+    Collocated_Invocation.cpp
+    Collocation_Resolver.cpp
+    Connect_Strategy.cpp
+    Connection_Handler.cpp
+    Connection_Purging_Strategy.cpp
+    Connector_Registry.cpp
+    CONV_FRAMEA.cpp
+    CONV_FRAMEC.cpp
+    CORBA_String.cpp
+    CORBALOC_Parser.cpp
+    CORBANAME_Parser.cpp
+    CurrentA.cpp
+    CurrentC.cpp
+    debug.cpp
+    default_client.cpp
+    Default_Collocation_Resolver.cpp
+    Default_Endpoint_Selector_Factory.cpp
+    Default_Protocols_Hooks.cpp
+    default_resource.cpp
+    default_server.cpp
+    Default_Stub_Factory.cpp
+    Default_Thread_Lane_Resources_Manager.cpp
+    DLL_Parser.cpp
+    DomainA.cpp
+    DomainC.cpp
+    DoubleSeqA.cpp
+    DoubleSeqC.cpp
+    Dynamic_ParameterA.cpp
+    Dynamic_ParameterC.cpp
+    DynamicA.cpp
+    DynamicC.cpp
+    Encodable.cpp
+    Endpoint.cpp
+    Endpoint_Selector_Factory.cpp
+    Environment.cpp
+    Exception.cpp
+    Exclusive_TMS.cpp
+    Fault_Tolerance_Service.cpp
+    FILE_Parser.cpp
+    FloatSeqA.cpp
+    FloatSeqC.cpp
+    Flushing_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_Lite.cpp
+    GIOP_Message_Locate_Header.cpp
+    GIOP_Message_State.cpp
+    GIOP_Message_Version.cpp
+    GIOP_Utils.cpp
+    GIOPA.cpp
+    GIOPC.cpp
+    IFR_Client_Adapter.cpp
+    IIOP_Acceptor.cpp
+    IIOP_Connection_Handler.cpp
+    IIOP_Connector.cpp
+    IIOP_Endpoint.cpp
+    IIOP_EndpointsA.cpp
+    IIOP_EndpointsC.cpp
+    IIOP_Factory.cpp
+    IIOP_Lite_Factory.cpp
+    IIOP_Profile.cpp
+    IIOP_Transport.cpp
+    IIOPA.cpp
+    IIOPC.cpp
+    Incoming_Message_Queue.cpp
+    Interceptor_List.cpp
+    Invocation_Adapter.cpp
+    Invocation_Base.cpp
+    Invocation_Endpoint_Selectors.cpp
+    IOP_CodecA.cpp
+    IOP_CodecC.cpp
+    IOP_IORA.cpp
+    IOP_IORC.cpp
+    IOPC.cpp
+    IOR_Parser.cpp
+    IORInterceptor_Adapter.cpp
+    IORInterceptor_Adapter_Factory.cpp
+    Leader_Follower.cpp
+    Leader_Follower_Flushing_Strategy.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_Strategy.cpp
+    LF_Strategy_Complete.cpp
+    LocalObject.cpp
+    LocateRequest_Invocation.cpp
+    LocateRequest_Invocation_Adapter.cpp
+    LongDoubleSeqA.cpp
+    LongDoubleSeqC.cpp
+    LongLongSeqA.cpp
+    LongLongSeqC.cpp
+    LongSeqA.cpp
+    LongSeqC.cpp
+    LRU_Connection_Purging_Strategy.cpp
+    Managed_Types.cpp
+    Marshal.cpp
+    MCAST_Parser.cpp
+    Messaging_SyncScopeC.cpp
+    MProfile.cpp
+    Muxed_TMS.cpp
+    Object.cpp
+    Object_KeyC.cpp
+    Object_Loader.cpp
+    Object_Proxy_Broker.cpp
+    Object_Proxy_Impl.cpp
+    Object_Ref_Table.cpp
+    ObjectIdListA.cpp
+    ObjectIdListC.cpp
+    ObjectKey_Table.cpp
+    OctetSeqA.cpp
+    OctetSeqC.cpp
+    operation_details.cpp
+    ORB.cpp
+    orb_typesA.cpp
+    orb_typesC.cpp
+    ORB_Core.cpp
+    ORB_Core_Auto_Ptr.cpp
+    ORB_Table.cpp
+    ORBInitializer_Registry.cpp
+    ORBInitInfo.cpp
+    ParameterModeC.cpp
+    params.cpp
+    Parser_Registry.cpp
+    PI_ForwardC.cpp
+    PICurrent.cpp
+    PICurrent_Copy_Callback.cpp
+    PICurrent_ORBInitializer.cpp
+    Pluggable_Messaging.cpp
+    Pluggable_Messaging_Utils.cpp
+    Policy_ForwardA.cpp
+    Policy_ForwardC.cpp
+    Policy_Set.cpp
+    Policy_Validator.cpp
+    PolicyA.cpp
+    PolicyC.cpp
+    PolicyFactory_Registry.cpp
+    PollableC.cpp
+    PortableInterceptorA.cpp
+    PortableInterceptorC.cpp
+    PredefinedType_Seq_Tmplinst.cpp
+    Principal.cpp
+    Profile.cpp
+    Profile_Transport_Resolver.cpp
+    Protocol_Factory.cpp
+    Protocols_Hooks.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
+    RequestInfo_Util.cpp
+    Resource_Factory.cpp
+    Resume_Handle.cpp
+    Sequence.cpp
+    Server_Strategy_Factory.cpp
+    Service_Callbacks.cpp
+    Service_Context.cpp
+    Services_Activate.cpp
+    ShortSeqA.cpp
+    ShortSeqC.cpp
+    skip.cpp
+    Special_Basic_Arguments.cpp
+    StringSeqA.cpp
+    StringSeqC.cpp
+    Stub.cpp
+    Stub_Factory.cpp
+    Sync_Strategies.cpp
+    Synch_Invocation.cpp
+    Synch_Queued_Message.cpp
+    Synch_Refcountable.cpp
+    Synch_Reply_Dispatcher.cpp
+    SystemException.cpp
+    Tagged_Components.cpp
+    Tagged_Profile.cpp
+    TAO_Internal.cpp
+    TAO_Server_Request.cpp
+    TAO_Singleton_Manager.cpp
+    TAOA.cpp
+    TAOC.cpp
+    target_specification.cpp
+    Thread_Lane_Resources.cpp
+    Thread_Lane_Resources_Manager.cpp
+    Thread_Per_Connection_Handler.cpp
+    TimeBaseA.cpp
+    TimeBaseC.cpp
+    Transport.cpp
+    Transport_Acceptor.cpp
+    Transport_Cache_Manager.cpp
+    Transport_Connector.cpp
+    Transport_Descriptor_Interface.cpp
+    Transport_Mux_Strategy.cpp
+    Transport_Timer.cpp
+    TSS_Resources.cpp
+    Typecode.cpp
+    Typecode_typesC.cpp
+    Typecode_Constants.cpp
+    TypeCodeFactory_Adapter.cpp
+    ULongLongSeqA.cpp
+    ULongLongSeqC.cpp
+    ULongSeqA.cpp
+    ULongSeqC.cpp
+    UserException.cpp
+    UShortSeqA.cpp
+    UShortSeqC.cpp
+    UTF16_BOM_Factory.cpp
+    UTF16_BOM_Translator.cpp
+    Valuetype_Adapter.cpp
+    Wait_On_Leader_Follower.cpp
+    Wait_On_LF_No_Upcall.cpp
+    Wait_On_Reactor.cpp
+    Wait_On_Read.cpp
+    Wait_Strategy.cpp
+    WCharSeqA.cpp
+    WCharSeqC.cpp
+    WrongTransactionA.cpp
+    WrongTransactionC.cpp
+    WStringSeqA.cpp
+    WStringSeqC.cpp
+    GUIResource_Factory.cpp
   }
 
   Header_Files {
-    *.h
+    Abstract_Servant_Base.h
+    Acceptor_Filter.h
+    Acceptor_Impl.h
+    Acceptor_Registry.h
+    Adapter_Factory.h
+    Adapter.h
+    Adapter_Registry.h
+    Allocator.h
+    Any_Arg_Traits.h
+    Any_Array_Impl_T.h
+    Any_Basic_Impl.h
+    Any_Basic_Impl_T.h
+    Any_Dual_Impl_T.h
+    Any.h
+    Any_Impl.h
+    Any_Impl_T.h
+    AnySeqC.h
+    AnySeqS.h
+    Any_Special_Impl_T.h
+    Any_SystemException.h
+    Any_Unknown_IDL_Type.h
+    Arg_Traits_T.h
+    Argument.h
+    Array_VarOut_T.h
+    Asynch_Queued_Message.h
+    Asynch_Reply_Dispatcher_Base.h
+    Auto_Functor.h
+    Base_Transport_Property.h
+    Basic_Arguments.h
+    Basic_Argument_T.h
+    Basic_SArguments.h
+    Basic_SArgument_T.h
+    Basic_Types.h
+    BD_String_Argument_T.h
+    BD_String_SArgument_T.h
+    BiDir_Adapter.h
+    Bind_Dispatcher_Guard.h
+    Blocked_Connect_Strategy.h
+    Block_Flushing_Strategy.h
+    BooleanSeqC.h
+    BooleanSeqS.h
+    BoundsC.h
+    Buffer_Allocator_T.h
+    Buffering_Constraint_Policy.h
+    Cache_Entries.h
+    CDR_Encaps_Codec.h
+    CDR.h
+    CharSeqC.h
+    CharSeqS.h
+    Cleanup_Func_Registry.h
+    ClientRequestInfo.h
+    ClientRequestInfo_i.h
+    ClientRequestInterceptor_Adapter.h
+    Client_Strategy_Factory.h
+    CodecFactory.h
+    CodecFactory_ORBInitializer.h
+    Codeset_Manager.h
+    Codeset_Translator_Factory.h
+    Codeset_Translator_Factory_T.h
+    Collocated_Invocation.h
+    Collocation_Proxy_Broker.h
+    Collocation_Resolver.h
+    Collocation_Strategy.h
+    Condition.h
+    Connection_Handler.h
+    Connection_Purging_Strategy.h
+    Connector_Impl.h
+    Connector_Registry.h
+    Connect_Strategy.h
+    CONV_FRAMEC.h
+    CONV_FRAMES.h
+    CONV_FRAMES_T.h
+    corbafwd.h
+    corba.h
+    CORBALOC_Parser.h
+    CORBA_methods.h
+    CORBANAME_Parser.h
+    CORBA_String.h
+    CurrentC.h
+    debug.h
+    default_client.h
+    Default_Collocation_Resolver.h
+    Default_Endpoint_Selector_Factory.h
+    default_environment.h
+    default_ports.h
+    Default_Protocols_Hooks.h
+    default_resource.h
+    default_server.h
+    Default_Stub_Factory.h
+    Default_Thread_Lane_Resources_Manager.h
+    DLL_Parser.h
+    DomainC.h
+    DoubleSeqC.h
+    DoubleSeqS.h
+    Dynamic_Adapter.h
+    DynamicC.h
+    Dynamic_ParameterC.h
+    Encodable.h
+    Endpoint.h
+    Endpoint_Selector_Factory.h
+    Environment.h
+    Exception_Data.h
+    Exception.h
+    Exclusive_TMS.h
+    Fault_Tolerance_Service.h
+    FILE_Parser.h
+    Fixed_Array_Argument_T.h
+    Fixed_Array_SArgument_T.h
+    Fixed_Size_Argument_T.h
+    Fixed_Size_SArgument_T.h
+    FloatSeqC.h
+    FloatSeqS.h
+    Flushing_Strategy.h
+    GIOPC.h
+    GIOP_Message_Base.h
+    GIOP_Message_Generator_Parser_10.h
+    GIOP_Message_Generator_Parser_11.h
+    GIOP_Message_Generator_Parser_12.h
+    GIOP_Message_Generator_Parser.h
+    GIOP_Message_Generator_Parser_Impl.h
+    GIOP_Message_Lite.h
+    GIOP_Message_Locate_Header.h
+    GIOP_Message_State.h
+    GIOP_Message_Version.h
+    GIOPS.h
+    GIOPS_T.h
+    GIOP_Utils.h
+    GUIResource_Factory.h
+    IFR_Client_Adapter.h
+    IIOP_Acceptor.h
+    IIOPC.h
+    IIOP_Connection_Handler.h
+    IIOP_Connector.h
+    IIOP_Endpoint.h
+    IIOP_EndpointsC.h
+    IIOP_Factory.h
+    IIOP_Lite_Factory.h
+    IIOP_Profile.h
+    IIOP_Transport.h
+    Incoming_Message_Queue.h
+    Interceptor_List.h
+    Invocation_Adapter.h
+    Invocation_Base.h
+    Invocation_Endpoint_Selectors.h
+    Invocation_Utils.h
+    IOPC.h
+    IOP_CodecC.h
+    IOP_IORC.h
+    IOPS.h
+    IOPS_T.h
+    IORInterceptor_Adapter_Factory.h
+    IORInterceptor_Adapter.h
+    IOR_Parser.h
+    Leader_Follower_Flushing_Strategy.h
+    Leader_Follower.h
+    LF_CH_Event.h
+    LF_Connect_Strategy.h
+    LF_Event_Binder.h
+    LF_Event.h
+    LF_Event_Loop_Thread_Helper.h
+    LF_Follower_Auto_Adder.h
+    LF_Follower_Auto_Ptr.h
+    LF_Follower.h
+    LF_Invocation_Event.h
+    LF_Strategy_Complete.h
+    LF_Strategy.h
+    LocalObject.h
+    LocateRequest_Invocation_Adapter.h
+    LocateRequest_Invocation.h
+    LongDoubleSeqC.h
+    LongDoubleSeqS.h
+    LongLongSeqC.h
+    LongLongSeqS.h
+    LongSeqC.h
+    LongSeqS.h
+    LRU_Connection_Purging_Strategy.h
+    Managed_Types.h
+    Marshal.h
+    MCAST_Parser.h
+    Messaging_PolicyValueC.h
+    Messaging_SyncScopeC.h
+    MProfile.h
+    Muxed_TMS.h
+    New_Leader_Generator.h
+    NVList.h
+    Object_Argument_T.h
+    Object.h
+    objectid.h
+    ObjectIdListC.h
+    Object_KeyC.h
+    ObjectKey_Table.h
+    Object_Loader.h
+    Object_Proxy_Broker.h
+    Object_Proxy_Impl.h
+    Object_Ref_Table.h
+    Object_SArgument_T.h
+    Object_T.h
+    Objref_VarOut_T.h
+    OBV_Constants.h
+    OctetSeqC.h
+    OctetSeqS.h
+    operation_details.h
+    orbconf.h
+    ORB_Constants.h
+    ORB_Core_Auto_Ptr.h
+    ORB_Core.h
+    ORB.h
+    ORBInitializer_Registry.h
+    ORBInitInfo.h
+    ORB_Table.h
+    orb_typesC.h
+    orb_typesS.h
+    ParameterModeC.h
+    ParameterModeS.h
+    params.h
+    Parser_Registry.h
+    PICurrent_Copy_Callback.h
+    PICurrent.h
+    PICurrent_ORBInitializer.h
+    PI_ForwardC.h
+    Pluggable_Messaging.h
+    Pluggable_Messaging_Utils.h
+    PolicyC.h
+    PolicyFactory_Registry.h
+    Policy_ForwardC.h
+    Policy_Manager.h
+    Policy_Set.h
+    PolicyS.h
+    Policy_Validator.h
+    PollableC.h
+    PollableS.h
+    PollableS_T.h
+    PortableInterceptorC.h
+    PortableInterceptor.h
+    PortableInterceptorS.h
+    Principal.h
+    Profile.h
+    Profile_Transport_Resolver.h
+    Protocol_Factory.h
+    Protocols_Hooks.h
+    Pseudo_VarOut_T.h
+    Queued_Message.h
+    Reactive_Connect_Strategy.h
+    Reactive_Flushing_Strategy.h
+    Refcounted_ObjectKey.h
+    Remote_Invocation.h
+    Remote_Object_Proxy_Broker.h
+    Reply_Dispatcher.h
+    Request_Dispatcher.h
+    RequestInfo_Util.h
+    Resource_Factory.h
+    Resume_Handle.h
+    Seq_Out_T.h
+    Sequence.h
+    Sequence_T.h
+    Seq_Var_T.h
+    Server_Strategy_Factory.h
+    Service_Callbacks.h
+    Service_Context.h
+    Services_Activate.h
+    ServicesC.h
+    ServicesS.h
+    ServicesS_T.h
+    ShortSeqC.h
+    ShortSeqS.h
+    Special_Basic_Arguments.h
+    Special_Basic_Argument_T.h
+    Special_Basic_SArguments.h
+    Special_Basic_SArgument_T.h
+    StringSeqC.h
+    StringSeqS.h
+    Stub_Factory.h
+    Stub.h
+    Synch_Invocation.h
+    Synch_Queued_Message.h
+    Synch_Refcountable.h
+    Synch_Reply_Dispatcher.h
+    Sync_Strategies.h
+    SystemException.h
+    Tagged_Components.h
+    Tagged_Profile.h
+    TAOC.h
+    TAO_Export.h
+    TAO_Internal.h
+    TAO_Server_Request.h
+    TAOS.h
+    TAO_Singleton.h
+    TAO_Singleton_Manager.h
+    TAOS_T.h
+    target_specification.h
+    TC_Constants_Forward.h
+    Thread_Lane_Resources.h
+    Thread_Lane_Resources_Manager.h
+    Thread_Per_Connection_Handler.h
+    TimeBaseC.h
+    TimeBaseS.h
+    TimeBaseS_T.h
+    Timeprobe.h
+    Transport_Acceptor.h
+    Transport_Cache_Manager.h
+    Transport_Connector.h
+    Transport_Descriptor_Interface.h
+    Transport.h
+    Transport_Mux_Strategy.h
+    Transport_Timer.h
+    TSS_Resources.h
+    Typecode_Constants.h
+    TypeCodeFactory_Adapter.h
+    Typecode.h
+    Typecode_typesC.h
+    Typecode_typesS.h
+    UB_String_Arguments.h
+    UB_String_Argument_T.h
+    UB_String_SArguments.h
+    UB_String_SArgument_T.h
+    ULongLongSeqC.h
+    ULongLongSeqS.h
+    ULongSeqC.h
+    ULongSeqS.h
+    UserException.h
+    UShortSeqC.h
+    UShortSeqS.h
+    UTF16_BOM_Factory.h
+    UTF16_BOM_Translator.h
+    Valuetype_Adapter.h
+    Var_Array_Argument_T.h
+    Var_Array_SArgument_T.h
+    varbase.h
+    VarOut_T.h
+    Var_Size_Argument_T.h
+    Var_Size_SArgument_T.h
+    Version.h
+    Wait_On_Leader_Follower.h
+    Wait_On_LF_No_Upcall.h
+    Wait_On_Reactor.h
+    Wait_On_Read.h
+    Wait_Strategy.h
+    WCharSeqC.h
+    WCharSeqS.h
+    WrongTransactionC.h
+    WStringSeqC.h
+    WStringSeqS.h
   }
 
   Inline_Files {
@@ -307,4 +640,8 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
     TAO_Singleton.cpp
     orb.idl
   }
+
+  Pkgconfig_Files {
+    TAO.pc.in
+  }
 }
diff --git a/TAO/tao/xt_resource.cpp b/TAO/tao/xt_resource.cpp
deleted file mode 100644
index 747bf2672e5..00000000000
--- a/TAO/tao/xt_resource.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-#include "tao/xt_resource.h"
-
-#if defined(ACE_HAS_XT)
-
-#if !defined (__ACE_INLINE__)
-# include "tao/xt_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, xt_resource, "$Id$")
-
-XtAppContext
-TAO_XT_Resource_Factory::context_ = 0;
-
-ACE_Reactor_Impl*
-TAO_XT_Resource_Factory::allocate_reactor_impl (void) const
-{
-  if (TAO_XT_Resource_Factory::context_ == 0)
-    return 0;
-
-  ACE_Reactor_Impl *impl = 0;
-
-  ACE_NEW_RETURN (impl, ACE_XtReactor (TAO_XT_Resource_Factory::context_), 0);
-  return impl;
-}
-
-void
-TAO_XT_Resource_Factory::set_context (XtAppContext context)
-{
-  TAO_XT_Resource_Factory::context_ = context;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_XT_Resource_Factory,
-                       ACE_TEXT ("XT_Resource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_XT_Resource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_XT_Resource_Factory)
-
-#endif /* ACE_HAS_XT */
diff --git a/TAO/tao/xt_resource.h b/TAO/tao/xt_resource.h
deleted file mode 100644
index 04274f55e16..00000000000
--- a/TAO/tao/xt_resource.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   xt_resource.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_XT_RESOURCE_H
-#define TAO_XT_RESOURCE_H
-#include /**/ "ace/pre.h"
-
-#include "tao/default_resource.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_XT)
-
-#include "ace/XtReactor.h"
-
-// ****************************************************************
-
-/**
- * @class TAO_XT_Resource_Factory
- *
- * @brief TAO's default resource factory
- *
- * Using a <{resource source specifier}> as a discriminator, the
- * factory can return resource instances which are, e.g., global,
- * stored in thread-specific storage, stored in shared memory,
- * etc.
- */
-class TAO_XT_Resource_Factory : public TAO_Default_Resource_Factory
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_XT_Resource_Factory (void);
-
-  /// Set the context used to create the XtReactor
-  static void set_context (XtAppContext context);
-
-protected:
-  /// Obtain the reactor implementation
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-
-private:
-  static XtAppContext context_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/xt_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_XT_Resource_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_XT_Resource_Factory)
-
-#endif /* ACE_HAS_XT */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/xt_resource.i b/TAO/tao/xt_resource.i
deleted file mode 100644
index 0b14c74dcf9..00000000000
--- a/TAO/tao/xt_resource.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_XT_Resource_Factory::TAO_XT_Resource_Factory (void)
-{
-}
diff --git a/TAO/taoConf.sh.in b/TAO/taoConf.sh.in
deleted file mode 100644
index 60955b5ff8f..00000000000
--- a/TAO/taoConf.sh.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Configuration of the TAO distribution
-#
-
-TAO_COMPILER="@CXX@"
-TAO_LIBDIR="@TAO_LIBDIR@"
-TAO_INCLUDEDIR="@TAO_INCLUDEDIR@ @CXXFLAGS@"
-TAO_LIBS="@TAO_LIBS@"
diff --git a/TAO/tao_targets.GNU b/TAO/tao_targets.GNU
deleted file mode 100644
index 76c70b1597f..00000000000
--- a/TAO/tao_targets.GNU
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# $Id$
-#
-
-TAO_DIRS=ace \
-	apps/gperf/src \
-	TAO/tao \
-	TAO/TAO_IDL
-
-tao:
-ifeq (Windows,$(findstring Windows,$(OS)))
-	@cmd /c "FOR /D %i IN ($(TAO_DIRS)) DO $(MAKE) ACE_COMPONENTS=FOR_TAO -C %i"
-else  # ! Windows
-	@for dir in $(TAO_DIRS); do $(MAKE) ACE_COMPONENTS=FOR_TAO -C $$dir $(ACE_NESTED_COMMAND); done
-endif # ! Windows
diff --git a/TAO/taoconfig.mk b/TAO/taoconfig.mk
deleted file mode 100644
index 50372b861d2..00000000000
--- a/TAO/taoconfig.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Common makefile definitions for all applications
-#
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-LDFLAGS +=  -L$(TAO_ROOT)/tao
-INCLDIRS += -I$(TAO_ROOT)
diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
index 01ed0d16004..31273239815 100644
--- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
+++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, amh, portableserver, strategies {
+project(*Server): taoserver, amh, strategies {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 5bf4fd81ca4..f3721e68cb0 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -103,7 +103,7 @@ ST_AMH_Server::ST_AMH_Server (int* argc, char **argv)
   : argc_ (argc)
   , argv_ (argv)
 {
-  this->ior_output_file_ = ACE_const_cast (char*, "test.ior");
+  this->ior_output_file_ = const_cast<char*> ("test.ior");
 }
 
 ST_AMH_Server::~ST_AMH_Server ()
diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
index 0e5819c5167..b42dca05552 100644
--- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
+++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
@@ -7,7 +7,7 @@ project(*client) : taoexe, portableserver, amh {
   }
 }
 
-project(*server) : taoexe, portableserver, amh, strategies {
+project(*server) : taoserver, amh, strategies {
   source_files {
     server.cpp
   }
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index 8ee95f578b2..98b960f76f7 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -122,7 +122,7 @@ ST_AMH_Server::ST_AMH_Server (int* argc, char **argv)
   : argc_ (argc)
   , argv_ (argv)
 {
-  this->ior_output_file_ = ACE_const_cast (char*, "test.ior");
+  this->ior_output_file_ = const_cast<char*> ("test.ior");
 }
 
 ST_AMH_Server::~ST_AMH_Server ()
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 856abb57673..9733d3be55d 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -22,6 +22,9 @@ const int BUFFERED_MESSAGES_COUNT = 50;
 const unsigned int TIMEOUT_MILLISECONDS = 50;
 const int BUFFER_SIZE = 64 * PAYLOAD_LENGTH;
 
+/// Allow a larger timeout to occur due to scheduler differences
+const unsigned int TIMEOUT_TOLERANCE = 4 * TIMEOUT_MILLISECONDS;
+
 /// Check that no more than 10% of the messages are not sent.
 const double LIVENESS_TOLERANCE = 0.9;
 
@@ -618,7 +621,7 @@ run_timeout (CORBA::ORB_ptr orb,
               break;
             }
 
-          if (elapsed.msec () > 2 * TIMEOUT_MILLISECONDS)
+          if (elapsed.msec () > TIMEOUT_TOLERANCE)
             {
               test_failed = 1;
               ACE_DEBUG ((LM_DEBUG,
@@ -626,7 +629,7 @@ run_timeout (CORBA::ORB_ptr orb,
                           "timeout threshold. "
                           "Elapsed = %d, Timeout = %d msecs\n",
                           i,
-                          elapsed.msec (), TIMEOUT_MILLISECONDS));
+                          elapsed.msec (), TIMEOUT_TOLERANCE));
               break;
             }
         }
@@ -738,7 +741,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
               break;
             }
 
-          if (elapsed.msec () > 2 * TIMEOUT_MILLISECONDS)
+          if (elapsed.msec () > TIMEOUT_TOLERANCE)
             {
               test_failed = 1;
               ACE_DEBUG ((LM_DEBUG,
@@ -746,7 +749,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
                           "timeout threshold. "
                           "Elapsed = %d, Timeout = %d msecs\n",
                           i,
-                          elapsed.msec (), TIMEOUT_MILLISECONDS));
+                          elapsed.msec (), TIMEOUT_TOLERANCE));
               break;
             }
         }
diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
index 3844d79fd15..4eeadb14767 100644
--- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
+++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, valuetype {
+project(*client) : taoclient, valuetype {
   idlflags += -Sc
 
   IDL_Files {
@@ -18,7 +18,7 @@ project(*client) : taoexe, valuetype {
   }
 }
 
-project(*server) : taoexe, portableserver, valuetype {
+project(*server) : taoserver, valuetype {
   idlflags += -Sc
 
   IDL_Files {
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index 055be7b2c47..ac6c799d32b 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
 #include "test_i.h"
+#include "ace/OS_NS_string.h"
 
-ACE_RCSID (Abstract_Interface, 
-           test_i, 
+
+ACE_RCSID (Abstract_Interface,
+           test_i,
            "$Id$")
 
-char * 
+
+char *
 foo_i::foo_op (const char * inarg
                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -29,7 +32,7 @@ foo_i::foo_op (const char * inarg
   return retval._retn ();
 }
 
-char * 
+char *
 foo_i::base_op (const char * inarg
                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
@@ -52,7 +55,7 @@ foo_i::base_op (const char * inarg
   return retval._retn ();
 }
 
-void 
+void
 passer_i::pass_ops (base_out outarg
                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
@@ -67,7 +70,7 @@ passer_i::pass_ops (base_out outarg
   ACE_CHECK;
 }
 
-void 
+void
 passer_i::pass_state (base_out outarg
                       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((
@@ -101,4 +104,3 @@ passer_i::pass_state (base_out outarg
 
   outarg = tc._retn ();
 }
-
diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc
index 68e9628068f..aa9caa94b83 100644
--- a/TAO/tests/Big_Reply/Big_Reply.mpc
+++ b/TAO/tests/Big_Reply/Big_Reply.mpc
@@ -1,15 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Big_Reply_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe, portableserver {
+project(*Client): taoclient {
   Source_Files {
+    TestC.cpp
     Client_Task.cpp
     client.cpp
   }
diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp
index d44ffbd86e6..63693d3240f 100644
--- a/TAO/tests/Big_Reply/Client_Task.cpp
+++ b/TAO/tests/Big_Reply/Client_Task.cpp
@@ -31,6 +31,7 @@ Client_Task::svc (void)
     {
       for (int i = 0; i != this->event_count_; ++i)
         {
+          Test::Octet_Seq_var dummy =
           this->reply_gen_->get_big_reply (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
index a91bc7699ca..77ace4817a7 100644
--- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
@@ -1,16 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, messaging {
+project(*Server): taoserver, messaging {
   Source_Files {
     Payload_Receiver.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe, messaging {
-  exename = client
-
+project(*Client): taoclient, messaging {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl
index 05a7b500a7c..6d3ad554f13 100755
--- a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl
+++ b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl
@@ -16,7 +16,8 @@ $CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Bug_1020_Regression/run_test.pl b/TAO/tests/Bug_1020_Regression/run_test.pl
index 624e25c6f63..732e3b9afd3 100755
--- a/TAO/tests/Bug_1020_Regression/run_test.pl
+++ b/TAO/tests/Bug_1020_Regression/run_test.pl
@@ -18,7 +18,8 @@ $CL3 = new PerlACE::Process ("client", "-k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, 
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Bug_1269_Regression/run_test.pl b/TAO/tests/Bug_1269_Regression/run_test.pl
index 7159c5104d9..d9588d8bec8 100755
--- a/TAO/tests/Bug_1269_Regression/run_test.pl
+++ b/TAO/tests/Bug_1269_Regression/run_test.pl
@@ -18,7 +18,8 @@ $CL3 = new PerlACE::Process ("client", "-k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, 
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Bug_1270_Regression/run_test.pl b/TAO/tests/Bug_1270_Regression/run_test.pl
index 2ea186cdba9..80402bb0270 100755
--- a/TAO/tests/Bug_1270_Regression/run_test.pl
+++ b/TAO/tests/Bug_1270_Regression/run_test.pl
@@ -18,7 +18,8 @@ $CL3 = new PerlACE::Process ("client", "-k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, 
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
index 433fb563880..286b6997b0b 100644
--- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
+++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(Bug 1330 Server): server, iortable {
+project(Bug 1330 Server): taoserver, iortable {
   Source_Files {
     Test_i.cpp
     server.cpp
   }
 }
 
-project(Bug 1330 Client): taoexe {
+project(Bug 1330 Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index 64fc5963c0b..ba1eb1160f0 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -16,7 +16,8 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-	cout << "Starting shutdown" << endl;
+  ACE_DEBUG ((LM_DEBUG,
+             "Starting shutdown\n"));
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp
index d8dca76fc9b..40d7a6c63e7 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1482_Regression/Hello.cpp
@@ -2,8 +2,13 @@
 // $Id$
 //
 #include "Hello.h"
+#include "ace/ACE.h"
+
+
+ACE_RCSID (Bug_1482_Regression,
+           Hello,
+           "$Id$")
 
-ACE_RCSID(Hello, Hello, "$Id$")
 
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Bug_1482_Regression/run_test.pl b/TAO/tests/Bug_1482_Regression/run_test.pl
index 865604beac8..1075e88e2c2 100755
--- a/TAO/tests/Bug_1482_Regression/run_test.pl
+++ b/TAO/tests/Bug_1482_Regression/run_test.pl
@@ -25,7 +25,8 @@ while($elapsed < $max_running_time) {
 print STDERR " Going .. \n";
 $sv1 = $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Bug_1551_Regression/run_test.pl b/TAO/tests/Bug_1551_Regression/run_test.pl
index edb7803c237..bd6037a58b7 100755
--- a/TAO/tests/Bug_1551_Regression/run_test.pl
+++ b/TAO/tests/Bug_1551_Regression/run_test.pl
@@ -28,7 +28,8 @@ while($n < $ntimes) {
 print STDERR " Going .. \n";
 $sv1 = $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Bug_1568_Regression/run_test.pl b/TAO/tests/Bug_1568_Regression/run_test.pl
index cb01e54efdc..54d0317c39e 100755
--- a/TAO/tests/Bug_1568_Regression/run_test.pl
+++ b/TAO/tests/Bug_1568_Regression/run_test.pl
@@ -17,7 +17,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Bug_1627_Regression/test.mpc b/TAO/tests/Bug_1627_Regression/test.mpc
index 83187aafa6b..76b61adbf38 100644
--- a/TAO/tests/Bug_1627_Regression/test.mpc
+++ b/TAO/tests/Bug_1627_Regression/test.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(Bug_1627_Server): server, iortable {
+project(Bug_1627_Server): taoserver, iortable {
   Source_Files {
     Test_i.cpp
     server.cpp
   }
 }
 
-project(Bug_1627_Client): taoexe {
+project(Bug_1627_Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1670_Regression/run_test.pl b/TAO/tests/Bug_1670_Regression/run_test.pl
index cb01e54efdc..54d0317c39e 100755
--- a/TAO/tests/Bug_1670_Regression/run_test.pl
+++ b/TAO/tests/Bug_1670_Regression/run_test.pl
@@ -17,7 +17,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index 1ad97a311b6..34821280c6b 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -185,7 +185,7 @@ main (int argc, char *argv[])
       ACE_Time_Value tv;
       cdr_encoding.elapsed_time_incr (tv);
       ACE_hrtime_t usecs = tv.sec ();
-      usecs *= ACE_static_cast (ACE_UINT32, ACE_ONE_SECOND_IN_USECS);
+      usecs *= static_cast<ACE_UINT32> (ACE_ONE_SECOND_IN_USECS);
       usecs += tv.usec ();
       double average = ACE_U64_TO_U32(usecs) / repeat;
 
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index cb2d21ec0a3..656025779a4 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -23,6 +23,7 @@
 #include "tao/Any.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (CDR,
            basic_types,
diff --git a/TAO/tests/CDR/growth.cpp b/TAO/tests/CDR/growth.cpp
index ead4518df27..9ddf3ea3d8e 100644
--- a/TAO/tests/CDR/growth.cpp
+++ b/TAO/tests/CDR/growth.cpp
@@ -19,6 +19,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/Log_Msg.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -146,13 +147,13 @@ main (int argc, char *argv[])
       ACE_Time_Value wtv;
       writing.elapsed_time_incr (wtv);
       ACE_hrtime_t wusecs = wtv.sec ();
-      wusecs *= ACE_static_cast (ACE_UINT32, ACE_ONE_SECOND_IN_USECS);
+      wusecs *= static_cast<ACE_UINT32> (ACE_ONE_SECOND_IN_USECS);
       wusecs += wtv.usec ();
 
       ACE_Time_Value rtv;
       reading.elapsed_time_incr (rtv);
       ACE_hrtime_t rusecs = rtv.sec ();
-      rusecs *= ACE_static_cast (ACE_UINT32, ACE_ONE_SECOND_IN_USECS);
+      rusecs *= static_cast<ACE_UINT32> (ACE_ONE_SECOND_IN_USECS);
       rusecs += rtv.usec ();
 
       double write_average = ACE_U64_TO_U32(wusecs) / m;
diff --git a/TAO/tests/CDR/octet_sequence.cpp b/TAO/tests/CDR/octet_sequence.cpp
index 905bee48f55..fd8a8026ab5 100644
--- a/TAO/tests/CDR/octet_sequence.cpp
+++ b/TAO/tests/CDR/octet_sequence.cpp
@@ -66,7 +66,7 @@ int main(int, char*[])
     cdr.write_octet_array_mb(m1);
     dump("expect 3,3,3"); // that's what I expected, anyway
     ACE_DEBUG ((LM_INFO, "total cdr length is %u\n",
-                ACE_static_cast (u_int, cdr.total_length())));
+                static_cast<u_int> (cdr.total_length())));
   }
   dump("expect 2,2,2"); // that's what I expected, anyway
 
diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
index 52da9feb86c..4f7f1f0064d 100644
--- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
+++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Hello.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Cache_Growth_Test/run_test.pl b/TAO/tests/Cache_Growth_Test/run_test.pl
index 9589137ebe2..2411ad764d5 100755
--- a/TAO/tests/Cache_Growth_Test/run_test.pl
+++ b/TAO/tests/Cache_Growth_Test/run_test.pl
@@ -18,7 +18,8 @@ $CL1 = new PerlACE::Process ("client", " -k file://$iorfile -x");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc
index a7f599c43a6..9d21026afb5 100644
--- a/TAO/tests/Client_Leaks/Client_Leaks.mpc
+++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Process_Factory.cpp
     Startup_Callback.cpp
@@ -10,7 +10,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
index 9ef933f5a76..47be0f23d87 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #include "Char_IBM1047_ISO8859_Factory.h"
+#include "ace/Log_Msg.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
index 32962cfb721..4c9d5479957 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
@@ -40,7 +40,7 @@ ACE_CDR::Boolean
 IBM1047_ISO8859::read_char (ACE_InputCDR &in,
                             ACE_CDR::Char &x)
 {
-  if (this->read_1 (in, ACE_reinterpret_cast (ACE_CDR::Octet*, &x)))
+  if (this->read_1 (in, reinterpret_cast<ACE_CDR::Octet*> (&x)))
     {
       x = to_IBM1047[(int) x];
       return 1;
@@ -100,8 +100,7 @@ IBM1047_ISO8859::write_char (ACE_OutputCDR& out,
                              ACE_CDR::Char x)
 {
   return this->write_1 (out,
-                        ACE_reinterpret_cast (const ACE_CDR::Octet*,
-                                              &from_IBM1047[(int) x]));
+                        reinterpret_cast<const ACE_CDR::Octet*> (&from_IBM1047[(int) x]));
 }
 
 ACE_CDR::Boolean
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
index 60da234be4c..73cafb5042f 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
@@ -21,6 +21,7 @@
 // ============================================================================
 
 #include "Wchar_IBM1047_ISO8859_Factory.h"
+#include "ace/Log_Msg.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
index 40677ac0275..bbd19acada2 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp
@@ -83,14 +83,13 @@ ACE_UTF16_T
 load_raw_wchar (const char * buffer, size_t & pos, int do_byte_swap)
 {
   // need a two byte object to load the UTF16 2 byte codepoint
-  ACE_UTF16_T utf16_char = * ACE_reinterpret_cast (ACE_UTF16_T const *,
-    &buffer[pos*ACE_UTF16_CODEPOINT_SIZE]);
+  ACE_UTF16_T utf16_char = * reinterpret_cast<ACE_UTF16_T const *> (&buffer[pos*ACE_UTF16_CODEPOINT_SIZE]);
 #if ! defined (ACE_DISABLE_SWAP_ON_READ)
   if (do_byte_swap)
     {
       ACE_CDR::swap_2 (
         &buffer[pos*ACE_UTF16_CODEPOINT_SIZE],
-        ACE_reinterpret_cast(char *,&utf16_char));
+        reinterpret_cast<char *> (&utf16_char));
     }
 #endif
   pos ++;
@@ -103,8 +102,7 @@ static
 ACE_CDR::WChar
 convert_surrogate_pair (ACE_UTF16_T high, ACE_UTF16_T low)
 {
-  return ACE_static_cast (ACE_CDR::WChar,
-    ((high - ACE_UTF16_SURROGATE_HIGH_BEGIN) << ACE_UTF16_SURROGATE_HIGH_SHIFT)
+  return static_cast<ACE_CDR::WChar> (((high - ACE_UTF16_SURROGATE_HIGH_BEGIN) << ACE_UTF16_SURROGATE_HIGH_SHIFT)
     + (low - ACE_UTF16_SURROGATE_LOW_BEGIN)
     + ACE_UTF16_SURROGATE_OFFSET
     );
@@ -121,7 +119,7 @@ load_wchar (const char * buffer, size_t & pos, size_t length, int do_byte_swap)
   ACE_CDR::WChar rc = ACE_UNICODE_SUBSTITUTE_CHARACTER;
   if (pos < length)
     {
-      rc = ACE_static_cast (ACE_CDR::WChar, load_raw_wchar (buffer, pos, do_byte_swap));
+      rc = static_cast<ACE_CDR::WChar> (load_raw_wchar (buffer, pos, do_byte_swap));
       // Is this a UTF16 surrogate?
       // note assumpton that SURROGATE_HIGH_END == SURROGATE_LOW_BEGIN
       if (rc >= ACE_UTF16_SURROGATE_HIGH_BEGIN && rc < ACE_UTF16_SURROGATE_LOW_END)
@@ -137,7 +135,7 @@ load_wchar (const char * buffer, size_t & pos, size_t length, int do_byte_swap)
                   && low < ACE_UTF16_SURROGATE_LOW_END)
                   {
                     rc = convert_surrogate_pair (
-                      ACE_static_cast (ACE_UTF16_T, rc), low);
+                      static_cast<ACE_UTF16_T> (rc), low);
                   }
                 else
                   {
@@ -162,7 +160,7 @@ static
 //ACE_INLINE
 size_t encode_utf16 (ACE_UTF16_T * buffer, ACE_CDR::WChar value)
 {
-  buffer[0] = ACE_static_cast (ACE_UTF16_T, value);
+  buffer[0] = static_cast<ACE_UTF16_T> (value);
   size_t length = 1;
   if (value >= ACE_UTF16_SURROGATE_HIGH_BEGIN)
     {
@@ -178,8 +176,7 @@ size_t encode_utf16 (ACE_UTF16_T * buffer, ACE_CDR::WChar value)
             }
           else
             {
-              ACE_CDR::WChar offset = ACE_static_cast (ACE_CDR::WChar,
-                value - ACE_UTF16_SURROGATE_OFFSET);
+              ACE_CDR::WChar offset = static_cast<ACE_CDR::WChar> (value - ACE_UTF16_SURROGATE_OFFSET);
               buffer[0] = (offset >> ACE_UTF16_SURROGATE_HIGH_SHIFT)
                 + ACE_UTF16_SURROGATE_HIGH_BEGIN;
               buffer[1] = (offset & ACE_UTF16_SURROGATE_LOW_MASK)
@@ -229,8 +226,8 @@ WUCS4_UTF16::~WUCS4_UTF16 (void)
 ACE_CDR::Boolean
 WUCS4_UTF16::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x)
 {
-  if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1
-      && ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) > 1)
+  if (static_cast<ACE_CDR::Short> (this->major_version(cdr)) == 1
+      && static_cast<ACE_CDR::Short> (this->minor_version(cdr)) > 1)
     {
       ACE_CDR::Octet len;
       if (! this->read_1 (cdr, &len))
@@ -284,7 +281,7 @@ WUCS4_UTF16::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x)
         }
       else
         {
-          x = ACE_static_cast(ACE_CDR::WChar, sx);
+          x = static_cast<ACE_CDR::WChar> (sx);
         }
 
         cdr.reset_byte_order (old_bo);
@@ -296,7 +293,7 @@ WUCS4_UTF16::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x)
         {
           return 0;
         }
-      x = ACE_static_cast(ACE_CDR::WChar, sx);
+      x = static_cast<ACE_CDR::WChar> (sx);
     }
   return 1;
 }
@@ -314,8 +311,8 @@ WUCS4_UTF16::read_wstring (ACE_InputCDR &cdr,
   // the memory is allocated.
   if (len > 0 && len <= cdr.length())
     {
-      if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1
-          && ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) > 1)
+      if (static_cast<ACE_CDR::Short> (this->major_version(cdr)) == 1
+          && static_cast<ACE_CDR::Short> (this->minor_version(cdr)) > 1)
         {
           len /= ACE_UTF16_CODEPOINT_SIZE;
 
@@ -404,8 +401,8 @@ WUCS4_UTF16::read_wchar_array (ACE_InputCDR & cdr,
   if (length == 0)
     return 1;
 
-  if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1
-      && ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) > 1)
+  if (static_cast<ACE_CDR::Short> (this->major_version(cdr)) == 1
+      && static_cast<ACE_CDR::Short> (this->minor_version(cdr)) > 1)
     {
       for (size_t i = 0; i < length; i++)
         if (!this->read_wchar(cdr,x[i]))
@@ -421,12 +418,12 @@ WUCS4_UTF16::write_wchar (ACE_OutputCDR &cdr,
                           ACE_CDR::WChar x)
 {
   int encode_len = 1;
-  if (ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) == 0)
+  if (static_cast<ACE_CDR::Short> (this->minor_version(cdr)) == 0)
     { // wchar is not allowed with GIOP 1.0
       errno = EINVAL;
       return 0;
     }
-  else if (ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) == 1)
+  else if (static_cast<ACE_CDR::Short> (this->minor_version(cdr)) == 1)
     encode_len = 0;
 
   return write_wchar_i(cdr,x,1,encode_len);
@@ -450,22 +447,21 @@ WUCS4_UTF16::write_wchar_i (ACE_OutputCDR &cdr,
     {
       len = 2;
       buffer[0] = ACE_UNICODE_BOM_CORRECT;
-      buffer[1] = ACE_static_cast(ACE_CDR::Short,x);
+      buffer[1] = static_cast<ACE_CDR::Short> (x);
     }
   else
     {
       len = 1;
       if (cdr.byte_order())
-        ACE_CDR::swap_2 (ACE_reinterpret_cast (const char *,&x),
-                         ACE_reinterpret_cast (char *,buffer));
+        ACE_CDR::swap_2 (reinterpret_cast<const char *> (&x),
+                         reinterpret_cast<char *> (buffer));
       else
-        buffer[0] = ACE_static_cast(ACE_CDR::Short,x);
+        buffer[0] = static_cast<ACE_CDR::Short> (x);
     }
 
   if (encode_len)
     {
-      unsigned char tcsize = ACE_static_cast (unsigned char,
-                                              len * ACE_UTF16_CODEPOINT_SIZE);
+      unsigned char tcsize = static_cast<unsigned char> (len * ACE_UTF16_CODEPOINT_SIZE);
       if (this->write_1 (cdr, &tcsize))
         return this->write_array(cdr, &buffer, tcsize, 1, 1);
       else
@@ -483,8 +479,8 @@ WUCS4_UTF16::write_wstring (ACE_OutputCDR & cdr,
                 ACE_CDR::ULong len,
                 const ACE_CDR::WChar *x)
 {
-  if (ACE_static_cast (ACE_CDR::Short, this->major_version(cdr)) == 1
-      && ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) > 1)
+  if (static_cast<ACE_CDR::Short> (this->major_version(cdr)) == 1
+      && static_cast<ACE_CDR::Short> (this->minor_version(cdr)) > 1)
     {
       // count characters that will require surrogates to
       // determine transmission length
@@ -529,12 +525,12 @@ WUCS4_UTF16::write_wchar_array (ACE_OutputCDR & cdr,
 #endif
 
   int encode_len = 1;
-  if (ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) == 0)
+  if (static_cast<ACE_CDR::Short> (this->minor_version(cdr)) == 0)
     { // wchar is not allowed with GIOP 1.0
       errno = EINVAL;
       return 0;
     }
-  else if (ACE_static_cast (ACE_CDR::Short, this->minor_version(cdr)) == 1)
+  else if (static_cast<ACE_CDR::Short> (this->minor_version(cdr)) == 1)
     encode_len = 0;
 
   for (size_t i = 0; i < length; i++)
@@ -559,7 +555,7 @@ WUCS4_UTF16::write_measured_wchar_array (ACE_OutputCDR & cdr,
       return 0;
     }
 
-  ACE_UTF16_T *sb = ACE_reinterpret_cast(ACE_UTF16_T *, buf);
+  ACE_UTF16_T *sb = reinterpret_cast<ACE_UTF16_T *> (buf);
   size_t sbpos = 0;
 
   for (size_t i = 0; i < length; i++)
@@ -574,7 +570,7 @@ WUCS4_UTF16::write_measured_wchar_array (ACE_OutputCDR & cdr,
       // and we don't want to allocate a new array
       for (size_t i = 0; i < sbpos; i++)
         {
-          char * pchar = ACE_static_cast (char *, &sb[i]);
+          char * pchar = static_cast<char *> (&sb[i]);
           // ACE_CDR::swap_2 (pchar, pchar);
           // can't use swap_2 because inplace swaps are not safe
           // and work-arounds like copying to another buffer lose
diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index 8214764827a..faff97c1cd1 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -24,6 +24,7 @@
 #include "ace/streams.h"
 
 #include "ace/OS_NS_string.h"
+#include "ace/Log_Msg.h"
 
 wchar_t *
 make_wstring (const char *str)
@@ -34,12 +35,14 @@ make_wstring (const char *str)
 
   int len = strlen (str) + 1;
   wchar_t *wstr = new wchar_t[len];
-  cout << "make_wstring: str = " << str << endl;
+  ACE_DEBUG ((LM_DEBUG,
+              "make_wstring: str = %s\n",str));
   for (int i = 0; i < len; i++)
     {
-      char *t = ACE_const_cast (char *, str);
-      wstr[i] = ACE_static_cast (wchar_t, *(t + i));
-      cout << "wstr[" << i << "] = " << (short)wstr[i] << endl;
+      char *t = const_cast<char *> (str);
+      wstr[i] = static_cast<wchar_t> (*(t + i));
+      ACE_DEBUG ((LM_DEBUG,
+	              "wstr[%d] = %d\n", i, (short)wstr[i]));
     }
   return wstr;
 }
@@ -64,18 +67,7 @@ int main (int argc, char *argv[])
       // Get IOR from command line (or file)
       if (argc != 2)
         {
-          ifstream fstr;
-          fstr.open ("server.ior");
-
-          if (fstr.bad ())
-            {
-              cout << "Cannot open server.ior and no IOR argument!" << endl;
-              exit (1);
-            }
-          else
-            {
-              fstr >> buf;
-            }
+		  ACE_OS::strcpy (buf, "file://server.ior");
         }
       else
         {
@@ -111,16 +103,16 @@ int main (int argc, char *argv[])
       const char *any_reply;
       outarg >>= any_reply;
 
-      cout << "Client sent " << bare_string
-           << ", got " << reply.in () << endl;
+      ACE_DEBUG ((LM_DEBUG,
+                 "Client sent %s, got %s\n", bare_string, reply.in () ));
 
       if (ACE_OS::strcmp (bare_string, reply.in ()) != 0)
         {
           ++error_count;
         }
 
-      cout << "Client sent " << any_string
-           << ", got " << any_reply << endl;
+      ACE_DEBUG ((LM_DEBUG,
+                 "Client sent %s, got %s\n", any_string, any_reply ));
 
       if (ACE_OS::strcmp (any_string, any_reply) != 0)
         {
@@ -129,7 +121,8 @@ int main (int argc, char *argv[])
 #if defined (ACE_HAS_WCHAR)
       wchar_t *wide_string = ACE_OS::strdup(ACE_TEXT_ALWAYS_WCHAR ("Wide String"));
       wchar_t *wide_reply = server->op2 (wide_string);
-      cout << "sent " << wide_string << " got " << wide_reply << endl;
+      ACE_DEBUG ((LM_DEBUG,
+                  "sent %W, got %W\n", wide_string, wide_reply));
 #endif /* ACE_HAS_WCHAR */
     }
   ACE_CATCHANY
diff --git a/TAO/tests/CodeSets/simple/run_test.pl b/TAO/tests/CodeSets/simple/run_test.pl
index b4cf1b83813..4cf6ee6747d 100755
--- a/TAO/tests/CodeSets/simple/run_test.pl
+++ b/TAO/tests/CodeSets/simple/run_test.pl
@@ -19,7 +19,8 @@ $CL = new PerlACE::Process ("client", " -ORBSvcConf cs_test.conf");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
@@ -48,7 +49,8 @@ $CL2 = new PerlACE::Process ("client");
 
 $SV2->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV2->Kill (); $SV2->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index d8cb504aca9..c37615ff438 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -23,6 +23,7 @@
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
+#include "ace/OS_NS_stdio.h"
 
 // ------------------------------------------------------------
 // Servant for associated CORBA object
@@ -38,10 +39,12 @@ public:
               ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    cout << "Server: bare string: " << name << endl;
+    ACE_DEBUG ((LM_DEBUG,
+                "Server: bare string: %s\n", name));
     const char *any_str;
     inany >>= any_str;
-    cout << "Server: inserted string: " << any_str << endl << endl;
+    ACE_DEBUG ((LM_DEBUG,
+                "Server: inserted string: %s\n\n", any_str));
 
     CORBA::Any *out_ptr = 0;
     ACE_NEW_RETURN (out_ptr,
@@ -85,7 +88,8 @@ int main(int argc, char *argv[])
       // Check POA
       if (CORBA::is_nil (poa_object.in ()))
         {
-          cout << "Couldn't initialize POA" << endl;
+          ACE_DEBUG ((LM_DEBUG,
+                     "Couldn't initialize POA\n"));
           return 1;
         }
 
@@ -115,18 +119,14 @@ int main(int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ofstream fstr;
-      fstr.open ("server.ior");
-
-      if (fstr.bad ())
-        {
-          cout << "Cannot open server.ior!" << endl;
-          exit (1);
-        }
-      else
-        {
-          fstr << ior.in () << endl;
-        }
+      FILE *output_file= ACE_OS::fopen ("server.ior", "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           "server.ior"),
+                              1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
 
       // Activate POA manager
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index a5048d39e31..d9e0019a156 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -123,7 +123,7 @@ main (int argc, char *argv[])
                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if ((ACE_reinterpret_cast (ptrdiff_t, encoded_data->get_buffer ())
+      if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ())
 	     % ACE_CDR::MAX_ALIGNMENT) == 0)
 	    ACE_DEBUG ((LM_DEBUG,
 		        "\nData for decoding are already aligned"
@@ -160,7 +160,7 @@ main (int argc, char *argv[])
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if ((ACE_reinterpret_cast (ptrdiff_t, encoded_data->get_buffer ())
+      if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ())
 	     % ACE_CDR::MAX_ALIGNMENT) == 0)
 	    ACE_DEBUG ((LM_WARNING,
                         "\n"
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index 1400bbb5696..9e248a81dbd 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -17,7 +17,7 @@ public:
   ~Top_i (void);
   // Ctor and dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 };
@@ -29,11 +29,11 @@ public:
   ~Left_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 };
@@ -45,15 +45,15 @@ public:
   ~Right_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 };
@@ -65,19 +65,19 @@ public:
   ~Buttom_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the name of the object.
 };
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index cca7e1b13be..8fe3545b9e4 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -69,8 +69,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL)
   else
     {
       TAO_POA_Current &tao_poa_current =
-        ACE_dynamic_cast (TAO_POA_Current &,
-                          *(this->poa_current_.in ()));
+        dynamic_cast<TAO_POA_Current &> (*(this->poa_current_.in ()));
 
       TAO_POA_Current_Impl &tao_poa_current_implementation =
         *tao_poa_current.implementation ();
diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp
index ccdc96bb5d3..7bb25bb8d33 100644
--- a/TAO/tests/Collocation_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Tests/Hello.cpp
@@ -34,8 +34,8 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       else if (this->orb_->orb_core ()->optimize_collocation_objects () &&
                this->orb_->orb_core ()->use_global_collocation () == 0)
         {
-          TAO_ORB_Table *orb_table =
-            TAO_ORB_Table::instance ();
+          TAO::ORB_Table * const orb_table =
+            TAO::ORB_Table::instance ();
 
           if (orb_table->find ("server_orb") == 0)
             {
diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
index 52da9feb86c..4f7f1f0064d 100644
--- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
+++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Hello.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Connect_Strategy_Test/run_test.pl b/TAO/tests/Connect_Strategy_Test/run_test.pl
index 37a2fdc5d4f..f7a37d77f93 100755
--- a/TAO/tests/Connect_Strategy_Test/run_test.pl
+++ b/TAO/tests/Connect_Strategy_Test/run_test.pl
@@ -20,7 +20,8 @@ $CL3 = new PerlACE::Process ("client", "-ORBSvcConf blocked$PerlACE::svcconf_ext
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Connection_Failure/Connection_Failure.mpc b/TAO/tests/Connection_Failure/Connection_Failure.mpc
index 03b90e84370..2e1ace5ef7a 100644
--- a/TAO/tests/Connection_Failure/Connection_Failure.mpc
+++ b/TAO/tests/Connection_Failure/Connection_Failure.mpc
@@ -2,8 +2,6 @@
 // $Id$
 
 project(*client): taoclient {
-  exename  = client
-
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc
index 799fb514183..ad230187aa7 100644
--- a/TAO/tests/Connection_Purging/Connection_Purging.mpc
+++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, taoexe, portableserver {
+project(*Server): strategies, taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): strategies, taoexe {
+project(*Client): strategies, taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
index 460e756b383..0fc5399e880 100644
--- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
+++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Oneway_Receiver.cpp
     Crash_Task.cpp
@@ -9,7 +9,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Crash_On_Write/run_test.pl b/TAO/tests/Crash_On_Write/run_test.pl
index d3c942c30ac..28cfc0e71a7 100755
--- a/TAO/tests/Crash_On_Write/run_test.pl
+++ b/TAO/tests/Crash_On_Write/run_test.pl
@@ -17,7 +17,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Crashed_Callback/run_test.pl b/TAO/tests/Crashed_Callback/run_test.pl
index d6717422f05..20b71ef1802 100755
--- a/TAO/tests/Crashed_Callback/run_test.pl
+++ b/TAO/tests/Crashed_Callback/run_test.pl
@@ -17,7 +17,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp
index c0a52a3fc30..3ff7ec43ff3 100644
--- a/TAO/tests/DynAny_Test/analyzer.cpp
+++ b/TAO/tests/DynAny_Test/analyzer.cpp
@@ -22,7 +22,9 @@
     ACE_DEBUG ((LM_DEBUG, str , b)); \
   } break;
 
-DynAnyAnalyzer::DynAnyAnalyzer(CORBA::ORB_ptr orb, DynamicAny::DynAnyFactory_ptr dynany_factory, int debug)
+DynAnyAnalyzer::DynAnyAnalyzer (CORBA::ORB_ptr orb,
+                                DynamicAny::DynAnyFactory_ptr dynany_factory,
+                                int debug)
   : orb_ (CORBA::ORB::_duplicate(orb)),
     dynany_factory_ (DynamicAny::DynAnyFactory::_duplicate(dynany_factory)),
     level_ (0),
@@ -30,7 +32,7 @@ DynAnyAnalyzer::DynAnyAnalyzer(CORBA::ORB_ptr orb, DynamicAny::DynAnyFactory_ptr
 {
 }
 
-void DynAnyAnalyzer::tab(int t)
+void DynAnyAnalyzer::tab (int t)
 {
   if (debug_)
     {
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 4c867297a66..ddef182f80c 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -16,6 +16,7 @@
 #include "data.h"
 #include "tao/DynamicAny/DynamicAny.h"
 #include "analyzer.h"
+#include "ace/OS_NS_string.h"
 
 Test_DynEnum::Test_DynEnum (CORBA::ORB_var orb, int debug)
   : orb_ (orb),
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 9014e60d60e..57f58e40bc4 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -17,6 +17,7 @@
 #include "data.h"
 #include "tao/DynamicAny/DynamicAny.h"
 #include "analyzer.h"
+#include "ace/OS_NS_string.h"
 
 Test_DynSequence::Test_DynSequence (CORBA::ORB_var orb, int debug)
   : orb_ (orb),
@@ -72,11 +73,13 @@ Test_DynSequence::run_test (void)
                             -1);
         }
 
-      DynAnyAnalyzer analyzer(this->orb_.in(), dynany_factory.in(), debug_);
+      DynAnyAnalyzer analyzer (this->orb_.in (),
+                               dynany_factory.in (),
+                               debug_);
 
       DynAnyTests::SeqShort shortseq1;
 
-      shortseq1.length(2);
+      shortseq1.length (2);
       shortseq1[0] = 2;
       shortseq1[1] = -2;
 
@@ -84,14 +87,14 @@ Test_DynSequence::run_test (void)
       any <<= shortseq1;
 
       DynamicAny::DynAny_var shortdany =
-        dynany_factory->create_dyn_any(any ACE_ENV_ARG_PARAMETER);
+        dynany_factory->create_dyn_any (any ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      analyzer.analyze(shortdany.in() ACE_ENV_ARG_PARAMETER);
+      analyzer.analyze(shortdany.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any_var any3;
-      any3 = shortdany->to_any(ACE_ENV_SINGLE_ARG_PARAMETER);
+      any3 = shortdany->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ts[0] = data.m_string2;
@@ -117,7 +120,8 @@ Test_DynSequence::run_test (void)
       fa1->seek (1
                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::String_var out_str1 = fa1->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var out_str1 =
+        fa1->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!ACE_OS::strcmp (out_str1.in (), data.m_string1))
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 57972b2391f..c5d5d9780e8 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -17,6 +17,7 @@
 #include "data.h"
 #include "tao/DynamicAny/DynamicAny.h"
 #include "analyzer.h"
+#include "ace/OS_NS_string.h"
 
 Test_DynStruct::Test_DynStruct (CORBA::ORB_var orb, int debug)
   : orb_ (orb),
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index a54cdb75d59..3de76b969e0 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -15,6 +15,7 @@
 #include "data.h"
 #include "tao/DynamicAny/DynamicAny.h"
 #include "analyzer.h"
+#include "ace/OS_NS_string.h"
 
 Test_DynUnion::Test_DynUnion (CORBA::ORB_var orb, int debug)
   : orb_ (orb),
diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
index 2dce3887a98..8857a176fa1 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     timeC.cpp
     client.cpp
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index 68dd909d017..567ebe4814b 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -16,6 +16,7 @@
 #include "tao/RTCORBA/RT_ORB.h"
 
 #include "tao/ORB_Constants.h"
+#include "tao/ORB_Core.h"
 
 ACE_RCSID (tao, Policy_Tester, "$Id$")
 
@@ -176,7 +177,8 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
     TAO_Protocol_Properties_Factory::create_orb_protocol_property (IOP::TAG_INTERNET_IOP);
 
   protocol_list[0].transport_protocol_properties =
-    TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::TAG_INTERNET_IOP);
+    TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::TAG_INTERNET_IOP,
+                                                                         this->orb_->orb_core ());
 
   poa_policy_list[2] =
     this->rt_orb_->create_client_protocol_policy (protocol_list);
diff --git a/TAO/tests/FL_Cube/FL_Cube.mpc b/TAO/tests/FL_Cube/FL_Cube.mpc
index e758da35d68..87c8e137dad 100644
--- a/TAO/tests/FL_Cube/FL_Cube.mpc
+++ b/TAO/tests/FL_Cube/FL_Cube.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver, strategies {
+project(*client) : taoexe, portableserver, tao_flresource {
   source_files {
     client.cpp
   }
 }
 
-project(*server) : taoexe, portableserver, strategies {
+project(*server) : taoexe, portableserver, tao_flresource {
   source_files {
     server.cpp
     test_i.cpp
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index d0c07a5748e..3d6b5a7abdf 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -1,22 +1,10 @@
 // $Id$
-
+#include "tao/FlResource_Loader.h"
 #include "testC.h"
 #include "ace/Get_Opt.h"
-#include "tao/Strategies/advanced_resource.h"
 
 ACE_RCSID(FL_Cube, client, "$Id$")
 
-#if !defined (ACE_HAS_FL)
-
-int main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "FL not supported on this platform\n"));
-  return 0;
-}
-
-#else
-
 #include <FL/Fl.h>
 #include <FL/Fl_Window.h>
 #include <FL/Fl_Roller.h>
@@ -65,6 +53,8 @@ private:
 
 int main (int argc, char* argv[])
 {
+  TAO::FlResource_Loader fl_loader;
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
@@ -132,14 +122,14 @@ Client::show (void)
 void
 Client::x_cb (Fl_Widget*, void* cookie)
 {
-  Client *self = ACE_static_cast(Client*,cookie);
+  Client *self = static_cast<Client*> (cookie);
   self->x_changed ();
 }
 
 void
 Client::y_cb (Fl_Widget*, void* cookie)
 {
-  Client *self = ACE_static_cast(Client*,cookie);
+  Client *self = static_cast<Client*> (cookie);
   self->y_changed ();
 }
 
@@ -207,4 +197,3 @@ Client::parse_args (int argc, char *argv[]
     Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index c7ec9047999..f3c3a235446 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -2,21 +2,10 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
-#include "tao/Strategies/advanced_resource.h"
+#include "tao/FlResource_Loader.h"
 
 ACE_RCSID(FL_Cube, server, "$Id$")
 
-#if !defined (ACE_HAS_FL)
-
-int main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "FL not supported on this platform\n"));
-  return 0;
-}
-
-#else
-
 #include <FL/Fl.h>
 
 const char *ior_output_file = 0;
@@ -51,6 +40,7 @@ int
 main (int argc, char *argv[])
 {
   Fl_Window window(300, 300);
+  TAO::FlResource_Loader fl_loader;
 
   Simple_Window sw (10, 10,
                     window.w () - 20, window.h () - 20);
@@ -131,4 +121,3 @@ main (int argc, char *argv[])
   return 0;
 }
 
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/svc.conf b/TAO/tests/FL_Cube/svc.conf
deleted file mode 100644
index f7d75c036eb..00000000000
--- a/TAO/tests/FL_Cube/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorType fl"
diff --git a/TAO/tests/FL_Cube/svc.conf.xml b/TAO/tests/FL_Cube/svc.conf.xml
deleted file mode 100644
index a640e1362e3..00000000000
--- a/TAO/tests/FL_Cube/svc.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/FL_Cube/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorType fl"/>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index 6fd545c5917..55e557c3341 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -1,14 +1,8 @@
 // $Id$
 
 #include "test_i.h"
-
-#if defined(ACE_HAS_FL)
 #include <GL/gl.h>
 
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(FL_Cube, test_i, "$Id$")
 
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
@@ -181,4 +175,3 @@ Simple_Window::draw_cube (void)
     glEnd();
 }
 
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
index e65bdd92e94..b2573fa173f 100644
--- a/TAO/tests/FL_Cube/test_i.h
+++ b/TAO/tests/FL_Cube/test_i.h
@@ -18,8 +18,6 @@
 
 #include "testS.h"
 
-#if defined(ACE_HAS_FL)
-
 #include <FL/Fl_Gl_Window.h>
 
 
@@ -79,10 +77,4 @@ private:
   // Display the graphics...
 };
 
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_FL */
-
 #endif /* TAO_FL_SERVER_TEST_I_H */
diff --git a/TAO/tests/FL_Cube/test_i.i b/TAO/tests/FL_Cube/test_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/FL_Cube/test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index c6ee9361ee3..39a1709e261 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, iortable {
+project(*Server): taoserver, iortable {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Forwarding/run_test.pl b/TAO/tests/Forwarding/run_test.pl
index eb80a33fb00..69d94eedb7a 100755
--- a/TAO/tests/Forwarding/run_test.pl
+++ b/TAO/tests/Forwarding/run_test.pl
@@ -21,7 +21,8 @@ $CL2 = new PerlACE::Process ("client", "-x -i 100 -k corbaloc::localhost:$port/S
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc
index b4ec43ea676..fb097f0edbe 100644
--- a/TAO/tests/Hello/Hello.mpc
+++ b/TAO/tests/Hello/Hello.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   idlflags += -GA
 
   Source_Files {
@@ -10,7 +10,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   idlflags += -GA
 
   Source_Files {
diff --git a/TAO/tests/Hello/run_test.pl b/TAO/tests/Hello/run_test.pl
index 69805391354..8c0d02aecd2 100755
--- a/TAO/tests/Hello/run_test.pl
+++ b/TAO/tests/Hello/run_test.pl
@@ -17,7 +17,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/ICMG_Any_Bug/run_test.pl b/TAO/tests/ICMG_Any_Bug/run_test.pl
index 69805391354..8c0d02aecd2 100755
--- a/TAO/tests/ICMG_Any_Bug/run_test.pl
+++ b/TAO/tests/ICMG_Any_Bug/run_test.pl
@@ -17,7 +17,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index 1a82229ee8f..e135d7f7ff0 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -6,73 +6,14 @@ project(*Main): taoserver, messaging {
   
   idlflags += -GC -GH -Gd -GA
 
+  IDL_Files {
+    *.idl
+  }
+  
   Source_Files {
-    anonymousC.cpp
-    anonymousS.cpp
-    anonymousA.cpp
-    arrayC.cpp
-    arrayS.cpp
-    arrayA.cpp
-    constantsC.cpp
-    constantsS.cpp
-    constantsA.cpp
-    enum_in_structC.cpp
-    enum_in_structS.cpp
-    enum_in_structA.cpp
-    fullC.cpp
-    fullS.cpp
-    fullA.cpp
-    fwdC.cpp
-    fwdS.cpp
-    fwdA.cpp
-    generic_objectC.cpp
-    generic_objectS.cpp
-    generic_objectA.cpp
-    gperfC.cpp
-    gperfS.cpp
-    gperfA.cpp
-    includedC.cpp
-    includedS.cpp
-    includedA.cpp
-    includingC.cpp
-    includingS.cpp
-    includingA.cpp
-    interfaceC.cpp
-    interfaceS.cpp
-    interfaceA.cpp
-    keywordsC.cpp
-    keywordsS.cpp
-    keywordsA.cpp
-    nested_scopeC.cpp
-    nested_scopeS.cpp
-    nested_scopeA.cpp
-    paramsC.cpp
-    paramsS.cpp
-    paramsA.cpp
-    pragmaC.cpp
-    pragmaS.cpp
-    pragmaA.cpp
-    reopened_modulesC.cpp
-    reopened_modulesS.cpp
-    reopened_modulesA.cpp
-    reopen_include1C.cpp
-    reopen_include1S.cpp
-    reopen_include1A.cpp
-    reopen_include2C.cpp
-    reopen_include2S.cpp
-    reopen_include2A.cpp
-    repo_id_modC.cpp
-    repo_id_modS.cpp
-    repo_id_modA.cpp
-    sequenceC.cpp
-    sequenceS.cpp
-    sequenceA.cpp
-    typedefC.cpp
-    typedefS.cpp
-    typedefA.cpp
-    unionC.cpp
-    unionS.cpp
-    unionA.cpp
     main.cpp
+    *C.cpp
+    *S.cpp
+    *A.cpp
   }
 }
diff --git a/TAO/tests/IDL_Test/array.idl b/TAO/tests/IDL_Test/array.idl
index aa940776ec9..0fe126593b8 100644
--- a/TAO/tests/IDL_Test/array.idl
+++ b/TAO/tests/IDL_Test/array.idl
@@ -72,6 +72,14 @@ module ABCModule
 typedef octet oa1[22];
 typedef octet oa2[22];
 
+// Test generation of Arg_Traits specialization for identical
+// arrays.
+interface array_args
+{
+  void all_arrays (in oa1 arg1,
+                   in oa2 arg2);
+};
+
 // This should generate unique _var and _forany types, but
 // also generate TAO_String_Manager as the element type for both.
 module string_array
@@ -81,3 +89,21 @@ module string_array
   typedef MyString ArrayOfMyString[15];
 };
 
+// Checks code generation for arrays and typedefs of arrays
+// when they are not declared globally or inside a module.
+interface testdata 
+{
+  typedef char Arraychar[2];
+  typedef Arraychar ArrayDeChar;
+
+  struct struct2 
+  {
+    Arraychar field_1;
+    ArrayDeChar field_2;
+  };
+
+  typedef sequence<Arraychar> ArraycharList;
+
+  typedef sequence<ArrayDeChar> ArrayDeCharList;
+};
+
diff --git a/TAO/tests/IDL_Test/fwd.idl b/TAO/tests/IDL_Test/fwd.idl
index c5fce5de4b5..bdf5bc6dec1 100644
--- a/TAO/tests/IDL_Test/fwd.idl
+++ b/TAO/tests/IDL_Test/fwd.idl
@@ -40,6 +40,13 @@ module mod2
 
   interface fwd;
   
+  exception exp
+  {
+    fwd fwd_mem;
+  };
+  
+  typedef fwd td_fwd;
+  
   interface full
   {
     fwd op (in fwd inarg,
diff --git a/TAO/tests/IDL_Test/interface.idl b/TAO/tests/IDL_Test/interface.idl
index e6f16306365..28e428251be 100644
--- a/TAO/tests/IDL_Test/interface.idl
+++ b/TAO/tests/IDL_Test/interface.idl
@@ -120,16 +120,48 @@ interface Client
   attribute End::Value v;
 };
 
-/*
- * Illegal recursion.
- * One day I'll add a mechanism to check for illegal IDL
- * files as well as legal ones.
- 
-interface Test
+// Tests arg_traits visitor for unaliased bounded (w)string
+// attributes.
+interface AttributeTester
+{
+  attribute string a_su;
+  attribute string<1> a_sb;
+};
+
+// All of the 'recursion' below is legal.
+module ParamMod
 {
-  struct TestInfo
+  interface ParameterTester
   {
-    Test atest;
+    exception object_excep_type
+    {
+      ParameterTester objref;
+    };
+  
+    typedef sequence<ParameterTester> object_seq_type;
+    
+    typedef ParameterTester object_array_type[5];
+
+    struct object_struct_type 
+    {
+      octet o1;
+      ParameterTester p1;
+      long l1;        
+    };
+    
+    union object_union_type switch (long)
+    {
+      case 0: string str;
+      case 1: ParameterTester pt;
+    };
+    
+    object_seq_type parameter_tester_op (
+        in object_struct_type inarg,
+        inout object_array_type inoutarg,
+        out object_union_type outarg
+      )
+      raises (object_excep_type); 
   };
 };
-*/
+
+ 
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index f9c641c873d..4f0e8cb4799 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -18,10 +18,13 @@
 //
 // ============================================================================
 
-#include "ace/Log_Msg.h"
 #include "pragmaS.h"
 #include "unionC.h"
 #include "repo_id_modC.h"
+
+#include "nested_scopeS.h"
+
+#include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
 class hello_i : public virtual POA_hello
@@ -76,6 +79,10 @@ class schmegegging_i : public virtual gleep::schmegegging
 {
 };
 
+struct something_handler : POA_bug_1985_c::d::AMI_somethingHandler
+{
+};
+
 int
 main (int argc , char *argv[])
 {
@@ -247,6 +254,55 @@ main (int argc , char *argv[])
                       "pragma prefix error in object 'schmegegging'\n"));
         }
 
+      {
+        something_handler x;
+        char const * base[] =
+        {
+          "IDL:bug_1985_c/d/AMI_somethingHandler:1.0",
+          "IDL:bug_1985_a/b/AMI_somethingHandler:1.0",
+          "IDL:omg.org/Messaging/ReplyHandler:1.0",
+          "IDL:omg.org/CORBA/Object:1.0"
+        };
+        
+        for (int i = 0; i != sizeof (base)/sizeof (base[0]); ++i)
+          {
+            if (!x._is_a (base[i]))
+              {
+                ++error_count;
+                ACE_DEBUG ((LM_DEBUG,
+                           "something_handler::_is_a should return true for %s\n",
+                           base[i]));                               
+              }
+          }
+
+        if (x._downcast (base[0])
+            != static_cast<POA_bug_1985_c::d::AMI_somethingHandler*> (&x))
+          {
+            ++error_count;
+            ACE_DEBUG( (LM_DEBUG,
+                       "mismatch in downcast for %s\n", 
+                        base[0]));
+          }
+          
+        if (x._downcast (base[1])
+            != static_cast<POA_bug_1985_a::b::AMI_somethingHandler*> (&x))
+          {
+            ++error_count;
+            ACE_DEBUG ((LM_DEBUG,
+                       "mismatch in downcast for %s\n", 
+                       base[0]));
+          }
+          
+        if (x._downcast (base[2])
+            != static_cast<POA_Messaging::ReplyHandler*> (&x))
+          {
+            ++error_count;
+            ACE_DEBUG ((LM_DEBUG,
+                       "mismatch in downcast for %s\n", 
+                       base[2]));
+          }
+      }
+
       // Testing (de)marshaling of IDL union values 
       // under duplicate and default case labels.
 
diff --git a/TAO/tests/IDL_Test/nested_scope.idl b/TAO/tests/IDL_Test/nested_scope.idl
index 88ee194b743..a0ff0ed746f 100644
--- a/TAO/tests/IDL_Test/nested_scope.idl
+++ b/TAO/tests/IDL_Test/nested_scope.idl
@@ -123,9 +123,24 @@ module obj_b_skip
   };
 };
 
+module bug_1985_a
+{
+  module b
+  {
+    interface something {};
+  };
+};
+
+module bug_1985_c
+{
+  module d
+  {
+    interface something : bug_1985_a::b::something {};
+  };
+};
+
 // This one caused several problems - in the stub declaration of
-// the operation, in the skeleton body's allocation of return type,
-// and in the generated code for the ancestor in _tao_QueryInterface().
+// the operation, and in the skeleton body's allocation of return type.
 module Negotiator
 { 
   interface UAV_Negotiator {};
@@ -136,4 +151,3 @@ module Negotiator
   };
 };
 
-
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index 0a3712366e6..29313aad9b1 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -12,6 +12,7 @@
 //=========================================================================
 
 
+#include "ace/Log_Msg.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
diff --git a/TAO/tests/MProfile_Connection_Timeout/run_test.pl b/TAO/tests/MProfile_Connection_Timeout/run_test.pl
index a34ece80af2..1788e40cc57 100755
--- a/TAO/tests/MProfile_Connection_Timeout/run_test.pl
+++ b/TAO/tests/MProfile_Connection_Timeout/run_test.pl
@@ -22,14 +22,16 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile1 -m file://$iorfile2"
 
 $SV1->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile1, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile1,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile1>\n";
     $SV1->Kill (); $SV1->TimedWait (1);
     exit 1;
 } 
 
 $SV2->Spawn ();
-if (PerlACE::waitforfile_timed ($iorfile2, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile2,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile2>\n";
     $SV2->Kill (); $SV2->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index 89e223c7cd9..7336bc42523 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -1,7 +1,10 @@
 //$Id$
-#include "ace/Get_Opt.h"
 #include "Manager.h"
+
 #include "tao/IORManipulation/IORManip_Loader.h"
+
+#include "ace/SString.h"
+#include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
 const char *first_ior = 0;
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index 751c637e9d3..24208035c60 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
 
       if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
         {
-          ACE_ERROR ((LM_ERROR, "Error activating server task\n"));
+          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
         }
 
       ACE_Thread_Manager::instance ()->wait ();
diff --git a/TAO/tests/MT_Server/run_test.pl b/TAO/tests/MT_Server/run_test.pl
index 4555d61fbe7..39937f4a0c6 100755
--- a/TAO/tests/MT_Server/run_test.pl
+++ b/TAO/tests/MT_Server/run_test.pl
@@ -23,7 +23,8 @@ $CLS = new PerlACE::Process ("client", "-k file://$iorfile -i 100 -x ");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index 587484ef5c0..71d75c1743c 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver {
+project(*Server): messaging, taoserver {
   Source_Files {
     Sleep_Service.cpp
     Server_Task.cpp
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index 1aa0bb6c352..2584e88308f 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   idlflags += -Gd
 
   Source_Files {
diff --git a/TAO/tests/Multiple/run_test.pl b/TAO/tests/Multiple/run_test.pl
index fca870955df..098a13bb93b 100755
--- a/TAO/tests/Multiple/run_test.pl
+++ b/TAO/tests/Multiple/run_test.pl
@@ -28,7 +28,8 @@ $CL = new PerlACE::Process ("client");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
@@ -53,7 +54,8 @@ $SV->Arguments ($direct_colloc);
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
@@ -78,7 +80,8 @@ $SV->Arguments ($no_colloc);
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index 640bef08880..e0ef7310b31 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     Multiple_InheritanceC.cpp
     client.cpp
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
index 6307a6f623a..a585f7ec595 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Muxed_GIOP_Versions/run_test.pl b/TAO/tests/Muxed_GIOP_Versions/run_test.pl
index 83f6e098654..21ba72cf028 100755
--- a/TAO/tests/Muxed_GIOP_Versions/run_test.pl
+++ b/TAO/tests/Muxed_GIOP_Versions/run_test.pl
@@ -22,6 +22,7 @@ unlink $logfile;
 # most effective is $serveriterations=1000 (with or without clients)
 $verbose = 1;
 $serverthreads = '10';
+$selfabusethreads = '5';
 $clientthreads = '5';
 $serveriterations = 1000;
 $clientiterations = 1000;
@@ -33,7 +34,10 @@ $corbaloc_str = "corbaloc:iiop:1.0\@$TARGETHOSTNAME:$orb_port/SomeObjectNameThat
 
 # ORBDebugLevel 10 seems to encourage the problem
 # -ORBCollocation no  is required for server to produce the problem
-$serverargs = "-ORBCollocation no -ORBdebuglevel 10 -ORBLogFile $logfile -ORBEndpoint iiop://$TARGETHOSTNAME:$orb_port -o $iorfile -i $serveriterations -n $serverthreads -l $corbaloc_str";
+$serverargs = "-ORBCollocation no -ORBdebuglevel 10 -ORBLogFile $logfile " .
+              "-ORBEndpoint iiop://$TARGETHOSTNAME:$orb_port -o $iorfile " .
+              "-i $serveriterations -n $serverthreads -c $selfabusethreads " .
+              "-l $corbaloc_str";
 
 $SV = new PerlACE::Process ("server", $serverargs);
 
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 17ca2104e68..e911f5aa83c 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -12,16 +12,21 @@ const char *corbaloc_arg = "corbaloc:iiop:1.0@localhost:12000/ObjectName";
 int niterations = 5;
 
 int nthreads = 4;
+int nclient_threads = nthreads;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "l:i:o:n:");
+  ACE_Get_Opt get_opts (argc, argv, "c:l:i:o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
+      case 'c':
+        nclient_threads = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
       case 'l':
         corbaloc_arg = get_opts.opt_arg ();
         break;
@@ -42,7 +47,11 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-                           "-o <iorfile>"
+                           "-c <# client threads> "
+                           "-i <# iterations> "
+                           "-l <corba loc> "
+                           "-n <# server threads> "
+                           "-o <iorfile> "
                            "\n",
                            argv [0]),
                           -1);
@@ -181,7 +190,7 @@ main (int argc, char *argv[])
 
       SelfClient selfabuse (orb.in(), server.in(), niterations);
       if (selfabuse.activate (THR_NEW_LWP | THR_JOINABLE,
-                              nthreads) != 0)
+                              nclient_threads) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Cannot activate abusive threads\n"),
                           1);
@@ -217,7 +226,7 @@ Worker::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      ACE_Time_Value tv (120, 0);
+      ACE_Time_Value tv (140, 0);
       this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index 47645f0b7c5..cc83753659f 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Receiver.cpp
     Server_Task.cpp
@@ -9,8 +9,9 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe, portableserver {
+project(*Client): taoclient {
   Source_Files {
+    TestC.cpp
     Client_Task.cpp
     client.cpp
   }
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index a1a5c4adc6f..361f727f0e8 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   idlflags  = -Ge 0 -Sc
   requires += exceptions
 
@@ -11,7 +11,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   idlflags  = -Ge 0 -Sc
   requires += exceptions
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
index dae79cf8525..6319ee86fc5 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
@@ -1,5 +1,4 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources tss"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
 dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml
index 7092b7ede25..e68a5b8e8ff 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml
@@ -3,7 +3,6 @@
 <ACE_Svc_Conf>
  <!--  $Id$ -->
  <!--  -->
- <static id="Resource_Factory" params="-ORBresources tss"/>
  <dynamic id="Client_Strategy_Factory" type="Service_Object">
    <initializer path="TAO" init="_make_TAO_Default_Client_Strategy_Factory"/>
  </dynamic>
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index 5edb6d5ab70..ca435d5b72b 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -206,7 +206,7 @@ MT_Client::init (int argc, char **argv,
   ACE_TRY
     {
       char buf[64];
-      ACE_OS::sprintf (buf, "thread_%lx", ACE_reinterpret_cast (long, this));
+      ACE_OS::sprintf (buf, "thread_%lx", reinterpret_cast<long> (this));
 
       this->orb_var_ =
         CORBA::ORB_init (this->argc_,
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
index a75bf048920..a4b04ac467b 100755
--- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
@@ -23,14 +23,16 @@ $CL = new PerlACE::Process ("client", "-f $ior1file -g $ior2file -n 2 -i 10 -s 5
 $SV1->Spawn ();
 $SV2->Spawn ();
 
-if (PerlACE::waitforfile_timed ($ior1file, 5) == -1) {
+if (PerlACE::waitforfile_timed ($ior1file,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$ior1file>\n";
     $SV1->Kill ();
     $SV2->Kill ();
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($ior2file, 5) == -1) {
+if (PerlACE::waitforfile_timed ($ior2file,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$ior2file>\n";
     $SV1->Kill ();
     $SV2->Kill ();
diff --git a/TAO/tests/NestedUpcall/Simple/run_test.pl b/TAO/tests/NestedUpcall/Simple/run_test.pl
index 752055602e4..277d5028c81 100755
--- a/TAO/tests/NestedUpcall/Simple/run_test.pl
+++ b/TAO/tests/NestedUpcall/Simple/run_test.pl
@@ -20,7 +20,8 @@ print STDERR "\nrunning ST version of the client and the server\n\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
@@ -49,7 +50,8 @@ print STDERR "\nrunning MT version of the client and the server\n\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 59b29310415..f9f3763ca91 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -63,7 +63,7 @@ write_ior_to_file (const char *ior)
                             "%s",
                             ior);
   if (result < 0 ||
-      ACE_static_cast (size_t, result) != ACE_OS::strlen (ior))
+      static_cast<size_t> (result) != ACE_OS::strlen (ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
                        ior,
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
index 27a7e0c54ce..8bc5f340701 100755
--- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
@@ -31,7 +31,8 @@ if (PerlACE::waitforfile_timed ($ior1file, 15) == -1) {
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($ior2file, 5) == -1) {
+if (PerlACE::waitforfile_timed ($ior2file,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$ior2file>\n";
     $SV2->Kill (); 
     $SV1->Kill (); 
diff --git a/TAO/tests/Nested_Upcall_Crash/run_test.pl b/TAO/tests/Nested_Upcall_Crash/run_test.pl
index dd8bc7a252c..bfacd98ebaf 100755
--- a/TAO/tests/Nested_Upcall_Crash/run_test.pl
+++ b/TAO/tests/Nested_Upcall_Crash/run_test.pl
@@ -18,7 +18,8 @@ $CL3 = new PerlACE::Process ("client", "-k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
index 6307a6f623a..a585f7ec595 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/No_Server_MT_Connect_Test/run_test.pl b/TAO/tests/No_Server_MT_Connect_Test/run_test.pl
index 63a35c8269c..73d5d40901e 100755
--- a/TAO/tests/No_Server_MT_Connect_Test/run_test.pl
+++ b/TAO/tests/No_Server_MT_Connect_Test/run_test.pl
@@ -22,7 +22,8 @@ $CL3 = new PerlACE::Process ("client", "-ORBSvcConf blocked$PerlACE::svcconf_ext
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/OBV/Any/run_test.pl b/TAO/tests/OBV/Any/run_test.pl
index 23ef1df6442..d30a337cc10 100755
--- a/TAO/tests/OBV/Any/run_test.pl
+++ b/TAO/tests/OBV/Any/run_test.pl
@@ -27,7 +27,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/OBV/Collocated/Forward/run_test.pl b/TAO/tests/OBV/Collocated/Forward/run_test.pl
index 611847eeafb..57532133504 100755
--- a/TAO/tests/OBV/Collocated/Forward/run_test.pl
+++ b/TAO/tests/OBV/Collocated/Forward/run_test.pl
@@ -15,7 +15,8 @@ $CO = new PerlACE::Process ("collocated");
 
 $CO->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/OBV/Factory/run_test.pl b/TAO/tests/OBV/Factory/run_test.pl
index 23ef1df6442..d30a337cc10 100755
--- a/TAO/tests/OBV/Factory/run_test.pl
+++ b/TAO/tests/OBV/Factory/run_test.pl
@@ -27,7 +27,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/OBV/Forward/run_test.pl b/TAO/tests/OBV/Forward/run_test.pl
index a74e7b5c8ba..34e9e56675d 100755
--- a/TAO/tests/OBV/Forward/run_test.pl
+++ b/TAO/tests/OBV/Forward/run_test.pl
@@ -16,7 +16,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/OBV/Supports/run_test.pl b/TAO/tests/OBV/Supports/run_test.pl
index 1e09ce96f6c..f871c5cfade 100755
--- a/TAO/tests/OBV/Supports/run_test.pl
+++ b/TAO/tests/OBV/Supports/run_test.pl
@@ -16,7 +16,8 @@ $CL1 = new PerlACE::Process ("client", " -t 16 -i 1");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/OBV/TC_Alignment/run_test.pl b/TAO/tests/OBV/TC_Alignment/run_test.pl
index c657b74f78d..6dbc4634718 100755
--- a/TAO/tests/OBV/TC_Alignment/run_test.pl
+++ b/TAO/tests/OBV/TC_Alignment/run_test.pl
@@ -41,7 +41,8 @@ $CL = new PerlACE::Process ("client", " -x $debug");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.mpc b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
index 8a0676872af..6cbfa60be64 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.mpc
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(ORB Shutdown Server): taoexe, portableserver {
+project(ORB Shutdown Server): taoserver {
   Source_Files {
     Foo_Bar.cpp
     server.cpp
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index 5795aa51e56..8a5b068bf7d 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.idl b/TAO/tests/ORT/ObjectReferenceFactory.idl
index c7243ea52c9..b4da79f1b83 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.idl
+++ b/TAO/tests/ORT/ObjectReferenceFactory.idl
@@ -14,7 +14,7 @@
 #ifndef OBJECT_REFERENCE_FACTORY_IDL
 #define OBJECT_REFERENCE_FACTORY_IDL
 
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
 
 module ORT_Test
 {
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index 792ccb496a4..73ae41e115f 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -3,10 +3,6 @@
 #include "Loader.h"
 #include "Test_i.h"
 
-#if !defined(__ACE_INLINE__)
-#include "Loader.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Object_Loader, Loader, "$Id$")
 
 Loader::Loader (void)
diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h
index 7451744993f..73b4c5708f4 100644
--- a/TAO/tests/Object_Loader/Loader.h
+++ b/TAO/tests/Object_Loader/Loader.h
@@ -38,10 +38,6 @@ public:
   // Create a new instance
 };
 
-#if defined(__ACE_INLINE__)
-#include "Loader.i"
-#endif /* __ACE_INLINE__ */
-
 // ACE_STATIC_SVC_DECLARE (Loader)
 ACE_FACTORY_DECLARE (OLT, Loader)
 
diff --git a/TAO/tests/Object_Loader/Loader.i b/TAO/tests/Object_Loader/Loader.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/Object_Loader/Loader.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index af7f919ab6c..6150714b0a5 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -2,10 +2,6 @@
 
 #include "Test_i.h"
 
-#if !defined(__ACE_INLINE__)
-#include "Test_i.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Object_Loader, Test_i, "$Id$")
 
 CORBA::Long
diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index 83adb188234..9d893017966 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -53,10 +53,6 @@ private:
   static CORBA::Long instance_count_;
 };
 
-#if defined(__ACE_INLINE__)
-#include "Test_i.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tests/Object_Loader/Test_i.i b/TAO/tests/Object_Loader/Test_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/Object_Loader/Test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index 086d31aaa06..4a4d62a720b 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Objref_Sequence_Test/run_test.pl b/TAO/tests/Objref_Sequence_Test/run_test.pl
index 6e5f50743eb..47ca2a0dba5 100755
--- a/TAO/tests/Objref_Sequence_Test/run_test.pl
+++ b/TAO/tests/Objref_Sequence_Test/run_test.pl
@@ -17,7 +17,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index 4fd3d478071..07b2083d7b1 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -128,13 +128,13 @@ run (char* buf, size_t bufsize,
       ACE_Time_Value wtv;
       writing.elapsed_time_incr (wtv);
       ACE_hrtime_t wusecs = wtv.sec ();
-      wusecs *= ACE_static_cast (ACE_UINT32, ACE_ONE_SECOND_IN_USECS);
+      wusecs *= static_cast<ACE_UINT32> (ACE_ONE_SECOND_IN_USECS);
       wusecs += wtv.usec ();
 
       ACE_Time_Value rtv;
       reading.elapsed_time_incr (rtv);
       ACE_hrtime_t rusecs = rtv.sec ();
-      rusecs *= ACE_static_cast (ACE_UINT32, ACE_ONE_SECOND_IN_USECS);
+      rusecs *= static_cast<ACE_UINT32> (ACE_ONE_SECOND_IN_USECS);
       rusecs += rtv.usec ();
 
       double write_average = ACE_U64_TO_U32(wusecs) / m;
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index e4193153e55..7df36753283 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index b7ca3e5baf4..b8163e4babf 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -133,8 +133,7 @@ main (int argc, char *argv[])
           ACE_TRY_CHECK;
 
           CORBA::ULong crc_local =
-            ACE::crc32 (ACE_reinterpret_cast (const char*,
-                                              elements[idx].get_buffer ()),
+            ACE::crc32 (elements[idx].get_buffer (),
                         elements[idx].length ());
 
           if (crc_local != crc_remote)
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index 37318a62f72..7e348c45627 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -27,8 +27,8 @@ Database_i::set (Test::Index i,
 
   returned_token = verification_token;
 
-  CORBA::ULong len = seq.length ();
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  CORBA::ULong len = seq.length ();
   // CORBA::ULong max = seq.maximum ();
   ACE_Message_Block *mb = seq.mb ();
   if (mb == 0)
@@ -68,8 +68,7 @@ Database_i::get_crc (Test::Index i
   if (i >= this->max_range_)
     ACE_THROW_RETURN (Test::OutOfRange (0, this->max_range_), 0);
 
-  return ACE::crc32 (ACE_reinterpret_cast (const char*,
-                                           this->elements_[i].get_buffer ()),
+  return ACE::crc32 (this->elements_[i].get_buffer (),
                      this->elements_[i].length ());
 }
 
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index 549b721fe4b..7aef588b5f2 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Server_Task.cpp
     Sender_i.cpp
diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index c31411e2720..cc25f6679b9 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -19,6 +19,7 @@
 //=========================================================================
 
 #include "tao/ORB.h"
+#include "tao/Any.h"
 #include "tao/PortableServer/PortableServer.h"
 
 #include "ace/Log_Msg.h"
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index c910bfcf0f2..b2ee727d323 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -114,7 +114,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
                                "unexpected (but known) user exception\n");
 
           // Since 'BadBoy' is not in the exception list the DII request,
-          // it should not be caught explicityly. See comment below.
+          // it should not be caught explicitly. See comment below.
           this->inout_ = this->in_ * 5;
           this->out_ = this->in_ * 5;
           this->ret_ = this->in_ * 5;
diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp
index ec3e09b5843..2ac0910f5a1 100644
--- a/TAO/tests/Param_Test/helper.cpp
+++ b/TAO/tests/Param_Test/helper.cpp
@@ -127,4 +127,6 @@ Generator::gen_step (void)
 template class ACE_Singleton<Generator, TAO_SYNCH_RECURSIVE_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<Generator, TAO_SYNCH_RECURSIVE_MUTEX>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Generator, ACE_Recursive_Thread_Mutex> *ACE_Singleton<Generator, ACE_Recursive_Thread_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index 35c42360b78..a17d065686d 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -246,4 +246,6 @@ Options::shutdown (void) const
 template class ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Options, ACE_Recursive_Thread_Mutex> *ACE_Singleton<Options, ACE_Recursive_Thread_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index d1065cb4f29..81a771b66ea 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -48,7 +48,7 @@ Test_Small_Union::opname (void) const
 
 void
 Test_Small_Union::dii_req_invoke (CORBA::Request *req
-                                ACE_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -78,7 +78,7 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Small_Union::init_parameters (Param_Test_ptr objref
-                                 ACE_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index ac76f622273..c6bfc107291 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -304,10 +304,10 @@ Manipulation::svc (void)
     {
 #ifndef ACE_LACKS_LONGLONG_T
       ACE_RANDR_TYPE seed =
-        ACE_static_cast (ACE_RANDR_TYPE, ACE_OS::gethrtime ());
+        static_cast<ACE_RANDR_TYPE> (ACE_OS::gethrtime ());
 #else
       ACE_RANDR_TYPE seed =
-        ACE_static_cast (ACE_RANDR_TYPE, ACE_OS::gethrtime().lo());
+        static_cast<ACE_RANDR_TYPE> (ACE_OS::gethrtime().lo());
 #endif
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("ORBPolicyManager"
diff --git a/TAO/tests/Portable_Interceptors/AMI/run_test.pl b/TAO/tests/Portable_Interceptors/AMI/run_test.pl
index fe0704ff75f..02041ea0c25 100755
--- a/TAO/tests/Portable_Interceptors/AMI/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/AMI/run_test.pl
@@ -17,7 +17,8 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index e86d9770f89..388a6668a6a 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -172,12 +172,12 @@ main (int argc, char *argv[])
       if (ACE_OS::last_error () == EPERM)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
+                      "client (%P|%t): user is not superuser, "
                       "test runs in time-shared class\n"));
         }
       else
         ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
+                    "client (%P|%t): sched_params failed\n"));
     }
 
   int interceptor_type;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
index 79972dd7760..c13ec151450 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
@@ -66,7 +66,7 @@ Vault_Client_Request_Interceptor::send_request (
       CORBA::Octet *buf = 0;
       ACE_NEW (buf,
                CORBA::Octet [string_len]);
-      ACE_OS::strcpy (ACE_reinterpret_cast (char *, buf), passwd);
+      ACE_OS::strcpy (reinterpret_cast<char *> (buf), passwd);
 
       sc.context_data.replace (string_len, string_len, buf, 1);
 
@@ -199,8 +199,7 @@ Vault_Server_Request_Interceptor::receive_request (
       ACE_CHECK;
 
       const char *buf =
-        ACE_reinterpret_cast (const char *,
-                              sc->context_data.get_buffer ());
+        reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
       if (ACE_OS::strcmp (buf, "root123") != 0)
         ACE_THROW (CORBA::NO_PERMISSION ());
@@ -317,7 +316,7 @@ Vault_Client_Request_Context_Interceptor::send_request (
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  ACE_OS::strcpy (ACE_reinterpret_cast (char *, buf), passwd);
+  ACE_OS::strcpy (reinterpret_cast<char *> (buf), passwd);
 
   sc.context_data.replace (string_len, string_len, buf, 1);
 
@@ -420,8 +419,7 @@ Vault_Server_Request_Context_Interceptor::receive_request (
     ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf = ACE_reinterpret_cast (const char *,
-                                          sc->context_data.get_buffer ());
+  const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf, "root123") !=0)
     ACE_THROW (CORBA::NO_PERMISSION ());
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp
index 094f541345d..31573b915ec 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp
@@ -120,7 +120,7 @@ Echo_Client_Request_Interceptor::send_request (
 
       CORBA::ULong string_len = ACE_OS::strlen (request_msg) + 1;
       CORBA::Octet *buf = CORBA::OctetSeq::allocbuf (string_len);
-      ACE_OS::strcpy (ACE_reinterpret_cast (char *, buf), request_msg);
+      ACE_OS::strcpy (reinterpret_cast<char *> (buf), request_msg);
 
       sc.context_data.replace (string_len, string_len, buf, 1);
 
@@ -134,7 +134,7 @@ Echo_Client_Request_Interceptor::send_request (
       ACE_CHECK;
 
       const char *buf2 =
-        ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
+        reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
       if (ACE_OS::strcmp (buf2, request_msg) != 0)
         {
@@ -162,7 +162,7 @@ Echo_Client_Request_Interceptor::send_request (
 
       CORBA::ULong string_len = ACE_OS::strlen (forward_msg) + 1;
       CORBA::Octet *buf = CORBA::OctetSeq::allocbuf (string_len);
-      ACE_OS::strcpy (ACE_reinterpret_cast (char *, buf), forward_msg);
+      ACE_OS::strcpy (reinterpret_cast<char *> (buf), forward_msg);
 
       sc.context_data.replace (string_len, string_len, buf, 1);
       // Add this context to the service context list.
@@ -175,7 +175,7 @@ Echo_Client_Request_Interceptor::send_request (
       ACE_CHECK;
 
       const char *buf2 =
-        ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
+        reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
       if (ACE_OS::strcmp (buf2, forward_msg) != 0)
         {
@@ -240,7 +240,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   ACE_CHECK;
 
   const char *buf =
-    ACE_reinterpret_cast (const char *, sc->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
               "  Received reply service context: %s\n",
               buf));
@@ -258,7 +258,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   ACE_CHECK;
 
   const char *buf2 =
-    ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, forward_msg) != 0)
     {
@@ -309,7 +309,7 @@ Echo_Client_Request_Interceptor::receive_other (
   ACE_CHECK;
 
   const char *buf =
-    ACE_reinterpret_cast (const char *, sc->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf, request_msg) != 0)
     {
@@ -362,7 +362,7 @@ Echo_Client_Request_Interceptor::receive_exception (
   ACE_CHECK;
 
   const char *buf =
-    ACE_reinterpret_cast (const char *, sc->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
               "  Received reply service context: %s\n",
               buf));
@@ -380,7 +380,7 @@ Echo_Client_Request_Interceptor::receive_exception (
   ACE_CHECK;
 
   const char *buf2 =
-    ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, forward_msg) != 0)
     {
@@ -467,7 +467,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   ACE_CHECK;
 
   const char *buf =
-    ACE_reinterpret_cast (const char *, sc->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
               "  Received service context: %s\n",
               buf));
@@ -486,7 +486,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
       CORBA::ULong string_len = ACE_OS::strlen (reply_msg) + 1;
       CORBA::Octet *buff = CORBA::OctetSeq::allocbuf (string_len);
 
-      ACE_OS::strcpy (ACE_reinterpret_cast (char *, buff), reply_msg);
+      ACE_OS::strcpy (reinterpret_cast<char *> (buff), reply_msg);
 
       scc.context_data.replace (string_len, string_len, buff, 1);
 
@@ -535,8 +535,7 @@ Echo_Server_Request_Interceptor::send_reply (
     ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf = ACE_reinterpret_cast (const char *,
-                                          sc->context_data.get_buffer ());
+  const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
               "  Reply service context: %s\n",
               buf));
@@ -554,8 +553,7 @@ Echo_Server_Request_Interceptor::send_reply (
     ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf2 = ACE_reinterpret_cast (const char *,
-                                           sc2->context_data.get_buffer ());
+  const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, forward_msg) != 0)
     {
@@ -589,8 +587,7 @@ Echo_Server_Request_Interceptor::send_exception (
     ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf = ACE_reinterpret_cast (const char *,
-                                          sc->context_data.get_buffer ());
+  const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
               "  Reply service context: %s\n",
               buf));
@@ -608,8 +605,7 @@ Echo_Server_Request_Interceptor::send_exception (
     ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf2 = ACE_reinterpret_cast (const char *,
-                                           sc2->context_data.get_buffer ());
+  const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, forward_msg) != 0)
     {
@@ -642,8 +638,7 @@ Echo_Server_Request_Interceptor::send_other (
     ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf = ACE_reinterpret_cast (const char *,
-                                           sc->context_data.get_buffer ());
+  const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf, request_msg) != 0)
     {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index 89258c68b70..e475811792b 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -89,7 +89,7 @@ Echo_Client_Request_Interceptor::send_request (
 
   CORBA::ULong string_len = ACE_OS::strlen (request_msg) + 1;
   CORBA::Octet *buf = CORBA::OctetSeq::allocbuf (string_len);
-  ACE_OS::strcpy (ACE_reinterpret_cast (char *, buf), request_msg);
+  ACE_OS::strcpy (reinterpret_cast<char *> (buf), request_msg);
 
   sc.context_data.replace (string_len, string_len, buf, 1);
 
@@ -103,7 +103,7 @@ Echo_Client_Request_Interceptor::send_request (
   ACE_CHECK;
 
   const char *buf2 =
-    ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   ACE_UNUSED_ARG (buf2);
 
@@ -165,8 +165,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       ACE_TRY_CHECK;
 
       const char *buf =
-        ACE_reinterpret_cast (const char *,
-                              sc->context_data.get_buffer ());
+        reinterpret_cast<const char *> (sc->context_data.get_buffer ());
       ACE_DEBUG ((LM_DEBUG,
                   "Received reply service context: %s\n",
                   buf));
@@ -185,8 +184,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       ACE_TRY_CHECK;
 
       const char *buf2 =
-        ACE_reinterpret_cast (const char *,
-                              sc2->context_data.get_buffer ());
+        reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
       if (ACE_OS::strcmp (buf2, request_msg) != 0)
         {
@@ -262,8 +260,7 @@ Echo_Client_Request_Interceptor::receive_exception (
       ACE_TRY_CHECK;
 
       const char *buf =
-        ACE_reinterpret_cast (const char *,
-                              sc->context_data.get_buffer ());
+        reinterpret_cast<const char *> (sc->context_data.get_buffer ());
       ACE_DEBUG ((LM_DEBUG,
                   "Received reply service context: %s\n",
                   buf));
@@ -282,8 +279,7 @@ Echo_Client_Request_Interceptor::receive_exception (
       ACE_TRY_CHECK;
 
       const char *buf2 =
-        ACE_reinterpret_cast (const char *,
-                              sc2->context_data.get_buffer ());
+        reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
       if (ACE_OS::strcmp (buf2, request_msg) != 0)
         {
@@ -353,7 +349,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   ACE_CHECK;
 
   const char *buf =
-    ACE_reinterpret_cast (const char *, sc->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
               "  Received service context: %s\n",
               buf));
@@ -374,7 +370,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   CORBA::ULong string_len = ACE_OS::strlen (reply_msg) + 1;
   CORBA::Octet *buff = CORBA::OctetSeq::allocbuf (string_len);
 
-  ACE_OS::strcpy (ACE_reinterpret_cast (char *, buff), reply_msg);
+  ACE_OS::strcpy (reinterpret_cast<char *> (buff), reply_msg);
 
   scc.context_data.replace (string_len, string_len, buff, 1);
 
@@ -414,8 +410,7 @@ Echo_Server_Request_Interceptor::send_reply (
     ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf = ACE_reinterpret_cast (const char *,
-                                          sc->context_data.get_buffer ());
+  const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
               "  Reply service context: %s\n",
               buf));
@@ -433,8 +428,7 @@ Echo_Server_Request_Interceptor::send_reply (
     ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf2 = ACE_reinterpret_cast (const char *,
-                                           sc2->context_data.get_buffer ());
+  const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, request_msg) != 0)
     {
@@ -468,8 +462,7 @@ Echo_Server_Request_Interceptor::send_exception (
     ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf = ACE_reinterpret_cast (const char *,
-                                          sc->context_data.get_buffer ());
+  const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
               "  Reply service context: %s\n",
               buf));
@@ -487,8 +480,7 @@ Echo_Server_Request_Interceptor::send_exception (
     ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf2 = ACE_reinterpret_cast (const char *,
-                                           sc2->context_data.get_buffer ());
+  const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, request_msg) != 0)
     {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl
index fab6c404097..f0383244ded 100755
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl
@@ -8,6 +8,15 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
 
+print STDERR <<EOF;
+INFO: Do not expect this test to work until portable interceptors
+INFO: get invoked during thru_POA colocation optimizations.
+INFO:
+INFO: See http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=586
+INFO: for more information.
+
+EOF
+
 $iorfile = PerlACE::LocalFile ("test.ior");
 unlink $iorfile;
 $status = 0;
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 1709ef20e4e..16e97a00ad7 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
index bdf8cfdd3cc..c2231d58046 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -68,7 +68,7 @@ IORInterceptor::establish_components (
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "EXCEPTION: "
-                           "IORIntferceptor::establish_components:");
+                           "IORInterceptor::establish_components:");
 
       ACE_ASSERT (false);
     }
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
index 8e2ab5a206f..cb8ce431dd2 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORInterceptor/IORInterceptorC.h"
+#include "tao/IORInterceptor/IORInterceptor.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
index e6aa3b6525f..293fa885115 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
       // Sanity check.
       if (ptype != Test::POLICY_TYPE)
         ACE_TRY_THROW (CORBA::INTERNAL ());
-        
+
       Test::Policy_var policy (Test::Policy::_narrow (p.in ()
                                                       ACE_ENV_ARG_PARAMETER));
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
index 138d1ff9a69..1c2a792d0f7 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
@@ -93,7 +93,7 @@ Echo_Client_Request_Interceptor::send_request (
 
   CORBA::ULong string_len = ACE_OS::strlen (request_msg) + 1;
   CORBA::Octet *buf = CORBA::OctetSeq::allocbuf (string_len);
-  ACE_OS::strcpy (ACE_reinterpret_cast (char *, buf), request_msg);
+  ACE_OS::strcpy (reinterpret_cast<char *> (buf), request_msg);
 
   sc.context_data.replace (string_len, string_len, buf, 1);
 
@@ -107,7 +107,7 @@ Echo_Client_Request_Interceptor::send_request (
   ACE_CHECK;
 
   const char *buf2 =
-    ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, request_msg) != 0)
     {
@@ -167,7 +167,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   ACE_CHECK;
 
   const char *buf =
-    ACE_reinterpret_cast (const char *, sc->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 #if 0
   ACE_DEBUG ((LM_DEBUG,
               "  Received reply service context: %s\n",
@@ -187,7 +187,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   ACE_CHECK;
 
   const char *buf2 =
-    ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, request_msg) != 0)
     {
@@ -254,7 +254,7 @@ Echo_Client_Request_Interceptor::receive_exception (
   ACE_CHECK;
 
   const char *buf =
-    ACE_reinterpret_cast (const char *, sc->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -275,7 +275,7 @@ Echo_Client_Request_Interceptor::receive_exception (
   ACE_CHECK;
 
   const char *buf2 =
-    ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, request_msg) != 0)
     {
@@ -338,7 +338,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   ACE_CHECK;
 
   const char *buf =
-    ACE_reinterpret_cast (const char *, sc->context_data.get_buffer ());
+    reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 #if 0
   ACE_DEBUG ((LM_DEBUG,
               "  Received service context: %s\n",
@@ -361,7 +361,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   CORBA::ULong string_len = ACE_OS::strlen (reply_msg) + 1;
   CORBA::Octet *buff = CORBA::OctetSeq::allocbuf (string_len);
 
-  ACE_OS::strcpy (ACE_reinterpret_cast (char *, buff), reply_msg);
+  ACE_OS::strcpy (reinterpret_cast<char *> (buff), reply_msg);
 
   scc.context_data.replace (string_len, string_len, buff, 1);
 
@@ -403,8 +403,7 @@ Echo_Server_Request_Interceptor::send_reply (
     ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf = ACE_reinterpret_cast (const char *,
-                                          sc->context_data.get_buffer ());
+  const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -425,8 +424,7 @@ Echo_Server_Request_Interceptor::send_reply (
     ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf2 = ACE_reinterpret_cast (const char *,
-                                           sc2->context_data.get_buffer ());
+  const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, request_msg) != 0)
     {
@@ -462,8 +460,7 @@ Echo_Server_Request_Interceptor::send_exception (
     ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf = ACE_reinterpret_cast (const char *,
-                                          sc->context_data.get_buffer ());
+  const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -484,8 +481,7 @@ Echo_Server_Request_Interceptor::send_exception (
     ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  const char *buf2 = ACE_reinterpret_cast (const char *,
-                                           sc2->context_data.get_buffer ());
+  const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf2, request_msg) != 0)
     {
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index 1013e370e62..a134df67dd0 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, ace_qt, qt_moc {
-  requires += qt
+project(*server): taoexe, portableserver, tao_qtresource  {
 
   MOC_Files {
     test_i.h
@@ -15,8 +14,7 @@ project(*server): taoexe, portableserver, ace_qt, qt_moc {
   }
 }
 
-project(*client): taoexe, ace_qt, qt_moc {
-  requires += qt
+project(*client): taoexe, tao_qtresource {
 
   MOC_Files {
     client.h
diff --git a/TAO/tests/QtTests/README b/TAO/tests/QtTests/README
index f5becbeb352..29393ece1f1 100644
--- a/TAO/tests/QtTests/README
+++ b/TAO/tests/QtTests/README
@@ -20,6 +20,11 @@ library installed.  You should enable the build of the QtReactor by
 initializing qt_reactor. The path should point to the Qt/bin area so
 that the moc could be accessed by the Makefile.
 
+Bugs:
+It seems there is a problem with ORB shutdown, namely client does not
+shutdown nicely after QUIT button. Needs some additional investigations.
+
+
 ---------------------------------------------------------------------
 Technical Description:
 The technical details are similar to that of the XtReactor. Please
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index fc505726700..165651a0181 100755
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -2,27 +2,17 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "tao/QtResource_Loader.h"
 
 ACE_RCSID(QtTests, client, "$Id$")
 
-#if !defined (ACE_HAS_QT)
-
-int
-main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "Qt not supported on this platform\n"));
-  return 0;
-}
-
-#else
 #include "client.h"
 
 int
 main (int argc, char *argv[])
 {
   QApplication app (argc, argv);
-  TAO_QtResource_Factory::set_context (&app);
+  TAO::QtResource_Loader qt_resources (&app);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -167,4 +157,3 @@ Client::shutdown_call (void)
   this->server_->shutdown ();
 }
 
-#endif /* ACE_HAS_QT*/
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index 36da68ab1f9..e4b50c40a70 100755
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -18,9 +18,6 @@
 
 #include "testC.h"
 
-#if defined (ACE_HAS_QT)
-
-#include "tao/qt_resource.h"
 #include <qapplication.h>
 #include <qvbox.h>
 #include <qslider.h>
@@ -70,6 +67,4 @@ private:
   QApplication *qapp_;
 };
 
-#endif /*ACE_HAS_QT*/
-
 #endif /* _QT_CLIENT_H */
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 1103e4a3358..718c1947c7c 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -5,22 +5,11 @@
 
 ACE_RCSID (QtTests, server, "$Id$")
 
-#if !defined (ACE_HAS_QT)
-
-int
-main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "Qt not supported on this platform\n"));
-  return 0;
-}
-
-#else
 // who defines index macro?
 #ifdef index
 #undef index
 #endif
-#include "tao/qt_resource.h"
+#include "tao/QtResource_Loader.h"
 #include <qlcdnumber.h>
 #include <qvbox.h>
 #include <qslider.h>
@@ -44,12 +33,14 @@ parse_args (int argc, char *argv[])
 
       case '?':
       default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
+          // ignore the first unknown option
+          return 0;
+//         ACE_ERROR_RETURN ((LM_ERROR,
+//                            "usage:  %s "
+//                            "-o <iorfile>"
+//                            "\n",
+//                            argv [0]),
+//                           -1);
       }
   // Indicates sucessful parsing of the command line
   return 0;
@@ -64,7 +55,7 @@ main (int argc, char *argv[])
 
   // Qt specific stuff for running with TAO...
   QApplication app (argc, argv);
-  TAO_QtResource_Factory::set_context (&app);
+  TAO::QtResource_Loader qt_resources (&app);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -152,5 +143,3 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
   return 0;
 }
-
-#endif /* ACE_HAS_QT */
diff --git a/TAO/tests/QtTests/svc.conf b/TAO/tests/QtTests/svc.conf
deleted file mode 100644
index 7134e5e18a4..00000000000
--- a/TAO/tests/QtTests/svc.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# $Id$
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_QtResource_Factory() ""
diff --git a/TAO/tests/QtTests/svc.conf.xml b/TAO/tests/QtTests/svc.conf.xml
deleted file mode 100644
index ed38f288da0..00000000000
--- a/TAO/tests/QtTests/svc.conf.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/QtTests/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  -->
- <!--  $Id$ -->
- <!--  -->
- <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="TAO" init="_make_TAO_QtResource_Factory"/>
- </dynamic>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 8b5bae8c705..0d961989108 100755
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -2,13 +2,9 @@
 
 #include "test_i.h"
 
-#if defined(ACE_HAS_QT)
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(FL_Cube, test_i, "$Id$")
+ACE_RCSID( QtTests,
+           test_i,
+           "$Id$")
 
 LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
 
@@ -35,4 +31,4 @@ LCD_Display_imp::send_val (CORBA::Long val
               "The value from server is <%d> \n", val));
   emit set_value (val);
 }
-#endif /* ACE_HAS_QT */
+
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index 46eeb94d323..ac04d36afc9 100755
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -1,5 +1,4 @@
 // $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -18,10 +17,6 @@
 
 #include "testS.h"
 
-
-#if defined(ACE_HAS_QT)
-
-#include "tao/qt_resource.h"
 #include <qapplication.h>
 #include <qobject.h>
 
@@ -56,10 +51,4 @@ private:
   // The ORB
 };
 
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_QT */
-
 #endif /* SERVER_TEST_I_H */
diff --git a/TAO/tests/QtTests/test_i.i b/TAO/tests/QtTests/test_i.i
deleted file mode 100755
index cfa1da318d3..00000000000
--- a/TAO/tests/QtTests/test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 09e5222b5ae..6b4cc59125f 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -198,7 +198,7 @@ main (int argc, char *argv[])
         (protocol_type);
       protocols[0].transport_protocol_properties =
         TAO_Protocol_Properties_Factory::create_transport_protocol_property
-        (protocol_type);
+        (protocol_type, orb->orb_core ());
 
       CORBA::PolicyList poa_policy_list;
       poa_policy_list.length (1);
diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.i b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/RTCORBA/Diffserv/README b/TAO/tests/RTCORBA/Diffserv/README
index a72f2d7de4c..f1a80b25b34 100644
--- a/TAO/tests/RTCORBA/Diffserv/README
+++ b/TAO/tests/RTCORBA/Diffserv/README
@@ -1,6 +1,8 @@
 $Id$
 
-This is a unit test for setting DiffServ Codepoint both in the requests sent and the replies received. It also illustrates how a Custom Network Priority Mapping can be plugged in.
+This is a unit test for setting DiffServ Codepoint both in the
+requests sent and the replies received. It also illustrates how a
+Custom Network Priority Mapping can be plugged in.
 
 Scenario:
 --------
@@ -25,17 +27,16 @@ reference. Client then performs several invocations on the object.
 To run (on Unix): 
 -----------------
 
-$./server 
-$./client
+$ ./server -ORBdebuglevel 1 -p 20000
+$ ./client -ORBdebuglevel 1 -n 10 -p 10000 -k file://simple_servant.ior
+$ ./client -ORBdebuglevel 1 -n 10 -p 10000 -k file://diffserv_servant.ior
 
-Options:
---------
-
-server [-k ior_output_file2] [-o ior_output_file2] [-p corba_priority] [-s {test_server} ] [-c {test_client}]
-
-client [-k server_ior] [-n number_of_iterations] [-p corba_priority] [-s {test_server}] [-c {test_client}]
+Both client executions set diffserv codepoints on outbound
+packets. When the client invokes on the diffserv_servant, reply
+packets also have diffserv codepoints set on them.
 
-NOTE: The iterations have to be >=6 in order to test set/unset at the ORB, THREAD and OBJECT levels.
+NOTE: The iterations have to be >=6 in order to test set/unset at the
+ORB, THREAD and OBJECT levels.
 
 
 
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/README b/TAO/tests/RTCORBA/Persistent_IOR/README
index e1789a6b204..c5c2d19824d 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/README
+++ b/TAO/tests/RTCORBA/Persistent_IOR/README
@@ -8,7 +8,8 @@ This test makes sure that:
 -ORBEndpoint option.
 
 - Makes sure that if the user tries to combine thread pools and
-persistence, an InvalidPolicy exception is thrown.
+persistence, an InvalidPolicy exception is no longer thrown since this
+feature is now supported with the -ORBLaneEndpoint option.
 
 - Makes sure that for POAs using thread pools, the user can specify
 the protocol selection, protocol version, and other protocol specific
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl
index 40c25a52a47..08a8fed4db6 100755
--- a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl
+++ b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl
@@ -9,32 +9,37 @@ use lib '../../../../bin';
 use PerlACE::Run_Test;
 
 $iiop_port = 27532;
+$tp_iiop_port = 27533;
 
-$extra_server_args = "-d 1 -ORBobjrefstyle url -ORBEndpoint iiop://1.0\@:$iiop_port";
+$extra_server_args = "-d 1 -ORBobjrefstyle url -ORBEndpoint iiop://1.0\@:$iiop_port -ORBLaneEndpoint 2:0 iiop://1.0\@:$tp_iiop_port";
 
 @iorfiles = 
     (
+     "not_used_ior_1",
+     "not_used_ior_2",
      "persistent_ior",
      "transient_ior",
-     "not_used_ior",
+     "tp_persistent_ior",
      );
      
 @configurations = 
     (
      {
-         iorfiles => [ "persistent_ior", "transient_ior" ],
-         server => "-p persistent_ior -t transient_ior $extra_server_args", 
-         clients => [ "-k file://persistent_ior", "-k file://transient_ior -x" ],
+         iorfiles => [ "persistent_ior", "tp_persistent_ior", "transient_ior" ],
+         server => "-a tp_persistent_ior -p persistent_ior -t transient_ior $extra_server_args",
+         clients => [ "-k file://tp_persistent_ior", "-k file://persistent_ior", "-k file://transient_ior -x" ],
      },
      {
-         iorfiles => [ "persistent_ior", "transient_ior", "not_used_ior" ],
-         server => "-p not_used_ior -t transient_ior $extra_server_args", 
-         clients => [ "-k file://not_used_ior", "-k file://transient_ior -x" ],
+         iorfiles => [ "not_used_ior_1", "not_used_ior_2", "transient_ior" ],
+         server => "-a not_used_ior_1 -p not_used_ior_2 -t transient_ior $extra_server_args",
+         clients => [ "-k file://tp_persistent_ior", "-k file://persistent_ior", "-k file://transient_ior -x" ],
      },
      );
 
 sub run_client
 {
+    print "\nRunning client with the following args: @_\n\n";
+
     $CL = new PerlACE::Process ("client", @_);
 
     $CL->Spawn ();
@@ -55,6 +60,8 @@ sub run_server
     my $args = $parms[0];
     my $iorfiles = $parms[1];
 
+    print "\nRunning server with the following args: $args\n\n";
+
     $SV = new PerlACE::Process ("server", $args);
 
     $SV->Spawn ();
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index 2a81402f7ec..a56182609fd 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -63,6 +63,7 @@ test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 static const char *persistent_ior = "persistent_ior";
 static const char *transient_ior = "transient_ior";
+static const char *tp_persistent_ior = "tp_persistent_ior";
 static int debug = 0;
 
 static CORBA::ULong stacksize = 0;
@@ -76,12 +77,16 @@ static CORBA::ULong max_request_buffer_size = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:t:d:");
+  ACE_Get_Opt get_opts (argc, argv, "a:p:t:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
+      case 'a':
+        tp_persistent_ior = get_opts.opt_arg ();
+        break;
+
       case 'p':
         persistent_ior = get_opts.opt_arg ();
         break;
@@ -98,6 +103,7 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
+                           "-a <tp persistent ior file> "
                            "-p <persistent ior file> "
                            "-t <transient ior file> "
                            "-d <debug> "
@@ -127,7 +133,8 @@ write_iors_to_file (CORBA::Object_ptr object,
 
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
-                "%s\n",
+                "%s: %s\n",
+                filename,
                 ior.in ()));
 
   u_int result = 0;
@@ -261,67 +268,76 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
 }
 
 void
-create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb,
-                                          PortableServer::POA_ptr root_poa
+create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb,
+                                          RTCORBA::RTORB_ptr rt_orb,
+                                          PortableServer::POA_ptr root_poa,
+                                          PortableServer::POAManager_ptr poa_manager
                                           ACE_ENV_ARG_DECL)
 {
-  ACE_TRY
-    {
-      CORBA::PolicyList policies;
-
-      RTCORBA::ThreadpoolId threadpool_id =
-        rt_orb->create_threadpool (stacksize,
-                                   static_threads,
-                                   dynamic_threads,
-                                   default_thread_priority,
-                                   allow_request_buffering,
-                                   max_buffered_requests,
-                                   max_request_buffer_size
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  RTCORBA::ThreadpoolId threadpool_id =
+    rt_orb->create_threadpool (stacksize,
+                               static_threads,
+                               dynamic_threads,
+                               default_thread_priority,
+                               allow_request_buffering,
+                               max_buffered_requests,
+                               max_request_buffer_size
+                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-      CORBA::Policy_var threadpool_policy =
-        rt_orb->create_threadpool_policy (threadpool_id
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  CORBA::Policy_var threadpool_policy =
+    rt_orb->create_threadpool_policy (threadpool_id
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-      CORBA::Policy_var lifespan_policy =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+  CORBA::Policy_var implicit_activation_policy =
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-      policies.length (policies.length () + 1);
-      policies[policies.length () - 1] =
-        lifespan_policy;
+  CORBA::Policy_var lifespan_policy =
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
-      policies.length (policies.length () + 1);
-      policies[policies.length () - 1] =
-        threadpool_policy;
+  CORBA::PolicyList policies;
 
-      PortableServer::POA_var invalid_poa =
-        root_poa->create_POA ("invalid",
-                              PortableServer::POAManager::_nil (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    implicit_activation_policy;
 
-      // This next line of code should not run because an exception
-      // should have been raised.
-      ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n"));
-    }
-  ACE_CATCH (PortableServer::POA::InvalidPolicy, ex)
-    {
-      // Expected exception.
-      ACE_DEBUG ((LM_DEBUG,
-                  "InvalidPolicy exception is caught as expected.\n"));
-    }
-  ACE_CATCHANY
-    {
-      // Unexpected exception.
-      ACE_DEBUG ((LM_DEBUG, "ERROR: unexpected exception caught\n"));
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    threadpool_policy;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    lifespan_policy;
+
+  PortableServer::POA_var poa =
+    root_poa->create_POA ("tp_persistent_child",
+                          poa_manager,
+                          policies
+                          ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  test_i *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    test_i (orb,
+                            poa.in ()),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  PortableServer::ServantBase_var safe_servant (servant);
+
+  test_var test =
+    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  write_iors_to_file (test.in (),
+                      orb,
+                      tp_persistent_ior
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -393,8 +409,10 @@ main (int argc, char **argv)
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      create_poa_with_tp_and_persistent_policy (rt_orb.in (),
-                                                root_poa.in  ()
+      create_poa_with_tp_and_persistent_policy (orb.in (),
+                                                rt_orb.in (),
+                                                root_poa.in  (),
+                                                poa_manager.in ()
                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index a232f56b1af..ede4ee6c071 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -148,8 +148,8 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                             -1);
 
         // test the pointers...
-        if (ACE_reinterpret_cast (void *, larry_mutex1.in ())
-            != ACE_reinterpret_cast (void *, larry_mutex2.in ()))
+        if (reinterpret_cast<void *> (larry_mutex1.in ())
+            != reinterpret_cast<void *> (larry_mutex2.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
                              "ERROR: Should have gotten the same mutex, but didn't\n"),
                             -1);
@@ -169,8 +169,8 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
         ACE_TRY_CHECK;
 
         // test the pointers...
-        if (ACE_reinterpret_cast (void *,larry_mutex1.in ())
-            != ACE_reinterpret_cast (void *,larry_mutex3.in ()))
+        if (reinterpret_cast<void *> (larry_mutex1.in ())
+            != reinterpret_cast<void *> (larry_mutex3.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
                              "ERROR: Should have gotten the same mutex, but didn't\n"),
                             -1);
@@ -254,7 +254,7 @@ struct Mutex_Test_Data
 static void *
 mutex_test_thread (void *args)
 {
-  Mutex_Test_Data *data = ACE_reinterpret_cast (Mutex_Test_Data *, args);
+  Mutex_Test_Data *data = reinterpret_cast<Mutex_Test_Data *> (args);
 
   RTCORBA::Mutex_ptr mutex = data->mutex;
   int *shared_var = data->shared_var;
@@ -377,7 +377,7 @@ static void *
 mutex_test_try_lock_thread (void *args)
 {
   // test out try_lock() failure cases
-  Mutex_Test_Data *data = ACE_reinterpret_cast (Mutex_Test_Data *, args);
+  Mutex_Test_Data *data = reinterpret_cast<Mutex_Test_Data *> (args);
 
   RTCORBA::Mutex_ptr mutex = data->mutex;
   CORBA::Boolean result;
diff --git a/TAO/tests/RTCORBA/Server_Protocol/README b/TAO/tests/RTCORBA/Server_Protocol/README
index 53c1f2216da..b8e889ab6f9 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/README
+++ b/TAO/tests/RTCORBA/Server_Protocol/README
@@ -10,7 +10,7 @@ and configured with Server Protocol Policy containing a single
 protocol specified with <-p> (see options section below).
 The object is registered with child POA if one was created (root poa
 otherwise) and the server waits for requests.
-The client obtains server IOR and makes a single incocation, causing
+The client obtains server IOR and makes a single invocation, causing
 server process to shut down its orb and exit.
 
 To run (on Unix):
diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
index 6c2abab3d58..6e1cafa833b 100755
--- a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
@@ -13,21 +13,24 @@ $iorfile = PerlACE::LocalFile ("test.ior");
 unlink $iorfile;
 $status = 0;
 
-$server_reverse_conf    = PerlACE::LocalFile ("server_reverse$PerlACE::svcconf_ext");
-$server_iiop_conf       = PerlACE::LocalFile ("server_iiop$PerlACE::svcconf_ext");
-$server_uiop_conf       = PerlACE::LocalFile ("server_uiop$PerlACE::svcconf_ext");
-$server_shmiop_conf     = PerlACE::LocalFile ("server_shmiop$PerlACE::svcconf_ext");
-$server_reverse_nt_conf = PerlACE::LocalFile ("server_reverse_nt$PerlACE::svcconf_ext");
+$server_reverse_conf     = PerlACE::LocalFile ("server_reverse$PerlACE::svcconf_ext");
+$server_iiop_conf        = PerlACE::LocalFile ("server_iiop$PerlACE::svcconf_ext");
+$server_uiop_conf        = PerlACE::LocalFile ("server_uiop$PerlACE::svcconf_ext");
+$server_shmiop_conf      = PerlACE::LocalFile ("server_shmiop$PerlACE::svcconf_ext");
+$server_iiop_uiop_conf   = PerlACE::LocalFile ("server_iiop_uiop$PerlACE::svcconf_ext");
+$server_iiop_shmiop_conf = PerlACE::LocalFile ("server_iiop_shmiop$PerlACE::svcconf_ext");
+$server_reverse_nt_conf  = PerlACE::LocalFile ("server_reverse_nt$PerlACE::svcconf_ext");
 
 # Configurations for all tests to be run.
 @server_opts =
-    ("-ORBendpoint iiop://",
+    ("-ORBSndSock 54321 -ORBendpoint iiop://",
 
      "-ORBsvcconf $server_reverse_conf "
-     ."-ORBEndpoint uiop:// -ORBendpoint iiop://",
+     ."-ORBEndpoint shmiop:// -ORBEndpoint uiop:// -ORBendpoint iiop://",
 
-     "-ORBEndpoint uiop:// "
-     ." -ORBsvcconf $server_uiop_conf -p 1413566208");
+     "-ORBRcvSock 12345 -ORBsvcconf $server_iiop_uiop_conf "
+     ."-ORBEndpoint iiop:// -ORBEndpoint uiop:// "
+     ."-p 1413566208");
 
 @comments = ("* ORB Default Server Protocol Policy Test\n          "
              ."(TAO's default behavior without config files): \n",
@@ -41,17 +44,18 @@ $server_reverse_nt_conf = PerlACE::LocalFile ("server_reverse_nt$PerlACE::svccon
 # UIOP only available on Unix.  Substitute with alternative tests on Windows.
 if ($^O eq "MSWin32") {
     @server_opts =
-        ("-ORBendpoint iiop://",
+        ("-ORBSndSock 54321 -ORBendpoint iiop://",
 
          "-ORBsvcconf $server_reverse_nt_conf "
-         ."-ORBendpoint iiop://",
+         ."-ORBEndpoint shmiop:// -ORBendpoint iiop://",
 
-         "-ORBendpoint iiop://"
-         ." -ORBsvcconf $server_iiop_conf -p 0");
+         "-ORBRcvSock 12345 -ORBsvcconf $server_iiop_shmiop_conf "
+        ."-ORBEndpoint iiop:// -ORBEndpoint shmiop:// "
+        ."-p 1413566210");
 
-    $comments[3] =
+    $comments[2] =
          "* Overriding ORB Default Server Protocol Policy in the POA\n"
-         ."          (POA Server Protocol set to IIOP only): \n";
+         ."          (POA Server Protocol set to SMHIOP only): \n";
 
 }
 
@@ -90,7 +94,7 @@ foreach $o (@server_opts) {
         $status = 1;
     }
 
-    $server = $SV->TerminateWaitKill (60);
+    $server = $SV->WaitKill (60);
 
     if ($server != 0) {
         print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index 21f9f7e7ebc..686d3f514cf 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -7,6 +7,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Policy_Set.h"
 #include "ace/Get_Opt.h"
+#include "tao/PortableServer/POA.h"
 
 class Test_i : public POA_Test
 {
@@ -85,16 +86,22 @@ parse_args (int argc, char *argv[])
 }
 
 int
-check_default_server_protocol (CORBA::ORB_ptr orb
-                               ACE_ENV_ARG_DECL)
+check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
+                                   PortableServer::POA_ptr poa
+                                   ACE_ENV_ARG_DECL)
 {
   // Users should never write code like below.
   // It is for testing purposes only! (Unfortunately, there
-  // is no standard way to access ORB default policies).
+  // is no standard way to access POA policies).
+  TAO_POA &tao_poa =
+    dynamic_cast<TAO_POA &> (*poa);
+
+  TAO_POA_Policy_Set &policies =
+    tao_poa.policies ();
+
   CORBA::Policy_var server_protocol =
-    orb->orb_core ()->get_default_policies ()->get_policy (
-      RTCORBA::SERVER_PROTOCOL_POLICY_TYPE
-      ACE_ENV_ARG_PARAMETER);
+    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   RTCORBA::ServerProtocolPolicy_var policy =
@@ -112,7 +119,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "\nORB default for ServerProtocolPolicy "
+              "\nRoot POA ServerProtocolPolicy "
               "contains %u protocols:\n", protocols->length ()));
 
   for (CORBA::ULong i = 0; i < protocols->length (); ++i)
@@ -128,8 +135,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb
       if (protocol_type == IOP::TAG_INTERNET_IOP)
         {
           RTCORBA::TCPProtocolProperties_var tcp_properties =
-            RTCORBA::TCPProtocolProperties::_narrow (properties.in
-                                                     ()
+            RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
                                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
@@ -138,20 +144,24 @@ check_default_server_protocol (CORBA::ORB_ptr orb
                         "     Properties: \n"
                         "      send_buffer_size = %d\n"
                         "      receive_buffer_size = %d\n"
-                        "      no_delay = %d\n",
+                        "      keep_alive = %d\n"
+                        "      dont_route = %d\n"
+                        "      no_delay = %d\n"
+                        "      enable_network_priority = %d\n",
                         tcp_properties->send_buffer_size (),
                         tcp_properties->recv_buffer_size (),
-                        tcp_properties->no_delay ()));
+                        tcp_properties->keep_alive (),
+                        tcp_properties->dont_route (),
+                        tcp_properties->no_delay (),
+                        tcp_properties->enable_network_priority ()));
         }
       else if (protocol_type == TAO_TAG_UIOP_PROFILE)
         {
           RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
-            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in
-                                                            ()
+            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()
                                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
-
           if (!CORBA::is_nil (uiop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
                         "     Properties: \n"
@@ -159,7 +169,69 @@ check_default_server_protocol (CORBA::ORB_ptr orb
                         "      receive_buffer_size = %d\n",
                         uiop_properties->send_buffer_size (),
                         uiop_properties->recv_buffer_size ()));
+        }
+      else if (protocol_type == TAO_TAG_SHMEM_PROFILE)
+        {
+          RTCORBA::SharedMemoryProtocolProperties_var shmem_properties =
+            RTCORBA::SharedMemoryProtocolProperties::_narrow (properties.in ()
+                                                              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+
+          if (!CORBA::is_nil (shmem_properties.in ()))
+            ACE_DEBUG ((LM_DEBUG,
+                        "     Properties: \n"
+                        "      send_buffer_size = %d\n"
+                        "      receive_buffer_size = %d\n"
+                        "      keep_alive = %d\n"
+                        "      dont_route = %d\n"
+                        "      no_delay = %d\n"
+                        "      preallocate_buffer_size = %d\n"
+                        "      mmap_filename = %s\n"
+                        "      mmap_lockname = %s\n",
+                        shmem_properties->send_buffer_size (),
+                        shmem_properties->recv_buffer_size (),
+                        shmem_properties->keep_alive (),
+                        shmem_properties->dont_route (),
+                        shmem_properties->no_delay (),
+                        shmem_properties->preallocate_buffer_size (),
+                        shmem_properties->mmap_filename (),
+                        shmem_properties->mmap_lockname ()));
+        }
+      else if (protocol_type == TAO_TAG_DIOP_PROFILE)
+        {
+          RTCORBA::UserDatagramProtocolProperties_var diop_properties =
+            RTCORBA::UserDatagramProtocolProperties::_narrow (properties.in ()
+                                                              ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
+
+          if (!CORBA::is_nil (diop_properties.in ()))
+            ACE_DEBUG ((LM_DEBUG,
+                        "     Properties: \n"
+                        "      enable_network_priority = %d\n",
+                        diop_properties->enable_network_priority ()));
+        }
+      else if (protocol_type == TAO_TAG_SCIOP_PROFILE)
+        {
+          RTCORBA::StreamControlProtocolProperties_var sciop_properties =
+            RTCORBA::StreamControlProtocolProperties::_narrow (properties.in ()
+                                                               ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (-1);
 
+          if (!CORBA::is_nil (sciop_properties.in ()))
+            ACE_DEBUG ((LM_DEBUG,
+                        "     Properties: \n"
+                        "      send_buffer_size = %d\n"
+                        "      receive_buffer_size = %d\n"
+                        "      keep_alive = %d\n"
+                        "      dont_route = %d\n"
+                        "      no_delay = %d\n"
+                        "      enable_network_priority = %d\n",
+                        sciop_properties->send_buffer_size (),
+                        sciop_properties->recv_buffer_size (),
+                        sciop_properties->keep_alive (),
+                        sciop_properties->dont_route (),
+                        sciop_properties->no_delay (),
+                        sciop_properties->enable_network_priority ()));
         }
     }
 
@@ -202,9 +274,10 @@ main (int argc, char *argv[])
                                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Check ORB default ServerProtocol configuration.
-      int result = check_default_server_protocol (orb.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+      // Check ServerProtocol configurations.
+      int result = check_server_protocol_at_root_poa (orb.in (),
+                                                      root_poa.in ()
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return -1;
diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
index 49f47127549..5c28403df92 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp
+++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
@@ -57,7 +57,7 @@ main (int argc, char* argv [])
 
 	  ACE_CString data ("Harry Potter");
 	  current->spawn (&thread_action,
-			  ACE_const_cast (char *, data.c_str ()),
+			  const_cast<char *> (data.c_str ()),
 			  name,
 			  sched_param,
 			  implicit_sched_param,
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index cc568b0965d..3c1752548a0 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -31,13 +31,9 @@ parse_args (int argc,
   return 0;
 }
 
-#if defined (__Lynx__)
-// LynxOS uses macro THREAD_CANCELLED internally, so it must
-// be undefined to avoid compilation errors
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
-#endif /*__Lynx__ */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 int
 main (int argc, char* argv [])
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index fab3b59fe37..4cdf2f37848 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -58,13 +58,9 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb)
   return 0;
 }
 
-#if defined (__Lynx__)
-// LynxOS uses macro THREAD_CANCELLED internally, so it must
-// be undefined to avoid compilation errors
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
-#endif /*__Lynx__ */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 int
 Thread_Task::svc (void)
diff --git a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
index f57d76b3b91..9c240b72452 100644
--- a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
+++ b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
@@ -5,11 +5,10 @@ project(*Server): taoexe, portableserver, minimum_corba {
   Source_Files {
     server.cpp
     Test_i.cpp
-    Test_i.h
     TestC.cpp
     TestS.cpp
   }
-  
+
   IDL_Files {
     Test.idl
   }
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
index 862babe5909..953c3c4b526 100644
--- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -1,15 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe, portableserver {
+project(*Client): taoclient {
   Source_Files {
+    TestC.cpp
     client.cpp
   }
 }
diff --git a/TAO/tests/Server_Connection_Purging/run_test.pl b/TAO/tests/Server_Connection_Purging/run_test.pl
index 52ad158288f..4220bc5fc4f 100755
--- a/TAO/tests/Server_Connection_Purging/run_test.pl
+++ b/TAO/tests/Server_Connection_Purging/run_test.pl
@@ -19,7 +19,8 @@ $CL = new PerlACE::Process ("client", "-h localhost -p $orbport");
 print STDERR $CL->CommandLine(), "\n" ;
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 614e3469e45..db616ea3e82 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Ping_Service.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Server_Port_Zero/run_test.pl b/TAO/tests/Server_Port_Zero/run_test.pl
index 690e3e04452..422f0e4e3ee 100755
--- a/TAO/tests/Server_Port_Zero/run_test.pl
+++ b/TAO/tests/Server_Port_Zero/run_test.pl
@@ -16,7 +16,8 @@ $SV = new PerlACE::Process ("server", "-o $iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index 6307a6f623a..a585f7ec595 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Single_Read/run_test.pl b/TAO/tests/Single_Read/run_test.pl
index 340122c73ae..52eec41c8ff 100755
--- a/TAO/tests/Single_Read/run_test.pl
+++ b/TAO/tests/Single_Read/run_test.pl
@@ -18,7 +18,8 @@ $CL = new PerlACE::Process ("client", "-k file://$iorfile -d 10 -i 10 -x");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 3320093d407..5c1be5369f7 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -109,12 +109,12 @@ main (int argc, char *argv[])
       if (ACE_OS::last_error () == EPERM)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
+                      "client (%P|%t): user is not superuser, "
                       "test runs in time-shared class\n"));
         }
       else
         ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
+                    "client (%P|%t): sched_params failed\n"));
     }
 
   ACE_TRY_NEW_ENV
diff --git a/TAO/tests/Smart_Proxies/Benchmark/run_test.pl b/TAO/tests/Smart_Proxies/Benchmark/run_test.pl
index 6bd51348b82..ff3e0d6b952 100755
--- a/TAO/tests/Smart_Proxies/Benchmark/run_test.pl
+++ b/TAO/tests/Smart_Proxies/Benchmark/run_test.pl
@@ -19,7 +19,8 @@ $CL = new PerlACE::Process ("client", "-i file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index b7777cd8cd0..1532085179d 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -3,6 +3,7 @@
 #include "Smart_Proxy_Impl.h"
 
 #include "ace/OS_NS_string.h"
+#include "ace/Log_Msg.h"
 
 Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void)
 {
diff --git a/TAO/tests/Smart_Proxies/On_Demand/run_test.pl b/TAO/tests/Smart_Proxies/On_Demand/run_test.pl
index fa5d9031263..05bd093393b 100755
--- a/TAO/tests/Smart_Proxies/On_Demand/run_test.pl
+++ b/TAO/tests/Smart_Proxies/On_Demand/run_test.pl
@@ -20,7 +20,8 @@ print STDERR "\nrunning Smart Proxy test consisting of the client and the server
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Smart_Proxies/Policy/run_test.pl b/TAO/tests/Smart_Proxies/Policy/run_test.pl
index 0ff69078181..737a50ba1d3 100755
--- a/TAO/tests/Smart_Proxies/Policy/run_test.pl
+++ b/TAO/tests/Smart_Proxies/Policy/run_test.pl
@@ -23,7 +23,8 @@ print STDERR "\nrunning Smart Proxy test consisting of the client and two server
 
 $SV1->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile1, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile1,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile1>\n";
     $SV1->Kill (); 
     exit 1;
@@ -31,7 +32,8 @@ if (PerlACE::waitforfile_timed ($iorfile1, 5) == -1) {
 
 $SV2->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile2, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile2,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile2>\n";
     $SV1->Kill ();
     $SV2->Kill (); 
@@ -67,7 +69,8 @@ print STDERR "\nrunning Smart Proxy test consisting of the client and two server
 
 $SV1->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile1, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile1,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile1>\n";
     $SV1->Kill ();
     exit 1;
@@ -75,7 +78,8 @@ if (PerlACE::waitforfile_timed ($iorfile1, 5) == -1) {
 
 $SV2->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile2, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile2,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile2>\n";
     $SV1->Kill ();
     $SV2->Kill (); 
diff --git a/TAO/tests/Smart_Proxies/run_test.pl b/TAO/tests/Smart_Proxies/run_test.pl
index 10b76ffd9ef..11eea576ded 100755
--- a/TAO/tests/Smart_Proxies/run_test.pl
+++ b/TAO/tests/Smart_Proxies/run_test.pl
@@ -20,7 +20,8 @@ print STDERR "\nrunning Smart Proxy test consisting of the client and the server
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/Strategies/run_test.pl b/TAO/tests/Strategies/run_test.pl
index 6974ab9bc27..c766aed57ea 100755
--- a/TAO/tests/Strategies/run_test.pl
+++ b/TAO/tests/Strategies/run_test.pl
@@ -26,7 +26,8 @@ print STDERR "\nrunning Strategies test with static config\n\n";
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
@@ -61,7 +62,8 @@ print STDERR "\nrunning Strategies test with dynamic config\n\n";
 
 $SV2->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV2->Kill ();
     exit 1;
diff --git a/TAO/tests/TestUtils/TestCombinedThreads.cpp b/TAO/tests/TestUtils/TestCombinedThreads.cpp
deleted file mode 100644
index 4a73f2ea158..00000000000
--- a/TAO/tests/TestUtils/TestCombinedThreads.cpp
+++ /dev/null
@@ -1,779 +0,0 @@
-// *******************************************************************
-//        File: TestCombinedThreads.cpp
-//      Author: Chad Elliott (elliott_c@ociweb.com)
-// Create Date: 4/11/2000
-//         $Id$
-// *******************************************************************
-
-#include "TestCombinedThreads.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Object_Manager.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Synch.h"
-#include "ace/SString.h"
-#ifdef VXWORKS
-# include <routeLib.h>
-#endif
-
-typedef ACE_Hash_Map_Manager<ACE_hthread_t,
-                             const char*,
-                             ACE_Null_Mutex> TestORBIDMap;
-typedef ACE_Hash_Map_Manager<ACE_hthread_t,
-                             ACE_Time_Value,
-                             ACE_Null_Mutex> TestTimeValueMap;
-
-static TestORBIDMap*       idMap          = 0;
-static TestTimeValueMap*   timeMap        = 0;
-static ACE_Thread_Manager* thread_manager = 0;
-static const ACE_hthread_t largestId      = 0x7fffffff;
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::TAO_TestCombinedThreads
-// Argument    : TEST_MAIN_TYPE_FUNC func - function to spawn as a
-//               thread
-// Argument    : char** args - arguments for the spawned function
-// Description : Constructor - copies the function arguments.
-// Notes       :
-// *******************************************************************
-
-TAO_TestCombinedThreads::TAO_TestCombinedThreads (TEST_MAIN_TYPE_FUNC func,
-                                                  char** args)
-  : timeout_ (0),
-    namingServiceHack_ (0),
-    args_ (0)
-{
-  this->initialize (func, args);
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::TAO_TestCombinedThreads
-// Argument    : const TAO_TestCombinedThreads& rhs - right hand side
-// Description : Copy Constructor
-// Notes       :
-// *******************************************************************
-
-TAO_TestCombinedThreads::TAO_TestCombinedThreads (
-                                    const TAO_TestCombinedThreads& rhs)
-  : timeout_ (0),
-    namingServiceHack_ (0),
-    args_ (0)
-{
-  this->initialize ();
-  *this = rhs;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::~TAO_TestCombinedThreads
-// Description : Destructor - deletes allocated arguments.
-// Notes       :
-// *******************************************************************
-
-TAO_TestCombinedThreads::~TAO_TestCombinedThreads (void)
-{
-  this->deleteArguments (this->testArgs_.argv_);
-  this->deleteArguments (this->args_);
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::operator=
-// Argument    : const TAO_TestCombinedThreads& rhs - right hand side
-// Description : Assignment Operator
-// Notes       :
-// *******************************************************************
-
-TAO_TestCombinedThreads&
-TAO_TestCombinedThreads::operator= (const TAO_TestCombinedThreads& rhs)
-{
-  if (this != &rhs)
-    {
-      // Remove the old allocated memory (if any)
-      this->deleteArguments (this->args_);
-      this->deleteArguments (this->testArgs_.argv_);
-
-      // Initialize the testArgs_ and args_ data members.
-      // timeout_ will be set by calling the wait() method.
-      this->initialize (rhs.testArgs_.func_, rhs.args_);
-      this->namingServiceHack_ = rhs.namingServiceHack_;
-    }
-  return *this;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::addNamingServiceTimeout
-// Argument    : int timeout - the number of seconds for the orb to
-//               timeout.
-// Description : Sets the timeout in the argument in the naming
-//               service arguments.
-// Notes       :
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::addNamingServiceTimeout (unsigned int timeout)
-{
-  // If this is enabled and we are passed a timeout
-  // then we will check for the -t option.  If the -t option
-  // exists we will do nothing.  Otherwise, we will add the -t
-  // with the given timeout.
-  static const char* timeoutOption = "-t";
-  int timeoutFound = 0;
-  for (int i = 0; !timeoutFound && this->testArgs_.argv_[i] != 0; i++)
-    {
-      if (ACE_OS_String::strcmp (this->testArgs_.argv_[i],
-                                 timeoutOption) == 0)
-        {
-          timeoutFound = 1;
-        }
-    }
-  if (!timeoutFound)
-    {
-      // Add the timeout option
-      ACE_NEW (this->testArgs_.argv_[this->testArgs_.argc_],
-               char[ACE_OS_String::strlen (timeoutOption) + 1]);
-      ACE_OS_String::strcpy (this->testArgs_.argv_[testArgs_.argc_],
-                             timeoutOption);
-      this->testArgs_.argc_++;
-
-      // Add the number of seconds
-      char number[64];
-      ACE_OS::sprintf (number, "%d", timeout);
-      ACE_NEW (this->testArgs_.argv_[this->testArgs_.argc_],
-               char[ACE_OS::strlen (number) + 1]);
-      ACE_OS_String::strcpy (this->testArgs_.argv_[this->testArgs_.argc_],
-                             number);
-      this->testArgs_.argc_++;
-
-      // Add the NULL terminator
-      this->testArgs_.argv_[this->testArgs_.argc_] = 0;
-    }
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::run
-// Argument    : int timeout - the number of seconds for the orb to
-//               timeout.
-// Description : Sets the timeout in the argument structure and then
-//               spawns a new thread and returns the thread group id.
-// Notes       :
-// *******************************************************************
-
-int
-TAO_TestCombinedThreads::run (unsigned int timeout)
-{
-  if (this->args_ != 0)
-    {
-      // Count up the arguments
-      int blank = 0;
-      for (this->testArgs_.argc_ = 0;
-           this->args_[this->testArgs_.argc_] != 0;
-           this->testArgs_.argc_++)
-        {
-          if (this->args_[this->testArgs_.argc_][0] == '\0')
-            {
-              blank++;
-            }
-        }
-      // Copy the arguments
-      int count = this->testArgs_.argc_ + 1 +
-                  (this->namingServiceHack_ ? 2: 0) - blank;
-      ACE_NEW_RETURN (this->testArgs_.argv_, char*[count], -1);
-      int p = 0;
-      for (int i = 0; i < this->testArgs_.argc_; i++)
-        {
-          if (this->args_[i][0] != '\0')
-            {
-              ACE_NEW_RETURN (this->testArgs_.argv_[p],
-                              char[ACE_OS_String::strlen (this->args_[i]) + 1],
-                              -1);
-              ACE_OS_String::strcpy (this->testArgs_.argv_[p],
-                                     this->args_[i]);
-              p++;
-            }
-        }
-      this->testArgs_.argv_[p] = 0;
-      this->testArgs_.argc_ -= blank;
-    }
-
-  if (timeout > 0)
-    {
-      this->testArgs_.timeout_ = ACE_Time_Value (timeout);
-
-      if (this->namingServiceHack_)
-        {
-          this->addNamingServiceTimeout (timeout);
-        }
-    }
-  return thread_manager->spawn (TAO_TestCombinedThreads::spawned,
-                                &(this->testArgs_));
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::wait
-// Argument    : unsigned int seconds
-// Description : Wait for all threads; if seconds is > 0, timeout
-//               after seconds expire.
-// Notes       :
-// *******************************************************************
-
-int
-TAO_TestCombinedThreads::wait (unsigned int seconds)
-{
-  this->timeout_.reset ((seconds > 0 ?
-                   new ACE_Time_Value (seconds += ACE_OS::time ()) : 0));
-  thread_manager->wait (this->timeout_.get ());
-  return 0;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::waitForFileTimed
-// Argument    : const char* file - the file for which to wait
-// Argument    : unsigned int seconds - how many seconds to wait
-// Description : Wait seconds for file.
-// Notes       : static
-// *******************************************************************
-
-int
-TAO_TestCombinedThreads::waitForFileTimed (const char* file,
-                                           unsigned int seconds)
-{
-  struct stat buf;
-  while (seconds-- != 0)
-    {
-      if (ACE_OS::stat (file, &buf) == 0 && buf.st_size > 0)
-        {
-          return 0;
-        }
-      ACE_OS::sleep (1);
-    }
-  return -1;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::TAO_TestCombinedThreads
-// Argument    : TEST_MAIN_TYPE_FUNC func - function to spawn as a
-//               thread
-// Argument    : char** args - arguments for the spawned function
-// Description : Constructor - copies the function arguments.
-// Notes       : protected
-// *******************************************************************
-
-TAO_TestCombinedThreads::TAO_TestCombinedThreads (TEST_MAIN_TYPE_FUNC func,
-                                                  char** args,
-                                                  int namingServiceHack)
-  : timeout_ (0),
-    namingServiceHack_ (namingServiceHack),
-    args_ (0)
-{
-  this->initialize (func, args);
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::initialize
-// Argument    : TEST_MAIN_TYPE_FUNC func - function to spawn as a
-//               thread
-// Description : Copies the function arguments.
-// Notes       :
-// *******************************************************************
-
-void TAO_TestCombinedThreads::initialize (TEST_MAIN_TYPE_FUNC func,
-                                          char** args)
-{
-  this->testArgs_.func_ = func;
-  this->testArgs_.argc_ = 0;
-  this->testArgs_.argv_ = 0;
-  this->copyArgv(args, this->args_);
-
-  if (thread_manager == 0)
-    {
-#if defined (VXWORKS) && defined (ACE_HAS_IP_MULTICAST)
-      char host[MAXHOSTNAMELEN];
-      if (ACE_OS::hostname (host, MAXHOSTNAMELEN) != -1)
-        {
-          routeAdd ("224.0.0.0", host);
-        }
-#endif
-      ACE_NEW (thread_manager,
-               ACE_Thread_Manager);
-      ACE_Object_Manager::at_exit (
-                            thread_manager,
-                            &TAO_TestCombinedThreads::destroyThreadManager,
-                            0);
-    }
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::copyArgv
-// Argument    : char** argv - original char* array
-// Argument    : char**& dest - destination char* array
-// Description : Copy argv type array
-// Notes       :
-// *******************************************************************
-
-int
-TAO_TestCombinedThreads::copyArgv (char** argv,
-                                   char**& dest)
-{
-  int argc = 0;
-  if (argv != 0)
-    {
-      for (; argv[argc] != 0; argc++);
-
-      ACE_NEW_RETURN (dest, char*[argc + 1], -1);
-      for (int i = 0; i < argc; i++)
-        {
-          ACE_NEW_RETURN (dest[i], char[strlen (argv[i]) + 1], 0);
-          ACE_OS_String::strcpy (dest[i],
-                                 argv[i]);
-        }
-      dest[argc] = 0;
-    }
-  return argc;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::deleteArguments
-// Argument    : char** args - char* array to be deleted
-// Description : Deletes the copied arguments.
-// Notes       : private
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::deleteArguments (char** args)
-{
-  if (args != 0)
-    {
-      for (int i = 0; args[i] != 0; i++)
-        {
-          delete [] args[i];
-        }
-      delete [] args;
-    }
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::spawned
-// Argument    : void* args
-// Description : Find the orbid (if any) and associate the thread id
-//               with the orbid.  Also, set the timeout for this
-//               thread.  Call the function and then disassociate the
-//               orbid.
-// Notes       : static
-// *******************************************************************
-
-void*
-TAO_TestCombinedThreads::spawned (void* args)
-{
-  TestArgs* testArgs = (TestArgs*)args;
-
-  // This ORB id per thread hack is here since so many tests and service
-  // executables use _this to activate objects with the default POA and
-  // very few overide the _default_POA method.  I keep a map of ORB ids
-  // per thread id and use a hacked version of ORB_Core.cpp to find the
-  // ORB id depending on the current thread id.  It seems to work pretty
-  // well.
-  TAO_TestCombinedThreads::associateORB (testArgs->argv_[0]);
-
-
-  // Set the timeout for hacked versions of calls to orb->run() or
-  // orbmanager.run().  These hacked versions allow threads to exit
-  // under their own accord.
-  TAO_TestCombinedThreads::setTimeout (testArgs->timeout_);
-
-  // Call the main function and print out the return value
-  int status = -1;
-  if (testArgs->func_ != 0)
-    {
-      status = testArgs->func_ (testArgs->argc_, testArgs->argv_);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_ERROR, "ERROR: testArgs->func_ is zero\n"));
-    }
-  ACE_DEBUG ((LM_DEBUG, "Return status from %s: %d\n",
-                        testArgs->argv_[0], status));
-
-  // Disassociate the orb since the thread is done.
-  TAO_TestCombinedThreads::disassociateORB ();
-
-  return ACE_reinterpret_cast (void*, status);
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::setTimeout
-// Argument    : ACE_Time_Value* timeout
-// Description : Set the timeout for the current thread id
-// Notes       : static
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::setTimeout (ACE_Time_Value timeout)
-{
-  static ACE_Time_Value largest;
-  // Only bind if timeout is not zero
-  if (timeout != ACE_Time_Value::zero)
-    {
-      ACE_hthread_t threadId;
-      ACE_OS::thr_self (threadId);
-
-      TAO_TestCombinedThreads::allocateTimeMap ();
-
-      timeMap->bind (threadId, timeout);
-      if (timeout > largest)
-        {
-          ACE_Time_Value dummy;
-          largest = timeout;
-          timeMap->unbind (largestId, dummy);
-          timeMap->bind (largestId, largest);
-        }
-    }
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::associateORB
-// Argument    : const char* orbId
-// Description : Associate the current thread id with the orb id.
-// Notes       : static
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::associateORB (const char* orbId)
-{
-  ACE_hthread_t threadId;
-  ACE_OS::thr_self (threadId);
-
-  TAO_TestCombinedThreads::allocateORBIdMap ();
-
-  idMap->bind (threadId, orbId);
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::disassociateORB
-// Description : Disassociate the current thread id from the orb id
-//               map.
-// Notes       : static
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::disassociateORB (void)
-{
-  ACE_hthread_t threadId;
-  ACE_OS::thr_self (threadId);
-
-  if (idMap != 0)
-    {
-      idMap->unbind (threadId);
-    }
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::getORBId
-// Description : Return the orb id associated with the current thread
-//               id.
-// Notes       : static
-// *******************************************************************
-
-const char*
-TAO_TestCombinedThreads::getORBId (void)
-{
-  const char* id = "";
-  ACE_hthread_t threadId;
-  ACE_OS::thr_self (threadId);
-
-  if (idMap != 0)
-    {
-      idMap->find (threadId, id);
-    }
-
-  return id;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::getTimeout
-// Description : Return the timeout associated with the current thread
-//               id.
-// Notes       : static
-// *******************************************************************
-
-ACE_Time_Value*
-TAO_TestCombinedThreads::getTimeout (void)
-{
-  ACE_Time_Value* timeout = 0;
-  ACE_hthread_t threadId;
-  ACE_OS::thr_self (threadId);
-
-  if (timeMap != 0)
-    {
-      ACE_Hash_Map_Entry<ACE_hthread_t, ACE_Time_Value>* entry;
-      if (timeMap->find (threadId, entry) == 0)
-        {
-          timeout = &(entry->int_id_);
-        }
-      if (timeout == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "WARNING: Could not find timeout for task %d\n",
-                      threadId));
-          // Couldn't find the timeout for the current thread, so
-          // we try to get the largest timeout registered.
-          if (timeMap->find (largestId, entry) == 0)
-            {
-              timeout = &(entry->int_id_);
-            }
-          else
-            {
-              // If that doesn't work, fall back to the 60 second default
-              timeMap->bind (threadId, ACE_Time_Value(60));
-              if (timeMap->find (threadId, entry) == 0)
-                {
-                  timeout = &(entry->int_id_);
-                }
-            }
-        }
-    }
-
-  return timeout;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::getRandomPortBase
-// Description : Returns a random port number between 0 and 32767
-// Notes       : static - The port returned may already be in use.
-//               I don't care to seed the rand function; it really
-//               doesn't matter how random it is.
-// *******************************************************************
-
-int
-TAO_TestCombinedThreads::getRandomPortBase (void)
-{
-  static const int min = 0;
-  static const int max = 0x7fff;
-  int port = (ACE_OS::rand () & max);
-  return (port < min ? port + min : port);
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::thr_join
-// Description : Wait on the specified thread name
-// Notes       : static
-// *******************************************************************
-
-int
-TAO_TestCombinedThreads::thr_join (ACE_thread_t thr_handle,
-                               ACE_thread_t *thr_id,
-                               void** status)
-{
-  ACE_UNUSED_ARG (thr_id);
-  return TAO_TestCombinedThreads::thr_join (taskNameToId (thr_handle),
-                                            status);
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::thr_join
-// Description : Wait on the specified thread handle
-// Notes       : static
-// *******************************************************************
-
-int
-TAO_TestCombinedThreads::thr_join (ACE_hthread_t thr_handle,
-                                   void** status)
-{
-  ACE_UNUSED_ARG (status);
-
-  // This method can not support joining all threads
-  if (ACE_OS::thr_cmp (thr_handle, ACE_OS::NULL_hthread))
-    {
-      ACE_NOTSUP_RETURN (-1);
-    }
-
-  int retval = ESRCH;
-  ACE_hthread_t current;
-  ACE_OS::thr_self (current);
-
-  // Make sure we are not joining ourself
-  if (ACE_OS::thr_cmp (thr_handle, current))
-    {
-      retval = EDEADLK;
-    }
-  else
-    {
-      // Whether the task exists or not
-      // we will return a successful value
-      retval = 0;
-
-      // Verify that the task id still exists
-      while (taskIdVerify (thr_handle) == OK)
-        {
-          // Wait a bit to see if the task is still active.
-          // I'm not sure what a good value would be.
-          ACE_OS::sleep (5);
-        }
-    }
-
-  // Adapt the return value into errno and return value.
-  // The ACE_ADAPT_RETVAL macro doesn't exactly do what
-  // we need to do here, so we do it manually.
-  if (retval != 0)
-    {
-      errno = retval;
-      retval = -1;
-    }
-
-  return retval;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::getRandomString
-// Description : Returns a random string based on the starting point
-// Notes       : static
-// *******************************************************************
-
-ACE_CString
-TAO_TestCombinedThreads::getRandomString (const char* base)
-{
-  ACE_CString string ("");
-  char number[32];
-
-  if (base != 0)
-    {
-      string = base;
-    }
-  string += ACE_OS_String::itoa (ACE_OS::rand (), number, 10);
-
-  return string;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::cleanORBIdMap
-// Description : Delete the orb id hash map.
-// Notes       : static
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::cleanORBIdMap (void*, void*)
-{
-  delete idMap;
-  idMap = 0;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::allocateORBIdMap
-// Description : Allocate the orb id hash map and register it with the
-//               object manager.
-// Notes       : static
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::allocateORBIdMap (void)
-{
-  if (idMap == 0)
-    {
-      ACE_NEW (idMap, TestORBIDMap ());
-      idMap->open (5);
-      ACE_Object_Manager::at_exit (idMap,
-                                   &TAO_TestCombinedThreads::cleanORBIdMap,
-                                   0);
-    }
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::cleanTimeMap
-// Description : Delete the time value hash map.
-// Notes       : static
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::cleanTimeMap (void*, void*)
-{
-  delete timeMap;
-  timeMap = 0;
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::allocateTimeMap
-// Description : Allocate the time value hash map and register it with
-//               the object manager.
-// Notes       : static
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::allocateTimeMap (void)
-{
-  if (timeMap == 0)
-    {
-      ACE_NEW (timeMap, TestTimeValueMap ());
-      timeMap->open (5);
-      ACE_Object_Manager::at_exit (timeMap,
-                                   &TAO_TestCombinedThreads::cleanTimeMap,
-                                   0);
-    }
-}
-
-
-// *******************************************************************
-// Method      : TAO_TestCombinedThreads::destroyThreadManager
-// Description : Delete the thread manager
-// Notes       : static
-// *******************************************************************
-
-void
-TAO_TestCombinedThreads::destroyThreadManager (void*, void*)
-{
-  delete thread_manager;
-  thread_manager = 0;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<ACE_Time_Value>;
-template class ACE_Hash_Map_Manager<ACE_hthread_t, const char*, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_hthread_t, const char*, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_hthread_t, const char*, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_hthread_t, const char*, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_hthread_t, const char*, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_hthread_t,const char*>;
-template class ACE_Hash_Map_Manager<ACE_hthread_t, ACE_Time_Value, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_hthread_t, ACE_Time_Value, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_hthread_t, ACE_Time_Value, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_hthread_t, ACE_Time_Value, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_hthread_t, ACE_Time_Value, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_hthread_t,ACE_Time_Value>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<ACE_Time_Value>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_hthread_t, const char*, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_hthread_t, const char*, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_hthread_t, const char*, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_hthread_t, const char*, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_hthread_t, const char*, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_hthread_t,const char*>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_hthread_t, ACE_Time_Value, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_hthread_t, ACE_Time_Value, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_hthread_t, ACE_Time_Value, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_hthread_t, ACE_Time_Value, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_hthread_t, ACE_Time_Value, ACE_Hash<ACE_hthread_t>, ACE_Equal_To<ACE_hthread_t>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_hthread_t,ACE_Time_Value>
-#endif
-
diff --git a/TAO/tests/TestUtils/TestCombinedThreads.h b/TAO/tests/TestUtils/TestCombinedThreads.h
deleted file mode 100644
index 0016d980511..00000000000
--- a/TAO/tests/TestUtils/TestCombinedThreads.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#ifndef TAO_TESTCOMBINEDTHREADS_H
-#define TAO_TESTCOMBINEDTHREADS_H
-
-//============================================================================
-/**
- *  @file TestCombinedThreads.h
- *
- *  $Id$
- *
- *  A small test framework library for VxWorks
- *
- *  @author Chad Elliott (elliott_c@ociweb.com)
- *
- */
-//============================================================================
-
-// *******************************************************************
-// Include files.
-// *******************************************************************
-
-#include "ace/OS.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/SString.h"
-
-// *******************************************************************
-// Typedefs, forward declarations and defines
-// *******************************************************************
-
-typedef int (*TEST_MAIN_TYPE_FUNC)(int, char**);
-#define TEST_MAIN_FUNC_DECLARE(X) int X(int argc, char** argv)
-#ifndef FULL_PATH
-# define FULL_PATH "."
-#endif
-
-// *******************************************************************
-// Class declaration.
-// *******************************************************************
-
-/**
- * @class TAO_TestCombinedThreads
- *
- * @brief Test Framework for VxWorks
- *
- * This class provides run_test type functionality for VxWorks
- * modules.  This class is used by c++ files generated by the
- * perltest2cpp.pl and vxworks_modify.pl perl scripts.
- */
-
-class TAO_TestCombinedThreads
-{
-public:
-  /// func is a function that looks like main(int argc, char** argv).
-  /// args are the arguments that will be passed to main, it must be NULL
-  /// termintated.
-  TAO_TestCombinedThreads (TEST_MAIN_TYPE_FUNC func,
-                           char** args);
-  TAO_TestCombinedThreads (const TAO_TestCombinedThreads& rhs);
-  virtual ~TAO_TestCombinedThreads (void);
-
-  TAO_TestCombinedThreads& operator= (const TAO_TestCombinedThreads& rhs);
-
-  /// spawn a thread and call the main type function.
-  /// if timeout is == 0, then do not provide a timeout value
-  /// for any orb->run() calls that were hacked by the vxworks_modify.pl script
-  virtual int            run (unsigned int timeout = 0);
-
-  /// Wait for all threads
-  /// if timeout is == 0, wait forever.
-  int                    wait (unsigned int seconds = 0);
-
-  /// Wait for the existance of the specified file for the givent amount
-  /// of seconds
-  static int             waitForFileTimed (const char* file,
-                                           unsigned int seconds);
-
-  /// Return the orb id associated with the current thread id
-  static const char*     getORBId (void);
-
-  /// Get the timeout value for the current thread id
-  static ACE_Time_Value* getTimeout (void);
-
-  /// Get a random port base between 0 and 32767
-  static int             getRandomPortBase (void);
-
-  /// Wait on the specified thread name
-  static int             thr_join (ACE_thread_t thr_handle,
-                                   ACE_thread_t *thr_id,
-                                   void** status = 0);
-
-  /// Wait on the specified thread handle
-  static int             thr_join (ACE_hthread_t thr_handle,
-                                   void** status = 0);
-
-  /// Returns a random string based on the starting point
-  static ACE_CString     getRandomString (const char* base);
-
-protected:
-  /// This constructor is functionaly the same as the
-  /// public constructor.  It has an extra parameter which is
-  /// used by the TestServices class.
-  TAO_TestCombinedThreads (TEST_MAIN_TYPE_FUNC func,
-                           char** args,
-                           int namingServiceHack);
-
-private:
-  struct TestArgs
-  {
-    TEST_MAIN_TYPE_FUNC func_;
-    int                 argc_;
-    char**              argv_;
-    ACE_Time_Value      timeout_;
-  };
-
-  /// Initialize the object
-  void                   initialize (TEST_MAIN_TYPE_FUNC func = 0,
-                                     char** args = 0);
-
-  /// Copy an argv array
-  int                    copyArgv (char** argv,
-                                   char**& dest);
-
-  /// Delete the copied arguments.
-  void                   deleteArguments (char** args);
-
-  /// Static function called by the thread manager
-  static void*           spawned (void* args);
-
-  /// Set the timeout for the current thread
-  static void            setTimeout (ACE_Time_Value timeout);
-
-  void                   addNamingServiceTimeout (unsigned int timeout);
-
-  /// Associates the given orb id with the current thread id
-  static void            associateORB (const char* orbId);
-  /// Disassociates the current thread id with its associated orb id
-  static void            disassociateORB (void);
-
-  /// Allocate the ORB id map
-  static void            allocateORBIdMap (void);
-  /// Used by the object manager to delete the ORB id map
-  static void            cleanORBIdMap (void* object, void* params);
-
-  /// Allocate the time value map
-  static void            allocateTimeMap (void);
-  /// Used by the object manager to delete the time value map
-  static void            cleanTimeMap (void* object, void* params);
-
-  /// Delete the thread manager
-  static void            destroyThreadManager (void* object, void* params);
-
-  TestArgs                 testArgs_;
-  auto_ptr<ACE_Time_Value> timeout_;
-  int                      namingServiceHack_;
-  char**                   args_;
-};
-
-#endif /* TAO_TESTCOMBINEDTHREADS_H */
diff --git a/TAO/tests/TestUtils/TestUtils.mpc b/TAO/tests/TestUtils/TestUtils.mpc
deleted file mode 100644
index 5147f54562c..00000000000
--- a/TAO/tests/TestUtils/TestUtils.mpc
+++ /dev/null
@@ -1,11 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-// This project looks like it's only for vxworks using gmake
-// For now it's defined empty, because there's no convenient
-// way to make it only build for gnuace.
-project : taolib {
-  sharedname = TestUtils
-  source_files {
-  }
-}
diff --git a/TAO/tests/Timed_Buffered_Oneways/run_test.pl b/TAO/tests/Timed_Buffered_Oneways/run_test.pl
index 18820bb7a6f..c2c3e986c6d 100755
--- a/TAO/tests/Timed_Buffered_Oneways/run_test.pl
+++ b/TAO/tests/Timed_Buffered_Oneways/run_test.pl
@@ -18,7 +18,8 @@ $CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc
index 7dc75345874..926002380e8 100644
--- a/TAO/tests/Timeout/Timeout.mpc
+++ b/TAO/tests/Timeout/Timeout.mpc
@@ -1,16 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): messaging, taoexe, portableserver {
-  requires += corba_messaging
-
+project(*Client): taoclient, messaging {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Timeout/run_test.pl b/TAO/tests/Timeout/run_test.pl
index ca1399d3acc..efe8e9910fd 100755
--- a/TAO/tests/Timeout/run_test.pl
+++ b/TAO/tests/Timeout/run_test.pl
@@ -19,7 +19,8 @@ $CL = new PerlACE::Process ("client", "-ORBDebugLevel 0 -k file://$iorfile -l 2
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index 96ecc85ba7f..00d5ddfd698 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -1,11 +1,6 @@
 // $Id$
 
 #include "test_i.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Timeout, test_i, "$Id$")
diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h
index 78b4c9015fd..00018fa25d8 100644
--- a/TAO/tests/Timeout/test_i.h
+++ b/TAO/tests/Timeout/test_i.h
@@ -43,8 +43,4 @@ private:
   // The ORB
 };
 
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_TIMEOUT_TEST_I_H */
diff --git a/TAO/tests/Timeout/test_i.i b/TAO/tests/Timeout/test_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/Timeout/test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index b6a8d2ef9fa..1570ccd0f66 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     worker.cpp
     First_i.cpp
@@ -11,7 +11,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     Two_ObjectsC.cpp
     client.cpp
diff --git a/TAO/tests/Two_Objects/run_test.pl b/TAO/tests/Two_Objects/run_test.pl
index f5dc88ca22b..283879c9611 100755
--- a/TAO/tests/Two_Objects/run_test.pl
+++ b/TAO/tests/Two_Objects/run_test.pl
@@ -17,7 +17,8 @@ $CL = new PerlACE::Process ("client", " -r file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index e39fb418d95..978e0f3c3b1 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -18,9 +18,8 @@
 
 #include "testC.h"
 
-#if defined (ACE_HAS_XT)
 
-#include "tao/xt_resource.h"
+#include "tao/XtResource_Loader.h"
 class Control;
 
 class Client
@@ -59,5 +58,4 @@ private:
   // The server.
 };
 
-#endif /*ACE_HAS_XT*/
 #endif /* CLIENT_H */
diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp
index 9e7745c2f24..6d3de01204b 100644
--- a/TAO/tests/Xt_Stopwatch/Control.cpp
+++ b/TAO/tests/Xt_Stopwatch/Control.cpp
@@ -2,7 +2,6 @@
 
 #include "Control.h"
 
-#if defined (ACE_HAS_XT)
 
 Control::Control (Widget &parent)
 {
@@ -53,4 +52,3 @@ Control::stopwidget (void)
   return this->stopwidget_;
 }
 
-#endif /*ACE_HAS_XT*/
diff --git a/TAO/tests/Xt_Stopwatch/Control.h b/TAO/tests/Xt_Stopwatch/Control.h
index 88aaeada02c..0dea6b7eed9 100644
--- a/TAO/tests/Xt_Stopwatch/Control.h
+++ b/TAO/tests/Xt_Stopwatch/Control.h
@@ -17,7 +17,6 @@
 #define CONTROL_H
 #include "Client.h"
 
-#if defined (ACE_HAS_XT)
 
 #include <Xm/Xm.h>
 #include <Xm/PushB.h>
@@ -60,6 +59,5 @@ class Control
 
 };
 
-#endif /*ACE_HAS_XT */
 
 #endif /* CONTROL_H */
diff --git a/TAO/tests/Xt_Stopwatch/README b/TAO/tests/Xt_Stopwatch/README
index 3bbd0f6f22c..85040fb2895 100644
--- a/TAO/tests/Xt_Stopwatch/README
+++ b/TAO/tests/Xt_Stopwatch/README
@@ -24,22 +24,12 @@ Technical Description:
 In addition to specifying the resources that the ORB needs to allocate
 for an Xt event loop, the ORB also needs the information about the
 XtAppContext in which the user application is initialised. To provide
-these information TAO provides a class by name
-"TAO_XT_Resource_Factory" that inherits from the
-TAO_Default_Resource_factory. This provides the user with a static
-method through which he can set the XtAppContext.
-
-To make TAO understand that the user is in fact wants to use the
-TAO_XT_Resource_Factory and not the default resource factory, the
-application developer must add the following line to his svc.conf
-file. 
-
-dynamic Resource_Factory Service_Object *
-TAO:_make_TAO_XT_Resource_Factory() ""
-
-Please see the line of code in server.cpp that sets the XtAppContext
-in the TAO_XT_Resource_factory.
-
-One more interseting observation would be to note that the server and
-client  run on the Xt event loop by calling the  XtAppMainLoop ().
+these information TAO provides a class by name TAO_XtResource_Loader which is
+responsible for create and instance of TAO_XtResource_Factory that inherits
+from the TAO_Default_Resource_factory. TAO_XtResource_Loader has a constructor
+parameterized the application context necessary for integration of ACE_XtReactor
+with Xt event loop.
+
+Please notice also that the server and client  run on the Xt event loop by
+calling the  XtAppMainLoop ().
 
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
index 9020bdd4e44..9f55249b27b 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
@@ -2,7 +2,6 @@
 
 #include "Stopwatch_display.h"
 
-#if defined (ACE_HAS_XT)
 
 #include "ace/OS_NS_stdio.h"
 
@@ -58,4 +57,3 @@ Stopwatch_display::set_time (CORBA::Float time)
   XmStringFree (xmstr);
 }
 
-#endif /*ACE_HAS_XT*/
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
index dd62dd9d5eb..984d90b4d35 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
@@ -18,8 +18,6 @@
 #include /**/ "ace/pre.h"
 #include "tao/ORB_Constants.h"
 
-#if defined (ACE_HAS_XT)
-
 #include <Xm/Xm.h>
 #include <Xm/Frame.h>
 #include <Xm/Label.h>
@@ -48,7 +46,6 @@ private:
   // Label Widget that is used to display time..
 };
 
-#endif /*ACE_HAS_XT*/
 
 #include /**/ "ace/post.h"
 #endif /* STOPWATCH_H */
diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
index fa1415dbe43..d98e1e04898 100644
--- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
+++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
-  requires += xt_reactor
+project(*Server): taoexe, portableserver, tao_xtresource, ace_motif {
   Source_Files {
     test_i.cpp
     Stopwatch_display.cpp
@@ -11,8 +10,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
-  requires += xt_reactor
+project(*Client): taoexe, tao_xtresource, ace_motif {
   Source_Files {
     testC.cpp
     Control.cpp
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index f40fe31f222..713ddb68f84 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -5,17 +5,6 @@
 
 ACE_RCSID(Xt_Stopwatch, client, "$Id$")
 
-#if !defined (ACE_HAS_XT)
-
-int
-main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "Xt not supported on this platform\n"));
-  return 0;
-}
-
-#else
 #include "Control.h"
 #include "Client.h"
 
@@ -34,7 +23,7 @@ main (int argc, char *argv[])
                                      NULL,
                                      0);
 
-  TAO_XT_Resource_Factory::set_context (app);
+  TAO::XtResource_Loader xt_loader (app);
 
   Control control (toplevel);
 
@@ -119,7 +108,7 @@ Client::parse_args (int argc,
 void
 Client::add_callback (Control &ctrl)
 {
-  XtPointer client_data = ACE_static_cast (XtPointer, this);
+  XtPointer client_data = static_cast<XtPointer> (this);
 
   // Register callbacks, specifying the object's instance pointer as
   // client data.
@@ -139,8 +128,7 @@ Client::start_callback (Widget /*widget*/,
                         XtPointer client_data,
                         XtPointer)
 {
-  Client *self = ACE_static_cast (Client *,
-                                  client_data);
+  Client *self = static_cast<Client *> (client_data);
   self->start_hook ();
 }
 
@@ -149,8 +137,7 @@ Client::stop_callback (Widget /*widget*/,
                        XtPointer client_data,
                        XtPointer )
 {
-  Client *self = ACE_static_cast (Client *,
-                                  client_data);
+  Client *self = static_cast<Client *> (client_data);
   self->stop_hook ();
 }
 
@@ -191,4 +178,3 @@ Client::stop_hook (void)
   ACE_CHECK;
 }
 
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index d7febb879c3..374dcb368f0 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -8,20 +8,7 @@ ACE_RCSID (Xt_Stopwatch,
            server,
            "$Id$")
 
-
-#if !defined (ACE_HAS_XT)
-
-int
-main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "Xt not supported on this platform\n"));
-  return 0;
-}
-
-#else
-
-#include "tao/xt_resource.h"
+#include "tao/XtResource_Loader.h"
 #include <Xm/Xm.h>
 #include "Stopwatch_display.h"
 #include "timer.h"
@@ -72,7 +59,7 @@ main (int argc, char *argv[])
                                      NULL,
                                      0);
 
-  TAO_XT_Resource_Factory::set_context (app);
+  TAO::XtResource_Loader xt_loader (app);
 
   Stopwatch_display stopwatch (toplevel);
 
@@ -157,4 +144,3 @@ main (int argc, char *argv[])
   return 0;
 }
 
-#endif /* ACE_HAS_Xt */
diff --git a/TAO/tests/Xt_Stopwatch/svc.conf b/TAO/tests/Xt_Stopwatch/svc.conf
deleted file mode 100644
index 9d6894193c4..00000000000
--- a/TAO/tests/Xt_Stopwatch/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_XT_Resource_Factory() ""
diff --git a/TAO/tests/Xt_Stopwatch/svc.conf.xml b/TAO/tests/Xt_Stopwatch/svc.conf.xml
deleted file mode 100644
index 58ce9b10ea3..00000000000
--- a/TAO/tests/Xt_Stopwatch/svc.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/Xt_Stopwatch/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="TAO" init="_make_TAO_XT_Resource_Factory"/>
- </dynamic>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index e224eb939df..de99f651892 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -2,13 +2,7 @@
 
 #include "test_i.h"
 
-#if defined(ACE_HAS_XT)
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(FL_Cube, test_i, "$Id$")
+ACE_RCSID(Xt_Stopwatch, test_i, "$Id$")
 
 Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
   : orb_ (CORBA::ORB::_duplicate (orb)),
@@ -37,4 +31,3 @@ Stopwatch_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->orb_->shutdown (0);
 }
 
-#endif /* ACE_HAS_XT */
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index 1450ca0a48b..33e4e0e826f 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -19,7 +19,6 @@
 #include "testS.h"
 #include "timer.h"
 
-#if defined(ACE_HAS_XT)
 
 class Stopwatch_imp : public POA_Stopwatch
 {
@@ -51,10 +50,4 @@ private:
   // Hold the timer object...
 };
 
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_XT */
-
 #endif /* SERVER_TEST_I_H */
diff --git a/TAO/tests/Xt_Stopwatch/test_i.i b/TAO/tests/Xt_Stopwatch/test_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/Xt_Stopwatch/test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/Xt_Stopwatch/timer.cpp b/TAO/tests/Xt_Stopwatch/timer.cpp
index 35716040392..ce807616e3e 100644
--- a/TAO/tests/Xt_Stopwatch/timer.cpp
+++ b/TAO/tests/Xt_Stopwatch/timer.cpp
@@ -1,7 +1,6 @@
 //$Id$
 #include "timer.h"
 
-#if defined (ACE_HAS_XT)
 
 Timer_imp::Timer_imp (XtAppContext &app,
                       CORBA::Long interval,
@@ -55,8 +54,7 @@ Timer_imp::tick_callback (XtPointer client_data,
                           XtIntervalId * )
 {
   // Get the object pointer and call the corresponding tick function
-  Timer_imp *obj = ACE_static_cast (Timer_imp *,
-                                    client_data);
+  Timer_imp *obj = static_cast<Timer_imp *> (client_data);
   obj->tick ();
 }
 
@@ -84,4 +82,3 @@ Timer_imp::report_time (CORBA::Float time)
 }
 
 
-#endif /*ACE_HAS_XT*/
diff --git a/TAO/tests/Xt_Stopwatch/timer.h b/TAO/tests/Xt_Stopwatch/timer.h
index 08ae4345a40..6c2362cb1a3 100644
--- a/TAO/tests/Xt_Stopwatch/timer.h
+++ b/TAO/tests/Xt_Stopwatch/timer.h
@@ -18,7 +18,6 @@
 
 #include "Stopwatch_display.h"
 
-#if defined (ACE_HAS_XT)
 
 #include <Xm/Xm.h>
 
@@ -69,6 +68,5 @@ class Timer_imp
   // Required by Xt functions
 };
 
-#endif /*ACE_HAS_XT*/
 
 #endif /* TIMER_H */
diff --git a/TAO/utils/NamingViewer/BindDialog.cpp b/TAO/utils/NamingViewer/BindDialog.cpp
index b12102c7bde..a7a0c2b7cdb 100644
--- a/TAO/utils/NamingViewer/BindDialog.cpp
+++ b/TAO/utils/NamingViewer/BindDialog.cpp
@@ -48,54 +48,54 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CBindDialog message handlers
 
-void CBindDialog::OnViewior() 
+void CBindDialog::OnViewior()
 {
 	// TODO: Add your control notification handler code here
   try
   {
     UpdateData();
-    m_Object = m_pORB->string_to_object(m_IOR);
+    m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR));
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
     return;
   }
   ViewIORDialog Dialog(m_pORB, m_Object);
   Dialog.DoModal();
 }
 
-BOOL CBindDialog::OnInitDialog() 
+BOOL CBindDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	
 	// TODO: Add extra initialization here
 	if(m_Context)
   {
-    SetWindowText("Bind Context");
+    SetWindowText(ACE_TEXT ("Bind Context"));
   }
   else
   {
-    SetWindowText("Bind Object");
+    SetWindowText(ACE_TEXT ("Bind Object"));
   }
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CBindDialog::OnOK() 
+void CBindDialog::OnOK()
 {
 	// TODO: Add extra validation here
 	UpdateData();
   m_Name.length(1);
-  m_Name[0].id = CORBA::string_dup(m_ID);
-  m_Name[0].kind = CORBA::string_dup(m_Kind);
+  m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID));
+  m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind));
   try
   {
-    m_Object = m_pORB->string_to_object(m_IOR);
+    m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR));
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "Invalid IOR");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("Invalid IOR"));
     return;
   }
   CDialog::OnOK();
diff --git a/TAO/utils/NamingViewer/BindNewContext.cpp b/TAO/utils/NamingViewer/BindNewContext.cpp
index 66d7f942ca3..a846fa6cf3c 100644
--- a/TAO/utils/NamingViewer/BindNewContext.cpp
+++ b/TAO/utils/NamingViewer/BindNewContext.cpp
@@ -43,12 +43,12 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CBindNewContext message handlers
 
-void CBindNewContext::OnOK() 
+void CBindNewContext::OnOK()
 {
 	// TODO: Add extra validation here
 	UpdateData();
   m_Name.length(1);
-  m_Name[0].id = CORBA::string_dup(m_ID);
-  m_Name[0].kind = CORBA::string_dup(m_Kind);
+  m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID));
+  m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind));
 	CDialog::OnOK();
 }
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
index 8bdf87e1613..112d769ee01 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
@@ -48,13 +48,13 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CNamingTreeCtrl message handlers
 
-void CNamingTreeCtrl::OnRButtonDown (UINT nFlags, CPoint point) 
+void CNamingTreeCtrl::OnRButtonDown (UINT nFlags, CPoint point)
 {
   // TODO: Add your message handler code here and/or call default
   // Special case here - this causes the entry to be selected when the
   // right button is the first to be hit.  strange
   OnLButtonDown (nFlags, point);
-  
+
   // Now find the item were hitting
   HTREEITEM hItem = HitTest(point);
   if(!hItem)
@@ -70,21 +70,31 @@ void CNamingTreeCtrl::OnRButtonDown (UINT nFlags, CPoint point)
   // If this is not a context, show the object popup
   if(!pObject->IsContext())
     {
-      if(!m_ObjectPopup.GetSubMenu(0)->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, Point.x, Point.y, this))
+      if(!m_ObjectPopup.GetSubMenu(0)->TrackPopupMenu(
+#if defined (TPM_RIGHTBUTTON)
+		                                              TPM_RIGHTBUTTON |
+#endif
+                                            		  TPM_LEFTALIGN,
+		                                              Point.x, Point.y, this))
         {
           TRACE0("TrackPopupMenu Failed");
         }
     }
   else
     {
-      if(!m_ContextPopup.GetSubMenu(0)->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, Point.x, Point.y, this))
+      if(!m_ContextPopup.GetSubMenu(0)->TrackPopupMenu(
+#if defined (TPM_RIGHTBUTTON)
+		                                              TPM_RIGHTBUTTON |
+#endif
+		                                               TPM_LEFTALIGN,
+		                                               Point.x, Point.y, this))
         {
           TRACE0("TrackPopupMenu Failed");
         }
     }
 }
 
-void CNamingTreeCtrl::OnContextPopupViewreference() 
+void CNamingTreeCtrl::OnContextPopupViewreference()
 {
 	// TODO: Add your command handler code here
 	ViewIORDialog Dialog(m_pORB, GetTreeObject()->Object());
@@ -117,7 +127,7 @@ void CNamingTreeCtrl::ClearChildren(HTREEITEM hItem)
     HTREEITEM hItem = GetRootItem();
     if(hItem)
     {
-      
+
       //CORBA::Object_var Object = (CORBA::Object_ptr)GetItemData(hItem);
       ClearChildren(hItem);
       delete GetTreeObject(hItem);
@@ -151,20 +161,20 @@ void CNamingTreeCtrl::ListContext(HTREEITEM hItem)
     {
       return;
     }
-    
+
     // List the contexts entries
     CosNaming::BindingList_var bl;
     CosNaming::BindingIterator_var bi;
     Context->list(LISTQUANTUM, bl, bi);
     ListBindingList(hItem, Context, bl);
-    
+
     if(!CORBA::is_nil(bi))
     {
       while(bl->length())
       {
         CString Text;
-        Text.Format("This context contains more than %d entries, list the next %d?", LISTQUANTUM, LISTQUANTUM);
-        if(MessageBox(Text, "Question", MB_YESNO) == IDNO)
+        Text.Format(ACE_TEXT ("This context contains more than %d entries, list the next %d?"), LISTQUANTUM, LISTQUANTUM);
+        if(MessageBox(Text, ACE_TEXT ("Question"), MB_YESNO) == IDNO)
         {
           return;
         }
@@ -176,11 +186,11 @@ void CNamingTreeCtrl::ListContext(HTREEITEM hItem)
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
-void CNamingTreeCtrl::OnItemexpanding(NMHDR* pNMHDR, LRESULT* pResult) 
+void CNamingTreeCtrl::OnItemexpanding(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
 	// TODO: Add your control notification handler code here
@@ -193,7 +203,7 @@ void CNamingTreeCtrl::OnItemexpanding(NMHDR* pNMHDR, LRESULT* pResult)
   ListContext(pNMTreeView->itemNew.hItem);
 }
 
-void CNamingTreeCtrl::OnContextPopupRefresh() 
+void CNamingTreeCtrl::OnContextPopupRefresh()
 {
 	// TODO: Add your command handler code here
 	HTREEITEM hItem = GetSelectedItem();
@@ -201,10 +211,11 @@ void CNamingTreeCtrl::OnContextPopupRefresh()
   ListContext(hItem);
 }
 
-void CNamingTreeCtrl::OnContextPopupUnbind() 
+void CNamingTreeCtrl::OnContextPopupUnbind()
 {
 	// TODO: Add your command handler code here
-  if(MessageBox("Are you sure you want to unbind this object?", "Confirm", MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
+  if(MessageBox(ACE_TEXT ("Are you sure you want to unbind this object?"),
+	            ACE_TEXT ("Confirm"), MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
   {
     return;
   }
@@ -226,7 +237,7 @@ void CNamingTreeCtrl::OnContextPopupUnbind()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
@@ -235,7 +246,7 @@ void CNamingTreeCtrl::Resolve(CosNaming::NamingContext_ptr pRootContext)
   ClearChildren();
   if(!CORBA::is_nil(pRootContext))
   {
-    HTREEITEM hItem = InsertItem("Root");
+    HTREEITEM hItem = InsertItem(ACE_TEXT ("Root"));
     CosNaming::Name Name;
     Name.length(1);
     Name[0].id = CORBA::string_dup("Root");
@@ -244,10 +255,11 @@ void CNamingTreeCtrl::Resolve(CosNaming::NamingContext_ptr pRootContext)
   }
 }
 
-void CNamingTreeCtrl::OnContextPopupDestroy() 
+void CNamingTreeCtrl::OnContextPopupDestroy()
 {
 	// TODO: Add your command handler code here
-  if(MessageBox("Are you sure you want to destroy this context?", "Confirm", MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
+  if(MessageBox(ACE_TEXT ("Are you sure you want to destroy this context?"),
+	            ACE_TEXT ("Confirm"), MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
   {
     return;
   }
@@ -274,11 +286,11 @@ void CNamingTreeCtrl::OnContextPopupDestroy()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
-void CNamingTreeCtrl::OnContextPopupBindContext() 
+void CNamingTreeCtrl::OnContextPopupBindContext()
 {
 	// TODO: Add your command handler code here
   CBindDialog Dialog(true, m_pORB);
@@ -297,7 +309,7 @@ void CNamingTreeCtrl::OnContextPopupBindContext()
     CosNaming::NamingContext_var NewContext = CosNaming::NamingContext::_narrow(Dialog.GetObject());
     if(CORBA::is_nil(NewContext))
     {
-      AfxMessageBox("Object is not a CosNaming::NamingContext");
+      AfxMessageBox(ACE_TEXT ("Object is not a CosNaming::NamingContext"));
       return;
     }
     Context->bind_context(Dialog.GetName(), NewContext);
@@ -305,11 +317,11 @@ void CNamingTreeCtrl::OnContextPopupBindContext()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
-void CNamingTreeCtrl::OnContextPopupBindobject() 
+void CNamingTreeCtrl::OnContextPopupBindobject()
 {
 	// TODO: Add your command handler code here
   CBindDialog Dialog(false, m_pORB);
@@ -331,11 +343,11 @@ void CNamingTreeCtrl::OnContextPopupBindobject()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
-void CNamingTreeCtrl::OnDestroy() 
+void CNamingTreeCtrl::OnDestroy()
 {
 	CTreeCtrl::OnDestroy();
 	
@@ -345,7 +357,7 @@ void CNamingTreeCtrl::OnDestroy()
 }
 
 
-void CNamingTreeCtrl::OnContextpopupBindnewcontext() 
+void CNamingTreeCtrl::OnContextpopupBindnewcontext()
 {
 	// TODO: Add your command handler code here
   HTREEITEM hItem = GetSelectedItem();
@@ -369,11 +381,11 @@ void CNamingTreeCtrl::OnContextpopupBindnewcontext()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
-void CNamingTreeCtrl::OnDblclk(NMHDR* pNMHDR, LRESULT* pResult) 
+void CNamingTreeCtrl::OnDblclk(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	// TODO: Add your control notification handler code here
 	CNamingObject* pObject = GetTreeObject();
@@ -387,7 +399,7 @@ void CNamingTreeCtrl::OnDblclk(NMHDR* pNMHDR, LRESULT* pResult)
 	*pResult = 0;
 }
 
-void CNamingTreeCtrl::OnCopy() 
+void CNamingTreeCtrl::OnCopy()
 {
 	// TODO: Add your command handler code here
   CNamingObject* pObject = GetTreeObject();
@@ -406,11 +418,11 @@ void CNamingTreeCtrl::OnCopy()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
-LRESULT CNamingTreeCtrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) 
+LRESULT CNamingTreeCtrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 {
 	// TODO: Add your specialized code here and/or call the base class
 	if(message == WM_HOTKEY)
@@ -423,10 +435,11 @@ LRESULT CNamingTreeCtrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 	return CTreeCtrl::WindowProc(message, wParam, lParam);
 }
 
-void CNamingTreeCtrl::OnObjectpopupUnbind() 
+void CNamingTreeCtrl::OnObjectpopupUnbind()
 {
 	// TODO: Add your command handler code here
-  if(MessageBox("Are you sure you want to unbind this object?", "Confirm", MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
+  if(MessageBox(ACE_TEXT ("Are you sure you want to unbind this object?"),
+	            ACE_TEXT ("Confirm"), MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
   {
     return;
   }
@@ -448,11 +461,11 @@ void CNamingTreeCtrl::OnObjectpopupUnbind()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }	
 }
 
-void CNamingTreeCtrl::OnObjectpopupViewrefrence() 
+void CNamingTreeCtrl::OnObjectpopupViewrefrence()
 {
 	// TODO: Add your command handler code here
 	ViewIORDialog Dialog(m_pORB, GetTreeObject()->Object());
@@ -473,11 +486,11 @@ void CNamingTreeCtrl::ListBindingList(HTREEITEM hItem, CosNaming::NamingContext_
       const char* pKind = (bl[i].binding_name[0]).kind;
       if(*pKind)
       {
-        Name.Format("%s | %s", (bl[i].binding_name[0]).id, pKind);
+        Name.Format(ACE_TEXT ("%s | %s"), (bl[i].binding_name[0]).id, pKind);
       }
       else
       {
-        Name.Format("%s", (bl[i].binding_name[0]).id);
+        Name.Format(ACE_TEXT ("%s"), (bl[i].binding_name[0]).id);
       }
       HTREEITEM hContext = InsertItem(Name, hItem);
       SetItemData(hContext, (DWORD)pNewObject);
@@ -500,7 +513,7 @@ void CNamingTreeCtrl::ListBindingList(HTREEITEM hItem, CosNaming::NamingContext_
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp
index a1b60a4386b..2f86a0d3a4a 100644
--- a/TAO/utils/NamingViewer/NamingViewer.cpp
+++ b/TAO/utils/NamingViewer/NamingViewer.cpp
@@ -5,6 +5,7 @@
 #include "NamingViewerDlg.h"
 #include "ace/ARGV.h"
 #include "ace/ACE.h"
+#include "ace/Argv_Type_Converter.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -47,21 +48,24 @@ BOOL CNamingViewerApp::InitInstance()
 	//  of your final executable, you should remove from the following
 	//  the specific initialization routines you do not need.
 
+#if !defined (_WIN32_WCE)
 #ifdef _AFXDLL
 	Enable3dControls();			// Call this when using MFC in a shared DLL
 #else
 	Enable3dControlsStatic();	// Call this when linking to MFC statically
 #endif
+#endif
 
   // Parse command line arguments so we can initialize ORB with them
-  ACE_ARGV Argv(m_lpCmdLine);
+  ACE_ARGV Argv(ACE_TEXT_CHAR_TO_TCHAR(m_lpCmdLine));
 
   ACE::init();
   {
     
     int argc = Argv.argc();
-    char** argv = Argv.argv();
-    CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv);
+    ACE_Argv_Type_Converter argcon (argc, Argv.argv ());
+    CORBA::ORB_var ORB = CORBA::ORB_init(argcon.get_argc (),
+                                         argcon.get_ASCII_argv ());
 	  CNamingViewerDlg dlg(ORB);
 	  m_pMainWnd = &dlg;
 	  int nResponse = dlg.DoModal();
diff --git a/TAO/utils/NamingViewer/NamingViewer.mpc b/TAO/utils/NamingViewer/NamingViewer.mpc
index 372bff084c8..ac0d95cf323 100644
--- a/TAO/utils/NamingViewer/NamingViewer.mpc
+++ b/TAO/utils/NamingViewer/NamingViewer.mpc
@@ -3,6 +3,7 @@
 
 project : namingexe, ace_mfc {
   exename    = NamingViewer
+  requires  += exceptions
   install    = $(ACE_ROOT)/bin
   pch_header = StdAfx.h
   pch_source = StdAfx.cpp
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
index fc741184c38..0e7520cf8db 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
@@ -13,6 +13,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+
 /////////////////////////////////////////////////////////////////////////////
 // CAboutDlg dialog used for App About
 
@@ -91,7 +92,9 @@ BEGIN_MESSAGE_MAP(CNamingViewerDlg, CDialog)
 	ON_BN_CLICKED(IDC_SELECT_NS, OnSelectNs)
 	ON_WM_SIZE()
 	//}}AFX_MSG_MAP
+#if !defined (_WIN32_WCE)
   ON_WM_GETMINMAXINFO()
+#endif
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -107,6 +110,7 @@ BOOL CNamingViewerDlg::OnInitDialog()
 	ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
 	ASSERT(IDM_ABOUTBOX < 0xF000);
 
+#if !defined (_WIN32_WCE)
 	CMenu* pSysMenu = GetSystemMenu(FALSE);
 	if (pSysMenu != NULL)
 	{
@@ -118,6 +122,7 @@ BOOL CNamingViewerDlg::OnInitDialog()
 			pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);
 		}
 	}
+#endif
 
 	// Set the icon for this dialog.  The framework does this automatically
 	//  when the application's main window is not a dialog
@@ -175,8 +180,6 @@ void CNamingViewerDlg::OnPaint()
 	{
 		CPaintDC dc(this); // device context for painting
 
-		SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0);
-
 		// Center icon in client rectangle
 		int cxIcon = GetSystemMetrics(SM_CXICON);
 		int cyIcon = GetSystemMetrics(SM_CYICON);
@@ -206,7 +209,7 @@ void CNamingViewerDlg::Resolve()
   m_Tree.Resolve(m_RootContext);
 }
 
-void CNamingViewerDlg::OnSelectNs() 
+void CNamingViewerDlg::OnSelectNs()
 {
 	// TODO: Add your control notification handler code here
 	CSelectNSDialog Dialog;
@@ -216,7 +219,7 @@ void CNamingViewerDlg::OnSelectNs()
   }
   try
   {
-    CORBA::Object_var Object = m_pORB->string_to_object(Dialog.GetIOR());
+    CORBA::Object_var Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (Dialog.GetIOR()));
     m_RootContext = CosNaming::NamingContext::_narrow(Object);
     m_Server = Dialog.GetName();
     UpdateData(FALSE);
@@ -224,19 +227,19 @@ void CNamingViewerDlg::OnSelectNs()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
-void CNamingViewerDlg::OnSize(UINT nType, int cx, int cy) 
+void CNamingViewerDlg::OnSize(UINT nType, int cx, int cy)
 {
 	CDialog::OnSize(nType, cx, cy);
 	// TODO: Add your message handler code here
-  
+
   // Resize the tree control
   if(m_Tree.m_hWnd)
   {
-    CRect Size; 
+    CRect Size;
     m_Tree.GetWindowRect(Size);
     ScreenToClient(Size);
     int Border = Size.left;
@@ -246,6 +249,7 @@ void CNamingViewerDlg::OnSize(UINT nType, int cx, int cy)
   }
 }
 
+#if !defined (_WIN32_WCE)
 void CNamingViewerDlg::OnGetMinMaxInfo( MINMAXINFO FAR* lpMMI )
 {
   // Prevent the window from being resized too small
@@ -259,3 +263,4 @@ void CNamingViewerDlg::OnGetMinMaxInfo( MINMAXINFO FAR* lpMMI )
     lpMMI->ptMinTrackSize.y = 200;
   }
 }
+#endif
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.h b/TAO/utils/NamingViewer/NamingViewerDlg.h
index fbda6676e4d..d11f272dc10 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.h
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.h
@@ -11,6 +11,7 @@
 
 #include "orbsvcs/CosNamingC.h"
 #include "NamingTreeCtrl.h"
+
 /////////////////////////////////////////////////////////////////////////////
 // CNamingViewerDlg dialog
 
@@ -46,9 +47,10 @@ protected:
 	afx_msg void OnSelectNs();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	//}}AFX_MSG
+#if !defined (_WIN32_WCE)
   afx_msg void OnGetMinMaxInfo( MINMAXINFO FAR* lpMMI );
+#endif
 	DECLARE_MESSAGE_MAP()
-
   void Resolve();
 
   CORBA::ORB_ptr                  m_pORB;
diff --git a/TAO/utils/NamingViewer/SelectNSDialog.cpp b/TAO/utils/NamingViewer/SelectNSDialog.cpp
index 968ce45c7c7..401816b527c 100644
--- a/TAO/utils/NamingViewer/SelectNSDialog.cpp
+++ b/TAO/utils/NamingViewer/SelectNSDialog.cpp
@@ -6,6 +6,8 @@
 #include "NamingViewer.h"
 #include "SelectNSDialog.h"
 #include "AddNameServerDlg.h"
+#include "ace/SString.h"
+#include "ace/OS_NS_String.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -47,13 +49,13 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CSelectNSDialog message handlers
 
-void CSelectNSDialog::OnOK() 
+void CSelectNSDialog::OnOK()
 {
 	// TODO: Add extra validation here
 	int index = m_Servers.GetCurSel();
   if(index == LB_ERR)
   {
-    AfxMessageBox("You must select a server or cancel");
+    AfxMessageBox(ACE_TEXT ("You must select a server or cancel"));
     return;
   }
   char* pIOR = (char*)m_Servers.GetItemData(index);
@@ -62,7 +64,7 @@ void CSelectNSDialog::OnOK()
 	CDialog::OnOK();
 }
 
-void CSelectNSDialog::OnAdd() 
+void CSelectNSDialog::OnAdd()
 {
 	// TODO: Add your control notification handler code here
 	CAddNameServerDlg Dialog;
@@ -71,16 +73,16 @@ void CSelectNSDialog::OnAdd()
     return;
   }
   ACE_Configuration_Section_Key Section = m_pConfig->root_section();
-  ACE_TString Value = Dialog.m_IOR;
+  ACE_CString Value = Dialog.m_IOR;
   m_pConfig->set_string_value(Section, Dialog.m_Name, Value);
   int pos = m_Servers.AddString(Dialog.m_Name);
   char* pIOR = new char[Value.length() + 1];
-  strcpy(pIOR, Value.c_str());
+  ACE_OS::strcpy(pIOR, Value.c_str());
   m_Servers.SetItemData(pos, (DWORD)pIOR);
 
 }
 
-void CSelectNSDialog::OnRemove() 
+void CSelectNSDialog::OnRemove()
 {
 	// TODO: Add your control notification handler code here
 	int index = m_Servers.GetCurSel();
@@ -96,16 +98,16 @@ void CSelectNSDialog::OnRemove()
   m_Servers.DeleteString(index);
 }
 
-BOOL CSelectNSDialog::OnInitDialog() 
+BOOL CSelectNSDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	
 	// TODO: Add extra initialization here
-  HKEY hKey = ACE_Configuration_Win32Registry::resolve_key(HKEY_LOCAL_MACHINE, "Software\\TAO\\NamingViewer\\Servers");
+  HKEY hKey = ACE_Configuration_Win32Registry::resolve_key(HKEY_LOCAL_MACHINE, ACE_TEXT("Software\\TAO\\NamingViewer\\Servers"));
   m_pConfig = new ACE_Configuration_Win32Registry(hKey);
   ACE_Configuration_Section_Key Section = m_pConfig->root_section();;
-  int index = 0; 
-  ACE_TString name; 
+  int index = 0;
+  ACE_TString name;
   ACE_Configuration::VALUETYPE type;
   while(m_pConfig->enumerate_values(Section, index, name, type) == 0)
   {
@@ -114,7 +116,7 @@ BOOL CSelectNSDialog::OnInitDialog()
     {
       int pos = m_Servers.AddString(name.c_str());
       char* pIOR = new char[value.length() + 1];
-      strcpy(pIOR, value.c_str());
+      ACE_OS::strcpy(pIOR, value.c_str());
       m_Servers.SetItemData(pos, (DWORD)pIOR);
     }
     index++;
@@ -124,7 +126,7 @@ BOOL CSelectNSDialog::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CSelectNSDialog::OnDestroy() 
+void CSelectNSDialog::OnDestroy()
 {
 	CDialog::OnDestroy();
 	
diff --git a/TAO/utils/NamingViewer/ViewIORDialog.cpp b/TAO/utils/NamingViewer/ViewIORDialog.cpp
index 240f4ad06fb..f7724f02d70 100644
--- a/TAO/utils/NamingViewer/ViewIORDialog.cpp
+++ b/TAO/utils/NamingViewer/ViewIORDialog.cpp
@@ -53,7 +53,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ViewIORDialog message handlers
 
-BOOL ViewIORDialog::OnInitDialog() 
+BOOL ViewIORDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	
@@ -63,18 +63,18 @@ BOOL ViewIORDialog::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void ViewIORDialog::OnApply() 
+void ViewIORDialog::OnApply()
 {
 	// TODO: Add your control notification handler code here
   UpdateData();
   try
   {
-    m_Object = m_pORB->string_to_object(m_IOR);
+    m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR));
     DecodeIOR();
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ex._rep_id(), "CORBA::Exception");
+    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
@@ -84,19 +84,19 @@ void ViewIORDialog::DecodeIOR()
   m_Profiles.DeleteAllItems();
   m_TypeID = "";
   UpdateData(FALSE);
-  
+
   // if object is nil, return out
   if(CORBA::is_nil(m_Object))
   {
     return;
   }
-  
+
   // Get the stub
   TAO_Stub* pStub = m_Object->_stubobj();
   const char* pType = pStub->type_id;
   m_TypeID = pType ? pType : ""; // special case for INS objects, tao doesn't get the type id
   UpdateData(FALSE);
-  
+
   // Iterate through each profile and add an entry to the tree control
   const TAO_MProfile& BaseProfiles= pStub->base_profiles();
   CORBA::ULong Count = BaseProfiles.profile_count();
@@ -106,12 +106,12 @@ void ViewIORDialog::DecodeIOR()
     HTREEITEM hProfile;
     switch(pProfile->tag())
     {
-    case 0: //IOP::TAG_INTERNET_IOP: 
+    case 0: //IOP::TAG_INTERNET_IOP:
       {
         TAO_IIOP_Profile* pIIOPProfile = (TAO_IIOP_Profile*)pProfile;
         CString ProfileString;
-        ProfileString.Format("IIOP %d.%d", 
-          pIIOPProfile->version().major, 
+        ProfileString.Format(ACE_TEXT ("IIOP %d.%d"),
+          pIIOPProfile->version().major,
           pIIOPProfile->version().minor);
         hProfile = m_Profiles.InsertItem(ProfileString);
         TAO_IIOP_Endpoint* pIIOPEndpoint =
@@ -119,21 +119,21 @@ void ViewIORDialog::DecodeIOR()
         while(pIIOPEndpoint)
         {
           CString EndpointString;
-          EndpointString.Format("%s:%d",
-            pIIOPEndpoint->host(), 
+          EndpointString.Format(ACE_TEXT ("%s:%d"),
+            pIIOPEndpoint->host(),
             pIIOPEndpoint->port());
           HTREEITEM hItem = m_Profiles.InsertItem(EndpointString, hProfile);
           m_Profiles.EnsureVisible(hItem);
           pIIOPEndpoint = (TAO_IIOP_Endpoint*)pIIOPEndpoint->next();
         }
-      
+
       }
       break;
     default:
       {
         CString ProfileString;
         char* pToString = ((TAO_Profile*)pProfile)->to_string();
-        ProfileString.Format("Unknown Profile (Tag=%d) %s", pProfile->tag(), pToString);
+        ProfileString.Format(ACE_TEXT ("Unknown Profile (Tag=%d) %s"), pProfile->tag(), pToString);
         delete pToString;
         hProfile = m_Profiles.InsertItem(ProfileString);
       }
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 494a15cd204..a090259fcb4 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -17,24 +17,25 @@
 //      Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com>
 //
 // ============================================================================
-// FUZZ: disable check_for_streams_include
 
 #include "ace/Codeset_Registry.h"
 #include "ace/Get_Opt.h"
 #include "ace/streams.h"
-#include "ace/os_include/os_ctype.h"
+#include "ace/OS_NS_ctype.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
+#include "tao/corba.h"
 #include "tao/IIOP_Profile.h"
 #include "tao/Messaging_PolicyValueC.h"
 #include "tao/Messaging/Messaging_RT_PolicyC.h"
 #include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
 #include "tao/Messaging/Messaging_No_ImplC.h"
 #include "tao/RTCORBA/RTCORBA.h"
-#include "tao/Typecode.h"
+//#include "tao/Typecode.h"
 #include "tao/Marshal.h"
-#include "tao/ORB_Constants.h"
+//#include "tao/ORB_Constants.h"
 #include "tao/Transport_Acceptor.h"
 #include "tao/IIOP_EndpointsC.h"
-#include "tao/CDR.h"
 
 
 static CORBA::Boolean
@@ -57,8 +58,8 @@ catiiop (char* string
 
   CORBA::Short  iiop_version_major, iiop_version_minor;
 
-  if (isdigit (string [0])
-      && isdigit (string [2])
+  if (ACE_OS::ace_isdigit (string [0])
+      && ACE_OS::ace_isdigit (string [2])
       && string [1] == '.'
       && string [3] == '/'
       && string [4] == '/')
@@ -132,8 +133,10 @@ catiiop (char* string
 static CORBA::Boolean
 cat_iiop_profile (TAO_InputCDR& cdr);
 
+#if 0
 static CORBA::Boolean
 cat_sciop_profile (TAO_InputCDR& cdr);
+#endif /*if 0*/
 
 static CORBA::Boolean
 cat_uiop_profile (TAO_InputCDR& cdr);
@@ -142,6 +145,12 @@ static CORBA::Boolean
 cat_shmiop_profile (TAO_InputCDR& cdr);
 
 static CORBA::Boolean
+cat_nskpw_profile (TAO_InputCDR& cdr);
+
+static CORBA::Boolean
+cat_nskfs_profile (TAO_InputCDR& cdr);
+
+static CORBA::Boolean
 cat_octet_seq (const char *object_name,
                TAO_InputCDR& stream);
 
@@ -172,7 +181,7 @@ catior (char* str
     {
       u_char byte;
 
-      if (! (isxdigit (tmp [0]) && isxdigit (tmp [1])))
+      if (! (ACE_OS::ace_isxdigit (tmp [0]) && ACE_OS::ace_isxdigit (tmp [1])))
         break;
 
       byte = (u_char) (ACE::hex2byte (tmp [0]) << 4);
@@ -189,7 +198,7 @@ catior (char* str
 
   mb.rd_ptr (1);
   mb.wr_ptr (2 * len - 1);
-  TAO_InputCDR stream (&mb, ACE_static_cast(int,byteOrder));
+  TAO_InputCDR stream (&mb, static_cast<int> (byteOrder));
 
   if (byteOrder == 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -272,12 +281,19 @@ catior (char* str
             continue_decoding = cat_iiop_profile (stream);
             ACE_DEBUG ((LM_DEBUG, "%}"));
           }
+
+// the SCIOR decoding is disabled in the main branch. This will be
+// enabled when SCTP_O branch is merged in.
+// gthaker@atl.lmco.com, Feb 11, 2003.
+#if 0
         else if (tag == TAO_TAG_SCIOP_PROFILE)
           {
             ACE_DEBUG ((LM_DEBUG, "%{"));
             continue_decoding = cat_sciop_profile (stream);
             ACE_DEBUG ((LM_DEBUG, "%}"));
           }
+#endif
+
         else if (tag == TAO_TAG_UIOP_PROFILE)
           {
             ACE_DEBUG ((LM_DEBUG, "%{"));
@@ -290,12 +306,24 @@ catior (char* str
             continue_decoding = cat_shmiop_profile (stream);
             ACE_DEBUG ((LM_DEBUG, "%}"));
           }
-        else if (tag == TAO_TAG_UDP_PROFILE)
+        else if (tag == TAO_TAG_DIOP_PROFILE)
           {
             ACE_DEBUG ((LM_DEBUG, "%{"));
             continue_decoding =  cat_profile_helper(stream, "DIOP (GIOP over UDP)");
             ACE_DEBUG ((LM_DEBUG, "%}"));
           }
+        else if (tag == TAO_TAG_NSKPW_PROFILE)
+          {
+            ACE_DEBUG ((LM_DEBUG, "%{"));
+            continue_decoding = cat_nskpw_profile (stream);
+            ACE_DEBUG ((LM_DEBUG, "%}"));
+          }
+        else if (tag == TAO_TAG_NSKFS_PROFILE)
+          {
+            ACE_DEBUG ((LM_DEBUG, "%{"));
+            continue_decoding = cat_nskfs_profile (stream);
+            ACE_DEBUG ((LM_DEBUG, "%}"));
+          }
         else
           {
             ACE_DEBUG ((LM_DEBUG, "%{"));
@@ -434,19 +462,32 @@ catpoop (char* string
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "f:");
-
   ACE_DECLARE_NEW_CORBA_ENV;
-  CORBA::ORB_var orb_var =  CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
+  ACE_Argv_Type_Converter argcon (argcw, argvw);
+  CORBA::ORB_var orb_var =  CORBA::ORB_init (argcon.get_argc (),
+                                             argcon.get_ASCII_argv (),
+                                             "TAO" ACE_ENV_ARG_PARAMETER);
   CORBA::Boolean b = 0;
   int opt;
 
+  ACE_Get_Opt get_opt (argcon.get_argc (), argcon.get_TCHAR_argv (),
+                       ACE_TEXT ("f:n:"));
+
   while ((opt = get_opt ()) != EOF)
     {
       switch (opt)
         {
+        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 ()));
+          break;
         case 'f':
           {
             //  Read the file into a CORBA::String_var.
@@ -454,6 +495,7 @@ main (int argc, char *argv[])
                         "reading the file %s\n",
                         get_opt.opt_arg ()));
 
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
             ifstream ifstr (get_opt.opt_arg ());
 
             if (!ifstr.good ())
@@ -476,6 +518,31 @@ main (int argc, char *argv[])
                     aString += ch;
                     have_some_input = 1;
                   }
+#else
+            FILE* ifstr = ACE_OS::fopen (get_opt.opt_arg (), ACE_TEXT ("r"));
+
+            if (ifstr && !ferror (ifstr))
+              {
+                if (ifstr)
+                  ACE_OS::fclose (ifstr);
+                return -1;
+              }
+
+            int have_some_input = 0;
+            while (!feof (ifstr))
+              {
+                char ch;
+                ACE_CString aString;
+
+                while (!feof (ifstr))
+                  {
+                    ch = ACE_OS::fgetc (ifstr);
+                    if (ch == '\n' || ch == EOF)
+                      break;
+                    aString += ch;
+                    have_some_input = 1;
+                  }
+#endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
                 if (have_some_input == 0)
                   break;
                 ACE_DEBUG ((LM_DEBUG,
@@ -490,7 +557,7 @@ main (int argc, char *argv[])
 
                     // Strip the IOR: off the string.
                     ACE_CString prefix = "IOR:";
-                    short prefixLength = prefix.length ();
+                    size_t prefixLength = prefix.length ();
 
                     ACE_CString subString =
                       aString.substring (prefixLength,
@@ -505,7 +572,7 @@ main (int argc, char *argv[])
                                 "decoding an IIOP URL IOR\n"));
 
                     ACE_CString prefix = "IIOP:";
-                    short prefixLength = prefix.length ();
+                    size_t prefixLength = prefix.length ();
 
                     ACE_CString subString =
                       aString.substring (prefixLength,
@@ -532,7 +599,11 @@ main (int argc, char *argv[])
             else
               ACE_DEBUG ((LM_DEBUG,
                           "catior returned false\n"));
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
             ifstr.close ();
+#else
+            ACE_OS::fclose (ifstr);
+#endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
           }
         break;
         case '?':
@@ -541,11 +612,12 @@ main (int argc, char *argv[])
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Usage: %s "
                              "-f filename "
+                             "-n CosName "
                              "\n"
                              "Reads an IOR "
                              "and dumps the contents to stdout "
                              "\n",
-                             argv[0]),
+                             argvw[0]),
                             1);
         }
     }
@@ -592,10 +664,6 @@ cat_tao_tag_endpoints (TAO_InputCDR& stream) {
   TAO::IIOPEndpointSequence epseq;
   stream2 >> epseq;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "%I Number of endpoints: %d\n",
-              epseq.length()));
-
   for (unsigned int iter=0; iter < epseq.length() ; iter++) {
     ACE_DEBUG ((LM_DEBUG,
                 "%I Endpoint #%d:\n",iter+1));
@@ -612,37 +680,25 @@ cat_tao_tag_endpoints (TAO_InputCDR& stream) {
   return 1;
 }
 
+// alternate endpoints arent supported yet
+#if 0
 static CORBA::Boolean
-cat_tag_group (TAO_InputCDR& stream) {
-/*
-ID is 27
-Component Value len:   36
-Component Value as hex:
-01 01 00 cd 0f 00 00 00 64 65 66 61 75 6c 74 2d
-64 6f 6d 61 69 6e 00 cd 01 00 00 00 00 00 00 00
-02 00 00 00
-The Component Value as string:
- ...-....default-domain.-............
-*/
-
-#if 1
-  cat_octet_seq ("TAG_GROUP", stream);
-#else
-  CORBA::Octet version_major;
-  if (stream.read_octet(version_major) == 0)
-  {
+cat_tag_alternate_endpoints (TAO_InputCDR& stream) {
+  CORBA::ULong length = 0;
+  if (stream.read_ulong (length) == 0)
     return 1;
-  }
 
-  CORBA::Octet version_minor;
-  if (stream.read_octet(version_minor) == 0)
-  {
-    return 1;
-  }
+  TAO_InputCDR stream2 (stream, length);
+  stream.skip_bytes(length);
 
-#endif
+  TAG_ALTERNATE_IIOP_Endpoint_Info ei;
+  if ((stream2  >> ei) == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,"cannot extract endpoint info\n"),0);
+  ACE_DEBUG ((LM_DEBUG,
+              "%I endpoint: %s:%u\n",ei.host.in(),(unsigned short)ei.port));
   return 1;
 }
+#endif
 
 static CORBA::Boolean
 cat_tag_policies (TAO_InputCDR& stream) {
@@ -673,7 +729,7 @@ cat_tag_policies (TAO_InputCDR& stream) {
     int byteOrder = policies[iter].pvalue[0];
     TAO_InputCDR stream3 (pmbuf,
                           policies[iter].pvalue.length(),
-                          ACE_static_cast(int,byteOrder));
+                          static_cast<int> (byteOrder));
 
     if (policies[iter].ptype == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) {
       ACE_DEBUG ((LM_DEBUG,
@@ -827,7 +883,8 @@ cat_octet_seq (const char *object_name,
   for (i = 0; i < length; i++)
     {
       char c = objKey[i];
-      if (isprint (c))
+      int tmp = (unsigned char) c; // isprint doesn't work with negative vals.(except EOF)
+      if (ACE_OS::ace_isprint (tmp))
         ACE_DEBUG ((LM_DEBUG, "%c", c));
       else
         ACE_DEBUG ((LM_DEBUG, "."));
@@ -888,7 +945,7 @@ cat_codeset_info(TAO_InputCDR& stream)
      CORBA::ULong byteOrder;
      stream >> byteOrder;
 
-     if( byteOrder )
+     if (byteOrder)
      {
         ACE_DEBUG ((LM_DEBUG,
             "\tThe Component Byte Order:\tLittle Endian\n"));
@@ -900,41 +957,42 @@ cat_codeset_info(TAO_InputCDR& stream)
      // CodesetId for char
      // CORBA::ULong c_ncsId;
      ACE_DEBUG ((LM_DEBUG, "\tNative CodeSet for char: "));
-     displayHex( stream );
+     displayHex (stream);
 
      // number of Conversion Codesets for char
      CORBA::ULong c_ccslen=0;
      stream >> c_ccslen;
      ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for char %u \n", c_ccslen));
 
-     if( c_ccslen )
+     if (c_ccslen)
         ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for char are: \n"));
 
      //  Loop through and display them
-     for(  CORBA::ULong index=0; index < c_ccslen; ++index)
+     CORBA::ULong index = 0;
+     for ( ; index < c_ccslen; ++index)
      {
         // CodesetId for char
         ACE_DEBUG ((LM_DEBUG, "\t%u) ", index + 1L));
-        displayHex( stream );
+        displayHex (stream);
      }
 
      // CodesetId for wchar
      ACE_DEBUG ((LM_DEBUG, "\tNative CodeSet for wchar: "));
-     displayHex( stream );
+     displayHex (stream);
 
      // number of Conversion Codesets for char
      CORBA::ULong w_ccslen=0;
      stream >> w_ccslen;
      ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for wchar %u \n", w_ccslen));
 
-     if( w_ccslen )
+     if (w_ccslen)
        ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for wchar are: \n"));
 
      //  Loop through and display them
-     for(  CORBA::ULong index2=0; index2 < w_ccslen; ++index2)
+     for (index = 0; index < w_ccslen; ++index)
      {
-       ACE_DEBUG ((LM_DEBUG, "\t %u) ", index2 + 1L));
-       displayHex( stream );
+       ACE_DEBUG ((LM_DEBUG, "\t %u) ", index + 1L));
+       displayHex (stream);
      }
      return 1;
 }
@@ -967,13 +1025,14 @@ cat_tagged_components (TAO_InputCDR& stream)
         ACE_DEBUG ((LM_DEBUG, "%{%{"));
         cat_codeset_info(stream);
         ACE_DEBUG ((LM_DEBUG, "%}%}"));
-
+// TAG_ALTERNATE_IIOP_ADDRESS not supported yet
+#if 0
       } else if (tag == IOP::TAG_ALTERNATE_IIOP_ADDRESS) {
         ACE_DEBUG ((LM_DEBUG,"%d (TAG_ALTERNATE_IIOP_ADDRESS)\n", tag));
         ACE_DEBUG ((LM_DEBUG, "%{%{"));
-        cat_octet_seq ("Component Value" ,stream);
+        cat_tag_alternate_endpoints (stream);
         ACE_DEBUG ((LM_DEBUG, "%}%}"));
-
+#endif
       } else if (tag == TAO_TAG_ENDPOINTS) {
         ACE_DEBUG ((LM_DEBUG,"%d (TAO_TAG_ENDPOINTS)\n", tag));
         ACE_DEBUG ((LM_DEBUG, "%{%{"));
@@ -985,16 +1044,6 @@ cat_tagged_components (TAO_InputCDR& stream)
         ACE_DEBUG ((LM_DEBUG, "%{%{"));
         cat_tag_policies(stream);
         ACE_DEBUG ((LM_DEBUG, "%}%}"));
-      } else if (tag == IOP::TAG_FT_GROUP) {  //@@ PortableGroup will rename this TAG_GROUP
-        ACE_DEBUG ((LM_DEBUG,"%d (TAG_GROUP)\n", tag));
-        ACE_DEBUG ((LM_DEBUG, "%{%{"));
-        cat_tag_group (stream);
-        ACE_DEBUG ((LM_DEBUG, "%}%}"));
-      } else if (tag == IOP::TAG_FT_PRIMARY) {   //@@ PortableGroup will rename this TAG_PRIMARY
-        ACE_DEBUG ((LM_DEBUG,"%d (TAG_PRIMARY)\n", tag));
-        ACE_DEBUG ((LM_DEBUG, "%{%{"));
-        cat_octet_seq ("TAG_PRIMARY", stream);
-        ACE_DEBUG ((LM_DEBUG, "%}%}"));
       } else {
         ACE_DEBUG ((LM_DEBUG,"%d\n", tag));
         ACE_DEBUG ((LM_DEBUG, "%{%{"));
@@ -1163,6 +1212,7 @@ cat_uiop_profile (TAO_InputCDR& stream)
   return 1;
 }
 
+#if 0
 static CORBA::Boolean
 cat_sciop_profile (TAO_InputCDR& stream)
 {
@@ -1253,3 +1303,96 @@ cat_sciop_profile (TAO_InputCDR& stream)
 
   return 1;
 }
+#endif /*if 0*/
+
+
+static CORBA::Boolean
+cat_nsk_profile_helper (TAO_InputCDR& stream,
+                        const char *protocol)
+{
+  // OK, we've got an NSK profile.  It's going to be
+  // encapsulated ProfileData.  Create a new decoding stream and
+  // context for it, and tell the "parent" stream that this data
+  // isn't part of it any more.
+
+  CORBA::ULong encap_len;
+  if (stream.read_ulong (encap_len) == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "cannot read encap length\n"));
+      return 0;
+    }
+
+  // Create the decoding stream from the encapsulation in the
+  // buffer, and skip the encapsulation.
+  TAO_InputCDR str (stream, encap_len);
+
+  if (str.good_bit () == 0 || stream.skip_bytes (encap_len) == 0)
+    return 0;
+
+  // Read and verify major, minor versions, ignoring NSK
+  // profiles whose versions we don't understand.
+  //
+  // XXX this doesn't actually go back and skip the whole
+  // encapsulation...
+  CORBA::Octet iiop_version_major, iiop_version_minor;
+  if (! (str.read_octet (iiop_version_major)
+         && iiop_version_major == 1
+         && str.read_octet (iiop_version_minor)
+         && iiop_version_minor <= 2))
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%I detected new v%d.%d %s profile that catior cannot decode",
+                  iiop_version_major,
+                  iiop_version_minor,
+                  protocol));
+      return 1;
+    }
+
+  ACE_DEBUG ((LM_DEBUG,
+              "%s Version:\t%d.%d\n",
+              protocol,
+              iiop_version_major,
+              iiop_version_minor));
+
+  // Get address
+  char* fsaddress;
+  if ((str >> fsaddress) == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%I problem decoding file system address\n"));
+      return 1;
+    }
+
+
+  ACE_DEBUG ((LM_DEBUG,
+              "%I FS Address:\t%s\n",
+              fsaddress));
+  CORBA::string_free (fsaddress);
+
+  if (cat_object_key (str) == 0)
+    return 0;
+
+  // Version 1.0 does not have tagged_components.
+  if (!(iiop_version_major == 1 && iiop_version_minor == 0))
+    {
+      if (cat_tagged_components (str) == 0)
+        return 0;
+
+      return 1;
+    }
+  else
+    return 0;
+}
+
+static CORBA::Boolean
+cat_nskpw_profile (TAO_InputCDR& stream)
+{
+  return cat_nsk_profile_helper (stream, "NSKPW");
+}
+
+static CORBA::Boolean
+cat_nskfs_profile (TAO_InputCDR& stream)
+{
+  return cat_nsk_profile_helper (stream, "NSKFS");
+}
diff --git a/TAO/utils/catior/catior.mpc b/TAO/utils/catior/catior.mpc
index 6bb4ff143fc..d46f13a598a 100644
--- a/TAO/utils/catior/catior.mpc
+++ b/TAO/utils/catior/catior.mpc
@@ -1,4 +1,5 @@
 // $Id$
 project : taoexe, rtcorba, core {
   install = $(ACE_ROOT)/bin
+  exename = catior
 }
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index a177230a856..1394726c5d2 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -20,30 +20,36 @@
 #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
-main (int argc, char *argv[])
+ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
+      ACE_Argv_Type_Converter argcon (argcw, argvw);
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
+                         "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      char *pname = argv[0];
+      int argc = argcon.get_argc ();
+      ACE_TCHAR** argv = argcon.get_TCHAR_argv ();
 
-      const char * ior = 0;
-      const char * name = 0;
+      ACE_TCHAR *pname = argv[0];
+
+      const ACE_TCHAR * ior = 0;
+      const ACE_TCHAR * name = 0;
       int rebind = 0;
       int newcontext = 0;
       while (argc > 0)
         {
-          if (ACE_OS::strcmp (*argv, "--ior") == 0)
+          if (ACE_OS::strcmp (*argv, ACE_TEXT ("--ior")) == 0)
             {
               if (argc == 1)
                 {
@@ -55,7 +61,7 @@ main (int argc, char *argv[])
               argv++;
               ior = *argv;
             }
-          else if (ACE_OS::strcmp (*argv, "--name") == 0)
+          else if (ACE_OS::strcmp (*argv, ACE_TEXT ("--name")) == 0)
             {
               if (argc == 1)
                 {
@@ -67,15 +73,15 @@ main (int argc, char *argv[])
               argv++;
               name = *argv;
             }
-          else if (ACE_OS::strcmp (*argv, "--rebind") == 0)
+          else if (ACE_OS::strcmp (*argv, ACE_TEXT ("--rebind")) == 0)
             {
               rebind = 1;
             }
-          else if (ACE_OS::strcmp(*argv, "--newcontext") == 0)
+          else if (ACE_OS::strcmp(*argv, ACE_TEXT ("--newcontext")) == 0)
           {
              newcontext = 1;
           }
-          else if (ACE_OS::strncmp (*argv, "--", 2) == 0)
+          else if (ACE_OS::strncmp (*argv, ACE_TEXT ("--"), 2) == 0)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "Usage: %s --name <name> "
@@ -98,7 +104,7 @@ main (int argc, char *argv[])
       CORBA::Object_var obj;
       if (ior)
         {
-          obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+          obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior) ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -116,7 +122,7 @@ main (int argc, char *argv[])
           return 1;
         }
       char buf[BUFSIZ];
-      ACE_OS::strcpy (buf, name);
+      ACE_OS::strcpy (buf, ACE_TEXT_ALWAYS_CHAR (name));
       char *bp = &buf[0];
       char *cp = 0;
       int ntoks = 0;
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 9905c6b40f7..ddd6ac33365 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -21,6 +21,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 CORBA::ORB_var orb;
 int showIOR = 0;
@@ -28,7 +29,7 @@ int showNSonly = 0;
 
 const char* USAGE = "Usage: %s [ --name <name> ] [--destroy]\n";
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -36,16 +37,21 @@ main (int argc, char *argv[])
   int destroy_after_unbind = 0;
   ACE_TRY
     {
+      ACE_Argv_Type_Converter argcon (argcw, argvw);
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
+                         "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      char *pname = argv[0];
-      const char *name = 0;
+      int argc = argcon.get_argc ();
+      ACE_TCHAR** argv = argcon.get_TCHAR_argv ();
+
+      ACE_TCHAR *pname = argv[0];
+      const ACE_TCHAR *name = 0;
 
       while (argc > 0)
         {
-          if (ACE_OS::strcmp (*argv, "--name") == 0)
+          if (ACE_OS::strcmp (*argv, ACE_TEXT ("--name")) == 0)
             {
               if (argc == 1)
                 {
@@ -57,11 +63,11 @@ main (int argc, char *argv[])
               argv++;
               name = *argv;
             }
-          else if (ACE_OS::strcmp (*argv, "--destroy") == 0)
+          else if (ACE_OS::strcmp (*argv, ACE_TEXT ("--destroy")) == 0)
             {
               destroy_after_unbind = 1;
             }
-          else if (ACE_OS::strncmp(*argv, "--", 2) == 0)
+          else if (ACE_OS::strncmp(*argv, ACE_TEXT ("--"), 2) == 0)
             {
               ACE_DEBUG ((LM_DEBUG, USAGE, pname));
               return 1;
@@ -78,7 +84,7 @@ main (int argc, char *argv[])
         // make a copy
 
         char buf[BUFSIZ];
-        ACE_OS::strcpy (buf, name);
+        ACE_OS::strcpy (buf, ACE_TEXT_ALWAYS_CHAR (name));
         char *bp = &buf[0];
         char *cp = 0;
         int ntoks = 0;
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index 46acd2d6b4a..80dabc861b4 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -22,6 +22,7 @@
 #include "tao/ORB_Constants.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 CORBA::ORB_var orb;
 int showIOR = 0;
@@ -41,10 +42,10 @@ get_tag_name (CORBA::ULong tag, ACE_CString& tag_string)
       tag_string = "UIOP";
   else if (tag == TAO_TAG_SHMEM_PROFILE)
       tag_string = "SHMEM";
-#ifdef TAO_TAG_UDP_PROFILE
-  else if (tag == TAO_TAG_UDP_PROFILE)
+#ifdef TAO_TAG_DIOP_PROFILE
+  else if (tag == TAO_TAG_DIOP_PROFILE)
       tag_string = "GIOP over UDP";
-#endif /* TAO_TAG_UDP_PROFILE */
+#endif /* TAO_TAG_DIOP_PROFILE */
   else
       tag_string = "Unknown tag: " + tag;
 }
@@ -214,7 +215,7 @@ list_context (CosNaming::NamingContext_ptr nc,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
   showIOR = 0;
   showNSonly = 0;
@@ -222,14 +223,19 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_Argv_Type_Converter argcon (argcw, argvw);
+      orb = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
+                             "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      char *pname = argv[0];
+      int argc = argcon.get_argc ();
+      ACE_TCHAR** argv = argcon.get_TCHAR_argv ();
+
+      ACE_TCHAR *pname = argv[0];
 
       while (argc > 0)
         {
-          if (strcmp(*argv, "--ior") == 0)
+          if (ACE_OS::strcmp(*argv, ACE_TEXT ("--ior")) == 0)
             {
               if (showNSonly)
                 {
@@ -240,7 +246,7 @@ main (int argc, char *argv[])
                 }
               showIOR = 1;
             }
-          else if (ACE_OS::strcmp (*argv, "--nsior") == 0)
+          else if (ACE_OS::strcmp (*argv, ACE_TEXT ("--nsior")) == 0)
             {
               if (showIOR)
                 {
@@ -251,11 +257,11 @@ main (int argc, char *argv[])
                 }
               showNSonly = 1;
             }
-          else if (ACE_OS::strcmp (*argv, "--ctxior") == 0)
+          else if (ACE_OS::strcmp (*argv, ACE_TEXT ("--ctxior")) == 0)
             {
               showCtxIOR = 1;
             }
-          else if (ACE_OS::strncmp (*argv, "--", 2) == 0)
+          else if (ACE_OS::strncmp (*argv, ACE_TEXT ("--"), 2) == 0)
             {
               ACE_DEBUG ((LM_DEBUG, "Usage: %s [[ --ior ][ --ctxior ] | --nsior ]\n", pname));
               return 1;
diff --git a/TAO/utils/nslist/nslist.mpc b/TAO/utils/nslist/nslist.mpc
index 4b8ee5c03d7..7d704eb9b95 100644
--- a/TAO/utils/nslist/nslist.mpc
+++ b/TAO/utils/nslist/nslist.mpc
@@ -3,6 +3,7 @@
 
 project(nsadd): namingexe, core {
   install = $(ACE_ROOT)/bin
+  exename = nsadd
   Source_Files {
     nsadd.cpp
   }
@@ -10,6 +11,7 @@ project(nsadd): namingexe, core {
 
 project(nsdel): namingexe, core {
   install = $(ACE_ROOT)/bin
+  exename = nsdel
   Source_Files {
     nsdel.cpp
   }
@@ -17,6 +19,7 @@ project(nsdel): namingexe, core {
 
 project(nslist): namingexe, core {
   install = $(ACE_ROOT)/bin
+  exename = nslist
   Source_Files {
     nslist.cpp
   }
diff --git a/TAO/utils/nslist/run_test.pl b/TAO/utils/nslist/run_test.pl
index 6d9b1032d1f..1d82ca98ae2 100755
--- a/TAO/utils/nslist/run_test.pl
+++ b/TAO/utils/nslist/run_test.pl
@@ -23,6 +23,14 @@ my $LS = new PerlACE::Process ("../../../bin/nslist");
 my $AD = new PerlACE::Process ("../../../bin/nsadd");
 my $status = 0;
 
+# We want the nslist and nsadd executables to be found exactly in the path
+# given, without being modified by the value of -ExeSubDir.
+# So, we tell their Process objects to ignore the setting of -ExeSubDir.
+
+$LS->IgnoreExeSubDir (1);
+$AD->IgnoreExeSubDir (1);
+
+print STDOUT "Executable for nslist is " . $LS->Executable () . "\n";
 
 sub name_server
 {
diff --git a/THANKS b/THANKS
index 80dca0de559..3413bb9b63c 100644
--- a/THANKS
+++ b/THANKS
@@ -21,7 +21,7 @@ Eric Ding <qnd1 at cs dot wustl dot edu>
 George Edwards <g dot edwards at vanderbilt dot edu>
 Sergio Flores-Gaitan <sergio at cs dot wustl dot edu>
 Chris Gill <cdgill at cs dot wustl dot edu>
-Andrew G.  Gilpin  <agg1 at cs dot wustl dot edu>
+Andrew G. Gilpin  <agg1 at cs dot wustl dot edu>
 Aniruddha Gokhale <a dot gokhale at vanderbilt dot edu>
 Priyanka Gontla <pgontla at ociweb dot com>
 Pradeep Gore <pradeep at cs dot wustl dot edu>
@@ -33,7 +33,7 @@ Don Hinton <dhinton at dre dot vanderbilt dot edu>
 Joe Hoffert <joeh at tango dot cs dot wustl dot edu>
 James Hu <jxh at cs dot wustl dot edu>
 Huang-Ming Huang <hh1 at cs dot wustl dot edu>
-Frank A.  Hunleth <fhunleth at cs dot wustl dot edu>
+Frank A. Hunleth <fhunleth at cs dot wustl dot edu>
 Prashant Jain <pjain at cs dot wustl dot edu>
 Vishal Kachroo <vishal at cs dot wustl dot edu>
 Michael Kircher <Michael dot Kircher at mchp dot siemens dot de>
@@ -97,7 +97,7 @@ Stuart Powell <stuartp at ot dot com dot au>
 Bin Mu <mubin at wfg dot com>
 Andrew McGowan <mcgowan at wg2 dot waii dot com>
 Ken Konecki <kenk at wfg dot com>
-John P dot  Hearn <jph at ccrl dot nj dot nec dot com>
+John P. Hearn <jph at ccrl dot nj dot nec dot com>
 Giang Hoang Nguyen <yang at titan dot com>
 Carlos Garcia Braschi <cgarcia at caramba dot tid dot es>
 Jam Hamidi <jh1 at osi dot com>
@@ -111,13 +111,13 @@ Bob Vistica <robertv at ims dot com>
 David Trumble <trumble at cvg dot enet dot dec dot com>
 George Reynolds <george at dvcorp dot com>
 Hans Rohnert <hans dot rohnert at mchp dot siemens dot de>
-Alex V dot  Maclinovsky <alexm at teltrunk1 dot tait dot co dot nz>
+Alex V. Maclinovsky <alexm at teltrunk1 dot tait dot co dot nz>
 Todd Blanchard <tblancha at evolving dot com>
 Rob Clairmont <rclairmo at bnr dot ca>
 Christian Millour <chris at etca dot fr>
 Neil B. Cohen <nbc at cisco dot com>
 Dieter Quehl <Dieter dot Quehl at med dot siemens dot de>
-Reginald S dot  Perry <perry at zso dot dec dot com>
+Reginald S. Perry <perry at zso dot dec dot com>
 James Morris <jmorris at aurora dot apana dot org dot au>
 Mark Seaborn <mseaborn at itthp1 dot comm dot mot dot com>
 Phil Brooks <phil_brooks at mentorg dot com>
@@ -176,7 +176,7 @@ Eric Beser <beser at simsun dot atsc dot allied dot com>
 Alfred Keller <kellera at pop dot eunet dot ch>
 John Lu <johnlu at f1 dot telekurs dot ch>
 James Mansion <james at wgold dot demon dot co dot uk>
-Jesper S dot  M|ller <Jesper dot Moller at ameridata dot dk>
+Jesper S. M|ller <Jesper dot Moller at ameridata dot dk>
 Chris Lahey <clahey at cccis dot com>
 Michael R"uger <m_rueger at syscomp dot de>
 Istvan Buki <istvan dot buki at euronet dot be>
@@ -185,7 +185,7 @@ Garrett Conaty <gconaty at outbackinc dot com>
 Brad Flood <BFLOOD at slc dot unisysgsg dot com>
 Marius Kjeldahl <marius at funcom dot com>
 Steve Huston <shuston at riverace dot com>
-Eugene K dot  Plaude <jec at r-style dot msk dot su>
+Eugene K. Plaude <jec at r-style dot msk dot su>
 Joseph DeAngelis <bytor at faxint dot com>
 Kim Gillies <gillies at noao dot edu>
 Luca Priorelli <lucapri at mbox dot vol dot it>
@@ -241,8 +241,8 @@ Paul Roman <proman at npac dot syr dot edu>
 Dave Mayerhoefer <davem at lynx dot com>
 Bert Craytor  <Bert_Craytor at peoplesoft dot com>
 Joey Zhu <joey dot zhu at wcom dot com>
-Arthur J dot  Lewis <hfdh99a at prodigy dot com>
-Michael R dot  MacFaden <mrm at yagosys dot com>
+Arthur J. Lewis <hfdh99a at prodigy dot com>
+Michael R. MacFaden <mrm at yagosys dot com>
 Paul Han <phan at CCGATE dot HAC dot COM>
 Jeff Morgan <jeff at audioactive dot com>
 Arturo Montes <mitosys at colomsat dot net dot co>
@@ -273,7 +273,7 @@ Michael Hartman <c62nt57 at ibx dot com>
 Tom Dobridge <dobridge at persimmon dot com>
 Rich Christy <rchristy at cccis dot com>
 Satoshi Ueno <satoshi dot ueno at gs dot com>
-Eugene R dot  Somdahl <gene at endo dot com>
+Eugene R. Somdahl <gene at endo dot com>
 Robert Head <rhead at mail dot virtc dot com>
 Ivan Murphy <Ivan dot Murphy at med dot siemens dot de>
 Jan Perman <jan dot perman at osd dot uab dot ericsson dot se>
@@ -285,7 +285,7 @@ Yigong Liu <ygl at emailbox dot lucent dot com>
 Erik Urdang <erik at bhi dot com>
 Mike Schweiger <mikes at bmo dot com>
 Anthony Mutiso <amutiso at hughes dot cg dot hac dot com>
-Jeff R dot  Hayes <Jeff dot Hayes at osi dot com>
+Jeff R. Hayes <Jeff dot Hayes at osi dot com>
 David Brackman <dbrackman at OhioEE dot com>
 Dave Moore <dave dot moore at gecm dot com>
 Joseph Cross <joseph dot k dot cross at lmco dot com>
@@ -328,7 +328,7 @@ Michael Hoffman <Hoffman_Michael at mac-mailserver dot atc dot ll dot mit dot ed
 John Lindal <jafl at cheshire-cat dot caltech dot edu>
 Dustin Laurence <laurence at alice dot wonderland dot caltech dot edu>
 Ernie Makris <emakris at ziplink dot net>
-Timothy A dot  Brown <tabrown at montana dot com>
+Timothy A. Brown <tabrown at montana dot com>
 Pat McNerthney <ace at mcnerthney dot com>
 Lori Anderson <lori at probita dot com>
 Erik Margraf <erik at asgard dot gud dot siemens dot co dot at>
@@ -393,16 +393,16 @@ Mark Kettner <m dot kettner at elsevier dot nl>
 Kent Watsen <kent at watsen dot net>
 Chris Healey <chealey at entera dot com>
 Philippe Klein <Philippe_Klein at vocaltec dot com>
-William S dot  Lear <rael at dejanews dot com>
+William S. Lear <rael at dejanews dot com>
 John Geiss <John_T_Geiss at raytheon dot com>
 Ernesto Guisado <eguisado at saincotrafico dot com>
 Stuart Myles <smyles at wsj dot dowjones dot com>
 Lothar Werzinger <lothar at xcerla dot com>
 Andrew Harbick <aharbick at opentext dot com>
 Pavel Motuzenko <p_motuzenko at hotmail dot com>
-Ross J dot  Lillie <lillie at rsch dot comm dot mot dot com>
+Ross J. Lillie <lillie at rsch dot comm dot mot dot com>
 Sam Hauer <shauer at nmo dot gtegsc dot com>
-Frank dot  J dot  Hodum <fhodum at dctd dot saic dot com>
+Frank J. Hodum <fhodum at dctd dot saic dot com>
 David Miron <dxm at crapper dot dsto dot defence dot gov dot au>
 Anton van Straaten <anton at appsolutions dot com>
 Joe Covalesky <joe at nowsol dot com>
@@ -427,7 +427,7 @@ Byron Harris <harris_b at ociweb dot com>
 Barney Dalton <barneyd at cyllene dot uwa dot edu dot au>
 Peter Gorgia <Peter dot Gorgia at libnet dot com>
 Dirk Broer <Dirk dot Broer at gsfc dot nasa dot gov>
-Joseph E dot  LaPrade <laprade at engw dot ana dot bna dot boeing dot com>
+Joseph E. LaPrade <laprade at engw dot ana dot bna dot boeing dot com>
 Goran Lowkrantz <Goran dot Lowkrantz at infologigruppen dot se>
 Susan Liebeskind <susan dot liebeskind at gtri dot gatech dot edu>
 Dana Hackman <upboms at network-one dot com>
@@ -452,7 +452,7 @@ Frank Adcock <frank at bushlife dot com dot au>
 Xu Yifeng <xuyifeng at www dot kali dot com dot cn>
 Valery Arkhangorodsky <valerya at servicesoft dot com>
 Alan Scheinine <scheinin at crs4 dot it>
-Andrew G dot  Harvey <agh at cisco dot com>
+Andrew G. Harvey <agh at cisco dot com>
 Dann Corbit <DCorbit at SolutionsIQ dot com>
 James <james at tsunami dot com>
 Jason Milley <Jason dot Milley dot jcmilley at nt dot com>
@@ -461,20 +461,20 @@ Peter Nordlund <petern at nada dot kth dot se>
 Mark Weel <weel at lucent dot com>
 Tres Seaver <tseaver at palladion dot com>
 Erik Koerber <erik dot koerber at siemens dot at>
-Eric R dot  Medley <palantir at net56 dot net>
+Eric R. Medley <palantir at net56 dot net>
 David O'Farrell <dave at virgo dot aersoft dot ie>
 Amir Bahmanyari <amir at peakstone dot com>
 Ian Wright <I dot Wright at elsevier dot co dot uk>
 David Janello <David dot Janello at abnamro dot com>
 Rich Wellner <rw2 at wellner dot org>
-Fernando D dot  Mato Mira <matomira at acm dot org>
+Fernando D. Mato Mira <matomira at acm dot org>
 Jonathan Reis <reis at stentor dot com>
 Seung-Lee Hoon <tarjan at lgsoft dot com>
-Russell L dot  Carter <rcarter at pinyon dot org>
+Russell L. Carter <rcarter at pinyon dot org>
 Bill Hall <hts at gte dot net>
 Brian Gilstrap <gilstrap_b at ociweb dot com>
 Balaji Srinivasan <balaji at cplane dot com>
-Anders W dot  Tell <anderst at toolsmiths dot se>
+Anders W. Tell <anderst at toolsmiths dot se>
 Larry Lachman <larry at paradigmsim dot com>
 Terry Rosenbaum <Terry dot Rosenbaum at Radiology dot MSU dot edu>
 Rainer Blome <rainer_blome at de dot ibm dot com>
@@ -483,7 +483,7 @@ Sunil Kumar <skumar at sutmyn dot com>
 T Stach <t dot stach at inobis dot de>
 Ron Barack <r dot barack at inobis dot de>
 Daniel Nieten <dnieten at bellsouth dot net>
-Paul K dot  Fisher <pfisher at plexware dot com>
+Paul K. Fisher <pfisher at plexware dot com>
 Jim Buck <jim at nowsol dot com>
 Olivier Lau <olivier_lau at srtelecom dot com>
 Achim Stindt <stindt at conbis dot de>
@@ -518,22 +518,22 @@ Faron Dutton <fdutton at avxus dot com>
 Gary York <gfyork at ix dot netcom dot com>
 Patty Hair <patty at Lynx dot COM>
 Ivan Pascal <pascal at info dot tsu dot ru>
-William A dot  Hoffman <hoffman at crd dot ge dot com>
+William A. Hoffman <hoffman at crd dot ge dot com>
 Mark Lucovsky <markl at microsoft dot com>
 Greg Holtmeyer <greg dot holtmeyer at windriver dot com>
 Jody Hagins <jody at atdesk dot com>
 Patrice Bensoussan <pbensoussan at amadeus dot net>
 Keith Brown <kalbrown at ix dot netcom dot com>
 Barry Hoggard <hoggard at cfx dot com>
-Peter J dot  Mason <peter dot mason at retriever dot com dot au>
-Jerry D dot  De Master <jdemaste at rite-solutions dot com>
+Peter J. Mason <peter dot mason at retriever dot com dot au>
+Jerry D. De Master <jdemaste at rite-solutions dot com>
 Greg Gallant <gcg at micrografx dot com>
 wym <wym at dekang dot com>
 Karel Zuiderveld <kzuiderveld at vitalimages dot com>
 Mike Goldman <whig at by dot net>
 Peter Gross <pgross at signalsoftcorp dot com>
 Greg Ross <gwross at west dot raytheon dot com>
-Stanford S dot  Guillory <sguillory at vignette dot com>
+Stanford S. Guillory <sguillory at vignette dot com>
 Peter Weat <weatp at syntron dot com>
 Magnus Karlsson <magnus dot karlsson at syncom dot se>
 Andreas Tobler <toa at pop dot agri dot ch>
@@ -593,7 +593,7 @@ Dmitry Goldshtain <goldstein at arcormail dot de>
 Carl Grinstead <grinstea at tsunami dot com>
 Henric Jungheim <junghelh at pe-nelson dot com>
 Michael Preobrazhensky <mikep at xpedite dot com>
-Gregory D dot  Fee <gdf2 at cec dot wustl dot edu>
+Gregory D. Fee <gdf2 at cec dot wustl dot edu>
 Roland Gigler <roland at mch dot pn dot siemens dot de>
 Frank Buschmann <Frank dot Buschmann at mchp dot siemens dot de>
 Eric Eide <eeide at cs dot utah dot edu>
@@ -611,7 +611,7 @@ Sarmeesha Reddy <sarmeesha at bigfoot dot com>
 Steven Tine <stevent at tr dot comm dot mot dot com>
 Dave Steele <Dave_Steele at Mitel dot COM>
 Simeon Simeonov <simeons at allaire dot com>
-David H dot  Whittington <david dot h dot whittington at boeing dot com>
+David H. Whittington <david dot h dot whittington at boeing dot com>
 Ian MacDonald <ianmacd at bg dot com>
 Hans Ridder <ridder at veritas dot com>
 Todd Mullanix <Todd dot Mullanix at sylantro dot com>
@@ -623,29 +623,29 @@ Dominic Williams <dom at connected-place dot co dot uk>
 Srikumar Kareti <skareti at htc dot honeywell dot com>
 Ian Pepper <ian at aptest dot ie>
 Kevin Lyda <kevin dot lyda at trintech dot com>
-James D dot  Rucker <jdrucker at huey dot jpl dot nasa dot gov>
+James D. Rucker <jdrucker at huey dot jpl dot nasa dot gov>
 Brian Wallis <Brian dot Wallis at sr dot com dot au>
 Sandeep Goyal <sagoyal at hss dot hns dot com>
 englishmalc at my-dejanew dot com
 Frank O'Dwyer <fod at brd dot ie>
 Long Hoang <LHoang at hwdcsaws dot cahwnet dot gov>
-Steven D dot  Chen <sdc2951 at aw101 dot iasl dot ca dot boeing dot com>
+Steven D. Chen <sdc2951 at aw101 dot iasl dot ca dot boeing dot com>
 Alain Magloire <alain at qnx dot com>
 Jim Rogers <jrogers at viasoft dot com>
 Nick Sawadsky <Nick_Sawadsky at BrooksSoftware dot com>
 David Brownell <david-b at pacbell dot net>
 Richard Stallman <rms at gnu dot org>
 Casey Lucas <clucas at sabre dot com>
-Brian C dot  Olson <bolson at rtlogic dot com>
-Joseph A dot  Condlin <jac at slpmbo dot ed dot ray dot com>
+Brian C. Olson <bolson at rtlogic dot com>
+Joseph A. Condlin <jac at slpmbo dot ed dot ray dot com>
 Serge Du <du at lal dot in2p3 dot fr>
 Mike Mazurek <mmazurek at std dot saic dot com>
 Christian Schuderer <Christian dot Schuderer at erl9 dot siemens dot de>
-John R dot  Taylor <jrtaylor at george dot lbl dot gov>
+John R. Taylor <jrtaylor at george dot lbl dot gov>
 Bill Tovrea <gwtovrea at west dot raytheon dot com>
 Wallace Owen <owen at visicom dot com>
-Vyacheslav A dot  Batenin <slavikb at iname dot com>
-Edwin D dot  Windes <ewindes at usa dot net>
+Vyacheslav A. Batenin <slavikb at iname dot com>
+Edwin D. Windes <ewindes at usa dot net>
 Christopher Kohlhoff <chris at kohlhoff dot com>
 Andreas Terstegge <andreas dot terstegge at nokia dot com>
 Stefaan Kiebooms <stefaan at ghs dot com>
@@ -663,7 +663,7 @@ Sridevi Subramanian <subrams at erols dot com>
 Bruce Trask <brucetrask at aol dot com>
 Jake Hamby <jehamby at anobject dot com>
 Rick Weisner <Rick dot Weisner at East dot Sun dot COM>
-Dennis C dot  De Mars <demars at mminternet dot com>
+Dennis C. De Mars <demars at mminternet dot com>
 V dot  Lakshmanan <lakshman at doplight dot nssl dot noaa dot gov>
 Hata Yoshiaki <hatay at alpha dot co dot jp>
 Vidya Narayanan <CVN065 at lmpsil02 dot comm dot mot dot com>
@@ -695,7 +695,7 @@ Bruce Edge <bedge at sattel dot com>
 Dan Butler <daniel dot g dot butler at boeing dot com>
 Ron MacKenzie <ronm at SLAC dot Stanford dot EDU>
 Craig Rodrigues <rodrigc at crodrigues dot org>
-Phil Y dot  Wang <yhwang at cs dot columbia dot edu>
+Phil Y. Wang <yhwang at cs dot columbia dot edu>
 David Brock <dbrock at momsdesk dot com>
 John Morey <jmorey at mmintl dot com>
 Dwayne Burns <dburns at isrglobal dot com>
@@ -710,7 +710,7 @@ James Whitledge <jwhitledge at spyglass dot com>
 Erik Johannes <erik_johannes at teseda dot com>
 Alex Hornby <alex at anvil dot co dot uk>
 Riaz Syed <syed at Lynx dot COM>
-Clarence M dot  Weaver <clarence_m_weaver at md dot northgrum dot com>
+Clarence M. Weaver <clarence_m_weaver at md dot northgrum dot com>
 Roger Egbers <regbers at isrglobal dot com>
 Ralf Kluthe <kluthe at iti dot mu-luebeck dot de>
 Ruud Diterwich<R dot M dot L dot Diterwich at marin dot nl>
@@ -752,7 +752,7 @@ Randall Sharo <rasb at eci dot esys dot com>
 Dave Madden <dhm at mersenne dot com>
 Cliff_H_Campbell <Cliff_H_Campbell at res dot raytheon dot com>
 Narendra Ravi <naren at cs dot ualberta dot ca>
-Krishnakumar B dot  <kitty at neo dot shinko dot co dot jp>
+Krishnakumar B. <kitty at neo dot shinko dot co dot jp>
 David Sunwall <das at planet8 dot tds-eagan dot lmco dot com>
 Brian Wright <bwright at paladyne dot com>
 Yosi Sarusi <yosi at appstream dot com>
@@ -787,7 +787,7 @@ Probal Bhattacharjya <probal at lucent dot com>
 Dmitri Katchalov <Dmitri dot Katchalov at computershare dot com dot au>
 Alok Gupta <alokg at ssind dot stpn dot soft dot net>
 Chien Yueh <cyueh at viasoft dot com>
-John K dot  Black <jblack at s22ct dot npt dot nuwc dot navy dot mil>
+John K. Black <jblack at s22ct dot npt dot nuwc dot navy dot mil>
 Kamen Penev <penev at earthlink dot net>
 Gregory Yarmit <Gregory dot Yarmit at hboc dot com>
 Jarek Tomaszewski <jarek-tomaszewski at vertel dot de>
@@ -840,7 +840,7 @@ Hani Mawlawi <hmawlawi at wecan dot com>
 Benedikt Eric Heinen <beh at icemark dot ch>
 Jason Topaz <topaz at panix dot com>
 Alexander Dergatch <dergy at websci dot ru>
-Airat A dot  Sadreev <airat at hq dot tatenergo dot ru>
+Airat A. Sadreev <airat at hq dot tatenergo dot ru>
 Klaus Hofmann <Klaus dot Hofmann at astrum dot de>
 Miroslav Koncar <mkoncar at mail dot com>
 Extern Chatterji <Extern dot Chatterji at kmweg dot de>
@@ -853,7 +853,7 @@ Alexander Belopolsky <belopolsky at my-deja dot com>
 Ben Bourner <ben at orion dot no>
 Lalitha Chinthamani <lchinthamani at oresis dot com>
 Thomas Huang <Thomas dot Huang at jpl dot nasa dot gov>
-Sankaranarayanan K dot  V <sankar at miel dot mot dot com>
+Sankaranarayanan K. V <sankar at miel dot mot dot com>
 Ephraim Vider <eff at allot dot com>
 Reid Spencer <reid at unique2u dot com>
 Kevin Dalley <kevind at rahul dot net>
@@ -862,7 +862,7 @@ Jochen Linkohr <Jochen dot Linkohr at stz-rechnereinsatz dot de>
 Mirko Brandner <mbrandner at yahoo dot com>
 Yuval Yosef <yuvi at isdn dot net dot il>
 Chad Elliott <elliott_c at ociweb dot com>
-David X dot  Callaway <david dot x dot callaway at intel dot com>
+David X. Callaway <david dot x dot callaway at intel dot com>
 Soren Ilsoe <soren dot ilsoe at tellabs dot com>
 Eric Hopper <ehopper at globalmt dot com>
 Martin Johnson <mjhn at bigpond dot net dot au>
@@ -870,7 +870,7 @@ Pierre Oberson <oberson at nagra-kudelski dot ch>
 Chris Uzdavinis <chris at atdesk dot com>
 Ishay Green <ishaygreen at hotmail dot com>
 Andrey Nechypurenko <andreynech at yahoo dot com>
-Charlie Duke <cduke at cuseeme dot com>
+Charlie Duke <cduke at fvc dot com>
 Jonathan Luellen <jluellen at scires dot com>
 Andrew Psaltis <apsaltis at mho dot net>
 Erik Jones <ej at pcslink dot com>
@@ -883,7 +883,7 @@ Jerry Jiang <javalist at 21cn dot com>
 Rob Ruff <rruff at scires dot com>
 Hugh Arnold <harnold at itginc dot com>
 Hessel Idzenga <idzenga at lucent dot com>
-Mark C dot  Barnes <marcus at muse3d dot com>
+Mark C. Barnes <marcus at muse3d dot com>
 Suresh Kannan <kannan at uav dot ae dot gatech dot edu>
 Alex Scholte <Alex dot Scholte at getronics dot com>
 Greg Jansen <plaidriver at msn dot com>
@@ -898,7 +898,7 @@ Defang Zhou <dzhou at inktomi dot com>
 Dave Zumbro <zumbro_d at ociweb dot com>
 Ted Nolan <ted at ags dot ga dot erg dot sri dot com>
 Jianfei Xu <jxu at yahoo dot com>
-Alvin C dot  Shih <acs at ml dot com>
+Alvin C. Shih <acs at ml dot com>
 J dot  Scott Evans <evans at cpi dot com>
 Alex Luk <fluk7 at ie dot cuhk dot edu dot hk>
 Kenneth Osenbroch <kennetho at stud dot cs dot uit dot no>
@@ -922,7 +922,7 @@ Rich Seibel <seibel_r at ociweb dot com>
 Jim Scheller <csoftware at iname dot com>
 Bob Bouterse <BBouterse at escient dot com>
 Sandeep Adwankar <adwankar at rsch dot comm dot mot dot com>
-W dot  Craig Trader <ct7 at vitelinc dot com>
+W Craig Trader <ct7 at vitelinc dot com>
 Bruce McIntosh <Bruce dot McIntosh at boeing dot com>
 Natarajan Kalpathy <Natarajan_Kalpathy at mw dot 3com dot com>
 David O'Farrell <eeidofl at eei dot ericsson dot se>
@@ -940,7 +940,7 @@ Shalabh Bhatnagar <shalabh_b at hotmail dot com>
 Charles Scott <Charles dot P dot Scott at jpl dot nasa dot gov>
 Espen Harlinn <espen at harlinn dot no>
 mulder <mul at iitb dot fhg dot de>
-Richard L dot  Johnson <rich at huey dot jpl dot nasa dot gov>
+Richard L. Johnson <rich at huey dot jpl dot nasa dot gov>
 Tam Nguyen <tnguyen at viasat dot com>
 Jeff Graham <jgraham at lincom-asg dot com>
 Ralph Loader <suckfish at ihug dot co dot nz>
@@ -948,7 +948,7 @@ Ji Wuliu <jiwuliu0952_cn at sina dot com>
 Wada Hiroshi <syu- at yhb dot att dot ne dot jp>
 Sal Amander <virgis at megagis dot lt>
 Torsten Pfuetzenreuter <torsten_pf at geocities dot com>
-John M dot  Mills <jmills at tga dot com>
+John M. Mills <jmills at tga dot com>
 David McWeeny <davemcw at tr dot comm dot mot dot com>
 Florian Lackerbauer <florian dot lackerbauer at mchp dot siemens dot de>
 Manuel Benche <mbenche at jazz dot cs dot utsa dot edu>
@@ -972,7 +972,7 @@ Xiaojun Wu <depender at yahoo dot com>
 George Lafortune <lafortg at res dot raytheon dot com>
 Aoxiang Xu <axu at cim dot mcgill dot ca>
 Dima Skvortsov <dskvortsov at mediasite dot com>
-Moore Y dot  Cao <yilincao at lucent dot com>
+Moore Y. Cao <yilincao at lucent dot com>
 Wai Keung Fung <wkfung at maews69 dot mae dot cuhk dot edu dot hk>
 Michael Laing <mpl at flni dot com>
 Benoit Viaud <benoit dot viaud at artal dot fr>
@@ -990,11 +990,11 @@ William Horn <whorn1984 at my-deja dot com>
 Greg Hall <Greg dot Hall at Australia dot Boeing dot com>
 Aviad Eden <Aviad_Eden at icomverse dot com>
 Vianney Lecroart <acegsm at itineris dot net>
-Russell Mora <rd dot mora at router dot econz dot co dot nz>
+Russell Mora <russell dot mora at veritas dot com>
 Samir Shaikh <SamirShaikh at bigfoot dot com>
 Eric Yee <eyee at authentica dot com>
 Matt Emerson <memerson at escient dot com>
-Yiu L dot  Lee <yiulee at crosskeys dot com>
+Yiu L. Lee <yiulee at crosskeys dot com>
 Pedro Brandao <pbrandao at inescn dot pt>
 Hakon Innerdal <hakoni at funcom dot com>
 Sami Aario <saempylae at hotmail dot com>
@@ -1004,7 +1004,7 @@ Xiaowen Wang <swangken at cfdlab dot ae dot utexas dot edu>
 <vsg at ivl dot kiev dot ua>
 Warren Miller <wmiller at stsci dot edu>
 Youngkwan Cho <ykcho at ece dot arizona dot edu>
-Dorr H dot  Clark <dhclark at Lynx dot COM>
+Dorr H. Clark <dhclark at Lynx dot COM>
 Dave McNeely <Dave_McNeely at md dot northgrum dot com>
 Eric Malenfant <EMalenfant at interstarinc dot com>
 Roland Fischer <roli at gugus dot com>
@@ -1035,7 +1035,7 @@ Kim Lester <Kim_R_Lester at rta dot nsw dot gov dot au>
 Wilson Chan <wilson at i-finance dot com dot hk>
 William Rucklidge <wjr at imarkets dot com>
 Victor Krebss <lopik at delfi dot lv>
-Chander P dot  Thareja <cthareja at ssind dot stpn dot soft dot net>
+Chander P. Thareja <cthareja at ssind dot stpn dot soft dot net>
 John Mills <jmills at tga dot com>
 Haifeng Lee <haifeng at dset dot com dot cn>
 Hans Utz <hans dot utz at informatik dot uni-ulm dot de>
@@ -1064,7 +1064,7 @@ Roland Rüdenauer <roland dot ruedenauer at freenet dot de>
 John Buckman <john at lyris dot com>
 Guy Rosen <grosen at bigfoot dot com>
 <amoderni at viasoft dot com>
-Bennett R dot  Stabile <bstabile at home dot com>
+Bennett R. Stabile <bstabile at home dot com>
 Paul Caffrey <denginere at hotmail dot com>
 Low Aik long <aiklong at softhome dot net>
 Michael Rinne <Michael dot Rinne at ZN-AG dot de>
@@ -1086,7 +1086,7 @@ Vsevolod Novikov <novikov at df dot nnov dot rfnet dot ru>
 Brendan Corcoran <brendan at jenisys dot com dot au>
 Steve Sivier <Steven dot Sivier at Eng dot Sun dot COM>
 Rick Schneeman <rschneeman at nist dot gov>
-Klaus H dot  Wolf <hw at cyland dot com>
+Klaus H. Wolf <hw at cyland dot com>
 Jean-Christophe Dubois <jcd at one dot com>
 Michael Hampel <michael dot hampel at fhs-hagenberg dot ac dot at>
 Wei Zheng <weizheng at uiuc dot edu>
@@ -1176,7 +1176,7 @@ Derek Horton <trohed at yahoo dot com>
 Shameek Basu <sbasu at ivast dot com>
 Dipti Jain <dijain at hss dot hns dot com>
 Eric Zuur <Eric dot Zuur at meco dot nl>
-Jeffrey J dot  Persch <hyperslug at yahoo dot com>
+Jeffrey J. Persch <hyperslug at yahoo dot com>
 Rahul Shukla <rshukla at ggn dot aithent dot com>
 Pierre Fayolle <fayolle at enseirb dot fr>
 Greg McCain <greg dot mccain at veritas dot com>
@@ -1248,7 +1248,7 @@ Kobi Cohen-Arazi <kobi-co at barak-online dot net>
 Israel Illescas Gomez <illescas at dycsa dot es>
 Brodie Thiesfield <brodie dot thiesfield at activesky dot com>
 Erik Toubro Nielsen <enielsen at mdsproteomics dot dk>
-Masaoud T dot  Moonim <masaoud at mailandnews dot com>
+Masaoud T. Moonim <masaoud at mailandnews dot com>
 Steve Witten <steve_witten at hp dot com>
 Gil Rapaport <grapaport at comgates dot co dot il>
 Boris Temkin <borist at allcharge dot com>
@@ -1267,17 +1267,17 @@ Victor Pitchouc <pitchouc at tlsoft dot ru>
 Srikanth Vedire <srvedire at yahoo dot com>
 J Shane Culpepper <pepper at channelogics dot com>
 Steffen Hieber <Steffen dot Hieber at erl9 dot siemens dot de>
-Craig L dot  Ching <cching at mqsoftware dot com>
+Craig L. Ching <cching at mqsoftware dot com>
 Ben Howard <Ben_Howard at raytheon dot com>
 Rich Newman <RNewman at directv dot com>
-Kelly F dot  Hickel <kfh at mqsoftware dot com>
+Kelly F. Hickel <kfh at mqsoftware dot com>
 David Trusty <david dot trusty at westwave dot com>
 Burkhard Neppert <b dot neppert at dr-staedtler dot de>
 Crawford Lodge <crawford dot lodge at xmlglobal dot com>
 Scott Gaa <scott_a_gaa at md dot northgrum dot com>
 Jenny Kowald <jkowald at oz dot agile dot tv>
 Oren Zeev-Ben-Mordehai <oren at phonedo dot com>
-Holger P dot  Krekel <krekel at merlinux dot de>
+Holger P. Krekel <krekel at merlinux dot de>
 Glenn Popelka <gpp at gpopelka dot com>
 Tibor Kiss <tkiss at mindmaker dot hu>
 Robert Davidson <robert at rdavidson dot freeserve dot co dot uk>
@@ -1415,11 +1415,11 @@ David Sanders <dsanders at chaincast dot com>
 Yoram Zini <yoram dot zini at emblaze dot com>
 Sean McCauliff <seanm at Narus dot com>
 Shmulik Regev <shmul at vself dot com>
-Andrew L dot  Shwaika <als at solvo dot ru>
+Andrew L. Shwaika <als at solvo dot ru>
 Gerhard Voss <Gerhard_Voss at t-online dot de>
 Gregor Bruce <gregorb at clear dot net dot nz>
 Ian Cahoon <icahoon at cisco dot com>
-Alexei I dot  Adamovich <lexa at adam dot botik dot ru>
+Alexei I. Adamovich <lexa at adam dot botik dot ru>
 Sohail Husain <chulbulla at yahoo dot com>
 Jerome Julius <julius at erols dot com>
 William R Volz <WRVO at chevrontexaco dot com>
@@ -1461,9 +1461,9 @@ Cyrille Chepelov <cyrille at softek dot fr>
 Peter Heitman <pheitman at cisco dot com>
 Paxton Mason <PMason at wolve dot com>
 Yan Dai <dai_y at ociweb dot com>
-Sean I dot  Luzader <sean dot i dot luzader at lmco dot com>
+Sean I. Luzader <sean dot i dot luzader at lmco dot com>
 Renjie Tang <rtang at informatica dot com>
-Max V dot  Zinal <Zlat0 at mail dot ru>
+Max V. Zinal <Zlat0 at mail dot ru>
 Stan Sosnovsky <sosnovsky_stan at emc dot com>
 Ariel Peltz <Arielp at bigbandnet dot com>
 Carsten Prescher <carsten dot prescher at sysde dot eads dot net>
@@ -1520,22 +1520,22 @@ Nathan Krasney <natan-k at actcom dot co dot il>
 Marek Maleta <marek_maleta at agilent dot com>
 David Smith <dts at prismtechnologies dot com>
 Dimitrije Jankovic <djankov99 at yahoo dot com>
-Frank O dot  Flemisch <f dot o dot flemisch at larc dot nasa dot gov>
+Frank O. Flemisch <f dot o dot flemisch at larc dot nasa dot gov>
 Cary Steinmetz <cary dot s dot steinmetz at boeing dot com>
 Ty Tenait <tytenait at yahoo dot com>
 Nitin Mallya <Nitin dot Mallya at med dot ge dot com>
 Nick Cross <nick dot cross at prismtechnologies dot com>
-Christopher W dot  Midgley <cmidgley at livevault dot com>
+Christopher W. Midgley <cmidgley at livevault dot com>
 Wanjia <jiawan at huawei dot com>
 Shanliang Cheng <shanliang at huawei dot com>
 Andy Ling <Andy dot Ling at Quantel dot Com>
 Stephen Howard <stephen dot e dot howard at lmco dot com>
-Carsten T dot  Nielsen <ctn at maerskdatadefence dot dk>
+Carsten T. Nielsen <ctn at maerskdatadefence dot dk>
 Adee Ran <adeeran at yahoo dot com>
 <rjgebis at hotmailer dot com>
 Davide Pasetto <dipo at sis dot it>
 Michael Hornok <Michael dot Hornok at alcatel dot com>
-W dot M dot  van den Boogaard <wim dot vd dot boogaard at meco dot nl>
+W.M. van den Boogaard <wim dot vd dot boogaard at meco dot nl>
 Carol Hunsicker <carol dot hunsicker at lmco dot com>
 Joseph Sarbak <joseph dot sarbak at csfb dot com>
 Ruslan Zasukhin <sunshine at public dot kherson dot ua>
@@ -1573,17 +1573,17 @@ Gautam Thaker <gthaker at atl dot lmco dot com>
 Christophe Juniet <cjuniet at entreview dot com>
 Jeff W <jeffw_1234 at yahoo dot com>
 Geir Berset <geirber at ifi dot uio dot no>
-Ken Sedgwick <ken at xvros dot org>
+Ken Sedgwick <ken at bonsai dot com>
 Vince Mounts <vince at mounts dot cc>
 Vladislav Zverev <vladislav at gtss dot spb dot ru>
 Erich Hochmuth <erich_hochmuth at hotmail dot com>
-Nick S dot  Petrov <nicksp at ci dot nnov dot ru>
+Nick S. Petrov <nicksp at ci dot nnov dot ru>
 Dmitry Botcharnikov <dimab at garant dot ru>
 Philippe Haussy <p dot haussy at xpedite dot com>
 k2 at biogate dot com
 Eric Frias <efrias at syncad dot com>
 Antonio Saraiva <Antonio_Saraiva at csgsystems dot com>
-Sean M dot  Paus <spaus at dctd dot saic dot com>
+Sean M. Paus <spaus at dctd dot saic dot com>
 Yuanfang Zhang <yfzhang at cse dot wustl dot edu>
 Jonathan Franklin <jfranklin at dctd dot saic dot com>
 Cristian Ungureanu <cristian dot ungureanu at amdocs dot com>
@@ -1637,7 +1637,7 @@ Marc Tardif <marc at sitepak dot com>
 Guan Joe <guan dot zhaohui at datawire dot net>
 Petr Ferschmann <pferschmann at kerio dot com>
 Greg Mulyar <greg_mu at yahoo dot com>
-Max F dot  Bilyk <mbilyk at europe dot com>
+Max F. Bilyk <mbilyk at europe dot com>
 Danile White <ygor at comcast dot net>
 Andrew Marlow <apm35 at student dot open dot ac dot uk>
 Michael F"olsl <michael dot foelsl at gmx dot net>
@@ -1706,9 +1706,9 @@ Jason Cohen <jcohen at atl dot lmco dot com>
 Nick Kukuczka <nickk at appliedepi dot com>
 Andrew Voumard <andrewv at melbpc dot org dot au>
 Anand <anand at iCMGworld dot com>
-D dot J dot  Dwyer <dj_dwyer at yahoo dot com>
+D.J. Dwyer <dj_dwyer at yahoo dot com>
 Douglas A Stuart <douglas dot a dot stuart at boeing dot com>
-Victor N dot  <dreamland_skib2 at mailru dot com>
+Victor N. <dreamland_skib2 at mailru dot com>
 Francesco Baldi <Francesco dot Baldi at hit dot it>
 Michael Rice <MichaelARice at knology dot net>
 Jesse Greenwald <jesse at cis dot ksu dot edu>
@@ -1752,8 +1752,8 @@ Adam Fanello <yahoo at fanello dot net>
 Matthieu Vansteene <matthieu dot vansteene at regis-dgac dot net>
 Sean Rooney <sro at zurich dot ibm dot com>
 Enrico Detoma <enrico dot detoma at email dot it>
-Onopin V dot  Mikhail <kool at garant dot ru>
-Edward R dot  Mulholland  <emulholl at atl dot lmco dot com>
+Onopin V. Mikhail <kool at garant dot ru>
+Edward R. Mulholland  <emulholl at atl dot lmco dot com>
 Brian Buesker <bbuesker at qualcomm dot com>
 Vladimir Naylov <vladimir at monosphere dot com>
 David Faure <faure at kde dot org>
@@ -1788,7 +1788,7 @@ John Poplett <John_Poplett at 3com dot com>
 Heiko Bachmann <h dot bachmann at unicontrol dot de>
 Andrew Metcalfe <Andrew dot Metcalfe at ccur dot com>
 Simon Dutkowski <dutkowski at fokus dot fraunhofer dot de>
-Mickael P dot  Golovin <migel at garant dot ru>
+Mickael P. Golovin <migel at garant dot ru>
 Shannon Barber <shannon dot barber at myrealbox dot com>
 Brad Orner <bradley_p_orner at raytheon dot com>
 Michelangelo Nottoli <m dot nottoli at acsys dot it>
@@ -1813,7 +1813,7 @@ Andrew Reid <andrew dot reid at eservglobal dot com>
 Praveen Sharma <psharma at bbn dot com>
 Yi Zuo <Yi dot Zuo at alcatel-sbell dot com dot cn>
 Raphael Bossek <raphael dot bossek at gmx dot de>
-Richard G dot  Hash <richard dot hash at openspirit dot com>
+Richard G. Hash <richard dot hash at openspirit dot com>
 Karl Tredwell <KTredwell at tullib dot com>
 Norm Whitehead <Norm_Whitehead at raytheon dot com>
 Jiang Wei <jiangwei_1976 at yahoo dot com dot cn>
@@ -1827,7 +1827,7 @@ Pavan Mandalkar <pm2 at cs dot wustl dot edu>
 Scott Willey <scott at sanasecurity dot com>
 David Calkins <dcalk at dejazzd dot com>
 Wu Yongwei <adah at netstd dot com>
-Karen L dot  Regner <karen dot regner at swri dot org>
+Karen L. Regner <karen dot regner at swri dot org>
 Michel Drapeau <michel dot drapeau at asdfsadfh dot com>
 Hans Bos <hans dot bos at xelion dot nl>
 Kevin Stacy <kevin_405 at yahoo dot com>
@@ -1894,7 +1894,7 @@ J. Abelardo Gutierrez <jabelardo at cantv dot net>
 Roger Sala <Roger dot Sala at gd-ais dot com>
 Raz Ben-Yehuda <raz dot b at corigin dot com>
 Geo Sebastian <geosebastian at onmobile dot com>
-Simon Massey <simon dot massey a tprismtechnologies dot com>
+Simon Massey <simon dot massey at prismtechnologies dot com>
 Rich Shapiro <rshapiro at bbn dot com>
 Ramiro Morales <rm0 at gmx dot net>
 Andrew Athan <aathan-ace-bugs-1524 at cloakmail dot com>
@@ -1904,6 +1904,56 @@ Rick Robinson <rick at oyarsa dot com>
 John D. Robertson <john at rrci dot com>
 Paul Lew <paullew at cisco dot com>
 Eider Oliveira <eider at oliveira dot gmail at com>
+Jeff Jones <jjones at zonetrading dot com>
+Jean-Christophe Cota <jean-christophe dot cota at eurocontrol dot int>
+Paul <paul at reeder dot cs>
+Vincent Newsum <Newsum at fel dot tno dot nl>
+Vasili Goutas <vasili at goutas dot de>
+Iliyan Jeliazkov  <jeliazkov_i at ociweb dot com>
+Shlomi Yaakobovich <Shlomi at exanet dot com>
+Todd Marshall <toddmarshall2002 at yahoo dot com>
+Ciju John <john_c at ociweb dot com>
+Yuk Ming Kwok <mkwok at cisco dot com>
+Honorato Saavedra <natodf at yahoo dot com>
+Domingos Monteiro <d dot monteiro at netia dot net>
+Vukajlo <vukajlo at finsoft dot co dot yu>
+Bill Somerville <bill at classdesign dot com>
+Bjorn Roald <bjorn dot roald at kongsberg dot com>
+Michi Henning <michi at triodia dot com>
+Xue Yong Zhi <seclib at seclib dot com>
+Ertugrul Sorar <esorar1 at yahoo dot com>
+Simone Viani <sviani at etasistemi dot it>
+Rohan Mars <rohan_mars at yahoo dot com>
+Robert S. Iakobashvili <roberti at gonetworks dot com>
+Chris Hammond <chrish at navsys dot com>
+Vincent Spano <spam dot robot at go dot away>
+Nuno Silva <Nuno dot Silva at edisoft dot pt>
+Greg Bostrum <greg dot bostrom at hp dot com>
+Dipa Suri <dipa dot suri at lmco dot com>
+Adam Howell <adam dot s dot howell at lmco dot com>
+Steven Frare <stevefr at avaya dot com>
+Dave Dalapati <dalapati at comcast dot net>
+Arjun Thounaojam <arjun dot thounaojam at wipro dot com>
+Michael Altmann <michael dot altmann dot extern at mchh dot siemens dot de>
+Steven Patrick <spo at ngls dot net>
+Pete McCann <mccap at lucent dot com>
+William Nagel <bill at stagelogic dot com>
+M. C. Gahan <mcgahan at sparta dot com>
+Thia Chang Chao <tchangch at dso dot org dot sg>
+Gao Xianchao <info at socks5cn dot com>
+Huang Rui <huangrui at mail dot cqzte dot com dot cn>
+Sam Abbe <sam_abbe at raytheon dot com>
+Mike McGahan <mcgahan at sparta dot com>
+David Michael <damicha at sandia dot gov>
+Steve D. Baker <Steven_D_Baker at raytheon dot com>
+Martina Yen <martina_h_yen at raytheon dot com>
+Kim ByeongSu <kcando at kcando dot org>
+Doug McCorkle <mccdo at iastate dot edu>
+YiQing Xiong <xjaguar at 126 dot com>
+Peter Falsh <webangel at list dot ru>
+Don Sharp <dws at prismtech dot com>
+Arto Jalkanen <ajalkane at gmail dot com>
+Scott Zionic <sz at finsatconsulting dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
@@ -1930,3 +1980,4 @@ for instructions on submitting suggestions or fixes.
 
                 Douglas C. Schmidt
                 d.schmidt at vanderbilt.edu
+
diff --git a/VERSION b/VERSION
index d60110cbd24..87d7adabe45 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.4.2, released Sat Jul 31 11:13:20 2004.
+This is ACE version 5.4.4, released Thu Feb 10 07:04:33 2005.
 
 If you have any problems with or questions about ACE, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/ace-config.1.in b/ace-config.1.in
deleted file mode 100644
index 0fe88bb087d..00000000000
--- a/ace-config.1.in
+++ /dev/null
@@ -1,57 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii ace-config.1
-.\"
-.TH ace-config 1 "DECEMBER 1998" "Library Configuration" "User Manuals"
-.SH NAME
-ace-config \- Display ACE Library Configuration
-.SH SYNOPSIS
-.B ace-config 
-.I OPTION 
-.B [
-.I OPTION
-.B ... ] 
-.B [
-.I LIBRARY
-.B ]
-.SH DESCRIPTION
-.B ace-config
-is a script that is used to display what compiler flags and libraries were
-used when ACE was built.
-.SH OPTIONS
-.IP --version
-ACE version information
-.IP --help
-display help message and exit
-.IP --cxx
-C++ compiler used for compiling
-.IP --cxxflags
-C++ pre-processor and compiler flags
-.IP --libs
-library linking information
-.IP --libs-only-L
-the -L/-R part of
-.I --libs
-.IP --libs-only-l
-the -l part of 
-.I --libs
-.SH LIBRARY
-.I LIBRARY
-refers to the library for which the specified configuration is desired.  Valid
-libraries are:
-.IP ace
-the ACE library
-.IP netsvcs
-the ACE net services library
-.IP tao
-the ACE ORB (TAO) library
-.SH FILES
-.I @libdir@/aceConf.sh
-.RS
-Additional ACE related library configuration information.
-.RE
-.SH BUGS
-None.
-.SH AUTHOR
-Ossama Othman <ossama@uci.edu>
-.SH "SEE ALSO"
-.BR tao-config (1)
diff --git a/ace-config.in b/ace-config.in
deleted file mode 100644
index a1e19895647..00000000000
--- a/ace-config.in
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-
-set -e
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-
-bindir=@bindir@
-sbindir=@sbindir@
-libexecdir=@libexecdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-sharedstatedir=@sharedstatedir@
-localstatedir=@localstatedir@
-libdir=@libdir@
-infodir=@infodir@
-mandir=@mandir@
-includedir=@includedir@
-
-pkgdatadir=${datadir}/@PACKAGE@
-pkglibdir=${libdir}/@PACKAGE@
-pkgincludedir=${includedir}/@PACKAGE@
-
-usage()
-{
-    cat <<EOF
-Usage: ace-config OPTION [OPTIONS...] [LIBRARY]
-
-Generic options:
-  --version	output ACE version information
-  --help	display this help and exit
-
-Compilation support options:
-  --cxx         print C++ compiler used for compiling
-  --cxxflags	print C++ pre-processor and compiler flags
-  --libs	print library linking information
-  --libs-only-L	only print the -L/-R part of --libs
-  --libs-only-l only print the -l part of --libs
-
-Install directories ACE was configured with:
-  --prefix  --exec-prefix  --bindir  --sbindir  --libexecdir  --datadir
-  --sysconfdir  --sharedstatedir  --localstatedir  --libdir  --infodir
-  --mandir  --includedir
-
-Known values for LIBRARY are:
-
-    ace
-    netsvcs
-    tao         (calls tao-config)
-
-If LIBRARY is none of these,
-    
-    ${libdir}/<LIBRARY>Conf.sh
-
-is looked in for the necessary information. 
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-cxx=false
-cxxflags=false
-libs_L=false
-libs_l=false
-
-# These values are only valid for ACE.
-the_compiler="@CXX@"
-the_libs="@ACE_LIBDIR@ -lACE @ACE_LIBS@"
-the_flags="@ACE_INCLUDEDIR@ @CXXFLAGS@"
-
-while test $# -gt 0; do
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case $1 in
-    --version)
-	echo @PACKAGE@ @VERSION@
-	exit 0
-	;;
-    --exec-prefix)
-	echo $exec_prefix
-	exit 0
-	;;
-    --prefix)
-	echo $prefix
-	exit 0
-	;;
-    --*dir)
-	dirname=\$`echo $1 | sed -e 's,^--,,'`
-	dirname=`eval echo $dirname`
-	test -z "$dirname" && exit 1
-	echo $dirname
-	exit 0
-	;;
-    --help)
-	usage 0
-	;;
-    --cxx)
-        cxx=true
-        ;;
-    --cxxflags)
-       	cxxflags=true
-       	;;
-    --libs)
-       	libs_L=true
-	libs_l=true
-       	;;
-    --libs-only-L)
-	libs_L=true
-	;;
-    --libs-only-l)
-	libs_l=true
-	;;
-    --*)
-	usage 1
-	;;
-    ace)
-# These are set before this option parsing loop begins.
-#        the_compiler="@CXX@"
-#        the_libs="$the_libs @ACE_LIBDIR@ -lACE @ACE_LIBS@"
-#        the_flags="$the_flags @ACE_INCLUDEDIR@ @CXXFLAGS@"
-	;;
-    netsvcs)
-        echo "Currently unsupported."
-        exit 1
-#      	the_libs="$the_libs @ACE_LIBDIR@ @NETSVCS_LIBS@"
-#  	the_flags="$the_flags @ACE_INCLUDEDIR@ @CXXFLAGS@"
-	;;
-    tao)
-        # The TAO compiler should be the same as ACE's compiler!
-        the_compiler="`tao-config --cxx tao`"
-        the_libs="$the_libs `tao-config --libs tao`"
-        the_flags="$the_flags `tao-config --cxxflags tao`"
-	;;
-    *)
-	cnf_sh=${libdir}/${1}Conf.sh
-	if test -f ${cnf_sh}; then
-	    . ${cnf_sh}
-	    up_name=`echo $1 | tr a-z A-Z`
-            cnf_compiler=\$${up_name}_COMPILER
-	    cnf_libdir=\$${up_name}_LIBDIR
-	    cnf_libs=\$${up_name}_LIBS
-	    cnf_flags=\$${up_name}_INCLUDEDIR
-            the_compiler="`eval echo $cnf_compiler`"
-	    the_libs="$the_libs `eval echo $cnf_libdir` `eval echo $cnf_libs`"
-	    the_flags="$the_flags `eval echo $cnf_flags`"
-	else
-	    echo Unknown library \`$1\' 1>&2
-	fi
-	;;
-    esac
-    shift
-done
-
-if $cxx; then
-    all_flags="$the_compiler"
-fi
-
-if $cxxflags; then
-    all_flags="$all_flags $the_flags"
-fi
-
-if $libs_L || $libs_l; then
-    all_flags="$all_flags $the_libs"
-fi
-
-if test -z "$all_flags" || test "x$all_flags" = "x "; then
-    exit 1
-fi
-
-# Straight out any possible duplicates, but be careful to
-# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz'
-other_flags=
-lib_L_flags=
-rev_libs=
-for i in $all_flags; do
-    case "$i" in
-    # a library, save it for later, in reverse order
-    -l*) rev_libs="$i $rev_libs" ;;
-    -L*|-R*)
-	if $libs_L; then
-	    case " $lib_L_flags " in
-	    *\ $i\ *) ;;			# already there
-	    *) lib_L_flags="$lib_L_flags $i" ;;	# add it to output
-	    esac 
-	fi;;
-    *)
-	case " $other_flags " in
-	*\ $i\ *) ;;				# already there
-	*) other_flags="$other_flags $i" ;;	# add it to output
-        esac ;;
-    esac
-done
-
-ord_libs=
-if $libs_l; then
-    for i in $rev_libs; do
-	case " $ord_libs " in
-	*\ $i\ *) ;;			# already there
-	*) ord_libs="$i $ord_libs" ;;	# add it to output in reverse order
-	esac
-    done
-fi
-
-echo $other_flags $lib_L_flags $ord_libs
-
-exit 0
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index aa3733444ae..7cd4ec2fd57 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -23,6 +23,10 @@
 #include "ace/OS_NS_ctype.h"
 #include "ace/OS_TLI.h"
 
+#if defined (VXWORKS)
+extern "C" int maxFiles;
+#endif /* VXWORKS */
+
 #if !defined (__ACE_INLINE__)
 #include "ace/ACE.inl"
 #endif /* __ACE_INLINE__ */
@@ -234,7 +238,7 @@ ACE::terminate_process (pid_t pid)
         ::TerminateProcess (process_handle, 0);
       // Free up the kernel resources.
       ACE_OS::close (process_handle);
-      return terminate_result;
+      return terminate_result ? 0 : -1;
     }
 #elif defined (CHORUS)
   KnCap cap_;
@@ -378,181 +382,6 @@ ACE::hash_pjw (const wchar_t *str)
 }
 #endif /* ACE_HAS_WCHAR */
 
-// The CRC routine was taken from the FreeBSD implementation of cksum,
-// that falls under the following license:
-/*-
- * Copyright (c) 1991, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * James W. Williams of NASA Goddard Space Flight Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-namespace ACE
-{
-  u_long crc_table_[] =
-    {
-      0x0,
-      0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
-      0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
-      0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
-      0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x5f15adac,
-      0x5bd4b01b, 0x569796c2, 0x52568b75, 0x6a1936c8, 0x6ed82b7f,
-      0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, 0x709f7b7a,
-      0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
-      0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58,
-      0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033,
-      0xa4ad16ea, 0xa06c0b5d, 0xd4326d90, 0xd0f37027, 0xddb056fe,
-      0xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
-      0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0xe13ef6f4,
-      0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
-      0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5,
-      0x2ac12072, 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
-      0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, 0x7897ab07,
-      0x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, 0x6f52c06c,
-      0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1,
-      0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
-      0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b,
-      0xbb60adfc, 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698,
-      0x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, 0x902b669d,
-      0x94ea7b2a, 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
-      0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, 0xc6bcf05f,
-      0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
-      0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80,
-      0x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
-      0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x5c007b8a,
-      0x58c1663d, 0x558240e4, 0x51435d53, 0x251d3b9e, 0x21dc2629,
-      0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, 0x3f9b762c,
-      0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
-      0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e,
-      0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65,
-      0xeba91bbc, 0xef68060b, 0xd727bbb6, 0xd3e6a601, 0xdea580d8,
-      0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
-      0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, 0xae3afba2,
-      0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
-      0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74,
-      0x857130c3, 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
-      0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, 0x7b827d21,
-      0x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, 0x6c47164a,
-      0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, 0x18197087,
-      0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
-      0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d,
-      0x2056cd3a, 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce,
-      0xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb,
-      0xdbee767c, 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
-      0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, 0x89b8fd09,
-      0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
-      0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf,
-      0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
-    };
-}
-
-// Compute a POSIX 1003.2 checksum.  The routine takes an string and
-// computes the CRC for it (it stops on the first '\0' character).
-
-// UNICOS UINT32's are 64-bit on the Cray PVP architecture
-#if defined(_UNICOS) || (ACE_SIZEOF_LONG == 8)
-#  define COMPUTE(var, ch) (var) = ( 0x00000000ffffffff & ((var) << 8)) ^ ACE::crc_table_[(((var) >> 24) ^ (ch))&0xff]
-#else /* _UNICOS */
-#  define COMPUTE(var, ch) (var) = ((var) << 8) ^ ACE::crc_table_[(((var) >> 24) ^ (ch))&0xff]
-#endif /* _UNICOS */
-
-u_long
-ACE::crc32 (const char *string)
-{
-  register ACE_UINT32 crc = 0;
-
-  u_long len = 0;
-
-  for (const char *p = string;
-       *p != 0;
-       ++p)
-    {
-      COMPUTE (crc, *p);
-      ++len;
-    }
-
-  // Include the length of the string.
-
-  for (; len != 0; len >>= 8)
-    COMPUTE (crc, len & 0xff);
-
-  return ~crc;
-}
-
-u_long
-ACE::crc32 (const char *buffer, ACE_UINT32 len)
-{
-  register ACE_UINT32 crc = 0;
-
-  for (const char *p = buffer;
-       p != buffer + len;
-       ++p)
-    COMPUTE (crc, *p);
-
-  // Include the length of the string.
-
-  for (; len != 0; len >>= 8)
-    COMPUTE (crc, len & 0xff);
-
-  return ~crc;
-}
-
-u_long
-ACE::crc32 (iovec *iov, int len)
-{
-  register ACE_UINT32 crc = 0;
-
-  int total_len = 0;
-
-  for (int i = 0; i < len; ++i)
-    {
-      for (const char *p = (char *) iov[i].iov_base;
-           p != (char *) iov[i].iov_base + iov[i].iov_len;
-           ++p)
-        COMPUTE (crc, *p);
-
-      total_len += iov[i].iov_len;
-    }
-
-  // Include the length of the string.
-
-  for (; total_len != 0; total_len >>= 8)
-    COMPUTE (crc, total_len & 0xff);
-
-  return ~crc;
-}
-
-#undef COMPUTE
-
 #if !defined (ACE_HAS_WINCE)
 ACE_TCHAR *
 ACE::strenvdup (const ACE_TCHAR *str)
@@ -3105,6 +2934,8 @@ ACE::max_handles (void)
 
 #if defined (_SC_OPEN_MAX)
   return ACE_OS::sysconf (_SC_OPEN_MAX);
+#elif defined (VXWORKS)
+  return maxFiles;
 #elif defined (FD_SETSIZE)
   return FD_SETSIZE;
 #else
@@ -3170,11 +3001,7 @@ ACE::set_handle_limit (int new_limit,
 #endif /* ACE_LACKS_RLIMIT */
     }
 
-  // Irix complains without this return statement.  DEC cxx
-  // (correctly) says that it's not reachable.  ACE_NOTREACHED won't
-  // work here, because it handles both platforms the same.
-  // IRIX does not complain anymore [7.2]
-  ACE_NOTREACHED (return 0);
+  return 0;
 }
 
 int
@@ -3195,14 +3022,14 @@ ACE::map_errno (int error)
 u_long
 ACE::gcd (u_long x, u_long y)
 {
-  if (y == 0)
+  while (y != 0)
     {
-      return x;
-    }
-  else
-    {
-      return ACE::gcd (y, x % y);
+      u_long r = x % y;
+      x = y;
+      y = r;
     }
+
+  return x;
 }
 
 
diff --git a/ace/ACE.h b/ace/ACE.h
index 3a0e4063394..d42be3c5098 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -22,7 +22,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-all.h"
+#include "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -156,12 +156,11 @@ namespace ACE
 
 #if defined (ACE_HAS_TLI)
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t t_rcv (ACE_HANDLE handle,
-                 void *buf,
-                 size_t len,
-                 int *flags,
-                 const ACE_Time_Value *timeout = 0);
+  extern ACE_Export ssize_t t_rcv (ACE_HANDLE handle,
+                                   void *buf,
+                                   size_t len,
+                                   int *flags,
+                                   const ACE_Time_Value *timeout = 0);
 
 #endif /* ACE_HAS_TLI */
 
@@ -378,7 +377,7 @@ namespace ACE
   /**
    * Reset the limit on the number of open handles.  If @a new_limit
    * == -1 set the limit to the maximum allowable.  Otherwise, set
-   * the limit value to @a new_limit.  If @a increase_limit_only is 
+   * the limit value to @a new_limit.  If @a increase_limit_only is
    * non-0 then only allow increases to the limit.
    */
   extern ACE_Export int set_handle_limit (int new_limit = -1,
@@ -536,17 +535,28 @@ namespace ACE
   extern ACE_Export u_long hash_pjw (const wchar_t *str, size_t len);
 #endif /* ACE_HAS_WCHAR */
 
-  /// Computes the ISO 8802-3 standard 32 bits CRC for the string
-  /// (not for a file).
-  extern ACE_Export u_long crc32 (const char *str);
+  /// Computes CRC-CCITT for the string.
+  extern ACE_Export ACE_UINT16 crc_ccitt(const char *str);
+
+  /// Computes CRC-CCITT for the buffer.
+  extern ACE_Export ACE_UINT16 crc_ccitt(const void *buf, size_t len,
+					 ACE_UINT16 crc = 0);
 
-  /// Computes the ISO 8802-3 standard 32 bits CRC for the given
-  /// buffer (the length is included in the CRC).
-  extern ACE_Export u_long crc32 (const char *buf, ACE_UINT32 len);
+  /// Computes CRC-CCITT for the @ len iovec buffers.
+  extern ACE_Export ACE_UINT16 crc_ccitt(const iovec *iov, int len,
+					 ACE_UINT16 crc = 0);
+
+  /// Computes the ISO 8802-3 standard 32 bits CRC for the string.
+  extern ACE_Export ACE_UINT32 crc32 (const char *str);
+
+  /// Computes the ISO 8802-3 standard 32 bits CRC for the buffer.
+  extern ACE_Export ACE_UINT32 crc32 (const void *buf, size_t len,
+				      ACE_UINT32 crc = 0);
 
   /// Computes the ISO 8802-3 standard 32 bits CRC for the
   /// @ len iovec buffers.
-  extern ACE_Export u_long crc32 (iovec *iov, int len);
+  extern ACE_Export ACE_UINT32 crc32 (const iovec *iov, int len,
+				      ACE_UINT32 crc = 0);
 
   /// Euclid's greatest common divisor algorithm.
   extern ACE_Export u_long gcd (u_long x, u_long y);
@@ -588,7 +598,7 @@ namespace ACE
   extern ACE_Export int process_active (pid_t pid);
 
   /**
-   * Terminate the process abruptly with id <pid>.  On Win32 platforms
+   * Terminate the process abruptly with id @a pid.  On Win32 platforms
    * this uses <TerminateProcess> and on POSIX platforms is uses
    * <kill> with the -9 (SIGKILL) signal, which cannot be caught or
    * ignored.  Note that this call is potentially dangerous to use
@@ -708,20 +718,18 @@ namespace ACE
 
 #if defined (ACE_HAS_TLI)
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t t_rcv_n_i (ACE_HANDLE handle,
-                     void *buf,
-                     size_t len,
-                     int *flags,
-                     size_t *bytes_transferred);
+  extern ACE_Export ssize_t t_rcv_n_i (ACE_HANDLE handle,
+                                       void *buf,
+                                       size_t len,
+                                       int *flags,
+                                       size_t *bytes_transferred);
 
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ssize_t t_rcv_n_i (ACE_HANDLE handle,
-                     void *buf,
-                     size_t len,
-                     int *flags,
-                     const ACE_Time_Value *timeout,
-                     size_t *bytes_transferred);
+  extern ACE_Export ssize_t t_rcv_n_i (ACE_HANDLE handle,
+                                       void *buf,
+                                       size_t len,
+                                       int *flags,
+                                       const ACE_Time_Value *timeout,
+                                       size_t *bytes_transferred);
 
 #endif /* ACE_HAS_TLI */
 
diff --git a/ace/ACE.inl b/ace/ACE.inl
index fcd4e9b407b..3384548b5ca 100644
--- a/ace/ACE.inl
+++ b/ace/ACE.inl
@@ -225,7 +225,7 @@ ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len)
 ACE_INLINE ssize_t
 ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len)
 {
-#if defined (ACE_WIN32) || defined (ACE_PSOS) || defined (ACE_OPENVMS)
+#if defined (ACE_WIN32) || defined (ACE_PSOS) || defined (ACE_OPENVMS) || defined (ACE_TANDEM_T1248_PTHREADS)
   return ACE_OS::recv (handle, (char *) buf, len);
 #else
   return ACE_OS::read (handle, (char *) buf, len);
@@ -288,7 +288,15 @@ ACE_INLINE ACE_TCHAR
 ACE::nibble2hex (u_int n)
 {
   // Hexadecimal characters.
+#if defined (ACE_VXWORKS) && !defined (__DCPLUSPLUS__)
+  // temporary solution to prevent Windriver GNU toolchains from spewing
+  // loads of warnings when inlining.
+  // problem (incorrect warning leftover from older GNU) has been reported as
+  // TSR to Windriver.
+  const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef");
+#else
   static const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef");
+#endif
 
   // @@ UNICODE does this work?
   return hex_chars[n & 0x0f];
diff --git a/ace/ACE_export.h b/ace/ACE_export.h
index 5b5de035aa7..78a1b47e08a 100644
--- a/ace/ACE_export.h
+++ b/ace/ACE_export.h
@@ -44,10 +44,18 @@
 #endif     /* ACE_HAS_DLL */
 
 // Added by hand to help with ACE_OS namespace
+#if defined (__TANDEM) && defined(USE_EXPLICIT_EXPORT)
+#define ACE_NAMESPACE_STORAGE_CLASS ACE_EXPORT_MACRO extern
+#else
 #define ACE_NAMESPACE_STORAGE_CLASS extern ACE_EXPORT_MACRO
+#endif
 
-#if (defined (_MSC_VER) || defined (__MINGW32__) || defined (CYGWIN32)) && defined (__ACE_INLINE__)
-#  define ACE_NAMESPACE_INLINE_FUNCTION inline
+#if defined (__ACE_INLINE__)
+#  if defined (_MSC_VER) || defined (__MINGW32__) || defined (CYGWIN32)
+#    define ACE_NAMESPACE_INLINE_FUNCTION inline
+#  else
+#    define ACE_NAMESPACE_INLINE_FUNCTION ACE_NAMESPACE_STORAGE_CLASS inline
+#  endif
 #else
 #  define ACE_NAMESPACE_INLINE_FUNCTION ACE_NAMESPACE_STORAGE_CLASS
 #endif
diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp
index 7e7b323fbdc..8109c3c215c 100644
--- a/ace/ARGV.cpp
+++ b/ace/ARGV.cpp
@@ -183,7 +183,7 @@ ACE_ARGV::add (const ACE_TCHAR *next_arg)
     }
 
   // Put the new argument at the end of the queue.
-  if (this->queue_.enqueue_tail ((ACE_TCHAR *) next_arg) == -1)
+  if (this->queue_.enqueue_tail (const_cast <ACE_TCHAR *> (next_arg)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_LIB_TEXT ("Can't add more to ARGV queue")),
                       -1);
diff --git a/ace/ARGV.h b/ace/ARGV.h
index e43ae3a719b..feba0fe6b1d 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -52,7 +52,7 @@ public:
             int substitute_env_args = 1);
 
   /**
-   * Converts <argv> into a linear string.  If <substitute_env_args>
+   * Converts @a argv into a linear string.  If @a substitute_env_args
    * is enabled then we'll substitute the environment variables for
    * each $ENV encountered in the string.  The <buf> operation is not
    * allowed on an ACE_ARGV created this way.
@@ -86,18 +86,18 @@ public:
   const ACE_TCHAR *operator[] (size_t index);
 
   /**
-   * Returns the <argv> array.  Caller should not delete this memory
-   * since the <ARGV> destructor will delete it.  If the caller
+   * Returns the @c argv array.  Caller should not delete this memory
+   * since the ACE_ARGV destructor will delete it.  If the caller
    * modifies the array in the iterative mode, the changes are not
    * saved to the queue.
    */
   ACE_TCHAR **argv (void);
 
-  /// Returns <argc>.
+  /// Returns @c argc.
   int argc (void) const;
 
-  /// Returns the <buf>.  Caller should not delete this memory since
-  /// the <ARGV> destructor will delete it.
+  /// Returns the @c buf.  Caller should not delete this memory since
+  /// the ACE_ARGV destructor will delete it.
   const ACE_TCHAR *buf (void);
 
   /// Dump the state of an object.
@@ -114,7 +114,7 @@ public:
   int add (const ACE_TCHAR *next_arg);
 
   /**
-   * Add another <argv> array.  The <argv> parameter must be NULL
+   * Add another @a argv array.  The @a argv parameter must be NULL
    * terminated.  This only works in the <ITERATIVE> state.  Returns
    * -1 on failure and 0 on success.
    */
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index 4f343653905..f187980c14f 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -925,19 +925,18 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE
       delete this->concurrency_strategy_;
       this->delete_concurrency_strategy_ = 0;
       this->concurrency_strategy_ = 0;
+    }
+  // Note that if we aren't actually registered with the
+  // ACE_Reactor then it's ok for this call to fail...
 
-      // Note that if we aren't actually registered with the
-      // ACE_Reactor then it's ok for this call to fail...
-
-      if (this->reactor ())
-        this->reactor ()->remove_handler
-          (this,
-           ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL);
+  if (this->reactor ())
+    this->reactor ()->remove_handler
+      (this,
+       ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL);
 
-      if (this->peer_acceptor_.close () == -1)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT ("close\n")));
-    }
+  if (this->peer_acceptor_.close () == -1)
+    ACE_ERROR ((LM_ERROR,
+                ACE_LIB_TEXT ("close\n")));
   return 0;
 }
 
diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h
index e1246a37125..b14a967d2bd 100644
--- a/ace/Activation_Queue.h
+++ b/ace/Activation_Queue.h
@@ -25,7 +25,7 @@
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Method_Request.h"
 
-// Be compatible with the terminology in the POSA2 book!
+/// Define to be compatible with the terminology in the POSA2 book!
 #define ACE_Activation_List ACE_Activation_Queue
 
 /**
@@ -136,7 +136,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-  /// Stores the <Method_Requests>.
+  /// Stores the Method_Requests.
   ACE_Message_Queue<ACE_SYNCH> *queue_;
 
   /// Keeps track of whether we need to delete the queue.
diff --git a/ace/Active_Map_Manager.h b/ace/Active_Map_Manager.h
index 62cf0b310f5..a80362da67c 100644
--- a/ace/Active_Map_Manager.h
+++ b/ace/Active_Map_Manager.h
@@ -39,9 +39,9 @@ public:
   ACE_Active_Map_Manager_Key (void);
 
   /**
-   * Constructor given the <slot_index> and <slot_generation> number.
+   * Constructor given the @a slot_index and @a slot_generation number.
    * This is useful once the user has somehow recovered the
-   * <slot_index> and <slot_generation> number from the client.
+   * @a slot_index and @a slot_generation number from the client.
    */
   ACE_Active_Map_Manager_Key (ACE_UINT32 slot_index,
                               ACE_UINT32 slot_generation);
diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h
index b4f0e4e7e87..66901baf659 100644
--- a/ace/Arg_Shifter.h
+++ b/ace/Arg_Shifter.h
@@ -79,7 +79,7 @@ public:
   const ACE_TCHAR *get_current (void) const;
 
   /**
-   * If the <flag> matches the current_arg of arg shifter
+   * If the @a flag matches the current_arg of arg shifter
    * this method will attempt to return the associated
    * parameter value
    *
@@ -90,7 +90,7 @@ public:
    * eg: main -foobar value, main -FooBar value
    *     main -FOOBARvalue
    *
-   *     all of the above will all match the <flag> == -FooBar
+   *     all of the above will all match the @a flag == -FooBar
    *     and will return a char* to "value"
    *
    *     main -foobar 4 would succeed and return a char* to "4"
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index 6303f00f869..24f4fa56bdf 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -347,15 +347,14 @@ ACE_Asynch_Acceptor<HANDLER>::cancel (void)
   // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
   // operations will occur normally.
 #if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \
-    && (   (defined (_MSC_VER) && (_MSC_VER > 1020)) \
+    && (    defined (_MSC_VER) \
         || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)))
   return (int) ::CancelIo (this->listen_handle_);
 #else
-  //ACE_NOTSUP_RETURN (-1);
   // Supported now
   return this->asynch_accept_.cancel();
 
-#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && ((defined (_MSC_VER) && (_MSC_VER > 1020)) || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && ((defined (_MSC_VER)) || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530))) */
 }
 
 template <class HANDLER> void
diff --git a/ace/Asynch_Connector.cpp b/ace/Asynch_Connector.cpp
index d8cc7b03fd0..9773be0421d 100644
--- a/ace/Asynch_Connector.cpp
+++ b/ace/Asynch_Connector.cpp
@@ -23,9 +23,6 @@ ACE_RCSID(ace, Asynch_Connector, "$Id$")
 #include "ace/INET_Addr.h"
 
 template <class HANDLER>
-const ACE_INET_Addr ACE_Asynch_Connector<HANDLER>::local_default = (u_short) 0;
-
-template <class HANDLER>
 ACE_Asynch_Connector<HANDLER>::ACE_Asynch_Connector (void)
   : pass_addresses_ (0),
     validate_new_connection_ (0)
diff --git a/ace/Asynch_Connector.h b/ace/Asynch_Connector.h
index c1e9a34fb70..91df697c275 100644
--- a/ace/Asynch_Connector.h
+++ b/ace/Asynch_Connector.h
@@ -44,8 +44,6 @@ template <class HANDLER>
 class ACE_Asynch_Connector : public ACE_Handler
 {
 public:
-  static const ACE_INET_Addr local_default;
-
   /// A do nothing constructor.
   ACE_Asynch_Connector (void);
 
@@ -61,7 +59,8 @@ public:
 
   /// This initiates a new asynchronous connect
   virtual int connect (const ACE_INET_Addr &remote_sap,
-                       const ACE_INET_Addr &local_sap = local_default,
+                       const ACE_INET_Addr &local_sap =
+                         (const ACE_INET_Addr &)ACE_Addr::sap_any,
                        int reuse_addr = 1,
                        const void *act = 0);
 
diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp
index 93d33c6f6ca..7b652ca0525 100644
--- a/ace/Asynch_IO.cpp
+++ b/ace/Asynch_IO.cpp
@@ -96,7 +96,7 @@ ACE_Asynch_Operation::open (ACE_Handler &handler,
                             const void *completion_key,
                             ACE_Proactor *proactor)
 {
-  return this->implementation ()->open (handler,
+  return this->implementation ()->open (handler.proxy (),
                                         handle,
                                         completion_key,
                                         proactor);
@@ -182,7 +182,7 @@ ACE_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
                                       bytes_to_read,
                                       act,
                                       priority,
-                                     signal_number);
+                                      signal_number);
 }
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
@@ -985,15 +985,24 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::transmit_buffers (void)
 ACE_Handler::ACE_Handler (void)
   : proactor_ (0), handle_ (ACE_INVALID_HANDLE)
 {
+  ACE_Handler::Proxy *p;
+  ACE_NEW (p, ACE_Handler::Proxy (this));
+  this->proxy_.reset (p);
 }
 
 ACE_Handler::ACE_Handler (ACE_Proactor *d)
   : proactor_ (d), handle_ (ACE_INVALID_HANDLE)
 {
+  ACE_Handler::Proxy *p;
+  ACE_NEW (p, ACE_Handler::Proxy (this));
+  this->proxy_.reset (p);
 }
 
 ACE_Handler::~ACE_Handler (void)
 {
+  ACE_Handler::Proxy *p = this->proxy_.get ();
+  if (p)
+    p->reset ();
 }
 
 void
@@ -1076,6 +1085,12 @@ ACE_Handler::handle (ACE_HANDLE h)
   this->handle_ = h;
 }
 
+ACE_Refcounted_Auto_Ptr<ACE_Handler::Proxy, ACE_SYNCH_MUTEX> &
+ACE_Handler::proxy (void)
+{
+  return this->proxy_;
+}
+
 // ************************************************************
 
 ACE_Service_Handler::ACE_Service_Handler (void)
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index 8af31d3e167..035c4bb01dd 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -35,6 +35,14 @@
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 
+#include "ace/Synch_Traits.h"
+#if defined (ACE_HAS_THREADS)
+#  include "ace/Thread_Mutex.h"
+#else
+#  include "ace/Null_Mutex.h"
+#endif /* ACE_HAS_THREADS */
+#include "ace/Refcounted_Auto_Ptr.h"
+
 #include "ace/os_include/os_signal.h"
 #include "ace/os_include/sys/os_socket.h"
 #include "ace/os_include/sys/os_types.h"
@@ -565,8 +573,8 @@ public:
    */
   int read (ACE_Message_Block &message_block,
             size_t bytes_to_read,
-            u_long offset = 0,
-            u_long offset_high = 0,
+            unsigned long offset = 0,
+            unsigned long offset_high = 0,
             const void *act = 0,
             int priority = 0,
             int signal_number = ACE_SIGRTMIN);
@@ -580,8 +588,8 @@ public:
   */
   int readv (ACE_Message_Block &message_block,
              size_t bytes_to_read,
-             u_long offset = 0,
-             u_long offset_high = 0,
+             unsigned long offset = 0,
+             unsigned long offset_high = 0,
              const void *act = 0,
              int priority = 0,
              int signal_number = ACE_SIGRTMIN);
@@ -699,8 +707,8 @@ public:
    */
   int write (ACE_Message_Block &message_block,
              size_t bytes_to_write,
-             u_long offset = 0,
-             u_long offset_high = 0,
+             unsigned long offset = 0,
+             unsigned long offset_high = 0,
              const void *act = 0,
              int priority = 0,
              int signal_number = ACE_SIGRTMIN);
@@ -714,8 +722,8 @@ public:
   */
   int writev (ACE_Message_Block &message_block,
               size_t bytes_to_write,
-              u_long offset = 0,
-              u_long offset_high = 0,
+              unsigned long offset = 0,
+              unsigned long offset_high = 0,
               const void *act = 0,
               int priority = 0,
               int signal_number = ACE_SIGRTMIN);
@@ -1059,10 +1067,10 @@ public:
   int transmit_file (ACE_HANDLE file,
                      Header_And_Trailer *header_and_trailer = 0,
                      size_t bytes_to_write = 0,
-                     u_long offset = 0,
-                     u_long offset_high = 0,
+                     unsigned long offset = 0,
+                     unsigned long offset_high = 0,
                      size_t bytes_per_send = 0,
-                     u_long flags = 0,
+                     unsigned long flags = 0,
                      const void *act = 0,
                      int priority = 0,
                      int signal_number = ACE_SIGRTMIN);
@@ -1550,12 +1558,38 @@ public:
   /// Set the ACE_HANDLE value for this Handler.
   virtual void handle (ACE_HANDLE);
 
+  /**
+   * @class Proxy
+   *
+   * @brief The Proxy class acts as a proxy for dispatch of completions
+   * to operations issued for the associated handler. It allows the handler
+   * to be deleted while operations are outstanding. The proxy must be used
+   * to get the ACE_Handler pointer for dispatching, and if it's 0, the
+   * handler is no longer valid and the result should not be dispatched.
+   */
+  class ACE_Export Proxy
+  {
+  public:
+    Proxy (ACE_Handler *handler) : handler_ (handler) {};
+    void reset (void) { this->handler_ = 0; };
+    ACE_Handler *handler (void) { return this->handler_; };
+  private:
+    ACE_Handler *handler_;
+  };
+  typedef ACE_Refcounted_Auto_Ptr<ACE_Handler::Proxy,ACE_SYNCH_MUTEX>
+    Proxy_Ptr;
+
+  ACE_Handler::Proxy_Ptr &proxy (void);
+
 protected:
   /// The proactor associated with this handler.
   ACE_Proactor *proactor_;
 
   /// The ACE_HANDLE in use with this handler.
   ACE_HANDLE    handle_;
+
+  /// Refers to proxy for this handler.
+  ACE_Refcounted_Auto_Ptr<ACE_Handler::Proxy, ACE_SYNCH_MUTEX> proxy_;
 };
 
 // Forward declarations
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
index c1ad52825b6..5657c2c49dc 100644
--- a/ace/Asynch_IO_Impl.h
+++ b/ace/Asynch_IO_Impl.h
@@ -117,11 +117,11 @@ public:
 
   /**
    * Initializes the factory with information which will be used with
-   * each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-   * <ACE_Handler::handle> will be called on the <handler> to get the
+   * each asynchronous call.  If @a handle == ACE_INVALID_HANDLE,
+   * ACE_Handler::handle() will be called on the proxied handler to get the
    * correct handle.
    */
-  virtual int open (ACE_Handler &handler,
+  virtual int open (ACE_Handler::Proxy_Ptr &handler_proxy,
                     ACE_HANDLE handle,
                     const void *completion_key,
                     ACE_Proactor *proactor) = 0;
diff --git a/ace/Atomic_Op.h b/ace/Atomic_Op.h
index ee0c330bf4a..3522234287e 100644
--- a/ace/Atomic_Op.h
+++ b/ace/Atomic_Op.h
@@ -103,10 +103,10 @@ public:
   bool operator< (long rhs) const;
 
   /// Atomically assign rhs to <value_>.
-  void operator= (long rhs);
+  ACE_Atomic_Op<ACE_Thread_Mutex, long> &operator= (long rhs);
 
   /// Atomically assign <rhs> to <value_>.
-  void operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &rhs);
+  ACE_Atomic_Op<ACE_Thread_Mutex, long> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &rhs);
 
   /// Explicitly return <value_>.
   long value (void) const;
diff --git a/ace/Atomic_Op.inl b/ace/Atomic_Op.inl
index 6194d8a7318..352c2afef4e 100644
--- a/ace/Atomic_Op.inl
+++ b/ace/Atomic_Op.inl
@@ -114,7 +114,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator< (long rhs) const
   return (this->value_ < rhs);
 }
 
-ACE_INLINE void
+ACE_INLINE ACE_Atomic_Op<ACE_Thread_Mutex, long> &
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (long rhs)
 {
 #if defined (WIN32)
@@ -122,9 +122,10 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (long rhs)
 #else /* WIN32 */
   (*exchange_fn_) (&this->value_, rhs);
 #endif /* WIN32 */
+  return *this;
 }
 
-ACE_INLINE void
+ACE_INLINE ACE_Atomic_Op<ACE_Thread_Mutex, long> &
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (
    const ACE_Atomic_Op<ACE_Thread_Mutex, long> &rhs)
 {
@@ -133,6 +134,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (
 #else /* WIN32 */
   (*exchange_fn_) (&this->value_, rhs.value_);
 #endif /* WIN32 */
+  return *this;
 }
 
 ACE_INLINE long
diff --git a/ace/Atomic_Op_T.h b/ace/Atomic_Op_T.h
index f536a349662..5cf17f473c7 100644
--- a/ace/Atomic_Op_T.h
+++ b/ace/Atomic_Op_T.h
@@ -89,10 +89,10 @@ public:
   bool operator< (const TYPE &rhs) const;
 
   /// Atomically assign rhs to <value_>.
-  void operator= (const TYPE &rhs);
+  ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &operator= (const TYPE &rhs);
 
   /// Atomically assign <rhs> to <value_>.
-  void operator= (const ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &rhs);
+  ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &operator= (const ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &rhs);
 
   /// Explicitly return <value_>.
   TYPE value (void) const;
@@ -159,10 +159,10 @@ public:
   ACE_Atomic_Op (const ACE_Atomic_Op<ACE_LOCK, TYPE> &c);
 
   /// Atomically assign rhs to <value_>.
-  void operator= (const TYPE &rhs);
+  ACE_Atomic_Op<ACE_LOCK, TYPE> &operator= (const TYPE &rhs);
 
   /// Atomically assign <rhs> to <value_>.
-  void operator= (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs);
+  ACE_Atomic_Op<ACE_LOCK, TYPE> &operator= (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs);
 
   /// Atomically pre-increment <value_>.
   TYPE operator++ (void);
diff --git a/ace/Atomic_Op_T.inl b/ace/Atomic_Op_T.inl
index ccdfee63905..6077ca4055f 100644
--- a/ace/Atomic_Op_T.inl
+++ b/ace/Atomic_Op_T.inl
@@ -111,17 +111,18 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator< (const TYPE &rhs) const
   return this->value_ < rhs;
 }
 
-template <class ACE_LOCK, class TYPE> ACE_INLINE void
+template <class ACE_LOCK, class TYPE> ACE_INLINE ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &
 ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator= (const ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &rhs)
 {
 // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator=");
   if (&rhs == this)
-    return; // Avoid deadlock...
-  ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_);
-  // This will call ACE_Atomic_Op_Ex::TYPE(), which will ensure the value
-  // of <rhs> is acquired atomically.
+    return *this; // Avoid deadlock...
+  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, *this);
+  // This will call ACE_Atomic_Op_Ex::TYPE(), which will ensure the
+  // value of <rhs> is acquired atomically.
 
   this->value_ = rhs.value ();
+  return *this;
 }
 
 template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE
@@ -142,28 +143,31 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value_i (void)
   return this->value_;
 }
 
-template <class ACE_LOCK, class TYPE> ACE_INLINE void
+template <class ACE_LOCK, class TYPE> ACE_INLINE ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &
 ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator= (const TYPE &rhs)
 {
 // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator=");
-  ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_);
+  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, *this);
   this->value_ = rhs;
+  return *this;
 }
 
 //
 // ACE_Atomic_Op inline functions
 //
 
-template <class ACE_LOCK, class TYPE> ACE_INLINE void
+template <class ACE_LOCK, class TYPE> ACE_INLINE ACE_Atomic_Op<ACE_LOCK, TYPE> &
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (const TYPE &i)
 {
   this->impl_ = i;
+  return *this;
 }
 
-template <class ACE_LOCK, class TYPE> ACE_INLINE void
+template <class ACE_LOCK, class TYPE> ACE_INLINE ACE_Atomic_Op<ACE_LOCK, TYPE> &
 ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs)
 {
   this->impl_ = rhs.impl_;
+  return *this;
 }
 
 template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index 7565e66cad0..1f0d93062dc 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -86,6 +86,7 @@ class auto_ptr : public ACE_Auto_Basic_Ptr <X>
 public:
   // = Initialization and termination methods
   explicit auto_ptr (X *p = 0) : ACE_Auto_Basic_Ptr<X> (p) {}
+  auto_ptr (auto_ptr<X> &ap) : ACE_Auto_Basic_Ptr<X> (ap.release()) {}
 
   X *operator-> () const;
 };
diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h
index 5ca62ae6cbf..24cd5b8c677 100644
--- a/ace/Base_Thread_Adapter.h
+++ b/ace/Base_Thread_Adapter.h
@@ -79,16 +79,8 @@ protected:
 class ACE_Export ACE_Base_Thread_Adapter
 {
 public:
-  /// Constructor.
-  ACE_Base_Thread_Adapter (ACE_THR_FUNC user_func,
-                           void *arg,
-                           ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter,
-                           ACE_OS_Thread_Descriptor *td = 0
-# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
-                           , ACE_SEH_EXCEPT_HANDLER selector = 0
-                           , ACE_SEH_EXCEPT_HANDLER handler = 0
-# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
-                      );
+
+  virtual ~ACE_Base_Thread_Adapter (void);
 
   /// Virtual method invoked by the thread entry point.
   virtual ACE_THR_FUNC_RETURN invoke (void) = 0;
@@ -113,10 +105,16 @@ public:
   static ACE_OS_Thread_Descriptor *thr_desc_log_msg (void);
 
 protected:
-  /// Destructor, making it private ensures that objects of this class
-  /// are allocated on the heap.
-  virtual ~ACE_Base_Thread_Adapter (void);
-
+  /// Constructor.
+  ACE_Base_Thread_Adapter (ACE_THR_FUNC user_func,
+                           void *arg,
+                           ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter,
+                           ACE_OS_Thread_Descriptor *td = 0
+# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
+                           , ACE_SEH_EXCEPT_HANDLER selector = 0
+                           , ACE_SEH_EXCEPT_HANDLER handler = 0
+# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
+                      );
   /// Inherit the logging features if the parent thread has an
   /// <ACE_Log_Msg>.
   void inherit_log_msg (void);
diff --git a/ace/Basic_Stats.cpp b/ace/Basic_Stats.cpp
index 3ed5dc739ad..eaf51d04a17 100644
--- a/ace/Basic_Stats.cpp
+++ b/ace/Basic_Stats.cpp
@@ -17,24 +17,28 @@ ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs)
 
   if (this->samples_count_ == 0)
     {
-      this->samples_count_ = rhs.samples_count_;
+      this->min_ = rhs.min_;
+      this->min_at_ = rhs.min_at_;
 
-      this->min_  = rhs.min_;
-      this->max_  = rhs.max_;
-      this->sum_  = rhs.sum_;
-      this->sum2_ = rhs.sum2_;
-
-      return;
+      this->max_ = rhs.max_;
+      this->max_at_ = rhs.max_at_;
+    }
+  else
+    {
+      if (this->min_ > rhs.min_)
+        {
+          this->min_ = rhs.min_;
+          this->min_at_ = rhs.min_at_;          
+        }
+      if (this->max_ < rhs.max_)
+        {
+          this->max_ = rhs.max_;
+          this->max_at_ = rhs.max_at_;
+        }
     }
-  this->samples_count_ += rhs.samples_count_;
-
-  if (this->min_ > rhs.min_)
-    this->min_ = rhs.min_;
-  if (this->max_ < rhs.max_)
-    this->max_ = rhs.max_;
 
-  this->sum_  += rhs.sum_;
-  this->sum2_ += rhs.sum2_;
+  this->samples_count_ += rhs.samples_count_;
+  this->sum_ += rhs.sum_;
 }
 
 void
@@ -49,27 +53,18 @@ ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg,
       return;
     }
 
-  const ACE_UINT64 avg = this->sum_ / this->samples_count_;
-  ACE_UINT64 dev =
-# if defined ACE_LACKS_LONGLONG_T
-    static_cast<ACE_U_LongLong> (this->sum2_ / this->samples_count_)
-    - avg * ACE_U64_TO_U32(avg);
-# else  /* ! ACE_LACKS_LONGLONG_T */
-    this->sum2_ / this->samples_count_ - avg * avg;
-# endif /* ! ACE_LACKS_LONGLONG_T */
+  ACE_UINT64 avg = this->sum_ / this->samples_count_;
 
-  const double l_min = ACE_CU64_TO_CU32 (this->min_) / sf;
-  const double l_max = ACE_CU64_TO_CU32 (this->max_) / sf;
-  const double l_avg = ACE_CU64_TO_CU32 (avg) / sf;
-  const double l_dev = ACE_CU64_TO_CU32 (dev) / (sf * sf);
+  ACE_UINT64 l_min = this->min_ / sf;
+  ACE_UINT64 l_max = this->max_ / sf;
+  ACE_UINT64 l_avg = avg / sf;
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("%s latency   : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"),
+              ACE_LIB_TEXT ("%s latency   : %Q[%d]/%Q/%Q[%d] (min/avg/max)\n"),
               msg,
               l_min, this->min_at_,
               l_avg,
-              l_max, this->max_at_,
-              l_dev));
+              l_max, this->max_at_));
 
 #endif /* ACE_NLOGGING */
 }
diff --git a/ace/Basic_Stats.h b/ace/Basic_Stats.h
index 6e5b5b32a4c..7a6c7fd8ab6 100644
--- a/ace/Basic_Stats.h
+++ b/ace/Basic_Stats.h
@@ -56,7 +56,6 @@ public:
   void dump_results (const ACE_TCHAR *msg,
                      ACE_UINT32 scale_factor) const;
 
-private:
   /// The number of samples
   ACE_UINT32 samples_count_;
 
@@ -74,9 +73,6 @@ private:
 
   /// The sum of all the values
   ACE_UINT64 sum_;
-
-  /// The sum of the square of all the values
-  ACE_UINT64 sum2_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Basic_Stats.inl b/ace/Basic_Stats.inl
index 4ed1baca459..b2fd80d121a 100644
--- a/ace/Basic_Stats.inl
+++ b/ace/Basic_Stats.inl
@@ -8,7 +8,6 @@ ACE_Basic_Stats::ACE_Basic_Stats (void)
   , max_ (0)
   , max_at_ (0)
   , sum_ (0)
-  , sum2_ (0)
 {
 }
 
@@ -29,12 +28,6 @@ ACE_Basic_Stats::sample (ACE_UINT64 value)
       this->min_at_ = this->samples_count_;
       this->max_ = value;
       this->max_at_ = this->samples_count_;
-      this->sum_ = value;
-#if defined ACE_LACKS_LONGLONG_T
-      this->sum2_ = value * ACE_U64_TO_U32 (value);
-#else  /* ! ACE_LACKS_LONGLONG_T */
-      this->sum2_ = value * value;
-#endif /* ! ACE_LACKS_LONGLONG_T */
     }
   else
     {
@@ -48,12 +41,7 @@ ACE_Basic_Stats::sample (ACE_UINT64 value)
           this->max_ = value;
           this->max_at_ = this->samples_count_;
         }
-
-      this->sum_  += value;
-#if defined ACE_LACKS_LONGLONG_T
-      this->sum2_ += value * ACE_U64_TO_U32 (value);
-#else  /* ! ACE_LACKS_LONGLONG_T */
-      this->sum2_ += value * value;
-#endif /* ! ACE_LACKS_LONGLONG_T */
     }
+
+  this->sum_ += value;
 }
diff --git a/ace/Basic_Types.cpp b/ace/Basic_Types.cpp
index d2a160c1851..036a79bae8d 100644
--- a/ace/Basic_Types.cpp
+++ b/ace/Basic_Types.cpp
@@ -114,7 +114,11 @@ ACE_U_LongLong::as_string (ACE_TCHAR *output,
 ostream&
 operator<< (ostream& os, const ACE_U_LongLong& ll)
 {
+#ifdef __TANDEM && (__CPLUSPLUS_VERSION >= 3)
+  unsigned long flags = os.flags();
+#else
   unsigned long flags = os.setf(0);
+#endif
   char buffer[32];
 
   if ((flags & ios::oct) != 0)
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index 3273f6eaccb..09aacf67004 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -31,7 +31,7 @@
  *    - ACE_INT32
  *    - ACE_UINT32
  *    - ACE_UINT64
- *  (Note: ACE_INT64 is not defined, because there is no ACE_LongLong for
+ *  (Note: ACE_INT64 is partly defined, there is no ACE_LongLong for
  *   platforms that don't have a native 8-byte integer type.)
  *
  *  Byte-order (endian-ness) determination:
@@ -142,7 +142,8 @@
 #   else  /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */
 #     if ACE_SIZEOF_LONG == 8
 #       define ACE_SIZEOF_LONG_LONG 8
-       typedef unsigned long ACE_UINT64;
+        typedef unsigned long ACE_UINT64;
+        typedef   signed long ACE_INT64;
 #     elif defined (ULLONG_MAX) && !defined (__GNUG__)
        // Some compilers use ULLONG_MAX and others, e.g. Irix, use
        // ULONGLONG_MAX.
@@ -154,6 +155,7 @@
 #         error Unsupported long long size needs to be updated for this platform
 #       endif
        typedef unsigned long long ACE_UINT64;
+       typedef   signed long long ACE_INT64;
 #     elif defined (ULONGLONG_MAX) && !defined (__GNUG__)
        // Irix 6.x, for example.
 #       if (ULONGLONG_MAX) == 18446744073709551615ULL
@@ -164,6 +166,7 @@
 #         error Unsupported long long size needs to be updated for this platform
 #       endif
        typedef unsigned long long ACE_UINT64;
+       typedef   signed long long ACE_INT64;
 #     else
        // ACE_SIZEOF_LONG_LONG is not yet known, but the platform doesn't
        // claim ACE_LACKS_LONGLONG_T, so assume it has 8-byte long longs.
@@ -173,9 +176,11 @@
          // Use it, at least with g++, so that its -pedantic doesn't
          // complain about no ANSI C++ long long.
          typedef u_longlong_t ACE_UINT64;
+         typedef   longlong_t ACE_INT64;
 #       else
          // LynxOS 2.5.0 and Linux don't have u_longlong_t.
          typedef unsigned long long ACE_UINT64;
+         typedef   signed long long ACE_INT64;
 #       endif /* sun */
 #     endif /* ULLONG_MAX && !__GNUG__ */
 #   endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */
@@ -229,6 +234,7 @@ typedef unsigned char ACE_Byte;
   typedef unsigned int ACE_UINT32;
 #   if defined (__KCC) && !defined (ACE_LACKS_LONGLONG_T)
   typedef unsigned long long ACE_UINT64;
+  typedef   signed long long ACE_INT64;
 #   endif /* __KCC */
 # elif ACE_SIZEOF_LONG == 4
   typedef long ACE_INT32;
@@ -240,6 +246,7 @@ typedef unsigned char ACE_Byte;
       typedef unsigned int ACE_UINT32;
 #   endif
   typedef unsigned long long ACE_UINT64;
+  typedef   signed long long ACE_INT64;
 # else
 #   error Have to add to the ACE_UINT32 type setting
 # endif
diff --git a/ace/CDR_Base.cpp b/ace/CDR_Base.cpp
index a3447451c72..7f3c7d5c05f 100644
--- a/ace/CDR_Base.cpp
+++ b/ace/CDR_Base.cpp
@@ -21,9 +21,13 @@ ACE_CDR::swap_2_array (const char* orig, char* target, size_t n)
 {
   // ACE_ASSERT(n > 0); The caller checks that n > 0
 
+  // We pretend that AMD64/GNU G++ systems have a Pentium CPU to 
+  // take advantage of the inline assembly implementation.
+
   // Later, we try to read in 32 or 64 bit chunks,
   // so make sure we don't do that for unaligned addresses.
-#if ACE_SIZEOF_LONG == 8
+#if ACE_SIZEOF_LONG == 8 && \
+    !(defined(__amd64__) && defined(__GNUG__))
   const char* const o8 = ACE_ptr_align_binary (orig, 8);
   while (orig < o8 && n > 0)
     {
@@ -57,7 +61,8 @@ ACE_CDR::swap_2_array (const char* orig, char* target, size_t n)
   const char* const end = orig + 2 * (n & (~3));
 
   // See if we're aligned for writting in 64 or 32 bit chunks...
-#if ACE_SIZEOF_LONG == 8
+#if ACE_SIZEOF_LONG == 8 && \
+    !(defined(__amd64__) && defined(__GNUG__))
   if (target == ACE_ptr_align_binary (target, 8))
 #else
   if (target == ACE_ptr_align_binary (target, 4))
@@ -65,7 +70,7 @@ ACE_CDR::swap_2_array (const char* orig, char* target, size_t n)
     {
       while (orig < end)
         {
-#if defined (ACE_HAS_PENTIUM) && defined (__GNUG__)
+#if (defined (ACE_HAS_PENTIUM) || defined(__amd64__)) && defined (__GNUG__)
           unsigned int a =
             * reinterpret_cast<const unsigned int*> (orig);
           unsigned int b =
@@ -126,7 +131,7 @@ ACE_CDR::swap_2_array (const char* orig, char* target, size_t n)
       // We're out of luck. We have to write in 2 byte chunks.
       while (orig < end)
         {
-#if defined (ACE_HAS_PENTIUM) && defined (__GNUG__)
+#if (defined (ACE_HAS_PENTIUM) || defined(__amd64__)) && defined (__GNUG__)
           unsigned int a =
             * reinterpret_cast<const unsigned int*> (orig);
           unsigned int b =
@@ -282,6 +287,12 @@ ACE_CDR::swap_4_array (const char* orig, char* target, size_t n)
           register unsigned long b =
             * reinterpret_cast<const long*> (orig + 8);
 
+#if defined(__amd64__) && defined(__GNUC__) 
+          asm ("bswapq %1" : "=r" (a) : "0" (a));
+          asm ("bswapq %1" : "=r" (b) : "0" (b));
+          asm ("rol $32, %1" : "=r" (a) : "0" (a));
+          asm ("rol $32, %1" : "=r" (b) : "0" (b));
+#else
           register unsigned long a84 = (a & 0x000000ff000000ffL) << 24;
           register unsigned long b84 = (b & 0x000000ff000000ffL) << 24;
           register unsigned long a73 = (a & 0x0000ff000000ff00L) << 8;
@@ -293,6 +304,7 @@ ACE_CDR::swap_4_array (const char* orig, char* target, size_t n)
 
           a = (a84 | a73 | a62 | a51);
           b = (b84 | b73 | b62 | b51);
+#endif
 
           * reinterpret_cast<long*> (target) = a;
           * reinterpret_cast<long*> (target + 8) = b;
@@ -311,6 +323,12 @@ ACE_CDR::swap_4_array (const char* orig, char* target, size_t n)
           register unsigned long b =
             * reinterpret_cast<const long*> (orig + 8);
 
+#if defined(__amd64__) && defined(__GNUC__)
+          asm ("bswapq %1" : "=r" (a) : "0" (a));
+          asm ("bswapq %1" : "=r" (b) : "0" (b));
+          asm ("rol $32, %1" : "=r" (a) : "0" (a));
+          asm ("rol $32, %1" : "=r" (b) : "0" (b));
+#else
           register unsigned long a84 = (a & 0x000000ff000000ffL) << 24;
           register unsigned long b84 = (b & 0x000000ff000000ffL) << 24;
           register unsigned long a73 = (a & 0x0000ff000000ff00L) << 8;
@@ -322,6 +340,7 @@ ACE_CDR::swap_4_array (const char* orig, char* target, size_t n)
 
           a = (a84 | a73 | a62 | a51);
           b = (b84 | b73 | b62 | b51);
+#endif
 
           ACE_UINT32 c1 = static_cast<ACE_UINT32> (a >> 32);
           ACE_UINT32 c2 = static_cast<ACE_UINT32> (a & 0xffffffff);
diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h
index 0503b9cae84..32c003a9284 100644
--- a/ace/CDR_Base.h
+++ b/ace/CDR_Base.h
@@ -39,11 +39,11 @@
 #include "ace/Basic_Types.h"
 #include "ace/Default_Constants.h"
 
-#if !defined (_MSC_VER) || (_MSC_VER >= 1300)
+#if !defined (_MSC_VER) || (_MSC_VER >= 1310)
   // MSVC++ 6 can't handle partial template specializations so fall
   // back on an unsigned char typedef.
 # include "ace/If_Then_Else.h"
-#endif  /* _MSC_VER < 1300 */
+#endif  /* _MSC_VER < 1310 */
 
 
 class ACE_Message_Block;
@@ -171,7 +171,7 @@ public:
    * avoid complaints from all compilers is to define them all.
    */
   //@{
-# if (defined (_MSC_VER) && (_MSC_VER < 1300))
+# if (defined (_MSC_VER) && (_MSC_VER < 1310))
   // MSVC++ 6 can't handle partial template specializations so fall
   // back on an unsigned char typedef.
   typedef unsigned char Boolean;
@@ -179,7 +179,7 @@ public:
   typedef ACE::If_Then_Else<(sizeof (bool) == 1),
                             bool,
                             unsigned char>::result_type Boolean;
-# endif  /* _MSC_VER <= 1300 */
+# endif  /* _MSC_VER <= 1310 */
   typedef unsigned char Octet;
   typedef char Char;
   typedef ACE_WCHAR_T WChar;
@@ -194,6 +194,8 @@ public:
       typedef __int64 LongLong;
 #   elif ACE_SIZEOF_LONG == 8 && !defined(_CRAYMPP)
       typedef long LongLong;
+#   elif defined(__TANDEM)
+      typedef long long LongLong;
 #   elif ACE_SIZEOF_LONG_LONG == 8 && !defined (ACE_LACKS_LONGLONG_T)
 #     if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T) && !defined (__KCC)
               // sun #defines   u_longlong_t, maybe other platforms do also.
diff --git a/ace/CDR_Base.inl b/ace/CDR_Base.inl
index 40ef426166c..6d6222ff40d 100644
--- a/ace/CDR_Base.inl
+++ b/ace/CDR_Base.inl
@@ -6,6 +6,9 @@
 // The ACE_CDR::swap_X and ACE_CDR::swap_X_array routines are broken
 // in 4 cases for optimization:
 //
+// * AMD64 CPU + gnu g++
+//   => gcc amd64 inline assembly.
+//
 // * x86 Pentium CPU + gnu g++
 //   (ACE_HAS_PENTIUM && __GNUG__)
 //   => gcc x86 inline assembly.
@@ -47,24 +50,19 @@
 ACE_INLINE void
 ACE_CDR::swap_2 (const char *orig, char* target)
 {
-#if defined(ACE_HAS_PENTIUM)
-# if defined(__GNUG__)
+#if (defined(ACE_HAS_PENTIUM) || defined (__amd64__)) && defined(__GNUG__)
   unsigned short a =
     *reinterpret_cast<const unsigned short*> (orig);
   asm( "rolw $8, %0" : "=r" (a) : "0" (a) );
   *reinterpret_cast<unsigned short*> (target) = a;
-# elif (defined(_MSC_VER) || defined(__BORLANDC__)) \
+#elif defined (ACE_HAS_PENTIUM) \
+       && (defined(_MSC_VER) || defined(__BORLANDC__)) \
        && !defined(ACE_LACKS_INLINE_ASSEMBLY)
   __asm mov ebx, orig;
   __asm mov ecx, target;
   __asm mov ax, [ebx];
   __asm rol ax, 8;
   __asm mov [ecx], ax;
-# else
-  // For CISC Platforms this is faster than shift/masks.
-  target[1] = orig[0];
-  target[0] = orig[1];
-# endif
 #else
   register ACE_UINT16 usrc = * reinterpret_cast<const ACE_UINT16*> (orig);
   register ACE_UINT16* udst = reinterpret_cast<ACE_UINT16*> (target);
@@ -75,7 +73,7 @@ ACE_CDR::swap_2 (const char *orig, char* target)
 ACE_INLINE void
 ACE_CDR::swap_4 (const char* orig, char* target)
 {
-#if defined(ACE_HAS_PENTIUM) && defined(__GNUG__)
+#if (defined(ACE_HAS_PENTIUM) || defined (__amd64__)) && defined(__GNUG__)
   // We have ACE_HAS_PENTIUM, so we know the sizeof's.
   register unsigned int j =
     *reinterpret_cast<const unsigned int*> (orig);
@@ -99,7 +97,12 @@ ACE_CDR::swap_4 (const char* orig, char* target)
 ACE_INLINE void
 ACE_CDR::swap_8 (const char* orig, char* target)
 {
-#if defined(ACE_HAS_PENTIUM) && defined(__GNUG__)
+#if defined(__amd64__) && defined(__GNUG__) 
+  register unsigned long x =
+    * reinterpret_cast<const unsigned long*> (orig);
+  asm ("bswapq %1" : "=r" (x) : "0" (x));
+  *reinterpret_cast<unsigned long*> (target) = x;
+#elif defined(ACE_HAS_PENTIUM) && defined(__GNUG__)
   register unsigned int i =
     *reinterpret_cast<const unsigned int*> (orig);
   register unsigned int j =
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index 8bdcb9d0eba..5d8b9dd9546 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -1616,19 +1616,11 @@ ACE_InputCDR::reset_contents (void)
 
 // --------------------------------------------------------------
 
-#if defined (VXWORKS) && defined (ghs)
-ACE_CDR::Boolean
-ACE_OutputCDR::write_float (ACE_CDR::Float x)
+ACE_WChar_Codeset_Translator::~ACE_WChar_Codeset_Translator (void)
 {
-  return this->write_4 (reinterpret_cast<const ACE_CDR::ULong*> (&x));
 }
 
-ACE_CDR::Boolean
-ACE_InputCDR::read_float (ACE_CDR::Float &x)
-{
-  return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (&x));
-}
-#endif /* VXWORKS && ghs */
+// --------------------------------------------------------------
 
 ACE_CDR::Boolean
 operator<< (ACE_OutputCDR &os, const ACE_CString &x)
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index 43924328cc4..1ca00bc0c1d 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -1072,7 +1072,7 @@ protected:
 class ACE_Export ACE_WChar_Codeset_Translator
 {
 public:
-  virtual ~ACE_WChar_Codeset_Translator () {}
+  virtual ~ACE_WChar_Codeset_Translator ();
 
   virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR&,
                                        ACE_CDR::WChar&) = 0;
diff --git a/ace/CDR_Stream.inl b/ace/CDR_Stream.inl
index e20f87551eb..87a59bff079 100644
--- a/ace/CDR_Stream.inl
+++ b/ace/CDR_Stream.inl
@@ -226,13 +226,11 @@ ACE_OutputCDR::write_ulonglong (const ACE_CDR::ULongLong &x)
   return this->write_8 (reinterpret_cast<const ACE_CDR::ULongLong*> (&x));
 }
 
-#if !defined (VXWORKS) || !defined (ghs)
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_float (ACE_CDR::Float x)
 {
   return this->write_4 (reinterpret_cast<const ACE_CDR::ULong*> (&x));
 }
-#endif /* !VXWORKS || !ghs */
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_OutputCDR::write_double (const ACE_CDR::Double &x)
@@ -624,13 +622,11 @@ ACE_InputCDR::read_ulonglong (ACE_CDR::ULongLong &x)
   return this->read_8 (reinterpret_cast<ACE_CDR::ULongLong*> (&x));
 }
 
-#if !defined (VXWORKS) || !defined (ghs)
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_float (ACE_CDR::Float &x)
 {
   return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (&x));
 }
-#endif /* !VXWORKS || !ghs */
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::read_double (ACE_CDR::Double &x)
diff --git a/ace/CLASSIX/CLASSIX_Addr.cpp b/ace/CLASSIX/CLASSIX_Addr.cpp
deleted file mode 100644
index faafc29109d..00000000000
--- a/ace/CLASSIX/CLASSIX_Addr.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Defines the ClassiX IPC address family address format.
-
-#define ACE_BUILD_DLL
-#include "ace/CLASSIX/CLASSIX_Addr.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Addr.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Addr)
diff --git a/ace/CLASSIX/CLASSIX_Addr.h b/ace/CLASSIX/CLASSIX_Addr.h
deleted file mode 100644
index a5d929b5716..00000000000
--- a/ace/CLASSIX/CLASSIX_Addr.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ACE
-//
-// = FILENAME
-//    CLASSIX_Addr.h
-//
-// = AUTHOR
-//    Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_ADDR_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_ADDR_H
-
-#include "ace/ACE.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Addr.h"
-
-#include <ipc/chIpc.h>
-#include <ace/CLASSIX/CLASSIX_OS.h>
-
-class ACE_Export ACE_CLASSIX_Addr : public ACE_Addr
-{
-  // = TITLE
-  //    Defines the ClassiX IPC address format.
-  //
-  // = DESCRIPTION
-  //   This class defines basic interfaces for "ACE-like" address for
-  //   Chorus port.
-public:
-  enum
-  {
-    ACE_CLASSIX_ADDR_UNKNOWN = ACE_INVALID_HANDLE, /* K_NONEPORT */
-    ACE_CLASSIX_ADDR_DEFAULT = K_DEFAULTPORT,
-    AF_CLASSIX               = AF_MAX + 1
-  };
-
-  enum Addr_Type
-  {
-    PORT,                       // use Peer_Port
-    GROUP,                      // use Peer_Group
-    STAMP,                      // use peer_Stamp
-    DYNAMIC,                    // use Peer_Group
-    UNDEFINED
-  };
-
-
-  /* -----------------------------------------------------*/
-  // = INITIALIZATION
-  ACE_CLASSIX_Addr(int /* size of the underlying address structure*/);
-  virtual ~ACE_CLASSIX_Addr (void);
-
-
-  /* -----------------------------------------------------*/
-  // = Direct initialization methods (useful after the object has been
-  // constructed).
-  // Returns 0 on success, -1 otherwise.
-  //
-
-  /* -----------------------------------------------------*/
-  // = ACCESS
-  //
-  virtual const KnUniqueId& get_id (void) const;
-  // Returns a reference to the unique identifier
-
-  virtual ACE_HANDLE get_port_number(void) const;
-  virtual ACE_HANDLE get_handle(void) const;
-  // Returns the local port no( can be used as an ACE_HANDLE)
-
-  virtual int is_configured(void) const;
-  // Returns 1, if address information is proper; Returns 0 otherwise
-  virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const;
-  // returns the type of the address
-
-  // = HELPER
-  virtual void dump(void) const;
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declares the dynamic allocation hooks.
-
-private:
-};
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Addr.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_ADDR_H */
diff --git a/ace/CLASSIX/CLASSIX_Addr.i b/ace/CLASSIX/CLASSIX_Addr.i
deleted file mode 100644
index 13cc5fd48e3..00000000000
--- a/ace/CLASSIX/CLASSIX_Addr.i
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// CLASSIX_Addr.i
-
-ACE_INLINE
-ACE_CLASSIX_Addr::ACE_CLASSIX_Addr(int theSize)
-    : ACE_Addr (AF_CLASSIX, theSize)
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_Addr::~ACE_CLASSIX_Addr(void)
-{
-}
-
-ACE_INLINE
-const KnUniqueId&
-ACE_CLASSIX_Addr::get_id(void) const
-{
-  return ACE_CLASSIX_OS::null_KnUniqueId();
-}
-
-ACE_INLINE
-ACE_HANDLE
-ACE_CLASSIX_Addr::get_handle(void) const
-{
-  return ACE_INVALID_HANDLE;
-}
-
-ACE_INLINE
-ACE_HANDLE
-ACE_CLASSIX_Addr::get_port_number(void) const
-{
-  return get_handle();
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Addr::is_configured(void) const
-{
-  return 0;
-}
-
-ACE_INLINE
-ACE_CLASSIX_Addr::Addr_Type
-ACE_CLASSIX_Addr::is_type(void) const
-{
-  return ACE_CLASSIX_Addr::UNDEFINED;
-}
-
-ACE_INLINE
-void
-ACE_CLASSIX_Addr::dump(void) const
-{
-}
diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.cpp b/ace/CLASSIX/CLASSIX_CLD_Connector.cpp
deleted file mode 100644
index 1baf897b75b..00000000000
--- a/ace/CLASSIX/CLASSIX_CLD_Connector.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// $Id$
-/*
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX_CLD_Connector.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-//
-// ============================================================================
-*/
-#define ACE_BUILD_DLL
-#include "ace/CLASSIX/CLASSIX_CLD_Connector.h"
-#include "ace/CLASSIX/CLASSIX_Addr.h"
-
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_CLD_Connector)
-
-#if !defined (__ACE_INLINE__)
-#include "CLASSIX_CLD_Connector.i"
-#endif /* __ACE_INLINE__ */
-/* ------------------------------------------------------------------------- */
-
-ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector (
-    ACE_CLASSIX_Stream &new_stream, 
-    const ACE_Addr &remote_sap, 
-    ACE_Time_Value *timeout,
-    const ACE_Addr &local_sap,
-    int reuse_addr,
-    int flags,
-    int perms,
-    int protocol_family,
-    int protocol)
-{
-  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector");
-  if (this->connect (new_stream, remote_sap, timeout, local_sap,
-		     reuse_addr, flags, perms, 
-		     protocol_family, protocol) == -1)
-      ACE_ERROR ((LM_ERROR, 
-		  ACE_TEXT ("%p\n"),  ACE_TEXT 
-		  ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector")));
-}
-
-// Set up remote port information
-int
-ACE_CLASSIX_CLD_Connector::connect (ACE_CLASSIX_Stream &new_stream, 
-				    const ACE_Addr & theRemote,/* remote_sap */
-				    ACE_Time_Value *, /* timeout */
-				    const ACE_Addr & theLocal,
-                                    int, /* reuse_addr */
-				    int theFlag, /* flags */
-				    int, /* perms */
-				    int theProtocolFamily, 
-				    int /* protocol */)
-
-{
-    ACE_TRACE ("ACE_CLASSIX_CLD_Connector::connect");
-    //
-    // Set up peer SAP
-    // 
-    if (theRemote == ACE_Addr::sap_any ||
-	new_stream.set_peer_sap(theRemote) != 0)
-	ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_CLD_Connector::connect()::"
-			  "Invalid Connector SAP\n"), -1);
-
-    //
-    // Set up local SAP
-    // 
-    if (theLocal == ACE_Addr::sap_any)
-    {
-	// if local sap has not been configured
-	// create a port and use it as the local SAP 
-	new_stream.open();
-    }
-    else
-    {
-	// replace the local SAP information
-	new_stream.close();
-	new_stream.open(theLocal);
-    }
-    
-    //
-    // Make the local SAP "selectable", if requested via the flag
-    // 
-    if (new_stream.local_sap().is_configured() && 
-	new_stream.peer_sap().is_configured() &&  /* remote sap info exist */
-	theProtocolFamily == ACE_CLASSIX_Addr::AF_CLASSIX)
-    {
-	new_stream.control();
-	// setup the default delivery mode, if applicable
-	if (theFlag & ACE_CLASSIX_CLD_Connector::ENABLE)
-	{
-	    if (new_stream.selectable() == 0)
-		return 0;
-	    else
-		return -1;
-	}
-	return 0;
-    }
-    else
-    {
-	return -1;
-    }
-}
-
-void
-ACE_CLASSIX_CLD_Connector::dump (void) const
-{
-  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::dump");
-}
-
-/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.h b/ace/CLASSIX/CLASSIX_CLD_Connector.h
deleted file mode 100644
index 4b1d7b0dca2..00000000000
--- a/ace/CLASSIX/CLASSIX_CLD_Connector.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-/*
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_CLD_Connector.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-*/
-
-#ifndef ACE_CLASSIX_CLD_CONNECTOR_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_CLD_CONNECTOR_H
-
-#include "ace/CLASSIX/CLASSIX_Stream.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/* ------------------------------------------------------------------------- */
-
-class ACE_CLASSIX_CLD_Connector
-    // = TITLE
-    //     Defines an CLASSIX IPC connectionless connection factory for the
-    //     template methods in <ACE_Connector>.
-    //
-    // = DESCRIPTION
-    //     This is used when a client needs to communicate with a server
-    //     whose SAP address is known beforehand.
-    //
-    //     Although there is a connection
-    //     procedure, no connection is actually taken place
-    //     between the client and server, since Chorus IPC does not have
-    //     connection semantics.
-    //     The connect procedure is necessary for
-    //     compatibility with <ACE_SOCK_Connector> class.
-    //
-    //     This class will simplify the client's
-    //     program, since it provides connection-like communication
-    //     mechanism.
-    //
-    // = NOTES
-    //     The server in this case trusts everyone who lands on the
-    //     server's SAP.
-    //
-    // = SEE ALSO
-    //   ACE_CLASSIX_COD_Connector
-{
-  public:
-    // =  Connect options
-    enum OPTIONS
-    {
-        // Do not enable the local SAP
-        // (so that the Reactor will not monitor the port)
-        ENABLE  = 0x1
-    };
-
-    // = Initialization routines.
-    ACE_CLASSIX_CLD_Connector (void);
-    // Default constructor.
-
-    ACE_CLASSIX_CLD_Connector (ACE_CLASSIX_Stream &new_stream,
-                               const ACE_Addr &remote_sap
-                               = ACE_Addr::sap_any,
-                               ACE_Time_Value *timeout = 0,
-                               const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                               int reuse_addr = 0,
-                               int flags = 0,
-                               int perms = 0,
-                               int protocol_family
-                               = ACE_CLASSIX_Addr::AF_CLASSIX,
-                               int protocol = 0);
-    // Emulates connection semantics so that it can be plugged into
-    // <ACE_Connector>
-    // Actively connect local SAP and remote SAP togeter.
-    // Produce a <new_stream> if things go well.
-    //
-    // <remote_sap> is the peer's address. In ACE_SOCK_Connector it refers to
-    // the acceptor's address.  In connectionless mode, we do not have
-    // an acceptor.  The <remote_sap> address will be copied to the new stream
-    // if things goes well.
-    //
-    // If <local_sap> refers to any address, a port will be
-    // allocated and will be used as a local SAP.
-    //
-    // The rest parameters are there so that this class can be plugged into
-    // <ACE_Connector>.
-
-    virtual int connect (ACE_CLASSIX_Stream &new_stream,
-                 const ACE_Addr &remote_sap = ACE_Addr::sap_any,
-                 ACE_Time_Value *timeout = 0,
-                 const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                 int reuse_addr = 0,
-                 int flags = 0,
-                 int perms = 0,
-                 int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
-                 int protocol = 0);
-
-    // Factory method used in <ACE_Connector>::connect_svc_handler()
-
-    // Initialization method when default constructor is used.
-    // See the comments for the corresponding constructor
-
-    virtual int reset_new_handle (ACE_HANDLE handle);
-    // Factory method used in ACE_Connector::handle_output().
-    // Meant for resetting any event associations on this handle
-    // Does nothig.
-
-    // = HELPER
-    void dump(void) const;
-
- private:
-
-    ACE_CLASSIX_CLD_Connector(ACE_CLASSIX_CLD_Connector const&);
-    ACE_CLASSIX_CLD_Connector const& operator=(ACE_CLASSIX_CLD_Connector const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_CLD_Connector.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_CLD_CONNECTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.i b/ace/CLASSIX/CLASSIX_CLD_Connector.i
deleted file mode 100644
index 8592b7825d2..00000000000
--- a/ace/CLASSIX/CLASSIX_CLD_Connector.i
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// CLASSIX/CLD_Connector.i
-/* ------------------------------------------------------------------------- */
-
-// Do-nothing constructor...
-
-ACE_INLINE
-ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector (void)
-{
-  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector");
-}
-
-ACE_INLINE
-int 
-ACE_CLASSIX_CLD_Connector::reset_new_handle (ACE_HANDLE /*  handle */)
-{
-  return 0;
-}
-
-/* ------------------------------------------------------------------------- */
-
-
diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp b/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp
deleted file mode 100644
index ab7708ba09f..00000000000
--- a/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "CLASSIX_CO_Acceptor.h"
-
-#if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "CLASSIX_CO_Acceptor.i"
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
-
-ACE_ALLOC_HOOK_DEFINE (ACE_CLASSIX_CO_Acceptor)
-
-// General purpose routine for performing server  creation.
-
-ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap, 
-						  int reuse_addr, 
-						  int protocol_family,
-						  int backlog, 
-						  int protocol,
-						  ACE_Reactor* theReactor)
-  : port_ (0),
-    reactor_ (theReactor)
-{
-  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor");
-  if (this->open (local_sap, reuse_addr, protocol_family, 
-		  backlog, protocol, theReactor) == -1)
-    ACE_ERROR ((LM_ERROR, 
-                ACE_TEXT ("%p\n"), 
-                ACE_TEXT ("ACE_CLASSIX_CO_Acceptor")));
-}
-
-// General purpose routine for performing server creation.
-
-int
-ACE_CLASSIX_CO_Acceptor::open (const ACE_Addr & theLocalSap, 
-			       int /* reuse_addr */,
-			       int theProtocolFamily, 
-			       int /* backlog */, 
-			       int /* protocol */,
-			       ACE_Reactor* theReactor)
-{
-  // make sure that the client requests for a "CLASSIX" family.
-
-  if (theProtocolFamily != ACE_CLASSIX_Addr::AF_CLASSIX)
-    return -1;
-  
-  // Setup local address
-
-  int error = 0;
-  if (theLocalSap == ACE_Addr::sap_any)
-    {
-      this->port_ = new ACE_CLASSIX_Port_Core ();
-      ACE_ASSERT (this->port_);
-      error = this->addr_.set (*this->port_);
-    }
-  else
-    error = this->addr_.set (theLocalSap);
-
-  if (error != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Acceptor::open ()::"
-                      "Cannot setup address\n"), -1);
-
-  // Make the port "selectable"
-
-  if (this->addr_.selectable () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Acceptor::open ()::"
-                      "Cannot enable port\n"), -1);
-
-  this->reactor_ = theReactor;
-  return 0;
-}
-    
-// General purpose routine for accepting new connections. 
-
-int
-ACE_CLASSIX_CO_Acceptor::accept (ACE_CLASSIX_Stream &new_stream, 
-				 ACE_Addr *remote_addr, 
-				 ACE_Time_Value* /* timeout */, 
-				 int /* restart */,
-				 int /* reset_new_handle */) const
-{
-  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::accept");
-
-  // Get peer's address info
-
-  size_t size = 0;
-  if (this->reactor_->current_info (this->get_handle (), size) 
-      == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Acceptor:.accept ()::"
-                       "Cannot get peer addr\n"), -1);
-
-  ACE_CLASSIX_CO_Acceptor::Peer_Union data;
-  ACE_CLASSIX_Msg rmsg (&data, sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union));
-  if (size != sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union) 
-      || ::ipcGetData (rmsg.get ()) != size)
-    ACE_ERROR_RETURN ((LM_ERROR, "%t"
-                       "ACE_CLASSIX_CO_Acceptor::accept::ipcGetData (%d)\n",
-                       size),
-                      -1);
-
-  // Set up Peer SAP
-
-  int error = 0;
-  switch (data.type)
-    {
-    case ACE_CLASSIX_Addr::PORT:
-      error = new_stream.set_peer_sap (data.choose.port.peer);
-      break;
-
-    case ACE_CLASSIX_Addr::GROUP:
-      error = new_stream.set_peer_sap (data.choose.group.peer);
-      break;
-
-    case ACE_CLASSIX_Addr::STAMP:
-      error = new_stream.set_peer_sap (data.choose.stamp.peer);
-      break;
-
-    case ACE_CLASSIX_Addr::DYNAMIC:
-      error = new_stream.set_peer_sap (data.choose.group.peer);
-      break;
-
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Accept::accept ()::"
-                         "Invalid peer address\n"), -1);
-    }
-
-  if (error != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Accept::accept ()::"
-                       "cannot set peer address\n"), -1);
-
-  // Set up local SAP & tell the peer
-
-  data.type = ACE_CLASSIX_Addr::UNDEFINED;
-
-  if (remote_addr != 0)
-    {
-      if (remote_addr->get_type () == ACE_CLASSIX_Addr::AF_CLASSIX &&
-          ((ACE_CLASSIX_Addr*) remote_addr)->is_type == 
-	  ACE_CLASSIX_Addr::PORT)
-        {
-	  new_stream.get_local_sap ().set (*remote_addr);
-	  data.type = ACE_CLASSIX_Addr::PORT;
-        }
-    }
-  else
-    {
-      ACE_CLASSIX_Port_Core *port = new ACE_CLASSIX_Port_Core ();
-      if (new_stream.set_local_port (port) == 0)
-        data.type = ACE_CLASSIX_Addr::PORT;;
-    }
-
-  data.choose.port.peer =
-    new_stream.get_local_sap ().get_addr ().get_id ();
-
-  ACE_CLASSIX_Msg smsg (&data, sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union));
-
-  if (::ipcReply (smsg.get ()) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Accept::accept ()::"
-                       "cannot deliver server address to peer\n"), -1);
-
-  // Make new_stream's local SAP selectable.
-  if (new_stream.selectable () != 0)
-    return -1;
-
-  return 0;
-}
-
-int
-ACE_CLASSIX_CO_Acceptor::close (void)
-{
-  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::close");
-  int result = 0;
-
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      delete this->port_;
-      this->port_ = 0;
-      ((ACE_CLASSIX_Port) this->addr_.get_addr ()).clear ();
-    }
-  return 0;
-}
-
-
-int
-ACE_CLASSIX_CO_Acceptor::get_local_addr (ACE_Addr &theAddr) const
-{
-  int size = theAddr.get_size ();
-  if (size < this->addr_.get_addr ().get_size ())
-    return -1;
-
-  return this->addr_.get_addr (theAddr);
-}
-
-void
-ACE_CLASSIX_CO_Acceptor::dump (void) const
-{
-  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::dump");
-}
diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.h b/ace/CLASSIX/CLASSIX_CO_Acceptor.h
deleted file mode 100644
index 1897518899b..00000000000
--- a/ace/CLASSIX/CLASSIX_CO_Acceptor.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ACE
-//
-// = FILENAME
-//    CLASSIX_CO_Acceptor.h
-//
-// = AUTHOR
-//    Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_CO_ACCEPTOR_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_CO_ACCEPTOR_H
-
-#include "ace/CLASSIX/CLASSIX_Stream.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Time_Value.h"
-
-class ACE_Export ACE_CLASSIX_CO_Acceptor
-{
-  // = TITLE
-  //     Defines the format and interface for a connection
-  //     oriented <ACE_CLASSIX_Stream>  acceptor.
-  //
-  // = DESCRIPTION
-  //     This class is the counter part of the <ACE_CLASSIX_Connector>
-  //     class.  It exchanges SAP information to set up a logical
-  //     connection.
-  //
-  //     Data format passed between a connector and this class uses
-  //     Peer_Union structure.
-  //
-  // = SEE ALSO
-  //     ACE_CLASSIX_Connector
-  //
-public:
-  struct Peer_Port
-  {
-    KnUniqueId peer;
-  };
-
-  struct Peer_Group
-  {
-    KnCap  peer;
-  };
-
-  struct Peer_Stamp
-  {
-    int    peer;
-  };
-
-  struct Peer_Union
-  {
-    int type;
-    union
-    {
-      Peer_Port port;
-      Peer_Group group;
-      Peer_Stamp stamp;
-    }choose;
-  };
-
-  // = Initialization methods.
-  ACE_CLASSIX_CO_Acceptor (ACE_Reactor* = ACE_Reactor::instance());
-  // Default constructor.
-
-  ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap,
-                           int reuse_addr = 0,
-                           int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
-                           int backlog = 0,
-                           int protocol = 0,
-                           ACE_Reactor* = ACE_Reactor::instance());
-  // Initiate a passive mode socket.
-
-  virtual ~ACE_CLASSIX_CO_Acceptor (void);
-  // Default dtor.
-
-  int open (const ACE_Addr &local_sap,
-            int reuse_addr = 0,
-            int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
-            int backlog = 5,
-            int protocol = 0,
-            ACE_Reactor* = ACE_Reactor::instance());
-  // Initiate a passive mode socket.
-  int close (void);
-  // Closes down the listening port.
-
-  // = Passive connection acceptance method.
-  int accept (ACE_CLASSIX_Stream &new_stream,
-              ACE_Addr *remote_addr = 0,
-              ACE_Time_Value *timeout = 0,
-              int restart = 1,
-              int reset_new_handle = 0) const;
-  // Accept a new data transfer connection.  A <timeout> of 0 means
-  // block forever, a <timeout> of {0, 0} means poll.  <restart> == 1
-  // means "restart if interrupted."
-
-  // = ACCESS
-  ACE_HANDLE get_handle (void) const;
-  // Get the underlying descriptor.
-  int get_local_addr (ACE_Addr &) const;
-  // Return the local endpoint address in the referenced ACE_Addr.
-  // Returns 0 if successful, else -1.
-
-  void reactor(ACE_Reactor*);
-  // reset the reactor
-
-  // = META-TYPE info
-  typedef ACE_CLASSIX_Addr PEER_ADDR;
-  typedef ACE_CLASSIX_Stream PEER_STREAM;
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-protected:
-
-private:
-
-  ACE_CLASSIX_Port_Core *port_;
-  // optional port.
-  // If 0, default port is used.
-  ACE_CLASSIX_SAP       addr_;
-
-  ACE_Reactor           *reactor_;
-  // for reference only. Does not own it
-};
-
-#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/CLASSIX/CLASSIX_CO_Acceptor.i"
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_CO_ACCEPTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.i b/ace/CLASSIX/CLASSIX_CO_Acceptor.i
deleted file mode 100644
index d15dedd007d..00000000000
--- a/ace/CLASSIX/CLASSIX_CO_Acceptor.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Do nothing routine for constructor. 
-ACE_INLINE
-ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor (ACE_Reactor* theReactor)
-    : port_    (0),
-      reactor_ (theReactor)
-{
-  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor");
-}
-
-ACE_INLINE
-ACE_CLASSIX_CO_Acceptor::~ACE_CLASSIX_CO_Acceptor(void)
-{
-  delete this->port_;
-}
-
-ACE_INLINE
-void
-ACE_CLASSIX_CO_Acceptor::reactor(ACE_Reactor* theReactor)
-{
-  this->reactor_ = theReactor;
-}
-
-ACE_INLINE
-ACE_HANDLE
-ACE_CLASSIX_CO_Acceptor::get_handle(void) const
-{
-  return this->addr_.get_handle();
-}
diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.cpp b/ace/CLASSIX/CLASSIX_CO_Connector.cpp
deleted file mode 100644
index 12280142b2b..00000000000
--- a/ace/CLASSIX/CLASSIX_CO_Connector.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-// $Id$
-/*
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX_CO_Connector.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-// ============================================================================
-*/
-#define ACE_BUILD_DLL
-#include "ace/CLASSIX/CLASSIX_CO_Connector.h"
-#include "ace/CLASSIX/CLASSIX_CO_Acceptor.h"
-
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_CO_Connector)
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_CO_Connector.i"
-#endif /* __ACE_INLINE__ */
-/* ------------------------------------------------------------------------- */
-
-// Set up remote port information
-    
-int
-ACE_CLASSIX_CO_Connector::connect (ACE_CLASSIX_Stream &new_stream, 
-				   const ACE_Addr & theAcceptor,/* acceptor */
-				   ACE_Time_Value * theTimeout, /* timeout */
-				   const ACE_Addr & theLocal,
-				   int theReuse,
-				   int theFlag,
-				   int thePerm,
-				   int theProtocolFamily, 
-				   int theProtocol)
-
-{
-    //
-    // set up local SAP and connector info in <new_stream>
-    // 
-    if (this->ACE_CLASSIX_CLD_Connector::
-	connect(new_stream,
-		theAcceptor,
-		theTimeout,
-		theLocal,
-		theReuse,
-		theFlag & (~ACE_CLASSIX_CLD_Connector::ENABLE),
-		thePerm,
-		theProtocolFamily,
-		theProtocol) != 0)
-	return -1;
-
-    //
-    // make a connection
-    // 
-    // Tell the connector my own SAP
-    ACE_CLASSIX_CO_Acceptor::Peer_Union peer;
-    size_t size = sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union);
-    peer.type = ACE_CLASSIX_Addr::PORT;
-    peer.choose.port.peer = new_stream.local_sap().get_addr().get_id();
-
-    if (new_stream.send((void*) &peer, size) != size)
-	ACE_ERROR_RETURN((LM_ERROR, "%t|%P|%p\n",
-			  "ACE_CLASSIX_Connector::connect()::send:"), -1);
-    // Wait for peer SAP information from the acceptor
-    if (new_stream.ipcRecv((void*) &peer, size, 0, theTimeout) != size)
-	ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Connector::connect()::"
-			  "unable to receive connect response\n"), -1);
-	
-    int error = 0;
-    switch (peer.type)
-    {
-    case ACE_CLASSIX_Addr::PORT:
-	error = new_stream.set_peer_sap(peer.choose.port.peer);
-	break;
-
-    case ACE_CLASSIX_Addr::GROUP:
-	error = new_stream.set_peer_sap(peer.choose.group.peer);
-	break;
-
-    case ACE_CLASSIX_Addr::STAMP:
-	error = new_stream.set_peer_sap(peer.choose.stamp.peer);
-	break;
-
-    case ACE_CLASSIX_Addr::DYNAMIC:
-	error = new_stream.set_peer_sap(peer.choose.group.peer);
-	break;
-
-    default:
-	ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Connect::connect()::"
-			  "Invalid peer address\n"), -1);
-    }
-
-    if (error != 0)
-	ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Connector::connect()::"
-			  "unable to receive connect response\n"), -1);
-
-
-    //
-    // Make the local SAP "selectable"
-    // 
-    if (theFlag & ACE_CLASSIX_CO_Connector::ENABLE &&
-	new_stream.selectable() != 0)
-	return -1;
-
-    return 0;
-}
-
-void
-ACE_CLASSIX_CO_Connector::dump (void) const
-{
-    ACE_TRACE ("ACE_CLASSIX_CO_Connector::dump");
-}
-
-/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.h b/ace/CLASSIX/CLASSIX_CO_Connector.h
deleted file mode 100644
index 1d12863e246..00000000000
--- a/ace/CLASSIX/CLASSIX_CO_Connector.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-/*
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_CO_Connector.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-*/
-
-#ifndef ACE_CLASSIX_CO_CONNECTOR_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_CO_CONNECTOR_H
-
-#include "ace/CLASSIX/CLASSIX_CLD_Connector.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/* ------------------------------------------------------------------------- */
-
-class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector
-    // = TITLE
-    //     Defines an CLASSIX IPC connection factory for the
-    //     template methods in <ACE_Connector>.
-    //
-    // = DESCRIPTION
-    //     This is used when a client needs to communicate with a server
-    //     whose SAP address is unknown.
-    //
-    //     <ACE_CLASSIX_Connect> and <ACE_CLASSIX_Acceptor> exchanges
-    //     address(SAP) information to establish a logical link.
-    //
-    // = NOTES
-    //      There is no other identifier and sequence information
-    //      passed between the acceptor and the connector.
-    //      Some applications may need to have a
-    //      reliable protocol for the connection setup procedure.
-    //
-    // = SEE ALSO
-    //   ACE_CLASSIX_CLD_Connector
-    //   ACE_CLASSIX_Acceptor
-    //
-{
-  public:
-    // = Initialization routines.
-    ACE_CLASSIX_CO_Connector (void);
-    // Default constructor.
-
-    ACE_CLASSIX_CO_Connector (ACE_CLASSIX_Stream &new_stream,
-                               const ACE_Addr &remote_sap
-                               = ACE_Addr::sap_any,
-                               ACE_Time_Value *timeout = 0,
-                               const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                               int reuse_addr = 0,
-                               int flags = 0,
-                               int perms = 0,
-                               int protocol_family
-                               = ACE_CLASSIX_Addr::AF_CLASSIX,
-                               int protocol = 0);
-    // Emulates connection semantics so that it can be plugged into
-    // <ACE_Connector>
-    // Actively connect local SAP and remote SAP togeter.
-    // Produce a <new_stream> if things go well.
-    //
-    // <remote_sap> is the peer's address. In ACE_SOCK_Connector it refers to
-    // the acceptor's address.  In connectionless mode, we do not have
-    // an acceptor.  The <remote_sap> address will be copied to the new stream
-    // if things goes well.
-    //
-    // If <local_sap> refers to any address, a port will be
-    // allocated and will be used as a local SAP.
-    //
-    // The rest parameters are there so that this class can be plugged into
-    // <ACE_Connector>.
-
-    int connect (ACE_CLASSIX_Stream &new_stream,
-                 const ACE_Addr &remote_sap = ACE_Addr::sap_any,
-                 ACE_Time_Value *timeout = 0,
-                 const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                 int reuse_addr = 0,
-                 int flags = 0,
-                 int perms = 0,
-                 int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
-                 int protocol = 0);
-
-    // Factory method used in <ACE_Connector>::connect_svc_handler()
-
-    // Initialization method when default constructor is used.
-    // See the comments for the corresponding constructor
-
-    // = HELPER
-    void dump(void) const;
-
-
- private:
-
-    ACE_CLASSIX_CO_Connector(ACE_CLASSIX_CO_Connector const&);
-    ACE_CLASSIX_CO_Connector const& operator=(ACE_CLASSIX_CO_Connector const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_CO_Connector.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_CO_CONNECTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.i b/ace/CLASSIX/CLASSIX_CO_Connector.i
deleted file mode 100644
index 7f28a66719f..00000000000
--- a/ace/CLASSIX/CLASSIX_CO_Connector.i
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// CLASSIX_CO_Connector.i
-/* ------------------------------------------------------------------------- */
-
-ACE_INLINE
-ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector (
-    ACE_CLASSIX_Stream &new_stream, 
-    const ACE_Addr &remote_sap, 
-    ACE_Time_Value *timeout,
-    const ACE_Addr &local_sap,
-    int reuse_addr,
-    int flags,
-    int perms,
-    int protocol_family,
-    int protocol)
-    : ACE_CLASSIX_CLD_Connector(new_stream, remote_sap, timeout, local_sap,
-				reuse_addr, flags, perms, 
-				protocol_family, protocol)
-{
-  ACE_TRACE ("ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector");
-}
-
-// Do-nothing constructor...
-
-ACE_INLINE
-ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector (void)
-    : ACE_CLASSIX_CLD_Connector()
-{
-  ACE_TRACE ("ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector");
-}
-
-/* ------------------------------------------------------------------------- */
-
-
diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp b/ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp
deleted file mode 100644
index 112d25956b7..00000000000
--- a/ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     IPP
-// 
-// = FILENAME
-//     CLASSIX/Dgram_Mcast.cpp
-//
-// = AUTHOR(S)
-//     Wei Chiang
-// 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.i"
-#endif /* __ACE_INLINE__ */
-/* ------------------------------------------------------------------------- */
-int
-ACE_CLASSIX_Dgram_Mcast::set_saps(int theStamp, 
-				    const ACE_CLASSIX_Port& thePort)
-{
-    this->local_sap_.set_addr(thePort);
-    if (this->peer_sap_.set(theStamp) != 0)
-    {
-	errno = EADDRNOTAVAIL;
-	ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Dgram_Mcast- "
-		   "failed to set up peer sap address \n"), -1);
-    }
-    else
-    {
-	this->dest_.target = this->peer_sap_.get_addr()->get_id();
-	return 0;
-    }
-}
-
-
-int
-ACE_CLASSIX_Dgram_Mcast::set_mode_(u_int theMode, int theSite)
-{
-    int result = K_EFAULT;
-    if (theMode <= K_FUNCXMODE  &&
-	(result =::uiSite(&this->dest_.coTarget, theSite)) == 0)
-	result = ::ipcTarget(&this->dest_.target, theMode);
-    
-    if (result != 0)
-    {
-	errno = ACE_CLASSIX_OS::convert_io_error(result);
-	result = -1;
-    }
-    return result;
-}
-
-int
-ACE_CLASSIX_Dgram_Mcast::set_mode_(u_int theMode)
-{
-    int result = K_EFAULT;
-    if (theMode <= K_FUNCXMODE )
-	result = ::ipcTarget(&this->dest_.target, theMode);
-
-    if (result < 0)
-    {
-	errno = ACE_CLASSIX_OS::convert_io_error(result);
-	result = -1;
-    }
-    return result;
-}
-
-
-void
-ACE_CLASSIX_Dgram_Mcast::dump (void) const
-{
-    ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Dgram_Mcast...\n"));
-    this->ACE_CLASSIX_Stream::dump();
-    ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
deleted file mode 100644
index 952d24e9022..00000000000
--- a/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_Dgram_Mcast.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_DGRAM_MCAST_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_DGRAM_MCAST_H
-
-/* ------------------------------------------------------------------------- */
-#include <ace/CLASSIX/CLASSIX_Stream.h>
-
-class ACE_CLASSIX_Dgram_Mcast : public ACE_CLASSIX_Stream
-    // = TITLE
-    //   Provides Dgram_Mcast interfaces for CLASSIX IPC communications.
-    //
-    // = DESCRIPTION
-    //   This class represents multiple end-points for message delivery.
-    //   All the remote ports are belong to the same group identified by
-    //   a stamp.
-    //   It uses the broadcast mode provided by ipcSend() to deliver
-    //   messages.
-    //
-    //   This class is most likely used in the server.
-    //
-{
- public:
-    // = INITIALIZATION
-    ACE_CLASSIX_Dgram_Mcast(void);
-    // Default constructor, does not setup anything
-
-    ACE_CLASSIX_Dgram_Mcast(int /* stamp */,
-                            const ACE_CLASSIX_Port& =
-                            *ACE_CLASSIX_DEFAULT_PORT::instance());
-    // remote SAP = port group, local SAP = default port
-
-    int set_saps(int /* stamp */,
-             const ACE_CLASSIX_Port& =
-             *ACE_CLASSIX_DEFAULT_PORT::instance());
-    // remote SAP = port group, local SAP = default port
-
-    //virtual ssize_t send (const void *, /* buf */
-    // size_t /* n */) const;
-
-
-    // = HELPER
-    void dump (void) const;
-    // Dump the state of an object.
-
-    ACE_ALLOC_HOOK_DECLARE;
-    // Declare the dynamic allocation hooks.
-
- protected:
-
-    virtual int set_mode_(u_int = K_BROADMODE); /* theMode */
-    // Sets the addressing mode with the current setting of coTarget
-    virtual int set_mode_(u_int, /* mode */ int /* site */);
-    // Sets the addressing mode as well as the coTarget
-
-    // Site information for delivery mode, see <ACE_CLASSIX_Stream::dest_ >
-    // Can be changed by control()/set_mode_()
-    int                 dest_site_;
-
-
- private:
-   // Disable copy constructor
-  ACE_CLASSIX_Dgram_Mcast(ACE_CLASSIX_Dgram_Mcast const&);
-  ACE_CLASSIX_Dgram_Mcast const& operator=(ACE_CLASSIX_Dgram_Mcast const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.i"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_DGRAM_MCAST_H */
diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.i b/ace/CLASSIX/CLASSIX_Dgram_Mcast.i
deleted file mode 100644
index 5d9fd3df0d3..00000000000
--- a/ace/CLASSIX/CLASSIX_Dgram_Mcast.i
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ace/CLASSIX_Dgram_Mcast.i
-/* ------------------------------------------------------------------------- */
-ACE_INLINE
-ACE_CLASSIX_Dgram_Mcast::ACE_CLASSIX_Dgram_Mcast(void)
-    : ACE_CLASSIX_Stream()
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_Dgram_Mcast::ACE_CLASSIX_Dgram_Mcast (int theStamp,
-				const ACE_CLASSIX_Port& thePort)
-    : ACE_CLASSIX_Stream()
-{
-    this->set_saps(theStamp, thePort);
-}
-
-
-/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/CLASSIX_Group.cpp b/ace/CLASSIX/CLASSIX_Group.cpp
deleted file mode 100644
index cb0064d3298..00000000000
--- a/ace/CLASSIX/CLASSIX_Group.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX_Group.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Group.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Group.i"
-#endif /* __ACE_INLINE__ */
-/* ------------------------------------------------------------------------- */
-
-void
-ACE_CLASSIX_Group::init_(void)
-{
-    this->clear_config_();
-    this->addr_.group_.ui.uiHead = this->addr_.group_.ui.uiTail = 0;
-    this->addr_.group_.key.keyHead = this->addr_.group_.key.keyTail = 0;
-}
-
-void
-ACE_CLASSIX_Group::set_addr(void* theSrc, int theLen)
-{
-    if (theLen > this->get_size())
-        return;
-
-    ACE_OS::memcpy ((void *) &this->addr_,
-                    (void *) theSrc, theLen);
-}
-
-void
-ACE_CLASSIX_Group::set_addr(const KnCap& thePeer)
-{
-    this->addr_.group_ = thePeer;
-    this->set_config_();
-}
-
-
-int
-ACE_CLASSIX_Group::insert(const ACE_CLASSIX_Port* thePort)
-{
-    if (this->is_configured())
-	return ::grpPortInsert((KnCap*) &this->get_cap(), 
-			       (KnUniqueId*) &thePort->get_id());
-    else
-	return K_EINVAL;
-}
-
-int
-ACE_CLASSIX_Group::remove(const ACE_CLASSIX_Port* thePort)
-{
-    if (this->is_configured())
-	return ::grpPortRemove((KnCap*) &this->get_cap(), 
-			       (KnUniqueId*) &thePort->get_id());
-    else
-	return K_EINVAL;
-}
-
-void
-ACE_CLASSIX_Group::dump(void) const
-{
-  ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Group...\n"));
-  char s[200];
-  if (!this->is_configured())
-      ACE_OS::sprintf(s, "Group has not been setup\n");
-  else
-  {
-      const KnCap &group = this->get_cap();
-      ACE_OS::sprintf (s, "id head = %d(%x), id tail = %d(%x)\n"
-		       "key head = %d(%x) key tail = %d(%x)\n",
-		       group.ui.uiHead, group.ui.uiHead, 
-		       group.ui.uiTail, group.ui.uiTail, 
-		       group.key.keyHead, group.key.keyHead, 
-		       group.key.keyTail, group.key.keyTail);
-  }
-  ACE_DEBUG ((LM_DEBUG, "\n%s", s));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));    
-}
diff --git a/ace/CLASSIX/CLASSIX_Group.h b/ace/CLASSIX/CLASSIX_Group.h
deleted file mode 100644
index 0b8f9fc75a2..00000000000
--- a/ace/CLASSIX/CLASSIX_Group.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX/Group.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_GROUP_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_GROUP_H
-
-/* ------------------------------------------------------------------------- */
-#include "ace/CLASSIX/CLASSIX_Addr.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CLASSIX/CLASSIX_Port.h"
-
-class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr
-    // = TITLE
-    //   Wrapper over Chorus's Group concept.
-    //
-    // = DESCRIPTION
-    //   Provides interface to insert and remove ports in the group which is
-    //   created based on a given KnCap. This"<KnCap> is the unique
-    //   identifier of the group.
-    //
-    // = NOTE
-    //   Chorus does not provide facility to remove a group from the system,
-    //   nor explicitly create a group.
-    //   As such, the wrapper allows users to freely change from one group
-    //   to the other within the same <ACE_CLASSIX_Group> instance.
-    //
-    // = SEE ALSO
-    //   <ACE_CLASSIX_Group_Stamp>, <ACE_CLASSIX_Group_Dynamic>
-    //
-{
- public:
-    // = INITIALIZATION
-    ACE_CLASSIX_Group(void*, /* group id */ int /* len */);
-    // Sets up the group wrapper using the supplied group id.
-    ACE_CLASSIX_Group(const KnCap&);
-    // Sets up the group wrapper using the supplied KnCap
-
-    // = ACCESS
-    int is_configured(void) const;
-    // Returns 1, if it contains valid group id; 0, otherwise.
-    virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const;
-    // returns GROUP type
-    void* get_addr(void) const;
-    // Returns the group id
-    virtual const KnUniqueId& get_id (void) const;
-    // Returns a reference to the unique identifier
-    virtual void set_addr(void* /* source */, int /* len */);
-    // Sets the group information  according to the supplied data
-    // in raw format.
-    virtual void set_addr(const KnCap&);
-    // Sets the group information  according to the supplied KnCap.
-    const KnCap& get_cap(void) const;
-    // Returns the capability to the supplied location
-    // If the address is not configured, the return value is unpredictable.
-    int insert(const ACE_CLASSIX_Port*);
-    int remove (const ACE_CLASSIX_Port*);
-    // Inserts/removes the specified port in to the group
-    // Returns 0, if successful; returns a negative value otherwise
-
-    bool operator == (const ACE_CLASSIX_Group &) const;
-    bool operator != (const ACE_CLASSIX_Group &) const;
-
-    // = HELPER
-    void dump(void) const;
-
- protected:
-    // = INITIALIZATION
-    ACE_CLASSIX_Group();
-    // default constructor, does nothing but init.
-
-    void init_(void);
-    // Initializes the structure.
-
-    void set_config_();
-    // Sets the group  configured.
-    void clear_config_();
-    // Sets the group  not-configured.
-
-    struct group_addr
-    {
-        int              config_; // 1, if the following fields are valid
-        KnCap            group_;
-    };
-    group_addr        addr_;
-
- private:
-
-    // disable copy/assignment constructor
-    ACE_CLASSIX_Group(ACE_CLASSIX_Group const&);
-    ACE_CLASSIX_Group const& operator=(ACE_CLASSIX_Group const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Group.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_GROUP_H */
diff --git a/ace/CLASSIX/CLASSIX_Group.i b/ace/CLASSIX/CLASSIX_Group.i
deleted file mode 100644
index 9ca1f49875e..00000000000
--- a/ace/CLASSIX/CLASSIX_Group.i
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_CLASSIX_Group::ACE_CLASSIX_Group()
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Group::group_addr))
-{
-    this->init_();
-}
-
-ACE_INLINE
-ACE_CLASSIX_Group::ACE_CLASSIX_Group(void* theSrc, int theLen)
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Group::group_addr))
-{
-    this->set_addr(theSrc, theLen);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Group::ACE_CLASSIX_Group(const KnCap& thePeer)
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Group::group_addr))
-{
-    this->set_addr(thePeer);
-}
-
-ACE_INLINE
-void *
-ACE_CLASSIX_Group::get_addr(void) const
-{
-    return (void*) &this->addr_;
-}
-
-ACE_INLINE
-const KnUniqueId&
-ACE_CLASSIX_Group::get_id(void) const
-{
-    return this->addr_.group_.ui;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Group::is_configured(void) const
-{
-    return this->addr_.config_ == 1;
-}
-
-ACE_INLINE
-ACE_CLASSIX_Addr::Addr_Type
-ACE_CLASSIX_Group::is_type(void) const
-{
-    return ACE_CLASSIX_Addr::GROUP;
-}
-
-ACE_INLINE
-void
-ACE_CLASSIX_Group::set_config_(void)
-{
-    this->addr_.config_ = 1;
-}
-
-ACE_INLINE
-void
-ACE_CLASSIX_Group::clear_config_(void)
-{
-    this->addr_.config_ = 0;
-}
-
-ACE_INLINE
-const KnCap&
-ACE_CLASSIX_Group::get_cap(void) const
-{
-    return this->addr_.group_;
-}
-
-ACE_INLINE
-bool
-ACE_CLASSIX_Group::operator ==(const ACE_CLASSIX_Group & theRhs) const
-{
-    return
-	this->is_configured() &&
-	theRhs.is_configured() &&
-	((KnCap) (this->get_cap()) == (KnCap) (theRhs.get_cap()));
-}
-
-ACE_INLINE
-bool
-ACE_CLASSIX_Group::operator !=(const ACE_CLASSIX_Group & theRhs) const
-{
-    return !(*this == theRhs);
-}
diff --git a/ace/CLASSIX/CLASSIX_Group_Dynamic.cpp b/ace/CLASSIX/CLASSIX_Group_Dynamic.cpp
deleted file mode 100644
index a0ecbe357e6..00000000000
--- a/ace/CLASSIX/CLASSIX_Group_Dynamic.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX_Group_Creator.cpp.1
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-//
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Group_Dynamic.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Group_Dynamic.i"
-#endif /* __ACE_INLINE__ */
diff --git a/ace/CLASSIX/CLASSIX_Group_Dynamic.h b/ace/CLASSIX/CLASSIX_Group_Dynamic.h
deleted file mode 100644
index ffc070f9c93..00000000000
--- a/ace/CLASSIX/CLASSIX_Group_Dynamic.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_Group_Dynamic.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_GROUP_DYNAMIC_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_GROUP_DYNAMIC_H
-
-/* ------------------------------------------------------------------------- */
-#include "ace/CLASSIX/CLASSIX_Group.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_CLASSIX_Group_Dynamic : public ACE_CLASSIX_Group
-    // = TITLE
-    //   Wrapper over Chorus's Group which is created dynamically and not named
-    //   by a <Stamp>.
-    //
-    // = DESCRIPTION
-    //   This is a subclass of <ACE_CLASSIX_Group>.
-    //
-    //   Its encapsulated group is created dynamically and the
-    //   <KnCap> is the name as well as the unique identifier.
-    //
-    // = SEE ALSO
-    //   <ACE_CLASSIX_Group>, <ACE_CLASSIX_Group_Stamp>
-{
-  public:
-
-  ACE_CLASSIX_Group_Dynamic(void);
-  // default constructor... create a group use Chorus IPC's K_DYNAMIC option
-
-    virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const;
-    // returns Dynamic type
-
-  private:
-
-  ACE_CLASSIX_Group_Dynamic(ACE_CLASSIX_Group_Dynamic const&);
-  ACE_CLASSIX_Group_Dynamic const& operator=(ACE_CLASSIX_Group_Dynamic const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Group_Dynamic.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_GROUP_DYNAMIC_H */
diff --git a/ace/CLASSIX/CLASSIX_Group_Dynamic.i b/ace/CLASSIX/CLASSIX_Group_Dynamic.i
deleted file mode 100644
index a7974ce45c1..00000000000
--- a/ace/CLASSIX/CLASSIX_Group_Dynamic.i
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_CLASSIX_Group_Dynamic::ACE_CLASSIX_Group_Dynamic(void)
-{
-    if (::grpAllocate( K_DYNAMIC, &this->addr_.group_, 0) == 0)
-	this->set_config_();
-}
-
-ACE_INLINE
-ACE_CLASSIX_Addr::Addr_Type
-ACE_CLASSIX_Group_Dynamic::is_type(void) const
-{
-    return ACE_CLASSIX_Addr::DYNAMIC;
-}
diff --git a/ace/CLASSIX/CLASSIX_Group_Stamp.cpp b/ace/CLASSIX/CLASSIX_Group_Stamp.cpp
deleted file mode 100644
index b1205ca66ec..00000000000
--- a/ace/CLASSIX/CLASSIX_Group_Stamp.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     ace/CLASSIX_Group_Stamp.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Group_Stamp.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Group_Stamp.i"
-#endif /* __ACE_INLINE__ */
-/* ------------------------------------------------------------------------- */
-void
-ACE_CLASSIX_Group_Stamp::set_addr(void* theStamp, int)
-{
-    // Get the group capability
-    this->stamp_ = *((u_int*)theStamp);
-    KnActorPrivilege     actor;
-    actorPrivilege(K_MYACTOR, &actor, NULL);
-    if (::grpAllocate((actor == K_SUPACTOR) ?  K_STATSYS : K_STATUSER,
-		      &this->addr_.group_, 
-		      this->stamp_) < 0 )
-    {
-	ACE_DEBUG((LM_DEBUG, "ACE_CLASSIX_Group_Stamp()::"
-		   "group allocation failed\n"));
-	this->init_();
-	this->stamp_ = ACE_CLASSIX_Group_Stamp::ILLEGAL_STAMP;
-    }
-    else
-    {
-	this->set_config_();
-    }
-}
-
-void
-ACE_CLASSIX_Group_Stamp::dump(void) const
-{
-  ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Group_Stamp...\n"));
-  ACE_DEBUG ((LM_DEBUG, "\nStamp = %d\n", this->get_stamp()));
-  this->ACE_CLASSIX_Group::dump();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));    
-}
diff --git a/ace/CLASSIX/CLASSIX_Group_Stamp.h b/ace/CLASSIX/CLASSIX_Group_Stamp.h
deleted file mode 100644
index 29e01e57892..00000000000
--- a/ace/CLASSIX/CLASSIX_Group_Stamp.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_Group_Stamp.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_GROUP_STAMP_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_GROUP_STAMP_H
-
-/* ------------------------------------------------------------------------- */
-#include "ace/CLASSIX/CLASSIX_Group.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_CLASSIX_Group_Stamp : public ACE_CLASSIX_Group
-    // = TITLE
-    //   Wrapper over Chorus's Group using <Stamp> for naming the group.
-    //
-    // = DESCRIPTION
-    //   This is a subclass of <ACE_CLASSIX_Group>.
-    //
-    //   Its encapsulated group is named by a <stamp>.  However,
-    //   <KnCap> is still the unique identifier of the group.
-    //
-    // = NOTE
-    //   As at the time of writing, The stamp is contained in the ui.uiTail
-    //   field of <KnCap>.
-    //
-    // = SEE ALSO
-    //   <ACE_CLASSIX_Group>, <ACE_CLASSIX_Group_Dynamic>
-    //
-{
- public:
-    enum
-    {
-        ILLEGAL_STAMP = 0
-        /* Have we defined the range of valid stamps? */
-    };
-
-    // = INITIALIZATION
-    ACE_CLASSIX_Group_Stamp();
-    // default constructor.  Does not contain group information..
-    ACE_CLASSIX_Group_Stamp(int /* stamp */);
-    // creates a group use the specfied stamp
-    virtual void set_addr(void*,  /* pointer to the stamp */
-                          int = 0 /* not used */);
-    // Replaces the existing group according to the supplied stamp
-
-    // = ACCESS
-    virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const;
-    // returns STAMP type
-
-    int get_stamp() const;
-    // Returns the stamp
-    // If the address is not configured, the return value is unpredictable.
-
-    // = HELPER
-    void dump(void) const;
-
-
-
- private:
-    u_int stamp_;
-
-    // disable copy/assignment constructor
-    ACE_CLASSIX_Group_Stamp(ACE_CLASSIX_Group_Stamp const&);
-    ACE_CLASSIX_Group_Stamp const& operator=(ACE_CLASSIX_Group_Stamp const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Group_Stamp.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_GROUP_STAMP_H */
diff --git a/ace/CLASSIX/CLASSIX_Group_Stamp.i b/ace/CLASSIX/CLASSIX_Group_Stamp.i
deleted file mode 100644
index 0c03d8ab17a..00000000000
--- a/ace/CLASSIX/CLASSIX_Group_Stamp.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_CLASSIX_Group_Stamp::ACE_CLASSIX_Group_Stamp()
-    : ACE_CLASSIX_Group (),
-      stamp_            (0)
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_Group_Stamp::ACE_CLASSIX_Group_Stamp(int theStamp)
-    : ACE_CLASSIX_Group ()
-{
-    this->set_addr(&theStamp);
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Group_Stamp::get_stamp() const
-{
-    return this->stamp_;
-	
-//    return this->addr_.group_.ui.uiTail;
-}
-
-ACE_INLINE
-ACE_CLASSIX_Addr::Addr_Type
-ACE_CLASSIX_Group_Stamp::is_type(void) const
-{
-    return ACE_CLASSIX_Addr::STAMP;
-}
diff --git a/ace/CLASSIX/CLASSIX_OS.cpp b/ace/CLASSIX/CLASSIX_OS.cpp
deleted file mode 100644
index 2ec4b6af6d8..00000000000
--- a/ace/CLASSIX/CLASSIX_OS.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX_OS.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_OS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_OS.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/CLASSIX/CLASSIX_Select_Reactor.h"
-
-/* ------------------------------------------------------------------------- */
-
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_OS)
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Msg)
-
-#if 0
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Mgr)
-ACE_CLASSIX_Mgr::ACE_CLASSIX_Mgr(void)
-{
-}
-
-ACE_CLASSIX_Mgr::~ACE_CLASSIX_Mgr(void)
-{
-}
-
-ACE_SYNCH_RECURSIVE_MUTEXT&
-ACE_CLASSIX_Mgr::ref_lock(void) const;
-{
-    return port_lock_;
-}
-#endif
-/* ------------------------------------------------------------------------- */
-KnUniqueId ACE_CLASSIX_OS::null_KnUniqueId_;
-ACE_Recursive_Thread_Mutex ACE_CLASSIX_OS::lock_;
-
-ACE_CLASSIX_OS::ACE_CLASSIX_OS(void)
-{
-  // Create a actor-wide CLASSIX reactor
-  ACE_Reactor *r = 
-    ACE_Reactor::instance
-    (new ACE_Reactor(new ACE_CLASSIX_Select_Reactor(), 1), 1);
-  delete r;
-  
-  // Fills in a null KnUniqueId so that it can be referenced when required
-  this->null_KnUniqueId_.uiHead = this->null_KnUniqueId_.uiTail = 0;
-}
-
-ssize_t
-ACE_CLASSIX_OS::convert_io_error(ssize_t theOriginal)
-{
-    switch (theOriginal)
-    {
-    case K_EFULL:
-	return ENOBUFS;
-
-    case K_EINVAL:
-	return EFTYPE;
-
-    case K_EFAULT:
-	return EFAULT;
-
-    case K_ETOOMUCH:
-	return EMSGSIZE;
-
-    case K_EUNKNOWN:
-	return EBADF;
-
-    case K_ENOPORT:
-	return EBADF;
-
-    case K_ETIMEOUT:
-	return ETIMEOUT;
-
-    case K_EABORT:
-	return EINTR;
-
-    default:
-	ACE_DEBUG((LM_DEBUG, "unknonw error: %d\n", theOriginal));
-	return EFAULT;
-    }
-}
-
-
-
-/* ------------------------------------------------------------------------- */
-
-void
-ACE_CLASSIX_Msg::dump(void) const
-{
-    ACE_DEBUG ((LM_INFO, ACE_BEGIN_DUMP, this));
-
-    char s[100];
-    ACE_OS::sprintf (s, "flag = %x\n"
-		     "body size = %d\t addr = %x\n"
-		     "annex addr = %x\n"
-		     "seq no = %d\n",
-		     this->msg_.flags,
-		     this->msg_.bodySize, this->msg_.bodyAddr,
-		     this->msg_.annexAddr,
-		     this->msg_.seqNum);
-    ACE_DEBUG ((LM_INFO, "%s", s));
-    ACE_DEBUG ((LM_INFO, ACE_END_DUMP));    
-}
diff --git a/ace/CLASSIX/CLASSIX_OS.h b/ace/CLASSIX/CLASSIX_OS.h
deleted file mode 100644
index 83025d49d74..00000000000
--- a/ace/CLASSIX/CLASSIX_OS.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_OS.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_OS_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_OS_H
-
-/* ------------------------------------------------------------------------- */
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Select_Reactor.h"
-#include "ace/Singleton.h"
-#include "ace/CLASSIX/CLASSIX_Port_Core.h"
-
-#include <ipc/chIpc.h>
-
-
-#if 0
-class ACE_Export ACE_CLASSIX_Mgr
-    // = TITLE
-    //   Class to manage resouces, especially static resources
-    //
-    // = DESCRIPTION
-    //   It is intended that one <ACE_CLASSIX_Mgr> per actor
-    //
-{
- public:
-    friend ACE_Singleton<ACE_CLASSIX_Mgr, ACE_SYNCH_NULL_MUTEX>;
-
-    ACE_SYNCH_RECURSIVE_MUTEXT& ref_lock(const) const;
-
- protected:
-    // = Initialization
-    ACE_CLASSIX_Mgr(void);
-    // Only allow its fried to instantiate, since it is meant as a
-    // singleton class.
-    // This class shall be instanti
-
-private:
-    ACE_SYNCH_RECURSIVE_MUTEX   *port_lock_;
-};
-#endif
-
-class ACE_Export ACE_CLASSIX_OS
-{
-public:
-
-    ACE_CLASSIX_OS();
-
-    static const KnUniqueId&  null_KnUniqueId();
-    static ssize_t convert_io_error (ssize_t /* CLASSIX' error no */);
-    // conver CLASSIX's errno no to Posix no.
-
-protected:
-
-private:
-    friend class ACE_CLASSIX_Port_Core;
-    friend class ACE_CLASSIX_Port;
-    static ACE_Recursive_Thread_Mutex& get_lock_(void);
-    // Returns CLASSIX environment-wide lock
-
-    static KnUniqueId                        null_KnUniqueId_;
-    // Null-filled KnUniqueId
-
-    static ACE_Recursive_Thread_Mutex        lock_;
-};
-
-/* ------------------------------------------------------------------------- */
-
-
-class ACE_CLASSIX_Msg
-    // = TITLE
-    //   Class wrapper over Chorus's KnMsgDesc structure
-    //
-    // = DESCRIPTION
-    //   Provides initialization and reset methods to construct a KnMsgDesc.
-    //
-    //   The flags in the <flags> field of the KnMsgDesc structure is always
-    //   set to 0. Therefore, the message body will always be copied and
-    //   the message is assumed to be part of the user(kernel) address
-    //   space when the caller is a USER(SUPERVISOR) thread.
-    //   (Chorus may not support the options defined in the flag, so we
-    //   choose not to use the flag, i.e. set it to null).
-    //
-    //   The message annex is not used.
-
-    // = SEE ALSO
-    //   ipcSend(2)
-{
- public:
-    // = initialization
-    ACE_CLASSIX_Msg();
-    // default constructor
-    ACE_CLASSIX_Msg(const void * /* body address */, int /* msg length */);
-
-    KnMsgDesc* get(void);
-    // get CLASSIX' message structure
-    void set (const void* /* body address */, int /* msg length*/);
-    // Reset the message.  The original message will be overwritten.
-
-    void dump(void) const;
-
-    ACE_ALLOC_HOOK_DECLARE;
-    // declare the dynamic allocation hooks
-
- private:
-    KnMsgDesc    msg_;
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_OS.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_OS_H */
diff --git a/ace/CLASSIX/CLASSIX_OS.i b/ace/CLASSIX/CLASSIX_OS.i
deleted file mode 100644
index d5ded0cc75a..00000000000
--- a/ace/CLASSIX/CLASSIX_OS.i
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-/* ------------------------------------------------------------------------- */
-ACE_INLINE
-const KnUniqueId&
-ACE_CLASSIX_OS::null_KnUniqueId(void)
-{
-    return null_KnUniqueId_;
-}
-
-
-ACE_INLINE
-ACE_Recursive_Thread_Mutex&
-ACE_CLASSIX_OS::get_lock_(void)
-{
-    return lock_;
-}
-
-/* ------------------------------------------------------------------------- */
-ACE_INLINE
-ACE_CLASSIX_Msg::ACE_CLASSIX_Msg(void)
-{
-    // Make a null-filled message
-    this->msg_.flags = 0;
-    this->msg_.bodySize = 0;
-    this->msg_.bodyAddr = 0;
-    this->msg_.annexAddr = 0;
-    this->msg_.seqNum = 0;
-}
-
-ACE_INLINE
-ACE_CLASSIX_Msg::ACE_CLASSIX_Msg(const void* theBuf, int theLen)
-{
-    this->msg_.flags = 0;
-    this->msg_.annexAddr = 0;
-    this->msg_.seqNum = 0;
-
-    this->msg_.bodySize = theLen;
-    this->msg_.bodyAddr = (VmAddr) theBuf;
-}
-
-ACE_INLINE
-void
-ACE_CLASSIX_Msg::set(const void* theBuf, int theLen)
-{
-    this->msg_.bodySize = theLen;
-    this->msg_.bodyAddr = (VmAddr) theBuf;
-}
-
-ACE_INLINE
-KnMsgDesc*
-ACE_CLASSIX_Msg::get(void)
-{
-    return &this->msg_;
-}
diff --git a/ace/CLASSIX/CLASSIX_Peer_SAP.cpp b/ace/CLASSIX/CLASSIX_Peer_SAP.cpp
deleted file mode 100644
index 9dbddf9c0b1..00000000000
--- a/ace/CLASSIX/CLASSIX_Peer_SAP.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX_Peer_SAP.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Peer_SAP.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Peer_SAP.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/CLASSIX/CLASSIX_Group_Stamp.h"
-/* ------------------------------------------------------------------------- */
-int
-ACE_CLASSIX_Peer_SAP::set(const ACE_CLASSIX_Port_Core& thePeer)
-{
-    delete this->peer_addr_;
-    this->peer_addr_ = new ACE_CLASSIX_Port (thePeer);
-    ACE_ASSERT(this->peer_addr_);
-    return 0;
-}
-
-int
-ACE_CLASSIX_Peer_SAP::set(const ACE_Addr& thePeer) 
-{
-    delete this->peer_addr_;
-    this->peer_addr_ = new ACE_CLASSIX_Port (thePeer);
-    ACE_ASSERT(this->peer_addr_);
-    return 0;
-}
-
-int
-ACE_CLASSIX_Peer_SAP::set(const KnUniqueId& thePeer)
-{
-    delete this->peer_addr_;
-    this->peer_addr_ = new ACE_CLASSIX_Port (thePeer);
-    ACE_ASSERT(this->peer_addr_);
-    return 0;
-}
-
-int
-ACE_CLASSIX_Peer_SAP::set(const KnCap& thePeer)
-{
-    delete this->peer_addr_;
-    this->peer_addr_ = new ACE_CLASSIX_Group (thePeer);
-    ACE_ASSERT(this->peer_addr_);
-    return 0;
-}
-
-int
-ACE_CLASSIX_Peer_SAP::set(int theStamp)
-{
-    delete this->peer_addr_;
-    this->peer_addr_ = new ACE_CLASSIX_Group_Stamp (theStamp);
-    ACE_ASSERT(this->peer_addr_);
-    return 0;
-}
-
-void
-ACE_CLASSIX_Peer_SAP::dump (void) const
-{
-    ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Peer_SAP...\n"));
-    if (this->peer_addr_)
-	this->peer_addr_->dump();
-    ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
diff --git a/ace/CLASSIX/CLASSIX_Peer_SAP.h b/ace/CLASSIX/CLASSIX_Peer_SAP.h
deleted file mode 100644
index e2761d79dbc..00000000000
--- a/ace/CLASSIX/CLASSIX_Peer_SAP.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_Peer_SAP.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_PEER_SAP_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_PEER_SAP_H
-
-/* ------------------------------------------------------------------------- */
-#include <ace/CLASSIX/CLASSIX_SAP.h>
-#include <ace/CLASSIX/CLASSIX_Port_Default.h>
-
-class ACE_CLASSIX_Peer_SAP
-    // = TITLE
-    //   Class implementing the peer SAP.
-    //
-    // = DESCRIPTION
-    //
-    //   In CLASSIX, a local SAP is always a port, a peer SAP can be
-    //   a port or a group of port.  This class is for peer SAP and
-    //   <ACE_SAP> is for local SAP.
-    //
-    // = SEE ALSO
-    //   <ACE_SAP>
-{
- public:
-    // = INITIALIZATION
-    ACE_CLASSIX_Peer_SAP(void);
-    // Default constructor.
-    // Needs to be initialized by a set() operation.
-    ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port_Core&);/* peer port */
-
-    ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port&);/* peer port address */
-    ACE_CLASSIX_Peer_SAP(const ACE_Addr&);        /* peer port address */
-
-    ACE_CLASSIX_Peer_SAP(const KnUniqueId&);      /* peer port address */
-    ACE_CLASSIX_Peer_SAP(const KnCap&);           /* peer group address */
-    ACE_CLASSIX_Peer_SAP(int /* stamp */);       /* stamp for peer group */
-
-    ~ACE_CLASSIX_Peer_SAP(void);
-
-    int set(const ACE_CLASSIX_Port_Core&); /* peer port */
-
-    int set(const ACE_Addr&);              /* peer port address */
-
-    int set(const KnUniqueId&);            /* peer port address */
-    int set(const KnCap&);                 /* peer group address */
-    int set(int /* stamp */);   /* stamp for the peer group */
-
-    // = ACCESS
-    const ACE_CLASSIX_Addr* get_addr(void) const;
-    // Returns peer's address, either a port or a group of ports
-    int is_configured(void) const;
-    // Returns 1, if address information is proper; Returns 0 otherwise
-
-    // = CONTROL
-#if 0
-    int control(u_int = K_BROADMODE);
-    int control(u_int, /* mode */ int /* site */ );
-    // Interface for CLASSIX' send mode
-#endif
-    // = HELPER
-    void dump (void) const;
-    // Dump the state of an object.
-
-    ACE_ALLOC_HOOK_DECLARE;
-    // Declare the dynamic allocation hooks.
-
- protected:
-#if 0
-    virtual set_mode_(u_int = K_BROADMODE); /* theMode */
-    // Sets the addressing mode with the current setting of coTarget
-    virtual set_mode_(u_int, /* mode */ int /* site */);
-    // Sets the addressing mode as well as the coTarget
-#endif
-    ACE_CLASSIX_Addr     *peer_addr_;
-
- private:
-    // Disable copy constructor
-    ACE_CLASSIX_Peer_SAP(ACE_CLASSIX_Peer_SAP const&);
-    ACE_CLASSIX_Peer_SAP const& operator=(ACE_CLASSIX_Peer_SAP const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Peer_SAP.i"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_PEER_SAP_H */
diff --git a/ace/CLASSIX/CLASSIX_Peer_SAP.i b/ace/CLASSIX/CLASSIX_Peer_SAP.i
deleted file mode 100644
index a10bcfd12b5..00000000000
--- a/ace/CLASSIX/CLASSIX_Peer_SAP.i
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(void)
-  :    peer_addr_   (0)
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port_Core& 
-					   thePeer)
-  :    peer_addr_   (0)
-{
-    this->set(thePeer);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(const ACE_CLASSIX_Port& thePeer) 
-    : peer_addr_   (0)
-{
-    this->set(thePeer);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(const ACE_Addr& thePeer) 
-    : peer_addr_   (0)
-{
-    this->set(thePeer);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(const KnUniqueId& thePeer)
-    : peer_addr_   (0)
-{
-    this->set(thePeer);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Peer_SAP::ACE_CLASSIX_Peer_SAP(int theStamp)
-    : peer_addr_   (0)
-{
-    this->set(theStamp);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Peer_SAP::~ACE_CLASSIX_Peer_SAP(void)
-{
-    delete this->peer_addr_;
-}
-
-
-ACE_INLINE
-const ACE_CLASSIX_Addr*
-ACE_CLASSIX_Peer_SAP::get_addr(void) const
-{
-    return this->peer_addr_;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Peer_SAP::is_configured(void) const
-{
-    if (this->peer_addr_)
-	return this->peer_addr_->is_configured();
-    else
-	return 0;
-}
-
-#if 0
-ACE_INLINE
-int
-ACE_CLASSIX_Peer_SAP::control(u_int theMode)
-{
-    return this->peer_addr_->set_mode_(theMode); 
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Peer_SAP::control(u_int theMode, int theSite)
-{
-    return this->set_mode_(theMode, theSite); 
-}
-
-
-ACE_INLINE
-int
-ACE_CLASSIX_Peer_SAP::set_mode_(u_int)
-{
-    return K_EFAULT;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Peer_SAP::set_mode_(u_int, int)
-{
-    return K_EFAULT;
-}
-#endif
diff --git a/ace/CLASSIX/CLASSIX_Port.cpp b/ace/CLASSIX/CLASSIX_Port.cpp
deleted file mode 100644
index e819e1abcfd..00000000000
--- a/ace/CLASSIX/CLASSIX_Port.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Defines the ClassiX IPC address family address format.
-
-#define ACE_BUILD_DLL
-#include "ace/CLASSIX/CLASSIX_Port.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Port.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Port)
-
-
-ACE_CLASSIX_Port::ACE_CLASSIX_Port(void* thePort, int theLen)
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr))
-{
-    if (thePort &&  theLen == this->get_size())
-    {
-	ACE_CLASSIX_Port_Core::Addr *port = 
-	    (ACE_CLASSIX_Port_Core::Addr*) thePort;
-	this->addr_.handle  = port->handle;
-	this->addr_.id      = port->id;
-    }
-    else
-    {
-	this->clear();
-    }
-}
-
-ACE_CLASSIX_Port::ACE_CLASSIX_Port(ACE_Addr const& theAddr)
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr))
-{
-    if (theAddr.get_size() == this->get_size() &&
-	theAddr.get_type() == this->get_type())
-	this->set_(theAddr);
-    else
-	this->clear();
-}
-
-void
-ACE_CLASSIX_Port::clear(void)
-{
-    this->addr_.handle = ACE_CLASSIX_ADDR_UNKNOWN;
-    this->addr_.id.uiHead = this->addr_.id.uiTail = 0;
-}
-
-int
-ACE_CLASSIX_Port::set_(const ACE_Addr& theAddr)
-{
-    ACE_CLASSIX_Port_Core::Addr *src = 
-	((ACE_CLASSIX_Port_Core::Addr*) theAddr.get_addr());
-    this->addr_.id = src->id;
-    this->addr_.handle = src->handle;
-	
-    return 0;
-}
-
-int
-ACE_CLASSIX_Port::set(const KnUniqueId& thePort)
-{
-    int no = ::portLi((KnUniqueId*) &thePort);
-
-    // update the port no only if the no is valid
-    if (no < 0)
-	// Assume this is a remote port
-	no = ACE_INVALID_HANDLE;
-
-    this->addr_.handle = no;
-    this->addr_.id     = thePort;
-    return 0;
-}
-
-int
-ACE_CLASSIX_Port::set_handle(ACE_HANDLE thePort)
-{
-    if (thePort == ACE_INVALID_HANDLE && 
-	::portUi(&this->addr_.id, thePort) < 0)
-	return -1;
-
-    this->addr_.handle = thePort;
-    return 0;
-}
-
-void
-ACE_CLASSIX_Port::set_addr(void* theSrc, int theLen)
-{
-    // Remove self owned first and Make sure no memory overflow 
-    if (theSrc && theLen > this->get_size())
-	return;
-
-    ACE_OS::memcpy ((void *) &this->addr_,
-		    (void *) theSrc, theLen);
-
-}
-
-ACE_CLASSIX_Port const&  
-ACE_CLASSIX_Port::operator =(ACE_Addr const& theAddr)
-{
-    if (theAddr.get_size() == this->get_size() &&
-	theAddr.get_type() == this->get_type())
-    {
-	
-	this->set_(theAddr);
-    }
-    return *this;
-}
-
-int 
-ACE_CLASSIX_Port::addr_to_string (ACE_TCHAR s[], size_t) const
-{
-  ACE_OS::sprintf (s, ACE_TEXT ("%d:%d"),
-                   ACE_TEXT_CHAR_TO_TCHAR (::agetId()),
-                   this->get_port_number ());
-}
-
-void
-ACE_CLASSIX_Port::dump (void) const
-{
-  ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Port...\n"));
-  ACE_Addr::dump();
-  char s[100];
-  ACE_OS::sprintf (s, "handle = %d;\tid head = %x, id tail = %x\n",
-		   this->get_handle(),
-		   this->get_id().uiHead, this->get_id().uiTail);
-  ACE_DEBUG ((LM_DEBUG, "%s", s));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
diff --git a/ace/CLASSIX/CLASSIX_Port.h b/ace/CLASSIX/CLASSIX_Port.h
deleted file mode 100644
index ee26c195870..00000000000
--- a/ace/CLASSIX/CLASSIX_Port.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    CLASSIX_Port.h
-//
-// = AUTHOR
-//    Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_PORT_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_PORT_H
-
-#include "ace/Singleton.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CLASSIX/CLASSIX_OS.h"
-#include "ace/CLASSIX/CLASSIX_Addr.h"
-
-
-class ACE_Export ACE_CLASSIX_Port : public ACE_CLASSIX_Addr
-{
-    // = TITLE
-    //    Defines the ClassiX IPC Port address format for "ACE Socket" like
-    //    interfaces
-    //
-    // = DESCRIPTION
-    //   The port address contains two fields:
-    //   a global unique identifier  and a local identifier.
-    //   The global unique identifier is also referred to as the port address
-    //   and the local identifier as the port no.
-    //
-    // = NOTE
-    //   In Chorus, one can always convert from a port unique identifier to
-    //   a port no and vice versa.  This class is implemented based on this
-    //   premise.
-    //
-    // = SEE ALSO
-    //   <ACE_CLASSIX_PORT_Default>, <ACE_CLASSIX_Port_Core>
-    //
-public:
-    /* -----------------------------------------------------*/
-    // = Initialization methods.
-    ACE_CLASSIX_Port ();
-    // Default constructor.
-    // The address corresponds to the default port of the actor.
-
-    ACE_CLASSIX_Port (const ACE_CLASSIX_Port &);
-    // Copy constructor.
-    ACE_CLASSIX_Port (const ACE_Addr &);
-    // Copy constructor.
-
-    ACE_CLASSIX_Port (const ACE_CLASSIX_Port_Core&);
-    // Creates an <ACE_CLASSIX_Port> from <ACE_CLASSIX_Port_Core>
-
-    ACE_CLASSIX_Port (const KnUniqueId& /* port_id */);
-    // Creates an <ACE_CLASSIX_Port> from the given <port_id>
-
-    ACE_CLASSIX_Port (ACE_HANDLE /* port_no */);
-    // Creates an <ACE_CLASSIX_Port> from the given <port_no>
-
-    ACE_CLASSIX_Port (void* /* location */, int /* length */);
-    // Create an <ACE_CLASSIX_Port> from the address in raw format.
-
-    ACE_CLASSIX_Port const&  operator =(ACE_Addr const&);
-
-
-    /* -----------------------------------------------------*/
-    // = ACCESS
-
-    virtual int addr_to_string (ACE_TCHAR addr[], size_t) const;
-    // Transform the current <ACE_CLASSIX_Port> address into string format,
-    // which is in the form "actor-id:port-number"
-
-    int set (const KnUniqueId& /* port_id */);
-    // Sets the <ACE_CLASSIX_Port_Basic> from a <port_id>
-
-    virtual void set_addr (void * /* addr location */,
-                           int /* len */);
-    // Set the address as the one pointed to by the location pointer.
-    // The address contains <len> bytes.
-    // Would prefer to return the status, but the base class uses void.
-    int set_handle (ACE_HANDLE /* port_no */);
-    // Sets the <addr_> field from a <port_no>
-
-    virtual void *get_addr (void) const;
-    // Returns a pointer to the address:,
-    // <ACE_CLASSIX_Port_Core::ipp_port_addr>
-    virtual const KnUniqueId& get_id (void) const;
-    // Returns a reference to the port id.
-    virtual ACE_HANDLE get_handle (void) const;
-    // Returns the port no.
-    int is_configured(void) const;
-    // Returns 1, if address information is proper; Returns 0 otherwise
-    virtual ACE_CLASSIX_Addr::Addr_Type is_type(void) const;
-    // returns PORT type
-
-    /* -----------------------------------------------------*/
-    // = Control
-    //
-    virtual int enable(int   /* receive priority */) const;
-    // Puts the port into the set of monitored ports.
-    virtual int disable(void) const;
-    // Removes the port from the set of monitored ports.
-    virtual void clear(void);
-    // Remove port information
-
-    /* -----------------------------------------------------*/
-    // = Comparison
-    //
-    bool operator == (const ACE_CLASSIX_Port &) const;
-    // Compare two addresses for equality.  The addresses are considered
-    // equal if they have the same content in the KnUniqueId address structure.
-
-    bool operator != (const ACE_CLASSIX_Port &) const;
-    // Compare two addresses for inequality.
-
-    /* -----------------------------------------------------*/
-    // = Helper
-    //
-    void dump (void) const;
-    // Dump the state of an object.
-
-
-    ACE_ALLOC_HOOK_DECLARE;
-    // Declare the dynamic allocation hooks.
-
-private:
-    /* -----------------------------------------------------*/
-    // = Direct initialization methods (useful after the object has been
-    // constructed).
-    // Will create/reset the port only if the port no was <ACE_CLASSIX_ANY>
-    // Returns 0 on success, -1 otherwise.
-    //
-
-    int set_ (const ACE_Addr &);
-    // Sets the <ACE_CLASSIX_Port_Basic> from another <ACE_CLASSIX_Port_Basic>.
-
-
-
-private:
-    ACE_CLASSIX_Port_Core::Addr           addr_;
-};
-
-/* ------------------------------------------------------------------------- */
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Port.i"
-#endif /* __ACE_INLINE__ */
-
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_PORT_H */
diff --git a/ace/CLASSIX/CLASSIX_Port.i b/ace/CLASSIX/CLASSIX_Port.i
deleted file mode 100644
index ac0504ca2c0..00000000000
--- a/ace/CLASSIX/CLASSIX_Port.i
+++ /dev/null
@@ -1,113 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-ACE_CLASSIX_Port::ACE_CLASSIX_Port(void)
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr))
-{
-    this->set_handle(K_DEFAULTPORT);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Port::ACE_CLASSIX_Port(const ACE_CLASSIX_Port& theSrc)
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr))
-{
-    this->set_(theSrc);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Port::ACE_CLASSIX_Port(const KnUniqueId& thePort)
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr))
-{
-    this->set(thePort);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Port::ACE_CLASSIX_Port(ACE_HANDLE thePort)
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr))
-{
-    this->set_handle(thePort);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Port::ACE_CLASSIX_Port(const ACE_CLASSIX_Port_Core& thePort)
-    : ACE_CLASSIX_Addr (sizeof (ACE_CLASSIX_Port_Core::Addr))
-{
-	this->addr_.handle = thePort.get_handle();
-	this->addr_.id     = thePort.get_id();
-}
-
-ACE_INLINE
-ACE_HANDLE
-ACE_CLASSIX_Port::get_handle(void) const
-{
-    return this->addr_.handle;
-}
-
-ACE_INLINE
-const KnUniqueId&
-ACE_CLASSIX_Port::get_id(void) const
-{
-    return this->addr_.id;
-}
-
-ACE_INLINE
-void *
-ACE_CLASSIX_Port::get_addr(void) const
-{
-    return (void*) &this->addr_;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Port::is_configured(void) const
-{
-    return (this->addr_.handle != ACE_CLASSIX_ADDR_UNKNOWN);
-}
-
-ACE_INLINE
-ACE_CLASSIX_Addr::Addr_Type
-ACE_CLASSIX_Port::is_type(void) const
-{
-    return ACE_CLASSIX_Addr::PORT;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Port::enable(int thePriority) const
-{
-    if (ACE_Reactor::instance()->notify() == 0)
-	return ::portEnable(K_MYACTOR, this->get_handle(), thePriority);
-    else
-	return -1;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Port::disable(void) const
-{
-    if (ACE_Reactor::instance()->notify() == 0)
-	return ::portDisable(K_MYACTOR, this->get_handle());
-    else
-	return -1;
-}
-
-// Compare two addresses for equality.
-ACE_INLINE
-bool
-ACE_CLASSIX_Port::operator==(const ACE_CLASSIX_Port &theSrc) const
-{
-  return
-      this->ACE_Addr::operator == (theSrc) &&
-      this->addr_.id.uiHead == theSrc.addr_.id.uiHead &&
-      this->addr_.id.uiTail == theSrc.addr_.id.uiTail &&
-      this->addr_.handle == theSrc.addr_.handle;
-}
-
-ACE_INLINE
-bool
-ACE_CLASSIX_Port::operator != (const ACE_CLASSIX_Port &sap) const
-{
-  return !((*this) == sap);
-}
diff --git a/ace/CLASSIX/CLASSIX_Port_Core.cpp b/ace/CLASSIX/CLASSIX_Port_Core.cpp
deleted file mode 100644
index 8ba5ac12ad2..00000000000
--- a/ace/CLASSIX/CLASSIX_Port_Core.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX_Port_Core.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Port_Core.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Port_Core.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/CLASSIX/CLASSIX_OS.h"
-/* ------------------------------------------------------------------------- */
-
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Port_Core)
-
-ACE_CLASSIX_Port_Core::ACE_CLASSIX_Port_Core(void)
-{
-    if ((this->addr_.handle = ::portCreate(K_MYACTOR, &this->addr_.id)) < 0)
-	this->clear_config_();
-    else
-    {
-	this->set_config_();
-    }
-}
-
-ACE_CLASSIX_Port_Core::~ACE_CLASSIX_Port_Core(void)
-{
-    if (this->is_configured())
-	if (int result = ::portDelete(K_MYACTOR, this->get_handle()) < 0)
-	    ACE_ERROR((LM_DEBUG, 
-		       "ACE_CLASSIX_Port_Core::~ACE_CLASSIX_PORT_CORE()- "
-		       "failed to delete port, error = %d", result));
-}
-
-void
-ACE_CLASSIX_Port_Core::clear_config_(void)
-{
-    this->config_ = 0;
-    this->addr_.id.uiHead = this->addr_.id.uiTail = 0;
-    this->addr_.handle = ACE_INVALID_HANDLE;
-}
-
-
-void
-ACE_CLASSIX_Port_Core::dump (void) const
-{
-  ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Port_Core...\n"));
-  char s[100];
-  if (!this->is_configured())
-      ACE_OS::sprintf(s, "Port has not been allocated\n");
-  else
-      ACE_OS::sprintf (s, "handle = %d;\tid head = %x, id tail = %x\n",
-		       this->get_handle(),
-		       this->get_id().uiHead, this->get_id().uiTail);
-  ACE_DEBUG ((LM_DEBUG, "%s", s));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
diff --git a/ace/CLASSIX/CLASSIX_Port_Core.h b/ace/CLASSIX/CLASSIX_Port_Core.h
deleted file mode 100644
index 75be7023f16..00000000000
--- a/ace/CLASSIX/CLASSIX_Port_Core.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_Port_Core.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_PORT_CORE_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_PORT_CORE_H
-
-/* ------------------------------------------------------------------------- */
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <ipc/chIpc.h>
-
-
-/* ------------------------------------------------------------------------- */
-class ACE_Export ACE_CLASSIX_Port_Core
-{
-    // = TITLE
-    //    Defines interfaces for allocation/deallocation of a Chorus
-    //    IPC port
-    //
-    // = DESCRIPTION
-    //   This class allocates a port in the constructor and deallocates it in
-    //   the destructor.
-
-public:
-    /* -----------------------------------------------------*/
-    // = Initialization methods.
-    ACE_CLASSIX_Port_Core (void);
-    // Allocates a port from the OS
-    //
-    virtual ~ACE_CLASSIX_Port_Core (void);
-    // Deallocates the port from the OS.
-
-    virtual const KnUniqueId& get_id (void) const;
-    // Returns a reference to the port id.
-    virtual ACE_HANDLE get_handle (void) const;
-    // Returns the port no(used as an ACE_HANDLE)
-    virtual void* get_addr(void) const;
-    // Returns a pointer to the location containing the raw
-    // address of the port.
-    int is_configured(void) const;
-    // Returns 1, if the port has been successfully created.
-
-#if 0
-    int enable(int /* priority */) const;
-    int disable (int) const;
-    // Puts/Removes the port into/from the set of monitored ports.
-#endif
-    /* -----------------------------------------------------*/
-    // = Helper
-    //
-    void dump (void) const;
-    // Dump the state of an object.
-
-
-    ACE_ALLOC_HOOK_DECLARE;
-    // Declare the dynamic allocation hooks.
-
-    struct Addr
-    {
-        KnUniqueId                  id;    // port address: unique identifier
-        ACE_HANDLE                  handle;// port no: local identifier.
-
-    };
-
-protected:
-    void clear_config_();
-    // Indicates that port has been allocated.
-    void set_config_();
-
-    ACE_CLASSIX_Port_Core::Addr addr_;
-    int                         config_; // Sets to 1, if configured;
-                                         // 0 otherwise
-private:
-    // Disallow copy constructor/assignment
-    ACE_CLASSIX_Port_Core(ACE_CLASSIX_Port_Core const&);
-    ACE_CLASSIX_Port_Core const&  operator =(ACE_CLASSIX_Port_Core const&);
-};
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Port_Core.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_PORT_CORE_H */
diff --git a/ace/CLASSIX/CLASSIX_Port_Core.i b/ace/CLASSIX/CLASSIX_Port_Core.i
deleted file mode 100644
index 7fd3694d8de..00000000000
--- a/ace/CLASSIX/CLASSIX_Port_Core.i
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-void
-ACE_CLASSIX_Port_Core::set_config_(void)
-{
-    this->config_ = 1;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Port_Core::is_configured(void) const
-{
-    return this->config_ == 1;
-}
-
-
-ACE_INLINE
-ACE_HANDLE
-ACE_CLASSIX_Port_Core::get_handle(void) const
-{
-    return this->addr_.handle;
-}
-
-ACE_INLINE
-const KnUniqueId&
-ACE_CLASSIX_Port_Core::get_id(void) const
-{
-    return this->addr_.id;
-}
-
-ACE_INLINE
-void*
-ACE_CLASSIX_Port_Core::get_addr(void) const
-{
-    return (void*) (&this->addr_);
-}
diff --git a/ace/CLASSIX/CLASSIX_Port_Default.cpp b/ace/CLASSIX/CLASSIX_Port_Default.cpp
deleted file mode 100644
index e18d55971e2..00000000000
--- a/ace/CLASSIX/CLASSIX_Port_Default.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Defines the ClassiX IPC address family address format.
-
-#define ACE_BUILD_DLL
-#include "ace/CLASSIX/CLASSIX_Port_Default.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Port_Default.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Port_Default)
-
-/* ------------------------------------------------------------------------- */
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Singleton<ACE_CLASSIX_Port_Default, 
-                             ACE_SYNCH_NULL_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiation ACE_Singleton<ACE_CLASSIX_Port_Default, 
-                             ACE_SYNCH_NULL_MUTEX>
-
-#endif
diff --git a/ace/CLASSIX/CLASSIX_Port_Default.h b/ace/CLASSIX/CLASSIX_Port_Default.h
deleted file mode 100644
index f1328d63200..00000000000
--- a/ace/CLASSIX/CLASSIX_Port_Default.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    CLASSIX_Port_Default.h
-//
-// = AUTHOR(S)
-//    Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef  ACE_CLASSIX_PORT_DEFAULT_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_PORT_DEFAULT_H
-
-#include "ace/Singleton.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CLASSIX/CLASSIX_Port.h"
-
-class ACE_CLASSIX_Port_Default : public ACE_CLASSIX_Port
-{
-    // = TITLE
-    //    Implements the address wrapper of an actor's default port.
-    //
-    // = DESCRIPTION
-    //   This corresponds to the address of an actor's default port
-    //   which does not change
-    //   in the life time of the actor.  Therefore the address information
-    //   in this class can not be modified once it is created.
-    //
-    //   Each actor has one and only one default port.  Therefore an instance
-    //   of this class is a singleton.  The protected constructor and the
-    //   friendship with the ACE_Singleton preventys this class from being
-    //   instantiated by other classes.
-    //
-    // = NOTE
-    //
-    // = SEE ALSO
-    //   <ACE_CLASSIX_PORT>
-    //
-    friend class ACE_Singleton<ACE_CLASSIX_Port_Default, ACE_SYNCH_NULL_MUTEX>;
-
-    /* -----------------------------------------------------*/
-    // = Access
-    virtual void set_addr(void*, int);
-    ACE_CLASSIX_Port const&  operator =(ACE_CLASSIX_Port const&);
-    ACE_CLASSIX_Port const&  operator =(ACE_Addr const&);
-    // Does nothing...The default port's address cannot be changed
-
-    ACE_ALLOC_HOOK_DECLARE;
-    // Declare the dynamic allocation hooks.
-
-protected:
-    /* -----------------------------------------------------*/
-    // = Initialization methods.
-    ACE_CLASSIX_Port_Default ();
-    // Wrapper for the Actor's default port
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Port_Default.i"
-#endif /* __ACE_INLINE__ */
-
-/* ------------------------------------------------------------------------- */
-typedef ACE_Singleton<ACE_CLASSIX_Port_Default, ACE_SYNCH_NULL_MUTEX>
-        ACE_CLASSIX_DEFAULT_PORT;
-/* ------------------------------------------------------------------------- */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_PORT_DEFAULT_H */
diff --git a/ace/CLASSIX/CLASSIX_Port_Default.i b/ace/CLASSIX/CLASSIX_Port_Default.i
deleted file mode 100644
index fac497bace0..00000000000
--- a/ace/CLASSIX/CLASSIX_Port_Default.i
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_CLASSIX_Port_Default::ACE_CLASSIX_Port_Default(void)
-    : ACE_CLASSIX_Port()
-{
-}
-
-ACE_INLINE
-void
-ACE_CLASSIX_Port_Default::set_addr(void*, int)
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_Port const&  
-ACE_CLASSIX_Port_Default::operator =(ACE_CLASSIX_Port const&)
-{
-    return *this;
-}
-
-ACE_INLINE
-ACE_CLASSIX_Port const&  
-ACE_CLASSIX_Port_Default::operator =(ACE_Addr const&)
-{
-    return *this;
-}
diff --git a/ace/CLASSIX/CLASSIX_SAP.cpp b/ace/CLASSIX/CLASSIX_SAP.cpp
deleted file mode 100644
index 55a9c8183a0..00000000000
--- a/ace/CLASSIX/CLASSIX_SAP.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX_SAP.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_SAP.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_SAP.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_SAP)
-/* ------------------------------------------------------------------------- */
-int
-ACE_CLASSIX_SAP::get_addr(ACE_Addr& theAddr) const
-{
-    if (theAddr.get_size() < this->local_addr_.get_size() || 
-	theAddr.get_type() != this->local_addr_.get_type())
-    {
-	return -1;
-    }
-    else
-    {
-	theAddr.set_addr(this->local_addr_.get_addr(), 
-			 this->local_addr_.get_size());
-	return 0;
-    }
-}
-
-void
-ACE_CLASSIX_SAP::set_addr(const ACE_Addr& theAddr)
-{
-    this->local_addr_.set_addr(theAddr.get_addr(), theAddr.get_size());
-}
-
-
-void
-ACE_CLASSIX_SAP::set_addr(const ACE_CLASSIX_Port_Core& thePort)
-{
-    this->local_addr_.set_addr(thePort.get_addr(), 
-			       sizeof (ACE_CLASSIX_Port_Core::Addr));
-}
-
-int
-ACE_CLASSIX_SAP::set(const KnUniqueId& theId)
-{
-    return this->local_addr_.set(theId);
-}
-
-void
-ACE_CLASSIX_SAP::set_handle(ACE_HANDLE theHandle)
-{
-    if (this->local_addr_.set_handle(theHandle) == -1)
-	ACE_DEBUG((LM_DEBUG, "ACE_CLASSIX_SAP::set_handle()::"
-		   "Handle invalid\n"));
-}
-
-int
-ACE_CLASSIX_SAP::set(const ACE_Addr& theAddr)
-{
-    this->set_addr(theAddr);
-    return 0;
-}
-
-int
-ACE_CLASSIX_SAP::open(const ACE_Addr& theAddr)
-{
-    this->set_addr(theAddr);
-    return 0;
-}
-
-
-int
-ACE_CLASSIX_SAP::set(const ACE_CLASSIX_Port_Core& thePort)
-{
-    this->set_addr(thePort);
-    return 0;
-}
-
-
-int
-ACE_CLASSIX_SAP::open(const ACE_CLASSIX_Port_Core* thePort)
-{
-    if (thePort)
-    {
-	this->set_addr(ACE_CLASSIX_Port(*thePort));
-	return 0;
-    }
-    else
-	return -1;
-}
-
-int
-ACE_CLASSIX_SAP::close(void)
-{    
-    // Disable receiving
-    this->unselectable();
-    //*** Do something to flush out potential messages on the local port
-    // e.g. have a separte thread call ipcReceive on each disabled SAP.
-
-    this->local_addr_.clear();
-    return 0;
-}
-
-int
-ACE_CLASSIX_SAP::selectable(int thePriority)
-{
-    if (!this->enabled_)
-    {
-	int result = this->local_addr_.enable(thePriority);
-	if (result == 0) 
-	    this->enabled_ = 1;
-	return result;
-    }
-    else
-	return 0;
-}
-
-int
-ACE_CLASSIX_SAP::unselectable(int)
-{
-    if (this->enabled_)
-    {
-	int result = this->local_addr_.disable();
-	if (result == 0)
-	    this->enabled_ = 0;
-	return result;
-    }
-    else
-	return 0;
-}
-
-
-void
-ACE_CLASSIX_SAP::dump(void) const
-{
-    ACE_DEBUG ((LM_INFO, "ACE_CLASSIX_SAP...\n"));
-
-    this->local_addr_.dump();
-
-    ACE_DEBUG ((LM_INFO, ACE_END_DUMP));
-}
diff --git a/ace/CLASSIX/CLASSIX_SAP.h b/ace/CLASSIX/CLASSIX_SAP.h
deleted file mode 100644
index 746bf6f7280..00000000000
--- a/ace/CLASSIX/CLASSIX_SAP.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_SAP.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_SAP_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_SAP_H
-
-/* ------------------------------------------------------------------------- */
-#include "ace/CLASSIX/CLASSIX_Port.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_CLASSIX_SAP
-    // = TITLE
-    //   Class implementing the SAP over a Chorus port.
-    //
-    // = DESCRIPTION
-    //   A SAP has a port which is referred to as the local port.
-    //   This class provides methods to manipulate this port.
-    //
-    //   The SAP will always put the port in DISABLED state on exit.
-    //
-    //   In CLASSIX, a local SAP is always a port, a peer SAP can be
-    //   a port or a group of port.  This class is for local SAP and
-    //   <ACE_Peer_SAP> is for peer SAP.
-    //
-    // = SEE ALSO
-    //   <ACE_Peer_SAP>
-    //
-{
- public:
-    enum
-    {
-        DEFAULT_PRIORITY = 10
-    };
-
-    // = INITIALIZATION
-    ACE_CLASSIX_SAP(void);
-    // Creates a SAP, using the address of the actor's default port.
-    ACE_CLASSIX_SAP(const ACE_Addr&);
-    // Creates a SAP, using the specified address as the local address.
-     virtual ~ACE_CLASSIX_SAP(void);
-
-    // = ACCESS
-    void set_addr(const ACE_Addr&);
-    void set_addr(const ACE_CLASSIX_Port_Core&);
-    // Sets the <local_addr_> based on the given address information.
-    // The caller should make sure that the original address can be removed!
-    int  set(const ACE_Addr&);
-    // Returns 0, if successful; returns -1, otherwise
-    // same as set_addr(const ACE_Addr&);
-    int  set(const ACE_CLASSIX_Port_Core&);
-    // Returns 0, if successful; returns -1, otherwise
-    // same as void set_addr(const ACE_CLASSIX_Port_Core&);
-    int set (const KnUniqueId&);
-    // Returns 0, if successful; returns -1, otherwise
-
-    void set_handle (ACE_HANDLE /* port_no */);
-    // Sets the port address according to <port_no>
-
-    int  get_addr(ACE_Addr& /* return_addr */) const;
-    // Returns address information to the supplied location.
-    // if successful, return 0 and the return_addr parameter contains the
-    // address info.
-    // Otherwise, return -1
-    const ACE_CLASSIX_Port& get_addr(void) const;
-    // Returns a reference to the address information
-    ACE_HANDLE get_handle(void) const;
-    // Get handles that the Reactor uses
-    virtual int is_configured(void) const;
-    // Returns 1, if address information is proper; Returns 0 otherwise
-    int is_selectable(void) const;
-    // Retruns 1, if the local SAP is enabled.
-
-    // = CONTROL
-    int selectable(int = ACE_CLASSIX_SAP::DEFAULT_PRIORITY /* priority */);
-    // Puts the SAP in the ENABLED state so that data the port associated
-    // with its local addess can be monitored by the CLASSIX's Reactor.
-
-    int unselectable(int = 0 /* not used */);
-    // Makes the SAP DISABLED and therefore the SAP can not be monitored
-    // by the CLASSIX's Reactor..
-    int open(const ACE_Addr&);
-    int open(const ACE_CLASSIX_Port_Core*);
-    // Sets the address information according to the supplied port
-    // Returns 0 on success; returns -1 otherwise
-    int close(void);
-    // removes the port information
-    // Returns 0 on success (always); returns -1 otherwise
-
-    void clear(void);
-    // erase local port info
-
-#if 0
-    int control(u_int = K_BROADMODE);
-    int control(u_int, /* mode */ int /* site */ );
-    // Interface for CLASSIX' send mode
-#endif
-
-
-    // = HELPER
-    void dump(void) const;
-    // dump the state of an object
-
-    ACE_ALLOC_HOOK_DECLARE;
-    // declare the dynamic allocation hooks
-
- protected:
-#if 0
-    virtual set_mode_(u_int = K_BROADMODE); /* theMode */
-    // Sets the addressing mode with the current setting of coTarget
-    virtual set_mode_(u_int, /* mode */ int /* site */);
-    // Sets the addressing mode as well as the coTarget
-#endif
-    // Disable copy constructor/assignment
-    ACE_CLASSIX_SAP(ACE_CLASSIX_SAP const&);
-    ACE_CLASSIX_SAP const& operator=(ACE_CLASSIX_SAP const&);
-
-    ACE_CLASSIX_Port   local_addr_;
-    int                enabled_; // 1 if enabled, 0 if disabled (Default)
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_SAP.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_SAP_H */
diff --git a/ace/CLASSIX/CLASSIX_SAP.i b/ace/CLASSIX/CLASSIX_SAP.i
deleted file mode 100644
index 105570b363b..00000000000
--- a/ace/CLASSIX/CLASSIX_SAP.i
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_CLASSIX_SAP::ACE_CLASSIX_SAP(void)
-    :local_addr_ (),
-     enabled_    (0)
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_SAP::ACE_CLASSIX_SAP(const ACE_Addr& theAddr)
-    :local_addr_ (theAddr.get_addr(), theAddr.get_size()),
-     enabled_    (0)
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_SAP::~ACE_CLASSIX_SAP(void)
-{
-    this->unselectable();
-}
-
-ACE_INLINE
-const ACE_CLASSIX_Port&
-ACE_CLASSIX_SAP::get_addr(void) const
-{
-    return this->local_addr_;
-}
-
-
-ACE_INLINE
-ACE_HANDLE
-ACE_CLASSIX_SAP::get_handle(void) const
-{
-    return this->local_addr_.get_handle();
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_SAP::is_configured(void) const
-{
-    return this->local_addr_.is_configured();
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_SAP::is_selectable(void) const
-{
-    return this->enabled_ == 1;
-}
-
-ACE_INLINE
-void
-ACE_CLASSIX_SAP::clear(void)
-{
-    this->local_addr_.clear();
-}
diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
deleted file mode 100644
index 4e1b3e70e8d..00000000000
--- a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-// $Id$
-/*
-// ============================================================================
-//
-// = LIBRARY
-//     ACE
-// 
-// = FILENAME
-//     CLASSIX_Reactor.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-// ============================================================================
-*/
-#include "ace/CLASSIX/CLASSIX_Select_Reactor.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Select_Reactor.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/CLASSIX/CLASSIX_OS.h"
-/* ------------------------------------------------------------------------- */
-int
-ACE_CLASSIX_Select_Reactor::wait_for_multiple_events 
-(ACE_Select_Reactor_Handle_Set &theDispatchSet,
- ACE_Time_Value *max_wait_time)
-{
-
-    ACE_Time_Value timer_buf (0);
-    ACE_Time_Value *this_timeout = &timer_buf;
-
-    int number_of_active_handles = this->any_ready (theDispatchSet);
-
-    // If there are any bits enabled in the <ready_set_> then we'll
-    // handle those first, otherwise we'll block in select().
-
-    if (number_of_active_handles == 0)
-    {
-	int port = K_ANYENABLED;
-	do
-	{
-	    // Monitor all enabled ports
-	    // CLASSIX uses -1 rathre than 0 for blocked receive
-	    int msec = -1;
-	    if (this->timer_queue_->calculate_timeout (max_wait_time,
-						       this_timeout) != 0)
-	    {
-		if ((msec = this_timeout->msec()) == 0)
-		{
-		    msec = -1;
-		    this_timeout = 0;
-		}
-	    }
-	    else
-		this_timeout = 0;
-
-	    ACE_CLASSIX_Msg rmsg(0, 0);
-	    port = K_ANYENABLED;
-	    ssize_t size = ::ipcReceive(rmsg.get(), &port, msec);
-#if 0
-	    ACE_DEBUG((LM_DEBUG, 
-		       "(%t)ACE_CLASSIX_Select_Reactor::"
-		       "return from ipcReceive():ret = %d"
-		       ", port = %d, timeout = %d\n", 
-		       size, port, msec));
-#endif
-	    if (size >= 0)
-	    {
-		// Is 0 valid ???
-		// Keep info about which handler this message is for and
-		// its size.
-		if (this->set_current_info_(port, size) == 0)
-		{
-		    theDispatchSet.rd_mask_.set_bit(port);
-		    number_of_active_handles = 1;
-		}
-		else
-		{
-		    ACE_DEBUG((LM_DEBUG, 
-			       "Synchronization problem in Reactor???\n"));
-		    number_of_active_handles = -1;
-		    errno = K_EFAULT;
-		}
-	    }
-	    else 
-	    {
-		// make the current message information invalid
-		this->set_current_info_(ACE_INVALID_HANDLE, 0);
-		if ((errno = size) == K_ETIMEOUT)
-		    number_of_active_handles = 0;
-		else
-		    number_of_active_handles = -1;
-	    }
-	}
-	while (number_of_active_handles == -1 && 
-	       this->handle_error_ (port) > 0);
-    }
-    // Return the number of events to dispatch.
-    return number_of_active_handles;
-}
-
-int
-ACE_CLASSIX_Select_Reactor::set_current_info_(ACE_HANDLE thePort, 
-					      size_t theSize)
-{
-    ACE_MT(ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, ace_mon, 
-			     this->token_, -1));
-
-    this->current_handle_     = thePort;
-    this->current_msg_size_   = theSize;
-    return 0;
-}
-
-int 
-ACE_CLASSIX_Select_Reactor::current_info(ACE_HANDLE thePort, 
-					     size_t& theSize)
-{
-    ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, 
-			      ace_mon, this->token_, -1));
-
-    if (this->current_handle_ == thePort)
-    {
-	theSize = this->current_msg_size_;
-	this->current_msg_size_ = 0;
-	this->current_handle_   = ACE_INVALID_HANDLE;
-	return 0;
-    }
-    else
-    {
-	theSize = 0;
-	return -1;
-    }
-}
-
-int
-ACE_CLASSIX_Select_Reactor::handle_error_ (int thePort)
-{
-
-    // The thread has been aborted
-    if (errno == K_EABORT)
-	return this->restart_;
-    // No port or a (Chorus) handler is attached to the port
-    else if (errno == K_ENOPORT || errno == K_EINVAL)
-	return this->check_handles_ (thePort);
-    else
-	return -1;
-}
-
-int
-ACE_CLASSIX_Select_Reactor::check_handles_ (int thePort)
-{
-    ACE_TRACE ("ACE_CLASSIX_Select_Reactor::check_handles_");
-    if (thePort == K_ANYENABLED)
-	return -1;
-    else
-    // Don't know how to check if a Chorus port has been disabled or deleted.
-	return 0;
-}
-
-/* ------------------------------------------------------------------------- */
-void
-ACE_CLASSIX_Select_Reactor_Notify::dump (void) const
-{
-  ACE_TRACE ("ACE_CLASSIX_Select_Reactor_Notify::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_CLASSIX_select_reactor_ = %x"), 
-	      this->select_reactor_));
-  this->notification_sap_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-int
-ACE_CLASSIX_Select_Reactor_Notify::open (ACE_Reactor_Impl *theReactor,
-					 ACE_Timer_Queue*,
-					 int the_disable_notify_pipe)
-{
-    if (the_disable_notify_pipe == 0)
-    {
-	this->select_reactor_ =  ACE_dynamic_cast 
-	    (ACE_CLASSIX_Select_Reactor *, theReactor);
-
-	if (this->notification_sap_.open (&this->notification_port_) != 0 ||
-	    this->notification_sap_.selectable() != 0)
-	    return -1;
-
-	return this->select_reactor_->register_handler
-	    (this->notification_sap_.get_handle (),
-	     this,
-	     ACE_Event_Handler::READ_MASK);
-    }
-    else
-    {
-	this->select_reactor_ = 0;
-    }
-}
-
-ssize_t
-ACE_CLASSIX_Select_Reactor_Notify::notify (ACE_Event_Handler *eh,
-                                   ACE_Reactor_Mask mask,
-                                   ACE_Time_Value *timeout)
-{
-    ACE_Notification_Buffer buffer (eh, mask);
-    ACE_CLASSIX_Msg msg(&buffer, sizeof (buffer));
-    KnIpcDest dest;
-    dest.target = this->notification_sap_.get_addr().get_id();
-
-    ssize_t n = ipcSend (msg.get(), K_DEFAULTPORT, &dest);
-    if (n < 0)
-	ACE_DEBUG((LM_DEBUG, "ipcSend() error = %d\n", n));
-    return n == 0 ? 0 : -1;
-}
-
-// Handles pending threads (if any) that are waiting to unblock the
-// Select_Reactor.
-
-int
-ACE_CLASSIX_Select_Reactor_Notify::dispatch_notifications (
-    int & number_of_active_handles,
-    const ACE_Handle_Set &rd_mask)
-{
-  ACE_TRACE ("(%t) ACE_CLASSIX_Select_Reactor_Notify::dispatch_notifications");
-
-  ACE_HANDLE read_handle =
-      this->notification_sap_.get_handle ();
-
-  if (rd_mask.is_set (read_handle))
-    {
-	number_of_active_handles--;
-	return this->handle_input (read_handle);
-    }
-  else
-    return 0;
-}
-
-// Special trick to unblock select() when updates occur in somewhere
-// other than the main ACE_Select_Reactor thread.  All we do is write data to
-// a pipe that the ACE_Select_Reactor is listening on.  Thanks to Paul
-// Stephenson for suggesting this approach.
-
-int
-ACE_CLASSIX_Select_Reactor_Notify::handle_input (ACE_HANDLE handle)
-{
-    // Precondition: this->select_reactor_.token_.current_owner () ==
-    // ACE_Thread::self ();
-
-    if (handle != this->notification_sap_.get_handle())
-    {
-	ACE_DEBUG((LM_DEBUG, "ACE_CLASSIX_Select_Reator_Notify::"
-		   "handle_input() Not my handle\n"));
-	return 0;
-    }
-
-    ssize_t                 n = 0;  
-    size_t                  n1= 0;
-
-    int                     number_dispatched = 0;
-
-    ACE_Notification_Buffer buffer;
-    ACE_CLASSIX_Msg rmsg(&buffer, sizeof (buffer));
-
-    if (this->select_reactor_->current_info(handle, n1) == -1 ||
-	n1 != sizeof buffer)
-    {
-	// I'm not quite sure what to do at this point.  It's
-	// probably best just to return -1.
-	ACE_DEBUG((LM_DEBUG, 
-		   "ACE_CLASSIX_Select_Reactor_Notify:: "
-		   "read returned %d not expected by the reactor\n", n1));
-	return -1;
-    }
-
-    while ((n = ::ipcGetData(rmsg.get())) > 0)
-    {
-	if (n != sizeof buffer)
-        {
-	    // I'm not sure quite what to do at this point.  It's
-	    // probably best just to return -1.
-	    ACE_DEBUG((LM_DEBUG, 
-		       "ACE_CLASSIX_Select_Reactor_Notify::ipcGetDAta() "
-		       "incorrect read(%d)\n", n));
-            return -1;
-        }
-
-	// If eh == 0 then another thread is unblocking the ACE_Select_Reactor
-	// to update the ACE_Select_Reactor's internal structures.  Otherwise,
-	// we need to dispatch the appropriate handle_* method on the
-	// ACE_Event_Handler pointer we've been passed.
-	if (buffer.eh_ != 0)
-        {
-	    int result = 0;
-
-	    switch (buffer.mask_)
-            {
-            case ACE_Event_Handler::READ_MASK:
-            case ACE_Event_Handler::ACCEPT_MASK:
-		result = buffer.eh_->handle_input (ACE_INVALID_HANDLE);
-		break;
-            case ACE_Event_Handler::WRITE_MASK:
-		result = buffer.eh_->handle_output (ACE_INVALID_HANDLE);
-		break;
-            case ACE_Event_Handler::EXCEPT_MASK:
-		result = buffer.eh_->handle_exception (ACE_INVALID_HANDLE);
-		break;
-            default:
-		// Should we bail out if we get an invalid mask?
-		ACE_ERROR ((LM_ERROR, ACE_TEXT ("invalid mask = %d\n"), buffer.mask_));
-            }
-	    if (result == -1)
-		buffer.eh_->handle_close (ACE_INVALID_HANDLE,
-					  ACE_Event_Handler::EXCEPT_MASK);
-        }
-
-	number_dispatched++;
-
-	// Bail out if we've reached the <notify_threshold_>.  Note that
-	// by default <notify_threshold_> is -1, so we'll loop until all
-	// the notifications in the pipe have been dispatched.
-	if (number_dispatched == this->select_reactor_->max_notify_iterations())
-	    break;
-    }
-
-    // Reassign number_dispatched to -1 if things have gone seriously
-    // wrong.
-    if (n < 0)
-	number_dispatched = -1;
-
-
-  // Enqueue ourselves into the list of waiting threads.  When we
-  // reacquire the token we'll be off and running again with ownership
-  // of the token.  The postcondition of this call is that
-  // this->select_reactor_.token_.current_owner () == ACE_Thread::self ();
-    this->select_reactor_->renew();
-    return number_dispatched;
-}
-/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.h b/ace/CLASSIX/CLASSIX_Select_Reactor.h
deleted file mode 100644
index 72d127ad86e..00000000000
--- a/ace/CLASSIX/CLASSIX_Select_Reactor.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-/*
-// ============================================================================
-//
-// = LIBRARY
-//     ACE
-//
-// = FILENAME
-//     CLASSIX_Reactor.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-*/
-
-#ifndef ACE_CLASSIX_REACTOR_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_REACTOR_H
-
-/* ------------------------------------------------------------------------- */
-#include "ace/Timer_Queue.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Select_Reactor.h"
-#include "ace/Message_Block.h"
-#include "ace/CLASSIX/CLASSIX_SAP.h"
-
-class ACE_CLASSIX_Select_Reactor;
-
-class ACE_Export ACE_CLASSIX_Select_Reactor_Notify :
-    public ACE_Reactor_Notify
-{
-  // = TITLE
-  //     Unblock the <ACE_CLASSIX_Select_Reactor> from its event loop.
-  //
-  // = DESCRIPTION
-  //   This replaces <ACE_Select_Reactor_Notify> class.
-  //   Instead of using pipe, this class uses an Chorus IPC port to
-  //   trigger the unblock event.
-  //
-public:
-    // = Initialization and termination methods.
-    ACE_CLASSIX_Select_Reactor_Notify(void);
-    ~ACE_CLASSIX_Select_Reactor_Notify(void);
-
-    virtual int open (ACE_Reactor_Impl *,
-                      ACE_Timer_Queue * = 0,
-                      int  = 0 /* dusable_notify_pip */);
-    // Enables the notification port and register it with the reactor
-    virtual int close (void);
-    // Disables the notification port
-
-    int dispatch_notifications (int &number_of_active_handles,
-                                const ACE_Handle_Set &rd_mask);
-    // Handles pending threads (if any) that are waiting to unblock the
-    // Select_Reactor.
-
-    ssize_t notify (ACE_Event_Handler * = 0,
-                    ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK,
-                    ACE_Time_Value * = 0);
-    // Called by a thread when it wants to unblock the Select_Reactor.
-    // This wakeups the <ACE_Select_Reactor> if currently blocked in
-    // select()/poll().  Pass over both the <Event_Handler> *and* the
-    // <mask> to allow the caller to dictate which <Event_Handler>
-    // method the <Select_Reactor> will invoke.  The <ACE_Time_Value>
-    // indicates how long to blocking trying to notify the
-    // <Select_Reactor>.  If <timeout> == 0, the caller will block until
-    // action is possible, else will wait until the relative time
-    // specified in *<timeout> elapses).
-
-    virtual int handle_input (ACE_HANDLE handle);
-    // Called back by the Select_Reactor when a thread wants to unblock us.
-
-    virtual void max_notify_iterations (int);
-    // Set the maximum number of times that the
-    // <ACE_CLASSIX_Reactor_Notify::handle_input> method will iterate
-    // Always 1.
-
-    virtual int max_notify_iterations (void);
-    // Get the maximum number of times that the
-    // <ACE_Select_Reactor_Notify::handle_input> method will iterate.
-    // Always 1
-
-    void dump (void) const;
-    // Dump the state of an object.
-
-    ACE_ALLOC_HOOK_DECLARE;
-    // Declare the dynamic allocation hooks.
-
-private:
-    ACE_CLASSIX_Select_Reactor       *select_reactor_;
-    // Keep a back pointer to the <ACE_Select_Reactor>.  If this value
-    // if NULL then the <ACE_Select_Reactor> has been initialized with
-    // <disable_notify_pipe>.
-    ACE_CLASSIX_Port_Core    notification_port_; // CLASSIX' IPC port
-    ACE_CLASSIX_SAP          notification_sap_;
-    // The HANDLE that the Select_Reactor is listening on and
-    // the HANDLE that threads wanting the attention of the
-    // Select_Reactor will write t are the same.
-    // It can be seen that the notification port is implicitly connected to the
-    // port from where the notification is written.  In many cases, it will be
-    // the actor's default port.
-};
-
-class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
-    // = TITLE
-    //   Implementing a Reactor for monitoring incoming data
-    //
-    // = DESCRIPTION
-    //     This class redefines the wait_for_events() method of
-    //     <ACE_Select_Reactor> class.
-    //
-    //     The wait_for_events() method uses ipcReceive() to monitor
-    //     all ENABLED ports for incoming messages.  The ipcReceive() is
-    //     set up such that it will find out the size of the message but will
-    //     not read the message.  The Chorus OS provides an ipcGetData()
-    //     to read the message that has just been detected on the same
-    //     thread.
-    //     Once a message is detected on a particular
-    //     port, the reactor  will invoke the port handler's
-    //     handle_input() method on the same thread.  It is important that
-    //     handle_input() shall immediately retrieve(use ipcGetData())
-    //     the message on the same
-    //     thread and it shall not hold up this thread in the handle_input()
-    //     routine for too long. This will allow the Reactor to respond to
-    //     events more quickly.
-    //
-    //  = NOTE
-    //   Since chorus does not allow ipcReceive to monitor a subset of
-    //   ENABLED ports.  One cannot have two ACE_CLASSIX_Select_Reactors
-    //   in one actor.
-    //
-{
-  public:
-
-
-    // = CURRENT MESSAGE
-    // The following message should be called in the handler's
-    // handle_input() routine.
-    // The handle_input() routine should not hold the reactor for too long.
-    virtual int current_info(ACE_HANDLE /* port */,
-                             size_t& /* msg size */);
-    // Retruns the current messageage to the caleer if the supplied
-    // handle id is the same as the <current_handle_>
-    // Returns 0, if <msg size> constains the size of the message
-    // that the handler shall read.
-    // Returns -1, if the caller is not the expected handler.
-
- protected:
-  // = INITIALIZATION
-  ACE_CLASSIX_Select_Reactor (ACE_Timer_Queue * = 0);
-  // Initializes <ACE_CLASSIX_Select__Reactor> with the handler
-  // repository of the default size.
-
-  ACE_CLASSIX_Select_Reactor (size_t size,
-                              int restart = 0,
-                              ACE_Timer_Queue * = 0);
-  // Initializes <ACE_CLASSIX_Select_Reactor> with the handler repository of
-  // size <size>.
-
-  // multiplexer
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-  // Wait for events to occur.
-
-  virtual int set_current_info_(ACE_HANDLE /* handle */,
-                                size_t /* size of data */);
-  // record the handler and the size of the message that the handler shall
-  // read next.
-
-
-  // ACE_Recursive_Thread_Mutex  lock_current_;
-  // lock for data relating to the current message.
-  // use token lock
-
-  size_t                      current_msg_size_;
-  // size of the message that has just been detected.
-
-  ACE_HANDLE                  current_handle_;
-  // handler id of the current address.
-
-  friend class ACE_CLASSIX_Select_Reactor_Notify;
-  friend class ACE_CLASSIX_OS;
- // for constructors
-
- private:
-  int handle_error_(int /* port handle */);
-  // Takes corrective action when errors occur.
-  int check_handles_(int /* port handle */);
-  // Makes sure the handler is valid.
-
-  ACE_CLASSIX_Select_Reactor(ACE_CLASSIX_Select_Reactor const&);
-  ACE_CLASSIX_Select_Reactor const& operator=(ACE_CLASSIX_Select_Reactor const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Select_Reactor.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_REACTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.i b/ace/CLASSIX/CLASSIX_Select_Reactor.i
deleted file mode 100644
index af4e995cb87..00000000000
--- a/ace/CLASSIX/CLASSIX_Select_Reactor.i
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// CLASSIX/Reactor.i
-/* ------------------------------------------------------------------------- */
-
-/* ------------------------------------------------------------------------- */
-ACE_INLINE
-ACE_CLASSIX_Select_Reactor_Notify::ACE_CLASSIX_Select_Reactor_Notify(void)
-    : ACE_Reactor_Notify()
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_Select_Reactor_Notify::~ACE_CLASSIX_Select_Reactor_Notify(void)
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_Select_Reactor::ACE_CLASSIX_Select_Reactor(
-    ACE_Timer_Queue *theTimeQ)
-  : ACE_Select_Reactor(0, theTimeQ, 0,
-		       new ACE_CLASSIX_Select_Reactor_Notify()),
-    current_msg_size_ (0),
-    current_handle_   (ACE_INVALID_HANDLE)
-{
-}
-
-ACE_INLINE
-ACE_CLASSIX_Select_Reactor::ACE_CLASSIX_Select_Reactor (
-    size_t theSize,
-    int theRs,
-    ACE_Timer_Queue *theTimeQ)
-  : ACE_Select_Reactor (theSize, theRs, 0, theTimeQ, 0,
-			new ACE_CLASSIX_Select_Reactor_Notify() ),
-    current_msg_size_ (0),
-    current_handle_   (ACE_INVALID_HANDLE)
-{
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Select_Reactor_Notify::close (void)
-{
-  // deregister handle ???
-  return this->notification_sap_.close ();
-}
-
-ACE_INLINE
-void
-ACE_CLASSIX_Select_Reactor_Notify::max_notify_iterations (int iterations)
-{
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Select_Reactor_Notify::max_notify_iterations (void)
-{
-    return 1;
-}
-
-
-/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/CLASSIX_Stream.cpp b/ace/CLASSIX/CLASSIX_Stream.cpp
deleted file mode 100644
index 5d1ba095853..00000000000
--- a/ace/CLASSIX/CLASSIX_Stream.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX_Stream.cpp
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Stream.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Stream.i"
-#endif /* __ACE_INLINE__ */
-/* ------------------------------------------------------------------------- */
-ACE_CLASSIX_Stream::ACE_CLASSIX_Stream(void)
-    : local_sap_        (),
-      local_sap_closed_ (0),
-      local_port_       (0),
-      peer_sap_         (),
-      peer_sap_closed_  (1)
-//      dest_site_        (-1)
-{
-}
-
-ACE_CLASSIX_Stream::ACE_CLASSIX_Stream
-         (const ACE_CLASSIX_Port_Core& thePeer, 
-	  const ACE_CLASSIX_Port& theLocal)
-    : local_sap_        (theLocal),
-      local_sap_closed_ (0),
-      local_port_       (0),
-      peer_sap_         (thePeer),
-      peer_sap_closed_  (1)
-//      dest_site_        (-1)
-{
-    this->dest_.target = this->peer_sap_.get_addr()->get_id();
-}
-
-ACE_CLASSIX_Stream::ACE_CLASSIX_Stream(const ACE_CLASSIX_Port& thePeer, 
-				       const ACE_CLASSIX_Port& theLocal)
-    : local_sap_       (theLocal),
-      local_sap_closed_(0),
-      local_port_      (0),
-      peer_sap_        (thePeer),
-      peer_sap_closed_ (1)
-//      dest_site_       (-1)
-{
-    this->dest_.target = this->peer_sap_.get_addr()->get_id();
-}
-
-
-ACE_CLASSIX_Stream::ACE_CLASSIX_Stream(const KnUniqueId& thePeer,
-			       const ACE_CLASSIX_Port& theLocal)
-    : local_sap_       (theLocal),
-      local_sap_closed_(0),
-      local_port_      (0),
-      peer_sap_        (thePeer),
-      peer_sap_closed_ (1)
-//      dest_site_       (-1)
-{
-    this->dest_.target = this->peer_sap_.get_addr()->get_id();
-}
-
-int
-ACE_CLASSIX_Stream::set_local_port(ACE_CLASSIX_Port_Core* thePort)
-{
-    delete this->local_port_;
-    if (this->local_sap_.open(thePort) == 0)
-    {
-	this->local_port_ = thePort;
-	return 0;
-    }
-    else
-    {
-	this->local_port_ = 0;
-	this->local_sap_.clear();
-	return -1;
-    }
-}
-
-int 
-ACE_CLASSIX_Stream::open(void)
-{
-    this->dest_.target = this->peer_sap_.get_addr()->get_id();
-    this->open_writer();
-
-    if (!this->local_sap().is_configured() ||
-	this->local_sap().get_handle() == 
-	ACE_CLASSIX_DEFAULT_PORT::instance()->get_handle())
-    {
-	delete this->local_port_;
-	ACE_NEW_RETURN(this->local_port_, ACE_CLASSIX_Port_Core(), -1);
-	return this->local_sap_.open(this->local_port_);
-    }
-
-    return 0;
-}
-
-int 
-ACE_CLASSIX_Stream::open(const ACE_Addr& theAddr)
-{
-    this->dest_.target = this->peer_sap_.get_addr()->get_id();
-    this->open_writer();
-
-    if (!this->local_sap().is_configured() ||
-	this->local_sap().get_handle() == 
-	ACE_CLASSIX_DEFAULT_PORT::instance()->get_handle())
-    {
-	delete this->local_port_;
-	if (theAddr.get_size() != this->local_sap().get_addr().get_size())
-	    return -1;
-	return this->local_sap_.open(theAddr);
-    }
-    return 0;	    
-}
-
-int
-ACE_CLASSIX_Stream::close_writer(void)
-{
-    if (this->peer_sap_closed_ == 0)
-    {
-	if (this->send_n(0, 0) < 0)
-	    ACE_DEBUG((LM_DEBUG, "failed to send a zero byte msg\n"));
-	this->peer_sap_closed_ = 1;
-    }
-    return 0;
-}
-
-void
-ACE_CLASSIX_Stream::open_writer(void)
-{
-    this->peer_sap_closed_ = 0;
-}
-
-int
-ACE_CLASSIX_Stream::close(void)
-{
-    this->close_writer();
-
-    this->local_sap_.close();
-    if (this->local_port_)
-    {
-	delete this->local_port_;
-	this->local_port_ = 0;
-    }
-    this->dest_.target = ACE_CLASSIX_OS::null_KnUniqueId();
-    return 0;
-}
-
-void
-ACE_CLASSIX_Stream::set_target_()
-{
-    this->dest_.target = this->peer_sap_.get_addr()->get_id();
-}
-
-int
-ACE_CLASSIX_Stream::set_peer_sap(const ACE_Addr& theAddr)
-{
-    if (this->peer_sap_.set(theAddr) == 0)
-    {
-	this->set_target_();
-	return 0;
-    }
-    return -1;
-}
-
-int
-ACE_CLASSIX_Stream::set_peer_sap(const ACE_CLASSIX_Port_Core& theAddr)
-{
-    if (this->peer_sap_.set(theAddr) == 0)
-    {
-	this->set_target_();
-	return 0;
-    }
-    return -1;
-}
-
-int
-ACE_CLASSIX_Stream::set_peer_sap(const KnUniqueId& theAddr)
-{
-    if (this->peer_sap_.set(theAddr) == 0)
-    {
-	this->set_target_();
-	return 0;
-    }
-    return -1;
-}
-
-int
-ACE_CLASSIX_Stream::set_peer_sap(const KnCap& theAddr)
-{
-    if (this->peer_sap_.set(theAddr) == 0)
-    {
-	this->set_target_();
-	return 0;
-    }
-    return -1;
-}
-
-ssize_t
-ACE_CLASSIX_Stream::send_n(const void* theBuf, size_t theLen, int theFlags)
-{
-    if (!this->is_writer_closed())
-    {
-	this->set_mode_(theFlags);
-	return this->send_n(theBuf, theLen);
-    }
-    else
-	return 0;
-}
-
-ssize_t
-ACE_CLASSIX_Stream::send_n(const void* theBuf, size_t theLen) const
-{
-    if (!this->is_writer_closed())
-    {
-	ACE_CLASSIX_Msg msg(theBuf, theLen);
-	int result = 0;
-	if ((result = ::ipcSend((KnMsgDesc*) msg.get(), 
-				this->local_sap().get_handle(), 
-				(KnIpcDest*) &this->dest_)) == 0)
-	    return theLen;
-	else
-	{
-	    errno = ACE_CLASSIX_OS::convert_io_error(result);
-	    return -1;
-	}
-    }
-    else
-    {
-	return 0;
-    }
-}
-
-ssize_t
-ACE_CLASSIX_Stream::reply(const void* theBuf, size_t theLen) const
-{
-    if (!this->is_writer_closed())
-    {
-	ACE_CLASSIX_Msg msg(theBuf, theLen);
-	if (int result = ::ipcReply((KnMsgDesc*) msg.get()) == 0)
-	    return theLen;
-	else
-	{
-	    errno = ACE_CLASSIX_OS::convert_io_error(result);
-	    return -1;
-	}
-    }
-    else
-	return 0;
-}
-
-ssize_t
-ACE_CLASSIX_Stream::ipcRecv(void* theBuf, size_t theLen, 
-			 int theFlag, ACE_Time_Value* theTimeout) const
-{
-    if (!this->is_reader_closed())
-    {
-	// In chorus environment, a negative value means block
-	// until recv is possible 
-	int timeout = theTimeout == 0 ? -1 : theTimeout->msec();
-	if (timeout == 0)
-	    timeout = -1;
-
-	if (theFlag & MSG_PEEK)
-	{
-	    theBuf = 0;
-	    theLen = 0;
-	}
-
-	ACE_CLASSIX_Msg rmsg(theBuf, theLen);
-	int handle = this->local_sap().get_handle();
-	int result = ::ipcReceive((KnMsgDesc*) rmsg.get(), &handle,  
-				  timeout);
-	if (result < 0)
-	{
-	    errno = ACE_CLASSIX_OS::convert_io_error(result);
-	    return -1;
-	}
-	else
-	    return result;
-    }
-    else
-    {
-	errno = ENOTCONN;
-	return -1;
-    }
-}
-
-ssize_t
-ACE_CLASSIX_Stream::ipcRecv_n(void* theBuf, size_t theLen, 
-			   int theFlag, ACE_Time_Value* theTimeout) const
-{
-    // Timeout value applies to each around of receive.
-    // ....Should be adjusted after each round!
-    int len = 0;
-    void *next = theBuf;
-    size_t more = theLen; 
-    for (int n = 0; 
-	 more > 0; 
-	 len += n, next += n, more -=n)
-    {
-	if ((n = this->ipcRecv(next, more, theFlag, theTimeout)) == -1)
-	    break;
-    }
-    return len;
-}
-
-ssize_t
-ACE_CLASSIX_Stream::recv(void* theBuf, int theLen) const
-{
-    if (!this->is_reader_closed())
-    {
-	ACE_CLASSIX_Msg rmsg(theBuf, theLen);
-	int result =  ::ipcGetData(rmsg.get());
-	if (result >= 0)
-	    return result;
-	else if (result == K_EINVAL)
-	    errno = EWOULDBLOCK;
-	else 
-	    errno = EFAULT;
-
-	return -1;
-    }
-    else
-	return 0;
-}
-
-
-
-void
-ACE_CLASSIX_Stream::dump (void) const
-{
-    ACE_DEBUG ((LM_DEBUG, "ACE_CLASSIX_Stream...\n"));
-    ACE_DEBUG ((LM_DEBUG, "...local sap(%s)\n", 
-	       this->is_writer_closed() == 1 ? "closed" : "opened"));
-    if (this->local_port_)
-	ACE_DEBUG ((LM_DEBUG, "\towns the local port(%x)\n", 
-		    this->local_port_));
-    this->local_sap().dump();
-
-    ACE_DEBUG ((LM_DEBUG, "...Peer sap(%s & %s)\n",
-	       this->is_reader_closed() == 1 ? "closed" : "opened",
-	       this->is_selectable() ? "enabled" : "disabled"));
-    this->peer_sap().dump();
-    ACE_DEBUG((LM_DEBUG, "Dest- Target\n head = %x tail = %x\n",
-	       this->dest_.target.uiHead,
-	       this->dest_.target.uiTail
-	       /* this->dest_site_ */));
-    ACE_DEBUG((LM_DEBUG, "Dest- coTarget\n head = %x tail = %x\n",
-	       this->dest_.coTarget.uiHead,
-	       this->dest_.coTarget.uiTail
-	       /* this->dest_site_ */));
-    ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
diff --git a/ace/CLASSIX/CLASSIX_Stream.h b/ace/CLASSIX/CLASSIX_Stream.h
deleted file mode 100644
index e728ce5d053..00000000000
--- a/ace/CLASSIX/CLASSIX_Stream.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-//
-// = FILENAME
-//     CLASSIX_Stream.h
-//
-// = AUTHOR(S)
-//     Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_STREAM_H
-#include /**/ "ace/pre.h"
-#define ACE_CLASSIX_STREAM_H
-
-/* ------------------------------------------------------------------------- */
-#include "ace/CLASSIX/CLASSIX_SAP.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CLASSIX/CLASSIX_Peer_SAP.h"
-#include "ace/CLASSIX/CLASSIX_Port_Default.h"
-
-class ACE_CLASSIX_Stream
-    // = TITLE
-    //   Provides the stream interface for CLASSIX IPC communications.
-    //
-    // = DESCRIPTION
-    //   This classes provides a stream wrapper over CLASSIX'
-    //   IPC. It is designed to be an alternative to Stream type of
-    //   communication in the UNIX AF_INET environment.
-    //
-    //   To the user, the stream is connection-oriented.  The stream
-    //   is implemented on top of IPC, it is connectionless and its
-    //   reliability is as good as what  the raw IPC can offer.
-    //
-    //   Since CLASSIX IPC is not intended to go across wide area network,
-    //   it can be seen as an
-    //   alternative to AF_INET's connection oriented stream, even though
-    //   the CLASSIX IPC is connectionless.
-    //
-    //   This class  contains a local sap, peer sap and data holding
-    //   delivery mode information.
-    //
-    //   When a stream is created, the peer SAP information must be provided.
-    //   The local SAP information may be provided in the constructor or
-    //   open().  The local SAP information given in open() overrides the
-    //   existing one. If the local SAP address is not given at all, it will
-    //   allocate a port and use it as the local SAP.
-    //
-{
- public:
-    ACE_CLASSIX_Stream(void);
-    // Default constructor, does not setup anything
-    ACE_CLASSIX_Stream(const ACE_CLASSIX_Port_Core&, /* remote port */
-                        const ACE_CLASSIX_Port& =
-                  *ACE_CLASSIX_DEFAULT_PORT::instance()); /* local address */
-
-    ACE_CLASSIX_Stream(const ACE_CLASSIX_Port&,    /* remote port address */
-                       const ACE_CLASSIX_Port& =
-                   *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */
-
-    ACE_CLASSIX_Stream(const KnUniqueId&,          /* remote port address */
-                       const ACE_CLASSIX_Port& =
-                   *ACE_CLASSIX_DEFAULT_PORT::instance());/* local address */
-
-    // = IO
-    // Returns -1, if fault has occured during receive.  errno contains
-    // the error condition.
-    // Returns no of bytes received/sent,  otherwise.
-    //
-    virtual ssize_t send_n (const void *, /* buf */
-                            size_t, /* n */
-                            int /* flags */);
-    // Sends exactly n bytes (keep trying until n bytes are sent)
-    virtual ssize_t send_n (const void *, /* buf */ size_t /* n */) const;
-    // Sends n bytes(keep trying until n bytes are sent)
-    // Uses the current addressing mode
-    virtual ssize_t send (const void *, /* buf */
-                          size_t, /* n */
-                          int /* flags */);
-    // Sends n bytes. Same as send_n(buf, n, flag)
-    virtual ssize_t send (const void *, /* buf */
-                          size_t /* n */) const;
-    // Sends n bytes. same as send_n(buf, n).
-    virtual ssize_t reply (const void *, /* buf */
-                           size_t /* n */) const;
-    // Sends n bytes to the sender of the cureent thread's current message.
-
-    ssize_t ipcRecv (void *,             /* buffer */
-                     size_t,             /* length */
-                     int  = 0,           /* flag: 0 or MSG_PEEK  */
-                     ACE_Time_Value* = 0) const; /* timeout */
-    // Recv an <n> byte buffer
-    // Wait up to <timeout> amount of time to receive up to <n> bytes
-    // into <buf> from <handle> (uses the <recv> call).  If <recv> times
-    // out a -1 is returned with <errno == ETIMEOUT>.  If it succeeds the
-    // number of bytes received is returned.
-    // If <timeout> == 0, the caller
-    // will block until action is possible, else will wait until the
-    // relative time specified in *<timeout> elapses).
-    ssize_t ipcRecv_n (void *,             /* buffer */
-                       size_t,             /* length */
-                       int  = 0,           /* flag: 0 or MSG_PEEK  */
-                       ACE_Time_Value* = 0) const; /* timeout */
-    // Continue until receives n bytes of data or an error has occurred.
-    // Retruns the no of bytes actually received.
-    // If it is less than expected, errno contains error info.
-
-    ssize_t peek(ACE_Time_Value* = 0 /* timeout */) const;
-    // It is the same as recv(0, 0, MSG_PEEK, timeout)
-    // This must be followd by get_data() in order to read the peeked message
-    ssize_t recv(void* /*buf */, int /* len */) const;
-    // Gets data which have been peeked
-    ssize_t recv_n(void* /*buf */, int /* len */) const;
-    // Gets data which have been peeked
-
-    // = ACCESS
-    virtual ACE_HANDLE get_handle (void) const;
-    // virtual void set_handle (ACE_HANDLE);
-    virtual void set_handle(ACE_HANDLE);
-    // set the local port's address according to the supplied handle
-
-    const ACE_CLASSIX_SAP&  local_sap(void) const;
-    // Returns read-only local sap
-    const ACE_CLASSIX_Peer_SAP& peer_sap(void) const;
-    // Returns read-only peer sap
-    int get_remote_addr (ACE_Addr & /* dest */) const;
-    // Returns 0, if the remote address has been setup, else -1.
-    // The <dest> parameter is not changed.
-    // This method is here for compatability with SOCK_Stream.
-    // Since the remote addr may be a port or a group and since the
-    // address formats are different between a port and a group, the caller
-    // cannot provide an appropriate buffer for recording the address.  The
-    // <dest> parameter is therefore not used.
-
-
-    const ACE_CLASSIX_Port& local_addr(void) const;
-    // Returns local address in <ACE_CLASSIX_Port> format
-
-    int is_selectable(void) const;
-    // Retruns 1, if the local SAP is enabled.
-    int is_writer_closed(void) const;
-    // Retruns 1, if writer side is closed.
-    int is_reader_closed(void) const;
-    // Retruns 1, if reader side is closed.
-
-
-    // = CONTROL
-    int  set_peer_sap(const ACE_Addr&);
-    // Returns 0, if successful; returns -1, otherwise
-    // same as set_addr(const ACE_Addr&);
-    int  set_peer_sap(const ACE_CLASSIX_Port_Core&);
-    // Returns 0, if successful; returns -1, otherwise
-    // same as void set_addr(const ACE_CLASSIX_Port_Core&);
-    int set_peer_sap (const KnUniqueId&);
-    // Returns 0, if successful; returns -1, otherwise
-    int set_peer_sap (const KnCap&);
-    // Returns 0, if successful; returns -1, otherwise
-
-    virtual int enable(int) const;
-    virtual int disable(int) const;
-    // These two methods do nothing. They are here to maintain the same
-    // interface as other type of Stream class, e.g. ACE_SOCK_Stream
-
-    int selectable(int = ACE_CLASSIX_SAP::DEFAULT_PRIORITY);
-    int unselectable(void);
-    // Enables/Disables the local port to be monitored (by a CLASSIX reactor)
-    // Default = DISABLED
-    virtual void open_writer(void);
-    virtual int close_writer(void);
-    // Closes down the writer
-    // Returns -1, if it fails; returns 0, otherwise
-    // Subclass can overwrite this with sophisticated mechanism, such as
-    // exchange protocol information with the peer.
-    virtual int close_reader(void);
-    // Closes down the writer
-    // Returns -1, if it fails; returns 0, otherwise
-    // Subclass can overwrite this with sophisticated mechanism, such as
-    // exchange protocol information with the peer.
-
-    virtual int open(void);
-    // for local SAP...
-    // Creates a port and uses it as a SAP.
-    // A port can be created if the local_sap is not configured or
-    // it is configured and the local_sap uses the actor's default port.
-    // Returns -1, if it fails; returns 0, otherwise
-    virtual int open(const ACE_Addr&);
-    // for local SAP...
-    // Uses the supplied port information for the local SAP.
-    virtual int close(void);
-    // for local SAP...
-    // Deletes the optional local port and clears the local SAP infomration.
-
-    // = OPTIONS
-    int control(u_int = K_BROADMODE);
-    int control(u_int, /* mode */ int /* site */ );
-    // Interface for CLASSIX' send mode
-
-    // = HELPER
-    void dump (void) const;
-    // Dump the state of an object.
-
-    ACE_ALLOC_HOOK_DECLARE;
-    // Declare the dynamic allocation hooks.
-
- protected:
-    friend class ACE_CLASSIX_CLD_Connector;
-    friend class ACE_CLASSIX_CO_Connector;
-    friend class ACE_CLASSIX_CO_Acceptor;
-    ACE_CLASSIX_SAP&  get_local_sap(void);
-    // Returns local sap
-    ACE_CLASSIX_Peer_SAP& get_peer_sap(void);
-    // Returns peer sap
-    int set_local_port(ACE_CLASSIX_Port_Core*);
-    // Uses the supplied port as the local port and assumes the ownership
-    // of the port. The existing local port, if any, will be deleted.
-    // Returns 0, if it is successful.
-    // Returns -1, otherwise.  The setting of the original local port
-    // will be erased.
-
-    void set_target_(void);
-    // set the delivery target structure using the existing peer information
-
-    virtual int set_mode_(u_int = K_BROADMODE); /* theMode */
-    // Sets the addressing mode with the current setting of coTarget
-    virtual int set_mode_(u_int, /* mode */ int /* site */);
-    // Sets the addressing mode as well as the coTarget
-
-    ACE_CLASSIX_SAP          local_sap_;
-    int                      local_sap_closed_;
-    // 0 if it's not closed(default),
-    // 1 if it's closed.
-    ACE_CLASSIX_Port_Core   *local_port_;
-    // if non-zero, it will be
-    // deleted on exit.
-
-    ACE_CLASSIX_Peer_SAP     peer_sap_;
-    int                      peer_sap_closed_;
-    // 0 if it's not closed(default),
-    // 1 if it's closed.
-
-    // Mode applied destination address
-    // Can be changed by control()/set_mode_()
-    // Mode is applicable in IPC classes other than the Stream class.
-    // It is here since it is the destination format used by ipcSend.
-
-    // with/without additional site information
-    // int                 dest_site_;
-    KnIpcDest           dest_;
-
- private:
-   // Disable copy constructor
-  ACE_CLASSIX_Stream(ACE_CLASSIX_Stream const&);
-  ACE_CLASSIX_Stream const& operator=(ACE_CLASSIX_Stream const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CLASSIX/CLASSIX_Stream.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CLASSIX_Stream_H */
diff --git a/ace/CLASSIX/CLASSIX_Stream.i b/ace/CLASSIX/CLASSIX_Stream.i
deleted file mode 100644
index a876a3d78c9..00000000000
--- a/ace/CLASSIX/CLASSIX_Stream.i
+++ /dev/null
@@ -1,182 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_CLASSIX_Stream::~ACE_CLASSIX_Stream(void)
-{
-  this->close();
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::control(u_int theMode)
-{
-  return this->set_mode_(theMode); 
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::control(u_int theMode, int theSite)
-{
-  return this->set_mode_(theMode, theSite); 
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::set_mode_(u_int theMode)
-{
-  return 0;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::set_mode_(u_int theMode, int theSite)
-{
-  return 0;
-}
-
-ACE_INLINE
-ssize_t
-ACE_CLASSIX_Stream::peek(ACE_Time_Value* theTimeout) const
-{
-  return this->ipcRecv(0, 0, MSG_PEEK, theTimeout);
-}
-
-ACE_INLINE
-ssize_t
-ACE_CLASSIX_Stream::send(const void *theBuf,  size_t theLen) const
-{
-  return this->send_n(theBuf, theLen);
-}
-
-ACE_INLINE
-ssize_t
-ACE_CLASSIX_Stream::send(const void *theBuf,size_t theLen, int theFlag)
-{
-  return this->send_n(theBuf, theLen, theFlag);
-}
-
-ACE_INLINE
-ssize_t
-ACE_CLASSIX_Stream::recv_n(void* theBuf, int theLen) const
-{
-  return this->recv_n(theBuf, theLen);
-}
-
-ACE_INLINE
-ACE_HANDLE
-ACE_CLASSIX_Stream::get_handle(void) const
-{
-  return this->local_sap_.get_handle();
-}
-
-ACE_INLINE
-void
-ACE_CLASSIX_Stream::set_handle(ACE_HANDLE theHandle)
-{
-  this->local_sap_.set_handle(theHandle);
-}
-
-ACE_INLINE
-const ACE_CLASSIX_SAP& 
-ACE_CLASSIX_Stream::local_sap(void) const
-{
-    return this->local_sap_;
-}
-
-ACE_INLINE
-const ACE_CLASSIX_Peer_SAP& 
-ACE_CLASSIX_Stream::peer_sap(void) const
-{
-    return this->peer_sap_;
-}
-
-ACE_INLINE
-ACE_CLASSIX_SAP& 
-ACE_CLASSIX_Stream::get_local_sap(void)
-{
-    return this->local_sap_;
-}
-
-ACE_INLINE
-ACE_CLASSIX_Peer_SAP& 
-ACE_CLASSIX_Stream::get_peer_sap(void)
-{
-    return this->peer_sap_;
-}
-
-ACE_INLINE
-const ACE_CLASSIX_Port& 
-ACE_CLASSIX_Stream::local_addr(void) const
-{
-    return this->local_sap_.get_addr();
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::selectable(int thePriority)
-{
-    return this->local_sap_.selectable(thePriority);
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::unselectable(void)
-{
-    return this->local_sap_.unselectable();
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::is_selectable(void) const
-{
-    return this->local_sap_.is_selectable();
-}
-
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::is_writer_closed(void) const
-{
-    
-    return (this->peer_sap_closed_ == 1);
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::close_reader(void)
-{
-    this->local_sap_closed_ = 1;
-    return 0;
-}
-
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::is_reader_closed(void) const
-{
-    
-    return this->local_sap_closed_ == 1;
-}
-
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::enable(int) const
-{
-    return 0;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::disable(int) const
-{
-    return 0;
-}
-
-ACE_INLINE
-int
-ACE_CLASSIX_Stream::get_remote_addr(ACE_Addr&) const
-{
-    return this->peer_sap_closed_ == 0;
-}
diff --git a/ace/Capabilities.cpp b/ace/Capabilities.cpp
index 422024834ac..741041bc9e4 100644
--- a/ace/Capabilities.cpp
+++ b/ace/Capabilities.cpp
@@ -254,7 +254,7 @@ ACE_Capabilities::getval (const ACE_TCHAR *keyname, ACE_TString &val)
     return -1;
 
   ACE_StringCapEntry *scap =
-    ACE_dynamic_cast (ACE_StringCapEntry *, cap);
+    dynamic_cast<ACE_StringCapEntry *> (cap);
   if (scap == 0)
     return -1;
 
@@ -270,7 +270,7 @@ ACE_Capabilities::getval (const ACE_TCHAR *keyname, int &val)
     return -1;
 
   ACE_IntCapEntry *icap =
-    ACE_dynamic_cast (ACE_IntCapEntry *, cap);
+    dynamic_cast<ACE_IntCapEntry *> (cap);
   if (icap != 0)
     {
       val = icap->getval ();
@@ -278,7 +278,7 @@ ACE_Capabilities::getval (const ACE_TCHAR *keyname, int &val)
     }
 
   ACE_BoolCapEntry *bcap =
-    ACE_dynamic_cast (ACE_BoolCapEntry *, cap);
+    dynamic_cast<ACE_BoolCapEntry *> (cap);
 
   if (bcap == 0)
     return -1;
@@ -357,14 +357,10 @@ template class ACE_Hash_Map_Manager_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TS
 template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>;
-template class ACE_Hash<ACE_TString>;
-template class ACE_Equal_To<ACE_TString>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Entry<ACE_TString,ACE_CapEntry*>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString,ACE_CapEntry*,ACE_Hash<ACE_TString>,ACE_Equal_To<ACE_TString>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash<ACE_TString>
-#pragma instantiate ACE_Equal_To<ACE_TString>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Condition_Recursive_Thread_Mutex.cpp b/ace/Condition_Recursive_Thread_Mutex.cpp
index 72270ff44d6..509b0a1c2be 100644
--- a/ace/Condition_Recursive_Thread_Mutex.cpp
+++ b/ace/Condition_Recursive_Thread_Mutex.cpp
@@ -80,7 +80,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (ACE_Recursive_Thread_Mutex &mut
                          &mutex.get_nesting_mutex ())
     : ACE_OS::cond_timedwait (&this->cond_,
                               &mutex.get_nesting_mutex (),
-                              (ACE_Time_Value *) abstime);
+                              const_cast <ACE_Time_Value *> (abstime));
   // We are holding the mutex, whether the wait succeeded or failed.
   // Stash errno (in case it failed) and then we need to reset the
   // recursive mutex state to what it was on entry to this method.
diff --git a/ace/Condition_Thread_Mutex.cpp b/ace/Condition_Thread_Mutex.cpp
index 0c50c0c0373..a04e2b30847 100644
--- a/ace/Condition_Thread_Mutex.cpp
+++ b/ace/Condition_Thread_Mutex.cpp
@@ -109,7 +109,7 @@ ACE_Condition_Thread_Mutex::wait (ACE_Thread_Mutex &mutex,
 // ACE_TRACE ("ACE_Condition_Thread_Mutex::wait");
   return ACE_OS::cond_timedwait (&this->cond_,
                                  &mutex.lock_,
-                                 (ACE_Time_Value *) abstime);
+                                 const_cast <ACE_Time_Value *> (abstime));
 }
 
 int
diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp
index 219df1ded44..5f71e30aa24 100644
--- a/ace/Configuration.cpp
+++ b/ace/Configuration.cpp
@@ -1,6 +1,7 @@
 // $Id$
 #include "ace/Configuration.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 
 // Can remove this when import_config and export_config are removed from
@@ -1071,8 +1072,7 @@ int
 ACE_Configuration_Win32Registry::load_key (const ACE_Configuration_Section_Key& key,
                                            HKEY& hKey)
 {
-  ACE_Section_Key_Win32* pKey = ACE_dynamic_cast (ACE_Section_Key_Win32*,
-                                                  get_internal_key (key));
+  ACE_Section_Key_Win32* pKey = dynamic_cast<ACE_Section_Key_Win32*> (get_internal_key (key));
   if (!pKey)
     return -1;
 
@@ -1439,7 +1439,7 @@ ACE_Configuration_Heap::create_index (void)
         {
           // Attempt to clean up.
           ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("create_index\n")));
+                      ACE_LIB_TEXT ("create_index failed\n")));
           this->allocator_->remove ();
           return -1;
         }
@@ -1463,8 +1463,7 @@ ACE_Configuration_Heap::load_key (const ACE_Configuration_Section_Key& key,
 {
   ACE_ASSERT (this->allocator_);
   ACE_Configuration_Section_Key_Heap* pKey =
-    ACE_dynamic_cast (ACE_Configuration_Section_Key_Heap*,
-                      get_internal_key (key));
+    dynamic_cast<ACE_Configuration_Section_Key_Heap*> (get_internal_key (key));
 
   if (!pKey)
     {
@@ -1807,8 +1806,7 @@ ACE_Configuration_Heap::enumerate_values (const ACE_Configuration_Section_Key& k
 {
   ACE_ASSERT (this->allocator_);
   ACE_Configuration_Section_Key_Heap* pKey =
-    ACE_dynamic_cast (ACE_Configuration_Section_Key_Heap*,
-                      get_internal_key (key));
+    dynamic_cast<ACE_Configuration_Section_Key_Heap*> (get_internal_key (key));
   if (!pKey)
     return -1;
 
@@ -1857,8 +1855,7 @@ ACE_Configuration_Heap::enumerate_sections (const ACE_Configuration_Section_Key&
   ACE_ASSERT (this->allocator_);
   // cast to a heap section key
   ACE_Configuration_Section_Key_Heap* pKey =
-    ACE_dynamic_cast (ACE_Configuration_Section_Key_Heap*,
-                      get_internal_key (key));
+    dynamic_cast<ACE_Configuration_Section_Key_Heap*> (get_internal_key (key));
   if (!pKey)
     return -1;  // not a heap key!
 
diff --git a/ace/Configuration.h b/ace/Configuration.h
index eac6923eb70..74ab0728b26 100644
--- a/ace/Configuration.h
+++ b/ace/Configuration.h
@@ -31,11 +31,12 @@
 #define ACE_CONFIGURATION_H
 #include /**/ "ace/pre.h"
 
-#include "ace/SString.h"
+#include "ace/SStringfwd.h"
 #include "ace/Hash_Map_With_Allocator_T.h"
 #include "ace/Malloc.h"
 #include "ace/Synch_Traits.h"
 
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -521,7 +522,7 @@ public:
                          const ACE_TCHAR* name,
                          VALUETYPE& type);
 
-  /// Removes the the value <name> from <key>.  returns non zero on error
+  /// Removes the the value @a name from @a key.  returns non zero on error
   virtual int remove_value (const ACE_Configuration_Section_Key& key,
                             const ACE_TCHAR* name);
 
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index cff2d563863..f5818a14486 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -375,9 +375,9 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i
   int use_reactor = synch_options[ACE_Synch_Options::USE_REACTOR];
 
   if (use_reactor)
-    timeout = (ACE_Time_Value *) &ACE_Time_Value::zero;
+    timeout = const_cast<ACE_Time_Value *> (&ACE_Time_Value::zero);
   else
-    timeout = (ACE_Time_Value *) synch_options.time_value ();
+    timeout = const_cast<ACE_Time_Value *> (synch_options.time_value ());
 
   int result;
   if (sh_copy == 0)
@@ -403,7 +403,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i
     return this->activate_svc_handler (sh);
 
   // Delegate to connection strategy.
-  if (use_reactor && errno == EWOULDBLOCK)
+  if (use_reactor && ACE_OS::last_error () == EWOULDBLOCK)
     {
       // If the connection hasn't completed and we are using
       // non-blocking semantics then register
@@ -486,7 +486,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::cancel (SVC_HANDLER *sh)
   ACE_Event_Handler_var safe_handler (handler);
 
   NBCH *nbch =
-    ACE_dynamic_cast (NBCH *, handler);
+    dynamic_cast<NBCH *> (handler);
 
   if (nbch == 0)
     return -1;
@@ -667,7 +667,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
       ACE_Event_Handler_var safe_handler (handler);
 
       NBCH *nbch =
-        ACE_dynamic_cast (NBCH *, handler);
+        dynamic_cast<NBCH *> (handler);
 
       ACE_ASSERT (nbch != 0);
 
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 226bfd54012..1b7ecfca264 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -1074,7 +1074,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::advance (void)
   if (this->iterated_items_ < this->s_.cur_size_)
     {
       for (++this->next_;
-           ACE_static_cast(size_t, this->next_) < this->s_.max_size_;
+           static_cast<size_t> (this->next_) < this->s_.max_size_;
            ++this->next_)
       if (this->s_.search_structure_[this->next_].is_free_ == 0)
         {
@@ -1111,7 +1111,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::next_i (T *&item)
 {
   ACE_TRACE ("ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::next_i");
 
-  if (ACE_static_cast(size_t, this->next_) < this->s_.max_size_)
+  if (static_cast<size_t> (this->next_) < this->s_.max_size_)
     do
       {
         if (this->s_.search_structure_[this->next_].is_free_ == 0)
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index bdb5bee9f16..69e584a401b 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -11,7 +11,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_DEV_IO_H
 #define ACE_DEV_IO_H
 #include /**/ "ace/pre.h"
diff --git a/ace/DEV_IO.inl b/ace/DEV_IO.inl
index 309ea6c6cde..3724c7cc492 100644
--- a/ace/DEV_IO.inl
+++ b/ace/DEV_IO.inl
@@ -23,9 +23,10 @@ ACE_DEV_IO::send_n (const void *buf, size_t n) const
 // this many bytes are received.
 
 ACE_INLINE ssize_t
-ACE_DEV_IO::recv_n (void *buf, size_t n,
+ACE_DEV_IO::recv_n (void *buf, 
+                    size_t n,
                     const ACE_Time_Value *timeout,
-                    size_t *bt) const
+                    size_t *bytes_transferred) const
 {
   ACE_TRACE ("ACE_DEV_IO::recv_n");
 #if defined (ACE_WIN32)
@@ -34,14 +35,13 @@ ACE_DEV_IO::recv_n (void *buf, size_t n,
   return ACE::read_n (this->get_handle (),
                       buf,
                       n,
-                      bt);
+                      bytes_transferred);
 #else
-
   return ACE::recv_n (this->get_handle (),
                       buf,
                       n,
                       timeout,
-                      bt);
+                      bytes_transferred);
 #endif /*ACE_WIN32*/
 }
 
diff --git a/ace/DLL.cpp b/ace/DLL.cpp
index 5ea9b0510bc..0a8aeb1be66 100644
--- a/ace/DLL.cpp
+++ b/ace/DLL.cpp
@@ -14,10 +14,10 @@ ACE_RCSID(ace, DLL, "$Id$")
 // Default constructor. Also, by default, the object will be closed
 // before it is destroyed.
 
-ACE_DLL::ACE_DLL (int close_on_destruction)
+ACE_DLL::ACE_DLL (int close_handle_on_destruction)
   : open_mode_ (0),
     dll_name_ (0),
-    close_on_destruction_ (close_on_destruction),
+    close_handle_on_destruction_ (close_handle_on_destruction),
     dll_handle_ (0),
     error_ (0)
 {
@@ -25,21 +25,20 @@ ACE_DLL::ACE_DLL (int close_on_destruction)
 }
 
 ACE_DLL::ACE_DLL (const ACE_DLL &rhs)
+  : open_mode_ (0),
+    dll_name_ (0),
+    close_handle_on_destruction_ (0),
+    dll_handle_ (0),
+    error_ (0)
 {
   ACE_TRACE ("ACE_DLL::ACE_DLL (const ACE_DLL &)");
 
-  // Have to do this since open() calls close()...
-  this->dll_handle_ = 0;
-  this->dll_name_ = 0;
-  this->close_on_destruction_ = 1;
-  this->error_ = 0;
-
-  if (rhs.dll_name_)
-    // This will automatically up the refcount.
-    if (this->open (rhs.dll_name_,
-                    rhs.open_mode_,
-                    this->close_on_destruction_) != 0
-        && ACE::debug ())
+  if (rhs.dll_name_
+      // This will automatically up the refcount.
+      && this->open (rhs.dll_name_,
+                     rhs.open_mode_,
+                     rhs.close_handle_on_destruction_) != 0
+      && ACE::debug ())
       ACE_ERROR ((LM_ERROR,
                   ACE_LIB_TEXT ("ACE_DLL::copy_ctor: error: %s\n"),
                   this->error ()));
@@ -50,16 +49,16 @@ ACE_DLL::ACE_DLL (const ACE_DLL &rhs)
 
 ACE_DLL::ACE_DLL (const ACE_TCHAR *dll_name,
                   int open_mode,
-                  int close_on_destruction)
+                  int close_handle_on_destruction)
   : open_mode_ (open_mode),
     dll_name_ (0),
-    close_on_destruction_ (close_on_destruction),
+    close_handle_on_destruction_ (close_handle_on_destruction),
     dll_handle_ (0),
     error_ (0)
 {
   ACE_TRACE ("ACE_DLL::ACE_DLL");
 
-  if (this->open (dll_name, this->open_mode_, close_on_destruction) != 0
+  if (this->open (dll_name, this->open_mode_, close_handle_on_destruction) != 0
       && ACE::debug ())
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE_DLL::open: error calling open: %s\n"),
@@ -67,8 +66,8 @@ ACE_DLL::ACE_DLL (const ACE_TCHAR *dll_name,
 }
 
 // The library is closed before the class gets destroyed depending on
-// the close_on_destruction value specified which is stored in
-// close_on_destruction_.
+// the close_handle_on_destruction value specified which is stored in
+// close_handle_on_destruction_.
 
 ACE_DLL::~ACE_DLL (void)
 {
@@ -91,17 +90,17 @@ ACE_DLL::~ACE_DLL (void)
 int
 ACE_DLL::open (const ACE_TCHAR *dll_filename,
                int open_mode,
-               int close_on_destruction)
+               int close_handle_on_destruction)
 {
   ACE_TRACE ("ACE_DLL::open");
 
-  return open_i (dll_filename, open_mode, close_on_destruction);
+  return open_i (dll_filename, open_mode, close_handle_on_destruction);
 }
 
 int
 ACE_DLL::open_i (const ACE_TCHAR *dll_filename,
                  int open_mode,
-                 int close_on_destruction,
+                 int close_handle_on_destruction,
                  ACE_SHLIB_HANDLE handle)
 {
   ACE_TRACE ("ACE_DLL::open_i");
@@ -112,9 +111,9 @@ ACE_DLL::open_i (const ACE_TCHAR *dll_filename,
     {
       if (ACE::debug ())
         ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT ("ACE_DLL::open_i: dll_name: %s\n"),
-                    this->dll_name_));
-
+                    ACE_LIB_TEXT ("ACE_DLL::open_i: dll_name is %s\n"),
+                    this->dll_name_ == 0 ? ACE_LIB_TEXT ("(null)")
+                                         : this->dll_name_));
       return -1;
     }
 
@@ -126,12 +125,12 @@ ACE_DLL::open_i (const ACE_TCHAR *dll_filename,
       else
         this->close ();
     }
+
   if (!this->dll_name_)
-    {
-      this->dll_name_ = ACE::strnew (dll_filename);
-    }
+    this->dll_name_ = ACE::strnew (dll_filename);
+
   this->open_mode_ = open_mode;
-  this->close_on_destruction_ = close_on_destruction;
+  this->close_handle_on_destruction_ = close_handle_on_destruction;
 
   this->dll_handle_ = ACE_DLL_Manager::instance()->open_dll (this->dll_name_,
                                                              this->open_mode_,
@@ -162,24 +161,31 @@ ACE_DLL::symbol (const ACE_TCHAR *sym_name, int ignore_errors)
   return sym;
 }
 
-// The library is closed using the ACE_SHLIB_HANDLE obejct.  i.e. The
+// The library is closed using the ACE_SHLIB_HANDLE obejct, i.e., the
 // shared object is now disassociated form the current process.
 
 int
 ACE_DLL::close (void)
 {
   ACE_TRACE ("ACE_DLL::close");
+
+  // Guard against multiple calls to close(), e.g., one explicitly and
+  // one from the destructor.
+  if (dll_handle_ == 0)
+    return 0;
+
   int retval = 0;
 
-  if (this->close_on_destruction_ && this->dll_name_ &&
-      (retval = ACE_DLL_Manager::instance ()->close_dll (this->dll_name_)) != 0)
+  if (this->close_handle_on_destruction_
+      && this->dll_name_
+      && (retval = ACE_DLL_Manager::instance ()->close_dll (this->dll_name_)) != 0)
     this->error_ = 1;
 
   // Even if close_dll() failed, go ahead and cleanup.
   this->dll_handle_ = 0;
-  delete[] this->dll_name_;
+  delete [] this->dll_name_;
   this->dll_name_ = 0;
-  this->close_on_destruction_ = 0;
+  this->close_handle_on_destruction_ = 0;
 
   return retval;
 }
@@ -219,7 +225,7 @@ ACE_DLL::get_handle (int become_owner) const
 
 int
 ACE_DLL::set_handle (ACE_SHLIB_HANDLE handle,
-                     int close_on_destruction)
+                     int close_handle_on_destruction)
 {
   ACE_TRACE ("ACE_DLL::set_handle");
 
@@ -228,5 +234,5 @@ ACE_DLL::set_handle (ACE_SHLIB_HANDLE handle,
   ACE_TCHAR temp[ACE_UNIQUE_NAME_LEN];
   ACE_OS::unique_name (this, temp, ACE_UNIQUE_NAME_LEN);
 
-  return this->open_i (temp, 1, close_on_destruction, handle);
+  return this->open_i (temp, 1, close_handle_on_destruction, handle);
 }
diff --git a/ace/DLL.h b/ace/DLL.h
index b596067e968..3554b558542 100644
--- a/ace/DLL.h
+++ b/ace/DLL.h
@@ -45,7 +45,7 @@ public:
 
   /// Default constructor.  By default, the close() operation on the
   /// object will be invoked before it is destroyed.
-  explicit ACE_DLL (int close_on_destruction = 1);
+  explicit ACE_DLL (int close_handle_on_destruction = 1);
 
   /**
    * This constructor opens and dynamically links @a dll_name.  The
@@ -58,7 +58,7 @@ public:
    */
   explicit ACE_DLL (const ACE_TCHAR *dll_name,
                     int open_mode = ACE_DEFAULT_SHLIB_MODE,
-           int close_on_destruction = 1);
+                    int close_handle_on_destruction = 1);
 
   /// Copy constructor.
   ACE_DLL (const ACE_DLL &);
@@ -73,20 +73,20 @@ public:
    * processing of any other DLLs.
    * @param dll_name The name of the dll.
    * @param open_mode How the dll is opened.
-   * @param close_on_destruction Close the handle in the destructor.
+   * @param close_handle_on_destruction Close the handle when object is destroyed.
    * @retval -1 On failure
    * @retval 0 On success.
    */
   int open (const ACE_TCHAR *dll_name,
             int open_mode = ACE_DEFAULT_SHLIB_MODE,
-            int close_on_destruction = 1);
+            int close_handle_on_destruction = 1);
 
   /// Call to close the DLL object.
   int close (void);
 
   /**
    * Called when the DLL object is destroyed -- invokes close() if the
-   * <close_on_destruction> flag is set in the constructor or open()
+   * <close_handle_on_destruction> flag is set in the constructor or open()
    * method.
    */
   ~ACE_DLL (void);
@@ -107,19 +107,20 @@ public:
    * Return the handle to the caller.  If @a become_owner is non-0 then
    * caller assumes ownership of the handle and the ACE_DLL object
    * won't call close() when it goes out of scope, even if
-   * <close_on_destruction> is set.
+   * <close_handle_on_destruction> is set.
    */
   ACE_SHLIB_HANDLE get_handle (int become_owner = 0) const;
 
   /// Set the handle for the DLL object. By default, the close()
   //operation on / the object will be invoked before it is destroyed.
-  int set_handle (ACE_SHLIB_HANDLE handle, int close_on_destruction = 1);
+  int set_handle (ACE_SHLIB_HANDLE handle, 
+                  int close_handle_on_destruction = 1);
 
 private:
 
   int open_i (const ACE_TCHAR *dll_name,
               int open_mode = ACE_DEFAULT_SHLIB_MODE,
-              int close_on_destruction = 1,
+              int close_handle_on_destruction = 1,
               ACE_SHLIB_HANDLE handle = 0);
 
 
@@ -132,8 +133,8 @@ private:
   ACE_TCHAR *dll_name_;
 
   /// This flag keeps track of whether we should close the handle
-  /// automatically when the destructor runs.
-  int close_on_destruction_;
+  /// automatically when the object is destroyed.
+  int close_handle_on_destruction_;
 
   ACE_DLL_Handle *dll_handle_;
 
diff --git a/ace/DLL_Manager.cpp b/ace/DLL_Manager.cpp
index 8d1e75c6660..c5f81f9ade4 100644
--- a/ace/DLL_Manager.cpp
+++ b/ace/DLL_Manager.cpp
@@ -126,6 +126,12 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
           ACE_TString *name = 0;
           while (name_iter.next (name))
             {
+              if (ACE::debug ())
+                ACE_DEBUG ((LM_DEBUG,
+                            ACE_LIB_TEXT ("ACE_DLL_Handle::open: Trying to open DLL %s with %s name\n"),
+                            this->dll_name_,
+                            name->c_str ()));
+              
               // The ACE_SHLIB_HANDLE object is obtained.
               this->handle_ = ACE_OS::dlopen (name->c_str (),
                                               open_mode);
diff --git a/ace/Default_Constants.h b/ace/Default_Constants.h
index b483d4152c2..780fbdecdbe 100644
--- a/ace/Default_Constants.h
+++ b/ace/Default_Constants.h
@@ -112,7 +112,7 @@
 # endif /* ACE_DEFAULT_MAX_SOCKET_BUFSIZ */
 
 # if !defined (ACE_DEFAULT_SERVER_PORT_STR)
-#   define ACE_DEFAULT_SERVER_PORT_STR "20002"
+#   define ACE_DEFAULT_SERVER_PORT_STR ACE_LIB_TEXT("20002")
 # endif /* ACE_DEFAULT_SERVER_PORT_STR */
 
 // Used for the Service_Directory test
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index f0bf6b15a1b..b8d8eb3530d 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/ace/Dev_Poll_Reactor.cpp
@@ -9,23 +9,19 @@ ACE_RCSID (ace,
 
 #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
 
-#  if defined (ACE_HAS_EVENT_POLL) && defined (linux)
-
-#    include "ace/OS_NS_unistd.h"
-#    include "ace/OS_NS_fcntl.h"
-
-#    include /**/ <sys/epoll.h>
-
-#  elif defined (ACE_HAS_DEV_POLL)
+# include "ace/OS_NS_unistd.h"
+# include "ace/OS_NS_fcntl.h"
+# include "ace/OS_NS_stropts.h"
 
+# if defined (ACE_HAS_EVENT_POLL) && defined (linux)
+#  include /**/ <sys/epoll.h>
+# elif defined (ACE_HAS_DEV_POLL)
 #    if defined (sun)
 #      include /**/ <sys/devpoll.h>
 #    elif defined (linux)
 #      include /**/ <linux/devpoll.h>
 #    endif  /* sun */
-
-#  endif  /* ACE_HAS_DEV_POLL */
-
+# endif  /* ACE_HAS_DEV_POLL */
 
 #if !defined (__ACE_INLINE__)
 # include "ace/Dev_Poll_Reactor.inl"
@@ -64,7 +60,7 @@ ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r,
 
   if (disable_notify_pipe == 0)
     {
-      this->dp_reactor_ = ACE_dynamic_cast (ACE_Dev_Poll_Reactor *, r);
+      this->dp_reactor_ = dynamic_cast<ACE_Dev_Poll_Reactor *> (r);
 
       if (this->dp_reactor_ == 0)
         {
@@ -133,7 +129,7 @@ ACE_Dev_Poll_Reactor_Notify::close (void)
   return this->notification_pipe_.close ();
 }
 
-ssize_t
+int
 ACE_Dev_Poll_Reactor_Notify::notify (ACE_Event_Handler *eh,
                                      ACE_Reactor_Mask mask,
                                      ACE_Time_Value *timeout)
@@ -185,11 +181,13 @@ ACE_Dev_Poll_Reactor_Notify::notify (ACE_Event_Handler *eh,
   ACE_ASSERT (temp != 0);
   *temp = buffer;
 
+  ACE_Dev_Poll_Handler_Guard eh_guard (eh);
+
   if (notify_queue_.enqueue_tail (temp) == -1)
     return -1;
 
-  // Let us send a notify for every message
-  // if (notification_required)
+  // Now pop the pipe to force the callback for dispatching when ready.
+  // @todo - this only needs to write one byte for ACE_HAS_NOTIFICATION_QUEUE.
   ssize_t n = ACE::send (this->notification_pipe_.write_handle (),
                          (char *) &buffer,
                          sizeof buffer,
@@ -197,10 +195,17 @@ ACE_Dev_Poll_Reactor_Notify::notify (ACE_Event_Handler *eh,
   if (n == -1)
     return -1;
 
+  // Since the notify is queued (and maybe already delivered by now)
+  // we can simply release the guard. The dispatch of this notification
+  // will decrement the reference count.
+  eh_guard.release ();
+
   return 0;
 #else
   ACE_Notification_Buffer buffer (eh, mask);
 
+  ACE_Dev_Poll_Handler_Guard eh_guard (eh);
+
   ssize_t n = ACE::send (this->notification_pipe_.write_handle (),
                          (char *) &buffer,
                          sizeof buffer,
@@ -208,6 +213,8 @@ ACE_Dev_Poll_Reactor_Notify::notify (ACE_Event_Handler *eh,
   if (n == -1)
     return -1;
 
+  eh_guard.release ();
+
   return 0;
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 }
@@ -387,6 +394,7 @@ ACE_Dev_Poll_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
                          ACE_LIB_TEXT ("enqueue_head")),
                         -1);
   }
+#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
   // If eh == 0 then another thread is unblocking the
   // ACE_Dev_Poll_Reactor to update the ACE_Dev_Poll_Reactor's
@@ -395,6 +403,10 @@ ACE_Dev_Poll_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
   // pointer we've been passed.
   if (buffer.eh_ != 0)
     {
+      // Guard the handler's refcount. Recall that when the notify
+      // was queued, the refcount was incremented, so it need not be
+      // now. The guard insures that it is decremented properly.
+      ACE_Dev_Poll_Handler_Guard eh_guard (buffer.eh_, false);
 
       switch (buffer.mask_)
         {
@@ -418,44 +430,6 @@ ACE_Dev_Poll_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
         buffer.eh_->handle_close (ACE_INVALID_HANDLE,
                                   ACE_Event_Handler::EXCEPT_MASK);
     }
-#else
-  // If eh == 0 then another thread is unblocking the
-  // ACE_Dev_Poll_Reactor to update the ACE_Dev_Poll_Reactor's
-  // internal structures.  Otherwise, we need to dispatch the
-  // appropriate handle_* method on the ACE_Event_Handler
-  // pointer we've been passed.
-  if (buffer.eh_ != 0)
-    {
-      switch (buffer.mask_)
-        {
-        case ACE_Event_Handler::READ_MASK:
-        case ACE_Event_Handler::ACCEPT_MASK:
-          result = buffer.eh_->handle_input (ACE_INVALID_HANDLE);
-          break;
-        case ACE_Event_Handler::WRITE_MASK:
-          result = buffer.eh_->handle_output (ACE_INVALID_HANDLE);
-          break;
-        case ACE_Event_Handler::EXCEPT_MASK:
-          result = buffer.eh_->handle_exception (ACE_INVALID_HANDLE);
-          break;
-        case ACE_Event_Handler::QOS_MASK:
-          result = buffer.eh_->handle_qos (ACE_INVALID_HANDLE);
-          break;
-        case ACE_Event_Handler::GROUP_QOS_MASK:
-          result = buffer.eh_->handle_group_qos (ACE_INVALID_HANDLE);
-          break;
-        default:
-          // Should we bail out if we get an invalid mask?
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("invalid mask = %d\n"),
-                      buffer.mask_));
-        }
-      if (result == -1)
-        buffer.eh_->handle_close (ACE_INVALID_HANDLE,
-                                  ACE_Event_Handler::EXCEPT_MASK);
-    }
-
-#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
   return 1;
 }
@@ -1193,7 +1167,21 @@ ACE_Dev_Poll_Reactor::handle_events_i (ACE_Time_Value *max_wait_time)
   if (result == 0 || (result == -1 && errno == ETIME))
     return 0;
   else if (result == -1)
-    return -1;
+    {
+      if (errno != EINTR)
+        return -1;
+
+      // Bail out -- we got here since the poll was interrupted.
+      // If it was due to a signal registered through our ACE_Sig_Handler,
+      // then it was dispatched, so we count it in the number of events
+      // handled rather than cause an error return.
+      if (ACE_Sig_Handler::sig_pending () != 0)
+        {
+          ACE_Sig_Handler::sig_pending (0);
+          return 1;
+        }
+      return -1;
+    }
 
   // Dispatch the events, if any.
   return this->dispatch ();
@@ -1230,45 +1218,15 @@ ACE_Dev_Poll_Reactor::dispatch (void)
 
       // Perform the Template Method for dispatching all the handlers.
 
-      // First check for interrupts.
-      if (0 /* active_handle_count == -1 */)
-        {
-          // Bail out -- we got here since the poll (i.e. ioctl()) was
-          // interrupted.
-          if (ACE_Sig_Handler::sig_pending () != 0)
-            {
-              ACE_Sig_Handler::sig_pending (0);
-
-#if 0
-              // If any HANDLES in the <ready_set_> are activated as a
-              // result of signals they should be dispatched since
-              // they may be time critical...
-              pfds = this->ready_set_.pfds;
-              active_handle_count = this->ready_set_.nfds;
-#endif  /* 0 */
-
-              // Record the fact that the Reactor has dispatched a
-              // handle_signal() method.  We need this to return the
-              // appropriate count below.
-              signal_occurred = 1;
-            }
-          else
-            return -1;
-        }
-
       // Handle timers early since they may have higher latency
       // constraints than I/O handlers.  Ideally, the order of
       // dispatching should be a strategy...
-      else if (this->dispatch_timer_handlers (other_handlers_dispatched) == -1)
+      if (this->dispatch_timer_handlers (other_handlers_dispatched) == -1)
         // State has changed or timer queue has failed, exit loop.
         break;
 
       // Check to see if there are no more I/O handles left to
       // dispatch AFTER we've handled the timers.
-      else if (0 /* active_handle_count == 0 */)
-        return io_handlers_dispatched
-          + other_handlers_dispatched
-          + signal_occurred;
 
 #if 0
       // Next dispatch the notification handlers (if there are any to
@@ -1390,7 +1348,11 @@ ACE_Dev_Poll_Reactor::dispatch_io_events (int &io_handlers_dispatched)
 
       {
         // Modify the reference count in an exception-safe way.
-        ACE_Dev_Poll_Handler_Guard (this->handler_rep_, handle);
+        // Note that eh could be the notify handler. It's not strictly
+        // necessary to manage its refcount, but since we don't enable
+        // the counting policy, it won't do much. Management of the
+        // notified handlers themselves is done in the notify handler.
+        ACE_Dev_Poll_Handler_Guard eh_guard (eh);
 
         // Release the lock during the upcall.
         ACE_Reverse_Lock<ACE_SYNCH_MUTEX> reverse_lock (this->lock_);
@@ -1406,6 +1368,8 @@ ACE_Dev_Poll_Reactor::dispatch_io_events (int &io_handlers_dispatched)
         if (ACE_BIT_ENABLED (revents, POLLOUT))
 #endif /* ACE_HAS_EVENT_POLL */
           {
+            ++io_handlers_dispatched;
+
             const int status =
               this->upcall (eh, &ACE_Event_Handler::handle_output, handle);
 
@@ -1416,8 +1380,6 @@ ACE_Dev_Poll_Reactor::dispatch_io_events (int &io_handlers_dispatched)
                 return this->remove_handler (handle,
                                              ACE_Event_Handler::WRITE_MASK);
               }
-
-            ++io_handlers_dispatched;
           }
 
         // Dispatch all "high priority" (e.g. out-of-band data) events.
@@ -1427,6 +1389,8 @@ ACE_Dev_Poll_Reactor::dispatch_io_events (int &io_handlers_dispatched)
         if (ACE_BIT_ENABLED (revents, POLLPRI))
 #endif /* ACE_HAS_EVENT_POLL */
           {
+            ++io_handlers_dispatched;
+
             const int status =
               this->upcall (eh, &ACE_Event_Handler::handle_exception, handle);
 
@@ -1437,8 +1401,6 @@ ACE_Dev_Poll_Reactor::dispatch_io_events (int &io_handlers_dispatched)
                 return this->remove_handler (handle,
                                              ACE_Event_Handler::EXCEPT_MASK);
               }
-
-            ++io_handlers_dispatched;
           }
 
         // Dispatch all input events.
@@ -1448,6 +1410,8 @@ ACE_Dev_Poll_Reactor::dispatch_io_events (int &io_handlers_dispatched)
         if (ACE_BIT_ENABLED (revents, POLLIN))
 #endif /* ACE_HAS_EVENT_POLL */
           {
+            ++io_handlers_dispatched;
+
             const int status =
               this->upcall (eh, &ACE_Event_Handler::handle_input, handle);
 
@@ -1458,8 +1422,6 @@ ACE_Dev_Poll_Reactor::dispatch_io_events (int &io_handlers_dispatched)
                 return this->remove_handler (handle,
                                              ACE_Event_Handler::READ_MASK);
               }
-
-            ++io_handlers_dispatched;
           }
       } // The reactor lock is reacquired upon leaving this scope.
     }
@@ -1668,7 +1630,7 @@ ACE_Dev_Poll_Reactor::register_handler (const ACE_Sig_Set &sigset,
 #if (ACE_NSIG > 0)  &&  !defined (CHORUS)
 
   for (int s = 1; s < ACE_NSIG; ++s)
-    if (sigset.is_member (s)
+    if ((sigset.is_member (s) == 1)
         && this->signal_handler_->register_handler (s,
                                                     new_sh,
                                                     new_disp) == -1)
@@ -1727,7 +1689,16 @@ ACE_Dev_Poll_Reactor::remove_handler_i (ACE_HANDLE handle,
     return -1;
 
   if (ACE_BIT_DISABLED (mask, ACE_Event_Handler::DONT_CALL))
-    (void) eh->handle_close (handle, mask);
+    {
+      // Release the lock during the "close" upcall.
+      ACE_Reverse_Lock<ACE_SYNCH_MUTEX> reverse_lock (this->lock_);
+      ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_MUTEX>,
+                        reverse_guard,
+                        reverse_lock,
+                        -1);
+
+      (void) eh->handle_close (handle, mask);
+    }
 
   // Note the fact that we've changed the state of the wait_set,
   // i.e. the "interest set," which is used by the dispatching loop to
@@ -1786,7 +1757,7 @@ ACE_Dev_Poll_Reactor::remove_handler (const ACE_Sig_Set &sigset)
 #if (ACE_NSIG > 0)  &&  !defined (CHORUS)
 
   for (int s = 1; s < ACE_NSIG; ++s)
-    if (sigset.is_member (s)
+    if ((sigset.is_member (s) == 1)
         && this->signal_handler_->remove_handler (s) == -1)
       result = -1;
 
@@ -2254,13 +2225,11 @@ ACE_Dev_Poll_Reactor::wakeup_all_threads (void)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::wakeup_all_threads");
 
-#if 0
   // Send a notification, but don't block if there's no one to receive
   // it.
   this->notify (0,
                 ACE_Event_Handler::NULL_MASK,
                 (ACE_Time_Value *) &ACE_Time_Value::zero);
-#endif  /* 0 */
 }
 
 int
diff --git a/ace/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h
index a35a087d6a1..9d722650351 100644
--- a/ace/Dev_Poll_Reactor.h
+++ b/ace/Dev_Poll_Reactor.h
@@ -29,6 +29,8 @@
 // The sys_epoll interface was introduced in Linux kernel 2.5.45.
 // Don't support backported versions since they appear to be buggy.
 // The obsolete ioctl()-based interface is no longer supported.
+#if 0
+// linux/version.h may not be accurate. It's not for Fedora Core 2...
 # include /**/ <linux/version.h>
 # if LINUX_VERSION_CODE < KERNEL_VERSION (2,5,45)
 #   undef ACE_HAS_EVENT_POLL
@@ -36,6 +38,7 @@
 #   error Linux kernel 2.5.45 or better is required.
 # endif  /* LINUX_VERSION_CODE < KERNEL_VERSION (2,5,45) */
 #endif  /* ACE_HAS_EVENT_POLL */
+#endif
 
 #if defined (ACE_HAS_EVENT_POLL) && defined (ACE_HAS_DEV_POLL)
 #  error ACE_HAS_EVENT_POLL and ACE_HAS_DEV_POLL are mutually exclusive.
@@ -55,7 +58,9 @@
 class ACE_Sig_Handler;
 class ACE_Dev_Poll_Reactor;
 
+#if defined (ACE_HAS_DEV_POLL)
 struct pollfd;
+#endif
 
 /**
  * @class ACE_Dev_Poll_Event_Tuple
@@ -91,23 +96,6 @@ public:
 
   /// Flag that states whether or not the event handler is suspended.
   char suspended;
-
-  /// The number of outstanding upcalls occurring on the above event
-  /// handler.
-  /**
-   * @todo The reference count should really be maintained within the
-   *       event handler.  This approach was taken to allow for
-   *       backward compatibility and quick implementation.  One
-   *       approach for maintaining backward compatibility while
-   *       implementing reference counting within the event handler is
-   *       to create an ACE_Ref_Counted_Event_Handler "mix-in" class
-   *       that concrete ACE_Event_Handlers can inherit from
-   *       (i.e. multiple inheritance).  Thus, legacy non-reference
-   *       counted event handlers need not pay for reference counting
-   *       resources.
-   */
-  unsigned long refcount;
-
 };
 
 // ---------------------------------------------------------------------
@@ -188,17 +176,17 @@ public:
 
   /**
    * Called by a thread when it wants to unblock the Reactor_Impl.
-   * This wakeups the Reactor_Impl if currently blocked.  Pass over
-   * both the Event_Handler *and* the mask to allow the caller to
+   * This wakes up the Reactor_Impl if currently blocked.  Pass over
+   * both the Event_Handler and the mask to allow the caller to
    * dictate which Event_Handler method the Reactor_Impl will
-   * invoke.  The ACE_Time_Value indicates how long to blocking
+   * invoke.  The ACE_Time_Value indicates how long to block
    * trying to notify the Reactor_Impl.  If timeout == 0, the
    * caller will block until action is possible, else will wait until
    * the relative time specified in *timeout elapses).
    */
-  virtual ssize_t notify (ACE_Event_Handler * = 0,
-                          ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK,
-                          ACE_Time_Value * = 0);
+  virtual int notify (ACE_Event_Handler *eh = 0,
+                      ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK,
+                      ACE_Time_Value *timeout = 0);
 
   /// Unimplemented method required by pure virtual method in abstract
   /// base class.
@@ -215,16 +203,15 @@ public:
   /// the Reactor_Impl.
   virtual ACE_HANDLE notify_handle (void);
 
-  /// Verify whether the buffer has dispatchable info  or not.
+  /// Verify whether the buffer has dispatchable info or not.
   virtual int is_dispatchable (ACE_Notification_Buffer &buffer);
 
-  /// Handle one of the notify call on the handle.  This could be
+  /// Handle one notify call represented in @a buffer.  This could be
   /// because of a thread trying to unblock the Reactor_Impl.
   virtual int dispatch_notify (ACE_Notification_Buffer &buffer);
 
-  /// Read one of the notify call on the handle into the
-  /// buffer. This could be because of a thread trying to unblock
-  /// the Reactor_Impl.
+  /// Read one notify call on the handle into @a buffer.
+  /// This could be because of a thread trying to unblock the Reactor_Impl.
   virtual int read_notify_pipe (ACE_HANDLE handle,
                                 ACE_Notification_Buffer &buffer);
 
@@ -392,21 +379,6 @@ public:
   /// Remove all the (@c ACE_HANDLE, @c ACE_Event_Handler) tuples.
   int unbind_all (void);
 
-  /// Increase the reference count on the event handler corresponding
-  /// to the given file descriptor.
-  /**
-   * @return Returns the updated reference count.
-   */
-  unsigned long add_ref (ACE_HANDLE handle);
-
-  /// Decrease the reference count on the event handler corresponding
-  /// to the given file descriptor.
-  /**
-   * @return Returns the updated reference count.
-   */
-  unsigned long remove_ref (ACE_HANDLE handle);
-  //@}
-
   /**
    * @name Sanity Checking
    *
@@ -499,7 +471,7 @@ public:
                         ACE_Reactor_Notify *notify = 0,
                         int mask_signals = 1);
 
-  /// Initialize ACE_Dev_Poll_Reactor with size "@a size."
+  /// Initialize ACE_Dev_Poll_Reactor with size @a size.
   /**
    * @note On Unix platforms, the @a size parameter should be as large
    *       as the maximum number of file descriptors allowed for a
@@ -759,9 +731,11 @@ public:
    * @see reset_timer_interval()
    *
    * @param event_handler  event handler to schedule on reactor
-   * @param arg   argument passed to the handle_timeout() method of  event_handler
-   * @param delay  time interval after which the timer will expire
-   * @param interval  time interval after which the timer will be automatically rescheduled
+   * @param arg   argument passed to the handle_timeout() method of
+   *              event_handler.
+   * @param delay  time interval after which the timer will expire.
+   * @param interval  time interval for which the timer will be
+   *                  automatically rescheduled.
    * @return -1 on failure, a timer_id value on success
    */
   virtual long schedule_timer (ACE_Event_Handler *event_handler,
@@ -785,19 +759,19 @@ public:
                             int dont_call_handle_close = 1);
 
   /**
-   * Cancel the single Event_Handler that matches the <timer_id> value
-   * (which was returned from the schedule method).  If arg is
+   * Cancel the single event handler that matches the @a timer_id value
+   * (which was returned from the schedule method).  If @a arg is
    * non-NULL then it will be set to point to the ``magic cookie''
-   * argument passed in when the Event_Handler was registered.  This
+   * argument passed in when the event handler was registered.  This
    * makes it possible to free up the memory and avoid memory leaks.
-   * Returns 1 if cancellation succeeded and 0 if the <timer_id>
+   * Returns 1 if cancellation succeeded and 0 if the @a timer_id
    * wasn't found.
    */
   virtual int cancel_timer (long timer_id,
                             const void **arg = 0,
                             int dont_call_handle_close = 1);
 
-  // = High-level Event_Handler scheduling operations
+  // = High-level event handler scheduling operations
 
   /// Add <masks_to_be_added> to the <event_handler>'s entry.
   /// <event_handler> must already have been registered.
@@ -1185,12 +1159,14 @@ public:
 
   /// Constructor
   /**
-   * The constructor increments the reference count on the event
-   * handler corresponding to the given handle.
+   * The constructor checks to see if @a eh is a reference-counted handler and
+   * remember that for later. If @a eh is reference counted, its reference
+   * count is incremented unless @a do_incr is false.
+   * @a do_incr should be false if the reference count was incremented
+   * independently of this guard, for example, on a notify handler since
+   * the reference count is incremented when the notify is queued.
    */
-  ACE_Dev_Poll_Handler_Guard (
-    ACE_Dev_Poll_Reactor_Handler_Repository &repository,
-    ACE_HANDLE handle);
+  ACE_Dev_Poll_Handler_Guard (ACE_Event_Handler *eh, bool do_incr = true);
 
   /// Destructor
   /**
@@ -1199,14 +1175,17 @@ public:
    */
   ~ACE_Dev_Poll_Handler_Guard (void);
 
+  /// Release the event handler from this guard; when the destructor is
+  /// called, the handler's reference count will not be decremented.
+  void release (void);
+
 private:
 
-  /// Reference to the handler repository containing the event handler
-  /// used during the upcall.
-  ACE_Dev_Poll_Reactor_Handler_Repository &repository_;
+  /// The event handler being managed.
+  ACE_Event_Handler *eh_;
 
-  /// Handle corresponding to the event being dispatched.
-  ACE_HANDLE handle_;
+  /// true if eh_ is a reference-counted handler.
+  bool refcounted_;
 
 };
 
diff --git a/ace/Dev_Poll_Reactor.inl b/ace/Dev_Poll_Reactor.inl
index 74ff5c2dc2a..4445b882b5a 100644
--- a/ace/Dev_Poll_Reactor.inl
+++ b/ace/Dev_Poll_Reactor.inl
@@ -2,12 +2,13 @@
 //
 // $Id$
 
+#include "ace/Log_Msg.h"
+
 ACE_INLINE
 ACE_Dev_Poll_Event_Tuple::ACE_Dev_Poll_Event_Tuple (void)
   : event_handler (0),
     mask (ACE_Event_Handler::NULL_MASK),
-    suspended (0),
-    refcount (1)
+    suspended (0)
 {
 }
 
@@ -91,57 +92,29 @@ ACE_Dev_Poll_Reactor_Handler_Repository::size (void) const
   return this->max_size_;
 }
 
-ACE_INLINE unsigned long
-ACE_Dev_Poll_Reactor_Handler_Repository::add_ref (ACE_HANDLE handle)
-{
-  // ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::add_ref");
-
-  // Caller provides synchronization
-
-  if (this->handle_in_range (handle))
-    return this->handlers_[handle].refcount++;
-
-  return 0;
-}
-
-ACE_INLINE unsigned long
-ACE_Dev_Poll_Reactor_Handler_Repository::remove_ref (ACE_HANDLE handle)
-{
-  // ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::remove_ref");
-
-  // Caller provides synchronization
-
-  if (this->handle_in_range (handle))
-    {
-      unsigned long & refcount = this->handlers_[handle].refcount;
-
-      ACE_ASSERT  (refcount > 0);
-
-      refcount--;
-
-      if (refcount != 0)
-        return refcount;
-
-      // Reference count dropped to zero.  Remove the event handler
-      // from the repository.
-      this->unbind (handle);
-    }
-
-  return 0;
-}
-
 // -----------------------------------------------------------------
 
 ACE_INLINE
-ACE_Dev_Poll_Handler_Guard::ACE_Dev_Poll_Handler_Guard (
-  ACE_Dev_Poll_Reactor_Handler_Repository &repository,
-  ACE_HANDLE handle)
-  : repository_ (repository),
-    handle_ (handle)
+ACE_Dev_Poll_Handler_Guard::ACE_Dev_Poll_Handler_Guard
+  (ACE_Event_Handler *eh,
+   bool do_incr)
+  : eh_ (eh),
+    refcounted_ (false)
 {
-  // Caller must provide synchronization.
+  if (eh == 0)
+    return;
+
+  this->refcounted_ =
+    eh->reference_counting_policy ().value () ==
+    ACE_Event_Handler::Reference_Counting_Policy::ENABLED;
 
-  (void) repository.add_ref (handle);
+  if (do_incr && this->refcounted_)
+    eh->add_reference ();
+
+  /**
+   * The below comments were here when I replaced the old refcount
+   * scheme was replaced. They may still need addressing.   -Steve Huston
+   */
 
   /**
    * @todo Suspend the handler so that other threads will not cause
@@ -169,16 +142,25 @@ ACE_Dev_Poll_Handler_Guard::ACE_Dev_Poll_Handler_Guard (
 ACE_INLINE
 ACE_Dev_Poll_Handler_Guard::~ACE_Dev_Poll_Handler_Guard (void)
 {
-  // Caller must provide synchronization.
-
-  (void) this->repository_.remove_ref (this->handle_);
+  if (this->refcounted_ && this->eh_ != 0)
+    this->eh_->remove_reference ();
 
   /**
+   * The below comments were here when I replaced the old refcount
+   * scheme was replaced. They may still need addressing.   -Steve Huston
+   */
+  /**
    * @todo Resume the handler so that other threads will be allowed to
    *       dispatch the handler.
    */
 }
 
+ACE_INLINE void
+ACE_Dev_Poll_Handler_Guard::release (void)
+{
+  this->eh_ = 0;
+}
+
 // ---------------------------------------------------------------------
 
 ACE_INLINE int
diff --git a/ace/Dirent.cpp b/ace/Dirent.cpp
index a819b0b33a1..50aab1ac5f3 100644
--- a/ace/Dirent.cpp
+++ b/ace/Dirent.cpp
@@ -4,8 +4,4 @@
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Dirent.inl"
-#else
-#if defined (__hpux) && !defined (__GNUG__)
-static int shut_up_aCC = 0;
-#endif /* HPUX && !g++ */
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Dump.cpp b/ace/Dump.cpp
index e0f98640593..380be07f857 100644
--- a/ace/Dump.cpp
+++ b/ace/Dump.cpp
@@ -40,8 +40,8 @@ ACE_Dumpable_Ptr::operator= (const ACE_Dumpable *dumper) const
   ACE_TRACE ("ACE_Dumpable_Ptr::operator=");
   if (this->dumper_ != dumper)
     {
-      delete (ACE_Dumpable *) this->dumper_;
-      ((ACE_Dumpable_Ptr *) this)->dumper_ = dumper;
+      delete const_cast <ACE_Dumpable *> (this->dumper_);
+      (const_cast<ACE_Dumpable_Ptr *> (this))->dumper_ = dumper;
     }
 }
 
diff --git a/ace/Dynamic_Service.cpp b/ace/Dynamic_Service.cpp
index 404916d4528..9178889675c 100644
--- a/ace/Dynamic_Service.cpp
+++ b/ace/Dynamic_Service.cpp
@@ -21,7 +21,7 @@ ACE_Dynamic_Service<TYPE>::instance (const ACE_TCHAR *name)
 {
   ACE_Service_Object *svc_obj =
     static_cast<ACE_Service_Object *> (ACE_Dynamic_Service_Base::instance (name));
-  return ACE_dynamic_cast (TYPE *, svc_obj);
+  return dynamic_cast<TYPE *> (svc_obj);
 }
 
 ACE_RCSID(ace, Dynamic_Service, "$Id$")
diff --git a/ace/Dynamic_Service_Base.h b/ace/Dynamic_Service_Base.h
index 46a470ca805..2b80085f0e7 100644
--- a/ace/Dynamic_Service_Base.h
+++ b/ace/Dynamic_Service_Base.h
@@ -38,7 +38,7 @@ public:
   void dump (void) const;
 
 protected:
-  /// Return instance using <name> to search the Service_Repository.
+  /// Return instance using @a name to search the Service_Repository.
   static void* instance (const ACE_TCHAR *name);
 };
 
diff --git a/ace/Event.cpp b/ace/Event.cpp
index 06c14937acd..fde6f78840c 100644
--- a/ace/Event.cpp
+++ b/ace/Event.cpp
@@ -55,7 +55,7 @@ int
 ACE_Event::wait (const ACE_Time_Value *abstime, int use_absolute_time)
 {
   return ACE_OS::event_timedwait (&this->handle_,
-                                  (ACE_Time_Value *) abstime,
+                                  const_cast <ACE_Time_Value *> (abstime),
                                   use_absolute_time);
 }
 
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index 5db15c15e41..5ea84a6c9a3 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -249,7 +249,7 @@ ACE_Event_Handler::reference_counting_policy (void)
 ACE_THR_FUNC_RETURN
 ACE_Event_Handler::read_adapter (void *args)
 {
-  ACE_Event_Handler *this_ptr = (ACE_Event_Handler *) args;
+  ACE_Event_Handler *this_ptr = static_cast<ACE_Event_Handler *> (args);
 
   ACE_HANDLE handle = this_ptr->get_handle ();
   if (handle == ACE_INVALID_HANDLE)
@@ -275,7 +275,7 @@ ACE_Event_Handler::register_stdin_handler (ACE_Event_Handler *eh,
   ACE_UNUSED_ARG (reactor);
 
   eh->reactor (reactor);
-  return thr_mgr->spawn (&read_adapter, (void *) eh, flags);
+  return thr_mgr->spawn (&read_adapter, static_cast<void *> (eh), flags);
 #else
   // Keep compilers happy.
   ACE_UNUSED_ARG (flags);
diff --git a/ace/FILE.cpp b/ace/FILE.cpp
index 2f15a3135b1..de7c294cc6e 100644
--- a/ace/FILE.cpp
+++ b/ace/FILE.cpp
@@ -108,7 +108,7 @@ ACE_FILE::get_local_addr (ACE_Addr &addr) const
   // Perform the downcast since <addr> had better be an
   // <ACE_FILE_Addr>.
   ACE_FILE_Addr *file_addr =
-    ACE_dynamic_cast (ACE_FILE_Addr *, &addr);
+    dynamic_cast<ACE_FILE_Addr *> (&addr);
 
   if (file_addr == 0)
     return -1;
diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp
index 8d3ded1a4b6..ace8bc594a4 100644
--- a/ace/Filecache.cpp
+++ b/ace/Filecache.cpp
@@ -10,7 +10,9 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
-ACE_RCSID(ace, Filecache, "$Id$")
+ACE_RCSID (ace,
+           Filecache,
+           "$Id$")
 
 #if defined (ACE_WIN32)
 // Specifies no sharing flags.
@@ -111,7 +113,7 @@ ACE_Filecache_Handle::handle (void) const
   if (this->handle_ == ACE_INVALID_HANDLE && this->file_ != 0)
     {
       ACE_Filecache_Handle *mutable_this =
-        (ACE_Filecache_Handle *) this;
+        const_cast<ACE_Filecache_Handle *> (this);
       mutable_this->handle_ = ACE_OS::dup (this->file_->handle ());
     }
   return this->handle_;
@@ -139,26 +141,27 @@ ACE_Filecache_Handle::size (void) const
 // ACE_Filecache_Hash
 // ------------------
 
-#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-
 #define ACE_Filecache_Hash \
         ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
 #define ACE_Filecache_Hash_Entry \
         ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *>
 
-ACE_TEMPLATE_SPECIALIZATION
-ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (const ACE_TCHAR *const &ext_id,
-                                              ACE_Filecache_Object *const &int_id,
-                                              ACE_Filecache_Hash_Entry *next,
-                                              ACE_Filecache_Hash_Entry *prev)
-  : ext_id_ (ext_id ? ACE_OS::strdup (ext_id) : ACE_OS::strdup (ACE_LIB_TEXT (""))),
+template <>
+ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (
+  const ACE_TCHAR *const &ext_id,
+  ACE_Filecache_Object *const &int_id,
+  ACE_Filecache_Hash_Entry *next,
+  ACE_Filecache_Hash_Entry *prev)
+  : ext_id_ (ext_id
+             ? ACE_OS::strdup (ext_id)
+             : ACE_OS::strdup (ACE_LIB_TEXT (""))),
     int_id_ (int_id),
     next_ (next),
     prev_ (prev)
 {
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template <>
 ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next,
                                               ACE_Filecache_Hash_Entry *prev)
   : ext_id_ (0),
@@ -167,7 +170,7 @@ ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next,
 {
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template <>
 ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void)
 {
   ACE_OS::free ((void *) ext_id_);
@@ -176,16 +179,17 @@ ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void)
 // We need these template specializations since KEY is defined as a
 // ACE_TCHAR*, which doesn't have a hash() or equal() method defined on it.
 
-ACE_TEMPLATE_SPECIALIZATION
+template <>
 unsigned long
 ACE_Filecache_Hash::hash (const ACE_TCHAR *const &ext_id)
 {
   return ACE::hash_pjw (ext_id);
 }
 
-ACE_TEMPLATE_SPECIALIZATION
+template <>
 int
-ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1, const ACE_TCHAR *const &id2)
+ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1,
+                           const ACE_TCHAR *const &id2)
 {
   return ACE_OS::strcmp (id1, id2) == 0;
 }
@@ -193,8 +197,6 @@ ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1, const ACE_TCHAR *const &
 #undef ACE_Filecache_Hash
 #undef ACE_Filecache_Hash_Entry
 
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
-
 
 // -------------
 // ACE_Filecache
@@ -745,31 +747,15 @@ ACE_Filecache_Object::update (void) const
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
 template class ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *>;
 template class ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
-#else
-template class ACE_Hash_Map_Entry<ACE_TString, ACE_Filecache_Object *>;
-template class ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
 #pragma instantiate ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
-#else
-#pragma instantiate ACE_Hash_Map_Entry<ACE_TString, ACE_Filecache_Object *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Filecache.h b/ace/Filecache.h
index 036468b7f14..c6986bd465d 100644
--- a/ace/Filecache.h
+++ b/ace/Filecache.h
@@ -23,7 +23,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Hash_Map_Manager_T.h"
-#include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 #include "ace/Synch_Traits.h"
 #include "ace/RW_Thread_Mutex.h"
@@ -148,23 +147,11 @@ private:
   int mapit_;
 };
 
-#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-
 typedef ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
         ACE_Filecache_Hash;
 
 typedef ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *> ACE_Filecache_Hash_Entry;
 
-#else
-
-typedef ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-        ACE_Filecache_Hash;
-
-typedef ACE_Filecache_Hash::ENTRY ACE_Filecache_Hash_Entry;
-
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
-
-
 /**
  * @class ACE_Filecache
  *
diff --git a/ace/FlReactor.cpp b/ace/FlReactor.cpp
index 1b15981844b..1eed0acf20d 100644
--- a/ace/FlReactor.cpp
+++ b/ace/FlReactor.cpp
@@ -4,8 +4,6 @@
 
 ACE_RCSID(ace, FlReactor, "$Id$")
 
-#if defined (ACE_HAS_FL)
-
 #include /**/ <FL/Fl.h>
 
 ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor)
@@ -326,5 +324,3 @@ ACE_FlReactor::cancel_timer (long timer_id,
       return 0;
     }
 }
-
-#endif /* ACE_HAS_FL */
diff --git a/ace/FlReactor.h b/ace/FlReactor.h
index d0c7867bc7a..b1813fdd9bd 100644
--- a/ace/FlReactor.h
+++ b/ace/FlReactor.h
@@ -25,8 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_FL)
-
+#include "ace/ACE_FlReactor_export.h"
 #include "ace/Select_Reactor.h"
 
 /**
@@ -42,7 +41,7 @@
  * events.  This class adapts this simple mechanisms so they are
  * compatible with ACE's Reactor.
  */
-class ACE_Export ACE_FlReactor : public ACE_Select_Reactor
+class ACE_FlReactor_Export ACE_FlReactor : public ACE_Select_Reactor
 {
 
 public:
@@ -103,7 +102,5 @@ private:
   ACE_FlReactor &operator = (const ACE_FlReactor &);
 };
 
-#endif /* ACE_HAS_FL */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_FLREACTOR_H */
diff --git a/ace/Flag_Manip.cpp b/ace/Flag_Manip.cpp
index 50df345d56a..e1b1c25b7a6 100644
--- a/ace/Flag_Manip.cpp
+++ b/ace/Flag_Manip.cpp
@@ -2,10 +2,10 @@
 
 #include "ace/Flag_Manip.h"
 
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
+#if defined (ACE_LACKS_FCNTL)
 #  include "ace/OS_NS_stropts.h"
 #  include "ace/OS_NS_errno.h"
-#endif /* ACE_WIN32 || VXWORKS || ACE_LACKS_FCNTL */
+#endif /* ACE_LACKS_FCNTL */
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Flag_Manip.inl"
@@ -25,7 +25,7 @@ int
 ACE::set_flags (ACE_HANDLE handle, int flags)
 {
   ACE_TRACE ("ACE::set_flags");
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
+#if defined (ACE_LACKS_FCNTL)
   switch (flags)
     {
     case ACE_NONBLOCK:
@@ -51,7 +51,7 @@ ACE::set_flags (ACE_HANDLE handle, int flags)
     return -1;
   else
     return 0;
-#endif /* ACE_WIN32 || ACE_LACKS_FCNTL */
+#endif /* ACE_LACKS_FCNTL */
 }
 
 // Flags are the file status flags to turn off.
@@ -61,7 +61,7 @@ ACE::clr_flags (ACE_HANDLE handle, int flags)
 {
   ACE_TRACE ("ACE::clr_flags");
 
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
+#if defined (ACE_LACKS_FCNTL)
   switch (flags)
     {
     case ACE_NONBLOCK:
@@ -87,5 +87,5 @@ ACE::clr_flags (ACE_HANDLE handle, int flags)
     return -1;
   else
     return 0;
-#endif /* ACE_WIN32 || ACE_LACKS_FCNTL */
+#endif /* ACE_LACKS_FCNTL */
 }
diff --git a/ace/Functor.cpp b/ace/Functor.cpp
index ca519868ef5..b42375de277 100644
--- a/ace/Functor.cpp
+++ b/ace/Functor.cpp
@@ -41,6 +41,10 @@
 
 ACE_RCSID(ace, Functor, "$Id$")
 
+ACE_Command_Base::~ACE_Command_Base (void)
+{
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Functor.inl b/ace/Functor.inl
index 0019f9c41c3..15ada4fb21e 100644
--- a/ace/Functor.inl
+++ b/ace/Functor.inl
@@ -43,13 +43,6 @@ ACE_Command_Base::ACE_Command_Base (void)
 {
 }
 
-// Virtaul destructor.
-
-ACE_INLINE
-ACE_Command_Base::~ACE_Command_Base (void)
-{
-}
-
 ////////////////////////////////////////////////////////////
 // STL-style Functor Classes and Template Specializations //
 ////////////////////////////////////////////////////////////
diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h
index d4dc3dae628..0bdc038c1df 100644
--- a/ace/Global_Macros.h
+++ b/ace/Global_Macros.h
@@ -70,7 +70,7 @@ private:
 # define ACE_ITOA(X) #X
 
 // Create a string of a server address with a "host:port" format.
-# define ACE_SERVER_ADDRESS(H,P) H":"P
+# define ACE_SERVER_ADDRESS(H,P) H ACE_TEXT(":") P
 
 // A couple useful inline functions for checking whether bits are
 // enabled or disabled.
@@ -96,13 +96,15 @@ private:
 #   define ACE_UNIMPLEMENTED_FUNC(f) f;
 # endif /* ACE_NEEDS_FUNC_DEFINITIONS */
 
-// Easy way to designate that a class is used as a pseudo-namespace.
-// Insures that g++ "friendship" anamolies are properly handled.
-# define ACE_CLASS_IS_NAMESPACE(CLASSNAME) \
-private: \
-CLASSNAME (void); \
-CLASSNAME (const CLASSNAME&); \
-friend class ace_dewarn_gplusplus
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  // Easy way to designate that a class is used as a pseudo-namespace.
+  // Insures that g++ "friendship" anamolies are properly handled.
+  # define ACE_CLASS_IS_NAMESPACE(CLASSNAME) \
+  private: \
+  CLASSNAME (void); \
+  CLASSNAME (const CLASSNAME&); \
+  friend class ace_dewarn_gplusplus
+#endif /* ACE_LACKS_DEPRECATED_MACROS */
 
 // ----------------------------------------------------------------
 
@@ -132,21 +134,23 @@ friend class ace_dewarn_gplusplus
 #   endif /* ! ACE_HAS_BROKEN_NAMESPACES */
 # endif  /* !ACE_NESTED_CLASS */
 
-/**
- * @name CORBA namespace macros.
- *
- * CORBA namespace macros.
- *
- * @deprecated These macros were formerly used by TAO but are now
- *             deprecated, and only remain to retain some backward
- *             compatibility.  They will be removed in a future ACE
- *             release.
- */
-//@{
-# define ACE_CORBA_1(NAME) CORBA::NAME
-# define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME
-# define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME
-//@}
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  /**
+   * @name CORBA namespace macros.
+   *
+   * CORBA namespace macros.
+   *
+   * @deprecated These macros were formerly used by TAO but are now
+   *             deprecated, and only remain to retain some backward
+   *             compatibility.  They will be removed in a future ACE
+   *             release.
+   */
+  //@{
+  # define ACE_CORBA_1(NAME) CORBA::NAME
+  # define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME
+  # define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME
+  //@}
+#endif /* ACE_LACKS_DEPRECATED_MACROS */
 
 // ----------------------------------------------------------------
 
@@ -613,6 +617,46 @@ _make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
   return new SERVICE_CLASS; \
 }
 
+/**
+ * For service classes scoped within namespaces, use this macro in
+ * place of ACE_FACTORY_DEFINE. The third argument in this case is
+ * the fully scoped name of the class as it is to be
+ * instantiated. For example, given:
+ * namespace ACE
+ * {
+ *   namespace Foo
+ *   {
+ *     class Bar : public ACE_Service_Object
+ *     {};
+ *   };
+ * };
+ *
+ * ACE_FACTORY_DECLARE(ACE,ACE_Foo_Bar)
+ *
+ * you would then use:
+ *
+ * ACE_FACTORY_NAMESPACE_DEFINE(ACE,ACE_Foo_Bar,ACE::Foo::Bar)
+ *
+ * Note that in this example, the ACE_FACTORY_DECLARE is done outside
+ * the namespace scope. Then, the SERVICE_CLASS name is the same as
+ * the fully scoped class name, but with '::' replaced with '_'. Doing
+ * this will ensure unique generated signatures for the various C
+ * style functions.
+ */
+# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
+void _gobble_##SERVICE_CLASS (void *p) { \
+  ACE_Service_Object *_p = static_cast<ACE_Service_Object *> (p); \
+  ACE_ASSERT (_p != 0); \
+  delete _p; } \
+extern "C" CLS##_Export ACE_Service_Object *\
+_make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
+{ \
+  ACE_TRACE (#SERVICE_CLASS); \
+  if (gobbler != 0) \
+    *gobbler = (ACE_Service_Object_Exterminator) _gobble_##SERVICE_CLASS; \
+  return new NAMESPACE_CLASS; \
+}
+
 /// The canonical name for a service factory method
 #define ACE_SVC_NAME(SERVICE_CLASS) _make_##SERVICE_CLASS
 
diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h
index f71b71fd3b1..eefd5862f89 100644
--- a/ace/Hash_Map_Manager_T.h
+++ b/ace/Hash_Map_Manager_T.h
@@ -120,6 +120,7 @@ public:
           KEY;
   typedef INT_ID
           VALUE;
+  typedef ACE_LOCK lock_type;
   typedef ACE_Hash_Map_Entry<EXT_ID, INT_ID>
           ENTRY;
 
diff --git a/ace/Hash_Map_Manager_T.inl b/ace/Hash_Map_Manager_T.inl
index d1b05afa492..05383a07e69 100644
--- a/ace/Hash_Map_Manager_T.inl
+++ b/ace/Hash_Map_Manager_T.inl
@@ -202,8 +202,8 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::find
                                                                                  INT_ID &int_id) const
 {
   ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *nc_this =
-    (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *)
-    this;
+    const_cast <ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *>
+    (this);
 
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, nc_this->lock_, -1);
 
@@ -214,8 +214,9 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &ext_id) const
 {
   ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *nc_this =
-    (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *)
-    this;
+    const_cast <ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *>
+    (this);
+
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, nc_this->lock_, -1);
 
   return nc_this->find_i (ext_id);
@@ -234,8 +235,8 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::find
                                                                                  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry) const
 {
   ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *nc_this =
-    (ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *)
-    this;
+    const_cast <ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *>
+    (this);
 
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, nc_this->lock_, -1);
 
diff --git a/ace/Hashable.inl b/ace/Hashable.inl
index 4938b231fab..69f6c3312a0 100644
--- a/ace/Hashable.inl
+++ b/ace/Hashable.inl
@@ -24,7 +24,7 @@ ACE_Hashable::hash (void) const
   // relative to the simple comparison.
 
   if (this->hash_value_ == 0)
-    ((ACE_Hashable *) this)->hash_value_ = this->hash_i ();
+    (const_cast <ACE_Hashable *> (this))->hash_value_ = this->hash_i ();
 
   return this->hash_value_;
 }
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index f2ba4c05687..9a20eeb94ae 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -270,7 +270,7 @@ ACE_High_Res_Timer::calibrate (const ACE_UINT32 usec,
         ACE_OS::gettimeofday () - actual_start;
 
       // Store the sample.
-      delta_hrtime.sample (ACE_U64_TO_U32 (stop - start));
+      delta_hrtime.sample (ACE_HRTIME_CONVERSION (stop - start));
       actual_sleeps.sample (actual_delta.msec () * 100u);
     }
 
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index ac100d46117..003ef38e0e9 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -40,9 +40,6 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
                       ACE_OS::strlen (this->get_host_addr ()))
     + ACE_OS::strlen ("65536") // Assume the max port number.
     + sizeof (':')
-#if defined ACE_HAS_IPV6
-    + ACE_OS::strlen ("[]")
-#endif
     + sizeof ('\0'); // For trailing '\0'.
 
   if (size < total_len)
@@ -50,11 +47,7 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
   else
     {
       ACE_OS::sprintf (s,
-#if defined ACE_HAS_IPV6
-                       ACE_LIB_TEXT ("[%s]:%d"),
-#else
                        ACE_LIB_TEXT ("%s:%d"),
-#endif
                        ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
                                                ? this->get_host_name ()
                                                : this->get_host_addr ()),
@@ -342,7 +335,7 @@ static int get_port_number_from_name (const char port_name[],
 
   // We try to resolve port number from its name.
 
-#if defined (VXWORKS) || defined (CHORUS) || defined (ACE_LACKS_GETSERVBYNAME)
+#if defined (ACE_LACKS_GETSERVBYNAME)
   port_number = 0;
   ACE_UNUSED_ARG (port_name);
   ACE_UNUSED_ARG (protocol);
@@ -356,7 +349,7 @@ static int get_port_number_from_name (const char port_name[],
                                          buf);
   if (sp != 0)
     port_number = sp->s_port;
-#endif /* VXWORKS */
+#endif /* ACE_LACKS_GETSERVBYNAME */
 
   return port_number;
 }
@@ -596,7 +589,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
   if (this->set (port_name,
-                 inet_address,
+                 htonl (inet_address),
                  protocol) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
@@ -611,7 +604,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
   if (this->set (port_name,
-                 inet_address,
+                 htonl (inet_address),
                  protocol) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
@@ -965,7 +958,7 @@ ACE_INET_Addr::get_host_addr (char *dst, int size) const
   //
   // So, we use the way that vxworks suggests.
   ACE_INET_Addr *ncthis = const_cast<ACE_INET_Addr *> (this);
-  inet_ntoa_b (this->inet_addr_.in4_.sin_addr, ncthis->buf_);
+  inet_ntoa_b(this->inet_addr_.in4_.sin_addr, ncthis->buf_);
   ACE_OS::strsncpy (dst, &buf_[0], size);
   return &buf_[0];
 #else /* VXWORKS */
@@ -1000,7 +993,6 @@ ACE_INET_Addr::get_host_addr (void) const
 }
 
 // Return the 4-byte IP address, converting it into host byte order.
-
 ACE_UINT32
 ACE_INET_Addr::get_ip_address (void) const
 {
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index 13df88af9de..c98dc1cdd29 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -23,6 +23,7 @@
 #include "ace/Addr.h"
 
 #if defined(VXWORKS)
+   // Needed to get INET_ADDR_LEN
 #  include /**/ "inetLib.h"
 #endif /* VXWORKS */
 
diff --git a/ace/IOStream_T.cpp b/ace/IOStream_T.cpp
index 3779d015a57..d8ff9c53b15 100644
--- a/ace/IOStream_T.cpp
+++ b/ace/IOStream_T.cpp
@@ -14,20 +14,6 @@ ACE_RCSID(ace, IOStream_T, "$Id$")
 
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
 
-#if defined (__GNUG__)
-# if !defined (ACE_IOSTREAM_T_H)
-    // _Only_ define this when compiling this .cpp file standalone, not
-    // when instantiating templates.  Its purpose is to provide something
-    // for global constructors and destructors to be tied to.  Without it,
-    // they would be tied to the file(name).  With Cygnus g++ 2.7.2/VxWorks,
-    // that name is used directly in variable names in the munched ctor/dtor
-    // file.  That name contains a ".", so it's not a legal C variable name.
-    // The root of all this trouble is a static instance (of Iostream_init)
-    // declared in the iostream.h header file.
-    int ACE_IOStream_global_of_builtin_type_to_avoid_munch_problems = 0;
-# endif /* ! ACE_IOSTREAM_T_H */
-#endif /*__GNUG__ */
-
 #if !defined (__ACE_INLINE__)
 #include "ace/IOStream_T.inl"
 #endif /* !__ACE_INLINE__ */
diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h
index dfcc5689f09..e6577e041d8 100644
--- a/ace/IOStream_T.h
+++ b/ace/IOStream_T.h
@@ -58,17 +58,17 @@ public:
 
   virtual ssize_t recv (char *buf,
                         ssize_t len,
-                        ACE_Time_Value *tv = NULL);
+                        ACE_Time_Value *tv = 0);
 
   virtual ssize_t recv (char *buf,
                         ssize_t len,
                         int flags,
-                        ACE_Time_Value * tv = NULL);
+                        ACE_Time_Value * tv = 0);
 
   virtual ssize_t recv_n (char *buf,
                           ssize_t len,
                           int flags = 0,
-                          ACE_Time_Value *tv = NULL);
+                          ACE_Time_Value *tv = 0);
 
 protected:
   virtual ACE_HANDLE get_handle (void);
@@ -262,15 +262,15 @@ public:
   ssize_t send_n (char *buf, ssize_t len);
   ssize_t recv  (char *buf,
                  ssize_t len,
-                 ACE_Time_Value *tv = NULL);
+                 ACE_Time_Value *tv = 0);
   ssize_t recv (char *buf,
                 ssize_t len,
                 int flags,
-                ACE_Time_Value *tv = NULL);
+                ACE_Time_Value *tv = 0);
   ssize_t recv_n (char *buf,
                   ssize_t len,
                   int flags = 0,
-                  ACE_Time_Value *tv = NULL);
+                  ACE_Time_Value *tv = 0);
   int get_remote_addr (ACE_INET_Addr &addr) const;
 
 protected:
diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp
index 295b88c9698..b5c45f1b128 100644
--- a/ace/IO_SAP.cpp
+++ b/ace/IO_SAP.cpp
@@ -50,8 +50,6 @@ ACE_IO_SAP::enable (int value) const
   if (ACE_IO_SAP::pid_ == 0)
     ACE_IO_SAP::pid_ = ACE_OS::getpid ();
 
-#if !defined(ACE_WIN32) && !defined (VXWORKS)
-
   switch (value)
     {
 #if defined (SIGURG)
@@ -90,9 +88,6 @@ ACE_IO_SAP::enable (int value) const
     default:
       return -1;
     }
-#else
-  ACE_UNUSED_ARG (value);
-#endif /* !ACE_WIN32 */
 
   return 0;
 }
@@ -102,7 +97,6 @@ ACE_IO_SAP::disable (int value) const
 {
   ACE_TRACE ("ACE_IO_SAP::disable");
 
-#if !defined(ACE_WIN32) && !defined (VXWORKS)
   switch (value)
     {
 #if defined (SIGURG)
@@ -142,8 +136,4 @@ ACE_IO_SAP::disable (int value) const
       return -1;
     }
   return 0;
-#else
-  ACE_UNUSED_ARG (value);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* !ACE_WIN32 */
 }
diff --git a/ace/LSOCK_Acceptor.cpp b/ace/LSOCK_Acceptor.cpp
index 7d700f5e566..e8674429e77 100644
--- a/ace/LSOCK_Acceptor.cpp
+++ b/ace/LSOCK_Acceptor.cpp
@@ -19,7 +19,7 @@ ACE_LSOCK_Acceptor::get_local_addr (ACE_Addr &a) const
 {
   ACE_TRACE ("ACE_LSOCK_Acceptor::get_local_addr");
 
-  ACE_UNIX_Addr& target = ACE_dynamic_cast (ACE_UNIX_Addr &, a);
+  ACE_UNIX_Addr& target = dynamic_cast<ACE_UNIX_Addr &> (a);
 
   target = this->local_addr_;
 
diff --git a/ace/LSOCK_Stream.cpp b/ace/LSOCK_Stream.cpp
index 5b0cd23382f..d1246cec230 100644
--- a/ace/LSOCK_Stream.cpp
+++ b/ace/LSOCK_Stream.cpp
@@ -22,7 +22,7 @@ ACE_LSOCK_Stream::get_local_addr (ACE_Addr &addr) const
 
   // Perform the downcast since <addr> had better be an
   // <ACE_UNIX_Addr>.
-  ACE_UNIX_Addr *rhs_unix_addr = ACE_dynamic_cast (ACE_UNIX_Addr *, &addr);
+  ACE_UNIX_Addr *rhs_unix_addr = dynamic_cast<ACE_UNIX_Addr *> (&addr);
   ACE_UNIX_Addr lhs_unix_addr;
 
   if (rhs_unix_addr == 0)
@@ -72,7 +72,7 @@ ACE_LSOCK_Stream::send_msg (const iovec iov[],
   cmsghdr *cmsgptr = (cmsghdr *) cmsgbuf;
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
 
-  send_msg.msg_iov = (iovec *) iov;
+  send_msg.msg_iov = const_cast <iovec *> (iov);
   send_msg.msg_iovlen = n;
   send_msg.msg_name = 0;
   send_msg.msg_namelen = 0;
diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h
index bfaf6a98003..a66422a1f9d 100644
--- a/ace/Lib_Find.h
+++ b/ace/Lib_Find.h
@@ -49,7 +49,7 @@ namespace ACE
                                   const ACE_TCHAR *type);
 
   /**
-   * Transforms <entry_point> into a form that can be located in a
+   * Transforms @a entry_point into a form that can be located in a
    * dynamic library using <dlsym>. For example, with Win32/Borland
    * extern "C" functions which use the default calling convention
    * have a '_' prepended. Always returns a buffer that has been
@@ -59,7 +59,7 @@ namespace ACE
 
   /**
    * Returns the temporary directory including the trailing slash in
-   * <buffer>.  Returns -1 for an error or if the buffer_len is not
+   * @a buffer.  Returns -1 for an error or if the buffer_len is not
    * long enough.
    */
   extern ACE_Export int get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len);
@@ -74,7 +74,7 @@ namespace ACE
   // above, these are used only in the functions in this class. So it makes
   // more sense to move these functions too to this class.
   //
-  /// Replace all instances of <search> in <s> with <replace>.  Returns
+  /// Replace all instances of @a search in @a s with @a replace.  Returns
   /// the number of replacements made.
   extern ACE_Export size_t strrepl (char *s, char search, char replace);
 
diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp
index 6cc578a7f8c..d7382c3266c 100644
--- a/ace/Local_Name_Space.cpp
+++ b/ace/Local_Name_Space.cpp
@@ -1,10 +1,7 @@
-#ifndef ACE_LOCAL_NAME_SPACE_CPP
-#define ACE_LOCAL_NAME_SPACE_CPP
-
-#include "ace/ACE.h"
 #include "ace/Local_Name_Space.h"
-#include "ace/OS_NS_string.h"
 #include "ace/RW_Process_Mutex.h"
+#include "ace/SString.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID (ace,
            Local_Name_Space,
@@ -215,4 +212,3 @@ template class ACE_Write_Guard<ACE_RW_Process_Mutex>;
 #pragma instantiate ACE_Write_Guard<ACE_RW_Process_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* ACE_LOCAL_NAME_SPACE_CPP */
diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h
index 1651119e55e..e8b8b4b39ca 100644
--- a/ace/Local_Name_Space.h
+++ b/ace/Local_Name_Space.h
@@ -17,13 +17,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/SString.h"
+#include "ace/Malloc_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Malloc_T.h"
+class ACE_NS_WString;
 
 /**
  * @class ACE_NS_String
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 5865dcedddc..8e0e72ef321 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -56,7 +56,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg)
 
 ACE_thread_key_t *log_msg_tss_key (void)
 {
-  static ACE_thread_key_t key;
+  static ACE_thread_key_t key = 0;
 
   return &key;
 }
@@ -727,6 +727,7 @@ ACE_Log_Msg::~ACE_Log_Msg (void)
 #else
     {
       delete ostream_;
+      ostream_ = 0;
     }
 #endif
 }
@@ -790,7 +791,7 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
       else
         {
           status =
-            ACE_Log_Msg_Manager::log_backend_->open (logger_key);
+            ACE_Log_Msg_Manager::log_backend_->open (prog_name);
         }
 
       if (status == -1)
@@ -803,8 +804,8 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
             ACE_SET_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG);
         }
     }
-  else if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER) ||
-           ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG))
+  else if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER) 
+           || ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG))
     {
       // If we are closing down logger, redirect logging to stderr.
       ACE_CLR_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER);
@@ -879,6 +880,7 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
  *   'P': format the current process id
  *   'p': format the appropriate errno message from sys_errlist, e.g., as done by <perror>
  *   'Q': print out the uint64 number
+ *   'q': print out the int64 number
  *   '@': print a void* pointer (in hexadecimal)
  *   'r': call the function pointed to by the corresponding argument
  *   'R': print return status
@@ -1785,8 +1787,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                     // On some platforms sizeof (wchar_t) can be 2
                     // on the others 4 ...
                     wchar_t wtchar =
-                      ACE_static_cast(wchar_t,
-                                      va_arg (argp, int));
+                      static_cast<wchar_t> (va_arg (argp, int));
 #if defined (ACE_WIN32)
 # if defined (ACE_USES_WCHAR)
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("c"));
@@ -1933,6 +1934,27 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   ACE_UPDATE_COUNT (bspace, this_len);
                   break;
 
+                case 'q':
+ #if defined (ACE_LACKS_LONGLONG_T)
+                   // No implementation available yet, no ACE_INT64 emulation
+                   // available yet
+ #else  /* ! ACE_LACKS_LONGLONG_T */
+                   {
+                     const ACE_TCHAR *fmt = ACE_INT64_FORMAT_SPECIFIER;
+                     ACE_OS::strcpy (fp, &fmt[1]);    // Skip leading %
+                     if (can_check)
+                       this_len = ACE_OS::snprintf (bp, bspace,
+                                                    format,
+                                                    va_arg (argp, ACE_INT64));
+                     else
+                       this_len = ACE_OS::sprintf (bp,
+                                                   format,
+                                                   va_arg (argp, ACE_INT64));
+                   }
+ #endif /* ! ACE_LACKS_LONGLONG_T */
+                   ACE_UPDATE_COUNT (bspace, this_len);
+                   break;
+
                 case '@':
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("p"));
                     if (can_check)
@@ -1973,21 +1995,26 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 
   *bp = '\0'; // Terminate bp, but don't auto-increment this!
 
-  // Check that memory was not corrupted.
+  ssize_t result = 0;
+
+  // Check that memory was not corrupted, if it corrupted we can't log anything
+  // anymore because all our members could be corrupted.
   if (bp >= this->msg_ + sizeof this->msg_)
     {
       abort_prog = 1;
       ACE_OS::fprintf (stderr,
                        "The following logged message is too long!\n");
     }
+  else
+    {
+      // Copy the message from thread-specific storage into the transfer
+      // buffer (this can be optimized away by changing other code...).
+      log_record.msg_data (this->msg ());
 
-  // Copy the message from thread-specific storage into the transfer
-  // buffer (this can be optimized away by changing other code...).
-  log_record.msg_data (this->msg ());
-
-  // Write the <log_record> to the appropriate location.
-  ssize_t result = this->log (log_record,
-                              abort_prog);
+      // Write the <log_record> to the appropriate location.
+      result = this->log (log_record,
+                          abort_prog);
+    }
 
   if (abort_prog)
     {
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 14be11341e9..ba6362bc3da 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -494,6 +494,7 @@ public:
    *  - 'p': print out the appropriate errno message from sys_errlist,
    *         e.g., as done by perror()
    *  - 'Q': print out the uint64 number
+   *  - 'q': print out the int64 number
    *  - '@': print a void* pointer (in hexadecimal)
    *  - 'r': call the function pointed to by the corresponding argument
    *  - 'R': print return status
diff --git a/ace/Log_Msg_UNIX_Syslog.cpp b/ace/Log_Msg_UNIX_Syslog.cpp
index b502d1dd185..b4738161753 100644
--- a/ace/Log_Msg_UNIX_Syslog.cpp
+++ b/ace/Log_Msg_UNIX_Syslog.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/config-all.h"
 
-#if !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG)
+#if !defined (ACE_LACKS_UNIX_SYSLOG)
 
 #include "ace/ACE.h"
 #include "ace/Log_Msg.h"
@@ -200,4 +200,4 @@ ACE_Log_Msg_UNIX_Syslog::convert_log_mask (int lm_mask)
   return syslog_mask;
 }
 
-#endif /* !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG) */
+#endif /* !defined (ACE_LACKS_UNIX_SYSLOG) */
diff --git a/ace/Log_Msg_UNIX_Syslog.h b/ace/Log_Msg_UNIX_Syslog.h
index 3e9940b27cc..46851c24f90 100644
--- a/ace/Log_Msg_UNIX_Syslog.h
+++ b/ace/Log_Msg_UNIX_Syslog.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG)
+#if !defined (ACE_LACKS_UNIX_SYSLOG)
 
 #include "ace/Log_Msg_Backend.h"
 
@@ -43,7 +43,7 @@ public:
   /**
    * Initialize the event logging facility.
    * @param logger_key The name of the calling program. This name is
-   *                   used as the @arg ident in the syslog entries. If
+   *                   used as the @c ident in the syslog entries. If
    *                   it is 0 (no name), the application name as
    *                   returned from ACE_Log_Msg::program_name() is used.
    */
@@ -66,7 +66,7 @@ private:
   int convert_log_mask (int lm_mask);
 };
 
-#endif /* !ACE_WIN32 && !ACE_HAS_WINCE */
+#endif /* !ACE_LACKS_UNIX_SYSLOG */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_LOG_MSG_UNIX_SYSLOG_H */
diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp
index 73acccd0e0e..fe6d4c5fc8c 100644
--- a/ace/Logging_Strategy.cpp
+++ b/ace/Logging_Strategy.cpp
@@ -304,28 +304,46 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[])
       if (ACE_BIT_ENABLED (this->flags_,
                            ACE_Log_Msg::OSTREAM))
         {
+          int delete_ostream = 0;
 #if defined (ACE_LACKS_IOSTREAM_TOTALLY)
-          FILE *output_file = 0;
+          FILE *output_file = this->log_msg_->msg_ostream ();
           if (wipeout_logfile_)
-            output_file = ACE_OS::fopen (this->filename_, ACE_LIB_TEXT ("wt"));
-          else
-            output_file = ACE_OS::fopen (this->filename_, ACE_LIB_TEXT ("at"));
+            {
+              // close and re-open a stream if such exits
+              if (output_file &&
+                  ACE_OS::fclose (output_file) == -1)
+                return -1;
+              output_file = ACE_OS::fopen (this->filename_, ACE_LIB_TEXT ("wt"));
+            }
+          // open a stream only if such doesn't exists
+          else if (output_file == 0)
+            output_file = ACE_OS::fopen (this->filename_,
+                                         ACE_LIB_TEXT ("at"));
+
           if (output_file == 0)
             return -1;
 #else
-          ofstream *output_file = 0;
+          ostream *output_file = this->log_msg_->msg_ostream ();
           // Create a new ofstream to direct output to the file.
           if (wipeout_logfile_)
-            ACE_NEW_RETURN
-              (output_file,
-               ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_)),
-               -1);
-          else
-            ACE_NEW_RETURN
-              (output_file,
-               ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_),
-                         ios::app | ios::out),
-               -1);
+            {
+              delete output_file;
+              ACE_NEW_RETURN
+                (output_file,
+                 ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_)),
+                 -1);
+              delete_ostream = 1;
+            }
+          else if (output_file == 0)
+            {
+              ACE_NEW_RETURN
+                (output_file,
+                 ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_),
+                           ios::app | ios::out),
+                 -1);
+              delete_ostream = 1;
+            }
+
           if (output_file->rdstate () != ios::goodbit)
             {
               delete output_file;
@@ -334,7 +352,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[])
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
           // Set the <output_file> that'll be used by the rest of the
           // code.
-          this->log_msg_->msg_ostream (output_file);
+          this->log_msg_->msg_ostream (output_file, delete_ostream);
 
           // Setup a timeout handler to perform the maximum file size
           // check (if required).
@@ -364,11 +382,9 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &,
                                       const void *)
 {
 #if defined (ACE_LACKS_IOSTREAM_TOTALLY)
-  if ((size_t) ACE_OS::fseek (this->log_msg_->msg_ostream (),
-                              0,
-                              SEEK_CUR) > this->max_size_)
+  if ((size_t) ACE_OS::ftell (this->log_msg_->msg_ostream ()) > this->max_size_)
 #else
-  if ((size_t) this->log_msg_->msg_ostream () > this->max_size_)
+  if ((size_t) this->log_msg_->msg_ostream ()->tellp () > this->max_size_)
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
     {
       // Lock out any other logging.
diff --git a/ace/MEM_Acceptor.h b/ace/MEM_Acceptor.h
index d9771a1bf37..5e70bf080d3 100644
--- a/ace/MEM_Acceptor.h
+++ b/ace/MEM_Acceptor.h
@@ -65,9 +65,9 @@ public:
 
   /**
    * Initialize a passive-mode BSD-style acceptor socket (no QoS).
-   * <local_sap> is the address that we're going to listen for
-   * connections on.  If <reuse_addr> is 1 then we'll use the
-   * <SO_REUSEADDR> to reuse this address.  Returns 0 on success and
+   * @a local_sap is the address that we're going to listen for
+   * connections on.  If @a reuse_addr is 1 then we'll use the
+   * @c SO_REUSEADDR to reuse this address.  Returns 0 on success and
    * -1 on failure.
    */
   int open (const ACE_MEM_Addr &local_sap,
@@ -117,7 +117,7 @@ public:
   int get_local_addr (ACE_MEM_Addr &) const;
 
   /// Accessor to the mmap options.
-  /// This method has been deprecated.
+  /// @deprecated This method has been deprecated.
   ACE_MEM_SAP::MALLOC_OPTIONS& malloc_options (void);
 
   // = Meta-type info
diff --git a/ace/MEM_Addr.h b/ace/MEM_Addr.h
index d3add754b4a..c720eaa6e8a 100644
--- a/ace/MEM_Addr.h
+++ b/ace/MEM_Addr.h
@@ -41,11 +41,10 @@ public:
   /// Copy constructor.
   ACE_MEM_Addr (const ACE_MEM_Addr &);
 
-  /// Creates an <ACE_INET_Addr> from a <port_number> and the remote
-  /// <host_name>.
+  /// Creates an ACE_MEM_Addr from a @a port_number
   ACE_MEM_Addr (u_short port_number);
 
-  /// Creates an <ACE_INET_Addr> from a <port_name>.
+  /// Creates an ACE_MEM_Addr from a @a port_name.
   explicit ACE_MEM_Addr (const ACE_TCHAR port_name[]);
 
   /// Default dtor.
@@ -53,24 +52,24 @@ public:
 
   // = Direct initialization methods.
 
-  /// default initialization routine.
+  /// Default initialization routine.
   int initialize_local (u_short port);
 
-  /// Check if <sap> designate an enpoint withing the same host.
+  /// Check if @a sap designate an enpoint withing the same host.
   int same_host (const ACE_INET_Addr& sap);
 
   // These methods are useful after the object has been constructed.
 
   /**
-   * Initializes an <ACE_INET_Addr> from a <port_number> and the
-   * remote <host_name>.  If <encode> is enabled then <port_number> is
-   * converted into network byte order, otherwise it is assumed to be
-   * in network byte order already and are passed straight through.
+   * Initializes an ACE_MEM_Addr from a @a port_number.  If @a encode
+   * is enabled then @a port_number is converted into network byte order,
+   * otherwise it is assumed to be in network byte order already and
+   * are passed straight through.
    */
   int set (u_short port_number,
            int encode = 1);
 
-  /// Uses <getservbyname> to initialize an <ACE_INET_Addr> from a
+  /// Uses <getservbyname> to initialize an ACE_MEM_Addr from a
   /// <port_name>, the remote <host_name>, and the <protocol>.
   int set (const ACE_TCHAR port_name[]);
 
@@ -80,13 +79,13 @@ public:
   /// Set a pointer to the address.
   virtual void set_addr (void *, int len);
 
-  /// Transform the external <ACE_INET_Addr> address into string
+  /// Transform the external ACE_MEM_Addr address into string
   /// format.
   virtual int addr_to_string (ACE_TCHAR buffer[],
                               size_t size,
                               int ipaddr_format = 1) const;
 
-  /// Initializes the external <ACE_INET_Addr> from the <address>.
+  /// Initializes the external ACE_MEM_Addr from the @a address.
   virtual int string_to_addr (const ACE_TCHAR address[]);
 
   /// Sets the port number.
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 0beb8b6a5c8..8dae7dfdc32 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -1,205 +1,170 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the entire ACE release
-##----------------------------------------------------------------------------
-
-##
 ##  Process this file with automake to create Makefile.in
 ##
-
-## These are subdirectories that are always included in the
-## distribution.
-DIST_SUBDIRS = \
-  RMCast \
-  QoS \
-  SSL
-
-## Conditionally built subdirectories.
-
-if BUILD_RMCAST
-RMCAST_DIR = RMCast
-else
-RMCAST_DIR =
-endif
-
-if BUILD_QOS
-QOS_DIR = QoS
-else
-QOS_DIR =
-endif
-
-if BUILD_SSL
-SSL_DIR = SSL
-else
-SSL_DIR =
-endif
-
-## List of conditionally built subdirectories.
+## $Id$
 ##
-## Note that the "." (current) directory in the below SUBDIRS list is
-## required to make the ACE directory be built prior to the
-## subdirectories.
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
-## Disable building of CLASSIX library for now.
-## SUBDIRS = CLASSIX
+## MPC Command:
+## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc
+
+includedir = @includedir@/ace
+pkgconfigdatadir = @libdir@/pkgconfig
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
 SUBDIRS = \
-  . \
-  $(RMCAST_DIR) \
-  $(QOS_DIR) \
-  $(SSL_DIR)
-
-
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-
-# Define any X libraries that ACE needs, if any.
-ACE_XLIBS = @ACE_XLIBS@
-
-
-# We only want `gethrtime.cpp' if building on Pentium(tm) with GNU C++.
-if ACE_ON_PENTIUM
-ACE_GETHRTIME_CPP = gethrtime.cpp
-else
-ACE_GETHRTIME_CPP =
-endif
-
-# Define which ACE components to build
-if BUILD_OS_FILES
-LIBACE_OS = libACE_OS.la
-else
-LIBACE_OS =
-endif
-
-if BUILD_UTILS_FILES
-LIBACE_UTILS = libACE_Utils.la
-else
-LIBACE_UTILS =
-endif
-
-if BUILD_LOGGING_FILES
-LIBACE_LOGGING = libACE_Logging.la
-else
-LIBACE_LOGGING =
-endif
-
-
-if BUILD_THREADS_FILES
-LIBACE_THREADS = libACE_Threads.la
-else
-LIBACE_THREADS =
-endif
-
-if BUILD_DEMUX_FILES
-LIBACE_DEMUX = libACE_Demux.la
-else
-LIBACE_DEMUX =
-endif
-
-if BUILD_CONNECTION_FILES
-LIBACE_CONNECTION = libACE_Connection.la
-else
-LIBACE_CONNECTION =
-endif
-
-if BUILD_SOCKETS_FILES
-LIBACE_SOCKETS = libACE_Sockets.la
-else
-LIBACE_SOCKETS =
-endif
-
-if BUILD_IPC_FILES
-LIBACE_IPC = libACE_IPC.la
-else
-LIBACE_IPC =
-endif
-
-if BUILD_SVCCONF_FILES
-LIBACE_SVCCONF = libACE_Svcconf.la
-else
-LIBACE_SVCCONF =
-#AM_CPPFLAGS += -DACE_LACKS_ACE_SVCCONF
-endif
-
-if BUILD_STREAMS_FILES
-LIBACE_STREAMS = libACE_Streams.la
-else
-LIBACE_STREAMS =
-endif
-
-if BUILD_MEMORY_FILES
-LIBACE_MEMORY = libACE_Memory.la
-else
-LIBACE_MEMORY =
-endif
-
-if BUILD_TIMER_FILES
-LIBACE_TIMER = libACE_Timer.la
-else
-LIBACE_TIMER =
-endif
-
-if BUILD_TOKEN_FILES
-LIBACE_TOKEN = libACE_Token.la
-else
-LIBACE_TOKEN =
-#AM_CPPFLAGS += -DACE_LACKS_ACE_TOKEN
-endif
-
-if BUILD_CODECS_FILES
-LIBACE_CODECS = libACE_Codecs.la
-else
-LIBACE_CODECS =
-#AM_CPPFLAGS += -DACE_LACKS_ACE_CODECS
-endif
-
-
-if BUILD_OTHER_FILES
-LIBACE_OTHER = libACE_Other.la
-else
-LIBACE_OTHER =
-#AM_CPPFLAGS += -DACE_LACKS_ACE_OTHER
-endif
-
-if BUILD_UUID_FILES
-LIBACE_UUID = libACE_UUID.la
-else
-LIBACE_UUID =
-#AM_CPPFLAGS += -DACE_LACKS_ACE_UUID
-endif
-
-if BUILD_FULL_LIBRARY
-LIBACE = libACE.la
-else
-LIBACE =
-endif
-
-# Build a libtool library, libACE.la for installation in libdir.
-lib_LTLIBRARIES = \
-  $(LIBACE) \
-  $(LIBACE_OS) \
-  $(LIBACE_UTILS) \
-  $(LIBACE_LOGGING) \
-  $(LIBACE_THREADS) \
-  $(LIBACE_DEMUX) \
-  $(LIBACE_CONNECTION) \
-  $(LIBACE_SOCKETS) \
-  $(LIBACE_IPC) \
-  $(LIBACE_SVCCONF) \
-  $(LIBACE_STREAMS) \
-  $(LIBACE_MEMORY) \
-  $(LIBACE_TIMER) \
-  $(LIBACE_TOKEN) \
-  $(LIBACE_CODECS) \
-  $(LIBACE_OTHER) \
-  $(LIBACE_UUID)
-
-libACE_OS_la_SOURCES = \
+        . \
+        QoS \
+        SSL
+
+CLEANFILES =
+BUILT_SOURCES =
+pkgconfigdata_DATA =
+lib_LTLIBRARIES =
+## Makefile.ACE.am 
+
+lib_LTLIBRARIES += libACE.la
+
+libACE_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DACE_HAS_ACE_TOKEN \
+  -DACE_HAS_ACE_SVCCONF \
+  -DACE_BUILD_DLL
+
+libACE_la_SOURCES = \
+  ACE.cpp \
+  ACE_crc32.cpp \
+  ACE_crc_ccitt.cpp \
   ARGV.cpp \
+  ATM_Acceptor.cpp \
+  ATM_Addr.cpp \
+  ATM_Connector.cpp \
+  ATM_Params.cpp \
+  ATM_QoS.cpp \
+  ATM_Stream.cpp \
+  Activation_Queue.cpp \
+  Active_Map_Manager.cpp \
+  Addr.cpp \
+  Arg_Shifter.cpp \
   Argv_Type_Converter.cpp \
+  Asynch_IO.cpp \
+  Asynch_IO_Impl.cpp \
+  Asynch_Pseudo_Task.cpp \
+  Atomic_Op.cpp \
+  Auto_Event.cpp \
+  Barrier.cpp \
+  Base_Thread_Adapter.cpp \
+  Based_Pointer_Repository.cpp \
+  Basic_Stats.cpp \
   Basic_Types.cpp \
-  Time_Value.cpp \
+  CDR_Base.cpp \
+  CDR_Stream.cpp \
+  Capabilities.cpp \
   Cleanup.cpp \
-  Object_Manager_Base.cpp \
+  Codecs.cpp \
+  Codeset_IBM1047.cpp \
+  Codeset_Registry.cpp \
+  Codeset_Registry_db.cpp \
+  Condition_Recursive_Thread_Mutex.cpp \
+  Condition_Thread_Mutex.cpp \
+  Configuration.cpp \
+  Configuration_Import_Export.cpp \
+  Connection_Recycling_Strategy.cpp \
+  Container_Instantiations.cpp \
+  Containers.cpp \
+  Copy_Disabled.cpp \
+  DEV.cpp \
+  DEV_Addr.cpp \
+  DEV_Connector.cpp \
+  DEV_IO.cpp \
+  DLL.cpp \
+  DLL_Manager.cpp \
+  Date_Time.cpp \
+  Dev_Poll_Reactor.cpp \
+  Dirent.cpp \
+  Dirent_Selector.cpp \
+  Dump.cpp \
+  Dynamic.cpp \
+  Dynamic_Service_Base.cpp \
+  Event.cpp \
+  Event_Handler.cpp \
+  FIFO.cpp \
+  FIFO_Recv.cpp \
+  FIFO_Recv_Msg.cpp \
+  FIFO_Send.cpp \
+  FIFO_Send_Msg.cpp \
+  FILE.cpp \
+  FILE_Addr.cpp \
+  FILE_Connector.cpp \
+  FILE_IO.cpp \
+  File_Lock.cpp \
+  Filecache.cpp \
+  Flag_Manip.cpp \
+  Framework_Component.cpp \
+  Functor.cpp \
+  Functor_String.cpp \
+  Get_Opt.cpp \
+  Handle_Ops.cpp \
+  Handle_Set.cpp \
+  Hash_Map_Manager.cpp \
+  Hashable.cpp \
+  High_Res_Timer.cpp \
+  ICMP_Socket.cpp \
+  INET_Addr.cpp \
+  IOStream.cpp \
+  IO_SAP.cpp \
+  IPC_SAP.cpp \
+  Init_ACE.cpp \
+  LSOCK.cpp \
+  LSOCK_Acceptor.cpp \
+  LSOCK_CODgram.cpp \
+  LSOCK_Connector.cpp \
+  LSOCK_Dgram.cpp \
+  LSOCK_Stream.cpp \
+  Lib_Find.cpp \
+  Local_Memory_Pool.cpp \
+  Local_Name_Space.cpp \
+  Local_Tokens.cpp \
+  Lock.cpp \
+  Log_Msg.cpp \
+  Log_Msg_Backend.cpp \
+  Log_Msg_Callback.cpp \
+  Log_Msg_IPC.cpp \
+  Log_Msg_NT_Event_Log.cpp \
+  Log_Msg_UNIX_Syslog.cpp \
+  Log_Record.cpp \
+  Logging_Strategy.cpp \
+  MEM_Acceptor.cpp \
+  MEM_Addr.cpp \
+  MEM_Connector.cpp \
+  MEM_IO.cpp \
+  MEM_SAP.cpp \
+  MEM_Stream.cpp \
+  MMAP_Memory_Pool.cpp \
+  Malloc.cpp \
+  Malloc_Allocator.cpp \
+  Malloc_Instantiations.cpp \
+  Manual_Event.cpp \
+  Mem_Map.cpp \
+  Message_Block.cpp \
+  Message_Queue.cpp \
+  Method_Request.cpp \
+  Metrics_Cache.cpp \
+  Msg_WFMO_Reactor.cpp \
+  Multihomed_INET_Addr.cpp \
+  Mutex.cpp \
+  NT_Service.cpp \
+  Name_Proxy.cpp \
+  Name_Request_Reply.cpp \
+  Name_Space.cpp \
+  Naming_Context.cpp \
+  Notification_Strategy.cpp \
+  OS_Errno.cpp \
+  OS_Log_Msg_Attributes.cpp \
+  OS_NS_Thread.cpp \
   OS_NS_arpa_inet.cpp \
   OS_NS_ctype.cpp \
   OS_NS_dirent.cpp \
@@ -228,145 +193,48 @@ libACE_OS_la_SOURCES = \
   OS_NS_sys_uio.cpp \
   OS_NS_sys_utsname.cpp \
   OS_NS_sys_wait.cpp \
-  OS_NS_Thread.cpp \
   OS_NS_time.cpp \
   OS_NS_unistd.cpp \
   OS_NS_wchar.cpp \
   OS_QoS.cpp \
   OS_TLI.cpp \
-  OS_Errno.cpp \
-  Base_Thread_Adapter.cpp \
   OS_Thread_Adapter.cpp \
-  OS_Log_Msg_Attributes.cpp \
-  Thread_Hook.cpp \
-  Sched_Params.cpp \
-  Handle_Set.cpp \
-  Copy_Disabled.cpp
-
-libACE_Utils_la_SOURCES = \
-  ACE.cpp \
-  Active_Map_Manager.cpp \
-  Arg_Shifter.cpp \
-  Capabilities.cpp \
-  Containers.cpp \
-  Configuration.cpp \
-  Configuration_Import_Export.cpp \
-  Date_Time.cpp \
-  Dirent.cpp \
-  Dirent_Selector.cpp \
-  Dynamic.cpp \
-  Filecache.cpp \
-  Flag_Manip.cpp \
-  Framework_Component.cpp \
-  Functor.cpp \
-  Functor_String.cpp \
-  Get_Opt.cpp \
-  Hash_Map_Manager.cpp \
-  Connection_Recycling_Strategy.cpp \
-  Hashable.cpp \
-  Notification_Strategy.cpp \
-  Recyclable.cpp \
-  Refcountable.cpp \
-  Handle_Ops.cpp \
-  Init_ACE.cpp \
-  Lib_Find.cpp \
-  Message_Block.cpp \
-  Method_Request.cpp \
+  OS_main.cpp \
+  Obchunk.cpp \
   Object_Manager.cpp \
-  Registry.cpp \
-  String_Base_Const.cpp \
-  SString.cpp \
-  Stats.cpp \
-  Container_Instantiations.cpp \
-  Sample_History.cpp \
-  Template_Instantiations.cpp
-
-libACE_Logging_la_SOURCES = \
-  Dump.cpp \
-  Log_Msg.cpp \
-  Log_Msg_Callback.cpp \
-  Log_Msg_Backend.cpp \
-  Log_Msg_IPC.cpp \
-  Log_Msg_NT_Event_Log.cpp \
-  Log_Msg_UNIX_Syslog.cpp \
-  Log_Record.cpp \
-  Logging_Strategy.cpp \
-  Trace.cpp
-
-libACE_Threads_la_SOURCES = \
-  Activation_Queue.cpp \
-  Atomic_Op.cpp \
+  Object_Manager_Base.cpp \
+  Obstack.cpp \
+  PI_Malloc.cpp \
+  POSIX_Asynch_IO.cpp \
+  POSIX_CB_Proactor.cpp \
+  POSIX_Proactor.cpp \
+  Pagefile_Memory_Pool.cpp \
+  Parse_Node.cpp \
+  Ping_Socket.cpp \
+  Pipe.cpp \
+  Priority_Reactor.cpp \
+  Proactor.cpp \
   Process.cpp \
   Process_Manager.cpp \
-  TSS_Adapter.cpp \
-  Auto_Event.cpp \
-  Manual_Event.cpp \
-  Barrier.cpp \
-  Condition_Thread_Mutex.cpp \
-  Condition_Recursive_Thread_Mutex.cpp \
-  Event.cpp \
-  Lock.cpp \
-  Mutex.cpp \
-  RW_Mutex.cpp \
-  RW_Thread_Mutex.cpp \
-  Recursive_Thread_Mutex.cpp \
-  Semaphore.cpp \
-  Thread_Mutex.cpp \
-  Thread_Semaphore.cpp \
-  Synch_Options.cpp \
-  Process_Semaphore.cpp \
   Process_Mutex.cpp \
+  Process_Semaphore.cpp \
+  Profile_Timer.cpp \
+  RW_Mutex.cpp \
   RW_Process_Mutex.cpp \
-  File_Lock.cpp \
-  Thread.cpp \
-  Thread_Manager.cpp \
-  Thread_Adapter.cpp \
-  Thread_Exit.cpp \
-  Thread_Control.cpp \
-  Token.cpp
-
-libACE_Demux_la_SOURCES = \
-  Event_Handler.cpp \
-  FlReactor.cpp \
-  Msg_WFMO_Reactor.cpp \
-  POSIX_Proactor.cpp \
-  POSIX_CB_Proactor.cpp \
-  WIN32_Proactor.cpp \
-  Priority_Reactor.cpp \
-  Proactor.cpp \
+  RW_Thread_Mutex.cpp \
   Reactor.cpp \
-  Select_Reactor.cpp \
-  Select_Reactor_Base.cpp \
-  SUN_Proactor.cpp \
-  Dev_Poll_Reactor.cpp \
-  TP_Reactor.cpp \
-  TkReactor.cpp \
-  WFMO_Reactor.cpp \
-  XtReactor.cpp \
-  QtReactor.cpp
-
-libACE_Connection_la_SOURCES = \
-  Asynch_IO.cpp \
-  Asynch_IO_Impl.cpp \
-  Asynch_Pseudo_Task.cpp \
-  POSIX_Asynch_IO.cpp \
-  WIN32_Asynch_IO.cpp
-
-libACE_Sockets_la_SOURCES = \
-  Addr.cpp \
-  INET_Addr.cpp \
-  Multihomed_INET_Addr.cpp \
-  IPC_SAP.cpp \
-  LSOCK.cpp \
-  LSOCK_Acceptor.cpp \
-  LSOCK_CODgram.cpp \
-  LSOCK_Connector.cpp \
-  LSOCK_Dgram.cpp \
-  LSOCK_Stream.cpp \
+  Reactor_Notification_Strategy.cpp \
+  Read_Buffer.cpp \
+  Recursive_Thread_Mutex.cpp \
+  Recyclable.cpp \
+  Refcountable.cpp \
+  Registry.cpp \
+  Registry_Name_Space.cpp \
+  Remote_Name_Space.cpp \
+  Remote_Tokens.cpp \
   SOCK.cpp \
   SOCK_Acceptor.cpp \
   SOCK_CODgram.cpp \
-  Sock_Connect.cpp \
   SOCK_Connector.cpp \
   SOCK_Dgram.cpp \
   SOCK_Dgram_Bcast.cpp \
@@ -375,1020 +243,1103 @@ libACE_Sockets_la_SOURCES = \
   SOCK_SEQPACK_Acceptor.cpp \
   SOCK_SEQPACK_Association.cpp \
   SOCK_SEQPACK_Connector.cpp \
-  SOCK_Stream.cpp
-
-libACE_IPC_la_SOURCES = \
-  ATM_Addr.cpp \
-  ATM_Acceptor.cpp \
-  ATM_Connector.cpp \
-  ATM_Params.cpp \
-  ATM_QoS.cpp \
-  ATM_Stream.cpp \
-  DEV.cpp \
-  DEV_Addr.cpp \
-  DEV_Connector.cpp \
-  DEV_IO.cpp \
-  FIFO.cpp \
-  FIFO_Recv.cpp \
-  FIFO_Recv_Msg.cpp \
-  FIFO_Send.cpp \
-  FIFO_Send_Msg.cpp \
-  FILE_Addr.cpp \
-  FILE.cpp \
-  FILE_Connector.cpp \
-  FILE_IO.cpp \
-  IO_SAP.cpp \
-  IOStream.cpp \
-  Pipe.cpp \
-  Signal.cpp \
-  SPIPE_Addr.cpp \
+  SOCK_Stream.cpp \
   SPIPE.cpp \
   SPIPE_Acceptor.cpp \
+  SPIPE_Addr.cpp \
   SPIPE_Connector.cpp \
   SPIPE_Stream.cpp \
+  SString.cpp \
+  SUN_Proactor.cpp \
   SV_Message.cpp \
   SV_Message_Queue.cpp \
   SV_Semaphore_Complex.cpp \
   SV_Semaphore_Simple.cpp \
   SV_Shared_Memory.cpp \
-  TLI.cpp \
-  TLI_Acceptor.cpp \
-  TLI_Connector.cpp \
-  TLI_Stream.cpp \
-  TTY_IO.cpp \
-  UNIX_Addr.cpp \
-  UPIPE_Acceptor.cpp \
-  UPIPE_Connector.cpp \
-  UPIPE_Stream.cpp \
-  XTI_ATM_Mcast.cpp \
-  MEM_Acceptor.cpp \
-  MEM_Addr.cpp \
-  MEM_Connector.cpp \
-  MEM_IO.cpp \
-  MEM_SAP.cpp \
-  MEM_Stream.cpp
-
-libACE_Svcconf_la_SOURCES = \
-  DLL.cpp \
-  DLL_Manager.cpp \
-  Dynamic_Service_Base.cpp \
-  Parse_Node.cpp \
+  Sample_History.cpp \
+  Sbrk_Memory_Pool.cpp \
+  Sched_Params.cpp \
+  Select_Reactor.cpp \
+  Select_Reactor_Base.cpp \
+  Semaphore.cpp \
   Service_Config.cpp \
   Service_Manager.cpp \
   Service_Object.cpp \
   Service_Repository.cpp \
-  Service_Types.cpp \
   Service_Templates.cpp \
+  Service_Types.cpp \
+  Shared_Memory.cpp \
+  Shared_Memory_MM.cpp \
+  Shared_Memory_Pool.cpp \
+  Shared_Memory_SV.cpp \
   Shared_Object.cpp \
-  XML_Svc_Conf.cpp \
+  Signal.cpp \
+  Sock_Connect.cpp \
+  Stats.cpp \
+  String_Base_Const.cpp \
+  Svc_Conf_Lexer_Guard.cpp \
   Svc_Conf_l.cpp \
   Svc_Conf_y.cpp \
-  Svc_Conf_Lexer_Guard.cpp
-
-libACE_Streams_la_SOURCES = \
-  CDR_Base.cpp \
-  CDR_Stream.cpp \
-  Codeset_IBM1047.cpp \
-  Codeset_Registry.cpp \
-  Codeset_Registry_db.cpp \
-  Message_Queue.cpp \
-  Reactor_Notification_Strategy.cpp \
-  Task.cpp
-
-libACE_Memory_la_SOURCES = \
-  Based_Pointer_Repository.cpp \
-  Malloc.cpp \
-  PI_Malloc.cpp \
-  Malloc_Allocator.cpp \
-  Malloc_Instantiations.cpp \
-  Mem_Map.cpp \
-  Memory_Pool.cpp \
-  Obchunk.cpp \
-  Obstack.cpp \
-  Read_Buffer.cpp \
-  Shared_Memory.cpp \
-  Shared_Memory_MM.cpp \
-  Shared_Memory_SV.cpp
-
-libACE_Token_la_SOURCES = \
-  Local_Tokens.cpp \
-  Remote_Tokens.cpp \
-  Token_Collection.cpp \
-  Token_Invariants.cpp \
-  Token_Manager.cpp \
-  Token_Request_Reply.cpp
-
-libACE_Timer_la_SOURCES = \
-  Basic_Stats.cpp \
-  High_Res_Timer.cpp \
-  Profile_Timer.cpp \
+  Synch_Options.cpp \
   System_Time.cpp \
+  TLI.cpp \
+  TLI_Acceptor.cpp \
+  TLI_Connector.cpp \
+  TLI_Stream.cpp \
+  TP_Reactor.cpp \
+  TSS_Adapter.cpp \
+  TTY_IO.cpp \
+  Task.cpp \
+  Thread.cpp \
+  Thread_Adapter.cpp \
+  Thread_Control.cpp \
+  Thread_Exit.cpp \
+  Thread_Hook.cpp \
+  Thread_Manager.cpp \
+  Thread_Mutex.cpp \
+  Thread_Semaphore.cpp \
   Time_Request_Reply.cpp \
+  Time_Value.cpp \
   Timeprobe.cpp \
   Timer_Hash.cpp \
   Timer_Heap.cpp \
   Timer_List.cpp \
   Timer_Queue.cpp \
   Timer_Wheel.cpp \
-  $(ACE_GETHRTIME_CPP)
-
-# We only want `gethrtime.cpp' if building on Pentium(tm) so we need
-# to let Automake know that `gethrtime.cpp' is conditionally built.
-EXTRA_libACE_Timer_la_SOURCES = gethrtime.cpp
-
-libACE_Codecs_la_SOURCES = \
-  Codecs.cpp
-
-libACE_Other_la_SOURCES = \
-  Local_Name_Space.cpp \
-  Name_Proxy.cpp \
-  Name_Request_Reply.cpp \
-  Name_Space.cpp \
-  Naming_Context.cpp \
-  Registry_Name_Space.cpp \
-  Remote_Name_Space.cpp
-
-libACE_UUID_la_SOURCES = \
-  UUID.cpp
-
-libACE_la_SOURCES = \
-  $(libACE_OS_la_SOURCES) \
-  $(libACE_Utils_la_SOURCES) \
-  $(libACE_Logging_la_SOURCES) \
-  $(libACE_Threads_la_SOURCES) \
-  $(libACE_Demux_la_SOURCES) \
-  $(libACE_Connection_la_SOURCES) \
-  $(libACE_Sockets_la_SOURCES) \
-  $(libACE_IPC_la_SOURCES) \
-  $(libACE_Svcconf_la_SOURCES) \
-  $(libACE_Streams_la_SOURCES) \
-  $(libACE_Memory_la_SOURCES) \
-  $(libACE_Timer_la_SOURCES) \
-  $(libACE_Token_la_SOURCES) \
-  $(libACE_Codecs_la_SOURCES) \
-  $(libACE_Other_la_SOURCES) \
-  $(libACE_UUID_la_SOURCES)
-
-
-## ACE's versioning scheme is not compatible with libtool's scheme so
-## use "-version-number", instead of "-version-info", to override it.
-libACE_la_LDFLAGS = $(X_LIBS) \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Codecs_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Connection_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Demux_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_IPC_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Logging_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Memory_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_OS_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Other_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Sockets_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Streams_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Svcconf_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Threads_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Timer_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Token_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_Utils_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_UUID_la_LDFLAGS = \
-  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+  Token.cpp \
+  Token_Collection.cpp \
+  Token_Invariants.cpp \
+  Token_Manager.cpp \
+  Token_Request_Reply.cpp \
+  Trace.cpp \
+  UNIX_Addr.cpp \
+  UPIPE_Acceptor.cpp \
+  UPIPE_Connector.cpp \
+  UPIPE_Stream.cpp \
+  UUID.cpp \
+  WFMO_Reactor.cpp \
+  WIN32_Asynch_IO.cpp \
+  WIN32_Proactor.cpp \
+  XML_Svc_Conf.cpp \
+  XTI_ATM_Mcast.cpp \
+  gethrtime.cpp
 
-# We also add any X libraries to the list.
-libACE_la_LIBADD = $(X_PRE_LIBS) $(ACE_XLIBS) $(X_EXTRA_LIBS)
+libACE_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
 
-## These are template source files.
-TEMPLATE_FILES = \
+nobase_include_HEADERS = \
+  ACE.h \
+  ACE.inl \
+  ACE_export.h \
+  ARGV.h \
+  ARGV.inl \
+  ATM_Acceptor.h \
+  ATM_Acceptor.inl \
+  ATM_Addr.h \
+  ATM_Addr.inl \
+  ATM_Connector.h \
+  ATM_Connector.inl \
+  ATM_Params.h \
+  ATM_Params.inl \
+  ATM_QoS.h \
+  ATM_QoS.inl \
+  ATM_Stream.h \
+  ATM_Stream.inl \
   Acceptor.cpp \
-  Active_Map_Manager_T.cpp \
-  Array_Base.cpp \
-  Asynch_Acceptor.cpp \
-  Asynch_Connector.cpp \
-  Atomic_Op_T.cpp \
-  Auto_IncDec_T.cpp \
-  Auto_Ptr.cpp \
-  Based_Pointer_T.cpp \
-  Cached_Connect_Strategy_T.cpp \
-  Cache_Map_Manager_T.cpp \
-  Caching_Strategies_T.cpp \
-  Caching_Utility_T.cpp \
-  Cleanup_Strategies_T.cpp \
-  Condition_T.cpp \
-  Connector.cpp \
-  Containers_T.cpp \
-  Dump_T.cpp \
-  Dynamic_Service.cpp \
-  Env_Value_T.cpp \
-  Event_Handler_T.cpp \
-  Framework_Component_T.cpp \
-  Free_List.cpp \
-  Functor_T.cpp \
-  Future.cpp \
-  Future_Set.cpp \
-  Guard_T.cpp \
-  Hash_Cache_Map_Manager_T.cpp \
-  Hash_Map_Manager_T.cpp \
-  Hash_Map_With_Allocator_T.cpp \
-  Intrusive_List.cpp \
-  Intrusive_List_Node.cpp \
-  IOStream_T.cpp \
-  Local_Name_Space_T.cpp \
-  Lock_Adapter_T.cpp \
-  LOCK_SOCK_Acceptor.cpp \
-  Malloc_T.cpp \
-  Managed_Object.cpp \
-  Map_Manager.cpp \
-  Map_T.cpp \
-  Message_Block_T.cpp \
-  Message_Queue_T.cpp \
-  Metrics_Cache_T.cpp \
-  Module.cpp \
-  Node.cpp \
-  Obstack_T.cpp \
-  Pair_T.cpp \
-  RB_Tree.cpp \
-  Reverse_Lock_T.cpp \
-  Select_Reactor_T.cpp \
-  Singleton.cpp \
-  Strategies_T.cpp \
-  Stream.cpp \
-  Stream_Modules.cpp \
-  String_Base.cpp \
-  Svc_Handler.cpp \
-  Swap.cpp \
-  Synch_T.cpp \
-  Task_Ex_T.cpp \
-  Task_T.cpp \
-  Test_and_Set.cpp \
-  Timeprobe_T.cpp \
-  Timer_Hash_T.cpp \
-  Timer_Heap_T.cpp \
-  Timer_List_T.cpp \
-  Timer_Queue_Adapters.cpp \
-  Timer_Queue_T.cpp \
-  Timer_Wheel_T.cpp \
-  TSS_T.cpp \
-  Typed_SV_Message.cpp \
-  Typed_SV_Message_Queue.cpp \
-  Unbounded_Queue.cpp \
-  Unbounded_Set_Ex.cpp \
-  Unbounded_Set.cpp \
-  Vector_T.cpp
-
-HEADER_FILES = \
   Acceptor.h \
-  ACE_export.h \
-  ACE.h \
-  ace_wchar.h \
   Activation_Queue.h \
+  Activation_Queue.inl \
   Active_Map_Manager.h \
+  Active_Map_Manager.inl \
+  Active_Map_Manager_T.cpp \
   Active_Map_Manager_T.h \
+  Active_Map_Manager_T.inl \
   Addr.h \
+  Addr.inl \
   Arg_Shifter.h \
-  ARGV.h \
   Argv_Type_Converter.h \
-  Array_Base.h \
+  Argv_Type_Converter.inl \
   Array.h \
+  Array_Base.cpp \
+  Array_Base.h \
+  Array_Base.inl \
+  Asynch_Acceptor.cpp \
   Asynch_Acceptor.h \
+  Asynch_Connector.cpp \
   Asynch_Connector.h \
   Asynch_IO.h \
   Asynch_IO_Impl.h \
+  Asynch_IO_Impl.inl \
   Asynch_Pseudo_Task.h \
-  ATM_Acceptor.h \
-  ATM_Addr.h \
-  ATM_Connector.h \
-  ATM_Params.h \
-  ATM_QoS.h \
-  ATM_Stream.h \
   Atomic_Op.h \
+  Atomic_Op.inl \
+  Atomic_Op_T.cpp \
   Atomic_Op_T.h \
+  Atomic_Op_T.inl \
   Auto_Event.h \
+  Auto_Event.inl \
+  Auto_Functor.cpp \
+  Auto_Functor.h \
+  Auto_Functor.inl \
+  Auto_IncDec_T.cpp \
   Auto_IncDec_T.h \
+  Auto_IncDec_T.inl \
+  Auto_Ptr.cpp \
   Auto_Ptr.h \
+  Auto_Ptr.inl \
   Barrier.h \
+  Barrier.inl \
+  Base_Thread_Adapter.h \
+  Base_Thread_Adapter.inl \
   Based_Pointer_Repository.h \
+  Based_Pointer_T.cpp \
   Based_Pointer_T.h \
-  Base_Thread_Adapter.h \
+  Based_Pointer_T.inl \
   Basic_Stats.h \
+  Basic_Stats.inl \
   Basic_Types.h \
+  Basic_Types.inl \
   Bound_Ptr.h \
-  Cached_Connect_Strategy_T.h \
+  Bound_Ptr.inl \
+  CDR_Base.h \
+  CDR_Base.inl \
+  CDR_Stream.h \
+  CDR_Stream.inl \
+  CORBA_macros.h \
+  Cache_Map_Manager_T.cpp \
   Cache_Map_Manager_T.h \
+  Cache_Map_Manager_T.inl \
+  Cached_Connect_Strategy_T.cpp \
+  Cached_Connect_Strategy_T.h \
+  Caching_Strategies_T.cpp \
   Caching_Strategies_T.h \
+  Caching_Strategies_T.inl \
+  Caching_Utility_T.cpp \
   Caching_Utility_T.h \
   Capabilities.h \
-  CDR_Base.h \
-  CDR_Stream.h \
-  CE_Screen_Output.h \
+  Capabilities.inl \
   Cleanup.h \
+  Cleanup.inl \
+  Cleanup_Strategies_T.cpp \
   Cleanup_Strategies_T.h \
   Codecs.h \
   Codeset_IBM1047.h \
   Codeset_Registry.h \
+  Codeset_Registry.inl \
   Condition_Recursive_Thread_Mutex.h \
+  Condition_T.cpp \
   Condition_T.h \
+  Condition_T.inl \
   Condition_Thread_Mutex.h \
-  config-all.h \
-  config-doxygen.h \
-  config.h \
-  config-lite.h \
-  config-minimal.h \
-  config-posix.h \
+  Condition_Thread_Mutex.inl \
   Configuration.h \
   Configuration_Import_Export.h \
   Connection_Recycling_Strategy.h \
+  Connector.cpp \
   Connector.h \
   Containers.h \
+  Containers.inl \
+  Containers_T.cpp \
   Containers_T.h \
+  Containers_T.inl \
   Copy_Disabled.h \
-  CORBA_macros.h \
-  Date_Time.h \
-  Default_Constants.h \
+  DEV.h \
+  DEV.inl \
   DEV_Addr.h \
+  DEV_Addr.inl \
   DEV_Connector.h \
-  DEV.h \
+  DEV_Connector.inl \
   DEV_IO.h \
+  DEV_IO.inl \
+  DLL.h \
+  DLL_Manager.h \
+  Date_Time.h \
+  Date_Time.inl \
+  Default_Constants.h \
   Dev_Poll_Reactor.h \
+  Dev_Poll_Reactor.inl \
   Dirent.h \
+  Dirent.inl \
   Dirent_Selector.h \
-  DLL.h \
-  DLL_Manager.h \
+  Dirent_Selector.inl \
   Dump.h \
+  Dump_T.cpp \
   Dump_T.h \
   Dynamic.h \
-  Dynamic_Service_Base.h \
+  Dynamic.inl \
+  Dynamic_Service.cpp \
   Dynamic_Service.h \
+  Dynamic_Service.inl \
+  Dynamic_Service_Base.h \
+  Env_Value_T.cpp \
   Env_Value_T.h \
+  Env_Value_T.inl \
   Event.h \
+  Event.inl \
   Event_Handler.h \
+  Event_Handler.inl \
+  Event_Handler_T.cpp \
   Event_Handler_T.h \
+  Event_Handler_T.inl \
   Exception_Macros.h \
   FIFO.h \
+  FIFO.inl \
   FIFO_Recv.h \
+  FIFO_Recv.inl \
   FIFO_Recv_Msg.h \
+  FIFO_Recv_Msg.inl \
   FIFO_Send.h \
+  FIFO_Send.inl \
   FIFO_Send_Msg.h \
+  FIFO_Send_Msg.inl \
+  FILE.h \
+  FILE.inl \
   FILE_Addr.h \
-  Filecache.h \
+  FILE_Addr.inl \
   FILE_Connector.h \
-  FILE.h \
+  FILE_Connector.inl \
   FILE_IO.h \
+  FILE_IO.inl \
   File_Lock.h \
+  File_Lock.inl \
+  Filecache.h \
   Flag_Manip.h \
-  FlReactor.h \
+  Flag_Manip.inl \
   Framework_Component.h \
+  Framework_Component.inl \
+  Framework_Component_T.cpp \
   Framework_Component_T.h \
+  Free_List.cpp \
   Free_List.h \
+  Free_List.inl \
   Functor.h \
+  Functor.inl \
   Functor_String.h \
+  Functor_String.inl \
+  Functor_T.cpp \
   Functor_T.h \
+  Functor_T.inl \
+  Future.cpp \
   Future.h \
+  Future_Set.cpp \
   Future_Set.h \
   Get_Opt.h \
+  Get_Opt.inl \
   Global_Macros.h \
+  Guard_T.cpp \
   Guard_T.h \
+  Guard_T.inl \
   Handle_Gobbler.h \
+  Handle_Gobbler.inl \
   Handle_Ops.h \
   Handle_Set.h \
-  Hashable.h \
+  Handle_Set.inl \
+  Hash_Cache_Map_Manager_T.cpp \
   Hash_Cache_Map_Manager_T.h \
+  Hash_Cache_Map_Manager_T.inl \
   Hash_Map_Manager.h \
+  Hash_Map_Manager_T.cpp \
   Hash_Map_Manager_T.h \
+  Hash_Map_Manager_T.inl \
+  Hash_Map_With_Allocator_T.cpp \
   Hash_Map_With_Allocator_T.h \
+  Hash_Map_With_Allocator_T.inl \
+  Hashable.h \
+  Hashable.inl \
   High_Res_Timer.h \
-  If_Then_Else.h \
+  High_Res_Timer.inl \
+  ICMP_Socket.h \
+  ICMP_Socket.inl \
   INET_Addr.h \
-  Init_ACE.h \
-  Intrusive_List.h \
-  Intrusive_List_Node.h \
-  IO_Cntl_Msg.h \
-  IO_SAP.h \
-  iosfwd.h \
+  INET_Addr.inl \
   IOStream.h \
+  IOStream_T.cpp \
   IOStream_T.h \
+  IOStream_T.inl \
+  IO_Cntl_Msg.h \
+  IO_SAP.h \
+  IO_SAP.inl \
   IPC_SAP.h \
+  IPC_SAP.inl \
+  If_Then_Else.h \
+  Init_ACE.h \
+  Intrusive_List.cpp \
+  Intrusive_List.h \
+  Intrusive_List.inl \
+  Intrusive_List_Node.cpp \
+  Intrusive_List_Node.h \
+  Intrusive_List_Node.inl \
+  LOCK_SOCK_Acceptor.cpp \
+  LOCK_SOCK_Acceptor.h \
+  LSOCK.h \
+  LSOCK.inl \
+  LSOCK_Acceptor.h \
+  LSOCK_CODgram.h \
+  LSOCK_CODgram.inl \
+  LSOCK_Connector.h \
+  LSOCK_Connector.inl \
+  LSOCK_Dgram.h \
+  LSOCK_Dgram.inl \
+  LSOCK_Stream.h \
+  LSOCK_Stream.inl \
   Lib_Find.h \
+  Local_Memory_Pool.h \
   Local_Name_Space.h \
+  Local_Name_Space_T.cpp \
   Local_Name_Space_T.h \
   Local_Tokens.h \
-  Lock_Adapter_T.h \
+  Local_Tokens.inl \
   Lock.h \
-  LOCK_SOCK_Acceptor.h \
-  Logging_Strategy.h \
+  Lock.inl \
+  Lock_Adapter_T.cpp \
+  Lock_Adapter_T.h \
+  Lock_Adapter_T.inl \
+  Log_Msg.h \
   Log_Msg_Backend.h \
   Log_Msg_Callback.h \
-  Log_Msg.h \
   Log_Msg_IPC.h \
   Log_Msg_NT_Event_Log.h \
   Log_Msg_UNIX_Syslog.h \
   Log_Priority.h \
   Log_Record.h \
-  LSOCK_Acceptor.h \
-  LSOCK_CODgram.h \
-  LSOCK_Connector.h \
-  LSOCK_Dgram.h \
-  LSOCK.h \
-  LSOCK_Stream.h \
+  Log_Record.inl \
+  Logging_Strategy.h \
+  MEM_Acceptor.h \
+  MEM_Acceptor.inl \
+  MEM_Addr.h \
+  MEM_Addr.inl \
+  MEM_Connector.h \
+  MEM_Connector.inl \
+  MEM_IO.h \
+  MEM_IO.inl \
+  MEM_SAP.h \
+  MEM_SAP.inl \
+  MEM_Stream.h \
+  MEM_Stream.inl \
+  MMAP_Memory_Pool.h \
+  Malloc.h \
+  Malloc.inl \
   Malloc_Allocator.h \
+  Malloc_Allocator.inl \
   Malloc_Base.h \
-  Malloc.h \
+  Malloc_T.cpp \
   Malloc_T.h \
+  Malloc_T.inl \
+  Managed_Object.cpp \
   Managed_Object.h \
+  Managed_Object.inl \
   Manual_Event.h \
-  Map.h \
+  Manual_Event.inl \
+  Map_Manager.cpp \
   Map_Manager.h \
+  Map_Manager.inl \
+  Map_T.cpp \
   Map_T.h \
-  MEM_Acceptor.h \
-  MEM_Addr.h \
-  MEM_Connector.h \
-  MEM_IO.h \
+  Map_T.inl \
   Mem_Map.h \
+  Mem_Map.inl \
   Memory_Pool.h \
-  MEM_SAP.h \
-  MEM_Stream.h \
   Message_Block.h \
+  Message_Block.inl \
+  Message_Block_T.cpp \
   Message_Block_T.h \
+  Message_Block_T.inl \
   Message_Queue.h \
+  Message_Queue.inl \
+  Message_Queue_T.cpp \
   Message_Queue_T.h \
+  Message_Queue_T.inl \
   Method_Object.h \
   Method_Request.h \
   Metrics_Cache.h \
-  Metrics_Cache_T.h \
+  Metrics_Cache_T.cpp \
   Min_Max.h \
+  Module.cpp \
   Module.h \
+  Module.inl \
   Msg_WFMO_Reactor.h \
+  Msg_WFMO_Reactor.inl \
   Multihomed_INET_Addr.h \
-  Multiplexor.h \
+  Multihomed_INET_Addr.inl \
   Mutex.h \
+  Mutex.inl \
+  NT_Service.h \
+  NT_Service.inl \
   Name_Proxy.h \
   Name_Request_Reply.h \
   Name_Space.h \
   Naming_Context.h \
+  Node.cpp \
   Node.h \
   Notification_Strategy.h \
-  NT_Service.h \
+  Notification_Strategy.inl \
   Null_Barrier.h \
   Null_Condition.h \
   Null_Mutex.h \
   Null_Semaphore.h \
-  Obchunk.h \
-  Object_Manager_Base.h \
-  Object_Manager.h \
-  Obstack.h \
-  Obstack_T.h \
+  OS.h \
+  OS.inl \
   OS_Dirent.h \
   OS_Errno.h \
-  OS.h \
+  OS_Errno.inl \
   OS_Log_Msg_Attributes.h \
-  OS_main.h \
+  OS_Log_Msg_Attributes.inl \
   OS_Memory.h \
+  OS_Memory.inl \
+  OS_NS_Thread.h \
+  OS_NS_Thread.inl \
   OS_NS_arpa_inet.h \
+  OS_NS_arpa_inet.inl \
   OS_NS_ctype.h \
+  OS_NS_ctype.inl \
   OS_NS_dirent.h \
+  OS_NS_dirent.inl \
   OS_NS_dlfcn.h \
+  OS_NS_dlfcn.inl \
   OS_NS_errno.h \
+  OS_NS_errno.inl \
   OS_NS_fcntl.h \
+  OS_NS_fcntl.inl \
   OS_NS_macros.h \
   OS_NS_math.h \
+  OS_NS_math.inl \
   OS_NS_netdb.h \
+  OS_NS_netdb.inl \
   OS_NS_poll.h \
+  OS_NS_poll.inl \
   OS_NS_pwd.h \
+  OS_NS_pwd.inl \
   OS_NS_regex.h \
+  OS_NS_regex.inl \
   OS_NS_signal.h \
+  OS_NS_signal.inl \
   OS_NS_stdio.h \
+  OS_NS_stdio.inl \
   OS_NS_stdlib.h \
+  OS_NS_stdlib.inl \
   OS_NS_string.h \
+  OS_NS_string.inl \
   OS_NS_strings.h \
+  OS_NS_strings.inl \
   OS_NS_stropts.h \
+  OS_NS_stropts.inl \
   OS_NS_sys_mman.h \
+  OS_NS_sys_mman.inl \
   OS_NS_sys_msg.h \
+  OS_NS_sys_msg.inl \
   OS_NS_sys_resource.h \
+  OS_NS_sys_resource.inl \
   OS_NS_sys_select.h \
+  OS_NS_sys_select.inl \
   OS_NS_sys_shm.h \
+  OS_NS_sys_shm.inl \
   OS_NS_sys_socket.h \
+  OS_NS_sys_socket.inl \
   OS_NS_sys_stat.h \
+  OS_NS_sys_stat.inl \
   OS_NS_sys_time.h \
+  OS_NS_sys_time.inl \
   OS_NS_sys_uio.h \
+  OS_NS_sys_uio.inl \
   OS_NS_sys_utsname.h \
+  OS_NS_sys_utsname.inl \
   OS_NS_sys_wait.h \
-  OS_NS_Thread.h \
+  OS_NS_sys_wait.inl \
   OS_NS_time.h \
+  OS_NS_time.inl \
   OS_NS_unistd.h \
+  OS_NS_unistd.inl \
   OS_NS_wchar.h \
+  OS_NS_wchar.inl \
   OS_QoS.h \
   OS_String.h \
-  OS_Thread_Adapter.h \
+  OS_String.inl \
   OS_TLI.h \
-  Pair.h \
-  Pair_T.h \
-  Parse_Node.h \
+  OS_TLI.inl \
+  OS_Thread_Adapter.h \
+  OS_main.h \
+  Obchunk.h \
+  Obchunk.inl \
+  Object_Manager.h \
+  Object_Manager.inl \
+  Object_Manager_Base.h \
+  Obstack.h \
+  Obstack_T.cpp \
+  Obstack_T.h \
+  Obstack_T.inl \
   PI_Malloc.h \
-  Pipe.h \
+  PI_Malloc.inl \
   POSIX_Asynch_IO.h \
   POSIX_CB_Proactor.h \
+  POSIX_CB_Proactor.inl \
   POSIX_Proactor.h \
-  post.h \
-  pre.h \
+  POSIX_Proactor.inl \
+  Pagefile_Memory_Pool.h \
+  Pagefile_Memory_Pool.inl \
+  Pair.h \
+  Pair_T.cpp \
+  Pair_T.h \
+  Pair_T.inl \
+  Parse_Node.h \
+  Parse_Node.inl \
+  Ping_Socket.h \
+  Ping_Socket.inl \
+  Pipe.h \
+  Pipe.inl \
   Priority_Reactor.h \
   Proactor.h \
+  Proactor.inl \
   Proactor_Impl.h \
   Process.h \
+  Process.inl \
   Process_Manager.h \
+  Process_Manager.inl \
   Process_Mutex.h \
+  Process_Mutex.inl \
   Process_Semaphore.h \
+  Process_Semaphore.inl \
   Profile_Timer.h \
-  QtReactor.h \
+  Profile_Timer.inl \
+  RB_Tree.cpp \
   RB_Tree.h \
+  RB_Tree.inl \
+  RW_Mutex.h \
+  RW_Mutex.inl \
+  RW_Process_Mutex.h \
+  RW_Process_Mutex.inl \
+  RW_Thread_Mutex.h \
+  RW_Thread_Mutex.inl \
   Reactor.h \
+  Reactor.inl \
   Reactor_Impl.h \
   Reactor_Notification_Strategy.h \
+  Reactor_Notification_Strategy.inl \
   Reactor_Timer_Interface.h \
   Read_Buffer.h \
+  Read_Buffer.inl \
   Recursive_Thread_Mutex.h \
+  Recursive_Thread_Mutex.inl \
   Recyclable.h \
+  Recyclable.inl \
   Refcountable.h \
+  Refcountable.inl \
   Refcounted_Auto_Ptr.h \
+  Refcounted_Auto_Ptr.inl \
   Registry.h \
   Registry_Name_Space.h \
   Remote_Name_Space.h \
   Remote_Tokens.h \
+  Remote_Tokens.inl \
+  Reverse_Lock_T.cpp \
   Reverse_Lock_T.h \
-  RW_Mutex.h \
-  RW_Process_Mutex.h \
-  RW_Thread_Mutex.h \
+  Reverse_Lock_T.inl \
+  SOCK.h \
+  SOCK.inl \
+  SOCK_Acceptor.h \
+  SOCK_Acceptor.inl \
+  SOCK_CODgram.h \
+  SOCK_CODgram.inl \
+  SOCK_Connector.h \
+  SOCK_Connector.inl \
+  SOCK_Dgram.h \
+  SOCK_Dgram.inl \
+  SOCK_Dgram_Bcast.h \
+  SOCK_Dgram_Bcast.inl \
+  SOCK_Dgram_Mcast.h \
+  SOCK_Dgram_Mcast.inl \
+  SOCK_IO.h \
+  SOCK_IO.inl \
+  SOCK_SEQPACK_Acceptor.h \
+  SOCK_SEQPACK_Acceptor.inl \
+  SOCK_SEQPACK_Association.h \
+  SOCK_SEQPACK_Association.inl \
+  SOCK_SEQPACK_Connector.h \
+  SOCK_SEQPACK_Connector.inl \
+  SOCK_Stream.h \
+  SOCK_Stream.inl \
+  SPIPE.h \
+  SPIPE.inl \
+  SPIPE_Acceptor.h \
+  SPIPE_Addr.h \
+  SPIPE_Addr.inl \
+  SPIPE_Connector.h \
+  SPIPE_Connector.inl \
+  SPIPE_Stream.h \
+  SPIPE_Stream.inl \
+  SString.h \
+  SString.inl \
+  SStringfwd.h \
+  SUN_Proactor.h \
+  SUN_Proactor.inl \
+  SV_Message.h \
+  SV_Message.inl \
+  SV_Message_Queue.h \
+  SV_Message_Queue.inl \
+  SV_Semaphore_Complex.h \
+  SV_Semaphore_Complex.inl \
+  SV_Semaphore_Simple.h \
+  SV_Semaphore_Simple.inl \
+  SV_Shared_Memory.h \
+  SV_Shared_Memory.inl \
   Sample_History.h \
+  Sample_History.inl \
+  Sbrk_Memory_Pool.h \
   Sched_Params.h \
-  Select_Reactor_Base.h \
+  Sched_Params.inl \
   Select_Reactor.h \
+  Select_Reactor_Base.h \
+  Select_Reactor_Base.inl \
+  Select_Reactor_T.cpp \
   Select_Reactor_T.h \
+  Select_Reactor_T.inl \
   Semaphore.h \
+  Semaphore.inl \
   Service_Config.h \
+  Service_Config.inl \
   Service_Manager.h \
+  Service_Manager.inl \
   Service_Object.h \
+  Service_Object.inl \
   Service_Repository.h \
+  Service_Repository.inl \
   Service_Templates.h \
   Service_Types.h \
+  Service_Types.inl \
   Shared_Memory.h \
   Shared_Memory_MM.h \
+  Shared_Memory_MM.inl \
+  Shared_Memory_Pool.h \
   Shared_Memory_SV.h \
+  Shared_Memory_SV.inl \
   Shared_Object.h \
+  Shared_Object.inl \
   Signal.h \
+  Signal.inl \
+  Singleton.cpp \
   Singleton.h \
-  SOCK_Acceptor.h \
-  SOCK_CODgram.h \
+  Singleton.inl \
   Sock_Connect.h \
-  SOCK_Connector.h \
-  SOCK_Dgram_Bcast.h \
-  SOCK_Dgram.h \
-  SOCK_Dgram_Mcast.h \
-  SOCK.h \
-  SOCK_IO.h \
-  SOCK_SEQPACK_Acceptor.h \
-  SOCK_SEQPACK_Association.h \
-  SOCK_SEQPACK_Connector.h \
-  SOCK_Stream.h \
-  SPIPE_Acceptor.h \
-  SPIPE_Addr.h \
-  SPIPE_Connector.h \
-  SPIPE.h \
-  SPIPE_Stream.h \
-  SStringfwd.h \
-  SString.h \
   Static_Object_Lock.h \
   Stats.h \
+  Stats.inl \
   Strategies.h \
+  Strategies_T.cpp \
   Strategies_T.h \
+  Strategies_T.inl \
+  Stream.cpp \
   Stream.h \
+  Stream.inl \
+  Stream_Modules.cpp \
   Stream_Modules.h \
-  streams.h \
-  String_Base_Const.h \
+  String_Base.cpp \
   String_Base.h \
-  SUN_Proactor.h \
+  String_Base.inl \
+  String_Base_Const.h \
   Svc_Conf.h \
   Svc_Conf_Lexer_Guard.h \
   Svc_Conf_Tokens.h \
-  svc_export.h \
+  Svc_Handler.cpp \
   Svc_Handler.h \
-  SV_Message.h \
-  SV_Message_Queue.h \
-  SV_Semaphore_Complex.h \
-  SV_Semaphore_Simple.h \
-  SV_Shared_Memory.h \
   Swap.h \
+  Swap.inl \
   Synch.h \
   Synch_Options.h \
+  Synch_Options.inl \
+  Synch_T.cpp \
   Synch_T.h \
   Synch_Traits.h \
   System_Time.h \
-  Task_Ex_T.h \
+  TLI.h \
+  TLI.inl \
+  TLI_Acceptor.h \
+  TLI_Connector.h \
+  TLI_Connector.inl \
+  TLI_Stream.h \
+  TLI_Stream.inl \
+  TP_Reactor.h \
+  TP_Reactor.inl \
+  TSS_Adapter.h \
+  TSS_Adapter.inl \
+  TSS_T.cpp \
+  TSS_T.h \
+  TSS_T.inl \
+  TTY_IO.h \
   Task.h \
+  Task.inl \
+  Task_Ex_T.cpp \
+  Task_Ex_T.h \
+  Task_Ex_T.inl \
+  Task_T.cpp \
   Task_T.h \
+  Task_T.inl \
+  Template_Instantiations.cpp \
+  Test_and_Set.cpp \
   Test_and_Set.h \
+  Thread.h \
+  Thread.inl \
   Thread_Adapter.h \
+  Thread_Adapter.inl \
   Thread_Control.h \
+  Thread_Control.inl \
   Thread_Exit.h \
-  Thread.h \
   Thread_Hook.h \
   Thread_Manager.h \
+  Thread_Manager.inl \
   Thread_Mutex.h \
+  Thread_Mutex.inl \
   Thread_Semaphore.h \
+  Thread_Semaphore.inl \
+  Time_Request_Reply.h \
+  Time_Value.h \
+  Time_Value.inl \
   Timeprobe.h \
+  Timeprobe.inl \
+  Timeprobe_T.cpp \
   Timeprobe_T.h \
-  Time_Request_Reply.h \
   Timer_Hash.h \
+  Timer_Hash_T.cpp \
   Timer_Hash_T.h \
   Timer_Heap.h \
+  Timer_Heap_T.cpp \
   Timer_Heap_T.h \
   Timer_List.h \
+  Timer_List_T.cpp \
   Timer_List_T.h \
-  Timer_Queue_Adapters.h \
-  Timer_Queuefwd.h \
   Timer_Queue.h \
+  Timer_Queue_Adapters.cpp \
+  Timer_Queue_Adapters.h \
+  Timer_Queue_Adapters.inl \
+  Timer_Queue_T.cpp \
   Timer_Queue_T.h \
+  Timer_Queue_T.inl \
+  Timer_Queuefwd.h \
   Timer_Wheel.h \
+  Timer_Wheel_T.cpp \
   Timer_Wheel_T.h \
-  Time_Value.h \
-  TkReactor.h \
-  TLI_Acceptor.h \
-  TLI_Connector.h \
-  TLI.h \
-  TLI_Stream.h \
-  Token_Collection.h \
   Token.h \
+  Token.inl \
+  Token_Collection.h \
+  Token_Collection.inl \
   Token_Invariants.h \
   Token_Manager.h \
+  Token_Manager.inl \
   Token_Request_Reply.h \
-  TP_Reactor.h \
+  Token_Request_Reply.inl \
   Trace.h \
-  TSS_Adapter.h \
-  TSS_T.h \
-  TTY_IO.h \
+  Typed_SV_Message.cpp \
   Typed_SV_Message.h \
+  Typed_SV_Message.inl \
+  Typed_SV_Message_Queue.cpp \
   Typed_SV_Message_Queue.h \
-  Unbounded_Queue.h \
-  Unbounded_Set_Ex.h \
-  Unbounded_Set.h \
+  Typed_SV_Message_Queue.inl \
   UNIX_Addr.h \
+  UNIX_Addr.inl \
   UPIPE_Acceptor.h \
+  UPIPE_Acceptor.inl \
   UPIPE_Addr.h \
   UPIPE_Connector.h \
+  UPIPE_Connector.inl \
   UPIPE_Stream.h \
+  UPIPE_Stream.inl \
   UUID.h \
+  UUID.inl \
+  Unbounded_Queue.cpp \
+  Unbounded_Queue.h \
+  Unbounded_Queue.inl \
+  Unbounded_Set.cpp \
+  Unbounded_Set.h \
+  Unbounded_Set.inl \
+  Vector_T.cpp \
   Vector_T.h \
+  Vector_T.inl \
   Version.h \
   WFMO_Reactor.h \
+  WFMO_Reactor.inl \
   WIN32_Asynch_IO.h \
   WIN32_Proactor.h \
   XML_Svc_Conf.h \
   XTI_ATM_Mcast.h \
-  XtReactor.h
-## Make sure config.h and config-all.h are in the above header list!
-
-INLINE_FILES = \
-  ACE.inl \
-  Activation_Queue.inl \
-  Active_Map_Manager.inl \
-  Active_Map_Manager_T.inl \
-  Addr.inl \
-  ARGV.inl \
-  Asynch_IO_Impl.inl \
-  ATM_Acceptor.inl \
-  ATM_Addr.inl \
-  ATM_Connector.inl \
-  ATM_Params.inl \
-  ATM_QoS.inl \
-  ATM_Stream.inl \
-  Atomic_Op.inl \
-  Atomic_Op_T.inl \
-  Auto_IncDec_T.inl \
-  Auto_Ptr.inl \
-  Based_Pointer_T.inl \
-  Basic_Types.inl \
-  Bound_Ptr.inl \
-  Cache_Map_Manager_T.inl \
-  Caching_Strategies_T.inl \
-  Capabilities.inl \
-  CDR_Stream.inl \
-  Containers.inl \
-  Containers_T.inl \
-  Date_Time.inl \
-  DEV_Addr.inl \
-  DEV_Connector.inl \
-  DEV.inl \
-  DEV_IO.inl \
-  Dirent.inl \
-  Dynamic.inl \
-  Dynamic_Service.inl \
-  Env_Value_T.inl \
-  Event_Handler.inl \
-  Event_Handler_T.inl \
-  FIFO.inl \
-  FIFO_Recv.inl \
-  FIFO_Recv_Msg.inl \
-  FIFO_Send.inl \
-  FIFO_Send_Msg.inl \
-  FILE_Addr.inl \
-  FILE_Connector.inl \
-  FILE.inl \
-  FILE_IO.inl \
-  Flag_Manip.inl \
-  Free_List.inl \
-  Functor.inl \
-  Functor_String.inl \
-  Functor_T.inl \
-  Get_Opt.inl \
-  Handle_Gobbler.inl \
-  Handle_Set.inl \
-  Hash_Cache_Map_Manager_T.inl \
-  Hash_Map_Manager_T.inl \
-  Hash_Map_With_Allocator_T.inl \
-  High_Res_Timer.inl \
-  INET_Addr.inl \
-  IO_SAP.inl \
-  IOStream_T.inl \
-  IPC_SAP.inl \
-  Local_Tokens.inl \
-  Log_Record.inl \
-  LSOCK_CODgram.inl \
-  LSOCK_Connector.inl \
-  LSOCK_Dgram.inl \
-  LSOCK.inl \
-  LSOCK_Stream.inl \
-  Malloc_Allocator.inl \
-  Malloc.inl \
-  Malloc_T.inl \
-  Managed_Object.inl \
-  Map_Manager.inl \
-  Map_T.inl \
-  MEM_Acceptor.inl \
-  MEM_Addr.inl \
-  MEM_Connector.inl \
-  MEM_IO.inl \
-  Mem_Map.inl \
-  Memory_Pool.inl \
-  MEM_SAP.inl \
-  MEM_Stream.inl \
-  Message_Block.inl \
-  Message_Block_T.inl \
-  Message_Queue.inl \
-  Message_Queue_T.inl \
-  Metrics_Cache_T.inl \
-  Module.inl \
-  Msg_WFMO_Reactor.inl \
-  Multihomed_INET_Addr.inl \
-  Multiplexor.inl \
-  NT_Service.inl \
-  Obchunk.inl \
-  Object_Manager.inl \
-  Obstack_T.inl \
-  OS.inl \
-  Pair_T.inl \
-  Parse_Node.inl \
-  PI_Malloc.inl \
-  Pipe.inl \
-  POSIX_CB_Proactor.inl \
-  POSIX_Proactor.inl \
-  Proactor.inl \
-  Process.inl \
-  Process_Manager.inl \
-  Profile_Timer.inl \
-  RB_Tree.inl \
-  Reactor.inl \
-  Read_Buffer.inl \
-  Refcounted_Auto_Ptr.inl \
-  Remote_Tokens.inl \
-  Sched_Params.inl \
-  Select_Reactor_Base.inl \
-  Select_Reactor_T.inl \
-  Service_Config.inl \
-  Service_Manager.inl \
-  Service_Object.inl \
-  Service_Repository.inl \
-  Service_Types.inl \
-  Shared_Memory_MM.inl \
-  Shared_Memory_SV.inl \
-  Shared_Object.inl \
-  Signal.inl \
-  Singleton.inl \
-  SOCK_Acceptor.inl \
-  SOCK_CODgram.inl \
-  SOCK_Connector.inl \
-  SOCK_Dgram_Bcast.inl \
-  SOCK_Dgram.inl \
-  SOCK_Dgram_Mcast.inl \
-  SOCK.inl \
-  SOCK_IO.inl \
-  SOCK_SEQPACK_Acceptor.inl \
-  SOCK_SEQPACK_Association.inl \
-  SOCK_SEQPACK_Connector.inl \
-  SOCK_Stream.inl \
-  SPIPE_Addr.inl \
-  SPIPE_Connector.inl \
-  SPIPE.inl \
-  SPIPE_Stream.inl \
-  SString.inl \
-  Stats.inl \
-  Strategies_T.inl \
-  Stream.inl \
-  String_Base.inl \
-  SUN_Proactor.inl \
-  SV_Message.inl \
-  SV_Message_Queue.inl \
-  SV_Semaphore_Complex.inl \
-  SV_Semaphore_Simple.inl \
-  SV_Shared_Memory.inl \
-  Synch_Options.inl \
-  Task_Ex_T.inl \
-  Task.inl \
-  Task_T.inl \
-  Thread.inl \
-  Thread_Manager.inl \
-  Timeprobe.inl \
-  Timer_Queue_Adapters.inl \
-  Timer_Queue_T.inl \
-  TLI_Connector.inl \
-  TLI.inl \
-  TLI_Stream.inl \
-  Token_Collection.inl \
-  Token.inl \
-  Token_Manager.inl \
-  Token_Request_Reply.inl \
-  TP_Reactor.inl \
-  Typed_SV_Message.inl \
-  Typed_SV_Message_Queue.inl \
-  UNIX_Addr.inl \
-  UPIPE_Acceptor.inl \
-  UPIPE_Connector.inl \
-  UPIPE_Stream.inl \
-  Vector_T.inl \
-  WFMO_Reactor.inl \
   XTI_ATM_Mcast.inl \
+  ace_wchar.h \
   ace_wchar.inl \
-  Argv_Type_Converter.inl \
-  Array_Base.inl \
-  Auto_Event.inl \
-  Barrier.inl \
-  Base_Thread_Adapter.inl \
-  Basic_Stats.inl \
-  CDR_Base.inl \
-  Cleanup.inl \
-  Codeset_Registry.inl \
-  Condition_Thread_Mutex.inl \
-  Condition_T.inl \
-  Dev_Poll_Reactor.inl \
-  Dirent_Selector.inl \
-  Event.inl \
-  File_Lock.inl \
-  Framework_Component.inl \
-  Guard_T.inl \
-  Hashable.inl \
-  Intrusive_List.inl \
-  Intrusive_List_Node.inl \
-  Lock_Adapter_T.inl \
-  Lock.inl \
-  Manual_Event.inl \
-  Mutex.inl \
-  Notification_Strategy.inl \
-  OS_Errno.inl \
-  OS_Log_Msg_Attributes.inl \
-  OS_Memory.inl \
-  OS_NS_arpa_inet.inl \
-  OS_NS_ctype.inl \
-  OS_NS_dirent.inl \
-  OS_NS_dlfcn.inl \
-  OS_NS_errno.inl \
-  OS_NS_fcntl.inl \
-  OS_NS_math.inl \
-  OS_NS_netdb.inl \
-  OS_NS_poll.inl \
-  OS_NS_pwd.inl \
-  OS_NS_regex.inl \
-  OS_NS_signal.inl \
-  OS_NS_stdio.inl \
-  OS_NS_stdlib.inl \
-  OS_NS_string.inl \
-  OS_NS_strings.inl \
-  OS_NS_stropts.inl \
-  OS_NS_sys_mman.inl \
-  OS_NS_sys_msg.inl \
-  OS_NS_sys_resource.inl \
-  OS_NS_sys_select.inl \
-  OS_NS_sys_shm.inl \
-  OS_NS_sys_socket.inl \
-  OS_NS_sys_stat.inl \
-  OS_NS_sys_time.inl \
-  OS_NS_sys_uio.inl \
-  OS_NS_sys_utsname.inl \
-  OS_NS_sys_wait.inl \
-  OS_NS_Thread.inl \
-  OS_NS_time.inl \
-  OS_NS_unistd.inl \
-  OS_NS_wchar.inl \
-  OS_String.inl \
-  OS_TLI.inl \
-  Process_Mutex.inl \
-  Process_Semaphore.inl \
-  Reactor_Notification_Strategy.inl \
-  Recursive_Thread_Mutex.inl \
-  Recyclable.inl \
-  Refcountable.inl \
-  Reverse_Lock_T.inl \
-  RW_Mutex.inl \
-  RW_Process_Mutex.inl \
-  RW_Thread_Mutex.inl \
-  Sample_History.inl \
-  Semaphore.inl \
-  Swap.inl \
-  Thread_Adapter.inl \
-  Thread_Control.inl \
-  Thread_Mutex.inl \
-  Thread_Semaphore.inl \
-  Time_Value.inl \
-  TSS_Adapter.inl \
-  TSS_T.inl \
-  Unbounded_Queue.inl \
-  Unbounded_Set_Ex.inl \
-  Unbounded_Set.inl \
-  UUID.inl
-
-## It would be good to remove pkgincludedir.  However, we want to install
-## headers in "$(prefix)/ace" not "$(prefix)/ACE" because the source files
-## include files in the directory "ace."  By default pkgincludedir would
-## be "$(prefix)/$(PACKAGE)" which would be "$(prefix)/ACE" in our case.
-## It is for this reason that we must redefine "pkgincludedir."
-## However, if we set the package to "ace" instead of "ACE" then we won't
-## need to set the "pkgincludedir."
-##        -Ossama
-##pkgincludedir = $(includedir)/ace
-pkginclude_HEADERS = \
-  $(HEADER_FILES) \
-  $(INLINE_FILES) \
-  $(TEMPLATE_FILES)
-
-## Make sure the following get into the distribution
-##EXTRA_DIST = $(TEMPLATE_FILES)
-
-## Directories to include in the distribution but which I am too lazy to
-## create Makefile.am files for.  A Makefile.am for these directories isn't
-## needed anyway.
-ACE_EXTRA_DIST = os_include
-
-## Automake recognized targets
-
-dist-hook:
-	(cd $(srcdir); tar cf - $(ACE_EXTRA_DIST)) | (cd $(distdir); \
-          tar xfBp -)
-	list=`find $(distdir) -type d -a \( -name CVS -o -name .svn \) -a -print`; for p in $$list; do \
-          rm -rf $$p; \
-        done
+  config-WinCE.h \
+  config-all.h \
+  config-borland-common.h \
+  config-lite.h \
+  config-minimal.h \
+  config-win32-borland.h \
+  config-win32-common.h \
+  config-win32-ghs.h \
+  config-win32-msvc-6.h \
+  config-win32-msvc-7.h \
+  config-win32-msvc.h \
+  config-win32-visualage.h \
+  config-win32.h \
+  config.h \
+  iosfwd.h \
+  os_include/arpa/os_inet.h \
+  os_include/net/os_if.h \
+  os_include/netinet/os_in.h \
+  os_include/netinet/os_tcp.h \
+  os_include/os_aio.h \
+  os_include/os_assert.h \
+  os_include/os_complex.h \
+  os_include/os_cpio.h \
+  os_include/os_ctype.h \
+  os_include/os_dirent.h \
+  os_include/os_dlfcn.h \
+  os_include/os_errno.h \
+  os_include/os_fcntl.h \
+  os_include/os_fenv.h \
+  os_include/os_float.h \
+  os_include/os_fmtmsg.h \
+  os_include/os_fnmatch.h \
+  os_include/os_ftw.h \
+  os_include/os_glob.h \
+  os_include/os_grp.h \
+  os_include/os_iconv.h \
+  os_include/os_inttypes.h \
+  os_include/os_iso646.h \
+  os_include/os_langinfo.h \
+  os_include/os_libgen.h \
+  os_include/os_limits.h \
+  os_include/os_local.h \
+  os_include/os_math.h \
+  os_include/os_monetary.h \
+  os_include/os_mqueue.h \
+  os_include/os_ndbm.h \
+  os_include/os_netdb.h \
+  os_include/os_nl_types.h \
+  os_include/os_poll.h \
+  os_include/os_pthread.h \
+  os_include/os_pwd.h \
+  os_include/os_regex.h \
+  os_include/os_sched.h \
+  os_include/os_search.h \
+  os_include/os_semaphore.h \
+  os_include/os_setjmp.h \
+  os_include/os_signal.h \
+  os_include/os_spawn.h \
+  os_include/os_stdarg.h \
+  os_include/os_stdbool.h \
+  os_include/os_stddef.h \
+  os_include/os_stdint.h \
+  os_include/os_stdio.h \
+  os_include/os_stdlib.h \
+  os_include/os_string.h \
+  os_include/os_strings.h \
+  os_include/os_stropts.h \
+  os_include/os_syslog.h \
+  os_include/os_tar.h \
+  os_include/os_termios.h \
+  os_include/os_tgmath.h \
+  os_include/os_time.h \
+  os_include/os_trace.h \
+  os_include/os_ucontext.h \
+  os_include/os_ulimit.h \
+  os_include/os_unistd.h \
+  os_include/os_utime.h \
+  os_include/os_utmpx.h \
+  os_include/os_wchar.h \
+  os_include/os_wctype.h \
+  os_include/os_wordexp.h \
+  os_include/sys/os_ipc.h \
+  os_include/sys/os_loadavg.h \
+  os_include/sys/os_mman.h \
+  os_include/sys/os_msg.h \
+  os_include/sys/os_pstat.h \
+  os_include/sys/os_resource.h \
+  os_include/sys/os_select.h \
+  os_include/sys/os_sem.h \
+  os_include/sys/os_shm.h \
+  os_include/sys/os_socket.h \
+  os_include/sys/os_stat.h \
+  os_include/sys/os_statvfs.h \
+  os_include/sys/os_time.h \
+  os_include/sys/os_timeb.h \
+  os_include/sys/os_times.h \
+  os_include/sys/os_types.h \
+  os_include/sys/os_uio.h \
+  os_include/sys/os_un.h \
+  os_include/sys/os_utsname.h \
+  os_include/sys/os_wait.h \
+  post.h \
+  pre.h \
+  streams.h \
+  svc_export.h
+
+pkgconfigdata_DATA += ACE.pc
+
+ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in
+
+EXTRA_DIST = \
+  ACE.pc.in \
+  ace.rc
+
+
+## Makefile.ACE_FlReactor.am 
+
+if BUILD_FL
+if BUILD_GL
+if BUILD_X11
+
+lib_LTLIBRARIES += libACE_FlReactor.la
+
+libACE_FlReactor_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DACE_FLREACTOR_BUILD_DLL
+
+libACE_FlReactor_la_SOURCES = \
+  FlReactor.cpp
+
+libACE_FlReactor_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+
+libACE_FlReactor_la_LIBADD = \
+ libACE.la
+
+nobase_include_HEADERS += \
+  ACE_FlReactor_export.h \
+  FlReactor.h
+
+pkgconfigdata_DATA += ACE_FlReactor.pc
+
+ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_FlReactor.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/ACE_FlReactor.pc.in
+
+endif BUILD_X11
+endif BUILD_GL
+endif BUILD_FL
+
+EXTRA_DIST += \
+  ACE_FlReactor.pc.in
+
+
+## Makefile.ACE_QtReactor.am 
+
+if BUILD_QT
+
+BUILT_SOURCES += \
+  QtReactor_moc.cpp
+
+CLEANFILES += \
+  QtReactor_moc.cpp
+
+QtReactor_moc.cpp: $(srcdir)/QtReactor.h
+	$(QTDIR)/bin/moc  $(srcdir)/QtReactor.h -o QtReactor_moc.cpp
+
+lib_LTLIBRARIES += libACE_QtReactor.la
+
+libACE_QtReactor_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(QTDIR)/include \
+  -DQT_THREAD_SUPPORT \
+  -DACE_QTREACTOR_BUILD_DLL
+
+libACE_QtReactor_la_SOURCES = \
+  QtReactor.cpp \
+  QtReactor_moc.cpp
+
+libACE_QtReactor_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+
+libACE_QtReactor_la_LIBADD = \
+ libACE.la -lqt-mt
+
+nobase_include_HEADERS += \
+  ACE_QtReactor_export.h \
+  QtReactor.h
+
+pkgconfigdata_DATA += ACE_QtReactor.pc
+
+ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_QtReactor.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/ACE_QtReactor.pc.in
+
+endif BUILD_QT
+
+EXTRA_DIST += \
+  ACE_QtReactor.pc.in
+
+
+## Makefile.ACE_TkReactor.am 
+
+if BUILD_TK
+
+lib_LTLIBRARIES += libACE_TkReactor.la
+
+libACE_TkReactor_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DACE_TKREACTOR_BUILD_DLL
+
+libACE_TkReactor_la_SOURCES = \
+  TkReactor.cpp
+
+libACE_TkReactor_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+
+libACE_TkReactor_la_LIBADD = \
+ libACE.la
+
+nobase_include_HEADERS += \
+  ACE_TkReactor_export.h \
+  TkReactor.h
+
+pkgconfigdata_DATA += ACE_TkReactor.pc
+
+ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_TkReactor.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/ACE_TkReactor.pc.in
+
+endif BUILD_TK
+
+EXTRA_DIST += \
+  ACE_TkReactor.pc.in
+
+
+## Makefile.ACE_XtReactor.am 
+
+if BUILD_X11
+if BUILD_XT
+
+lib_LTLIBRARIES += libACE_XtReactor.la
+
+libACE_XtReactor_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DACE_XTREACTOR_BUILD_DLL
+
+libACE_XtReactor_la_SOURCES = \
+  XtReactor.cpp
+
+libACE_XtReactor_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+
+libACE_XtReactor_la_LIBADD = \
+ libACE.la
+
+nobase_include_HEADERS += \
+  ACE_XtReactor_export.h \
+  XtReactor.h
+
+pkgconfigdata_DATA += ACE_XtReactor.pc
+
+ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_XtReactor.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/ACE_XtReactor.pc.in
+
+endif BUILD_XT
+endif BUILD_X11
+
+EXTRA_DIST += \
+  ACE_XtReactor.pc.in
+
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core core.*
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
 	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf Templates.DB gcctemp.c gcctemp so_locations *.ics
-	-rm -rf templateregistry SunWS_cache ir.out
-
-## Install headers in "os_include" directory.  Adding a Makefile.am in
-## os_include subdirectory just for installation purposes seemed like
-## overkill.
-install-data-local:
-	list=`(cd $(srcdir); find os_include -type d -a \! \( \( -name CVS -o -name .svn \) -prune \) )`; for p in $$list; do \
-	  $(mkdir_p) $(DESTDIR)$(pkgincludedir)/$$p; \
-	  files=`(cd $(srcdir)/$$p; $(ECHO) *.h)`; \
-          test "$$files" != "*.h"  && \
-            (cd $(srcdir)/$$p; $(INSTALL_DATA) $$files $(DESTDIR)$(pkgincludedir)/$$p); \
-	done
-
-## Clean up data installed by local targets.
-uninstall-local:
-	-rm -rf $(DESTDIR)$(pkgincludedir)/os_include
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ace/Malloc_Allocator.cpp b/ace/Malloc_Allocator.cpp
index bfa794e1a7f..ec12aa32954 100644
--- a/ace/Malloc_Allocator.cpp
+++ b/ace/Malloc_Allocator.cpp
@@ -20,6 +20,8 @@
 
 #include "ace/Guard_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
+#include "ace/Log_Msg.h"  // for ACE_ASSERT
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID (ace, Malloc_Allocator, "$Id$")
 
@@ -138,14 +140,217 @@ ACE_New_Allocator::calloc (size_t nbytes,
   return (void *) ptr;
 }
 
+void *
+ACE_New_Allocator::calloc (size_t n_elem, size_t elem_size, char initial_value)
+{
+  return ACE_New_Allocator::calloc (n_elem * elem_size, initial_value);
+}
+
 void
 ACE_New_Allocator::free (void *ptr)
 {
   delete [] (char *) ptr;
 }
 
+int
+ACE_New_Allocator::remove (void)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::bind (const char *, void *, int)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::trybind (const char *, void *&)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::find (const char *, void *&)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::find (const char *)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::unbind (const char *)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::unbind (const char *, void *&)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::sync (ssize_t, int)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::sync (void *, size_t, int)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::protect (ssize_t, int)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+int
+ACE_New_Allocator::protect (void *, size_t, int)
+{
+  ACE_NOTSUP_RETURN (-1);
+}
+
+#if defined (ACE_HAS_MALLOC_STATS)
+void
+ACE_New_Allocator::print_stats (void) const
+{
+}
+#endif /* ACE_HAS_MALLOC_STATS */
+
+void
+ACE_New_Allocator::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
+}
+
 /******************************************************************************/
 
+void *
+ACE_Static_Allocator_Base::malloc (size_t nbytes)
+{
+  if (this->offset_ + nbytes > this->size_)
+    {
+      errno = ENOMEM;
+      return 0;
+    }
+  else
+    {
+      // Record the current offset, increment the offset by the number
+      // of bytes requested, and return the original offset.
+      char *ptr = &this->buffer_[this->offset_];
+      this->offset_ += nbytes;
+      return (void *) ptr;
+    }
+}
+
+void *
+ACE_Static_Allocator_Base::calloc (size_t nbytes,
+                                   char initial_value)
+{
+  void *ptr = this->malloc (nbytes);
+
+  ACE_OS::memset (ptr, initial_value, nbytes);
+  return (void *) ptr;
+}
+
+void *
+ACE_Static_Allocator_Base::calloc (size_t n_elem,
+                                   size_t elem_size,
+                                   char initial_value)
+{
+  return this->calloc (n_elem * elem_size, initial_value);
+}
+
+void
+ACE_Static_Allocator_Base::free (void *ptr)
+{
+  // Check to see if ptr is within our pool?!
+  ACE_UNUSED_ARG (ptr);
+  ACE_ASSERT (ptr >= this->buffer_ && ptr < this->buffer_ + this->size_);
+}
+
+int
+ACE_Static_Allocator_Base::remove (void)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::bind (const char *, void *, int)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::trybind (const char *, void *&)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::find (const char *, void *&)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::find (const char *)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::unbind (const char *)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::unbind (const char *, void *&)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::sync (ssize_t, int)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::sync (void *, size_t, int)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::protect (ssize_t, int)
+{
+  return -1;
+}
+
+int
+ACE_Static_Allocator_Base::protect (void *, size_t, int)
+{
+  return -1;
+}
+
+#if defined (ACE_HAS_MALLOC_STATS)
+void
+ACE_Static_Allocator_Base::print_stats (void) const
+{
+}
+#endif /* ACE_HAS_MALLOC_STATS */
+
 void
 ACE_Static_Allocator_Base::dump (void) const
 {
@@ -162,6 +367,4 @@ ACE_Static_Allocator_Base::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-
-
 #endif /* ACE_MALLOC_ALLOCATOR_CPP */
diff --git a/ace/Malloc_Allocator.inl b/ace/Malloc_Allocator.inl
index e360750f9aa..7ec860c8591 100644
--- a/ace/Malloc_Allocator.inl
+++ b/ace/Malloc_Allocator.inl
@@ -1,214 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/os_include/os_errno.h"
-#include "ace/Log_Msg.h"  // for ACE_ASSERT
-#include "ace/OS_NS_string.h"
-
-ACE_INLINE void *
-ACE_New_Allocator::calloc (size_t n_elem, size_t elem_size, char initial_value)
-{
-  return ACE_New_Allocator::calloc (n_elem * elem_size, initial_value);
-}
-
-
-ACE_INLINE int
-ACE_New_Allocator::remove (void)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::bind (const char *, void *, int)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::trybind (const char *, void *&)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::find (const char *, void *&)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::find (const char *)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::unbind (const char *)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::unbind (const char *, void *&)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::sync (ssize_t, int)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::sync (void *, size_t, int)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::protect (ssize_t, int)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-ACE_INLINE int
-ACE_New_Allocator::protect (void *, size_t, int)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-#if defined (ACE_HAS_MALLOC_STATS)
-ACE_INLINE void
-ACE_New_Allocator::print_stats (void) const
-{
-}
-#endif /* ACE_HAS_MALLOC_STATS */
-
-ACE_INLINE void
-ACE_New_Allocator::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-#endif /* ACE_HAS_DUMP */
-}
-
-ACE_INLINE void *
-ACE_Static_Allocator_Base::malloc (size_t nbytes)
-{
-  if (this->offset_ + nbytes > this->size_)
-    {
-      errno = ENOMEM;
-      return 0;
-    }
-  else
-    {
-      // Record the current offset, increment the offset by the number
-      // of bytes requested, and return the original offset.
-      char *ptr = &this->buffer_[this->offset_];
-      this->offset_ += nbytes;
-      return (void *) ptr;
-    }
-}
-
-ACE_INLINE void *
-ACE_Static_Allocator_Base::calloc (size_t nbytes,
-                                   char initial_value)
-{
-  void *ptr = this->malloc (nbytes);
-
-  ACE_OS::memset (ptr, initial_value, nbytes);
-  return (void *) ptr;
-}
-
-ACE_INLINE void *
-ACE_Static_Allocator_Base::calloc (size_t n_elem,
-                                   size_t elem_size,
-                                   char initial_value)
-{
-  return this->calloc (n_elem * elem_size, initial_value);
-}
-
-ACE_INLINE void
-ACE_Static_Allocator_Base::free (void *ptr)
-{
-  // Check to see if ptr is within our pool?!
-  ACE_UNUSED_ARG (ptr);
-  ACE_ASSERT (ptr >= this->buffer_ && ptr < this->buffer_ + this->size_);
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::remove (void)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::bind (const char *, void *, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::trybind (const char *, void *&)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::find (const char *, void *&)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::find (const char *)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::unbind (const char *)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::unbind (const char *, void *&)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::sync (ssize_t, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::sync (void *, size_t, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::protect (ssize_t, int)
-{
-  return -1;
-}
-
-ACE_INLINE int
-ACE_Static_Allocator_Base::protect (void *, size_t, int)
-{
-  return -1;
-}
-
-#if defined (ACE_HAS_MALLOC_STATS)
-ACE_INLINE void
-ACE_Static_Allocator_Base::print_stats (void) const
-{
-}
-#endif /* ACE_HAS_MALLOC_STATS */
-
 ACE_INLINE
 ACE_Static_Allocator_Base::ACE_Static_Allocator_Base (char *buffer,
                                                       size_t size)
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index ada5fc23236..15c6c807b83 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -115,6 +115,9 @@ public:
   /// Return a chunk of memory back to free list cache.
   void free (void *);
 
+  /// Return the number of chunks available in the cache.
+  size_t pool_depth (void);
+
 private:
   /// Remember how we allocate the memory in the first place so
   /// we can clear things up later.
@@ -177,6 +180,9 @@ public:
   /// Return a chunk of memory back to free list cache.
   void free (void *);
 
+  /// Return the number of chunks available in the cache.
+  size_t pool_depth (void);
+
 private:
   /// Remember how we allocate the memory in the first place so
   /// we can clear things up later.
@@ -666,13 +672,6 @@ private:
  * examples.
  *
  */
-template <class ACE_LOCK>
-class ACE_Malloc_Lock_Adapter_T
-{
-public:
-  ACE_LOCK * operator () (const ACE_TCHAR *name);
-};
-
 /*****************************************************************************/
 
 /**
@@ -875,6 +874,13 @@ public:
                             const char *name = 0);
 };
 
+template <class ACE_LOCK>
+class ACE_Malloc_Lock_Adapter_T
+{
+public:
+  ACE_LOCK * operator () (const ACE_TCHAR *myname);
+};
+
 #if defined (__ACE_INLINE__)
 #include "ace/Malloc_T.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Malloc_T.inl b/ace/Malloc_T.inl
index b24436fb868..109d1153336 100644
--- a/ace/Malloc_T.inl
+++ b/ace/Malloc_T.inl
@@ -67,6 +67,12 @@ ACE_Cached_Allocator<T, ACE_LOCK>::free (void * ptr)
     this->free_list_.add ((ACE_Cached_Mem_Pool_Node<T> *) ptr) ;
 }
 
+template <class T, class ACE_LOCK> ACE_INLINE size_t
+ACE_Cached_Allocator<T, ACE_LOCK>::pool_depth (void)
+{
+  return this->free_list_.size ();
+}
+
 template <class ACE_LOCK> ACE_INLINE void *
 ACE_Dynamic_Cached_Allocator<ACE_LOCK>::malloc (size_t nbytes)
 {
@@ -107,6 +113,12 @@ ACE_Dynamic_Cached_Allocator<ACE_LOCK>::free (void * ptr)
     this->free_list_.add ((ACE_Cached_Mem_Pool_Node<char> *) ptr);
 }
 
+template <class ACE_LOCK> ACE_INLINE size_t
+ACE_Dynamic_Cached_Allocator<ACE_LOCK>::pool_depth (void)
+{
+  return this->free_list_.size ();
+}
+
 template <class MALLOC> ACE_INLINE void *
 ACE_Allocator_Adapter<MALLOC>::malloc (size_t nbytes)
 {
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index 79af0088240..1cf39698914 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -133,6 +133,7 @@ public:
   // = Traits.
   typedef EXT_ID KEY;
   typedef INT_ID VALUE;
+  typedef ACE_LOCK lock_type;
   typedef ACE_Map_Entry<EXT_ID, INT_ID> ENTRY;
   typedef ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> ITERATOR;
   typedef ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> CONST_ITERATOR;
diff --git a/ace/Map_T.inl b/ace/Map_T.inl
index e786e1de5bf..82bd75794b2 100644
--- a/ace/Map_T.inl
+++ b/ace/Map_T.inl
@@ -256,7 +256,7 @@ template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE int
 ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::compare (const ACE_Iterator_Impl<T> &rhs) const
 {
   const ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY> &rhs_local
-    = ACE_dynamic_cast_3_ref (const ACE_Map_Impl_Iterator_Adapter, T, IMPLEMENTATION, ENTRY, rhs);
+    = dynamic_cast<const ACE_Map_Impl_Iterator_Adapter< T, IMPLEMENTATION, ENTRY> &> (rhs);
 
   return this->implementation_ == rhs_local.implementation_;
 }
@@ -313,7 +313,7 @@ template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE int
 ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const
 {
   const ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY> &rhs_local
-    = ACE_dynamic_cast_3_ref (const ACE_Map_Impl_Reverse_Iterator_Adapter, T, IMPLEMENTATION, ENTRY, rhs);
+    = dynamic_cast<const ACE_Map_Impl_Reverse_Iterator_Adapter< T, IMPLEMENTATION, ENTRY> &> (rhs);
 
   return this->implementation_ == rhs_local.implementation_;
 }
@@ -579,7 +579,7 @@ template <class T, class VALUE> ACE_INLINE int
 ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::compare (const ACE_Iterator_Impl<T> &rhs) const
 {
   const ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE> &rhs_local
-    = ACE_dynamic_cast_2_ref (const ACE_Active_Map_Manager_Iterator_Adapter, T, VALUE, rhs);
+    = dynamic_cast<const ACE_Active_Map_Manager_Iterator_Adapter< T, VALUE> &> (rhs);
 
   return this->implementation_ == rhs_local.implementation_;
 }
@@ -637,7 +637,7 @@ template <class T, class VALUE> ACE_INLINE int
 ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const
 {
   const ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE> &rhs_local
-    = ACE_dynamic_cast_2_ref (const ACE_Active_Map_Manager_Reverse_Iterator_Adapter, T, VALUE, rhs);
+    = dynamic_cast<const ACE_Active_Map_Manager_Reverse_Iterator_Adapter< T, VALUE> &> (rhs);
 
   return this->implementation_ == rhs_local.implementation_;
 }
@@ -1071,7 +1071,7 @@ template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> A
 ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::compare (const ACE_Iterator_Impl<T> &rhs) const
 {
   const ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS> &rhs_local
-    = ACE_dynamic_cast_5_ref (const ACE_Hash_Map_Manager_Ex_Iterator_Adapter, T, KEY, VALUE, HASH_KEY, COMPARE_KEYS, rhs);
+    = dynamic_cast<const ACE_Hash_Map_Manager_Ex_Iterator_Adapter< T, KEY, VALUE, HASH_KEY, COMPARE_KEYS> &> (rhs);
 
   return this->implementation_ == rhs_local.implementation_;
 }
@@ -1129,7 +1129,7 @@ template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> A
 ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const
 {
   const ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS> &rhs_local
-    = ACE_dynamic_cast_5_ref (const ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter, T, KEY, VALUE, HASH_KEY, COMPARE_KEYS, rhs);
+    = dynamic_cast<const ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter< T, KEY, VALUE, HASH_KEY, COMPARE_KEYS> &> (rhs);
 
   return this->implementation_ == rhs_local.implementation_;
 }
@@ -1414,7 +1414,7 @@ template <class T, class KEY, class VALUE> ACE_INLINE int
 ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::compare (const ACE_Iterator_Impl<T> &rhs) const
 {
   const ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE> &rhs_local
-    = ACE_dynamic_cast_3_ref (const ACE_Map_Manager_Iterator_Adapter, T, KEY, VALUE, rhs);
+    = dynamic_cast<const ACE_Map_Manager_Iterator_Adapter< T, KEY, VALUE> &> (rhs);
 
   return this->implementation_ == rhs_local.implementation_;
 }
@@ -1472,7 +1472,7 @@ template <class T, class KEY, class VALUE> ACE_INLINE int
 ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const
 {
   const ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE> &rhs_local
-    = ACE_dynamic_cast_3_ref (const ACE_Map_Manager_Reverse_Iterator_Adapter, T, KEY, VALUE, rhs);
+    = dynamic_cast<const ACE_Map_Manager_Reverse_Iterator_Adapter< T, KEY, VALUE> &> (rhs);
 
   return this->implementation_ == rhs_local.implementation_;
 }
diff --git a/ace/Mem_Map.cpp b/ace/Mem_Map.cpp
index 493244d2977..086051a79d9 100644
--- a/ace/Mem_Map.cpp
+++ b/ace/Mem_Map.cpp
@@ -196,10 +196,10 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle,
 #endif /* !CHORUS */
     }
 
-#if defined (__Lynx__)
+#if defined (ACE_HAS_LYNXOS_BROKEN_MMAP)
   // Set flag that indicates whether PROT_WRITE has been enabled.
   write_enabled_ = ACE_BIT_ENABLED (prot, PROT_WRITE);
-#endif /* __Lynx__ */
+#endif /* ACE_HAS_LYNXOS_BROKEN_MMAP */
 
 #if defined (ACE_USE_MAPPING_NAME)
   if (ACE_BIT_ENABLED (share, MAP_SHARED))
diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h
index 17e02461878..7e779e19557 100644
--- a/ace/Mem_Map.h
+++ b/ace/Mem_Map.h
@@ -188,10 +188,10 @@ private:
   /// HANDLE for the open mapping.
   ACE_HANDLE file_mapping_;
 
-#if defined (__Lynx__)
+#if defined (ACE_HAS_LYNXOS_BROKEN_MMAP)
   /// Flag to indicate that PROT_WRITE has been enabled.
   int write_enabled_;
-#endif /* __Lynx__ */
+#endif /* ACE_HAS_LYNXOS_BROKEN_MMAP */
 
   /// Keeps track of whether we need to close the handle.  This is set
   /// if we opened the file.
diff --git a/ace/Mem_Map.inl b/ace/Mem_Map.inl
index d499a7807d9..e7af6589df4 100644
--- a/ace/Mem_Map.inl
+++ b/ace/Mem_Map.inl
@@ -117,7 +117,7 @@ ACE_Mem_Map::unmap (int len)
 
   this->close_filemapping_handle ();
 
-#if defined (__Lynx__)
+#if defined (ACE_HAS_LYNXOS_BROKEN_MMAP)
   int writeback_result = 0;
   if (write_enabled_)
     {
@@ -130,7 +130,7 @@ ACE_Mem_Map::unmap (int len)
                           base_addr_,
                           (int) filesize) == filesize ? 0 : -1;
     }
-#endif /* __Lynx__ */
+#endif /* ACE_HAS_LYNXOS_BROKEN_MMAP */
   if (this->base_addr_ != MAP_FAILED)
     {
       int result = ACE_OS::munmap (this->base_addr_,
@@ -139,11 +139,11 @@ ACE_Mem_Map::unmap (int len)
       return result;
     }
   else
-#if defined (__Lynx__)
+#if defined (ACE_HAS_LYNXOS_BROKEN_MMAP)
     return writeback_result;
-#else  /* ! __Lynx__ */
+#else  /* ! ACE_HAS_LYNXOS_BROKEN_MMAP */
     return 0;
-#endif /* ! __Lynx__ */
+#endif /* ! ACE_HAS_LYNXOS_BROKEN_MMAP */
 }
 
 // Unmap the region starting at <addr_>.
@@ -155,7 +155,7 @@ ACE_Mem_Map::unmap (void *addr, int len)
 
   this->close_filemapping_handle ();
 
-#if defined (__Lynx__)
+#if defined (ACE_HAS_LYNXOS_BROKEN_MMAP)
   int writeback_result = 0;
   if (write_enabled_)
     {
@@ -167,16 +167,16 @@ ACE_Mem_Map::unmap (void *addr, int len)
                           base_addr_,
                           (int) filesize) == filesize ? 0 : -1;
     }
-#endif /* __Lynx__ */
+#endif /* ACE_HAS_LYNXOS_BROKEN_MMAP */
 
-#if defined (__Lynx__)
+#if defined (ACE_HAS_LYNXOS_BROKEN_MMAP)
   return ACE_OS::munmap (addr,
                          len < 0 ? this->length_ : len)
     | writeback_result;;
-#else  /* ! __Lynx__ */
+#else  /* ! ACE_HAS_LYNXOS_BROKEN_MMAP */
   return ACE_OS::munmap (addr,
                          len < 0 ? this->length_ : len);
-#endif /* ! __Lynx__ */
+#endif /* ! ACE_HAS_LYNXOS_BROKEN_MMAP */
 }
 
 // Sync <len> bytes of the memory region to the backing store starting
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
deleted file mode 100644
index 28826577d52..00000000000
--- a/ace/Memory_Pool.cpp
+++ /dev/null
@@ -1,1363 +0,0 @@
-// $Id$
-
-// Memory_Pool.cpp
-#include "ace/Memory_Pool.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Memory_Pool.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Log_Msg.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/RW_Thread_Mutex.h"
-#include "ace/OS_NS_sys_mman.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_sys_stat.h"
-#include "ace/OS_NS_sys_shm.h"
-#include "ace/OS_NS_unistd.h"
-
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-#include "ace/Based_Pointer_T.h"
-#include "ace/Based_Pointer_Repository.h"
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1  */
-
-ACE_RCSID(ace, Memory_Pool, "$Id$")
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Local_Memory_Pool)
-
-void
-ACE_Local_Memory_Pool::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Local_Memory_Pool::dump");
-#endif /* ACE_HAS_DUMP */
-}
-
-ACE_Local_Memory_Pool::ACE_Local_Memory_Pool (const ACE_TCHAR *,
-                                              const OPTIONS *)
-{
-  ACE_TRACE ("ACE_Local_Memory_Pool::ACE_Local_Memory_Pool");
-}
-
-void *
-ACE_Local_Memory_Pool::acquire (size_t nbytes,
-                                size_t &rounded_bytes)
-{
-  ACE_TRACE ("ACE_Local_Memory_Pool::acquire");
-  rounded_bytes = this->round_up (nbytes);
-
-  char *temp = 0;
-  ACE_NEW_RETURN (temp,
-                  char[rounded_bytes],
-                  0);
-
-  ACE_Auto_Basic_Array_Ptr<char> cp (temp);
-
-  if (this->allocated_chunks_.insert (cp.get ()) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_LIB_TEXT ("(%P|%t) insertion into set failed\n")),
-                      0);
-
-  return cp.release ();
-}
-
-int
-ACE_Local_Memory_Pool::release (int)
-{
-  ACE_TRACE ("ACE_Local_Memory_Pool::release");
-
-  // Zap the memory we allocated.
-  for (ACE_Unbounded_Set<char *>::iterator i = this->allocated_chunks_.begin ();
-       i != this->allocated_chunks_.end ();
-       ++i)
-    delete [] *i;
-  this->allocated_chunks_.reset ();
-  return 0;
-}
-
-#if defined (ACE_WIN32)
-int
-ACE_Local_Memory_Pool::seh_selector (void *)
-{
-  return 0;
-  // Continue propagate the structural exception up.
-}
-#endif /* ACE_WIN32 */
-
-int
-ACE_Local_Memory_Pool::remap (void *)
-{
-  return 0;
-  // Not much can be done.
-}
-
-ACE_ALLOC_HOOK_DEFINE(ACE_MMAP_Memory_Pool)
-
-void
-ACE_MMAP_Memory_Pool::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::dump");
-#endif /* ACE_HAS_DUMP */
-}
-
-int
-ACE_MMAP_Memory_Pool::release (int destroy)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::release");
-
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-  ACE_BASED_POINTER_REPOSITORY::instance ()->unbind (this->mmap_.addr ());
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
-  if (destroy)
-  this->mmap_.remove ();
-  else
-    this->mmap_.close ();
-  return 0;
-}
-
-int
-ACE_MMAP_Memory_Pool::sync (ssize_t len, int flags)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::sync");
-
-  if (len < 0)
-    len = ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END);
-
-  return this->mmap_.sync (len, flags);
-}
-
-// Sync <len> bytes of the memory region to the backing store starting
-// at <addr_>.
-
-int
-ACE_MMAP_Memory_Pool::sync (void *addr, size_t len, int flags)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::sync");
-  return ACE_OS::msync (addr, len, flags);
-}
-
-// Change the protection of the pages of the mapped region to <prot>
-// starting at <this->base_addr_> up to <len> bytes.  If <len> == -1
-// then change protection of all pages in the mapped region.
-
-int
-ACE_MMAP_Memory_Pool::protect (ssize_t len, int prot)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::protect");
-
-  if (len < 0)
-    len = ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END);
-
-  return this->mmap_.protect (len, prot);
-}
-
-// Change the protection of the pages of the mapped region to <prot>
-// starting at <addr> up to <len> bytes.
-
-int
-ACE_MMAP_Memory_Pool::protect (void *addr, size_t len, int prot)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::protect");
-  return ACE_OS::mprotect (addr, len, prot);
-}
-
-ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (const ACE_TCHAR *backing_store_name,
-                                            const OPTIONS *options)
-  : base_addr_ (0),
-    use_fixed_addr_(0),
-    flags_ (MAP_SHARED),
-    write_each_page_ (0),
-    minimum_bytes_ (0),
-    sa_ (0),
-    file_mode_ (ACE_DEFAULT_FILE_PERMS)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool");
-
-#if (defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR)) || defined (ACE_WIN32)
-      // For plaforms that give the faulting address.
-      guess_on_fault_ = 0;
-#else
-      // For plaforms that do NOT give the faulting address, let the
-      // options decide whether to guess or not.
-      if (options)
-        guess_on_fault_ = options->guess_on_fault_;
-      else
-        // If no options are specified, default to true.
-        guess_on_fault_ = 1;
-#endif /* (defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR)) || defined (ACE_WIN32) */
-
-  // Only change the defaults if <options> != 0.
-  if (options)
-    {
-      if (options->flags_ != 0)
-        this->flags_ = options->flags_;
-      use_fixed_addr_ = options->use_fixed_addr_;
-
-      if (use_fixed_addr_ == ACE_MMAP_Memory_Pool_Options::ALWAYS_FIXED)
-        {
-          this->base_addr_ = const_cast<void *> (options->base_addr_);
-          ACE_SET_BITS (flags_, MAP_FIXED);
-        }
-      this->write_each_page_ = options->write_each_page_;
-      this->minimum_bytes_ = options->minimum_bytes_;
-      if (options->sa_ != 0)
-        this->sa_ = options->sa_;
-      this->file_mode_ = options->file_mode_;
-    }
-
-  if (backing_store_name == 0)
-    {
-      // Only create a new unique filename for the backing store file
-      // if the user didn't supply one...
-#if defined (ACE_DEFAULT_BACKING_STORE)
-      // Create a temporary file.
-      ACE_OS::strcpy (this->backing_store_name_,
-                      ACE_DEFAULT_BACKING_STORE);
-#else /* ACE_DEFAULT_BACKING_STORE */
-      if (ACE::get_temp_dir (this->backing_store_name_,
-                                      MAXPATHLEN - 17) == -1)
-        // -17 for ace-malloc-XXXXXX
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("Temporary path too long, ")
-                      ACE_LIB_TEXT ("defaulting to current directory\n")));
-          this->backing_store_name_[0] = 0;
-        }
-
-      // Add the filename to the end
-      ACE_OS::strcat (this->backing_store_name_,
-                      ACE_LIB_TEXT ("ace-malloc-XXXXXX"));
-
-#endif /* ACE_DEFAULT_BACKING_STORE */
-    }
-  else
-    ACE_OS::strsncpy (this->backing_store_name_,
-                      backing_store_name,
-                      (sizeof this->backing_store_name_ / sizeof (ACE_TCHAR)));
-
-#if !defined (ACE_WIN32) && !defined (CHORUS)
-  if (this->signal_handler_.register_handler (SIGSEGV, this) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "%p\n", this->backing_store_name_));
-#endif /* ACE_WIN32 */
-}
-
-// Compute the new map_size of the backing store and commit the
-// memory.
-int
-ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
-                                                 off_t &map_size)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::commit_backing_store_name");
-
-#if defined (CHORUS)
-  map_size = rounded_bytes;
-#else
-  size_t seek_len;
-
-  if (this->write_each_page_)
-    // Write to the end of every block to ensure that we have enough
-    // space in the backing store.
-    seek_len = this->round_up (1); // round_up(1) is one page.
-  else
-    // We're willing to risk it all in the name of efficiency...
-    seek_len = rounded_bytes;
-
-  // The following loop will execute multiple times (if
-  // this->write_each_page == 1) or just once (if
-  // this->write_each_page == 0).
-
-  for (size_t cur_block = 0;
-       cur_block < rounded_bytes;
-       cur_block += seek_len)
-    {
-      map_size = ACE_OS::lseek (this->mmap_.handle (),
-                                static_cast<off_t> (seek_len - 1),
-                                SEEK_END);
-
-      if (map_size == -1
-          || ACE_OS::write (this->mmap_.handle (),
-                            "",
-                            1) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("(%P|%t) %p\n"),
-                           this->backing_store_name_),
-                          -1);
-    }
-
-#if defined (ACE_OPENVMS)
-  ::fsync(this->mmap_.handle());
-#endif
-
-  // Increment by one to put us at the beginning of the next chunk...
-  map_size++;
-#endif /* CHORUS */
-  return 0;
-}
-
-// Memory map the file up to <map_size> bytes.
-
-int
-ACE_MMAP_Memory_Pool::map_file (off_t map_size)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::map_file");
-
-  // Unmap the existing mapping.
-  this->mmap_.unmap ();
-
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-  if(use_fixed_addr_ == ACE_MMAP_Memory_Pool_Options::NEVER_FIXED)
-    this->base_addr_ = 0;
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
-  // Remap the file.
-  if (this->mmap_.map (map_size,
-                       PROT_RDWR,
-                       this->flags_,
-                       this->base_addr_,
-                       0,
-                       this->sa_) == -1
-      || this->base_addr_ != 0
-#ifdef ACE_HAS_WINCE
-      && this->mmap_.addr () == 0)  // WinCE does not allow users to specify alloc addr.
-#else
-      && this->mmap_.addr () != this->base_addr_)
-#endif  // ACE_HAS_WINCE
-    {
-#if 0
-      ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("(%P|%t) addr = %u, base_addr = %u, map_size = %u, %p\n"),
-                  this->mmap_.addr (),
-                  this->base_addr_,
-                  map_size,
-                  this->backing_store_name_));
-#endif /* 0 */
-      return -1;
-    }
-  else
-    {
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-      this->base_addr_ = this->mmap_.addr ();
-      ACE_BASED_POINTER_REPOSITORY::instance ()->bind (this->base_addr_,
-                                                       map_size);
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-      return 0;
-    }
-}
-
-// Ask operating system for more shared memory, increasing the mapping
-// accordingly.  Note that this routine assumes that the appropriate
-// locks are held when it is called.
-
-void *
-ACE_MMAP_Memory_Pool::acquire (size_t nbytes,
-                               size_t &rounded_bytes)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::acquire");
-  rounded_bytes = this->round_up (nbytes);
-
-  // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes =
-  // %d, rounded_bytes = %d\n", nbytes, rounded_bytes));
-
-  off_t map_size;
-
-  if (this->commit_backing_store_name (rounded_bytes,
-                                       map_size) == -1)
-    return 0;
-  else if (this->map_file (map_size) == -1)
-    return 0;
-
-  // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquired more chunks, nbytes = %d,
-  // rounded_bytes = %d, map_size = %d\n", nbytes, rounded_bytes,
-  // map_size));
-
-  return (void *) ((char *) this->mmap_.addr () + (this->mmap_.size () - rounded_bytes));
-}
-
-// Ask system for initial chunk of shared memory.
-
-void *
-ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes,
-                                    size_t &rounded_bytes,
-                                    int &first_time)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::init_acquire");
-
-  first_time = 0;
-
-  if (nbytes < (size_t) this->minimum_bytes_)
-    nbytes = this->minimum_bytes_;
-
-  if (this->mmap_.open (this->backing_store_name_,
-                        O_RDWR | O_CREAT | O_TRUNC | O_EXCL,
-                        this->file_mode_, this->sa_) != -1)
-    {
-      // First time in, so need to acquire memory.
-      first_time = 1;
-      return this->acquire (nbytes, rounded_bytes);
-    }
-  else if (errno == EEXIST)
-    {
-      errno = 0;
-      // Reopen file *without* using O_EXCL...
-      if (this->mmap_.map (this->backing_store_name_,
-#if defined (CHORUS)
-                           nbytes,
-#else
-                           -1,
-#endif /* CHORUS */
-                           O_RDWR,
-                           this->file_mode_,
-                           PROT_RDWR,
-                           this->flags_,
-                           this->base_addr_,
-                           0,
-                           this->sa_) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("%p\n"),
-                           ACE_LIB_TEXT ("open")),
-                          0);
-
-      return this->mmap_.addr ();
-    }
-  else
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_LIB_TEXT ("%p\n"),
-                       ACE_LIB_TEXT ("open")),
-                      0);
-}
-
-#if defined (ACE_WIN32)
-int
-ACE_MMAP_Memory_Pool::seh_selector (void *ep)
-{
-  DWORD ecode = ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionCode;
-
-  if (ecode == EXCEPTION_ACCESS_VIOLATION)
-    {
-      void * fault_addr = (void *)
-        ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionInformation[1];
-
-      if (this->remap (fault_addr) == 0)
-        return 1;
-    }
-
-  return 0;
-}
-#endif /* ACE_WIN32 */
-
-int
-ACE_MMAP_Memory_Pool::remap (void *addr)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::remap");
-  //  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("Remapping with fault address at: %X\n"), addr));
-  off_t current_map_size = ACE_OS::filesize (this->mmap_.handle ());
-  // ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END);
-
-  if (!(addr < (void *) ((char *) this->mmap_.addr () + current_map_size)
-        && addr >= this->mmap_.addr ()))
-    return -1;
-
-  // Extend the mapping to cover the size of the backing store.
-  return this->map_file (current_map_size);
-}
-
-ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (const void *base_addr,
-                                                            int use_fixed_addr,
-                                                            int write_each_page,
-                                                            off_t minimum_bytes,
-                                                            u_int flags,
-                                                            int guess_on_fault,
-                                                            LPSECURITY_ATTRIBUTES sa,
-                                                            mode_t file_mode)
-  : base_addr_ (base_addr),
-    use_fixed_addr_ (use_fixed_addr),
-    write_each_page_ (write_each_page),
-    minimum_bytes_ (minimum_bytes),
-    flags_ (flags),
-    guess_on_fault_ (guess_on_fault),
-    sa_ (sa),
-    file_mode_ (file_mode)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options");
-  // for backwards compatability
-  if (base_addr_ == 0 && use_fixed_addr_ == ALWAYS_FIXED)
-    use_fixed_addr_ = FIRSTCALL_FIXED;
-
-  // HP-UX 11, 64-bit bug workaround.
-#if defined (__hpux) && defined (__LP64__)
-  long temp = ACE_DEFAULT_BASE_ADDRL;
-  base_addr_ = (void *) temp;
-#endif /* defined (__hpux) && defined (__LP64__) */
-}
-
-// Handle SIGSEGV and SIGBUS signals to remap memory properly.  When a
-// process reads or writes to non-mapped memory a signal (SIGBUS or
-// SIGSEGV) will be triggered.  At that point, the ACE_Sig_Handler
-// (which is part of the ACE_Reactor) will catch the signal and
-// dispatch the handle_signal() method defined here.  If the SIGSEGV
-// signal occurred due to the fact that the mapping wasn't uptodate
-// with respect to the backing store, the handler method below will
-// update the mapping accordingly.  When the signal handler returns,
-// the instruction should be restarted and the operation should work.
-
-int
-ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *)
-{
-  if (signum != SIGSEGV)
-    return -1;
-  else
-    ; // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) received %S\n"), signum));
-
-  // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_map_size));
-
-#if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR)
-  // Make sure that the pointer causing the problem is within the
-  // range of the backing store.
-
-  if (siginfo != 0)
-    {
-      // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr));
-      if (this->remap ((void *) siginfo->si_addr) == -1)
-        return -1;
-      // ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %u out of range\n",
-      // siginfo->si_addr), -1);
-      return 0;
-    }
-#else
-  ACE_UNUSED_ARG(siginfo);
-#endif /* ACE_HAS_SIGINFO_T && !defined ACE_LACKS_SI_ADDR */
-  // If guess_on_fault_ is true, then we want to try to remap without
-  // knowing the faulting address.  guess_on_fault_ can only be true
-  // on platforms that do not provide the faulting address through
-  // signals or exceptions.  We check to see if the mapping is up to
-  // date. If it is, then this fault isn't due to this mapping and we
-  // pass it on.
-  if (guess_on_fault_)
-    {
-      // Check if the current mapping is up to date.
-      off_t current_map_size = ACE_OS::filesize (this->mmap_.handle ());
-
-      if (static_cast<size_t> (current_map_size) == this->mmap_.size ())
-        {
-          // The mapping is up to date so this really is a bad
-          // address.  Thus, remove current signal handler so process
-          // will fail with default action and core file will be
-          // written.
-          this->signal_handler_.remove_handler (SIGSEGV);
-          return 0;
-        }
-
-      // Extend the mapping to cover the size of the backing store.
-      return this->map_file (current_map_size);
-    }
-  else
-    return -1;
-}
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Lite_MMAP_Memory_Pool)
-
-ACE_Lite_MMAP_Memory_Pool::ACE_Lite_MMAP_Memory_Pool (const ACE_TCHAR *backing_store_name,
-                                                      const OPTIONS *options)
-  : ACE_MMAP_Memory_Pool (backing_store_name, options)
-{
-  ACE_TRACE ("ACE_Lite_MMAP_Memory_Pool::ACE_Lite_MMAP_Memory_Pool");
-}
-
-int
-ACE_Lite_MMAP_Memory_Pool::sync (ssize_t, int)
-{
-  ACE_TRACE ("ACE_Lite_MMAP_Memory_Pool::sync");
-  return 0;
-}
-
-int
-ACE_Lite_MMAP_Memory_Pool::sync (void *, size_t, int)
-{
-  ACE_TRACE ("ACE_Lite_MMAP_Memory_Pool::sync");
-  return 0;
-}
-
-#if !defined (ACE_LACKS_SBRK)
-ACE_ALLOC_HOOK_DEFINE(ACE_Sbrk_Memory_Pool)
-
-// Ask system for more local memory via sbrk(2).
-
-void *
-ACE_Sbrk_Memory_Pool::acquire (size_t nbytes,
-                               size_t &rounded_bytes)
-{
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::acquire");
-  rounded_bytes = this->round_up (nbytes);
-  // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes));
-  void *cp = ACE_OS::sbrk (rounded_bytes);
-
-  if (cp == MAP_FAILED)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) cp = %u\n",
-                       cp),
-                      0);
-  else
-    // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp));
-  return cp;
-}
-
-void
-ACE_Sbrk_Memory_Pool::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::dump");
-#endif /* ACE_HAS_DUMP */
-}
-
-ACE_Sbrk_Memory_Pool::ACE_Sbrk_Memory_Pool (const ACE_TCHAR *,
-                                            const OPTIONS *)
-{
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::ACE_Sbrk_Memory_Pool");
-}
-#endif /* !ACE_LACKS_SBRK */
-
-#if !defined (ACE_LACKS_SYSV_SHMEM)
-ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_Pool)
-
-ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options (const char *base_addr,
-                                                                size_t max_segments,
-                                                                size_t file_perms,
-                                                                off_t minimum_bytes,
-                                                                size_t segment_size)
-  : base_addr_ (base_addr),
-    max_segments_ (max_segments),
-    minimum_bytes_ (minimum_bytes),
-    file_perms_ (file_perms),
-    segment_size_ (segment_size)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options");
-  // HP-UX 11, 64-bit bug workaround
-#if defined (__hpux) && defined (__LP64__)
-  long temp = ACE_DEFAULT_BASE_ADDRL;
-  base_addr_ = (char *) temp;
-#endif /* defined (__hpux) && defined (__LP64__) */
-}
-
-void
-ACE_Shared_Memory_Pool::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Shared_Memory_Pool::dump");
-#endif /* ACE_HAS_DUMP */
-}
-
-int
-ACE_Shared_Memory_Pool::in_use (off_t &offset,
-                                size_t &counter)
-{
-  offset = 0;
-  SHM_TABLE *st = reinterpret_cast<SHM_TABLE *> (this->base_addr_);
-  shmid_ds buf;
-
-  for (counter = 0;
-       counter < this->max_segments_ && st[counter].used_ == 1;
-       counter++)
-    {
-      if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("(%P|%t) %p\n"),
-                           ACE_LIB_TEXT ("shmctl")),
-                          -1);
-      offset += buf.shm_segsz;
-      // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset));
-    }
-
-  return 0;
-}
-
-int
-ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr,
-                                  off_t &offset,
-                                  size_t &counter)
-{
-  offset = 0;
-  SHM_TABLE *st = reinterpret_cast<SHM_TABLE *> (this->base_addr_);
-  shmid_ds buf;
-
-  for (counter = 0;
-       counter < this->max_segments_
-         && st[counter].used_ == 1;
-       counter++)
-    {
-      if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("(%P|%t) %p\n"),
-                           ACE_LIB_TEXT ("shmctl")),
-                          -1);
-      offset += buf.shm_segsz;
-
-      // If segment 'counter' starts at a location greater than the
-      // place we are searching for. We then decrement the offset to
-      // the start of counter-1. (flabar@vais.net)
-      if (((ptrdiff_t) offset + (ptrdiff_t) (this->base_addr_)) > (ptrdiff_t) searchPtr)
-        {
-          --counter;
-          offset -= buf.shm_segsz;
-          return 0;
-        }
-      // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset));
-    }
-
-  return 0;
-}
-
-int
-ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
-                                                   off_t &offset)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::commit_backing_store_name");
-
-  size_t counter;
-  SHM_TABLE *st = reinterpret_cast<SHM_TABLE *> (this->base_addr_);
-
-  if (this->in_use (offset, counter) == -1)
-    return -1;
-
-  if (counter == this->max_segments_)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                      "exceeded max number of segments = %d, base = %u, offset = %u\n",
-                       counter,
-                       this->base_addr_,
-                       offset),
-                      -1);
-  else
-    {
-      int shmid = ACE_OS::shmget (st[counter].key_,
-                                  rounded_bytes,
-                                  this->file_perms_ | IPC_CREAT | IPC_EXCL);
-      if (shmid == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("(%P|%t) %p\n"),
-                           ACE_LIB_TEXT ("shmget")),
-                          -1);
-      st[counter].shmid_ = shmid;
-      st[counter].used_ = 1;
-
-      void *address = (void *) (((char *) this->base_addr_) + offset);
-      void *shmem = ACE_OS::shmat (st[counter].shmid_,
-                                   (char *) address,
-                                   0);
-
-      if (shmem != address)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p, shmem = %u, address = %u\n",
-                           "shmat",
-                           shmem,
-                           address),
-                          -1);
-    }
-  return 0;
-}
-
-// Handle SIGSEGV and SIGBUS signals to remap shared memory properly.
-
-int
-ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::handle_signal");
-  // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("signal %S occurred\n"), signum));
-
-#if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR)
-  off_t offset;
-  // Make sure that the pointer causing the problem is within the
-  // range of the backing store.
-
-  if (siginfo != 0)
-    {
-      // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr));
-      size_t counter;
-      if (this->in_use (offset, counter) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT ("(%P|%t) %p\n"),
-                    ACE_LIB_TEXT ("in_use")));
-#if !defined(_UNICOS)
-      else if (!(siginfo->si_code == SEGV_MAPERR
-           && siginfo->si_addr < (((char *) this->base_addr_) + offset)
-           && siginfo->si_addr >= ((char *) this->base_addr_)))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) address %u out of range\n",
-                           siginfo->si_addr),
-                          -1);
-#else /* ! _UNICOS */
-      else if (!(siginfo->si_code == SEGV_MEMERR
-           && siginfo->si_addr < (((unsigned long) this->base_addr_) + offset)
-           && siginfo->si_addr >= ((unsigned long) this->base_addr_)))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) address %u out of range\n",
-                           siginfo->si_addr),
-                          -1);
-#endif /* ! _UNICOS */
-    }
-
-  // The above if case will check to see that the address is in the
-  // proper range.  Therefore there is a segment out there that the
-  // pointer wants to point into.  Find the segment that someone else
-  // has used and attach to it (flabar@vais.net)
-
-  size_t counter; // ret value to get shmid from the st table.
-
-#if !defined(_UNICOS)
-  if (this->find_seg (siginfo->si_addr, offset, counter) == -1)
-#else /* ! _UNICOS */
-  if (this->find_seg ((const void *)siginfo->si_addr, offset, counter) == -1)
-#endif /* ! _UNICOS */
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_LIB_TEXT ("(%P|%t) %p\n"),
-                         ACE_LIB_TEXT ("in_use")),
-                        -1);
-
-  void *address = (void *) (((char *) this->base_addr_) + offset);
-  SHM_TABLE *st = reinterpret_cast<SHM_TABLE *> (this->base_addr_);
-
-  void *shmem = ACE_OS::shmat (st[counter].shmid_, (char *) address, 0);
-
-  if (shmem != address)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) %p, shmem = %u, address = %u\n",
-                         "shmat",
-                         shmem,
-                         address),
-                        -1);
-
-  // NOTE: this won't work if we dont have SIGINFO_T or SI_ADDR
-#else
-  ACE_UNUSED_ARG (siginfo);
-#endif /* ACE_HAS_SIGINFO_T && !defined (ACE_LACKS_SI_ADDR) */
-
-  return 0;
-}
-
-ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_name,
-                                                const OPTIONS *options)
-  : base_addr_ (0),
-    file_perms_ (ACE_DEFAULT_FILE_PERMS),
-    max_segments_ (ACE_DEFAULT_MAX_SEGMENTS),
-    minimum_bytes_ (0),
-    segment_size_ (ACE_DEFAULT_SEGMENT_SIZE)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool");
-
-  // Only change the defaults if <options> != 0.
-  if (options)
-    {
-      this->base_addr_ =
-        reinterpret_cast<void *> (const_cast<char *> (options->base_addr_));
-      this->max_segments_ = options->max_segments_;
-      this->file_perms_ = options->file_perms_;
-      this->minimum_bytes_ = options->minimum_bytes_;
-      this->segment_size_ = options->segment_size_;
-    }
-
-  if (backing_store_name)
-    {
-      // Convert the string into a number that is used as the segment
-      // key.
-
-      int segment_key;
-      int result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (backing_store_name),
-                             "%d",
-                             &segment_key);
-
-      if (result == 0 || result == EOF)
-        // The conversion to a number failed so hash with crc32
-        // ACE::crc32 is also used in <SV_Semaphore_Simple>.
-        this->base_shm_key_ =
-          (key_t) ACE::crc32 (ACE_TEXT_ALWAYS_CHAR (backing_store_name));
-      else
-        this->base_shm_key_ = segment_key;
-
-      if (this->base_shm_key_ == IPC_PRIVATE)
-        // Make sure that the segment can be shared between unrelated
-        // processes.
-        this->base_shm_key_ = ACE_DEFAULT_SHM_KEY;
-    }
-  else
-    this->base_shm_key_ = ACE_DEFAULT_SHM_KEY;
-
-  if (this->signal_handler_.register_handler (SIGSEGV, this) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\n"),
-                ACE_LIB_TEXT ("ACE_Sig_Handler::register_handler")));
-}
-
-// Ask system for more shared memory.
-
-void *
-ACE_Shared_Memory_Pool::acquire (size_t nbytes,
-                                 size_t &rounded_bytes)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::acquire");
-
-  rounded_bytes = this->round_up (nbytes);
-
-  // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes));
-
-  off_t offset;
-
-  if (this->commit_backing_store_name (rounded_bytes, offset) == -1)
-    return 0;
-
-  // ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes));
-  return ((char *) this->base_addr_) + offset;
-}
-
-// Ask system for initial chunk of shared memory.
-
-void *
-ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
-                                      size_t &rounded_bytes,
-                                      int &first_time)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::init_acquire");
-
-  off_t shm_table_offset = ACE::round_to_pagesize (sizeof (SHM_TABLE));
-  rounded_bytes = this->round_up (nbytes > (size_t) this->minimum_bytes_
-                                  ? nbytes
-                                  : (size_t) this->minimum_bytes_);
-
-  // Acquire the semaphore to serialize initialization and prevent
-  // race conditions.
-
-  int shmid = ACE_OS::shmget (this->base_shm_key_,
-                              rounded_bytes + shm_table_offset,
-                              this->file_perms_ | IPC_CREAT | IPC_EXCL);
-  if (shmid == -1)
-    {
-      if (errno != EEXIST)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("(%P|%t) %p\n"),
-                           ACE_LIB_TEXT ("shmget")),
-                          0);
-      first_time = 0;
-
-      shmid = ACE_OS::shmget (this->base_shm_key_, 0, 0);
-
-      if (shmid == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_LIB_TEXT ("(%P|%t) %p\n"),
-                           ACE_LIB_TEXT ("shmget")),
-                          0);
-
-      // This implementation doesn't care if we don't get the key we
-      // want...
-      this->base_addr_ =
-        ACE_OS::shmat (shmid,
-                       reinterpret_cast<char *> (this->base_addr_),
-                       0);
-      if (this->base_addr_ == reinterpret_cast<void *> (-1))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p, base_addr = %u\n",
-                           "shmat",
-                           this->base_addr_),
-                          0);
-    }
-  else
-    {
-      first_time = 1;
-
-      // This implementation doesn't care if we don't get the key we
-      // want...
-      this->base_addr_ =
-        ACE_OS::shmat (shmid,
-                       reinterpret_cast<char *> (this->base_addr_),
-                       0);
-      if (this->base_addr_ == reinterpret_cast<char *> (-1))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p, base_addr = %u\n",
-                           "shmat",
-                           this->base_addr_), 0);
-
-      SHM_TABLE *st = reinterpret_cast<SHM_TABLE *> (this->base_addr_);
-      st[0].key_ = this->base_shm_key_;
-      st[0].shmid_ = shmid;
-
-      st[0].used_ = 1;
-
-      for (size_t counter = 1; // Skip over the first entry...
-           counter < this->max_segments_;
-           counter++)
-        {
-          st[counter].key_ = this->base_shm_key_ + counter;
-          st[counter].shmid_ = 0;
-          st[counter].used_ = 0;
-        }
-    }
-
-  return (void *) (((char *) this->base_addr_) + shm_table_offset);
-}
-
-// Instruct the memory pool to release all of its resources.
-
-int
-ACE_Shared_Memory_Pool::release (int)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::release");
-
-  int result = 0;
-  SHM_TABLE *st = reinterpret_cast<SHM_TABLE *> (this->base_addr_);
-
-  for (size_t counter = 0;
-       counter < this->max_segments_ && st[counter].used_ == 1;
-       counter++)
-    if (ACE_OS::shmctl (st[counter].shmid_, IPC_RMID, 0) == -1)
-      result = -1;
-
-  return result;
-}
-#endif /* !ACE_LACKS_SYSV_SHMEM */
-
-#if defined (ACE_WIN32)
-#if !defined (ACE_HAS_WINCE)
-#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\
-  MapViewOfFileEx (_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)
-#else //if !defined (ACE_HAS_WINCE)
-#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\
-  MapViewOfFile (_hnd, _access, _offHigh, _offLow, _nBytes)
-#endif /* !defined (ACE_HAS_WINCE) */
-
-ACE_Pagefile_Memory_Pool_Options::ACE_Pagefile_Memory_Pool_Options (void *base_addr,
-                                                                    size_t max_size)
-  : base_addr_ (base_addr),
-    max_size_ (max_size)
-{
-}
-
-int
-ACE_Pagefile_Memory_Pool::release (int)
-{
-  return this->unmap ();
-}
-
-ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_store_name,
-                                                    const OPTIONS *options)
-  : shared_cb_ (0),
-    object_handle_ (0),
-    page_size_ (ACE_Pagefile_Memory_Pool::round_to_page_size (1))
-{
-  // Initialize local copy of pool statistics.
-  if (options != 0)
-    {
-      this->local_cb_.req_base_ = options->base_addr_;
-      this->local_cb_.mapped_base_ = 0;
-      this->local_cb_.sh_.max_size_ =
-        options->max_size_;
-      this->local_cb_.sh_.mapped_size_ = 0;
-      this->local_cb_.sh_.free_offset_ =
-        this->local_cb_.sh_.mapped_size_;
-      this->local_cb_.sh_.free_size_ = 0;
-    }
-
-  if (backing_store_name == 0)
-    // Only create a new unique filename for the backing store file if
-    // the user didn't supply one...
-    backing_store_name = ACE_DEFAULT_PAGEFILE_POOL_NAME;
-
-  ACE_OS::strsncpy (this->backing_store_name_,
-                    backing_store_name,
-                    (sizeof this->backing_store_name_ / sizeof (ACE_TCHAR)));
-}
-
-void *
-ACE_Pagefile_Memory_Pool::acquire (size_t nbytes,
-                                   size_t &rounded_bytes)
-{
-  rounded_bytes = round_to_page_size (nbytes);
-  void *result = 0;
-  int first_time = 0;
-
-  // Check local_cb_ for consistency.  Remap, if extra space is too
-  // small and/or we didn't map the whole shared memory section
-  if (this->shared_cb_->sh_.mapped_size_
-      > this->local_cb_.sh_.mapped_size_
-      || this->shared_cb_->sh_.free_size_ < rounded_bytes)
-    {
-      size_t append = 0;
-      if (rounded_bytes > this->shared_cb_->sh_.free_size_)
-        append = rounded_bytes - this->shared_cb_->sh_.free_size_;
-
-      if (this->map (first_time, append) < 0)
-        return result;
-    }
-
-  // Get the block from extra space and update shared and local
-  // control block
-  if (this->shared_cb_->sh_.free_size_ < rounded_bytes)
-    return result;
-
-  result = (void *)((char *) this->local_cb_.mapped_base_
-                    + this->shared_cb_->sh_.free_offset_);
-  this->shared_cb_->sh_.free_offset_ += rounded_bytes;
-  this->shared_cb_->sh_.free_size_ -= rounded_bytes;
-  this->local_cb_.sh_ = this->shared_cb_->sh_;
-
-  return result;
-}
-
-void *
-ACE_Pagefile_Memory_Pool::init_acquire (size_t nbytes,
-                                        size_t &rounded_bytes,
-                                        int &first_time)
-{
-  // Map the shared memory and get information, if we created the
-  // shared memory.
-  if (this->map (first_time) < 0)
-    return 0;
-
-  if (first_time != 0)
-    // We created the shared memory. So we have to allocate the
-    // requested memory.
-    return this->acquire (nbytes, rounded_bytes);
-  else
-    // We just mapped the memory and return the base address
-    return (void *)((char *) this->local_cb_.mapped_base_
-                    + ACE_Pagefile_Memory_Pool::round_to_page_size
-                    ((int) sizeof (Control_Block)));
-}
-
-int
-ACE_Pagefile_Memory_Pool::seh_selector (void *ep)
-{
-  DWORD ecode = ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionCode;
-
-  if (ecode == EXCEPTION_ACCESS_VIOLATION)
-    {
-      void * fault_addr = (void *)
-        ((EXCEPTION_POINTERS *) ep)->ExceptionRecord->ExceptionInformation[1];
-
-      if (this->remap (fault_addr) == 0)
-        return 1;
-    }
-
-  return 0;
-}
-
-int
-ACE_Pagefile_Memory_Pool::remap (void *addr)
-{
-  // If the shared memory is not mapped or the address, that caused
-  // the memory fault is outside of the commited range of chunks, we
-  // return.
-  if (this->shared_cb_ == 0
-      || addr < this->local_cb_.mapped_base_
-      || addr >= (void *)((char *) this->local_cb_.mapped_base_
-                          + this->shared_cb_->sh_.mapped_size_))
-    return -1;
-
-  // We can solve the problem by committing additional chunks.
-  int first_time = 0;
-  return this->map (first_time);
-}
-
-int
-ACE_Pagefile_Memory_Pool::unmap (void)
-{
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-  ACE_BASED_POINTER_REPOSITORY::instance ()->unbind
-    (this->local_cb_.mapped_base_);
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
-  // Cleanup cached pool pointer.
-  this->shared_cb_ = 0;
-
-  if (this->local_cb_.sh_.mapped_size_ > 0)
-    ::UnmapViewOfFile (this->local_cb_.mapped_base_);
-
-  // Reset local pool statistics.
-  this->local_cb_.req_base_ =
-    ACE_DEFAULT_PAGEFILE_POOL_BASE;
-  this->local_cb_.mapped_base_ = 0;
-  this->local_cb_.sh_.max_size_ =
-    ACE_DEFAULT_PAGEFILE_POOL_SIZE;
-  this->local_cb_.sh_.mapped_size_ = 0;
-  this->local_cb_.sh_.free_offset_ =
-    this->local_cb_.sh_.mapped_size_;
-  this->local_cb_.sh_.free_size_ = 0;
-
-  // Release the pool
-  if (this->object_handle_ != 0)
-    {
-      ::CloseHandle (this->object_handle_);
-      this->object_handle_ = 0;
-    }
-  return 0;
-}
-
-int
-ACE_Pagefile_Memory_Pool::map (int &first_time,
-                               size_t append_bytes)
-{
-  size_t map_size;
-  void *map_addr;
-
-  // Create file mapping, if not yet done
-  if (object_handle_ == 0)
-    {
-#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
-      // Allow access by all users.
-      SECURITY_ATTRIBUTES sa;
-      SECURITY_DESCRIPTOR sd;
-      ::InitializeSecurityDescriptor (&sd,
-                                      SECURITY_DESCRIPTOR_REVISION);
-      ::SetSecurityDescriptorDacl (&sd,
-                                   TRUE,
-                                   0,
-                                   FALSE);
-      sa.nLength = sizeof (SECURITY_ATTRIBUTES);
-      sa.lpSecurityDescriptor = &sd;
-      sa.bInheritHandle = FALSE;
-#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
-
-      // Get an object handle to the named reserved memory object.
-      DWORD size_high;
-      DWORD size_low;
-#if defined (ACE_WIN64)
-      size_high = static_cast<DWORD> (this->local_cb_.sh_.max_size_ >> 32);
-      size_low  = static_cast<DWORD> (this->local_cb_.sh_.max_size_ & 0xFFFFFFFF);
-#else
-      size_high = 0;
-      size_low = this->local_cb_.sh_.max_size_;
-#endif
-
-      object_handle_ =
-        ACE_TEXT_CreateFileMapping (INVALID_HANDLE_VALUE,
-#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
-                                    &sa,
-#else
-                                    0,
-#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
-                                    PAGE_READWRITE | SEC_RESERVE,
-                                    size_high,
-                                    size_low,
-                                    this->backing_store_name_);
-      if (object_handle_ == 0)
-        return -1;
-      first_time =
-        ::GetLastError () == ERROR_ALREADY_EXISTS
-        ? 0
-        : 1;
-    }
-
-  // Do the initial mapping.
-  if (this->shared_cb_ == 0)
-    {
-      // Map a view to the shared memory.  Note: <MapViewOfFile[Ex]>
-      // does *not* commit the pages!
-      this->shared_cb_ = (ACE_Pagefile_Memory_Pool::Control_Block *)
-        ACE_MAP_FILE (this->object_handle_,
-                      FILE_MAP_WRITE,
-                      0,
-                      0,
-                      this->local_cb_.sh_.max_size_,
-                      this->local_cb_.req_base_);
-      if (this->shared_cb_ == 0)
-        return -1;
-
-      // There was no previous mapping, so we map the first chunk and
-      // initialize the shared pool statistics.
-      if (first_time)
-        {
-          // 1st block is used to keep shared memory statistics.
-          map_size =
-            ACE_Pagefile_Memory_Pool::round_to_chunk_size
-            (ACE_Pagefile_Memory_Pool::round_to_page_size
-             ((int) sizeof(Control_Block))
-             + append_bytes);
-
-          if (::VirtualAlloc ((void *) this->shared_cb_,
-                              map_size,
-                              MEM_COMMIT,
-                              PAGE_READWRITE) == 0)
-            return -1;
-
-          this->shared_cb_->req_base_ = 0;
-          this->shared_cb_->mapped_base_ = 0;
-          this->local_cb_.mapped_base_ = this->shared_cb_;
-          this->local_cb_.sh_.mapped_size_ = map_size;
-          this->local_cb_.sh_.free_offset_ =
-            round_to_page_size ((int) sizeof (Control_Block));
-          this->local_cb_.sh_.free_size_ =
-            this->local_cb_.sh_.mapped_size_ -
-            this->local_cb_.sh_.free_offset_;
-          this->shared_cb_->sh_ = this->local_cb_.sh_;
-        }
-
-      // The shared memory exists, so we map the first chunk to the
-      // base address of the pool to get the shared pool statistics.
-      else
-        {
-          // 1st block is used to keep shared memory statistics.
-          map_size =
-            ACE_Pagefile_Memory_Pool::round_to_chunk_size
-            ((int) sizeof (Control_Block));
-
-          if (::VirtualAlloc ((void *) this->shared_cb_,
-                              map_size,
-                              MEM_COMMIT,
-                              PAGE_READWRITE) == 0)
-            return -1;
-          this->local_cb_.mapped_base_ = this->shared_cb_;
-          this->local_cb_.sh_.mapped_size_ = map_size;
-        }
-    }
-
-  // If the shared memory is larger than the part we've already
-  // committed, we have to remap it.
-  if (this->shared_cb_->sh_.mapped_size_ >
-      this->local_cb_.sh_.mapped_size_
-      || append_bytes > 0)
-    {
-      map_size =
-        (this->shared_cb_->sh_.mapped_size_ -
-         this->local_cb_.sh_.mapped_size_)
-        + ACE_Pagefile_Memory_Pool::round_to_chunk_size
-        (append_bytes);
-
-      map_addr = (void *)((char *) this->shared_cb_ +
-                          this->local_cb_.sh_.mapped_size_);
-
-      if (::VirtualAlloc (map_addr,
-                          map_size,
-                          MEM_COMMIT,
-                          PAGE_READWRITE) == 0)
-        return -1;
-      else if (append_bytes > 0)
-        {
-          this->shared_cb_->sh_.mapped_size_ +=
-            round_to_chunk_size (append_bytes);
-          this->shared_cb_->sh_.free_size_ =
-            this->shared_cb_->sh_.mapped_size_ -
-            this->shared_cb_->sh_.free_offset_;
-        }
-    }
-
-  // Update local copy of the shared memory statistics.
-  this->local_cb_.sh_ =
-    this->shared_cb_->sh_;
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-  ACE_BASED_POINTER_REPOSITORY::instance ()->bind
-    (this->local_cb_.mapped_base_,
-     this->local_cb_.sh_.mapped_size_);
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
-  return 0;
-}
-
-#endif /* ACE_WIN32 */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Array_Ptr<char>;
-template class ACE_Unbounded_Set<char *>;
-template class ACE_Unbounded_Set_Iterator<char *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<char>
-#pragma instantiate ACE_Unbounded_Set<char *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<char *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index 521378370b6..628a6e09c24 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -21,795 +21,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Event_Handler.h"
-#include "ace/Signal.h"
-#include "ace/Mem_Map.h"
-#if !defined (ACE_WIN32)
-#include "ace/SV_Semaphore_Complex.h"
-#endif /* !ACE_WIN32 */
-
-#include "ace/Unbounded_Set.h"
-
-#if !defined (ACE_LACKS_SBRK)
-/**
- * @class ACE_Sbrk_Memory_Pool_Options
- *
- * @brief Helper class for Sbrk Memory Pool constructor options.
- *
- * This should be a nested class, but that breaks too many
- * compilers.
- */
-class ACE_Export ACE_Sbrk_Memory_Pool_Options
-{
-};
-
-/**
- * @class ACE_Sbrk_Memory_Pool
- *
- * @brief Make a memory pool that is based on <sbrk(2)>.
- */
-class ACE_Export ACE_Sbrk_Memory_Pool
-{
-public:
-  typedef ACE_Sbrk_Memory_Pool_Options OPTIONS;
-
-  /// Initialize the pool.
-  ACE_Sbrk_Memory_Pool (const ACE_TCHAR *backing_store_name = 0,
-                        const OPTIONS *options = 0);
-
-  virtual ~ACE_Sbrk_Memory_Pool (void);
-
-  // = Implementor operations.
-  /// Ask system for initial chunk of local memory.
-  virtual void *init_acquire (size_t nbytes,
-                              size_t &rounded_bytes,
-                              int &first_time);
-
-  /// Acquire at least @a nbytes from the memory pool. @a rounded_bytes is
-  /// the actual number of bytes allocated.
-  virtual void *acquire (size_t nbytes,
-                         size_t &rounded_bytes);
-
-  /// Instruct the memory pool to release all of its resources.
-  virtual int release (int destroy = 1);
-
-  /**
-   * Sync @a len bytes of the memory region to the backing store
-   * starting at @c this->base_addr_.  If @a len == -1 then sync the
-   * whole region.
-   */
-  virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
-
-  /// Sync @a len bytes of the memory region to the backing store
-  /// starting at @a addr.
-  virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
-
-  /**
-   * Change the protection of the pages of the mapped region to <prot>
-   * starting at @c this->base_addr_ up to @a len bytes.  If @a len == -1
-   * then change protection of all pages in the mapped region.
-   */
-  virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
-
-  /// Change the protection of the pages of the mapped region to @a prot
-  /// starting at @a addr up to @a len bytes.
-  virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
-
-  /// Dump the state of an object.
-  virtual void dump (void) const;
-
-  /// Return the base address of this memory pool, 0 if base_addr
-  /// never changes.
-  virtual void *base_addr (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-  /// Implement the algorithm for rounding up the request to an
-  /// appropriate chunksize.
-  virtual size_t round_up (size_t nbytes);
-};
-#endif /* !ACE_LACKS_SBRK */
-
-#if !defined (ACE_LACKS_SYSV_SHMEM)
-
-/**
- * @class ACE_Shared_Memory_Pool_Options
- *
- * @brief Helper class for Shared Memory Pool constructor options.
- *
- * This should be a nested class, but that breaks too many
- * compilers.
- */
-class ACE_Export ACE_Shared_Memory_Pool_Options
-{
-public:
-  /// Initialization method.
-  ACE_Shared_Memory_Pool_Options (const char *base_addr = ACE_DEFAULT_BASE_ADDR,
-                                  size_t max_segments = ACE_DEFAULT_MAX_SEGMENTS,
-                                  size_t file_perms = ACE_DEFAULT_FILE_PERMS,
-                                  off_t minimum_bytes = 0,
-                                  size_t segment_size = ACE_DEFAULT_SEGMENT_SIZE);
-
-  /// Base address of the memory-mapped backing store.
-  const char *base_addr_;
-
-  /// Number of shared memory segments to allocate.
-  size_t max_segments_;
-
-  /// What the minimum bytes of the initial segment should be.
-  off_t minimum_bytes_;
-
-  /// File permissions to use when creating/opening a segment.
-  size_t file_perms_;
-
-  /// Shared memory segment size.
-  size_t segment_size_;
-};
-
-/**
- * @class ACE_Shared_Memory_Pool
- *
- * @brief Make a memory pool that is based on System V shared memory
- * (shmget(2) etc.).  This implementation allows memory to be
- * shared between processes.  If your platform doesn't support
- * System V shared memory (e.g., Win32 and many RTOS platforms
- * do not) then you should use ACE_MMAP_Memory_Pool instead of this
- * class.  In fact, you should probably use ACE_MMAP_Memory_Pool on
- * platforms that *do* support System V shared memory since it
- * provides more powerful features, such as persistent backing store
- * and greatly scalability.
- */
-class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler
-{
-public:
-  typedef ACE_Shared_Memory_Pool_Options OPTIONS;
-
-  /// Initialize the pool.
-  ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_name = 0,
-                          const OPTIONS *options = 0);
-
-  virtual ~ACE_Shared_Memory_Pool (void);
-
-  /// Ask system for initial chunk of local memory.
-  virtual void *init_acquire (size_t nbytes,
-                              size_t &rounded_bytes,
-                              int &first_time);
-
-  /**
-   * Acquire at least @a nbytes from the memory pool. @a rounded_byes is
-   * the actual number of bytes allocated.  Also acquires an internal
-   * semaphore that ensures proper serialization of Memory_Pool
-   * initialization across processes.
-   */
-  virtual void *acquire (size_t nbytes,
-                         size_t &rounded_bytes);
-
-  /// Instruct the memory pool to release all of its resources.
-  virtual int release (int destroy = 1);
-
-  /// Sync the memory region to the backing store starting at
-  /// @c this->base_addr_.
-  virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
-
-  /// Sync the memory region to the backing store starting at @a addr.
-  virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
-
-  /**
-   * Change the protection of the pages of the mapped region to <prot>
-   * starting at @c this->base_addr_ up to @a len bytes.  If @a len == -1
-   * then change protection of all pages in the mapped region.
-   */
-  virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
-
-  /// Change the protection of the pages of the mapped region to <prot>
-  /// starting at <addr> up to <len> bytes.
-  virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
-
-  /// Return the base address of this memory pool, 0 if base_addr
-  /// never changes.
-  virtual void *base_addr (void) const;
-
-  /// Dump the state of an object.
-  virtual void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-  /// Implement the algorithm for rounding up the request to an
-  /// appropriate chunksize.
-  virtual size_t round_up (size_t nbytes);
-
-  /**
-   * Commits a new shared memory segment if necessary after an
-   * <acquire> or a signal.  <offset> is set to the new offset into
-   * the backing store.
-   */
-  virtual int commit_backing_store_name (size_t rounded_bytes,
-                                    off_t &offset);
-
-  /// Keeps track of all the segments being used.
-  struct SHM_TABLE
-  {
-    /// Shared memory segment key.
-    key_t key_;
-
-    /// Shared memory segment internal id.
-    int shmid_;
-
-    /// Is the segment currently used.;
-    int used_;
-  };
-
-  /**
-   * Base address of the shared memory segment.  If this has the value
-   * of 0 then the OS is free to select any address, otherwise this
-   * value is what the OS must try to use to map the shared memory
-   * segment.
-   */
-  void *base_addr_;
-
-  /// File permissions to use when creating/opening a segment.
-  size_t file_perms_;
-
-  /// Number of shared memory segments in the <SHM_TABLE> table.
-  size_t max_segments_;
-
-  /// What the minimim bytes of the initial segment should be.
-  off_t minimum_bytes_;
-
-  /// Shared memory segment size.
-  size_t segment_size_;
-
-  /// Base shared memory key for the segment.
-  key_t base_shm_key_;
-
-  /// Find the segment that contains the @a searchPtr
-  virtual int find_seg (const void *const searchPtr,
-                        off_t &offset,
-                        size_t &counter);
-
-  /// Determine how much memory is currently in use.
-  virtual int in_use (off_t &offset,
-                      size_t &counter);
-
-  /// Handles SIGSEGV.
-  ACE_Sig_Handler signal_handler_;
-
-  /// Handle SIGSEGV and SIGBUS signals to remap shared memory
-  /// properly.
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
-};
-#endif /* !ACE_LACKS_SYSV_SHMEM */
-
-/**
- * @class ACE_Local_Memory_Pool_Options
- *
- * @brief Helper class for Local Memory Pool constructor options.
- *
- * This should be a nested class, but that breaks too many
- * compilers.
- */
-class ACE_Export ACE_Local_Memory_Pool_Options
-{
-};
-
-/**
- * @class ACE_Local_Memory_Pool
- *
- * @brief Make a memory pool that is based on C++ new/delete.  This is
- * useful for integrating existing components that use new/delete
- * into the ACE Malloc scheme...
- */
-class ACE_Export ACE_Local_Memory_Pool
-{
-public:
-  typedef ACE_Local_Memory_Pool_Options OPTIONS;
-
-  /// Initialize the pool.
-  ACE_Local_Memory_Pool (const ACE_TCHAR *backing_store_name = 0,
-                         const OPTIONS *options = 0);
-
-  virtual ~ACE_Local_Memory_Pool (void);
-
-  /// Ask system for initial chunk of local memory.
-  virtual void *init_acquire (size_t nbytes,
-                              size_t &rounded_bytes,
-                              int &first_time);
-
-  /// Acquire at least @a nbytes from the memory pool. @a rounded_bytes is
-  /// the actual number of bytes allocated.
-  virtual void *acquire (size_t nbytes,
-                         size_t &rounded_bytes);
-
-  /// Instruct the memory pool to release all of its resources.
-  virtual int release (int destroy = 1);
-
-  /**
-   * Sync <len> bytes of the memory region to the backing store
-   * starting at <this->base_addr_>.  If <len> == -1 then sync the
-   * whole region.
-   */
-  virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
-
-  /// Sync <len> bytes of the memory region to the backing store
-  /// starting at <addr_>.
-  virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
-
-  /**
-   * Change the protection of the pages of the mapped region to <prot>
-   * starting at <this->base_addr_> up to <len> bytes.  If <len> == -1
-   * then change protection of all pages in the mapped region.
-   */
-  virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
-
-  /// Change the protection of the pages of the mapped region to <prot>
-  /// starting at <addr> up to <len> bytes.
-  virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
-
-#if defined (ACE_WIN32)
-  /**
-   * Win32 Structural exception selector.  The return value decides
-   * how to handle memory pool related structural exceptions.  Returns
-   * 1, 0, or , -1.
-   */
-  virtual int seh_selector (void *);
-#endif /* ACE_WIN32 */
-
-  /**
-   * Try to extend the virtual address space so that <addr> is now
-   * covered by the address mapping.  Always returns 0 since we can't
-   * remap a local memory pool.
-   */
-  virtual int remap (void *addr);
-
-  /// Return the base address of this memory pool, 0 if base_addr
-  /// never changes.
-  virtual void *base_addr (void) const;
-
-  /// Dump the state of an object.
-  virtual void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-  /// List of memory that we have allocated.
-  ACE_Unbounded_Set<char *> allocated_chunks_;
-
-  /// Implement the algorithm for rounding up the request to an
-  /// appropriate chunksize.
-  virtual size_t round_up (size_t nbytes);
-
-};
-
-/**
- * @class ACE_MMAP_Memory_Pool_Options
- *
- * @brief Helper class for MMAP Memory Pool constructor options.
- *
- * This should be a nested class, but that breaks too many
- * compilers.
- */
-class ACE_Export ACE_MMAP_Memory_Pool_Options
-{
-public:
-  enum
-  {
-    /**
-     * The base address from the first call to mmap will be used for subsequent
-     * calls to mmap.
-     */
-    FIRSTCALL_FIXED = 0,
-
-    /**
-     * The base address specified in base_addr will be used in all calls to
-     * mmap.
-     */
-    ALWAYS_FIXED = 1,
-
-    /**
-     * The base address will be selected by the OS for each call to mmap.
-     * Caution should be used with this mode since a call that requires the
-     * backing store to grow may change pointers that are cached by the
-     * application.
-     */
-    NEVER_FIXED = 2
-  };
-
-  // = Initialization method.
-  ACE_MMAP_Memory_Pool_Options (const void *base_addr = ACE_DEFAULT_BASE_ADDR,
-                                int use_fixed_addr = ALWAYS_FIXED,
-                                int write_each_page = 1,
-                                off_t minimum_bytes = 0,
-                                u_int flags = 0,
-                                int guess_on_fault = 1,
-                                LPSECURITY_ATTRIBUTES sa = 0,
-                                mode_t file_mode = ACE_DEFAULT_FILE_PERMS);
-
-  /// Base address of the memory-mapped backing store.
-  const void *base_addr_;
-
-  /**
-   * Determines whether we set @c base_addr_ or if mmap(2) selects it
-   * FIRSTCALL_FIXED The base address from the first call to mmap
-   *                 will be used for subsequent calls to mmap
-   * ALWAYS_FIXED    The base address specified in base_addr will be
-   *                 used in all calls to mmap.
-   * NEVER_FIXED     The base address will be selected by the OS for
-   *                 each call to mmap. Caution should be used with
-   *                 this mode since a call that requires the backing
-   *                 store to grow may change pointers that are
-   *                 cached by the application.
-   */
-  int use_fixed_addr_;
-
-  /// Should each page be written eagerly to avoid surprises later
-  /// on?
-  int write_each_page_;
-
-  /// What the minimim bytes of the initial segment should be.
-  off_t minimum_bytes_;
-
-  /// Any special flags that need to be used for @c mmap.
-  u_int flags_;
-
-  /**
-   * Try to remap without knowing the faulting address.  This
-   * parameter is ignored on platforms that know the faulting address
-   * (UNIX with SI_ADDR and Win32).
-   */
-  int guess_on_fault_;
-
-  /// Pointer to a security attributes object.  Only used on NT.
-  LPSECURITY_ATTRIBUTES sa_;
-
-  /// File mode for mmaped file, if it is created.
-  mode_t file_mode_;
-};
-
-/**
- * @class ACE_MMAP_Memory_Pool
- *
- * @brief Make a memory pool that is based on @c mmap(2).  This
- * implementation allows memory to be shared between processes.
- */
-class ACE_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler
-{
-public:
-  typedef ACE_MMAP_Memory_Pool_Options OPTIONS;
-
-  // = Initialization and termination methods.
-
-  /// Initialize the pool.
-  ACE_MMAP_Memory_Pool (const ACE_TCHAR *backing_store_name = 0,
-                        const OPTIONS *options = 0);
-
-  /// Destructor.
-  virtual ~ACE_MMAP_Memory_Pool (void);
-
-  /// Ask system for initial chunk of shared memory.
-  virtual void *init_acquire (size_t nbytes,
-                              size_t &rounded_bytes,
-                              int &first_time);
-
-  /**
-   * Acquire at least @a nbytes from the memory pool. @a rounded_bytes
-   * is the actual number of bytes allocated.  Also acquires an
-   * internal semaphore that ensures proper serialization of
-   * ACE_MMAP_Memory_Pool initialization across processes.
-   */
-  virtual void *acquire (size_t nbytes,
-                         size_t &rounded_bytes);
-
-  /// Instruct the memory pool to release all of its resources.
-  virtual int release (int destroy = 1);
-
-  /// Sync the memory region to the backing store starting at
-  /// @c this->base_addr_.
-  virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
-
-  /// Sync the memory region to the backing store starting at @a addr.
-  virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
-
-  /**
-   * Change the protection of the pages of the mapped region to <prot>
-   * starting at <this->base_addr_> up to <len> bytes.  If <len> == -1
-   * then change protection of all pages in the mapped region.
-   */
-  virtual int protect (ssize_t len = -1, int prot = PROT_RDWR);
-
-  /// Change the protection of the pages of the mapped region to @a prot
-  /// starting at @a addr up to @a len bytes.
-  virtual int protect (void *addr, size_t len, int prot = PROT_RDWR);
-
-#if defined (ACE_WIN32)
-  /**
-   * Win32 Structural exception selector.  The return value decides
-   * how to handle memory pool related structural exceptions.  Returns
-   * 1, 0, or , -1.
-   */
-  virtual int seh_selector (void *);
-#endif /* ACE_WIN32 */
-
-  /**
-   * Try to extend the virtual address space so that @a addr is now
-   * covered by the address mapping.  The method succeeds and returns
-   * 0 if the backing store has adequate memory to cover this address.
-   * Otherwise, it returns -1.  This method is typically called by a
-   * UNIX signal handler for SIGSEGV or a Win32 structured exception
-   * when another process has grown the backing store (and its
-   * mapping) and our process now incurs a fault because our mapping
-   * isn't in range (yet).
-   */
-  virtual int remap (void *addr);
-
-  /// Return the base address of this memory pool.
-  virtual void *base_addr (void) const;
-
-  /// Dump the state of an object.
-  virtual void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-  /// Implement the algorithm for rounding up the request to an
-  /// appropriate chunksize.
-  virtual size_t round_up (size_t nbytes);
-
-  /// Compute the new @a map_size of the backing store and commit the
-  /// memory.
-  virtual int commit_backing_store_name (size_t rounded_bytes,
-                                         off_t &map_size);
-
-  /// Memory map the file up to @a map_size bytes.
-  virtual int map_file (off_t map_size);
-
-  /// Handle SIGSEGV and SIGBUS signals to remap shared memory
-  /// properly.
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
-
-  /// Handles SIGSEGV.
-  ACE_Sig_Handler signal_handler_;
-
-  /// Memory-mapping object.
-  ACE_Mem_Map mmap_;
-
-  /**
-   * Base of mapped region.  If this has the value of 0 then the OS is
-   * free to select any address to map the file, otherwise this value
-   * is what the OS must try to use to mmap the file.
-   */
-  void *base_addr_;
-
-  /// Must we use the @c base_addr_ or can we let mmap(2) select it?
-  int use_fixed_addr_;
-
-  /// Flags passed into <ACE_OS::mmap>.
-  int flags_;
-
-  /// Should we write a byte to each page to forceably allocate memory
-  /// for this backing store?
-  int write_each_page_;
-
-  /// What the minimum bytes of the initial segment should be.
-  off_t minimum_bytes_;
-
-  /// Name of the backing store where the shared memory pool is kept.
-  ACE_TCHAR backing_store_name_[MAXPATHLEN + 1];
-
-  /**
-   * Try to remap without knowing the faulting address.  This
-   * parameter is ignored on platforms that know the faulting address
-   * (UNIX with SI_ADDR and Win32).
-   */
-  int guess_on_fault_;
-
-  /// Security attributes object, only used on NT.
-  LPSECURITY_ATTRIBUTES sa_;
-
-  /// Protection mode for mmaped file.
-  mode_t file_mode_;
-};
-
-/**
- * @class ACE_Lite_MMAP_Memory_Pool
- *
- * @brief Make a ``lighter-weight'' memory pool based <ACE_Mem_Map>.
- *
- * This implementation allows memory to be shared between
- * processes.  However, unlike the <ACE_MMAP_Memory_Pool>
- * the <sync> methods are no-ops, which means that we don't pay
- * for the price of flushing the memory to the backing store on
- * every update.  Naturally, this trades off increased
- * performance for less reliability if the machine crashes.
- */
-class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool
-{
-public:
-  /// Initialize the pool.
-  ACE_Lite_MMAP_Memory_Pool (const ACE_TCHAR *backing_store_name = 0,
-                             const OPTIONS *options = 0);
-
-  /// Destructor.
-  virtual ~ACE_Lite_MMAP_Memory_Pool (void);
-
-  /// Overwrite the default sync behavior with no-op
-  virtual int sync (ssize_t len = -1, int flags = MS_SYNC);
-
-  /// Overwrite the default sync behavior with no-op
-  virtual int sync (void *addr, size_t len, int flags = MS_SYNC);
-};
-
-#if defined (ACE_WIN32)
-
-/**
- * @class ACE_Pagefile_Memory_Pool_Options
- *
- * @brief Helper class for Pagefile Memory Pool constructor options.
- *
- * This should be a nested class, but that breaks too many
- * compilers.
- */
-class ACE_Export ACE_Pagefile_Memory_Pool_Options
-{
-public:
-  /// Initialization method.
-  ACE_Pagefile_Memory_Pool_Options (void *base_addr = ACE_DEFAULT_PAGEFILE_POOL_BASE,
-                                    size_t max_size = ACE_DEFAULT_PAGEFILE_POOL_SIZE);
-
-  /// Base address of the memory-mapped backing store.
-  void *base_addr_;
-
-  /// Maximum size the pool may grow.
-  size_t max_size_;
-};
-
-/**
- * @class ACE_Pagefile_Memory_Pool
- *
- * @brief Make a memory pool that is based on "anonymous" memory
- * regions allocated from the Win32 page file.
- */
-class ACE_Export ACE_Pagefile_Memory_Pool
-{
-public:
-  typedef ACE_Pagefile_Memory_Pool_Options OPTIONS;
-
-  /// Initialize the pool.
-  ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_store_name = 0,
-                            const OPTIONS *options = 0);
-
-  /// Ask system for initial chunk of shared memory.
-  void *init_acquire (size_t nbytes,
-                      size_t &rounded_bytes,
-                      int &first_time);
-
-  /// Acquire at least <nbytes> from the memory pool.  <rounded_bytes>
-  /// is the actual number of bytes allocated.
-  void *acquire (size_t nbytes,
-                 size_t &rounded_bytes);
-
-  /// Instruct the memory pool to release all of its resources.
-  int release (int destroy = 1);
-
-  /**
-   * Win32 Structural exception selector.  The return value decides
-   * how to handle memory pool related structural exceptions.  Returns
-   * 1, 0, or , -1.
-   */
-  virtual int seh_selector (void *);
-
-  /**
-   * Try to extend the virtual address space so that <addr> is now
-   * covered by the address mapping.  The method succeeds and returns
-   * 0 if the backing store has adequate memory to cover this address.
-   * Otherwise, it returns -1.  This method is typically called by an
-   * exception handler for a Win32 structured exception when another
-   * process has grown the backing store (and its mapping) and our
-   * process now incurs a fault because our mapping isn't in range
-   * (yet).
-   */
-  int remap (void *addr);
-
-  /// Round up to system page size.
-  size_t round_to_page_size (size_t nbytes);
-
-  /// Round up to the chunk size required by the operation system
-  size_t round_to_chunk_size (size_t nbytes);
-
-  // = Don't need this methods here ...
-  int sync (ssize_t = -1, int = MS_SYNC);
-  int sync (void *, size_t, int = MS_SYNC);
-  int protect (ssize_t = -1, int = PROT_RDWR);
-  int protect (void *, size_t, int = PROT_RDWR);
-
-  /// Return the base address of this memory pool, 0 if base_addr
-  /// never changes.
-  virtual void *base_addr (void) const;
-
-  void dump (void) const {}
-
-protected:
-
-  /**
-   * Map portions or the entire pool into the local virtual address
-   * space.  To do this, we compute the new @c file_offset of the
-   * backing store and commit the memory.
-   */
-  int map (int &firstTime, size_t appendBytes = 0);
-
-  /// Release the mapping.
-  int unmap (void);
-
-private:
-
-  /**
-   * @class Control_Block
-   *
-   * @brief Attributes that are meaningful in local storage only.
-   */
-  class Control_Block
-  {
-  public:
-    /// Required base address
-    void *req_base_;
-
-    /// Base address returned from system call
-    void *mapped_base_;
-
-    /**
-     * @class Shared_Control_Block
-     *
-     * @brief Pool statistics
-     */
-    class Shared_Control_Block
-    {
-    public:
-      /// Maximum size the pool may grow
-      size_t max_size_;
-
-      /// Size of mapped shared memory segment
-      size_t mapped_size_;
-
-      /// Offset to mapped but not yet acquired address space
-      ptrdiff_t free_offset_;
-
-      /// Size of mapped but not yet acquired address space
-      size_t free_size_;
-    };
-
-    Shared_Control_Block sh_;
-  };
-
-  // Base of mapped region.  If this has the value of 0 then the OS is
-  // free to select any address to map the file, otherwise this value
-  // is what the OS must try to use to mmap the file.
-
-  /// Description of what our process mapped.
-  Control_Block local_cb_;
-
-  /// Shared memory pool statistics.
-  Control_Block *shared_cb_;
-
-  /// File mapping handle.
-  ACE_HANDLE object_handle_;
-
-  /// System page size.
-  size_t page_size_;
-
-  /// Name of the backing store where the shared memory pool is kept.
-  ACE_TCHAR backing_store_name_[MAXPATHLEN];
-};
-
-#endif /* ACE_WIN32 */
-
-#if defined (__ACE_INLINE__)
-#include "ace/Memory_Pool.inl"
-#endif /* __ACE_INLINE__ */
+#include "ace/Local_Memory_Pool.h"
+#include "ace/MMAP_Memory_Pool.h"
+#include "ace/Sbrk_Memory_Pool.h"
+#include "ace/Shared_Memory_Pool.h"
+#include "ace/Pagefile_Memory_Pool.h"
 
 #include /**/ "ace/post.h"
 #endif /* ACE_MEMORY_POOL_H */
diff --git a/ace/Memory_Pool.inl b/ace/Memory_Pool.inl
deleted file mode 100644
index de87de3b331..00000000000
--- a/ace/Memory_Pool.inl
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_Local_Memory_Pool::~ACE_Local_Memory_Pool (void)
-{
-  // Free up all memory allocated by this pool.
-  this->release ();
-}
-
-ACE_INLINE int
-ACE_Local_Memory_Pool::sync (ssize_t, int)
-{
-  ACE_TRACE ("ACE_Local_Memory_Pool::sync");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Local_Memory_Pool::sync (void *, size_t, int)
-{
-  ACE_TRACE ("ACE_Local_Memory_Pool::sync");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Local_Memory_Pool::protect (ssize_t, int)
-{
-  ACE_TRACE ("ACE_Local_Memory_Pool::protect");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Local_Memory_Pool::protect (void *, size_t, int)
-{
-  ACE_TRACE ("ACE_Local_Memory_Pool::protect");
-  return 0;
-}
-
-ACE_INLINE void *
-ACE_Local_Memory_Pool::base_addr (void) const
-{
-  return 0;
-}
-
-ACE_INLINE
-ACE_MMAP_Memory_Pool::~ACE_MMAP_Memory_Pool (void)
-{
-}
-
-ACE_INLINE
-ACE_Lite_MMAP_Memory_Pool::~ACE_Lite_MMAP_Memory_Pool (void)
-{
-}
-
-ACE_INLINE size_t
-ACE_MMAP_Memory_Pool::round_up (size_t nbytes)
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::round_up");
-  return ACE::round_to_pagesize (static_cast<off_t> (nbytes));
-}
-
-ACE_INLINE void *
-ACE_MMAP_Memory_Pool::base_addr (void) const
-{
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::base_addr");
-  return this->base_addr_;
-}
-
-// Ask system for initial chunk of local memory.
-
-ACE_INLINE void *
-ACE_Local_Memory_Pool::init_acquire (size_t nbytes,
-                                     size_t &rounded_bytes,
-                                     int &first_time)
-{
-  ACE_TRACE ("ACE_Local_Memory_Pool::init_acquire");
-  // Note that we assume that when ACE_Local_Memory_Pool is used,
-  // ACE_Malloc's constructor will only get called once.  If this
-  // assumption doesn't hold, we are in deep trouble!
-
-  first_time = 1;
-  return this->acquire (nbytes, rounded_bytes);
-}
-
-// Let the underlying new operator figure out the alignment...
-
-ACE_INLINE size_t
-ACE_Local_Memory_Pool::round_up (size_t nbytes)
-{
-  ACE_TRACE ("ACE_Local_Memory_Pool::round_up");
-  return ACE::round_to_pagesize (static_cast<off_t> (nbytes));
-}
-
-#if !defined (ACE_LACKS_SYSV_SHMEM)
-// Implement the algorithm for rounding up the request to an
-// appropriate chunksize.
-
-ACE_INLINE
-ACE_Shared_Memory_Pool::~ACE_Shared_Memory_Pool (void)
-{
-}
-
-ACE_INLINE size_t
-ACE_Shared_Memory_Pool::round_up (size_t nbytes)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::round_up");
-  if (nbytes < this->segment_size_)
-    nbytes = this->segment_size_;
-
-  return ACE::round_to_pagesize (nbytes);
-}
-
-ACE_INLINE int
-ACE_Shared_Memory_Pool::sync (ssize_t, int)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::sync");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Shared_Memory_Pool::sync (void *, size_t, int)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::sync");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Shared_Memory_Pool::protect (ssize_t, int)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::protect");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Shared_Memory_Pool::protect (void *, size_t, int)
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::protect");
-  return 0;
-}
-
-ACE_INLINE void *
-ACE_Shared_Memory_Pool::base_addr (void) const
-{
-  ACE_TRACE ("ACE_Shared_Memory_Pool::base_addr");
-  return this->base_addr_;
-}
-#endif /* !ACE_LACKS_SYSV_SHMEM */
-
-#if !defined (ACE_LACKS_SBRK)
-
-ACE_INLINE
-ACE_Sbrk_Memory_Pool::~ACE_Sbrk_Memory_Pool (void)
-{
-}
-
-ACE_INLINE void *
-ACE_Sbrk_Memory_Pool::base_addr (void) const
-{
-  return 0;
-}
-
-// Ask system for initial chunk of local memory.
-
-ACE_INLINE void *
-ACE_Sbrk_Memory_Pool::init_acquire (size_t nbytes,
-                                    size_t &rounded_bytes,
-                                    int &first_time)
-{
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::init_acquire");
-  // Note that we assume that when ACE_Sbrk_Memory_Pool is used,
-  // ACE_Malloc's constructor will only get called once.  If this
-  // assumption doesn't hold, we are in deep trouble!
-
-  first_time = 1;
-  return this->acquire (nbytes, rounded_bytes);
-}
-
-// Round up the request to a multiple of the page size.
-
-ACE_INLINE size_t
-ACE_Sbrk_Memory_Pool::round_up (size_t nbytes)
-{
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::round_up");
-  return ACE::round_to_pagesize (nbytes);
-}
-
-/* No-op for now... */
-
-ACE_INLINE int
-ACE_Sbrk_Memory_Pool::release (int)
-{
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::release");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Sbrk_Memory_Pool::sync (ssize_t, int)
-{
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::sync");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Sbrk_Memory_Pool::sync (void *, size_t, int)
-{
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::sync");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Sbrk_Memory_Pool::protect (ssize_t, int)
-{
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::protect");
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Sbrk_Memory_Pool::protect (void *, size_t, int)
-{
-  ACE_TRACE ("ACE_Sbrk_Memory_Pool::protect");
-  return 0;
-}
-#endif /* !ACE_LACKS_SBRK */
-
-#if defined (ACE_WIN32)
-
-ACE_INLINE size_t
-ACE_Pagefile_Memory_Pool::round_to_chunk_size (size_t nbytes)
-{
-  return (nbytes + ACE_DEFAULT_PAGEFILE_POOL_CHUNK - 1)
-          & (~(ACE_DEFAULT_PAGEFILE_POOL_CHUNK - 1));
-}
-
-ACE_INLINE size_t
-ACE_Pagefile_Memory_Pool::round_to_page_size (size_t nbytes)
-{
-  return ACE::round_to_pagesize (static_cast<off_t> (nbytes));
-}
-
-ACE_INLINE int
-ACE_Pagefile_Memory_Pool::sync (ssize_t, int)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Pagefile_Memory_Pool::sync (void *, size_t, int)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Pagefile_Memory_Pool::protect (ssize_t, int)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Pagefile_Memory_Pool::protect (void *, size_t, int)
-{
-  return 0;
-}
-
-ACE_INLINE void *
-ACE_Pagefile_Memory_Pool::base_addr (void) const
-{
-  return 0;
-}
-#endif /* ACE_WIN32 */
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index 05659a712c5..09b12e2b91c 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -322,7 +322,7 @@ ACE_Data_Block::ACE_Data_Block (size_t size,
     cur_size_ (0),          // Reset later if memory alloc'd ok
     max_size_ (0),
     flags_ (flags),
-    base_ ((char *) msg_data),
+    base_ (const_cast <char *> (msg_data)),
     allocator_strategy_ (allocator_strategy),
     locking_strategy_ (locking_strategy),
     reference_count_ (1),
@@ -1046,12 +1046,15 @@ ACE_Data_Block::clone (ACE_Message_Block::Message_Flags mask) const
 
   ACE_Data_Block *nb = this->clone_nocopy (mask);
 
-  // Copy all of the payload memory into the new object.
+  // Copy all of the payload memory into the new object. The new block
+  // was allocated with max_size_ (and, thus, it's cur_size_ is the same
+  // as max_size_). Maintain the same "has been written" boundary in the
+  // new block by only copying cur_size_ bytes.
   if (nb != 0)
     {
       ACE_OS::memcpy (nb->base_,
                       this->base_,
-                      this->max_size_);
+                      this->cur_size_);
     }
 
   return nb;
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index 9379f61a35b..9d33f3ca937 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -15,6 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
+#include "ace/config-lite.h"
 #include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp
index 9d06664b5f2..6ba5fa5c649 100644
--- a/ace/Message_Queue.cpp
+++ b/ace/Message_Queue.cpp
@@ -12,6 +12,19 @@
 
 ACE_RCSID(ace, Message_Queue, "$Id$")
 
+
+ACE_Message_Queue_Base::~ACE_Message_Queue_Base (void)
+{
+}
+
+int
+ACE_Message_Queue_Base::state (void)
+{
+  ACE_TRACE ("ACE_Message_Queue_Base::state");
+
+  return this->state_;
+}
+
 #if defined (VXWORKS)
 
 ////////////////////////////////
@@ -424,7 +437,7 @@ ACE_Message_Queue_NT::deactivate (void)
       // Get the number of shutdown messages necessary to wake up all
       // waiting threads.
       DWORD cntr =
-        this->cur_thrs_ - ACE_static_cast (DWORD, this->cur_count_);
+        this->cur_thrs_ - static_cast<DWORD> (this->cur_count_);
       while (cntr-- > 0)
         ::PostQueuedCompletionStatus (this->completion_port_,
                                       0,
@@ -459,7 +472,7 @@ ACE_Message_Queue_NT::pulse (void)
       // waiting threads.
 
       DWORD cntr =
-        this->cur_thrs_ - ACE_static_cast (DWORD, this->cur_count_);
+        this->cur_thrs_ - static_cast<DWORD> (this->cur_count_);
       while (cntr-- > 0)
         ::PostQueuedCompletionStatus (this->completion_port_,
                                       0,
diff --git a/ace/Message_Queue.inl b/ace/Message_Queue.inl
index fa03235d6a7..6fadfd2c2c6 100644
--- a/ace/Message_Queue.inl
+++ b/ace/Message_Queue.inl
@@ -6,19 +6,6 @@ ACE_Message_Queue_Base::ACE_Message_Queue_Base (void)
 {
 }
 
-ACE_INLINE
-ACE_Message_Queue_Base::~ACE_Message_Queue_Base (void)
-{
-}
-
-ACE_INLINE int
-ACE_Message_Queue_Base::state (void)
-{
-  ACE_TRACE ("ACE_Message_Queue_Base::state");
-
-  return this->state_;
-}
-
 #if defined (VXWORKS)
 // Specialization to use native VxWorks Message Queues.
 
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index ff017456769..58fb0053f86 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -118,7 +118,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::peek_dequeue_head (ACE_ME
   int cur_count = this->queue_.peek_dequeue_head (mb, timeout);
 
   if (cur_count != -1)
-    first_item  = ACE_reinterpret_cast (ACE_MESSAGE_TYPE *, mb->base ());
+    first_item  = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
 
   return cur_count;
 }
@@ -242,7 +242,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_head (ACE_MESSAGE
   // Dequeue the message.
   if (cur_count != -1)
     {
-      first_item = ACE_reinterpret_cast (ACE_MESSAGE_TYPE *, mb->base ());
+      first_item = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
       // Delete the message block.
       mb->release ();
       return cur_count;
@@ -268,7 +268,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_prio (ACE_MESSAGE
   // Dequeue the message.
   if (cur_count != -1)
     {
-      dequeued = ACE_reinterpret_cast (ACE_MESSAGE_TYPE *, mb->base ());
+      dequeued = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
       // Delete the message block.
       mb->release ();
       return cur_count;
@@ -294,7 +294,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_tail (ACE_MESSAGE
   // Dequeue the message.
   if (cur_count != -1)
     {
-      dequeued = ACE_reinterpret_cast (ACE_MESSAGE_TYPE *, mb->base ());
+      dequeued = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
       // Delete the message block.
       mb->release ();
       return cur_count;
@@ -320,7 +320,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue_deadline (ACE_MES
   // Dequeue the message.
   if (cur_count != -1)
     {
-      dequeued = ACE_reinterpret_cast (ACE_MESSAGE_TYPE *, mb->base ());
+      dequeued = reinterpret_cast<ACE_MESSAGE_TYPE *> (mb->base ());
       // Delete the message block.
       mb->release ();
       return cur_count;
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index 429e2c2edf6..a8833fec40d 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -1219,7 +1219,7 @@ public:
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
-private:
+protected:
   /// Implement this via an <ACE_Message_Queue>.
   ACE_Message_Queue<ACE_SYNCH_USE> queue_;
 };
diff --git a/ace/Multihomed_INET_Addr.cpp b/ace/Multihomed_INET_Addr.cpp
index b9258687a99..0b4a56dac10 100644
--- a/ace/Multihomed_INET_Addr.cpp
+++ b/ace/Multihomed_INET_Addr.cpp
@@ -58,6 +58,43 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
   return;
 }
 
+#if defined (ACE_HAS_WCHAR)
+ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
+                                                   const wchar_t host_name[],
+                                                   int encode,
+                                                   int address_family,
+                                                   const wchar_t *(secondary_host_names[]),
+                                                   size_t size){
+
+  // Initialize the primary INET addr
+  ACE_INET_Addr::set(port_number, host_name, encode, address_family);
+
+  // check for secondary INET addrs
+  if (secondary_host_names && size){
+    // we have a non-zero pointer and size
+    this->secondaries_.size(size); // size the array
+
+    size_t next_empty_slot = 0;
+    for (size_t i = 0; i < size; ++i) {
+      int ret = this->secondaries_[next_empty_slot].set(port_number,
+                                                       secondary_host_names[i],
+                                                       encode,
+                                                       address_family);
+      if (ret) {
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"),
+                    ACE_TEXT_WCHAR_TO_TCHAR (secondary_host_names[i]), port_number));
+        this->secondaries_.size(this->secondaries_.size() - 1);
+      }
+      else
+        ++next_empty_slot;
+    }
+  }
+
+  return;
+}
+#endif /* ACE_HAS_WCHAR */
+
 ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
                                                    ACE_UINT32 primary_ip_addr,
                                                    int encode,
@@ -117,6 +154,35 @@ ACE_Multihomed_INET_Addr::set (u_short port_number,
   return ACE_INET_Addr::set(port_number, host_name, encode, address_family);
 }
 
+#if defined (ACE_HAS_WCHAR)
+//
+// WCHAR version of ::set
+//
+int
+ACE_Multihomed_INET_Addr::set (u_short port_number,
+                               const wchar_t host_name[],
+                               int encode,
+                               int address_family,
+                               const wchar_t *(secondary_host_names[]),
+                               size_t size)
+{
+  this->secondaries_.size(size);
+
+  for (size_t i = 0; i < size; ++i) {
+
+    int ret = this->secondaries_[i].set(port_number,
+                                       secondary_host_names[i],
+                                       encode,
+                                       address_family);
+    if (ret) {
+      return ret;
+    }
+  }
+
+  return ACE_INET_Addr::set(port_number, host_name, encode, address_family);
+}
+#endif /* ACE_HAS_WCHAR */
+
 int
 ACE_Multihomed_INET_Addr::set (u_short port_number,
                                ACE_UINT32 primary_ip_addr,
diff --git a/ace/Multihomed_INET_Addr.h b/ace/Multihomed_INET_Addr.h
index dd3b2f45908..2f129691832 100644
--- a/ace/Multihomed_INET_Addr.h
+++ b/ace/Multihomed_INET_Addr.h
@@ -67,6 +67,25 @@ public:
                            const ACE_UINT32 *secondary_ip_addrs = 0,
                            size_t size = 0);
 
+#if defined (ACE_HAS_WCHAR)
+    /**
+     * WCHAR versions of the methods that take char's as arguments.
+     */
+  ACE_Multihomed_INET_Addr(u_short port_number,
+                           const wchar_t primary_host_name[],
+                           int encode = 1,
+                           int address_family = AF_UNSPEC,
+                           const wchar_t *(secondary_host_names[]) = 0,
+                           size_t size = 0);
+  int set (u_short port_number,
+           const wchar_t primary_host_name[],
+           int encode = 1,
+           int address_family = AF_UNSPEC,
+           const wchar_t *(secondary_host_names[]) = 0,
+           size_t size = 0);
+
+#endif /* ACE_HAS_WCHAR */
+
   /// Use compiler-generated copy constructor.
 
   /// Use compiler-generated assignment operator.
diff --git a/ace/Name_Proxy.cpp b/ace/Name_Proxy.cpp
index a5157d5d9ac..5a3e61cbb16 100644
--- a/ace/Name_Proxy.cpp
+++ b/ace/Name_Proxy.cpp
@@ -49,8 +49,10 @@ ACE_Name_Proxy::open (const ACE_INET_Addr &remote_addr,
 
 // Establish binding with the ACE_Name Server at remote_addr.
 
-ACE_Name_Proxy::ACE_Name_Proxy (const ACE_INET_Addr &remote_addr,
-				ACE_Synch_Options& options)
+ACE_Name_Proxy::ACE_Name_Proxy (
+  const ACE_INET_Addr &remote_addr,
+  ACE_Synch_Options& options)
+   : reactor_ (0)
 {
   ACE_TRACE ("ACE_Name_Proxy::ACE_Name_Proxy");
   if (this->open (remote_addr, options) == -1
diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h
index a10dac70b29..594df3c3c2a 100644
--- a/ace/Name_Proxy.h
+++ b/ace/Name_Proxy.h
@@ -32,6 +32,7 @@
 #include "ace/Service_Config.h"
 #include "ace/Synch_Options.h"
 #include "ace/Name_Request_Reply.h"
+#include "ace/Event_Handler.h"
 
 /**
  * @class ACE_Name_Proxy
@@ -85,6 +86,11 @@ private:
 
   /// Pointer to ACE_Reactor (used if we are run in "reactive-mode").
   ACE_Reactor *reactor_;
+
+private:
+  // Prevent copying
+  ACE_Name_Proxy (const ACE_Name_Proxy &);
+  ACE_Name_Proxy &operator= (const ACE_Name_Proxy &);
 };
 
 #include /**/ "ace/post.h"
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index d700b592158..871f4ee0ce7 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -54,7 +54,7 @@ ACE_Naming_Context::info (ACE_TCHAR **strp,
     return -1;
   else
     ACE_OS::strsncpy (*strp, buf, length);
-  return ACE_static_cast (int, ACE_OS::strlen (buf));
+  return static_cast<int> (ACE_OS::strlen (buf));
 }
 
 int
@@ -156,7 +156,8 @@ ACE_Naming_Context::ACE_Naming_Context (void)
 ACE_Naming_Context::ACE_Naming_Context (Context_Scope_Type scope_in,
                                         int lite)
   : name_options_ (0),
-    name_space_ (0)
+    name_space_ (0),
+    netnameserver_host_ (0)
 {
   ACE_TRACE ("ACE_Naming_Context::ACE_Naming_Context");
 
@@ -434,7 +435,7 @@ ACE_Name_Options::ACE_Name_Options (void)
   this->namespace_dir_ = ACE_OS::strdup (ACE_DEFAULT_NAMESPACE_DIR);
 #else /* ACE_DEFAULT_NAMESPACE_DIR */
   size_t pathsize = (MAXPATHLEN + 1) * sizeof (ACE_TCHAR);
-  this->namespace_dir_ = ACE_static_cast (ACE_TCHAR *, ACE_OS::malloc (pathsize));
+  this->namespace_dir_ = static_cast <ACE_TCHAR *> (ACE_OS::malloc (pathsize));
 
   if (ACE::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1)
     {
@@ -599,8 +600,15 @@ void
 ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_Name_Options::parse_args");
-  ACE_LOG_MSG->open (argv[0]);
-  this->process_name (argv[0]);
+
+  const ACE_TCHAR* program_name = 0;
+
+  // Argc can be 0 on some platforms like VxWorks.
+  if (argc > 0)
+    program_name = argv[0];
+
+  ACE_LOG_MSG->open (program_name);
+  this->process_name (program_name);
 
   // Default is to use the PROC_LOCAL context...
   this->context (ACE_Naming_Context::PROC_LOCAL);
@@ -648,7 +656,7 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[])
         break;
       case 'b':
         this->base_address
-          (ACE_static_cast (char *, ACE_OS::atop (get_opt.opt_arg ())));
+          (static_cast<char *> (ACE_OS::atop (get_opt.opt_arg ())));
         break;
       case 'T':
 #if defined (ACE_HAS_TRACE)
diff --git a/ace/Node.cpp b/ace/Node.cpp
index f13b18cde86..91e989d739b 100644
--- a/ace/Node.cpp
+++ b/ace/Node.cpp
@@ -23,16 +23,14 @@ ACE_Node<T>::~ACE_Node (void)
 template <class T>
 ACE_Node<T>::ACE_Node (const T &i, ACE_Node<T> *n)
   : next_ (n),
-    item_ (i),
-    deleted_ (false)
+    item_ (i)
 {
   // ACE_TRACE ("ACE_Node<T>::ACE_Node");
 }
 
 template <class T>
 ACE_Node<T>::ACE_Node (ACE_Node<T> *n, int)
-  : next_ (n),
-    deleted_ (false)
+  : next_ (n)
 {
   // ACE_TRACE ("ACE_Node<T>::ACE_Node");
 }
@@ -40,8 +38,7 @@ ACE_Node<T>::ACE_Node (ACE_Node<T> *n, int)
 template <class T>
 ACE_Node<T>::ACE_Node (const ACE_Node<T> &s)
   : next_ (s.next_),
-    item_ (s.item_),
-    deleted_ (false)
+    item_ (s.item_)
 {
   // ACE_TRACE ("ACE_Node<T>::ACE_Node");
 }
diff --git a/ace/Node.h b/ace/Node.h
index 4abe6e9b69f..607d0b6f137 100644
--- a/ace/Node.h
+++ b/ace/Node.h
@@ -25,9 +25,6 @@
 template <class T> class ACE_Unbounded_Set;
 template <class T> class ACE_Unbounded_Set_Iterator;
 template <class T> class ACE_Unbounded_Set_Const_Iterator;
-template <class T> class ACE_Unbounded_Set_Ex;
-template <class T> class ACE_Unbounded_Set_Ex_Iterator;
-template <class T> class ACE_Unbounded_Set_Ex_Const_Iterator;
 template <class T> class ACE_Unbounded_Queue;
 template <class T> class ACE_Unbounded_Queue_Iterator;
 template <class T> class ACE_Unbounded_Queue_Const_Iterator;
@@ -49,9 +46,6 @@ public:
   friend class ACE_Unbounded_Set<T>;
   friend class ACE_Unbounded_Set_Iterator<T>;
   friend class ACE_Unbounded_Set_Const_Iterator<T>;
-  friend class ACE_Unbounded_Set_Ex<T>;
-  friend class ACE_Unbounded_Set_Ex_Iterator<T>;
-  friend class ACE_Unbounded_Set_Ex_Const_Iterator<T>;
   friend class ACE_Unbounded_Stack<T>;
   friend class ACE_Unbounded_Stack_Iterator<T>;
 
@@ -71,9 +65,6 @@ private:
 
   /// Current value of the item in this node.
   T item_;
-
-  /// Flag that indicates whether this node is deleted.
-  int deleted_;
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ace/OS.h b/ace/OS.h
index 14f86e2a4ae..98054918dab 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -264,7 +264,6 @@ class ACE_Timeout_Manager;
 #   elif defined(__rtems__)
 #     include "ace/os_include/os_fcntl.h"  // <sys/file.h>
 #     include "ace/os_include/sys/os_resource.h"
-#     include "ace/os_include/sys/os_fcntl.h"
 #     include "ace/os_include/sys/os_time.h"
 #     include "ace/os_include/sys/os_utsname.h"
 #     include "ace/os_include/sys/os_wait.h"
@@ -305,7 +304,7 @@ class ACE_Timeout_Manager;
 
 #     include "ace/os_include/os_limits.h"  // <sys/param.h>
 
-#   if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) && !defined (VXWORKS)
+#   if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 #     include "ace/os_include/sys/os_un.h"
 #   endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 
diff --git a/ace/OS.inl b/ace/OS.inl
index bd725c941e5..8dcb9c39105 100644
--- a/ace/OS.inl
+++ b/ace/OS.inl
@@ -52,7 +52,7 @@ using std::strftime;
 #     endif /* ACE_PSOS_DIAB_MIPS */
 #   else
 #     include /**/ <memory.h>
-#   endif /* VXWORKS */
+#   endif /* ACE_LACKS_MEMORY_H */
 # endif /* ACE_HAS_GNU_CSTRING_H */
 
 // The following are #defines and #includes that must be visible for
diff --git a/ace/OS_Errno.cpp b/ace/OS_Errno.cpp
index 59c6790b529..7e1d6f93cc0 100644
--- a/ace/OS_Errno.cpp
+++ b/ace/OS_Errno.cpp
@@ -5,7 +5,14 @@
 
 ACE_RCSID(ace, OS_Errno, "$Id$")
 
-#if !defined (ACE_HAS_INLINED_OSCALLS)
+// Inlining this class on debug builds with gcc on Solaris can cause
+// deadlocks during static initialization.
+#if !defined (ACE_HAS_INLINED_OSCALLS) || \
+    (defined (__GNUG__) && defined (__sun__) && !defined (ACE_NDEBUG))
+# if defined (ACE_INLINE)
+#  undef ACE_INLINE
+# endif /* ACE_INLINE */
+# define ACE_INLINE
 # include "ace/OS_Errno.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
diff --git a/ace/OS_Errno.h b/ace/OS_Errno.h
index 7318147ae37..82446047842 100644
--- a/ace/OS_Errno.h
+++ b/ace/OS_Errno.h
@@ -71,13 +71,20 @@ public:
   bool operator!= (int error);
 
 private:
+  // Prevent copying
+  ACE_Errno_Guard (const ACE_Errno_Guard &);
+  ACE_Errno_Guard &operator= (const ACE_Errno_Guard &);
+
 #if defined (ACE_MT_SAFE)
   ACE_ERRNO_TYPE *errno_ptr_;
 #endif /* ACE_MT_SAFE */
   int error_;
 };
 
-#if defined (ACE_HAS_INLINED_OSCALLS)
+// Inlining this class on debug builds with gcc on Solaris can cause
+// deadlocks during static initialization.
+#if defined (ACE_HAS_INLINED_OSCALLS) && \
+    (!defined (__GNUG__) || !defined (__sun__) || defined (ACE_NDEBUG))
 # if defined (ACE_INLINE)
 #  undef ACE_INLINE
 # endif /* ACE_INLINE */
diff --git a/ace/OS_Log_Msg_Attributes.h b/ace/OS_Log_Msg_Attributes.h
index 132ebba91ba..f86011147ea 100644
--- a/ace/OS_Log_Msg_Attributes.h
+++ b/ace/OS_Log_Msg_Attributes.h
@@ -64,6 +64,11 @@ protected:
   ACE_SEH_EXCEPT_HANDLER seh_except_selector_;
   ACE_SEH_EXCEPT_HANDLER seh_except_handler_;
 #   endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
+
+private:
+  // Prevent copying
+  ACE_OS_Log_Msg_Attributes (const ACE_OS_Log_Msg_Attributes &);
+  ACE_OS_Log_Msg_Attributes &operator= (const ACE_OS_Log_Msg_Attributes &);
 };
 
 # if defined (ACE_HAS_INLINED_OSCALLS)
diff --git a/ace/OS_Memory.cpp b/ace/OS_Memory.cpp
index 5847657bb46..8a30926a8bd 100644
--- a/ace/OS_Memory.cpp
+++ b/ace/OS_Memory.cpp
@@ -6,10 +6,6 @@ ACE_RCSID(ace, OS_Memory, "$Id$")
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_Memory.inl"
-#else /* !ACE_HAS_INLINED_OSCALLS */
-#if defined (__hpux) && !defined (__GNUG__)
-static int shut_up_aCC = 0;
-#endif /* HPUX && !g++ */
 #endif /* !ACE_HAS_INLINED_OS_CALLS */
 
 #include "ace/os_include/os_stdlib.h"
diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h
index 11f1371e521..89616c74d81 100644
--- a/ace/OS_Memory.h
+++ b/ace/OS_Memory.h
@@ -69,6 +69,13 @@ typedef void *ACE_MALLOC_T;
 // being used).
 // ============================================================================
 
+// If new(std::nothrow) is defined then, by definition, new throws exceptions.
+#if defined (ACE_HAS_NEW_NOTHROW)
+#  if !defined (ACE_NEW_THROWS_EXCEPTIONS)
+#    define ACE_NEW_THROWS_EXCEPTIONS
+#  endif
+#endif
+
 #if defined (ACE_NEW_THROWS_EXCEPTIONS)
 
 // Since new() throws exceptions, we need a way to avoid passing
@@ -121,7 +128,7 @@ typedef void *ACE_MALLOC_T;
 #        define ACE_bad_alloc std::bad_alloc
 #        define ACE_throw_bad_alloc throw ACE_bad_alloc ()
 #      endif /* __SUNPRO_CC < 0x500 */
-#  elif defined (__BORLANDC__) || defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+#  elif defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
 #    include /**/ <new>
 #    define ACE_bad_alloc std::bad_alloc
 #    define ACE_nothrow   std::nothrow
diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp
index 2286002754e..5f5cfd52fd0 100644
--- a/ace/OS_NS_Thread.cpp
+++ b/ace/OS_NS_Thread.cpp
@@ -18,6 +18,7 @@ ACE_RCSID (ace,
 #include "ace/OS_NS_ctype.h"
 #include "ace/Log_Msg.h" // for ACE_ASSERT
 // This is necessary to work around nasty problems with MVS C++.
+#include "ace/Auto_Ptr.h"
 
 extern "C" void
 ace_mutex_lock_cleanup_adapter (void *args)
@@ -138,8 +139,7 @@ ACE_Thread_ID::to_string (char *thr_string)
   ACE_OS::strcpy (fp, "u");
   ACE_OS::sprintf (thr_string,
                    format,
-                   ACE_static_cast (unsigned,
-                                    thread_id_));
+                   static_cast <unsigned> (thread_id_));
 #elif defined (ACE_AIX_VERS) && (ACE_AIX_VERS <= 402)
                   // AIX's pthread_t (ACE_hthread_t) is a pointer, and it's
                   // a little ugly to send that through a %u format.  So,
@@ -258,9 +258,10 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
       if (key_created_ == 0)
         {
           ACE_NO_HEAP_CHECK;
-          if (ACE_OS::thr_keycreate (&native_tss_key_,
+          if (ACE_OS::thr_keycreate_native (&native_tss_key_,
                                      &ACE_TSS_Emulation_cleanup) != 0)
             {
+              ACE_ASSERT (0);
               return 0; // Major problems, this should *never* happen!
             }
           key_created_ = 1;
@@ -270,9 +271,12 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
   void **old_ts_storage = 0;
 
   // Get the tss_storage from thread-OS specific storage.
-  if (ACE_OS::thr_getspecific (native_tss_key_,
+  if (ACE_OS::thr_getspecific_native (native_tss_key_,
                                (void **) &old_ts_storage) == -1)
-    return 0; // This should not happen!
+    {
+      ACE_ASSERT (false);
+      return 0; // This should not happen!
+    }
 
   // Check to see if this is the first time in for this thread.
   // This block can also be entered after a fork () in the child process,
@@ -309,9 +313,12 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
        // Store the pointer in thread-specific storage.  It gets
        // deleted via the ACE_TSS_Emulation_cleanup function when the
        // thread terminates.
-       if (ACE_OS::thr_setspecific (native_tss_key_,
+       if (ACE_OS::thr_setspecific_native (native_tss_key_,
                                     (void *) ts_storage) != 0)
-          return 0; // Major problems, this should *never* happen!
+          {
+            ACE_ASSERT (false);
+            return 0; // This should not happen!
+          }
     }
   else
     if (ts_created)
@@ -325,8 +332,8 @@ u_int
 ACE_TSS_Emulation::total_keys ()
 {
   ACE_OS_Recursive_Thread_Mutex_Guard (
-    *ACE_static_cast (ACE_recursive_thread_mutex_t *,
-                      ACE_OS_Object_Manager::preallocated_object[
+    *static_cast <ACE_recursive_thread_mutex_t *>
+                      (ACE_OS_Object_Manager::preallocated_object[
                         ACE_OS_Object_Manager::ACE_TSS_KEY_LOCK]));
 
   return total_keys_;
@@ -336,8 +343,8 @@ int
 ACE_TSS_Emulation::next_key (ACE_thread_key_t &key)
 {
   ACE_OS_Recursive_Thread_Mutex_Guard (
-    *ACE_static_cast (ACE_recursive_thread_mutex_t *,
-                      ACE_OS_Object_Manager::preallocated_object[
+    *static_cast <ACE_recursive_thread_mutex_t *>
+                      (ACE_OS_Object_Manager::preallocated_object[
                         ACE_OS_Object_Manager::ACE_TSS_KEY_LOCK]));
 
   // Initialize the tss_keys_used_ pointer on first use.
@@ -383,8 +390,8 @@ int
 ACE_TSS_Emulation::release_key (ACE_thread_key_t key)
 {
   ACE_OS_Recursive_Thread_Mutex_Guard (
-    *ACE_static_cast (ACE_recursive_thread_mutex_t *,
-                      ACE_OS_Object_Manager::preallocated_object[
+    *static_cast <ACE_recursive_thread_mutex_t *>
+                      (ACE_OS_Object_Manager::preallocated_object[
                         ACE_OS_Object_Manager::ACE_TSS_KEY_LOCK]));
 
   if (tss_keys_used_ != 0 &&
@@ -396,6 +403,22 @@ ACE_TSS_Emulation::release_key (ACE_thread_key_t key)
   return 1;
 }
 
+int
+ACE_TSS_Emulation::is_key (ACE_thread_key_t key)
+{
+  ACE_OS_Recursive_Thread_Mutex_Guard (
+    *static_cast <ACE_recursive_thread_mutex_t *>
+                      (ACE_OS_Object_Manager::preallocated_object[
+                        ACE_OS_Object_Manager::ACE_TSS_KEY_LOCK]));
+
+  if (tss_keys_used_ != 0 &&
+      tss_keys_used_->is_set (key) == 1)
+  {
+    return 1;
+  }
+  return 0;
+}
+
 void *
 ACE_TSS_Emulation::tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX])
 {
@@ -451,9 +474,9 @@ ACE_TSS_Emulation::tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX])
 void
 ACE_TSS_Emulation::tss_close ()
 {
-#  if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
-  // Free native_tss_key_ here.
-#  endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
+#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+  ACE_OS::thr_keyfree_native (native_tss_key_);
+#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 }
 
 #endif /* ACE_HAS_TSS_EMULATION */
@@ -613,7 +636,7 @@ ACE_TSS_Keys::test_and_clear (const ACE_thread_key_t key)
   u_int word, bit;
   find (key_index, word, bit);
 
-  if (ACE_BIT_ENABLED (key_bit_words_[word], 1 << bit))
+  if (word < ACE_WORDS && ACE_BIT_ENABLED (key_bit_words_[word], 1 << bit))
     {
       ACE_CLR_BITS (key_bit_words_[word], 1 << bit);
       return 0;
@@ -631,38 +654,14 @@ ACE_TSS_Keys::is_set (const ACE_thread_key_t key) const
   u_int word, bit;
   find (key_index, word, bit);
 
-  return ACE_BIT_ENABLED (key_bit_words_[word], 1 << bit);
+  return word < ACE_WORDS ? ACE_BIT_ENABLED (key_bit_words_[word], 1 << bit) : 0;
 }
 
 /*****************************************************************************/
 
 /**
  * @class ACE_TSS_Cleanup
- *
  * @brief Singleton that helps to manage the lifetime of TSS objects and keys.
- *
- ***********************************************************************
- * Behavior of TSS_Cleanup was changed to eliminate leaks:
- *                           +------OLD------------+--------NEW---------
- *   Action                  | exit|    detach     |   exit  : detach : remove
- * --------------------------      | Always: Last  |         :        : (if...)
- * --key_info->thread_count_    X  |  X    :       |   X     :        :
- * destructor(tss_obj)          X  | [4]   :       |   X     :        :
- * tss_keys ()->test_and_clear  X  | X[2]  :  X[2] |   X     :        :
- * key_info->inst = 0              | X[2]  :  X[1] |         :  X     :
- *                                 |               | remove  : remove :
- * key_info->in_use (0)            |       :  X[1] |         :        : X
- * key_info->key_ = NULL [6]       |       :  X[1] |         :        :
- * key_info->destructor=0          |       :  X[1] |         :        : X
- * release tss key             [4] |       :  X    |         :        : X
- * clear key in_use_               |       : [5]   |         :        : X
- *----------------------------------------------------------------------
- * [1] delegated to remove
- * [2] done twice;
- * [3] this is a bug.  It should not be done here
- * [4] Resource leak--should be done, but it's not.
- * [5] Should be done here, but it's not.
- * [6] Unnecessary and problematic.
  */
 class ACE_TSS_Cleanup
 {
@@ -670,21 +669,28 @@ public:
   static ACE_TSS_Cleanup *instance (void);
 
   ~ACE_TSS_Cleanup (void);
-
-  /// Cleanup the thread-specific objects.  Does _NOT_ exit the thread.
-  void exit (void *status);
-
-  /// Insert a <key, destructor> tuple into the table.
+  /// Register a newly-allocated key
+  /// @param key the key to be monitored
+  /// @param destructor the function to call to delete objects stored via this key
+  /// @param inst an opaque value used to reserve this key.  If inst is zero then
+  ///  the key is freed when the thread-use count goes to zero.
   int insert (ACE_thread_key_t key, void (*destructor)(void *), void *inst);
 
-  /// Remove a <key, destructor> tuple from the table.
-  int remove (ACE_thread_key_t key);
+  /// Mark a key as being used by this thread.
+  void thread_use_key (ACE_thread_key_t key);
 
-  /// Detaches a tss_instance from its key.
-  int detach (ACE_thread_key_t key, void * inst);
+  /// This thread is no longer using this key
+  ///   Deletes the TSS object associated with this thread/key.
+  ///   Clears reservation if inst != 0.
+  ///   Release key if use count == 0 and reservation is cleared.
+  /// @param key the key to be released
+  /// @param inst a opaque value.  If it is non-zero, it must match the inst value
+  /// given to insert and the key will no longer be reserved.
+  int thread_free_key (ACE_thread_key_t key, void * inst);
 
-  /// Mark a key as being used by this thread.
-  void key_used (ACE_thread_key_t key);
+  /// Cleanup the thread-specific objects.  Does _NOT_ exit the thread.
+  /// For each used key perform the same actions as thread_free_key.
+  void thread_exit (void);
 
   /// Indication of whether the ACE_TSS_CLEANUP_LOCK is usable, and
   /// therefore whether we are in static constructor/destructor phase
@@ -694,11 +700,24 @@ public:
     return instance_ != 0;
   }
 
-protected:
+private:
   void dump (void);
 
-  ///  Implementation remove key if it's unused
-  int remove_key (ACE_thread_key_t key);
+  /// Perform the actual free actions for thread_free_key and thread_exit.
+  int free_key (ACE_thread_key_t key);
+
+  /// remove key if it's unused (thread_count == 0 and inst == 0)
+  /// @param info reference to the info for this key
+  void remove_key (ACE_TSS_Info &info);
+
+  /// Release a key used by this thread
+  /// @param info reference to the info for this key
+  /// @param destructor out arg to receive destructor function ptr
+  /// @param tss_obj out arg to receive pointer to deletable object
+  void thread_release (
+          ACE_TSS_Info &info,
+          ACE_TSS_Info::Destructor & destructor,
+          void *& tss_obj);
 
   /// Find the TSS keys (if any) for this thread.
   /// @param thread_keys reference to pointer to be filled in by this function.
@@ -743,49 +762,83 @@ ACE_TSS_Cleanup::~ACE_TSS_Cleanup (void)
 }
 
 void
-ACE_TSS_Cleanup::exit (void * /* status */)
+ACE_TSS_Cleanup::thread_exit (void)
 {
-  ACE_OS_TRACE ("ACE_TSS_Cleanup::exit");
+  ACE_OS_TRACE ("ACE_TSS_Cleanup::thread_exit");
+  // variables to hold the destructors
+  // and pointers to the object to be destructed
+  // the actual destruction is deferred until the guard is released
+  ACE_TSS_Info::Destructor destructor[ACE_DEFAULT_THREAD_KEYS];
+  void * tss_obj[ACE_DEFAULT_THREAD_KEYS];
+  // count of items to be destroyed
+  unsigned int d_count = 0;
 
-  // if not initialized or already cleaned up
-  ACE_TSS_Keys *this_thread_keys = 0;
-  if (! find_tss_keys (this_thread_keys) )
-    {
-      return;
-    }
+  // scope the guard
+  {
+    ACE_TSS_CLEANUP_GUARD
+
+    // if not initialized or already cleaned up
+    ACE_TSS_Keys *this_thread_keys = 0;
+    if (! find_tss_keys (this_thread_keys) )
+      {
+        return;
+      }
 
-  // note: tss_keys is thread specific
-  // and the key_ value of a table_ entry won't change while
-  // thread_count_ shows this thread using the entry, so no lock is
-  // necessary here
-  // Minor hack: Iterating in reverse order means the LOG buffer which is
-  // accidentally allocated first will be accidentally deallocated (almost)
-  // last -- in case someone logs something from the other destructors.
-  unsigned int key = ACE_DEFAULT_THREAD_KEYS;
-  while( key > 0)
+    // Minor hack: Iterating in reverse order means the LOG buffer which is
+    // accidentally allocated first will be accidentally deallocated (almost)
+    // last -- in case someone logs something from the other destructors.
+    // applications should not count on this behavior because platforms which
+    // do not use ACE_TSS_Cleanup may delete objects in other orders.
+    unsigned int key_index = ACE_DEFAULT_THREAD_KEYS;
+    while( key_index > 0)
+      {
+        --key_index;
+        ACE_TSS_Info & info = this->table_[key_index];
+        // if this key is in use by this thread
+        if (info.key_in_use () && this_thread_keys->is_set(info.key_))
+          {
+            // defer deleting the in-use key until all others have been deleted
+            if(info.key_ != this->in_use_)
+              {
+                destructor[d_count] = 0;
+                tss_obj[d_count] = 0;
+                this->thread_release (info, destructor[d_count], tss_obj[d_count]);
+                if (destructor[d_count] != 0 && tss_obj[d_count] != 0)
+                  {
+                    ++d_count;
+                  }
+                this->remove_key (info);
+              }
+          }
+      }
+
+    // remove the in_use bit vector last
+    ACE_KEY_INDEX (use_index, this->in_use_);
+    ACE_TSS_Info & info = this->table_[use_index];
+    destructor[d_count] = 0;
+    tss_obj[d_count] = 0;
+    this->thread_release (info, destructor[d_count], tss_obj[d_count]);
+    if (destructor[d_count] != 0 &&  tss_obj[d_count] != 0)
+      {
+        ++d_count;
+      }
+    this->remove_key (info);
+  } // end of guard scope
+  // WARNING:
+  // Once the guard is released this ACE_TSS_Cleanup may be deleted -- especially
+  // because we are about to delete a Thread_Exit object.
+  // Do not attempt to use any data members for the rest of this method.
+
+  for (unsigned int d_index = 0; d_index < d_count; ++d_index)
     {
-      --key;
-      ACE_TSS_Info & info = this->table_[key];
-      // if this key is in use by this thread
-      if (this_thread_keys->is_set(info.key_))
-        {
-          // defer deleting the in-use key until all others have been deleted
-          if(info.key_ != this->in_use_)
-            {
-              detach (info.key_, 0);
-              // Warning: we may have just detached the log buffer.  This thread
-              // can no longer log anything.
-            }
-        }
+      (*destructor[d_index])(tss_obj[d_index]);
     }
-  // delete the in_use_ bit buffer last (and very carefully!)
-  detach (this->in_use_, 0);
 }
 
 extern "C" void
 ACE_TSS_Cleanup_keys_destroyer (void *tss_keys)
 {
-  delete ACE_reinterpret_cast (ACE_TSS_Keys *, tss_keys);
+  delete reinterpret_cast <ACE_TSS_Keys *> (tss_keys);
 }
 
 ACE_TSS_Cleanup::ACE_TSS_Cleanup (void)
@@ -825,9 +878,13 @@ ACE_TSS_Cleanup::insert (ACE_thread_key_t key,
   ACE_TSS_CLEANUP_GUARD
 
   ACE_KEY_INDEX (key_index, key);
+  ACE_ASSERT (key_index < ACE_DEFAULT_THREAD_KEYS);
   if (key_index < ACE_DEFAULT_THREAD_KEYS)
     {
+      ACE_ASSERT (table_[key_index].thread_count_ == -1);
       table_[key_index] = ACE_TSS_Info (key, destructor, inst);
+      table_[key_index].thread_count_ = 0; // inserting it does not use it
+                                           // but it does "allocate" it
       return 0;
     }
   else
@@ -837,50 +894,43 @@ ACE_TSS_Cleanup::insert (ACE_thread_key_t key,
 }
 
 int
-ACE_TSS_Cleanup::remove (ACE_thread_key_t key)
+ACE_TSS_Cleanup::free_key (ACE_thread_key_t key)
 {
-  ACE_OS_TRACE ("ACE_TSS_Cleanup::remove");
+  ACE_OS_TRACE ("ACE_TSS_Cleanup::free_key");
   ACE_TSS_CLEANUP_GUARD
-  return remove_key (key);
-}
+  ACE_KEY_INDEX (key_index, key);
+  if (key_index < ACE_DEFAULT_THREAD_KEYS)
+    {
+      remove_key (this->table_ [key_index]);
+      return 0;
+    }
+  return -1;}
 
-int
-ACE_TSS_Cleanup::remove_key (ACE_thread_key_t key)
+void
+ACE_TSS_Cleanup::remove_key (ACE_TSS_Info &info)
 {
   // assume CLEANUP_GUARD is held by caller
   ACE_OS_TRACE ("ACE_TSS_Cleanup::remove_key");
 
-  ACE_KEY_INDEX (key_index, key);
-  if (key_index < ACE_DEFAULT_THREAD_KEYS)
+  // only remove it if all threads are done with it
+  // and there is no ACE_TSS holding on to it.
+  if (info.thread_count_ == 0 && info.tss_inst_ == 0)
     {
-      // find the TSS_Info table entry.
-      // only remove it if all threads are done with it
-      // and there is no ACE_TSS holding on to it.
-      ACE_TSS_Info &info = this->table_ [key_index];
-      if (info.thread_count_ == 0 && info.tss_inst_ == 0)
+#if !defined (ACE_HAS_TSS_EMULATION)
+      ACE_OS_thread_key_t temp_key = info.key_;
+      ACE_OS::thr_keyfree_native (temp_key);
+#endif /* !ACE_HAS_TSS_EMULATION */
+      if (info.key_ == this->in_use_)
         {
-# if defined (ACE_WIN32)
-          ACE_thread_key_t temp_key = info.key_;
-          ::TlsFree (temp_key);
-# elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
-          ACE_thread_key_t temp_key = info.key_;
-          ::tsd_delete (temp_key);
-# endif /* ACE_WIN32 */
-          if (info.key_ == this->in_use_)
-            {
-              this->in_use_ = ACE_OS::NULL_key;
-            }
-          info.key_in_use (0);
-          info.destructor_ = 0;
+          this->in_use_ = ACE_OS::NULL_key;
         }
-      return 0;
+      info.key_in_use (0);
+      info.destructor_ = 0;
     }
-  else
-    return -1;
 }
 
 int
-ACE_TSS_Cleanup::detach (ACE_thread_key_t key, void *inst)
+ACE_TSS_Cleanup::thread_free_key (ACE_thread_key_t key, void *inst)
 {
   // variables to hold the destructor and the object to be destructed
   // the actual call is deferred until the guard is released
@@ -909,31 +959,11 @@ ACE_TSS_Cleanup::detach (ACE_thread_key_t key, void *inst)
         ACE_ASSERT (info.tss_inst_ == inst);
         info.tss_inst_ = 0;
       }
-    // Find the TSS keys (if any) for this thread
-    // do not create them if they don't exist
-    ACE_TSS_Keys * thread_keys = 0;
-    if (find_tss_keys (thread_keys))
-      {
-          // if this key is in use by this thread
-        if (thread_keys->test_and_clear(info.key_) == 0)
-        {
-          // save destructor & pointer to tss object
-          // until after the guard is released
-          destructor = info.destructor_;
-          ACE_OS::thr_getspecific (info.key_, &tss_obj);
-          ACE_ASSERT (info.thread_count_ > 0);
-          --info.thread_count_;
-#ifdef ACE_DEBUGGING_TSS_CLEANUP
-          ACE_DEBUG ((LM_DEBUG,
-            ACE_TEXT ("(%P|%t) ACE_TSS_Cleanup::detach[%d] decrement %d\n"),
-            key,info.thread_count_));
-#endif //ACE_DEBUGGING_TSS_CLEANUP
-        }
-      }
+    this->thread_release (info, destructor, tss_obj);
 
     // try to remove this key
-    this->remove_key (info.key_);
- 
+    this->remove_key (info);
+
   } // end of scope for the Guard
   // if there's a destructor and an object to be destroyed
   if (destructor != 0 && tss_obj != 0)
@@ -944,7 +974,32 @@ ACE_TSS_Cleanup::detach (ACE_thread_key_t key, void *inst)
 }
 
 void
-ACE_TSS_Cleanup::key_used (ACE_thread_key_t key)
+ACE_TSS_Cleanup::thread_release (
+        ACE_TSS_Info &info,
+        ACE_TSS_Info::Destructor & destructor,
+        void *& tss_obj)
+{
+  // assume guard is held by caller
+  // Find the TSS keys (if any) for this thread
+  // do not create them if they don't exist
+  ACE_TSS_Keys * thread_keys = 0;
+  if (find_tss_keys (thread_keys))
+    {
+        // if this key is in use by this thread
+      if (thread_keys->test_and_clear(info.key_) == 0)
+      {
+        // save destructor & pointer to tss object
+        // until after the guard is released
+        destructor = info.destructor_;
+        ACE_OS::thr_getspecific (info.key_, &tss_obj);
+        ACE_ASSERT (info.thread_count_ > 0);
+        --info.thread_count_;
+      }
+    }
+}
+
+void
+ACE_TSS_Cleanup::thread_use_key (ACE_thread_key_t key)
 {
   // If the key's ACE_TSS_Info in-use bit for this thread is not set,
   // set it and increment the key's thread_count_.
@@ -955,10 +1010,9 @@ ACE_TSS_Cleanup::key_used (ACE_thread_key_t key)
       // Retrieve the key's ACE_TSS_Info and increment its thread_count_.
       ACE_KEY_INDEX (key_index, key);
       ACE_TSS_Info &key_info = this->table_ [key_index];
-      if (!key_info.key_in_use ())
-        key_info.key_in_use (1);
-      else
-        ++key_info.thread_count_;
+
+      ACE_ASSERT (key_info.key_in_use ());
+      ++key_info.thread_count_;
     }
 }
 
@@ -1011,7 +1065,7 @@ ACE_TSS_Cleanup::tss_keys ()
 
   ACE_TSS_Keys *ts_keys = 0;
   if (ACE_OS::thr_getspecific (in_use_,
-        ACE_reinterpret_cast (void **, &ts_keys)) == -1)
+                               reinterpret_cast <void **> (&ts_keys)) == -1)
     {
       ACE_ASSERT (false);
       return 0; // This should not happen!
@@ -1025,8 +1079,7 @@ ACE_TSS_Cleanup::tss_keys ()
       // Store the dynamically allocated pointer in thread-specific
       // storage.
       if (ACE_OS::thr_setspecific (in_use_,
-            ACE_reinterpret_cast (void *,
-                                  ts_keys)) == -1)
+                                   reinterpret_cast <void *> (ts_keys)) == -1)
         {
           ACE_ASSERT (false);
           delete ts_keys;
@@ -1052,7 +1105,7 @@ ACE_TSS_Cleanup::tss_keys ()
 ACE_thread_t ACE_OS::NULL_thread;
 ACE_hthread_t ACE_OS::NULL_hthread;
 #if defined (ACE_HAS_TSS_EMULATION) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
-  ACE_thread_key_t ACE_OS::NULL_key = ACE_static_cast (ACE_thread_key_t, -1);
+  ACE_thread_key_t ACE_OS::NULL_key = static_cast <ACE_thread_key_t> (-1);
 #else  /* ! ACE_HAS_TSS_EMULATION */
   ACE_thread_key_t ACE_OS::NULL_key;
 #endif /* ! ACE_HAS_TSS_EMULATION */
@@ -1071,7 +1124,7 @@ ACE_OS::cleanup_tss (const u_int main_thread)
 #if defined (ACE_HAS_TSS_EMULATION) || defined (ACE_WIN32) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
   // Call TSS destructors for current thread.
   if (ACE_TSS_Cleanup::lockable ())
-    ACE_TSS_Cleanup::instance ()->exit (0);
+    ACE_TSS_Cleanup::instance ()->thread_exit ();
 #endif /* ACE_HAS_TSS_EMULATION || ACE_WIN32 || ACE_PSOS_HAS_TSS */
 
   if (main_thread)
@@ -1917,7 +1970,8 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
                      int, -1);
 #elif defined (ACE_HAS_STHREADS)
   return ACE_OS::set_scheduling_params (sched_params, id);
-#elif defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_SETSCHED)
+#elif defined (ACE_HAS_PTHREADS) && \
+      (!defined (ACE_LACKS_SETSCHED) || defined (ACE_TANDEM_T1248_PTHREADS))
   ACE_UNUSED_ARG (id);
   if (sched_params.quantum () != ACE_Time_Value::zero)
     {
@@ -1936,6 +1990,9 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
 
   if (sched_params.scope () == ACE_SCOPE_PROCESS)
     {
+# if defined(ACE_TANDEM_T1248_PTHREADS)
+      ACE_NOTSUP_RETURN (-1);
+# else  /* ! ACE_TANDEM_T1248_PTHREADS */
       int result = ::sched_setscheduler (0, // this process
                                          sched_params.policy (),
                                          &param) == -1 ? -1 : 0;
@@ -1948,6 +2005,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
 # else  /* ! DIGITAL_UNIX */
       return result;
 # endif /* ! DIGITAL_UNIX */
+# endif /* ! ACE_TANDEM_T1248_PTHREADS */
     }
   else if (sched_params.scope () == ACE_SCOPE_THREAD)
     {
@@ -2199,7 +2257,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 
   ACE_Base_Thread_Adapter *thread_args;
   if (thread_adapter == 0)
-
 #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
     ACE_NEW_RETURN (thread_args,
                     ACE_OS_Thread_Adapter (func, args,
@@ -2217,6 +2274,13 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
   else
     thread_args = thread_adapter;
 
+  auto_ptr <ACE_Base_Thread_Adapter> auto_thread_args;
+
+  if (thread_adapter == 0)
+    ACE_AUTO_PTR_RESET (auto_thread_args,
+                        thread_args,
+                        ACE_Base_Thread_Adapter);
+
 #if defined (ACE_HAS_THREADS)
 
   // *** Set Stack Size
@@ -2270,7 +2334,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       size_t size = stacksize;
 
 #   if defined (PTHREAD_STACK_MIN)
-      if (size < ACE_static_cast (size_t, PTHREAD_STACK_MIN))
+      if (size < static_cast <size_t> (PTHREAD_STACK_MIN))
         size = PTHREAD_STACK_MIN;
 #   endif /* PTHREAD_STACK_MIN */
 
@@ -2378,6 +2442,9 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 #     if defined (ACE_HAS_ONLY_SCHED_OTHER)
           // SunOS, thru version 5.6, only supports SCHED_OTHER.
           spolicy = SCHED_OTHER;
+#     elif defined (ACE_HAS_ONLY_SCHED_FIFO)
+          // NonStop OSS standard pthread supports only SCHED_FIFO.
+          spolicy = SCHED_FIFO;
 #     else
           // Make sure to enable explicit scheduling, in case we didn't
           // enable it above (for non-default priority).
@@ -2729,6 +2796,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 #     endif /* ACE_NEEDS_LWP_PRIO_SET */
 
 #   endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */
+  auto_thread_args.release ();
   return result;
 # elif defined (ACE_HAS_STHREADS)
   int result;
@@ -2771,6 +2839,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
             }
         }
     }
+  auto_thread_args.release ();
   return result;
 # elif defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (stack);
@@ -2800,7 +2869,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
         cwin_thread->ResumeThread ();
       // cwin_thread will be deleted in AfxThreadExit()
       // Warning: If AfxThreadExit() is called from within the
-      // thread, ACE_TSS_Cleanup->exit() never gets called !
+      // thread, ACE_TSS_Cleanup->thread_exit() never gets called !
     }
   else
 #   endif /* ACE_HAS_MFC */
@@ -2813,8 +2882,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
         ACE_SET_BITS (flags, THR_SUSPENDED);
 
       *thr_handle = (void *) ACE_BEGINTHREADEX (0,
-                                                ACE_static_cast
-                                                   (u_int, stacksize),
+                                                static_cast <u_int> (stacksize),
                                                 thread_args->entry_point (),
                                                 thread_args,
                                                 flags,
@@ -2846,7 +2914,10 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
     ::CloseHandle (tmp_handle);
 
   if (*thr_handle != 0)
-    return 0;
+    {
+      auto_thread_args.release ();
+      return 0;
+    }
   else
     ACE_FAIL_RETURN (-1);
   /* NOTREACHED */
@@ -2913,6 +2984,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 
   // store the task id in the handle and return success
   *thr_handle = tid;
+  auto_thread_args.release ();
   return 0;
 
 # elif defined (VXWORKS)
@@ -3010,6 +3082,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       if (thr_handle)
         *thr_handle = tid;
 
+      auto_thread_args.release ();
       return 0;
     }
 
@@ -3039,7 +3112,7 @@ ACE_OS::thr_exit (ACE_THR_FUNC_RETURN status)
 # elif defined (ACE_HAS_WTHREADS)
     // Can't call it here because on NT, the thread is exited
     // directly by ACE_Thread_Adapter::invoke ().
-    //   ACE_TSS_Cleanup::instance ()->exit (status);
+    //   ACE_TSS_Cleanup::instance ()->thread_exit (status);
 
 #   if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0)
     int using_afx = -1;
@@ -3102,7 +3175,7 @@ ACE_OS::thr_exit (ACE_THR_FUNC_RETURN status)
 #endif /* ACE_HAS_THREADS */
 }
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
 // Leave this in the global scope to allow
 // users to adjust the delay value.
 int ACE_THR_JOIN_DELAY = 5;
@@ -3171,9 +3244,9 @@ ACE_OS::thr_join (ACE_thread_t waiter_id,
 int
 ACE_OS::thr_key_detach (ACE_thread_key_t key, void * inst)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
+#if defined (ACE_HAS_WTHREADS) || defined (ACE_HAS_TSS_EMULATION) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
   if (ACE_TSS_Cleanup::lockable ())
-    return ACE_TSS_Cleanup::instance()->detach (key, inst);
+    return ACE_TSS_Cleanup::instance()->thread_free_key (key, inst);
   else
     // We're in static constructor/destructor phase.  Don't
     // try to use the ACE_TSS_Cleanup instance because its lock
@@ -3184,14 +3257,14 @@ ACE_OS::thr_key_detach (ACE_thread_key_t key, void * inst)
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (inst);
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION */
+#endif /* ACE_HAS_WTHREADS || ACE_HAS_TSS_EMULATION */
 }
 
 int
 ACE_OS::thr_key_used (ACE_thread_key_t key)
 {
 #if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) || (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS))
-  ACE_TSS_Cleanup::instance ()->key_used (key);
+  ACE_TSS_Cleanup::instance ()->thread_use_key (key);
   return 0;
 #else
   ACE_UNUSED_ARG (key);
@@ -3199,199 +3272,167 @@ ACE_OS::thr_key_used (ACE_thread_key_t key)
 #endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION || ACE_PSOS_HAS_TSS */
 }
 
-#if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
 int
-ACE_OS::thr_keycreate (ACE_OS_thread_key_t *key,
+ACE_OS::thr_keycreate_native (ACE_OS_thread_key_t *key,
 # if defined (ACE_HAS_THR_C_DEST)
-                       ACE_THR_C_DEST dest,
+                       ACE_THR_C_DEST dest
 # else
-                       ACE_THR_DEST dest,
+                       ACE_THR_DEST dest
 # endif /* ACE_HAS_THR_C_DEST */
-                       void *inst)
+                       )
 {
-  // ACE_OS_TRACE ("ACE_OS::thr_keycreate");
+  // can't trace here. Trace uses TSS
+  // ACE_OS_TRACE ("ACE_OS::thr_keycreate_native");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
-  ACE_UNUSED_ARG (inst);
-
 
 #     if defined (ACE_HAS_PTHREADS_DRAFT4)
 #       if defined (ACE_HAS_STDARG_THR_DEST)
-  ACE_OSCALL_RETURN (::pthread_keycreate (key, (void (*)(...)) dest), int, -1);
+    ACE_OSCALL_RETURN (::pthread_keycreate (key, (void (*)(...)) dest), int, -1);
 #       else  /* ! ACE_HAS_STDARG_THR_DEST */
-  ACE_OSCALL_RETURN (::pthread_keycreate (key, dest), int, -1);
+    ACE_OSCALL_RETURN (::pthread_keycreate (key, dest), int, -1);
 #       endif /* ! ACE_HAS_STDARG_THR_DEST */
 #     elif defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (::pthread_key_create (key, dest), int, -1);
+    ACE_OSCALL_RETURN (::pthread_key_create (key, dest), int, -1);
 #     else
-  int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest),
-                                       result),
-                     int, -1);
+    int result;
+    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest),
+                                         result),
+                       int, -1);
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 */
 #   elif defined (ACE_HAS_STHREADS)
-  ACE_UNUSED_ARG (inst);
-  int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_keycreate (key, dest),
-                                       result),
-                     int, -1);
+    int result;
+    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_keycreate (key, dest),
+                                         result),
+                       int, -1);
+#   elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
+    ACE_UNUSED_ARG (dest);
+
+    static u_long unique_name = 0;
+    void *tsdanchor;
+
+    ++unique_name;
+    if (::tsd_create (reinterpret_cast <char *> (&unique_name),
+                      0,
+                      TSD_NOALLOC,
+                      (void ****) &tsdanchor,
+                      key) != 0)
+      {
+        return -1;
+      }
+      return 0;
 #   elif defined (ACE_HAS_WTHREADS)
-  *key = ::TlsAlloc ();
+    ACE_UNUSED_ARG (dest);
+    *key = ::TlsAlloc ();
 
-  if (*key != ACE_SYSCALL_FAILED)
-    {
-      // Extract out the thread-specific table instance and stash away
-      // the key and destructor so that we can free it up later on...
-      return ACE_TSS_Cleanup::instance ()->insert (*key, dest, inst);
-    }
-  else
-    ACE_FAIL_RETURN (-1);
-  /* NOTREACHED */
+    if (*key == ACE_SYSCALL_FAILED)
+      ACE_FAIL_RETURN (-1);
+    return 0;
 #   endif /* ACE_HAS_STHREADS */
 # else
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (dest);
-  ACE_UNUSED_ARG (inst);
   ACE_NOTSUP_RETURN (-1);
 # endif /* ACE_HAS_THREADS */
 }
-#endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
+#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
 int
 ACE_OS::thr_keycreate (ACE_thread_key_t *key,
-#if defined (ACE_HAS_THR_C_DEST)
+# if defined (ACE_HAS_THR_C_DEST)
                        ACE_THR_C_DEST dest,
-#else
+# else
                        ACE_THR_DEST dest,
-#endif /* ACE_HAS_THR_C_DEST */
+# endif /* ACE_HAS_THR_C_DEST */
                        void *inst)
 {
   // ACE_OS_TRACE ("ACE_OS::thr_keycreate");
 #if defined (ACE_HAS_THREADS)
-# if defined (ACE_HAS_TSS_EMULATION)
+#   if defined (ACE_HAS_TSS_EMULATION)
     if (ACE_TSS_Emulation::next_key (*key) == 0)
       {
-        ACE_TSS_Emulation::tss_destructor (
-                               *key,
-                               (ACE_TSS_Emulation::ACE_TSS_DESTRUCTOR) dest);
+        ACE_TSS_Emulation::tss_destructor (*key, dest);
 
         // Extract out the thread-specific table instance and stash away
         // the key and destructor so that we can free it up later on...
         return ACE_TSS_Cleanup::instance ()->insert (*key, dest, inst);
       }
     else
-      {
-        errno = EAGAIN;
-        return -1;
-      }
-# elif defined (ACE_HAS_PTHREADS)
-    ACE_UNUSED_ARG (inst);
-
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-#     if defined (ACE_HAS_STDARG_THR_DEST)
-    ACE_OSCALL_RETURN (::pthread_keycreate (key, (void (*)(...)) dest), int, -1);
-#     else  /* ! ACE_HAS_STDARG_THR_DEST */
-    ACE_OSCALL_RETURN (::pthread_keycreate (key, dest), int, -1);
-#     endif /* ! ACE_HAS_STDARG_THR_DEST */
-#   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-    ACE_OSCALL_RETURN (::pthread_key_create (key, dest), int, -1);
-#   else
-    int result;
-    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest),
-                                         result),
-                       int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
-
-# elif defined (ACE_HAS_STHREADS)
-    ACE_UNUSED_ARG (inst);
-    int result;
-    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_keycreate (key, dest),
-                                         result),
-                       int, -1);
-# elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
-
-    static u_long unique_name = 0;
-    void *tsdanchor;
-
-    ++unique_name;
-    if (::tsd_create (ACE_reinterpret_cast (char *, &unique_name),
-                      0,
-                      TSD_NOALLOC,
-                      (void ****) &tsdanchor,
-                      key) != 0)
-      {
-        return -1;
-      }
-
-    return ACE_TSS_Cleanup::instance ()->insert (*key, dest, inst);
-# elif defined (ACE_HAS_WTHREADS)
-    *key = ::TlsAlloc ();
-
-    if (*key != ACE_SYSCALL_FAILED)
+      return -1;
+#   elif (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)) || defined (ACE_HAS_WTHREADS)
+    if (ACE_OS::thr_keycreate_native (key, dest) == 0)
       {
         // Extract out the thread-specific table instance and stash away
         // the key and destructor so that we can free it up later on...
         return ACE_TSS_Cleanup::instance ()->insert (*key, dest, inst);
-     }
+      }
     else
-      ACE_FAIL_RETURN (-1);
+      return -1;
       /* NOTREACHED */
-# else
-    ACE_UNUSED_ARG (key);
-    ACE_UNUSED_ARG (dest);
+#   else /* ACE_HAS_TSS_EMULATION */
     ACE_UNUSED_ARG (inst);
-    ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_TSS_EMULATION */
-#else
+    return  ACE_OS::thr_keycreate_native (key, dest);
+#   endif /* ACE_HAS_TSS_EMULATION */
+# else /* ACE_HAS_THREADS */
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (dest);
   ACE_UNUSED_ARG (inst);
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_THREADS */
+# endif /* ACE_HAS_THREADS */
 }
 
+#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
 int
-ACE_OS::thr_keyfree (ACE_thread_key_t key)
+ACE_OS::thr_keyfree_native (ACE_OS_thread_key_t key)
 {
-  ACE_OS_TRACE ("ACE_OS::thr_keyfree");
-#if defined (ACE_HAS_THREADS)
-# if defined (ACE_HAS_TSS_EMULATION)
-    // Release the key in the TSS_Emulation administration
-    ACE_TSS_Emulation::release_key (key);
-    if (ACE_TSS_Cleanup::lockable ())
-      return ACE_TSS_Cleanup::instance ()->remove (key);
-    else
-      return -1;
-# elif defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
+  ACE_OS_TRACE ("ACE_OS::thr_keyfree_native");
+# if defined (ACE_HAS_THREADS)
+#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
     ACE_UNUSED_ARG (key);
     ACE_NOTSUP_RETURN (-1);
-# elif defined (ACE_HAS_PTHREADS)
+#   elif defined (ACE_HAS_PTHREADS)
     return ::pthread_key_delete (key);
-# elif defined (ACE_HAS_THR_KEYDELETE)
+#   elif defined (ACE_HAS_THR_KEYDELETE)
     return ::thr_keydelete (key);
-# elif defined (ACE_HAS_STHREADS)
+#   elif defined (ACE_HAS_STHREADS)
     ACE_UNUSED_ARG (key);
     ACE_NOTSUP_RETURN (-1);
-# elif defined (ACE_HAS_WTHREADS)
-    // Extract out the thread-specific table instance and free up
-    // the key and destructor.
-    if (ACE_TSS_Cleanup::lockable ())
-      return ACE_TSS_Cleanup::instance ()->remove (key);
+#   elif defined (ACE_HAS_WTHREADS)
     ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::TlsFree (key), ace_result_), int, -1);
-# elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
-    // Extract out the thread-specific table instance and free up
-    // the key and destructor.
-    if (ACE_TSS_Cleanup::lockable ())
-      return ACE_TSS_Cleanup::instance ()->remove (key);
+#   elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
     return (::tsd_delete (key) == 0) ? 0 : -1;
-# else
+#   else
     ACE_UNUSED_ARG (key);
     ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_TSS_EMULATION */
-#else
+#   endif /* ACE_HAS_PTHREADS */
+# else
   ACE_UNUSED_ARG (key);
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_THREADS */
+# endif /* ACE_HAS_THREADS */
+}
+#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
+
+int
+ACE_OS::thr_keyfree (ACE_thread_key_t key)
+{
+  ACE_OS_TRACE ("ACE_OS::thr_keyfree");
+# if defined (ACE_HAS_THREADS)
+#   if defined (ACE_HAS_TSS_EMULATION)
+    // Release the key in the TSS_Emulation administration
+    ACE_TSS_Emulation::release_key (key);
+    return ACE_TSS_Cleanup::instance ()->thread_free_key (key, 0);
+#   elif (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)) || defined (ACE_HAS_WTHREADS)
+    // Extract out the thread-specific table instance and free up
+    // the key and destructor.
+    return ACE_TSS_Cleanup::instance ()->thread_free_key (key, 0);
+#   else /* ACE_HAS_TSS_EMULATION */
+    return ACE_OS::thr_keyfree_native (key);
+#   endif /* ACE_HAS_TSS_EMULATION */
+# else /* ACE_HAS_THREADS */
+  ACE_UNUSED_ARG (key);
+  ACE_NOTSUP_RETURN (-1);
+# endif /* ACE_HAS_THREADS */
 }
 
 int
@@ -3433,49 +3474,64 @@ ACE_OS::thr_setprio (const ACE_Sched_Priority prio)
   return status;
 }
 
-#if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
 int
-ACE_OS::thr_setspecific (ACE_OS_thread_key_t key, void *data)
+ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data)
 {
-  // ACE_OS_TRACE ("ACE_OS::thr_setspecific");
-# if defined (ACE_HAS_THREADS)
-#   if defined (ACE_HAS_PTHREADS)
-#     if defined (ACE_HAS_FSU_PTHREADS)
-  // Call pthread_init() here to initialize threads package.  FSU
-  // threads need an initialization before the first thread
-  // constructor.  This seems to be the one; however, a segmentation
-  // fault may indicate that another pthread_init() is necessary,
-  // perhaps in Synch.cpp or Synch_T.cpp.  FSU threads will not reinit
-  // if called more than once, so another call to pthread_init will
-  // not adversely affect existing threads.
-  pthread_init ();
-#     endif /*  ACE_HAS_FSU_PTHREADS */
-  int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setspecific (key, data), result), int, -1);
-#   elif defined (ACE_HAS_STHREADS)
-  int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int, -1);
-#   elif defined (ACE_HAS_WTHREADS)
-    ::TlsSetValue (key, data);
-    return 0;
-#   endif /* ACE_HAS_STHREADS */
-# else
-  ACE_UNUSED_ARG (key);
-  ACE_UNUSED_ARG (data);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_THREADS */
+  // ACE_OS_TRACE ("ACE_OS::thr_setspecific_native");
+#   if defined (ACE_HAS_THREADS)
+#     if defined (ACE_HAS_PTHREADS)
+#       if defined (ACE_HAS_FSU_PTHREADS)
+      // Call pthread_init() here to initialize threads package.  FSU
+      // threads need an initialization before the first thread constructor.
+      // This seems to be the one; however, a segmentation fault may
+      // indicate that another pthread_init() is necessary, perhaps in
+      // Synch.cpp or Synch_T.cpp.  FSU threads will not reinit if called
+      // more than once, so another call to pthread_init will not adversely
+      // affect existing threads.
+      pthread_init ();
+#       endif /*  ACE_HAS_FSU_PTHREADS */
+#      if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
+    ACE_OSCALL_RETURN (::pthread_setspecific (key, data), int, -1);
+#       else
+    int result;
+    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setspecific (key, data),
+                                         result),
+                       int, -1);
+#       endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
+
+#     elif defined (ACE_HAS_STHREADS)
+      int result;
+      ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int, -1);
+#    elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
+      ACE_hthread_t tid;
+      ACE_OS::thr_self (tid);
+      if (::tsd_setval (key, tid, data) != 0)
+        return -1;
+      return 0;
+#     elif defined (ACE_HAS_WTHREADS)
+      ::TlsSetValue (key, data);
+      return 0;
+#     else /* ACE_HAS_STHREADS */
+      ACE_UNUSED_ARG (key);
+      ACE_UNUSED_ARG (data);
+      ACE_NOTSUP_RETURN (-1);
+#     endif /* ACE_HAS_STHREADS */
+#   else
+    ACE_UNUSED_ARG (key);
+    ACE_UNUSED_ARG (data);
+    ACE_NOTSUP_RETURN (-1);
+#   endif /* ACE_HAS_THREADS */
 }
-#endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
+# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
 int
 ACE_OS::thr_setspecific (ACE_thread_key_t key, void *data)
 {
   // ACE_OS_TRACE ("ACE_OS::thr_setspecific");
 #if defined (ACE_HAS_THREADS)
-# if defined (ACE_HAS_TSS_EMULATION)
-    ACE_KEY_INDEX (key_index, key);
-
-    if (key_index >= ACE_TSS_Emulation::total_keys ())
+#   if defined (ACE_HAS_TSS_EMULATION)
+    if (ACE_TSS_Emulation::is_key (key) == 0)
       {
         errno = EINVAL;
         data = 0;
@@ -3484,55 +3540,25 @@ ACE_OS::thr_setspecific (ACE_thread_key_t key, void *data)
     else
       {
         ACE_TSS_Emulation::ts_object (key) = data;
-        ACE_TSS_Cleanup::instance ()->key_used (key);
+        ACE_TSS_Cleanup::instance ()->thread_use_key (key);
 
         return 0;
       }
-# elif defined (ACE_HAS_PTHREADS)
-#   if defined (ACE_HAS_FSU_PTHREADS)
-    // Call pthread_init() here to initialize threads package.  FSU
-    // threads need an initialization before the first thread
-    // constructor.  This seems to be the one; however, a segmentation
-    // fault may indicate that another pthread_init() is necessary,
-    // perhaps in Synch.cpp or Synch_T.cpp.  FSU threads will not
-    // reinit if called more than once, so another call to
-    // pthread_init will not adversely affect existing threads.
-    pthread_init ();
-#   endif /*  ACE_HAS_FSU_PTHREADS */
-
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-    ACE_OSCALL_RETURN (::pthread_setspecific (key, data), int, -1);
-#   else
-    int result;
-    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setspecific (key, data),
-                                         result),
-                       int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
-
-# elif defined (ACE_HAS_STHREADS)
-  int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int, -1);
-# elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
-    ACE_hthread_t tid;
-    ACE_OS::thr_self (tid);
-    if (::tsd_setval (key, tid, data) != 0)
-     return -1;
-    ACE_TSS_Cleanup::instance ()->key_used (key);
-    return 0;
-# elif defined (ACE_HAS_WTHREADS)
-    ::TlsSetValue (key, data);
-    ACE_TSS_Cleanup::instance ()->key_used (key);
-    return 0;
-# else
-    ACE_UNUSED_ARG (key);
-    ACE_UNUSED_ARG (data);
-    ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_STHREADS */
-#else
+#   elif (defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)) || defined (ACE_HAS_WTHREADS)
+    if (ACE_OS::thr_setspecific_native (key, data) == 0)
+    {
+      ACE_TSS_Cleanup::instance ()->thread_use_key (key);
+      return 0;
+    }
+    return -1;
+#   else /* ACE_HAS_TSS_EMULATION */
+  return ACE_OS::thr_setspecific_native (key, data);
+#   endif /* ACE_HAS_TSS_EMULATION */
+# else /* ACE_HAS_THREADS */
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (data);
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_THREADS */
+# endif /* ACE_HAS_THREADS */
 }
 
 void
@@ -3549,7 +3575,7 @@ ACE_OS::unique_name (const void *object,
   ACE_OS::sprintf (temp_name,
                    ACE_LIB_TEXT ("%p%d"),
                    object,
-                   ACE_static_cast (int, ACE_OS::getpid ()));
+                   static_cast <int> (ACE_OS::getpid ()));
   ACE_OS::strsncpy (name,
                     temp_name,
                     length);
diff --git a/ace/OS_NS_Thread.h b/ace/OS_NS_Thread.h
index cb93d65773d..7775da2d2fa 100644
--- a/ace/OS_NS_Thread.h
+++ b/ace/OS_NS_Thread.h
@@ -105,11 +105,13 @@ protected:
 # if defined (ACE_WIN32)
 typedef DWORD ACE_thread_t;
 typedef HANDLE ACE_hthread_t;
+// Native TSS key type
+typedef DWORD ACE_OS_thread_key_t;
+// Application TSS key type (use this type except in TSS Emulation)
 #   if defined (ACE_HAS_TSS_EMULATION)
-      typedef DWORD ACE_OS_thread_key_t;
       typedef u_int ACE_thread_key_t;
 #   else  /* ! ACE_HAS_TSS_EMULATION */
-      typedef DWORD ACE_thread_key_t;
+      typedef ACE_OS_thread_key_t ACE_thread_key_t;
 #   endif /* ! ACE_HAS_TSS_EMULATION */
 # endif /* ACE_WIN32 */
 
@@ -139,7 +141,14 @@ typedef HANDLE ACE_hthread_t;
 // Solaris threads, without PTHREADS.
 // Typedefs to help compatibility with Windows NT and Pthreads.
 typedef thread_t ACE_thread_t;
-typedef thread_key_t ACE_thread_key_t;
+// Native TSS key type (not for general use)
+typedef thread_key_t ACE_OS_thread_key_t;
+// Application TSS key type (use this type except in TSS Emulation)
+#   if defined (ACE_HAS_TSS_EMULATION)
+      typedef u_int ACE_thread_key_t;
+#   else  /* ! ACE_HAS_TSS_EMULATION */
+      typedef ACE_OS_thread_key_t ACE_thread_key_t;
+#   endif /* ! ACE_HAS_TSS_EMULATION */
 typedef mutex_t ACE_mutex_t;
 #     if !defined (ACE_LACKS_RWLOCK_T)
 typedef rwlock_t ACE_rwlock_t;
@@ -201,10 +210,16 @@ struct ACE_Export ACE_mutexattr_t
 // use unsigned int, so the ACE TSS emulation is compatible with them.
 // Native pSOS TSD, where available, uses unsigned long as the key type.
 #     if defined (ACE_PSOS_HAS_TSS)
-typedef u_long ACE_thread_key_t;
+typedef u_long ACE_OS_thread_key_t;
 #     else
-typedef u_int ACE_thread_key_t;
+typedef u_int ACE_OS_thread_key_t;
 #     endif /* ACE_PSOS_HAS_TSS */
+// Application TSS key type (use this type except in TSS Emulation)
+#   if defined (ACE_HAS_TSS_EMULATION)
+      typedef u_int ACE_thread_key_t;
+#   else  /* ! ACE_HAS_TSS_EMULATION */
+      typedef ACE_OS_thread_key_t ACE_thread_key_t;
+#   endif /* ! ACE_HAS_TSS_EMULATION */
 
 #     define THR_CANCEL_DISABLE      0  /* thread can never be cancelled */
 #     define THR_CANCEL_ENABLE       0      /* thread can be cancelled */
@@ -310,7 +325,14 @@ typedef int ACE_hthread_t;
 // Key type: the ACE TSS emulation requires the key type be unsigned,
 // for efficiency.  (Current POSIX and Solaris TSS implementations also
 // use u_int, so the ACE TSS emulation is compatible with them.)
-typedef u_int ACE_thread_key_t;
+// Native TSS key type
+typedef u_int ACE_OS_thread_key_t;
+// Application TSS key type (use this type except in TSS Emulation)
+#   if defined (ACE_HAS_TSS_EMULATION)
+      typedef u_int ACE_thread_key_t;
+#   else  /* ! ACE_HAS_TSS_EMULATION */
+      typedef ACE_OS_thread_key_t ACE_thread_key_t;
+#   endif /* ! ACE_HAS_TSS_EMULATION */
 
       // Marker for ACE_Thread_Manager to indicate that it allocated
       // an ACE_thread_t.  It is placed at the beginning of the ID.
@@ -465,30 +487,30 @@ struct ACE_Export ACE_rwlock_t
 public:
 //protected:
 
+  /// Serialize access to internal state.
   ACE_mutex_t lock_;
-  // Serialize access to internal state.
 
+  /// Reader threads waiting to acquire the lock.
   ACE_cond_t waiting_readers_;
-  // Reader threads waiting to acquire the lock.
 
+  /// Number of waiting readers.
   int num_waiting_readers_;
-  // Number of waiting readers.
 
+  /// Writer threads waiting to acquire the lock.
   ACE_cond_t waiting_writers_;
-  // Writer threads waiting to acquire the lock.
 
+  /// Number of waiting writers.
   int num_waiting_writers_;
-  // Number of waiting writers.
 
+  /// Value is -1 if writer has the lock, else this keeps track of the
+  /// number of readers holding the lock.
   int ref_count_;
-  // Value is -1 if writer has the lock, else this keeps track of the
-  // number of readers holding the lock.
 
+  /// Indicate that a reader is trying to upgrade
   int important_writer_;
-  // indicate that a reader is trying to upgrade
 
+  /// Condition for the upgrading reader
   ACE_cond_t waiting_important_writer_;
-  // condition for the upgrading reader
 };
 #   elif defined (ACE_HAS_PTHREADS_UNIX98_EXT)
 typedef pthread_rwlock_t ACE_rwlock_t;
@@ -680,7 +702,14 @@ typedef int ACE_sema_t;
 typedef int ACE_rwlock_t;
 typedef int ACE_thread_t;
 typedef int ACE_hthread_t;
-typedef unsigned int ACE_thread_key_t;
+// Native TSS key type
+typedef unsigned int ACE_OS_thread_key_t;
+// Application TSS key type (use this type except in TSS Emulation)
+#   if defined (ACE_HAS_TSS_EMULATION)
+      typedef u_int ACE_thread_key_t;
+#   else  /* ! ACE_HAS_TSS_EMULATION */
+      typedef ACE_OS_thread_key_t ACE_thread_key_t;
+#   endif /* ! ACE_HAS_TSS_EMULATION */
 
 // Ensure that ACE_THR_PRI_FIFO_DEF and ACE_THR_PRI_OTHER_DEF are
 // defined on non-threaded platforms, to support application source
@@ -834,6 +863,9 @@ public:
   /// new request. Returns 0 on success, 1 if the key was not reserved.
   static int release_key (ACE_thread_key_t key);
 
+  /// Check a key for validity.
+  static int is_key (ACE_thread_key_t key);
+
   /// Returns the exit hook associated with the key.  Does _not_ check
   /// for a valid key.
   static ACE_TSS_DESTRUCTOR tss_destructor (const ACE_thread_key_t key);
@@ -1089,34 +1121,6 @@ class ACE_event_t;
 class ACE_Base_Thread_Adapter;
 
 namespace ACE_OS {
-
-# if 0
-  //@{ @name A set of wrappers for threads (these are portable since they use the ACE_Thread_ID).
-  int thr_continue (const ACE_Thread_ID &thread);
-  int thr_create (ACE_THR_FUNC,
-                  void *args,
-                  long flags,
-                  ACE_Thread_ID *,
-                  long priority = ACE_DEFAULT_THREAD_PRIORITY,
-                  void *stack = 0,
-                  size_t stacksize = 0);
-  int thr_getprio (ACE_Thread_ID thr_id,
-                   int &prio,
-                   int *policy = 0);
-  int thr_join (ACE_Thread_ID waiter_id,
-                ACE_THR_FUNC_RETURN *status);
-  int thr_kill (ACE_Thread_ID thr_id,
-                int signum);
-  ACE_Thread_ID thr_self (void);
-  int thr_setprio (ACE_Thread_ID thr_id,
-                   int prio);
-  int thr_setprio (const ACE_Sched_Priority prio);
-  int thr_suspend (ACE_Thread_ID target_thread);
-  int thr_cancel (ACE_Thread_ID t_id);
-  //@}
-# endif /* 0 */
-
-
   //@{ @name A set of wrappers for threads
 
   /// This is necessary to deal with POSIX pthreads and their use of
@@ -1632,11 +1636,12 @@ namespace ACE_OS {
                    int &priority,
                    int &policy);
 
-# if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
   ACE_NAMESPACE_INLINE_FUNCTION
-  int thr_getspecific (ACE_OS_thread_key_t key,
+  /// for internal use only.  Applications should call thr_getspecific
+  int thr_getspecific_native (ACE_OS_thread_key_t key,
                        void **data);
-# endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
+# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int thr_getspecific (ACE_thread_key_t key,
@@ -1666,31 +1671,37 @@ namespace ACE_OS {
   int thr_key_used (ACE_thread_key_t key);
 
 # if defined (ACE_HAS_THR_C_DEST)
-#   if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+#   if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+  /// for internal use.  Applications should call thr_keycreate
   extern ACE_Export
-  int thr_keycreate (ACE_OS_thread_key_t *key,
-                     ACE_THR_C_DEST,
-                     void *inst = 0);
-#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
+  int thr_keycreate_native (ACE_OS_thread_key_t *key,
+                     ACE_THR_C_DEST);
+#   endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
   extern ACE_Export
   int thr_keycreate (ACE_thread_key_t *key,
                      ACE_THR_C_DEST,
                      void *inst = 0);
 # else
-#   if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+#   if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+  // for internal use:  applications should call thr_keycreate instead
   extern ACE_Export
-  int thr_keycreate (ACE_OS_thread_key_t *key,
-                     ACE_THR_DEST,
-                     void *inst = 0);
-#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
-
+  int thr_keycreate_native (ACE_OS_thread_key_t *key,
+                     ACE_THR_DEST);
+#   endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
   extern ACE_Export
   int thr_keycreate (ACE_thread_key_t *key,
                      ACE_THR_DEST,
                      void *inst = 0);
+
 # endif /* ACE_HAS_THR_C_DEST */
 
+# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+  // for internal use:  applications should call thr_keyfree instead
+  extern ACE_Export
+  int thr_keyfree_native (ACE_OS_thread_key_t key);
+# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
+
   extern ACE_Export
   int thr_keyfree (ACE_thread_key_t key);
 
@@ -1726,11 +1737,12 @@ namespace ACE_OS {
   extern ACE_Export
   int thr_setprio (const ACE_Sched_Priority prio);
 
-# if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+  /// for internal use.  Applications should call thr_setspecific
   extern ACE_Export
-  int thr_setspecific (ACE_OS_thread_key_t key,
+  int thr_setspecific_native (ACE_OS_thread_key_t key,
                        void *data);
-# endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
+# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
   extern ACE_Export
   int thr_setspecific (ACE_thread_key_t key,
diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl
index 89a9c934870..14f783b47ea 100644
--- a/ace/OS_NS_Thread.inl
+++ b/ace/OS_NS_Thread.inl
@@ -104,94 +104,6 @@ ACE_TSS_Emulation::ts_object (const ACE_thread_key_t key)
 
 /*****************************************************************************/
 
-#if 0
-ACE_INLINE int
-ACE_OS::thr_continue (const ACE_Thread_ID &thr_id)
-{
-  ACE_OS_TRACE ("ACE_OS::thr_continue");
-  return ACE_OS::thr_continue (thr_id.id ());
-}
-
-ACE_INLINE int
-ACE_OS::thr_create (ACE_THR_FUNC func,
-                    void *args,
-                    long flags,
-                    ACE_Thread_ID *thr_id,
-                    long priority,
-                    void *stack,
-                    size_t stacksize);
-{
-  ACE_OS_TRACE ("ACE_OS::thr_create");
-  ACE_thread_t thread_id;
-  ACE_hthread_t thread_handle;
-
-  int result = ACE_OS::thr_create (func, args, flags,
-                                   &thread_id, &thread_handle,
-                                   priority, stack, stacksize);
-  if (result == -1)
-    return -1;
-  else if (thr_id != 0)
-    {
-      thr_id->id (thread_id);
-      thr_id->handle (thread_handle);
-      return result;
-    }
-}
-
-ACE_INLINE int
-ACE_OS::thr_getprio (const ACE_Thread_ID &thr_id, int &prio)
-{
-  ACE_OS_TRACE ("ACE_OS::thr_getprio");
-  return ACE_OS::thr_getprio (thr_id.handle (), prio);
-}
-
-ACE_INLINE int
-ACE_OS::thr_join (const ACE_Thread_ID &thr_id, ACE_THR_FUNC_RETURN *status)
-{
-# if defined (ACE_WIN32)
-  return ACE_OS::thr_join (thr_id.handle (), status);
-# else
-  return ACE_OS::thr_join (thr_id.id (), status);
-# endif /* ACE_WIN32 */
-}
-
-ACE_INLINE int
-ACE_OS::thr_cancel (const ACE_Thread_ID &thr_id)
-{
-  return ACE_OS::thr_cancel (thr_id.id ());
-}
-
-ACE_INLINE int
-ACE_OS::thr_kill (const ACE_Thread_ID &thr_id, int signum)
-{
-  return ACE_OS::thr_kill (thr_id.id (), signum);
-}
-
-ACE_INLINE ACE_Thread_ID
-ACE_OS::thr_self (void)
-{
-  ACE_hthread_t thr_handle;
-  ACE_OS::thr_self (thr_handle);
-  ACE_thread_t thr_id = ACE_OS::thr_self ();
-
-  return ACE_Thread_ID (thr_id, thr_handle);
-}
-
-ACE_INLINE int
-ACE_OS::thr_setprio (const ACE_Thread_ID &thr_id, int prio)
-{
-  ACE_OS_TRACE ("ACE_OS::thr_setprio");
-  return ACE_OS::thr_setprio (thr_id.handle (), prio);
-}
-
-ACE_INLINE int
-ACE_OS::thr_suspend (const ACE_Thread_ID &thr_id)
-{
-  return ACE_OS::thr_suspend (thr_id.handle ());
-}
-
-#endif /* 0 */
-
 ACE_INLINE int
 ACE_OS::thr_equal (ACE_thread_t t1, ACE_thread_t t2)
 {
@@ -2497,6 +2409,8 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
   pthread_rwlockattr_setpshared (&attr, (type == USYNC_THREAD ?
                                          PTHREAD_PROCESS_PRIVATE :
                                          PTHREAD_PROCESS_SHARED));
+#    else
+  ACE_UNUSED_ARG (type);
 #    endif /* !ACE_LACKS_RWLOCKATTR_PSHARED */
   status = ACE_ADAPT_RETVAL (pthread_rwlock_init (rw, &attr), status);
   pthread_rwlockattr_destroy (&attr);
@@ -3477,9 +3391,14 @@ ACE_OS::sigwait (sigset_t *sset, int *sig)
 # if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) || defined (CHORUS) || defined (ACE_PSOS)
     ACE_UNUSED_ARG (sset);
     ACE_NOTSUP_RETURN (-1);
-# elif (defined (ACE_HAS_STHREADS) && !defined (_POSIX_PTHREAD_SEMANTICS))
-    *sig = ::sigwait (sset);
-    return *sig;
+# elif defined (ACE_HAS_STHREADS)
+   # if (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_POSIX_PTHREAD_SEMANTICS)
+     errno = ::sigwait (sset, sig);
+     return errno == 0  ?  *sig  :  -1;
+   #else
+     *sig = ::sigwait (sset);
+     return *sig;
+   #endif /* _POSIX_C_SOURCE - 0 >= 199506L || _POSIX_PTHREAD_SEMANTICS */
 # elif defined (ACE_HAS_PTHREADS)
   // LynxOS and Digital UNIX have their own hoops to jump through.
 #   if defined (__Lynx__)
@@ -3695,12 +3614,20 @@ ACE_OS::thr_getprio (ACE_hthread_t id, int &priority, int &policy)
 # elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (id, &priority), result), int, -1);
-# elif defined (ACE_HAS_WTHREADS)
+# elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE)
+  ACE_Errno_Guard error (errno);
+
   priority = ::GetThreadPriority (id);
-  if (priority == THREAD_PRIORITY_ERROR_RETURN)
+
+  DWORD priority_class = ::GetPriorityClass (::GetCurrentProcess());
+  if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR)
     ACE_FAIL_RETURN (-1);
-  else
-    return 0;
+
+  policy =
+    (priority_class ==
+     REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER;
+
+  return 0;
 # elif defined (ACE_PSOS)
   // passing a 0 in the second argument does not alter task priority,
   // third arg gets existing one
@@ -3728,34 +3655,22 @@ ACE_OS::thr_getprio (ACE_hthread_t id, int &priority)
   return ACE_OS::thr_getprio (id, priority, policy);
 }
 
-#if defined (ACE_HAS_TSS_EMULATION)
-
-# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
 ACE_INLINE int
-ACE_OS::thr_getspecific (ACE_OS_thread_key_t key, void **data)
+ACE_OS::thr_getspecific_native (ACE_OS_thread_key_t key, void **data)
 {
-  ACE_OS_TRACE ("ACE_OS::thr_getspecific");
-#  if defined (ACE_HAS_THREADS)
-#   if defined (ACE_HAS_PTHREADS)
-#    if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
+//  ACE_OS_TRACE ("ACE_OS::thr_getspecific_native");
+# if defined (ACE_HAS_PTHREADS)
+#  if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
     return pthread_getspecific (key, data);
-#    else /* this is ACE_HAS_PTHREADS_DRAFT7 or STD */
-#     if (pthread_getspecific)
-    // This is a macro on some platforms, e.g., CHORUS!
-    *data = pthread_getspecific (key);
-#     else
+#  else /* this is ACE_HAS_PTHREADS_DRAFT7 or STD */
     *data = pthread_getspecific (key);
-#     endif /* pthread_getspecific */
-#    endif       /*  ACE_HAS_PTHREADS_DRAFT4, 6 */
     return 0;
-#   elif defined (ACE_HAS_STHREADS)
+#  endif       /*  ACE_HAS_PTHREADS */
+# elif defined (ACE_HAS_STHREADS)
     int result;
     ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), result), int, -1);
-#   elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
-    ACE_hthread_t tid;
-    ACE_OS::thr_self (tid);
-    return (::tsd_getval (key, tid, data) == 0) ? 0 : -1;
-#   elif defined (ACE_HAS_WTHREADS)
+# elif defined (ACE_HAS_WTHREADS)
 
   // The following handling of errno is designed like this due to
   // ACE_Log_Msg::instance calling ACE_OS::thr_getspecific.
@@ -3778,26 +3693,25 @@ ACE_OS::thr_getspecific (ACE_OS_thread_key_t key, void **data)
     return -1;
   else
     return 0;
-#   endif /* ACE_HAS_STHREADS */
-#  else
+# elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
+    ACE_hthread_t tid;
+    ACE_OS::thr_self (tid);
+    return (::tsd_getval (key, tid, data) == 0) ? 0 : -1;
+# else /* ACE_HAS_PTHREADS etc.*/
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (data);
   ACE_NOTSUP_RETURN (-1);
-#  endif /* ACE_HAS_THREADS */
+# endif /* ACE_HAS_PTHREADS etc.*/
 }
-# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
-
-#endif /* ACE_HAS_TSS_EMULATION */
-
+#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
 ACE_INLINE int
 ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data)
 {
-  // ACE_OS_TRACE ("ACE_OS::thr_getspecific");
+//   ACE_OS_TRACE ("ACE_OS::thr_getspecific");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_TSS_EMULATION)
-    ACE_KEY_INDEX (key_index, key);
-    if (key_index >= ACE_TSS_Emulation::total_keys ())
+    if (ACE_TSS_Emulation::is_key (key) == 0)
       {
         errno = EINVAL;
         data = 0;
@@ -3808,51 +3722,9 @@ ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data)
         *data = ACE_TSS_Emulation::ts_object (key);
         return 0;
       }
-# elif defined (ACE_HAS_STHREADS)
-  int result;
-    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), result), int, -1);
-# elif defined (ACE_HAS_PTHREADS)
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-      return ::pthread_getspecific (key, data);
-#   else /* this is Draft 7 or STD */
-      *data = pthread_getspecific (key);
-      return 0;
-#   endif       /*  ACE_HAS_PTHREADS_DRAFT4, 6 */
-# elif defined (ACE_HAS_WTHREADS)
-
-  // The following handling of errno is designed like this due to
-  // ACE_Log_Msg::instance calling ACE_OS::thr_getspecific.
-  // Basically, it is ok for a system call to reset the error to zero.
-  // (It really shouldn't, though).  However, we have to remember to
-  // store errno *immediately* after an error is detected.  Calling
-  // ACE_ERROR_RETURN((..., errno)) did not work because errno was
-  // cleared before being passed to the thread-specific instance of
-  // ACE_Log_Msg.  The workaround for was to make it so
-  // thr_getspecific did not have the side effect of clearing errno.
-  // The correct fix is for ACE_ERROR_RETURN to store errno
-  //(actually ACE_OS::last_error) before getting the ACE_Log_Msg tss
-  // pointer, which is how it is implemented now.  However, other uses
-  // of ACE_Log_Msg may not work correctly, so we're keeping this as
-  // it is for now.
-
-  ACE_Errno_Guard error (errno);
-  *data = ::TlsGetValue (key);
-  if (*data == 0 && (error = ::GetLastError ()) != NO_ERROR)
-    return -1;
-  else
-    return 0;
-# elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
-  ACE_hthread_t tid;
-  ACE_OS::thr_self (tid);
-  int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::tsd_getval (key, tid, data),
-                                       result),
-                     int, -1);
-# else
-  ACE_UNUSED_ARG (key);
-  ACE_UNUSED_ARG (data);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_STHREADS */
+# else /* ACE_HAS_TSS_EMULATION */
+  return ACE_OS::thr_getspecific_native (key, data);
+# endif /* ACE_HAS_TSS_EMULATION */
 #else
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (data);
@@ -3860,7 +3732,7 @@ ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data)
 #endif /* ACE_HAS_THREADS */
 }
 
-#if !defined (VXWORKS)
+#if !(defined (VXWORKS) && !defined (ACE_HAS_PTHREADS))
 ACE_INLINE int
 ACE_OS::thr_join (ACE_hthread_t thr_handle,
                   ACE_THR_FUNC_RETURN *status)
@@ -4206,23 +4078,11 @@ ACE_INLINE int
 ACE_OS::thr_setconcurrency (int hint)
 {
   ACE_OS_TRACE ("ACE_OS::thr_setconcurrency");
-#if defined (ACE_HAS_THREADS)
-# if defined (ACE_HAS_STHREADS)
+#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setconcurrency (hint),
                                        result),
                      int, -1);
-# elif defined (ACE_HAS_PTHREADS)
-  ACE_UNUSED_ARG (hint);
-  ACE_NOTSUP_RETURN (-1);
-# elif defined (ACE_HAS_WTHREADS)
-  ACE_UNUSED_ARG (hint);
-
-  ACE_NOTSUP_RETURN (-1);
-# elif defined (VXWORKS) || defined (ACE_PSOS)
-  ACE_UNUSED_ARG (hint);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_STHREADS */
 #else
   ACE_UNUSED_ARG (hint);
   ACE_NOTSUP_RETURN (-1);
@@ -4491,12 +4351,9 @@ ACE_OS::thread_mutex_destroy (ACE_thread_mutex_t *m)
   ::DeleteCriticalSection (m);
   return 0;
 
-# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
+# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (VXWORKS) || defined (ACE_PSOS)
   return ACE_OS::mutex_destroy (m);
 
-# elif defined (VXWORKS) || defined (ACE_PSOS)
-  return mutex_destroy (m);
-
 # endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */
 
 #else
@@ -4583,11 +4440,9 @@ ACE_OS::thread_mutex_lock (ACE_thread_mutex_t *m)
 # if defined (ACE_HAS_WTHREADS)
   ::EnterCriticalSection (m);
   return 0;
-# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
+# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (VXWORKS) || defined (ACE_PSOS)
   return ACE_OS::mutex_lock (m);
-# elif defined (VXWORKS) || defined (ACE_PSOS)
-  return mutex_lock (m);
-# endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */
+# endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS || VXWORKS || ACE_PSOS */
 #else
   ACE_UNUSED_ARG (m);
   ACE_NOTSUP_RETURN (-1);
@@ -4609,11 +4464,9 @@ ACE_OS::thread_mutex_lock (ACE_thread_mutex_t *m,
   // Windows synchronization mechanism.
 
 #if defined (ACE_HAS_THREADS) && !defined (ACE_HAS_WTHREADS)
-# if defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
+# if defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (VXWORKS) || defined (ACE_PSOS)
   return ACE_OS::mutex_lock (m, timeout);
-#elif defined (VXWORKS) || defined (ACE_PSOS)
-  return mutex_lock (m, timeout);
-#endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */
+#endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS || VXWORKS || ACE_PSOS */
 #else
   ACE_UNUSED_ARG (m);
   ACE_UNUSED_ARG (timeout);
@@ -4650,9 +4503,7 @@ ACE_OS::thread_mutex_trylock (ACE_thread_mutex_t *m)
   ACE_UNUSED_ARG (m);
   ACE_NOTSUP_RETURN (-1);
 #   endif /* ACE_HAS_WIN32_TRYLOCK */
-# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
-  return ACE_OS::mutex_trylock (m);
-# elif defined (VXWORKS) || defined (ACE_PSOS)
+# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (VXWORKS) || defined (ACE_PSOS)
   return ACE_OS::mutex_trylock (m);
 #endif /* Threads variety case */
 
@@ -4670,9 +4521,7 @@ ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m)
 # if defined (ACE_HAS_WTHREADS)
   ::LeaveCriticalSection (m);
   return 0;
-# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
-  return ACE_OS::mutex_unlock (m);
-# elif defined (VXWORKS) || defined (ACE_PSOS)
+# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (VXWORKS) || defined (ACE_PSOS)
   return ACE_OS::mutex_unlock (m);
 # endif /* Threads variety case */
 #else
diff --git a/ace/OS_NS_arpa_inet.cpp b/ace/OS_NS_arpa_inet.cpp
index b4040a0032c..16594216b80 100644
--- a/ace/OS_NS_arpa_inet.cpp
+++ b/ace/OS_NS_arpa_inet.cpp
@@ -31,7 +31,7 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr)
   // Must reset errno first. Refer to WindRiver SPR# 34949, SPR# 36026
   ::errnoSet(0);
   int result = ERROR;
-  ACE_OSCALL (::inet_aton ((char*)host_name, addr), int, ERROR, result);
+  ACE_OSCALL (::inet_aton (const_cast <char*>(host_name), addr), int, ERROR, result);
   return (result == ERROR) ? 0 : 1;
 #else
   // inet_aton() returns 0 upon failure, not -1 since -1 is a valid
diff --git a/ace/OS_NS_arpa_inet.inl b/ace/OS_NS_arpa_inet.inl
index 8e42c253f6a..31a6b9a3f34 100644
--- a/ace/OS_NS_arpa_inet.inl
+++ b/ace/OS_NS_arpa_inet.inl
@@ -9,7 +9,7 @@ ACE_INLINE unsigned long
 ACE_OS::inet_addr (const char *name)
 {
   ACE_OS_TRACE ("ACE_OS::inet_addr");
-#if defined (VXWORKS) || defined (ACE_PSOS)
+#if defined (ACE_PSOS)
 
   u_long ret = 0;
   u_int segment;
@@ -43,7 +43,7 @@ ACE_OS::inet_addr (const char *name)
     }
   return valid ? htonl (ret) : INADDR_NONE;
 #elif defined (ACE_HAS_NONCONST_GETBY)
-  return ::inet_addr ((char *) name);
+  return ::inet_addr (const_cast <char*> (name));
 #else
   return ::inet_addr (name);
 #endif /* ACE_HAS_NONCONST_GETBY */
diff --git a/ace/OS_NS_ctype.h b/ace/OS_NS_ctype.h
index ce738790ef1..ce9fc51fd19 100644
--- a/ace/OS_NS_ctype.h
+++ b/ace/OS_NS_ctype.h
@@ -48,47 +48,47 @@ namespace ACE_OS {
 
   /// Returns true if the character is an alphanumeric character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isalnum (const ACE_TCHAR c);
+  int ace_isalnum (ACE_TCHAR c);
 
   /// Returns true if the character is an alphabetic character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isalpha (const ACE_TCHAR c);
+  int ace_isalpha (ACE_TCHAR c);
 
   /// Returns true if the character is a control character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_iscntrl (const ACE_TCHAR c);
+  int ace_iscntrl (ACE_TCHAR c);
 
   /// Returns true if the character is a decimal-digit character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isdigit (const ACE_TCHAR c);
+  int ace_isdigit (ACE_TCHAR c);
 
   /// Returns true if the character is a printable character other than a space.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isgraph (const ACE_TCHAR c);
+  int ace_isgraph (ACE_TCHAR c);
 
   /// Returns true if the character is a lowercase character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_islower (const ACE_TCHAR c);
+  int ace_islower (ACE_TCHAR c);
 
   /// Returns true if the character is a printable character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isprint (const ACE_TCHAR c);
+  int ace_isprint (ACE_TCHAR c);
 
   /// Returns true if the character is a punctuation character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_ispunct (const ACE_TCHAR c);
+  int ace_ispunct (ACE_TCHAR c);
 
   /// Returns true if the character is a space character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isspace (const ACE_TCHAR c);
+  int ace_isspace (ACE_TCHAR c);
 
   /// Returns true if the character is an uppercase character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isupper (const ACE_TCHAR c);
+  int ace_isupper (ACE_TCHAR c);
 
   /// Returns true if the character is a hexadecimal-digit character.
   ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isxdigit (const ACE_TCHAR c);
+  int ace_isxdigit (ACE_TCHAR c);
 
   /// Converts a character to lower case (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
diff --git a/ace/OS_NS_ctype.inl b/ace/OS_NS_ctype.inl
index 13b8e05a1aa..96d50465c4c 100644
--- a/ace/OS_NS_ctype.inl
+++ b/ace/OS_NS_ctype.inl
@@ -2,9 +2,12 @@
 // $Id$
 
 #include "ace/os_include/os_ctype.h"
+#if defined ACE_HAS_WCHAR
+# include "ace/os_include/os_wctype.h"
+#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
-ACE_OS::ace_isalnum (const ACE_TCHAR c)
+ACE_OS::ace_isalnum (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswalnum (c);
@@ -14,7 +17,7 @@ ACE_OS::ace_isalnum (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_isalpha (const ACE_TCHAR c)
+ACE_OS::ace_isalpha (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswalpha (c);
@@ -24,7 +27,7 @@ ACE_OS::ace_isalpha (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_iscntrl (const ACE_TCHAR c)
+ACE_OS::ace_iscntrl (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswcntrl (c);
@@ -34,7 +37,7 @@ ACE_OS::ace_iscntrl (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_isdigit (const ACE_TCHAR c)
+ACE_OS::ace_isdigit (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswdigit (c);
@@ -44,7 +47,7 @@ ACE_OS::ace_isdigit (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_isgraph (const ACE_TCHAR c)
+ACE_OS::ace_isgraph (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswgraph (c);
@@ -54,7 +57,7 @@ ACE_OS::ace_isgraph (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_islower (const ACE_TCHAR c)
+ACE_OS::ace_islower (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswlower (c);
@@ -64,7 +67,7 @@ ACE_OS::ace_islower (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_isprint (const ACE_TCHAR c)
+ACE_OS::ace_isprint (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswprint (c);
@@ -74,7 +77,7 @@ ACE_OS::ace_isprint (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_ispunct (const ACE_TCHAR c)
+ACE_OS::ace_ispunct (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswpunct (c);
@@ -84,7 +87,7 @@ ACE_OS::ace_ispunct (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_isspace (const ACE_TCHAR c)
+ACE_OS::ace_isspace (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswspace (c);
@@ -94,7 +97,7 @@ ACE_OS::ace_isspace (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_isupper (const ACE_TCHAR c)
+ACE_OS::ace_isupper (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswupper (c);
@@ -104,7 +107,7 @@ ACE_OS::ace_isupper (const ACE_TCHAR c)
 }
 
 ACE_INLINE int
-ACE_OS::ace_isxdigit (const ACE_TCHAR c)
+ACE_OS::ace_isxdigit (ACE_TCHAR c)
 {
 #if defined (ACE_USES_WCHAR)
   return iswxdigit (c);
diff --git a/ace/OS_NS_dirent.inl b/ace/OS_NS_dirent.inl
index 7fe98c850db..28ea14b7531 100644
--- a/ace/OS_NS_dirent.inl
+++ b/ace/OS_NS_dirent.inl
@@ -51,8 +51,7 @@ ACE_OS::opendir (const ACE_TCHAR *filename)
 #  else /* ! ACE_PSOS */
 #    if defined (ACE_WIN32) && defined (ACE_LACKS_OPENDIR)
   return ::ACE_OS::opendir_emulation (filename);
-#    elif defined (VXWORKS)
-  // VxWorks' ::opendir () is declared with a non-const argument.
+#    elif defined (ACE_HAS_NONCONST_OPENDIR)
   return ::opendir (const_cast<char *> (filename));
 #    else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */
   return ::opendir (ACE_TEXT_ALWAYS_CHAR (filename));
@@ -107,7 +106,8 @@ ACE_OS::readdir_r (ACE_DIR *dirp,
     return 1; // Oops, some type of error!
 #elif defined (ACE_HAS_DIRENT)  &&  !defined (ACE_LACKS_READDIR_R)
 #  if (defined (sun) && (defined (_POSIX_PTHREAD_SEMANTICS) || \
-                        (_FILE_OFFSET_BITS == 64))) || \
+                        (_FILE_OFFSET_BITS == 64) || \
+                        (_POSIX_C_SOURCE - 0 >= 199506L))) || \
       (!defined (sun) && (defined (ACE_HAS_PTHREADS_STD) || \
                          defined (ACE_HAS_PTHREADS_DRAFT7) || \
                          defined (__USE_POSIX) || \
diff --git a/ace/OS_NS_fcntl.cpp b/ace/OS_NS_fcntl.cpp
index d9586a8e4ac..d901c53e702 100644
--- a/ace/OS_NS_fcntl.cpp
+++ b/ace/OS_NS_fcntl.cpp
@@ -121,26 +121,26 @@ ACE_OS::open (const char *filename,
   return 0;
 # else
   unsigned long result, handle;
-  result = ::open_f (&handle, ACE_const_cast(char *, filename), 0);
+  result = ::open_f (&handle, const_cast<char *> (filename), 0);
   if (result != 0)
     {
       // We need to clean this up...not 100% correct!
       // To correct we should handle all the cases of TRUNC and CREAT
       if ((result == 0x200B) && (ACE_BIT_ENABLED (mode, O_CREAT)))
         {
-          result = ::create_f(ACE_const_cast(char *, filename),1,0);
+          result = ::create_f(const_cast<char *> (filename),1,0);
           if (result != 0)
             {
               errno = result;
-              return ACE_static_cast (ACE_HANDLE, -1);
+              return static_cast<ACE_HANDLE> (-1);
             }
           else  //File created...try to open it again
             {
-              result = ::open_f (&handle, ACE_const_cast(char *, filename), 0);
+              result = ::open_f (&handle, const_cast<char *> (filename), 0);
               if (result != 0)
                 {
                   errno = result;
-                  return ACE_static_cast (ACE_HANDLE, -1);
+                  return static_cast<ACE_HANDLE> (-1);
                 }
 
             }
@@ -148,10 +148,10 @@ ACE_OS::open (const char *filename,
       else
         {
           errno = result;
-          return ACE_static_cast (ACE_HANDLE, -1);
+          return static_cast<ACE_HANDLE> (-1);
         }
     }
-  return ACE_static_cast (ACE_HANDLE, handle);
+  return static_cast<ACE_HANDLE> (handle);
 # endif /* defined (ACE_PSOS_LACKS_PHILE) */
 #elif defined (INTEGRITY)
   ACE_UNUSED_ARG (sa);
diff --git a/ace/OS_NS_macros.h b/ace/OS_NS_macros.h
index 1703ce14a80..fc39d7084bf 100644
--- a/ace/OS_NS_macros.h
+++ b/ace/OS_NS_macros.h
@@ -30,8 +30,13 @@
   do { TYPE ace_result_ = (TYPE) OP; \
       if (ace_result_ == FAILVALUE) { int ___ = ::WSAGetLastError (); errno = ___; return (TYPE) FAILVALUE; } else return ace_result_; \
   } while (0)
+# define ACE_SOCKCALL(OP,TYPE,FAILVALUE,RESULT) \
+  do { RESULT = (TYPE) OP; \
+      if (RESULT == FAILVALUE) { int ___ = ::WSAGetLastError (); errno = ___; RESULT = FAILVALUE; } \
+  } while (0)
 #else
 # define ACE_SOCKCALL_RETURN(OP,TYPE,FAILVALUE) ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE)
+# define ACE_SOCKCALL(OP,TYPE,FAILVALUE,RESULT) ACE_OSCALL(OP,TYPE,FAILVALUE,RESULT)
 #endif /* ACE_WIN32 */
 
 #if !defined (ACE_WIN32)
diff --git a/ace/OS_NS_math.inl b/ace/OS_NS_math.inl
index 51db6c44966..6a55a57480a 100644
--- a/ace/OS_NS_math.inl
+++ b/ace/OS_NS_math.inl
@@ -1,20 +1,24 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE double
-ACE_OS::floor (double x)
-{
-  // This method computes the largest integral value not greater than x.
-  return double (static_cast<long> (x));
-}
+namespace ACE_OS {
 
-ACE_INLINE double
-ACE_OS::ceil (double x)
-{
-  // This method computes the smallest integral value not less than x.
-  const double floor = ACE_OS::floor (x);
-  if (floor == x)
-    return floor;
-  else
-    return floor + 1;
-}
+  ACE_INLINE double
+  floor (double x)
+  {
+    // This method computes the largest integral value not greater than x.
+    return double (static_cast<long> (x));
+  }
+
+  ACE_INLINE double
+  ceil (double x)
+  {
+    // This method computes the smallest integral value not less than x.
+    const double floor = ACE_OS::floor (x);
+    if (floor == x)
+      return floor;
+    else
+      return floor + 1;
+  }
+
+} // ACE_OS namespace
diff --git a/ace/OS_NS_netdb.cpp b/ace/OS_NS_netdb.cpp
index 1915e714427..ed102852f07 100644
--- a/ace/OS_NS_netdb.cpp
+++ b/ace/OS_NS_netdb.cpp
@@ -208,7 +208,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
 
   ACE_OS::memset (&ncb, 0, sizeof(ncb));
   ncb.ncb_command = NCBENUM;
-  ncb.ncb_buffer  = ACE_reinterpret_cast (unsigned char*,&lenum);
+  ncb.ncb_buffer  = reinterpret_cast<unsigned char*> (&lenum);
   ncb.ncb_length  = sizeof(lenum);
 
   result = Netbios (&ncb);
@@ -229,10 +229,10 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
 
       ADAPTERSTAT adapter;
       ACE_OS::memset (&ncb, 0, sizeof (ncb));
-      ACE_OS::strcpy (ACE_reinterpret_cast (char*, ncb.ncb_callname), "*");
+      ACE_OS::strcpy (reinterpret_cast<char*> (ncb.ncb_callname), "*");
       ncb.ncb_command     = NCBASTAT;
       ncb.ncb_lana_num    = lenum.lana[i];
-      ncb.ncb_buffer      = ACE_reinterpret_cast (unsigned char*, &adapter);
+      ncb.ncb_buffer      = reinterpret_cast<unsigned char*> (&adapter);
       ncb.ncb_length      = sizeof (adapter);
 
       result = Netbios (&ncb);
diff --git a/ace/OS_NS_netdb.inl b/ace/OS_NS_netdb.inl
index 555521fb74c..fed8aa4ebbb 100644
--- a/ace/OS_NS_netdb.inl
+++ b/ace/OS_NS_netdb.inl
@@ -246,7 +246,7 @@ ACE_INLINE struct hostent *
 ACE_OS::getipnodebyaddr (const void *src, size_t len, int family)
 {
 #if defined (ACE_HAS_IPV6) && !defined (ACE_WIN32)
-#  if defined (__GLIBC__)
+#  if defined (ACE_LACKS_GETIPNODEBYADDR)
   ACE_UNUSED_ARG (src);
   ACE_UNUSED_ARG (len);
   ACE_UNUSED_ARG (family);
@@ -259,7 +259,7 @@ ACE_OS::getipnodebyaddr (const void *src, size_t len, int family)
       errno = errnum;
     }
   return hptr;
-#  endif /* whatever_doesnt_have_getipnodebyname */
+#  endif /* ACE_LACKS_GETIPNODEBYADDR */
 #else
   // IPv4-only implementation
   if (family == AF_INET)
@@ -281,7 +281,7 @@ ACE_OS::getipnodebyname (const char *name, int family, int flags)
   ACE_UNUSED_ARG (flags);
   ACE_NOTSUP_RETURN (0);
 # elif defined (ACE_HAS_IPV6) && !defined (ACE_WIN32)
-#   if defined (__GLIBC__)
+#   if defined (ACE_LACKS_GETIPNODEBYNAME)
   ACE_UNUSED_ARG (flags);
 #     if defined (ACE_HAS_NONCONST_GETBY)
   ACE_SOCKCALL_RETURN (::gethostbyname2 (const_cast<char *> (name),
@@ -299,7 +299,7 @@ ACE_OS::getipnodebyname (const char *name, int family, int flags)
       errno = errnum;
     }
   return hptr;
-#   endif /* __GLIBC__ */
+#   endif /* ACE_LACKS_GETIPNODEBYNAME */
 # else
   // IPv4-only implementation
   ACE_UNUSED_ARG (flags);
diff --git a/ace/OS_NS_pwd.inl b/ace/OS_NS_pwd.inl
index b5d10ec914b..62f5e1813f8 100644
--- a/ace/OS_NS_pwd.inl
+++ b/ace/OS_NS_pwd.inl
@@ -9,11 +9,7 @@ ACE_INLINE void
 ACE_OS::endpwent (void)
 {
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
-# if !defined (ACE_WIN32)
   ::endpwent ();
-# else
-# endif /* ACE_WIN32 */
-#else
 #endif /* ! ACE_LACKS_PWD_FUNCTIONS */
 }
 
@@ -21,11 +17,7 @@ ACE_INLINE struct passwd *
 ACE_OS::getpwent (void)
 {
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
-# if !defined (ACE_WIN32)
   return ::getpwent ();
-# else
-  ACE_NOTSUP_RETURN (0);
-# endif /* ACE_WIN32 */
 #else
   ACE_NOTSUP_RETURN (0);
 #endif /* ! ACE_LACKS_PWD_FUNCTIONS */
@@ -35,15 +27,10 @@ ACE_INLINE struct passwd *
 ACE_OS::getpwnam (const char *name)
 {
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
-# if !defined (ACE_WIN32)
   return ::getpwnam (name);
 # else
   ACE_UNUSED_ARG (name);
   ACE_NOTSUP_RETURN (0);
-# endif /* ACE_WIN32 */
-#else
-  ACE_UNUSED_ARG (name);
-  ACE_NOTSUP_RETURN (0);
 #endif /* ACE_LACKS_PWD_FUNCTIONS */
 }
 
@@ -124,10 +111,6 @@ ACE_INLINE void
 ACE_OS::setpwent (void)
 {
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
-# if !defined (ACE_WIN32)
   ::setpwent ();
-# else
-# endif /* ACE_WIN32 */
-#else
 #endif /* ! ACE_LACKS_PWD_FUNCTIONS */
 }
diff --git a/ace/OS_NS_signal.h b/ace/OS_NS_signal.h
index ec622762cea..74351b3a192 100644
--- a/ace/OS_NS_signal.h
+++ b/ace/OS_NS_signal.h
@@ -19,7 +19,7 @@
 
 # include /**/ "ace/pre.h"
 
-# include "ace/config-all.h"
+# include "ace/config-lite.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
@@ -46,8 +46,6 @@
 # endif /* SIG_SETMASK */
 
 // Create some useful typedefs.
-// @todo: remove, not used  dhinton
-//typedef const char **SYS_SIGLIST;
 
 # if !defined (ACE_HAS_SIGINFO_T)
 struct ACE_Export siginfo_t
@@ -64,7 +62,7 @@ struct ACE_Export siginfo_t
 # endif /* ACE_HAS_SIGINFO_T */
 
 #if !defined (ACE_WIN32)
-extern "C" 
+extern "C"
 {
   typedef void (*ACE_SIGNAL_C_FUNC)(int, siginfo_t *, void *);
 }
diff --git a/ace/OS_NS_signal.inl b/ace/OS_NS_signal.inl
index e5fb4958df2..a2159ad2604 100644
--- a/ace/OS_NS_signal.inl
+++ b/ace/OS_NS_signal.inl
@@ -4,8 +4,10 @@
 #include "ace/OS_NS_macros.h"
 #include "ace/OS_NS_errno.h"
 
+namespace ACE_OS {
+
 ACE_INLINE int
-ACE_OS::kill (pid_t pid, int signum)
+kill (pid_t pid, int signum)
 {
   ACE_OS_TRACE ("ACE_OS::kill");
 #if defined (ACE_WIN32) || defined (CHORUS) || defined (ACE_PSOS)
@@ -18,7 +20,7 @@ ACE_OS::kill (pid_t pid, int signum)
 }
 
 ACE_INLINE int
-ACE_OS::pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp)
+pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp)
 {
 #if defined (ACE_HAS_PTHREADS_STD)  &&  !defined (ACE_LACKS_PTHREAD_SIGMASK)
   int result;
@@ -35,9 +37,7 @@ ACE_OS::pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp)
 }
 
 ACE_INLINE int
-ACE_OS::sigaction (int signum,
-                   const struct sigaction *nsa,
-                   struct sigaction *osa)
+sigaction (int signum, const struct sigaction *nsa, struct sigaction *osa)
 {
   ACE_OS_TRACE ("ACE_OS::sigaction");
   if (signum == 0)
@@ -72,7 +72,7 @@ ACE_OS::sigaction (int signum,
 }
 
 ACE_INLINE int
-ACE_OS::sigaddset (sigset_t *s, int signum)
+sigaddset (sigset_t *s, int signum)
 {
   ACE_OS_TRACE ("ACE_OS::sigaddset");
 #if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
@@ -103,7 +103,7 @@ ACE_OS::sigaddset (sigset_t *s, int signum)
 }
 
 ACE_INLINE int
-ACE_OS::sigdelset (sigset_t *s, int signum)
+sigdelset (sigset_t *s, int signum)
 {
 #if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
   if (s == 0)
@@ -133,7 +133,7 @@ ACE_OS::sigdelset (sigset_t *s, int signum)
 }
 
 ACE_INLINE int
-ACE_OS::sigemptyset (sigset_t *s)
+sigemptyset (sigset_t *s)
 {
 #if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
   if (s == 0)
@@ -154,7 +154,7 @@ ACE_OS::sigemptyset (sigset_t *s)
 }
 
 ACE_INLINE int
-ACE_OS::sigfillset (sigset_t *s)
+sigfillset (sigset_t *s)
 {
 #if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
   if (s == 0)
@@ -175,7 +175,7 @@ ACE_OS::sigfillset (sigset_t *s)
 }
 
 ACE_INLINE int
-ACE_OS::sigismember (sigset_t *s, int signum)
+sigismember (sigset_t *s, int signum)
 {
 #if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
   if (s == 0)
@@ -211,7 +211,7 @@ ACE_OS::sigismember (sigset_t *s, int signum)
 }
 
 ACE_INLINE ACE_SignalHandler
-ACE_OS::signal (int signum, ACE_SignalHandler func)
+signal (int signum, ACE_SignalHandler func)
 {
   if (signum == 0)
     return 0;
@@ -240,7 +240,7 @@ ACE_OS::signal (int signum, ACE_SignalHandler func)
 }
 
 ACE_INLINE int
-ACE_OS::sigprocmask (int how, const sigset_t *nsp, sigset_t *osp)
+sigprocmask (int how, const sigset_t *nsp, sigset_t *osp)
 {
 #if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
   ACE_UNUSED_ARG (how);
@@ -253,7 +253,7 @@ ACE_OS::sigprocmask (int how, const sigset_t *nsp, sigset_t *osp)
 }
 
 ACE_INLINE int
-ACE_OS::sigsuspend (const sigset_t *sigset)
+sigsuspend (const sigset_t *sigset)
 {
 #if defined (ACE_HAS_SIGSUSPEND)
   sigset_t s;
@@ -269,3 +269,5 @@ ACE_OS::sigsuspend (const sigset_t *sigset)
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_SIGSUSPEND */
 }
+
+}  /* end namespace ACE_OS */
diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp
index 10208d96a34..a2c965027d7 100644
--- a/ace/OS_NS_stdio.cpp
+++ b/ace/OS_NS_stdio.cpp
@@ -1,9 +1,12 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(ace, OS_NS_stdio, "$Id$")
+
+ACE_RCSID (ace,
+           OS_NS_stdio,
+           "$Id$")
+
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_stdio.inl"
@@ -131,9 +134,9 @@ ACE_OS::fopen (const char *filename,
       if (fd != -1)
         {
 #   if defined (__BORLANDC__) && !defined (ACE_USES_WCHAR)
-          FILE *fp = ::_fdopen (fd, ACE_const_cast (char *, mode));
+          FILE *fp = ::_fdopen (fd, const_cast<char *> (mode));
 #   elif defined (__BORLANDC__) && defined (ACE_USES_WCHAR)
-          FILE *fp = ::_wfdopen (fd, ACE_const_cast (wchar_t *, mode));
+          FILE *fp = ::_wfdopen (fd, const_cast<wchar_t *> (mode));
 #   elif defined (ACE_USES_WCHAR)
           FILE *fp = ::_wfdopen (fd, mode);
 #   else
@@ -146,7 +149,7 @@ ACE_OS::fopen (const char *filename,
 #   endif  // ACE_USES_WCHAR
             return fp;
           }
-          _close (fd);
+          ::_close (fd);
         }
 # endif  // ACE_HAS_WINCE
 
@@ -186,9 +189,9 @@ ACE_OS::fopen (const wchar_t *filename,
       if (fd != -1)
         {
 #   if defined (__BORLANDC__) && !defined (ACE_USES_WCHAR)
-          FILE *fp = ::_fdopen (fd, ACE_const_cast (char *, mode));
+          FILE *fp = ::_fdopen (fd, const_cast<char *> (mode));
 #   elif defined (__BORLANDC__) && defined (ACE_USES_WCHAR)
-          FILE *fp = ::_wfdopen (fd, ACE_const_cast (wchar_t *, mode));
+          FILE *fp = ::_wfdopen (fd, const_cast<wchar_t *> (mode));
 #   elif defined (ACE_USES_WCHAR)
           FILE *fp = ::_wfdopen (fd, mode);
 #   else
@@ -201,7 +204,7 @@ ACE_OS::fopen (const wchar_t *filename,
 #   endif  // ACE_USES_WCHAR
             return fp;
           }
-          _close (fd);
+          ::_close (fd);
         }
 # endif  // ACE_HAS_WINCE
 
@@ -248,45 +251,6 @@ ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...)
 }
 #endif /* ACE_HAS_WCHAR */
 
-char *
-ACE_OS::gets (char *str, int n)
-{
-  ACE_OS_TRACE ("ACE_OS::gets");
-  int c;
-  char *s = str;
-
-  if (str == 0 || n < 0) n = 0;
-  if (n == 0) str = 0;
-  else n--;
-
-#   if defined (DIGITAL_UNIX)
-  // On Tru64 getchar is a macro which calls fgetc, in that case we must explicit
-  // use the global namespace, because fgetc is also in the ACE_OS namespace
-  while ((c = ::getchar ()) != '\n')
-#   else
-  while ((c = getchar ()) != '\n')
-#   endif
-    {
-
-      if (c == EOF && errno == EINTR)
-        {
-#   if defined (ACE_HAS_SIGNAL_SAFE_OS_CALLS)
-          continue;
-#   else
-          break;
-#   endif /* ACE_HAS_SIGNAL_SAFE_OS_CALLS */
-        }
-
-      if (c == EOF)
-        break;
-
-      if (n > 0)
-        n--, *s++ = c;
-    }
-  if (s) *s = '\0';
-
-  return (c == EOF) ? 0 : str;
-}
 
 // The following *printf functions aren't inline because
 // they use varargs.
@@ -328,7 +292,7 @@ ACE_OS::snprintf (char *buf, size_t maxlen, const char *format, ...)
   // -1. This method follows the C99 standard, but needs to guess at the
   // value; uses maxlen + 1.
   if (result == -1)
-    result = ACE_static_cast (int, (maxlen + 1));
+    result = static_cast <int> (maxlen + 1);
   return result;
 
 #else
@@ -368,7 +332,7 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...)
   // -1. This method follows the C99 standard, but needs to guess at the
   // value; uses maxlen + 1.
   if (result == -1)
-    result = ACE_static_cast (int, (maxlen + 1));
+    result = static_cast <int> (maxlen + 1);
   return result;
 
 #else
@@ -399,7 +363,7 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
 {
   ACE_OS_TRACE ("ACE_OS::sprintf");
 
-# if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || (defined ACE_HAS_DINKUM_STL)
+# if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || (defined ACE_HAS_DINKUM_STL) || defined (__DMC__)
 
   // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a
   // maxlen argument. Since this method doesn't supply one, pass in
diff --git a/ace/OS_NS_stdio.h b/ace/OS_NS_stdio.h
index eb242cc7bda..a183126d63a 100644
--- a/ace/OS_NS_stdio.h
+++ b/ace/OS_NS_stdio.h
@@ -179,10 +179,10 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   char *fgets (char *buf, int size, FILE *fp);
 
-# if defined (ACE_HAS_WCHAR)
+# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FGETWS)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *fgets (wchar_t *buf, int size, FILE *fp);
-# endif /* ACE_HAS_WCHAR */
+# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */
 
   //@{ @name A set of wrappers for file locks.
 
@@ -302,11 +302,11 @@ namespace ACE_OS {
   int fputs (const char *s,
              FILE *stream);
 
-# if defined (ACE_HAS_WCHAR)
+# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FPUTWS)
   ACE_NAMESPACE_INLINE_FUNCTION
   int fputs (const wchar_t *s,
              FILE *stream);
-#endif /* ACE_HAS_WCHAR */
+# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t fread (void *ptr,
@@ -336,18 +336,6 @@ namespace ACE_OS {
                  size_t nitems,
                  FILE *fp);
 
-  // The old gets () which directly maps to the evil, unprotected
-  // gets () has been deprecated.  If you really need gets (),
-  // consider the following one.
-
-  // A better gets ().
-  //   If n == 0, input is swallowed, but NULL is returned.
-  //   Otherwise, reads up to n-1 bytes (not including the newline),
-  //              then swallows rest up to newline
-  //              then swallows newline
-  extern ACE_Export
-  char *gets (char *str, int n = 0);
-
   ACE_NAMESPACE_INLINE_FUNCTION
   void perror (const char *s);
 
diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl
index 958b4ca806b..421377fcbd0 100644
--- a/ace/OS_NS_stdio.inl
+++ b/ace/OS_NS_stdio.inl
@@ -709,14 +709,14 @@ ACE_OS::fgets (char *buf, int size, FILE *fp)
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgets (buf, size, fp), char *, 0);
 }
 
-#if defined (ACE_HAS_WCHAR)
+#if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FGETWS)
 ACE_INLINE wchar_t *
 ACE_OS::fgets (wchar_t *buf, int size, FILE *fp)
 {
   ACE_OS_TRACE ("ACE_OS::fgets");
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetws (buf, size, fp), wchar_t *, 0);
 }
-#endif /* ACE_HAS_WCHAR */
+#endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */
 
 #if !defined (ACE_WIN32)
 // Win32 implementation of fopen () is in OS_NS_stdio.cpp.
@@ -749,14 +749,14 @@ ACE_OS::fputs (const char *s, FILE *stream)
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputs (s, stream), int, -1);
 }
 
-#if defined (ACE_HAS_WCHAR)
+#if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FPUTWS)
 ACE_INLINE int
 ACE_OS::fputs (const wchar_t *s, FILE *stream)
 {
   ACE_OS_TRACE ("ACE_OS::fputs");
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputws (s, stream), int, -1);
 }
-#endif /* ACE_HAS_WCHAR */
+#endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */
 
 ACE_INLINE size_t
 ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp)
@@ -825,19 +825,6 @@ ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp)
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fwrite (ptr, size, nitems, fp), int, 0);
 }
 
-#if 0
-// @@ gets is evil anyway.
-//    and it is *** DEPRECATED *** now.  If you
-//    really needs gets, use ACE_OS::gets (char*, int)
-//    instead.
-ACE_INLINE char *
-ACE_OS::gets (char *str)
-{
-  ACE_OS_TRACE ("ACE_OS::gets");
-  ACE_OSCALL_RETURN (::gets (str), char *, 0);
-}
-#endif /* 0 */
-
 ACE_INLINE void
 ACE_OS::perror (const char *s)
 {
@@ -975,19 +962,19 @@ ACE_INLINE char *
 ACE_OS::tempnam (const char *dir, const char *pfx)
 {
   ACE_OS_TRACE ("ACE_OS::tempnam");
-#if defined (ACE_HAS_WINCE) || defined (ACE_LACKS_TEMPNAM)
+#if defined (ACE_LACKS_TEMPNAM)
   ACE_UNUSED_ARG (dir);
   ACE_UNUSED_ARG (pfx);
   ACE_NOTSUP_RETURN (0);
 #elif defined (ACE_PSOS)
   // pSOS only considers the directory prefix
   ACE_UNUSED_ARG (pfx);
-  ACE_OSCALL_RETURN (::tmpnam ((char *) dir), char *, 0);
-#elif (defined (ACE_WIN32) && ((defined (__BORLANDC__) && (__BORLANDC__ < 0x600))))
-  ACE_OSCALL_RETURN (::_tempnam ((char *) dir, (char *) pfx), char *, 0);
-#else /* ACE_HAS_WINCE || ACE_LACKS_TEMPNAM */
+  ACE_OSCALL_RETURN (::tmpnam (const_cast <char *> (dir)), char *, 0);
+#elif (defined (ACE_WIN32) && ((defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) || defined (__DMC__)))
+  ACE_OSCALL_RETURN (::_tempnam (const_cast <char *> (dir), const_cast<char *> (pfx)), char *, 0);
+#else /* ACE_LACKS_TEMPNAM */
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (dir, pfx), char *, 0);
-#endif /* VXWORKS */
+#endif /* ACE_LACKS_TEMPNAM */
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -995,17 +982,17 @@ ACE_INLINE wchar_t *
 ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
 {
   ACE_OS_TRACE ("ACE_OS::tempnam");
-#if defined (ACE_HAS_WINCE) || defined (ACE_LACKS_TEMPNAM)
+#if defined (ACE_LACKS_TEMPNAM)
   ACE_UNUSED_ARG (dir);
   ACE_UNUSED_ARG (pfx);
   ACE_NOTSUP_RETURN (0);
 #elif defined(ACE_WIN32)
-#  if defined (__BORLANDC__) && (__BORLANDC__ < 0x600)
-  ACE_OSCALL_RETURN (::_wtempnam ((wchar_t*) dir, (wchar_t*) pfx), wchar_t *, 0);
+#  if (defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) || defined (__DMC__)
+  ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *, 0);
 #  else
   ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0);
 #  endif /* __BORLANDC__ */
-#else /* ACE_HAS_WINCE || ACE_LACKS_TEMPNAM */
+#else /* ACE_LACKS_TEMPNAM */
   // No native wide-char support; convert to narrow and call the char* variant.
   char *ndir = ACE_Wide_To_Ascii (dir).char_rep ();
   char *npfx = ACE_Wide_To_Ascii (pfx).char_rep ();
@@ -1023,7 +1010,7 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
       ACE_OS::free (name);
     }
   return wname;
-#endif /* VXWORKS */
+#endif /* ACE_LACKS_TEMPNAM */
 }
 #endif /* ACE_HAS_WCHAR */
 
@@ -1039,11 +1026,12 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
 {
 # if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || \
      (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \
-     (defined (ACE_HAS_DINKUM_STL))
+     (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__))
 
   // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a
   // maxlen argument. Since this method doesn't supply one, pass in
-  // a length that works (ULONG_MAX doesn't). If this isn't ok, use
+  // a length that works (ULONG_MAX doesn't on all platform since some check
+  // to see if the operation will remain in bounds). If this isn't ok, use
   // ACE_OS::snprintf().
   return vswprintf (buffer, 4096, format, argptr);
 
diff --git a/ace/OS_NS_stdlib.cpp b/ace/OS_NS_stdlib.cpp
index 882057e6380..de0c9c305b0 100644
--- a/ace/OS_NS_stdlib.cpp
+++ b/ace/OS_NS_stdlib.cpp
@@ -1,9 +1,10 @@
-// -*- C++ -*-
 // $Id$
 
 #include "ace/OS_NS_stdlib.h"
 
-ACE_RCSID(ace, OS_NS_stdlib, "$Id$")
+ACE_RCSID (ace,
+           OS_NS_stdlib,
+           "$Id$")
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_stdlib.inl"
@@ -13,10 +14,21 @@ ACE_RCSID(ace, OS_NS_stdlib, "$Id$")
 
 #include "ace/OS_NS_unistd.h"
 
-#if defined (ACE_LACKS_MKTEMP) || defined (ACE_LACKS_REALPATH)
+#if defined (ACE_LACKS_MKTEMP) \
+    || defined (ACE_LACKS_MKSTEMP) \
+    || defined (ACE_LACKS_REALPATH)
 #  include "ace/OS_NS_stdio.h"
 #  include "ace/OS_NS_sys_stat.h"
-#endif /* ACE_LACKS_MKTEMP || ACE_LACKS_REALPATH */
+#endif /* ACE_LACKS_MKTEMP || ACE_LACKS_MKSTEMP || ACE_LACKS_REALPATH */
+
+#if defined (ACE_LACKS_MKSTEMP)
+# include "ace/OS_NS_fcntl.h"
+# include "ace/OS_NS_ctype.h"
+# include "ace/OS_NS_sys_time.h"
+# if !defined (ACE_HAS_WINCE) && !defined (ACE_VXWORKS)
+#  include /**/ <limits>
+# endif
+#endif  /* ACE_LACKS_MKSTEMP */
 
 ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0;
 
@@ -262,10 +274,10 @@ ACE_OS::realloc (void *ptr, size_t nbytes)
 #if defined (ACE_LACKS_REALPATH) && !defined (ACE_HAS_WINCE)
 char *
 ACE_OS::realpath (const char *file_name,
-		  char *resolved_name)
+                  char *resolved_name)
 {
   ACE_OS_TRACE ("ACE_OS::realpath");
-  
+
   if (file_name == 0)
     {
       // Single Unix Specification V3:
@@ -366,6 +378,7 @@ ACE_OS::realpath (const char *file_name,
             while (*--dest != '/')
               ;
         }
+#  if !defined (ACE_LACKS_SYMLINKS)
       else
         {
           ACE_stat st;
@@ -378,49 +391,50 @@ ACE_OS::realpath (const char *file_name,
                 return 0;
             }
 
-	  // Check if current path is a link
-	  if (S_ISLNK (st.st_mode))
-	    {
-	      if (++nlinks > MAXSYMLINKS)
-          {
-            errno = ELOOP;
-            if (resolved_name == 0)
-              ACE_OS::free (rpath);
-            return 0;
-          }
+          // Check if current path is a link
+          if (S_ISLNK (st.st_mode))
+            {
+              if (++nlinks > MAXSYMLINKS)
+                {
+                  errno = ELOOP;
+                  if (resolved_name == 0)
+                    ACE_OS::free (rpath);
+                  return 0;
+                }
 
-	      char link_buf[PATH_MAX];
+              char link_buf[PATH_MAX];
 
-	      int link_len = ACE_OS::readlink (rpath, link_buf, PATH_MAX);
-	      int tail_len = ACE_OS::strlen (file_name) + 1;
+              int link_len = ACE_OS::readlink (rpath, link_buf, PATH_MAX);
+              int tail_len = ACE_OS::strlen (file_name) + 1;
 
-	      // Check if there is room to expand link?
-	      if (link_len + tail_len > PATH_MAX)
-          {
-            errno = ENAMETOOLONG;
-            if (resolved_name == 0)
-              ACE_OS::free (rpath);
-            return 0;
-          }
-
-	      // Move tail and prefix it with expanded link
-	      ACE_OS::memmove (expand_buf + link_len, file_name, tail_len);
-	      ACE_OS::memcpy (expand_buf, link_buf, link_len);
-
-	      if (*link_buf == '/') // Absolute link?
-          {
-            dest = rpath;
-          }
-	      else // Relative link, remove expanded link component
-          {
-            --dest;
-            while (*--dest != '/')
-              ;
-          }
-	      file_name = expand_buf; // Source path is now in expand_buf
-	    }
+              // Check if there is room to expand link?
+              if (link_len + tail_len > PATH_MAX)
+                {
+                  errno = ENAMETOOLONG;
+                  if (resolved_name == 0)
+                    ACE_OS::free (rpath);
+                  return 0;
+                }
+
+              // Move tail and prefix it with expanded link
+              ACE_OS::memmove (expand_buf + link_len, file_name, tail_len);
+              ACE_OS::memcpy (expand_buf, link_buf, link_len);
+
+              if (*link_buf == '/') // Absolute link?
+                {
+                  dest = rpath;
+                }
+              else // Relative link, remove expanded link component
+                {
+                  --dest;
+                  while (*--dest != '/')
+                    ;
+                }
+              file_name = expand_buf; // Source path is now in expand_buf
+            }
+        }
+#  endif /* ACE_LACKS_SYMLINKS */
     }
-  }
 
   *dest = '\0';
 
@@ -576,3 +590,98 @@ ACE_OS::strtoul_emulation (const char *nptr,
 }
 #endif /* ACE_LACKS_STRTOUL */
 
+
+#if defined (ACE_LACKS_MKSTEMP)
+ACE_HANDLE
+ACE_OS::mkstemp_emulation (ACE_TCHAR * s)
+{
+  if (s == 0)
+    {
+      errno = EINVAL;
+      return ACE_INVALID_HANDLE;
+    }
+
+  // The "XXXXXX" template to be filled in.
+  ACE_TCHAR * const t  = ACE_OS::strstr (s, ACE_TEXT ("XXXXXX"));
+
+  if (t == 0)
+    {
+      errno = EINVAL;
+      return ACE_INVALID_HANDLE;
+    }
+
+  static unsigned int const NUM_RETRIES = 50;
+  static unsigned int const NUM_CHARS   = 6;  // Do not change!
+
+  ACE_RANDR_TYPE seed =
+    static_cast<ACE_RANDR_TYPE> (ACE_OS::gettimeofday ().msec ());
+
+  // We only care about UTF-8 / ASCII characters in generated
+  // filenames.  A UTF-16 or UTF-32 character could potentially cause
+  // a very large space to be searched in the below do/while() loop,
+  // greatly slowing down this mkstemp() implementation.  It is more
+  // practical to limit the search space to UTF-8 / ASCII characters
+  // (i.e. 127 characters).
+#  if defined (ACE_HAS_WINCE) || defined (ACE_VXWORKS) || defined (max)
+  static float const MAX_VAL = static_cast<float> (127);
+#else
+  static float const MAX_VAL =
+    static_cast<float> (std::numeric_limits<char>::max ());
+#endif /* ACE_HAS_WINCE */
+
+  // Use high-order bits rather than low-order ones (e.g. rand() %
+  // MAX_VAL).  See Numerical Recipes in C: The Art of Scientific
+  // Computing (William  H. Press, Brian P. Flannery, Saul
+  // A. Teukolsky, William T. Vetterling; New York: Cambridge
+  // University Press, 1992 (2nd ed., p. 277).
+  //
+  // e.g.: MAX_VAL * rand() / (RAND_MAX + 1.0)
+
+  // Factor out the constant coefficient.
+  static float const coefficient =
+    static_cast<float> (MAX_VAL / (RAND_MAX + 1.0f));
+
+  // @@ These nested loops may be ineffecient.  Improvements are
+  //    welcome.
+  for (unsigned int i = 0; i < NUM_RETRIES; ++i)
+    {
+      for (unsigned int n = 0; n < NUM_CHARS; ++n)
+        {
+          ACE_TCHAR r;
+
+          // This do/while() loop allows this alphanumeric character
+          // selection to work for EBCDIC, as well.
+          do
+            {
+              r =
+                static_cast<ACE_TCHAR> (coefficient * ACE_OS::rand_r (seed));
+            }
+          while (!ACE_OS::ace_isalnum (r));
+
+          t[n] = r;
+        }
+
+      static int const perms =
+#if defined (ACE_WIN32)
+        0;      /* Do not share while open. */
+#else
+        0600;   /* S_IRUSR | S_IWUSR */
+#endif  /* ACE_WIN32 */
+
+      // Create the file with the O_EXCL bit set to ensure that we're
+      // not subject to a symbolic link attack.
+      //
+      // Note that O_EXCL is subject to a race condition over NFS
+      // filesystems.
+      ACE_HANDLE const handle = ACE_OS::open (s,
+                                              O_RDWR | O_CREAT | O_EXCL,
+                                              perms);
+
+      if (handle != ACE_INVALID_HANDLE)
+        return handle;
+    }
+
+  errno = EEXIST;  // Couldn't create a unique temporary file.
+  return ACE_INVALID_HANDLE;
+}
+#endif /* ACE_LACKS_MKSTEMP */
diff --git a/ace/OS_NS_stdlib.h b/ace/OS_NS_stdlib.h
index 85b4f468e49..38fcd9e9187 100644
--- a/ace/OS_NS_stdlib.h
+++ b/ace/OS_NS_stdlib.h
@@ -144,27 +144,30 @@ namespace ACE_OS {
   extern ACE_Export
   void *malloc (size_t);
 
-#if !defined (ACE_LACKS_MKSTEMP)
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_HANDLE mkstemp (char *t);
+  ACE_HANDLE mkstemp (char *s);
 
 #  if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_HANDLE mkstemp (wchar_t *t);
+  ACE_HANDLE mkstemp (wchar_t *s);
 #  endif /* ACE_HAS_WCHAR */
-#endif /* !ACE_LACKS_MKSTEMP */
+
+#if defined (ACE_LACKS_MKSTEMP)
+  extern ACE_Export
+  ACE_HANDLE mkstemp_emulation (ACE_TCHAR * s);
+#endif /* ACE_LACKS_MKSTEMP */
 
 #if !defined (ACE_LACKS_MKTEMP)
   ACE_NAMESPACE_INLINE_FUNCTION
-  char *mktemp (char *t);
+  char *mktemp (char *s);
 
 #  if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *mktemp (wchar_t *t);
+  wchar_t *mktemp (wchar_t *s);
 #  endif /* ACE_HAS_WCHAR */
 #else
   extern ACE_Export
-  ACE_TCHAR *mktemp (ACE_TCHAR *t);
+  ACE_TCHAR *mktemp (ACE_TCHAR *s);
 #endif /* !ACE_LACKS_MSTEMP */
 
   ACE_NAMESPACE_INLINE_FUNCTION
diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl
index 0f067ccbe5b..ce524255e41 100644
--- a/ace/OS_NS_stdlib.inl
+++ b/ace/OS_NS_stdlib.inl
@@ -174,22 +174,27 @@ ACE_OS::itoa (int value, wchar_t *string, int radix)
 }
 #endif /* ACE_HAS_WCHAR */
 
-#if !defined (ACE_LACKS_MKSTEMP)
 ACE_INLINE ACE_HANDLE
 ACE_OS::mkstemp (char *s)
 {
+#if !defined (ACE_LACKS_MKSTEMP)
   return ::mkstemp (s);
+#else
+  return ACE_OS::mkstemp_emulation (ACE_TEXT_CHAR_TO_TCHAR (s));
+#endif  /* !ACE_LACKS_MKSTEMP */
 }
 
-#  if defined (ACE_HAS_WCHAR)
+#if defined (ACE_HAS_WCHAR)
 ACE_INLINE ACE_HANDLE
 ACE_OS::mkstemp (wchar_t *s)
 {
-  ACE_Wide_To_Ascii narrow_s (s);
-  return ::mkstemp (narrow_s.char_rep ());
+#  if !defined (ACE_LACKS_MKSTEMP)
+  return ::mkstemp (ACE_TEXT_WCHAR_TO_TCHAR (ACE_TEXT_ALWAYS_CHAR (s)));
+#  else
+  return ACE_OS::mkstemp_emulation (ACE_TEXT_WCHAR_TO_TCHAR (s));
+#  endif  /* !ACE_LACKS_MKSTEMP */
 }
-#  endif /* ACE_HAS_WCHAR */
-#endif /* !ACE_LACKS_MKSTEMP */
+#endif /* ACE_HAS_WCHAR */
 
 #if !defined (ACE_LACKS_MKTEMP)
 ACE_INLINE char *
@@ -242,8 +247,7 @@ ACE_OS::putenv (const char *string)
   ACE_UNUSED_ARG (string);
   ACE_NOTSUP_RETURN (0);
 #else /* ! ACE_HAS_WINCE && ! ACE_PSOS */
-  // VxWorks declares ::putenv with a non-const arg.
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::putenv ((char *) string), int, -1);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::putenv (const_cast <char *> (string)), int, -1);
 #endif /* ACE_HAS_WINCE */
 }
 
@@ -337,7 +341,7 @@ ACE_OS::rand_r (ACE_RANDR_TYPE& seed)
 #  if !defined (ACE_LACKS_REALPATH)
 ACE_INLINE char *
 ACE_OS::realpath (const char *file_name,
-		  char *resolved_name)
+                  char *resolved_name)
 {
 #    if defined (ACE_WIN32)
   return ::_fullpath (resolved_name, file_name, PATH_MAX);
@@ -350,7 +354,7 @@ ACE_OS::realpath (const char *file_name,
 #  if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::realpath (const wchar_t *file_name,
-		  wchar_t *resolved_name)
+                  wchar_t *resolved_name)
 {
 #    if defined (ACE_WIN32)
   return ::_wfullpath (resolved_name, file_name, PATH_MAX);
diff --git a/ace/OS_NS_string.cpp b/ace/OS_NS_string.cpp
index 02226349e5e..608ce8cb2f7 100644
--- a/ace/OS_NS_string.cpp
+++ b/ace/OS_NS_string.cpp
@@ -41,53 +41,6 @@ ACE_OS::memchr_emulation (const void *s, int c, size_t len)
 }
 #endif /*ACE_HAS_MEMCHR*/
 
-#if defined (ACE_LACKS_STRCHR)
-char *
-ACE_OS::strchr_emulation (char *s, int c)
-{
-  for (;;++s)
-    {
-      if (*s == c)
-        return s;
-      if (*s == 0)
-        return 0;
-    }
-}
-
-const char *
-ACE_OS::strchr_emulation (const char *s, int c)
-{
-  for (;;++s)
-    {
-      if (*s == c)
-        return s;
-      if (*s == 0)
-        return 0;
-    }
-}
-#endif /* ACE_LACKS_STRCHR */
-
-#if defined (ACE_LACKS_STRCSPN)
-size_t
-ACE_OS::strcspn_emulation (const char *s, const char *reject)
-{
-  const char *scan;
-  const char *rej_scan;
-  int count = 0;
-
-  for (scan = s; *scan; ++scan)
-    {
-      for (rej_scan = reject; *rej_scan; ++rej_scan)
-        if (*scan == *rej_scan)
-          return count;
-
-      ++count;
-    }
-
-  return count;
-}
-#endif /* ACE_LACKS_STRCSPN */
-
 char *
 ACE_OS::strdup (const char *s)
 {
diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h
index a1bca281806..2f357ce7ab5 100644
--- a/ace/OS_NS_string.h
+++ b/ace/OS_NS_string.h
@@ -112,18 +112,6 @@ namespace ACE_OS {
   wchar_t *strchr (wchar_t *s, wint_t c);
 #endif /* ACE_HAS_WCHAR */
 
-#if defined (ACE_LACKS_STRCHR)
-  /// Emulated strchr (char version) - Finds the first occurance of a
-  /// character in a string.
-  extern ACE_Export
-  char *strchr_emulation (char *s, int c);
-
-  /// Emulated strchr (const char version) - Finds the first occurance of a
-  /// character in a string.
-  extern ACE_Export
-  const char *strchr_emulation (const char *s, int c);
-#endif /* ACE_LACKS_STRCHR */
-
   /// Compares two strings (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   int strcmp (const char *s, const char *t);
@@ -154,12 +142,6 @@ namespace ACE_OS {
   size_t strcspn (const wchar_t *s, const wchar_t *reject);
 #endif /* ACE_HAS_WCHAR */
 
-#if defined (ACE_LACKS_STRCSPN)
-  /// Emulated strcspn - Finds a substring in a string.
-  extern ACE_Export
-  size_t strcspn_emulation (const char *s, const char *reject);
-#endif /* ACE_LACKS_STRCSPN */
-
   /// Returns a malloced duplicated string (char version).
   extern ACE_Export
   char *strdup (const char *s);
@@ -352,9 +334,9 @@ namespace ACE_OS {
    * Unlike strncpy() this function will always add a terminating '\0'
    * char if maxlen > 0.  So the user doesn't has to provide an extra
    * '\0' if the user wants a '\0' terminated dst.  The function
-   * doesn't check for a 0 <dst>, because this will give problems
-   * anyway.  When <src> is 0 an empty string is made.  We do not
-   * "touch" *<dst> if maxlen is 0.  Returns <dst>.  Care should be
+   * doesn't check for a 0 @a dst, because this will give problems
+   * anyway.  When @a src is 0 an empty string is made.  We do not
+   * "touch" * @a dst if maxlen is 0.  Returns @a dst.  Care should be
    * taken when replacing strncpy() calls, because in some cases a
    * strncpy() user is using the "not '\0' terminating" feature from
    * strncpy().  This happens most when the call to strncpy() was
@@ -373,9 +355,9 @@ namespace ACE_OS {
    * Unlike strncpy() this function will always add a terminating '\0'
    * char if maxlen > 0.  So the user doesn't has to provide an extra
    * '\0' if the user wants a '\0' terminated dst.  The function
-   * doesn't check for a 0 <dst>, because this will give problems
-   * anyway.  When <src> is 0 an empty string is made.  We do not
-   * "touch" *<dst> if maxlen is 0.  Returns <dst>.  Care should be
+   * doesn't check for a 0 @a dst, because this will give problems
+   * anyway.  When @a src is 0 an empty string is made.  We do not
+   * "touch" * @a dst if maxlen is 0.  Returns @a dst.  Care should be
    * taken when replacing strncpy() calls, because in some cases a
    * strncpy() user is using the "not '\0' terminating" feature from
    * strncpy().  This happens most when the call to strncpy() was
@@ -456,13 +438,13 @@ namespace ACE_OS {
   /// Emulated strtok_r.
   extern ACE_Export
   char *strtok_r_emulation (char *s, const char *tokens, char **lasts);
+#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
 
-# if defined (ACE_HAS_WCHAR)
+# if defined (ACE_HAS_WCHAR) && defined(ACE_LACKS_WCSTOK)
   /// Emulated strtok_r (wchar_t version).
   extern ACE_Export
   wchar_t *strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts);
-# endif  // ACE_HAS_WCHAR
-#endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
+# endif  // ACE_HAS_WCHAR && ACE_LACKS_WCSTOK
 
 } /* namespace ACE_OS */
 
diff --git a/ace/OS_NS_string.inl b/ace/OS_NS_string.inl
index cb3ee4ec3c6..05e1faeae4c 100644
--- a/ace/OS_NS_string.inl
+++ b/ace/OS_NS_string.inl
@@ -93,11 +93,7 @@ ACE_OS::strchr (const wchar_t *s, wint_t c)
 ACE_INLINE char *
 ACE_OS::strchr (char *s, int c)
 {
-#if defined (ACE_LACKS_STRCHR)
-  return ACE_OS::strchr_emulation (s, c);
-#else  /* ! ACE_LACKS_STRCHR */
   return ::strchr (s, c);
-#endif /* ACE_LACKS_STRCHR */
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -147,11 +143,7 @@ ACE_OS::strcpy (wchar_t *s, const wchar_t *t)
 ACE_INLINE size_t
 ACE_OS::strcspn (const char *s, const char *reject)
 {
-#if defined (ACE_LACKS_STRCSPN)
-  return ACE_OS::strcspn_emulation (s, reject);
-#else  /* ACE_LACKS_STRCSPN */
   return ::strcspn (s, reject);
-#endif /* ACE_LACKS_STRCSPN */
 }
 
 #if defined (ACE_HAS_WCHAR)
diff --git a/ace/OS_NS_stropts.cpp b/ace/OS_NS_stropts.cpp
index f8fe0b4ad7a..a8f4710a1f7 100644
--- a/ace/OS_NS_stropts.cpp
+++ b/ace/OS_NS_stropts.cpp
@@ -120,8 +120,7 @@ ACE_OS::ioctl (ACE_HANDLE socket,
                                         char [dwBufferLen],
                                         -1);
 
-        QOS *qos = ACE_reinterpret_cast (QOS*,
-                                                                         qos_buf);
+        QOS *qos = reinterpret_cast<QOS*> (qos_buf);
 
         result = ::WSAIoctl ((ACE_SOCKET) socket,
                                    io_control_code,
diff --git a/ace/OS_NS_stropts.inl b/ace/OS_NS_stropts.inl
index 6b963ec6e63..38663c67cba 100644
--- a/ace/OS_NS_stropts.inl
+++ b/ace/OS_NS_stropts.inl
@@ -110,7 +110,7 @@ ACE_OS::ioctl (ACE_HANDLE handle,
 
 #if defined (ACE_WIN32)
   ACE_SOCKET sock = (ACE_SOCKET) handle;
-  ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, (unsigned long *) val), int, -1);
+  ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, reinterpret_cast<unsigned long *> (val)), int, -1);
 #elif defined (VXWORKS)
   ACE_OSCALL_RETURN (::ioctl (handle, cmd, reinterpret_cast<int> (val)),
                      int, -1);
diff --git a/ace/OS_NS_sys_mman.h b/ace/OS_NS_sys_mman.h
index bf0462afa26..1ce8939525f 100644
--- a/ace/OS_NS_sys_mman.h
+++ b/ace/OS_NS_sys_mman.h
@@ -27,6 +27,7 @@
 
 #include "ace/Global_Macros.h"
 #include "ace/os_include/sys/os_types.h"
+#include "ace/os_include/sys/os_mman.h"
 #include "ace/ACE_export.h"
 
 #if defined (ACE_EXPORT_MACRO)
diff --git a/ace/OS_NS_sys_mman.inl b/ace/OS_NS_sys_mman.inl
index f4f5987d0a8..e2a911c3bab 100644
--- a/ace/OS_NS_sys_mman.inl
+++ b/ace/OS_NS_sys_mman.inl
@@ -6,7 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_macros.h"
 #include "ace/OS_NS_errno.h"
-#include "ace/os_include/sys/os_mman.h"
 
 #if defined (__Lynx__)
 #  include "ace/OS_NS_sys_stat.h"
@@ -160,8 +159,8 @@ ACE_OS::mmap (void *addr,
     ACE_FAIL_RETURN (MAP_FAILED);
   else
     return addr_mapping;
-#elif defined (__Lynx__)
-  // The LynxOS 2.5.0 mmap doesn't allow operations on plain
+#elif defined (ACE_HAS_LYNXOS_BROKEN_MMAP)
+  // The LynxOS mmap doesn't allow operations on plain
   // file descriptors.  So, create a shm object and use that.
   ACE_UNUSED_ARG (sa);
 
diff --git a/ace/OS_NS_sys_select.inl b/ace/OS_NS_sys_select.inl
index b4b3efa117a..a46dc4bc800 100644
--- a/ace/OS_NS_sys_select.inl
+++ b/ace/OS_NS_sys_select.inl
@@ -28,12 +28,21 @@ ACE_OS::select (int width,
 #else
   const timeval *timep = (timeout == 0 ? (const timeval *)0 : *timeout);
 #endif /* ACE_HAS_NONCONST_SELECT_TIMEVAL */
+#if defined(ACE_TANDEM_T1248_PTHREADS)
+  ACE_SOCKCALL_RETURN (::spt_select (width,
+                                 (ACE_FD_SET_TYPE *) rfds,
+                                 (ACE_FD_SET_TYPE *) wfds,
+                                 (ACE_FD_SET_TYPE *) efds,
+                                 timep),
+                       int, -1);
+#else
   ACE_SOCKCALL_RETURN (::select (width,
                                  (ACE_FD_SET_TYPE *) rfds,
                                  (ACE_FD_SET_TYPE *) wfds,
                                  (ACE_FD_SET_TYPE *) efds,
                                  timep),
                        int, -1);
+#endif
 }
 
 ACE_INLINE int
@@ -49,12 +58,21 @@ ACE_OS::select (int width,
 # define ___ACE_TIMEOUT timep
   const timeval *timep = timeout;
 #endif /* ACE_HAS_NONCONST_SELECT_TIMEVAL */
+#if defined(ACE_TANDEM_T1248_PTHREADS)
+  ACE_SOCKCALL_RETURN (::spt_select (width,
+                                 (ACE_FD_SET_TYPE *) rfds,
+                                 (ACE_FD_SET_TYPE *) wfds,
+                                 (ACE_FD_SET_TYPE *) efds,
+                                 ___ACE_TIMEOUT),
+                       int, -1);
+#else
   ACE_SOCKCALL_RETURN (::select (width,
                                  (ACE_FD_SET_TYPE *) rfds,
                                  (ACE_FD_SET_TYPE *) wfds,
                                  (ACE_FD_SET_TYPE *) efds,
                                  ___ACE_TIMEOUT),
                        int, -1);
+#endif
 #undef ___ACE_TIMEOUT
 }
 
diff --git a/ace/OS_NS_sys_shm.cpp b/ace/OS_NS_sys_shm.cpp
index 33474349f7f..5feb509e5db 100644
--- a/ace/OS_NS_sys_shm.cpp
+++ b/ace/OS_NS_sys_shm.cpp
@@ -9,9 +9,3 @@ ACE_RCSID(ace, OS_NS_sys_shm, "$Id$")
 # include "ace/OS_NS_sys_shm.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
-// these don't appear to be used anywhere. dhinton
-#if defined(INTEGRITY) && defined(ACE_HAS_SHM_OPEN)
-char* shm_area_name = "ACE_Area";
-char* shm_area_password = "******";
-#endif
-
diff --git a/ace/OS_NS_sys_socket.cpp b/ace/OS_NS_sys_socket.cpp
index 1eb0500ad5f..cd4ae2d469f 100644
--- a/ace/OS_NS_sys_socket.cpp
+++ b/ace/OS_NS_sys_socket.cpp
@@ -55,7 +55,7 @@ ACE_OS::connect (ACE_HANDLE handle,
 # else
   ACE_UNUSED_ARG (qos_params);
   return ACE_OS::connect (handle,
-                          (sockaddr *) addr,
+                          const_cast <sockaddr *> (addr),
                           addrlen);
 # endif /* ACE_HAS_WINSOCK2 */
 }
diff --git a/ace/OS_NS_sys_socket.inl b/ace/OS_NS_sys_socket.inl
index 3d3f9fbd199..5e39f4f2f85 100644
--- a/ace/OS_NS_sys_socket.inl
+++ b/ace/OS_NS_sys_socket.inl
@@ -8,6 +8,12 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_QoS.h"
 #include "ace/Global_Macros.h"
+#include "ace/os_include/netinet/os_in.h"
+
+#if defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) \
+         && (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO == 1)
+#include "ace/OS_NS_string.h"
+#endif
 
 #if defined (ACE_HAS_VOIDPTR_SOCKOPT)
 typedef void *ACE_SOCKOPT_TYPE1;
@@ -177,17 +183,59 @@ ACE_OS::getpeername (ACE_HANDLE handle, struct sockaddr *addr,
                      int *addrlen)
 {
   ACE_OS_TRACE ("ACE_OS::getpeername");
-#if defined (ACE_PSOS) && !defined ACE_PSOS_DIAB_PPC
+
+#if defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) \
+         && (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO == 1)
+  int result;
+#  if defined (ACE_PSOS) && !defined ACE_PSOS_DIAB_PPC
+  ACE_SOCKCALL (::getpeername ((ACE_SOCKET) handle,
+                               (struct sockaddr_in *) addr,
+                               (ACE_SOCKET_LEN *) addrlen),
+                int,
+                -1,
+                result);
+#  else
+  ACE_SOCKCALL (::getpeername ((ACE_SOCKET) handle,
+                               addr,
+                               (ACE_SOCKET_LEN *) addrlen),
+               int,
+                -1,
+                result);
+#  endif /* defined (ACE_PSOS) */
+
+  // Some platforms, like older versions of the Linux kernel, do not
+  // initialize the sin_zero field since that field is generally only
+  // used for padding/alignment purposes.  On those platforms
+  // memcmp()-based comparisons of the sockaddr_in structure, such as
+  // the one in the ACE_INET_Addr equality operator, may fail due to
+  // random bytes in the sin_zero field even though that field is
+  // unused.  Prevent equality comparison of two different sockaddr_in
+  // instances that refer to the same socket from failing by
+  // explicitly initializing the sockaddr_in::sin_zero field to a
+  // consistent value, e.g. zero.
+  if (result != -1 && addr->sa_family == AF_INET)
+    {
+      ACE_OS::memset (reinterpret_cast<struct sockaddr_in *> (addr)->sin_zero,
+                      0,
+                      sizeof (reinterpret_cast<struct sockaddr_in *> (addr)->sin_zero));
+    }
+
+  return result;
+#else
+#  if defined (ACE_PSOS) && !defined ACE_PSOS_DIAB_PPC
   ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle,
                                       (struct sockaddr_in *) addr,
                                       (ACE_SOCKET_LEN *) addrlen),
-                       int, -1);
-#else
+                       int,
+                       -1);
+#  else
   ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle,
                                       addr,
                                       (ACE_SOCKET_LEN *) addrlen),
-                       int, -1);
-#endif /* defined (ACE_PSOS) */
+                       int,
+                       -1);
+#  endif /* defined (ACE_PSOS) */
+#endif /* ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO */
 }
 
 ACE_INLINE int
@@ -196,17 +244,54 @@ ACE_OS::getsockname (ACE_HANDLE handle,
                      int *addrlen)
 {
   ACE_OS_TRACE ("ACE_OS::getsockname");
-#if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
+#if defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) \
+         && (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO == 1)
+  int result;
+#  if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
+  ACE_SOCKCALL (::getsockname ((ACE_SOCKET) handle,
+                               (struct sockaddr_in *) addr,
+                               (ACE_SOCKET_LEN *) addrlen),
+                int,
+                -1,
+                result);
+#  else
+  ACE_SOCKCALL (::getsockname ((ACE_SOCKET) handle,
+                               addr,
+                               (ACE_SOCKET_LEN *) addrlen),
+               int, -1, result);
+#  endif /* defined (ACE_PSOS) */
+
+  // Some platforms, like older versions of the Linux kernel, do not
+  // initialize the sin_zero field since that field is generally only
+  // used for padding/alignment purposes.  On those platforms
+  // memcmp()-based comparisons of the sockaddr_in structure, such as
+  // the one in the ACE_INET_Addr equality operator, may fail due to
+  // random bytes in the sin_zero field even though that field is
+  // unused.  Prevent equality comparison of two different sockaddr_in
+  // instances that refer to the same socket from failing by
+  // explicitly initializing the sockaddr_in::sin_zero field to a
+  // consistent value, e.g. zero.
+  if (result != -1 && addr->sa_family == AF_INET)
+    {
+      ACE_OS::memset (reinterpret_cast<struct sockaddr_in *> (addr)->sin_zero,
+                      0,
+                      sizeof (reinterpret_cast<struct sockaddr_in *> (addr)->sin_zero));
+    }
+
+  return result;
+#else
+#  if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
   ACE_SOCKCALL_RETURN (::getsockname ((ACE_SOCKET) handle,
                                       (struct sockaddr_in *) addr,
                                       (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
-#else
+#  else
   ACE_SOCKCALL_RETURN (::getsockname ((ACE_SOCKET) handle,
                                       addr,
                                       (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
-#endif /* defined (ACE_PSOS) */
+#  endif /* defined (ACE_PSOS) */
+#endif /* ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO */
 }
 
 ACE_INLINE int
@@ -479,11 +564,11 @@ ACE_OS::send (ACE_HANDLE handle, const char *buf, size_t len, int flags)
                                flags), int, -1);
 #else
   int ace_result_;
-#  if defined (VXWORKS) || defined (HPUX) || defined (ACE_PSOS)
-  ace_result_ = ::send ((ACE_SOCKET) handle, (char *) buf, len, flags);
+#  if defined (ACE_PSOS)
+  ace_result_ = ::send ((ACE_SOCKET) handle, const_cast <char *> (buf), len, flags);
 #  else
   ace_result_ = ::send ((ACE_SOCKET) handle, buf, len, flags);
-#  endif /* VXWORKS */
+#  endif /* ACE_PSOS */
 
 # if !(defined (EAGAIN) && defined (EWOULDBLOCK) && EAGAIN == EWOULDBLOCK)
   // Optimize this code out if we can detect that EAGAIN ==
@@ -532,9 +617,9 @@ ACE_OS::sendmsg (ACE_HANDLE handle,
   else
     return (ssize_t) bytes_sent;
 # elif defined (ACE_HAS_NONCONST_SENDMSG)
-  ACE_SOCKCALL_RETURN (::sendmsg (handle, 
-				  const_cast<struct msghdr *>(msg), 
-				  flags), int, -1);
+  ACE_SOCKCALL_RETURN (::sendmsg (handle,
+                                  const_cast<struct msghdr *>(msg),
+                                  flags), int, -1);
 # else
   ACE_SOCKCALL_RETURN (::sendmsg (handle, msg, flags), int, -1);
 # endif
@@ -557,7 +642,8 @@ ACE_OS::sendto (ACE_HANDLE handle,
 {
   ACE_OS_TRACE ("ACE_OS::sendto");
 #if defined (VXWORKS)
-  ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle, (char *) buf,
+  ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle,
+                                 const_cast <char *> (buf),
                                  len,
                                  flags,
                                  const_cast<struct sockaddr *> (addr),
@@ -633,8 +719,8 @@ ACE_OS::sendto (ACE_HANDLE handle,
   for (int i = 0; i < buffer_count; ++i)
     {
        result = ACE_OS::sendto (handle,
-                                reinterpret_cast<char *ACE_CAST_CONST> (
-                                                      buffers[i].iov_base),
+                                reinterpret_cast<char *> (
+                                                 buffers[i].iov_base),
                                 buffers[i].iov_len,
                                 flags,
                                 addr,
@@ -709,6 +795,29 @@ ACE_OS::sendv (ACE_HANDLE handle,
 
   return (ssize_t) bytes_sent;
 
+#elif defined (ACE_HAS_SOCK_BUF_SIZE_MAX)
+
+  // Platform limits the maximum socket message size.  Pare down the
+  // iovec, if necessary, to obey the limit.
+  iovec local_iov[ACE_IOV_MAX];
+  long total = 0;
+  long new_total;
+  for (int i = 0; i < n; i++)
+    {
+      local_iov[i].iov_base = buffers[i].iov_base;
+      local_iov[i].iov_len  = buffers[i].iov_len;
+
+      new_total = total + buffers[i].iov_len;
+      if ( new_total >= SSIZE_MAX )
+        {
+          local_iov[i].iov_len = SSIZE_MAX - total;
+          n = i+1;
+          break;
+        }
+      total = new_total;
+    }
+  return ACE_OS::writev (handle, local_iov, n);
+
 #else
   return ACE_OS::writev (handle, buffers, n);
 #endif /* ACE_HAS_WINSOCK2 */
@@ -726,12 +835,14 @@ ACE_OS::setsockopt (ACE_HANDLE handle,
   #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && defined(SO_REUSEPORT)
   // To work around an inconsistency with Microsofts implementation of
   // sockets, we will check for SO_REUSEADDR, and ignore it. Winsock
-  // always behaves as if SO_REUSEADDR=1. Some implementations have the
-  // same behaviour as Winsock, but use a new name for it. SO_REUSEPORT.
-  // If you want the normal behaviour for SO_REUSEADDR=0, then NT 4 sp4 and later
-  // supports SO_EXCLUSIVEADDRUSE. This also requires using an updated Platform SDK
-  // so it was decided to ignore the option for now. (Especially since ACE always
-  // sets SO_REUSEADDR=1, which we can mimic by doing nothing.)
+  // always behaves as if SO_REUSEADDR=1. Some implementations have
+  // the same behaviour as Winsock, but use a new name for
+  // it. SO_REUSEPORT.  If you want the normal behaviour for
+  // SO_REUSEADDR=0, then NT 4 sp4 and later supports
+  // SO_EXCLUSIVEADDRUSE. This also requires using an updated Platform
+  // SDK so it was decided to ignore the option for now. (Especially
+  // since Windows always sets SO_REUSEADDR=1, which we can mimic by doing
+  // nothing.)
   if (level == SOL_SOCKET) {
     if (optname == SO_REUSEADDR) {
       return 0; // Not supported by Winsock
@@ -806,7 +917,7 @@ ACE_OS::socketpair (int domain, int type,
                     int protocol, ACE_HANDLE sv[2])
 {
   ACE_OS_TRACE ("ACE_OS::socketpair");
-#if defined (ACE_WIN32) || defined (ACE_LACKS_SOCKETPAIR)
+#if defined (ACE_LACKS_SOCKETPAIR)
   ACE_UNUSED_ARG (domain);
   ACE_UNUSED_ARG (type);
   ACE_UNUSED_ARG (protocol);
@@ -816,7 +927,7 @@ ACE_OS::socketpair (int domain, int type,
 #else
   ACE_OSCALL_RETURN (::socketpair (domain, type, protocol, sv),
                      int, -1);
-#endif /* ACE_WIN32 */
+#endif /* ACE_LACKS_SOCKETPAIR */
 }
 
 #if defined (__linux__) && defined (ACE_HAS_IPV6)
diff --git a/ace/OS_NS_sys_stat.inl b/ace/OS_NS_sys_stat.inl
index b96e5e3b1fb..80fc1d48e64 100644
--- a/ace/OS_NS_sys_stat.inl
+++ b/ace/OS_NS_sys_stat.inl
@@ -6,42 +6,44 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_macros.h"
 
-ACE_INLINE ACE_HANDLE
-ACE_OS::creat (const ACE_TCHAR *filename, mode_t mode)
-{
-  ACE_OS_TRACE ("ACE_OS::creat");
+namespace ACE_OS {
+
+  ACE_INLINE ACE_HANDLE
+  creat (const ACE_TCHAR *filename, mode_t mode)
+  {
+    ACE_OS_TRACE ("ACE_OS::creat");
 #if defined (ACE_WIN32)
-  return ACE_OS::open (filename, O_CREAT|O_TRUNC|O_WRONLY, mode);
+    return ACE_OS::open (filename, O_CREAT|O_TRUNC|O_WRONLY, mode);
 #elif defined(ACE_PSOS)
-   ACE_OSCALL_RETURN(::create_f((char *)filename, 1024,
-                              S_IRUSR | S_IWUSR | S_IXUSR),
-                     ACE_HANDLE, ACE_INVALID_HANDLE);
+    ACE_OSCALL_RETURN(::create_f((char *)filename, 1024,
+                                 S_IRUSR | S_IWUSR | S_IXUSR),
+                      ACE_HANDLE, ACE_INVALID_HANDLE);
 #elif defined(ACE_PSOS_TM)
-  ACE_UNUSED_ARG (filename);
-  ACE_UNUSED_ARG (mode);
-  ACE_NOTSUP_RETURN (-1);
+    ACE_UNUSED_ARG (filename);
+    ACE_UNUSED_ARG (mode);
+    ACE_NOTSUP_RETURN (-1);
 #elif defined(ACE_PSOS)
-  ACE_UNUSED_ARG (filename);
-  ACE_UNUSED_ARG (mode);
-  ACE_NOTSUP_RETURN (-1);
+    ACE_UNUSED_ARG (filename);
+    ACE_UNUSED_ARG (mode);
+    ACE_NOTSUP_RETURN (-1);
 #else
-  ACE_OSCALL_RETURN (::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode),
-                     ACE_HANDLE, ACE_INVALID_HANDLE);
+    ACE_OSCALL_RETURN (::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode),
+                       ACE_HANDLE, ACE_INVALID_HANDLE);
 #endif /* ACE_WIN32 */
-}
+  }
 
 #if !defined (ACE_WIN32)
 
-ACE_INLINE int
-ACE_OS::fstat (ACE_HANDLE handle, ACE_stat *stp)
-{
-  ACE_OS_TRACE ("ACE_OS::fstat");
+  ACE_INLINE int
+  fstat (ACE_HANDLE handle, ACE_stat *stp)
+  {
+    ACE_OS_TRACE ("ACE_OS::fstat");
 #if defined (ACE_PSOS_LACKS_PHILE)
-  ACE_UNUSED_ARG (handle);
-  ACE_UNUSED_ARG (stp);
-  ACE_NOTSUP_RETURN (-1);
+    ACE_UNUSED_ARG (handle);
+    ACE_UNUSED_ARG (stp);
+    ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_PSOS)
-  ACE_OSCALL_RETURN (::fstat_f (handle, stp), int, -1);
+    ACE_OSCALL_RETURN (::fstat_f (handle, stp), int, -1);
 #else
 # if defined (ACE_HAS_X86_STAT_MACROS)
     // Solaris for intel uses an macro for fstat(), this is a wrapper
@@ -57,322 +59,308 @@ ACE_OS::fstat (ACE_HANDLE handle, ACE_stat *stp)
     ACE_OSCALL_RETURN (::fstat (handle, stp), int, -1);
 # endif /* !ACE_HAS_X86_STAT_MACROS */
 #endif /* ACE_PSOS_LACKS_PHILE */
-}
+  }
 
 #else /* ACE_WIN32 */
 
-ACE_INLINE int
-ACE_OS::fstat (ACE_HANDLE handle, ACE_stat *stp)
-{
-  ACE_OS_TRACE ("ACE_OS::fstat");
+  ACE_INLINE int
+  fstat (ACE_HANDLE handle, ACE_stat *stp)
+  {
+    ACE_OS_TRACE ("ACE_OS::fstat");
 # if 1
-  BY_HANDLE_FILE_INFORMATION fdata;
-
-  if (::GetFileInformationByHandle (handle, &fdata) == FALSE)
-    {
-      ACE_OS::set_errno_to_last_error ();
-      return -1;
-    }
-  else if (fdata.nFileSizeHigh != 0)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  else
-    {
-      stp->st_size = fdata.nFileSizeLow;
-      stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec ();
-      stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec ();
-      stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec ();
-      stp->st_nlink = static_cast<short> (fdata.nNumberOfLinks);
-      stp->st_dev = stp->st_rdev = 0; // No equivalent conversion.
-      stp->st_mode = S_IXOTH | S_IROTH |
-        (fdata.dwFileAttributes & FILE_ATTRIBUTE_READONLY ? 0 : S_IWOTH) |
-        (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? S_IFDIR : S_IFREG);
-    }
-  return 0;
+    BY_HANDLE_FILE_INFORMATION fdata;
+
+    if (::GetFileInformationByHandle (handle, &fdata) == FALSE)
+      {
+        ACE_OS::set_errno_to_last_error ();
+        return -1;
+      }
+    else if (fdata.nFileSizeHigh != 0)
+      {
+        errno = EINVAL;
+        return -1;
+      }
+    else
+      {
+        stp->st_size = fdata.nFileSizeLow;
+        stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec ();
+        stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec ();
+        stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec ();
+        stp->st_nlink = static_cast<short> (fdata.nNumberOfLinks);
+        stp->st_dev = stp->st_rdev = 0; // No equivalent conversion.
+        stp->st_mode = S_IXOTH | S_IROTH |
+          (fdata.dwFileAttributes & FILE_ATTRIBUTE_READONLY ? 0 : S_IWOTH) |
+          (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? S_IFDIR : S_IFREG);
+      }
+    return 0;
 # else /* 1 */
-  // This implementation close the handle.
-  int retval = -1;
-  int fd = ::_open_osfhandle ((long) handle, 0);
-  if (fd != -1)
+    // This implementation close the handle.
+    int retval = -1;
+    int fd = ::_open_osfhandle ((long) handle, 0);
+    if (fd != -1)
       retval = ::_fstat (fd, stp);
 
-  ::_close (fd);
-  // Remember to close the file handle.
-  return retval;
+    ::_close (fd);
+    // Remember to close the file handle.
+    return retval;
 # endif /* 1 */
-}
+  }
 
 #endif /* WIN32 */
 
-// This function returns the number of bytes in the file referenced by
-// FD.
+  // This function returns the number of bytes in the file referenced by
+  // FD.
 
-ACE_INLINE long
-ACE_OS::filesize (ACE_HANDLE handle)
-{
-  ACE_OS_TRACE ("ACE_OS::filesize");
+  ACE_INLINE long
+  filesize (ACE_HANDLE handle)
+  {
+    ACE_OS_TRACE ("ACE_OS::filesize");
 #if defined (ACE_WIN32)
-  ACE_WIN32CALL_RETURN (::GetFileSize (handle, 0), long, -1);
+    ACE_WIN32CALL_RETURN (::GetFileSize (handle, 0), long, -1);
 #else /* !ACE_WIN32 */
-  ACE_stat sb;
-  return ACE_OS::fstat (handle, &sb) == -1 ? -1 : (long) sb.st_size;
+    ACE_stat sb;
+    return ACE_OS::fstat (handle, &sb) == -1 ? -1 : (long) sb.st_size;
 #endif /* ACE_WIN32 */
-}
-
-ACE_INLINE long
-ACE_OS::filesize (const ACE_TCHAR *filename)
-{
-  ACE_OS_TRACE ("ACE_OS::filesize");
-
-  ACE_HANDLE h = ACE_OS::open (filename, O_RDONLY);
-  if (h != ACE_INVALID_HANDLE)
-    {
-      long size = ACE_OS::filesize (h);
-      ACE_OS::close (h);
-      return size;
-    }
-  else
-    return -1;
-}
-
-ACE_INLINE int
-ACE_OS::lstat (const char *file, ACE_stat *stp)
-{
-  ACE_OS_TRACE ("ACE_OS::lstat");
+  }
+
+  ACE_INLINE long
+  filesize (const ACE_TCHAR *filename)
+  {
+    ACE_OS_TRACE ("ACE_OS::filesize");
+
+    ACE_HANDLE h = ACE_OS::open (filename, O_RDONLY);
+    if (h != ACE_INVALID_HANDLE)
+      {
+        long size = ACE_OS::filesize (h);
+        ACE_OS::close (h);
+        return size;
+      }
+    else
+      return -1;
+  }
+
+  ACE_INLINE int
+  lstat (const char *file, ACE_stat *stp)
+  {
+    ACE_OS_TRACE ("ACE_OS::lstat");
 # if defined (ACE_LACKS_LSTAT)
-  return ACE_OS::stat (file, stp);
+    return ACE_OS::stat (file, stp);
 # elif defined (ACE_HAS_X86_STAT_MACROS)
-   // Solaris for intel uses an macro for lstat(), this macro is a
-   // wrapper for _lxstat().
-  ACE_OSCALL_RETURN (::_lxstat (_STAT_VER, file, stp), int, -1);
+    // Solaris for intel uses an macro for lstat(), this macro is a
+    // wrapper for _lxstat().
+    ACE_OSCALL_RETURN (::_lxstat (_STAT_VER, file, stp), int, -1);
 # else /* !ACE_HAS_X86_STAT_MACROS */
-  ACE_OSCALL_RETURN (::lstat (file, stp), int, -1);
+    ACE_OSCALL_RETURN (::lstat (file, stp), int, -1);
 # endif /* ACE_LACKS_LSTAT */
-}
+  }
 
 #if defined (ACE_HAS_WCHAR)
-ACE_INLINE int
-ACE_OS::lstat (const wchar_t *file, ACE_stat *stp)
-{
-  ACE_OS_TRACE ("ACE_OS::lstat");
+  ACE_INLINE int
+  lstat (const wchar_t *file, ACE_stat *stp)
+  {
+    ACE_OS_TRACE ("ACE_OS::lstat");
 # if defined (ACE_LACKS_LSTAT)
-  return ACE_OS::stat (file, stp);
+    return ACE_OS::stat (file, stp);
 # else
-  return ACE_OS::lstat (ACE_Wide_To_Ascii (file).char_rep (), stp);
+    return ACE_OS::lstat (ACE_Wide_To_Ascii (file).char_rep (), stp);
 # endif /* ACE_LACKS_LSTAT */
-}
+  }
 #endif /* ACE_HAS_WCHAR */
 
-ACE_INLINE int
-ACE_OS::mkdir (const char *path, mode_t mode)
-{
+  ACE_INLINE int
+  mkdir (const char *path, mode_t mode)
+  {
 #if defined (ACE_PSOS_LACKS_PHILE)
-  ACE_UNUSED_ARG (path);
-  ACE_UNUSED_ARG (mode);
-  ACE_NOTSUP_RETURN (-1);
+    ACE_UNUSED_ARG (path);
+    ACE_UNUSED_ARG (mode);
+    ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_PSOS)
-  //The pSOS make_dir fails if the last character is a '/'
-  int location;
-  char *phile_path;
-
-  phile_path = (char *)ACE_OS::malloc (strlen (path+1));
-  if (phile_path == 0)
-    {
-      ACE_OS::printf ("malloc in make_dir failed: [%X]\n",
-                      errno);
-      return -1;
-    }
-  else
-    ACE_OS::strcpy (phile_path, path);
+    //The pSOS make_dir fails if the last character is a '/'
+    int location;
+    char *phile_path;
+
+    phile_path = (char *)ACE_OS::malloc (strlen (path+1));
+    if (phile_path == 0)
+      {
+        ACE_OS::printf ("malloc in make_dir failed: [%X]\n",
+                        errno);
+        return -1;
+      }
+    else
+      ACE_OS::strcpy (phile_path, path);
+
+    location = ACE_OS::strlen(phile_path);
+    if(phile_path[location-1] == '/')
+      {
+        phile_path[location-1] = 0;
+      }
+
+    u_long result;
+    result = ::make_dir ((char *) phile_path, mode);
+    if (result == 0x2011)  // Directory already exists
+      {
+        result = 0;
+      }
+    else if (result != 0)
+      {
+        result = -1;
+      }
+
+    ACE_OS::free(phile_path);
+    return result;
 
-  location = ACE_OS::strlen(phile_path);
-  if(phile_path[location-1] == '/')
-  {
-     phile_path[location-1] = 0;
-  }
-
-  u_long result;
-  result = ::make_dir ((char *) phile_path, mode);
-  if (result == 0x2011)  // Directory already exists
-    {
-      result = 0;
-    }
-  else if (result != 0)
-    {
-      result = -1;
-    }
-
-  ACE_OS::free(phile_path);
-  return result;
-
-#elif defined (VXWORKS)
-  ACE_UNUSED_ARG (mode);
-  ACE_OSCALL_RETURN (::mkdir ((char *) path), int, -1);
 #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  ACE_UNUSED_ARG (mode);
-  ACE_OSCALL_RETURN (::_mkdir ((char *) path), int, -1);
+    ACE_UNUSED_ARG (mode);
+    ACE_OSCALL_RETURN (::_mkdir ((char *) path), int, -1);
 #elif defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (mode);
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0),
-                                          ace_result_),
-                        int, -1);
-#elif defined (ACE_WIN32)
-  ACE_UNUSED_ARG (mode);
-  ACE_OSCALL_RETURN (::mkdir (path), int, -1);
+    ACE_UNUSED_ARG (mode);
+    ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0),
+                                            ace_result_),
+                          int, -1);
+#elif defined (ACE_MKDIR_LACKS_MODE)
+    ACE_UNUSED_ARG (mode);
+    ACE_OSCALL_RETURN (::mkdir (path), int, -1);
 #else
-  ACE_OSCALL_RETURN (::mkdir (path, mode), int, -1);
+    ACE_OSCALL_RETURN (::mkdir (path, mode), int, -1);
 #endif /* ACE_PSOS_LACKS_PHILE */
-}
+  }
 
 #if defined (ACE_HAS_WCHAR)
 
-ACE_INLINE int
-ACE_OS::mkdir (const wchar_t *path, mode_t mode)
-{
+  ACE_INLINE int
+  mkdir (const wchar_t *path, mode_t mode)
+  {
 #if defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (mode);
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (CreateDirectory (path, 0),
-                                          ace_result_),
-                        int, -1);
+    ACE_UNUSED_ARG (mode);
+    ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (CreateDirectory (path, 0),
+                                            ace_result_),
+                          int, -1);
 #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-  ACE_UNUSED_ARG (mode);
-  ACE_OSCALL_RETURN (::_wmkdir (path), int, -1);
+    ACE_UNUSED_ARG (mode);
+    ACE_OSCALL_RETURN (::_wmkdir (path), int, -1);
 #else
-  return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode);
+    return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode);
 #endif /* ACE_HAS_WINCE */
-}
+  }
 
 #endif /* ACE_HAS_WCHAR */
 
-ACE_INLINE int
-ACE_OS::mkfifo (const ACE_TCHAR *file, mode_t mode)
-{
-  ACE_OS_TRACE ("ACE_OS::mkfifo");
+  ACE_INLINE int
+  mkfifo (const ACE_TCHAR *file, mode_t mode)
+  {
+    ACE_OS_TRACE ("ACE_OS::mkfifo");
 #if defined (ACE_LACKS_MKFIFO)
-  ACE_UNUSED_ARG (file);
-  ACE_UNUSED_ARG (mode);
-  ACE_NOTSUP_RETURN (-1);
+    ACE_UNUSED_ARG (file);
+    ACE_UNUSED_ARG (mode);
+    ACE_NOTSUP_RETURN (-1);
 #else
-  ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_ALWAYS_CHAR (file), mode), int, -1);
+    ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_ALWAYS_CHAR (file), mode), int, -1);
 #endif /* ACE_LACKS_MKFIFO */
-}
-
-ACE_INLINE int
-ACE_OS::stat (const char *file, ACE_stat *stp)
-{
-  ACE_OS_TRACE ("ACE_OS::stat");
-#if defined (VXWORKS)
-  ACE_OSCALL_RETURN (::stat ((char *) file, stp), int, -1);
+  }
+
+  ACE_INLINE int
+  stat (const char *file, ACE_stat *stp)
+  {
+    ACE_OS_TRACE ("ACE_OS::stat");
+#if defined (ACE_HAS_NONCONST_STAT)
+    ACE_OSCALL_RETURN (::stat (const_cast <char *> (file), stp), int, -1);
 #elif defined (ACE_PSOS_LACKS_PHILE)
-  ACE_UNUSED_ARG (file);
-  ACE_UNUSED_ARG (stp);
-  ACE_NOTSUP_RETURN (-1);
+    ACE_UNUSED_ARG (file);
+    ACE_UNUSED_ARG (stp);
+    ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_PSOS)
-  ACE_OSCALL_RETURN (::stat_f ((char *) file, stp), int, -1);
+    ACE_OSCALL_RETURN (::stat_f (const_cast <char *> (file), stp), int, -1);
 #elif defined (ACE_HAS_WINCE)
-  ACE_TEXT_WIN32_FIND_DATA fdata;
-
-  HANDLE fhandle;
-
-  fhandle = ::FindFirstFile (ACE_TEXT_CHAR_TO_TCHAR (file), &fdata);
-  if (fhandle == INVALID_HANDLE_VALUE)
-    {
-      ACE_OS::set_errno_to_last_error ();
-      return -1;
-    }
-  else if (fdata.nFileSizeHigh != 0)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  else
-    {
-      stp->st_size = fdata.nFileSizeLow;
-      stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime);
-      stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime);
-    }
-  return 0;
+    ACE_TEXT_WIN32_FIND_DATA fdata;
+
+    HANDLE fhandle;
+
+    fhandle = ::FindFirstFile (ACE_TEXT_CHAR_TO_TCHAR (file), &fdata);
+    if (fhandle == INVALID_HANDLE_VALUE)
+      {
+        ACE_OS::set_errno_to_last_error ();
+        return -1;
+      }
+    else if (fdata.nFileSizeHigh != 0)
+      {
+        errno = EINVAL;
+        return -1;
+      }
+    else
+      {
+        stp->st_mode = static_cast<unsigned short>(fdata.dwFileAttributes);
+        stp->st_size = fdata.nFileSizeLow;
+        stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime);
+        stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime);
+      }
+    return 0;
 #elif defined (ACE_HAS_X86_STAT_MACROS)
-   // Solaris for intel uses an macro for stat(), this macro is a
-   // wrapper for _xstat().
-  ACE_OSCALL_RETURN (::_xstat (_STAT_VER, file, stp), int, -1);
+    // Solaris for intel uses an macro for stat(), this macro is a
+    // wrapper for _xstat().
+    ACE_OSCALL_RETURN (::_xstat (_STAT_VER, file, stp), int, -1);
 #elif defined (ACE_WIN32)
 # if defined(__IBMCPP__)
-  ACE_OSCALL_RETURN (::_stat (file,  stp), int, -1);
+    ACE_OSCALL_RETURN (::_stat (file,  stp), int, -1);
 #else
-  ACE_OSCALL_RETURN (::_stat (file, (struct _stat *) stp), int, -1);
+    ACE_OSCALL_RETURN (::_stat (file, (struct _stat *) stp), int, -1);
 #endif /* __IBMCPP__ */
-#else /* VXWORKS */
-  ACE_OSCALL_RETURN (::stat (file, stp), int, -1);
-#endif /* VXWORKS */
-}
+#else /* ACE_HAS_NONCONST_STAT */
+    ACE_OSCALL_RETURN (::stat (file, stp), int, -1);
+#endif /* ACE_HAS_NONCONST_STAT */
+  }
 
 #if defined (ACE_HAS_WCHAR)
-ACE_INLINE int
-ACE_OS::stat (const wchar_t *file, ACE_stat *stp)
-{
-  ACE_OS_TRACE ("ACE_OS::stat");
+  ACE_INLINE int
+  stat (const wchar_t *file, ACE_stat *stp)
+  {
+    ACE_OS_TRACE ("ACE_OS::stat");
 #if defined (ACE_HAS_WINCE)
-  ACE_TEXT_WIN32_FIND_DATA fdata;
-
-  HANDLE fhandle;
-
-  fhandle = ::FindFirstFile (file, &fdata);
-  if (fhandle == INVALID_HANDLE_VALUE)
-    {
-      ACE_OS::set_errno_to_last_error ();
-      return -1;
-    }
-  else if (fdata.nFileSizeHigh != 0)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  else
-    {
-      stp->st_size = fdata.nFileSizeLow;
-      stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime);
-      stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime);
-    }
-  return 0;
+    ACE_TEXT_WIN32_FIND_DATA fdata;
+
+    HANDLE fhandle;
+
+    fhandle = ::FindFirstFile (file, &fdata);
+    if (fhandle == INVALID_HANDLE_VALUE)
+      {
+        ACE_OS::set_errno_to_last_error ();
+        return -1;
+      }
+    else if (fdata.nFileSizeHigh != 0)
+      {
+        errno = EINVAL;
+        return -1;
+      }
+    else
+      {
+        stp->st_mode = static_cast<unsigned short>(fdata.dwFileAttributes);
+        stp->st_size = fdata.nFileSizeLow;
+        stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime);
+        stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime);
+      }
+    return 0;
 #elif defined (__BORLANDC__)  && (__BORLANDC__ <= 0x540)
-  ACE_OSCALL_RETURN (::_wstat (file, stp), int, -1);
+    ACE_OSCALL_RETURN (::_wstat (file, stp), int, -1);
 #elif defined (ACE_WIN32)
-  ACE_OSCALL_RETURN (::_wstat (file, (struct _stat *) stp), int, -1);
+    ACE_OSCALL_RETURN (::_wstat (file, (struct _stat *) stp), int, -1);
 #else /* ACE_HAS_WINCE */
-  ACE_Wide_To_Ascii nfile (file);
-  return ACE_OS::stat (nfile.char_rep (), stp);
+    ACE_Wide_To_Ascii nfile (file);
+    return ACE_OS::stat (nfile.char_rep (), stp);
 #endif /* ACE_HAS_WINCE */
-}
+  }
 #endif /* ACE_HAS_WCHAR */
 
-#if !defined (ACE_WIN32)
-
-ACE_INLINE mode_t
-ACE_OS::umask (mode_t cmask)
-{
-  ACE_OS_TRACE ("ACE_OS::umask");
-# if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY)
-  ACE_UNUSED_ARG (cmask);
-  ACE_NOTSUP_RETURN ((mode_t)-1);
-# else
-  return ::umask (cmask); // This call shouldn't fail...
-# endif /* VXWORKS || ACE_PSOS */
-}
-
-#else /* ACE_WIN32 */
-
-ACE_INLINE mode_t
-ACE_OS::umask (mode_t cmask)
-{
-#if !defined (ACE_HAS_WINCE)
-  ACE_OS_TRACE ("ACE_OS::umask");
-  ACE_OSCALL_RETURN (::_umask (cmask), mode_t, -1);
+  ACE_INLINE mode_t
+  umask (mode_t cmask)
+  {
+    ACE_OS_TRACE ("ACE_OS::umask");
+# if defined (ACE_LACKS_UMASK)
+    ACE_UNUSED_ARG (cmask);
+    ACE_NOTSUP_RETURN ((mode_t)-1);
+# elif defined (ACE_WIN32)
+    ACE_OSCALL_RETURN (::_umask (cmask), mode_t, -1);
 # else
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_WINCE */
-}
+    return ::umask (cmask); // This call shouldn't fail...
+# endif /* ACE_LACKS_UMASK */
+  }
 
-#endif /* WIN32 */
+} // ACE_OS namespace
diff --git a/ace/OS_NS_sys_time.h b/ace/OS_NS_sys_time.h
index 8c6791f35e1..23be37b8d29 100644
--- a/ace/OS_NS_sys_time.h
+++ b/ace/OS_NS_sys_time.h
@@ -34,10 +34,20 @@
 #define ACE_EXPORT_MACRO ACE_Export
 
 namespace ACE_OS {
-
+#if defined (ACE_WIN32) && defined (_WIN32_WCE)
+// Something is a bit brain-damaged here and I'm not sure what... this code
+// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC
+// complains that the operators that return ACE_Time_Value are C-linkage
+// functions that can't return a C++ class. The only way I've found to
+// defeat this is to wrap the whole class in extern "C++".
+//    - Steve Huston, 23-Aug-2004
+extern "C++" {
+#endif
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_Time_Value gettimeofday (void);
-
+#if defined (ACE_WIN32) && defined (_WIN32_WCE)
+}
+#endif
 } /* namespace ACE_OS */
 
 # if defined (ACE_HAS_INLINED_OSCALLS)
diff --git a/ace/OS_NS_sys_time.inl b/ace/OS_NS_sys_time.inl
index a2c25b18e5d..6aec9b145dc 100644
--- a/ace/OS_NS_sys_time.inl
+++ b/ace/OS_NS_sys_time.inl
@@ -8,6 +8,16 @@
 #  include "ace/OS_NS_time.h"
 #endif /* VXWORKS || CHORUS || ACE_PSOS */
 
+#if defined (ACE_WIN32) && defined (_WIN32_WCE)
+// Something is a bit brain-damaged here and I'm not sure what... this code
+// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC
+// complains that the operators that return ACE_Time_Value are C-linkage
+// functions that can't return a C++ class. The only way I've found to
+// defeat this is to wrap the whole class in extern "C++".
+//    - Steve Huston, 23-Aug-2004
+extern "C++" {
+#endif
+
 ACE_INLINE ACE_Time_Value
 ACE_OS::gettimeofday (void)
 {
@@ -75,3 +85,7 @@ ACE_OS::gettimeofday (void)
     return ACE_Time_Value (tv);
 #endif // !defined (ACE_HAS_WINCE)&& !defined (ACE_WIN32)
 }
+
+#if defined (ACE_WIN32) && defined (_WIN32_WCE)
+}
+#endif
diff --git a/ace/OS_NS_sys_uio.cpp b/ace/OS_NS_sys_uio.cpp
index 7c52d91bab7..5b7563dc7fd 100644
--- a/ace/OS_NS_sys_uio.cpp
+++ b/ace/OS_NS_sys_uio.cpp
@@ -33,7 +33,7 @@ ACE_OS::readv_emulation (ACE_HANDLE handle,
   int i;
 
   for (i = 0; i < n; ++i)
-    if (ACE_static_cast (int, iov[i].iov_len) < 0)
+    if (static_cast<int> (iov[i].iov_len) < 0)
       return -1;
     else
       length += iov[i].iov_len;
@@ -117,7 +117,7 @@ ACE_OS::writev_emulation (ACE_HANDLE handle, const iovec *iov, int n)
           // This avoids a subtle problem where "holes" in the data
           // stream would occur if partial sends of a given buffer in
           // the iovec array occured.
-          if (ACE_static_cast (size_t, result) < iov[i].iov_len)
+          if (static_cast<size_t> (result) < iov[i].iov_len)
             break;
         }
     }
diff --git a/ace/OS_NS_sys_utsname.cpp b/ace/OS_NS_sys_utsname.cpp
index 62d8476b53a..be9c24a089c 100644
--- a/ace/OS_NS_sys_utsname.cpp
+++ b/ace/OS_NS_sys_utsname.cpp
@@ -45,7 +45,7 @@ ACE_OS::uname (ACE_utsname *name)
   EK_KERNELINFO ets_kern;
   EK_SYSTEMINFO ets_sys;
   EtsGetSystemInfo (&ets_kern, &ets_sys);
-  sinfo.wProcessorLevel = ACE_static_cast (WORD, ets_kern.CpuType);
+  sinfo.wProcessorLevel = static_cast<WORD> (ets_kern.CpuType);
   sinfo.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL;
   sinfo.dwProcessorType = ets_kern.CpuType * 100 + 86;
 #   else
diff --git a/ace/OS_NS_sys_utsname.inl b/ace/OS_NS_sys_utsname.inl
index d36dc1ab273..eb660f2cad6 100644
--- a/ace/OS_NS_sys_utsname.inl
+++ b/ace/OS_NS_sys_utsname.inl
@@ -4,28 +4,30 @@
 
 #include "ace/os_include/os_errno.h"
 
-
+namespace ACE_OS
+{
 #if !defined (ACE_WIN32) && !defined (VXWORKS) && !defined (CHORUS) && !defined (ACE_PSOS)
 // Don't inline on those platforms because this function contains
 // string literals, and some compilers, e.g., g++, don't handle those
 // efficiently in unused inline functions.
-ACE_INLINE int
-ACE_OS::uname (ACE_utsname *name)
-{
+  ACE_INLINE int
+  uname (ACE_utsname *name)
+  {
 #if defined (INTEGRITY)
-  if(!name) {
+    if(!name) {
       errno = EFAULT;
       return -1;
-  }
-  strcpy(name->sysname,"INTEGRITY");
-  int status = gethostname(name->nodename,_SYS_NMLN);
-  strcpy(name->release,"4.0");
-  strcpy(name->version,"4.0.9");
-  strcpy(name->machine,"a standard name");
-  return status;
+    }
+    strcpy(name->sysname,"INTEGRITY");
+    int status = gethostname(name->nodename,_SYS_NMLN);
+    strcpy(name->release,"4.0");
+    strcpy(name->version,"4.0.9");
+    strcpy(name->machine,"a standard name");
+    return status;
 #else
-  ACE_OS_TRACE ("ACE_OS::uname");
-  ACE_OSCALL_RETURN (::uname (name), int, -1);
+    ACE_OS_TRACE ("ACE_OS::uname");
+    ACE_OSCALL_RETURN (::uname (name), int, -1);
 #endif
-}
+  }
 #endif /* ! ACE_WIN32 && ! VXWORKS && ! CHORUS */
+} // namespace ACE_OS
diff --git a/ace/OS_NS_sys_wait.inl b/ace/OS_NS_sys_wait.inl
index d72842213ba..85afcb961ce 100644
--- a/ace/OS_NS_sys_wait.inl
+++ b/ace/OS_NS_sys_wait.inl
@@ -8,9 +8,8 @@ ACE_INLINE pid_t
 ACE_OS::wait (int *status)
 {
   ACE_OS_TRACE ("ACE_OS::wait");
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined(CHORUS) || defined (ACE_PSOS) || defined (INTEGRITY)
+#if defined (ACE_LACKS_WAIT)
   ACE_UNUSED_ARG (status);
-
   ACE_NOTSUP_RETURN (0);
 #else
 # if defined (ACE_HAS_UNION_WAIT)
@@ -18,7 +17,7 @@ ACE_OS::wait (int *status)
 # else
   ACE_OSCALL_RETURN (::wait (status), pid_t, -1);
 # endif /* ACE_HAS_UNION_WAIT */
-#endif /* ACE_WIN32 || VXWORKS || CHORUS || ACE_PSOS */
+#endif /* ACE_LACKS_WAIT */
 }
 
 ACE_INLINE pid_t
@@ -28,7 +27,7 @@ ACE_OS::waitpid (pid_t pid,
                  ACE_HANDLE handle)
 {
   ACE_OS_TRACE ("ACE_OS::waitpid");
-#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY)
+#if defined (ACE_LACKS_WAITPID)
   ACE_UNUSED_ARG (pid);
   ACE_UNUSED_ARG (status);
   ACE_UNUSED_ARG (wait_options);
@@ -94,7 +93,7 @@ ACE_OS::waitpid (pid_t pid,
   ACE_UNUSED_ARG (handle);
   ACE_OSCALL_RETURN (::waitpid (pid, status, wait_options),
                      pid_t, -1);
-#endif /* VXWORKS || ACE_PSOS */
+#endif /* ACE_LACKS_WAITPID */
 }
 
 ACE_INLINE pid_t
diff --git a/ace/OS_NS_time.cpp b/ace/OS_NS_time.cpp
index cf4fb7076a4..a0d19c4a83d 100644
--- a/ace/OS_NS_time.cpp
+++ b/ace/OS_NS_time.cpp
@@ -72,30 +72,28 @@ ACE_PSOS_Time_t::ACE_PSOS_Time_t (const timespec_t& t)
 
   // Encode date values from tm struct into pSOS date bit array.
   date_ = (ACE_PSOS_Time_t::year_mask &
-           ACE_static_cast (u_long,
-                            tm_struct->tm_year + ACE_PSOS_Time_t::year_origin)) <<
+           static_cast <u_long>
+                            (tm_struct->tm_year + ACE_PSOS_Time_t::year_origin)) <<
     ACE_PSOS_Time_t::year_shift;
   date_ |= (ACE_PSOS_Time_t::month_mask &
-            ACE_static_cast (u_long,
-                             tm_struct->tm_mon + ACE_PSOS_Time_t::month_origin)) <<
+            static_cast<u_long> (tm_struct->tm_mon + ACE_PSOS_Time_t::month_origin)) <<
     ACE_PSOS_Time_t::month_shift;
   date_ |= ACE_PSOS_Time_t::day_mask &
-    ACE_static_cast (u_long, tm_struct->tm_mday);
+    static_cast<u_long> (tm_struct->tm_mday);
   // Encode time values from tm struct into pSOS time bit array.
   time_ = (ACE_PSOS_Time_t::hour_mask  &
-            ACE_static_cast (u_long, tm_struct->tm_hour)) <<
+            static_cast<u_long> (tm_struct->tm_hour)) <<
     ACE_PSOS_Time_t::hour_shift;
   time_ |= (ACE_PSOS_Time_t::minute_mask &
-            ACE_static_cast (u_long, tm_struct->tm_min)) <<
+            static_cast<u_long> (tm_struct->tm_min)) <<
     ACE_PSOS_Time_t::minute_shift;
   time_ |= ACE_PSOS_Time_t::second_mask &
-    ACE_static_cast (u_int, tm_struct->tm_sec);
+    static_cast<u_int> (tm_struct->tm_sec);
 
   // encode nanoseconds as system clock ticks
-  ticks_ = ACE_static_cast (u_long,
-                            ((ACE_static_cast (double, t.tv_nsec) *
-                              ACE_static_cast (double, KC_TICKS2SEC)) /
-                             ACE_static_cast (double, 1000000000)));
+  ticks_ = static_cast<u_long> (((static_cast<double> (t.tv_nsec) *
+                              static_cast<double> (KC_TICKS2SEC)) /
+                             static_cast<double> (1000000000)));
 
 }
 
@@ -108,23 +106,23 @@ ACE_PSOS_Time_t::operator timespec_t (void)
   // Decode date and time bit arrays and fill in fields of tm_struct.
 
   tm_struct.tm_year =
-    ACE_static_cast (int, (ACE_PSOS_Time_t::year_mask &
+    static_cast<int> ((ACE_PSOS_Time_t::year_mask &
                            (date_ >> ACE_PSOS_Time_t::year_shift))) -
     ACE_PSOS_Time_t::year_origin;
   tm_struct.tm_mon =
-    ACE_static_cast (int, (ACE_PSOS_Time_t::month_mask &
+    static_cast<int> ((ACE_PSOS_Time_t::month_mask &
                            (date_ >> ACE_PSOS_Time_t::month_shift))) -
     ACE_PSOS_Time_t::month_origin;
   tm_struct.tm_mday =
-    ACE_static_cast (int, (ACE_PSOS_Time_t::day_mask & date_));
+    static_cast<int> ((ACE_PSOS_Time_t::day_mask & date_));
   tm_struct.tm_hour =
-    ACE_static_cast (int, (ACE_PSOS_Time_t::hour_mask &
+    static_cast<int> ((ACE_PSOS_Time_t::hour_mask &
                            (time_ >> ACE_PSOS_Time_t::hour_shift)));
   tm_struct.tm_min =
-    ACE_static_cast (int, (ACE_PSOS_Time_t::minute_mask &
+    static_cast<int> ((ACE_PSOS_Time_t::minute_mask &
                            (time_ >> ACE_PSOS_Time_t::minute_shift)));
   tm_struct.tm_sec =
-    ACE_static_cast (int, (ACE_PSOS_Time_t::second_mask & time_));
+    static_cast<int> ((ACE_PSOS_Time_t::second_mask & time_));
 
   // Indicate values we don't know as negative numbers.
   tm_struct.tm_wday  = -1;
@@ -137,10 +135,9 @@ ACE_PSOS_Time_t::operator timespec_t (void)
   t.tv_sec = ACE_OS::mktime (&tm_struct);
 
   // Encode nanoseconds as system clock ticks.
-  t.tv_nsec = ACE_static_cast (long,
-                               ((ACE_static_cast (double, ticks_) *
-                                 ACE_static_cast (double, 1000000000)) /
-                                ACE_static_cast (double, KC_TICKS2SEC)));
+  t.tv_nsec = static_cast<long> (((static_cast<double> (ticks_) *
+                                 static_cast<double> (1000000000)) /
+                                static_cast<double> (KC_TICKS2SEC)));
   return t;
 }
 
diff --git a/ace/OS_NS_time.h b/ace/OS_NS_time.h
index 8cb05fa4cda..5ee8e8ffc4a 100644
--- a/ace/OS_NS_time.h
+++ b/ace/OS_NS_time.h
@@ -201,6 +201,8 @@ typedef ACE_UINT64 ACE_hrtime_t;
 #   endif // ACE_LACKS_LONGLONG_T
 # elif defined (ACE_PSOS)
 typedef ACE_UINT64 ACE_hrtime_t;
+# elif defined (_TNS_R_TARGET)
+typedef long long ACE_hrtime_t;
 # else /* !ACE_WIN32 && !ACE_PSOS */
 #   if defined (ACE_HAS_HI_RES_TIMER) &&  !defined (ACE_LACKS_LONGLONG_T)
   /* hrtime_t is defined on systems (Suns) with ACE_HAS_HI_RES_TIMER */
@@ -211,6 +213,14 @@ typedef ACE_UINT64 ACE_hrtime_t;
 # endif /* ACE_WIN32 */
 
 
+# if defined (ACE_HRTIME_T_IS_BASIC_TYPE)
+#   define ACE_HRTIME_CONVERSION(VAL) (VAL)
+#   define ACE_HRTIME_TO_U64(VAL) ACE_U_LongLong(VAL)
+# else
+#   define ACE_HRTIME_CONVERSION(VAL) ACE_U64_TO_U32(VAL)
+#   define ACE_HRTIME_TO_U64(VAL) (VAL)
+# endif
+
 
 namespace ACE_OS {
 
@@ -255,7 +265,11 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_TCHAR *ctime (const time_t *t);
 
+#if defined (ACE_HAS_WINCE) && !defined (_DEBUG)
+  extern ACE_EXPORT_MACRO
+#else
   ACE_NAMESPACE_INLINE_FUNCTION
+#endif
   ACE_TCHAR *ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen);
 
 # if defined (difftime)
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index ac13858669c..0d2a6686afb 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -37,6 +37,8 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen)
 # else
 #   if defined (HPUX_10)
   return (::asctime_r(t, buf, buflen) == 0 ? buf : (char *)0);
+#   elif defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R)
+  ACE_OSCALL_RETURN (::asctime_r (t, buf, reinterpret_cast<size_t*>(&buflen)), char *, 0);
 #   else
   ACE_OSCALL_RETURN (::asctime_r (t, buf, buflen), char *, 0);
 #   endif /* HPUX_10 */
@@ -130,12 +132,12 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
   bufp = buf;
 #   endif /* ACE_USES_WCHAR */
 
-#   if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
   if (buflen < ctime_buf_size)
     {
       errno = ERANGE;
       return 0;
     }
+#   if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
 #      if defined (DIGITAL_UNIX)
   ACE_OSCALL (::_Pctime_r (t, bufp), ACE_TCHAR *, 0, bufp);
 #      else /* DIGITAL_UNIX */
@@ -145,6 +147,8 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
 
 #      if defined (ACE_CTIME_R_RETURNS_INT)
   bufp = ::ctime_r (t, bufp, buflen) == -1 ? 0 : bufp;
+#      elif defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R)
+  bufp = ::ctime_r (t, bufp, reinterpret_cast<size_t*>(&buflen));
 #      else /* ACE_CTIME_R_RETURNS_INT */
   bufp = ::ctime_r (t, bufp, buflen);
 #      endif /* ACE_CTIME_R_RETURNS_INT */
@@ -218,7 +222,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
   ACE_UNUSED_ARG (op);
   // Use .obj/gethrtime.o, which was compiled with g++.
   return ACE_gethrtime ();
-#elif (defined(__KCC) || defined (__GNUG__)) && !defined (__MINGW32__) && defined (ACE_HAS_PENTIUM)
+#elif (defined(__KCC) || defined (__GNUG__)) && !defined (__MINGW32__) && !defined(ACE_VXWORKS) && defined (ACE_HAS_PENTIUM)
   ACE_UNUSED_ARG (op);
 
 # if defined (ACE_LACKS_LONGLONG_T)
@@ -322,7 +326,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
   do {
     asm volatile ("mftbu %0\n"
 		  "mftb  %1\n"
-		  "mftbu %2" 
+		  "mftbu %2"
 		  : "=r" (most), "=r" (least), "=r" (scratch));
   } while (most != scratch);
 #endif
diff --git a/ace/OS_NS_unistd.cpp b/ace/OS_NS_unistd.cpp
index 370ff5f4510..aebef707e61 100644
--- a/ace/OS_NS_unistd.cpp
+++ b/ace/OS_NS_unistd.cpp
@@ -28,7 +28,7 @@ ftruncate (ACE_HANDLE handle, long len)
   fl.l_start = len;
   fl.l_type = F_WRLCK;
 
-  return ACE_OS::fcntl (handle, F_FREESP, ACE_reinterpret_cast (long, &fl));
+  return ACE_OS::fcntl (handle, F_FREESP, reinterpret_cast <long> (&fl));
 }
 #endif /* ACE_NEEDS_FTRUNCATE */
 
@@ -136,39 +136,27 @@ int
 ACE_OS::execl (const char * /* path */, const char * /* arg0 */, ...)
 {
   ACE_OS_TRACE ("ACE_OS::execl");
-#if defined (ACE_WIN32) || defined (VXWORKS)
-  ACE_NOTSUP_RETURN (-1);
-#else
   ACE_NOTSUP_RETURN (-1);
   // Need to write this code.
   // ACE_OSCALL_RETURN (::execv (path, argv), int, -1);
-#endif /* ACE_WIN32 */
 }
 
 int
 ACE_OS::execle (const char * /* path */, const char * /* arg0 */, ...)
 {
   ACE_OS_TRACE ("ACE_OS::execle");
-#if defined (ACE_WIN32) || defined (VXWORKS)
-  ACE_NOTSUP_RETURN (-1);
-#else
   ACE_NOTSUP_RETURN (-1);
   // Need to write this code.
   //  ACE_OSCALL_RETURN (::execve (path, argv, envp), int, -1);
-#endif /* ACE_WIN32 */
 }
 
 int
 ACE_OS::execlp (const char * /* file */, const char * /* arg0 */, ...)
 {
   ACE_OS_TRACE ("ACE_OS::execlp");
-#if defined (ACE_WIN32) || defined (VXWORKS)
-  ACE_NOTSUP_RETURN (-1);
-#else
   ACE_NOTSUP_RETURN (-1);
   // Need to write this code.
   //  ACE_OSCALL_RETURN (::execvp (file, argv), int, -1);
-#endif /* ACE_WIN32 */
 }
 
 pid_t
@@ -409,7 +397,7 @@ ACE_OS::pread (ACE_HANDLE handle,
 
   BOOL result = ::ReadFile (handle,
                             buf,
-                            ACE_static_cast (DWORD, nbytes),
+                            static_cast <DWORD> (nbytes),
                             &bytes_read,
                             &overlapped);
 
@@ -534,7 +522,7 @@ ACE_OS::pwrite (ACE_HANDLE handle,
 
   BOOL result = ::WriteFile (handle,
                              buf,
-                             ACE_static_cast (DWORD, nbytes),
+                             static_cast <DWORD> (nbytes),
                              &bytes_written,
                              &overlapped);
 
diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl
index 549ea9530e8..fb0380c44c7 100644
--- a/ace/OS_NS_unistd.inl
+++ b/ace/OS_NS_unistd.inl
@@ -106,7 +106,7 @@ ACE_INLINE int
 ACE_OS::chdir (const char *path)
 {
   ACE_OS_TRACE ("ACE_OS::chdir");
-#if defined (VXWORKS)
+#if defined (ACE_HAS_NONCONST_CHDIR)
   ACE_OSCALL_RETURN (::chdir (const_cast<char *> (path)), int, -1);
 
 #elif defined (ACE_PSOS_LACKS_PHILE)
@@ -115,7 +115,7 @@ ACE_OS::chdir (const char *path)
 
 #elif defined (ACE_PSOS)
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::change_dir ((char *) path), result),
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::change_dir (const_cast<char *> (path)), result),
                      int, -1);
 
 #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
@@ -128,7 +128,7 @@ ACE_OS::chdir (const char *path)
 #else
   ACE_OSCALL_RETURN (::chdir (path), int, -1);
 
-#endif /* VXWORKS */
+#endif /* ACE_HAS_NONCONST_CHDIR */
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -184,8 +184,6 @@ ACE_OS::rmdir (const char *path)
 
   return (int) result;
 
-#elif defined (VXWORKS)
-  ACE_OSCALL_RETURN (::rmdir ((char *) path), int, -1);
 #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
   ACE_OSCALL_RETURN (::_rmdir ((char *) path), int, -1);
 #elif defined (ACE_HAS_WINCE)
@@ -269,15 +267,14 @@ ACE_INLINE int
 ACE_OS::dup2 (ACE_HANDLE oldhandle, ACE_HANDLE newhandle)
 {
   ACE_OS_TRACE ("ACE_OS::dup2");
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_PSOS)
+#if defined (ACE_LACKS_DUP2)
   // msvcrt has _dup2 ?!
   ACE_UNUSED_ARG (oldhandle);
   ACE_UNUSED_ARG (newhandle);
-
   ACE_NOTSUP_RETURN (-1);
 #else
   ACE_OSCALL_RETURN (::dup2 (oldhandle, newhandle), int, -1);
-#endif /* ACE_WIN32 || VXWORKS || ACE_PSOS */
+#endif /* ACE_LACKS_DUP2 */
 }
 
 ACE_INLINE int
@@ -523,7 +520,7 @@ ACE_OS::getcwd (wchar_t *buf, size_t size)
   ACE_UNUSED_ARG (size);
   ACE_NOTSUP_RETURN (0);
 #  elif defined (ACE_WIN32)
-  return ::_wgetcwd (buf, ACE_static_cast (int, size));
+  return ::_wgetcwd (buf, static_cast<int> (size));
 #  else
   char *narrow_buf = new char[size];
   char *result = 0;
@@ -551,13 +548,11 @@ ACE_OS::getgid (void)
 # endif /* VXWORKS || ACE_PSOS */
 }
 
-#if !defined (ACE_WIN32)
-
 ACE_INLINE int
 ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
 {
   ACE_OS_TRACE ("ACE_OS::getopt");
-#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY)
+#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY) || defined (ACE_WIN32)
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
   ACE_UNUSED_ARG (optstring);
@@ -567,21 +562,6 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
 # endif /* VXWORKS */
 }
 
-#else /* ACE_WIN32 */
-
-ACE_INLINE int
-ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
-{
-  ACE_UNUSED_ARG (argc);
-  ACE_UNUSED_ARG (argv);
-  ACE_UNUSED_ARG (optstring);
-
-  ACE_OS_TRACE ("ACE_OS::getopt");
-  ACE_NOTSUP_RETURN (-1);
-}
-
-#endif /* !ACE_WIN32 */
-
 ACE_INLINE pid_t
 ACE_OS::getpgid (pid_t pid)
 {
@@ -926,8 +906,7 @@ ACE_INLINE int
 ACE_OS::readlink (const char *path, char *buf, size_t bufsiz)
 {
   ACE_OS_TRACE ("ACE_OS::readlink");
-# if defined (ACE_LACKS_READLINK) || \
-     defined (ACE_HAS_WINCE) || defined (ACE_WIN32)
+# if defined (ACE_LACKS_READLINK)
   ACE_UNUSED_ARG (path);
   ACE_UNUSED_ARG (buf);
   ACE_UNUSED_ARG (bufsiz);
@@ -980,7 +959,7 @@ ACE_OS::sbrk (int brk)
   ACE_NOTSUP_RETURN (0);
 #else
   ACE_OSCALL_RETURN (::sbrk (brk), void *, 0);
-#endif /* VXWORKS */
+#endif /* ACE_LACKS_SBRK */
 }
 
 ACE_INLINE int
@@ -1166,6 +1145,10 @@ ACE_OS::swab (const void *src,
   char *from = const_cast<char *> (tmp);
   char *to = static_cast<char *> (dest);
   ::swab (from, to, length);
+#elif defined (ACE_HAS_CONST_CHAR_SWAB)
+  const char *from = static_cast<const char*> (src);
+  char *to = static_cast<char *> (dest);
+  ::swab (from, to, length);
 #else
   ::swab (src, dest, length);
 #endif /* ACE_LACKS_SWAB */
@@ -1276,13 +1259,13 @@ ACE_INLINE int
 ACE_OS::unlink (const char *path)
 {
   ACE_OS_TRACE ("ACE_OS::unlink");
-# if defined (VXWORKS)
+# if defined (ACE_HAS_NONCONST_UNLINK)
   ACE_OSCALL_RETURN (::unlink (const_cast<char *> (path)), int, -1);
 # elif defined (ACE_PSOS) && ! defined (ACE_PSOS_LACKS_PHILE)
-  ACE_OSCALL_RETURN (::remove_f ((char *) path), int , -1);
+  ACE_OSCALL_RETURN (::remove_f (const_char <char *> (path)), int , -1);
 # elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_C_LIBRARY)
   int result;
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::remove ((char *) path),
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::remove (const_char <char *> (path)),
                                        result),
                      int, -1);
 # elif defined (ACE_HAS_WINCE)
@@ -1294,7 +1277,7 @@ ACE_OS::unlink (const char *path)
   ACE_NOTSUP_RETURN (-1);
 # else
   ACE_OSCALL_RETURN (::unlink (path), int, -1);
-# endif /* VXWORKS */
+# endif /* ACE_HAS_NONCONST_UNLINK */
 }
 
 #if defined (ACE_HAS_WCHAR)
diff --git a/ace/OS_NS_wchar.cpp b/ace/OS_NS_wchar.cpp
index 7150d7f3627..5e09dfc0a8d 100644
--- a/ace/OS_NS_wchar.cpp
+++ b/ace/OS_NS_wchar.cpp
@@ -11,6 +11,7 @@ ACE_RCSID(ace, OS_NS_wchar, "$Id$")
 
 #if defined (ACE_HAS_WCHAR)
 #  include "ace/OS_NS_ctype.h"
+#  include "ace/OS_NS_string.h"
 #endif /* ACE_HAS_WCHAR */
 
 // The following wcs*_emulation methods were created based on BSD code:
@@ -68,8 +69,8 @@ wchar_t *
 ACE_OS::wcschr_emulation (const wchar_t *string, wint_t c)
 {
   for (;*string ; ++string)
-    if (*string == ACE_static_cast (wchar_t, c))
-      return ACE_const_cast (wchar_t *, string);
+    if (*string == static_cast<wchar_t> (c))
+      return const_cast<wchar_t *> (string);
 
   return 0;
 }
@@ -290,7 +291,7 @@ ACE_OS::wcspbrk_emulation (const wchar_t *string,
     {
       for (scanp = charset; (sc = *scanp++) != 0;)
         if (sc == c)
-          return ACE_const_cast (wchar_t *, string - 1);
+          return const_cast<wchar_t *> (string - 1);
     }
 
   return 0;
@@ -303,7 +304,7 @@ ACE_OS::wcsrchr_emulation (const wchar_t *s, wint_t c)
 {
   const wchar_t *p = s + ACE_OS::strlen (s);
 
-  while (*p != ACE_static_cast (wchar_t, c))
+  while (*p != static_cast<wchar_t> (c))
     if (p == s)
       return 0;
     else
@@ -317,7 +318,7 @@ ACE_OS::wcsrchr_emulation (wchar_t *s, wint_t c)
 {
   wchar_t *p = s + ACE_OS::strlen (s);
 
-  while (*p != ACE_static_cast(wchar_t, c))
+  while (*p != static_cast<wchar_t> (c))
     if (p == s)
       return 0;
     else
@@ -356,7 +357,7 @@ ACE_OS::wcsstr_emulation (const wchar_t *string,
 
   if ((c = *charset++) != 0)
     {
-      len = strlen(charset);
+      len = ACE_OS::strlen (charset);
       do
         {
           do
@@ -364,11 +365,11 @@ ACE_OS::wcsstr_emulation (const wchar_t *string,
               if ((sc = *string++) == 0)
                 return 0;
             } while (sc != c);
-        } while (strncmp(string, charset, len) != 0);
+        } while (ACE_OS::strncmp (string, charset, len) != 0);
       string--;
     }
 
-  return ACE_const_cast (wchar_t *, string);
+  return const_cast<wchar_t *> (string);
 }
 #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSTR */
 
diff --git a/ace/OS_TLI.cpp b/ace/OS_TLI.cpp
index 0a8ad8269cc..a2b7ada501c 100644
--- a/ace/OS_TLI.cpp
+++ b/ace/OS_TLI.cpp
@@ -6,8 +6,4 @@ ACE_RCSID(ace, OS_TLI, "$Id$")
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_TLI.inl"
-#else /* !ACE_HAS_INLINED_OSCALLS */
-#if defined (__hpux) && !defined (__GNUG__)
-static int shut_up_aCC = 0;
-#endif /* HPUX && !g++ */
 #endif /* !ACE_HAS_INLINED_OS_CALLS */
diff --git a/ace/OS_TLI.inl b/ace/OS_TLI.inl
index 09595026dcd..d88655338fb 100644
--- a/ace/OS_TLI.inl
+++ b/ace/OS_TLI.inl
@@ -3,10 +3,10 @@
 
 #include "ace/OS_NS_errno.h"
 
+namespace ACE_OS {
+
 ACE_INLINE int
-ACE_OS::t_accept (ACE_HANDLE handle,
-                  ACE_HANDLE reshandle,
-                  struct t_call *call)
+t_accept (ACE_HANDLE handle, ACE_HANDLE reshandle, struct t_call *call)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_accept (handle, reshandle, call), int, -1);
@@ -20,8 +20,7 @@ ACE_OS::t_accept (ACE_HANDLE handle,
 }
 
 ACE_INLINE char *
-ACE_OS::t_alloc (ACE_HANDLE handle, int struct_type,
-                 int fields)
+t_alloc (ACE_HANDLE handle, int struct_type, int fields)
 {
 #if defined (ACE_HAS_TLI)
 #  if (_XOPEN_SOURCE - 0 >= 500)
@@ -44,8 +43,7 @@ ACE_OS::t_alloc (ACE_HANDLE handle, int struct_type,
 }
 
 ACE_INLINE int
-ACE_OS::t_bind (ACE_HANDLE handle, struct t_bind *req,
-                struct t_bind *ret)
+t_bind (ACE_HANDLE handle, struct t_bind *req, struct t_bind *ret)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_bind (handle, req, ret), int, -1);
@@ -59,7 +57,7 @@ ACE_OS::t_bind (ACE_HANDLE handle, struct t_bind *req,
 }
 
 ACE_INLINE int
-ACE_OS::t_close (ACE_HANDLE handle)
+t_close (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_close (handle), int, -1);
@@ -71,9 +69,9 @@ ACE_OS::t_close (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_connect(ACE_HANDLE fildes,
-                  struct t_call *sndcall,
-                  struct t_call *rcvcall)
+t_connect(ACE_HANDLE fildes,
+          struct t_call *sndcall,
+          struct t_call *rcvcall)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_connect (fildes, sndcall, rcvcall), int, -1);
@@ -87,7 +85,7 @@ ACE_OS::t_connect(ACE_HANDLE fildes,
 }
 
 ACE_INLINE void
-ACE_OS::t_error (const char *errmsg)
+t_error (const char *errmsg)
 {
 #if defined (ACE_HAS_TLI)
 #if defined (ACE_HAS_BROKEN_T_ERROR)
@@ -101,7 +99,7 @@ ACE_OS::t_error (const char *errmsg)
 }
 
 ACE_INLINE int
-ACE_OS::t_free (char *ptr, int struct_type)
+t_free (char *ptr, int struct_type)
 {
 #if defined (ACE_HAS_TLI)
   if (ptr == 0)
@@ -116,7 +114,7 @@ ACE_OS::t_free (char *ptr, int struct_type)
 }
 
 ACE_INLINE int
-ACE_OS::t_getinfo (ACE_HANDLE handle, struct t_info *info)
+t_getinfo (ACE_HANDLE handle, struct t_info *info)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_getinfo (handle, info), int, -1);
@@ -129,9 +127,7 @@ ACE_OS::t_getinfo (ACE_HANDLE handle, struct t_info *info)
 }
 
 ACE_INLINE int
-ACE_OS::t_getname (ACE_HANDLE handle,
-                   struct netbuf *namep,
-                   int type)
+t_getname (ACE_HANDLE handle, struct netbuf *namep, int type)
 {
 #if defined (ACE_HAS_XTI)
   struct t_bind bound, peer;
@@ -181,7 +177,7 @@ ACE_OS::t_getname (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_getstate (ACE_HANDLE handle)
+t_getstate (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_getstate (handle), int, -1);
@@ -193,7 +189,7 @@ ACE_OS::t_getstate (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_listen (ACE_HANDLE handle, struct t_call *call)
+t_listen (ACE_HANDLE handle, struct t_call *call)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_listen (handle, call), int, -1);
@@ -206,7 +202,7 @@ ACE_OS::t_listen (ACE_HANDLE handle, struct t_call *call)
 }
 
 ACE_INLINE int
-ACE_OS::t_look (ACE_HANDLE handle)
+t_look (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_look (handle), int, -1);
@@ -218,7 +214,7 @@ ACE_OS::t_look (ACE_HANDLE handle)
 }
 
 ACE_INLINE ACE_HANDLE
-ACE_OS::t_open (char *path, int oflag, struct t_info *info)
+t_open (char *path, int oflag, struct t_info *info)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_open (path, oflag, info), ACE_HANDLE, ACE_INVALID_HANDLE);
@@ -232,9 +228,7 @@ ACE_OS::t_open (char *path, int oflag, struct t_info *info)
 }
 
 ACE_INLINE int
-ACE_OS::t_optmgmt (ACE_HANDLE handle,
-                   struct t_optmgmt *req,
-                   struct t_optmgmt *ret)
+t_optmgmt (ACE_HANDLE handle, struct t_optmgmt *req, struct t_optmgmt *ret)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_optmgmt (handle, req, ret), int, -1);
@@ -248,10 +242,10 @@ ACE_OS::t_optmgmt (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_rcv (ACE_HANDLE handle,
-               char *buf,
-               unsigned int nbytes,
-               int *flags)
+t_rcv (ACE_HANDLE handle,
+       char *buf,
+       unsigned int nbytes,
+       int *flags)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcv (handle, buf, nbytes, flags),
@@ -267,7 +261,7 @@ ACE_OS::t_rcv (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_rcvdis (ACE_HANDLE handle, struct t_discon *discon)
+t_rcvdis (ACE_HANDLE handle, struct t_discon *discon)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvdis (handle, discon), int, -1);
@@ -280,7 +274,7 @@ ACE_OS::t_rcvdis (ACE_HANDLE handle, struct t_discon *discon)
 }
 
 ACE_INLINE int
-ACE_OS::t_rcvrel (ACE_HANDLE handle)
+t_rcvrel (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvrel (handle), int, -1);
@@ -292,9 +286,9 @@ ACE_OS::t_rcvrel (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_rcvudata (ACE_HANDLE handle,
-                    struct t_unitdata *unitdata,
-                    int *flags)
+t_rcvudata (ACE_HANDLE handle,
+            struct t_unitdata *unitdata,
+            int *flags)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvudata (handle, unitdata, flags),
@@ -309,7 +303,7 @@ ACE_OS::t_rcvudata (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr)
+t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvuderr (handle, uderr), int, -1);
@@ -322,10 +316,10 @@ ACE_OS::t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr)
 }
 
 ACE_INLINE int
-ACE_OS::t_snd (ACE_HANDLE handle,
-               const char *buf,
-               unsigned int nbytes,
-               int flags)
+t_snd (ACE_HANDLE handle,
+       const char *buf,
+       unsigned int nbytes,
+       int flags)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_snd (handle, (char *) buf, nbytes, flags), int, -1);
@@ -340,7 +334,7 @@ ACE_OS::t_snd (ACE_HANDLE handle,
 }
 
 ACE_INLINE int
-ACE_OS::t_snddis (ACE_HANDLE handle, struct t_call *call)
+t_snddis (ACE_HANDLE handle, struct t_call *call)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_snddis (handle, call), int, -1);
@@ -353,7 +347,7 @@ ACE_OS::t_snddis (ACE_HANDLE handle, struct t_call *call)
 }
 
 ACE_INLINE int
-ACE_OS::t_sndrel (ACE_HANDLE handle)
+t_sndrel (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_sndrel (handle), int, -1);
@@ -365,7 +359,7 @@ ACE_OS::t_sndrel (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_sync (ACE_HANDLE handle)
+t_sync (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_sync (handle), int, -1);
@@ -377,7 +371,7 @@ ACE_OS::t_sync (ACE_HANDLE handle)
 }
 
 ACE_INLINE int
-ACE_OS::t_unbind (ACE_HANDLE handle)
+t_unbind (ACE_HANDLE handle)
 {
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_unbind (handle), int, -1);
@@ -387,3 +381,5 @@ ACE_OS::t_unbind (ACE_HANDLE handle)
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_TLI */
 }
+
+}  /* end namespace ACE_OS */
diff --git a/ace/OS_Thread_Adapter.cpp b/ace/OS_Thread_Adapter.cpp
index 85f8caf1670..1f7e94a2890 100644
--- a/ace/OS_Thread_Adapter.cpp
+++ b/ace/OS_Thread_Adapter.cpp
@@ -43,7 +43,7 @@ ACE_OS_Thread_Adapter::invoke (void)
 
   // Extract the arguments.
   ACE_THR_FUNC_INTERNAL func =
-    ACE_reinterpret_cast (ACE_THR_FUNC_INTERNAL, this->user_func_);
+    reinterpret_cast<ACE_THR_FUNC_INTERNAL> (this->user_func_);
   void *arg = this->arg_;
 
   // Delete ourselves since we don't need <this> anymore.  Make sure
@@ -80,7 +80,7 @@ ACE_OS_Thread_Adapter::invoke (void)
             // Invoke the start hook to give the user a chance to
             // perform some initialization processing before the
             // <func> is invoked.
-            status = hook->start (ACE_reinterpret_cast (ACE_THR_FUNC, func),
+            status = hook->start (reinterpret_cast<ACE_THR_FUNC> (func),
                                   arg);
           else
             {
@@ -109,8 +109,7 @@ ACE_OS_Thread_Adapter::invoke (void)
       // Task::svc_run to 0.
 #if 0
       // Call the <Task->close> hook.
-      if (func == ACE_reinterpret_cast (ACE_THR_FUNC_INTERNAL,
-                                        ACE_Task_Base::svc_run))
+      if (func == reinterpret_cast<ACE_THR_FUNC_INTERNAL> (ACE_Task_Base::svc_run))
         {
           ACE_Task_Base *task_ptr = (ACE_Task_Base *) arg;
           ACE_Thread_Manager *thr_mgr_ptr = task_ptr->thr_mgr ();
diff --git a/ace/OS_main.cpp b/ace/OS_main.cpp
index 1e926b58ad2..abf27582818 100644
--- a/ace/OS_main.cpp
+++ b/ace/OS_main.cpp
@@ -74,7 +74,7 @@ int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */
   return ace_main_i (argc, argv);           /* what the user calls "main" */ 
 }
 
-#  elif !defined (ACE_WINCE)
+#  elif !defined (ACE_HAS_WINCE)
 
 #    if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
 int ACE_Main_Base::run (int argc, ACE_TCHAR *argv[])
@@ -102,56 +102,18 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi
 } 
 #    endif /* ACE_WIN32 && ACE_USES_WCHAR */
 
-#  else /* ACE_WINCE */
-
-int ACE_Main_Base::run (int argc, ACE_TCHAR *argv[])
-{
-  return this->run_i (argc, argv);
-}
+#  else /* ACE_HAS_WINCE */
 
 // CE only gets a command line string;  no argv. So we need to convert it
 // when the main entrypoint expects argc/argv. ACE_ARGV supports this.
+#    include "ace/OS_NS_string.h"
+#    include "ace/ACE.h"
 #    include "ace/ARGV.h"
 
-// Support for ACE_TMAIN, which is a recommended way. It would be nice if
-// CE had CommandLineToArgvW()... but it's only on NT3.5 and up.
-
-int WINAPI ace_os_wintmain_i (ACE_Main_Base &mbase, HINSTANCE hInstance,
-                              HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
-{
-  ACE_TCHAR cmdline[1024];
-  ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program "));
-  ACE_OS::strcat (cmdline, lpCmdLine);
-  ACE_ARGV ce_argv (cmdline);
-  ACE::init ();
-  ACE_MAIN_OBJECT_MANAGER
-  int i = mbase.run (ce_argv.argc (), ce_argv.argv ());
-  ACE::fini ();
-  return i;
-}
-
-// Support for wchar_t but still can't fit to CE because of the command
-// line parameters.
-int WINAPI ace_os_winwmain_i (ACE_Main_Base &mbase, HINSTANCE hInstance,
-                              HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
-{
-  ACE_TCHAR cmdline[1024];
-  ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program "));
-  ACE_OS::strcat (cmdline, lpCmdLine);
-  ACE_ARGV ce_argv (cmdline);
-  ACE::init ();
-  ACE_MAIN_OBJECT_MANAGER
-  int i = mbase.run (ce_argv.argc (), ce_argv.argv ());
-  ACE::fini ();
-  return i;
-}
-
-// Supporting legacy 'main' is A LOT easier for users than changing existing
-// code on WinCE. Unfortunately, evc 3 can't grok a #include within the macro
-// expansion, so it needs to go out here.
-#    include "ace/Argv_Type_Converter.h"
-int WINAPI ace_os_winmain_i (ACE_Main_Base &mbase, HINSTANCE hInstance,
-                             HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
+int ACE_Main_Base::run (HINSTANCE,
+                        HINSTANCE,
+                        LPWSTR lpCmdLine,
+                        int)
 {
   ACE_TCHAR cmdline[1024];
   ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program "));
@@ -159,12 +121,10 @@ int WINAPI ace_os_winmain_i (ACE_Main_Base &mbase, HINSTANCE hInstance,
   ACE_ARGV ce_argv (cmdline);
   ACE::init ();
   ACE_MAIN_OBJECT_MANAGER
-  ACE_Argv_Type_Converter command_line (ce_argv.argc (), ce_argv.argv ());
-  int i = mbase.run (command_line.get_argc(), command_line.get_ASCII_argv());
+  int i = this->run_i (ce_argv.argc (), ce_argv.argv ());
   ACE::fini ();
   return i;
 }
-int ace_main_i
 
-#  endif   /* !ACE_WINCE */
+#  endif   /* !ACE_HAS_WINCE */
 # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
diff --git a/ace/OS_main.h b/ace/OS_main.h
index 87e932a4dd9..dc9d87300f2 100644
--- a/ace/OS_main.h
+++ b/ace/OS_main.h
@@ -87,7 +87,7 @@ ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
 int \
 ace_main_i
 
-#   elif !defined (ACE_WINCE)
+#   elif !defined (ACE_HAS_WINCE)
 
 #     if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
 class ACE_Export ACE_Main_Base
@@ -155,16 +155,11 @@ public:
 #       undef ACE_TMAIN
 #     endif  // ACE_TMAIN
 
-// CE only gets a command line string;  no argv. So we need to convert it
-// when the main entrypoint expects argc/argv. ACE_ARGV supports this.
-#     include "ace/ARGV.h"
-
 // Support for ACE_TMAIN, which is a recommended way. It would be nice if
 // CE had CommandLineToArgvW()... but it's only on NT3.5 and up.
 
 #     define ACE_TMAIN \
 ace_tmain_i (int, ACE_TCHAR *[]); \
-ACE_Export int ace_os_wintmain_i (ACE_Main_Base&, HINSTANCE, HINSTANCE, LPWSTR, int);  /* forward declaration */ \
 class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \
 inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[])  \
 { \
@@ -173,7 +168,7 @@ inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[])  \
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \
 { \
   ACE_Main m; \
-  return ace_os_wintmain_i (m, hInstance, hPrevInstance, lpCmdLine, nCmdShow); \
+  return m.run (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \
 } \
 int ace_tmain_i
 
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index c911792a188..fe1ad9d359e 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -259,7 +259,7 @@ ACE_Object_Manager::init (void)
 #     endif /* ! ACE_LACKS_ACE_SVCCONF */
 
           // Open the main thread's ACE_Log_Msg.
-          if (NULL == ACE_LOG_MSG)
+          if (0 == ACE_LOG_MSG)
             return -1;
         }
 
diff --git a/ace/Object_Manager_Base.cpp b/ace/Object_Manager_Base.cpp
index 6a2b512ef67..4a04cb16348 100644
--- a/ace/Object_Manager_Base.cpp
+++ b/ace/Object_Manager_Base.cpp
@@ -213,21 +213,21 @@ ACE_OS_Object_Manager::init (void)
           ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_OS_MONITOR_LOCK)
           if (ACE_OS::thread_mutex_init
               // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-              (ACE_reinterpret_cast (ACE_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0)
+              (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0)
             ACE_OS_Object_Manager::print_error_message (
               __LINE__, ACE_LIB_TEXT ("ACE_OS_MONITOR_LOCK"));
           ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t,
                                      ACE_TSS_CLEANUP_LOCK)
           if (ACE_OS::recursive_mutex_init
               // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-              (ACE_reinterpret_cast (ACE_recursive_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0)
+              (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0)
             ACE_OS_Object_Manager::print_error_message (
               __LINE__, ACE_LIB_TEXT ("ACE_TSS_CLEANUP_LOCK"));
           ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t,
                                      ACE_LOG_MSG_INSTANCE_LOCK)
           if (ACE_OS::thread_mutex_init
               // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-              (ACE_reinterpret_cast (ACE_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_LOG_MSG_INSTANCE_LOCK])) != 0)
+              (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_LOG_MSG_INSTANCE_LOCK])) != 0)
             ACE_OS_Object_Manager::print_error_message (
               __LINE__, ACE_LIB_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK"));
 #   if defined (ACE_HAS_TSS_EMULATION)
@@ -235,7 +235,7 @@ ACE_OS_Object_Manager::init (void)
                                      ACE_TSS_KEY_LOCK)
           if (ACE_OS::recursive_mutex_init
               // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-              (ACE_reinterpret_cast (ACE_recursive_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0)
+              (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0)
             ACE_OS_Object_Manager::print_error_message (
               __LINE__, ACE_LIB_TEXT ("ACE_TSS_KEY_LOCK"));
 #     if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
@@ -243,7 +243,7 @@ ACE_OS_Object_Manager::init (void)
                                      ACE_TSS_BASE_LOCK)
           if (ACE_OS::recursive_mutex_init
               // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-              (ACE_reinterpret_cast (ACE_recursive_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0)
+              (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0)
             ACE_OS_Object_Manager::print_error_message (
               __LINE__, ACE_LIB_TEXT ("ACE_TSS_BASE_LOCK"));
 #     endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
@@ -320,7 +320,7 @@ ACE_OS_Object_Manager::fini (void)
 #   if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK)
       if (ACE_OS::thread_mutex_destroy
           // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-          (ACE_reinterpret_cast (ACE_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0)
+          (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0)
         ACE_OS_Object_Manager::print_error_message (
           __LINE__, ACE_LIB_TEXT ("ACE_OS_MONITOR_LOCK"));
 #   endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */
@@ -329,7 +329,7 @@ ACE_OS_Object_Manager::fini (void)
 #   if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK)
       if (ACE_OS::recursive_mutex_destroy
           // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-          (ACE_reinterpret_cast (ACE_recursive_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0)
+          (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0)
         ACE_OS_Object_Manager::print_error_message (
           __LINE__, ACE_LIB_TEXT ("ACE_TSS_CLEANUP_LOCK"));
 #   endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */
@@ -338,7 +338,7 @@ ACE_OS_Object_Manager::fini (void)
 #   if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK)
       if (ACE_OS::thread_mutex_destroy
           // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-          (ACE_reinterpret_cast (ACE_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object [ACE_LOG_MSG_INSTANCE_LOCK])) != 0)
+          (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object [ACE_LOG_MSG_INSTANCE_LOCK])) != 0)
         ACE_OS_Object_Manager::print_error_message (
           __LINE__, ACE_LIB_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK "));
 #   endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */
@@ -348,7 +348,7 @@ ACE_OS_Object_Manager::fini (void)
 #     if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK)
         if (ACE_OS::recursive_mutex_destroy
             // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-            (ACE_reinterpret_cast (ACE_recursive_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0)
+            (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0)
           ACE_OS_Object_Manager::print_error_message (
             __LINE__, ACE_LIB_TEXT ("ACE_TSS_KEY_LOCK"));
 #     endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */
@@ -358,7 +358,7 @@ ACE_OS_Object_Manager::fini (void)
 #       if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK)
           if (ACE_OS::recursive_mutex_destroy
               // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor.
-              (ACE_reinterpret_cast (ACE_recursive_thread_mutex_t *, ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0)
+              (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0)
             ACE_OS_Object_Manager::print_error_message (
               __LINE__, ACE_LIB_TEXT ("ACE_TSS_BASE_LOCK"));
 #       endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */
@@ -396,12 +396,12 @@ int
 ACE_OS_Object_Manager::at_exit (ACE_EXIT_HOOK func)
 {
   return exit_info_.at_exit_i (&ace_exit_hook_marker,
-                               ACE_reinterpret_cast (ACE_CLEANUP_FUNC, func),
+                               reinterpret_cast <ACE_CLEANUP_FUNC> (func),
                                0);
 }
 
 void
-ACE_OS_Object_Manager::print_error_message (u_int line_number,
+ACE_OS_Object_Manager::print_error_message (unsigned int line_number,
                                             const ACE_TCHAR *message)
 {
   // To avoid duplication of these const strings in OS.o.
diff --git a/ace/Object_Manager_Base.h b/ace/Object_Manager_Base.h
index dc09e8daeb5..4188e008835 100644
--- a/ace/Object_Manager_Base.h
+++ b/ace/Object_Manager_Base.h
@@ -114,7 +114,7 @@ protected:
    * application, then the application is responsible for destroying
    * it.)
    */
-  u_int dynamically_allocated_;
+  unsigned int dynamically_allocated_;
 
   /// Link to next Object_Manager, for chaining.
   ACE_Object_Manager_Base *next_;
@@ -237,7 +237,7 @@ public:
 #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
   /// For use by init () and fini (), to consolidate error reporting.
-  static void print_error_message (u_int line_number, const ACE_TCHAR *message);
+  static void print_error_message (unsigned int line_number, const ACE_TCHAR *message);
 
   /// This class is for internal use by ACE_OS, etc., only.
   friend class ACE_Object_Manager;
diff --git a/ace/Obstack_T.cpp b/ace/Obstack_T.cpp
index b32171b7337..4fdeeae1c26 100644
--- a/ace/Obstack_T.cpp
+++ b/ace/Obstack_T.cpp
@@ -95,8 +95,7 @@ ACE_Obstack_T<CHAR>::grow (CHAR c)
 
   if (this->request (1) == 0)
     {
-      CHAR *retv = ACE_reinterpret_cast (CHAR *,
-                                         this->curr_->cur_);
+      CHAR *retv = reinterpret_cast<CHAR *> (this->curr_->cur_);
       this->curr_->cur_ += sizeof (CHAR);
       *retv = c;
       return retv;
@@ -113,8 +112,7 @@ ACE_Obstack_T<CHAR>::new_chunk (void)
   ACE_Obchunk *temp;
 
   ACE_NEW_MALLOC_RETURN (temp,
-                         ACE_static_cast (ACE_Obchunk *,
-                           this->allocator_strategy_->malloc
+                         static_cast<ACE_Obchunk *> (this->allocator_strategy_->malloc
                              (sizeof (class ACE_Obchunk) + this->size_)),
                          ACE_Obchunk (this->size_),
                          0);
@@ -172,8 +170,7 @@ template <class CHAR> void
 ACE_Obstack_T<CHAR>::unwind (void* obj)
 {
   if (obj >= this->curr_->contents_ && obj < this->curr_->end_)
-    this->curr_->block_ = this->curr_->cur_ = ACE_reinterpret_cast (char*,
-                                                                    obj);
+    this->curr_->block_ = this->curr_->cur_ = reinterpret_cast<char*> (obj);
   else
     this->unwind_i (obj);
 }
@@ -189,8 +186,7 @@ ACE_Obstack_T<CHAR>::unwind_i (void* obj)
   if (curr)
     {
       this->curr_ = curr;
-      this->curr_->block_ = this->curr_->cur_ = ACE_reinterpret_cast (char*,
-                                                                      obj);
+      this->curr_->block_ = this->curr_->cur_ = reinterpret_cast<char*> (obj);
     }
   else if (obj != 0)
     ACE_ERROR ((LM_ERROR,
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp
index 10558ce4fa7..e03b6d8ae1b 100644
--- a/ace/POSIX_Asynch_IO.cpp
+++ b/ace/POSIX_Asynch_IO.cpp
@@ -96,8 +96,7 @@ int
 ACE_POSIX_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor_impl)
 {
   // Get to the platform specific implementation.
-  ACE_POSIX_Proactor *posix_proactor = ACE_dynamic_cast (ACE_POSIX_Proactor *,
-                                                         proactor_impl);
+  ACE_POSIX_Proactor *posix_proactor = dynamic_cast<ACE_POSIX_Proactor *> (proactor_impl);
 
   if (posix_proactor == 0)
     ACE_ERROR_RETURN ((LM_ERROR, "Dynamic cast to POSIX Proactor failed\n"), -1);
@@ -110,16 +109,17 @@ ACE_POSIX_Asynch_Result::~ACE_POSIX_Asynch_Result (void)
 {
 }
 
-ACE_POSIX_Asynch_Result::ACE_POSIX_Asynch_Result (ACE_Handler &handler,
-                                                  const void* act,
-                                                  ACE_HANDLE event,
-                                                  u_long offset,
-                                                  u_long offset_high,
-                                                  int priority,
-                                                  int signal_number)
+ACE_POSIX_Asynch_Result::ACE_POSIX_Asynch_Result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   const void* act,
+   ACE_HANDLE event,
+   u_long offset,
+   u_long offset_high,
+   int priority,
+   int signal_number)
   : ACE_Asynch_Result_Impl (),
     aiocb (),
-    handler_ (handler),
+    handler_proxy_ (handler_proxy),
     act_ (act),
     bytes_transferred_ (0),
     success_ (0),
@@ -145,18 +145,22 @@ ACE_POSIX_Asynch_Result::ACE_POSIX_Asynch_Result (ACE_Handler &handler,
 // ****************************************************************
 
 int
-ACE_POSIX_Asynch_Operation::open (ACE_Handler &handler,
+ACE_POSIX_Asynch_Operation::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                   ACE_HANDLE handle,
                                   const void *completion_key,
                                   ACE_Proactor *proactor)
 {
   this->proactor_ = proactor;
-  this->handler_ = &handler;
+  this->handler_proxy_ = handler_proxy;
   this->handle_ = handle;
 
   // Grab the handle from the <handler> if <handle> is invalid
   if (this->handle_ == ACE_INVALID_HANDLE)
-    this->handle_ = this->handler_->handle ();
+    {
+      ACE_Handler *handler = handler_proxy.get ()->handler ();
+      if (handler != 0)
+        this->handle_ = handler->handle ();
+    }
   if (this->handle_ == ACE_INVALID_HANDLE)
     return -1;
 
@@ -208,7 +212,6 @@ ACE_POSIX_Asynch_Operation::~ACE_POSIX_Asynch_Operation (void)
 ACE_POSIX_Asynch_Operation::ACE_POSIX_Asynch_Operation (ACE_POSIX_Proactor *posix_proactor)
   : ACE_Asynch_Operation_Impl (),
     posix_proactor_ (posix_proactor),
-    handler_ (0),
     handle_  (ACE_INVALID_HANDLE)
 {
 }
@@ -233,17 +236,19 @@ ACE_POSIX_Asynch_Read_Stream_Result::handle (void) const
   return this->aio_fildes;
 }
 
-ACE_POSIX_Asynch_Read_Stream_Result::ACE_POSIX_Asynch_Read_Stream_Result (ACE_Handler &handler,
-                                                                          ACE_HANDLE handle,
-                                                                          ACE_Message_Block &message_block,
-                                                                          size_t bytes_to_read,
-                                                                          const void* act,
-                                                                          ACE_HANDLE event,
-                                                                          int priority,
-                                                                          int signal_number)
+ACE_POSIX_Asynch_Read_Stream_Result::ACE_POSIX_Asynch_Read_Stream_Result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_read,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Read_Stream_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
+    ACE_POSIX_Asynch_Result
+      (handler_proxy, act, event, 0, 0, priority, signal_number),
     message_block_ (message_block)
 {
   this->aio_fildes = handle;
@@ -273,7 +278,9 @@ ACE_POSIX_Asynch_Read_Stream_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Read_Stream::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_read_stream (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_read_stream (result);
 }
 
 ACE_POSIX_Asynch_Read_Stream_Result::~ACE_POSIX_Asynch_Read_Stream_Result (void)
@@ -310,7 +317,7 @@ ACE_POSIX_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
   ACE_POSIX_Asynch_Read_Stream_Result *result = 0;
   ACE_POSIX_Proactor *proactor = this->posix_proactor ();
   ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Read_Stream_Result (*this->handler_,
+                  ACE_POSIX_Asynch_Read_Stream_Result (this->handler_proxy_,
                                                        this->handle_,
                                                        message_block,
                                                        bytes_to_read,
@@ -352,7 +359,7 @@ ACE_POSIX_Asynch_Write_Stream_Result::handle (void) const
 }
 
 ACE_POSIX_Asynch_Write_Stream_Result::ACE_POSIX_Asynch_Write_Stream_Result
-  (ACE_Handler &handler,
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
    ACE_HANDLE handle,
    ACE_Message_Block &message_block,
    size_t bytes_to_write,
@@ -362,7 +369,8 @@ ACE_POSIX_Asynch_Write_Stream_Result::ACE_POSIX_Asynch_Write_Stream_Result
    int signal_number)
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Write_Stream_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
+    ACE_POSIX_Asynch_Result
+      (handler_proxy, act, event, 0, 0, priority, signal_number),
     message_block_ (message_block)
 {
   this->aio_fildes = handle;
@@ -393,7 +401,9 @@ ACE_POSIX_Asynch_Write_Stream_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Write_Stream::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_write_stream (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_write_stream (result);
 }
 
 ACE_POSIX_Asynch_Write_Stream_Result::~ACE_POSIX_Asynch_Write_Stream_Result (void)
@@ -430,7 +440,7 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
   ACE_POSIX_Asynch_Write_Stream_Result *result = 0;
   ACE_POSIX_Proactor *proactor = this->posix_proactor ();
   ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Write_Stream_Result (*this->handler_,
+                  ACE_POSIX_Asynch_Write_Stream_Result (this->handler_proxy_,
                                                         this->handle_,
                                                         message_block,
                                                         bytes_to_write,
@@ -454,7 +464,7 @@ ACE_POSIX_Asynch_Write_Stream::~ACE_POSIX_Asynch_Write_Stream (void)
 // *********************************************************************
 
 ACE_POSIX_Asynch_Read_File_Result::ACE_POSIX_Asynch_Read_File_Result
-  (ACE_Handler &handler,
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
    ACE_HANDLE handle,
    ACE_Message_Block &message_block,
    size_t bytes_to_read,
@@ -467,7 +477,7 @@ ACE_POSIX_Asynch_Read_File_Result::ACE_POSIX_Asynch_Read_File_Result
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Read_Stream_Result_Impl (),
     ACE_Asynch_Read_File_Result_Impl (),
-    ACE_POSIX_Asynch_Read_Stream_Result (handler,
+    ACE_POSIX_Asynch_Read_Stream_Result (handler_proxy,
                                          handle,
                                          message_block,
                                          bytes_to_read,
@@ -505,7 +515,9 @@ ACE_POSIX_Asynch_Read_File_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Read_File::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_read_file (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_read_file (result);
 }
 
 ACE_POSIX_Asynch_Read_File_Result::~ACE_POSIX_Asynch_Read_File_Result (void)
@@ -545,7 +557,7 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block,
   ACE_POSIX_Asynch_Read_File_Result *result = 0;
   ACE_POSIX_Proactor *proactor = this->posix_proactor ();
   ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Read_File_Result (*this->handler_,
+                  ACE_POSIX_Asynch_Read_File_Result (this->handler_proxy_,
                                                      this->handle_,
                                                      message_block,
                                                      bytes_to_read,
@@ -576,16 +588,16 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block,
                                   int signal_number)
 {
   return ACE_POSIX_Asynch_Read_Stream::read (message_block,
-                                                   bytes_to_read,
-                                                   act,
-                                                   priority,
-                                                   signal_number);
+                                             bytes_to_read,
+                                             act,
+                                             priority,
+                                             signal_number);
 }
 
 // ************************************************************
 
 ACE_POSIX_Asynch_Write_File_Result::ACE_POSIX_Asynch_Write_File_Result
-  (ACE_Handler &handler,
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
    ACE_HANDLE handle,
    ACE_Message_Block &message_block,
    size_t bytes_to_write,
@@ -598,7 +610,7 @@ ACE_POSIX_Asynch_Write_File_Result::ACE_POSIX_Asynch_Write_File_Result
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Write_Stream_Result_Impl (),
     ACE_Asynch_Write_File_Result_Impl (),
-    ACE_POSIX_Asynch_Write_Stream_Result (handler,
+    ACE_POSIX_Asynch_Write_Stream_Result (handler_proxy,
                                           handle,
                                           message_block,
                                           bytes_to_write,
@@ -636,7 +648,9 @@ ACE_POSIX_Asynch_Write_File_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Write_File::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_write_file (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_write_file (result);
 }
 
 ACE_POSIX_Asynch_Write_File_Result::~ACE_POSIX_Asynch_Write_File_Result  (void)
@@ -676,7 +690,7 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block,
   ACE_POSIX_Asynch_Write_File_Result *result = 0;
   ACE_POSIX_Proactor *proactor = this->posix_proactor ();
   ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Write_File_Result (*this->handler_,
+                  ACE_POSIX_Asynch_Write_File_Result (this->handler_proxy_,
                                                       this->handle_,
                                                       message_block,
                                                       bytes_to_write,
@@ -741,7 +755,7 @@ ACE_POSIX_Asynch_Accept_Result::accept_handle (void) const
 }
 
 ACE_POSIX_Asynch_Accept_Result::ACE_POSIX_Asynch_Accept_Result
-  (ACE_Handler &handler,
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
    ACE_HANDLE listen_handle,
    ACE_HANDLE accept_handle,
    ACE_Message_Block &message_block,
@@ -753,7 +767,8 @@ ACE_POSIX_Asynch_Accept_Result::ACE_POSIX_Asynch_Accept_Result
 
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Accept_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
+    ACE_POSIX_Asynch_Result
+      (handler_proxy, act, event, 0, 0, priority, signal_number),
     message_block_ (message_block),
     listen_handle_ (listen_handle)
 {
@@ -780,7 +795,9 @@ ACE_POSIX_Asynch_Accept_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Accept::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_accept (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_accept (result);
 }
 
 ACE_POSIX_Asynch_Accept_Result::~ACE_POSIX_Asynch_Accept_Result (void)
@@ -818,7 +835,7 @@ ACE_POSIX_Asynch_Accept::set_handle (ACE_HANDLE handle)
 }
 
 int
-ACE_POSIX_Asynch_Accept::open (ACE_Handler &handler,
+ACE_POSIX_Asynch_Accept::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                ACE_HANDLE handle,
                                const void *completion_key,
                                ACE_Proactor *proactor)
@@ -838,7 +855,7 @@ ACE_POSIX_Asynch_Accept::open (ACE_Handler &handler,
                        ACE_LIB_TEXT("acceptor already open \n")),
                       -1);
 
-  result = ACE_POSIX_Asynch_Operation::open (handler,
+  result = ACE_POSIX_Asynch_Operation::open (handler_proxy,
                                              handle,
                                              completion_key,
                                              proactor);
@@ -909,7 +926,7 @@ ACE_POSIX_Asynch_Accept::accept (ACE_Message_Block &message_block,
     // Create future Asynch_Accept_Result
     ACE_POSIX_Asynch_Accept_Result *result = 0;
     ACE_NEW_RETURN (result,
-                    ACE_POSIX_Asynch_Accept_Result (*this->handler_,
+                    ACE_POSIX_Asynch_Accept_Result (this->handler_proxy_,
                                                     this->handle_,
                                                     accept_handle,
                                                     message_block,
@@ -1233,7 +1250,7 @@ void ACE_POSIX_Asynch_Connect_Result::connect_handle (ACE_HANDLE handle)
 
 
 ACE_POSIX_Asynch_Connect_Result::ACE_POSIX_Asynch_Connect_Result
-  (ACE_Handler &handler,
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
    ACE_HANDLE connect_handle,
    const void* act,
    ACE_HANDLE event,
@@ -1242,7 +1259,8 @@ ACE_POSIX_Asynch_Connect_Result::ACE_POSIX_Asynch_Connect_Result
 
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Connect_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number)
+    ACE_POSIX_Asynch_Result
+      (handler_proxy, act, event, 0, 0, priority, signal_number)
 {
   this->aio_fildes = connect_handle;
   this->aio_nbytes = 0;
@@ -1264,7 +1282,9 @@ ACE_POSIX_Asynch_Connect_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Connect::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_connect (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_connect (result);
 }
 
 ACE_POSIX_Asynch_Connect_Result::~ACE_POSIX_Asynch_Connect_Result (void)
@@ -1303,7 +1323,7 @@ ACE_POSIX_Asynch_Connect::set_handle (ACE_HANDLE)
 }
 
 int
-ACE_POSIX_Asynch_Connect::open (ACE_Handler &handler,
+ACE_POSIX_Asynch_Connect::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                 ACE_HANDLE handle,
                                 const void *completion_key,
                                 ACE_Proactor *proactor)
@@ -1322,7 +1342,7 @@ ACE_POSIX_Asynch_Connect::open (ACE_Handler &handler,
                       -1);
 
   //int result =
-  ACE_POSIX_Asynch_Operation::open (handler,
+  ACE_POSIX_Asynch_Operation::open (handler_proxy,
                                     handle,
                                     completion_key,
                                     proactor);
@@ -1360,13 +1380,13 @@ ACE_POSIX_Asynch_Connect::connect (ACE_HANDLE connect_handle,
     // Create future Asynch_Connect_Result
     ACE_POSIX_Asynch_Connect_Result *result = 0;
     ACE_NEW_RETURN (result,
-                    ACE_POSIX_Asynch_Connect_Result (*this->handler_,
-                                                    connect_handle,
-                                                    act,
-                                                    this->posix_proactor ()->get_handle (),
-                                                    priority,
-                                                    signal_number),
-                  -1);
+                    ACE_POSIX_Asynch_Connect_Result (this->handler_proxy_,
+                                                     connect_handle,
+                                                     act,
+                                                     this->posix_proactor ()->get_handle (),
+                                                     priority,
+                                                     signal_number),
+                    -1);
 
     int rc = connect_i (result,
                         remote_sap,
@@ -1513,8 +1533,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result,
 
   if (local_sap != ACE_Addr::sap_any)
     {
-      sockaddr * laddr = ACE_reinterpret_cast (sockaddr *,
-                                               local_sap.get_addr ());
+      sockaddr * laddr = reinterpret_cast<sockaddr *> (local_sap.get_addr ());
       size_t size = local_sap.get_size ();
 
       if (ACE_OS::bind (handle, laddr, size) == -1)
@@ -1543,8 +1562,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result,
   for (;;)
     {
       int rc = ACE_OS::connect (handle,
-                                ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+                                reinterpret_cast<sockaddr *> (remote_sap.get_addr ()),
                                 remote_sap.get_size ());
       if (rc < 0)  // failure
         {
@@ -1826,7 +1844,7 @@ ACE_POSIX_Asynch_Transmit_File_Result::flags (void) const
 }
 
 ACE_POSIX_Asynch_Transmit_File_Result::ACE_POSIX_Asynch_Transmit_File_Result
-  (ACE_Handler &handler,
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
    ACE_HANDLE socket,
    ACE_HANDLE file,
    ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
@@ -1842,7 +1860,8 @@ ACE_POSIX_Asynch_Transmit_File_Result::ACE_POSIX_Asynch_Transmit_File_Result
 
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Transmit_File_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, offset, offset_high, priority, signal_number),
+    ACE_POSIX_Asynch_Result
+     (handler_proxy, act, event, offset, offset_high, priority, signal_number),
     socket_ (socket),
     header_and_trailer_ (header_and_trailer),
     bytes_per_send_ (bytes_per_send),
@@ -1884,7 +1903,9 @@ ACE_POSIX_Asynch_Transmit_File_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Transmit_File::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_transmit_file (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_transmit_file (result);
 }
 
 ACE_POSIX_Asynch_Transmit_File_Result::~ACE_POSIX_Asynch_Transmit_File_Result (void)
@@ -2014,7 +2035,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void)
   // general <proactor> interface pointer.
 
   // Open Asynch_Read_File.
-  if (this->rf_.open (*this,
+  if (this->rf_.open (this->proxy (),
                       this->result_->file (),
                       0,
                       0) == -1)
@@ -2023,7 +2044,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void)
                       -1);
 
   // Open Asynch_Write_Stream.
-  if (this->ws_.open (*this,
+  if (this->ws_.open (this->proxy (),
                       this->result_->socket (),
                       0,
                       0) == -1)
@@ -2034,7 +2055,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void)
   // Transmit the header.
   if (this->ws_.write (*this->result_->header_and_trailer ()->header (),
                        this->result_->header_and_trailer ()->header_bytes (),
-                       ACE_reinterpret_cast (void *, &this->header_act_),
+                       reinterpret_cast<void *> (&this->header_act_),
                        0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Asynch_Transmit_Handler:transmitting header:write_stream failed\n"),
@@ -2272,7 +2293,7 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
   ACE_POSIX_Asynch_Transmit_File_Result *result = 0;
 
   ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Transmit_File_Result (*this->handler_,
+                  ACE_POSIX_Asynch_Transmit_File_Result (this->handler_proxy_,
                                                          this->handle_,
                                                          file,
                                                          header_and_trailer,
@@ -2357,7 +2378,7 @@ ACE_POSIX_Asynch_Read_Dgram_Result::message_block () const
 }
 
 ACE_POSIX_Asynch_Read_Dgram_Result::ACE_POSIX_Asynch_Read_Dgram_Result
-  (ACE_Handler &handler,
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
    ACE_HANDLE handle,
    ACE_Message_Block *message_block,
    size_t bytes_to_read,
@@ -2370,7 +2391,8 @@ ACE_POSIX_Asynch_Read_Dgram_Result::ACE_POSIX_Asynch_Read_Dgram_Result
 
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Read_Dgram_Result_Impl(),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
+    ACE_POSIX_Asynch_Result
+      (handler_proxy, act, event, 0, 0, priority, signal_number),
     bytes_to_read_ (bytes_to_read),
     message_block_ (message_block),
     remote_address_ (0),
@@ -2405,7 +2427,9 @@ ACE_POSIX_Asynch_Read_Dgram_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Read_Dgram::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_read_dgram (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_read_dgram (result);
 }
 
 ACE_POSIX_Asynch_Read_Dgram_Result::~ACE_POSIX_Asynch_Read_Dgram_Result (void)
@@ -2440,7 +2464,7 @@ ACE_POSIX_Asynch_Write_Dgram_Result::message_block () const
 }
 
 ACE_POSIX_Asynch_Write_Dgram_Result::ACE_POSIX_Asynch_Write_Dgram_Result
-  (ACE_Handler &handler,
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
    ACE_HANDLE handle,
    ACE_Message_Block *message_block,
    size_t bytes_to_write,
@@ -2452,7 +2476,8 @@ ACE_POSIX_Asynch_Write_Dgram_Result::ACE_POSIX_Asynch_Write_Dgram_Result
 
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Write_Dgram_Result_Impl(),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
+    ACE_POSIX_Asynch_Result
+     (handler_proxy, act, event, 0, 0, priority, signal_number),
     bytes_to_write_ (bytes_to_write),
     message_block_ (message_block),
     flags_ (flags),
@@ -2485,7 +2510,9 @@ ACE_POSIX_Asynch_Write_Dgram_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Write_Dgram::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_write_dgram (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_write_dgram (result);
 }
 
 ACE_POSIX_Asynch_Write_Dgram_Result::~ACE_POSIX_Asynch_Write_Dgram_Result (void)
@@ -2511,7 +2538,7 @@ ACE_POSIX_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
   ACE_POSIX_Asynch_Read_Dgram_Result *result = 0;
   ACE_POSIX_Proactor *proactor = this->posix_proactor ();
   ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Read_Dgram_Result (*this->handler_,
+                  ACE_POSIX_Asynch_Read_Dgram_Result (this->handler_proxy_,
                                                       this->handle_,
                                                       message_block,
                                                       space,
@@ -2563,7 +2590,7 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
   ACE_POSIX_Asynch_Write_Dgram_Result *result = 0;
   ACE_POSIX_Proactor *proactor = this->posix_proactor ();
   ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Write_Dgram_Result (*this->handler_,
+                  ACE_POSIX_Asynch_Write_Dgram_Result (this->handler_proxy_,
                                                        this->handle_,
                                                        message_block,
                                                        len,
diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h
index dae1bb2b359..405b6dc9f85 100644
--- a/ace/POSIX_Asynch_IO.h
+++ b/ace/POSIX_Asynch_IO.h
@@ -114,7 +114,7 @@ public:
 
 protected:
   /// Constructor. <Event> is not used on POSIX.
-  ACE_POSIX_Asynch_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                            const void* act,
                            ACE_HANDLE event,
                            u_long offset,
@@ -123,7 +123,7 @@ protected:
                            int signal_number);
 
   /// Handler that will be called back.
-  ACE_Handler &handler_;
+  ACE_Handler::Proxy_Ptr &handler_proxy_;
 
   /**
    * ACT for this operation.
@@ -166,7 +166,7 @@ public:
    * Operation class itself was created by the correct implementation
    * Proactor class.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor = 0);
@@ -209,7 +209,7 @@ protected:
   ACE_Proactor *proactor_;
 
   /// Handler that will receive the callback.
-  ACE_Handler *handler_;
+  ACE_Handler::Proxy_Ptr handler_proxy_;
 
   /// I/O handle used for reading.
   ACE_HANDLE handle_;
@@ -243,7 +243,7 @@ public:
   ACE_HANDLE handle (void) const;
 
 protected:
-  ACE_POSIX_Asynch_Read_Stream_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Read_Stream_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                        ACE_HANDLE handle,
                                        ACE_Message_Block &message_block,
                                        size_t bytes_to_read,
@@ -335,7 +335,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Write_Stream factory.
-  ACE_POSIX_Asynch_Write_Stream_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Write_Stream_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                         ACE_HANDLE handle,
                                         ACE_Message_Block &message_block,
                                         size_t bytes_to_write,
@@ -410,7 +410,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Read_File factory.
-  ACE_POSIX_Asynch_Read_File_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Read_File_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
                                      ACE_Message_Block &message_block,
                                      size_t bytes_to_read,
@@ -514,7 +514,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_File_Result : public virtual ACE_Asynch_
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Write_File factory.
-  ACE_POSIX_Asynch_Write_File_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Write_File_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block &message_block,
                                       size_t bytes_to_write,
@@ -618,7 +618,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Accept factory.
-  ACE_POSIX_Asynch_Accept_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Accept_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                   ACE_HANDLE listen_handle,
                                   ACE_HANDLE accept_handle,
                                   ACE_Message_Block &message_block,
@@ -676,7 +676,7 @@ public:
    * this call to that method. We have put this here to avoid the
    * compiler warnings.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor = 0);
@@ -784,7 +784,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Connect factory.
-  ACE_POSIX_Asynch_Connect_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Connect_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                    ACE_HANDLE  connect_handle,
                                    const void* act,
                                    ACE_HANDLE  event,
@@ -828,7 +828,7 @@ public:
    * this call to that method. We have put this here to avoid the
    * compiler warnings.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor = 0);
@@ -969,7 +969,7 @@ public:
   u_long flags (void) const;
 
 protected:
-  ACE_POSIX_Asynch_Transmit_File_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Transmit_File_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                          ACE_HANDLE socket,
                                          ACE_HANDLE file,
                                          ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
@@ -1142,7 +1142,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Write_Stream factory.
-  ACE_POSIX_Asynch_Write_Dgram_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Write_Dgram_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                        ACE_HANDLE handle,
                                        ACE_Message_Block *message_block,
                                        size_t bytes_to_write,
@@ -1275,7 +1275,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Read_Dgram factory.
-  ACE_POSIX_Asynch_Read_Dgram_Result (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Read_Dgram_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block *message_block,
                                       size_t bytes_to_read,
diff --git a/ace/POSIX_CB_Proactor.cpp b/ace/POSIX_CB_Proactor.cpp
index afae1751103..7bbaa7cc059 100644
--- a/ace/POSIX_CB_Proactor.cpp
+++ b/ace/POSIX_CB_Proactor.cpp
@@ -33,7 +33,7 @@ ACE_POSIX_CB_Proactor::~ACE_POSIX_CB_Proactor (void)
 
 void ACE_POSIX_CB_Proactor::aio_completion_func (sigval_t cb_data)
 {
-  ACE_POSIX_CB_Proactor * impl = ACE_static_cast (ACE_POSIX_CB_Proactor *, cb_data.sival_ptr);
+  ACE_POSIX_CB_Proactor * impl = static_cast<ACE_POSIX_CB_Proactor *> (cb_data.sival_ptr);
   if ( impl != 0 )
     impl->notify_completion (0);
 }
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index af93e541c3d..3e0bbbec2f7 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -38,7 +38,7 @@ class ACE_Export ACE_POSIX_Wakeup_Completion : public ACE_POSIX_Asynch_Result
 {
 public:
   /// Constructor.
-  ACE_POSIX_Wakeup_Completion (ACE_Handler &handler,
+  ACE_POSIX_Wakeup_Completion (ACE_Handler::Proxy_Ptr &handler_proxy,
                                const void *act = 0,
                                ACE_HANDLE event = ACE_INVALID_HANDLE,
                                int priority = 0,
@@ -57,11 +57,11 @@ public:
 
 // *********************************************************************
 ACE_POSIX_Proactor::ACE_POSIX_Proactor (void)
-  :  os_id_ (OS_UNDEFINED)
+  :  os_id_ (ACE_OS_UNDEFINED)
 {
 #if defined(sun)
 
-  os_id_ = OS_SUN; // set family
+  os_id_ = ACE_OS_SUN; // set family
 
   char Buf [32];
 
@@ -70,23 +70,23 @@ ACE_POSIX_Proactor::ACE_POSIX_Proactor (void)
   ACE_OS::sysinfo (SI_RELEASE , Buf, sizeof(Buf)-1);
 
   if (ACE_OS::strcasecmp (Buf , "5.6") == 0)
-    os_id_ = OS_SUN_56;
+    os_id_ = ACE_OS_SUN_56;
   else if (ACE_OS::strcasecmp (Buf , "5.7") == 0)
-    os_id_ = OS_SUN_57;
+    os_id_ = ACE_OS_SUN_57;
   else if (ACE_OS::strcasecmp (Buf , "5.8") == 0)
-    os_id_ = OS_SUN_58;
+    os_id_ = ACE_OS_SUN_58;
 
 #elif defined(HPUX)
 
-  os_id_ = OS_HPUX;   // set family
+  os_id_ = ACE_OS_HPUX;   // set family
 
 #elif defined(__sgi)
 
-  os_id_ = OS_IRIX;   // set family
+  os_id_ = ACE_OS_IRIX;   // set family
 
 #elif defined(__OpenBSD)
 
-  os_id_ = OS_OPENBSD; // set family
+  os_id_ = ACE_OS_OPENBSD; // set family
 
   // do the same
 
@@ -158,18 +158,19 @@ ACE_POSIX_Proactor::create_asynch_read_stream (void)
 }
 
 ACE_Asynch_Read_Stream_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
-                                                      ACE_HANDLE handle,
-                                                      ACE_Message_Block &message_block,
-                                                      size_t bytes_to_read,
-                                                      const void* act,
-                                                      ACE_HANDLE event,
-                                                      int priority,
-                                                      int signal_number)
+ACE_POSIX_Proactor::create_asynch_read_stream_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_read,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Read_Stream_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Read_Stream_Result (handler,
+                  ACE_POSIX_Asynch_Read_Stream_Result (handler_proxy,
                                                        handle,
                                                        message_block,
                                                        bytes_to_read,
@@ -193,18 +194,19 @@ ACE_POSIX_Proactor::create_asynch_write_stream (void)
 }
 
 ACE_Asynch_Write_Stream_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
-                                                       ACE_HANDLE handle,
-                                                       ACE_Message_Block &message_block,
-                                                       size_t bytes_to_write,
-                                                       const void* act,
-                                                       ACE_HANDLE event,
-                                                       int priority,
-                                                       int signal_number)
+ACE_POSIX_Proactor::create_asynch_write_stream_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_write,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Write_Stream_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Write_Stream_Result (handler,
+                  ACE_POSIX_Asynch_Write_Stream_Result (handler_proxy,
                                                         handle,
                                                         message_block,
                                                         bytes_to_write,
@@ -228,20 +230,21 @@ ACE_POSIX_Proactor::create_asynch_read_file (void)
 }
 
 ACE_Asynch_Read_File_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
-                                                    ACE_HANDLE handle,
-                                                    ACE_Message_Block &message_block,
-                                                    size_t bytes_to_read,
-                                                    const void* act,
-                                                    u_long offset,
-                                                    u_long offset_high,
-                                                    ACE_HANDLE event,
-                                                    int priority,
-                                                    int signal_number)
+ACE_POSIX_Proactor::create_asynch_read_file_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_read,
+   const void* act,
+   u_long offset,
+   u_long offset_high,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Read_File_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Read_File_Result (handler,
+                  ACE_POSIX_Asynch_Read_File_Result (handler_proxy,
                                                      handle,
                                                      message_block,
                                                      bytes_to_read,
@@ -267,20 +270,21 @@ ACE_POSIX_Proactor::create_asynch_write_file (void)
 }
 
 ACE_Asynch_Write_File_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
-                                                     ACE_HANDLE handle,
-                                                     ACE_Message_Block &message_block,
-                                                     size_t bytes_to_write,
-                                                     const void* act,
-                                                     u_long offset,
-                                                     u_long offset_high,
-                                                     ACE_HANDLE event,
-                                                     int priority,
-                                                     int signal_number)
+ACE_POSIX_Proactor::create_asynch_write_file_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_write,
+   const void* act,
+   u_long offset,
+   u_long offset_high,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Write_File_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Write_File_Result (handler,
+                  ACE_POSIX_Asynch_Write_File_Result (handler_proxy,
                                                       handle,
                                                       message_block,
                                                       bytes_to_write,
@@ -306,20 +310,21 @@ ACE_POSIX_Proactor::create_asynch_read_dgram (void)
 }
 
 ACE_Asynch_Read_Dgram_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_read_dgram_result (ACE_Handler &handler,
-                                                     ACE_HANDLE handle,
-                                                     ACE_Message_Block *message_block,
-                                                     size_t bytes_to_read,
-                                                     int flags,
-                                                     int protocol_family,
-                                                     const void* act,
-                                                     ACE_HANDLE event ,
-                                                     int priority ,
-                                                     int signal_number)
+ACE_POSIX_Proactor::create_asynch_read_dgram_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block *message_block,
+   size_t bytes_to_read,
+   int flags,
+   int protocol_family,
+   const void* act,
+   ACE_HANDLE event ,
+   int priority ,
+   int signal_number)
 {
   ACE_Asynch_Read_Dgram_Result_Impl *implementation=0;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Read_Dgram_Result(handler,
+                  ACE_POSIX_Asynch_Read_Dgram_Result(handler_proxy,
                                                      handle,
                                                      message_block,
                                                      bytes_to_read,
@@ -347,19 +352,20 @@ ACE_POSIX_Proactor::create_asynch_write_dgram (void)
 }
 
 ACE_Asynch_Write_Dgram_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_write_dgram_result (ACE_Handler &handler,
-                                                      ACE_HANDLE handle,
-                                                      ACE_Message_Block *message_block,
-                                                      size_t bytes_to_write,
-                                                      int flags,
-                                                      const void* act,
-                                                      ACE_HANDLE event,
-                                                      int priority ,
-                                                      int signal_number)
+ACE_POSIX_Proactor::create_asynch_write_dgram_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block *message_block,
+   size_t bytes_to_write,
+   int flags,
+   const void* act,
+   ACE_HANDLE event,
+   int priority ,
+   int signal_number)
 {
   ACE_Asynch_Write_Dgram_Result_Impl *implementation=0;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Write_Dgram_Result(handler,
+                  ACE_POSIX_Asynch_Write_Dgram_Result(handler_proxy,
                                                       handle,
                                                       message_block,
                                                       bytes_to_write,
@@ -386,19 +392,20 @@ ACE_POSIX_Proactor::create_asynch_accept (void)
 }
 
 ACE_Asynch_Accept_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_accept_result (ACE_Handler &handler,
-                                                 ACE_HANDLE listen_handle,
-                                                 ACE_HANDLE accept_handle,
-                                                 ACE_Message_Block &message_block,
-                                                 size_t bytes_to_read,
-                                                 const void* act,
-                                                 ACE_HANDLE event,
-                                                 int priority,
-                                                 int signal_number)
+ACE_POSIX_Proactor::create_asynch_accept_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE listen_handle,
+   ACE_HANDLE accept_handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_read,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Accept_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Accept_Result (handler,
+                  ACE_POSIX_Asynch_Accept_Result (handler_proxy,
                                                   listen_handle,
                                                   accept_handle,
                                                   message_block,
@@ -424,16 +431,17 @@ ACE_POSIX_Proactor::create_asynch_connect (void)
 }
 
 ACE_Asynch_Connect_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_connect_result (ACE_Handler &handler,
-                                                  ACE_HANDLE  connect_handle,
-                                                  const void* act,
-                                                  ACE_HANDLE event,
-                                                  int priority,
-                                                  int signal_number)
+ACE_POSIX_Proactor::create_asynch_connect_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE connect_handle,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Connect_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Connect_Result (handler,
+                  ACE_POSIX_Asynch_Connect_Result (handler_proxy,
                                                    connect_handle,
                                                    act,
                                                    event,
@@ -455,23 +463,24 @@ ACE_POSIX_Proactor::create_asynch_transmit_file (void)
 }
 
 ACE_Asynch_Transmit_File_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                        ACE_HANDLE socket,
-                                                        ACE_HANDLE file,
-                                                        ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                        size_t bytes_to_write,
-                                                        u_long offset,
-                                                        u_long offset_high,
-                                                        size_t bytes_per_send,
-                                                        u_long flags,
-                                                        const void *act,
-                                                        ACE_HANDLE event,
-                                                        int priority,
-                                                        int signal_number)
+ACE_POSIX_Proactor::create_asynch_transmit_file_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE socket,
+   ACE_HANDLE file,
+   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
+   size_t bytes_to_write,
+   u_long offset,
+   u_long offset_high,
+   size_t bytes_per_send,
+   u_long flags,
+   const void *act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Transmit_File_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Transmit_File_Result (handler,
+                  ACE_POSIX_Asynch_Transmit_File_Result (handler_proxy,
                                                          socket,
                                                          file,
                                                          header_and_trailer,
@@ -489,16 +498,17 @@ ACE_POSIX_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
 }
 
 ACE_Asynch_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_timer (ACE_Handler &handler,
-                                         const void *act,
-                                         const ACE_Time_Value &tv,
-                                         ACE_HANDLE event,
-                                         int priority,
-                                         int signal_number)
+ACE_POSIX_Proactor::create_asynch_timer
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   const void *act,
+   const ACE_Time_Value &tv,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Timer (handler,
+                  ACE_POSIX_Asynch_Timer (handler_proxy,
                                           act,
                                           tv,
                                           event,
@@ -569,9 +579,10 @@ ACE_POSIX_Proactor::post_wakeup_completions (int how_many)
 
   for (int ci = 0; ci < how_many; ci++)
     {
-      ACE_NEW_RETURN (wakeup_completion,
-                      ACE_POSIX_Wakeup_Completion (this->wakeup_handler_),
-                      -1);
+      ACE_NEW_RETURN
+        (wakeup_completion,
+         ACE_POSIX_Wakeup_Completion (this->wakeup_handler_.proxy ()),
+         -1);
       if (this->post_completion (wakeup_completion) == -1)
         return -1;
     }
@@ -652,11 +663,14 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr
   // Set write side in NONBLOCK mode
   ACE::set_flags (this->pipe_.write_handle (), ACE_NONBLOCK);
 
+  // Set read side in NONBLOCK mode
+  ACE::set_flags (this->pipe_.read_handle (), ACE_NONBLOCK);
+
   // Let AIOCB_Proactor know about our handle
   posix_aiocb_proactor_->set_notify_handle (this->pipe_.read_handle ());
 
   // Open the read stream.
-  if (this->read_stream_.open (*this,
+  if (this->read_stream_.open (this->proxy (),
                                this->pipe_.read_handle (),
                                0, // Completion Key
                                0) // Proactor
@@ -1217,7 +1231,7 @@ ACE_POSIX_AIOCB_Proactor::get_result_status (ACE_POSIX_Asynch_Result *asynch_res
 
   ssize_t op_return = aio_return (asynch_result);
   if (op_return > 0)
-    transfer_count = ACE_static_cast (size_t, op_return);
+    transfer_count = static_cast<size_t> (op_return);
   // else transfer_count is already 0, error_status reports the error.
   return 1; // completed
 }
@@ -1317,7 +1331,7 @@ ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result,
   if (slot < 0)
     return -1;
 
-  size_t index = ACE_static_cast (size_t, slot);
+  size_t index = static_cast<size_t> (slot);
 
   result_list_[index] = result;   //Store result ptr anyway
   aiocb_list_cur_size_++;
@@ -1379,7 +1393,7 @@ ACE_POSIX_AIOCB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result)
   //setup OS notification methods for this aio
   result->aio_sigevent.sigev_notify = SIGEV_NONE;
 
-  return ACE_static_cast (ssize_t, i);
+  return static_cast<ssize_t> (i);
 }
 
 // start_aio_i  has new return codes
@@ -1712,12 +1726,13 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num)
 }
 
 ACE_Asynch_Result_Impl *
-ACE_POSIX_SIG_Proactor::create_asynch_timer (ACE_Handler &handler,
-                                             const void *act,
-                                             const ACE_Time_Value &tv,
-                                             ACE_HANDLE event,
-                                             int priority,
-                                             int signal_number)
+ACE_POSIX_SIG_Proactor::create_asynch_timer
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   const void *act,
+   const ACE_Time_Value &tv,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   int is_member = 0;
 
@@ -1752,7 +1767,7 @@ ACE_POSIX_SIG_Proactor::create_asynch_timer (ACE_Handler &handler,
 
   ACE_Asynch_Result_Impl *implementation;
   ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Timer (handler,
+                  ACE_POSIX_Asynch_Timer (handler_proxy,
                                           act,
                                           tv,
                                           event,
@@ -1834,12 +1849,12 @@ ACE_POSIX_SIG_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result)
   result->aio_sigevent.sigev_notify = SIGEV_SIGNAL;
   result->aio_sigevent.sigev_signo = result->signal_number ();
 #if defined (__FreeBSD__)
-  result->aio_sigevent.sigev_value.sigval_int = ACE_static_cast (int, i);
+  result->aio_sigevent.sigev_value.sigval_int = static_cast<int> (i);
 #else
-  result->aio_sigevent.sigev_value.sival_int = ACE_static_cast (int, i);
+  result->aio_sigevent.sigev_value.sival_int = static_cast<int> (i);
 #endif /* __FreeBSD__ */
 
-  return ACE_static_cast (ssize_t, i);
+  return static_cast<ssize_t> (i);
 }
 
 int
@@ -1878,21 +1893,21 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout)
   int error_status = 0;
   size_t transfer_count = 0;
 
-  if (sig_info.si_code == SI_ASYNCIO || this->os_id_ == OS_SUN_56)
+  if (sig_info.si_code == SI_ASYNCIO || this->os_id_ == ACE_OS_SUN_56)
     {
       flg_aio = 1;  // AIO signal received
       // define index to start
       // nothing will happen if it contains garbage
 #if defined (__FreeBSD__)
-      index = ACE_static_cast (size_t, sig_info.si_value.sigval_int);
+      index = static_cast<size_t> (sig_info.si_value.sigval_int);
 #else
-      index = ACE_static_cast (size_t, sig_info.si_value.sival_int);
+      index = static_cast<size_t> (sig_info.si_value.sival_int);
 #endif
       // Assume we have a correctly-functioning implementation, and that
       // there is one I/O to process, and it's correctly specified in the
       // siginfo received. There are, however, some special situations
       // where this isn't true...
-      if (os_id_ == OS_SUN_56) // Solaris 6
+      if (os_id_ == ACE_OS_SUN_56) // Solaris 6
         {
           // 1. Solaris 6 always loses any RT signal,
           //    if it has more SIGQUEMAX=32 pending signals
@@ -1959,14 +1974,16 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout)
 
 // *********************************************************************
 
-ACE_POSIX_Asynch_Timer::ACE_POSIX_Asynch_Timer (ACE_Handler &handler,
-                                                const void *act,
-                                                const ACE_Time_Value &tv,
-                                                ACE_HANDLE event,
-                                                int priority,
-                                                int signal_number)
+ACE_POSIX_Asynch_Timer::ACE_POSIX_Asynch_Timer
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   const void *act,
+   const ACE_Time_Value &tv,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
   : ACE_Asynch_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
+    ACE_POSIX_Asynch_Result
+     (handler_proxy, act, event, 0, 0, priority, signal_number),
     time_ (tv)
 {
 }
@@ -1977,19 +1994,28 @@ ACE_POSIX_Asynch_Timer::complete (size_t       /* bytes_transferred */,
                                   const void * /* completion_key */,
                                   u_long       /* error */)
 {
-  this->handler_.handle_time_out (this->time_, this->act ());
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_time_out (this->time_, this->act ());
 }
 
 
 // *********************************************************************
 
-ACE_POSIX_Wakeup_Completion::ACE_POSIX_Wakeup_Completion (ACE_Handler &handler,
-                                                          const void *act,
-                                                          ACE_HANDLE event,
-                                                          int priority,
-                                                          int signal_number)
+ACE_POSIX_Wakeup_Completion::ACE_POSIX_Wakeup_Completion
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   const void *act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
   : ACE_Asynch_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number)
+    ACE_POSIX_Asynch_Result (handler_proxy,
+                             act,
+                             event,
+                             0,
+                             0,
+                             priority,
+                             signal_number)
 {
 }
 
@@ -2004,7 +2030,9 @@ ACE_POSIX_Wakeup_Completion::complete (size_t       /* bytes_transferred */,
                                        u_long       /*  error */)
 {
 
-  this->handler_.handle_wakeup ();
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_wakeup ();
 }
 
 
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index 4c4c905e7cb..37cdbba197b 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -74,21 +74,21 @@ public:
 
   enum SystemType  // open for future extention
   {
-    OS_UNDEFINED= 0x0000,
-    OS_WIN      = 0x0100,          // for future
-    OS_WIN_NT   = OS_WIN | 0x0001,
-    OS_WIN_2000 = OS_WIN | 0x0002,
-    OS_SUN      = 0x0200,          // Sun Solaris family
-    OS_SUN_55   = OS_SUN | 0x0001,
-    OS_SUN_56   = OS_SUN | 0x0002,
-    OS_SUN_57   = OS_SUN | 0x0004,
-    OS_SUN_58   = OS_SUN | 0x0008,
-    OS_HPUX     = 0x0400,          // HPUX family
-    OS_HPUX_11  = OS_HPUX | 0x0001,
-    OS_LINUX    = 0x0800,          // Linux family
-    OS_FREEBSD  = 0x1000,          // FreeBSD family
-    OS_IRIX     = 0x2000,          // SGI IRIX family
-    OS_OPENBSD  = 0x4000           // OpenBSD familty
+    ACE_OS_UNDEFINED= 0x0000,
+    ACE_OS_WIN      = 0x0100,          // for future
+    ACE_OS_WIN_NT   = ACE_OS_WIN | 0x0001,
+    ACE_OS_WIN_2000 = ACE_OS_WIN | 0x0002,
+    ACE_OS_SUN      = 0x0200,          // Sun Solaris family
+    ACE_OS_SUN_55   = ACE_OS_SUN | 0x0001,
+    ACE_OS_SUN_56   = ACE_OS_SUN | 0x0002,
+    ACE_OS_SUN_57   = ACE_OS_SUN | 0x0004,
+    ACE_OS_SUN_58   = ACE_OS_SUN | 0x0008,
+    ACE_OS_HPUX     = 0x0400,          // HPUX family
+    ACE_OS_HPUX_11  = ACE_OS_HPUX | 0x0001,
+    ACE_OS_LINUX    = 0x0800,          // Linux family
+    ACE_OS_FREEBSD  = 0x1000,          // FreeBSD family
+    ACE_OS_IRIX     = 0x2000,          // SGI IRIX family
+    ACE_OS_OPENBSD  = 0x4000           // OpenBSD familty
   };
 
   enum Opcode {
@@ -160,7 +160,7 @@ public:
 
   virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
   virtual ACE_Asynch_Read_Stream_Result_Impl *
-    create_asynch_read_stream_result (ACE_Handler &handler,
+    create_asynch_read_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block &message_block,
                                       size_t bytes_to_read,
@@ -171,7 +171,7 @@ public:
 
   virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
   virtual ACE_Asynch_Write_Stream_Result_Impl *
-    create_asynch_write_stream_result (ACE_Handler &handler,
+    create_asynch_write_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                        ACE_HANDLE handle,
                                        ACE_Message_Block &message_block,
                                        size_t bytes_to_write,
@@ -182,7 +182,7 @@ public:
 
   virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
   virtual ACE_Asynch_Read_File_Result_Impl *
-    create_asynch_read_file_result (ACE_Handler &handler,
+    create_asynch_read_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                     ACE_HANDLE handle,
                                     ACE_Message_Block &message_block,
                                     size_t bytes_to_read,
@@ -195,7 +195,7 @@ public:
 
   virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
   virtual ACE_Asynch_Write_File_Result_Impl *
-    create_asynch_write_file_result (ACE_Handler &handler,
+    create_asynch_write_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
                                      ACE_Message_Block &message_block,
                                      size_t bytes_to_write,
@@ -208,7 +208,7 @@ public:
 
   virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void);
   virtual ACE_Asynch_Read_Dgram_Result_Impl *
-    create_asynch_read_dgram_result (ACE_Handler &handler,
+    create_asynch_read_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
                                      ACE_Message_Block *message_block,
                                      size_t bytes_to_read,
@@ -221,7 +221,7 @@ public:
 
   virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void);
   virtual ACE_Asynch_Write_Dgram_Result_Impl *
-    create_asynch_write_dgram_result (ACE_Handler &handler,
+    create_asynch_write_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block *message_block,
                                       size_t bytes_to_write,
@@ -233,7 +233,7 @@ public:
 
   virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void);
   virtual ACE_Asynch_Accept_Result_Impl *
-    create_asynch_accept_result (ACE_Handler &handler,
+    create_asynch_accept_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                  ACE_HANDLE listen_handle,
                                  ACE_HANDLE accept_handle,
                                  ACE_Message_Block &message_block,
@@ -245,7 +245,7 @@ public:
 
   virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void);
   virtual ACE_Asynch_Connect_Result_Impl *
-    create_asynch_connect_result (ACE_Handler & handler,
+    create_asynch_connect_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                   ACE_HANDLE connect_handle,
                                   const void *act,
                                   ACE_HANDLE event = ACE_INVALID_HANDLE,
@@ -254,7 +254,7 @@ public:
 
   virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
   virtual ACE_Asynch_Transmit_File_Result_Impl *
-    create_asynch_transmit_file_result (ACE_Handler &handler,
+    create_asynch_transmit_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                         ACE_HANDLE socket,
                                         ACE_HANDLE file,
                                         ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
@@ -271,7 +271,7 @@ public:
   /// Create a timer result object which can be used with the Timer
   /// mechanism of the Proactor.
   virtual ACE_Asynch_Result_Impl *
-    create_asynch_timer (ACE_Handler &handler,
+    create_asynch_timer (ACE_Handler::Proxy_Ptr &handler_proxy,
                          const void *act,
                          const ACE_Time_Value &tv,
                          ACE_HANDLE event = ACE_INVALID_HANDLE,
@@ -563,12 +563,13 @@ public:
    * which the Proactor will be waiting) of the Proactor. If there are
    * more than one signal, the higher numbered signal will be chosen.
    */
-  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler,
-                                                       const void *act,
-                                                       const ACE_Time_Value &tv,
-                                                       ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                       int priority = 0,
-                                                       int signal_number = ACE_SIGRTMIN);
+  virtual ACE_Asynch_Result_Impl *create_asynch_timer
+    (ACE_Handler::Proxy_Ptr &handler_proxy,
+     const void *act,
+     const ACE_Time_Value &tv,
+     ACE_HANDLE event = ACE_INVALID_HANDLE,
+     int priority = 0,
+     int signal_number = ACE_SIGRTMIN);
 
 protected:
   /// To setup the handler for a real-time signbal.
@@ -628,7 +629,7 @@ class ACE_Export ACE_POSIX_Asynch_Timer : public ACE_POSIX_Asynch_Result
 
 protected:
   /// Constructor.
-  ACE_POSIX_Asynch_Timer (ACE_Handler &handler,
+  ACE_POSIX_Asynch_Timer (ACE_Handler::Proxy_Ptr &handler_proxy,
                           const void *act,
                           const ACE_Time_Value &tv,
                           ACE_HANDLE event = ACE_INVALID_HANDLE,
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index 4783472d48e..bb702ecd68a 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -83,10 +83,8 @@ ACE_Parse_Node::link (ACE_Parse_Node *n)
 ACE_Stream_Node::ACE_Stream_Node (const ACE_Static_Node *str_ops,
                                   const ACE_Parse_Node *str_mods)
 #if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
-  : ACE_Parse_Node (str_ops == 0 ? ACE_static_cast (ACE_TCHAR *,
-                                                    ACE_LIB_TEXT ("<unknown>"))
-                                 : ACE_static_cast (ACE_TCHAR *,
-                                                    str_ops->name ())),
+  : ACE_Parse_Node (str_ops == 0 ? static_cast<ACE_TCHAR *> (ACE_LIB_TEXT ("<unknown>"))
+                                 : static_cast<ACE_TCHAR *> (str_ops->name ())),
 #else
   : ACE_Parse_Node ((str_ops == 0 ? ACE_LIB_TEXT ("<unknown>") : str_ops->name ())),
 #endif /* defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
@@ -100,11 +98,9 @@ ACE_Stream_Node::ACE_Stream_Node (const ACE_Static_Node *str_ops,
 ACE_Stream_Node::~ACE_Stream_Node (void)
 {
   ACE_TRACE ("ACE_Stream_Node::~ACE_Stream_Node");
-  ACE_Static_Node *n = ACE_const_cast (ACE_Static_Node *,
-                                       this->node_);
+  ACE_Static_Node *n = const_cast<ACE_Static_Node *> (this->node_);
   delete n;
-  ACE_Parse_Node *m = ACE_const_cast (ACE_Parse_Node *,
-                                      this->mods_);
+  ACE_Parse_Node *m = const_cast<ACE_Parse_Node *> (this->mods_);
   delete m;
 }
 
@@ -140,7 +136,7 @@ ACE_Parse_Node::print (void) const
 ACE_Parse_Node::~ACE_Parse_Node (void)
 {
   ACE_TRACE ("ACE_Parse_Node::~ACE_Parse_Node");
-  delete[] ACE_const_cast (ACE_TCHAR*, this->name_);
+  delete[] const_cast<ACE_TCHAR*> (this->name_);
   delete this->next_;
 }
 
@@ -447,7 +443,7 @@ ACE_Object_Node::symbol (int & yyerrno,
   ACE_TRACE ("ACE_Object_Node::symbol");
   if (this->open_dll (yyerrno) == 0)
     {
-      ACE_TCHAR *object_name = ACE_const_cast (ACE_TCHAR *, this->object_name_);
+      ACE_TCHAR *object_name = const_cast<ACE_TCHAR *> (this->object_name_);
 
       this->symbol_ = this->dll_.symbol (object_name);
       if (this->symbol_ == 0)
@@ -474,7 +470,7 @@ ACE_Object_Node::symbol (int & yyerrno,
 ACE_Object_Node::~ACE_Object_Node (void)
 {
   ACE_TRACE ("ACE_Object_Node::~ACE_Object_Node");
-  delete[] ACE_const_cast (ACE_TCHAR *, this->object_name_);
+  delete[] const_cast<ACE_TCHAR *> (this->object_name_);
 }
 
 ACE_ALLOC_HOOK_DEFINE (ACE_Function_Node)
@@ -511,8 +507,7 @@ ACE_Function_Node::symbol (int & yyerrno,
 
       // Locate the factory function <function_name> in the shared
       // object.
-      ACE_TCHAR *function_name = ACE_const_cast (ACE_TCHAR *,
-                                                 this->function_name_);
+      ACE_TCHAR *function_name = const_cast<ACE_TCHAR *> (this->function_name_);
       void *func_p = this->dll_.symbol (function_name);
       if (func_p == 0)
         {
@@ -534,8 +529,8 @@ ACE_Function_Node::symbol (int & yyerrno,
               return 0;
             }
         }
-      ptrdiff_t temp_p = ACE_reinterpret_cast (ptrdiff_t, func_p);
-      func = ACE_reinterpret_cast (ACE_Service_Factory_Ptr, temp_p);
+      ptrdiff_t temp_p = reinterpret_cast<ptrdiff_t> (func_p);
+      func = reinterpret_cast<ACE_Service_Factory_Ptr> (temp_p);
       // Invoke the factory function and record it's return value.
       this->symbol_ = (*func) (gobbler);
 
@@ -554,8 +549,8 @@ ACE_Function_Node::symbol (int & yyerrno,
 ACE_Function_Node::~ACE_Function_Node (void)
 {
   ACE_TRACE ("ACE_Function_Node::~ACE_Function_Node");
-  delete[] ACE_const_cast (ACE_TCHAR *, function_name_);
-  delete[] ACE_const_cast (ACE_TCHAR *, pathname_);
+  delete[] const_cast<ACE_TCHAR *> (function_name_);
+  delete[] const_cast<ACE_TCHAR *> (pathname_);
 }
 
 ACE_ALLOC_HOOK_DEFINE (ACE_Dummy_Node)
@@ -596,11 +591,9 @@ ACE_Dummy_Node::apply (int & yyerrno)
 ACE_Dummy_Node::~ACE_Dummy_Node (void)
 {
   ACE_TRACE ("ACE_Dummy_Node::~ACE_Dummy_Node");
-  ACE_Static_Node *n = ACE_const_cast (ACE_Static_Node *,
-                                       this->node_);
+  ACE_Static_Node *n = const_cast<ACE_Static_Node *> (this->node_);
   delete n;
-  ACE_Parse_Node *m = ACE_const_cast (ACE_Parse_Node *,
-                                      this->mods_);
+  ACE_Parse_Node *m = const_cast<ACE_Parse_Node *> (this->mods_);
   delete m;
 }
 
@@ -635,7 +628,7 @@ ACE_Static_Function_Node::symbol (int & yyerrno,
 
   ACE_Static_Svc_Descriptor **ssdp = 0;
   ACE_STATIC_SVCS &svcs = *ACE_Service_Config::static_svcs ();
-  ACE_TCHAR *function_name = ACE_const_cast (ACE_TCHAR *, this->function_name_);
+  ACE_TCHAR *function_name = const_cast<ACE_TCHAR *> (this->function_name_);
 
   for (ACE_STATIC_SVCS_ITERATOR iter (svcs);
        iter.next (ssdp) != 0;
@@ -680,7 +673,7 @@ ACE_Static_Function_Node::symbol (int & yyerrno,
 ACE_Static_Function_Node::~ACE_Static_Function_Node (void)
 {
   ACE_TRACE ("ACE_Static_Function_Node::~ACE_Static_Function_Node");
-  delete[] ACE_const_cast (ACE_TCHAR *, this->function_name_);
+  delete[] const_cast<ACE_TCHAR *> (this->function_name_);
 }
 
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index 50ad4221b79..ed254648e7e 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -93,7 +93,7 @@ ACE_Pipe::open (int buffer_size)
 # else  /* ! ACE_LACKS_SOCKET_BUFSIZ */
   if (reader.set_option (SOL_SOCKET,
                          SO_RCVBUF,
-                         ACE_reinterpret_cast (void *, &buffer_size),
+                         reinterpret_cast <void *> (&buffer_size),
                          sizeof (buffer_size)) == -1
       && errno != ENOTSUP)
     {
@@ -102,7 +102,7 @@ ACE_Pipe::open (int buffer_size)
     }
   else if (writer.set_option (SOL_SOCKET,
                               SO_SNDBUF,
-                              ACE_reinterpret_cast (void *, &buffer_size),
+                              reinterpret_cast <void *> (&buffer_size),
                               sizeof (buffer_size)) == -1
            && errno != ENOTSUP)
     {
@@ -153,8 +153,7 @@ ACE_Pipe::open (int buffer_size)
   if (ACE_OS::setsockopt (this->handles_[0],
                           SOL_SOCKET,
                           SO_RCVBUF,
-                          ACE_reinterpret_cast (const char *,
-                                                &buffer_size),
+                          reinterpret_cast <const char *> (&buffer_size),
                           sizeof (buffer_size)) == -1
       && errno != ENOTSUP)
     {
@@ -164,7 +163,7 @@ ACE_Pipe::open (int buffer_size)
   if (ACE_OS::setsockopt (this->handles_[1],
                           SOL_SOCKET,
                           SO_SNDBUF,
-                          ACE_reinterpret_cast (const char *, &buffer_size),
+                          reinterpret_cast <const char *> (&buffer_size),
                           sizeof (buffer_size)) == -1
       && errno != ENOTSUP)
     {
diff --git a/ace/Pipe.h b/ace/Pipe.h
index 8316820d356..4426126f865 100644
--- a/ace/Pipe.h
+++ b/ace/Pipe.h
@@ -43,7 +43,7 @@ public:
   /// Open the pipe and initialize the handles.
   ACE_Pipe (ACE_HANDLE handles[2]);
 
-  /// Initialize the <ACE_Pipe> from the <read> and <write> handles.
+  /// Initialize the ACE_Pipe from the @a read and @a write handles.
   ACE_Pipe (ACE_HANDLE read, ACE_HANDLE write);
 
   /// Default dtor.  It doesn't close the handles for you.
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 65f426a9f2b..c8012d7727b 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -218,7 +218,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &,
 
   // Create the Asynch_Timer.
   ACE_Asynch_Result_Impl *asynch_timer =
-    this->proactor_->create_asynch_timer (*handler,
+    this->proactor_->create_asynch_timer (handler->proxy (),
                                           act,
                                           time,
                                           ACE_INVALID_HANDLE,
@@ -856,228 +856,242 @@ ACE_Proactor::create_asynch_transmit_file (void)
 }
 
 ACE_Asynch_Read_Stream_Result_Impl *
-ACE_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
-                                                ACE_HANDLE handle,
-                                                ACE_Message_Block &message_block,
-                                                u_long bytes_to_read,
-                                                const void* act,
-                                                ACE_HANDLE event,
-                                                int priority,
-                                                int signal_number)
-{
-  return this->implementation ()->create_asynch_read_stream_result (handler,
-                                                                    handle,
-                                                                    message_block,
-                                                                    bytes_to_read,
-                                                                    act,
-                                                                    event,
-                                                                    priority,
-                                                                    signal_number);
+ACE_Proactor::create_asynch_read_stream_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   u_long bytes_to_read,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation ()->create_asynch_read_stream_result
+    (handler_proxy,
+     handle,
+     message_block,
+     bytes_to_read,
+     act,
+     event,
+     priority,
+     signal_number);
 }
 
 
 ACE_Asynch_Write_Stream_Result_Impl *
-ACE_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
-                                                 ACE_HANDLE handle,
-                                                 ACE_Message_Block &message_block,
-                                                 u_long bytes_to_write,
-                                                 const void* act,
-                                                 ACE_HANDLE event,
-                                                 int priority,
-                                                 int signal_number)
-
-{
-  return this->implementation ()->create_asynch_write_stream_result (handler,
-                                                                     handle,
-                                                                     message_block,
-                                                                     bytes_to_write,
-                                                                     act,
-                                                                     event,
-                                                                     priority,
-                                                                     signal_number);
+ACE_Proactor::create_asynch_write_stream_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   u_long bytes_to_write,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation ()->create_asynch_write_stream_result
+    (handler_proxy,
+     handle,
+     message_block,
+     bytes_to_write,
+     act,
+     event,
+     priority,
+     signal_number);
 }
 
 ACE_Asynch_Read_File_Result_Impl *
-ACE_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
-                                              ACE_HANDLE handle,
-                                              ACE_Message_Block &message_block,
-                                              u_long bytes_to_read,
-                                              const void* act,
-                                              u_long offset,
-                                              u_long offset_high,
-                                              ACE_HANDLE event,
-                                              int priority,
-                                              int signal_number)
-
-{
-  return this->implementation ()->create_asynch_read_file_result (handler,
-                                                                  handle,
-                                                                  message_block,
-                                                                  bytes_to_read,
-                                                                  act,
-                                                                  offset,
-                                                                  offset_high,
-                                                                  event,
-                                                                  priority,
-                                                                  signal_number);
+ACE_Proactor::create_asynch_read_file_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   u_long bytes_to_read,
+   const void* act,
+   u_long offset,
+   u_long offset_high,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation ()->create_asynch_read_file_result
+    (handler_proxy,
+     handle,
+     message_block,
+     bytes_to_read,
+     act,
+     offset,
+     offset_high,
+     event,
+     priority,
+     signal_number);
 }
 
 ACE_Asynch_Write_File_Result_Impl *
-ACE_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
-                                               ACE_HANDLE handle,
-                                               ACE_Message_Block &message_block,
-                                               u_long bytes_to_write,
-                                               const void* act,
-                                               u_long offset,
-                                               u_long offset_high,
-                                               ACE_HANDLE event,
-                                               int priority,
-                                               int signal_number)
-
-{
-  return this->implementation ()->create_asynch_write_file_result (handler,
-                                                                   handle,
-                                                                   message_block,
-                                                                   bytes_to_write,
-                                                                   act,
-                                                                   offset,
-                                                                   offset_high,
-                                                                   event,
-                                                                   priority,
-                                                                   signal_number);
+ACE_Proactor::create_asynch_write_file_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   u_long bytes_to_write,
+   const void* act,
+   u_long offset,
+   u_long offset_high,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation ()->create_asynch_write_file_result
+    (handler_proxy,
+     handle,
+     message_block,
+     bytes_to_write,
+     act,
+     offset,
+     offset_high,
+     event,
+     priority,
+     signal_number);
 }
 
 ACE_Asynch_Read_Dgram_Result_Impl *
-ACE_Proactor::create_asynch_read_dgram_result (ACE_Handler &handler,
-                                               ACE_HANDLE handle,
-                                               ACE_Message_Block *message_block,
-                                               size_t bytes_to_read,
-                                               int flags,
-                                               int protocol_family,
-                                               const void* act,
-                                               ACE_HANDLE event,
-                                               int priority,
-                                               int signal_number)
-{
-  return this->implementation()->create_asynch_read_dgram_result (handler,
-                                                                  handle,
-                                                                  message_block,
-                                                                  bytes_to_read,
-                                                                  flags,
-                                                                  protocol_family,
-                                                                  act,
-                                                                  event,
-                                                                  priority,
-                                                                  signal_number);
+ACE_Proactor::create_asynch_read_dgram_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block *message_block,
+   size_t bytes_to_read,
+   int flags,
+   int protocol_family,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation()->create_asynch_read_dgram_result
+    (handler_proxy,
+     handle,
+     message_block,
+     bytes_to_read,
+     flags,
+     protocol_family,
+     act,
+     event,
+     priority,
+     signal_number);
 }
 
 ACE_Asynch_Write_Dgram_Result_Impl *
-ACE_Proactor::create_asynch_write_dgram_result (ACE_Handler &handler,
-                                                ACE_HANDLE handle,
-                                                ACE_Message_Block *message_block,
-                                                size_t bytes_to_write,
-                                                int flags,
-                                                const void* act,
-                                                ACE_HANDLE event,
-                                                int priority,
-                                                int signal_number)
-{
-  return this->implementation()->create_asynch_write_dgram_result (handler,
-                                                                   handle,
-                                                                   message_block,
-                                                                   bytes_to_write,
-                                                                   flags,
-                                                                   act,
-                                                                   event,
-                                                                   priority,
-                                                                   signal_number);
+ACE_Proactor::create_asynch_write_dgram_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block *message_block,
+   size_t bytes_to_write,
+   int flags,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation()->create_asynch_write_dgram_result
+    (handler_proxy,
+     handle,
+     message_block,
+     bytes_to_write,
+     flags,
+     act,
+     event,
+     priority,
+     signal_number);
 }
 
 ACE_Asynch_Accept_Result_Impl *
-ACE_Proactor::create_asynch_accept_result (ACE_Handler &handler,
-                                           ACE_HANDLE listen_handle,
-                                           ACE_HANDLE accept_handle,
-                                           ACE_Message_Block &message_block,
-                                           u_long bytes_to_read,
-                                           const void* act,
-                                           ACE_HANDLE event,
-                                           int priority,
-                                           int signal_number)
-
-{
-  return this->implementation ()->create_asynch_accept_result (handler,
-                                                               listen_handle,
-                                                               accept_handle,
-                                                               message_block,
-                                                               bytes_to_read,
-                                                               act,
-                                                               event,
-                                                               priority,
-                                                               signal_number);
+ACE_Proactor::create_asynch_accept_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE listen_handle,
+   ACE_HANDLE accept_handle,
+   ACE_Message_Block &message_block,
+   u_long bytes_to_read,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation ()->create_asynch_accept_result
+    (handler_proxy,
+     listen_handle,
+     accept_handle,
+     message_block,
+     bytes_to_read,
+     act,
+     event,
+     priority,
+     signal_number);
 }
 
 ACE_Asynch_Connect_Result_Impl *
-ACE_Proactor::create_asynch_connect_result (ACE_Handler &handler,
-                                            ACE_HANDLE  connect_handle,
-                                            const void* act,
-                                            ACE_HANDLE event,
-                                            int priority,
-                                            int signal_number)
-
-{
-  return this->implementation ()->create_asynch_connect_result (handler,
-                                                                connect_handle,
-                                                                act,
-                                                                event,
-                                                                priority,
-                                                                signal_number);
+ACE_Proactor::create_asynch_connect_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE  connect_handle,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation ()->create_asynch_connect_result
+    (handler_proxy,
+     connect_handle,
+     act,
+     event,
+     priority,
+     signal_number);
 }
 
 ACE_Asynch_Transmit_File_Result_Impl *
-ACE_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                  ACE_HANDLE socket,
-                                                  ACE_HANDLE file,
-                                                  ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                  u_long bytes_to_write,
-                                                  u_long offset,
-                                                  u_long offset_high,
-                                                  u_long bytes_per_send,
-                                                  u_long flags,
-                                                  const void *act,
-                                                  ACE_HANDLE event,
-                                                  int priority,
-                                                  int signal_number)
-
-{
-  return this->implementation ()->create_asynch_transmit_file_result (handler,
-                                                                      socket,
-                                                                      file,
-                                                                      header_and_trailer,
-                                                                      bytes_to_write,
-                                                                      offset,
-                                                                      offset_high,
-                                                                      bytes_per_send,
-                                                                      flags,
-                                                                      act,
-                                                                      event,
-                                                                      priority,
-                                                                      signal_number);
+ACE_Proactor::create_asynch_transmit_file_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE socket,
+   ACE_HANDLE file,
+   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
+   u_long bytes_to_write,
+   u_long offset,
+   u_long offset_high,
+   u_long bytes_per_send,
+   u_long flags,
+   const void *act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation ()->create_asynch_transmit_file_result
+    (handler_proxy,
+     socket,
+     file,
+     header_and_trailer,
+     bytes_to_write,
+     offset,
+     offset_high,
+     bytes_per_send,
+     flags,
+     act,
+     event,
+     priority,
+     signal_number);
 }
 
 ACE_Asynch_Result_Impl *
-ACE_Proactor::create_asynch_timer (ACE_Handler &handler,
-                                   const void *act,
-                                   const ACE_Time_Value &tv,
-                                   ACE_HANDLE event,
-                                   int priority,
-                                   int signal_number)
-{
-  return this->implementation ()->create_asynch_timer (handler,
-                                                       act,
-                                                       tv,
-                                                       event,
-                                                       priority,
-                                                       signal_number);
+ACE_Proactor::create_asynch_timer
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   const void *act,
+   const ACE_Time_Value &tv,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
+{
+  return this->implementation ()->create_asynch_timer
+    (handler_proxy,
+     act,
+     tv,
+     event,
+     priority,
+     signal_number);
 }
 
 int
@@ -1159,8 +1173,20 @@ template class ACE_Timer_Wheel_Iterator_T<ACE_Handler *,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Framework_Component_T<ACE_Proactor>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+template class ACE_Auto_Basic_Ptr<ACE_Asynch_Result_Impl>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
+template class auto_ptr<ACE_Asynch_Result_Impl>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Framework_Component_T<ACE_Proactor>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Asynch_Result_Impl>
+#  endif  /* ACE_LACKS_AUTO_PTR */
+#pragma instanstiate auto_ptr<ACE_Asynch_Result_Impl>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #else /* !ACE_WIN32 || !ACE_HAS_AIO_CALLS */
@@ -1210,24 +1236,4 @@ ACE_Proactor::event_loop_done (void)
   return sig_atomic_t (1);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<ACE_Asynch_Result_Impl>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-template class auto_ptr<ACE_Asynch_Result_Impl>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Asynch_Result_Impl>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#pragma instanstiate auto_ptr<ACE_Asynch_Result_Impl>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
diff --git a/ace/Proactor.h b/ace/Proactor.h
index b78142619b7..8ed6aa83a02 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -443,7 +443,7 @@ public:
   /// Create the correct implementation class for
   /// ACE_Asynch_Read_Stream::Result class.
   virtual ACE_Asynch_Read_Stream_Result_Impl *
-    create_asynch_read_stream_result (ACE_Handler &handler,
+    create_asynch_read_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block &message_block,
                                       u_long bytes_to_read,
@@ -455,7 +455,7 @@ public:
   /// Create the correct implementation class for
   /// ACE_Asynch_Write_Stream::Result.
   virtual ACE_Asynch_Write_Stream_Result_Impl *
-    create_asynch_write_stream_result (ACE_Handler &handler,
+    create_asynch_write_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                        ACE_HANDLE handle,
                                        ACE_Message_Block &message_block,
                                        u_long bytes_to_write,
@@ -467,7 +467,7 @@ public:
   /// Create the correct implementation class for
   /// ACE_Asynch_Read_File::Result.
   virtual ACE_Asynch_Read_File_Result_Impl *
-    create_asynch_read_file_result (ACE_Handler &handler,
+    create_asynch_read_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                     ACE_HANDLE handle,
                                     ACE_Message_Block &message_block,
                                     u_long bytes_to_read,
@@ -481,7 +481,7 @@ public:
   /// Create the correct implementation class for
   /// ACE_Asynch_Write_File::Result.
   virtual ACE_Asynch_Write_File_Result_Impl *
-    create_asynch_write_file_result (ACE_Handler &handler,
+    create_asynch_write_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
                                      ACE_Message_Block &message_block,
                                      u_long bytes_to_write,
@@ -495,7 +495,7 @@ public:
   /// Create the correct implementation class for
   /// ACE_Asynch_Read_Dgram::Result.
   virtual ACE_Asynch_Read_Dgram_Result_Impl *
-    create_asynch_read_dgram_result (ACE_Handler &handler,
+    create_asynch_read_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
                                      ACE_Message_Block *message_block,
                                      size_t bytes_to_read,
@@ -509,7 +509,7 @@ public:
   /// Create the correct implementation class for
   /// ACE_Asynch_Write_Dgram::Result.
   virtual ACE_Asynch_Write_Dgram_Result_Impl *
-    create_asynch_write_dgram_result (ACE_Handler &handler,
+    create_asynch_write_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block *message_block,
                                       size_t bytes_to_write,
@@ -521,7 +521,7 @@ public:
 
   /// Create the correct implementation class for ACE_Asynch_Accept::Result.
   virtual ACE_Asynch_Accept_Result_Impl *
-    create_asynch_accept_result (ACE_Handler &handler,
+    create_asynch_accept_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                  ACE_HANDLE listen_handle,
                                  ACE_HANDLE accept_handle,
                                  ACE_Message_Block &message_block,
@@ -533,7 +533,7 @@ public:
 
   /// Create the correct implementation class for ACE_Asynch_Connect::Result
   virtual ACE_Asynch_Connect_Result_Impl *
-    create_asynch_connect_result (ACE_Handler &handler,
+    create_asynch_connect_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                   ACE_HANDLE  connect_handle,
                                   const void* act,
                                   ACE_HANDLE event = ACE_INVALID_HANDLE,
@@ -543,7 +543,7 @@ public:
   /// Create the correct implementation class for
   /// ACE_Asynch_Transmit_File::Result.
   virtual ACE_Asynch_Transmit_File_Result_Impl *
-    create_asynch_transmit_file_result (ACE_Handler &handler,
+    create_asynch_transmit_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                         ACE_HANDLE socket,
                                         ACE_HANDLE file,
                                         ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
@@ -564,12 +564,13 @@ public:
    * Timer object with a meaningful signal number, choosing the
    * largest signal number from the signal mask of the Proactor.
    */
-  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler,
-                                                       const void *act,
-                                                       const ACE_Time_Value &tv,
-                                                       ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                       int priority = 0,
-                                                       int signal_number = ACE_SIGRTMIN);
+  virtual ACE_Asynch_Result_Impl *
+    create_asynch_timer (ACE_Handler::Proxy_Ptr &handler_proxy,
+                         const void *act,
+                         const ACE_Time_Value &tv,
+                         ACE_HANDLE event = ACE_INVALID_HANDLE,
+                         int priority = 0,
+                         int signal_number = ACE_SIGRTMIN);
 
 protected:
 
diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h
index ae41266d180..96a9e1bdab3 100644
--- a/ace/Proactor_Impl.h
+++ b/ace/Proactor_Impl.h
@@ -125,117 +125,127 @@ public:
   // methods unless they want to "fake" results.
 
   /// Create the correct implementation class for ACE_Asynch_Read_Stream::Result class.
-  virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler &handler,
-                                                                                ACE_HANDLE handle,
-                                                                                ACE_Message_Block &message_block,
-                                                                                size_t bytes_to_read,
-                                                                                const void* act,
-                                                                                ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                int priority = 0,
-                                                                                int signal_number = ACE_SIGRTMIN) = 0;
+  virtual ACE_Asynch_Read_Stream_Result_Impl *
+    create_asynch_read_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
+                                      ACE_HANDLE handle,
+                                      ACE_Message_Block &message_block,
+                                      size_t bytes_to_read,
+                                      const void* act,
+                                      ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                      int priority = 0,
+                                      int signal_number = ACE_SIGRTMIN) = 0;
 
   /// Create the correct implementation class for ACE_Asynch_Write_Stream::Result.
-  virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler &handler,
-                                                                                  ACE_HANDLE handle,
-                                                                                  ACE_Message_Block &message_block,
-                                                                                  size_t bytes_to_write,
-                                                                                  const void* act,
-                                                                                  ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                  int priority = 0,
-                                                                                  int signal_number = ACE_SIGRTMIN) = 0;
+  virtual ACE_Asynch_Write_Stream_Result_Impl *
+    create_asynch_write_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
+                                       ACE_HANDLE handle,
+                                       ACE_Message_Block &message_block,
+                                       size_t bytes_to_write,
+                                       const void* act,
+                                       ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                       int priority = 0,
+                                       int signal_number = ACE_SIGRTMIN) = 0;
 
   /// Create the correct implementation class for ACE_Asynch_Read_File::Result.
-  virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler,
-                                                                            ACE_HANDLE handle,
-                                                                            ACE_Message_Block &message_block,
-                                                                            size_t bytes_to_read,
-                                                                            const void* act,
-                                                                            u_long offset,
-                                                                            u_long offset_high,
-                                                                            ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                            int priority = 0,
-                                                                            int signal_number = ACE_SIGRTMIN) = 0;
+  virtual ACE_Asynch_Read_File_Result_Impl *
+    create_asynch_read_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
+                                    ACE_HANDLE handle,
+                                    ACE_Message_Block &message_block,
+                                    size_t bytes_to_read,
+                                    const void* act,
+                                    u_long offset,
+                                    u_long offset_high,
+                                    ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                    int priority = 0,
+                                    int signal_number = ACE_SIGRTMIN) = 0;
 
     /// Create the correct implementation class for ACE_Asynch_Write_File::Result.
-  virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler,
-                                                                              ACE_HANDLE handle,
-                                                                              ACE_Message_Block &message_block,
-                                                                              size_t bytes_to_write,
-                                                                              const void* act,
-                                                                              u_long offset,
-                                                                              u_long offset_high,
-                                                                              ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                              int priority = 0,
-                                                                              int signal_number = ACE_SIGRTMIN) = 0;
+  virtual ACE_Asynch_Write_File_Result_Impl *
+    create_asynch_write_file_result (ACE_Handler::Proxy_Ptr &handler,
+                                     ACE_HANDLE handle,
+                                     ACE_Message_Block &message_block,
+                                     size_t bytes_to_write,
+                                     const void* act,
+                                     u_long offset,
+                                     u_long offset_high,
+                                     ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                     int priority = 0,
+                                     int signal_number = ACE_SIGRTMIN) = 0;
 
   /// Create the correct implementation class for ACE_Asynch_Read_Dgram::Result.
-  virtual ACE_Asynch_Read_Dgram_Result_Impl *create_asynch_read_dgram_result (ACE_Handler &handler,
-                                                                              ACE_HANDLE handle,
-                                                                              ACE_Message_Block *message_block,
-                                                                              size_t bytes_to_read,
-                                                                              int flags,
-                                                                              int protocol_family,
-                                                                              const void* act,
-                                                                              ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                              int priority = 0,
-                                                                              int signal_number = ACE_SIGRTMIN) = 0;
+  virtual ACE_Asynch_Read_Dgram_Result_Impl *
+    create_asynch_read_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
+                                     ACE_HANDLE handle,
+                                     ACE_Message_Block *message_block,
+                                     size_t bytes_to_read,
+                                     int flags,
+                                     int protocol_family,
+                                     const void* act,
+                                     ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                     int priority = 0,
+                                     int signal_number = ACE_SIGRTMIN) = 0;
 
   /// Create the correct implementation class for ACE_Asynch_Write_Dgram::Result.
-  virtual ACE_Asynch_Write_Dgram_Result_Impl *create_asynch_write_dgram_result (ACE_Handler &handler,
-                                                                                ACE_HANDLE handle,
-                                                                                ACE_Message_Block *message_block,
-                                                                                size_t bytes_to_write,
-                                                                                int flags,
-                                                                                const void* act,
-                                                                                ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                int priority = 0,
-                                                                                int signal_number = ACE_SIGRTMIN) = 0;
+  virtual ACE_Asynch_Write_Dgram_Result_Impl *
+    create_asynch_write_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
+                                      ACE_HANDLE handle,
+                                      ACE_Message_Block *message_block,
+                                      size_t bytes_to_write,
+                                      int flags,
+                                      const void* act,
+                                      ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                      int priority = 0,
+                                      int signal_number = ACE_SIGRTMIN) = 0;
 
   /// Create the correct implementation class for ACE_Asynch_Accept::Result.
-  virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler,
-                                                                      ACE_HANDLE listen_handle,
-                                                                      ACE_HANDLE accept_handle,
-                                                                      ACE_Message_Block &message_block,
-                                                                      size_t bytes_to_read,
-                                                                      const void* act,
-                                                                      ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                      int priority = 0,
-                                                                      int signal_number = ACE_SIGRTMIN) = 0;
+  virtual ACE_Asynch_Accept_Result_Impl *
+    create_asynch_accept_result (ACE_Handler::Proxy_Ptr &handler_proxy,
+                                 ACE_HANDLE listen_handle,
+                                 ACE_HANDLE accept_handle,
+                                 ACE_Message_Block &message_block,
+                                 size_t bytes_to_read,
+                                 const void* act,
+                                 ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                 int priority = 0,
+                                 int signal_number = ACE_SIGRTMIN) = 0;
 
   /// Create the correct implementation class for ACE_Asynch_Connect::Result.
-  virtual ACE_Asynch_Connect_Result_Impl *create_asynch_connect_result (ACE_Handler &handler,
-                                                                        ACE_HANDLE connect_handle,
-                                                                        const void* act,
-                                                                        ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                        int priority = 0,
-                                                                        int signal_number = ACE_SIGRTMIN) = 0;
+  virtual ACE_Asynch_Connect_Result_Impl *
+    create_asynch_connect_result (ACE_Handler::Proxy_Ptr &handler_proxy,
+                                  ACE_HANDLE connect_handle,
+                                  const void* act,
+                                  ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                  int priority = 0,
+                                  int signal_number = ACE_SIGRTMIN) = 0;
 
   /// Create the correct implementation class for ACE_Asynch_Transmit_File::Result.
-  virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                                                    ACE_HANDLE socket,
-                                                                                    ACE_HANDLE file,
-                                                                                    ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                                                    size_t bytes_to_write,
-                                                                                    u_long offset,
-                                                                                    u_long offset_high,
-                                                                                    size_t bytes_per_send,
-                                                                                    u_long flags,
-                                                                                    const void *act,
-                                                                                    ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                    int priority = 0,
-                                                                                    int signal_number = ACE_SIGRTMIN) = 0;
+  virtual ACE_Asynch_Transmit_File_Result_Impl *
+    create_asynch_transmit_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
+                                        ACE_HANDLE socket,
+                                        ACE_HANDLE file,
+                                        ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
+                                        size_t bytes_to_write,
+                                        u_long offset,
+                                        u_long offset_high,
+                                        size_t bytes_per_send,
+                                        u_long flags,
+                                        const void *act,
+                                        ACE_HANDLE event = ACE_INVALID_HANDLE,
+                                        int priority = 0,
+                                        int signal_number = ACE_SIGRTMIN) = 0;
 
   /**
    * Create the correct implementation object for the Timer
    * result. POSIX_SIG_Proactor will create a Timer object with a
    * meaningful signal number, if you leave the signal number as 0.
    */
-  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler,
-                                                       const void *act,
-                                                       const ACE_Time_Value &tv,
-                                                       ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                       int priority = 0,
-                                                       int signal_number = 0) = 0;
+  virtual ACE_Asynch_Result_Impl *
+    create_asynch_timer (ACE_Handler::Proxy_Ptr &handler_proxy,
+                         const void *act,
+                         const ACE_Time_Value &tv,
+                         ACE_HANDLE event = ACE_INVALID_HANDLE,
+                         int priority = 0,
+                         int signal_number = 0) = 0;
 
   /**
    * Post <how_many> completions to the completion port so that all
diff --git a/ace/Process.cpp b/ace/Process.cpp
index bfecc19732c..86f9bde611a 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -1103,3 +1103,9 @@ ACE_Managed_Process::ACE_Managed_Process (void)
 ACE_Managed_Process::~ACE_Managed_Process (void)
 {
 }
+
+void
+ACE_Managed_Process::unmanage (void)
+{
+  delete this;
+}
diff --git a/ace/Process.h b/ace/Process.h
index 7f1685f4ef9..8ca56b21aaf 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -21,8 +21,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Handle_Set.h"
-#include "ace/os_include/sys/os_types.h"
 #include "ace/Global_Macros.h"
+#include "ace/os_include/sys/os_types.h"
 
 // Forward declaration
 class ACE_Time_Value;
@@ -597,8 +597,6 @@ private:
   friend class ace_dewarn_gplusplus;
 };
 
-#include "ace/SString.h"
-
 #if defined (__ACE_INLINE__)
 #include "ace/Process.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Process.inl b/ace/Process.inl
index 7b561b5c59d..db6f410e9b3 100644
--- a/ace/Process.inl
+++ b/ace/Process.inl
@@ -372,12 +372,6 @@ ACE_Process_Options::process_name (void)
   return this->process_name_;
 }
 
-ACE_INLINE void
-ACE_Managed_Process::unmanage (void)
-{
-  delete this;
-}
-
 #if defined (ACE_HAS_WINCE)
 // Here is a collection of inline functions which are defined only
 // under CE.  They are not empty on most other platforms.
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index 4aa30ef5c5d..9046f69011c 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -606,13 +606,13 @@ ACE_Process_Manager::terminate (pid_t pid)
 
   // Check for duplicates and bail out if they're already
   // registered...
-  ssize_t i = this->find_proc (pid);
+  ssize_t const i = this->find_proc (pid);
 
   if (i == -1)
     // set "no such process" error
     return -1;
 
-  int result = ACE::terminate_process (pid);
+  int const result = ACE::terminate_process (pid);
 
   if (result != -1)
     {
@@ -621,8 +621,8 @@ ACE_Process_Manager::terminate (pid_t pid)
       this->remove_proc (i);
       return 0;
     }
-  else
-    return -1;
+
+  return -1;
 }
 
 int
diff --git a/ace/Profile_Timer.cpp b/ace/Profile_Timer.cpp
index 2d7370449b1..c3fe6f5e0d6 100644
--- a/ace/Profile_Timer.cpp
+++ b/ace/Profile_Timer.cpp
@@ -15,6 +15,8 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer)
 
 #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
 
+#include "ace/OS_NS_stdio.h"
+
 void
 ACE_Profile_Timer::dump (void) const
 {
diff --git a/ace/Profile_Timer.inl b/ace/Profile_Timer.inl
index b4070d3250c..6256ad61868 100644
--- a/ace/Profile_Timer.inl
+++ b/ace/Profile_Timer.inl
@@ -8,6 +8,9 @@
 #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
 
 #  if defined (ACE_HAS_PRUSAGE_T)
+
+#    include "ace/OS_NS_stropts.h"
+
 ACE_INLINE int
 ACE_Profile_Timer::start (void)
 {
diff --git a/ace/QoS/Makefile.am b/ace/QoS/Makefile.am
index 3cf8b04a686..020e4bfd064 100644
--- a/ace/QoS/Makefile.am
+++ b/ace/QoS/Makefile.am
@@ -1,16 +1,30 @@
-##----------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile.am for ACE_QoS library
-##----------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+includedir = @includedir@/ace/QoS
+pkgconfigdatadir = ${prefix}/lib/pkgconfig
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+nobase_include_HEADERS =
+lib_LTLIBRARIES =
+## Makefile.QoS.am 
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+if BUILD_QOS
+lib_LTLIBRARIES += libACE_QoS.la
 
-lib_LTLIBRARIES = libACE_QoS.la
+libACE_QoS_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DACE_QoS_BUILD_DLL
 
 libACE_QoS_la_SOURCES = \
   QoS_Decorator.cpp \
@@ -19,21 +33,34 @@ libACE_QoS_la_SOURCES = \
   QoS_Session_Impl.cpp \
   SOCK_Dgram_Mcast_QoS.cpp
 
-libACE_QoS_la_LIBADD = $(top_builddir)/ace/libACE.la
+libACE_QoS_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
 
-HEADER_FILES = \
+libACE_QoS_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
+
+nobase_include_HEADERS += \
   ACE_QoS_Export.h \
   QoS_Decorator.h \
   QoS_Manager.h \
   QoS_Session.h \
   QoS_Session_Factory.h \
   QoS_Session_Impl.h \
-  SOCK_Dgram_Mcast_QoS.h
-
-INLINE_FILES = \
+  SOCK_Dgram_Mcast_QoS.h \
   QoS_Session_Impl.i \
   SOCK_Dgram_Mcast_QoS.i
 
-pkginclude_HEADERS = \
-  $(HEADER_FILES) \
-  $(INLINE_FILES)
+pkgconfigdata_DATA = ACE_QoS.pc
+
+ACE_QoS.pc: ${top_builddir}/config.status ACE_QoS.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/ACE_QoS.pc.in
+
+endif BUILD_QOS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
index b02952fbeb7..28917278c31 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
@@ -240,8 +240,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr,
 
       // XX This is windows stuff only. fredk
       if (ACE_OS::join_leaf (this->get_handle (),
-                             ACE_reinterpret_cast (const sockaddr *,
-                                                   &ret_mreq.IMR_MULTIADDR.s_addr),
+                             reinterpret_cast<const sockaddr *> (&ret_mreq.IMR_MULTIADDR.s_addr),
                              sizeof ret_mreq.IMR_MULTIADDR.s_addr,
                              qos_params) == ACE_INVALID_HANDLE
           && errno != ENOTSUP)
diff --git a/ace/QtReactor.cpp b/ace/QtReactor.cpp
index 164d5f317b1..ab82e9c9944 100644
--- a/ace/QtReactor.cpp
+++ b/ace/QtReactor.cpp
@@ -1,6 +1,5 @@
 //$Id$
 #include "ace/QtReactor.h"
-#if defined (ACE_HAS_QT)
 ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
 
 // Must be called with lock held
@@ -76,7 +75,7 @@ ACE_QtReactor::~ACE_QtReactor (void)
     {
         MAP::ENTRY &entry ( *iter );
         // QOBject destructor notifies qapplication (hopefully) on delete
-        delete entry.int_id_; 
+        delete entry.int_id_;
         ++iter;
     }
 
@@ -99,23 +98,23 @@ ACE_QtReactor::~ACE_QtReactor (void)
         MAP::ENTRY &entry ( *iter );
         // QOBject destructor notifies qapplication (hopefully) on delete
         delete entry.int_id_;
-        ++iter; 
+        ++iter;
     }
 
     // QOBject destructor notifies qapplication (hopefully) on delete
     delete qtime_;
 }
 
-void 
+void
 ACE_QtReactor::qapplication (QApplication *qapp)
 {
   // reparent QSocketNotifiers and QTimer
   qapp_ = qapp ;
 }
 
-void 
+void
 ACE_QtReactor::timeout_event (void)
-{  
+{
   // Deal with any timer events
   ACE_Select_Reactor_Handle_Set handle_set;
   this->dispatch (0, handle_set );
@@ -124,18 +123,17 @@ ACE_QtReactor::timeout_event (void)
   this->reset_timeout ();
 }
 
-void 
+void
 ACE_QtReactor::read_event (int p_handle)
 {
-  ACE_TRACE( (LM_TRACE, 
-	  ACE_TEXT( "ACE_QtReactor::read_event (%d)\n") , p_handle ) );
+  ACE_TRACE ("ACE_QtReactor::read_event");
 
   ACE_HANDLE handle = ACE_HANDLE( p_handle );
 
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS    
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
   // disable socket notifier to clear pending events
   QSocketNotifier *qsock_notifier = 0;
-  if ( ( this->read_notifier_.find( handle, 
+  if ( ( this->read_notifier_.find( handle,
              qsock_notifier) != -1) )
     qsock_notifier->setEnabled( false );
 #endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
@@ -146,7 +144,7 @@ ACE_QtReactor::read_event (int p_handle)
   dispatch_set.rd_mask_.set_bit ( handle );
   this->dispatch (1, dispatch_set);
 
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS    	
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
   // enable socket notifier according to current mask
   ACE_Reactor_Mask mask = 0;
   mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
@@ -155,15 +153,14 @@ ACE_QtReactor::read_event (int p_handle)
 #endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
 }
 
-void 
+void
 ACE_QtReactor::write_event (int p_handle)
 {
-  ACE_TRACE( (LM_TRACE, 
-	  ACE_TEXT( "ACE_QtReactor::write_event (%d)\n"), p_handle ) );
+  ACE_TRACE ("ACE_QtReactor::write_event");
 
   ACE_HANDLE handle = ACE_HANDLE( p_handle );
 
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS    	  
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
   // disable socket notifier to clear pending events
   QSocketNotifier *qsock_notifier = 0;
   if ( ( this->write_notifier_.find( handle, qsock_notifier) != -1) )
@@ -176,7 +173,7 @@ ACE_QtReactor::write_event (int p_handle)
   dispatch_set.wr_mask_.set_bit( handle );
   this->dispatch (1, dispatch_set);
 
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS    	
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
   // enable socket notifier according to current mask
   ACE_Reactor_Mask mask = 0;
   mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
@@ -185,16 +182,15 @@ ACE_QtReactor::write_event (int p_handle)
 #endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
 }
 
-void 
+void
 ACE_QtReactor::exception_event (int p_handle)
 {
-  ACE_TRACE( (LM_TRACE, 
-	  ACE_TEXT( "ACE_QtReactor::exception_event (%d)\n"), p_handle ) );
+  ACE_TRACE ("ACE_QtReactor::exception_event");
 
   ACE_HANDLE handle = ACE_HANDLE( p_handle );
 
 
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS    	
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
   // disable socket notifier to clear pending events
   QSocketNotifier *qsock_notifier = 0;
   if ( ( this->exception_notifier_.find( handle, qsock_notifier) != -1) )
@@ -205,9 +201,9 @@ ACE_QtReactor::exception_event (int p_handle)
   ACE_Select_Reactor_Handle_Set dispatch_set;
 
   dispatch_set.ex_mask_.set_bit( handle );
-  dispatch (1, dispatch_set);  
+  dispatch (1, dispatch_set);
 
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS    	  
+#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
   // enable socket notifier according to current mask
   ACE_Reactor_Mask mask = 0;
   mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
@@ -230,10 +226,10 @@ ACE_QtReactor::set_enable_flag_by_mask (int flag_value,
       qs_not = 0;
       if ((this->read_notifier_.find (handle, qs_not) == -1))
         return -1;
-      
+
       qs_not->setEnabled (flag_value);
     }
-  
+
   if (ACE_BIT_ENABLED( mask, ACE_Event_Handler::WRITE_MASK) ||
       ACE_BIT_ENABLED( mask, ACE_Event_Handler::ACCEPT_MASK) ||
       ACE_BIT_ENABLED( mask, ACE_Event_Handler::CONNECT_MASK))
@@ -241,17 +237,17 @@ ACE_QtReactor::set_enable_flag_by_mask (int flag_value,
       qs_not = 0;
       if ((this->write_notifier_.find (handle, qs_not) == -1))
         return -1;
-      
+
       qs_not->setEnabled (flag_value);
     }
-  
-  if (ACE_BIT_ENABLED( mask, 
+
+  if (ACE_BIT_ENABLED( mask,
                        ACE_Event_Handler::EXCEPT_MASK))
     {
       qs_not = 0;
       if ((this->exception_notifier_.find (handle, qs_not) == -1))
         return -1;
-      
+
       qs_not->setEnabled (flag_value);
     }
 
@@ -302,7 +298,7 @@ ACE_QtReactor::bit_ops (ACE_HANDLE handle,
           return -1;
         }
       break;
-      
+
     default:
       // we take no action for any other operations
       break;
@@ -318,20 +314,20 @@ ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle)
 
     // if there is already a read socket notifier for this handle, do nothing
     // otherwise create read notifier
-    if ( ( this->read_notifier_.find (handle, 
+    if ( ( this->read_notifier_.find (handle,
                qsock_notifier) == -1) )
     {
         ACE_NEW (qsock_notifier,
             QSocketNotifier (int(handle), QSocketNotifier::Read, this));
         this->read_notifier_.bind (handle,
             qsock_notifier);
-        QObject::connect (qsock_notifier, 
-            SIGNAL (activated (int)), 
-            this, 
+        QObject::connect (qsock_notifier,
+            SIGNAL (activated (int)),
+            this,
             SLOT (read_event (int))) ;
         // disable; it will be enabled by the regular register_handler_i if
         // necessary
-        qsock_notifier->setEnabled (0);      
+        qsock_notifier->setEnabled (0);
     }
 
     qsock_notifier = 0;
@@ -339,42 +335,42 @@ ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle)
 
     // if there is already a write socket notifier for this handle, do nothing
     // otherwise create read notifier
-    if ((this->write_notifier_.find (handle, 
+    if ((this->write_notifier_.find (handle,
              qsock_notifier) == -1))
-    {      
+    {
         ACE_NEW (qsock_notifier,
             QSocketNotifier (int(handle), QSocketNotifier::Write, this));
-      
+
         this->write_notifier_.bind (handle,
             qsock_notifier);
-      
-        QObject::connect (qsock_notifier, 
-            SIGNAL (activated (int)), 
-            this, 
+
+        QObject::connect (qsock_notifier,
+            SIGNAL (activated (int)),
+            this,
             SLOT (write_event (int)));
         // disable; it will be enabled by the regular register_handler_i if
         // necessary
         qsock_notifier->setEnabled (0);
     }
-  
-  
+
+
     qsock_notifier = 0;
 
     // if there is already a write socket notifier for this handle, do nothing
     // otherwise create read notifier
-    if ((this->exception_notifier_.find (handle, 
+    if ((this->exception_notifier_.find (handle,
              qsock_notifier) == -1))
     {
-      
+
         ACE_NEW (qsock_notifier,
             QSocketNotifier (int(handle), QSocketNotifier::Exception, this));
-      
+
         this->exception_notifier_.bind (handle,
             qsock_notifier);
-      
-        QObject::connect (qsock_notifier, 
-            SIGNAL (activated (int)), 
-            this, 
+
+        QObject::connect (qsock_notifier,
+            SIGNAL (activated (int)),
+            this,
             SLOT (exception_event (int))) ;
         // disable; it will be enabled by the regular register_handler_i if
         // necessary
@@ -384,12 +380,12 @@ ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle)
 
 void
 ACE_QtReactor::destroy_notifiers_for_handle (ACE_HANDLE handle)
-{	
+{
   QSocketNotifier *qsock_notifier = 0;
 
-  // Looks for the handle in the maps and removes them. 
-  
-  if ((this->read_notifier_.find (handle, 
+  // Looks for the handle in the maps and removes them.
+
+  if ((this->read_notifier_.find (handle,
                                   qsock_notifier) != -1))
     {
       this->read_notifier_.unbind (handle,
@@ -397,7 +393,7 @@ ACE_QtReactor::destroy_notifiers_for_handle (ACE_HANDLE handle)
       delete qsock_notifier;
     }
 
-  if ((this->write_notifier_.find (handle, 
+  if ((this->write_notifier_.find (handle,
                                    qsock_notifier) != -1))
     {
       this->write_notifier_.unbind (handle,
@@ -406,7 +402,7 @@ ACE_QtReactor::destroy_notifiers_for_handle (ACE_HANDLE handle)
     }
 
 
-  if ((this->exception_notifier_.find (handle, 
+  if ((this->exception_notifier_.find (handle,
                                        qsock_notifier) != -1))
     {
       this->exception_notifier_.unbind (handle,
@@ -415,19 +411,19 @@ ACE_QtReactor::destroy_notifiers_for_handle (ACE_HANDLE handle)
     }
 }
 
-int 
+int
 ACE_QtReactor::register_handler_i (ACE_HANDLE handle ,
                                    ACE_Event_Handler *handler,
                                    ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_QtReactor::register_handler_i");
-  
+
   this->create_notifiers_for_handle (handle);
 
   int result;
-  if ((result = ACE_Select_Reactor::register_handler_i(handle, 
-                                                       handler, 
-                                                       mask )) 
+  if ((result = ACE_Select_Reactor::register_handler_i(handle,
+                                                       handler,
+                                                       mask ))
       == -1)
     {
         // destroy notifiers only when there is no handler for handle
@@ -439,13 +435,13 @@ ACE_QtReactor::register_handler_i (ACE_HANDLE handle ,
   return 0;
 }
 
-int 
+int
 ACE_QtReactor::register_handler_i (const ACE_Handle_Set &handles,
                                    ACE_Event_Handler *handler,
                                    ACE_Reactor_Mask mask)
 {
-  return ACE_Select_Reactor::register_handler_i(handles, 
-                                                handler, 
+  return ACE_Select_Reactor::register_handler_i(handles,
+                                                handler,
                                                 mask);
 }
 
@@ -462,27 +458,27 @@ int ACE_QtReactor::remove_handler_i (ACE_HANDLE handle ,
 }
 
 
-int 
+int
 ACE_QtReactor::remove_handler_i (const ACE_Handle_Set &handles,
                                  ACE_Reactor_Mask  mask)
 {
-  return ACE_Select_Reactor::remove_handler_i (handles, 
+  return ACE_Select_Reactor::remove_handler_i (handles,
                                                mask);
 }
 
 // The following functions ensure that there is an Qt timeout for the
 // first timeout in the Reactor's Timer_Queue.
 
-void 
+void
 ACE_QtReactor::reset_timeout (void)
 {
-  if (this->qtime_ != 0) 
-    { 
-      delete this->qtime_; 
-      this->qtime_ = 0; 
+  if (this->qtime_ != 0)
+    {
+      delete this->qtime_;
+      this->qtime_ = 0;
     }
 
-  ACE_Time_Value *max_wait_time = 
+  ACE_Time_Value *max_wait_time =
     this->timer_queue_->calculate_timeout (0) ;
 
   if (max_wait_time)
@@ -490,34 +486,34 @@ ACE_QtReactor::reset_timeout (void)
     ACE_NEW (this->qtime_,
              QTimer);
 
-    QObject::connect (qtime_, 
-                      SIGNAL (timeout ()), 
-                      this, 
+    QObject::connect (qtime_,
+                      SIGNAL (timeout ()),
+                      this,
                       SLOT (timeout_event ()));
-    
-    qtime_->start(max_wait_time->msec(), 1); 
+
+    qtime_->start(max_wait_time->msec(), 1);
   }
-  
+
 }
 
 
-long 
+long
 ACE_QtReactor::schedule_timer (ACE_Event_Handler *handler,
                                const void *arg,
                                const ACE_Time_Value &delay_time,
                                const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_QtReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, 
-                            ace_mon, 
-                            this->token_, 
+  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token,
+                            ace_mon,
+                            this->token_,
                             -1));
 
   long result;
-  if ((result = ACE_Select_Reactor::schedule_timer(handler, 
-                                                   arg, 
-                                                   delay_time, 
-                                                   interval)) == -1 ) 
+  if ((result = ACE_Select_Reactor::schedule_timer(handler,
+                                                   arg,
+                                                   delay_time,
+                                                   interval)) == -1 )
     return -1;
   else
   {
@@ -526,14 +522,14 @@ ACE_QtReactor::schedule_timer (ACE_Event_Handler *handler,
   }
 }
 
-int 
+int
 ACE_QtReactor::cancel_timer (ACE_Event_Handler *handler,
                              int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_QtReactor::cancel_timer");
 
-  if (ACE_Select_Reactor::cancel_timer (handler, 
-                                        dont_call_handle_close ) == -1 ) 
+  if (ACE_Select_Reactor::cancel_timer (handler,
+                                        dont_call_handle_close ) == -1 )
     return -1 ;
   else
   {
@@ -546,11 +542,11 @@ int ACE_QtReactor::cancel_timer (long  timer_id,
                                  const void **arg,
                                  int dont_call_handle_close )
 {
-  ACE_TRACE( "ACE_QtReactor::cancel_timer" ) ;
+  ACE_TRACE ("ACE_QtReactor::cancel_timer") ;
 
-  if (ACE_Select_Reactor::cancel_timer (timer_id, 
-                                        arg, 
-                                        dont_call_handle_close ) == -1 ) 
+  if (ACE_Select_Reactor::cancel_timer (timer_id,
+                                        arg,
+                                        dont_call_handle_close ) == -1 )
     return -1 ;
   else
   {
@@ -560,7 +556,7 @@ int ACE_QtReactor::cancel_timer (long  timer_id,
 }
 
 // mbrudka: who needs QtWaitForMultipleEvents? It seems it's cargo load now!
-int 
+int
 ACE_QtReactor::QtWaitForMultipleEvents (int width,
                                         ACE_Select_Reactor_Handle_Set &wait_set,
                                         ACE_Time_Value * /*max_wait_time*/)
@@ -574,7 +570,7 @@ ACE_QtReactor::QtWaitForMultipleEvents (int width,
                       temp_set.ex_mask_,
                       (ACE_Time_Value *) &ACE_Time_Value::zero ) == -1)
     return -1; // Bad file arguments...
-  
+
   // Qt processing.
   this->qapp_->processOneEvent ();
 
@@ -591,25 +587,25 @@ ACE_QtReactor::QtWaitForMultipleEvents (int width,
 }
 
 // mbrudka: who needs wait_for_multiple_events? It seems it's cargo load now!
-int 
+int
 ACE_QtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
                                          ACE_Time_Value *max_wait_time)
 {
-  ACE_TRACE( "ACE_QtReactor::wait_for_multiple_events" );
+  ACE_TRACE ("ACE_QtReactor::wait_for_multiple_events");
 
-  int nfound = 0; 
-  do 
+  int nfound = 0;
+  do
   {
     max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
     size_t width = this->handler_rep_.max_handlep1 ();
     handle_set.rd_mask_ = this->wait_set_.rd_mask_;
     handle_set.wr_mask_ = this->wait_set_.wr_mask_;
     handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-    
-    nfound = QtWaitForMultipleEvents (width, 
-                                      handle_set, 
+
+    nfound = QtWaitForMultipleEvents (width,
+                                      handle_set,
                                       max_wait_time);
-    
+
   } while( nfound == -1 && this->handle_error () > 0 );
 
   if (nfound > 0)
@@ -620,8 +616,8 @@ ACE_QtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s
     handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
 #endif /* ACE_WIN32 */
   }
-  
-  return nfound; 
+
+  return nfound;
   // Timed out or input available
 }
 
@@ -640,4 +636,3 @@ template class ACE_Map_Reverse_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_
 #pragma instantiate ACE_Map_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /*ACE_HAS_QT */
diff --git a/ace/QtReactor.h b/ace/QtReactor.h
index 26e48e21bff..b336fdd3d13 100644
--- a/ace/QtReactor.h
+++ b/ace/QtReactor.h
@@ -17,12 +17,12 @@
 
 
 #include "ace/Select_Reactor.h"
+#include "ace/ACE_QtReactor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_QT)
 #include "ace/Map_Manager.h"
 
 // Qttoolkit specific includes.
@@ -79,7 +79,7 @@
  * it is not clear if the leak is introduced by  QtReactor, or rather incorrect
  * memory management in QtReactor_Test.
  */
-class ACE_Export ACE_QtReactor : public QObject, public ACE_Select_Reactor
+class ACE_QtReactor_Export ACE_QtReactor : public QObject, public ACE_Select_Reactor
 {
 
     Q_OBJECT
@@ -212,7 +212,5 @@ void read_event (int FD);
     void timeout_event (void);
 };
 
-#endif /*ACE_HAS_QT */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_QTREACTOR_H */
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 3c903ee8efd..fcef3243700 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -1075,7 +1075,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_I
    : tree_ (&tree), node_ (0)
 {
   ACE_TRACE("ACE_RB_Tree_Iterator_Base (ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree, const EXT_ID& key)");
-  ACE_RB_Tree_Node<EXT_ID, INT_ID>* entry;
+  ACE_RB_Tree_Node<EXT_ID, INT_ID>* entry = 0;
   tree.find_i(key, entry);
   node_ = entry;
 }
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index e2ba71cee94..121b0731cfc 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -193,6 +193,7 @@ public:
 
   typedef EXT_ID KEY;
   typedef INT_ID VALUE;
+  typedef ACE_LOCK lock_type;
   typedef ACE_RB_Tree_Node<EXT_ID, INT_ID> ENTRY;
 
   // = ACE-style iterator typedefs.
diff --git a/ace/RMCast/Makefile.am b/ace/RMCast/Makefile.am
deleted file mode 100644
index f874ca9a380..00000000000
--- a/ace/RMCast/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for ACE_RMCast library
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libACE_RMCast.la
-
-## ACE_RMCast library version is same as ACE's version.
-libACE_RMCast_la_LDFLAGS = -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
-
-libACE_RMCast_la_SOURCES = \
-  RMCast.cpp \
-  RMCast_Ack_Worker.cpp \
-  RMCast_Fork.cpp \
-  RMCast_Fragment.cpp \
-  RMCast_IO_UDP.cpp \
-  RMCast_Membership.cpp \
-  RMCast_Module.cpp \
-  RMCast_Module_Factory.cpp \
-  RMCast_Partial_Message.cpp \
-  RMCast_Proxy.cpp \
-  RMCast_Reassembly.cpp \
-  RMCast_Receiver_Module.cpp \
-  RMCast_Reliable_Factory.cpp \
-  RMCast_Reordering.cpp \
-  RMCast_Resend_Handler.cpp \
-  RMCast_Resend_Worker.cpp \
-  RMCast_Retransmission.cpp \
-  RMCast_Sequencer.cpp \
-  RMCast_Singleton_Factory.cpp \
-  RMCast_UDP_Event_Handler.cpp \
-  RMCast_UDP_Proxy.cpp \
-  RMCast_UDP_Reliable_Receiver.cpp \
-  RMCast_UDP_Reliable_Sender.cpp
-
-libACE_RMCast_la_LIBADD = $(top_builddir)/ace/libACE.la
-
-## These are template source files.
-TEMPLATE_FILES = \
-  RMCast_Copy_On_Write.cpp \
-  RMCast_Worker.cpp
-
-HEADER_FILES = \
-  RMCast.h \
-  RMCast_Ack_Worker.h \
-  RMCast_Copy_On_Write.h \
-  RMCast_Export.h \
-  RMCast_Fork.h \
-  RMCast_Fragment.h \
-  RMCast_IO_UDP.h \
-  RMCast_Membership.h \
-  RMCast_Module.h \
-  RMCast_Module_Factory.h \
-  RMCast_Partial_Message.h \
-  RMCast_Proxy.h \
-  RMCast_Reassembly.h \
-  RMCast_Receiver_Module.h \
-  RMCast_Reliable_Factory.h \
-  RMCast_Reordering.h \
-  RMCast_Resend_Handler.h \
-  RMCast_Resend_Worker.h \
-  RMCast_Retransmission.h \
-  RMCast_Sequencer.h \
-  RMCast_Singleton_Factory.h \
-  RMCast_UDP_Event_Handler.h \
-  RMCast_UDP_Proxy.h \
-  RMCast_UDP_Reliable_Receiver.h \
-  RMCast_UDP_Reliable_Sender.h \
-  RMCast_Worker.h
-
-INLINE_FILES = \
-  RMCast.i \
-  RMCast_Ack_Worker.i \
-  RMCast_Copy_On_Write.i \
-  RMCast_Fork.i \
-  RMCast_Fragment.i \
-  RMCast_IO_UDP.i \
-  RMCast_Membership.i \
-  RMCast_Module.i \
-  RMCast_Module_Factory.i \
-  RMCast_Partial_Message.i \
-  RMCast_Proxy.i \
-  RMCast_Reassembly.i \
-  RMCast_Receiver_Module.i \
-  RMCast_Reliable_Factory.i \
-  RMCast_Reordering.i \
-  RMCast_Resend_Handler.i \
-  RMCast_Resend_Worker.i \
-  RMCast_Retransmission.i \
-  RMCast_Sequencer.i \
-  RMCast_Singleton_Factory.i \
-  RMCast_UDP_Event_Handler.i \
-  RMCast_UDP_Proxy.i \
-  RMCast_UDP_Reliable_Receiver.i \
-  RMCast_UDP_Reliable_Sender.i \
-  RMCast_Worker.i
-
-pkginclude_HEADERS = \
-  $(HEADER_FILES) \
-  $(INLINE_FILES) \
-  $(TEMPLATE_FILES)
diff --git a/ace/RMCast/README b/ace/RMCast/README
deleted file mode 100644
index ed6b22bf1c6..00000000000
--- a/ace/RMCast/README
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-
-	This directory will contain a simple, small-scale reliable
-multicast framework for ACE.  The framework is based on the ASX
-components of the ACE library: the protocol is implemented as a stack
-of interchangeable "modules", each one in charge of a very small task.
-For example, one module implements fragmentation and reassembly, other
-modules implement retransmission, send ACK and NAK messages, and
-maintain receiver membership.
-
-	The modules are replaced to achieve different levels of
-reliability.  For example, the retransmission module can be either the
-"Best_Effort", "Semi_Reliable" or "Reliable" implementation.  In the
-first case no retransmissions are performed, but lost messages are
-detected and reported to the receiver.  The "Semi_Reliable" case
-messages are held for a pre-specified amount of time, and
-re-transmited if requested, but it is possible to loose some messages
-if multiple re-transmissions fail.  As in the "Best_Effort" case the
-lost messages are detected and flagged to the application.  Finally
-in the "Reliable" mode the senders are flowed controlled until enough
-messages are successfully transmitted.
-
-	In general the stack looks like this:
-
-
-SENDER:
-
-----------------------------------------------------------------
-Buffering	:	Save lost messages
-Retransmission	:	Retransmit 
-----------------------------------------------------------------
-Fragmentation   :	Fragment messages in smaller chunks
-Reassembly	:	and ensure that the IOVMAX limit is not
-		:	reached
-----------------------------------------------------------------
-Transport	:	Encapsulate the specific transport media
-		:	such as TCP/IP, ATM, or shared memory
-		:	Demuxes incoming data to the right chain
-		:	Change control messages and data messages
-		:	to the right dynamic types.
-----------------------------------------------------------------
-
-RECEIVER:
-
-----------------------------------------------------------------
-Lost detection	:	Detect lost messages and send control
-		:	messages back
-----------------------------------------------------------------
-Reassembly	:	Reassemble messages, fragment control
-Fragmentation	:	data
-----------------------------------------------------------------
-Transport	:	Group membership, ACT reception,
-		:	handle keep-alive messages...
-----------------------------------------------------------------
-
-
-@@ TODO: Piggybacking...
diff --git a/ace/RMCast/RMCast.cpp b/ace/RMCast/RMCast.cpp
deleted file mode 100644
index 92ea637e481..00000000000
--- a/ace/RMCast/RMCast.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-#include "RMCast.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RMCast.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast, "$Id$")
diff --git a/ace/RMCast/RMCast.h b/ace/RMCast/RMCast.h
deleted file mode 100644
index aa6730f4b85..00000000000
--- a/ace/RMCast/RMCast.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    RMCast.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_H
-#define ACE_RMCAST_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Basic_Types.h"
-
-class ACE_Message_Block;
-class ACE_RMCast_Proxy;
-
-//! The RMCast namespace
-/*!
-  Several simple data structures and enums are shared by all the
-  RMCast components, this is the place where we put them by default.
-*/
-class ACE_RMCast_Export ACE_RMCast
-{
-public:
-
-  //! The message types
-  /*!
-    Each message includes a type field in the header used by the
-    receiver to correctly parse it.
-    Classes with the same name as the message type describe the actual
-    format of the message.
-  */
-  enum Message_Type
-  {
-    // Sender initiated
-    RMCAST_MT_POLL,
-    RMCAST_MT_ACK_JOIN,
-    RMCAST_MT_ACK_LEAVE,
-    RMCAST_MT_DATA,
-    // Receiver initiated
-    RMCAST_MT_JOIN,
-    RMCAST_MT_LEAVE,
-    RMCAST_MT_ACK,
-    RMCAST_MT_LAST
-  };
-
-  //! Simle enum used to describe the state transitions for senders
-  /*!
-   State transition (and actions) for the senders.
-   This configuration is pesimistic, any invalid message is cause
-   enough to reclaim all the resources.  This partially addresses
-   situations where either accidentally or intentionally a sender is
-   multicasting packets to the wrong group.
-
-  <CODE>
-              NON_EXISTENT   JOINED<BR>
-   ------------------------------------------<BR>
-   POLL       NON_EXISTENT   NON_EXISTENT<BR>
-              Destroy        Destroy<BR>
-  <BR>
-   ACK        NON_EXISTENT   JOINED<BR>
-              Noop           Process/Ack<BR>
-  <BR>
-   JOIN       JOINED         NON_EXISTENT<BR>
-              Send/Join_Ack  Send/Join_Ack<BR>
-  <BR>
-   LEAVE      NON_EXISTENT   NON_EXISTENT<BR>
-              Send/Leave_Ack Send/Leave_Ack<BR>
-                             Destroy<BR>
-  <BR>
-   ACK_JOIN   NON_EXISTENT   NON_EXISTENT<BR>
-              Noop           Destroy<BR>
-  <BR>
-   ACK_LEAVE  NON_EXISTENT   NON_EXISTENT<BR>
-              Noop           Destroy<BR>
-  <BR>
-   SEND_DATA  NON_EXISTENT   NON_EXISTENT<BR>
-              Noop           Destroy<BR>
-  </CODE>
-  */
-  enum Sender_State
-  {
-    SS_NON_EXISTENT,
-    SS_JOINED
-  };
-
-
-  // These structures define the basic layout of the messages.
-
-  //! This is the main message sent by senders
-  /*!
-  <CODE>
-   +---------+----------------------+<BR>
-   | 8 bits  | DATA                 |<BR>
-   +---------+----------------------+<BR>
-   | 32 bits | sequence_number      |<BR>
-   +---------+----------------------+<BR>
-   | 32 bits | message_size         |<BR>
-   +---------+----------------------+<BR>
-   | 32 bits | fragment_offset      |<BR>
-   +---------+----------------------+<BR>
-   ? ? ? ? ? | 32 bits | payload_size         |<BR>
-   ? ? ? ? ? +---------+----------------------+<BR>
-   |         | payload              |<BR>
-   +---------+----------------------+<BR>
-  </CODE>
-  */
-  struct Data
-  {
-    // Source ID is implicit in recvfrom()...
-    ACE_UINT32 sequence_number;
-    ACE_UINT32 total_size;
-    ACE_UINT32 fragment_offset;
-
-    // @@ TODO: we may want to add optional fields, such as:
-    //    - Polling clients for their status
-    //    - Sending the range of messages in the queue
-    //    - If we are using authentic group communication we may
-    //    piggyback the ACK / NAK messages
-
-    ACE_Message_Block *payload;
-
-    //! Pass the proxy source between layers
-    ACE_RMCast_Proxy *source;
-  };
-
-  /*!
-    <CODE>
-    +---------+----------------------+<BR>
-    | 8 bits  | RMCAST_MT_POLL              |<BR>
-    +---------+----------------------+<BR>
-    </CODE>
-  */
-  struct Poll
-  {
-    //! Pass the proxy source between layers
-    ACE_RMCast_Proxy *source;
-  };
-
-  //! Receivers accept new members using this message
-  /*!
-    <CODE>
-    +---------+----------------------+<BR>
-    | 8 bits  | RMCAST_MT_ACK_JOIN          |<BR>
-    +---------+----------------------+<BR>
-    | 32 bits | next_sequence_number |<BR>
-    +---------+----------------------+<BR>
-    </CODE>
-  */
-  struct Ack_Join
-  {
-    ACE_UINT32 next_sequence_number;
-
-    //! Pass the proxy source between layers
-    ACE_RMCast_Proxy *source;
-  };
-
-  //! Senders acknowledge when receivers try to leave
-  /*!
-  <CODE>
-    +---------+----------------------+<BR>
-    | 8 bits  | ACK_LEAVE            |<BR>
-    +---------+----------------------+<BR>
-    </CODE>
-  */
-  struct Ack_Leave
-  {
-    //! Pass the proxy source between layers
-    ACE_RMCast_Proxy *source;
-  };
-
-  //! Provide feedback to the sender about messages received and sent
-  //! so far.
-  /*!
-   *
-   * This message is used to provide feedback information to senders.
-   * It contains two sequence numbers:
-   * - \param next_expected: is the sequence number of the next message
-   *   expected, i.e. (next_expected-1) is the last message received
-   *   without any losses before it.
-   * - \param highest_received: is the highest sequence number among
-   *   all the messages successfully received.
-   * In other words, all messages lost (if any) are in the range:
-   * [next_expected,highest_received)
-   *
-   * <CODE>
-   * +---------+----------------------+<BR>
-   * | 8 bits  | RMCAST_MT_ACK               |<BR>
-   * +---------+----------------------+<BR>
-   * | 32 bits | next_expected        |<BR>
-   * +---------+----------------------+<BR>
-   * | 32 bits | highest_received     |<BR>
-   * +---------+----------------------+<BR>
-   * </CODE>
-   */
-  struct Ack
-  {
-    //! The last message received without any losses before it.
-    ACE_UINT32 next_expected;
-
-    //! The last message successfully received
-    ACE_UINT32 highest_received;
-
-    //! Pass the proxy source between layers
-    ACE_RMCast_Proxy *source;
-  };
-
-  //! Receivers send this message to indicate they want to join
-  /*
-  <CODE>
-    +---------+----------------------+<BR>
-    | 8 bits  | RMCAST_MT_JOIN              |<BR>
-    +---------+----------------------+<BR>
-  </CODE>
-  */
-  struct Join
-  {
-    //! Pass the proxy source between layers
-    ACE_RMCast_Proxy *source;
-  };
-
-  //! Receivers send this message to disconnect gracefully
-  /*!
-  <CODE>
-    +---------+----------------------+<BR>
-    | 8 bits  | RMCAST_MT_LEAVE             |<BR>
-    +---------+----------------------+<BR>
-  </CODE>
-  */
-  struct Leave
-  {
-    //! Pass the proxy source between layers
-    ACE_RMCast_Proxy *source;
-  };
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_H */
diff --git a/ace/RMCast/RMCast.i b/ace/RMCast/RMCast.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/ace/RMCast/RMCast.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/ace/RMCast/RMCast.rc b/ace/RMCast/RMCast.rc
deleted file mode 100644
index 142de8a5625..00000000000
--- a/ace/RMCast/RMCast.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "RMCast\0"
-            VALUE "FileVersion", ACE_VERSION "\0"
-            VALUE "InternalName", "RMCastDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "RMCast.DLL\0"
-            VALUE "ProductName", "ACE\0"
-            VALUE "ProductVersion", ACE_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/ace/RMCast/RMCast_Ack_Worker.cpp b/ace/RMCast/RMCast_Ack_Worker.cpp
deleted file mode 100644
index d9843ebe93b..00000000000
--- a/ace/RMCast/RMCast_Ack_Worker.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_Ack_Worker.h"
-#include "ace/Message_Block.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Ack_Worker.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Ack_Worker, "$Id$")
-
-int
-ACE_RMCast_Ack_Worker::work (ACE_UINT32 const & key,
-                             ACE_RMCast::Data const &item)
-{
-  if (key >= this->ack_.next_expected)
-    return 0;
-  // ACE_DEBUG ((LM_DEBUG,
-  //            "  Retransmission::ack - message %d erased\n",
-  //            key));
-  ACE_Message_Block::release (item.payload);
-  return this->messages_->unbind_i (this->ace_mon_, key);
-}
diff --git a/ace/RMCast/RMCast_Ack_Worker.h b/ace/RMCast/RMCast_Ack_Worker.h
deleted file mode 100644
index b4d81e4e972..00000000000
--- a/ace/RMCast/RMCast_Ack_Worker.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#ifndef ACE_RMCAST_ACK_WORKER_H
-#define ACE_RMCAST_ACK_WORKER_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Retransmission.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/// Process an Ack message in the ACE_RMCast_Retransmission module
-/**
- * The retransmission module uses internal iterators, thus it needs to
- * create helper Worker classes to process some messages.
- */
-class ACE_RMCast_Ack_Worker
-  : public ACE_RMCast_Worker<ACE_UINT32,ACE_RMCast::Data>
-{
-public:
-  ACE_RMCast_Ack_Worker (ACE_RMCast::Ack &ack,
-                         ACE_RMCast_Retransmission::Messages::Write_Guard &g,
-                         ACE_RMCast_Retransmission::Messages *messages);
-
-  virtual int work (ACE_UINT32 const & key,
-                    ACE_RMCast::Data const &item);
-
-private:
-  ACE_RMCast_Ack_Worker (const ACE_RMCast_Ack_Worker&);
-  ACE_RMCast_Ack_Worker& operator= (const ACE_RMCast_Ack_Worker&);
-
-private:
-  ACE_RMCast::Ack &ack_;
-
-  ACE_RMCast_Retransmission::Messages::Write_Guard &ace_mon_;
-
-  ACE_RMCast_Retransmission::Messages *messages_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Ack_Worker.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_ACK_WORKER_H */
diff --git a/ace/RMCast/RMCast_Ack_Worker.i b/ace/RMCast/RMCast_Ack_Worker.i
deleted file mode 100644
index 54d94d21167..00000000000
--- a/ace/RMCast/RMCast_Ack_Worker.i
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Ack_Worker::
-ACE_RMCast_Ack_Worker (ACE_RMCast::Ack &ack,
-                       ACE_RMCast_Retransmission::Messages::Write_Guard &g,
-                       ACE_RMCast_Retransmission::Messages *messages)
-  : ack_ (ack)
-  , ace_mon_ (g)
-  , messages_ (messages)
-{
-}
diff --git a/ace/RMCast/RMCast_Copy_On_Write.cpp b/ace/RMCast/RMCast_Copy_On_Write.cpp
deleted file mode 100644
index 39bf16f88a2..00000000000
--- a/ace/RMCast/RMCast_Copy_On_Write.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// $Id$
-
-#ifndef ACE_RMCAST_COPY_ON_WRITE_CPP
-#define ACE_RMCAST_COPY_ON_WRITE_CPP
-
-#include "RMCast_Copy_On_Write.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "RMCast_Copy_On_Write.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(RMCast, RMCast_Copy_On_Write, "$Id$")
-
-template<class COLLECTION, class ITERATOR> void
-ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt (void)
-{
-  // LOCKING: no locking is required, the caller grabs the mutex.
-  this->refcount_++;
-}
-
-template<class COLLECTION, class ITERATOR> void
-ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt (void)
-{
-  // LOCKING: no locking is required, the caller grabs the mutex.
-  {
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return;
-  }
-  //@@ TODO: If this wrapper is going to be completely general some
-  // kind of functor has to be provided to remove the elements in the
-  // collection, in case the are no self-managed
-
-  delete this;
-}
-
-// ****************************************************************
-
-template<class KEY, class ITEM, class COLLECTION, class ITERATOR>
-ACE_RMCast_Copy_On_Write<KEY,ITEM,COLLECTION,ITERATOR>::
-    ACE_RMCast_Copy_On_Write (void)
-      : ACE_RMCast_Copy_On_Write_Container<COLLECTION,ITERATOR> ()
-{
-}
-
-template<class KEY, class ITEM, class COLLECTION, class ITERATOR>
-ACE_RMCast_Copy_On_Write<KEY,ITEM,COLLECTION,ITERATOR>::
-    ~ACE_RMCast_Copy_On_Write (void)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
-
-  while (this->pending_writes_ != 0)
-    this->cond_.wait ();
-
-  this->collection_->_decr_refcnt ();
-  this->collection_ = 0;
-}
-
-template<class KEY, class ITEM, class COLLECTION, class ITERATOR> int
-ACE_RMCast_Copy_On_Write<KEY,ITEM,COLLECTION,ITERATOR>::
-    for_each (ACE_RMCast_Worker<KEY,ITEM> *worker)
-{
-  Read_Guard ace_mon (*this);
-
-  ITERATOR end = ace_mon.collection->collection.end ();
-  for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i)
-    {
-      int r = worker->work ((*i).key (), (*i).item ());
-      if (r == 1)
-        return 0; // Abort loop, but no error
-      if (r == -1)
-        return -1;
-    }
-  return 0;
-}
-
-template<class KEY, class ITEM, class C, class ITERATOR> KEY
-ACE_RMCast_Copy_On_Write<KEY,ITEM,C,ITERATOR>::first_key (void)
-{
-  Read_Guard ace_mon (*this);
-  ITERATOR end = ace_mon.collection->collection.end ();
-  ITERATOR begin = ace_mon.collection->collection.begin ();
-  if (begin == end)
-    {
-      return KEY ();
-    }
-  return (*begin).key ();
-}
-
-template<class KEY, class ITEM, class C, class ITERATOR> int
-ACE_RMCast_Copy_On_Write<KEY,ITEM,C,ITERATOR>::empty (void)
-{
-  Read_Guard ace_mon (*this);
-  ITERATOR end = ace_mon.collection->collection.end ();
-  ITERATOR begin = ace_mon.collection->collection.begin ();
-
-  return end == begin;
-}
-
-template<class KEY, class ITEM, class C, class I> int
-ACE_RMCast_Copy_On_Write<KEY,ITEM,C,I>::bind (KEY const & k,
-                                              ITEM const & i)
-{
-  Write_Guard ace_mon (*this);
-
-  return this->bind_i (ace_mon, k, i);
-}
-
-template<class KEY, class ITEM, class C, class I> int
-ACE_RMCast_Copy_On_Write<KEY,ITEM,C,I>::unbind (KEY const & k)
-{
-  Write_Guard ace_mon (*this);
-
-  return this->unbind_i (ace_mon, k);
-}
-
-template<class KEY, class ITEM, class C, class I> int
-ACE_RMCast_Copy_On_Write<KEY,ITEM,C,I>::bind_i (Write_Guard &ace_mon,
-                                                KEY const & k,
-                                                ITEM const & i)
-{
-  return ace_mon.copy->collection.bind (k, i);
-}
-
-template<class KEY, class ITEM, class C, class I> int
-ACE_RMCast_Copy_On_Write<KEY,ITEM,C,I>::unbind_i (Write_Guard &ace_mon,
-                                                  KEY const & k)
-{
-  return ace_mon.copy->collection.unbind (k);
-}
-
-// ****************************************************************
-
-template<class COLLECTION, class ITERATOR>
-ACE_RMCast_Copy_On_Write_Container<COLLECTION,ITERATOR>::ACE_RMCast_Copy_On_Write_Container (void)
-  : pending_writes_ (0)
-  , writing_ (0)
-  , cond_ (mutex_)
-{
-  ACE_NEW (this->collection_, Collection);
-}
-
-// ****************************************************************
-
-template<class COLLECTION, class ITERATOR>
-ACE_RMCast_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR>::
-  ACE_RMCast_Copy_On_Write_Write_Guard (Container &container)
-  : copy (0)
-  , mutex (container.mutex_)
-  , cond (container.cond_)
-  , pending_writes (container.pending_writes_)
-  , writing_flag (container.writing_)
-  , collection (container.collection_)
-{
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex);
-
-    this->pending_writes++;
-
-    while (this->writing_flag != 0)
-      this->cond.wait ();
-
-    this->writing_flag = 1;
-  }
-
-  // Copy outside the mutex, because it may take a long time.
-  // Nobody can change it, because it is protected by the
-  // writing_flag.
-
-  // First initialize it (with the correct reference count
-  ACE_NEW (this->copy, Collection);
-  // Copy the contents
-  this->copy->collection = this->collection->collection;
-}
-
-template<class COLLECTION, class ITERATOR>
-ACE_RMCast_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR>::
-    ~ACE_RMCast_Copy_On_Write_Write_Guard (void)
-{
-  Collection *tmp = 0;
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex);
-
-    tmp = this->collection;
-    this->collection = this->copy;
-    this->writing_flag = 0;
-    this->pending_writes--;
-
-    this->cond.signal ();
-  }
-  // Delete outside the mutex, because it may take a long time.
-  // @@ Is this right?  What happens if several readers are still
-  // using the old copy?
-  tmp->_decr_refcnt ();
-}
-
-// ****************************************************************
-
-#endif /* ACE_RMCAST_COPY_ON_WRITE_CPP */
diff --git a/ace/RMCast/RMCast_Copy_On_Write.h b/ace/RMCast/RMCast_Copy_On_Write.h
deleted file mode 100644
index c73dade591b..00000000000
--- a/ace/RMCast/RMCast_Copy_On_Write.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#ifndef ACE_RMCAST_COPY_ON_WRITE_H
-#define ACE_RMCAST_COPY_ON_WRITE_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Worker.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Basic_Types.h"
-#include "ace/Condition_Thread_Mutex.h"
-
-//! A wrapper to implement reference counted collections
-template<class COLLECTION, class ITERATOR>
-class ACE_RMCast_Copy_On_Write_Collection
-{
-public:
-  //! Constructor
-  ACE_RMCast_Copy_On_Write_Collection (void);
-
-  //! Increment the reference count
-  void _incr_refcnt (void);
-
-  //! Decrement the reference count
-  void _decr_refcnt (void);
-
-  //! The actual collection
-  COLLECTION collection;
-
-private:
-  //! The reference count
-  ACE_UINT32 refcount_;
-};
-
-// ****************************************************************
-
-template<class COLLECTION, class ITERATOR>
-class ACE_RMCast_Copy_On_Write_Read_Guard;
-
-template<class COLLECTION, class ITERATOR>
-class ACE_RMCast_Copy_On_Write_Write_Guard;
-
-//! Base class for the Copy_On_Write collection, used to simplify the
-//! declaration of the Write_Guard
-template<class COLLECTION, class ITERATOR>
-class ACE_RMCast_Copy_On_Write_Container
-{
-public:
-  //! Constructor
-  ACE_RMCast_Copy_On_Write_Container (void);
-
-  //! Let the Write_Guard access the internal fields.
-  friend class ACE_RMCast_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR>;
-
-  //! Let the Read_Guard access the internal fields.
-  friend class ACE_RMCast_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR>;
-
-  //! A shorter name for the actual collection type
-  typedef ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
-
-protected:
-  //! Number of pending writes
-  int pending_writes_;
-
-  //! If non-zero then a thread is changing the collection.
-  /*!
-   * Many threads can use the collection simulatenously, but only one
-   * change it.
-   */
-  int writing_;
-
-  //! A mutex to serialize access to the collection pointer.
-  ACE_SYNCH_MUTEX mutex_;
-
-  //! A condition variable to wait to synchronize multiple writers.
-  ACE_SYNCH_CONDITION cond_;
-
-  //! The collection, with reference counting added
-  Collection *collection_;
-};
-
-// ****************************************************************
-
-//! Implement a read guard for a reference counted collection
-template<class COLLECTION, class ITERATOR>
-class ACE_RMCast_Copy_On_Write_Read_Guard
-{
-public:
-  typedef ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
-  typedef ACE_RMCast_Copy_On_Write_Container<COLLECTION,ITERATOR> Container;
-
-  //! Constructor
-  ACE_RMCast_Copy_On_Write_Read_Guard (Container &container);
-
-  //! Destructor
-  ~ACE_RMCast_Copy_On_Write_Read_Guard (void);
-
-  //! A reference to the collection
-  Collection *collection;
-
-private:
-  //! Synchronization
-  ACE_SYNCH_MUTEX &mutex_;
-};
-
-// ****************************************************************
-
-//! Implement the write guard for a reference counted collecion
-/*!
- * This helper class atomically increments the reference count of a
- * ACE_RMCast_Copy_On_Write_Collection and reads the current
- * collection in the Copy_On_Write class.
- */
-template<class COLLECTION, class ITERATOR>
-class ACE_RMCast_Copy_On_Write_Write_Guard
-{
-public:
-  typedef ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
-  typedef ACE_RMCast_Copy_On_Write_Container<COLLECTION,ITERATOR> Container;
-
-  //! Constructor
-  ACE_RMCast_Copy_On_Write_Write_Guard (Container &container);
-
-  //! Destructor
-  ~ACE_RMCast_Copy_On_Write_Write_Guard (void);
-
-  //! The collection
-  Collection *copy;
-
-private:
-  //! Keep a reference to the mutex
-  ACE_SYNCH_MUTEX &mutex;
-
-  //! Keep a reference to the condition variable
-  ACE_SYNCH_CONDITION &cond;
-
-  //! Use a reference to update the pending writes count
-  int &pending_writes;
-
-  //! Use a reference to update the writing flag
-  int &writing_flag;
-
-  //! Use this reference to update the collection once the
-  //! modifications are finished.
-  Collection *&collection;
-};
-
-
-// ****************************************************************
-
-//! Implement a copy on write wrapper for a map-like collection
-/*
- *
- * <B>WARNING: </B>  This class may be moved away in the future, I'm
- * investigating how it could be converted into a reusable component
- * in ACE.   I won't make promises on when will that happen, but I
- * won't promise that it will stay here either.
- *
- */
-template<class KEY, class ITEM, class COLLECTION, class ITERATOR>
-class ACE_RMCast_Copy_On_Write : public ACE_RMCast_Copy_On_Write_Container<COLLECTION,ITERATOR>
-{
-public:
-  //! The Read_Guard trait
-  typedef ACE_RMCast_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR> Read_Guard;
-
-  //! The Write_Guard trait
-  typedef ACE_RMCast_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR> Write_Guard;
-
-  //! The underlying collection type
-  typedef ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
-
-  //! Constructor
-  ACE_RMCast_Copy_On_Write (void);
-
-  //! Destructor
-  ~ACE_RMCast_Copy_On_Write (void);
-
-  //! Iterate over all the elements invoking \param worker on each one.
-  int for_each (ACE_RMCast_Worker<KEY,ITEM> *worker);
-
-  //! Get the first key
-  KEY first_key (void);
-
-  /// Return non-zero if the collection is empty
-  int empty (void);
-
-  //! Add a new element
-  int bind (KEY const & key, ITEM const & item);
-
-  //! Remove an element
-  int unbind (KEY const & key);
-
-  //! Bind assuming the Write_Guard is held
-  int bind_i (Write_Guard &guard, KEY const & key, ITEM const & item);
-
-  //! Unbind assuming the Write_Guard is held
-  int unbind_i (Write_Guard &guard, KEY const & key);
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Copy_On_Write.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "RMCast_Copy_On_Write.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("RMCast_Copy_On_Write.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_COPY_ON_WRITE_H */
diff --git a/ace/RMCast/RMCast_Copy_On_Write.i b/ace/RMCast/RMCast_Copy_On_Write.i
deleted file mode 100644
index c83483c0729..00000000000
--- a/ace/RMCast/RMCast_Copy_On_Write.i
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "ace/Guard_T.h"
-#include "ace/Null_Mutex.h"
-
-template<class COLLECTION, class ITERATOR> ACE_INLINE
-ACE_RMCast_Copy_On_Write_Collection<COLLECTION,ITERATOR>::
-    ACE_RMCast_Copy_On_Write_Collection (void)
-      :  refcount_ (1)
-{
-}
-
-// ****************************************************************
-
-template<class COLLECTION, class ITERATOR> ACE_INLINE
-ACE_RMCast_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR>::
-    ACE_RMCast_Copy_On_Write_Read_Guard (Container &container)
-  : collection (0)
-  , mutex_ (container.mutex_)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
-  this->collection = container.collection_;
-  this->collection->_incr_refcnt ();
-}
-
-template<class COLLECTION, class ITERATOR> ACE_INLINE
-ACE_RMCast_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR>::
-    ~ACE_RMCast_Copy_On_Write_Read_Guard (void)
-{
-  if (this->collection != 0)
-    {
-      ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
-      this->collection->_decr_refcnt ();
-    }
-}
-
-// ****************************************************************
diff --git a/ace/RMCast/RMCast_Export.h b/ace/RMCast/RMCast_Export.h
deleted file mode 100644
index 51257c4d682..00000000000
--- a/ace/RMCast/RMCast_Export.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
-// ------------------------------
-#if !defined (ACE_RMCAST_EXPORT_H)
-#define ACE_RMCAST_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL)
-#  define ACE_RMCAST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */
-
-#if !defined (ACE_RMCAST_HAS_DLL)
-#define ACE_RMCAST_HAS_DLL 1
-#endif /* ! ACE_RMCAST_HAS_DLL */
-
-#if defined (ACE_RMCAST_HAS_DLL)
-#  if (ACE_RMCAST_HAS_DLL == 1)
-#    if defined (ACE_RMCAST_BUILD_DLL)
-#      define ACE_RMCast_Export ACE_Proper_Export_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    else
-#      define ACE_RMCast_Export ACE_Proper_Import_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    endif /* ACE_RMCAST_BUILD_DLL */
-#  else
-#    define ACE_RMCast_Export
-#    define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#    define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif   /* ! ACE_RMCAST_HAS_DLL == 1 */
-#else
-#  define ACE_RMCast_Export
-#  define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#  define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif     /* ACE_RMCAST_HAS_DLL */
-
-#endif     /* ACE_RMCAST_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ace/RMCast/RMCast_Fork.cpp b/ace/RMCast/RMCast_Fork.cpp
deleted file mode 100644
index 928d34cb411..00000000000
--- a/ace/RMCast/RMCast_Fork.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$
-
-#include "RMCast_Fork.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Fork.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Fork, "$Id$")
-
-ACE_RMCast_Fork::~ACE_RMCast_Fork (void)
-{
-}
-
-int
-ACE_RMCast_Fork::open (void)
-{
-  int r = this->ACE_RMCast_Module::open ();
-  if (r != 0)
-    return r;
-  if (this->secondary () != 0)
-    return this->secondary ()->open ();
-  return 0;
-}
-
-int
-ACE_RMCast_Fork::close (void)
-{
-  int r = this->ACE_RMCast_Module::close ();
-  if (r != 0)
-    return r;
-  if (this->secondary () != 0)
-    return this->secondary ()->close ();
-  return 0;
-}
-
-int
-ACE_RMCast_Fork::data (ACE_RMCast::Data &data)
-{
-  int r = this->ACE_RMCast_Module::data (data);
-  if (r != 0)
-    return r;
-  if (this->secondary () != 0)
-    return this->secondary ()->data (data);
-  return 0;
-}
-
-int
-ACE_RMCast_Fork::poll (ACE_RMCast::Poll &poll)
-{
-  int r = this->ACE_RMCast_Module::poll (poll);
-  if (r != 0)
-    return r;
-  if (this->secondary () != 0)
-    return this->secondary ()->poll (poll);
-  return 0;
-}
-
-int
-ACE_RMCast_Fork::ack_join (ACE_RMCast::Ack_Join &ack_join)
-{
-  int r = this->ACE_RMCast_Module::ack_join (ack_join);
-  if (r != 0)
-    return r;
-  if (this->secondary () != 0)
-    return this->secondary ()->ack_join (ack_join);
-  return 0;
-}
-
-int
-ACE_RMCast_Fork::ack_leave (ACE_RMCast::Ack_Leave &ack_leave)
-{
-  int r = this->ACE_RMCast_Module::ack_leave (ack_leave);
-  if (r != 0)
-    return r;
-  if (this->secondary () != 0)
-    return this->secondary ()->ack_leave (ack_leave);
-  return 0;
-}
-
-int
-ACE_RMCast_Fork::ack (ACE_RMCast::Ack &ack)
-{
-  int r = this->ACE_RMCast_Module::ack (ack);
-  if (r != 0)
-    return r;
-  if (this->secondary () != 0)
-    return this->secondary ()->ack (ack);
-  return 0;
-}
-
-int
-ACE_RMCast_Fork::join (ACE_RMCast::Join &join)
-{
-  int r = this->ACE_RMCast_Module::join (join);
-  if (r != 0)
-    return r;
-  if (this->secondary () != 0)
-    return this->secondary ()->join (join);
-  return 0;
-}
-
-int
-ACE_RMCast_Fork::leave (ACE_RMCast::Leave &leave)
-{
-  int r = this->ACE_RMCast_Module::leave (leave);
-  if (r != 0)
-    return r;
-  if (this->secondary () != 0)
-    return this->secondary ()->leave (leave);
-  return 0;
-}
diff --git a/ace/RMCast/RMCast_Fork.h b/ace/RMCast/RMCast_Fork.h
deleted file mode 100644
index 498ee2d6d63..00000000000
--- a/ace/RMCast/RMCast_Fork.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#ifndef ACE_RMCAST_FORK_H
-#define ACE_RMCAST_FORK_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/// Fork messages to multiple destinations
-/**
- * In some instances the messages must be sent to multiple
- * destinations, this module is a generic component to duplicate such
- * messages.
- */
-class ACE_RMCast_Export ACE_RMCast_Fork : public ACE_RMCast_Module
-{
-public:
-  //! Constructor
-  ACE_RMCast_Fork (void);
-
-  //! Destructor
-  virtual ~ACE_RMCast_Fork (void);
-
-  /// Set the control module, all incoming control messages go to it
-  void secondary (ACE_RMCast_Module *module);
-
-  /// Return the current control module
-  ACE_RMCast_Module *secondary (void) const;
-
-  virtual int open (void);
-  virtual int close (void);
-  virtual int data (ACE_RMCast::Data &);
-  virtual int poll (ACE_RMCast::Poll &);
-  virtual int ack_join (ACE_RMCast::Ack_Join &);
-  virtual int ack_leave (ACE_RMCast::Ack_Leave &);
-  virtual int ack (ACE_RMCast::Ack &);
-  virtual int join (ACE_RMCast::Join &);
-  virtual int leave (ACE_RMCast::Leave &);
-
-private:
-  /// The control module
-  ACE_RMCast_Module *secondary_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Fork.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_FORK_H */
diff --git a/ace/RMCast/RMCast_Fork.i b/ace/RMCast/RMCast_Fork.i
deleted file mode 100644
index bbcd4f23ae1..00000000000
--- a/ace/RMCast/RMCast_Fork.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Fork::ACE_RMCast_Fork (void)
-  : ACE_RMCast_Module ()
-  , secondary_ (0)
-{
-}
-
-ACE_INLINE void
-ACE_RMCast_Fork::secondary (ACE_RMCast_Module *module)
-{
-  this->secondary_ = module;
-}
-
-
-ACE_INLINE ACE_RMCast_Module *
-ACE_RMCast_Fork::secondary (void) const
-{
-  return this->secondary_;
-}
diff --git a/ace/RMCast/RMCast_Fragment.cpp b/ace/RMCast/RMCast_Fragment.cpp
deleted file mode 100644
index 2285fcb0a49..00000000000
--- a/ace/RMCast/RMCast_Fragment.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// $Id$
-
-#include "RMCast_Fragment.h"
-#include "ace/Message_Block.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (__ACE_INLINE__)
-#include "RMCast_Fragment.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Fragment, "$Id$")
-
-ACE_RMCast_Fragment::
-ACE_RMCast_Fragment (void)
-  :  ACE_RMCast_Module ()
-  ,  max_fragment_size_ (ACE_RMCAST_DEFAULT_FRAGMENT_SIZE)
-{
-}
-
-ACE_RMCast_Fragment::~ACE_RMCast_Fragment (void)
-{
-}
-
-int
-ACE_RMCast_Fragment::data (ACE_RMCast::Data &received_data)
-{
-  if (this->next () == 0)
-    return 0;
-
-  // The Data object sent downstream
-  ACE_RMCast::Data data = received_data;
-
-  ACE_Message_Block *mb = data.payload;
-
-  // @@ We should keep the total size precomputed
-  data.total_size = ACE_static_cast (ACE_UINT32, mb->total_length ());
-
-  // We must leave room for the header
-#if defined (ACE_HAS_BROKEN_DGRAM_SENDV)
-  const int ACE_RMCAST_WRITEV_MAX = ACE_IOV_MAX - 2;
-#else
-  const int ACE_RMCAST_WRITEV_MAX = ACE_IOV_MAX - 1;
-#endif /* ACE_HAS_BROKEN_DGRAM_SENDV */
-
-  // Assume the header will be included on each fragment, so readuce
-  // the maximum amount of memory allowed on each fragment....
-  const size_t fragment_header_size = 1 + 3 * sizeof(ACE_UINT32);
-
-  const size_t max_fragment_payload =
-    this->max_fragment_size_ - fragment_header_size;
-
-  // Iterate over all the message blocks in the chain.  If there is
-  // enough data to send an MTU then it is sent immediately.
-  // The last fragment is sent with whatever data remains.
-  // A single fragment can expand multiple message blocks, put
-  // together in an <iovec> array, it is also possible that a single
-  // message block requires multiple fragments... so the code below is
-  // as simple as possible, but not any simpler ;-)
-
-
-  // The first piece of each fragment is a header that contains:
-  // - A sequence number for reassembly, this is unrelated to
-  //   the sequence number for re-transmission.
-  //   NOTE: yes, this increases the bandwidth requires by 4 bytes on
-  //   each message, I don't think this is a big deal.
-  // - A fragment offset for reassembly.
-  // - The total size of the message, so the reassembly layer knows
-  //   when a complete message has been received.
-
-  // Complete the initialization of the <data> structure
-
-  data.fragment_offset = 0;
-
-  // The underlying transport layer can only tolerate so many elements
-  // in a chain, so we must count them and send a fragment if we are
-  // going over the limit.
-
-  ACE_Message_Block blocks[ACE_RMCAST_WRITEV_MAX];
-
-
-  // How many elements of the <blocks> array are in use...
-  int iovcnt = 0;
-
-  // The size of the current message, adding the size of all its
-  // message blocks.
-  size_t fragment_size = 0;
-
-  for (ACE_Message_Block* b = mb;  b != 0; b = b->cont ())
-    {
-      ACE_Message_Block *current_block = &blocks[iovcnt];
-
-      // Add the block to the vector...
-
-      current_block->data_block (b->data_block ()->duplicate ());
-      current_block->rd_ptr (b->rd_ptr ());
-      current_block->wr_ptr (b->wr_ptr ());
-      current_block->cont (0);
-
-      // Set the continuation field
-      if (iovcnt != 0)
-        blocks[iovcnt-1].cont (current_block);
-
-      size_t current_block_length = current_block->length ();
-
-      // Recompute the state of the fragment
-      fragment_size += current_block_length;
-      iovcnt++;
-
-      while (fragment_size >= max_fragment_payload)
-        {
-          // We have filled a fragment.  It is possible that we need
-          // to split the last message block in multiple fragments,
-          // thus the loop above...
-
-          // First adjust the last message block to exactly fit in the
-          // fragment:
-          size_t last_sent_mb_len =
-            max_fragment_payload - (fragment_size - current_block_length);
-
-          // Send only enough data of the last message block to fill
-          // the fragment...
-          current_block->wr_ptr (current_block->rd_ptr ()
-                              + last_sent_mb_len);
-
-          data.payload = blocks;
-          if (this->next ()->data (data) == -1)
-            return -1;
-
-          // adjust the offset
-          data.fragment_offset += ACE_static_cast (ACE_UINT32,
-                                                   max_fragment_payload);
-
-          // Now compute how much data is left in the last message
-          // block, to check if we should continue sending it...
-          current_block_length -= last_sent_mb_len;
-          if (current_block_length == 0)
-            {
-              // No more data from this message block, just continue
-              // the outer loop...
-              iovcnt = 0;
-              fragment_size = 0;
-              blocks[0].cont (0);
-              break; // while
-            }
-
-          // There is some data left, we try to send it in a single
-          // fragment, if it is still too big the beginning of this
-          // loop will adjust things.
-
-          // We must put the data in the right place in the array..
-          char *rd_ptr = current_block->rd_ptr () + last_sent_mb_len;
-          char *wr_ptr = rd_ptr + current_block_length;
-          blocks[0].data_block (current_block->replace_data_block (0));
-
-          // And determine what segment of the data will be sent..
-          blocks[0].rd_ptr (rd_ptr);
-          blocks[0].wr_ptr (wr_ptr);
-          blocks[0].cont (0);
-
-          // Adjust the state of the fragment
-          fragment_size = current_block_length;
-          iovcnt = 1;
-
-          // Notice that if <fragment_size> is too big the start of
-          // this loop will continue the fragmentation.
-        }
-
-      // It is also possible to fill up the iovec array before the
-      // fragment is completed, in this case we must send whatever we
-      // have:
-      if (iovcnt == ACE_RMCAST_WRITEV_MAX)
-        {
-          if (this->next ()->data (data) == -1)
-            return -1;
-
-          iovcnt = 0;
-          fragment_size = 0;
-          blocks[0].cont (0);
-        }
-    }
-
-  if (iovcnt == 0)
-    return 0;
-
-  return this->next ()->data (data);
-}
diff --git a/ace/RMCast/RMCast_Fragment.h b/ace/RMCast/RMCast_Fragment.h
deleted file mode 100644
index f180087ce3e..00000000000
--- a/ace/RMCast/RMCast_Fragment.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// $Id$
-
-#ifndef ACE_RMCAST_FRAGMENT_H
-#define ACE_RMCAST_FRAGMENT_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-//! Default fragment size
-#ifndef ACE_RMCAST_DEFAULT_FRAGMENT_SIZE
-# define ACE_RMCAST_DEFAULT_FRAGMENT_SIZE 1024
-#endif /* ACE_RMCAST_DEFAULT_FRAGMENT_SIZE */
-
-//! Fragmentation module
-/*!
- * Some transports cannot send very big messages, for example UDP
- * imposes a limit of 64K, and in practice the limit is even more
- * strict than that.
- * This class decomposes a message into multiple fragments, using an
- * application defined maximum size.
- */
-class ACE_RMCast_Export ACE_RMCast_Fragment : public ACE_RMCast_Module
-{
-public:
-  //! Constructor
-  ACE_RMCast_Fragment (void);
-
-  //! Destructor
-  virtual ~ACE_RMCast_Fragment (void);
-
-  //! Accessor for the max_fragment size.
-  /*! There is no modifier, the maximum fragment size is obtained
-   *  using feedback from the lower layers (transport?)
-   *  @@TODO We have not implemented the feedback mechanisms yet!
-   */
-  size_t max_fragment_size (void) const;
-
-  /*!
-   * Only data messages need fragmentation, the control messages are
-   * all small enough for all the transports that I know about.
-   * Well, actually for CAN-Bus (Controller Area Network), they may be
-   * too big, because the max payload there is 8 bytes, but we don't
-   * play with those in ACE.
-   */
-  virtual int data (ACE_RMCast::Data &data);
-
-private:
-  //! Current fragment size limit
-  size_t max_fragment_size_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Fragment.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_FRAGMENT_H */
diff --git a/ace/RMCast/RMCast_Fragment.i b/ace/RMCast/RMCast_Fragment.i
deleted file mode 100644
index 8e628093b8c..00000000000
--- a/ace/RMCast/RMCast_Fragment.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE size_t
-ACE_RMCast_Fragment::max_fragment_size (void) const
-{
-  return this->max_fragment_size_;
-}
diff --git a/ace/RMCast/RMCast_IO_UDP.cpp b/ace/RMCast/RMCast_IO_UDP.cpp
deleted file mode 100644
index 156a60c7ad3..00000000000
--- a/ace/RMCast/RMCast_IO_UDP.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-// $Id$
-
-#include "RMCast_IO_UDP.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_IO_UDP.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "RMCast_UDP_Proxy.h"
-#include "RMCast_Module_Factory.h"
-
-#include "ace/Handle_Set.h"
-#include "ace/Reactor.h"
-#include "ace/Message_Block.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_sys_select.h"
-#include "ace/os_include/arpa/os_inet.h"
-#include "ace/OS_NS_unistd.h"
-
-ACE_RCSID(ace, RMCast_IO_UDP, "RMCast_IO_UDP.cpp,v 1.12 2000/12/20 22:00:33 oci Exp")
-
-ACE_RMCast_IO_UDP::~ACE_RMCast_IO_UDP (void)
-{
-}
-
-int
-ACE_RMCast_IO_UDP::init (const ACE_INET_Addr &mcast_group,
-                         const ACE_Addr &local,
-                         int protocol_family,
-                         int protocol,
-                         int reuse_addr)
-{
-  this->mcast_group_ = mcast_group;
-
-  ACE_SOCK_Dgram &dgram = this->dgram_;
-  return dgram.open (local, protocol_family, protocol, reuse_addr);
-}
-
-int
-ACE_RMCast_IO_UDP::subscribe (const ACE_INET_Addr &mcast_addr,
-                              int reuse_addr,
-                              const ACE_TCHAR *net_if,
-                              int protocol_family,
-                              int protocol)
-{
-  this->mcast_group_ = mcast_addr;
-  return this->dgram_.subscribe (mcast_addr,
-                                 reuse_addr,
-                                 net_if,
-                                 protocol_family,
-                                 protocol);
-}
-
-int
-ACE_RMCast_IO_UDP::handle_events (ACE_Time_Value *tv)
-{
-  ACE_HANDLE h = this->dgram_.get_handle ();
-  if (h == ACE_INVALID_HANDLE)
-    return -1;
-
-  ACE_Handle_Set handle_set;
-  handle_set.set_bit (h);
-
-  ACE_Countdown_Time countdown (tv);
-
-  int r = ACE_OS::select (int(size_t(h)) + 1,
-                          handle_set, 0, 0,
-                          tv);
-  if (r == -1)
-    {
-      if (errno == EINTR)
-        return 0;
-      else
-        return -1;
-    }
-  else if (r == 0)
-    {
-      return 0;
-    }
-
-  return this->handle_input (h);
-}
-
-int
-ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE)
-{
-  char buffer[ACE_MAX_UDP_PACKET_SIZE];
-
-  ACE_INET_Addr from_address;
-  ssize_t r =
-    this->dgram_.recv (buffer, sizeof(buffer), from_address);
-
-  if (r == -1)
-    {
-      // @@ LOG??
-      ACE_ERROR ((LM_ERROR,
-                  "RMCast_IO_UDP::handle_input () - error in recv %p\n",
-                  ACE_TEXT ("")));
-      return -1;
-    }
-
-  // ACE_HEX_DUMP ((LM_DEBUG, buffer, 16, "Receiver::handle_input"));
-
-  // @@ Locking!
-
-  int type = buffer[0];
-
-  if (type < 0 || type >= ACE_RMCast::RMCAST_MT_LAST)
-    {
-      // @@ Log: invalid message type!!
-      // @@ TODO: should we return -1?  The socket is still valid, it
-      // makes little sense to destroy it just because one remote
-      // sender is sending invalid messages. Maybe we should
-      // strategize this too, and report the problem to the
-      // application, this could indicate a misconfiguration or
-      // something worse...
-
-      // In any case the proxy should be destroyed, its peer is making
-      // something really wrong.
-      ACE_RMCast_UDP_Proxy *proxy;
-      if (this->map_.unbind (from_address, proxy) == 0)
-        {
-          this->factory_->destroy (proxy->next ());
-          delete proxy;
-        }
-      return 0;
-    }
-
-  ACE_RMCast_UDP_Proxy *proxy;
-  if (this->map_.find (from_address, proxy) != 0)
-    {
-      //ACE_DEBUG ((LM_DEBUG,
-      //            "IO_UDP::handle_input - new proxy from <%s:%d>\n",
-      //            from_address.get_host_addr (),
-      //            from_address.get_port_number ()));
-
-      // @@ We should validate the message *before* creating the
-      // object, all we need is some sort of validation strategy, a
-      // different one for the receiver and another one for the
-      // sender.
-
-#if 0
-      if (type == ACE_RMCast::RMCAST_MT_ACK
-          || type == ACE_RMCast::RMCAST_MT_JOIN
-          || type == ACE_RMCast::RMCAST_MT_LEAVE
-          || type == ACE_RMCast::RMCAST_MT_ACK_LEAVE)
-        {
-          // All these message types indicate a problem, the should be
-          // generated by receivers, not received by them.
-          return 0;
-        }
-#endif /* 0 */
-      ACE_RMCast_Module *module = this->factory_->create ();
-      if (module == 0)
-        {
-          // @@ LOG??
-          // Try to continue working, maybe the module can be created
-          // later.
-          return 0;
-        }
-      // This is necessary to satisfy the xgcc for Lynx on Solaris
-      // by including the code directly causes :
-      // RMCast_IO_UDP.cpp:202: error: internal error--unrecognizable insn:
-      // (insn 1510 1507 524 (set (mem:SI (plus:SI (reg:SI 28 r28)
-      //                 (const_int 65536)))
-      //         (reg:SI 0 r0)) -1 (insn_list 528 (insn_list 1507 (nil)))
-      //     (nil))
-      // /usr/lynx/home2/jose/98r2/src/gcc/toplev.c:1489: Internal compiler error in function fatal_insn
-      // to be thrown at the end of the function.
-      if ((proxy = allocate_and_bind_proxy(module,from_address)) == 0)
-        return 0;
-    }
-
-  // Have the proxy process the message and do the right thing.
-  if (proxy->receive_message (buffer, r) != 0)
-    {
-      (void) this->map_.unbind (from_address);
-      this->factory_->destroy (proxy->next ());
-      delete proxy;
-    }
-
-  return 0;
-}
-
-ACE_HANDLE
-ACE_RMCast_IO_UDP::get_handle (void) const
-{
-  return this->dgram_.get_handle ();
-}
-
-int
-ACE_RMCast_IO_UDP::data (ACE_RMCast::Data &data)
-{
-  return this->send_data (data, this->mcast_group_);
-}
-
-int
-ACE_RMCast_IO_UDP::poll (ACE_RMCast::Poll &poll)
-{
-  return this->send_poll (poll, this->mcast_group_);
-}
-
-int
-ACE_RMCast_IO_UDP::ack_join (ACE_RMCast::Ack_Join &ack_join)
-{
-  return this->send_ack_join (ack_join, this->mcast_group_);
-}
-
-int
-ACE_RMCast_IO_UDP::ack_leave (ACE_RMCast::Ack_Leave &ack_leave)
-{
-  return this->send_ack_leave (ack_leave, this->mcast_group_);
-}
-
-int
-ACE_RMCast_IO_UDP::ack (ACE_RMCast::Ack &ack)
-{
-  return this->send_ack (ack, this->mcast_group_);
-}
-
-int
-ACE_RMCast_IO_UDP::join (ACE_RMCast::Join &join)
-{
-  return this->send_join (join, this->mcast_group_);
-}
-
-int
-ACE_RMCast_IO_UDP::leave (ACE_RMCast::Leave &leave)
-{
-  return this->send_leave (leave, this->mcast_group_);
-}
-
-int
-ACE_RMCast_IO_UDP::send_data (ACE_RMCast::Data &data,
-                              const ACE_INET_Addr &to)
-{
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "IO_UDP::send_data - pushing out to <%s:%d>\n",
-  //            to.get_host_addr (),
-  //            to.get_port_number ()));
-
-  // The first message block contains the header
-  // @@ TODO: We could keep the header pre-initialized, and only
-  // update the portions that do change...
-  ACE_UINT32 tmp;
-  char header[1 + 3 * sizeof(ACE_UINT32)];
-  header[0] = ACE_RMCast::RMCAST_MT_DATA;
-
-  tmp = ACE_HTONL (data.sequence_number);
-  ACE_OS::memcpy (header + 1,
-                  &tmp, sizeof(ACE_UINT32));
-  tmp = ACE_HTONL (data.total_size);
-  ACE_OS::memcpy (header + 1 + sizeof(ACE_UINT32),
-                  &tmp, sizeof(ACE_UINT32));
-  tmp = ACE_HTONL (data.fragment_offset);
-  ACE_OS::memcpy (header + 1 + 2 * sizeof(ACE_UINT32),
-                  &tmp, sizeof(ACE_UINT32));
-
-  iovec iov[ACE_IOV_MAX];
-  int iovcnt = 1;
-
-  iov[0].iov_base = header;
-  iov[0].iov_len = sizeof(header);
-
-  ACE_Message_Block *mb = data.payload;
-
-  for (const ACE_Message_Block *i = mb; i != 0; i = i->cont ())
-    {
-      iov[iovcnt].iov_base = i->rd_ptr ();
-      iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ());
-      iovcnt++;
-      if (iovcnt >= IOV_MAX)
-        return -1;
-    }
-
-  // @@ This pacing stuff here reduced the number of packet lost in
-  // loopback tests, but it should be taken out for real applications
-  // (or at least made configurable!)
-  ACE_Time_Value tv (0, 10000);
-  ACE_OS::sleep (tv);
-
-  // ACE_SOCK_MCast_Dgram disallows sending, but it actually works.
-  ACE_SOCK_Dgram &dgram = this->dgram_;
-
-  if (dgram.send (iov, iovcnt, to) == -1)
-    return -1;
-
-#if 0
-  ACE_HEX_DUMP ((LM_DEBUG,
-                 (char*)iov[0].iov_base,
-                 iov[0].iov_len,
-                 "Sending"));
-#endif
-
-  return 0;
-}
-
-int
-ACE_RMCast_IO_UDP::send_poll (ACE_RMCast::Poll &,
-                              const ACE_INET_Addr &to)
-{
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "IO_UDP::send_poll - pushing out to <%s:%d>\n",
-  //            to.get_host_addr (),
-  //            to.get_port_number ()));
-
-  // @@ TODO: We could keep the header pre-initialized, and only
-  // update the portions that do change...
-  char header[16];
-  header[0] = ACE_RMCast::RMCAST_MT_POLL;
-
-  // ACE_SOCK_MCast_Dgram disallows sending, but it actually works.
-  ACE_SOCK_Dgram &dgram = this->dgram_;
-
-  if (dgram.send (header, 1, to) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-ACE_RMCast_IO_UDP::send_ack_join (ACE_RMCast::Ack_Join &ack_join,
-                                  const ACE_INET_Addr &to)
-{
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "IO_UDP::send_ack_join - pushing out to <%s:%d>\n",
-  //            to.get_host_addr (),
-  //            to.get_port_number ()));
-
-  // @@ TODO: We could keep the header pre-initialized, and only
-  // update the portions that do change...
-  char header[16];
-  header[0] = ACE_RMCast::RMCAST_MT_ACK_JOIN;
-
-  ACE_UINT32 tmp = ACE_HTONL (ack_join.next_sequence_number);
-  ACE_OS::memcpy (header + 1,
-                  &tmp, sizeof(ACE_UINT32));
-  // ACE_SOCK_MCast_Dgram disallows sending, but it actually works.
-  ACE_SOCK_Dgram &dgram = this->dgram_;
-
-  if (dgram.send (header, 1 + sizeof(ACE_UINT32), to) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-ACE_RMCast_IO_UDP::send_ack_leave (ACE_RMCast::Ack_Leave &,
-                                   const ACE_INET_Addr &to)
-{
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "IO_UDP::send_ack_leave - pushing out to <%s:%d>\n",
-  //            to.get_host_addr (),
-  //            to.get_port_number ()));
-
-  // @@ TODO: We could keep the header pre-initialized, and only
-  // update the portions that do change...
-  char header[16];
-  header[0] = ACE_RMCast::RMCAST_MT_ACK_LEAVE;
-
-  // ACE_SOCK_MCast_Dgram disallows sending, but it actually works.
-  ACE_SOCK_Dgram &dgram = this->dgram_;
-
-  if (dgram.send (header, 1, to) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-ACE_RMCast_IO_UDP::send_ack (ACE_RMCast::Ack &ack,
-                              const ACE_INET_Addr &to)
-{
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "IO_UDP::send_ack - pushing (%d:%d) out to <%s:%d>\n",
-  //            ack.next_expected,
-  //            ack.highest_received,
-  //            to.get_host_addr (),
-  //            to.get_port_number ()));
-
-  // @@ TODO: We could keep the header pre-initialized, and only
-  // update the portions that do change...
-  char header[16];
-  header[0] = ACE_RMCast::RMCAST_MT_ACK;
-
-  ACE_UINT32 tmp = ACE_HTONL (ack.next_expected);
-  ACE_OS::memcpy (header + 1,
-                  &tmp, sizeof(ACE_UINT32));
-  tmp = ACE_HTONL (ack.highest_received);
-  ACE_OS::memcpy (header + 1 + sizeof(ACE_UINT32),
-                  &tmp, sizeof(ACE_UINT32));
-
-  // ACE_SOCK_MCast_Dgram disallows sending, but it actually works.
-  ACE_SOCK_Dgram &dgram = this->dgram_;
-
-  if (dgram.send (header, 1 + 2*sizeof(ACE_UINT32), to) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-ACE_RMCast_IO_UDP::send_join (ACE_RMCast::Join &,
-                              const ACE_INET_Addr &to)
-{
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "IO_UDP::send_join - pushing out to <%s:%d>\n",
-  //            to.get_host_addr (),
-  //            to.get_port_number ()));
-
-  // @@ TODO: We could keep the header pre-initialized, and only
-  // update the portions that do change...
-  char header[16];
-  header[0] = ACE_RMCast::RMCAST_MT_JOIN;
-
-  // ACE_SOCK_MCast_Dgram disallows sending, but it actually works.
-  ACE_SOCK_Dgram &dgram = this->dgram_;
-
-  if (dgram.send (header, 1, to) == -1)
-    return -1;
-
-  return 0;
-}
-
-int
-ACE_RMCast_IO_UDP::send_leave (ACE_RMCast::Leave &,
-                               const ACE_INET_Addr &to)
-{
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "IO_UDP::send_leave - pushing out to <%s:%d>\n",
-  //            to.get_host_addr (),
-  //            to.get_port_number ()));
-
-  // @@ TODO: We could keep the header pre-initialized, and only
-  // update the portions that do change...
-  char header[16];
-  header[0] = ACE_RMCast::RMCAST_MT_LEAVE;
-
-  // ACE_SOCK_MCast_Dgram disallows sending, but it actually works.
-  ACE_SOCK_Dgram &dgram = this->dgram_;
-
-  if (dgram.send (header, 1, to) == -1)
-    return -1;
-
-  return 0;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash_Map_Manager<ACE_INET_Addr,ACE_RMCast_UDP_Proxy*,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr,ACE_RMCast_UDP_Proxy*,ACE_Hash<ACE_INET_Addr>,ACE_Equal_To<ACE_INET_Addr>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_INET_Addr,ACE_RMCast_UDP_Proxy*,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr,ACE_RMCast_UDP_Proxy*,ACE_Hash<ACE_INET_Addr>,ACE_Equal_To<ACE_INET_Addr>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr,ACE_RMCast_UDP_Proxy*,ACE_Hash<ACE_INET_Addr>,ACE_Equal_To<ACE_INET_Addr>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr,ACE_RMCast_UDP_Proxy*,ACE_Hash<ACE_INET_Addr>,ACE_Equal_To<ACE_INET_Addr>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_INET_Addr,ACE_RMCast_UDP_Proxy*>;
-template class ACE_Equal_To<ACE_INET_Addr>;
-template class ACE_Hash<ACE_INET_Addr>;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/RMCast/RMCast_IO_UDP.h b/ace/RMCast/RMCast_IO_UDP.h
deleted file mode 100644
index 9cad38a0506..00000000000
--- a/ace/RMCast/RMCast_IO_UDP.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = DESCRIPTION
-//     Encapsulate the I/O layer for a UDP based receiver
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_IO_UDP_H
-#define ACE_RMCAST_IO_UDP_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/INET_Addr.h"
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_RMCast_UDP_Proxy;
-class ACE_RMCast_Module_Factory;
-class ACE_Time_Value;
-
-class ACE_RMCast_Export ACE_RMCast_IO_UDP : public ACE_RMCast_Module
-{
-public:
-  //! Constructor
-  /*!
-   * The <factory> argument is used to create the modules for each
-   * proxy that process incoming messages. The class does *not* assume
-   * ownership of <factory>, the caller owns it.  But it does assume
-   * ownership of the modules returned by the factory, and it may ask
-   * the factory to release them eventually.
-   */
-  ACE_RMCast_IO_UDP (ACE_RMCast_Module_Factory *factory);
-
-  //! Destructor
-  ~ACE_RMCast_IO_UDP (void);
-
-  /// Open the internal socket, but only to send multicast data.
-  /**
-   * It is not clear to me if this is a valid configuration.  Maybe it
-   * would be a problem to expose two separate, incompatible
-   * interfaces (check the subscribe() method). However, the
-   * alternative would be to implement almost identical class for
-   * outgoing and incoming UDP I/O
-   */
-  int init (const ACE_INET_Addr &mcast_group,
-            const ACE_Addr &local,
-            int protocol_family = PF_INET,
-            int protocol = 0,
-            int reuse_addr = 0);
-
-  //! Join a new multicast group
-  /*!
-   * Start receiving data for the <mcast_addr> multicast group.
-   * Please read the documentation of ACE_SOCK_Dgram_Mcast for more
-   * details.
-   */
-  int subscribe (const ACE_INET_Addr &mcast_addr,
-                 int reuse_addr = 1,
-                 const ACE_TCHAR *net_if = 0,
-                 int protocol_family = PF_INET,
-                 int protocol = 0);
-
-  // The class can be used with a Reactor or using blocking I/O
-  // depending on what method of the following two is called.
-
-  //! Wait for events for the period <tv>. If <tv> is zero it blocks
-  //! forever.
-  int handle_events (ACE_Time_Value *tv = 0);
-
-  //! There is data to read, read it and process it.
-  int handle_input (ACE_HANDLE h);
-
-  //! Obtain the handle for the underlying socket
-  ACE_HANDLE get_handle (void) const;
-
-  //@{
-  //! Send the message to the ACE_INET_Addr argument.
-  /*!
-   * These methods are used in the implementation of the
-   * ACE_RMCast_UDP_Proxy objects and the implementation of the
-   * inherited ACE_RMCast_Module methods in this class.
-   */
-  int send_data (ACE_RMCast::Data &, const ACE_INET_Addr &);
-  int send_poll (ACE_RMCast::Poll &, const ACE_INET_Addr &);
-  int send_ack_join (ACE_RMCast::Ack_Join &, const ACE_INET_Addr &);
-  int send_ack_leave (ACE_RMCast::Ack_Leave &, const ACE_INET_Addr &);
-  int send_ack (ACE_RMCast::Ack &, const ACE_INET_Addr &);
-  int send_join (ACE_RMCast::Join &, const ACE_INET_Addr &);
-  int send_leave (ACE_RMCast::Leave &, const ACE_INET_Addr &);
-  //@}
-
-  // Please read the documentation in ACE_RMCast_Module for more details
-  virtual int data (ACE_RMCast::Data &);
-  virtual int poll (ACE_RMCast::Poll &);
-  virtual int ack_join (ACE_RMCast::Ack_Join &);
-  virtual int ack_leave (ACE_RMCast::Ack_Leave &);
-  virtual int ack (ACE_RMCast::Ack &);
-  virtual int join (ACE_RMCast::Join &);
-  virtual int leave (ACE_RMCast::Leave &);
-
-private:
-
-  // This is necessary to satisfy the stupid xgcc for Lynx on Solaris
-  // The compiler barfs up lisp code errors
-  ACE_RMCast_UDP_Proxy *allocate_and_bind_proxy (ACE_RMCast_Module *module,
-                                                 const ACE_INET_Addr &);
-
-  //! The factory used to create the modules attached to each proxy
-  ACE_RMCast_Module_Factory *factory_;
-
-  //! The multicast group we subscribe and send to
-  ACE_INET_Addr mcast_group_;
-
-  //! The socket used to receive and send data
-  ACE_SOCK_Dgram_Mcast dgram_;
-
-  //! Use a Hash_Map to maintain the collection of proxies
-  typedef ACE_Hash_Map_Manager<ACE_INET_Addr,ACE_RMCast_UDP_Proxy*,ACE_Null_Mutex> Map;
-  //! The collection of proxies
-  Map map_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_IO_UDP.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_IO_UDP_H */
diff --git a/ace/RMCast/RMCast_IO_UDP.i b/ace/RMCast/RMCast_IO_UDP.i
deleted file mode 100644
index 5468ae292af..00000000000
--- a/ace/RMCast/RMCast_IO_UDP.i
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#include "RMCast_UDP_Proxy.h"
-#include "RMCast_Module_Factory.h"
-#include "ace/OS_Memory.h"
-
-ACE_INLINE
-ACE_RMCast_IO_UDP::
-    ACE_RMCast_IO_UDP (ACE_RMCast_Module_Factory *factory)
-  :  factory_ (factory),
-     dgram_ (ACE_SOCK_Dgram_Mcast::OPT_BINDADDR_NO)
-{
-}
-
-// Workaround failure in gcc for lynx hosted on solaris
-// see ACE_RMCast_IO_UDP::handle_input() for more details
-ACE_INLINE ACE_RMCast_UDP_Proxy *
-ACE_RMCast_IO_UDP::allocate_and_bind_proxy (ACE_RMCast_Module *module,
-                                            const ACE_INET_Addr& from_address)
-{
-  ACE_RMCast_UDP_Proxy *proxy;
-  ACE_NEW_RETURN (proxy,
-                  ACE_RMCast_UDP_Proxy(this,
-                                       from_address),
-                  0);
-  proxy->next (module);
-
-  if (this->map_.bind (from_address, proxy) != 0)
-    {
-      // @@ LOG??
-      return 0;
-    }
-
-  return proxy;
-}
-
-
diff --git a/ace/RMCast/RMCast_Membership.cpp b/ace/RMCast/RMCast_Membership.cpp
deleted file mode 100644
index 598e05019af..00000000000
--- a/ace/RMCast/RMCast_Membership.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_Membership.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Membership.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "RMCast_Proxy.h"
-#include "ace/Guard_T.h"
-
-ACE_RCSID(ace, RMCast_Membership, "$Id$")
-
-ACE_RMCast_Membership::~ACE_RMCast_Membership (void)
-{
-}
-
-int
-ACE_RMCast_Membership::has_members (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-
-  Proxy_Iterator end = this->proxies_.end ();
-  Proxy_Iterator i = this->proxies_.begin ();
-  return (i != end);
-}
-
-int
-ACE_RMCast_Membership::ack (ACE_RMCast::Ack &ack)
-{
-  //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack (%d:%d)\n",
-  //            ack.next_expected, ack.highest_received));
-
-  ACE_RMCast::Ack next_ack;
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-    if (ack.next_expected < this->next_expected_)
-      {
-        // @@ This violates an invariant of the class, shouldn't
-        // happen...
-        //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack[2]\n"));
-        return 0;
-      }
-    else if (ack.next_expected == this->next_expected_)
-      {
-        // Nothing new, just continue....
-        //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack[3]\n"));
-        return 0;
-      }
-
-    int r = this->compute_ack_i (ack.source, next_ack);
-    if (r < 0)
-      return r;
-    if (r == 1)
-      return 0;
-  }
-
-  //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack[4] (%d:%d)\n",
-  //            next_ack.next_expected, next_ack.highest_received));
-
-  return this->ACE_RMCast_Module::ack (next_ack);
-}
-
-int
-ACE_RMCast_Membership::join (ACE_RMCast::Join &join)
-{
-  if (join.source == 0)
-    return 0;
-
-  {
-    //  ACE_DEBUG ((LM_DEBUG,
-    //            "RMCast_Membership::join - %d\n",
-    //            long(join.source)));
-
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-    if (this->proxies_.insert (join.source) == -1)
-      return -1;
-  }
-  (void) this->generate_ack (join.source);
-
-  return this->ACE_RMCast_Module::join (join);
-}
-
-int
-ACE_RMCast_Membership::leave (ACE_RMCast::Leave &leave)
-{
-  if (leave.source == 0)
-    return 0;
-
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-    (void) this->proxies_.remove (leave.source);
-  }
-  (void) this->generate_ack (leave.source);
-
-  return this->ACE_RMCast_Module::leave (leave);
-}
-
-int
-ACE_RMCast_Membership::generate_ack (ACE_RMCast_Proxy *proxy)
-{
-  ACE_RMCast::Ack next_ack;
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-    int r = this->compute_ack_i (proxy, next_ack);
-    if (r < 0)
-      return r;
-    if (r == 1)
-      return 0;
-  }
-
-  //ACE_DEBUG ((LM_DEBUG, "ACE_RMCast_Membership::ack[6] (%d:%d)\n",
-  //            next_ack.next_expected, next_ack.highest_received));
-
-  return this->ACE_RMCast_Module::ack (next_ack);
-}
-
-int
-ACE_RMCast_Membership::compute_ack_i (ACE_RMCast_Proxy *source,
-                                      ACE_RMCast::Ack &next_ack)
-{
-  Proxy_Iterator end = this->proxies_.end ();
-  Proxy_Iterator i = this->proxies_.begin ();
-  if (i == end)
-    return 1;
-
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "RMCast_Membership::generate_ack[1] - %d -> (%d:%d)\n",
-  //            long(*i),
-  //            (*i)->next_expected (),
-  //            (*i)->highest_received ()));
-
-  ACE_UINT32 next_expected = (*i)->next_expected ();
-  ACE_UINT32 highest_received = (*i)->highest_received ();
-  ++i;
-
-  for (; i != end; ++i)
-    {
-      //    ACE_DEBUG ((LM_DEBUG,
-      //            "RMCast_Membership::generate_ack[2] - %d -> (%d:%d)\n",
-      //            long(*i),
-      //            (*i)->next_expected (),
-      //            (*i)->highest_received ()));
-
-      ACE_UINT32 s = (*i)->next_expected ();
-      if (s < next_expected)
-        next_expected = s;
-      ACE_UINT32 r = (*i)->highest_received ();
-      if (r > highest_received)
-        highest_received = r;
-    }
-#if 0
-  // @@TODO: this is an important feature, disabled until it is
-  // fully debugged
-  if (this->next_expected_ >= next_expected
-      || this->highest_received_ >= highest_received)
-    {
-      // No change....
-      ACE_DEBUG ((LM_DEBUG,
-                  "RMCast_Membership::generate_ack[3]\n"));
-      return 1;
-    }
-#endif /* 0 */
-  this->next_expected_ = next_expected;
-  this->highest_received_ = highest_received;
-  next_ack.source = source;
-  next_ack.next_expected = this->next_expected_;
-  next_ack.highest_received = this->highest_received_;
-
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "RMCast_Membership::generate_ack[4] - (%d:%d)\n",
-  //            next_ack.next_expected,
-  //            next_ack.highest_received));
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Unbounded_Set<ACE_RMCast_Proxy*>;
-template class ACE_Unbounded_Set_Iterator<ACE_RMCast_Proxy*>;
-template class ACE_Node<ACE_RMCast_Proxy*>;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/RMCast/RMCast_Membership.h b/ace/RMCast/RMCast_Membership.h
deleted file mode 100644
index 14d5790e584..00000000000
--- a/ace/RMCast/RMCast_Membership.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    RMCast_Membership.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_MEMBERSHIP_H
-#define ACE_RMCAST_MEMBERSHIP_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-#include "ace/Containers.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_RMCast_Proxy;
-
-/// Track peer membership
-/**
- * Reliable senders of events need to know exactly how many peers are
- * receiving the events, and how many events has each peer received so
- * far.
- * This class uses the Join, Leave and Ack messages to build that
- * information, it also summarizes the Ack events and propagate only
- * the global info to the upper layer.
- */
-class ACE_RMCast_Export ACE_RMCast_Membership : public ACE_RMCast_Module
-{
-public:
-  /// Constructor
-  ACE_RMCast_Membership (void);
-
-  /// Destructor
-  virtual ~ACE_RMCast_Membership (void);
-
-  /// Return 1 if there are still members in the group
-  int has_members (void);
-
-  /// Receive an process an Ack message
-  /**
-   * After receiving the Ack message we find out what is the lowest
-   * sequence number received in order among all the acks received by
-   * the proxies in the collection. We also find out what is the
-   * highest sequence number received by any proxy.
-   * We only propagate that information back to the upper layer, and
-   * then only if there are any news since the last Ack.
-   */
-  virtual int ack (ACE_RMCast::Ack &);
-
-  /// Add a new member to the collection, using the <source> field in
-  /// the Join message
-  virtual int join (ACE_RMCast::Join &);
-
-  /// Remove a member from the collection, using the <source> field in
-  /// the Join message
-  virtual int leave (ACE_RMCast::Leave &);
-
-private:
-  /// Generate an Ack message, normally due to changes in the
-  /// collection, such as new proxys joining or leaving
-  int generate_ack (ACE_RMCast_Proxy *proxy);
-
-  /// Compute an Ack message to propagate to the upper layers.
-  int compute_ack_i (ACE_RMCast_Proxy *source,
-                     ACE_RMCast::Ack &next_ack);
-
-protected:
-  /// Use an unbounded set to maintain the collection of proxies.
-  typedef ACE_Unbounded_Set<ACE_RMCast_Proxy*> Proxy_Collection;
-  typedef ACE_Unbounded_Set_Iterator<ACE_RMCast_Proxy*> Proxy_Iterator;
-
-  /// The collection of proxies
-  Proxy_Collection proxies_;
-
-  /// The smallest value of \param next_expected for all the proxies
-  ACE_UINT32 next_expected_;
-
-  /// The highest value of \param highest_received for all the proxies
-  ACE_UINT32 highest_received_;
-
-  /// Synchronization
-  ACE_SYNCH_MUTEX mutex_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Membership.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_MEMBERSHIP_H */
diff --git a/ace/RMCast/RMCast_Membership.i b/ace/RMCast/RMCast_Membership.i
deleted file mode 100644
index b513c2d5141..00000000000
--- a/ace/RMCast/RMCast_Membership.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Membership::ACE_RMCast_Membership (void)
-  : next_expected_ (0)
-  , highest_received_ (0)
-{
-}
diff --git a/ace/RMCast/RMCast_Module.cpp b/ace/RMCast/RMCast_Module.cpp
deleted file mode 100644
index 727ef631d9d..00000000000
--- a/ace/RMCast/RMCast_Module.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_Module.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Module.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Module, "$Id$")
-
-ACE_RMCast_Module::~ACE_RMCast_Module (void)
-{
-}
-
-int
-ACE_RMCast_Module::next (ACE_RMCast_Module *next)
-{
-  if (this->next_ != 0 && next != 0)
-    return 1;
-  this->next_ = next;
-  return 0;
-}
-
-ACE_RMCast_Module *
-ACE_RMCast_Module::next (void) const
-{
-  return this->next_;
-}
-
-int
-ACE_RMCast_Module::open (void)
-{
-  if (this->next () != 0)
-    return this->next ()->open ();
-  return 0;
-}
-
-int
-ACE_RMCast_Module::close (void)
-{
-  if (this->next () != 0)
-    return this->next ()->close ();
-  return 0;
-}
-
-int
-ACE_RMCast_Module::data (ACE_RMCast::Data &data)
-{
-  if (this->next () != 0)
-    return this->next ()->data (data);
-  return 0;
-}
-
-int
-ACE_RMCast_Module::poll (ACE_RMCast::Poll &poll)
-{
-  if (this->next () != 0)
-    return this->next ()->poll (poll);
-  return 0;
-}
-
-int
-ACE_RMCast_Module::ack_join (ACE_RMCast::Ack_Join &ack_join)
-{
-  if (this->next () != 0)
-    return this->next ()->ack_join (ack_join);
-  return 0;
-}
-
-int
-ACE_RMCast_Module::ack_leave (ACE_RMCast::Ack_Leave &ack_leave)
-{
-  if (this->next () != 0)
-    return this->next ()->ack_leave (ack_leave);
-  return 0;
-}
-
-int
-ACE_RMCast_Module::ack (ACE_RMCast::Ack &ack)
-{
-  if (this->next () != 0)
-    return this->next ()->ack (ack);
-  return 0;
-}
-
-int
-ACE_RMCast_Module::join (ACE_RMCast::Join &join)
-{
-  if (this->next () != 0)
-    return this->next ()->join (join);
-  return 0;
-}
-
-int
-ACE_RMCast_Module::leave (ACE_RMCast::Leave &leave)
-{
-  if (this->next () != 0)
-    return this->next ()->leave (leave);
-  return 0;
-}
diff --git a/ace/RMCast/RMCast_Module.h b/ace/RMCast/RMCast_Module.h
deleted file mode 100644
index 8497b367776..00000000000
--- a/ace/RMCast/RMCast_Module.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    RMCast_Module.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_MODULE_H
-#define ACE_RMCAST_MODULE_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Message_Block;
-class ACE_Time_Value;
-
-//! Reliable Multicast Module
-/*!
-  The reliable multicast protocol is implemented as a stack of
-  "Modules" each one performing one specific task.  In short, this is
-  an instance of the pipes-and-filters architectural pattern.
-*/
-class ACE_RMCast_Export ACE_RMCast_Module
-{
-public:
-  //! Constructor
-  ACE_RMCast_Module (void);
-
-  //! Destructor
-  virtual ~ACE_RMCast_Module (void);
-
-  //! Modifier for the next element in the stack
-  virtual int next (ACE_RMCast_Module *next);
-
-  //! Accesor for the next element in the stack
-  virtual ACE_RMCast_Module* next (void) const;
-
-  //! Initialize the module, setting up the next module
-  virtual int open (void);
-
-  //! Close the module.
-  virtual int close (void);
-
-  //! Push data through the stack
-  virtual int data (ACE_RMCast::Data &);
-
-  //! Push a polling request through the stack
-  virtual int poll (ACE_RMCast::Poll &);
-
-  //! Push a message to ack a join request through the stack
-  virtual int ack_join (ACE_RMCast::Ack_Join &);
-
-  //! Push a message to ack a leave request through the stack
-  virtual int ack_leave (ACE_RMCast::Ack_Leave &);
-
-  //! Push an ack mesage through the stack
-  virtual int ack (ACE_RMCast::Ack &);
-
-  //! Push a join message through the stack
-  virtual int join (ACE_RMCast::Join &);
-
-  //! Push a leave message through the stack
-  virtual int leave (ACE_RMCast::Leave &);
-
-private:
-  //! The next element in the stack
-  ACE_RMCast_Module *next_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Module.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_MODULE_H */
diff --git a/ace/RMCast/RMCast_Module.i b/ace/RMCast/RMCast_Module.i
deleted file mode 100644
index af299d706e3..00000000000
--- a/ace/RMCast/RMCast_Module.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Module::ACE_RMCast_Module (void)
-  :  next_ (0)
-{
-}
diff --git a/ace/RMCast/RMCast_Module_Factory.cpp b/ace/RMCast/RMCast_Module_Factory.cpp
deleted file mode 100644
index b749048a78c..00000000000
--- a/ace/RMCast/RMCast_Module_Factory.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "RMCast_Module_Factory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Module_Factory.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Module_Factory, "$Id$")
-
-ACE_RMCast_Module_Factory::~ACE_RMCast_Module_Factory (void)
-{
-}
diff --git a/ace/RMCast/RMCast_Module_Factory.h b/ace/RMCast/RMCast_Module_Factory.h
deleted file mode 100644
index 53efdb4355f..00000000000
--- a/ace/RMCast/RMCast_Module_Factory.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    RMCast_Module_Factory.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_MODULE_FACTORY_H
-#define ACE_RMCAST_MODULE_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_RMCast_Module;
-class ACE_RMCast_IO_UDP;
-
-//! Create Module stacks
-/*!
- * Different application will probably require different
- * configurations in their Module stack, some will just want best
- * effort semantics.  Others will use Reliable communication with a
- * maximum retransmission time.  Furthermore, applications may want to
- * receive messages in send order, or just as soon as they are
- * received.
- * Obviously most applications will want to change want happens once a
- * message is completely received.
- *
- * To achieve all this flexibility the IO layer uses this factory to
- * create the full stack of Modules corresponding to a single
- * consumer.
- * To keep the complexity under control the intention is to create
- * helper Factories, such as Reliable_Module_Factory where
- * applications only need to customize a few features.
- */
-class ACE_RMCast_Export ACE_RMCast_Module_Factory
-{
-public:
-  //! Destructor
-  virtual ~ACE_RMCast_Module_Factory (void);
-
-  //! Create a new proxy
-  virtual ACE_RMCast_Module *create (void) = 0;
-
-  //! Destroy a proxy
-  /*!
-   * Some factories may allocate modules from a pool, or return the
-   * same module for all proxies.  Consequently, only the factory
-   * knows how to destroy them.
-   */
-  virtual void destroy (ACE_RMCast_Module *) = 0;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Module_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_MODULE_FACTORY_H */
diff --git a/ace/RMCast/RMCast_Module_Factory.i b/ace/RMCast/RMCast_Module_Factory.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/ace/RMCast/RMCast_Module_Factory.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/ace/RMCast/RMCast_Partial_Message.cpp b/ace/RMCast/RMCast_Partial_Message.cpp
deleted file mode 100644
index d6e5cff0f7b..00000000000
--- a/ace/RMCast/RMCast_Partial_Message.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// $Id$
-
-#include "RMCast_Partial_Message.h"
-#include "ace/OS_NS_string.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RMCast_Partial_Message.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Partial_Message, "$Id$")
-
-ACE_RMCast_Partial_Message::
-ACE_RMCast_Partial_Message (ACE_UINT32 message_size)
-  :  max_hole_count_ (ACE_RMCAST_DEFAULT_HOLE_COUNT),
-     hole_count_ (1)
-{
-  ACE_NEW (this->hole_list_,
-           ACE_RMCast_Partial_Message::Hole[this->max_hole_count_]);
-  this->hole_list_[0].start = 0;
-  this->hole_list_[0].end = message_size;
-
-  this->message_body_.size (message_size);
-  this->message_body_.wr_ptr (message_size);
-}
-
-ACE_RMCast_Partial_Message::
-~ACE_RMCast_Partial_Message (void)
-{
-  delete[] this->hole_list_;
-}
-
-int
-ACE_RMCast_Partial_Message::fragment_received (ACE_UINT32 message_size,
-                                               ACE_UINT32 offset,
-                                               ACE_Message_Block *mb)
-{
-  if (this->message_body_.length () != message_size)
-    {
-      //      ACE_DEBUG ((LM_DEBUG,
-      //                  "Partial_Message::fragment_received - "
-      //                  "invalid message length\n"));
-      return -1;
-    }
-
-  // Just copy the data...
-  char *rd_ptr = this->message_body_.rd_ptr () + offset;
-  size_t total_length = 0;
-  {
-    for (const ACE_Message_Block *i = mb; i != 0; i = i->cont ())
-      {
-        if (rd_ptr + i->length () > this->message_body_.wr_ptr ())
-          {
-            //            ACE_DEBUG ((LM_DEBUG,
-            //                        "Partial_Message::fragment_received - "
-            //                        "invalid payload length\n"));
-            return -1;
-          }
-        ACE_OS::memcpy (rd_ptr, i->rd_ptr (), i->length ());
-        rd_ptr       += i->length ();
-        total_length += i->length ();
-      }
-  }
-
-  // The algorithm works like this:
-  //
-  //   For each hole we determine if there is an intersection between
-  //   the hole and the incoming fragment.  If there is none we do
-  //   nothing (actually since the holes are ordered we can stop the
-  //   iteration if the
-
-  ACE_UINT32 start = offset;
-  ACE_UINT32 end   = ACE_static_cast (ACE_UINT32,
-                                      offset + total_length);
-
-  while (start != end && this->hole_count_ != 0)
-    {
-      for (size_t i = 0; i < this->hole_count_; ++i)
-        {
-          Hole& hole = this->hole_list_[i];
-
-          // First check if the new data insersects the hole...
-          if (end <= hole.start)
-            return 0;
-          if (start >= hole.end)
-            {
-              if (i == this->hole_count_ - 1)
-                return 0;
-              else
-                continue;
-            }
-
-          // The hole and the new fragment intersect, we have to
-          // update the hole list.
-          //
-          // There are only three cases for the <start> value:
-          // start < hole.start
-          // start == hole.start
-          // hole.start < start < hole.end
-          //
-          // But the code for both start == hole.start and start <
-          // hole.start is identical....
-
-          if (start <= hole.start)
-            {
-              if (end < hole.end)
-                {
-                  // NOTE: hole.start < end, because of previous test
-
-                  // In this case we shrink the hole, but it is not
-                  // removed!
-                  hole.start = end;
-                  return 0;
-                }
-              else // end >= hole.end
-                {
-                  start = hole.end;
-                  // We remove the hole, and continue the iteration...
-                  if (this->remove_hole (i) == -1)
-                    return -1;
-                  break;
-                }
-            }
-          else // hole.start < start < hole.end
-            {
-              if (end >= hole.end)
-                {
-                  // Just adjust the size of the hole...
-                  ACE_UINT32 tmp = hole.end;
-                  hole.end = start;
-                  start = tmp;
-                  break;
-                }
-              else // if (end < hole.end)
-                {
-                  // Nasty, we need to insert a new hole...
-                  if (this->insert_hole (i, end, hole.end) == -1)
-                    return -1;
-                  // and change the old hole...
-                  // NOTE: we have to refetch it because the array may
-                  // have been reallocated!
-                  this->hole_list_[i].end = start;
-                  return 0;
-                }
-            }
-        }
-    }
-  return 0;
-  // @@ OLD COMMENTS, the algorithm has changed since!
-  // There are several cases:
-  //
-  // 1) The fragment is completely contained in data already received,
-  //    nothing changes in this case.
-  //
-  // 2) Part of the fragment is contained in data already received and
-  //    part is new data:
-  //    2.1) The new data closes a hole, remove it from the list
-  //    2.2) The beginning of the new fragment is the new data, reduce
-  //    the size of the hole
-  //    2.3) The end of the new fragment is the new data, increment
-  //    the size of the received block
-  //
-  // 3) The fragment is completely contained in a hole
-  //    3.1) It closes the hole, remove it from the list
-  //    3.2) It starts at the beginning of a hole, grow the received
-  //    block
-  //    3.3) It ends at the end of a hole, reduce the hole size
-  //    3.4) It is in the middle of a hole, insert a new hole
-  //
-}
-
-int
-ACE_RMCast_Partial_Message::insert_hole (size_t i,
-                                         ACE_UINT32 start,
-                                         ACE_UINT32 end)
-{
-  //  ACE_DEBUG ((LM_DEBUG,
-  //              "Partial_Message::insert_hole %d = [%d,%d]\n",
-  //              i, start, end));
-  if (this->hole_count_ + 1 > this->max_hole_count_)
-    {
-      this->max_hole_count_ *= 2;
-      Hole *tmp;
-      ACE_NEW_RETURN (tmp, Hole[this->max_hole_count_], -1);
-      for (size_t j = 0; j != this->hole_count_; ++j)
-        {
-          tmp[j] = this->hole_list_[j];
-        }
-      delete[] this->hole_list_;
-      this->hole_list_ = tmp;
-    }
-  if (this->hole_count_ != 0)
-    {
-      for (size_t j = this->hole_count_ - 1; j >= i + 1; --j)
-        {
-          this->hole_list_[j+1] = this->hole_list_[j];
-        }
-    }
-
-  this->hole_list_[i + 1].start = start;
-  this->hole_list_[i + 1].end   = end;
-  this->hole_count_++;
-
-  return 0;
-}
-
-int
-ACE_RMCast_Partial_Message::remove_hole (size_t i)
-{
-  //  ACE_DEBUG ((LM_DEBUG,
-  //              "Partial_Message::remove_hole %d\n",
-  //              i));
-  for (size_t j = i; j != this->hole_count_ - 1; ++j)
-    this->hole_list_[j] = this->hole_list_[j + 1];
-
-  this->hole_count_--;
-  return 0;
-}
diff --git a/ace/RMCast/RMCast_Partial_Message.h b/ace/RMCast/RMCast_Partial_Message.h
deleted file mode 100644
index 0c14cd7828a..00000000000
--- a/ace/RMCast/RMCast_Partial_Message.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = DESCRIPTION
-//   Helper class used in the reassembly layer of the realiable
-//   multicast library.
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_PARTIAL_MESSAGE_H
-#define ACE_RMCAST_PARTIAL_MESSAGE_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Export.h"
-#include "ace/Task.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#ifndef ACE_RMCAST_DEFAULT_HOLE_COUNT
-#define ACE_RMCAST_DEFAULT_HOLE_COUNT 16
-#endif /* ACE_RMCAST_DEFAULT_HOLE_COUNT */
-
-//! Represent a partially received message in the
-//! ACE_RMCast_Reassembly module
-/*!
- * This class provides temporary storage for the fragments as they are
- * received in the ACE_RMCast_Reassembly module.  It also keeps track
- * of what portions of the message are still missing.
- */
-class ACE_RMCast_Export ACE_RMCast_Partial_Message
-{
-public:
-  //! Constructor, reserve enough memory for the complete message
-  ACE_RMCast_Partial_Message (ACE_UINT32 message_size);
-
-  //! Destructor
-  ~ACE_RMCast_Partial_Message (void);
-
-  //! Process a fragment
-  /*!
-   * A fragment starting at <offset> has been received, copy the
-   * fragment contents and update the list of holes.
-   */
-  int fragment_received (ACE_UINT32 message_size,
-                         ACE_UINT32 offset,
-                         ACE_Message_Block *mb);
-
-  //! Return 1 if the message is complete
-  int is_complete (void) const;
-
-  //! Return the body of the message, the memory is *not* owned by the
-  //! caller
-  ACE_Message_Block *message_body (void);
-
-private:
-  //! Insert a new hole into the list
-  /*!
-   * The class keeps an array to represent the missing portions of the
-   * message.  This method inserts a new hole, i.e. a new element in
-   * the array at index <i>. The <start> and <end> arguments represent
-   * the offsets of the missing portion of the message.
-   */
-  int insert_hole (size_t i,
-                   ACE_UINT32 start,
-                   ACE_UINT32 end);
-
-  //! Remove a hole from the list
-  int remove_hole (size_t i);
-
-private:
-  //! Maintain the message storage
-  ACE_Message_Block message_body_;
-
-  //! Represent a missing portion of a message
-  struct Hole
-  {
-    //! Offset where the missing portion of the message starts
-    ACE_UINT32 start;
-    //! Offset where the missing portion of the message ends
-    ACE_UINT32 end;
-  };
-
-  //! Implement a growing array of Hole structures
-  //@{
-  Hole *hole_list_;
-  size_t max_hole_count_;
-  size_t hole_count_;
-  //@}
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Partial_Message.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_PARTIAL_MESSAGE_H */
diff --git a/ace/RMCast/RMCast_Partial_Message.i b/ace/RMCast/RMCast_Partial_Message.i
deleted file mode 100644
index 7be89aa1932..00000000000
--- a/ace/RMCast/RMCast_Partial_Message.i
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Id$
-
-ACE_INLINE int
-ACE_RMCast_Partial_Message::is_complete (void) const
-{
-  return (this->hole_count_ == 0)
-    || (this->hole_count_ == 1
-        && this->hole_list_[0].start == this->hole_list_[0].end);
-}
-
-ACE_INLINE ACE_Message_Block *
-ACE_RMCast_Partial_Message::message_body (void)
-{
-  return &this->message_body_;
-}
diff --git a/ace/RMCast/RMCast_Proxy.cpp b/ace/RMCast/RMCast_Proxy.cpp
deleted file mode 100644
index 2257f9a2bd7..00000000000
--- a/ace/RMCast/RMCast_Proxy.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_Proxy.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Proxy.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Proxy, "$Id$")
-
-ACE_RMCast_Proxy::~ACE_RMCast_Proxy (void)
-{
-}
-
-ACE_UINT32
-ACE_RMCast_Proxy::next_expected (void) const
-{
-  return this->next_expected_;
-}
-
-ACE_UINT32
-ACE_RMCast_Proxy::highest_received (void) const
-{
-  return this->highest_received_;
-}
-
-int
-ACE_RMCast_Proxy::ack (ACE_RMCast::Ack &ack)
-{
-  this->next_expected_ = ack.next_expected;
-  this->highest_received_ = ack.highest_received;
-  return this->ACE_RMCast_Module::ack (ack);
-}
-
-int
-ACE_RMCast_Proxy::reply_ack_join (ACE_RMCast::Ack_Join &ack_join)
-{
-  if (this->next_expected_ < ack_join.next_sequence_number)
-    {
-      this->next_expected_ = ack_join.next_sequence_number;
-      this->highest_received_ = ack_join.next_sequence_number;
-    }
-  return 0;
-}
diff --git a/ace/RMCast/RMCast_Proxy.h b/ace/RMCast/RMCast_Proxy.h
deleted file mode 100644
index 303a5e8ffe4..00000000000
--- a/ace/RMCast/RMCast_Proxy.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    RMCast_Proxy.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_PROXY_H
-#define ACE_RMCAST_PROXY_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Message_Block;
-class ACE_Time_Value;
-
-//! Local representation for remote peers
-/*!
-  Both senders and receivers in the multicast group need to maintain
-  explicit representations of their "peers".  For example, a sender
-  needs to know the list of all the receivers and what messages they
-  have reported as successfully received.
-  Likewise, the receiver needs to maintain separate state for each
-  remote sender, and must be able to disconnect from all of them
-  gracefully when needed.
-  The RMCast_Proxy class is an opaque representation of such a peer,
-  and hides all the networking details from the rest of the system.
-*/
-class ACE_RMCast_Export ACE_RMCast_Proxy : public ACE_RMCast_Module
-{
-public:
-  //! Constructor
-  ACE_RMCast_Proxy (void);
-  // Constructor
-
-  //! Destructor
-  virtual ~ACE_RMCast_Proxy (void);
-
-  //! Return the next sequence number expected by the peer. Only
-  //! applies to remote receiver proxies.
-  /*!
-   * Please read the documentation in ACE_RMCast::Ack
-   */
-  virtual ACE_UINT32 next_expected (void) const;
-
-  //! Return the highest sequence number successfully received.
-  //! Only applies to remote receiver proxies.
-  /*!
-   * Please read the documentation in ACE_RMCast::Ack
-   */
-  virtual ACE_UINT32 highest_received (void) const;
-
-  //@{
-  //! Send messages directly to the peer.
-  /*!
-   * Send a message directly to the peer, i.e. the message is not
-   * sent through the multicast group and it may not be processed by
-   * all the layers in the stack.
-   */
-  virtual int reply_data (ACE_RMCast::Data &) = 0;
-  virtual int reply_poll (ACE_RMCast::Poll &) = 0;
-  virtual int reply_ack_join (ACE_RMCast::Ack_Join &);
-  virtual int reply_ack_leave (ACE_RMCast::Ack_Leave &) = 0;
-  virtual int reply_ack (ACE_RMCast::Ack &) = 0;
-  virtual int reply_join (ACE_RMCast::Join &) = 0;
-  virtual int reply_leave (ACE_RMCast::Leave &) = 0;
-  //@}
-
-  /*!
-   * Proxies process the ACK sequence numbers to cache the ack
-   * information from the peer.
-   */
-  virtual int ack (ACE_RMCast::Ack &);
-
-private:
-  //@{
-  //! Cache the sequence numbers reported from the remote peer using
-  //! Ack messages
-  ACE_UINT32 next_expected_;
-  ACE_UINT32 highest_received_;
-  //@}
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Proxy.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_PROXY_H */
diff --git a/ace/RMCast/RMCast_Proxy.i b/ace/RMCast/RMCast_Proxy.i
deleted file mode 100644
index 6fee09fe9e5..00000000000
--- a/ace/RMCast/RMCast_Proxy.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Proxy::ACE_RMCast_Proxy (void)
-  : next_expected_ (0)
-  , highest_received_ (0)
-{
-}
diff --git a/ace/RMCast/RMCast_Reassembly.cpp b/ace/RMCast/RMCast_Reassembly.cpp
deleted file mode 100644
index e16fb368acf..00000000000
--- a/ace/RMCast/RMCast_Reassembly.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// $Id$
-
-#include "RMCast_Reassembly.h"
-#include "RMCast_Partial_Message.h"
-#include "ace/Message_Block.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (__ACE_INLINE__)
-#include "RMCast_Reassembly.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Reassembly, "$Id$")
-
-ACE_RMCast_Reassembly::
-ACE_RMCast_Reassembly (void)
-  :  ACE_RMCast_Module ()
-{
-}
-
-ACE_RMCast_Reassembly::~ACE_RMCast_Reassembly (void)
-{
-  (void) this->close_i ();
-}
-
-/**
- *
- * We cleanup the resources in the destructor
- */
-int
-ACE_RMCast_Reassembly::close ()
-{
-  this->close_i ();
-  return this->ACE_RMCast_Module::close ();
-}
-
-int
-ACE_RMCast_Reassembly::data (ACE_RMCast::Data &data)
-{
-  if (this->next () == 0)
-    return 0;
-
-  // ACE_DEBUG ((LM_DEBUG,
-  //             "Reassembly::data - %d,%d,%d\n",
-  //             data.sequence_number,
-  //             data.total_size,
-  //             data.fragment_offset));
-
-  if (data.payload->length () + data.fragment_offset > data.total_size)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "RMCast_Reassembly::data - invalid size\n"));
-      return -1; // Corrupt message?
-    }
-
-  ACE_RMCast_Partial_Message *message;
-
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-    if (this->messages_.find (data.sequence_number, message) == -1)
-      {
-        ACE_NEW_RETURN (message,
-                        ACE_RMCast_Partial_Message (data.total_size),
-                        -1);
-
-        // ACE_DEBUG ((LM_DEBUG,
-        //             "Reassembly::data - new message\n"));
-        if (this->messages_.bind (data.sequence_number,
-                                  message) == -1)
-          return -1; // Internal error?
-      }
-
-    if (message->fragment_received (data.total_size,
-                                    data.fragment_offset,
-                                    data.payload) == -1)
-      {
-        // ACE_DEBUG ((LM_DEBUG,
-        //             "Error in fragment_received\n"));
-        return -1;
-      }
-
-    if (!message->is_complete ())
-      {
-        // ACE_DEBUG ((LM_DEBUG,
-        //             "Reassembly::data - message still incomplete\n"));
-        return 0;
-      }
-
-    if (this->messages_.unbind (data.sequence_number) == -1)
-      {
-        // ACE_DEBUG ((LM_DEBUG,
-        //            "Reassembly::data - message now complete\n"));
-        return -1;
-      }
-  }
-
-  // Push the message...
-  ACE_RMCast::Data downstream_data;
-  downstream_data.source = data.source;
-  downstream_data.sequence_number = data.sequence_number;
-  downstream_data.total_size = ACE_static_cast(
-                                    ACE_UINT32,
-                                    message->message_body ()->length ());
-  downstream_data.fragment_offset = 0;
-  downstream_data.payload = message->message_body ();
-
-  int r = this->next ()->data (downstream_data);
-
-  delete message;
-
-  return r;
-}
-
-void
-ACE_RMCast_Reassembly::close_i (void)
-{
-  for (Message_Map_Iterator i = this->messages_.begin ();
-       i != this->messages_.end ();
-       ++i)
-    {
-      ACE_RMCast_Partial_Message *message = (*i).int_id_;
-      if (message != 0)
-        delete message;
-    }
-  this->messages_.unbind_all ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash_Map_Manager<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Hash<ACE_UINT32>,ACE_Equal_To<ACE_UINT32>,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Hash<ACE_UINT32>,ACE_Equal_To<ACE_UINT32>,ACE_Null_Mutex >;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Hash<ACE_UINT32>,ACE_Equal_To<ACE_UINT32>,ACE_Null_Mutex >;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Hash<ACE_UINT32>,ACE_Equal_To<ACE_UINT32>,ACE_Null_Mutex >;
-template class ACE_Hash_Map_Entry<ACE_UINT32,ACE_RMCast_Partial_Message*>;
-
-template class ACE_Less_Than<ACE_UINT32>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Hash<ACE_UINT32>,ACE_Equal_To<ACE_UINT32>,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Hash<ACE_UINT32>,ACE_Equal_To<ACE_UINT32>,ACE_Null_Mutex >
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Hash<ACE_UINT32>,ACE_Equal_To<ACE_UINT32>,ACE_Null_Mutex >
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Hash<ACE_UINT32>,ACE_Equal_To<ACE_UINT32>,ACE_Null_Mutex >
-#pragma instantiate ACE_Hash_Map_Entry<ACE_UINT32,ACE_RMCast_Partial_Message*>
-
-#pragma instantiate ACE_Less_Than<ACE_UINT32>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/ace/RMCast/RMCast_Reassembly.h b/ace/RMCast/RMCast_Reassembly.h
deleted file mode 100644
index d4ed999cf78..00000000000
--- a/ace/RMCast/RMCast_Reassembly.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = DESCRIPTION
-//   The reassembly task for the reliable multicast library
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_REASSEMBLY_H
-#define ACE_RMCAST_REASSEMBLY_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_RMCast_Partial_Message;
-
-//! Reassemble multiple data fragments into a single data message
-/*!
-  Data messages may not fit in a single MTU in the transport layer, in
-  that case the application configure a RMCast_Fragment module on the
-  sender side.  On the receiver side this layer reassemble the
-  messages sent from a <EM>single</EM> source, and passes the messages
-  up the stream.
-*/
-class ACE_RMCast_Export ACE_RMCast_Reassembly : public ACE_RMCast_Module
-{
-public:
-  //! Constructor
-  ACE_RMCast_Reassembly (void);
-
-  //! Destructor
-  virtual ~ACE_RMCast_Reassembly (void);
-
-  // = The ACE_RMCast_Module methods
-  virtual int close (void);
-  virtual int data (ACE_RMCast::Data &data);
-
-private:
-  /// Cleanup resources, but do not close the other modules in the
-  /// stack
-  void close_i (void);
-
-private:
-  //! A mutex used to synchronize all the internal operations.
-  ACE_SYNCH_MUTEX mutex_;
-  typedef
-      ACE_Hash_Map_Manager<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Null_Mutex>
-      Message_Map;
-  typedef
-      ACE_Hash_Map_Iterator<ACE_UINT32,ACE_RMCast_Partial_Message*,ACE_Null_Mutex>
-      Message_Map_Iterator;
-
-  //! A map, indexed by sequence number, of the partially received
-  //! messages.
-  Message_Map messages_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Reassembly.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_REASSEMBLY_H */
diff --git a/ace/RMCast/RMCast_Reassembly.i b/ace/RMCast/RMCast_Reassembly.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/ace/RMCast/RMCast_Reassembly.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/ace/RMCast/RMCast_Receiver_Module.cpp b/ace/RMCast/RMCast_Receiver_Module.cpp
deleted file mode 100644
index 2d08ca4bb02..00000000000
--- a/ace/RMCast/RMCast_Receiver_Module.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_Receiver_Module.h"
-#include "RMCast_Proxy.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Receiver_Module.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Receiver_Module, "$Id$")
-
-ACE_RMCast_Receiver_Module::~ACE_RMCast_Receiver_Module (void)
-{
-}
-
-int
-ACE_RMCast_Receiver_Module::data (ACE_RMCast::Data &data)
-{
-  switch (this->state_)
-    {
-    case RS_NON_EXISTENT:
-    case RS_JOINING:
-      if (data.source != 0)
-        {
-          //ACE_DEBUG ((LM_DEBUG,
-          //            "Receiver_Module::data - joining\n"));
-
-          this->state_ = RS_JOINING;
-          ACE_RMCast::Join join;
-          if (data.source->reply_join (join) != 0)
-            this->leaving (data.source);
-        }
-      break;
-
-    case RS_JOINED:
-      // ACE_DEBUG ((LM_DEBUG,
-      //             "Receiver_Module::data - joined\n"));
-      if (this->ACE_RMCast_Module::data (data) != 0)
-        this->leaving (data.source);
-      break;
-
-    default:
-    case RS_LEAVING:
-      this->leaving (data.source);
-      break;
-    }
-  return 0;
-}
-
-int
-ACE_RMCast_Receiver_Module::poll (ACE_RMCast::Poll &poll)
-{
-  switch (this->state_)
-    {
-    case RS_NON_EXISTENT:
-    case RS_JOINING:
-      if (poll.source != 0)
-        {
-          this->state_ = RS_JOINING;
-          ACE_RMCast::Join join;
-          if (poll.source->reply_join (join) != 0)
-            this->leaving (poll.source);
-        }
-      break;
-
-    case RS_JOINED:
-      if (this->ACE_RMCast_Module::poll (poll) != 0)
-        this->leaving (poll.source);
-
-    default:
-    case RS_LEAVING:
-      this->leaving (poll.source);
-      break;
-    }
-  return 0;
-}
-
-int
-ACE_RMCast_Receiver_Module::ack_join (ACE_RMCast::Ack_Join &ack_join)
-{
-  switch (this->state_)
-    {
-    case RS_NON_EXISTENT:
-      if (ack_join.source != 0)
-        {
-          //ACE_DEBUG ((LM_DEBUG,
-          //            "Receiver_Module::ack_join - joining\n"));
-
-          this->state_ = RS_JOINING;
-          ACE_RMCast::Join join;
-          if (ack_join.source->reply_join (join) != 0)
-            this->leaving (ack_join.source);
-        }
-      break;
-
-    case RS_JOINING:
-    case RS_JOINED:
-      //ACE_DEBUG ((LM_DEBUG,
-      //            "Receiver_Module::ack_join - joined\n"));
-
-      this->state_ = RS_JOINED;
-      if (this->ACE_RMCast_Module::ack_join (ack_join) != 0)
-        this->leaving (ack_join.source);
-      break;
-
-    default:
-    case RS_LEAVING:
-      this->leaving (ack_join.source);
-      break;
-    }
-  return 0;
-}
-
-int
-ACE_RMCast_Receiver_Module::ack_leave (ACE_RMCast::Ack_Leave &ack_leave)
-{
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "Receiver_Module::ack_leave\n"));
-
-  (void) this->ACE_RMCast_Module::ack_leave (ack_leave);
-
-  // Returning -1 should remove the Proxy from the local set
-  return -1;
-}
-
-int
-ACE_RMCast_Receiver_Module::ack (ACE_RMCast::Ack &)
-{
-  return -1;
-}
-
-int
-ACE_RMCast_Receiver_Module::join (ACE_RMCast::Join &)
-{
-  return -1;
-}
-
-int
-ACE_RMCast_Receiver_Module::leave (ACE_RMCast::Leave &)
-{
-  return -1;
-}
-
-void
-ACE_RMCast_Receiver_Module::leaving (ACE_RMCast_Proxy *proxy)
-{
-  this->state_ = RS_LEAVING;
-  if (proxy != 0)
-    {
-      ACE_RMCast::Leave leave;
-      (void) proxy->reply_leave (leave);
-    }
-  (void) this->close ();
-}
diff --git a/ace/RMCast/RMCast_Receiver_Module.h b/ace/RMCast/RMCast_Receiver_Module.h
deleted file mode 100644
index 112ad768696..00000000000
--- a/ace/RMCast/RMCast_Receiver_Module.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace/RMCast
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_RECEIVER_MODULE_H
-#define ACE_RMCAST_RECEIVER_MODULE_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/// Keep track of the receiver module.
-/**
- * A receiver proxy must reject invalid messages and communicate with
- * the sender to join and leave the multicast group.
- *
- * This module performs all the task related to 
- *
- */
-class ACE_RMCast_Export ACE_RMCast_Receiver_Module : public ACE_RMCast_Module
-{
-public:
-  //! Constructor
-  ACE_RMCast_Receiver_Module (void);
-
-  //! Destructor
-  virtual ~ACE_RMCast_Receiver_Module (void);
-
-  virtual int data (ACE_RMCast::Data &);
-  virtual int poll (ACE_RMCast::Poll &);
-  virtual int ack_join (ACE_RMCast::Ack_Join &);
-  virtual int ack_leave (ACE_RMCast::Ack_Leave &);
-  virtual int ack (ACE_RMCast::Ack &);
-  virtual int join (ACE_RMCast::Join &);
-  virtual int leave (ACE_RMCast::Leave &);
-
-  /// Simple enum used to describe the receiver state transitions
-  /**
-   * Receivers go through several states before they can fully accept
-   * messages, the following comments describe those states, as well as
-   * the possible transitions
-   * This configuration is pesimistic, any invalid message is cause
-   * enough to reclaim all the resources.  This partially addresses
-   * situations where either accidentally or intentionally a sender is
-   * multicasting packets to the wrong group.
-
-   <CODE>
-              NON_EXISTENT JOINING      JOINED       LEAVING<BR>
-   ----------------------------------------------------------------<BR>
-  <BR>
-   DATA       JOINING      JOINING      JOINED       LEAVING<BR>
-              Send/Join    Send/Join    Recv/Data    Send/Leave<BR>
-  <BR>
-   POLL       JOINING      JOINING      JOINED       LEAVING<BR>
-              Send/Join    Send/Join    Send/Ack     Send/Leave<BR>
-  <BR>
-   ACK_JOIN   JOINING      JOINED       JOINED       LEAVING<BR>
-              Send/Join    Receive Msg  Receive Msg  Send/Leave<BR>
-  <BR>
-   ACK_LEAVE  NON_EXISTENT NON_EXISTENT NON_EXISTENT NON_EXISTENT<BR>
-              Noop         Destroy      Destroy      Destroy<BR>
-  <BR>
-   ACK        NON_EXISTENT NON_EXISTENT NON_EXISTENT NON_EXISTENT<BR>
-              Noop         Destroy      Destroy      Destroy<BR>
-  <BR>
-   JOIN       NON_EXISTENT NON_EXISTENT NON_EXISTENT NON_EXISTENT<BR>
-              Noop         Destroy      Destroy      Destroy<BR>
-  <BR>
-   LEAVE      NON_EXISTENT NON_EXISTENT NON_EXISTENT NON_EXISTENT<BR>
-              Noop         Destroy      Destroy      Destroy<BR>
-  <BR>
-  </CODE>
-  */
-  enum Receiver_State
-  {
-    RS_NON_EXISTENT,
-    RS_JOINING,
-    RS_JOINED,
-    RS_LEAVING
-  };
-
-private:
-  /// Enter the leaving state, prepare for termination
-  void leaving (ACE_RMCast_Proxy *proxy);
-
-private:
-  /// The current state of the receiver
-  int state_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Receiver_Module.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_RECEIVER_MODULE_H */
diff --git a/ace/RMCast/RMCast_Receiver_Module.i b/ace/RMCast/RMCast_Receiver_Module.i
deleted file mode 100644
index 6662f7f048a..00000000000
--- a/ace/RMCast/RMCast_Receiver_Module.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Receiver_Module::ACE_RMCast_Receiver_Module (void)
-  :  state_ (ACE_RMCast_Receiver_Module::RS_NON_EXISTENT)
-{
-}
diff --git a/ace/RMCast/RMCast_Reliable_Factory.cpp b/ace/RMCast/RMCast_Reliable_Factory.cpp
deleted file mode 100644
index 6140c685153..00000000000
--- a/ace/RMCast/RMCast_Reliable_Factory.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-#include "RMCast_Reliable_Factory.h"
-#include "RMCast_Receiver_Module.h"
-#include "RMCast_Reassembly.h"
-#include "RMCast_Reordering.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Reliable_Factory.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Reliable_Factory, "$Id$")
-
-ACE_RMCast_Reliable_Factory::~ACE_RMCast_Reliable_Factory (void)
-{
-}
-
-ACE_RMCast_Module*
-ACE_RMCast_Reliable_Factory::create (void)
-{
-  ACE_RMCast_Module *receiver;
-  ACE_NEW_RETURN (receiver, ACE_RMCast_Receiver_Module, 0);
-
-  ACE_RMCast_Module *reassembly;
-  ACE_NEW_RETURN (reassembly, ACE_RMCast_Reassembly, 0);
-
-  ACE_RMCast_Module *reordering;
-  ACE_NEW_RETURN (reordering, ACE_RMCast_Reordering, 0);
-
-  ACE_RMCast_Module *user = this->factory_->create ();
-  if (user == 0)
-    {
-      delete receiver;
-      delete reordering;
-      delete reassembly;
-      return 0;
-    }
-  receiver->next (reassembly);
-  reassembly->next (reordering);
-  reordering->next (user);
-  return receiver;
-}
-
-void
-ACE_RMCast_Reliable_Factory::destroy (ACE_RMCast_Module *receiver)
-{
-  ACE_RMCast_Module *reassembly = receiver->next ();
-  ACE_RMCast_Module *reordering = reassembly->next ();
-  ACE_RMCast_Module *user = reordering->next ();
-  this->factory_->destroy (user);
-  delete reordering;
-  delete reassembly;
-  delete receiver;
-}
diff --git a/ace/RMCast/RMCast_Reliable_Factory.h b/ace/RMCast/RMCast_Reliable_Factory.h
deleted file mode 100644
index 8f9b9aa6aa1..00000000000
--- a/ace/RMCast/RMCast_Reliable_Factory.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    RMCast_Reliable_Factory.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_RELIABLE_FACTORY_H
-#define ACE_RMCAST_RELIABLE_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/// Implement an ACE_RMCast_Module_Factory that "creates" a single
-/// object.
-/**
- * Many applications (and even some internal components), will use a
- * single ACE_RMCast_Module to process all the events, for example, a
- * receiver may decide to use the same ACE_RMCast_Module to process
- * all incoming events, instead of using one per remote sender.
- */
-class ACE_RMCast_Export ACE_RMCast_Reliable_Factory : public ACE_RMCast_Module_Factory
-{
-public:
-  /// Constructor
-  ACE_RMCast_Reliable_Factory (ACE_RMCast_Module_Factory *factory);
-
-  //! Destructor
-  virtual ~ACE_RMCast_Reliable_Factory (void);
-
-  /**
-   * The create() method will return always @c reliable.
-   */
-  virtual ACE_RMCast_Module *create (void);
-  virtual void destroy (ACE_RMCast_Module *);
-
-private:
-  /// Delegate on another factory to create the user module
-  ACE_RMCast_Module_Factory *factory_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Reliable_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_RELIABLE_FACTORY_H */
diff --git a/ace/RMCast/RMCast_Reliable_Factory.i b/ace/RMCast/RMCast_Reliable_Factory.i
deleted file mode 100644
index 47ba22754ec..00000000000
--- a/ace/RMCast/RMCast_Reliable_Factory.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Reliable_Factory::
-    ACE_RMCast_Reliable_Factory (ACE_RMCast_Module_Factory *factory)
-      : factory_ (factory)
-{
-}
diff --git a/ace/RMCast/RMCast_Reordering.cpp b/ace/RMCast/RMCast_Reordering.cpp
deleted file mode 100644
index 755fa5c4a86..00000000000
--- a/ace/RMCast/RMCast_Reordering.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_Reordering.h"
-#include "RMCast_Proxy.h"
-#include "ace/Guard_T.h"
-#include "ace/Message_Block.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Reordering.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Reordering, "$Id$")
-
-ACE_RMCast_Reordering::~ACE_RMCast_Reordering (void)
-{
-}
-
-int
-ACE_RMCast_Reordering::close (void)
-{
-  Messages_Iterator i = this->messages_.begin ();
-  Messages_Iterator end = this->messages_.end ();
-
-  while (i != end)
-    {
-      ACE_Message_Block::release ((*i).item ().payload);
-      this->messages_.unbind ((*i).key ());
-      i = this->messages_.begin ();
-    }
-  return this->ACE_RMCast_Module::close ();
-}
-
-int
-ACE_RMCast_Reordering::data (ACE_RMCast::Data &data)
-{
-  int must_ack = 0;
-  int result = 0;
-  ACE_RMCast::Ack ack;
-
-  //ACE_DEBUG ((LM_DEBUG, "Received message (%d)\n", data.sequence_number));
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-
-    if (data.sequence_number < this->next_expected_)
-      {
-        // Old message.  Ack with the current status (look at the end
-        // of this block).
-        must_ack = 1;
-
-        //ACE_DEBUG ((LM_DEBUG, ".... old message is ignored\n"));
-      }
-
-    else if (data.sequence_number == this->next_expected_)
-      {
-        //ACE_DEBUG ((LM_DEBUG, ".... message is in order, received\n"));
-
-        // Accept the message, the current thread will dispatch it, so
-        // it is marked as accepted (using the <next_expected> field).
-        // Any other thread will not push that message because now it
-        // is "old".
-
-        this->next_expected_++;
-
-        // Right message, process as many messages as possible from
-        // the queue, then ack the right level...
-
-        // NOTE: we cannot release the mutex while dispatching
-        // events, otherwise: how do we stop other threads from
-        // delivering messages out of order?  I.E. what if the
-        // next thread receives the next message?
-        if (this->next () != 0)
-          {
-            result = this->next ()->data (data);
-          }
-
-        // After delivering one message there may be more messages
-        // pending
-        if (result == 0)
-          result = this->push_queued_messages ();
-
-        //@@ This should be strategized, for example, only Ack if
-        //   there is a message out of order or something, otherwise
-        //   continue with happiness.  That works well for "optimistic
-        //   models".
-        must_ack = 1;
-      }
-
-    else
-      {
-        //ACE_DEBUG ((LM_DEBUG, ".... message out of sequence, saved\n"));
-
-        // Out of sequence.
-        if (this->highest_received_ < data.sequence_number)
-          {
-            this->highest_received_ = data.sequence_number;
-          }
-        ACE_RMCast::Data new_data = data;
-        new_data.payload = ACE_Message_Block::duplicate (data.payload);
-        (void) this->messages_.bind (data.sequence_number, new_data);
-        // re-ack, otherwise save it and ack.
-      }
-
-    ack.next_expected = this->next_expected_;
-    ack.highest_received = this->highest_received_;
-  }
-
-  if (must_ack && data.source != 0)
-    (void) data.source->reply_ack (ack);
-
-  return result;
-}
-
-int
-ACE_RMCast_Reordering::ack_join (ACE_RMCast::Ack_Join &ack_join)
-{
-  //ACE_DEBUG ((LM_DEBUG, "RMCast_Reordering::ack_join - <%d,%d>\n",
-  //            this->next_expected_,
-  //            ack_join.next_sequence_number));
-
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-    if (this->next_expected_ >= ack_join.next_sequence_number)
-      {
-        // Nothing to do in this case...
-        return 0;
-      }
-
-    Messages_Iterator i = this->messages_.begin ();
-    Messages_Iterator end = this->messages_.end ();
-
-    while (i != end
-           && (*i).key () < ack_join.next_sequence_number)
-      {
-        ACE_Message_Block::release ((*i).item ().payload);
-        this->messages_.unbind ((*i).key ());
-        i = this->messages_.begin ();
-      }
-
-    this->next_expected_ = ack_join.next_sequence_number;
-    if (this->highest_received_ < ack_join.next_sequence_number)
-      this->highest_received_ = ack_join.next_sequence_number;
-
-    this->push_queued_messages ();
-  }
-
-  return 0;
-}
-
-int
-ACE_RMCast_Reordering::push_queued_messages (void)
-{
-  Messages_Iterator i = this->messages_.begin ();
-  Messages_Iterator end = this->messages_.end ();
-
-  while (i != end
-         && (*i).key () == this->next_expected_)
-    {
-      int r = 0;
-      if (this->next () != 0)
-        {
-          ACE_RMCast::Data data = (*i).item ();
-          r = this->next ()->data (data);
-        }
-
-      ACE_Message_Block::release ((*i).item ().payload);
-      this->messages_.unbind ((*i).key ());
-      i = this->messages_.begin ();
-      this->next_expected_++;
-      if (r != 0)
-        return r;
-    }
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/RMCast/RMCast_Reordering.h b/ace/RMCast/RMCast_Reordering.h
deleted file mode 100644
index dadca2aa0f6..00000000000
--- a/ace/RMCast/RMCast_Reordering.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace/RMCast
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_REORDERING_H
-#define ACE_RMCAST_REORDERING_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-#include "ace/RB_Tree.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_RMCast_Proxy;
-
-/// Pass messages up in sent order
-/**
- * Some applications require receivers to process messages in the same
- * order that messages are sent.  This module buffers out of order
- * messages and only delivers a message if:
- * - All the previous messages have been delivered.
- * - The sender sends a notification that previous messages will not
- *   be resent.
- *
- * The module also sends the Ack feedback to the sender.
- *
- * NOTE:  This is not the same as causal or total ordering, that could
- * be implemented someday, but requires a lot more than what we have
- * right now.
- *
- */
-class ACE_RMCast_Export ACE_RMCast_Reordering : public ACE_RMCast_Module
-{
-public:
-  /// Constructor
-  ACE_RMCast_Reordering (void);
-
-  /// Destructor
-  virtual ~ACE_RMCast_Reordering (void);
-
-  /// Use a Red-Black Tree to keep the queue of messages
-  //@{
-  typedef ACE_RB_Tree<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex> Messages;
-  typedef ACE_RB_Tree_Iterator<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex> Messages_Iterator;
-  //@}
-
-  /// Remove messages still pending
-  virtual int close (void);
-
-  /// Process a Data message.
-  /**
-   * Process a Data message, sending the right Ack message back.
-   * The message is passed up only if it is in order.
-   */
-  virtual int data (ACE_RMCast::Data &);
-
-  /// During the join process the server informs us of the next
-  /// expected message
-  virtual int ack_join (ACE_RMCast::Ack_Join &);
-
-private:
-  /// Push any messages that are pending in the queue
-  int push_queued_messages (void);
-
-protected:
-  /// The reordering buffer
-  Messages messages_;
-
-  /// The smallest value of \param next_expected for all the proxies
-  ACE_UINT32 next_expected_;
-
-  /// The highest value of \param highest_received for all the proxies
-  ACE_UINT32 highest_received_;
-
-  /// Synchronization
-  ACE_SYNCH_MUTEX mutex_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Reordering.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_REORDERING_H */
diff --git a/ace/RMCast/RMCast_Reordering.i b/ace/RMCast/RMCast_Reordering.i
deleted file mode 100644
index ccbf852bc67..00000000000
--- a/ace/RMCast/RMCast_Reordering.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Reordering::ACE_RMCast_Reordering (void)
-  :  next_expected_ (0)
-  ,  highest_received_ (0)
-{
-}
diff --git a/ace/RMCast/RMCast_Resend_Handler.cpp b/ace/RMCast/RMCast_Resend_Handler.cpp
deleted file mode 100644
index c8597b301f0..00000000000
--- a/ace/RMCast/RMCast_Resend_Handler.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#include "RMCast_Resend_Handler.h"
-#include "RMCast_Retransmission.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Resend_Handler.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Resend_Handler, "$Id$")
-
-ACE_RMCast_Resend_Handler::~ACE_RMCast_Resend_Handler (void)
-{
-}
-
-int
-ACE_RMCast_Resend_Handler::handle_timeout (const ACE_Time_Value &,
-                                           const void *)
-{
-  (void) this->retransmission_->resend_all ();
-  return 0;
-}
diff --git a/ace/RMCast/RMCast_Resend_Handler.h b/ace/RMCast/RMCast_Resend_Handler.h
deleted file mode 100644
index 363b0ee5cc3..00000000000
--- a/ace/RMCast/RMCast_Resend_Handler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-#ifndef ACE_RMCAST_RESEND_HANDLER_H
-#define ACE_RMCAST_RESEND_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Export.h"
-#include "ace/Event_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_RMCast_Retransmission;
-
-/// Implement an adapter to resend messages in the
-/// ACE_RMCast_Retransmission layer, but based on Reactor based
-/// timeouts.
-class ACE_RMCast_Export ACE_RMCast_Resend_Handler : public ACE_Event_Handler
-{
-public:
-  /// Constructor, save io_udp as the Adaptee in the Adapter pattern.
-  ACE_RMCast_Resend_Handler (ACE_RMCast_Retransmission *retransmission);
-
-  /// Destructor
-  ~ACE_RMCast_Resend_Handler (void);
-
-  //@{
-  //! Documented in ACE_Event_Handler class
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act = 0);
-  //@}
-
-private:
-  //! The adaptee
-  ACE_RMCast_Retransmission *retransmission_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Resend_Handler.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_RESEND_HANDLER_H */
diff --git a/ace/RMCast/RMCast_Resend_Handler.i b/ace/RMCast/RMCast_Resend_Handler.i
deleted file mode 100644
index 9ad6cd8870d..00000000000
--- a/ace/RMCast/RMCast_Resend_Handler.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Resend_Handler::
-ACE_RMCast_Resend_Handler (ACE_RMCast_Retransmission *r)
-  :  retransmission_ (r)
-{
-}
diff --git a/ace/RMCast/RMCast_Resend_Worker.cpp b/ace/RMCast/RMCast_Resend_Worker.cpp
deleted file mode 100644
index a4acbeff0cd..00000000000
--- a/ace/RMCast/RMCast_Resend_Worker.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_Resend_Worker.h"
-#include "RMCast_Module.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Resend_Worker.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Resend_Worker, "$Id$")
-
-int
-ACE_RMCast_Resend_Worker::work (ACE_UINT32 const & key,
-                                ACE_RMCast::Data const &item)
-{
-  if (key > this->max_sequence_number_)
-    return 0;
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "RMCast_Resend_Worker::work - message %d resent\n",
-  //            key));
-
-  ACE_RMCast::Data data = item;
-  int r = this->next_->data (data);
-  if (r != 0)
-    return r;
-  this->n++;
-
-  return 1; // @@ Stop after the first message...
-}
diff --git a/ace/RMCast/RMCast_Resend_Worker.h b/ace/RMCast/RMCast_Resend_Worker.h
deleted file mode 100644
index 2b49f97876a..00000000000
--- a/ace/RMCast/RMCast_Resend_Worker.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#ifndef ACE_RMCAST_RESEND_WORKER_H
-#define ACE_RMCAST_RESEND_WORKER_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast.h"
-#include "RMCast_Copy_On_Write.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_RMCast_Module;
-
-/// Process an Ack message in the ACE_RMCast_Retransmission module
-/**
- * The retransmission module uses internal iterators, thus it needs to
- * create helper Worker classes to process some messages.
- */
-class ACE_RMCast_Resend_Worker
-  : public ACE_RMCast_Worker<ACE_UINT32,ACE_RMCast::Data>
-{
-public:
-  ACE_RMCast_Resend_Worker (ACE_RMCast_Module *next,
-                            ACE_UINT32 max_sequence_number);
-
-  virtual int work (ACE_UINT32 const & key,
-                    ACE_RMCast::Data const &item);
-
-  int n;
-
-private:
-  ACE_RMCast_Module *next_;
-
-  ACE_UINT32 max_sequence_number_;
-
-private:
-  ACE_RMCast_Resend_Worker (const ACE_RMCast_Resend_Worker&);
-  ACE_RMCast_Resend_Worker& operator= (const ACE_RMCast_Resend_Worker&);
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Resend_Worker.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_RESEND_WORKER_H */
diff --git a/ace/RMCast/RMCast_Resend_Worker.i b/ace/RMCast/RMCast_Resend_Worker.i
deleted file mode 100644
index d609c27f006..00000000000
--- a/ace/RMCast/RMCast_Resend_Worker.i
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-ACE_INLINE
-
-ACE_RMCast_Resend_Worker::
-ACE_RMCast_Resend_Worker (ACE_RMCast_Module *next,
-                          ACE_UINT32 max_sequence_number)
-  : n (0)
-  , next_ (next)
-  , max_sequence_number_ (max_sequence_number)
-{
-}
diff --git a/ace/RMCast/RMCast_Retransmission.cpp b/ace/RMCast/RMCast_Retransmission.cpp
deleted file mode 100644
index d3c8ee97d84..00000000000
--- a/ace/RMCast/RMCast_Retransmission.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_Retransmission.h"
-#include "RMCast_Proxy.h"
-#include "RMCast_Ack_Worker.h"
-#include "RMCast_Resend_Worker.h"
-#include "ace/Message_Block.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Retransmission.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Retransmission, "$Id$")
-
-ACE_RMCast_Retransmission::~ACE_RMCast_Retransmission (void)
-{
-}
-
-int
-ACE_RMCast_Retransmission::resend (ACE_UINT32 max_sequence_number)
-{
-  if (this->next () == 0)
-    return 0;
-
-  ACE_RMCast_Resend_Worker worker (this->next (), max_sequence_number);
-
-  if (this->messages_.for_each (&worker) == -1)
-    return -1;
-
-  return worker.n;
-}
-
-int
-ACE_RMCast_Retransmission::resend_all (void)
-{
-  if (this->next () == 0)
-    return 0;
-
-  ACE_RMCast_Resend_Worker worker (this->next (), ACE_UINT32_MAX);
-
-  if (this->messages_.for_each (&worker) == -1)
-    return -1;
-
-  return worker.n;
-}
-
-int
-ACE_RMCast_Retransmission::has_data (void)
-{
-  return !this->messages_.empty ();
-}
-
-int
-ACE_RMCast_Retransmission::close (void)
-{
-  // @@
-  return 0;
-}
-
-int
-ACE_RMCast_Retransmission::data (ACE_RMCast::Data &data)
-{
-  if (this->next () == 0)
-    return 0;
-
-  int r = this->next ()->data (data);
-  if (r == 0)
-    {
-      ACE_RMCast::Data copy = data;
-      copy.payload = ACE_Message_Block::duplicate (data.payload);
-      r = this->messages_.bind (data.sequence_number, copy);
-    }
-  return r;
-}
-
-int
-ACE_RMCast_Retransmission::join (ACE_RMCast::Join &join)
-{
-  if (join.source == 0)
-    return 0;
-
-  ACE_RMCast::Ack_Join ack_join;
-  ack_join.source = 0;
-  ack_join.next_sequence_number = this->messages_.first_key ();
-
-  (void) join.source->reply_ack_join (ack_join);
-
-  // @@ We should force a full retransmission of all the messages!
-
-  return 0;
-}
-
-int
-ACE_RMCast_Retransmission::leave (ACE_RMCast::Leave &leave)
-{
-  if (leave.source == 0)
-    return 0;
-
-  ACE_RMCast::Ack_Leave ack_leave;
-  ack_leave.source = 0;
-
-  (void) leave.source->reply_ack_leave (ack_leave);
-
-  return 0;
-}
-
-int
-ACE_RMCast_Retransmission::ack (ACE_RMCast::Ack &ack)
-{
-  Messages::Write_Guard ace_mon (this->messages_);
-
-  ACE_RMCast_Ack_Worker worker (ack, ace_mon, &this->messages_);
-
-  return this->messages_.for_each (&worker);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_RB_Tree<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex>;
-template class ACE_RB_Tree_Iterator_Base<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex>;
-template class ACE_RB_Tree_Iterator<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex>;
-template class ACE_RB_Tree_Node<ACE_UINT32,ACE_RMCast::Data>;
-
-template class ACE_RMCast_Copy_On_Write<ACE_UINT32,ACE_RMCast::Data,ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>;
-template class ACE_RMCast_Copy_On_Write_Container<ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>;
-template class ACE_RMCast_Copy_On_Write_Write_Guard<ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>;
-template class ACE_RMCast_Copy_On_Write_Read_Guard<ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>;
-template class ACE_RMCast_Copy_On_Write_Collection<ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>;
-template class ACE_RMCast_Worker<ACE_UINT32,ACE_RMCast::Data>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_RB_Tree<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Node<ACE_UINT32,ACE_RMCast::Data>
-
-#pragma instantiate ACE_RMCast_Copy_On_Write<ACE_UINT32,ACE_RMCast::Data,ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>
-#pragma instantiate ACE_RMCast_Copy_On_Write_Container<ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>
-#pragma instantiate ACE_RMCast_Copy_On_Write_Write_Guard<ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>
-#pragma instantiate ACE_RMCast_Copy_On_Write_Read_Guard<ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>
-#pragma instantiate ACE_RMCast_Copy_On_Write_Collection<ACE_RMCast_Retransmission::Collection,ACE_RMCast_Retransmission::Collection_Iterator>
-#pragma instantiate ACE_RMCast_Worker<ACE_UINT32,ACE_RMCast::Data>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/RMCast/RMCast_Retransmission.h b/ace/RMCast/RMCast_Retransmission.h
deleted file mode 100644
index b51d1438c2a..00000000000
--- a/ace/RMCast/RMCast_Retransmission.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    RMCast_Retransmission.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_RETRANSMISSION_H
-#define ACE_RMCAST_RETRANSMISSION_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-#include "RMCast_Copy_On_Write.h"
-#include "ace/RB_Tree.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/// Store messages for retransmission in reliable configurations
-/**
- * Reliable configurations of the RMCast framework need to store
- * messages on the sender side to resend them if one or more clients
- * do not receive them successfully.
- */
-class ACE_RMCast_Export ACE_RMCast_Retransmission : public ACE_RMCast_Module
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor
-  ACE_RMCast_Retransmission (void);
-
-  /// Destructor
-  virtual ~ACE_RMCast_Retransmission (void);
-
-  /// Use a Red-Black Tree to keep the queue of messages
-  typedef ACE_RB_Tree<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex> Collection;
-  typedef ACE_RB_Tree_Iterator<ACE_UINT32,ACE_RMCast::Data,ACE_Less_Than<ACE_UINT32>,ACE_Null_Mutex> Collection_Iterator;
-
-  /// The messages are stored in the Copy_On_Write wrapper to provide
-  /// an efficient, but thread safe interface.
-  typedef ACE_RMCast_Copy_On_Write<ACE_UINT32,ACE_RMCast::Data,Collection,Collection_Iterator> Messages;
-
-  /// Resend messages
-  /**
-   * Resends all the messages up to \param max_sequence_number
-   * Returns the number of messages sent, or -1 if there where any
-   * errors.
-   */
-  int resend (ACE_UINT32 max_sequence_number);
-
-  /// Resend all messages
-  /**
-   * Resends all the messages currently in the queue.
-   */
-  int resend_all (void);
-
-  /// Return 0 if there is no pending data to send
-  int has_data (void);
-
-  /// Cleanup all the stored messages
-  virtual int close (void);
-
-  /// Pass the message downstream, but also save it in the
-  /// retransmission queue
-  /**
-   * Sequence number are assigned by the ACE_RMCast_Fragmentation
-   * class, consequently this class first passes the message
-   * downstream, to obtain the sequence number and then stores the
-   * message for later retransmission.
-   */
-  virtual int data (ACE_RMCast::Data &data);
-
-  /// Process an Ack message from the remote receivers.
-  /**
-   * Normally this Ack message will be a summary of all the Ack
-   * messages received by the ACE_RMCast_Membership class
-   */
-  virtual int ack (ACE_RMCast::Ack &);
-
-  /// Detect when new members join the group and Ack_Join them
-  /**
-   * When a new receiver joins the group this module sends an Ack_Join
-   * message with the next sequence number that the receiver should
-   * expect.
-   * The sequence number is obtained from the current list of cached
-   * messages.
-   */
-  virtual int join (ACE_RMCast::Join &);
-
-  /// A receiver is leaving
-  /**
-   * Normally the ACE_RMCast_Membership module could do this, but,
-   * because this module processes the Join messages, it seems more
-   * natural to process the Leave messages too.
-   */
-  virtual int leave (ACE_RMCast::Leave &);
-
-protected:
-
-  /// The retransmission buffer
-  Messages messages_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Retransmission.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_RETRANSMISSION_H */
diff --git a/ace/RMCast/RMCast_Retransmission.i b/ace/RMCast/RMCast_Retransmission.i
deleted file mode 100644
index e67b41120ce..00000000000
--- a/ace/RMCast/RMCast_Retransmission.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Retransmission::ACE_RMCast_Retransmission (void)
-{
-}
diff --git a/ace/RMCast/RMCast_Sequencer.cpp b/ace/RMCast/RMCast_Sequencer.cpp
deleted file mode 100644
index 356fbb4a01b..00000000000
--- a/ace/RMCast/RMCast_Sequencer.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_Sequencer.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Sequencer.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "ace/Guard_T.h"
-
-ACE_RCSID(ace, RMCast_Sequencer, "$Id$")
-
-ACE_RMCast_Sequencer::~ACE_RMCast_Sequencer (void)
-{
-}
-
-int
-ACE_RMCast_Sequencer::data (ACE_RMCast::Data &data)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-    data.sequence_number = this->sequence_number_generator_++;
-  }
-  return this->ACE_RMCast_Module::data (data);
-}
diff --git a/ace/RMCast/RMCast_Sequencer.h b/ace/RMCast/RMCast_Sequencer.h
deleted file mode 100644
index 28f83a1d4b3..00000000000
--- a/ace/RMCast/RMCast_Sequencer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace/RMCast
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_SEQUENCER_H
-#define ACE_RMCAST_SEQUENCER_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/// Assign sequence numbers to outgoing messages
-/**
- * On the sender side we must assign sequence numbers to the messages
- * <B>before</B> they are put in the retransmission queue.
- */
-class ACE_RMCast_Export ACE_RMCast_Sequencer : public ACE_RMCast_Module
-{
-public:
-  /// Constructor
-  ACE_RMCast_Sequencer (void);
-
-  /// Destructor
-  virtual ~ACE_RMCast_Sequencer (void);
-
-  virtual int data (ACE_RMCast::Data &);
-
-protected:
-  /// Create the sequence numbers
-  ACE_UINT32 sequence_number_generator_;
-
-  /// Synchronization
-  ACE_SYNCH_MUTEX mutex_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Sequencer.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_SEQUENCER_H */
diff --git a/ace/RMCast/RMCast_Sequencer.i b/ace/RMCast/RMCast_Sequencer.i
deleted file mode 100644
index e7b7ff0f492..00000000000
--- a/ace/RMCast/RMCast_Sequencer.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Sequencer::ACE_RMCast_Sequencer (void)
-  :  sequence_number_generator_ (0)
-{
-}
diff --git a/ace/RMCast/RMCast_Singleton_Factory.cpp b/ace/RMCast/RMCast_Singleton_Factory.cpp
deleted file mode 100644
index 403b87060e2..00000000000
--- a/ace/RMCast/RMCast_Singleton_Factory.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#include "RMCast_Singleton_Factory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_Singleton_Factory.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_Singleton_Factory, "$Id$")
-
-ACE_RMCast_Singleton_Factory::~ACE_RMCast_Singleton_Factory (void)
-{
-}
-
-ACE_RMCast_Module*
-ACE_RMCast_Singleton_Factory::create (void)
-{
-  return this->singleton_;
-}
-
-void
-ACE_RMCast_Singleton_Factory::destroy (ACE_RMCast_Module *)
-{
-}
diff --git a/ace/RMCast/RMCast_Singleton_Factory.h b/ace/RMCast/RMCast_Singleton_Factory.h
deleted file mode 100644
index 6ab5819bf30..00000000000
--- a/ace/RMCast/RMCast_Singleton_Factory.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    RMCast_Singleton_Factory.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_SINGLETON_FACTORY_H
-#define ACE_RMCAST_SINGLETON_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Module_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/// Implement an ACE_RMCast_Module_Factory that "creates" a single
-/// object.
-/**
- * Many applications (and even some internal components), will use a
- * single ACE_RMCast_Module to process all the events, for example, a
- * receiver may decide to use the same ACE_RMCast_Module to process
- * all incoming events, instead of using one per remote sender.
- */
-class ACE_RMCast_Export ACE_RMCast_Singleton_Factory : public ACE_RMCast_Module_Factory
-{
-public:
-  /// Constructor
-  /**
-   * @param singleton This object is returned by any call to
-   * create().
-   */
-  ACE_RMCast_Singleton_Factory (ACE_RMCast_Module *singleton);
-
-  //! Destructor
-  virtual ~ACE_RMCast_Singleton_Factory (void);
-
-  virtual ACE_RMCast_Module *create (void);
-  virtual void destroy (ACE_RMCast_Module *);
-
-private:
-  /// The singleton object
-  ACE_RMCast_Module *singleton_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Singleton_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_SINGLETON_FACTORY_H */
diff --git a/ace/RMCast/RMCast_Singleton_Factory.i b/ace/RMCast/RMCast_Singleton_Factory.i
deleted file mode 100644
index a45837dfa93..00000000000
--- a/ace/RMCast/RMCast_Singleton_Factory.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_Singleton_Factory::
-    ACE_RMCast_Singleton_Factory (ACE_RMCast_Module *singleton)
-      : singleton_ (singleton)
-{
-}
diff --git a/ace/RMCast/RMCast_UDP_Event_Handler.cpp b/ace/RMCast/RMCast_UDP_Event_Handler.cpp
deleted file mode 100644
index 963928845f7..00000000000
--- a/ace/RMCast/RMCast_UDP_Event_Handler.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// $Id$
-//
-
-#include "RMCast_UDP_Event_Handler.h"
-#include "RMCast_IO_UDP.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_UDP_Event_Handler.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_UDP_Event_Handler, "$Id$")
-
-ACE_RMCast_UDP_Event_Handler::~ACE_RMCast_UDP_Event_Handler (void)
-{
-}
-
-ACE_HANDLE
-ACE_RMCast_UDP_Event_Handler::get_handle (void) const
-{
-  return this->io_udp_->get_handle ();
-}
-
-int
-ACE_RMCast_UDP_Event_Handler::handle_input (ACE_HANDLE h)
-{
-  return this->io_udp_->handle_input (h);
-}
-
-int
-ACE_RMCast_UDP_Event_Handler::handle_timeout (const ACE_Time_Value &,
-                                              const void *)
-{
-  // @@ return this->io_udp_->handle_timeout ();
-  return 0;
-}
diff --git a/ace/RMCast/RMCast_UDP_Event_Handler.h b/ace/RMCast/RMCast_UDP_Event_Handler.h
deleted file mode 100644
index e8873ed67fd..00000000000
--- a/ace/RMCast/RMCast_UDP_Event_Handler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-
-#ifndef ACE_RMCAST_UDP_EVENT_HANDLER_H
-#define ACE_RMCAST_UDP_EVENT_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Export.h"
-#include "ace/Event_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_RMCast_IO_UDP;
-class ACE_INET_Addr;
-
-//! Implement an Adapter for the ACE_RMCast_IO_UDP class
-/*!
- * Applications may wish to use the ACE_Reactor to demultiplex I/O
- * events for an ACE_RMCast_IO_UDP object.  However other application
- * may choose to make ACE_RMCast_IO_UDP active, or they may dedicate
- * their own threads for its events.
- * To avoid couplin ACE_RMCast_IO_UDP with the Reactor we don't make
- * it derived from ACE_Event_Handler or any other class in the Reactor
- * framework, instead, this simple Adapter can forward the Reactor
- * messages to an ACE_RMCast_IO_UDP object.
- */
-class ACE_RMCast_Export ACE_RMCast_UDP_Event_Handler : public ACE_Event_Handler
-{
-public:
-  //! Constructor, save io_udp as the Adaptee in the Adapter pattern.
-  ACE_RMCast_UDP_Event_Handler (ACE_RMCast_IO_UDP *io_udp);
-
-  //! Destructor
-  /*!
-   * Notice that this class does not own the ACE_RMCast_IO_UDP
-   * adaptee, so it does not destroy it.
-   */
-  ~ACE_RMCast_UDP_Event_Handler (void);
-
-  //@{
-  //! Documented in ACE_Event_Handler class
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act = 0);
-  //@}
-
-private:
-  //! The adaptee
-  ACE_RMCast_IO_UDP *io_udp_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_UDP_Event_Handler.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_UDP_EVENT_HANDLER_H */
diff --git a/ace/RMCast/RMCast_UDP_Event_Handler.i b/ace/RMCast/RMCast_UDP_Event_Handler.i
deleted file mode 100644
index 99b4c0ac7e5..00000000000
--- a/ace/RMCast/RMCast_UDP_Event_Handler.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_RMCast_UDP_Event_Handler::
-ACE_RMCast_UDP_Event_Handler (ACE_RMCast_IO_UDP *io)
-  :  io_udp_ (io)
-{
-}
diff --git a/ace/RMCast/RMCast_UDP_Proxy.cpp b/ace/RMCast/RMCast_UDP_Proxy.cpp
deleted file mode 100644
index 7801a3f2ce3..00000000000
--- a/ace/RMCast/RMCast_UDP_Proxy.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-// $Id$
-
-#include "RMCast_UDP_Proxy.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_UDP_Proxy.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "RMCast_Module.h"
-#include "RMCast_IO_UDP.h"
-#include "ace/Message_Block.h"
-#include "ace/OS_Memory.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/arpa/os_inet.h"
-
-ACE_RCSID(ace, RMCast_UDP_Proxy, "$Id$")
-
-ACE_RMCast_UDP_Proxy::ACE_RMCast_UDP_Proxy (ACE_RMCast_IO_UDP *io_udp,
-                                            const ACE_INET_Addr &addr)
-  : io_udp_ (io_udp)
-  , peer_addr_ (addr)
-{
-}
-
-ACE_RMCast_UDP_Proxy::~ACE_RMCast_UDP_Proxy (void)
-{
-}
-
-int
-ACE_RMCast_UDP_Proxy::receive_message (char *buffer, size_t size)
-{
-  int type = buffer[0];
-
-  // @@ What should we do with invalid messages like this?
-  //
-  if (type < 0 || type >= ACE_RMCast::RMCAST_MT_LAST)
-    return 0;
-
-  if (type == ACE_RMCast::RMCAST_MT_POLL)
-    {
-      ACE_RMCast::Poll poll;
-      poll.source = this;
-      return this->poll (poll);
-    }
-
-  else if (type == ACE_RMCast::RMCAST_MT_ACK_JOIN)
-    {
-      ACE_RMCast::Ack_Join ack_join;
-      ack_join.source = this;
-
-      const size_t header_size = 1 + sizeof(ACE_UINT32);
-      if (size < header_size)
-        {
-          // The message is too small
-          return 0;
-        }
-
-      ACE_UINT32 tmp;
-
-      ACE_OS::memcpy (&tmp, buffer + 1,
-                      sizeof(tmp));
-      ack_join.next_sequence_number = ACE_NTOHL (tmp);
-      return this->ack_join (ack_join);
-    }
-
-  else if (type == ACE_RMCast::RMCAST_MT_ACK_LEAVE)
-    {
-      ACE_RMCast::Ack_Leave ack_leave;
-      ack_leave.source = this;
-      return this->ack_leave (ack_leave);
-    }
-
-  else if (type == ACE_RMCast::RMCAST_MT_DATA)
-    {
-      ACE_RMCast::Data data;
-      data.source = this;
-      const size_t header_size = 1 + 3 * sizeof(ACE_UINT32);
-      if (size < header_size)
-        {
-          // The message is too small
-          return 0;
-        }
-
-      ACE_UINT32 tmp;
-
-      ACE_OS::memcpy (&tmp, buffer + 1,
-                      sizeof(tmp));
-      data.sequence_number = ACE_NTOHL (tmp);
-
-      ACE_OS::memcpy (&tmp, buffer + 1 + sizeof(tmp),
-                      sizeof(tmp));
-      data.total_size = ACE_NTOHL (tmp);
-
-      ACE_OS::memcpy (&tmp, buffer + 1 + 2 * sizeof(tmp),
-                      sizeof(tmp));
-      data.fragment_offset = ACE_NTOHL (tmp);
-
-      // Pass it up the module...
-      ACE_Message_Block *mb;
-      ACE_NEW_RETURN (mb, ACE_Message_Block, -1);
-      mb->size (size - header_size);
-      mb->copy (buffer + header_size, size - header_size);
-
-      data.payload = mb;
-      return this->data (data);
-    }
-
-  else if (type == ACE_RMCast::RMCAST_MT_JOIN)
-    {
-      ACE_RMCast::Join join;
-      join.source = this;
-      return this->join (join);
-    }
-
-  else if (type == ACE_RMCast::RMCAST_MT_LEAVE)
-    {
-      ACE_RMCast::Leave leave;
-      leave.source = this;
-      return this->leave (leave);
-    }
-
-  else if (type == ACE_RMCast::RMCAST_MT_ACK)
-    {
-      ACE_RMCast::Ack ack;
-      ack.source = this;
-
-      const size_t header_size = 1 + sizeof(ACE_UINT32);
-      if (size < header_size)
-        {
-          // The message is too small
-          return 0;
-        }
-
-      ACE_UINT32 tmp;
-
-      ACE_OS::memcpy (&tmp, buffer + 1,
-                      sizeof(tmp));
-      ack.next_expected = ACE_NTOHL (tmp);
-      ACE_OS::memcpy (&tmp, buffer + 1 + sizeof(ACE_UINT32),
-                      sizeof(tmp));
-      ack.highest_received = ACE_NTOHL (tmp);
-
-      return this->ack (ack);
-    }
-
-  return 0;
-}
-
-int
-ACE_RMCast_UDP_Proxy::reply_data (ACE_RMCast::Data &data)
-{
-  return this->io_udp_->send_data (data, this->peer_addr_);
-}
-
-int
-ACE_RMCast_UDP_Proxy::reply_poll (ACE_RMCast::Poll &poll)
-{
-  return this->io_udp_->send_poll (poll, this->peer_addr_);
-}
-
-int
-ACE_RMCast_UDP_Proxy::reply_ack_join (ACE_RMCast::Ack_Join &ack_join)
-{
-  (void) this->ACE_RMCast_Proxy::reply_ack_join (ack_join);
-  return this->io_udp_->send_ack_join (ack_join, this->peer_addr_);
-}
-
-int
-ACE_RMCast_UDP_Proxy::reply_ack_leave (ACE_RMCast::Ack_Leave &ack_leave)
-{
-  return this->io_udp_->send_ack_leave (ack_leave, this->peer_addr_);
-}
-
-int
-ACE_RMCast_UDP_Proxy::reply_ack (ACE_RMCast::Ack &ack)
-{
-  return this->io_udp_->send_ack (ack, this->peer_addr_);
-}
-
-int
-ACE_RMCast_UDP_Proxy::reply_join (ACE_RMCast::Join &join)
-{
-  return this->io_udp_->send_join (join, this->peer_addr_);
-}
-
-int
-ACE_RMCast_UDP_Proxy::reply_leave (ACE_RMCast::Leave &leave)
-{
-  return this->io_udp_->send_leave (leave, this->peer_addr_);
-}
diff --git a/ace/RMCast/RMCast_UDP_Proxy.h b/ace/RMCast/RMCast_UDP_Proxy.h
deleted file mode 100644
index 01db65f66d1..00000000000
--- a/ace/RMCast/RMCast_UDP_Proxy.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    RMCast_UDP_Proxy.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RMCAST_UDP_PROXY_H
-#define ACE_RMCAST_UDP_PROXY_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Proxy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/INET_Addr.h"
-
-class ACE_RMCast_IO_UDP;
-
-/// Define the proxy implementation for UDP based communication
-/**
- * Proxy objects are transport specific, they are responsible for
- * storing the remote peer addressing information.
- * This class implements the UDP version of a proxy.
- */
-class ACE_RMCast_Export ACE_RMCast_UDP_Proxy : public ACE_RMCast_Proxy
-{
-public:
-  /// Constructor
-  /**
-   * The \param io_udp argument is kept to send the replys through the
-   * right socket.
-   * The \param peer_addr is the address used byu the peer to receive
-   * responses.
-   */
-  ACE_RMCast_UDP_Proxy (ACE_RMCast_IO_UDP *io_udp,
-                        const ACE_INET_Addr &peer_addr);
-
-  /// Destructor
-  virtual ~ACE_RMCast_UDP_Proxy (void);
-
-  /// Receive a message, parse and send it upstream in the right
-  /// format.
-  int receive_message (char *buffer, size_t size);
-
-  /// Make the peer address available
-  const ACE_INET_Addr &peer_addr (void) const;
-
-  //@{
-  /**
-   * Implement the ACE_RMCast_Proxy methods, in this case we use the
-   * @var io_udp_ object to send the data, using the address of our
-   * remote peer.
-   */
-  virtual int reply_data (ACE_RMCast::Data &);
-  virtual int reply_poll (ACE_RMCast::Poll &);
-  virtual int reply_ack_join (ACE_RMCast::Ack_Join &);
-  virtual int reply_ack_leave (ACE_RMCast::Ack_Leave &);
-  virtual int reply_ack (ACE_RMCast::Ack &);
-  virtual int reply_join (ACE_RMCast::Join &);
-  virtual int reply_leave (ACE_RMCast::Leave &);
-  //@}
-
-private:
-  /// The IO facade
-  ACE_RMCast_IO_UDP *io_udp_;
-
-  /// The remote peer's address
-  ACE_INET_Addr peer_addr_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_UDP_Proxy.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_UDP_PROXY_H */
diff --git a/ace/RMCast/RMCast_UDP_Proxy.i b/ace/RMCast/RMCast_UDP_Proxy.i
deleted file mode 100644
index b7a85e78ce2..00000000000
--- a/ace/RMCast/RMCast_UDP_Proxy.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE const ACE_INET_Addr&
-ACE_RMCast_UDP_Proxy::peer_addr (void) const
-{
-  return this->peer_addr_;
-}
diff --git a/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp b/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp
deleted file mode 100644
index 9057281cc52..00000000000
--- a/ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-#include "RMCast_UDP_Reliable_Receiver.h"
-#include "RMCast_UDP_Event_Handler.h"
-#include "ace/Reactor.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_UDP_Reliable_Receiver.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_UDP_Reliable_Receiver, "$Id$")
-
-ACE_RMCast_UDP_Reliable_Receiver::ACE_RMCast_UDP_Reliable_Receiver (ACE_RMCast_Module *user_module)
-  : user_factory_ (user_module)
-  , factory_ (&user_factory_)
-  , io_udp_ (&factory_)
-{
-}
-
-ACE_RMCast_UDP_Reliable_Receiver::~ACE_RMCast_UDP_Reliable_Receiver (void)
-{
-}
-
-void
-ACE_RMCast_UDP_Reliable_Receiver::reactive_incoming_messages (ACE_Reactor *reactor)
-{
-  ACE_RMCast_UDP_Event_Handler *eh;
-  ACE_NEW (eh, ACE_RMCast_UDP_Event_Handler (&this->io_udp_));
-
-  /// @@ TODO Make sure it is removed from the Reactor at some point
-  (void) reactor->register_handler (eh, ACE_Event_Handler::READ_MASK);
-}
diff --git a/ace/RMCast/RMCast_UDP_Reliable_Receiver.h b/ace/RMCast/RMCast_UDP_Reliable_Receiver.h
deleted file mode 100644
index 56797861b4b..00000000000
--- a/ace/RMCast/RMCast_UDP_Reliable_Receiver.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#ifndef ACE_RMCAST_UDP_RELIABLE_RECEIVER_H
-#define ACE_RMCAST_UDP_RELIABLE_RECEIVER_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Singleton_Factory.h"
-#include "RMCast_Reliable_Factory.h"
-#include "RMCast_IO_UDP.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Reactor;
-
-class ACE_RMCast_Export ACE_RMCast_UDP_Reliable_Receiver : public ACE_RMCast_Module
-{
-public:
-  /// Constructor
-  ACE_RMCast_UDP_Reliable_Receiver (ACE_RMCast_Module *user_control);
-
-  /// Destructor
-  virtual ~ACE_RMCast_UDP_Reliable_Receiver (void);
-
-  /// Open the UDP I/O module.
-  int init (const ACE_INET_Addr &mcast_group);
-
-  /// Use the reactor to handle incoming messages
-  void reactive_incoming_messages (ACE_Reactor *reactor);
-
-private:
-  /// All the proxys give their messages to user module
-  ACE_RMCast_Singleton_Factory user_factory_;
-
-  /// This factory creates the per-proxy stack
-  ACE_RMCast_Reliable_Factory factory_;
-
-  /// Handle all the UDP I/O
-  ACE_RMCast_IO_UDP io_udp_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_UDP_Reliable_Receiver.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_UDP_RELIABLE_RECEIVER_H */
diff --git a/ace/RMCast/RMCast_UDP_Reliable_Receiver.i b/ace/RMCast/RMCast_UDP_Reliable_Receiver.i
deleted file mode 100644
index 01b2ebe2cad..00000000000
--- a/ace/RMCast/RMCast_UDP_Reliable_Receiver.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE int
-ACE_RMCast_UDP_Reliable_Receiver::init (const ACE_INET_Addr &mcast_group)
-{
-  return this->io_udp_.subscribe (mcast_group);
-}
diff --git a/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp b/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp
deleted file mode 100644
index befab142320..00000000000
--- a/ace/RMCast/RMCast_UDP_Reliable_Sender.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-#include "RMCast_UDP_Reliable_Sender.h"
-#include "RMCast_UDP_Event_Handler.h"
-#include "RMCast_Resend_Handler.h"
-#include "ace/Reactor.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RMCast_UDP_Reliable_Sender.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(ace, RMCast_UDP_Reliable_Sender, "$Id$")
-
-ACE_RMCast_UDP_Reliable_Sender::ACE_RMCast_UDP_Reliable_Sender (ACE_RMCast_Module *user_control)
-  : user_control_ (user_control)
-
-  // We use a singleton factory, all proxys send their messages to the
-  // retransmission module.  There should be only control messages
-  // coming back, so this is OK.
-  , factory_ (&membership_)
-  , io_udp_ (&factory_)
-{
-  // Control messages are received by the membership module and passed
-  // up to the both the retransmission and user modules, we use a fork
-  // module to do that
-  this->membership_.next (&this->fork_);
-
-  this->fork_.next (&this->retransmission_);
-  this->fork_.secondary (user_control);
-
-  // Messages are passed down to the sequencer module
-  this->next (&this->sequencer_);
-
-  // then to the retransmission module
-  this->sequencer_.next (&this->retransmission_);
-
-  // Then fork the messages, at this point control messages are sent
-  // back to the user, other messages continue down to the
-  // fragmentation layer.
-  this->retransmission_.next (&this->fragment_);
-
-  // The fragmentation layer delegates all messages to the UDP I/O
-  // module, that sends every message back to the application.
-  this->fragment_.next (&this->io_udp_);
-}
-
-ACE_RMCast_UDP_Reliable_Sender::~ACE_RMCast_UDP_Reliable_Sender (void)
-{
-}
-
-void
-ACE_RMCast_UDP_Reliable_Sender::reactive_incoming_messages (ACE_Reactor *reactor)
-{
-  ACE_RMCast_UDP_Event_Handler *eh;
-  ACE_NEW (eh, ACE_RMCast_UDP_Event_Handler (&this->io_udp_));
-
-  /// @@ TODO Make sure it is removed from the Reactor at some point
-  (void) reactor->register_handler (eh, ACE_Event_Handler::READ_MASK);
-}
-
-void
-ACE_RMCast_UDP_Reliable_Sender::reactive_resends (ACE_Reactor *reactor,
-                                         const ACE_Time_Value &period)
-{
-  ACE_RMCast_Resend_Handler *eh;
-  ACE_NEW (eh, ACE_RMCast_Resend_Handler (&this->retransmission_));
-
-  /// @@ TODO make sure it is removed from the Reactor at some point
-  (void) reactor->schedule_timer (eh, 0, period, period);
-}
diff --git a/ace/RMCast/RMCast_UDP_Reliable_Sender.h b/ace/RMCast/RMCast_UDP_Reliable_Sender.h
deleted file mode 100644
index 9b1fa01143b..00000000000
--- a/ace/RMCast/RMCast_UDP_Reliable_Sender.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#ifndef ACE_RMCAST_UDP_RELIABLE_SENDER_H
-#define ACE_RMCAST_UDP_RELIABLE_SENDER_H
-#include /**/ "ace/pre.h"
-
-#include "RMCast_Singleton_Factory.h"
-#include "RMCast_IO_UDP.h"
-#include "RMCast_Sequencer.h"
-#include "RMCast_Retransmission.h"
-#include "RMCast_Membership.h"
-#include "RMCast_Fragment.h"
-#include "RMCast_Fork.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Reactor;
-
-class ACE_RMCast_Export ACE_RMCast_UDP_Reliable_Sender : public ACE_RMCast_Module
-{
-public:
-  /// Constructor
-  ACE_RMCast_UDP_Reliable_Sender (ACE_RMCast_Module *user_control);
-
-  /// Destructor
-  virtual ~ACE_RMCast_UDP_Reliable_Sender (void);
-
-  /// Open the UDP I/O module.
-  int init (const ACE_INET_Addr &mcast_group);
-
-  /// Use the reactor to handle incoming messages
-  void reactive_incoming_messages (ACE_Reactor *reactor);
-
-  /// Use the reactor to periodically resend messages
-  void reactive_resends (ACE_Reactor *reactor,
-                         const ACE_Time_Value &period);
-
-  /// Check if there is still some messages to send, return 0 if not.
-  int has_data (void);
-
-  /// Check if there are any members still connected
-  int has_members (void);
-
-private:
-  /// The application-level control module
-  ACE_RMCast_Module *user_control_;
-
-  /// Assign sequence numbers
-  ACE_RMCast_Sequencer sequencer_;
-
-  /// The retransmission module
-  ACE_RMCast_Retransmission retransmission_;
-
-  /// All the proxys give their messages to the retransmission module
-  ACE_RMCast_Singleton_Factory factory_;
-
-  /// Handle all the UDP I/O
-  ACE_RMCast_IO_UDP io_udp_;
-
-  /// The membership module
-  ACE_RMCast_Membership membership_;
-
-  /// The fragmentation module
-  ACE_RMCast_Fragment fragment_;
-
-  /// Redirect control messages to the user supplied module
-  ACE_RMCast_Fork fork_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_UDP_Reliable_Sender.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_RMCAST_UDP_RELIABLE_SENDER_H */
diff --git a/ace/RMCast/RMCast_UDP_Reliable_Sender.i b/ace/RMCast/RMCast_UDP_Reliable_Sender.i
deleted file mode 100644
index 93868a86ede..00000000000
--- a/ace/RMCast/RMCast_UDP_Reliable_Sender.i
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-ACE_INLINE int
-ACE_RMCast_UDP_Reliable_Sender::init (const ACE_INET_Addr &mcast_group)
-{
-  return this->io_udp_.init (mcast_group, ACE_Addr::sap_any);
-}
-
-ACE_INLINE int
-ACE_RMCast_UDP_Reliable_Sender::has_data (void)
-{
-  return this->retransmission_.has_data ();
-}
-
-ACE_INLINE int
-ACE_RMCast_UDP_Reliable_Sender::has_members (void)
-{
-  return this->membership_.has_members ();
-}
diff --git a/ace/RMCast/RMCast_Worker.cpp b/ace/RMCast/RMCast_Worker.cpp
deleted file mode 100644
index 06254b8c0f6..00000000000
--- a/ace/RMCast/RMCast_Worker.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#ifndef ACE_RMCAST_WORKER_CPP
-#define ACE_RMCAST_WORKER_CPP
-
-#include "RMCast_Worker.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "RMCast_Worker.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(RMCast, RMCast_Worker, "$Id$")
-
-template<class KEY, class ITEM>
-ACE_RMCast_Worker<KEY,ITEM>::~ACE_RMCast_Worker (void)
-{
-}
-
-#endif /* ACE_RMCAST_WORKER_CPP */
diff --git a/ace/RMCast/RMCast_Worker.h b/ace/RMCast/RMCast_Worker.h
deleted file mode 100644
index d3eb3032ebc..00000000000
--- a/ace/RMCast/RMCast_Worker.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-
-#ifndef ACE_RMCAST_WORKER_H
-#define ACE_RMCAST_WORKER_H
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<class KEY, class ITEM>
-class ACE_RMCast_Worker
-{
-public:
-  virtual ~ACE_RMCast_Worker (void);
-
-  virtual int work (KEY const & key,
-                    ITEM const & item) = 0;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RMCast_Worker.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "RMCast_Worker.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("RMCast_Worker.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* ACE_RMCAST_WORKER_H */
diff --git a/ace/RMCast/RMCast_Worker.i b/ace/RMCast/RMCast_Worker.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/ace/RMCast/RMCast_Worker.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/ace/RMCast/rmcast.mpc b/ace/RMCast/rmcast.mpc
deleted file mode 100644
index 5f98b38d8b0..00000000000
--- a/ace/RMCast/rmcast.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-//  -*- MPC -*-
-// $Id$
-
-project(RMCast) : acelib, core {
-  requires    += rmcast
-  sharedname   = ACE_RMCast
-  dynamicflags = ACE_RMCAST_BUILD_DLL
-}
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index eec9855a892..c1287d30ae5 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -11,11 +11,16 @@
 #if !defined (ACE_WIN32) \
       || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \
       || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \
-      || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL)
+      || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) \
+      || defined (ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL)
 #  if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL)
 #    include "ace/TP_Reactor.h"
 #  else
-#    include "ace/Select_Reactor.h"
+#    if defined (ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL)
+#      include "ace/Dev_Poll_Reactor.h"
+#    else
+#      include "ace/Select_Reactor.h"
+#    endif /* ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL */
 #  endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */
 #else /* We are on Win32 and we have winsock and ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL is not defined */
 #  if defined (ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL)
@@ -50,14 +55,20 @@ ACE_Reactor::ACE_Reactor (ACE_Reactor_Impl *impl,
 #if !defined (ACE_WIN32) \
       || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \
       || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \
-      || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL)
-  #if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL)
+      || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) \
+      || defined (ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL)
+#  if defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL)
       ACE_NEW (impl,
                ACE_TP_Reactor);
-  #else
+#  else
+#    if defined (ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL)
+      ACE_NEW (impl,
+               ACE_Dev_Poll_Reactor);
+#    else
       ACE_NEW (impl,
                ACE_Select_Reactor);
-  #endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */
+#    endif /* ACE_USE_DEV_POLL_REACTOR_FOR_REACTOR_IMPL */
+#  endif /* ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL */
 #else /* We are on Win32 and we have winsock and ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL is not defined */
   #if defined (ACE_USE_MSG_WFMO_REACTOR_FOR_REACTOR_IMPL)
       ACE_NEW (impl,
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index 40fc4f750cc..d067a583e84 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -59,9 +59,9 @@ public:
    * caller will block until action is possible, else will wait until
    * the relative time specified in *<timeout> elapses).
    */
-  virtual int notify (ACE_Event_Handler * = 0,
-                      ACE_Reactor_Mask = ACE_Event_Handler::EXCEPT_MASK,
-                      ACE_Time_Value * = 0) = 0;
+  virtual int notify (ACE_Event_Handler *eh = 0,
+                      ACE_Reactor_Mask mask = ACE_Event_Handler::EXCEPT_MASK,
+                      ACE_Time_Value *timeout = 0) = 0;
 
   /// Handles pending threads (if any) that are waiting to unblock the
   /// <Reactor_Impl>.
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index a8f91571ad7..55c50a275c7 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -1,6 +1,7 @@
 #include "ace/Remote_Name_Space.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
+#include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID (ace,
@@ -46,11 +47,11 @@ ACE_Remote_Name_Space::bind (const ACE_NS_WString &name,
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
   ACE_UINT32 name_len =
-    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
   ACE_UINT32 value_len =
-    ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T));
   ACE_UINT32 type_len =
-    ACE_static_cast (ACE_UINT32, ACE_OS::strlen (type));
+    static_cast<ACE_UINT32> (ACE_OS::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::BIND,
                             name_urep.get (),
                             name_len,
@@ -70,11 +71,11 @@ ACE_Remote_Name_Space::rebind (const ACE_NS_WString &name,
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
   ACE_UINT32 name_len =
-    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
   ACE_UINT32 value_len =
-    ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T));
   ACE_UINT32 type_len =
-    ACE_static_cast (ACE_UINT32, ACE_OS::strlen (type));
+    static_cast<ACE_UINT32> (ACE_OS::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::REBIND,
                             name_urep.get (),
                             name_len,
@@ -93,7 +94,7 @@ ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name,
   ACE_TRACE ("ACE_Remote_Name_Space::resolve");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
   ACE_UINT32 name_len =
-    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::RESOLVE,
                             name_urep.get (),
                             name_len,
@@ -122,7 +123,7 @@ ACE_Remote_Name_Space::unbind (const ACE_NS_WString &name)
   ACE_TRACE ("ACE_Remote_Name_Space::unbind");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
   ACE_UINT32 name_len =
-    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::UNBIND,
                             name_urep.get (),
                             name_len,
@@ -137,7 +138,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
   ACE_TRACE ("ACE_Remote_Name_Space::list_names");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAMES,
                             pattern_urep.get (),
                             pattern_len,
@@ -171,7 +172,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
   ACE_TRACE ("ACE_Remote_Name_Space::list_values");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUES,
                             pattern_urep.get (),
                             pattern_len,
@@ -206,7 +207,7 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
   ACE_TRACE ("ACE_Remote_Name_Space::list_types");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPES,
                             pattern_urep.get (),
                             pattern_len,
@@ -241,7 +242,7 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
   ACE_TRACE ("ACE_Remote_Name_Space::list_name_entries");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAME_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -282,7 +283,7 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
   ACE_TRACE ("ACE_Remote_Name_Space::list_value_entries");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUE_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -323,7 +324,7 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
   ACE_TRACE ("ACE_Remote_Name_Space::list_type_entries");
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPE_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h
index 95c7b051770..95c0d9c4531 100644
--- a/ace/Remote_Name_Space.h
+++ b/ace/Remote_Name_Space.h
@@ -22,10 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
 #include "ace/Name_Proxy.h"
 #include "ace/Name_Space.h"
 
+
+class ACE_NS_WString;
+
 typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
 
 /**
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index 151c29b3ce0..ffb187b5e17 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -229,8 +229,7 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
   if (protocol_family == PF_INET6)
     {
       sockaddr_in6 local_inet6_addr;
-      ACE_OS::memset (ACE_reinterpret_cast (void *,
-                                            &local_inet6_addr),
+      ACE_OS::memset (reinterpret_cast<void *> (&local_inet6_addr),
                       0,
                       sizeof local_inet6_addr);
 
@@ -241,15 +240,13 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
           local_inet6_addr.sin6_addr = in6addr_any;
         }
       else
-        local_inet6_addr = *ACE_reinterpret_cast (sockaddr_in6 *,
-                                                  local_sap.get_addr ());
+        local_inet6_addr = *reinterpret_cast<sockaddr_in6 *> (local_sap.get_addr ());
 
       // We probably don't need a bind_port written here.
       // There are currently no supported OS's that define
       // ACE_LACKS_WILDCARD_BIND.
       if (ACE_OS::bind (this->get_handle (),
-                        ACE_reinterpret_cast (sockaddr *,
-                                              &local_inet6_addr),
+                        reinterpret_cast<sockaddr *> (&local_inet6_addr),
                         sizeof local_inet6_addr) == -1)
         error = 1;
     }
@@ -258,8 +255,7 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
   if (protocol_family == PF_INET)
     {
       sockaddr_in local_inet_addr;
-      ACE_OS::memset (ACE_reinterpret_cast (void *,
-                                            &local_inet_addr),
+      ACE_OS::memset (reinterpret_cast<void *> (&local_inet_addr),
                       0,
                       sizeof local_inet_addr);
 
@@ -268,8 +264,7 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
           local_inet_addr.sin_port = 0;
         }
       else
-        local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *,
-                                                 local_sap.get_addr ());
+        local_inet_addr = *reinterpret_cast<sockaddr_in *> (local_sap.get_addr ());
       if (local_inet_addr.sin_port == 0)
         {
           if (ACE::bind_port (this->get_handle (),
@@ -277,8 +272,7 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
             error = 1;
         }
       else if (ACE_OS::bind (this->get_handle (),
-                             ACE_reinterpret_cast (sockaddr *,
-                                                   &local_inet_addr),
+                             reinterpret_cast<sockaddr *> (&local_inet_addr),
                              sizeof local_inet_addr) == -1)
         error = 1;
     }
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index fe7fa79103d..86c09b92f1d 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -81,8 +81,7 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
 
   if (local_sap != ACE_Addr::sap_any)
     {
-      sockaddr *laddr = ACE_reinterpret_cast (sockaddr *,
-                                              local_sap.get_addr ());
+      sockaddr *laddr = reinterpret_cast<sockaddr *> (local_sap.get_addr ());
       int size = local_sap.get_size ();
 
       if (ACE_OS::bind (new_stream.get_handle (),
@@ -168,8 +167,7 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
     return -1;
 
   int result = ACE_OS::connect (new_stream.get_handle (),
-                                ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+                                reinterpret_cast<sockaddr *> (remote_sap.get_addr ()),
                                 remote_sap.get_size ());
 
   return this->shared_connect_finish (new_stream,
@@ -206,8 +204,7 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
     return -1;
 
   int result = ACE_OS::connect (new_stream.get_handle (),
-                                ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+                                reinterpret_cast<sockaddr *> (remote_sap.get_addr ()),
                                 remote_sap.get_size (),
                                 qos_params);
 
@@ -254,8 +251,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
   if (remote_sap != 0)
     {
       int len = remote_sap->get_size ();
-      sockaddr *addr = ACE_reinterpret_cast (sockaddr *,
-                                             remote_sap->get_addr ());
+      sockaddr *addr = reinterpret_cast<sockaddr *> (remote_sap->get_addr ());
       if (ACE_OS::getpeername (h,
                                addr,
                                &len) == -1)
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index fe4598ea2d3..7f9323dc230 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -508,7 +508,7 @@ ACE_SOCK_Dgram::set_nic (const char *option_value)
      nic_name specified */
   ip_mreq multicast_address;
   ACE_INET_Addr mcast_addr;
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) || defined(__INTERIX)
   // This port number is not necessary, just convenient
   ACE_INET_Addr interface_addr;
   if (interface_addr.set (mcast_addr.get_port_number (),
@@ -535,7 +535,7 @@ ACE_SOCK_Dgram::set_nic (const char *option_value)
   sockaddr_in *socket_address;
   socket_address = reinterpret_cast<sockaddr_in *> (&if_address.ifr_addr);
   multicast_address.imr_interface.s_addr = socket_address->sin_addr.s_addr;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 || __INTERIX */
 
   /*
    * Now. I got the interface address for the 'nic' specified.
diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp
index cbad8c3344c..7e9c71aed61 100644
--- a/ace/SOCK_Dgram_Bcast.cpp
+++ b/ace/SOCK_Dgram_Bcast.cpp
@@ -115,9 +115,11 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                           SO_BROADCAST,
                           (char *) &one,
                           sizeof one) == -1)
-    return -1;
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
+                      "ACE_SOCK_Dgram_Bcast::mk_broadcast: setsockopt failed"),
+                      -1);
 
-#if !defined (ACE_WIN32)
+#if !defined (ACE_WIN32) && !defined(__INTERIX)
   ACE_HANDLE s = this->get_handle ();
 
   char buf[BUFSIZ];
@@ -139,7 +141,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
 
   struct sockaddr_in host_addr;
 
-  //Get host ip address
+  // Get host ip address
   if (host_name)
     {
       hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR (host_name));
@@ -162,7 +164,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
     }
 
 
-#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (VXWORKS)
   for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0;
        n--, ifr++)
 #else
@@ -180,9 +182,9 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
             ifr = (struct ifreq *)
               ((caddr_t) &ifr->ifr_addr + ifr->ifr_addr.sa_len)) :
           (nbytes -= sizeof (struct ifreq), ifr++)))
-#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) */
+#endif /* !defined(CHORUS_4) && !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (VXWORKS) */
     {
-#if defined (__QNX__)
+#if defined (__QNX__) || defined (VXWORKS)
       // Silently skip link interfaces
       if (ifr->ifr_addr.sa_family == AF_LINK)
         continue;
@@ -252,8 +254,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
 						   flags.ifr_name));
           else
             {
-              ACE_INET_Addr addr (ACE_reinterpret_cast (sockaddr_in *,
-                                                        &if_req.ifr_broadaddr),
+              ACE_INET_Addr addr (reinterpret_cast <sockaddr_in *>
+                                                   (&if_req.ifr_broadaddr),
                                   sizeof if_req.ifr_broadaddr);
               ACE_NEW_RETURN (this->if_list_,
                               ACE_Bcast_Node (addr,
@@ -278,7 +280,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                   ACE_Bcast_Node (addr,
                                   this->if_list_),
                   -1);
-#endif /* !ACE_WIN32 */
+#endif /* !ACE_WIN32 && !__INTERIX */
   if (this->if_list_ == 0)
     {
       errno = ENXIO;
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index f63bf302777..b4755a848be 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -92,13 +92,13 @@ ACE_SOCK_Dgram_Mcast::dump (void) const
       ip_mreq *pm = iter.next ();
 
       // Get subscribed address (w/out port# info - not relevant).
-      ACE_INET_Addr ip_addr (ACE_static_cast (u_short, 0),
+      ACE_INET_Addr ip_addr (static_cast<u_short> (0),
                              ACE_NTOHL (pm->IMR_MULTIADDR.s_addr));
       ACE_SDM_helpers::addr_to_string (ip_addr, addr_string,
                                        sizeof addr_string, 1);
 
       // Get interface address/specification.
-      ACE_INET_Addr if_addr (ACE_static_cast (u_short, 0),
+      ACE_INET_Addr if_addr (static_cast<u_short> (0),
                              ACE_NTOHL (pm->imr_interface.s_addr));
       ACE_SDM_helpers::addr_to_string (if_addr, iface_string,
                                        sizeof iface_string, 1);
@@ -961,7 +961,7 @@ ACE_SOCK_Dgram_Mcast::make_multicast_ifaddr (ip_mreq *ret_mreq,
   ip_mreq  lmreq;       // Scratch copy.
   if (net_if != 0)
     {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) || defined(__INTERIX)
       // This port number is not necessary, just convenient
       ACE_INET_Addr interface_addr;
       if (interface_addr.set (mcast_addr.get_port_number (), net_if) == -1)
@@ -984,10 +984,9 @@ ACE_SOCK_Dgram_Mcast::make_multicast_ifaddr (ip_mreq *ret_mreq,
         return -1;
 
       sockaddr_in *socket_address;
-      socket_address = ACE_reinterpret_cast (sockaddr_in*,
-                                             &if_address.ifr_addr);
+      socket_address = reinterpret_cast<sockaddr_in*> (&if_address.ifr_addr);
       lmreq.imr_interface.s_addr = socket_address->sin_addr.s_addr;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 || __INTERIX */
     }
   else
     lmreq.imr_interface.s_addr = INADDR_ANY;
diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp
index fa45e5d83a0..7ec5fadbbde 100644
--- a/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -171,8 +171,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Addr &local_sap,
   if (protocol_family == PF_INET6)
     {
       sockaddr_in6 local_inet6_addr;
-      ACE_OS::memset (ACE_reinterpret_cast (void *,
-                                            &local_inet6_addr),
+      ACE_OS::memset (reinterpret_cast<void *> (&local_inet6_addr),
                       0,
                       sizeof local_inet6_addr);
 
@@ -183,15 +182,13 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Addr &local_sap,
           local_inet6_addr.sin6_addr = in6addr_any;
         }
       else
-        local_inet6_addr = *ACE_reinterpret_cast (sockaddr_in6 *,
-                                                  local_sap.get_addr ());
+        local_inet6_addr = *reinterpret_cast<sockaddr_in6 *> (local_sap.get_addr ());
 
       // We probably don't need a bind_port written here.
       // There are currently no supported OS's that define
       // ACE_LACKS_WILDCARD_BIND.
       if (ACE_OS::bind (this->get_handle (),
-                        ACE_reinterpret_cast (sockaddr *,
-                                              &local_inet6_addr),
+                        reinterpret_cast<sockaddr *> (&local_inet6_addr),
                         sizeof local_inet6_addr) == -1)
         error = 1;
     }
@@ -200,8 +197,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Addr &local_sap,
   if (protocol_family == PF_INET)
     {
       sockaddr_in local_inet_addr;
-      ACE_OS::memset (ACE_reinterpret_cast (void *,
-                                            &local_inet_addr),
+      ACE_OS::memset (reinterpret_cast<void *> (&local_inet_addr),
                       0,
                       sizeof local_inet_addr);
 
@@ -210,16 +206,14 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Addr &local_sap,
           local_inet_addr.sin_port = 0;
         }
       else
-        local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *,
-                                                 local_sap.get_addr ());
+        local_inet_addr = *reinterpret_cast<sockaddr_in *> (local_sap.get_addr ());
       if (local_inet_addr.sin_port == 0)
         {
           if (ACE::bind_port (this->get_handle ()) == -1)
             error = 1;
         }
       else if (ACE_OS::bind (this->get_handle (),
-                             ACE_reinterpret_cast (sockaddr *,
-                                                   &local_inet_addr),
+                             reinterpret_cast<sockaddr *> (&local_inet_addr),
                              sizeof local_inet_addr) == -1)
         error = 1;
     }
@@ -256,8 +250,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
   if (protocol_family == PF_INET6)
     {
       sockaddr_in6 local_inet6_addr;
-      ACE_OS::memset (ACE_reinterpret_cast (void *,
-                                            &local_inet6_addr),
+      ACE_OS::memset (reinterpret_cast<void *> (&local_inet6_addr),
                       0,
                       sizeof local_inet6_addr);
 
@@ -268,15 +261,13 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
           local_inet6_addr.sin6_addr = in6addr_any;
         }
       else
-        local_inet6_addr = *ACE_reinterpret_cast (sockaddr_in6 *,
-                                                  local_sap.get_addr ());
+        local_inet6_addr = *reinterpret_cast<sockaddr_in6 *> (local_sap.get_addr ());
 
       // We probably don't need a bind_port written here.
       // There are currently no supported OS's that define
       // ACE_LACKS_WILDCARD_BIND.
       if (ACE_OS::bind (this->get_handle (),
-                        ACE_reinterpret_cast (sockaddr *,
-                                              &local_inet6_addr),
+                        reinterpret_cast<sockaddr *> (&local_inet6_addr),
                         sizeof local_inet6_addr) == -1)
         error = 1;
     }
@@ -285,8 +276,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
   if (protocol_family == PF_INET)
     {
       sockaddr_in local_inet_addr;
-      ACE_OS::memset (ACE_reinterpret_cast (void *,
-                                            &local_inet_addr),
+      ACE_OS::memset (reinterpret_cast<void *> (&local_inet_addr),
                       0,
                       sizeof local_inet_addr);
 
@@ -295,8 +285,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
           local_inet_addr.sin_port = 0;
         }
       else
-        local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *,
-                                                 local_sap.get_addr ());
+        local_inet_addr = *reinterpret_cast<sockaddr_in *> (local_sap.get_addr ());
 
 //  A port number of 0 means that the user is requesting that the
 //  operating system choose an arbitrary, unused port.  Since some
@@ -362,8 +351,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
 
               // bind the primary first
               if (ACE_OS::bind (this->get_handle (),
-                                ACE_reinterpret_cast(sockaddr *,
-                                &(local_inet_addrs[0])),
+                                reinterpret_cast<sockaddr *> (&(local_inet_addrs[0])),
                                 sizeof(sockaddr)) == -1)
               {
                 error = 1;
@@ -391,8 +379,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
 
                 // now call bindx
                 if (!error && sctp_bindx(this->get_handle (),
-                                         ACE_reinterpret_cast(sockaddr *,
-                                                              local_sockaddr),
+                                         reinterpret_cast<sockaddr *> (local_sockaddr),
                                          num_addresses - 1,
                                          SCTP_BINDX_ADD_ADDR))
                 {
@@ -405,9 +392,8 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
               // Call bind
               size_t name_len = (sizeof local_inet_addr) * num_addresses;
               if (ACE_OS::bind (this->get_handle (),
-                                ACE_reinterpret_cast (sockaddr *,
-                                                      local_inet_addrs),
-                                ACE_static_cast (int, name_len)) == -1)
+                                reinterpret_cast<sockaddr *> (local_inet_addrs),
+                                static_cast<int> (name_len)) == -1)
                 error = 1;
 #endif /* ACE_HAS_LKSCTP */
             }
diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp
index 89fa0ba95eb..45eed58d1a4 100644
--- a/ace/SOCK_SEQPACK_Association.cpp
+++ b/ace/SOCK_SEQPACK_Association.cpp
@@ -39,6 +39,33 @@ ACE_SOCK_SEQPACK_Association::close (void)
   return ACE_SOCK::close ();
 }
 
+// Developed according to the API discussed in 7.1.4 of
+// draft-ietf-tsvwg-sctpsocket-09.txt to abruptly free a transport
+// transport association's resources.
+int
+ACE_SOCK_SEQPACK_Association::abort (void)
+{
+  //
+  // setsockopt() SO_LINGER configures socket to reap immediately.
+  // Normal close then aborts the association.
+  //
+  linger slinger;
+
+  slinger.l_onoff = 1;
+  slinger.l_linger = 0;
+
+  if (-1 == ACE_OS::setsockopt (this->get_handle (),
+                                SOL_SOCKET,
+                                SO_LINGER,
+                                reinterpret_cast<const char *> (&slinger),
+                                sizeof (linger)))
+  {
+    return -1;
+  }
+
+  return this->close ();
+}
+
 int
 ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &size) const
 {
@@ -150,20 +177,19 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz
   ** the number of bytes written to addr_structs.
   ** Use name_size to get the data types right across the call.
   */
-  int name_size = ACE_static_cast (int, physical_size);
+  int name_size = static_cast<int> (physical_size);
   if (ACE_OS::getsockname (this->get_handle (),
-                           ACE_reinterpret_cast (sockaddr *,
-                                                 addr_structs.get()),
+                           reinterpret_cast<sockaddr *> (addr_structs.get()),
                            &name_size) == -1)
     return -1;
 
   /* Calculate the NEW physical size of the array */
   name_size /= sizeof (sockaddr_in);
-  size = ACE_static_cast (size_t, name_size);
+  size = static_cast<size_t> (name_size);
 
   /* Copy each sockaddr_in to the address structure of an ACE_Addr from
      the passed-in array */
-  const int addrlen (ACE_static_cast (int, sizeof (sockaddr_in)));
+  const int addrlen (static_cast<int> (sizeof (sockaddr_in)));
   for (int i = 0; i < name_size; ++i)
     {
       addrs[i].set_addr (&(addr_structs[i]), addrlen);
@@ -285,20 +311,19 @@ ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &si
   ** the number of bytes written to addr_structs.
   ** Use name_size to get the data types right across the call.
   */
-  int name_size = ACE_static_cast (int, physical_size);
+  int name_size = static_cast<int> (physical_size);
   if (ACE_OS::getpeername (this->get_handle (),
-                           ACE_reinterpret_cast (sockaddr *,
-                                                 addr_structs.get()),
+                           reinterpret_cast<sockaddr *> (addr_structs.get()),
                            &name_size) == -1)
     return -1;
 
   /* Calculate the NEW physical size of the array */
   name_size /= sizeof (sockaddr_in);
-  size = ACE_static_cast (size_t, name_size);
+  size = static_cast<size_t> (name_size);
 
   /* Copy each sockaddr_in to the address structure of an ACE_Addr from
      the passed-in array */
-  const int addrlen (ACE_static_cast (int, sizeof (sockaddr_in)));
+  const int addrlen (static_cast<int> (sizeof (sockaddr_in)));
   for (int i = 0; i < name_size; ++i)
     {
       addrs[i].set_addr (&(addr_structs[i]), addrlen);
diff --git a/ace/SOCK_SEQPACK_Association.h b/ace/SOCK_SEQPACK_Association.h
index 9f25a91e6f0..b2ea5896adb 100644
--- a/ace/SOCK_SEQPACK_Association.h
+++ b/ace/SOCK_SEQPACK_Association.h
@@ -174,6 +174,12 @@ public:
    * the close to avoid losing data).  */
   int close (void);
 
+  /**
+   * Abort the association according to RFC 2960 9.1 through the API
+   * in draft-ietf-tsvwg-sctpsocket-09 7.1.4.
+   */
+  int abort (void);
+
   // = Meta-type info
   typedef ACE_Multihomed_INET_Addr PEER_ADDR;
 
diff --git a/ace/SOCK_SEQPACK_Connector.cpp b/ace/SOCK_SEQPACK_Connector.cpp
index 3db27f24e26..b7cb5471755 100644
--- a/ace/SOCK_SEQPACK_Connector.cpp
+++ b/ace/SOCK_SEQPACK_Connector.cpp
@@ -93,8 +93,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
 
   if (local_sap != ACE_Addr::sap_any)
     {
-      sockaddr *laddr = ACE_reinterpret_cast (sockaddr *,
-                                              local_sap.get_addr ());
+      sockaddr *laddr = reinterpret_cast<sockaddr *> (local_sap.get_addr ());
       int size = local_sap.get_size ();
 
       if (ACE_OS::bind (new_association.get_handle (),
@@ -149,8 +148,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
 
       // bind to the primary addr first
       if (ACE_OS::bind(new_association.get_handle (),
-                       ACE_reinterpret_cast(sockaddr *,
-                       &(local_inet_addrs[0])),
+                       reinterpret_cast<sockaddr *> (&(local_inet_addrs[0])),
                        sizeof(sockaddr)))
       {
         ACE_Errno_Guard error (errno);
@@ -167,8 +165,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
 
         // get sockaddr_in for the local handle
         if (ACE_OS::getsockname(new_association.get_handle (),
-                                ACE_reinterpret_cast(sockaddr *,
-                                                     &portst),
+                                reinterpret_cast<sockaddr *> (&portst),
 		                                     &sn))
         {
           ACE_Errno_Guard error (errno);
@@ -192,7 +189,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
 
         // bind other ifaces
         if (sctp_bindx(new_association.get_handle(),
-                       ACE_reinterpret_cast(sockaddr *, local_sockaddr),
+                       reinterpret_cast<sockaddr *> (local_sockaddr),
                        num_addresses - 1,
                        SCTP_BINDX_ADD_ADDR))
         {
@@ -208,9 +205,8 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
       // Call bind
       size_t name_len = (sizeof (sockaddr_in)) * num_addresses;
       if (ACE_OS::bind (new_association.get_handle (),
-                        ACE_reinterpret_cast (sockaddr *,
-                                              local_inet_addrs),
-                        ACE_static_cast (int, name_len)) == -1)
+                        reinterpret_cast<sockaddr *> (local_inet_addrs),
+                        static_cast<int> (name_len)) == -1)
         {
           // Save/restore errno.
           ACE_Errno_Guard error (errno);
@@ -295,8 +291,7 @@ ACE_SOCK_SEQPACK_Connector::connect (ACE_SOCK_SEQPACK_Association &new_associati
     return -1;
 
   int result = ACE_OS::connect (new_association.get_handle (),
-                                ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+                                reinterpret_cast<sockaddr *> (remote_sap.get_addr ()),
                                 remote_sap.get_size ());
 
   return this->shared_connect_finish (new_association,
@@ -328,8 +323,7 @@ ACE_SOCK_SEQPACK_Connector::connect (ACE_SOCK_SEQPACK_Association &new_associati
     return -1;
 
   int result = ACE_OS::connect (new_association.get_handle (),
-                                ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+                                reinterpret_cast<sockaddr *> (remote_sap.get_addr ()),
                                 remote_sap.get_size ());
 
   return this->shared_connect_finish (new_association,
@@ -374,8 +368,7 @@ ACE_SOCK_SEQPACK_Connector::complete (ACE_SOCK_SEQPACK_Association &new_associat
   if (remote_sap != 0)
     {
       int len = remote_sap->get_size ();
-      sockaddr *addr = ACE_reinterpret_cast (sockaddr *,
-                                             remote_sap->get_addr ());
+      sockaddr *addr = reinterpret_cast<sockaddr *> (remote_sap->get_addr ());
       if (ACE_OS::getpeername (h,
                                addr,
                                &len) == -1)
diff --git a/ace/SPIPE.cpp b/ace/SPIPE.cpp
index a87967a6249..f69c8b63b33 100644
--- a/ace/SPIPE.cpp
+++ b/ace/SPIPE.cpp
@@ -48,6 +48,9 @@ ACE_SPIPE::close (void)
   if (this->get_handle () != ACE_INVALID_HANDLE)
     {
       result = ACE_OS::close (this->get_handle ());
+#if defined (ACE_HAS_STREAM_PIPES)
+      result = (ACE_OS::close (duplex_pipe_handle_) || result);
+#endif /* ACE_HAS_STREAM_PIPES */
       this->set_handle (ACE_INVALID_HANDLE);
     }
   return result;
@@ -64,3 +67,12 @@ ACE_SPIPE::remove (void)
   return ACE_OS::unlink (this->local_addr_.get_path_name ()) == -1 || result == -1 ? -1 : 0;
 }
 
+#if defined (ACE_HAS_STREAM_PIPES)
+/// Temporary store of duplex pipe handle.
+void
+ACE_SPIPE::set_duplex_handle (ACE_HANDLE handle)
+{
+  ACE_TRACE ("ACE_SPIPE::set_duplex_handle");
+  this->duplex_pipe_handle_ = handle;
+}
+#endif /* ACE_HAS_STREAM_PIPES */
diff --git a/ace/SPIPE.h b/ace/SPIPE.h
index 9524698baa2..61278aac517 100644
--- a/ace/SPIPE.h
+++ b/ace/SPIPE.h
@@ -81,9 +81,21 @@ public:
   /// Dump the state of an object.
   void dump (void) const;
 
+#if defined (ACE_HAS_STREAM_PIPES)
+  /// Temporary store of duplex pipe handle.
+  void set_duplex_handle (ACE_HANDLE handle);
+#endif /* ACE_HAS_STREAM_PIPES */
+
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
+private:
+#if defined (ACE_HAS_STREAM_PIPES)
+  /// Duplex to the pipe I/O handle.
+  /// Stored here for latter cleaning.
+  ACE_HANDLE duplex_pipe_handle_;
+#endif /* ACE_HAS_STREAM_PIPES */
+
 protected:
   /// Ensure that this class is an abstract base class
   ACE_SPIPE (void);
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp
index deeead76ef3..84e3d517b2c 100644
--- a/ace/SPIPE_Acceptor.cpp
+++ b/ace/SPIPE_Acceptor.cpp
@@ -94,6 +94,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
                             this->local_addr_.get_path_name ()) == -1)
     return -1;
 
+  this->set_duplex_handle (spipe[0]);
   this->set_handle (spipe[1]);
   return 0;
 
diff --git a/ace/SSL/Makefile.am b/ace/SSL/Makefile.am
index ce69f86b01d..cfc7aeffc90 100644
--- a/ace/SSL/Makefile.am
+++ b/ace/SSL/Makefile.am
@@ -1,20 +1,32 @@
-##----------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile.am for ACE_SSL library
-##----------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) @ACE_TLS_CPPFLAGS@
+includedir = @includedir@/ace/SSL
+pkgconfigdatadir = ${prefix}/lib/pkgconfig
 
-lib_LTLIBRARIES = libACE_SSL.la
-libACE_SSL_la_LIBADD = $(top_builddir)/ace/libACE.la @ACE_TLS_LIBS@
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
-## ACE_SSL library version is same as ACE's version.
-libACE_SSL_la_LDFLAGS = -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+nobase_include_HEADERS =
+lib_LTLIBRARIES =
+## Makefile.SSL.am 
+
+if BUILD_SSL
+lib_LTLIBRARIES += libACE_SSL.la
+
+libACE_SSL_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(SSL_ROOT)/include \
+  -I/usr/kerberos/include \
+  -DACE_SSL_BUILD_DLL
 
 libACE_SSL_la_SOURCES = \
   SSL_Asynch_BIO.cpp \
@@ -25,7 +37,13 @@ libACE_SSL_la_SOURCES = \
   SSL_SOCK_Connector.cpp \
   SSL_SOCK_Stream.cpp
 
-HEADER_FILES = \
+libACE_SSL_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+
+libACE_SSL_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la -lssl -lcrypto
+
+nobase_include_HEADERS += \
   SSL_Asynch_BIO.h \
   SSL_Asynch_Stream.h \
   SSL_Context.h \
@@ -34,15 +52,24 @@ HEADER_FILES = \
   SSL_SOCK_Acceptor.h \
   SSL_SOCK_Connector.h \
   SSL_SOCK_Stream.h \
-  sslconf.h
-
-INLINE_FILES = \
+  sslconf.h \
+  SSL_Context.inl \
   SSL_SOCK.i \
   SSL_SOCK_Acceptor.i \
   SSL_SOCK_Connector.i \
-  SSL_SOCK_Stream.i \
-  SSL_Context.inl
+  SSL_SOCK_Stream.i
+
+pkgconfigdata_DATA = ACE_SSL.pc
+
+ACE_SSL.pc: ${top_builddir}/config.status ACE_SSL.pc.in
+	${top_builddir}/config.status --file $@:${srcdir}/ACE_SSL.pc.in
+
+endif BUILD_SSL
 
-pkginclude_HEADERS = \
-  $(HEADER_FILES) \
-  $(INLINE_FILES)
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp
index 21c10034531..54555358e2e 100644
--- a/ace/Sched_Params.cpp
+++ b/ace/Sched_Params.cpp
@@ -87,7 +87,8 @@ ACE_Sched_Params::priority_min (const Policy policy,
           return ACE_THR_PRI_OTHER_MIN;
         }
     }
-#elif defined (ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED)
+#elif defined(ACE_HAS_PTHREADS) && \
+      ( !defined(ACE_LACKS_SETSCHED) || defined (ACE_TANDEM_T1248_PTHREADS) )
 
   switch (scope)
     {
@@ -189,7 +190,8 @@ ACE_Sched_Params::priority_max (const Policy policy,
           return ACE_THR_PRI_OTHER_MAX;
         }
     }
-#elif defined(ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED)
+#elif defined(ACE_HAS_PTHREADS) && \
+      ( !defined(ACE_LACKS_SETSCHED) || defined (ACE_TANDEM_T1248_PTHREADS) )
 
   switch (scope)
     {
@@ -269,7 +271,8 @@ ACE_Sched_Params::next_priority (const Policy policy,
       default:
         return priority;  // unknown priority:  should never get here
     }
-#elif defined(ACE_HAS_THREADS) && !defined(ACE_LACKS_SETSCHED)
+#elif defined(ACE_HAS_THREADS) && \
+      ( !defined(ACE_LACKS_SETSCHED) || defined (ACE_TANDEM_T1248_PTHREADS) )
   // including STHREADS, and PTHREADS
   const int max = priority_max (policy, scope);
   return priority < max  ?  priority + 1  :  max;
@@ -312,7 +315,8 @@ ACE_Sched_Params::previous_priority (const Policy policy,
       default:
         return priority;  // unknown priority:  should never get here
     }
-#elif defined (ACE_HAS_THREADS) && !defined(ACE_LACKS_SETSCHED)
+#elif defined(ACE_HAS_THREADS) && \
+      ( !defined(ACE_LACKS_SETSCHED) || defined (ACE_TANDEM_T1248_PTHREADS) )
   // including STHREADS and PTHREADS
   const int min = priority_min (policy, scope);
 
diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp
index 294417c0511..735babf577a 100644
--- a/ace/Select_Reactor_Base.cpp
+++ b/ace/Select_Reactor_Base.cpp
@@ -686,7 +686,7 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r,
   if (disable_notify_pipe == 0)
     {
       this->select_reactor_ =
-        ACE_dynamic_cast (ACE_Select_Reactor_Impl *, r);
+        dynamic_cast<ACE_Select_Reactor_Impl *> (r);
 
       if (select_reactor_ == 0)
         {
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 8ae95b9ebb9..e4a08a4f74b 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -714,7 +714,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler
 
 #if (ACE_NSIG > 0)  &&  !defined (CHORUS)
   for (int s = 1; s < ACE_NSIG; ++s)
-    if (sigset.is_member (s)
+    if ((sigset.is_member (s) == 1)
         && this->signal_handler_->register_handler (s,
                                                     new_sh,
                                                     new_disp) == -1)
@@ -736,7 +736,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler
 
 #if (ACE_NSIG > 0)  &&  !defined (CHORUS)
   for (int s = 1; s < ACE_NSIG; ++s)
-    if (sigset.is_member (s)
+    if ((sigset.is_member (s) == 1)
         && this->signal_handler_->remove_handler (s) == -1)
       result = -1;
 #else  /* ACE_NSIG <= 0  ||  CHORUS */
@@ -1203,10 +1203,14 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_notification_handlers
   int n =
     this->notify_handler_->dispatch_notifications (number_of_active_handles,
                                                    dispatch_set.rd_mask_);
+
   if (n == -1)
     return -1;
   else
-    number_of_handlers_dispatched += n;
+    {
+      number_of_handlers_dispatched += n;
+      number_of_active_handles -= n;
+    }
 
   // Same as dispatch_timer_handlers
   // No need to do anything with the state changed. That is because
diff --git a/ace/Semaphore.cpp b/ace/Semaphore.cpp
index 374e4cad282..97e0e289bd1 100644
--- a/ace/Semaphore.cpp
+++ b/ace/Semaphore.cpp
@@ -33,7 +33,7 @@ ACE_Semaphore::ACE_Semaphore (unsigned int count,
   : removed_ (0)
 {
 // ACE_TRACE ("ACE_Semaphore::ACE_Semaphore");
-#if defined(ACE_LACKS_UNNAMED_SEMAPHORE)
+#if defined(ACE_LACKS_UNNAMED_SEMAPHORE) || !defined (ACE_HAS_SHM_OPEN)
 // if the user does not provide a name, we generate a unique name here
   ACE_TCHAR iname[ACE_UNIQUE_NAME_LEN];
   if (name == 0)
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index f47536dfbfc..58d164b0de7 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -18,9 +18,12 @@
 #include "ace/Reactor.h"
 #include "ace/Thread_Manager.h"
 #include "ace/DLL.h"
-#include "ace/OS_NS_stdio.h"
 #include "ace/XML_Svc_Conf.h"
+#include "ace/SString.h"
+#include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_time.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_sys_stat.h"
 
 ACE_RCSID (ace,
            Service_Config,
@@ -54,6 +57,7 @@ sig_atomic_t ACE_Service_Config::reconfig_occurred_ = 0;
   // = Set by command-line options.
 int ACE_Service_Config::be_a_daemon_ = 0;
 int ACE_Service_Config::no_static_svcs_ = 1;
+ACE_TCHAR* ACE_Service_Config::pid_file_name_ = 0;
 
 // Number of the signal used to trigger reconfiguration.
 int ACE_Service_Config::signum_ = SIGHUP;
@@ -157,7 +161,7 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[])
   ACE_TRACE ("ACE_Service_Config::parse_args");
   ACE_Get_Opt getopt (argc,
                       argv,
-                      ACE_LIB_TEXT ("bdf:k:nys:S:"),
+                      ACE_LIB_TEXT ("bdf:k:nyp:s:S:"),
                       1); // Start at argv[1].
 
   if (ACE_Service_Config::init_svc_conf_file_queue () == -1)
@@ -189,6 +193,9 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[])
       case 'y':
         ACE_Service_Config::no_static_svcs_ = 0;
         break;
+      case 'p':
+        ACE_Service_Config::pid_file_name_ = getopt.opt_arg ();
+        break;
       case 's':
         {
           // There's no point in dealing with this on NT since it
@@ -424,7 +431,15 @@ ACE_Service_Config::process_file (const ACE_TCHAR file[])
                     ACE_LIB_TEXT ("%p\n"),
                     file));
 
-      errno = ENOENT;
+      // Use stat to find out if the file exists.  I didn't use access()
+      // because stat is better supported on most non-unix platforms.
+      ACE_stat exists;
+      if (ACE_OS::stat (file, &exists) == 0)
+        // If it exists, but we couldn't open it for reading then we
+        // must not have permission to read it.
+        errno = EPERM;
+      else
+        errno = ENOENT;
       result = -1;
     }
   else
@@ -663,6 +678,21 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[],
   if (ACE_Service_Config::be_a_daemon_)
     ACE_Service_Config::start_daemon ();
 
+  // Write process id to file.
+  if (ACE_Service_Config::pid_file_name_ != 0)
+    {
+      FILE* pidf = ACE_OS::fopen (ACE_Service_Config::pid_file_name_,
+				  ACE_LIB_TEXT("w"));
+
+      if (pidf != 0)
+        {
+          ACE_OS::fprintf (pidf,
+                           "%ld\n",
+                           static_cast<long> (ACE_OS::getpid()));
+          ACE_OS::fclose (pidf);
+        }
+    }
+
   u_long flags = log_msg->flags ();
 
   if (flags == 0)
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index bbc73166a02..ff8363bc345 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -24,8 +24,7 @@
 
 #include "ace/Unbounded_Queue.h"
 #include "ace/Unbounded_Set.h"
-#include "ace/SString.h"
-#include "ace/XML_Svc_Conf.h"
+#include "ace/SStringfwd.h"
 #include "ace/OS_NS_signal.h"
 
 // Forward decl.
@@ -41,7 +40,9 @@ class ACE_DLL;
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
 class ACE_Svc_Conf_Param;
-#endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
+#else
+class ACE_XML_Svc_Conf;
+#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
 
 extern "C"
 {
@@ -106,15 +107,15 @@ typedef ACE_Unbounded_Queue_Iterator<ACE_TString>
  * @brief Supplies common server operations for dynamic and static
  * configuration of services.
  *
- * The <ACE_Service_Config> uses the Monostate pattern.  Therefore,
+ * The ACE_Service_Config uses the Monostate pattern.  Therefore,
  * you can only have one of these instantiated per-process.
- * NOTE: the signal_handler_ static member is allocated by the
- * <ACE_Object_Manager>.  The <ACE_Service_Config> constructor
+ * @note The signal_handler_ static member is allocated by the
+ * ACE_Object_Manager.  The ACE_Service_Config constructor
  * uses signal_handler_.  Therefore, if the program has any
- * static <ACE_Service_Config> objects, there might be
+ * static ACE_Service_Config objects, there might be
  * initialization order problems.  They can be minimized, but
  * not eliminated, by _not_ #defining
- * <ACE_HAS_NONSTATIC_OBJECT_MANAGER>.
+ * ACE_HAS_NONSTATIC_OBJECT_MANAGER.
  */
 class ACE_Export ACE_Service_Config
 {
@@ -141,12 +142,12 @@ public:
 
   /**
    * Performs an open without parsing command-line arguments.  The
-   * <logger_key> indicates where to write the logging output, which
+   * @a logger_key indicates where to write the logging output, which
    * is typically either a STREAM pipe or a socket address.  If
-   * <ignore_default_svc_conf_file> is non-0 then the "svc.conf" file
-   * will be ignored.  If <ignore_debug_flag> is non-0 then the
+   * @a ignore_default_svc_conf_file is non-0 then the "svc.conf" file
+   * will be ignored.  If @a ignore_debug_flag is non-0 then the
    * application is responsible for setting the
-   * <ACE_Log_Msg::priority_mask> appropriately.  Returns number of
+   * @c ACE_Log_Msg::priority_mask() appropriately.  Returns number of
    * errors that occurred on failure and 0 otherwise.
    */
   static int open_i (const ACE_TCHAR program_name[],
@@ -156,15 +157,15 @@ public:
 
   /**
    * Performs an open without parsing command-line arguments.  The
-   * <logger_key> indicates where to write the logging output, which
+   * @a logger_key indicates where to write the logging output, which
    * is typically either a STREAM pipe or a socket address.  If
-   * <ignore_static_svcs> is 1 then static services are not loaded,
-   * otherwise, they are loaded.  If <ignore_default_svc_conf_file> is
+   * @a ignore_static_svcs is 1 then static services are not loaded,
+   * otherwise, they are loaded.  If @a ignore_default_svc_conf_file is
    * non-0 then the <svc.conf> configuration file will be ignored.
    * Returns zero upon success, -1 if the file is not found or cannot
    * be opened (errno is set accordingly), otherwise returns the
    * number of errors encountered loading the services in the
-   * specified svc.conf configuration file.  If <ignore_debug_flag> is
+   * specified svc.conf configuration file.  If @a ignore_debug_flag is
    * non-0 then the application is responsible for setting the
    * <ACE_Log_Msg::priority_mask> appropriately.
    */
@@ -196,6 +197,7 @@ public:
    *        overrides the @a ignore_static_svcs parameter value.
    * - '-n' Explicitly disables the use of static services. This flag
    *        overrides the @a ignore_static_svcs parameter value.
+   * - '-p' Specifies a pathname which is used to store the process id.
    * - '-s' Specifies a signal number other than SIGHUP to trigger reprocessing
    *        of the configuration file(s). Ignored for platforms that do not
    *        have POSIX signals, such as Windows.
@@ -217,7 +219,7 @@ public:
    *                          for setting the @c ACE_Log_Msg::priority_mask
    *                          appropriately.
    *
-   * @retval -1   the configuration file is not found or cannot
+   * @retval -1   The configuration file is not found or cannot
    *              be opened (errno is set accordingly).
    * @retval  0   Success.
    * @retval  >0  The number of errors encountered while processing
@@ -244,8 +246,8 @@ public:
 
   /**
    * Perform user-specified close hooks on all of the configured
-   * services in the <Service_Repository>, then delete the
-   * <Service_Repository> itself.  Returns 0.
+   * services in the Service_Repository, then delete the
+   * Service_Repository itself.  Returns 0.
    */
   static int close_svcs (void);
 
@@ -274,16 +276,16 @@ public:
   static int initialize (const ACE_Service_Type *,
                          const ACE_TCHAR *parameters);
 
-  /// Initialize and activate a statically <svc_name> service.
+  /// Initialize and activate a statically @a svc_name service.
   static int initialize (const ACE_TCHAR *svc_name,
                          const ACE_TCHAR *parameters);
 
-  /// Resume a <svc_name> that was previously suspended or has not yet
+  /// Resume a @a svc_name that was previously suspended or has not yet
   /// been resumed (e.g., a static service).
   static int resume (const ACE_TCHAR svc_name[]);
 
   /**
-   * Suspend <svc_name>.  Note that this will not unlink the service
+   * Suspend @a svc_name.  Note that this will not unlink the service
    * from the daemon if it was dynamically linked, it will mark it as
    * being suspended in the Service Repository and call the <suspend>
    * member function on the appropriate <ACE_Service_Object>.  A
@@ -292,7 +294,7 @@ public:
    */
   static int suspend (const ACE_TCHAR svc_name[]);
 
-  /// Totally remove <svc_name> from the daemon by removing it
+  /// Totally remove @a svc_name from the daemon by removing it
   /// from the ACE_Reactor, and unlinking it if necessary.
   static int remove (const ACE_TCHAR svc_name[]);
 
@@ -319,7 +321,7 @@ public:
   /// directives.
   static int process_file (const ACE_TCHAR file[]);
 
-  /// Process one service configuration <directive>, which is passed as
+  /// Process one service configuration @a directive, which is passed as
   /// a string.  Returns the number of errors that occurred.
   static int process_directive (const ACE_TCHAR directive[]);
 
@@ -397,7 +399,7 @@ protected:
   static int start_daemon (void);
 
   /// Add the default statically-linked services to the
-  /// <ACE_Service_Repository>.
+  /// ACE_Service_Repository.
   static int load_static_svcs (void);
 
 private:
@@ -425,6 +427,9 @@ private:
   /// Shall we become a daemon process?
   static int be_a_daemon_;
 
+  /// Pathname of file to write process id.
+  static ACE_TCHAR *pid_file_name_;
+
   /// Should we avoid loading the static services?
   static int no_static_svcs_;
 
@@ -448,11 +453,6 @@ private:
 #include "ace/Service_Config.inl"
 #endif /* __ACE_INLINE__ */
 
-// These must go here to avoid circular includes...  (only left here
-// for to not break applications which rely on this - no real need any
-// longer)
-#include "ace/Reactor.h"
-#include "ace/Svc_Conf_Tokens.h"
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h
index f2805abe74a..6c7d745e65e 100644
--- a/ace/Service_Manager.h
+++ b/ace/Service_Manager.h
@@ -61,7 +61,7 @@ protected:
   // = Perform the various meta-services.
 
   /// Trigger a reconfiguration of the Service Configurator by
-  //re-reading its local <svc.conf> file.
+  /// re-reading its local <svc.conf> file.
   virtual int reconfigure_services (void);
 
   /// Determine all the services offered by this daemon and return the
diff --git a/ace/Service_Object.cpp b/ace/Service_Object.cpp
index e92d4119bf5..42786291f87 100644
--- a/ace/Service_Object.cpp
+++ b/ace/Service_Object.cpp
@@ -61,7 +61,7 @@ ACE_Service_Type::~ACE_Service_Type (void)
 
   this->fini ();
 
-  delete [] (ACE_TCHAR *) this->name_;
+  delete [] const_cast <ACE_TCHAR *> (this->name_);
 }
 
 int
@@ -79,7 +79,7 @@ int
 ACE_Service_Type::suspend (void) const
 {
   ACE_TRACE ("ACE_Service_Type::suspend");
-  ((ACE_Service_Type *) this)->active_ = 0;
+  (const_cast<ACE_Service_Type *> (this))->active_ = 0;
   return this->type_->suspend ();
 }
 
@@ -87,7 +87,7 @@ int
 ACE_Service_Type::resume (void) const
 {
   ACE_TRACE ("ACE_Service_Type::resume");
-  ((ACE_Service_Type *) this)->active_ = 1;
+  (const_cast<ACE_Service_Type *> (this))->active_ = 1;
   return this->type_->resume ();
 }
 
@@ -121,6 +121,6 @@ ACE_Service_Type::name (const ACE_TCHAR *n)
 {
   ACE_TRACE ("ACE_Service_Type::name");
 
-  delete [] (ACE_TCHAR *) this->name_;
+  delete [] const_cast <ACE_TCHAR *> (this->name_);
   this->name_ = ACE::strnew (n);
 }
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index b44fddf9d66..d96e5c59255 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -60,7 +60,7 @@ class ACE_Service_Type_Impl;
  * @class ACE_Service_Type
  *
  * @brief Keeps track of information related to the various
- * <ACE_Service_Type_Impl> subclasses.
+ * ACE_Service_Type_Impl subclasses.
  *
  * This class acts as the interface of the "Bridge" pattern.
  */
@@ -153,13 +153,13 @@ class ACE_Export ACE_Service_Object_Ptr
 {
 public:
   // = Initialization and termination methods.
-  /// Acquire ownership of the <so>.
+  /// Acquire ownership of the @a so.
   ACE_Service_Object_Ptr (ACE_Service_Object *so);
 
-  /// Release the held <ACE_Service_Object> by calling its <fini> hook.
+  /// Release the held ACE_Service_Object by calling its <fini> hook.
   ~ACE_Service_Object_Ptr (void);
 
-  /// Smart pointer to access the underlying <ACE_Service_Object>.
+  /// Smart pointer to access the underlying ACE_Service_Object.
   ACE_Service_Object *operator-> ();
 
 private:
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index a84a4874785..c872df591ff 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -112,8 +112,7 @@ ACE_Service_Repository::open (int size)
                   ACE_Service_Type *[size],
                   -1);
 
-  this->service_vector_ = ACE_const_cast (const ACE_Service_Type **,
-                                          temp);
+  this->service_vector_ = const_cast<const ACE_Service_Type **> (temp);
   this->total_size_ = size;
   return 0;
 }
@@ -135,7 +134,7 @@ int
 ACE_Service_Repository::fini (void)
 {
   ACE_TRACE ("ACE_Service_Repository::fini");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
   int retval = 0;
 
   if (this->service_vector_ != 0)
@@ -154,8 +153,7 @@ ACE_Service_Repository::fini (void)
                         ACE_LIB_TEXT ("finalizing %s\n"),
                         this->service_vector_[i]->name ()));
           ACE_Service_Type *s =
-            ACE_const_cast (ACE_Service_Type *,
-                            this->service_vector_[i]);
+            const_cast<ACE_Service_Type *> (this->service_vector_[i]);
           // Collect errors.
           retval += s->fini ();
         }
@@ -170,7 +168,7 @@ int
 ACE_Service_Repository::close (void)
 {
   ACE_TRACE ("ACE_Service_Repository::close");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
 
   if (this->service_vector_ != 0)
     {
@@ -182,8 +180,7 @@ ACE_Service_Repository::close (void)
 
       for (int i = this->current_size_ - 1; i >= 0; i--)
         {
-          ACE_Service_Type *s = ACE_const_cast (ACE_Service_Type *,
-                                                this->service_vector_[i]);
+          ACE_Service_Type *s = const_cast<ACE_Service_Type *> (this->service_vector_[i]);
           --this->current_size_;
           delete s;
         }
@@ -248,7 +245,7 @@ ACE_Service_Repository::find (const ACE_TCHAR name[],
                               int ignore_suspended)
 {
   ACE_TRACE ("ACE_Service_Repository::find");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
 
   return this->find_i (name, srp, ignore_suspended);
 }
@@ -261,37 +258,55 @@ int
 ACE_Service_Repository::insert (const ACE_Service_Type *sr)
 {
   ACE_TRACE ("ACE_Service_Repository::insert");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
-  int i;
+  int return_value = -1;
+  ACE_Service_Type *s = 0;
 
-  // Check to see if this is a duplicate.
-  for (i = 0; i < this->current_size_; i++)
-    if (ACE_OS::strcmp (sr->name (),
-                        this->service_vector_[i]->name ()) == 0)
-      break;
+  {
+    ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
+    int i;
+
+    // Check to see if this is a duplicate.
+    for (i = 0; i < this->current_size_; i++)
+      if (ACE_OS::strcmp (sr->name (),
+                          this->service_vector_[i]->name ()) == 0)
+        break;
+
+    // Replacing an existing entry
+    if (i < this->current_size_)
+      {
+        // Check for self-assignment...
+        if (sr == this->service_vector_[i])
+          {
+            return_value = 0;
+          }
+        else
+          {
+            s = const_cast<ACE_Service_Type *> (this->service_vector_[i]);
+            this->service_vector_[i] = sr;
+            return_value = 0;
+          }
+      }
+    // Adding a new entry.
+    else if (i < this->total_size_)
+      {
+        this->service_vector_[i] = sr;
+        this->current_size_++;
+        return_value = 0;
+      }
+  }
 
-  // Replacing an existing entry
-  if (i < this->current_size_)
+  // delete outside the lock
+  if (s != 0)
     {
-      // Check for self-assignment...
-      if (sr == this->service_vector_[i])
-        return 0;
-      ACE_Service_Type *s = ACE_const_cast (ACE_Service_Type *,
-                                            this->service_vector_[i]);
       delete s;
-      this->service_vector_[i] = sr;
-      return 0;
     }
-  // Adding a new entry.
-  else if (i < this->total_size_)
+
+  if (return_value == -1)
     {
-      this->service_vector_[i] = sr;
-      this->current_size_++;
-      return 0;
+      ACE_OS::last_error (ENOSPC);
     }
 
-  ACE_OS::last_error (ENOSPC);
-  return -1;
+  return return_value;
 }
 
 // Re-resume a service that was previously suspended.
@@ -301,7 +316,7 @@ ACE_Service_Repository::resume (const ACE_TCHAR name[],
                                 const ACE_Service_Type **srp)
 {
   ACE_TRACE ("ACE_Service_Repository::resume");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
 
   int i = this->find_i (name, srp, 0);
 
@@ -319,7 +334,7 @@ ACE_Service_Repository::suspend (const ACE_TCHAR name[],
                                  const ACE_Service_Type **srp)
 {
   ACE_TRACE ("ACE_Service_Repository::suspend");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
   int i = this->find_i (name, srp, 0);
 
   if (i == -1)
@@ -340,14 +355,13 @@ ACE_Service_Repository::remove (const ACE_TCHAR name[], ACE_Service_Type **ps)
   ACE_TRACE ("ACE_Service_Repository::remove");
   ACE_Service_Type *s = 0;
   {
-    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
+    ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
     int i = this->find_i (name, 0, 0);
 
     if (i == -1)
       return -1;
 
-    s = ACE_const_cast (ACE_Service_Type *,
-                        this->service_vector_[i]);
+    s = const_cast<ACE_Service_Type *> (this->service_vector_[i]);
     --this->current_size_;
 
     if (this->current_size_ >= 1)
diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h
index 48b13290f5a..5479f59238e 100644
--- a/ace/Service_Repository.h
+++ b/ace/Service_Repository.h
@@ -22,7 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Default_Constants.h"
-#include "ace/Thread_Mutex.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 
 class ACE_Service_Type;
@@ -153,7 +153,7 @@ private:
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   /// Synchronization variable for the MT_SAFE Repository
-  ACE_Thread_Mutex lock_;
+  ACE_Recursive_Thread_Mutex lock_;
 #endif /* ACE_MT_SAFE */
 };
 
diff --git a/ace/Service_Repository.inl b/ace/Service_Repository.inl
index 6872433596e..f6e13326eab 100644
--- a/ace/Service_Repository.inl
+++ b/ace/Service_Repository.inl
@@ -15,7 +15,7 @@ ACE_INLINE int
 ACE_Service_Repository::current_size (void) const
 {
   ACE_TRACE ("ACE_Service_Repository::current_size");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, (ACE_Recursive_Thread_Mutex &) this->lock_, -1));
   return this->current_size_;
 }
 
@@ -26,7 +26,7 @@ ACE_INLINE int
 ACE_Service_Repository::total_size (void) const
 {
   ACE_TRACE ("ACE_Service_Repository::total_size");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, (ACE_Recursive_Thread_Mutex &) this->lock_, -1));
   return this->total_size_;
 }
 
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp
index fb0b13c1837..e941bf4a610 100644
--- a/ace/Service_Types.cpp
+++ b/ace/Service_Types.cpp
@@ -46,7 +46,7 @@ ACE_Service_Type_Impl::~ACE_Service_Type_Impl (void)
 
   // It's ok to call this, even though we may have already deleted it
   // in the fini() method since it would then be NULL.
-  delete [] (ACE_TCHAR *) this->name_;
+  delete [] const_cast <ACE_TCHAR *> (this->name_);
 }
 
 int
@@ -59,8 +59,8 @@ ACE_Service_Type_Impl::fini (void) const
                 this->name_,
                 this->flags_));
 
-  delete [] (ACE_TCHAR *) this->name_;
-  ((ACE_Service_Type_Impl *) this)->name_ = 0;
+  delete [] const_cast <ACE_TCHAR *> (this->name_);
+  (const_cast <ACE_Service_Type_Impl *> (this))->name_ = 0;
 
   if (ACE_BIT_ENABLED (this->flags_,
                        ACE_Service_Type::DELETE_OBJ))
@@ -74,7 +74,7 @@ ACE_Service_Type_Impl::fini (void) const
 
   if (ACE_BIT_ENABLED (this->flags_,
                        ACE_Service_Type::DELETE_THIS))
-    delete (ACE_Service_Type_Impl *) this;
+    delete const_cast <ACE_Service_Type_Impl *> (this);
 
   return 0;
 }
diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index ef489e851fa..a87169c7dbb 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -85,7 +85,7 @@ protected:
  * @class ACE_Service_Object_Type
  *
  * @brief Define the methods for handling the configuration of
- * <ACE_Service_Objects>.
+ * ACE_Service_Objects.
  */
 class ACE_Export ACE_Service_Object_Type : public ACE_Service_Type_Impl
 {
@@ -110,7 +110,7 @@ public:
  * @class ACE_Module_Type
  *
  * @brief Define the methods for handling the configuration of
- * <ACE_Modules>.
+ * ACE_Modules.
  */
 class ACE_Export ACE_Module_Type : public ACE_Service_Type_Impl
 {
@@ -129,10 +129,10 @@ public:
   virtual int fini (void) const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
-  // Get the link pointer.
+  /// Get the link pointer.
   ACE_Module_Type *link (void) const;
 
-  // Set the link pointer.
+  /// Set the link pointer.
   void link (ACE_Module_Type *);
 
   /// Dump the state of an object.
@@ -142,7 +142,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-  /// Pointer to the next <ACE_Module_Type> in an <ACE_Stream_Type>.
+  /// Pointer to the next ACE_Module_Type in an ACE_Stream_Type.
   ACE_Module_Type *link_;
 };
 
@@ -150,7 +150,7 @@ private:
  * @class ACE_Stream_Type
  *
  * @brief Define the methods for handling the configuration of
- * <ACE_Streams>.
+ * ACE_Streams.
  */
 class ACE_Export ACE_Stream_Type : public ACE_Service_Type_Impl
 {
@@ -169,13 +169,13 @@ public:
   virtual int fini (void) const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
-  /// Add a new <ACE_Module> to the top of the <ACE_Stream>.
+  /// Add a new  ACE_Module to the top of the ACE_Stream.
   int push (ACE_Module_Type *new_module);
 
-  /// Search for <module> and remove it from the <ACE_Stream>.
+  /// Search for @a module and remove it from the ACE_Stream.
   int remove (ACE_Module_Type *module);
 
-  /// Locate the <ACE_Module> with <mod_name>.
+  /// Locate the ACE_Module with @a mod_name.
   ACE_Module_Type *find (const ACE_TCHAR *mod_name) const;
 
   /// Dump the state of an object.
@@ -185,7 +185,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-  /// Pointer to the head of the <ACE_Module> list.
+  /// Pointer to the head of the ACE_Module list.
   ACE_Module_Type *head_;
 };
 
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 24c72078cc0..ba6688c90e1 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -190,7 +190,7 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals,
 
 #if (ACE_NSIG > 0)  &&  !defined (CHORUS)
   for (int s = 1; s < ACE_NSIG; s++)
-    if (signals.is_member (s))
+    if ((signals.is_member (s)) == 1)
       ACE_OS::sigaction (s, &this->sa_, 0);
 #else  /* ACE_NSIG <= 0  ||  CHORUS */
   ACE_UNUSED_ARG (signals);
@@ -218,7 +218,7 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals,
 
 #if (ACE_NSIG > 0)  &&  !defined (CHORUS)
   for (int s = 1; s < ACE_NSIG; s++)
-    if (signals.is_member (s))
+    if ((signals.is_member (s)) == 1)
       ACE_OS::sigaction (s, &this->sa_, 0);
 #else  /* ACE_NSIG <= 0  ||  CHORUS */
   ACE_UNUSED_ARG (signals);
@@ -392,7 +392,7 @@ ACE_Sig_Handler::remove_handler (int signum,
       // Register either the new disposition or restore the default.
       return new_disp->register_action (signum, old_disp);
     }
-  else
+
     return -1;
 }
 
@@ -474,6 +474,10 @@ ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Handler_Ex sig_func,
   // ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter");
 }
 
+ACE_Sig_Adapter::~ACE_Sig_Adapter ()
+{
+}
+
 int
 ACE_Sig_Adapter::sigkey (void)
 {
@@ -693,8 +697,8 @@ ACE_Sig_Handlers::register_handler (int signum,
             return ace_sig_adapter->sigkey ();
         }
     }
-  else
-    return -1;
+
+  return -1;
 }
 
 // Remove the ACE_Event_Handler currently associated with <signum>.
diff --git a/ace/Signal.h b/ace/Signal.h
index 3cefd3ce112..f4c733c1135 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -14,6 +14,8 @@
 #define ACE_SIGNAL_HANDLER_H
 #include /**/ "ace/pre.h"
 
+#include "ace/config-lite.h"
+
 #if defined (ACE_DONT_INCLUDE_ACE_SIGNAL_H)
 # error ace/Signal.h was #included instead of signal.h by ace/OS_NS_signal.h:  fix!!!!
 #endif /* ACE_DONT_INCLUDE_ACE_SIGNAL_H */
@@ -43,15 +45,15 @@ class ACE_Export ACE_Sig_Set
 {
 public:
   // = Initialization and termination methods.
-  /// Initialize <sigset_> with <sigset>.  If <sigset> == 0 then fill
+  /// Initialize <sigset_> with @a sigset.  If @a sigset == 0 then fill
   /// the set.
   ACE_Sig_Set (sigset_t *sigset);
 
-  /// Initialize <sigset_> with <sigset>.  If <sigset> == 0 then fill
+  /// Initialize <sigset_> with @a sigset.  If @a sigset == 0 then fill
   /// the set.
   ACE_Sig_Set (ACE_Sig_Set *sigset);
 
-  /// If <fill> == 0 then initialize the <sigset_> to be empty, else
+  /// If @a fill == 0 then initialize the <sigset_> to be empty, else
   /// full.
   ACE_Sig_Set (int fill = 0);
 
diff --git a/ace/Signal.inl b/ace/Signal.inl
index df65d471f1c..0a28a773296 100644
--- a/ace/Signal.inl
+++ b/ace/Signal.inl
@@ -308,8 +308,3 @@ ACE_Sig_Handler::in_range (int signum)
   ACE_TRACE ("ACE_Sig_Handler::in_range");
   return signum > 0 && signum < ACE_NSIG;
 }
-
-ACE_INLINE
-ACE_Sig_Adapter::~ACE_Sig_Adapter (void)
-{
-}
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp
index 91d6cb5b89b..caa60a11b2a 100644
--- a/ace/Sock_Connect.cpp
+++ b/ace/Sock_Connect.cpp
@@ -350,7 +350,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
 {
   ACE_TRACE ("ACE::get_bcast_addr");
 
-#if !defined(ACE_WIN32)
+#if !defined(ACE_WIN32) && !defined(__INTERIX)
   ACE_HANDLE s = handle;
 
   if (s == ACE_INVALID_HANDLE)
@@ -488,8 +488,8 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
                         ACE_LIB_TEXT ("ioctl (get broadaddr)")));
           else
             {
-              ACE_OS::memcpy (ACE_reinterpret_cast(sockaddr_in *, &ip_addr),
-                              ACE_reinterpret_cast(sockaddr_in *, &if_req.ifr_broadaddr),
+              ACE_OS::memcpy (reinterpret_cast<sockaddr_in *> (&ip_addr),
+                              reinterpret_cast<sockaddr_in *> (&if_req.ifr_broadaddr),
                               sizeof if_req.ifr_broadaddr);
 
               ACE_OS::memcpy ((void *) &host_addr,
@@ -523,7 +523,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
   ACE_UNUSED_ARG (host_name);
   bcast_addr = (ACE_UINT32 (INADDR_BROADCAST));
   return 0;
-#endif /* !ACE_WIN32 */
+#endif /* !ACE_WIN32 && !__INTERIX */
 }
 
 // return an array of all configured IP interfaces on this host, count
@@ -587,7 +587,7 @@ ACE::get_ip_interfaces (size_t &count,
         continue;
 
       // We assume IPv4 addresses here
-      addrp = ACE_reinterpret_cast(struct sockaddr_in *, &(lpii->iiAddress));
+      addrp = reinterpret_cast<struct sockaddr_in *> (&(lpii->iiAddress));
       if (addrp->sin_addr.s_addr == INADDR_ANY)
         continue;
 
@@ -997,7 +997,7 @@ ACE::get_ip_interfaces (size_t &count,
           p_if->ifa_addr->sa_family == AF_INET)
         {
           struct sockaddr_in *addr =
-            ACE_reinterpret_cast(sockaddr_in *, p_if->ifa_addr);
+            reinterpret_cast<sockaddr_in *> (p_if->ifa_addr);
 
           // Sometimes the kernel returns 0.0.0.0 as the interface
           // address, skip those...
@@ -1098,7 +1098,7 @@ ACE::get_ip_interfaces (size_t &count,
         {
 #if !defined(_UNICOS)
           struct sockaddr_in *addr =
-            ACE_reinterpret_cast(sockaddr_in *, &pcur->ifr_addr);
+            reinterpret_cast<sockaddr_in *> (&pcur->ifr_addr);
 
           // Sometimes the kernel returns 0.0.0.0 as the interface
           // address, skip those...
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index 2b5ab69b28d..24b761132db 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -54,9 +54,9 @@ ACE_Singleton_Strategy<SVC_HANDLER>::open (SVC_HANDLER *sh,
 }
 
 template <class SVC_HANDLER> int
-ACE_DLL_Strategy<SVC_HANDLER>::open (const char dll_name[],
-                                     const char factory_function[],
-                                     const char svc_name[],
+ACE_DLL_Strategy<SVC_HANDLER>::open (const ACE_TCHAR dll_name[],
+                                     const ACE_TCHAR factory_function[],
+                                     const ACE_TCHAR svc_name[],
                                      ACE_Service_Repository *svc_rep,
                                      ACE_Thread_Manager *thr_mgr)
 {
@@ -95,7 +95,7 @@ ACE_DLL_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
       // Create an ACE_Service_Type containing the SVC_Handler and
       // insert into this->svc_rep_;
 
-      ACE_Service_Type_Impl *stp;
+      ACE_Service_Type_Impl *stp = 0;
       ACE_NEW_RETURN (stp,
                       ACE_Service_Object_Type (svc_handler,
                                                this->svc_name_),
@@ -475,7 +475,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cach
   this->recycling_strategy_ = 0;
 
   // Close down all cached service handlers.
-  CONNECTION_MAP_ENTRY *entry;
+  CONNECTION_MAP_ENTRY *entry = 0;
   for (CONNECTION_MAP_ITERATOR iterator (connection_map_);
        iterator.next (entry);
        iterator.advance ())
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index 95c09503cff..9dfcfc1f134 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -191,17 +191,17 @@ public:
 
   /// Initialize the DLL strategy based upon the service's DLL
   /// information contained in the <svc_dll_info> string.
-  ACE_DLL_Strategy (const char dll_name[],
-                    const char factory_function[],
-                    const char svc_name[],
+  ACE_DLL_Strategy (const ACE_TCHAR dll_name[],
+                    const ACE_TCHAR factory_function[],
+                    const ACE_TCHAR svc_name[],
                     ACE_Service_Repository *,
                     ACE_Thread_Manager * = 0);
 
   /// Initialize the DLL strategy based upon the service's DLL
   /// information contained in the <svc_dll_info> string.
-  int open (const char dll_name[],
-            const char factory_function[],
-            const char svc_name[],
+  int open (const ACE_TCHAR dll_name[],
+            const ACE_TCHAR factory_function[],
+            const ACE_TCHAR svc_name[],
             ACE_Service_Repository *,
             ACE_Thread_Manager * = 0);
 
@@ -220,14 +220,14 @@ protected:
   typedef ACE_Creation_Strategy<SVC_HANDLER> inherited;
 
   /// Name of the DLL to dynamically link.
-  char dll_name_[MAXPATHLEN + 1];
+  ACE_TCHAR dll_name_[MAXPATHLEN + 1];
 
   /// Name of the factory function in the shared library to use to
   /// obtain a pointer to the new SVC_HANDLER.
-  char factory_function_[MAXPATHLEN + 1];
+  ACE_TCHAR factory_function_[MAXPATHLEN + 1];
 
   /// Name of the service.
-  char svc_name_[MAXNAMELEN + 1];
+  ACE_TCHAR svc_name_[MAXNAMELEN + 1];
 
   /// Pointer to the <Service_Repository>.
   ACE_Service_Repository *svc_rep_;
@@ -289,7 +289,7 @@ protected:
  *
  * @brief Defines the interface for specifying a reactive concurrency
  * strategy for a SVC_HANDLER, where all upcalls to @c handle_*()
- * methods run in the reactor's thread of control.  
+ * methods run in the reactor's thread of control.
  *
  * This class provides a strategy that registers the
  * <SVC_HANDLER> with a <Reactor>.
@@ -352,7 +352,7 @@ protected:
  * to handle requests from clients concurrently via a
  * thread-per-connection model.  It behaves as a "thread factory",
  * spawning threads "on-demand" to run the service specified by a
- * user-supplied <SVC_HANDLER>.  
+ * user-supplied <SVC_HANDLER>.
  */
 template <class SVC_HANDLER>
 class ACE_Thread_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER>
diff --git a/ace/Strategies_T.inl b/ace/Strategies_T.inl
index 41f625a2063..97d4a9a00a9 100644
--- a/ace/Strategies_T.inl
+++ b/ace/Strategies_T.inl
@@ -95,9 +95,9 @@ ACE_Creation_Strategy<SVC_HANDLER>::~ACE_Creation_Strategy (void)
 }
 
 template <class SVC_HANDLER> ACE_INLINE
-ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const char dll_name[],
-                                                 const char factory_function[],
-                                                 const char svc_name[],
+ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const ACE_TCHAR dll_name[],
+                                                 const ACE_TCHAR factory_function[],
+                                                 const ACE_TCHAR svc_name[],
                                                  ACE_Service_Repository *svc_rep,
                                                  ACE_Thread_Manager *thr_mgr)
 {
@@ -122,7 +122,7 @@ template <class SVC_HANDLER> ACE_INLINE
 ACE_Concurrency_Strategy<SVC_HANDLER>::ACE_Concurrency_Strategy (int flags)
   : flags_ (flags)
 {
-  ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy");
+  ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::ACE_Concurrency_Strategy");
 }
 
 template <class SVC_HANDLER> ACE_INLINE
diff --git a/ace/Stream_Modules.cpp b/ace/Stream_Modules.cpp
index 6afe507f06b..3e4b4a6f1b7 100644
--- a/ace/Stream_Modules.cpp
+++ b/ace/Stream_Modules.cpp
@@ -143,7 +143,7 @@ ACE_Stream_Head<ACE_SYNCH_USE>::info (ACE_TCHAR **strp, size_t length) const
     return -1;
   else
     ACE_OS::strsncpy (*strp, name, length);
-  return ACE_static_cast (int, ACE_OS::strlen (name));
+  return static_cast<int> (ACE_OS::strlen (name));
 }
 
 template <ACE_SYNCH_DECL> int
@@ -286,7 +286,7 @@ ACE_Stream_Tail<ACE_SYNCH_USE>::info (ACE_TCHAR **strp, size_t length) const
     return -1;
   else
     ACE_OS::strsncpy (*strp, name, length);
-  return ACE_static_cast (int, ACE_OS::strlen (name));
+  return static_cast<int> (ACE_OS::strlen (name));
 }
 
 template <ACE_SYNCH_DECL> int
@@ -365,7 +365,7 @@ ACE_Thru_Task<ACE_SYNCH_USE>::info (ACE_TCHAR **strp,
     return -1;
   else
     ACE_OS::strsncpy (*strp, name, length);
-  return ACE_static_cast (int, ACE_OS::strlen (name));
+  return static_cast<int> (ACE_OS::strlen (name));
 }
 
 template <ACE_SYNCH_DECL> int
diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h
index dcf0cc2d089..064b33753c8 100644
--- a/ace/Stream_Modules.h
+++ b/ace/Stream_Modules.h
@@ -24,7 +24,7 @@
 /**
  * @class ACE_Stream_Head
  *
- * @brief Standard module that acts as the head of a ustream.
+ * @brief Standard module that acts as the head of a stream.
  */
 template <ACE_SYNCH_DECL>
 class ACE_Stream_Head : public ACE_Task<ACE_SYNCH_USE>
@@ -62,7 +62,7 @@ private:
 /**
  * @class ACE_Stream_Tail
  *
- * @brief Standard module that acts as the head of a ustream.
+ * @brief Standard module that acts as the head of a stream.
  */
 template <ACE_SYNCH_DECL>
 class ACE_Stream_Tail : public ACE_Task<ACE_SYNCH_USE>
diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp
index a55f940e3c5..77fe1c48529 100644
--- a/ace/String_Base.cpp
+++ b/ace/String_Base.cpp
@@ -73,7 +73,7 @@ ACE_String_Base<CHAR>::set (const CHAR *s,
         {
           this->buf_len_ = len;
           this->len_ = len;
-          this->rep_ = (CHAR *) s;
+          this->rep_ = const_cast <CHAR *> (s);
         }
       else
         {
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index 002d4d59b00..c34b71eedcb 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -172,9 +172,7 @@ module
                                                 svc_type,
                                                 ACE_SVC_CONF_PARAM->yyerrno);
           ACE_Stream_Type *st =
-            ACE_dynamic_cast (ACE_Stream_Type *,
-                              ACE_const_cast (ACE_Service_Type_Impl *,
-                                              module->record ()->type ()));
+            dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (module->record ()->type ()));
 
           if (mt->init (args.argc (), args.argv ()) == -1
               || st->push (mt) == -1)
@@ -224,9 +222,7 @@ module
                                             ACE_SVC_CONF_PARAM->yyerrno);
 
       ACE_Stream_Type *st =
-        ACE_dynamic_cast (ACE_Stream_Type *,
-                          ACE_const_cast (ACE_Service_Type_Impl *,
-                                          stream->record ()->type ()));
+        dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (stream->record ()->type ()));
       if (mt != 0 && st->remove (mt) == -1)
         {
           ACE_ERROR ((LM_ERROR,
@@ -363,9 +359,7 @@ ace_get_module (ACE_Static_Node *str_rec,
   const ACE_Service_Type_Impl *type = sr->type ();
   ACE_Stream_Type *st = sr == 0
     ? 0
-    : ACE_dynamic_cast (ACE_Stream_Type *,
-                        ACE_const_cast (ACE_Service_Type_Impl *,
-                                        type));
+    : dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (type));
   ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name);
 
   if (sr == 0 || st == 0 || mt == 0)
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index 96d83d8147e..9826310aebb 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -1079,9 +1079,7 @@ case 25:
                                                 svc_type,
                                                 ACE_SVC_CONF_PARAM->yyerrno);
           ACE_Stream_Type *st =
-            ACE_dynamic_cast (ACE_Stream_Type *,
-                              ACE_const_cast (ACE_Service_Type_Impl *,
-                                              module->record ()->type ()));
+            dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (module->record ()->type ()));
 
           if (mt->init (args.argc (), args.argv ()) == -1
               || st->push (mt) == -1)
@@ -1135,9 +1133,7 @@ case 29:
                                             ACE_SVC_CONF_PARAM->yyerrno);
 
       ACE_Stream_Type *st =
-        ACE_dynamic_cast (ACE_Stream_Type *,
-                          ACE_const_cast (ACE_Service_Type_Impl *,
-                                          stream->record ()->type ()));
+        dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (stream->record ()->type ()));
       if (mt != 0 && st->remove (mt) == -1)
         {
           ACE_ERROR ((LM_ERROR,
@@ -1495,9 +1491,7 @@ ace_get_module (ACE_Static_Node *str_rec,
   const ACE_Service_Type_Impl *type = sr->type ();
   ACE_Stream_Type *st = sr == 0
     ? 0
-    : ACE_dynamic_cast (ACE_Stream_Type *,
-                        ACE_const_cast (ACE_Service_Type_Impl *,
-                                        type));
+    : dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (type));
   ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name);
 
   if (sr == 0 || st == 0 || mt == 0)
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index 8a9173a4bb7..2fd4f15320e 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -26,8 +26,8 @@ class ACE_Connection_Recycling_Strategy;
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Task.h"
-#include "ace/Service_Config.h"
 #include "ace/Recyclable.h"
+#include "ace/Reactor.h"
 
 /**
  * @class ACE_Svc_Handler
diff --git a/ace/TLI.cpp b/ace/TLI.cpp
index 22c747bade0..3efa611ef74 100644
--- a/ace/TLI.cpp
+++ b/ace/TLI.cpp
@@ -129,15 +129,15 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen)
   struct t_optmgmt req, ret;
   ACE_NEW_RETURN (req.opt.buf, char[sizeof (struct t_opthdr) + optlen], -1);
 #  if (_XOPEN_SOURCE - 0 >= 500)
-  auto_ptr<char> req_opt_buf_p (ACE_reinterpret_cast (char*, req.opt.buf));
+  auto_ptr<char> req_opt_buf_p (reinterpret_cast<char*> (req.opt.buf));
 #  else
   ACE_Auto_Array_Ptr<char> req_opt_buf_p (req.opt.buf);
 #  endif /* XPG5 vs XPG4 */
   struct t_opthdr *opthdr =
-    ACE_reinterpret_cast (struct t_opthdr *, req.opt.buf);
+    reinterpret_cast<struct t_opthdr *> (req.opt.buf);
   ACE_NEW_RETURN (ret.opt.buf, char[sizeof (struct t_opthdr) + optlen], -1);
 #  if (_XOPEN_SOURCE - 0 >= 500)
-  auto_ptr<char> ret_opt_buf_p (ACE_reinterpret_cast (char*, ret.opt.buf));
+  auto_ptr<char> ret_opt_buf_p (reinterpret_cast<char*> (ret.opt.buf));
 #  else
   ACE_Auto_Array_Ptr<char> ret_opt_buf_p (ret.opt.buf);
 #  endif /* XPG5 vs XPG4 */
@@ -167,7 +167,7 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen)
       return -1;
     }
 
-  opthdr = ACE_reinterpret_cast (struct opthdr *, this->so_opt_req.opt.buf);
+  opthdr = reinterpret_cast<struct opthdr *> (this->so_opt_req.opt.buf);
   opthdr->level = level;
   opthdr->name  = option;
   opthdr->len   = OPTLEN (optlen);
@@ -194,15 +194,15 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen)
   struct t_optmgmt req, ret;
   ACE_NEW_RETURN (req.opt.buf, char[sizeof (struct t_opthdr)], -1);
 #  if (_XOPEN_SOURCE - 0 >= 500)
-  auto_ptr<char> req_opt_buf_p (ACE_reinterpret_cast (char*, req.opt.buf));
+  auto_ptr<char> req_opt_buf_p (reinterpret_cast<char*> (req.opt.buf));
 #  else
   ACE_Auto_Array_Ptr<char> req_opt_buf_p (req.opt.buf);
 #  endif /* XPG5 vs XPG4 */
   struct t_opthdr *opthdr =
-    ACE_reinterpret_cast (struct t_opthdr *, req.opt.buf);
+    reinterpret_cast<struct t_opthdr *> (req.opt.buf);
   ACE_NEW_RETURN (ret.opt.buf, char[sizeof (struct t_opthdr) + optlen], -1);
 #  if (_XOPEN_SOURCE - 0 >= 500)
-  auto_ptr<char> ret_opt_buf_p (ACE_reinterpret_cast (char*, ret.opt.buf));
+  auto_ptr<char> ret_opt_buf_p (reinterpret_cast<char*> (ret.opt.buf));
 #  else
   ACE_Auto_Array_Ptr<char> ret_opt_buf_p (ret.opt.buf);
 #  endif /* XPG5 vs XPG4 */
@@ -217,7 +217,7 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen)
     return -1;
   else
     {
-      opthdr = ACE_reinterpret_cast (struct t_opthdr *, ret.opt.buf);
+      opthdr = reinterpret_cast<struct t_opthdr *> (ret.opt.buf);
       if (opthdr->status == T_NOTSUPPORT)
         {
           errno = ENOTSUP;
diff --git a/ace/TLI.h b/ace/TLI.h
index bc0997ca7ff..6960af430cf 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -15,12 +15,14 @@
 #define ACE_TLI_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS_TLI.h"
+#include "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/OS_TLI.h"
+
 #if defined (ACE_HAS_TLI)
 
 #include "ace/IPC_SAP.h"
diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp
index 193a64aecb9..180bcc95717 100644
--- a/ace/TLI_Acceptor.cpp
+++ b/ace/TLI_Acceptor.cpp
@@ -160,7 +160,7 @@ open_new_endpoint (ACE_HANDLE listen_handle,
 #if defined (I_PUSH) && !defined (ACE_HAS_FORE_ATM_XTI)
   else if (rwf != 0 && ACE_OS::ioctl (fd,
                                       I_PUSH,
-                                      ACE_const_cast (char *, "tirdwr"))
+                                      const_cast<char *> ("tirdwr"))
                                       == ACE_INVALID_HANDLE)
     fd = ACE_INVALID_HANDLE;
 #else
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp
index 1a717f338b6..d48d854f8e1 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -178,7 +178,7 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
       if (new_stream.get_rwflag ())
         result = ACE_OS::ioctl (new_stream.get_handle (),
                                 I_PUSH,
-                                ACE_const_cast (char *, "tirdwr"));
+                                const_cast<char *> ("tirdwr"));
 #endif /* I_PUSH */
     }
   else if (!(errno == EWOULDBLOCK || errno == ETIME))
diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h
index c4036b2bb13..468ab87f9ac 100644
--- a/ace/TLI_Stream.h
+++ b/ace/TLI_Stream.h
@@ -15,12 +15,14 @@
 #define ACE_TLI_STREAM_H
 #include /**/ "ace/pre.h"
 
-#include "ace/TLI.h"
+#include "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/TLI.h"
+
 #include "ace/INET_Addr.h"
 
 #if defined (ACE_HAS_TLI)
diff --git a/ace/TMCast/Export.hpp b/ace/TMCast/Export.hpp
deleted file mode 100644
index f13a69ecefd..00000000000
--- a/ace/TMCast/Export.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TMCast
-// ------------------------------
-#ifndef TMCAST_EXPORT_H
-#define TMCAST_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TMCAST_HAS_DLL)
-#  define TMCAST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TMCAST_HAS_DLL */
-
-#if !defined (TMCAST_HAS_DLL)
-#define TMCAST_HAS_DLL 1
-#endif /* ! TMCAST_HAS_DLL */
-
-#if defined (TMCAST_HAS_DLL) && (TMCAST_HAS_DLL == 1)
-#  if defined (TMCAST_BUILD_DLL)
-#    define TMCast_Export ACE_Proper_Export_Flag
-#    define TMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TMCAST_BUILD_DLL */
-#    define TMCast_Export ACE_Proper_Import_Flag
-#    define TMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TMCAST_BUILD_DLL */
-#else /* TMCAST_HAS_DLL == 1 */
-#  define TMCast_Export
-#  define TMCAST_SINGLETON_DECLARATION(T)
-#  define TMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TMCAST_HAS_DLL == 1 */
-
-// Set TMCAST_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TMCAST_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TMCAST_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TMCAST_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TMCAST_NTRACE */
-
-#if (TMCAST_NTRACE == 1)
-#  define TMCAST_TRACE(X)
-#else /* (TMCAST_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TMCAST_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TMCAST_NTRACE == 1) */
-
-#endif /* TMCAST_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ace/TMCast/FaultDetector.hpp b/ace/TMCast/FaultDetector.hpp
deleted file mode 100644
index ba476cbd367..00000000000
--- a/ace/TMCast/FaultDetector.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// file      : TMCast/FaultDetector.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "Protocol.hpp"
-
-namespace TMCast
-{
-  class FaultDetector
-  {
-  public:
-    FaultDetector ()
-        : silence_period_ (-1)
-    {
-    }
-
-  public:
-    class Failed {};
-
-
-    void
-    insync ()
-    {
-      silence_period_ = 0;
-    }
-
-    void
-    outsync ()
-    {
-      if (++silence_period_ >= Protocol::FATAL_SILENCE_FRAME)
-      {
-        // cerr << "Silence period has been passed." << endl;
-        // cerr << "Decalring the node failed." << endl;
-        throw Failed ();
-      }
-    }
-
-  private:
-    short silence_period_;
-  };
-}
diff --git a/ace/TMCast/Group.cpp b/ace/TMCast/Group.cpp
deleted file mode 100644
index 6cf8c33e47c..00000000000
--- a/ace/TMCast/Group.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-// file      : TMCast/Group.cpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "Group.hpp"
-
-#include <typeinfo>
-
-// OS primitives
-#include <ace/OS.h>
-#include <ace/Synch.h>
-#include <ace/Time_Value.h>
-#include <ace/SOCK_Dgram_Mcast.h>
-
-#include "Messaging.hpp"
-
-#include "Protocol.hpp"
-
-// Components
-
-#include "LinkListener.hpp"
-#include "FaultDetector.hpp"
-#include "TransactionController.hpp"
-
-namespace TMCast
-{
-  bool
-  operator== (std::type_info const* pa, std::type_info const& b)
-  {
-    return *pa == b;
-  }
-
-  //
-  //
-  //
-  class Terminate : public virtual Message {};
-
-
-  //
-  //
-  //
-  class Failure : public virtual Message {};
-
-
-  //
-  //
-  //
-  class Scheduler
-  {
-  public:
-    Scheduler (ACE_INET_Addr const& addr,
-               char const* id,
-               MessageQueue& out_send_data,
-               MessageQueue& out_recv_data,
-               MessageQueue& out_control)
-
-        : cond_ (mutex_),
-
-          addr_ (addr),
-          sock_ (),
-
-          out_control_ (out_control),
-
-          in_data_ (mutex_),
-          in_link_data_(mutex_),
-          in_control_ (mutex_),
-
-          sync_schedule (ACE_OS::gettimeofday ()),
-
-          transaction_controller_ (in_data_, out_send_data, out_recv_data)
-    {
-      ACE_OS::strncpy (id_, id, Protocol::MEMBER_ID_LENGTH);
-      id_[Protocol::MEMBER_ID_LENGTH - 1] = '\0';
-
-      sock_.set_option (IP_MULTICAST_TTL, 32); // @@ ttl is hardcoded
-
-      in_data_.subscribe (cond_);
-      in_link_data_.subscribe (cond_);
-      in_control_.subscribe (cond_);
-
-      if (ACE_OS::thr_create (&thread_thunk,
-                              this,
-                              THR_JOINABLE,
-                              &thread_) != 0) ::abort ();
-    }
-
-    virtual ~Scheduler ()
-    {
-      {
-        MessageQueueAutoLock lock (in_control_);
-
-        in_control_.push (MessagePtr (new Terminate));
-      }
-
-      if (ACE_OS::thr_join (thread_, &thread_, 0) != 0) ::abort ();
-
-      // cerr << "Scheduler is down." << endl;
-    }
-
-  public:
-    MessageQueue&
-    in_data ()
-    {
-      return in_data_;
-    }
-
-  private:
-    static ACE_THR_FUNC_RETURN
-    thread_thunk (void* arg)
-    {
-      Scheduler* obj = reinterpret_cast<Scheduler*> (arg);
-      obj->execute ();
-      return 0;
-    }
-
-    void
-    execute ()
-    {
-      try
-      {
-        sock_.join (addr_);
-        auto_ptr<LinkListener> ll (new LinkListener (sock_, in_link_data_));
-
-        {
-          AutoLock lock (mutex_);
-
-          // Loop
-          //
-          //
-
-          while (true)
-          {
-            cond_.wait (&sync_schedule);
-
-            // "Loop of Fairness"
-
-            bool done = false;
-
-            do
-            {
-              // control message
-              //
-              //
-              if (!in_control_.empty ())
-              {
-                done = true;
-                break;
-              }
-
-              // outsync
-              //
-              //
-              if (sync_schedule < ACE_OS::gettimeofday ())
-              {
-                // OUTSYNC
-
-                outsync ();
-
-                // schedule next outsync
-                sync_schedule =
-                  ACE_OS::gettimeofday () +
-                  ACE_Time_Value (0, Protocol::SYNC_PERIOD);
-              }
-
-              // link message
-              //
-              //
-              if (!in_link_data_.empty ())
-              {
-                MessagePtr m (in_link_data_.front ());
-                in_link_data_.pop ();
-
-                std::type_info const* exp = &typeid (*m);
-
-                if (exp == typeid (LinkFailure))
-                {
-                  // cerr << "link failure" << endl;
-                  throw false;
-                }
-                else if (exp == typeid (LinkData))
-                {
-
-                  LinkData* data = dynamic_cast<LinkData*> (m.get ());
-
-                  // INSYNC, TL, CT
-
-                  // Filter out loopback.
-                  //
-                  if (ACE_OS::strcmp (data->header().member_id.id, id_) != 0)
-                  {
-                    insync ();
-                    transaction_list ();
-                    current_transaction (data->header().current,
-                                         data->payload (),
-                                         data->size ());
-                  }
-                }
-                else
-                {
-                  // cerr << "unknown message type from link listener: "
-                  //      << typeid (*m).name () << endl;
-                  abort ();
-                }
-              }
-
-              // api message
-              //
-              //
-              if (!in_data_.empty ())
-              {
-                // API
-
-                api ();
-              }
-
-            } while (!in_link_data_.empty() ||
-                     sync_schedule < ACE_OS::gettimeofday ());
-
-            if (done) break;
-          }
-        }
-      }
-      catch (...)
-      {
-        // cerr << "Exception in scheduler loop." << endl;
-        MessageQueueAutoLock lock (out_control_);
-        out_control_.push (MessagePtr (new Failure));
-      }
-    }
-
-    // Events
-    //
-    // Order:
-    //
-    // INSYNC, TSL, VOTE, BEGIN
-    // API
-    // OUTSYNC
-    //
-
-    void
-    insync ()
-    {
-      fault_detector_.insync ();
-    }
-
-    void
-    outsync ()
-    {
-      char buf[Protocol::MAX_MESSAGE_SIZE];
-
-      Protocol::MessageHeader* hdr =
-        reinterpret_cast<Protocol::MessageHeader*> (buf);
-
-      void* data = buf + sizeof (Protocol::MessageHeader);
-
-      hdr->length = sizeof (Protocol::MessageHeader);
-      hdr->check_sum = 0;
-
-      ACE_OS::strcpy (hdr->member_id.id, id_);
-
-      size_t size (0);
-
-      transaction_controller_.outsync (hdr->current, data, size);
-
-      hdr->length += size;
-
-      fault_detector_.outsync ();
-
-      // sock_.send (buf, hdr->length, addr_);
-      sock_.send (buf, hdr->length);
-    }
-
-    void
-    transaction_list ()
-    {
-    }
-
-    void
-    current_transaction (Protocol::Transaction const& t,
-                         void const* payload,
-                         size_t size)
-    {
-      transaction_controller_.current_transaction (t, payload, size);
-    }
-
-    void
-    api ()
-    {
-      transaction_controller_.api ();
-    }
-
-  private:
-    ACE_thread_t thread_;
-
-    ACE_Thread_Mutex mutex_;
-    ACE_Condition<ACE_Thread_Mutex> cond_;
-
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
-
-    char id_[Protocol::MEMBER_ID_LENGTH];
-
-    ACE_INET_Addr addr_;
-    ACE_SOCK_Dgram_Mcast sock_;
-
-    MessageQueue& out_control_;
-
-    MessageQueue  in_data_;
-    MessageQueue  in_link_data_;
-    MessageQueue  in_control_;
-
-    // Protocol state
-    //
-    //
-
-    ACE_Time_Value sync_schedule;
-
-    FaultDetector fault_detector_;
-    TransactionController transaction_controller_;
-  };
-
-
-  //
-  //
-  //
-  class Group::GroupImpl
-  {
-  public:
-    virtual ~GroupImpl ()
-    {
-    }
-
-    GroupImpl (ACE_INET_Addr const& addr, char const* id)
-      throw (Group::Failed)
-        : send_cond_ (mutex_),
-          recv_cond_ (mutex_),
-          failed_ (false),
-          in_send_data_ (mutex_),
-          in_recv_data_ (mutex_),
-          in_control_ (mutex_),
-          scheduler_ (new  Scheduler (addr,
-                                      id,
-                                      in_send_data_,
-                                      in_recv_data_,
-                                      in_control_)),
-          out_data_ (scheduler_->in_data ())
-    {
-      in_send_data_.subscribe (send_cond_);
-      in_recv_data_.subscribe (recv_cond_);
-
-      in_control_.subscribe (send_cond_);
-      in_control_.subscribe (recv_cond_);
-    }
-
-    void
-    send (void const* msg, size_t size)
-      throw (Group::InvalidArg, Group::Failed, Group::Aborted)
-    {
-      if (size > Protocol::MAX_PAYLOAD_SIZE) throw InvalidArg ();
-
-      // Note the potential deadlock if I lock mutex_ and out_data_ in
-      // reverse order.
-
-      MessageQueueAutoLock l1 (out_data_);
-      AutoLock l2 (mutex_);
-
-      throw_if_failed ();
-
-      out_data_.push (MessagePtr (new Send (msg, size)));
-
-      l1.unlock (); // no need to keep it locked
-
-      while (true)
-      {
-        throw_if_failed ();
-
-        if (!in_send_data_.empty ())
-        {
-          MessagePtr m (in_send_data_.front ());
-          in_send_data_.pop ();
-
-          std::type_info const* exp = &typeid (*m);
-
-          if (exp == typeid (TMCast::Aborted))
-          {
-            throw Group::Aborted ();
-          }
-          else if (exp == typeid (Commited))
-          {
-            return;
-          }
-          else
-          {
-            // cerr << "send: group-scheduler messaging protocol violation; "
-            //     << "unexpected message " << typeid (*m).name ()
-            //     << " " << typeid (Aborted).name () << endl;
-
-            abort ();
-          }
-        }
-
-        // cerr << "send: waiting on condition" << endl;
-        send_cond_.wait ();
-        // cerr << "send: wokeup on condition" << endl;
-      }
-    }
-
-
-
-    size_t
-    recv (void* msg, size_t size) throw (Group::Failed, Group::InsufficienSpace)
-    {
-      AutoLock lock (mutex_);
-
-      while (true)
-      {
-        throw_if_failed ();
-
-        if (!in_recv_data_.empty ())
-        {
-          MessagePtr m (in_recv_data_.front ());
-          in_recv_data_.pop ();
-
-          std::type_info const* exp = &typeid (*m);
-
-          if (exp == typeid (Recv))
-          {
-            Recv* data = dynamic_cast<Recv*> (m.get ());
-
-            if (size < data->size ()) throw Group::InsufficienSpace ();
-
-            memcpy (msg, data->payload (), data->size ());
-
-            return data->size ();
-          }
-          else
-          {
-            // cerr << "recv: group-scheduler messaging protocol violation. "
-            //     << "unexpected message " << typeid (*m).name () << endl;
-
-            abort ();
-          }
-        }
-
-        recv_cond_.wait ();
-      }
-    }
-
-  private:
-    void
-    throw_if_failed ()
-    {
-      if (!failed_ && !in_control_.empty ()) failed_ = true;
-
-      if (failed_) throw Group::Failed ();
-    }
-
-  private:
-    ACE_Thread_Mutex mutex_;
-    ACE_Condition<ACE_Thread_Mutex> send_cond_;
-    ACE_Condition<ACE_Thread_Mutex> recv_cond_;
-
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
-
-    bool failed_;
-
-    MessageQueue  in_send_data_;
-    MessageQueue  in_recv_data_;
-    MessageQueue  in_control_;
-
-    auto_ptr<Scheduler> scheduler_;
-
-    MessageQueue& out_data_;
-  };
-
-
-  // Group
-  //
-  //
-  Group::
-  Group (ACE_INET_Addr const& addr, char const* id)
-    throw (Group::Failed)
-      : pimpl_ (new GroupImpl (addr, id))
-  {
-  }
-
-  Group::
-  ~Group ()
-  {
-  }
-
-  void 
-  Group::send (void const* msg, size_t size) throw (Group::InvalidArg, Group::Failed, Group::Aborted)
-  {
-    pimpl_->send (msg, size);
-  }
-
-  size_t 
-  Group::recv (void* msg, size_t size) throw (Group::Failed, Group::InsufficienSpace)
-  {
-    return pimpl_->recv (msg, size);
-  }
-}
diff --git a/ace/TMCast/Group.hpp b/ace/TMCast/Group.hpp
deleted file mode 100644
index 416cea0a17d..00000000000
--- a/ace/TMCast/Group.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// file      : TMCast/Group.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_GROUP_HPP
-#define TMCAST_GROUP_HPP
-
-#include <ace/Auto_Ptr.h>
-#include <ace/INET_Addr.h>
-
-#include "Export.hpp"
-
-namespace TMCast
-{
-  class TMCast_Export Group
-  {
-  public:
-    class Aborted {};
-    class Failed {};
-    class InvalidArg {};
-    class InsufficienSpace {};
-
-  public:
-    ~Group ();
-
-    Group (ACE_INET_Addr const& addr, char const* id) throw (Failed);
-
-  public:
-    void
-    send (void const* msg, size_t size) throw (InvalidArg, Failed, Aborted);
-
-    size_t
-    recv (void* msg, size_t size) throw (Failed, InsufficienSpace);
-
-  private:
-    bool
-    failed ();
-
-  private:
-    class GroupImpl;
-    auto_ptr<GroupImpl> pimpl_;
-
-  private:
-    Group (Group const&);
-
-    Group&
-    operator= (Group const&);
-  };
-}
-
-#endif // TMCAST_GROUP_HPP
diff --git a/ace/TMCast/GroupFwd.hpp b/ace/TMCast/GroupFwd.hpp
deleted file mode 100644
index beba06df79d..00000000000
--- a/ace/TMCast/GroupFwd.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// file      : TMCast/GroupFwd.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_GROUP_FWD_HPP
-#define TMCAST_GROUP_FWD_HPP
-
-#include "Export.hpp"
-
-namespace TMCast
-{
-  class TMCast_Export Group;
-}
-
-#endif // TMCAST_GROUP_FWD_HPP
diff --git a/ace/TMCast/LinkListener.hpp b/ace/TMCast/LinkListener.hpp
deleted file mode 100644
index cbb7fd1d5ce..00000000000
--- a/ace/TMCast/LinkListener.hpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// file      : TMCast/LinkListener.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-// OS primitives
-#include <ace/Synch.h>
-#include <ace/SOCK_Dgram_Mcast.h>
-#include <ace/Refcounted_Auto_Ptr.h>
-
-
-#include "Messaging.hpp"
-
-namespace TMCast
-{
-  //
-  //
-  //
-  class LinkFailure : public virtual Message {};
-
-
-  //
-  //
-  //
-  class LinkData : public virtual Message
-  {
-  public:
-    LinkData (Protocol::MessageHeader const* header,
-              void* payload,
-              size_t size)
-        : size_ (size)
-    {
-      ACE_OS::memcpy (&header_, header, sizeof (Protocol::MessageHeader));
-      ACE_OS::memcpy (payload_, payload, size_);
-    }
-
-    Protocol::MessageHeader const&
-    header () const
-    {
-      return header_;
-    }
-
-    void const*
-    payload () const
-    {
-      return payload_;
-    }
-
-    size_t
-    size () const
-    {
-      return size_;
-    }
-
-  private:
-    Protocol::MessageHeader header_;
-    char payload_[Protocol::MAX_MESSAGE_SIZE];
-    size_t size_;
-  };
-
-  typedef
-  ACE_Refcounted_Auto_Ptr<LinkData, ACE_Null_Mutex>
-  LinkDataPtr;
-
-  //
-  //
-  //
-  class LinkListener
-  {
-  private:
-    class Terminate : public virtual Message {};
-
-  public:
-    LinkListener (ACE_SOCK_Dgram_Mcast& sock, MessageQueue& out)
-        : sock_(sock), out_ (out)
-    {
-      if (ACE_OS::thr_create (&thread_thunk,
-                              this,
-                              THR_JOINABLE,
-                              &thread_) != 0) ::abort ();
-    }
-
-    ~LinkListener ()
-    {
-      {
-        MessageQueueAutoLock lock (control_);
-
-        control_.push (MessagePtr (new Terminate));
-      }
-
-      if (ACE_OS::thr_join (thread_, &thread_, 0) != 0) ::abort ();
-
-      // cerr << "Link listener is down." << endl;
-    }
-
-
-    static ACE_THR_FUNC_RETURN
-    thread_thunk (void* arg)
-    {
-      LinkListener* obj = reinterpret_cast<LinkListener*> (arg);
-
-      obj->execute ();
-      return 0;
-    }
-
-    void
-    execute ()
-    {
-      char msg[Protocol::MAX_MESSAGE_SIZE];
-
-      ssize_t header_size = sizeof (Protocol::MessageHeader);
-
-      // OS::Time timeout (1000000); // one millisecond
-
-      ACE_Time_Value timeout (0, 1000); // one millisecond
-
-      try
-      {
-        while (true)
-        {
-          // Check control message queue
-
-          {
-            MessageQueueAutoLock lock (control_);
-
-            if (!control_.empty ()) break;
-          }
-
-          ACE_INET_Addr junk;
-          ssize_t n = sock_.recv (msg,
-                                  Protocol::MAX_MESSAGE_SIZE,
-                                  junk,
-                                  0,
-                                  &timeout);
-
-          if (n != -1)
-          {
-            if (n < header_size) throw false;
-
-            Protocol::MessageHeader* header =
-              reinterpret_cast<Protocol::MessageHeader*> (msg);
-
-            MessageQueueAutoLock lock (out_);
-
-            out_.push (MessagePtr (new LinkData (header,
-                                                 msg + header_size,
-                                                 n - header_size)));
-          }
-        }
-      }
-      catch (...)
-      {
-        MessageQueueAutoLock lock (out_);
-
-        out_.push (MessagePtr (new LinkFailure));
-      }
-    }
-
-  private:
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
-
-    ACE_thread_t thread_;
-    ACE_SOCK_Dgram_Mcast& sock_;
-    MessageQueue& out_;
-    MessageQueue  control_;
-  };
-}
diff --git a/ace/TMCast/MTQueue.hpp b/ace/TMCast/MTQueue.hpp
deleted file mode 100644
index 429a73d45ba..00000000000
--- a/ace/TMCast/MTQueue.hpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// file      : TMCast/MTQueue.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_MT_QUEUE_HPP
-#define TMCAST_MT_QUEUE_HPP
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Unbounded_Set.h"
-#include "ace/Unbounded_Queue.h"
-#include "ace/os_include/sys/os_types.h"
-
-namespace TMCast
-{
-  template <typename T,
-            typename M,
-            typename C,
-            typename Q = ACE_Unbounded_Queue<T> >
-  class MTQueue
-  {
-  public:
-    typedef T ElementType;
-    typedef M MutexType;
-    typedef C ConditionalType;
-    typedef Q QueueType;
-
-  public:
-
-    MTQueue ()
-        : mutexp_ (new MutexType),
-          mutex_ (*mutexp_),
-          queue_ (),
-          signal_ (false)
-    {
-    }
-
-    MTQueue (MutexType& mutex)
-        : mutexp_ (),
-          mutex_ (mutex),
-          queue_ (),
-          signal_ (false)
-    {
-    }
-
-  public:
-    bool
-    empty () const
-    {
-      return queue_.is_empty ();
-    }
-
-    size_t
-    size () const
-    {
-      return queue_.size ();
-    }
-
-    // typedef typename QueueType::Empty Empty;
-
-    class Empty {};
-
-    T&
-    front ()
-    {
-      ACE_Unbounded_Queue_Iterator<T> f (queue_);
-      T* tmp;
-      if (!f.next (tmp)) throw Empty ();
-
-      return *tmp;
-    }
-
-
-    T const&
-    front () const
-    {
-      ACE_Unbounded_Queue_Const_Iterator<T> f (queue_);
-      T* tmp;
-      if (!f.next (tmp)) throw Empty ();
-
-      return *tmp;
-    }
-
-    /*
-      T&
-      back ()
-      {
-      return queue_.back ();
-      }
-
-
-      T const&
-      back () const
-      {
-      return queue_.back ();
-      }
-    */
-
-    void
-    push (T const& t)
-    {
-      signal_ = empty ();
-      queue_.enqueue_tail (t);
-    }
-
-    void
-    pop ()
-    {
-      T junk;
-      queue_.dequeue_head (junk);
-    }
-
-  public:
-    void
-    lock () const
-    {
-      mutex_.acquire ();
-    }
-
-    void
-    unlock () const
-    {
-      if (signal_)
-      {
-        signal_ = false;
-
-        for (ConditionalSetConstIterator_ i (cond_set_);
-             !i.done ();
-             i.advance ())
-        {
-          ConditionalType** c;
-
-          i.next (c);
-
-          (*c)->signal ();
-        }
-      }
-
-      mutex_.release ();
-    }
-
-    void
-    subscribe (ConditionalType& c)
-    {
-      //@@ should check for duplicates
-      //
-      cond_set_.insert (&c);
-    }
-
-    void
-    unsubscribe (ConditionalType& c)
-    {
-      //@@ should check for absence
-      //
-      cond_set_.remove (&c);
-    }
-
-  private:
-    auto_ptr<MutexType> mutexp_;
-    MutexType& mutex_;
-    QueueType queue_;
-
-    typedef
-    ACE_Unbounded_Set<ConditionalType*>
-    ConditionalSet_;
-
-    typedef
-    ACE_Unbounded_Set_Const_Iterator<ConditionalType*>
-    ConditionalSetConstIterator_;
-
-    ConditionalSet_ cond_set_;
-
-    mutable bool signal_;
-  };
-}
-
-#endif // TMCAST_MT_QUEUE_HPP
diff --git a/ace/TMCast/Messaging.hpp b/ace/TMCast/Messaging.hpp
deleted file mode 100644
index 6a1000c3265..00000000000
--- a/ace/TMCast/Messaging.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// file      : TMCast/Messaging.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_MESSAGING_HPP
-#define TMCAST_MESSAGING_HPP
-
-#include <ace/Synch.h>
-#include <ace/Refcounted_Auto_Ptr.h>
-
-#include "MTQueue.hpp"
-
-namespace TMCast
-{
-  class Message
-  {
-  public:
-    virtual
-    ~Message () {}
-  };
-
-  typedef
-  ACE_Refcounted_Auto_Ptr<Message, ACE_Null_Mutex>
-  MessagePtr;
-
-  typedef
-  MTQueue<MessagePtr, ACE_Thread_Mutex, ACE_Condition<ACE_Thread_Mutex> >
-  MessageQueue;
-
-  struct MessageQueueAutoLock
-  {
-    MessageQueueAutoLock (MessageQueue& q)
-        : q_ (q)
-    {
-      q_.lock ();
-    }
-
-    void
-    unlock ()
-    {
-      q_.unlock ();
-    }
-
-    ~MessageQueueAutoLock ()
-    {
-    q_.unlock ();
-    }
-
-  private:
-    MessageQueue& q_;
-  };
-}
-
-#endif // TMCAST_MESSAGING_HPP
diff --git a/ace/TMCast/Protocol.cpp b/ace/TMCast/Protocol.cpp
deleted file mode 100644
index 9d57a97f221..00000000000
--- a/ace/TMCast/Protocol.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// file      : TMCast/Protocol.cpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "Protocol.hpp"
-
-namespace TMCast
-{
-  namespace Protocol
-  {
-    /*
-      namespace
-      {
-      char const* labels[] = {
-      "NONE", "BEGIN", "COMMIT", "ABORT", "COMMITED", "ABORTED"};
-      }
-
-      std::string
-      tslabel (Protocol::TransactionStatus s)
-      {
-      return labels[s];
-      }
-
-      std::ostream&
-      operator << (std::ostream& o, Transaction const& t)
-      {
-      return o << "{" << t.id << "; " << tslabel (t.status) << "}";
-      }
-    */
-  }
-}
diff --git a/ace/TMCast/Protocol.hpp b/ace/TMCast/Protocol.hpp
deleted file mode 100644
index d5ae6a50cd6..00000000000
--- a/ace/TMCast/Protocol.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// file      : TMCast/Protocol.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef TMCAST_PROTOCOL_HPP
-#define TMCAST_PROTOCOL_HPP
-
-namespace TMCast
-{
-  namespace Protocol
-  {
-    //
-    //
-    //
-    unsigned long const MEMBER_ID_LENGTH = 38;
-
-    struct MemberId
-    {
-      char id[MEMBER_ID_LENGTH];
-      /*
-        unsigned long  ip;
-        unsigned short port;
-      */
-    };
-
-    //
-    //
-    //
-    typedef unsigned short TransactionId;
-
-
-
-    typedef unsigned char  TransactionStatus;
-
-    TransactionStatus const TS_BEGIN    = 1;
-    TransactionStatus const TS_COMMIT   = 2;
-    TransactionStatus const TS_ABORT    = 3;
-    TransactionStatus const TS_COMMITED = 4;
-    TransactionStatus const TS_ABORTED  = 5;
-
-    struct Transaction
-    {
-      TransactionId id;
-      TransactionStatus status;
-    };
-
-    // Transaction List (TL)
-
-    // unsigned long const TL_LENGTH = 1;
-
-    // typedef Transaction TransactionList[TL_LENGTH];
-
-
-    //
-    //
-    //
-    struct MessageHeader
-    {
-      unsigned long length;
-
-      unsigned long check_sum;
-
-      MemberId member_id;
-
-      Transaction current;
-
-      //TransactionList transaction_list;
-    };
-
-
-    //
-    //
-    //
-
-    unsigned long const MAX_MESSAGE_SIZE = 768;
-
-    unsigned long const
-    MAX_PAYLOAD_SIZE = MAX_MESSAGE_SIZE - sizeof (MessageHeader);
-
-    // Protocol timing
-    //
-    //
-
-    unsigned long const SYNC_PERIOD = 30000;    // in mks
-
-    unsigned short const VOTING_FRAME = 4;      // in SYNC_PERIOD's
-    unsigned short const SEPARATION_FRAME = 5;  // in SYNC_PERIOD's
-
-    // FATAL_SILENCE_FRAME in SYNC_PERIOD's
-    // Generally it's a good idea to set it to < VOTING_FRAME + SEPARATION_FRAME
-    //
-
-    short const FATAL_SILENCE_FRAME = VOTING_FRAME + SEPARATION_FRAME - 2;
-
-    // short const FATAL_SILENCE_FRAME = 10000;
-
-    // Helpers
-
-    // std::string
-    // tslabel (Protocol::TransactionStatus s);
-
-    // std::ostream&
-    // operator << (std::ostream& o, Transaction const& t);
-  }
-}
-
-#endif // TMCAST_PROTOCOL_HPP
diff --git a/ace/TMCast/README b/ace/TMCast/README
deleted file mode 100644
index 9600b17fe2c..00000000000
--- a/ace/TMCast/README
+++ /dev/null
@@ -1,240 +0,0 @@
-
-
-Introduction
-------------
-
-TMCast (stands for Transaction MultiCast) is an implementation of a
-transactional multicast protocol. In essence, the idea is to represent
-each message delivery to members of a multicast group as a transaction
-- an atomic, consistent and isolated action. A multicast transaction
-can be viewed as an atomic transition of the group members to a new
-state.  If we define [Mo] as a set of operational (non-faulty) members
-of the group, [Mf] as a set of faulty members of the group, [Ma] as a
-set of members that view transition [Tn] as aborted and [Mc] as a set
-of members that view transition [Tn] as committed, then this atomic
-transition [Tn] should satisfy one of the following equations:
-
-Mo(Tn-1) = Ma(T) U Mf(T)
-Mo(Tn-1) = Mc(T) U Mf(T)
-
-Or, in other words, after transaction T has been committed (aborted), 
-all operational (before transaction T) members are either in the
-committed (aborted) or failed state.
-
-Thus, for each member of the group, outcome of the transaction can be
-commit, abort or a member failure. It is important for a member to
-exhibit a failfast (error latency is less than transaction cycle)
-behavior. Or, in other words, if a member transitioned into a wrong
-state, it is guaranteed to fail instead of delivering a wrong result.
-
-In order to achieve such an error detection in a decentralized
-environment, certain limitations were imposed. One of the most
-user-visible limitation is the fact that the lifetime of the group
-with only one member is very short. This is because there is not way
-for a member to distinguish "no members yet" case from "my link to the
-group is down". In such a situation, the member assumes the latter
-case.  There is also a military saying that puts it quite nicely: two
-is one, one is nothing.
-
-
-
-State of Implementation
------------------------
-
-The current implementation is in a prototypical stage. The following 
-parts are not implemented or still under development:
-
-* Handling of network partitioning (TODO)
-
-* Redundant network support (TODO)
-
-* Member failure detection (partial implementation)
-
-
-Examples
---------
-
-There is a simple example available in examples/TMCast/Member with 
-the corresponding README.
-
-
-Architecture
-------------
-
-Primary goals of the protocol are to (1) mask transient failures of the
-underlying multicast protocol (or, more precisely, allow to recover 
-from transient failures) and (2) exhibit failfast behavior in cases of
-permanent failures.
-
-The distinction between transient and permanent failures is based on
-timeouts thus what can be a transient failure in one configuration of
-the protocol could be a permanent failure in the other.
-
-[Maybe talk more about a transient/permanent threshold and its effect
-on performance/resource utilization/etc.]
-
-[Maybe add a terminology section.]
-
-Each member of a multicast group has its unique (group-wise) id:
-
-struct MemberId
-{
-  char id[MEMBER_ID_LENGTH];
-};
-
-Each payload delivery is part of a transaction. Each transaction is 
-identified by TransactionId:
-
-typedef unsigned short TransactionId;
-
-
-Each transaction has a status code which identifies its state, as viewed by 
-a group member:
-
-
-typedef unsigned char  TransactionStatus;
-
-TransactionStatus const TS_BEGIN     = 1;
-TransactionStatus const TS_COMMIT    = 2;
-TransactionStatus const TS_ABORT     = 3;
-TransactionStatus const TS_COMMITTED = 4;
-TransactionStatus const TS_ABORTED   = 5;
-
-Thus each transaction is described by its id and status:
-
-struct Transaction
-{
-  TransactionId id;
-  TransactionStatus status;
-};
-
-The outcome of some predefined number of recent transactions is stored 
-in TransactionList:
-
-typedef Transaction TransactionList[TL_LENGTH];
-
-
-Each message sent to a multicast group has the following header:
-
-struct MessageHeader
-{
-  unsigned long length;
-  unsigned long check_sum;
-  MemberId member_id;
-  Transaction current;
-  TransactionList transaction_list;
-};
-
-[Maybe describe each field here.]
-
-A new member joins the group with transaction id 0 and status 
-TS_COMMITTED.
-
-Each member sends a periodic 'pulse' messages with some predefined interval
-advertising its current view of the group. This includes the state of the
-current transaction and the history of the recent transactions.
-
-
-If a member of the group needs a payload delivery it starts a new 
-transaction by sending a message with current transaction set to
-
-{++current_id, TS_BEGIN} 
-
-and payload appended after the header.
-
-
-Each member joins a transaction in one of the following ways:
-
-* A member that began the transaction joins it 'to commit' (TS_COMMIT)
-
-* A member that received TS_BEGIN joins current transaction 'to commit' 
-  (TS_COMMIT).
-
-* A member that received TS_COMMIT or TS_ABORT but did not receive TS_BEGIN
-  joins current transaction 'to abort' (TS_ABORT).
-
-
-After a member has joined the transaction it starts participating in the 
-transaction's voting phase. On this phase members of the group decide the 
-fate of the transaction. Each member sends a predefined number of messages 
-where it announces its vote. In between those messages the member is receiving
-and processing votes from other members and can be influenced by their
-'opinion'. 
-
-In their decision-making, members follow the principle of the majority. As 
-the voting progresses (and comes close to an end) members become more and 
-more reluctant to deviate from the decision of the majority.
-
-[Maybe add an equation that measures member's willingness to change
-its mind.]
-
-At the end of the voting phase each member declares the current transaction
-either committed (TS_COMMITTED) or aborted (TS_ABORTED). If this decision does
-not agree with the majority the member declares itself failed.
-
-In addition, each member builds a 'majority view' of the transaction history
-(based on transaction_list). If it deviates from the member's own history the
-member declares itself failed.
-
-Here are some example scenarios of how the protocol behaves in different 
-situations. Let's say we have three members of the group S, R1, R2. S 
-initiates a transaction. R1 and R2 join it.
-
-Scenario 1. (two-step voting)
-
-1.  S  initiates a transaction (TS_BEGIN)
-2a. R1 receives TS_BEGIN, joins for commit
-2b. R2 receives TS_BEGIN, joins for commit
-3a. S  announces TS_COMMIT (first vote)
-3b. R1 announces TS_COMMIT (first vote)
-3c. R2 announces TS_COMMIT (first vote)
-4a. S  announces TS_COMMIT (second vote)
-4b. R1 announces TS_COMMIT (second vote)
-4c. R2 announces TS_COMMIT (second vote)
-5a. S  announces TS_COMMITTED (end of vote)
-5b. R1 announces TS_COMMITTED (end of vote)
-5c. R2 announces TS_COMMITTED (end of vote)
-
-
-Scenario 2. (two-step voting)
-
-1.  S  initiates a transaction (TS_BEGIN)
-2a. R1 receives TS_BEGIN, joins for commit
-2b. R2 didn't receive TS_BEGIN 
-3a. S  announces TS_COMMIT (first vote)
-3b. R1 announces TS_COMMIT (first vote)
-3c. R2 received R1's TS_COMMIT announces TS_ABORT (first vote)
-4a. S  received R2's TS_ABORT announces TS_ABORT (second vote)
-4b. R1 received R2's TS_ABORT announces TS_ABORT (second vote)
-4c. R2 announces TS_ABORT (second vote)
-5a. S  announces TS_ABORTED (end of vote)
-5b. R1 announces TS_ABORTED (end of vote)
-5c. R2 announces TS_ABORTED (end of vote)
-
-
-Scenario 3. (three-step voting)
-
-1.  S  initiates a transaction (TS_BEGIN)
-2a. R1 receives TS_BEGIN, joins for commit
-2b. R2 didn't receive TS_BEGIN 
-3a. S  announces TS_COMMIT (first vote)
-3b. R1 announces TS_COMMIT (first vote)
-3c. R2 still didn't receive anything
-4a. S  announces TS_COMMIT (second vote)
-4b. R1 announces TS_COMMIT (second vote)
-4c. R2 received R1's TS_COMMIT, announces TS_ABORT (first vote)
-
-5a. S  received R2's TS_ABORT but it is the end of the voting phase and
-       majority (S and R1) vote for commit, announces TS_COMMIT (third vote)
-5b. R1 received R2's TS_ABORT but it is the end of the voting phase and
-       majority (S and R1) vote for commit, announces TS_COMMIT (third vote)
-5c. R2 announces TS_ABORT (second vote)
-
-6a. S  announces TS_COMMITTED (end of vote)
-6b. R1 announces TS_COMMITTED (end of vote)
-6c. R2 discovers that the the majority has declared current transaction 
-       committed and thus declares itself failed.
-
-
--- 
-Boris Kolpackov <boris@dre.vanderbilt.edu>
diff --git a/ace/TMCast/TMCast.mpc b/ace/TMCast/TMCast.mpc
deleted file mode 100644
index 7826b439836..00000000000
--- a/ace/TMCast/TMCast.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-//  -*- MPC -*-
-// $Id$
-
-project : acelib, core {
-  requires     += exceptions threads
-  sharedname    = TMCast
-  dynamicflags += TMCAST_BUILD_DLL
-}
diff --git a/ace/TMCast/TransactionController.hpp b/ace/TMCast/TransactionController.hpp
deleted file mode 100644
index f1108963ffa..00000000000
--- a/ace/TMCast/TransactionController.hpp
+++ /dev/null
@@ -1,387 +0,0 @@
-// file      : TMCast/TransactionController.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "ace/OS_NS_string.h"
-#include "ace/Synch.h"
-#include "ace/Refcounted_Auto_Ptr.h"
-
-#include "Protocol.hpp"
-#include "Messaging.hpp"
-
-#include <typeinfo>
-
-namespace TMCast
-{
-
-  // Messages
-  //
-  //
-  class Send : public virtual Message
-  {
-  public:
-    Send (void const* msg, size_t size)
-        : size_ (size)
-    {
-      ACE_OS::memcpy (payload_, msg, size_);
-    }
-
-    void const*
-    payload () const
-    {
-      return payload_;
-    }
-
-    size_t
-    size () const
-    {
-      return size_;
-    }
-
-  private:
-    size_t size_;
-    char payload_[Protocol::MAX_PAYLOAD_SIZE];
-  };
-
-  typedef
-  ACE_Refcounted_Auto_Ptr<Send, ACE_Null_Mutex>
-  SendPtr;
-
-
-  class Recv : public virtual Message
-  {
-  public:
-    Recv (void const* msg, size_t size)
-        : size_ (size)
-    {
-      ACE_OS::memcpy (payload_, msg, size_);
-    }
-
-    void const*
-    payload () const
-    {
-      return payload_;
-    }
-
-    size_t
-    size () const
-    {
-      return size_;
-    }
-
-  private:
-    size_t size_;
-    char payload_[Protocol::MAX_PAYLOAD_SIZE];
-  };
-
-  typedef
-  ACE_Refcounted_Auto_Ptr<Recv, ACE_Null_Mutex>
-  RecvPtr;
-
-  class Aborted : public virtual Message {};
-
-  class Commited : public virtual Message {};
-
-
-  //
-  //
-  //
-  class TransactionController
-  {
-  public:
-    TransactionController (MessageQueue& in,
-                           MessageQueue& send_out,
-                           MessageQueue& recv_out)
-        : trace_ (false),
-          voting_duration_ (0),
-          separation_duration_ (0),
-          in_ (in),
-          send_out_ (send_out),
-          recv_out_ (recv_out)
-    {
-      current_.id = 0;
-      current_.status = Protocol::TS_COMMITED;
-    }
-
-  public:
-    class Failure {};
-
-
-    void
-    outsync (Protocol::Transaction& c, void* payload, size_t& size)
-    {
-      if (current_.status == Protocol::TS_COMMIT ||
-          current_.status == Protocol::TS_ABORT)
-      {
-        if (++voting_duration_ >= Protocol::VOTING_FRAME)
-        {
-          // end of voting frame
-
-          if (current_.status == Protocol::TS_COMMIT)
-          {
-            {
-              if (initiated_)
-              {
-                MessageQueueAutoLock lock (send_out_);
-                send_out_.push (MessagePtr (new Commited));
-              }
-              else // joined transaction
-              {
-                MessageQueueAutoLock lock (recv_out_);
-                recv_out_.push (MessagePtr (recv_.release ()));
-                recv_ = RecvPtr ();
-              }
-            }
-
-            current_.status = Protocol::TS_COMMITED;
-
-            // if (trace_) cerr << "commited transaction with id "
-            //                  << current_.id << endl;
-          }
-          else // TS_ABORT
-          {
-            if (initiated_)
-            {
-              MessageQueueAutoLock lock (send_out_);
-              send_out_.push (MessagePtr (new Aborted));
-            }
-            else
-            {
-              // free revc_ buffer if necessary
-              //
-              if (recv_.get ()) recv_ = RecvPtr ();
-            }
-
-
-            current_.status = Protocol::TS_ABORTED;
-
-            // if (trace_) cerr << "aborted transaction with id "
-            //                  << current_.id << endl;
-          }
-
-          // start transaction separation frame (counts down)
-          // +1 because it will be decremented on this iteration
-          separation_duration_ = Protocol::SEPARATION_FRAME + 1;
-        }
-      }
-
-      // Set current outsync info
-
-      c.id = current_.id;
-      c.status = current_.status;
-
-
-      // Do some post-processing
-
-      switch (current_.status)
-      {
-      case Protocol::TS_COMMITED:
-      case Protocol::TS_ABORTED:
-        {
-          if (separation_duration_ > 0) --separation_duration_;
-          break;
-        }
-      case Protocol::TS_BEGIN:
-        {
-          // transfer payload
-
-          size = send_->size ();
-          memcpy (payload, send_->payload (), size);
-
-          send_ = SendPtr ();
-
-          // get redy to vote for 'commit'
-
-          current_.status = Protocol::TS_COMMIT;
-          voting_duration_ = 0;
-        }
-      }
-    }
-
-    void
-    current_transaction (Protocol::Transaction const& t,
-                         void const* payload,
-                         size_t size)
-    {
-      Protocol::TransactionId& id = current_.id;
-      Protocol::TransactionStatus& s = current_.status;
-
-      if (id == 0 && t.id != 0) // catch up
-      {
-        switch (t.status)
-        {
-        case Protocol::TS_BEGIN:
-        case Protocol::TS_COMMIT:
-        case Protocol::TS_ABORT:
-          {
-            id = t.id - 1;
-            s = Protocol::TS_COMMITED;
-            break;
-          }
-        case Protocol::TS_ABORTED:
-        case Protocol::TS_COMMITED:
-          {
-            id = t.id;
-            s = t.status;
-            break;
-          }
-        }
-
-        // if (trace_) cerr << "caught up with id " << id << endl;
-      }
-
-      bool stable (s == Protocol::TS_COMMITED || s == Protocol::TS_ABORTED);
-
-      switch (t.status)
-      {
-      case Protocol::TS_BEGIN:
-        {
-          if (!stable || t.id != id + 1)
-          {
-            // Transaction is in progress or hole in transaction id's
-
-            // cerr << "unexpected request to join " << t
-            //     << " while on " << current_ << endl;
-
-            // if (!stable) cerr << "voting progress is " << voting_duration_
-            //                  << "/" << Protocol::VOTING_FRAME << endl;
-
-            if (t.id == id) // collision
-            {
-              if (!stable && s != Protocol::TS_ABORT)
-              {
-                // abort both
-                // cerr << "aborting both transactions" << endl;
-
-                s = Protocol::TS_ABORT;
-                voting_duration_ = 0; //@@ reset voting frame
-              }
-            }
-            else
-            {
-              // @@ delicate case. need to think more
-
-              // cerr << "Declaring node failed." << endl;
-              throw Failure ();
-            }
-          }
-          else
-          {
-            // join the transaction
-
-            initiated_ = false;
-
-            recv_ = RecvPtr (new Recv (payload, size));
-
-            id = t.id;
-            s = Protocol::TS_COMMIT;
-            voting_duration_ = 0;
-
-            // if (trace_) cerr << "joining-for-commit transaction with id "
-            //                  << id << endl;
-          }
-          break;
-        }
-      case Protocol::TS_COMMIT:
-        {
-          if (stable && id == t.id - 1)
-          {
-            // not begin and and we haven't joined
-
-            // join for abort
-
-            initiated_ = false;
-
-            current_.id = t.id;
-            current_.status = Protocol::TS_ABORT;
-            voting_duration_ = 0;
-
-            // if (trace_) cerr << "joining-for-abort transaction with id "
-            //                  << current_.id << endl;
-          }
-          break;
-        }
-      case Protocol::TS_ABORT:
-        {
-          if ((!stable && id == t.id && s == Protocol::TS_COMMIT) ||
-              (stable && id == t.id - 1)) // abort current || new transaction
-          {
-            // if (trace_) cerr << "voting-for-abort on transaction with id "
-            //                  << current_.id << endl;
-
-            id = t.id;
-            s = Protocol::TS_ABORT;
-
-            voting_duration_ = 0; //@@ reseting voting_duration_
-          }
-          else
-          {
-          }
-
-          break;
-        }
-      case Protocol::TS_ABORTED:
-      case Protocol::TS_COMMITED:
-        {
-          // nothing for now
-          break;
-        }
-      }
-    }
-
-    void
-    api ()
-    {
-      if ((current_.status == Protocol::TS_COMMITED ||
-           current_.status == Protocol::TS_ABORTED) &&
-          separation_duration_ == 0) // no transaction in progress
-      {
-        // start new transaction
-
-        // Note that in_ is already locked by Scheduler
-
-        MessagePtr m (in_.front ());
-        in_.pop ();
-
-        if (typeid (*m) == typeid (Send))
-        {
-          send_ = SendPtr (dynamic_cast<Send*> (m.release ()));
-        }
-        else
-        {
-          // cerr << "Expecting Send but received " << typeid (*m).name ()
-          //      << endl;
-
-          ::abort ();
-        }
-
-        current_.id++;
-        current_.status = Protocol::TS_BEGIN;
-
-        initiated_ = true;
-
-        // if (trace_) cerr << "starting transaction with id " << current_.id
-        //                  << endl;
-      }
-    }
-
-  private:
-    typedef ACE_Guard<ACE_Thread_Mutex> AutoLock;
-
-    bool trace_;
-
-    Protocol::Transaction current_;
-
-    bool initiated_;
-
-    unsigned short voting_duration_;
-    unsigned short separation_duration_;
-
-    MessageQueue& in_;
-    MessageQueue& send_out_;
-    MessageQueue& recv_out_;
-
-    SendPtr send_;
-    RecvPtr recv_;
-  };
-}
diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp
index af29cdca943..85997315732 100644
--- a/ace/TP_Reactor.cpp
+++ b/ace/TP_Reactor.cpp
@@ -358,6 +358,11 @@ int
 ACE_TP_Reactor::handle_timer_events (int & /*event_count*/,
                                      ACE_TP_Token_Guard &guard)
 {
+  if (this->timer_queue_->is_empty())
+    { // Empty timer queue so cannot have any expired timers.
+      return 0;
+    }
+
   // Get the current time
   ACE_Time_Value cur_time (this->timer_queue_->gettimeofday () +
                            this->timer_queue_->timer_skew ());
diff --git a/ace/TSS_T.cpp b/ace/TSS_T.cpp
index fc25332dd1f..645a6f0612b 100644
--- a/ace/TSS_T.cpp
+++ b/ace/TSS_T.cpp
@@ -100,7 +100,7 @@ ACE_TSS<TYPE>::ts_init (void) const
   // once!
   if (this->once_ == 0)
     {
-      if (ACE_Thread::keycreate (ACE_const_cast (ACE_thread_key_t *, &this->key_),
+      if (ACE_Thread::keycreate (const_cast<ACE_thread_key_t *> (&this->key_),
 #if defined (ACE_HAS_THR_C_DEST)
                                  &ACE_TSS_C_cleanup,
 #else
@@ -112,7 +112,7 @@ ACE_TSS<TYPE>::ts_init (void) const
         {
           // This *must* come last to avoid race conditions!  Note that
           // we need to "cast away const..."
-          * ACE_const_cast (int*, &this->once_) = 1;
+          * const_cast<int*> (&this->once_) = 1;
           return 0;
         }
     }
diff --git a/ace/Task.cpp b/ace/Task.cpp
index a7fa0894b26..b1311c68306 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -202,12 +202,12 @@ ACE_Task_Base::svc_run (void *args)
   // Call the Task's svc() hook method.
   int svc_status = t->svc ();
   ACE_THR_FUNC_RETURN status;
-#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400)) || (defined (ACE_WIN32) && defined(__IBMCPP__))
+#if (defined (__BORLANDC__) && (__BORLANDC__ <= 0x571)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400)) || (defined (ACE_WIN32) && defined(__IBMCPP__) || defined (__DCC__))
   // Some compilers complain about reinterpret_cast from int to unsigned long...
   status = static_cast<ACE_THR_FUNC_RETURN> (svc_status);
 #else
   status = reinterpret_cast<ACE_THR_FUNC_RETURN> (svc_status);
-#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1400 || __IBMCPP__ */
+#endif /* (__BORLANDC__ <= 0x570) || __MINGW32__ || _MSC_VER <= 1400 || __IBMCPP__ */
 
 // If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke
 #if 1
diff --git a/ace/Thread.inl b/ace/Thread.inl
index f12145ff040..a858535e1b1 100644
--- a/ace/Thread.inl
+++ b/ace/Thread.inl
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-// Thread.i
+// Thread.inl
 
 #include "ace/OS_NS_string.h"
 
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index bd1318a5e93..e4511fdb00c 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -580,7 +580,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
   ACE_TRACE ("ACE_Thread_Manager::spawn_i");
   ACE_hthread_t thr_handle;
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
   // On VxWorks, ACE_thread_t is char *.  If t_id is 0, allocate space
   // for ACE_OS::thr_create () to store the task name.  If t_id is not
   // 0, and it doesn't point to a 0 char *, then the non-zero char *
@@ -630,40 +630,38 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
       new_thr_desc->sync_->release ();
       return -1;
     }
-  else
-    {
+
 #if defined (ACE_HAS_WTHREADS)
-      // Have to duplicate handle if client asks for it.
-      // @@ How are thread handles implemented on AIX?  Do they
-      // also need to be duplicated?
-      if (t_handle != 0)
+  // Have to duplicate handle if client asks for it.
+  // @@ How are thread handles implemented on AIX?  Do they
+  // also need to be duplicated?
+  if (t_handle != 0)
 # if defined (ACE_HAS_WINCE)
-        *t_handle = thr_handle;
+    *t_handle = thr_handle;
 # else  /* ! ACE_HAS_WINCE */
-        (void) ::DuplicateHandle (::GetCurrentProcess (),
-                                  thr_handle,
-                                  ::GetCurrentProcess (),
-                                  t_handle,
-                                  0,
-                                  TRUE,
-                                  DUPLICATE_SAME_ACCESS);
+  (void) ::DuplicateHandle (::GetCurrentProcess (),
+                            thr_handle,
+                            ::GetCurrentProcess (),
+                            t_handle,
+                            0,
+                            TRUE,
+                            DUPLICATE_SAME_ACCESS);
 # endif /* ! ACE_HAS_WINCE */
 #else  /* ! ACE_HAS_WTHREADS */
-     if (t_handle != 0)
-       *t_handle = thr_handle;
+  if (t_handle != 0)
+    *t_handle = thr_handle;
 #endif /* ! ACE_HAS_WTHREADS && ! VXWORKS */
 
-      // append_thr also put the <new_thr_desc> into Thread_Manager's
-      // double-linked list.  Only after this point, can we manipulate
-      // double-linked list from a spawned thread's context.
-      return this->append_thr (*t_id,
-                               thr_handle,
-                               ACE_THR_SPAWNED,
-                               grp_id,
-                               task,
-                               flags,
-                               new_thr_desc.release ());
-    }
+  // append_thr also put the <new_thr_desc> into Thread_Manager's
+  // double-linked list.  Only after this point, can we manipulate
+  // double-linked list from a spawned thread's context.
+  return this->append_thr (*t_id,
+                           thr_handle,
+                           ACE_THR_SPAWNED,
+                           grp_id,
+                           task,
+                           flags,
+                           new_thr_desc.release ());
 }
 
 int
@@ -867,7 +865,7 @@ ACE_Thread_Manager::insert_thr (ACE_thread_t t_id,
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
 
   // Check for duplicates and bail out if we're already registered...
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
   if (this->find_hthread (t_handle) != 0 )
     return -1;
 #else  /* ! VXWORKS */
@@ -923,7 +921,7 @@ ACE_Thread_Manager::remove_thr (ACE_Thread_Descriptor *td,
 {
   ACE_TRACE ("ACE_Thread_Manager::remove_thr");
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
   ACE_thread_t tid = td->self ();
 #endif /* VXWORKS */
 
@@ -932,7 +930,7 @@ ACE_Thread_Manager::remove_thr (ACE_Thread_Descriptor *td,
 #endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */
   this->thr_list_.remove (td);
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
   // Delete the thread ID, if the ACE_Thread_Manager allocated it.
   if (tid  &&  tid[0] == ACE_THR_ID_ALLOCATED)
     {
@@ -1070,7 +1068,7 @@ ACE_Thread_Manager::kill_thr (ACE_Thread_Descriptor *td, int signum)
   ACE_TRACE ("ACE_Thread_Manager::kill_thr");
 
   ACE_thread_t tid = td->thr_id_;
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
   // Skip over the ID-allocated marker, if present.
   tid += tid[0] == ACE_THR_ID_ALLOCATED  ?  1  :  0;
 #endif /* VXWORKS */
@@ -1641,7 +1639,7 @@ ACE_Thread_Manager::exit (ACE_THR_FUNC_RETURN status, int do_thr_exit)
 
     // Find the thread id, but don't use the cache.  It might have been
     // deleted already.
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
     ACE_hthread_t id;
     ACE_OS::thr_self (id);
     ACE_Thread_Descriptor *td = this->find_hthread (id);
@@ -1702,7 +1700,7 @@ ACE_Thread_Manager::exit (ACE_THR_FUNC_RETURN status, int do_thr_exit)
 
     // Find the thread id, but don't use the cache.  It might have been
     // deleted already.
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
     ACE_hthread_t id;
     ACE_OS::thr_self (id);
     ACE_Thread_Descriptor* td = this->find_hthread (id);
diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h
index 583cb94e6cc..551da8dfb82 100644
--- a/ace/Time_Request_Reply.h
+++ b/ace/Time_Request_Reply.h
@@ -23,8 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
-
 /**
  * @class ACE_Time_Request
  *
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index a2f7c856ef8..a95c7caad22 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -21,16 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 # if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS_DIAB_MIPS)
 #   include "ace/os_include/sys/os_time.h"
-#   if defined (__Lynx__)
-#     include /**/ <st.h>
-#     include /**/ <sem.h>
-#   endif /* __Lynx__ */
-#   if defined (VXWORKS)
-#     include /**/ <sys/times.h>
-#   endif /* VXWORKS */
 # endif /* ACE_HAS_WINCE ACE_PSOS_DIAB_MIPS */
 
 // HP-UX 10.20 doesn't define timespec_t - it defined struct timespec.
@@ -334,9 +326,6 @@ private:
   /// Store the values as a timeval.
   timeval tv_;
 };
-#if defined (ACE_WIN32) && defined (_WIN32_WCE)
-}
-#endif
 
 /**
  * @class ACE_Countdown_Time
@@ -380,7 +369,14 @@ private:
 
   /// Keeps track of whether we've already been stopped.
   int stopped_;
+
+  // Prevent copying
+  ACE_Countdown_Time (const ACE_Countdown_Time &);
+  ACE_Countdown_Time &operator= (const ACE_Countdown_Time &);
 };
+#if defined (ACE_WIN32) && defined (_WIN32_WCE)
+}
+#endif
 
 #if defined (__ACE_INLINE__)
 #include "ace/Time_Value.inl"
diff --git a/ace/Time_Value.inl b/ace/Time_Value.inl
index f139d5f7daa..62ef44ce983 100644
--- a/ace/Time_Value.inl
+++ b/ace/Time_Value.inl
@@ -4,6 +4,16 @@
 
 #include "ace/OS_NS_sys_time.h"
 
+#if defined (ACE_WIN32) && defined (_WIN32_WCE)
+// Something is a bit brain-damaged here and I'm not sure what... this code
+// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC
+// complains that the operators that return ACE_Time_Value are C-linkage
+// functions that can't return a C++ class. The only way I've found to
+// defeat this is to wrap the whole class in extern "C++".
+//    - Steve Huston, 23-Aug-2004
+extern "C++" {
+#endif
+
 // Returns the value of the object as a timeval.
 
 ACE_INLINE
@@ -335,3 +345,7 @@ operator - (const ACE_Time_Value &tv1,
   delta.normalize ();
   return delta;
 }
+
+#if defined (ACE_WIN32) && defined (_WIN32_WCE)
+}
+#endif
diff --git a/ace/Timeprobe_T.cpp b/ace/Timeprobe_T.cpp
index 49f98b426cc..bde2c1736dc 100644
--- a/ace/Timeprobe_T.cpp
+++ b/ace/Timeprobe_T.cpp
@@ -15,6 +15,7 @@ ACE_RCSID(ace, Timeprobe_T, "$Id$")
 
 #include "ace/Timeprobe.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/OS_NS_string.h"
 
 template <class ACE_LOCK, class ALLOCATOR>
 ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (u_long size)
@@ -71,17 +72,10 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (const ACE_Timeprobe_Ex<
 template <class ACE_LOCK, class ALLOCATOR>
 ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::~ACE_Timeprobe_Ex (void)
 {
-#if defined (ACE_HAS_BROKEN_DES_ARRAY_FREE)
-  ACE_DES_ARRAY_FREE ( (this->timeprobes_),
-                      this->max_size_,
-                      this->allocator ()->free,
-                      ACE_timeprobe_t);
-#else
   ACE_DES_ARRAY_FREE ((ACE_timeprobe_t *) (this->timeprobes_),
                       this->max_size_,
                       this->allocator ()->free,
                       ACE_timeprobe_t);
-#endif
 }
 
 template <class ACE_LOCK, class ALLOCATOR> void
@@ -157,22 +151,10 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::increase_size (u_long size)
          // Iterates over the array explicitly calling the destructor for
          // each probe instance, then deallocates the memory
 
-         // There is a compiler bug for VxWorks (gcc version 2.96-PentiumIII-991112 Tornado 2)
-         // which cannot handle the cast for timeprobes_addr()
-#if defined (ACE_HAS_BROKEN_DES_ARRAY_FREE)
-         ACE_DES_ARRAY_FREE (
-                             (this->timeprobes_),
-                             this->max_size_,
-                             this->allocator ()->free,
-                             ACE_timeprobe_t);
-#else
-         ACE_DES_ARRAY_FREE ((ACE_timeprobe_t *)
-                             (this->timeprobes_),
+         ACE_DES_ARRAY_FREE ((ACE_timeprobe_t *)(this->timeprobes_),
                              this->max_size_,
                              this->allocator ()->free,
                              ACE_timeprobe_t);
-#endif
-
       }
       this->timeprobes_ = temp;
       this->max_size_ = size;
@@ -329,14 +311,17 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times (void)
     i = this->current_size_;
   }
 
+  ACE_Time_Value tv; // to convert ACE_hrtime_t
   do
     {
+      ACE_High_Res_Timer::hrtime_to_tv (tv, this->timeprobes_ [i].time_);
+
       ACE_DEBUG ((LM_DEBUG,
                   "%-50.50s %8.8x %12.12u\n",
                   this->find_description_i (i),
                   this->timeprobes_ [i].thread_,
-                  this->timeprobes_ [i].time_.sec () * 1000000
-                   + this->timeprobes_[i].time_.usec ()));
+                  tv.sec () * 1000000
+                   + tv.usec ()));
       i = (i + 1) % this ->max_size_; // Modulus increment: loops around at the end.
 
     } while (i != this->current_size_);
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h
index 621264b39ab..2b6e7944438 100644
--- a/ace/Timer_Hash_T.h
+++ b/ace/Timer_Hash_T.h
@@ -134,7 +134,7 @@ public:
   virtual ACE_Timer_Node_T<TYPE> *item (void);
 
 protected:
-  /// Pointer to the <ACE_Timer_Hash> that we are iterating over.
+  /// Pointer to the ACE_Timer_Hash that we are iterating over.
   ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &timer_hash_;
 
   /// Current position in <timer_hash_>'s table
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index 537c2e85734..81224fa354b 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -234,8 +234,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void)
     }
 
   // We need to truncate this to <int> for backwards compatibility.
-  int new_id = ACE_static_cast (int,
-                                this->timer_ids_curr_);
+  int new_id = static_cast<int> (this->timer_ids_curr_);
   return new_id;
 }
 
@@ -509,7 +508,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 
   // And add the new elements to the end of the "freelist".
   for (size_t i = this->max_size_; i < new_size; i++)
-    this->timer_ids_[i] = -(ACE_static_cast (ssize_t, i) + 1);
+    this->timer_ids_[i] = -(static_cast<ssize_t> (i) + 1);
 
    // Grow the preallocation array (if using preallocation)
   if (this->preallocated_nodes_ != 0)
diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h
index cf011cd4a7d..3b85b985801 100644
--- a/ace/Timer_List_T.h
+++ b/ace/Timer_List_T.h
@@ -27,7 +27,7 @@ class ACE_Timer_List_T;
 /**
  * @class ACE_Timer_List_Iterator_T
  *
- * @brief Iterates over an <ACE_Timer_List>.
+ * @brief Iterates over an ACE_Timer_List.
  *
  * This is a generic iterator that can be used to visit every
  * node of a timer queue.
@@ -57,10 +57,10 @@ public:
   virtual ACE_Timer_Node_T<TYPE> *item (void);
 
 protected:
-  /// Pointer to the <ACE_Timer_List> that we are iterating over.
+  /// Pointer to the ACE_Timer_List that we are iterating over.
   List& list_;
 
-  /// Current position in the <ACE_Timer_List>
+  /// Current position in the ACE_Timer_List
   ACE_Timer_Node_T<TYPE>* current_node_;
 };
 
@@ -98,9 +98,9 @@ public:
 
   // = Initialization and termination methods.
   /**
-   * Default constructor. <upcall_functor> is the instance of the
-   * FUNCTOR to be used by the list. If <upcall_functor> is 0, a
-   * default FUNCTOR will be created.  <freelist> the freelist of
+   * Default constructor. @a upcall_functor is the instance of the
+   * FUNCTOR to be used by the list. If @a upcall_functor is 0, a
+   * default FUNCTOR will be created.  @a freelist is the freelist of
    * timer nodes.  If 0, then a default freelist will be created.
    */
   ACE_Timer_List_T (FUNCTOR* upcall_functor = 0, FreeList* freelist = 0);
@@ -111,30 +111,30 @@ public:
   /// True if queue is empty, else false.
   virtual int is_empty (void) const;
 
-  /// Returns the time of the earlier node in the <ACE_Timer_List>.
+  /// Returns the time of the earlier node in the ACE_Timer_List.
   /// Must be called on a non-empty queue.
   virtual const ACE_Time_Value& earliest_time (void) const;
 
   /**
-   * Resets the interval of the timer represented by <timer_id> to
-   * <interval>, which is specified in relative time to the current
-   * <gettimeofday>.  If <interval> is equal to
-   * <ACE_Time_Value::zero>, the timer will become a non-rescheduling
+   * Resets the interval of the timer represented by @a timer_id to
+   * @a interval, which is specified in relative time to the current
+   * <gettimeofday>.  If @a interval is equal to
+   * ACE_Time_Value::zero, the timer will become a non-rescheduling
    * timer.  Returns 0 if successful, -1 if not.
    */
   virtual int reset_interval (long timer_id,
                               const ACE_Time_Value& interval);
 
   /**
-   * Cancel all timers associated with <type>.  If <dont_call> is 0
-   * then the <functor> will be invoked.  Returns number of timers
+   * Cancel all timers associated with @a type.  If dont_call_handle_close is 0
+   * then the @a functor will be invoked.  Returns the number of timers
    * cancelled.
    */
   virtual int cancel (const TYPE& type,
                       int dont_call_handle_close = 1);
 
   /**
-   * Cancel the single timer that matches the <timer_id> value (which
+   * Cancel the single timer that matches the @a timer_id value (which
    * was returned from the <schedule> method).  If act is non-NULL
    * then it will be set to point to the ``magic cookie'' argument
    * passed in when the timer was registered.  This makes it possible
@@ -146,7 +146,7 @@ public:
                       const void** act = 0,
                       int dont_call_handle_close = 1);
 
-  /// Returns a pointer to this <ACE_Timer_Queue>'s iterator.
+  /// Returns a pointer to this ACE_Timer_Queue's iterator.
   virtual ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>& iter (void);
 
   /// Removes the earliest node from the queue and returns it
@@ -155,7 +155,7 @@ public:
   /// Dump the state of an object.
   virtual void dump (void) const;
 
-  /// Reschedule an "interval" <ACE_Timer_Node>.  This should be private
+  /// Reschedule an "interval" ACE_Timer_Node_T.  This should be private
   /// but for now it needs to be public for <ACE_Timer_Hash_T>
   virtual void reschedule (ACE_Timer_Node_T<TYPE> *);
 
diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h
index e02fb262af6..ed8d0cd8ecc 100644
--- a/ace/Timer_Queue_Adapters.h
+++ b/ace/Timer_Queue_Adapters.h
@@ -45,14 +45,14 @@ public:
 
   /// Constructor
   /**
-   * Register the SIGALRM handler.  If <mask> == 0 then block all
+   * Register the SIGALRM handler.  If @a mask == 0 then block all
    * signals when <SIGALRM> is run.  Otherwise, just block the signals
-   * indicated in <mask>.
+   * indicated in @a mask.
    */
   ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *mask = 0);
 
   /// Schedule the timer according to the semantics of the
-  /// <ACE_Timer_List>.
+  /// ACE_Timer_List.
   /**
    * This timer gets dispatched via a signal, rather than by a user
    * calling expire().  Note that interval timers are not implemented
@@ -138,7 +138,7 @@ public:
                  const ACE_Time_Value &future_time,
                  const ACE_Time_Value &interval = ACE_Time_Value::zero);
 
-  /// Cancel the <timer_id> and return the <act> parameter if an
+  /// Cancel the @a timer_id and return the @a act parameter if an
   /// address is passed in. Also wakes up the dispatching thread.
   int cancel (long timer_id, const void **act = 0);
 
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp
index 331cd3d58bc..f32b29b8853 100644
--- a/ace/Timer_Wheel_T.cpp
+++ b/ace/Timer_Wheel_T.cpp
@@ -273,7 +273,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK> u_int
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::calculate_spoke
   (const ACE_Time_Value& t) const
 {
-  return ACE_static_cast(u_int, (t.msec () >> this->res_bits_) & (this->spoke_count_ - 1));
+  return static_cast<u_int> ((t.msec () >> this->res_bits_) & (this->spoke_count_ - 1));
 }
 
 /// Generates a unique timer_id for the given spoke. It should be pretty
@@ -304,7 +304,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::generate_timer_id (u_int spoke)
 #  pragma warning(push)
 #  pragma warning(disable : 4311)
 #endif /* ACE_WIN64 */
-  long next_cnt = ACE_reinterpret_cast (long, root->get_act ());
+  long next_cnt = reinterpret_cast<long> (root->get_act ());
 #if defined (ACE_WIN64)
 #  pragma warning(pop)
 #endif /* ACE_WIN64 */
@@ -359,7 +359,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::generate_timer_id (u_int spoke)
 #  pragma warning(push)
 #  pragma warning(disable : 4312)
 #endif /* ACE_WIN64 */
-          root->set_act (ACE_reinterpret_cast (void*, next_cnt));
+          root->set_act (reinterpret_cast<void*> (next_cnt));
 #if defined (ACE_WIN64)
 #  pragma warning(pop)
 #endif /* ACE_WIN64 */
@@ -828,14 +828,6 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value& cur_ti
       // Get the dispatch info
       n->get_dispatch_info (info);
 
-      const void *upcall_act = 0;
-
-      this->preinvoke (info, cur_time, upcall_act);
-
-      this->upcall (info, cur_time);
-
-      this->postinvoke (info, cur_time, upcall_act);
-
       if (n->get_interval () > ACE_Time_Value::zero)
         {
           // Make sure that we skip past values that have already
@@ -852,11 +844,17 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value& cur_ti
           this->free_node (n);
         }
 
+      const void *upcall_act = 0;
+
+      this->preinvoke (info, cur_time, upcall_act);
+
+      this->upcall (info, cur_time);
+
+      this->postinvoke (info, cur_time, upcall_act);
+
       n = this->remove_first_expired (cur_time);
     }
 
-  //ACE_ERROR((LM_ERROR, "Expired %d nodes\n", expcount));
-
   return expcount;
 }
 
diff --git a/ace/TkReactor.cpp b/ace/TkReactor.cpp
index eb14225cade..5fb8b56db71 100644
--- a/ace/TkReactor.cpp
+++ b/ace/TkReactor.cpp
@@ -1,6 +1,5 @@
 #include "ace/TkReactor.h"
 
-#if defined (ACE_HAS_TK)
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Connector.h"
 
@@ -435,4 +434,3 @@ ACE_TkReactor::cancel_timer (long timer_id,
     }
 }
 
-#endif /* ACE_HAS_TK */
diff --git a/ace/TkReactor.h b/ace/TkReactor.h
index 7868eb6650c..024d341b937 100644
--- a/ace/TkReactor.h
+++ b/ace/TkReactor.h
@@ -20,8 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_TK)
-
+#include "ace/ACE_TkReactor_export.h"
 #include "ace/Select_Reactor.h"
 #include /**/ <tk.h>
 
@@ -31,7 +30,7 @@
  * @brief This little class is necessary due to the way that Microsoft
  * implements sockets to be pointers rather than indices.
  */
-class ACE_Export ACE_TkReactorID
+class ACE_TkReactor_Export ACE_TkReactorID
 {
 public:
   /// Underlying handle.
@@ -43,7 +42,7 @@ public:
 
 class ACE_TkReactor;
 
-class ACE_Export ACE_TkReactor_Input_Callback
+class ACE_TkReactor_Export ACE_TkReactor_Input_Callback
 {
 public:
   ACE_TkReactor *reactor_;
@@ -56,7 +55,7 @@ public:
  * @brief An object-oriented event demultiplexor and event handler
  * dispatcher that uses the Tk functions.
  */
-class ACE_Export ACE_TkReactor : public ACE_Select_Reactor
+class ACE_TkReactor_Export ACE_TkReactor : public ACE_Select_Reactor
 {
 public:
   // = Initialization and termination methods.
@@ -128,6 +127,5 @@ private:
   ACE_TkReactor &operator = (const ACE_TkReactor &);
 };
 
-#endif /* ACE_HAS_TK */
 #include /**/ "ace/post.h"
 #endif /* ACE_TK_REACTOR_H */
diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp
index c85c7f7e08f..5287cd6208a 100644
--- a/ace/Token_Collection.cpp
+++ b/ace/Token_Collection.cpp
@@ -22,8 +22,7 @@ ACE_Token_Collection::ACE_Token_Collection (int debug,
     name = ACE_LIB_TEXT ("no name");
 
   ACE_OS::strsncpy (this->name_,
-                    ACE_const_cast (ACE_TCHAR *,
-                                    name),
+                    const_cast<ACE_TCHAR *> (name),
                     ACE_MAXTOKENNAMELEN);
 }
 
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 981095b0538..1f42c8406cf 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -33,7 +33,6 @@
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
 #include "ace/Local_Tokens.h"
-#include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
 /**
diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp
index 4ef4c22a1c9..4a0ed531b72 100644
--- a/ace/UNIX_Addr.cpp
+++ b/ace/UNIX_Addr.cpp
@@ -1,4 +1,3 @@
-// UNIX_Addr.cpp
 // $Id$
 
 #include "ace/UNIX_Addr.h"
@@ -92,12 +91,9 @@ ACE_UNIX_Addr::set (const char rendezvous_point[])
 			 0,
 			 sizeof this->unix_addr_);
   this->unix_addr_.sun_family = AF_UNIX;
-  size_t len = ACE_OS::strlen (rendezvous_point);
-  size_t maxlen = sizeof this->unix_addr_.sun_path;
-
-  (void) ACE_OS::memcpy (this->unix_addr_.sun_path,
-			 rendezvous_point,
-                         len >= maxlen ? maxlen - 1 : len);
+  (void) ACE_OS::strsncpy (this->unix_addr_.sun_path, 
+                           rendezvous_point,
+                           sizeof this->unix_addr_.sun_path);
 
   this->ACE_Addr::base_set (AF_UNIX,
 			    sizeof this->unix_addr_ -
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index 86be58e2452..7825bac26f5 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -65,11 +65,19 @@ public:
   virtual void set_addr (void *addr, int len);
 
   /// Transform the current address into string format.
-  virtual int addr_to_string (char addr[], size_t) const;
+  virtual int addr_to_string (ACE_TCHAR addr[], size_t) const;
 
   /// Transform the string into the current addressing format.
   virtual int string_to_addr (const char addr[]);
 
+#if defined (ACE_HAS_WCHAR)
+  /// Creates an ACE_UNIX_Addr from a string.
+  ACE_UNIX_Addr (const wchar_t rendezvous_point[]);
+
+  /// Creates an ACE_UNIX_Addr from a string.
+  int set (const wchar_t rendezvous_point[]);
+#endif /* ACE_HAS_WCHAR */
+
   /// Compare two addresses for equality.
   bool operator == (const ACE_UNIX_Addr &SAP) const;
 
diff --git a/ace/UNIX_Addr.inl b/ace/UNIX_Addr.inl
index 57303a817da..a5a755f20c4 100644
--- a/ace/UNIX_Addr.inl
+++ b/ace/UNIX_Addr.inl
@@ -29,12 +29,30 @@ ACE_UNIX_Addr::string_to_addr (const char addr[])
 // Transform the current address into string format.
 
 ACE_INLINE int
-ACE_UNIX_Addr::addr_to_string (char s[], size_t len) const
+ACE_UNIX_Addr::addr_to_string (ACE_TCHAR s[], size_t len) const
 {
-  ACE_OS::strsncpy (s, this->unix_addr_.sun_path, len);
+  ACE_OS::strsncpy (s,
+                    ACE_TEXT_CHAR_TO_TCHAR (this->unix_addr_.sun_path),
+                    len);
   return 0;
 }
 
+#if defined (ACE_HAS_WCHAR)
+/// Creates an ACE_UNIX_Addr from a string.
+ACE_INLINE
+ACE_UNIX_Addr::ACE_UNIX_Addr (const wchar_t rendezvous_point[])
+{
+  this->set (ACE_TEXT_ALWAYS_CHAR (rendezvous_point));
+}
+
+/// Creates an ACE_UNIX_Addr from a string.
+ACE_INLINE int
+ACE_UNIX_Addr::set (const wchar_t rendezvous_point[])
+{
+  return this->set (ACE_TEXT_ALWAYS_CHAR (rendezvous_point));
+}
+#endif /* ACE_HAS_WCHAR */
+
 // Compare two addresses for equality.
 
 ACE_INLINE bool
diff --git a/ace/UPIPE_Stream.cpp b/ace/UPIPE_Stream.cpp
index e452db9f56e..4df8d5fc547 100644
--- a/ace/UPIPE_Stream.cpp
+++ b/ace/UPIPE_Stream.cpp
@@ -110,7 +110,7 @@ ACE_UPIPE_Stream::send (const char *buffer,
   return
     this->stream_.put (mb_p, timeout) == -1
     ? -1
-    : ACE_static_cast (ssize_t, n);
+    : static_cast<ssize_t> (n);
 }
 
 // Receive a buffer.
diff --git a/ace/UUID.cpp b/ace/UUID.cpp
index 6f9ced30d41..917f73b254d 100644
--- a/ace/UUID.cpp
+++ b/ace/UUID.cpp
@@ -132,7 +132,7 @@ namespace ACE_Utils
           {
             ACE_DEBUG ((LM_DEBUG,
                         "UUID::UUID - "
-                        "IllegalArgument(invalid string representation)"));
+                        "IllegalArgument(invalid string representation)\n"));
             return;
           }
       }
@@ -159,20 +159,20 @@ namespace ACE_Utils
           {
             ACE_DEBUG ((LM_DEBUG,
                         "ACE_UUID::ACE_UUID - "
-                        "IllegalArgument(invalid string representation)"));
+                        "IllegalArgument(invalid string representation)\n"));
             return;
           }
       }
 
-    this->timeLow_ = ACE_static_cast (ACE_UINT32, timeLow);
-    this->timeMid_ = ACE_static_cast (ACE_UINT16, timeMid);
-    this->timeHiAndVersion_ = ACE_static_cast (ACE_UINT16, timeHiAndVersion);
-    this->clockSeqHiAndReserved_ = ACE_static_cast (u_char, clockSeqHiAndReserved);
-    this->clockSeqLow_ = ACE_static_cast (u_char, clockSeqLow);
+    this->timeLow_ = static_cast<ACE_UINT32> (timeLow);
+    this->timeMid_ = static_cast<ACE_UINT16> (timeMid);
+    this->timeHiAndVersion_ = static_cast<ACE_UINT16> (timeHiAndVersion);
+    this->clockSeqHiAndReserved_ = static_cast<u_char> (clockSeqHiAndReserved);
+    this->clockSeqLow_ = static_cast<u_char> (clockSeqLow);
 
     UUID_node::NodeID nodeID;
     for (int i = 0; i < UUID_node::NODE_ID_SIZE; ++i)
-      nodeID [i] = ACE_static_cast (u_char, node[i]);
+      nodeID [i] = static_cast<u_char> (node[i]);
 
     this->node_->nodeID (nodeID);
 
@@ -181,7 +181,7 @@ namespace ACE_Utils
       {
         ACE_DEBUG ((LM_DEBUG,
                     "ACE_UUID_Impl::ACE_UUID_Impl - "
-                    "IllegalArgument(unsupported variant)"));
+                    "IllegalArgument(unsupported variant)\n"));
         return;
       }
 
@@ -194,7 +194,7 @@ namespace ACE_Utils
       {
         ACE_DEBUG ((LM_DEBUG,
                     "ACE_UUID::ACE_UUID - "
-                    "IllegalArgument(unsupported version)"));
+                    "IllegalArgument(unsupported version)\n"));
         return;
       }
     if ((this->clockSeqHiAndReserved_ & 0xc0) == 0xc0)
@@ -203,7 +203,7 @@ namespace ACE_Utils
           {
             ACE_DEBUG ((LM_DEBUG,
                       "ACE_UUID::ACE_UUID - "
-                        "IllegalArgument (Missing Thread and Process Id)"));
+                        "IllegalArgument (Missing Thread and Process Id)\n"));
             return;
           }
         ACE_CString thr_pid_str (thr_pid_buf);
@@ -211,7 +211,7 @@ namespace ACE_Utils
         if (pos == -1)
           ACE_DEBUG ((LM_DEBUG,
                       "ACE_UUID::ACE_UUID - "
-                      "IllegalArgument (Thread and Process Id format incorrect)"));
+                      "IllegalArgument (Thread and Process Id format incorrect)\n"));
 
         this->thr_id_ = thr_pid_str.substr (0, pos);
       this->pid_ = thr_pid_str.substr (pos+1, thr_pid_str.length ()-pos-1);
@@ -332,12 +332,12 @@ namespace ACE_Utils
       }
     else
       {
-        nodeID [0] = ACE_static_cast (u_char, ACE_OS::rand());
-        nodeID [1] = ACE_static_cast (u_char, ACE_OS::rand());
-        nodeID [2] = ACE_static_cast (u_char, ACE_OS::rand());
-        nodeID [3] = ACE_static_cast (u_char, ACE_OS::rand());
-        nodeID [4] = ACE_static_cast (u_char, ACE_OS::rand());
-        nodeID [5] = ACE_static_cast (u_char, ACE_OS::rand());
+        nodeID [0] = static_cast<u_char> (ACE_OS::rand());
+        nodeID [1] = static_cast<u_char> (ACE_OS::rand());
+        nodeID [2] = static_cast<u_char> (ACE_OS::rand());
+        nodeID [3] = static_cast<u_char> (ACE_OS::rand());
+        nodeID [4] = static_cast<u_char> (ACE_OS::rand());
+        nodeID [5] = static_cast<u_char> (ACE_OS::rand());
       }
 
     this->get_timestamp (timeLast_);
@@ -358,11 +358,11 @@ namespace ACE_Utils
 
 
     // Construct a Version 1 UUID with the information in the arguements.
-    uuid.timeLow (ACE_static_cast (ACE_UINT32, timestamp & 0xFFFFFFFF));
-    uuid.timeMid (ACE_static_cast(ACE_UINT16, (timestamp >> 32) & 0xFFFF));
+    uuid.timeLow (static_cast<ACE_UINT32> (timestamp & 0xFFFFFFFF));
+    uuid.timeMid (static_cast<ACE_UINT16> ((timestamp >> 32) & 0xFFFF));
 
 
-    ACE_UINT16 tHAV = ACE_static_cast (ACE_UINT16, (timestamp >> 48) & 0xFFFF);
+    ACE_UINT16 tHAV = static_cast<ACE_UINT16> ((timestamp >> 48) & 0xFFFF);
     tHAV |= (version << 12);
     uuid.timeHiAndVersion (tHAV);
 
@@ -387,7 +387,7 @@ namespace ACE_Utils
 
       ACE_OS::sprintf (buf,
                        "%d",
-                       ACE_static_cast (int, ACE_OS::getpid ()));
+                       static_cast<int> (ACE_OS::getpid ()));
       uuid.pid (buf);
     }
   }
diff --git a/ace/Unbounded_Queue.cpp b/ace/Unbounded_Queue.cpp
index d265d9b9fd2..332fddb4428 100644
--- a/ace/Unbounded_Queue.cpp
+++ b/ace/Unbounded_Queue.cpp
@@ -166,8 +166,7 @@ ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item)
 
   // Create a new node that points to the original head.
   ACE_NEW_MALLOC_RETURN (temp,
-                         ACE_static_cast(ACE_Node<T> *,
-                           this->allocator_->malloc (sizeof (ACE_Node<T>))),
+                         static_cast<ACE_Node<T> *> (this->allocator_->malloc (sizeof (ACE_Node<T>))),
                          ACE_Node<T> (new_item, this->head_->next_),
                          -1);
   // Link this pointer into the front of the list.  Note that the
@@ -193,8 +192,7 @@ ACE_Unbounded_Queue<T>::enqueue_tail (const T &new_item)
 
   // Create a new dummy node.
   ACE_NEW_MALLOC_RETURN (temp,
-                         ACE_static_cast(ACE_Node<T> *,
-                           this->allocator_->malloc (sizeof (ACE_Node<T>))),
+                         static_cast<ACE_Node<T> *> (this->allocator_->malloc (sizeof (ACE_Node<T>))),
                          ACE_Node<T> (this->head_->next_),
                          -1);
   // Link this dummy pointer into the list.
diff --git a/ace/Unbounded_Set.cpp b/ace/Unbounded_Set.cpp
index 948144cbc06..54ffa30a0f2 100644
--- a/ace/Unbounded_Set.cpp
+++ b/ace/Unbounded_Set.cpp
@@ -37,8 +37,7 @@ ACE_Unbounded_Set<T>::insert_tail (const T &item)
 
   // Create a new dummy node.
   ACE_NEW_MALLOC_RETURN (temp,
-                         ACE_static_cast(ACE_Node<T>*,
-                           this->allocator_->malloc (sizeof (ACE_Node<T>))),
+                         static_cast<ACE_Node<T>*> (this->allocator_->malloc (sizeof (ACE_Node<T>))),
                          ACE_Node<T> (this->head_->next_),
                          -1);
   // Link this pointer into the list.
@@ -166,7 +165,7 @@ ACE_Unbounded_Set<T>::ACE_Unbounded_Set (const ACE_Unbounded_Set<T> &us)
   this->copy_nodes (us);
 }
 
-template <class T> void
+template <class T> ACE_Unbounded_Set<T> &
 ACE_Unbounded_Set<T>::operator= (const ACE_Unbounded_Set<T> &us)
 {
   ACE_TRACE ("ACE_Unbounded_Set<T>::operator=");
@@ -176,6 +175,8 @@ ACE_Unbounded_Set<T>::operator= (const ACE_Unbounded_Set<T> &us)
       this->delete_nodes ();
       this->copy_nodes (us);
     }
+
+  return *this;
 }
 
 template <class T> int
diff --git a/ace/Unbounded_Set.h b/ace/Unbounded_Set.h
index ffb57a2799b..d4f2a957cdd 100644
--- a/ace/Unbounded_Set.h
+++ b/ace/Unbounded_Set.h
@@ -206,7 +206,7 @@ public:
   /**
    * Perform a deep copy of the rhs into the lhs.
    */
-  void operator= (const ACE_Unbounded_Set<T> &);
+  ACE_Unbounded_Set<T> & operator= (const ACE_Unbounded_Set<T> &);
 
   /// Destructor.
   /**
@@ -230,30 +230,30 @@ public:
 
   // = Classic unordered set operations.
 
-  ///Linear insertion of an item.
+  /// Linear insertion of an item.
   /**
-   * Insert <new_item> into the set (doesn't allow duplicates).
+   * Insert @a new_item into the set (doesn't allow duplicates).
    * Returns -1 if failures occur, 1 if item is already present, else
    * 0.
    */
   int insert (const T &new_item);
 
-  /// Insert <item> at the tail of the set (doesn't check for
+  /// Insert @a item at the tail of the set (doesn't check for
   /// duplicates).
   /**
    * Constant time insert at the end of the set.
    */
   int insert_tail (const T &item);
 
-  ///Linear remove operation.
+  /// Linear remove operation.
   /**
-   * Remove first occurrence of <item> from the set.  Returns 0 if
+   * Remove first occurrence of @a item from the set.  Returns 0 if
    * it removes the item, -1 if it can't find the item, and -1 if a
    * failure occurs.
    */
   int remove (const T &item);
 
-  /// Finds if <item> occurs in the set.  Returns 0 if find succeeds,
+  /// Finds if @a item occurs in the set.  Returns 0 if find succeeds,
   /// else -1.
   /**
    * Performs a linear find operation.
diff --git a/ace/Unbounded_Set_Ex.cpp b/ace/Unbounded_Set_Ex.cpp
deleted file mode 100644
index e59e33857f9..00000000000
--- a/ace/Unbounded_Set_Ex.cpp
+++ /dev/null
@@ -1,629 +0,0 @@
-// $Id$
-
-#ifndef ACE_UNBOUNDED_SET_EX_C
-#define ACE_UNBOUNDED_SET_EX_C
-
-#include "ace/Unbounded_Set_Ex.h"
-#include "ace/Malloc_Base.h"
-#include "ace/Log_Msg.h"
-#include "ace/os_include/os_errno.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Unbounded_Set_Ex.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (ace,
-           Unbounded_Set_Ex,
-           "$Id$")
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex)
-
-template <class T> size_t
-ACE_Unbounded_Set_Ex<T>::size (void) const
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::size");
-  return this->cur_size_;
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex<T>::insert_tail (const T &item)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::insert_tail");
-  ACE_Node<T> *temp;
-
-  // Insert <item> into the old dummy node location.
-  this->head_->item_ = item;
-
-  // Create a new dummy node.
-  ACE_NEW_MALLOC_RETURN (temp,
-                         ACE_static_cast(ACE_Node<T>*,
-                           this->allocator_->malloc (sizeof (ACE_Node<T>))),
-                         ACE_Node<T> (this->head_->next_),
-                         -1);
-  // Link this pointer into the list.
-  this->head_->next_ = temp;
-
-  // Point the head to the new dummy node.
-  this->head_ = temp;
-
-  this->cur_size_++;
-  return 0;
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex<T>::reset (void)
-{
-  ACE_TRACE ("reset");
-
-  this->delete_nodes ();
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex<T>::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nhead_ = %u"), this->head_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_));
-
-  T *item = 0;
-#if !defined (ACE_NLOGGING)
-  size_t count = 1;
-#endif /* ! ACE_NLOGGING */
-
-  for (ACE_Unbounded_Set_Ex_Iterator<T> iter (*(ACE_Unbounded_Set_Ex<T> *) this);
-       iter.next (item) != 0;
-       iter.advance ())
-    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("count = %d\n"), count++));
-
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex<T>::copy_nodes (const ACE_Unbounded_Set_Ex<T> &us)
-{
-  for (ACE_Node<T> *curr = us.head_->next_;
-       curr != us.head_;
-       curr = curr->next_)
-    {
-      if (!curr->deleted_)
-        this->insert_tail (curr->item_);
-    }
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex<T>::delete_nodes (void)
-{
-  ACE_Node<T> *curr = this->head_->next_;
-  ACE_ASSERT (number_of_iterators_ == 0);
-  // Keep looking until we've hit the dummy node.
-
-  while (curr != this->head_)
-    {
-      ACE_Node<T> *temp = curr;
-      curr = curr->next_;
-      if (!temp->deleted_)
-        this->cur_size_--;
-      ACE_DES_FREE_TEMPLATE (temp,
-                             this->allocator_->free,
-                             ACE_Node,
-                             <T>);
-    }
-
-  // Reset the list to be a circular list with just a dummy node.
-  this->head_->next_ = this->head_;
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex<T>::cleanup ()
-{
-  /// curr is the address of the chaining
-  ACE_Node<T> **curr = &(this->head_->next_);
-  ACE_ASSERT (number_of_iterators_ == 0);
-
-  // Keep looking until we've hit the dummy node.
-  while (*curr != this->head_)
-    {
-      if ((*curr)->deleted_)
-        {
-          ACE_Node<T> *temp = *curr;
-          *curr = (*curr)->next_; // skip the deleted, curr is still the same
-          ACE_DES_FREE_TEMPLATE (temp,
-                                 this->allocator_->free,
-                                 ACE_Node,
-                                 <T>);
-        }
-      else
-        {
-          curr = &((*curr)->next_);
-        }
-    }
-}
-
-template <class T>
-ACE_Unbounded_Set_Ex<T>::~ACE_Unbounded_Set_Ex (void)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::~ACE_Unbounded_Set_Ex");
-
-  this->delete_nodes ();
-
-  // Delete the dummy node.
-  ACE_DES_FREE_TEMPLATE (head_,
-                         this->allocator_->free,
-                         ACE_Node,
-                         <T>);
-  this->head_ = 0;
-}
-
-template <class T>
-ACE_Unbounded_Set_Ex<T>::ACE_Unbounded_Set_Ex (ACE_Allocator *alloc)
-  : head_ (0),
-    cur_size_ (0),
-    allocator_ (alloc),
-    number_of_iterators_ (0)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::ACE_Unbounded_Set_Ex");
-
-  if (this->allocator_ == 0)
-    this->allocator_ = ACE_Allocator::instance ();
-
-  ACE_NEW_MALLOC (this->head_,
-                  (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
-                  ACE_Node<T>);
-  // Make the list circular by pointing it back to itself.
-  this->head_->next_ = this->head_;
-}
-
-template <class T>
-ACE_Unbounded_Set_Ex<T>::ACE_Unbounded_Set_Ex (const ACE_Unbounded_Set_Ex<T> &us)
-  : head_ (0),
-    cur_size_ (0),
-    allocator_ (us.allocator_),
-    number_of_iterators_ (0)
-{
-  ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::ACE_Unbounded_Set_Ex");
-
-  if (this->allocator_ == 0)
-    this->allocator_ = ACE_Allocator::instance ();
-
-  ACE_NEW_MALLOC (this->head_,
-                  (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
-                  ACE_Node<T>);
-  this->head_->next_ = this->head_;
-  this->copy_nodes (us);
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex<T>::operator= (const ACE_Unbounded_Set_Ex<T> &us)
-{
-  ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::operator=");
-
-  if (this != &us)
-    {
-      this->delete_nodes ();
-      this->copy_nodes (us);
-    }
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex<T>::find (const T &item) const
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::find");
-  // Set <item> into the dummy node.
-  this->head_->item_ = item;
-
-  ACE_Node<T> *temp = this->head_->next_;
-
-  // Keep looping until we find the item.
-  while (!(temp->item_ == item && !temp->deleted_))
-    temp = temp->next_;
-
-  // If we found the dummy node then it's not really there, otherwise,
-  // it is there.
-  return temp == this->head_ ? -1 : 0;
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex<T>::insert (const T &item)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::insert");
-  if (this->find (item) == 0)
-    return 1;
-  else
-    return this->insert_tail (item);
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex<T>::remove (const T &item)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::remove");
-
-  // Insert the item to be founded into the dummy node.
-  this->head_->item_ = item;
-  this->head_->deleted_ = false;
-
-  ACE_Node<T> *curr = this->head_;
-
-  while (!(curr->next_->item_ == item) || curr->next_->deleted_)
-    curr = curr->next_;
-
-  if (curr->next_ == this->head_)
-    return -1; // Item was not found.
-  else
-    {
-      this->cur_size_--;
-      ACE_Node<T> *temp = curr->next_;
-      if (number_of_iterators_>0)
-        {
-          temp->deleted_=true;
-        }
-      else
-        {
-          // Skip over the node that we're deleting.
-          curr->next_ = temp->next_;
-          ACE_DES_FREE_TEMPLATE (temp,
-                                 this->allocator_->free,
-                                 ACE_Node,
-                                 <T>);
-        }
-      return 0;
-    }
-}
-
-template <class T> ACE_Unbounded_Set_Ex_Iterator<T>
-ACE_Unbounded_Set_Ex<T>::begin (void)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::begin");
-  return ACE_Unbounded_Set_Ex_Iterator<T> (*this);
-}
-
-template <class T> ACE_Unbounded_Set_Ex_Iterator<T>
-ACE_Unbounded_Set_Ex<T>::end (void)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::end");
-  return ACE_Unbounded_Set_Ex_Iterator<T> (*this, 1);
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex<T>::iterator_add (void) const
-{
-  number_of_iterators_++;
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex<T>::iterator_leave (void)
-{
-  ACE_ASSERT (number_of_iterators_ > 0);
-  number_of_iterators_--;
-  if (number_of_iterators_ == 0)
-    cleanup ();
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex<T>::const_iterator_leave (void) const
-{
-  ACE_ASSERT (number_of_iterators_ > 0);
-  number_of_iterators_--;
-}
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex_Iterator)
-
-template <class T> void
-ACE_Unbounded_Set_Ex_Iterator<T>::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::dump");
-#endif /* ACE_HAS_DUMP */
-}
-
-template <class T>
-ACE_Unbounded_Set_Ex_Iterator<T>::ACE_Unbounded_Set_Ex_Iterator (ACE_Unbounded_Set_Ex<T> &s, int end)
-  : current_ (end == 0 ? s.head_->next_ : s.head_ ), set_ (&s)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::ACE_Unbounded_Set_Ex_Iterator");
-  // the first one may be deleted
-  while (this->current_->deleted_ && this->current_ != this->set_->head_)
-    this->current_ = this->current_->next_;
-  registered_in_set_ = (!end && this->current_ != this->set_->head_);
-  if (registered_in_set_)
-    set_->iterator_add ();
-}
-
-template <class T>
-ACE_Unbounded_Set_Ex_Iterator<T>::ACE_Unbounded_Set_Ex_Iterator (const ACE_Unbounded_Set_Ex_Iterator<T> &o)
-  : current_ (o.current_), set_ (o.set_),
-    registered_in_set_ (o.registered_in_set_)
-{
-  if (registered_in_set_)
-    set_->iterator_add ();
-}
-
-template <class T> void
-ACE_Unbounded_Set_Ex_Iterator<T>::operator= (const ACE_Unbounded_Set_Ex_Iterator &o)
-{
-  if (this == &o)
-    return;
-  if (registered_in_set_)
-    set_->iterator_leave ();
-  this->set_ = o.set_;
-  this->current_ = o.current_;
-  this->registered_in_set_ = o.registered_in_set_;
-  if (registered_in_set_)
-    set_->iterator_add ();
-}
-
-
-template <class T>
-ACE_Unbounded_Set_Ex_Iterator<T>::~ACE_Unbounded_Set_Ex_Iterator ()
-{
-  if (registered_in_set_)
-    set_->iterator_leave ();
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex_Iterator<T>::advance (void)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::advance");
-  this->current_ = this->current_->next_;
-  while (this->current_->deleted_ && this->current_ != this->set_->head_)
-    this->current_ = this->current_->next_;
-  int completed = (this->current_ == this->set_->head_);
-  if (completed && registered_in_set_)
-    {
-      set_->iterator_leave ();
-      registered_in_set_ = false;
-    }
-  return !completed;
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex_Iterator<T>::first (void)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::first");
-  this->current_ = this->set_->head_->next_;
-  while (this->current_->deleted_ && this->current_ != this->set_->head_)
-    this->current_ = this->current_->next_;
-  int non_empty = (this->current_ != this->set_->head_);
-  if (non_empty && !registered_in_set_)
-    {
-      registered_in_set_ = true;
-      set_->iterator_add ();
-    }
-  return non_empty;
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex_Iterator<T>::done (void) const
-{
-  ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::done");
-
-  return this->current_ == this->set_->head_;
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex_Iterator<T>::next (T *&item)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::next");
-  int completed = (this->current_ == this->set_->head_);
-  if (completed)
-    {
-      if (registered_in_set_)
-        {
-          set_->iterator_leave ();
-          registered_in_set_ = false;
-        }
-      return 0;
-    }
-  item = &this->current_->item_;
-  return 1;
-}
-
-template <class T> ACE_Unbounded_Set_Ex_Iterator<T>
-ACE_Unbounded_Set_Ex_Iterator<T>::operator++ (int)
-{
-  //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::operator++ (int)");
-  ACE_Unbounded_Set_Ex_Iterator<T> retv (*this);
-
-  // postfix operator
-
-  this->advance ();
-  return retv;
-}
-
-template <class T> ACE_Unbounded_Set_Ex_Iterator<T>&
-ACE_Unbounded_Set_Ex_Iterator<T>::operator++ (void)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::operator++ (void)");
-
-  // prefix operator
-
-  this->advance ();
-  return *this;
-}
-
-template <class T> T&
-ACE_Unbounded_Set_Ex_Iterator<T>::operator* (void)
-{
-  //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::operator*");
-  T *retv = 0;
-
-  int result = this->next (retv);
-  ACE_ASSERT (result != 0);
-  ACE_UNUSED_ARG (result);
-
-  return *retv;
-}
-
-template <class T> bool
-ACE_Unbounded_Set_Ex_Iterator<T>::operator== (const ACE_Unbounded_Set_Ex_Iterator<T> &rhs) const
-{
-  //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::operator==");
-  return (this->set_ == rhs.set_ && this->current_ == rhs.current_);
-}
-
-template <class T> bool
-ACE_Unbounded_Set_Ex_Iterator<T>::operator!= (const ACE_Unbounded_Set_Ex_Iterator<T> &rhs) const
-{
-  //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::operator!=");
-  return (this->set_ != rhs.set_ || this->current_ != rhs.current_);
-}
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex_Const_Iterator)
-
-template <class T> void
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::dump");
-#endif /* ACE_HAS_DUMP */
-}
-
-template <class T>
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::ACE_Unbounded_Set_Ex_Const_Iterator (const ACE_Unbounded_Set_Ex<T> &s, int end)
-  : current_ (end == 0 ? s.head_->next_ : s.head_ ), set_ (&s)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::ACE_Unbounded_Set_Ex_Const_Iterator");
-  // the first one may be deleted
-  while (this->current_->deleted_ && this->current_ != this->set_->head_)
-    this->current_ = this->current_->next_;
-  registered_in_set_ = (!end && this->current_ != this->set_->head_);
-  if (registered_in_set_)
-    set_->iterator_add ();
-}
-
-template <class T>
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::ACE_Unbounded_Set_Ex_Const_Iterator
-     (const ACE_Unbounded_Set_Ex_Const_Iterator<T> &o)
-     : current_ (o.current_),
-       set_ (o.set_),
-       registered_in_set_ (o.registered_in_set_)
-{
-  if (registered_in_set_)
-    set_->iterator_add ();
-}
-
-template <class T>
-void ACE_Unbounded_Set_Ex_Const_Iterator<T>::operator=
-     (const ACE_Unbounded_Set_Ex_Const_Iterator& o)
-{
-  if (this == &o)
-    return;
-  if (registered_in_set_)
-    set_->const_iterator_leave ();
-  this->set_ = o.set_;
-  this->current_ = o.current_;
-  this->registered_in_set_ = o.registered_in_set_;
-  if (registered_in_set_)
-    set_->iterator_add ();
-}
-
-template <class T>
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::~ACE_Unbounded_Set_Ex_Const_Iterator ()
-{
-  if (registered_in_set_)
-    set_->const_iterator_leave ();
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::advance (void)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::advance");
-  this->current_ = this->current_->next_;
-  while (this->current_->deleted_ && this->current_ != this->set_->head_)
-    this->current_ = this->current_->next_;
-  int completed = (this->current_ == this->set_->head_);
-  if (completed && registered_in_set_)
-    {
-      set_->const_iterator_leave ();
-      registered_in_set_ = false;
-    }
-  return !completed;
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::first (void)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::first");
-  this->current_ = this->set_->head_->next_;
-  while (this->current_->deleted_ && this->current_ != this->set_->head_)
-    this->current_ = this->current_->next_;
-  int non_empty = (this->current_ != this->set_->head_);
-  if (non_empty && !registered_in_set_)
-    {
-      registered_in_set_ = true;
-      set_->iterator_add ();
-    }
-  return non_empty;
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::done (void) const
-{
-  ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::done");
-
-  return this->current_ == this->set_->head_;
-}
-
-template <class T> int
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::next (T *&item)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::next");
-  int completed = (this->current_ == this->set_->head_);
-  if (completed)
-    {
-      if (registered_in_set_)
-        {
-          set_->const_iterator_leave ();
-          registered_in_set_ = false;
-        }
-      return 0;
-    }
-  item = &this->current_->item_;
-  return 1;
-}
-
-template <class T> ACE_Unbounded_Set_Ex_Const_Iterator<T>
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::operator++ (int)
-{
-  //ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::operator++ (int)");
-  ACE_Unbounded_Set_Ex_Const_Iterator<T> retv (*this);
-
-  // postfix operator
-
-  this->advance ();
-  return retv;
-}
-
-template <class T> ACE_Unbounded_Set_Ex_Const_Iterator<T>&
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::operator++ (void)
-{
-  // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::operator++ (void)");
-
-  // prefix operator
-
-  this->advance ();
-  return *this;
-}
-
-template <class T> T&
-ACE_Unbounded_Set_Ex_Const_Iterator<T>::operator* (void)
-{
-  //ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::operator*");
-  T *retv = 0;
-
-  int result = this->next (retv);
-  ACE_ASSERT (result != 0);
-  ACE_UNUSED_ARG (result);
-
-  return *retv;
-}
-
-#endif /* ACE_UNBOUNDED_SET_EX_C */
diff --git a/ace/Unbounded_Set_Ex.h b/ace/Unbounded_Set_Ex.h
deleted file mode 100644
index 60dfda38cfa..00000000000
--- a/ace/Unbounded_Set_Ex.h
+++ /dev/null
@@ -1,360 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file Unbounded_Set_Ex.h
- *
- *  $Id$
- *
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- *  ACE_Unbounded_Set Extension by Rudolf Weber <rfweber@tesionmail.de>
- *
- *  If iterators are working in an Unbounded_Set_Ex, the elements are not
- *  deleted physically, but marked as deleted.
- *  There is a bookkeeping of the iterators active in the set.
- *  It is an error if a set is reset() or destructed while iterators are
- *  still working on the set.
- *
- *  CAUTION: Pay attention to the state of the iterators.
- *           Deleting a set, or an element in a set, is only feasible
- *           when no iterator is active.
- *
- */
-//=============================================================================
-
-#ifndef ACE_UNBOUNDED_SET_EX_H
-#define ACE_UNBOUNDED_SET_EX_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Node.h"
-#include "ace/os_include/os_stddef.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Allocator;
-
-/**
- * @class ACE_Unbounded_Set_Ex_Iterator
- *
- * @brief Implement an iterator over an unbounded set.
- */
-template <class T>
-class ACE_Unbounded_Set_Ex_Iterator
-{
-public:
-  // = Initialization method.
-  ACE_Unbounded_Set_Ex_Iterator (ACE_Unbounded_Set_Ex<T> &s, int end = 0);
-  ACE_Unbounded_Set_Ex_Iterator (const  ACE_Unbounded_Set_Ex_Iterator &o);
-  void operator= (const ACE_Unbounded_Set_Ex_Iterator &o);
-  ~ACE_Unbounded_Set_Ex_Iterator ();
-
-  // = Iteration methods.
-
-  /// Pass back the <next_item> that hasn't been seen in the Set.
-  /// Returns 0 when all items have been seen, else 1.
-  int next (T *&next_item);
-
-  /// Move forward by one element in the set.  Returns 0 when all the
-  /// items in the set have been seen, else 1.
-  int advance (void);
-
-  /// Move to the first element in the set.  Returns 0 if the
-  /// set is empty, else 1.
-  int first (void);
-
-  /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  // = STL styled iteration, compare, and reference functions.
-
-  /// Postfix advance.
-  ACE_Unbounded_Set_Ex_Iterator<T> operator++ (int);
-
-  /// Prefix advance.
-  ACE_Unbounded_Set_Ex_Iterator<T>& operator++ (void);
-
-  /// Returns a reference to the internal element <this> is pointing to.
-  T& operator* (void);
-
-  /// Check if two iterators point to the same position
-  bool operator== (const ACE_Unbounded_Set_Ex_Iterator<T> &) const;
-  bool operator!= (const ACE_Unbounded_Set_Ex_Iterator<T> &) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-private:
-
-  /// Pointer to the current node in the iteration.
-  ACE_Node<T> *current_;
-
-  /// Pointer to the set we're iterating over.
-  ACE_Unbounded_Set_Ex<T> *set_;
-
-  // Flag that indicates whether this iterator is registered at the set.
-  int registered_in_set_;
-};
-
-/**
- * @class ACE_Unbounded_Set_Ex_Const_Iterator
- *
- * @brief Implement a const iterator over an unbounded set.
- *
- *  The bookkeeping operations are regarded as const. (The member
- *  number_of_iterators_ in ACE_Unbounded_Set_Ex is `mutable'.)
- *  Some asynchronous activity may cause a deletion under a Const_Iterator
- *  so Const_Iterators are registered too.
- *  However, the cleanup operation isn't const at all, thus it is not
- *  called from const iterators.
- *
- */
-template <class T>
-class ACE_Unbounded_Set_Ex_Const_Iterator
-{
-public:
-  // = Initialization method.
-  ACE_Unbounded_Set_Ex_Const_Iterator (const ACE_Unbounded_Set_Ex<T> &s, int end = 0);
-  ACE_Unbounded_Set_Ex_Const_Iterator (const ACE_Unbounded_Set_Ex_Const_Iterator& o);
-  void operator= (const ACE_Unbounded_Set_Ex_Const_Iterator& o);
-  ~ACE_Unbounded_Set_Ex_Const_Iterator ();
-
-  // = Iteration methods.
-
-  /// Pass back the <next_item> that hasn't been seen in the Set.
-  /// Returns 0 when all items have been seen, else 1.
-  int next (T *&next_item);
-
-  /// Move forward by one element in the set.  Returns 0 when all the
-  /// items in the set have been seen, else 1.
-  int advance (void);
-
-  /// Move to the first element in the set.  Returns 0 if the
-  /// set is empty, else 1.
-  int first (void);
-
-  /// Returns 1 when all items have been seen, else 0.
-  int done (void) const;
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  // = STL styled iteration, compare, and reference functions.
-
-  /// Postfix advance.
-  ACE_Unbounded_Set_Ex_Const_Iterator<T> operator++ (int);
-
-  /// Prefix advance.
-  ACE_Unbounded_Set_Ex_Const_Iterator<T>& operator++ (void);
-
-  /// Returns a reference to the internal element <this> is pointing to.
-  T& operator* (void);
-
-  /// Check if two iterators point to the same position
-  bool operator== (const ACE_Unbounded_Set_Ex_Const_Iterator<T> &) const;
-  bool operator!= (const ACE_Unbounded_Set_Ex_Const_Iterator<T> &) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-private:
-
-  /// Pointer to the current node in the iteration.
-  ACE_Node<T> *current_;
-
-  /// Pointer to the set we're iterating over.
-  const ACE_Unbounded_Set_Ex<T> *set_;
-
-  // Flag that indicates whether this iterator is registered at the set.
-  int registered_in_set_;
-};
-
-/**
- * @class ACE_Unbounded_Set_Ex
- *
- * @brief Implement a simple unordered set of <T> of unbounded size.
- *
- * This implementation of an unordered set uses a circular
- * linked list with a dummy node.  This implementation does not
- * allow duplicates, but it maintains FIFO ordering of insertions.
- *
- * <b> Requirements and Performance Characteristics</b>
- *   - Internal Structure
- *       Circular linked list
- *   - Duplicates allowed?
- *       No
- *   - Random access allowed?
- *       No
- *   - Search speed
- *       Linear
- *   - Insert/replace speed
- *       Linear
- *   - Iterator still valid after change to container?
- *       Yes
- *   - Frees memory for removed elements?
- *       Yes
- *   - Items inserted by
- *       Value
- *   - Requirements for contained type
- *       -# Default constructor
- *       -# Copy constructor
- *       -# operator=
- *       -# operator==
- *
- */
-template <class T>
-class ACE_Unbounded_Set_Ex
-{
-public:
-  friend class ACE_Unbounded_Set_Ex_Iterator<T>;
-  friend class ACE_Unbounded_Set_Ex_Const_Iterator<T>;
-
-  // Trait definition.
-  typedef ACE_Unbounded_Set_Ex_Iterator<T> ITERATOR;
-  typedef ACE_Unbounded_Set_Ex_Iterator<T> iterator;
-  typedef ACE_Unbounded_Set_Ex_Const_Iterator<T> CONST_ITERATOR;
-  typedef ACE_Unbounded_Set_Ex_Const_Iterator<T> const_iterator;
-
-  // = Initialization and termination methods.
-  /// Constructor.  Use user specified allocation strategy
-  /// if specified.
-  /**
-   * Initialize an empty set using the allocation strategy of the user if
-   * provided.
-   */
-  ACE_Unbounded_Set_Ex (ACE_Allocator *alloc = 0);
-
-  /// Copy constructor.
-  /**
-   * Initialize this set to be an exact copy of the set provided.
-   */
-  ACE_Unbounded_Set_Ex (const ACE_Unbounded_Set_Ex<T> &);
-
-  /// Assignment operator.
-  /**
-   * Perform a deep copy of the rhs into the lhs.
-   */
-  void operator= (const ACE_Unbounded_Set_Ex<T> &);
-
-  /// Destructor.
-  /**
-   * Destroy the nodes of the set.
-   */
-  ~ACE_Unbounded_Set_Ex (void);
-
-  // = Check boundary conditions.
-
-  /// Returns 1 if the container is empty, otherwise returns 0.
-  /**
-   * Constant time is_empty check.
-   */
-  int is_empty (void) const;
-
-  /// Returns 0.
-  /**
-   * Always returns 0 since the set can never fill up.
-   */
-  int is_full (void) const;
-
-  // = Classic unordered set operations.
-
-  ///Linear insertion of an item.
-  /**
-   * Insert <new_item> into the set (doesn't allow duplicates).
-   * Returns -1 if failures occur, 1 if item is already present, else
-   * 0.
-   */
-  int insert (const T &new_item);
-
-  /// Insert <item> at the tail of the set (doesn't check for
-  /// duplicates).
-  /**
-   * Constant time insert at the end of the set.
-   */
-  int insert_tail (const T &item);
-
-  ///Linear remove operation.
-  /**
-   * Remove first occurrence of <item> from the set.  Returns 0 if
-   * it removes the item, -1 if it can't find the item, and -1 if a
-   * failure occurs.
-   */
-  int remove (const T &item);
-
-  /// Finds if <item> occurs in the set.  Returns 0 if find succeeds,
-  /// else -1.
-  /**
-   * Performs a linear find operation.
-   */
-  int find (const T &item) const;
-
-  /// Size of the set.
-  /**
-   * Access the size of the set.
-   */
-  size_t size (void) const;
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  /// Reset the <ACE_Unbounded_Set_Ex> to be empty.
-  /**
-   * Delete the nodes of the set.
-   */
-  void reset (void);
-
-  // = STL-styled unidirectional iterator factory.
-  ACE_Unbounded_Set_Ex_Iterator<T> begin (void);
-  ACE_Unbounded_Set_Ex_Iterator<T> end (void);
-
-  /// An Iterator has to register itself here.
-  void iterator_add () const;
-  /// A non-const Iterator has to unregister itself here.
-  void iterator_leave ();
-  /// A Const_Iterator has to unregister itself here.
-  void const_iterator_leave () const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-private:
-  /// Delete all the nodes in the Set.
-  void delete_nodes (void);
-
-  /// Copy nodes into this set.
-  void copy_nodes (const ACE_Unbounded_Set_Ex<T> &);
-
-  /// Really delete all nodes marked for deletion.
-  void cleanup ();
-
-  /// Head of the linked list of Nodes.
-  ACE_Node<T> *head_;
-
-  /// Current size of the set.
-  size_t cur_size_;
-
-  /// Allocation strategy of the set.
-  ACE_Allocator *allocator_;
-
-  /// Number of iterators working on this set.
-  mutable int number_of_iterators_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "ace/Unbounded_Set_Ex.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Unbounded_Set_Ex.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Unbounded_Set_Ex.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_UNBOUNDED_SET_EX_H */
diff --git a/ace/Unbounded_Set_Ex.inl b/ace/Unbounded_Set_Ex.inl
deleted file mode 100644
index 989b7666b49..00000000000
--- a/ace/Unbounded_Set_Ex.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "ace/Global_Macros.h"
-
-template <class T> ACE_INLINE int
-ACE_Unbounded_Set_Ex<T>::is_empty (void) const
-{
-  ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::is_empty");
-  return this->head_ == this->head_->next_;
-}
-
-template <class T> ACE_INLINE int
-ACE_Unbounded_Set_Ex<T>::is_full (void) const
-{
-  ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::is_full");
-  return 0; // We should implement a "node of last resort for this..."
-}
diff --git a/ace/Version.h b/ace/Version.h
index a846375930c..2242e04a6ea 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -3,5 +3,5 @@
 
 #define ACE_MAJOR_VERSION 5
 #define ACE_MINOR_VERSION 4
-#define ACE_BETA_VERSION 2
-#define ACE_VERSION "5.4.2"
+#define ACE_BETA_VERSION 4
+#define ACE_VERSION "5.4.4"
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index 7ec38b8da2b..1e4bb6a9720 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -2560,7 +2560,7 @@ ACE_WFMO_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh,
         return -1;        // This shouldn't happen...
 
       ACE_Notification_Buffer *buffer =
-        ACE_reinterpret_cast (ACE_Notification_Buffer *, mb->base ());
+        reinterpret_cast<ACE_Notification_Buffer *> (mb->base ());
 
       // If this is not a Reactor notify (it is for a particular handler),
       // and it matches the specified handler (or purging all),
diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp
index b20748f2ec9..b88ae61b5f4 100644
--- a/ace/WIN32_Asynch_IO.cpp
+++ b/ace/WIN32_Asynch_IO.cpp
@@ -81,8 +81,7 @@ int
 ACE_WIN32_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor)
 {
   // Get to the platform specific implementation.
-  ACE_WIN32_Proactor *win32_proactor = ACE_dynamic_cast (ACE_WIN32_Proactor *,
-                                                         proactor);
+  ACE_WIN32_Proactor *win32_proactor = dynamic_cast<ACE_WIN32_Proactor *> (proactor);
 
   if (win32_proactor == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -109,16 +108,17 @@ ACE_WIN32_Asynch_Result::~ACE_WIN32_Asynch_Result (void)
 {
 }
 
-ACE_WIN32_Asynch_Result::ACE_WIN32_Asynch_Result (ACE_Handler &handler,
-                                                  const void* act,
-                                                  ACE_HANDLE event,
-                                                  u_long offset,
-                                                  u_long offset_high,
-                                                  int priority,
-                                                  int signal_number)
+ACE_WIN32_Asynch_Result::ACE_WIN32_Asynch_Result
+   (ACE_Handler::Proxy_Ptr &handler_proxy,
+    const void* act,
+    ACE_HANDLE event,
+    u_long offset,
+    u_long offset_high,
+    int priority,
+    int signal_number)
   : ACE_Asynch_Result_Impl (),
     OVERLAPPED (),
-    handler_ (handler),
+    handler_proxy_ (handler_proxy),
     act_ (act),
     bytes_transferred_ (0),
     success_ (0),
@@ -137,18 +137,22 @@ ACE_WIN32_Asynch_Result::ACE_WIN32_Asynch_Result (ACE_Handler &handler,
 }
 
 int
-ACE_WIN32_Asynch_Operation::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Operation::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                   ACE_HANDLE handle,
                                   const void *completion_key,
                                   ACE_Proactor *proactor)
 {
   this->proactor_ = proactor;
-  this->handler_ = &handler;
+  this->handler_proxy_ = handler_proxy;
   this->handle_ = handle;
 
   // Grab the handle from the <handler> if <handle> is invalid
   if (this->handle_ == ACE_INVALID_HANDLE)
-    this->handle_ = this->handler_->handle ();
+    {
+      ACE_Handler *handler = handler_proxy.get ()->handler ();
+      if (handler != 0)
+        this->handle_ = handler->handle ();
+    }
   if (this->handle_ == ACE_INVALID_HANDLE)
     return -1;
 
@@ -161,7 +165,7 @@ int
 ACE_WIN32_Asynch_Operation::cancel (void)
 {
 #if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \
-    && (   (defined (_MSC_VER) && (_MSC_VER > 1020)) \
+    && (   (defined (_MSC_VER)) \
         || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)) \
         || (defined (__MINGW32)))
   // All I/O operations that are canceled will complete with the error
@@ -195,7 +199,6 @@ ACE_WIN32_Asynch_Operation::ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win3
   : ACE_Asynch_Operation_Impl (),
     win32_proactor_ (win32_proactor),
     proactor_ (0),
-    handler_ (0),
     handle_ (ACE_INVALID_HANDLE)
 {
 }
@@ -225,7 +228,7 @@ ACE_WIN32_Asynch_Read_Stream_Result::handle (void) const
 }
 
 ACE_WIN32_Asynch_Read_Stream_Result::ACE_WIN32_Asynch_Read_Stream_Result (
-  ACE_Handler &handler,
+  ACE_Handler::Proxy_Ptr &handler_proxy,
   ACE_HANDLE handle,
   ACE_Message_Block &message_block,
   size_t bytes_to_read,
@@ -236,7 +239,7 @@ ACE_WIN32_Asynch_Read_Stream_Result::ACE_WIN32_Asynch_Read_Stream_Result (
   int scatter_enabled)
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Read_Stream_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler,
+    ACE_WIN32_Asynch_Result (handler_proxy,
                              act,
                              event,
                              0,
@@ -286,7 +289,9 @@ ACE_WIN32_Asynch_Read_Stream_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Read_Stream::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_read_stream (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_read_stream (result);
 }
 
 ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result (void)
@@ -395,7 +400,7 @@ ACE_WIN32_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
   // Create the Asynch_Result.
   ACE_WIN32_Asynch_Read_Stream_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Read_Stream_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Read_Stream_Result (this->handler_proxy_,
                                                        this->handle_,
                                                        message_block,
                                                        bytes_to_read,
@@ -454,7 +459,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
         if (msg_space > ULONG_MAX)
           this_chunk_length = ULONG_MAX;
         else
-          this_chunk_length = ACE_static_cast (u_long, msg_space);
+          this_chunk_length = static_cast<u_long> (msg_space);
         // Collect the data in the iovec.
         iov[iovcnt].iov_base = msg->wr_ptr () + wr_ptr_offset;
         iov[iovcnt].iov_len  = this_chunk_length;
@@ -487,7 +492,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
   // Create the Asynch_Result.
   ACE_WIN32_Asynch_Read_Stream_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Read_Stream_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Read_Stream_Result (this->handler_proxy_,
                                                        this->handle_,
                                                        message_block,
                                                        bytes_to_read,
@@ -505,8 +510,8 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
   DWORD bytes_recvd = 0;
   u_long flags = 0;
 
-  int initiate_result = ::WSARecv (ACE_reinterpret_cast (SOCKET, result->handle ()),
-                                   ACE_reinterpret_cast (WSABUF *, iov),
+  int initiate_result = ::WSARecv (reinterpret_cast<SOCKET> (result->handle ()),
+                                   reinterpret_cast<WSABUF *> (iov),
                                    iovcnt,
                                    &bytes_recvd,
                                    &flags,
@@ -569,7 +574,7 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *
       errno = ERANGE;
       return -1;
     }
-  DWORD bytes_to_read = ACE_static_cast (DWORD, result->bytes_to_read ());
+  DWORD bytes_to_read = static_cast<DWORD> (result->bytes_to_read ());
   u_long bytes_read;
 
   result->set_error (0); // Clear error before starting IO.
@@ -582,7 +587,7 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *
                                     result);
   if (initiate_result == 1)
     // Immediate success: the OVERLAPPED will still get queued.
-    return 1;
+    return 0;
 
   // If initiate failed, check for a bad error.
   ACE_OS::set_errno_to_last_error ();
@@ -613,12 +618,12 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *
 // call to the ACE_WIN32_Asynch_Operation base class.
 
 int
-ACE_WIN32_Asynch_Read_Stream::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Read_Stream::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                     ACE_HANDLE handle,
                                     const void *completion_key,
                                     ACE_Proactor *proactor)
 {
-  return ACE_WIN32_Asynch_Operation::open (handler,
+  return ACE_WIN32_Asynch_Operation::open (handler_proxy,
                                            handle,
                                            completion_key,
                                            proactor);
@@ -655,7 +660,7 @@ ACE_WIN32_Asynch_Write_Stream_Result::handle (void) const
 }
 
 ACE_WIN32_Asynch_Write_Stream_Result::ACE_WIN32_Asynch_Write_Stream_Result (
-  ACE_Handler &handler,
+  ACE_Handler::Proxy_Ptr &handler_proxy,
   ACE_HANDLE handle,
   ACE_Message_Block &message_block,
   size_t bytes_to_write,
@@ -666,7 +671,8 @@ ACE_WIN32_Asynch_Write_Stream_Result::ACE_WIN32_Asynch_Write_Stream_Result (
   int gather_enabled)
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Write_Stream_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
+    ACE_WIN32_Asynch_Result
+      (handler_proxy, act, event, 0, 0, priority, signal_number),
     bytes_to_write_ (bytes_to_write),
     message_block_ (message_block),
     handle_ (handle),
@@ -710,7 +716,9 @@ ACE_WIN32_Asynch_Write_Stream_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Write_Stream::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_write_stream (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_write_stream (result);
 }
 
 ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result (void)
@@ -820,7 +828,7 @@ ACE_WIN32_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
 
   ACE_WIN32_Asynch_Write_Stream_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Write_Stream_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Write_Stream_Result (this->handler_proxy_,
                                                         this->handle_,
                                                         message_block,
                                                         bytes_to_write,
@@ -875,7 +883,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block,
         if (msg_len > ULONG_MAX)
           this_chunk_length = ULONG_MAX;
         else
-          this_chunk_length = ACE_static_cast (u_long, msg_len);
+          this_chunk_length = static_cast<u_long> (msg_len);
         // Collect the data in the iovec.
         iov[iovcnt].iov_base = msg->rd_ptr () + rd_ptr_offset;
         iov[iovcnt].iov_len  = this_chunk_length;
@@ -909,7 +917,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block,
 
   ACE_WIN32_Asynch_Write_Stream_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Write_Stream_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Write_Stream_Result (this->handler_proxy_,
                                                         this->handle_,
                                                         message_block,
                                                         bytes_to_write,
@@ -924,8 +932,8 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block,
 
   u_long bytes_sent = 0;
 
-  int initiate_result = ::WSASend (ACE_reinterpret_cast (SOCKET, result->handle ()),
-                                   ACE_reinterpret_cast (WSABUF *, iov),
+  int initiate_result = ::WSASend (reinterpret_cast<SOCKET> (result->handle ()),
+                                   reinterpret_cast<WSABUF *> (iov),
                                    iovcnt,
                                    &bytes_sent,
                                    0, // flags
@@ -988,7 +996,7 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul
       errno = ERANGE;
       return -1;
     }
-  DWORD bytes_to_write = ACE_static_cast (DWORD, result->bytes_to_write ());
+  DWORD bytes_to_write = static_cast<DWORD> (result->bytes_to_write ());
 
   result->set_error (0); // Clear error before starting IO.
 
@@ -1000,7 +1008,7 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul
                                      result);
   if (initiate_result == 1)
     // Immediate success: the OVERLAPPED will still get queued.
-    return 1;
+    return 0;
 
   // If initiate failed, check for a bad error.
   ACE_OS::set_errno_to_last_error ();
@@ -1016,11 +1024,9 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul
       // queued.
 
       if (ACE::debug ())
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      ACE_LIB_TEXT ("%p\n"),
-                      ACE_LIB_TEXT ("WriteFile")));
-        }
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_LIB_TEXT ("%p\n"),
+                    ACE_LIB_TEXT ("WriteFile")));
       return -1;
     }
 }
@@ -1030,12 +1036,12 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul
 // call to the ACE_WIN32_Asynch_Operation base class.
 
 int
-ACE_WIN32_Asynch_Write_Stream::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Write_Stream::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
                                      const void *completion_key,
                                      ACE_Proactor *proactor)
 {
-  return ACE_WIN32_Asynch_Operation::open (handler,
+  return ACE_WIN32_Asynch_Operation::open (handler_proxy,
                                            handle,
                                            completion_key,
                                            proactor);
@@ -1054,7 +1060,7 @@ ACE_WIN32_Asynch_Write_Stream::proactor (void) const
 }
 
 ACE_WIN32_Asynch_Read_File_Result::ACE_WIN32_Asynch_Read_File_Result (
-  ACE_Handler &handler,
+  ACE_Handler::Proxy_Ptr &handler_proxy,
   ACE_HANDLE handle,
   ACE_Message_Block &message_block,
   size_t bytes_to_read,
@@ -1068,7 +1074,7 @@ ACE_WIN32_Asynch_Read_File_Result::ACE_WIN32_Asynch_Read_File_Result (
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Read_Stream_Result_Impl (),
     ACE_Asynch_Read_File_Result_Impl (),
-    ACE_WIN32_Asynch_Read_Stream_Result (handler,
+    ACE_WIN32_Asynch_Read_Stream_Result (handler_proxy,
                                          handle,
                                          message_block,
                                          bytes_to_read,
@@ -1124,7 +1130,9 @@ ACE_WIN32_Asynch_Read_File_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Read_File::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_read_file (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_read_file (result);
 }
 
 ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result (void)
@@ -1256,7 +1264,7 @@ ACE_WIN32_Asynch_Read_File::read (ACE_Message_Block &message_block,
 
   ACE_WIN32_Asynch_Read_File_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Read_File_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Read_File_Result (this->handler_proxy_,
                                                      this->handle_,
                                                      message_block,
                                                      bytes_to_read,
@@ -1327,14 +1335,14 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block,
       errno = ERANGE;
       return -1;
     }
-  DWORD dword_bytes_to_read = ACE_static_cast (DWORD, bytes_to_read);
+  DWORD dword_bytes_to_read = static_cast<DWORD> (bytes_to_read);
 
   // last one should be completely 0
   buffer_pointers[buffer_pointers_count].Buffer = 0;
 
   ACE_WIN32_Asynch_Read_File_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Read_File_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Read_File_Result (this->handler_proxy_,
                                                      this->handle_,
                                                      message_block,
                                                      bytes_to_read,
@@ -1430,12 +1438,12 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block,
 // call to the ACE_WIN32_Asynch_Operation base class.
 
 int
-ACE_WIN32_Asynch_Read_File::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Read_File::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                   ACE_HANDLE handle,
                                   const void *completion_key,
                                   ACE_Proactor *proactor)
 {
-  return ACE_WIN32_Asynch_Operation::open (handler,
+  return ACE_WIN32_Asynch_Operation::open (handler_proxy,
                                            handle,
                                            completion_key,
                                            proactor);
@@ -1454,7 +1462,7 @@ ACE_WIN32_Asynch_Read_File::proactor (void) const
 }
 
 ACE_WIN32_Asynch_Write_File_Result::ACE_WIN32_Asynch_Write_File_Result (
-  ACE_Handler &handler,
+  ACE_Handler::Proxy_Ptr &handler_proxy,
   ACE_HANDLE handle,
   ACE_Message_Block &message_block,
   size_t bytes_to_write,
@@ -1468,7 +1476,7 @@ ACE_WIN32_Asynch_Write_File_Result::ACE_WIN32_Asynch_Write_File_Result (
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Write_Stream_Result_Impl (),
     ACE_Asynch_Write_File_Result_Impl (),
-    ACE_WIN32_Asynch_Write_Stream_Result (handler,
+    ACE_WIN32_Asynch_Write_Stream_Result (handler_proxy,
                                           handle,
                                           message_block,
                                           bytes_to_write,
@@ -1525,7 +1533,9 @@ ACE_WIN32_Asynch_Write_File_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Write_File::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_write_file (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_write_file (result);
 }
 
 ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result  (void)
@@ -1654,7 +1664,7 @@ ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block,
 
   ACE_WIN32_Asynch_Write_File_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Write_File_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Write_File_Result (this->handler_proxy_,
                                                       this->handle_,
                                                       message_block,
                                                       bytes_to_write,
@@ -1730,14 +1740,14 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block,
       errno = ERANGE;
       return -1;
     }
-  DWORD dword_bytes_to_write = ACE_static_cast (DWORD, bytes_to_write);
+  DWORD dword_bytes_to_write = static_cast<DWORD> (bytes_to_write);
 
   // last one should be completely 0
   buffer_pointers[buffer_pointers_count].Buffer = 0;
 
   ACE_WIN32_Asynch_Write_File_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Write_File_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Write_File_Result (this->handler_proxy_,
                                                       this->handle_,
                                                       message_block,
                                                       bytes_to_write,
@@ -1835,12 +1845,12 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block,
 // call to the ACE_WIN32_Asynch_Operation base class.
 
 int
-ACE_WIN32_Asynch_Write_File::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Write_File::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                    ACE_HANDLE handle,
                                    const void *completion_key,
                                    ACE_Proactor *proactor)
 {
-  return ACE_WIN32_Asynch_Operation::open (handler,
+  return ACE_WIN32_Asynch_Operation::open (handler_proxy,
                                            handle,
                                            completion_key,
                                            proactor);
@@ -1883,7 +1893,7 @@ ACE_WIN32_Asynch_Accept_Result::accept_handle (void) const
 }
 
 ACE_WIN32_Asynch_Accept_Result::ACE_WIN32_Asynch_Accept_Result (
-  ACE_Handler &handler,
+  ACE_Handler::Proxy_Ptr &handler_proxy,
   ACE_HANDLE listen_handle,
   ACE_HANDLE accept_handle,
   ACE_Message_Block &message_block,
@@ -1894,7 +1904,7 @@ ACE_WIN32_Asynch_Accept_Result::ACE_WIN32_Asynch_Accept_Result (
   int signal_number)
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Accept_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler,
+    ACE_WIN32_Asynch_Result (handler_proxy,
                              act,
                              event,
                              0,
@@ -1927,7 +1937,9 @@ ACE_WIN32_Asynch_Accept_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Accept::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_accept (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_accept (result);
 }
 
 ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result (void)
@@ -2037,7 +2049,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
       errno = ERANGE;
       return -1;
     }
-  DWORD dword_bytes_to_read = ACE_static_cast (DWORD, bytes_to_read);
+  DWORD dword_bytes_to_read = static_cast<DWORD> (bytes_to_read);
 
   int close_accept_handle = 0;
   // If the <accept_handle> is invalid, we will create a new socket.
@@ -2064,7 +2076,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
   // Common code for both WIN and POSIX.
   ACE_WIN32_Asynch_Accept_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Accept_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Accept_Result (this->handler_proxy_,
                                                   this->handle_,
                                                   accept_handle,
                                                   message_block,
@@ -2082,8 +2094,8 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
                                     (SOCKET) result->accept_handle (),
                                     result->message_block ().wr_ptr (),
                                     dword_bytes_to_read,
-                                    ACE_static_cast (DWORD, address_size),
-                                    ACE_static_cast (DWORD, address_size),
+                                    static_cast<DWORD> (address_size),
+                                    static_cast<DWORD> (address_size),
                                     &bytes_read,
                                     result);
   if (initiate_result == 1)
@@ -2138,12 +2150,12 @@ ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept (void)
 // call to the ACE_WIN32_Asynch_Operation base class.
 
 int
-ACE_WIN32_Asynch_Accept::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Accept::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                ACE_HANDLE handle,
                                const void *completion_key,
                                ACE_Proactor *proactor)
 {
-  return ACE_WIN32_Asynch_Operation::open (handler,
+  return ACE_WIN32_Asynch_Operation::open (handler_proxy,
                                            handle,
                                            completion_key,
                                            proactor);
@@ -2176,7 +2188,7 @@ void ACE_WIN32_Asynch_Connect_Result::connect_handle ( ACE_HANDLE handle )
 
 
 ACE_WIN32_Asynch_Connect_Result::ACE_WIN32_Asynch_Connect_Result
-            (ACE_Handler &handler,
+            (ACE_Handler::Proxy_Ptr &handler_proxy,
              ACE_HANDLE connect_handle,
              const void* act,
              ACE_HANDLE event,
@@ -2184,8 +2196,9 @@ ACE_WIN32_Asynch_Connect_Result::ACE_WIN32_Asynch_Connect_Result
              int signal_number)
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Connect_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
-    connect_handle_ ( connect_handle )
+    ACE_WIN32_Asynch_Result
+      (handler_proxy, act, event, 0, 0, priority, signal_number),
+    connect_handle_ (connect_handle)
 {
   ;
 }
@@ -2206,7 +2219,9 @@ ACE_WIN32_Asynch_Connect_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Connect::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_connect (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_connect (result);
 }
 
 ACE_WIN32_Asynch_Connect_Result::~ACE_WIN32_Asynch_Connect_Result (void)
@@ -2320,7 +2335,7 @@ ACE_WIN32_Asynch_Connect::set_handle (ACE_HANDLE)
 }
 
 int
-ACE_WIN32_Asynch_Connect::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Connect::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                 ACE_HANDLE,
                                 const void *completion_key,
                                 ACE_Proactor *proactor)
@@ -2338,7 +2353,7 @@ ACE_WIN32_Asynch_Connect::open (ACE_Handler &handler,
                       -1);
 
   //int result =
-  ACE_WIN32_Asynch_Operation::open (handler,
+  ACE_WIN32_Asynch_Operation::open (handler_proxy,
                                     ACE_INVALID_HANDLE,
                                     completion_key,
                                     proactor);
@@ -2376,7 +2391,7 @@ ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle,
     // Create future Asynch_Connect_Result
     ACE_WIN32_Asynch_Connect_Result *result = 0;
     ACE_NEW_RETURN (result,
-                    ACE_WIN32_Asynch_Connect_Result (*this->handler_,
+                    ACE_WIN32_Asynch_Connect_Result (this->handler_proxy_,
                                                      connect_handle,
                                                      act,
                                                      this->win32_proactor_->get_handle (),
@@ -2530,8 +2545,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result,
 
   if (local_sap != ACE_Addr::sap_any)
     {
-      sockaddr * laddr = ACE_reinterpret_cast (sockaddr *,
-                                               local_sap.get_addr ());
+      sockaddr * laddr = reinterpret_cast<sockaddr *> (local_sap.get_addr ());
       int size = local_sap.get_size ();
 
       if (ACE_OS::bind (handle, laddr, size) == -1)
@@ -2539,8 +2553,8 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result,
            result->set_error (errno);
 
            ACE_ERROR_RETURN ((LM_ERROR,
-                              ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect_i: ")
-                              ACE_LIB_TEXT (" ACE_OS::bind failed\n")),
+                              ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect_i: %p\n"),
+                              ACE_LIB_TEXT ("ACE_OS::bind")),
                              -1);
         }
     }
@@ -2560,8 +2574,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result,
   for (;;)
     {
       int rc = ACE_OS::connect (handle,
-                                ACE_reinterpret_cast (sockaddr *,
-                                                      remote_sap.get_addr ()),
+                                reinterpret_cast<sockaddr *> (remote_sap.get_addr ()),
                                 remote_sap.get_size ());
 
       if (rc < 0)  // failure
@@ -2842,7 +2855,7 @@ ACE_WIN32_Asynch_Transmit_File_Result::flags (void) const
 }
 
 ACE_WIN32_Asynch_Transmit_File_Result::ACE_WIN32_Asynch_Transmit_File_Result (
-  ACE_Handler &handler,
+  ACE_Handler::Proxy_Ptr &handler_proxy,
   ACE_HANDLE socket,
   ACE_HANDLE file,
   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
@@ -2857,7 +2870,7 @@ ACE_WIN32_Asynch_Transmit_File_Result::ACE_WIN32_Asynch_Transmit_File_Result (
   int signal_number)
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Transmit_File_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler,
+    ACE_WIN32_Asynch_Result (handler_proxy,
                              act,
                              event,
                              offset,
@@ -2905,7 +2918,9 @@ ACE_WIN32_Asynch_Transmit_File_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Transmit_File::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_transmit_file (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_transmit_file (result);
 }
 
 ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result (void)
@@ -3008,12 +3023,12 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
       errno = ERANGE;
       return -1;
     }
-  DWORD dword_bytes_to_write = ACE_static_cast (DWORD, bytes_to_write);
-  DWORD dword_bytes_per_send = ACE_static_cast (DWORD, bytes_per_send);
+  DWORD dword_bytes_to_write = static_cast<DWORD> (bytes_to_write);
+  DWORD dword_bytes_per_send = static_cast<DWORD> (bytes_per_send);
 
   ACE_WIN32_Asynch_Transmit_File_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Transmit_File_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Transmit_File_Result (this->handler_proxy_,
                                                          this->handle_,
                                                          file,
                                                          header_and_trailer,
@@ -3092,12 +3107,12 @@ ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File (void)
 // call to the ACE_WIN32_Asynch_Operation base class.
 
 int
-ACE_WIN32_Asynch_Transmit_File::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Transmit_File::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       const void *completion_key,
                                       ACE_Proactor *proactor)
 {
-  return ACE_WIN32_Asynch_Operation::open (handler,
+  return ACE_WIN32_Asynch_Operation::open (handler_proxy,
                                            handle,
                                            completion_key,
                                            proactor);
@@ -3230,7 +3245,7 @@ ACE_WIN32_Asynch_Read_Dgram_Result::post_completion (ACE_Proactor_Impl *proactor
 }
 
 ACE_WIN32_Asynch_Read_Dgram_Result::ACE_WIN32_Asynch_Read_Dgram_Result (
-  ACE_Handler &handler,
+  ACE_Handler::Proxy_Ptr &handler_proxy,
   ACE_HANDLE handle,
   ACE_Message_Block *message_block,
   size_t bytes_to_read,
@@ -3242,7 +3257,7 @@ ACE_WIN32_Asynch_Read_Dgram_Result::ACE_WIN32_Asynch_Read_Dgram_Result (
   int signal_number)
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Read_Dgram_Result_Impl(),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
+    ACE_WIN32_Asynch_Result (handler_proxy, act, event, 0, 0, priority, signal_number),
     bytes_to_read_ (bytes_to_read),
     message_block_ (message_block),
     remote_address_ (0),
@@ -3292,7 +3307,9 @@ ACE_WIN32_Asynch_Read_Dgram_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Read_Dgram::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_read_dgram (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_read_dgram (result);
 }
 
 ACE_WIN32_Asynch_Read_Dgram_Result::~ACE_WIN32_Asynch_Read_Dgram_Result (void)
@@ -3345,7 +3362,7 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
         if (msg_space > ULONG_MAX)
           this_chunk_length = ULONG_MAX;
         else
-          this_chunk_length = ACE_static_cast (u_long, msg_space);
+          this_chunk_length = static_cast<u_long> (msg_space);
         // Collect the data in the iovec.
         iov[iovcnt].iov_base = msg->wr_ptr () + wr_ptr_offset;
         iov[iovcnt].iov_len  = this_chunk_length;
@@ -3372,7 +3389,7 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
   // Create the Asynch_Result.
   ACE_WIN32_Asynch_Read_Dgram_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Read_Dgram_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Read_Dgram_Result (this->handler_proxy_,
                                                       this->handle_,
                                                       message_block,
                                                       bytes_to_read,
@@ -3438,12 +3455,12 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
 }
 
 int
-ACE_WIN32_Asynch_Read_Dgram::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Read_Dgram::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                    ACE_HANDLE handle,
                                    const void *completion_key,
                                    ACE_Proactor *proactor)
 {
-  return ACE_WIN32_Asynch_Operation::open (handler,
+  return ACE_WIN32_Asynch_Operation::open (handler_proxy,
                                            handle,
                                            completion_key,
                                            proactor);
@@ -3561,7 +3578,7 @@ ACE_WIN32_Asynch_Write_Dgram_Result::post_completion (ACE_Proactor_Impl *proacto
 }
 
 ACE_WIN32_Asynch_Write_Dgram_Result::ACE_WIN32_Asynch_Write_Dgram_Result (
-  ACE_Handler &handler,
+  ACE_Handler::Proxy_Ptr &handler_proxy,
   ACE_HANDLE handle,
   ACE_Message_Block *message_block,
   size_t bytes_to_write,
@@ -3572,7 +3589,7 @@ ACE_WIN32_Asynch_Write_Dgram_Result::ACE_WIN32_Asynch_Write_Dgram_Result (
   int signal_number)
   : ACE_Asynch_Result_Impl (),
     ACE_Asynch_Write_Dgram_Result_Impl(),
-    ACE_WIN32_Asynch_Result (handler,
+    ACE_WIN32_Asynch_Result (handler_proxy,
                              act,
                              event,
                              0,
@@ -3617,7 +3634,9 @@ ACE_WIN32_Asynch_Write_Dgram_Result::complete (size_t bytes_transferred,
   ACE_Asynch_Write_Dgram::Result result (this);
 
   // Call the application handler.
-  this->handler_.handle_write_dgram (result);
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_write_dgram (result);
 }
 
 ACE_WIN32_Asynch_Write_Dgram_Result::~ACE_WIN32_Asynch_Write_Dgram_Result (void)
@@ -3670,7 +3689,7 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
         if (msg_len > ULONG_MAX)
           this_chunk_length = ULONG_MAX;
         else
-          this_chunk_length = ACE_static_cast (u_long, msg_len);
+          this_chunk_length = static_cast<u_long> (msg_len);
         // Collect the data in the iovec.
         iov[iovcnt].iov_base = msg->rd_ptr () + rd_ptr_offset;
         iov[iovcnt].iov_len  = this_chunk_length;
@@ -3697,7 +3716,7 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
   // Create the Asynch_Result.
   ACE_WIN32_Asynch_Write_Dgram_Result *result = 0;
   ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Write_Dgram_Result (*this->handler_,
+                  ACE_WIN32_Asynch_Write_Dgram_Result (this->handler_proxy_,
                                                        this->handle_,
                                                        message_block,
                                                        bytes_to_write,
@@ -3765,12 +3784,12 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
 }
 
 int
-ACE_WIN32_Asynch_Write_Dgram::open (ACE_Handler &handler,
+ACE_WIN32_Asynch_Write_Dgram::open (ACE_Handler::Proxy_Ptr &handler_proxy,
                                     ACE_HANDLE handle,
                                     const void *completion_key,
                                     ACE_Proactor *proactor)
 {
-  return ACE_WIN32_Asynch_Operation::open (handler,
+  return ACE_WIN32_Asynch_Operation::open (handler_proxy,
                                            handle,
                                            completion_key,
                                            proactor);
diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h
index b9d875164b1..c9d26ff00a6 100644
--- a/ace/WIN32_Asynch_IO.h
+++ b/ace/WIN32_Asynch_IO.h
@@ -116,7 +116,7 @@ public:
 
 protected:
   /// Constructor.
-  ACE_WIN32_Asynch_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                            const void* act,
                            ACE_HANDLE event,
                            u_long offset,
@@ -124,8 +124,8 @@ protected:
                            int priority,
                            int signal_number = 0);
 
-  /// Handler that will be called back.
-  ACE_Handler &handler_;
+  /// Proxy for the ACE_Handler that will be called back.
+  ACE_Handler::Proxy_Ptr &handler_proxy_;
 
   /// ACT for this operation.
   const void *act_;
@@ -159,7 +159,7 @@ public:
    * <ACE_Handler::handle> will be called on the <handler> to get the
    * correct handle.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor);
@@ -190,7 +190,7 @@ protected:
   ACE_Proactor *proactor_;
 
   /// Handler that will receive the callback.
-  ACE_Handler *handler_;
+  ACE_Handler::Proxy_Ptr handler_proxy_;
 
   /// I/O handle used for reading.
   ACE_HANDLE handle_;
@@ -269,7 +269,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Read_Stream factory.
-  ACE_WIN32_Asynch_Read_Stream_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Read_Stream_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                        ACE_HANDLE handle,
                                        ACE_Message_Block &message_block,
                                        size_t bytes_to_read,
@@ -352,7 +352,7 @@ public:
    * <ACE_Handler::handle> will be called on the <handler> to get the
    * correct handle.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor);
@@ -446,7 +446,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Write_Stream factory.
-  ACE_WIN32_Asynch_Write_Stream_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Write_Stream_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                         ACE_HANDLE handle,
                                         ACE_Message_Block &message_block,
                                         size_t bytes_to_write,
@@ -531,7 +531,7 @@ public:
    * <ACE_Handler::handle> will be called on the <handler> to get the
    * correct handle.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor);
@@ -628,7 +628,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Read_File factory.
-  ACE_WIN32_Asynch_Read_File_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Read_File_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                      ACE_HANDLE handle,
                                      ACE_Message_Block &message_block,
                                      size_t bytes_to_read,
@@ -715,7 +715,7 @@ public:
    * <ACE_Handler::handle> will be called on the <handler> to get the
    * correct handle.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor);
@@ -839,7 +839,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Write_File factory.
-  ACE_WIN32_Asynch_Write_File_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Write_File_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block &message_block,
                                       size_t bytes_to_write,
@@ -921,7 +921,7 @@ public:
    * <ACE_Handler::handle> will be called on the <handler> to get the
    * correct handle.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor);
@@ -1036,7 +1036,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Accept factory.
-  ACE_WIN32_Asynch_Accept_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Accept_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                   ACE_HANDLE listen_handle,
                                   ACE_HANDLE accept_handle,
                                   ACE_Message_Block &message_block,
@@ -1118,7 +1118,7 @@ public:
    * <ACE_Handler::handle> will be called on the <handler> to get the
    * correct handle.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor);
@@ -1202,7 +1202,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Connect factory.
-  ACE_WIN32_Asynch_Connect_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Connect_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                    ACE_HANDLE  connect_handle,
                                    const void* act,
                                    ACE_HANDLE  event,
@@ -1246,7 +1246,7 @@ public:
    * this call to that method. We have put this here to avoid the
    * compiler warnings.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor = 0);
@@ -1440,7 +1440,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Transmit_File factory.
-  ACE_WIN32_Asynch_Transmit_File_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Transmit_File_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                          ACE_HANDLE socket,
                                          ACE_HANDLE file,
                                          ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
@@ -1545,7 +1545,7 @@ public:
    * <ACE_Handler::handle> will be called on the <handler> to get the
    * correct handle.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor);
@@ -1639,7 +1639,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Read_Dgram factory.
-  ACE_WIN32_Asynch_Read_Dgram_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Read_Dgram_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                       ACE_HANDLE handle,
                                       ACE_Message_Block *message_block,
                                       size_t bytes_to_read,
@@ -1735,7 +1735,7 @@ public:
    * <ACE_Handler::handle> will be called on the <handler> to get the
    * correct handle.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor);
@@ -1828,7 +1828,7 @@ public:
 protected:
   /// Constructor is protected since creation is limited to
   /// ACE_Asynch_Write_Stream factory.
-  ACE_WIN32_Asynch_Write_Dgram_Result (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Write_Dgram_Result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                        ACE_HANDLE handle,
                                        ACE_Message_Block *message_block,
                                        size_t bytes_to_write,
@@ -1920,7 +1920,7 @@ public:
    * <ACE_Handler::handle> will be called on the <handler> to get the
    * correct handle.
    */
-  int open (ACE_Handler &handler,
+  int open (ACE_Handler::Proxy_Ptr &handler_proxy,
             ACE_HANDLE handle,
             const void *completion_key,
             ACE_Proactor *proactor);
diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp
index 6905c0d7912..62458aed76f 100644
--- a/ace/WIN32_Proactor.cpp
+++ b/ace/WIN32_Proactor.cpp
@@ -24,7 +24,7 @@ class ACE_Export ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result
 
 public:
   /// Constructor.
-  ACE_WIN32_Wakeup_Completion (ACE_Handler &handler,
+  ACE_WIN32_Wakeup_Completion (ACE_Handler::Proxy_Ptr &handler_proxy,
                                const void *act = 0,
                                ACE_HANDLE event = ACE_INVALID_HANDLE,
                                int priority = 0,
@@ -44,7 +44,7 @@ ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads,
                                         int used_with_reactor_event_loop)
   : completion_port_ (0),
     // This *MUST* be 0, *NOT* ACE_INVALID_HANDLE !!!
-    number_of_threads_ (ACE_static_cast (DWORD, number_of_threads)),
+    number_of_threads_ (static_cast<DWORD> (number_of_threads)),
     used_with_reactor_event_loop_ (used_with_reactor_event_loop)
 {
   // Create the completion port.
@@ -121,9 +121,9 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle,
                                      const void *completion_key)
 {
 #if defined (ACE_WIN64)
-  ULONG_PTR comp_key (ACE_reinterpret_cast (ULONG_PTR, completion_key));
+  ULONG_PTR comp_key (reinterpret_cast<ULONG_PTR> (completion_key));
 #else
-  ULONG comp_key (ACE_reinterpret_cast (ULONG, completion_key));
+  ULONG comp_key (reinterpret_cast<ULONG> (completion_key));
 #endif /* ACE_WIN64 */
 
   // No locking is needed here as no state changes.
@@ -241,18 +241,19 @@ ACE_WIN32_Proactor::create_asynch_transmit_file (void)
 }
 
 ACE_Asynch_Read_Stream_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
-                                                      ACE_HANDLE handle,
-                                                      ACE_Message_Block &message_block,
-                                                      size_t bytes_to_read,
-                                                      const void* act,
-                                                      ACE_HANDLE event,
-                                                      int priority,
-                                                      int signal_number)
+ACE_WIN32_Proactor::create_asynch_read_stream_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_read,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Read_Stream_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Read_Stream_Result (handler,
+                  ACE_WIN32_Asynch_Read_Stream_Result (handler_proxy,
                                                        handle,
                                                        message_block,
                                                        bytes_to_read,
@@ -265,18 +266,19 @@ ACE_WIN32_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
 }
 
 ACE_Asynch_Write_Stream_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
-                                                       ACE_HANDLE handle,
-                                                       ACE_Message_Block &message_block,
-                                                       size_t bytes_to_write,
-                                                       const void* act,
-                                                       ACE_HANDLE event,
-                                                       int priority,
-                                                       int signal_number)
+ACE_WIN32_Proactor::create_asynch_write_stream_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_write,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Write_Stream_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Write_Stream_Result (handler,
+                  ACE_WIN32_Asynch_Write_Stream_Result (handler_proxy,
                                                         handle,
                                                         message_block,
                                                         bytes_to_write,
@@ -289,20 +291,21 @@ ACE_WIN32_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
 }
 
 ACE_Asynch_Read_File_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
-                                                    ACE_HANDLE handle,
-                                                    ACE_Message_Block &message_block,
-                                                    size_t bytes_to_read,
-                                                    const void* act,
-                                                    u_long offset,
-                                                    u_long offset_high,
-                                                    ACE_HANDLE event,
-                                                    int priority,
-                                                    int signal_number)
+ACE_WIN32_Proactor::create_asynch_read_file_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_read,
+   const void* act,
+   u_long offset,
+   u_long offset_high,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Read_File_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Read_File_Result (handler,
+                  ACE_WIN32_Asynch_Read_File_Result (handler_proxy,
                                                      handle,
                                                      message_block,
                                                      bytes_to_read,
@@ -317,20 +320,21 @@ ACE_WIN32_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
 }
 
 ACE_Asynch_Write_File_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
-                                                     ACE_HANDLE handle,
-                                                     ACE_Message_Block &message_block,
-                                                     size_t bytes_to_write,
-                                                     const void* act,
-                                                     u_long offset,
-                                                     u_long offset_high,
-                                                     ACE_HANDLE event,
-                                                     int priority,
-                                                     int signal_number)
+ACE_WIN32_Proactor::create_asynch_write_file_result
+ (ACE_Handler::Proxy_Ptr &handler_proxy,
+  ACE_HANDLE handle,
+  ACE_Message_Block &message_block,
+  size_t bytes_to_write,
+  const void* act,
+  u_long offset,
+  u_long offset_high,
+  ACE_HANDLE event,
+  int priority,
+  int signal_number)
 {
   ACE_Asynch_Write_File_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Write_File_Result (handler,
+                  ACE_WIN32_Asynch_Write_File_Result (handler_proxy,
                                                       handle,
                                                       message_block,
                                                       bytes_to_write,
@@ -345,20 +349,21 @@ ACE_WIN32_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
 }
 
 ACE_Asynch_Read_Dgram_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_read_dgram_result (ACE_Handler &handler,
-                                                     ACE_HANDLE handle,
-                                                     ACE_Message_Block *message_block,
-                                                     size_t bytes_to_read,
-                                                     int flags,
-                                                     int protocol_family,
-                                                     const void* act,
-                                                     ACE_HANDLE event ,
-                                                     int priority ,
-                                                     int signal_number)
+ACE_WIN32_Proactor::create_asynch_read_dgram_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block *message_block,
+   size_t bytes_to_read,
+   int flags,
+   int protocol_family,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Read_Dgram_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Read_Dgram_Result (handler,
+                  ACE_WIN32_Asynch_Read_Dgram_Result (handler_proxy,
                                                       handle,
                                                       message_block,
                                                       bytes_to_read,
@@ -373,19 +378,20 @@ ACE_WIN32_Proactor::create_asynch_read_dgram_result (ACE_Handler &handler,
 }
 
 ACE_Asynch_Write_Dgram_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_write_dgram_result (ACE_Handler &handler,
-                                                      ACE_HANDLE handle,
-                                                      ACE_Message_Block *message_block,
-                                                      size_t bytes_to_read,
-                                                      int flags,
-                                                      const void* act,
-                                                      ACE_HANDLE event ,
-                                                      int priority ,
-                                                      int signal_number)
+ACE_WIN32_Proactor::create_asynch_write_dgram_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE handle,
+   ACE_Message_Block *message_block,
+   size_t bytes_to_read,
+   int flags,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Write_Dgram_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Write_Dgram_Result(handler,
+                  ACE_WIN32_Asynch_Write_Dgram_Result(handler_proxy,
                                                       handle,
                                                       message_block,
                                                       bytes_to_read,
@@ -399,19 +405,20 @@ ACE_WIN32_Proactor::create_asynch_write_dgram_result (ACE_Handler &handler,
 }
 
 ACE_Asynch_Accept_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_accept_result (ACE_Handler &handler,
-                                                 ACE_HANDLE listen_handle,
-                                                 ACE_HANDLE accept_handle,
-                                                 ACE_Message_Block &message_block,
-                                                 size_t bytes_to_read,
-                                                 const void* act,
-                                                 ACE_HANDLE event,
-                                                 int priority,
-                                                 int signal_number)
+ACE_WIN32_Proactor::create_asynch_accept_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE listen_handle,
+   ACE_HANDLE accept_handle,
+   ACE_Message_Block &message_block,
+   size_t bytes_to_read,
+   const void* act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Accept_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Accept_Result (handler,
+                  ACE_WIN32_Asynch_Accept_Result (handler_proxy,
                                                   listen_handle,
                                                   accept_handle,
                                                   message_block,
@@ -425,16 +432,17 @@ ACE_WIN32_Proactor::create_asynch_accept_result (ACE_Handler &handler,
 }
 
 ACE_Asynch_Connect_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_connect_result (ACE_Handler & handler,
-                                                  ACE_HANDLE connect_handle,
-                                                  const void *act,
-                                                  ACE_HANDLE event,
-                                                  int priority ,
-                                                  int signal_number)
+ACE_WIN32_Proactor::create_asynch_connect_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE connect_handle,
+   const void *act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Connect_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Connect_Result (handler,
+                  ACE_WIN32_Asynch_Connect_Result (handler_proxy,
                                                    connect_handle,
                                                    act,
                                                    event,
@@ -445,23 +453,24 @@ ACE_WIN32_Proactor::create_asynch_connect_result (ACE_Handler & handler,
 }
 
 ACE_Asynch_Transmit_File_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                        ACE_HANDLE socket,
-                                                        ACE_HANDLE file,
-                                                        ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                        size_t bytes_to_write,
-                                                        u_long offset,
-                                                        u_long offset_high,
-                                                        size_t bytes_per_send,
-                                                        u_long flags,
-                                                        const void *act,
-                                                        ACE_HANDLE event,
-                                                        int priority,
-                                                        int signal_number)
+ACE_WIN32_Proactor::create_asynch_transmit_file_result
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   ACE_HANDLE socket,
+   ACE_HANDLE file,
+   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
+   size_t bytes_to_write,
+   u_long offset,
+   u_long offset_high,
+   size_t bytes_per_send,
+   u_long flags,
+   const void *act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
 {
   ACE_Asynch_Transmit_File_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Transmit_File_Result (handler,
+                  ACE_WIN32_Asynch_Transmit_File_Result (handler_proxy,
                                                          socket,
                                                          file,
                                                          header_and_trailer,
@@ -479,7 +488,7 @@ ACE_WIN32_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
 }
 
 ACE_Asynch_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_timer (ACE_Handler &handler,
+ACE_WIN32_Proactor::create_asynch_timer (ACE_Handler::Proxy_Ptr &handler_proxy,
                                          const void *act,
                                          const ACE_Time_Value &tv,
                                          ACE_HANDLE event,
@@ -488,7 +497,7 @@ ACE_WIN32_Proactor::create_asynch_timer (ACE_Handler &handler,
 {
   ACE_Asynch_Result_Impl *implementation = 0;
   ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Timer (handler,
+                  ACE_WIN32_Asynch_Timer (handler_proxy,
                                           act,
                                           tv,
                                           event,
@@ -626,8 +635,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds)
         result_err = errno ;
 
       this->application_specific_code (asynch_result,
-                                       ACE_static_cast (size_t,
-                                                        bytes_transferred),
+                                       static_cast<size_t> (bytes_transferred),
                                        (void *) completion_key,
                                        result_err);
     }
@@ -674,14 +682,13 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result)
     {
       // This cast is ok since the original API calls restricted the transfer
       // counts to DWORD range.
-      bytes_transferred = ACE_static_cast (DWORD,
-                                           result->bytes_transferred ());
+      bytes_transferred = static_cast<DWORD> (result->bytes_transferred ());
       completion_key = result->completion_key();
     }
 #if defined (ACE_WIN64)
-  ULONG_PTR comp_key (ACE_reinterpret_cast (ULONG_PTR, completion_key));
+  ULONG_PTR comp_key (reinterpret_cast<ULONG_PTR> (completion_key));
 #else
-  ULONG comp_key (ACE_reinterpret_cast (ULONG, completion_key));
+  ULONG comp_key (reinterpret_cast<ULONG> (completion_key));
 #endif /* ACE_WIN64 */
 
   // Post a completion
@@ -717,9 +724,10 @@ ACE_WIN32_Proactor::post_wakeup_completions (int how_many)
 
   for (ssize_t ci = 0; ci < how_many; ci++)
     {
-      ACE_NEW_RETURN (wakeup_completion,
-                      ACE_WIN32_Wakeup_Completion (this->wakeup_handler_),
-                      -1);
+      ACE_NEW_RETURN
+        (wakeup_completion,
+         ACE_WIN32_Wakeup_Completion (this->wakeup_handler_.proxy ()),
+         -1);
 
       if (wakeup_completion->post_completion (this) == -1)
         return -1;
@@ -743,49 +751,49 @@ ACE_WIN32_Proactor::close_dispatch_threads (int)
 size_t
 ACE_WIN32_Proactor::number_of_threads (void) const
 {
-  return ACE_static_cast (size_t, this->number_of_threads_);
+  return static_cast<size_t> (this->number_of_threads_);
 }
 
 void
 ACE_WIN32_Proactor::number_of_threads (size_t threads)
 {
-  this->number_of_threads_ = ACE_static_cast (DWORD, threads);
+  this->number_of_threads_ = static_cast<DWORD> (threads);
 }
 
-ACE_WIN32_Asynch_Timer::ACE_WIN32_Asynch_Timer (ACE_Handler &handler,
-                                                const void *act,
-                                                const ACE_Time_Value &tv,
-                                                ACE_HANDLE event,
-                                                int priority,
-                                                int signal_number)
+ACE_WIN32_Asynch_Timer::ACE_WIN32_Asynch_Timer
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   const void *act,
+   const ACE_Time_Value &tv,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
   : ACE_Asynch_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority,
+    ACE_WIN32_Asynch_Result (handler_proxy, act, event, 0, 0, priority,
                              signal_number),
     time_ (tv)
 {
 }
 
 void
-ACE_WIN32_Asynch_Timer::complete (size_t bytes_transferred,
-                                  int success,
-                                  const void *completion_key,
-                                  u_long error)
-{
-  ACE_UNUSED_ARG (error);
-  ACE_UNUSED_ARG (completion_key);
-  ACE_UNUSED_ARG (success);
-  ACE_UNUSED_ARG (bytes_transferred);
-
-  this->handler_.handle_time_out (this->time_, this->act ());
-}
-
-ACE_WIN32_Wakeup_Completion::ACE_WIN32_Wakeup_Completion (ACE_Handler &handler,
-                                                          const void *act,
-                                                          ACE_HANDLE event,
-                                                          int priority,
-                                                          int signal_number)
+ACE_WIN32_Asynch_Timer::complete (size_t,
+                                  int,
+                                  const void *,
+                                  u_long)
+{
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_time_out (this->time_, this->act ());
+}
+
+ACE_WIN32_Wakeup_Completion::ACE_WIN32_Wakeup_Completion
+  (ACE_Handler::Proxy_Ptr &handler_proxy,
+   const void *act,
+   ACE_HANDLE event,
+   int priority,
+   int signal_number)
   : ACE_Asynch_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number)
+    ACE_WIN32_Asynch_Result
+     (handler_proxy, act, event, 0, 0, priority, signal_number)
 {
 }
 
@@ -799,7 +807,9 @@ ACE_WIN32_Wakeup_Completion::complete (size_t       /* bytes_transferred */,
                                        const void * /* completion_key */,
                                        u_long       /*  error */)
 {
-  this->handler_.handle_wakeup ();
+  ACE_Handler *handler = this->handler_proxy_.get ()->handler ();
+  if (handler != 0)
+    handler->handle_wakeup ();
 }
 
 #endif /* ACE_WIN32 */
diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h
index 0afec3db432..57bfe943e5f 100644
--- a/ace/WIN32_Proactor.h
+++ b/ace/WIN32_Proactor.h
@@ -121,7 +121,7 @@ public:
   // Methods used to create Asynch_IO_Result objects. We create the right
   // objects here in these methods.
 
-  virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler &handler,
+  virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                                                 ACE_HANDLE handle,
                                                                                 ACE_Message_Block &message_block,
                                                                                 size_t bytes_to_read,
@@ -130,7 +130,7 @@ public:
                                                                                 int priority,
                                                                                 int signal_number = 0);
 
-  virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler &handler,
+  virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                                                   ACE_HANDLE handle,
                                                                                   ACE_Message_Block &message_block,
                                                                                   size_t bytes_to_write,
@@ -139,7 +139,7 @@ public:
                                                                                   int priority,
                                                                                   int signal_number = 0);
 
-  virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler,
+  virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                                             ACE_HANDLE handle,
                                                                             ACE_Message_Block &message_block,
                                                                             size_t bytes_to_read,
@@ -150,7 +150,7 @@ public:
                                                                             int priority,
                                                                             int signal_number = 0);
 
-  virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler,
+  virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                                               ACE_HANDLE handle,
                                                                               ACE_Message_Block &message_block,
                                                                               size_t bytes_to_write,
@@ -162,7 +162,7 @@ public:
                                                                               int signal_number = 0);
 
   /// Create the correct implementation class for ACE_Asynch_Read_Dgram::Result.
-  virtual ACE_Asynch_Read_Dgram_Result_Impl *create_asynch_read_dgram_result (ACE_Handler &handler,
+  virtual ACE_Asynch_Read_Dgram_Result_Impl *create_asynch_read_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                                               ACE_HANDLE handle,
                                                                               ACE_Message_Block *message_block,
                                                                               size_t bytes_to_read,
@@ -174,7 +174,7 @@ public:
                                                                               int signal_number = 0);
 
   /// Create the correct implementation class for ACE_Asynch_Write_Dgram::Result.
-  virtual ACE_Asynch_Write_Dgram_Result_Impl *create_asynch_write_dgram_result (ACE_Handler &handler,
+  virtual ACE_Asynch_Write_Dgram_Result_Impl *create_asynch_write_dgram_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                                                 ACE_HANDLE handle,
                                                                                 ACE_Message_Block *message_block,
                                                                                 size_t bytes_to_write,
@@ -184,7 +184,7 @@ public:
                                                                                 int priority,
                                                                                 int signal_number = 0);
 
-  virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler,
+  virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                                       ACE_HANDLE listen_handle,
                                                                       ACE_HANDLE accept_handle,
                                                                       ACE_Message_Block &message_block,
@@ -194,7 +194,7 @@ public:
                                                                       int priority,
                                                                       int signal_number = 0);
 
-  virtual ACE_Asynch_Connect_Result_Impl *create_asynch_connect_result (ACE_Handler & handler,
+  virtual ACE_Asynch_Connect_Result_Impl *create_asynch_connect_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                                         ACE_HANDLE connect_handle,
                                                                         const void *act,
                                                                         ACE_HANDLE event,
@@ -202,7 +202,7 @@ public:
                                                                         int signal_number = 0);
 
 
-  virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler &handler,
+  virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                                                     ACE_HANDLE socket,
                                                                                     ACE_HANDLE file,
                                                                                     ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
@@ -218,7 +218,7 @@ public:
 
   /// Create a timer result object which can be used with the Timer
   /// mechanism of the Proactor.
-  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler,
+  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler::Proxy_Ptr &handler_proxy,
                                                        const void *act,
                                                        const ACE_Time_Value &tv,
                                                        ACE_HANDLE event,
@@ -299,7 +299,7 @@ class ACE_Export ACE_WIN32_Asynch_Timer : public ACE_WIN32_Asynch_Result
 
 protected:
   /// Constructor.
-  ACE_WIN32_Asynch_Timer (ACE_Handler &handler,
+  ACE_WIN32_Asynch_Timer (ACE_Handler::Proxy_Ptr &handler_proxy,
                           const void *act,
                           const ACE_Time_Value &tv,
                           ACE_HANDLE event = ACE_INVALID_HANDLE,
diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp
index 609f0077b64..6fb2c898ba3 100644
--- a/ace/XtReactor.cpp
+++ b/ace/XtReactor.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "ace/XtReactor.h"
-#if defined (ACE_HAS_XT)
 
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Connector.h"
@@ -446,4 +445,3 @@ ACE_XtReactor::cancel_timer (long timer_id,
     }
 }
 
-#endif /* ACE_HAS_XT */
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index 87b129af19b..e51fc87722e 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -22,9 +22,7 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_XT)
-
+#include "ace/ACE_XtReactor_export.h"
 #include "ace/Select_Reactor.h"
 
 //#define String XtString
@@ -37,7 +35,7 @@
  * @brief This little class is necessary due to the way that Microsoft
  * implements sockets to be pointers rather than indices.
  */
-class ACE_Export ACE_XtReactorID
+class ACE_XtReactor_Export ACE_XtReactorID
 {
 public:
   /// Magic cookie.
@@ -56,7 +54,7 @@ public:
  * @brief An object-oriented event demultiplexor and event handler
  * dispatcher that uses the X Toolkit functions.
  */
-class ACE_Export ACE_XtReactor : public ACE_Select_Reactor
+class ACE_XtReactor_Export ACE_XtReactor : public ACE_Select_Reactor
 {
 public:
   // = Initialization and termination methods.
@@ -132,7 +130,6 @@ private:
   ACE_XtReactor (const ACE_XtReactor &);
   ACE_XtReactor &operator = (const ACE_XtReactor &);
 };
-#endif /* ACE_HAS_XT */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_XTREACTOR_H */
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 58bdf1fece2..1959cb09e44 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -1,15 +1,12 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token, svcconf, uuid, filecache {
+project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache {
   libout       = $(ACE_ROOT)/lib
   sharedname   = ACE
   dynamicflags = ACE_BUILD_DLL
   install      = $(ACE_ROOT)/lib
 
-  // This mpc file could be greatly simplified by putting the separate components
-  // in subdirectories.
-
   // Old OS files.  put these back and remove the OS_NS*, Cleanup.cpp, and
   // Object_Manager_Base.cpp to improve compile times at the cost of
   // footprint. dhinton
@@ -20,407 +17,402 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
   //Synch.cpp
 
   Source_Files(ACE_COMPONENTS) {
-    OS {
-      Basic_Types.cpp
-      Time_Value.cpp
-      Cleanup.cpp
-      Object_Manager_Base.cpp
-      OS_main.cpp
-      OS_NS_arpa_inet.cpp
-      OS_NS_ctype.cpp
-      OS_NS_dirent.cpp
-      OS_NS_dlfcn.cpp
-      OS_NS_errno.cpp
-      OS_NS_fcntl.cpp
-      OS_NS_math.cpp
-      OS_NS_netdb.cpp
-      OS_NS_poll.cpp
-      OS_NS_pwd.cpp
-      OS_NS_regex.cpp
-      OS_NS_signal.cpp
-      OS_NS_stdio.cpp
-      OS_NS_stdlib.cpp
-      OS_NS_string.cpp
-      OS_NS_strings.cpp
-      OS_NS_stropts.cpp
-      OS_NS_sys_mman.cpp
-      OS_NS_sys_msg.cpp
-      OS_NS_sys_resource.cpp
-      OS_NS_sys_select.cpp
-      OS_NS_sys_shm.cpp
-      OS_NS_sys_socket.cpp
-      OS_NS_sys_stat.cpp
-      OS_NS_sys_time.cpp
-      OS_NS_sys_uio.cpp
-      OS_NS_sys_utsname.cpp
-      OS_NS_sys_wait.cpp
-      OS_NS_Thread.cpp
-      OS_NS_time.cpp
-      OS_NS_unistd.cpp
-      OS_NS_wchar.cpp
-      OS_QoS.cpp
-      OS_TLI.cpp
-      OS_Errno.cpp
-      ARGV.cpp
-      Argv_Type_Converter.cpp
-      Base_Thread_Adapter.cpp
-      OS_Thread_Adapter.cpp
-      OS_Log_Msg_Attributes.cpp
-      Thread_Hook.cpp
-      Sched_Params.cpp
-      Handle_Set.cpp
-      Copy_Disabled.cpp
-      Date_Time.cpp
-      gethrtime.cpp
-    }
-
-    Utils {
-      ACE.cpp
-      Active_Map_Manager.cpp
-      Arg_Shifter.cpp
-      Capabilities.cpp
-      Containers.cpp
-      Configuration.cpp
-      Configuration_Import_Export.cpp
-      Dirent.cpp
-      Dirent_Selector.cpp
-      Dynamic.cpp
-      Flag_Manip.cpp
-      Framework_Component.cpp
-      Functor.cpp
-      Functor_String.cpp
-      Get_Opt.cpp
-      Hash_Map_Manager.cpp
-      Connection_Recycling_Strategy.cpp
-      Hashable.cpp
-      Notification_Strategy.cpp
-      Recyclable.cpp
-      Refcountable.cpp
-      Handle_Ops.cpp
-      Init_ACE.cpp
-      Lib_Find.cpp
-      Message_Block.cpp
-      Method_Request.cpp
-      Object_Manager.cpp
-      Registry.cpp
-      String_Base_Const.cpp
-      SString.cpp
-      Stats.cpp
-      Container_Instantiations.cpp
-      Sample_History.cpp
-    }
-
-    Logging {
-      Dump.cpp
-      Log_Msg.cpp
-      Log_Msg_Callback.cpp
-      Log_Msg_Backend.cpp
-      Log_Msg_IPC.cpp
-      Log_Msg_NT_Event_Log.cpp
-      Log_Msg_UNIX_Syslog.cpp
-      Log_Record.cpp
-      Logging_Strategy.cpp
-      Trace.cpp
-    }
-
-    Threads {
-      Activation_Queue.cpp
-      Atomic_Op.cpp
-      Process.cpp
-      Process_Manager.cpp
-      TSS_Adapter.cpp
-      Auto_Event.cpp
-      Manual_Event.cpp
-      Barrier.cpp
-      Condition_Thread_Mutex.cpp
-      Condition_Recursive_Thread_Mutex.cpp
-      Event.cpp
-      Lock.cpp
-      Mutex.cpp
-      RW_Mutex.cpp
-      RW_Thread_Mutex.cpp
-      Recursive_Thread_Mutex.cpp
-      Semaphore.cpp
-      Thread_Mutex.cpp
-      Thread_Semaphore.cpp
-      Synch_Options.cpp
-      Process_Semaphore.cpp
-      Process_Mutex.cpp
-      RW_Process_Mutex.cpp
-      File_Lock.cpp
-      Thread.cpp
-      Thread_Manager.cpp
-      Thread_Adapter.cpp
-      Thread_Exit.cpp
-      Thread_Control.cpp
-      Token.cpp
-    }
-
-    Demux {
-      Event_Handler.cpp
-      FlReactor.cpp
-      Msg_WFMO_Reactor.cpp
-      POSIX_Proactor.cpp
-      POSIX_CB_Proactor.cpp
-      WIN32_Proactor.cpp
-      Priority_Reactor.cpp
-      Proactor.cpp
-      Reactor.cpp
-      Select_Reactor.cpp
-      Select_Reactor_Base.cpp
-      SUN_Proactor.cpp
-      Dev_Poll_Reactor.cpp
-      TP_Reactor.cpp
-      TkReactor.cpp
-      WFMO_Reactor.cpp
-      XtReactor.cpp
-      QtReactor.cpp
-    }
-
-    Connection {
-      Asynch_IO.cpp
-      Asynch_IO_Impl.cpp
-      Asynch_Pseudo_Task.cpp
-      POSIX_Asynch_IO.cpp
-      WIN32_Asynch_IO.cpp
-    }
-
-    Sockets {
-      Addr.cpp
-      INET_Addr.cpp
-      IPC_SAP.cpp
-      LSOCK.cpp
-      LSOCK_Acceptor.cpp
-      LSOCK_CODgram.cpp
-      LSOCK_Connector.cpp
-      LSOCK_Dgram.cpp
-      LSOCK_Stream.cpp
-      Multihomed_INET_Addr.cpp
-      SOCK.cpp
-      SOCK_Acceptor.cpp
-      SOCK_CODgram.cpp
-      Sock_Connect.cpp
-      SOCK_Connector.cpp
-      SOCK_Dgram.cpp
-      SOCK_Dgram_Bcast.cpp
-      SOCK_Dgram_Mcast.cpp
-      SOCK_IO.cpp
-      SOCK_SEQPACK_Acceptor.cpp
-      SOCK_SEQPACK_Association.cpp
-      SOCK_SEQPACK_Connector.cpp
-      SOCK_Stream.cpp
-    }
-
-    IPC {
-      ATM_Addr.cpp
-      ATM_Acceptor.cpp
-      ATM_Connector.cpp
-      ATM_Params.cpp
-      ATM_QoS.cpp
-      ATM_Stream.cpp
-      XTI_ATM_Mcast.cpp
-      DEV.cpp
-      DEV_Addr.cpp
-      DEV_Connector.cpp
-      DEV_IO.cpp
-      FIFO.cpp
-      FIFO_Recv.cpp
-      FIFO_Recv_Msg.cpp
-      FIFO_Send.cpp
-      FIFO_Send_Msg.cpp
-      FILE_Addr.cpp
-      FILE.cpp
-      FILE_Connector.cpp
-      FILE_IO.cpp
-      IO_SAP.cpp
-      IOStream.cpp
-      Pipe.cpp
-      Signal.cpp
-      SPIPE_Addr.cpp
-      SPIPE.cpp
-      SPIPE_Acceptor.cpp
-      SPIPE_Connector.cpp
-      SPIPE_Stream.cpp
-      SV_Message.cpp
-      SV_Message_Queue.cpp
-      SV_Semaphore_Complex.cpp
-      SV_Semaphore_Simple.cpp
-      SV_Shared_Memory.cpp
-      TLI.cpp
-      TLI_Acceptor.cpp
-      TLI_Connector.cpp
-      TLI_Stream.cpp
-      TTY_IO.cpp
-      UNIX_Addr.cpp
-      UPIPE_Acceptor.cpp
-      UPIPE_Connector.cpp
-      UPIPE_Stream.cpp
-      MEM_Acceptor.cpp
-      MEM_Addr.cpp
-      MEM_Connector.cpp
-      MEM_IO.cpp
-      MEM_SAP.cpp
-      MEM_Stream.cpp
-    }
-
-    Streams {
-      CDR_Base.cpp
-      CDR_Stream.cpp
-      Codeset_IBM1047.cpp
-      Codeset_Registry.cpp
-      Codeset_Registry_db.cpp
-      Message_Queue.cpp
-      Reactor_Notification_Strategy.cpp
-      Task.cpp
-    }
-
-    Memory {
-      Based_Pointer_Repository.cpp
-      Malloc.cpp
-      PI_Malloc.cpp
-      Malloc_Allocator.cpp
-      Malloc_Instantiations.cpp
-      Mem_Map.cpp
-      Memory_Pool.cpp
-      Obchunk.cpp
-      Obstack.cpp
-      Read_Buffer.cpp
-      Shared_Memory.cpp
-      Shared_Memory_MM.cpp
-      Shared_Memory_SV.cpp
-    }
-
-    Timer {
-      Basic_Stats.cpp
-      High_Res_Timer.cpp
-      Profile_Timer.cpp
-      System_Time.cpp
-      Time_Request_Reply.cpp
-      Timeprobe.cpp
-      Timer_Hash.cpp
-      Timer_Heap.cpp
-      Timer_List.cpp
-      Timer_Queue.cpp
-      Timer_Wheel.cpp
-    }
-
-    Metrics {
-      Metrics_Cache.cpp
-    }
+    ACE.cpp
+    ACE_crc_ccitt.cpp
+    ACE_crc32.cpp
+    Activation_Queue.cpp
+    Active_Map_Manager.cpp
+    Addr.cpp
+    Arg_Shifter.cpp
+    ARGV.cpp
+    Argv_Type_Converter.cpp
+    Asynch_IO.cpp
+    Asynch_IO_Impl.cpp
+    Asynch_Pseudo_Task.cpp
+    ATM_Acceptor.cpp
+    ATM_Addr.cpp
+    ATM_Connector.cpp
+    ATM_Params.cpp
+    ATM_QoS.cpp
+    ATM_Stream.cpp
+    Atomic_Op.cpp
+    Auto_Event.cpp
+    Barrier.cpp
+    Base_Thread_Adapter.cpp
+    Based_Pointer_Repository.cpp
+    Basic_Stats.cpp
+    Basic_Types.cpp
+    Capabilities.cpp
+    CDR_Base.cpp
+    CDR_Stream.cpp
+    Cleanup.cpp
+    Codeset_IBM1047.cpp
+    Codeset_Registry.cpp
+    Codeset_Registry_db.cpp
+    Condition_Recursive_Thread_Mutex.cpp
+    Condition_Thread_Mutex.cpp
+    Configuration.cpp
+    Configuration_Import_Export.cpp
+    Connection_Recycling_Strategy.cpp
+    Container_Instantiations.cpp
+    Containers.cpp
+    Copy_Disabled.cpp
+    Date_Time.cpp
+    DEV.cpp
+    DEV_Addr.cpp
+    DEV_Connector.cpp
+    DEV_IO.cpp
+    Dev_Poll_Reactor.cpp
+    Dirent.cpp
+    Dirent_Selector.cpp
+    Dump.cpp
+    Dynamic.cpp
+    Event.cpp
+    Event_Handler.cpp
+    FIFO.cpp
+    FIFO_Recv.cpp
+    FIFO_Recv_Msg.cpp
+    FIFO_Send.cpp
+    FIFO_Send_Msg.cpp
+    FILE.cpp
+    FILE_Addr.cpp
+    FILE_Connector.cpp
+    FILE_IO.cpp
+    File_Lock.cpp
+    Flag_Manip.cpp
+    Framework_Component.cpp
+    Functor.cpp
+    Functor_String.cpp
+    Get_Opt.cpp
+    gethrtime.cpp
+    Handle_Ops.cpp
+    Handle_Set.cpp
+    Hash_Map_Manager.cpp
+    Hashable.cpp
+    High_Res_Timer.cpp
+    ICMP_Socket.cpp
+    INET_Addr.cpp
+    Init_ACE.cpp
+    IO_SAP.cpp
+    IOStream.cpp
+    IPC_SAP.cpp
+    Lib_Find.cpp
+    Local_Memory_Pool.cpp
+    Lock.cpp
+    Log_Msg.cpp
+    Log_Msg_Backend.cpp
+    Log_Msg_Callback.cpp
+    Log_Msg_IPC.cpp
+    Log_Msg_NT_Event_Log.cpp
+    Log_Msg_UNIX_Syslog.cpp
+    Log_Record.cpp
+    Logging_Strategy.cpp
+    LSOCK.cpp
+    LSOCK_Acceptor.cpp
+    LSOCK_CODgram.cpp
+    LSOCK_Connector.cpp
+    LSOCK_Dgram.cpp
+    LSOCK_Stream.cpp
+    Malloc.cpp
+    Malloc_Allocator.cpp
+    Malloc_Instantiations.cpp
+    Manual_Event.cpp
+    MEM_Acceptor.cpp
+    MEM_Addr.cpp
+    MEM_Connector.cpp
+    MEM_IO.cpp
+    Mem_Map.cpp
+    MEM_SAP.cpp
+    MEM_Stream.cpp
+    Message_Block.cpp
+    Message_Queue.cpp
+    Method_Request.cpp
+    Metrics_Cache.cpp
+    MMAP_Memory_Pool.cpp
+    Msg_WFMO_Reactor.cpp
+    Multihomed_INET_Addr.cpp
+    Mutex.cpp
+    Notification_Strategy.cpp
+    Obchunk.cpp
+    Object_Manager.cpp
+    Object_Manager_Base.cpp
+    Obstack.cpp
+    OS_Errno.cpp
+    OS_Log_Msg_Attributes.cpp
+    OS_main.cpp
+    OS_NS_arpa_inet.cpp
+    OS_NS_ctype.cpp
+    OS_NS_dirent.cpp
+    OS_NS_dlfcn.cpp
+    OS_NS_errno.cpp
+    OS_NS_fcntl.cpp
+    OS_NS_math.cpp
+    OS_NS_netdb.cpp
+    OS_NS_poll.cpp
+    OS_NS_pwd.cpp
+    OS_NS_regex.cpp
+    OS_NS_signal.cpp
+    OS_NS_stdio.cpp
+    OS_NS_stdlib.cpp
+    OS_NS_string.cpp
+    OS_NS_strings.cpp
+    OS_NS_stropts.cpp
+    OS_NS_sys_mman.cpp
+    OS_NS_sys_msg.cpp
+    OS_NS_sys_resource.cpp
+    OS_NS_sys_select.cpp
+    OS_NS_sys_shm.cpp
+    OS_NS_sys_socket.cpp
+    OS_NS_sys_stat.cpp
+    OS_NS_sys_time.cpp
+    OS_NS_sys_uio.cpp
+    OS_NS_sys_utsname.cpp
+    OS_NS_sys_wait.cpp
+    OS_NS_Thread.cpp
+    OS_NS_time.cpp
+    OS_NS_unistd.cpp
+    OS_NS_wchar.cpp
+    OS_QoS.cpp
+    OS_Thread_Adapter.cpp
+    OS_TLI.cpp
+    Pagefile_Memory_Pool.cpp
+    PI_Malloc.cpp
+    Ping_Socket.cpp
+    Pipe.cpp
+    POSIX_Asynch_IO.cpp
+    POSIX_CB_Proactor.cpp
+    POSIX_Proactor.cpp
+    Priority_Reactor.cpp
+    Proactor.cpp
+    Process.cpp
+    Process_Manager.cpp
+    Process_Mutex.cpp
+    Process_Semaphore.cpp
+    Profile_Timer.cpp
+    Reactor.cpp
+    Reactor_Notification_Strategy.cpp
+    Read_Buffer.cpp
+    Recursive_Thread_Mutex.cpp
+    Recyclable.cpp
+    Refcountable.cpp
+    Registry.cpp
+    RW_Mutex.cpp
+    RW_Process_Mutex.cpp
+    RW_Thread_Mutex.cpp
+    Sample_History.cpp
+    Sbrk_Memory_Pool.cpp
+    Sched_Params.cpp
+    Select_Reactor.cpp
+    Select_Reactor_Base.cpp
+    Semaphore.cpp
+    Shared_Memory.cpp
+    Shared_Memory_MM.cpp
+    Shared_Memory_Pool.cpp
+    Shared_Memory_SV.cpp
+    Signal.cpp
+    SOCK.cpp
+    SOCK_Acceptor.cpp
+    SOCK_CODgram.cpp
+    Sock_Connect.cpp
+    SOCK_Connector.cpp
+    SOCK_Dgram.cpp
+    SOCK_Dgram_Bcast.cpp
+    SOCK_Dgram_Mcast.cpp
+    SOCK_IO.cpp
+    SOCK_SEQPACK_Acceptor.cpp
+    SOCK_SEQPACK_Association.cpp
+    SOCK_SEQPACK_Connector.cpp
+    SOCK_Stream.cpp
+    SPIPE.cpp
+    SPIPE_Acceptor.cpp
+    SPIPE_Addr.cpp
+    SPIPE_Connector.cpp
+    SPIPE_Stream.cpp
+    SString.cpp
+    Stats.cpp
+    String_Base_Const.cpp
+    SUN_Proactor.cpp
+    SV_Message.cpp
+    SV_Message_Queue.cpp
+    SV_Semaphore_Complex.cpp
+    SV_Semaphore_Simple.cpp
+    SV_Shared_Memory.cpp
+    Synch_Options.cpp
+    System_Time.cpp
+    Task.cpp
+    Thread.cpp
+    Thread_Adapter.cpp
+    Thread_Control.cpp
+    Thread_Exit.cpp
+    Thread_Hook.cpp
+    Thread_Manager.cpp
+    Thread_Mutex.cpp
+    Thread_Semaphore.cpp
+    Time_Request_Reply.cpp
+    Time_Value.cpp
+    Timeprobe.cpp
+    Timer_Hash.cpp
+    Timer_Heap.cpp
+    Timer_List.cpp
+    Timer_Queue.cpp
+    Timer_Wheel.cpp
+    TLI.cpp
+    TLI_Acceptor.cpp
+    TLI_Connector.cpp
+    TLI_Stream.cpp
+    Token.cpp
+    TP_Reactor.cpp
+    Trace.cpp
+    TSS_Adapter.cpp
+    TTY_IO.cpp
+    UNIX_Addr.cpp
+    UPIPE_Acceptor.cpp
+    UPIPE_Connector.cpp
+    UPIPE_Stream.cpp
+    WFMO_Reactor.cpp
+    WIN32_Asynch_IO.cpp
+    WIN32_Proactor.cpp
+    XTI_ATM_Mcast.cpp
   }
 
   Template_Files {
-      Acceptor.cpp
-      Active_Map_Manager_T.cpp
-      Array_Base.cpp
-      Auto_Functor.cpp
-      Atomic_Op_T.cpp
-      Node.cpp
-      Unbounded_Set.cpp
-      Unbounded_Queue.cpp
-      Asynch_Acceptor.cpp
-      Asynch_Connector.cpp
-      Auto_IncDec_T.cpp
-      Auto_Ptr.cpp
-      Based_Pointer_T.cpp
-      Connector.cpp
-      Containers_T.cpp
-      Cache_Map_Manager_T.cpp
-      Cached_Connect_Strategy_T.cpp
-      Caching_Strategies_T.cpp
-      Caching_Utility_T.cpp
-      Cleanup_Strategies_T.cpp
-      Dump_T.cpp
-      Dynamic_Service.cpp
-      Env_Value_T.cpp
-      Event_Handler_T.cpp
-      Framework_Component_T.cpp
-      Free_List.cpp
-      Functor_T.cpp
-      Future.cpp
-      Future_Set.cpp
-      Hash_Map_Manager_T.cpp
-      Hash_Map_With_Allocator_T.cpp
-      Hash_Cache_Map_Manager_T.cpp
-      IOStream_T.cpp
-      Intrusive_List.cpp
-      Intrusive_List_Node.cpp
-      LOCK_SOCK_Acceptor.cpp
-      Local_Name_Space_T.cpp
-      Malloc_T.cpp
-      Managed_Object.cpp
-      Map_Manager.cpp
-      Map_T.cpp
-      Message_Block_T.cpp
-      Message_Queue_T.cpp
-      Module.cpp
-      Obstack_T.cpp
-      Pair_T.cpp
-      RB_Tree.cpp
-      Select_Reactor_T.cpp
-      Singleton.cpp
-      Strategies_T.cpp
-      Stream.cpp
-      Stream_Modules.cpp
-      String_Base.cpp
-      Svc_Handler.cpp
-      Synch_T.cpp
-      Task_T.cpp
-      Task_Ex_T.cpp
-      Template_Instantiations.cpp
-      Test_and_Set.cpp
-      Timeprobe_T.cpp
-      Timer_Hash_T.cpp
-      Timer_Heap_T.cpp
-      Timer_List_T.cpp
-      Timer_Queue_Adapters.cpp
-      Timer_Queue_T.cpp
-      Timer_Wheel_T.cpp
-      Typed_SV_Message.cpp
-      Typed_SV_Message_Queue.cpp
-      Vector_T.cpp
+    Acceptor.cpp
+    Active_Map_Manager_T.cpp
+    Array_Base.cpp
+    Asynch_Acceptor.cpp
+    Asynch_Connector.cpp
+    Atomic_Op_T.cpp
+    Auto_Functor.cpp
+    Auto_IncDec_T.cpp
+    Auto_Ptr.cpp
+    Based_Pointer_T.cpp
+    Cache_Map_Manager_T.cpp
+    Cached_Connect_Strategy_T.cpp
+    Caching_Strategies_T.cpp
+    Caching_Utility_T.cpp
+    Cleanup_Strategies_T.cpp
+    Condition_T.cpp
+    Connector.cpp
+    Containers_T.cpp
+    Dump_T.cpp
+    Dynamic_Service.cpp
+    Env_Value_T.cpp
+    Event_Handler_T.cpp
+    Framework_Component_T.cpp
+    Free_List.cpp
+    Functor_T.cpp
+    Future.cpp
+    Future_Set.cpp
+    Guard_T.cpp
+    Hash_Cache_Map_Manager_T.cpp
+    Hash_Map_Manager_T.cpp
+    Hash_Map_With_Allocator_T.cpp
+    IOStream_T.cpp
+    Intrusive_List.cpp
+    Intrusive_List_Node.cpp
+    LOCK_SOCK_Acceptor.cpp
+    Local_Name_Space_T.cpp
+    Lock_Adapter_T.cpp
+    Malloc_T.cpp
+    Managed_Object.cpp
+    Map_Manager.cpp
+    Map_T.cpp
+    Message_Block_T.cpp
+    Message_Queue_T.cpp
+    Module.cpp
+    Node.cpp
+    Obstack_T.cpp
+    Pair_T.cpp
+    RB_Tree.cpp
+    Reverse_Lock_T.cpp
+    Select_Reactor_T.cpp
+    Singleton.cpp
+    Strategies_T.cpp
+    Stream.cpp
+    Stream_Modules.cpp
+    String_Base.cpp
+    Svc_Handler.cpp
+    Synch_T.cpp
+    TSS_T.cpp
+    Task_Ex_T.cpp
+    Task_T.cpp
+    Template_Instantiations.cpp
+    Test_and_Set.cpp
+    Timeprobe_T.cpp
+    Timer_Hash_T.cpp
+    Timer_Heap_T.cpp
+    Timer_List_T.cpp
+    Timer_Queue_Adapters.cpp
+    Timer_Queue_T.cpp
+    Timer_Wheel_T.cpp
+    Typed_SV_Message.cpp
+    Typed_SV_Message_Queue.cpp
+    Unbounded_Queue.cpp
+    Unbounded_Set.cpp
+    Vector_T.cpp
   }
 
   Inline_Files {
     Bound_Ptr.inl
+    Condition_T.inl
+    Guard_T.inl
     Handle_Gobbler.inl
+    Lock_Adapter_T.inl
+    OS.inl
+    OS_Memory.inl
+    OS_String.inl
     Refcounted_Auto_Ptr.inl
+    Reverse_Lock_T.inl
+    Swap.inl
+    TSS_T.inl
     ace_wchar.inl
   }
 
   Header_Files {
-    os_include
-    os_include/arpa
-    os_include/net
-    os_include/netinet
-    os_include/sys
     ACE_export.h
     Array.h
     Bound_Ptr.h
     CORBA_macros.h
+    Condition_T.h
     Default_Constants.h
     Exception_Macros.h
     Global_Macros.h
+    Guard_T.h
     Handle_Gobbler.h
+    If_Then_Else.h
+    IO_Cntl_Msg.h
+    Lock_Adapter_T.h
     Log_Priority.h
     Malloc_Base.h
     Method_Object.h
+    Memory_Pool.h
     Min_Max.h
     Null_Barrier.h
     Null_Condition.h
     Null_Mutex.h
     Null_Semaphore.h
+    OS.h
+    OS_Dirent.h
+    OS_Memory.h
     OS_NS_macros.h
+    OS_String.h
+    OS_Thread_Adapter.h
+    Object_Manager_Base.h
+    Pair.h
     Proactor_Impl.h
     Reactor_Impl.h
     Reactor_Timer_Interface.h
     Refcounted_Auto_Ptr.h
+    Reverse_Lock_T.h
     SStringfwd.h
     Static_Object_Lock.h
     Strategies.h
     Svc_Conf.h
     Svc_Conf_Tokens.h
+    Swap.h
+    Synch.h
     Synch_Traits.h
+    TSS_T.h
     Timer_Queuefwd.h
     UPIPE_Addr.h
     Version.h
@@ -440,6 +432,11 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
     config-win32.h
     config.h
     iosfwd.h
+    os_include
+    os_include/arpa
+    os_include/net
+    os_include/netinet
+    os_include/sys
     post.h
     pre.h
     streams.h
@@ -450,4 +447,41 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
     README
     ../VERSION
   }
+
+  verbatim(gnuace, local) {
+    "Svc_Conf_y.cpp: Svc_Conf.y"
+    "	$(YACC) -l -d Svc_Conf.y"
+    "	sed -e 's/char \\*getenv/char *ace_foo/g' \\"
+    "            -e 's/= getenv/= ACE_OS::getenv/g' \\"
+    "            -e 's/fprintf/ACE_OS::fprintf/g' \\"
+    "            -e 's/yy/ace_yy/g' \\"
+    "            -e 's/->ace_yyerrno/->yyerrno/g' \\"
+    "            -e 's/->ace_yylineno/->yylineno/g' \\"
+    "            -e 's/YY/ACE_YY/g' \\"
+    "            -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' < Svc_Conf.tab.c > /tmp/$@"
+    "	cp /tmp/$@ $@"
+    "	patch < ../etc/Svc_Conf_y.cpp.diff"
+    "	echo \/\/ '$$Id$$' > Svc_Conf_Tokens.h"
+    "	cat Svc_Conf.tab.h >> Svc_Conf_Tokens.h"
+    "	$(RM) -f /tmp/$@ Svc_Conf.tab.c Svc_Conf.tab.h Svc_Conf_y.cpp.orig"
+
+    "Svc_Conf_l.cpp: Svc_Conf.l"
+    "	$(LEX) -L -t -I Svc_Conf.l > $@"
+    "	sed -e 's/unistd/stdio/g' \\"
+    "            -e 's/yy/ace_yy/g' \\"
+    "            -e 's/YY/ACE_YY/g' \\"
+    "            -e 's/->ace_yyerrno/->yyerrno/g' \\"
+    "            -e 's/->ace_yylineno/->yylineno/g' \\"
+    "            -e 's/free( ptr );/free( ACE_MALLOC_T (ptr) );/g' \\"
+    "            -e 's/exit( 1 );/ACE_OS::exit( 1 );/g' \\"
+    "            -e 's/isatty( fileno(file)/ACE_OS::isatty( fileno (file)/g' \\"
+    "            -e 's/int isatty/int nop_isatty/g' \\"
+    "            -e 's/realloc( ptr, size );/realloc( ACE_MALLOC_T (ptr), size );/g' \\"
+    "            -e 's@#include <stdio\.h>@#include /**/ \"ace/OS.h\"@' \\"
+    "            -e 's@#include <@#include /**/ <@' \\"
+    "            -e 's@ECHO@ACE_SVC_CONF_ECHO@' < $@ > /tmp/$@"
+    "	cp /tmp/$@ $@"
+    "	patch < ../etc/Svc_Conf_l.cpp.diff"
+    "	$(RM) -f /tmp/$@ Svc_Conf_l.cpp.orig"
+  }
 }
diff --git a/ace/ace.mwc b/ace/ace.mwc
index 0ae6180ea24..fc541981260 100644
--- a/ace/ace.mwc
+++ b/ace/ace.mwc
@@ -3,8 +3,10 @@
 
 workspace {
   ace.mpc
+  ace_flreactor.mpc
+  ace_qtreactor.mpc
+  ace_tkreactor.mpc
+  ace_xtreactor.mpc
   QoS
-  RMCast
   SSL
-  TMCast
 }
diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h
index 8b115c13cb6..d118c3ce3b6 100644
--- a/ace/ace_wchar.h
+++ b/ace/ace_wchar.h
@@ -264,6 +264,7 @@ typedef ACE_Wide_To_Ascii ACE_OS_WString;
 #define ACE_TEXT_OpenFileMapping                 ::OpenFileMappingW
 #define ACE_TEXT_OpenSCManager                   ::OpenSCManagerW
 #define ACE_TEXT_OpenService                     ::OpenServiceW
+#define ACE_TEXT_OutputDebugString               ::OutputDebugStringW
 #define ACE_TEXT_RegisterEventSource             ::RegisterEventSourceW
 #define ACE_TEXT_RegisterServiceCtrlHandler      ::RegisterServiceCtrlHandlerW
 #define ACE_TEXT_RegConnectRegistry              ::RegConnectRegistryW
@@ -312,6 +313,7 @@ typedef ACE_Wide_To_Ascii ACE_OS_WString;
 #define ACE_TEXT_OpenFileMapping                 ::OpenFileMappingA
 #define ACE_TEXT_OpenSCManager                   ::OpenSCManagerA
 #define ACE_TEXT_OpenService                     ::OpenServiceA
+#define ACE_TEXT_OutputDebugString               ::OutputDebugStringA
 #define ACE_TEXT_RegisterEventSource             ::RegisterEventSourceA
 #define ACE_TEXT_RegisterServiceCtrlHandler      ::RegisterServiceCtrlHandlerA
 #define ACE_TEXT_RegConnectRegistry              ::RegConnectRegistryA
diff --git a/ace/codecs.mpb b/ace/codecs.mpb
index 2acc9343db7..d8c85fffddb 100644
--- a/ace/codecs.mpb
+++ b/ace/codecs.mpb
@@ -3,8 +3,6 @@
 
 feature(ace_codecs) {
   Source_Files(ACE_COMPONENTS) {
-    Codecs {
-      Codecs.cpp
-    }
+    Codecs.cpp
   }
 }
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index 2e4ba28e98c..5f7ccb11ac8 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -31,6 +31,7 @@
 # define ACE_LACKS_ASSERT_H
 # define ACE_LACKS_SEARCH_H
 # define ACE_LACKS_WCHAR_H
+# define ACE_LACKS_WCTYPE_H
 #endif /* UNDER_CE < 400 */
 
 #if !defined (ACE_HAS_WINCE)
@@ -72,6 +73,7 @@
 #define ACE_LACKS_ACE_TOKEN
 #define ACE_LACKS_ACE_OTHER
 #define ACE_LACKS_MSG_WFMO
+#define ACE_LACKS_UMASK
 
 #define ACE_HAS_WCHAR
 
@@ -194,7 +196,9 @@
 #define ACE_LACKS_ENV
 #define ACE_LACKS_HOSTNAME
 #define ACE_LACKS_REALPATH
+#define ACE_LACKS_READLINK
 #define ACE_LACKS_SWAB
+#define ACE_LACKS_TEMPNAM
 
 #if defined (_WIN32_WCE_EMULATION)
 // @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl)
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 6358813be38..5c9ea452378 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -48,8 +48,6 @@
 #    if (__xlC__ < 0x0500)
 #      define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
 #    endif /* __xlC__ < 0x0500 */
-#    define ACE_TEMPLATES_REQUIRE_PRAGMA
-     // If compiling without thread support, turn off ACE's thread capability.
 #  endif
 
    // These are for Visual Age C++ only
diff --git a/ace/config-all.h b/ace/config-all.h
index 165761fc0ef..2eb753b138f 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -38,8 +38,6 @@
     // before the #include of time.h.
 #     include "ace/os_include/os_stdarg.h"
 #   endif /* ghs */
-
-#   include /**/ <vxWorks.h>
 # endif /* VXWORKS */
 
 // This is used to indicate that a platform doesn't support a
@@ -47,13 +45,9 @@
 #if defined ACE_HAS_VERBOSE_NOTSUP
   // Print a console message with the file and line number of the
   // unsupported function.
-# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-#   include /**/ <cstdio>
-# else
-#   include "ace/os_include/os_stdio.h"
-# endif
-# define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP; fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return FAILVALUE; } while (0)
-# define ACE_NOTSUP do { errno = ENOTSUP; fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return; } while (0)
+# include "ace/OS_NS_stdio.h"
+# define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP; ACE_OS::fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return FAILVALUE; } while (0)
+# define ACE_NOTSUP do { errno = ENOTSUP; ACE_OS::fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return; } while (0)
 #else /* ! ACE_HAS_VERBOSE_NOTSUP */
 # define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP ; return FAILVALUE; } while (0)
 # define ACE_NOTSUP do { errno = ENOTSUP; return; } while (0)
diff --git a/ace/config-chorus.h b/ace/config-chorus.h
index 6f534c51a06..f5315273a41 100644
--- a/ace/config-chorus.h
+++ b/ace/config-chorus.h
@@ -115,6 +115,7 @@
 #define ACE_LACKS_UNIX_SIGNALS
 #define ACE_LACKS_UTSNAME_T
 #define ACE_LACKS_WRITEV
+#define ACE_LACKS_WAIT
 #define ACE_PAGE_SIZE 4096
 
 // Chorus has syslog, but doesn't have setlogmask()
diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h
index 230a42ecd1d..7ed1c40c6d6 100644
--- a/ace/config-cygwin32.h
+++ b/ace/config-cygwin32.h
@@ -35,9 +35,6 @@
 
 #define ACE_LACKS_SYSTIME_H
 
-#define ACE_LACKS_READDIR_R
-#define ACE_LACKS_RLIMIT
-
 #define ACE_HAS_SELECT_H
 
 #define ACE_LACKS_PRAGMA_ONCE
@@ -62,16 +59,27 @@
 # error unsupported compiler in ace/config-cygwin32.h
 #endif /* __GNUG__ */
 
+#define ACE_HAS_VOIDPTR_SOCKOPT 1
+#define ACE_HAS_UALARM 1
+#define ACE_HAS_SYS_ERRLIST 1
+#define ACE_HAS_STRNLEN 1
+#define ACE_HAS_POSIX_GETPWNAM_R 1
+#define ACE_HAS_POSIX_NONBLOCK 1
 #define ACE_HAS_POSIX_TIME
+#define ACE_HAS_CLOCK_GETTIME 1
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 #define ACE_HAS_MSG
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-#define ACE_LACKS_GETHOSTENT
+#define ACE_DEFAULT_BASE_ADDR ((char *) 0x8000000)
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
-#define ACE_LACKS_GETPGID_PROTOTYPE
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
-#define ACE_HAS_SYSV_IPC
+//#define ACE_HAS_SYSV_IPC
 #define ACE_HAS_VOIDPTR_MMAP
+#define ACE_HAS_CPLUSPLUS_HEADERS
+#define ACE_HAS_MEMCHR 1
+#define ACE_HAS_POLL
+#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
+#define ACE_HAS_SOCKADDR_MSG_NAME 1
+#define ACE_LACKS_PRI_T 1
 
 // Compiler/platform supports alloca().
 // Although ACE does have alloca() on this compiler/platform combination, it is
@@ -87,9 +95,7 @@
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
-#if !defined(ACE_HAS_IP_MULTICAST)
-# define ACE_HAS_IP_MULTICAST
-#endif /* #if ! defined(ACE_HAS_IP_MULTICAST) */
+#define ACE_HAS_IP_MULTICAST
 
 #define ACE_HAS_BIG_FD_SET
 
@@ -101,10 +107,6 @@
 
 #define ACE_HAS_GETPAGESIZE
 
-#define ACE_LACKS_STRRECVFD
-
-#define ACE_LACKS_MADVISE
-
 #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
 // Compiler/platform supports strerror ().
@@ -113,8 +115,7 @@
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
 
-// Compiler/platform defines the sig_atomic_t typedef.
-#define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SOCKLEN_T 1
 
 #define ACE_HAS_GPERF
 
@@ -122,20 +123,38 @@
 #define ACE_HAS_STRPTIME
 
 #define ACE_LACKS_MKFIFO
-
-// Cygwin has no siginfo.h
 #define ACE_LACKS_SIGINFO_H
-// Cygwin has no ucontext.h
 #define ACE_LACKS_UCONTEXT_H
-
 #define ACE_LACKS_STROPTS_H
+#define ACE_LACKS_FGETWC 1
+#define ACE_LACKS_NAMED_POSIX_SEM
+#define ACE_LACKS_STRRECVFD
+#define ACE_LACKS_MADVISE
+#define ACE_LACKS_GETPGID_PROTOTYPE
+#define ACE_LACKS_GETHOSTENT
+#define ACE_LACKS_ITOW 1
+#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
+#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1
+#define ACE_LACKS_READDIR_R
+#define ACE_LACKS_RLIMIT
+#define ACE_LACKS_RWLOCK_T 1
 
-#define ACE_HAS_AUTOMATIC_INIT_FINI
+#define ACE_LACKS_FGETWS 1
+#define ACE_LACKS_FPUTWS 1
 
+#define ACE_HAS_AUTOMATIC_INIT_FINI
 #define ACE_HAS_SNPRINTF
 
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIGINFO_T
+#define ACE_HAS_SIGACTION_CONSTP2
+#define ACE_HAS_SIGSUSPEND
+#define ACE_HAS_SIG_C_FUNC 1
+#define ACE_HAS_SIG_ATOMIC_T
+
+#define ACE_HAS_POSIX_SEM
+
+#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 
 // Cygwin DLL suffix is .dll
 #define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dll")
@@ -156,6 +175,8 @@
 #   define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
 #   define ACE_HAS_PTHREADS_UNIX98_EXT
+#   define ACE_HAS_PTHREAD_CONTINUE 1
+#   define ACE_HAS_PTHREAD_SUSPEND 1
 
 // ... and the final standard even!
 #  define ACE_HAS_PTHREADS_STD
@@ -166,6 +187,9 @@
 #  define ACE_LACKS_PTHREAD_CANCEL
 #  define ACE_LACKS_THREAD_PROCESS_SCOPING
 #  define ACE_LACKS_MUTEXATTR_PSHARED
+#  define ACE_LACKS_RWLOCKATTR_PSHARED
+#  define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1
+#  define ACE_LACKS_PTHREAD_YIELD 1
 
 // In the 1.5.9 release of Cygwin the pthread_kill gives an access violation
 // so for the time being we say Cygwin doesn't support pthread_kill.
diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h
index de23ed5b5cb..2555cd82bda 100644
--- a/ace/config-doxygen.h
+++ b/ace/config-doxygen.h
@@ -25,8 +25,6 @@
 // #define ACE_LACKS_WCSTOK
 #define ACE_LACKS_ITOW
 #define ACE_LACKS_STRCASECMP
-#define ACE_LACKS_STRCSPN
-#define ACE_LACKS_STRCHR
 #define ACE_LACKS_STRRCHR
 #define ACE_LACKS_WCSCAT
 #define ACE_LACKS_WCSCHR
@@ -60,13 +58,6 @@
 /// Enable support for the SSL wrappers
 #define ACE_HAS_SSL 1
 
-/// Several GUI Reactors that are only enabled in some platforms.
-#define ACE_HAS_XT
-#define ACE_HAS_FL
-#define ACE_HAS_QT
-#define ACE_HAS_TK
-#define ACE_HAS_GTK
-
 /// Enable exceptions
 #define ACE_HAS_EXCEPTIONS
 
@@ -112,6 +103,9 @@
 /// Doxygen is capable of parsing using
 #define ACE_HAS_USING_KEYWORD
 
+/// Generate icmp documentation
+#define ACE_HAS_ICMP_SUPPORT 1
+
 /// Parse some ACE_SSL classes that depend on recent versions of
 /// OpenSSL.
 #define OPENSSL_VERSION_NUMBER 0x00905820L
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 9937e35c0e3..869d78de7b8 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -10,72 +10,40 @@
 #define ACE_GNUG_COMMON_H
 #include /**/ "ace/pre.h"
 
-#if __GNUC__ > 2  ||  ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)  || \
-    (defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x540)
-  // egcs or g++ >= 2.8.0
-
-# define ACE_HAS_CPLUSPLUS_HEADERS
-# define ACE_HAS_STDCPP_STL_INCLUDES
-# define ACE_HAS_TEMPLATE_TYPEDEFS
-# define ACE_HAS_TYPENAME_KEYWORD
-# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-
-#if __GNUC__ > 2  ||  ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-#endif
+#define ACE_HAS_CPLUSPLUS_HEADERS
+#define ACE_HAS_STDCPP_STL_INCLUDES
+#define ACE_HAS_TEMPLATE_TYPEDEFS
+#define ACE_HAS_TYPENAME_KEYWORD
+#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
+#define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+#define ACE_HAS_STANDARD_CPP_LIBRARY 1
+#define ACE_HAS_TEMPLATE_SPECIALIZATION
+#define ACE_HAS_USING_KEYWORD
+#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
+#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#define ACE_TEMPLATES_REQUIRE_SOURCE
 
-# define ACE_HAS_STANDARD_CPP_LIBRARY 1
+#if ( __GNUC__ == 2 && __GNUC_MINOR__ < 97 )
+  // gcc 2.97 and lower use old iostreams
 # define ACE_USES_OLD_IOSTREAMS
-
-#if (__GNUC__ == 2 && __GNUC_MINOR__ <= 91)
-// EGCS (gcc 2.91) doesn't define this in its C++ standard library.
-# define ACE_LACKS_AUTO_PTR
-# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-#endif
-
-# if __GNUC__ == 2  &&  __GNUC_MINOR__ != 9  &&  __GNUC_MINOR__ != 91
-#   // g++ 2.9 and egcs 2.91 apparently have a bug with this . . .
-#   define ACE_HAS_TEMPLATE_SPECIALIZATION
-# endif /* __GNUC__ != 2.9  &&  __GNUC__ != 2.91*/
-
-# if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 91 )
-#   define ACE_HAS_USING_KEYWORD
-    // This is only needed with egcs 1.1 (egcs-2.91.57).  It can't be
-    // used with older versions.
-#   define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-#   if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
-#   endif /* __GNUC__ >= 3.4 */
-# endif /* __GNUC__ >= 2.91 */
-
-#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 97 )
-        // gcc 2.97 and higher use libstdc++-v3 and require
-        // the use of the std namespace for using iostreams
-# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-# undef  ACE_USES_OLD_IOSTREAMS
 #endif /* __GNUC__ >= 2.97 */
 
-  // __EXCEPTIONS is defined with -fexceptions, the egcs default.  It
-  // is not defined with -fno-exceptions, the ACE default for g++.
-  // ACE_HAS_EXCEPTIONS is defined in
-  // include/makeinclude/wrapper_macros.GNU, so this really isn't
-  // necessary.  Just in case . . .
-# if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS)
-#   define ACE_HAS_EXCEPTIONS
-# endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
+#endif /* __GNUC__ >= 3.4 */
 
-# if defined (ACE_HAS_EXCEPTIONS)
-#   define ACE_NEW_THROWS_EXCEPTIONS
-# endif /* ACE_HAS_EXCEPTIONS */
+// __EXCEPTIONS is defined with -fexceptions, the egcs default.  It
+// is not defined with -fno-exceptions, the ACE default for g++.
+// ACE_HAS_EXCEPTIONS is defined in
+// include/makeinclude/wrapper_macros.GNU, so this really isn't
+// necessary.  Just in case . . .
+#if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS)
+#  define ACE_HAS_EXCEPTIONS
+#endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */
 
-#else  /* ! egcs */
-  // Plain old g++.
-# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
-# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-# define ACE_HAS_GNUG_PRE_2_8
-# define ACE_HAS_TEMPLATE_SPECIALIZATION
-# define ACE_LACKS_MIN_MAX_TEMPLATES
-#endif /* ! egcs */
+#if defined (ACE_HAS_EXCEPTIONS)
+#  define ACE_NEW_THROWS_EXCEPTIONS
+#endif /* ACE_HAS_EXCEPTIONS */
 
 #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
 # define ACE_SIZEOF_LONG_DOUBLE 12
@@ -108,7 +76,5 @@
 # endif /* ACE_HAS_STRING_CLASS */
 #endif /* ! ACE_HAS_GNU_REPO */
 
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
 #include /**/ "ace/post.h"
 #endif /* ACE_GNUG_COMMON_H */
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index b35b001f4ee..61e341869e5 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -19,6 +19,11 @@
 
 #  include "ace/config-g++-common.h"
 
+#  if __GLIBC__ >= 2
+     // glibc 2 and higher has wchar support
+#    define ACE_HAS_XPG4_MULTIBYTE_CHAR
+#  endif
+
 // gcc 2.95.2 supplies the ssize_t typedef.
 #  define ACE_HAS_SSIZE_T
 
@@ -210,12 +215,6 @@
 // It can also be set so that the mapped region is shareable with 32-bit
 // programs.  To enable the 32/64 sharing, comment out the first definition
 // of ACE_DEFAULT_BASE_ADDR and uncomment the two lines after it.
-// Note - there's a compiler bug on aC++ A.03.04 in 64-bit mode which prevents
-// these from working as-is.  So, there's some hackery in Naming_Context.cpp
-// and Memory_Pool.cpp which works around it.  It requires the
-// ACE_DEFAULT_BASE_ADDRL definition below - make sure it has the same
-// value as what you use for ACE_DEFAULT_BASE_ADDR.  This is allegedly fixed
-// in A.03.10 on the June Applications CD.
 #if defined (__LP64__)
 #  define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000)
 //#  define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
diff --git a/ace/config-integritySCA.h b/ace/config-integritySCA.h
index 990987673ef..3a99062546b 100644
--- a/ace/config-integritySCA.h
+++ b/ace/config-integritySCA.h
@@ -23,10 +23,7 @@
 #endif
 #define ACE_NEW_THROWS_EXCEPTIONS
 #define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#define	ACE_HAS_TEMPLATE_SPECIALIZATION
-#if 0
-#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
-#endif
+#define ACE_HAS_TEMPLATE_SPECIALIZATION
 #define ACE_TEMPLATES_REQUIRE_SOURCE 1
 #define ACE_HAS_TEMPLATE_TYPEDEFS
 #define TAO_USE_SEQUENCE_TEMPLATES
@@ -34,7 +31,6 @@
 #define ACE_NEEDS_FUNC_DEFINITIONS
 #define _REENTRANT
 #define ACE_MT_SAFE 1
-#define __ACE_INLINE__
 
 // Compiler/platform has correctly prototyped header files.
 #define ACE_HAS_CPLUSPLUS_HEADERS
@@ -54,6 +50,9 @@
 
 
 /* SCA STUFF */
+#if defined(INTEGRITY_VERSION) && (INTEGRITY_VERSION >= 40108)
+#define ACE_HAS_SIG_ATOMIC_T
+#endif /* INTEGRITY_VERSION */
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIGACTION
 #define ACE_HAS_SIGINFO_T
@@ -80,6 +79,8 @@
 #define ACE_LACKS_KEY_T
 
 /****** Posix Defines *****/
+#define ACE_LACKS_WAIT
+#define ACE_LACKS_WAITPID
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_STRDUP_EMULATION
@@ -90,9 +91,6 @@
 #define ACE_LACKS_MKFIFO
 #define ACE_LACKS_MKTEMP
 #define ACE_LACKS_MKSTEMP
-#if 0
-#define ACE_LACKS_MMAP
-#endif
 #define ACE_LACKS_MPROTECT
 #define ACE_LACKS_MUTEXATTR_PSHARED
 #define ACE_LACKS_PIPE
@@ -100,38 +98,21 @@
 #define ACE_LACKS_RECVMSG
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SEMBUF_T
-#if 0
-#define ACE_LACKS_SOCKETPAIR
-#endif
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
 #define ACE_LACKS_USER
-#if 0
-#define ACE_LACKS_STAT
-#endif
 #define ACE_LACKS_FILE_FCNTL
 #define ACE_LACKS_FCNTL
-#if 0
-#define ACE_LACKS_DIRECTORY_FUNCTIONS
-#define ACE_LACKS_UNLINK
-#endif
 #define ACE_LACKS_UMASK
-#if 0
-#define ACE_LACKS_CREAT
-#define ACE_LACKS_TRUNCATE
-#define ACE_LACKS_DUP
-#endif
 #define ACE_LACKS_SEEK
 #define ACE_LACKS_SHARED_MEMORY
 #define ACE_LACKS_MSYNC
-#if 0
-#define ACE_LACKS_SIGNALS
-#endif
 #define ACE_LACKS_PID_STUFF
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_IPC_H
 #define ACE_LACKS_SYS_PARAM_H
 #define ACE_LACKS_SYS_MSG_H
 #define ACE_LACKS_UTSNAME_T
+#define ACE_LACKS_UMASK
 #define ACE_LACKS_ISATTY
 #define ACE_LACKS_GETOPT
 #define ACE_LACKS_STRCASECMP
@@ -139,10 +120,6 @@
 #define ACE_LACKS_TRUNCATE
 #define ACE_LACKS_PWD_FUNCTIONS
 #define ACE_LACKS_UNIX_SIGNALS
-#if 0
-#define ACE_LACKS_ACCESS
-#define ACE_LACKS_UNAME
-#endif
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_PUTENV
@@ -150,29 +127,36 @@
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_LACKS_SETSCHED
-/* #define ACE_LACKS_SYS_NERR */
-#if 0
-#define ACE_LACKS_PTHREAD_CANCEL
-#define ACE_LACKS_PTHREAD_KILL
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_LACKS_PTHREAD_CLEANUP
-#endif
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_WRITEV
 #define ACE_LACKS_READV
 /* below refers to fcntl style locking */
 #define ACE_LACKS_FILELOCKS
 
+#define ACE_LACKS_REALPATH
+#define ACE_HAS_CONST_CHAR_SWAB
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+
 /***** Not tied to standards AFAIK ****/
 #define ACE_LACKS_MADVISE /* paging optimization not needed with INTEGRITY */
 #define ACE_LACKS_MALLOC_H /* netbsd's just includes stdlib.h */
 #define ACE_LACKS_MEMORY_H /* netbsd's just includes string.h */
+#define ACE_LACKS_INTTYPES_H
+#define ACE_LACKS_SYS_RESOURCE_H
+#define ACE_LACKS_SYS_WAIT_H
+#define ACE_LACKS_SEARCH_H
+#define ACE_LACKS_SYS_IPC_H
+#define ACE_LACKS_SYS_SEM_H
+#define ACE_LACKS_PWD_H
+#define ACE_LACKS_STROPTS_H
+#define ACE_LACKS_DLFCN_H
+#define ACE_LACKS_REGEX_H
+#define ACE_LACKS_POLL_H
+#define ACE_LACKS_SYS_SHM_H
+#define ACE_LACKS_TERMIOS_H
 
 /***** STUFF INTEGRITY 4.0.8 APPEARS TO SUPPORT ****/
 /* note, possibly untested with ace */
-#if 0
-#define ACE_LACKS_GETSERVBYNAME
-#endif
 
 /***** TAO STUFF ****/
 #define TAO_USE_DOTTED_DECIMAL_ADDRESSES 1
@@ -188,25 +172,6 @@ extern "C"
   inline int isatty(int) { return 0; }
 }
 
-#if 0
-struct stat
-{
-  unsigned int st_atime; // time of last access
-  unsigned int st_mtime; // time of last data modification
-  unsigned int st_size;           // file size, in bytes
-  unsigned int st_mode;
-  unsigned int st_nlink;
-};
-
-#define MAXNAMLEN 1024
-#define S_IRUSR 1
-#define S_IRGRP 2
-#define S_IROTH 4
-#define S_IWUSR 8
-#define S_IWGRP 16
-#define S_IWOTH 32
-#endif
-
 #ifdef ppc
 #define ACE_HAS_POWERPC_TIMER
 #endif
@@ -221,25 +186,11 @@ typedef union sigval sigval_t;
 #define NSIG (SIGRTMAX+1)
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #define ACE_USE_RCSID 0
-#if 0
-typedef int mode_t;
-typedef int gid_t;
-typedef int uid_t;
-#endif
 #define ACE_LACKS_CUSERID
-#if 0
-#define ACE_LACKS_FSYNC
-#define ACE_LACKS_CHDIR
-#define ACE_LACKS_LSTAT
-#endif
-#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 0x20000
-// #include <stdio.h>
-#define fileno(file)	((file)->io_channel) //Hack to get Svc_Conf_l.cpp compiled
+#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 0x5000
+#define fileno(file) ((file)->io_channel) //Hack to get Svc_Conf_l.cpp compiled
 #define ACE_DEFAULT_THREAD_PRIORITY 127
 #define ACE_HAS_ATTR_SETSCHED
-#if 0
-#define ACE_LACKS_INHERIT_SCHED
-#endif
 #define PRI_FIFO_MIN 1
 #define PRI_FIFO_MAX 127
 #define ACE_THR_PRI_FIFO_DEF 127
@@ -259,16 +210,17 @@ int unlink(const char *);
 }
 
 #define ACE_LACKS_SETSID
-#define ACE_HAS_TIMEZONE_GETTIMEOFDAY /* TZ is ignored */
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 #define ACE_LACKS_UNIX_SYSLOG
 #define ACE_LACKS_TELLDIR
 #define ACE_LACKS_SEEKDIR
-#if 0
-#define ACE_LACKS_REWINDDIR
-#endif
 #define ACE_LACKS_GETHOSTENT
 
 
 /* end MIKEC Addtions */
 
+// Hack to avoid ensure that things defined in ind_io.h
+// have the right linkage
+#include <unistd.h>
+
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 3be0898f3a5..80f58633fb4 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -29,6 +29,12 @@
 #  define ACE_HAS_PTHREADS_UNIX98_EXT
 #endif /* _XOPEN_SOURCE - 0 >= 500 */
 
+#if defined (__USE_POSIX199309)
+#  if !defined (ACE_HAS_CLOCK_GETTIME)
+#    define ACE_HAS_CLOCK_GETTIME
+#  endif
+#endif
+
 // First the machine specific part
 
 #if defined (__alpha)
@@ -40,7 +46,7 @@
 # if !defined (ACE_DEFAULT_BASE_ADDR)
 #   define ACE_DEFAULT_BASE_ADDR ((char *) 0x40000000)
 # endif /* ! ACE_DEFAULT_BASE_ADDR */
-#elif defined (__ia64)
+#elif defined (__ia64) || defined (__x86_64__)
 # if !defined (ACE_DEFAULT_BASE_ADDR)
 // Zero base address should work fine for Linux of IA-64: it just lets
 // the kernel to choose the right value.
@@ -172,7 +178,18 @@
 # undef ACE_LACKS_LLSEEK_PROTOTYPE
 # undef ACE_LACKS_LSEEK64_PROTOTYPE
 # include "ace/config-borland-common.h"
-#else  /* ! __GNUG__ && ! __KCC && !__DECCXX && !__INTEL_COMPILER && !__BORLANDC__*/
+#elif defined (__PGI)
+// Portable group compiler
+# define ACE_HAS_CPLUSPLUS_HEADERS
+# define ACE_HAS_STDCPP_STL_INCLUDES
+# define ACE_HAS_TEMPLATE_TYPEDEFS
+# define ACE_HAS_TYPENAME_KEYWORD
+# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
+# define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+# define ACE_LACKS_SWAB
+# undef ACE_HAS_CLOCK_GETTIME
+#else  /* ! __GNUG__ && ! __KCC && !__DECCXX && !__INTEL_COMPILER && !__BORLANDC__ && !__PGI */
 # error unsupported compiler in ace/config-linux-common.h
 #endif /* ! __GNUG__ && ! __KCC */
 
@@ -325,7 +342,7 @@
 
 #define ACE_HAS_DIRENT
 
-#if defined (__ia64) || defined(__alpha)
+#if defined (__ia64) || defined(__alpha) || defined (__x86_64__)
 // On 64 bit platforms, the "long" type is 64-bits.  Override the
 // default 32-bit platform-specific format specifiers appropriately.
 # define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
@@ -335,9 +352,24 @@
 
 #define ACE_SIZEOF_WCHAR 4
 
-#include /**/ "ace/post.h"
+#define ACE_LACKS_GETIPNODEBYADDR
+#define ACE_LACKS_GETIPNODEBYNAME
 
 // Enables use of POSIX termios struct
 #define ACE_USES_NEW_TERMIOS
 
+#if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) 
+// Detect if getsockname() and getpeername() returns random values in
+// the sockaddr_in::sin_zero field by evaluation of the kernel
+// version. Since version 2.5.47 this problem is fixed.
+#include <linux/version.h>
+#  if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,47))
+#    define ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO 0
+#  else
+#    define ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO 1
+#  endif  /* (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,47)) */
+#endif  /* ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO */
+
+#include /**/ "ace/post.h"
+
 #endif /* ACE_LINUX_COMMON_H */
diff --git a/ace/config-lite.h b/ace/config-lite.h
index 026671f9e84..7ea8ef8cb14 100644
--- a/ace/config-lite.h
+++ b/ace/config-lite.h
@@ -195,26 +195,30 @@
 #  define ACE_INLINE
 #endif /* __ACE_INLINE__ */
 
-// =========================================================================
-// EXPLICIT macro
-// =========================================================================
-
-/**
- * @deprecated explicit is deprecated.  ACE requires C++
- *             "explicit" keyword support.
- */
-# define ACE_EXPLICIT explicit
-
-// =========================================================================
-// MUTABLE macro
-// =========================================================================
-
-/**
- * @deprecated ACE_MUTABLE is deprecated.  ACE requires C++ "mutable"
- *             keyword support.
- */
-# define ACE_MUTABLE mutable
-# define ACE_CONST_WHEN_MUTABLE const
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  // =========================================================================
+  // EXPLICIT macro
+  // =========================================================================
+
+  /**
+   * @deprecated explicit is deprecated.  ACE requires C++
+   *             "explicit" keyword support.
+   */
+  # define ACE_EXPLICIT explicit
+#endif /* ACE_LACKS_DEPRECATED_MACROS */
+
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  // =========================================================================
+  // MUTABLE macro
+  // =========================================================================
+
+  /**
+   * @deprecated ACE_MUTABLE is deprecated.  ACE requires C++ "mutable"
+   *             keyword support.
+   */
+  # define ACE_MUTABLE mutable
+  # define ACE_CONST_WHEN_MUTABLE const
+#endif /* ACE_LACKS_DEPRECATED_MACROS */
 
 // ============================================================================
 // EXPORT macros
@@ -346,17 +350,21 @@
 // should keep them quiet.
 // ============================================================================
 
-#if defined (ghs) || defined (__GNUC__) || defined (__hpux) || defined (__sgi) || defined (__DECCXX) || defined (__KCC) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544)
+#if defined (ghs) || defined (__GNUC__) || defined (__hpux) || defined (__sgi) || defined (__DECCXX) || defined (__KCC) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI)
 // Some compilers complain about "statement with no effect" with (a).
 // This eliminates the warnings, and no code is generated for the null
 // conditional statement.  NOTE: that may only be true if -O is enabled,
 // such as with GreenHills (ghs) 1.8.8.
 # define ACE_UNUSED_ARG(a) do {/* null */} while (&a == 0)
+#elif defined (__DMC__)
+  #define ACE_UNUSED_ID(identifier)
+  template <class T>
+  inline void ACE_UNUSED_ARG(const T& ACE_UNUSED_ID(t)) { }
 #else /* ghs || __GNUC__ || ..... */
 # define ACE_UNUSED_ARG(a) (a)
 #endif /* ghs || __GNUC__ || ..... */
 
-#if defined (__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__KCC) || defined (ACE_RM544) || defined (__USLC__)
+#if defined (__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__KCC) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI)
 # define ACE_NOTREACHED(a)
 #else  /* __sgi || ghs || ..... */
 # define ACE_NOTREACHED(a) a
@@ -517,8 +525,7 @@ typedef ACE_HANDLE ACE_SOCKET;
 // indicate that the actual thread function doesn't return anything. The
 // rest of ACE uses a real type so there's no a ton of conditional code
 // everywhere to deal with the possibility of no return type.
-# if defined (VXWORKS)
-//typedef FUNCPTR ACE_THR_FUNC;  // where typedef int (*FUNCPTR) (...)
+# if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
 # include /**/ <taskLib.h>
 typedef int ACE_THR_FUNC_RETURN;
 # elif defined (ACE_PSOS)
@@ -538,7 +545,7 @@ typedef void (*ACE_THR_C_DEST)(void *);
 typedef void (*ACE_THR_DEST)(void *);
 
 // Now some platforms have special requirements...
-# if defined (VXWORKS)
+# if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
 typedef FUNCPTR ACE_THR_FUNC_INTERNAL;  // where typedef int (*FUNCPTR) (...)
 # elif defined (ACE_PSOS)
 typedef void (*ACE_THR_FUNC_INTERNAL)(void *);
@@ -548,7 +555,7 @@ typedef ACE_THR_FUNC ACE_THR_FUNC_INTERNAL;
 
 extern "C"
 {
-# if defined (VXWORKS)
+# if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
 typedef FUNCPTR ACE_THR_C_FUNC;  // where typedef int (*FUNCPTR) (...)
 # elif defined (ACE_PSOS)
 // needed to handle task entry point type inconsistencies in pSOS+
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index f36147fb310..a9394f87cdb 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -14,8 +14,6 @@
 #define ACE_CONFIG_H
 #include /**/ "ace/pre.h"
 
-#include <unistd.h> /* Get _POSIX_VERSION macro */
-
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
@@ -24,7 +22,7 @@
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
 
-#if _POSIX_VERSION >= 199506L
+#if ACE_LYNXOS_MAJOR > 3 || (ACE_LYNXOS_MAJOR == 3 && ACE_LYNXOS_MINOR > 0)
   // LynxOS 3.1.0 or greater need ipc_1c.h to be included before net/if.h
   // to avoid macro conflict.
 # define ACE_NEEDS_IPC_1C_H
@@ -56,6 +54,7 @@
 #define ACE_HAS_GNU_CSTRING_H
 #define ACE_HAS_GPERF
 #define ACE_HAS_IP_MULTICAST
+#define ACE_HAS_LYNXOS_BROKEN_MMAP
 #define ACE_HAS_LYNXOS_SIGNALS
 #define ACE_HAS_MEMCHR
 #define ACE_HAS_MSG
@@ -65,6 +64,7 @@
 #define ACE_HAS_POLL
 #define ACE_HAS_POSIX_NONBLOCK
 #define ACE_HAS_POSIX_TIME
+#define ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
 #define ACE_HAS_SEMUN
 #define ACE_HAS_SHM_OPEN
@@ -113,7 +113,6 @@
 // MAP_SHARED.
 #define ACE_MAP_PRIVATE ACE_MAP_SHARED
 #define ACE_PAGE_SIZE 4096
-#define ACE_POLL_IS_BROKEN
 
 // Compile using multi-thread libraries.
 #if !defined (ACE_MT_SAFE)
@@ -124,14 +123,14 @@
 #if ACE_MT_SAFE == 1
   // Platform supports threads.
 # define ACE_HAS_PTHREADS
-# if _POSIX_VERSION >= 199506L
+# if ACE_LYNXOS_MAJOR > 3 || (ACE_LYNXOS_MAJOR == 3 && ACE_LYNXOS_MINOR > 0)
     /* LynxOS 3.1.0 or greater */
 #   define ACE_HAS_PTHREADS_STD
 # else  /* LynxOS < 3.1.0 */
 #   define ACE_HAS_PTHREADS_DRAFT4
 #   define ACE_HAS_STDARG_THR_DEST
 #   define ACE_LACKS_MUTEXATTR_PSHARED
-    // Without TSS emulation, you'll only have 3 native TSS keys, on
+    // Without TSS emulation, you'll only have 3 native TSS keys on 
     // LynxOS 3.0.0/ppc.
 #   define ACE_HAS_TSS_EMULATION
 # endif /* LynxOS < 3.1.0 */
@@ -147,8 +146,7 @@
 
 #define ACE_HAS_AIO_CALLS
 #define ACE_POSIX_AIOCB_PROACTOR
-// AIOCB Proactor works on Lynx. But it is not
-// multi-threaded.
+// AIOCB Proactor works on Lynx. But it is not multi-threaded.
 // Lynx OS 3.0.0 lacks POSIX call <pthread_sigmask>. So,we cannot use
 // SIG Proactor also, with multiple threads. So, let us use the AIOCB
 // Proactor. Once <pthreadd_sigmask> is available on Lynx, we can turn
@@ -163,13 +161,13 @@
 #define ACE_HAS_USING_KEYWORD
 
 #if __GNUC__ == 2  &&  __GNUC_MINOR__ == 9
-   // config-g++-common.h defines these incorrectly for LynxOS 3.x
-   // with G++ version 2.9-gnupro-98r2
-#  define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-#  define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-#  define ACE_HAS_TEMPLATE_SPECIALIZATION
-#  define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
-#  undef ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+  // config-g++-common.h defines these incorrectly for LynxOS 3.x
+  // with G++ version 2.9-gnupro-98r2
+# define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
+# define ACE_HAS_TEMPLATE_SPECIALIZATION
+# define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
+# undef ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 #endif /* __GNUC__ == 2  &&  __GNUC_MINOR__ == 9 */
 
 // By default, don't include RCS Id strings in object code.
@@ -180,19 +178,15 @@
 // System include files are not in sys/, this gets rid of warning.
 #define __NO_INCLUDE_WARN__
 
-// socket.h from LynxOS 4.0.x defines SOCK_MAXADDRLEN.  Versions
-// of socket.h found on earlier releases of LynxOS do not define it.
-#include <socket.h>
-#if _POSIX_VERSION >= 199506L && defined (SOCK_MAXADDRLEN)
-
-// "changes signedness" error (OS.i and many other files)
+#if ACE_LYNXOS_MAJOR > 3 /* LynxOS 4.x */
+  // "changes signedness" error (OS.i and many other files)
 # define ACE_HAS_SOCKLEN_T
-
-// LSOCK.cpp uses a macro from param.h, not included
+  // LSOCK.cpp uses a macro from param.h, not included
 # define ALIGNBYTES (sizeof(int) - 1)
 # define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES)
-
-#endif /* _POSIX_VERSION && SOCK_MAXADDRLEN */
+#else /* LynxOS 3.x */
+# define ACE_LACKS_AUTO_PTR
+#endif /* ACE_LYNXOS_MAJOR > 3 */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-mvs.h b/ace/config-mvs.h
index ddab94da911..30e75c159f9 100644
--- a/ace/config-mvs.h
+++ b/ace/config-mvs.h
@@ -96,7 +96,7 @@
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_SYS_NERR
-#define ACE_LACKS_TCP_H
+#define ACE_LACKS_NETINET_TCP_H
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_LACKS_THREAD_STACK_ADDR
 #define ACE_LACKS_TIMESPEC_T
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index 3e2b76af37e..575afdabd5a 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -87,6 +87,8 @@
 #define ACE_IOCTL_TYPE_ARG2 u_long
 #define ACE_LACKS_CONDATTR_PSHARED 1
 #define ACE_LACKS_GETHOSTENT 1
+#define ACE_LACKS_GETIPNODEBYADDR 1
+#define ACE_LACKS_GETIPNODEBYNAME 1
 #define ACE_LACKS_IOSTREAM_FX 1
 #define ACE_LACKS_ITOW 1
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
@@ -114,11 +116,8 @@
 #define ACE_MT_SAFE 1
 #define ACE_NEW_THROWS_EXCEPTIONS 1
 #define ACE_TEMPLATES_REQUIRE_SOURCE 1
-#define ACE_UINT64_TYPEDEF unsigned long long
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 
-typedef unsigned long long ACE_UINT64;
-
 #if defined(__x86_64__)
 #define ACE_SIZEOF_DOUBLE 8
 #define ACE_SIZEOF_FLOAT 4
@@ -129,6 +128,10 @@ typedef unsigned long long ACE_UINT64;
 #define ACE_SIZEOF_SHORT 2
 #define ACE_SIZEOF_VOID_P 8
 #define ACE_SIZEOF_WCHAR 4
+
+typedef unsigned long ACE_UINT64;
+typedef   signed long ACE_INT64;
+
 #define ACE_SSIZE_T_FORMAT_SPECIFIER	ACE_LIB_TEXT ("%ld")
 #define ACE_SIZE_T_FORMAT_SPECIFIER	ACE_LIB_TEXT ("%lu")
 
@@ -144,6 +147,10 @@ typedef unsigned long long ACE_UINT64;
 #define ACE_SIZEOF_SHORT 2
 #define ACE_SIZEOF_VOID_P 4
 #define ACE_SIZEOF_WCHAR 4
+
+typedef unsigned long long ACE_UINT64;
+typedef   signed long long ACE_INT64;
+
 #else
 # error unknown CPU architecture
 #endif
diff --git a/ace/config-openvms.h b/ace/config-openvms.h
index 797db7091ca..b6970ffbc5f 100644
--- a/ace/config-openvms.h
+++ b/ace/config-openvms.h
@@ -22,11 +22,6 @@
 //#define MAXNAMLEN FILENAME_MAX
 //#define __unix__
 
-// OpenVMS does not support symlinks and does not define this.
-// Defining this as 0 effectively cancels out the one bit of code using this in
-// OS_NS_stdlib.cpp.
-#define MAXSYMLINKS 0
-
 #define ACE_OPENVMS
 #define ACE_DLL_SUFFIX ACE_LIB_TEXT("")
 
@@ -73,6 +68,7 @@
 #define ACE_LACKS_FCNTL 1
 
 #define ACE_LACKS_REALPATH 1
+#define ACE_LACKS_SYMLINKS
 
 #define ACE_LACKS_TIMESPEC_T    1
 #define ACE_LACKS_CONST_TIMESPEC_PTR 1
@@ -287,8 +283,6 @@
 #define ACE_LACKS_MALLOC_H 1
                                         /*Platform lacks malloc.h*/
 #define ACE_LACKS_MKFIFO 1
-                                        /*Platform lacks mkfifo() e.g.,
-                                        VxWorks, Chorus, pSoS, and WinNT.*/
 #define ACE_LACKS_NAMED_POSIX_SEM 1
                                         /*Platform lacks named POSIX
                                         semaphores (e.g., Chorus)*/
diff --git a/ace/config-psos-diab-mips.h b/ace/config-psos-diab-mips.h
index daa02b75560..5013201a244 100644
--- a/ace/config-psos-diab-mips.h
+++ b/ace/config-psos-diab-mips.h
@@ -18,6 +18,7 @@
 #define ACE_LACKS_ISATTY
 
 #define ACE_LACKS_DIFFTIME
+#define ACE_LACKS_DUP2
 
 #define ACE_LACKS_INLINE_FUNCTIONS
 
@@ -35,6 +36,8 @@
 
 #define ACE_LACKS_ASSERT_MACRO
 
+#define ACE_LACKS_WAIT
+#define ACE_LACKS_WAITPID
 #define ACE_LACKS_SIGSET
 #define ACE_LACKS_SIGACTION
 #define ACE_LACKS_FCNTL
@@ -208,6 +211,7 @@
 #define ACE_LACKS_TIMESPEC_T
 
 #define ACE_LACKS_UCONTEXT_H
+#define ACE_LACKS_UMASK
 
 #define ACE_LACKS_UNIX_SIGNALS
 
diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h
index 9347e12861c..39def652617 100644
--- a/ace/config-psos-diab-ppc.h
+++ b/ace/config-psos-diab-ppc.h
@@ -21,6 +21,7 @@
 #define ACE_LACKS_ISATTY
 
 #define ACE_LACKS_DIFFTIME
+#define ACE_LACKS_DUP2
 
 #define ACE_LACKS_FCNTL
 
@@ -40,6 +41,8 @@
 # define ACE_HAS_EXCEPTIONS
 #endif /* __GNUG__ */
 
+#define ACE_LACKS_WAIT
+#define ACE_LACKS_WAITPID
 #define ACE_PSOS_LACKS_PREPC
 
 #define ACE_PSOS_HAS_TIME
@@ -104,6 +107,7 @@
 #define ACE_LACKS_WRITEV
 
 #define ACE_LACKS_READV
+#define ACE_LACKS_UMASK
 
 // rename the main entry point
 #define ACE_MAIN extern "C" void root
diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h
index 842cd7a00c3..7824151310c 100644
--- a/ace/config-psos-diab.h
+++ b/ace/config-psos-diab.h
@@ -16,8 +16,11 @@
 #endif /* __ACE_INLINE__ */
 
 #define ACE_LACKS_ISATTY
-
+#define ACE_LACKS_UMASK
+#define ACE_LACKS_WAIT
+#define ACE_LACKS_WAITPID
 #define ACE_LACKS_DIFFTIME
+#define ACE_LACKS_DUP2
 
 #define ACE_LACKS_FCNTL
 
diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h
index 917ee850c71..35ee52422eb 100644
--- a/ace/config-psos-tm.h
+++ b/ace/config-psos-tm.h
@@ -19,6 +19,8 @@
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
 
+#define ACE_LACKS_WAIT
+#define ACE_LACKS_WAITPID
 #define ACE_HAS_STRDUP_EMULATION
 
 #define ACE_HAS_IP_MULTICAST
@@ -39,6 +41,7 @@
 #define TCP_NODELAY  1       // this will be defined later by pSOS/TM
 
 #define ACE_LACKS_HRTIME_T
+#define ACE_LACKS_UMASK
 
 // #define ACE_LACKS_EVENT_T
 
@@ -188,6 +191,7 @@
 #define ACE_PSOS_LACKS_PREPC
 #define ACE_PSOS_CANT_USE_SYS_TYPES
 #define ACE_PSOS_HAS_TIME
+#define ACE_LACKS_DUP2
 
 //#define ACE_PSOS_SNARFS_HEADER_INFO
 
diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h
index b6d83a38ffa..fa71b463fdc 100644
--- a/ace/config-psosim-g++.h
+++ b/ace/config-psosim-g++.h
@@ -53,7 +53,8 @@
 #endif /* __GNUG__ */
 
 #define ACE_HAS_IP_MULTICAST
-
+#define ACE_LACKS_WAIT
+#define ACE_LACKS_WAITPID
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
 // #define ACE_LACKS_U_LONG_LONG
@@ -69,6 +70,7 @@
 #define ACE_LACKS_MALLOC_H
 
 #define ACE_LACKS_MMAP
+#define ACE_LACKS_UMASK
 
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
 
@@ -206,6 +208,7 @@
 #define ACE_LACKS_SYS_MSG_H
 
 #define ACE_LACKS_SYSV_SHMEM
+#define ACE_LACKS_DUP2
 
 #define ACE_LACKS_SYS_NERR
 
diff --git a/ace/config-qnx-rtp-62x.h b/ace/config-qnx-rtp-62x.h
index c24ff841715..d916465d95c 100644
--- a/ace/config-qnx-rtp-62x.h
+++ b/ace/config-qnx-rtp-62x.h
@@ -118,7 +118,7 @@
 #define ACE_LACKS_WCSICMP
 #define ACE_LACKS_WCSNICMP
 #define ACE_LACKS_WCSDUP
-
+#define ACE_LACKS_CUSERID
 // The default value of FD_SETSIZE is 32, but actually x86 NTO
 // supports by default at least 1000 descriptors in fd_set.
 #if defined( FD_SETSIZE )
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 65986361746..0c08d64e6b2 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -192,10 +192,10 @@
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
 
-// This is a lie, but the signatures are all messed up on
-// Solaris. Adding  the right options lie XOPEN_SOURCE and stuff
-// doesn't seem to work right. This is a hack.
-#define ACE_LACKS_SWAB
+// This setting was determined by running the autoconf tests. If it doesn't
+// work uniformly, will need some tweaking, possibly based on other
+// XPG feature-test macros.
+#define ACE_HAS_CONST_CHAR_SWAB
 
 // Compiler/platform supports alloca()
 // Although ACE does have alloca() on this compiler/platform combination, it is
diff --git a/ace/config-tandem-nsk-mips-v2.h b/ace/config-tandem-nsk-mips-v2.h
index d37a2769ce3..c68c72bc9ee 100644
--- a/ace/config-tandem-nsk-mips-v2.h
+++ b/ace/config-tandem-nsk-mips-v2.h
@@ -4,8 +4,8 @@
 
 #ifndef ACE_CONFIG_NSK_H
 #define ACE_CONFIG_NSK_H
-#include /**/ "ace/pre.h"
 
+#include /**/ "ace/pre.h"
 
 // The following configuration file contains defines for Tandem NSK
 // platform, MIPS processor, version 2 C++ compiler.
@@ -28,6 +28,7 @@
 
 // Use all available T1248 thread aware wrapper functions for providing
 // non-blocking I/O.
+// [Note: this causes a significant performance degradation]
 //#define ACE_TANDEM_T1248_PTHREADS_ALL_IO_WRAPPERS
 
 
@@ -66,6 +67,25 @@ typedef enum CMA_T_SCHED_POLICY {
     }                           cma_t_sched_policy;
 #endif
 
+// T1248 doesn't define these constants.  They're defined in spt/cma.h
+// (formerly dce/cma.h), but this header is not included or provided
+// by T1248 G07-AAL.
+#define cma_c_prio_fifo_min     16
+#define cma_c_prio_fifo_mid     24
+#define cma_c_prio_fifo_max     31
+#define cma_c_prio_rr_min       16
+#define cma_c_prio_rr_mid       24
+#define cma_c_prio_rr_max       31
+#define cma_c_prio_through_min  8
+#define cma_c_prio_through_mid  12
+#define cma_c_prio_through_max  15
+#define cma_c_prio_back_min     1
+#define cma_c_prio_back_mid     4
+#define cma_c_prio_back_max     7
+
+// Enable NSK Pluggable Protocols
+#define TAO_HAS_NSKPW 1
+#define TAO_HAS_NSKFS 1
 
 //=========================================================================
 // Platform specific parts
@@ -163,6 +183,12 @@ typedef enum CMA_T_SCHED_POLICY {
 // classification.
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
 
+// No wcsstr function available for this compiler
+#define ACE_LACKS_WCSSTR
+
+// No wctype.h available for this compiler
+#define ACE_LACKS_WCTYPE_H
+
 // Platform supports the POSIX regular expression library.
 // [Note Tandem NSK platform does have regular expresson support but it
 // does not follow the assumptions made by ACE.  To use it would need
@@ -211,6 +237,12 @@ typedef enum CMA_T_SCHED_POLICY {
 // Platform lacks the socketpair() call
 #define ACE_LACKS_SOCKETPAIR
 
+// Platform limits the maximum socket message size.
+#define ACE_HAS_SOCK_BUF_SIZE_MAX
+
+// hrtime_t is a basic type that doesn't require ACE_U64_TO_U32 conversion
+#define ACE_HRTIME_T_IS_BASIC_TYPE
+
 //=========================================================================
 // Threads specific parts
 //=========================================================================
@@ -237,6 +269,9 @@ extern int cma_sigwait  (sigset_t *);
 #define ACE_HAS_PTHREADS_STD
 #endif
 
+// Standard pthreads supports only SCHED_FIFO
+#define ACE_HAS_ONLY_SCHED_FIFO
+
 // Compiler/platform has thread-specific storage
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
@@ -360,10 +395,6 @@ extern int cma_sigwait  (sigset_t *);
 // of classes used as formal arguments to a template class.
 #define ACE_HAS_TEMPLATE_TYPEDEFS
 
-// Platform/Compiler supports a String class
-//#define ACE_HAS_STRING_CLASS
-//# define ACE_HAS_STDCPP_STL_INCLUDES
-
 // Platform has its standard c++ library in the namespace std.
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 
@@ -374,15 +405,13 @@ extern int cma_sigwait  (sigset_t *);
 // Following will not be needed if use standard c library (G06.20 and later)
 #define ACE_LACKS_SIGNED_CHAR
 
+// Compiler supports the new using keyword for C++ namespaces.
+#define ACE_HAS_USING_KEYWORD 
+
 //=========================================================================
 // Build options
 //=========================================================================
 
-// Use in-line functions by default
-//#if ! defined (__ACE_INLINE__)
-//# define __ACE_INLINE__
-//#endif /* ! __ACE_INLINE__ */
-
 // Disable the inclusion of RCS ids in the generated code.
 #define ACE_USE_RCSID 0
 
@@ -399,4 +428,6 @@ extern int cma_sigwait  (sigset_t *);
 // Uncomment the following if tokens library is needed.
 //#define ACE_HAS_TOKENS_LIBRARY
 
+#include /**/ "ace/post.h"
+
 #endif /* ACE_CONFIG_NSK_H */
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index fe25aef308a..b03893e478c 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -39,9 +39,6 @@
 // OS/compiler omits the const from the sendmsg() prototype.
 #define ACE_HAS_NONCONST_SENDMSG
 
-//OS/compiler's header files are inconsistent with libC definition of rand_r().
-//#define ACE_HAS_BROKEN_RANDR          // Defines it the same way as sunos5.4
-
 //Platform supports system configuration information
 #define ACE_HAS_SYSINFO
 
@@ -60,23 +57,18 @@
 // Platform has terminal ioctl flags like TCGETS and TCSETS.
 #define ACE_HAS_TERM_IOCTLS
 
-// ? ACE_HAS_AUTOMATIC_INIT_FINI        Compiler/platform correctly calls
-//                                      init()/fini() for shared libraries
-
 //Platform supports POSIX O_NONBLOCK semantics
 #define ACE_HAS_POSIX_NONBLOCK
 
 // Compiler/platform has correctly prototyped header files
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
-// Platform supports IP multicast
-//#define ACE_HAS_IP_MULTICAST
-
 //Compiler/platform supports alloca()
 // Although ACE does have alloca() on this compiler/platform combination, it is
 // disabled by default since it can be dangerous.  Uncomment the following line
 // if you ACE to use it.
 //#define ACE_HAS_ALLOCA
+
 //Compiler/platform has <alloca.h>
 #define ACE_HAS_ALLOCA_H
 
@@ -87,11 +79,6 @@
 #define ACE_HAS_POSIX_TIME   // As i understand it, but i'm in deep water
 //Platform supports the SVR4 timestruc_t type
 
-//ACE_HAS_PROC_FS                       Platform supports the /proc file system
-
-//ACE_HAS_PRUSAGE_T                     Platform supports the prusage_t struct
-
-
 // To get this to work a patch in sys/signal must be made
 // typedef void          SIG_FUNC_TYPE(int);
 //#if defined (__cplusplus)
@@ -107,10 +94,6 @@
 #define ACE_HAS_SIGINFO_T
 //Platform supports ucontext_t (which is used in the extended signal API).
 #define ACE_HAS_UCONTEXT_T
-//Compiler/platform supports SVR4 signal typedef
-//#define ACE_HAS_SVR4_SIGNAL_T
-//ACE_HAS_SVR4_SIGNAL_T
-
 
 // Platform/compiler has the sigwait(2) prototype
 #define ACE_HAS_SIGWAIT
@@ -135,8 +118,6 @@
 
 //Compiler/platform supports SVR4 dynamic linking semantics
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
-//Compiler/platform supports SVR4  gettimeofday() prototype
-//#define ACE_HAS_SVR4_GETTIMEOFDAY       // Defines it the same way as sunos5.4
 
 //Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)...
 #define ACE_HAS_SVR4_TLI
@@ -161,9 +142,6 @@
 #define ACE_LACKS_SIGNED_CHAR
 
 
-//? ACE_NEEDS_DEV_IO_CONVERSION         Necessary with some compilers
-//to pass ACE_TTY_IO as parameter to DEV_Connector.
-
 #define ACE_PAGE_SIZE 4096
 // Defines the page size of the system (not used on Win32 or
 // with ACE_HAS_GETPAGESIZE).
@@ -184,54 +162,12 @@
 #define ACE_LACKS_PRI_T                 // Tandem lacks pri_t
 #define ACE_HAS_THR_KEYDELETE
 
-//ACE_HAS_REENTRANT_FUNCTIONS           Platform supports reentrant
-// functions (i.e., all the POSIX *_r functions).
-//ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS  Platform will recurse infinitely on
-// thread exits from TSS cleanup routines (e.g., AIX).
-//ACE_NEEDS_HUGE_THREAD_STACKSIZE       Required by platforms with small
-// default stacks.
-//ACE_HAS_ONLY_SCHED_OTHER                Platform, e.g., Solaris 2.5, only
-// supports SCHED_OTHER POSIX scheduling policy.
-
-
 //*************************************
-//ACE_HAS_PTHREADS                      Platform supports POSIX Pthreads
-//ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP   Platform has pthread_condattr_
-// setkind_np().
-//ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP  Platform has
-// pthread_mutexattr_setkind_np().
-//ACE_HAS_THREAD_SELF                   Platform has thread_self() rather
-// than pthread_self() (e.g., DCETHREADS and AIX)
-//ACE_HAS_THR_C_DEST                    The pthread_keycreate() routine *
-// must* take extern C functions.
-//ACE_HAS_THR_C_FUNC                    The pthread_create() routine *must*
-// take extern C functions.
-//ACE_LACKS_CONDATTR_PSHARED            Platform has no implementation of
-// pthread_condattr_setpshared(), even though it supports pthreads!
-//ACE_LACKS_PTHREAD_THR_SIGSETMASK      Platform lacks pthread_thr_
-// sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2)
-//ACE_LACKS_SETDETACH                   Platform lacks pthread_attr_
-// setdetachstate() (e.g., HP/UX 10.x)
-//ACE_LACKS_SETSCHED                    Platform lacks pthread_attr_
-// setsched() (e.g. MVS)
-//ACE_LACKS_THREAD_STACK_SIZE           Platform lacks pthread_attr_
-// setstacksize() (e.g., Linux pthreads)
-
-//ACE_HAS_IRIX62_THREADS                Platform supports the very odd IRIX
-// 6.2 threads...
 
 /*********************************/
 
 /******* SIGNAL STUFF *******/
-//ACE_HAS_SIGNAL_OBJECT_AND_WAIT        Platform supports the Win32
-// SignalObjectAndWait() function (WinNT 4.0 and beyond).
-//#define ACE_HAS_SIGNAL_SAFE_OS_CALLS
-//Automatically restart OS system
-// calls when EINTR occurs
-
 
-// Platform supports the getrusage() system call.
-//#define ACE_HAS_GETRUSAGE
 //Platform uses non-const char * in calls to gethostbyaddr, gethostbyname,
 // getservbyname
 #define ACE_HAS_NONCONST_GETBY
@@ -244,191 +180,13 @@
 #define ACE_HAS_SELECT_H
 // Platform/compiler supports Standard C++ Library
 #define ACE_HAS_STANDARD_CPP_LIBRARY
-//Platform/compiler supports _sys_errlist symbol
-//#define ACE_HAS_SYS_ERRLIST
 //Platform lacks madvise() (e.g., Linux)
 #define ACE_LACKS_MADVISE
-//Platform lacks the si_addr field of siginfo_t (e.g.,VxWorks and HP/UX 10.x)
-//?#define ACE_LACKS_SI_ADDR
 //Compiler/platform lacks strcasecmp() (e.g., DG/UX, UNIXWARE, VXWORKS)
 #define ACE_LACKS_STRCASECMP
 //<time.h> doesn't automatically #include /**/ <sys/time.h>
 #define ACE_LACKS_SYSTIME_H
 
-//ACE_HAS_AIX_BROKEN_SOCKET_HEADER      Platform, such as AIX4, needs to wrap
-//                #include of sys/socket.h with #undef/#define of __cplusplus.
-//ACE_HAS_AIX_HI_RES_TIMER              Platform has AIX4 ::read_real_time ()
-// ? ACE_HAS_BROKEN_BITSHIFT                 Compiler has integer overflow
-//                                      problem with bit-shift operations.
-// ? ACE_HAS_BROKEN_CONVERSIONS         Compiler can't handle calls like
-//                                      foo->operator T *()
-//ACE_HAS_BROKEN_CTIME                  Compiler/platform uses macro for ctime
-// (e.g., MVS)
-//ACE_HAS_BROKEN_HPUX_TEMPLATES         Earlier versions of HP/UX C++ are
-// damned...
-//ACE_HAS_BROKEN_MSG_H                 Platform headers don't support <msg.h>
-// prototypes
-//ACE_HAS_BROKEN_MMAP_H         HP/UX does not wrap the mmap(2) header
-// files with extern "C".
-//ACE_HAS_BROKEN_POSIX_TIME             Platform defines struct timespec in
-// <sys/timers.h>
-//ACE_HAS_NONCONST_SETRLIMIT             OS/compiler omits the const from the
-// rlimit parameter in the setrlimit() prototype.
-//ACE_HAS_NONCONST_WRITEV                OS/compiler omits the const from the
-// iovec parameter in the writev() prototype.
-// There is a bstring in the Tandem but where man bstring OK, find bstring NOK
-// ? ACE_HAS_BSTRING                     Platform has <bstring.h> (which contains bzero() prototype)
-//ACE_HAS_CANCEL_IO                     Platform supports the Win32 CancelIO()
-// function (WinNT 4.0 and beyond).
-//ACE_HAS_CHARPTR_DL                    OS/platform uses char * for
-// dlopen/dlsym args, rather than const char *.
-// Yes in man, no in header file
-//ACE_HAS_CHARPTR_SOCKOPT              OS/platform uses char * for sockopt,
-// rather than const char *
-// sprintf() returns char * rather than int (e.g., SunOS 4.x)
-//#define ACE_HAS_CHARPTR_SPRINTF
-//ACE_HAS_CLOCK_GETTIME                 Platform supports POSIX 1.b
-// clock_gettime ()
-//ACE_HAS_COMPLEX_LOCK                  Platform supports non-standard
-// readers/writer locks...
-//? ACE_HAS_EXCEPTIONS                  Compiler supports C++ exception
-// handling
-// Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be
-// defined, except on Win32)
-//#define ACE_HAS_GETPAGESIZE           // Man getpagesize ok grep /usr/.. not
-// found
-//ACE_HAS_GNU_CSTRING_H         Denotes that GNU has cstring.h as
-// standard which redefines memchr()
-//ACE_HAS_HI_RES_TIMER                  Compiler/platform supports SunOS
-// high resolution timers
-//ACE_HAS_INLINED_OSCALLS               Inline all the static class OS
-// methods to remove call overhead
-//ACE_HAS_LIMITED_RUSAGE_T              The rusage_t structure has only two
-// fields.
-//ACE_HAS_LONG_MAP_FAILED                 Platform defines MAP_FAILED as a
-// long constant.
-//? ACE_HAS_NONCONST_MSGSND             Platform has a non-const parameter to
-// msgsend() (e.g., SCO).
-// Has it msgsend at all
-
-//ACE_HAS_OLD_MALLOC                    Compiler/platform uses old malloc()/
-// free() prototypes (ugh)
-//? ACE_HAS_POSIX_SEM                   Platform supports POSIX real-time
-//semaphores (e.g., VxWorks and Solaris)
-//Compiler/platform defines a union semun for SysV shared memory
-//#define ACE_HAS_SEMUN
-//ACE_HAS_SIN_LEN                       Platform supports new BSD inet_addr
-// len field.
-//? ACE_HAS_SIZET_SOCKET_LEN            OS/compiler uses size_t * rather
-//than int * for socket lengths
-//ACE_HAS_SOCKADDR_MSG_NAME             Platform requires (struct sockaddr *)
-//for msg_name field of struct msghdr.
-//ACE_HAS_STRICT                Use the STRICT compilation mode on Win32.
-//? ACE_HAS_STRUCT_NETDB_DATA           Compiler/platform has strange
-// hostent API for socket *_r() calls
-//ACE_HAS_VOIDPTR_GETTIMEOFDAY           
-//ACE_HAS_TEMPLATE_TYPEDEFS             Compiler implements templates that
-// support typedefs inside of classes used as formal arguments to a template
-// class.
-//Platform/compiler supports timezone * as second parameter to gettimeofday()
-//#define ACE_HAS_TIMEZONE_GETTIMEOFDAY  According to man we have but not
-//when compiling
-//ACE_HAS_UNION_WAIT                    The wait() system call takes a (
-// union wait *) rather than int *
-//? ACE_HAS_USING_KEYWORD               Compiler supports the new using
-// keyword for C++ namespaces.
-//ACE_HAS_VOIDPTR_MMAP                  Platform requires void * for mmap().
-//ACE_HAS_VOIDPTR_SOCKOPT               OS/compiler uses void * arg 4
-// setsockopt() rather than const char *
-//ACE_HAS_WIN32_TRYLOCK                 The Win32 platform support
-//TryEnterCriticalSection() (WinNT 4.0 and beyond)
-//ACE_HAS_WINSOCK2                      The Win32 platform supports WinSock 2.0
-//ACE_HAS_XLI                           Platform has the XLI version of TLI
-//ACE_HAS_XT                            Platform has Xt and Motif
-//ACE_LACKS_CONST_TIMESPEC_PTR          Platform forgot const in cond_timewait
-// (e.g., HP/UX).
-//ACE_LACKS_COND_T                      Platform lacks condition variables
-// (e.g., Win32 and VxWorks)
-//ACE_LACKS_EXEC                        Platform lacks the exec() family of
-// system calls (e.g., Win32, VxWorks, Chorus)
-//ACE_LACKS_FILELOCKS                   Platform lacks file locking mechanism
-//ACE_LACKS_IOSTREAM_FX                 iostream header does not declare
-// ipfx (), opfx (), etc.
-//ACE_LACKS_MALLOC_H                    Platform lacks malloc.h
-//ACE_LACKS_MEMORY_H                    Platform lacks memory.h
-//(e.g., VxWorks and Chorus)
-//ACE_LACKS_MKTEMP                      ACE has no mktemp()
-//ACE_LACKS_MMAP                        The platform doesn't have mmap(2)
-// (e.g., SCO UNIX).
-//ACE_LACKS_MODE_MASKS                  Platform/compiler doesn't have
-//open() mode masks.
-//ACE_LACKS_MPROTECT                    The platform doesn't have mprotect(2)
-//(e.g., EPLX real time OS from CDC (based on LYNX))
-//ACE_LACKS_MSYNC                               Platform lacks msync() (e.g., Linux)
-//ACE_LACKS_NETDB_REENTRANT_FUNCTIONS   Platform does not support reentrant
-// netdb functions (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r,
-// gethostbyname_r, getservbyname_r).
-//ACE_LACKS_SYS_PARAM_H                     Platform lacks <sys/param.h> (e.g.,
-//MVS)
-//certain System V functions like shared memory and message queues.
-//ACE_LACKS_RECVMSG                     Platform lacks recvmsg() (e.g., Linux)
-//ACE_LACKS_RWLOCK_T                    Platform lacks readers/writer locks.
-//ACE_LACKS_SBRK                        Platform lacks a working sbrk()
-// (e.g., Win32 and VxWorks)
-//ACE_LACKS_SEMBUF_T                    Platform lacks struct sembuf
-//(e.g., Win32 and VxWorks)
-//ACE_LACKS_SIGACTION                   Platform lacks struct sigaction
-// (e.g., Win32 and Chorus)
-//? ACE_LACKS_SYS_NERR                  Platforms/compiler lacks the sys_nerr
-// variable (e.g., VxWorks and MVS).
-//ACE_LACKS_SYS_MSG_H                  Platform lacks sys/msg.h
-//(e.g., Chorus and VxWorks)
-//ACE_LACKS_KEY_T                       Platform lacks key_t
-//(e.g., Chorus, VxWorks, Win32)
-//ACE_LACKS_SENDMSG                     Platform lacks sendmsg()
-// (e.g., Linux)
-//ACE_LACKS_SYSV_SHMEM                  Platform lacks System V shared
-// memory (e.g., Win32 and VxWorks)
-//ACE_LACKS_SIGINFO_H                   Platform lacks the siginfo.h include
-// file (e.g., MVS)
-//ACE_LACKS_SOCKETPAIR                  Platform lacks the socketpair()
-// call (e.g., SCO UNIX)
-//? ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES      Compiler doesn't support
-// static data member templates
-//ACE_LACKS_STRRECVFD                   Platform doesn't define struct
-//strrecvfd.
-//ACE_LACKS_SYSCALL                     Platform doesn't have syscall()
-// prototype
-//ACE_LACKS_SYSV_MSQ_PROTOS             Platform doesn't have prototypes for
-//Sys V msg()* queues.
-//ACE_LACKS_T_ERRNO                     Header files lack t_errno for TLI
-//ACE_LACKS_TCP_H                       Platform doesn't have netinet/tcp.h
-//ACE_LACKS_UCONTEXT_H                  Platform lacks the ucontext.h file
-//ACE_LACKS_UNIX_DOMAIN_SOCKETS         ACE platform has no UNIX domain sockets
-//ACE_LACKS_UTSNAME_T                   Platform lacks struct utsname
-// (e.g., Win32 and VxWorks)
-//ACE_NDEBUG                            Turns off debugging features
-//ACE_LACKS_READV                       Platform doesn't define readv, so
-// use our own
-//ACE_LACKS_WRITEV                      Platform doesn't define writev, so
-//use our own
-//ACE_NLOGGING                          Turns off the LM_DEBUG and LM_ERROR
-//logging macros...
-//ACE_REDEFINES_XTI_FUNCTIONS           Platform redefines the t_... names
-//(UnixWare)
-//ACE_SELECT_USES_INT                   Platform uses int for select()
-//rather than fd_set
-//? ACE_TEMPLATES_REQUIRE_PRAGMA        Compiler's template mechanism must
-// use a pragma This is used for AIX's C++ compiler.
-//? ACE_TEMPLATES_REQUIRE_SOURCE        Compiler's template mechanim must
-// see source code (i.e., .cpp files).  This is used for GNU G++.
-//? ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION    Compiler's template mechanism
-//requires the use of explicit C++ specializations for all used
-//templates. This is also used for GNU G++ if you don't use the "repo"
-//patches.
-//ACE_USE_POLL                          Use the poll() event demultiplexor
-//rather than select().
-
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
 
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
index 3290d5c23b9..df7e073deee 100644
--- a/ace/config-tru64.h
+++ b/ace/config-tru64.h
@@ -13,12 +13,19 @@
 # include "ace/config-osf1-4.0.h"
 # define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 # if DIGITAL_UNIX >= 0x500
-// It's possible that snprintf() is available on earlier Tru64 versions,
-// but this is the only way it's been tested.  Steve Huston, 22-Jan-2003
-// It is not on 4.0F.  Rich Seibel, 6 Feb 2003
-# ifndef ACE_HAS_SNPRINTF
-#  define ACE_HAS_SNPRINTF
-# endif /* ACE_HAS_SNPRINTF */
+    // It's possible that snprintf() is available on earlier Tru64 versions,
+    // but this is the only way it's been tested.  Steve Huston, 22-Jan-2003
+    // It is not on 4.0F.  Rich Seibel, 6 Feb 2003
+#   ifndef ACE_HAS_SNPRINTF
+#     define ACE_HAS_SNPRINTF
+#   endif /* ACE_HAS_SNPRINTF */
+#   define ACE_HAS_XPG4_MULTIBYTE_CHAR 1
+    /*Platform has support for
+    multi-byte character support
+    compliant with the XPG4
+    Worldwide Portability
+    Interface wide-character
+    classification.*/
 # endif /* DIGITAL_UNIX >= 0x500 */
 # if DIGITAL_UNIX >= 0x40D
 #   define ACE_LACKS_SYSTIME_H
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index c7b41c9ea97..4a2b0383737 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -2,9 +2,11 @@
 // $Id$
 
 // The following configuration file is designed to work for VxWorks
-// 5.2/5.3 platforms using one of these compilers:
-// 1) The GNU/Cygnus g++ compiler that is shipped with Tornado 1.0.1.
-// 2) The Green Hills 1.8.8 (not 1.8.7!!!!) and 1.8.9 compilers.
+// 5.5.x platforms using one of these compilers:
+// 1) The GNU g++ compiler that is shipped with Tornado 2.2 or newer.
+// 2) The Green Hills 1.8.8 and newer 1.8.9 compilers (not tested
+// already for a long time)
+// 3) The WindRiver Compiler (formerly known as Diab)
 
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
@@ -14,6 +16,10 @@
 # define VXWORKS
 #endif /* ! VXWORKS */
 
+#if ! defined (ACE_VXWORKS)
+# define ACE_VXWORKS 0x551
+#endif /* ! ACE_VXWORKS */
+
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
@@ -21,23 +27,19 @@
 // Compiler-specific configuration.
 #if defined (__GNUG__)
 # include "ace/config-g++-common.h"
-# undef ACE_HAS_TEMPLATE_SPECIALIZATION
-
-// We have to explicitly instantiate static template members
-# define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
 
 # define ACE_LACKS_IOSTREAM_FX
+
 # if !defined (ACE_MAIN)
 #   define ACE_MAIN ace_main
 # endif /* ! ACE_MAIN */
 
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
-# define ACE_LACKS_SIGNED_CHAR
 
 // An explicit check for Tornado 2.1, which had very limited release.
 // See include/makeinclude/platform_vxworks5.x_g++.GNU for details
 // on version conventions used by ACE for VxWorks.
-# if defined (ACE_VXWORKS) && ACE_VXWORKS == 0x542
+# if ACE_VXWORKS == 0x542
     // Older versions of Tornado accidentally omitted math routines from
     // the link library to support long long arithmetic. These could be
     // found and used from another library in the distro.
@@ -45,24 +47,23 @@
     // have a problem.
 #   define ACE_LACKS_LONGLONG_T
 #   define ACE_LACKS_CLEARERR
-    // This is for inofficial(!) gcc2.96 shipped with Tornado2.1.0 for
-    // Hitachi SuperH platform.
 #   define ACE_LACKS_AUTO_PTR
 # endif /* ACE_VXWORKS == 0x542 */
 
+# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
+	// GNU 3.3+ toolchain supports long long types but fails to define this so STL
+	// skips some definitions
+#   if !defined (_GLIBCPP_USE_LONG_LONG)
+#     define _GLIBCPP_USE_LONG_LONG
+#   endif
+# endif /* (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) */
+
 #elif defined (ghs)
   // Processor type, if necessary.  Green Hills defines "ppc".
 # if defined (ppc)
 #   define ACE_HAS_POWERPC_TIMER
 #   define ACE_LACKS_CLEARERR
-# elif defined (i386) || defined (__i386__)
-    // If running an Intel, assume that it's a Pentium so that
-    // ACE_OS::gethrtime () can use the RDTSC instruction.  If
-    // running a 486 or lower, be sure to comment this out.
-    // (If not running an Intel CPU, this #define will not be seen
-    //  because of the i386 protection, so it can be ignored.)
-#   define ACE_HAS_PENTIUM
-# endif /* ppc || i386 */
+# endif /* ppc */
 
 # define ACE_CONFIG_INCLUDE_GHS_COMMON
 # include "ace/config-ghs-common.h"
@@ -75,7 +76,7 @@
 // with different parameters.
 # define __INCineth
 
-#elif defined (__DCPLUSPLUS__)
+#elif defined (__DCPLUSPLUS__) || defined (__DCC__)
   // Diab 4.2a or later.
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
     // We define it with a -D with make depend.
@@ -84,23 +85,32 @@
 
   // Diab doesn't support VxWorks' iostream libraries.
 # define ACE_LACKS_IOSTREAM_TOTALLY
+# define ACE_LACKS_ACE_IOSTREAM
+
+# define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 0
 
-  // #include <new.h> causes strange compilation errors in
-  // the system header files.
-# define ACE_LACKS_NEW_H
+# define ACE_HAS_USING_KEYWORD
 
-#else  /* ! __GNUG__ && ! ghs */
+# define ACE_TEMPLATES_REQUIRE_SOURCE
+# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
+# define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+
+#else  /* ! __GNUG__ && ! ghs && !__DCC__ */
 # error unsupported compiler on VxWorks
 #endif /* ! __GNUG__ && ! ghs */
 
-#if defined (ACE_VXWORKS) && ACE_VXWORKS <= 0x540
-#  define ACE_LACKS_ARPA_INET_H
-#endif /* ! (ACE_VXWORKS) && ACE_VXWORKS <= 0x540 */
-
 // OS-specific configuration
-
+#define ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R
+#define ACE_MKDIR_LACKS_MODE
+#define ACE_HAS_NONCONST_GETBY
+#define ACE_HAS_NONCONST_STAT
+#define ACE_HAS_NONCONST_SWAB
+#define ACE_HAS_NONCONST_READV
+#define ACE_HAS_NONCONST_CHDIR
+#define ACE_HAS_NONCONST_UNLINK
+#define ACE_HAS_NONCONST_OPENDIR
 #define ACE_LACKS_UNIX_SYSLOG
-#define ACE_HAS_MUTEX_TIMEOUTS
 #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768
 #define ACE_DEFAULT_THREAD_KEYS 16
 #define ACE_HAS_BROKEN_ACCEPT_ADDR
@@ -115,21 +125,20 @@
 #define ACE_HAS_DLL 0
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_MSG
+#define ACE_HAS_NONCONST_READV
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 #define ACE_HAS_POSIX_NONBLOCK
 #define ACE_HAS_POSIX_TIME
-#define ACE_HAS_RECURSIVE_MUTEXES
+#define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_STRDUP_EMULATION
 #define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
-#define ACE_HAS_TSS_EMULATION
 #define ACE_HAS_STRPTIME
 #define ACE_LACKS_ACCESS
-#define ACE_LACKS_COND_T
 #define ACE_LACKS_EXEC
 #define ACE_LACKS_FCNTL
 #define ACE_LACKS_FILELOCKS
@@ -151,8 +160,10 @@
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_SYS_PARAM_H
 #define ACE_LACKS_PWD_FUNCTIONS
+#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS
 #define ACE_LACKS_READDIR_R
 #define ACE_LACKS_READLINK
+#define ACE_LACKS_REALPATH
 #define ACE_LACKS_RLIMIT
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SBRK
@@ -172,9 +183,12 @@
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_TRUNCATE
 #define ACE_LACKS_UCONTEXT_H
-#define ACE_LACKS_UNIX_SIGNALS
+#define ACE_LACKS_UMASK
 #define ACE_LACKS_UTSNAME_T
 #define ACE_LACKS_NATIVE_STRPTIME
+#define ACE_LACKS_WAIT
+#define ACE_LACKS_WAITPID
+#define ACE_LACKS_DUP2
 #define ACE_PAGE_SIZE 4096
 #define ACE_THR_PRI_FIFO_DEF 101
 #define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF
@@ -206,7 +220,6 @@
 
 // Not sure if these should always be defined.
 #define ACE_LACKS_SYS_UN_H
-#define ACE_LACKS_PTHREAD_H
 
 // Some string things
 #define ACE_LACKS_WCSCAT
@@ -232,19 +245,57 @@
 #define ACE_LACKS_WCSTOL
 #define ACE_LACKS_WCSTOUL
 #define ACE_LACKS_WCSDUP
+#define ACE_LACKS_SYMLINKS
+
+// It is possible to enable pthread support with VxWorks, when the user decides
+// to use this, we need some more defines
+#if defined ACE_HAS_PTHREADS
+# define ACE_HAS_PTHREADS_STD
+# define ACE_LACKS_CONDATTR_PSHARED
+# define ACE_LACKS_MUTEXATTR_PSHARED
+# define ACE_HAS_THREAD_SPECIFIC_STORAGE
+# define ACE_HAS_POSIX_SEM
+// Include this file, the sys/stat.h file shipped with VxWorks has old types
+// and without this include we get a lot of compile errors. A TSR has been filed
+// so that hopefully in the future we can zap this include
+#include "types/vxTypesOld.h"
+#else
+# define ACE_LACKS_PTHREAD_H
+# define ACE_LACKS_COND_T
+// VxWorks has no recursive mutexes. This was set in the past but it doesn't
+// work with the pthread support, so only set it for the time being when pthread
+// is disabled
+# define ACE_HAS_RECURSIVE_MUTEXES
+// VxWorks does not have the pthread_mutex_timedlock operation, but there is
+// an emulation for this when not using the pthread mapping
+#define ACE_HAS_MUTEX_TIMEOUTS
+#define ACE_HAS_TSS_EMULATION
+#endif
 
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
 #endif
 
+// Needed include to get all VxWorks CPU types
+#include "types/vxCpu.h"
+#if (CPU == PENTIUM || CPU == PENTIUM2 || CPU == PENTIUM3 || CPU == PENTIUM4)
+// If running an Intel Pentium the
+// ACE_OS::gethrtime () can use the RDTSC instruction.
+# define ACE_HAS_PENTIUM
+#endif
+
 #if !defined (ACE_NEEDS_HUGE_THREAD_STACKSIZE)
 # define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536
 #endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */
 
+#if !defined (ACE_NTRACE)
+# define ACE_NTRACE 1
+#endif /* ACE_NTRACE */
+
 // By default, don't include RCS Id strings in object code.
 #if !defined (ACE_USE_RCSID)
 #define ACE_USE_RCSID 0
-#endif /* #if !defined (ACE_USE_RCSID) */
+#endif /* !ACE_USE_RCSID */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 079ba1fb143..9b931b20cc6 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -195,6 +195,7 @@
 #define ACE_HAS_MSG
 #define ACE_HAS_DIRENT
 #define ACE_HAS_SOCKADDR_MSG_NAME
+#define ACE_LACKS_DUP2
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_GETPPID
 #define ACE_LACKS_SETPGID
@@ -223,20 +224,29 @@
 #define ACE_LACKS_PTHREAD_H
 #define ACE_LACKS_ARPA_INET_H
 #define ACE_LACKS_MADVISE
+#define ACE_LACKS_READLINK
+#define ACE_LACKS_PWD_FUNCTIONS
+#define ACE_LACKS_WAIT
+#define ACE_LACKS_SOCKETPAIR
+#define ACE_LACKS_UNIX_SYSLOG
 
 #define ACE_HAS_SNPRINTF
 #define ACE_HAS_VFWPRINTF
 #define ACE_HAS_VSWPRINTF
 
+#define ACE_MKDIR_LACKS_MODE
+
 #define ACE_SIZEOF_LONG_LONG 8
 // Green Hills Native x86 does not support __int64 keyword
 // Neither does mingw32.
 #if !defined (ACE_LACKS_LONGLONG_T) && !defined (__MINGW32__)
 typedef unsigned __int64 ACE_UINT64;
+typedef   signed __int64 ACE_INT64;
 #endif /* (ghs) */
 
 #if defined (__MINGW32__)
 typedef unsigned long long ACE_UINT64;
+typedef   signed long long ACE_INT64;
 #endif
 
 // Optimize ACE_Handle_Set for select().
@@ -342,12 +352,6 @@ typedef unsigned long long ACE_UINT64;
 # endif /* !_MT && !ACE_HAS_WINCE */
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
-// We are using STL's min and max (in algobase.h).  Therefore the
-// macros in window.h are extra
-#if !defined (NOMINMAX)
-# define NOMINMAX
-#endif /* NOMINMAX */
-
 #if !defined(_DEBUG)
 // If we are making a release, and the user has not specified
 // inline directives, we will default to inline
diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h
index 86fd9f522d8..7aa3e0b3027 100644
--- a/ace/config-win32-mingw.h
+++ b/ace/config-win32-mingw.h
@@ -52,6 +52,9 @@
 #  define ACE_LACKS_DIRENT_H
 #endif
 
+#undef ACE_LACKS_SIGSET
+
+#define ACE_LACKS_SIGSET_DEFINITIONS
 #define ACE_LACKS_SYS_SHM_H
 #define ACE_LACKS_TERMIOS_H
 #define ACE_LACKS_NETINET_TCP_H
@@ -95,6 +98,9 @@
 # endif
 #endif
 
+#define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d")
+#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
+
 #define ACE_ENDTHREADEX(STATUS)  ::_endthreadex ((DWORD) (STATUS))
 
 #include /**/ "ace/post.h"
diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h
index f3f47bfd8f7..f6023a0cdf9 100644
--- a/ace/config-win32-msvc-7.h
+++ b/ace/config-win32-msvc-7.h
@@ -37,10 +37,6 @@
 #define ACE_AUTO_PTR_LACKS_RESET
 #endif
 
-#if !defined (ACE_HAS_BROKEN_NESTED_TEMPLATES)
-#define ACE_HAS_BROKEN_NESTED_TEMPLATES
-#endif
-
 #define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_HAS_USING_KEYWORD
 
@@ -70,7 +66,9 @@
 #define ACE_LACKS_STRRECVFD
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
-#define ACE_HAS_TEMPLATE_TYPEDEFS
+#if (_MSC_VER >= 1310)
+#  define ACE_HAS_TEMPLATE_TYPEDEFS
+#endif
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
diff --git a/ace/config-win32-msvc-8.h b/ace/config-win32-msvc-8.h
index e99ad109bf6..ebf8f3494fa 100644
--- a/ace/config-win32-msvc-8.h
+++ b/ace/config-win32-msvc-8.h
@@ -37,10 +37,6 @@
 #define ACE_AUTO_PTR_LACKS_RESET
 #endif
 
-#if !defined (ACE_HAS_BROKEN_NESTED_TEMPLATES)
-#define ACE_HAS_BROKEN_NESTED_TEMPLATES
-#endif
-
 #define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_HAS_USING_KEYWORD
 
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index 02e0daa03a4..bb319cef13e 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -139,10 +139,5 @@
 #     endif /* !STRICT */
 #   endif /* ACE_HAS_STRICT */
 
-// Define QT_DLL for QtReactor to be compiled correct
-#   if defined (ACE_HAS_QT)
-#     define QT_DLL
-#   endif
-
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_WIN32_MSVC_H */
diff --git a/ace/config-win32.h b/ace/config-win32.h
index a7a46c39fa1..cfe53fbc847 100644
--- a/ace/config-win32.h
+++ b/ace/config-win32.h
@@ -47,6 +47,8 @@
 #    include "ace/config-win32-ghs.h"
 #elif defined (__MINGW32__)
 #    include "ace/config-win32-mingw.h"
+#elif defined (__DMC__)
+#    include "ace/config-win32-dmc.h"
 #else
 #    error Compiler is not supported
 #endif
diff --git a/ace/filecache.mpb b/ace/filecache.mpb
index a1b94c41fef..f5da84a3314 100644
--- a/ace/filecache.mpb
+++ b/ace/filecache.mpb
@@ -3,8 +3,6 @@
 
 feature(ace_filecache) {
   Source_Files(ACE_COMPONENTS) {
-    Filecache {
-      Filecache.cpp
-    }
+    Filecache.cpp
   }
 }
diff --git a/ace/os_include/arpa/os_inet.h b/ace/os_include/arpa/os_inet.h
index 34efdeed433..91be0df2331 100644
--- a/ace/os_include/arpa/os_inet.h
+++ b/ace/os_include/arpa/os_inet.h
@@ -62,14 +62,6 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (ACE_VXWORKS) && ACE_VXWORKS <= 0x540
-   // Work around a lack of ANSI prototypes for these functions on VxWorks.
-   unsigned long  inet_addr (const char *);
-   char           *inet_ntoa (const struct in_addr);
-   struct in_addr inet_makeaddr (const int, const int);
-   unsigned long  inet_network (const char *);
-#endif /* ! (ACE_VXWORKS) && ACE_VXWORKS <= 0x540 */
-
 #if defined (ACE_LACKS_INET_ATON_PROTOTYPE)
   int inet_aton (const char *, struct in_addr *);
 #endif /* ACE_LACKS_INET_ATON_PROTOTYPE */
diff --git a/ace/os_include/netinet/os_tcp.h b/ace/os_include/netinet/os_tcp.h
index 67cd7db28b3..bf9886ef632 100644
--- a/ace/os_include/netinet/os_tcp.h
+++ b/ace/os_include/netinet/os_tcp.h
@@ -24,11 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// @todo: remove this, and fix references when you get a chance... dhinton
-#if defined (ACE_LACKS_TCP_H)
-#  define ACE_LACKS_NETINET_TCP_H
-#endif /* ACE_LACKS_TCP_H */
-
 #if !defined (ACE_LACKS_NETINET_TCP_H)
 # include /**/ <netinet/tcp.h>
 #endif /* !ACE_LACKS_NETIINET_TCP_H */
diff --git a/ace/os_include/os_errno.h b/ace/os_include/os_errno.h
index 4c39bc04dfa..e633a7a4fb9 100644
--- a/ace/os_include/os_errno.h
+++ b/ace/os_include/os_errno.h
@@ -156,6 +156,11 @@ extern "C"
 #    define ENOTEMPTY               WSAENOTEMPTY
 #  endif /* __BORLANDC__  && __BORLANDC__ <= 0x540*/
 #  define EADDRINUSE WSAEADDRINUSE
+
+  // CE needs this...
+#  if !defined (EPERM)
+#    define EPERM                 ERROR_ACCESS_DENIED
+#  endif
 #endif /* ACE_WIN32 */
 
 #if defined (ACE_HAS_H_ERRNO)
diff --git a/ace/os_include/os_fcntl.h b/ace/os_include/os_fcntl.h
index 4f7e3ec02fd..0d456c06043 100644
--- a/ace/os_include/os_fcntl.h
+++ b/ace/os_include/os_fcntl.h
@@ -56,6 +56,10 @@ extern "C"
 #  define _O_TEXT   O_TEXT
 #endif /* __BORLANDC__ */
 
+#if defined (__DMC__)
+#  define _O_TEMPORARY 0x08 /* see fcntl.h */
+#endif /* __DMC__ */
+
 // defined Win32 specific macros for UNIX platforms
 #if !defined (O_BINARY)
 #  define O_BINARY 0
diff --git a/ace/os_include/os_limits.h b/ace/os_include/os_limits.h
index e8b17d2249a..27be31af2b4 100644
--- a/ace/os_include/os_limits.h
+++ b/ace/os_include/os_limits.h
@@ -35,6 +35,12 @@
 #  include /**/ <sys/param.h>
 #endif /* ACE_LACKS_SYS_PARAM_H */
 
+// On VxWorks _POSIX_TIMER_MAX is defined in time.h, report this to WindRiver
+// support.
+#if defined (VXWORKS)
+#  include /**/ <time.h>
+#endif /* VXWORKS */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_pthread.h b/ace/os_include/os_pthread.h
index 5c579a99056..6eccef3a418 100644
--- a/ace/os_include/os_pthread.h
+++ b/ace/os_include/os_pthread.h
@@ -66,6 +66,11 @@ extern "C" pthread_t pthread_self (void);
    }
 #endif /* !ACE_LACKS_PTHREAD_H */
 
+#if defined (ACE_HAS_PTHREAD_NP_H)
+// FreeBSD declares _np (non-portable) pthread extensions in <pthread_np.h>
+#  include /**/ <pthread_np.h>
+#endif
+
 // @todo: need to reoganize to put includes at the top and the rest of the
 // code at the bottom.  Also, move the classes out of this file.
 #if defined (ACE_HAS_PTHREADS)
@@ -93,8 +98,8 @@ extern "C" pthread_t pthread_self (void);
 // programs to have their own ACE-wide "default".
 
 // PROCESS-level values
-#  if defined (_POSIX_PRIORITY_SCHEDULING) && \
-         !defined(_UNICOS) && !defined(UNIXWARE_7_1)
+#  if (defined (_POSIX_PRIORITY_SCHEDULING) || defined (ACE_TANDEM_T1248_PTHREADS)) \
+   && !defined(_UNICOS) && !defined(UNIXWARE_7_1)
 #    define ACE_PROC_PRI_FIFO_MIN  (sched_get_priority_min(SCHED_FIFO))
 #    define ACE_PROC_PRI_RR_MIN    (sched_get_priority_min(SCHED_RR))
 #    if defined (HPUX)
@@ -236,11 +241,13 @@ extern "C" pthread_t pthread_self (void);
    typedef pthread_t ACE_hthread_t;
    typedef pthread_t ACE_thread_t;
 
+   // native TSS key type
+   typedef pthread_key_t ACE_OS_thread_key_t;
+   // TSS key type to be used by application
 #  if defined (ACE_HAS_TSS_EMULATION)
-     typedef pthread_key_t ACE_OS_thread_key_t;
-     typedef u_long ACE_thread_key_t;
+     typedef u_int ACE_thread_key_t;
 #  else  /* ! ACE_HAS_TSS_EMULATION */
-     typedef pthread_key_t ACE_thread_key_t;
+     typedef ACE_OS_thread_key_t ACE_thread_key_t;
 #  endif /* ! ACE_HAS_TSS_EMULATION */
 
 #  if !defined (ACE_LACKS_COND_T)
diff --git a/ace/os_include/os_semaphore.h b/ace/os_include/os_semaphore.h
index 18c8c58b498..a1905169249 100644
--- a/ace/os_include/os_semaphore.h
+++ b/ace/os_include/os_semaphore.h
@@ -30,10 +30,6 @@
 # include /**/ <semaphore.h>
 #endif /* !ACE_LACKS_SEMAPHORE_H */
 
-#if defined (VXWORKS)
-#  include /**/ <semLib.h>
-#endif /* VXWORKS */
-
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_signal.h b/ace/os_include/os_signal.h
index 45a1a0fddaf..058fa57fcb5 100644
--- a/ace/os_include/os_signal.h
+++ b/ace/os_include/os_signal.h
@@ -40,7 +40,7 @@
 
 #if defined (ACE_HAS_SIGINFO_T)
 #  if !defined (ACE_LACKS_SIGINFO_H)
-#    if defined (__QNX__) || defined (__OpenBSD__)
+#    if defined (__QNX__) || defined (__OpenBSD__) || defined (__INTERIX)
 #      include /**/ <sys/siginfo.h>
 #    else  /* __QNX__ || __OpenBSD__ */
 #      include /**/ <siginfo.h>
@@ -48,7 +48,7 @@
 #  endif /* ACE_LACKS_SIGINFO_H */
 #endif /* ACE_HAS_SIGINFO_T */
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
 #  include /**/ <sigLib.h>
 #endif /* VXWORKS */
 
@@ -66,13 +66,11 @@ extern "C"
 #endif /* __cplusplus */
 
 #if defined (ACE_SIGINFO_IS_SIGINFO_T)
-   typedef struct siginfo siginfo_t;
+  typedef struct siginfo siginfo_t;
 #endif /* ACE_LACKS_SIGINFO_H */
 
 #if defined (ACE_LACKS_SIGSET)
-#  if !defined(__MINGW32__)
-     typedef u_int sigset_t;
-#  endif /* !__MINGW32__*/
+  typedef u_int sigset_t;
 #endif /* ACE_LACKS_SIGSET */
 
 #if defined (ACE_HAS_SIG_MACROS)
@@ -198,11 +196,6 @@ extern "C"
 #elif defined (__Lynx__)
    // LynxOS Neutrino sets NSIG to the highest-numbered signal.
 #  define ACE_NSIG (NSIG + 1)
-#  if defined (ACE_HAS_PTHREADS_STD) /* LynxOS 3.1.0 or greater */
-     /* Though there's a pthread_sigmask man page, there isn't a
-        declaration in a system header file. */
-     int pthread_sigmask (int, const sigset_t *, sigset_t *);
-#  endif /* ACE_HAS_PTHREADS_STD */   
 #elif defined (__rtems__)
 #  define ACE_NSIG (SIGRTMAX)
 #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x600)
diff --git a/ace/os_include/os_time.h b/ace/os_include/os_time.h
index 80f49200187..78300ba24be 100644
--- a/ace/os_include/os_time.h
+++ b/ace/os_include/os_time.h
@@ -71,7 +71,7 @@ extern "C"
 #if defined (ACE_HAS_PTHREADS_STD)    /* POSIX.1c threads (pthreads) */
    // ... and 2-parameter asctime_r and ctime_r
 #  if !defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) && \
-      !defined (ACE_HAS_STHREADS)
+      !defined (ACE_HAS_STHREADS) && !defined (ACE_VXWORKS)
 #    define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #  endif
 #endif /* ACE_HAS_PTHREADS_STD */
@@ -96,7 +96,7 @@ extern "C"
 typedef struct timespec * ACE_TIMESPEC_PTR;
 #else
 typedef const struct timespec * ACE_TIMESPEC_PTR;
-#endif /* HPUX */
+#endif /* ACE_LACKS_CONST_TIMESPEC_PTR */
 
 #if defined (DIGITAL_UNIX)
   extern char *_Pctime_r (const time_t *, char *);
diff --git a/ace/os_include/sys/os_stat.h b/ace/os_include/sys/os_stat.h
index 375a91714f4..536d1ce8ff0 100644
--- a/ace/os_include/sys/os_stat.h
+++ b/ace/os_include/sys/os_stat.h
@@ -67,22 +67,33 @@ extern "C"
 #  define S_IWOTH 00002           /* write permission: other. */
 #  define S_IXOTH 00001           /* execute permission: other. */
 
-// eVC doesn't define these bits, but MSVC does. The bit settings are copied
-// from the MSVC defs.
-#  if defined (ACE_HAS_WINCE)
-#    define S_IFDIR 0040000
-#    define S_IFREG 0100000
-#  endif /* ACE_HAS_WINCE */
-
-#if !defined (S_IFLNK)
+// WinCE's S_IFLNK is defined with the other bits, below.
+#if !defined (S_IFLNK) && !defined (ACE_HAS_WINCE)
 #define S_IFLNK 0200000
-#endif /* S_IFLNK */
+#endif /* S_IFLNK && !ACE_HAS_WINCE */
 
 #endif /* ACE_LACKS_MODE_MASKS */
 
+// Some systems (VxWorks) don't define S_ISLNK
+#if !defined (S_ISLNK)
+# if defined (S_IFLNK)
+#   define S_ISLNK(mode) (((mode)&S_IFLNK) == S_IFLNK)
+# else
+#   define S_ISLNK(mode) 0
+# endif /* S_IFLNK */
+#endif /* S_ISLNK */
+
 #if defined (ACE_HAS_WINCE)
 #  include "ace/Time_Value.h"
 
+// Translate the WinCE bits into names expected by our callers.
+// The dwFileAttributes parameter doesn't have protection info, so
+// S_IFMT is the whole thing. Since there are no symbolic links, S_IFLNK is 0.
+#  define S_IFMT 0xFFFF
+#  define S_IFDIR FILE_ATTRIBUTE_DIRECTORY
+#  define S_IFREG FILE_ATTRIBUTE_NORMAL
+#  define S_IFLNK 0
+
    struct stat
    {
       /// always 0 on Windows platforms
diff --git a/ace/other.mpb b/ace/other.mpb
index a2f0015b0db..9599ab8282b 100644
--- a/ace/other.mpb
+++ b/ace/other.mpb
@@ -3,15 +3,13 @@
 
 feature(ace_other) {
   Source_Files(ACE_COMPONENTS) {
-    Other {
-      Local_Name_Space.cpp
-      Name_Proxy.cpp
-      Name_Request_Reply.cpp
-      Name_Space.cpp
-      Naming_Context.cpp
-      Registry_Name_Space.cpp
-      Remote_Name_Space.cpp
-      NT_Service.cpp
-    }
+    Local_Name_Space.cpp
+    Name_Proxy.cpp
+    Name_Request_Reply.cpp
+    Name_Space.cpp
+    Naming_Context.cpp
+    Registry_Name_Space.cpp
+    Remote_Name_Space.cpp
+    NT_Service.cpp
   }
 }
diff --git a/ace/qt_reactor.mpb b/ace/qt_reactor.mpb
index e596b5e5d5c..ea302f05bda 100644
--- a/ace/qt_reactor.mpb
+++ b/ace/qt_reactor.mpb
@@ -7,8 +7,6 @@ feature(qt): ace_qt, qt_moc {
   }
 
   Source_Files(ACE_COMPONENTS) {
-    Demux {
       QtReactor_moc.cpp
-    }
   }
 }
diff --git a/ace/streams.h b/ace/streams.h
index 8b61b0cf2ee..11f5c927b69 100644
--- a/ace/streams.h
+++ b/ace/streams.h
@@ -27,13 +27,13 @@
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
-
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+
 // Do this so the #pragma warning in the MSVC headers do not
 // affect our #pragma warning settings
-#if defined (_MSC_VER) && (_MSC_VER >= 1200)
+#if defined (_MSC_VER)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
+#endif /* _MSC_VER*/
 
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -132,9 +132,9 @@
 
 // Do this so the #pragma warning in the MSVC headers do not
 // affect our #pragma warning settings
-#if defined (_MSC_VER) && (_MSC_VER >= 1200)
+#if defined (_MSC_VER)
 #pragma warning(pop)
-#endif /* _MSC_VER >= 1200 */
+#endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_STREAMS_H */
diff --git a/ace/svcconf.mpb b/ace/svcconf.mpb
index 5f5ba112e86..c05fd56ce09 100644
--- a/ace/svcconf.mpb
+++ b/ace/svcconf.mpb
@@ -5,22 +5,20 @@ feature(ace_svcconf) {
   macros += ACE_HAS_ACE_SVCCONF
 
   Source_Files(ACE_COMPONENTS) {
-    Svcconf {
-      DLL.cpp
-      DLL_Manager.cpp
-      Dynamic_Service_Base.cpp
-      Parse_Node.cpp
-      Service_Config.cpp
-      Service_Manager.cpp
-      Service_Object.cpp
-      Service_Repository.cpp
-      Service_Types.cpp
-      Service_Templates.cpp
-      Shared_Object.cpp
-      Svc_Conf_l.cpp
-      Svc_Conf_y.cpp
-      Svc_Conf_Lexer_Guard.cpp
-      XML_Svc_Conf.cpp
-    }
+    DLL.cpp
+    DLL_Manager.cpp
+    Dynamic_Service_Base.cpp
+    Parse_Node.cpp
+    Service_Config.cpp
+    Service_Manager.cpp
+    Service_Object.cpp
+    Service_Repository.cpp
+    Service_Types.cpp
+    Service_Templates.cpp
+    Shared_Object.cpp
+    Svc_Conf_l.cpp
+    Svc_Conf_y.cpp
+    Svc_Conf_Lexer_Guard.cpp
+    XML_Svc_Conf.cpp
   }
 }
diff --git a/ace/token.mpb b/ace/token.mpb
index 7795ec54328..e2a03f6edc8 100644
--- a/ace/token.mpb
+++ b/ace/token.mpb
@@ -5,13 +5,11 @@ feature(ace_token) {
   macros += ACE_HAS_ACE_TOKEN
 
   Source_Files(ACE_COMPONENTS) {
-    Token {
-      Local_Tokens.cpp
-      Remote_Tokens.cpp
-      Token_Collection.cpp
-      Token_Invariants.cpp
-      Token_Manager.cpp
-      Token_Request_Reply.cpp
-    }
+    Local_Tokens.cpp
+    Remote_Tokens.cpp
+    Token_Collection.cpp
+    Token_Invariants.cpp
+    Token_Manager.cpp
+    Token_Request_Reply.cpp
   }
 }
diff --git a/ace/uuid.mpb b/ace/uuid.mpb
index a7f9db9eb64..3357a6e61b8 100644
--- a/ace/uuid.mpb
+++ b/ace/uuid.mpb
@@ -3,8 +3,6 @@
 
 feature(ace_uuid) {
   Source_Files(ACE_COMPONENTS) {
-    UUID {
-      UUID.cpp
-    }
+    UUID.cpp
   }
 }
diff --git a/aceConf.sh.in b/aceConf.sh.in
deleted file mode 100644
index bff456f6928..00000000000
--- a/aceConf.sh.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Configuration of the ACE distribution
-#
-
-ACE_COMPILER="@CXX@"
-ACE_LIBDIR="@ACE_LIBDIR@"
-ACE_INCLUDEDIR="@ACE_INCLUDEDIR@ @CXXFLAGS@"
-ACE_LIBS="@ACE_LIBS@"
diff --git a/apps/Gateway/Gateway/gateway.mpc b/apps/Gateway/Gateway/gateway.mpc
index 64e5ec6288b..9403ba858b1 100644
--- a/apps/Gateway/Gateway/gateway.mpc
+++ b/apps/Gateway/Gateway/gateway.mpc
@@ -18,7 +18,7 @@ project(Gateway) : acelib {
 }
 
 project(gatewayd) : aceexe {
-
+  exename = gatewayd
   after += Gateway
   libs  += Gateway
 
diff --git a/apps/Gateway/Gateway/gatewayd.cpp b/apps/Gateway/Gateway/gatewayd.cpp
index bda60fe7d3f..2c598c6805f 100644
--- a/apps/Gateway/Gateway/gatewayd.cpp
+++ b/apps/Gateway/Gateway/gatewayd.cpp
@@ -22,6 +22,7 @@
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 #include "ace/Log_Msg.h"
+#include "ace/Reactor.h"
 #include "Gateway.h"
 
 ACE_RCSID (Gateway,
diff --git a/apps/Gateway/Gateway/svc.conf b/apps/Gateway/Gateway/svc.conf
index 9b35a7dcbd6..3698b0e3e13 100644
--- a/apps/Gateway/Gateway/svc.conf
+++ b/apps/Gateway/Gateway/svc.conf
@@ -1,3 +1,3 @@
 #static Svc_Manager "-d -p 2913"
-dynamic Gateway Service_Object * ./Gateway:_make_Gateway() active "-b -d -c C|S -a C|S -P connection_config -C consumer_config"
+dynamic Gateway Service_Object * Gateway:_make_Gateway() active "-b -d -c C|S -a C|S -P connection_config -C consumer_config"
 
diff --git a/apps/Gateway/Peer/peer.mpc b/apps/Gateway/Peer/peer.mpc
index 422aeec4c26..7e2e24ba4aa 100644
--- a/apps/Gateway/Peer/peer.mpc
+++ b/apps/Gateway/Peer/peer.mpc
@@ -1,14 +1,23 @@
 // -*- MPC -*-
 // $Id$
 
-project(Gateway_Peer) : aceexe {
-  exename = peerd
+project(Gateway_Peer) : acelib {
+  sharedname = Gateway_Peer
   Source_Files {
     Options.cpp
     Peer.cpp
-    peerd.cpp
   }
   Documentation_Files {
     svc.conf
   }
 }
+
+project(gateway_peerd) : aceexe {
+  exename = peerd
+  after += Gateway_Peer
+  libs += Gateway_Peer
+
+  Source_Files {
+    peerd.cpp
+  }
+}
\ No newline at end of file
diff --git a/apps/Gateway/Peer/svc.conf b/apps/Gateway/Peer/svc.conf
index c27eb06cec8..707f457da2f 100644
--- a/apps/Gateway/Peer/svc.conf
+++ b/apps/Gateway/Peer/svc.conf
@@ -1,2 +1,2 @@
 #static Svc_Manager "-d -p 291"
-dynamic Peer1 Service_Object * ./Peer:_make_Peer_Factory() active "-a C|S"
+dynamic Peer1 Service_Object * Gateway_Peer:_make_Peer_Factory() active "-a C|S"
diff --git a/apps/JAWS/clients/Blobby/Blob.cpp b/apps/JAWS/clients/Blobby/Blob.cpp
index 7c6d41d4554..b29004ae960 100644
--- a/apps/JAWS/clients/Blobby/Blob.cpp
+++ b/apps/JAWS/clients/Blobby/Blob.cpp
@@ -18,7 +18,7 @@ ACE_Blob::~ACE_Blob (void)
 // initialize address and filename. No network i/o in open
 
 int
-ACE_Blob::open (ACE_TCHAR *filename, const ACE_TCHAR *hostname , u_short port)
+ACE_Blob::open (const ACE_TCHAR *filename, const ACE_TCHAR *hostname , u_short port)
 {
   filename_ = ACE_OS::strdup (filename);
   inet_addr_.set (port, hostname);
diff --git a/apps/JAWS/clients/Blobby/Blob.h b/apps/JAWS/clients/Blobby/Blob.h
index afd880bf46c..9ba35fb0176 100644
--- a/apps/JAWS/clients/Blobby/Blob.h
+++ b/apps/JAWS/clients/Blobby/Blob.h
@@ -49,8 +49,8 @@ public:
   ACE_Blob (void);
   ~ACE_Blob (void);
 
-  int open (ACE_TCHAR *filename,
-            const ACE_TCHAR *hostname =  ACE_DEFAULT_SERVER_HOST ,
+  int open (const ACE_TCHAR *filename,
+            const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST,
             u_short port = 80);
   // initializes the class with the given filename, hostname and port.
   // it should be called with the filename, before any read/write calls
diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/apps/JAWS/clients/Blobby/Blob_Handler.cpp
index 093b5fd42f8..c2e74f38548 100644
--- a/apps/JAWS/clients/Blobby/Blob_Handler.cpp
+++ b/apps/JAWS/clients/Blobby/Blob_Handler.cpp
@@ -277,11 +277,12 @@ ACE_Blob_Writer::send_request (void)
   char *mesg;
   ACE_NEW_RETURN (mesg, char [mesglen], -1);
 
-  // Create the header, store the actual length in mesglen
-  mesglen = ACE_OS::sprintf (mesg, "%s /%s %s "
-                             ACE_SIZE_T_FORMAT_SPECIFIER"\n\n",
+  // Create the header, store the actual length in mesglen.
+  // NOTE! %lu is really what's wanted. ACE_SIZE_T_FORMAT_SPECIFIER is
+  // defined in terms of ACE_LIB_TEXT which is NOT what we want here.
+  mesglen = ACE_OS::sprintf (mesg, "%s /%s %s %lu\n\n",
                              request_prefix_, filename_, request_suffix_,
-                             length_);
+                             (unsigned long)length_);
 
   // Send the header followed by the data
 
diff --git a/apps/JAWS/clients/Blobby/Options.h b/apps/JAWS/clients/Blobby/Options.h
index 47c0c852036..8396cf5535b 100644
--- a/apps/JAWS/clients/Blobby/Options.h
+++ b/apps/JAWS/clients/Blobby/Options.h
@@ -39,7 +39,7 @@ public:
   void parse_args (int argc, ACE_TCHAR *argv[]);
   // parses commandline arguments
 
-  char *hostname_;
+  ACE_TCHAR *hostname_;
   // Hostname to connect to
 
   u_short port_;
diff --git a/apps/JAWS/clients/Blobby/blobby.cpp b/apps/JAWS/clients/Blobby/blobby.cpp
index 56da1046ff8..e614b049c20 100644
--- a/apps/JAWS/clients/Blobby/blobby.cpp
+++ b/apps/JAWS/clients/Blobby/blobby.cpp
@@ -39,7 +39,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   // Explain what is going to happen
   if (options->debug_)
     ACE_DEBUG ((LM_DEBUG,
-		"hostname = %s, port = %d, filename = %s, length = %d, offset = %d, operation = %c\n",
+		ACE_TEXT ("hostname = %C, port = %d, filename = %s, ")
+                ACE_TEXT ("length = %d, offset = %d, operation = %c\n"),
 		options->hostname_,
 		options->port_,
 		options->filename_,
@@ -56,16 +57,27 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_Message_Block mb (0, options->length_);
 
       // Open the blob
-      if (blob.open (options->filename_, options->hostname_, options->port_) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open error"), -1);
+      if (blob.open (options->filename_,
+                     options->hostname_,
+                     options->port_) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("open error")),
+                          -1);
 
       // Read from it
       if (blob.read (&mb, options->length_, options->offset_) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "read error"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("read error")),
+                          -1);
 
       // Write to STDOUT
       if (ACE_OS::write (ACE_STDOUT, mb.rd_ptr(), mb.length()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "write error"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("write error")),
+                          -1);
     }
   else
     {
@@ -75,15 +87,24 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Open the file to be sent
       ACE_HANDLE h = ACE_OS::open (options->filename_, O_RDONLY);
       if (h == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "file open error"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("file open error")),
+                          -1);
 
       // Open the blob
       if (blob.open (options->filename_, options->hostname_, options->port_) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "connection open error"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("connection open error")),
+                          -1);
 
       // Read from the file
       if (ACE_OS::read (h, mb.wr_ptr (), total) != total)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "file read error"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("file read error")),
+                          -1);
 
       // Close the file
       ACE_OS::close (h);
@@ -93,7 +114,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // Write to the blob
       if (blob.write (&mb, options->length_, options->offset_) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "network write error"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("network write error")),
+                          -1);
     }
 
   blob.close ();
diff --git a/apps/JAWS/clients/Caching/http_client.cpp b/apps/JAWS/clients/Caching/http_client.cpp
index afbc38a2513..f0bb20b6d56 100644
--- a/apps/JAWS/clients/Caching/http_client.cpp
+++ b/apps/JAWS/clients/Caching/http_client.cpp
@@ -18,13 +18,14 @@
 // ============================================================================
 
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
 #include "http_handler.h"
 
 ACE_RCSID(Caching, http_client, "$Id$")
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   // Present a command line.
   // * Accept a URL.
@@ -57,8 +58,8 @@ main (int, char *[])
 	  while (isspace (*s));
 
           // Shell command.
-          if (ACE_OS::system (s) == -1)
-            ACE_ERROR ((LM_ERROR, " ! Error executing: %s\n", s));
+          if (ACE_OS::system (ACE_TEXT_CHAR_TO_TCHAR (s)) == -1)
+            ACE_ERROR ((LM_ERROR, ACE_TEXT (" ! Error executing: %C\n"), s));
         }
       else if (ACE_OS::strncmp (s, "http://", 7) == 0)
         {
@@ -67,12 +68,12 @@ main (int, char *[])
           connector.connect (s);
         }
       else
-        ACE_ERROR ((LM_ERROR, " ? I don't understand: %s\n", s));
+        ACE_ERROR ((LM_ERROR, ACE_TEXT (" ? I don't understand: %C\n"), s));
 
-      ACE_ERROR ((LM_ERROR, "* "));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("* ")));
     }
 
-  ACE_DEBUG ((LM_DEBUG, "\nBye!\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nBye!\n")));
 
   return 0;
 }
diff --git a/apps/JAWS/clients/Caching/http_handler.cpp b/apps/JAWS/clients/Caching/http_handler.cpp
index 0d879af7173..b205451ec9a 100644
--- a/apps/JAWS/clients/Caching/http_handler.cpp
+++ b/apps/JAWS/clients/Caching/http_handler.cpp
@@ -13,6 +13,7 @@
 //
 // ============================================================================
 
+#include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Filecache.h"
 #include "http_handler.h"
@@ -136,7 +137,7 @@ HTTP_Handler::svc (void)
       && (::sscanf (contentlength, "\nContent-%*[lL]ength: %d ",
                     &this->response_size_) == 1))
     {
-      ACE_Filecache_Handle afh (this->filename_,
+      ACE_Filecache_Handle afh (ACE_TEXT_CHAR_TO_TCHAR (this->filename_),
                                 this->response_size_);
 
       this->peer ().recv_n (afh.address (), this->response_size_);
@@ -188,7 +189,7 @@ HTTP_Connector::connect (const char * url)
   HTTP_Handler *hhptr = &hh;
 
   // First check the cache.
-  if (ACE_Filecache::instance ()->find (hh.filename ()) == 0)
+  if (ACE_Filecache::instance ()->find (ACE_TEXT_CHAR_TO_TCHAR (hh.filename ())) == 0)
     {
       ACE_DEBUG ((LM_DEBUG, "  ``%s'' is already cached.\n",
                   hh.filename ()));
diff --git a/apps/JAWS/server/HTTP_Helpers.cpp b/apps/JAWS/server/HTTP_Helpers.cpp
index 314e88985ac..07ca24bae8f 100644
--- a/apps/JAWS/server/HTTP_Helpers.cpp
+++ b/apps/JAWS/server/HTTP_Helpers.cpp
@@ -56,9 +56,9 @@ HTTP_Helper::HTTP_mktime (const char *httpdate)
   // rfc850-date    = weekday "," SP dd-month-yy SP hh:mm:ss SP "GMT"
   // asctime-date   = wkday SP month dd SP hh:mm:ss SP yyyy
 
-  const char *rfc1123_date = "%3s,;%2d;%3s;%4d;%2d:%2d:%2d;GMT";
-  const char *rfc850_date = "%s,;%2d-%3s-%2d;%2d:%2d:%2d;GMT";
-  const char *asctime_date = "%3s;%3s;%2d;%2d:%2d:%2d;%4d";
+  const char * const rfc1123_date = "%3s,;%2d;%3s;%4d;%2d:%2d:%2d;GMT";
+  const char * const rfc850_date = "%s,;%2d-%3s-%2d;%2d:%2d:%2d;GMT";
+  const char * const asctime_date = "%3s;%3s;%2d;%2d:%2d:%2d;%4d";
 
   // Should also support other versions (such as from NNTP and SMTP)
   // for robustness, but it should be clear how to extend this.
diff --git a/apps/JAWS/server/HTTP_Request.cpp b/apps/JAWS/server/HTTP_Request.cpp
index 970d9a82126..c2d4b7a3134 100644
--- a/apps/JAWS/server/HTTP_Request.cpp
+++ b/apps/JAWS/server/HTTP_Request.cpp
@@ -138,11 +138,11 @@ HTTP_Request::parse_request_line (char *const request_line)
   this->got_request_line_ = 1;
 
   if (this->method (ACE_OS::strtok_r (buf, " \t", &lasts))
-      && this->uri (ACE_OS::strtok_r (NULL, " \t", &lasts)))
+      && this->uri (ACE_OS::strtok_r (0, " \t", &lasts)))
     {
       this->type (this->method ());
 
-      if (this->version (ACE_OS::strtok_r (NULL, " \t", &lasts)) == 0
+      if (this->version (ACE_OS::strtok_r (0, " \t", &lasts)) == 0
           && this->type () != HTTP_Request::GET)
         this->status_ = HTTP_Status_Code::STATUS_NOT_IMPLEMENTED;
 
@@ -170,7 +170,7 @@ HTTP_Request::init (char *const buffer,
   datalen_ = 0;
 
   // Set the datalen
-  if (data_ != NULL)
+  if (data_ != 0)
     datalen_ = buflen;
   else
     datalen_ = 0;
@@ -506,7 +506,7 @@ HTTP_Request::cgi_in_path (char *uri_string, char *&extra_path_info)
           }
         extra_path_info = 0;
 
-        cgi_path_next = ACE_OS::strtok_r (NULL, ":", &lasts);
+        cgi_path_next = ACE_OS::strtok_r (0, ":", &lasts);
       }
     while (cgi_path_next);
 
diff --git a/apps/JAWS/server/HTTP_Response.cpp b/apps/JAWS/server/HTTP_Response.cpp
index e187ba10934..5f5b036989e 100644
--- a/apps/JAWS/server/HTTP_Response.cpp
+++ b/apps/JAWS/server/HTTP_Response.cpp
@@ -203,7 +203,7 @@ HTTP_Response::normal_response (void)
           char *auth
             = HTTP_Helper::HTTP_decode_base64 (ACE_OS::strcpy (buf, hvv));
 
-          if (mmapfile.map ("jaws.auth") != -1
+          if (mmapfile.map (ACE_TEXT ("jaws.auth")) != -1
 	      && auth != 0
               && ACE_OS::strstr((const char *) mmapfile.addr (), auth) != 0)
             this->io_.receive_file (this->request_.path (),
diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp
index 99aa97e71ff..a43575db5e3 100644
--- a/apps/JAWS/server/HTTP_Server.cpp
+++ b/apps/JAWS/server/HTTP_Server.cpp
@@ -34,13 +34,12 @@ public:
 };
 
 void
-HTTP_Server::parse_args (int argc,
-			 char *argv[])
+HTTP_Server::parse_args (int argc, ACE_TCHAR *argv[])
 {
   int c;
   int thr_strategy = 0;
   int io_strategy = 0;
-  const char *prog = argc > 0 ? argv[0] : "HTTP_Server";
+  const ACE_TCHAR *prog = argc > 0 ? argv[0] : ACE_TEXT ("HTTP_Server");
 
   // Set some defaults
   this->port_ = 0;
@@ -48,7 +47,7 @@ HTTP_Server::parse_args (int argc,
   this->backlog_ = 0;
   this->throttle_ = 0;
 
-  ACE_Get_Opt get_opt (argc, argv, "p:n:t:i:b:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:n:t:i:b:"));
 
   while ((c = get_opt ()) != -1)
     switch (c)
@@ -63,36 +62,36 @@ HTTP_Server::parse_args (int argc,
 	// POOL        -> thread pool
 	// PER_REQUEST -> thread per request
 	// THROTTLE    -> thread per request with throttling
-        if (ACE_OS::strcmp (get_opt.opt_arg (), "POOL") == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("POOL")) == 0)
           thr_strategy = JAWS::JAWS_POOL;
-        else if (ACE_OS::strcmp (get_opt.opt_arg (), "PER_REQUEST") == 0)
+        else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("PER_REQUEST")) == 0)
           {
             thr_strategy = JAWS::JAWS_PER_REQUEST;
             this->throttle_ = 0;
           }
-        else if (ACE_OS::strcmp (get_opt.opt_arg (), "THROTTLE") == 0)
+        else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("THROTTLE")) == 0)
           {
             thr_strategy = JAWS::JAWS_PER_REQUEST;
             this->throttle_ = 1;
           }
 	break;
       case 'f':
-        if (ACE_OS::strcmp (get_opt.opt_arg (), "THR_BOUND") == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("THR_BOUND")) == 0)
           {
             // What happened here?
           }
-        else if (ACE_OS::strcmp (get_opt.opt_arg (), "THR_DAEMON") == 0)
+        else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("THR_DAEMON")) == 0)
           {
           }
-        else if (ACE_OS::strcmp (get_opt.opt_arg (), "THR_DETACHED") == 0)
+        else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("THR_DETACHED")) == 0)
           {
           }
       case 'i':
 	// SYNCH  -> synchronous I/O
 	// ASYNCH -> asynchronous I/O
-        if (ACE_OS::strcmp (get_opt.opt_arg (), "SYNCH") == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("SYNCH")) == 0)
           io_strategy = JAWS::JAWS_SYNCH;
-        else if (ACE_OS::strcmp (get_opt.opt_arg (), "ASYNCH") == 0)
+        else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("ASYNCH")) == 0)
           io_strategy = JAWS::JAWS_ASYNCH;
 	break;
       case 'b':
@@ -115,12 +114,13 @@ HTTP_Server::parse_args (int argc,
 
   ACE_UNUSED_ARG (prog);
   ACE_DEBUG ((LM_DEBUG,
-              "in HTTP_Server::init, %s port = %d, number of threads = %d\n",
+              ACE_TEXT ("in HTTP_Server::init, %s port = %d, ")
+              ACE_TEXT ("number of threads = %d\n"),
               prog, this->port_, this->threads_));
 }
 
 int
-HTTP_Server::init (int argc, char *argv[])
+HTTP_Server::init (int argc, ACE_TCHAR *argv[])
   // Document this function
 {
   // Ignore signals generated when a connection is broken unexpectedly.
@@ -161,7 +161,8 @@ HTTP_Server::synch_thread_pool (void)
   // Main thread opens the acceptor
   if (this->acceptor_.open (ACE_INET_Addr (this->port_), 1,
                             PF_INET, this->backlog_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Acceptor::open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("HTTP_Acceptor::open")), -1);
 
   // Create a pool of threads to handle incoming connections.
   Synch_Thread_Pool_Task t (this->acceptor_, this->tm_, this->threads_);
@@ -177,7 +178,8 @@ Synch_Thread_Pool_Task::Synch_Thread_Pool_Task (HTTP_Acceptor &acceptor,
     acceptor_ (acceptor)
 {
   if (this->activate (THR_DETACHED | THR_NEW_LWP, threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "Synch_Thread_Pool_Task::open"));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+                ACE_TEXT ("Synch_Thread_Pool_Task::open")));
 }
 
 int
@@ -192,7 +194,8 @@ Synch_Thread_Pool_Task::svc (void)
 
       // Lock in this accept.  When it returns, we have a connection.
       if (this->acceptor_.accept (stream) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Acceptor::accept"), -1);
+	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"),
+                           ACE_TEXT ("HTTP_Acceptor::accept")), -1);
 
       ACE_Message_Block *mb;
       ACE_NEW_RETURN (mb,
@@ -207,7 +210,7 @@ Synch_Thread_Pool_Task::svc (void)
 
       mb->release ();
       ACE_DEBUG ((LM_DEBUG,
-                  " (%t) in Synch_Thread_Pool_Task::svc, recycling\n"));
+                  ACE_TEXT (" (%t) in Synch_Thread_Pool_Task::svc, recycling\n")));
     }
 
   ACE_NOTREACHED(return 0);
@@ -222,7 +225,8 @@ HTTP_Server::thread_per_request (void)
   // Main thread opens the acceptor
   if (this->acceptor_.open (ACE_INET_Addr (this->port_), 1,
                             PF_INET, this->backlog_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Acceptor::open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("HTTP_Acceptor::open")), -1);
 
   ACE_SOCK_Stream stream;
 
@@ -233,7 +237,8 @@ HTTP_Server::thread_per_request (void)
   for (;;)
     {
       if (this->acceptor_.accept (stream) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Acceptor::accept"), -1);
+	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("HTTP_Acceptor::accept")), -1);
 
       Thread_Per_Request_Task *t;
       // Pass grp_id as a constructor param instead of into open.
@@ -244,8 +249,8 @@ HTTP_Server::thread_per_request (void)
 
 
       if (t->open () != 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n", "Thread_Per_Request_Task::open"),
+	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("Thread_Per_Request_Task::open")),
                           -1);
 
       // Throttling is not allowing too many threads to run away.
@@ -286,7 +291,8 @@ Thread_Per_Request_Task::open (void *)
                              1, 0, -1, this->grp_id_, 0);
 
   if (status == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Thread_Per_Request_Task::open"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("Thread_Per_Request_Task::open")),
                       -1);
   return 0;
 }
@@ -308,7 +314,7 @@ int
 Thread_Per_Request_Task::close (u_long)
 {
   ACE_DEBUG ((LM_DEBUG,
-	      " (%t) Thread_Per_Request_Task::svc, dying\n"));
+	      ACE_TEXT (" (%t) Thread_Per_Request_Task::svc, dying\n")));
   delete this;
   return 0;
 }
@@ -342,8 +348,8 @@ HTTP_Server::asynch_thread_pool (void)
   // asynchronous I/O request to the OS.
   if (acceptor.open (ACE_INET_Addr (this->port_),
 		     HTTP_Handler::MAX_REQUEST_SIZE + 1) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
-                       "ACE_Asynch_Acceptor::open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("ACE_Asynch_Acceptor::open")), -1);
 
   // Create the thread pool.
   // Register threads with the proactor and thread manager.
@@ -367,7 +373,8 @@ Asynch_Thread_Pool_Task::Asynch_Thread_Pool_Task (ACE_Proactor &proactor,
     proactor_ (proactor)
 {
   if (this->activate () == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "Asynch_Thread_Pool_Task::open"));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+                ACE_TEXT ("Asynch_Thread_Pool_Task::open")));
 }
 
 int
@@ -375,7 +382,8 @@ Asynch_Thread_Pool_Task::svc (void)
 {
   for (;;)
     if (this->proactor_.handle_events () == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Proactor::handle_events"),
+      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("ACE_Proactor::handle_events")),
                         -1);
 
   return 0;
@@ -387,7 +395,7 @@ Asynch_Thread_Pool_Task::svc (void)
 ACE_SVC_FACTORY_DEFINE (HTTP_Server)
 
 // Define the object that describes the service.
-ACE_STATIC_SVC_DEFINE (HTTP_Server, "HTTP_Server", ACE_SVC_OBJ_T,
+ACE_STATIC_SVC_DEFINE (HTTP_Server, ACE_TEXT ("HTTP_Server"), ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (HTTP_Server),
                        ACE_Service_Type::DELETE_THIS
                        | ACE_Service_Type::DELETE_OBJ, 0)
diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h
index a81f34d244e..8d39e193642 100644
--- a/apps/JAWS/server/HTTP_Server.h
+++ b/apps/JAWS/server/HTTP_Server.h
@@ -54,7 +54,7 @@ class ACE_Svc_Export HTTP_Server : public ACE_Service_Object
   // = DESCRIPTION
 {
 public:
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialization
 
   virtual int fini (void);
@@ -72,7 +72,7 @@ protected:
 
 private:
   // James, comment these data members.
-  void parse_args (int argc, char **argv);
+  void parse_args (int argc, ACE_TCHAR **argv);
   int port_;
   int threads_;
   int strategy_;
diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp
index 63267987b81..66f34d94cf0 100644
--- a/apps/JAWS/server/IO.cpp
+++ b/apps/JAWS/server/IO.cpp
@@ -4,6 +4,7 @@
 #include "ace/OS_NS_sys_uio.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/Message_Block.h"
+#include "ace/Min_Max.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Filecache.h"
 #include "IO.h"
@@ -128,19 +129,19 @@ JAWS_Synch_IO::transmit_file (const char *filename,
       int iovcnt = 0;
       if (header_size > 0)
         {
-          iov[iovcnt].iov_base = ACE_const_cast(char*, header);
+          iov[iovcnt].iov_base = const_cast<char*> (header);
           iov[iovcnt].iov_len =  header_size;
           iovcnt++;
         }
       if (handle.size () > 0)
         {
-          iov[iovcnt].iov_base =  ACE_reinterpret_cast(char*,handle.address ());
+          iov[iovcnt].iov_base =  reinterpret_cast<char*> (handle.address ());
           iov[iovcnt].iov_len = handle.size ();
           iovcnt++;
         }
       if (trailer_size > 0)
         {
-          iov[iovcnt].iov_base = ACE_const_cast(char*, trailer);
+          iov[iovcnt].iov_base = const_cast<char*> (trailer);
           iov[iovcnt].iov_len = trailer_size;
           iovcnt++;
         }
diff --git a/apps/JAWS/server/JAWS_Pipeline_Handler.cpp b/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
index da5605558a2..e67a99545bb 100644
--- a/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
+++ b/apps/JAWS/server/JAWS_Pipeline_Handler.cpp
@@ -15,8 +15,7 @@ JAWS_Pipeline_Handler<TYPE>::JAWS_Pipeline_Handler (void)
 template <class TYPE> int
 JAWS_Pipeline_Handler<TYPE>::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 {
-  TYPE *data = ACE_dynamic_cast (TYPE *,
-                                 mb->data_block ());
+  TYPE *data = dynamic_cast<TYPE *> (mb->data_block ());
 
   int status = this->handle_input (data, tv);
 
diff --git a/apps/JAWS/server/server.mpc b/apps/JAWS/server/server.mpc
index 4930b8b85aa..1785965f478 100644
--- a/apps/JAWS/server/server.mpc
+++ b/apps/JAWS/server/server.mpc
@@ -5,6 +5,7 @@ project(JAWS) : acelib {
   sharedname = JAWS
   dynamicflags = ACE_BUILD_SVC_DLL
   requires    += ace_filecache
+  avoids += uses_wchar
 
   Source_Files {
     HTTP_Server.cpp
@@ -25,6 +26,7 @@ project(JAWS_server) : aceexe {
   after += JAWS
   libs  += JAWS
   requires += ace_filecache
+  avoids += uses_wchar
 
   Source_Files {
     main.cpp
diff --git a/apps/JAWS2/HTTP_10_Parse.cpp b/apps/JAWS2/HTTP_10_Parse.cpp
index a7a028d7454..67e63ae5b2f 100644
--- a/apps/JAWS2/HTTP_10_Parse.cpp
+++ b/apps/JAWS2/HTTP_10_Parse.cpp
@@ -34,7 +34,7 @@ JAWS_HTTP_10_Parse_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
   JAWS_HTTP_10_Request *info;
 
   if (data->payload ())
-    info = ACE_reinterpret_cast (JAWS_HTTP_10_Request *, data->payload ());
+    info = reinterpret_cast<JAWS_HTTP_10_Request *> (data->payload ());
   else
     {
       info = new JAWS_HTTP_10_Request;
@@ -43,7 +43,7 @@ JAWS_HTTP_10_Parse_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
           ACE_ERROR ((LM_ERROR, "%p\n", "JAWS_HTTP_10_Parse_Task::handle_put"));
           return -1;
         }
-      data->payload (ACE_static_cast (void *, info));
+      data->payload (static_cast<void *> (info));
     }
 
   while (info->receive (*(ACE_Message_Block *)data) == 0)
diff --git a/apps/JAWS2/HTTP_10_Write.cpp b/apps/JAWS2/HTTP_10_Write.cpp
index 16bf3f56d9e..d6c81ac665a 100644
--- a/apps/JAWS2/HTTP_10_Write.cpp
+++ b/apps/JAWS2/HTTP_10_Write.cpp
@@ -33,8 +33,7 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
 
   JAWS_IO *io = policy->io ();
 
-  JAWS_HTTP_10_Request *info = ACE_static_cast (JAWS_HTTP_10_Request *,
-                                                data->payload ());
+  JAWS_HTTP_10_Request *info = static_cast<JAWS_HTTP_10_Request *> (data->payload ());
 
   if (info->status () == (int) JAWS_HTTP_10_Request::STATUS_QUIT)
     {
diff --git a/apps/JAWS2/JAWS/Assoc_Array.cpp b/apps/JAWS2/JAWS/Assoc_Array.cpp
index 16781be98f4..841aa042928 100644
--- a/apps/JAWS2/JAWS/Assoc_Array.cpp
+++ b/apps/JAWS2/JAWS/Assoc_Array.cpp
@@ -21,14 +21,14 @@ JAWS_Assoc_Array<KEY,DATA>::JAWS_Assoc_Array (int maxsize)
 {
   typedef void * ptr_type;
 
-  this->k_array_ = ACE_reinterpret_cast(KEY **, new ptr_type[this->maxsize_]);
+  this->k_array_ = reinterpret_cast<KEY **> (new ptr_type[this->maxsize_]);
   if (this->k_array_ == 0)
     {
       this->maxsize_ = 0;
       return;
     }
 
-  this->d_array_ = ACE_reinterpret_cast(DATA **, new ptr_type[this->maxsize_]);
+  this->d_array_ = reinterpret_cast<DATA **> (new ptr_type[this->maxsize_]);
   if (this->d_array_ == 0)
     {
       delete[] this->k_array_;
@@ -48,8 +48,8 @@ JAWS_Assoc_Array<KEY,DATA>::~JAWS_Assoc_Array (void)
 {
   this->clear ();
 
-  delete[] ACE_reinterpret_cast(void **, this->k_array_);
-  delete[] ACE_reinterpret_cast(void **, this->d_array_);
+  delete[] reinterpret_cast<void **> (this->k_array_);
+  delete[] reinterpret_cast<void **> (this->d_array_);
 
   this->k_array_ = 0;
   this->d_array_ = 0;
diff --git a/apps/JAWS2/JAWS/Concurrency.cpp b/apps/JAWS2/JAWS/Concurrency.cpp
index 26670687799..5ebf54e65c4 100644
--- a/apps/JAWS2/JAWS/Concurrency.cpp
+++ b/apps/JAWS2/JAWS/Concurrency.cpp
@@ -75,7 +75,7 @@ JAWS_Concurrency_Base::svc (void)
       return -1;
     }
 
-  db = ACE_dynamic_cast (JAWS_Data_Block *, mb);
+  db = dynamic_cast<JAWS_Data_Block *> (mb);
 
   this->svc_loop (db);
 
@@ -166,7 +166,7 @@ JAWS_Concurrency_Base::svc_hook (JAWS_Data_Block *ts_db)
           // We need a way to destroy all the handlers created by the
           // Asynch_Acceptor.  Figure this out later.
           handler = waiter->wait_for_completion (waiter_index);
-          if (handler == 0) 
+          if (handler == 0)
             {
               JAWS_TRACE ("JAWS_Concurrency_Base::svc_hook, bad proactor");
               // Proactor failed
diff --git a/apps/JAWS2/JAWS/IO.cpp b/apps/JAWS2/JAWS/IO.cpp
index 1cb294f96fb..b9dddcaa0af 100644
--- a/apps/JAWS2/JAWS/IO.cpp
+++ b/apps/JAWS2/JAWS/IO.cpp
@@ -107,7 +107,7 @@ JAWS_Synch_IO::receive_file (JAWS_IO_Handler *ioh,
                              unsigned int initial_data_length,
                              unsigned int entire_length)
 {
-  ACE_Filecache_Handle handle (filename, 
+  ACE_Filecache_Handle handle (filename,
                                (int) entire_length);
 
   int result = handle.error ();
@@ -240,7 +240,7 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
       int iovcnt = 0;
       if (header_size > 0)
         {
-          iov[iovcnt].iov_base = ACE_const_cast(char*,header);
+          iov[iovcnt].iov_base = const_cast<char*> (header);
           iov[iovcnt].iov_len =  header_size;
           iovcnt++;
         }
@@ -255,7 +255,7 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
         }
       if (trailer_size > 0)
         {
-          iov[iovcnt].iov_base = ACE_const_cast(char*,trailer);
+          iov[iovcnt].iov_base = const_cast<char*> (trailer);
           iov[iovcnt].iov_len = trailer_size;
           iovcnt++;
         }
@@ -344,7 +344,7 @@ JAWS_Asynch_IO::accept (JAWS_IO_Handler *ioh,
   //ACE_HANDLE listen_handle = db->policy ()->acceptor ()->get_handle ();
 
   //JAWS_Asynch_IO_Handler *aioh =
-  //  ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+  //  dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   size_t bytes_to_read = JAWS_Data_Block::JAWS_DATA_BLOCK_SIZE;
 
@@ -362,7 +362,7 @@ JAWS_Asynch_IO::read (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Asynch_Read_Stream ar;
 
@@ -383,7 +383,7 @@ JAWS_Asynch_IO::receive_file (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Message_Block *mb = 0;
   ACE_Filecache_Handle *handle;
@@ -439,7 +439,7 @@ JAWS_Asynch_IO::transmit_file (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer = 0;
 
@@ -493,7 +493,7 @@ JAWS_Asynch_IO::transmit_file (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer = 0;
   JAWS_Cached_FILE *cf = new JAWS_Cached_FILE (filename);
@@ -554,7 +554,7 @@ JAWS_Asynch_IO::send_message (JAWS_IO_Handler *ioh,
   ioh->idle ();
 
   JAWS_Asynch_IO_Handler *aioh =
-    ACE_dynamic_cast (JAWS_Asynch_IO_Handler *, ioh);
+    dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh);
 
   ACE_Message_Block *mb;
   ACE_NEW (mb, ACE_Message_Block (buffer, length));
diff --git a/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
index 8af617d8979..0616e600800 100644
--- a/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
+++ b/apps/JAWS2/JAWS/Pipeline_Tasks.cpp
@@ -23,7 +23,7 @@ JAWS_Pipeline_Handler::~JAWS_Pipeline_Handler (void)
 int
 JAWS_Pipeline_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 {
-  JAWS_Data_Block *db = ACE_dynamic_cast (JAWS_Data_Block *, mb);
+  JAWS_Data_Block *db = dynamic_cast<JAWS_Data_Block *> (mb);
   JAWS_IO_Handler *ioh = db->io_handler ();
 
   // guarantee the handler remains for the duration of this call
@@ -35,7 +35,7 @@ JAWS_Pipeline_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
     {
       JAWS_Pipeline_Handler *task = ioh->task ();
       JAWS_Pipeline_Handler *next
-        = ACE_dynamic_cast (JAWS_Pipeline_Handler *, task->next ());
+        = dynamic_cast<JAWS_Pipeline_Handler *> (task->next ());
 
       ioh->task (next);
     }
@@ -60,11 +60,11 @@ JAWS_Pipeline_Handler::policy (JAWS_Dispatch_Policy *policy)
 int
 JAWS_Pipeline_Accept_Task::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 {
-  JAWS_Data_Block *db = ACE_dynamic_cast (JAWS_Data_Block *, mb);
+  JAWS_Data_Block *db = dynamic_cast<JAWS_Data_Block *> (mb);
 
   JAWS_Pipeline_Handler *task = db->task ();
   JAWS_Pipeline_Handler *next
-    = ACE_dynamic_cast (JAWS_Pipeline_Handler *, task->next ());
+    = dynamic_cast<JAWS_Pipeline_Handler *> (task->next ());
 
   JAWS_IO_Handler *ioh = this->new_handler (db);
   if (ioh == 0)
@@ -178,7 +178,7 @@ JAWS_Pipeline_Done_Task::put (ACE_Message_Block *mb, ACE_Time_Value *)
 {
   JAWS_TRACE ("JAWS_Pipeline_Done_Task::put");
 
-  JAWS_Data_Block *data = ACE_dynamic_cast (JAWS_Data_Block *, mb);
+  JAWS_Data_Block *data = dynamic_cast<JAWS_Data_Block *> (mb);
 
   JAWS_IO_Handler *handler = data->io_handler ();
   JAWS_Dispatch_Policy *policy = this->policy ();
diff --git a/apps/JAWS3/http/HTTP_States.h b/apps/JAWS3/http/HTTP_States.h
index 12d8922d50a..cabfcf8cb62 100644
--- a/apps/JAWS3/http/HTTP_States.h
+++ b/apps/JAWS3/http/HTTP_States.h
@@ -32,7 +32,7 @@ private:                                                         \
                                                                  \
   int service (JAWS_Event_Completer *ec, void *d)                \
   {                                                              \
-    JAWS_HTTP_Data *hd = ACE_static_cast (JAWS_HTTP_Data *, d);  \
+    JAWS_HTTP_Data *hd = static_cast<JAWS_HTTP_Data *> (d);  \
     return this->service (ec, hd);                               \
   }                                                              \
                                                                  \
@@ -41,7 +41,7 @@ private:                                                         \
                                    , void a*                     \
                                    )                             \
   {                                                              \
-    JAWS_HTTP_Data *hd = ACE_static_cast (JAWS_HTTP_Data *, d);  \
+    JAWS_HTTP_Data *hd = static_cast<JAWS_HTTP_Data *> (d);  \
     return this->transition (r, hd, a);                          \
   }                                                              \
                                                                  \
diff --git a/apps/JAWS3/jaws3/Asynch_IO.cpp b/apps/JAWS3/jaws3/Asynch_IO.cpp
index 811c3d88a6f..0113e73da39 100644
--- a/apps/JAWS3/jaws3/Asynch_IO.cpp
+++ b/apps/JAWS3/jaws3/Asynch_IO.cpp
@@ -139,7 +139,7 @@ JAWS_EC_AH_Adapter
                                    );
   // More useful diagnostics not implemented yet.
 
-  void *act = ACE_const_cast (void *, result.act ());
+  void *act = const_cast<void *> (result.act ());
 
   this->completer_->input_complete (io_result, act);
   delete this;
@@ -157,7 +157,7 @@ JAWS_EC_AH_Adapter
                                    );
   // More useful diagnostics not implemented yet.
 
-  void *act = ACE_const_cast (void *, result.act ());
+  void *act = const_cast<void *> (result.act ());
 
   this->completer_->output_complete (io_result, act);
   delete this;
@@ -176,7 +176,7 @@ JAWS_EC_AH_Adapter
   // More useful diagnostics not implemented yet.
   // Watch out for files not opened in overlapped IO mode.
 
-  void *act = ACE_const_cast (void *, result.act ());
+  void *act = const_cast<void *> (result.act ());
 
   this->completer_->output_complete (io_result, act);
   delete this;
diff --git a/apps/JAWS3/jaws3/Asynch_IO.h b/apps/JAWS3/jaws3/Asynch_IO.h
index b62a0e4b285..68fd257cb24 100644
--- a/apps/JAWS3/jaws3/Asynch_IO.h
+++ b/apps/JAWS3/jaws3/Asynch_IO.h
@@ -4,9 +4,10 @@
 #ifndef JAWS_ASYNCH_IO_H
 #define JAWS_ASYNCH_IO_H
 
-#include "ace/OS.h"
 #include "ace/Asynch_IO.h"
+#include "ace/Message_Block.h"
 #include "ace/Singleton.h"
+#include "ace/Time_Value.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/Asynch_IO_Helpers.h b/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
index 473b5cbc842..e82ab8189e5 100644
--- a/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
+++ b/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_ASYNCH_IO_HELPERS_H
 #define JAWS_ASYNCH_IO_HELPERS_H
 
-#include "ace/OS.h"
 #include "ace/Asynch_IO.h"
 #include "ace/Singleton.h"
 
diff --git a/apps/JAWS3/jaws3/Concurrency.cpp b/apps/JAWS3/jaws3/Concurrency.cpp
index 3844950c25d..3d42fde5fae 100644
--- a/apps/JAWS3/jaws3/Concurrency.cpp
+++ b/apps/JAWS3/jaws3/Concurrency.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/OS_NS_strings.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
diff --git a/apps/JAWS3/jaws3/Concurrency_T.h b/apps/JAWS3/jaws3/Concurrency_T.h
index 788129d74cf..704da56faea 100644
--- a/apps/JAWS3/jaws3/Concurrency_T.h
+++ b/apps/JAWS3/jaws3/Concurrency_T.h
@@ -4,8 +4,8 @@
 #ifndef JAWS_CONCURRENCY_T_H
 #define JAWS_CONCURRENCY_T_H
 
-// This gets me the ACE #defines without having to #include "ace/OS.h".
-#include "ace/OS.h"
+// This gets me the ACE template defines without having to #include "ace/OS.h".
+#include "ace/config-lite.h"
 
 class JAWS_Protocol_Handler;
 
diff --git a/apps/JAWS3/jaws3/Event_Dispatcher.h b/apps/JAWS3/jaws3/Event_Dispatcher.h
index 65a82e56e03..d29095b5744 100644
--- a/apps/JAWS3/jaws3/Event_Dispatcher.h
+++ b/apps/JAWS3/jaws3/Event_Dispatcher.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_EVENT_DISPATCHER_H
 #define JAWS_EVENT_DISPATCHER_H
 
-#include "ace/OS.h"
 #include "ace/Reactor.h"
 #include "ace/Select_Reactor.h"
 
diff --git a/apps/JAWS3/jaws3/IO.cpp b/apps/JAWS3/jaws3/IO.cpp
index 6a4090f8481..98e2e6e32f5 100644
--- a/apps/JAWS3/jaws3/IO.cpp
+++ b/apps/JAWS3/jaws3/IO.cpp
@@ -4,6 +4,8 @@
 #define JAWS_BUILD_DLL
 #endif /*JAWS_BUILD_DLL*/
 
+#include "ace/OS_NS_strings.h"
+
 #include "jaws3/IO.h"
 #include "jaws3/Asynch_IO.h"
 #include "jaws3/Synch_IO.h"
diff --git a/apps/JAWS3/jaws3/Options.h b/apps/JAWS3/jaws3/Options.h
index b767cc5438c..ff3720706ad 100644
--- a/apps/JAWS3/jaws3/Options.h
+++ b/apps/JAWS3/jaws3/Options.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_OPTIONS_H
 #define JAWS_OPTIONS_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
 
diff --git a/apps/JAWS3/jaws3/Reactive_IO.h b/apps/JAWS3/jaws3/Reactive_IO.h
index 9bbb8dbffdf..e899357e5fc 100644
--- a/apps/JAWS3/jaws3/Reactive_IO.h
+++ b/apps/JAWS3/jaws3/Reactive_IO.h
@@ -4,9 +4,10 @@
 #ifndef JAWS_REACTIVE_IO_H
 #define JAWS_REACTIVE_IO_H
 
-#include "ace/OS.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Time_Value.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
index 966f99a0e55..9f94fd4caaf 100644
--- a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
+++ b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
@@ -4,9 +4,10 @@
 #ifndef JAWS_REACTIVE_IO_HELPERS_H
 #define JAWS_REACTIVE_IO_HELPERS_H
 
-#include "ace/OS.h"
+#include "ace/Event_Handler.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
+#include "ace/Time_Value.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/Signal_Task.h b/apps/JAWS3/jaws3/Signal_Task.h
index f66c9fb9e56..f1564b812a0 100644
--- a/apps/JAWS3/jaws3/Signal_Task.h
+++ b/apps/JAWS3/jaws3/Signal_Task.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_SIGNAL_TASK_H
 #define JAWS_SIGNAL_TASK_H
 
-#include "ace/OS.h"
 #include "ace/Synch.h"
 #include "ace/Signal.h"
 #include "ace/Singleton.h"
diff --git a/apps/JAWS3/jaws3/Synch_IO.h b/apps/JAWS3/jaws3/Synch_IO.h
index f74d78ce04d..5ecf5267088 100644
--- a/apps/JAWS3/jaws3/Synch_IO.h
+++ b/apps/JAWS3/jaws3/Synch_IO.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_SYNCH_IO_H
 #define JAWS_SYNCH_IO_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/jaws3.mpc b/apps/JAWS3/jaws3/jaws3.mpc
index 5d1be0bfcd0..39670f1c384 100644
--- a/apps/JAWS3/jaws3/jaws3.mpc
+++ b/apps/JAWS3/jaws3/jaws3.mpc
@@ -4,6 +4,7 @@
 project(JAWS3) : acelib {
     sharedname = JAWS3
     dynamicflags = JAWS_BUILD_DLL
+    avoids += uses_wchar
     includes += ..
     Source_Files {
         Asynch_IO.cpp
@@ -68,6 +69,7 @@ project(JAWS3) : acelib {
 }
 
 project(JAWS3_server) : aceexe {
+    avoids += uses_wchar
     includes += ..
     exename = main
     after += JAWS3
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 1d353b3d709..973a19ca6d9 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -1,23 +1,19 @@
-##---------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile for the apps directory
+## $Id$
 ##
-##---------------------------------------------------------------------------
-
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
-##  Process this file with automake to create Makefile.in
-##
-
-if COMPILE_GPERF
-GPERF_DIR = gperf
-else
-GPERF_DIR = 
-endif
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
-SUBDIRS = $(GPERF_DIR)
-## SUBDIRS = Gateway \
-##           JAWS \
-##           gperf
+SUBDIRS = \
+        Gateway \
+        JAWS \
+        JAWS3 \
+        drwho \
+        gperf \
+        mkcsregdb \
+        soreduce
 
-## EXTRA_DIST = README
diff --git a/apps/drwho/CM_Client.cpp b/apps/drwho/CM_Client.cpp
index 3352d8d9a92..970529a59d3 100644
--- a/apps/drwho/CM_Client.cpp
+++ b/apps/drwho/CM_Client.cpp
@@ -58,8 +58,7 @@ CM_Client::receive (int timeout)
                                     this->recv_packet_,
                                     UDP_PACKET_SIZE,
                                     0,
-                                    ACE_reinterpret_cast (sockaddr *,
-                                                          &this->sin_),
+                                    reinterpret_cast<sockaddr *> (&this->sin_),
                                     &sin_len);
           if (n < 0)
             return -1;
@@ -122,7 +121,7 @@ CM_Client::send (void)
                   this->send_packet_,
                   packet_length,
                   0,
-                  ACE_reinterpret_cast (sockaddr *, &this->sin_),
+                  reinterpret_cast<sockaddr *> (&this->sin_),
                   sizeof this->sin_) < 0)
         return -1;
     }
diff --git a/apps/drwho/CM_Server.cpp b/apps/drwho/CM_Server.cpp
index 16a7bcfe07b..96d5385c790 100644
--- a/apps/drwho/CM_Server.cpp
+++ b/apps/drwho/CM_Server.cpp
@@ -28,7 +28,7 @@ CM_Server::open (short port_number)
 
   // This call fails if an rflo daemon is already running.
   if (ACE_OS::bind (this->sokfd_,
-                    ACE_reinterpret_cast (sockaddr *, &this->sin_),
+                    reinterpret_cast<sockaddr *> (&this->sin_),
                     sizeof this->sin_) < 0)
     return -1;
 
@@ -54,7 +54,7 @@ CM_Server::receive (int)
                             this->recv_packet_,
                             UDP_PACKET_SIZE,
                             0,
-                            ACE_reinterpret_cast (sockaddr *, &this->sin_),
+                            reinterpret_cast<sockaddr *> (&this->sin_),
                             (int *) &sin_len);
   if (n == -1)
     return -1;
@@ -88,7 +88,7 @@ CM_Server::send (void)
               this->send_packet_,
               packet_length,
               0,
-              ACE_reinterpret_cast (sockaddr *, &this->sin_),
+              reinterpret_cast<sockaddr *> (&this->sin_),
               sizeof this->sin_) < 0)
     return -1;
 
diff --git a/apps/drwho/drwho.mpc b/apps/drwho/drwho.mpc
index 351376f1697..79631f8168d 100644
--- a/apps/drwho/drwho.mpc
+++ b/apps/drwho/drwho.mpc
@@ -3,6 +3,7 @@
 
 project(*-client) : aceexe {
   requires += rwho
+  avoids += uses_wchar
   Source_Files {
     Protocol_Manager.cpp
     Drwho_Node.cpp
@@ -46,6 +47,7 @@ project(*-client) : aceexe {
 
 project(*-server) : aceexe {
   requires += rwho
+  avoids += uses_wchar
   Source_Files {
     Protocol_Manager.cpp
     Drwho_Node.cpp
diff --git a/apps/drwho/server.cpp b/apps/drwho/server.cpp
index f7115c4fe97..aa4bea1349b 100644
--- a/apps/drwho/server.cpp
+++ b/apps/drwho/server.cpp
@@ -61,7 +61,7 @@ started_by_inetd (void)
   int size = sizeof sin;
 
   return ACE_OS::getsockname (0,
-                              ACE_reinterpret_cast (sockaddr *, &sin),
+                              reinterpret_cast<sockaddr *> (&sin),
                               &size) == 0;
 }
 
diff --git a/apps/gperf/Makefile.am b/apps/gperf/Makefile.am
index 866c41f9c99..9f74ede4861 100644
--- a/apps/gperf/Makefile.am
+++ b/apps/gperf/Makefile.am
@@ -1,22 +1,14 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Top-level Makefile for gperf
+##  Process this file with automake to create Makefile.in
 ##
-##---------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
-SUBDIRS = src ##tests
-
-GPERF_VERSION = 2.0
-
-VERSION = $(GPERF_VERSION)
-
-info_TEXINFOS = gperf.texi
-
-man_MANS = gperf.1
+SUBDIRS = \
+        src \
+        tests
 
-EXTRA_DIST = $(man_MANS) gperf.info
diff --git a/apps/gperf/src/Hash_Table.cpp b/apps/gperf/src/Hash_Table.cpp
index ecd56920d10..43c72552cee 100644
--- a/apps/gperf/src/Hash_Table.cpp
+++ b/apps/gperf/src/Hash_Table.cpp
@@ -67,7 +67,7 @@ Hash_Table::~Hash_Table (void)
                   keysig_width,
                   "keysig"));
 
-      for (int i = ACE_static_cast (int, this->size_ - 1); i >= 0; i--)
+      for (int i = static_cast<int> (this->size_ - 1); i >= 0; i--)
         if (this->table_[i])
           ACE_DEBUG ((LM_DEBUG,
                       "%8d, %*s, %s\n",
diff --git a/apps/gperf/src/Key_List.cpp b/apps/gperf/src/Key_List.cpp
index dceb489f28b..4301e629d25 100644
--- a/apps/gperf/src/Key_List.cpp
+++ b/apps/gperf/src/Key_List.cpp
@@ -252,8 +252,7 @@ Key_List::read_keys (void)
           const char *delimiter = option.delimiter ();
           ACE_NEW_RETURN (this->head,
                           List_Node (buffer,
-                                     ACE_static_cast (int,
-                                       ACE_OS::strcspn (buffer,
+                                     static_cast<int> (ACE_OS::strcspn (buffer,
                                                         delimiter))),
                           -1);
           for (temp = this->head;
@@ -263,8 +262,7 @@ Key_List::read_keys (void)
             {
               ACE_NEW_RETURN (temp->next,
                               List_Node (buffer,
-                                         ACE_static_cast (int,
-                                           ACE_OS::strcspn (buffer,
+                                         static_cast<int> (ACE_OS::strcspn (buffer,
                                                             delimiter))),
                               -1);
               this->total_keys++;
@@ -897,7 +895,7 @@ Key_List::output_binary_search_function (void)
   // Output type declaration now, reference it later on....
   if (option[TYPE] && !option[NOTYPE])
     ACE_OS::printf ("%s;\n",
-	    array_type_);
+            array_type_);
 
   output_min_max ();
 
@@ -907,11 +905,11 @@ Key_List::output_binary_search_function (void)
   // Class definition if -M is *not* enabled.
   if (option[CPLUSPLUS] && !option[SKIPCLASS])
     ACE_OS::printf ("class %s {\npublic:\n"
-	    "  static %s%s%s (const char *str);\n};\n\n",
-	    option.class_name (),
-	    option[CONSTANT] ? "const " : "",
-	    return_type,
-	    option.function_name ());
+            "  static %s%s%s (const char *str);\n};\n\n",
+            option.class_name (),
+            option[CONSTANT] ? "const " : "",
+            return_type,
+            option.function_name ());
 
   // Use the inline keyword to remove function overhead.
   if (option[INLINE])
@@ -922,9 +920,9 @@ Key_List::output_binary_search_function (void)
     ACE_OS::printf ("%s::", option.class_name ());
 
   ACE_OS::printf (option[ANSI]
-	  ? "%s (const char *str)\n{\n"
-	  : "%s (str)\n     char *str;\n{\n",
-	  option.function_name ());
+          ? "%s (const char *str)\n{\n"
+          : "%s (str)\n     char *str;\n{\n",
+          option.function_name ());
 
 // Use the switch in place of lookup table.
 
@@ -935,11 +933,11 @@ Key_List::output_binary_search_function (void)
   else
     {
       if (!option[GLOBAL])
-	{
-	  if (option[LENTABLE])
-	    output_keylength_table ();
-	  output_keyword_table ();
-	}
+        {
+          if (option[LENTABLE])
+            output_keylength_table ();
+          output_keyword_table ();
+        }
     }
 
   // Logic to handle the Binary Search.
@@ -960,14 +958,14 @@ Key_List::output_binary_search_function (void)
   if (additional_code)
     {
       for (;;)
-	{
-	  int c = getchar ();
-
-	  if (c == EOF)
-	    break;
-	  else
-	    putchar (c);
-	}
+        {
+          int c = getchar ();
+
+          if (c == EOF)
+            break;
+          else
+            putchar (c);
+        }
     }
 
   fflush(stdout);
@@ -991,7 +989,7 @@ Key_List::output_linear_search_function (void)
   // Output type declaration now, reference it later on....
   if (option[TYPE] && !option[NOTYPE])
     ACE_OS::printf ("%s;\n",
-	    array_type_);
+            array_type_);
 
   output_min_max ();
 
@@ -1001,26 +999,26 @@ Key_List::output_linear_search_function (void)
   // Class definition if -M is *not* enabled.
   if (option[CPLUSPLUS] && !option[SKIPCLASS])
     ACE_OS::printf ("class %s {\npublic:\n"
-	    "  static %s%s%s (const char *str);\n};\n\n",
-	    option.class_name (),
-	    option[CONSTANT] ? "const " : "",
-	    return_type,
-	    option.function_name ());
+            "  static %s%s%s (const char *str);\n};\n\n",
+            option.class_name (),
+            option[CONSTANT] ? "const " : "",
+            return_type,
+            option.function_name ());
 
   // Use the inline keyword to remove function overhead.
   if (option[INLINE])
     ACE_OS::printf ("inline\n");
 
   ACE_OS::printf ("%s%s\n",
-	  option[CONSTANT] ? "const " : "",
-	  return_type);
+          option[CONSTANT] ? "const " : "",
+          return_type);
   if (option[CPLUSPLUS])
     ACE_OS::printf ("%s::", option.class_name ());
 
   ACE_OS::printf (option[ANSI]
-	  ? "%s (const char *str)\n{\n"
-	  : "%s (str)\n     char *str;\n{\n",
-	  option.function_name ());
+          ? "%s (const char *str)\n{\n"
+          : "%s (str)\n     char *str;\n{\n",
+          option.function_name ());
 
   // Use the switch in place of lookup table.
 
@@ -1030,11 +1028,11 @@ Key_List::output_linear_search_function (void)
   else
     {
       if (!option[GLOBAL])
-	{
-	  if (option[LENTABLE])
-	    output_keylength_table ();
-	  output_keyword_table ();
-	}
+        {
+          if (option[LENTABLE])
+            output_keylength_table ();
+          output_keyword_table ();
+        }
     }
 
   // Logic to handle the Linear Search.
@@ -1049,14 +1047,14 @@ Key_List::output_linear_search_function (void)
   if (additional_code)
     {
       for (;;)
-	{
-	  int c = getchar ();
-
-	  if (c == EOF)
-	    break;
-	  else
-	    putchar (c);
-	}
+        {
+          int c = getchar ();
+
+          if (c == EOF)
+            break;
+          else
+            putchar (c);
+        }
     }
 
   ACE_OS::fflush (stdout);
@@ -1135,8 +1133,8 @@ Key_List::output_hash_function (void)
             ACE_OS::printf ("\n    ");
 
           ACE_OS::printf ("%*d,",
- 			  Key_List::field_width,
- 			  Vectors::occurrences[count] ? Vectors::asso_values[count] : max_hash_value + 1);
+                          Key_List::field_width,
+                          Vectors::occurrences[count] ? Vectors::asso_values[count] : max_hash_value + 1);
         }
 
       ACE_OS::printf ("\n#else");
@@ -1148,8 +1146,8 @@ Key_List::output_hash_function (void)
 
           target = ascii_to_ebcdic[count];
           ACE_OS::printf ("%*d,",
-			  Key_List::field_width,
- 			  Vectors::occurrences[target] ? Vectors::asso_values[target] : max_hash_value + 1);
+                          Key_List::field_width,
+                          Vectors::occurrences[target] ? Vectors::asso_values[target] : max_hash_value + 1);
         }
     }
 #  else
@@ -1171,8 +1169,8 @@ Key_List::output_hash_function (void)
 
           target = ebcdic_to_ascii[count];
           ACE_OS::printf ("%*d,",
- 			  Key_List::field_width,
- 			  Vectors::occurrences[target] ? Vectors::asso_values[target] : max_hash_value + 1);
+                          Key_List::field_width,
+                          Vectors::occurrences[target] ? Vectors::asso_values[target] : max_hash_value + 1);
         }
       ACE_OS::printf ("\n#else");
 
@@ -1182,8 +1180,8 @@ Key_List::output_hash_function (void)
             ACE_OS::printf ("\n    ");
 
           ACE_OS::printf ("%*d,",
- 			  Key_List::field_width,
- 			  Vectors::occurrences[count] ? Vectors::asso_values[count] : max_hash_value + 1);
+                          Key_List::field_width,
+                          Vectors::occurrences[count] ? Vectors::asso_values[count] : max_hash_value + 1);
         }
     }
 #endif /* ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE */
@@ -1661,54 +1659,54 @@ Key_List::output (void)
 
       // Get prototype for strncmp() and strcmp().
       if (!option[SKIPSTRINGH])
-	ACE_OS::printf ("#include <string.h>\n");
+        ACE_OS::printf ("#include <string.h>\n");
 
       // Output type declaration now, reference it later on....
       if (option[TYPE] && !option[NOTYPE])
-	ACE_OS::printf ("%s;\n",
-		array_type_);
+        ACE_OS::printf ("%s;\n",
+                array_type_);
 
       output_min_max ();
 
       if (option[STRCASECMP])
-	output_strcasecmp ();
+        output_strcasecmp ();
 
       // Class definition if -M is *not* enabled.
       if (option[CPLUSPLUS] && !option[SKIPCLASS])
-	ACE_OS::printf ("class %s\n{\nprivate:\n"
-		"  static unsigned int %s (const char *str, unsigned int len);\npublic:\n"
-		"  static %s%s%s (const char *str, unsigned int len);\n};\n\n",
-		option.class_name (),
-		option.hash_name (),
-		option[CONSTANT] ? "const " : "",
-		return_type,
-		option.function_name ());
+        ACE_OS::printf ("class %s\n{\nprivate:\n"
+                "  static unsigned int %s (const char *str, unsigned int len);\npublic:\n"
+                "  static %s%s%s (const char *str, unsigned int len);\n};\n\n",
+                option.class_name (),
+                option.hash_name (),
+                option[CONSTANT] ? "const " : "",
+                return_type,
+                option.function_name ());
 
       output_hash_function ();
 
       if (option[GLOBAL])
-	if (option[SWITCH])
-	  {
-	    if (option[LENTABLE] && option[DUP])
-	      output_keylength_table ();
-	    if (option[POINTER] && option[TYPE])
-	      output_keyword_table ();
-	  }
-	else
-	  {
-	    if (option[LENTABLE])
-	      output_keylength_table ();
-	    output_keyword_table ();
-	    if (output_lookup_array () == -1)
-	      ACE_ERROR_RETURN ((LM_DEBUG,
-				 "%p\n",
-				 "output_lookup_array"),
-				-1);
-	  }
+        if (option[SWITCH])
+          {
+            if (option[LENTABLE] && option[DUP])
+              output_keylength_table ();
+            if (option[POINTER] && option[TYPE])
+              output_keyword_table ();
+          }
+        else
+          {
+            if (option[LENTABLE])
+              output_keylength_table ();
+            output_keyword_table ();
+            if (output_lookup_array () == -1)
+              ACE_ERROR_RETURN ((LM_DEBUG,
+                                 "%p\n",
+                                 "output_lookup_array"),
+                                -1);
+          }
 
       // Use the inline keyword to remove function overhead.
       if (option[INLINE])
-	ACE_OS::printf ("inline\n");
+        ACE_OS::printf ("inline\n");
 
       int pointer_and_type_enabled = option[POINTER] && option[TYPE];
 
@@ -1716,73 +1714,73 @@ Key_List::output (void)
                       option[CONSTANT] || pointer_and_type_enabled == 0 ? "const " : "",
                       return_type);
       if (option[CPLUSPLUS])
-	ACE_OS::printf ("%s::", option.class_name ());
+        ACE_OS::printf ("%s::", option.class_name ());
 
       ACE_OS::printf (option[ANSI]
-	      ? "%s (const char *str, unsigned int len)\n{\n"
-	      : "%s (str, len)\n     char *str;\n     unsigned int len;\n{\n",
-	      option.function_name ());
+              ? "%s (const char *str, unsigned int len)\n{\n"
+              : "%s (str, len)\n     char *str;\n     unsigned int len;\n{\n",
+              option.function_name ());
 
       if (option[ENUM] && !option[GLOBAL])
-	ACE_OS::printf ("  enum\n    {\n"
-		"      TOTAL_KEYWORDS = %d,\n"
-		"      MIN_WORD_LENGTH = %d,\n"
-		"      MAX_WORD_LENGTH = %d,\n"
-		"      MIN_HASH_VALUE = %d,\n"
-		"      MAX_HASH_VALUE = %d,\n"
-		"      HASH_VALUE_RANGE = %d,\n"
-		"      DUPLICATES = %d,\n"
-		"      WORDLIST_SIZE = %d\n    };\n\n",
-		total_keys, min_key_len, max_key_len, min_hash_value,
-		max_hash_value, max_hash_value - min_hash_value + 1,
-		total_duplicates ? total_duplicates + 1 : 0, total_keys + min_hash_value);
+        ACE_OS::printf ("  enum\n    {\n"
+                "      TOTAL_KEYWORDS = %d,\n"
+                "      MIN_WORD_LENGTH = %d,\n"
+                "      MAX_WORD_LENGTH = %d,\n"
+                "      MIN_HASH_VALUE = %d,\n"
+                "      MAX_HASH_VALUE = %d,\n"
+                "      HASH_VALUE_RANGE = %d,\n"
+                "      DUPLICATES = %d,\n"
+                "      WORDLIST_SIZE = %d\n    };\n\n",
+                total_keys, min_key_len, max_key_len, min_hash_value,
+                max_hash_value, max_hash_value - min_hash_value + 1,
+                total_duplicates ? total_duplicates + 1 : 0, total_keys + min_hash_value);
       // Use the switch in place of lookup table.
       if (option[SWITCH])
-	output_switch ();
+        output_switch ();
       // Use the lookup table, in place of switch.
       else
-	{
-	  if (!option[GLOBAL])
-	    {
-	      if (option[LENTABLE])
-		output_keylength_table ();
-	      output_keyword_table ();
-	    }
-	  if (!option[GLOBAL])
-	    {
-	      switch (output_lookup_array ())
-		{
-		case -1:
-		  ACE_ERROR_RETURN ((LM_DEBUG,
-				     "%p\n",
-				     "output_lookup_array"),
-				    -1);
-		  /* NOTREACHED */
-		case 0:
-		  output_lookup_function ();
-		  break;
-		  /* NOTREACHED */
-		default:
-		  break;
-		  /* NOTREACHED */
-		}
-	    }
+        {
+          if (!option[GLOBAL])
+            {
+              if (option[LENTABLE])
+                output_keylength_table ();
+              output_keyword_table ();
+            }
+          if (!option[GLOBAL])
+            {
+              switch (output_lookup_array ())
+                {
+                case -1:
+                  ACE_ERROR_RETURN ((LM_DEBUG,
+                                     "%p\n",
+                                     "output_lookup_array"),
+                                    -1);
+                  /* NOTREACHED */
+                case 0:
+                  output_lookup_function ();
+                  break;
+                  /* NOTREACHED */
+                default:
+                  break;
+                  /* NOTREACHED */
+                }
+            }
           else
             output_lookup_function ();
-	}
+        }
 
       if (additional_code)
-	{
-	  for (;;)
-	    {
-	      int c = getchar ();
-
-	      if (c == EOF)
-		break;
-	      else
-		putchar (c);
-	    }
-	}
+        {
+          for (;;)
+            {
+              int c = getchar ();
+
+              if (c == EOF)
+                break;
+              else
+                putchar (c);
+            }
+        }
       fflush (stdout);
     }
   return 0;
@@ -1813,22 +1811,22 @@ Key_List::string_sort (void)
       List_Node *curr;
       if(ptr->link)
         {
-	  List_Node *last_node = 0;
+          List_Node *last_node = 0;
 
           for(curr = ptr->link; curr; curr = curr->link)
             {
-	      // Chnage the link to next pointer.
+              // Chnage the link to next pointer.
               curr->next = curr->link;
 
-	      // Save the pointer for the last node.
-	      if (curr->link == 0)
-		last_node = curr;
+              // Save the pointer for the last node.
+              if (curr->link == 0)
+                last_node = curr;
             }
 
-	  // Set the pointers, correctly.
-	  last_node->next = ptr->next;
+          // Set the pointers, correctly.
+          last_node->next = ptr->next;
           ptr->next = ptr->link;
-	  ptr = last_node;
+          ptr = last_node;
         }
     }
 
@@ -1867,7 +1865,7 @@ Key_List::dump (void)
 
   u_int keysig_width = option.max_keysig_size () > ACE_OS::strlen ("keysig")
     ? option.max_keysig_size ()
-    : ACE_static_cast (u_int, ACE_OS::strlen ("keysig"));
+    : static_cast<u_int> (ACE_OS::strlen ("keysig"));
 
   size_t key_length = this->max_key_length ();
   size_t keyword_width = key_length > ACE_OS::strlen ("keysig")
diff --git a/apps/gperf/src/List_Node.cpp b/apps/gperf/src/List_Node.cpp
index b5e22bc0bb9..38c12201403 100644
--- a/apps/gperf/src/List_Node.cpp
+++ b/apps/gperf/src/List_Node.cpp
@@ -69,7 +69,7 @@ List_Node::List_Node (char *k, int len)
   : link (0),
     next (0),
     key (k),
-    rest (option[TYPE] ? k + len + 1 : ACE_const_cast(char*, "")),
+    rest (option[TYPE] ? k + len + 1 : const_cast<char*> ("")),
     length (len),
     slot (0)
 {
@@ -90,11 +90,11 @@ List_Node::List_Node (char *k, int len)
         int i = (int) *ptr;
         ++Vectors::occurrences[i];
       }
-  else                          
+  else
     {
       // Only use those character positions specified by the user.
 
-      option.reset (); 
+      option.reset ();
 
       // Iterate thru the list of key_positions, initializing
       // occurrences table and keysig (via char * pointer ptr).
@@ -119,7 +119,7 @@ List_Node::List_Node (char *k, int len)
                     1));
     }
   // Terminate this string.
-  *ptr = '\0'; 
+  *ptr = '\0';
 
   // Sort the KEYSIG items alphabetically.
   sort (keysig, ptr - keysig);
diff --git a/apps/gperf/src/Makefile.am b/apps/gperf/src/Makefile.am
index f989809530d..7e0c6584393 100644
--- a/apps/gperf/src/Makefile.am
+++ b/apps/gperf/src/Makefile.am
@@ -1,36 +1,55 @@
-##---------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile for GPERF release
-##---------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+bin_PROGRAMS =
+## Makefile.gperf.am 
 
-bin_PROGRAMS = gperf
+if !BUILD_USES_WCHAR
+bin_PROGRAMS += gperf
+
+gperf_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
 gperf_SOURCES = \
-         gperf.cpp  \
-         Bool_Array.cpp  \
-         Gen_Perf.cpp  \
-         Hash_Table.cpp  \
-         Iterator.cpp  \
-         Key_List.cpp  \
-         List_Node.cpp  \
-         Options.cpp  \
-         Vectors.cpp  \
-         Version.cpp
-gperf_LDADD = $(top_builddir)/ace/libACE.la
-
-noinst_HEADERS = \
-         Bool_Array.h  \
-         Gen_Perf.h  \
-         Hash_Table.h  \
-         Iterator.h  \
-         Key_List.h  \
-         List_Node.h  \
-         Options.h  \
-         Vectors.h
+  Bool_Array.cpp \
+  Gen_Perf.cpp \
+  Hash_Table.cpp \
+  Iterator.cpp \
+  Key_List.cpp \
+  List_Node.cpp \
+  Options.cpp \
+  Vectors.cpp \
+  Version.cpp \
+  gperf.cpp \
+  Bool_Array.h \
+  Gen_Perf.h \
+  Hash_Table.h \
+  Iterator.h \
+  Key_List.h \
+  List_Node.h \
+  Options.h \
+  Vectors.h
+
+gperf_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/gperf/src/gperf.mpc b/apps/gperf/src/gperf.mpc
index b5a682d98d4..b8dc0ad1d74 100644
--- a/apps/gperf/src/gperf.mpc
+++ b/apps/gperf/src/gperf.mpc
@@ -3,6 +3,7 @@
 
 project(gperf) : aceexe, core, crosscompile {
   install = $(ACE_ROOT)/bin
+  avoids += uses_wchar
   exename = gperf
   Source_Files {
     gperf.cpp
diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am
index c5ee4623956..982ec71244e 100644
--- a/apps/gperf/tests/Makefile.am
+++ b/apps/gperf/tests/Makefile.am
@@ -1,115 +1,344 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-## Copyright (C) 1989, 1992, 1993 Free Software Foundation, Inc.
-## Original makefile written by Douglas C. Schmidt (schmidt@ics.uci.edu)
-## This Makefile.am written by Ossama Othman (othman@astrosun.tn.cornell.edu)
-## 
-## This file is part of GNU GPERF.
-## 
-## GNU GPERF 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 1, or (at your option)
-## any later version.
-## 
-## GNU GPERF 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 GNU GPERF; see the file COPYING.  If not, write to the Free
-## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. 
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile for GPERF tests
-##---------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+CLEANFILES =
+BUILT_SOURCES =
+## Makefile.adainset.am 
+
+if !BUILD_USES_WCHAR
+
+BUILT_SOURCES += \
+  ada.cpp
+
+CLEANFILES += \
+  ada.cpp \
+  ada-stamp
+
+ada.cpp: ada-stamp
+
+ada-stamp: $(srcdir)/ada.gperf
+	../src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf > ada.cpp
+	@touch $@
+
+noinst_PROGRAMS += aout
+
+aout_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+aout_SOURCES = \
+  ada.cpp \
+  test.cpp
+
+aout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+
+## Makefile.cinset.am 
+
+if !BUILD_USES_WCHAR
+
+BUILT_SOURCES += \
+  c.cpp
+
+CLEANFILES += \
+  c.cpp \
+  c-stamp
+
+c.cpp: c-stamp
+
+c-stamp: $(srcdir)/c.gperf
+	../src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf > c.cpp
+	@touch $@
+
+noinst_PROGRAMS += cout
+
+cout_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+cout_SOURCES = \
+  c.cpp \
+  test.cpp
+
+cout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+
+## Makefile.cppinset.am 
+
+if !BUILD_USES_WCHAR
+
+BUILT_SOURCES += \
+  cpp.cpp
+
+CLEANFILES += \
+  cpp.cpp \
+  cpp-stamp
+
+cpp.cpp: cpp-stamp
+
+cpp-stamp: $(srcdir)/cpp.gperf
+	../src/gperf -a -D $(srcdir)/cpp.gperf > cpp.cpp
+	@touch $@
+
+noinst_PROGRAMS += cppout
+
+cppout_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+cppout_SOURCES = \
+  cpp.cpp \
+  test.cpp
+
+cppout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+
+## Makefile.iinset.am 
+
+if !BUILD_USES_WCHAR
+
+BUILT_SOURCES += \
+  idl.cpp
+
+CLEANFILES += \
+  idl.cpp \
+  idl-stamp
+
+idl.cpp: idl-stamp
+
+idl-stamp: $(srcdir)/idl.gperf
+	../src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf > idl.cpp
+	@touch $@
+
+noinst_PROGRAMS += iout
+
+iout_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+iout_SOURCES = \
+  idl.cpp \
+  test.cpp
+
+iout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+
+## Makefile.iinset2.am 
+
+if !BUILD_USES_WCHAR
+
+BUILT_SOURCES += \
+  iout2_gen/idl.cpp
+
+CLEANFILES += \
+  iout2_gen/idl.cpp \
+  iout2_gen/idl-stamp
+
+iout2_gen/idl.cpp: iout2_gen/idl-stamp
+
+iout2_gen/idl-stamp: $(srcdir)/idl.gperf
+	mkdir -p iout2_gen
+	../src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp
+	@touch $@
+
+noinst_PROGRAMS += iout2
+
+iout2_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+iout2_SOURCES = \
+  iout2_gen/idl.cpp \
+  test.cpp
+
+iout2_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+
+## Makefile.m3inset.am 
+
+if !BUILD_USES_WCHAR
+
+BUILT_SOURCES += \
+  modula3.cpp
+
+CLEANFILES += \
+  modula3.cpp \
+  modula3-stamp
+
+modula3.cpp: modula3-stamp
+
+modula3-stamp: $(srcdir)/modula3.gperf
+	../src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf > modula3.cpp
+	@touch $@
+
+noinst_PROGRAMS += m3out
+
+m3out_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+m3out_SOURCES = \
+  modula3.cpp \
+  test.cpp
+
+m3out_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+
+## Makefile.pinset.am 
+
+if !BUILD_USES_WCHAR
+
+BUILT_SOURCES += \
+  pascal.cpp
+
+CLEANFILES += \
+  pascal.cpp \
+  pascal-stamp
+
+pascal.cpp: pascal-stamp
+
+pascal-stamp: $(srcdir)/pascal.gperf
+	../src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf > pascal.cpp
+	@touch $@
+
+noinst_PROGRAMS += pout
+
+pout_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+pout_SOURCES = \
+  pascal.cpp \
+  test.cpp
+
+pout_LDADD = \
+ $(top_builddir)/ace/libACE.la
+
+endif !BUILD_USES_WCHAR
+
+## Makefile.preinset.am 
+
+if !BUILD_USES_WCHAR
+
+BUILT_SOURCES += \
+  adadefs.cpp
+
+CLEANFILES += \
+  adadefs.cpp \
+  adadefs-stamp
+
+adadefs.cpp: adadefs-stamp
+
+adadefs-stamp: $(srcdir)/adadefs.gperf
+	../src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf > adadefs.cpp
+	@touch $@
+
+noinst_PROGRAMS += preout
+
+preout_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+preout_SOURCES = \
+  adadefs.cpp \
+  test.cpp
+
+preout_LDADD = \
+ $(top_builddir)/ace/libACE.la
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+endif !BUILD_USES_WCHAR
 
+## Makefile.taoinset.am 
 
-noinst_PROGRAMS = cout aout cppout preout m3out pout iout iout2 tout
+if !BUILD_USES_WCHAR
 
-cout_SOURCES = cinset.cpp test.cpp
+BUILT_SOURCES += \
+  tao.cpp
 
-aout_SOURCES = adainset.cpp test.cpp
+CLEANFILES += \
+  tao.cpp \
+  tao-stamp
 
-cppout_SOURCES = cppinset.cpp test.cpp
+tao.cpp: tao-stamp
 
-preout_SOURCES = preinset.cpp test.cpp
+tao-stamp: $(srcdir)/tao.gperf
+	../src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf > tao.cpp
+	@touch $@
 
-m3out_SOURCES = m3inset.cpp test.cpp
+noinst_PROGRAMS += taoout
 
-pout_SOURCES = pinset.cpp test.cpp
+taoout_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-iout_SOURCES = iinset.cpp test.cpp
+taoout_SOURCES = \
+  tao.cpp \
+  test.cpp
 
-iout_SOURCES = iinset2.cpp test.cpp
+taoout_LDADD = \
+ $(top_builddir)/ace/libACE.la
 
-tout_SOURCES = tinset.cpp test.cpp
+endif !BUILD_USES_WCHAR
 
-BUILT_SOURCES = \
-        cinset.cpp \
-        adainset.cpp \
-        cppinset.cpp \
-        preinset.cpp \
-        m3inset.cpp \
-        pinset.cpp \
-        iinset.cpp \
-        iinset2.cpp \
-        tinset.cpp
+## Makefile.tinset.am 
 
-EXTRA_DIST = \
-        gpc.gperf \
-        gplus.gperf \
-        irc.gperf \
-        makeinfo.gperf \
-        modula2.gperf \
-        ada-pred.exp \
-        ada-res.exp \
-        cpp-res.exp \
-        c.exp \
-        corba.exp \
-        idl.exp \
-        modula.exp \
-        pascal.exp \
-        test-1.exp \
-        test-2.exp \
-        test-3.exp \
-        test-4.exp \
-        test-5.exp \
-        test-6.exp \
-        test-7.exp
+if !BUILD_USES_WCHAR
 
-cinset.cpp: c.gperf
-        $(GPERF) -a -p -c -l -S1 -o $(srcdir)/c.gperf > cinset.cpp
+BUILT_SOURCES += \
+  corba.cpp
 
-adainset.cpp: ada.gperf
-        $(GPERF) -a -k1,4,'$$' $(srcdir)/ada.gperf > adainset.cpp
+CLEANFILES += \
+  corba.cpp \
+  corba-stamp
 
-cppinset.cpp: cpp.gperf
-        $(GPERF) -a -D $(srcdir)/cpp.gperf > cppinset.cpp
+corba.cpp: corba-stamp
 
-preinset.cpp: adadefs.gperf
-        $(GPERF) -a -p -D -k1,'$$' -s 2 -o $(srcdir)/adadefs.gperf > preinset.cpp
+corba-stamp: $(srcdir)/corba.gperf
+	../src/gperf -a -o $(srcdir)/corba.gperf > corba.cpp
+	@touch $@
 
-m3inset.cpp: modula3.gperf
-        $(GPERF) -a -k1,2,'$$' -o $(srcdir)/modula3.gperf > m3inset.cpp
+noinst_PROGRAMS += tout
 
-pinset.cpp: pascal.gperf
-        $(GPERF) -a -o -S2 -p < $(srcdir)/pascal.gperf > pinset.cpp
+tout_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-iinset.cpp: idl.gperf
-        $(GPERF) -m -M -c -C -D -S1 -E -T -a -o -p < $(srcdir)/idl.gperf > iinset.cpp
+tout_SOURCES = \
+  corba.cpp \
+  test.cpp
 
-iinset2.cpp: idl.gperf
-        $(GPERF) -m -M -c -C -D -E -T -a -o -p < $(srcdir)/idl.gperf > iinset.cpp
+tout_LDADD = \
+ $(top_builddir)/ace/libACE.la
 
-tinset.cpp: corba.gperf
-        $(GPERF) -a -o < $(srcdir)/corba.gperf > tinset.cpp
+endif !BUILD_USES_WCHAR
 
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/apps/gperf/tests/gperf_test.mpb b/apps/gperf/tests/gperf_test.mpb
index c4615b1adc4..857de94aaf5 100644
--- a/apps/gperf/tests/gperf_test.mpb
+++ b/apps/gperf/tests/gperf_test.mpb
@@ -3,6 +3,7 @@
 
 project: aceexe, crosscompile {
   after += gperf
+  avoids += uses_wchar
   Define_Custom(GPERF) {
     command          = $(ACE_ROOT)/bin/gperf
     libpath         += $(ACE_ROOT)/lib
diff --git a/apps/gperf/tests/test.cpp b/apps/gperf/tests/test.cpp
index b73a9214e80..e5fda938430 100644
--- a/apps/gperf/tests/test.cpp
+++ b/apps/gperf/tests/test.cpp
@@ -4,7 +4,7 @@
 
 // The -v option prints diagnostics as to whether a word is in the set
 // or not.  Without -v the program is useful for timing.
-  
+
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
 
@@ -15,19 +15,19 @@ static const int MAX_LEN = 80;
 // Lookup function.
 const char *in_word_set (const char *str, unsigned int len);
 
-int 
-main (int argc, char *argv[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  int verbose = argc > 1 && ACE_OS::strcmp (argv[1], "-v") == 0 ? 1 : 0;
+  int verbose = argc > 1 && ACE_OS::strcmp (argv[1], ACE_TEXT("-v")) == 0 ? 1 : 0;
   char buf[MAX_LEN];
 
-  while (ACE_OS::fgets (buf, sizeof buf, stdin) != 0) 
+  while (ACE_OS::fgets (buf, sizeof buf, stdin) != 0)
     {
       int len = ACE_OS::strlen (buf) - 1;
       buf[len] = '\0';
       if (in_word_set (buf, len) && verbose)
         ACE_OS::printf ("in word set %s\n", buf);
-      else if (verbose) 
+      else if (verbose)
         ACE_OS::printf ("NOT in word set %s\n", buf);
     }
 
diff --git a/apps/gperf/tests/tests.mpc b/apps/gperf/tests/tests.mpc
index cf6f1506133..f5ea29989fe 100644
--- a/apps/gperf/tests/tests.mpc
+++ b/apps/gperf/tests/tests.mpc
@@ -185,12 +185,13 @@ project(iinset2): gperf_test {
   }
 
   GPERF_Files {
+    gendir = iout2_gen
     commandflags += -m -M -c -C -D -E -T -a -o -p
     idl.gperf
   }
 
   Source_Files {
-    idl.cpp
+    iout2_gen/idl.cpp
   }
 }
 
diff --git a/apps/mkcsregdb/mkcsregdb.cpp b/apps/mkcsregdb/mkcsregdb.cpp
index 321bb694b1d..9134375d72c 100644
--- a/apps/mkcsregdb/mkcsregdb.cpp
+++ b/apps/mkcsregdb/mkcsregdb.cpp
@@ -151,8 +151,8 @@ csdb_generator::read_from (const char *srcfile)
       if (entry_.max_bytes_ == 0)
         fail ("entry does not define max_bytes");
       write_entry ();
-      delete [] ACE_const_cast (char *, entry_.desc_);
-      delete [] ACE_const_cast (char *, entry_.loc_name_);
+      delete [] const_cast<char *> (entry_.desc_);
+      delete [] const_cast<char *> (entry_.loc_name_);
       count_++;
       in_entry_ = 0;
       break;
@@ -185,7 +185,7 @@ csdb_generator::read_from (const char *srcfile)
         if (*ptr == ':')
           ptr++;
         ACE_CDR::UShort tmp =
-          ACE_static_cast(ACE_CDR::UShort,strtoul(ptr,&ptr,16));
+          static_cast<ACE_CDR::UShort> (strtoul(ptr,&ptr,16));
         if (*ptr != 0 && *ptr != ':')
           {
             char *emsg = new char [100];
@@ -207,7 +207,7 @@ csdb_generator::read_from (const char *srcfile)
       if (entry_.max_bytes_ != 0)
         fail ("duplicate max_bytes");
       entry_.max_bytes_ =
-        ACE_static_cast (ACE_CDR::UShort, strtol(line_data_,&ptr,10));
+        static_cast<ACE_CDR::UShort> (strtol(line_data_,&ptr,10));
       if (*ptr != 0)
         fail ("invalid max_bytes");
       break;
diff --git a/apps/mkcsregdb/mkcsregdb.mpc b/apps/mkcsregdb/mkcsregdb.mpc
index 529916cb54c..3dea8f982e5 100644
--- a/apps/mkcsregdb/mkcsregdb.mpc
+++ b/apps/mkcsregdb/mkcsregdb.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project: aceexe {
+  avoids += uses_wchar
 }
diff --git a/apps/soreduce/Library.cpp b/apps/soreduce/Library.cpp
index b56579092c4..20660b8f49a 100644
--- a/apps/soreduce/Library.cpp
+++ b/apps/soreduce/Library.cpp
@@ -6,7 +6,7 @@
 // Author: Phil Mesnier
 
 // This file contains the implementation of the classes responsible for
-// generating specialized makefiles for individual libraries, as well as
+// generating specialized mpc files for individual libraries, as well as
 // outputting usage metrics for the various object modules contained in the
 // library.
 
@@ -15,174 +15,146 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_stat.h"
+#include "ace/OS_NS_ctype.h"
 #include "ace/Log_Msg.h"
 
 #include "Library.h"
 
 ACE_RCSID(src, Library, "$Id$")
 
-Makefile_Generator::Makefile_Generator (const ACE_CString& libname)
-  : makefile_(),
+MPC_Generator::MPC_Generator (const ACE_CString& libname)
+  : mpcfile_(),
     libname_(libname),
-    makefilename_()
+    mpcfilename_()
 {
-  makefilename_ = "Makefile." + libname_ + "_subset";
+  mpcfilename_ = libname_ + "_subset.mpc";
 }
 
-Makefile_Generator::~Makefile_Generator ()
+MPC_Generator::~MPC_Generator ()
 {
 }
 
 void
-Makefile_Generator::write_file (const ACE_CString& file)
+MPC_Generator::write_file (const ACE_CString& file)
 {
-  makefile_ << " \\\n\t" << file << flush;
+  mpcfile_ << "    " << file << ".cpp" << endl;
 }
 
 void
-Makefile_Generator::write_prolog (const ACE_CString& path)
+MPC_Generator::write_prolog (const ACE_CString& path)
 {
-  ACE_CString fname (path + "/" + makefilename_);
+  ACE_CString fname (path + "/" + mpcfilename_);
   ACE_DEBUG ((LM_DEBUG, "writing file %s\n",fname.c_str()));
-  makefile_.open(fname.c_str());
-  if (!makefile_)
-    ACE_DEBUG ((LM_DEBUG,"makefile open failed\n"));
-
-  makefile_
-    << "#--------------------------------------------------------------------"
-    << endl;
-  makefile_
-    << "# Generated makefile for producing a subset of the "
-    << libname_ << " library " << endl;
-  makefile_
-    << "#--------------------------------------------------------------------"
-    << endl;
-
-  makefile_ << "\nMAKEFILE = " << makefilename_ << endl;
-  makefile_ << "LIB      = lib" << libname_ << "_subset.a" << endl;
-  makefile_ << "SHLIB    = lib" << libname_ << "_subset.$(SOEXT)" << endl;
-  makefile_ << "\nFILES  =" << flush;
-}
+  mpcfile_.open(fname.c_str());
+  if (!mpcfile_)
+    ACE_DEBUG ((LM_DEBUG,"mpc file open failed\n"));
 
-void
-Makefile_Generator::write_epilog ()
-{
-  makefile_ << "\n" << endl;
-  this->write_libdeps();
-  makefile_
-    << "#--------------------------------------------------------" << endl;
-  makefile_
-    << "#             Include macros and targets" << endl;
-  makefile_
-    << "#--------------------------------------------------------" << endl;
-  makefile_
-    << "include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU" << endl;
-
-  this->write_initial_rules();
-
-  makefile_
-    << "\nLSRC  = $(addsuffix .cpp,$(FILES))\n" << endl;
-
-  makefile_
-    << "include $(ACE_ROOT)/include/makeinclude/macros.GNU" << endl;
-  makefile_
-    << "include $(ACE_ROOT)/include/makeinclude/rules.common.GNU" << endl;
-  makefile_
-    << "include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU" << endl;
-  makefile_
-    << "include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU" << endl;
-  makefile_
-    << "include $(ACE_ROOT)/include/makeinclude/rules.local.GNU" << endl;
-
-  this->write_final_rules();
-
-  makefile_ << "\n" << endl;
-
-  makefile_
-    << "#-----------------------------------------------------------" << endl;
-  makefile_
-    << "#       Dependencies" << endl;
-  makefile_
-    << "#-----------------------------------------------------------" << endl;
-  makefile_
-    << "# DO NOT DELETE THIS LINE -- g++dep uses it." << endl;
-  makefile_
-    << "# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY." << endl;
-  makefile_
-    << "# IF YOU PUT ANYTHING HERE IT WILL GO AWAY" << endl;
-
-  makefile_.close();
+  mpcfile_
+    << "// Generated mpc file for producing a subset of the "
+    << libname_ << " library " << endl << endl
+    << "project(" << libname_ << "_subset)";
+
+  this->write_baseprojects ();
+
+  mpcfile_
+    << " {" << endl
+    << "  sharedname   = " << libname_ << "_subset" << endl
+    << "  pch_header   = " << endl
+    << "  pch_source   = " << endl;
+
+  this->write_projectinfo ();
+
+  mpcfile_ << endl
+           << "  Source_Files {" << endl;
 }
 
 void
-Makefile_Generator::write_libdeps()
+MPC_Generator::write_epilog ()
 {
-  // nothing to do
+  mpcfile_ << "  }" << endl
+           << "}" << endl;
+  mpcfile_.close();
 }
 
 void
-Makefile_Generator::write_initial_rules()
+MPC_Generator::write_baseprojects()
 {
-  // nothing to do
+  mpcfile_ << ": acedefaults, aceversion, core";
 }
 
 void
-Makefile_Generator::write_final_rules()
+MPC_Generator::write_projectinfo()
 {
-  // nothing to do
+  mpcfile_ << "  libout       = $(ACE_ROOT)/lib" << endl
+           << "  dynamicflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL" << endl;
 }
 
 //-----------------------------------------------------------------------------
-Make_ACE_Dep_Lib::Make_ACE_Dep_Lib (const ACE_CString& libname)
-  : Makefile_Generator(libname)
+MPC_ACE_Dep_Lib::MPC_ACE_Dep_Lib (const ACE_CString& libname)
+  : MPC_Generator(libname)
 {}
 
 void
-Make_ACE_Dep_Lib::write_libdeps()
+MPC_ACE_Dep_Lib::write_baseprojects()
 {
-  makefile_ << "ACE_SHLIBS = -lACE_subset" << endl;
+  mpcfile_ << ": acedefaults, aceversion";
 }
 
-//-----------------------------------------------------------------------------
-Make_TAO_Lib::Make_TAO_Lib (const ACE_CString& libname)
-  : Make_ACE_Dep_Lib(libname)
-{}
-
 void
-Make_TAO_Lib::write_libdeps()
+MPC_ACE_Dep_Lib::write_projectinfo()
 {
-  makefile_ << "ifndef TAO_ROOT" << endl;
-  makefile_ << "TAO_ROOT = $(ACE_ROOT)/TAO" << endl;
-  makefile_ << "endif" << endl;
-
-  makefile_ << "ACE_SHLIBS = -lACE_subset" << endl;
+  mpcfile_ << "  libout       = $(ACE_ROOT)/lib" << endl
+           << "  libs        += ACE_subset" << endl
+           << "  after       += ACE_subset" << endl;
 }
 
+//-----------------------------------------------------------------------------
+MPC_TAO_Lib::MPC_TAO_Lib (const ACE_CString& libname)
+  : MPC_ACE_Dep_Lib(libname)
+{}
+
 void
-Make_TAO_Lib::write_initial_rules()
+MPC_TAO_Lib::write_baseprojects()
 {
-    makefile_ << "include $(TAO_ROOT)/rules.tao.GNU" << endl;
+  MPC_ACE_Dep_Lib::write_baseprojects ();
+  mpcfile_ << ", taoversion, core, tao_output, taodefaults";
 }
 
 void
-Make_TAO_Lib::write_final_rules()
+MPC_TAO_Lib::write_projectinfo()
 {
-  makefile_ << "include $(TAO_ROOT)/taoconfig.mk" << endl;
+  MPC_ACE_Dep_Lib::write_projectinfo();
+  mpcfile_ << "  dynamicflags = TAO_BUILD_DLL" << endl;
 }
 
 //-----------------------------------------------------------------------------
-Make_TAO_Dep_Lib::Make_TAO_Dep_Lib (const ACE_CString& libname)
-  : Make_TAO_Lib(libname)
+MPC_TAO_Dep_Lib::MPC_TAO_Dep_Lib (const ACE_CString& libname)
+  : MPC_TAO_Lib(libname)
 {}
 
 void
-Make_TAO_Dep_Lib::write_libdeps()
+MPC_TAO_Dep_Lib::write_baseprojects()
 {
-  makefile_ << "ifndef TAO_ROOT" << endl;
-  makefile_ << "TAO_ROOT = $(ACE_ROOT)/TAO" << endl;
-  makefile_ << "endif" << endl;
+  MPC_TAO_Lib::write_baseprojects ();
+  mpcfile_ << ", taoidldefaults";
+}
 
-  makefile_ << "ACE_SHLIBS = -lTAO_subset -lACE_subset" << endl;
+void
+MPC_TAO_Dep_Lib::write_projectinfo()
+{
+  // Try our best to generate the dynamicflags
+  ACE_CString dflags;
+  for(size_t i = 0; i < this->libname_.length (); ++i) {
+    dflags += static_cast<char>(ACE_OS::ace_toupper (this->libname_[i]));
+  }
+  dflags += "_BUILD_DLL";
+
+  MPC_ACE_Dep_Lib::write_projectinfo();
+  mpcfile_ << "  dynamicflags = " << dflags.c_str () << endl
+           << "  libs        += TAO_subset" << endl
+           << "  after       += TAO_subset" << endl
+           << "  includes    += $(TAO_ROOT)/orbsvcs" << endl
+           << "  idlflags    += -I$(TAO_ROOT)/orbsvcs" << endl;
 }
 
 //-----------------------------------------------------------------------------
@@ -195,21 +167,21 @@ Library::Library (const char *name)
     num_extrefs_(0),
     modules_(0),
     exported_(0),
-    makefile_(0)
+    mpcfile_(0)
 {
   if (name_ == "ACE")
-    makefile_ = new Makefile_Generator(name_);
+    mpcfile_ = new MPC_Generator(name_);
   else if (name_.find ("ACE_") == 0)
-    makefile_ = new Make_ACE_Dep_Lib (name_);
+    mpcfile_ = new MPC_ACE_Dep_Lib (name_);
   else if (name_ == "TAO")
-    makefile_ = new Make_TAO_Lib (name_);
+    mpcfile_ = new MPC_TAO_Lib (name_);
   else
-    makefile_ = new Make_TAO_Dep_Lib (name_);
+    mpcfile_ = new MPC_TAO_Dep_Lib (name_);
 }
 
 Library::~Library ()
 {
-  delete makefile_;
+  delete mpcfile_;
   int i;
   for (i = 0; i < num_modules_; delete modules_[i++]);
   delete [] modules_;
@@ -330,14 +302,15 @@ Library::write_export_list (int show_ref_counts)
 
   if (show_ref_counts) {
     ACE_DEBUG ((LM_DEBUG, "Making directory %s\n",rcpath.c_str()));
-    if (ACE_OS::mkdir(ACE_TEXT_CHAR_TO_TCHAR (rcpath.c_str())) == -1)
+    if (ACE_OS::mkdir(ACE_TEXT_CHAR_TO_TCHAR (rcpath.c_str())) == -1 &&
+        errno != EEXIST)
       ACE_ERROR ((LM_ERROR, "%p\n", "mkdir"));
   }
 
   ACE_DEBUG ((LM_DEBUG,"%s: %d out of %d modules required\n",
               name_.c_str(), num_extrefs_, num_modules_));
 
-  makefile_->write_prolog(path_);
+  mpcfile_->write_prolog(path_);
 
   for (int i = 0; i < num_modules_ ; i++)
     if (modules_[i]->extref()) {
@@ -358,7 +331,7 @@ Library::write_export_list (int show_ref_counts)
              n_sig = modules_[i]->imports().next())
           countfile << n_sig->name() << endl;
       }
-      makefile_->write_file(modules_[i]->name().substring(0,modules_[i]->name().length()-2));
+      mpcfile_->write_file(modules_[i]->name().substring(0,modules_[i]->name().length()-2));
     } else {
       //      const char * modname = modules_[i]->name().c_str();
       exclusions
@@ -366,5 +339,5 @@ Library::write_export_list (int show_ref_counts)
         << endl;
     }
 
-  makefile_->write_epilog();
+  mpcfile_->write_epilog();
 }
diff --git a/apps/soreduce/Library.h b/apps/soreduce/Library.h
index 081dd1864bf..af978c61f74 100644
--- a/apps/soreduce/Library.h
+++ b/apps/soreduce/Library.h
@@ -9,82 +9,81 @@
 
 // Author: Phil Mesnier
 
-// A Library is a collection of Obj_Modules that define a single shared 
-// library. It is used to manipulate the list of unresolved references by 
+// A Library is a collection of Obj_Modules that define a single shared
+// library. It is used to manipulate the list of unresolved references by
 // removing those that are resolved and adding those brought in by new modules
-// that are required to resolve references.  The Library is responsible 
-// for outputting a specialized makefile build the reduce footprint library.
+// that are required to resolve references.  The Library is responsible
+// for outputting a specialized mpc file to build the reduce footprint library.
 
 #include "Obj_Module.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
-// The Makefile generator class serves as the base class used to output the
-// custom makefiles (or in the future, project files) used to build the 
-// subsetted libraries.
+// The MPC generator class serves as the base class used to output the
+// custom mpc files used to build the subsetted libraries.
 // The base class will make libACE_subset.so
 
-class Makefile_Generator
+class MPC_Generator
 {
 public:
-  Makefile_Generator (const ACE_CString&  );
-  virtual ~Makefile_Generator();
+  MPC_Generator (const ACE_CString& libname);
+  virtual ~MPC_Generator();
 
   void write_prolog (const ACE_CString& );
   void write_file (const ACE_CString& );
   void write_epilog ();
 
 protected:
-  virtual void write_libdeps();
-  virtual void write_initial_rules();
-  virtual void write_final_rules();
+  virtual void write_baseprojects();
+  virtual void write_projectinfo();
 
-  ofstream makefile_;
+  ofstream mpcfile_;
   ACE_CString libname_;
-  ACE_CString makefilename_;
+  ACE_CString mpcfilename_;
 };
 
-// Generate makefiles for  libraries dependant on ACE, that are not TAO.
-class Make_ACE_Dep_Lib : public Makefile_Generator
+// Generate mpc files for libraries dependant on ACE, that are not TAO.
+class MPC_ACE_Dep_Lib : public MPC_Generator
 {
 public:
-  Make_ACE_Dep_Lib (const ACE_CString& );
+  MPC_ACE_Dep_Lib (const ACE_CString& libname);
 
 protected:
-  virtual void write_libdeps();
+  virtual void write_baseprojects();
+  virtual void write_projectinfo();
 };
 
-// Generates makefiles for libTAO_subset.so
-class Make_TAO_Lib : public Make_ACE_Dep_Lib
+// Generates mpc files for libTAO_subset.so
+class MPC_TAO_Lib : public MPC_ACE_Dep_Lib
 {
 public:
-  Make_TAO_Lib (const ACE_CString& );
+  MPC_TAO_Lib (const ACE_CString& libname);
 
 protected:
-  virtual void write_libdeps();
-  virtual void write_initial_rules();
-  virtual void write_final_rules();
+  virtual void write_baseprojects();
+  virtual void write_projectinfo();
 };
 
 // Generates makefiles for libs dependant on TAO.  This has a problem when
-// building libraries in the orbsvcs tree. 
-class Make_TAO_Dep_Lib : public Make_TAO_Lib
+// building libraries in the orbsvcs tree.
+class MPC_TAO_Dep_Lib : public MPC_TAO_Lib
 {
 public:
-  Make_TAO_Dep_Lib (const ACE_CString& );
+  MPC_TAO_Dep_Lib (const ACE_CString& );
 
 protected:
-  virtual void write_libdeps();
+  virtual void write_baseprojects();
+  virtual void write_projectinfo();
 };
 
 //----------------------------------------------------------------------------
 
-class Library 
+class Library
 {
 public:
 
-  Library (const char *name = 0 ); 
+  Library (const ACE_TCHAR *name = 0 );
   /// Constructor is responsible for loading all of the modules related to the
   /// library
   ~Library ();
@@ -96,13 +95,13 @@ public:
   // as exported, and its unresolved symbols are added to the undef list.
   void resolve (Sig_List &undefs);
 
-  // Outputs a list of files suitable for inclusion in a makefile to produce
+  // Outputs a list of files suitable for inclusion in an mpc file to produce
   // a subsetted library. If the argument is non-zero, reference countes for
   // each module are also listed.
   void write_export_list ( int );
 
   // set the path to find the .so files
-  void set_path (const char *p );
+  void set_path (const ACE_TCHAR *p );
 
   // Load the actual .so files from the path.
   void load_modules();
@@ -116,14 +115,14 @@ public:
 private:
   ACE_CString name_;
   ACE_CString path_;
-  
+
   int num_modules_;
   int num_exports_;
   int num_extrefs_;
- 
+
   Obj_Module **modules_;
   Sig_List exported_;
-  Makefile_Generator *makefile_;
+  MPC_Generator *mpcfile_;
 };
 
 #endif /* _LIBRARY_H_ */
diff --git a/apps/soreduce/README b/apps/soreduce/README
index 8b4a5570419..5e0264bdab2 100644
--- a/apps/soreduce/README
+++ b/apps/soreduce/README
@@ -38,9 +38,9 @@ the following steps to generate its results.
    process is repeated until the entire list of undefined symbols is
    traversed without change.
 
-4. Makefiles are generated. Rather than invoking the linker directly, a make
+4. MPC files are generated. Rather than invoking the linker directly, an mpc
    file is generated that may be used to build the libs. With these
-   makefiles, the actual library will be named lib(orig)_subset.so.
+   mpc files, the actual library will be named (orig)_subset.
 
 Analysis Artifacts
 ------------------
@@ -77,9 +77,8 @@ pass 4, undef count = 245
 pass 5, undef count = 235
 Writing results
 Making directory /opt/wustl/ACE_wrappers/build/native/ace/usage_metrics
-mkdir: File exists
 ACE: 61 out of 210 modules required
-writing file /opt/wustl/ACE_wrappers/build/native/ace/Makefile.ACE_subset
+writing file /opt/wustl/ACE_wrappers/build/native/ace/ACE_subset.mpc
 Done.
 
 The size of libACE.so before rebuilding:
@@ -101,7 +100,7 @@ Here is another example, using the Naming Service, and its simple test
 client.  Note that the orbsvcs results are bogus, the libraries are
 already fairly well factored so that the additional subsetting by
 soreduce is not effective. Also, due to the layout of the orbsvcs
-library source directory, the tool does not generate valid makefiles.
+library source directory, the tool may not generate valid mpc files.
 
 bash$ $ACE_ROOT/apps/soreduce/soreduce Naming_Service/Naming_Service tests/Simple_Naming/client                    
 discovering libraries
@@ -124,25 +123,22 @@ pass 6, undef count = 242
 Writing results
 Making directory /opt/wustl/ACE_wrappers/build/native/TAO/orbsvcs/orbsvcs/usage_metrics
 TAO_CosNaming: 11 out of 256 modules required
-writing file /opt/wustl/ACE_wrappers/build/native/TAO/orbsvcs/orbsvcs/Makefile.TAO_CosNaming_subset
+writing file /opt/wustl/ACE_wrappers/build/native/TAO/orbsvcs/orbsvcs/TAO_CosNaming_subset.mpc
 Making directory /opt/wustl/ACE_wrappers/build/native/TAO/orbsvcs/orbsvcs/usage_metrics
-mkdir: File exists
 TAO_Svc_Utils: 8 out of 256 modules required
-writing file /opt/wustl/ACE_wrappers/build/native/TAO/orbsvcs/orbsvcs/Makefile.TAO_Svc_Utils_subset
+writing file /opt/wustl/ACE_wrappers/build/native/TAO/orbsvcs/orbsvcs/TAO_Svc_Utils_subset.mpc
 Making directory /opt/wustl/ACE_wrappers/build/native/TAO/tao/IORTable/usage_metrics
 TAO_IORTable: 4 out of 4 modules required
-writing file /opt/wustl/ACE_wrappers/build/native/TAO/tao/IORTable/Makefile.TAO_IORTable_subset
+writing file /opt/wustl/ACE_wrappers/build/native/TAO/tao/IORTable/TAO_IORTable_subset.mpc
 Making directory /opt/wustl/ACE_wrappers/build/native/TAO/tao/PortableServer/usage_metrics
 TAO_PortableServer: 26 out of 29 modules required
-writing file /opt/wustl/ACE_wrappers/build/native/TAO/tao/PortableServer/Makefile.TAO_PortableServer_subset
+writing file /opt/wustl/ACE_wrappers/build/native/TAO/tao/PortableServer/TAO_PortableServer_subset.mpc
 Making directory /opt/wustl/ACE_wrappers/build/native/TAO/tao/usage_metrics
-mkdir: File exists
 TAO: 160 out of 191 modules required
-writing file /opt/wustl/ACE_wrappers/build/native/TAO/tao/Makefile.TAO_subset
+writing file /opt/wustl/ACE_wrappers/build/native/TAO/tao/TAO_subset.mpc
 Making directory /opt/wustl/ACE_wrappers/build/native/ace/usage_metrics
-mkdir: File exists
 ACE: 75 out of 210 modules required
-writing file /opt/wustl/ACE_wrappers/build/native/ace/Makefile.ACE_subset
+writing file /opt/wustl/ACE_wrappers/build/native/ace/ACE_subset.mpc
 Done.
 
 Size before & after:
diff --git a/apps/soreduce/SO_Group.cpp b/apps/soreduce/SO_Group.cpp
index 895a03f0717..f369050a1dd 100644
--- a/apps/soreduce/SO_Group.cpp
+++ b/apps/soreduce/SO_Group.cpp
@@ -19,7 +19,7 @@ SO_Group::SO_Group ()
   : undef_wrapper_ ("nothing"),
     undefs_(undef_wrapper_.imports()),
     libs_ (0),
-    max_libs_ (30),
+    max_libs_ (128),
     num_libs_(0)
 {
   libs_ = new Library*[max_libs_];
diff --git a/apps/soreduce/soreduce.mpc b/apps/soreduce/soreduce.mpc
index 0537c9e4102..18f2e917796 100644
--- a/apps/soreduce/soreduce.mpc
+++ b/apps/soreduce/soreduce.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(soreduce) : aceexe {
+  avoids += uses_wchar
   exename = soreduce
   Source_Files {
     Signature.cpp
diff --git a/bin/.cvsignore b/bin/.cvsignore
deleted file mode 100755
index 9a0a734fc38..00000000000
--- a/bin/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.dll
-*.ilk
diff --git a/bin/DependencyGenerator/DependencyEditor.pm b/bin/DependencyGenerator/DependencyEditor.pm
index 1e884360d9e..8ee36bdd11b 100644
--- a/bin/DependencyGenerator/DependencyEditor.pm
+++ b/bin/DependencyGenerator/DependencyEditor.pm
@@ -15,7 +15,6 @@ use FileHandle;
 use File::Basename;
 
 use DependencyGenerator;
-use ObjectGeneratorFactory;
 
 # ************************************************************
 # Subroutine Section
@@ -60,15 +59,14 @@ sub process {
       }
     }
 
-    print $fh "# DO NOT DELETE THIS LINE -- " . basename($0) . " uses it.\n" .
+    print $fh "# DO NOT DELETE THIS LINE -- ", basename($0), " uses it.\n",
               "# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.\n\n";
 
     my($dep) = new DependencyGenerator($macros, $ipaths, $replace,
                                        $type, $noinline, $exclude);
-    my($objgen) = ObjectGeneratorFactory::create($type);
     ## Sort the files so the dependencies are reproducible
     foreach my $file (sort @$files) {
-      print $fh $dep->process($file, $objgen->process($file)) . "\n";
+      print $fh $dep->process($file), "\n";
     }
 
     print $fh "# IF YOU PUT ANYTHING HERE IT WILL GO AWAY\n";
diff --git a/bin/DependencyGenerator/DependencyGenerator.pm b/bin/DependencyGenerator/DependencyGenerator.pm
index c28cae59c26..5c1264b6f56 100644
--- a/bin/DependencyGenerator/DependencyGenerator.pm
+++ b/bin/DependencyGenerator/DependencyGenerator.pm
@@ -14,6 +14,7 @@ use strict;
 
 use Preprocessor;
 use DependencyWriterFactory;
+use ObjectGeneratorFactory;
 
 # ************************************************************
 # Subroutine Section
@@ -31,6 +32,7 @@ sub new {
                                                         $ipaths, $exclude),
                          'replace'  => $replace,
                          'dwrite'   => DependencyWriterFactory::create($type),
+                         'objgen'   => ObjectGeneratorFactory::create($type),
                          'noinline' => $noinline,
                         }, $class;
 
@@ -52,17 +54,15 @@ sub new {
 sub process {
   my($self)    = shift;
   my($file)    = shift;
-  my($objects) = shift;
   my($replace) = $self->{'replace'};
-  my($cwd)     = $self->{'cwd'};
 
   ## Generate the dependency string
   my($depstr) = $self->{'dwrite'}->process(
-                   $objects,
+                   $self->{'objgen'}->process($file),
                    $self->{'pre'}->process($file, $self->{'noinline'}));
 
   ## Perform the replacements on the dependency string
-  $depstr =~ s/$cwd//go;
+  $depstr =~ s/$self->{'cwd'}//go;
   foreach my $rep (@{$self->{'repkeys'}}) {
     $depstr =~ s/$rep/$$replace{$rep}/g;
   }
diff --git a/bin/DependencyGenerator/GNUObjectGenerator.pm b/bin/DependencyGenerator/GNUObjectGenerator.pm
index 38be72880dc..a1058f05da8 100644
--- a/bin/DependencyGenerator/GNUObjectGenerator.pm
+++ b/bin/DependencyGenerator/GNUObjectGenerator.pm
@@ -11,7 +11,6 @@ package GNUObjectGenerator;
 # ************************************************************
 
 use strict;
-use File::Basename;
 use ObjectGenerator;
 
 use vars qw(@ISA);
@@ -22,7 +21,7 @@ use vars qw(@ISA);
 # ************************************************************
 
 sub process {
-  my($noext)   = basename($_[1]);
+  my($noext)   = $_[1];
   my($objects) = [];
   $noext =~ s/\.[^\.]+$//o;
 
diff --git a/bin/GNUmakefile b/bin/GNUmakefile
deleted file mode 100644
index 2aa81c9f906..00000000000
--- a/bin/GNUmakefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#	GNUmakefile for all the ACE binaries
-#
-# This Makefile can build clone and envinfo, but not both at the same
-# time.  clone must not use any ACE pieces, since it's building a
-# clone of the source tree and it can't have done a build yet.
-# envinfo, on the other hand, requires a built ACE to build
-# correctly.  This Makefile is distributed so as to be able to build
-# clone without changes.  To build envinfo, first build ACE, then come
-# back and do a make envinfo=1
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifdef envinfo
-BIN = envinfo
-
-LSRC   = $(addsuffix .cpp,$(BIN))
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(VBIN)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# To build multiple executables in the same directory on AIX, it works
-# best to wipe out any previously-created tempinc directory.
-# The compiler/linker isn't too smart about instantiating templates...
-ifdef TEMPINCDIR
-COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
-endif
-
-else   # Not building envinfo
-
-include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
-
-CFILES		= clone.cpp
-OFILES		= clone.o
-DFLAGS		= -b elf
-CCFLAGS		+= -I$(ACE_ROOT)
-
-#############################################################################
-# C++ directives
-
-.SUFFIXES: .cpp
-.cpp.o:
-	$(CXX) $(CCFLAGS) -c $<
-#############################################################################
-
-clone: $(OFILES)
-	$(CXX) $(CCFLAGS) -o $@ $(OFILES)
-
-clean:
-	-$(RM) $(OFILES)
-realclean: clean
-	-$(RM) clone
-
-endif  # envinfo
-
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-clone.o: clone.cpp \
-  $(ACE_ROOT)/ace/OS_NS_stdio.h \
-  $(ACE_ROOT)/ace/OS_NS_dirent.h \
-  $(ACE_ROOT)/ace/OS_NS_string.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/bin/MakeProjectCreator/config/ace_qt.mpb b/bin/MakeProjectCreator/config/ace_qt.mpb
index 28276bc89dd..6c199111514 100644
--- a/bin/MakeProjectCreator/config/ace_qt.mpb
+++ b/bin/MakeProjectCreator/config/ace_qt.mpb
@@ -1,6 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-feature(qt): qt {
-  macros += ACE_HAS_QT
+
+project: qt {
+  // Depends on configration from include/makeinclude/platform_*.GNU
+  verbatim(gnuace,local) {
+    CPPFLAGS += $(PLATFORM_QT_CPPFLAGS)
+    LIBS += $(PLATFORM_QT_LIBS)
+    LDFLAGS += $(PLATFORM_QT_LDFLAGS)
+  }
 }
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb
index ff74f4e334e..50da282fa5c 100644
--- a/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: ace_qt, zzip {
+project: zzip {
   staticflags += ACE_AS_STATIC_LIBS
   includes    += $(ACE_ROOT)
   libpaths    += $(ACE_ROOT)/lib
@@ -10,6 +10,7 @@ project: ace_qt, zzip {
   specific(bmake) {
     unicode_flags += -DACE_USES_WCHAR
     macros += ACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\\"$(LIBMODIFIER)\\")
+    debug_macros += ACE_NO_INLINE=1
   }
 
   specific(automake) {
diff --git a/bin/MakeProjectCreator/config/aceexe.mpb b/bin/MakeProjectCreator/config/aceexe.mpb
index 42615038802..f4d01056653 100644
--- a/bin/MakeProjectCreator/config/aceexe.mpb
+++ b/bin/MakeProjectCreator/config/aceexe.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: acedefaults, aceversion {
+project: acedefaults {
   after    += ACE
   libs     += ACE
 }
diff --git a/bin/MakeProjectCreator/config/acelib.mpb b/bin/MakeProjectCreator/config/acelib.mpb
index cfec24468ca..c7b18701fd1 100644
--- a/bin/MakeProjectCreator/config/acelib.mpb
+++ b/bin/MakeProjectCreator/config/acelib.mpb
@@ -1,8 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project: acedefaults, aceversion {
+project: acedefaults, pkgconfig {
   after    += ACE
   libs     += ACE
-  libout    = $(ACE_ROOT)/lib 
+  libout    = $(ACE_ROOT)/lib
+
+  specific(automake) {
+    libout -= $(ACE_ROOT)/lib
+    libout += $(top_builddir)/lib
+  }
 }
diff --git a/bin/MakeProjectCreator/config/aceversion.mpb b/bin/MakeProjectCreator/config/aceversion.mpb
deleted file mode 100644
index 1d0015e628c..00000000000
--- a/bin/MakeProjectCreator/config/aceversion.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  version = 5.4.2
-}
diff --git a/bin/MakeProjectCreator/config/acexml.mpb b/bin/MakeProjectCreator/config/acexml.mpb
index f746f2c5de0..caf428e3353 100644
--- a/bin/MakeProjectCreator/config/acexml.mpb
+++ b/bin/MakeProjectCreator/config/acexml.mpb
@@ -5,4 +5,5 @@ project {
   after    += ACEXML_Parser ACEXML
   libs     += ACEXML_Parser ACEXML
   includes += $(ACE_ROOT)/ACEXML/common
+  requires += acexml
 }
diff --git a/bin/MakeProjectCreator/config/ciao_client.mpb b/bin/MakeProjectCreator/config/ciao_client.mpb
index f7bc80f49be..065a163bf2d 100644
--- a/bin/MakeProjectCreator/config/ciao_client.mpb
+++ b/bin/MakeProjectCreator/config/ciao_client.mpb
@@ -3,8 +3,7 @@
 
 project : orbsvcslib, ifr_client, valuetype, security, taoidldefaults {
   after    += CIAO_Client
-  includes   += $(CIAO_ROOT) $(CIAO_ROOT)/ciao 
-  idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao 
+  includes   += $(CIAO_ROOT) $(CIAO_ROOT)/ciao
+  idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao
   libs     += CIAO_Client
-  includes += $(CIAO_ROOT)
 }
diff --git a/bin/MakeProjectCreator/config/ciao_client_dnc.mpb b/bin/MakeProjectCreator/config/ciao_client_dnc.mpb
index 0c1e97916f6..0e36740bdb8 100644
--- a/bin/MakeProjectCreator/config/ciao_client_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_client_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, ifr_client, valuetype, security, taoidldefaults {
+project : security, ifr_client, valuetype {
   after    += CIAO_DnC_Client
   includes   += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT)/DAnCE/ciao
   idlflags += -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -Sc
diff --git a/bin/MakeProjectCreator/config/ciao_component_dnc.mpb b/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
index f36d73b3af1..b02f4dafe84 100644
--- a/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_component_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_client_dnc, portableserver {
+project : ciao_client_dnc, portableserver, ciao_deployment_stub {
   after    += CIAO_DnC_Container
   libs     += CIAO_DnC_Container
 }
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
index 180daf23682..ae995bc1548 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib_with_idl {
+project : ciao_client_dnc {
   after += Deployment_stub
   libs  += CIAO_Deployment_stub
   includes += $(CIAO_ROOT)/DAnCE
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
index 48293d29fa4..3b41eff3ea4 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : portableserver, ciao_deployment_stub, ciao_client_dnc {
+project : ciao_deployment_stub, portableserver {
   after += Deployment_svnt
   libs  += CIAO_Deployment_svnt 
   includes += $(CIAO_ROOT)/DAnCE/ciao 
diff --git a/bin/MakeProjectCreator/config/ciao_servant.mpb b/bin/MakeProjectCreator/config/ciao_servant.mpb
index 54c71d843f6..4b3efcb3e75 100644
--- a/bin/MakeProjectCreator/config/ciao_servant.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant.mpb
@@ -5,11 +5,18 @@ project : ciao_component {
   after += CIAO_Server
   libs  += CIAO_Server
 
+  // Set the cidl compiler and flags as template values
+  specific {
+    cidlc      = $(CIAO_ROOT)/bin/cidlc
+    cidlc_dep  = $(CIAO_ROOT)/bin/cidlc
+    cidlc_flags = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
+  }
+
   Define_Custom(CIDL) {
     automatic         = 0
-    dependent         = 1
-    command           = $(CIAO_ROOT)/bin/cidlc
-    commandflags      = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
+    dependent         = $(CIDLC_DEP)
+    command           = $(CIDLC)
+    commandflags      = $(CIDLC_FLAGS)
     inputext          = .cidl
     source_outputext  = _svnt.cpp
     generic_outputext = E.idl
diff --git a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
index c4d66b64e3c..fd97c072f9e 100644
--- a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
@@ -5,11 +5,18 @@ project : ciao_component_dnc {
   after += CIAO_DnC_Server
   libs  += CIAO_DnC_Server
 
+  // Set the cidl compiler and flags as template values
+  specific {
+    cidlc      = $(CIAO_ROOT)/bin/cidlc
+    cidlc_dep  = $(CIAO_ROOT)/bin/cidlc
+    cidlc_flags = -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
+  }
+
   Define_Custom(CIDL) {
     automatic         = 0
-    dependent         = 1
-    command           = $(CIAO_ROOT)/bin/cidlc
-    commandflags      = -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
+    dependent         = $(CIDLC_DEP)
+    command           = $(CIDLC)
+    commandflags      = $(CIDLC_FLAGS)
     inputext          = .cidl
     source_outputext  = _svnt.cpp
     generic_outputext = E.idl
diff --git a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
index 7edba9f68fc..910c3a04e13 100644
--- a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_component_dnc, utils {
+project : ciao_component_dnc, ciao_deployment_svnt, utils {
   after += CIAO_DnC_Server
-  libs    += CIAO_DnC_Server CIAO_Deployment_stub CIAO_Deployment_svnt
+  libs    += CIAO_DnC_Server
 }
diff --git a/bin/MakeProjectCreator/config/ciaoversion.mpb b/bin/MakeProjectCreator/config/ciaoversion.mpb
deleted file mode 100644
index 69bf6ddf873..00000000000
--- a/bin/MakeProjectCreator/config/ciaoversion.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  version = 0.4.2
-}
diff --git a/bin/MakeProjectCreator/config/core.mpb b/bin/MakeProjectCreator/config/core.mpb
index d718009002d..f4a53274ad3 100644
--- a/bin/MakeProjectCreator/config/core.mpb
+++ b/bin/MakeProjectCreator/config/core.mpb
@@ -3,6 +3,7 @@
 
 project {
   specific {
-    INSTALL_THIS_TARGET = 1
+    install_headers = 1
+    install_this_target = 1
   }
 }
diff --git a/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb b/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb
index 4249dcc4ef7..6ca347eb674 100644
--- a/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb
+++ b/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, dsnotifylogadmin_skel, dslogadmin_serv {
+project : orbsvcslib, dsnotifylogadmin_skel, dslogadmin_serv, notification_serv {
   after      += DsNotifyLogAdmin_Serv
   libs       += TAO_DsNotifyLogAdmin_Serv
 }
diff --git a/bin/MakeProjectCreator/config/event_serv.mpb b/bin/MakeProjectCreator/config/event_serv.mpb
index d4d5b4e8967..82463ba4756 100644
--- a/bin/MakeProjectCreator/config/event_serv.mpb
+++ b/bin/MakeProjectCreator/config/event_serv.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging, minimum_corba {
+project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging, svc_utils, minimum_corba {
   after     += CosEvent_Serv
   libs      += TAO_CosEvent_Serv
   tagchecks += CosEvent
diff --git a/bin/MakeProjectCreator/config/ftclientorb.mpb b/bin/MakeProjectCreator/config/ftclientorb.mpb
index 2a97a543b59..46cabd37291 100644
--- a/bin/MakeProjectCreator/config/ftclientorb.mpb
+++ b/bin/MakeProjectCreator/config/ftclientorb.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ftorbutils {
+project : ftorbutils, interceptors {
   after     += FT_ClientORB 
   libs      += TAO_FT_ClientORB
   requires  += ace_uuid
diff --git a/bin/MakeProjectCreator/config/ftrteventchannel.mpb b/bin/MakeProjectCreator/config/ftrteventchannel.mpb
index 9f971599c8f..3af417f8f1e 100644
--- a/bin/MakeProjectCreator/config/ftrteventchannel.mpb
+++ b/bin/MakeProjectCreator/config/ftrteventchannel.mpb
@@ -1,9 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : ftrtevent, utils {
+project : ftrtevent, utils, corba_messaging {
   after     += FTRT_EventChannel
   libs      += TAO_FTRT_EventChannel
   includes  += $(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel
-  requires  += corba_messaging
 }
diff --git a/bin/MakeProjectCreator/config/ftserverorb.mpb b/bin/MakeProjectCreator/config/ftserverorb.mpb
index 94b230cb1ed..7c7ba7c11ba 100644
--- a/bin/MakeProjectCreator/config/ftserverorb.mpb
+++ b/bin/MakeProjectCreator/config/ftserverorb.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ftorbutils {
+project : ftorbutils, portablegroup, interceptors {
   after     += FT_ServerORB 
   libs      += TAO_FT_ServerORB 
   tagchecks += FT_ServerORB 
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index d77e608c9ca..e557c0b7055 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -1,3 +1,4 @@
+// $Id$
 // The global features file contains the default feature settings.
 // By default, if a feature isn't listed here then it is enabled.
 // If it is listed, then the value assigned to the feature is interpreted
@@ -10,25 +11,70 @@
 // 2) Create a feature file anywhere you like with the features you want and
 //    use the -feature_file option to specify where it is located.
 //
+// Feature definitions from this file are always overwritten by -features
+// command option of mwc.pl.
+//
 // This file is somewhat akin to the platform_macros.GNU file in that build
 // settings can be set here.
 
+// Enable these by default.
+acexml        = 1
+
 // By default we disable these.
 ssl           = 0
 qos           = 0
 rapi          = 0
-fl_reactor    = 0
 repo          = 0
 minimum_corba = 0
 java          = 0
-qt            = 0
-wxWindows     = 0
 zlib          = 0
 zzip          = 0
 mfc           = 0
 rpc           = 0
 sctp 	      = 0
-xt_reactor    = 0
 dummy_label   = 0
 cidl          = 0
+boost         = 0
 wince         = 0
+uses_wchar    = 0
+
+// Features for various GUI libraries
+// 1 - wxWindows (wxWidgets) libraries are avalaible
+wxWindows     = 0
+// 1 - Motif (Lestif) libraries are avalaible
+motif         = 0
+// 1 - Athena widgets libraries are avalaible
+athena        = 0
+// 1 - X11 libraries are avalaible
+x11           = 0
+// 1 - X Toolkit libraries are avalaible
+xt            = 0
+// 1 - Tk libraries are avalaible
+tk            = 0
+// 1 - Fast Light toolkit libraries are avalaible (assume lowercase h in header files)
+fl            = 0
+// 1 - Qt libraries are avalaible
+qt            = 0
+// 1 - OpenGL libraries are avalaible
+gl            = 0
+
+// Features for ACE support for various GUI libraries
+// Use QtReactor
+ace_qtreactor    = 0
+// Use XtReactor
+ace_xtreactor    = 0
+// Use TkReactor
+ace_tkreactor    = 0
+// Use FlReactor
+ace_flreactor    = 0
+
+// Features for TAO support for various GUI libraries
+// Use QtResources for TAO
+tao_qtresource    = 0
+// Use XtResources for TAO
+tao_xtresource    = 0
+// Use TkResources for TAO
+tao_tkresource    = 0
+// Use FlResources for TAO
+tao_flresource    = 0
+
diff --git a/bin/MakeProjectCreator/config/messaging.mpb b/bin/MakeProjectCreator/config/messaging.mpb
index 0f2aab15a7d..28a962e1b46 100644
--- a/bin/MakeProjectCreator/config/messaging.mpb
+++ b/bin/MakeProjectCreator/config/messaging.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : valuetype, portableserver {
-  after   += Messaging
-  libs    += TAO_Messaging
+project : valuetype, portableserver, corba_messaging {
+  after    += Messaging
+  libs     += TAO_Messaging
 }
diff --git a/bin/MakeProjectCreator/config/notification_serv.mpb b/bin/MakeProjectCreator/config/notification_serv.mpb
index ed23856b8e9..a4c1bb6c002 100644
--- a/bin/MakeProjectCreator/config/notification_serv.mpb
+++ b/bin/MakeProjectCreator/config/notification_serv.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, notification_skel, etcl, dynamicany {
+project : orbsvcslib, svc_utils, notification_skel, etcl, dynamicany {
   after     += CosNotification_Serv
   libs      += TAO_CosNotification_Serv
   tagchecks += Notify
diff --git a/bin/MakeProjectCreator/config/orbsvcslib.mpb b/bin/MakeProjectCreator/config/orbsvcslib.mpb
index 0b63b7f61f1..9a9842671f9 100644
--- a/bin/MakeProjectCreator/config/orbsvcslib.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcslib.mpb
@@ -5,4 +5,8 @@ project : taolib_with_idl, orbsvcs_output {
   tagname     = TAO_ORBSVCS
   includes += $(TAO_ROOT)/orbsvcs
   idlflags += -I$(TAO_ROOT)/orbsvcs
+
+  specific(automake) {
+    includes += $(TAO_BUILDDIR)/orbsvcs
+  }
 }
diff --git a/bin/MakeProjectCreator/config/psdl.mpb b/bin/MakeProjectCreator/config/psdl.mpb
index f6876000d00..fcc0e4edaa2 100644
--- a/bin/MakeProjectCreator/config/psdl.mpb
+++ b/bin/MakeProjectCreator/config/psdl.mpb
@@ -6,7 +6,7 @@ project {
   libs  += TAO_PSDL TAO_PSDL_Datastore
 
   Define_Custom(PSDL) {
-    dependent        = 1
+    dependent        = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao
     command          = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao
     libpath          = $(ACE_ROOT)/lib
     inputext         = .psdl
diff --git a/bin/MakeProjectCreator/config/rmcast.mpb b/bin/MakeProjectCreator/config/rmcast.mpb
index eeb590d9eb8..72cf0e9abc8 100644
--- a/bin/MakeProjectCreator/config/rmcast.mpb
+++ b/bin/MakeProjectCreator/config/rmcast.mpb
@@ -1,8 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : acelib {
-  requires += rmcast
+project : acelib, exceptions {
   after    += RMCast
   libs     += ACE_RMCast
+  includes += $(ACE_ROOT)/protocols
 }
diff --git a/bin/MakeProjectCreator/config/rtscheduling.mpb b/bin/MakeProjectCreator/config/rtscheduling.mpb
index 2ade021b316..9dc026b6087 100644
--- a/bin/MakeProjectCreator/config/rtscheduling.mpb
+++ b/bin/MakeProjectCreator/config/rtscheduling.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : rtcorba {
+project : rtcorba, portableserver {
   after   += RTScheduler 
   libs    += TAO_RTScheduler
 }
diff --git a/bin/MakeProjectCreator/config/server.mpb b/bin/MakeProjectCreator/config/server.mpb
deleted file mode 100644
index ad099e38395..00000000000
--- a/bin/MakeProjectCreator/config/server.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taoexe, portableserver {
-  exename  = server
-}
diff --git a/bin/MakeProjectCreator/config/strategies.mpb b/bin/MakeProjectCreator/config/strategies.mpb
index 769ed324dc5..262bc6200ed 100644
--- a/bin/MakeProjectCreator/config/strategies.mpb
+++ b/bin/MakeProjectCreator/config/strategies.mpb
@@ -1,6 +1,5 @@
 // -*- MPC -*-
 // $Id$
-
 project : taolib {
   after   += Strategies
   libs    += TAO_Strategies
diff --git a/bin/MakeProjectCreator/config/taoexe.mpb b/bin/MakeProjectCreator/config/taoexe.mpb
index f8519f19b41..0fa75b85198 100644
--- a/bin/MakeProjectCreator/config/taoexe.mpb
+++ b/bin/MakeProjectCreator/config/taoexe.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : aceexe, taoversion, taodefaults, taoidldefaults {
+project : aceexe, taodefaults, taoidldefaults {
   after += TAO
   libs  += TAO
 }
diff --git a/bin/MakeProjectCreator/config/taoidldefaults.mpb b/bin/MakeProjectCreator/config/taoidldefaults.mpb
index 0bde5a6f07b..c00a576b4de 100644
--- a/bin/MakeProjectCreator/config/taoidldefaults.mpb
+++ b/bin/MakeProjectCreator/config/taoidldefaults.mpb
@@ -5,13 +5,14 @@ project {
   // Set the idl compiler and flags as template values
   specific {
     tao_idl      = $(ACE_ROOT)/bin/tao_idl
+    tao_idl_dep  = $(ACE_ROOT)/bin/tao_idl
     tao_idlflags = -Ge 1 -Wb,pre_include=ace/pre.h \
                    -Wb,post_include=ace/post.h -I$(TAO_ROOT)
   }
 
   Define_Custom(IDL) {
     automatic            = 1
-    dependent            = 1
+    dependent            = $(TAO_IDL_DEP)
     command              = $(TAO_IDL)
     libpath              = $(ACE_ROOT)/lib
     inputext             = .idl
diff --git a/bin/MakeProjectCreator/config/taolib.mpb b/bin/MakeProjectCreator/config/taolib.mpb
index ae9910d4e14..8898660cd8c 100644
--- a/bin/MakeProjectCreator/config/taolib.mpb
+++ b/bin/MakeProjectCreator/config/taolib.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : acelib, taoversion, tao_output, taodefaults, pidl {
+project : acelib, tao_output, taodefaults, pidl {
   after += TAO
   libs  += TAO
 }
diff --git a/bin/MakeProjectCreator/config/taoversion.mpb b/bin/MakeProjectCreator/config/taoversion.mpb
deleted file mode 100644
index f497f54e089..00000000000
--- a/bin/MakeProjectCreator/config/taoversion.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  version = 1.4.2
-}
diff --git a/bin/MakeProjectCreator/config/tmcast.mpb b/bin/MakeProjectCreator/config/tmcast.mpb
index eca5af80f66..124a243dd1f 100644
--- a/bin/MakeProjectCreator/config/tmcast.mpb
+++ b/bin/MakeProjectCreator/config/tmcast.mpb
@@ -1,8 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project: acelib {
-  after        += TMCast
-  libs         += TMCast
-  requires     += exceptions threads
+project: acelib, exceptions, threads {
+  after    += TMCast
+  libs     += ACE_TMCast
+  includes += $(ACE_ROOT)/protocols
 }
diff --git a/bin/MakeProjectCreator/config/trading_serv.mpc b/bin/MakeProjectCreator/config/trading_serv.mpc
deleted file mode 100644
index 1cb8109e4b8..00000000000
--- a/bin/MakeProjectCreator/config/trading_serv.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, trading_skel, dynamicany, svc_utils {
-  after     += CosTrading_Serv
-  libs      += TAO_CosTrading_Serv
-  tagchecks += Trader
-}
diff --git a/bin/MakeProjectCreator/config/trading_skel.mpc b/bin/MakeProjectCreator/config/trading_skel.mpc
deleted file mode 100644
index ee926a85d59..00000000000
--- a/bin/MakeProjectCreator/config/trading_skel.mpc
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : orbsvcslib, trading, portableserver {
-  after     += CosTrading_Skel 
-  libs      += TAO_CosTrading_Skel
-}
diff --git a/bin/MakeProjectCreator/config/zzip.mpb b/bin/MakeProjectCreator/config/zzip.mpb
deleted file mode 100644
index d4a2fc3e086..00000000000
--- a/bin/MakeProjectCreator/config/zzip.mpb
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(zzip) {
-  includes += $(ZZIP_ROOT)/include
-  macros   += ACEXML_HAS_ZZIPLIB
-  lit_libs += zzlib
-  libpaths += $(ZZIP_ROOT)/lib
-}
diff --git a/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm b/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
index 1d78bd08461..5504edfe54b 100644
--- a/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
+++ b/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
@@ -2,7 +2,7 @@ package AutomakeWorkspaceHelper;
 
 # ************************************************************
 # Description   : An Automake Workspace Helper
-# Author        : J.T. Conklin
+# Author        : Chad Elliott
 # Create Date   : 9/01/2004
 # ************************************************************
 
@@ -19,9 +19,44 @@ use vars qw(@ISA);
 @ISA = qw(WorkspaceHelper);
 
 # ************************************************************
+# Data Section
+# ************************************************************
+
+my(%vals)  = ('ACE_ROOT'     => '$(top_srcdir)',
+              'TAO_ROOT'     => '$(top_srcdir)',
+              'ACE_BUILDDIR' => '$(top_builddir)',
+              'TAO_BUILDDIR' => '$(top_builddir)',
+              'TAO_IDL'      => 'ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl' . "\n" .
+                                'TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf',
+             );
+my(%addon) = ('ACE_ROOT'     => {'TAO_ROOT'     => '/..',
+                                 'TAO_BUILDDIR' => '/..'},
+              'ACE_BUILDDIR' => {'TAO_ROOT'     => '/..',
+                                 'TAO_BUILDDIR' => '/..'},
+             );
+
+# ************************************************************
 # Subroutine Section
 # ************************************************************
 
+sub modify_value {
+  my($self)  = shift;
+  my($name)  = shift;
+  my($value) = shift;
+
+  if ($name eq 'includedir') {
+    ## TAO/orbsvcs and TAO are like separate projects, so first
+    ## remove the TAO/orbsvcs part and if that doesn't work try
+    ## removing the TAO part.  The ACE related values don't need
+    ## any modification.
+    if (!($value =~ s/^\/TAO\/orbsvcs//)) {
+      $value =~ s/^\/TAO//;
+    }
+  }
+
+  return $value;
+}
+
 sub write_settings {
   my($self)   = shift;
   my($wsc)    = shift;
@@ -31,33 +66,18 @@ sub write_settings {
   my($error)  = undef;
   my($crlf)   = $wsc->crlf();
   my($pfh)    = new FileHandle();
-
-  my($seen_ace_root)     = 0;
-  my($seen_tao_root)     = 0;
-  my($seen_ace_builddir) = 0;
-  my($seen_tao_builddir) = 0;
-  my($seen_tao_idl)      = 0;
+  my(%seen)   = ();
+  my($outdir) = $wsc->get_outdir();
 
   foreach my $local (reverse @locals) {
-    if (open($pfh,$local)) {
+    if (open($pfh, "$outdir/$local")) {
       while(<$pfh>) {
-        if (/ACE_ROOT/) {
-           $seen_ace_root = 1;
-        }
-        if (/TAO_ROOT/) {
-           $seen_tao_root = 1;
-        }
-        if (/ACE_BUILDDIR/) {
-           $seen_ace_builddir = 1;
-        }
-        if (/TAO_BUILDDIR/) {
-           $seen_tao_builddir = 1;
-        }
-        if (/TAO_IDL/) {
-           $seen_tao_idl = 1;
+        foreach my $key (keys %vals) {
+          if (/$key/) {
+            $seen{$key} = $vals{$key};
+          }
         }
       }
-
       close($pfh);
     }
     else {
@@ -66,38 +86,20 @@ sub write_settings {
     }
   }
 
-  if ($seen_ace_root || $seen_ace_builddir ||
-      $seen_tao_root || $seen_tao_builddir) {
-
-    if ($seen_ace_root) {
-      if ($seen_tao_root || $seen_tao_builddir) {
-        print $fh "ACE_ROOT = \$(top_srcdir)/..", $crlf;
-      } else {
-        print $fh "ACE_ROOT = \$(top_srcdir)", $crlf;
-      }
-    }
-    if ($seen_ace_builddir) {
-      if ($seen_tao_root || $seen_tao_builddir) {
-        print $fh "ACE_BUILDDIR = \$(top_builddir)/..", $crlf;
-      } else {
-        print $fh "ACE_BUILDDIR = \$(top_builddir)", $crlf;
+  foreach my $key (sort keys %seen) {
+    print $fh "$key = $seen{$key}";
+    if (defined $addon{$key}) {
+      foreach my $add (keys %{$addon{$key}}) {
+        if ($seen{$add}) {
+          print $fh $addon{$key}->{$add};
+          last;
+        }
       }
     }
-    if ($seen_tao_root) {
-      print $fh "TAO_ROOT = \$(top_srcdir)", $crlf;
-    }
-    if ($seen_tao_builddir) {
-      print $fh "TAO_BUILDDIR = \$(top_builddir)", $crlf;
-    }
-
     print $fh $crlf;
   }
 
-  if ($seen_tao_idl) {
-    print $fh "TAO_IDL = ACE_ROOT=\$(ACE_ROOT) TAO_ROOT=\$(TAO_ROOT) \$(TAO_BUILDDIR)/TAO_IDL/tao_idl", $crlf;
-    print $fh "TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I\$(TAO_ROOT) -I\$(srcdir) -g \$(ACE_BUILDDIR)/apps/gperf/src/gperf", $crlf;
-    print $fh $crlf;
-  }
+  print $fh $crlf;
 
   return $status, $error;
 }
diff --git a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
index df10ae17ab1..2c45a070d29 100644
--- a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm
@@ -53,14 +53,14 @@ sub fill_value {
     $value = join(';', sort keys %dirnames);
   }
   elsif ($name eq 'relwd') {
-    my($expenv) = $self->get_expand_env();
-    my($rel)    = ($expenv ? \%ENV : $self->get_relative());
+    my($useenv) = $self->get_use_env();
+    my($rel)    = ($useenv ? \%ENV : $self->get_relative());
     $value = $self->getcwd();
 
     foreach my $key (keys %$rel) {
       ## Do not use PWD or CD if we are expanding environment variables.
       ## They could conflict with the "real" values we're looking for.
-      if ($expenv && ($key eq 'PWD' || $key eq 'CD')) {
+      if ($useenv && ($key eq 'PWD' || $key eq 'CD')) {
         next;
       }
 
diff --git a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
index 851239663ea..d2bd64961d4 100644
--- a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm
@@ -20,6 +20,13 @@ use vars qw(@ISA);
 @ISA = qw(WorkspaceCreator);
 
 # ************************************************************
+# Data Section
+# ************************************************************
+
+my($max_line_length) = 32767; ## Borland Make's maximum line length
+my(@targets) = ('clean', 'realclean', 'install');
+
+# ************************************************************
 # Subroutine Section
 # ************************************************************
 
@@ -81,7 +88,7 @@ sub write_project_targets {
     }
 
     print $fh ($chdir ? "\t\@cd $dir$crlf" : '') .
-              "\t\$(MAKE) -\$(MAKEFLAGS) \$(MAKE_FLAGS) -f " . basename($project) . " $target$crlf" .
+              "\t\$(MAKE) \$(MAKE_FLAGS) -f " . basename($project) . " $target$crlf" .
               ($chdir ? "\t\@cd $back$crlf" : '');
   }
 }
@@ -95,18 +102,24 @@ sub write_comps {
   my(%targnum)  = ();
   my(@list)     = $self->number_target_deps($projects, $pjs, \%targnum);
   my($crlf)     = $self->crlf();
+  my(@ltargets) = @targets;
 
   print $fh "!include <\$(ACE_ROOT)\\include\\makeinclude\\make_flags.bor>$crlf";
 
-  ## Print out the "all" target
-  print $fh $crlf . 'all:';
+  ## Construct the "all" target
+  my($all) = $crlf . 'all:';
   foreach my $project (@list) {
-    print $fh " $$pjs{$project}->[0]";
+    $all .= " $$pjs{$project}->[0]";
+  }
+  if (length($all) < $max_line_length) {
+    print $fh $all, $crlf;
+  }
+  else {
+    unshift(@ltargets, 'all');
   }
-  print $fh $crlf;
 
   ## Print out all other targets here
-  foreach my $target ('clean', 'realclean', 'install') {
+  foreach my $target (@ltargets) {
     print $fh $crlf .
               "$target\:$crlf";
     $self->write_project_targets($fh, $target, \@list);
diff --git a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
index 74155e380ac..586dc8aa9a7 100644
--- a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
+++ b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
@@ -20,6 +20,12 @@ use vars qw(@ISA);
 @ISA = qw(WorkspaceCreator);
 
 # ************************************************************
+# Data Section
+# ************************************************************
+
+my($base) = 'GNUmakefile';
+
+# ************************************************************
 # Subroutine Section
 # ************************************************************
 
@@ -31,7 +37,7 @@ sub generate_implicit_project_dependencies {
 
 sub workspace_file_name {
   my($self) = shift;
-  return $self->get_modified_workspace_name('GNUmakefile', '');
+  return $self->get_modified_workspace_name($base, '');
 }
 
 
@@ -59,7 +65,8 @@ sub pre_workspace {
             "# $0 @ARGV", $crlf,
             '#', $crlf,
             '#-------------------------------------------------------------------------', $crlf,
-            'MAKEFILE = ', $self->get_current_output_name(), $crlf;
+            'MAKEFILE = ', $self->get_modified_workspace_name($base, '', 1),
+            $crlf;
 }
 
 
@@ -162,10 +169,13 @@ sub write_comps {
       }
     }
     print $fh $crlf,
-              "REMAINING_TARGETS := \$(subst all, , \$(TARGETS_NESTED:.nested=))$crlf",
+              'REMAINING_TARGETS := ',
+              '$(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)',
+              $crlf;
   }
   else {
-    print $fh "REMAINING_TARGETS := \$(TARGETS_NESTED:.nested=)$crlf",
+    print $fh 'REMAINING_TARGETS := $(TARGETS_NESTED:.nested=) ',
+              '$(CUSTOM_TARGETS)', $crlf;
   }
 
   ## Print out the remaing targets.
diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd
index 4e1c101e100..9c35b04a770 100644
--- a/bin/MakeProjectCreator/templates/bor.mpd
+++ b/bin/MakeProjectCreator/templates/bor.mpd
@@ -23,8 +23,8 @@ OBJFILES = \
 
 LFLAGS = \
 <%foreach(libpaths)%>
-	-L"<%libpath%>\$(CONFIG_SUBDIR)" \
-	-j"<%libpath%>\$(CONFIG_SUBDIR)" <%fornotlast(" \\")%>
+        -L"<%libpath%>" \
+        -j"<%libpath%>" <%fornotlast(" \\")%>
 <%endfor%>
 <%endif%>
 <%if(libs || lit_libs || pure_libs)%>
@@ -88,10 +88,11 @@ CFLAGS = \
 # For example, any place that uses ACE_LIB_TEXT().
 #PCH_HEADER=<%pch_header%>
 <%endif%>
+<%if(cppdir)%>
 
 CPPDIR = <%cppdir%>
 CDIR   = <%cppdir%>
-
+<%endif%>
 <%if(header_files || template_files || inline_files || idl_files)%>
 
 INCDIR_NAME = <%relwd%>
@@ -111,12 +112,21 @@ PATH := $(PATH);<%custom_type->libpath%>
 
 <%custom_type%>_<%forcount(custom_type->input_files)%>=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%>
 $(<%custom_type%>_<%forcount(custom_type->input_files)%>): <%custom_type->input_file%>
-	<%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%> <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
+<%if(flag_overrides(custom_type->input_file, gendir))%>
+	-mkdir <%flag_overrides(custom_type->input_file, gendir)%> 2> nul
+<%endif%>
+	<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%> <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
+<%if(flag_overrides(custom_type->input_file, postcommand))%>
+<%foreach(custom_type->input_file->output_files)%>
+	<%flag_overrides(custom_type->input_file, postcommand)%>
+<%endfor%>
+<%else%>
 <%if(custom_type->postcommand)%>
 <%foreach(custom_type->input_file->output_files)%>
-	<%custom_type->postcommand()%>
+	<%custom_type->postcommand%>
 <%endfor%>
 <%endif%>
+<%endif%>
 <%if(pch_header)%>
 <%if(custom_type->pch_postrule)%>
 <%foreach(custom_type->input_file->source_output_files)%>
@@ -148,12 +158,6 @@ INSTALL_THIS_TARGET = 1
 
 <%endif%>
 <%marker(macros)%>
-STATIC_DIR=.
-DEBUG_DIR=.
-PASCAL_DIR=.
-UNICODE_DIR=.
-
-INSTALL_DLLDIR=$(INSTALL_DIR)\lib
 INCLUDES_INSTALL=1
 <%if(exename)%>
 
@@ -167,15 +171,14 @@ BASE_BINDIR = .
 
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
 <%else%>
-<%if(dllout)%>
-BINDIR = <%dllout%>
-<%else%>
-<%if(libout)%>
-BINDIR = <%libout%>
-<%endif%>
-<%endif%>
+<%if(sharedname || staticname)%>
+BINDIR = <%if(dllout)%><%dllout%><%else%><%libout%><%endif%>
 
 !include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
+<%else%>
+all:
+	@-rem
+<%endif%>
 <%endif%>
 <%if(header_files || template_files || inline_files || idl_files || pidl_files)%>
 
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index d127c32620b..c9549d03fe4 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -14,12 +14,12 @@
 MAKEFILE         = <%project_file%>
 DEPENDENCY_FILE  = .depend.<%project_name%>
 <%if(exename)%>
-BIN_UNCHECKED    = <%exename%>
+BIN_UNCHECKED    = <%if(targetoutdir)%><%targetoutdir%><%endif%><%exename%>
 <%endif%>
 <%if(staticname)%>
 
 ## LIB may be set to empty later on in this file
-LIB_UNCHECKED    = lib<%staticname%>.a
+LIB_UNCHECKED    = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%staticname%>.a
 LIB              = $(LIB_UNCHECKED)
 <%if(!sharedname)%>
 static_libs_only = 1
@@ -28,17 +28,15 @@ static_libs_only = 1
 <%if(sharedname)%>
 
 ## SHLIB may be set to empty later on in this file
-SHLIB_UNCHECKED  = lib<%sharedname%>.$(SOEXT)
+SHLIB_UNCHECKED  = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%sharedname%>.$(SOEXT)
 SHLIB            = $(SHLIB_UNCHECKED)
 <%endif%>
-<%if(tao)%>
+<%if(tao || ciao)%>
 
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-ifndef CIAO_ROOT
-  CIAO_ROOT = $(TAO_ROOT)/CIAO
-endif
+TAO_ROOT  ?= $(ACE_ROOT)/TAO
+<%if(ciao)%>
+CIAO_ROOT ?= $(TAO_ROOT)/CIAO
+<%endif%>
 <%endif%>
 
 <%if(grouped_source_files)%>
@@ -74,19 +72,68 @@ RESOURCES += \
 #----------------------------------------------------------------------------
 <%marker(macros)%>
 <%if(exename)%>
-LDLIBS =<%foreach(libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%>
+LDLIBS =<%foreach(libs lit_libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%>
 <%else%>
 <%if(sharedname)%>
-ACE_SHLIBS =<%foreach(libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%>
+ACE_SHLIBS =<%foreach(libs lit_libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%>
 <%endif%>
 <%endif%>
 <%if(tao_idl)%>
 TAO_IDL = <%tao_idl%>
 <%endif%>
+<%if(tao_idl_dep)%>
+TAO_IDL_DEP = <%tao_idl_dep%>$(EXEEXT)
+<%endif%>
 <%if(tao_idlflags)%>
 TAO_IDLFLAGS = <%tao_idlflags%>
 <%endif%>
+<%if(cidlc)%>
+CIDLC = <%cidlc%>
+<%endif%>
+<%if(cidlc_dep)%>
+CIDLC_DEP = <%cidlc_dep%>$(EXEEXT)
+<%endif%>
+<%if(cidlc_flags)%>
+CIDLC_FLAGS = <%cidlc_flags%>
+<%endif%>
 
+<%if(exename)%>
+<%if(install)%>
+INSBIN ?= <%install%>
+<%endif%>
+ifeq ($(INSBIN),.)
+  ifeq ($(PWD),)
+    PWD=$(shell pwd)
+  endif
+  INSBIN = $(PWD)
+endif
+<%if(targetoutdir)%>
+ifneq ($(INSBIN),)
+OUTPUT_DIRECTORY = $(INSBIN)/<%targetoutdir%>
+else
+<%endif%>
+OUTPUT_DIRECTORY = $(INSBIN)
+<%if(targetoutdir)%>
+endif
+<%endif%>
+<%else%>
+<%if(dllout || libout)%>
+INSLIB ?= <%if(dllout)%><%dllout%><%else%><%libout%><%endif%>
+<%endif%>
+ifeq ($(INSLIB),.)
+  ifeq ($(PWD),)
+    PWD=$(shell pwd)
+  endif
+  INSLIB = $(PWD)
+endif
+OUTPUT_DIRECTORY = $(INSLIB)<%if(targetoutdir)%>/<%targetoutdir%><%endif%>
+<%endif%>
+
+<%if(targetoutdir)%>
+VDIR   = <%targetoutdir%>.obj/
+VSHDIR = <%targetoutdir%>.shobj/
+
+<%endif%>
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 ## We don't need the ACELIB setting from wrapper_macros.GNU
 ACELIB =
@@ -94,34 +141,29 @@ ACELIB =
 tao_dont_use_idl_make_rule = 1
 include $(TAO_ROOT)/rules.tao.GNU
 <%endif%>
+<%if(ciao)%>
+include $(CIAO_ROOT)/rules.ciao.GNU
+<%endif%>
+<%if(version)%>
+
+ifeq ($(versioned_so),1)
+SOVERSION = .<%version%>
+endif
+<%endif%>
 
 # To build multiple targets in the same directory on AIX, it works
 # best to have a template directory per project.
 # The compiler/linker isn't too smart about instantiating templates...
 ifdef TEMPINCDIR
 TEMPINCDIR := $(TEMPINCDIR)/<%project_name%>
-
 all: $(TEMPINCDIR)
-
 endif
 
-<%if(exename)%>
-INSBIN ?= <%if(install)%><%install%><%else%>.<%endif%>
-OUTPUT_DIRECTORY = $(INSBIN)
-<%else%>
-INSLIB ?= <%if(dllout)%><%dllout%><%else%><%libout%><%endif%>
-ifeq ($(INSLIB),.)
-  ifeq ($(PWD),)
-    PWD=$(shell pwd)
-  endif
-  INSLIB = $(PWD)
-endif
-OUTPUT_DIRECTORY = $(INSLIB)
-<%endif%>
+ifneq ($(OUTPUT_DIRECTORY),)
 all: $(OUTPUT_DIRECTORY)
-
 $(OUTPUT_DIRECTORY):
-	-@mkdir -p "$(OUTPUT_DIRECTORY)"
+	-@$(MKDIR) "$(OUTPUT_DIRECTORY)"
+endif
 
 <%if(sharedname || staticname || exename)%>
 <%if(libs && libpaths)%>
@@ -272,7 +314,7 @@ else
 endif
 <%endfor%>
 
-OBJS   = $(addsuffix .o, $(notdir $(FILES)))
+OBJS   = $(addsuffix .$(OBJEXT), $(notdir $(FILES)))
 SRC    = $(addsuffix .cpp, $(FILES))
 <%endif%>
 ifneq (,$(RC))
@@ -287,11 +329,13 @@ LSRC   = $(addsuffix .cpp, $(FILES))
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-<%if(install && exename)%>
+<%if(exename)%>
 
+ifneq ($(OUTPUT_DIRECTORY),)
 ifneq ($(OUTPUT_DIRECTORY),.)
   INSTALL = $(VBIN:%=$(INSBIN)/%)
-  CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%)
+  CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(VAR)$(EXEEXT))
+endif
 endif
 
 <%endif%>
@@ -314,12 +358,16 @@ endif
 
 <%endif%>
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-<%if(tao)%>
-include $(TAO_ROOT)/taoconfig.mk
-<%endif%>
+ifeq ($(VXWORKSLINK),true)
+include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE)
+endif
 
 <%if(libpaths)%>
+ifeq ($(VXWORKSLINK),true)
+LDLIBPATH     =<%foreach(libpaths)%> -L<%libpath%><%endfor%>
+else
 LDFLAGS      +=<%foreach(libpaths)%> -L<%libpath%><%endfor%>
+endif
 <%endif%>
 <%if(includes)%>
 CPPFLAGS     +=<%foreach(includes)%> -I<%include%><%endfor%>
@@ -361,6 +409,15 @@ avoid_warning:
 
 <%endif%>
 <%if(custom_types)%>
+## Some OS's have /bin/test others only have /usr/bin/test
+ifeq ($(wildcard /bin/test), /bin/test)
+  TEST_EXE = /bin/test
+else
+ifeq ($(wildcard /usr/bin/test), /usr/bin/test)
+  TEST_EXE = /usr/bin/test
+endif
+endif
+
 <%foreach(custom_types)%>
 <%if(custom_types->libpath)%>
 DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):<%custom_type->libpath%>
@@ -385,22 +442,33 @@ OBJS_DEPEND_ON_GENERATED = 1
 ## the case, then we don't need this special rule.
 ifeq ($(wildcard $(GENERATED_DIRTY)), $(GENERATED_DIRTY))
   ## If we can find /bin/test, then we will continue
-  ifeq ($(wildcard /bin/test), /bin/test)
+  ifneq ($(TEST_EXE),)
     ## If all of the generated files are there, then we need to check
     ## and make sure that the generated files are up-to-date.  If they are not
     ## then we need the special rule.
-    ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> /bin/test <%custom_type->input_file%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),)
+    ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) <%custom_type->input_file%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),)
       .NOTPARALLEL:
+<%if(flag_overrides(custom_type->input_file, dependent))%>
+    else
+      ## By this point, all of the generated files are here and up-to-date
+      ## with respect to the source file.  Now we need to make sure that
+      ## they are up-to-date with respect to the generation tool.  If the tool
+      ## is newer than the generated files, then we need the special rule.
+      ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) <%flag_overrides(custom_type->input_file, dependent)%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),)
+        .NOTPARALLEL:
+      endif
+<%else%>
 <%if(custom_type->dependent)%>
     else
       ## By this point, all of the generated files are here and up-to-date
       ## with respect to the source file.  Now we need to make sure that
       ## they are up-to-date with respect to the generation tool.  If the tool
       ## is newer than the generated files, then we need the special rule.
-      ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> /bin/test <%custom_type->command%>$(EXEEXT) -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),)
+      ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) <%custom_type->dependent%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),)
         .NOTPARALLEL:
       endif
 <%endif%>
+<%endif%>
     endif
   else
     .NOTPARALLEL:
@@ -410,13 +478,22 @@ else
 endif
 <%endif%>
 <%endfor%>
-<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->dependent)%> <%custom_type->command%>$(EXEEXT)<%endif%>
-	<%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%> <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
+<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(flag_overrides(custom_type->input_file, dependent))%> <%flag_overrides(custom_type->input_file, dependent)%><%else%><%if(custom_type->dependent)%> <%custom_type->dependent%><%endif%><%endif%>
+<%if(flag_overrides(custom_type->input_file, gendir))%>
+	$(MKDIR) <%flag_overrides(custom_type->input_file, gendir)%>
+<%endif%>
+	<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%> <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
+<%if(flag_overrides(custom_type->input_file, postcommand))%>
+<%foreach(custom_type->input_file->output_files)%>
+	<%flag_overrides(custom_type->input_file, postcommand)%>
+<%endfor%>
+<%else%>
 <%if(custom_type->postcommand)%>
 <%foreach(custom_type->input_file->output_files)%>
-	<%custom_type->postcommand()%>
+	<%custom_type->postcommand%>
 <%endfor%>
 <%endif%>
+<%endif%>
 <%if(pch_header)%>
 <%if(custom_type->pch_postrule)%>
 <%foreach(custom_type->input_file->source_output_files)%>
@@ -435,8 +512,8 @@ ifneq ($(GENERATED_DIRTY),)
 ## ensure that those files are generated before we attempt to build anything
 ## else.
 ifeq ($(OBJS_DEPEND_ON_GENERATED),1)
-$(addprefix $(VDIR), $(OBJS)): $(GENERATED_DIRTY)
-$(VSHOBJS): $(GENERATED_DIRTY)
+$(VDIR)$(ACE_PCH_FILE) $(addprefix $(VDIR), $(OBJS)): $(GENERATED_DIRTY)
+$(VSHDIR)$(ACE_PCH_FILE) $(VSHOBJS): $(GENERATED_DIRTY)
 endif
 <%else%>
 <%foreach(requires)%>
@@ -481,6 +558,7 @@ endif
 <%endif%>
 <%if(exename)%>
 
+ifneq ($(VXWORKSLINK),true)
 ifndef kylix
 $(BIN): $(addprefix $(VDIR), $(OBJS))
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -488,6 +566,7 @@ else
 $(BIN): $(addprefix $(VDIR), $(OBJS))
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $(VLDLIBS) $(BORINITEXEOBJ) $(POSTLINK) $^, $@,,
 endif
+endif
 <%endif%>
 
 realclean: clean
diff --git a/bin/MakeProjectCreator/templates/gnudll.mpt b/bin/MakeProjectCreator/templates/gnudll.mpt
index 300ea4b23c4..c5fa1017803 100644
--- a/bin/MakeProjectCreator/templates/gnudll.mpt
+++ b/bin/MakeProjectCreator/templates/gnudll.mpt
@@ -2,3 +2,5 @@
 // $Id$
 
 conditional_include "common"
+
+targetoutdir =
diff --git a/bin/MakeProjectCreator/templates/gnuexe.mpt b/bin/MakeProjectCreator/templates/gnuexe.mpt
index 300ea4b23c4..2b595402d86 100644
--- a/bin/MakeProjectCreator/templates/gnuexe.mpt
+++ b/bin/MakeProjectCreator/templates/gnuexe.mpt
@@ -1,4 +1,4 @@
 // -*- MPC -*-
 // $Id$
 
-conditional_include "common"
+conditional_include "gnudll"
diff --git a/bin/PerlACE/ConfigList.pm b/bin/PerlACE/ConfigList.pm
index f2546d844d9..74e530b1c94 100644
--- a/bin/PerlACE/ConfigList.pm
+++ b/bin/PerlACE/ConfigList.pm
@@ -9,7 +9,7 @@ use FileHandle;
 my @new_argv = ();
 
 for(my $i = 0; $i <= $#ARGV; ++$i) {
-    if ($ARGV[$i] eq '-Config') {  
+    if ($ARGV[$i] eq '-Config') {
         if (defined $ARGV[$i + 1]) {
             push @PerlACE::ConfigList::Configs, $ARGV[++$i];
         }
@@ -25,7 +25,7 @@ for(my $i = 0; $i <= $#ARGV; ++$i) {
 @ARGV = @new_argv;
 
 
-sub new () 
+sub new ()
 {
     my $self = {};
     @{$self->{MY_CONFIGS}} = @PerlACE::ConfigList::Configs;
@@ -78,17 +78,20 @@ sub load ($)
 
     while (<$fh>) {
         chomp;
-	if (/^\s*$/ || /^#/) { 
-            next; 
+	if (/^\s*$/ || /^#/) {
+            next;
         }
         # compress white space
 	s/\s+/ /g;
 
         my $entry = '';
         my $configs = '';
-            
+
         ($entry, $configs) = split /:/;
 
+        # remove trailing white spaces
+        $entry =~ s/\s+$//;
+
         push @{$self->{ENTRIES}}, $entry;
 	if (defined $configs) {
             @{$self->{CONFIGS}->{$entry}} =  split (" ", $configs);
@@ -98,7 +101,7 @@ sub load ($)
     $fh->close ();
 }
 
-sub valid_entries () 
+sub valid_entries ()
 {
     my $self = shift;
     my @entries = ();
@@ -118,7 +121,7 @@ sub list_configs ()
     my $list = '';
 
     foreach my $entry (@{$self->{ENTRIES}}) {
-	
+
         foreach my $config (@{$self->{CONFIGS}->{$entry}}) {
             $config =~ s/!//g;
             if ($allconfigs{$config} != 1) {
@@ -133,7 +136,7 @@ sub list_configs ()
 
 sub dump ()
 {
-    my $self = shift;	
+    my $self = shift;
 
     print "============================================================\n";
     print "Config\n";
@@ -152,4 +155,4 @@ sub dump ()
     print "============================================================\n";
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm
index a0092379f8e..f6d973fdad0 100644
--- a/bin/PerlACE/Process_Unix.pm
+++ b/bin/PerlACE/Process_Unix.pm
@@ -305,10 +305,15 @@ sub check_return_value ($)
     my $self = shift;
     my $rc = shift;
 
+    # NSK OSS has a 32-bit waitpid() status 
+    my $is_NSK = ($^O eq "nonstop_kernel");
+    my $CC_MASK = $is_NSK ? 0xffff00 : 0xff00;
+
+    # Exit code processing
     if ($rc == 0) {
         return 0;
     }
-    elsif ($rc == 0xff00) {
+    elsif ($rc == $CC_MASK) {
         print STDERR "ERROR: <", $self->{EXECUTABLE},
                      "> failed: $!\n";
         return ($rc >> 8);
@@ -318,6 +323,10 @@ sub check_return_value ($)
         return $rc;
     }
 
+    # Ignore NSK 16-bit completion code
+    $rc &= 0xff if $is_NSK;
+
+    # Remember Core dump flag
     my $dump = 0;
 
     if ($rc & 0x80) {
diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm
index e9d8c173025..d83f333e118 100644
--- a/bin/PerlACE/Process_Win32.pm
+++ b/bin/PerlACE/Process_Win32.pm
@@ -81,6 +81,11 @@ sub Normalize_Executable_Name
 
     $executable = $dirname.$PerlACE::Process::ExeSubDir.$basename.".EXE";
 
+    ## Installed executables do not conform to the ExeSubDir
+    if (! -x $executable && -x $dirname.$basename.'.EXE') {
+      $executable = $dirname.$basename.'.EXE';
+    }
+
     $executable =~ s/\//\\/g; # / <- # color coding issue in devenv
 
     return $executable;
@@ -97,16 +102,13 @@ sub Executable
 
     my $executable = $self->{EXECUTABLE};
 
-    if ($self->{IGNOREEXESUBDIR}) {
-        return $executable;
+    if ($self->{IGNOREEXESUBDIR} == 0) {
+      $executable = PerlACE::Process::Normalize_Executable_Name ($executable);
+    }
+    else {
+      $executable = $executable.".EXE";
+      $executable =~ s/\//\\/g; # / <- # color coding issue in devenv
     }
-
-    my $basename = basename ($executable);
-    my $dirname = dirname ($executable). '/';
-
-    $executable = $dirname.$PerlACE::Process::ExeSubDir.$basename.".EXE";
-
-    $executable =~ s/\//\\/g; # / <- # color coding issue in devenv
 
     return $executable;
 }
diff --git a/bin/PerlACE/Run_Test.pm b/bin/PerlACE/Run_Test.pm
index e40d0c15721..9bfd180a712 100644
--- a/bin/PerlACE/Run_Test.pm
+++ b/bin/PerlACE/Run_Test.pm
@@ -15,6 +15,9 @@ if (!defined $svcconf_ext) {
     $svcconf_ext = ".conf";
 }
 
+# Default timeout.  NSCORBA needs more time for process start up.
+$wait_interval_for_process_creation = ($^O eq "nonstop_kernel") ? 10 : 5;
+
 # Turn on autoflush
 $| = 1;
 
diff --git a/bin/ace_tests.lst b/bin/ace_tests.lst
index 61b7303299e..0b5d78549d0 100644
--- a/bin/ace_tests.lst
+++ b/bin/ace_tests.lst
@@ -10,4 +10,4 @@
 # NOTE: This file contains tests only for ACE. Please do not include
 # tests in TAO here..
 tests/run_test.pl
-examples/Reactor/WFMO_Reactor/run_test.pl: !Cygwin
+examples/Reactor/WFMO_Reactor/run_test.pl: !Cygwin !VxWorks
diff --git a/bin/am_edit b/bin/am_edit
deleted file mode 100755
index 9b0e828b5fa..00000000000
--- a/bin/am_edit
+++ /dev/null
@@ -1,1368 +0,0 @@
-#!/usr/bin/perl
-
-## $Id$
-
-## Expands the specilised TAO tags in Makefile.in to (hopefully) valid
-## make syntax.
-##
-## This script has been modified from the original am_edit script that
-## the KDE development team uses for the KDE.  This modified script
-## searches a Makefile.in file for IDL sources (ending in `.idl'), and
-## adds appropriate targets for the C++ sources generated by the TAO
-## IDL compiler.  For example, for the IDL file `CosNaming.idl' this script
-## would add all relevant targets for the following files:
-##
-##     CosNaming.idl  --> CosNamingC.h
-##                        CosNamingC.i
-##                        CosNamingC.cpp
-##                        CosNamingS.h
-##                        CosNamingS.i
-##                        CosNamingS.cpp
-##
-##   Ossama Othman <ossama@debian.org> 
-
-
-# Expands the specilised KDE tags in Makefile.in to (hopefully) valid
-# make syntax.
-# When called without file parameters, we work recursively on all Makefile.in
-# in and below the current subdirectory. When called with file parameters,
-# only those Makefile.in are changed.
-# The currently supported tags are
-#
-# {program}_METASOURCES
-# where you have a choice of two styles
-#   {program}_METASOURCES = name1.moc name2.moc ... [\]
-#   {program}_METASOURCES = AUTO
-#       The second style requires other tags as well.
-#
-# and more new tags TBD!
-#
-# The concept (and base code) for this peogram came from automoc,
-# supplied by the following
-#
-# Matthias Ettrich <ettrich\@kde.org>      (The originator)
-# Kalle Dalheimer <kalle\@kde.org>      (The original implementator)
-# Harri Porten  <porten@tu-harburg.de>
-# Alex Zepeda  <garbanzo@hooked.net>
-# David Faure <faure@kde.org>
-# Stephan Kulow <coolo@kde.org>
-#
-# I've puddled around with automoc and produced something different
-# 1999-02-01 John Birch <jb.nz@writeme.com>
-#       * Rewritten automoc to cater for more than just moc file expansion
-#         Version 0.01 does the same as automoc at this stage.
-# 1999-02-18 jb
-#       * We must always write a Makefile.in file out even if we fail
-#         because we need the "perl autokmake" in the AUTOMAKE so that a
-#         "make" will regenerate the Makefile.in correctly.
-#         Reworked moc file checking so that missing includes in cpp
-#         will work and includes in cpp when using use_automoc will also
-#         work.
-# 1999-02-23 jb
-#       * Added POFILE processing and changed the USE_AUTOMOC tag to
-#         AUTO instead.
-# 1999-11-07 Ossama Othman <ossama@debian.org> 
-#       * Modified IDL source file related code to specifically
-#       * generated targets for TAO IDL generated sources.
-
-
-use Cwd;
-use File::Find;
-use File::Basename;
-
-# Prototype the functions
-sub initialise ();
-sub processMakefile ($);
-sub updateMakefile ();
-sub restoreMakefile ();
-
-sub removeLine ($$);
-sub appendLines ($);
-sub substituteLine ($$);
-
-sub findMocCandidates ();
-sub pruneMocCandidates ($);
-sub checkMocCandidates ();
-sub addMocRules ();
-
-sub tag_AUTOMAKE ();
-sub tag_META_INCLUDES ();
-sub tag_METASOURCES ();
-sub tag_POFILES ();
-sub tag_DOCFILES ();
-sub tag_LOCALINSTALL();
-sub tag_IDLFILES();
-sub tag_TOPLEVEL();
-sub tag_SUBDIRS();
-sub tag_ICON();
-
-# Some global globals...
-$verbose    = 0;        # a debug flag
-$thisProg   = "$0";     # This programs name
-$topdir     = cwd();    # The current directory
-@makefiles  = ();       # Contains all the files we'll process
-$start      = (times)[0]; # some stats for testing - comment out for release
-$version    = "v0.2";
-$errorflag  = 0;
-$cppExt     = "*.cpp *.cc *.cxx *.C *.c++";           # used by grep
-$hExt       = "*.h *.H *.hh *.hxx *.h++";             # used by grep
-$progId     = "TAO tags expanded automatically by " . basename($thisProg);
-$automkCall = "\n";
-$printname  = "";  # used to display the directory the Makefile is in
-$use_final  = 1;        # create code for --enable-final
-$cleantarget = "clean";
-$locolor_install = 0;
-
-while (defined ($ARGV[0]))
-{
-    $_ = shift;
-    if (/^--version$/)
-    {
-        print STDOUT "\n";
-        print STDOUT basename($thisProg), " $version\n",
-                "This is really free software, unencumbered by the GPL.\n",
-                "You can do anything you like with it except sueing me.\n",
-                "Copyright 1998 Kalle Dalheimer <kalle\@kde.org>\n",
-                "Concept, design and unnecessary questions about perl\n",
-                "       by Matthias Ettrich <ettrich\@kde.org>\n\n",
-                "Making it useful by Stephan Kulow <coolo\@kde.org> and\n",
-                "Harri Porten <porten\@kde.org>\n",
-                "Updated (Feb-1999), John Birch <jb.nz\@writeme.com>\n\n";
-        exit 0;
-    }
-    elsif (/^--verbose$|^-v$/)
-    {
-        $verbose = 1;       # Oh is there a problem...?
-    }
-    elsif (/^-p(.+)$|^--path=(.+)$/)
-    {
-        $thisProg = "$1/".basename($thisProg);
-        warn ("$thisProg doesn't exist\n")      if (!(-f $thisProg));
-    }
-    elsif (/^--help$|^-h$/)
-    {
-        print STDOUT "Usage $thisProg [OPTION] ... [dir/Makefile.in]...\n",
-                "\n",
-                "Patches dir/Makefile.in generated from automake\n",
-                "(where dir can be a full or relative directory name)",
-                "\n",
-                "  -v, --verbose      verbosely list files processed\n",
-                "  -h, --help         print this help, then exit\n",
-                "  --version          print version number, then exit\n",
-                "  -p, --path=        use the path to automoc if the path\n",
-	        "  --no-final         don't patch for --enable-final\n",
-                "                     called from is not the one to be used\n";
-	
-        exit 0;
-    }
-    elsif (/^--no-final$/)
-    {
-	$use_final = 0;
-	$locolor_install = 1;
-    }
-    else
-    {
-        # user selects what input files to check
-        # add full path if relative path is given
-        $_ = cwd()."/".$_   if (! /^\//);
-        print "User wants $_\n" if ($verbose);
-        push (@makefiles, $_);
-    }
-}
-
-# Only scan for files when the user hasn't entered data
-if (!@makefiles)
-{
-    print STDOUT "Scanning for Makefile.in\n"       if ($verbose);
-    find (\&add_makefile, cwd());
-    #chdir('$topdir');
-} else {
-    print STDOUT "Using user enter input files\n"   if ($verbose);
-}
-
-foreach $makefile (@makefiles)
-{
-    processMakefile ($makefile);
-    last            if ($errorflag);
-}
-
-# Just some debug statistics - comment out for release as it uses printf.
-printf STDOUT "Time %.2f CPU sec\n", (times)[0] - $start     if ($verbose);
-
-exit $errorflag;        # causes make to fail if errorflag is set
-
-#-----------------------------------------------------------------------------
-
-# In conjunction with the "find" call, this builds the list of input files
-sub add_makefile ()
-{
-    push (@makefiles, $File::Find::name)  if (/Makefile.in$/);
-}
-
-#-----------------------------------------------------------------------------
-
-# Processes a single make file
-# The parameter contains the full path name of the Makefile.in to use
-sub processMakefile ($)
-{
-    # some useful globals for the subroutines called here
-    local ($makefile)       = @_;
-    local @headerdirs       = ('.');
-    local $haveAutomocTag   = 0;
-    local $MakefileData     = "";
-
-    local $cxxsuffix  = "TAO";
-
-    local @programs = ();  # lists the names of programs and libraries
-    local $program = "";
-
-    local %realObjs = ();  # lists the objects compiled into $program
-    local %sources = ();   # lists the sources used for $program
-    local %finalObjs = (); # lists the objects compiled when final
-    local %idlfiles = ();  # lists the idl files used for $program
-    local $idl_output = "";# lists all idl generated files for cleantarget
-
-    local %depedmocs = ();
-
-    local $metasourceTags = 0;
-    local $dep_files = "";
-    local %target_adds = (); # the targets to add
-    local $kdelang    = "";
-
-    $makefileDir = dirname($makefile);
-    chdir ($makefileDir);
-    $printname = $makefile;
-    $printname =~ s/^\Q$topdir\E\///;
-    $makefile = basename($makefile);
-
-    print STDOUT "Processing makefile $printname\n"   if ($verbose);
-
-    # Setup and see if we need to do this.
-    return      if (!initialise());
-
-    tag_AUTOMAKE ();            # Allows a "make" to redo the Makefile.in
-    tag_META_INCLUDES ();       # Supplies directories for src locations
-
-    foreach $program (@programs) {
-	tag_METASOURCES ();         # Sorts out the moc rules
-	tag_IDLFILES();             # Sorts out idl rules
-    }
-
-    if ($idl_output) {
-      appendLines ("$cleantarget-idl:\n\t-rm -f $idl_output\n");
-      $target_adds{"$cleantarget-am"} .= "$cleantarget-idl ";
-    }
-
-    if ($MakefileData =~ /\nKDE_LANG\s*=\s*(\S*)\n/) {
-      $kdelang = '$(KDE_LANG)'
-    } else {
-      $kdelang = '';
-    }
-
-    tag_POFILES ();             # language rules for po directory
-    tag_DOCFILES ();            # language rules for doc directories
-    tag_TOPLEVEL ();            # language rules for po toplevel
-    tag_LOCALINSTALL();         # add $(DESTDIR) before all kde_ dirs
-    tag_ICON();
-
-    my $tmp = "force-reedit:\n";
-    $tmp   .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
-    appendLines($tmp);
-
-    tag_FINAL() if ($use_final);
-
-    my $final_lines = "final:\n\t\$(MAKE) ";
-
-    foreach $program (@programs) {
-
-      my $lookup = "$program\_OBJECTS.*=[^\n]*";
-
-      my $new = "";
-
-      my @list = split(/[\034\s]+/, $realObjs{$program});
-
-      if ($use_final && @list > 1 && $finalObjs{$program}) {
-	
-	$new  = "\@KDE_USE_FINAL_FALSE\@$program\_OBJECTS = " . $realObjs{$program};
-	$new .= "\n\@KDE_USE_FINAL_TRUE\@$program\_OBJECTS = " . $finalObjs{$program};
-	$new .= "\n$program\_final\_OBJECTS = " . $finalObjs{$program};
-
-	$final_lines .= "$program\_OBJECTS=\"\$($program\_final_OBJECTS)\" ";
-
-      } else {
-	$new = "$program\_OBJECTS = " . $realObjs{$program};
-      }
-
-      substituteLine ($lookup, $new);
-    }
-    appendLines($final_lines . "all-am");
-
-    my $lookup = 'DEP_FILES\s*=(.*)\n';
-    if ($MakefileData =~ /\n$lookup/) {
-      $lines = "DEP_FILES = $dep_files";
-      $lines .= " \034";
-      $lines .= $1;
-      $lines .= "\n";
-
-      substituteLine($lookup, $lines);
-    }
-
-    foreach $add (keys %target_adds) {
-      my $lookup = "$add:\s*(.*)";
-      if ($MakefileData =~ /\n$lookup\n/) {
-	substituteLine($lookup, "$add: " . $target_adds{$add} . $1);
-      }
-    }
-
-    my $cvs_lines = "cvs-clean:\n";
-    $cvs_lines .= "\t\$(MAKE) -f \$(top_srcdir)/admin/Makefile.common cvs-clean\n";
-    appendLines($cvs_lines);
-
-    # Always update the Makefile.in
-    updateMakefile ();
-    return;
-}
-
-#-----------------------------------------------------------------------------
-
-# Check to see whether we should process this make file.
-# This is where we look for tags that we need to process.
-# A small amount of initialising on the tags is also done here.
-# And of course we open and/or create the needed make files.
-sub initialise ()
-{
-    if (! -r "Makefile.am") {
-	print STDOUT "found Makefile.in without Makefile.am\n" if ($verbose);
-	return;
-    }
-
-    # Checking for files to process...
-    open (FILEIN, $makefile)
-      || die "Could not open $makefileDir/$makefile: $!\n";
-    # Read the file
-    while ( <FILEIN> )
-    {
-        $MakefileData .= $_;
-    }
-    close FILEIN;
-
-    # Remove the line continuations, but keep them marked
-    # Note: we lose the trailing spaces but that's ok.
-    $MakefileData =~ s/\\\s*\n/\034/g;
-
-    # If we've processed the file before...
-    restoreMakefile ()      if ($MakefileData =~ /$progId/);
-
-    # Look for the tags than mean we should process this file.
-    $metasourceTags = 0;
-    $metasourceTags++    while ($MakefileData =~ /\n[^=#]*METASOURCES\s*=/g);
-
-    my $pofileTag = 0;
-    $pofileTag++    while ($MakefileData =~ /\nPOFILES\s*=/g);
-    if ($pofileTag > 1)
-    {
-        print STDERR "Error: Only one POFILES tag allowed\n";
-        $errorflag = 1;
-    }
-
-    while ($MakefileData =~ /\n\.SUFFIXES:([^\n]+)\n/g) {
-	my @list=split(' ', $1);
-	my $extions = " " . $cppExt . " ";
-	foreach $ext (@list) {
-	    if ($extions =~ / \*\Q$ext\E /) {
-		$cxxsuffix = $ext;
-		$cxxsuffix =~ s/\.//g;
-		print STDOUT "will use suffix $cxxsuffix\n" if ($verbose);
-		last;
-	    }
-	}
-    }
-
-    while ($MakefileData =~ /\n(\S*)_OBJECTS\s*=\s*([^(\n]*)\n/g) {
-      my $program = $1;
-      my $objs = $2; # safe them
-      $program =~ s/^am_// if ($program =~ /^am_/);
-
-      print STDOUT "found program $program\n" if ($verbose);
-      push(@programs, $program);
-
-      $realObjs{$program} = $objs;
-
-      if ($MakefileData =~ /\n$program\_SOURCES\s*=\s*(.*)\n/) {
-	$sources{$program} = $1;
-      } else {
-	$sources{$program} = "";
-	print STDERR "found program with no _SOURCES: $program\n";
-      }
-    }
-
-    my $localTag = 0;
-    $localTag++ if ($MakefileData =~ /\ninstall-\S+-local:/);
-
-    return (!$errorflag);
-}
-
-#-----------------------------------------------------------------------------
-
-# Gets the list of user defined directories - relative to $srcdir - where
-# header files could be located.
-sub tag_META_INCLUDES ()
-{
-    my $lookup = '[^=\n]*META_INCLUDES\s*=\s*(.*)';
-    return 1    if ($MakefileData !~ /($lookup)\n/);
-    print STDOUT "META_INCLUDE processing <$1>\n"       if ($verbose);
-
-    my $headerStr = $2;
-    removeLine ($lookup, $1);
-
-    $headerStr =~ tr/\034/ /;
-    my @headerlist = split(' ', $headerStr);
-
-    foreach $dir (@headerlist)
-    {
-        $dir =~ s#\$\(srcdir\)#.#;
-        if (! -d $dir)
-        {
-            print STDERR "Warning: $dir can't be found. ",
-                            "Must be a relative path to \$(srcdir)\n";
-        }
-        else
-        {
-            push (@headerdirs, $dir);
-        }
-    }
-
-    return 0;
-}
-
-#-----------------------------------------------------------------------------
-
-sub tag_FINAL()
-{
-  my @final_names = ();
-
-  foreach $program (@programs) {
-
-    if ($sources{$program} =~ /\(/) {
-      print STDERR "found ( in $program\_SOURCES. skipping\n" if ($verbose);
-      next;
-    }
-
-    my @list = split(/[\s\034]+/, $realObjs{$program});
-    # we're not making anything faster for one object file
-    next if (@list == 1);
-
-    my $mocsources = "";
-
-    my @progsources = split(/[\s\034]+/, $sources{$program});
-    my %sourcelist = ();
-
-    foreach $source (@progsources) {
-      my $suffix = $source;
-      $suffix =~ s/^.*\.([^\.]+)$/$1/;
-
-      if (defined($sourcelist{$suffix})) {
-	$sourcelist{$suffix} .= " " . $source;
-      } else {
-	$sourcelist{$suffix} .= $source;
-      }
-    }
-
-    foreach $suffix (keys %sourcelist) {
-
-      # See if this file contains c++ code. (ie Just check the files suffix against
-      my $suffix_is_cxx = 0;
-      foreach $cxx_suffix (split(' ', $cppExt)) {
-       $cxx_suffix =~ s/^\*\.//;
-       $cxx_suffix = quotemeta($cxx_suffix);
-       if ($suffix =~ $cxx_suffix) {
-         $suffix_is_cxx = 1;
-         last;
-       }
-      }
-
-      my $mocfiles_in = ($suffix eq $cxxsuffix) &&
-	defined($depedmocs{$program});
-
-      my @sourcelist = split(/[\s\034]+/, $sourcelist{$suffix});
-
-      if ((@sourcelist == 1 && !$mocfiles_in) || $suffix_is_cxx != 1 ) {
-
-	# we support IDL on our own
-	if ($suffix =~ /^idl$/ || $suffix =~ /^h$/) {
-	  next;
-	}
-	
-	foreach $file (@sourcelist) {
-
-	  $file =~ s/\Q$suffix\E$//;
-	
-	  $finalObjs{$program} .= $file;
-	  if ($program =~ /_la$/) {
-	    $finalObjs{$program} .= "lo ";
-	  } else {
-	    $finalObjs{$program} .= "o ";
-	  }
-	}
-	next; # suffix
-      }
-
-      my $source_deps = "";
-      foreach $source (@sourcelist) {
-	if (-f $source) {
-	  $source_deps .= "\$(srcdir)/$source ";
-	} else {
-	  $source_deps .= "$source ";
-	}
-      }
-
-      $handling = "$program.all_$suffix.$suffix: \$(srcdir)/Makefile.in " . $source_deps . " ";
-
-      if ($mocfiles_in) {
-	$handling .= $depedmocs{$program};
-	foreach $mocfile (split(' ', $depedmocs{$program})) {
-	  if ($mocfile =~ m/\.$suffix$/) {
-	    $mocsources .= " " . $mocfile;
-	  }
-	}
-      }
-
-      $handling .= "\n";
-      $handling .= "\t\@echo 'creating $program.all_$suffix.$suffix ...'; \\\n";
-      $handling .= "\trm -f $program.all_$suffix.files $program.all_$suffix.final; \\\n";
-      $handling .= "\techo \"#define KDE_USE_FINAL 1\" >> $program.all_$suffix.final; \\\n";
-      $handling .= "\tfor file in " . $sourcelist{$suffix} . " $mocsources; do \\\n";
-      $handling .= "\t  echo \"#include \\\"\$\$file\\\"\" >> $program.all_$suffix.files; \\\n";
-      $handling .= "\t  test ! -f \$\(srcdir\)/\$\$file || egrep '^#pragma +implementation' \$\(srcdir\)/\$\$file >> $program.all_$suffix.final; \\\n";
-      $handling .= "\tdone; \\\n";
-      $handling .= "\tcat $program.all_$suffix.final $program.all_$suffix.files  > $program.all_$suffix.$suffix; \\\n";
-      $handling .= "\trm -f $program.all_$suffix.final $program.all_$suffix.files\n";
-
-      appendLines($handling);
-	
-      push(@final_names, "$program.all_$suffix.$suffix");
-      $finalObjs{$program} .= "$program.all_$suffix.";
-      if ($program =~ /_la$/) {
-	$finalObjs{$program} .= "lo ";
-      } else {
-	$finalObjs{$program} .= "o ";
-      }
-    }
-  }
-
-  if ($use_final && @final_names >= 1) {
-    # add clean-final target
-    my $lines = "$cleantarget-final:\n";
-    $lines .= "\t-rm -f " . join(' ', @final_names) . "\n" if (@final_names);
-    appendLines($lines);
-    $target_adds{"$cleantarget-am"} .= "$cleantarget-final ";
-
-    foreach $finalfile (@final_names) {
-      $finalfile =~ s/\.[^.]*$/.P/;
-      $dep_files .= " .deps/$finalfile";
-    }
-  }
-}
-
-# Organises the list of headers that we'll use to produce moc files
-# from.
-sub tag_METASOURCES ()
-{
-    local @newObs           = ();  # here we add to create object files
-    local @deped            = ();  # here we add to create moc files
-    local $mocExt           = ".moc";
-    local %mocFiles         = ();
-
-    my $line = "";
-    my $postEqual = "";
-
-    my $lookup;
-    my $found = "";
-
-    if ($metasourceTags > 1) {
-	$lookup = $program . '_METASOURCES\s*=\s*(.*)';
-	return 1    if ($MakefileData !~ /\n($lookup)\n/);
-	$found = $1;
-    } else {
-	$lookup = $program . '_METASOURCES\s*=\s*(.*)';
-	if ($MakefileData !~ /\n($lookup)\n/) {
-	    $lookup = 'METASOURCES\s*=\s*(.*)';
-	    return 1    if ($MakefileData !~ /\n($lookup)\n/);
-	    $found = $1;
-	    $metasourceTags = 0; # we can use the general target only once
-	} else {
-	  $found = $1;
-      }
-    }
-    print STDOUT "METASOURCE processing <$found>)\n"      if ($verbose);
-
-    $postEqual = $found;
-    $postEqual =~ s/[^=]*=//;
-
-    removeLine ($lookup, $found);
-
-    # Always find the header files that could be used to "moc"
-    return 1    if (findMocCandidates ());
-
-    if ($postEqual =~ /AUTO\s*(\S*)|USE_AUTOMOC\s*(\S*)/)
-    {
-	print STDERR "$printname: the argument for AUTO|USE_AUTOMOC is obsolete" if ($+);
-	$mocExt = ".moc.$cxxsuffix";
-	$haveAutomocTag = 1;
-    }
-    else
-    {
-        # Not automoc so read the list of files supplied which
-        # should be .moc files.
-
-        $postEqual =~ tr/\034/ /;
-
-        # prune out extra headers - This also checks to make sure that
-        # the list is valid.
-        pruneMocCandidates ($postEqual);
-    }
-
-    checkMocCandidates ();
-
-    if (@newObs) {
-      my $ext =  ($program =~ /_la$/) ? ".moc.lo " : ".moc.o ";
-      $realObjs{$program} .= "\034" . join ($ext, @newObs) . $ext;
-      $depedmocs{$program} = join (".moc.$cxxsuffix " , @newObs) . ".moc.$cxxsuffix";
-      foreach $file (@newObs) {
-	$dep_files .= " .deps/$file.moc.P";
-      }
-    }
-    if (@deped) {
-      $depedmocs{$program} .= " ";
-      $depedmocs{$program} .= join('.moc ', @deped) . ".moc";
-      $depedmocs{$program} .= " ";
-    }
-    addMocRules ();
-}
-
-#-----------------------------------------------------------------------------
-
-# Returns 0 if the line was processed - 1 otherwise.
-# Errors are logged in the global $errorflags
-sub tag_AUTOMAKE ()
-{
-    my $lookup = '.*cd \$\(top_srcdir\)\s+&&\s+\$\(AUTOMAKE\)(.*)';
-    return 1    if ($MakefileData !~ /($lookup)/);
-    print STDOUT "AUTOMAKE processing <$1>\n"        if ($verbose);
-
-    my $newLine = $1."\n\tcd \$(top_srcdir) && perl $thisProg $printname";
-    substituteLine ($lookup, $newLine);
-    $automkCall = $1;
-    return 0;
-}
-
-#-----------------------------------------------------------------------------
-
-sub tag_TOPLEVEL()
-{
-  my $lookup = 'TOPLEVEL_LANG\s*=\s*(\S+)';
-  return 1 if ($MakefileData !~ /\n$lookup\n/);
-  my $lang = $1;
-
-  if (tag_SUBDIRS()) {
-    print STDERR "Error: TOPLEVEL_LANG without SUBDIRS = \$(AUTODIRS) in $printname\n";
-    $errorflag = 1;
-    return 1;
-  }
-
-  my $pofiles = "";
-  my @restfiles = ();
-  opendir (THISDIR, ".");
-  foreach $entry (readdir(THISDIR)) {
-    next if (-d $entry);
-
-    next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^#.*#$/ || $entry =~ /.gmo$/);
-
-    if ($entry =~ /\.po$/) {
-      $pofiles .= "$entry ";
-      next;
-    }
-    push(@restfiles, $entry);
-  }
-  closedir (THISDIR);
-
-  print STDOUT "pofiles found = $pofiles\n"   if ($verbose);
-  handle_POFILES($pofiles, '$(TOPLEVEL_LANG)') if ($pofiles);
-
-  if (@restfiles) {
-    $target_adds{"install-data-am"} .= "install-nls-files ";
-    $lines = "install-nls-files:\n";
-    $lines .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/$lang\n";
-    for $file (@restfiles) {
-      $lines .= "\t\$(INSTALL_DATA) \$\(srcdir\)/$file \$(DESTDIR)\$(kde_locale)/$lang/$file\n";
-    }
-    appendLines($lines);
-  }
-
-  return 0;
-}
-
-#-----------------------------------------------------------------------------
-
-sub tag_SUBDIRS ()
-{
-  if ($MakefileData !~ /\nSUBDIRS\s*=\s*\$\(AUTODIRS\)\s*\n/) {
-    return 1;
-  }
-
-  my $subdirs;
-
-  opendir (THISDIR, ".");
-  foreach $entry (readdir(THISDIR)) {
-    next if ($entry eq "CVS" || $entry =~ /^\./);
-    if (-d $entry && -f $entry . "/Makefile.in") {
-      $subdirs .= " $entry";
-      next;
-    }
-  }
-  closedir (THISDIR);
-
-  my $lines = "SUBDIRS =$subdirs\n";
-  substituteLine('SUBDIRS\s*=.*', $lines);
-  return 0;
-}
-
-sub tag_IDLFILES ()
-{
-  my @psources = split(/[\034\s]+/, $sources{$program});
-  my $dep_lines = "";
-
-  foreach $source (@psources) {
-    if ($source =~ m/\.idl$/) {
-      print STDERR "adding IDL file $source\n" if ($verbose);
-
-      $source =~ s/\.idl$//;
-
-      my $sourcedir = '';
-      if (-f "$makefileDir/$source.idl") {
-	$sourcedir = '$(srcdir)/';
-      } else {
-	if ($MakefileData =~ /\n$source\_IDLDIR\s*=\s*(\S+)\n/) {#
-	  $sourcedir = $1;
-	  $sourcedir .= "/" if ($sourcedir !~ /\/$/);
-	}
-      }
-
-      $dep_lines .= "${source}C.h: $sourcedir${source}.idl\n";
-      $dep_lines .= "\t\$(IDL) \$(IDL_FLAGS) ${source}.idl\n";
-      $dep_lines .= "${source}S.h: ${source}C.h\n";
-      $dep_lines .= "${source}C.i: ${source}C.h\n";
-      $dep_lines .= "${source}S.i: ${source}C.h\n";
-      $dep_lines .= "${source}C.cpp: ${source}C.h\n";
-      $dep_lines .= "${source}S.cpp: ${source}C.h\n";
-
-      $idlfiles{$program} .= $source . " ";
-#      $realObjs{$program} .= " $source";
-      if ($program =~ /_la$/) {
-	$realObjs{$program} .= " ${source}C.lo";
-	$realObjs{$program} .= " ${source}S.lo";
-      } else {
-	$realObjs{$program} .= " ${source}C.o";
-	$realObjs{$program} .= " ${source}S.o";
-      }
-      $sources{$program} .= " ${source}C.cpp";
-      $sources{$program} .= " ${source}S.cpp";
-      $idl_output .= " ${source}C.cpp ${source}S.cpp ${source}C.h ${source}S.h ${source}C.i ${source}S.i";
-    }
-  }
-  if ($dep_lines) {
-    appendLines($dep_lines);
-    my $lookup = "($program)";
-    $lookup =~ s/\_/./g;
-    $lookup .= ":(.*)\\\$\\\($program\_OBJECTS\\\)(.*)";
-    if ($MakefileData =~ /\n$lookup/) {
-
-      my $line = "$1:$2";
-      foreach $file (split(' ', $idlfiles{$program})) {
-	$line .= "$file.h ";
-      }
-      $line .= "\$($program\_OBJECTS)$3\n";
-      substituteLine($lookup, $line);
-    } else {
-      print STDERR "no built dependency found $lookup\n";
-    }
-  }
-
-}
-
-sub tag_ICON()
-{
-  my $lookup = 'KDE_ICON\s*=\s*([^\n]*)';
-  return 1    if ($MakefileData !~ /\n$lookup/);
-  my @appnames = split(" ", $1);
-  print STDOUT "KDE_ICON processing <@appnames>\n"   if ($verbose);
-
-  my @files = ();
-  opendir (THISDIR, ".");
-  foreach $entry (readdir(THISDIR)) {
-    next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/);
-    next if (! -f $entry);
-    next if ($entry !~ /\.xpm$/ && $entry !~ /\.png/);
-    foreach $appname (@appnames) {
-      if ($entry =~ /^mini-$appname\./ || $entry =~ /^$appname\./ || $entry =~ /^lo-$appname\./) {
-	push(@files, $entry);
-      }
-    }
-  }
-  closedir (THISDIR);
-  $target_adds{"install-data-am"} .= "install-kde-icons ";
-  $target_adds{"uninstall-am"} .= "uninstall-kde-icons ";
-
-  $install = "install-kde-icons:\n";
-  $uninstall = "uninstall-kde-icons:\n";
-
-  my %directories = ();
-
-  foreach $file (@files)
-    {
-      my $newfile = $file;
-
-      if ($file =~ /^mini-/) {
-	if (!defined $directories{"mini"}) {
-	  $install .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_icondir)/mini\n";
-	  $directories{"mini"} = 1;
-	}
-	$newfile =~ s/^mini-//;
-	$install .= "\t\$(INSTALL_DATA) \$(srcdir)/$file \$(DESTDIR)\$(kde_icondir)/mini/$newfile\n";
-	$uninstall .= "\t-rm -f \$(DESTDIR)\$(kde_icondir)/mini/$newfile\n";
-	next;
-      }
-
-      if ($file =~ /^lo-/) {
-	my $dir;
-	if ($locolor_install) {
-	  $dir = "\$(DESTDIR)\$(kde_icondir)/locolor"
-	} else {
-	  $dir = "\$(DESTDIR)\$(kde_icondir)"
-	}
-
-	if (!defined $directories{"locolor"}) {
-	  $install .= "\t\$(mkinstalldirs) $dir\n";
-	  $directories{"locolor"} = 1;
-	}
-	$newfile =~ s/^lo-//;
-	$install .= "\t\$(INSTALL_DATA) \$(srcdir)/$file $dir/$newfile\n";
-	$uninstall .= "\t-rm -f $dir/$newfile\n";
-	next;
-      }
-
-      if (!defined $directories{"icon"}) {
-	$install .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_icondir)\n";
-	$directories{"icon"} = 1;
-      }
-      $install .= "\t\$(INSTALL_DATA) \$(srcdir)/$file \$(DESTDIR)\$(kde_icondir)/$newfile\n";
-      $uninstall .= "\t-rm -f \$(DESTDIR)\$(kde_icondir)/$newfile\n";
-
-    }
-
-  appendLines($install . "\n" . $uninstall);
-
-}
-
-sub handle_POFILES($$)
-{
-  my @pofiles = split(" ", $_[0]);
-  my $lang = $_[1];
-
-  # Build rules for creating the gmo files
-  my $tmp = "";
-  my $allgmofiles     = "";
-  my $pofileLine   = "POFILES =";
-  foreach $pofile (@pofiles)
-    {
-        $pofile =~ /(.*)\.[^\.]*$/;          # Find name minus extension
-        $tmp .= "$1.gmo: $pofile\n";
-        $tmp .= "\trm -f $1.gmo; \$(GMSGFMT) -o $1.gmo \$(srcdir)/$pofile\n";
-        $allgmofiles .= " $1.gmo";
-        $pofileLine  .= " $1.po";
-    }
-  appendLines ($tmp);
-  my $lookup = 'POFILES\s*=([^\n]*)';
-  if ($MakefileData !~ /\n$lookup/) {
-    appendLines("$pofileLine\nGMOFILES =$allgmofiles");
-  } else {
-    substituteLine ($lookup, "$pofileLine\nGMOFILES =$allgmofiles");
-  }
-
-    if ($allgmofiles) {
-
-        # Add the "clean" rule so that the maintainer-clean does something
-        appendLines ("clean-nls:\n\t-rm -f $allgmofiles\n");
-
-	$target_adds{"maintainer-clean"} .= "clean-nls ";
-
-	$lookup = 'DISTFILES\s*=\s*(.*)';
-	if ($MakefileData =~ /\n$lookup\n/) {
-	  $tmp = "DISTFILES = \$(GMOFILES) \$(POFILES) $1";
-	  substituteLine ($lookup, $tmp);
-	}
-    }
-
-  $target_adds{"install-data-am"} .= "install-nls-\@USE_NLS\@ ";
-
-  $tmp = "install-nls-no:\n";
-  $tmp .= "install-nls-yes:\n";
-  if ($lang) {
-    $tmp  .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES\n";
-  }
-  $tmp .= "\t\@for base in ";
-  foreach $pofile (@pofiles)
-    {
-      $pofile =~ /(.*)\.[^\.]*$/;          # Find name minus extension
-      $tmp .= "$1 ";
-    }
-
-  $tmp .= "; do \\\n";
-  if ($lang) {
-    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
-    $tmp .= "\t  test ! -f \$\$base.gmo || \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n"
-  } else {
-    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
-    $tmp .= "\t  \$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES ; \\\n";
-    $tmp .= "\t  test ! -f \$\$base.gmo || \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
-  }
-  $tmp .= "\tdone\n\n";
-  appendLines ($tmp);
-
-  $target_adds{"uninstall"} .= "uninstall-nls ";
-
-  $tmp = "uninstall-nls:\n";
-  foreach $pofile (@pofiles)
-    {
-      $pofile =~ /(.*)\.[^\.]*$/;          # Find name minus extension
-      if ($lang) {
-	$tmp .= "\trm -f \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/$1.mo\n";
-      } else {
-	$tmp .= "\trm -f \$(DESTDIR)\$(kde_locale)/$1/LC_MESSAGES/\$(PACKAGE).mo\n";
-      }
-    }
-  appendLines($tmp);
-
-  $target_adds{"all"} .= "all-nls-\@USE_NLS\@ ";
-
-  $tmp = "all-nls-no:\n";
-  $tmp .= "all-nls-yes: \$(GMOFILES)\n";
-
-  appendLines($tmp);
-
-  $target_adds{"distdir"} .= "distdir-nls ";
-
-  $tmp = "distdir-nls:\$(GMOFILES)\n";
-  $tmp .= "\tfor file in \$(POFILES); do \\\n";
-  $tmp .= "\t  cp \$(srcdir)/\$\$file \$(distdir); \\\n";
-  $tmp .= "\tdone\n";
-  $tmp .= "\ttest -z \"\$(GMOFILES)\" || cp \$(GMOFILES) \$(distdir)\n";
-
-  appendLines ($tmp);
-
-}
-
-#-----------------------------------------------------------------------------
-
-# Returns 0 if the line was processed - 1 otherwise.
-# Errors are logged in the global $errorflags
-sub tag_POFILES ()
-{
-    my $lookup = 'POFILES\s*=([^\n]*)';
-    return 1    if ($MakefileData !~ /\n$lookup/);
-    print STDOUT "POFILES processing <$1>\n"   if ($verbose);
-
-    my $tmp = $1;
-
-    # make sure these are all gone.
-    if ($MakefileData =~ /\n\.po\.gmo:\n/)
-    {
-        print STDERR "Warning: Found old .po.gmo rules in $printname. New po rules not added\n";
-        return 1;
-    }
-
-    # Either find the pofiles in the directory (AUTO) or use
-    # only the specified po files.
-    my $pofiles = "";
-    if ($tmp =~ /^\s*AUTO\s*$/)
-    {
-        opendir (THISDIR, ".");
-	next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^#.*#$/);
-	$pofiles =  join(" ", grep(/\.po$/, readdir(THISDIR)));
-        closedir (THISDIR);
-        print STDOUT "pofiles found = $pofiles\n"   if ($verbose);
-    }
-    else
-    {
-        $tmp =~ s/\034/ /g;
-        $pofiles = $tmp;
-    }
-    return 1    if (!$pofiles);        # Nothing to do
-
-    handle_POFILES($pofiles, $kdelang);
-
-    return 0;
-}
-
-sub helper_LOCALINSTALL($)
-{
-  my $lookup = "\n" . $_[0] . ":";
-  if ($MakefileData =~ /($lookup)/) {
-
-    my $install = $MakefileData;
-    $install =~ s/\n/\035/g;
-    $install =~ s/.*\035$_[0]:[^\035]*\035//;
-    my $emptyline = 0;
-    while (! $emptyline) {
-      if ($install =~ /([^\035]*)\035(.*)/) {
-	local $line = $1;
-	$install = $2;
-	if ($line =~ /^\s*$/ || $line !~ /^\t/) {
-	  $emptyline = 1;
-	} else {
-	  replaceDestDir($line);
-	}
-      } else {
-	$emptyline = 1;
-      }
-    }
-  }
-
-}
-
-sub tag_LOCALINSTALL ()
-{
-  helper_LOCALINSTALL('install-exec-local');
-  helper_LOCALINSTALL('install-data-local');
-  helper_LOCALINSTALL('uninstall-local');
-
-  return 0;
-}
-
-sub replaceDestDir($) {
-  local $line = $_[0];
-
-  if ($line =~ /^\s*\$\(mkinstalldirs\)/ || $line =~ /^\s*\$\(INSTALL\S*\)/
-      || $line =~ /^\s*(-?rm.*) \S*$/)
-  {
-    $line =~ s/^(.*) ([^\s]*)\s*$/$1 \$(DESTDIR)$2/;
-  }
-
-  if ($line ne $_[0]) {
-    $_[0] = quotemeta $_[0];
-    substituteLine($_[0], $line);
-  }
-}
-#-----------------------------------------------------------------------------
-
-# Returns 0 if the line was processed - 1 otherwise.
-# Errors are logged in the global $errorflags
-sub tag_DOCFILES ()
-{
-    my $lookup = 'KDE_DOCS\s*=\s*([^\n]*)';
-    return 1    if ($MakefileData !~ /\n$lookup/);
-    print STDOUT "KDE_DOCS processing <$1>\n"   if ($verbose);
-
-    tag_SUBDIRS();
-
-    my $tmp = $1;
-
-    # Either find the files in the directory (AUTO) or use
-    # only the specified po files.
-    my $files = "";
-    my $appname = $tmp;
-    $appname =~ s/^(\S*)\s*.*$/$1/;
-    if ($appname =~ /AUTO/) {
-      $appname = basename($makefileDir);
-    }
-
-    if ($tmp !~ / - /)
-    {
-        opendir (THISDIR, ".");
-	foreach $entry (readdir(THISDIR)) {
-	  next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^#.*#$/);
-	  next if (! -f $entry);
-	  $files .= "$entry ";
-	}
-        closedir (THISDIR);
-        print STDOUT "docfiles found = $files\n"   if ($verbose);
-    }
-    else
-    {
-        $tmp =~ s/\034/ /g;
-	$tmp =~ s/^\S*\s*-\s*//;
-        $files = $tmp;
-    }
-    return 1    if (!$files);        # Nothing to do
-
-    $target_adds{"install-data-am"} .= "install-nls-\@USE_NLS\@ ";
-    $target_adds{"uninstall"} .= "uninstall-nls ";
-
-    $tmp = "install-nls-no:\n";
-    $tmp .= "install-nls-yes:\n";
-    $tmp .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n";
-    $tmp .= "\t\@for base in $files; do \\\n";
-    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/\$\$base ;\\\n";
-    $tmp .= "\t  \$(INSTALL_DATA) \$(srcdir)/\$\$base \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/\$\$base ;\\\n";
-    $tmp .= "\tdone\n";
-    $tmp .= "\n";
-    $tmp .= "uninstall-nls:\n";
-    $tmp .= "\tfor base in $files; do \\\n";
-    $tmp .= "\t  rm -f \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/\$\$base ;\\\n";
-    $tmp .= "\tdone\n\n";
-    appendLines ($tmp);
-
-    $target_adds{"distdir"} .= "distdir-nls ";
-
-    $tmp = "distdir-nls:\n";
-    $tmp .= "\tfor file in $files; do \\\n";
-    $tmp .= "\t  cp \$(srcdir)/\$\$file \$(distdir); \\\n";
-    $tmp .= "\tdone\n";
-
-    appendLines ($tmp);
-
-    return 0;
-}
-
-sub tag_LOCALINSTALL ()
-{
-  helper_LOCALINSTALL('install-exec-local');
-  helper_LOCALINSTALL('install-data-local');
-  helper_LOCALINSTALL('uninstall-local');
-
-  return 0;
-}
-
-#-----------------------------------------------------------------------------
-# Find headers in any of the source directories specified previously, that
-# are candidates for "moc-ing".
-sub findMocCandidates ()
-{
-    my @list = ();
-    foreach $dir (@headerdirs)
-    {
-        chdir ($dir);
-        @list = `grep -l '^.*Q_OBJECT' $hExt 2> /dev/null`;
-        chdir ($makefileDir);
-
-        # The assoc array of root of headerfile and header filename
-        foreach $hFile (@list)
-        {
-            chomp ($hFile);
-            $hFile =~ /(.*)\.[^\.]*$/;          # Find name minus extension
-            if ($mocFiles{$1})
-            {
-                print STDERR "Warning: Multiple header files found for $1\n";
-                next;                           # Use the first one
-            }
-            $mocFiles{$1} = "$dir\035$hFile";   # Add relative dir
-        }
-    }
-
-    if (!%mocFiles)
-    {
-        print STDERR "Error: No moc-able header's found but METASOURCES in $printname \n";
-        $errorflag = 1;
-        return 1;
-    }
-
-    return 0;
-}
-
-#-----------------------------------------------------------------------------
-
-# The programmer has specified a moc list. Prune out the moc candidates
-# list that we found based on looking at the header files. This generates
-# a warning if the programmer gets the list wrong, but this doesn't have
-# to be fatal here.
-sub pruneMocCandidates ($)
-{
-    my %prunedMoc = ();
-    local @mocList = split(' ', $_[0]);
-
-    foreach $mocname (@mocList)
-    {
-        $mocname =~ s/\.moc$//;
-        if ($mocFiles{$mocname})
-        {
-            $prunedMoc{$mocname} = $mocFiles{$mocname};
-        }
-        else
-        {
-            my $print = $makefileDir;
-            $print =~ s/^\Q$topdir\E\\//;
-            # They specified a moc file but we can't find a header that
-            # will generate this moc file. That's possible fatal!
-            print STDERR "Warning: No moc-able header file for $print/$mocname\n";
-        }
-    }
-
-    undef %mocFiles;
-    %mocFiles = %prunedMoc;
-}
-
-#-----------------------------------------------------------------------------
-
-# Finds the cpp files (If they exist).
-# The cpp files get appended to the header file separated by \035
-sub checkMocCandidates ()
-{
-    my @cppFiles = ();
-
-    foreach $mocFile (keys (%mocFiles))
-    {
-        # Find corresponding c++ files that includes the moc file
-        @cppFiles =
-            `grep -l "^#include[ ]*.$mocFile\.moc." $cppExt 2> /dev/null`;
-
-        if (@cppFiles == 1)
-        {
-            chomp $cppFiles[0];
-            $mocFiles{$mocFile} .= "\035" . $cppFiles[0];
-	    push(@deped, $mocFile);
-            next;
-        }
-
-        if (@cppFiles == 0)
-        {
-            push (@newObs, $mocFile);           # Produce new object file
-            next    if ($haveAutomocTag);       # This is expected...
-            # But this is an error we can deal with - let them know
-            print STDERR
-                "Warning: No c++ file that includes $mocFile.moc\n";
-            next;
-        }
-        else
-        {
-            # We can't decide which file to use, so it's fatal. Although as a
-            # guess we could use the mocFile.cpp file if it's in the list???
-            print STDERR
-                "Error: Multiple c++ files that include $mocFile.moc\n";
-            print STDERR "\t",join ("\t", @cppFiles),"\n";
-            $errorflag = 1;
-            delete $mocFiles{$mocFile};
-            # Let's continue and see what happens - They have been told!
-        }
-    }
-}
-
-#-----------------------------------------------------------------------------
-
-# Add the rules for generating moc source from header files
-# For Automoc output *.moc.cpp but normally we'll output *.moc
-# (We must compile *.moc.cpp separately. *.moc files are included
-# in the appropriate *.cpp file by the programmer)
-sub addMocRules ()
-{
-    my $cppFile;
-    my $hFile;
-    my $cleanMoc = "";
-
-    foreach $mocFile (keys (%mocFiles))
-    {
-        undef $cppFile;
-        ($dir, $hFile, $cppFile) =  split ("\035", $mocFiles{$mocFile}, 3);
-        $dir =~ s#^\.#\$(srcdir)#;
-        if (defined ($cppFile))
-        {
-            appendLines ("\$(srcdir)/$cppFile: $mocFile.moc\n$mocFile.moc: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile.moc\n");
-            $cleanMoc .= " $mocFile.moc";
-        }
-        else
-        {
-            appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile$mocExt\n");
-            $cleanMoc .= " $mocFile$mocExt";
-        }
-    }
-	
-    if ($cleanMoc) {
-      # Always add dist clean tag
-      # Add extra *.moc.cpp files created for USE_AUTOMOC because they
-      # aren't included in the normal *.moc clean rules.
-      appendLines ("$cleantarget-metasources:\n\t-rm -f $cleanMoc\n");
-      $target_adds{"$cleantarget-am"} .= "$cleantarget-metasources ";
-    }
-  }
-
-#-----------------------------------------------------------------------------
-
-sub updateMakefile ()
-{
-    open (FILEOUT, "> $makefile")
-                        || die "Could not create $makefile: $!\n";
-
-    print FILEOUT "\# $progId - " . '$Revision$ '  . "\n";
-    $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
-    print FILEOUT $MakefileData;
-    close FILEOUT;
-}
-
-#-----------------------------------------------------------------------------
-
-# The given line needs to be removed from the makefile
-# Do this by adding the special "removed line" comment at the line start.
-sub removeLine ($$)
-{
-    my ($lookup, $old) = @_;
-
-    $old =~ s/\034/\\\n#>- /g;          # Fix continuation lines
-    $MakefileData =~ s/\n$lookup/\n#>\- $old/;
-}
-
-#-----------------------------------------------------------------------------
-
-# Replaces the old line with the new line
-# old line(s) are retained but tagged as removed. The new line(s) have the
-# "added" tag placed before it.
-sub substituteLine ($$)
-{
-    my ($lookup, $new) = @_;
-
-    if ($MakefileData =~ /\n($lookup)/) {
-      $old = $1;
-      $old =~ s/\034/\\\n#>\- /g;         # Fix continuation lines
-      $new =~ s/\034/\\\n/g;
-      my $newCount = 1;
-      $newCount++  while ($new =~ /\n/g);
-
-      $MakefileData =~ s/\n$lookup/\n#>- $old\n#>\+ $newCount\n$new/;
-    } else {
-      print STDERR "Warning: substitution of \"$lookup\" in $printname failed\n";
-    }
-}
-
-#-----------------------------------------------------------------------------
-
-# Slap new lines on the back of the file.
-sub appendLines ($)
-{
-    my ($new) = @_;
-
-    $new =~ s/\034/\\\n/g;        # Fix continuation lines
-    my $newCount = 1;
-    $newCount++  while ($new =~ /\n/g);
-
-    $MakefileData .= "\n#>\+ $newCount\n$new";
-}
-
-#-----------------------------------------------------------------------------
-
-# Restore the Makefile.in to the state it was before we fiddled with it
-sub restoreMakefile ()
-{
-    $MakefileData =~ s/# $progId[^\n\034]*[\n\034]*//g;
-    # Restore removed lines
-    $MakefileData =~ s/([\n\034])#>\- /$1/g;
-    # Remove added lines
-    while ($MakefileData =~ /[\n\034]#>\+ ([^\n\034]*)/)
-    {
-        my $newCount = $1;
-        my $removeLines = "";
-        while ($newCount--) {
-            $removeLines .= "[^\n\034]*([\n\034]|)";
-        }
-        $MakefileData =~ s/[\n\034]#>\+.*[\n\034]$removeLines/\n/;
-    }
-}
-
-#-----------------------------------------------------------------------------
diff --git a/bin/auto_run_tests.pl b/bin/auto_run_tests.pl
index af7edf90721..7eecf4a1c4c 100755
--- a/bin/auto_run_tests.pl
+++ b/bin/auto_run_tests.pl
@@ -8,6 +8,9 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # auto_run_tests.lst.
 
 use lib "$ENV{ACE_ROOT}/bin";
+if (defined $ENV{srcdir}) {
+  use lib "$ENV{srcdir}/bin";
+}
 use PerlACE::Run_Test;
 
 use English;
@@ -60,8 +63,8 @@ push (@file_list, "/bin/tao_other_tests.lst");
 
 if (scalar(@file_list) == 0) {
 push (@file_list, "/bin/ace_tests.lst");
-push (@file_list, "/bin/tao_orb_tests.lst");
-push (@file_list, "/bin/tao_other_tests.lst");
+push (@file_list, "/bin/tao_orb_tests.lst") if -d "$ACE_ROOT/TAO";
+push (@file_list, "/bin/tao_other_tests.lst") if -d "$ACE_ROOT/TAO";
 }
 
 foreach my$test_lst (@file_list) {
diff --git a/bin/clone.cpp b/bin/clone.cpp
deleted file mode 100644
index d05d65a1a3c..00000000000
--- a/bin/clone.cpp
+++ /dev/null
@@ -1,982 +0,0 @@
-// $Id$
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_dirent.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (bin,
-           clone,
-           "$Id$")
-
-#if 0
-#if defined (USG)
-#define lstat stat
-#else
-extern "C" char *getwd (char *);
-#define getcwd(str,len) (getwd(str))
-#endif
-#endif
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN      1024
-#endif
-
-#ifndef BLKDEV_IOSIZE
-#define BLKDEV_IOSIZE   1024
-#endif
-
-#ifndef linux
-extern char *sys_errlist[];
-#endif
-static void clone (char* s_path, char* d_path, int sroot_flag, int level);
-
-static char *pname;
-static int errors = 0;
-
-static char* src_path = 0;
-static char* dst_path = 0;
-
-static int quiet_flag = 0;
-static int verbose_flag = 0;
-static int force_flag = 0;
-#ifndef USG
-static int symlink_flag = 0;
-#endif
-static int copy_flag = 0;
-static int sccs_flag = 0;
-
-static void
-usage (void)
-{
-#ifdef USG
-  fprintf (stderr, "%s: usage: '%s [-q][-v][-f][-c] pathname1 pathname2'\n", pname, pname);
-#else
-  fprintf (stderr, "%s: usage: '%s [-q][-v][-f][-S][-c | -s | -S] pathname1 pathname2'\n", pname, pname);
-#endif
-  exit (1);
-}
-
-/* abspath(): return the absolutized pathname for the given relative
-   pathname.  Note that if that pathname is already absolute, it may
-   still be returned in a modified form because this routine also
-   eliminates redundant slashes and single dots and eliminates double
-   dots to get a shortest possible pathname from the given input
-   pathname.  The absolutization of relative pathnames is made by
-   assuming that the given pathname is to be taken as relative to the
-   first argument (cwd) or to the current directory if cwd is null.  */
-
-static char *
-abspath (char *cwd, char *rel_pathname)
-{
-  static char cwd_buffer[MAXPATHLEN + 1];
-  char abs_buffer[MAXPATHLEN + 1];
-  register char *endp;
-  register char *p;
-  register char *inp = abs_buffer;
-  register char *outp = abs_buffer;
-
-  /* Setup the current working directory as needed.  */
-
-  if (!cwd)
-    {
-      if (!cwd_buffer[0])
-        getcwd (cwd_buffer, MAXPATHLEN);
-      cwd = cwd_buffer;
-    }
-  else if (*cwd != '/')
-    abort ();                   /* base path must be absolute */
-
-  /* Copy the  pathname (possibly preceeded by the current working
-     directory name) into the absolutization buffer.  */
-
-  endp = abs_buffer;
-  if (rel_pathname[0] != '/')
-    {
-      p = cwd;
-      while (*endp++ = *p++)
-        continue;
-      *(endp-1) = '/';                  /* overwrite null */
-    }
-  p = rel_pathname;
-  while (*endp++ = *p++)
-    continue;
-  if (endp[-1] == '/')
-    *endp = (char) 0;
-
-  /* Now make a copy of abs_buffer into abs_buffer, shortening the
-     pathname (by taking out slashes and dots) as we go.  */
-
-  *outp++ = *inp++;             /* copy first slash */
-  for (;;)
-    {
-      if (!inp[0])
-        break;
-      else if (inp[0] == '/' && outp[-1] == '/')
-        {
-          inp++;
-          continue;
-        }
-      else if (inp[0] == '.' && outp[-1] == '/')
-        {
-          if (!inp[1])
-            break;
-          else if (inp[1] == '/')
-            {
-              inp += 2;
-              continue;
-            }
-          else if ((inp[1] == '.') && (inp[2] == 0 || inp[2] == '/'))
-            {
-              inp += (inp[2] == '/') ? 3 : 2;
-              outp -= 2;
-              while (outp >= abs_buffer && *outp != '/')
-                outp--;
-              if (outp < abs_buffer)
-                {
-                  /* Catch cases like /.. where we try to backup to a
-                     point above the absolute root of the logical file
-                     system.  */
-
-                  fprintf (stderr, "%s: fatal: invalid pathname: %s\n",
-                    pname, rel_pathname);
-                  exit (1);
-                }
-              *++outp = (char) 0;
-              continue;
-            }
-        }
-      *outp++ = *inp++;
-    }
-
-  /* On exit, make sure that there is a trailing null, and make sure that
-     the last character of the returned string is *not* a slash.  */
-
-  *outp = (char) 0;
-  if (outp[-1] == '/')
-    *--outp  = (char) 0;
-
-  /* Make a copy (in the heap) of the stuff left in the absolutization
-     buffer and return a pointer to the copy.  */
-
-  return strcpy ((char *) malloc (outp - abs_buffer + 1), abs_buffer);
-}
-
-static char*
-path_concat (const char* s1, const char* s2)
-{
-  int s1_len;
-  char* ret_val = (char *) malloc ((s1_len = strlen (s1)) + strlen (s2) + 2);
-
-  strcpy (ret_val, s1);
-  ret_val[s1_len] = '/';
-  strcpy (&ret_val[s1_len+1], s2);
-  return ret_val;
-}
-
-/* Decide if the given path (which may be relative to . or absolute) designa
-tes
-   a point within the original "src_path" directory, and return non-zero if
-it
-   does, or zero otherwise.  */
-
-static int
-in_original_tree (char* other_path)
-{
-  char* abs_src_path = abspath (NULL, src_path);
-  char* abs_src_path_slash = path_concat (abs_src_path, "");
-  char* abs_other_path = abspath (NULL, other_path);
-  int ret_val =  !strncmp (abs_src_path_slash, abs_other_path, strlen (abs_src_path_slash));
-
-  free (abs_src_path);
-  free (abs_src_path_slash);
-  free (abs_other_path);
-  return ret_val;
-}
-
-static void
-fix_mode (int new_mode, char* d_path)
-{
-  if (chmod (d_path, new_mode))
-    {
-      if (!quiet_flag)
-        fprintf (stderr, "%s: warning: can't chmod on output entity %s: %s\n",
-          pname, d_path, sys_errlist[errno]);
-    }
-}
-
-static int
-remove_item (char* s_path, char* d_path)
-{
-  struct stat dst_stat_buf;
-  DIR* dirp;
-  char containing_dir[MAXPATHLEN + 1];
-
-  if (lstat (d_path, &dst_stat_buf) == -1)
-    {
-      if (!quiet_flag)
-        fprintf (stderr, "%s: error: cannot get status of %s: %s\n",
-          pname, d_path, sys_errlist[errno]);
-      return -1;
-    }
-
-  /* Before wasting a lot of time sniffing at the thing we are trying to
-     delete, first make sure that we have write permission into the
-     directory that contains this thing.  Otherwise, it is all a waste
-     of time.  */
-
-  if (*d_path == '/')
-    strcpy(containing_dir, d_path);
-  else
-    {
-      containing_dir[0] = '.';
-      containing_dir[1] = '/';
-      strcpy(containing_dir+2, d_path);
-    }
-  *(strrchr (containing_dir, '/')) = '\0';
-  if (containing_dir[0] == '\0')
-    {
-      containing_dir[0] = '/';
-      containing_dir[1] = '\0';
-    }
-  if (access (containing_dir, W_OK))
-    {
-      if (!quiet_flag)
-        fprintf (stderr, "%s: error: don't have write access to %s: %s\n",
-          pname, containing_dir, sys_errlist[errno]);
-      return -1;
-    }
-
-  switch (dst_stat_buf.st_mode & S_IFMT)
-    {
-      case  S_IFDIR:
-        if (access (d_path, R_OK) != 0)
-          {
-            if (!quiet_flag)
-              fprintf (stderr, "%s: error: don't have read permission for directory %s\n",
-                pname, d_path);
-            return -1;
-          }
-        if (access (d_path, X_OK) != 0)
-          {
-            if (!quiet_flag)
-              fprintf (stderr,
-                "%s: error: don't have search permission for directory %s\n",
-                pname, d_path);
-            return -1;
-          }
-        if (access (d_path, W_OK) != 0)
-          {
-            if (!quiet_flag)
-              fprintf (stderr,
-                "%s: error: don't have write permission for directory %s\n",
-                pname, d_path);
-            return -1;
-          }
-        if ((dirp = opendir (d_path)) == NULL)
-          {
-            if (!quiet_flag)
-              fprintf (stderr,
-                "%s: error: can't open directory %s for reading: %s\n",
-                pname, d_path, sys_errlist[errno]);
-            return -1;
-          }
-        for (;;)
-          {
-            struct dirent* dir_entry_p;
-            char* new_s_path;
-            char* new_d_path;
-
-            if ((dir_entry_p = readdir (dirp)) == NULL)
-              break;
-            if (!strcmp (dir_entry_p->d_name, "."))
-              continue;
-            if (!strcmp (dir_entry_p->d_name, ".."))
-              continue;
-            new_s_path = path_concat (s_path, dir_entry_p->d_name);
-            new_d_path = path_concat (d_path, dir_entry_p->d_name);
-            if (remove_item (new_s_path, new_d_path))
-              {
-                closedir (dirp);
-                return -1;
-              }
-            free (new_s_path);
-            free (new_d_path);
-          }
-        closedir (dirp);
-        if (rmdir (d_path))
-          {
-            if (!quiet_flag)
-              fprintf (stderr, "%s: error: can't delete existing directory %s: %s\n",
-                pname, d_path, sys_errlist[errno]);
-            return -1;
-          }
-        if (!quiet_flag)
-          fprintf (stderr, "%s: removed directory %s\n",
-            pname, d_path);
-        break;
-
-      /* Note that symbolic links can be treated just like normal files
-         when the time comes for deleting them.  Unlinking a symbolic link
-         just deletes the link and *not* the thing it points to.  */
-
-      default:
-        if (unlink (d_path))
-          {
-            if (!quiet_flag)
-              fprintf (stderr, "%s: error: can't delete existing file %s: %s\n",
-                pname, d_path, sys_errlist[errno]);
-            return -1;
-          }
-        if (!quiet_flag)
-          fprintf (stderr, "%s: removed file %s\n",
-            pname, d_path);
-        break;
-    }
-  return 0;
-}
-
-#ifndef USG
-static void
-mk_symbolic_link (const char *s_path,
-                  const char *d_path,
-                  int level)
-{
-  int result = 0;
-
-  if (s_path[0] == '/' || level < 2)
-    result = symlink (s_path, d_path);
-  else
-    {
-      int len;
-      char *new_s_path = (char *) malloc (len = strlen(s_path) + 3 * level);
-      int i;
-      char *cp = new_s_path;
-
-      for (i = 0; i < level-1; i++)
-        {
-          strcpy (cp, "../");
-          cp += 3;
-        }
-      strcpy (cp, s_path);
-      result = symlink (new_s_path, d_path);
-    }
-  if (result)
-    {
-      if (!quiet_flag)
-        fprintf (stderr, "%s: error: can't symlink %s to %s: %s\n",
-                 pname, s_path, d_path, sys_errlist[errno]);
-    }
-  else
-    {
-      if (verbose_flag)
-        fprintf (stderr, "%s: created symlink %s -> %s\n",
-                 pname, d_path, s_path);
-    }
-}
-#endif
-
-static void
-mk_hard_link (char *s_path, char *d_path)
-{
-  if (link (s_path, d_path))
-    {
-      if (!quiet_flag)
-        fprintf (stderr, "%s: error: can't link %s to %s: %s\n",
-          pname, s_path, d_path, sys_errlist[errno]);
-    }
-  else
-    {
-      if (verbose_flag)
-        fprintf (stderr, "%s: created hard link %s = %s\n",
-          pname, d_path, s_path);
-    }
-}
-
-static void
-copy_file (char *s_path, char *d_path)
-{
-  int input, output;
-  struct stat src_stat_buf;
-
-  if (lstat (s_path, &src_stat_buf) == -1)
-    {
-      if (!quiet_flag)
-        {
-          fprintf (stderr, "%s: error: can't get status of %s: %s\n",
-            pname, s_path, sys_errlist[errno]);
-          fprintf (stderr, "%s: input entity %s will be ignored\n",
-            pname, s_path);
-        }
-      return;
-    }
-
-  if ((input = open (s_path, O_RDONLY, 0)) == -1)
-    {
-      if (!quiet_flag)
-        {
-          fprintf (stderr, "%s: error: can't open input file %s: %s\n",
-            pname, d_path, sys_errlist[errno]);
-          fprintf (stderr, "%s: input file %s will be ignored\n",
-            pname, s_path);
-        }
-        return;
-    }
-
-  if ((output = open (d_path, O_CREAT | O_WRONLY, src_stat_buf.st_mode & 07777)) == -1)
-    {
-      if (!quiet_flag)
-        {
-          fprintf (stderr, "%s: error: can't create output file %s: %s\n",
-            pname, d_path, sys_errlist[errno]);
-          fprintf (stderr, "%s: input file %s will be ignored\n",
-            pname, s_path);
-        }
-        return;
-    }
-
-  for (;;)
-    {
-      int rlen, wlen;
-      char block_buf[BLKDEV_IOSIZE];
-
-      if ((rlen = read (input, block_buf, BLKDEV_IOSIZE)) == -1)
-        {
-          if (!quiet_flag)
-            {
-              fprintf (stderr, "%s: error: bad read from input file %s: %s\n",
-                pname, s_path, sys_errlist[errno]);
-              fprintf (stderr, "%s: input file %s was not fully copied\n",
-                pname, s_path);
-            }
-          break;
-        }
-
-    if (rlen == 0)
-      break;
-
-    if ((wlen = write (output, block_buf, rlen)) == -1 || wlen != rlen)
-      {
-        if (!quiet_flag)
-          {
-            fprintf (stderr, "%s: error: bad write to output file %s: %s\n",
-              pname, s_path, sys_errlist[errno]);
-            fprintf (stderr, "%s: input file %s not fully copied\n",
-              pname, s_path);
-          }
-        break;
-      }
-    }
-
-  close (output);
-  close (input);
-
-  fix_mode (src_stat_buf.st_mode & 07777, d_path);
-
-  if (verbose_flag)
-    fprintf (stderr, "%s: created file copy %s = %s\n",
-      pname, d_path, s_path);
-}
-
-static void
-symlink_SCCS (char* s_path, char* d_path)
-{
-  struct stat dst_stat_buf;
-  char symlink_buf[MAXPATHLEN + 1];
-  int count;
-
-  if (access (d_path, F_OK))                    /* Does d_path exit? */
-    {
-      if (errno != ENOENT)
-        {
-          if (!quiet_flag)
-            {
-              fprintf (stderr, "%s: error: can't check accessability of %s: %s\n",
-                pname, d_path, sys_errlist[errno]);
-              fprintf (stderr, "%s: input %s will be ignored\n",
-                pname, s_path);
-            }
-          return;
-        }
-    }
-  else                                          /* d_path exists.  What is it? */
-    {
-      if (lstat (d_path, &dst_stat_buf) == -1)
-        {
-          if (!quiet_flag)
-            {
-              fprintf (stderr, "%s: error: unable to get status of %s: %s\n",
-                pname, d_path, sys_errlist[errno]);
-              fprintf (stderr, "%s: input %s will be ignored\n",
-                pname, s_path);
-            }
-          return;
-        }
-
-      if (S_ISLNK(dst_stat_buf.st_mode))        /* d_path is a symbolic link */
-        {
-          if ((count = readlink (d_path, symlink_buf, MAXPATHLEN)) == -1)
-            {
-              fprintf (stderr, "%s: error: can't read symlink %s: %s\n",
-                pname, d_path, sys_errlist[errno]);
-              fprintf (stderr, "%s: input file %s will be ignored\n",
-                pname, s_path);
-              return;
-            }
-          symlink_buf[count] = '\0';
-
-          if (!strcmp(s_path, symlink_buf))     /* symlink = s_path. Done */
-            {
-              return;
-            }
-          else                                  /* symlink != s_path */
-            {
-              if (force_flag)
-                {
-                  if (remove_item (s_path, d_path) != 0)
-                    return;
-                }
-              else
-                {
-                  if (!quiet_flag)
-                    {
-                      fprintf (stderr, "%s: error: Symbolic link %s already exists \
-                        but does not point to %s\n",
-                        pname, d_path, s_path);
-                      fprintf (stderr, "%s: input s %s will be ignored\n",
-                        pname, s_path);
-                    }
-                  return;
-                }
-            }
-        }
-      else                                      /* d_path is NOT a symbolic link */
-        {
-          if (force_flag)
-            {
-              if (remove_item (s_path, d_path))
-                return;
-            }
-          else
-            {
-              if (!quiet_flag)
-                {
-                  fprintf (stderr, "%s: error: output already exists: %s\n",
-                    pname, d_path);
-                  fprintf (stderr, "%s: input %s will be ignored\n",
-                    pname, s_path);
-                }
-              return;
-            }
-        }
-    }
-
-  if (symlink (s_path, d_path))
-    {
-      if (!quiet_flag)
-        fprintf (stderr, "%s: error: can't symlink %s to %s: %s\n",
-          pname, s_path, d_path, sys_errlist[errno]);
-    }
-  else
-    {
-      if (verbose_flag)
-        fprintf (stderr, "%s: created symlink %s -> %s\n",
-        pname, d_path, s_path);
-    }
-}
-
-static void
-clone_dir (char* s_path, char* d_path, int level)
-{
-  DIR* dirp;
-
-  if (access (s_path, R_OK) != 0)
-    {
-      if (!quiet_flag)
-        {
-          fprintf (stderr,
-            "%s: error: don't have read permission for input directory %s\n"
-,
-            pname, s_path);
-          fprintf (stderr, "%s: input directory %s will be ignored\n",
-            pname, s_path);
-         }
-        return;
-    }
-
-  if (access (s_path, X_OK) != 0)
-    {
-      if (!quiet_flag)
-        {
-           fprintf (stderr,
-             "%s: error: don't have search permission for input directory %s\n",
-             pname, s_path);
-           fprintf (stderr, "%s: input directory %s will be ignored\n",
-             pname, s_path);
-         }
-       return;
-    }
-
-  if ((dirp = opendir (s_path)) == NULL)
-    {
-      if (!quiet_flag)
-        {
-          fprintf (stderr, "%s: error: can't open directory %s for reading: %s\n",
-            pname, s_path, sys_errlist[errno]);
-          fprintf (stderr, "%s: input directory %s will be ignored\n",
-            pname, s_path);
-        }
-      return;
-    }
-
-  for (;;)
-    {
-      struct dirent* dir_entry_p;
-      char* new_s_path;
-      char* new_d_path;
-
-      if ((dir_entry_p = readdir (dirp)) == NULL)
-        break;
-      if (!strcmp (dir_entry_p->d_name, "."))
-        continue;
-      if (!strcmp (dir_entry_p->d_name, ".."))
-        continue;
-
-      new_s_path = path_concat (s_path, dir_entry_p->d_name);
-      new_d_path = path_concat (d_path, dir_entry_p->d_name);
-
-      if (sccs_flag && !strcmp (dir_entry_p->d_name, "SCCS"))
-        symlink_SCCS(new_s_path, new_d_path);
-      else
-        clone (new_s_path, new_d_path, 0, level+1);
-
-      free (new_s_path);
-      free (new_d_path);
-    }
-
-  closedir (dirp);
-}
-
-static void
-clone_symbolic_link (char* s_path,char* d_path)
-{
-  char symlink_buf[MAXPATHLEN + 1];
-  int count;
-
-  if ((count = readlink (s_path, symlink_buf, MAXPATHLEN)) == -1)
-    {
-      fprintf (stderr, "%s: error: can't read symlink %s: %s\n",
-        pname, s_path, sys_errlist[errno]);
-      fprintf (stderr, "%s: input file %s will be ignored\n",
-        pname, s_path);
-      return;
-    }
-  symlink_buf[count] = '\0';
-
-  if (symlink_buf[0] == '/')            /* symlink is absolute */
-    {
-      if (in_original_tree (symlink_buf))
-        {
-           if (!quiet_flag)
-             fprintf (stderr,
-               "%s: warning: absolute symlink points into source tree %s -> %s\n",
-               pname, s_path, symlink_buf);
-        }
-    }
-  else                                  /* symlink is relative */
-    {
-      char* src_root_relative = path_concat (s_path, symlink_buf);
-      int in_orig = in_original_tree (src_root_relative);
-
-      free (src_root_relative);
-      if (!in_orig)
-        {
-          if (!quiet_flag)
-            fprintf (stderr,
-              "%s: warning: relative symlink points out of source tree %s -> %s\n",
-              pname, s_path, symlink_buf);
-        }
-    }
-
-  mk_symbolic_link(symlink_buf, d_path, 0); /* Make an identical symlink.  */
-}
-
-
-/* clone: clone the item designated by s_path as the new item d_path.  */
-
-#define IS_DIR(STAT_BUF) (((STAT_BUF).st_mode & S_IFMT) == S_IFDIR)
-
-static void
-clone (char* s_path, char* d_path, int sroot_flag, int level)
-{
-  struct stat src_stat_buf;
-  struct stat dst_stat_buf;
-  int dir_already_exists = 0;
-  const char* intype = "file";
-
-  if (lstat (s_path, &src_stat_buf) == -1)
-    {
-      if (!quiet_flag)
-        {
-          fprintf (stderr, "%s: error: can't get status of %s: %s\n",
-            pname, s_path, sys_errlist[errno]);
-          fprintf (stderr, "%s: input entity %s will be ignored\n",
-            pname, s_path);
-        }
-      return;
-    }
-  if (sccs_flag && sroot_flag && S_ISLNK (src_stat_buf.st_mode))
-    {
-
-      /* If root of the source path is a symbolic link and
-         SCCS cloning is enabled, clone the target of the link */
-
-      if (stat(s_path, &src_stat_buf) == -1)
-        {
-          if (!quiet_flag)
-            {
-              fprintf (stderr, "%s: error: can't get status of %s: %s\n",
-                pname, s_path, sys_errlist[errno]);
-              fprintf (stderr, "%s: input entity %s will be ignored\n",
-                pname, s_path);
-            }
-          return;
-        }
-    }
-  if (IS_DIR (src_stat_buf))
-    intype = "directory";
-  if (access (d_path, 0))
-    {
-      if (errno != ENOENT)
-        {
-          if (!quiet_flag)
-            {
-              fprintf (stderr, "%s: error: can't check accessability of %s: %s\n",
-                pname, d_path, sys_errlist[errno]);
-              fprintf (stderr, "%s: input %s %s will be ignored\n",
-                pname, intype, s_path);
-            }
-          return;
-        }
-    }
-  else
-    {
-      const char* outtype = "file";
-
-      if (lstat (d_path, &dst_stat_buf) == -1)
-        {
-          if (!quiet_flag)
-            {
-              fprintf (stderr, "%s: error: unable to get status of %s: %s\n"
-,
-                pname, d_path, sys_errlist[errno]);
-              fprintf (stderr, "%s: input %s %s will be ignored\n",
-                pname, intype, s_path);
-            }
-          return;
-        }
-      if (IS_DIR (dst_stat_buf))
-        outtype = "directory";
-      if (IS_DIR (src_stat_buf) && IS_DIR (dst_stat_buf))
-        {
-          dir_already_exists = -1;
-
-          /* Have to make sure that we have full access to the output
-             directory (at least temporarily).  */
-
-          chmod (d_path, (dst_stat_buf.st_mode & 07777) | 0700);
-          if (access (d_path, R_OK | W_OK | X_OK) != 0)
-            {
-              if (!quiet_flag)
-                {
-                  fprintf (stderr,
-                    "%s: error: too few permissions for existing directory %s\n",
-                    pname, d_path);
-                  fprintf (stderr, "%s: input directory %s will be ignored\n",
-                    pname, s_path);
-                }
-              return;
-            }
-        }
-      else
-        {
-          if (force_flag)
-            {
-              if (remove_item (s_path, d_path))
-                return;
-            }
-          else
-            {
-              if (!quiet_flag)
-                {
-                  fprintf (stderr, "%s: error: output %s already exists: %s\n",
-                    pname, outtype, d_path);
-                  fprintf (stderr, "%s: input %s %s will be ignored\n",
-                    pname, intype, s_path);
-                }
-              return;
-            }
-        }
-    }
-
-  switch (src_stat_buf.st_mode & S_IFMT)
-    {
-      case  S_IFDIR:                            /* Clone a directory */
-
-        if (!dir_already_exists)
-          {
-            /* Don't let others sneak in.
-               Only we can write the new directory (for now).  */
-
-            if (mkdir (d_path, 0700))
-              {
-                if (!quiet_flag)
-                  {
-                    fprintf (stderr, "%s: error: can't create output directory %s: %s\n",
-                      pname, d_path, sys_errlist[errno]);
-                    fprintf (stderr, "%s: input directory %s will be ignored\n",
-                      pname, s_path);
-                  }
-                return;
-              }
-            if (verbose_flag)
-              fprintf (stderr, "%s: created new output directory: %s\n",
-                pname, d_path);
-          }
-
-        clone_dir(s_path, d_path, level);
-
-        /* By default, output directories which existed before this
-           program was executed are reset back to their original
-           permissions (when we are done adding things to them).  For
-           output directories which are actually created by this program
-           however, these have their permissions set so that they are
-           essentially the same as the permissions for their corresponding
-           input directories, except that the owner is given full
-           permissions.  */
-
-        if (dir_already_exists)
-          fix_mode (dst_stat_buf.st_mode & 07777, d_path);
-        else
-          fix_mode ((src_stat_buf.st_mode & 07777) | 0700, d_path);
-        break;
-
-#ifndef USG
-      case S_IFLNK:                             /* Clone a symbolic link */
-
-        if (!sccs_flag)
-          clone_symbolic_link (s_path, d_path);
-        break;
-#endif
-
-      default:                                  /* Clone a normal file */
-
-        if (sccs_flag)
-          break;
-
-#ifndef USG
-        if (symlink_flag)
-          mk_symbolic_link(s_path, d_path, level);
-        else
-#endif
-        if (copy_flag)
-          copy_file(s_path, d_path);
-        else
-          mk_hard_link(s_path, d_path);
-
-        break;
-    } /* switch */
-}
-
-int
-main (int /* argc */, char *argv[])
-{
-  char **argn;
-
-  pname = (pname = strrchr (argv[0], '/')) ? pname+1 : argv[0];
-  for (argn = argv+1; *argn; argn++)
-    {
-      if (**argn != '-')
-        {
-          if (!src_path)
-            src_path = *argn;
-          else if (!dst_path)
-            dst_path = *argn;
-          else
-            usage ();
-        }
-      else
-        {
-          switch (* ((*argn)+1))
-            {
-              case 0:
-                fprintf (stderr, "%s: invalid option: -\n", pname);
-                errors = -1;
-                break;
-
-              case 'q':
-                quiet_flag = -1;
-                break;
-
-              case 'v':
-                verbose_flag = -1;
-                break;
-
-              case 'f':
-                force_flag = -1;
-                break;
-
-#ifndef USG
-              case 'S':
-                sccs_flag = -1;
-
-                if (copy_flag)
-                  errors++;
-                break;
-#endif
-
-#ifndef USG
-              case 's':
-                symlink_flag = -1;
-                if (copy_flag)
-                  errors++;
-                break;
-#endif
-
-              case 'c':
-                copy_flag = -1;
-#ifndef USG
-                if (symlink_flag)
-                  errors++;
-
-                if (sccs_flag)
-                  errors++;
-#endif
-                break;
-
-              default:
-                fprintf (stderr, "%s: invalid option: -%c\n",
-                        pname, *((*argn)+1));
-                errors = -1;
-            }
-        }
-    }
-  if (errors || src_path == 0 || dst_path == 0)
-    usage ();
-#if 0 // ndef USG
-  if (symlink_flag && *src_path != '/')
-    {
-      fprintf (stderr, "%s: error: source root pathname must be absolute when using -s\n",
-        pname);
-      exit (1);
-    }
-#endif
-  if (access (src_path, 0) == -1)
-    {
-      fprintf (stderr, "%s: error: accessing source root entity %s: %s\n",
-        pname, src_path, sys_errlist[errno]);
-      exit (1);
-    }
-  umask (0);                    /* disable all masking */
-  clone (src_path, dst_path, 1, 0);
-  return 0;
-}
diff --git a/bin/depgen.pl b/bin/depgen.pl
index a856f8d698d..aa7c921d7bf 100755
--- a/bin/depgen.pl
+++ b/bin/depgen.pl
@@ -16,6 +16,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 use strict;
 use Cwd;
 use Config;
+use File::Spec;
 use File::Basename;
 
 if ( $^O eq 'VMS' ) {
@@ -178,7 +179,9 @@ sub setReplace {
   if (defined $name) {
     ## The key will be used in a regular expression.
     ## So, we need to escape some special characters.
+    $name = File::Spec->canonpath($name);
     $name =~ s/([\+\-\\\$\[\]\(\)\.])/\\$1/g;
+
     $$replace{$name} = $value;
   }
 }
@@ -209,7 +212,7 @@ for(my $i = 0; $i <= $#ARGV; ++$i) {
     $macros{$1} = $3;
   }
   elsif ($arg =~ /^\-I(.*)/) {
-    push(@ipaths, $1);
+    push(@ipaths, File::Spec->canonpath($1));
   }
   elsif ($arg eq '-A') {
     setReplace(\%replace, $ENV{ACE_ROOT}, '$(ACE_ROOT)');
diff --git a/bin/dsp2dsp.pl b/bin/dsp2dsp.pl
deleted file mode 100755
index 962127a8f11..00000000000
--- a/bin/dsp2dsp.pl
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id$
-#
-# File: dsp2dsp.pl
-# Description: This perl script is used to "create" new dsp files
-#              by modifying an existing dsp file.
-# Requirement: perl for Win32.
-# Usage: perl dsp2dsp.pl Basic_Types_Test Atomic_Op_Test
-#        This will create Atomic_Op_Test.dsp by using
-#        Basic_Types_Test.dsp as a template.
-#
-# Author: Nanbor Wang <nanbor@cs.wustl.edu>
-
-die "$0 requires two arguments.\n" if $#ARGV < 1;
-$TOFILE="$ARGV[1].dsp" ;
-die "$TOFILE already exists.  Remove it first.\n" if -e $TOFILE;
-
-$FROM = $ARGV[0];
-$TO = $ARGV[1];
-
-open (FROM, "<$FROM.dsp");
-open (TO, ">$TO.dsp");
-
-while (<FROM>)
-{
-    s/$FROM/$TO/g;
-    print TO ;
-}
-
-close (TO);
diff --git a/bin/envinfo.cpp b/bin/envinfo.cpp
index ff05e328f48..7a727d08818 100644
--- a/bin/envinfo.cpp
+++ b/bin/envinfo.cpp
@@ -1,28 +1,39 @@
 // $Id$
 
 #include "ace/ACE.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_main.h"
+#include "ace/OS_NS_sys_utsname.h"
 
 ACE_RCSID(bin, envinfo, "$Id$")
 
 int
-main (int, ACE_TCHAR *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  cerr << "ACE: "
-       << ACE::major_version() << "."
-       << ACE::minor_version() << "."
-       << ACE::beta_version() << "\n";
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("ACE: %u.%u.%u\n"),
+              ACE::major_version(),
+              ACE::minor_version(),
+              ACE::beta_version()));
 
   ACE_utsname uname;
   ACE_OS::uname(&uname);
-  cerr << "OS: "
-       << uname.sysname << " "
-       << uname.release << "\n";
+#if defined (ACE_LACKS_UTSNAME_T)
+  ACE_DEBUG ((LM_INFO,
+              ACE_TEXT ("OS: %s %s\n"),
+              uname.sysname,
+              uname.release));
+#else
+  ACE_DEBUG ((LM_INFO,
+              ACE_TEXT ("OS: %C %C\n"),
+              uname.sysname,
+              uname.release));
+#endif
 
-  cerr << "Compiler: "
-       << ACE::compiler_name() << " "
-       << ACE::compiler_major_version() << "."
-       << ACE::compiler_minor_version() << "."
-       << ACE::compiler_beta_version() << "\n";
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("Compiler: %s %u.%u\n"),
+              ACE::compiler_name(),
+              ACE::compiler_major_version(),
+              ACE::compiler_minor_version(),
+              ACE::compiler_beta_version()));
 
   return 0;
 }
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index 31969e73652..5ed6cb93d5e 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -126,7 +126,7 @@ sub store_file ($)
     elsif ($name =~ /\.(mpc|mwc|mpb|mpt)/i) {
         push @files_mpc, ($name);
     }
-    elsif ($name =~ /\.(icc|ncb|opt)$/i) {
+    elsif ($name =~ /\.(icc|ncb|opt|zip)$/i) {
         push @files_noncvs, ($name);
     }
 }
@@ -210,6 +210,36 @@ sub check_for_id_string ()
     }
 }
 
+# check for _MSC_VER >= 1200
+sub check_for_msc_ver_string ()
+{
+    print "Running _MSC_VER check\n";
+    foreach $file (@files_cpp, @files_inl, @files_h) {
+        my $found = 0;
+        if (open (FILE, $file)) {
+            my $disable = 0;
+            print "Looking at file $file\n" if $opt_d;
+            while (<FILE>) {
+                if (/FUZZ\: disable check_for_msc_ver/) {
+                    $disable = 1;
+                }
+                if (/FUZZ\: enable check_for_msc_ver/) {
+                    $disable = 0;
+                }
+                if ($disable == 0 and /\_MSC_VER \>= 1200/) {
+                    $found = 1;
+                }
+            }
+            close (FILE);
+            if ($found == 1) {
+               print_error ("Incorrect _MSC_VER >= 1200 found in $file");
+            }
+        }
+        else {
+            print STDERR "Error: Could not open $file\n";
+        }
+    }
+}
 
 # This test checks for the newline at the end of a file
 sub check_for_newline ()
@@ -461,6 +491,36 @@ sub check_for_preprocessor_comments ()
     }
 }
 
+# We should not have empty inline files in the repo
+sub check_for_empty_inline_files ()
+{
+    print "Running empty inline files test\n";
+    foreach $file (@files_inl) {
+        my $found_non_empty_line = 0;
+        my $idl_generated = 0;
+        if (open (FILE, $file)) {
+            print "Looking at file $file\n" if $opt_d;
+            while (<FILE>) {
+              if (m/TAO and the TAO IDL Compiler have been developed by/) {# skip IDL generated files
+                $idl_generated = 1;
+                last;}
+              next if /^[:blank:]*$/; # skip empty lines
+              next if /^[:blank:]*\/\//; # skip C++ comments
+              $found_non_empty_line = 1;
+              last;
+            }
+            close (FILE);
+            if ($found_non_empty_line == 0 and $idl_generated == 0) {
+             print_error ("File $file is empty and should not be in the "
+                         ."repository");
+            }
+        }
+        else {
+            print STDERR "Error: Could not open $file\n";
+        }
+    }
+}
+
 
 # This test checks for the use of the Win32 Unicode string defines
 # or outdated ASYS_* macros
@@ -618,10 +678,10 @@ sub check_for_pre_and_post ()
                         print_error ("post.h missing \"/**/\" in $file");
                         ++$post;
                     }
-                    if (/^\s*#\s*include\s*/**/\s*\"ace\/pre\.h\"/) {
+                    if (/^\s*#\s*include\s*\/\*\*\/\s*\"ace\/pre\.h\"/) {
                         ++$pre;
                     }
-                    if (/^\s*#\s*include\s*/**/\s*\"ace\/post\.h\"/) {
+                    if (/^\s*#\s*include\s*\/\*\*\/\s*\"ace\/post\.h\"/) {
                         ++$post;
                     }
                 }
@@ -686,7 +746,7 @@ sub check_for_mismatched_filename ()
             my $disable = 0;
             print "Looking at file $file\n" if $opt_d;
             while (<FILE>) {
-                if (m/\@file\s*([^\s]*)/){
+                if (m/\@file\s*([^\s]+)/){
                     # $file includes complete path, $1 is the name after
                     # @file. We must strip the complete path from $file.
                     # we do that using the basename function from
@@ -1157,8 +1217,8 @@ sub check_for_non_bool_operators ()
                 if ($found_bool == 0
                     && (/[^\w]bool\s*$/
                         || /^bool\s*$/
-                        || /\sbool\s\w/
-                        || /^bool\s\w/
+                        || /\sbool\s+\w/
+                        || /^bool\s+\w/
                         || /[^\w]return\s*$/))
                   {
                     $found_bool = 1;
@@ -1193,7 +1253,7 @@ sub check_for_non_bool_operators ()
     }
 }
 
-# This test verifies that all filenames are short enough 
+# This test verifies that all filenames are short enough
 
 sub check_for_long_file_names ()
 {
@@ -1201,21 +1261,21 @@ sub check_for_long_file_names ()
     my $max_mpc_filename = $max_filename - 20;
     print "Running file names check\n";
 
-    foreach $file (@files_cpp, @files_inl, @files_h, @files_html, 
-                   @files_dsp, @files_dsw, @files_gnu, @files_idl, 
-                   @files_pl, @files_changelog, @files_makefile, 
+    foreach $file (@files_cpp, @files_inl, @files_h, @files_html,
+                   @files_dsp, @files_dsw, @files_gnu, @files_idl,
+                   @files_pl, @files_changelog, @files_makefile,
                    @files_bor ) {
-        if ( length( basename($file) ) >= $max_filename ) 
+        if ( length( basename($file) ) >= $max_filename )
         {
             print_error ("File name $file exceeds $max_filename chars.");
         }
     }
     foreach $file (@files_mpc) {
-        if ( length( basename($file) ) >= $max_mpc_filename ) 
+        if ( length( basename($file) ) >= $max_mpc_filename )
         {
             print_warning ("File name $file exceeds $max_mpc_filename chars.");
         }
-  
+
     }
 }
 
@@ -1289,6 +1349,8 @@ if ($opt_t) {
 print "--------------------Configuration: Fuzz - Level ",$opt_l,
       "--------------------\n";
 
+check_for_empty_inline_files () if ($opt_l >= 1);
+check_for_msc_ver_string () if ($opt_l >= 6);
 check_for_noncvs_files () if ($opt_l >= 1);
 check_for_streams_include () if ($opt_l >= 6);
 check_for_dependency_file () if ($opt_l >= 1);
diff --git a/bin/generate_doxygen.pl b/bin/generate_doxygen.pl
index 00e462d4392..83739efaea0 100755
--- a/bin/generate_doxygen.pl
+++ b/bin/generate_doxygen.pl
@@ -14,6 +14,7 @@ require File::Path;
 $is_release = 0;
 $exclude_ace = 0;
 $exclude_tao = 0;
+$exclude_ciao = 0;
 $verbose = 0;
 $perl_path = '/usr/bin/perl';
 $dot_path = '/usr/local/bin';
@@ -46,14 +47,13 @@ $dot_path = '/usr/local/bin';
              ,'tao_costrader'
              ,'tao_portablegroup'
              ,'tao_pss'
-             ,'tao_ifr'
-             ,'ciao_assembly_deployer'
+             ,'tao_ifr');
+@CIAO_DOCS = ('ciao_assembly_deployer'
              ,'ciao_componentserver'
-	     ,'ciao_daemon'
-	     ,'ciao_serveractivator'
-	     ,'ciao_xml_helpers'
-	     ,'ciao'
-	     );
+	       ,'ciao_daemon'
+	       ,'ciao_serveractivator'
+  	       ,'ciao_xml_helpers'
+	       ,'ciao');
 
 # Modify defaults using the command line arguments
 &parse_args ();
@@ -63,8 +63,9 @@ open(CONFIG_H, ">ace/config.h")
 print CONFIG_H "#include \"ace/config-doxygen.h\"\n";
 close (CONFIG_H);
 
-&generate_doxy_files ('ACE',     'VERSION', @ACE_DOCS) if (!$exclude_ace);
-&generate_doxy_files ('TAO', 'TAO/VERSION', @TAO_DOCS) if (!$exclude_tao);
+&generate_doxy_files ('ACE',          'VERSION', @ACE_DOCS) if (!$exclude_ace);
+&generate_doxy_files ('TAO',      'TAO/VERSION', @TAO_DOCS) if (!$exclude_tao);
+&generate_doxy_files ('CIAO','TAO/CIAO/VERSION', @CIAO_DOCS) if (!$exclude_ciao);
 
 unlink "ace/config.h";
 
@@ -81,6 +82,8 @@ sub parse_args {
       $exclude_ace = 1;
     } elsif ($ARGV[0] eq "-exclude_tao") {
       $exclude_tao = 1;
+    } elsif ($ARGV[0] eq "-exclude_ciao") {
+      $exclude_ciao = 1;
     } elsif ($ARGV[0] eq "-verbose") {
       $verbose = 1;
     } elsif ($ARGV[0] eq "-perl_path" && $#ARGV >= 1) {
diff --git a/bin/generate_export_file.pl b/bin/generate_export_file.pl
index 846181a9ead..a2d42cb2c39 100755
--- a/bin/generate_export_file.pl
+++ b/bin/generate_export_file.pl
@@ -16,30 +16,31 @@ use Getopt::Std;
 $flags = join (" ", @ARGV);
 
 if (!getopts ('df:hs') || $opt_h) {
-    print "generate_export_file.pl [-d] [-f dependency] [-s] library_name\n";
-    print "\n";
-    print "    -d         Turn on debug mode\n";
-    print "    -f         Adds a dependency to another *_HAS_DLL macro\n";
-    print "    -s         Add in ACE_AS_STATIC_LIBS check\n";
-    print "\n";
-    print "generate_export_file creates the *_export files that are used\n";
-    print "in exporting of symbols for DLLs (and not exporting them when\n";
-    print "the library is static).  If library_name is something like\n";
-    print "\"Foo\", then the file will contain definitions for Foo_Export\n";
-    print "and FOO_SINGLETON_DECLARE, etc. which will be controlled by\n";
-    print "FOO_HAS_DLL, etc.\n";
+    print STDERR
+          "generate_export_file.pl [-d] [-f dependency] [-s] library_name\n",
+          "\n",
+          "    -d         Turn on debug mode\n",
+          "    -f         Adds a dependency to another *_HAS_DLL macro\n",
+          "    -s         Add in ACE_AS_STATIC_LIBS check\n",
+          "\n",
+          "generate_export_file creates the *_export files that are used\n",
+          "in exporting of symbols for DLLs (and not exporting them when\n",
+          "the library is static).  If library_name is something like\n",
+          "\"Foo\", then the file will contain definitions for Foo_Export\n",
+          "and FOO_SINGLETON_DECLARE, etc. which will be controlled by\n",
+          "FOO_HAS_DLL, etc.\n";
     exit (1);
 }
 
 if (defined $opt_d) {
-    print "Debugging Turned on\n";
+    print STDERR "Debugging Turned on\n";
 
     if (defined $opt_f) {
-        print "Dependency to $opt_f\n";
+        print STDERR "Dependency to $opt_f\n";
     }
 
     if (defined $opt_s) {
-        print "ACE_AS_STATIC_LIBS turned on\n";
+        print STDERR "ACE_AS_STATIC_LIBS turned on\n";
     }
 }
 
diff --git a/bin/generate_rel_manpages b/bin/generate_rel_manpages
index 00940dd5587..7e5827a51f8 100755
--- a/bin/generate_rel_manpages
+++ b/bin/generate_rel_manpages
@@ -30,7 +30,7 @@ my $dot_path = '/usr/bin';
 
 my  $doxy_path = '/usr/bin';
 
-my $doxy_version = '1.3.7';
+my $doxy_version = '1.3.9.1';
 
 &can_run($doxy_path.'/doxygen --version | grep '.$doxy_version.' >/dev/null') ||
   die "$0: doxygen path or version incorrect, please fix the script\n";
diff --git a/bin/make_release b/bin/make_release
index 8ac8d9b01c3..91de333e0d9 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -92,7 +92,7 @@ my $controlled_files = my $release_files = my $release_lib_files = '';
 my $release_tag_files = my $release_autoconf_files = '';
 my $release_filter = '\\( -name CVS -o -name build \\) -prune -o ' .
                      '! -name \'.\#*\' ! -name \'\#*\' ! -name \'*~\' ' .
-                     '! -name \'*.MAK\' -print';
+                     '! -name \'*.MAK\' ! -name \'.cvsignore\' -print';
 my $update_versions = 0;
 my $create_zips = 1;
 
@@ -210,6 +210,9 @@ unless ("$release_tag_files") {
 &ex ("$touch  $export_dir/DON")  &&
  die "$0: Write failures in $export_dir, access problems..\n";
 
+&ex ("$touch  $old_versions_dir/DON")  &&
+ die "$0: Write failures in $old_versions_dir, access problems..\n";
+
 my $ace_root = $ENV{'ACE_ROOT'};
 
 &ex ("$touch  $ace_root/MPC/DON")  &&
@@ -221,6 +224,9 @@ my $ace_root = $ENV{'ACE_ROOT'};
 &ex ("$rm -r $export_dir/DON $export_dir/*.gz $export_dir/*.zip $export_dir/*.bz2")  &&
  die "$0: failed to remove files in $export_dir\n";
 
+&ex ("$rm -r $old_versions_dir/DON")  &&
+ die "$0: failed to remove file in $old_versions_dir\n";
+
 ########
 ######## Setup signal handlers.
 ########
@@ -287,7 +293,7 @@ if ($update_versions  &&  "$kit" ne 'ace+tao+ciao') {
     chdir "ACE_wrappers"  ||  die "$0: unable to chdir ACE_wrappers\n";
     &ex ("$cvs -q export -r$tao_tag -kv TAO > /dev/null")  &&
       die "$0: failed cvs export of $tao_tag in $stage_dir\n";
-    &ex ("cd TAO  &&  $make INSTALL")  &&
+    &ex ("cd TAO  &&  $make TAO-INSTALL")  &&
       die "$0: failed make INSTALL in " .
           "$stage_dir/ACE_wrappers/TAO\n";
   }
@@ -296,6 +302,9 @@ if ($update_versions  &&  "$kit" ne 'ace+tao+ciao') {
     chdir "TAO"  ||  die "$0: unable to chdir ACE_wrappers/TAO\n";
     &ex ("$cvs -q export -r$ciao_tag -kv CIAO > /dev/null")  &&
       die "$0: failed cvs export of $ciao_tag in $stage_dir\n";
+    &ex ("cd CIAO  &&  $make CIAO-INSTALL")  &&
+      die "$0: failed make INSTALL in " .
+          "$stage_dir/ACE_wrappers/TAO\n";
   }
 
   chdir "../../";
@@ -322,7 +331,7 @@ if ($update_versions  &&  "$kit" ne 'ace+tao+ciao') {
           my $previous_beta = $beta_v - 1;
           $previous_version = "$major_v.$minor_v.$previous_beta";
 
-          &diff ('ACE_wrappers', "ACE-$previous_version", "$ace_tag");
+####          &diff ('ACE_wrappers', "ACE-$previous_version", "$ace_tag");
         }
       }
     }
@@ -341,7 +350,7 @@ if ($update_versions  &&  "$kit" ne 'ace+tao+ciao') {
           my $previous_beta = $beta_v - 1;
           $previous_version = "$major_v.$minor_v.$previous_beta";
 
-          &diff ('ACE_wrappers/TAO', "TAO-$previous_version", "$tao_tag");
+####          &diff ('ACE_wrappers/TAO', "TAO-$previous_version", "$tao_tag");
         }
       }
     }
@@ -561,9 +570,9 @@ sub update_version_files () {
     if ("$exec_prefix") {
       print "CIAO version ${major_version}.${minor_version}.${beta_version}\n";
     } else {
-      &ex ("perl -pi -e 's/version =.*/version = $version/' " .
-           "../../bin/MakeProjectCreator/config/ciaoversion.mpb");
-      return 1 if $? >> 8;
+###     &ex ("perl -pi -e 's/version =.*/version = $version/' " .
+###           "../../bin/MakeProjectCreator/config/ciaoversion.mpb");
+###      return 1 if $? >> 8;
 
       open (CIAO_VERSION_H, "> ciao/Version.h")  ||
         die "$0: unable to open ciao/Version.h\n";
@@ -588,9 +597,9 @@ sub update_version_files () {
     if ("$exec_prefix") {
       print "TAO version ${major_version}.${minor_version}.${beta_version}\n";
     } else {
-      &ex ("perl -pi -e 's/version =.*/version = $version/' " .
-           "../bin/MakeProjectCreator/config/taoversion.mpb");
-      return 1 if $? >> 8;
+###      &ex ("perl -pi -e 's/version =.*/version = $version/' " .
+###         "../bin/MakeProjectCreator/config/taoversion.mpb");
+###      return 1 if $? >> 8;
 
       open (TAO_VERSION_H, "> tao/Version.h")  ||
         die "$0: unable to open tao/Version.h\n";
@@ -611,9 +620,9 @@ sub update_version_files () {
     if ("$exec_prefix") {
       print "ACE version ${major_version}.${minor_version}.${beta_version}\n";
     } else {
-      &ex ("perl -pi -e 's/version =.*/version = $version/' " .
-           "bin/MakeProjectCreator/config/aceversion.mpb");
-      return 1 if $? >> 8;
+##      &ex ("perl -pi -e 's/version =.*/version = $version/' " .
+##           "bin/MakeProjectCreator/config/aceversion.mpb");
+##      return 1 if $? >> 8;
 
       open (ACE_VERSION_H, "> ace/Version.h")  ||
         die "$0: unable to open ace/Version.h\n";
@@ -667,17 +676,13 @@ sub update_changelog () {
     || return 1;
 
   my $version_h = '';
-  my $version_mpb = '';
 
   if ($KIT eq 'ACE') {
       $version_h = 'ace/Version.h';
-      $version_mpb = 'bin/MakeProjectCreator/config/aceversion.mpb';
   } elsif ($KIT eq 'TAO') {
       $version_h = 'TAO/tao/Version.h';
-      $version_mpb = 'bin/MakeProjectCreator/config/taoversion.mpb';
   } elsif ($KIT eq 'CIAO') {
       $version_h = 'TAO/CIAO/ciao/Version.h';
-      $version_mpb = 'bin/MakeProjectCreator/config/ciaoversion.mpb';
   }
 
 # Incase you are wondering what is all this about. We are trying to
@@ -688,19 +693,19 @@ sub update_changelog () {
 
   if ($KIT eq 'TAO') {
   &ex ("cd ..; $cvs commit -m'$version' " .
-      "TAO/VERSION TAO/PROBLEM-REPORT-FORM TAO/ChangeLog $version_h $version_mpb && " .
-      "chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb; " .
-      "chgrp 1213 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb");
+      "TAO/VERSION TAO/PROBLEM-REPORT-FORM TAO/ChangeLog $version_h && " .
+      "chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h; " .
+      "chgrp 1213 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h");
   } elsif ($KIT eq 'CIAO') {
   &ex ("cd ../../; $cvs commit -m'$version' " .
-       "TAO/CIAO/VERSION TAO/CIAO/PROBLEM-REPORT-FORM TAO/CIAO/ChangeLog $version_h $version_mpb && " .
-       "chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb; " .
-       "chgrp 1213 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb");
+       "TAO/CIAO/VERSION TAO/CIAO/PROBLEM-REPORT-FORM TAO/CIAO/ChangeLog $version_h && " .
+       "chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h; " .
+       "chgrp 1213 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h");
   } else {
   &ex ("$cvs commit -m'$version' " .
-       "VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb &&" .
-       "chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb; " .
-       "chgrp 1213 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb");
+       "VERSION PROBLEM-REPORT-FORM ChangeLog $version_h &&" .
+       "chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h; " .
+       "chgrp 1213 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h");
   }
 
   return 1 if $? >> 8;
@@ -778,14 +783,15 @@ sub generate_makefiles () {
     # Need todo a common chmod on the file lists!
     my $here = Cwd::getcwd();
 
-    my $exclude_option = '-exclude TAO/TAOACE.mwc,TAO/CIAO/CIAOTAO.mwc';
+    print "My current wok in generate makefiles $here \n";
+    my $exclude_option = '-exclude ASNMP/asnmp.mwc,TAO/TAOACE.mwc,TAO/CIAO/CIAOTAO.mwc';
     my $tmp_mpc_option =
         '-recurse -hierarchy -relative ACE_ROOT=';
 
     my $mpc_option = $tmp_mpc_option.$here.'/ACE_wrappers';
 
     my $tmp_static_option =
-        '-static -name_modifier *_Static -apply_project -exclude TAO/CIAO,TAO/TAOACE.mwc ';
+        '-static -name_modifier *_Static -apply_project -exclude ASNMP/asnmp.mwc,TAO/CIAO,TAO/TAOACE.mwc ';
 
     my $static_option = $tmp_static_option.$mpc_option;
 
@@ -796,6 +802,8 @@ sub generate_makefiles () {
         "// \$Id\$\n" .
         "// This is an automatically generated file.\n\n" .
         "ssl=1\n" .
+        "fl_reactor=1\n" .
+        "xt_reactor=1\n" .
         "cidl=1\n" .
         "sctp=1\n";
 
@@ -873,7 +881,7 @@ sub create_kit () {
   # These files don't get LF->CRLF conversions done when making the zip.
   my $bin_files =
     "\"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\|\\.ico\|\\.gz\|\\.zip\|" .
-    "\\.gif|\\.vcp|\\.vcproj|\\.vcw|\\.sln\|\\.dfm\|\\.jpg\"";
+    "\\.gif|\\.vcp|\\.vcproj|\\.vcw|\\.sln\|\\.dfm\|\\.jpg\|\\.png\|\\.vsd\|\\.bz2\"";
 
   my $build_command;
   my $archives;
@@ -927,6 +935,12 @@ sub create_kit () {
   if ($kit eq 'ace+tao' || $kit eq 'ace+tao+ciao') {
       # Set the relese files once again
     my $tmp_rel_file = '';
+      $status = &bootstrap_autotools ();
+
+      if ($status != 0) {
+          die "$0: failed to bootstrap autotools\n";
+      }
+
     chomp ($tmp_rel_file = `$regmake -f ACE_wrappers/TAO/Release show_release_files`);
     $release_files = $base_release_files;
     $release_files .= ' ';
@@ -971,14 +985,9 @@ sub create_kit () {
         if ($status != 0) {
             die "$0: failed to generate em3 files\n";
         }
-      $status = &bootstrap_autotools ();
-
-      if ($status != 0) {
-          die "$0: failed to bootstrap autotools\n";
-      }
 
       # Reset it again with autoconf files
-      chomp ($release_files = `$regmake -f ACE_wrappers/Release show_autoconf_release_files`);
+      chomp ($release_files = `$regmake -f ACE_wrappers/Release show_release_files`);
 
       $build_command =
         "$rm ACE.zip ACE-lib.zip; " .
diff --git a/bin/msvc_mpc_auto_compile.pl b/bin/msvc_mpc_auto_compile.pl
index f2daff0bd8f..725be0ae639 100755
--- a/bin/msvc_mpc_auto_compile.pl
+++ b/bin/msvc_mpc_auto_compile.pl
@@ -22,6 +22,7 @@ else {
 @ace_core_dirs = ("$ACE_ROOT\\ace",
                   "$ACE_ROOT\\Kokyu",
                   "$ACE_ROOT\\ACEXML",
+                  "$ACE_ROOT\\protocols",
                   "$ACE_ROOT\\examples",
                   "$ACE_ROOT\\tests");
 
@@ -273,20 +274,20 @@ while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^(-|\/)/ )
     elsif ($ARGV[0] =~ '-ACE') {# Build ACE and its tests
         print "Building ACE\n" if ( $verbose );
         $use_custom_dir = 1;
-	push @directories, @ace_core_dirs;
+        push @directories, @ace_core_dirs;
     }
     elsif ($ARGV[0] =~ '-TAO') {# Build TAO and its tests
         print "Building TAO\n" if ( $verbose );
         $use_custom_dir = 1;
-	push @directories, @ace_core_dirs;
-	push @directories, @tao_core_dirs;
+        push @directories, @ace_core_dirs;
+        push @directories, @tao_core_dirs;
     }
     elsif ($ARGV[0] =~ '-CIAO') {# Build the CIAO and related
                                  # libraries
         print "Building only CIAO\n" if ( $verbose );
         $use_custom_dir = 1;
         push @directories, @ace_core_dirs;
-	push @directories, @tao_core_dirs;
+        push @directories, @tao_core_dirs;
         push @directories, @ciao_core_dirs;
     }
     elsif ($ARGV[0] =~ '-ALL') {# Build the CIAO and related
diff --git a/bin/msvc_static_order.lst b/bin/msvc_static_order.lst
index d0dd91fb118..53c1b7c46f2 100644
--- a/bin/msvc_static_order.lst
+++ b/bin/msvc_static_order.lst
@@ -34,6 +34,9 @@ TAO/orbsvcs/orbsvcs/CosNaming_Serv
 TAO/orbsvcs/orbsvcs/CosNaming_Skel
 TAO/orbsvcs/orbsvcs/CosProperty
 TAO/orbsvcs/orbsvcs/CosTrading
+TAO/orbsvcs/orbsvcs/CosTrading_Serv
+TAO/orbsvcs/orbsvcs/CosTrading_Skel
+TAO/orbsvcs/orbsvcs/HTIOP
 TAO/orbsvcs/orbsvcs/AV
 TAO/orbsvcs/orbsvcs/ETCL
 TAO/orbsvcs/orbsvcs/RTCosScheduling
@@ -42,12 +45,16 @@ TAO/orbsvcs/orbsvcs/RTSched
 TAO/orbsvcs/orbsvcs/RTSchedEvent
 TAO/orbsvcs/orbsvcs/RTOLDEvent
 TAO/orbsvcs/orbsvcs/CosEvent
+TAO/orbsvcs/orbsvcs/CosEvent_Serv
+TAO/orbsvcs/orbsvcs/CosEvent_Skel
 TAO/orbsvcs/orbsvcs/RTKokyuEvent
 TAO/orbsvcs/orbsvcs/CosConcurrency
 TAO/orbsvcs/orbsvcs/CosLifeCycle
 TAO/orbsvcs/orbsvcs/CosTime
 TAO/orbsvcs/orbsvcs/CosNotification
 TAO/orbsvcs/orbsvcs/CosNotification_Skel
+TAO/orbsvcs/orbsvcs/CosNotification_Serv
+TAO/orbsvcs/orbsvcs/CosNotification_Persist
 TAO/orbsvcs/orbsvcs/DsLogAdmin
 TAO/orbsvcs/orbsvcs/DsEventLogAdmin
 TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin
@@ -61,7 +68,15 @@ TAO/orbsvcs/orbsvcs/CosLoadBalancing
 TAO/orbsvcs/orbsvcs/IFRService
 TAO/orbsvcs/orbsvcs/RTCORBAEvent
 TAO/orbsvcs/orbsvcs/RT_Notification
+TAO/orbsvcs/orbsvcs/Security
 TAO/orbsvcs/Naming_Service/Naming_Service
+TAO/orbsvcs/ImplRepo_Service/ImR_Activator_IDL
+TAO/orbsvcs/ImplRepo_Service/ImR_Locator_IDL
+TAO/orbsvcs/ImplRepo_Service/ImR_Activator
+TAO/orbsvcs/ImplRepo_Service/ImR_Activator_Service
+TAO/orbsvcs/ImplRepo_Service/ImR_Locator
+TAO/orbsvcs/ImplRepo_Service/ImR_Locator_Service
+TAO/orbsvcs/ImplRepo_Service/tao_imr
 TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Lib
 TAO/orbsvcs/orbsvcs/FTRT_ClientORB
 TAO/orbsvcs/tests/Event/lib/Event_Test_Lib
@@ -84,3 +99,4 @@ netsvcs/lib/netsvcs
 netsvcs/clients/Naming/Client/Netsvsc_Client_Test_Lib
 netsvcs/clients/Naming/Dump_Restore/Netsvcs_Dump_Restore_Lib
 websvcs/lib/websvcs
+protocols/ace/HTBP/HTBP
diff --git a/bin/tao_orb_tests.lst b/bin/tao_orb_tests.lst
index b4617dc690f..991d0ea7165 100644
--- a/bin/tao_orb_tests.lst
+++ b/bin/tao_orb_tests.lst
@@ -27,12 +27,12 @@ TAO/tests/Leader_Followers/run_test_mt.pl: !ST
 TAO/tests/Multiple_Inheritance/run_test.pl
 TAO/tests/Bug_1269_Regression/run_test.pl: !Win32 !MINIMUM
 TAO/tests/Bug_1495_Regression/run_test.pl: !MINIMUM !ST !DISABLE_INTERCEPTORS
-TAO/tests/Bug_1568_Regression/run_test.pl
-TAO/tests/Bug_1670_Regression/run_test.pl
+TAO/tests/Bug_1568_Regression/run_test.pl: !NO_MESSAGING
+TAO/tests/Bug_1670_Regression/run_test.pl: !NO_MESSAGING
 TAO/tests/Bug_1270_Regression/run_test.pl: !Win32 !MINIMUM
 TAO/tests/Bug_1020_Basic_Regression/run_test.pl: !Win32 !MINIMUM !ST
 TAO/tests/Bug_1020_Regression/run_test.pl: !MINIMUM !ST !Win32
-TAO/tests/Bug_1361_Regression/run_test.pl: !MINIMUM !ST !Win32
+TAO/tests/Bug_1361_Regression/run_test.pl: !MINIMUM !ST !Win32 !IRIX
 TAO/tests/Bug_1482_Regression/run_test.pl: !MINIMUM !ST
 TAO/tests/Bug_1551_Regression/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !ST
@@ -114,7 +114,7 @@ TAO/tests/Connection_Timeout/run_test.pl: !MINIMUM
 TAO/tests/MProfile_Connection_Timeout/run_test.pl: !MINIMUM
 TAO/tests/Codec/run_test.pl
 TAO/tests/Bug_1693_Test/run_test.pl
-TAO/tests/IDL_Test/run_test.pl
+TAO/tests/IDL_Test/run_test.pl: !NO_MESSAGING
 TAO/tests/ORB_init/run_test.pl
 TAO/tests/ORB_destroy/run_test.pl
 TAO/tests/ORB_shutdown/run_test.pl
@@ -161,3 +161,8 @@ TAO/tests/Two_Objects/run_test.pl: !ST
 TAO/tests/UNKNOWN_Exception/run_test.pl: Exceptions
 TAO/tests/Native_Exceptions/run_test.pl: Exceptions
 TAO/tests/Servant_To_Reference_Test/run_test.pl: !MINIMUM !ST
+TAO/tests/Sequence_Unit_Tests/run_test.pl
+TAO/tests/Typedef_String_Array/run_test.pl
+TAO/tests/Bug_1535_Regression/run_test.pl: !MINIMUM
+TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl
+TAO/tests/CodeSets/simple/run_test.pl : !GIOP10 !STATIC
diff --git a/bin/tao_other_tests.lst b/bin/tao_other_tests.lst
index f9fcc6fb19b..d71e4ec9729 100644
--- a/bin/tao_other_tests.lst
+++ b/bin/tao_other_tests.lst
@@ -1,3 +1,4 @@
+
 # $Id$
 #
 # This is the list of run_test.pl's that need to be run by
@@ -9,26 +10,27 @@
 #
 # NOTE: This file contains examples and other service level test  for
 # TAO's. Please do not include regular tests here.
-TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !MINIMUM !ST
-#TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl: !MINIMUM !ST !STATIC
-TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD
-TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000
-TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST
-TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST
-TAO/performance-tests/Latency/AMI/run_test.pl: !MINIMUM !ST
-TAO/performance-tests/Latency/DSI/run_test.pl: !MINIMUM
-TAO/performance-tests/Latency/DII/run_test.pl: !MINIMUM
-TAO/performance-tests/Latency/Deferred/run_test.pl: !MINIMUM
-TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl
-TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST
-TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST
-TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !ST
-TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM
-TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM
-TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM
-TAO/performance-tests/Throughput/run_test.pl
-TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl
-TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM
+TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !MINIMUM !ST !Win32
+#TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl: !MINIMUM !ST !STATIC !Win32
+TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32
+TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000: !Win32
+TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32
+TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32
+TAO/performance-tests/Latency/AMI/run_test.pl: !MINIMUM !ST !Win32
+TAO/performance-tests/Latency/DSI/run_test.pl: !MINIMUM !Win32
+TAO/performance-tests/Latency/DII/run_test.pl: !MINIMUM !Win32
+TAO/performance-tests/Latency/Deferred/run_test.pl: !MINIMUM !Win32
+TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32
+TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32
+TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32
+TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !ST !Win32
+TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !Win32
+TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !Win32
+TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !Win32
+TAO/performance-tests/Throughput/run_test.pl: !Win32
+TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32
+TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !Win32
+TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !STATIC !Win32
 TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM !SUNCC5_1
 TAO/examples/POA/POA_BiDir/run_test.pl: !MINIMUM !DISABLE_BIDIR
 TAO/examples/POA/DSI/run_test.pl: !MINIMUM
@@ -44,13 +46,13 @@ TAO/examples/POA/Loader/run_test.pl: !MINIMUM !STATIC !KCC_Linux
 TAO/examples/POA/RootPOA/run_test.pl
 TAO/examples/Simple/bank/run_test.pl: !NO_MESSAGING
 TAO/examples/Simple/grid/run_test.pl: !NO_MESSAGING
-TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING
-TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING
-TAO/examples/Quoter/run_test.pl: !MINIMUM
+TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING !Win32
+TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING !Win32
+TAO/examples/Quoter/run_test.pl: !MINIMUM !Win32
 TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !SUNCC5_1
 TAO/examples/PluggableUDP/tests/Basic/run_test.pl: !STATIC !ST !NO_DIOP
 TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl: !NO_DIOP
-TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM
+TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !Win32
 TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM
 TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP
 TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: !MINIMUM
@@ -64,6 +66,12 @@ TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !
 TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM
 TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM
 TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM
+TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl
+TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl: !MINIMUM
+TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl: !MINIMUM !NO_MESSAGING
+TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl: !MINIMUM
+TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl: !MINIMUM !NO_MESSAGING
+TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl
 TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING
 TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !NO_MESSAGING
 TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM
@@ -73,26 +81,35 @@ TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST !MINIMUM
 TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST !MINIMUM
 TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM
 TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !STATIC
+TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS
+TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS
 TAO/orbsvcs/tests/ImplRepo/run_test.pl: !MINIMUM
 TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: SANDBOX
+TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:  !MINIMUM
+TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl:  !MINIMUM
+TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl:  !MINIMUM
+TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl:  !MINIMUM
+TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl:  !MINIMUM
 TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !MINIMUM
-TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
-TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: !ST !NO_MESSAGING
-TAO/orbsvcs/tests/Notify/Lanes/run_test.pl: !ST !MINIMUM !STATIC
-TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl: !ST !MINIMUM
-TAO/orbsvcs/examples/Notify/Lanes/run_test.pl: !ST !MINIMUM
-TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl: !ST !MINIMUM
+TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl: !MINIMUM
+TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !STATIC !ST Exceptions
+TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: !NO_MESSAGING
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC !MINIMUM
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !STATIC !MINIMUM
+TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !IRIX
+TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl: !ST !NO_MESSAGING !MINIMUM
+TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl: !ST !NO_MESSAGING !MINIMUM
 # BREAKS !linux 'TAO/orbsvcs/tests/EC_Mcast/run_test.pl
 # FAILS 'TAO/orbsvcs/tests/EC_Multiple/run_test.pl
 # NO REDIRECTION TAO/examples/Simple/echo/run_test.pl < Echo.idl
@@ -105,7 +122,6 @@ TAO/orbsvcs/tests/Security/Callback/run_test.pl: SSL !STATIC
 TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: !ST SSL !STATIC
 TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: !ST SSL !STATIC
 TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl: SSL !STATIC
-TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl: SSL !STATIC
 TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl: SSL !STATIC
 TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !STATIC !SUNCC5_1
 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
@@ -115,6 +131,6 @@ TAO/tests/Two_Objects/run_test.pl: !ST
 TAO/examples/RTCORBA/Activity/run_test.pl: !MINIMUM !ST
 TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS  !STATIC !ST
 TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ST
-TAO/examples/ior_corbaloc/run_test.pl
-TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1
-
+TAO/examples/ior_corbaloc/run_test.pl: !NO_MESSAGING
+TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING
+TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: !NO_MESSAGING
diff --git a/configure.ac b/configure.ac
index a3448727f96..9867880a3d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,12 +428,6 @@ AS_IF([test "$ac_cv_header_dirent_dirent_h" = yes ||
 dnl Check for sys/wait.h Posix.1 compliance
 AC_HEADER_SYS_WAIT
 
-AS_IF([test "$ac_cv_cygwin" = yes],
-  [
-   AC_CHECK_HEADER([cygwin32/socket.h],
-                   [AC_DEFINE([ACE_HAS_CYGWIN32_SOCKET_H])],)
-  ],[])
-
 AC_CHECK_HEADER([dlfcn.h],
   [
    dnl We already checked for dlopen in the previous library checks however,
@@ -545,6 +539,8 @@ ACE_CHECK_LACKS_HEADERS(errno.h)
 
 ACE_CHECK_LACKS_HEADERS(fcntl.h)
 
+ACE_CHECK_HAS_HEADERS(pthread_np.h)
+
 ACE_CHECK_LACKS_HEADERS(search.h)
 
 ACE_CHECK_HAS_HEADERS(select.h)
@@ -609,6 +605,8 @@ ACE_CHECK_LACKS_HEADERS(time.h)
 
 ACE_CHECK_LACKS_HEADERS(termios.h)
 
+ACE_CHECK_LACKS_HEADERS(wctype.h)
+
 
 
 AC_CHECK_HEADER([sys/systeminfo.h],[],[])
@@ -657,17 +655,13 @@ AS_IF([test "$ace_has_xti_funcs" = yes],
      ],)
 
 dnl Check if XTI headers define TCP macros that conflict with netinet/tcp.h's
-   ACE_CACHE_CHECK([if TCP macros are defined in XTI headers],
+   ACE_CACHE_CHECK([if TCP macros in sys/xti.h conflict with netinet/tcp.h],
      [ace_cv_lib_has_conflicting_xti_macros],
      [
-      AC_EGREP_CPP([ACE_CONFLICTING_XTI_MACROS],
-        [
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#if defined (ACE_HAS_TIUSER_H) || defined (ACE_HAS_XTI)
+      ACE_CONVERT_WARNINGS_TO_ERRORS([
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #  if defined (ACE_HAS_XTI)
+#    include <sys/types.h>
 #    if defined (ACE_HAS_SYS_XTI_H)
 #      include /**/ <sys/xti.h>
 #    else
@@ -678,18 +672,17 @@ dnl Check if XTI headers define TCP macros that conflict with netinet/tcp.h's
 #      include /**/ <tiuser.h>
 #    endif
 #  endif /* ACE_HAS_XTI */
-#endif /* ACE_HAS_TIUSER_H || ACE_HAS_XTI */
-
-#if defined (TCP_NODELAY) || defined (TCP_MAXSEG)
-ACE_CONFLICTING_XTI_MACROS
-#endif  /* TCP_NODELAY || TCPMAXSEG  */
-        ],
-        [
-         ace_cv_lib_has_conflicting_xti_macros=yes
-        ],
-        [
+#  if !defined (ACE_LACKS_NETINET_TCP_H)
+#    include /**/ <netinet/tcp.h>
+#  endif /* !ACE_LACKS_NETIINET_TCP_H */
+        ]],[[
+         int a = 0;
+        ]])],[
          ace_cv_lib_has_conflicting_xti_macros=no
+        ],[
+         ace_cv_lib_has_conflicting_xti_macros=yes
         ])
+      ])
      ],
      [
       AC_DEFINE([ACE_HAS_CONFLICTING_XTI_MACROS])
@@ -1101,30 +1094,64 @@ dnl AC_CHECK_TYPE([off64_t],[long long])
 
 dnl Specific typedef checks
 dnl TODO: Check whether these typedefs can be defined somewhere else.
-ACE_CHECK_TYPE([idtype_t],[signal.h],[AC_DEFINE([ACE_HAS_IDTYPE_T])],)
+AC_CHECK_TYPE([idtype_t],
+	      [AC_DEFINE([ACE_HAS_IDTYPE_T], 1,
+			 [Define to 1 if the system has the type `idtype_t'.])],
+	      [],
+	      [#include <signal.h>])
+
+AC_CHECK_TYPE([key_t],
+	      [],
+	      [AC_DEFINE([ACE_LACKS_KEY_T], 1,
+			 [Define to 1 if the system lacks the type `key_t'.])],
+	      [#include <sys/types.h>])
+
 ACE_CHECK_TYPE([sem_t],[semaphore.h],,)
-ACE_CHECK_TYPE([key_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_KEY_T])])
-ACE_CHECK_TYPE([ssize_t],[sys/types.h],[AC_DEFINE([ACE_HAS_SSIZE_T])],)
-ACE_CHECK_TYPE([u_longlong_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_U_LONGLONG_T])])
-ACE_CHECK_TYPE([pri_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_PRI_T])])
+
+AC_CHECK_TYPE([pri_t],
+	      [],
+	      [AC_DEFINE([ACE_LACKS_PRI_T], 1,
+			 [Define to 1 if the system lacks the type 'pri_t'.])],
+	      [#include <sys/types.h>])
+
+AC_CHECK_TYPE([sig_atomic_t],
+	      [AC_DEFINE([ACE_HAS_SIG_ATOMIC_T], 1,
+			 [Define to 1 if the system has the type 'sig_atomic_t'.])],
+	      [],
+	      [#include <signal.h>])
+
+AC_CHECK_TYPE([ssize_t],
+	      [AC_DEFINE([ACE_HAS_SSIZE_T], 1,
+			 [Define to 1 if the system has the type `ssize_t'.])],
+	      [],
+	      [#include <sys/types.h>])
 
 dnl Some platforms define ucontext_t in <sys/ucontext.h>, but ACE
 dnl doesn't explicitly include that header.  However, it is very
 dnl likely that <signal.h> does, either directly or indirectly.
 AC_CHECK_TYPE([ucontext_t],
-	AC_DEFINE([ACE_HAS_UCONTEXT_T]),
-	,
-	[
-#include <signal.h>
+	      [AC_DEFINE([ACE_HAS_UCONTEXT_T], 1,
+			 [Define to 1 if the system has the type `ucontext_t'.])],
+	      [],
+[#include <signal.h>
 #ifndef ACE_LACKS_UCONTEXT_H
 # include <ucontext.h>
 #endif
 ])
 
-ACE_CHECK_TYPE([wchar_t],[wchar.h],,
-  [
-   ACE_CHECK_TYPE([wchar_t],[sys/types.h],,[AC_DEFINE([ACE_LACKS_WCHAR_T])])
-  ])
+AC_CHECK_TYPE([u_longlong_t],
+	      [],
+	      [AC_DEFINE([ACE_LACKS_U_LONGLONG_T], 1,
+			 [Define to 1 if the system lacks the type `u_long_long'.])],
+	      [#include <sys/types.h>])
+
+AC_CHECK_TYPE([wchar_t],
+	      [],
+	      [AC_DEFINE([ACE_LACKS_WCHAR_T], 1,
+			 [Define to 1 if the system lacks the type `wchar_t'.])],
+[#include <sys/types.h>
+#include <wchar.h>
+])
 
 ACE_CHECK_TYPE([socklen_t],[sys/socket.h],[AC_DEFINE([ACE_HAS_SOCKLEN_T])],
   [
@@ -1176,23 +1203,6 @@ ACE_CHECK_TYPE([socklen_t],[sys/socket.h],[AC_DEFINE([ACE_HAS_SOCKLEN_T])],
     ])
   ])
 
-dnl Check for sig_atomic_t
-ACE_CACHE_CHECK([for sig_atomic_t],
-    [ace_cv_lib_posix_defines_sig_atomic_t],[
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <signal.h>
-         ]],[[
-          sig_atomic_t sat;
-         ]])],[
-          ace_cv_lib_posix_defines_sig_atomic_t=yes
-         ],[
-          ace_cv_lib_posix_defines_sig_atomic_t=no
-         ])
-],[AC_DEFINE([ACE_HAS_SIG_ATOMIC_T])],)
-
 
 
 dnl SECTION 7: checks for structures
@@ -1258,28 +1268,25 @@ dnl structure we are testing for.
 
 dnl Thanks to Konstantinos Margaritis <kmargar@cc.uoa.gr> for pointing out
 dnl that struct siginfo_t may also be defined in signal.h
-ACE_CACHE_CHECK([for struct siginfo_t],[ace_cv_struct_siginfo_t],
-  [
-   dnl Since we are checking for siginfo_t in more than one header
-   dnl we can't use the ACE_CHECK_STRUCT macro so we have to do things
-   dnl manually.
-   ACE_TRY_COMPILE_STRUCT([siginfo_t],[siginfo.h],
-     [
-      ace_cv_struct_siginfo_t=yes
-     ],
-     [
-      ACE_TRY_COMPILE_STRUCT([siginfo_t],[signal.h],
-        [
-         ace_cv_struct_siginfo_t=yes
-        ],
-        [
-         ace_cv_struct_siginfo_t=no
-        ])
-     ])
-  ],
-  [
-   AC_DEFINE([ACE_HAS_SIGINFO_T])
-  ],)
+AC_CHECK_TYPE([siginfo_t],
+	      [AC_DEFINE([ACE_HAS_SIGINFO_T], 1,
+			 [Define to 1 if the system has the type `siginfo_t'.])],
+	      [],
+	      [#include <signal.h>
+#ifndef ACE_LACKS_SIGINFO_H
+#include <siginfo.h>
+#endif])
+
+if test "$ac_cv_type_siginfo_t" = yes; then
+  AC_CHECK_MEMBER([siginfo_t.si_addr],
+		  [],
+		  [AC_DEFINE([ACE_LACKS_SI_ADDR], 1,
+			     [Define to 1 if `si_addr' is not a member of `siginfo_t'.])],
+		  [#include <signal.h>
+#ifndef ACE_LACKS_SIGINFO_H
+#include <siginfo.h>
+#endif])
+fi
 
 dnl Some platforms need to include sys/types.h before sys/socket.h
 dnl in order for struct msghdr to work.
@@ -1701,54 +1708,60 @@ dnl If we get a size of zero, then the type is unknown to the compiler.
 dnl We don't need to check for sizeof(char) right now.  Also conflicts with
 dnl ACE definition in Basic_Types.h, so we leave the test out.
 if test "$cross_compiling" != yes; then
-  dnl AC_CHECK_SIZEOF([char],[1])
-  dnl if test "$ac_cv_sizeof_char" != "0"; then
-  dnl   AC_DEFINE([ACE_SIZEOF_CHAR],[SIZEOF_CHAR])
-  dnl fi
   AC_CHECK_SIZEOF([wchar_t])
   if test "$ac_cv_sizeof_wchar_t" != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_WCHAR],[$ac_cv_sizeof_wchar_t])
+    AC_DEFINE_UNQUOTED([ACE_SIZEOF_WCHAR],[$ac_cv_sizeof_wchar_t],
+		       [Size of the native "wchar_t" type])
   fi
   AC_CHECK_SIZEOF([short])
   if test "$ac_cv_sizeof_short" != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_SHORT],[$ac_cv_sizeof_short])
+    AC_DEFINE_UNQUOTED([ACE_SIZEOF_SHORT],[$ac_cv_sizeof_short],
+		       [Size of the native "short" type])
   fi
   AC_CHECK_SIZEOF([int])
   if test $ac_cv_sizeof_int != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_INT],[$ac_cv_sizeof_int])
+    AC_DEFINE_UNQUOTED([ACE_SIZEOF_INT],[$ac_cv_sizeof_int],
+		       [Size of the native "int" type])
   fi
   AC_CHECK_SIZEOF([long])
   if test $ac_cv_sizeof_long != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_LONG],[$ac_cv_sizeof_long])
+    AC_DEFINE_UNQUOTED([ACE_SIZEOF_LONG],[$ac_cv_sizeof_long],
+		       [Size of the native "long" type])
   fi
   AC_CHECK_SIZEOF([long long])
   if test $ac_cv_sizeof_long_long != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_LONG_LONG],[$ac_cv_sizeof_long_long])
+    AC_DEFINE_UNQUOTED([ACE_SIZEOF_LONG_LONG],[$ac_cv_sizeof_long_long],
+		       [Size of the native "long long" type])
   else
     AC_DEFINE([ACE_LACKS_LONGLONG_T])
   fi
   AC_CHECK_SIZEOF([void *])
   if test $ac_cv_sizeof_void_p != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_VOID_P],[$ac_cv_sizeof_void_p])
+    AC_DEFINE_UNQUOTED([ACE_SIZEOF_VOID_P],[$ac_cv_sizeof_void_p],
+		       [Size of the native "pointer to void" type])
   fi
   AC_CHECK_SIZEOF([float])
   if test $ac_cv_sizeof_float != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_FLOAT],[$ac_cv_sizeof_float])
+    AC_DEFINE_UNQUOTED([ACE_SIZEOF_FLOAT],[$ac_cv_sizeof_float],
+		       [Size of the native "float" type])
   else
     AC_DEFINE([ACE_LACKS_FLOATING_POINT])
   fi
   AC_CHECK_SIZEOF([double])
   if test $ac_cv_sizeof_double != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_DOUBLE],[$ac_cv_sizeof_double])
+    AC_DEFINE_UNQUOTED([ACE_SIZEOF_DOUBLE],[$ac_cv_sizeof_double],
+		       [Size of the native "double" type])
   else
     AC_DEFINE([ACE_LACKS_FLOATING_POINT])
   fi
   AC_CHECK_SIZEOF([long double])
   if test $ac_cv_sizeof_long_double != 0; then
-    AC_DEFINE_UNQUOTED([ACE_SIZEOF_LONG_DOUBLE],[$ac_cv_sizeof_long_double])
+    AC_DEFINE_UNQUOTED([ACE_SIZEOF_LONG_DOUBLE],[$ac_cv_sizeof_long_double],
+		       [Size of the native "long double" type])
   fi
 
-  dnl Set the 64 bit unsigned int typedef
+  dnl Set the 64 bit typedefs
+  ACE_INT64=""
   ACE_UINT64=""
   dnl if test "$ace_cv_type_u_longlong_t" = yes; then
   dnl This doesn't work:  AC_CHECK_SIZEOF([u_longlong_t],[8])
@@ -1758,9 +1771,11 @@ if test "$cross_compiling" != yes; then
   dnl   fi
   dnl elif test $ac_cv_sizeof_long = 8; then
   if test $ac_cv_sizeof_long = 8; then
+    ACE_INT64="signed long"
     ACE_UINT64="unsigned long"
     ace_u_long_long_typedef_set=yes
   elif test $ac_cv_sizeof_long_long = 8; then
+    ACE_INT64="signed long long"
     ACE_UINT64="unsigned long long"
     ace_u_long_long_typedef_set=yes
   else
@@ -1826,8 +1841,76 @@ cin >> b;
                   ])
   ],,[AC_DEFINE([ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS])])
 
-dnl Check if we have working C++ explicit template destructors
+dnl Check to see how to call the explicit destructor on a template.
+dnl There are a few different possibilities:
+dnl   ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR (two cases):
+dnl     ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS: ~CLASS<PARAM>()
+dnl     (no other settings): ~CLASS()
+dnl   w/o ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR:
+dnl     CLASS<PARAM>::~CLASS()
+dnl
+dnl The first seems to be the most widely used form, although very few
+dnl hand-made configs have it set. Many compilers take all three forms.
+dnl The only one that seems to be less-used is #2 above, ~CLASS().
+dnl So, we check for the first two cases, and if neither of them work,
+dnl we assume the third (no config macros).
+
+ACE_CACHE_CHECK([to see if template destructor call takes template args],
+  [ace_cv_feature_explicit_template_des_takes_args],
+  [
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+
+class dyn
+{
+ public:
+   dyn () { }
+   ~dyn () { }
+};
+
+template <class T>
+class Base
+{
+ public:
+   Base () { }
+   virtual void f (void) { }
+   ~Base () { }
+};
+
+template <class T>
+class Derived
+{
+ public:
+   Derived ()
+     {
+      x_ = new Base<T> ();
+     }
+   virtual void f (void) { }
+   ~Derived () { x_->~Base<T> (); }
+ private:
+   Base<T> *x_;
+   T t_;
+};
+                  ]],[[
+                   Derived<dyn> *x = new Derived<dyn> ();
+
+                   x->f ();
+
+                   delete x;
+                   return 0;
+                  ]])],[
+                   ace_cv_feature_explicit_template_des_takes_args=yes
+                  ],[
+                   ace_cv_feature_explicit_template_des_takes_args=no
+                  ])
+  ],[
+      AC_DEFINE([ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS])
+      AC_DEFINE([ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR])
+    ],
+)
+
+dnl Check for the second form of C++ explicit template destructors
 dnl Thanks to Nanbor Wang <nanbor@cs.wustl.edu> for providing this test.
+if test "$ace_cv_feature_explicit_template_des_takes_args" = no; then
 ACE_CACHE_CHECK([for working C++ explicit template destructors],
   [ace_cv_feature_working_explicit_des],
   [
@@ -1876,6 +1959,7 @@ class Derived
                    ace_cv_feature_working_explicit_des=no
                   ])
   ],[AC_DEFINE([ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR])],)
+fi
 
 dnl Check for working C++ conversions
 ACE_CACHE_CHECK([for working C++ conversions],
@@ -2134,15 +2218,11 @@ ACE_CACHE_CHECK([for C++ typename keyword],
                      public:
                        typedef typename T::Y Y;
                        Foo(T* foo) : foo_(foo) {}
-                       void bilbo(typename T::Y y);
+                       void bilbo(typename T::Y y)
+                         { typename T::Y x(10); }
                      private:
                        T* foo_;
                      };
-
-                     template <class T>
-                     void Foo<T>::bilbo(typename T::Y y)
-                     {
-                     }
                    ]],[[
                      Bar bar(15);
                      Foo<Bar> foo(&bar);
@@ -3194,6 +3274,10 @@ ACE_CHECK_LACKS_FUNCS(fgetwc fcntl fsync)
 
 ACE_CHECK_LACKS_FUNCS(gethostent)
 
+ACE_CHECK_LACKS_FUNCS(getipnodebyaddr)
+
+ACE_CHECK_LACKS_FUNCS(getipnodebyname)
+
 ACE_CHECK_HAS_FUNCS(getifaddrs)
 
 ACE_CHECK_HAS_FUNCS(itoa)
@@ -3202,10 +3286,6 @@ ACE_CHECK_LACKS_FUNCS(qsort)
 
 ACE_CHECK_HAS_FUNCS(strnlen)
 
-ACE_CHECK_LACKS_FUNCS(strchr)
-
-ACE_CHECK_LACKS_FUNCS(strcspn)
-
 ACE_CHECK_LACKS_FUNCS(strerror)
 
 ACE_CHECK_LACKS_FUNCS(strpbrk)
@@ -3218,7 +3298,54 @@ ACE_CHECK_LACKS_FUNCS(strtol)
 
 ACE_CHECK_LACKS_FUNCS(strtoul)
 
-ACE_CHECK_LACKS_FUNCS(swab)
+# swab() comes in a number of forms:
+#   swab (const void*, void*, ssize_t) is POSIX, XPG4, SUS, SUSv2 standard.
+#   swab (const char*, char*, ssize_t) is SVID third edition.
+#   swab (char*, char*, ssize_t) is on some odd platforms like Windows.
+# So, if swab() is available, figure out which of the three variants it is.
+# The second and third have ACE config settings.
+ACE_CHECK_LACKS_FUNCS([swab],
+    [
+      AC_LINK_IFELSE([
+      AC_LANG_PROGRAM([
+#include <stdlib.h>
+#include <unistd.h>
+       ],
+       [
+// If this compiles, we have the POSIX, XPG4, etc. standard.
+const char src[2] = {'a', 'b'};
+char dst[2];
+const void *vsrc = src;
+void *vdst = dst;
+swab (vsrc, vdst, 2);
+       ])
+      ],
+      [
+        ace_cv_std_swab=yes
+      ],
+      [
+        AC_LINK_IFELSE([
+        AC_LANG_PROGRAM([
+#include <stdlib.h>
+#include <unistd.h>
+        ],
+        [
+// If this compiles, we have the SVID3 version, else it's the odd,
+// non-const one.
+const char src[2] = {'a', 'b'};
+char dst[2];
+swab (src, dst, 2);
+        ])
+       ],
+       [
+         AC_DEFINE([ACE_HAS_CONST_CHAR_SWAB])
+       ],
+       [
+         AC_DEFINE([ACE_HAS_NONCONST_SWAB])
+       ])
+      ])
+    ],
+)
 
 dnl ACE uses execv, execvp and execve, so we don't bother to check
 dnl for the others (e.g. execl, execlp, execle)
@@ -3376,6 +3503,53 @@ AC_CHECK_FUNC([poll],
      ],[AC_DEFINE([ACE_POLL_IS_BROKEN])],)
   ],)
 
+case "$host" in
+  *linux*)
+    dnl Linux Event Poll
+    ACE_CACHE_CHECK([for epoll_create],
+     [ace_cv_linux_event_poll],
+     [
+      AC_LINK_IFELSE([
+      AC_LANG_PROGRAM([
+#include <sys/epoll.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2,5,45)
+#  error Disabling Linux epoll support.  Kernel used in C library is too old.
+#  error Linux kernel 2.5.45 or better is required.
+#endif  /* LINUX_VERSION_CODE < KERNEL_VERSION (2,5,45) */
+       ],
+       [
+int const ACE_NUM_DESCRIPTORS = 10;
+(void) epoll_create (ACE_NUM_DESCRIPTORS);
+       ])
+      ],
+      [
+       ace_cv_linux_event_poll=yes
+      ],
+      [
+       ace_cv_linux_event_poll=no
+      ])
+     ],
+     [
+      AC_DEFINE([ACE_HAS_EVENT_POLL])
+     ],
+     [])
+    ;;
+  *)
+    AS_IF([test "$cross_compiling" = no],
+      [
+       dnl AC_CHECK_FILE cannot be run when cross-compiling.
+
+       dnl Check if /dev/poll character device file exists and is
+       dnl readable.
+       AC_CHECK_FILE([/dev/poll],
+                     [AC_DEFINE([ACE_HAS_DEV_POLL])],
+                     [])
+      ],
+      [])
+    ;;
+esac
+
 AC_CHECK_FUNC([gethrtime],
   [
    ACE_CHECK_TYPE([hrtime_t],[sys/time.h],[AC_DEFINE([ACE_HAS_HI_RES_TIMER])],)
@@ -3602,7 +3776,9 @@ ACE_CHECK_LACKS_FUNCS(sbrk)
 
 ACE_CHECK_HAS_FUNCS(vfwprintf vswprintf)
 
-ACE_CHECK_LACKS_FUNCS(itow towlower towupper wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcsicmp wcslen wcsncat wcsncmp wcsncpy wcsnicmp wcspbrk wcsrchr wcsspn wcsstr wcstod wcstok wcstol wcstoul)
+ACE_CHECK_LACKS_FUNCS(fgetws fputws itow towlower towupper wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcsicmp wcslen wcsncat wcsncmp wcsncpy wcsnicmp wcspbrk wcsrchr wcsspn wcsstr wcstod wcstok wcstol wcstoul)
+
+ACE_CHECK_LACKS_FUNCS(umask)
 
 if test "$ac_cv_func_wcstok" = yes; then
 dnl The wcstok() function varies with standards. Check which one we have.
@@ -5613,7 +5789,7 @@ if test "$ace_cv_lib_voidptr_gettimeofday" = no; then
 ACE_CONVERT_WARNINGS_TO_ERRORS(
 [
 dnl Check for old OSF1 style gettimeofday()
-  AC_CACHE_CHECK([if gettimeofday() takes a timezone * second argument],
+  AC_CACHE_CHECK([if gettimeofday() takes a struct timezone * second argument],
     [ace_cv_lib_timezone_gettimeofday],
     [
      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -6167,6 +6343,25 @@ ACE_CACHE_CHECK([for UNIX domain sockets],
       ])
    ], , [AC_DEFINE([ACE_LACKS_UNIX_DOMAIN_SOCKETS])])
 
+dnl Check for raw sockets
+ACE_CACHE_CHECK([for raw sockets],
+  [ace_cv_feature_raw_sockets],
+   [
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <sys/socket.h>
+#include <netinet/in.h>
+      ]], [[
+return socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+      ]])],[
+       ace_cv_feature_raw_sockets=yes
+      ],[
+       ace_cv_feature_raw_sockets=no
+      ])
+   ], [AC_DEFINE([ACE_HAS_ICMP_SUPPORT])])
+
 dnl Check for ACE_Handle_Set optimized for select()
 ACE_CACHE_CHECK([for ACE_Handle_Set optimized for select()],
   [ace_cv_feature_handle_set_optimized_for_select],[
@@ -6897,6 +7092,7 @@ dnl
 
 dnl Make final substitutions and defines
 if test "$ace_u_long_long_typedef_set" = yes; then
+  AC_DEFINE_UNQUOTED([ACE_INT64_TYPEDEF], [$ACE_INT64])
   AC_DEFINE_UNQUOTED([ACE_UINT64_TYPEDEF], [$ACE_UINT64])
 fi
 
@@ -6935,6 +7131,9 @@ ACE_CACHE_CHECK([if generated ACE configuration is usable],
       dnl Now run the compilation test
       ACE_TRY_COMPILE([-I. -I${srcdir}],
         [
+#if defined(ACE_INT64_TYPEDEF)
+  typedef ACE_INT64_TYPEDEF ACE_INT64;
+#endif /* ACE_INT64_TYPEDEF */
 #if defined(ACE_UINT64_TYPEDEF)
   typedef ACE_UINT64_TYPEDEF ACE_UINT64;
 #endif /* ACE_UINT64_TYPEDEF */
@@ -7008,6 +7207,9 @@ ACE_CACHE_CHECK([for ACE_IOStream support],
       dnl Now run the compilation test
       ACE_TRY_COMPILE([-I. -I${srcdir}],
         [
+#if defined(ACE_INT64_TYPEDEF)
+  typedef ACE_INT64_TYPEDEF ACE_INT64;
+#endif /* ACE_INT64_TYPEDEF */
 #if defined(ACE_UINT64_TYPEDEF)
   typedef ACE_UINT64_TYPEDEF ACE_UINT64;
 #endif /* ACE_UINT64_TYPEDEF */
@@ -7015,7 +7217,7 @@ ACE_CACHE_CHECK([for ACE_IOStream support],
 #include "ace/IOStream.cpp"
         ],
         [
-         int a=0; a += 1;
+         int a = 0; a += 1;
         ],
         [
          ace_cv_feature_ace_iostream=yes
@@ -7041,6 +7243,9 @@ ACE_CACHE_CHECK([for ACE_addr::sap_any support],
       dnl Now run the compilation test
       ACE_TRY_COMPILE([-I. -I${srcdir}],
         [
+#if defined(ACE_INT64_TYPEDEF)
+  typedef ACE_INT64_TYPEDEF ACE_INT64;
+#endif /* ACE_INT64_TYPEDEF */
 #if defined(ACE_UINT64_TYPEDEF)
   typedef ACE_UINT64_TYPEDEF ACE_UINT64;
 #endif /* ACE_UINT64_TYPEDEF */
@@ -7058,6 +7263,9 @@ ACE_CACHE_CHECK([for ACE_addr::sap_any support],
          dnl compilation work!
          ACE_TRY_COMPILE([-I. -I${srcdir}],
            [
+#if defined(ACE_INT64_TYPEDEF)
+  typedef ACE_INT64_TYPEDEF ACE_INT64;
+#endif /* ACE_INT64_TYPEDEF */
 #if defined(ACE_UINT64_TYPEDEF)
   typedef ACE_UINT64_TYPEDEF ACE_UINT64;
 #endif /* ACE_UINT64_TYPEDEF */
@@ -7090,6 +7298,9 @@ ACE_CACHE_CHECK([if ACE needs conversion to pass ACE_TTY_IO to DEV_Connector],
       dnl Now run the compilation test
       ACE_TRY_COMPILE([-I. -I${srcdir}],
         [
+#if defined(ACE_INT64_TYPEDEF)
+  typedef ACE_INT64_TYPEDEF ACE_INT64;
+#endif /* ACE_INT64_TYPEDEF */
 #if defined(ACE_UINT64_TYPEDEF)
   typedef ACE_UINT64_TYPEDEF ACE_UINT64;
 #endif /* ACE_UINT64_TYPEDEF */
@@ -7107,6 +7318,9 @@ ACE_CACHE_CHECK([if ACE needs conversion to pass ACE_TTY_IO to DEV_Connector],
          dnl compilation work!
          ACE_TRY_COMPILE([-I. -I${srcdir}],
            [
+#if defined(ACE_INT64_TYPEDEF)
+  typedef ACE_INT64_TYPEDEF ACE_INT64;
+#endif /* ACE_INT64_TYPEDEF */
 #if defined(ACE_UINT64_TYPEDEF)
   typedef ACE_UINT64_TYPEDEF ACE_UINT64;
 #endif /* ACE_UINT64_TYPEDEF */
@@ -7205,17 +7419,135 @@ dnl   netsvcs/servers/Makefile
 dnl   tests/Makefile
 
 AC_CONFIG_FILES([
-  ace-config
-  ace-config.1
-  aceConf.sh
   Makefile
   ace/Makefile
-  ace/RMCast/Makefile
   ace/QoS/Makefile
+  ace/RMCast/Makefile
   ace/SSL/Makefile
+  ace/TMCast/Makefile
+  ASNMP/Makefile
+  ASNMP/asnmp/Makefile
+  ASNMP/agent/Makefile
+  ASNMP/examples/Makefile
+  ASNMP/examples/get/Makefile
+  ASNMP/examples/next/Makefile
+  ASNMP/examples/set/Makefile
+  ASNMP/examples/trap/Makefile
+  ASNMP/examples/walk/Makefile
+  ASNMP/tests/Makefile
   apps/Makefile
+  apps/Gateway/Makefile
+  apps/Gateway/Gateway/Makefile
+  apps/Gateway/Peer/Makefile
+  apps/JAWS/Makefile
+  apps/JAWS/clients/Makefile
+  apps/JAWS/clients/Blobby/Makefile
+  apps/JAWS/clients/Caching/Makefile
+  apps/JAWS/server/Makefile
+  apps/JAWS3/Makefile
+  apps/JAWS3/jaws3/Makefile
+  apps/drwho/Makefile
   apps/gperf/Makefile
   apps/gperf/src/Makefile
+  apps/gperf/tests/Makefile
+  apps/mkcsregdb/Makefile
+  apps/soreduce/Makefile
+  bin/Makefile
+  bin/PerlACE/Makefile
+  examples/Makefile
+  examples/APG/Makefile
+  examples/APG/Active_Objects/Makefile
+  examples/APG/Config/Makefile
+  examples/APG/Containers/Makefile
+  examples/APG/Logging/Makefile
+  examples/APG/Misc_IPC/Makefile
+  examples/APG/Naming/Makefile
+  examples/APG/Proactor/Makefile
+  examples/APG/Processes/Makefile
+  examples/APG/Reactor/Makefile
+  examples/APG/Shared_Memory/Makefile
+  examples/APG/Signals/Makefile
+  examples/APG/Sockets/Makefile
+  examples/APG/Streams/Makefile
+  examples/APG/Svc_Config/Makefile
+  examples/APG/ThreadManagement/Makefile
+  examples/APG/ThreadPools/Makefile
+  examples/APG/ThreadSafety/Makefile
+  examples/APG/Threads/Makefile
+  examples/APG/Timers/Makefile
+  examples/ASX/Makefile
+  examples/ASX/CCM_App/Makefile
+  examples/ASX/Message_Queue/Makefile
+  examples/Bounded_Packet_Relay/Makefile
+  examples/C++NPv1/Makefile
+  examples/C++NPv2/Makefile
+  examples/Connection/Makefile
+  examples/Connection/blocking/Makefile
+  examples/Connection/misc/Makefile
+  examples/Connection/non_blocking/Makefile
+  examples/DLL/Makefile
+  examples/Export/Makefile
+  examples/IOStream/Makefile
+  examples/IOStream/client/Makefile
+  examples/IOStream/server/Makefile
+  examples/IPC_SAP/Makefile
+  examples/IPC_SAP/ATM_SAP/Makefile
+  examples/IPC_SAP/DEV_SAP/Makefile
+  examples/IPC_SAP/DEV_SAP/reader/Makefile
+  examples/IPC_SAP/DEV_SAP/writer/Makefile
+  examples/IPC_SAP/FIFO_SAP/Makefile
+  examples/IPC_SAP/FILE_SAP/Makefile
+  examples/IPC_SAP/SOCK_SAP/Makefile
+  examples/IPC_SAP/SPIPE_SAP/Makefile
+  examples/IPC_SAP/SSL_SAP/Makefile
+  examples/IPC_SAP/TLI_SAP/Makefile
+  examples/IPC_SAP/UPIPE_SAP/Makefile
+  examples/Log_Msg/Makefile
+  examples/Logger/Makefile
+  examples/Logger/Acceptor-server/Makefile
+  examples/Logger/client/Makefile
+  examples/Logger/simple-server/Makefile
+  examples/Mem_Map/Makefile
+  examples/Mem_Map/IO-tests/Makefile
+  examples/Mem_Map/file-reverse/Makefile
+  examples/Misc/Makefile
+  examples/NT_Service/Makefile
+  examples/Naming/Makefile
+  examples/OS/Makefile
+  examples/OS/Process/Makefile
+  examples/QOS/Makefile
+  examples/QOS/Change_Receiver_FlowSpec/Makefile
+  examples/QOS/Change_Sender_TSpec/Makefile
+  examples/QOS/Diffserv/Makefile
+  examples/QOS/Simple/Makefile
+  examples/RMCast/Makefile
+  examples/RMCast/Send_Msg/Makefile
+  examples/Reactor/Makefile
+  examples/Reactor/Dgram/Makefile
+  examples/Reactor/FIFO/Makefile
+  examples/Reactor/Misc/Makefile
+  examples/Reactor/Multicast/Makefile
+  examples/Reactor/Ntalker/Makefile
+  examples/Reactor/Proactor/Makefile
+  examples/Reactor/WFMO_Reactor/Makefile
+  examples/Registry/Makefile
+  examples/Service_Configurator/Makefile
+  examples/Service_Configurator/IPC-tests/Makefile
+  examples/Service_Configurator/IPC-tests/client/Makefile
+  examples/Service_Configurator/IPC-tests/server/Makefile
+  examples/Service_Configurator/Misc/Makefile
+  examples/Shared_Malloc/Makefile
+  examples/Shared_Memory/Makefile
+  examples/Smart_Pointers/Makefile
+  examples/Synch/Makefile
+  examples/System_V_IPC/Makefile
+  examples/System_V_IPC/SV_Message_Queues/Makefile
+  examples/System_V_IPC/SV_Semaphores/Makefile
+  examples/TMCast/Makefile
+  examples/TMCast/Member/Makefile
+  examples/Threads/Makefile
+  examples/Timer_Queue/Makefile
+  examples/Web_Crawler/Makefile
   netsvcs/Makefile
   netsvcs/lib/Makefile
   netsvcs/clients/Makefile
@@ -7223,21 +7555,67 @@ AC_CONFIG_FILES([
   netsvcs/clients/Naming/Makefile
   netsvcs/clients/Naming/Client/Makefile
   netsvcs/clients/Naming/Dump_Restore/Makefile
-  netsvcs/clients/Tokens/Makefile
-  netsvcs/clients/Tokens/collection/Makefile
-  netsvcs/clients/Tokens/deadlock/Makefile
-  netsvcs/clients/Tokens/invariant/Makefile
-  netsvcs/clients/Tokens/manual/Makefile
-  netsvcs/clients/Tokens/mutex/Makefile
-  netsvcs/clients/Tokens/rw_lock/Makefile
   netsvcs/servers/Makefile
+  performance-tests/Makefile
+  performance-tests/Misc/Makefile
+  performance-tests/SCTP/Makefile
+  performance-tests/Server_Concurrency/Makefile
+  performance-tests/Server_Concurrency/Leader_Follower/Makefile
+  performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile
+  performance-tests/Synch-Benchmarks/Makefile
+  performance-tests/Synch-Benchmarks/Synch_Lib/Makefile
+  performance-tests/Synch-Benchmarks/Base_Test/Makefile
+  performance-tests/Synch-Benchmarks/Perf_Test/Makefile
+  performance-tests/TCP/Makefile
+  performance-tests/UDP/Makefile
+  protocols/Makefile
+  protocols/ace/Makefile
+  protocols/ace/HTBP/Makefile
+  protocols/ace/RMCast/Makefile
+  protocols/ace/TMCast/Makefile
   tests/Makefile
+  tests/HTBP/Makefile
+  tests/HTBP/Reactor_Tests/Makefile
+  tests/HTBP/Send_Large_Msg/Makefile
+  tests/HTBP/Send_Recv_Tests/Makefile
+  tests/HTBP/ping/Makefile
   tests/SSL/Makefile
+  websvcs/Makefile
+  websvcs/lib/Makefile
+  websvcs/tests/Makefile
 ])
 
 dnl Configure subdirectories if they are present.
+if test -d $srcdir/ACEXML; then
+  AC_CONFIG_FILES([
+    ACEXML/Makefile
+    ACEXML/common/Makefile
+    ACEXML/parser/Makefile
+    ACEXML/parser/parser/Makefile
+    ACEXML/apps/Makefile
+    ACEXML/apps/svcconf/Makefile
+    ACEXML/examples/Makefile
+    ACEXML/examples/SAXPrint/Makefile
+    ACEXML/tests/Makefile
+  ])
+fi
+
+if test -d $srcdir/Kokyu; then
+  AC_CONFIG_FILES([
+    Kokyu/Makefile
+    Kokyu/tests/Makefile
+    Kokyu/tests/DSRT_MIF/Makefile
+    Kokyu/tests/EDF/Makefile
+    Kokyu/tests/FIFO/Makefile
+  ])
+  AC_SUBST([KOKYU],[Kokyu])
+fi
+AM_CONDITIONAL([BUILD_KOKYU],
+               [test -d $srcdir/Kokyu])
+
 if test -d $srcdir/TAO -a X$ace_user_with_tao = Xyes; then
   AC_CONFIG_SUBDIRS([TAO])
+  AC_SUBST([TAO],[TAO])
 fi
 AM_CONDITIONAL([BUILD_TAO],
                [test -d $srcdir/TAO -a X$ace_user_with_tao = Xyes])
diff --git a/docs/ACE-bug-process.html b/docs/ACE-bug-process.html
index f28c2ded7ce..7cec4bfa66c 100644
--- a/docs/ACE-bug-process.html
+++ b/docs/ACE-bug-process.html
@@ -63,7 +63,7 @@ permits. <P>
 </OL>
 
 <LI> You should also consider entering your bug report into our <A
-HREF="http://deuce.doc.wustl.edu/bugzilla">bug tracking database</A>
+HREF="http://deuce.doc.wustl.edu/bugzilla/index.cgi">bug tracking database</A>
 so that it's archived for future processing.  We try to address these
 bugs as time permits, but may not get to them for a while unless it
 affects our work or the work of our sponsors.  If you'd like an
@@ -94,7 +94,8 @@ can not guarantee responses to all postings. <P>
   can see by checking out the <A
     HREF="http://groups.google.com/groups?q=comp.soft-sys.ace&ie=UTF-8&oe=UTF-8&hl=en">comp.soft-sys.ace</A> newsgroup to see if your posting is visible. <P>
 
-<LI> If it's not visible, please make sure you're <A HREF="ACE-mail.html">subscribed to the mailing
+<LI> If it's not visible, please make sure you're 
+  <A HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">subscribed to the mailing
   list(s)</A> you sent the report to since we have a "members only" posting
   requirement to minimize spam. <P>
 
diff --git a/docs/ACE-categories.html b/docs/ACE-categories.html
index c49646f79f5..2d6e46223a8 100644
--- a/docs/ACE-categories.html
+++ b/docs/ACE-categories.html
@@ -28,9 +28,9 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Array.cpp">Array.cpp</a></li>
 <li><a href = "../ace/Array.h">Array.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Array.html">[doxygen]</a></b>
-<li><a href = "../ace/Array.i">Array.i</a></li>
+<li><a href = "../ace/Array.inl">Array.inl</a></li>
 <li><a href = "../ace/Containers.cpp">Containers.cpp</a></li>
-<li><a href = "../ace/Containers.i">Containers.i</a></li>
+<li><a href = "../ace/Containers.inl">Containers.inl</a></li>
 <li><a href = "../ace/Containers.h">Containers.h</a></li>
 <li><a href = "../ace/Hash_Map_Manager.cpp">Hash_Map_Manager.cpp</a></li>
 <li><a href = "../ace/Hash_Map_Manager.h">Hash_Map_Manager.h</a></li>
@@ -39,32 +39,32 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Filecache.h">Filecache.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Filecache.html">[doxygen]</a></b>
 <li><a href = "../ace/Free_List.cpp">Free_List.cpp</a></li>
-<li><a href = "../ace/Free_List.i">Free_List.i</a></li>
+<li><a href = "../ace/Free_List.inl">Free_List.inl</a></li>
 <li><a href = "../ace/Free_List.h">Free_List.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Free__List.html">[doxygen]</a></b>
 <li><a href = "../ace/Managed_Object.cpp">Managed_Object.cpp</a></li>
 <li><a href = "../ace/Managed_Object.h">Managed_Object.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Managed__Object.html">[doxygen]</a></b>
-<li><a href = "../ace/Managed_Object.i">Managed_Object.i</a></li>
+<li><a href = "../ace/Managed_Object.inl">Managed_Object.inl</a></li>
 <li><a href = "../ace/Map_Manager.cpp">Map_Manager.cpp</a></li>
 <li><a href = "../ace/Map_Manager.h">Map_Manager.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Map__Manager.html">[doxygen]</a></b>
-<li><a href = "../ace/Map_Manager.i">Map_Manager.i</a></li>
+<li><a href = "../ace/Map_Manager.inl">Map_Manager.inl</a></li>
 <li><a href = "../ace/Object_Manager.cpp">Object_Manager.cpp</a></li>
-<li><a href = "../ace/Object_Manager.i">Object_Manager.i</a></li>
+<li><a href = "../ace/Object_Manager.inl">Object_Manager.inl</a></li>
 <li><a href = "../ace/Object_Manager.h">Object_Manager.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Object__Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/SString.cpp">SString.cpp</a></li>
 <li><a href = "../ace/SString.h">SString.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SString.html">[doxygen]</a></b>
-<li><a href = "../ace/SString.i">SString.i</a></li>
+<li><a href = "../ace/SString.inl">SString.inl</a></li>
 </ul>
 <b>[Concurrency]</b>
 <ul>
 <li><a href = "../ace/Activation_Queue.h">Activation_Queue.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Activation__Queue.html">[doxygen]</a></b>
 <li><a href = "../ace/Activation_Queue.cpp">Activation_Queue.cpp</a></li>
-<li><a href = "../ace/Atomic_Op.i">Atomic_Op.i</a></li>
+<li><a href = "../ace/Atomic_Op.inl">Atomic_Op.inl</a></li>
 <li><a href = "../ace/Future.h">Future.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Future.html">[doxygen]</a></b>
 <li><a href = "../ace/Future.cpp">Future.cpp</a></li>
@@ -74,44 +74,44 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Process.cpp">Process.cpp</a></li>
 <li><a href = "../ace/Process.h">Process.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Process.html">[doxygen]</a></b>
-<li><a href = "../ace/Process.i">Process.i</a></li>
+<li><a href = "../ace/Process.inl">Process.inl</a></li>
 <li><a href = "../ace/Process_Manager.cpp">Process_Manager.cpp</a></li>
 <li><a href = "../ace/Process_Manager.h">Process_Manager.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Process__Manager.html">[doxygen]</a></b>
-<li><a href = "../ace/Process_Manager.i">Process_Manager.i</a></li>
+<li><a href = "../ace/Process_Manager.inl">Process_Manager.inl</a></li>
 <li><a href = "../ace/Sched_Params.cpp">Sched_Params.cpp</a></li>
 <li><a href = "../ace/Sched_Params.h">Sched_Params.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Sched__Params.html">[doxygen]</a></b>
-<li><a href = "../ace/Sched_Params.i">Sched_Params.i</a></li>
+<li><a href = "../ace/Sched_Params.inl">Sched_Params.inl</a></li>
 <li><a href = "../ace/Synch.cpp">Synch.cpp</a></li>
 <li><a href = "../ace/Synch.h">Synch.h</a></li>
-<li><a href = "../ace/Synch.i">Synch.i</a></li>
+<li><a href = "../ace/Synch.inl">Synch.inl</a></li>
 <li><a href = "../ace/Synch_Options.cpp">Synch_Options.cpp</a></li>
 <li><a href = "../ace/Synch_Options.h">Synch_Options.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Synch__Options.html">[doxygen]</a></b>
-<li><a href = "../ace/Synch_Options.i">Synch_Options.i</a></li>
+<li><a href = "../ace/Synch_Options.inl">Synch_Options.inl</a></li>
 <li><a href = "../ace/Synch_T.cpp">Synch_T.cpp</a></li>
 <li><a href = "../ace/Synch_T.h">Synch_T.h</a></li>
-<li><a href = "../ace/Synch_T.i">Synch_T.i</a></li>
+<li><a href = "../ace/Synch_T.inl">Synch_T.inl</a></li>
 <li><a href = "../ace/Thread.cpp">Thread.cpp</a></li>
 <li><a href = "../ace/Thread.h">Thread.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Thread.html">[doxygen]</a></b>
-<li><a href = "../ace/Thread.i">Thread.i</a></li>
+<li><a href = "../ace/Thread.inl">Thread.inl</a></li>
 <li><a href = "../ace/Thread_Manager.cpp">Thread_Manager.cpp</a></li>
 <li><a href = "../ace/Thread_Manager.h">Thread_Manager.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Thread__Manager.html">[doxygen]</a></b>
-<li><a href = "../ace/Thread_Manager.i">Thread_Manager.i</a></li>
+<li><a href = "../ace/Thread_Manager.inl">Thread_Manager.inl</a></li>
 <li><a href = "../ace/Token.cpp">Token.cpp</a></li>
 <li><a href = "../ace/Token.h">Token.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Token.html">[doxygen]</a></b>
-<li><a href = "../ace/Token.i">Token.i</a></li>
+<li><a href = "../ace/Token.inl">Token.inl</a></li>
 </ul>
 <b>[Config]</b>
 <ul>
 <li><a href = "../ace/config.h">config.h</a></li>
 <li><a href = "../ace/Basic_Types.cpp">Basic_Types.cpp</a></li>
 <li><a href = "../ace/Basic_Types.h">Basic_Types.h</a></li>
-<li><a href = "../ace/Basic_Types.i">Basic_Types.i</a></li>
+<li><a href = "../ace/Basic_Types.inl">Basic_Types.inl</a></li>
 <li><a href = "../ace/Version.h">Version.h</a></li>
 </ul>
 <b>[Connection]</b>
@@ -119,32 +119,32 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Acceptor.cpp">Acceptor.cpp</a></li>
 <li><a href = "../ace/Acceptor.h">Acceptor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Acceptor.html">[doxygen]</a></b>
-<li><a href = "../ace/Acceptor.i">Acceptor.i</a></li>
+<li><a href = "../ace/Acceptor.inl">Acceptor.inl</a></li>
 <li><a href = "../ace/Asynch_Acceptor.cpp">Asynch_Acceptor.cpp</a></li>
 <li><a href = "../ace/Asynch_Acceptor.h">Asynch_Acceptor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Asynch__Acceptor.html">[doxygen]</a></b>
-<li><a href = "../ace/Asynch_Acceptor.i">Asynch_Acceptor.i</a></li>
+<li><a href = "../ace/Asynch_Acceptor.inl">Asynch_Acceptor.inl</a></li>
 <li><a href = "../ace/Asynch_IO.cpp">Asynch_IO.cpp</a></li>
 <li><a href = "../ace/Asynch_IO.h">Asynch_IO.h</a></li>
-<li><a href = "../ace/Asynch_IO.i">Asynch_IO.i</a></li>
+<li><a href = "../ace/Asynch_IO.inl">Asynch_IO.inl</a></li>
 <li><a href = "../ace/Connector.cpp">Connector.cpp</a></li>
 <li><a href = "../ace/Connector.h">Connector.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Connector.html">[doxygen]</a></b>
-<li><a href = "../ace/Connector.i">Connector.i</a></li>
+<li><a href = "../ace/Connector.inl">Connector.inl</a></li>
 <li><a href = "../ace/Dynamic_Service.cpp">Dynamic_Service.cpp</a></li>
 <li><a href = "../ace/Dynamic_Service.h">Dynamic_Service.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Dynamic__Service.html">[doxygen]</a></b>
-<li><a href = "../ace/Dynamic_Service.i">Dynamic_Service.i</a></li>
+<li><a href = "../ace/Dynamic_Service.inl">Dynamic_Service.inl</a></li>
 <li><a href = "../ace/Strategies.cpp">Strategies.cpp</a></li>
 <li><a href = "../ace/Strategies.h">Strategies.h</a></li>
-<li><a href = "../ace/Strategies.i">Strategies.i</a></li>
+<li><a href = "../ace/Strategies.inl">Strategies.inl</a></li>
 <li><a href = "../ace/Strategies_T.cpp">Strategies_T.cpp</a></li>
 <li><a href = "../ace/Strategies_T.h">Strategies_T.h</a></li>
-<li><a href = "../ace/Strategies_T.i">Strategies_T.i</a></li>
+<li><a href = "../ace/Strategies_T.inl">Strategies_T.inl</a></li>
 <li><a href = "../ace/Svc_Handler.cpp">Svc_Handler.cpp</a></li>
 <li><a href = "../ace/Svc_Handler.h">Svc_Handler.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Svc__Handler.html">[doxygen]</a></b>
-<li><a href = "../ace/Svc_Handler.i">Svc_Handler.i</a></li>
+<li><a href = "../ace/Svc_Handler.inl">Svc_Handler.inl</a></li>
 </ul>
 <b>[IPC]</b>
 <ul>
@@ -153,22 +153,22 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/IO_SAP.cpp">IO_SAP.cpp</a></li>
 <li><a href = "../ace/IO_SAP.h">IO_SAP.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__IO__SAP.html">[doxygen]</a></b>
-<li><a href = "../ace/IO_SAP.i">IO_SAP.i</a></li>
+<li><a href = "../ace/IO_SAP.inl">IO_SAP.inl</a></li>
 <br>
 <b>[DEV_SAP]</b>
 <ul>
 <li><a href = "../ace/DEV.cpp">DEV.cpp</a></li>
 <li><a href = "../ace/DEV.h">DEV.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__DEV.html">[doxygen]</a></b>
-<li><a href = "../ace/DEV.i">DEV.i</a></li>
+<li><a href = "../ace/DEV.inl">DEV.inl</a></li>
 <li><a href = "../ace/DEV_Connector.cpp">DEV_Connector.cpp</a></li>
 <li><a href = "../ace/DEV_Connector.h">DEV_Connector.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__DEV__Connector.html">[doxygen]</a></b>
-<li><a href = "../ace/DEV_Connector.i">DEV_Connector.i</a></li>
+<li><a href = "../ace/DEV_Connector.inl">DEV_Connector.inl</a></li>
 <li><a href = "../ace/DEV_IO.cpp">DEV_IO.cpp</a></li>
 <li><a href = "../ace/DEV_IO.h">DEV_IO.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__DEV__IO.html">[doxygen]</a></b>
-<li><a href = "../ace/DEV_IO.i">DEV_IO.i</a></li>
+<li><a href = "../ace/DEV_IO.inl">DEV_IO.inl</a></li>
 <li><a href = "../ace/TTY_IO.cpp">TTY_IO.cpp</a></li>
 <li><a href = "../ace/TTY_IO.h">TTY_IO.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__TTY__IO.html">[doxygen]</a></b>
@@ -178,15 +178,15 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/FILE.cpp">FILE.cpp</a></li>
 <li><a href = "../ace/FILE.h">FILE.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__FILE.html">[doxygen]</a></b>
-<li><a href = "../ace/FILE.i">FILE.i</a></li>
+<li><a href = "../ace/FILE.inl">FILE.inl</a></li>
 <li><a href = "../ace/FILE_Connector.cpp">FILE_Connector.cpp</a></li>
 <li><a href = "../ace/FILE_Connector.h">FILE_Connector.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__FILE__Connector.html">[doxygen]</a></b>
-<li><a href = "../ace/FILE_Connector.i">FILE_Connector.i</a></li>
+<li><a href = "../ace/FILE_Connector.inl">FILE_Connector.inl</a></li>
 <li><a href = "../ace/FILE_IO.cpp">FILE_IO.cpp</a></li>
 <li><a href = "../ace/FILE_IO.h">FILE_IO.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__FILE__IO.html">[doxygen]</a></b>
-<li><a href = "../ace/FILE_IO.i">FILE_IO.i</a></li>
+<li><a href = "../ace/FILE_IO.inl">FILE_IO.inl</a></li>
 </ul>
 </ul>
 <b>[IPC_SAP]</b>
@@ -194,34 +194,34 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/IPC_SAP.cpp">IPC_SAP.cpp</a></li>
 <li><a href = "../ace/IPC_SAP.h">IPC_SAP.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__IPC__SAP.html">[doxygen]</a></b>
-<li><a href = "../ace/IPC_SAP.i">IPC_SAP.i</a></li>
+<li><a href = "../ace/IPC_SAP.inl">IPC_SAP.inl</a></li>
 <br>
 <b>[Addr]</b>
 <ul>
 <li><a href = "../ace/Addr.cpp">Addr.cpp</a></li>
 <li><a href = "../ace/Addr.h">Addr.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Addr.html">[doxygen]</a></b>
-<li><a href = "../ace/Addr.i">Addr.i</a></li>
+<li><a href = "../ace/Addr.inl">Addr.inl</a></li>
 <li><a href = "../ace/DEV_Addr.cpp">DEV_Addr.cpp</a></li>
 <li><a href = "../ace/DEV_Addr.h">DEV_Addr.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__DEV__Addr.html">[doxygen]</a></b>
-<li><a href = "../ace/DEV_Addr.i">DEV_Addr.i</a></li>
+<li><a href = "../ace/DEV_Addr.inl">DEV_Addr.inl</a></li>
 <li><a href = "../ace/FILE_Addr.cpp">FILE_Addr.cpp</a></li>
 <li><a href = "../ace/FILE_Addr.h">FILE_Addr.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__FILE__Addr.html">[doxygen]</a></b>
-<li><a href = "../ace/FILE_Addr.i">FILE_Addr.i</a></li>
+<li><a href = "../ace/FILE_Addr.inl">FILE_Addr.inl</a></li>
 <li><a href = "../ace/INET_Addr.cpp">INET_Addr.cpp</a></li>
 <li><a href = "../ace/INET_Addr.h">INET_Addr.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__INET__Addr.html">[doxygen]</a></b>
-<li><a href = "../ace/INET_Addr.i">INET_Addr.i</a></li>
+<li><a href = "../ace/INET_Addr.inl">INET_Addr.inl</a></li>
 <li><a href = "../ace/SPIPE_Addr.cpp">SPIPE_Addr.cpp</a></li>
 <li><a href = "../ace/SPIPE_Addr.h">SPIPE_Addr.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SPIPE__Addr.html">[doxygen]</a></b>
-<li><a href = "../ace/SPIPE_Addr.i">SPIPE_Addr.i</a></li>
+<li><a href = "../ace/SPIPE_Addr.inl">SPIPE_Addr.inl</a></li>
 <li><a href = "../ace/UNIX_Addr.cpp">UNIX_Addr.cpp</a></li>
 <li><a href = "../ace/UNIX_Addr.h">UNIX_Addr.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__UNIX__Addr.html">[doxygen]</a></b>
-<li><a href = "../ace/UNIX_Addr.i">UNIX_Addr.i</a></li>
+<li><a href = "../ace/UNIX_Addr.inl">UNIX_Addr.inl</a></li>
 <li><a href = "../ace/UPIPE_Addr.h">UPIPE_Addr.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__UPIPE__Addr.html">[doxygen]</a></b>
 </ul>
@@ -230,23 +230,23 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/FIFO.cpp">FIFO.cpp</a></li>
 <li><a href = "../ace/FIFO.h">FIFO.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__FIFO.html">[doxygen]</a></b>
-<li><a href = "../ace/FIFO.i">FIFO.i</a></li>
+<li><a href = "../ace/FIFO.inl">FIFO.inl</a></li>
 <li><a href = "../ace/FIFO_Recv.cpp">FIFO_Recv.cpp</a></li>
 <li><a href = "../ace/FIFO_Recv.h">FIFO_Recv.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__FIFO__Recv.html">[doxygen]</a></b>
-<li><a href = "../ace/FIFO_Recv.i">FIFO_Recv.i</a></li>
+<li><a href = "../ace/FIFO_Recv.inl">FIFO_Recv.inl</a></li>
 <li><a href = "../ace/FIFO_Recv_Msg.cpp">FIFO_Recv_Msg.cpp</a></li>
 <li><a href = "../ace/FIFO_Recv_Msg.h">FIFO_Recv_Msg.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__FIFO__Recv__Msg.html">[doxygen]</a></b>
-<li><a href = "../ace/FIFO_Recv_Msg.i">FIFO_Recv_Msg.i</a></li>
+<li><a href = "../ace/FIFO_Recv_Msg.inl">FIFO_Recv_Msg.inl</a></li>
 <li><a href = "../ace/FIFO_Send.cpp">FIFO_Send.cpp</a></li>
 <li><a href = "../ace/FIFO_Send.h">FIFO_Send.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__FIFO__Send.html">[doxygen]</a></b>
-<li><a href = "../ace/FIFO_Send.i">FIFO_Send.i</a></li>
+<li><a href = "../ace/FIFO_Send.inl">FIFO_Send.inl</a></li>
 <li><a href = "../ace/FIFO_Send_Msg.cpp">FIFO_Send_Msg.cpp</a></li>
 <li><a href = "../ace/FIFO_Send_Msg.h">FIFO_Send_Msg.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__FIFO__Send__Msg.html">[doxygen]</a></b>
-<li><a href = "../ace/FIFO_Send_Msg.i">FIFO_Send_Msg.i</a></li>
+<li><a href = "../ace/FIFO_Send_Msg.inl">FIFO_Send_Msg.inl</a></li>
 </ul>
 <b>[SOCK_SAP]</b>
 <ul>
@@ -256,101 +256,101 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/LSOCK.cpp">LSOCK.cpp</a></li>
 <li><a href = "../ace/LSOCK.h">LSOCK.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__LSOCK.html">[doxygen]</a></b>
-<li><a href = "../ace/LSOCK.i">LSOCK.i</a></li>
+<li><a href = "../ace/LSOCK.inl">LSOCK.inl</a></li>
 <li><a href = "../ace/LSOCK_Acceptor.cpp">LSOCK_Acceptor.cpp</a></li>
 <li><a href = "../ace/LSOCK_Acceptor.h">LSOCK_Acceptor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__LSOCK__Acceptor.html">[doxygen]</a></b>
-<li><a href = "../ace/LSOCK_Acceptor.i">LSOCK_Acceptor.i</a></li>
+<li><a href = "../ace/LSOCK_Acceptor.inl">LSOCK_Acceptor.inl</a></li>
 <li><a href = "../ace/LSOCK_CODgram.cpp">LSOCK_CODgram.cpp</a></li>
 <li><a href = "../ace/LSOCK_CODgram.h">LSOCK_CODgram.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__LSOCK__CODgram.html">[doxygen]</a></b>
-<li><a href = "../ace/LSOCK_CODgram.i">LSOCK_CODgram.i</a></li>
+<li><a href = "../ace/LSOCK_CODgram.inl">LSOCK_CODgram.inl</a></li>
 <li><a href = "../ace/LSOCK_Connector.cpp">LSOCK_Connector.cpp</a></li>
 <li><a href = "../ace/LSOCK_Connector.h">LSOCK_Connector.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__LSOCK__Connector.html">[doxygen]</a></b>
-<li><a href = "../ace/LSOCK_Connector.i">LSOCK_Connector.i</a></li>
+<li><a href = "../ace/LSOCK_Connector.inl">LSOCK_Connector.inl</a></li>
 <li><a href = "../ace/LSOCK_Dgram.cpp">LSOCK_Dgram.cpp</a></li>
 <li><a href = "../ace/LSOCK_Dgram.h">LSOCK_Dgram.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__LSOCK__Dgram.html">[doxygen]</a></b>
-<li><a href = "../ace/LSOCK_Dgram.i">LSOCK_Dgram.i</a></li>
+<li><a href = "../ace/LSOCK_Dgram.inl">LSOCK_Dgram.inl</a></li>
 <li><a href = "../ace/LSOCK_Stream.cpp">LSOCK_Stream.cpp</a></li>
 <li><a href = "../ace/LSOCK_Stream.h">LSOCK_Stream.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__LSOCK__Stream.html">[doxygen]</a></b>
-<li><a href = "../ace/LSOCK_Stream.i">LSOCK_Stream.i</a></li>
+<li><a href = "../ace/LSOCK_Stream.inl">LSOCK_Stream.inl</a></li>
 <li><a href = "../ace/SOCK.cpp">SOCK.cpp</a></li>
 <li><a href = "../ace/SOCK.h">SOCK.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SOCK.html">[doxygen]</a></b>
-<li><a href = "../ace/SOCK.i">SOCK.i</a></li>
+<li><a href = "../ace/SOCK.inl">SOCK.inl</a></li>
 <li><a href = "../ace/SOCK_Acceptor.cpp">SOCK_Acceptor.cpp</a></li>
 <li><a href = "../ace/SOCK_Acceptor.h">SOCK_Acceptor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SOCK__Acceptor.html">[doxygen]</a></b>
-<li><a href = "../ace/SOCK_Acceptor.i">SOCK_Acceptor.i</a></li>
+<li><a href = "../ace/SOCK_Acceptor.inl">SOCK_Acceptor.inl</a></li>
 <li><a href = "../ace/SOCK_CODgram.cpp">SOCK_CODgram.cpp</a></li>
 <li><a href = "../ace/SOCK_CODgram.h">SOCK_CODgram.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SOCK__CODgram.html">[doxygen]</a></b>
-<li><a href = "../ace/SOCK_CODgram.i">SOCK_CODgram.i</a></li>
+<li><a href = "../ace/SOCK_CODgram.inl">SOCK_CODgram.inl</a></li>
 <li><a href = "../ace/SOCK_Connector.cpp">SOCK_Connector.cpp</a></li>
 <li><a href = "../ace/SOCK_Connector.h">SOCK_Connector.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SOCK__Connector.html">[doxygen]</a></b>
-<li><a href = "../ace/SOCK_Connector.i">SOCK_Connector.i</a></li>
+<li><a href = "../ace/SOCK_Connector.inl">SOCK_Connector.inl</a></li>
 <li><a href = "../ace/SOCK_Dgram.cpp">SOCK_Dgram.cpp</a></li>
 <li><a href = "../ace/SOCK_Dgram.h">SOCK_Dgram.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SOCK__Dgram.html">[doxygen]</a></b>
-<li><a href = "../ace/SOCK_Dgram.i">SOCK_Dgram.i</a></li>
+<li><a href = "../ace/SOCK_Dgram.inl">SOCK_Dgram.inl</a></li>
 <li><a href = "../ace/SOCK_Dgram_Bcast.cpp">SOCK_Dgram_Bcast.cpp</a></li>
 <li><a href = "../ace/SOCK_Dgram_Bcast.h">SOCK_Dgram_Bcast.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SOCK__Dgram_Bcast.html">[doxygen]</a></b>
-<li><a href = "../ace/SOCK_Dgram_Bcast.i">SOCK_Dgram_Bcast.i</a></li>
+<li><a href = "../ace/SOCK_Dgram_Bcast.inl">SOCK_Dgram_Bcast.inl</a></li>
 <li><a href = "../ace/SOCK_Dgram_Mcast.cpp">SOCK_Dgram_Mcast.cpp</a></li>
 <li><a href = "../ace/SOCK_Dgram_Mcast.h">SOCK_Dgram_Mcast.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SOCK__Dgram__Mcast.html">[doxygen]</a></b>
-<li><a href = "../ace/SOCK_Dgram_Mcast.i">SOCK_Dgram_Mcast.i</a></li>
+<li><a href = "../ace/SOCK_Dgram_Mcast.inl">SOCK_Dgram_Mcast.inl</a></li>
 <li><a href = "../ace/SOCK_IO.cpp">SOCK_IO.cpp</a></li>
 <li><a href = "../ace/SOCK_IO.h">SOCK_IO.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SOCK__IO.html">[doxygen]</a></b>
-<li><a href = "../ace/SOCK_IO.i">SOCK_IO.i</a></li>
+<li><a href = "../ace/SOCK_IO.inl">SOCK_IO.inl</a></li>
 <li><a href = "../ace/SOCK_Stream.cpp">SOCK_Stream.cpp</a></li>
 <li><a href = "../ace/SOCK_Stream.h">SOCK_Stream.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SOCK__Stream.html">[doxygen]</a></b>
-<li><a href = "../ace/SOCK_Stream.i">SOCK_Stream.i</a></li>
+<li><a href = "../ace/SOCK_Stream.inl">SOCK_Stream.inl</a></li>
 </ul>
 <b>[SPIPE_SAP]</b>
 <ul>
 <li><a href = "../ace/SPIPE.cpp">SPIPE.cpp</a></li>
 <li><a href = "../ace/SPIPE.h">SPIPE.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SPIPE.html">[doxygen]</a></b>
-<li><a href = "../ace/SPIPE.i">SPIPE.i</a></li>
+<li><a href = "../ace/SPIPE.inl">SPIPE.inl</a></li>
 <li><a href = "../ace/SPIPE_Acceptor.cpp">SPIPE_Acceptor.cpp</a></li>
 <li><a href = "../ace/SPIPE_Acceptor.h">SPIPE_Acceptor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SPIPE__Acceptor.html">[doxygen]</a></b>
-<li><a href = "../ace/SPIPE_Acceptor.i">SPIPE_Acceptor.i</a></li>
+<li><a href = "../ace/SPIPE_Acceptor.inl">SPIPE_Acceptor.inl</a></li>
 <li><a href = "../ace/SPIPE_Connector.cpp">SPIPE_Connector.cpp</a></li>
 <li><a href = "../ace/SPIPE_Connector.h">SPIPE_Connector.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SPIPE__Connector.html">[doxygen]</a></b>
-<li><a href = "../ace/SPIPE_Connector.i">SPIPE_Connector.i</a></li>
+<li><a href = "../ace/SPIPE_Connector.inl">SPIPE_Connector.inl</a></li>
 <li><a href = "../ace/SPIPE_Stream.cpp">SPIPE_Stream.cpp</a></li>
 <li><a href = "../ace/SPIPE_Stream.h">SPIPE_Stream.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SPIPE__Stream.html">[doxygen]</a></b>
-<li><a href = "../ace/SPIPE_Stream.i">SPIPE_Stream.i</a></li>
+<li><a href = "../ace/SPIPE_Stream.inl">SPIPE_Stream.inl</a></li>
 </ul>
 <b>[TLI_SAP]</b>
 <ul>
 <li><a href = "../ace/TLI.cpp">TLI.cpp</a></li>
 <li><a href = "../ace/TLI.h">TLI.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__TLI.html">[doxygen]</a></b>
-<li><a href = "../ace/TLI.i">TLI.i</a></li>
+<li><a href = "../ace/TLI.inl">TLI.inl</a></li>
 <li><a href = "../ace/TLI_Acceptor.cpp">TLI_Acceptor.cpp</a></li>
 <li><a href = "../ace/TLI_Acceptor.h">TLI_Acceptor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__TLI__Acceptor.html">[doxygen]</a></b>
-<li><a href = "../ace/TLI_Acceptor.i">TLI_Acceptor.i</a></li>
+<li><a href = "../ace/TLI_Acceptor.inl">TLI_Acceptor.inl</a></li>
 <li><a href = "../ace/TLI_Connector.cpp">TLI_Connector.cpp</a></li>
 <li><a href = "../ace/TLI_Connector.h">TLI_Connector.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__TLI__Connector.html">[doxygen]</a></b>
-<li><a href = "../ace/TLI_Connector.i">TLI_Connector.i</a></li>
+<li><a href = "../ace/TLI_Connector.inl">TLI_Connector.inl</a></li>
 <li><a href = "../ace/TLI_Stream.cpp">TLI_Stream.cpp</a></li>
 <li><a href = "../ace/TLI_Stream.h">TLI_Stream.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__TLI__Stream.html">[doxygen]</a></b>
-<li><a href = "../ace/TLI_Stream.i">TLI_Stream.i</a></li>
+<li><a href = "../ace/TLI_Stream.inl">TLI_Stream.inl</a></li>
 </ul>
 </ul>
 <b>[UPIPE_SAP]</b>
@@ -358,15 +358,15 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/UPIPE_Acceptor.cpp">UPIPE_Acceptor.cpp</a></li>
 <li><a href = "../ace/UPIPE_Acceptor.h">UPIPE_Acceptor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__UPIPE__Acceptor.html">[doxygen]</a></b>
-<li><a href = "../ace/UPIPE_Acceptor.i">UPIPE_Acceptor.i</a></li>
+<li><a href = "../ace/UPIPE_Acceptor.inl">UPIPE_Acceptor.inl</a></li>
 <li><a href = "../ace/UPIPE_Connector.cpp">UPIPE_Connector.cpp</a></li>
 <li><a href = "../ace/UPIPE_Connector.h">UPIPE_Connector.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__UPIPE__Connector.html">[doxygen]</a></b>
-<li><a href = "../ace/UPIPE_Connector.i">UPIPE_Connector.i</a></li>
+<li><a href = "../ace/UPIPE_Connector.inl">UPIPE_Connector.inl</a></li>
 <li><a href = "../ace/UPIPE_Stream.cpp">UPIPE_Stream.cpp</a></li>
 <li><a href = "../ace/UPIPE_Stream.h">UPIPE_Stream.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__UPIPE__Stream.html">[doxygen]</a></b>
-<li><a href = "../ace/UPIPE_Stream.i">UPIPE_Stream.i</a></li>
+<li><a href = "../ace/UPIPE_Stream.inl">UPIPE_Stream.inl</a></li>
 </ul>
 <b>[Misc]</b>
 <ul>
@@ -374,14 +374,14 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/IOStream.h">IOStream.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__IOStream.html">[doxygen]</a></b>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__IOStream_T.html">[doxygen]</a></b>
-<li><a href = "../ace/IOStream_T.i">IOStream_T.i</a></li>
+<li><a href = "../ace/IOStream_T.inl">IOStream_T.inl</a></li>
 <li><a href = "../ace/Pipe.cpp">Pipe.cpp</a></li>
 <li><a href = "../ace/Pipe.h">Pipe.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Pipe.html">[doxygen]</a></b>
-<li><a href = "../ace/Pipe.i">Pipe.i</a></li>
+<li><a href = "../ace/Pipe.inl">Pipe.inl</a></li>
 <li><a href = "../ace/Signal.cpp">Signal.cpp</a></li>
 <li><a href = "../ace/Signal.h">Signal.h</a></li>
-<li><a href = "../ace/Signal.i">Signal.i</a></li>
+<li><a href = "../ace/Signal.inl">Signal.inl</a></li>
 </ul>
 </ul>
 <b>[Logging and Tracing]</b>
@@ -393,16 +393,16 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Log_Msg.cpp">Log_Msg.cpp</a></li>
 <li><a href = "../ace/Log_Msg.h">Log_Msg.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Log__Msg.html">[doxygen]</a></b>
-<li><a href = "../ace/Log_Msg.i">Log_Msg.i</a></li>
+<li><a href = "../ace/Log_Msg.inl">Log_Msg.inl</a></li>
 <li><a href = "../ace/Log_Priority.h">Log_Priority.h</a></li>
 <li><a href = "../ace/Log_Record.cpp">Log_Record.cpp</a></li>
 <li><a href = "../ace/Log_Record.h">Log_Record.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Log__Record.html">[doxygen]</a></b>
-<li><a href = "../ace/Log_Record.i">Log_Record.i</a></li>
+<li><a href = "../ace/Log_Record.inl">Log_Record.inl</a></li>
 <li><a href = "../ace/Trace.cpp">Trace.cpp</a></li>
 <li><a href = "../ace/Trace.h">Trace.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Trace.html">[doxygen]</a></b>
-<li><a href = "../ace/Trace.i">Trace.i</a></li>
+<li><a href = "../ace/Trace.inl">Trace.inl</a></li>
 </ul>
 <b>[Memory]</b>
 <ul>
@@ -411,20 +411,20 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Mem_Map.cpp">Mem_Map.cpp</a></li>
 <li><a href = "../ace/Mem_Map.h">Mem_Map.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Mem__Map.html">[doxygen]</a></b>
-<li><a href = "../ace/Mem_Map.i">Mem_Map.i</a></li>
+<li><a href = "../ace/Mem_Map.inl">Mem_Map.inl</a></li>
 </ul>
 <b>[Shared_Malloc]</b>
 <ul>
 <li><a href = "../ace/Malloc.cpp">Malloc.cpp</a></li>
 <li><a href = "../ace/Malloc.h">Malloc.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Malloc.html">[doxygen]</a></b>
-<li><a href = "../ace/Malloc.i">Malloc.i</a></li>
+<li><a href = "../ace/Malloc.inl">Malloc.inl</a></li>
 <li><a href = "../ace/Malloc_T.cpp">Malloc_T.cpp</a></li>
 <li><a href = "../ace/Malloc_T.h">Malloc_T.h</a></li>
-<li><a href = "../ace/Malloc_T.i">Malloc_T.i</a></li>
+<li><a href = "../ace/Malloc_T.inl">Malloc_T.inl</a></li>
 <li><a href = "../ace/Memory_Pool.cpp">Memory_Pool.cpp</a></li>
 <li><a href = "../ace/Memory_Pool.h">Memory_Pool.h</a></li>
-<li><a href = "../ace/Memory_Pool.i">Memory_Pool.i</a></li>
+<li><a href = "../ace/Memory_Pool.inl">Memory_Pool.inl</a></li>
 </ul>
 <b>[Shared_Memory]</b>
 <ul>
@@ -433,11 +433,11 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Shared_Memory_MM.cpp">Shared_Memory_MM.cpp</a></li>
 <li><a href = "../ace/Shared_Memory_MM.h">Shared_Memory_MM.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Shared__Memory__MM.html">[doxygen]</a></b>
-<li><a href = "../ace/Shared_Memory_MM.i">Shared_Memory_MM.i</a></li>
+<li><a href = "../ace/Shared_Memory_MM.inl">Shared_Memory_MM.inl</a></li>
 <li><a href = "../ace/Shared_Memory_SV.cpp">Shared_Memory_SV.cpp</a></li>
 <li><a href = "../ace/Shared_Memory_SV.h">Shared_Memory_SV.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Shared__Memory__SV.html">[doxygen]</a></b>
-<li><a href = "../ace/Shared_Memory_SV.i">Shared_Memory_SV.i</a></li>
+<li><a href = "../ace/Shared_Memory_SV.inl">Shared_Memory_SV.inl</a></li>
 </ul>
 <b>[Utils]</b>
 <ul>
@@ -447,7 +447,7 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Read_Buffer.cpp">Read_Buffer.cpp</a></li>
 <li><a href = "../ace/Read_Buffer.h">Read_Buffer.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Read__Buffer.html">[doxygen]</a></b>
-<li><a href = "../ace/Read_Buffer.i">Read_Buffer.i</a></li>
+<li><a href = "../ace/Read_Buffer.inl">Read_Buffer.inl</a></li>
 </ul>
 </ul>
 <b>[Misc]</b>
@@ -455,29 +455,29 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/ARGV.cpp">ARGV.cpp</a></li>
 <li><a href = "../ace/ARGV.h">ARGV.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__ARGV.html">[doxygen]</a></b>
-<li><a href = "../ace/ARGV.i">ARGV.i</a></li>
+<li><a href = "../ace/ARGV.inl">ARGV.inl</a></li>
 <li><a href = "../ace/Auto_Ptr.cpp">Auto_Ptr.cpp</a></li>
 <li><a href = "../ace/Auto_Ptr.h">Auto_Ptr.h</a></li>
-<li><a href = "../ace/Auto_Ptr.i">Auto_Ptr.i</a></li>
+<li><a href = "../ace/Auto_Ptr.inl">Auto_Ptr.inl</a></li>
 <li><a href = "../ace/Date_Time.cpp">Date_Time.cpp</a></li>
 <li><a href = "../ace/Date_Time.h">Date_Time.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Date__Time.html">[doxygen]</a></b>
-<li><a href = "../ace/Date_Time.i">Date_Time.i</a></li>
+<li><a href = "../ace/Date_Time.inl">Date_Time.inl</a></li>
 <li><a href = "../ace/Dynamic.cpp">Dynamic.cpp</a></li>
 <li><a href = "../ace/Dynamic.h">Dynamic.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Dynamic.html">[doxygen]</a></b>
-<li><a href = "../ace/Dynamic.i">Dynamic.i</a></li>
+<li><a href = "../ace/Dynamic.inl">Dynamic.inl</a></li>
 <li><a href = "../ace/Get_Opt.cpp">Get_Opt.cpp</a></li>
 <li><a href = "../ace/Get_Opt.h">Get_Opt.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Get__Opt.html">[doxygen]</a></b>
-<li><a href = "../ace/Get_Opt.i">Get_Opt.i</a></li>
+<li><a href = "../ace/Get_Opt.inl">Get_Opt.inl</a></li>
 <li><a href = "../ace/Registry.cpp">Registry.cpp</a></li>
 <li><a href = "../ace/Registry.h">Registry.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Registry.html">[doxygen]</a></b>
 <li><a href = "../ace/Singleton.cpp">Singleton.cpp</a></li>
 <li><a href = "../ace/Singleton.h">Singleton.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Singleton.html">[doxygen]</a></b>
-<li><a href = "../ace/Singleton.i">Singleton.i</a></li>
+<li><a href = "../ace/Singleton.inl">Singleton.inl</a></li>
 <li><a href = "../ace/System_Time.cpp">System_Time.cpp</a></li>
 <li><a href = "../ace/System_Time.h">System_Time.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__System__Time.html">[doxygen]</a></b>
@@ -512,48 +512,48 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/ACE.cpp">ACE.cpp</a></li>
 <li><a href = "../ace/ACE.h">ACE.h</a></li>
-<b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE.html">[doxygen]</a></b>
-<li><a href = "../ace/ACE.i">ACE.i</a></li>
+<b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/namespaceACE.html">[doxygen]</a></b>
+<li><a href = "../ace/ACE.inl">ACE.inl</a></li>
 <li><a href = "../ace/OS.cpp">OS.cpp</a></li>
 <li><a href = "../ace/OS.h">OS.h</a></li>
-<b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__OS.html">[doxygen]</a></b>
-<li><a href = "../ace/OS.i">OS.i</a></li>
+<b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/namespaceACE__OS.html">[doxygen]</a></b>
+<li><a href = "../ace/OS.inl">OS.inl</a></li>
 </ul>
 <b>[Reactor]</b>
 <ul>
 <li><a href = "../ace/Event_Handler.cpp">Event_Handler.cpp</a></li>
 <li><a href = "../ace/Event_Handler.h">Event_Handler.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Event__Handler.html">[doxygen]</a></b>
-<li><a href = "../ace/Event_Handler.i">Event_Handler.i</a></li>
+<li><a href = "../ace/Event_Handler.inl">Event_Handler.inl</a></li>
 <li><a href = "../ace/Event_Handler_T.cpp">Event_Handler_T.cpp</a></li>
 <li><a href = "../ace/Event_Handler_T.h">Event_Handler_T.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Event__Handler__T.html">[doxygen]</a></b>
-<li><a href = "../ace/Event_Handler_T.i">Event_Handler_T.i</a></li>
+<li><a href = "../ace/Event_Handler_T.inl">Event_Handler_T.inl</a></li>
 <li><a href = "../ace/Handle_Set.cpp">Handle_Set.cpp</a></li>
 <li><a href = "../ace/Handle_Set.h">Handle_Set.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Handle__Set.html">[doxygen]</a></b>
-<li><a href = "../ace/Handle_Set.i">Handle_Set.i</a></li>
+<li><a href = "../ace/Handle_Set.inl">Handle_Set.inl</a></li>
 <li><a href = "../ace/Priority_Reactor.cpp">Priority_Reactor.cpp</a></li>
-<li><a href = "../ace/Priority_Reactor.i">Priority_Reactor.i</a></li>
+<li><a href = "../ace/Priority_Reactor.inl">Priority_Reactor.inl</a></li>
 <li><a href = "../ace/Priority_Reactor.h">Priority_Reactor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Priority__Reactor.html">[doxygen]</a></b>
 <li><a href = "../ace/Proactor.h">Proactor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Proactor.html">[doxygen]</a></b>
-<li><a href = "../ace/Proactor.i">Proactor.i</a></li>
+<li><a href = "../ace/Proactor.inl">Proactor.inl</a></li>
 <li><a href = "../ace/Proactor.cpp">Proactor.cpp</a></li>
 <li><a href = "../ace/Reactor.cpp">Reactor.cpp</a></li>
 <li><a href = "../ace/Reactor.h">Reactor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Reactor.html">[doxygen]</a></b>
-<li><a href = "../ace/Reactor.i">Reactor.i</a></li>
+<li><a href = "../ace/Reactor.inl">Reactor.inl</a></li>
 <li><a href = "../ace/Reactor_Impl.h">Reactor_Impl.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Reactor__Impl.html">[doxygen]</a></b>
 <li><a href = "../ace/Select_Reactor.cpp">Select_Reactor.cpp</a></li>
 <li><a href = "../ace/Select_Reactor.h">Select_Reactor.h</a></li>
-<li><a href = "../ace/Select_Reactor.i">Select_Reactor.i</a></li>
+<li><a href = "../ace/Select_Reactor.inl">Select_Reactor.inl</a></li>
 <li><a href = "../ace/WFMO_Reactor.cpp">WFMO_Reactor.cpp</a></li>
 <li><a href = "../ace/WFMO_Reactor.h">WFMO_Reactor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__WFMO__Reactor.html">[doxygen]</a></b>
-<li><a href = "../ace/WFMO_Reactor.i">WFMO_Reactor.i</a></li>
+<li><a href = "../ace/WFMO_Reactor.inl">WFMO_Reactor.inl</a></li>
 <li><a href = "../ace/XtReactor.cpp">XtReactor.cpp</a></li>
 <li><a href = "../ace/XtReactor.h">XtReactor.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__XtReactor.html">[doxygen]</a></b>
@@ -566,30 +566,30 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Parse_Node.cpp">Parse_Node.cpp</a></li>
 <li><a href = "../ace/Parse_Node.h">Parse_Node.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Parse__Node.html">[doxygen]</a></b>
-<li><a href = "../ace/Parse_Node.i">Parse_Node.i</a></li>
+<li><a href = "../ace/Parse_Node.inl">Parse_Node.inl</a></li>
 <li><a href = "../ace/Service_Config.cpp">Service_Config.cpp</a></li>
 <li><a href = "../ace/Service_Config.h">Service_Config.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Service__Config.html">[doxygen]</a></b>
-<li><a href = "../ace/Service_Config.i">Service_Config.i</a></li>
+<li><a href = "../ace/Service_Config.inl">Service_Config.inl</a></li>
 <li><a href = "../ace/Service_Manager.cpp">Service_Manager.cpp</a></li>
 <li><a href = "../ace/Service_Manager.h">Service_Manager.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Service__Manager.html">[doxygen]</a></b>
-<li><a href = "../ace/Service_Manager.i">Service_Manager.i</a></li>
+<li><a href = "../ace/Service_Manager.inl">Service_Manager.inl</a></li>
 <li><a href = "../ace/Service_Object.cpp">Service_Object.cpp</a></li>
 <li><a href = "../ace/Service_Object.h">Service_Object.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Service__Object.html">[doxygen]</a></b>
-<li><a href = "../ace/Service_Object.i">Service_Object.i</a></li>
+<li><a href = "../ace/Service_Object.inl">Service_Object.inl</a></li>
 <li><a href = "../ace/Service_Repository.cpp">Service_Repository.cpp</a></li>
 <li><a href = "../ace/Service_Repository.h">Service_Repository.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Service__Repository.html">[doxygen]</a></b>
-<li><a href = "../ace/Service_Repository.i">Service_Repository.i</a></li>
+<li><a href = "../ace/Service_Repository.inl">Service_Repository.inl</a></li>
 <li><a href = "../ace/Service_Types.cpp">Service_Types.cpp</a></li>
-<li><a href = "../ace/Service_Types.i">Service_Types.i</a></li>
+<li><a href = "../ace/Service_Types.inl">Service_Types.inl</a></li>
 <li><a href = "../ace/Service_Types.h">Service_Types.h</a></li>
 <li><a href = "../ace/Shared_Object.cpp">Shared_Object.cpp</a></li>
 <li><a href = "../ace/Shared_Object.h">Shared_Object.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Shared__Object.html">[doxygen]</a></b>
-<li><a href = "../ace/Shared_Object.i">Shared_Object.i</a></li>
+<li><a href = "../ace/Shared_Object.inl">Shared_Object.inl</a></li>
 <li><a href = "../ace/Svc_Conf.h">Svc_Conf.h</a></li>
 <li><a href = "../ace/Svc_Conf_l.cpp">Svc_Conf_l.cpp</a></li>
 <li><a href = "../ace/Svc_Conf_y.cpp">Svc_Conf_y.cpp</a></li>
@@ -600,36 +600,36 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/IO_Cntl_Msg.cpp">IO_Cntl_Msg.cpp</a></li>
 <li><a href = "../ace/IO_Cntl_Msg.h">IO_Cntl_Msg.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__IO__Cntl__Msg.html">[doxygen]</a></b>
-<li><a href = "../ace/IO_Cntl_Msg.i">IO_Cntl_Msg.i</a></li>
+<li><a href = "../ace/IO_Cntl_Msg.inl">IO_Cntl_Msg.inl</a></li>
 <li><a href = "../ace/Message_Block.cpp">Message_Block.cpp</a></li>
 <li><a href = "../ace/Message_Block.h">Message_Block.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Message__Block.html">[doxygen]</a></b>
-<li><a href = "../ace/Message_Block.i">Message_Block.i</a></li>
+<li><a href = "../ace/Message_Block.inl">Message_Block.inl</a></li>
 <li><a href = "../ace/Message_Queue.cpp">Message_Queue.cpp</a></li>
 <li><a href = "../ace/Message_Queue.h">Message_Queue.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Message__Queue.html">[doxygen]</a></b>
-<li><a href = "../ace/Message_Queue.i">Message_Queue.i</a></li>
+<li><a href = "../ace/Message_Queue.inl">Message_Queue.inl</a></li>
 <li><a href = "../ace/Message_Queue_T.cpp">Message_Queue_T.cpp</a></li>
 <li><a href = "../ace/Message_Queue_T.h">Message_Queue_T.h</a></li>
-<li><a href = "../ace/Message_Queue_T.i">Message_Queue_T.i</a></li>
+<li><a href = "../ace/Message_Queue_T.inl">Message_Queue_T.inl</a></li>
 <li><a href = "../ace/Module.cpp">Module.cpp</a></li>
 <li><a href = "../ace/Module.h">Module.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Module.html">[doxygen]</a></b>
-<li><a href = "../ace/Module.i">Module.i</a></li>
+<li><a href = "../ace/Module.inl">Module.inl</a></li>
 <li><a href = "../ace/Stream.cpp">Stream.cpp</a></li>
 <li><a href = "../ace/Stream.h">Stream.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Stream.html">[doxygen]</a></b>
-<li><a href = "../ace/Stream.i">Stream.i</a></li>
+<li><a href = "../ace/Stream.inl">Stream.inl</a></li>
 <li><a href = "../ace/Stream_Modules.cpp">Stream_Modules.cpp</a></li>
 <li><a href = "../ace/Stream_Modules.h">Stream_Modules.h</a></li>
-<li><a href = "../ace/Stream_Modules.i">Stream_Modules.i</a></li>
+<li><a href = "../ace/Stream_Modules.inl">Stream_Modules.inl</a></li>
 <li><a href = "../ace/Task.cpp">Task.cpp</a></li>
 <li><a href = "../ace/Task.h">Task.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Task.html">[doxygen]</a></b>
-<li><a href = "../ace/Task.i">Task.i</a></li>
+<li><a href = "../ace/Task.inl">Task.inl</a></li>
 <li><a href = "../ace/Task_T.cpp">Task_T.cpp</a></li>
 <li><a href = "../ace/Task_T.h">Task_T.h</a></li>
-<li><a href = "../ace/Task_T.i">Task_T.i</a></li>
+<li><a href = "../ace/Task_T.inl">Task_T.inl</a></li>
 </ul>
 <b>[System_V_IPC]</b>
 <ul>
@@ -638,38 +638,38 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/SV_Message.cpp">SV_Message.cpp</a></li>
 <li><a href = "../ace/SV_Message.h">SV_Message.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SV__Message.html">[doxygen]</a></b>
-<li><a href = "../ace/SV_Message.i">SV_Message.i</a></li>
+<li><a href = "../ace/SV_Message.inl">SV_Message.inl</a></li>
 <li><a href = "../ace/SV_Message_Queue.cpp">SV_Message_Queue.cpp</a></li>
 <li><a href = "../ace/SV_Message_Queue.h">SV_Message_Queue.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SV__Message__Queue.html">[doxygen]</a></b>
-<li><a href = "../ace/SV_Message_Queue.i">SV_Message_Queue.i</a></li>
+<li><a href = "../ace/SV_Message_Queue.inl">SV_Message_Queue.inl</a></li>
 <li><a href = "../ace/Typed_SV_Message.cpp">Typed_SV_Message.cpp</a></li>
 <li><a href = "../ace/Typed_SV_Message.h">Typed_SV_Message.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Typed__SV__Message.html">[doxygen]</a></b>
-<li><a href = "../ace/Typed_SV_Message.i">Typed_SV_Message.i</a></li>
+<li><a href = "../ace/Typed_SV_Message.inl">Typed_SV_Message.inl</a></li>
 <li><a href = "../ace/Typed_SV_Message_Queue.cpp">Typed_SV_Message_Queue.cpp</a></
 li>
 <li><a href = "../ace/Typed_SV_Message_Queue.h">Typed_SV_Message_Queue.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Typed__SV__Message__Queue.html">[doxygen]</a></b>
-<li><a href = "../ace/Typed_SV_Message_Queue.i">Typed_SV_Message_Queue.i</a></li>
+<li><a href = "../ace/Typed_SV_Message_Queue.inl">Typed_SV_Message_Queue.inl</a></li>
 </ul>
 <b>[System_V_Semaphores]</b>
 <ul>
 <li><a href = "../ace/SV_Semaphore_Complex.cpp">SV_Semaphore_Complex.cpp</a></li>
 <li><a href = "../ace/SV_Semaphore_Complex.h">SV_Semaphore_Complex.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SV__Semaphore__Complex.html">[doxygen]</a></b>
-<li><a href = "../ace/SV_Semaphore_Complex.i">SV_Semaphore_Complex.i</a></li>
+<li><a href = "../ace/SV_Semaphore_Complex.inl">SV_Semaphore_Complex.inl</a></li>
 <li><a href = "../ace/SV_Semaphore_Simple.cpp">SV_Semaphore_Simple.cpp</a></li>
 <li><a href = "../ace/SV_Semaphore_Simple.h">SV_Semaphore_Simple.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SV__Semaphore__Simple.html">[doxygen]</a></b>
-<li><a href = "../ace/SV_Semaphore_Simple.i">SV_Semaphore_Simple.i</a></li>
+<li><a href = "../ace/SV_Semaphore_Simple.inl">SV_Semaphore_Simple.inl</a></li>
 </ul>
 <b>[System_V_Shared_Memory]</b>
 <ul>
 <li><a href = "../ace/SV_Shared_Memory.cpp">SV_Shared_Memory.cpp</a></li>
 <li><a href = "../ace/SV_Shared_Memory.h">SV_Shared_Memory.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__SV__Shared__Memory.html">[doxygen]</a></b>
-<li><a href = "../ace/SV_Shared_Memory.i">SV_Shared_Memory.i</a></li>
+<li><a href = "../ace/SV_Shared_Memory.inl">SV_Shared_Memory.inl</a></li>
 </ul>
 </ul>
 <b>[Timers]</b>
@@ -677,11 +677,11 @@ li>
 <li><a href = "../ace/High_Res_Timer.cpp">High_Res_Timer.cpp</a></li>
 <li><a href = "../ace/High_Res_Timer.h">High_Res_Timer.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__High__Res__Timer.html">[doxygen]</a></b>
-<li><a href = "../ace/High_Res_Timer.i">High_Res_Timer.i</a></li>
+<li><a href = "../ace/High_Res_Timer.inl">High_Res_Timer.inl</a></li>
 <li><a href = "../ace/Profile_Timer.cpp">Profile_Timer.cpp</a></li>
 <li><a href = "../ace/Profile_Timer.h">Profile_Timer.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Profile__Timer.html">[doxygen]</a></b>
-<li><a href = "../ace/Profile_Timer.i">Profile_Timer.i</a></li>
+<li><a href = "../ace/Profile_Timer.inl">Profile_Timer.inl</a></li>
 <li><a href = "../ace/Time_Request_Reply.cpp">Time_Request_Reply.cpp</a></li>
 <li><a href = "../ace/Time_Request_Reply.h">Time_Request_Reply.h</a></li>
 <li><a href = "../ace/Time_Value.h">Time_Value.h</a></li>
@@ -703,14 +703,14 @@ li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Timer__List__T.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_Queue.cpp">Timer_Queue.cpp</a></li>
 <li><a href = "../ace/Timer_Queue.h">Timer_Queue.h</a></li>
-<li><a href = "../ace/Timer_Queue.i">Timer_Queue.i</a></li>
+<li><a href = "../ace/Timer_Queue.inl">Timer_Queue.inl</a></li>
 <li><a href = "../ace/Timer_Queue_Adapters.cpp">Timer_Queue_Adapters.cpp</a></li>
 <li><a href = "../ace/Timer_Queue_Adapters.h">Timer_Queue_Adapters.h</a></li>
-<li><a href = "../ace/Timer_Queue_Adapters.i">Timer_Queue_Adapters.i</a></li>
+<li><a href = "../ace/Timer_Queue_Adapters.inl">Timer_Queue_Adapters.inl</a></li>
 <li><a href = "../ace/Timer_Queue_T.cpp">Timer_Queue_T.cpp</a></li>
 <li><a href = "../ace/Timer_Queue_T.h">Timer_Queue_T.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Timer__Queue__T.html">[doxygen]</a></b>
-<li><a href = "../ace/Timer_Queue_T.i">Timer_Queue_T.i</a></li>
+<li><a href = "../ace/Timer_Queue_T.inl">Timer_Queue_T.inl</a></li>
 <li><a href = "../ace/Timer_Wheel.cpp">Timer_Wheel.cpp</a></li>
 <li><a href = "../ace/Timer_Wheel.h">Timer_Wheel.h</a></li>
 <li><a href = "../ace/Timer_Wheel_T.cpp">Timer_Wheel_T.cpp</a></li>
@@ -721,23 +721,23 @@ li>
 <ul>
 <li><a href = "../ace/Local_Tokens.cpp">Local_Tokens.cpp</a></li>
 <li><a href = "../ace/Local_Tokens.h">Local_Tokens.h</a></li>
-<li><a href = "../ace/Local_Tokens.i">Local_Tokens.i</a></li>
+<li><a href = "../ace/Local_Tokens.inl">Local_Tokens.inl</a></li>
 <li><a href = "../ace/Remote_Tokens.cpp">Remote_Tokens.cpp</a></li>
 <li><a href = "../ace/Remote_Tokens.h">Remote_Tokens.h</a></li>
-<li><a href = "../ace/Remote_Tokens.i">Remote_Tokens.i</a></li>
+<li><a href = "../ace/Remote_Tokens.inl">Remote_Tokens.inl</a></li>
 <li><a href = "../ace/Token_Collection.cpp">Token_Collection.cpp</a></li>
 <li><a href = "../ace/Token_Collection.h">Token_Collection.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Token__Collection.html">[doxygen]</a></b>
-<li><a href = "../ace/Token_Collection.i">Token_Collection.i</a></li>
+<li><a href = "../ace/Token_Collection.inl">Token_Collection.inl</a></li>
 <li><a href = "../ace/Token_Manager.cpp">Token_Manager.cpp</a></li>
 <li><a href = "../ace/Token_Manager.h">Token_Manager.h</a></li>
 <b><a href = "http://www.dre.vanderbilt.edu/Doxygen/Current/html/ace/classACE__Token__Manager.html">[doxygen]</a></b>
-<li><a href = "../ace/Token_Manager.i">Token_Manager.i</a></li>
+<li><a href = "../ace/Token_Manager.inl">Token_Manager.inl</a></li>
 <li><a href = "../ace/Token_Request_Reply.cpp">Token_Request_Reply.cpp</a></li>
 <li><a href = "../ace/Token_Request_Reply.h">Token_Request_Reply.h</a></li>
-<li><a href = "../ace/Token_Request_Reply.i">Token_Request_Reply.i</a></li>
+<li><a href = "../ace/Token_Request_Reply.inl">Token_Request_Reply.inl</a></li>
 <li><a href = "../ace/Token_Invariants.h">Token_Invariants.h</a></li>
-<li><a href = "../ace/Token_Invariants.i">Token_Invariants.i</a></li>
+<li><a href = "../ace/Token_Invariants.inl">Token_Invariants.inl</a></li>
 <li><a href = "../ace/Token_Invariants.cpp">Token_Invariants.cpp</a></li>
 </ul>
 </ul>
diff --git a/docs/ACE-guidelines.html b/docs/ACE-guidelines.html
index 486ab50300e..f7a3bbf6f79 100644
--- a/docs/ACE-guidelines.html
+++ b/docs/ACE-guidelines.html
@@ -42,21 +42,21 @@ bgcolor="#ffffff">
         reading code.  And, it avoids mangling problems with email
         and net news.<p>
 
-	<li>Try to avoid creating files with exceesively long names (45 characters).
-        Moreover, ensure that the names of generated files eg. MakeProjectCreator,
-        tao_idl do not also go beyond that limit. Some operating
+        <li>Try to avoid creating files with excessively long names (45 characters).
+        Moreover, ensure that the names of generated files e.g. <code>MakeProjectCreator</code>,
+        <code>tao_idl</code> do not also go beyond that limit. Some operating
         systems cannot handle very long file names correctly.<p>
 
     <li>If you add a comment to code that is directed to, or
         requires the attention of, a particular individual:
         <strong>SEND EMAIL TO THAT INDIVIDUAL!</strong>.<p>
 
-    <li>Every program should have a ``usage'' message.  It should be
+    <li>Every program should have a "usage" message.  It should be
         printed out if erroneous command line arguments, or a
         <strong><code>-?</code></strong> command line argument, are
         provided to the program.<p>
 
-    <li>A program entry poing <code>main</code> can take any of the
+    <li>A program entry point <code>main</code> can take any of the
         three forms:
         <p><pre>
         int main (int argc, char *argv[])
@@ -64,15 +64,15 @@ bgcolor="#ffffff">
         int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         </pre></p>
         Of them, the entry point <code>main</code> always gives you
-        the command line arguemnt in char strings form.  The entry
+        the command line argument in char strings form.  The entry
         point <code>wmain</code> currently can only be used under
-        Win32 and it returns the command line arguments in wchar
+        Win32 and it returns the command line arguments in <code>wchar</code>
         strings format.  Defining the <code>ACE_TMAIN</code> as the
         program entry point is the more portable form.  The command
         line arguments are given in char strings in most cases,
-        or wchar strings when <code>ACE_USES_WCHAR</code> is defined.
+        or <code>wchar</code> strings when <code>ACE_USES_WCHAR</code> is defined.
         See <code>$ACE_ROOT/docs/wchar.txt</code> for more information
-        on ACE support on wchar.
+        on ACE support on <code>wchar</code>.
 
     <li>The program entry point function, in any form mentioned above, must
         always be declared with arguments, <em>e.g.</em>,
@@ -100,21 +100,24 @@ bgcolor="#ffffff">
 
         Please declare the second argument as <code>ACE_TCHAR *[]</code>
         instead of <code>ACE_TCHAR **</code> or <code>char *[]</CODE>.
-        Ancient versions of MSC
+        Ancient versions of MSC++
         complained about <code>ACE_TCHAR **</code> and <code>char
         *[]</CODE> is not Unicode-compliant.<p>
 
         <code>main</code> must also return 0 on successful
         termination, and non-zero otherwise.<p>
 
-    <li>Avoid use of floating point types (float and double) and operations
+    <li>Avoid use of floating point types (<code>float</code> and
+            <code>double</code>) and operations
         unless absolutely necessary.  Not all ACE platforms support them.
-        Therefore, wherever they are used, ACE_LACKS_FLOATING_POINT
+        Therefore, wherever they are used, <code>ACE_LACKS_FLOATING_POINT</code>
         conditional code must be also be used.<p>
 
-    <li>Avoid including the string ``Error'' in a source code filename.
-        GNU Make's error messages start with ``Error''.  So, it's much
-        easier to search for errors if filenames don't contain ``Error''.<p>
+    <li>Avoid including the string "<code>Error</code>" in a source
+            code filename. GNU Make's error messages start with
+            "<code>Error</code>".  So, it's much easier to search for
+            errors if filenames don't contain "<code>Error</code>".<p>
+
 
     <li>Narrow interfaces are better than wide interfaces.  If there
         isn't a need for an interface, leave it out.  This eases maintenance,
@@ -193,34 +196,34 @@ bgcolor="#ffffff">
     <li>Always insert a <strong><code>/**/</code></strong> between an
         <strong><code>#include</code></strong> and
         <strong><code>filename</code></strong>, for system headers and
-        <strong><code>ace/pre.h</code></strong> and 
-        <strong><code>ace/post.h</code></strong> as 
-        shown in the above example.  This avoids dependency problems 
+        <strong><code>ace/pre.h</code></strong> and
+        <strong><code>ace/post.h</code></strong> as
+        shown in the above example.  This avoids dependency problems
         with Visual C++ and prevents Doxygen from including the
         headers in the file reference trees.  <p>
 
-    <li>Be very careful with names of macros, enum values, and variables
+    <li>Be very careful with names of macros, <code>enum</code> values, and variables
         It's always best to prefix them with something like <code>ACE_</code>
         or <code>TAO_</code>.  There are too many system headers out
-        there that #define <code>OK</code>, <code>SUCCESS</code>,
+        there that <code>#define</code> <code>OK</code>, <code>SUCCESS</code>,
         <code>ERROR</code>, <code>index</code>, <code>s_type</code>,
         and so on.<p>
 
     <li>When using macros in an arithmetic expression, be sure to test
-      that the macro is defined, using defined(macro) before specifying
+      that the macro is defined, using <code>defined(<em>macro</em>)</code> before specifying
       the expression.  For example:
 <pre>
 #if __FreeBSD__ &lt; 3
 </pre>
 
-will evaluate true on any platform where __FreeBSD__ is not defined.
-The correct way to write that guard is:
+will evaluate true on any platform where <code>__FreeBSD__</code> is
+not defined.  The correct way to write that guard is:
 <pre>
 #if defined (__FreeBSD__)  &&  __FreeBSD__ &lt; 3
 </pre>
 
-    <li>Try to centralize <code>#ifdefs</code> with <code>typedefs</code>
-        and <code>#defines</code>.  For example, use this:
+    <li>Try to centralize <code>#ifdef</code>s with <code>typedef</code>s
+        and <code>#define</code>s.  For example, use this:
         <pre>
         #if defined(ACE_PSOS)
           typedef long ACE_NETIF_TYPE;
@@ -258,7 +261,7 @@ The correct way to write that guard is:
         file once per compilation unit.  Thanks to Eric C. Newton
         &lt;ecn@smart.net&gt; for pointing that out.<p>
 
-        If the header <code>#includes</code> an ACE library header,
+        If the header <code>#include</code>s an ACE library header,
         then it's a good idea to include the <code>#pragma once</code>
         directive:
         <pre>
@@ -324,8 +327,8 @@ The correct way to write that guard is:
       To avoid multiple inclusions of the <code>.cpp</code> file it
       should also be protected as in:
       <pre>
-      #ifndef FOO_T_C
-      #define FOO_T_C
+      #ifndef FOO_T_CPP
+      #define FOO_T_CPP
 
       #include "Foo_T.h"
       #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -336,8 +339,6 @@ The correct way to write that guard is:
       #include "ace/Foo_T.inl"
       #endif /* __ACE_INLINE__ */
 
-      ACE_RCSID(lib, Foo_T, "$<!-- -->Id$")
-
       // put your template code here
 
       #endif /* FOO_T_H */
@@ -402,22 +403,22 @@ The correct way to write that guard is:
   <ul>
     <li><strong><code>for</code></strong> loops should look like:
         <pre>
-        for (u_int i = 0; i &lt; count; ++i)
+        for (unsigned int i = 0; i &lt; count; ++i)
           ++total;
         </pre>
         Though, I prefer to always wrap the body of the loop in braces,
         to avoid surprises when other code or debugging statements are
         added, and to maintain sanity when the body consists of a macro,
-        such as an ACE_ASSERT without a trailing semicolon:
+        such as an <code>ACE_ASSERT</code> without a trailing semicolon:
         <pre>
-        for (u_int i = 0; i &lt; count; ++i)
+        for (unsigned int i = 0; i &lt; count; ++i)
           {
             ACE_ASSERT (++total &lt; UINT_MAX;)
           }
         </pre><p>
 
         Similarly, <strong><code>if</code></strong> statements should have
-        a space after the ``<strong>if</strong>'', and no spaces just after
+        a space after the "<strong>if</strong>", and no spaces just after
         the opening parenthesis and just before the closing parenthesis.<p>
 
     <li>If a loop index is used after the body of the loop, it
@@ -437,7 +438,7 @@ The correct way to write that guard is:
         file_name [i] = '\0';
         </pre><p>
 
-   <li>Prefix operators are sometimes more efficient than postfix
+   <li>Prefix operators are generally more efficient than postfix
        operators.  Therefore, they are preferred over their postfix
        counterparts where the expression value is not used.<p>
 
@@ -462,9 +463,10 @@ The correct way to write that guard is:
     less error prone, and will help you avoid bugs caused due to the
     precedence of <strong> <code> ?: </code> </strong>, compared with other
     operators in an expression.
-    
-    <li>When a class provides operator==, it must also provide
-        operator!=.  Also, both these operators must be const.
+
+    <li>When a class provides <code>operator==</code>, it must also provide
+        <code>operator!=</code>.  Also, both these operators must be
+        <code>const</code> and return <code>bool</code>.
 
     <li>Avoid unnecessary parenthesis.  We're not writing Lisp :-)<p>
 
@@ -509,25 +511,27 @@ The correct way to write that guard is:
 ACE_INLINE
 Foo::bar ()
 {
-  this-&gt;baz();
+  this-&gt;baz ();
 }
 </pre><p>
 
-        <li>The notable exception is virtual functions, which should never be
-          inlined.<p>
+        <li>The notable exception is virtual functions, which should
+            generally not be inlined.<p>
 
         <li>Big (more than 10 lines) and complex function (more than one if ()
           statement, or a switch, or a loop) should not be inlined.<p>
 
         <li>Medium sized stuff depends on how performance critical it is.
-          If you know that it's in the critical path, then make it inline.<p>
+          If you know that it's in the critical path, then make it
+                inline.  When in doubt, profile the code.<p>
       </ul>
 
     <li><code>ACE_Export</code> must be inserted between the
         <code>class</code> keyword and class name for all classes that
         are exported from libraries, as shown in the example above.
         <strong>However</strong>, do <strong>not</strong> use
-        <code>ACE_Export</code> for template classes!<p>
+        <code>ACE_Export</code> for template classes or classes that
+        are not used out of the ACE library, for example.!<p>
 
     <li>Mutators and accessors should be of this form:<p>
 
@@ -539,7 +543,7 @@ Foo::bar ()
         // Returns the &lt;ACE_INET_Addr&gt; for this profile.
         </pre><p>
 
-        instead of the ``set_'' and ``get_'' form.<p>
+        instead of the "set_" and "get_" form.<p>
 
     <li>Never use <strong><code>delete</code></strong> to deallocate
         memory that was allocated with <strong><code>malloc</code></strong>.
@@ -570,10 +574,6 @@ Foo::bar ()
         of <strong>NULL</strong> is implementation dependent, so it is
         difficult to use portably without casting.<p>
 
-    <li>Never use TRUE, true, or anything else other than 1 to indicate
-        true.  Never use FALSE, false, or anything else other than 0 to
-        indicate false.<p>
-
     <li>Never cast a pointer to or from an <strong><code>int</code></strong>.
         On all currently supported ACE platforms, it is safe to cast
         a pointer to or from a <strong><code>long</code></strong>.<p>
@@ -643,7 +643,7 @@ Foo::bar ()
         But, beware if the initialization is of a static variable.
         A static variable is only initialized the first time its
         declaration is seen.  Of course, we should avoid using
-        static variables at all.<p>
+        static (and non-constant) variables at all.<p>
 
     <li>It is usually clearer to write conditionals that have
         both branches without a negated condition.  For example,<p>
@@ -672,26 +672,9 @@ Foo::bar ()
           }
         </pre><p>
 
-    <li>If a cast is necessary, avoid use of function-style casts,
-        <em>e.g.</em>, <code>int (foo)</code>.  Instead, use
-        one of the ACE cast macros:
-
-        <pre>
-        return ACE_static_cast(size_t, this-&gt;count_) &gt; that-&gt;size_;
-        </pre><p>
-
-        The general usage guidelines for the four styles of casts are:<p>
-        <ul>
-          <li><strong>ACE_const_cast</strong>: use to cast away
-            constness, or volatile-ness.<p>
-          <li><strong>ACE_static_cast</strong>: use to cast between
-            compatible types, such as downcasting a pointer or narrowing
-            an integer.<p>
-          <li><strong>ACE_reinterpret_cast</strong>: use only when
-            ACE_static_cast is not suitable.<p>
-          <li><strong>ACE_dynamic_cast</strong>: avoid, unless you really
-            want to type check at run-time.<p>
-        </ul>
+    <li>If a cast is necessary, avoid use of C-style "sledgehammer"
+            casts.  Use standard C++ casts
+            (e.g. <code>static_cast&lt;int&gt; (foo)</code>) instead.<p>
 
     <li>In general, if instances of a class should not be copied,
         then a private copy constructor and assignment operator should
@@ -716,9 +699,10 @@ Foo::bar ()
         classes as well.  Though for consistency and maximum safety, it
         should be avoided for non-template classes.<p>
 
-    <li>Never use <code>bool</code>, <code>BOOL</code>, or similar
-        types.  (CORBA::Boolean is acceptable).  Use <code>int</code>
-        or <code>u_int</code> instead for boolean types.<p>
+    <li>Never use <code>BOOL</code>, or similar types.
+            (<code>ACE_CDR::Boolean</code> and
+            <code>CORBA::Boolean</code> are acceptable).  Use the
+            standard C++ <code>bool</code> for boolean variables, instead.<p>
 
     <li>Functions should always return -1 to indicate failure, and
         0 or greater to indicate success.<p>
@@ -755,19 +739,20 @@ Foo::bar ()
   <li><strong>WCHAR conformity</strong><p>
 
   <ul>
-     <li>For ACE, use ACE_TCHAR instead of char for strings and ACE_TEXT ()
-         around string literals.  Exceptions are char arrays used for data
-         and strings that need to remain as 1 byte characters.
+     <li>For ACE, use <code>ACE_TCHAR</code> instead of char for strings and <code>ACE_TEXT()</code>
+         around string literals.  Exceptions are <code>char</code>
+            arrays used for data  and strings that need to remain as 1
+            byte characters.
 
-     <li>If you have a char string that needs to be converted to ACE_TCHAR,
-         use the ACE_TEXT_CHAR_TO_TCHAR () macro.  If you have a ACE_TCHAR
-         string that needs to be converted to a char string, use the
-         ACE_TEXT_ALWAYS_CHAR () macro
+     <li>If you have a char string that needs to be converted to <code>ACE_TCHAR</code>,
+         use the <code>ACE_TEXT_CHAR_TO_TCHAR()</code> macro.  If you have a <code>ACE_TCHAR</code>
+         string that needs to be converted to a <code>char</code> string, use the
+         <code>ACE_TEXT_ALWAYS_CHAR()</code> macro
 
-     <li>Do not use the Win32 TCHAR macros.  The wide character-ness of ACE
+     <li>Do not use the Win32 <code>TCHAR</code> macros.  The wide character-ness of ACE
          is separate from UNICODE and _UNICODE.
 
-     <li>For TAO, don't use ACE_TCHAR or ACE_TEXT.  The CORBA specification
+     <li>For TAO, don't use <code>ACE_TCHAR</code> or <code>ACE_TEXT</code>.  The CORBA specification
          defines APIs as using char.  So most of the time there is no need
          to use wide characters.
   </ul><P>
@@ -918,13 +903,14 @@ Foo::bar ()
 <h3><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">ACE</a>
   Usage Guidelines</h3>
 <ul>
-  <li>Always use <strong><code>ACE_OS</code></strong> (static)
-      member functions instead of bare OS system calls.<p>
+  <li>Always use the <strong><code>ACE_OS</code></strong>
+      namespace functions instead of bare OS system calls.<p>
 
   <li>As a general rule, the only functions that should go into the
-      <strong><code>ACE_OS</code></strong> class are ones that have
-      direct equivalents on some OS platform.  Functions that are
-      extensions should go in the <strong><code>ACE</code></strong> class.<p>
+      <strong><code>ACE_OS</code></strong> namespace are ones that
+        have direct equivalents on some OS platform.  Functions that
+        are extensions should go in the
+        <strong><code>ACE</code></strong> namespace.<p>
 
   <li>Use the <strong><code>ACE_SYNCH_MUTEX</code></strong> macro,
       instead of using one of the specific mutexes, such as
@@ -952,10 +938,6 @@ Foo::bar ()
       This allows statics suchs as locks to be safely created.  We do not
       want to violate this assumption.<p>
 
-  <li>Do not use run-time type identification (RTTI) directly since some platforms
-      do not support it.  Instead, use the ACE macros, e.g.,
-      <CODE>ACE_static_cast()</CODE>, <CODE>ACE_dynamic_cast()</CODE>, etc.<p>
-
   <li>Do not use C++ exception handling directly.  Some platforms do
       not support it.  And, it can impose an execution speed penalty.
       Instead use the TAO/ACE try/catch macros.<p>
@@ -1087,7 +1069,7 @@ ChangeLogTag: Thu Jul 22 09:55:10 1999  David L. Levine
 <ul>
   <li>Always make sure that a change builds and executes correctly
     on at least one platform before checking it into the CVS repository.
-    All changes <strong>must</strong> be tested with egcs before commiting.
+    All changes <strong>must</strong> be tested with g++ before commiting.
     That means you may need to test on at least two platforms.<p>
 </ul>
 
@@ -1112,8 +1094,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
       </pre><p>
 
   <li>Never, never, never start the first line of a script
-    with ``#'', unless the first line is ``#! /bin/sh''.
-    With just ``#'', t/csh users will spawn a new shell.
+    with "<code>#</code>", unless the first line is "<code>#! /bin/sh</code>".
+    With just "<code>#</code>", t/csh users will spawn a new shell.
     That will cause their <code>.[t]cshrc</code> to be
     processed, possibly clobbering a necessary part of
     their environment.<p>
@@ -1164,32 +1146,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 </ul>
 
 
-<hr>
-<h3><a href="http://www.cs.wustl.edu/~doc/PACE/">PACE</a>
-  Software Development Guidelines</h3>
-
-PACE code should be developed following the ACE guidelines
-above, with these exceptions:
-<ul>
-  <li>An <code>if</code> statement that has just one statement must
-    be written with the braces:
-
-<pre>
-if (condition)
-  {
-    statement;
-  }
-</pre>
-
-This avoids bugs caused by subsequent insertion of code:
-
-<pre>
-  if (condition)
-    ACE_OS::fprintf (stderr, "I need to see what's going on here\n");
-    statement;  /* Ooops!  This statement will always be executed!!!! */
-</pre>
-</ul>
-
 
 <hr>
 <h3><a href="http://www.cs.wustl.edu/~schmidt/rules.html">ACE
@@ -1198,8 +1154,12 @@ This avoids bugs caused by subsequent insertion of code:
 
 <hr><p>
   <font size=-1>
-    Last modified <!--#echo var="LAST_MODIFIED" -->.<p>
-  </font>
+<!-- hhmts start -->
+Last modified: Thu Jan 20 22:59:04 PST 2005
+<!-- hhmts end -->
+  </font><p>
+
+
 
 Back to <A HREF="index.html">ACE Documentation Home</A>.
 
diff --git a/docs/ACE-subsets.html b/docs/ACE-subsets.html
index 31d2bdec068..ef2a1e0dcd1 100644
--- a/docs/ACE-subsets.html
+++ b/docs/ACE-subsets.html
@@ -31,12 +31,13 @@ size of your ACE+TAO applications. </P>
 <hr>
 <h3><a name="pastwork">Past Work</a></h3>
 <p>
+
 Previous ACE+TAO subsetting efforts were mainly concerned with
-breaking up ACE into multiple libraries.  Although this is a worthy
-goal, the existing component definitions in 
-<a href="../ace/ace.mpc">ace.mpc</a> are too tighly coupled.
-Therefore, even if ACE is compiled into multiple libraries,
-applications will still have to link almost every one of them.</p>
+breaking up ACE into multiple libraries.  Although this was a worthy
+goal, the existing component definitions in <a
+href="../ace/ace.mpc">ace.mpc</a> are too tightly coupled.  Even if
+ACE was compiled into multiple libraries, therefore, applications
+would still have to link almost every one of them.</p>
 
 <p>
 Potentially more satisfying results can be obtained through the use of
@@ -65,16 +66,125 @@ result in smaller overall footprint than static linking.</p>
 <hr>
 <h3><a name="futurework">Future Work</a></h3>
 <p>
-Future work includes converting additional classes to namespaces,
-e.g., ACE, modifying inlines to reduce unneeded coupling, and
-refactoring some of the ubiquitous classes and frameworks in ACE, e.g.,
-Logging, to further reduce coupling (which should make it possible to
-break up ACE into multiple independent libraries).</p>  
 
-<p>
-Anyone interested in contributing to the effort should contact <a
-href="mailto:d.hinton@vanderbilt.edu">d.hinton@vanderbilt.edu</a>.</p>
+Depending on funding and contributions from the ACE community, future
+work on subsetting in ACE can be divided into two thrusts: <P>
+
+<UL>
+
+<LI> <B>Code refactoring</B>, which helps to reduce the coupling
+between applications and ACE C++ wrappers and frameworks.  The amount
+of coupling that's in ACE currently yields larger compiled size for
+executable applications, increased link times, and indirect dependency
+on a large amounts of code that may not be needed for many embedded
+applications. <P>
+
+<LI> <B>Functionality Refactoring</B>, which enables application
+developers to choose lightweight reusable classes and frameworks,
+rather than monolithic and heavyweight implementations, to decrease
+compilation times, link times, and compiled memory footprint of
+embedded applications. <P>
+
+</UL>
+
+Our ideas for performing each of these thrusts is described in detail
+below.
+
+<h4>ACE Code Refactoring</H4>
+    
+ACE is currently designed in such a way that application developers
+must link many classes and methods of ACE with their application, even
+if they use a small number of classes and functions in their
+application.  As a result, static memory resource utilization is
+unnecessarily high for common use cases.  This section describes
+techniques to address the existing code structuring complexities in
+ACE, which were originally driven by the poor quality of C++ tools
+that were available in the 1990's.  For example, early C++ compilers
+in the embedded domain lacked support for namespaces, which forced
+developers to write classes that had a number of utility functions
+useful for network programming.  Now that modern C++ compilers have
+better support for standard C++, we propose the following
+optimizations to ACE: <P>
+
+<UL>
+
+<LI> We will identify ACE classes and utility functions that serve a
+   common goal, and move them into a namespace of their own.  Since C++
+   allows a single namespace to be reopened in multiple translation
+   units, we plan to split the operations into multiple C++ source
+   files, giving the linker a chance to choose a smaller sized object
+   files while creating an executable. <P>
+
+<LI> Currently, ACE inlines many of its methods, which tradesoff run-time
+   performance for larger footprint.  We propose to examine the contents
+   of inlined files in ACE, and evaluate whether inlining is required in
+   every instance.  ACE aggressively inlined functions to get better
+   performance from the tool chains, but this has lead to increased code
+   coupling within ACE, as well as increased coupling between
+   applications that use ACE.  We will evaluate the tradeoffs associated
+   with inlining and performance of certain functions and selectively
+   inline those methods.  These optimizations are described further in
+   <A
+HREF="http://www.amazon.com/exec/obidos/tg/detail/-/0201379503/104-7731669-1857527?v=glance">Efficient
+C++: Performance Programming Techniques</A> by Dov Bulka and
+   David Mayhew.
+</UL>
+   
+We expect that we will be able to reduce footprint by ~25-30% for ACE
+applications, and a ~15-20% reduction in compile and link time of
+applications. <P>
+
+<H4>Functionality Refactoring</H4>
+
+   This section proposes to address additional compile-time and memory
+footprint problems that can be solved by functionality refactoring.
+During the past decade, ACE has been designed and built based on many
+unique requirements from users around the globe.  Though this input
+enhanced the flexibility of ACE and increased the visibility of ACE,
+it also led to functionality "clumping," i.e., many classes in ACE
+have functionality associated with them that are not required for many
+applications.  For example, the ACE_Svc_Handler serves as an event
+handler for the ACE Reactor framework, serves as a handler to
+implement the thread-per-connection strategies, and can be dynamically
+loaded from shared libraries using the ACE Service Configurator
+framework, which in turn depends on the ACE Reactor framework.  Though
+all these dependencies and functionalities are required for some
+applications, they yield excessive coupling and overhead for
+applications (such as clients) that only want to use the ACE
+Acceptor/Connector framework to connect and send messages to remote
+servers. <P>
+
+   To address the issues of tight-coupling outlined above, we propose
+to refactor the code and functionality of the existing ACE frameworks
+and wrapper classes to offer finer-grained components that can be
+selectively included by embedded applications.  Our initial efforts
+would focus on the following key ACE frameworks: 
+<UL>
+<LI> Logging
+<LI> Service Configurator
+<LI> Object Manager
+<LI> Reactor
+<LI> Framework Component
+<LI> Thread Manager
+<LI> Proactor
+</UL>
+
+We propose to apply the techniques we have mentioned above.  As a
+result, we expect that we will be able to reduce footprint by another
+~20-25% for certain classes of ACE applications, and a ~15-20%
+reduction in compile- and link-time of applications. <P>
+
+   Collectively, the optimizations we propose above will greatly
+reduce the memory footprint and speedup the compilation and link time
+for ACE-based applications. <P>
 
+<p> Anyone interested in contributing time or funding to these efforts
+should please contact <a
+href="mailto:d.schmidt@vanderbilt.edu">d.schmidt@vanderbilt.edu</a>.
+If you have questions about ACE and/or ACE subsetting and footprint
+reduction please post these questions to the <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE-mail.html">ACE mailing
+list</A>.</p>
 
 <P><HR><P>
 Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</A>
diff --git a/etc/ace.doxygen b/etc/ace.doxygen
index 67ca357cfa5..fd88b2e507a 100644
--- a/etc/ace.doxygen
+++ b/etc/ace.doxygen
@@ -54,7 +54,9 @@ INPUT                 = docs \
                         ace/os_include/arpa \
                         ace/os_include/net \
                         ace/os_include/netinet \
-                        ace/os_include/sys
+                        ace/os_include/sys \
+                        ace/config-lite.h \
+                        ace/config-all.h
 FILE_PATTERNS         = *.h *.cpp *.inl *.i *.txt
 RECURSIVE             = NO
 EXCLUDE               = ace/config.h \
diff --git a/etc/ace_rmcast.doxygen b/etc/ace_rmcast.doxygen
index 459c43f1820..87879b93a63 100644
--- a/etc/ace_rmcast.doxygen
+++ b/etc/ace_rmcast.doxygen
@@ -48,7 +48,7 @@ WARN_FORMAT           = "$file:$line: $text"
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
-INPUT                 = ace/RMCast
+INPUT                 = protcols/ace/RMCast
 FILE_PATTERNS         = *.cpp *.h *.i *.inl
 RECURSIVE             = NO
 EXCLUDE               =
diff --git a/etc/create-jace-release b/etc/create-jace-release
deleted file mode 100755
index 50206b14a01..00000000000
--- a/etc/create-jace-release
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-# $Id$
-# Builds the JACE release.
-
-umask 2
-
-cd java
-find src doc examples apps tests classes -name CVS -prune -o -print | cpio -o -H tar | gzip -9 > ../JACE-1.2.tar.gz
-find src doc examples apps tests classes ImageProcessing -name CVS -prune -o -print | cpio -o -H tar | gzip -9 > ../JACE-1.3.tar.gz
diff --git a/examples/APG/Active_Objects/active_objects.mwc b/examples/APG/Active_Objects/active_objects.mwc
deleted file mode 100644
index 8a497a79d8e..00000000000
--- a/examples/APG/Active_Objects/active_objects.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  active_objects.mpc
-}
diff --git a/examples/APG/Config/HA_Status.cpp b/examples/APG/Config/HA_Status.cpp
index 68f723759c0..dacee9ea654 100644
--- a/examples/APG/Config/HA_Status.cpp
+++ b/examples/APG/Config/HA_Status.cpp
@@ -70,7 +70,7 @@ HA_Status::init (int argc, ACE_TCHAR *argv[])
       ((LM_ERROR,
         ACE_TEXT ("HAStatus ListenPort does not exist\n")),
        -1);
-  this->listen_addr_.set (ACE_static_cast (u_short, status_port));
+  this->listen_addr_.set (static_cast<u_short> (status_port));
   // Listing 2
 
   return 0;
diff --git a/examples/APG/Config/config.mwc b/examples/APG/Config/config.mwc
deleted file mode 100644
index bc58d58733f..00000000000
--- a/examples/APG/Config/config.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  config.mpc
-}
diff --git a/examples/APG/Containers/containers.mwc b/examples/APG/Containers/containers.mwc
deleted file mode 100644
index f74c08d3727..00000000000
--- a/examples/APG/Containers/containers.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  containers.mpc
-}
diff --git a/examples/APG/Logging/Callback-2.h b/examples/APG/Logging/Callback-2.h
index f2c124896b1..87463ce47fd 100644
--- a/examples/APG/Logging/Callback-2.h
+++ b/examples/APG/Logging/Callback-2.h
@@ -15,7 +15,7 @@ public:
       cerr << "Log Message Received:" << endl;
       unsigned long msg_severity = log_record.type ();
       ACE_Log_Priority prio =
-        ACE_static_cast (ACE_Log_Priority, msg_severity);
+        static_cast<ACE_Log_Priority> (msg_severity);
       const ACE_TCHAR *prio_name =
         ACE_Log_Record::priority_name (prio);
       cerr << "\tType:        "
diff --git a/examples/APG/Logging/Change_Mask.cpp b/examples/APG/Logging/Change_Mask.cpp
index 4cd0deac7e5..a34a00e63b1 100644
--- a/examples/APG/Logging/Change_Mask.cpp
+++ b/examples/APG/Logging/Change_Mask.cpp
@@ -6,7 +6,7 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   // Listing 1 code/ch03
   ACE_LOG_MSG->priority_mask (0, ACE_Log_Msg::PROCESS);
@@ -23,7 +23,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Howto_Syslog.cpp b/examples/APG/Logging/Howto_Syslog.cpp
index 0bafab546b7..283099a3da1 100644
--- a/examples/APG/Logging/Howto_Syslog.cpp
+++ b/examples/APG/Logging/Howto_Syslog.cpp
@@ -11,7 +11,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
     (argv[0], ACE_Log_Msg::SYSLOG, ACE_TEXT ("syslogTest"));
   // Listing 1
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   foo ();
@@ -22,7 +22,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Simple1.cpp b/examples/APG/Logging/Simple1.cpp
index 93c8b681c23..cf7a12e410b 100644
--- a/examples/APG/Logging/Simple1.cpp
+++ b/examples/APG/Logging/Simple1.cpp
@@ -6,7 +6,7 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE(ACE_TEXT ("main"));
+  ACE_TRACE("main");
     
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHi Mom\n")));
   foo();
@@ -17,7 +17,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Simple2.cpp b/examples/APG/Logging/Simple2.cpp
index dfec1c68dd2..26315b9d689 100644
--- a/examples/APG/Logging/Simple2.cpp
+++ b/examples/APG/Logging/Simple2.cpp
@@ -6,7 +6,7 @@ void foo(void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_LOG_MSG->priority_mask (LM_DEBUG | LM_NOTICE,
                               ACE_Log_Msg::PROCESS);
@@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo(void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Trace.h b/examples/APG/Logging/Trace.h
index f426b6a8adb..6e46741dba1 100644
--- a/examples/APG/Logging/Trace.h
+++ b/examples/APG/Logging/Trace.h
@@ -98,8 +98,10 @@ private:
 
 //////////////////////////////////////////////////
 
-#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95)
+#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) && \
+    (!defined (VXWORKS) || !(__GNUC__ == 2 && __GNUC_MINOR__ == 96))
 // This stuff only works with g++ 2.96 and later...
+// But not with VxWorks g++ 2.96.
 
 // Listing 3 code/ch03
 
diff --git a/examples/APG/Logging/Trace_Return.cpp b/examples/APG/Logging/Trace_Return.cpp
index d466abc43c1..1bb32a03456 100644
--- a/examples/APG/Logging/Trace_Return.cpp
+++ b/examples/APG/Logging/Trace_Return.cpp
@@ -1,17 +1,19 @@
 // $Id$
 
-#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95)
+#include "Trace.h"
+
+#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) && \
+    (!defined (VXWORKS) || !(__GNUC__ == 2 && __GNUC_MINOR__ == 96))
 // The DEBUG stuff only works with g++ 2.96 and later.
+// But not with VxWorks g++ 2.96.
 
 // Listing 1 code/ch03
-#include "Trace.h"
-
 void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  TRACE (ACE_TEXT ("main"));
-    
+  TRACE ("main");
+
   MY_DEBUG (ACE_TEXT ("Hi Mom\n"));
   foo ();
   MY_DEBUG (ACE_TEXT ("Goodnight\n"));
@@ -21,7 +23,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  TRACE (ACE_TEXT ("foo"));
+  TRACE ("foo");
   MY_DEBUG (ACE_TEXT ("Howdy Pardner\n"));
   TRACE_RETURN_VOID ();
 }
@@ -30,7 +32,7 @@ void foo (void)
 #else
 #include <stdio.h>
 
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   puts ("This example only works on g++ 2.96 and later.\n");
   return 0;
diff --git a/examples/APG/Logging/Use_Callback.cpp b/examples/APG/Logging/Use_Callback.cpp
index 2deff99f4ea..2f08a2127ed 100644
--- a/examples/APG/Logging/Use_Callback.cpp
+++ b/examples/APG/Logging/Use_Callback.cpp
@@ -11,7 +11,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
   ACE_LOG_MSG->msg_callback (callback);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IGoodnight\n")));
diff --git a/examples/APG/Logging/Use_Callback2.cpp b/examples/APG/Logging/Use_Callback2.cpp
index a3f005e5949..bcfe8b8e5d7 100644
--- a/examples/APG/Logging/Use_Callback2.cpp
+++ b/examples/APG/Logging/Use_Callback2.cpp
@@ -11,7 +11,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
   ACE_LOG_MSG->msg_callback (callback);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IGoodnight\n")));
diff --git a/examples/APG/Logging/Use_LogManager.cpp b/examples/APG/Logging/Use_LogManager.cpp
index ad3280b8d4f..ddcbb758f87 100644
--- a/examples/APG/Logging/Use_LogManager.cpp
+++ b/examples/APG/Logging/Use_LogManager.cpp
@@ -8,7 +8,7 @@ void foo (void);
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   LOG_MANAGER->redirectToStderr ();
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
   LOG_MANAGER->redirectToSyslog ();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHi Mom\n")));
   foo ();
@@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
   LOG_MANAGER->redirectToFile ("output.test");
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Use_Logger.cpp b/examples/APG/Logging/Use_Logger.cpp
index 9dd00caee42..5fb672c1ab4 100644
--- a/examples/APG/Logging/Use_Logger.cpp
+++ b/examples/APG/Logging/Use_Logger.cpp
@@ -8,7 +8,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 		     ACE_Log_Msg::LOGGER, 
                      ACE_DEFAULT_LOGGER_KEY);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IGoodnight\n")));
diff --git a/examples/APG/Logging/Use_Logging_Server.cpp b/examples/APG/Logging/Use_Logging_Server.cpp
index 1d304f2577b..eaad6bf7a6b 100644
--- a/examples/APG/Logging/Use_Logging_Server.cpp
+++ b/examples/APG/Logging/Use_Logging_Server.cpp
@@ -11,7 +11,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
   ACE_LOG_MSG->msg_callback (callback);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IGoodnight\n")));
diff --git a/examples/APG/Logging/Use_Logging_Strategy.cpp b/examples/APG/Logging/Use_Logging_Strategy.cpp
index 0bf1e67afd5..559d85d65ae 100644
--- a/examples/APG/Logging/Use_Logging_Strategy.cpp
+++ b/examples/APG/Logging/Use_Logging_Strategy.cpp
@@ -24,7 +24,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
                        ACE_TEXT ("Service Config open")),
                       1);
-    ACE_TRACE (ACE_TEXT ("main"));
+    ACE_TRACE ("main");
     ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("%t%IHowdy Pardner\n")));
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("%t%IGoodnight\n")));
 
diff --git a/examples/APG/Logging/Use_Multiple_Sinks.cpp b/examples/APG/Logging/Use_Multiple_Sinks.cpp
index 468fc09d838..7decd59217a 100644
--- a/examples/APG/Logging/Use_Multiple_Sinks.cpp
+++ b/examples/APG/Logging/Use_Multiple_Sinks.cpp
@@ -10,7 +10,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
   // Output to default destination (stderr)
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_OSTREAM_TYPE *output =
         (ACE_OSTREAM_TYPE *) new std::ofstream ("ostream.output.test");
diff --git a/examples/APG/Logging/Use_Ostream.cpp b/examples/APG/Logging/Use_Ostream.cpp
index f5665fbfd2e..54ab19170db 100644
--- a/examples/APG/Logging/Use_Ostream.cpp
+++ b/examples/APG/Logging/Use_Ostream.cpp
@@ -9,11 +9,10 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
 
-
   /* Alternatively, you can use the set_flags() method to do the same
      thing after the singleton has been created:
   */
@@ -33,7 +32,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Use_Stderr.cpp b/examples/APG/Logging/Use_Stderr.cpp
index 3b087a09af4..e0418c4d362 100644
--- a/examples/APG/Logging/Use_Stderr.cpp
+++ b/examples/APG/Logging/Use_Stderr.cpp
@@ -17,7 +17,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
      thing after the singleton has been created:
   */
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   // Listing 2 code/ch03
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
@@ -32,8 +32,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
-
 }
diff --git a/examples/APG/Logging/Use_Syslog.cpp b/examples/APG/Logging/Use_Syslog.cpp
index ef0cc8857f2..dce4a1fe6b0 100644
--- a/examples/APG/Logging/Use_Syslog.cpp
+++ b/examples/APG/Logging/Use_Syslog.cpp
@@ -8,7 +8,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
   // This will be directed to stderr (the default ACE_Log_Msg
   // behavior).
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
 
@@ -26,7 +26,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Wrap_Macros.cpp b/examples/APG/Logging/Wrap_Macros.cpp
index 73c908272d2..9e88d3e11e0 100644
--- a/examples/APG/Logging/Wrap_Macros.cpp
+++ b/examples/APG/Logging/Wrap_Macros.cpp
@@ -1,16 +1,18 @@
 // $Id$
 
-#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95)
+#include "Trace.h"
+
+#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) && \
+    (!defined (VXWORKS) || !(__GNUC__ == 2 && __GNUC_MINOR__ == 96))
 // The macros in Trace.h only work on g++ 2.96 and later.
+// But not with VxWorks g++ 2.96.
 
 // Listing 1 code/ch03
-#include "Trace.h"
-
 void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
   MY_DEBUG (ACE_TEXT ("Hi Mom\n"));
   foo ();
   MY_DEBUG (ACE_TEXT ("Goodnight\n"));
@@ -19,7 +21,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
   MY_DEBUG (ACE_TEXT ("Howdy Pardner\n"));
 }
 // Listing 1
@@ -27,7 +29,7 @@ void foo (void)
 #else
 #include <stdio.h>
 
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   puts ("This example only works on g++ 2.96 and later.\n");
   return 0;
diff --git a/examples/APG/Logging/Wrap_Macros_Alt.cpp b/examples/APG/Logging/Wrap_Macros_Alt.cpp
index 1926f001d36..306eefcd83a 100644
--- a/examples/APG/Logging/Wrap_Macros_Alt.cpp
+++ b/examples/APG/Logging/Wrap_Macros_Alt.cpp
@@ -6,7 +6,7 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
   
   // Listing 1 code/ch03
   ACE_DEBUG ((MY_DEBUG ACE_TEXT ("Hi Mom\n")));
diff --git a/examples/APG/Logging/logging.mwc b/examples/APG/Logging/logging.mwc
deleted file mode 100644
index d3847aa6894..00000000000
--- a/examples/APG/Logging/logging.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  logging.mpc
-}
diff --git a/examples/APG/Misc_IPC/UDP_Broadcast.cpp b/examples/APG/Misc_IPC/UDP_Broadcast.cpp
index 69e342b6f15..318be67b19c 100644
--- a/examples/APG/Misc_IPC/UDP_Broadcast.cpp
+++ b/examples/APG/Misc_IPC/UDP_Broadcast.cpp
@@ -14,7 +14,7 @@
 int send_broadcast (u_short to_port)
 {
   const char *message = "this is the message!\n";
-  ACE_INET_Addr my_addr (ACE_static_cast (u_short, 10101));
+  ACE_INET_Addr my_addr (static_cast<u_short> (10101));
   ACE_SOCK_Dgram_Bcast udp (my_addr);
   ssize_t sent = udp.send (message,
                            ACE_OS::strlen (message) + 1,
diff --git a/examples/APG/Misc_IPC/UDP_Unicast.cpp b/examples/APG/Misc_IPC/UDP_Unicast.cpp
index 909ff175978..ac3d4d00488 100644
--- a/examples/APG/Misc_IPC/UDP_Unicast.cpp
+++ b/examples/APG/Misc_IPC/UDP_Unicast.cpp
@@ -14,7 +14,7 @@
 int send_unicast (const ACE_INET_Addr &to)
 {
   const char *message = "this is the message!\n";
-  ACE_INET_Addr my_addr (ACE_static_cast (u_short, 10101));
+  ACE_INET_Addr my_addr (static_cast<u_short> (10101));
   ACE_SOCK_Dgram udp (my_addr);
   ssize_t sent = udp.send (message,
                            ACE_OS::strlen (message) + 1,
@@ -30,14 +30,14 @@ int send_unicast (const ACE_INET_Addr &to)
 // Listing 2 code/ch09
 void echo_dgram (void)
 {
-  ACE_INET_Addr my_addr (ACE_static_cast (u_short, 10102));
+  ACE_INET_Addr my_addr (static_cast<u_short> (10102));
   ACE_INET_Addr your_addr;
   ACE_SOCK_Dgram udp (my_addr);
   char buff[BUFSIZ];
   size_t buflen = sizeof (buff);
   ssize_t recv_cnt = udp.recv (buff, buflen, your_addr);
   if (recv_cnt > 0)
-    udp.send (buff, ACE_static_cast (size_t, buflen), your_addr);
+    udp.send (buff, static_cast<size_t> (buflen), your_addr);
   udp.close ();
   return;
 }
diff --git a/examples/APG/Misc_IPC/misc_ipc.mwc b/examples/APG/Misc_IPC/misc_ipc.mwc
deleted file mode 100644
index a6131dbb3bb..00000000000
--- a/examples/APG/Misc_IPC/misc_ipc.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  misc_ipc.mpc
-}
diff --git a/examples/APG/Naming/Graph.cpp b/examples/APG/Naming/Graph.cpp
index cff8e37244e..79d0def14f3 100644
--- a/examples/APG/Naming/Graph.cpp
+++ b/examples/APG/Naming/Graph.cpp
@@ -3,16 +3,20 @@
 #include "ace/Log_Msg.h"
 #include "Graph.h"
 
-void Graph::graph( char * filename, Graphable_Element_List & data )
+void Graph::graph (char *filename, Graphable_Element_List &data)
 {
-  data.sort();
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  ACE_UNUSED_ARG (filename);
+  ACE_UNUSED_ARG (data);
+#else
+  data.sort ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Save graph to %s\n"), filename ));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Save graph to %C\n"), filename));
 
   char h[10][10];
   for (int n = 0 ; n < 10 ; ++n )
     {
-      for ( int j = 0 ; j < 10 ; ++j )
+      for (int j = 0; j < 10; ++j )
         {
           h[n][j] = ' ';
         }
@@ -20,29 +24,29 @@ void Graph::graph( char * filename, Graphable_Element_List & data )
 
   int l[10];
   int k = 0;
-  for ( Graphable_Element_List::iterator i = data.begin() ;
-        i != data.end() ;
+  for (Graphable_Element_List::iterator i = data.begin ();
+        i != data.end ();
         ++i, ++k )
     {
-      l[k] = (*i).when();
+      l[k] = (*i).when ();
 
-      int temp = (int) ((*i).temp() - 80.0);
+      int temp = (int)((*i).temp () - 80.0);
 
-      for ( int j = 0 ; j <= temp ; ++j )
+      for (int j = 0; j <= temp; ++j)
         {
           h[k][j] = '#';
         }
     }
 
-  for (int m = 0 ; m < 10 ; ++m )
+  for (int m = 0 ; m < 10 ; ++m)
     {
-      ACE_DEBUG ((LM_INFO, ACE_TEXT ("%d  "), l[m] ));
+      ACE_DEBUG ((LM_INFO, ACE_TEXT ("%d  "), l[m]));
 
-      for ( int j = 0 ; j < 10 ; ++j )
+      for (int j = 0; j < 10; ++j)
         {
           ACE_DEBUG ((LM_INFO, ACE_TEXT ("%c"), h[m][j]));
         }
       ACE_DEBUG ((LM_INFO, ACE_TEXT ("\n")));
     }
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 }
-
diff --git a/examples/APG/Naming/Name_Binding.h b/examples/APG/Naming/Name_Binding.h
index 943781d5af2..6c093a941f2 100644
--- a/examples/APG/Naming/Name_Binding.h
+++ b/examples/APG/Naming/Name_Binding.h
@@ -33,7 +33,7 @@ public:
   {
     delete this->name_;
     delete this->value_;
-    ACE_OS::free (ACE_const_cast (char*, this->type_));
+    ACE_OS::free (const_cast<char*> (this->type_));
     this->type_ = 0;
   }
 
diff --git a/examples/APG/Naming/Temperature_Grapher.cpp b/examples/APG/Naming/Temperature_Grapher.cpp
index e11367af4a0..4f1ef1bcff1 100644
--- a/examples/APG/Naming/Temperature_Grapher.cpp
+++ b/examples/APG/Naming/Temperature_Grapher.cpp
@@ -54,6 +54,7 @@ void Temperature_Grapher::update_graph (void)
     }
   // Listing 4
 
+#if !defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
   // Listing 5 code/ch21
   Graphable_Element_List graphable;
   ACE_BINDING_ITERATOR set_iterator (set);
@@ -78,4 +79,5 @@ void Temperature_Grapher::update_graph (void)
   this->naming_context_.rebind ("lastGraphed",
                                 lastUpdate->int_value ());
   // Listing 6
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 }
diff --git a/examples/APG/Naming/naming.mpc b/examples/APG/Naming/naming.mpc
index 37bd910919e..5c32cb1d641 100644
--- a/examples/APG/Naming/naming.mpc
+++ b/examples/APG/Naming/naming.mpc
@@ -19,7 +19,7 @@ project(Netlocal Reader) : aceexe {
 }
 
 project(Nodelocal) : aceexe {
-  exename = Netlocal
+  exename = Nodelocal
   Source_Files {
     Nodelocal.cpp
     Temperature_Monitor.cpp
diff --git a/examples/APG/Naming/naming.mwc b/examples/APG/Naming/naming.mwc
deleted file mode 100644
index 9d85d60c315..00000000000
--- a/examples/APG/Naming/naming.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  naming.mpc
-}
diff --git a/examples/APG/Proactor/HA_Proactive_Status.cpp b/examples/APG/Proactor/HA_Proactive_Status.cpp
index 2fad562f12c..e64656398ba 100644
--- a/examples/APG/Proactor/HA_Proactive_Status.cpp
+++ b/examples/APG/Proactor/HA_Proactive_Status.cpp
@@ -106,11 +106,9 @@ HA_Proactive_Acceptor::validate_connection (
    const ACE_INET_Addr& local)
 {
   struct in_addr *remote_addr =
-    ACE_reinterpret_cast (struct in_addr*,
-                          remote.get_addr ());
+    reinterpret_cast<struct in_addr*> (remote.get_addr ());
   struct in_addr *local_addr =
-    ACE_reinterpret_cast (struct in_addr*,
-                          local.get_addr ());
+    reinterpret_cast<struct in_addr*> (local.get_addr ());
   if (inet_netof (*local_addr) == inet_netof (*remote_addr))
     return 0;
 
diff --git a/examples/APG/Proactor/proactor.mwc b/examples/APG/Proactor/proactor.mwc
deleted file mode 100644
index 3c019a49266..00000000000
--- a/examples/APG/Proactor/proactor.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  proactor.mpc
-}
diff --git a/examples/APG/Processes/Spawn.cpp b/examples/APG/Processes/Spawn.cpp
index b7b51bde7d2..20a38722f7e 100644
--- a/examples/APG/Processes/Spawn.cpp
+++ b/examples/APG/Processes/Spawn.cpp
@@ -16,13 +16,13 @@ class Manager : public ACE_Process
 public:
   Manager (const ACE_TCHAR* program_name)
   {
-    ACE_TRACE (ACE_TEXT ("Manager::Manager"));
+    ACE_TRACE ("Manager::Manager");
     ACE_OS::strcpy (programName_, program_name);
   }
 
   int doWork (void)
   {
-    ACE_TRACE (ACE_TEXT ("Manager::doWork"));
+    ACE_TRACE ("Manager::doWork");
 
     // Spawn the new process; prepare() hook is called first.
     ACE_Process_Options options;
@@ -46,7 +46,7 @@ private:
   // Listing 3 code/ch10
   int dumpRun (void)
   {
-    ACE_TRACE (ACE_TEXT ("Manager::dumpRun"));
+    ACE_TRACE ("Manager::dumpRun");
 
     if (ACE_OS::lseek (this->outputfd_, 0, SEEK_SET) == -1)
       ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
@@ -73,13 +73,13 @@ private:
   // prepare() is inherited from ACE_Process.
   int prepare (ACE_Process_Options &options)
   {
-    ACE_TRACE (ACE_TEXT ("Manager::prepare"));
+    ACE_TRACE ("Manager::prepare");
 
     options.command_line ("%s 1", this->programName_);
     if (this->setStdHandles (options) == -1 ||
         this->setEnvVariable (options) == -1)
       return -1;
-#if !defined (ACE_WIN32)
+#if !defined (ACE_WIN32) && !defined (ACE_LACKS_PWD_FUNCTIONS)
     return this->setUserID (options);
 #else
     return 0;
@@ -88,7 +88,7 @@ private:
 
   int setStdHandles (ACE_Process_Options &options)
   {
-    ACE_TRACE(ACE_TEXT ("Manager::setStdHandles"));
+    ACE_TRACE ("Manager::setStdHandles");
 
     ACE_OS::unlink ("output.dat");
     this->outputfd_ =
@@ -99,16 +99,17 @@ private:
 
   int setEnvVariable (ACE_Process_Options &options)
   {
-    ACE_TRACE (ACE_TEXT ("Manager::setEnvVariables"));
-    return options.setenv (ACE_TEXT("PRIVATE_VAR=/that/seems/to/be/it"));
+    ACE_TRACE ("Manager::setEnvVariables");
+    return options.setenv
+      (ACE_TEXT ("PRIVATE_VAR=/that/seems/to/be/it"));
   }
  // Listing 2
 
-#if !defined (ACE_WIN32)
+#if !defined (ACE_LACKS_PWD_FUNCTIONS)
  // Listing 10 code/ch10
   int setUserID (ACE_Process_Options &options)
   {
-    ACE_TRACE (ACE_TEXT ("Manager::setUserID"));
+    ACE_TRACE ("Manager::setUserID");
     passwd* pw = ACE_OS::getpwnam ("nobody");
     if (pw == 0)
       return -1;
@@ -116,7 +117,7 @@ private:
     return 0;
   }
  // Listing 10
-#endif /* ACE_WIN32 */
+#endif /* !ACE_LACKS_PWD_FUNCTIONS */
 
 private:
   ACE_HANDLE outputfd_;
@@ -129,12 +130,12 @@ class Slave
 public:
   Slave ()
   {
-    ACE_TRACE (ACE_TEXT ("Slave::Slave"));
+    ACE_TRACE ("Slave::Slave");
   }
 
   int doWork (void)
   {
-    ACE_TRACE (ACE_TEXT ("Slave::doWork"));
+    ACE_TRACE ("Slave::doWork");
 
     ACE_DEBUG ((LM_INFO,
                 ACE_TEXT ("(%P) started at %T, parent is %d\n"),
@@ -146,7 +147,7 @@ public:
 
     ACE_TCHAR str[128];
     ACE_OS::sprintf (str, ACE_TEXT ("(%d) Enter your command\n"),
-                     static_cast<int> (ACE_OS::getpid ()));
+                     static_cast<int>(ACE_OS::getpid ()));
     ACE_OS::write (ACE_STDOUT, str, ACE_OS::strlen (str));
     this->readLine (str);
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P) Executed: %C\n"),
@@ -157,8 +158,8 @@ public:
 
   void showWho (void)
   {
-    ACE_TRACE (ACE_TEXT ("Slave::showWho"));
-#if !defined (ACE_WIN32)
+    ACE_TRACE ("Slave::showWho");
+#if !defined (ACE_LACKS_PWD_FUNCTIONS)
     passwd *pw = ::getpwuid (::geteuid ());
     ACE_DEBUG ((LM_INFO,
                 ACE_TEXT ("(%P) Running this process as:%s\n"),
@@ -168,22 +169,22 @@ public:
 
   ACE_TCHAR* readLine (ACE_TCHAR* str)
   {
-    ACE_TRACE (ACE_TEXT ("Slave::readLine"));
+    ACE_TRACE ("Slave::readLine");
 
     int i = 0;
     while (true)
       {
-	int retval = ACE_OS::read (ACE_STDIN, &str[i], 1);
-	if (retval > 0)
-	  {
-	    if (str[i] == '\n')
-	      {
-		str[++i] = 0;
-		return str;
-	      }
-	    i++;
-	  }
-	else
+        int retval = ACE_OS::read (ACE_STDIN, &str[i], 1);
+        if (retval > 0)
+          {
+            if (str[i] == '\n')
+              {
+                str[++i] = 0;
+                return str;
+              }
+            i++;
+          }
+        else
           return str;
       }
   }
diff --git a/examples/APG/Processes/processes.mwc b/examples/APG/Processes/processes.mwc
deleted file mode 100644
index 46807d1d3e1..00000000000
--- a/examples/APG/Processes/processes.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  processes.mpc
-}
diff --git a/examples/APG/Reactor/Client.cpp b/examples/APG/Reactor/Client.cpp
index b32e2b7f9d8..520b17f7ef1 100644
--- a/examples/APG/Reactor/Client.cpp
+++ b/examples/APG/Reactor/Client.cpp
@@ -32,7 +32,7 @@ int Client::handle_input (ACE_HANDLE)
   if (recv_cnt > 0)
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%.*C"),
-                  ACE_static_cast (int, recv_cnt),
+                  static_cast<int> (recv_cnt),
                   buf));
       return 0;
     }
@@ -60,7 +60,7 @@ int Client::handle_timeout(const ACE_Time_Value &, const void *)
   int nbytes = ACE_OS::sprintf
     (mb->wr_ptr (), "Iteration %d\n", this->iterations_);
   ACE_ASSERT (nbytes > 0);
-  mb->wr_ptr (ACE_static_cast (size_t, nbytes));
+  mb->wr_ptr (static_cast<size_t> (nbytes));
   this->putq (mb);
   return 0;
 }
@@ -80,7 +80,7 @@ int Client::handle_output (ACE_HANDLE)
                     ACE_TEXT ("(%P|%t) %p\n"),
                     ACE_TEXT ("send")));
       else
-        mb->rd_ptr (ACE_static_cast (size_t, send_cnt));
+        mb->rd_ptr (static_cast<size_t> (send_cnt));
       if (mb->length () > 0)
         {
           this->ungetq (mb);
diff --git a/examples/APG/Reactor/HAStatus-AC.cpp b/examples/APG/Reactor/HAStatus-AC.cpp
index f872fc612ba..24861113f85 100644
--- a/examples/APG/Reactor/HAStatus-AC.cpp
+++ b/examples/APG/Reactor/HAStatus-AC.cpp
@@ -52,7 +52,7 @@ ClientService::handle_input (ACE_HANDLE)
 
   send_cnt =
     this->peer ().send (buffer,
-                        ACE_static_cast (size_t, recv_cnt));
+                        static_cast<size_t> (recv_cnt));
   if (send_cnt == recv_cnt)
     return 0;
   if (send_cnt == -1 && ACE_OS::last_error () != EWOULDBLOCK)
@@ -64,7 +64,7 @@ ClientService::handle_input (ACE_HANDLE)
     send_cnt = 0;
   ACE_Message_Block *mb;
   size_t remaining =
-    ACE_static_cast (size_t, (recv_cnt - send_cnt));
+    static_cast<size_t> ((recv_cnt - send_cnt));
   ACE_NEW_RETURN (mb, ACE_Message_Block (remaining), -1);
   mb->copy (&buffer[send_cnt], remaining);
   int output_off = this->msg_queue ()->is_empty ();
@@ -99,7 +99,7 @@ ClientService::handle_output (ACE_HANDLE)
                     ACE_TEXT ("(%P|%t) %p\n"),
                     ACE_TEXT ("send")));
       else
-        mb->rd_ptr (ACE_static_cast (size_t, send_cnt));
+        mb->rd_ptr (static_cast<size_t> (send_cnt));
       if (mb->length () > 0)
         {
           this->ungetq (mb);
diff --git a/examples/APG/Reactor/HAStatus.cpp b/examples/APG/Reactor/HAStatus.cpp
index 361c7806391..fb32aa61632 100644
--- a/examples/APG/Reactor/HAStatus.cpp
+++ b/examples/APG/Reactor/HAStatus.cpp
@@ -156,7 +156,7 @@ ClientService::handle_input (ACE_HANDLE)
     }
 
   send_cnt =
-    this->sock_.send (buffer, ACE_static_cast (size_t, recv_cnt));
+    this->sock_.send (buffer, static_cast<size_t> (recv_cnt));
   if (send_cnt == recv_cnt)
     return 0;
   if (send_cnt == -1 && ACE_OS::last_error () != EWOULDBLOCK)
@@ -168,7 +168,7 @@ ClientService::handle_input (ACE_HANDLE)
     send_cnt = 0;
   ACE_Message_Block *mb;
   size_t remaining =
-    ACE_static_cast (size_t, (recv_cnt - send_cnt));
+    static_cast<size_t> ((recv_cnt - send_cnt));
   ACE_NEW_RETURN (mb, ACE_Message_Block (remaining), -1);
   mb->copy (&buffer[send_cnt], remaining);
   int output_off = this->output_queue_.is_empty ();
@@ -204,7 +204,7 @@ ClientService::handle_output (ACE_HANDLE)
                     ACE_TEXT ("(%P|%t) %p\n"),
                     ACE_TEXT ("send")));
       else
-        mb->rd_ptr (ACE_static_cast (size_t, send_cnt));
+        mb->rd_ptr (static_cast<size_t> (send_cnt));
       if (mb->length () > 0)
         {
           this->output_queue_.enqueue_head (mb);
diff --git a/examples/APG/Reactor/Timer_State_Data.cpp b/examples/APG/Reactor/Timer_State_Data.cpp
index ff945553372..215381df394 100644
--- a/examples/APG/Reactor/Timer_State_Data.cpp
+++ b/examples/APG/Reactor/Timer_State_Data.cpp
@@ -64,9 +64,9 @@ public:
     time_t epoch = ((timespec_t)current_time).tv_sec;
 
     const TemperatureSensor *const_sensor =
-      ACE_reinterpret_cast (const TemperatureSensor *, arg);
+      reinterpret_cast<const TemperatureSensor *> (arg);
     TemperatureSensor *sensor =
-      ACE_const_cast (TemperatureSensor *, const_sensor);
+      const_cast<TemperatureSensor *> (const_sensor);
 
     int queryCount = sensor->querySensor ();
     this->updateAverageTemperature (sensor);
diff --git a/examples/APG/Reactor/Timers.cpp b/examples/APG/Reactor/Timers.cpp
index 4fc7bfafa4b..3e5706b44e7 100644
--- a/examples/APG/Reactor/Timers.cpp
+++ b/examples/APG/Reactor/Timers.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "ace/config.h"
+#include "ace/OS_main.h"
+
 #if !defined (ACE_LACKS_FORK)
 
 #include "ace/streams.h"
@@ -58,7 +60,7 @@ void programMainLoop (void)
 }
 
 // Listing 3 code/ch07
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   pid_t timerId = timerTask (3, 5, foo);
   programMainLoop ();
@@ -70,7 +72,7 @@ int main (int, char *[])
 #else
 #include <stdio.h>
 
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   puts ("This very unportable example requires fork().\n");
   return 0;
diff --git a/examples/APG/Reactor/reactor.mwc b/examples/APG/Reactor/reactor.mwc
deleted file mode 100644
index 5b25a959bfb..00000000000
--- a/examples/APG/Reactor/reactor.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  reactor.mpc
-}
diff --git a/examples/APG/Shared_Memory/Hash_Map.cpp b/examples/APG/Shared_Memory/Hash_Map.cpp
index 1a7d85cd9e1..a6a2cc48295 100644
--- a/examples/APG/Shared_Memory/Hash_Map.cpp
+++ b/examples/APG/Shared_Memory/Hash_Map.cpp
@@ -47,7 +47,7 @@ MAP* smap (ALLOCATOR *shmem_allocator)
 // Listing 6 code/ch17
 int processRecords (MAP *map, ALLOCATOR *shmem_allocator)
 {
-  ACE_TRACE (ACE_TEXT ("::processRecords"));
+  ACE_TRACE ("processRecords");
 
   size_t mapLength = map->current_size ();
   ACE_DEBUG ((LM_DEBUG,
@@ -106,10 +106,10 @@ int processRecords (MAP *map, ALLOCATOR *shmem_allocator)
 // Listing 4 code/ch17
 int addRecords(MAP *map, ALLOCATOR *shmem_allocator)
 {
-  ACE_TRACE (ACE_TEXT ("::addRecords"));
+  ACE_TRACE ("addRecords");
 
   char buf[32];
-  int mapLength = ACE_static_cast (int, map->current_size ());
+  int mapLength = static_cast<int> (map->current_size ());
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Map has %d entries; adding 20 more\n"),
               mapLength));
@@ -135,7 +135,7 @@ int addRecords(MAP *map, ALLOCATOR *shmem_allocator)
 // Listing 5 code/ch17
 int handle_child (void)
 {
-  ACE_TRACE (ACE_TEXT ("::handle_child"));
+  ACE_TRACE ("handle_child");
 
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, coordMutex, -1);
 
@@ -169,7 +169,7 @@ int handle_child (void)
 // Listing 3 code/ch17
 int handle_parent (ACE_TCHAR *cmdLine)
 {
-  ACE_TRACE (ACE_TEXT ("::handle_parent"));
+  ACE_TRACE ("handle_parent");
 
   ALLOCATOR * shmem_allocator = 0;
   ACE_MMAP_Memory_Pool_Options options
@@ -185,7 +185,11 @@ int handle_parent (ACE_TCHAR *cmdLine)
 
   ACE_Process processa, processb;
   ACE_Process_Options poptions;
-  poptions.command_line("%s a", cmdLine);
+  const ACE_TCHAR *args[3];
+  args[0] = cmdLine;
+  args[1] = ACE_TEXT ("a");
+  args[2] = 0;
+  poptions.command_line (args);
   {
     ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon,
                       coordMutex, -1);
diff --git a/examples/APG/Shared_Memory/Malloc.cpp b/examples/APG/Shared_Memory/Malloc.cpp
index 27c21f5ea92..1a15ec74763 100644
--- a/examples/APG/Shared_Memory/Malloc.cpp
+++ b/examples/APG/Shared_Memory/Malloc.cpp
@@ -25,8 +25,7 @@ public:
   {
     size_t len = ACE_OS::strlen (name) + 1;
     this->name_ =
-      ACE_reinterpret_cast (char *,
-                            g_allocator->malloc (len));
+      reinterpret_cast<char *> (g_allocator->malloc (len));
     ACE_OS::strcpy (this->name_, name);
   }
 
@@ -52,7 +51,7 @@ void showRecords ()
     for (void *temp = 0; iter.next (temp) != 0; iter.advance ())
       {
         Record *record =
-          ACE_reinterpret_cast (Record *, temp);
+          reinterpret_cast<Record *> (temp);
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("Record name: %C|id1:%d|id2:%d\n"),
                     record->name (),
diff --git a/examples/APG/Shared_Memory/PI_Malloc.cpp b/examples/APG/Shared_Memory/PI_Malloc.cpp
index 80120a894da..60b4677482c 100644
--- a/examples/APG/Shared_Memory/PI_Malloc.cpp
+++ b/examples/APG/Shared_Memory/PI_Malloc.cpp
@@ -28,8 +28,7 @@ public:
   {
     size_t len = ACE_OS::strlen (name) + 1;
     char *buf =
-      ACE_reinterpret_cast (char *,
-                            g_allocator->malloc (len));
+      reinterpret_cast<char *> (g_allocator->malloc (len));
     ACE_OS::strcpy (buf, name);
     name_ = buf;
   }
@@ -58,7 +57,7 @@ void showRecords (void)
     for (void *temp = 0; iter.next (temp) != 0; iter.advance ())
       {
         Record *record =
-          ACE_reinterpret_cast (Record *, temp);
+          reinterpret_cast<Record *> (temp);
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("Record name: %C|id1:%d|id2:%d\n"),
                     record->name(), record->id1(), record->id2()));
diff --git a/examples/APG/Shared_Memory/Pool_Growth.cpp b/examples/APG/Shared_Memory/Pool_Growth.cpp
index e63cc51f668..7f5ffa7491b 100644
--- a/examples/APG/Shared_Memory/Pool_Growth.cpp
+++ b/examples/APG/Shared_Memory/Pool_Growth.cpp
@@ -201,7 +201,11 @@ int handle_parent (ACE_TCHAR *cmdLine)
 
   ACE_Process processa, processb;
   ACE_Process_Options poptions;
-  poptions.command_line ("%s a", cmdLine);
+  const ACE_TCHAR *args[3];
+  args[0] = cmdLine;
+  args[1] = ACE_TEXT ("a");
+  args[2] = 0;
+  poptions.command_line (args);
   processa.spawn (poptions);
   processb.spawn (poptions);
 
diff --git a/examples/APG/Shared_Memory/shared_memory.mwc b/examples/APG/Shared_Memory/shared_memory.mwc
deleted file mode 100644
index cbbecc67e33..00000000000
--- a/examples/APG/Shared_Memory/shared_memory.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  shared_memory.mpc
-}
diff --git a/examples/APG/Signals/signals.mwc b/examples/APG/Signals/signals.mwc
deleted file mode 100644
index fc8897e5001..00000000000
--- a/examples/APG/Signals/signals.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  signals.mpc
-}
diff --git a/examples/APG/Sockets/Iovec.cpp b/examples/APG/Sockets/Iovec.cpp
index 95217baa39a..fb27b6d562e 100644
--- a/examples/APG/Sockets/Iovec.cpp
+++ b/examples/APG/Sockets/Iovec.cpp
@@ -24,11 +24,11 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
   // Listing 1 code/ch06
   iovec send[4];
-  send[0].iov_base = ACE_const_cast (char *, "up");
+  send[0].iov_base = const_cast<char *> ("up");
   send[0].iov_len  = 2;
-  send[1].iov_base = ACE_const_cast (char *, "time");
+  send[1].iov_base = const_cast<char *> ("time");
   send[1].iov_len  = 4;
-  send[2].iov_base = ACE_const_cast (char *, "\n");
+  send[2].iov_base = const_cast<char *> ("\n");
   send[2].iov_len  = 1;
 
   peer.sendv (send, 3);
@@ -61,12 +61,12 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   for (int i = 0; i < 2 && bc > 0; ++i)
     {
       size_t wc = receive[i].iov_len;
-      if (ACE_static_cast (size_t, bc) < wc)
-        wc = ACE_static_cast (size_t, bc);
+      if (static_cast<size_t> (bc) < wc)
+        wc = static_cast<size_t> (bc);
       write (1, receive[i].iov_base, wc);
       bc -= receive[i].iov_len;
       delete []
-        (ACE_reinterpret_cast (char *, receive[i].iov_base));
+        (reinterpret_cast<char *> (receive[i].iov_base));
     }
   // Listing 4
 
@@ -75,7 +75,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   iovec response;
   peer.recvv (&response);
   write (1, response.iov_base, response.iov_len);
-  delete [] ACE_reinterpret_cast (char *, response.iov_base);
+  delete [] reinterpret_cast<char *> (response.iov_base);
   // Listing 5
 
   peer.close ();
diff --git a/examples/APG/Sockets/sockets.mwc b/examples/APG/Sockets/sockets.mwc
deleted file mode 100644
index 7dfb911f0b2..00000000000
--- a/examples/APG/Sockets/sockets.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  sockets.mpc
-}
diff --git a/examples/APG/Streams/Answerer.cpp b/examples/APG/Streams/Answerer.cpp
index b56445f3030..507b6172108 100644
--- a/examples/APG/Streams/Answerer.cpp
+++ b/examples/APG/Streams/Answerer.cpp
@@ -113,7 +113,7 @@ protected:
   ACE_FILE_Addr get_incoming_message_queue (void)
   {
     // Exclude 24
-    return ACE_FILE_Addr ("/tmp/incoming_message");
+    return ACE_FILE_Addr (ACE_TEXT ("/tmp/incoming_message"));
     // Exclude 24
   }
 };
@@ -157,7 +157,7 @@ protected:
   ACE_FILE_Addr get_message_destination (Message *)
   {
     // Exclude 26
-    return ACE_FILE_Addr ("/tmp/encoded_message");
+    return ACE_FILE_Addr (ACE_TEXT ("/tmp/encoded_message"));
     // Exclude 26
   }
 };
@@ -171,8 +171,8 @@ protected:
   {
     ACE_TRACE (ACE_TEXT ("SaveMetaData::process()"));
 
-    ACE_CString path (message->addr ().get_path_name ());
-    path += ".xml";
+    ACE_TString path (message->addr ().get_path_name ());
+    path += ACE_TEXT (".xml");
 
     ACE_FILE_Connector connector;
     ACE_FILE_IO file;
@@ -239,7 +239,7 @@ public:
   {
     if (tail == 0)
       ACE_NEW_RETURN (tail,
-                      Module ("End Module", new EndTask ()),
+                      Module (ACE_TEXT ("End Module"), new EndTask ()),
                       -1);
     this->inherited::open (arg, head, tail);
     // Listing 1000
@@ -247,50 +247,50 @@ public:
     // Listing 1001 code/ch18
     Module *answerIncomingCallModule;
     ACE_NEW_RETURN (answerIncomingCallModule,
-                    Module ("Answer Incoming Call",
+                    Module (ACE_TEXT ("Answer Incoming Call"),
                             new AnswerIncomingCall ()),
                     -1);
 
     // Listing 11 code/ch18
     Module *getCallerIdModule;
     ACE_NEW_RETURN (getCallerIdModule,
-                    Module ("Get Caller ID", new GetCallerId ()),
+                    Module (ACE_TEXT ("Get Caller ID"), new GetCallerId ()),
                     -1);
     // Listing 11
 
     Module *playOGMModule;
     ACE_NEW_RETURN (playOGMModule,
-                    Module ("Play Outgoing Message",
+                    Module (ACE_TEXT ("Play Outgoing Message"),
                             new PlayOutgoingMessage ()),
                     -1);
 
     Module *recordModule;
     ACE_NEW_RETURN (recordModule,
-                    Module ("Record Incoming Message",
+                    Module (ACE_TEXT ("Record Incoming Message"),
                             new RecordIncomingMessage ()),
                     -1);
 
     Module *releaseModule;
     ACE_NEW_RETURN (releaseModule,
-                    Module ("Release Device",
+                    Module (ACE_TEXT ("Release Device"),
                             new ReleaseDevice ()),
                     -1);
 
     Module *conversionModule;
     ACE_NEW_RETURN (conversionModule,
-                    Module ("Encode Message",
+                    Module (ACE_TEXT ("Encode Message"),
                             new EncodeMessage ()),
                     -1);
 
     Module *saveMetaDataModule;
     ACE_NEW_RETURN (saveMetaDataModule,
-                    Module ("Save Meta-Data",
+                    Module (ACE_TEXT ("Save Meta-Data"),
                             new SaveMetaData ()),
                     -1);
 
     Module *notificationModule;
     ACE_NEW_RETURN (notificationModule,
-                    Module ("Notify Someone",
+                    Module (ACE_TEXT ("Notify Someone"),
                             new NotifySomeone ()),
                     -1);
     // Listing 1001
diff --git a/examples/APG/Streams/CommandStream.cpp b/examples/APG/Streams/CommandStream.cpp
index d2b4bfdabb8..def3f123d77 100644
--- a/examples/APG/Streams/CommandStream.cpp
+++ b/examples/APG/Streams/CommandStream.cpp
@@ -49,25 +49,25 @@ int CommandStream::open (void *arg,
   if (this->push (answerCallModule) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Failed to push %p\n"),
-                       ACE_TEXT_CHAR_TO_TCHAR (answerCallModule->name())),
+                       answerCallModule->name()),
                       -1);
 
   if (this->push (retrieveCallerIdModule) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Failed to push %p\n"),
-                       ACE_TEXT_CHAR_TO_TCHAR (retrieveCallerIdModule->name())),
+                       retrieveCallerIdModule->name()),
                       -1);
 
   if (this->push (playMessageModule) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Failed to push %p\n"),
-                       ACE_TEXT_CHAR_TO_TCHAR (playMessageModule->name())),
+                       playMessageModule->name()),
                       -1);
 
   if (this->push (recordMessageModule) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Failed to push %p\n"),
-                       ACE_TEXT_CHAR_TO_TCHAR (recordMessageModule->name())),
+                       recordMessageModule->name()),
                       -1);
   // Listing 03
   return 0;
diff --git a/examples/APG/Streams/CommandTask.cpp b/examples/APG/Streams/CommandTask.cpp
index ec3f61dcc46..7ad63166ffd 100644
--- a/examples/APG/Streams/CommandTask.cpp
+++ b/examples/APG/Streams/CommandTask.cpp
@@ -95,7 +95,7 @@ int CommandTask::svc (void)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("CommandTask::svc() - ")
                   ACE_TEXT ("%s got work request %d\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (this->module ()->name ()),
+                  this->module ()->name (),
                   command->command_));
 
       if (command->command_ != this->command_)
@@ -110,7 +110,7 @@ int CommandTask::svc (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("CommandTask::svc() - ")
                       ACE_TEXT ("%s work request %d result is %d\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (this->module ()->name ()),
+                      this->module ()->name (),
                       command->command_,
                       result));
 
diff --git a/examples/APG/Streams/RecordingDevice_Text.cpp b/examples/APG/Streams/RecordingDevice_Text.cpp
index a44b805ddf7..01720bb2470 100644
--- a/examples/APG/Streams/RecordingDevice_Text.cpp
+++ b/examples/APG/Streams/RecordingDevice_Text.cpp
@@ -97,7 +97,7 @@ MessageType *TextListenerAcceptor::record_message (ACE_FILE_Addr &addr)
 TextListener::TextListener (TextListenerAcceptor *acceptor)
   : acceptor_(acceptor)
 {
-  ACE_TRACE (ACE_TEXT ("TextListener ctor"));
+  ACE_TRACE ("TextListener ctor");
 
   ACE_NEW (this->command_stream_, CommandStream (&(this->peer_)));
   this->command_stream_->open (0);
diff --git a/examples/APG/Streams/streams.mwc b/examples/APG/Streams/streams.mwc
deleted file mode 100644
index 0197a16e2a8..00000000000
--- a/examples/APG/Streams/streams.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  streams.mpc
-}
diff --git a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
index c80817d7efd..b2c15661a66 100644
--- a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
+++ b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
@@ -70,7 +70,7 @@ HA_Status::init (int argc, ACE_TCHAR *argv[])
                        ACE_TEXT ("HAStatus ListenPort ")
                        ACE_TEXT ("does not exist\n")),
                       -1);
-  this->listen_addr_.set (ACE_static_cast (u_short, status_port));
+  this->listen_addr_.set (static_cast<u_short> (status_port));
 
   if (this->acceptor_.open (this->listen_addr_) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -103,7 +103,7 @@ HA_Status::info (ACE_TCHAR **str, size_t len) const
       *str = ACE::strnew (buf);
     else
       ACE_OS::strncpy (*str, buf, len);
-    return ACE_static_cast (int, ACE_OS::strlen (*str));
+    return static_cast<int> (ACE_OS::strlen (*str));
   }
 // Listing 3
 
diff --git a/examples/APG/Svc_Config/HA_Status_Static.cpp b/examples/APG/Svc_Config/HA_Status_Static.cpp
index 5027ae34dd5..b97c74a11d9 100644
--- a/examples/APG/Svc_Config/HA_Status_Static.cpp
+++ b/examples/APG/Svc_Config/HA_Status_Static.cpp
@@ -69,7 +69,7 @@ HA_Status::init (int argc, ACE_TCHAR *argv[])
                        ACE_TEXT ("HAStatus ListenPort does ")
                        ACE_TEXT ("not exist\n")),
                       -1);
-  this->listen_addr_.set (ACE_static_cast (u_short, status_port));
+  this->listen_addr_.set (static_cast<u_short> (status_port));
 
   if (this->acceptor_.open (this->listen_addr_) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -101,7 +101,7 @@ HA_Status::info (ACE_TCHAR **str, size_t len) const
       *str = ACE::strnew (buf);
     else
       ACE_OS::strncpy (*str, buf, len);
-    return ACE_static_cast (int, ACE_OS::strlen (*str));
+    return static_cast<int> (ACE_OS::strlen (*str));
   }
 // Listing 3
 
diff --git a/examples/APG/Svc_Config/HA_Status_Static.h b/examples/APG/Svc_Config/HA_Status_Static.h
index 6545cdadf48..d4926ff0460 100644
--- a/examples/APG/Svc_Config/HA_Status_Static.h
+++ b/examples/APG/Svc_Config/HA_Status_Static.h
@@ -16,6 +16,7 @@
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Service_Object.h"
 #include "ace/Svc_Handler.h"
+#include "ace/Service_Config.h"
 
 class ClientHandler :
       public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
diff --git a/examples/APG/Svc_Config/svc_config.mwc b/examples/APG/Svc_Config/svc_config.mwc
deleted file mode 100644
index ff7d458bc6c..00000000000
--- a/examples/APG/Svc_Config/svc_config.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  svc_config.mpc
-}
diff --git a/examples/APG/ThreadManagement/Priorities.cpp b/examples/APG/ThreadManagement/Priorities.cpp
index a7d7effdabf..06021432291 100644
--- a/examples/APG/ThreadManagement/Priorities.cpp
+++ b/examples/APG/ThreadManagement/Priorities.cpp
@@ -23,7 +23,15 @@ public:
     ACE_OS::sleep (2);
     ACE_Message_Block *mb;
     while (this->getq (mb) != -1)
-      process_message (mb);
+      {
+        if (mb->msg_type () == ACE_Message_Block::MB_BREAK)
+          {
+            mb->release ();
+            break;
+          }
+        process_message (mb);
+        mb->release ();
+      }
     return 0;
   }
 
@@ -42,10 +50,14 @@ private:
 };
 // Listing 2
 
+#if !defined (ACE_THR_PRI_OTHER_MAX)
 // This should be fixed in ACE... There's no _MAX, _MIN values for
 // thread priorities.
-#if defined (ACE_WIN32) && !defined (ACE_THR_PRI_OTHER_MAX)
+#if defined (ACE_WIN32)
 #  define ACE_THR_PRI_OTHER_MAX ((ACE_THR_PRI_OTHER_DEF) + 1)
+#elif defined (VXWORKS)
+#  define ACE_THR_PRI_OTHER_MAX 0
+#endif
 #endif
 
 // Listing 1 code/ch13
@@ -62,10 +74,16 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_Message_Block mb;
   for (int i = 0; i < 100; i++)
     {
-      hp_handler.putq (&mb);
-      lp_handler.putq (&mb);
+      ACE_Message_Block *mb_hp, *mb_lp;
+      mb_hp = mb.clone ();
+      mb_lp = mb.clone ();
+      hp_handler.putq (mb_hp);
+      lp_handler.putq (mb_lp);
     }
 
+  ACE_Message_Block stop (0, ACE_Message_Block::MB_BREAK);
+  hp_handler.putq (stop.clone ());
+  lp_handler.putq (stop.clone ());
   hp_handler.wait ();
   lp_handler.wait ();
 
diff --git a/examples/APG/ThreadManagement/threadmgmt.mwc b/examples/APG/ThreadManagement/threadmgmt.mwc
deleted file mode 100644
index bfb05f50f1d..00000000000
--- a/examples/APG/ThreadManagement/threadmgmt.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  threadmgmt.mpc
-}
diff --git a/examples/APG/ThreadPools/Futures.cpp b/examples/APG/ThreadPools/Futures.cpp
index 95f76a524cf..32028714288 100644
--- a/examples/APG/ThreadPools/Futures.cpp
+++ b/examples/APG/ThreadPools/Futures.cpp
@@ -24,7 +24,7 @@ public:
     ACE_CString *result;
 
     // Block for the result.
-    ((ACE_Future<ACE_CString*>)future).get (result);
+    future.get (result);
     ACE_DEBUG ((LM_INFO, ACE_TEXT("%C\n"), result->c_str ()));
     delete result;
   }
@@ -42,7 +42,7 @@ public:
     ACE_OS::sleep (1);
 
     char buf[1024];
-    ACE_OS::strcpy (buf, ACE_TEXT ("Completed assigned task\n"));
+    ACE_OS::strcpy (buf, "Completed assigned task\n");
     ACE_CString *msg;
     ACE_NEW_RETURN
       (msg, ACE_CString (buf, ACE_OS::strlen (buf) + 1), -1);
@@ -250,7 +250,7 @@ Manager::shut_down (void)
 {
   ACE_TRACE (ACE_TEXT ("Manager::shut_down"));
   ACE_Unbounded_Queue<Worker* >::ITERATOR iter = this->workers_.begin ();
-  Worker **worker_ptr = NULL;
+  Worker **worker_ptr = 0;
   do
     {
       iter.next (worker_ptr);
diff --git a/examples/APG/ThreadPools/LF_ThreadPool.cpp b/examples/APG/ThreadPools/LF_ThreadPool.cpp
index 79540435f96..2e85ed41b3c 100644
--- a/examples/APG/ThreadPools/LF_ThreadPool.cpp
+++ b/examples/APG/ThreadPools/LF_ThreadPool.cpp
@@ -99,7 +99,7 @@ LF_ThreadPool::svc (void)
     {
       become_leader ();  // Block until this thread is the leader.
 
-      ACE_Message_Block *mb = NULL;
+      ACE_Message_Block *mb = 0;
       ACE_Time_Value tv (LONG_TIME);
       tv += ACE_OS::gettimeofday ();
 
diff --git a/examples/APG/ThreadPools/TP_Reactor.cpp b/examples/APG/ThreadPools/TP_Reactor.cpp
index 56998bb2a0d..ff9e11012db 100644
--- a/examples/APG/ThreadPools/TP_Reactor.cpp
+++ b/examples/APG/ThreadPools/TP_Reactor.cpp
@@ -60,7 +60,7 @@ Request_Handler::handle_input (ACE_HANDLE fd)
 
   if (result > 0
       && this->peer ().recv_n (buffer, len * sizeof (ACE_TCHAR))
-      == ACE_static_cast (ssize_t, len * sizeof (ACE_TCHAR)))
+      == static_cast<ssize_t> (len * sizeof (ACE_TCHAR)))
     {
       ++this->nr_msgs_rcvd_;
 
@@ -165,7 +165,7 @@ class Client: public ACE_Task_Base
       ACE_SOCK_Stream stream;
       ACE_SOCK_Connector connect;
       ACE_Time_Value delay (0, req_delay);
-      size_t len = * ACE_reinterpret_cast (ACE_TCHAR *, arg);
+      size_t len = * reinterpret_cast<ACE_TCHAR *> (arg);
 
       for (size_t i = 0 ; i < cli_conn_no; i++)
         {
diff --git a/examples/APG/ThreadPools/ThreadPool.cpp b/examples/APG/ThreadPools/ThreadPool.cpp
index cfcfcee8b58..cecee873820 100644
--- a/examples/APG/ThreadPools/ThreadPool.cpp
+++ b/examples/APG/ThreadPools/ThreadPool.cpp
@@ -102,7 +102,7 @@ public:
 
     while (!done ())
       {
-        ACE_Message_Block *mb = NULL;
+        ACE_Message_Block *mb = 0;
         ACE_Time_Value tv ((long)MAX_TIMEOUT);
         tv += ACE_OS::time (0);
 
@@ -188,7 +188,7 @@ Manager::shut_down (void)
   ACE_TRACE (ACE_TEXT ("Manager::shut_down"));
   ACE_Unbounded_Queue<Worker* >::ITERATOR iter =
     this->workers_.begin ();
-  Worker **worker_ptr = NULL;
+  Worker **worker_ptr = 0;
   do
     {
       iter.next (worker_ptr);
diff --git a/examples/APG/ThreadPools/threadpools.mwc b/examples/APG/ThreadPools/threadpools.mwc
deleted file mode 100644
index a4c2b0f8085..00000000000
--- a/examples/APG/ThreadPools/threadpools.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  threadpools.mpc
-}
diff --git a/examples/APG/ThreadSafety/threadsafety.mwc b/examples/APG/ThreadSafety/threadsafety.mwc
deleted file mode 100644
index 8d68bfb172c..00000000000
--- a/examples/APG/ThreadSafety/threadsafety.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  threadsafety.mpc
-}
diff --git a/examples/APG/Threads/Guards.cpp b/examples/APG/Threads/Guards.cpp
index 75c40c98594..7ef23e1e4da 100644
--- a/examples/APG/Threads/Guards.cpp
+++ b/examples/APG/Threads/Guards.cpp
@@ -1,9 +1,34 @@
 // $Id$
+#include "ace/config-lite.h"
+#if defined (ACE_HAS_THREADS)
+
+#include "ace/OS_main.h"
+#include "ace/OS_Memory.h"
+#include "ace/Guard_T.h"
+#include "ace/Log_Msg.h"
+#include "ace/Thread_Mutex.h"
+
+// This file exists primarily to get code into the book to show different
+// ways to do the same thing. For complete context and explanation, please
+// see APG chapter 12.
+
+class HA_Device_Repository {
+public:
+  int update_device (int device_id);
+
+private:
+  ACE_Thread_Mutex  mutex_;
+};
+
+class Object {
+};
+static Object *object;
 
 #if 0
+// This is less-desired way to do this...
 
 // Listing 1 code/ch12
-int 
+int
 HA_Device_Repository::update_device (int device_id)
 {
   this->mutex_.acquire ();
@@ -19,10 +44,10 @@ HA_Device_Repository::update_device (int device_id)
 }
 // Listing 1
 // Listing 2 code/ch12
-int 
+int
 HA_Device_Repository::update_device (int device_id)
 {
-  // Construct a guard specifying the type of the mutex as 
+  // Construct a guard specifying the type of the mutex as
   // a template parameter and passing in the mutex to hold
   // as a parameter.
   ACE_Guard<ACE_Thread_Mutex> guard (this->mutex_);
@@ -35,18 +60,36 @@ HA_Device_Repository::update_device (int device_id)
   // Guard is destroyed, automatically releasing the lock.
 }
 // Listing 2
+#endif /* 0 */
+
 // Listing 3 code/ch12
-int 
-HA_Device_Repository::update_device (int device_id)
+int
+HA_Device_Repository::update_device (int /* device_id */)
 {
   ACE_GUARD_RETURN (ACE_Thread_Mutex, mon, mutex_, -1);
 
   ACE_NEW_RETURN (object, Object, -1);
   // Use the object.
   // ...
+  return 0;
 }
 // Listing 3
 
-#endif /* 0 */
-int main (int, char *[])
-{ return 0; }
+int ACE_TMAIN (int, ACE_TCHAR *[])
+{
+  HA_Device_Repository rep;
+  rep.update_device (42);
+  return 0;
+}
+
+#else
+#include "ace/OS_main.h"
+#include "ace/OS_NS_stdio.h"
+
+int ACE_TMAIN (int, ACE_TCHAR *[])
+{
+  ACE_OS::puts (ACE_TEXT ("This example requires threads."));
+  return 0;
+}
+
+#endif /* ACE_HAS_THREADS */
diff --git a/examples/APG/Threads/Message_Blocks.cpp b/examples/APG/Threads/Message_Blocks.cpp
index 3ddf3ba8a5b..96cbf3e8cfe 100644
--- a/examples/APG/Threads/Message_Blocks.cpp
+++ b/examples/APG/Threads/Message_Blocks.cpp
@@ -1,8 +1,16 @@
 // $Id$
 
-int main (int, char **)
+#include "ace/OS_main.h"
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
+#include "ace/Log_Msg.h"
+#include "ace/Message_Block.h"
+
+int ACE_TMAIN (int, ACE_TCHAR **)
 {
 #if 0
+// Just for the book...
 
 // Listing 1 code/ch12
   ACE_Message_Block *mb;
@@ -11,19 +19,20 @@ int main (int, char **)
   const char *deviceAddr= "Dev#12";
   mb->copy (deviceAddr, ACE_OS::strlen (deviceAddr)+1);
 // Listing 1
+#endif /* 0 */
 // Listing 2 code/ch12
   ACE_Message_Block *mb;
   ACE_NEW_RETURN (mb, ACE_Message_Block (128), -1);
 
   const char *commandSeq= "CommandSeq#14";
   ACE_OS::sprintf (mb->wr_ptr (), commandSeq);
-  // Move the wr_ptr() forward in the buffer by the 
+  // Move the wr_ptr() forward in the buffer by the
   // amount of data we just put in.
   mb->wr_ptr (ACE_OS::strlen (commandSeq) +1);
 // Listing 2
 // Listing 3 code/ch12
-  ACE_DEBUG((LM_DEBUG, 
-             ACE_TEXT ("Command Sequence --> %s\n"), 
+  ACE_DEBUG((LM_DEBUG,
+             ACE_TEXT ("Command Sequence --> %C\n"),
              mb->rd_ptr ()));
   mb->rd_ptr (ACE_OS::strlen (mb->rd_ptr ())+1);
   mb->release ();
@@ -35,6 +44,7 @@ int main (int, char **)
   // Send an error notification to the receiver.
   mb->msg_type (ACE_Message_Block::MB_ERROR);
 // Listing 4
-#endif
+  mb->release ();
+
   return 0;
 }
diff --git a/examples/APG/Threads/threads.mwc b/examples/APG/Threads/threads.mwc
deleted file mode 100644
index c6d64884433..00000000000
--- a/examples/APG/Threads/threads.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  threads.mpc
-}
diff --git a/examples/APG/Timers/Alarm.cpp b/examples/APG/Timers/Alarm.cpp
index 29828531ac1..e66f1ed0465 100644
--- a/examples/APG/Timers/Alarm.cpp
+++ b/examples/APG/Timers/Alarm.cpp
@@ -20,7 +20,7 @@ public:
   {
     ACE_TRACE (ACE_TEXT ("CB::handle_timeout"));
 
-    const int *val = ACE_static_cast (const int*, arg);
+    const int *val = static_cast<const int*> (arg);
     ACE_ASSERT ((*val) == id_);
 
     ACE_UNUSED_ARG (val);
diff --git a/examples/APG/Timers/CB.cpp b/examples/APG/Timers/CB.cpp
index 4754987660f..0a86ae7edeb 100644
--- a/examples/APG/Timers/CB.cpp
+++ b/examples/APG/Timers/CB.cpp
@@ -15,7 +15,7 @@ int CB::handle_timeout (const ACE_Time_Value &,
 {
   ACE_TRACE (ACE_TEXT ("CB::handle_timeout"));
 
-  const int *val = ACE_static_cast (const int*, arg);
+  const int *val = static_cast<const int*> (arg);
   ACE_ASSERT ((*val) == timerID_);
 
   ACE_UNUSED_ARG (val);
diff --git a/examples/APG/Timers/PCB.cpp b/examples/APG/Timers/PCB.cpp
index 03392ca7ead..c13d060a1d3 100644
--- a/examples/APG/Timers/PCB.cpp
+++ b/examples/APG/Timers/PCB.cpp
@@ -13,7 +13,7 @@ int PCB::handleEvent (const void *arg)
 {
   ACE_TRACE (ACE_TEXT ("PCB::handle_timeout"));
 
-  const int *val = ACE_static_cast (const int*, arg);
+  const int *val = static_cast<const int*> (arg);
   ACE_ASSERT ((*val) == timerID_); 
 
   ACE_UNUSED_ARG (val);
diff --git a/examples/APG/Timers/Task.cpp b/examples/APG/Timers/Task.cpp
index d25a8197857..cf2a87bae2d 100644
--- a/examples/APG/Timers/Task.cpp
+++ b/examples/APG/Timers/Task.cpp
@@ -21,7 +21,7 @@ public:
   {
     ACE_TRACE (ACE_TEXT ("CB::handle_timeout"));
 
-    const int *val = ACE_static_cast (const int*, arg);
+    const int *val = static_cast<const int*> (arg);
     ACE_ASSERT((*val) == id_);
 
     ACE_UNUSED_ARG (val);
diff --git a/examples/APG/Timers/timers.mwc b/examples/APG/Timers/timers.mwc
deleted file mode 100644
index a9b2f734629..00000000000
--- a/examples/APG/Timers/timers.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  timers.mpc
-}
diff --git a/examples/ASX/CCM_App/CCM_App.cpp b/examples/ASX/CCM_App/CCM_App.cpp
index b791ac8639e..ac72730edb7 100644
--- a/examples/ASX/CCM_App/CCM_App.cpp
+++ b/examples/ASX/CCM_App/CCM_App.cpp
@@ -18,65 +18,65 @@ class ACE_Svc_Export Test_Task : public MT_Task
 public:
   virtual int open (void *);
   virtual int close (u_long);
-  virtual int init (int, char *[]);
+  virtual int init (int, ACE_TCHAR *[]);
   virtual int fini (void);
   virtual int suspend (void);
   virtual int resume (void);
 };
 
-int 
+int
 Test_Task::open (void *)
-{ 
+{
   ACE_DEBUG ((LM_DEBUG,
-              "opening %s\n",
-              this->name () ? this->name () : "task"));
+              ACE_TEXT ("opening %s\n"),
+              this->name () ? this->name () : ACE_TEXT ("task")));
   return 0;
 }
 
-int 
-Test_Task::close (u_long) 
+int
+Test_Task::close (u_long)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "closing %s\n",
-              this->name () ? this->name () : "task"));
+              ACE_TEXT ("closing %s\n"),
+              this->name () ? this->name () : ACE_TEXT ("task")));
   return 0;
 }
 
-int 
-Test_Task::suspend (void) 
-{ 
+int
+Test_Task::suspend (void)
+{
   ACE_DEBUG ((LM_DEBUG,
-              "suspending in %s\n",
-              this->name () ? this->name () : "task")); 
-  return 0; 
+              ACE_TEXT ("suspending in %s\n"),
+              this->name () ? this->name () : ACE_TEXT ("task")));
+  return 0;
 }
 
-int 
-Test_Task::resume (void) 
+int
+Test_Task::resume (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "resuming in %s\n",
-              this->name () ? this->name () : "task"));
+              ACE_TEXT ("resuming in %s\n"),
+              this->name () ? this->name () : ACE_TEXT ("task")));
   return 0;
 }
 
-int 
-Test_Task::init (int, char *[])
+int
+Test_Task::init (int, ACE_TCHAR *[])
 {
   ACE_DEBUG ((LM_DEBUG,
-              "initializing %s\n",
-              this->name () ? this->name () : "task"));
+              ACE_TEXT ("initializing %s\n"),
+              this->name () ? this->name () : ACE_TEXT ("task")));
 
-  return 0; 
+  return 0;
 }
 
-int 
+int
 Test_Task::fini (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "finalizing %s\n",
-              this->name () ? this->name () : "task"));
-  return 0; 
+              ACE_TEXT ("finalizing %s\n"),
+              this->name () ? this->name () : ACE_TEXT ("task")));
+  return 0;
 }
 
 // Factories used to control configuration.
@@ -100,17 +100,20 @@ make_stream (void)
 MT_Module *
 make_da (void)
 {
-  return new MT_Module ("Device_Adapter", new Test_Task, new Test_Task);
+  return new MT_Module (ACE_TEXT ("Device_Adapter"),
+                        new Test_Task, new Test_Task);
 }
 
 MT_Module *
 make_ea (void)
 {
-  return new MT_Module ("Event_Analyzer", new Test_Task, new Test_Task);
+  return new MT_Module (ACE_TEXT ("Event_Analyzer"),
+                        new Test_Task, new Test_Task);
 }
 
 MT_Module *
 make_mr (void)
 {
-  return new MT_Module ("Multicast_Router", new Test_Task, new Test_Task);
+  return new MT_Module (ACE_TEXT ("Multicast_Router"),
+                        new Test_Task, new Test_Task);
 }
diff --git a/examples/ASX/CCM_App/SC_Client.cpp b/examples/ASX/CCM_App/SC_Client.cpp
index 41453b3eb5d..fbd4439784a 100644
--- a/examples/ASX/CCM_App/SC_Client.cpp
+++ b/examples/ASX/CCM_App/SC_Client.cpp
@@ -6,8 +6,8 @@ ACE_RCSID(CCM_App, SC_Client, "$Id$")
 
 // Pretty simple, eh? ;-)
 
-int 
-main (int, char *[])
+int
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/examples/ASX/CCM_App/SC_Server.cpp b/examples/ASX/CCM_App/SC_Server.cpp
index 6d6d6904099..bb6f60a2b8e 100644
--- a/examples/ASX/CCM_App/SC_Server.cpp
+++ b/examples/ASX/CCM_App/SC_Server.cpp
@@ -4,8 +4,10 @@
 // links in all the services in the <svc.conf> file.
 
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_main.h"
 #include "ace/Service_Config.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Reactor.h"
 #include "ace/Signal.h"
 
 ACE_RCSID(CCM_App, SC_Server, "$Id$")
@@ -14,11 +16,11 @@ class Event_Handler : public ACE_Event_Handler
 {
 public:
   virtual int handle_input (ACE_HANDLE handle);
-  virtual int handle_close (ACE_HANDLE, 
+  virtual int handle_close (ACE_HANDLE,
 			    ACE_Reactor_Mask);
 };
 
-int 
+int
 Event_Handler::handle_input (ACE_HANDLE handle)
 {
   char buf[BUFSIZ];
@@ -27,28 +29,28 @@ Event_Handler::handle_input (ACE_HANDLE handle)
   if (n == -1)
     return -1;
   else if (n == 0)
-    ACE_ERROR_RETURN ((LM_DEBUG, 
-                       "shutting down on EOF\n"),
+    ACE_ERROR_RETURN ((LM_DEBUG,
+                       ACE_TEXT ("shutting down on EOF\n")),
                       -1);
   else if (ACE_OS::write (ACE_STDOUT, buf, n) != n)
-    ACE_ERROR_RETURN ((LM_DEBUG, 
-                       "%p\n", "write failed"),
+    ACE_ERROR_RETURN ((LM_DEBUG,
+                       ACE_TEXT ("%p\n"), ACE_TEXT ("write failed")),
                        -1);
   else
     return 0;
 }
 
-int 
+int
 Event_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "closing Event_Handler\n"));
-  ACE_Reactor::end_event_loop ();
+              ACE_TEXT ("closing Event_Handler\n")));
+  ACE_Reactor::instance ()->end_reactor_event_loop ();
   return 0;
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Service_Config loggerd;
   Event_Handler handler;
@@ -58,8 +60,8 @@ main (int argc, char *argv[])
 						 ACE_Reactor::instance (),
 						 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "register_stdin_handler"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("register_stdin_handler")));
 
   if (loggerd.open (argc,
                     argv,
@@ -67,18 +69,18 @@ main (int argc, char *argv[])
                     // Don't ignore static services!
                     0) == -1 && errno != ENOENT)
     ACE_ERROR ((LM_ERROR,
-                "%p\n%a",
-                "open",
+                ACE_TEXT ("%p\n%a"),
+                ACE_TEXT ("open"),
                 1));
   else if (ACE_Reactor::instance ()->register_handler
     (SIGINT, &shutdown_handler) == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n%a",
-                "register_handler",
+                ACE_TEXT ("%p\n%a"),
+                ACE_TEXT ("register_handler"),
                 1));
 
   // Perform logging service until we receive SIGINT.
 
-  ACE_Reactor::run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
   return 0;
 }
diff --git a/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
index 712672cc559..d5215ffcd26 100644
--- a/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
@@ -44,8 +44,8 @@ Consumer_Router::open (void *)
 int
 Consumer_Router::close (u_long)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%t) closing Consumer_Router %s\n",
-	      this->is_reader () ? "reader" : "writer"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) closing Consumer_Router %s\n"),
+	      this->is_reader () ? ACE_TEXT ("reader") : ACE_TEXT ("writer")));
 
   if (this->is_writer ())
     // Inform the thread to shut down.
@@ -65,25 +65,26 @@ Consumer_Router::svc (void)
   assert (this->is_writer ());
 
   ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) starting svc in Consumer_Router\n"));
+	      ACE_TEXT ("(%t) starting svc in Consumer_Router\n")));
 
   for (ACE_Message_Block *mb = 0;
        this->getq (mb) >= 0;
        )
     {
       ACE_DEBUG ((LM_DEBUG, 
-		  "(%t) warning: Consumer_Router is "
-                  "forwarding a message to Supplier_Router\n"));
+		  ACE_TEXT ("(%t) warning: Consumer_Router is ")
+                  ACE_TEXT ("forwarding a message to Supplier_Router\n")));
 
       // Pass this message down to the next Module's writer Task.
       if (this->put_next (mb) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "(%t) send_peers failed in Consumer_Router\n"),
-			  -1);
+	ACE_ERROR_RETURN
+          ((LM_ERROR, 
+            ACE_TEXT ("(%t) send_peers failed in Consumer_Router\n")),
+           -1);
     }
 
   ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) stopping svc in Consumer_Router\n"));
+	      ACE_TEXT ("(%t) stopping svc in Consumer_Router\n")));
   return 0;
   // Note the implicit ACE_OS::thr_exit() via destructor.
 }
@@ -109,9 +110,10 @@ Consumer_Router::put (ACE_Message_Block *mb,
   else if (this->is_reader ())
     {
       if (this->context ()->send_peers (mb) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "(%t) send_peers failed in Consumer_Router\n"),
-			  -1);
+	ACE_ERROR_RETURN
+          ((LM_ERROR,
+            ACE_TEXT ("(%t) send_peers failed in Consumer_Router\n")),
+           -1);
       else 
 	return 0;
     }
@@ -125,24 +127,29 @@ Consumer_Router::put (ACE_Message_Block *mb,
 }
 
 // Return information about the <Consumer_Router>.
+#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
+#  define FMTSTR  ACE_TEXT ("%s\t %d/%s %s (%s)\n")
+#else
+#  define FMTSTR  ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n")
+#endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
 int
-Consumer_Router::info (char **strp, size_t length) const
+Consumer_Router::info (ACE_TCHAR **strp, size_t length) const
 {
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   ACE_INET_Addr  addr;
-  const char *mod_name = this->name ();
+  const ACE_TCHAR *mod_name = this->name ();
   
   if (this->context ()->acceptor ().get_local_addr (addr) == -1)
     return -1;
   
   ACE_OS::sprintf (buf,
-                   "%s\t %d/%s %s (%s)\n",
+                   FMTSTR,
 		   mod_name,
                    addr.get_port_number (),
-                   "tcp",
-		   "# consumer router",
-                   this->is_reader () ? "reader" : "writer");
+                   ACE_TEXT ("tcp"),
+		   ACE_TEXT ("# consumer router"),
+                   this->is_reader () ? ACE_TEXT ("reader") : ACE_TEXT ("writer"));
   if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0)
     return -1;
   else
diff --git a/examples/ASX/Event_Server/Event_Server/Consumer_Router.h b/examples/ASX/Event_Server/Event_Server/Consumer_Router.h
index 556dd640230..062a07116ea 100644
--- a/examples/ASX/Event_Server/Event_Server/Consumer_Router.h
+++ b/examples/ASX/Event_Server/Event_Server/Consumer_Router.h
@@ -64,7 +64,7 @@ protected:
   // the stream.
 
   // = Dynamic linking hooks.
-  virtual int info (char **info_string, size_t length) const;
+  virtual int info (ACE_TCHAR **info_string, size_t length) const;
   // Returns information about this service.
 };
 
diff --git a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
index beeeed83807..a064da6459a 100644
--- a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
@@ -43,8 +43,8 @@ Event_Analyzer::put (ACE_Message_Block *mb, ACE_Time_Value *)
 {
   if (Options::instance ()->debug ())
     ACE_DEBUG ((LM_DEBUG,
-                "(%t) passing through Event_Analyser::put() (%s)\n",
-		this->is_reader () ? "reader" : "writer"));
+                ACE_TEXT ("(%t) passing through Event_Analyser::put() (%s)\n"),
+		this->is_reader () ? ACE_TEXT ("reader") : ACE_TEXT ("writer")));
 
   if (mb->msg_type () == ACE_Message_Block::MB_IOCTL)
     this->control (mb);
@@ -54,7 +54,7 @@ Event_Analyzer::put (ACE_Message_Block *mb, ACE_Time_Value *)
 }
 
 int 
-Event_Analyzer::init (int, char *[])
+Event_Analyzer::init (int, ACE_TCHAR *[])
 {
   // No-op for now.
   return 0;
@@ -68,9 +68,9 @@ Event_Analyzer::fini (void)
 }
 
 int 
-Event_Analyzer::info (char **strp, size_t length) const
+Event_Analyzer::info (ACE_TCHAR **strp, size_t length) const
 {
-  const char *mod_name = this->name ();
+  const ACE_TCHAR *mod_name = this->name ();
   
   if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0)
     return -1;
diff --git a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h
index c88db5dedc9..d4f88c8b68d 100644
--- a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h
+++ b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h
@@ -32,9 +32,9 @@ public:
   // Entry point into this task.
 
   // Dynamic linking hooks (not used).
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int fini (void);
-  virtual int info (char **info_string,
+  virtual int info (ACE_TCHAR **info_string,
                     size_t length) const;
 private:
   virtual int control (ACE_Message_Block *);
diff --git a/examples/ASX/Event_Server/Event_Server/Options.cpp b/examples/ASX/Event_Server/Event_Server/Options.cpp
index c3c2258eeb3..6ef846f2f31 100644
--- a/examples/ASX/Event_Server/Event_Server/Options.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Options.cpp
@@ -104,11 +104,11 @@ void Options::print_results (void)
 }
 
 void
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, "c:bdH:i:L:l:M:ns:t:T:v");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:bdH:i:L:l:M:ns:t:T:v"));
   int c;
 
   while ((c = get_opt ()) != EOF)
@@ -146,9 +146,9 @@ Options::parse_args (int argc, char *argv[])
 	break;
       case 'T':
 #if defined (ACE_HAS_TRACE)
-	if (ACE_OS::strcasecmp (get_opt.opt_arg (), "ON") == 0)
+	if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT ("ON")) == 0)
 	  ACE_Trace::start_tracing ();
-	else if (ACE_OS::strcasecmp (get_opt.opt_arg (), "OFF") == 0)
+	else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT ("OFF")) == 0)
 	  ACE_Trace::stop_tracing ();
 #endif /* ACE_HAS_TRACE */
 	break;
@@ -172,12 +172,18 @@ Options::parse_args (int argc, char *argv[])
 		   "\t[-s supplier port]\n"
 		   "\t[-t number of threads]\n"
 		   "\t[-v] (verbose) \n",
-		   argv[0]);
+		   ACE_TEXT_ALWAYS_CHAR (argv[0]));
 	::exit (1);
 	/* NOTREACHED */
 	break;
       }
 
+  // This is a major hack to get the size_t format spec to be a narrow
+  // char, same as the other strings for printf() here. It only works
+  // because this is the end of the source file. It makes the
+  // ACE_SIZE_T_FORMAT_SPECIFIER not use ACE_LIB_TEXT, effectively.
+#undef ACE_LIB_TEXT
+#define ACE_LIB_TEXT(A) A
   if (this->verbose ())
     ACE_OS::printf ("%8d = initial concurrency hint\n"
 	      ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n"
diff --git a/examples/ASX/Event_Server/Event_Server/Options.h b/examples/ASX/Event_Server/Event_Server/Options.h
index 0dbe093a079..7be5ec0a3cc 100644
--- a/examples/ASX/Event_Server/Event_Server/Options.h
+++ b/examples/ASX/Event_Server/Event_Server/Options.h
@@ -20,7 +20,7 @@ public:
   static Options *instance (void);
   // Singleton access point.
 
-  void parse_args (int argc, char *argv[]);
+  void parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the command-line arguments and set the options.
 
   // = Timer management.
diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
index 1679b4d746d..8d376f27b4b 100644
--- a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
@@ -38,7 +38,7 @@ Peer_Router_Context::send_peers (ACE_Message_Block *mb)
     {
       if (Options::instance ()->debug ())
 	ACE_DEBUG ((LM_DEBUG,
-		    "(%t) sending to peer via handle %d\n",
+		    ACE_TEXT ("(%t) sending to peer via handle %d\n"),
 		    ss->ext_id_));
 
       iterations++;
@@ -92,21 +92,21 @@ Peer_Router_Context::Peer_Router_Context (u_short port)
   ACE_INET_Addr endpoint (port);
   if (this->open (endpoint) == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "Acceptor::open"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("Acceptor::open")));
 
   // Initialize the connection map.
   else if (this->peer_map_.open () == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "Map_Manager::open"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("Map_Manager::open")));
   else
     {
       ACE_INET_Addr addr;
 
       if (this->acceptor ().get_local_addr (addr) != -1)
 	ACE_DEBUG ((LM_DEBUG,
-		    "(%t) initializing %s on port = %d, handle = %d, this = %u\n",
+		    ACE_TEXT ("(%t) initializing %C on port = %d, handle = %d, this = %u\n"),
 		    addr.get_port_number () == Options::instance ()->supplier_port () 
                     ? "Supplier_Handler" : "Consumer_Handler",
 		    addr.get_port_number (),
@@ -114,8 +114,8 @@ Peer_Router_Context::Peer_Router_Context (u_short port)
 		    this));
       else
 	ACE_ERROR ((LM_ERROR,
-		    "%p\n",
-                    "get_local_addr"));
+		    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("get_local_addr")));
     }
 }
 
@@ -123,7 +123,7 @@ Peer_Router_Context::~Peer_Router_Context (void)
 {
   // Free up the handle and close down the listening socket.
   ACE_DEBUG ((LM_DEBUG,
-	      "(%t) closing down Peer_Router_Context\n"));
+	      ACE_TEXT ("(%t) closing down Peer_Router_Context\n")));
 
   // Close down the Acceptor and take ourselves out of the Reactor.
   this->handle_close ();
@@ -139,15 +139,15 @@ Peer_Router_Context::~Peer_Router_Context (void)
     {
       if (Options::instance ()->debug ())
 	ACE_DEBUG ((LM_DEBUG,
-		    "(%t) closing down peer on handle %d\n",
+		    ACE_TEXT ("(%t) closing down peer on handle %d\n"),
 		    ss->ext_id_));
 
       if (ACE_Reactor::instance ()->remove_handler
 	  (ss->ext_id_,
            ACE_Event_Handler::READ_MASK) == -1)
 	ACE_ERROR ((LM_ERROR,
-                    "(%t) p\n",
-                    "remove_handle"));
+                    ACE_TEXT ("(%t) p\n"),
+                    ACE_TEXT ("remove_handle")));
     }
 
   // Close down the map.
@@ -213,46 +213,46 @@ Peer_Handler::put (ACE_Message_Block *mb,
 int
 Peer_Handler::open (void *)
 {
-  char buf[BUFSIZ], *p = buf;
+  ACE_TCHAR buf[BUFSIZ], *p = buf;
 
   if (this->peer_router_context_->peer_router ()->info (&p,
-                                        sizeof buf) != -1)
+                                                        sizeof buf) != -1)
     ACE_DEBUG ((LM_DEBUG,
-                "(%t) creating handler for %s, handle = %d\n",
+                ACE_TEXT ("(%t) creating handler for %s, handle = %d\n"),
                 buf,
                 this->get_handle ()));
   else
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "info"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("info")),
                       -1);
 #if 0
   // If we're running as an Active Object activate the Peer_Handler
   // here.
   if (this->activate (Options::instance ()->t_flags ()) == -1)
      ACE_ERROR_RETURN ((LM_ERROR,
-                        "%p\n",
-                        "activation of thread failed"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("activation of thread failed")),
                        -1);
   ACE_DEBUG ((LM_DEBUG,
-	      "(%t) Peer_Handler::open registering with Reactor for handle_input\n"));
+	      ACE_TEXT ("(%t) Peer_Handler::open registering with Reactor for handle_input\n")));
 #else
 
   // Register with the Reactor to receive messages from our Peer.
   if (ACE_Reactor::instance ()->register_handler
       (this, ACE_Event_Handler::READ_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "register_handler"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("register_handler")),
                       -1);
 #endif /* 0 */
 
   // Insert outselves into the routing map.
   else if (this->peer_router_context_->bind_peer (this->get_handle (),
-                                  this) == -1)
+                                                  this) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n",
-                       "bind_peer"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("bind_peer")),
                       -1);
   else
     return 0;
@@ -264,7 +264,7 @@ int
 Peer_Handler::handle_input (ACE_HANDLE h)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) input arrived on handle %d\n",
+              ACE_TEXT ("(%t) input arrived on handle %d\n"),
               h));
 
   ACE_Message_Block *db;
@@ -286,19 +286,19 @@ Peer_Handler::handle_input (ACE_HANDLE h)
 
   if (n == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p",
-                       "recv failed"),
+                       ACE_TEXT ("%p"),
+                       ACE_TEXT ("recv failed")),
                       -1);
   else if (n == 0) // Client has closed down the connection.
     {
       if (this->peer_router_context_->unbind_peer (this->get_handle ()) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p",
-                           "unbind failed"),
+                           ACE_TEXT ("%p"),
+                           ACE_TEXT ("unbind failed")),
                           -1);
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%t) shutting down handle %d\n", h));
+                  ACE_TEXT ("(%t) shutting down handle %d\n"), h));
       // Instruct the <ACE_Reactor> to deregister us by returning -1.
       return -1; 
     }
@@ -396,18 +396,18 @@ Peer_Handler::svc (void)
 
       if (n == -1)
 	LM_ERROR_RETURN ((LOG_ERROR,
-                          "%p",
-                          "recv failed"),
+                          ACE_TEXT ("%p"),
+                          ACE_TEXT ("recv failed")),
                          -1);
       else if (n == 0) // Client has closed down the connection.
 	{
 	  if (this->peer_router_context_->peer_router ()->unbind_peer (this->get_handle ()) == -1)
 	    LM_ERROR_RETURN ((LOG_ERROR,
-                              "%p",
-                              "unbind failed"),
+                              ACE_TEXT ("%p"),
+                              ACE_TEXT ("unbind failed")),
                              -1);
 	  LM_DEBUG ((LOG_DEBUG,
-                     "(%t) shutting down \n"));
+                     ACE_TEXT ("(%t) shutting down \n")));
 
           // We do not need to be deregistered by reactor
 	  // as we were not registered at all.
@@ -423,8 +423,8 @@ Peer_Handler::svc (void)
           // Pass the message to the stream.
 	  if (this->peer_router_context_->peer_router ()->reply (hb) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               "(%t) %p\n",
-                               "Peer_Handler.svc : peer_router->reply failed"),
+                               ACE_TEXT ("(%t) %p\n"),
+                               ACE_TEXT ("Peer_Handler.svc : peer_router->reply failed")),
                               -1);
 	}
     }
diff --git a/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
index d227c310f2d..72c43ee6312 100644
--- a/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
@@ -132,24 +132,30 @@ Supplier_Router::put (ACE_Message_Block *mb,
 }
 
 // Return information about the <Supplier_Router>.
+#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
+#  define FMTSTR  ACE_TEXT ("%s\t %d/%s %s (%s)\n")
+#else
+#  define FMTSTR  ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n")
+#endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
 int 
-Supplier_Router::info (char **strp, size_t length) const
+Supplier_Router::info (ACE_TCHAR **strp, size_t length) const
 {
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   ACE_INET_Addr addr;
-  const char *mod_name = this->name ();
+  const ACE_TCHAR *mod_name = this->name ();
 
   if (this->context ()->acceptor ().get_local_addr (addr) == -1)
     return -1;
   
   ACE_OS::sprintf (buf,
-                   "%s\t %d/%s %s (%s)\n",
+                   FMTSTR,
 		   mod_name,
                    addr.get_port_number (),
-                   "tcp",
-		   "# supplier router",
-                   this->is_reader () ? "reader" : "writer");
+                   ACE_TEXT ("tcp"),
+		   ACE_TEXT ("# supplier router"),
+                   this->is_reader () ?
+                     ACE_TEXT ("reader") : ACE_TEXT ("writer"));
   if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0)
     return -1;
   else
diff --git a/examples/ASX/Event_Server/Event_Server/Supplier_Router.h b/examples/ASX/Event_Server/Event_Server/Supplier_Router.h
index b960ff35da2..8a42943c147 100644
--- a/examples/ASX/Event_Server/Event_Server/Supplier_Router.h
+++ b/examples/ASX/Event_Server/Event_Server/Supplier_Router.h
@@ -65,7 +65,7 @@ protected:
   // Runs in a separate thread to dequeue messages and pass them up
   // the stream.
 
-  virtual int info (char **info_string, size_t length) const;
+  virtual int info (ACE_TCHAR **info_string, size_t length) const;
   // Dynamic linking hook.
 };
 
diff --git a/examples/ASX/Event_Server/Event_Server/event_server.cpp b/examples/ASX/Event_Server/Event_Server/event_server.cpp
index ed41a241bf0..529c792f2c5 100644
--- a/examples/ASX/Event_Server/Event_Server/event_server.cpp
+++ b/examples/ASX/Event_Server/Event_Server/event_server.cpp
@@ -2,15 +2,19 @@
 
 // Main driver program for the event server example.
 
+#include "ace/OS_main.h"
 #include "ace/Stream.h"
 #include "ace/Service_Config.h"
+#include "ace/OS_NS_unistd.h"
 #include "Options.h"
 #include "Consumer_Router.h"
 #include "Event_Analyzer.h"
 #include "Supplier_Router.h"
 #include "ace/Signal.h"
 
-ACE_RCSID(Event_Server, event_server, "$Id$")
+ACE_RCSID (Event_Server,
+           event_server,
+           "$Id$")
 
 // Typedef these components to handle multi-threading correctly.
 typedef ACE_Stream<ACE_SYNCH> MT_Stream;
@@ -69,14 +73,14 @@ Event_Server::Event_Server (void)
                                                  ACE_Reactor::instance (),
                                                  ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "register_stdin_handler"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("register_stdin_handler")));
   // Register to trap the SIGINT signal.
   else if (ACE_Reactor::instance ()->register_handler
            (SIGINT, this) == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "register_handler"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("register_handler")));
 }
 
 int
@@ -98,10 +102,10 @@ Event_Server::handle_input (ACE_HANDLE)
   Options::instance ()->stop_timer ();
 
   ACE_DEBUG ((LM_INFO,
-              "(%t) closing down the test\n"));
+              ACE_TEXT ("(%t) closing down the test\n")));
   Options::instance ()->print_results ();
 
-  ACE_Reactor::end_event_loop ();
+  ACE_Reactor::instance ()->end_reactor_event_loop ();
   return -1;
 }
 
@@ -120,7 +124,7 @@ Event_Server::configure_stream (void)
   // Create the <Supplier_Router> module.
   ACE_NEW_RETURN (srm,
                   MT_Module
-                  ("Supplier_Router",
+                  (ACE_TEXT ("Supplier_Router"),
                    new Supplier_Router (src),
                    new Supplier_Router (src)),
                   -1);
@@ -129,7 +133,7 @@ Event_Server::configure_stream (void)
   // Create the <Event_Analyzer> module.
   ACE_NEW_RETURN (eam,
                   MT_Module
-                  ("Event_Analyzer",
+                  (ACE_TEXT ("Event_Analyzer"),
                    new Event_Analyzer,
                    new Event_Analyzer),
                   -1);
@@ -146,7 +150,7 @@ Event_Server::configure_stream (void)
   // Create the <Consumer_Router> module.
   ACE_NEW_RETURN (crm,
                   MT_Module
-                  ("Consumer_Router",
+                  (ACE_TEXT ("Consumer_Router"),
                    new Consumer_Router (crc),
                    new Consumer_Router (crc)),
                   -1);
@@ -155,18 +159,18 @@ Event_Server::configure_stream (void)
 
   if (this->event_server_.push (srm) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "push (Supplier_Router)"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (Supplier_Router)")),
                       -1);
   else if (this->event_server_.push (eam) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "push (Event_Analyzer)"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (Event_Analyzer)")),
                       -1);
   else if (this->event_server_.push (crm) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "push (Consumer_Router)"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (Consumer_Router)")),
                       -1);
   return 0;
 }
@@ -181,15 +185,15 @@ Event_Server::set_watermarks (void)
 
   if (this->event_server_.control (ACE_IO_Cntl_Msg::SET_LWM,
                                    &wm) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "push (setting low watermark)"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (setting low watermark)")),
                       -1);
 
   wm = Options::instance ()->high_water_mark ();
   if (this->event_server_.control (ACE_IO_Cntl_Msg::SET_HWM,
                                    &wm) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "push (setting high watermark)"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (setting high watermark)")),
                       -1);
   return 0;
 }
@@ -203,7 +207,7 @@ Event_Server::run_event_loop (void)
   // Perform the main event loop waiting for the user to type ^C or to
   // enter a line on the ACE_STDIN.
 
-  ACE_Reactor::run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
 
   // Close down the stream and call the <close> hooks on all the
   // <ACE_Task>s in the various Modules in the Stream.
@@ -228,7 +232,7 @@ Event_Server::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 #if defined (ACE_HAS_THREADS)
   Options::instance ()->parse_args (argc, argv);
@@ -239,15 +243,14 @@ main (int argc, char *argv[])
   // Run the event server's event-loop.
   int result = event_server.svc ();
 
-  ACE_DEBUG ((LM_DEBUG,
-              "exiting main\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("exiting main\n")));
 
   return result;
 #else
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
   ACE_ERROR_RETURN ((LM_ERROR,
-                     "threads not supported on this platform\n"),
+                     ACE_TEXT ("threads not supported on this platform\n")),
                     1);
 #endif /* ACE_HAS_THREADS */
 }
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 45ee10e72eb..a1b618bbffb 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -4,33 +4,37 @@
 // role of either Consumer or Supplier.  You can terminate this
 // program by typing ^C....
 
+#include "ace/OS_main.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Service_Config.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/Connector.h"
 #include "ace/Get_Opt.h"
 #include "ace/Signal.h"
+#include "ace/OS_NS_unistd.h"
 
 #include "transceiver.h"
 
-ACE_RCSID(Transceiver, transceiver, "$Id$")
+ACE_RCSID (Transceiver,
+           transceiver,
+           "$Id$")
 
 // Handle the command-line arguments.
 
 int
-Event_Transceiver::parse_args (int argc, char *argv[])
+Event_Transceiver::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "Ch:p:S");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("Ch:p:S"));
 
   this->port_number_ = ACE_DEFAULT_SERVER_PORT;
   this->host_name_ = ACE_DEFAULT_SERVER_HOST;
-  this->role_ = "Supplier";
+  this->role_ = ACE_TEXT ("Supplier");
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
       {
       case 'C':
-        this->role_ = "Consumer";
+        this->role_ = ACE_TEXT ("Consumer");
         break;
       case 'h':
         this->host_name_ = get_opt.opt_arg ();
@@ -39,11 +43,11 @@ Event_Transceiver::parse_args (int argc, char *argv[])
         this->port_number_ = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'S':
-        this->role_ = "Supplier";
+        this->role_ = ACE_TEXT ("Supplier");
         break;
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage: %n [-CS] [-h host_name] [-p portnum] \n"),
+                           ACE_TEXT ("usage: %n [-CS] [-h host_name] [-p portnum] \n")),
                           -1);
         /* NOTREACHED */
         break;
@@ -54,7 +58,7 @@ Event_Transceiver::parse_args (int argc, char *argv[])
   // ACE_DEFAULT_SERVER_PORT and the Supplier port to
   // ACE_DEFAULT_SERVER_PORT + 1).  Note that this is kind of a
   // hack...
-  if (ACE_OS::strcmp (this->role_, "Supplier") == 0
+  if (ACE_OS::strcmp (this->role_, ACE_TEXT ("Supplier")) == 0
       && this->port_number_ == ACE_DEFAULT_SERVER_PORT)
     this->port_number_++;
   return 0;
@@ -64,20 +68,18 @@ int
 Event_Transceiver::handle_close (ACE_HANDLE,
                                  ACE_Reactor_Mask)
 {
-  ACE_Reactor::end_event_loop ();
+  ACE_Reactor::instance ()->end_reactor_event_loop ();
   return 0;
 }
 
 // Close down via SIGINT or SIGQUIT.
 
 int
-Event_Transceiver::handle_signal (int signum,
+Event_Transceiver::handle_signal (int,
                                   siginfo_t *,
                                   ucontext_t *)
 {
-  ACE_UNUSED_ARG (signum);
-
-  ACE_Reactor::end_event_loop ();
+  ACE_Reactor::instance ()->end_reactor_event_loop ();
   return 0;
 }
 
@@ -85,12 +87,12 @@ Event_Transceiver::Event_Transceiver (void)
 {
 }
 
-Event_Transceiver::Event_Transceiver (int argc, char *argv[])
+Event_Transceiver::Event_Transceiver (int argc, ACE_TCHAR *argv[])
 {
   if (this->parse_args (argc, argv) == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "parse_args"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("parse_args")));
   else
     {
       ACE_Sig_Set sig_set;
@@ -103,8 +105,8 @@ Event_Transceiver::Event_Transceiver (int argc, char *argv[])
           (sig_set,
            this) == -1)
         ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "register_handler"));
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("register_handler")));
 
       // We need to register <this> here before we're connected since
       // otherwise <get_handle> will return the connection socket
@@ -113,8 +115,8 @@ Event_Transceiver::Event_Transceiver (int argc, char *argv[])
                                                           ACE_Reactor::instance (),
                                                           ACE_Thread_Manager::instance ()) == -1)
         ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "register_stdin_handler"));
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("register_stdin_handler")));
 
       // Address of the server.
       ACE_INET_Addr server_addr (this->port_number_,
@@ -131,7 +133,7 @@ Event_Transceiver::Event_Transceiver (int argc, char *argv[])
                              server_addr) == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      "%p\n",
+                      ACE_TEXT ("%p\n"),
                       this->host_name_));
           ACE_Reactor::instance()->remove_handler (sig_set);
           ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance(),
@@ -149,8 +151,8 @@ Event_Transceiver::open (void *)
       (this,
        ACE_Event_Handler::READ_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "register_handler"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("register_handler")),
                        -1);
   return 0;
 }
@@ -169,7 +171,7 @@ int
 Event_Transceiver::transmitter (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) entering %s transmitter\n",
+              ACE_TEXT ("(%P|%t) entering %s transmitter\n"),
               this->role_));
 
   char buf[BUFSIZ];
@@ -180,7 +182,7 @@ Event_Transceiver::transmitter (void)
     result = -1;
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) leaving %s transmitter\n",
+              ACE_TEXT ("(%P|%t) leaving %s transmitter\n"),
               this->role_));
   return result;
 }
@@ -189,7 +191,7 @@ int
 Event_Transceiver::receiver (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) entering %s receiver\n",
+              ACE_TEXT ("(%P|%t) entering %s receiver\n"),
               this->role_));
 
   char buf[BUFSIZ];
@@ -202,19 +204,19 @@ Event_Transceiver::receiver (void)
     result = -1;
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) leaving %s receiver\n",
+              ACE_TEXT ("(%P|%t) leaving %s receiver\n"),
               this->role_));
   return result;
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (ACE_Service_Config::open (argv[0]) == -1
       && errno != ENOENT)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                        -1);
 
   // Create and initialize the transceiver.
@@ -223,14 +225,14 @@ main (int argc, char *argv[])
   // Demonstrate how we can check if a constructor failed...
   if (ACE_LOG_MSG->op_status () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "Event_Transceiver constructor failed"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("Event_Transceiver constructor failed")),
                        -1);
 
 
   // Run event loop until either the event server shuts down or we get
   // a SIGINT.
-  ACE_Reactor::run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
   return 0;
 }
 
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.h b/examples/ASX/Event_Server/Transceiver/transceiver.h
index f369d4e34d2..864b88a0b48 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.h
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.h
@@ -17,7 +17,7 @@ class Event_Transceiver : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH
   //     it's a ``transceiver.''
 public:
   // = Initialization method.
-  Event_Transceiver (int argc, char *argv[]);
+  Event_Transceiver (int argc, ACE_TCHAR *argv[]);
   // Performs the actual initialization.
 
   Event_Transceiver (void);
@@ -44,16 +44,16 @@ private:
   int transmitter (void);
   // Writes data from ACE_STDIN to socket.
 
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the command-line arguments.
 
   u_short port_number_;
   // Port number of event server.
 
-  const char *host_name_;
+  const ACE_TCHAR *host_name_;
   // Name of event server.
 
-  const char *role_;
+  const ACE_TCHAR *role_;
   // Are we playing the Consumer or Supplier role?
 };
 
diff --git a/examples/ASX/Message_Queue/bounded_buffer.cpp b/examples/ASX/Message_Queue/bounded_buffer.cpp
index ada4c6304d1..2cdc50f2116 100644
--- a/examples/ASX/Message_Queue/bounded_buffer.cpp
+++ b/examples/ASX/Message_Queue/bounded_buffer.cpp
@@ -22,7 +22,7 @@ ACE_RCSID(Message_Queue, bounded_buffer, "$Id$")
 static void *
 producer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue)
 {
-  // Keep reading stdin, until we reach EOF. 
+  // Keep reading stdin, until we reach EOF.
 
   for (int n; ; )
     {
@@ -56,7 +56,7 @@ producer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue)
 	}
     }
 
-  return 0; 
+  return 0;
 }
 
 // The consumer dequeues a message from the ACE_Message_Queue, writes
@@ -103,13 +103,13 @@ static void *consumer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue)
 
 // Spawn off two threads that copy stdin to stdout.
 
-int 
-main (int, char *[])
+int
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   // Message list.
   ACE_Message_Queue<ACE_MT_SYNCH> msg_queue;
 
-  if (ACE_Thread_Manager::instance ()->spawn 
+  if (ACE_Thread_Manager::instance ()->spawn
       (ACE_THR_FUNC (producer),
        (void *) &msg_queue,
        THR_NEW_LWP | THR_DETACHED) == -1)
@@ -117,7 +117,7 @@ main (int, char *[])
                        "%p\n",
                        "spawn"),
                       1);
-  else if (ACE_Thread_Manager::instance ()->spawn 
+  else if (ACE_Thread_Manager::instance ()->spawn
            (ACE_THR_FUNC (consumer),
             (void *) &msg_queue,
             THR_NEW_LWP | THR_DETACHED) == -1)
@@ -131,8 +131,8 @@ main (int, char *[])
   return 0;
 }
 #else
-int 
-main (int, char *[])
+int
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
   return 0;
diff --git a/examples/ASX/Message_Queue/buffer_stream.cpp b/examples/ASX/Message_Queue/buffer_stream.cpp
index b17d4a85d19..7c5f098972e 100644
--- a/examples/ASX/Message_Queue/buffer_stream.cpp
+++ b/examples/ASX/Message_Queue/buffer_stream.cpp
@@ -8,6 +8,7 @@
 // the use of these reusable components reduces the reliance on global
 // variables, as compared with the bounded_buffer.C example.
 
+#include "ace/OS_main.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_time.h"
@@ -91,8 +92,8 @@ Common_Task::open (void *)
 {
   if (this->activate (THR_NEW_LWP | THR_DETACHED) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "spawn"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("spawn")),
                       -1);
   return 0;
 }
@@ -101,7 +102,7 @@ int
 Common_Task::close (u_long exit_status)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) thread is exiting with status %d in module %s\n",
+              ACE_TEXT ("(%t) thread is exiting with status %d in module %s\n"),
               exit_status,
               this->name ()));
 
@@ -142,8 +143,8 @@ Producer::svc (void)
 
           if (this->put_next (mb) == -1)
             ACE_ERROR ((LM_ERROR,
-                        "(%t) %p\n",
-                        "put_next"));
+                        ACE_TEXT ("(%t) %p\n"),
+                        ACE_TEXT ("put_next")));
 	  break;
         }
 
@@ -157,8 +158,8 @@ Producer::svc (void)
 
 	  if (this->put_next (mb) == -1)
 	    ACE_ERROR ((LM_ERROR,
-                        "(%t) %p\n",
-                        "put_next"));
+                        ACE_TEXT ("(%t) %p\n"),
+                        ACE_TEXT ("put_next")));
 	}
     }
 
@@ -214,13 +215,22 @@ Consumer::svc (void)
 
   if (result == -1 && errno == EWOULDBLOCK)
     ACE_ERROR ((LM_ERROR,
-		"(%t) %p\n%a",
-		"timed out waiting for message",
+		ACE_TEXT ("(%t) %p\n%a"),
+		ACE_TEXT ("timed out waiting for message"),
 		1));
   return 0;
 }
 
 // The filter prepends a line number in front of each line.
+#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
+#  if defined (ACE_WIN64)
+#    define FMTSTR  "%I64u: %s"
+#  else
+#    define FMTSTR  "%u: %s"
+#  endif /* ACE_WIN64 */
+#else
+#  define FMTSTR  "%u: %ls"
+#endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
 int
 Filter::put (ACE_Message_Block *mb,
@@ -243,7 +253,7 @@ Filter::put (ACE_Message_Block *mb,
 
       // Prepend the line count in front of the buffer.
       ACE_OS::sprintf (mb->rd_ptr (),
-                       ACE_SIZE_T_FORMAT_SPECIFIER": %s", 
+                       FMTSTR,
                        this->count_++,
                        buf);
       return this->put_next (mb, tv);
@@ -253,7 +263,7 @@ Filter::put (ACE_Message_Block *mb,
 // Main driver function.
 
 int 
-main (int, char *argv[])
+ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
   ACE_Service_Config daemon (argv[0]);
 
@@ -265,15 +275,15 @@ main (int, char *argv[])
   MT_Module *cm; 
 
   ACE_NEW_RETURN (cm,
-                  MT_Module ("Consumer",
+                  MT_Module (ACE_TEXT ("Consumer"),
                              new Consumer),
                   -1);
   ACE_NEW_RETURN (fm,
-                  MT_Module ("Filter",
+                  MT_Module (ACE_TEXT ("Filter"),
                              new Filter),
                   -1);
   ACE_NEW_RETURN (pm,
-                  MT_Module ("Producer",
+                  MT_Module (ACE_TEXT ("Producer"),
                              new Producer),
                   -1);
 
@@ -282,18 +292,18 @@ main (int, char *argv[])
 
   if (stream.push (cm) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "push"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push")),
                       1);
   else if (stream.push (fm) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "push"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push")),
                       1);
   else if (stream.push (pm) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "push"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push")),
                       1);
   // Barrier synchronization: wait for the threads to exit, then exit
   // ourselves.
@@ -305,7 +315,7 @@ int
 main (int, char *[])
 {
   ACE_ERROR ((LM_ERROR,
-              "threads not supported on this platform\n"));
+              ACE_TEXT ("threads not supported on this platform\n")));
   return 0;
 }
 #endif /* ACE_HAS_THREADS */
diff --git a/examples/ASX/Message_Queue/priority_buffer.cpp b/examples/ASX/Message_Queue/priority_buffer.cpp
index 26603c7dc64..db60a33bcae 100644
--- a/examples/ASX/Message_Queue/priority_buffer.cpp
+++ b/examples/ASX/Message_Queue/priority_buffer.cpp
@@ -67,7 +67,7 @@ producer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue)
 {
   ACE_Read_Buffer rb (ACE_STDIN);
 
-  // Keep reading stdin, until we reach EOF. 
+  // Keep reading stdin, until we reach EOF.
 
   for (;;)
     {
@@ -102,7 +102,7 @@ producer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue)
           mb->wr_ptr (rb.size ());
 
           ACE_DEBUG ((LM_DEBUG,
-		      "enqueueing message of size %d\n", 
+		      "enqueueing message of size %d\n",
                       mb->msg_priority ()));
 
           // Enqueue in priority order.
@@ -115,14 +115,14 @@ producer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue)
   // the size of the lines!).
   consumer (msg_queue);
 
-  return 0; 
+  return 0;
 }
 
 // Spawn off one thread that copies stdin to stdout in order of the
 // size of each line.
 
-int 
-main (int, char *[])
+int
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   // Message queue.
   ACE_Message_Queue<ACE_MT_SYNCH> msg_queue (max_queue);
@@ -136,8 +136,8 @@ main (int, char *[])
   return 0;
 }
 #else
-int 
-main (int, char *[])
+int
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
   return 0;
diff --git a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
index 11fb01a4666..cc96c58c137 100644
--- a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
@@ -38,10 +38,10 @@ int
 Consumer_Router::open (void *)
 {
   ACE_ASSERT (this->is_reader ());
-  char *argv[3];
+  ACE_TCHAR *argv[3];
 
-  argv[0] = (char *) this->name ();
-  argv[1] = (char *) options.consumer_file ();
+  argv[0] = (ACE_TCHAR *) this->name ();
+  argv[1] = (ACE_TCHAR *) options.consumer_file ();
   argv[2] = 0;
 
   if (this->init (1, &argv[1]) == -1)
@@ -74,11 +74,13 @@ Consumer_Router::svc (void)
   ACE_ASSERT (this->is_reader ());
 
   if (options.debug ())
-    ACE_DEBUG ((LM_DEBUG, "(%t) starting svc in %s\n", this->name ()));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting svc in %s\n"),
+                this->name ()));
 
   while (this->getq (mb) > 0)
     if (this->put_next (mb) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, "(%t) put_next failed in %s\n", this->name ()), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) put_next failed in %s\n"),
+                         this->name ()), -1);
 
   return 0;
   // Note the implicit ACE_OS::thr_exit() via destructor.
@@ -106,19 +108,25 @@ Consumer_Router::put (ACE_Message_Block *mb, ACE_Time_Value *)
 // Return information about the Client_Router ACE_Module..
 
 int
-Consumer_Router::info (char **strp, size_t length) const
+Consumer_Router::info (ACE_TCHAR **strp, size_t length) const
 {
-  char	     buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   ACE_UPIPE_Addr  addr;
-  const char *mod_name = this->name ();
+  const ACE_TCHAR *mod_name = this->name ();
   ACE_UPIPE_Acceptor &sa = (ACE_UPIPE_Acceptor &) *this->acceptor_;
 
   if (sa.get_local_addr (addr) == -1)
     return -1;
 
-  ACE_OS::sprintf (buf, "%s\t /%s %s",
-	     mod_name,  "upipe",
-	     "# consumer router\n");
+#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls")
+#else
+# define FMTSTR ACE_TEXT ("%s\t %s/ %s")
+#endif
+
+  ACE_OS::sprintf (buf, FMTSTR,
+                   mod_name, ACE_TEXT ("upipe"),
+                   ACE_TEXT ("# consumer router\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0)
     return -1;
diff --git a/examples/ASX/UPIPE_Event_Server/Consumer_Router.h b/examples/ASX/UPIPE_Event_Server/Consumer_Router.h
index bfd86f94f05..93a1220dc11 100644
--- a/examples/ASX/UPIPE_Event_Server/Consumer_Router.h
+++ b/examples/ASX/UPIPE_Event_Server/Consumer_Router.h
@@ -47,7 +47,7 @@ protected:
   virtual int svc (void);
 
   // Dynamic linking hooks.
-  virtual int info (char **info_string, size_t length) const;
+  virtual int info (ACE_TCHAR **info_string, size_t length) const;
 };
 #endif /* ACE_HAS_THREADS */
 #endif /* _CONSUMER_ROUTER_H */
diff --git a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
index 9ee2fd26cf8..689a9280766 100644
--- a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
@@ -47,7 +47,7 @@ Event_Analyzer::put (ACE_Message_Block *mb, ACE_Time_Value *)
 }
 
 int 
-Event_Analyzer::init (int, char *[])
+Event_Analyzer::init (int, ACE_TCHAR *[])
 {
   return 0;
 }
@@ -59,9 +59,9 @@ Event_Analyzer::fini (void)
 }
 
 int 
-Event_Analyzer::info (char **strp, size_t length) const
+Event_Analyzer::info (ACE_TCHAR **strp, size_t length) const
 {
-  const char *mod_name = this->name ();
+  const ACE_TCHAR *mod_name = this->name ();
   
   if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0)
     return -1;
diff --git a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h
index db074f649e5..01bc3028964 100644
--- a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h
+++ b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h
@@ -25,9 +25,9 @@ public:
   virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0);
 
   // Dynamic linking hooks.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int fini (void);
-  virtual int info (char **info_string, size_t length) const;
+  virtual int info (ACE_TCHAR **info_string, size_t length) const;
 
 private:
   virtual int control (ACE_Message_Block *);
diff --git a/examples/ASX/UPIPE_Event_Server/Options.cpp b/examples/ASX/UPIPE_Event_Server/Options.cpp
index bb7bb3e962d..ca2cbbca887 100644
--- a/examples/ASX/UPIPE_Event_Server/Options.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Options.cpp
@@ -24,10 +24,10 @@ Options::Options (void)
 		   iterations_ (100000),
 		   debugging_ (0),
 		   verbosity_ (0),
-		   consumer_port_ ("-p 10000"),
-		   supplier_port_ ("-p 10001"),
-		   consumer_file_ ("-f/tmp/conupipe"),
-		   supplier_file_ ("-f/tmp/supupipe")
+		   consumer_port_ (ACE_TEXT ("-p 10000")),
+		   supplier_port_ (ACE_TEXT ("-p 10001")),
+		   consumer_file_ (ACE_TEXT ("-f/tmp/conupipe")),
+		   supplier_file_ (ACE_TEXT ("-f/tmp/supupipe"))
 {
 }
 
@@ -94,11 +94,11 @@ void Options::print_results (void)
 Options options;
 
 void
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt getopt (argc, argv, "C:c:bdH:i:L:l:M:nS:s:t:T:v");
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("C:c:bdH:i:L:l:M:nS:s:t:T:v"));
   int c;
 
   while ((c = getopt ()) != -1)
@@ -142,9 +142,9 @@ Options::parse_args (int argc, char *argv[])
 	break;
       case 'T':
 #if defined (ACE_HAS_TRACE)
-	if (ACE_OS::strcasecmp (getopt.opt_arg (), "ON") == 0)
+	if (ACE_OS::strcasecmp (getopt.opt_arg (), ACE_TEXT ("ON")) == 0)
 	  ACE_Trace::start_tracing ();
-	else if (ACE_OS::strcasecmp (getopt.opt_arg (), "OFF") == 0)
+	else if (ACE_OS::strcasecmp (getopt.opt_arg (), ACE_TEXT ("OFF")) == 0)
 	  ACE_Trace::stop_tracing ();
 #endif /* ACE_HAS_TRACE */
 	break;
@@ -170,12 +170,19 @@ Options::parse_args (int argc, char *argv[])
 		   "\t[-s supplier port]\n"
 		   "\t[-t number of threads]\n"
 		   "\t[-v] (verbose) \n",
-		   argv[0]);
+		   ACE_TEXT_ALWAYS_CHAR (argv[0]));
 	::exit (1);
 	/* NOTREACHED */
 	break;
       }
 
+  // HACK! This needs to be done to avoid the mismatch from ACE_LIB_TEXT
+  // in ACE_SIZE_T_FORMAT_SPECIFIER to narrow-char on wide-char builds.
+  // It only works because it's at the end of the file.
+# if defined (ACE_LIB_TEXT)
+#  undef ACE_LIB_TEXT
+# endif
+# define ACE_LIB_TEXT(X) X
   if (this->verbose ())
     ACE_OS::printf ("%8d = initial concurrency hint\n"
 	      ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n"
diff --git a/examples/ASX/UPIPE_Event_Server/Options.h b/examples/ASX/UPIPE_Event_Server/Options.h
index 2a98787398b..1acad4b9d1f 100644
--- a/examples/ASX/UPIPE_Event_Server/Options.h
+++ b/examples/ASX/UPIPE_Event_Server/Options.h
@@ -21,7 +21,7 @@ class Options
 public:
   Options (void);
   ~Options (void);
-  void parse_args (int argc, char *argv[]);
+  void parse_args (int argc, ACE_TCHAR *argv[]);
 
   void   stop_timer (void);
   void   start_timer (void);
@@ -47,17 +47,17 @@ public:
   void   t_flags (long flag);
   long   t_flags (void);
 
-  void   supplier_port (const char *port);
-  const char   *supplier_port (void);
+  void   supplier_port (const ACE_TCHAR *port);
+  const ACE_TCHAR  *supplier_port (void);
 
-  void   consumer_port (const char *port);
-  const char   *consumer_port (void);
+  void   consumer_port (const ACE_TCHAR *port);
+  const ACE_TCHAR  *consumer_port (void);
 
-  void   supplier_file (const char *file);
-  const char   *supplier_file (void);
+  void   supplier_file (const ACE_TCHAR *file);
+  const ACE_TCHAR  *supplier_file (void);
 
-  void   consumer_file (const char *file);
-  const char   *consumer_file (void);
+  void   consumer_file (const ACE_TCHAR *file);
+  const ACE_TCHAR  *consumer_file (void);
 
   int    debug (void);
   int    verbose (void);
@@ -75,10 +75,10 @@ private:
   size_t        iterations_;            // Number of iterations to run the test program.
   int           debugging_;             // Extra debugging info.
   int           verbosity_;             // Extra verbose messages.
-  const char    *consumer_port_;        // Port that the Consumer_Router is using.
-  const char    *supplier_port_;        // Port that the Supplier_Router is using.
-  const char    *consumer_file_;        // file that the Consumer_Router is using.
-  const char    *supplier_file_;        // file that the Supplier_Router is using.
+  const ACE_TCHAR *consumer_port_;      // Port that the Consumer_Router is using.
+  const ACE_TCHAR *supplier_port_;      // Port that the Supplier_Router is using.
+  const ACE_TCHAR *consumer_file_;      // file that the Consumer_Router is using.
+  const ACE_TCHAR *supplier_file_;      // file that the Supplier_Router is using.
 };
 
 extern Options options;
diff --git a/examples/ASX/UPIPE_Event_Server/Options.i b/examples/ASX/UPIPE_Event_Server/Options.i
index af11b0d77f7..af04f73eb26 100644
--- a/examples/ASX/UPIPE_Event_Server/Options.i
+++ b/examples/ASX/UPIPE_Event_Server/Options.i
@@ -9,48 +9,48 @@
 
 
 inline void   
-Options::supplier_port (const char *port)
+Options::supplier_port (const ACE_TCHAR *port)
 {
   this->supplier_port_ = port;
 }
 
-inline const char *
+inline const ACE_TCHAR *
 Options::supplier_port (void)
 {
   return this->supplier_port_;
 }
 
 inline void   
-Options::supplier_file (const char *file)
+Options::supplier_file (const ACE_TCHAR *file)
 {
   this->supplier_file_ = file;
 }
 
-inline const char *
+inline const ACE_TCHAR *
 Options::supplier_file (void)
 {
   return this->supplier_file_;
 }
 
 inline void   
-Options::consumer_file (const char *file)
+Options::consumer_file (const ACE_TCHAR *file)
 {
   this->consumer_file_ = file;
 }
 
-inline const char *
+inline const ACE_TCHAR *
 Options::consumer_file (void)
 {
   return this->consumer_file_;
 }
 
 inline void   
-Options::consumer_port (const char *port)
+Options::consumer_port (const ACE_TCHAR *port)
 {
   this->consumer_port_ = port;
 }
 
-inline const char *
+inline const ACE_TCHAR *
 Options::consumer_port (void)
 {
   return this->consumer_port_;
diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
index 0be7305d31b..757eecedc33 100644
--- a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
@@ -24,9 +24,9 @@ ACE_RCSID(UPIPE_Event_Server, Peer_Router, "$Id$")
 #define PM  PEER_MAP
 
 template <class PH, class PK> int
-Acceptor_Factory<PH, PK>::init (int argc, char *argv[])
+Acceptor_Factory<PH, PK>::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "df:", 0);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("df:"), 0);
   ACE_UPIPE_Addr addr;
 
   for (int c; (c = get_opt ()) != -1; )
@@ -42,7 +42,7 @@ Acceptor_Factory<PH, PK>::init (int argc, char *argv[])
        }
   
   if (this->open (addr, ACE_Reactor::instance ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
   return 0;
 }
 
@@ -77,13 +77,15 @@ Peer_Handler<ROUTER, KEY>::svc (void)
       hb = new ACE_Message_Block (sizeof (KEY), ACE_Message_Block::MB_PROTO, db);
   
       if ((n = this->peer ().recv (db->rd_ptr (), db->size ())) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p", "recv failed"), -1);    
+	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("recv failed")), -1);    
       else if (n == 0) // Client has closed down the connection.
 	{
 
 	  if (this->router_task_->unbind_peer (this->get_handle ()) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "%p", "unbind failed"), -1);
-          ACE_DEBUG ((LM_DEBUG, "(%t) shutting down \n"));
+	    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                               ACE_TEXT ("unbind failed")), -1);
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shutting down \n")));
 	  return -1; // We do not need to be deregistered by reactor
 	  // as we were not registered at all
 	}
@@ -94,7 +96,7 @@ Peer_Handler<ROUTER, KEY>::svc (void)
 	  hb->wr_ptr (sizeof (long));
 	  if (this->router_task_->reply (hb) == -1)
 	    {
-              ACE_DEBUG ((LM_DEBUG, "Peer_Handler.svc : router_task->reply failed\n"));
+              ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Peer_Handler.svc : router_task->reply failed\n")));
 	      return -1;
 	    }
        
@@ -118,18 +120,21 @@ Peer_Handler<ROUTER, KEY>::put (ACE_Message_Block *mb, ACE_Time_Value *)
 template <class ROUTER, class KEY> int
 Peer_Handler<ROUTER, KEY>::open (void *a)
 {
-  char buf[BUFSIZ], *p = buf;
+  ACE_TCHAR buf[BUFSIZ], *p = buf;
 
   if (this->router_task_->info (&p, sizeof buf) != -1)
-    ACE_DEBUG ((LM_DEBUG, "(%t) creating handler for %s, fd = %d, this = %d\n", 
-	       buf, this->get_handle (), a));
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT ("(%t) creating handler for %s, fd = %d, this = %@\n"),
+                buf, this->get_handle (), a));
   else
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "info"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("info")), -1);
 
   if ( this->activate (options.t_flags ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "activation of thread failed"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("activation of thread failed")), -1);
   else if (this->router_task_->bind_peer (this->get_handle (), this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "bind_peer"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("bind_peer")), -1);
   return 0;
 }
 
@@ -139,7 +144,7 @@ template <class ROUTER, class KEY> int
 Peer_Handler<ROUTER, KEY>::handle_input (ACE_HANDLE h)
 {
 
-  ACE_DEBUG ((LM_DEBUG, "(%t) input arrived on sd %d\n", h));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) input arrived on sd %d\n"), h));
 //  ACE_Reactor::instance ()->remove_handler(h,
 //                                          ACE_Event_Handler::ALL_EVENTS_MASK
 //                                          |ACE_Event_Handler::DONT_CALL);
@@ -154,11 +159,12 @@ Peer_Handler<ROUTER, KEY>::handle_input (ACE_HANDLE h)
   int           n;
 
   if ((n = this->peer ().recv (db->rd_ptr (), db->size ())) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "recv failed"), -1);    
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv failed")), -1);    
   else if (n == 0) // Client has closed down the connection.
     {
       if (this->router_task_->unbind_peer (this->get_handle ()) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p", "unbind failed"), -1);
+	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("unbind failed")), -1);
       ACE_DEBUG ((LM_DEBUG, "(%t) shutting down %d\n", h));
       return -1; // Instruct the ACE_Reactor to deregister us by returning -1.
     }
@@ -190,7 +196,8 @@ Peer_Router<PH, PK>::send_peers (ACE_Message_Block *mb)
        map_iter.advance ())
     {
       if (options.debug ())
-	ACE_DEBUG ((LM_DEBUG, "(%t) sending to peer via sd %d\n", ss->ext_id_));
+	ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) sending to peer via sd %d\n"),
+                    ss->ext_id_));
 
       iterations++;
       bytes += ss->int_id_->put (data_block);
@@ -244,7 +251,7 @@ Peer_Router<PH, PK>::bind_peer (PK key, Peer_Handler<Peer_Router<PH, PK>, PK> *p
 }
 
 template <class PH, class PK> int 
-Peer_Router<PH, PK>::init (int argc, char *argv[])
+Peer_Router<PH, PK>::init (int argc, ACE_TCHAR *argv[])
 {
   this->acceptor_ = new Acceptor_Factory <PH, PK> (this);
 
@@ -257,10 +264,12 @@ Peer_Router<PH, PK>::init (int argc, char *argv[])
       ACE_UPIPE_Acceptor &pa = this->acceptor_->acceptor ();
       
       if (pa.get_local_addr (addr) != -1)
-	ACE_DEBUG ((LM_DEBUG, "(%t) initializing %s, file = %s, fd = %d, this = %u\n", 
+	ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("(%t) initializing %s, file = %s, fd = %d, this = %@\n"), 
 		   this->name (), addr.get_path_name (), pa.get_handle (), this));
       else
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_local_addr"), -1);
+	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("get_local_addr")), -1);
     }
   return 0;
 }
diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/examples/ASX/UPIPE_Event_Server/Peer_Router.h
index 0dab5d3caac..3962d371ae0 100644
--- a/examples/ASX/UPIPE_Event_Server/Peer_Router.h
+++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.h
@@ -33,7 +33,7 @@ public:
   Acceptor_Factory (Peer_Router<PEER_HANDLER, KEY> *pr);
   Peer_Router<PEER_HANDLER, KEY> *router (void);
 
-  int init (int argc, char *argv[]);
+  int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the acceptor when it's linked dynamically.
 
 private:
@@ -97,7 +97,7 @@ protected:
   ACE_Map_Manager <PEER_KEY, PEER_HANDLER *, ACE_RW_Mutex> peer_map_;
 
   // Dynamic linking initialization hooks inherited from ACE_Task.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int fini (void);
 
   // Factory for accepting new PEER_HANDLERs.
diff --git a/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
index 6fff0f33feb..73fe806780a 100644
--- a/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
@@ -58,10 +58,10 @@ int
 Supplier_Router::open (void *)
 {
   ACE_ASSERT (this->is_writer ());
-  char *argv[3];
+  ACE_TCHAR *argv[3];
 
-  argv[0] = (char *) this->name ();
-  argv[1] = (char *) options.supplier_file ();
+  argv[0] = (ACE_TCHAR *)this->name ();
+  argv[1] = (ACE_TCHAR *)options.supplier_file ();
   argv[2] = 0;
 
   if (this->init (1, &argv[1]) == -1)
@@ -107,19 +107,25 @@ Supplier_Router::put (ACE_Message_Block *mb, ACE_Time_Value *)
 // Return information about the Supplier_Router ACE_Module..
 
 int
-Supplier_Router::info (char **strp, size_t length) const
+Supplier_Router::info (ACE_TCHAR **strp, size_t length) const
 {
-  char       buf[BUFSIZ];
+  ACE_TCHAR       buf[BUFSIZ];
   ACE_UPIPE_Addr  addr;
-  const char *mod_name = this->name ();
+  const ACE_TCHAR *mod_name = this->name ();
   ACE_UPIPE_Acceptor &sa = (ACE_UPIPE_Acceptor &) *this->acceptor_;
 
   if (sa.get_local_addr (addr) == -1)
     return -1;
 
-  ACE_OS::sprintf (buf, "%s\t %s/ %s",
-	     mod_name,  "upipe",
-	     "# supplier router\n");
+#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls")
+#else
+# define FMTSTR ACE_TEXT ("%s\t %s/ %s")
+#endif
+
+  ACE_OS::sprintf (buf, FMTSTR,
+                   mod_name, ACE_TEXT ("upipe"),
+                   ACE_TEXT ("# supplier router\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0)
     return -1;
diff --git a/examples/ASX/UPIPE_Event_Server/Supplier_Router.h b/examples/ASX/UPIPE_Event_Server/Supplier_Router.h
index 3fc61c8acfc..4d5d440e018 100644
--- a/examples/ASX/UPIPE_Event_Server/Supplier_Router.h
+++ b/examples/ASX/UPIPE_Event_Server/Supplier_Router.h
@@ -50,7 +50,7 @@ protected:
   virtual int svc (void);
 
   // Dynamic linking hooks inherited from Peer_Router.
-  virtual int info (char **info_string, size_t length) const;
+  virtual int info (ACE_TCHAR **info_string, size_t length) const;
 };
 
 #endif /* ACE_HAS_THREADS */
diff --git a/examples/ASX/UPIPE_Event_Server/event_server.cpp b/examples/ASX/UPIPE_Event_Server/event_server.cpp
index 7da5d611f56..91c5325bcc8 100644
--- a/examples/ASX/UPIPE_Event_Server/event_server.cpp
+++ b/examples/ASX/UPIPE_Event_Server/event_server.cpp
@@ -2,6 +2,7 @@
 
 // Test the event server.
 
+#include "ace/OS_main.h"
 #include "ace/Stream.h"
 #include "ace/Service_Config.h"
 #include "ace/UPIPE_Acceptor.h"
@@ -15,8 +16,11 @@
 #include "Event_Analyzer.h"
 #include "Supplier_Router.h"
 #include "ace/Signal.h"
+#include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(UPIPE_Event_Server, event_server, "$Id$")
+ACE_RCSID (UPIPE_Event_Server,
+           event_server,
+           "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
@@ -34,15 +38,15 @@ public:
 
 Quit_Handler::Quit_Handler (void)
   : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
-{  
+{
   // Register to trap input from the user.
   if (ACE_Event_Handler::register_stdin_handler (this,
-						 ACE_Reactor::instance (),
-						 ACE_Thread_Manager::instance ()) == -1)
+                                                 ACE_Reactor::instance (),
+                                                 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
   // Register to trap the SIGINT signal.
-  else if (ACE_Reactor::instance ()->register_handler 
-	   (SIGINT, this) == -1)
+  else if (ACE_Reactor::instance ()->register_handler
+           (SIGINT, this) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
 }
 
@@ -61,7 +65,7 @@ static void *
 consumer (void *)
 {
   ACE_UPIPE_Stream c_stream;
-  ACE_UPIPE_Addr c_addr ("/tmp/conupipe");
+  ACE_UPIPE_Addr c_addr (ACE_TEXT ("/tmp/conupipe"));
 
   int verb = options.verbose ();
   int msiz = options.message_size ();
@@ -86,22 +90,22 @@ consumer (void *)
 
   par1= (time_t) currsec;
 
-  while (done == 0 
-	 && (c_stream.recv (mb_p) != -1))
-    if (mb_p->length () > 1) 
+  while (done == 0
+         && (c_stream.recv (mb_p) != -1))
+    if (mb_p->length () > 1)
       {
-	cnt++;
-	if (verb)
-	  cout << " consumer received message !!!!!! " 
-	       << mb_p->rd_ptr () << endl;
+        cnt++;
+        if (verb)
+          cout << " consumer received message !!!!!! "
+               << mb_p->rd_ptr () << endl;
       }
     else
       {
-	if (verb)
-	  cout << "consumer got last mb" 
-	       << (char) * (mb_p->rd_ptr ()) << endl;
-	c_stream.close ();
-	done = 1;
+        if (verb)
+          cout << "consumer got last mb"
+               << (char) * (mb_p->rd_ptr ()) << endl;
+        c_stream.close ();
+        done = 1;
       }
 
     ACE_OS::time (&currsec);
@@ -112,8 +116,8 @@ consumer (void *)
     if (secs <= 0)
       secs=1;
 
-    cout << "consumer got " << cnt << " messages of size " << msiz 
-	 << "within " << secs << " seconds" << endl;
+    cout << "consumer got " << cnt << " messages of size " << msiz
+         << "within " << secs << " seconds" << endl;
 
     ACE_OS::sleep (2);
     cout << "consumer terminating " << endl;
@@ -124,7 +128,7 @@ static void *
 supplier (void *dummy)
 {
   ACE_UPIPE_Stream s_stream;
-  ACE_UPIPE_Addr serv_addr ("/tmp/supupipe");
+  ACE_UPIPE_Addr serv_addr (ACE_TEXT ("/tmp/supupipe"));
   ACE_UPIPE_Connector con;
 
   int iter = options.iterations ();
@@ -136,7 +140,7 @@ supplier (void *dummy)
     ACE_DEBUG ((LM_INFO, " (%t) connect failed\n"));
 
   cout << "supplier : we're connected" << endl;
-  int	   n;
+  int      n;
   n = 0;
   ACE_Message_Block * mb_p;
 
@@ -148,10 +152,10 @@ supplier (void *dummy)
       if (verb)
         cout << "supplier sending 1 message_block" << endl;
       if (s_stream.send (mb_p) == -1)
-	{
-	  cout << "supplier send failed" << endl;
-	  return (void *) -1;
-	}
+        {
+          cout << "supplier send failed" << endl;
+          return (void *) -1;
+        }
       n++;
     }
 
@@ -184,75 +188,82 @@ supplier (void *dummy)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Service_Config daemon;
-  
+
   options.parse_args (argc, argv);
   options.start_timer ();
 
   // Primary ACE_Stream for EVENT_SERVER application.
-  MT_Stream event_server; 
+  MT_Stream event_server;
 
   // Enable graceful shutdowns....
   Quit_Handler quit_handler;
 
   // Create the modules..
 
-  MT_Module *sr = new MT_Module ("Supplier_Router", 
-	  new Supplier_Router (ACE_Thread_Manager::instance ()));
-  MT_Module *ea = new MT_Module ("Event_Analyzer", 
-				 new Event_Analyzer, 
-				 new Event_Analyzer);
-  MT_Module *cr = new MT_Module ("Consumer_Router", 
-				 0, // 0 triggers the creation of a ACE_Thru_Task...
-				 new Consumer_Router (ACE_Thread_Manager::instance ()));
+  MT_Module *sr = new MT_Module (ACE_TEXT ("Supplier_Router"),
+          new Supplier_Router (ACE_Thread_Manager::instance ()));
+  MT_Module *ea = new MT_Module (ACE_TEXT ("Event_Analyzer"),
+                                 new Event_Analyzer,
+                                 new Event_Analyzer);
+  MT_Module *cr = new MT_Module (ACE_TEXT ("Consumer_Router"),
+                                 0, // 0 triggers the creation of a ACE_Thru_Task...
+                                 new Consumer_Router (ACE_Thread_Manager::instance ()));
 
   // Push the modules onto the event_server stream.
 
   if (event_server.push (sr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "push (Supplier_Router)"), -1);
-					
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (Supplier_Router)")), -1);
+
   if (event_server.push (ea) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "push (Event_Analyzer)"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (Event_Analyzer)")), -1);
 
   if (event_server.push (cr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "push (Consumer_Router)"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (Consumer_Router)")), -1);
 
   // Set the high and low water marks appropriately.
 
   int wm = options.low_water_mark ();
 
   if (event_server.control (ACE_IO_Cntl_Msg::SET_LWM, &wm) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "push (setting low watermark)"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (setting low watermark)")), -1);
 
   wm = options.high_water_mark ();
   if (event_server.control (ACE_IO_Cntl_Msg::SET_HWM, &wm) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "push (setting high watermark)"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("push (setting high watermark)")), -1);
 
   // spawn the two threads.
 
   if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (consumer), (void *) 0,
-					     THR_NEW_LWP | THR_DETACHED) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), 1);
+                                             THR_NEW_LWP | THR_DETACHED) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn")), 1);
 
   else if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (supplier), (void *) "hello",
-						  THR_NEW_LWP | THR_DETACHED) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), 1);
- 
+                                                  THR_NEW_LWP | THR_DETACHED) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn")), 1);
+
   // Perform the main event loop waiting for the user to type ^C or to
   // enter a line on the ACE_STDIN.
 
-  ACE_Reactor::run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
 
-  ACE_DEBUG ((LM_DEBUG, "main exiting\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("main exiting\n")));
 
   return 0;
 }
 #else
-int 
-main (int, char *[])
+int
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_ERROR_RETURN ((LM_ERROR, "test not defined for this platform\n"), -1);
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ACE_TEXT ("test not defined for this platform\n")),
+                    -1);
 }
 #endif /* ACE_HAS_THREADS */
diff --git a/examples/Bounded_Packet_Relay/BPR_Drivers.cpp b/examples/Bounded_Packet_Relay/BPR_Drivers.cpp
index 059235b6154..4fd8577b3df 100644
--- a/examples/Bounded_Packet_Relay/BPR_Drivers.cpp
+++ b/examples/Bounded_Packet_Relay/BPR_Drivers.cpp
@@ -448,8 +448,7 @@ Bounded_Packet_Relay::receive_input (void * arg)
 
       return -1;
     }
-  ACE_Message_Block *message = ACE_static_cast (ACE_Message_Block *,
-                                                arg);
+  ACE_Message_Block *message = static_cast<ACE_Message_Block *> (arg);
   if (queue_.enqueue_tail (message) < 0)
     {
       if (is_active_)
diff --git a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp
index 8dafecace78..1e8bfc77d94 100644
--- a/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp
+++ b/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp
@@ -66,7 +66,7 @@ Text_Input_Device_Wrapper::modify_device_settings (void *logging)
   packet_count_ = 0;
 
   if (logging)
-    logging_ = *ACE_static_cast (int *, logging);
+    logging_ = *static_cast<int *> (logging);
   else
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Text_Input_Device_Wrapper::modify_device_settings: "
@@ -144,11 +144,10 @@ Text_Output_Device_Wrapper::write_output_message (void *message)
       if (logging_ & Text_Output_Device_Wrapper::PRINT_MSGS_RCVD)
         ACE_DEBUG ((LM_DEBUG, "output message %d:\n[%s]\n",
 		            packet_count_,
-                    ACE_static_cast (ACE_Message_Block *, message)->
+                    static_cast<ACE_Message_Block *> (message)->
                       rd_ptr ()));
 
-      delete ACE_static_cast (ACE_Message_Block *,
-                              message);
+      delete static_cast<ACE_Message_Block *> (message);
       return 0;
     }
   ACE_ERROR_RETURN ((LM_ERROR,
@@ -164,7 +163,7 @@ Text_Output_Device_Wrapper::modify_device_settings (void *logging)
   packet_count_ = 0;
 
   if (logging)
-    logging_ = *ACE_static_cast (int *, logging);
+    logging_ = *static_cast<int *> (logging);
   else
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Text_Output_Device_Wrapper::modify_device_settings: "
@@ -220,7 +219,7 @@ User_Input_Task::set_packet_count (void *argument)
 {
   if (argument)
     {
-      driver_.packet_count (*ACE_static_cast (int *, argument));
+      driver_.packet_count (*static_cast<int *> (argument));
       return 0;
     }
   ACE_ERROR_RETURN ((LM_ERROR,
@@ -236,7 +235,7 @@ User_Input_Task::set_arrival_period (void *argument)
 {
   if (argument)
     {
-      driver_.arrival_period (*ACE_static_cast (int *, argument));
+      driver_.arrival_period (*static_cast<int *> (argument));
       return 0;
     }
   ACE_ERROR_RETURN ((LM_ERROR,
@@ -252,7 +251,7 @@ User_Input_Task::set_send_period (void *argument)
 {
   if (argument)
     {
-      driver_.send_period (*ACE_static_cast (int *, argument));
+      driver_.send_period (*static_cast<int *> (argument));
       return 0;
     }
   ACE_ERROR_RETURN ((LM_ERROR,
@@ -267,7 +266,7 @@ User_Input_Task::set_duration_limit (void *argument)
 {
   if (argument)
     {
-      driver_.duration_limit (*ACE_static_cast (int *, argument));
+      driver_.duration_limit (*static_cast<int *> (argument));
       return 0;
     }
   ACE_ERROR_RETURN ((LM_ERROR,
@@ -283,7 +282,7 @@ User_Input_Task::set_logging_level (void *argument)
 {
   if (argument)
     {
-      driver_.logging_level (*ACE_static_cast (int *, argument));
+      driver_.logging_level (*static_cast<int *> (argument));
       return 0;
     }
   ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/examples/Bounded_Packet_Relay/bpr_thread.cpp b/examples/Bounded_Packet_Relay/bpr_thread.cpp
index b0f1ac930e1..bc6f0f607aa 100644
--- a/examples/Bounded_Packet_Relay/bpr_thread.cpp
+++ b/examples/Bounded_Packet_Relay/bpr_thread.cpp
@@ -9,7 +9,7 @@
 //    bpr_thread.cpp
 //
 // = DESCRIPTION
-//    Exercises drivers for a bounded packet relay, based on threaded timer queues.  
+//    Exercises drivers for a bounded packet relay, based on threaded timer queues.
 //
 // = AUTHORS
 //    Chris Gill           <cdgill@cs.wustl.edu>  and
@@ -52,7 +52,7 @@ static const char input_text [] =
 " Time's winged chariot hurrying near.";
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   // Construct a new thread manager for the input device task.  Auto
   // ptr ensures memory is freed when we exit this scope.
@@ -67,7 +67,7 @@ main (int, char *[])
   Text_Input_Device_Wrapper *input_device;
   ACE_NEW_RETURN (input_device,
                   Text_Input_Device_Wrapper (input_task_mgr,
-                                             sizeof (input_text), 
+                                             sizeof (input_text),
                                              input_text),
                   -1);
   auto_ptr <Text_Input_Device_Wrapper> input (input_device);
@@ -90,8 +90,8 @@ main (int, char *[])
                   -1);
   auto_ptr <Bounded_Packet_Relay> relay (packet_relay);
 
-  // Construct a receive input callback command for the relay, and register 
-  // it with the input device.  Auto ptr ensures memory is freed when we exit 
+  // Construct a receive input callback command for the relay, and register
+  // it with the input device.  Auto ptr ensures memory is freed when we exit
   // this scope.
   INPUT_CALLBACK *input_callback;
   ACE_NEW_RETURN (input_callback,
@@ -102,7 +102,7 @@ main (int, char *[])
   if (input_device->set_send_input_msg_cmd (input_callback) < 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "failed to register input callback"), 
+                         "failed to register input callback"),
                         -1);
     }
 
diff --git a/examples/C++NPv1/C++NPv1.mpc b/examples/C++NPv1/C++NPv1.mpc
index 85bfa84a619..f7d3f626ff4 100644
--- a/examples/C++NPv1/C++NPv1.mpc
+++ b/examples/C++NPv1/C++NPv1.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Iterative_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = iterative_logging_server
   Source_Files {
     Iterative_Logging_Server.cpp
@@ -11,6 +12,7 @@ project(*Iterative_Logging_Server) : aceexe {
 }
 
 project(*Logging_Client) : aceexe {
+  avoids += uses_wchar
   exename = logging_client
   Source_Files {
     Logging_Client.cpp
@@ -18,6 +20,7 @@ project(*Logging_Client) : aceexe {
 }
 
 project(*PPC_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = ppc_logging_server
   Source_Files {
     Process_Per_Connection_Logging_Server.cpp
@@ -27,6 +30,7 @@ project(*PPC_Logging_Server) : aceexe {
 }
 
 project(*Reactive_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = reactive_logging_server
   Source_Files {
     Reactive_Logging_Server.cpp
@@ -36,6 +40,7 @@ project(*Reactive_Logging_Server) : aceexe {
 }
 
 project(*Reactive_Logging_Server_Ex) : aceexe {
+  avoids += uses_wchar
   exename = reactive_logging_server_ex
   Source_Files {
     Reactive_Logging_Server_Ex.cpp
@@ -45,6 +50,7 @@ project(*Reactive_Logging_Server_Ex) : aceexe {
 }
 
 project(*RTTPC_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = RTTPC_logging_server
   Source_Files {
     RT_Thread_Per_Connection_Logging_Server.cpp
@@ -54,10 +60,11 @@ project(*RTTPC_Logging_Server) : aceexe {
 }
 
 project(*TPC_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = tpc_logging_server
   Source_Files {
     Thread_Per_Connection_Logging_Server.cpp
     Logging_Server.cpp
     Logging_Handler.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/examples/C++NPv1/Logging_Client.cpp b/examples/C++NPv1/Logging_Client.cpp
index fe6f65506dd..614b557c551 100644
--- a/examples/C++NPv1/Logging_Client.cpp
+++ b/examples/C++NPv1/Logging_Client.cpp
@@ -31,8 +31,7 @@ int operator<< (ACE_OutputCDR &cdr, const ACE_Log_Record &log_record)
   // know that no members are modified here, we can safely const_cast
   // the log_record parameter without violating the interface
   // contract.
-  ACE_Log_Record &nonconst_record = (ACE_const_cast (ACE_Log_Record&,
-                                                     log_record));
+  ACE_Log_Record &nonconst_record = (const_cast<ACE_Log_Record&> (log_record));
   // Insert each field from <log_record> into the output CDR stream.
   cdr << ACE_CDR::Long (log_record.type ());
   cdr << ACE_CDR::Long (log_record.pid ());
diff --git a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
index b1cce5a481d..54d936962aa 100644
--- a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
@@ -117,7 +117,7 @@ Process_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client)
 int
 Process_Per_Connection_Logging_Server::run (int argc, char *argv[])
 {
-  strncpy (prog_name_, argv[0], MAXPATHLEN);
+  ACE_OS::strncpy (prog_name_, argv[0], MAXPATHLEN);
   prog_name_[MAXPATHLEN] = '\0'; // Ensure NUL-termination.
   // If there are 2 command line arguments after prog_name_, this
   // is a spawned worker process. Else run as the master.
@@ -151,10 +151,10 @@ Process_Per_Connection_Logging_Server::run_worker (int, char *argv[])
   // only do reinterpret_cast on Windows.
 #if defined (ACE_WIN32)
   ACE_HANDLE client_handle =
-    ACE_reinterpret_cast (ACE_HANDLE, client_handle_i);
+    reinterpret_cast<ACE_HANDLE> (client_handle_i);
 #else
   ACE_HANDLE client_handle =
-    ACE_static_cast (ACE_HANDLE, client_handle_i);
+    static_cast<ACE_HANDLE> (client_handle_i);
 #endif /* ACE_WIN32 */
   ACE_SOCK_Stream client (client_handle);
 
diff --git a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
index 0be97237952..465c8ae8f96 100644
--- a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
@@ -61,7 +61,7 @@ RT_Thread_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client)
 
 ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg)
 {
-  auto_ptr<Thread_Args> thread_args (ACE_static_cast (Thread_Args *, arg));
+  auto_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg));
 
   thread_args->this_->handle_data (&thread_args->logging_peer_);
   thread_args->logging_peer_.close ();
@@ -80,7 +80,7 @@ Thread_Per_Connection_Logging_Server::handle_connections ()
                    // Pointer to function entry point.
                   Thread_Per_Connection_Logging_Server::run_svc,
                    // <run_svc> parameter.
-                  ACE_static_cast (void *, thread_args.get ()),
+                  static_cast<void *> (thread_args.get ()),
                   THR_DETACHED | THR_SCOPE_SYSTEM) == -1)
     return -1;
   thread_args.release ();   // Spawned thread now owns memory
diff --git a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
index ec4389110f0..e2c37bb0ef2 100644
--- a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
@@ -22,7 +22,7 @@ namespace {
 
 ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg)
 {
-  auto_ptr<Thread_Args> thread_args (ACE_static_cast (Thread_Args *, arg));
+  auto_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg));
 
   thread_args->this_->handle_data (&thread_args->logging_peer_);
   thread_args->logging_peer_.close ();
@@ -41,7 +41,7 @@ Thread_Per_Connection_Logging_Server::handle_connections ()
                    // Pointer to function entry point.
                   Thread_Per_Connection_Logging_Server::run_svc,
                    // <run_svc> parameter.
-                  ACE_static_cast (void *, thread_args.get ()),
+                  static_cast<void *> (thread_args.get ()),
                   THR_DETACHED | THR_SCOPE_SYSTEM) == -1)
     return -1;
   thread_args.release ();   // Spawned thread now owns memory
diff --git a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
index f59b385a903..0231c841cbb 100644
--- a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
@@ -89,6 +89,14 @@ protected:
      const ACE_SOCK_Connector::PEER_ADDR &local_addr,
      int reuse_addr, int flags, int perms);
 
+  virtual int connect_svc_handler
+    (AC_Output_Handler *&svc_handler,
+     AC_Output_Handler *&sh_copy,
+     const ACE_SOCK_Connector::PEER_ADDR &remote_addr,
+     ACE_Time_Value *timeout,
+     const ACE_SOCK_Connector::PEER_ADDR &local_addr,
+     int reuse_addr, int flags, int perms);
+
   // Pointer to <AC_Output_Handler> we're connecting.
   AC_Output_Handler *handler_;
 
@@ -136,7 +144,7 @@ public:
 
 int AC_Output_Handler::open (void *connector) {
   connector_ =
-    ACE_static_cast (AC_CLD_Connector *, connector);
+    static_cast<AC_CLD_Connector *> (connector);
   int bufsiz = ACE_DEFAULT_MAX_SOCKET_BUFSIZ;
   peer ().set_option (SOL_SOCKET, SO_SNDBUF,
                       &bufsiz, sizeof bufsiz);
@@ -327,7 +335,7 @@ int AC_CLD_Connector::connect_svc_handler
        local_addr, reuse_addr, flags, perms) == -1) return -1;
   SSL_clear (ssl_);
   SSL_set_fd (ssl_,
-              ACE_reinterpret_cast (int, svc_handler->get_handle ()));
+              reinterpret_cast<int> (svc_handler->get_handle ()));
 
   SSL_set_verify (ssl_, SSL_VERIFY_PEER, 0);
 
@@ -337,6 +345,18 @@ int AC_CLD_Connector::connect_svc_handler
   return 0;
 }
 
+int AC_CLD_Connector::connect_svc_handler
+    (AC_Output_Handler *&svc_handler,
+     AC_Output_Handler *&sh_copy,
+     const ACE_SOCK_Connector::PEER_ADDR &remote_addr,
+     ACE_Time_Value *timeout,
+     const ACE_SOCK_Connector::PEER_ADDR &local_addr,
+     int reuse_addr, int flags, int perms) {
+  sh_copy = svc_handler;
+  return this->connect_svc_handler (svc_handler, remote_addr, timeout,
+                                    local_addr, reuse_addr, flags, perms);
+}
+
 int AC_CLD_Connector::reconnect () {
   // Maximum number of times to retry connect.
   const size_t MAX_RETRIES = 5;
@@ -373,12 +393,10 @@ int AC_Client_Logging_Daemon::init
   for (int c; (c = get_opt ()) != -1;)
     switch (c) {
     case 'p': // Client logging daemon acceptor port number.
-      cld_port = ACE_static_cast
-        (u_short, ACE_OS::atoi (get_opt.opt_arg ()));
+      cld_port = static_cast<u_short> (ACE_OS::atoi (get_opt.opt_arg ()));
       break;
     case 'r': // Server logging daemon acceptor port number.
-      sld_port = ACE_static_cast
-        (u_short, ACE_OS::atoi (get_opt.opt_arg ()));
+      sld_port = static_cast<u_short> (ACE_OS::atoi (get_opt.opt_arg ()));
       break;
     case 's': // Server logging daemon hostname.
       ACE_OS::strsncpy
diff --git a/examples/C++NPv2/C++NPv2.mpc b/examples/C++NPv2/C++NPv2.mpc
index c8677ca3bf0..d7f570155eb 100644
--- a/examples/C++NPv2/C++NPv2.mpc
+++ b/examples/C++NPv2/C++NPv2.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*AC_CLD) : acelib, ssl {
+  avoids += uses_wchar
   sharedname = AC_CLD
   dynamicflags = AC_CLD_BUILD_DLL
   Source_Files {
@@ -19,6 +20,7 @@ project(*AIO_CLD) : acelib, ssl {
 }
 
 project(*CLD) : acelib {
+  avoids += uses_wchar
   sharedname = CLD
   dynamicflags = CLD_BUILD_DLL
   Source_Files {
@@ -30,6 +32,7 @@ project(*CLD) : acelib {
 }
 
 project(*Configurable_Log_Server) : aceexe {
+  avoids += uses_wchar
   exename = configurable_logging_server
   Source_Files {
     Configurable_Logging_Server.cpp
@@ -45,6 +48,7 @@ project(*Display_Logfile) : aceexe {
 }
 
 project(*Reactor_Log_Server) : aceexe {
+  avoids += uses_wchar
   exename = reactor_logging_server
   Source_Files {
     Logging_Acceptor.cpp
@@ -56,6 +60,7 @@ project(*Reactor_Log_Server) : aceexe {
 }
 
 project(*Select_Reactor_Log_Server) : aceexe {
+  avoids += uses_wchar
   exename = select_reactor_loggin_server
   Source_Files {
     Logging_Acceptor.cpp
@@ -67,6 +72,7 @@ project(*Select_Reactor_Log_Server) : aceexe {
 }
 
 project(*SLD) : acelib {
+  avoids += uses_wchar
   sharedname = SLD
   dynamicflags = SLD_BUILD_DLL
   Source_Files {
@@ -78,6 +84,7 @@ project(*SLD) : acelib {
 }
 
 project(*SLDex) : acelib {
+  avoids += uses_wchar
   sharedname = SLDex
   dynamicflags = SLDEX_BUILD_DLL
   Source_Files {
@@ -99,6 +106,7 @@ project(*SR_Configurable_Log_Server) : aceexe {
 }
 
 project(*TP_Reactor_Log_Server) : aceexe {
+  avoids += uses_wchar
   exename = tp_reactor_logging_server
   Source_Files {
     Logging_Acceptor.cpp
@@ -110,6 +118,7 @@ project(*TP_Reactor_Log_Server) : aceexe {
 }
 
 project(*TPCLS) : acelib, ssl {
+  avoids += uses_wchar
   sharedname = TPCLS
   dynamicflags = TPCLS_BUILD_DLL
   Source_Files {
@@ -119,6 +128,7 @@ project(*TPCLS) : acelib, ssl {
 }
 
 project(*TPLS) : acelib {
+  avoids += uses_wchar
   sharedname = TPLS
   dynamicflags = TPLS_BUILD_DLL
   Source_Files {
@@ -130,6 +140,7 @@ project(*TPLS) : acelib {
 }
 
 project(*WFMO_Reactor_Log_Server) : aceexe, wfmo {
+  avoids += uses_wchar
   exename = wfmo_reactor_logging_server
   Source_Files {
     Logging_Acceptor.cpp
diff --git a/examples/C++NPv2/Client_Logging_Daemon.cpp b/examples/C++NPv2/Client_Logging_Daemon.cpp
index cfe4aefa14e..313ed08dc01 100644
--- a/examples/C++NPv2/Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/Client_Logging_Daemon.cpp
@@ -145,7 +145,7 @@ int CLD_Handler::open (CLD_Connector *connector) {
 
 
 ACE_THR_FUNC_RETURN CLD_Handler::run_svc (void *arg) {
-  CLD_Handler *handler = ACE_static_cast (CLD_Handler *, arg);
+  CLD_Handler *handler = static_cast<CLD_Handler *> (arg);
   return handler->forward ();
 }
 
@@ -347,12 +347,10 @@ int Client_Logging_Daemon::init (int argc, ACE_TCHAR *argv[]) {
   for (int c; (c = get_opt ()) != -1;)
     switch (c) {
     case 'p': // Client logging daemon acceptor port number.
-      cld_port = ACE_static_cast
-        (u_short, ACE_OS::atoi (get_opt.opt_arg ()));
+      cld_port = static_cast<u_short> (ACE_OS::atoi (get_opt.opt_arg ()));
       break;
     case 'r': // Server logging daemon acceptor port number.
-      sld_port = ACE_static_cast
-        (u_short, ACE_OS::atoi (get_opt.opt_arg ()));
+      sld_port = static_cast<u_short> (ACE_OS::atoi (get_opt.opt_arg ()));
       break;
     case 's': // Server logging daemon hostname.
       ACE_OS::strsncpy
diff --git a/examples/C++NPv2/Logging_Event_Handler.h b/examples/C++NPv2/Logging_Event_Handler.h
index 614649daba8..f1a71364be5 100644
--- a/examples/C++NPv2/Logging_Event_Handler.h
+++ b/examples/C++NPv2/Logging_Event_Handler.h
@@ -47,7 +47,7 @@ public:
     // Need a non-const reference to call peer(), but that's
     // safe since we call a const method using it.
     Logging_Handler& h =
-      ACE_const_cast (Logging_Handler&, logging_handler_);
+      const_cast<Logging_Handler&> (logging_handler_);
     return h.peer ().get_handle ();
   };
 
diff --git a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
index 2f32140f3c7..13db2c90387 100644
--- a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
@@ -46,7 +46,7 @@ private:
 
 
 static ACE_THR_FUNC_RETURN event_loop (void *arg) {
-  ACE_Reactor *reactor = ACE_static_cast (ACE_Reactor *, arg);
+  ACE_Reactor *reactor = static_cast<ACE_Reactor *> (arg);
 
   reactor->owner (ACE_OS::thr_self ());
   reactor->run_reactor_event_loop ();
@@ -55,7 +55,7 @@ static ACE_THR_FUNC_RETURN event_loop (void *arg) {
 
 
 static ACE_THR_FUNC_RETURN controller (void *arg) {
-  ACE_Reactor *reactor = ACE_static_cast (ACE_Reactor *, arg);
+  ACE_Reactor *reactor = static_cast<ACE_Reactor *> (arg);
 
   Quit_Handler *quit_handler = 0;
   ACE_NEW_RETURN (quit_handler, Quit_Handler (reactor), 0);
@@ -64,7 +64,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) {
                             (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
   for (;;) {
     char user_input[80];
-    gets (user_input);
+    fgets (user_input, sizeof (user_input), stdin);
     if (ACE_OS::strcmp (user_input, "quit") == 0) {
       reactor->notify (quit_handler);
       break;
diff --git a/examples/C++NPv2/Server_Shutdown.cpp b/examples/C++NPv2/Server_Shutdown.cpp
index 6f068d6cec5..0618eb31395 100644
--- a/examples/C++NPv2/Server_Shutdown.cpp
+++ b/examples/C++NPv2/Server_Shutdown.cpp
@@ -44,7 +44,7 @@ private:
 
 
 static ACE_THR_FUNC_RETURN controller (void *arg) {
-  ACE_Reactor *reactor = ACE_static_cast (ACE_Reactor *, arg);
+  ACE_Reactor *reactor = static_cast<ACE_Reactor *> (arg);
 
   Quit_Handler *quit_handler = 0;
   ACE_NEW_RETURN (quit_handler, Quit_Handler (reactor), 0);
@@ -53,7 +53,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) {
                             (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
   for (;;) {
     char user_input[80];
-    gets (user_input);
+    fgets (user_input, sizeof (user_input), stdin);
     if (ACE_OS::strcmp (user_input, "quit") == 0) {
       reactor->notify (quit_handler);
       break;
diff --git a/examples/C++NPv2/Service_Reporter.cpp b/examples/C++NPv2/Service_Reporter.cpp
index 940e6337666..ad9cd05d26c 100644
--- a/examples/C++NPv2/Service_Reporter.cpp
+++ b/examples/C++NPv2/Service_Reporter.cpp
@@ -50,18 +50,18 @@ int Service_Reporter::handle_input (ACE_HANDLE) {
        iterator.next (st) != 0;
        iterator.advance ()) {
     iovec iov[3];
-    iov[0].iov_base = ACE_const_cast (char *, st->name ());
+    iov[0].iov_base = const_cast<ACE_TCHAR *> (st->name ());
     iov[0].iov_len =
       ACE_OS::strlen (st->name ()) * sizeof (ACE_TCHAR);
     const ACE_TCHAR *state = st->active () ?
            ACE_TEXT (" (active) ") : ACE_TEXT (" (paused) ");
-    iov[1].iov_base = ACE_const_cast (char *, state);
+    iov[1].iov_base = const_cast<ACE_TCHAR *> (state);
     iov[1].iov_len =
       ACE_OS::strlen (state) * sizeof (ACE_TCHAR);
     ACE_TCHAR *report = 0;   // Ask info() to allocate buffer
     int len = st->type ()->info (&report, 0);
-    iov[2].iov_base = ACE_static_cast (char *, report);
-    iov[2].iov_len = ACE_static_cast (size_t, len);
+    iov[2].iov_base = static_cast<ACE_TCHAR *> (report);
+    iov[2].iov_len = static_cast<size_t> (len);
     iov[2].iov_len *= sizeof (ACE_TCHAR);
     peer_stream.sendv_n (iov, 3);
     ACE::strdelete (report);
diff --git a/examples/C++NPv2/TPC_Logging_Server.cpp b/examples/C++NPv2/TPC_Logging_Server.cpp
index f990a87151a..739240fb34c 100644
--- a/examples/C++NPv2/TPC_Logging_Server.cpp
+++ b/examples/C++NPv2/TPC_Logging_Server.cpp
@@ -82,7 +82,7 @@ int TPC_Logging_Acceptor::accept_svc_handler
   if (PARENT::accept_svc_handler (sh) == -1) return -1;
   SSL_clear (ssl_);  // Reset for new SSL connection.
   SSL_set_fd
-    (ssl_, ACE_reinterpret_cast (int, sh->get_handle ()));
+    (ssl_, reinterpret_cast<int> (sh->get_handle ()));
 
   SSL_set_verify
     (ssl_,
diff --git a/examples/C++NPv2/TP_Logging_Server.cpp b/examples/C++NPv2/TP_Logging_Server.cpp
index e62c7d9e892..b591ef425b7 100644
--- a/examples/C++NPv2/TP_Logging_Server.cpp
+++ b/examples/C++NPv2/TP_Logging_Server.cpp
@@ -15,7 +15,7 @@ int TP_Logging_Handler::handle_input (ACE_HANDLE) {
     ACE_Message_Block *log_blk = 0;
     ACE_NEW_RETURN
       (log_blk, ACE_Message_Block
-                  (ACE_reinterpret_cast (char *, this)), -1);
+                  (reinterpret_cast<char *> (this)), -1);
     log_blk->cont (mblk);
     ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, -1);
     if (TP_LOGGING_TASK::instance ()->put (log_blk) == -1)
@@ -50,8 +50,7 @@ TP_Logging_Handler::handle_close (ACE_HANDLE handle,
 
 int TP_Logging_Task::svc () {
   for (ACE_Message_Block *log_blk; getq (log_blk) != -1; ) {
-    TP_Logging_Handler *tp_handler = ACE_reinterpret_cast
-      (TP_Logging_Handler *, log_blk->rd_ptr ());
+    TP_Logging_Handler *tp_handler = reinterpret_cast<TP_Logging_Handler *> (log_blk->rd_ptr ());
     Logging_Handler logging_handler (tp_handler->log_file ());
     logging_handler.write_log_record (log_blk->cont ());
 
diff --git a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
index 2e3641e480a..3c2d73fdd0e 100644
--- a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
@@ -47,7 +47,7 @@ private:
 
 
 static ACE_THR_FUNC_RETURN event_loop (void *arg) {
-  ACE_Reactor *reactor = ACE_static_cast (ACE_Reactor *, arg);
+  ACE_Reactor *reactor = static_cast<ACE_Reactor *> (arg);
 
   reactor->owner (ACE_OS::thr_self ());
   reactor->run_reactor_event_loop ();
@@ -56,7 +56,7 @@ static ACE_THR_FUNC_RETURN event_loop (void *arg) {
 
 
 static ACE_THR_FUNC_RETURN controller (void *arg) {
-  ACE_Reactor *reactor = ACE_static_cast (ACE_Reactor *, arg);
+  ACE_Reactor *reactor = static_cast<ACE_Reactor *> (arg);
 
   Quit_Handler *quit_handler = 0;
   ACE_NEW_RETURN (quit_handler, Quit_Handler (reactor), 0);
@@ -65,7 +65,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) {
                             (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
   for (;;) {
     char user_input[80];
-    gets (user_input);
+    fgets (user_input, sizeof (user_input), stdin);
     if (ACE_OS::strcmp (user_input, "quit") == 0) {
       reactor->notify (quit_handler);
       break;
diff --git a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
index 505c7d474fc..2be5102ad52 100644
--- a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
@@ -107,7 +107,7 @@ protected:
 
 
 static ACE_THR_FUNC_RETURN event_loop (void *arg) {
-  ACE_Reactor *reactor = ACE_static_cast (ACE_Reactor *, arg);
+  ACE_Reactor *reactor = static_cast<ACE_Reactor *> (arg);
 
   reactor->owner (ACE_OS::thr_self ());
   reactor->run_reactor_event_loop ();
diff --git a/examples/C++NPv2/display_logfile.cpp b/examples/C++NPv2/display_logfile.cpp
index 10982ea7344..4796ceccd91 100644
--- a/examples/C++NPv2/display_logfile.cpp
+++ b/examples/C++NPv2/display_logfile.cpp
@@ -66,7 +66,7 @@ public:
                                           mblk.space ());
       if (bytes_read <= 0)
         break;
-      mblk.wr_ptr (ACE_static_cast (size_t, bytes_read));
+      mblk.wr_ptr (static_cast<size_t> (bytes_read));
 
       // We have a bunch of data from the log file. The data is
       // arranged like so:
@@ -144,22 +144,19 @@ public:
 
         // Extract the type
         ACE_CDR::Long *lp;
-        lp = ACE_reinterpret_cast
-          (ACE_CDR::Long*, temp->wr_ptr ());
+        lp = reinterpret_cast<ACE_CDR::Long*> (temp->wr_ptr ());
         cdr >> *lp;
         temp->wr_ptr (sizeof (ACE_CDR::Long));
         temp = temp->cont ();
 
         // Extract the pid
-        lp = ACE_reinterpret_cast
-          (ACE_CDR::Long*, temp->wr_ptr ());
+        lp = reinterpret_cast<ACE_CDR::Long*> (temp->wr_ptr ());
         cdr >> *lp;
         temp->wr_ptr (sizeof (ACE_CDR::Long));
         temp = temp->cont ();
 
         // Extract the timestamp (2 Longs)
-        lp = ACE_reinterpret_cast
-          (ACE_CDR::Long*, temp->wr_ptr ());
+        lp = reinterpret_cast<ACE_CDR::Long*> (temp->wr_ptr ());
         cdr >> *lp; ++lp; cdr >> *lp;
         temp->wr_ptr (2 * sizeof (ACE_CDR::Long));
         temp = temp->cont ();
@@ -274,9 +271,11 @@ public:
     ACE_CDR::Long secs = * (ACE_CDR::Long *)mblk->rd_ptr ();
     mblk->rd_ptr (sizeof (ACE_CDR::Long));
     ACE_CDR::Long usecs = * (ACE_CDR::Long *)mblk->rd_ptr ();
+    ACE_TCHAR timestamp_t[26];
     char timestamp[26]; // Max size of ctime_r() string.
     time_t time_secs (secs);
-    ACE_OS::ctime_r (&time_secs, timestamp, sizeof timestamp);
+    ACE_OS::ctime_r (&time_secs, timestamp_t, sizeof timestamp_t);
+    ACE_OS::strcpy (timestamp, ACE_TEXT_ALWAYS_CHAR (timestamp_t));
     mblk->size (26); // Max size of ctime_r() string.
     mblk->reset ();
     timestamp[19] = '\0'; // NUL-terminate after the time.
@@ -337,13 +336,13 @@ public:
 
 LOGREC_MODULE (Logrec_Separator);
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (argc != 2)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "usage: %s logfile\n", argv[0]),
                       1);
-  ACE_TString logfile (ACE_TEXT_CHAR_TO_TCHAR (argv[1]));
+  ACE_TString logfile (argv[1]);
   ACE_Stream<ACE_SYNCH> stream;
 
   if (stream.push
diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp
index 48386d40073..5f8810a076f 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -30,7 +30,7 @@ int
 Svc_Handler::open (void *)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "client connected on handle %d\n",
+              ACE_TEXT ("client connected on handle %d\n"),
 	      this->peer ().get_handle ()));
   if (this->ar_.open (*this,
                       this->peer ().get_handle ()) == -1)
@@ -48,10 +48,10 @@ Svc_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 
       // Print out the message received from the server.
       ACE_DEBUG ((LM_DEBUG,
-                  "(%t) message size %d.\n",
+                  ACE_TEXT ("(%t) message size %d.\n"),
                   result.message_block ().length ()));
       ACE_DEBUG ((LM_DEBUG,
-                  "%s",
+                  ACE_TEXT ("%C"),
                   result.message_block ().rd_ptr ()));
       // Reset the message block here to make sure multiple writes to
       // the pipe don't keep appending to the message_block!
@@ -79,8 +79,7 @@ IPC_Server::handle_signal (int,
                            siginfo_t *,
                            ucontext_t *)
 {
-  ACE_LOG_MSG->log (LM_INFO,
-                    "IPC_Server::handle_signal().\n");
+  ACE_LOG_MSG->log (LM_INFO, ACE_TEXT ("IPC_Server::handle_signal().\n"));
 
   // Flag the main <svc> loop to shutdown.
   this->shutdown_ = 1;
@@ -92,21 +91,18 @@ IPC_Server::handle_signal (int,
 }
 
 int
-IPC_Server::init (int argc, char *argv[])
+IPC_Server::init (int argc, ACE_TCHAR *argv[])
 {
-  if (this->parse_args (argc,
-                        argv) == -1)
+  if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "Opening %s\n",
-              rendezvous_));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Opening %s\n"), rendezvous_));
 
   // Initialize named pipe listener.
   if (this->open (ACE_SPIPE_Addr (rendezvous_)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"), 1);
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")), 1);
 
   // Register to receive shutdowns using this handler.
   else if (ACE_Reactor::instance ()->register_handler
@@ -123,11 +119,11 @@ IPC_Server::fini (void)
 }
 
 int
-IPC_Server::parse_args (int argc, char *argv[])
+IPC_Server::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, "ut:r:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("ut:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -135,12 +131,12 @@ IPC_Server::parse_args (int argc, char *argv[])
 	{
 	case 'r':
 	  ACE_OS::strncpy (rendezvous_,
-			   ACE_TEXT_CHAR_TO_TCHAR (get_opt.opt_arg ()),
+			   get_opt.opt_arg (),
 			   sizeof (rendezvous_) / sizeof (ACE_TCHAR));
 	  break;
 	case 't':
 	  n_threads_ = ACE_OS::atoi (get_opt.opt_arg ());
-	  ACE_DEBUG ((LM_DEBUG, "%s == %d.\n",
+	  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s == %d.\n"),
 		      get_opt.opt_arg (),
 		      n_threads_));
 	  ACE_Proactor::instance (2 * n_threads_);
@@ -150,8 +146,8 @@ IPC_Server::parse_args (int argc, char *argv[])
 	case 'u':
 	default:
 	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "usage: %n -t <threads>\n"
-			     "-r <rendezvous>\n"), -1);
+			     ACE_TEXT ("usage: %n -t <threads>\n")
+			     ACE_TEXT (" -r <rendezvous>\n")), -1);
 	  break;
 	}
     }
@@ -162,7 +158,7 @@ IPC_Server::parse_args (int argc, char *argv[])
 static ACE_THR_FUNC_RETURN
 run_reactor_event_loop (void *)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%t) worker thread starting\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) worker thread starting\n")));
 
   ACE_Proactor::run_event_loop ();
   return 0;
@@ -181,8 +177,8 @@ IPC_Server::svc (void)
       // EINTR).
       if (this->accept (&sh, 0) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "accept"),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("accept")),
                           1);
 
       // SH's destructor closes the stream implicitly but the
@@ -199,15 +195,14 @@ IPC_Server::svc (void)
                     THR_NEW_LWP) == -1)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 "%p\n",
-                                 "spawn_n"),
+                                 ACE_TEXT ("%p\n"),
+                                 ACE_TEXT ("spawn_n")),
                                 1);
 
               ACE_Thread_Manager::instance ()->wait ();
             }
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%t) main thread exiting.\n"));
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) main thread exiting.\n")));
 
           // Reset the Proactor so another accept will work.
           ACE_Proactor::reset_event_loop();
diff --git a/examples/Connection/blocking/SPIPE-acceptor.h b/examples/Connection/blocking/SPIPE-acceptor.h
index 99e8b873839..546941c48fb 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.h
+++ b/examples/Connection/blocking/SPIPE-acceptor.h
@@ -5,6 +5,7 @@
 #define SP_ACCEPTOR_H
 
 #include "ace/Svc_Handler.h"
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,7 +47,7 @@ public:
   ~IPC_Server (void);
 
   // = Dynamic linking hooks.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the network server.
 
   virtual int fini (void);
@@ -56,7 +57,7 @@ public:
   // Run the interative service.
 
 private:
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse command-line arguments.
 
   int n_threads_;
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index e54c9c841aa..be88aa7f668 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -26,9 +26,7 @@ Peer_Handler::~Peer_Handler (void)
 int
 Peer_Handler::open (void *)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "activating %d\n",
-              this->get_handle ()));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("activating %d\n"), this->get_handle ()));
 
   // If iterations_ has not been set, read from stdin.
   if (iterations_ == 0)
@@ -39,8 +37,8 @@ Peer_Handler::open (void *)
            ACE_Reactor::instance (),
            ACE_Thread_Manager::instance ()) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "register_stdin_handler"),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("register_stdin_handler")),
                           -1);
       else
         return 0;
@@ -62,7 +60,7 @@ Peer_Handler::open (void *)
         continue;
 
       this->peer ().close ();
-      ACE_Reactor::end_event_loop();
+      ACE_Reactor::instance ()->end_reactor_event_loop();
       return 0;
     }
 }
@@ -79,15 +77,15 @@ Peer_Handler::handle_input (ACE_HANDLE)
   if (n > 0)
     if (this->peer ().send (buf, n) != n)
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "write failed"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("write failed")),
                         -1);
     else if (n == 0) // Explicitly close the connection.
       {
         if (this->peer ().close () == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "%p\n",
-                             "close"),
+                             ACE_TEXT ("%p\n"),
+                             ACE_TEXT ("close")),
                             1);
         return -1;
       }
@@ -100,8 +98,7 @@ int
 Peer_Handler::handle_close (ACE_HANDLE,
                             ACE_Reactor_Mask)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "Shutting down\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Shutting down\n")));
   return 0;
 }
 
@@ -114,16 +111,14 @@ Peer_Handler::get_handle (void) const
 void
 Peer_Handler::display_menu (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "\nplease enter input..: "));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nplease enter input..: ")));
 }
 
 IPC_Client::IPC_Client (void)
   : iterations_ (0),
     done_handler_ (ACE_Sig_Handler_Ex (ACE_Proactor::end_event_loop))
 {
-  ACE_OS::strcpy (rendezvous_,
-                  ACE_TEXT ("acepipe"));
+  ACE_OS::strcpy (rendezvous_, ACE_TEXT ("acepipe"));
 }
 
 IPC_Client::~IPC_Client (void)
@@ -133,7 +128,7 @@ IPC_Client::~IPC_Client (void)
 // Dynamic linking hooks.
 
 int
-IPC_Client::init (int argc, char *argv[])
+IPC_Client::init (int argc, ACE_TCHAR *argv[])
 {
   if (this->parse_args (argc, argv) == -1)
     return -1;
@@ -143,9 +138,7 @@ IPC_Client::init (int argc, char *argv[])
             &this->done_handler_) == -1)
     return -1;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "Opening %s\n",
-              rendezvous_));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Opening %s\n"), rendezvous_));
 
   Peer_Handler *ph;
 
@@ -162,8 +155,8 @@ IPC_Client::init (int argc, char *argv[])
                      O_RDWR | FILE_FLAG_OVERLAPPED,
                      0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "connect"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("connect")),
                       -1);
 
   return 0;
@@ -178,7 +171,7 @@ IPC_Client::fini (void)
 int
 IPC_Client::svc (void)
 {
-  ACE_Reactor::run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
   return 0;
 }
 
@@ -190,11 +183,11 @@ IPC_Client::handle_close (ACE_HANDLE,
 }
 
 int
-IPC_Client::parse_args (int argc, char *argv[])
+IPC_Client::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, "ui:r:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("ui:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -202,7 +195,7 @@ IPC_Client::parse_args (int argc, char *argv[])
         {
         case 'r':
           ACE_OS::strncpy (rendezvous_,
-                           ACE_TEXT_CHAR_TO_TCHAR (get_opt.opt_arg ()),
+                           get_opt.opt_arg (),
                            sizeof (rendezvous_) / sizeof (ACE_TCHAR));
           break;
         case 'i':
@@ -211,8 +204,8 @@ IPC_Client::parse_args (int argc, char *argv[])
         case 'u':
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "usage: %n -i <iterations>\n"
-                             "-r <rendezvous>\n"),
+                             ACE_TEXT ("usage: %n -i <iterations>\n")
+                             ACE_TEXT ("-r <rendezvous>\n")),
                             -1);
           break;
         }
diff --git a/examples/Connection/blocking/SPIPE-connector.h b/examples/Connection/blocking/SPIPE-connector.h
index 916caa973f3..9c47bcda962 100644
--- a/examples/Connection/blocking/SPIPE-connector.h
+++ b/examples/Connection/blocking/SPIPE-connector.h
@@ -5,6 +5,7 @@
 #define SP_CONNECTOR_H
 
 #include "ace/Svc_Handler.h"
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -51,7 +52,7 @@ public:
   ~IPC_Client (void);
 
   // = Dynamic linking hooks.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the IPC client.
 
   virtual int fini (void);
@@ -64,7 +65,7 @@ public:
   // Report connection errors.
 
 private:
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse command-line arguments.
 
   int iterations_;
diff --git a/examples/Connection/blocking/test_spipe_acceptor.cpp b/examples/Connection/blocking/test_spipe_acceptor.cpp
index c265fc1400f..549690ebf43 100644
--- a/examples/Connection/blocking/test_spipe_acceptor.cpp
+++ b/examples/Connection/blocking/test_spipe_acceptor.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(blocking, test_spipe_acceptor, "$Id$")
 #if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Perform Service_Config initializations
   ACE_Service_Config daemon (argv[0]);
@@ -17,7 +17,7 @@ main (int argc, char *argv[])
   IPC_Server peer_acceptor;
 
   if (peer_acceptor.init (argc, argv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("init")), -1);
 
   return peer_acceptor.svc ();
 }
diff --git a/examples/Connection/blocking/test_spipe_connector.cpp b/examples/Connection/blocking/test_spipe_connector.cpp
index 24156ca862e..e10cc023a6f 100644
--- a/examples/Connection/blocking/test_spipe_connector.cpp
+++ b/examples/Connection/blocking/test_spipe_connector.cpp
@@ -7,7 +7,7 @@
 ACE_RCSID(blocking, test_spipe_connector, "$Id$")
 
 int 
-main (int argc, char *argv[])                       
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])                       
 {                                                       
   // Perform Service_Config initializations
   ACE_Service_Config daemon (argv[0]);
@@ -15,7 +15,7 @@ main (int argc, char *argv[])
   IPC_Client peer_connector;
 
   if (peer_connector.init (argc, argv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("init")), -1);
   
   return peer_connector.svc ();
 }                                                       
diff --git a/examples/Connection/misc/Connection_Handler.cpp b/examples/Connection/misc/Connection_Handler.cpp
index fe08fa05fbf..5129fc7cb92 100644
--- a/examples/Connection/misc/Connection_Handler.cpp
+++ b/examples/Connection/misc/Connection_Handler.cpp
@@ -29,8 +29,7 @@ ACE_RCSID(misc, Connection_Handler, "$Id$")
 int
 Connection_Handler::open (void *)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) in open()\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in open()\n")));
 
   // Make ourselves an Active Object.
   return this->activate (THR_NEW_LWP | THR_DETACHED);
@@ -39,8 +38,7 @@ Connection_Handler::open (void *)
 int
 Connection_Handler::close (u_long)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) in close()\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in close()\n")));
 
   // Shut ourself down.  Note that this doesn't destroy the thread,
   // just the state of the object.
@@ -51,8 +49,7 @@ Connection_Handler::close (u_long)
 int
 Connection_Handler::svc (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) in svc()\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in svc()\n")));
 
   this->finished_ = 0;
 
@@ -72,7 +69,7 @@ Connection_Handler::svc (void)
   if (this->reactor ()->register_handler
       (this, ACE_Event_Handler::READ_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "can' (%P|%t) t register with reactor\n"),
+                       ACE_TEXT ("can' (%P|%t) t register with reactor\n")),
                       -1);
   // Schedule a timer.
   else if (this->reactor ()->schedule_timer (this,
@@ -80,18 +77,16 @@ Connection_Handler::svc (void)
                                              ACE_Time_Value (2),
                                              ACE_Time_Value (2)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) can't register with reactor\n"),
+                       ACE_TEXT ("(%P|%t) can't register with reactor\n")),
                       -1);
   else
-    ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) connected with client\n"));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected with client\n")));
 
   // Keep looping until we receive SIGQUIT or the client shutsdown.
 
   while (this->finished_ == 0)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) handling events\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) handling events\n")));
       this->reactor ()->handle_events ();
     }
 
@@ -105,8 +100,7 @@ Connection_Handler::svc (void)
   // Zero-out the Reactor field so it isn't accessed later on.
   this->reactor (0);
 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) exiting svc\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) exiting svc\n")));
   return 0;
 }
 
@@ -114,8 +108,7 @@ int
 Connection_Handler::handle_close (ACE_HANDLE,
                                   ACE_Reactor_Mask)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) in handle_close \n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in handle_close \n")));
 
   // Signal the svc() event loop to shut down.
   this->finished_ = 1;
@@ -127,30 +120,28 @@ Connection_Handler::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
 
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) handle_input\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) handle_input\n")));
 
   switch (this->peer ().recv (buf, sizeof buf))
     {
     case -1:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) %p bad read\n",
-                         "client logger"),
+                         ACE_TEXT ("(%P|%t) %p bad read\n"),
+                         ACE_TEXT ("client logger")),
                         -1);
     case 0:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) closing log daemon (fd = %d)\n",
+                         ACE_TEXT ("(%P|%t) closing log daemon (fd = %d)\n"),
                          this->get_handle ()),
                         -1);
     default:
       if (buf[0] == (char) EOF)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) closing log daemon (fd = %d)\n",
+                           ACE_TEXT ("(%P|%t) closing log daemon (fd = %d)\n"),
                            this->get_handle ()),
                           -1);
       else
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) from client: %s",
-                    buf));
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) from client: %s"), buf));
     }
 
   return 0;
@@ -164,26 +155,23 @@ Connection_Handler::handle_signal (int signum,
   // @@ Note that this code is not portable to all OS platforms since
   // it uses print statements within signal handler context.
 
-  ACE_DEBUG ((LM_DEBUG,
-              "received signal %S\n",
-              signum));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("received signal %S\n"), signum));
 
   this->finished_ = 1;
   return 0;
 }
 
 int
-Connection_Handler::handle_timeout (const ACE_Time_Value &tv,
+Connection_Handler::handle_timeout (const ACE_Time_Value &,
                                     const void *arg)
 {
-  ACE_UNUSED_ARG (tv);
 #if defined (ACE_NDEBUG)
   ACE_UNUSED_ARG (arg);
 #endif /* ACE_NDEBUG */
 
   ACE_ASSERT (arg == this);
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) handling timeout from this = %u\n",
+              ACE_TEXT ("(%P|%t) handling timeout from this = %@\n"),
               this));
   return 0;
 }
@@ -194,14 +182,13 @@ typedef ACE_Acceptor <Connection_Handler, ACE_SOCK_ACCEPTOR>
         Connection_Acceptor;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Service_Config daemon (argv[0]);
 
   u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) in main\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in main\n")));
 
   // Acceptor factory.
   Connection_Acceptor peer_acceptor;
@@ -212,20 +199,20 @@ main (int argc, char *argv[])
   // Register the signal handler adapter.
   if (ACE_Reactor::instance ()->register_handler (SIGINT, &sa) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "register_handler"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("register_handler")),
                       -1);
 
   // Open the Acceptor.
   else if (peer_acceptor.open (ACE_INET_Addr (port),
                                ACE_Reactor::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) starting up connection server\n"));
+              ACE_TEXT ("(%P|%t) starting up connection server\n")));
 
   // Perform connection service until we receive SIGINT.
 
@@ -233,7 +220,7 @@ main (int argc, char *argv[])
     ACE_Reactor::run_event_loop ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) shutting down connection server\n"));
+              ACE_TEXT ("(%P|%t) shutting down connection server\n")));
   return 0;
 }
 
diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp
index 111f5c219a7..e986ba069cb 100644
--- a/examples/Connection/misc/test_upipe.cpp
+++ b/examples/Connection/misc/test_upipe.cpp
@@ -57,10 +57,10 @@ public:
       ACE_TRACE ("Server::Server");
     }
 
-  virtual int init (int argc, char *argv[])
+  virtual int init (int argc, ACE_TCHAR *argv[])
     {
       ACE_TRACE ("Server::init");
-      const char *l_addr = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
+      const ACE_TCHAR *l_addr = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
 
       ACE_UPIPE_Addr local_addr (l_addr);
 
@@ -98,11 +98,11 @@ public:
       ACE_TRACE ("Client::Client");
     }
 
-  virtual int init (int argc, char *argv[])
+  virtual int init (int argc, ACE_TCHAR *argv[])
   {
     ACE_TRACE ("Client::init");
 
-    const char *r_addr = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
+    const ACE_TCHAR *r_addr = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
 
     ACE_UPIPE_Addr remote_addr (r_addr);
 
@@ -118,7 +118,7 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Service_Config svc_conf;
   ACE_Thread_Manager thr_mgr;
@@ -129,9 +129,9 @@ main (int argc, char *argv[])
   // Establish the connection between Acceptor and Connector.
 
   if (peer_acceptor.init (argc, argv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("init")), -1);
   else if (peer_connector.init (argc, argv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("init")), -1);
 
   // Wait for threads to exit.
   thr_mgr.wait ();
diff --git a/examples/Connection/misc/test_upipe.h b/examples/Connection/misc/test_upipe.h
index f61c997d84b..9c3b50bc1c3 100644
--- a/examples/Connection/misc/test_upipe.h
+++ b/examples/Connection/misc/test_upipe.h
@@ -7,6 +7,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/Svc_Handler.h"
+#include "ace/Service_Config.h"
 #include "ace/UPIPE_Stream.h"
 
 typedef ACE_Svc_Handler <ACE_UPIPE_STREAM, ACE_NULL_SYNCH> SVC_HANDLER;
diff --git a/examples/Connection/non_blocking/CPP-acceptor.cpp b/examples/Connection/non_blocking/CPP-acceptor.cpp
index 8dce9c948be..12c80c1d939 100644
--- a/examples/Connection/non_blocking/CPP-acceptor.cpp
+++ b/examples/Connection/non_blocking/CPP-acceptor.cpp
@@ -27,8 +27,7 @@ Svc_Handler<PR_ST_2>::Svc_Handler (ACE_Reactor *r)
 template <PR_ST_1> int
 Svc_Handler<PR_ST_2>::close (u_long)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "calling Svc_Handler close\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("calling Svc_Handler close\n")));
 
   // Free up the handle.
   this->peer ().close ();
@@ -39,22 +38,22 @@ template <PR_ST_1> int
 Svc_Handler<PR_ST_2>::open (void *)
 {
   PR_AD client_addr;
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
 
   if (this->peer ().get_remote_addr (client_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_remote_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_remote_addr")),
                       -1);
   else if (client_addr.addr_to_string (buf,
                                        sizeof buf) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "addr_to_string"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("addr_to_string")),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
-                "client addr %s on handle %d\n",
+                ACE_TEXT ("client addr %s on handle %d\n"),
                 buf,
                 this->peer ().get_handle ()));
 
@@ -72,8 +71,7 @@ Svc_Handler<PR_ST_2>::handle_input (ACE_HANDLE)
 
   // Read data from client (terminate on error).
 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) in handle_input\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) in handle_input\n")));
 
   for (ssize_t r_bytes;
        (r_bytes = this->peer ().recv (buf,
@@ -83,33 +81,31 @@ Svc_Handler<PR_ST_2>::handle_input (ACE_HANDLE)
                        buf,
                        r_bytes) != r_bytes)
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "ACE::send_n"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("ACE::send_n")),
                         -1);
   // Send back ack.
   if (this->peer ().send_n ("",
                             1) != 1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "send_n"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("send_n")),
                       -1);
   return 0;
 }
 
 template <PR_ST_1> int
 Svc_Handler<PR_ST_2>::handle_timeout (const ACE_Time_Value &,
-                                       const void *)
+                                      const void *)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "%p\n",
-              "handle_timeout"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("handle_timeout")));
   return 0;
 }
 
 template <class SVH, PR_AC_1> int
-IPC_Server<SVH, PR_AC_2>::init (int argc, char *argv[])
+IPC_Server<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
 {
-  const char *local_addr = argc > 1
+  const ACE_TCHAR *local_addr = argc > 1
     ? argv[1]
     : ACE_DEFAULT_SERVER_PORT_STR;
   ACE_Time_Value timeout (argc > 2
@@ -124,8 +120,8 @@ IPC_Server<SVH, PR_AC_2>::init (int argc, char *argv[])
 
   if (this->server_addr_.set (local_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "set"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("set")),
                       -1);
   // Call down to the ACCEPTOR's <open> method to do the
   // initialization.
@@ -134,16 +130,16 @@ IPC_Server<SVH, PR_AC_2>::init (int argc, char *argv[])
                              ? ACE_Reactor::instance ()
                              : 0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       -1);
   // Handle the SIGINT signal through the <ACE_Reactor>.
   else if (ACE_Reactor::instance ()->register_handler
            (SIGINT,
             &this->done_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "register_handler"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("register_handler")),
                       -1);
 #if !defined (ACE_WIN32)
   // Handle the SIGPIPE signal through the <ACE_Reactor>.
@@ -151,8 +147,8 @@ IPC_Server<SVH, PR_AC_2>::init (int argc, char *argv[])
            (SIGPIPE,
             &this->done_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "register_handler"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("register_handler")),
                       -1);
 #endif /* ACE_WIN32 */
   else
@@ -184,7 +180,7 @@ IPC_Server<SVH, PR_AC_2>::handle_close (ACE_HANDLE handle,
   ACE_UNUSED_ARG (mask);
 
   ACE_DEBUG ((LM_DEBUG,
-              "calling IPC_Server handle_close, but accept handle stays open!\n"));
+              ACE_TEXT ("calling IPC_Server handle_close, but accept handle stays open!\n")));
   return 0;
 }
 
@@ -193,17 +189,17 @@ IPC_Server<SVH, PR_AC_2>::handle_close (ACE_HANDLE handle,
 template <class SVH, PR_AC_1> int
 IPC_Server<SVH, PR_AC_2>::svc (void)
 {
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
 
   if (this->server_addr_.addr_to_string (buf,
                                          sizeof buf) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "addr_to_string"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("addr_to_string")),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,
-                "starting server addr %s on handle %d\n",
+                ACE_TEXT ("starting server addr %s on handle %d\n"),
                 buf,
                 this->get_handle ()));
 
@@ -229,8 +225,8 @@ IPC_Server<SVH, PR_AC_2>::svc (void)
           else
             // We've probably timed out...
             ACE_ERROR ((LM_ERROR,
-                        "%p on handle %d\n",
-                        "accept",
+                        ACE_TEXT ("%p on handle %d\n"),
+                        ACE_TEXT ("accept"),
                         this->acceptor ().get_handle ()));
         }
 
diff --git a/examples/Connection/non_blocking/CPP-acceptor.h b/examples/Connection/non_blocking/CPP-acceptor.h
index 1ee9ff99a4a..548d853c736 100644
--- a/examples/Connection/non_blocking/CPP-acceptor.h
+++ b/examples/Connection/non_blocking/CPP-acceptor.h
@@ -61,7 +61,7 @@ public:
   // the <Reactor>.
 
   // = Dynamic linking hooks.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the network server.
 
   virtual int fini (void);
diff --git a/examples/Connection/non_blocking/CPP-connector.cpp b/examples/Connection/non_blocking/CPP-connector.cpp
index 79004face87..e113b5f5acb 100644
--- a/examples/Connection/non_blocking/CPP-connector.cpp
+++ b/examples/Connection/non_blocking/CPP-connector.cpp
@@ -28,12 +28,11 @@ template <PR_ST_1> int
 Peer_Handler<PR_ST_2>::open (void *)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "activating %d\n",
+              ACE_TEXT ("activating %d\n"),
               this->peer ().get_handle ()));
   this->action_ = &Peer_Handler<PR_ST_2>::connected;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "please enter input..: "));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("please enter input..: ")));
 
   if (this->reactor ())
 
@@ -64,7 +63,7 @@ template <PR_ST_1> int
 Peer_Handler<PR_ST_2>::close (u_long)
 {
   ACE_ERROR ((LM_ERROR,
-              "Connect not successful: ending reactor event loop\n"));
+              ACE_TEXT ("Connect not successful: ending reactor event loop\n")));
   this->reactor ()->end_reactor_event_loop();
   return 0;
 }
@@ -72,8 +71,7 @@ Peer_Handler<PR_ST_2>::close (u_long)
 template <PR_ST_1> int
 Peer_Handler<PR_ST_2>::uninitialized (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "uninitialized!\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("uninitialized!\n")));
   return 0;
 }
 
@@ -89,24 +87,21 @@ Peer_Handler<PR_ST_2>::connected (void)
   if (n > 0
       && this->peer ().send_n (buf,
                                n) != n)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "write failed"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("write failed")),
                       -1);
   else if (n == 0)
     {
       // Explicitly close the connection.
       if (this->peer ().close () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "close"),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("close")),
                           1);
       return -1;
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "please enter input..: "));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("please enter input..: ")));
       return 0;
     }
 }
@@ -116,8 +111,7 @@ Peer_Handler<PR_ST_2>::stdio (void)
 {
   char buf[BUFSIZ];
 
-  ACE_DEBUG ((LM_DEBUG,
-              "in stdio\nplease enter input..: "));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("in stdio\nplease enter input..: ")));
 
   ssize_t n = ACE_OS::read (ACE_STDIN,
                             buf,
@@ -128,8 +122,8 @@ Peer_Handler<PR_ST_2>::stdio (void)
                          buf,
                          n) != n)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "write"),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("write")),
                           -1);
       return 0;
     }
@@ -141,16 +135,14 @@ template <PR_ST_1> int
 Peer_Handler<PR_ST_2>::handle_timeout (const ACE_Time_Value &,
                                        const void *)
 {
-  ACE_ERROR ((LM_ERROR,
-              "Connect timedout. "));
+  ACE_ERROR ((LM_ERROR, ACE_TEXT ("Connect timedout. ")));
   return this->close ();
 }
 
 template <PR_ST_1> int
 Peer_Handler<PR_ST_2>::handle_output (ACE_HANDLE)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "in handle_output\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("in handle_output\n")));
 
   return (this->*action_) ();
 }
@@ -164,8 +156,7 @@ Peer_Handler<PR_ST_2>::handle_signal (int signum,
 
   // @@ Note that this code is not portable to all OS platforms since
   // it uses print statements within signal handler context.
-  ACE_DEBUG ((LM_DEBUG,
-              "in handle_signal\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("in handle_signal\n")));
 
   return (this->*action_) ();
 }
@@ -173,8 +164,7 @@ Peer_Handler<PR_ST_2>::handle_signal (int signum,
 template <PR_ST_1> int
 Peer_Handler<PR_ST_2>::handle_input (ACE_HANDLE)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "in handle_input\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("in handle_input\n")));
 
   return (this->*action_) ();
 }
@@ -184,20 +174,18 @@ Peer_Handler<PR_ST_2>::handle_close (ACE_HANDLE h,
                                      ACE_Reactor_Mask mask)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "closing down handle %d with mask %d\n",
+              ACE_TEXT ("closing down handle %d with mask %d\n"),
               h,
               mask));
 
   if (this->action_ == &Peer_Handler<PR_ST_2>::stdio)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "moving to closed state\n"));
-      ACE_Reactor::end_event_loop ();
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("moving to closed state\n")));
+      this->reactor ()->end_reactor_event_loop ();
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "moving to stdio state\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("moving to stdio state\n")));
       this->action_ = &Peer_Handler<PR_ST_2>::stdio;
       this->peer ().close ();
       ACE_OS::rewind (stdin);
@@ -226,7 +214,7 @@ template <class SVH, PR_CO_1> int
 IPC_Client<SVH, PR_CO_2>::svc (void)
 {
   if (this->reactor ())
-    ACE_Reactor::run_event_loop ();
+    this->reactor ()->run_reactor_event_loop ();
 
   return 0;
 }
@@ -244,13 +232,13 @@ IPC_Client<SVH, PR_CO_2>::IPC_Client (void)
 }
 
 template <class SVH, PR_CO_1> int
-IPC_Client<SVH, PR_CO_2>::init (int argc, char *argv[])
+IPC_Client<SVH, PR_CO_2>::init (int argc, ACE_TCHAR *argv[])
 {
   // Call down to the CONNECTOR's open() method to do the
   // initialization.
   this->inherited::open (ACE_Reactor::instance ());
 
-  const char *r_addr = argc > 1 ? argv[1] :
+  const ACE_TCHAR *r_addr = argc > 1 ? argv[1] :
     ACE_SERVER_ADDRESS (ACE_DEFAULT_SERVER_HOST,
                         ACE_DEFAULT_SERVER_PORT_STR);
   ACE_Time_Value timeout (argc > 2
@@ -262,8 +250,8 @@ IPC_Client<SVH, PR_CO_2>::init (int argc, char *argv[])
       (SIGINT,
        &this->done_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "register_handler"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("register_handler")),
                       -1);
   PR_AD remote_addr (r_addr);
   this->options_.set (ACE_Synch_Options::USE_REACTOR,
@@ -280,8 +268,8 @@ IPC_Client<SVH, PR_CO_2>::init (int argc, char *argv[])
                      this->options_) == -1
       && errno != EWOULDBLOCK)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "connect"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("connect")),
                       -1);
   else
     return 0;
diff --git a/examples/Connection/non_blocking/CPP-connector.h b/examples/Connection/non_blocking/CPP-connector.h
index aa7cec8aa6d..aa934a69543 100644
--- a/examples/Connection/non_blocking/CPP-connector.h
+++ b/examples/Connection/non_blocking/CPP-connector.h
@@ -66,7 +66,7 @@ public:
   // Destructor.
 
   // = Dynamic linking hooks.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the IPC client.
 
   virtual int fini (void);
diff --git a/examples/Connection/non_blocking/test_lsock_acceptor.cpp b/examples/Connection/non_blocking/test_lsock_acceptor.cpp
index f6f78ddcd6e..c79ab0f3740 100644
--- a/examples/Connection/non_blocking/test_lsock_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_lsock_acceptor.cpp
@@ -9,7 +9,7 @@
 
 #if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 int
-main (int, char *argv[])
+ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
   ACE_ERROR_RETURN ((LM_INFO,
                      ACE_TEXT ("%s: not supported with ")
@@ -31,7 +31,7 @@ typedef Svc_Handler<ACE_LSOCK_STREAM> SVC_HANDLER;
 typedef IPC_Server<SVC_HANDLER, ACE_LSOCK_ACCEPTOR> IPC_SERVER;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Perform Service_Config initializations
   ACE_Service_Config daemon (argv[0]);
@@ -40,8 +40,8 @@ main (int argc, char *argv[])
 
   if (peer_acceptor.init (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("init")),
                       -1);
   return peer_acceptor.svc ();
 }
diff --git a/examples/Connection/non_blocking/test_lsock_connector.cpp b/examples/Connection/non_blocking/test_lsock_connector.cpp
index 32997875db1..cb6b1328975 100644
--- a/examples/Connection/non_blocking/test_lsock_connector.cpp
+++ b/examples/Connection/non_blocking/test_lsock_connector.cpp
@@ -5,7 +5,7 @@
 
 #if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 int
-main (int, char *argv[])
+ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
   ACE_ERROR_RETURN ((LM_INFO,
                      ACE_TEXT ("%s: not supported with ")
@@ -27,7 +27,7 @@ typedef IPC_Client<PEER_HANDLER, ACE_LSOCK_CONNECTOR> IPC_CLIENT;
 // ACE_LSOCK Client.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Perform Service_Config initializations
   ACE_Service_Config daemon (argv[0]);
@@ -36,8 +36,8 @@ main (int argc, char *argv[])
 
   if (peer_connector.init (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("init")),
                       -1);
 
   return peer_connector.svc ();
diff --git a/examples/Connection/non_blocking/test_sock_acceptor.cpp b/examples/Connection/non_blocking/test_sock_acceptor.cpp
index c6948b8bed8..9cf756e5c17 100644
--- a/examples/Connection/non_blocking/test_sock_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_sock_acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "ace/SOCK_Acceptor.h"
 #include "ace/INET_Addr.h"
 #include "ace/Service_Config.h"
@@ -14,7 +16,7 @@ typedef Svc_Handler<ACE_SOCK_STREAM> SVC_HANDLER;
 typedef IPC_Server<SVC_HANDLER, ACE_SOCK_ACCEPTOR> IPC_SERVER;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Perform Service_Config initializations
   ACE_Service_Config daemon (argv[0]);
@@ -23,8 +25,8 @@ main (int argc, char *argv[])
 
   if (peer_acceptor.init (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("init")),
                       -1);
 
   return peer_acceptor.svc ();
diff --git a/examples/Connection/non_blocking/test_sock_connector.cpp b/examples/Connection/non_blocking/test_sock_connector.cpp
index d5ebccfcc4a..50c7931cbf4 100644
--- a/examples/Connection/non_blocking/test_sock_connector.cpp
+++ b/examples/Connection/non_blocking/test_sock_connector.cpp
@@ -14,7 +14,7 @@ typedef IPC_Client<PEER_HANDLER, ACE_SOCK_CONNECTOR> IPC_CLIENT;
 // ACE_SOCK Client.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Since this test waits on the STDIN handle to become ready, we
   // have to make sure that the WFMO_Reactor is used on Win32. This is
@@ -27,9 +27,11 @@ main (int argc, char *argv[])
   ACE_Reactor::instance (&reactor);
 # else
   ACE_ERROR_RETURN ((LM_ERROR,
-                     "Non-NT platform (Win95/98?) without Winsock2 installed.\n"
-                     "This example requires WFMO_Reactor which requires.\n"
-                     "Winsock2 be installed.\n"), -1);
+                     ACE_TEXT ("Non-NT platform (Win95/98?) without Winsock2 ")
+                     ACE_TEXT ("installed.\n")
+                     ACE_TEXT ("This example requires WFMO_Reactor which ")
+                     ACE_TEXT ("requires.\n")
+                     ACE_TEXT ("Winsock2 be installed.\n")), -1);
 # endif /*  !ACE_HAS_WINSOCK2 && ACE_HAS_WINSOCK2 != 0 */
 #endif /* ACE_WIN32 */
 
@@ -39,9 +41,7 @@ main (int argc, char *argv[])
   IPC_CLIENT peer_connector;
 
   if (peer_connector.init (argc, argv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("init")),
                       -1);
 
   return peer_connector.svc ();
diff --git a/examples/Connection/non_blocking/test_spipe_acceptor.cpp b/examples/Connection/non_blocking/test_spipe_acceptor.cpp
index 55b0e50ddda..c0d137f626a 100644
--- a/examples/Connection/non_blocking/test_spipe_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_spipe_acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "ace/SPIPE_Acceptor.h"
 #include "ace/SPIPE_Addr.h"
 #include "ace/Service_Config.h"
@@ -15,7 +17,7 @@ typedef Svc_Handler<ACE_SPIPE_STREAM> SVC_HANDLER;
 typedef IPC_Server<SVC_HANDLER, ACE_SPIPE_ACCEPTOR> IPC_SERVER;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Perform Service_Config initializations
   ACE_Service_Config daemon (argv[0]);
@@ -25,8 +27,8 @@ main (int argc, char *argv[])
   if (peer_acceptor.init (argc,
                           argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("init")),
                       -1);
 
   return peer_acceptor.svc ();
@@ -47,7 +49,7 @@ template class Svc_Handler<ACE_SPIPE_STREAM>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "This test is not ported to Win32 (yet)\n"),
diff --git a/examples/Connection/non_blocking/test_spipe_connector.cpp b/examples/Connection/non_blocking/test_spipe_connector.cpp
index c37bb678042..2b777ffe334 100644
--- a/examples/Connection/non_blocking/test_spipe_connector.cpp
+++ b/examples/Connection/non_blocking/test_spipe_connector.cpp
@@ -13,7 +13,7 @@ typedef Peer_Handler<ACE_SPIPE_STREAM> PEER_HANDLER;
 typedef IPC_Client<PEER_HANDLER, ACE_SPIPE_CONNECTOR> IPC_CLIENT;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Perform Service_Config initializations
   ACE_Service_Config daemon (argv[0]);
@@ -22,8 +22,8 @@ main (int argc, char *argv[])
 
   if (peer_connector.init (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("init")),
                       -1);
 
   return peer_connector.svc ();
@@ -47,7 +47,7 @@ template class Peer_Handler<ACE_SPIPE_STREAM>;
 
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "This test is not ported to Win32 (yet)\n"),
diff --git a/examples/Connection/non_blocking/test_tli_acceptor.cpp b/examples/Connection/non_blocking/test_tli_acceptor.cpp
index 7b9c1a2f0e8..5654f62ad74 100644
--- a/examples/Connection/non_blocking/test_tli_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_tli_acceptor.cpp
@@ -47,7 +47,7 @@ template class Svc_Handler<ACE_TLI_STREAM>;
 
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "your platform does not support TLI\n"),
diff --git a/examples/Connection/non_blocking/test_tli_connector.cpp b/examples/Connection/non_blocking/test_tli_connector.cpp
index 5e86e5f75d3..afb2636d7d5 100644
--- a/examples/Connection/non_blocking/test_tli_connector.cpp
+++ b/examples/Connection/non_blocking/test_tli_connector.cpp
@@ -47,7 +47,7 @@ template class Peer_Handler<ACE_TLI_STREAM>;
 
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "your platform does not support TLI\n"),
diff --git a/examples/DLL/DLL.mpc b/examples/DLL/DLL.mpc
index 658c9379279..ca8d0a63009 100644
--- a/examples/DLL/DLL.mpc
+++ b/examples/DLL/DLL.mpc
@@ -14,8 +14,9 @@ project(*Today) : acelib {
 }
 
 project(*Main) : aceexe {
-  after += DLL_Newsweek DLL_Today
+  exename = test_dll
+  after  += DLL_Newsweek DLL_Today
   Source_Files {
     test_dll.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/examples/DLL/Magazine.h b/examples/DLL/Magazine.h
index 4810fb73baa..6555974494f 100644
--- a/examples/DLL/Magazine.h
+++ b/examples/DLL/Magazine.h
@@ -33,7 +33,7 @@ class Magazine
 public:
 
   virtual ~Magazine (void) {};
-  // No-op vitrual destructor.
+  // No-op virtual destructor.
   
   virtual void title (void) = 0;
   // This method gives the title of the magazine.
diff --git a/examples/Export/Export.mpc b/examples/Export/Export.mpc
index 82a1773921d..51edc145591 100644
--- a/examples/Export/Export.mpc
+++ b/examples/Export/Export.mpc
@@ -10,8 +10,9 @@ project(*Lib) : acelib {
 }
 
 project(*test) : aceexe {
-  after += *Lib
-  libs  += Export_Lib
+  exename = test
+  after  += *Lib
+  libs   += Export_Lib
   Source_Files {
     test.cpp
   }
diff --git a/examples/Export/dll.cpp b/examples/Export/dll.cpp
index 3d72333aef8..7e2f969c3fa 100644
--- a/examples/Export/dll.cpp
+++ b/examples/Export/dll.cpp
@@ -26,4 +26,6 @@ get_dll_singleton ()
 template class ACE_Singleton<test_class,ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<test_class,ACE_Null_Mutex>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<test_class, ACE_Null_Mutex> *ACE_Singleton<test_class, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/IOStream/client/iostream_client.cpp b/examples/IOStream/client/iostream_client.cpp
index 1f1ee8882f3..609e335c5d5 100644
--- a/examples/IOStream/client/iostream_client.cpp
+++ b/examples/IOStream/client/iostream_client.cpp
@@ -15,10 +15,10 @@ ACE_RCSID (client,
 // classes, which mimic a C++ iostream.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
-  const char *server_host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
+  const ACE_TCHAR *server_host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
   u_short server_port = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT;
 
   ACE_IOStream<ACE_SOCK_Stream> server;
diff --git a/examples/IOStream/server/iostream_server.cpp b/examples/IOStream/server/iostream_server.cpp
index fa80036a3ab..0fc83436f69 100644
--- a/examples/IOStream/server/iostream_server.cpp
+++ b/examples/IOStream/server/iostream_server.cpp
@@ -86,7 +86,7 @@ typedef ACE_Acceptor<Handler, ACE_SOCK_ACCEPTOR> IOStream_Acceptor;
 #endif /* !ACE_LACKS_ACE_IOSTREAM */
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 {
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
   ACE_Service_Config daemon;
diff --git a/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc b/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
index 746b45466e2..a213dbd8942 100644
--- a/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
+++ b/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc
@@ -2,5 +2,9 @@
 // $Id$
 
 project : aceexe {
+  exename = reader
+  Source_Files {
+    reader.cpp
+  }
 }
 
diff --git a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp
index a13746c3361..a6f81429dc4 100644
--- a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp
+++ b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp
@@ -7,12 +7,11 @@
 
 ACE_RCSID(reader, reader, "$Id$")
 
-int 
-main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (argc < 2)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "usage: %s device-filename\n",
+                       ACE_TEXT ("usage: %s device-filename\n"),
                        argv[0]),
                       1);
 
@@ -22,7 +21,7 @@ main (int argc, char *argv[])
   if (con.connect (read_dev,
                    ACE_DEV_Addr (argv[1])) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
+                       ACE_TEXT ("%p\n"),
                        argv[1]),
                       1);
 
@@ -39,7 +38,7 @@ main (int argc, char *argv[])
   if (read_dev.control (ACE_TTY_IO::SETPARAMS,
                         &myparams) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p control\n",
+                       ACE_TEXT ("%p control\n"),
                        argv[1]),
                       1);
 
@@ -51,12 +50,11 @@ main (int argc, char *argv[])
 
       if (bytes_read == 1)
 	ACE_DEBUG ((LM_DEBUG,
-                    "read: %c\n",
+                    ACE_TEXT ("read: %c\n"),
                     readback));
       else if (bytes_read == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "%p  recv\n",
-
+                             ACE_TEXT ("%p  recv\n"),
                              argv[1]), 1);
     }
 
diff --git a/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc b/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
index 746b45466e2..dc5d3c39ad7 100644
--- a/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
+++ b/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc
@@ -2,5 +2,9 @@
 // $Id$
 
 project : aceexe {
+  exename = writer
+  Source_Files {
+    writer.cpp
+  }
 }
 
diff --git a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
index 1c6bc78d087..b22b40dfe05 100644
--- a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
+++ b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
@@ -6,13 +6,11 @@
 
 ACE_RCSID(writer, writer, "$Id$")
 
-int
-main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (argc < 2)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "usage: %s device-filename\n",
-
+                       ACE_TEXT ("usage: %s device-filename\n"),
                        argv[0]), 1);
 
   ACE_TTY_IO write_dev;
@@ -21,8 +19,7 @@ main (int argc, char *argv[])
   if (con.connect (write_dev,
                    ACE_DEV_Addr (argv[1])) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-
-                       "%p\n",
+                       ACE_TEXT ("%p\n"),
                        argv[1]),
                       1);
 
@@ -39,12 +36,12 @@ main (int argc, char *argv[])
   if (write_dev.control (ACE_TTY_IO::SETPARAMS,
                          &myparams) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "control"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("control")),
                       1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "enter character to send, q terminates :\n"));
+              ACE_TEXT ("enter character to send, q terminates :\n")));
 
   for (char writeto;
        ACE_OS::read (ACE_STDIN, &writeto, 1) != -1;
@@ -56,8 +53,8 @@ main (int argc, char *argv[])
 
       if (bytes_written != 1)
 	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "send"),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("send")),
                           1);
       if (writeto == 'q')
 	break;
@@ -65,8 +62,8 @@ main (int argc, char *argv[])
 
   if (write_dev.close () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "close"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("close")),
                       1);
   return 0;
 }
diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp
index 6b653ba24e5..fc96ec71dbb 100644
--- a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp
+++ b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp
@@ -3,6 +3,9 @@
 #include "ace/FIFO_Recv_Msg.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_stropts.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID(FIFO_SAP, FIFO_Msg_server, "$Id$")
@@ -37,10 +40,10 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 #else
-#include <stdio.h>
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_OS::fprintf (stderr, "This feature is not supported\n");
+  ACE_ERROR ((LM_INFO,
+              ACE_TEXT ("This feature is not supported\n")));
   return 0;
 }
 #endif /* ACE_HAS_STREAM_PIPES */
diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp
index 3b30d0a7612..d6911908658 100644
--- a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp
+++ b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp
@@ -20,7 +20,7 @@ ACE_RCSID(FIFO_SAP, FIFO_test, "$Id$")
 #define EXEC_NAME               "more"
 #define EXEC_COMMAND_ARG        "more"
 
-static const char *FIFO_NAME = "/tmp/fifo";
+static const ACE_TCHAR *FIFO_NAME = ACE_TEXT ("/tmp/fifo");
 
 static int
 do_child (ACE_FIFO_Recv &fifo_reader)
@@ -31,7 +31,7 @@ do_child (ACE_FIFO_Recv &fifo_reader)
     return -1;
 
   char *argv[2];
-  argv[0] = (char *) EXEC_COMMAND_ARG;
+  argv[0] = const_cast<char *> (EXEC_COMMAND_ARG);
   argv[1] = 0;
 
   if (ACE_OS::execvp (EXEC_NAME, argv) == -1)
@@ -40,8 +40,8 @@ do_child (ACE_FIFO_Recv &fifo_reader)
 }
 
 static int
-do_parent (const char fifo_name[],
-	   char input_filename[])
+do_parent (const ACE_TCHAR fifo_name[],
+	   ACE_TCHAR input_filename[])
 {
   ACE_FIFO_Send fifo_sender (fifo_name, O_WRONLY | O_CREAT);
   ssize_t len;
@@ -71,14 +71,14 @@ do_parent (const char fifo_name[],
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
   if (argc != 2)
     {
       ACE_ERROR ((LM_ERROR,
-                  "usage: %n input-file\n",
+                  ACE_TEXT ("usage: %n input-file\n"),
                   1));
       ACE_OS::exit (1);
     }
@@ -94,27 +94,27 @@ main (int argc, char *argv[])
     {
     case -1:
       ACE_ERROR ((LM_ERROR,
-                  "%n: %p\n%a",
-                  "fork",
+                  ACE_TEXT ("%n: %p\n%a"),
+                  ACE_TEXT ("fork"),
                   1));
     case 0:
       if (do_child (fifo_reader) == -1)
         ACE_ERROR ((LM_ERROR,
-                    "%n: %p\n%a",
-                    "do_child",
+                    ACE_TEXT ("%n: %p\n%a"),
+                    ACE_TEXT ("do_child"),
                     1));
     default:
       if (do_parent (FIFO_NAME, argv[1]) == -1)
         ACE_ERROR ((LM_ERROR,
-                    "%n: %p\n%a",
-                    "do_parent",
+                    ACE_TEXT ("%n: %p\n%a"),
+                    ACE_TEXT ("do_parent"),
                     1));
 
       // wait for child to ACE_OS::exit.
       if (ACE_OS::waitpid (child_pid, (ACE_exitcode *) 0, 0) == -1)
         ACE_ERROR ((LM_ERROR,
-                    "%n: %p\n%a",
-                    "waitpid",
+                    ACE_TEXT ("%n: %p\n%a"),
+                    ACE_TEXT ("waitpid"),
                     1));
     }
 
diff --git a/examples/IPC_SAP/FILE_SAP/client.cpp b/examples/IPC_SAP/FILE_SAP/client.cpp
index 531ef6a62c4..f26302f3b57 100644
--- a/examples/IPC_SAP/FILE_SAP/client.cpp
+++ b/examples/IPC_SAP/FILE_SAP/client.cpp
@@ -52,7 +52,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   else
     ACE_OS::printf ("fileinfo : mode = %o\nno of links = %lu\nsize = %lu\n",
                     (u_int) fileinfo.mode_ & 0777,
-                    ACE_static_cast(u_long ,fileinfo.nlink_),
+                    static_cast<u_long > (fileinfo.nlink_),
                     (u_long) fileinfo.size_);
 
   off_t fpos = cli_file.tell ();
diff --git a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
index 724491fdb0a..e4cf8997857 100644
--- a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
@@ -60,7 +60,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   // Establish connection with remote server.
   if (ACE_OS::connect (s_handle,
-		       ACE_reinterpret_cast(sockaddr *, &saddr),
+		       reinterpret_cast<sockaddr *> (&saddr),
                        sizeof saddr) == -1)
     ACE_OS::perror (ACE_TEXT("connect")), ACE_OS::exit (1);
 
diff --git a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
index 3273a306cdc..0a6915cc463 100644
--- a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
@@ -50,7 +50,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   /* Associate address with endpoint */
   if (ACE_OS::bind (s_handle,
-                    ACE_reinterpret_cast(struct sockaddr *, &saddr),
+                    reinterpret_cast<struct sockaddr *> (&saddr),
                     sizeof saddr) == -1)
     ACE_OS::perror (ACE_TEXT("bind")), ACE_OS::exit (1);
 
@@ -72,8 +72,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       do
         n_handle =
           ACE_OS::accept (s_handle,
-                          ACE_reinterpret_cast(struct sockaddr *,
-                                               &cli_addr),
+                          reinterpret_cast<struct sockaddr *> (&cli_addr),
                           &cli_addr_len);
       while (n_handle == ACE_INVALID_HANDLE && errno == EINTR);
 
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index 0f112652030..f681defd2f9 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -275,7 +275,7 @@ Options::oneway_client_test (void *)
   cli_stream.close ();
 
   delete [] request;
-  return ACE_reinterpret_cast (void *, result);
+  return reinterpret_cast<void *> (result);
 }
 
 // Static function entry point to the twoway client service.
@@ -366,7 +366,7 @@ Options::twoway_client_test (void *)
   cli_stream.close ();
 
   delete [] request;
-  return ACE_reinterpret_cast (void *, result);
+  return reinterpret_cast<void *> (result);
 }
 
 ACE_THR_FUNC
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
index 71b568fd9cc..b978bb5f989 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp
@@ -25,14 +25,13 @@ run_server (ACE_THR_FUNC server,
   // Spawn a new thread and run the new connection in that thread of
   // control using the <server> function as the entry point.
   if (ACE_Thread_Manager::instance ()->spawn (server,
-                                              ACE_reinterpret_cast(void *,
-                                                                  handle),
+                                              reinterpret_cast<void *> (handle),
                                               THR_DETACHED) == -1)
     ACE_ERROR ((LM_ERROR,
                 "(%P|%t) %p\n",
                 "spawn"));
 #else
-  (*server) (ACE_reinterpret_cast(void *, handle));
+  (*server) (reinterpret_cast<void *> (handle));
 #endif /* ACE_HAS_THREADS */
 }
 
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp
index 8f60eeff7e5..e7ebe811fd2 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp
@@ -25,21 +25,21 @@ run_client (void)
   ACE_MEM_Addr server_addr (ACE_DEFAULT_SERVER_PORT);
 
   if (connector.connect (stream, server_addr.get_remote_addr ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "connect"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("connect")), -1);
 
   char buf [MAXPATHLEN];
   while (fgets (buf, MAXPATHLEN, stdin) >0)
     {
       stream.send (buf, ACE_OS::strlen (buf)+1);
       stream.recv (buf, MAXPATHLEN);
-      ACE_DEBUG ((LM_DEBUG, "Echo: %s\n", buf));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Echo: %C\n"), buf));
     }
 
   return 0;
 }
 
-int
-main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNUSED_ARG(argc);
   // Initialize the logger.
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp
index 40f228c89da..4ef76e51b38 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp
@@ -59,7 +59,7 @@ run_event_loop (u_short port)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   u_short port = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp
index 12be6a03004..9f3fdec22b9 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp
@@ -6,14 +6,15 @@
 #include "ace/UNIX_Addr.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(SOCK_SAP, CPP_unclient, "$Id$")
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  const char *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
+  const ACE_TCHAR *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
   char buf[BUFSIZ];
 
   ACE_LSOCK_Stream cli_stream;
@@ -23,8 +24,8 @@ main (int argc, char *argv[])
   // Establish the connection with server.
   if (con.connect (cli_stream, remote_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "connect"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("connect")),
                       1);
 
   // Send data to server (correctly handles "incomplete writes").
@@ -34,29 +35,29 @@ main (int argc, char *argv[])
        )
     if (cli_stream.send_n (buf, r_bytes) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "send_n"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("send_n")),
                         1);
 
   // Explicitly close the writer-side of the connection.
   if (cli_stream.close_writer () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "close_writer"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("close_writer")),
                       1);
 
   // Wait for handshake with server.
   if (cli_stream.recv_n (buf, 1) != 1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "recv_n"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("recv_n")),
                       1);
 
   // Close the connection completely.
   if (cli_stream.close () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "close"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("close")),
                       1);
   return 0;
 }
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
index f360eb8f562..cddfe787d92 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
@@ -7,6 +7,7 @@
 #include "ace/LSOCK_Acceptor.h"
 #include "ace/Thread_Manager.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(SOCK_SAP, CPP_unserver, "$Id$")
 
@@ -29,17 +30,17 @@ server (void *arg)
   // Make sure we're not in non-blocking mode.
   if (new_stream.disable (ACE_NONBLOCK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "disable"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("disable")),
                        0);
 
   if (new_stream.get_remote_addr (cli_addr) == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "get_remote_addr"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("get_remote_addr")));
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) client connected from %s\n",
+              ACE_TEXT ("(%P|%t) client connected from %C\n"),
               cli_addr.get_path_name ()));
 
   // Read data from client (terminate on error).
@@ -53,38 +54,38 @@ server (void *arg)
       if (r_bytes == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      "%p\n",
-                      "recv"));
+                      ACE_TEXT ("%p\n"),
+                      ACE_TEXT ("recv")));
           break;
 
         }
       else if (r_bytes == 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) reached end of input, connection closed by client\n"));
+                      ACE_TEXT ("(%P|%t) reached end of input, connection closed by client\n")));
           break;
         }
       else if (verbose && ACE::write_n (ACE_STDOUT, buf, r_bytes) != r_bytes)
         ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "ACE::write_n"));
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("ACE::write_n")));
       else if (new_stream.send_n (buf, r_bytes) != r_bytes)
         ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "send_n"));
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("send_n")));
     }
 
   // Close new endpoint (listening endpoint stays open).
   if (new_stream.close () == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "close"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("close")));
 
   return 0;
 }
 
 static int
-run_event_loop (const char rendezvous[])
+run_event_loop (const ACE_TCHAR rendezvous[])
 {
   ACE_LSOCK_Acceptor peer_acceptor;
 
@@ -97,17 +98,17 @@ run_event_loop (const char rendezvous[])
 
   if (peer_acceptor.open (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       1);
   else if (peer_acceptor.get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_local_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_local_addr")),
                        -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "starting server %s\n",
+              ACE_TEXT ("starting server %C\n"),
               server_addr.get_path_name ()));
 
   // Keep these guys out here to prevent excessive constructor
@@ -123,22 +124,21 @@ run_event_loop (const char rendezvous[])
       if (peer_acceptor.accept (new_stream, 0, &timeout) == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      "%p\n",
-                      "accept"));
+                      ACE_TEXT ("%p\n"),
+                      ACE_TEXT ("accept")));
           continue;
         }
 
 #if defined (ACE_HAS_THREADS)
       if (ACE_Thread_Manager::instance ()->spawn ((ACE_THR_FUNC) server,
-                                                  ACE_reinterpret_cast (void *,
-                                                      new_stream.get_handle ()),
+                                                  reinterpret_cast<void *> (new_stream.get_handle ()),
                                                   THR_DETACHED) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) %p\n",
-                           "spawn"),
+                           ACE_TEXT ("(%P|%t) %p\n"),
+                           ACE_TEXT ("spawn")),
                           1);
 #else
-      server (ACE_reinterpret_cast (void *, new_stream.get_handle ()));
+      server (reinterpret_cast<void *> (new_stream.get_handle ()));
 #endif /* ACE_HAS_THREADS */
     }
 
@@ -146,7 +146,7 @@ run_event_loop (const char rendezvous[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   return run_event_loop (argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS);
 }
diff --git a/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp b/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp
index 85b36906a26..1c21aeb74c0 100644
--- a/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp
@@ -12,10 +12,10 @@ ACE_RCSID(SOCK_SAP, FD_unclient, "$Id$")
 // ACE_LSOCK Client.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  const char *file_name = argc > 1 ? argv[1] : "./local_data";
-  const char *rendezvous = argc > 2 ? argv[2] : ACE_DEFAULT_RENDEZVOUS;
+  const ACE_TCHAR *file_name = argc > 1 ? argv[1] : ACE_TEXT ("./local_data");
+  const ACE_TCHAR *rendezvous = argc > 2 ? argv[2] : ACE_DEFAULT_RENDEZVOUS;
 
   ACE_LSOCK_Stream cli_stream;
   ACE_UNIX_Addr addr (rendezvous);
@@ -24,36 +24,37 @@ main (int argc, char *argv[])
   ACE_LSOCK_Connector connector;
 
   if (connector.connect (cli_stream, addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "connect"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p"), ACE_TEXT ("connect")), -1);
 
   ACE_HANDLE handle = ACE_OS::open (file_name, O_RDONLY);
 
   if (handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p"), ACE_TEXT ("open")), -1);
 
   // Send handle to server (correctly handles incomplete writes).
   if (cli_stream.send_handle (handle) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "send"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p"), ACE_TEXT ("send")), -1);
 
   char buf[BUFSIZ];
   ssize_t n = cli_stream.recv (buf, sizeof buf);
 
   if (n == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "recv"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p"), ACE_TEXT ("recv")), -1);
   else if (n == 0)
-    ACE_DEBUG ((LM_DEBUG, "server shutdown (bug in kernel?)\n"));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("server shutdown (bug in kernel?)\n")));
   else
-    ACE_DEBUG ((LM_DEBUG, "server %*s shutdown\n", n, buf));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("server %*C shutdown\n"), n, buf));
 
   // Explicitly close the connection.
   if (cli_stream.close () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p", "close"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p"), ACE_TEXT ("close")), -1);
 
   return 0;
 }
 #else
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_ERROR_RETURN ((LM_ERROR, "your platform must support sendmsg/recvmsg to run this test\n"), -1);
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     ACE_TEXT ("your platform must support sendmsg/recvmsg to run this test\n")), -1);
 }
 #endif /* ACE_HAS_MSG */
diff --git a/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp b/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp
index 6c710b3ea88..b629b9f0dd8 100644
--- a/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp
@@ -37,7 +37,7 @@ handle_client (ACE_LSOCK_Stream &stream)
        )
     ACE_DEBUG ((LM_DEBUG, "%*s", n, buf));
 
-  ACE_OS::sprintf (buf, "%d", ACE_static_cast (int, ACE_OS::getpid ()));
+  ACE_OS::sprintf (buf, "%d", static_cast<int> (ACE_OS::getpid ()));
 
   ACE_DEBUG ((LM_DEBUG, "(%s, %d) ----------------------------------------\n", buf, ACE_OS::strlen (buf)));
 
@@ -51,9 +51,9 @@ handle_client (ACE_LSOCK_Stream &stream)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  const char *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
+  const ACE_TCHAR *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
   // Create a server.
   ACE_OS::unlink (rendezvous);
   ACE_UNIX_Addr addr (rendezvous);
diff --git a/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
index c6273eedeec..6ea1307c4fb 100644
--- a/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
+++ b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
@@ -50,10 +50,17 @@ project(*FD_unclient) : aceexe {
   }
 }
 
+project(*CPP_unclient) : aceexe {
+  exename = CPP-unclient
+  Source_Files {
+    CPP-unclient.cpp
+  }
+}
+
 project(*CPP_unserver) : aceexe {
-  exename = FD-unserver
+  exename = CPP-unserver
   Source_Files {
-    FD-unserver.cpp
+    CPP-unserver.cpp
   }
 }
 
diff --git a/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp b/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp
index 37cfe02c181..e7c6c5904aa 100644
--- a/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp
@@ -11,9 +11,9 @@
 ACE_RCSID(SPIPE_SAP, NPClient, "$Id$")
 
 #if defined (ACE_WIN32)
-#define MAKE_PIPE_NAME(X) "\\\\.\\pipe\\" X
+#define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\") ACE_TEXT (X)
 #else
-#define MAKE_PIPE_NAME(X) X
+#define MAKE_PIPE_NAME(X) ACE_TEXT (X)
 #endif
 
 const int DEFAULT_SIZE = 8;
@@ -30,7 +30,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                   char[size],
                   1);
 
-  const char *rendezvous = MAKE_PIPE_NAME ("acepipe");
+  const ACE_TCHAR *rendezvous = MAKE_PIPE_NAME ("acepipe");
 
   ACE_SPIPE_Stream cli_stream;
   ACE_SPIPE_Connector con;
@@ -39,7 +39,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (con.connect (cli_stream,
                    ACE_SPIPE_Addr (rendezvous)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
+                       ACE_TEXT ("%p\n"),
                        rendezvous),
                       -1);
 
@@ -49,14 +49,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   for (i = 0; i < iterations; i++)
     if (cli_stream.send (buf, size) != size)
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "putmsg"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("putmsg")),
                         -1);
 
   if (cli_stream.close () == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "close"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("close")),
                         -1);
   return 0;
 }
diff --git a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp
index cb34a10220d..4055a2cc02d 100644
--- a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp
@@ -9,42 +9,41 @@
 ACE_RCSID(SPIPE_SAP, NPServer, "$Id$")
 
 #if defined (ACE_WIN32)
-#define MAKE_PIPE_NAME(X) "\\\\.\\pipe\\" X
+#define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\") ACE_TEXT (X)
 #else
-#define MAKE_PIPE_NAME(X) X
+#define MAKE_PIPE_NAME(X) ACE_TEXT (X)
 #endif
 
 int
-main (int /* argc */, ACE_TCHAR * /* argv */ [])
+ACE_TMAIN (int /* argc */, ACE_TCHAR * /* argv */ [])
 {
   ACE_SPIPE_Acceptor acceptor;
   ACE_SPIPE_Stream new_stream;
   char buf[BUFSIZ];
   int  n;
-  const char *rendezvous = MAKE_PIPE_NAME ("acepipe");
+  const ACE_TCHAR *rendezvous = MAKE_PIPE_NAME ("acepipe");
 
   // Initialize named pipe listener.
 
   if (acceptor.open (ACE_SPIPE_Addr (rendezvous)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-
-                       "open"), 1);
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")), 1);
 
   for (;;)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "waiting for connection\n"));
+                  ACE_TEXT ("waiting for connection\n")));
 
       // Accept a client connection.
       if (acceptor.accept (new_stream, 0) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "accept"),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("accept")),
                           1);
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Accepted connection\n"));
+                  ACE_TEXT ("Accepted connection\n")));
 
       while ((n = new_stream.recv (buf, sizeof buf)) > 0)
 	{
@@ -59,7 +58,7 @@ main (int /* argc */, ACE_TCHAR * /* argv */ [])
       if (n == -1)
 	{
 	  ACE_DEBUG ((LM_DEBUG,
-                      "End of connection. Closing handle\n"));
+                      ACE_TEXT ("End of connection. Closing handle\n")));
 	  new_stream.close ();
 	}
     }
diff --git a/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp b/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp
index 19c41f7cbef..f4dce39685d 100644
--- a/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp
@@ -5,6 +5,8 @@
 #include "ace/SPIPE_Acceptor.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Time_Value.h"
 
 ACE_RCSID(SPIPE_SAP, consumer_msg, "$Id$")
 
diff --git a/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp b/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp
index 95f088eff46..02b69e47604 100644
--- a/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp
@@ -5,6 +5,8 @@
 #include "ace/SPIPE_Acceptor.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Time_Value.h"
 
 ACE_RCSID(SPIPE_SAP, consumer_read, "$Id$")
 
diff --git a/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp b/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp
index e663aa7f84f..619a44f1e71 100644
--- a/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp
@@ -1,10 +1,14 @@
 // $Id$
 
 #include "ace/OS_main.h"
+#include "ace/OS_Memory.h"
 #include "ace/SPIPE_Addr.h"
 #include "ace/SPIPE_Connector.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Time_Value.h"
 
 ACE_RCSID(SPIPE_SAP, producer_msg, "$Id$")
 
diff --git a/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp b/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp
index 03aa5ea244a..f04f7961818 100644
--- a/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp
@@ -4,6 +4,8 @@
 #include "ace/SPIPE_Addr.h"
 #include "ace/SPIPE_Connector.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdlib.h"
+
 
 ACE_RCSID(SPIPE_SAP, producer_read, "$Id$")
 
diff --git a/examples/IPC_SAP/SPIPE_SAP/server.cpp b/examples/IPC_SAP/SPIPE_SAP/server.cpp
index f2f5ef12a01..b5129916e23 100644
--- a/examples/IPC_SAP/SPIPE_SAP/server.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/server.cpp
@@ -6,6 +6,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_poll.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(SPIPE_SAP, server, "$Id$")
 
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
index fb83f31308c..d647b910274 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
@@ -28,13 +28,13 @@ Options::Options (void)
   : host_ (ACE_DEFAULT_SERVER_HOST),
     port_ (ACE_DEFAULT_SERVER_PORT),
     sleep_time_ (0, 0), // By default, don't sleep between calls.
-    quit_string_ ("q"),
     message_len_ (0),
     message_buf_ (0),
     io_source_ (ACE_INVALID_HANDLE), // Defaults to using the generator.
     iterations_ (10000),
     oneway_ (1) // Make oneway calls the default.
 {
+  ACE_OS::strcpy (quit_string_, "q");
 }
 
 Options::~Options (void)
@@ -103,9 +103,9 @@ Options::read (void *buf, size_t len, size_t &iteration)
 }
 
 int
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, "2h:i:m:p:q:sT:", 1);
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:sT:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -126,7 +126,9 @@ Options::parse_args (int argc, char *argv[])
         this->port_ = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 'q':
-        this->quit_string_ = getopt.opt_arg ();
+        ACE_OS::strncpy (this->quit_string_,
+                         ACE_TEXT_ALWAYS_CHAR (getopt.opt_arg ()),
+                         QUIT_STRING_SIZE);
         break;
       case 's':
         this->io_source_ = ACE_STDIN;
@@ -136,10 +138,10 @@ Options::parse_args (int argc, char *argv[])
         break;
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) usage: %n [-2] [-h <host>] "
-                           "[-i iterations] [-m message-size] "
-                           "[-p <port>] [-q <quit string>] "
-                           "[-s] [-T <sleep_time>]\n"),
+                           ACE_TEXT ("(%P|%t) usage: %n [-2] [-h <host>] ")
+                           ACE_TEXT ("[-i iterations] [-m message-size] ")
+                           ACE_TEXT ("[-p <port>] [-q <quit string>] ")
+                           ACE_TEXT ("[-s] [-T <sleep_time>]\n")),
                           -1);
       }
 
@@ -152,7 +154,7 @@ Options::port (void) const
   return this->port_;
 }
 
-const char *
+const ACE_TCHAR *
 Options::host (void) const
 {
   return this->host_;
@@ -181,12 +183,12 @@ Options::shared_client_test (u_short port,
   if (con.connect (cli_stream,
                    remote_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "connection failed"),
+                       ACE_TEXT ("(%P|%t) %p\n"),
+                       ACE_TEXT ("connection failed")),
                       0);
   else
     ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) connected to %s at port %d\n",
+                ACE_TEXT ("(%P|%t) connected to %C at port %d\n"),
                 remote_addr.get_host_name (),
                 remote_addr.get_port_number ()));
 
@@ -196,7 +198,7 @@ Options::shared_client_test (u_short port,
                   0);
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) waiting...\n"));
+              ACE_TEXT ("(%P|%t) waiting...\n")));
 
   return buf;
 }
@@ -222,7 +224,7 @@ Options::oneway_client_test (void)
   ACE_INT32 len = this->message_len ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) starting oneway transmission\n"));
+              ACE_TEXT ("(%P|%t) starting oneway transmission\n")));
 
   // Perform oneway transmission of data to server (correctly handles
   // "incomplete writes").
@@ -238,8 +240,8 @@ Options::oneway_client_test (void)
     else if (cli_stream.send_n (request, r_bytes) == -1)
       {
         ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) %p\n",
-                    "send_n"));
+                    ACE_TEXT ("(%P|%t) %p\n"),
+                    ACE_TEXT ("send_n")));
         result = -1;
         break;
       }
@@ -275,7 +277,7 @@ Options::twoway_client_test (void)
   ACE_INT32 len = this->message_len ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) starting twoway transmission\n"));
+              ACE_TEXT ("(%P|%t) starting twoway transmission\n")));
 
   // Perform twoway transmission of data to server (correctly handles
   // "incomplete writes").
@@ -301,8 +303,8 @@ Options::twoway_client_test (void)
         if (cli_stream.send_n (request, r_bytes) == -1)
           {
             ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) %p\n",
-                        "send_n"));
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("send_n")));
             result = -1;
             break;
           }
@@ -311,8 +313,8 @@ Options::twoway_client_test (void)
         else if (cli_stream.recv (request, r_bytes) <= 0)
           {
             ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) %p\n",
-                        "recv"));
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("recv")));
             result = -1;
             break;
           }
@@ -359,7 +361,7 @@ run_client (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Initialize the logger.
   ACE_LOG_MSG->open (argv[0]);
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h
index d044b7262e5..4ec6b815a4c 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h
@@ -21,7 +21,7 @@ public:
   ~Options (void);
   // Destructor.
 
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the command-line arguments.
 
   const ACE_Time_Value &sleep_time (void) const;
@@ -31,7 +31,7 @@ public:
   u_short port (void) const;
   // Port of the server.
 
-  const char *host (void) const;
+  const ACE_TCHAR *host (void) const;
   // Host of the server.
 
   const char *quit_string (void) const;
@@ -65,7 +65,7 @@ private:
   void oneway_client_test (void);
   // Performs the oneway test.
 
-  const char *host_;
+  const ACE_TCHAR *host_;
   // Host of the server.
 
   u_short port_;
@@ -74,7 +74,8 @@ private:
   ACE_Time_Value sleep_time_;
   // Sleep_Time value.
 
-  const char *quit_string_;
+  enum {QUIT_STRING_SIZE = 128};
+  char quit_string_[QUIT_STRING_SIZE];
   // String that shuts down the client/server.
 
   size_t message_len_;
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
index 5301c03ccff..6539de3b500 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
@@ -25,7 +25,6 @@ Options::Options (void)
     port_ (ACE_DEFAULT_SERVER_PORT),
     sleep_time_ (0, 0), // By default, don't sleep between calls.
     threads_ (10),
-    quit_string_ ("q"),
     message_len_ (0),
     message_buf_ (0),
     io_source_ (ACE_INVALID_HANDLE), // Defaults to using the generator.
@@ -35,6 +34,7 @@ Options::Options (void)
     , barrier_ (0)
 #endif /* ACE_MT_SAFE */
 {
+  ACE_OS::strcpy (quit_string_, "q");
 }
 
 Options::~Options (void)
@@ -108,9 +108,9 @@ Options::read (void *buf, size_t len, size_t &iteration)
 }
 
 int
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, "2h:i:m:p:q:st:T:", 1);
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:st:T:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -131,7 +131,9 @@ Options::parse_args (int argc, char *argv[])
         this->port_ = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 'q':
-        this->quit_string_ = getopt.opt_arg ();
+        ACE_OS::strncpy (this->quit_string_,
+                         ACE_TEXT_ALWAYS_CHAR (getopt.opt_arg ()),
+                         QUIT_STRING_SIZE);
         break;
       case 's':
         this->io_source_ = ACE_STDIN;
@@ -144,10 +146,10 @@ Options::parse_args (int argc, char *argv[])
         break;
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) usage: %n [-2] [-h <host>] "
-                           "[-i iterations] [-m message-size] "
-                           "[-p <port>] [-q <quit string>] "
-                           "[-s] [-t <threads>] [-T <sleep_time>]\n"),
+                           ACE_TEXT ("(%P|%t) usage: %n [-2] [-h <host>] ")
+                           ACE_TEXT ("[-i iterations] [-m message-size] ")
+                           ACE_TEXT ("[-p <port>] [-q <quit string>] ")
+                           ACE_TEXT ("[-s] [-t <threads>] [-T <sleep_time>]\n")),
                           -1);
       }
 
@@ -160,7 +162,7 @@ Options::port (void) const
   return this->port_;
 }
 
-const char *
+const ACE_TCHAR *
 Options::host (void) const
 {
   return this->host_;
@@ -195,12 +197,12 @@ Options::shared_client_test (u_short port,
   if (con.connect (cli_stream,
                    remote_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "connection failed"),
+                       ACE_TEXT ("(%P|%t) %p\n"),
+                       ACE_TEXT ("connection failed")),
                       0);
   else
     ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) connected to %s at port %d\n",
+                ACE_TEXT ("(%P|%t) connected to %C at port %d\n"),
                 remote_addr.get_host_name (),
                 remote_addr.get_port_number ()));
 
@@ -211,7 +213,7 @@ Options::shared_client_test (u_short port,
                   0);
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) waiting...\n"));
+              ACE_TEXT ("(%P|%t) waiting...\n")));
 
   // Wait for all other threads to finish initialization.
   ACE_MT (this->barrier_->wait ());
@@ -236,11 +238,11 @@ Options::oneway_client_test (void *)
   size_t iteration = 0;
 
   // Keep track of return value.
-  int result = 0;
+  size_t result = 0;
   ACE_INT32 len = options->message_len ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) starting oneway transmission\n"));
+              ACE_TEXT ("(%P|%t) starting oneway transmission\n")));
 
   // Perform oneway transmission of data to server (correctly handles
   // "incomplete writes").
@@ -256,9 +258,9 @@ Options::oneway_client_test (void *)
     else if (cli_stream.send_n (request, r_bytes) == -1)
       {
         ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) %p\n",
-                    "send_n"));
-        result = -1;
+                    ACE_TEXT ("(%P|%t) %p\n"),
+                    ACE_TEXT ("send_n")));
+        result = size_t (-1);
         break;
       }
 
@@ -288,7 +290,7 @@ Options::twoway_client_test (void *)
   size_t iteration = 0;
 
   // Keep track of return value.
-  int result = 0;
+  size_t result = 0;
 
   // Timer business.
   ACE_High_Res_Timer timer;
@@ -296,7 +298,7 @@ Options::twoway_client_test (void *)
   ACE_INT32 len = options->message_len ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) starting twoway transmission\n"));
+              ACE_TEXT ("(%P|%t) starting twoway transmission\n")));
 
   // Perform twoway transmission of data to server (correctly handles
   // "incomplete writes").
@@ -322,9 +324,9 @@ Options::twoway_client_test (void *)
         if (cli_stream.send_n (request, r_bytes) == -1)
           {
             ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) %p\n",
-                        "send_n"));
-            result = -1;
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("send_n")));
+            result = size_t (-1);
             break;
           }
         // Receive the reply from the server.  Normally, it just sends
@@ -332,9 +334,9 @@ Options::twoway_client_test (void *)
         else if (cli_stream.recv (request, r_bytes) <= 0)
           {
             ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) %p\n",
-                        "recv"));
-            result = -1;
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("recv")));
+            result = size_t (-1);
             break;
           }
 
@@ -383,8 +385,8 @@ run_client (void)
            OPTIONS::instance ()->threads (),
            OPTIONS::instance ()->thr_func ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "spawn_n"),
+                       ACE_TEXT ("(%P|%t) %p\n"),
+                       ACE_TEXT ("spawn_n")),
                       1);
   else
     ACE_Thread_Manager::instance ()->wait ();
@@ -395,7 +397,7 @@ run_client (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_SSL_Context *context = ACE_SSL_Context::instance ();
 
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.h b/examples/IPC_SAP/SSL_SAP/SSL-client.h
index 6f68f6e760a..af081004368 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client.h
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client.h
@@ -23,7 +23,7 @@ public:
   ~Options (void);
   // Destructor.
 
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the command-line arguments.
 
   const ACE_Time_Value &sleep_time (void) const;
@@ -33,7 +33,7 @@ public:
   u_short port (void) const;
   // Port of the server.
 
-  const char *host (void) const;
+  const ACE_TCHAR *host (void) const;
   // Host of the server.
 
   size_t threads (void) const;
@@ -71,7 +71,7 @@ private:
   static void *oneway_client_test (void *);
   // Performs the oneway test.
 
-  const char *host_;
+  const ACE_TCHAR *host_;
   // Host of the server.
 
   u_short port_;
@@ -83,7 +83,8 @@ private:
   size_t threads_;
   // Number of threads.
 
-  const char *quit_string_;
+  enum {QUIT_STRING_SIZE = 128};
+  char quit_string_[QUIT_STRING_SIZE];
   // String that shuts down the client/server.
 
   size_t message_len_;
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
index 9d41b68c4f5..b749c45f7f1 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
@@ -171,9 +171,9 @@ Options::Options (void)
 }
 
 int
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, "p:r:v", 1);
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("p:r:v"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -189,7 +189,7 @@ Options::parse_args (int argc, char *argv[])
         break;
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) usage: %n [-p <port>] [-v]"),
+                           ACE_TEXT ("(%P|%t) usage: %n [-p <port>] [-v]")),
                           -1);
       }
 
@@ -215,12 +215,12 @@ Handler::open (void *)
   // Make sure we're not in non-blocking mode.
   if (this->ssl_stream_-> disable (ACE_NONBLOCK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "disable"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("disable")),
                        0);
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) client %s connected from %d \n",
+              ACE_TEXT ("(%P|%t) client %C connected from %d \n"),
               cli_addr.get_host_name (),
               cli_addr.get_port_number ()));
 
@@ -231,7 +231,7 @@ int
 Handler::close (u_long)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) closing down %x\n",
+              ACE_TEXT ("(%P|%t) closing down %@\n"),
               this));
 
   delete this->ssl_stream_;
@@ -265,13 +265,13 @@ Handler::parse_header_and_allocate_buffer (char *&request,
   if (result == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) connected closed\n"));
+                  ACE_TEXT ("(%P|%t) connected closed\n")));
       return -1;
     }
   else if (result == -1 || result != sizeof (ACE_INT32))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "recv_n failed"),
+                       ACE_TEXT ("(%P|%t) %p\n"),
+                       ACE_TEXT ("recv_n failed")),
                       -1);
   else
     {
@@ -319,15 +319,15 @@ Twoway_Handler::run (void)
       if (r_bytes == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      "%p\n",
-                      "recv"));
+                      ACE_TEXT ("%p\n"),
+                      ACE_TEXT ("recv")));
           break;
         }
       else if (r_bytes == 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) reached end of input, connection closed "
-                      "by client\n"));
+                      ACE_TEXT ("(%P|%t) reached end of input, connection ")
+                      ACE_TEXT ("closed by client\n")));
           break;
         }
       else if (OPTIONS::instance ()->verbose ()
@@ -335,8 +335,8 @@ Twoway_Handler::run (void)
                                 request,
                                 r_bytes) != r_bytes)
         ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "ACE::write_n"));
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("ACE::write_n")));
       else
         {
           ssize_t s_bytes =
@@ -349,8 +349,8 @@ Twoway_Handler::run (void)
           if (this->ssl_stream_ -> send_n (request,
                                            s_bytes) != s_bytes)
             ACE_ERROR ((LM_ERROR,
-                        "%p\n",
-                        "send_n"));
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("send_n")));
         }
       this->total_bytes_ += size_t (r_bytes);
       this->message_count_++;
@@ -413,15 +413,15 @@ Oneway_Handler::run (void)
       if (r_bytes == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      "%p\n",
-                      "recv"));
+                      ACE_TEXT ("%p\n"),
+                      ACE_TEXT ("recv")));
           break;
         }
       else if (r_bytes == 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) reached end of input, connection closed "
-                      "by client\n"));
+                      ACE_TEXT ("(%P|%t) reached end of input, connection ")
+                      ACE_TEXT ("closed by client\n")));
           break;
         }
       else if (OPTIONS::instance ()->verbose ()
@@ -429,8 +429,8 @@ Oneway_Handler::run (void)
                                 request,
                                 r_bytes) != r_bytes)
         ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "ACE::write_n"));
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("ACE::write_n")));
 
       this->total_bytes_ += size_t (r_bytes);
       this->message_count_++;
@@ -470,17 +470,17 @@ Handler_Factory::init_acceptors (void)
   if (this->twoway_acceptor_.open (twoway_server_addr, 1) == -1
       || this->oneway_acceptor_.open (oneway_server_addr, 1) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       -1);
   else if (this->twoway_acceptor_.get_local_addr (twoway_server_addr) == -1
            || this->oneway_acceptor_.get_local_addr (oneway_server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_local_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_local_addr")),
                       -1);
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) starting twoway server at port %d and oneway server at port %d\n",
+              ACE_TEXT ("(%P|%t) starting twoway server at port %d and oneway server at port %d\n"),
               twoway_server_addr.get_port_number (),
               oneway_server_addr.get_port_number ()));
   return 0;
@@ -498,8 +498,8 @@ Handler_Factory::create_handler (
 
   if (acceptor.accept (*new_stream) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "accept"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("accept")),
                        -1);
 
   Handler *handler;
@@ -509,7 +509,7 @@ Handler_Factory::create_handler (
                         -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) spawning %s handler\n",
+              ACE_TEXT ("(%P|%t) spawning %s handler\n"),
               handler_type));
 
   if (handler->open () == -1)
@@ -565,11 +565,11 @@ Handler_Factory::handle_events (void)
                         timeout);
       if (result == -1)
         ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) %p\n",
-                    "select"));
+                    ACE_TEXT ("(%P|%t) %p\n"),
+                    ACE_TEXT ("select")));
       else if (result == 0 && OPTIONS::instance ()->verbose ())
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) select timed out\n"));
+                    ACE_TEXT ("(%P|%t) select timed out\n")));
       else
         {
           if (FD_ISSET (this->twoway_acceptor_.get_handle (),
@@ -589,7 +589,7 @@ Handler_Factory::handle_events (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   ACE_SSL_Context *context = ACE_SSL_Context::instance ();
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h
index 295875ca153..fed1b513f90 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h
@@ -18,7 +18,7 @@ public:
   ~Options (void);
   // Destructor.
 
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the command-line arguments.
 
   int verbose (void) const;
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
index 0ea8d549750..6990763a8b0 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ace/TLI_Connector.h"
-#include "ace/ATM_QoS.h"                              
+#include "ace/ATM_QoS.h"
 #include "ace/ATM_Addr.h"
 #include "ace/Log_Msg.h"
 
@@ -11,10 +11,10 @@ ACE_RCSID(TLI_SAP, CPP_ATM_client, "$Id$")
 
 /* ACE_XTI/ATM Client */
 
-int main (int argc, char *argv[])                       
+int main (int argc, char *argv[])
 {
   if (argc < 2)
-    ACE_ERROR_RETURN ((LM_ERROR, 
+    ACE_ERROR_RETURN ((LM_ERROR,
                        "Usage: %s [-s selector] hostname [QoS in KB/sec]\n",
                        argv[0]),
                       1);
@@ -73,7 +73,7 @@ int main (int argc, char *argv[])
 
   // Initiate timed, non-blocking connection with server.
   ACE_TLI_Connector con;
-                                                        
+
   // Construct QoS options - currently FORE only supports bandwidth
   ACE_ATM_QoS qos;
   qos.set_rate(cli_stream.get_handle (),
@@ -93,7 +93,7 @@ int main (int argc, char *argv[])
   // Not sure why but reuse_addr set to true/1 causes problems for
   // FORE/XTI/ATM - this is now handled in ACE_TLI_Connector::connect()
   if (con.connect (cli_stream,
-                   remote_addr, 
+                   remote_addr,
                    (ACE_Time_Value *) &ACE_Time_Value::zero,
                    local_addr,
                    1,
@@ -127,14 +127,14 @@ int main (int argc, char *argv[])
                           1);
       else
 	ACE_DEBUG ((LM_DEBUG,
-                    "connected to %s\n", 
+                    "connected to %s\n",
 		    remote_addr.addr_to_string ()));
     }
 
   // Send data to server (correctly handles "incomplete writes").
-  
+
   for (int r_bytes;
-       (r_bytes = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0; 
+       (r_bytes = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0;
        )
     if (cli_stream.send_n (buf,
                            r_bytes,
@@ -145,17 +145,17 @@ int main (int argc, char *argv[])
                         1);
 
   // Explicitly close the connection.
-  if (cli_stream.close () == -1) 
+  if (cli_stream.close () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "close"),
                       -1);
   return 0;
-}                                                       
+}
 #else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_ERROR_RETURN ((LM_ERROR, 
+  ACE_ERROR_RETURN ((LM_ERROR,
 		     "your platform isn't configured to support XTI/ATM\n"),
                     1);
 }
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
index 9be86342ce1..d4d3dec813c 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
@@ -1,15 +1,15 @@
 // $Id$
 
-#include "ace/TLI_Acceptor.h"                             
+#include "ace/TLI_Acceptor.h"
 #include "ace/ATM_Addr.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID(TLI_SAP, CPP_ATM_server, "$Id$")
 
 #if defined (ACE_HAS_FORE_ATM_XTI)
-// ACE_TLI Server 
+// ACE_TLI Server
 
-int 
+int
 main (int argc, char *argv[])
 {
   ACE_Time_Value timeout (ACE_DEFAULT_TIMEOUT);
@@ -33,12 +33,12 @@ main (int argc, char *argv[])
       } // switch
     } // while getopt
 
-  // Create a server address. 
+  // Create a server address.
   ACE_ATM_Addr addr;
   if (selector_specified)
     addr.set_selector(selector);
 
-  // Create a server, reuse the addr. 
+  // Create a server, reuse the addr.
   ACE_TLI_Acceptor peer_acceptor;
 
   // Not sure why but reuse_addr set to true/1 causes problems for
@@ -54,22 +54,22 @@ main (int argc, char *argv[])
                        "open"),
                       -1);
 
-  ACE_TLI_Stream new_stream;                                   
+  ACE_TLI_Stream new_stream;
 
   ACE_DEBUG ((LM_DEBUG,
-              "starting server at address %s\n", 
+              "starting server at address %s\n",
               addr.addr_to_string ()));
 
 
-  // Performs the iterative server activities 
+  // Performs the iterative server activities
 
-  for (;;) 
+  for (;;)
     {
-      char buf[BUFSIZ];                                          
+      char buf[BUFSIZ];
 
       // Create a new ACE_TLI_Stream endpoint (note automatic restart
       // if errno == EINTR).
-      if (peer_acceptor.accept (new_stream, 
+      if (peer_acceptor.accept (new_stream,
 				&addr,
                                 &timeout) == -1)
 	{
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
                       "%p\n",
                       "accept"));
 	  continue;
-	}          
+	}
 
       ACE_DEBUG ((LM_DEBUG,
                   "client %s connected\n",
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
 
       // Read data from client (terminate on error).
 
-      for (int r_bytes; 
+      for (int r_bytes;
 	   (r_bytes = new_stream.recv (buf, sizeof buf, 0)) > 0; )
         if (ACE_OS::write (ACE_STDOUT,
                            buf,
@@ -95,7 +95,7 @@ main (int argc, char *argv[])
                       "ACE::send_n"));
 
 	// Close new endpoint (listening endpoint stays open).
-      if (new_stream.close () == -1) 
+      if (new_stream.close () == -1)
 	ACE_ERROR ((LM_ERROR,
                     "%p\n",
                     "close"));
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
   return 0;
 }
 #else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "your platform isn't configured to support XTI/ATM\n"),
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
index fe6c1ff09ba..b027315ef26 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
@@ -13,7 +13,7 @@ ACE_RCSID(TLI_SAP, CPP_client, "$Id$")
 
 /* ACE_TLI Client */
 
-int main (int argc, char *argv[])                       
+int main (int argc, char *argv[])
 {
   const char *host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
   u_short r_port = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT;
@@ -32,10 +32,10 @@ int main (int argc, char *argv[])
 
   // Initiate timed, non-blocking connection with server.
   ACE_TLI_Connector con;
-                                                        
+
   if (con.connect (cli_stream,
-                   remote_addr, 
-                   (ACE_Time_Value *) &ACE_Time_Value::zero, 
+                   remote_addr,
+                   (ACE_Time_Value *) &ACE_Time_Value::zero,
                    local_addr,
                    1) == -1)
     {
@@ -61,14 +61,14 @@ int main (int argc, char *argv[])
                           1);
       else
 	ACE_DEBUG ((LM_DEBUG,
-                    "connected to %s\n", 
+                    "connected to %s\n",
 		    remote_addr.get_host_name ()));
     }
 
   // Send data to server (correctly handles "incomplete writes").
-  
+
   for (int r_bytes;
-       (r_bytes = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0; 
+       (r_bytes = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0;
        )
     if (cli_stream.send_n (buf,
                            r_bytes,
@@ -79,17 +79,17 @@ int main (int argc, char *argv[])
                         1);
 
   // Explicitly close the connection.
-  if (cli_stream.close () == -1) 
+  if (cli_stream.close () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "close"),
                       -1);
   return 0;
-}                                                       
+}
 #else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_ERROR_RETURN ((LM_ERROR, 
+  ACE_ERROR_RETURN ((LM_ERROR,
 		     "your platform isn't configured to support TLI\n"),
                     1);
 }
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
index 8f8fdda9efe..4ed8c0bf643 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
@@ -8,18 +8,18 @@
 ACE_RCSID(TLI_SAP, CPP_server, "$Id$")
 
 #if defined (ACE_HAS_TLI)
-// ACE_TLI Server 
+// ACE_TLI Server
 
-int 
+int
 main (int argc, char *argv[])
 {
   u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT;
   ACE_Time_Value timeout (argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_TIMEOUT);
 
-  // Create a server address. 
+  // Create a server address.
   ACE_INET_Addr addr (port);
 
-  // Create a server, reuse the addr. 
+  // Create a server, reuse the addr.
   ACE_TLI_Acceptor peer_acceptor;
 
   // Not sure why but reuse_addr set to true/1 causes problems for
@@ -30,21 +30,21 @@ main (int argc, char *argv[])
                        "open"),
                       -1);
 
-  ACE_TLI_Stream new_stream;                                   
+  ACE_TLI_Stream new_stream;
 
   ACE_DEBUG ((LM_DEBUG,
-              "starting server at host %s\n", 
+              "starting server at host %s\n",
               addr.get_host_name ()));
 
-  // Performs the iterative server activities 
+  // Performs the iterative server activities
 
-  for (;;) 
+  for (;;)
     {
-      char buf[BUFSIZ];                                          
-                                                                     
+      char buf[BUFSIZ];
+
       // Create a new ACE_TLI_Stream endpoint (note automatic restart
       // if errno == EINTR).
-      if (peer_acceptor.accept (new_stream, 
+      if (peer_acceptor.accept (new_stream,
 				&addr,
                                 &timeout) == -1)
 	{
@@ -52,15 +52,15 @@ main (int argc, char *argv[])
                       "%p\n",
                       "accept"));
 	  continue;
-	}          
-                                                                 
+	}
+
       ACE_DEBUG ((LM_DEBUG,
                   "client %s connected\n",
                   addr.get_host_name ()));
 
       // Read data from client (terminate on error).
 
-      for (int r_bytes; 
+      for (int r_bytes;
 	   (r_bytes = new_stream.recv (buf, sizeof buf)) > 0; )
         if (ACE_OS::write (ACE_STDOUT,
                            buf,
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
                       "ACE::send_n"));
 
 	// Close new endpoint (listening endpoint stays open).
-      if (new_stream.close () == -1) 
+      if (new_stream.close () == -1)
 	ACE_ERROR ((LM_ERROR,
                     "%p\n",
                     "close"));
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
   return 0;
 }
 #else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "your platform isn't configured to support TLI\n"),
diff --git a/examples/IPC_SAP/TLI_SAP/db-client.cpp b/examples/IPC_SAP/TLI_SAP/db-client.cpp
index 168c5beb1af..51858b5f0cc 100644
--- a/examples/IPC_SAP/TLI_SAP/db-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/db-client.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(TLI_SAP, db_client, "$Id$")
 
 #if defined (ACE_HAS_TLI)
 const int MAXLINE = 255;
-  
+
 int
 main (int argc, char *argv[])
 {
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
   return 0;
 }
 #else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "your platform isn't configured to support TLI\n"),
diff --git a/examples/IPC_SAP/TLI_SAP/db-server.cpp b/examples/IPC_SAP/TLI_SAP/db-server.cpp
index 903214ab46d..145c4a13ad0 100644
--- a/examples/IPC_SAP/TLI_SAP/db-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/db-server.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-// Simple multi-threaded database server example. 
+// Simple multi-threaded database server example.
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/TLI_Acceptor.h"
@@ -10,7 +10,7 @@ ACE_RCSID(TLI_SAP, db_server, "$Id$")
 
 #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_TLI)
 
-// Global thread manager. 
+// Global thread manager.
 ACE_Thread_Manager thr_mgr;
 
 void *
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
 }
 #else
 #include <stdio.h>
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "platform isn't configured to support TLI\n"),
diff --git a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
index e3d070c543d..f12da575039 100644
--- a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   return 0;
 }
 #else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "your platform isn't configured to support TLI\n"),
diff --git a/examples/IPC_SAP/TLI_SAP/ftp-server.cpp b/examples/IPC_SAP/TLI_SAP/ftp-server.cpp
index 6d6493645b9..23596a84dd4 100644
--- a/examples/IPC_SAP/TLI_SAP/ftp-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/ftp-server.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-// Simple file transfer example 
+// Simple file transfer example
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/Thread_Manager.h"
@@ -74,7 +74,7 @@ main (int argc, char *argv[])
 }
 #else
 #include <stdio.h>
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "your platform isn't configured to support TLI\n"),
diff --git a/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp b/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp
index 4354bde10c4..18899d5611c 100644
--- a/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp
+++ b/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp
@@ -35,7 +35,7 @@ MFC_Log::log (ACE_Log_Record& log_record)
                    log_record.msg_data());
 
 #if defined (ACE_WIN32)
-  ::OutputDebugString(Message);
+  ACE_TEXT_OutputDebugString(Message);
 #endif /* ACE_WIN32 */
 }
 
diff --git a/examples/Log_Msg/test_log_msg.cpp b/examples/Log_Msg/test_log_msg.cpp
index 9ebbe148d02..910f0f066a7 100644
--- a/examples/Log_Msg/test_log_msg.cpp
+++ b/examples/Log_Msg/test_log_msg.cpp
@@ -94,6 +94,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                   "hello",
                   10000));
 
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
+
       ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
       ACE_LOG_MSG->msg_ostream (&cout);
 
@@ -138,6 +140,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                   "world",
                   10000 * counter++));
 
+#endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
+
       static int array[] = {1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048};
 
       // Print out the binary bytes of the array in hex form.
diff --git a/examples/Logger/Acceptor-server/Logger_Acceptor_Server.mpc b/examples/Logger/Acceptor-server/Logger_Acceptor_Server.mpc
index ca6b8ee6622..1e4d8240e38 100644
--- a/examples/Logger/Acceptor-server/Logger_Acceptor_Server.mpc
+++ b/examples/Logger/Acceptor-server/Logger_Acceptor_Server.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : aceexe {
+  exename = server_loggerd
 }
\ No newline at end of file
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index 434428d4909..159bcdf93ce 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -1,4 +1,5 @@
 // $Id$
+// server_loggerd.cpp,v 4.29 2003/12/30 23:18:59 shuston Exp
 
 // This server daemon collects, formats, and displays logging
 // information forwarded from client daemons running on other hosts in
@@ -37,11 +38,11 @@ Options::port (void)
 // Parse the command-line options.
 
 void
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   this->port_ = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_Get_Opt get_opt (argc, argv, "p:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
@@ -89,7 +90,8 @@ Logging_Handler::handle_timeout (const ACE_Time_Value &,
 #endif /* ACE_NDEBUG */
 
   ACE_ASSERT (arg == this);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) handling timeout from this = %u\n", this));
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%P|%t) handling timeout from this = %@\n"), this));
   return 0;
 }
 
@@ -110,12 +112,12 @@ Logging_Handler::handle_input (ACE_HANDLE)
   switch (n)
     {
     case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
-                         "client logger", this->peer_name_), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
+                         ACE_TEXT ("client logger"), this->peer_name_), -1);
       /* NOTREACHED */
     case 0:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) closing log daemon at host %s (fd = %d)\n",
+                         ACE_TEXT ("(%P|%t) closing log daemon at host %C (fd = %d)\n"),
                          this->peer_name_, this->get_handle ()), -1);
       /* NOTREACHED */
     case sizeof (size_t):
@@ -126,25 +128,30 @@ Logging_Handler::handle_input (ACE_HANDLE)
         n = this->peer ().recv_n ((void *) &lp, len);
 
         if (n != len)
-          ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
-                             "client logger", this->peer_name_), -1);
+          ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
+                             ACE_TEXT ("client logger"), this->peer_name_),-1);
         /* NOTREACHED */
 
         lp.decode ();
 
         if (lp.length () == n)
           {
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) "));
-            lp.print (this->peer_name_, 1, cerr);
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ")));
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
+            lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->peer_name_), 1, cerr);
+#else
+            lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->peer_name_), 1, stderr);
+#endif
           }
         else
-          ACE_ERROR ((LM_ERROR, "(%P|%t) error, lp.length = %d, n = %d\n",
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) error, lp.length = %d, n = %d\n"),
                       lp.length (), n));
         break;
       }
     default:
-      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
-                         "client logger", this->peer_name_), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
+                         ACE_TEXT ("client logger"), this->peer_name_), -1);
       /* NOTREACHED */
     }
 
@@ -166,23 +173,26 @@ Logging_Handler::open (void *)
 
       if (REACTOR::instance ()->register_handler (this, READ_MASK) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) can't register with reactor\n"), -1);
+                           ACE_TEXT ("(%P|%t) can't register with reactor\n")),
+                          -1);
       else if (REACTOR::instance ()->schedule_timer
                (this,
                 (const void *) this,
                 ACE_Time_Value (2),
                 ACE_Time_Value (2)) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "can'(%P|%t) t register with reactor\n"), -1);
+                           ACE_TEXT ("(%P|%t) can't register with reactor\n")),
+                          -1);
       else
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) connected with %s\n", this->peer_name_));
+                    ACE_TEXT ("(%P|%t) connected with %C\n"),
+                    this->peer_name_));
       return 0;
     }
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Acceptor factory.
   Logging_Acceptor peer_acceptor;
@@ -195,7 +205,7 @@ main (int argc, char *argv[])
   if (peer_acceptor.open
       (ACE_INET_Addr (OPTIONS::instance ()->port ()),
        REACTOR::instance ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
 
   // Register QUIT_HANDLER to receive SIGINT commands.  When received,
   // QUIT_HANDLER becomes "set" and thus, the event loop below will
@@ -203,19 +213,20 @@ main (int argc, char *argv[])
   else if (REACTOR::instance ()->register_handler
            (SIGINT, QUIT_HANDLER::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "registering service with ACE_Reactor\n"), -1);
+                       ACE_TEXT ("registering service with ACE_Reactor\n")),
+                      -1);
 
   // Run forever, performing logging service.
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) starting up server logging daemon\n"));
+              ACE_TEXT ("(%P|%t) starting up server logging daemon\n")));
 
   // Perform logging service until QUIT_HANDLER receives SIGINT.
   while (QUIT_HANDLER::instance ()->is_set () == 0)
     REACTOR::instance ()->handle_events ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) shutting down server logging daemon\n"));
+              ACE_TEXT ("(%P|%t) shutting down server logging daemon\n")));
 
   return 0;
 }
diff --git a/examples/Logger/Acceptor-server/server_loggerd.h b/examples/Logger/Acceptor-server/server_loggerd.h
index 45bc1f6cec0..33d5f0042ee 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.h
+++ b/examples/Logger/Acceptor-server/server_loggerd.h
@@ -14,7 +14,7 @@ class Options
   // = TITLE
   //     Keeps track of the options.
 public:
-  void parse_args (int argc, char *argv[]);
+  void parse_args (int argc, ACE_TCHAR *argv[]);
   u_short port (void);
 
 private:
diff --git a/examples/Logger/client/Logger_client.mpc b/examples/Logger/client/Logger_client.mpc
index ca6b8ee6622..ec75f197b14 100644
--- a/examples/Logger/client/Logger_client.mpc
+++ b/examples/Logger/client/Logger_client.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : aceexe {
+  exename = logging_app
 }
\ No newline at end of file
diff --git a/examples/Logger/client/logging_app.cpp b/examples/Logger/client/logging_app.cpp
index dadccde4f3b..ba5bb24295e 100644
--- a/examples/Logger/client/logging_app.cpp
+++ b/examples/Logger/client/logging_app.cpp
@@ -14,13 +14,13 @@
 ACE_RCSID(client, logging_app, "$Id$")
 
 static u_short LOGGER_PORT = ACE_DEFAULT_SERVER_PORT;
-static const char *const LOGGER_HOST = ACE_DEFAULT_SERVER_HOST;
+static const ACE_TCHAR *const LOGGER_HOST = ACE_DEFAULT_SERVER_HOST;
 static const int MAX_ITERATIONS = 10;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  const char *logger_host = argc > 1 ? argv[1] : LOGGER_HOST;
+  const ACE_TCHAR *logger_host = argc > 1 ? argv[1] : LOGGER_HOST;
   u_short logger_port  = argc > 2 ? ACE_OS::atoi (argv[2]) : LOGGER_PORT;
   int max_iterations = argc > 3 ? ACE_OS::atoi (argv[3]) : MAX_ITERATIONS;
 
@@ -29,16 +29,16 @@ main (int argc, char *argv[])
   ACE_INET_Addr addr (logger_port, logger_host);
 
   if (connector.connect (logger, addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
 
   for (int i = 0; i < max_iterations; i++)
     {
-      ACE_Log_Record log_record (LM_DEBUG,
-				 ACE_OS::time ((time_t *) 0),
-				 ACE_OS::getpid ());
+      ACE_Log_Record log_record (LM_DEBUG, 
+                                 ACE_OS::time ((time_t *) 0), 
+                                 ACE_OS::getpid ());
 
-      char buf[BUFSIZ];
-      ACE_OS::sprintf (buf, "message = %d\n", i + 1);
+      ACE_TCHAR buf[BUFSIZ];
+      ACE_OS::sprintf (buf, ACE_TEXT ("message = %d\n"), i + 1);
       log_record.msg_data (buf);
       size_t len = log_record.length ();
       size_t encoded_len = htonl (len);
@@ -47,13 +47,13 @@ main (int argc, char *argv[])
 
       if (logger.send (4, &encoded_len, sizeof encoded_len,
 		       (char *) &log_record, len) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send"), -1);
+	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send")),-1);
       else
 	ACE_OS::sleep (1);
     }
 
   if (logger.close () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "close"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("close")), -1);
 
   return 0;
 }
diff --git a/examples/Logger/simple-server/Logger_Simple_Server.mpc b/examples/Logger/simple-server/Logger_Simple_Server.mpc
index ca6b8ee6622..1e4d8240e38 100644
--- a/examples/Logger/simple-server/Logger_Simple_Server.mpc
+++ b/examples/Logger/simple-server/Logger_Simple_Server.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : aceexe {
+  exename = server_loggerd
 }
\ No newline at end of file
diff --git a/examples/Logger/simple-server/Logging_Handler.cpp b/examples/Logger/simple-server/Logging_Handler.cpp
index 72afed83497..111a26248fc 100644
--- a/examples/Logger/simple-server/Logging_Handler.cpp
+++ b/examples/Logger/simple-server/Logging_Handler.cpp
@@ -41,7 +41,8 @@ Logging_Handler::handle_timeout (const ACE_Time_Value &,
 #endif /* ACE_NDEBUG */
 
   ACE_ASSERT (arg == this);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) handling timeout from this = %u\n", this));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) handling timeout from this = %@\n"),
+              this));
   return 0;
 }
 
@@ -62,8 +63,8 @@ Logging_Handler::handle_input (ACE_HANDLE)
   switch (n = this->cli_stream_.recv ((void *) &len, sizeof len))
     {
     case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
-                         "client logger", this->host_name_), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
+                         ACE_TEXT ("client logger"), this->host_name_), -1);
       /* NOTREACHED */
     case 0:
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -77,25 +78,26 @@ Logging_Handler::handle_input (ACE_HANDLE)
         len = ntohl (len);
         n = this->cli_stream_.recv_n ((void *) &lp, len);
         if (n != (ssize_t) len)
-          ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
-                             "client logger", this->host_name_), -1);
+          ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
+                             ACE_TEXT ("client logger"), this->host_name_), -1);
         /* NOTREACHED */
 
         lp.decode ();
 
         if (lp.length () == n)
           {
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) "));
-            lp.print (this->host_name_, 1);
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ")));
+            lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->host_name_), 1);
           }
         else
-          ACE_ERROR ((LM_ERROR, "(%P|%t) error, lp.length = %d, n = %d\n",
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) error, lp.length = %d, n = %d\n"),
                       lp.length (), n));
         break;
       }
     default:
-      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
-                         "client logger", this->host_name_), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p at host %C\n"),
+                         ACE_TEXT ("client logger"), this->host_name_), -1);
       /* NOTREACHED */
     }
 
@@ -125,18 +127,18 @@ Logging_Handler::open (void)
 
       if (REACTOR::instance ()->register_handler (this, READ_MASK) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) can't register with reactor\n"),
+                           ACE_TEXT ("(%P|%t) can't register with reactor\n")),
                           -1);
       else if (REACTOR::instance ()->schedule_timer
                (this, (const void *) this,
                 ACE_Time_Value (2),
                 ACE_Time_Value (2)) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "can'(%P|%t) t register with reactor\n"),
+                           ACE_TEXT ("(%P|%t) can't register with reactor\n")),
                           -1);
       else
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) connected with %s\n",
+                    ACE_TEXT ("(%P|%t) connected with %C\n"),
                     this->host_name_));
       return 0;
     }
diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp
index 323eea5b2d1..49981dc92ff 100644
--- a/examples/Logger/simple-server/server_loggerd.cpp
+++ b/examples/Logger/simple-server/server_loggerd.cpp
@@ -28,7 +28,7 @@ handler (int)
 static const u_short PORT = ACE_DEFAULT_SERVER_PORT;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Register a signal handler.
   ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
 
   ACE_INET_Addr addr (PORT);
 
-  ACE_Get_Opt get_opt (argc, argv, "p:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"));
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
@@ -55,26 +55,26 @@ main (int argc, char *argv[])
 
   if (peer_acceptor->open (addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       -1);
   else if (REACTOR::instance ()->register_handler
 	   (peer_acceptor,
 	    ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "registering service with ACE_Reactor\n"),
+		       ACE_TEXT ("registering service with ACE_Reactor\n")),
 		       -1);
 
   // Run forever, performing the logging service.
 
   ACE_DEBUG ((LM_DEBUG,
-	      "(%P|%t) starting up server logging daemon\n"));
+	      ACE_TEXT ("(%P|%t) starting up server logging daemon\n")));
 
   while (!finished)
      REACTOR::instance ()->handle_events ();
 
   ACE_DEBUG ((LM_DEBUG,
-	      "(%P|%t) shutting down server logging daemon\n"));
+	      ACE_TEXT ("(%P|%t) shutting down server logging daemon\n")));
   return 0;
 }
 
diff --git a/examples/Mem_Map/IO-tests/IO_Test.cpp b/examples/Mem_Map/IO-tests/IO_Test.cpp
index 0aebceb2de9..180722a5523 100644
--- a/examples/Mem_Map/IO-tests/IO_Test.cpp
+++ b/examples/Mem_Map/IO-tests/IO_Test.cpp
@@ -164,10 +164,7 @@ Mmap1_Test::run_test (int iterations,
   void *src = map_input.addr ();
 
   if (src == MAP_FAILED)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%s",
-                       this->name ()),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%C"), this->name ()), -1);
   else
     {
       this->tm_.start ();
@@ -175,15 +172,15 @@ Mmap1_Test::run_test (int iterations,
       while (--iterations >= 0)
       {
         if (ACE_OS::write (fileno (output_fp),
-                             src,
-                             map_input.size ()) == -1)
-                             ACE_ERROR_RETURN ((LM_ERROR,
-                               "%s",
-                               this->name ()),
-                              -1);
+                           src,
+                           map_input.size ()) == -1)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("%C"),
+                             this->name ()),
+                            -1);
         ACE_OS::lseek (fileno (output_fp),
-                         0,
-                         SEEK_SET);
+                       0,
+                       SEEK_SET);
       }
 
       this->tm_.stop ();
@@ -191,7 +188,7 @@ Mmap1_Test::run_test (int iterations,
   
   if (map_input.unmap () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%s",
+                       ACE_TEXT ("%C"),
                        this->name ()),
                       -1);
   else
diff --git a/examples/Mem_Map/IO-tests/test_io.cpp b/examples/Mem_Map/IO-tests/test_io.cpp
index 4eef90498e3..b60401cc813 100644
--- a/examples/Mem_Map/IO-tests/test_io.cpp
+++ b/examples/Mem_Map/IO-tests/test_io.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 // Test program for different methods of copying files.
-#if !defined(_WIN32)
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
@@ -14,14 +13,16 @@
 
 ACE_RCSID(IO_tests, test_io, "$Id$")
 
+#if !defined(_WIN32)
+
 // Name of program.
-static const char *program_name;
+static const ACE_TCHAR *program_name;
 
 // Name of default input file.
-static const char *input_filename = "/usr/dict/words";
+static const ACE_TCHAR *input_filename = ACE_TEXT ("/usr/dict/words");
 
 // Name of default output file.
-static const char *output_filename = "/tmp/foo";
+static const ACE_TCHAR *output_filename = ACE_TEXT ("/tmp/foo");
 
 // Check if removing output file upon completion...
 static int remove_output = 1;
@@ -39,7 +40,7 @@ print_usage_and_die (void)
 {
   ACE_OS::fprintf (stderr, "usage: %s"
                    " [-i input_file] [-o output_file] [-n iteration_count] [-r]\n",
-                   program_name);
+                   ACE_TEXT_ALWAYS_CHAR (program_name));
   ACE_OS::exit (1);
 }
 
@@ -56,9 +57,9 @@ cleanup (int = 0)
 // Parse the command-line arguments and set options.
 
 static void
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "i:n:o:r");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:n:o:r"));
 
   for (int c; ((c = get_opt ()) != -1); )
     switch (c)
@@ -129,13 +130,13 @@ run_tests (int iterations, FILE *input_fp, FILE *output_fp)
       ACE_HANDLE hfile = fileno (output_fp);
       if (ACE_OS::ftruncate (hfile, 0) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s\n",
-                           "ftruncate"),
+                           ACE_TEXT ("%s\n"),
+                           ACE_TEXT ("ftruncate")),
                           -1);
 
       ACE_DEBUG ((LM_DEBUG,
-                  "--------------------\n"
-		  "starting %s for %d iterations(s):\n",
+                  ACE_TEXT ("--------------------\n")
+		  ACE_TEXT ("starting %C for %d iterations(s):\n"),
 		  test_vector[i]->name (),
 		  iterations));
 
@@ -147,7 +148,7 @@ run_tests (int iterations, FILE *input_fp, FILE *output_fp)
       profile_timer.elapsed_time (et);
 
       ACE_DEBUG ((LM_DEBUG,
-                  "wallclock time = %f, user time = %f, system time = %f\n",
+                  ACE_TEXT ("wallclock time = %f, user time = %f, system time = %f\n"),
 		  et.real_time,
 		  et.user_time,
 		  et.system_time));
@@ -156,12 +157,12 @@ run_tests (int iterations, FILE *input_fp, FILE *output_fp)
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              "--------------------\n"));
+              ACE_TEXT ("--------------------\n")));
   return 0;
 }
 
 int
-main (int argc, char *argv[])
+main (int argc, ACE_TCHAR *argv[])
 {
   program_name = ACE::basename (argv[0],
                                 ACE_DIRECTORY_SEPARATOR_CHAR);
@@ -171,20 +172,20 @@ main (int argc, char *argv[])
   ACE_UNUSED_ARG (sa);
 
   FILE *input_fp =
-    ACE_OS::fopen (input_filename, "r");
+    ACE_OS::fopen (input_filename, ACE_TEXT ("r"));
   FILE *output_fp =
-    ACE_OS::fopen (output_filename, "w+");
+    ACE_OS::fopen (output_filename, ACE_TEXT ("w+"));
 
   if (input_fp == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%s\n",
-                       "input_filename"),
+                       ACE_TEXT ("%p\n"),
+                       input_filename),
                       -1);
 
   if (output_fp == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%s\n",
-                       "output_filename"),
+                       ACE_TEXT ("%p\n"),
+                       output_filename),
                       -1);
 
   ACE_OS::unlink (output_filename);
@@ -192,22 +193,18 @@ main (int argc, char *argv[])
   if (run_tests (iteration_count,
                  input_fp,
                  output_fp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "run_tests"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("run_tests")),
                       -1);
 
   if (ACE_OS::fclose (input_fp) == -1
       || ACE_OS::fclose (output_fp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%s\n",
-                       "fclose"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("fclose")),
                       -1);
   cleanup ();
   return 0;
 }
 #else
-int main(int, char*[]) {
+int ACE_TMAIN (int, ACE_TCHAR*[]) {
   // not supported on win32
   return 0;
 }
diff --git a/examples/Misc/Misc.mpc b/examples/Misc/Misc.mpc
index a8eca856e7a..86d377dc224 100644
--- a/examples/Misc/Misc.mpc
+++ b/examples/Misc/Misc.mpc
@@ -50,14 +50,14 @@ project(*test_trace) : aceexe {
   }
 }
 
-project(*test_XtReactor1) : aceexe {
+project(*test_XtReactor1) : aceexe, ace_xtreactor, ace_motif {
   exename = test_XtReactor1
   Source_Files {
     test_XtReactor1.cpp
   }
 }
 
-project(*test_XtReactor2) : aceexe {
+project(*test_XtReactor2) : aceexe, ace_xtreactor, ace_motif {
   exename = test_XtReactor2
   Source_Files {
     test_XtReactor2.cpp
diff --git a/examples/Misc/test_XtReactor1.cpp b/examples/Misc/test_XtReactor1.cpp
index ebafcb1db79..f4bef54aeae 100644
--- a/examples/Misc/test_XtReactor1.cpp
+++ b/examples/Misc/test_XtReactor1.cpp
@@ -15,7 +15,6 @@ ACE_RCSID (Misc,
            test_XtReactor1,
            "$Id$")
 
-#if defined (ACE_HAS_XT)
 //#define String XtString
 #include <Xm/PushB.h>
 
@@ -172,12 +171,3 @@ ACE_TMAIN (int argc, ACE_TCHAR**argv)
 
   return 0;
 }
-#else
-int
-ACE_TMAIN (int, ACE_TCHAR *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     "XT not configured for this platform\n"),
-                    0);
-}
-#endif /* ACE_HAS_XT */
diff --git a/examples/Misc/test_XtReactor2.cpp b/examples/Misc/test_XtReactor2.cpp
index 601335f7b34..2e2f4be0ba2 100644
--- a/examples/Misc/test_XtReactor2.cpp
+++ b/examples/Misc/test_XtReactor2.cpp
@@ -14,7 +14,7 @@ ACE_RCSID (Misc,
            test_XtReactor2,
            "$Id$")
 
-#if defined (ACE_HAS_XT)
+
 #include <Xm/PushB.h>
 
 class Stdin : public ACE_Event_Handler
@@ -99,12 +99,3 @@ ACE_TMAIN (int argc, ACE_TCHAR**argv)
   // Demonstrate Reactor/Xt event loop unification:
   XtAppMainLoop (XtWidgetToApplicationContext (top_level));
 }
-#else
-int
-ACE_TMAIN (int, ACE_TCHAR *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     "XT not configured for this platform\n"),
-                    0);
-}
-#endif /* ACE_HAS_XT */
diff --git a/examples/Misc/test_read_buffer.cpp b/examples/Misc/test_read_buffer.cpp
index 66809086bfd..1c24aec98b7 100644
--- a/examples/Misc/test_read_buffer.cpp
+++ b/examples/Misc/test_read_buffer.cpp
@@ -6,8 +6,12 @@
 #include "ace/Malloc_Base.h"
 #include "ace/Service_Config.h"
 #include "ace/Read_Buffer.h"
+#include "ace/OS_NS_stdlib.h"
 
-ACE_RCSID(Misc, test_read_buffer, "$Id$")
+
+ACE_RCSID (Misc,
+           test_read_buffer,
+           "$Id$")
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/examples/Misc/test_trace.cpp b/examples/Misc/test_trace.cpp
index 2def9cf613d..338cf8eaa77 100644
--- a/examples/Misc/test_trace.cpp
+++ b/examples/Misc/test_trace.cpp
@@ -51,9 +51,9 @@ private:
 int
 My_Task::recursive (size_t depth)
 {
-  ACE_Trace _ (ACE_TEXT("int recursive (size_t depth)"),
-               __LINE__,
-               ACE_TEXT(__FILE__));
+  ACE_Trace trace (ACE_TEXT("int recursive (size_t depth)"),
+                   __LINE__,
+                   ACE_TEXT(__FILE__));
 
   if (depth > 0)
     return recursive (depth - 1);
@@ -80,9 +80,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (argc > 2)
     ACE_Trace::set_nesting_indent (ACE_OS::atoi (argv[2]));
 
-  ACE_Trace _ (ACE_TEXT("int ACE_TMAIN (int argc, ACE_TCHAR *argv[])"),
-               __LINE__,
-               ACE_TEXT(__FILE__));
+  ACE_Trace trace (ACE_TEXT("int ACE_TMAIN (int argc, ACE_TCHAR *argv[])"),
+                   __LINE__,
+                   ACE_TEXT(__FILE__));
 
   // The following won't work on MVS OpenEdition...
   ACE_Sig_Action sig1 ((ACE_SignalHandler) ACE_Trace::start_tracing,
diff --git a/examples/NT_Service/NT_Service.mpc b/examples/NT_Service/NT_Service.mpc
index 7d11f2ca152..2adfe6f6feb 100644
--- a/examples/NT_Service/NT_Service.mpc
+++ b/examples/NT_Service/NT_Service.mpc
@@ -1,19 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : aceexe {
-
-  verbatim(gnuace, top) {
-    ifneq ($(MAKE),)
-    include $(ACE_ROOT)/include/makeinclude/macros.GNU
-    TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
-    $(TARGETS_NESTED):
-    "	@echo NT_Service will only build on Windows"
-    else
-  }
-
-  verbatim(gnuace, bottom) {
-    endif
-  }
-
-}
\ No newline at end of file
+project : aceexe, winregistry {
+  exename = main
+}
diff --git a/examples/OS/Process/process.cpp b/examples/OS/Process/process.cpp
index 1fb70ced486..de0f2db0d57 100644
--- a/examples/OS/Process/process.cpp
+++ b/examples/OS/Process/process.cpp
@@ -27,24 +27,25 @@
 #include "ace/Process.h"
 #include "ace/Log_Msg.h"
 #include "ace/Time_Value.h"
+#include "ace/SString.h"
 
 ACE_RCSID(Process, process, "$Id$")
 
 #if defined (ACE_WIN32)
-#define EXEC_NAME "MORE.COM"
-const char *DATE_PATH = "date.exe";
-const char *LS_PATH = "ls.exe";
-const char *SLEEP_PATH = "sleep.exe";
+#define EXEC_NAME ACE_TEXT ("MORE.COM")
+const ACE_TCHAR *DATE_PATH = ACE_TEXT ("date.exe");
+const ACE_TCHAR *LS_PATH = ACE_TEXT ("ls.exe");
+const ACE_TCHAR *SLEEP_PATH = ACE_TEXT ("sleep.exe");
 #else
-#define EXEC_NAME "less"
-const char *DATE_PATH = "date";
-const char *LS_PATH = "ls";
-const char *SLEEP_PATH = "sleep";
+#define EXEC_NAME ACE_TEXT ("less")
+const ACE_TCHAR *DATE_PATH = ACE_TEXT ("date");
+const ACE_TCHAR *LS_PATH = ACE_TEXT ("ls");
+const ACE_TCHAR *SLEEP_PATH = ACE_TEXT ("sleep");
 #endif /* ACE_WIN32 */
 
-static const char *executable = EXEC_NAME;
-static char *print_file = 0;
-static char *environment_string = 0;
+static const ACE_TCHAR *executable = EXEC_NAME;
+static ACE_TCHAR *print_file = 0;
+static ACE_TCHAR *environment_string = 0;
 static int get_env = 0;
 static int run_date = 0;
 static int run_ls = 0;
@@ -55,9 +56,9 @@ static int run_wait = 0;
 
 // Parse the command-line arguments and set options.
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Opt get_opt (argc, argv, "dlx:p:e:gastuw");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dlx:p:e:gastuw"));
   int c;
 
   while ((c = get_opt ()) != -1)
@@ -96,17 +97,18 @@ parse_args (int argc, char **argv)
         break;
       case 'u':
       default:
-        ACE_ERROR_RETURN ((LM_ERROR, "Usage:\n"
-                           "-d print date\n"
-                           "-l run ls\n"
-                           "-x <executable=more.com>\n"
-                           "-p print <file_name>\n"
-                           "-e <env variable message>\n"
-                           "-s setenv ACE_PROCESS_ENV and spawn -g\n"
-                           "-g get_env ACE_PROCESS_ENV\n"
-                           "-t test tokenizer\n"
-                           "-w test wait functions\n"
-                           "-a run all (d,l,e \"running\")\n"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Usage:\n")
+                           ACE_TEXT ("-d print date\n")
+                           ACE_TEXT ("-l run ls\n")
+                           ACE_TEXT ("-x <executable=more.com>\n")
+                           ACE_TEXT ("-p print <file_name>\n")
+                           ACE_TEXT ("-e <env variable message>\n")
+                           ACE_TEXT ("-s setenv ACE_PROCESS_ENV and spawn -g\n")
+                           ACE_TEXT ("-g get_env ACE_PROCESS_ENV\n")
+                           ACE_TEXT ("-t test tokenizer\n")
+                           ACE_TEXT ("-w test wait functions\n")
+                           ACE_TEXT ("-a run all (d,l,e \"running\")\n")),
+                          -1);
         break;
       }
     }
@@ -122,7 +124,7 @@ test_more (void)
 
   if (infile == ACE_INVALID_HANDLE)
     {
-      ACE_ERROR ((LM_DEBUG, "%p\n", print_file));
+      ACE_ERROR ((LM_DEBUG, ACE_TEXT ("%p\n"), print_file));
       return;
     }
 
@@ -135,20 +137,20 @@ test_more (void)
     {
       int error = ACE_OS::last_error ();
       ACE_ERROR ((LM_ERROR,
-                  "%p errno = %d.\n",
-                  "test_more",
+                  ACE_TEXT ("%p errno = %d.\n"),
+                  ACE_TEXT ("test_more"),
                   error));
     }
 
   ACE_exitcode status;
   new_process.wait (&status);
   ACE_DEBUG ((LM_DEBUG,
-              "Process exit with status %d\n",
+              ACE_TEXT ("Process exit with status %d\n"),
               status));
   ACE_OS::close (infile);
 
   ACE_DEBUG ((LM_DEBUG,
-              "More succeeded.\n"));
+              ACE_TEXT ("More succeeded.\n")));
 }
 
 // This is a simple usage of ACE_Process.
@@ -165,8 +167,8 @@ test_date (void)
     {
       int error = ACE_OS::last_error ();
       ACE_ERROR ((LM_ERROR,
-                  "%p errno = %d.\n",
-                  "test_date",
+                  ACE_TEXT ("%p errno = %d.\n"),
+                  ACE_TEXT ("test_date"),
                   error));
       return;
     }
@@ -174,32 +176,35 @@ test_date (void)
   ACE_exitcode status;
   new_process.wait (&status);
   ACE_DEBUG ((LM_DEBUG,
-              "Process exit with status %d\n",
+              ACE_TEXT ("Process exit with status %d\n"),
               status));
   ACE_DEBUG ((LM_DEBUG,
-              "date succeeded.\n"));
+              ACE_TEXT ("date succeeded.\n")));
 }
 
 static void
 test_ls (void)
 {
   ACE_Process_Options options;
-  options.command_line ("%s -al", LS_PATH);
-
+#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
+  options.command_line (ACE_TEXT ("%s -al"), LS_PATH);
+#else
+  options.command_line (ACE_TEXT ("%ls -al"), LS_PATH);
+#endif
   ACE_Process new_process;
   if (new_process.spawn (options) == -1)
     {
       int error = ACE_OS::last_error ();
       ACE_ERROR ((LM_ERROR,
-                  "%p errno = %d.\n",
-                  "test_ls",
+                  ACE_TEXT ("%p errno = %d.\n"),
+                  ACE_TEXT ("test_ls"),
                   error));
     }
 
   ACE_exitcode status;
   new_process.wait (&status);
   ACE_DEBUG ((LM_DEBUG,
-              "Process exit with status %d\n",
+              ACE_TEXT ("Process exit with status %d\n"),
               status));
 }
 
@@ -207,15 +212,18 @@ static void
 test_wait (void)
 {
   ACE_Process_Options options;
-  options.command_line ("%s 10", SLEEP_PATH);
-
+#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
+  options.command_line (ACE_TEXT ("%s 10"), SLEEP_PATH);
+#else
+  options.command_line (ACE_TEXT ("%ls 10"), SLEEP_PATH);
+#endif
   ACE_Process process1;
   if (process1.spawn (options) == -1)
     {
       int error = ACE_OS::last_error ();
       ACE_ERROR ((LM_ERROR,
-                  "%p errno = %d.\n",
-                  "test_ls",
+                  ACE_TEXT ("%p errno = %d.\n"),
+                  ACE_TEXT ("test_ls"),
                   error));
     }
 
@@ -223,19 +231,18 @@ test_wait (void)
   ACE_exitcode status;
 
   ACE_DEBUG ((LM_DEBUG,
-              "[%T] New process sleeping 10; try wait(2)\n"));
+              ACE_TEXT ("[%T] New process sleeping 10; try wait(2)\n")));
 
-  result = process1.wait (ACE_Time_Value (2),
-                          &status);
+  result = process1.wait (ACE_Time_Value (2), &status);
 
   ACE_DEBUG ((LM_DEBUG,
-              "[%T] wait(2) returns %d(%d)...now try regular wait\n",
+              ACE_TEXT ("[%T] wait(2) returns %d(%d)...now try regular wait\n"),
               result,
               status));
 
   result = process1.wait (&status);
   ACE_DEBUG ((LM_DEBUG,
-              "[%T] wait() returns %d(%d)\n",
+              ACE_TEXT ("[%T] wait() returns %d(%d)\n"),
               result,
               status));
 
@@ -244,26 +251,25 @@ test_wait (void)
     {
       int error = ACE_OS::last_error ();
       ACE_ERROR ((LM_ERROR,
-                  "%p errno = %d.\n",
-                  "test_ls",
+                  ACE_TEXT ("%p errno = %d.\n"),
+                  ACE_TEXT ("test_ls"),
                   error));
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              "[%T] New process sleeping 10; try wait(12)\n",
+              ACE_TEXT ("[%T] New process sleeping 10; try wait(12)\n"),
               status));
 
-  result = process2.wait (ACE_Time_Value (12),
-                          &status);
+  result = process2.wait (ACE_Time_Value (12), &status);
 
   ACE_DEBUG ((LM_DEBUG,
-              "[%T] wait(12) returns %d(%d)...now try regular wait\n",
+              ACE_TEXT ("[%T] wait(12) returns %d(%d)...now try regular wait\n"),
               result,
               status));
 
   result = process2.wait (&status);
   ACE_DEBUG ((LM_DEBUG,
-              "[%T] wait returns %d(%d)\n",
+              ACE_TEXT ("[%T] wait returns %d(%d)\n"),
               result,
               status));
 }
@@ -296,14 +302,14 @@ win32_test_ls (void)
                           DUPLICATE_SAME_ACCESS))
     {
       ACE_ERROR ((LM_ERROR,
-                  "%p duplicate failed.\n",
-                  "test_ls"));
+                  ACE_TEXT ("%p duplicate failed.\n"),
+                  ACE_TEXT ("test_ls")));
       return;
     }
 
   BOOL fork_result =
-    ACE_TEXT_CreateProcess ("c:\\Utils\\bin\\ls.exe",
-                                   "-a",
+    ACE_TEXT_CreateProcess (ACE_TEXT ("c:\\Utils\\bin\\ls.exe"),
+                            ACE_TEXT ("-a"),
                             NULL, // No process attributes.
                             NULL, // No thread attributes.
                             TRUE, // Allow handle inheritance.
@@ -317,14 +323,13 @@ win32_test_ls (void)
 
   if (fork_result == 0)
     ACE_ERROR ((LM_ERROR,
-                "%p CreateProcess failed.\n",
-                "test_ls"));
+                ACE_TEXT ("%p CreateProcess failed.\n"),
+                ACE_TEXT ("test_ls")));
   else
     {
       ::WaitForSingleObject (process_info.hProcess,
                              INFINITE);
-      ACE_DEBUG ((LM_ERROR,
-                  "ls succeeded.\n"));
+      ACE_DEBUG ((LM_ERROR, ACE_TEXT ("ls succeeded.\n")));
     }
 }
 
@@ -360,7 +365,8 @@ win32_spawn_environment_process (void)
                           DUPLICATE_SAME_ACCESS))
     {
       ACE_ERROR ((LM_ERROR,
-                  "%p duplicate failed.\n", "spawn_environment_process"));
+                  ACE_TEXT ("%p duplicate failed.\n"),
+                  ACE_TEXT ("spawn_environment_process")));
       return;
     }
 
@@ -373,8 +379,8 @@ win32_spawn_environment_process (void)
                           DUPLICATE_SAME_ACCESS))
     {
       ACE_ERROR ((LM_ERROR,
-                  "%p duplicate failed.\n",
-                  "spawn_environment_process"));
+                  ACE_TEXT ("%p duplicate failed.\n"),
+                  ACE_TEXT ("spawn_environment_process")));
       return;
     }
 
@@ -387,17 +393,17 @@ win32_spawn_environment_process (void)
                           DUPLICATE_SAME_ACCESS))
     {
       ACE_ERROR ((LM_ERROR,
-                  "%p duplicate failed.\n",
-                  "spawn_environment_process"));
+                  ACE_TEXT ("%p duplicate failed.\n"),
+                  ACE_TEXT ("spawn_environment_process")));
       return;
     }
 
   // Normally, this would be just GetEnvironmentStrings, but it
   // doesn't follow the same rules as the rest of the Win32 API
-  char *existing_environment = ACE_OS::getenvstrings ();
-  char environment[10240];
+  ACE_TCHAR *existing_environment = ACE_OS::getenvstrings ();
+  ACE_TCHAR environment[10240];
   ACE_OS::sprintf (environment,
-                   "ACE_PROCESS_TEST=%s",
+                   ACE_TEXT("ACE_PROCESS_TEST=%s"),
                    environment_string);
 
   int size = 0;
@@ -411,8 +417,8 @@ win32_spawn_environment_process (void)
   ACE_TEXT_FreeEnvironmentStrings (existing_environment);
 
   BOOL fork_result =
-    ACE_TEXT_CreateProcess ("d:\\harrison\\ACE_wrappers\\examples\\OS\\Process\\process.exe",
-                            "process -g",
+    ACE_TEXT_CreateProcess (ACE_TEXT ("d:\\harrison\\ACE_wrappers\\examples\\OS\\Process\\process.exe"),
+                            ACE_TEXT ("process -g"),
                             NULL, // No process attributes.
                             NULL, // No thread attributes.
                             TRUE, // Allow handle inheritance.
@@ -428,45 +434,50 @@ win32_spawn_environment_process (void)
 
   if (fork_result == 0)
     ACE_ERROR ((LM_ERROR,
-                "%p.\n",
-                "spawn_environment_process"));
+                ACE_TEXT ("%p.\n"),
+                ACE_TEXT ("spawn_environment_process")));
   else
     {
       ::WaitForSingleObject (process_info.hProcess,
                              INFINITE);
       ACE_DEBUG ((LM_ERROR,
-                  "spawn_environment_process succeeded.\n"));
+                  ACE_TEXT ("spawn_environment_process succeeded.\n")));
     }
 }
 #endif
 
 static void
-test_setenv (const char *argv0)
+test_setenv (const ACE_TCHAR *argv0)
 {
   ACE_Process_Options options;
   //  options.setenv ("ACE_PROCESS_TEST", "here's a really large number: %u", 0 - 1);
-  options.setenv ("ACE_PROCESS_TEST= here's a large number %u", 0 - 1);
-  options.setenv ("ACE_PROCESS_TEST2", "ophilli");
+  options.setenv (ACE_TEXT ("ACE_PROCESS_TEST= here's a large number %u"),
+                  0 - 1);
+  options.setenv (ACE_TEXT ("ACE_PROCESS_TEST2"), ACE_TEXT ("ophilli"));
+#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
   options.command_line ("%s -g", argv0);
+#else
+  options.command_line ("%ls -g", argv0);
+#endif
   ACE_Process process;
   if (process.spawn (options) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%p.\n",
-                  "test_setenv"));
+                  ACE_TEXT ("%p.\n"),
+                  ACE_TEXT ("test_setenv")));
       return;
     }
 
   ACE_exitcode status;
   process.wait (&status);
   ACE_DEBUG ((LM_DEBUG,
-              "Process exit with status %d\n",
+              ACE_TEXT ("Process exit with status %d\n"),
               status));
 }
 
 // Tests the ACE_Tokenizer.
 static void
-tokenize (char *buffer)
+tokenize (ACE_TCHAR *buffer)
 {
   // This tokenizer will replace all spaces with end-of-string
   // characters and will preserve text between "" and '' pairs.
@@ -475,46 +486,47 @@ tokenize (char *buffer)
   parser.preserve_designators ('\"', '\"'); // "  This quote is for emacs
   parser.preserve_designators ('\'', '\'');
 
-  for (const char *temp; ;)
+  for (const ACE_TCHAR *temp; ;)
     {
       temp = parser.next ();
       if (temp == 0)
         break;
-      ACE_DEBUG ((LM_DEBUG,
-                  temp));
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n"));
+      ACE_DEBUG ((LM_DEBUG, temp));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
     }
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (ACE_LOG_MSG->open (argv[0]) == -1)
     ACE_ERROR ((LM_ERROR,
-                "cannot open logger!!!\n"));
+                ACE_TEXT ("cannot open logger!!!\n")));
 
-  ACE_DEBUG ((LM_DEBUG,
-              "starting...\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("starting...\n")));
 
   if (::parse_args (argc, argv) == -1)
     return -1;
 
   if (run_all)
     {
+#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
+      const ACE_TCHAR *cmdline = ACE_TEXT ("%s -d -l -s -w");
+#else
+      const ACE_TCHAR *cmdline = ACE_TEXT ("%ls -d -l -s -w");
+#endif
       ACE_Process_Options options;
-      options.command_line ("%s -d -l -s -w",
-                            argv[0]);
+      options.command_line (cmdline, argv[0]);
       ACE_Process process;
       if (process.spawn (options) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p.\n",
-                           "main"),
+                           ACE_TEXT ("%p.\n"),
+                           ACE_TEXT ("main")),
                           -1);
       ACE_exitcode status;
       process.wait (&status);
       ACE_DEBUG ((LM_DEBUG,
-                  "Process exit with status %d\n",
+                  ACE_TEXT ("Process exit with status %d\n"),
                   status));
     }
 
@@ -526,12 +538,12 @@ main (int argc, char *argv[])
 
   if (get_env)
     {
-      ACE_DEBUG ((LM_DEBUG, "checking ACE_PROCESS_TEST\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("checking ACE_PROCESS_TEST\n")));
       char *value = ACE_OS::getenv ("ACE_PROCESS_TEST");
       char *value2 = ACE_OS::getenv ("ACE_PROCESS_TEST2");
       ACE_DEBUG ((LM_DEBUG,
-                  "ACE_PROCESS_TEST = %s.\n"
-                  "ACE_PROCESS_TEST2 = %s.\n",
+                  "ACE_PROCESS_TEST = %C.\n"
+                  "ACE_PROCESS_TEST2 = %C.\n",
                   value == 0 ? "no value" : value,
                   value2 == 0 ? "no value" : value2));
     }
@@ -550,15 +562,15 @@ main (int argc, char *argv[])
   if (print_file != 0)
     test_more ();
 
-  char buf1[30];
-  char buf2[30];
-  ACE_OS::strcpy(buf1, " -f hi honey -g \"I\'m home\"");
-  ACE_OS::strcpy(buf2, "\"token 1\"\'token 2\'\"token 3\" ");
+  ACE_TCHAR buf1[30];
+  ACE_TCHAR buf2[30];
+  ACE_OS::strcpy(buf1, ACE_TEXT (" -f hi honey -g \"I\'m home\""));
+  ACE_OS::strcpy(buf2, ACE_TEXT ("\"token 1\"\'token 2\'\"token 3\" "));
 
   if (run_tokenizer)
     {
-      tokenize ( buf1 );
-      tokenize ( buf2 );
+      tokenize (buf1);
+      tokenize (buf2);
     }
 
   return 0;
diff --git a/examples/QOS/Change_Receiver_FlowSpec/sender.cpp b/examples/QOS/Change_Receiver_FlowSpec/sender.cpp
index 2dea073a12b..c721aa810c4 100644
--- a/examples/QOS/Change_Receiver_FlowSpec/sender.cpp
+++ b/examples/QOS/Change_Receiver_FlowSpec/sender.cpp
@@ -40,7 +40,7 @@
 
 int
 FillQoSParams (ACE_QoS_Params &qos_params,
-               iovec* iov, 
+               iovec* iov,
                ACE_QoS* qos)
 {
   qos_params.callee_data (iov);
@@ -53,8 +53,8 @@ FillQoSParams (ACE_QoS_Params &qos_params,
 }
 
 int
-main (int argc, char * argv[])
-{  
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
+{
 
   ACE_DEBUG ((LM_DEBUG,
               "Sender\n"));
@@ -88,7 +88,7 @@ main (int argc, char * argv[])
                                                             25,
                                                             1)))
          {
-         case 1 : 
+         case 1 :
            ACE_ERROR_RETURN ((LM_ERROR,
                               "Unable to bind the new flow spec\n"
                               "The Flow Spec name already exists\n"),
@@ -100,7 +100,7 @@ main (int argc, char * argv[])
                              -1);
            break;
          }
-    
+
        ACE_DEBUG ((LM_DEBUG,
                    "g_711 Flow Spec bound successfully\n"));
 
@@ -115,31 +115,31 @@ main (int argc, char * argv[])
        else
          ACE_DEBUG ((LM_DEBUG,
                      "Filled up the Sender QoS parameters\n"));
-       
+
        // Opening a new Multicast Datagram. It is absolutely necessary that
        // the sender and the receiver subscribe to the same multicast
        // addresses to make sure the "multicast sessions" for the two are
        // the same. This is used to match the RESV<->PATH states.
        ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos;
-       
+
       // Multicast Session Address specified by user at command line.
-      // If this address is not specified, 
-      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed. 
+      // If this address is not specified,
+      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed.
        ACE_INET_Addr mult_addr (*(qos_util.mult_session_addr ()));
-      
+
       // Fill the ACE_QoS_Params to be passed to the <ACE_OS::join_leaf>
       // through subscribe.
-      
+
       ACE_QoS_Params qos_params;
       FillQoSParams (qos_params, 0, &ace_qos_sender);
-      
+
       // Create a QoS Session Factory.
       ACE_QoS_Session_Factory session_factory;
-      
+
       // Ask the factory to create a QoS session.
-      ACE_QoS_Session *qos_session = 
+      ACE_QoS_Session *qos_session =
         session_factory.create_session ();
-      
+
       // Create a destination address for the QoS session. The same
       // address should be used for the subscribe call later. A copy is
       // made below only to distinguish the two usages of the dest
@@ -171,7 +171,7 @@ main (int argc, char * argv[])
       // done, the subscribe call will fail. A more abstract version of
       // subscribe will be added that constrains the various features of
       // GQoS like different flags etc.
-      
+
       if (dgram_mcast_qos.subscribe (mult_addr,
                                      qos_params,
                                      1,
@@ -181,8 +181,8 @@ main (int argc, char * argv[])
                                      0,
                                      0, // ACE_Protocol_Info,
                                      0,
-                                     ACE_OVERLAPPED_SOCKET_FLAG 
-                                     | ACE_FLAG_MULTIPOINT_C_LEAF 
+                                     ACE_OVERLAPPED_SOCKET_FLAG
+                                     | ACE_FLAG_MULTIPOINT_C_LEAF
                                      | ACE_FLAG_MULTIPOINT_D_LEAF,
                                      qos_session) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -195,7 +195,7 @@ main (int argc, char * argv[])
       int nIP_TTL = 25;
       char achInBuf [BUFSIZ];
       u_long dwBytes;
-  
+
       // Should this be abstracted into QoS objects ?? Doesnt seem to have
       // to do anything directly with QoS.
       if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket.
diff --git a/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc b/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc
deleted file mode 100644
index 9767bd6fdb9..00000000000
--- a/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*receiver) : aceexe, qos {
-  exename = receiver
-  requires += qos
-  Source_Files {
-    Fill_ACE_QoS.cpp
-    QoS_Signal_Handler.cpp
-    QoS_Util.cpp
-    receiver.cpp
-    Receiver_QoS_Event_Handler.cpp
-  }
-}
-project(*sender) : aceexe, qos {
-  exename = sender
-  requires += qos
-  Source_Files {
-    Fill_ACE_QoS.cpp
-    QoS_Signal_Handler.cpp
-    QoS_Util.cpp
-    sender.cpp
-    Sender_QoS_Event_Handler.cpp
-  }
-}
diff --git a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
index 4005b40a25a..0ef3b353248 100644
--- a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
+++ b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(QOS, QoS_Util,"$Id$")
 
 // constructor.
 QoS_Util::QoS_Util (int argc,
-                    char *argv[])
+                    ACE_TCHAR *argv[])
   : argc_ (argc),
     argv_ (argv),
     source_port_ (SENDER_PORT),
@@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void)
 int
 QoS_Util::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "m:n:p:P:c");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -50,10 +50,10 @@ QoS_Util::parse_args (void)
         this->dest_addr_->set (get_opts.opt_arg ());
         break;
       case 'p': // protocol.
-        if (ACE_OS::strcasecmp (get_opts.opt_arg (), "tcp") == 0)
+        if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("tcp")) == 0)
           this->protocol_ = IPPROTO_TCP;
         else
-          if (ACE_OS::strcasecmp (get_opts.opt_arg (), "udp") == 0)
+          if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("udp")) == 0)
             this->protocol_ = IPPROTO_UDP;
           else
             ACE_DEBUG ((LM_DEBUG,
diff --git a/examples/QOS/Change_Sender_TSpec/QoS_Util.h b/examples/QOS/Change_Sender_TSpec/QoS_Util.h
index 6de6e2d24d3..ae347de68f6 100644
--- a/examples/QOS/Change_Sender_TSpec/QoS_Util.h
+++ b/examples/QOS/Change_Sender_TSpec/QoS_Util.h
@@ -22,21 +22,21 @@
 
 class QoS_Util
 {
-  // = TITLE 
-  //     This class provides the utility functions like parse_args () 
+  // = TITLE
+  //     This class provides the utility functions like parse_args ()
   //     required by a QoS enabled application.
 
 public:
 
   // constructor.
-  QoS_Util (int argc, char *argv[]);
+  QoS_Util (int argc, ACE_TCHAR *argv[]);
 
   // destructor.
   ~QoS_Util (void);
 
   // Parse command-line arguments.
   int parse_args (void);
-  
+
   // GET methods.
   ACE_INET_Addr *mult_session_addr (void) const;
 
@@ -52,7 +52,7 @@ private:
 
   // Command line arguments.
   int argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
 
   // Multicast session address.
   ACE_INET_Addr *mult_session_addr_;
diff --git a/examples/QOS/Change_Sender_TSpec/receiver.cpp b/examples/QOS/Change_Sender_TSpec/receiver.cpp
index c01433655a2..e5702b90c1c 100644
--- a/examples/QOS/Change_Sender_TSpec/receiver.cpp
+++ b/examples/QOS/Change_Sender_TSpec/receiver.cpp
@@ -25,7 +25,7 @@
 #include "Fill_ACE_QoS.h"
 #include "QoS_Signal_Handler.h"
 #include "Receiver_QoS_Event_Handler.h"
-    
+
 // To open QOS sockets administrative access is required on the
 // machine.  Fill in default values for QoS structure.  The default
 // values were simply choosen from existing QOS templates available
@@ -42,7 +42,7 @@
 
 int
 FillQoSParams (ACE_QoS_Params &qos_params,
-               iovec* iov, 
+               iovec* iov,
                ACE_QoS* qos)
 {
   qos_params.callee_data (iov);
@@ -55,8 +55,8 @@ FillQoSParams (ACE_QoS_Params &qos_params,
 }
 
 int
-main (int argc, char * argv[])
-{  
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
+{
 
   QoS_Util qos_util(argc, argv);
 
@@ -87,7 +87,7 @@ main (int argc, char * argv[])
                                                             25,
                                                             1)))
          {
-         case 1 : 
+         case 1 :
            ACE_ERROR_RETURN ((LM_ERROR,
                               "Unable to bind the new flow spec\n"
                               "The Flow Spec name already exists\n"),
@@ -99,7 +99,7 @@ main (int argc, char * argv[])
                              -1);
            break;
          }
-    
+
        ACE_DEBUG ((LM_DEBUG,
                    "g_711 Flow Spec bound successfully\n"));
 
@@ -116,12 +116,12 @@ main (int argc, char * argv[])
 
       // Opening a new Multicast Datagram.
       ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos;
-      
+
       // Multicast Session Address specified by user at command line.
-      // If this address is not specified, 
-      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed. 
+      // If this address is not specified,
+      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed.
       ACE_INET_Addr mult_addr (*(qos_util.mult_session_addr ()));
-      
+
       // Fill the ACE_QoS_Params to be passed to the <ACE_OS::join_leaf>
       // through subscribe.
 
@@ -132,7 +132,7 @@ main (int argc, char * argv[])
       ACE_QoS_Session_Factory session_factory;
 
       // Ask the factory to create a QoS session.
-      ACE_QoS_Session *qos_session = 
+      ACE_QoS_Session *qos_session =
         session_factory.create_session ();
 
       // Create a destination address for the QoS session. The same
@@ -167,7 +167,7 @@ main (int argc, char * argv[])
       // subscribe call will fail. A more abstract version of
       // subscribe will be added that constrains the various features
       // of GQoS like different flags etc.
-      
+
       if (dgram_mcast_qos.subscribe (mult_addr,
                                      qos_params,
                                      1,
@@ -177,8 +177,8 @@ main (int argc, char * argv[])
                                      0,
                                      0, // ACE_Protocol_Info,
                                      0,
-                                     ACE_OVERLAPPED_SOCKET_FLAG 
-                                     | ACE_FLAG_MULTIPOINT_C_LEAF 
+                                     ACE_OVERLAPPED_SOCKET_FLAG
+                                     | ACE_FLAG_MULTIPOINT_C_LEAF
                                      | ACE_FLAG_MULTIPOINT_D_LEAF,
                                      qos_session) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -191,7 +191,7 @@ main (int argc, char * argv[])
       int nIP_TTL = 25;
       char achInBuf [BUFSIZ];
       u_long dwBytes;
-  
+
       // Should this be abstracted into QoS objects ?? Doesnt seem to have
       // to do anything directly with QoS.
       if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket.
diff --git a/examples/QOS/Change_Sender_TSpec/sender.cpp b/examples/QOS/Change_Sender_TSpec/sender.cpp
index 7777973116d..68d8d1a5586 100644
--- a/examples/QOS/Change_Sender_TSpec/sender.cpp
+++ b/examples/QOS/Change_Sender_TSpec/sender.cpp
@@ -40,7 +40,7 @@
 
 int
 FillQoSParams (ACE_QoS_Params &qos_params,
-               iovec* iov, 
+               iovec* iov,
                ACE_QoS* qos)
 {
   qos_params.callee_data (iov);
@@ -53,8 +53,8 @@ FillQoSParams (ACE_QoS_Params &qos_params,
 }
 
 int
-main (int argc, char * argv[])
-{  
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
+{
 
   ACE_DEBUG ((LM_DEBUG,
               "Sender\n"));
@@ -88,7 +88,7 @@ main (int argc, char * argv[])
                                                             25,
                                                             1)))
          {
-         case 1 : 
+         case 1 :
            ACE_ERROR_RETURN ((LM_ERROR,
                               "Unable to bind the new flow spec\n"
                               "The Flow Spec name already exists\n"),
@@ -100,7 +100,7 @@ main (int argc, char * argv[])
                              -1);
            break;
          }
-    
+
        ACE_DEBUG ((LM_DEBUG,
                    "g_711 Flow Spec bound successfully\n"));
 
@@ -115,31 +115,31 @@ main (int argc, char * argv[])
        else
          ACE_DEBUG ((LM_DEBUG,
                      "Filled up the Sender QoS parameters\n"));
-       
+
        // Opening a new Multicast Datagram. It is absolutely necessary that
        // the sender and the receiver subscribe to the same multicast
        // addresses to make sure the "multicast sessions" for the two are
        // the same. This is used to match the RESV<->PATH states.
        ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos;
-       
+
       // Multicast Session Address specified by user at command line.
-      // If this address is not specified, 
-      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed. 
+      // If this address is not specified,
+      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed.
        ACE_INET_Addr mult_addr (*(qos_util.mult_session_addr ()));
-      
+
       // Fill the ACE_QoS_Params to be passed to the <ACE_OS::join_leaf>
       // through subscribe.
-      
+
       ACE_QoS_Params qos_params;
       FillQoSParams (qos_params, 0, &ace_qos_sender);
-      
+
       // Create a QoS Session Factory.
       ACE_QoS_Session_Factory session_factory;
-      
+
       // Ask the factory to create a QoS session.
-      ACE_QoS_Session *qos_session = 
+      ACE_QoS_Session *qos_session =
         session_factory.create_session ();
-      
+
       // Create a destination address for the QoS session. The same
       // address should be used for the subscribe call later. A copy is
       // made below only to distinguish the two usages of the dest
@@ -171,7 +171,7 @@ main (int argc, char * argv[])
       // done, the subscribe call will fail. A more abstract version of
       // subscribe will be added that constrains the various features of
       // GQoS like different flags etc.
-      
+
       if (dgram_mcast_qos.subscribe (mult_addr,
                                      qos_params,
                                      1,
@@ -181,8 +181,8 @@ main (int argc, char * argv[])
                                      0,
                                      0, // ACE_Protocol_Info,
                                      0,
-                                     ACE_OVERLAPPED_SOCKET_FLAG 
-                                     | ACE_FLAG_MULTIPOINT_C_LEAF 
+                                     ACE_OVERLAPPED_SOCKET_FLAG
+                                     | ACE_FLAG_MULTIPOINT_C_LEAF
                                      | ACE_FLAG_MULTIPOINT_D_LEAF,
                                      qos_session) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -195,7 +195,7 @@ main (int argc, char * argv[])
       int nIP_TTL = 25;
       char achInBuf [BUFSIZ];
       u_long dwBytes;
-  
+
       // Should this be abstracted into QoS objects ?? Doesnt seem to have
       // to do anything directly with QoS.
       if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket.
diff --git a/examples/QOS/Diffserv/diffserv_test.cpp b/examples/QOS/Diffserv/diffserv_test.cpp
index 6fd0d8bca8b..1969616ea32 100644
--- a/examples/QOS/Diffserv/diffserv_test.cpp
+++ b/examples/QOS/Diffserv/diffserv_test.cpp
@@ -92,7 +92,7 @@ const char *dscp_char[]=
   };
 
 int
-main(int argc , char *argv[])
+ACE_TMAIN (int argc , ACE_TCHAR *argv[])
 {
 
   if(argc != 3)
diff --git a/examples/QOS/Diffserv/server.cpp b/examples/QOS/Diffserv/server.cpp
index 2c082cdc1e7..a1030d775e9 100644
--- a/examples/QOS/Diffserv/server.cpp
+++ b/examples/QOS/Diffserv/server.cpp
@@ -109,7 +109,7 @@ run_test (u_short localport)
   ACE_INET_Addr local_addr (localport);
 
   Dgram_Endpoint *endpoint;
-  
+
   ACE_NEW_RETURN (endpoint,
                   Dgram_Endpoint (local_addr),
                   -1);
@@ -124,7 +124,7 @@ run_test (u_short localport)
                        "ACE_Reactor::register_handler"),
                       -1);
 
-  int ret; 
+  int ret;
   while(1){
     ACE_Time_Value tv(10, 0);
     ret = ACE_Reactor::instance ()->handle_events (&tv);
@@ -144,7 +144,7 @@ run_test (u_short localport)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Estabish call backs and socket names.
 
diff --git a/examples/QOS/Simple/QoS_Util.cpp b/examples/QOS/Simple/QoS_Util.cpp
index 4005b40a25a..0ef3b353248 100644
--- a/examples/QOS/Simple/QoS_Util.cpp
+++ b/examples/QOS/Simple/QoS_Util.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(QOS, QoS_Util,"$Id$")
 
 // constructor.
 QoS_Util::QoS_Util (int argc,
-                    char *argv[])
+                    ACE_TCHAR *argv[])
   : argc_ (argc),
     argv_ (argv),
     source_port_ (SENDER_PORT),
@@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void)
 int
 QoS_Util::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "m:n:p:P:c");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -50,10 +50,10 @@ QoS_Util::parse_args (void)
         this->dest_addr_->set (get_opts.opt_arg ());
         break;
       case 'p': // protocol.
-        if (ACE_OS::strcasecmp (get_opts.opt_arg (), "tcp") == 0)
+        if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("tcp")) == 0)
           this->protocol_ = IPPROTO_TCP;
         else
-          if (ACE_OS::strcasecmp (get_opts.opt_arg (), "udp") == 0)
+          if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("udp")) == 0)
             this->protocol_ = IPPROTO_UDP;
           else
             ACE_DEBUG ((LM_DEBUG,
diff --git a/examples/QOS/Simple/QoS_Util.h b/examples/QOS/Simple/QoS_Util.h
index 6de6e2d24d3..ae347de68f6 100644
--- a/examples/QOS/Simple/QoS_Util.h
+++ b/examples/QOS/Simple/QoS_Util.h
@@ -22,21 +22,21 @@
 
 class QoS_Util
 {
-  // = TITLE 
-  //     This class provides the utility functions like parse_args () 
+  // = TITLE
+  //     This class provides the utility functions like parse_args ()
   //     required by a QoS enabled application.
 
 public:
 
   // constructor.
-  QoS_Util (int argc, char *argv[]);
+  QoS_Util (int argc, ACE_TCHAR *argv[]);
 
   // destructor.
   ~QoS_Util (void);
 
   // Parse command-line arguments.
   int parse_args (void);
-  
+
   // GET methods.
   ACE_INET_Addr *mult_session_addr (void) const;
 
@@ -52,7 +52,7 @@ private:
 
   // Command line arguments.
   int argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
 
   // Multicast session address.
   ACE_INET_Addr *mult_session_addr_;
diff --git a/examples/QOS/Simple/receiver.cpp b/examples/QOS/Simple/receiver.cpp
index ecf85a51d45..72381d64f69 100644
--- a/examples/QOS/Simple/receiver.cpp
+++ b/examples/QOS/Simple/receiver.cpp
@@ -25,7 +25,7 @@
 #include "Fill_ACE_QoS.h"
 #include "QoS_Signal_Handler.h"
 #include "Receiver_QoS_Event_Handler.h"
-    
+
 // To open QOS sockets administrative access is required on the
 // machine.  Fill in default values for QoS structure.  The default
 // values were simply choosen from existing QOS templates available
@@ -42,7 +42,7 @@
 
 int
 FillQoSParams (ACE_QoS_Params &qos_params,
-               iovec* iov, 
+               iovec* iov,
                ACE_QoS* qos)
 {
   qos_params.callee_data (iov);
@@ -55,8 +55,8 @@ FillQoSParams (ACE_QoS_Params &qos_params,
 }
 
 int
-main (int argc, char * argv[])
-{  
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
+{
 
   QoS_Util qos_util(argc, argv);
 
@@ -87,7 +87,7 @@ main (int argc, char * argv[])
                                                             25,
                                                             1)))
          {
-         case 1 : 
+         case 1 :
            ACE_ERROR_RETURN ((LM_ERROR,
                               "Unable to bind the new flow spec\n"
                               "The Flow Spec name already exists\n"),
@@ -99,7 +99,7 @@ main (int argc, char * argv[])
                              -1);
            break;
          }
-    
+
        ACE_DEBUG ((LM_DEBUG,
                    "g_711 Flow Spec bound successfully\n"));
 
@@ -116,12 +116,12 @@ main (int argc, char * argv[])
 
       // Opening a new Multicast Datagram.
       ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos;
-      
+
       // Multicast Session Address specified by user at command line.
-      // If this address is not specified, 
-      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed. 
+      // If this address is not specified,
+      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed.
       ACE_INET_Addr mult_addr (*(qos_util.mult_session_addr ()));
-      
+
       // Fill the ACE_QoS_Params to be passed to the <ACE_OS::join_leaf>
       // through subscribe.
 
@@ -133,7 +133,7 @@ main (int argc, char * argv[])
 
       // Ask the factory to create a QoS session. This could be RAPI or
       // GQoS based on the parameter passed.
-      ACE_QoS_Session *qos_session = 
+      ACE_QoS_Session *qos_session =
         session_factory.create_session ();
 
       // Create a destination address for the QoS session. The same
@@ -168,7 +168,7 @@ main (int argc, char * argv[])
       // subscribe call will fail. A more abstract version of
       // subscribe will be added that constrains the various features
       // of GQoS like different flags etc.
-      
+
       if (dgram_mcast_qos.subscribe (mult_addr,
                                      qos_params,
                                      1,
@@ -178,8 +178,8 @@ main (int argc, char * argv[])
                                      0,
                                      0, // ACE_Protocol_Info,
                                      0,
-                                     ACE_OVERLAPPED_SOCKET_FLAG 
-                                     | ACE_FLAG_MULTIPOINT_C_LEAF 
+                                     ACE_OVERLAPPED_SOCKET_FLAG
+                                     | ACE_FLAG_MULTIPOINT_C_LEAF
                                      | ACE_FLAG_MULTIPOINT_D_LEAF,
                                      qos_session) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -192,7 +192,7 @@ main (int argc, char * argv[])
       int nIP_TTL = 25;
       char achInBuf [BUFSIZ];
       u_long dwBytes;
-  
+
       // Should this be abstracted into QoS objects ?? Doesnt seem to have
       // to do anything directly with QoS.
       if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket.
diff --git a/examples/QOS/Simple/sender.cpp b/examples/QOS/Simple/sender.cpp
index 7ccce8eb351..97e6aafa407 100644
--- a/examples/QOS/Simple/sender.cpp
+++ b/examples/QOS/Simple/sender.cpp
@@ -40,7 +40,7 @@
 
 int
 FillQoSParams (ACE_QoS_Params &qos_params,
-               iovec* iov, 
+               iovec* iov,
                ACE_QoS* qos)
 {
   qos_params.callee_data (iov);
@@ -53,8 +53,8 @@ FillQoSParams (ACE_QoS_Params &qos_params,
 }
 
 int
-main (int argc, char * argv[])
-{  
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
+{
 
   ACE_DEBUG ((LM_DEBUG,
               "Sender\n"));
@@ -88,7 +88,7 @@ main (int argc, char * argv[])
                                                             25,
                                                             1)))
          {
-         case 1 : 
+         case 1 :
            ACE_ERROR_RETURN ((LM_ERROR,
                               "Unable to bind the new flow spec\n"
                               "The Flow Spec name already exists\n"),
@@ -100,7 +100,7 @@ main (int argc, char * argv[])
                              -1);
            break;
          }
-    
+
        ACE_DEBUG ((LM_DEBUG,
                    "g_711 Flow Spec bound successfully\n"));
 
@@ -115,31 +115,31 @@ main (int argc, char * argv[])
        else
          ACE_DEBUG ((LM_DEBUG,
                      "Filled up the Sender QoS parameters\n"));
-       
+
        // Opening a new Multicast Datagram. It is absolutely necessary that
        // the sender and the receiver subscribe to the same multicast
        // addresses to make sure the "multicast sessions" for the two are
        // the same. This is used to match the RESV<->PATH states.
        ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos;
-       
+
       // Multicast Session Address specified by user at command line.
-      // If this address is not specified, 
-      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed. 
+      // If this address is not specified,
+      // <localhost:ACE_DEFAULT_MULTICAST_PORT> is assumed.
        ACE_INET_Addr mult_addr (*(qos_util.mult_session_addr ()));
-      
+
       // Fill the ACE_QoS_Params to be passed to the <ACE_OS::join_leaf>
       // through subscribe.
-      
+
       ACE_QoS_Params qos_params;
       FillQoSParams (qos_params, 0, &ace_qos_sender);
-      
+
       // Create a QoS Session Factory.
       ACE_QoS_Session_Factory session_factory;
-      
+
       // Ask the factory to create a QoS session.
-      ACE_QoS_Session *qos_session = 
+      ACE_QoS_Session *qos_session =
         session_factory.create_session ();
-      
+
       // Create a destination address for the QoS session. The same
       // address should be used for the subscribe call later. A copy is
       // made below only to distinguish the two usages of the dest
@@ -171,7 +171,7 @@ main (int argc, char * argv[])
       // done, the subscribe call will fail. A more abstract version of
       // subscribe will be added that constrains the various features of
       // GQoS like different flags etc.
-      
+
       if (dgram_mcast_qos.subscribe (mult_addr,
                                      qos_params,
                                      1,
@@ -181,8 +181,8 @@ main (int argc, char * argv[])
                                      0,
                                      0, // ACE_Protocol_Info,
                                      0,
-                                     ACE_OVERLAPPED_SOCKET_FLAG 
-                                     | ACE_FLAG_MULTIPOINT_C_LEAF 
+                                     ACE_OVERLAPPED_SOCKET_FLAG
+                                     | ACE_FLAG_MULTIPOINT_C_LEAF
                                      | ACE_FLAG_MULTIPOINT_D_LEAF,
                                      qos_session) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -195,7 +195,7 @@ main (int argc, char * argv[])
       int nIP_TTL = 25;
       char achInBuf [BUFSIZ];
       u_long dwBytes;
-  
+
       // Should this be abstracted into QoS objects ?? Doesnt seem to have
       // to do anything directly with QoS.
       if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket.
diff --git a/examples/README b/examples/README
index 08d0f235b46..4f2629dfba9 100644
--- a/examples/README
+++ b/examples/README
@@ -2,7 +2,7 @@ This directory contains a number of examples that illustrate how to
 use the following ACE library components.  If you want to see how
 to program using ACE, this is the best place to start reading code and
 learning the ACE design.
-				
+
 These examples are roughly divided up according to the class
 categories in ACE.  For more information on ACE class categories,
 please take a look at $ACE_ROOT/ACE-categories.
@@ -11,14 +11,10 @@ please take a look at $ACE_ROOT/ACE-categories.
 		Illustrate various components in the ADAPTIVE Service
 		eXecutive, which is a user-level implementation of
 		System V STREAMS written in C++.
-		
-
-	. CORBA
-		Illustrate how CORBA can be integrated into ACE.
 
 	. Connection
 		Illustrate how the various Acceptor and Connector
-		components can be used.		
+		components can be used.
 
 	. IOStream
 		Illustrate how the ACE IOStreams wrapper works.
@@ -31,7 +27,7 @@ please take a look at $ACE_ROOT/ACE-categories.
 		Illustrate some of the features of the logging
 		facility used in ACE to consolidate debugging and
 		error report.
-		
+
 	. Logger
 		This is a simple version of a Server Logging Daemon
 		that illustrates the "bare-bones" usage of the
@@ -42,7 +38,7 @@ please take a look at $ACE_ROOT/ACE-categories.
 	. Mem_Map
 		Illustrate how the ACE memory-mapped file components
 		work.
-		
+
 	. Misc
 		Various miscellaneous tests that illustrate how ACE
 		utility components work.
@@ -71,7 +67,7 @@ please take a look at $ACE_ROOT/ACE-categories.
 		shared memory and memory mapped file.
 
 	. System_V_IPC
-		Illustrates how to use the ACE wrappers for System V 
+		Illustrates how to use the ACE wrappers for System V
 		IPC (i.e., semphores, shared memory, and message
 		queues).
 
@@ -79,5 +75,3 @@ please take a look at $ACE_ROOT/ACE-categories.
 		Illustrates the use of ACE wrappers for threading
 		and synchronization.
 
-		
-	
diff --git a/examples/RMCast/Send_File/RMCast_Send_File.mpc b/examples/RMCast/Send_File/RMCast_Send_File.mpc
deleted file mode 100644
index 897e1611b71..00000000000
--- a/examples/RMCast/Send_File/RMCast_Send_File.mpc
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Sender) : aceexe, rmcast {
-  exename = sender
-  Source_Files {
-    Sender.cpp
-  }
-}
-project(*Receiver) : aceexe, rmcast {
-  exename = receiver
-  Source_Files {
-    Receiver.cpp
-  }
-}
diff --git a/examples/RMCast/Send_File/Receiver.cpp b/examples/RMCast/Send_File/Receiver.cpp
deleted file mode 100644
index 80ac7be26bd..00000000000
--- a/examples/RMCast/Send_File/Receiver.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-// $Id$
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_fcntl.h"
-#include "ace/RMCast/RMCast_UDP_Reliable_Receiver.h"
-#include "ace/INET_Addr.h"
-#include "ace/FILE_IO.h"
-#include "ace/Message_Block.h"
-#include "ace/Reactor.h"
-
-ACE_RCSID(tests, RMCast_Examples_Receiver, "$Id$")
-
-class File_Module : public ACE_RMCast_Module
-{
-public:
-  File_Module (void);
-
-  /// Return 1 if all the data has been received
-  int status (void) const;
-
-  /// Initialize the module
-  int init (const ACE_TCHAR *filename);
-
-  int close (void);
-  int data (ACE_RMCast::Data &data);
-  int ack_join (ACE_RMCast::Ack_Join &ack_join);
-  int ack_leave (ACE_RMCast::Ack_Leave &ack_leave);
-
-private:
-  /// Set to 1 when the last block is received
-  int status_;
-
-  /// Used to dump the received data into a file
-  ACE_FILE_IO file_io_;
-};
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  if (argc != 3)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Usage: %s <filename> <mcastgroup:port>\n",
-                         argv[0]),
-                        1);
-    }
-
-  const ACE_TCHAR *filename = argv[1];
-
-  File_Module file_module;
-  if (file_module.init (filename) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot init file module\n"),
-                        1);
-    }
-
-  ACE_RMCast_UDP_Reliable_Receiver receiver (&file_module);
-
-  ACE_INET_Addr mcast_group;
-  if (mcast_group.set (argv[2]) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot setup multicast group <%s>\n",
-                         argv[2]),
-                        1);
-    }
-
-  if (receiver.init (mcast_group) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot init UDP I/O at <%s:%d> %p\n",
-                         mcast_group.get_host_name (),
-                         mcast_group.get_port_number (),
-                         ""),
-                        1);
-    }
-
-  // Use the Reactor to demultiplex all the messages
-  ACE_Reactor *reactor = ACE_Reactor::instance ();
-  receiver.reactive_incoming_messages (reactor);
-
-  // Wait until all the messages are successfully delivered
-  do
-    {
-      // Try for 50 milliseconds...
-      ACE_Time_Value tv (5, 0); // 0, 50000);
-      int r = reactor->handle_events (&tv);
-      if (r == -1)
-        break;
-    }
-  while (file_module.status () != 2);
-
-  ACE_DEBUG ((LM_DEBUG, "event loop completed\n"));
-
-  return 0;
-}
-
-// ****************************************************************
-
-File_Module::File_Module (void)
-  :  status_ (0)
-{
-}
-
-int
-File_Module::status (void) const
-{
-  return this->status_;
-}
-
-int
-File_Module::init (const ACE_TCHAR * filename)
-{
-  ACE_HANDLE handle = ACE_OS::open (filename,
-                                    O_WRONLY|O_BINARY|O_CREAT,
-                                    ACE_DEFAULT_FILE_PERMS);
-  if (handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Cannot open file <%s> %p\n", filename, ""),
-                      -1);
-  this->file_io_.set_handle (handle);
-  return 0;
-}
-
-int
-File_Module::close (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "File_Module closed\n"));
-  (void) this->file_io_.close ();
-  return 0;
-}
-
-int
-File_Module::data (ACE_RMCast::Data &data)
-{
-  if (this->status_ == 1)
-    return -1;
-
-  size_t length = data.payload->length () - 1;
-  (void) this->file_io_.send (data.payload->rd_ptr () + 1, length);
-
-  if (*(data.payload->rd_ptr ()) == 'E')
-    {
-      this->status_ = 1;
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-File_Module::ack_join (ACE_RMCast::Ack_Join &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "File_Module::ack_join\n"));
-  return 0;
-}
-
-int
-File_Module::ack_leave (ACE_RMCast::Ack_Leave &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "File_Module::ack_leave\n"));
-  this->status_ = 2;
-  return 0;
-}
diff --git a/examples/RMCast/Send_File/Sender.cpp b/examples/RMCast/Send_File/Sender.cpp
deleted file mode 100644
index ec6e3e43642..00000000000
--- a/examples/RMCast/Send_File/Sender.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-// $Id$
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_fcntl.h"
-#include "ace/RMCast/RMCast_UDP_Reliable_Sender.h"
-#include "ace/INET_Addr.h"
-#include "ace/FILE_IO.h"
-#include "ace/Message_Block.h"
-#include "ace/Reactor.h"
-
-ACE_RCSID(tests, RMCast_Examples_Sender, "$Id$")
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  if (argc != 3)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Usage: %s <filename> <mcastgroup:port>\n",
-                         argv[0]),
-                        1);
-    }
-
-  const ACE_TCHAR *filename = argv[1];
-  if (ACE_OS::access (filename, R_OK) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot read file <%s>\n", filename),
-                        1);
-    }
-
-  ACE_INET_Addr mcast_group;
-  if (mcast_group.set (argv[2]) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot setup multicast group <%s>\n",
-                         argv[2]),
-                        1);
-    }
-
-
-  ACE_HANDLE handle = ACE_OS::open (filename, O_RDONLY|O_BINARY);
-  if (handle == ACE_INVALID_HANDLE)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot open file <%s> %p\n", filename, ""),
-                        1);
-    }
-  ACE_FILE_IO file_io;
-  file_io.set_handle (handle);
-
-  // We don't provide a module to receive the control messages, in
-  // this example we simply ignore them.
-  ACE_RMCast_UDP_Reliable_Sender sender (0);
-
-  if (sender.init (mcast_group) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot init UDP I/O at <%s:%d> %p\n",
-                         mcast_group.get_host_name (),
-                         mcast_group.get_port_number (),
-                         ""),
-                        1);
-    }
-
-  // Use the Reactor to demultiplex all the messages
-  ACE_Reactor *reactor = ACE_Reactor::instance ();
-
-  sender.reactive_incoming_messages (reactor);
-  {
-    // Resend the messages every 20 milliseconds..
-    ACE_Time_Value tv (2, 0);
-    sender.reactive_resends (reactor, tv);
-  }
-
-  for (;;)
-    {
-      ACE_Message_Block payload (BUFSIZ + 1);
-
-      ssize_t r = file_io.recv (payload.rd_ptr () + 1, BUFSIZ);
-      if (r <= 0)
-        break;
-
-      payload.wr_ptr (r + 1);
-      *(payload.rd_ptr ()) = 'N'; // Normal
-      if (r < BUFSIZ)
-        {
-          *(payload.rd_ptr ()) = 'E'; // EOF
-        }
-
-      ACE_RMCast::Data data;
-      data.payload = &payload;
-      if (sender.data (data) != 0)
-        break;
-
-      if (r < BUFSIZ)
-        {
-          // Last buffer, terminate loop
-          break;
-        }
-
-      // Handle incoming events, without blocking...
-      ACE_Time_Value tv (4, 0);
-      reactor->handle_events (&tv);
-    }
-
-  // Wait until all the messages are successfully delivered
-  do
-    {
-      // Try for 50 milliseconds...
-      ACE_Time_Value tv (5, 0);
-      int r = reactor->handle_events (&tv);
-      if (r == -1)
-        break;
-    }
-  while (sender.has_data () || sender.has_members ());
-
-  return 0;
-}
diff --git a/examples/Reactor/FIFO/client.cpp b/examples/Reactor/FIFO/client.cpp
index c4737d16db4..daa8d3304ad 100644
--- a/examples/Reactor/FIFO/client.cpp
+++ b/examples/Reactor/FIFO/client.cpp
@@ -7,7 +7,7 @@
 ACE_RCSID(FIFO, client, "$Id$")
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   char buf[] = "hello world";
   ACE_Str_Buf msg (buf, sizeof buf);
diff --git a/examples/Reactor/FIFO/server.cpp b/examples/Reactor/FIFO/server.cpp
index 108f51a7ffc..b6e91dd5046 100644
--- a/examples/Reactor/FIFO/server.cpp
+++ b/examples/Reactor/FIFO/server.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
+#include "ace/Event_Handler.h"
 #include "ace/FIFO_Recv_Msg.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_unistd.h"
@@ -28,12 +30,12 @@ FIFO_Recv_Handler::FIFO_Recv_Handler (void)
   // Make sure to open the FIFO with the "persistent" flag enabled
   // (which is the default).
   if (this->fifo_reader_.open (ACE_DEFAULT_RENDEZVOUS) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "open"));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")));
 
   // Register with the Reactor.
   if (ACE_Reactor::instance ()->register_handler
       (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("register_handler")));
 }
 
 ACE_HANDLE
@@ -53,35 +55,35 @@ FIFO_Recv_Handler::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
 
-  ACE_DEBUG ((LM_DEBUG, "handle_input\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_input\n")));
 
   ACE_Str_Buf msg (buf, 0, sizeof buf);
 
   ssize_t n = this->fifo_reader_.recv (msg);
 
   if (n < 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "recv"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv")), -1);
   else
     {
-      ACE_DEBUG ((LM_DEBUG, "msg.len = %d, n = %d\n", msg.len, n));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("msg.len = %d, n = %d\n"), msg.len, n));
 
       if (msg.len > 0)
 	{
 	  // Do some work in here...
-	  ACE_DEBUG ((LM_DEBUG, "msg.buf = %s\n", msg.buf));
+	  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("msg.buf = %C\n"), msg.buf));
 	}
       return 0;
     }
 }
 
 int
-main (int, char *argv[])
+ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
   ACE_Service_Config daemon (argv[0]);
 
   FIFO_Recv_Handler fr_handler;
 
-  ACE_Reactor::run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
 
   return 0;
 }
diff --git a/examples/Reactor/Misc/Reactor_Misc.mpc b/examples/Reactor/Misc/Reactor_Misc.mpc
index 6436ba8d015..c056a909bd8 100644
--- a/examples/Reactor/Misc/Reactor_Misc.mpc
+++ b/examples/Reactor/Misc/Reactor_Misc.mpc
@@ -1,6 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
+project(*event_handler_t) : aceexe {
+  exename = event_handler_t
+  Source_Files {
+    test_event_handler_t.cpp
+  }
+}
 project(*demuxing) : aceexe {
   exename = demuxing
   Source_Files {
@@ -19,6 +25,12 @@ project(*notification) : aceexe {
     notification.cpp
   }
 }
+project(*pingpong) : aceexe {
+  exename = pingpong
+  Source_Files {
+    pingpong.cpp
+  }
+}
 project(*reactors) : aceexe {
   exename = reactors
   Source_Files {
diff --git a/examples/Reactor/Misc/notification.cpp b/examples/Reactor/Misc/notification.cpp
index 105bfc8475e..a4ccc5b5620 100644
--- a/examples/Reactor/Misc/notification.cpp
+++ b/examples/Reactor/Misc/notification.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Thread.h"
 #include "ace/Signal.h"
@@ -21,7 +22,7 @@ class Thread_Handler : public ACE_Event_Handler
   // = TITLE
   //   Illustrate how the ACE_Reactor's thread-safe event notification
   //   mechanism works.
-  //     
+  //
   // = DESCRIPTION
   //   Handle timeouts in the main thread via the ACE_Reactor and I/O
   //   events in a separate thread.  Just before the separate I/O
@@ -51,7 +52,7 @@ public:
   virtual int handle_output (ACE_HANDLE);
   // Print data from main thread.
 
-  virtual int handle_timeout (const ACE_Time_Value &, 
+  virtual int handle_timeout (const ACE_Time_Value &,
 			      const void *);
   // Handle timeout events in the main thread.
 
@@ -108,14 +109,14 @@ Thread_Handler::~Thread_Handler (void)
   ACE_Reactor::instance ()->cancel_timer (this);
 }
 
-Thread_Handler::Thread_Handler (int delay, 
+Thread_Handler::Thread_Handler (int delay,
 				int interval,
 				size_t n_threads,
                                 size_t max_iterations)
     : iterations_ (max_iterations)
 {
   ACE_Sig_Set sig_set;
-  
+
   sig_set.sig_add (SIGQUIT);
   sig_set.sig_add (SIGINT);
 
@@ -134,7 +135,7 @@ Thread_Handler::Thread_Handler (int delay,
     ACE_ERROR ((LM_ERROR,
                 "(%t) %p\n",
                 "register_handler"));
-  else if (ACE_Reactor::instance ()->schedule_timer 
+  else if (ACE_Reactor::instance ()->schedule_timer
            (this,
             0,
             Thread_Handler::delay_,
@@ -142,7 +143,7 @@ Thread_Handler::Thread_Handler (int delay,
     ACE_ERROR ((LM_ERROR,
                 "(%t) %p\n",
                 "schedule_timer"));
-   
+
   // Set up this thread's signal mask to block all the signal in the
   // <sig_set>, which is inherited by the threads it spawns.
   ACE_Sig_Guard guard (&sig_set);
@@ -152,14 +153,13 @@ Thread_Handler::Thread_Handler (int delay,
   for (size_t i = 0; i < n_threads; i++)
     {
       Thread_Handler *th;
-      
+
       ACE_NEW (th,
                Thread_Handler (i + 1,
                                this->iterations_));
 
-      if (ACE_Thread::spawn (ACE_reinterpret_cast (ACE_THR_FUNC,
-                                                   &Thread_Handler::svc_run),
-                             ACE_reinterpret_cast (void *, th),
+      if (ACE_Thread::spawn (reinterpret_cast<ACE_THR_FUNC> (&Thread_Handler::svc_run),
+                             reinterpret_cast<void *> (th),
                              THR_NEW_LWP | THR_DETACHED) != 0)
         ACE_ERROR ((LM_ERROR,
                     "%p\n",
@@ -176,20 +176,20 @@ Thread_Handler::notify (ACE_Time_Value *timeout)
   // Just do something to test the ACE_Reactor's multi-thread
   // capabilities...
 
-  if (ACE_Reactor::instance ()->notify 
+  if (ACE_Reactor::instance ()->notify
       (this,
        ACE_Event_Handler::EXCEPT_MASK,
        timeout) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%t) %p\n", 
+                       "(%t) %p\n",
 		       "notification::notify:exception"),
                       -1);
-  else if (ACE_Reactor::instance ()->notify 
+  else if (ACE_Reactor::instance ()->notify
 	   (this,
             ACE_Event_Handler::WRITE_MASK,
             timeout) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%t) %p\n", 
+                       "(%t) %p\n",
 		       "notification::notify:write"),
                       -1);
   return 0;
@@ -207,21 +207,21 @@ Thread_Handler::handle_input (ACE_HANDLE handle)
   if (n > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "input to (%t) %*s", 
+                  "input to (%t) %*s",
 		  n,
                   buf));
 
       ACE_DEBUG ((LM_DEBUG,
-                  "%d more input to kill\n", 
+                  "%d more input to kill\n",
 		  this->iterations_));
 
       // Only wait up to 10 milliseconds to notify the Reactor.
       ACE_Time_Value timeout (0,
                               10 * 1000);
-	  
+
       if (this->notify (&timeout) == -1)
-	ACE_ERROR ((LM_DEBUG, 
-                    "(%t), %p\n", 
+	ACE_ERROR ((LM_DEBUG,
+                    "(%t), %p\n",
 		    "notification::handle_input:notify"));
       return 0;
     }
@@ -253,7 +253,7 @@ Thread_Handler::svc (void)
       ACE_Time_Value timeout (0,
                               10 * 1000);
       if (this->notify (&timeout) == -1)
-	ACE_ERROR ((LM_ERROR, 
+	ACE_ERROR ((LM_ERROR,
                     "(%t) %p\n",
                     "notify"));
     }
@@ -267,7 +267,7 @@ Thread_Handler::svc (void)
 
 // Test signal handling.
 
-int 
+int
 Thread_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
 {
   // @@ Note that this code is not portable to all OS platforms since
@@ -280,8 +280,8 @@ Thread_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
     {
     case SIGINT:
     case SIGQUIT:
-      ACE_ERROR ((LM_ERROR, 
-		  "(%t) ******************** shutting down %n on signal %S\n", 
+      ACE_ERROR ((LM_ERROR,
+		  "(%t) ******************** shutting down %n on signal %S\n",
 		  signum));
       this->shutdown_ = 1;
       ACE_Reactor::end_event_loop();
@@ -289,7 +289,7 @@ Thread_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
   return 0;
 }
 
-int 
+int
 Thread_Handler::handle_timeout (const ACE_Time_Value &time,
 				const void *)
 {
@@ -311,7 +311,7 @@ Thread_Handler::handle_timeout (const ACE_Time_Value &time,
 int
 Thread_Handler::handle_exception (ACE_HANDLE)
 {
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
 	      "(%t) exception to id %d, iteration = %d\n",
 	      this->id_,
               this->iterations_));
@@ -323,8 +323,8 @@ Thread_Handler::handle_exception (ACE_HANDLE)
 int
 Thread_Handler::handle_output (ACE_HANDLE)
 {
-  ACE_DEBUG ((LM_DEBUG, 
-	      "(%t) output to id %d, iteration = %d\n", 
+  ACE_DEBUG ((LM_DEBUG,
+	      "(%t) output to id %d, iteration = %d\n",
 	      this->id_,
               // This decrement must come last since
               // <handle_exception> is called before <handle_output>!
@@ -337,24 +337,24 @@ Thread_Handler::handle_output (ACE_HANDLE)
 void *
 Thread_Handler::svc_run (void *eh)
 {
-  Thread_Handler *this_handler = 
-    ACE_reinterpret_cast (Thread_Handler *, eh);
+  Thread_Handler *this_handler =
+    reinterpret_cast<Thread_Handler *> (eh);
 
   if (this_handler->svc () == 0)
     return 0;
   else
-    return ACE_reinterpret_cast (void *, -1);
+    return reinterpret_cast<void *> (-1);
 }
 
-int 
-main (int argc, char *argv[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
   if (argc < 4)
     {
-      ACE_ERROR ((LM_ERROR, 
-                  "usage: %s delay interval n_threads [iterations]\n",
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("usage: %s delay interval n_threads [iterations]\n"),
                   argv[0]));
       ACE_OS::exit (1);
     }
@@ -369,17 +369,17 @@ main (int argc, char *argv[])
                               n_threads,
                               max_iterations);
 
-  ACE_Reactor::run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "exiting from main\n"));
+              ACE_TEXT ("exiting from main\n")));
   return 0;
 }
 #else
-int 
+int
 main (int, char *[])
 {
-  ACE_ERROR_RETURN ((LM_ERROR, 
+  ACE_ERROR_RETURN ((LM_ERROR,
 		     "threads must be supported to run this application\n"), -1);
 }
 #endif /* ACE_HAS_THREADS */
diff --git a/examples/Reactor/Misc/pingpong.cpp b/examples/Reactor/Misc/pingpong.cpp
index 4295d682b14..877b6ab740c 100644
--- a/examples/Reactor/Misc/pingpong.cpp
+++ b/examples/Reactor/Misc/pingpong.cpp
@@ -42,6 +42,11 @@
 #include "ace/Test_and_Set.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Null_Mutex.h"
+#include "ace/OS_NS_unistd.h"
+#if defined (ACE_WIN32) || defined (CHORUS)
+#  include "ace/Barrier.h"
+#  include "ace/Thread.h"
+#endif
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>;
@@ -103,13 +108,13 @@ Ping_Pong::handle_input (ACE_HANDLE)
 
   if (n != (ssize_t) this->buflen_)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) reading [%d] %p\n",
+                       ACE_TEXT ("(%P|%t) reading [%d] %p\n"),
                        handle_,
-                       "read"),
+                       ACE_TEXT ("read")),
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) reading <%d> (%d) [%d] = %s\n",
+              ACE_TEXT ("(%P|%t) reading <%d> (%d) [%d] = %C\n"),
               this->handle_,
               *(int *) this->buf_,
               *(int *) (this->buf_ + sizeof (int)),
@@ -120,15 +125,15 @@ Ping_Pong::handle_input (ACE_HANDLE)
                          this->buflen_);
   if (n == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "[%d] %p\n",
+                       ACE_TEXT ("[%d] %p\n"),
                        handle_,
-                       "read"),
+                       ACE_TEXT ("read")),
                       -1);
   n -= (2 * sizeof (int));
   char *buf = this->buf_ + (2 * sizeof (int));
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) reading <%d> = %*s\n",
+              ACE_TEXT ("(%P|%t) reading <%d> = %*C\n"),
               this->handle_,
               n,
               buf));
@@ -151,7 +156,7 @@ Ping_Pong::handle_output (ACE_HANDLE)
   else
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) writing <%d> [%d]\n",
+                  ACE_TEXT ("(%P|%t) writing <%d> [%d]\n"),
                   this->handle_,
                   this->pid_));
       return 0;
@@ -164,7 +169,7 @@ Ping_Pong::handle_output (ACE_HANDLE)
   else
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) writing <%d>\n",
+                  ACE_TEXT ("(%P|%t) writing <%d>\n"),
                   this->handle_));
       return 0;
     }
@@ -180,7 +185,7 @@ Ping_Pong::handle_timeout (const ACE_Time_Value &,
 }
 
 // Contains the string to "pingpong" back and forth...
-static char *string_name;
+static ACE_TCHAR *string_name;
 
 // Wait for 10 seconds and then shut down.
 static const int SHUTDOWN_TIME = 10;
@@ -193,7 +198,7 @@ run_svc (ACE_HANDLE handle)
   // works because the ACE_Reactor is destroyed before leaving this
   // scope as well, so it'll remove the <callback> object from its
   // internal tables BEFORE it is destroyed.
-  Ping_Pong callback (string_name, handle);
+  Ping_Pong callback (ACE_TEXT_ALWAYS_CHAR (string_name), handle);
 
   // Note that we put the <reactor> AFTER the <callback> so that the
   // <reactor> will get shutdown first.
@@ -214,8 +219,8 @@ run_svc (ACE_HANDLE handle)
                                  SHUTDOWN_TIME) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "reactor"));
+                  ACE_TEXT ("%p\n"),
+                  ACE_TEXT ("reactor")));
       ACE_OS::exit (1);
     }
 
@@ -224,8 +229,8 @@ run_svc (ACE_HANDLE handle)
   while (callback.is_set () == 0)
     if (reactor.handle_events () == -1)
       ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "handle_events"));
+                  ACE_TEXT ("%p\n"),
+                  ACE_TEXT ("handle_events")));
 }
 
 #if defined (ACE_WIN32) || defined (CHORUS)
@@ -242,19 +247,19 @@ worker (void *arg)
   barrier.wait ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) %n: shutting down tester\n"));
+              ACE_TEXT ("(%P|%t) %n: shutting down tester\n")));
   return 0;
 }
 #endif /* ACE_WIN32 */
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
   if (argc != 2)
     ACE_ERROR ((LM_ERROR,
-                "usage: %n string\n%a",
+                ACE_TEXT ("usage: %n string\n%a"),
                 1));
 
   string_name = argv[1];
@@ -272,8 +277,8 @@ main (int argc, char *argv[])
                             (void *) handles[1],
                             THR_DETACHED) == -1)
       ACE_ERROR ((LM_ERROR,
-                  "%p\n%a",
-                  "spawn",
+                  ACE_TEXT ("%p\n%a"),
+                  ACE_TEXT ("spawn"),
                   1));
   barrier.wait ();
 #else
@@ -281,18 +286,18 @@ main (int argc, char *argv[])
 
   if (pid == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n%a",
-                "fork",
+                ACE_TEXT ("%p\n%a"),
+                ACE_TEXT ("fork"),
                 1));
   run_svc (handles[pid == 0]);
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) %n: shutting down tester\n"));
+              ACE_TEXT ("(%P|%t) %n: shutting down tester\n")));
 #endif /* ACE_WIN32 */
 
   if (pipe.close () == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "close"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("close")));
   return 0;
 }
diff --git a/examples/Reactor/Misc/test_demuxing.cpp b/examples/Reactor/Misc/test_demuxing.cpp
index a29a99dfdc8..621e5f72f1c 100644
--- a/examples/Reactor/Misc/test_demuxing.cpp
+++ b/examples/Reactor/Misc/test_demuxing.cpp
@@ -10,6 +10,7 @@
 
 #include "ace/ACE.h"
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 #include "ace/Task.h"
 #include "ace/Reactor_Notification_Strategy.h"
 #include "ace/Signal.h"
@@ -347,7 +348,7 @@ Message_Handler::handle_input (ACE_HANDLE)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Service_Config daemon (argv [0]);
 
@@ -369,8 +370,8 @@ main (int argc, char *argv[])
 
   // Loop handling signals and I/O events until SIGQUIT occurs.
 
-  while (ACE_Reactor::event_loop_done () == 0)
-    ACE_Reactor::run_event_loop ();
+  while (ACE_Reactor::instance ()->event_loop_done () == 0)
+    ACE_Reactor::instance ()->run_reactor_event_loop ();
 
   // Deactivate the message queue.
   mh.msg_queue ()->deactivate ();
@@ -378,6 +379,6 @@ main (int argc, char *argv[])
   // Wait for the thread to exit.
   ACE_Thread_Manager::instance ()->wait ();
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) leaving main\n"));
+              ACE_TEXT ("(%t) leaving main\n")));
   return 0;
 }
diff --git a/examples/Reactor/Misc/test_early_timeouts.cpp b/examples/Reactor/Misc/test_early_timeouts.cpp
index 910fad2e3f9..4c7193d9a67 100644
--- a/examples/Reactor/Misc/test_early_timeouts.cpp
+++ b/examples/Reactor/Misc/test_early_timeouts.cpp
@@ -28,7 +28,7 @@
 ACE_RCSID(Misc, test_early_timeouts, "$Id$")
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   // Mumber of seconds this test should run
   int runtime_in_seconds = 10;
diff --git a/examples/Reactor/Misc/test_event_handler_t.cpp b/examples/Reactor/Misc/test_event_handler_t.cpp
index f5195d17aff..d644107544f 100644
--- a/examples/Reactor/Misc/test_event_handler_t.cpp
+++ b/examples/Reactor/Misc/test_event_handler_t.cpp
@@ -24,7 +24,7 @@ public:
 };
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   typedef ACE_Event_Handler_T<ACE_Test_Sig_Handler> EH_SH;
 
@@ -48,7 +48,7 @@ template class ACE_Event_Handler_T<ACE_Test_Sig_Handler>;
 
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR, "your platform does not support template typedefs\n"), 1);
 }
diff --git a/examples/Reactor/Misc/test_reactors.cpp b/examples/Reactor/Misc/test_reactors.cpp
index 59eb101b036..7af2c2709f8 100644
--- a/examples/Reactor/Misc/test_reactors.cpp
+++ b/examples/Reactor/Misc/test_reactors.cpp
@@ -158,7 +158,7 @@ worker (void *args)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_Reactor *react1 = ACE_Reactor::instance ();
   ACE_Reactor *react2 = new ACE_Reactor ();
diff --git a/examples/Reactor/Misc/test_signals_1.cpp b/examples/Reactor/Misc/test_signals_1.cpp
index dcb7ba39c54..8b4ae6f0d96 100644
--- a/examples/Reactor/Misc/test_signals_1.cpp
+++ b/examples/Reactor/Misc/test_signals_1.cpp
@@ -6,6 +6,7 @@
 // do).
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 #include "ace/Log_Msg.h"
 #include "ace/Signal.h"
 
@@ -14,7 +15,7 @@ ACE_RCSID(Misc, test_signals_1, "$Id$")
 // Number of times to allow signal to execute until we quit.
 static size_t count = 10;
 
-static void 
+static void
 my_signal_function (int sig)
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -32,7 +33,7 @@ public:
     // @@ Note that this code is not portable to all OS platforms
     // since it uses print statements within signal handler context.
     ACE_DEBUG ((LM_DEBUG,
-                "Executed ACE signal handler for signal %S, count = %d\n", 
+                "Executed ACE signal handler for signal %S, count = %d\n",
 		sig,
                 count));
     count--;
@@ -53,8 +54,8 @@ public:
   }
 };
 
-int 
-main (int argc, char *argv[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // First you need a handler for the timeout.
   My_Handler my_handler;
@@ -66,8 +67,8 @@ main (int argc, char *argv[])
     period.set (ACE_OS::atoi (argv[1]));
 
   // Set up the periodic interval timer.
-  if (ACE_Reactor::instance ()->schedule_timer 
-      (&my_handler, 
+  if (ACE_Reactor::instance ()->schedule_timer
+      (&my_handler,
        "hello",
        period,
        period) == -1)
@@ -78,7 +79,7 @@ main (int argc, char *argv[])
 
   // Set up an ACE signal handler.
 
-  if (ACE_Reactor::instance ()->register_handler 
+  if (ACE_Reactor::instance ()->register_handler
       (SIGINT,
        &my_handler) == -1)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -92,7 +93,7 @@ main (int argc, char *argv[])
                       SIGQUIT);
   ACE_UNUSED_ARG (sig);
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
 	      "starting event loop that runs until you've typed ^C a total of 10 times or ^\\ once.\n"));
 
   // This call executes the reactor events until we're finished.
diff --git a/examples/Reactor/Misc/test_signals_2.cpp b/examples/Reactor/Misc/test_signals_2.cpp
index 12ea63e6478..466ab58482f 100644
--- a/examples/Reactor/Misc/test_signals_2.cpp
+++ b/examples/Reactor/Misc/test_signals_2.cpp
@@ -230,20 +230,20 @@ external_handler (int signum)
 }
 
 #if !defined (HPUX)
-int 
-main (int argc, char *[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *[])
 {
   // If argc > 1 then allow multiple handlers per-signal, else just
   // allow 1 handler per-signal.
   ACE_Sig_Handlers multi_handlers;
 
 #if defined (ACE_WIN32)
-  ACE_WFMO_Reactor reactor_impl (argc > 1 
-                                 ? &multi_handlers 
+  ACE_WFMO_Reactor reactor_impl (argc > 1
+                                 ? &multi_handlers
                                  : (ACE_Sig_Handler *) 0);
 #else
-  ACE_Select_Reactor reactor_impl (argc > 1 
-                                   ? &multi_handlers 
+  ACE_Select_Reactor reactor_impl (argc > 1
+                                   ? &multi_handlers
                                    : (ACE_Sig_Handler *) 0);
 #endif /* ACE_WIN32 */
   ACE_Reactor reactor (&reactor_impl);
diff --git a/examples/Reactor/Misc/test_timer_queue.cpp b/examples/Reactor/Misc/test_timer_queue.cpp
index e92dfe4561a..0a4d676989f 100644
--- a/examples/Reactor/Misc/test_timer_queue.cpp
+++ b/examples/Reactor/Misc/test_timer_queue.cpp
@@ -56,10 +56,10 @@ test_functionality (ACE_Timer_Queue *tq)
   ACE_ASSERT (result != -1);
   ACE_NEW (timer_act, int (42));
   result = tq->schedule (&eh, timer_act, ACE_OS::gettimeofday ());
-  ACE_ASSERT (result != -1);  
+  ACE_ASSERT (result != -1);
 
   result = tq->cancel (timer_id1, &timer_act);
-  ACE_ASSERT (result == 1);  
+  ACE_ASSERT (result == 1);
   delete (int *) timer_act;
   result = tq->is_empty ();
   ACE_ASSERT (!result);
@@ -103,7 +103,7 @@ static Timer_Queues timer_queues[] =
 };
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   for (int i = 0; timer_queues[i].name_ != 0; i++)
     {
diff --git a/examples/Reactor/Multicast/Log_Wrapper.cpp b/examples/Reactor/Multicast/Log_Wrapper.cpp
index 8a11973152c..055b57b9975 100644
--- a/examples/Reactor/Multicast/Log_Wrapper.cpp
+++ b/examples/Reactor/Multicast/Log_Wrapper.cpp
@@ -31,7 +31,12 @@ Log_Wrapper::open (const int port, const char *mcast_addr)
   if (ACE_OS::uname (&host_data) < 0)
     return -1;
 
-  if ((host_info = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR(host_data.nodename))) == NULL)
+#if defined (ACE_LACKS_UTSNAME_T)
+  if ((host_info = ACE_OS::gethostbyname
+       (ACE_TEXT_ALWAYS_CHAR(host_data.nodename))) == NULL)
+#else
+  if ((host_info = ACE_OS::gethostbyname (host_data.nodename)) == NULL)
+#endif
     return -1;
   else
     ACE_OS::memcpy ((char *) &this->log_msg_.host,
@@ -63,7 +68,7 @@ Log_Wrapper::log_message (Log_Priority type, char *message)
   this->log_msg_.sequence_number = htonl(sequence_number_);
 
   iovec iovp[2];
-  iovp[0].iov_base = ACE_reinterpret_cast (char*, &log_msg_);
+  iovp[0].iov_base = reinterpret_cast<char*> (&log_msg_);
   iovp[0].iov_len  = sizeof (log_msg_);
   iovp[1].iov_base = message;
   iovp[1].iov_len  = log_msg_.msg_length;
diff --git a/examples/Reactor/Ntalker/Reactor_Ntalker.mpc b/examples/Reactor/Ntalker/Reactor_Ntalker.mpc
index f40976387fb..ef2fb84d9a0 100644
--- a/examples/Reactor/Ntalker/Reactor_Ntalker.mpc
+++ b/examples/Reactor/Ntalker/Reactor_Ntalker.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : aceexe {
+  exename = ntalker
 }
diff --git a/examples/Reactor/Proactor/README b/examples/Reactor/Proactor/README
index 1c857fdc03f..29f2a0b1832 100644
--- a/examples/Reactor/Proactor/README
+++ b/examples/Reactor/Proactor/README
@@ -47,7 +47,7 @@ o test_multiple_loops.cpp       : This example application shows how
 o test_timeout.cpp      : Multithreaded application testing the Timers
         mechanism of the Proactor.
 
-o test_timeout_st.cpp   : Sinle threaded version of test_timeout.cpp.
+o test_timeout_st.cpp   : Single-threaded version of test_timeout.cpp.
 
 o post_completions.cpp  : Tests the completion posting mechanism of
         the Proactor.  
@@ -58,8 +58,6 @@ o test_end_event_loop.cpp : Tests the event loop mechanism of the
 o test_cancel.cpp         : Tests <cancel> interface of the
         Asynch_Operation class.
         
-
-
 Behavior of POSIX AIO of various platforms:
 ==========================================
 
diff --git a/examples/Reactor/Proactor/test_aiosig_ace.cpp b/examples/Reactor/Proactor/test_aiosig_ace.cpp
index 685df93f073..34c1b9b5ab2 100644
--- a/examples/Reactor/Proactor/test_aiosig_ace.cpp
+++ b/examples/Reactor/Proactor/test_aiosig_ace.cpp
@@ -174,7 +174,7 @@ issue_aio_calls (void)
   aiocb3.aio_sigevent.sigev_signo = SIGRTMIN;
   aiocb3.aio_sigevent.sigev_value.sival_ptr = (void *) &aiocb3;
   sigval value;
-  value.sival_ptr = ACE_reinterpret_cast (void *, &aiocb3);
+  value.sival_ptr = reinterpret_cast<void *> (&aiocb3);
   // Queue this one for completion right now.
   if (sigqueue (ACE_OS::getpid (), SIGRTMIN, value) == -1)
     // Queueing failed.
diff --git a/examples/Reactor/Proactor/test_multiple_loops.cpp b/examples/Reactor/Proactor/test_multiple_loops.cpp
index ce40a117b3b..ac4228ab641 100644
--- a/examples/Reactor/Proactor/test_multiple_loops.cpp
+++ b/examples/Reactor/Proactor/test_multiple_loops.cpp
@@ -94,7 +94,7 @@ public:
 };
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   Timeout_Handler handler;
   ACE_WIN32_Proactor win32_proactor (0, 1);
diff --git a/examples/Reactor/WFMO_Reactor/APC.cpp b/examples/Reactor/WFMO_Reactor/APC.cpp
index 589f191a395..bf42fd1edfa 100644
--- a/examples/Reactor/WFMO_Reactor/APC.cpp
+++ b/examples/Reactor/WFMO_Reactor/APC.cpp
@@ -56,8 +56,7 @@ apc_callback (DWORD)
 void
 queue_apc (void)
 {
-  DWORD result = ::QueueUserAPC (ACE_reinterpret_cast (PAPCFUNC,
-                                                       &apc_callback),
+  DWORD result = ::QueueUserAPC (reinterpret_cast<PAPCFUNC> (&apc_callback),
                                                          // pointer to APC function
                                  ::GetCurrentThread (),  // handle to the thread
                                  0);                     // argument for the APC function
diff --git a/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
index d4f4fa3cf1d..9eb6d7c727a 100644
--- a/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
+++ b/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
@@ -180,7 +180,7 @@ public:
       ACE_Event_Handler::EXCEPT_MASK;
 
     ACE_ASSERT (old_masks ==
-                ACE_static_cast (ACE_Reactor_Mask, result));
+                static_cast<ACE_Reactor_Mask> (result));
     ACE_UNUSED_ARG (old_masks);
 
     // Get new masks
@@ -195,7 +195,7 @@ public:
       ACE_Event_Handler::EXCEPT_MASK;
 
     ACE_ASSERT (current_masks ==
-                ACE_static_cast (ACE_Reactor_Mask, result));
+                static_cast<ACE_Reactor_Mask> (result));
     ACE_UNUSED_ARG (current_masks);
 
     // Remove for writing
diff --git a/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/examples/Reactor/WFMO_Reactor/Multithreading.cpp
index db0687cff28..8e6d6dfa6f1 100644
--- a/examples/Reactor/WFMO_Reactor/Multithreading.cpp
+++ b/examples/Reactor/WFMO_Reactor/Multithreading.cpp
@@ -35,9 +35,7 @@
 ACE_RCSID(WFMO_Reactor, Multithreading, "$Id$")
 
 static int concurrent_threads = 1;
-static int number_of_handles = ACE_static_cast (
-                                   int,
-                                   ACE_Reactor::instance ()->size ());
+static int number_of_handles = static_cast<int> (ACE_Reactor::instance ()->size ());
 static int number_of_handles_to_signal = 1;
 static int interval = 2;
 static int iterations = 10;
@@ -143,7 +141,7 @@ Task_Handler::Task_Handler (size_t number_of_handles,
 
   // Make us an active object.
   if (this->activate (THR_NEW_LWP,
-                      ACE_static_cast (int, concurrent_threads)) == -1)
+                      static_cast<int> (concurrent_threads)) == -1)
     ACE_ERROR ((LM_ERROR, "%p\t cannot activate task\n",
                 "activate"));
 }
diff --git a/examples/Reactor/WFMO_Reactor/Removals.cpp b/examples/Reactor/WFMO_Reactor/Removals.cpp
index 1505dd53452..260b9e897ee 100644
--- a/examples/Reactor/WFMO_Reactor/Removals.cpp
+++ b/examples/Reactor/WFMO_Reactor/Removals.cpp
@@ -88,7 +88,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *[])
   int close_down = argc > 1 ? 1 : 0;
 
   for (size_t i = 1; i <= ACE_Reactor::instance ()->size (); i++)
-    new Event_Handler (ACE_static_cast (int, i), close_down);
+    new Event_Handler (static_cast<int> (i), close_down);
 
   int result = 0;
   ACE_Time_Value time (1);
diff --git a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
index 6a2c63a9bf2..3f8ed3db866 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
@@ -17,28 +17,29 @@ ACE_RCSID(client, local_dgram_client_test, "$Id$")
 
 #if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 // Name of the program.
-static char *program_name;
+static ACE_TCHAR *program_name;
 
 // Name of rendezvous point.
-static const char *rendezvous_codgram = "/tmp/foo_codgram";
-static const char *rendezvous_dgram = "/tmp/foo_dgram";
+static const ACE_TCHAR *rendezvous_codgram = ACE_TEXT ("/tmp/foo_codgram");
+static const ACE_TCHAR *rendezvous_dgram = ACE_TEXT ("/tmp/foo_dgram");
 
 // Name of file to send.
-static const char *file_name = "local_data";
+static const ACE_TCHAR *file_name = ACE_TEXT ("local_data");
 
 static void
 print_usage_and_die (void)
 {
   ACE_ERROR ((LM_ERROR,
-              "usage: %s [-r rendezvous_dgram] [-c rendezvous_codgram] [-f file]\n",
+              ACE_TEXT ("usage: %s [-r rendezvous_dgram] ")
+              ACE_TEXT ("[-c rendezvous_codgram] [-f file]\n"),
 	      program_name));
   ACE_OS::exit (1);
 }
 
 void
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "c:f:r:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:f:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
@@ -69,9 +70,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_LSOCK_Dgram sd ((ACE_UNIX_Addr) (sock_client));
   if (ACE_OS::unlink (sock_client))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "unlink"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("unlink")),
                       -1);
   ACE_OS::free ((void *) sock_client);
 
@@ -79,25 +78,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   if (sc.open (ACE_UNIX_Addr (rendezvous_codgram),
                ACE_Addr::sap_any) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")),
                       -1);
 
   ACE_HANDLE handle = ACE_OS::open (file_name, O_RDONLY);
 
   if (handle == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")),
                       -1);
 
   // Send the open file descriptor to the server!
 
   if (sc.send_handle (handle) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "send"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send")),
                       -1);
 
   char name[ACE_MAX_USERID];
@@ -106,15 +99,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (sd.send (name,
                ACE_OS::strlen (name) + 1,
                ACE_UNIX_Addr (rendezvous_dgram)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "send"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send")),
                       -1);
 
   if (ACE_OS::close (handle) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "close"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("close")),
                       -1);
   return 0;
 }
@@ -122,7 +111,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
-                     "your platform must support sendmsg/recvmsg to run this test\n"),
+                     ACE_TEXT ("your platform must support sendmsg/recvmsg to run this test\n")),
                     -1);
 }
 #endif /* ACE_HAS_MSG */
diff --git a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
index 5d45f88fec3..7193440b440 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
@@ -8,37 +8,37 @@
 #include "ace/LSOCK_Connector.h"
 #include "ace/UNIX_Addr.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_fcntl.h"
 
 ACE_RCSID(client, local_pipe_client_test, "$Id$")
 
 #if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 // Name of the program.
-static char *program_name;
+static ACE_TCHAR *program_name;
 
 // Name of rendezvous point.
-static const char *rendezvous = "/tmp/foo_pipe";
+static const ACE_TCHAR *rendezvous = ACE_TEXT ("/tmp/foo_pipe");
 
 // Name of file to send.
-static const char *file_name = "local_data";
+static const ACE_TCHAR *file_name = ACE_TEXT ("local_data");
 
 static void
 print_usage_and_die (void)
 {
   ACE_ERROR ((LM_ERROR,
-              "usage: %s [-r rendezvous] [-f file]\n",
+              ACE_TEXT ("usage: %s [-r rendezvous] [-f file]\n"),
 	      program_name));
   ACE_OS::exit (1);
 }
 
 void
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
 
-  ACE_Get_Opt get_opt (argc, argv, "f:r:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
@@ -87,15 +87,15 @@ do_client_processing (ACE_LSOCK_Stream &sc)
                          buf,
                          n) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "write"),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("write")),
                           -1);
       if ((n = ACE_OS::read (fd_read[0],
                              buf,
                              sizeof buf)) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "read"),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("read")),
                           -1);
       if (ACE_OS::write (ACE_STDOUT,
                          buf,
@@ -122,20 +122,20 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (con.connect (sc,
                    ACE_UNIX_Addr (rendezvous)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "connect"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("connect")),
                       -1);
 
   if (do_client_processing (sc) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "do_client_processing"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("do_client_processing")),
                       -1);
 
   if (sc.close () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "close"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("close")),
                       -1);
 
   return 0;
@@ -144,7 +144,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
-                     "your platform must support sendmsg/recvmsg to run this test\n"),
+                     ACE_TEXT ("your platform must support sendmsg/recvmsg to run this test\n")),
                     -1);
 }
 #endif /* ACE_HAS_MSG */
diff --git a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
index e2960590edf..390b14e19b8 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
@@ -14,28 +14,28 @@ ACE_RCSID(client, local_stream_client_test, "$Id$")
 
 #if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 // Name of the program.
-static char *program_name;
+static ACE_TCHAR *program_name;
 
 // Name of rendezvous point.
-static const char *rendezvous = "/tmp/foo_stream";
+static const ACE_TCHAR *rendezvous = ACE_TEXT ("/tmp/foo_stream");
 
 // Name of file to send.
-static const char *file_name = "local_data";
+static const ACE_TCHAR *file_name = ACE_TEXT ("local_data");
 
 static void
 print_usage_and_die (void)
 {
   ACE_ERROR ((LM_ERROR,
-              "usage: %s [-r rendezvous] [-f file]\n",
+              ACE_TEXT ("usage: %s [-r rendezvous] [-f file]\n"),
               program_name));
   ACE_OS::exit (1);
 }
 
 void
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
-  ACE_Get_Opt get_opt (argc, argv, "f:r:");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
@@ -67,38 +67,38 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (con.connect (sc,
                    ACE_UNIX_Addr (rendezvous)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "connect"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("connect")),
                       -1);
 
   if ((fd = ACE_OS::open (file_name,
                           O_RDONLY)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       -1);
 
   // Send the open file descriptor to the server!
 
   if (sc.send_handle (fd) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "send_handle"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("send_handle")),
                       -1);
 
   if ((n = sc.recv_n (buf,
                       sizeof buf)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "recv"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("recv")),
                       -1);
   else
     ACE_OS::write (ACE_STDOUT, buf, n);
 
   if (ACE_OS::close (fd) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "close"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("close")),
                       -1);
 
   return 0;
@@ -107,7 +107,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
-                     "your platform must support sendmsg/recvmsg to run this test\n"),
+                     ACE_TEXT ("your platform must support sendmsg/recvmsg to run this test\n")),
                     -1);
 }
 #endif /* ACE_HAS_MSG */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
index b04d7a3b057..8b382f9fd73 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
@@ -8,6 +8,7 @@
 #define _HANDLE_BROADCAST_H
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
index 5fe130eaeaf..ce7f42617e7 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
@@ -36,7 +36,8 @@ Handle_Broadcast::info (ACE_TCHAR **strp, size_t length) const
   if (this->get_local_addr (sa) == -1)
     return -1;
 
-  ACE_OS::sprintf (buf, ACE_TEXT("%d/%s %s"), sa.get_port_number (), ACE_TEXT("udp"), ACE_TEXT("# tests broadcasting\n"));
+  ACE_OS::sprintf (buf, ACE_TEXT("%d/"), sa.get_port_number ());
+  ACE_OS::strcat (buf, ACE_TEXT("udp # tests broadcasting\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -62,10 +63,11 @@ Handle_Broadcast::init (int argc, ACE_TCHAR *argv[])
        }
 
   if (this->open (sba) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
   else if (ACE_Reactor::instance ()->register_handler
            (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("registering service with ACE_Reactor")), -1);
   return 0;
 }
 
@@ -93,7 +95,7 @@ Handle_Broadcast::handle_input (ACE_HANDLE)
     return -1;
   else
     ACE_DEBUG ((LM_INFO,
-                ACE_TEXT ("received broadcast datagram from host %s\n"),
+                ACE_TEXT ("received broadcast datagram from host %C\n"),
                 sa.get_host_name ()));
 
   ACE_OS::puts (ACE_TEXT ("----------------------------------------"));
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp
index 913ee7bcad3..6fe631fdb41 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp
@@ -6,13 +6,14 @@
 
 ACE_RCSID(server, Handle_L_CODgram, "$Id$")
 
-const char *Handle_L_CODgram::DEFAULT_RENDEZVOUS = "/tmp/foo_codgram";
+const ACE_TCHAR *Handle_L_CODgram::DEFAULT_RENDEZVOUS =
+  ACE_TEXT ("/tmp/foo_codgram");
 
 #if !defined (__ACE_INLINE__)
 #include "Handle_L_CODgram.i"
 #endif /* __ACE_INLINE__ */
 
 Handle_L_CODgram local_codgram;
-ACE_Service_Object_Type lc (&local_codgram, "Local_CODgram");
+ACE_Service_Object_Type lc (&local_codgram, ACE_TEXT ("Local_CODgram"));
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
index 25bf07cf7ad..852c0557cda 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
@@ -7,6 +7,7 @@
 #define _HANDLE_L_CODGRAM_H
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +24,8 @@ class ACE_Svc_Export Handle_L_CODgram : public ACE_Service_Object, public ACE_LS
 {
 public:
   Handle_L_CODgram (void);
-  virtual int init (int argc, char *argv[]);
-  virtual int info (char **, size_t) const;
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini (void);
 
 public:
@@ -33,8 +34,8 @@ public:
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
 
-  char rendezvous[MAXPATHLEN + 1];
-  static const char *DEFAULT_RENDEZVOUS;
+  ACE_TCHAR rendezvous[MAXPATHLEN + 1];
+  static const ACE_TCHAR *DEFAULT_RENDEZVOUS;
 };
 
 extern ACE_Service_Object_Type lc;
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
index 878e4cb7762..a77d75e1fa8 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
@@ -23,16 +23,16 @@ Handle_L_CODgram::open (const ACE_UNIX_Addr &suad, int async)
 }
 
 ACE_INLINE int 
-Handle_L_CODgram::info (char **strp, size_t length) const
+Handle_L_CODgram::info (ACE_TCHAR **strp, size_t length) const
 {
-  char      buf[BUFSIZ];
+  ACE_TCHAR      buf[BUFSIZ];
   ACE_UNIX_Addr sa;
 
   if (ACE_LSOCK_CODgram::get_local_addr (sa) == -1)
     return -1;
   
-  ACE_OS::sprintf (buf, "%s %s", sa.get_path_name (), 
-		   "# tests local connected datagram\n");
+  ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ()));
+  ACE_OS::strcat (buf, ACE_TEXT (" # tests local connected datagram\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -42,11 +42,11 @@ Handle_L_CODgram::info (char **strp, size_t length) const
 }
 
 ACE_INLINE int
-Handle_L_CODgram::init (int argc, char *argv[])
+Handle_L_CODgram::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr  sucd;
-  ACE_Get_Opt    get_opt (argc, argv, "r:", 0);
-  const char *r = Handle_L_CODgram::DEFAULT_RENDEZVOUS;
+  ACE_Get_Opt    get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  const ACE_TCHAR *r = Handle_L_CODgram::DEFAULT_RENDEZVOUS;
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
@@ -62,11 +62,12 @@ Handle_L_CODgram::init (int argc, char *argv[])
   ACE_OS::unlink (this->rendezvous);
   sucd.set (this->rendezvous);
   if (this->open (sucd) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
   else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-		       "registering service with ACE_Reactor\n"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+		       ACE_TEXT ("registering service with ACE_Reactor")),
+                      -1);
   return 0;
 }
 
@@ -92,7 +93,7 @@ Handle_L_CODgram::handle_input (ACE_HANDLE)
   if (this->recv_handle (handle) == -1)
     return -1;
   else
-    ACE_DEBUG ((LM_INFO, "received handle (%d)\n", handle));
+    ACE_DEBUG ((LM_INFO, ACE_TEXT ("received handle (%d)\n"), handle));
 
   ACE_OS::puts ("----------------------------------------");
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp
index 4d381a6d34b..c502da057f7 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp
@@ -6,12 +6,13 @@ ACE_RCSID(server, Handle_L_Dgram, "$Id$")
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-const char *Handle_L_Dgram::DEFAULT_RENDEZVOUS = "/tmp/foo_dgram";
+const ACE_TCHAR *Handle_L_Dgram::DEFAULT_RENDEZVOUS =
+  ACE_TEXT ("/tmp/foo_dgram");
 
 #if !defined (__ACE_INLINE__)
 #include "Handle_L_Dgram.i"
 #endif /* __ACE_INLINE__ */
 
 Handle_L_Dgram local_dgram;
-ACE_Service_Object_Type ld (&local_dgram, "Local_Dgram");
+ACE_Service_Object_Type ld (&local_dgram, ACE_TEXT ("Local_Dgram"));
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
index b8e0e76e211..ac1eac69117 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 // Handles UNIX datagram messages from local host.
@@ -8,6 +7,7 @@
 #define _HANDLE_L_DGRAM_H
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,8 +24,8 @@ class ACE_Svc_Export Handle_L_Dgram : public ACE_Service_Object, public ACE_LSOC
 {
 public:
   Handle_L_Dgram (void);
-  virtual int init (int argc, char *argv[]);
-  virtual int info (char **, size_t) const;
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini (void);
 
 private:
@@ -34,8 +34,8 @@ private:
   virtual int handle_input (int fd);
   virtual int handle_close (int fd, ACE_Reactor_Mask);
 
-  char rendezvous[MAXPATHLEN + 1];
-  static const char *DEFAULT_RENDEZVOUS;
+  ACE_TCHAR rendezvous[MAXPATHLEN + 1];
+  static const ACE_TCHAR *DEFAULT_RENDEZVOUS;
 };
 
 extern ACE_Service_Object_Type ld;
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
index 7b37dbfab99..3b2ab29331f 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
@@ -23,15 +23,16 @@ Handle_L_Dgram::open (const ACE_UNIX_Addr &suad, int async)
 }
 
 ACE_INLINE int 
-Handle_L_Dgram::info (char **strp, size_t length) const
+Handle_L_Dgram::info (ACE_TCHAR **strp, size_t length) const
 {
-  char      buf[BUFSIZ];
+  ACE_TCHAR      buf[BUFSIZ];
   ACE_UNIX_Addr sa;
 
   if (this->ACE_LSOCK_Dgram::get_local_addr (sa) == -1)
     return -1;
-  
-  ACE_OS::sprintf (buf, "%s %s", sa.get_path_name (), "# tests local datagram\n");
+
+  ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ()));
+  ACE_OS::strcat (buf, ACE_TEXT (" # tests local datagram\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -41,11 +42,11 @@ Handle_L_Dgram::info (char **strp, size_t length) const
 }
 
 ACE_INLINE int
-Handle_L_Dgram::init (int argc, char *argv[])
+Handle_L_Dgram::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr  sudg;
-  ACE_Get_Opt    get_opt (argc, argv, "r:", 0);
-  const char *r = Handle_L_Dgram::DEFAULT_RENDEZVOUS;
+  ACE_Get_Opt    get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  const ACE_TCHAR *r = Handle_L_Dgram::DEFAULT_RENDEZVOUS;
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
@@ -61,10 +62,13 @@ Handle_L_Dgram::init (int argc, char *argv[])
   ACE_OS::unlink (this->rendezvous);
   sudg.set (this->rendezvous);
   if (this->open (sudg) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
   else if (ACE_Reactor::instance ()->register_handler (this,
 						      ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("registering service with ACE_Reactor")),
+                      -1);
   return 0;
 }
 
@@ -90,7 +94,8 @@ Handle_L_Dgram::handle_input (int)
   if ((n = this->recv (buf, sizeof buf, sa)) == -1)
     return -1;
   else
-    ACE_DEBUG ((LM_INFO, "received datagram from %s\n", sa.get_path_name ()));
+    ACE_DEBUG ((LM_INFO, ACE_TEXT ("received datagram from %s\n"),
+                sa.get_path_name ()));
 
   ACE_OS::puts ("----------------------------------------");
   ACE_OS::write (ACE_STDOUT, buf, n);
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
index f9fe23f6dda..4375b2d105c 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
@@ -9,6 +9,7 @@
 #define _HANDLE_L_FIFO_H
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
index ac97de161d5..f6cd0cda734 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
@@ -29,7 +29,8 @@ Handle_L_FIFO::info (ACE_TCHAR **strp, size_t length) const
 
   this->get_local_addr (rendezvous_fifo);
 
-  ACE_OS::sprintf (buf, ACE_TEXT("%s %s"), rendezvous_fifo, ACE_TEXT("# tests local ACE_FIFO\n"));
+  ACE_OS::strcpy (buf, rendezvous_fifo);
+  ACE_OS::strcat (buf, ACE_TEXT(" # tests local ACE_FIFO\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -56,11 +57,11 @@ Handle_L_FIFO::init (int argc, ACE_TCHAR *argv[])
 
   ACE_OS::unlink (rendezvous_fifo);
   if (this->open (rendezvous_fifo) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
   else if (ACE_Reactor::instance ()->register_handler
 	   (this, ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "registering service with ACE_Reactor\n"),
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("registering service with ACE_Reactor")),
                       -1);
   return 0;
 }
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
index 3985f9369a2..a4508266363 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp
@@ -37,7 +37,7 @@ Handle_L_Pipe::handle_input (ACE_HANDLE)
     return -1;
   else
     ACE_DEBUG ((LM_INFO,
-                "received file descriptors %d and %d\n",
+                ACE_TEXT ("received file descriptors %d and %d\n"),
                 fd1,
                 fd2));
 
@@ -54,13 +54,13 @@ Handle_L_Pipe::handle_input (ACE_HANDLE)
   return 0;
 }
 
-const char *Handle_L_Pipe::DEFAULT_RENDEZVOUS = "/tmp/foo_pipe";
+const ACE_TCHAR *Handle_L_Pipe::DEFAULT_RENDEZVOUS = ACE_TEXT ("/tmp/foo_pipe");
 
 #if !defined (__ACE_INLINE__)
 #include "Handle_L_Pipe.i"
 #endif /* __ACE_INLINE__ */
 
 Handle_L_Pipe local_pipe;
-ACE_Service_Object_Type lp (&local_pipe, "Local_Pipe");
+ACE_Service_Object_Type lp (&local_pipe, ACE_TEXT ("Local_Pipe"));
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
index 4f84945ddc8..51d5bae1dac 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 // Handle connections from local UNIX domain sockets that are sending
@@ -9,6 +8,7 @@
 #define _HANDLE_L_PIPE_H
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,8 @@ class ACE_Svc_Export Handle_L_Pipe : public ACE_Service_Object, public ACE_LSOCK
 public:
   Handle_L_Pipe (void);
   ~Handle_L_Pipe (void);
-  virtual int init (int argc, char *argv[]);
-  virtual int info (char **, size_t) const;
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini (void);
 
 private:
@@ -38,8 +38,8 @@ private:
 
   char *upper_case (char s[], int n);
 
-  char rendezvous[MAXPATHLEN + 1];
-  static const char *DEFAULT_RENDEZVOUS;
+  ACE_TCHAR rendezvous[MAXPATHLEN + 1];
+  static const ACE_TCHAR *DEFAULT_RENDEZVOUS;
 };
 
 extern ACE_Service_Object_Type lp;
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
index 214d8475b18..ce978aa85ea 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
@@ -4,6 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_INLINE
 Handle_L_Pipe::~Handle_L_Pipe (void)
@@ -26,16 +27,17 @@ Handle_L_Pipe::open (const ACE_UNIX_Addr &suap, int async)
     return 0;
 }
 
-ACE_INLINE int 
-Handle_L_Pipe::info (char **strp, size_t length) const
+ACE_INLINE int
+Handle_L_Pipe::info (ACE_TCHAR **strp, size_t length) const
 {
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   ACE_UNIX_Addr sa;
 
   if (ACE_LSOCK_Acceptor::get_local_addr (sa) == -1)
     return -1;
-  
-  ACE_OS::sprintf (buf, "%s %s", sa.get_path_name (), "# tests local pipe\n");
+
+  ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ()));
+  ACE_OS::strcat (buf, ACE_TEXT (" # tests local pipe\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -45,16 +47,16 @@ Handle_L_Pipe::info (char **strp, size_t length) const
 }
 
 ACE_INLINE int
-Handle_L_Pipe::init (int argc, char *argv[])
+Handle_L_Pipe::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr sup;
-  const char	*r = Handle_L_Pipe::DEFAULT_RENDEZVOUS;
-  ACE_Get_Opt	get_opt (argc, argv, "r:", 0);
+  const ACE_TCHAR *r = Handle_L_Pipe::DEFAULT_RENDEZVOUS;
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
-       case 'r': 
+       case 'r':
 	 r = get_opt.opt_arg ();
 	 break;
        default:
@@ -65,25 +67,25 @@ Handle_L_Pipe::init (int argc, char *argv[])
   ACE_OS::unlink (this->rendezvous);
   sup.set (this->rendezvous);
   if (this->open (sup) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance ()->register_handler 
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
+  else if (ACE_Reactor::instance ()->register_handler
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-		       "registering service with ACE_Reactor\n"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+		       ACE_TEXT ("registering service with ACE_Reactor")), -1);
   return 0;
 }
 
-ACE_INLINE int 
-Handle_L_Pipe::fini (void) 
+ACE_INLINE int
+Handle_L_Pipe::fini (void)
 {
-  return ACE_Reactor::instance ()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
 ACE_INLINE int
 Handle_L_Pipe::get_handle (void) const
-{ 
-  return ACE_LSOCK_Acceptor::get_handle (); 
+{
+  return ACE_LSOCK_Acceptor::get_handle ();
 }
 
 ACE_INLINE int
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
index 1f88a676743..1dcb739b0ab 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
@@ -1,12 +1,18 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
 
 #include "ace/SPIPE_Stream.h"
+
+#if defined (ACE_HAS_STREAM_PIPES)
+
+#include "ace/Reactor.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_string.h"
 
-#if defined (ACE_HAS_STREAM_PIPES)
 
 ACE_INLINE
 Handle_L_SPIPE::Handle_L_SPIPE (void)
@@ -14,7 +20,7 @@ Handle_L_SPIPE::Handle_L_SPIPE (void)
 }
 
 ACE_INLINE int
-Handle_L_SPIPE::open (const ACE_SPIPE_Addr &rendezvous_spipe) 
+Handle_L_SPIPE::open (const ACE_SPIPE_Addr &rendezvous_spipe)
 {
   if (this->ACE_SPIPE_Acceptor::open (rendezvous_spipe) == -1)
     return -1;
@@ -22,7 +28,7 @@ Handle_L_SPIPE::open (const ACE_SPIPE_Addr &rendezvous_spipe)
     return 0;
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 Handle_L_SPIPE::info (char **strp, size_t length) const
 {
   char       buf[BUFSIZ];
@@ -44,49 +50,49 @@ ACE_INLINE int
 Handle_L_SPIPE::init (int argc, char *argv[])
 {
   ACE_SPIPE_Addr susp;
-  const char	 *rendezvous = Handle_L_SPIPE::DEFAULT_RENDEZVOUS;
-  ACE_Get_Opt	 get_opt (argc, argv, "r:", 0);
+  const char     *rendezvous = Handle_L_SPIPE::DEFAULT_RENDEZVOUS;
+  ACE_Get_Opt    get_opt (argc, argv, "r:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
-       case 'r': 
-	 rendezvous = get_opt.opt_arg ();
-	 break;
+       case 'r':
+         rendezvous = get_opt.opt_arg ();
+         break;
        default:
-	 break;
+         break;
        }
-  
+
   ACE_OS::unlink (rendezvous);
   susp.set (rendezvous);
   if (this->open (susp) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance ()->register_handler 
-	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
+  else if (ACE_Reactor::instance ()->register_handler
+           (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
   return 0;
 }
 
-ACE_INLINE int 
-Handle_L_SPIPE::fini (void) 
+ACE_INLINE int
+Handle_L_SPIPE::fini (void)
 {
-  return ACE_Reactor::instance ()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 Handle_L_SPIPE::get_handle (void) const
 {
   return ACE_SPIPE::get_handle();
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 Handle_L_SPIPE::handle_input (int)
 {
   ACE_SPIPE_Stream new_spipe;
-  char	   buf[PIPE_BUF];
+  char     buf[PIPE_BUF];
   ACE_Str_Buf  msg (buf, 0, sizeof buf);
-  int	   flags = 0;
+  int      flags = 0;
 
   /* Accept communication requests */
   if (this->ACE_SPIPE_Acceptor::accept (new_spipe) == -1)
@@ -98,7 +104,7 @@ Handle_L_SPIPE::handle_input (int)
       new_spipe.get_remote_addr (sa);
 
       ACE_DEBUG ((LM_INFO, "accepted request from %s (gid = %d, uid = %d)\n",
-		 sa.get_path_name (), sa.group_id (), sa.user_id ()));
+                 sa.get_path_name (), sa.group_id (), sa.user_id ()));
     }
 
   while (new_spipe.recv ((ACE_Str_Buf *) 0, &msg, &flags) >= 0)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp
index cf37bd92734..074f0057e74 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(server, Handle_L_Stream, "$Id$")
 
 // Static variables.
 
-const char *Handle_L_Stream::DEFAULT_RENDEZVOUS = "/tmp/foo_stream";
+const ACE_TCHAR *Handle_L_Stream::DEFAULT_RENDEZVOUS = ACE_TEXT ("/tmp/foo_stream");
 char *Handle_L_Stream::login_name = 0;
 char Handle_L_Stream::login[ACE_MAX_USERID];
 
@@ -17,6 +17,6 @@ char Handle_L_Stream::login[ACE_MAX_USERID];
 #endif /* __ACE_INLINE__ */
 
 Handle_L_Stream local_stream;
-ACE_Service_Object_Type ls (&local_stream, "Local_Stream");
+ACE_Service_Object_Type ls (&local_stream, ACE_TEXT ("Local_Stream"));
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
index 6e403e9b1a9..912af48a292 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 // Handle connections from local UNIX domain sockets.
@@ -8,6 +7,7 @@
 #define _HANDLE_L_STREAM_H
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,8 @@ class ACE_Svc_Export Handle_L_Stream : public ACE_Service_Object, public ACE_LSO
 public:
   Handle_L_Stream (void);
   ~Handle_L_Stream (void);
-  virtual int init (int argc, char *argv[]);
-  virtual int info (char **, size_t) const;
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini (void);
 
 private:
@@ -35,8 +35,8 @@ private:
   virtual int handle_input (ACE_HANDLE fd);
   virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask);
 
-  char rendezvous[MAXPATHLEN + 1];
-  static const char *DEFAULT_RENDEZVOUS;
+  ACE_TCHAR rendezvous[MAXPATHLEN + 1];
+  static const ACE_TCHAR *DEFAULT_RENDEZVOUS;
   static char *login_name;
   static char login[ACE_MAX_USERID];
 };
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
index 4afa1557791..80b21852293 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
@@ -32,17 +32,16 @@ Handle_L_Stream::open (const ACE_UNIX_Addr &suas,
 }
 
 ACE_INLINE int 
-Handle_L_Stream::info (char **strp, 
-		       size_t length) const
+Handle_L_Stream::info (ACE_TCHAR **strp, size_t length) const
 {
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   ACE_UNIX_Addr sa;
 
   if (this->get_local_addr (sa) == -1)
     return -1;
   
-  ACE_OS::sprintf (buf, "%s %s", sa.get_path_name (), 
-		   "# tests local ACE_Stream\n");
+  ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ()));
+  ACE_OS::strcat (buf, ACE_TEXT (" # tests local ACE_Stream\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -52,20 +51,20 @@ Handle_L_Stream::info (char **strp,
 }
 
 ACE_INLINE int
-Handle_L_Stream::init (int argc, char *argv[])
+Handle_L_Stream::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr sus;
-  const char *r = Handle_L_Stream::DEFAULT_RENDEZVOUS;
-  ACE_Get_Opt get_opt (argc, argv, "r:", 0);
+  const ACE_TCHAR *r = Handle_L_Stream::DEFAULT_RENDEZVOUS;
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'r': 
-	 r = get_opt.opt_arg ();
-	 break;
+         r = get_opt.opt_arg ();
+         break;
        default:
-	 break;
+         break;
        }
   
   ACE_OS::strncpy (this->rendezvous, r, MAXPATHLEN);
@@ -73,18 +72,18 @@ Handle_L_Stream::init (int argc, char *argv[])
   sus.set (this->rendezvous);
 
   if (this->open (sus) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
   else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-		       "registering service with ACE_Reactor\n"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+		       ACE_TEXT ("registering service with ACE_Reactor")), -1);
   return 0;
 }
 
 ACE_INLINE int 
 Handle_L_Stream::fini (void) 
 {
-  return ACE_Reactor::instance ()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
@@ -108,7 +107,7 @@ Handle_L_Stream::handle_input (ACE_HANDLE)
     return -1;
   else
     ACE_DEBUG ((LM_INFO, 
-		"received file descriptor %d on ACE_Stream %s\n", 
+		ACE_TEXT ("received file descriptor %d on ACE_Stream %s\n"),
 		handle, sa.get_path_name ()));
 
   ACE_OS::puts ("----------------------------------------");
@@ -126,12 +125,12 @@ Handle_L_Stream::handle_input (ACE_HANDLE)
   ACE_OS::puts ("----------------------------------------");
 
   time_t t = ACE_OS::time (0L);
-  char *cs = ACE_OS::ctime (&t);
+  ACE_TCHAR *cs = ACE_OS::ctime (&t);
 
   if (new_local_stream.send (4,
 			     Handle_L_Stream::login_name, 
 			     ACE_OS::strlen (Handle_L_Stream::login_name),
-			     cs, 
+			     ACE_TEXT_ALWAYS_CHAR (cs), 
 			     ACE_OS::strlen (cs)) == -1)
     return -1;
   else if (ACE_OS::close (handle) == -1)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
index 37649b16566..0cab7190ca8 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
@@ -2,7 +2,7 @@
 
 #include "Handle_R_Dgram.h"
 
-ACE_RCSID(server, Handle_R_Dgram, "$Id$")
+ACE_RCSID(server, Handle_R_Dgram, "Handle_R_Dgram.cpp,v 4.2 1998/07/31 22:55:19 gonzo Exp")
 
 #if defined (SunOS4)
 extern "C" 
@@ -35,4 +35,4 @@ unsigned short Handle_R_Dgram::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT;
 #endif /* __ACE_INLINE__ */
 
 Handle_R_Dgram remote_dgram;
-ACE_Service_Object_Type rd (&remote_dgram, "Remote_Dgram");
+ACE_Service_Object_Type rd (&remote_dgram, ACE_TEXT ("Remote_Dgram"));
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
index c8a5e327c30..858d72ff993 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 /* Handles INET datagram messages from remote hosts. */
@@ -23,8 +22,8 @@ class ACE_Svc_Export Handle_R_Dgram : public ACE_Service_Object, public ACE_SOCK
 {
 public:
   Handle_R_Dgram (void);
-  virtual int init (int argc, char *argv[]);
-  virtual int info (char **, size_t) const;
+  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int info (ACE_TCHAR **, size_t) const;
   virtual int fini (void);
 
 private:
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
index 0129829abdb..88212a988f0 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
@@ -23,15 +23,16 @@ Handle_R_Dgram::open (const ACE_INET_Addr &r, int async)
 }
 
 ACE_INLINE int 
-Handle_R_Dgram::info (char **strp, size_t length) const
+Handle_R_Dgram::info (ACE_TCHAR **strp, size_t length) const
 {
-  char      buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   ACE_INET_Addr sa;
 
   if (this->get_local_addr (sa) == -1)
     return -1;
   
-  ACE_OS::sprintf (buf, "%d/%s %s", sa.get_port_number (), "udp", "# tests remote dgram\n");
+  ACE_OS::sprintf (buf, ACE_TEXT ("%d/"), sa.get_port_number ());
+  ACE_OS::strcat (buf, ACE_TEXT ("udp # tests remote dgram\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -41,10 +42,10 @@ Handle_R_Dgram::info (char **strp, size_t length) const
 }
 
 ACE_INLINE int
-Handle_R_Dgram::init (int argc, char *argv[])
+Handle_R_Dgram::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_INET_Addr sidg (Handle_R_Dgram::DEFAULT_PORT);
-  ACE_Get_Opt	get_opt (argc, argv, "p:", 0);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
@@ -57,17 +58,18 @@ Handle_R_Dgram::init (int argc, char *argv[])
        }
   
   if (this->open (sidg) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
   else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("registering service with ACE_Reactor")), -1);
   return 0;
 }
 
 ACE_INLINE int 
 Handle_R_Dgram::fini (void) 
 {
-  return ACE_Reactor::instance ()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
@@ -87,8 +89,9 @@ Handle_R_Dgram::handle_input (ACE_HANDLE)
   if (n == -1)
     return -1;
   else
-    ACE_DEBUG ((LM_INFO, "received datagram from host %s on port %d\n",
-	       sa.get_host_name (), sa.get_port_number ()));
+    ACE_DEBUG ((LM_INFO,
+                ACE_TEXT ("received datagram from host %C on port %d\n"),
+                sa.get_host_name (), sa.get_port_number ()));
 
   ACE_OS::puts ("----------------------------------------");
   ACE_OS::write (ACE_STDOUT, buf, n);
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
index d49d10ae4a5..9878321cec8 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
@@ -8,6 +8,7 @@
 #define _HANDLE_R_STREAM_H
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
index ed914792c3e..82fe384273a 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -41,7 +41,7 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::Handle_Thr_Acceptor (void)
 
 template <class SVH, PR_AC_1> int
 Handle_Thr_Acceptor<SVH, PR_AC_2>::info (ACE_TCHAR **strp,
-					size_t length) const
+                                         size_t length) const
 {
   ACE_TCHAR buf[BUFSIZ];
   ACE_INET_Addr sa;
@@ -49,8 +49,8 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::info (ACE_TCHAR **strp,
   if (this->acceptor ().get_local_addr (sa) == -1)
     return -1;
 
-  ACE_OS::sprintf (buf, ACE_TEXT("%d/%s %s"), sa.get_port_number (), ACE_TEXT("tcp"),
-       ACE_TEXT("# tests threaded remote stream\n"));
+  ACE_OS::sprintf (buf, ACE_TEXT("%d/"), sa.get_port_number ());
+  ACE_OS::strcat (buf, ACE_TEXT("tcp # tests threaded remote stream\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -84,7 +84,7 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
   if (this->thr_strategy_.open (&this->thr_mgr_,
 				this->thr_flags_,
 				n_threads) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
 
   // Initialize the Acceptor base class, passing in the desired
   // concurrency strategy.
@@ -93,7 +93,7 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
 		       0,
 		       0,
 		       &this->thr_strategy_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1);
   else
     return 0;
 }
@@ -114,7 +114,8 @@ CLI_Stream<PR_ST_2>::CLI_Stream (ACE_Thread_Manager *thr_mgr)
 template <PR_ST_1> int
 CLI_Stream<PR_ST_2>::close (u_long)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%t) client stream object closing down\n"));
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%t) client stream object closing down\n")));
   this->peer ().close ();
 
   // Must be allocated dynamically!
@@ -127,13 +128,13 @@ CLI_Stream<PR_ST_2>::open (void *)
 {
   ACE_INET_Addr sa;
 
-  ACE_DEBUG ((LM_DEBUG, "(%t) client handle = %d\n",
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) client handle = %d\n"),
 	      this->peer ().get_handle ()));
 
   if (this->peer ().get_remote_addr (sa) == -1)
     return -1;
 
-  ACE_DEBUG ((LM_DEBUG, "(%t) accepted at port %d\n",
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) accepted at port %d\n"),
 	     sa.get_port_number ()));
   return 0;
 }
@@ -157,7 +158,7 @@ CLI_Stream<PR_ST_2>::svc (void)
   ACE_OS::cuserid (login_name);
   ACE_OS::sprintf (buf, "user %s %s",
 		   login_name,
-		   ACE_OS::ctime ((const time_t *) &t));
+		   ACE_TEXT_ALWAYS_CHAR (ACE_OS::ctime ((const time_t *) &t)));
 
   if (this->peer ().send_n (buf, ACE_OS::strlen (buf) + 1) == -1)
     return -1;
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
index 8f30199b480..88b6e673aaf 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
@@ -8,6 +8,7 @@
 #define _HANDLE_TIMEOUT_H
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
index fbea27d826c..346a22e773c 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
@@ -16,7 +16,7 @@ Handle_Timeout::info (ACE_TCHAR **strp, size_t length) const
 {
   ACE_TCHAR buf[BUFSIZ];
 
-  ACE_OS::sprintf (buf, ACE_TEXT("%s"), ACE_TEXT("# tests timeout facility\n"));
+  ACE_OS::strcpy (buf, ACE_TEXT("# tests timeout facility\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -50,8 +50,7 @@ Handle_Timeout::init (int argc, ACE_TCHAR *argv[])
        }
 
   if (ACE_Reactor::instance ()->schedule_timer (this,
-                                                ACE_reinterpret_cast (void *,
-                                                                      arg),
+                                                reinterpret_cast<void *> (arg),
                                                       delta,
                                                       interval) == -1)
     return -1;
@@ -81,7 +80,7 @@ Handle_Timeout::handle_timeout (const ACE_Time_Value &tv,
   // Cast arg to a long, first, because a pointer is the same
   // size as a long on all current ACE platforms.
   ACE_DEBUG ((LM_INFO,
-              "time for this(%u) expired at (%d, %d) with arg = %d\n",
+              ACE_TEXT ("time for this(%u) expired at (%d, %d) with arg = %d\n"),
              this, tv.sec (), tv.usec (), (int) (long) arg));
   return 0;
 }
diff --git a/examples/Service_Configurator/IPC-tests/server/server_test.cpp b/examples/Service_Configurator/IPC-tests/server/server_test.cpp
index 5c278132875..b513f51da65 100644
--- a/examples/Service_Configurator/IPC-tests/server/server_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/server_test.cpp
@@ -4,21 +4,22 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 #include "ace/Log_Msg.h"
 #include "ace/Signal.h"
 
 ACE_RCSID(server, server_test, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (ACE_Service_Config::open (argc,
                                 argv,
                                 ACE_DEFAULT_LOGGER_KEY,
                                 0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "ACE_Service_Config::open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("ACE_Service_Config::open")),
                       -1);
 
   // Create an adapter to end the event loop.
@@ -33,7 +34,7 @@ main (int argc, char *argv[])
   if (ACE_Reactor::instance ()->register_handler (sig_set,
                                                   &sa) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n"),
+                       ACE_TEXT ("%p\n"), ACE_TEXT ("register_handler")),
                       -1);
 
   // This makes the README demo even easier (for sighup).
@@ -44,7 +45,7 @@ main (int argc, char *argv[])
   // Run forever, performing the configured services until we are shut
   // down by a SIGINT/SIGQUIT signal.
 
-  ACE_Reactor::run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
 
   return 0;
 }
diff --git a/examples/Service_Configurator/Misc/Timer_Service.cpp b/examples/Service_Configurator/Misc/Timer_Service.cpp
index c69b448aebc..82ace8f657c 100644
--- a/examples/Service_Configurator/Misc/Timer_Service.cpp
+++ b/examples/Service_Configurator/Misc/Timer_Service.cpp
@@ -100,6 +100,9 @@ Timer_Service_1::handle_close (ACE_HANDLE,
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("closing down the timer test\n")));
 
+  // Remove ourselves from the timer queue.
+  ACE_Reactor::instance ()->cancel_timer (this);
+
   ACE_Reactor::end_event_loop();
   return 0;
 }
diff --git a/examples/Service_Configurator/Misc/Timer_Service.h b/examples/Service_Configurator/Misc/Timer_Service.h
index e740cb9ac91..01aa77b7317 100644
--- a/examples/Service_Configurator/Misc/Timer_Service.h
+++ b/examples/Service_Configurator/Misc/Timer_Service.h
@@ -9,6 +9,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 #include "ace/Service_Object.h"
 
 
diff --git a/examples/Shared_Malloc/Options.cpp b/examples/Shared_Malloc/Options.cpp
index 8e3b9b02f19..6716fa66c31 100644
--- a/examples/Shared_Malloc/Options.cpp
+++ b/examples/Shared_Malloc/Options.cpp
@@ -22,13 +22,13 @@ Options::instance (void)
   return Options::instance_;
 }
 
-ACE_TCHAR *
+const char *
 Options::program_name (void)
 {
   return this->program_name_;
 }
 
-const ACE_TCHAR *
+const char *
 Options::slave_name (void)
 {
   return this->slave_name_;
@@ -116,8 +116,7 @@ Options::print_usage_and_die (void)
 }
 
 Options::Options (void)
-  : slave_name_ (ACE_TEXT ("slave")),
-    debug_ (0),
+  : debug_ (0),
     exec_slave_ (0),
     iteration_count_ (100),
     use_sbrk_ (0),
@@ -128,6 +127,7 @@ Options::Options (void)
     use_mmap_ (0),
     child_ (0)
 {
+  ACE_OS::strcpy (this->slave_name_, "slave");
 }
 
 void
@@ -135,8 +135,8 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dehlL:mn:pst:T"));
 
-  this->program_name_ = argv[0];
-  ACE_LOG_MSG->open (this->program_name_);
+  ACE_OS::strcpy (this->program_name_, ACE_TEXT_ALWAYS_CHAR (argv[0]));
+  ACE_LOG_MSG->open (argv[0]);
 
   // Put in a special-case check for child process.
   if (ACE_OS::strcmp (this->program_name_, slave_name_) == 0)
diff --git a/examples/Shared_Malloc/Options.h b/examples/Shared_Malloc/Options.h
index f0be8da98d6..67956d80cc3 100644
--- a/examples/Shared_Malloc/Options.h
+++ b/examples/Shared_Malloc/Options.h
@@ -5,6 +5,7 @@
 #define _OPTIONS
 
 #include "ace/os_include/os_stddef.h"
+#include "ace/os_include/os_limits.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,8 +23,8 @@ public:
   // Parse the arguments.
 
   // = Accessor methods.
-  ACE_TCHAR *program_name (void);
-  const ACE_TCHAR *slave_name (void);
+  const char *program_name (void);
+  const char *slave_name (void);
   int debug (void);
   int exec_slave (void);
   size_t iteration_count (void);
@@ -45,10 +46,10 @@ private:
   void print_usage_and_die (void);
   // Explain usage and exit.
 
-  ACE_TCHAR *program_name_;
+  char program_name_[MAXPATHLEN];
   // Name of the program.
 
-  const ACE_TCHAR *slave_name_;
+  char slave_name_[MAXPATHLEN];
   // Name of slave process.
 
   int debug_;
diff --git a/examples/Shared_Malloc/test_malloc.cpp b/examples/Shared_Malloc/test_malloc.cpp
index fe566da6eab..c0531029b95 100644
--- a/examples/Shared_Malloc/test_malloc.cpp
+++ b/examples/Shared_Malloc/test_malloc.cpp
@@ -18,8 +18,7 @@ static int
 gen_size (void)
 {
 #if defined (ACE_HAS_THREADS)
-  ACE_RANDR_TYPE seed = ACE_static_cast (ACE_RANDR_TYPE,
-    ACE_reinterpret_cast (unsigned long, &seed));
+  ACE_RANDR_TYPE seed = static_cast<ACE_RANDR_TYPE> (reinterpret_cast<unsigned long> (&seed));
   return (ACE_OS::rand_r (seed) % Options::instance ()->max_msg_size ()) + 1;
 #else
   return (ACE_OS::rand () % Options::instance ()->max_msg_size ()) + 1;
@@ -109,19 +108,19 @@ spawn (void)
 #endif /* ACE_HAS_THREADS */
     }
 #if !defined (ACE_WIN32)
-  else if (ACE_OS::fork (Options::instance ()->program_name ()) == 0)
+  else if (ACE_OS::fork (ACE_TEXT_CHAR_TO_TCHAR (Options::instance ()->program_name ())) == 0)
     {
       if (Options::instance ()->exec_slave ())
         {
           char iterations[20];
           char msg_size[20];
 
-          ACE_OS::sprintf (iterations,
-                           ACE_SIZE_T_FORMAT_SPECIFIER,
-                           Options::instance ()->iteration_count ());
-          ACE_OS::sprintf (msg_size,
-                           ACE_SIZE_T_FORMAT_SPECIFIER,
-                           Options::instance ()->max_msg_size ());
+          ACE_OS::sprintf (iterations, "%lu",
+                           (unsigned long)
+                             Options::instance ()->iteration_count ());
+          ACE_OS::sprintf (msg_size, "%lu",
+                           (unsigned long)
+                             Options::instance ()->max_msg_size ());
           const char *cp = 0;
 
           if (Options::instance ()->debug ())
@@ -131,14 +130,14 @@ spawn (void)
 
           const char *argv[] =
           {
-            (char *) Options::instance ()->slave_name (),
+            Options::instance ()->slave_name (),
             "-p",
             "-n",
             iterations,
             "-L",
             msg_size,
             cp,
-            (char *) 0
+            0
           };
 
           if (ACE_OS::execv (Options::instance ()->program_name (),
diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp
index 8c2f5f61e19..9177d22745d 100644
--- a/examples/Shared_Malloc/test_persistence.cpp
+++ b/examples/Shared_Malloc/test_persistence.cpp
@@ -36,8 +36,7 @@ public:
   Employee (const char *name, u_long id) : id_ (id)
   {
     size_t len = ACE_OS::strlen (name) + 1;
-    this->name_ = ACE_reinterpret_cast (char *,
-                                        shmem_allocator->malloc (len));
+    this->name_ = reinterpret_cast<char *> (shmem_allocator->malloc (len));
     ACE_OS::strcpy (this->name_, name);
   }
 
@@ -51,8 +50,7 @@ public:
       shmem_allocator->free (this->name_);
 
     size_t len = ACE_OS::strlen (name) + 1;
-    this->name_ = ACE_reinterpret_cast (char *,
-                                        shmem_allocator->malloc (len));
+    this->name_ = reinterpret_cast<char *> (shmem_allocator->malloc (len));
     ACE_OS::strcpy (this->name_, name);
   }
 
@@ -205,8 +203,7 @@ GUI_Handler::find_employee (const char *name)
   if (shmem_allocator->find (name,
                              temp) == 0)
     {
-      Employee *employee = ACE_reinterpret_cast (Employee *,
-                                                 temp);
+      Employee *employee = reinterpret_cast<Employee *> (temp);
 
       ACE_DEBUG ((LM_DEBUG,
                   "The following employee was found.......\n\n"));
@@ -235,8 +232,7 @@ GUI_Handler::list_employees (void)
          iterator.next (temp) != 0;
          iterator.advance ())
       {
-        Employee *employee = ACE_reinterpret_cast (Employee *,
-                                                   temp);
+        Employee *employee = reinterpret_cast<Employee *> (temp);
         ACE_DEBUG ((LM_DEBUG,
                     "Employee name: %s\nEmployee id:   %d\n",
                     employee->name (),
@@ -253,8 +249,7 @@ GUI_Handler::list_employees (void)
          iterator.next (temp) != 0;
          iterator.advance ())
       {
-        Employee *employee = ACE_reinterpret_cast (Employee *,
-                                                   temp);
+        Employee *employee = reinterpret_cast<Employee *> (temp);
         ACE_DEBUG ((LM_DEBUG,
                     "Employee name: %s\nEmployee id:   %d\n",
                     employee->name (),
@@ -272,8 +267,7 @@ GUI_Handler::delete_employee (const char *name)
   if (shmem_allocator->unbind (name,
                                temp) == 0)
     {
-      Employee *employee = ACE_reinterpret_cast (Employee *,
-                                                 temp);
+      Employee *employee = reinterpret_cast<Employee *> (temp);
 
       ACE_DEBUG ((LM_DEBUG,
                   "The following employee was found and deleted.......\n\n"));
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp
index dc756bf6847..9d9dc308a08 100644
--- a/examples/Shared_Malloc/test_position_independent_malloc.cpp
+++ b/examples/Shared_Malloc/test_position_independent_malloc.cpp
@@ -127,8 +127,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         {
         case 'a':
           // Override the default base address.
-          base_addr = ACE_reinterpret_cast (void *,
-                                            ACE_OS::atoi (get_opt.opt_arg ()));
+          base_addr = reinterpret_cast<void *> (ACE_OS::atoi (get_opt.opt_arg ()));
           break;
         case 'T':
 #if defined (ACE_HAS_TRACE)
diff --git a/examples/Shared_Memory/test_MM.cpp b/examples/Shared_Memory/test_MM.cpp
index 09b4e5ea02a..2d98224f910 100644
--- a/examples/Shared_Memory/test_MM.cpp
+++ b/examples/Shared_Memory/test_MM.cpp
@@ -9,7 +9,7 @@
 ACE_RCSID(Shared_Memory, test_MM, "$Id$")
 
 #define SHMSZ 27
-char shm_key[] = "/tmp/fooXXXXXX";
+ACE_TCHAR shm_key[] = ACE_TEXT ("/tmp/fooXXXXXX");
 
 static void
 client (void)
@@ -41,20 +41,26 @@ server (void)
     ACE_OS::sleep (1);
 
   if (shm_server->remove () < 0)
-    ACE_ERROR ((LM_ERROR, "%p\n", "remove"));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("remove")));
   ACE_OS::unlink (shm_key);
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  if (ACE_OS::mktemp (ACE_TEXT_CHAR_TO_TCHAR (shm_key)) == 0 || (ACE_OS::unlink (shm_key) == -1 && errno == EPERM))
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", shm_key), 1);
+  if (
+#if defined (ACE_LACKS_MKSTEMP)
+      ACE_OS::mktemp (shm_key) == 0
+#else
+      ACE_OS::mkstemp (shm_key) == 0
+#endif
+      || (ACE_OS::unlink (shm_key) == -1 && errno == EPERM))
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), shm_key), 1);
 
   switch (ACE_OS::fork ())
     {
     case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "fork"), 1);
+      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("fork")), 1);
     case 0:
       // Make sure the server starts up first.
       ACE_OS::sleep (1);
diff --git a/examples/Shared_Memory/test_SV.cpp b/examples/Shared_Memory/test_SV.cpp
index b7e8a36adfc..26ab56a7115 100644
--- a/examples/Shared_Memory/test_SV.cpp
+++ b/examples/Shared_Memory/test_SV.cpp
@@ -25,7 +25,7 @@ client (void)
 static void
 server (void)
 {
-  ACE_Shared_Memory_SV shm_server (SHM_KEY, SHMSZ, 
+  ACE_Shared_Memory_SV shm_server (SHM_KEY, SHMSZ,
 				   ACE_Shared_Memory_SV::ACE_CREATE);
   char *shm = (char *) shm_server.malloc ();
   char *s   = shm;
@@ -43,15 +43,15 @@ server (void)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   switch (ACE_OS::fork ())
     {
     case -1:
       ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "fork"), 1);
-    case 0: 
+    case 0:
       // Make sure the server starts up first.
-      ACE_OS::sleep (1); 
+      ACE_OS::sleep (1);
       client ();
       break;
     default:
diff --git a/examples/Smart_Pointers/gadget_test.cpp b/examples/Smart_Pointers/gadget_test.cpp
index 1577d860255..74df2248dc3 100644
--- a/examples/Smart_Pointers/gadget_test.cpp
+++ b/examples/Smart_Pointers/gadget_test.cpp
@@ -17,7 +17,7 @@
 #include "Gadget_Part.h"
 #include "Gadget_Part_Factory.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
diff --git a/examples/Smart_Pointers/widget_test.cpp b/examples/Smart_Pointers/widget_test.cpp
index 83f5568a8a4..978b33d5bec 100644
--- a/examples/Smart_Pointers/widget_test.cpp
+++ b/examples/Smart_Pointers/widget_test.cpp
@@ -14,12 +14,13 @@
 #include "ace/Unbounded_Queue.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
 #include "Widget.h"
 #include "Widget_Factory.h"
 #include "Widget_Part.h"
 #include "Widget_Part_Factory.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp
index de16db27a7b..9f0578f09b1 100644
--- a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp
@@ -21,7 +21,7 @@ main (int, char *[])
   ACE_SV_Message_Queue msgque (SRV_KEY);
   Message_Block send_msg (SRV_ID,
                           pid,
-                          ACE_OS::cuserid (ACE_static_cast (char *, 0)),
+                          ACE_OS::cuserid (static_cast<char *> (0)),
                           "did you get this?");
   Message_Block recv_msg (pid);
 
@@ -44,7 +44,7 @@ main (int, char *[])
 
 #else
 
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR,
               "SYSV IPC, or SYSV SHMEM is not supported on this platform\n"));
diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp
index 9e5bd71cde7..57c7502cabd 100644
--- a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp
@@ -33,7 +33,7 @@ main (int, char *[])
   Message_Block recv_msg (SRV_ID);
   Message_Block send_msg (0,
                           pid,
-                          ACE_OS::cuserid (ACE_static_cast (char *, 0)),
+                          ACE_OS::cuserid (static_cast<char *> (0)),
                           "I received your message.");
 
   // Register a signal handler.
@@ -69,7 +69,7 @@ main (int, char *[])
 
 #else
 
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR,
               "SYSV IPC, or SYSV SHMEM is not supported on this platform\n"));
diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp
index 75a539661e5..055f93223c3 100644
--- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp
@@ -13,13 +13,15 @@
 ACE_RCSID(SV_Message_Queues, TMQ_Client, "$Id$")
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   long pid = long (ACE_OS::getpid ());
 
   ACE_Typed_SV_Message_Queue<Message_Data> msgque (key_t (SRV_KEY));
 
-  Message_Data msg_data (pid, ACE_OS::cuserid (ACE_static_cast (char *, 0)), "did you get this?");
+  Message_Data msg_data (pid,
+                         ACE_OS::cuserid (static_cast<char *> (0)),
+                         "did you get this?");
 
   ACE_Typed_SV_Message<Message_Data> send_msg (msg_data,
 					       SRV_ID,
@@ -27,20 +29,23 @@ main (int, char *[])
 					       recv_msg (pid);
 
   if (msgque.send (send_msg) < 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "msgque.send"), 1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("msgque.send")), 1);
 
   if (msgque.recv (recv_msg) < 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "msgque.recv"), 1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("msgque.recv")), 1);
 
   Message_Data &recv_msg_data = recv_msg.data ();
 
-  cout << "a message of length "
-       << recv_msg_data.length ()
-       << " received from server "
-       << recv_msg_data.pid ()
-       << " (user "
-       << recv_msg_data.user () << "): "
-       << recv_msg_data.text () << "\n";
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("a message of length %d")
+              ACE_TEXT (" received from server %d")
+              ACE_TEXT (" (user %C): %C\n"),
+              recv_msg_data.length (),
+              recv_msg_data.pid (),
+              recv_msg_data.user (),
+              recv_msg_data.text ()));
 
   return 0;
 }
diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
index e1a22cda9c8..bb4377e02c6 100644
--- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
@@ -31,7 +31,7 @@ handler (int)
 int
 main (int, char *[])
 {
-  char *username = ACE_OS::cuserid (ACE_static_cast (char *, 0));
+  char *username = ACE_OS::cuserid (static_cast<char *> (0));
   Message_Data msg_data ((int) ACE_OS::getpid (), username, "I received your message.");
   ACE_Typed_SV_Message<Message_Data> send_msg (msg_data, 0, msg_data.length ());
   ACE_Typed_SV_Message<Message_Data> recv_msg (SRV_ID);
@@ -75,7 +75,7 @@ template class ACE_Typed_SV_Message<Message_Data>;
 
 #else
 
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR,
               "SYSV IPC, or SYSV SHMEM is not supported on this platform\n"));
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp
index 1dba56c734c..afc0c279577 100644
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp
+++ b/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/SV_Shared_Memory.h"
 #include "ace/SV_Semaphore_Simple.h"
+#include "ace/SV_Semaphore_Complex.h"
 #include "ace/Malloc.h"
 #include "ace/OS_NS_unistd.h"
 
@@ -78,7 +79,7 @@ main (int, char *[])
     }
 }
 #else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR,
               "SYSV IPC, or SYSV SHMEM is not supported on this platform\n"));
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
index 5edebdbb6cd..2c0f2ca6e9f 100644
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
+++ b/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
@@ -99,7 +99,7 @@ main (int, char *[])
     }
 }
 #else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR,
               "SYSV IPC, or SYSV SHMEM is not supported on this platform\n"));
diff --git a/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp b/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp
index 981663630f0..3a36e395d35 100644
--- a/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp
+++ b/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp
@@ -68,7 +68,7 @@ main (int, char *argv[])
 
 #else
 
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR,
               "SYSV IPC, or SYSV SHMEM is not supported on this platform\n"));
diff --git a/examples/TMCast/Member/Member.mpc b/examples/TMCast/Member/Member.mpc
index 41372c2abb4..29f274f51f3 100644
--- a/examples/TMCast/Member/Member.mpc
+++ b/examples/TMCast/Member/Member.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project: aceexe, tmcast {
+  exename = member
 }
 
diff --git a/examples/TMCast/Member/member.cpp b/examples/TMCast/Member/member.cpp
index d6abd081b70..f89c68564ea 100644
--- a/examples/TMCast/Member/member.cpp
+++ b/examples/TMCast/Member/member.cpp
@@ -15,7 +15,7 @@
 class Args {};
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   int status = 0;
   try
@@ -32,7 +32,7 @@ main (int argc, char* argv[])
 
     ACE_INET_Addr address (argv[3]);
 
-    TMCast::Group group (address, argv[2]);
+    ACE_TMCast::Group group (address, ACE_TEXT_ALWAYS_CHAR (argv[2]));
 
     if (receiver)
     {
@@ -53,8 +53,7 @@ main (int argc, char* argv[])
 
         ACE_UINT64 tmpl = 1000000U;
         unsigned long t =
-          ACE_static_cast (unsigned long,
-                           ((tmpl * ACE_OS::rand ()) / RAND_MAX));
+          static_cast<unsigned long> (((tmpl * ACE_OS::rand ()) / RAND_MAX));
 
         // ACE_DEBUG ((LM_DEBUG, "sleeping for %u\n", t));
 
@@ -66,7 +65,7 @@ main (int argc, char* argv[])
         {
           group.send (buffer, ACE_OS::strlen (buffer) + 1);
         }
-        catch (TMCast::Group::Aborted const&)
+        catch (ACE_TMCast::Group::Aborted const&)
         {
           ACE_ERROR ((LM_ERROR, "%s has been aborted\n", buffer));
         }
@@ -79,13 +78,13 @@ main (int argc, char* argv[])
                 "Usage: member {r|s} <id> <IPv4 mcast address>:<port>\n"));
     status++;
   }
-  catch (TMCast::Group::Failed const&)
+  catch (ACE_TMCast::Group::Failed const&)
   {
     ACE_ERROR ((LM_ERROR,
                 "Group failure. Perhaps I am alone in the group.\n"));
     status++;
   }
-  catch (TMCast::Group::InsufficienSpace const&)
+  catch (ACE_TMCast::Group::InsufficienSpace const&)
   {
     ACE_ERROR ((LM_ERROR, "Insufficient space in receive buffer.\n"));
     status++;
diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp
index dad6573d59d..c1e796736ad 100644
--- a/examples/Threads/task_three.cpp
+++ b/examples/Threads/task_three.cpp
@@ -12,6 +12,7 @@
 //    }
 
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdio.h"
 #include "ace/OS_main.h"
 #include "ace/Reactor.h"
 #include "ace/Service_Config.h"
@@ -26,7 +27,7 @@ ACE_RCSID(Threads, task_three, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
-static ofstream *out_stream = 0;
+static ACE_OSTREAM_TYPE *out_stream = 0;
 static sig_atomic_t done = 0;
 static const size_t NUM_INVOCATIONS = 100;
 static const size_t TASK_COUNT = 130;
@@ -61,7 +62,7 @@ Test_Task::Test_Task (void)
   this->handled_ = 0;
   Test_Task::current_count_++;
   ACE_DEBUG ((LM_DEBUG,
-	      "Test_Task constructed, current_count_ = %d\n",
+	      ACE_TEXT ("Test_Task constructed, current_count_ = %d\n"),
 	      Test_Task::current_count_));
 }
 
@@ -70,14 +71,14 @@ Test_Task::~Test_Task (void)
   ACE_GUARD (ACE_Thread_Mutex, ace_mon, lock_);
 
   ACE_DEBUG ((LM_DEBUG,
-              "Test_Task destroyed, current_count_ = %d\n",
+              ACE_TEXT ("Test_Task destroyed, current_count_ = %d\n"),
 	      Test_Task::current_count_));
 }
 
 int
 Test_Task::open (void *args)
 {
-  r_ = ACE_reinterpret_cast (ACE_Reactor *, args);
+  r_ = reinterpret_cast <ACE_Reactor *> (args);
   return ACE_Task<ACE_MT_SYNCH>::activate (THR_NEW_LWP);
 }
 
@@ -88,7 +89,7 @@ Test_Task::close (u_long)
 
   Test_Task::current_count_--;
   ACE_DEBUG ((LM_DEBUG,
-              "Test_Task::close () current_count_ = %d.\n",
+              ACE_TEXT ("Test_Task::close () current_count_ = %d.\n"),
 	      Test_Task::current_count_));
   return 0;
 }
@@ -112,14 +113,13 @@ Test_Task::svc (void)
 	  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
 
 	  ACE_ERROR_RETURN ((LM_ERROR,
-                             "Test_Task: error %p!\n",
-                             "notifying reactor"),
+                             ACE_TEXT ("Test_Task: error %p!\n"),
+                             ACE_TEXT ("notifying reactor")),
                              0);
 	}
     }
 
-  ACE_DEBUG ((LM_DEBUG,
-              " (%t) returning from svc ()\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) returning from svc ()\n")));
   return 0;
 }
 
@@ -133,7 +133,7 @@ Test_Task::handle_input (ACE_HANDLE)
       ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
       Test_Task::done_cnt_++;
       ACE_DEBUG ((LM_DEBUG,
-		  " (%t) Test_Task: handle_input! done_cnt_ = %d.\n",
+		  ACE_TEXT (" (%t) Test_Task: handle_input done_cnt_ = %d.\n"),
 		  Test_Task::done_cnt_));
     }
 
@@ -151,9 +151,8 @@ dispatch (void *arg)
       ACE_LOG_MSG->msg_ostream (out_stream);
     }
 
-  ACE_DEBUG ((LM_DEBUG,
-              " (%t) Dispatcher Thread started!\n"));
-  ACE_Reactor *r = ACE_reinterpret_cast (ACE_Reactor *, arg);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) Dispatcher Thread started!\n")));
+  ACE_Reactor *r = reinterpret_cast <ACE_Reactor *> (arg);
   int result;
 
   r->owner (ACE_OS::thr_self ());
@@ -164,7 +163,7 @@ dispatch (void *arg)
 
       if (result <= 0)
 	ACE_DEBUG ((LM_DEBUG,
-                    "Dispatch: handle_events (): %d",
+                    ACE_TEXT ("Dispatch: handle_events (): %d"),
                     result));
     }
 
@@ -183,10 +182,15 @@ ACE_TMAIN (int argc, ACE_TCHAR **)
   if (argc > 1)
     {
       // Send output to file.
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
       ACE_NEW_RETURN (out_stream,
                       ofstream ("test_task_three.out",
                                 ios::trunc|ios::out),
                       -1);
+#else
+      if ((out_stream = ACE_OS::fopen ("test_task_three.out", "w")) == NULL)
+        return -1;
+#endif
       ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
       ACE_LOG_MSG->msg_ostream (out_stream);
     }
@@ -223,20 +227,27 @@ ACE_TMAIN (int argc, ACE_TCHAR **)
 	  if (errno == ETIME)
 	    {
 	      ACE_DEBUG ((LM_DEBUG,
-                          "no activity within 2 seconds, shutting down\n"));
+                          ACE_TEXT ("no activity within 2 seconds, shutting down\n")));
 	      break;
 	    }
 	  else
 	    ACE_ERROR ((LM_ERROR,
-                        "%p error handling events\n",
-                        "main"));
+                        ACE_TEXT ("%p error handling events\n"),
+                        ACE_TEXT ("main")));
 	}
     }
 
   if (argc > 1)
     {
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
       *out_stream << flush;
-      out_stream->close ();
+      delete out_stream;
+#else
+      ACE_OS::fflush(out_stream);
+      ACE_OS::fclose(out_stream);
+#endif
+      ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM);
+      ACE_LOG_MSG->msg_ostream (0);
     }
 
   // Bail out here so that we don't call the destructors for the tasks..
@@ -251,7 +262,7 @@ int
 ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR,
-              "threads not supported on this platform\n"));
+              ACE_TEXT ("threads not supported on this platform\n")));
   return 0;
 }
 #endif /* ACE_HAS_THREADS */
diff --git a/examples/Threads/thread_manager.cpp b/examples/Threads/thread_manager.cpp
index 6bbcbee6300..e6f12f6c939 100644
--- a/examples/Threads/thread_manager.cpp
+++ b/examples/Threads/thread_manager.cpp
@@ -66,7 +66,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
 
   int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker),
-				 ACE_reinterpret_cast (void *, n_iterations),
+				 reinterpret_cast<void *> (n_iterations),
 				 THR_NEW_LWP | THR_DETACHED);
 
   // Wait for 1 second and then suspend every thread in the group.
diff --git a/examples/Threads/thread_specific.cpp b/examples/Threads/thread_specific.cpp
index e26571ad61b..5fdd9a5471c 100644
--- a/examples/Threads/thread_specific.cpp
+++ b/examples/Threads/thread_specific.cpp
@@ -36,7 +36,7 @@ cleanup (void *ptr)
               "(%t) in cleanup, ptr = %x\n",
               ptr));
 
-  delete ACE_reinterpret_cast (char *, ptr);
+  delete reinterpret_cast<char *> (ptr);
 }
 
 // This worker function is the entry point for each thread.
@@ -203,8 +203,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 #if defined (ACE_HAS_THREADS)
   if (ACE_Thread_Manager::instance ()->spawn_n (threads,
                                                ACE_THR_FUNC (&worker),
-                                               ACE_reinterpret_cast(void *,
-                                                                    count),
+                                               reinterpret_cast<void *> (count),
                                                THR_BOUND | THR_DETACHED) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
index 3329e983323..ceafaef5fe9 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
@@ -141,7 +141,7 @@ Input_Task::svc (void)
 int
 Input_Task::add_timer (void *argument)
 {
-  u_long useconds = *ACE_reinterpret_cast (int *, argument);
+  u_long useconds = *reinterpret_cast<int *> (argument);
   ACE_Time_Value interval (useconds / usecs_,
                            useconds % usecs_);
   ACE_Time_Value expire_at = ACE_OS::gettimeofday () + interval;
@@ -174,8 +174,7 @@ Input_Task::add_timer (void *argument)
 int
 Input_Task::cancel_timer (void *argument)
 {
-  return this->queue_->cancel (*ACE_reinterpret_cast (int *,
-                                                      argument));
+  return this->queue_->cancel (*reinterpret_cast<int *> (argument));
 }
 
 // Lists the timers in the queue.  Ignores the argument. This method
diff --git a/examples/Web_Crawler/Command_Processor.cpp b/examples/Web_Crawler/Command_Processor.cpp
index dc6ab443d45..c23310be017 100644
--- a/examples/Web_Crawler/Command_Processor.cpp
+++ b/examples/Web_Crawler/Command_Processor.cpp
@@ -89,8 +89,7 @@ Command_Processor::execute (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n", "dequeue_head"),
                           -1);
-      URL_Command *url_command = ACE_dynamic_cast (URL_Command *,
-                                                   command);
+      URL_Command *url_command = dynamic_cast<URL_Command *> (command);
       Auto_Destroyer<URL_Command> url_command_ptr (url_command);
       if (url_command_ptr->execute () != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -134,4 +133,6 @@ template class ACE_Unbounded_Queue<Command *>;
 #pragma instantiate ACE_Node<Command *>
 #pragma instantiate ACE_Unbounded_Queue_Iterator<Command *>
 #pragma instantiate ACE_Unbounded_Queue<Command *>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+template ACE_Singleton<Options, ACE_Null_Mutex> *ACE_Singleton<Options, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Web_Crawler/Iterators.cpp b/examples/Web_Crawler/Iterators.cpp
index ba6d20c19ec..98b4f999622 100644
--- a/examples/Web_Crawler/Iterators.cpp
+++ b/examples/Web_Crawler/Iterators.cpp
@@ -46,7 +46,7 @@ HTML_Body_Iterator::next (ACE_CString &url)
       if ( href_index > 0)
         {
           // Get back to buffer start location.
-          this->url_.stream ().seek (-1 * ACE_static_cast (off_t, len),
+          this->url_.stream ().seek (-1 * static_cast<off_t> (len),
                                      SEEK_CUR);
 
           int start_index = buffer.find ('\"',
@@ -92,7 +92,7 @@ HTTP_Header_Iterator::next (ACE_CString &line)
   else
     {
       for (char c;
-           (c = this->url_.stream ().get_char ()) != EOF;
+           (c = this->url_.stream ().get_char ()) != (char)EOF;
            )
         {
           // Check to see if we're at the end of the header line.
diff --git a/examples/Web_Crawler/Mem_Map_Stream.cpp b/examples/Web_Crawler/Mem_Map_Stream.cpp
index 7626f378ce8..dda1d465a71 100644
--- a/examples/Web_Crawler/Mem_Map_Stream.cpp
+++ b/examples/Web_Crawler/Mem_Map_Stream.cpp
@@ -38,8 +38,7 @@ int
 Mem_Map_Stream::rewind (void)
 {
   this->recv_pos_ =
-    ACE_reinterpret_cast (char *,
-                          this->mem_map_.addr ());
+    reinterpret_cast<char *> (this->mem_map_.addr ());
   this->get_pos_ = this->recv_pos_;
   this->end_of_mapping_plus1_ =
     this->recv_pos_ + this->mem_map_.size ();
@@ -102,8 +101,7 @@ Mem_Map_Stream::seek (off_t offset, int whence)
     {
     case SEEK_SET:
       this->get_pos_ =
-        ACE_reinterpret_cast (char *,
-                              this->mem_map_.addr ())
+        reinterpret_cast<char *> (this->mem_map_.addr ())
         + offset;
       break;
 
@@ -125,8 +123,7 @@ Mem_Map_Stream::seek (off_t offset, int whence)
       return (off_t) -1;
 
   this->recv_pos_ = this->get_pos_;
-  return this->recv_pos_ - ACE_reinterpret_cast (char *,
-                                                 this->mem_map_.addr ());
+  return this->recv_pos_ - reinterpret_cast<char *> (this->mem_map_.addr ());
 }
 
 Mem_Map_Stream::Svc_Handler * 
@@ -224,14 +221,12 @@ Mem_Map_Stream::grow_file_and_remap (void)
   // MAP_FAILED is used as a "first time in" flag.
   if (this->recv_pos_ == MAP_FAILED)
     {
-      this->recv_pos_ = ACE_reinterpret_cast (char *,
-                                              this->mem_map_.addr ());
+      this->recv_pos_ = reinterpret_cast<char *> (this->mem_map_.addr ());
       this->get_pos_ = this->recv_pos_;
     }
 
   this->end_of_mapping_plus1_ =
-    ACE_reinterpret_cast (char *,
-                          this->mem_map_.addr ())
+    reinterpret_cast<char *> (this->mem_map_.addr ())
     + this->mem_map_.size ();
 
   return 0;
diff --git a/examples/Web_Crawler/URL.h b/examples/Web_Crawler/URL.h
index cf022309a9f..68c41f018ad 100644
--- a/examples/Web_Crawler/URL.h
+++ b/examples/Web_Crawler/URL.h
@@ -18,13 +18,17 @@
 #define _URL_H
 
 #include "Mem_Map_Stream.h"
-#include "URL_Addr.h"
-#include "URL_Status.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "URL_Addr.h"
+#include "URL_Status.h"
+
+#include "ace/SString.h"
+
+
 // Forward declaration.
 class URL_Visitor;
 
@@ -32,7 +36,7 @@ class URL
 {
   // = TITLE
   //    Base class for a URL.
-  // 
+  //
   // = DESCRIPTION
   //    This class plays a role in the Visitor pattern.
 public:
@@ -47,7 +51,7 @@ public:
   virtual ssize_t send_request (void) = 0;
   // Send a <GET> command to fetch the contents in the URI from the
   // server.
-  
+
   virtual const ACE_URL_Addr &url_addr (void) const = 0;
   // Returns the URL that we represent.
 
@@ -62,7 +66,7 @@ public:
   virtual const ACE_CString &content_type (void);
   virtual void content_type (const ACE_CString &);
 
-  
+
 
 private:
   URL_Status reply_status_;
diff --git a/examples/Web_Crawler/URL_Addr.cpp b/examples/Web_Crawler/URL_Addr.cpp
index a49dfd2ac96..5a630e387fb 100644
--- a/examples/Web_Crawler/URL_Addr.cpp
+++ b/examples/Web_Crawler/URL_Addr.cpp
@@ -145,11 +145,9 @@ ACE_URL_Addr::ACE_URL_Addr (const ACE_URL_Addr &addr)
 int
 ACE_URL_Addr::set (const ACE_URL_Addr &addr)
 {
-  ACE_OS::free (ACE_reinterpret_cast (void *,
-                                      const_cast<ACE_TCHAR *>
+  ACE_OS::free (reinterpret_cast<void *> (const_cast<ACE_TCHAR *>
                                                       (this->path_name_)));
-  ACE_OS::free (ACE_reinterpret_cast (void *,
-                                      const_cast<ACE_TCHAR *>
+  ACE_OS::free (reinterpret_cast<void *> (const_cast<ACE_TCHAR *>
                                                       (this->addr_string_)));
   if (this->ACE_INET_Addr::set (addr) == -1)
     return -1;
@@ -220,11 +218,9 @@ ACE_URL_Addr::get_path_name (void) const
 
 ACE_URL_Addr::~ACE_URL_Addr (void)
 {
-  ACE_OS::free (ACE_reinterpret_cast (void *,
-                                      const_cast<ACE_TCHAR *>
+  ACE_OS::free (reinterpret_cast<void *> (const_cast<ACE_TCHAR *>
                                                       (this->path_name_)));
-  ACE_OS::free (ACE_reinterpret_cast (void *,
-                                      const_cast<ACE_TCHAR *>
+  ACE_OS::free (reinterpret_cast<void *> (const_cast<ACE_TCHAR *>
                                                       (this->addr_string_)));
   this->path_name_ = 0;
 }
diff --git a/examples/Web_Crawler/URL_Visitor.cpp b/examples/Web_Crawler/URL_Visitor.cpp
index 5e25613e38e..2ad46d42eac 100644
--- a/examples/Web_Crawler/URL_Visitor.cpp
+++ b/examples/Web_Crawler/URL_Visitor.cpp
@@ -165,8 +165,7 @@ HTML_Body_Validation_Strategy::execute (void)
           HTTP_URL *http_url;
           ACE_NEW_RETURN (http_url,
                           HTTP_URL (**url_addr_ptr,
-                                    ACE_dynamic_cast (HTTP_URL *,
-                                                      &this->url_)),
+                                    dynamic_cast<HTTP_URL *> (&this->url_)),
                           0);
           URL_Command *url_command;
           ACE_NEW_RETURN (url_command,
diff --git a/examples/Web_Crawler/Web_Crawler.mpc b/examples/Web_Crawler/Web_Crawler.mpc
index f40976387fb..a7df4bfef17 100644
--- a/examples/Web_Crawler/Web_Crawler.mpc
+++ b/examples/Web_Crawler/Web_Crawler.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : aceexe {
+  exename = main
 }
diff --git a/html/README b/html/README
index 600b2a0ab3c..d575719e1a4 100644
--- a/html/README
+++ b/html/README
@@ -4,7 +4,7 @@
 generated files.  The index.html file only makes sense if you download
 the ACE-html.tar.gz documents from:
 
-ftp://ace.cs.wustl.edu/pub/ACE/
+ftp://deuce.doc.wustl.edu/pub/ACE+TAO-distribution/
 
 	or if you generate the Doxygen documentation using the
 configuration files in $ACE_ROOT/etc/*.doxygen and/or the perl script
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
index c79e8775747..fd51d933706 100644
--- a/include/makeinclude/build_dll.bor
+++ b/include/makeinclude/build_dll.bor
@@ -10,7 +10,6 @@
 # CPPDIR - list	of directories containing source files
 # OBJFILES - list of (non-system) object files
 # LIBFILES - list of (non-system) libraries
-# PASCAL - if defined means link dll against pascal run-time library
 # DEBUG	- if defined means building with debug information
 # UNICODE - if defined when building a unicode dll
 #
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
index e64eb9cf4b6..aeb65a595c6 100644
--- a/include/makeinclude/build_exe.bor
+++ b/include/makeinclude/build_exe.bor
@@ -11,7 +11,6 @@
 # OBJFILES - list of (non-system) object files
 # LIBFILES - list of (non-system) libraries
 # STATIC - if defined means link exe with static libraries
-# PASCAL - if defined means link dll against pascal run-time library
 # DEBUG	- if defined means building with debug information
 # UNICODE - if defined when building a unicode exe
 #
diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor
index a2df5312abc..a16909869bc 100644
--- a/include/makeinclude/build_lib.bor
+++ b/include/makeinclude/build_lib.bor
@@ -10,7 +10,6 @@
 # CPPDIR - list	of directories containing source files
 # OBJFILES - list of (non-system) object files
 # LIBFILES - list of (non-system) libraries
-# PASCAL - if defined means link dll against pascal run-time library
 # DEBUG	- if defined means building with debug information
 # UNICODE - if defined when building a unicode lib
 #
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index 26d2c914198..c37d0e2c976 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -6,7 +6,6 @@
 # Inputs:
 # ~~~~~~~
 # STATIC - if defined means creating a static library or executable
-# PASCAL - if defined means link dll against pascal run-time library
 # DEBUG - if defined means building with debug information
 # UNICODE - if defined means building unicode
 # CBX - if defined means building with the new cbuilderx compiler
@@ -126,19 +125,11 @@ COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn
 
 DLL_CFLAGS = -tWD
 DLL_LFLAGS = -Tpd -Gi
-!ifdef PASCAL
-!ifdef UNICODE
-DLL_STARTUP_OBJ = c0d32w.$(OBJ_EXT) sysinit.obj
-!else
-DLL_STARTUP_OBJ = c0d32.$(OBJ_EXT) sysinit.obj
-!endif
-!else
 !ifdef UNICODE
 DLL_STARTUP_OBJ = c0d32w.$(OBJ_EXT)
 !else
 DLL_STARTUP_OBJ = c0d32.$(OBJ_EXT)
 !endif
-!endif
 
 #
 # EXE specific flags
@@ -146,19 +137,11 @@ DLL_STARTUP_OBJ = c0d32.$(OBJ_EXT)
 
 EXE_CFLAGS =
 EXE_LFLAGS = -Tpe
-!ifdef PASCAL
-!ifdef UNICODE
-EXE_STARTUP_OBJ = c0x32w.$(OBJ_EXT) sysinit.obj
-!else
-EXE_STARTUP_OBJ = c0x32.$(OBJ_EXT) sysinit.obj
-!endif
-!else
 !ifdef UNICODE
 EXE_STARTUP_OBJ = c0x32w.$(OBJ_EXT)
 !else
 EXE_STARTUP_OBJ = c0x32.$(OBJ_EXT)
 !endif
-!endif
 
 #
 # Static lib specific flags
@@ -199,15 +182,7 @@ CODEGUARD_LIB = cg32.lib
 !endif
 
 !ifdef STATIC
-!ifdef PASCAL
-COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) vcl$(VCLVER).lib vcle$(VCLVER).lib cp32mt.lib ws2_32.lib
-!else
 COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) cw32mt.lib ws2_32.lib
-!endif
-!else
-!ifdef PASCAL
-COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) vcl$(VCLVER).bpi vcle$(VCLVER).lib cp32mti.lib ws2_32.lib
 !else
 COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) cw32mti.lib ws2_32.lib
 !endif
-!endif
diff --git a/include/makeinclude/decorator.bor b/include/makeinclude/decorator.bor
index 074daa78c17..0b68acc3514 100644
--- a/include/makeinclude/decorator.bor
+++ b/include/makeinclude/decorator.bor
@@ -7,7 +7,6 @@
 # ~~~~~~~
 # DEBUG - defined if building a debug library/executable
 # STATIC - defined if building a static library
-# PASCAL - defined if linking against cp32*
 # UNICODE - defined if building a unicode version
 #
 # Outputs:
@@ -26,11 +25,6 @@ BORLAND_DECO=b
 DECO_PREFIX=_
 !endif
 
-!ifdef PASCAL
-DECO_PREFIX=_
-PASCAL_DECO=p
-!endif
-
 !ifdef STATIC
 DECO_PREFIX=_
 STATIC_DECO=s
@@ -46,11 +40,11 @@ DECO_PREFIX=_
 UNICODE_DECO=u
 !endif
 
-LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
+LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
 
 !ifdef NO_EXE_DECORATION
 EXE_DECORATOR=
 !else
-EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
+EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
 !endif
 
diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor
index c3beb76356f..87a35ae6725 100644
--- a/include/makeinclude/make_flags.bor
+++ b/include/makeinclude/make_flags.bor
@@ -12,30 +12,6 @@ DEBUG_FLAG = -DDEBUG
 STATIC_FLAG = -DSTATIC
 !endif
 
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!if $(BCBVER) != 4
-!ifndef FORCE_PASCAL
-!message
-!message -------------------------------------------------------------
-!message The PASCAL build configuration is *not* required for use with
-!message Borland C++Builder 5 or 6.
-!message
-!message Since both VCL and non-VCL applications share a common run-
-!message time library (i.e. cc3250mt.dll), you can simply link your
-!message VCL code with a non-PASCAL build of the ACE+TAO libraries.
-!message
-!message If you still really want to build a PASCAL configuration, add
-!message -DFORCE_PASCAL to your make command.
-!message -------------------------------------------------------------
-!message
-!error Aborting build
-!else
-PASCAL_FLAG = -DPASCAL -DFORCE_PASCAL
-!endif
-!endif
-!endif
-
 !ifdef CODEGUARD
 CODEGUARD_FLAG = -DCODEGUARD
 !endif
@@ -52,5 +28,5 @@ UNICODE_FLAG = -DUNICODE
 NO_FULL_PATH_FLAG = -DNO_FULL_PATH
 !endif
 
-MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) $(UNICODE_FLAG) \
+MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(UNICODE_FLAG) \
        $(CODEGUARD_FLAG) $(INSTALL_DIR_FLAG) $(NO_FULL_PATH_FLAG)
diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor
index 586b38e6f27..2e9e8a2b7c9 100644
--- a/include/makeinclude/outputdir.bor
+++ b/include/makeinclude/outputdir.bor
@@ -19,50 +19,20 @@
 #
 
 !ifdef STATIC
-!ifndef STATIC_DIR
-STATIC_DIR=Static
-!endif
 OBJSTATIC_DIR=Static
 !else
-!ifndef STATIC_DIR
-STATIC_DIR=Dynamic
-!endif
 OBJSTATIC_DIR=Dynamic
 !endif
 
 !ifdef DEBUG
-!ifndef DEBUG_DIR
-DEBUG_DIR=Debug
-!endif
 OBJDEBUG_DIR=Debug
 !else
-!ifndef DEBUG_DIR
-DEBUG_DIR=Release
-!endif
 OBJDEBUG_DIR=Release
 !endif
 
-!ifdef PASCAL
-!ifndef PASCAL_DIR
-PASCAL_DIR=Pascal
-!endif
-OBJPASCAL_DIR=Pascal
-!else
-!ifndef PASCAL_DIR
-PASCAL_DIR=.
-!endif
-OBJPASCAL_DIR=.
-!endif
-
 !ifdef UNICODE
-!ifndef UNICODE_DIR
-UNICODE_DIR=Unicode
-!endif
 OBJUNICODE_DIR=Unicode
 !else
-!ifndef UNICODE_DIR
-UNICODE_DIR=.
-!endif
 OBJUNICODE_DIR=.
 !endif
 
@@ -76,14 +46,12 @@ BASE_BINDIR=.
 BASE_OBJDIR=.\obj
 !endif
 
-CONFIG_SUBDIR=$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR)
-
 !ifndef BINDIR
-BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR)
+BINDIR=$(BASE_BINDIR)
 !endif
 
 !ifndef CORE_BINDIR
-CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR)
+CORE_BINDIR=$(ACE_ROOT)\bin
 !endif
 
 !ifdef MKDIR
@@ -94,7 +62,7 @@ MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)"
 !endif
 
 !ifndef OBJDIR
-OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(OBJSTATIC_DIR)\$(OBJDEBUG_DIR)\$(OBJPASCAL_DIR)\$(OBJUNICODE_DIR)
+OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(OBJSTATIC_DIR)\$(OBJDEBUG_DIR)\$(OBJUNICODE_DIR)
 !endif
 
 !ifdef MKDIR
@@ -105,19 +73,7 @@ MAKE_OBJDIR=if not exist "$(OBJDIR)" mkdir "$(OBJDIR)"
 !endif
 
 !ifndef INSTALL_EXEDIR
-!ifndef STATIC
-!ifndef DEBUG
-!ifndef UNICODE
 INSTALL_EXEDIR=$(INSTALL_DIR)\bin
-!else
-INSTALL_EXEDIR=$(INSTALL_DIR)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(UNICODE_DIR)
-!endif
-!else
-INSTALL_EXEDIR=$(INSTALL_DIR)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(UNICODE_DIR)
-!endif
-!else
-INSTALL_EXEDIR=$(INSTALL_DIR)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(UNICODE_DIR)
-!endif
 !endif
 
 !ifdef MKDIR
@@ -128,7 +84,7 @@ MAKE_INSTALL_EXEDIR=if not exist "$(INSTALL_EXEDIR)" mkdir "$(INSTALL_EXEDIR)"
 !endif
 
 !ifndef INSTALL_DLLDIR
-INSTALL_DLLDIR=$(INSTALL_DIR)\bin
+INSTALL_DLLDIR=$(INSTALL_DIR)\lib
 !endif
 
 !ifdef MKDIR
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
index eb6ece1fc46..cfce83d686e 100644
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ b/include/makeinclude/platform_aix_ibm.GNU
@@ -109,7 +109,7 @@ DCFLAGS     += -g
 ifeq ($(XLCVERSION),0x0306)
   SHR_FILTER=$(ACE_ROOT)/bin/aix_shr
   TEMPINCDIR  = tempinc
-  CCFLAGS    += -qlanglvl=ansi -qflag=e:e -qonce -qtempinc=$(TEMPINCDIR)
+  CCFLAGS    += -qlanglvl=ansi -qflag=e:e -qonce -qtempinc=$(TEMPINCDIR) -DACE_TEMPLATES_REQUIRE_PRAGMA
   SOFLAGS    += -p 0
 # ibmcxx_build turns on the extra step for instantiating and compiling
 # template instances in rules.lib.GNU.
@@ -119,7 +119,7 @@ else    # Visual Age 5 and 6
   SHR_FILTER=$(ACE_ROOT)/bin/aix_shr
   ifeq ($(XLCVERSION),0x0500)
     TEMPINCDIR  = tempinc
-    CCFLAGS    += -qflag=w:w -qstaticinline -qfuncsect -qonce -qtempinc=$(TEMPINCDIR)
+    CCFLAGS    += -qflag=w:w -qstaticinline -qfuncsect -qonce -qtempinc=$(TEMPINCDIR) -DACE_TEMPLATES_REQUIRE_PRAGMA
   else
     ifeq ($(XLCVERSION),0x0600)
       TEMPINCDIR = tempinc
@@ -127,9 +127,9 @@ else    # Visual Age 5 and 6
 # warns that __C99_RESTRICT is reserved. When that workaround is gone, this
 # ifeq can be removed also. -qflag=w:w is what we want in the end.
       ifeq (502,$(AIX_VERS))
-        CCFLAGS    += -qflag=e:e -qstaticinline -qfuncsect -qtempinc=$(TEMPINCDIR)
+        CCFLAGS    += -qflag=e:e -qstaticinline -qfuncsect -qtempinc=$(TEMPINCDIR) -DACE_TEMPLATES_REQUIRE_SOURCE
       else
-        CCFLAGS    += -qflag=w:w -qstaticinline -qfuncsect -qtempinc=$(TEMPINCDIR)
+        CCFLAGS    += -qflag=w:w -qstaticinline -qfuncsect -qtempinc=$(TEMPINCDIR) -DACE_TEMPLATES_REQUIRE_SOURCE
       endif
     else
       CXX = echo "Unrecognized compiler version $(XLCVERSION)\n"
diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU
index 39884825b0d..2b72aa2723b 100644
--- a/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/include/makeinclude/platform_gnuwin32_common.GNU
@@ -90,6 +90,18 @@ SOEXT      = dll
 SOFLAGS    += $(MODEL_FLAGS) $(CPPFLAGS)
 SOBUILD    = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 
+PLATFORM_FL_CPPFLAGS  ?=
+PLATFORM_FL_LIBS      ?= -lfltk -lfltk_forms -lfltk_gl -lfltk_images
+PLATFORM_FL_LDFLAGS   ?=
+
+PLATFORM_GL_CPPFLAGS  ?= -I/usr/X11R6/include
+PLATFORM_GL_LIBS      ?= -lGL
+PLATFORM_GL_LDFLAGS   ?= -L/usr/X11R6/lib
+
+PLATFORM_WX_CPPFLAGS  ?= $(shell wx-config --cxxflags) -I/usr/local/include
+PLATFORM_WX_LIBS      ?= $(shell wx-config --libs)
+PLATFORM_WX_LDFLAGS   ?= $(shell wx-config --ldflags)
+
 # The sed below is to strip comments on the .def file,
 # to workaround to a bug in ld.
 SHLIBBUILD = \
diff --git a/include/makeinclude/platform_integrity_ghs.GNU b/include/makeinclude/platform_integrity_ghs.GNU
index 98cb026b358..ffd50a45410 100644
--- a/include/makeinclude/platform_integrity_ghs.GNU
+++ b/include/makeinclude/platform_integrity_ghs.GNU
@@ -36,6 +36,27 @@ ifndef BSP
   BSP = mcp750
 endif
 
+ifndef TARGET_BSP
+  TARGET_BSP = $(ACE_ROOT)/tests/ACE.bsp
+endif
+
+ifndef TARGET_LD
+  TARGET_LD = $(ACE_ROOT)/tests/INTEGRITY.ld
+endif
+
+#### Set Integrity version
+verline := $(shell ($(GHSROOT)/gversion 2>&1|grep "Green Hills Software"))
+ifeq "$(verline)" ""
+  $(error Not Green Hills or the environment is not set-up)
+endif
+INTEGRITY_VERSION_STR := $(strip $(if ifeq $(word 4, $(verline)) "INTEGRITY", $(word 5, $(verline))))
+ifeq "$(INTEGRITY_VERSION_STR)" ""
+  $(error This Green Hills setup is not for Integrity)
+endif
+ifeq "$(INTEGRITY_VERSION_STR)" "4.1.8"
+  CCFLAGS += -DINTEGRITY_VERSION=40108
+endif
+
 CC = $(GHSROOT)/cc$(CPU)
 CXX = $(GHSROOT)/cx$(CPU)
 
@@ -46,15 +67,12 @@ ifeq (1, $(exceptions))
    override rtti = 1
 endif # exceptions
 
-CCFLAGS  += $(CFLAGS) -integrate -dynamic -I$(RTOSROOT)/INTEGRITY-include-SCA $(IOPS) -bspfile=$(ACE_ROOT)/tests/ACE.bsp $(ACE_ROOT)/tests/INTEGRITY.ld
+CCFLAGS  += $(CFLAGS) -integrate -dynamic -I$(RTOSROOT)/INTEGRITY-include-SCA $(IOPS) -bspfile=$(TARGET_BSP) $(TARGET_LD)
 DCFLAGS  += -G
 SOFLAGS  += -shared
 DLD      = $(CXX)
 LD       = $(CXX)
-LDLIBS += -lACE -lshm_client -lnet -livfssca -lposixsca -lsocket
-LDFLAGS = -lACE -lshm_client -lnet -livfssca -lposixsca -lsocket
-#LDFLAGS  = --no_auto_instantiation
-#OCFLAGS  += -OL -OM
+LIBS    += -lshm_client -lnet -livfssca -lposixsca -lsocket
 PIC      =
 AR := $(CXX) -archive $(IOPS)
 ARFLAGS = -o
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index cbc26622554..71ef0089b3a 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -46,6 +46,18 @@ PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS)
 PLATFORM_WX_LIBS    = $(shell wx-config --libs)     $(PLATFORM_GTK_LIBS)
 PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags)  $(PLATFORM_GTK_LDFLAGS)
 
+PLATFORM_BOOST_CPPFLAGS ?=
+PLATFORM_BOOST_LDLAGS ?=
+PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework
+
+PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_LDFLAGS=
+
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_LDFLAGS=
+
 PLATFORM_AIO_SUPPORT := \
        $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_HAS_AIO_CALLS)
 
@@ -98,7 +110,7 @@ endif
 LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt)
 
 PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include
-PLATFORM_QT_LIBS=-lqt
+PLATFORM_QT_LIBS=-lqt-mt
 PLATFORM_QT_LDFLAGS=-L$(QTDIR)/lib
 
 OCFLAGS ?= -O3
diff --git a/include/makeinclude/platform_linux_borland.GNU b/include/makeinclude/platform_linux_borland.GNU
index be69dd8090c..2ff56d195b0 100644
--- a/include/makeinclude/platform_linux_borland.GNU
+++ b/include/makeinclude/platform_linux_borland.GNU
@@ -21,6 +21,14 @@ ifeq (,$(threads))
   threads = 1
 endif
 
+PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_LDFLAGS=
+
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_LDFLAGS=
+
 PLATFORM_AIO_SUPPORT := \
        $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
 
diff --git a/include/makeinclude/platform_linux_icc.GNU b/include/makeinclude/platform_linux_icc.GNU
index df8ee77e647..907a407d34b 100644
--- a/include/makeinclude/platform_linux_icc.GNU
+++ b/include/makeinclude/platform_linux_icc.GNU
@@ -49,6 +49,14 @@ PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS)
 PLATFORM_WX_LIBS    = $(shell wx-config --libs)     $(PLATFORM_GTK_LIBS)
 PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags)  $(PLATFORM_GTK_LDFLAGS)
 
+PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_LDFLAGS=
+
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_LDFLAGS=
+
 PLATFORM_AIO_SUPPORT := \
        $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
 
diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU
index 717c4d25b04..81f7c1f7e4e 100644
--- a/include/makeinclude/platform_lynxos.GNU
+++ b/include/makeinclude/platform_lynxos.GNU
@@ -15,10 +15,6 @@
 #### Similarly, the default VERSION and HOST_OS settings (see below)
 #### can be overridden for your particular platform.
 
-
-ifeq ($(debug),)
-  debug = 1
-endif
 ifeq ($(shared_libs_only),1)
   shared_libs = 1
   static_libs =
@@ -28,13 +24,15 @@ ifeq ($(static_libs_only),1)
   static_libs = 1
 endif
 
-#### optimize is defined below because it is version-dependent.
+optimize ?= 1
+debug ?= 1
+pipes ?= 1
 
-ifneq ($(shell uname -s),LynxOS)
+ifeq ($(shell uname -s),LynxOS)
+  export VERSION=$(shell uname -r)
+else
   CROSS-COMPILE = 1
 
-  PACE_SYSNAME = LynxOS
-
   #### The following may need to be customized for your host or target type.
   #### Or, you can source the appropriate (for your shell) Lynx SETUP file
   #### before running "make".
@@ -43,8 +41,6 @@ ifneq ($(shell uname -s),LynxOS)
     export VERSION=3.0.0
   endif # VERSION
 
-  PACE_SYSVER = 0x$(VERSION)
-
   ifeq (,$(LYNXTARGET))
     export LYNXTARGET = x86
   endif # LYNXTARGET
@@ -82,20 +78,8 @@ $(ENV_PREFIX)/cdk/$(HOST_OS)-$(OBJSFORMAT)-$(LYNXTARGET)/bin:$(ENV_PREFIX)/cdk/$
   endif # PATH
 endif # ! LynxOS
 
-ifeq (2.5.0,$(VERSION))
-  # NOTE: On LynxOS Version 2.5.0, optimization causes these warnings:
-  #       warning: internal compiler error: debugging info corrupted
-  optimize = 0
-  ACE_HAS_GNUG_PRE_2_8 = 1
-else
-  ifeq ($(optimize),)
-    optimize = 1
-  endif
-
-  #### Even though the g++ version is 2.7-97r1, it supports nested
-  #### classes, so it can build the TAO tests.
-  ACE_HAS_GNUG_PRE_2_8 = 0
-endif # VERSION
+LYNXOS_MAJOR = $(shell uname -r | awk -F. '{print $$1;}')
+LYNXOS_MINOR = $(shell uname -r | awk -F. '{print $$2;}')
 
 PLATFORM_XT_CPPFLAGS=
 PLATFORM_XT_LIBS=-lXm -lXt
@@ -105,14 +89,20 @@ PLATFORM_X11_CPPFLAGS=
 PLATFORM_X11_LIBS=-lXpm -lXext -lX11 -lSM -lICE
 PLATFORM_X11_LDFLAGS=
 
-pipes ?= 1
+ifeq ($(LYNXOS_MAJOR),4)
+  PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+  PLATFORM_TCL_LIBS=-ltcl8.4
+  PLATFORM_TCL_LDFLAGS=
+
+  PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+  PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+  PLATFORM_TK_LDFLAGS=
+endif
 
 CC              = gcc
 CXX             = g++
 CFLAGS          += -mthreads -Wpointer-arith -Wall
-#### -Winline complains a lot with -O2.
-#### CFLAGS          += -Winline
-
+CFLAGS          += -DACE_LYNXOS_MAJOR=$(LYNXOS_MAJOR) -DACE_LYNXOS_MINOR=$(LYNXOS_MINOR)
 DCFLAGS         += -g
 PIC             = -fPIC
 DLD             = $(CXX)
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 9e19f643a0b..c26fa32d065 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -73,6 +73,15 @@ PLATFORM_X11_CPPFLAGS= -I/usr/openwin/include -I/usr/dt/include
 PLATFORM_X11_LIBS =-lX11
 PLATFORM_X11_LDFLAGS=
 
+# TODO: Fix the parameters
+#PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+#PLATFORM_TCL_LIBS=-ltcl8.4
+#PLATFORM_TCL_LDFLAGS=
+#
+#PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+#PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+#PLATFORM_TK_LDFLAGS=
+
 ## Unfortunately, gcc 3.0 fails to many cpp files with
 ## optimization enabled.  Even -O causes the compiler
 ## to core dump on some files.
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 0e32bec299c..4b5a2f1c3a2 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -163,7 +163,6 @@ endif # ! 4.2
 
 # If no option has been specified, try to enable templates based on the
 # version of the compiler.
-#
 ifeq ($(templates),)
   ifeq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
     templates = explicit
@@ -171,17 +170,15 @@ ifeq ($(templates),)
     ifeq (C++ 5.3,$(findstring C++ 5.3,$(CC_VERSION)))
       # Set this to automatic if automatic template instantiation works for you.
       templates = explicit
-    else
-      ifeq (C++ 5.5,$(findstring C++ 5.5,$(CC_VERSION)))
-        # SunForte8 has no problems using implicit templates
-        templates = implicit
-      else
-        templates = explicit
-      endif
     endif
   endif
 endif
 
+# If templates is not set by the rules above, we default to implicit
+ifeq ($(templates),)
+  templates = implicit
+endif
+
 # Turn on the proper flags for explicit template instantiation.
 #
 ifeq ($(templates),explicit)
diff --git a/include/makeinclude/platform_vxworks5.x_diab.GNU b/include/makeinclude/platform_vxworks5.x_diab.GNU
index c93290b759d..39d4acd0ff8 100644
--- a/include/makeinclude/platform_vxworks5.x_diab.GNU
+++ b/include/makeinclude/platform_vxworks5.x_diab.GNU
@@ -95,7 +95,14 @@ ifeq ($(CPU),I80386)
   CFLAGS += -tI386EH:tornado -DCPU=I80386  #### not sure about that
   TOOLENV = 386
 else
+ifeq ($(CPU),PPCE500)
   BINXSYM_NAME = xsym
+  CFLAGS += -tPPCE500ES -DCPU=PPC505
+  CCFLAGS +=
+  TOOLENV = ppc
+else
+  BINXSYM_NAME = xsym
+endif # PPCE500E
 endif # I80386
 endif # I80486
 endif # PPC860
@@ -129,8 +136,8 @@ endif # ! static_libs
 CC              = dplus
 CXX             = $(CC)
 CFLAGS          += -Xsmall-data=0 -Xsmall-const=0 -Xno-implicit-templates \
-                   -Xstrings-in-text=0 -tPPC750EN:tornado
-CCFLAGS         += $(CFLAGS) -Xenum-is-int -Xbool-is-int
+                   -Xstrings-in-text=0
+CCFLAGS         += -Xenum-is-int -Xbool-is-int
 ifeq (0,$(rtti))
   #### Don't use RTTI, because Tornado 1.0.x libraries don't support it.
   CCFLAGS += -DACE_LACKS_RTTI
diff --git a/include/makeinclude/recurse.bor b/include/makeinclude/recurse.bor
index 0e9d220e29a..06ccede3a3b 100644
--- a/include/makeinclude/recurse.bor
+++ b/include/makeinclude/recurse.bor
@@ -24,10 +24,10 @@ all: $(DIRS)
 # automatically restored when the sub-directory is finished.
 $(DIRS):
 	@echo Entering directory $<
-	@$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f&&!
+        @$(MAKE) $(MAKE_FLAGS) -f&&!
 all:
 	@cd $<
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -fMakefile.bor
+        $(MAKE) $(MAKE_FLAGS) -fMakefile.bor
 !
 
 # This ugliness is to remove extra spaces from between the items in the list.
@@ -43,10 +43,10 @@ clean: $(DIRS_CLEAN)
 # automatically restored when the sub-directory is finished.
 $(DIRS_CLEAN):
 	@echo Cleaning directory $(<:.Clean=)
-	@$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f&&!
+        @$(MAKE) $(MAKE_FLAGS) -f&&!
 all:
 	@cd $(<:.Clean=)
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -fMakefile.bor clean
+        $(MAKE) $(MAKE_FLAGS) -fMakefile.bor clean
 !
 
 # This ugliness is to remove extra spaces from between the items in the list.
@@ -62,10 +62,10 @@ realclean: $(DIRS_REALCLEAN)
 # automatically restored when the sub-directory is finished.
 $(DIRS_REALCLEAN):
 	@echo Cleaning directory $(<:.RealClean=)
-	@$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f&&!
+        @$(MAKE) $(MAKE_FLAGS) -f&&!
 all:
 	@cd $(<:.RealClean=)
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -fMakefile.bor realclean
+        $(MAKE) $(MAKE_FLAGS) -fMakefile.bor realclean
 !
 
 # This ugliness is to remove extra spaces from between the items in the list.
@@ -81,10 +81,10 @@ install: $(DIRS_INSTALL)
 # automatically restored when the sub-directory is finished.
 $(DIRS_INSTALL):
        @echo Installing directory $(<:.Install=)
-       @$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f&&!
+       @$(MAKE) $(MAKE_FLAGS) -f&&!
 all:
        @cd $(<:.Install=)
-       $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -fMakefile.bor install
+       $(MAKE) $(MAKE_FLAGS) -fMakefile.bor install
 !
 
 !endif
@@ -101,7 +101,7 @@ MAKEFILES_ALL = $(MAKEFILES_ALL_4:%=.All )
 all: $(MAKEFILES_ALL)
 
 $(MAKEFILES_ALL):
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(<:.All=)
+        $(MAKE) $(MAKE_FLAGS) -f$(<:.All=)
 
 # This ugliness is to remove extra spaces from between the items in the list.
 MAKEFILES_CLEAN_1 = $(MAKEFILES) $(BLANK_SPACE)
@@ -113,7 +113,7 @@ MAKEFILES_CLEAN = $(MAKEFILES_CLEAN_4:%=.Clean )
 clean: $(MAKEFILES_CLEAN)
 
 $(MAKEFILES_CLEAN):
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(<:.Clean=) clean
+        $(MAKE) $(MAKE_FLAGS) -f$(<:.Clean=) clean
 
 # This ugliness is to remove extra spaces from between the items in the list.
 MAKEFILES_REALCLEAN_1 = $(MAKEFILES) $(BLANK_SPACE)
@@ -125,7 +125,7 @@ MAKEFILES_REALCLEAN = $(MAKEFILES_REALCLEAN_4:%=.RealClean )
 realclean: $(MAKEFILES_REALCLEAN)
 
 $(MAKEFILES_REALCLEAN):
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(<:.RealClean=) realclean
+        $(MAKE) $(MAKE_FLAGS) -f$(<:.RealClean=) realclean
 
 # This ugliness is to remove extra spaces from between the items in the list.
 MAKEFILES_INSTALL_1 = $(MAKEFILES) $(BLANK_SPACE)
@@ -137,7 +137,7 @@ MAKEFILES_INSTALL = $(MAKEFILES_INSTALL_4:%=.Install )
 install: $(MAKEFILES_INSTALL)
 
 $(MAKEFILES_INSTALL):
-       $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(<:.Install=) install
+       $(MAKE) $(MAKE_FLAGS) -f$(<:.Install=) install
 
 !endif
 
@@ -164,7 +164,7 @@ NAMES_ALL = $(NAMES_ALL_4:%=.All )
 all: $(NAMES_ALL)
 
 $(NAMES_ALL):
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.All=)
+        $(MAKE) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.All=)
 
 # This ugliness is to remove extra spaces from between the items in the list.
 NAMES_CLEAN_1 = $(NAMES) $(BLANK_SPACE)
@@ -176,7 +176,7 @@ NAMES_CLEAN = $(NAMES_CLEAN_4:%=.Clean )
 clean: $(NAMES_CLEAN)
 
 $(NAMES_CLEAN):
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.Clean=) clean
+        $(MAKE) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.Clean=) clean
 
 # This ugliness is to remove extra spaces from between the items in the list.
 NAMES_REALCLEAN_1 = $(NAMES) $(BLANK_SPACE)
@@ -188,7 +188,7 @@ NAMES_REALCLEAN = $(NAMES_REALCLEAN_4:%=.RealClean )
 realclean: $(NAMES_REALCLEAN)
 
 $(NAMES_REALCLEAN):
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.RealClean=) realclean
+        $(MAKE) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.RealClean=) realclean
 
 # This ugliness is to remove extra spaces from between the items in the list.
 NAMES_INSTALL_1 = $(NAMES) $(BLANK_SPACE)
@@ -200,7 +200,7 @@ NAMES_INSTALL = $(NAMES_INSTALL_4:%=.Install )
 install: $(NAMES_INSTALL)
 
 $(NAMES_INSTALL):
-       $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.Install=) install
+       $(MAKE) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.Install=) install
 
 !endif
 
diff --git a/include/makeinclude/rules.bin.GNU b/include/makeinclude/rules.bin.GNU
index 426c03b4380..4a0f71f1bb0 100644
--- a/include/makeinclude/rules.bin.GNU
+++ b/include/makeinclude/rules.bin.GNU
@@ -35,8 +35,13 @@ PSRC += $(addsuffix .cpp, $(CLEANUP_BIN))
 CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(VAR)$(EXEEXT))
 
 CHORUSLINK ?=
+VXWORKSLINK ?=
 using_aix_vacpp ?=
 
+ifeq ($(VXWORKSLINK),true)
+$(BIN): $(DEFAULTRULE)
+	mv $(DEFAULTRULE) $@
+else # !VXWORKSLINK
 ifeq ($(CHORUSLINK),true)
 $(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS)
 	$(LINK.cc) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(LDFLAGS) $(POSTLINK)
@@ -60,3 +65,4 @@ $(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS)
     endif # kylix
   endif # using_aix_vacpp
 endif
+endif
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index 442f02fa483..a8ef79f0027 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -130,11 +130,11 @@ ifeq (1,$(ace_lib_prelink))
         #### to lib files, for example.
 	-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR)
 endif # ace_lib_prelink
-	echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA);
+	echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
 ifdef ibmcxx_build
 # This is required to get AIX IBM C/C++ to instantiate and compile the needed
 # templates.
-	if test -s ./$(TEMPINCDIR)/*.C; \
+                      if test -s ./$(TEMPINCDIR)/*.C; \
 	then \
 		$(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \
 		$(RM) dummy; \
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index d9ac5b6a581..3c4f60b69da 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -31,6 +31,8 @@ ifdef sun
   CLEANUP_DIRS += SunWS_cache
 endif
 
+vxworks_ntbuild ?= 0
+
 #### TEMPLATE_REPOSITORY can be set in individual platform files
 #### to create template repository directories.  See
 #### platform_sunos5_sunc++.GNU for an example.
@@ -87,15 +89,7 @@ ifeq ($(static_link),1)
 endif # static_link = 1
 
 OS ?=
-ifeq ($(OS),"Windows_NT")
-$(VDIR)%.obj: %.c
-	$(COMPILE.c) $(CC_OUTPUT_FLAG) $@ $<
-	${MVCMD}
 
-$(VDIR)%.obj: %.cpp
-	$(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $<
-	${MVCMD}
-else
 $(VDIR)%.o: %.c $(VDIR)%.creation_stamp
 	$(COMPILE.c) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
@@ -103,7 +97,6 @@ $(VDIR)%.o: %.c $(VDIR)%.creation_stamp
 $(VDIR)%.o: %.cpp $(VDIR)%.creation_stamp
 	$(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
-endif
 
 $(VDIR)%.o: %.C $(VDIR)%.creation_stamp
 	$(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $<
@@ -117,6 +110,12 @@ $(VDIR)%.o: %.cxx $(VDIR)%.creation_stamp
 	$(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $<
 	${MVCMD}
 
+  ifneq (,$(COMPILE.rc))
+$(VDIR)%.rc.o: %.rc $(VDIR)%.creation_stamp
+	$(COMPILE.rc) $< $@
+	${MVCMD}
+  endif # COMPILE.rc
+
 # If SOLINK is defined, then the .$(SOEXT) file is built from the
 # .$(OBJEXT) file via separate rules in the same directory.
 # Otherwise, the .$(SOEXT) and .$(OBJEXT) are built via the same rule.
@@ -166,25 +165,25 @@ $(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT) $(VSHDIR)%.creation_stamp
 	$(SOLINK)
 endif # SOLINK
 
-ifeq ($(OS),"Windows_NT")
-$(VDIR).creation_stamp:
-	@if not exist $(VDIR) mkdir $(VDIR)
+ifeq ($(vxworks_ntbuild),1)
+$(VDIR)%.creation_stamp:
+	@if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
 	@echo > $@
 else
 .PHONY: $(VDIR)%.creation_stamp
 $(VDIR)%.creation_stamp:
-	@-test -d $(dir $@) || mkdir -p $(dir $@) $(ACE_NUL_STDERR)
+	@-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
 endif
 
 ifneq ($(VDIR),$(VSHDIR))
-  ifeq ($(OS),"Windows_NT")
-$(VSHDIR).creation_stamp:
-	@if not exist $(VSHDIR) mkdir $(VSHDIR)
+  ifeq ($(vxworks_ntbuild),1)
+$(VSHDIR)%.creation_stamp:
+	@if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
 	@echo > $@
   else
 .PHONY: $(VSHDIR)%.creation_stamp
 $(VSHDIR)%.creation_stamp:
-	@-test -d $(dir $@) || mkdir -p $(dir $@) $(ACE_NUL_STDERR)
+	@-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR)
   endif
 endif
 
@@ -258,6 +257,15 @@ $(INSMAN)/man7/% \
 $(INSMAN)/man8/% \
 $(INSMAN)/manl/% \
 $(INSMAN)/mann/% :
+ifeq ($(vxworks_ntbuild),1)
+	@if exist $@ echo "$(@F) already installed"
+	@if not exist $@ echo "Installing $(@F:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) to $(@D)" && \
+		$(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \
+		$(LN_S) $(shell pwd)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \
+		echo "Installing $(@F) to $(@D)" && \
+		$(RM) $@ && \
+		$(LN_S) $(shell pwd)/$(@F) $@
+else
 ifneq ($(mingw32),1)
 	@if test $(shell pwd) != $(@D) -o -n "$(SOVERSION)" ; then \
 		if test -s $@ ; then \
@@ -285,6 +293,7 @@ else
 		fi ; \
 	fi
 endif
+endif
 ifdef MVSLIB
 #special for MVS in order to use the .x files
 	@if test -w $(@D) ; then \
@@ -444,12 +453,12 @@ rcs_info.local:
 
 build.objdirs: $(CLEANUP_DIRS)
 
-ifeq ($(OS),"Windows_NT")
+ifeq ($(MKDIR_NTSTYLE),1)
 $(CLEANUP_DIRS):
-	@if not exist $@ mkdir $@
+	@if not exist $@ $(MKDIR) $@ $(ACE_NUL_STDERR)
 else
 $(CLEANUP_DIRS):
-	@test -d $@ || mkdir -p $@ $(ACE_NUL_STDERR)
+	@test -d $@ || $(MKDIR) $@ $(ACE_NUL_STDERR)
 endif
 
 #---------------------------------------------------------------------------
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 9e0d59f5525..6818cb29ddc 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -50,11 +50,10 @@
 #  static_link      Link only static libs to executables, e.g., uses "-static"
 #                   flag with the GNU ld linker.
 #  threads          Build with thread support.
-#  xt_reactor       Build the XtReactor.
-#  fl_reactor       Build the FlReactor.
-#  tk_reactor       Build the TkReactor.
-#  qt_reactor       Build the QtReactor.
-#  gtk_reactor      Build the GtkReactor.
+#  ace_xtreactor    Build the XtReactor.
+#  ace_flreactor    Build the FlReactor.
+#  ace_tkreactor    Build the TkReactor.
+#  ace_qtreactor    Build the QtReactor.
 #  ssl              Build with OpenSSL support.
 #  rapi             Build with RAPI
 #  stlport          Build with STLPort support
@@ -170,6 +169,7 @@
 #  PWD          Command to get the current working directory
 #  PTDIRS       Pathnames of directories containing template code
 #  RM           Name of program to use to remove files
+#  ACE_MKDIR    Name of program to (recursively) create directories
 #  SOFLAGS      Flags used to build a shared library
 #  SOLINK.cc    Link line necessary to build a share library
 #  VAR          Variant identifier suffix
@@ -255,15 +255,13 @@ endif # static_libs
 
 #### The system has X Windows and we want to include the XtReactor in
 #### the library
-xt_reactor = 0
+ace_xtreactor = 0
 
 #### Set up the build ACE version in case the platform_macros.GNU wants it.
 ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h)
 ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h)
 ACE_BETA_VERSION := $(shell awk '/ACE_BETA_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h)
 
-PACE_ROOT ?= $(ACE_ROOT)/PACE
-
 # Define some variables to silence warnings
 SHR_FILTER ?=
 
@@ -288,20 +286,17 @@ ifeq ($(threads),0)
 endif # threads
 
 ####
-#### Defaults are exceptions off (0), fast off (0), rtti off (0), and
+#### Defaults are exceptions off (0), fast off (0), rtti on (1), and
 #### versioned_so on (1).
 ####
 exceptions ?= 0
 
 fast ?= 0
 
-# @@@ Should this really be the default?  Or should we let the
-# compiler choose?
-rtti ?= 0
+rtti ?= 1
+
+versioned_so ?= 1
 
-ifeq (,$(versioned_so))
-  versioned_so = 1
-endif
 SOVERSION ?=
 SONAME ?=
 
@@ -309,6 +304,12 @@ ifeq ($(PWD),)
   PWD=$(shell pwd)
 endif
 
+ifeq ($(ACE_MKDIR),)
+  MKDIR = mkdir -p
+else
+  MKDIR = $(ACE_MKDIR)
+endif
+
 #----------------------------------------------------------------------------
 #      Platform-independent macro definitions
 #----------------------------------------------------------------------------
@@ -332,7 +333,6 @@ IDL_SERVER_TSRC_EXT ?= S_T.cpp
 ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS)))
   INCLDIRS        += -I$(ACE_ROOT)
 endif
-INSBIN          ?= $(ACE_ROOT)/bin
 INSINC          ?= $(ACE_ROOT)/ace
 INSLIB          ?= $(ACE_ROOT)/lib
 INSMAN          ?= $(ACE_ROOT)/man
@@ -440,66 +440,49 @@ ifeq ($(threads),0)
   override threads =
 endif # threads
 
-ifeq ($(xt_reactor),0)
-  override xt_reactor =
-endif # xt_reactor
-
-ifneq ($(xt_reactor),)
-  override ace_with_x11=1
-  CPPFLAGS += -DACE_HAS_XT $(PLATFORM_XT_CPPFLAGS)
-  LIBS += $(PLATFORM_XT_LIBS)
-  LDFLAGS += $(PLATFORM_XT_LDFLAGS)
-  ACE_MAKE_OPTIONS += xt_reactor
-endif # xt_reactor
-
-fl_reactor ?=
-ifeq ($(fl_reactor),0)
-  override fl_reactor =
-endif # fl_reactor
-
-ifneq ($(fl_reactor),)
-  override ace_with_x11=1
-  override ace_with_gl=1
-  CPPFLAGS += -DACE_HAS_FL $(PLATFORM_FL_CPPFLAGS)
-  LIBS += $(PLATFORM_FL_LIBS)
-  LDFLAGS += $(PLATFORM_FL_LDFLAGS)
-  ACE_MAKE_OPTIONS += rl_reactor
-endif # fl_reactor
-
-tk_reactor ?=
-ifeq ($(tk_reactor),0)
-  override tk_reactor =
-endif # tk_reactor
-
-ifneq ($(tk_reactor),)
-  override ace_with_tk=1
-  CPPFLAGS += -DACE_HAS_TK $(PLATFORM_TK_CPPFLAGS)
-  LIBS += $(PLATFORM_TK_LIBS)
-  LDFLAGS += $(PLATFORM_TK_LDFLAGS)
-  ACE_MAKE_OPTIONS += tk_reactor
-endif # tk_reactor
-
-qt_reactor ?=
+ifeq ($(ace_xtreactor),0)
+  override ace_xtreactor =
+endif # ace_xtreactor
+
+ifneq ($(ace_xtreactor),)
+  override x11=1
+  override xt=1
+  ACE_MAKE_OPTIONS += ace_xtreactor
+endif # ace_xtreactor
+
+ace_flreactor ?=
+ifeq ($(ace_flreactor),0)
+  override ace_flreactor =
+endif # ace_flreactor
+
+ifneq ($(ace_flreactor),)
+  override x11=1
+  override gl=1
+  ACE_MAKE_OPTIONS += ace_flreactor
+endif # ace_flreactor
+
+ace_tkreactor ?=
+ifeq ($(ace_tkreactor),0)
+  override ace_tkreactor =
+endif # ace_tkreactor
+
+ifneq ($(ace_tkreactor),)
+  override x11=1
+  override tk=1
+  ACE_MAKE_OPTIONS += ace_tkreactor
+endif # ace_tkreactor
+
+ace_qtreactor ?=
 ifeq ($(qt_reactor),0)
-  override qt_reactor =
-endif # qt_reactor
-
-ifneq ($(qt_reactor),)
-  override ace_with_qt=1
-  CPPFLAGS += -DACE_HAS_QT $(PLATFORM_QT_CPPFLAGS)
-  LIBS += $(PLATFORM_QT_LIBS)
-  LDFLAGS += $(PLATFORM_QT_LDFLAGS)
-  ACE_MAKE_OPTIONS += qt_reactor
-endif # qt_reactor
-
-QTDIR ?=
-ifneq ($(QTDIR),)
-  MOC = ${QTDIR}/bin/moc
-else
-  MOC = moc
-endif
+  override ace_qtreactor =
+endif # ace_qtreactor
 
+ifneq ($(ace_qtreactor),)
+  override qt=1
+  ACE_MAKE_OPTIONS += ace_qtreactor
+endif # ace_qtreactor
 gtk_reactor ?=
+
 ifeq ($(gtk_reactor),0)
   override gtk_reactor =
 endif # gtk_reactor
@@ -512,6 +495,13 @@ ifneq ($(gtk_reactor),)
   ACE_MAKE_OPTIONS += gtk_reactor
 endif # gtk_reactor
 
+QTDIR ?=
+ifneq ($(QTDIR),)
+  MOC = ${QTDIR}/bin/moc
+else
+  MOC = moc
+endif
+
 rapi ?=
 ifeq ($(rapi),0)
      override rapi =
@@ -537,36 +527,27 @@ ifneq ($(sctp),)
   ACE_MAKE_OPTIONS += sctp
 endif
 
-ace_with_gl ?=
-ifeq ($(ace_with_gl),0)
-  override ace_with_gl =
-endif # ace_with_gl
-
-ifneq ($(ace_with_gl),)
-  override ace_with_x11 = 1
-  CPPFLAGS += $(PLATFORM_GL_CPPFLAGS)
-  LIBS += $(PLATFORM_GL_LIBS)
-  LDFLAGS += $(PLATFORM_GL_LDFLAGS)
-  ACE_MAKE_OPTIONS += ace_with_gl
-endif # ace_with_gl
-
-ace_with_x11 ?=
-ifeq ($(ace_with_x11),0)
-  override ace_with_x11 =
-endif # ace_with_x11
-
-ifneq ($(ace_with_x11),)
-  CPPFLAGS += $(PLATFORM_X11_CPPFLAGS)
-  LIBS += $(PLATFORM_X11_LIBS)
-  LDFLAGS += $(PLATFORM_X11_LDFLAGS)
-  ACE_MAKE_OPTIONS += ace_with_x11
-endif # ace_with_x11
+gl ?=
+ifeq ($(gl),0)
+  override gl =
+endif # gl
+
+ifneq ($(gl),)
+  ACE_MAKE_OPTIONS += gl
+endif # gl
 
 ssl ?=
 ifeq ($(ssl),0)
   override ssl =
 else
+  ifneq ($(SSL_ROOT),)
+      # Don't do a thing..
+    else
+      CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS)
+      LDFLAGS  += $(PLATFORM_SSL_LDFLAGS)
+      LIBS     += $(PLATFORM_SSL_LIBS)
   ACE_MAKE_OPTIONS += ssl
+  endif
 endif
 
 ifeq ($(exceptions),0)
@@ -780,7 +761,6 @@ ifeq ($(stlport),1)
   LIBS     += $(PLATFORM_STLPORT_LIBS)
 endif
 
-
 # If not explicitly is set that we have wfmo, assume we don't have it.
 wfmo ?= 0
 
@@ -794,6 +774,7 @@ ace_token     ?= 1
 ace_svcconf   ?= 1
 ace_uuid      ?= 1
 ace_filecache ?= 1
+acexml        ?= 1
 
 #----------------------------------------------------------------------------
 #      Conditional macro definitions
diff --git a/java/ChangeLog b/java/ChangeLog
deleted file mode 100644
index 0f876427365..00000000000
--- a/java/ChangeLog
+++ /dev/null
@@ -1,143 +0,0 @@
-Wed Dec  5 14:35:07 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-	* EAC/System Manual.doc:
-	* EAC/System_Manual.doc:
-	  Another file with spaces in the name, awful for scripts!
-
-Fri Mar 16 16:17:24 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * java/EAC/User Manual.doc:
-        * java/EAC/User_Manual.doc:
-          Renamed documentation file, many a script gets confused with
-          names that have spaces in them.
-
-Sun Jun  4 14:53:05 2000  Darrell Brunsch <brunsch@uci.edu>
-
-        * ImageProcessing/framework/MedJava.html:
-        * ImageProcessing/framework/test.html:
-        * apps/NexusII/start.html:
-
-          Added in missing CVS Id strings.
-
-Tue Aug 24 13:09:15 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/*, tests/*, netsvcs/*: Implemented major changes to the
-          package system.  Now all files descend from the JACE directory
-          under the main archive level.  All files are further grouped by
-          their subpackage names.  This is the way Java usually wants it,
-          and makes JACE javadoc friendly.
-
-          Rewrote and added javadoc comments throughout JACE.
-
-          Changed all concurrency mechanisms to inherit from AbstractLock,
-          obeying all its requirements such as not releasing the lock
-          unless the accessing thread is the owner.
-
-          Added the token service.
-
-          Added and rewrote tests for Concurrency mechs and ServiceConfig.
-
-          Rewrote network services to inherit from JACE.netsvcs.Server and
-          JACE.netsvcs.Handler, abstracting much of the work out to these
-          base classes.
-
-          Debugging is now OFF by default.
-
-Wed Aug 18 19:43:23 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/GetOpt.java: Added another constructor to GetOpt with an
-          option to return args even if not in the optstring.  This is
-          useful for the default case in a switch (for printUsage
-          and exit).
-
-Wed Aug 18 13:35:46 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/TimerQueue.java: Now when createInternalThread is specified
-          in the constructor, it is set to be a daemon thread.  Thus, if a
-          TimerQueue thread is the only one executing, the VM exits.
-
-Wed Jul 14 11:27:47 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/StrategyAcceptor.java, AcceptStrategy.java
-          StrategyAcceptor now inherits from Acceptor.  AcceptStrategy
-          can now delegate to an Acceptor, rather than having its own
-          SOCKAcceptor.  Its default is to delegate to a generic
-          Acceptor instance (that uses a SOCKAcceptor).
-
-Fri Jul 09 13:58:42 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/Acceptor.java, TimeValue.java
-          Solved a few javadoc warnings.
-
-Fri Jul 09 11:08:32 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/TimedWait.java, Stream*.java, Token.java
-          Fixed a bug in TimedWait from the recent changes.  Made
-          Streams (and Modules) use absolute times for timeouts.
-
-Thu Jul 08 14:54:36 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/Condition.java, TimedWait.java, EventHandler.java,
-          MessageQueue.java, ServiceObject.java, SvcHandler.java,
-          Task.java, Mutex.java, Semaphore.java, Token.java,
-          TimerQueue.java
-
-          Changed the semantics of Condition, TimedWait, MessageQueue,
-          Task, Mutex, Semaphore, and Token to use absolute times for
-          their timeouts.
-
-          Changed the semantics of EventHandler, ServiceObject, and
-          SvcHandler such that handleTimeout receives a TimeValue
-          representing when the event occured.
-
-          Changed TimerQueue internally to reflect the above changes.
-
-          Also made better checks in Token and Mutex so that non-owners
-          can call release without adverse effects.  I plan to try to
-          do this with Semaphore and RWMutex as well.
-
-Thu Jul 08 11:20:17 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/TimeValue.java: Added relativeTimeOfDay(offsets)
-          methods which return TimeValues.  These should help people
-          since many classes will be changed to use
-          absolute TimeValues shortly to correspond to ACE's versions.
-
-Wed Jul 07 22:42:27 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/Token.java: Fixed several bugs in tryacquire and renew.
-        Specifying a null TimeValue in acquire or renew now means to wait
-        until the lock is obtained.  Specifying TimeValue.zero in acquire
-        means just to poll and don't call sleepHook().  In renew, it is
-        the same as specifying a requePosition of 0 -- doesn't give up
-        the token.
-
-Wed Jul 07 21:54:35 1999  Everett Anderson  <eea1@cs.wustl.edu>
-
-        * src/TimedWait.java: Fixed the semantics of
-          timedWait(TimeValue tv).  Now when tv represents zero, it has
-          polling semantics, checking the condition once and returning
-          on success or throwing a TimeoutException on failure.  Before,
-          it blocked until notified.  (Also affects synch mechanisms)
-
-Wed May 20 14:37:48 CDT 1998  Everett Anderson <eea1@cs.wustl.edu>
-
-Reset the ChangeLog file for future users.  If anyone wants more complete
-file by file changes, they can be provided with the CVS log command.
-
-Updated the JACE page at http://www.cs.wustl.edu/~eea1/JACE.html to reflect
-the Version 1.4.4 changes, which included:
-
-* Removed CUP and JLex from JACE.  The java_cup directory is still in CVS,
-  but won't be included in future versions.  This means that the option to
-  load C++ ACE ServiceConfigurator files is gone.
-
-* Changed the SOCKStream system so it uses DataInputStream and DataOutputStream
-  to maintain compatibility with other languages and remove the deprecation
-  warnings from using PrintStream.  (Can't use Reader/Writers since they
-  write 16-bit chars not 8-bit bytes)
-
-* Made lots of modifications to comments and code to remove javadoc warnings
-  and deprecation warnings.  They were all straight-forward changes such as
-  making sure a @throws line was in the comments for all exceptions a method
-  had, etc.
diff --git a/java/EAC/BoundsException.java b/java/EAC/BoundsException.java
deleted file mode 100644
index 12010d570b0..00000000000
--- a/java/EAC/BoundsException.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- *  Title:        BoundsException
- *  Description:  An exception class for when graphical objects are positioned
- *                partially out of their container's boundaries
- */
-package EAC;
-
-public class BoundsException extends Exception {
-
-  public BoundsException(String msg) {
-    super(msg);
-  }
-}
\ No newline at end of file
diff --git a/java/EAC/Configuration.java b/java/EAC/Configuration.java
deleted file mode 100644
index 426a8ba2a5e..00000000000
--- a/java/EAC/Configuration.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- *  Title:        Configuration
- *  Description:  A container of Event Analysis Configurator primitives,
- *                capable of executing interactions among those primitives
- *                one "tick" at a time.
- */
-package EAC;
-import java.awt.*;
-import java.lang.*;
-
-public class Configuration extends Thread {
-
-  // highest simulation clock value
-  public final long MAX_SIM_CLOCK = 1000000;
-
-  // maximum number of primitives in a configuration
-  public final int MAX_PRIMITIVES = 100;
-
-  // execution modes
-  public final int INITIAL = 0;
-  public final int RUNNING = 1;
-  public final int STOPPED = 2;
-
-  // current mode
-  protected int mode = INITIAL;
-
-  // simulation "clock"
-  protected long simulation_time;
-
-  // one simulation time unit (msec)
-  public int tick; // will be set by runtime parameter
-
-  // number of missed execution deadlines
-  protected int missed_deadlines;
-
-  // simulated resource pool
-  protected ResourcePool rp;
-
-  // event queue
-  protected Queue eventQ;
-
-  // input and output areas
-  protected TextField inputArea;
-  protected Label reportArea;
-
-  // collection of primitives
-  private Primitive primitive[];
-
-  // number of primitives currently stored
-  private int primitive_count;
-
-  public Configuration(TextField i, Label r) {
-    inputArea = i;
-    reportArea = r;
-    eventQ = new Queue();
-    clear();
-    mode = INITIAL;
-  } /* constructor */
-
-  public void clear() {
-    primitive_count = 0;
-    simulation_time = 0;
-    missed_deadlines = 0;
-    rp = new ResourcePool();
-    primitive = new Primitive[MAX_PRIMITIVES];
-    eventQ.clear();
-  } /* clear */
-
-  public void restart() {
-    int i;
-
-    simulation_time = 0;
-    missed_deadlines = 0;
-    rp.release(rp.usage());
-    eventQ.clear();
-    for (i = 0; i < primitive_count; i++)
-      primitive[i].restart();
-
-  } /* restart */
-
-  public void setTick(int t) {
-    tick = t;
-  } /* setTick */
-
-  public void addLabel(Primitive p) {
-    reportArea.setText("Need a label");
-  } /* addLabel */
-
-  public int getPrimitiveCount() {
-    return primitive_count;
-  } /* getPrimitiveCount */
-
-  public Primitive getPrimitive(int n) {
-    return primitive[n];
-  } /* getPrimitive */
-
-  protected void setPrimitive(int n, Primitive p) {
-    primitive[n] = p;
-  } /* setPrimitive */
-
-  public int addPrimitive(Primitive p) throws TooManyPrimitivesException {
-    if (primitive_count == MAX_PRIMITIVES)
-      throw new TooManyPrimitivesException("ERROR: Too many primitives");
-
-    primitive[primitive_count++] = p;
-    return primitive_count;
-  } /* addPrimitive */
-
-  public boolean deletePrimitive(int i) {
-    if (primitive[i] == null)
-      return false;
-    else {
-      primitive[i] = null;
-      return true;
-    }
-  } /* deletePrimitive */
-
-  public int leftSideOverlaps(Primitive p) {
-    int i;
-
-    for (i = 0; i < primitive_count; i++) {
-      if (primitive[i] != null) {
-        if ((primitive[i].contains(p.upperLeft())) ||
-            (primitive[i].contains(p.lowerLeft())) ||
-            (p.contains(primitive[i].lowerLeft())) ||
-            (p.contains(primitive[i].upperLeft()))) {
-          return i;
-        } /* if */
-      } /* if */
-    } /* for */
-
-    // no overlap detected
-    return -1;
-  } /* leftSideOverlaps */
-
-  public int rightSideOverlaps(Primitive p) {
-    int i;
-
-    for (i = 0; i < primitive_count; i++) {
-      if (primitive[i] != null) {
-        if ((primitive[i].contains(p.lowerRight())) ||
-            (primitive[i].contains(p.upperRight())) ||
-            (p.contains(primitive[i].upperRight())) ||
-            (p.contains(primitive[i].lowerRight()))) {
-          return i;
-        } /* if */
-      } /* if */
-    } /* for */
-
-    // no overlap detected
-    return -1;
-  } /* rightSideOverlaps */
-
-  public Primitive primitiveContaining (Point p) {
-    int i;
-
-    for (i = 0; i < primitive_count; i++)
-      if (primitive[i].contains(p))
-        return primitive[i];
-
-    return null;
-  } /* primitiveContaining */
-
-  public void draw() {
-    int i;
-
-    for (i = 0; i < primitive_count; i++)
-      if (primitive[i] != null)
-        try {
-          primitive[i].draw();
-        } catch (BoundsException be) {
-          // can't happen
-        }
-  } /* draw */
-
-  public void eventEnqueue(Primitive p, long t) {
-    eventQ.enqueue(p,t);
-  } /* eventEnqueue */
-
-  public long getTime() {
-    return simulation_time;
-  } /* getTime */
-
-  public void run() {
-    Primitive nextP;
-
-    while (true) {
-      simulation_time += 1;
-      simulation_time %= MAX_SIM_CLOCK;
-      try {
-        reportArea.setText("Simulation Time: " +
-                         java.lang.Long.toString(simulation_time) +
-                         "    Resource Consumption: " +
-                         java.lang.Integer.toString(rp.usage()) +
-                         "%   Missed Deadlines: " +
-                         java.lang.Integer.toString(missed_deadlines) +
-                         "    Next Event: " +
-                         java.lang.Long.toString(eventQ.frontTime()));
-
-        // wake up all primitives who've set alarms for current time
-        while (simulation_time == eventQ.frontTime()) {
-          nextP = eventQ.dequeue();
-          nextP.wakeup(simulation_time);
-        } /* while */
-      } catch (EmptyQueueException eqe) {
-        System.out.println("Event queue empty.  We're done?");
-      } catch (ConnectionException ce) {
-        System.out.println("Connection exception in run");
-      }
-
-      try {
-        sleep(tick);
-      }
-      catch (InterruptedException ie) {
-        System.out.println("Interrupted");
-      }
-    } /* outer while */
-  } /* run */
-
-}
\ No newline at end of file
diff --git a/java/EAC/Configurator.java b/java/EAC/Configurator.java
deleted file mode 100644
index 1a9bc7a0ed8..00000000000
--- a/java/EAC/Configurator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- *  Title:        Configurator
- *  Description:  The application class for the Event Analysis Configurator
- */
-package EAC;
-import java.awt.*;
-import java.awt.event.*;
-
-public class Configurator extends Frame {
-
-  // Initial dimensions of the frame
-  public final int INITIAL_WIDTH = 800;
-  public final int INITIAL_HEIGHT = 600;
-
-  protected TextField inputArea = new TextField("Input Area", 80);
-  protected Label reportArea = new Label();
-  protected Configuration config = new Configuration(inputArea,reportArea);
-  protected EACPanel canvas = new EACPanel(config,inputArea,reportArea);
-  protected EACMenuBar menuBar = new EACMenuBar(canvas,config,inputArea,reportArea);
-
-  Configurator(int tick) {
-    config.setTick(tick);
-
-    setTitle("The Event Analysis Configurator");
-    setLayout(new BorderLayout());
-    reportArea.setText("Report Area");
-
-    // Input Area at top of frame
-    add(inputArea,"North");
-
-    // Report Area at bottom of frame
-    add(reportArea,"South");
-
-    // Canvas in the middle of frame
-    add(canvas,"Center");
-
-    // Menu Bar
-    setMenuBar(menuBar);
-
-    // Move and resize
-    setLocation(0,0);
-    setSize(INITIAL_WIDTH,INITIAL_HEIGHT);
-
-    // For exiting
-    addWindowListener(new Closer());
-  }
-
-  public static void main (String[] argv) {
-    new Configurator(java.lang.Integer.valueOf(argv[0]).intValue()).show();
-  }
-
-  class Closer extends WindowAdapter {
-    public void windowClosing (WindowEvent e) {
-	System.exit (0);
-    }
-  }
-
-} /* Configurator */
diff --git a/java/EAC/ConnectionException.java b/java/EAC/ConnectionException.java
deleted file mode 100644
index a1f3efab7ab..00000000000
--- a/java/EAC/ConnectionException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- *  Title:        ConnectionException
- *  Description:  An exception class for when an attempt is made to connect
- *                an input where one is already connected, or to add an
- *                output when the maximum number of outputs are already set
- */
-package EAC;
-
-public class ConnectionException extends Exception {
-
-  public ConnectionException(String msg) {
-    super(msg);
-  }
-}
\ No newline at end of file
diff --git a/java/EAC/Connector.java b/java/EAC/Connector.java
deleted file mode 100644
index 27c02e820bc..00000000000
--- a/java/EAC/Connector.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Title:        Connector
- * Description:  Connects two primitives in the Event Analysis Configurator
- */
-package EAC;
-import java.awt.*;
-
-public class Connector extends Primitive {
-
-  // for drawing
-  protected RubberbandLine rbLine;
-
-  // Primitives connected by connector
-  Primitive startP,
-            endP;
-
-  // the second point of the connector
-  // (the anchor point is inherited from Primitive)
-  protected Point endpoint;
-
-  public Connector(EACPanel p) {
-    super(p);
-    rbLine = new RubberbandLine(p);
-  }
-
-  // inappropriate inherited methods: should not be used
-  public void setTop(Point p) {}
-  public Point getTop() { return null; }
-
-  public void setEndpoint(Point p) {
-    endpoint = p;
-  } /* setEndpoint */
-
-  public Point getEndpoint() {
-    return endpoint;
-  } /* getEndpoint */
-
-  // Anchor the rubberband line AND the connector itself
-  public void anchor(Point p) {
-    rbLine.anchor(p);
-    anchor = p;
-  } /* anchor */
-
-  // Stretch the rubberband line
-  public void stretch(Point p) {
-    rbLine.stretch(p);
-  } /* stretch */
-
-  // End the rubberband line AND the connector itself
-  public void end(Point p) {
-    rbLine.end(p);
-    endpoint = p;
-  } /* end */
-
-  public void draw() throws BoundsException {
-    if (inBounds()) {
-      Graphics g = canvas.getGraphics();
-
-      g.drawLine(anchor.x,anchor.y,endpoint.x,endpoint.y);
-      drawArrowhead(g);
-    } else
-      throw new BoundsException("ERROR: Attempted to place Connector endpoint out of bounds");
-  } /* draw */
-
-  private void drawArrowhead(Graphics g) {
-    final int arrowHeadWidth = 10;
-    Point P1 = anchor;
-    Point P2 = endpoint;
-
-    // Draw Arrowhead (using java.lang.Math and floating point)
-    // source provided by Erik in newsgroup posting
-    double dx = P2.x - P1.x;
-    double dy = P2.y - P1.y;
-    final double ra = java.lang.Math.sqrt(dx*dx + dy*dy);
-    final double ri = (double) arrowHeadWidth;
-    dx /= ra;
-    dy /= ra;
-    Point p2 = new Point((int)Math.round(P2.x - dx*ri),
-    (int)Math.round(P2.y - dy*ri));
-    int[] x = new int[3];
-    int[] y = new int[3];
-    double r = 0.4 * ri;
-    x[0] = (int)Math.round(p2.x + dy * r);
-    y[0] = (int)Math.round(p2.y - dx * r);
-    x[1] = P2.x;
-    y[1] = P2.y;
-    x[2] = (int)Math.round(p2.x - dy * r);
-    y[2] = (int)Math.round(p2.y + dx * r);
-    g.fillPolygon(x, y, x.length);
-  } /* drawArrowhead */
-
-  public boolean contains(Point p) {
-    return false;
-  } /* contains */
-
-  public Point upperLeft() {
-    return anchor;
-  } /* upperLeft */
-
-  public Point lowerRight() {
-    return endpoint;
-  } /* lowerRight */
-
-  public Point upperRight() {
-    return endpoint;
-  } /* upperRight */
-
-  public Point lowerLeft() {
-    return anchor;
-  } /* lowerLeft */
-
-  public boolean inBounds() {
-    if (canvas.contains(endpoint))
-      return true;
-    else
-      return false;
-  } /* inBounds */
-
-  public void write(File f) throws java.io.IOException {
-    f.writeInt(f.CONNECTOR);
-    f.writeInt(anchor.x);
-    f.writeInt(anchor.y);
-    f.writeInt(endpoint.x);
-    f.writeInt(endpoint.y);
-  } /* write */
-
-  public void read(File f) throws java.io.IOException {
-    anchor = new Point();
-    endpoint = new Point();
-
-    anchor.x = f.readInt();
-    anchor.y = f.readInt();
-    endpoint.x = f.readInt();
-    endpoint.y = f.readInt();
-  } /* read */
-
-  public int addInput(Connector c) throws ConnectionException {
-    throw new ConnectionException("ERROR: Connectors cannot connect each other");
-  } /* addInput */
-
-  public int addOutput(Connector c) throws ConnectionException {
-    throw new ConnectionException("ERROR: Connectors cannot connect each other");
-  } /* addOutput */
-
-  public void setInput(Primitive p) {
-    startP = p;
-  } /* setInput */
-
-  public void setOutput(Primitive p) {
-    endP = p;
-  } /* setOutput */
-
-  public Primitive getInput() {
-    return startP;
-  } /* getInput */
-
-  public Primitive getOutput() {
-    return endP;
-  } /* getOutput */
-
-  public Connector getInput(int i) throws ConnectionException {
-    throw new ConnectionException("Internal error: wrong getInput() called on Connector");
-  } /* getInput */
-
-  public Connector getOutput(int i) throws ConnectionException {
-    throw new ConnectionException("Internal error: wrong getOutput() called on Connector");
-  } /* getOutput */
-
-  public void removeInput(int i) throws ConnectionException {
-    //throw new ConnectionException("ERROR: Attempted to remove input from connector");
-    startP = null;
-  } /* removeInput */
-
-  public void removeOutput(int i) throws ConnectionException {
-    //throw new ConnectionException("ERROR: Attempted to remove output from connector");
-    endP = null;
-  } /* removeOutput */
-
-  public int getInputCount() throws ConnectionException {
-    //throw new ConnectionException("ERROR: Attempted to retrieve input count from connector");
-    return (startP == null) ? 0 : 1;
-  } /* getInputCount */
-
-  public int getOutputCount() throws ConnectionException {
-    //throw new ConnectionException("ERROR: Attempted to retrieve output count from connector");
-    return (endP == null) ? 0 : 1;
-  } /* getOutputCount */
-
-  public void event(Source s) throws ConnectionException {
-    //throw new ConnectionException("ERROR: Attempted to push event to connector");
-    endP.event(s);
-  } /* event */
-
-  public void wakeup(long t) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to wake up connector");
-  } /* wakeup */
-}
\ No newline at end of file
diff --git a/java/EAC/EACComponent.java b/java/EAC/EACComponent.java
deleted file mode 100644
index f26aca96880..00000000000
--- a/java/EAC/EACComponent.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/**
- *  Title:        Component
- *  Description:  A real-time component emulator, for use in the Event Analysis
- *                Configurator.
- */
-package EAC;
-import java.awt.*;
-
-public class EACComponent extends Primitive {
-
-  class QueueEntry {
-
-    Source source;
-    long request_time;
-    boolean running;
-
-  } /* QueueEntry */
-
-  public class ServiceQueue {
-
-    public QueueEntry queue[];
-
-    public int size;
-
-    void enqueue(QueueEntry e) {
-      int i;
-
-      for (i = 0; i < size; i++)
-        if (e.source == queue[i].source) {
-          System.out.println("Internal error: attempt to enqueue duplicate source");
-          System.exit(-1);
-        }
-
-      if (size >= MAX_INPUTS) {
-        System.out.println("Internal error: queue size at max");
-        System.exit(-1);
-      }
-
-      queue[size++] = e;
-    } /* enqueue */
-
-    QueueEntry dequeue() {
-      QueueEntry front = queue[0];
-      int i;
-
-      for (i = 0; i < size; i++)
-        queue[i] = queue[i+1];
-
-      --size;
-
-      return front;
-    } /* dequeue */
-
-    boolean containsSource (Primitive p) {
-      int i;
-
-      for (i = 0; i < size; i++)
-        if (queue[i].source == p)
-          return true;
-
-      return false;
-    } /* containsSource */
-
-  } /* ServiceQueue */
-
-  // queue of running/waiting event sources
-  protected ServiceQueue sq;
-
-  // Font for text
-  protected Font text_font = new EACFont().getFont();
-
-  // dimensions of the rectangle to be drawn on-screen
-  protected final int HEIGHT = 40;
-  protected final int WIDTH = 30;
-
-  // Configuration to which the component belongs
-  protected Configuration config;
-
-  // percentage of Resource Pool consumed during execution
-  protected int resource_consumption;
-
-  // duration of execution
-  protected int duration;
-
-  // input
-  protected Connector input;
-
-  // outputs
-  protected Connector output[] = new Connector[MAX_OUTPUTS];
-  protected int output_count = 0;
-
-  // helps with dragging the component
-  protected boolean selected = false;
-  protected Point old_anchor;
-
-  // Black-on-white (normal) or white-on-black (reversed)?
-  protected boolean reverse_color = false;
-
-  public EACComponent(EACPanel p, Configuration c) {
-    super(p);
-    config = c;
-    sq = new ServiceQueue();
-    sq.queue = new QueueEntry[MAX_INPUTS];
-    sq.size = 0;
-  } /* constructor */
-
-  public void restart() {
-    sq.size = 0;
-    reverse_color = false;
-    selected = false;
-  } /* restart */
-
-  public void setTop(Point p) {
-    anchor = new Point(p.x - (int) (WIDTH / 2), p.y);
-  } /* setTop */
-
-  public Point getTop() {
-    return new Point(anchor.x + (int) (WIDTH / 2), anchor.y);
-  } /* getTop */
-
-  public void setResourceConsumption(int rc) throws NumberFormatException {
-    if ((rc > 0) && (rc <= 100))
-      resource_consumption = rc;
-    else
-      throw new NumberFormatException();
-  } /* setResourceConsumption */
-
-  public int getResourceConsumption() {
-    return resource_consumption;
-  } /* getResourceConsumption */
-
-  public void setDuration(int d) throws NumberFormatException {
-    if (d > 0)
-      duration = d;
-    else
-      throw new NumberFormatException();
-  } /* setDuration */
-
-  public int getDuration() {
-    return duration;
-  } /* getDuration */
-
-  public void event(Source s) throws ConnectionException {
-    long time = config.getTime();
-
-    s.reverseColor();
-    try {
-      s.draw();
-    } catch (BoundsException be) {}
-
-    //System.out.print(label.getText());
-    //System.out.print(" event at: ");
-    //System.out.println(time);
-
-    if (sq.containsSource(s)) { // missed a deadline
-      config.missed_deadlines++;
-      System.out.print(label.getText());
-      System.out.print(" missed a deadline for ");
-      System.out.print(s.getLabel().getText());
-      System.out.print(" at: ");
-      System.out.println(java.lang.Long.toString(time));
-    } else { // there's no existing service call for this source
-      // prepare to add new entry to Service Queue
-      QueueEntry e = new QueueEntry();
-      e.source = s;
-      e.request_time = time;
-      if (config.rp.reserve(resource_consumption)) { // resource reservation succeeded
-        reverseColor(); // indicate we're working it
-        try {
-          draw();
-        } catch (BoundsException be) {}
-        config.eventEnqueue(this,time + duration); // set wakeup call to release resources
-
-        // new entry will be running
-        e.running = true;
-      } else { // resource reservation failed
-        config.eventEnqueue(this,time + 1); // set wakeup call to try for resources again
-
-        // new entry will be waiting
-        e.running = false;
-      } /* else */
-
-      sq.enqueue(e); // add new entry to Service Queue
-    } /* else */
-  } /* event */
-
-  public void wakeup(long t) throws ConnectionException {
-    int i;
-
-    //System.out.print(label.getText());
-    //System.out.println(" wakeup at: " + java.lang.Long.toString(t));
-
-    while (sq.size > 0) {
-      if ((sq.queue[0].running) && (sq.queue[0].request_time + duration <= t)) { // time to release
-        config.rp.release(resource_consumption);
-        try {
-          Source s = sq.dequeue().source; // dequeue and get the source
-          s.normalColor();  // indicates we're done
-          normalColor();
-          s.draw();
-          draw();
-        } catch (BoundsException be) {}
-      } else
-        break;
-    } /* while */
-
-    // satisfy as many waiting service calls as possible
-    for (i = 0; i < sq.size; i++) {
-      if (!sq.queue[i].running) {
-        if (config.rp.reserve(resource_consumption)) { // resource reservation succeeded
-          config.eventEnqueue(this,t + duration); // set wakeup call to release resources
-          sq.queue[i].request_time = t;
-          sq.queue[i].running = true;
-          sq.queue[i].source.reverseColor(); // indicates we're working it
-          reverseColor();
-          try {
-            draw();
-            sq.queue[i].source.draw();
-          } catch (BoundsException be) {}
-        } else { // resource reservation failed
-          config.eventEnqueue(this,t + 1); // set wakeup call to try for resources again
-          break; // no reason to keep trying right now
-        } /* else */
-      } /* if */
-    } /* while */
-
-  } /* wakeup */
-
-  public int addInput(Connector c) throws ConnectionException {
-    if (input == null) {
-      input = c;
-      return 1;
-    }
-    else
-      throw new ConnectionException("ERROR: Input already established for this component");
-  } /* setInput */
-
-  public int addOutput(Connector c) throws ConnectionException {
-    if (output_count < MAX_OUTPUTS)
-      output[output_count++] = c;
-    else
-      throw new ConnectionException("ERROR: Maximum outputs established for this component");
-
-    return output_count;
-  } /* addOutput */
-
-  public Connector getInput(int i) throws ConnectionException {
-    if (i != 0)
-      throw new ConnectionException("ERROR: Bad input index for component");
-    else if (input == null)
-      throw new ConnectionException("ERROR: No input for this component");
-    else
-      return input;
-  } /* getInput */
-
-  public Connector getOutput(int i) throws ConnectionException {
-    if ((i >= 0) && (i < output_count))
-      return output[i];
-    else
-      throw new ConnectionException("ERROR: Bad output index for component");
-  } /* getOutput */
-
-  public void removeInput(int i) throws ConnectionException {
-    if (i != 0)
-      throw new ConnectionException("ERROR: Bad input index for component");
-    else
-      input = null;
-  } /* removeInput */
-
-  public void removeOutput(int i) throws ConnectionException {
-    if ((i >= 0) && (i < output_count)) {
-      output[i] = output[output_count-1];
-      --output_count;
-    } else
-      throw new ConnectionException("ERROR: Bad output index for component");
-  } /* removeOutput */
-
-  public int getOutputCount() throws ConnectionException {
-    return output_count;
-  } /* getOutputCount */
-
-  public int getInputCount() throws ConnectionException {
-    return (input == null) ? 0 : 1;
-  } /* getInputCount */
-
-  public boolean contains(Point p) {
-    if ((p.x >= anchor.x) &&
-        (p.x <= anchor.x + WIDTH) &&
-        (p.y >= anchor.y) &&
-        (p.y <= anchor.y + HEIGHT))
-      return true;
-    else
-      return false;
-  } /* contains */
-
-  public Point upperLeft() {
-    return anchor;
-  } /* upperLeft */
-
-  public Point lowerRight() {
-    return new Point(anchor.x + WIDTH, anchor.y + HEIGHT);
-  } /* lowerRight */
-
-  public Point upperRight() {
-    return new Point(anchor.x + WIDTH, anchor.y);
-  } /* upperRight */
-
-  public Point lowerLeft() {
-    return new Point(anchor.x, anchor.y + HEIGHT);
-  } /* lowerLeft */
-
-  public void draw() throws BoundsException {
-    if (selected)
-      selected = false;
-    else if (inBounds()) {
-      Graphics g = canvas.getGraphics();
-      char stringData[];
-      Color bg,
-            fg;
-
-      if (reverse_color) {
-        bg = Color.black;
-        fg = Color.white;
-      } else {
-        bg = Color.white;
-        fg = Color.black;
-      }
-
-      g.setColor(Color.black); // rectangle is always black
-      g.drawRect(anchor.x,anchor.y,WIDTH,HEIGHT);
-
-      g.setColor(bg); // interior
-      g.fillRect(anchor.x+1,anchor.y+1,WIDTH-1,HEIGHT-1);
-
-      g.setColor(fg); // middle line and text
-      g.drawLine(anchor.x,anchor.y + (int) (HEIGHT / 2),
-                 anchor.x + WIDTH, anchor.y + (int) (HEIGHT / 2));
-
-      // print resource consumption percentage
-      g.setFont(text_font);
-      g.drawString(java.lang.String.valueOf(resource_consumption),
-                   anchor.x + 16 - (3 * java.lang.String.valueOf(resource_consumption).length()),
-                   anchor.y + (int) (HEIGHT / 3));
-
-      // print duration
-      g.drawString(java.lang.String.valueOf(duration),
-                   anchor.x + 16 - (3 * java.lang.String.valueOf(duration).length()),
-                   anchor.y + (int) (HEIGHT * 3 / 4) + 3);
-
-    } else
-      throw new BoundsException("ERROR: Attempted to place Component partially out of bounds");
-  } /* draw */
-
-  public void reverseColor() {
-    reverse_color = true;
-  } /* reverseColor */
-
-  public void normalColor() {
-    reverse_color = false;
-  } /* normalColor */
-
-  public void specialDraw() {
-    Graphics g = canvas.getGraphics();
-
-    g.setXORMode(canvas.getBackground());
-    g.drawRect(anchor.x,anchor.y,WIDTH,HEIGHT);
-  } /* specialDraw */
-
-  public void specialUndraw() {
-    Graphics g = canvas.getGraphics();
-
-    g.setColor(canvas.getBackground());
-    g.setXORMode(canvas.getForeground());
-    g.drawRect(anchor.x,anchor.y,WIDTH,HEIGHT);
-  } /* specialUndraw */
-
-  public void selectedDraw() {
-    // this will preclude drawing this component for one repaint() call
-    selected = true;
-
-    old_anchor = anchor;
-
-    super.selectedDraw();
-  } /* selectedDraw */
-
-  public void reconnect() {
-    int i;
-
-    // move output anchors
-    for (i = 0; i < output_count; i++)
-      output[i].setAnchor(new Point(output[i].getAnchor().x + anchor.x - old_anchor.x,
-                                    output[i].getAnchor().y + anchor.y - old_anchor.y));
-
-    // move input endpoint
-    input.setEndpoint(new Point(input.upperRight().x + anchor.x - old_anchor.x,
-                                input.upperRight().y + anchor.y - old_anchor.y));
-
-    // move label anchor
-    label.setAnchor(new Point(label.getAnchor().x + anchor.x - old_anchor.x,
-                              label.getAnchor().y + anchor.y - old_anchor.y));
-  } /* reconnect */
-
-  public boolean inBounds() {
-    if ((canvas.contains(upperLeft())) &&
-        (canvas.contains(lowerRight())))
-      return true;
-    else
-      return false;
-  } /* inBounds */
-
-  public void write(File f) throws java.io.IOException {
-    char temp[]; // for writing label
-    int i, n;
-
-    f.writeInt(f.COMPONENT);
-    f.writeInt(anchor.x);
-    f.writeInt(anchor.y);
-    f.writeInt(resource_consumption);
-    f.writeInt(duration);
-
-    // Write out the associated label
-    n = label.getText().length();
-    f.writeInt(n); // text length
-    temp = new char[n];
-    temp = label.getText().toCharArray();
-    for (i = 0; i < n; i++)
-      f.writeChar(temp[i]);
-    f.writeInt(label.getAnchor().x); // label position
-    f.writeInt(label.getAnchor().y);
-  } /* write */
-
-  public void read(File f) throws java.io.IOException {
-    char temp[]; // for reading label
-    int i, n;
-    int label_x, label_y;
-
-    anchor = new Point();
-    anchor.x = f.readInt();
-    anchor.y = f.readInt();
-    resource_consumption = f.readInt();
-    duration = f.readInt();
-
-    // get label info
-    n = f.readInt(); // text length
-    label = new EACLabel(canvas,n);
-    temp = new char[n];
-    for (i = 0; i < n; i++)
-      temp[i] = f.readChar();
-    label.setText(java.lang.String.valueOf(temp));
-    label_x = f.readInt();
-    label_y = f.readInt();
-    label.setAnchor(new Point(label_x,label_y));
-    label.setLabelee(this);
-    try {
-      config.addPrimitive(label);
-    } catch (TooManyPrimitivesException tmpe) {
-      // have faith :-)
-    }
-  } /* read */
-}
\ No newline at end of file
diff --git a/java/EAC/EACFont.java b/java/EAC/EACFont.java
deleted file mode 100644
index 97f4d39b6cb..00000000000
--- a/java/EAC/EACFont.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Title:        EACFont
- * Description:  The font to be used for on-screen text
- */
-package EAC;
-import java.awt.*;
-
-public class EACFont {
-
-  // Use 9-point Courier New
-  public final int FONT_SIZE = 10;
-  protected Font eac_font = new Font("Courier New",Font.PLAIN,FONT_SIZE);
-
-  public EACFont() {
-  }
-
-  public Font getFont() {
-    return eac_font;
-  } /* getFont */
-
-}
\ No newline at end of file
diff --git a/java/EAC/EACLabel.java b/java/EAC/EACLabel.java
deleted file mode 100644
index e841c4e4c40..00000000000
--- a/java/EAC/EACLabel.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Title:        EACLabel
- * Description:  Text labels for Event Analysis Configurator graphical
- *               primitives
- */
-package EAC;
-import java.awt.*;
-
-public class EACLabel extends Primitive {
-
-  // Font for labels
-  protected Font label_font = new EACFont().getFont();
-
-  // Font Metrics for sizing and bounds checking labels
-  protected FontMetrics fm = canvas.getFontMetrics(label_font);
-
-  // Label text
-  protected char[] text;
-
-  // associated Primitive
-  protected Primitive labelee;
-
-  public EACLabel(EACPanel p, int n) {
-    super(p);
-    text = new char[n];
-  } /* constructor */
-
-  public void setLabelee(Primitive p) {
-    labelee = p;
-  } /* setLabelee */
-
-  public Primitive getLabelee() {
-    return labelee;
-  } /* getLabelee */
-
-  public void setText(String s) {
-    text = s.toCharArray();
-  } /* setText */
-
-  public String getText() {
-    return java.lang.String.valueOf(text);
-  } /* getText */
-
-  public void setTop(Point p) {
-    anchor = new Point(p.x - (3 * text.length),
-                       p.y + 9);
-  } /* setTop */
-
-  public Point getTop() {
-    return new Point(anchor.x + (3 * text.length),
-                     anchor.y - 9);
-  } /* getTop */
-
-  public void draw() throws BoundsException {
-    if (inBounds()) {
-      Graphics g = canvas.getGraphics();
-      g.setFont(label_font);
-      g.drawChars(text,0,text.length,anchor.x,anchor.y);
-    } else
-      throw new BoundsException("Attempted to place Label partially out of bounds");
-  } /* draw */
-
-  public void specialDraw() {
-    Graphics g = canvas.getGraphics();
-
-    g.setXORMode(canvas.getBackground());
-    g.drawRect(upperLeft().x, upperLeft().y,
-               upperRight().x - upperLeft().x, // WIDTH
-               lowerRight().y - upperRight().y); // HEIGHT
-  } /* specialDraw */
-
-  public void specialUndraw() {
-    Graphics g = canvas.getGraphics();
-
-    g.setColor(canvas.getBackground());
-    g.setXORMode(canvas.getForeground());
-    g.drawRect(upperLeft().x, upperLeft().y,
-               upperRight().x - upperLeft().x, // WIDTH
-               lowerRight().y - upperRight().y); // HEIGHT
-  } /* specialUndraw */
-
-  public boolean contains(Point p) {
-    return ((p.x >= upperLeft().x) &&
-            (p.x <= upperRight().x) &&
-            (p.y <= lowerLeft().y) &&
-            (p.y >= upperLeft().y));
-  } /* contains */
-
-  public boolean inBounds() {
-    // don't know why we need this, but fm.stringWidth seems to return a
-    // value that's bigger than the actual width of the text
-    //final int xTweak = 20;
-
-    //if (canvas.contains(anchor.x + fm.stringWidth(text.toString()) - xTweak,
-    //                    anchor.y - fm.getHeight()))
-    if ((canvas.contains(upperLeft())) &&
-        (canvas.contains(upperRight())) &&
-        (canvas.contains(lowerLeft())) &&
-        (canvas.contains(lowerRight())))
-      return true;
-    else
-      return false;
-  } /* inBounds */
-
-  public Point upperLeft() {
-    return new Point(anchor.x,anchor.y - 9);
-  } /* upperLeft */
-
-  public Point upperRight() {
-    return new Point(anchor.x + (6 * text.length),anchor.y - 9);
-  } /* upperRight */
-
-  public Point lowerLeft() {
-    return anchor;
-  } /* lowerLeft */
-
-  public Point lowerRight() {
-    return new Point(anchor.x + (6 * text.length),anchor.y);
-  } /* lowerRight */
-
-  public void write(File f) throws java.io.IOException {
-    int i;
-
-    // if there's an associated primitive, that primitive
-    // is responsible for writing out the label info too,
-    // so only write out the info if there is no labelee
-    if (labelee == null) {
-      f.writeInt(f.LABEL);
-      f.writeInt(text.length);
-      f.writeInt(anchor.x);
-      f.writeInt(anchor.y);
-      for (i = 0; i < text.length; i++)
-        f.writeChar(text[i]);
-    }
-  } /* write */
-
-  public void read(File f) throws java.io.IOException {
-    int i;
-
-    anchor = new Point();
-    anchor.x = f.readInt();
-    anchor.y = f.readInt();
-
-    for (i = 0; i < text.length; i++)
-      text[i] = f.readChar();
-  } /* read */
-
-  public int addInput(Connector c) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to add input to label");
-  } /* addInput */
-
-  public int addOutput(Connector c) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to add output to label");
-  } /* addOutput */
-
-  public Connector getInput(int i) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to retrieve input from label");
-  } /* getInput */
-
-  public Connector getOutput(int i) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to retrieve output from label");
-  } /* getOutput */
-
-  public int getInputCount() throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to retrieve input count from label");
-  } /* getInputCount */
-
-  public int getOutputCount() throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to retrieve output count from label");
-  } /* getOutputCount */
-
-  public void removeInput(int i) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to remove input from label");
-  } /* removeInput */
-
-  public void removeOutput(int i) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to remove output from label");
-  } /* removeOutput */
-
-  public void event(Source s) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to push event to label");
-  } /* event */
-
-  public void wakeup(long t) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to wake up label");
-  } /* wakeup */
-}
\ No newline at end of file
diff --git a/java/EAC/EACMenuBar.java b/java/EAC/EACMenuBar.java
deleted file mode 100644
index d34a776635d..00000000000
--- a/java/EAC/EACMenuBar.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Title:        EACMenuBar
- * Description:  A subclass of MenuBar for the Event Analysis Configurator
- */
-package EAC;
-import java.awt.*;
-import java.awt.event.*;
-
-public class EACMenuBar extends MenuBar {
-
-  protected EACPanel canvas;
-  protected Configuration config;
-  protected TextField inputArea;
-  protected Label reportArea;
-
-  public EACMenuBar(EACPanel p, Configuration c, TextField i, Label r) {
-    canvas = p;
-    config = c;
-    inputArea = i;
-    reportArea = r;
-
-    // Configuration menu
-    Menu menu = new Menu("Configuration");
-
-    // Configuration menu options
-    MenuItem mi = new MenuItem("Clear");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode == config.RUNNING) {
-          config.suspend();
-          config.mode = config.STOPPED;
-        } /* if */
-        config.clear();
-        canvas.repaint();
-        inputArea.setText("");
-        reportArea.setText("Configuration cleared");
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Load");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode == config.RUNNING) {
-          config.suspend();
-          config.mode = config.STOPPED;
-        } /* if */
-        config.clear();
-        canvas.repaint();
-        inputArea.setText("");
-        reportArea.setText("Please enter a filename");
-        canvas.mode = canvas.LOAD;
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Save");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode == config.RUNNING) {
-          config.suspend();
-          config.mode = config.STOPPED;
-        } /* if */
-        canvas.repaint();
-        canvas.mode = canvas.SAVE;
-        inputArea.setText("");
-        reportArea.setText("Please enter a filename");
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Run/Restart");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode == config.INITIAL) {
-          config.start();
-        } else if (config.mode == config.STOPPED) {
-          config.restart();
-          canvas.repaint();
-          config.resume();
-        }
-        System.out.println();
-        System.out.println("Configuration running...");
-        config.mode = config.RUNNING;
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Pause/Unpause");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode == config.RUNNING) {
-          config.suspend();
-          config.mode = config.STOPPED;
-        } else if (config.mode == config.STOPPED) {
-          config.resume();
-          config.mode = config.RUNNING;
-        }
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    add(menu);
-
-    // New menu
-    menu = new Menu("New");
-
-    // New menu options
-    mi = new MenuItem("Component");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode != config.RUNNING) {
-          canvas.current_component = new EACComponent(canvas,config);
-          canvas.repaint();
-          canvas.mode = canvas.COMPONENT;
-        }
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Union");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode != config.RUNNING) {
-          canvas.current_shape = new Union(canvas);
-          canvas.repaint();
-          canvas.mode = canvas.EDIT;
-        }
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Intersection");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode != config.RUNNING) {
-          canvas.current_shape = new Intersection(canvas);
-          canvas.repaint();
-          canvas.mode = canvas.EDIT;
-        }
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Source");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode != config.RUNNING) {
-          canvas.current_source = new Source(canvas,config);
-          canvas.repaint();
-          canvas.mode = canvas.SOURCE;
-        }
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Sink");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode != config.RUNNING) {
-          canvas.current_shape = new Sink(canvas);
-          canvas.repaint();
-          canvas.mode = canvas.EDIT;
-        }
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Connector");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode != config.RUNNING) {
-          canvas.repaint();
-          canvas.mode = canvas.CONNECTING;
-        }
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    mi = new MenuItem("Label");
-    mi.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        if (config.mode != config.RUNNING) {
-          reportArea.setText("Enter the text for your label in the input area");
-          inputArea.setText("");
-          canvas.repaint();
-          canvas.mode = canvas.LABEL_TYPING;
-        }
-      } /* actionPerformed */
-    }); /* addActionListener */
-    menu.add(mi);
-
-    add(menu);
-
-  } /* constructor */
-
-} /* EACMenuBar */
-
diff --git a/java/EAC/EACPanel.java b/java/EAC/EACPanel.java
deleted file mode 100644
index 333321ef545..00000000000
--- a/java/EAC/EACPanel.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/**
- * Title:        EACPanel
- * Description:  A subclass of Panel for the Event Analysis Configurator
- */
-package EAC;
-import java.awt.*;
-import java.awt.event.*;
-
-public class EACPanel extends Panel {
-
-  protected TextField inputArea;
-  protected Label reportArea;
-
-  // input modes
-  public final int COMMAND = 0;
-  public final int SELECT = 1;
-  public final int CUT = 2;
-  public final int COPY = 3;
-  public final int PASTE = 4;
-  public final int EDIT = 5;
-  public final int CONNECTING = 6;
-  public final int COMPONENT = 7;
-  public final int LABEL_TYPING = 8;
-  public final int LABEL_ADDING = 9;
-  public final int RC_TYPING = 10;
-  public final int DURATION_TYPING = 11;
-  public final int PERIOD_TYPING = 12;
-  public final int SOURCE = 13;
-  public final int CONNECTING_END = 14;
-  public final int LOAD = 15;
-  public final int SAVE = 16;
-
-  // current input mode
-  protected int mode;
-
-  // current primitive for drawing
-  protected Primitive current_shape;
-
-  // current text label
-  protected EACLabel current_label;
-
-  // current component
-  protected EACComponent current_component;
-
-  // current source
-  protected Source current_source;
-
-  // current connector, and associated primitives (indices into config's collection)
-  protected Connector current_connector;
-  protected int connector_start_index;
-  protected int connector_end_index;
-
-  // flag for associating the required label with a component or source
-  protected boolean component_needs_label = false;
-  protected boolean source_needs_label = false;
-
-  // Component Configuration associated with this panel
-  protected Configuration config;
-
-  // for dragging primitives around the panel
-  int moving_dx,
-      moving_dy;
-  boolean repainted;
-
-
-  // Constructor
-  public EACPanel(Configuration c, TextField i, Label r) {
-    config = c;
-    inputArea = i;
-    inputArea.addKeyListener(eac_key_adapter);
-    reportArea = r;
-    mode = COMMAND;
-    addMouseListener(eac_mouse_adapter);
-    addMouseMotionListener(eac_mm_adapter);
-  } /* constructor */
-
-  // Mouse Adapter
-  private class EACMouseAdapter extends MouseAdapter
-    implements MouseListener {
-
-      EACPanel canvas;
-
-      public EACMouseAdapter(EACPanel p) {
-        canvas = p;
-      } /* constructor */
-
-      public void mousePressed(MouseEvent e) {
-      switch (mode) {
-      case EDIT:
-        current_shape.setTop(new Point(e.getX(),e.getY()));
-        try {
-          if ((config.leftSideOverlaps(current_shape) == -1) &&
-              (config.rightSideOverlaps(current_shape) == -1)) {
-            current_shape.draw();
-            reportArea.setText("");
-            config.addPrimitive(current_shape);
-            mode = COMMAND;
-          } else {
-            reportArea.setText("ERROR: Primitives too close together");
-          } /* if */
-        } catch (BoundsException be) {
-          reportArea.setText(be.getMessage());
-        } catch (TooManyPrimitivesException tmpe) {
-          reportArea.setText(tmpe.getMessage());
-        } /* try */
-        break;
-      case SOURCE:
-        current_source.setTop(new Point(e.getX(),e.getY()));
-        try {
-          if ((config.leftSideOverlaps(current_source) == -1) &&
-              (config.rightSideOverlaps(current_source) == -1)) {
-            current_source.draw();
-            config.addPrimitive(current_source);
-            reportArea.setText("Please enter the period for this source in the input area");
-            inputArea.setText("");
-            mode = PERIOD_TYPING;
-          } else {
-            reportArea.setText("ERROR: Primitives too close together");
-          } /* if */
-        } catch (BoundsException be) {
-          reportArea.setText(be.getMessage());
-        } catch (TooManyPrimitivesException tmpe) {
-          reportArea.setText(tmpe.getMessage());
-        } /* try */
-        break;
-      case COMPONENT:
-        current_component.setTop(new Point(e.getX(),e.getY()));
-        try {
-          if ((config.leftSideOverlaps(current_component) == -1) &&
-              (config.rightSideOverlaps(current_component) == -1)) {
-            current_component.draw();
-            config.addPrimitive(current_component);
-            reportArea.setText("Please enter the resource consumption for this component in the input area");
-            inputArea.setText("");
-            mode = RC_TYPING;
-          } else {
-            reportArea.setText("ERROR: Primitives too close together");
-          } /* if */
-        } catch (BoundsException be) {
-          reportArea.setText(be.getMessage());
-        } catch (TooManyPrimitivesException tmpe) {
-          reportArea.setText(tmpe.getMessage());
-        } /* try */
-        break;
-      case CONNECTING:
-        current_connector = new Connector(canvas);
-        current_connector.anchor(new Point(e.getX(),e.getY()));
-        connector_start_index = config.leftSideOverlaps(current_connector);
-        if (connector_start_index == -1)
-          reportArea.setText("ERROR: Connector must begin inside a primitive");
-        else
-          mode = CONNECTING_END;
-        break;
-      case LABEL_ADDING:
-        current_label.setTop(new Point(e.getX(),e.getY()));
-        try {
-          current_label.specialUndraw();
-          current_label.draw();
-          reportArea.setText("");
-          config.addPrimitive(current_label);
-          mode = COMMAND;
-        } catch (BoundsException be) {
-          reportArea.setText(be.getMessage());
-        } catch (TooManyPrimitivesException tmpe) {
-          reportArea.setText(tmpe.getMessage());
-        } /* try */
-        break;
-      default: // SELECT mode
-        mode = SELECT;
-        current_shape = config.primitiveContaining(new Point(e.getX(),e.getY()));
-        repaint();
-        if (current_shape != null) {
-          repaint(); // if there was a previously selected shape, it ignored
-                     // the last repaint()  (kludge--looks better for dragging)
-          moving_dx = e.getX() - current_shape.getTop().x;
-          moving_dy = e.getY() - current_shape.getTop().y;
-          current_shape.selectedDraw();
-          repainted = false;
-        } else
-          repaint(); // need to repaint a second time
-        break;
-      } /* switch */
-      } /* mousePressed */
-
-      public void mouseReleased(MouseEvent e) {
-      switch (mode) {
-      case CONNECTING_END:
-        current_connector.end(new Point(e.getX(),e.getY()));
-        try {
-          connector_end_index = config.rightSideOverlaps(current_connector);
-          if (connector_end_index != -1) {
-            if (connector_end_index == connector_start_index)
-              reportArea.setText("ERROR: Connector cannot start and end at same primitive");
-            else {
-              Primitive startP = config.getPrimitive(connector_start_index);
-              Primitive endP = config.getPrimitive(connector_end_index);
-
-              // connect primitives
-              try {
-                startP.addOutput(current_connector);
-                current_connector.setInput(startP);
-                current_connector.setOutput(endP);
-                endP.addInput(current_connector);
-
-                // if everything okay, draw arrow
-                current_connector.draw();
-                reportArea.setText("");
-                config.addPrimitive(current_connector);
-
-                mode = COMMAND;
-
-              } catch (ConnectionException ce) {
-                reportArea.setText(ce.getMessage());
-              }
-            } /* else */
-          } else {
-            reportArea.setText("ERROR: Connector must terminate inside a primitive");
-          } /* if */
-        } catch (BoundsException be) {
-          reportArea.setText(be.getMessage());
-        } catch (TooManyPrimitivesException tmpe) {
-          reportArea.setText(tmpe.getMessage());
-        } /* try */
-        mode = CONNECTING;
-        break;
-      case SELECT:
-        if (current_shape != null)
-          current_shape.reconnect();
-        if (repainted) // dragging occurred
-          repaint();
-        break;
-      default:
-        //no-op
-      } /* switch */
-      } /* mouseReleased */
-
-      public void mouseClicked(MouseEvent e) {}
-      public void mouseEntered(MouseEvent e) {}
-      public void mouseExited(MouseEvent e) {}
-
-  } /* EACMouseAdapter */
-
-  // Mouse Motion Adapter
-  private class EACMouseMotionAdapter extends MouseMotionAdapter
-    implements MouseMotionListener {
-
-    public void mouseDragged(MouseEvent e) {
-    switch (mode) {
-    case CONNECTING_END:
-      current_connector.stretch(new Point(e.getX(),e.getY()));
-      break;
-    case SELECT:
-      if (current_shape != null) {
-        Point old_top = current_shape.getTop();
-        if (!repainted) {
-          repaint();
-          repainted = true;
-        } /* if */
-        current_shape.specialUndraw();
-        current_shape.setTop(new Point(e.getX() - moving_dx,e.getY() - moving_dy));
-        if (!current_shape.inBounds())
-          current_shape.setTop(old_top);
-        current_shape.specialDraw();
-      } /* if */
-    default:
-      //no-op
-    } /* switch */
-    } /* mouseDragged */
-
-    public void mouseMoved(MouseEvent e) {
-    switch (mode) {
-    case COMPONENT:
-      if (current_component.getAnchor() != null)
-        current_component.specialUndraw();
-      current_component.setTop(new Point(e.getX(),e.getY()));
-      current_component.specialDraw();
-      break;
-    case SOURCE:
-      if (current_source.getAnchor() != null)
-        current_source.specialUndraw();
-      current_source.setTop(new Point(e.getX(),e.getY()));
-      current_source.specialDraw();
-      break;
-    case EDIT:
-      if (current_shape.getAnchor() != null)
-        current_shape.specialUndraw();
-      current_shape.setTop(new Point(e.getX(),e.getY()));
-      current_shape.specialDraw();
-      break;
-    case LABEL_ADDING:
-      if (current_label.getAnchor() != null)
-        current_label.specialUndraw();
-      current_label.setTop(new Point(e.getX(),e.getY()));
-      current_label.specialDraw();
-      break;
-    default:
-      //no-op
-    } /* switch */
-    } /* mouseMoved */
-
-  } /* EACMouseMotionAdapter */
-
-  // Key Adapter
-  private class EACKeyAdapter extends KeyAdapter implements KeyListener {
-
-    EACPanel canvas;
-
-    public EACKeyAdapter(EACPanel p) {
-      canvas = p;
-    } /* constructor */
-
-    public void keyPressed(KeyEvent e) {
-      Graphics g = getGraphics();
-      String input;
-
-      if ((mode == RC_TYPING) && (e.getKeyChar() == '\n')) {
-        input = new String(inputArea.getText());
-        try {
-          current_component.setResourceConsumption(Integer.parseInt(input));
-          current_component.draw();
-          reportArea.setText("Please enter the duration for this component in the input area");
-          inputArea.setText("");
-          mode = DURATION_TYPING;
-        } catch (NumberFormatException nfe) {
-          reportArea.setText("Please enter an integer value between 1 and 100, inclusive");
-          inputArea.setText("");
-          return;
-        } catch (BoundsException be) {
-          reportArea.setText(be.getMessage());
-        } /* try */
-      } else if ((mode == DURATION_TYPING) && (e.getKeyChar() == '\n')) {
-        input = new String(inputArea.getText());
-        try {
-          current_component.setDuration(Integer.parseInt(input));
-          current_component.draw();
-          reportArea.setText("Please enter a label for this component in the input area");
-          inputArea.setText("");
-          component_needs_label = true;
-          mode = LABEL_TYPING;
-        } catch (NumberFormatException nfe) {
-          reportArea.setText("Please enter an integer value");
-          inputArea.setText("");
-          return;
-        } catch (BoundsException be) {
-          reportArea.setText(be.getMessage());
-        } /* try */
-      } else if ((mode == LABEL_TYPING) && (e.getKeyChar() == '\n')) {
-        current_label = new EACLabel(canvas,inputArea.getText().length());
-        current_label.setText(inputArea.getText());
-        if (component_needs_label) {
-          component_needs_label = false;
-          current_component.setLabel(current_label);
-          current_label.setLabelee(current_component);
-        } else if (source_needs_label) {
-          source_needs_label = false;
-          current_source.setLabel(current_label);
-          current_label.setLabelee(current_source);
-        }
-        reportArea.setText("Click at desired label location");
-        inputArea.setText("");
-        mode = LABEL_ADDING;
-      } else if ((mode == PERIOD_TYPING) && (e.getKeyChar() == '\n')) {
-        input = new String(inputArea.getText());
-        try {
-          current_source.setPeriod(Integer.parseInt(input));
-          current_source.draw();
-          inputArea.setText("");
-          reportArea.setText("Please enter a label for this source in the input area");
-          mode = LABEL_TYPING;
-          source_needs_label = true;
-        } catch (NumberFormatException nfe) {
-          reportArea.setText("Please enter a positive integer value");
-          inputArea.setText("");
-          return;
-        } catch (BoundsException be) {
-          reportArea.setText(be.getMessage());
-        } /* try */
-      } else if ((mode == LOAD) && (e.getKeyChar() == '\n')) {
-        File input_file;
-        input = new String(inputArea.getText());
-        try {
-          input_file = new File(input,"r",config,canvas);
-          input_file.readConfiguration();
-          input_file.close();
-          reportArea.setText("Configuration loaded successfully");
-          inputArea.setText("");
-        } catch (java.io.FileNotFoundException fnfe) {
-        } catch (java.io.IOException ioe) {
-        } catch (TooManyPrimitivesException tmpe) {
-          reportArea.setText(tmpe.getMessage());
-        }
-      } else if ((mode == SAVE) && (e.getKeyChar() == '\n')) {
-        File output_file;
-        input = new String(inputArea.getText());
-        try {
-          output_file = new File(input,"rw",config,canvas);
-          output_file.writeConfiguration();
-          output_file.close();
-          reportArea.setText("Configuration saved successfully");
-          inputArea.setText("");
-        } catch (java.io.FileNotFoundException fnfe) {
-        } catch (java.io.IOException ioe) {}
-      } /* if */
-    } /* keyPressed */
-  } /* EACKeyAdapter */
-
-  // Mouse Adapter Instances
-  private EACMouseAdapter eac_mouse_adapter = new EACMouseAdapter(this);
-  private EACMouseMotionAdapter eac_mm_adapter = new EACMouseMotionAdapter();
-
-  // Key Adapter Instance
-  private EACKeyAdapter eac_key_adapter = new EACKeyAdapter(this);
-
-  public void paint(Graphics g) {
-    g.setColor(getBackground());
-    g.fillRect(0,0,getSize().width,getSize().height);
-    g.setColor(getForeground());
-    g.drawRect(0,0,getSize().width - 1,getSize().height - 1);
-    config.draw();
-  } /* paint */
-
-  public void repaint() {
-    paint(getGraphics());
-  } /* repaint */
-}
\ No newline at end of file
diff --git a/java/EAC/EACPrintStream.java b/java/EAC/EACPrintStream.java
deleted file mode 100644
index 9e8d82d03f0..00000000000
--- a/java/EAC/EACPrintStream.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- *  Title:        EACFileStream
- *  Description:  A stream class for conducting file I/O in the Event Analysis Configurator.
- */
-package EAC;
-
-import java.io.RandomAccessF;
-
-public class EACPrintStream {
-
-  PrintStream ps;
-
-  public EACPrintStream(String filename) {
-    ps = new PrintStream(new FileOutputStream(filename), true);
-  }
-}
\ No newline at end of file
diff --git a/java/EAC/EmptyQueueException.java b/java/EAC/EmptyQueueException.java
deleted file mode 100644
index 0b2af00c36f..00000000000
--- a/java/EAC/EmptyQueueException.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- *  Title:        EmptyQueueException
- *  Description:  An exception class for when an attempt is made to access
- *                the head of the event queue when the queue is empty
- */
-package EAC;
-
-public class EmptyQueueException extends Exception {
-
-  public EmptyQueueException(String msg) {
-    super(msg);
-  }
-}
\ No newline at end of file
diff --git a/java/EAC/File.java b/java/EAC/File.java
deleted file mode 100644
index 6ba151cddc0..00000000000
--- a/java/EAC/File.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- *  Title:        File
- *  Description:  A file I/O class for the Event Analysis Configurator
- */
-package EAC;
-
-import java.io.RandomAccessFile;
-
-public class File extends RandomAccessFile {
-
-  public final int SOURCE = 1;
-  public final int SINK = 2;
-  public final int COMPONENT = 3;
-  public final int CONNECTOR = 4;
-  public final int UNION = 5;
-  public final int INTERSECTION = 6;
-  public final int LABEL = 7;
-
-  protected Configuration config;
-
-  protected EACPanel canvas;
-
-  public File(String filename, String mode, Configuration c, EACPanel p)
-    throws java.io.FileNotFoundException {
-      super(filename,mode);
-      config = c;
-      canvas = p;
-  } /* constructor */
-
-  public void writeConfiguration() throws java.io.IOException {
-    int i;
-
-    // write number of primitives
-    writeInt(config.getPrimitiveCount());
-
-    // write primitives
-    for (i = 0; i < config.getPrimitiveCount(); i++)
-      config.getPrimitive(i).write(this);
-
-  } /* writeConfiguration */
-
-  public void readConfiguration() throws java.io.IOException, TooManyPrimitivesException {
-    int i,
-        num,
-        label_length,  // for reading the number of chars in an EACLabel
-        primitiveID;
-
-    Primitive next_primitive = new Union(canvas);  // dummy initialization
-
-    Connector next_connector;
-
-    // read number of primitives
-    num = readInt();
-
-    for (i = 0; i < num; i++) {
-      primitiveID = readInt();
-      switch(primitiveID) {
-        case SOURCE:
-          next_primitive = new Source(canvas,config);
-          next_primitive.read(this);
-          i++; // Add one more to the loop counter 'cause we read our own label
-          break;
-        case SINK:
-          next_primitive = new Sink(canvas);
-          next_primitive.read(this);
-          break;
-        case COMPONENT:
-          next_primitive = new EACComponent(canvas,config);
-          next_primitive.read(this);
-          i++; // Add one more to the loop counter 'cause we read our own label
-          break;
-        case CONNECTOR:
-          next_connector = new Connector(canvas);
-          next_primitive = next_connector; // so it can be added to the config
-          next_connector.read(this);
-          try {
-            int connector_start_index = config.leftSideOverlaps(next_connector);
-            int connector_end_index = config.rightSideOverlaps(next_connector);
-
-            Primitive startP = config.getPrimitive(connector_start_index);
-            Primitive endP = config.getPrimitive(connector_end_index);
-
-            // reinstate connection
-            startP.addOutput(next_connector);
-            next_connector.setInput(startP);
-            next_connector.setOutput(endP);
-            endP.addInput(next_connector);
-
-          } catch (ConnectionException ce) {
-            // can't happen (right?)
-          } /* try */
-          break;
-        case UNION:
-          next_primitive = new Union(canvas);
-          next_primitive.read(this);
-          break;
-        case INTERSECTION:
-          next_primitive = new Intersection(canvas);
-          next_primitive.read(this);
-          break;
-        case LABEL:
-          label_length = readInt();
-          next_primitive = new EACLabel(canvas,label_length);
-          next_primitive.read(this);
-          break;
-      } /* switch */
-
-      // add to configuration
-      config.addPrimitive(next_primitive);
-
-    } /* for */
-
-    // draw the configuration
-    config.draw();
-
-  } /* readConfiguration */
-
-}
\ No newline at end of file
diff --git a/java/EAC/InputMode.java b/java/EAC/InputMode.java
deleted file mode 100644
index c44e4a45c4d..00000000000
--- a/java/EAC/InputMode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Title:        InputMode
- * Description:  Maintains Configurator state for deciding how to handle input
- */
-package EAC;
-
-public class InputMode {
-
-  public final int COMMAND = 0;
-  public final int SELECT = 1;
-  public final int CUT = 2;
-  public final int COPY = 3;
-  public final int PASTE = 4;
-  public final int EDIT = 5;
-  public final int RESIZE = 6;
-
-  protected int mode;
-
-  protected Primitive current_shape;
-
-  public InputMode() {
-    mode = COMMAND;
-  } /* constructor */
-
-  public int getMode() {
-    return mode;
-  } /* getMode */
-
-  protected void setMode(int m) {
-    mode = m;
-  } /* setMode */
-}
\ No newline at end of file
diff --git a/java/EAC/Intersection.java b/java/EAC/Intersection.java
deleted file mode 100644
index 1e1beafb770..00000000000
--- a/java/EAC/Intersection.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- *  Title:        Intersection
- *  Description:  A binary intersection operator class for the Event Analysis
- *                Configurator.  Acts as a sort of filter, combining two event
- *                streams into one.
- */
-package EAC;
-import java.awt.*;
-
-public class Intersection extends Operator {
-
-  // Where did the last event come from?
-  protected Primitive last_event_source;
-
-  public Intersection(EACPanel p) {
-    super(p);
-    last_event_source = null;
-  } /* constructor */
-
-  public void draw() throws BoundsException {
-    // the intersection symbol
-    final char iSymbol = '^';
-
-    // subtle adjustments to position symbol within circle
-    final int xTweak = 2;
-    final int yTweak = -5;
-
-    char symbol[] = new char[1];
-    Graphics g = canvas.getGraphics();
-
-    super.draw();
-    symbol[0] = iSymbol;
-    g.drawChars(symbol,0,1,
-                anchor.x + (int) (DIAMETER / 2) - xTweak,
-                anchor.y + (int) (DIAMETER / 2) - yTweak);
-  } /* draw */
-
-  public void event(Source s) throws ConnectionException {
-    //System.out.println("Intersection event");
-    if (last_event_source == null)
-      last_event_source = s;
-    else if (last_event_source != s) { // we've now gotten events from two distinct sources
-      int i;
-
-      last_event_source = null;
-      for (i = 0; i < output_count; i++)
-        output[i].event(s);
-    } // else no-op, because this event is from the same source as the last event
-  } /* event */
-
-  public void write(File f) throws java.io.IOException {
-    f.writeInt(f.INTERSECTION);
-    f.writeInt(anchor.x);
-    f.writeInt(anchor.y);
-  } /* write */
-
-  public void read(File f) throws java.io.IOException {
-    anchor = new Point();
-    anchor.x = f.readInt();
-    anchor.y = f.readInt();
-  } /* read */
-}
\ No newline at end of file
diff --git a/java/EAC/Operator.java b/java/EAC/Operator.java
deleted file mode 100644
index 724c9583b20..00000000000
--- a/java/EAC/Operator.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- *  Title:        Operator
- *  Description:  An abstract binary operator class for the Event Analysis
- *                Configurator
- */
-package EAC;
-import java.awt.*;
-
-public abstract class Operator extends Primitive {
-
-  // Radius of the circle
-  protected final int DIAMETER = 40;
-
-  // inputs
-  protected Connector left_input,
-                      right_input;
-
-  // outputs
-  protected Connector output[] = new Connector[MAX_OUTPUTS];
-  protected int output_count = 0;
-
-  // helps with dragging the operator
-  protected boolean selected;
-  Point old_anchor;
-
-  public Operator(EACPanel p) {
-    super(p);
-  } /* constructor */
-
-  public void setTop(Point p) {
-    anchor = new Point(p.x - (int) (DIAMETER / 2), p.y);
-  } /* setTop */
-
-  public Point getTop() {
-    return new Point(anchor.x + (int) (DIAMETER / 2), anchor.y);
-  } /* getTop */
-
-  public void draw() throws BoundsException {
-    Graphics g = canvas.getGraphics();
-
-    if (selected)
-      selected = false;
-    else if (inBounds())
-      g.drawOval(anchor.x, anchor.y, DIAMETER, DIAMETER);
-    else
-      throw new BoundsException("ERROR: Attempted to place Operator partially out of bounds");
-  } /* draw */
-
-  public void specialDraw() {
-    Graphics g = canvas.getGraphics();
-
-    g.setXORMode(canvas.getBackground());
-    g.drawOval(anchor.x,anchor.y,DIAMETER,DIAMETER);
-  } /* specialDraw */
-
-  public void specialUndraw() {
-    Graphics g = canvas.getGraphics();
-
-    g.setColor(canvas.getBackground());
-    g.setXORMode(canvas.getForeground());
-    g.drawOval(anchor.x,anchor.y,DIAMETER,DIAMETER);
-  } /* specialUndraw */
-
-  public void selectedDraw() {
-    old_anchor = anchor;
-    selected = true;
-    super.selectedDraw();
-  } /* selectedDraw */
-
-  public void reconnect() {
-    int i;
-
-    // move output anchors
-    for (i = 0; i < output_count; i++)
-      output[i].setAnchor(new Point(output[i].getAnchor().x + anchor.x - old_anchor.x,
-                                    output[i].getAnchor().y + anchor.y - old_anchor.y));
-
-    // move input endpoints
-    if (left_input != null)
-      left_input.setEndpoint(new Point(left_input.upperRight().x + anchor.x - old_anchor.x,
-                                       left_input.upperRight().y + anchor.y - old_anchor.y));
-    if (right_input != null)
-      right_input.setEndpoint(new Point(right_input.upperRight().x + anchor.x - old_anchor.x,
-                                        right_input.upperRight().y + anchor.y - old_anchor.y));
-
-  } /* reconnect */
-
-  public boolean contains(Point p) {
-    if ((p.x >= anchor.x) &&
-        (p.x <= anchor.x + DIAMETER) &&
-        (p.y >= anchor.y) &&
-        (p.y <= anchor.y + DIAMETER))
-      return true;
-    else
-      return false;
-  } /* contains */
-
-  public Point upperLeft() {
-    return anchor;
-  } /* upperLeft */
-
-  public Point lowerRight() {
-    return new Point(anchor.x + DIAMETER, anchor.y + DIAMETER);
-  } /* lowerRight */
-
-  public Point upperRight() {
-    return new Point(anchor.x + DIAMETER, anchor.y);
-  } /* upperRight */
-
-  public Point lowerLeft() {
-    return new Point(anchor.x, anchor.y + DIAMETER);
-  } /* lowerLeft */
-
-  public int addInput(Connector c) throws ConnectionException {
-    if (left_input == null) {
-      left_input = c;
-      return 0;
-    } else if (right_input == null) {
-      right_input = c;
-      return 1;
-    } else
-      throw new ConnectionException("ERROR: Operator already has two inputs");
-  } /* addInput */
-
-  public int addOutput(Connector c) throws ConnectionException {
-    if (output_count < MAX_OUTPUTS)
-      output[output_count++] = c;
-    else
-      throw new ConnectionException("ERROR: Maximum outputs established for this operator");
-
-    return output_count;
-  } /* addOutput */
-
-  public Connector getInput(int i) throws ConnectionException {
-    if ((i < 0) || (i > 1))
-      throw new ConnectionException("ERROR: Bad input index for operator");
-    else if (i == 0) {
-      if (left_input == null)
-        throw new ConnectionException("ERROR: No left input for operator");
-      else
-        return left_input;
-    } else // i == 1
-      if (right_input == null)
-        throw new ConnectionException("ERROR: No right input for operator");
-
-    return right_input;
-  } /* getInput */
-
-  public Connector getOutput(int i) throws ConnectionException {
-    if ((i >= 0) && (i < output_count))
-      return output[i];
-    else
-      throw new ConnectionException("ERROR: Bad output index for operator");
-  } /* getOutput */
-
-  public void removeInput(int i) throws ConnectionException {
-    if ((i < 0) || (i > 1))
-      throw new ConnectionException("ERROR: Bad input index for operator");
-    else if (i == 0) {
-      if (left_input == null)
-        throw new ConnectionException("ERROR: No left input for operator");
-      else
-        left_input = null;
-    } else if (i == 1) {
-      if (right_input == null)
-        throw new ConnectionException("ERROR: No right input for operator");
-      else
-        right_input = null;
-    }
-  } /* removeInput */
-
-  public void removeOutput(int i) throws ConnectionException {
-    if ((i < 0) || (i > output_count))
-      throw new ConnectionException("ERROR: Bad output index for operator");
-    else {
-      output[i] = output[output_count-1];
-      --output_count;
-    }
-  } /* removeOutput */
-
-  public int getOutputCount() throws ConnectionException {
-    return output_count;
-  } /* getOutputCount */
-
-  public int getInputCount() throws ConnectionException {
-    if (left_input == null)
-      return 0;
-    else if (right_input == null)
-      return 1;
-    else
-      return 2;
-  } /* getInputCount */
-
-  public void wakeup(long t) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to wake up operator");
-  } /* wakeup */
-
-  public boolean inBounds() {
-    if (canvas.contains(anchor.x,anchor.y) &&
-        canvas.contains(anchor.x + DIAMETER, anchor.y + DIAMETER))
-      return true;
-    else
-      return false;
-  } /* inBounds */
-
-}
\ No newline at end of file
diff --git a/java/EAC/Primitive.java b/java/EAC/Primitive.java
deleted file mode 100644
index a0532a9731b..00000000000
--- a/java/EAC/Primitive.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Title:        Primitive
- * Description:  An abstract class for Event Analysis Configurator graphical
- *               primitives
- */
-package EAC;
-import java.awt.*;
-import java.io.*;
-
-public abstract class Primitive {
-
-  // maximum number of outputs from any primitive
-  public final int MAX_OUTPUTS = 8;
-
-  // maximum number of inputs to a sink
-  public final int MAX_INPUTS = 8;
-
-  // where the primitive will be drawn
-  protected EACPanel canvas;
-
-  // anchor point of the graphical shape
-  protected Point anchor;
-
-  // associated label
-  protected EACLabel label;
-
-  public Primitive(EACPanel p) {
-    canvas = p;
-  } /* constructor */
-
-  public void setAnchor(Point p) {
-    anchor = p;
-  } /* setAnchor */
-
-  public Point getAnchor() {
-    return anchor;
-  } /* getAnchor */
-
-  public void setLabel(EACLabel l) {
-    label = l;
-  } /* setLabel */
-
-  public EACLabel getLabel() {
-    return label;
-  } /* getLabel */
-
-  public void restart() {
-    // no-op for most primitives
-    // overload as needed
-  } /* restart */
-
-  public void specialDraw() {
-    // no-op for some primitives
-    // overload as needed
-  } /* specialDraw */
-
-  public void specialUndraw() {
-    // no-op for some primitives
-    // overload as needed
-  } /* specialUndraw */
-
-  public void reconnect() {
-    // no-op for some primitives
-    // overload as needed
-  } /* reconnect */
-
-  public void selectedDraw() {
-    final int d = 4; // dimension of hotspot
-    Graphics g = canvas.getGraphics();
-
-    g.setColor(java.awt.Color.darkGray);
-    g.drawRect(upperLeft().x - (d/2),upperLeft().y - (d/2), d, d);
-    g.drawRect(lowerLeft().x - (d/2),lowerLeft().y - (d/2), d, d);
-    g.drawRect(upperRight().x - (d/2),upperRight().y - (d/2), d, d);
-    g.drawRect(lowerRight().x - (d/2),lowerRight().y - (d/2), d, d);
-  } /* selectedDraw */
-
-  // establish the top center point of the graphical shape
-  public abstract void setTop(Point p);
-
-  public abstract Point getTop();
-
-  public abstract boolean inBounds();
-
-  public abstract int addInput(Connector c) throws ConnectionException;
-
-  public abstract int addOutput(Connector c) throws ConnectionException;
-
-  public abstract Connector getInput(int i) throws ConnectionException;
-
-  public abstract Connector getOutput(int i) throws ConnectionException;
-
-  public abstract void removeInput(int i) throws ConnectionException;
-
-  public abstract void removeOutput(int i) throws ConnectionException;
-
-  public abstract int getInputCount() throws ConnectionException;
-
-  public abstract int getOutputCount() throws ConnectionException;
-
-  public abstract void event(Source s) throws ConnectionException;
-
-  public abstract void wakeup(long t) throws ConnectionException;
-
-  public abstract void draw() throws BoundsException;
-
-  public abstract void write(File f) throws java.io.IOException;
-
-  public abstract void read(File f) throws java.io.IOException;
-
-  public abstract boolean contains(Point p);
-
-  public abstract Point upperLeft();
-
-  public abstract Point lowerRight();
-
-  public abstract Point upperRight();
-
-  public abstract Point lowerLeft();
-
-}
\ No newline at end of file
diff --git a/java/EAC/Queue.java b/java/EAC/Queue.java
deleted file mode 100644
index 20c4483a17a..00000000000
--- a/java/EAC/Queue.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Title:        Queue
- * Description:  The primary event queue for the Event Analysis Configurator
- */
-package EAC;
-
-public class Queue {
-
-  private class Node {
-
-    public Primitive primitive;
-    public long time;
-    public Node next;
-
-    public Node(Primitive p, long t, Node n) {
-      primitive = p;
-      time = t;
-      next = n;
-    } /* constructor */
-
-  } /* Node */
-
-  private Node head;
-
-  private int count;
-
-  public Queue() {
-    count = 0;
-  } /* constructor */
-
-  public boolean empty() {
-    return (count == 0);
-  } /* empty */
-
-  public void clear() {
-    while (!empty())
-    try {
-      dequeue();
-    } catch (EmptyQueueException eqe) {
-    // can't happen
-    }
-  } /* clear */
-
-  public void enqueue(Primitive p, long t) {
-    if (head == null) {
-      head = new Node(p,t,null);
-      count = 1;
-    } else { // non-empty
-      if ((head.time == t) && (head.primitive == p))
-        return; // no duplicates
-      else if (head.time >= t) { // need new head
-        Node temp = new Node(p,t,head);
-        head = temp;
-      } else { // find insertion point
-        Node ptr = head;
-
-        while (ptr.next != null)
-          if (ptr.next.time < t)
-            ptr = ptr.next;
-          else
-            break;
-
-        if (ptr.next == null)
-          ptr.next = new Node(p,t,null);
-        else if ((ptr.next.time == t) && (ptr.next.primitive == p))
-          return; // no duplicates
-        else {
-          Node temp = new Node(p,t,ptr.next);
-          ptr.next = temp;
-        }
-      }
-
-      count++;
-    } /* else */
-  } /* enqueue */
-
-  public Primitive dequeue () throws EmptyQueueException {
-    if (count == 0)
-      throw new EmptyQueueException("ERROR: dequeue called when queue empty");
-
-    Primitive temp = head.primitive;
-    head = head.next;
-    --count;
-    return temp;
-  } /* dequeue */
-
-  public long frontTime () throws EmptyQueueException {
-    if (count == 0)
-      throw new EmptyQueueException("ERROR: frontTime called when queue empty");
-
-    return head.time;
-  } /* frontTime */
-
-}
\ No newline at end of file
diff --git a/java/EAC/README b/java/EAC/README
deleted file mode 100644
index 91773ab16bd..00000000000
--- a/java/EAC/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This directory contains the source code for the Event Analysis Configurator (EAC).
-The EAC was built as a final project for an Advanced User Interface (CS 501) course,
-taught by Dr. Kimura in the fall of 2000.
-
-There are also two MS-Word documents which were written as part of the project.
-Hopefully these will explain what the EAC is, what it does, and how it works.
diff --git a/java/EAC/ResourcePool.java b/java/EAC/ResourcePool.java
deleted file mode 100644
index c2200baa2fc..00000000000
--- a/java/EAC/ResourcePool.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Title:        ResourcePool
- * Description:  An abstraction of a collection of resources that can be
- *               reserved and released by real-time components
- */
-package EAC;
-
-public class ResourcePool {
-
-  // percentage of resources reserved
-  protected int reserved;
-
-  public ResourcePool()
-  {
-    reserved = 0;
-  } /* default constructor */
-
-  public ResourcePool(int r) {
-    reserved = r;
-  } /* constructor */
-
-  public int usage() {
-    return reserved;
-  } /* usage */
-
-  public boolean reserve(int r) {
-    if (reserved + r > 100)
-      return false;
-    else {
-      //System.out.println("Reservation ok: " + java.lang.Integer.toString(r));
-      reserved += r;
-      return true;
-    } /* else */
-  } /* reserve */
-
-  public boolean release(int r) {
-    if (reserved - r < 0)
-      return false;
-    else {
-      //System.out.println("Release ok: " + java.lang.Integer.toString(r));
-      reserved -= r;
-      return true;
-    } /* else */
-  } /* release */
-
-}
\ No newline at end of file
diff --git a/java/EAC/Rubberband.java b/java/EAC/Rubberband.java
deleted file mode 100644
index b5fcf7e60a0..00000000000
--- a/java/EAC/Rubberband.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * A abstract base class for rubberbands.<p>
- *
- * Rubberbands do their rubberbanding inside of a Component,
- * which must be specified at construction time.<p>
- *
- * Subclasses are responsible for implementing
- * <em>void drawLast(Graphics g)</em> and
- * <em>void drawNext(Graphics g)</em>.
- *
- * drawLast() draws the appropriate geometric shape at the last
- * rubberband location, while drawNext() draws the appropriate
- * geometric shape at the next rubberband location.  All of the
- * underlying support for rubberbanding is taken care of here,
- * including handling XOR mode setting; extensions of Rubberband
- * need not concern themselves with anything but drawing the
- * last and next geometric shapes.<p>
- *
- * @version 1.00, 12/27/95
- * @author  David Geary
- */
-package EAC;
-import java.awt.*;
-
-abstract public class Rubberband {
-  protected Point anchor    = new Point(0,0);
-  protected Point stretched = new Point(0,0);
-  protected Point last      = new Point(0,0);
-  protected Point end       = new Point(0,0);
-
-  private Component component;
-  private boolean   firstStretch = true;
-
-  abstract public void drawLast(Graphics g);
-  abstract public void drawNext(Graphics g);
-
-  public Rubberband(Component component) {
-    this.component = component;
-  }
-
-  public Point getAnchor   () { return anchor; }
-  public Point getStretched() { return stretched; }
-  public Point getLast     () { return last; }
-  public Point getEnd      () { return end; }
-  public void setAnchor(Point p) { anchor = p; }
-  public void setEnd(Point p) { end = p; }
-
-  public void anchor(Point p) {
-      firstStretch = true;
-      anchor.x = p.x;
-      anchor.y = p.y;
-
-      stretched.x = last.x = anchor.x;
-      stretched.y = last.y = anchor.y;
-  }
-
-  public void stretch(Point p) {
-    last.x      = stretched.x;
-    last.y      = stretched.y;
-    stretched.x = p.x;
-    stretched.y = p.y;
-
-    Graphics g = component.getGraphics();
-    if (g != null) {
-      g.setXORMode(component.getBackground());
-
-      if (firstStretch == true)
-        firstStretch = false;
-      else
-        drawLast(g);
-
-      drawNext(g);
-    }
-  }
-
-  public void end(Point p) {
-    last.x = end.x = p.x;
-    last.y = end.y = p.y;
-
-    Graphics g = component.getGraphics();
-    if(g != null) {
-      g.setXORMode(component.getBackground());
-      drawLast(g);
-    }
-  }
-
-  public Rectangle bounds() {
-    return new Rectangle(stretched.x < anchor.x ?
-                         stretched.x : anchor.x,
-                         stretched.y < anchor.y ?
-                         stretched.y : anchor.y,
-                         Math.abs(stretched.x - anchor.x),
-                         Math.abs(stretched.y - anchor.y));
-  }
-
-  public Rectangle lastBounds() {
-    return new Rectangle(
-                last.x < anchor.x ? last.x : anchor.x,
-                last.y < anchor.y ? last.y : anchor.y,
-                Math.abs(last.x - anchor.x),
-                Math.abs(last.y - anchor.y));
-  }
-}
diff --git a/java/EAC/RubberbandLine.java b/java/EAC/RubberbandLine.java
deleted file mode 100644
index 8a4ebfd2230..00000000000
--- a/java/EAC/RubberbandLine.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Title:        RubberbandLine
- * Description:  A line subclass of Rubberband
- */
-package EAC;
-import java.awt.*;
-
-public class RubberbandLine extends Rubberband {
-
-  public RubberbandLine(EACPanel p) {
-    super(p);
-  } /* RubberbandLine constructor */
-
-  public void drawNext(Graphics g) {
-    g.drawLine(getAnchor().x,
-               getAnchor().y,
-               getStretched().x,
-               getStretched().y);
-  } /* drawNext */
-
-  public void drawLast(Graphics g) {
-    g.drawLine(getAnchor().x,
-               getAnchor().y,
-               getLast().x,
-               getLast().y);
-  } /* drawLast */
-
-} /* RubberbandLine */
diff --git a/java/EAC/Sink.java b/java/EAC/Sink.java
deleted file mode 100644
index f4f8d02d0fe..00000000000
--- a/java/EAC/Sink.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * Title:        Sink
- * Description:  An event sink for the Event Analysis Configurator
- */
-package EAC;
-import java.awt.*;
-
-public class Sink extends Primitive {
-
-  // triangle dimensions
-  protected final int WIDTH = 20;
-  protected final int HEIGHT = 35;
-
-  // lower left and lower right corner points
-  // inherited anchor attribute holds the top point
-  protected Point p2,
-                  p3;
-
-  // inputs
-  protected Connector input[] = new Connector[MAX_INPUTS];
-  protected int input_count;
-
-  // for help with dragging this Sink
-  Point old_anchor;
-
-  public Sink(EACPanel p) {
-    super(p);
-  } /* constructor */
-
-  public void draw() throws BoundsException {
-    int x[] = new int[3],
-        y[] = new int[3];
-
-    if (inBounds()) {
-      Graphics g = canvas.getGraphics();
-
-      g.drawLine(anchor.x,anchor.y,p2.x,p2.y);
-      g.drawLine(p2.x,p2.y,p3.x,p3.y);
-      g.drawLine(p3.x,p3.y,anchor.x,anchor.y);
-
-      /* Make it black */
-      x[0] = anchor.x;
-      x[1] = p2.x;
-      x[2] = p3.x;
-
-      y[0] = anchor.y;
-      y[1] = p2.y;
-      y[2] = p3.y;
-
-      g.fillPolygon(x,y,3);
-    } else
-      throw new BoundsException("ERROR: Attempted to place Sink partially out of bounds");
-  } /* draw */
-
-  public void selectedDraw() {
-    old_anchor = anchor;
-    super.selectedDraw();
-  } /* selectedDraw */
-
-  public void specialDraw() {
-    int x[] = new int[3],
-        y[] = new int[3];
-
-    Graphics g = canvas.getGraphics();
-
-    g.setXORMode(canvas.getBackground());
-    g.drawLine(anchor.x,anchor.y,p2.x,p2.y);
-    g.drawLine(p2.x,p2.y,p3.x,p3.y);
-    g.drawLine(p3.x,p3.y,anchor.x,anchor.y);
-
-    /* Make it black */
-    x[0] = anchor.x;
-    x[1] = p2.x;
-    x[2] = p3.x;
-
-    y[0] = anchor.y;
-    y[1] = p2.y;
-    y[2] = p3.y;
-
-    g.fillPolygon(x,y,3);
-  } /* specialDraw */
-
-  public void specialUndraw() {
-    int x[] = new int[3],
-        y[] = new int[3];
-
-    Graphics g = canvas.getGraphics();
-
-    g.setColor(canvas.getBackground());
-    g.setXORMode(canvas.getForeground());
-    g.drawLine(anchor.x,anchor.y,p2.x,p2.y);
-    g.drawLine(p2.x,p2.y,p3.x,p3.y);
-    g.drawLine(p3.x,p3.y,anchor.x,anchor.y);
-
-      /* Make it black */
-      x[0] = anchor.x;
-      x[1] = p2.x;
-      x[2] = p3.x;
-
-      y[0] = anchor.y;
-      y[1] = p2.y;
-      y[2] = p3.y;
-
-      g.fillPolygon(x,y,3);
-  } /* specialUndraw */
-
-  public void reconnect() {
-    int i;
-
-    for (i = 0; i < input_count; i++)
-      input[i].setEndpoint(new Point(input[i].upperRight().x + anchor.x - old_anchor.x,
-                                     input[i].upperRight().y + anchor.y - old_anchor.y));
-  } /* reconnect */
-
-  public boolean contains(Point p) {
-    if ((p.x >= p2.x) &&
-        (p.x <= p3.x) &&
-        (p.y >= anchor.y) &&
-        (p.y <= anchor.y + HEIGHT))
-      return true;
-    else
-      return false;
-  } /* contains */
-
-  public Point upperLeft() {
-    return new Point(p2.x,anchor.y);
-  } /* upperLeft */
-
-  public Point lowerRight() {
-    return p3;
-  } /* lowerRight */
-
-  public Point upperRight() {
-    return new Point(p3.x,anchor.y);
-  } /* upperRight */
-
-  public Point lowerLeft() {
-    return p2;
-  } /* lowerLeft */
-
-  public void setTop(Point p) {
-    anchor = p;
-    p2 = bottomLeft();
-    p3 = bottomRight();
-  } /* setTop */
-
-  public Point getTop() {
-    return anchor;
-  } /* getTop */
-
-  public boolean inBounds() {
-    if (canvas.contains(bottomLeft()) &&
-        canvas.contains(bottomRight()))
-      return true;
-    else
-      return false;
-  } /* inBounds */
-
-  private Point bottomLeft() {
-    return new Point(anchor.x - WIDTH, anchor.y + HEIGHT);
-  } /* bottomLeft */
-
-  private Point bottomRight() {
-    return new Point(anchor.x + WIDTH, anchor.y + HEIGHT);
-  } /* bottomRight */
-
-  public void write(File f) throws java.io.IOException {
-    f.writeInt(f.SINK);
-    f.writeInt(anchor.x);
-    f.writeInt(anchor.y);
-  } /* write */
-
-  public void read(File f) throws java.io.IOException {
-    anchor = new Point();
-    anchor.x = f.readInt();
-    anchor.y = f.readInt();
-    p2 = bottomLeft();
-    p3 = bottomRight();
-  } /* read */
-
-  public int addInput(Connector c) throws ConnectionException {
-    if (input_count == MAX_INPUTS)
-      throw new ConnectionException("ERROR: Maximum inputs established for sink");
-    else
-      input[input_count++] = c;
-
-    return input_count;
-  } /* addInput */
-
-  public int addOutput(Connector c) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to add output to sink");
-  } /* addOutput */
-
-  public Connector getInput(int i) throws ConnectionException {
-    if ((i < 0) || (i >= input_count))
-      throw new ConnectionException("ERROR: Bad input index for sink");
-    else
-      return input[i];
-  } /* getInput */
-
-  public Connector getOutput(int i) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to retrieve output from source");
-  } /* getOutput */
-
-  public void removeOutput(int i) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to remove output from source");
-  } /* removeOutput */
-
-  public void removeInput(int i) throws ConnectionException {
-    if ((i >= 0) && (i < input_count)) {
-      input[i] = input[input_count-1];
-      --input_count;
-    } else
-      throw new ConnectionException("ERROR: Bad input index for sink");
-  } /* removeInput */
-
-  public int getInputCount() throws ConnectionException {
-    return input_count;
-  } /* getInputCount */
-
-  public int getOutputCount() throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to retrieve output count from sink");
-  } /* getOutputCount */
-
-  public void event(Source s) {
-  } /* event */
-
-  public void wakeup(long t) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to wake up sink");
-  } /* wakeup */
-}
\ No newline at end of file
diff --git a/java/EAC/Source.java b/java/EAC/Source.java
deleted file mode 100644
index d8b50ee224f..00000000000
--- a/java/EAC/Source.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/**
- * Title:        Source
- * Description:  An event source for the Event Analysis Configurator
- */
-package EAC;
-import java.awt.*;
-
-public class Source extends Primitive {
-
-  // Font for text
-  protected Font text_font = new EACFont().getFont();
-
-  // triangle dimensions
-  protected final int WIDTH = 20;
-  protected final int HEIGHT = 35;
-
-  // lower left and lower right corner points
-  // inherited anchor attribute holds the top point
-  protected Point p2,
-                  p3;
-
-  // period at which events will be generated
-  protected int period;
-
-  // where the Source was anchored prior to a move
-  protected Point old_anchor;
-
-  // where events will be pushed
-  protected Connector output[] = new Connector[MAX_OUTPUTS];
-  protected int output_count;
-
-  // Is this Source currently selected for dragging?
-  protected boolean selected = false;
-
-  // Black-on-white (normal) or white-on-black (reversed)?
-  protected boolean reverse_color = false;
-
-  // configuration to which the Source belongs
-  Configuration config;
-
-  public Source(EACPanel p, Configuration c) {
-    super(p);
-    config = c;
-    output_count = 0;
-    period = 0;
-  } /* constructor */
-
-  private void drawTriangle(Graphics g) {
-    g.drawLine(anchor.x,anchor.y,p2.x,p2.y);
-    g.drawLine(p2.x,p2.y,p3.x,p3.y);
-    g.drawLine(p3.x,p3.y,anchor.x,anchor.y);
-  } /* drawTriangle */
-
-  public void draw() throws BoundsException {
-    int x[] = new int[3],
-        y[] = new int[3];
-
-    if (selected)
-      selected = false;
-    else if (inBounds()) {
-      Graphics g = canvas.getGraphics();
-      Color bg,
-            fg;
-
-      x[0] = anchor.x;
-      x[1] = p2.x;
-      x[2] = p3.x;
-
-      y[0] = anchor.y;
-      y[1] = p2.y;
-      y[2] = p3.y;
-
-      if (reverse_color) {
-        bg = Color.black;
-        fg = Color.white;
-      } else {
-        bg = Color.white;
-        fg = Color.black;
-      }
-
-      g.setColor(bg); // for interior
-      g.fillPolygon(x,y,3);
-
-      g.setColor(Color.black); // triangle itself is always black
-      drawTriangle(g);
-
-      g.setColor(fg); // for text
-
-      // print period
-      if (period > 0) {
-        g.setFont(text_font);
-        g.drawString(java.lang.String.valueOf(period),
-                     anchor.x - (3 * java.lang.String.valueOf(period).length()),
-                     anchor.y + 28);
-      }
-    } else
-      throw new BoundsException("ERROR: Attempted to place source partially out of bounds");
-  } /* draw */
-
-  public void selectedDraw() {
-    Graphics g = canvas.getGraphics();
-    int x[] = new int[3],
-        y[] = new int[3];
-
-    old_anchor = anchor;
-    x[0] = anchor.x;
-    x[1] = p2.x;
-    x[2] = p3.x;
-
-    y[0] = anchor.y;
-    y[1] = p2.y;
-    y[2] = p3.y;
-
-    //drawTriangle();
-    g.setColor(canvas.getBackground());
-    g.fillPolygon(x,y,3);
-
-    // this will preclude drawing this Source for one repaint() call
-    selected = true;
-
-    super.selectedDraw();
-  } /* selectedDraw */
-
-  public void specialDraw() {
-    Graphics g = canvas.getGraphics();
-
-    g.setXORMode(canvas.getBackground());
-    drawTriangle(g);
-  } /* specialDraw */
-
-  public void specialUndraw() {
-    Graphics g = canvas.getGraphics();
-
-    g.setColor(canvas.getBackground());
-    g.setXORMode(canvas.getForeground());
-    drawTriangle(g);
-  } /* specialUndraw */
-
-  public void reverseColor() {
-    reverse_color = true;
-  } /* reverseColor */
-
-  public void normalColor() {
-    reverse_color = false;
-  } /* normalColor */
-
-  public void reconnect() {
-    int i;
-
-    for (i = 0; i < output_count; i++)
-      output[i].setAnchor(new Point(output[i].getAnchor().x + anchor.x - old_anchor.x,
-                                    output[i].getAnchor().y + anchor.y - old_anchor.y));
-
-    // move label anchor
-    label.setAnchor(new Point(label.getAnchor().x + anchor.x - old_anchor.x,
-                              label.getAnchor().y + anchor.y - old_anchor.y));
-  } /* reconnect */
-
-  public boolean contains(Point p) {
-    if ((p.x >= p2.x) &&
-        (p.x <= p3.x) &&
-        (p.y >= anchor.y) &&
-        (p.y <= anchor.y + HEIGHT))
-      return true;
-    else
-      return false;
-  } /* contains */
-
-  public Point upperLeft() {
-    return new Point(p2.x,anchor.y);
-  } /* upperLeft */
-
-  public Point lowerRight() {
-    return p3;
-  } /* lowerRight */
-
-  public Point upperRight() {
-    return new Point(p3.x,anchor.y);
-  } /* upperRight */
-
-  public Point lowerLeft() {
-    return p2;
-  } /* lowerLeft */
-
-  public void setTop(Point p) {
-    anchor = p;
-    p2 = bottomLeft();
-    p3 = bottomRight();
-  } /* setTop */
-
-  public Point getTop() {
-    return anchor;
-  } /* getTop */
-
-  public void setPeriod(int p) throws NumberFormatException {
-    if (p > 0) {
-      period = p;
-      config.eventEnqueue(this,period); // Enqueue first wakeup time
-    }
-    else
-      throw new NumberFormatException();
-  } /* setPeriod */
-
-  public int getPeriod() {
-    return period;
-  } /* getPeriod */
-
-  public void restart() {
-    config.eventEnqueue(this,period);
-    reverse_color = false;
-    selected = false;
-  } /* restart */
-
-  public int addOutput(Connector c) throws ConnectionException {
-    if (output_count == MAX_OUTPUTS)
-      throw new ConnectionException("ERROR: Maximum outputs established for source");
-    else
-      output[output_count++] = c;
-
-    return output_count;
-  } /* addOutput */
-
-  public int addInput(Connector c) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to add input to source");
-  } /* addInput */
-
-  public Connector getOutput(int i) throws ConnectionException {
-    if ((i < 0) || (i >= output_count))
-      throw new ConnectionException("ERROR: Bad output index for source");
-    else
-      return output[i];
-  } /* getOutput */
-
-  public Connector getInput(int i) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to retrieve input from source");
-  } /* getInput */
-
-  public void removeInput(int i) throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to remove input from source");
-  } /* removeInput */
-
-  public void removeOutput(int i) throws ConnectionException {
-    if ((i >= 0) && (i < output_count)) {
-      output[i] = output[output_count-1];
-      --output_count;
-    } else
-      throw new ConnectionException("ERROR: Bad output index for source");
-  } /* removeOutput */
-
-  public int getOutputCount() throws ConnectionException {
-    return output_count;
-  } /* getOutputCount */
-
-  public int getInputCount() throws ConnectionException {
-    throw new ConnectionException("ERROR: Attempted to retrieve input count from source");
-  } /* getInputCount */
-
-  public void event(Source s) throws ConnectionException {
-    throw new ConnectionException("Internal error: event() called on source");
-  } /* event */
-
-  public void wakeup(long t) throws ConnectionException {
-    int i;
-
-    //System.out.println("Source wakeup at: " + java.lang.Long.toString(t));
-    config.eventEnqueue(this,t + period); // enqueue next wakeup time
-
-    // send an event to all outputs
-    for (i = 0; i < output_count; i++)
-      output[i].event(this);
-  } /* wakeup */
-
-  public boolean inBounds() {
-    if (canvas.contains(bottomLeft()) &&
-        canvas.contains(bottomRight()) &&
-        canvas.contains(anchor))
-      return true;
-    else
-      return false;
-  } /* inBounds */
-
-  private Point bottomLeft() {
-    return new Point(anchor.x - WIDTH, anchor.y + HEIGHT);
-  } /* bottomLeft */
-
-  private Point bottomRight() {
-    return new Point(anchor.x + WIDTH, anchor.y + HEIGHT);
-  } /* bottomRight */
-
-  public void write(File f) throws java.io.IOException {
-    char temp[]; // for reading label
-    int i, n;
-
-    f.writeInt(f.SOURCE);
-    f.writeInt(anchor.x);
-    f.writeInt(anchor.y);
-    f.writeInt(period);
-
-    // Write out the associated label
-    n = label.getText().length();
-    f.writeInt(n); // text length
-    temp = new char[n];
-    temp = label.getText().toCharArray();
-
-    for (i = 0; i < n; i++)
-      f.writeChar(temp[i]);
-    f.writeInt(label.getAnchor().x); // label position
-    f.writeInt(label.getAnchor().y);
-  } /* write */
-
-  public void read(File f) throws java.io.IOException {
-    char temp[]; // for reading label
-    int i, n;
-    int label_x, label_y;
-
-    anchor = new Point();
-    anchor.x = f.readInt();
-    anchor.y = f.readInt();
-    period = f.readInt();
-    config.eventEnqueue(this,period); // Enqueue first event
-    p2 = bottomLeft();
-    p3 = bottomRight();
-
-    // get label info
-    n = f.readInt(); // text length
-    label = new EACLabel(canvas,n);
-    temp = new char[n];
-    for (i = 0; i < n; i++)
-      temp[i] = f.readChar();
-    label.setText(java.lang.String.valueOf(temp));
-    label_x = f.readInt();
-    label_y = f.readInt();
-    label.setAnchor(new Point(label_x,label_y));
-    label.setLabelee(this);
-    try {
-      config.addPrimitive(label);
-    } catch (TooManyPrimitivesException tmpe) {
-      // have faith :-)
-    }
-  } /* read */
-}
\ No newline at end of file
diff --git a/java/EAC/System_Manual.doc b/java/EAC/System_Manual.doc
deleted file mode 100644
index 89d76eba720..00000000000
--- a/java/EAC/System_Manual.doc
+++ /dev/null
diff --git a/java/EAC/TooManyPrimitivesException.java b/java/EAC/TooManyPrimitivesException.java
deleted file mode 100644
index d9cb8efa733..00000000000
--- a/java/EAC/TooManyPrimitivesException.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- *  Title:        TooManyPrimitivesException
- *  Description:  An exception class for when an attempt is made to add a
- *                primitives when the maximum number have already been added
- */
-package EAC;
-
-public class TooManyPrimitivesException extends Exception {
-
-  public TooManyPrimitivesException(String msg) {
-    super(msg);
-  }
-}
\ No newline at end of file
diff --git a/java/EAC/Union.java b/java/EAC/Union.java
deleted file mode 100644
index 107390dc560..00000000000
--- a/java/EAC/Union.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- *  Title:        Union
- *  Description:  A binary union operator class for the Event Analysis
- *                Configurator.  Acts as a sort of multiplexor, combining two
- *                event streams into one.
- */
-package EAC;
-import java.awt.*;
-
-public class Union extends Operator {
-
-  public Union(EACPanel p) {
-    super(p);
-  } /* constructor */
-
-  public void draw() throws BoundsException {
-    // the union symbol
-    final char uSymbol = 'U';
-
-    // subtle adjustments to position symbol within circle
-    final int xTweak = 4;
-    final int yTweak = -4;
-
-    char symbol[] = new char[1];
-
-    Graphics g = canvas.getGraphics();
-
-    super.draw();
-    symbol[0] = (char) uSymbol;
-    g.drawChars(symbol,0,1,
-                anchor.x + (int) (DIAMETER / 2) - xTweak,
-                anchor.y + (int) (DIAMETER / 2) - yTweak);
-  } /* draw */
-
-  public void event(Source s) throws ConnectionException {
-    int i;
-
-    //System.out.println("Union event");
-
-    // send an event to all outputs
-    for (i = 0; i < output_count; i++)
-      output[i].event(s);
-  } /* event */
-
-  public void write(File f) throws java.io.IOException {
-    f.writeInt(f.UNION);
-    f.writeInt(anchor.x);
-    f.writeInt(anchor.y);
-  } /* write */
-
-  public void read(File f) throws java.io.IOException {
-    anchor = new Point();
-    anchor.x = f.readInt();
-    anchor.y = f.readInt();
-  } /* read */
-}
\ No newline at end of file
diff --git a/java/EAC/User_Manual.doc b/java/EAC/User_Manual.doc
deleted file mode 100644
index 5f17fc98f37..00000000000
--- a/java/EAC/User_Manual.doc
+++ /dev/null
diff --git a/java/ImageProcessing/filters/Assert.java b/java/ImageProcessing/filters/Assert.java
deleted file mode 100644
index c83f9ca94c0..00000000000
--- a/java/ImageProcessing/filters/Assert.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package imaging.filters;
-
-/**
- * A simple assertion mechanism for asserting validity of
- * arguments.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- */
-class Assert {
-    static public void notFalse(boolean b) 
-                       throws IllegalArgumentException {
-        if(b == false) 
-            throw new IllegalArgumentException(
-                            "boolean expression false");
-    }
-    static public void notNull(Object obj) 
-                       throws IllegalArgumentException {
-        if(obj == null) 
-            throw new IllegalArgumentException("null argument");
-    }
-
-    static public void notFalse(boolean b, String s) 
-                               throws IllegalArgumentException {
-        if(b == false)
-            throw new IllegalArgumentException(s);
-    }
-    static public void notNull(Object obj, String s) 
-                               throws IllegalArgumentException {
-        if(obj == null) 
-            throw new IllegalArgumentException(s);
-    }
-}
diff --git a/java/ImageProcessing/filters/BleachFilter.java b/java/ImageProcessing/filters/BleachFilter.java
deleted file mode 100644
index e9d6a0b9e0e..00000000000
--- a/java/ImageProcessing/filters/BleachFilter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-/**
- * A derivation of RGBImageFilter that bleaches an image.<p>
- *
- * Extent of the bleaching effect is controlled by the only 
- * constructor argument: an integer representing the percentage 
- * of bleaching.  The percentage of bleaching may also be 
- * controlled after instantiation by invoking the 
- * void percent(int) method.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     RGBImageFilter
- */
-public class BleachFilter extends RGBImageFilter implements MedFilter
-{
-  private int percent;
-
-  public BleachFilter()
-    {
-      this(25);
-    }
-  
-  public BleachFilter(int percent) 
-  {
-    Assert.notFalse(percent >= 0 && percent <= 100);
-    this.percent = percent;
-    canFilterIndexColorModel = true;
-  }
-
-  public String info ()
-  {
-    return "Bleaches/Lightens an image";
-  }
-
-    public int  percent()            { return percent;    }
-    public void percent(int percent) { percent = percent; }
-
-    public int filterRGB(int x, int y, int rgb) {
-        DirectColorModel cm = 
-            (DirectColorModel)ColorModel.getRGBdefault();
-
-        int    alpha = cm.getAlpha(rgb);
-        int    red   = cm.getRed  (rgb);
-        int    green = cm.getGreen(rgb);
-        int    blue  = cm.getBlue (rgb);
-        double percentMultiplier = (double)percent/100;
-
-        red   = Math.min((int)
-                (red + (red * percentMultiplier)), 255);
-        green = Math.min((int)
-                (green + (green * percentMultiplier)), 255);
-        blue  = Math.min((int)
-                (blue  + (blue  * percentMultiplier)), 255);
-
-        alpha = alpha << 24;
-        red   = red   << 16;
-        green = green << 8;
-
-        return alpha | red | green | blue;
-    }
-}
diff --git a/java/ImageProcessing/filters/BlurFilter.java b/java/ImageProcessing/filters/BlurFilter.java
deleted file mode 100644
index e071324e491..00000000000
--- a/java/ImageProcessing/filters/BlurFilter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class BlurFilter extends SpatialFilter
-{
-  private int[][] mean_filter;     
-  private int degree_ = 3;
-  
-  public BlurFilter()
-    {
-    }
-
-  public BlurFilter(int degree)
-    {
-      degree_ = degree;
-    }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error");
-	return;
-      }
-
-    System.gc();
-    
-    int[] pixels = new int[columns_*rows_];
-    int pixel = 0, count = 0;
-    int red, green, blue, index;
-    int alpha, n2 = degree_/2;
-
-    profile_timer_.start();
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {
-	   
-	for (int y = 0, i = 0; y < rows_; y++)
-	  {
-	    for (int x = 0; x < columns_; x++, i++)
-	      {	    
-		red = 0; green = 0; blue = 0; count = 0;
-		alpha = (raster_[i] >> 24) & 0xff;
-		
-		for (int y1 = y - n2; y1 < y + n2; y1++)
-		  {
-		    index = y1*columns_;
-		    if (y1 >= 0 && y1 < rows_)
-		      {		
-			for (int x1 = x - n2; x1 < x + n2; x1++)
-			  {
-			    if (x1 >= 0 && x1 < columns_)
-			      {
-				pixel = raster_[index + x1];
-				
-				red += (pixel >> 16) & 0xff;
-				green += (pixel >> 8) & 0xff;
-				blue += (pixel) & 0xff;
-				count++;
-			      }
-			  }
-		      }
-		  }
-		
-		red /= count;
-		green /= count;
-		blue /= count;
-		
-		if (red < 0) red = 0;
-		if (green < 0) green = 0;
-		if (blue < 0) blue = 0 ;
-		
-		if (red > 255) red = 255;
-		if (green > 255) green = 255;
-		if (blue > 255) blue = 255;
-		
-		pixels[i] = (alpha << 24) | (red << 16) | (green << 8) | blue;
-	      }       
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    System.out.println("Finished altering image");
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    consumer.imageComplete(status);
-  }
-  
-  public String info ()
-    {
-      return "Blurs an image.";
-    }
-}
diff --git a/java/ImageProcessing/filters/DarkenFilter.java b/java/ImageProcessing/filters/DarkenFilter.java
deleted file mode 100644
index ea20d15a46b..00000000000
--- a/java/ImageProcessing/filters/DarkenFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class DarkenFilter extends RGBImageFilter implements MedFilter
-{
-  private int percent_;
-
-  public DarkenFilter ()
-  {  
-    percent_ = 50;
-    canFilterIndexColorModel = true;
-  }
-
-  public DarkenFilter(int percent)
-  {  
-    Assert.notFalse(percent >= 0 && percent <= 100);
-    percent_ = percent;
-    canFilterIndexColorModel = true;
-  }
-
-  public String info ()
-  {
-    return "Darkens an image.";
-  }
-
-  public int filterRGB(int x, int y, int rgb)
-  {
-    DirectColorModel cm = 
-      (DirectColorModel)ColorModel.getRGBdefault();
-    
-    int    alpha = cm.getAlpha(rgb);
-    int    red   = cm.getRed  (rgb);
-    int    green = cm.getGreen(rgb);
-    int    blue  = cm.getBlue (rgb);
-    double percentMultiplier = (double)((double)1.0 - (double)percent_/100);
-
-    red   *=  percentMultiplier;
-    blue   *= percentMultiplier;
-    green  *= percentMultiplier;
-    
-    alpha = alpha << 24;
-    red   = red   << 16;
-    green = green << 8;
-    
-    return alpha | red | green | blue;
-  }
-}
diff --git a/java/ImageProcessing/filters/DeSpeckleFilter.java b/java/ImageProcessing/filters/DeSpeckleFilter.java
deleted file mode 100644
index d9bff1de3b5..00000000000
--- a/java/ImageProcessing/filters/DeSpeckleFilter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class DeSpeckleFilter extends SpatialFilter
-{
-  private int degree_ = 3;
-  
-  public DeSpeckleFilter()
-    {
-    }
-
-  public DeSpeckleFilter(int degree)
-    {
-      degree_ = degree;
-    }
-  
-  public String info ()
-  {
-    return "Removes speckles from an image.";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("DeSpeckleFilter Image Error: " + status);
-	return;
-      }
-
-    System.gc();
-    
-    int rsum, bsum, gsum, r, g, b, a;
-    int count, n2, nsq, c2, lcv, lcv2, index;
-    int[] rtab, gtab, btab;
-    int[] pixels = new int[columns_*rows_];
-
-    profile_timer_.start();
-    
-    n2 = degree_/2;
-    nsq = degree_ * degree_;
-
-    rtab = new int[nsq];
-    gtab = new int[nsq];
-    btab = new int[nsq];
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {    
-	for (int y = 0, k = 0; y < rows_; y++)
-	  {
-	    lcv = y + n2;
-	    for (int x = 0; x < columns_; x++, k++)
-	      {	    
-		rsum = gsum = bsum = 0;
-		count = 0;
-		
-		lcv2 = x + n2;
-		for (int y1 = y - n2; y1 < lcv; y1++)
-		  {
-		    index = y1*columns_; 
-		    if (y1 >= 0 && y1 < rows_)
-		      {
-			for (int x1 = x - n2; x1 < lcv2; x1++)
-			  {
-			    if (x1 >= 0 && x1 < columns_)
-			      {
-				int pixel = raster_[index + x1];
-				rtab[count] = (pixel >> 16) & 0xff;
-				gtab[count] = (pixel >> 8) & 0xff;
-				btab[count] = (pixel) & 0xff;
-				count++;
-			      }
-			  }
-		      }
-		  }
-		
-		for (int d = count >> 1; d > 0; d >>= 1)
-		  {
-		    for (int i = d; i < count; i++)
-		      {		    
-			for (int j = i - d; j >= 0 && rtab[j] > rtab[j+d]; j -= d)
-			  {
-			    int t = rtab[j];
-			    rtab[j] = rtab[j + d];
-			    rtab[j + d] = t;			
-			  }
-			
-			for (int j = i - d; j >= 0 && gtab[j] > gtab[j+d]; j -= d)
-			  {
-			    int t = gtab[j];
-			    gtab[j] = gtab[j + d];
-			    gtab[j + d] = t;			
-			  }
-			
-			for (int j = i - d; j >= 0 && btab[j] > btab[j+d]; j -= d)
-			  {
-			    int t = btab[j];
-			    btab[j] = btab[j + d];
-			    btab[j + d] = t;			
-			  }
-		      }
-		  }
-		
-		c2 = count >> 1;
-		
-		a = (raster_[k] >> 24) & 0xff;
-		r = ( (count % 2 == 0) ? (rtab[c2] + rtab[c2 - 1]) >> 1 : rtab[c2]);
-		g = ( (count % 2 == 0) ? (gtab[c2] + gtab[c2 - 1]) >> 1 : gtab[c2]);
-		b = ( (count % 2 == 0) ? (btab[c2] + btab[c2 - 1]) >> 1 : btab[c2]);
-		
-		pixels[k] = (a << 24) | (r << 16) | (g << 8) | b;
-	      }
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);	
-    consumer.imageComplete(status);
-  }
-
-}
diff --git a/java/ImageProcessing/filters/DissolveFilter.java b/java/ImageProcessing/filters/DissolveFilter.java
deleted file mode 100644
index 0225aad6ad1..00000000000
--- a/java/ImageProcessing/filters/DissolveFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-/**
- * A derivation of RGBImageFilter that partially or wholly
- * dissolves an image.<p>
- *
- * Extent of dissolving is set by the setOpacity(int) method,
- * which is passed an integer between 0 and 255 (inclusive).
- * The integer represents the alpha value to be applied to
- * every color in the image.<p>
- *
- * An alpha value of 255 signifies an opaque color, while an
- * alpha value of 0 signifies a translucent color.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     RGBImageFilter
- */
-public class DissolveFilter extends RGBImageFilter implements MedFilter
-{
-  private int opacity;
-
-  public DissolveFilter() {
-        this(0);
-    }
-    public DissolveFilter(int opacity) {
-        canFilterIndexColorModel = true;
-        setOpacity(opacity);
-    }
-  public String info ()
-  {
-    return "Dissolves an image";
-  }  
-  public void setOpacity(int opacity) {
-        Assert.notFalse(opacity >= 0 && opacity <= 255);
-        this.opacity = opacity;
-    }
-    public int filterRGB(int x, int y, int rgb) {
-        DirectColorModel cm = 
-            (DirectColorModel)ColorModel.getRGBdefault();
-        int alpha = cm.getAlpha(rgb);
-        int red   = cm.getRed  (rgb);
-        int green = cm.getGreen(rgb);
-        int blue  = cm.getBlue (rgb);
-
-        alpha = opacity;
-
-        return alpha << 24 | red << 16 | green << 8 | blue;
-    }
-}
diff --git a/java/ImageProcessing/filters/EdgeDetectFilter.java b/java/ImageProcessing/filters/EdgeDetectFilter.java
deleted file mode 100644
index 87cc88d475d..00000000000
--- a/java/ImageProcessing/filters/EdgeDetectFilter.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class EdgeDetectFilter extends SpatialFilter
-{
-  public EdgeDetectFilter()
-  {
-  }
-  
-  public String info ()
-  {
-    return "Edge detection filter.";
-  }
-
-  public void imageComplete(int status)
-    {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error");
-	return;
-      }
-
-    System.gc();
-    
-    int[] pixels = new int[columns_*rows_];
-    int pixel = 0;
-    int red, green, blue;
-    int row1, row2, row3;
-    int new_red1 = 0, new_green1 = 0, new_blue1 = 0,
-      new_red2 = 0, new_green2 = 0, new_blue2 = 0;
-    int ul, um, ur, ll, lm, lr, ml, mr;
-    int alpha, lcv, lcv2;
-
-    profile_timer_.start();
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {
-	lcv = rows_ - 1;
-	lcv2 = columns_ - 1;
-	for (int x = 1, index = 0; x < lcv; x++, index += columns_)
-	  {
-	    for (int y = 1; y < lcv2; y++)
-	      {
-		row1 = index + y;
-		row2 = row1 + columns_;
-		row3 = row2 + columns_;
-		
-		ul = raster_[row1 - 1];
-		um = raster_[row1];
-		ur = raster_[row1 + 1];
-		ml = raster_[row2 - 1];
-		mr = raster_[row2 + 1];
-		ll = raster_[row3 - 1];
-		lm = raster_[row3];
-		lr = raster_[row3 + 1];
-		
-		alpha = (raster_[row2] >> 24) & 0xff;
-		
-		new_red1 =
-		  (((ul >> 16) & 0xff)
-		   + (((um >> 16) & 0xff) << 1)
-		   + ((ur >> 16) & 0xff)
-		   - ((ll >> 16) & 0xff)
-		   - (((lm >> 16) & 0xff) << 1)
-		   - ((lr >> 16) & 0xff));
-		
-		new_green1 =
-		  (((ul >> 8) & 0xff)
-		   + (((um >> 8) & 0xff) << 1)
-		   + ((ur >> 8) & 0xff)
-		   - ((ll >> 8) & 0xff)
-		   - (((lm >> 8) & 0xff) << 1)
-		   - ((lr >> 8) & 0xff));
-		
-		new_blue1 =
-		  (((ul) & 0xff)
-		   + (((um) & 0xff) << 1)
-		   + ((ur) & 0xff)
-		   - ((ll) & 0xff)
-		   - (((lm) & 0xff) << 1)
-		   - ((lr) & 0xff));
-		
-		new_red2 =
-		  (- ((ul >> 16) & 0xff)
-		   + ((ur >> 16) & 0xff)
-		   - (((ml >> 16) & 0xff) << 1)
-		   + (((mr >> 16) & 0xff) << 1)
-		   - ((ll >> 16) & 0xff)
-		   + ((lr >> 16) & 0xff));
-		
-		new_green2 =
-		  (- ((ul >> 8) & 0xff)
-		   + ((ur >> 8) & 0xff)
-		   - (((ml >> 8) & 0xff) << 1)
-		   + (((mr >> 8) & 0xff) << 1)
-		   - ((ll >> 8) & 0xff)
-		   + ((lr >> 8) & 0xff));
-		
-		new_blue2 =
-		  (- ((ul) & 0xff)
-		   + ((ur) & 0xff)
-		   - (((ml) & 0xff) << 1)
-		   + (((mr) & 0xff) << 1)
-		   - ((ll) & 0xff)
-		   + ((lr) & 0xff));
-		
-		
-		new_red1 = (int)Math.sqrt(new_red1*new_red1 + new_red2*new_red2);
-		new_green1 = (int)Math.sqrt(new_green1*new_green1 + new_green2*new_green2);
-		new_blue1 = (int)Math.sqrt(new_blue1*new_blue1 + new_blue2*new_blue2);
-		
-		if (new_red1 < 0) red = 0;
-		if (new_green1 < 0) green = 0;
-		if (new_blue1 < 0) blue = 0 ;
-		
-		
-		if (new_red1 > 255)
-		  new_red1 = 255;
-		
-		if (new_green1 > 255)
-		  new_green1 = 255;
-		
-		if (new_blue1 > 255)
-		  new_blue1 = 255;
-		
-		pixels[row2] = (alpha << 24) | (new_red1 << 16) | (new_green1 << 8) | new_blue1;		
-	      }
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    consumer.imageComplete(status);
-  }
-
-  /*
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error");
-	return;
-      }
-    
-    int[][] pixels = new int[rows_*columns_];
-    int pixel = 0;
-    int red, green, blue;
-    int row1, row2, row3, row4, row5;
-    int a, b, c, d, rsum, gsum, bsum, v, maxv = 0;
-    int ul, um, ur, ml, mr, ll, lm, lr, lcv, lcv2;
-    int alpha;
-
-    lcv = rows_ -1;
-    for (int y = 1; y < lcv; y++)
-      {
-	lcv2 = columns_ -1;
-	for (int x = 1; x < lcv2; x++)
-	  {
-	    row1 = columns_*(y-1) + x;
-	    row2 = row1 + columns_;
-	    row3 = row2 + columns_;
-	    ul = raster_[row1 - 1];
-	    um = raster_[row1];
-	    ur = raster_[row1 + 1];
-	    ml = raster_[row2 - 1];
-	    mr = raster_[row2 + 1];
-	    ll = raster_[row3 - 1];
-	    lm = raster_[row3];
-	    lr = raster_[row3 + 1];
-
-	    alpha = defaultRGB_.getAlpha(raster_[row2]);
-
-	    a = ((lr >> 16) & 0xff) - ((ul >> 16) & 0xff);
-	    b = ((mr >> 16) & 0xff) - ((ml >> 16) & 0xff);
-	    c = ((ur >> 16) & 0xff) - ((ll >> 16) & 0xff);
-	    d = ((um >> 16) & 0xff) - ((lm >> 16) & 0xff);
-
-	    rsum = a + b + c;
-	    if (rsum < 0) rsum = -rsum;
-	    a = a - c - d;
-	    if (a < 0) a  = -a;
-	    if (rsum > a) rsum = a;
-	    rsum /= 3;
-	    
-	    a = ((lr >> 8) & 0xff) - ((ul >> 8) & 0xff);
-	    b = ((mr >> 8) & 0xff) - ((ml >> 8) & 0xff);
-	    c = ((ur >> 8) & 0xff) - ((ll >> 8) & 0xff);
-	    d = ((um >> 8) & 0xff) - ((lm >> 8) & 0xff);
-
-	    gsum = a + b + c;
-	    if (gsum < 0) gsum = -gsum;
-	    a = a - c - d;
-	    if (a < 0) a  = -a;
-	    if (gsum > a) gsum = a;
-	    gsum /= 3;
-	    
-	    a = ((lr) & 0xff) - ((ul) & 0xff);
-	    b = ((mr) & 0xff) - ((ml) & 0xff);
-	    c = ((ur) & 0xff) - ((ll) & 0xff);
-	    d = ((um) & 0xff) - ((lm) & 0xff);
-
-	    bsum = a + b + c;
-	    if (bsum < 0) bsum = -bsum;
-	    a = a - c - d;
-	    if (a < 0) a  = -a;
-	    if (bsum > a) bsum = a;
-	    bsum /= 3;
-
-	    pixels[row2] = (alpha << 24) | (rsum << 16) | (gsum << 8) | bsum;
-
-	    v = (((int)(rsum)*11 + ((int)(gsum) << 4) + (int)(bsum)*5) >> 5);
-	    
-	    if (maxv < v)
-	      maxv = v;
-	  }
-	
-      }
-
-    for (int y = 1; y < rows_ - 1; y++)
-      {
-	for (int x = 1; x < columns_ - 1; x++)
-	  {
-	    pixel = pixels[y][x];
-	    alpha = (pixel >> 24) & 0xff;
-	    red = (((pixel >> 16) & 0xff) * 255) / maxv;
-	    green = (((pixel >> 8) & 0xff) * 255) / maxv;
-	    blue = ((pixel & 0xff) * 255) / maxv;
-
-	    if (red < 0) red = 0;
-	    if (green < 0) green = 0;
-	    if (blue < 0) blue = 0 ;
-
-	    if (red > 255) red = 255;
-	    if (green > 255) green = 255;
-	    if (blue > 255) blue = 255;
-
-	    pixels[y*x] = (alpha << 24) | (red << 16) | (green << 8) | blue;
-	  }
-
-	consumer.setPixels(0, y, columns_, 1, defaultRGB_, pixels[y], 0, columns_);
-	}
-      
-    consumer.imageComplete(status);
-  }
-  */
-}
diff --git a/java/ImageProcessing/filters/EmbossFilter.java b/java/ImageProcessing/filters/EmbossFilter.java
deleted file mode 100644
index e6d5833ee39..00000000000
--- a/java/ImageProcessing/filters/EmbossFilter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class EmbossFilter extends SpatialFilter
-{
-  
-  public EmbossFilter()
-  {
-  }
-    
-  public String info ()
-  {
-    return "Embosses an image.";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Emboss: Image Error: " + status);
-	return;
-      }
-
-    System.out.println("Beginning to emboss an image.");
-    System.gc();
-    
-    int[] pixels = new int[columns_*rows_];
-    int pixel = 0;
-    int red, green, blue;
-    int row1, row2, row3, ul, um, ml, mr, lm, lr;
-    int new_grey = 0, lcv, lcv2;
-    int alpha;
-
-    profile_timer_.start();
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {    
-	lcv = rows_ -1;
-	for (int x = 1, index = 0; x < lcv; x++, index += columns_)
-	  {
-	    lcv2 = columns_ - 1;
-	    for (int y = 1; y < lcv2; y++)
-	      {
-		
-		row1 = index + y;
-		row2 = row1 + columns_;
-		row3 = row2 + columns_;
-		
-		ul = raster_[row1 - 1];
-		um = raster_[row1];
-		ml = raster_[row2 - 1];
-		mr = raster_[row2 + 1];
-		lm = raster_[row3];
-		lr = raster_[row3 + 1];
-		
-		alpha = (raster_[row2] >> 24) & 0xff;
-		
-		red = ((- (((ul >> 16) & 0xff) << 1) - ((um >> 16) & 0xff) -
-			((ml >> 16) & 0xff) + ((mr >> 16) & 0xff) +
-			((lm >> 16) & 0xff) + (((lr >> 16) & 0xff) << 1)) >> 3) + 128;
-		
-		green = ((- (((ul >> 8) & 0xff) << 1) - ((um >> 8) & 0xff) -
-			  ((ml >> 8) & 0xff) + ((mr >> 8) & 0xff) +
-			  ((lm >> 8) & 0xff) + (((lr >> 8) & 0xff) << 1)) >> 3) + 128;
-		
-		blue = ((- ((ul & 0xff) << 1) - (um & 0xff) -
-			 (ml & 0xff) + (mr & 0xff) +
-			 (lm & 0xff) + ((lr & 0xff) << 1)) >> 3) + 128;
-		
-		new_grey = (((int)(red)*11 + ((int)(green) << 4) + (int)(blue)*5) >> 5);
-		
-		pixels[row2] = (alpha << 24) | (new_grey << 16) | (new_grey << 8) | new_grey;
-		
-	      }
-	  }
-      }
-
-    profile_timer_.stop();
-	
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    //    System.out.println(timer);
-    consumer.imageComplete(status);
-  }
-}
diff --git a/java/ImageProcessing/filters/MedFilter.java b/java/ImageProcessing/filters/MedFilter.java
deleted file mode 100644
index def0bd2075a..00000000000
--- a/java/ImageProcessing/filters/MedFilter.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package imaging.filters;
-
-public interface MedFilter
-{
-  String info ();
-}
diff --git a/java/ImageProcessing/filters/OilPaintFilter.java b/java/ImageProcessing/filters/OilPaintFilter.java
deleted file mode 100644
index 68bcf79e5c2..00000000000
--- a/java/ImageProcessing/filters/OilPaintFilter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package imaging.filters; 
-
-import java.awt.image.*; 
-
-public class OilPaintFilter extends SpatialFilter 
-{
-  private int degree_ = 3; 
-
-  public OilPaintFilter() 
-    {
-    }
-
-  public OilPaintFilter(int degree)
-    {
-      degree_ = degree;
-    }
-
-  public String info ()
-  {
-    return "Converts an image into an oil painting.";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Oil Paint FilterImage Error: " + status);
-	return;
-      }
-
-    System.gc();
-    
-    int[] pixels = new int[columns_*rows_];
-    int[] nnrect = new int[degree_*degree_];
-    int offset = degree_/2, cnt = 0, maxcnt = 0, col = 0, tmp;
-    int lcv1 = rows_,
-      lcv2 = columns_,
-      lcv3 = degree_*degree_;
-    
-    profile_timer_.start();
-    
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {
-	for (int y = 0, index = 0; y < lcv1; y++)
-	  {
-	    for (int x = 0; x < lcv2; x++, index++)
-	      {
-		cnt = 0;
-		for (int i = y - offset; i < y + offset; i++)
-		  {
-		    tmp = i*columns_;
-		    for (int j = x - offset; j < x + offset; j++, cnt++)
-		      {
-			if (i >= 0 && i < lcv1 && j >= 0 && j < lcv2)
-			  nnrect[cnt] = raster_[tmp + j];
-			else
-			  nnrect[cnt] = -1;
-		      }		    
-		  }
-		
-		maxcnt = 0;
-		col = 0;
-		cnt = 0;
-		for (int i = 0; i < lcv3; i++)
-		  {
-		    if (nnrect[i] != -1)
-		      {
-			cnt = 1;
-			
-			for (int j = i+1; j < lcv3; j++)
-			  {
-			    if (nnrect[i] == nnrect[j])
-			      cnt++;
-			  } 
-			
-			if (cnt > maxcnt)
-			  {
-			    col = nnrect[i];
-			    maxcnt = cnt;
-			  }
-		      }
-		  }
-		
-		pixels[index] = col;
-	      }
-	  }
-      }
-
-    System.err.println("Oil Paint should be finished.");
-    
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    consumer.imageComplete(status);
-  }
-}
diff --git a/java/ImageProcessing/filters/PixelizeFilter.java b/java/ImageProcessing/filters/PixelizeFilter.java
deleted file mode 100644
index cdfe768789a..00000000000
--- a/java/ImageProcessing/filters/PixelizeFilter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class PixelizeFilter extends SpatialFilter
-{
-  private int pwidth_ = 4;
-  private int pheight_ = 4;
-
-  public PixelizeFilter()
-    {
-    }
-  
-  public PixelizeFilter(int pwidth, int pheight)
-    {
-      pwidth_ = pwidth;
-      pheight_ = pheight;
-    }
-
-  public String info ()
-  {
-    return "Pixelizes the image.";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Pixelize Image Error: " + status);
-	return;
-      }
-
-    System.gc();
-    
-    int pixel;
-    int nsum, asum, rsum, gsum, bsum, nwide, nhigh, stx, sty, x, y;
-    int x_offset, y_offset, x_extent, y_extent, lcv, lcv2, lcv3, index;
-    int[] results = new int[rows_*columns_];
-
-    profile_timer_.start();
-
-    for (int z = SpatialFilter.iterations_; z-- > 0;)
-      {
-	lcv3 = pwidth_*pheight_;
-	nwide = (columns_ + pwidth_ - 1) / pwidth_;
-	nhigh = (rows_ + pheight_ - 1) / pheight_;
-	
-	stx = -(nwide*pwidth_ - columns_)/2;
-	sty = -(nhigh*pheight_ - rows_)/2;
-	
-	y = sty;
-	for (int i = 0; i < nhigh; i++, y += pheight_)
-	  {
-	    x = stx;	    
-	    for (int j = 0; j < nwide; j++, x += pwidth_)
-	      {
-		nsum = asum = rsum = bsum = gsum = 0;
-		
-		lcv = y + pheight_;
-		lcv2 = x + pwidth_;
-		for (int y1 = y; y1 < lcv; y1++)
-		  {
-		    index = y1*columns_;
-		    for (int x1 = x; x1 < lcv2; x1++)
-		      {
-			if (x1 >= 0 && y1 >= 0 && x1 < columns_ && y1 < rows_)
-			  {
-			    nsum++;
-			    pixel = raster_[index + x1];
-			    
-			    asum += (pixel >> 24) & 0xff;
-			    rsum += (pixel >> 16) & 0xff;
-			    gsum += (pixel >> 8 ) & 0xff;
-			    bsum += pixel & 0xff;
-			  }
-		      }
-		  }
-		
-		if (nsum > 0)
-		  {
-		    rsum /= nsum;
-		    gsum /= nsum;
-		    bsum /= nsum;
-		    
-		    if (asum < 0) asum = 0;
-		    if (rsum < 0) rsum = 0;
-		    if (gsum < 0) gsum = 0;
-		    if (bsum < 0) bsum = 0;
-
-		    if (asum > 255) asum = 255;
-		    if (rsum > 255) rsum = 255;
-		    if (gsum > 255) gsum = 255;
-		    if (bsum > 255) bsum = 255;
-		    
-		  }
-		
-		for (int y1 = y; y1< lcv; y1++)
-		  {
-		    index = y1*columns_;
-		    for (int x1 = x; x1 < lcv2; x1++)
-		      {
-			if (x1 >= 0 && y1 >= 0 && x1 < columns_ && y1 < rows_)
-			  results[index + x1]
-			    = (asum << 24) | (rsum << 16) | (gsum << 8) | bsum;
-		      }
-		  }	    
-	      }	
-	  }
-      }
-    
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, results, 0, columns_);
-    consumer.imageComplete(status);
-  }
-}
diff --git a/java/ImageProcessing/filters/RandomizeFilter.java b/java/ImageProcessing/filters/RandomizeFilter.java
deleted file mode 100644
index 438f79e01c0..00000000000
--- a/java/ImageProcessing/filters/RandomizeFilter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-import java.util.Random;
-
-public class RandomizeFilter extends RGBImageFilter implements MedFilter
-{
-  private static Random rand = new Random(System.currentTimeMillis());
-  
-  public RandomizeFilter ()
-  {  
-    canFilterIndexColorModel = true;
-  }
-
-  public String info ()
-  {
-    return "Randomizes an image.";
-  }
-
-  public int filterRGB(int x, int y, int rgb)
-  {
-    DirectColorModel cm = 
-      (DirectColorModel)ColorModel.getRGBdefault();
-    
-    int    alpha = cm.getAlpha(rgb);
-    int    red   = rand.nextInt() % 255;
-    int    green = rand.nextInt() % 255;
-    int    blue  = rand.nextInt() % 255;
-    
-    alpha = alpha << 24;
-    red   = red   << 16;
-    green = green << 8;
-    
-    return alpha | red | green | blue;
-  }
-}
diff --git a/java/ImageProcessing/filters/RotateFilter.java b/java/ImageProcessing/filters/RotateFilter.java
deleted file mode 100644
index 39551017a4b..00000000000
--- a/java/ImageProcessing/filters/RotateFilter.java
+++ /dev/null
@@ -1,358 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-
-public class RotateFilter extends SpatialFilter
-{
-  private double angle_;
-  private int rotx_, roty_;
-  private int rotheight_, rotwidth_;
-  
-  public RotateFilter ()
-  {
-    this.angle_ = 90.0;
-  }
-
-  public RotateFilter(double angle)
-    {
-      this.angle_ = angle;
-    }
-
-  public String info ()
-    {
-      return "Rotates an image";
-    }
-
-    public void setDimensions(int width, int height)
-    {
-      DoublePoint temp;
-
-      rows_ = height;
-      columns_ = width;
-      
-      // Convert the angle into radians
-      double rotrad = angle_ * Math.PI / (double)180.0;
-      
-      // Compute the corner points after rotation
-      double center_x = (double)(columns_ - 1) / (double)2.0;
-      double center_y = (double)(rows_ - 1) / (double)2.0;
-      
-      // The new top left corner
-      temp = rotatePoint(0, 0, center_x, center_y, rotrad);
-      int rtl_x = (int)(temp.x_ + ((temp.x_ < 0) ? -0.5 : 0.5));
-      int rtl_y = (int)(temp.y_ + ((temp.y_ < 0) ? -0.5 : 0.5));
-      
-      // the new top right corner
-      temp = rotatePoint(0, rows_, center_x, center_y, rotrad);
-      int rtr_x = (int)(temp.x_ + ((temp.x_ < 0) ? -0.5 : 0.5));
-      int rtr_y = (int)(temp.y_ + ((temp.y_ < 0) ? -0.5 : 0.5));
-      
-      // the new bottom left corner
-      temp = rotatePoint(columns_, 0, center_x, center_y, rotrad);
-      int rbl_x = (int)(temp.x_ + ((temp.x_ < 0) ? -0.5 : 0.5));
-      int rbl_y = (int)(temp.y_ + ((temp.y_ < 0) ? -0.5 : 0.5));
-      
-      // the new bottom right corner
-      temp = rotatePoint(columns_, rows_, center_x, center_y, rotrad);
-      int rbr_x = (int)(temp.x_ + ((temp.x_ < 0) ? -0.5 : 0.5));
-      int rbr_y = (int)(temp.y_ + ((temp.y_ < 0) ? -0.5 : 0.5));
-
-      //System.out.println(" ( " + center_x + "," + center_y + " ) ");
-      //System.out.println(" ( " + rtl_x + "," + rtl_y + " ) ");
-      //System.out.println(" ( " + rtr_x + "," + rtr_y + " ) ");
-      //System.out.println(" ( " + rbr_x + "," + rbr_y + " ) ");
-      //System.out.println(" ( " + rbl_x + "," + rbl_y + " ) ");       
-      
-      // rotated bounding box
-      int rbbx1, rbby1;
-      int rbbx = rbbx1 = rtl_x;
-      int rbby = rbby1 = rtl_y;
-      
-      if (rtr_x < rbbx) rbbx = rtr_x;
-      if (rtr_x > rbbx1) rbbx1 = rtr_x;
-      if (rtr_y < rbby) rbby = rtr_y;
-      if (rtr_y > rbby1) rbby1 = rtr_y;
-      
-      if (rbl_x < rbbx) rbbx = rbl_x;
-      if (rbl_x > rbbx1) rbbx1 = rbl_x;
-      if (rbl_y < rbby) rbby = rbl_y;
-      if (rbl_y > rbby1) rbby1 = rbl_y;
-      
-      if (rbr_x < rbbx) rbbx = rbr_x;
-      if (rbr_x > rbbx1) rbbx1 = rbr_x;
-      if (rbr_y < rbby) rbby = rbr_y;
-      if (rbr_y > rbby1) rbby1 = rbr_y;
-      
-      int rbbw = rbbx1 - rbbx;
-      int rbbh = rbby1 - rbby;
-
-      //System.out.println("(rbbx, rbby): " + rbbx + " " + rbby);
-      //System.out.println("(rbbx1, rbby1): " + rbbx1 + " " + rbby1);
-      //System.out.println("(rbbw, rbbh): " + rbbw + " " + rbbh);
-
-      
-      //rbbx--; rbby--; rbbw+=2; rbbh+=2;
-
-      
-      // Ensure we haven't increased the size of the image
-
-      /*
-      int x = rbbx + rbbw - 1, y = rbby + rbbh - 1;
-      if (rbbx < 0) rbbx = 0;
-      if (rbbx > columns_ - 1 ) rbbx = columns_ - 1;
-      if (rbby < 0) rbby = 0;
-      if (rbby > rows_ - 1) rbby = rows_ - 1;
-      */
-      
-      /*
-      
-      if (x < 0) x = 0;
-      if (x > columns_ - 1) x = columns_ - 1;
-      if (y < 0) y = 0;
-      if (y > rows_ - 1) y = rows_ - 1;
-
-      if (x < rbbx) x = rbbx;
-      if (y < rbby) y = rbby;
-      rbbw = (x - rbbx) + 1;
-      rbbh = (y - rbby) + 1;
-
-      */
-      
-      rotx_ = rbbx;
-      roty_ = rbby;
-      rotheight_ = rbbh;
-      rotwidth_ = rbbw;
-
-      //System.out.println("(rotx,roty): " + rotx_ + " " +
-      //		 roty_);
-      //System.out.println("(rotwidth,rotheight): " + rotwidth_ + " " +
-      //		 rotheight_);
-      //System.out.println("(columns,rows): " + columns_ +
-      //		 " " + rows_);
-	    
-      
-      raster_ = new int[columns_*rows_];
-      consumer.setDimensions(rotwidth_, rotheight_);
-    }
-
-  
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error: " + status);
-	return;
-      }
-
-    // For each pixel in the dimensions of the rotated image, if the
-    // inverse rotation falls in the bounds of the original image. If
-    // it does, compute and store an appropriate color, otherwise skip
-    // it.
-
-    System.gc();
-    
-    double xf, yf, px, py, apx, apy;
-    int[] pixels = new int[rotwidth_*rotheight_];
-    int ox, oy, ox1, oy1, index, pixel;
-    double cx = (columns_ - 1) / 2;
-    double cy = (rows_ - 1) / 2;
-    double rotrad = angle_ * Math.PI / 180.0, ang, d;
-    int p0r = 0, p0g = 0, p0b = 0,
-      p1r = 0, p1g = 0,p1b = 0,
-      p2r = 0, p2g = 0, p2b = 0,
-      p3r = 0, p3g = 0, p3b = 0, lcv, lcv2;
-    int rv,gv,bv, alpha;
-    double rd,gd,bd, p0wgt = 0,
-      p1wgt = 0, p2wgt = 0, p3wgt = 0, xfrac, yfrac;
-
-    profile_timer_.start();
-
-    lcv = roty_ + rotheight_;
-    lcv2 = rotx_ + rotwidth_;
-    for (int y = roty_, i = 0; y < lcv; y++)
-      {
-	for (int x = rotx_; x < lcv2; x++, i++)
-	  {
-	    // Inverse rotate the point (x,y)
-	    // Inlining the call to rotatePoint
-	    xf = (double)x;
-	    yf = (double)y;
-	    d = Math.sqrt((xf - cx) * (xf - cx) + (yf - cy) * (yf - cy));
-	    
-	    if ((xf - cx) != 0.0)
-	      {
-		ang = Math.atan((cy-yf)/(xf-cx));
-		if ((xf - cx) < 0)
-		  ang += Math.PI;
-	      }
-	    else
-	      {
-		if ((yf - cy) > 0.0)
-		  ang = (Math.PI * 3.0) / 2;
-		else
-		  ang = Math.PI / 2;
-	      }
-
-	    xf = cx + (d * Math.cos(ang - rotrad));
-	    yf = cy - (d * Math.sin(ang - rotrad));
-	    // end inline
-	    
-	    // Cheat a little
-	    if (xf < 0.0 && xf > -0.5) xf = 0.0;
-	    if (yf < 0.0 && yf > -0.5) yf = 0.0;
-
-	    ox = (int)Math.floor(xf);
-	    oy = (int)Math.floor(yf);
-
-	    if ((ox >= 0) && (oy >= 0) &&
-		(ox < columns_) && (oy < rows_) )
-	      {
-		// The color will be a linear combination of the colors of
-		// the center pixel, its left or right neighbor, its top
-		// or bottom neighbor, and its corner neighbor. Which
-		// neighbors are used is determined by the position of
-		// the fractional part of xf, xy within the 1-unit square
-		// of the pixel.
-
-		/* compute px,py: fractional offset from center of pixel (x.5,y.5) */
-		xfrac = xf - ox;        /* 0 - .9999 */
-		yfrac = yf - oy;
-		px = ((xfrac >= .5) ? (xfrac - .5) : (-.5 + xfrac));
-		py = ((yfrac >= .5) ? (yfrac - .5) : (-.5 + yfrac));
-		apx = ((px < 0) ? -px : px);
-		apy = ((py < 0) ? -py : py);
-		
-		/* get neighbor colors:  p0col, p1col, p2col, p3col */
-		ox1 = ox + ((px < 0.0) ? -1 : 1);
-		oy1 = oy + ((py < 0.0) ? -1 : 1);
-
-		index = oy * columns_ + ox;
-		pixel = raster_[index];
-		alpha = (pixel >> 24) & 0xff;
-		p0r = (pixel >> 16) & 0xff;
-		p0g = (pixel >> 8) & 0xff;
-		p0b = pixel & 0xff;
-
-		if (ox1 >= 0 && ox1 < columns_)
-		  {
-		    index = oy*columns_ + ox1;
-		    pixel = raster_[index];
-		    p1r = (pixel >> 16) & 0xff;
-		    p1g = (pixel >> 8) & 0xff;
-		    p1b = pixel & 0xff;
-		    p1wgt = apx * (1.0 - apy);
-		  }
-		else { p1r=p1g=p1b=0;  p1wgt = 0.0; }
-		
-		if (oy1 >= 0 && oy1 < rows_)
-		  {
-		    index = oy1*columns_ + ox;
-		    pixel = raster_[index];
-		    p2r = (pixel >> 16) & 0xff;
-		    p2g = (pixel >> 8) & 0xff;
-		    p2b = pixel & 0xff;
-		    p2wgt = apx * (1.0 - apy);
-		  }
-		else { p2r=p2g=p2b=0;  p2wgt = 0.0; }
-		
-		if (ox1 >= 0 &&  ox1 < columns_ &&
-		    oy1 >= 0 && oy1 < rows_)
-		  {
-		    index = oy1 * columns_ + ox1;
-		    pixel = raster_[index];
-		    p3r = (pixel >> 16) & 0xff;
-		    p3g = (pixel >> 8) & 0xff;
-		    p3b = pixel & 0xff;
-		    p3wgt = apx * (1.0 - apy);
-		  }
-		else { p3r=p3g=p3b=0;  p3wgt = 0.0; }
-
-		p1wgt = p1wgt * .7;        /* black art */
-		p2wgt = p2wgt * .7;
-		p3wgt = p3wgt * .7;
-		
-		p0wgt = 1.0 - (p1wgt + p2wgt + p3wgt);
-		
-		/* okay, compute and store resulting color */
-		rd = p0r * p0wgt + p1r * p1wgt + p2r * p2wgt + p3r * p3wgt;
-		gd = p0g * p0wgt + p1g * p1wgt + p2g * p2wgt + p3g * p3wgt;
-		bd = p0b * p0wgt + p1b * p1wgt + p2b * p2wgt + p3b * p3wgt;
-		
-		rv = (int) (rd + 0.5);
-		gv = (int) (gd + 0.5);
-		bv = (int) (bd + 0.5);
-		
-		if (rv < 0) rv = 0;
-		if (gv < 0) gv = 0;
-		if (bv < 0) bv = 0 ;
-		
-		if (rv > 255) rv = 255;
-		if (gv > 255) gv = 255;
-		if (bv > 255) bv = 255;
-
-		pixels[i] = (alpha << 24) | (rv << 16) | (gv << 8) | bv;
-	      }	       
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, rotwidth_, rotheight_, defaultRGB_,
-		       pixels, 0, rotwidth_);
-
-    consumer.imageComplete(status);
-  }
-
-  private final static DoublePoint rotatePoint(int x, int y,
-				  double cx, double cy, double rad)
-    {
-      /* rotate point x, y 'rad' radians around cx, cy, return rx, ry */
-      double d, xf, yf, ang, rx, ry;
-
-      xf = (double)x;
-      yf = (double)y;
-
-      // d = distance from the point to the center
-      d = Math.sqrt((xf - cx) * (xf - cx) + (yf - cy) * (yf - cy));
-
-      if ((xf - cx) != 0.0)
-	{
-	  // Compute the angle between the axis and the point in radians
-	  // using the inverse tangent function.
-	  ang = Math.atan((cy-yf)/(xf-cx));
-
-	  // If the x value falls below the axis the angle is between
-	  // PI and 2*PI.
-	  if ((xf - cx) < 0)
-	    ang += Math.PI;
-	}
-      else
-	{
-	  // The point is on the positive y-axis so its angle is 3/2*PI
-	  // I'm guessing this the cooridnate system is flipped in
-	  // screen graphics.
-	  if ((yf - cy) > 0.0)
-	    ang = (Math.PI * 3.0) / 2;
-	  else
-	    ang = Math.PI / 2;
-	}
-
-      rx = cx + (d * Math.cos(ang + rad));
-      ry = cy - (d * Math.sin(ang + rad));
-      
-      return new DoublePoint(rx, ry);
-    }
-}
-
-class DoublePoint
-{
-  public double x_;
-  public double y_;
-
-  DoublePoint(double x, double y)
-    {
-      x_ = x;
-      y_ = y;
-    }
-}
diff --git a/java/ImageProcessing/filters/SharpenFilter.java b/java/ImageProcessing/filters/SharpenFilter.java
deleted file mode 100644
index fcb6f03c7ac..00000000000
--- a/java/ImageProcessing/filters/SharpenFilter.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package imaging.filters;
-
-import java.awt.Color;
-import java.awt.image.*;
-import java.util.*;
-
-public class SharpenFilter extends SpatialFilter
-{
-  float percentage_ = (float)75.0;
-  
-  public SharpenFilter()
-    {
-    }
-  
-  public SharpenFilter(float percentage)
-    {
-      percentage_ = percentage;
-    }
-  
-  public String info ()
-    {
-      return "Sharpens an image.";
-    }
-
-
-  public void imageComplete(int status) 
-    {
-      System.out.println("Image Complete called"); 
-    
-      if (status == IMAGEERROR || status == IMAGEABORTED)  
-	{
-	  consumer.imageComplete(status);  
-	  System.out.println("Image Error"); 
-	  return; 
-	}
-
-      System.gc();
-      
-      float[] hsv = new float[3];
-      int rgb, red, green, blue;
-      int pixel, alpha, lcv, lcv2, lcv3;
-      int[] pixels = new int[columns_*rows_];
-      float fact, ifact, hue, sat, val, vsum;
-      float[] line0 = new float[columns_], 
-	linep1 = new float[columns_],
-	linem1 = new float[columns_],
-	tmpptr;
-      
-      profile_timer_.start();
-      
-      for (int z = 0; z < SpatialFilter.iterations_; z++)
-	{          
-	  fact = percentage_/(float)100.0;
-	  ifact = (float)1.0 - fact;
-	  
-	  for (int x = 0; x < columns_; x++)
-	    {
-	      pixel = raster_[x];
-	      hsv = getHSV(((pixel >> 16) & 0xff), ((pixel >> 8) & 0xff), (pixel & 0xff),hsv);
-	      line0[x] = hsv[2];
-	    }
-	  
-	  lcv = columns_ << 1;
-	  for (int x = columns_, index = 0; x < lcv; x++, index++)
-	    {
-	      pixel = raster_[x];
-	      hsv = getHSV(((pixel >> 16) & 0xff), ((pixel >> 8) & 0xff), (pixel & 0xff),hsv);
-	      linep1[index] = hsv[2];
-	    }
-	  
-	  lcv = columns_ - 1;
-	  lcv2 = rows_ - 1;
-	  for (int y = 1, i = columns_; y < lcv2; y++)
-	    {
-	      tmpptr = linem1;
-	      linem1 = line0;
-	      line0 = linep1;
-	      linep1 = tmpptr;
-	      
-	      lcv3 = columns_*(y+2);
-	      for (int x = columns_*(y+1), index= 0; x < lcv; x++, index++)
-		{
-		  pixel = raster_[x];
-		  // Note hsv is only instantiated once
-		  hsv = getHSV(((pixel >> 16) & 0xff), ((pixel >> 8) & 0xff), (pixel & 0xff), hsv);
-		  linep1[index] = hsv[2];			   
-		}
-	      
-	      i++;
-	      for (int x = 1; x < lcv; x++, i++)
-		{
-		  vsum = (float)0.0;
-		  vsum = linem1[x-1] + linem1[x] + linem1[x+1] +
-		    line0[x-1] + line0[x] + line0[x + 1] + 
-		    linep1[x-1] + linep1[x] + linep1[x + 1];
-		  
-		  pixel = raster_[i];
-		  alpha = (pixel >> 24) & 0xff;
-		  hsv = getHSV(((pixel >> 16) & 0xff), ((pixel >> 8) & 0xff), (pixel & 0xff), hsv);
-		  
-		  val = ((hsv[2] - (fact * vsum) / 9) / ifact);	      
-		  if (val < 1.0)
-		    {
-		      if (val < 0.0)
-			val = (float)0.0;
-		    }
-		  else
-		    val = (float)1.0;
-		  
-		  hsv[2] = val;
-		  rgb = getRGB(hsv[0], hsv[1], hsv[2]);
-		  
-		  red = (rgb >> 16) & 0xff;
-		  green = (rgb >> 8) & 0xff;
-		  blue = rgb & 0xff;
-		  
-		  if (red < 0) red = 0;
-		  if (green < 0) green = 0;
-		  if (blue < 0) blue = 0 ;
-		  
-		  if (red > 255) red = 255;
-		  if (green > 255) green = 255;
-		  if (blue > 255) blue = 255;
-		  
-		  pixels[i] =
-		    (alpha << 24) | (red << 16) | (green << 8) | blue;
-		}
-	      i++;
-	    }
-	}
-      
-      profile_timer_.stop();
-
-      consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-      
-      System.out.println("Finished altering image");
-      consumer.imageComplete(status);
-    }
-  
-  
-  static private float[] getHSV(int red, int green, int blue, float[] hsv)
-    {
-      float rd, gd, bd, max, min, del, rc, gc, bc, hue, sat;
-      if (hsv == null)
-	hsv = new float[3];
-      
-      /* convert RGB to HSV */ 
-      rd = red / (float)255.0;            /* rd,gd,bd range 0-1 instead of 0-255 */
-      gd = green / (float)255.0; 
-      bd = blue / (float)255.0; 
-
-      /* compute maximum of rd,gd,bd */
-      if (rd >= gd)
-	{
-	  if (rd >= bd)
-	    max = rd;
-	  else
-	    max = bd;
-	}
-      else
-	{
-	  if (gd >= bd)
-	    max = gd;
-	  else
-	    max = bd;
-	}
-      
-      /* compute minimum of rd,gd,bd */
-      if (rd<=gd)
-	{
-	  if (rd<=bd)
-	    min = rd;
-	  else
-	    min = bd;
-	}
-      else 
-	{
-	  if (gd<=bd)
-	    min = gd;
-	  else
-	    min = bd;
-	}
-
-      del = max - min;
-      hsv[2] = max;
-
-      if (max != 0.0)
-	sat = (del) / max;
-      else
-	sat = (float)0.0;
-      
-      hue = -1;
-      
-      if (sat != 0.0)
-	{
-	  rc = (max - rd) / del;
-	  gc = (max - gd) / del;
-	  bc = (max - bd) / del;
-
-	  if (rd == max)
-	    hue = bc - gc;
-	  else
-	    if (gd == max)
-	      hue = 2 + rc - bc;
-	    else
-	      if (bd == max)
-		hue = 4 + gc - rc;
-
-	  hue *= 60;
-	  if (hue<0)
-	    hue += 360;
-	}
-
-      hsv[0] = hue;
-      hsv[1] = sat;
-      return hsv;
-    }
-
-  static private int getRGB(float hue, float sat, float val)
-    {
-      int    j, r, g, b;
-      float rd, gd, bd;
-      float f, p, q, t;
-      
-      /* convert HSV back to RGB */
-      if (hue == -1 || sat == 0.0)
-	{
-	  rd = val;  gd = val;  bd = val;
-	}
-      else
-	{
-	  if (hue==(float)360.0) hue = (float)0.0;
-	  hue = hue / (float)60.0;
-	  j = (int) hue;
-	  if (j<0) j=0;          /* either hue or floor seem to go neg on some sys */
-	  f = hue - j;
-	  p = val * (1-sat); // val - sat* val
-	  q = val * (1 - (sat*f)); // val - val*sat*f
-	  t = val * (1 - (sat*(1 - f)));
-	  
-	  switch (j) {
-	  case 0:  rd = val;  gd = t;  bd = p;  break;
-	  case 1:  rd = q;  gd = val;  bd = p;  break;
-	  case 2:  rd = p;  gd = val;  bd = t;  break;
-	  case 3:  rd = p;  gd = q;  bd = val;  break;
-	  case 4:  rd = t;  gd = p;  bd = val;  break;
-	  case 5:  rd = val;  gd = p;  bd = q;  break;
-	  default: rd = val;  gd = t;  bd = p;  break;  /* never happen */
-	  }
-	}
-      r = (int)(rd * 255.0 + 0.5);
-      g = (int)(gd * 255.0 + 0.5);
-      b = (int)(bd * 255.0 + 0.5);
-      
-      return 0xff000000 | (r << 16) | (g << 8) | b;
-    }
-}  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/ImageProcessing/filters/SpatialFilter.java b/java/ImageProcessing/filters/SpatialFilter.java
deleted file mode 100644
index ad56164819e..00000000000
--- a/java/ImageProcessing/filters/SpatialFilter.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-import JACE.Timers.ProfileTimer;
-
-public class SpatialFilter extends ImageFilter implements MedFilter
-{
-  public SpatialFilter()
-  {
-  }
-  
-  public SpatialFilter(int[][] matrix, int degree)
-  {
-    this(matrix, degree, 1, 0);
-  }
-  
-  public SpatialFilter(int[][] matrix, int degree, int div_factor, int offset)
-  {
-    matrix_ = matrix;
-    div_factor_ = div_factor;
-    offset_ = offset;
-    degree_ = degree;
-  }
-
-  public void setFilter(int[][] matrix, int degree, int div_factor)
-    {
-      matrix_ = matrix;
-      degree_ = degree;
-      div_factor_ = div_factor;
-    }
-  
-  public String info ()
-  {
-    return "Base Filter class. Doesn't do much";
-  }
-
-  public long filterTime()
-    {
-      return profile_timer_.elapsedTime();
-    }
-
-  public static void setTimer(int internal_iterations)
-    {
-      iterations_ = internal_iterations;
-    }
-  
-  public void setDimensions(int width, int height)
-  {
-    rows_ = height;
-    columns_ = width;
-    raster_ = new int[width * height];
-    consumer.setDimensions(width, height);
-  }
-  
-  public void setPixels(int x, int y, int w, int h, ColorModel model,
-                          byte pixels[], int off, int scansize)
-  {
-    int source_offset = off;
-    int dest_offset = y * columns_ + x;
-
-    for (int y_ind = 0; y_ind < h; y_ind++)
-      {
-	for (int x_ind = 0; x_ind < w; x_ind++)
-	  {
-	    raster_[dest_offset] = model.getRGB(pixels[source_offset] & 0xff);
-	    dest_offset++;
-	    source_offset++;
-	  }
-
-	source_offset += (scansize - w);
-	dest_offset += (columns_ - w);
-      }
-  }
-
-  public void setPixels(int x, int y, int w, int h, ColorModel model,
-                          int pixels[], int off, int scansize)
-  {
-    int source_offset = off;
-    int dest_offset = y * columns_ + x;
-    
-    if (model == defaultRGB_)
-      {
-	for (int yc = 0; yc < h; yc++)
-	  {
-	    System.arraycopy(pixels, source_offset, raster_, dest_offset, w);
-	    source_offset += scansize;
-	    dest_offset += columns_;
-	  }
-      }
-    else
-      {
-
-	for (int yc = 0; yc < h; yc++)
-	  {
-	    for (int xc = 0; xc < w; xc++)
-	      {
-		raster_[dest_offset] = model.getRGB(pixels[source_offset]);
-		dest_offset++;
-		source_offset++;
-	      }
-	    source_offset += (scansize - w);
-	    dest_offset += (columns_ - w);
-	  }
-      }
-  }
-  
-  public void setColorModel(ColorModel model)
-  {
-    consumer.setColorModel(defaultRGB_);
-  }
-
-  public void setHints(int hintflags)
-  {
-    consumer.setHints(TOPDOWNLEFTRIGHT
-		      | COMPLETESCANLINES
-		      | SINGLEPASS
-		      | (hintflags & SINGLEFRAME));
-  }
-
-
-  public void imageComplete(int status)
-  {
-    System.out.println("Image Complete called");
-    
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Image Error");
-	return;
-      }
-    
-    int[] pixels = new int[columns_];
-    int[][] new_raster= expandRaster();
-    int pixel = 0;
-    int red, green, blue;
-    int new_red = 0, new_green = 0, new_blue = 0;
-    int alpha;
-
-    for (int x = raster_offset_; x < rows_; x++)
-      {
-	for (int y = raster_offset_; y < columns_; y++)
-	  {
-	    new_red = 0; new_green = 0; new_blue = 0;
-	    alpha = defaultRGB_.getAlpha(new_raster[x][y]);
-	    for (int i = 0; i < degree_; i++)
-	      {
-		for (int j = 0; j < degree_; j++)
-		  {
-		    pixel = new_raster[x + (i - raster_offset_)][y + (j - raster_offset_)];
-		    
-		    red = defaultRGB_.getRed(pixel) * matrix_[i][j];
-		    blue = defaultRGB_.getBlue(pixel) * matrix_[i][j];
-		    green = defaultRGB_.getGreen(pixel) * matrix_[i][j];
-		    
-		    new_red += red;
-		    new_green += green;
-		    new_blue += blue;
-		  }
-	      }
-	    
-	    new_red /= div_factor_;
-	    new_green /= div_factor_;
-	    new_blue /= div_factor_;
-	    
-	    new_red = Math.min(Math.abs(new_red), 255);
-	    new_green = Math.min(Math.abs(new_green), 255);
-	    new_blue = Math.min(Math.abs(new_blue), 255);
-
-	    pixels[y - raster_offset_] =
-	      (alpha << 24) | (new_red << 16) | (new_green << 8) | new_blue;
-	  }
-	
-	consumer.setPixels(0, x - raster_offset_, columns_, 1, defaultRGB_, pixels, 0, columns_);
-      }
-
-    System.out.println("Finished altering image");
-    consumer.imageComplete(status);
-  }
-
-  protected int[][] expandRaster()
-  {
-    int[][] new_raster;
-    int index = 0;
-
-    raster_offset_ = degree_ / 2;
-    new_raster = new int[rows_ + raster_offset_*2][columns_ + raster_offset_*2];
-    
-    for (int x = 0; x < rows_; x++)
-      {
-	for (int y = 0; y < columns_; y++)
-	  {
-	    new_raster[x + raster_offset_][y + raster_offset_] = raster_[index];
-	    index++;
-	  }
-      }
-
-    return new_raster;
-  }
-
-  protected static final int intensity(int rd, int gn, int bl)
-    {
-      return (((int)(rd)*11 + (int)(gn)*16 + (int)(bl)*5) >> 5);
-    }
-
-  protected static int iterations_ = 1;
-  protected static final  ColorModel defaultRGB_ = ColorModel.getRGBdefault();
-  protected int[][] matrix_;
-  protected int[] raster_;
-  protected int rows_ = 0, columns_ = 0;
-  protected int div_factor_ = 1, offset_, degree_;
-  protected int raster_offset_ = 0;
-  protected final ProfileTimer profile_timer_ = new ProfileTimer();
-}
diff --git a/java/ImageProcessing/filters/SpreadFilter.java b/java/ImageProcessing/filters/SpreadFilter.java
deleted file mode 100644
index c78790c9235..00000000000
--- a/java/ImageProcessing/filters/SpreadFilter.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package imaging.filters;
-
-import java.awt.image.*;
-import java.util.Random;
-
-public class SpreadFilter extends SpatialFilter
-{
-  private int pwidth_ = 5;
-  private int pheight_ = 5;
-
-  public SpreadFilter()
-    {
-    }
-  
-  public SpreadFilter(int pwidth, int pheight)
-    {
-      pwidth_ = pwidth;
-      pheight_ = pheight;
-    }
-
-  public String info ()
-  {
-    return "Spreads an image (an effect of being under water).";
-  }
-
-  public void imageComplete(int status)
-  {
-    if (status == IMAGEERROR || status == IMAGEABORTED)
-      {
-	consumer.imageComplete(status);
-	System.out.println("Spread Image Error: " + status);
-	return;
-      }
-
-    System.gc();
-    
-    Random rand = new Random();
-    int[] pixels = new int[columns_*rows_];
-    int d, dx, dy, x1, y1, xrng, xoff, yrng, yoff;
-    int minx, maxx, miny, maxy, rdist, tmp;
-
-    profile_timer_.start();
-
-    for (int z = 0; z < SpatialFilter.iterations_; z++)
-      {    
-	for (int y = 0, i=0; y < rows_; y++)
-	  {
-	    for (int x = 0; x < columns_; x++, i++)
-	      {
-		if (pwidth_ < 0)
-		  {
-		    d = (pwidth_ < 0 ? -pwidth_ : pwidth_);
-		    
-		    minx = x - d;
-		    if (minx < 0)
-		      minx = 0;
-		    
-		    maxx = x + d;
-		    if (maxx >= columns_)
-		      maxx = columns_ - 1;
-		    
-		    tmp = rand.nextInt();
-		    tmp = (tmp < 0 ? -tmp : tmp);
-		    x1 = minx + tmp % ((maxx - minx) + 1);
-		    
-		    miny = y - d;
-		    if (miny < 0)
-		      miny = 0;
-		    
-		    maxy = y + d;
-		    if (maxy >= rows_)
-		      maxy = rows_ - 1;
-		    
-		    rdist = d - (x1 < x ? -(x1 - x) : x1 - x);
-		    if (y - miny > rdist)
-		      miny = (y - rdist);
-		    if (maxy - y > rdist)
-		      maxy = (y + rdist);
-		    
-		    tmp = rand.nextInt();
-		    tmp = (tmp < 0 ? -tmp : tmp);
-		    y1 = miny + tmp % ((maxy - miny) + 1);
-		  }
-		else
-		  {
-		    minx = x - pwidth_;
-		    if (minx < 0)
-		      minx = 0;
-		    
-		    maxx = x + pwidth_;
-		    if (maxx >= columns_)
-		      maxx = columns_ - 1;
-		    
-		    tmp = rand.nextInt();
-		    tmp = (tmp < 0 ? -tmp : tmp);
-		    x1 = minx + tmp % ((maxx - minx) + 1);
-		    
-		    miny = y - pheight_;
-		    if (miny < 0)
-		      miny = 0;
-		    
-		    maxy = y + pheight_;
-		    if (maxx >= columns_)
-		      maxx = columns_ - 1;
-		    
-		    tmp = rand.nextInt();
-		    tmp = (tmp < 0 ? -tmp : tmp);
-		    y1 = miny + tmp % ((maxy - miny) + 1);
-		  }
-		
-		if (x1 >= 0 && y1 >= 0 && x1 < columns_ && y1 < rows_)
-		  {
-		    int pixel = raster_[i];
-		    int alpha = (pixel >> 24) & 0xff;
-		    int red = (pixel >> 16) & 0xff;
-		    int green = (pixel >> 8) & 0xff;
-		    int blue = pixel & 0xff;
-		    
-		    pixels[i] = (alpha << 24) | (red << 16) | (green << 8) | blue;
-		  }
-	      }
-	  }
-      }
-
-    profile_timer_.stop();
-    
-    consumer.setPixels(0, 0, columns_, rows_, defaultRGB_, pixels, 0, columns_);
-    consumer.imageComplete(status);
-  }
-}
diff --git a/java/ImageProcessing/filters/Timer.java b/java/ImageProcessing/filters/Timer.java
deleted file mode 100644
index 609ec8aa366..00000000000
--- a/java/ImageProcessing/filters/Timer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package imaging.filters;
-
-public class Timer
-{
-  long start_time_;
-  long stop_time_;
-  
-  public void start()
-  {
-    start_time_ = System.currentTimeMillis();
-  }
-
-  public void stop()
-  {
-    stop_time_ = System.currentTimeMillis();
-  }
-
-  public String toString()
-  {
-    long total = stop_time_ - start_time_;
-    return "Total Time:" + total + " ms";
-  }
-}
diff --git a/java/ImageProcessing/framework/BaseButton.java b/java/ImageProcessing/framework/BaseButton.java
deleted file mode 100644
index 794670b2f3f..00000000000
--- a/java/ImageProcessing/framework/BaseButton.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import imaging.filters.*;
-
-public class BaseButton extends Panel
-{
-  public BaseButton (String title, String description, ImageApp parent)
-  {
-    this.setLayout (new BorderLayout ());
-    this.button_ = new Button (title);
-    this.add ("Center", this.button_);
-    this.resize (100, 100);
-    this.description_ = description;
-    this.parent_ = parent;
-  }
-
-  public boolean mouseEnter(Event evt, int x, int y)
-  {
-    this.parent_.displayStatus (this.description_);
-    return true;
-  }
-
-  public boolean mouseExit(Event evt, int x, int y)
-  {
-    this.parent_.displayStatus ("");
-    return true;
-  }
-
-  protected ImageApp parent_;
-  private String description_;
-  private Button button_;
-}
-
-class URLDialogButton extends BaseButton
-{
-  public URLDialogButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-    this.openURLFrame_ = new LoadURLFrame ("Open URL <2>", this.parent_);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.openURLFrame_.show ();
-    return true;
-  }
-  private LoadURLFrame openURLFrame_;
-}
-
-// ******************
-// Should continue to remember the password
-// ******************
-class SaveButton extends BaseButton
-{
-  public SaveButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-    this.openURLFrame_ = new SaveURLFrame ("Save Image <2>", this.parent_);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.openURLFrame_.show ();
-    return true;
-  }
-  private SaveURLFrame openURLFrame_;
-}
-
-class ReloadButton extends BaseButton
-{
-  public ReloadButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.reloadFilters ();
-    return true;
-  }
-}
-
-class ApplyButton extends BaseButton
-{
-  public ApplyButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.apply ();
-    return true;
-  }
-}
-
-class ResetButton extends BaseButton
-{
-  public ResetButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.resetImage ();
-    return true;
-  }
-}
-
-class ZoomInButton extends BaseButton
-{
-  public ZoomInButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.zoomFactor (1.6);
-    return true;
-  }
-}
-
-class ZoomOutButton extends BaseButton
-{
-  public ZoomOutButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    this.parent_.zoomFactor (0.625);
-    return true;
-  }
-}
-
-
-class AboutButton extends BaseButton
-{
-  public AboutButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    DialogManager.popDialog (DialogType.ABOUT, null);
-    return true;
-  }
-}
-
-class HelpButton extends BaseButton
-{
-  public HelpButton (String title, String desc, ImageApp parent)
-  {
-    super (title, desc, parent);
-  }
-
-  public boolean action (Event e, Object arg)
-  {
-    DialogManager.popDialog (DialogType.HELP, null);
-    return true;
-  }
-}
-
-class ChoicePanel extends Panel
-{
-  public ChoicePanel (String desc, ImageApp parent)
-  {
-    this.description_ = desc;
-    this.parent_ = parent;
-
-    this.loadFilters ();
-    // Set the layout of the Choice Panel. Note that the Choice Panel
-    // holds the choice button of filters.
-    this.setLayout (new FlowLayout ());
-    this.resize (150, 100);
-  }
-
-  public void choice (Choice choice)
-  {
-    this.choice_ = choice;
-  }
-
-  public Choice choice ()
-  {
-    return this.choice_;
-  }
-
-  public void loadFilters ()
-  {
-    // First remove all components of the panel including the
-    // choices of filters
-    this.removeAll ();
-
-    // Now create new choices
-    this.choice_ = this.parent_.getFilters ();
-
-    // Add the choices to our choice panel
-    this.add (this.choice_);
-  }
-
-  public boolean mouseEnter(Event evt, int x, int y)
-  {
-    MedFilter filter = null;
-    String displayString = null;
-    String filterName = this.choice_.getSelectedItem ();
-
-    if (filterName.compareTo ("Filters:") == 0)
-      displayString = "No filter selected";
-    else
-      {
-	filter = (MedFilter) this.parent_.getFilter (filterName);
-	displayString = filter.info ();
-      }
-    this.parent_.displayStatus (displayString);
-    //    this.parent_.displayStatus (this.description_);
-    return true;
-  }
-
-  public boolean mouseExit(Event evt, int x, int y)
-  {
-    this.parent_.displayStatus ("");
-    return true;
-  }
-  
-  private Choice choice_;
-  private ImageApp parent_;
-  String description_;
-}
-
diff --git a/java/ImageProcessing/framework/BenchmarkApplet.java b/java/ImageProcessing/framework/BenchmarkApplet.java
deleted file mode 100644
index ac125a1d9de..00000000000
--- a/java/ImageProcessing/framework/BenchmarkApplet.java
+++ /dev/null
@@ -1,622 +0,0 @@
-package imaging.framework;
-
-import JACE.Timers.ProfileTimer;
-import imaging.filters.*;
-import java.awt.*;
-import java.awt.image.*;
-import java.applet.*;
-import java.net.*;
-import java.util.*;
-import java.io.*;
-import gjt.*;
-
-public class BenchmarkApplet extends Applet implements Runnable
-{
-  public static final Font GLOBAL_FONT = new Font("Dialog", Font.BOLD, 10);
-  private static final String NEW_LINE = System.getProperty("line.separator");
-  private static final String WELCOME = "Welcome to MedJava Image Processing Benchmarking Tool";
-  private static final String COPYRIGHT = "(c) 1997 Distributed Object Computing Group, Washington Univesity";
-  private static final String ABORT = "Image Processing Tests Aborted";
-  private static final String STOP = "Stop";
-  private static final String START= "Start";
-  private static final String CLEAR= "Clear";
-  private static final String RANDOM= "Create Random Image";
-  private static final int INTERNAL_ITERATIONS = 10;
-  private static final int TRIALS = 1;
-  
-  private List images_, filters_;
-  private TextArea console_;
-  private TextField new_image_;
-  private Button start_button_;
-  private Button stop_button_;
-  private Button clear_button_;
-  private Button random_button_;
-  private ButtonPanel button_panel_ = new ButtonPanel();
-  private Hashtable filter_table_ = new Hashtable();
-  private Hashtable image_table_ = new Hashtable();
-  private Thread benchmarker_;
-  private long elapsed_time_;
-  private SpatialFilter filter_;
-  private Object monitor_ = new Object();
-  
-  public void init()
-    {
-      Panel control_panel = new Panel();
-      Panel sub_panel1 = new Panel();
-      Panel filter_panel = new Panel();
-      Panel image_panel = new Panel();
-      Label image_panel_label = new Label("Images");
-      Label filter_panel_label = new Label("Filters");
-
-      new_image_ = new TextField();
-      console_ = new TextArea();
-      images_ = new List();
-      filters_ = new List();
-
-      console_.setEditable(false);
-      images_.setMultipleSelections(true);
-      filters_.setMultipleSelections(true);
-      console_.setFont(GLOBAL_FONT);
-      images_.setFont(GLOBAL_FONT);
-      filters_.setFont(GLOBAL_FONT);
-      image_panel_label.setFont(GLOBAL_FONT);
-      filter_panel_label.setFont(GLOBAL_FONT);
-      
-      console_.appendText(WELCOME + NEW_LINE);
-      console_.appendText(COPYRIGHT + NEW_LINE);
-      
-      image_panel.setLayout(new BorderLayout());
-      image_panel.add("North", image_panel_label);
-      image_panel.add("Center", images_);
-      image_panel.add("South", new_image_);
-
-      filter_panel.setLayout(new BorderLayout());
-      filter_panel.add("North", filter_panel_label);
-      filter_panel.add("Center", filters_);
-
-      sub_panel1.setLayout(new GridLayout(1, 2, 5, 5));
-      sub_panel1.add(filter_panel);
-      sub_panel1.add(image_panel);
-
-      control_panel.setLayout(new GridLayout(2, 1, 5, 5));
-      control_panel.add(sub_panel1);
-      control_panel.add(console_);
-      
-      setLayout(new BorderLayout());
-
-      stop_button_ = button_panel_.add(STOP);
-      start_button_ = button_panel_.add(START);
-      clear_button_ = button_panel_.add(CLEAR);
-      random_button_ = button_panel_.add(RANDOM);
-
-      stop_button_.disable();
-      add("Center", control_panel);
-      add("South", button_panel_);
-
-      getFilters();
-      getImages();      
-    }
-  
-  synchronized public void run()
-    {
-      Image image;
-      String image_name, filter_name;
-      int image_height, image_width;
-      String[] image_list = images_.getSelectedItems();
-      String[] filter_list = filters_.getSelectedItems();
-      ImageProducer image_source;
-      FilteredImageSource filtered_image;
-      //      BenchmarkFrame bframe = BenchmarkFrame.instance();
-      
-      double cumulative_time;
-      double best_time;
-
-      SpatialFilter.setTimer(INTERNAL_ITERATIONS);
-      console_.appendText(NEW_LINE);
-      console_.appendText("Benchmark tests:  [mem=" +
-			  Runtime.getRuntime().freeMemory() +"/" +
-			  Runtime.getRuntime().totalMemory() +"]"
-			  + NEW_LINE);
-      
-      for (int i = 0; i < image_list.length; i++)
-	{
-
-	  image_name = image_list[i];
-	  image = (Image)image_table_.get(image_name);
-	  
-	  image_width = image.getWidth(this);
-	  image_height = image.getHeight(this);
-	  
-	  console_.appendText("Begining tests for image " + image_name);
-	  console_.appendText(" (size " + image_width + "x" + image_height +
-			      " = " +  image_height*image_width*4 + " bytes )");
-	  console_.appendText(NEW_LINE);
-
-	  console_.appendText(NEW_LINE + " ********** " + NEW_LINE);
-	  //	  bframe.init("Begining tests for image " + image_name, image, image_width, image_height);
-
-	  //	  if (! bframe.isShowing())
-	  //	    bframe.show();
-	  
-	  for (int j = 0; j < filter_list.length; j++)
-	    {
-	      filter_name = filter_list[j];
-	      filter_ = (SpatialFilter)filter_table_.get(filter_name);
-
-	      if (filter_ == null)
-		System.err.println(filter_name + " is null");
-	      
-	      best_time = Double.MAX_VALUE;
-	      cumulative_time = 0;
-	      image_source = image.getSource();
-	      filtered_image = new FilteredImageSource(image.getSource(), filter_);
-
-	      for (int l = 0; l < TRIALS; l++)
-		{
-		  elapsed_time_ = 0;
-		  prepareImage(createImage(filtered_image), this);
-
-		  try
-		    {
-		      //		      synchronized(monitor_)
-		      //			{
-			  while (elapsed_time_ == 0)
-			    {
-			      System.out.println("Waiting for image loading to complete.");
-			      //			      monitor_.wait();
-			      wait();
-			    }
-
-			  System.out.println("Image loading has completed.");
-			  //			}
-		    }
-		  catch(Exception excp)
-		    {
-		      System.out.println(excp);
-		      stop();
-		    }
-		  
-		  cumulative_time = (double)elapsed_time_ / (double)INTERNAL_ITERATIONS;		      
-		  System.out.println(image_name + " " + filter_name + " " +  elapsed_time_);
-
-		  if (best_time > cumulative_time)
-		    best_time = cumulative_time;
-		}
-	      
-	      console_.appendText(filter_name + ": best time from " +
-				  TRIALS + " trials of " + INTERNAL_ITERATIONS +
-				  " iterations equals: " + best_time + " ms");
-	      console_.appendText(NEW_LINE);
-	      Thread.yield();
-	    }
-	  
-	  console_.appendText(NEW_LINE);
-	}
-
-      console_.appendText("Tests concluded." + NEW_LINE);
-
-      //      if (bframe.isShowing())
-      //	bframe.hide();
-      
-      stop_button_.disable();
-      start_button_.enable();
-    }
-
-  synchronized public boolean imageUpdate(Image img, int infoflags, int x, int y,
-			     int width, int height)
-    {
-      System.out.println("Image Update called");
-      
-      boolean return_value = false;
-      try
-	{
-	  if ((infoflags & ALLBITS) != 0 ||
-	      (infoflags & SOMEBITS) != 0)
-	    {
-	      System.out.println("notify called" + width + " " + height);
-	      elapsed_time_ = filter_.filterTime();
-	      return_value = true;
-	      //	      monitor_.notify();
-	      notifyAll();
-	    }
-	  else if ((infoflags & ImageObserver.ABORT) != 0 ||
-		   (infoflags & ERROR) != 0)
-	    {
-	      System.out.println("image error!");
-	      //	      stop();
-	      return_value = true;
-	    }
-	}
-      catch(SecurityException excp)
-	{
-	  System.err.println(excp);
-	}
-
-      return return_value;
-    }
-  
-  public void stop()
-    {
-      try
-	{
-	  if (benchmarker_.isAlive())
-	    {
-	      BenchmarkFrame bframe = BenchmarkFrame.instance();
-
-	      if (bframe.isShowing())
-		bframe.hide();
-	      
-	      System.out.println("Stopping tests...");
-	      benchmarker_.stop();
-	      console_.appendText(NEW_LINE + ABORT + NEW_LINE);	      
-	    }
-	  
-	  start_button_.enable();
-	  stop_button_.disable();
-	}
-      catch(SecurityException exception)
-	{
-	  console_.appendText(NEW_LINE + "Stop Failed." + NEW_LINE);
-	}      
-    }
-
-  public boolean action(Event evt, Object what)
-    {
-      if (what.equals(START))
-	{
-	  boolean proceed = ! (benchmarker_ != null && benchmarker_.isAlive());
-	  
-	  stop_button_.enable();
-	  
-	  if (proceed &&
-	      images_.getSelectedIndexes() != null &&
-	      filters_.getSelectedIndexes() != null)
-	    {
-	      System.out.println("Starting tests...");
-	      start_button_.disable();
-	      benchmarker_ = new Thread(this);
-	      benchmarker_.setPriority(Math.min(Thread.currentThread().getPriority() + 2,
-						Thread.MAX_PRIORITY - 1));
-	      benchmarker_.start();
-	    }
-	}
-      else if (what.equals(STOP))
-	{
-	  stop();
-	}
-      else if (what.equals(CLEAR))
-	{
-	  console_.setText("");
-	  console_.appendText(WELCOME + NEW_LINE);
-	  console_.appendText(COPYRIGHT + NEW_LINE);	  
-	}
-      else if (what.equals(RANDOM))
-	{
-	  RandomImageDialog.instance(this).show();
-	}	
-      else if (evt.target == new_image_)
-	{
-	  getSingleImage(new_image_.getText());
-	}
-	
-
-      return true;
-    }
-
-  private void getSingleImage(String image_url)
-    {
-      Image image;
-      MediaTracker tracker = new MediaTracker(this);
-
-      try
-	{
-	  image = getImage(new URL(image_url));
-	  tracker.addImage(image, 0);
-	  tracker.waitForID(0);
-	      
-	  if (image != null)
-	    {
-	      int index = image_url.lastIndexOf('/');
-	      
-	      if (index != -1)
-		image_url = image_url.substring(index + 1);
-	      
-	      image_table_.put(image_url, image);
-	      images_.addItem(image_url);
-	    }
-	}
-      catch(MalformedURLException e)
-	{
-	  System.err.println(e);
-	}
-      catch(InterruptedException excp)
-	{
-	  System.err.println(excp);
-	}
-
-    }
-  
-  private void getImages()
-    {
-      Image image;
-      String image_list = getParameter("images"), image_url;
-      StringTokenizer str_tok = new StringTokenizer(image_list, ",");
-
-      while (str_tok.hasMoreTokens())
-	{
-	  image_url = str_tok.nextToken();
-	  getSingleImage(image_url);
-	}
-    }
-  
-  private void getFilters()
-    {
-      URL url;
-      Object download;
-      String config_file;
-      String configInfo= null;
-      Choice choice = new Choice ();
-      ImageFilter filter;
-      
-      config_file = getParameter ("configFile");
-      
-      if (config_file == null)
-	config_file = "http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/filter.conf";
-      
-      try
-	{
-	  System.out.println ("Configuration File: " + config_file);
-	  // Create a new URL
-	  url = new URL (config_file);
-	  
-	  // Get the input stream and pipe it to a DataInputStream
-	  DataInputStream iStream = new DataInputStream (url.openStream ());
-	  
-	  // Create a buffer to hold all the data we get
-	  StringBuffer tempBuf = new StringBuffer ();
-	  // Keep reading the data until we are done
-	  String tempString = iStream.readLine ();
-	  while (tempString != null)
-	    {
-	      tempBuf.append (tempString);
-	      tempBuf.append (" ");
-	      tempString = iStream.readLine ();
-	    }
-	  
-	  configInfo = tempBuf.toString ();	  
-	  System.out.println(configInfo);
-	  
-	  if (configInfo != null)
-	    {
-	      StringTokenizer tokens = new StringTokenizer (configInfo);
-	      String fullFilterName = null;
-	      String filterName = null;
-	      // Now parse the string, picking up filter names. Use these
-	      // names to load the actual filters as well add new choices to
-	      // the filter choices.
-	      while (tokens.hasMoreTokens ())
-		{
-		  // Get the next token
-		  fullFilterName = tokens.nextToken ();
-		  filterName = this.extractFilterName (fullFilterName);
-		  
-		  System.out.println ("Loading: " + fullFilterName);
-		  // Load the filter class
-		  Class c = Class.forName (fullFilterName);
-		  //		Class c = this.filterRepository_.load (filter);
-
-		  filter = (ImageFilter)c.newInstance();
-
-		  if (filter instanceof SpatialFilter)
-		    {
-		      // Add the filter to the Filter Repository
-		      filter_table_.put(filterName, filter);
-		      
-		      // Add filter name to the list of filter choices
-		      filters_.addItem (filterName);
-		    }
-		}
-	    }	  
-	}
-      catch (Exception e)
-	{
-	  System.err.println ("Filter not found: " + e);
-	}      
-  }
-
-  private String extractFilterName (String s)
-  {
-    String filterName = null;
-    StringTokenizer tokens = new StringTokenizer (s, ".");
-    while (tokens.hasMoreTokens ())
-      filterName = tokens.nextToken ();
-    return filterName;
-  }
-
-  public void generateRandomImage(String name, int width, int height)
-    {
-      Image image = createImage(width, height);
-      Graphics g = image.getGraphics();
-      FilteredImageSource filtered_image;
-
-      if (g != null)
-	{
-	  ImageFilter filter = new RandomizeFilter();
-	  g.fillRect(0, 0, width, height);
-	  filtered_image = new FilteredImageSource(image.getSource(), filter);
-	  image_table_.put(name, createImage(filtered_image));
-	  images_.addItem(name);
-	}
-    }
-}
-
-class RandomImageDialog extends Frame
-{
-  private static String GENERATE = "Generate";
-  private static String CANCEL = "Cancel";
-  
-  private TextField name_ = new TextField(30),
-  width_ = new TextField(5),
-    height_= new TextField(5);
-  private BenchmarkApplet applet_;
-  private Button generate_button_;
-  private Button cancel_button_;
-  private ButtonPanel button_panel_ = new ButtonPanel();
-  
-  private static RandomImageDialog instance_;  
-
-  public static RandomImageDialog instance(BenchmarkApplet applet)
-    {
-      if (instance_ == null)
-	instance_ = new RandomImageDialog(applet);
-      
-      return instance_;	  
-    }
-
-  protected RandomImageDialog(BenchmarkApplet applet)
-    {
-      super("Generate Random Image");
-      applet_ = applet;
-
-      Panel controls = new Panel();
-      GridBagLayout gb = new GridBagLayout();
-      GridBagConstraints gc = new GridBagConstraints();
-      Label width = new Label("Width: "),
-	height = new Label("Height: "),
-	name = new Label("Name: ");
-
-      reshape (0, 0, 300, 200);
-      
-      controls.setLayout(gb);
-      gc.gridx = 0;
-      gc.gridy = 0;
-      gc.gridwidth = 1;
-      gc.insets = new Insets(5,5,5,5);
-      gc.anchor = GridBagConstraints.WEST;
-      width.setFont(BenchmarkApplet.GLOBAL_FONT);
-      gb.setConstraints(width, gc);
-      controls.add(width);
-
-      gc.gridx = 1;
-      gc.anchor = GridBagConstraints.CENTER;
-      gc.fill = GridBagConstraints.HORIZONTAL;
-      gb.setConstraints(width_, gc);
-      controls.add(width_);
-      
-      gc.gridx = 2;
-      gc.anchor = GridBagConstraints.WEST;
-      gc.fill = GridBagConstraints.NONE;
-      height.setFont(BenchmarkApplet.GLOBAL_FONT);
-      gb.setConstraints(height, gc);
-      controls.add(height);
-
-      gc.gridx = 3;
-      gc.anchor = GridBagConstraints.CENTER;
-      gc.fill = GridBagConstraints.HORIZONTAL;
-      gb.setConstraints(height_, gc);
-      controls.add(height_);
-
-      gc.gridx = 0;
-      gc.gridy = 1;
-      gc.gridwidth = 1;
-      gc.fill = GridBagConstraints.NONE;
-      gc.anchor = GridBagConstraints.WEST;
-      name.setFont(BenchmarkApplet.GLOBAL_FONT);
-      gb.setConstraints(name, gc);
-      controls.add(name);
-
-      gc.gridx = 1;
-      gc.gridwidth = GridBagConstraints.REMAINDER;
-      gc.anchor = GridBagConstraints.CENTER;
-      gc.fill = GridBagConstraints.HORIZONTAL;
-      gb.setConstraints(name_, gc);
-      controls.add(name_);
-      
-      setLayout(new BorderLayout());
-      generate_button_ = button_panel_.add(GENERATE);
-      cancel_button_ = button_panel_.add(CANCEL);
-      add("Center", controls);
-      add("South", button_panel_);
-
-    }
-
-  public boolean action(Event evt, Object what)
-    {
-      if (what.equals(GENERATE))
-	{
-	  String width = width_.getText(),
-	    height = height_.getText(),
-	    name = name_.getText();
-	  
-	  try
-	    {
-	      int width_num = Integer.parseInt(width),
-		height_num = Integer.parseInt(height);
-
-	      applet_.generateRandomImage(name, width_num, height_num);
-	      dispose();		      	      
-	    }
-	  catch(NumberFormatException nfe)
-	    {
-	      width_.setText("");
-	      height_.setText("");
-	    }
-	}
-      else if (what.equals(CANCEL))
-	dispose();
-
-      return true;
-    }  
-}
-
-class BenchmarkFrame extends Frame
-{
-  private String desc_;
-  private Image image_;
-  private int height_, width_;
-  private static BenchmarkFrame instance_;
-  private static final Font FONT = new Font("Dialog", Font.BOLD, 12);
-  
-  public static BenchmarkFrame instance()
-    {
-      if (instance_ == null)
-	instance_ = new BenchmarkFrame();
-      
-      return instance_;	  
-    }
-  
-  public void init(String desc, Image image, int width, int height)
-    {
-      reshape(0, 0, width, height + 50);
-      setImage(desc, image);
-    }
-  
-  public void setImage(String desc, Image image)
-    {/*
-      try
-	{
-	  MediaTracker tracker = new MediaTracker(this);
-	  tracker.addImage(image, 0);
-	  tracker.waitForID(0);
-	}
-      catch(InterruptedException excp)
-	{
-	}
-	*/     
-      desc_ = desc;
-      image_ = image;
-    }
-
-  public void paint(Graphics g)
-    {
-      g.setColor(Color.black);
-      g.setFont(FONT);
-      g.drawImage(image_, 0, 50, this);      
-      g.drawString(desc_, 5, 40);
-    }
-  
-  protected BenchmarkFrame()
-    {
-      super("Benchmark Frame");
-    }
-}
diff --git a/java/ImageProcessing/framework/DialogManager.java b/java/ImageProcessing/framework/DialogManager.java
deleted file mode 100644
index cca0c037af1..00000000000
--- a/java/ImageProcessing/framework/DialogManager.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.applet.*;
-import java.util.*;
-import java.io.*;
-import java.net.*;
-
-class DialogManager
-{
-  public static void initialize (Applet parent)
-  {
-    codeBase_ = parent.getCodeBase ().toString ();
-    aboutFrame_ = new AboutFrame ();
-    helpFrame_ = new HelpFrame (codeBase_);
-  }
-
-  public static void popDialog (int type, String message)
-  {
-    Frame frame = null;
-    
-    switch (type)
-      {
-      case DialogType.ABOUT:
-	aboutFrame_.show ();
-	break;
-      case DialogType.HELP:
-	helpFrame_.show ();
-	break;
-      case DialogType.MALFORMED_URL:
-      case DialogType.NOT_SUPPORTED:
-      case DialogType.URL_NOT_FOUND:
-	frame = new MessageFrame ("Error", message);
-	break;
-      case DialogType.NOT_YET_IMPLEMENTED:
-	frame = new MessageFrame ("", message);
-	break;
-      }
-    Dimension d = Toolkit.getDefaultToolkit ().getScreenSize ();
-    frame.move ((d.width - frame.size ().width)/2,
-		(d.height - frame.size ().height)/2);
-    frame.show ();
-  }
-
-  private static String codeBase_ = "";
-  private static AboutFrame aboutFrame_;
-  private static HelpFrame helpFrame_;
-}
-
-class MessageFrame extends Frame
-{
-  public MessageFrame (String title, String message)
-  {
-    super (title);
-
-    this.resize (message.length () * 8, 100);
-    this.setLayout (new BorderLayout ());
-
-    this.text_ = new TextField (message);
-    this.text_.setEditable (false);
-
-    Panel okButtonPanel = new Panel ();
-    okButtonPanel.add (this.okButton_);
-    okButtonPanel.resize (100, 100);
-    
-    this.add ("Center", this.text_);
-    this.add ("South", okButtonPanel);
-  }
-
-  public boolean handleEvent (Event evt)
-  {
-    if (evt.id == Event.WINDOW_DESTROY)
-      {
-	this.dispose ();
-	return true;
-      }
-    return super.handleEvent (evt);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.okButton_)
-	  {
-	    this.dispose ();
-	  }
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private Button okButton_ = new Button (" ok ");
-  private TextField text_ = null;
-}
-
-class AboutFrame extends Frame
-{
-  public AboutFrame ()
-  {
-    super ("About");
-    this.resize (300,300);
-    this.setLayout (new BorderLayout ());
-
-    Panel okButtonPanel = new Panel ();
-    okButtonPanel.add (this.okButton_);
-    AboutFrameTextPanel textPanel = new AboutFrameTextPanel ();
-
-    this.add ("Center", textPanel);    
-    this.add ("South", okButtonPanel);
-  }
-
-  // Handle window destroy events
-  public boolean handleEvent (Event evt)
-  {
-    if (evt.id == Event.WINDOW_DESTROY)
-      {
-	this.hide ();
-	return true;
-      }
-    return super.handleEvent (evt);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.okButton_)
-	  {
-	    this.hide ();
-	  }
-	return true;
-      }
-    else
-      return false;
-  }
-  private Button okButton_ = new Button (" ok ");
-}
-
-class AboutFrameTextPanel extends Panel
-{
-  public void paint (Graphics g)
-  {
-    int width = this.size ().width;
-    int height = this.size ().height;
-
-    g.clearRect (0, 0, width, height);
-    this.setBackground (Color.cyan);
-
-    // First draw the title
-    g.setFont (new Font ("TimesRoman", Font.BOLD | Font.ITALIC, 48));
-    FontMetrics fontMetrics = g.getFontMetrics ();
-    int x = (width - fontMetrics.stringWidth (title_))/2;
-    int y = 100;
-
-    Color color = g.getColor ();
-    g.setColor (Color.orange);
-    g.drawString(title_, x+2, y+2);
-    g.setColor (color);
-    g.drawString(title_, x, y);
-
-    // Then draw author's name
-    g.setFont (new Font ("TimesRoman", Font.ITALIC, 24));
-    fontMetrics = g.getFontMetrics ();
-    x = (width - fontMetrics.stringWidth (by_))/2;
-    y += 50;
-    g.drawString(by_, x, y);
-
-    x = (width - fontMetrics.stringWidth (author_))/2;
-    y += 50;
-    g.drawString(author_, x, y);
-
-    // Finally draw other information -- version number etc.
-    g.setFont (new Font ("TimesRoman", Font.ITALIC, 18));
-    fontMetrics = g.getFontMetrics ();
-    x = (width - fontMetrics.stringWidth (info_))/2;
-    y += 50;
-    g.drawString(info_, x, y);
-  }
-
-  private String title_ = "MedJava";
-  private String by_ = "by";
-  private String author_ = "Prashant Jain";
-  private String info_ = "Version 1.0";
-}
-
-class HelpFrame extends Frame
-{
-  public HelpFrame (String codeBase)
-  {
-    super ("Help");
-    this.setBackground (Color.white);
-    this.text_.setEditable (false);
-    Font defaultFont = new Font ("TimesRoman", Font.PLAIN, 14);
-    this.text_.setFont (defaultFont);
-
-    try
-      {
-	URL url = new URL (codeBase + "../ImageProcessing/framework/help.conf");
-	String delim = "\n";
-	
-	// Get the input stream and pipe it to a DataInputStream
-	DataInputStream iStream = new DataInputStream (url.openStream ());
-	
-	// Keep reading the data until we are done
-	String tempString = iStream.readLine ();
-	while (tempString != null)
-	  {
-	    if (tempString.startsWith ("<START>"))
-	      delim = "";
-	    else if (tempString.startsWith ("<END>"))
-	      delim = "\n";
-	    else if (tempString.startsWith ("<TAB>"))
-	      this.text_.appendText ("\t");
-	    else if (tempString.startsWith ("<P>"))
-	      this.text_.appendText ("\n");
-	    else
-	      {
-		this.text_.appendText (tempString);
-		this.text_.appendText (delim);
-	      }
-	    tempString = iStream.readLine ();		
-	  }
-      }
-    catch (MalformedURLException e)
-      {
-	System.err.println (e);
-      }
-    catch (IOException e)
-      {
-	System.err.println (e);
-      }
-    
-    this.resize (600,700);
-    this.setLayout (new BorderLayout ());
-    
-    Panel okButtonPanel = new Panel ();
-    okButtonPanel.add (this.okButton_);
-    this.add ("South", okButtonPanel);
-    this.add ("Center", this.text_);
-  }
-
-  // Handle window destroy events
-  public boolean handleEvent (Event evt)
-  {
-    if (evt.id == Event.WINDOW_DESTROY)
-      {
-	this.hide ();
-	return true;
-      }
-    return super.handleEvent (evt);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.okButton_)
-	  {
-	    this.hide ();
-	  }
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private Vector helpInfo_ = new Vector ();
-  private Button okButton_ = new Button (" ok ");
-  private TextArea text_ = new TextArea ();
-}
-
diff --git a/java/ImageProcessing/framework/DialogType.java b/java/ImageProcessing/framework/DialogType.java
deleted file mode 100644
index c95372c08e1..00000000000
--- a/java/ImageProcessing/framework/DialogType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package imaging.framework;
-
-public class DialogType
-{
-  public static final int ABOUT = 0;
-  public static final int MALFORMED_URL = 1;
-  public static final int URL_NOT_FOUND = 2;
-  public static final int NOT_SUPPORTED = 3;
-  public static final int HELP = 4;
-  public static final int NOT_YET_IMPLEMENTED = 10;
-}
diff --git a/java/ImageProcessing/framework/FileBrowser.java b/java/ImageProcessing/framework/FileBrowser.java
deleted file mode 100644
index 27245b1f2f4..00000000000
--- a/java/ImageProcessing/framework/FileBrowser.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.net.*;
-import java.applet.*;
-import gjt.Separator;
-import gjt.ComponentScroller;
-
-class FileNode extends HierarchyAdapter
-{
-  public FileNode (String name, 
-		   Icon icon, 
-		   boolean root,
-		   ImageApp app)
-  {
-    super (name, icon, root);
-    this.app_ = app;
-  }
-
-  public FileNode (String name, 
-		   Icon icon, 
-		   ListFiles list,
-		   ImageApp app)
-  {
-    super (name, icon);
-    this.list_ = list;
-    this.app_ = app;
-  }
-
-  public ImageApp app ()
-  {
-    return this.app_;
-  }
-
-  public void handleEvent ()
-  {
-    String s = null;
-    String pString = "";
-    Hierarchy p = this.getHierarchyParent ();
-
-    while (p != null)
-      {
-	pString = p.getName () + pString;
-	p = p.getHierarchyParent ();
-      }
-
-    if (pString.endsWith ("/"))
-      s = "http://" +  pString + this.getName ();
-    else
-      s = "http://" + pString + "/" + this.getName ();
-
-    System.out.println ("Opening: " + s);
-
-    // If list is null, then it is a file, else it is a directory and
-    // use list to get the rest of the directory.
-    if (this.list_ == null)
-      this.app_.openURL (s);            // It is a file
-    else
-      this.list_.listFiles (s, this);	// It is a directory. 
-  }
-
-  private ListFiles list_ = null;
-  private ImageApp app_ = null;
-}
-
-class BrowserPanel extends Panel
-{
-  public BrowserPanel (ImageApp parent)
-  {
-    this.resize (300, 300);
-    this.parent_ = parent;
-    this.setLayout (new BorderLayout ());
-  }
-
-  public int initialize (String url, ListFiles list)
-  {
-    String directory = null;
-    int index = -1;
-
-    String pString = list.stripProtocolHeader (url);
-    if (!pString.endsWith ("/"))
-      pString = pString + "/";
-
-    try
-      {
-	Icon dirIcon = new Icon (this.parent_.getCodeBase () + 
-				 "../ImageProcessing/framework/" +
-				 "file03.gif", (Applet) this.parent_);
-	System.out.println (this.parent_.getCodeBase () + 
-			    "../ImageProcessing/framework/" +
-			    "file03.gif");
-	this.root_ = new FileNode (pString,
-				   dirIcon, true, this.parent_);
-      }
-    catch (MalformedURLException e)
-      {
-      }
-
-    int count = list.listFiles (url, this.root_);
-    //    System.out.println ("Count: " + count);
-    if (count > 0)
-      {
-	// Add the root to the component scroller and then add the
-	// component scroller to the panel.
-	this.scroller_ = new ComponentScroller (this.root_);
-	this.add ("Center", this.scroller_);
-      }
-    return count;
-  }
-
-  private FileNode root_ = null;
-  private ImageApp parent_;
-  private ComponentScroller scroller_;
-}
-
-class FileBrowser extends Frame
-{
-  public FileBrowser (String title, ImageApp parent)
-  {
-    super (title);
-    this.resize (300, 300);
-    this.browser_ = new BrowserPanel (parent);
-    this.setLayout (new BorderLayout ());
-
-    this.cancelButton_ = new Button (" cancel ");
-    Panel buttonPanel = new Panel ();
-    buttonPanel.add (this.cancelButton_);
-    buttonPanel.resize (100, 100);
-
-    Panel southPanel = new Panel ();
-    southPanel.setLayout (new BorderLayout ());
-    southPanel.add ("North", new Separator ());
-    southPanel.add ("South", buttonPanel);
-    this.add ("South", southPanel);
-    this.add ("Center", this.browser_);
-  }
-
-  public int initialize (String url, ListFiles list)
-  {
-    return this.browser_.initialize (url, list);
-  }
-
-  // Handle window destroy events
-  public boolean handleEvent (Event evt)
-  {
-    if (evt.id == Event.WINDOW_DESTROY)
-      {
-	this.dispose ();
-	return true;
-      }
-    return super.handleEvent (evt);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.cancelButton_)
-	  {
-	    this.dispose ();
-	  }
-	validate ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private Button cancelButton_;;
-  private BrowserPanel browser_;
-}
diff --git a/java/ImageProcessing/framework/FilePanel.java b/java/ImageProcessing/framework/FilePanel.java
deleted file mode 100644
index f8ffc7dbca8..00000000000
--- a/java/ImageProcessing/framework/FilePanel.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-
-// Create a panel for all the buttons
-class FilePanel extends Panel
-{
-  FilePanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-
-    // First create all the buttons
-    this.URLDialogButton_ = new URLDialogButton ("Open URL", "Download an image", this.parent_);
-    this.saveButton_ = new SaveButton ("Save", "Upload an image", this.parent_);
-
-    // Place the created buttons in the panel
-    this.add (this.URLDialogButton_);
-    this.add (this.saveButton_);
-
-    // Disable the save button for now
-    this.disableSaveButton ();
-    this.resize (400, 400);
-  }
-
-  public void enableSaveButton ()
-  {
-    this.saveButton_.enable ();
-  }
-
-  public void disableSaveButton ()
-  {
-    this.saveButton_.disable ();
-  }
-
-  // All the created buttons
-  private URLDialogButton URLDialogButton_;
-  private SaveButton saveButton_;
-
-  private ImageApp parent_;
-}
-
-// Create a panel for all the buttons
-class ResetPanel extends Panel
-{
-  ResetPanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-
-    // First create all the buttons
-    this.reloadButton_ = new ReloadButton ("Reload Filters", "Reload all filters", this.parent_);
-
-    // **********************
-    // Disable this until it works
-    // **********************
-    this.reloadButton_.disable();
-
-
-    this.resetButton_ = new ResetButton ("Reset", "Reset the image", this.parent_);
-
-
-    // Place the created buttons in the panel
-    this.add (this.resetButton_);
-    this.add (this.reloadButton_);
-
-    this.resize (400, 400);
-  }
-
-  // All the created buttons
-  private ReloadButton reloadButton_;
-  private ResetButton resetButton_;
-
-  private ImageApp parent_;
-}
-
-
-class ZoomPanel extends Panel
-{
-  ZoomPanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-
-    // First create the two zoom buttons
-    this.zoomInButton_ = new ZoomInButton ("<< Zoom in", "Zoom into the image", this.parent_);
-    this.zoomOutButton_ = new ZoomOutButton ("Zoom out >>", "Zoom out of the image", this.parent_);
-
-    // Now add the buttons to the panel
-    this.add (this.zoomInButton_);
-    this.add (this.zoomOutButton_);
-
-    this.resize (100, 100);
-  }
-
-  private ZoomInButton zoomInButton_;
-  private ZoomOutButton zoomOutButton_;
-
-  private ImageApp parent_;
-}
-
-
-class FilterPanel extends Panel
-{
-  FilterPanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-    this.applyButton_ = new ApplyButton ("Apply", "Apply the selected filter", this.parent_);
-
-    // Set the layout of the Choice Panel. Note that the Choice Panel
-    // holds the choice button of filters.
-    this.choicePanel_ = new ChoicePanel ("Select filter", this.parent_);
-
-    this.add (this.applyButton_);
-    this.add (this.choicePanel_);
-    this.resize (200,200);
-  }
-
-  public Choice choice ()
-  {
-    return this.choicePanel_.choice ();
-  }
-
-  public void loadFilters ()
-  {
-    this.choicePanel_.loadFilters ();
-  }
-
-  private ChoicePanel choicePanel_;
-  private ApplyButton applyButton_;
-  private ImageApp parent_;
-}
-
-class HelpPanel extends Panel
-{
-  HelpPanel (ImageApp parent)
-  {
-    this.parent_ = parent;
-
-    this.setLayout (new GridLayout (2, 1));
-
-    this.aboutButton_ = new AboutButton ("About", "About the applet", this.parent_);
-    this.helpButton_ = new HelpButton ("Help", "Help on how to use the applet", this.parent_);
-
-    // Now add the buttons to the panel
-    this.add (this.aboutButton_);
-    this.add (this.helpButton_);
-
-    this.resize (100, 100);
-  }
-
-  private AboutButton aboutButton_;
-  private HelpButton helpButton_;
-
-  private ImageApp parent_;
-}
diff --git a/java/ImageProcessing/framework/FilterTest.java b/java/ImageProcessing/framework/FilterTest.java
deleted file mode 100644
index b1e33482be9..00000000000
--- a/java/ImageProcessing/framework/FilterTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import imaging.filters.Timer;
-
-public class FilterTest
-{
-  public static void main(String[] args)
-  {
-    Timer timer = new Timer();
-    ImageProcessor ip = new ImageProcessor();
-    ImageFilterFactory iff = new ImageFilterFactory();
-    Frame frame = new Frame("Rotate Example");
-    Toolkit tk = Toolkit.getDefaultToolkit();
-    Dimension d = tk.getScreenSize();
-    Image old_image = tk.getImage("myphoto.gif"), image;
-    int image_x, image_y, x = 50, y = 50;
-    Graphics g;
-
-    frame.reshape(d.width/4, d.height/8, d.width/2, 3*d.height/4);
-    frame.show();
-    g = frame.getGraphics();
-    d = frame.size();
-
-    MediaTracker tracker = new MediaTracker(frame);
-    tracker.addImage(old_image, 0);
-    try { tracker.waitForID(0); } catch(InterruptedException excp) {}
-    g.drawImage(old_image, x, y, frame);
-    x += old_image.getWidth(frame) + 50;
-
-    timer.start();
-    image = ip.processImage(old_image, iff.createMeanImageFilter(), frame);
-    timer.stop();
-    System.out.println(timer);
-    g.drawImage(image, x, y, frame);
-    x += old_image.getWidth(frame) + 50;
-
-    timer.start();
-    image = ip.processImage(old_image, iff.createSobelFilter(), frame);
-    timer.stop();
-    System.out.println(timer);
-    g.drawImage(image, x, y, frame);
-    x = 50;
-    y += old_image.getHeight(frame) + 50;
-
-    timer.start();
-    image = ip.processImage(old_image, iff.createEmbossFilter(), frame);
-    timer.stop();
-    System.out.println(timer);
-    g.drawImage(image, x, y, frame);
-    x += old_image.getWidth(frame) + 50;
-
-    image = ip.processImage(old_image, iff.createSharpenFilter(), frame);
-    g.drawImage(image, x, y, frame);
-    x = 50;
-    y += old_image.getHeight(frame) + 50;
-    
-    image = ip.processImage(old_image, iff.createRotateImageFilter(), frame);
-    g.drawImage(image, x, y, frame);
-  }
-}
diff --git a/java/ImageProcessing/framework/GIFHandler.java b/java/ImageProcessing/framework/GIFHandler.java
deleted file mode 100644
index 3d099ba294c..00000000000
--- a/java/ImageProcessing/framework/GIFHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.io.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-
-public class GIFHandler extends BlobWriter
-{
-  public GIFHandler (String filename, Image image, int length)
-  {
-    super (null, length, 0, filename);
-    this.image_ = image;
-  }
-
-  /******************************
-   * Used for HTTP 1.1 PUT authorization
-   *****************************/
-  public GIFHandler (String filename, Image image, int length, String authentication)
-    {
-      super (null, length, 0, filename, authentication);
-      this.image_ = image;
-    }
-  
-  protected int sendRequest ()
-  {
-    if (this.sendHeader () == -1)
-      {
-	ACE.ERROR ("GIFHandler::sendHeader failed.");
-	return -1;
-      }
-    else
-      if (this.sendData () == -1)
-	{
-	  ACE.ERROR ("GIFHandler::sendData failed.");
-	  return -1;
-	}
-    return 0;
-  }
-
-  // Send the data
-  protected int sendData ()
-  {
-
-
-    try
-      {
-	if (this.length_ > 0)
-	  {
-	    OutputStream ostream = this.peer ().outputStream ();
-
-	    this.encoder_ = new GifEncoder (this.image_, ostream);
-
-	    this.encoder_.encode ();
-
-	    ostream.flush();
-
-	    //	this.encoder_ = new GIFEncoder (this.image_);
-	    //	this.encoder_.Write (ostream);
-	  }
-	this.bytesWritten_ = this.length_;
-	  
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR ("Error writing to server");
-      }
-    return 0;
-  }
-
-  GifEncoder encoder_ = null;
-  //  GIFEncoder encoder_ = null;
-  Image image_ = null;
-}
diff --git a/java/ImageProcessing/framework/GifEncoder.java b/java/ImageProcessing/framework/GifEncoder.java
deleted file mode 100644
index 91a3927d95d..00000000000
--- a/java/ImageProcessing/framework/GifEncoder.java
+++ /dev/null
@@ -1,693 +0,0 @@
-// GifEncoder - write out an image as a GIF
-//
-// Transparency handling and variable bit size courtesy of Jack Palevich.
-//
-// Copyright (C) 1996 by Jef Poskanzer <jef@acme.com>.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE.
-//
-// Visit the ACME Labs Java page for up-to-date versions of this and other
-// fine Java utilities: http://www.acme.com/java/
-
-package imaging.framework;
-
-import java.util.*;
-import java.io.*;
-import java.awt.Image;
-import java.awt.image.*;
-
-/// Write out an image as a GIF.
-// <P>
-// <A HREF="/resources/classes/Acme/JPM/Encoders/GifEncoder.java">Fetch the software.</A><BR>
-// <A HREF="/resources/classes/Acme.tar.Z">Fetch the entire Acme package.</A>
-// <P>
-// @see ToGif
-
-public class GifEncoder extends ImageEncoder
-    {
-
-    private boolean interlace = false;
-
-    /// Constructor from Image.
-    // @param img The image to encode.
-    // @param out The stream to write the GIF to.
-    public GifEncoder( Image img, OutputStream out ) throws IOException
-	{
-	super( img, out );
-	}
-
-    /// Constructor from Image with interlace setting.
-    // @param img The image to encode.
-    // @param out The stream to write the GIF to.
-    // @param interlace Whether to interlace.
-    public GifEncoder( Image img, OutputStream out, boolean interlace ) throws IOException
-	{
-	super( img, out );
-	this.interlace = interlace;
-	}
-
-    /// Constructor from ImageProducer.
-    // @param prod The ImageProducer to encode.
-    // @param out The stream to write the GIF to.
-    public GifEncoder( ImageProducer prod, OutputStream out ) throws IOException
-	{
-	super( prod, out );
-	}
-
-    /// Constructor from ImageProducer with interlace setting.
-    // @param prod The ImageProducer to encode.
-    // @param out The stream to write the GIF to.
-    public GifEncoder( ImageProducer prod, OutputStream out, boolean interlace ) throws IOException
-	{
-	super( prod, out );
-	this.interlace = interlace;
-	}
-
-
-    int width, height;
-    int[][] rgbPixels;
-
-    void encodeStart( int width, int height ) throws IOException
-	{
-	this.width = width;
-	this.height = height;
-	rgbPixels = new int[height][width];
-	}
-
-    void encodePixels(
-	int x, int y, int w, int h, int[] rgbPixels, int off, int scansize )
-	throws IOException
-	{
-	// Save the pixels.
-	for ( int row = 0; row < h; ++row )
-	    System.arraycopy(
-		rgbPixels, row * scansize + off,
-		this.rgbPixels[y + row], x, w );
-
-	}
-
-    IntHashtable colorHash;
-
-    void encodeDone() throws IOException
-	{
-	int transparentIndex = -1;
-	int transparentRgb = -1;
-        // Put all the pixels into a hash table.
-        colorHash = new IntHashtable();
-	int index = 0;
-        for ( int row = 0; row < height; ++row )
-            {
-            int rowOffset = row * width;
-            for ( int col = 0; col < width; ++col )
-                {
-                int rgb = rgbPixels[row][col];
-		boolean isTransparent = ( ( rgb >>> 24 ) < 0x80 );
-		if ( isTransparent )
-		    {
-		    if ( transparentIndex < 0 )
-			{
-			// First transparent color; remember it.
-			transparentIndex = index;
-			transparentRgb = rgb;
-			}
-		    else if ( rgb != transparentRgb )
-			{
-			// A second transparent color; replace it with
-			// the first one.
-			rgbPixels[row][col] = rgb = transparentRgb;
-			}
-		    }
-                GifEncoderHashitem item =
-		    (GifEncoderHashitem) colorHash.get( rgb );
-                if ( item == null )
-		    {
-		    if ( index >= 256 )
-			throw new IOException( "too many colors for a GIF" );
-                    item = new GifEncoderHashitem(
-			rgb, 1, index, isTransparent );
-		    ++index;
-		    colorHash.put( rgb, item );
-		    }
-                else
-                    ++item.count;
-                }
-            }
-
-	// Figure out how many bits to use.
-	int logColors;
-	if ( index <= 2 )
-	    logColors = 1;
-	else if ( index <= 4 )
-	    logColors = 2;
-	else if ( index <= 16 )
-	    logColors = 4;
-	else
-	    logColors = 8;
-
-	// Turn colors into colormap entries.
-	int mapSize = 1 << logColors;
-	byte[] reds = new byte[mapSize];
-	byte[] grns = new byte[mapSize];
-	byte[] blus = new byte[mapSize];
-	for ( Enumeration e = colorHash.elements(); e.hasMoreElements(); )
-	    {
-	    GifEncoderHashitem item = (GifEncoderHashitem) e.nextElement();
-	    reds[item.index] = (byte) ( ( item.rgb >> 16 ) & 0xff );
-	    grns[item.index] = (byte) ( ( item.rgb >>  8 ) & 0xff );
-	    blus[item.index] = (byte) (   item.rgb         & 0xff );
-	    }
-
-	GIFEncode(
-	    out, width, height, interlace, (byte) 0, transparentIndex,
-	    logColors, reds, grns, blus );
-	}
-
-    byte GetPixel( int x, int y ) throws IOException
-	{
-	GifEncoderHashitem item =
-	    (GifEncoderHashitem) colorHash.get( rgbPixels[y][x] );
-	if ( item == null )
-	    throw new IOException( "color not found" );
-	return (byte) item.index;
-	}
-
-    static void writeString( OutputStream out, String str ) throws IOException
-        {
-        int len = str.length();
-        byte[] buf = new byte[len];
-        str.getBytes( 0, len, buf, 0 );
-        out.write( buf );
-        }
-
-    // Adapted from ppmtogif, which is based on GIFENCOD by David
-    // Rowley <mgardi@watdscu.waterloo.edu>.  Lempel-Zim compression
-    // based on "compress".
-
-    int Width, Height;
-    boolean Interlace;
-    int curx, cury;
-    int CountDown;
-    int Pass = 0;
-
-    void GIFEncode(
-	OutputStream outs, int Width, int Height, boolean Interlace, byte Background, int Transparent, int BitsPerPixel, byte[] Red, byte[] Green, byte[] Blue )
-	throws IOException
-	{
-	byte B;
-	int LeftOfs, TopOfs;
-	int ColorMapSize;
-	int InitCodeSize;
-	int i;
-
-	this.Width = Width;
-	this.Height = Height;
-	this.Interlace = Interlace;
-	ColorMapSize = 1 << BitsPerPixel;
-	LeftOfs = TopOfs = 0;
-
-	// Calculate number of bits we are expecting
-	CountDown = Width * Height;
-
-	// Indicate which pass we are on (if interlace)
-	Pass = 0;
-
-	// The initial code size
-	if ( BitsPerPixel <= 1 )
-	    InitCodeSize = 2;
-	else
-	    InitCodeSize = BitsPerPixel;
-
-	// Set up the current x and y position
-	curx = 0;
-	cury = 0;
-
-	// Write the Magic header
-	writeString( outs, "GIF89a" );
-
-	// Write out the screen width and height
-	Putword( Width, outs );
-	Putword( Height, outs );
-
-	// Indicate that there is a global colour map
-	B = (byte) 0x80;		// Yes, there is a color map
-	// OR in the resolution
-	B |= (byte) ( ( 8 - 1 ) << 4 );
-	// Not sorted
-	// OR in the Bits per Pixel
-	B |= (byte) ( ( BitsPerPixel - 1 ) );
-
-	// Write it out
-	Putbyte( B, outs );
-
-	// Write out the Background colour
-	Putbyte( Background, outs );
-
-	// Pixel aspect ratio - 1:1.
-	//Putbyte( (byte) 49, outs );
-	// Java's GIF reader currently has a bug, if the aspect ratio byte is
-	// not zero it throws an ImageFormatException.  It doesn't know that
-	// 49 means a 1:1 aspect ratio.  Well, whatever, zero works with all
-	// the other decoders I've tried so it probably doesn't hurt.
-	Putbyte( (byte) 0, outs );
-
-	// Write out the Global Colour Map
-	for ( i = 0; i < ColorMapSize; ++i )
-	    {
-	    Putbyte( Red[i], outs );
-	    Putbyte( Green[i], outs );
-	    Putbyte( Blue[i], outs );
-	    }
-
-	// Write out extension for transparent colour index, if necessary.
-	if ( Transparent != -1 )
-	    {
-	    Putbyte( (byte) '!', outs );
-	    Putbyte( (byte) 0xf9, outs );
-	    Putbyte( (byte) 4, outs );
-	    Putbyte( (byte) 1, outs );
-	    Putbyte( (byte) 0, outs );
-	    Putbyte( (byte) 0, outs );
-	    Putbyte( (byte) Transparent, outs );
-	    Putbyte( (byte) 0, outs );
-	    }
-
-	// Write an Image separator
-	Putbyte( (byte) ',', outs );
-
-	// Write the Image header
-	Putword( LeftOfs, outs );
-	Putword( TopOfs, outs );
-	Putword( Width, outs );
-	Putword( Height, outs );
-
-	// Write out whether or not the image is interlaced
-	if ( Interlace )
-	    Putbyte( (byte) 0x40, outs );
-	else
-	    Putbyte( (byte) 0x00, outs );
-
-	// Write out the initial code size
-	Putbyte( (byte) InitCodeSize, outs );
-
-	// Go and actually compress the data
-	compress( InitCodeSize+1, outs );
-
-	// Write out a Zero-length packet (to end the series)
-	Putbyte( (byte) 0, outs );
-
-	// Write the GIF file terminator
-	Putbyte( (byte) ';', outs );
-	}
-
-    // Bump the 'curx' and 'cury' to point to the next pixel
-    void BumpPixel()
-	{
-	// Bump the current X position
-	++curx;
-
-	// If we are at the end of a scan line, set curx back to the beginning
-	// If we are interlaced, bump the cury to the appropriate spot,
-	// otherwise, just increment it.
-	if ( curx == Width )
-	    {
-	    curx = 0;
-
-	    if ( ! Interlace )
-		++cury;
-	    else
-		{
-		switch( Pass )
-		    {
-		    case 0:
-		    cury += 8;
-		    if ( cury >= Height )
-			{
-			++Pass;
-			cury = 4;
-			}
-		    break;
-
-		    case 1:
-		    cury += 8;
-		    if ( cury >= Height )
-			{
-			++Pass;
-			cury = 2;
-			}
-		    break;
-
-		    case 2:
-		    cury += 4;
-		    if ( cury >= Height )
-			{
-			++Pass;
-			cury = 1;
-			}
-		    break;
-
-		    case 3:
-		    cury += 2;
-		    break;
-		    }
-		}
-	    }
-	}
-
-    static final int EOF = -1;
-
-    // Return the next pixel from the image
-    int GIFNextPixel() throws IOException
-	{
-	byte r;
-
-	if ( CountDown == 0 )
-	    return EOF;
-
-	--CountDown;
-
-	r = GetPixel( curx, cury );
-
-	BumpPixel();
-
-	return r & 0xff;
-	}
-
-    // Write out a word to the GIF file
-    void Putword( int w, OutputStream outs ) throws IOException
-	{
-	Putbyte( (byte) ( w & 0xff ), outs );
-	Putbyte( (byte) ( ( w >> 8 ) & 0xff ), outs );
-	}
-
-    // Write out a byte to the GIF file
-    void Putbyte( byte b, OutputStream outs ) throws IOException
-	{
-	outs.write( b );
-	}
-
-
-    // GIFCOMPR.C       - GIF Image compression routines
-    //
-    // Lempel-Ziv compression based on 'compress'.  GIF modifications by
-    // David Rowley (mgardi@watdcsu.waterloo.edu)
-
-    // General DEFINEs
-
-    static final int BITS = 12;
-
-    static final int HSIZE = 5003;		// 80% occupancy
-
-    // GIF Image compression - modified 'compress'
-    //
-    // Based on: compress.c - File compression ala IEEE Computer, June 1984.
-    //
-    // By Authors:  Spencer W. Thomas      (decvax!harpo!utah-cs!utah-gr!thomas)
-    //              Jim McKie              (decvax!mcvax!jim)
-    //              Steve Davies           (decvax!vax135!petsd!peora!srd)
-    //              Ken Turkowski          (decvax!decwrl!turtlevax!ken)
-    //              James A. Woods         (decvax!ihnp4!ames!jaw)
-    //              Joe Orost              (decvax!vax135!petsd!joe)
-
-    int n_bits;				// number of bits/code
-    int maxbits = BITS;			// user settable max # bits/code
-    int maxcode;			// maximum code, given n_bits
-    int maxmaxcode = 1 << BITS; // should NEVER generate this code
-
-    final int MAXCODE( int n_bits )
-	{
-	return ( 1 << n_bits ) - 1;
-	}
-
-    int[] htab = new int[HSIZE];
-    int[] codetab = new int[HSIZE];
-
-    int hsize = HSIZE;		// for dynamic table sizing
-
-    int free_ent = 0;			// first unused entry
-
-    // block compression parameters -- after all codes are used up,
-    // and compression rate changes, start over.
-    boolean clear_flg = false;
-
-    // Algorithm:  use open addressing double hashing (no chaining) on the
-    // prefix code / next character combination.  We do a variant of Knuth's
-    // algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime
-    // secondary probe.  Here, the modular division first probe is gives way
-    // to a faster exclusive-or manipulation.  Also do block compression with
-    // an adaptive reset, whereby the code table is cleared when the compression
-    // ratio decreases, but after the table fills.  The variable-length output
-    // codes are re-sized at this point, and a special CLEAR code is generated
-    // for the decompressor.  Late addition:  construct the table according to
-    // file size for noticeable speed improvement on small files.  Please direct
-    // questions about this implementation to ames!jaw.
-
-    int g_init_bits;
-
-    int ClearCode;
-    int EOFCode;
-
-    void compress( int init_bits, OutputStream outs ) throws IOException
-	{
-	int fcode;
-	int i /* = 0 */;
-	int c;
-	int ent;
-	int disp;
-	int hsize_reg;
-	int hshift;
-
-	// Set up the globals:  g_init_bits - initial number of bits
-	g_init_bits = init_bits;
-
-	// Set up the necessary values
-	clear_flg = false;
-	n_bits = g_init_bits;
-	maxcode = MAXCODE( n_bits );
-
-	ClearCode = 1 << ( init_bits - 1 );
-	EOFCode = ClearCode + 1;
-	free_ent = ClearCode + 2;
-
-	char_init();
-
-	ent = GIFNextPixel();
-
-	hshift = 0;
-	for ( fcode = hsize; fcode < 65536; fcode *= 2 )
-	    ++hshift;
-	hshift = 8 - hshift;			// set hash code range bound
-
-	hsize_reg = hsize;
-	cl_hash( hsize_reg );	// clear hash table
-
-	output( ClearCode, outs );
-
-	outer_loop:
-	while ( (c = GIFNextPixel()) != EOF )
-	    {
-	    fcode = ( c << maxbits ) + ent;
-	    i = ( c << hshift ) ^ ent;		// xor hashing
-
-	    if ( htab[i] == fcode )
-		{
-		ent = codetab[i];
-		continue;
-		}
-	    else if ( htab[i] >= 0 )	// non-empty slot
-		{
-		disp = hsize_reg - i;	// secondary hash (after G. Knott)
-		if ( i == 0 )
-		    disp = 1;
-		do
-		    {
-		    if ( (i -= disp) < 0 )
-			i += hsize_reg;
-
-		    if ( htab[i] == fcode )
-			{
-			ent = codetab[i];
-			continue outer_loop;
-			}
-		    }
-		while ( htab[i] >= 0 );
-		}
-	    output( ent, outs );
-	    ent = c;
-	    if ( free_ent < maxmaxcode )
-		{
-		codetab[i] = free_ent++;	// code -> hashtable
-		htab[i] = fcode;
-		}
-	    else
-		cl_block( outs );
-	    }
-	// Put out the final code.
-	output( ent, outs );
-	output( EOFCode, outs );
-	}
-
-    // output
-    //
-    // Output the given code.
-    // Inputs:
-    //      code:   A n_bits-bit integer.  If == -1, then EOF.  This assumes
-    //              that n_bits =< wordsize - 1.
-    // Outputs:
-    //      Outputs code to the file.
-    // Assumptions:
-    //      Chars are 8 bits long.
-    // Algorithm:
-    //      Maintain a BITS character long buffer (so that 8 codes will
-    // fit in it exactly).  Use the VAX insv instruction to insert each
-    // code in turn.  When the buffer fills up empty it and start over.
-
-    int cur_accum = 0;
-    int cur_bits = 0;
-
-    int masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
-		    0x001F, 0x003F, 0x007F, 0x00FF,
-		    0x01FF, 0x03FF, 0x07FF, 0x0FFF,
-		    0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
-
-    void output( int code, OutputStream outs ) throws IOException
-	{
-	cur_accum &= masks[cur_bits];
-
-	if ( cur_bits > 0 )
-	    cur_accum |= ( code << cur_bits );
-	else
-	    cur_accum = code;
-
-	cur_bits += n_bits;
-
-	while ( cur_bits >= 8 )
-	    {
-	    char_out( (byte) ( cur_accum & 0xff ), outs );
-	    cur_accum >>= 8;
-	    cur_bits -= 8;
-	    }
-
-	// If the next entry is going to be too big for the code size,
-	// then increase it, if possible.
-       if ( free_ent > maxcode || clear_flg )
-	    {
-	    if ( clear_flg )
-		{
-		maxcode = MAXCODE(n_bits = g_init_bits);
-		clear_flg = false;
-		}
-	    else
-		{
-		++n_bits;
-		if ( n_bits == maxbits )
-		    maxcode = maxmaxcode;
-		else
-		    maxcode = MAXCODE(n_bits);
-		}
-	    }
-
-	if ( code == EOFCode )
-	    {
-	    // At EOF, write the rest of the buffer.
-	    while ( cur_bits > 0 )
-		{
-		char_out( (byte) ( cur_accum & 0xff ), outs );
-		cur_accum >>= 8;
-		cur_bits -= 8;
-		}
-
-	    flush_char( outs );
-	    }
-	}
-
-    // Clear out the hash table
-
-    // table clear for block compress
-    void cl_block( OutputStream outs ) throws IOException
-	{
-	cl_hash( hsize );
-	free_ent = ClearCode + 2;
-	clear_flg = true;
-
-	output( ClearCode, outs );
-	}
-
-    // reset code table
-    void cl_hash( int hsize )
-	{
-	for ( int i = 0; i < hsize; ++i )
-	    htab[i] = -1;
-	}
-
-    // GIF Specific routines
-
-    // Number of characters so far in this 'packet'
-    int a_count;
-
-    // Set up the 'byte output' routine
-    void char_init()
-	{
-	a_count = 0;
-	}
-
-    // Define the storage for the packet accumulator
-    byte[] accum = new byte[256];
-
-    // Add a character to the end of the current packet, and if it is 254
-    // characters, flush the packet to disk.
-    void char_out( byte c, OutputStream outs ) throws IOException
-	{
-	accum[a_count++] = c;
-	if ( a_count >= 254 )
-	    flush_char( outs );
-	}
-
-    // Flush the packet to disk, and reset the accumulator
-    void flush_char( OutputStream outs ) throws IOException
-	{
-	if ( a_count > 0 )
-	    {
-	    outs.write( a_count );
-	    outs.write( accum, 0, a_count );
-	    a_count = 0;
-	    }
-	}
-
-    }
-
-class GifEncoderHashitem
-    {
-
-    public int rgb;
-    public int count;
-    public int index;
-    public boolean isTransparent;
-
-    public GifEncoderHashitem( int rgb, int count, int index, boolean isTransparent )
-	{
-	this.rgb = rgb;
-	this.count = count;
-	this.index = index;
-	this.isTransparent = isTransparent;
-	}
-
-    }
diff --git a/java/ImageProcessing/framework/Hierarchy.java b/java/ImageProcessing/framework/Hierarchy.java
deleted file mode 100644
index 41b1825ef4d..00000000000
--- a/java/ImageProcessing/framework/Hierarchy.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.util.Vector;
-
-public class Hierarchy extends Canvas
-{
-  // Attributes
-  private String name_;
-  private Hierarchy root_;
-  private Hierarchy parent_;
-  private Icon icon_ = null;
-  
-  // State
-  private boolean collapsed_ = true;
-  private boolean deadend_ = true;
-  private Vector contained_ = new Vector();
-  private Rectangle self_;
-  private Rectangle scope_;
-  
-  // Constants
-  private Color COLOR = Color.black;
-  private Font FONT = new Font("Dialog", Font.BOLD, 12);
-  private static int TRI_HEIGHT = 8;
-  private int SPACE = 15;
-
-  static Hierarchy last_lit_ = null;
-  
-  public Hierarchy(String name, boolean root)
-  {
-    name_ = name;
-    
-    if (root)
-      {
-	deadend_ = false;
-	root_ = this;
-	parent_ = null;
-      }
-  }
-  
-  public Hierarchy(String name, Icon icon, boolean root)
-  {
-    this(name, root);
-    icon_ = icon;
-  }
-
-  public Hierarchy(String name)
-  {
-    this(name, false);
-  }
-  
-  public Hierarchy(String name, Icon icon)
-  {
-    this(name, icon, false);
-  }
-
-  public void setExpandable(boolean expandable)
-  {
-    deadend_ = ! expandable;
-
-    /*
-    if (root_ != null)
-      root_.repaint();
-      */
-  }
-
-  public void setCollapsed(boolean collapsed)
-  {
-    collapsed_ = collapsed;
-
-    if (root_ != null)
-      root_.repaint();
-  }
-
-  public void addEntry(Hierarchy entry)
-  {
-    deadend_ = false;
-    entry.parent_ = this;
-    entry.root_ = root_;
-    entry.FONT = FONT;
-    entry.COLOR = COLOR;
-    entry.SPACE = SPACE;
-
-    contained_.addElement(entry);
-  }
-
-  public boolean removeEntry(String name)
-  {
-    if (contained_.size() == 1)
-      deadend_ = true;
-    
-    return contained_.removeElement(name);
-  }
-
-  public String getName()
-  {
-    return name_;
-  }
-
-  public void setName(String name)
-  {
-    name_ = name;
-  }
-
-  public Hierarchy getHierarchyParent()
-  {
-    return parent_;
-  }
-
-  public void setFont(Font font)
-  {
-    FONT = font;
-  }
-
-  public void setColor(Color color)
-  {
-    COLOR = color;
-  }
-
-  public void setSpace(int space)
-  {
-    SPACE = space;
-  }
-
-  public void handleEvent() {}
-
-  public boolean mouseDown(Event evt, int x, int y)
-  {
-    Hierarchy value = mouseInside(x, y);
-
-    if (value != null)
-      {
-	if (! value.deadend_)
-	  {
-	    if (x < value.self_.x + TRI_HEIGHT + SPACE)
-	      {
-		value.collapsed_ = ! value.collapsed_;
-		if (value.contained_.isEmpty())
-		  value.handleEvent();
-		repaint();
-	      }
-	  }
-	else
-	  {
-	    if (value.contained_.isEmpty())
-	      value.handleEvent();
-	  }
-      }
-    
-    return false;
-  }
-  
-  public boolean mouseMove(Event evt, int x, int y)
-  {
-    Hierarchy value = mouseInside(x, y);
-
-    if ((value != last_lit_) && (last_lit_ != null))
-      last_lit_.highlight(getGraphics(), false);
-    
-    if (value != null && value.deadend_)
-      value.highlight(getGraphics(), true);
-    
-    last_lit_ = value;
-    
-    return false;
-  }
-
-  public void paint(Graphics g)
-  {
-    Dimension d = size();
-
-    drawLevel(g, SPACE, SPACE);
-
-    if (d.width < scope_.width || d.height < scope_.height ||
-	d.width > scope_.width || d.height > scope_.height)
-	resize(scope_.width, scope_.height);
-  }
-
-  
-  private Point drawLevel(Graphics g, int x, int y)
-  {
-    g.setFont(FONT);
-    FontMetrics font_metrics = g.getFontMetrics();
-    int string_height = font_metrics.getHeight();
-    int string_width = font_metrics.stringWidth(name_); 
-    int entry_height = string_height;
-    int entry_width = string_width + 2*SPACE + TRI_HEIGHT;
-    int total_height, total_width, initial_x = x, initial_y = y;
-    int indent = SPACE + TRI_HEIGHT/2;
-    int temp_x = x;
-    Point place_marker;
-    Hierarchy entry;
-
-    if (icon_ != null)
-      {
-	entry_height = Math.max(string_height, icon_.iconSize().height);
-	entry_width += icon_.iconSize().width + SPACE;
-	indent += icon_.iconSize().width/2;
-	if (! deadend_)
-	  drawShape(g, x, y + (entry_height - TRI_HEIGHT)/2, deadend_, collapsed_);
-      }
-    else
-      drawShape(g, x, y + (entry_height - TRI_HEIGHT)/2, deadend_, collapsed_);
-    
-    self_ = new Rectangle(initial_x, initial_y, entry_width, entry_height);
-
-    temp_x += TRI_HEIGHT + SPACE;
-
-    if (icon_ != null)
-      {
-	icon_.drawIcon(g, temp_x, y, root_);
-	temp_x += SPACE + icon_.iconSize().width;
-      }
-
-    g.setColor(COLOR);
-   
-    g.drawString(name_, temp_x, y + (entry_height + string_height)/2);
-
-    total_width = entry_width;
-    y += entry_height + SPACE;
-    
-    if (! (deadend_ || collapsed_))
-      {	
-	x += indent;
-	for (int i = 0; i < contained_.size(); i++)
-	  {
-	    entry = (Hierarchy)contained_.elementAt(i);
-	    place_marker = entry.drawLevel(g, x, y);
-	    total_width = Math.max(total_width, entry.scope_.width + indent + SPACE);
-	    x = place_marker.x;
-	    y = place_marker.y;
-	  }
-	x -= indent;
-      }     
-
-    total_height = y - initial_y;
-    scope_ = new Rectangle(initial_x, initial_y, total_width, total_height);
-    
-    return new Point(x, y);
-  }
-
-  private Hierarchy mouseInside(int x, int y)
-  {
-    Hierarchy entry;
-    Hierarchy return_value = null;
-
-    if (self_.inside(x, y))
-      {
-	return_value = this;
-      }
-    else
-      {
-	if (scope_.inside(x, y) && (! collapsed_))
-	  {
-	    for (int i = 0; i < contained_.size(); i++)
-	      {
-		entry = (Hierarchy)contained_.elementAt(i);
-		if ((return_value = entry.mouseInside(x, y)) != null)
-		  break;		
-	      }
-	  }
-	else
-	  return_value =  null;
-      }
-
-    return return_value;
-  }
-
-  private void highlight(Graphics g, boolean lit)
-  {  
-    g.setFont(FONT);
-    FontMetrics fm = g.getFontMetrics();
-    int string_height = fm.getHeight();
-    int x = self_.x + SPACE + TRI_HEIGHT;
-    int y = self_.y;
-
-    if (icon_ != null)
-      x += icon_.iconSize().width + SPACE;
-    
-    if (lit) 
-      g.setColor(Color.magenta);
-    else
-      g.setColor(COLOR);
-    
-    g.drawString(name_, x, y + (self_.height + string_height)/2);
-  } 
-
-  
-  private static void drawShape(Graphics g, int x, int y, boolean dead_end, boolean collapsed)   
-  {
-    int xpoints[] = new int[3];
-    int ypoints[] = new int[3];
-
-    xpoints[0] = x;
-    ypoints[0] = y;
-
-    if (dead_end)
-      {
-	g.fillOval(x, y, TRI_HEIGHT, TRI_HEIGHT);
-      }
-    else
-      {
-	// Draw a small collapsed triangle: |>
-	if (collapsed)
-	  {
-	    xpoints[1] = x;
-	    xpoints[2] = x + TRI_HEIGHT;
-	    ypoints[1] = y + TRI_HEIGHT;
-	    ypoints[2] = y + TRI_HEIGHT/2;
-	    g.fillPolygon(xpoints, ypoints, 3);
-	  }
-	//Draw a small uncollapsed triangle
-	else
-	  {
-	    xpoints[1] = x + TRI_HEIGHT;
-	    xpoints[2] = x + TRI_HEIGHT/2;
-	    ypoints[1] = y;
-	    ypoints[2] = y + TRI_HEIGHT;
-	    g.fillPolygon(xpoints, ypoints, 3);
-	  }
-      }
-  }
-
- private static void drawVertHashedLine(Graphics g, int x, int y1, int y2, int hashsize)
-  {
-    for (int ytemp = y1; ytemp < y2; ytemp += hashsize*3)
-      {
-	if (y2 - hashsize < ytemp)
-	  g.drawLine(x, ytemp, x, y2);
-	else
-	  g.drawLine(x, ytemp, x, ytemp + hashsize);
-      }
-  }
-  
-  private static void drawHoroHashedLine(Graphics g, int y, int x1, int x2, Color color, int hashsize)
-  {
-    for (int xtemp = x1; xtemp < x2; xtemp += hashsize*3)
-      {
-	if (x2 - hashsize < xtemp)
-	  g.drawLine(xtemp, y, x1, y);
-	else
-	  g.drawLine(xtemp, y, xtemp + hashsize, y);
-      }
-  }
-}
-
-
diff --git a/java/ImageProcessing/framework/HierarchyAdapter.java b/java/ImageProcessing/framework/HierarchyAdapter.java
deleted file mode 100644
index a265be656ea..00000000000
--- a/java/ImageProcessing/framework/HierarchyAdapter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-
-class HierarchyAdapter extends Hierarchy
-{
-  public HierarchyAdapter(String name, boolean root)
-  {
-    super(name, root);
-  }
-  
-  public HierarchyAdapter(String name, Icon icon, boolean root)
-  {
-    super(name, icon, root);
-  }
-
-  public HierarchyAdapter(String name)
-  {
-    super(name);
-  }
-  
-  public HierarchyAdapter(String name, Icon icon)
-  {
-    super(name, icon);
-  }
-
-  public void paint(Graphics g)
-    {
-      super.paint(g);
-      
-      Container p = getParent().getParent();
-      p.getLayout ().layoutContainer (p);
-    }
-}
diff --git a/java/ImageProcessing/framework/Icon.java b/java/ImageProcessing/framework/Icon.java
deleted file mode 100644
index eed91ed55c7..00000000000
--- a/java/ImageProcessing/framework/Icon.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.applet.*;
-import java.net.*;
-
-public class Icon
-{
-  protected Image icon_;
-  protected Dimension iconSize_;
-  
-  Icon()
-  {
-    super();
-  }
-  
-  Icon(String file_name, Component comp)
-  {
-    this.icon_ = Toolkit.getDefaultToolkit().getImage(file_name);
-    this.loadImage(comp);
-  }
-  
-  Icon(Image icon_image, Component comp)
-  {
-    this.icon_ = icon_image;
-    this.loadImage(comp);
-  }
-
-  Icon(String url, Applet applet) throws MalformedURLException
-  {
-    this.icon_ = applet.getImage(new URL(url));
-    loadImage(applet);
-  }
-  
-  public void drawIcon(Graphics g, int x, int y, Component comp)
-  {
-    g.drawImage(this.icon_, x, y, comp);
-  }
-  
-  private void loadImage(Component comp)
-  {
-    try
-      {
-	MediaTracker tracker = new MediaTracker(comp);
-	tracker.addImage(this.icon_, 0);
-        tracker.waitForID(0);
-
-	this.iconSize_ = new Dimension(this.icon_.getWidth(comp), this.icon_.getHeight(comp));
-      }
-    catch (InterruptedException excp)
-      {
-        System.err.println("Icon::getIcon image failed to load");
-      }
-  }
-
-  public Dimension iconSize()
-  {
-    return this.iconSize_;
-  }
-
-  public Image getIconImage()
-  {
-    return this.icon_;
-  }
-
-}
-
-
-
-
diff --git a/java/ImageProcessing/framework/ImageApp.java b/java/ImageProcessing/framework/ImageApp.java
deleted file mode 100644
index 486f45b9afb..00000000000
--- a/java/ImageProcessing/framework/ImageApp.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package imaging.framework;
-
-import java.util.*;
-import java.awt.*;
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
-import java.applet.*;
-import gjt.Separator;
-import gjt.Util;
-
-public class ImageApp extends Applet
-{
-  public void init ()
-  {
-    // Use BorderLayout for our applet frame
-    this.setLayout (new BorderLayout ());
-
-    // Now load all the filters specified in the config file
-    //    this.loadFilters ();
-    this.setupButtonPanel ();
-    this.add ("Center", this.imageCanvas_);
-    // Check if we are running in test mode
-    String testFile = getParameter ("testFile");
-    if (testFile != null)
-      {
-	this.tester_ = new Tester (testFile, this);
-	this.tester_.initialize ();
-      }
-    // Initialize the DialogManager
-    DialogManager.initialize (this);
-  }
-
-  private void setupButtonPanel ()
-  {
-    Panel southPanel = new Panel ();
-    southPanel.setLayout (new BorderLayout ());
-    
-    Panel buttonPanel = new Panel ();
-    buttonPanel.setLayout (new GridLayout (1, 5));
-
-    this.statusDisplay_ = new StatusDisplay ();
-    // Create a panel for all the buttons
-    this.filePanel_ = new FilePanel (this);
-    this.resetPanel_ = new ResetPanel (this);
-    this.zoomPanel_ = new ZoomPanel (this);
-    this.filterPanel_ = new FilterPanel (this);
-    this.helpPanel_ = new HelpPanel (this);
-
-    buttonPanel.add (this.filePanel_);
-    buttonPanel.add (this.resetPanel_);
-    buttonPanel.add (this.zoomPanel_);
-    buttonPanel.add (this.filterPanel_);
-    buttonPanel.add (this.helpPanel_);
-
-    southPanel.add ("North", new Separator ());
-    southPanel.add ("Center", buttonPanel);
-    southPanel.add ("South", this.statusDisplay_);
-
-    southPanel.resize (400, 400);
-  
-    // Now add all these components to the main frame
-    this.add ("South", southPanel);
-    this.add ("North", new Panel ()); // Empty panel (for aesthetics)
-    //    this.add ("East", new Panel ()); // Empty panel (for aesthetics)
-    //    this.add ("West", new Panel ()); // Empty panel (for aesthetics)
-  }
-
-  public void displayStatus (String s)
-  {
-    this.statusDisplay_.setText (s);
-  }
-
-  // Handle all action events
-  public void zoomFactor (double zoomFactor)
-  {
-    this.imageCanvas_.zoomFactor (zoomFactor);
-  }
-
-  public void reloadFilters ()
-  {
-    this.filterPanel_.loadFilters ();
-    repaint ();
-  }
-  
-  public Hashtable filterTable ()
-  {
-    return this.filterTable_;
-  }
-
-  public ImageFilter getFilter (String s)
-  {
-    return (ImageFilter) this.filterTable_.get (s);
-  }
-
-  public void apply ()
-  {
-    ImageFilter filter = this.getFilter (this.filterPanel_.choice ().getSelectedItem ());
-    this.apply (filter);
-  }
-
-  public void apply (ImageFilter filter)
-  {
-    if (filter != null)
-      {
-	Util.getFrame (this).setCursor (Frame.WAIT_CURSOR);
-	this.imageCanvas_.applyFilter (filter);
-	Util.getFrame (this).setCursor (Frame.DEFAULT_CURSOR);
-      }
-  }
-
-  public void resetImage ()
-  {
-    this.imageCanvas_.applyFilter (null);
-  }
-
-  public int openURL (String url)
-  {
-    if (url == null)
-      return -1;
-
-    Image image = null;
-    try
-      {
-	System.out.println("Getting image");
-	image = getImage (new URL (url));
-	System.out.println("Done");
-      }
-    catch (MalformedURLException e)
-      {
-	return -1;
-      }
-
-    if (image != null)
-      {
-	// Check if the image was actually loaded. Note that we have
-	// to wait for the potential image to finish loading before we
-	// know if it is a valid image.
-	if (this.imageCanvas_.setImage (image) == -1)
-	  return -1;
-	else
-	  this.filePanel_.enableSaveButton ();
-      }
-    else
-      return -1;
-    return 0;
-  }
-
-  // maintain compatibility
-  public void saveFile (String url)
-    {
-      this.saveFile (url, null);
-    }
-
-  public void saveFile (String url, String authentication)
-  {
-    ImageSender imageSender = new ImageSender (this);
-    imageSender.open (this.imageCanvas_.getImage (), url);
-    int bytesSent = imageSender.send (authentication);
-    if (bytesSent == -1)
-      DialogManager.popDialog (DialogType.NOT_SUPPORTED,
-			       "Server does not support uploading or URL not found");
-  }
-
-  public Choice getFilters () 
-  {
-    Choice choice = new Choice ();
-
-    // Add the default choice first
-    choice.addItem ("Filters:");
-
-    // Now do the file processing -- to determine which filters need
-    // to be loaded.
-
-    // Check if the filename has been previously specified and
-    // if not then check if the user has specified the name of the
-    // config file
-    if (this.configFile_ == null) 
-      this.configFile_ = getParameter ("configFile");
-
-      /*
-      if (this.configFile_ == null)
-	this.configFile_ = "http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/filter.conf";
-	*/
-
-    if (this.configFile_ == null)
-      this.configFile_ = this.getCodeBase().toString() + "../ImageProcessing/framework/filter.conf";
-
-    String configInfo = null;
-
-    // Only get the file as a URL if it was specified as an http style parameter!
-    if ((this.configFile_ != null) && ((this.configFile_.startsWith("http://")) ||
-				       (this.configFile_.startsWith("file://")) ||
-				       (this.configFile_.startsWith("ftp://")))) {
-
-      URL url;
-
-      try
-	{
-	  System.out.println ("Configuration File: " + this.configFile_);
-	  // Create a new URL
-	  url = new URL (this.configFile_);
-
-	  // Get the input stream and pipe it to a DataInputStream
-	  DataInputStream iStream = new DataInputStream (url.openStream ());
-
-	  // Create a buffer to hold all the data we get
-	  StringBuffer tempBuf = new StringBuffer ();
-	  // Keep reading the data until we are done
-	  String tempString = iStream.readLine ();
-	  while (tempString != null)
-	  {
-	    tempBuf.append (tempString);
-	    tempBuf.append (" ");
-	    tempString = iStream.readLine ();
-	  }
-	  configInfo = tempBuf.toString ();
-	}
-      catch (MalformedURLException e)
-	{
-	  System.err.println (e);
-	}
-      catch (IOException e)
-	{
-	  System.err.println (e);
-	}
-    }
-
-    if (configInfo != null)
-      {
-	try
-	  {
-	    StringTokenizer tokens = new StringTokenizer (configInfo);
-	    String fullFilterName = null;
-	    String filterName = null;
-	    // Now parse the string, picking up filter names. Use these
-	    // names to load the actual filters as well add new choices to
-	    // the filter choices.
-	    while (tokens.hasMoreTokens ())
-	      {
-		// Get the next token
-		fullFilterName = tokens.nextToken ();
-		filterName = this.extractFilterName (fullFilterName);
-		
-		System.out.println ("Loading: " + fullFilterName);
-		// Load the filter class
-		Class c = Class.forName (fullFilterName);
-		  //		Class c = this.filterRepository_.load (filter);
-		
-		// Add the filter to the Filter Repository
-		this.filterTable_.put (filterName, 
-				       (ImageFilter) c.newInstance ());
-	    
-		// Add filter name to the list of filter choices
-		choice.addItem (filterName);
-	      }
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    System.err.println ("Filter not found: " + e);
-	    return null;
-	  }
-	catch (IllegalAccessException e)
-	  {
-	    System.err.println ("Filter not found: " + e);
-	    return null;
-	  }
-	catch (InstantiationException e)
-	  {
-	    System.err.println ("Filter not found: " + e);
-	    return null;
-	  }
-      }
-    return choice;
-  }
-
-  // Extract the short filter name from the full filter name. For
-  // example, this method returns "EmbossFilter" if it is given the
-  // string "imaging/filters/EmbossFilter" 
-  private String extractFilterName (String s)
-  {
-    String filterName = null;
-    StringTokenizer tokens = new StringTokenizer (s, ".");
-    while (tokens.hasMoreTokens ())
-      filterName = tokens.nextToken ();
-    return filterName;
-  }
-
-  private Panel centerPanel_ = new Panel ();
-  private String configFile_ = null;
-  private Choice choice_ = null;
-  private ImageCanvas imageCanvas_ = new ImageCanvas ();
-  private FilePanel filePanel_;
-  private ResetPanel resetPanel_;
-  private ZoomPanel zoomPanel_;
-  private FilterPanel filterPanel_;
-  private HelpPanel helpPanel_;
-
-  private StatusDisplay statusDisplay_;
-  private Hashtable filterTable_ = new Hashtable ();
-  private Tester tester_;
-  
-}
diff --git a/java/ImageProcessing/framework/ImageByteCounter.java b/java/ImageProcessing/framework/ImageByteCounter.java
deleted file mode 100644
index c907c9f1c92..00000000000
--- a/java/ImageProcessing/framework/ImageByteCounter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.awt.*;
-import java.applet.*;
-import java.net.*;
-import JACE.OS.*;
-
-public class ImageByteCounter
-{
-  public ImageByteCounter (String title, Image image, Applet parent)
-  {
-    this.image_ = image;
-    this.parent_ = parent;
-
-    Image im = null;
-    try
-      {
-	im = this.parent_.getImage (new URL (this.parent_.getCodeBase () + 
-					     "../ImageProcessing/framework/" +
-					     "10.gif"));
-      }
-    catch (MalformedURLException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    indicator_ = new StatusIndicator ("", im);
-  }
-
-  public int count ()
-  {
-    int length = 0;
-    try
-      {
-	GIFOutputStream ostream = new GIFOutputStream (indicator_);
-	//	GIFOutputStream ostream = new GIFOutputStream (null);
-	GifEncoder encoder = new GifEncoder (this.image_, ostream);
-	encoder.encode ();
-
-	length = ostream.count ();
-	System.out.println ("send: " + length);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR ("Exception generating gif");
-      }
-    indicator_.dispose ();
-    return length;
-  }
-
-  Image image_ = null;
-  StatusIndicator indicator_ = null;
-  boolean done_ = false;
-  Applet parent_;
-}
-
-class GIFOutputStream extends OutputStream
-{
-  public GIFOutputStream (StatusIndicator indicator)
-  {
-    super ();
-    this.indicator_ = indicator;
-  }
-
-  public synchronized void write (int b) throws IOException 
-    {
-      bytesWritten_++;
-      if (this.indicator_ != null)
-	this.indicator_.update (bytesWritten_);
-    }
-
-  public synchronized void write (byte buf[]) throws IOException 
-    {
-      bytesWritten_ += buf.length;
-      if (this.indicator_ != null)
-	this.indicator_.update (bytesWritten_);
-    }
-
-  public synchronized void write (byte buf[], int offset, int length) throws IOException 
-    {
-      bytesWritten_ += length;
-      if (this.indicator_ != null)
-	this.indicator_.update (bytesWritten_);
-    }
-
-  public int count ()
-    {
-      return this.bytesWritten_;
-    }
-
-  private int bytesWritten_ = 0;
-  private StatusIndicator indicator_ = null;
-}
diff --git a/java/ImageProcessing/framework/ImageCanvas.java b/java/ImageProcessing/framework/ImageCanvas.java
deleted file mode 100644
index 182bd54bf9b..00000000000
--- a/java/ImageProcessing/framework/ImageCanvas.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import gjt.Util;
-import JACE.OS.*;
-
-class ImageCanvas extends Canvas
-{
-  public static final double MAX_ZOOM = 4.0;
-  public static final double MIN_ZOOM = 0.5;
-
-  public int setImage (Image image)
-  {
-    int flags = 0;
-    if (image != null)
-      {
-	// Load the image
-	this.tracker_.addImage(image, 0);
-	try { this.tracker_.waitForID(0); } catch(InterruptedException excp) {}
-
-	// Check if the image was actually loaded. Note that we have
-	// to wait for the potential image to finish loading before we
-	// know if it is a valid image.
-	flags = this.checkImage (image, this);
-	if (ACE.BIT_ENABLED (flags, ImageObserver.ERROR))
-	  return -1;
-
-	// If we reached here, it means image was loaded successfully so cache it
-	this.image_ = image;
-	this.originalImage_ = this.image_;
-	
-	this.x_ = (this.size ().width - this.image_.getWidth (this))/2;
-	this.y_ = (this.size ().height - this.image_.getHeight (this))/2;
-	this.original_x_ = this.x_;
-	this.original_y_ = this.y_;
-	repaint ();
-      }
-    return 0;
-  }
-
-  public Image getImage ()
-  {
-    return this.image_;
-  }
-
-  public void paint (Graphics g)
-  {
-    this.setBackground (Color.white);
-    if (this.image_ != null)
-      g.drawImage(this.image_, 
-		  this.x_, this.y_,
-		  (int) (this.image_.getWidth (this) * this.zoom_),
-		  (int) (this.image_.getHeight (this) * this.zoom_),
-		  this);
-  }
-
-  public void applyFilter (ImageFilter filter)
-  {
-    if (this.image_ != null)
-      {
-	Image temp;
-	if (filter == null)
-	  {
-	    temp = this.originalImage_;
-	    this.x_ = this.original_x_;
-	    this.y_ = this.original_y_;
-	    this.zoom_ = 1.0;
-	  }
-	else
-	  temp = this.ip_.processImage(this.image_, filter, this);
-	
-	this.tracker_.addImage(temp, 0);
-	try { this.tracker_.waitForID(0); } catch(InterruptedException excp) {}
-	
-	this.image_ = temp;
-
-	// Originally I needed to flush the pixel data for the image to be
-	// drawn properly. When running the applet in appletviewer, the
-	// image used to jump around, but running in a browser seems to be
-	// ok.  
-	//this.image_.flush();
-	repaint ();
-      }
-  }
-
-  public void zoomFactor (double zoom)
-  {
-    this.zoom_ *= zoom;
-    if (this.zoom_ > ImageCanvas.MAX_ZOOM)
-      this.zoom_ = ImageCanvas.MAX_ZOOM;
-    else if (this.zoom_ < ImageCanvas.MIN_ZOOM)
-      this.zoom_ = ImageCanvas.MIN_ZOOM;
-
-    repaint ();
-  }
-
-  public boolean mouseDown (Event evt, int x, int y)
-  {
-    if (inBounds (x, y))
-      {
-	this.selected_ = true;
-	this.last_x_ = x;
-	this.last_y_ = y;
-      }
-    return true;
-  }
-
-  public boolean mouseUp (Event evt, int x, int y)
-  {
-    this.selected_ = false;
-    return true;
-  }
-
-  public boolean mouseDrag (Event evt, int x, int y)
-  {
-    if (this.selected_)
-      {
-	this.x_ = x - (this.last_x_ - this.x_);
-	this.y_ = y - (this.last_y_ - this.y_);
-	this.last_x_ = x;
-	this.last_y_ = y;
-	repaint ();
-      }
-    return true;
-  }
-
-  public boolean mouseMove (Event evt, int x, int y)
-  {
-    if (this.image_ != null && inBounds (x, y))
-      Util.getFrame (this).setCursor (Frame.HAND_CURSOR);
-    else
-      Util.getFrame (this).setCursor (Frame.DEFAULT_CURSOR);
-    return true;	
-  }
-
-  public boolean mouseExit (Event evt, int x, int y)
-  {
-    Util.getFrame (this).setCursor (Frame.DEFAULT_CURSOR);
-    return true;
-  }
-
-  // Check if  mouse is within the bounds of the image
-  private boolean inBounds (int x, int y)
-  {
-    if (this.image_ == null)
-      return false;
-    else
-      return (x >= this.x_) &&
-	     (y >= this.y_) &&
-             (x <= (this.x_ + this.zoom_ * this.image_.getWidth (this))) &&
-             (y <= (this.y_ + this.zoom_ * this.image_.getHeight (this)));
-  }
-
-  private MediaTracker tracker_ = new MediaTracker(this);
-  private Image image_, originalImage_;
-  private int x_ = 0, y_ = 0;
-  private int original_x_ = 0, original_y_ = 0;
-  private int width_ = 0, height_ = 0;
-  private ImageProcessor ip_ = new ImageProcessor ();
-  private boolean selected_ = false;
-  private int last_x_ = 0, last_y_ = 0;
-  private double zoom_ = 1.0;
-
-}
-
diff --git a/java/ImageProcessing/framework/ImageEncoder.java b/java/ImageProcessing/framework/ImageEncoder.java
deleted file mode 100644
index a0aac0d559f..00000000000
--- a/java/ImageProcessing/framework/ImageEncoder.java
+++ /dev/null
@@ -1,271 +0,0 @@
-// ImageEncoder - abstract class for writing out an image
-//
-// Copyright (C) 1996 by Jef Poskanzer <jef@acme.com>.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE.
-//
-// Visit the ACME Labs Java page for up-to-date versions of this and other
-// fine Java utilities: http://www.acme.com/java/
-
-package imaging.framework;
-
-import java.util.*;
-import java.io.*;
-import java.awt.Image;
-import java.awt.image.*;
-
-/// Abstract class for writing out an image.
-// <P>
-// A framework for classes that encode and write out an image in
-// a particular file format.
-// <P>
-// This provides a simplified rendition of the ImageConsumer interface.
-// It always delivers the pixels as ints in the RGBdefault color model.
-// It always provides them in top-down left-right order.
-// If you want more flexibility you can always implement ImageConsumer
-// directly.
-// <P>
-// <A HREF="/resources/classes/Acme/JPM/Encoders/ImageEncoder.java">Fetch the software.</A><BR>
-// <A HREF="/resources/classes/Acme.tar.Z">Fetch the entire Acme package.</A>
-// <P>
-// @see GifEncoder
-// @see PpmEncoder
-// @see Acme.JPM.Decoders.ImageDecoder
-
-public abstract class ImageEncoder implements ImageConsumer
-    {
-
-    protected OutputStream out;
-
-    private ImageProducer producer;
-    private int width = -1;
-    private int height = -1;
-    private int hintflags = 0;
-    private boolean started = false;
-    private boolean encoding;
-    private IOException iox;
-    private static final ColorModel rgbModel = ColorModel.getRGBdefault();
-    private Hashtable props = null;
-
-    /// Constructor.
-    // @param img The image to encode.
-    // @param out The stream to write the bytes to.
-    public ImageEncoder( Image img, OutputStream out ) throws IOException
-	{
-	this( img.getSource(), out );
-	}
-
-    /// Constructor.
-    // @param producer The ImageProducer to encode.
-    // @param out The stream to write the bytes to.
-    public ImageEncoder( ImageProducer producer, OutputStream out ) throws IOException
-	{
-	this.producer = producer;
-	this.out = out;
-	}
-
-
-    // Methods that subclasses implement.
-
-    /// Subclasses implement this to initialize an encoding.
-    abstract void encodeStart( int w, int h ) throws IOException;
-
-    /// Subclasses implement this to actually write out some bits.  They
-    // are guaranteed to be delivered in top-down-left-right order.
-    // One int per pixel, index is row * scansize + off + col,
-    // RGBdefault (AARRGGBB) color model.
-    abstract void encodePixels(
-	int x, int y, int w, int h, int[] rgbPixels, int off, int scansize )
-	throws IOException;
-
-    /// Subclasses implement this to finish an encoding.
-    abstract void encodeDone() throws IOException;
-
-
-    // Our own methods.
-
-    /// Call this after initialization to get things going.
-    public synchronized void encode() throws IOException
-	{
-	encoding = true;
-	iox = null;
-	producer.startProduction( this );
-	while ( encoding )
-	    try
-		{
-		wait();
-		}
-	    catch ( InterruptedException e ) {}
-	if ( iox != null )
-	    throw iox;
-	}
-
-    private boolean accumulate = false;
-    private int[] accumulator;
-
-    private void encodePixelsWrapper(
-	int x, int y, int w, int h, int[] rgbPixels, int off, int scansize )
-	throws IOException
-	{
-	if ( ! started )
-	    {
-	    started = true;
-	    encodeStart( width, height );
-	    if ( ( hintflags & TOPDOWNLEFTRIGHT ) == 0 )
-		{
-		accumulate = true;
-		accumulator = new int[width * height];
-		}
-	    }
-	if ( accumulate )
-	    for ( int row = 0; row < h; ++row )
-		System.arraycopy(
-		    rgbPixels, row * scansize + off,
-		    accumulator, ( y + row ) * width + x,
-		    w );
-	else
-	    encodePixels( x, y, w, h, rgbPixels, off, scansize );
-	}
-
-    private void encodeFinish() throws IOException
-	{
-	if ( accumulate )
-	    {
-	    encodePixels( 0, 0, width, height, accumulator, 0, width );
-	    accumulator = null;
-	    accumulate = false;
-	    }
-	}
-
-    private synchronized void stop()
-	{
-	encoding = false;
-	notifyAll();
-	}
-
-
-    // Methods from ImageConsumer.
-
-    public void setDimensions( int width, int height )
-	{
-	this.width = width;
-	this.height = height;
-	}
-
-    public void setProperties( Hashtable props )
-	{
-	this.props = props;
-	}
-
-    public void setColorModel( ColorModel model )
-	{
-	// Ignore.
-	}
-
-    public void setHints( int hintflags )
-	{
-	this.hintflags = hintflags;
-	}
-
-    public void setPixels(
-	int x, int y, int w, int h, ColorModel model, byte[] pixels,
-	int off, int scansize )
-	{
-	int[] rgbPixels = new int[w];
-	for ( int row = 0; row < h; ++row )
-	    {
-	    int rowOff = off + row * scansize;
-	    for ( int col = 0; col < w; ++col )
-		rgbPixels[col] = model.getRGB( pixels[rowOff + col] & 0xff );
-	    try
-		{
-		encodePixelsWrapper( x, y + row, w, 1, rgbPixels, 0, w );
-		}
-	    catch ( IOException e )
-		{
-		iox = e;
-		stop();
-		return;
-		}
-	    }
-	}
-
-    public void setPixels(
-	int x, int y, int w, int h, ColorModel model, int[] pixels,
-	int off, int scansize )
-	{
-	if ( model == rgbModel )
-	    {
-	    try
-		{
-		encodePixelsWrapper( x, y, w, h, pixels, off, scansize );
-		}
-	    catch ( IOException e )
-		{
-		iox = e;
-		stop();
-		return;
-		}
-	    }
-	else
-	    {
-	    int[] rgbPixels = new int[w];
-            for ( int row = 0; row < h; ++row )
-		{
-		int rowOff = off + row * scansize;
-                for ( int col = 0; col < w; ++col )
-                    rgbPixels[col] = model.getRGB( pixels[rowOff + col] );
-		try
-		    {
-		    encodePixelsWrapper( x, y + row, w, 1, rgbPixels, 0, w );
-		    }
-		catch ( IOException e )
-		    {
-		    iox = e;
-		    stop();
-		    return;
-		    }
-		}
-	    }
-	}
-
-    public void imageComplete( int status )
-	{
-	producer.removeConsumer( this );
-	if ( status == ImageConsumer.IMAGEABORTED )
-	    iox = new IOException( "image aborted" );
-	else
-	    {
-	    try
-		{
-		encodeFinish();
-		encodeDone();
-		}
-	    catch ( IOException e )
-		{
-		iox = e;
-		}
-	    }
-	stop();
-	}
-
-    }
diff --git a/java/ImageProcessing/framework/ImageProcessor.java b/java/ImageProcessing/framework/ImageProcessor.java
deleted file mode 100644
index 422298d508f..00000000000
--- a/java/ImageProcessing/framework/ImageProcessor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.util.Vector;
-
-public class ImageProcessor
-{
-  private Vector pipeline_ = new Vector();
-
-  
-  public ImageProcessor()
-  {
-  }
-
-  public void addFilter(String filter_name, ImageFilter filter)
-  {
-    pipeline_.addElement(new FilterNode(filter_name, filter));
-  }
-
-  public boolean removeFilter(String name)
-  {
-    FilterNode filter_node;
-    
-    for (int i = 0; i < pipeline_.size(); i++)
-      {
-	filter_node =  (FilterNode)pipeline_.elementAt(i);
-	if (name.equals(filter_node.getName()))
-	  {
-	    pipeline_.removeElementAt(i);
-	    pipeline_.trimToSize();
-	    return true;
-	  }
-      }
-
-    return false;
-  }
-
-  public Image processImage(Image image, ImageFilter filter, Component component)
-  {
-    Image old_image = image, new_image = old_image;
-    MediaTracker tracker = new MediaTracker(component);
-
-    try
-      {
-	new_image = component.createImage(new FilteredImageSource(old_image.getSource(), filter));
-	tracker.addImage(new_image, 0);
-	tracker.waitForID(0);
-      }
-    catch(InterruptedException excp)
-      {
-	System.out.println("ImageProcessor::processImage Image failed to load.");
-	System.out.println(excp);
-	return null;
-      }
-
-    return new_image;
-  }
-  
-  public Image processImage(Image image, Component component)
-  {
-    Image old_image = image, new_image = null;
-    ImageFilter image_filter;
-    FilterNode filter_node;
-    MediaTracker tracker = new MediaTracker(component);
-
-    try
-      {
-	for (int i = 0; i < pipeline_.size(); i++)
-	  {
-	    filter_node = (FilterNode) pipeline_.elementAt(i);
-	    image_filter = filter_node.getFilter();
-	    new_image = component.createImage(new FilteredImageSource(old_image.getSource(), image_filter));
-	    old_image = new_image;
-	    tracker.addImage(new_image, 0);
-	    tracker.waitForID(0);
-	  }
-      }
-    catch(InterruptedException excp)
-      {
-	System.out.println("ImageProcessor::processImage Image failed to load.");
-	System.out.println(excp);
-	return null;
-      }
-
-    return new_image;
-  }
-}
-
-  
-class FilterNode
-{
-  private String name_;
-  private ImageFilter filter_;
-
-  FilterNode(String name, ImageFilter filter)
-  {
-    name_ = name;
-    filter_ = filter;
-  }
-
-  String getName()
-  {
-    return name_;
-  }
-
-  ImageFilter getFilter()
-  {
-    return filter_;
-  }
-}
diff --git a/java/ImageProcessing/framework/ImageSender.java b/java/ImageProcessing/framework/ImageSender.java
deleted file mode 100644
index c1659267537..00000000000
--- a/java/ImageProcessing/framework/ImageSender.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.net.*;
-import java.io.*;
-import java.applet.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ImageSender 
-{
-  public ImageSender (Applet parent)
-  {
-    this.parent_ = parent;
-  }
-
-  // ****************** 
-  // Currently bombs if it's not in an http or / format
-  //
-  public void open (Image image, String url)
-  {
-    this.image_ = image;
-
-    this.hostname_ = url;
-    if (this.hostname_.startsWith ("http://"))
-      this.hostname_ = this.hostname_.substring (7);
-
-    int index = -1;
-    if ((index = this.hostname_.indexOf (":")) != -1)
-      {
-	String temp = this.hostname_.substring (index + 1);
-	int i = -1;
-	if ((i = temp.indexOf ("/")) != -1)
-	  {
-	    this.port_ = (new Integer (temp.substring (0, i))).intValue ();
-	    this.filename_ = temp.substring (i);
-	  }
-	this.hostname_ = this.hostname_.substring (0, index);
-      }
-    else
-      {
-	int i = -1;
-	if ((i = this.hostname_.indexOf ("/")) != -1)
-	  {
-	    this.filename_ = hostname_.substring (i);
-	  }
-	this.hostname_ = this.hostname_.substring (0, i);
-	this.port_ = 80;
-      }
-  }
-
-  // Maintain compatibility 
-  public int send ()
-    {
-      return send(null);
-    }
-
-  /*******************************************
-   * The authenication string allows the PUT command to work if the server
-   * accepts the basic HTTP 1.1 encryption scheme
-   *******************************************/
-  public int send (String authentication)
-  {
-    ImageByteCounter byteCounter = new ImageByteCounter ("", this.image_, this.parent_);
-    //    StatusIndicator indicator = new StatusIndicator ("");
-    //    ImageByteCounter byteCounter = new ImageByteCounter ("", this.image_, indicator);
-    int length = byteCounter.count ();
-    //    indicator.dispose ();
-    // First determine how many bytes we will be sending
-    /*
-    try
-      {
-	GIFOutputStream ostream = new GIFOutputStream ();
-	GifEncoder encoder = new GifEncoder (this.image_, ostream);
-	encoder.encode ();
-
-	length = ostream.count ();
-	System.out.println ("send: " + length);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR ("Exception generating gif");
-      }
-      */
-
-    GIFHandler gifHandler;
-    if (authentication == null)
-      gifHandler = new GIFHandler (this.filename_, this.image_, length);
-    else
-      gifHandler = new GIFHandler (this.filename_, this.image_, length, authentication);
-
-    try
-      {
-	// Connect to the server and send the image
-	this.connector_.open (this.hostname_, this.port_);
-	this.connector_.connect (gifHandler);
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    if (gifHandler.returnCode () != -1)
-      return gifHandler.bytesWritten ();
-    else
-      return -1;
-  }
-
-  private Image image_ = null;
-  String filename_;
-  String hostname_;
-  int port_;
-  Connector connector_ = new Connector ();
-  Applet parent_;
-}
-
diff --git a/java/ImageProcessing/framework/IntHashtable.java b/java/ImageProcessing/framework/IntHashtable.java
deleted file mode 100644
index 95e6cbc25e0..00000000000
--- a/java/ImageProcessing/framework/IntHashtable.java
+++ /dev/null
@@ -1,396 +0,0 @@
-// IntHashtable - a Hashtable that uses ints as the keys
-//
-// This is 90% based on JavaSoft's java.util.Hashtable.
-//
-// Visit the ACME Labs Java page for up-to-date versions of this and other
-// fine Java utilities: http://www.acme.com/java/
-
-package imaging.framework;
-
-import java.util.*;
-
-/// A Hashtable that uses ints as the keys.
-// <P>
-// Use just like java.util.Hashtable, except that the keys must be ints.
-// This is much faster than creating a new Integer for each access.
-// <P>
-// <A HREF="/resources/classes/Acme/IntHashtable.java">Fetch the software.</A><BR>
-// <A HREF="/resources/classes/Acme.tar.Z">Fetch the entire Acme package.</A>
-// <P>
-// @see java.util.Hashtable
-
-public class IntHashtable extends Dictionary implements Cloneable
-    {
-    /// The hash table data.
-    private IntHashtableEntry table[];
-
-    /// The total number of entries in the hash table.
-    private int count;
-
-    /// Rehashes the table when count exceeds this threshold.
-    private int threshold;
-
-    /// The load factor for the hashtable.
-    private float loadFactor;
-
-    /// Constructs a new, empty hashtable with the specified initial 
-    // capacity and the specified load factor.
-    // @param initialCapacity the initial number of buckets
-    // @param loadFactor a number between 0.0 and 1.0, it defines
-    //		the threshold for rehashing the hashtable into
-    //		a bigger one.
-    // @exception IllegalArgumentException If the initial capacity
-    // is less than or equal to zero.
-    // @exception IllegalArgumentException If the load factor is
-    // less than or equal to zero.
-    public IntHashtable( int initialCapacity, float loadFactor )
-	{
-	if ( initialCapacity <= 0 || loadFactor <= 0.0 )
-	    throw new IllegalArgumentException();
-	this.loadFactor = loadFactor;
-	table = new IntHashtableEntry[initialCapacity];
-	threshold = (int) ( initialCapacity * loadFactor );
-	}
-
-    /// Constructs a new, empty hashtable with the specified initial 
-    // capacity.
-    // @param initialCapacity the initial number of buckets
-    public IntHashtable( int initialCapacity )
-	{
-	this( initialCapacity, 0.75f );
-	}
-
-    /// Constructs a new, empty hashtable. A default capacity and load factor
-    // is used. Note that the hashtable will automatically grow when it gets
-    // full.
-    public IntHashtable()
-	{
-	this( 101, 0.75f );
-	}
-
-    /// Returns the number of elements contained in the hashtable. 
-    public int size()
-	{
-	return count;
-	}
-
-    /// Returns true if the hashtable contains no elements.
-    public boolean isEmpty()
-	{
-	return count == 0;
-	}
-
-    /// Returns an enumeration of the hashtable's keys.
-    // @see IntHashtable#elements
-    public synchronized Enumeration keys()
-	{
-	return new IntHashtableEnumerator( table, true );
-	}
-
-    /// Returns an enumeration of the elements. Use the Enumeration methods 
-    // on the returned object to fetch the elements sequentially.
-    // @see IntHashtable#keys
-    public synchronized Enumeration elements()
-	{
-	return new IntHashtableEnumerator( table, false );
-	}
-
-    /// Returns true if the specified object is an element of the hashtable.
-    // This operation is more expensive than the containsKey() method.
-    // @param value the value that we are looking for
-    // @exception NullPointerException If the value being searched 
-    // for is equal to null.
-    // @see IntHashtable#containsKey
-    public synchronized boolean contains( Object value )
-	{
-	if ( value == null )
-	    throw new NullPointerException();
-	IntHashtableEntry tab[] = table;
-	for ( int i = tab.length ; i-- > 0 ; )
-	    {
-	    for ( IntHashtableEntry e = tab[i] ; e != null ; e = e.next )
-		{
-		if ( e.value.equals( value ) )
-		    return true;
-		}
-	    }
-	return false;
-	}
-
-    /// Returns true if the collection contains an element for the key.
-    // @param key the key that we are looking for
-    // @see IntHashtable#contains
-    public synchronized boolean containsKey( int key )
-	{
-	IntHashtableEntry tab[] = table;
-	int hash = key;
-	int index = ( hash & 0x7FFFFFFF ) % tab.length;
-	for ( IntHashtableEntry e = tab[index] ; e != null ; e = e.next )
-	    {
-	    if ( e.hash == hash && e.key == key )
-		return true;
-	    }
-	return false;
-	}
-
-    /// Gets the object associated with the specified key in the 
-    // hashtable.
-    // @param key the specified key
-    // @returns the element for the key or null if the key
-    // 		is not defined in the hash table.
-    // @see IntHashtable#put
-    public synchronized Object get( int key )
-	{
-	IntHashtableEntry tab[] = table;
-	int hash = key;
-	int index = ( hash & 0x7FFFFFFF ) % tab.length;
-	for ( IntHashtableEntry e = tab[index] ; e != null ; e = e.next )
-	    {
-	    if ( e.hash == hash && e.key == key )
-		return e.value;
-	    }
-	return null;
-	}
-
-    /// A get method that takes an Object, for compatibility with
-    // java.util.Dictionary.  The Object must be an Integer.
-    public Object get( Object okey )
-	{
-	if ( ! ( okey instanceof Integer ) )
-	    throw new InternalError( "key is not an Integer" );
-	Integer ikey = (Integer) okey;
-	int key = ikey.intValue();
-	return get( key );
-	}
-
-    /// Rehashes the content of the table into a bigger table.
-    // This method is called automatically when the hashtable's
-    // size exceeds the threshold.
-    protected void rehash()
-	{
-	int oldCapacity = table.length;
-	IntHashtableEntry oldTable[] = table;
-
-	int newCapacity = oldCapacity * 2 + 1;
-	IntHashtableEntry newTable[] = new IntHashtableEntry[newCapacity];
-
-	threshold = (int) ( newCapacity * loadFactor );
-	table = newTable;
-
-	for ( int i = oldCapacity ; i-- > 0 ; )
-	    {
-	    for ( IntHashtableEntry old = oldTable[i] ; old != null ; )
-		{
-		IntHashtableEntry e = old;
-		old = old.next;
-
-		int index = ( e.hash & 0x7FFFFFFF ) % newCapacity;
-		e.next = newTable[index];
-		newTable[index] = e;
-		}
-	    }
-	}
-
-    /// Puts the specified element into the hashtable, using the specified
-    // key.  The element may be retrieved by doing a get() with the same key.
-    // The key and the element cannot be null. 
-    // @param key the specified key in the hashtable
-    // @param value the specified element
-    // @exception NullPointerException If the value of the element 
-    // is equal to null.
-    // @see IntHashtable#get
-    // @return the old value of the key, or null if it did not have one.
-    public synchronized Object put( int key, Object value )
-	{
-	// Make sure the value is not null.
-	if ( value == null )
-	    throw new NullPointerException();
-
-	// Makes sure the key is not already in the hashtable.
-	IntHashtableEntry tab[] = table;
-	int hash = key;
-	int index = ( hash & 0x7FFFFFFF ) % tab.length;
-	for ( IntHashtableEntry e = tab[index] ; e != null ; e = e.next )
-	    {
-	    if ( e.hash == hash && e.key == key )
-		{
-		Object old = e.value;
-		e.value = value;
-		return old;
-		}
-	    }
-
-	if ( count >= threshold )
-	    {
-	    // Rehash the table if the threshold is exceeded.
-	    rehash();
-	    return put( key, value );
-	    } 
-
-	// Creates the new entry.
-	IntHashtableEntry e = new IntHashtableEntry();
-	e.hash = hash;
-	e.key = key;
-	e.value = value;
-	e.next = tab[index];
-	tab[index] = e;
-	++count;
-	return null;
-	}
-
-    /// A put method that takes an Object, for compatibility with
-    // java.util.Dictionary.  The Object must be an Integer.
-    public Object put( Object okey, Object value )
-	{
-	if ( ! ( okey instanceof Integer ) )
-	    throw new InternalError( "key is not an Integer" );
-	Integer ikey = (Integer) okey;
-	int key = ikey.intValue();
-	return put( key, value );
-	}
-
-    /// Removes the element corresponding to the key. Does nothing if the
-    // key is not present.
-    // @param key the key that needs to be removed
-    // @return the value of key, or null if the key was not found.
-    public synchronized Object remove( int key )
-	{
-	IntHashtableEntry tab[] = table;
-	int hash = key;
-	int index = ( hash & 0x7FFFFFFF ) % tab.length;
-	for ( IntHashtableEntry e = tab[index], prev = null ; e != null ; prev = e, e = e.next )
-	    {
-	    if ( e.hash == hash && e.key == key )
-		{
-		if ( prev != null )
-		    prev.next = e.next;
-		else
-		    tab[index] = e.next;
-		--count;
-		return e.value;
-		}
-	    }
-	return null;
-	}
-
-    /// A remove method that takes an Object, for compatibility with
-    // java.util.Dictionary.  The Object must be an Integer.
-    public Object remove( Object okey )
-	{
-	if ( ! ( okey instanceof Integer ) )
-	    throw new InternalError( "key is not an Integer" );
-	Integer ikey = (Integer) okey;
-	int key = ikey.intValue();
-	return remove( key );
-	}
-
-    /// Clears the hash table so that it has no more elements in it.
-    public synchronized void clear()
-	{
-	IntHashtableEntry tab[] = table;
-	for ( int index = tab.length; --index >= 0; )
-	    tab[index] = null;
-	count = 0;
-	}
-
-    /// Creates a clone of the hashtable. A shallow copy is made,
-    // the keys and elements themselves are NOT cloned. This is a
-    // relatively expensive operation.
-    public synchronized Object clone()
-	{
-	try
-	    {
-	    IntHashtable t = (IntHashtable) super.clone();
-	    t.table = new IntHashtableEntry[table.length];
-	    for ( int i = table.length ; i-- > 0 ; )
-		t.table[i] = ( table[i] != null ) ?
-		    (IntHashtableEntry) table[i].clone() : null;
-	    return t;
-	    }
-	catch ( CloneNotSupportedException e)
-	    {
-	    // This shouldn't happen, since we are Cloneable.
-	    throw new InternalError();
-	    }
-	}
-
-    /// Converts to a rather lengthy String.
-    public synchronized String toString()
-	{
-	int max = size() - 1;
-	StringBuffer buf = new StringBuffer();
-	Enumeration k = keys();
-	Enumeration e = elements();
-	buf.append( "{" );
-
-	for ( int i = 0; i <= max; ++i )
-	    {
-	    String s1 = k.nextElement().toString();
-	    String s2 = e.nextElement().toString();
-	    buf.append( s1 + "=" + s2 );
-	    if ( i < max )
-		buf.append( ", " );
-	    }
-	buf.append( "}" );
-	return buf.toString();
-	}
-    }
-
-
-class IntHashtableEntry
-    {
-    int hash;
-    int key;
-    Object value;
-    IntHashtableEntry next;
-
-    protected Object clone()
-	{
-	IntHashtableEntry entry = new IntHashtableEntry();
-	entry.hash = hash;
-	entry.key = key;
-	entry.value = value;
-	entry.next = ( next != null ) ? (IntHashtableEntry) next.clone() : null;
-	return entry;
-	}
-    }
-
-
-class IntHashtableEnumerator implements Enumeration
-    {
-    boolean keys;
-    int index;
-    IntHashtableEntry table[];
-    IntHashtableEntry entry;
-
-    IntHashtableEnumerator( IntHashtableEntry table[], boolean keys )
-	{
-	this.table = table;
-	this.keys = keys;
-	this.index = table.length;
-	}
-	
-    public boolean hasMoreElements()
-	{
-	if ( entry != null )
-	    return true;
-	while ( index-- > 0 )
-	    if ( ( entry = table[index] ) != null )
-		return true;
-	return false;
-	}
-
-    public Object nextElement()
-	{
-	if ( entry == null )
-	    while ( ( index-- > 0 ) && ( ( entry = table[index] ) == null ) )
-		;
-	if ( entry != null )
-	    {
-	    IntHashtableEntry e = entry;
-	    entry = e.next;
-	    return keys ? new Integer( e.key ) : e.value;
-	    }
-	throw new NoSuchElementException( "IntHashtableEnumerator" );
-	}
-    }
diff --git a/java/ImageProcessing/framework/ListFiles.java b/java/ImageProcessing/framework/ListFiles.java
deleted file mode 100644
index 7abe067341c..00000000000
--- a/java/ImageProcessing/framework/ListFiles.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package imaging.framework;
-
-import java.net.*;
-import java.io.*;
-import java.applet.*;
-
-public class ListFiles
-{
-  public ListFiles ()
-  {
-  }
-
-  public ListFiles (FileBrowser browser, Applet parent)
-  {
-    this.browser_ = browser;
-    try
-      {
-	this.fileIcon_ = new Icon (parent.getCodeBase () + 
-				   "../ImageProcessing/framework/" +
-				   "doc01.gif", 
-				   parent);
-	this.dirIcon_ = new Icon (parent.getCodeBase () + 
-				  "../ImageProcessing/framework/" +
-				  "file03.gif", 
-				  parent);
-      }
-    catch (MalformedURLException e)
-      {
-      }
-  }
-
-  public String stripProtocolHeader (String url)
-  {
-    if (url.startsWith ("http://"))
-      {
-	return url.substring (7);
-      }
-    else
-      return url;
-  }
-    
-  public int listFiles (String url, FileNode fileNode)
-  {
-    String s = this.stripProtocolHeader (url);
-    String hostname = s;
-    String directory = null;
-    int index = -1;
-
-    if ((index = s.indexOf ("/")) != -1)
-      {
-	hostname = s.substring (0, index);
-	directory = s.substring (index);
-      }
-    return this.listFiles (hostname, directory, fileNode);
-  }
-
-  public int listFiles (String url, String directory, FileNode fileNode)
-  {
-    boolean validDirectory = false;
-    int count = 0;
-    String hostname = this.stripProtocolHeader (url);
-    this.url_ = url;
-    this.directory_ = directory;
-    try
-      {
-	Socket sock = new Socket (hostname, 80);
-	PrintStream out = new PrintStream (sock.getOutputStream ());
-	DataInputStream in = new DataInputStream (sock.getInputStream ());
-	System.out.println ("Connected to: " + hostname);
-
-	String request = null;
-	if (directory.endsWith ("/"))
-	  request = "GET " + directory + "\n\n";
-	else
-	  request = "GET " + directory + "/\n\n";
-    
-	System.out.println ("Sending request: " + request);
-
-	// Send the request
-	out.println (request);
-	
-	String reply = null;
-	// Receive the reply
-
-	// Read all the data in a loop. Search for "Parent Directory"
-	// to verify that this indeed is a directory. If we encounter
-	// the string "<HTML>" then assume that this is an HTML page
-	// and therefore the directory contained "index.html"
-	while ((reply = in.readLine ()) != null)
-	  {
-	    if (validDirectory)
-	      this.parse (reply, fileNode);
-	    else 
-	      {
-		// Take a guess at the type of data we get back
-		if (reply.indexOf ("Parent Directory") != -1)
-		  validDirectory = true;
-		else if ((reply.toUpperCase ().indexOf ("<HTML>") != -1) ||
-			 (reply.toUpperCase ().indexOf ("<P>") != -1) ||
-			 (reply.toUpperCase ().indexOf ("<TABLE") != -1))
-		  return 0;
-	      }
-	  }
-      }
-    catch (MalformedURLException e)
-      {
-	System.err.println (e);
-      }
-    catch (IOException e)
-      {
-	System.err.println (e);
-      }
-    if (validDirectory == false)
-      return -1;
-    return 1;
-  }
-
-  private int parse (String s, FileNode fileNode)
-  {
-    int i= -1;
-    int j = -1;
-    int startIndex = -1;
-    int endIndex = -1;
-    boolean isFile = true;
-    String name = null;
-
-    if ((i = s.indexOf ("HREF=")) != -1)
-      startIndex = i + 6;
-    else
-      return -1;
-
-    if ((j = s.indexOf (">", i)) != -1)
-      endIndex = j - 1;
-    else
-      return -1;
-
-    // Check if this is a directory
-    if (s.charAt (endIndex - 1) == '/')
-      isFile = false;
-
-    if (endIndex >= startIndex)
-      {
-	name = s.substring (startIndex, endIndex);
-	if (browser_ != null)
-	  {
-	    //	    System.out.println (name);
-	    if (isFile)	      
-	      fileNode.addEntry (new FileNode (name, this.fileIcon_, null,
-					       fileNode.app ()));
-	    else
-	      {
-		FileNode f = new FileNode (name, this.dirIcon_, this,
-					   fileNode.app ());
-		fileNode.addEntry (f);
-		f.setExpandable (true);
-	      }
-	  }
-      }
-    return 0;
-  }
-
-  private FileBrowser browser_ = null;
-  private String url_ = null;
-  private String directory_ = null;
-  private Icon fileIcon_;
-  private Icon dirIcon_;
-}
diff --git a/java/ImageProcessing/framework/LoadURLFrame.java b/java/ImageProcessing/framework/LoadURLFrame.java
deleted file mode 100755
index 610d9eaafa8..00000000000
--- a/java/ImageProcessing/framework/LoadURLFrame.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.net.*;
-import java.io.*;
-
-/******************************************************
- * Future idea:
- *
- * Create a smart button class with an invoke method that's
- * to be called when the button is pressed.
- *
- * Subclasses override the invoke method to define 
- * specific behavior.
- *
- * That would allow things like load and save frames
- * to be almost exactly the same -- one could inherit
- * from the other and override addButtons, etc
- *****************************************************/
-
-class LoadURLFrame extends Frame
-{
-  public LoadURLFrame (String title, ImageApp parent)
-  {
-    super (title);
-
-    this.parent_ = parent;
-    this.resize (500,130);
-    
-    this.addButtons();
-  }
-
-  private void addButtons()
-  {
-    this.setLayout (new BorderLayout ());
-
-    Panel textPanel = new Panel ();
-    textPanel.setLayout (new BorderLayout ());
-    textPanel.add ("North", new Label ("Image Location:"));
-    textPanel.add ("Center", this.openURLText_);
-
-    Panel buttonPanel = new Panel ();
-    buttonPanel.setLayout (new FlowLayout (FlowLayout.CENTER));
-
-    buttonPanel.add (this.openButton_);
-    
-    buttonPanel.add (this.clearButton_);
-    buttonPanel.add (this.cancelButton_);
-
-    this.add ("North", textPanel);
-    this.add ("South", buttonPanel);
-  }
-
-  private int browseFiles (String url)
-  {
-    fileBrowser_ = new FileBrowser ("Browse", this.parent_);
-    ListFiles list = new ListFiles (this.fileBrowser_, this.parent_);
-    return this.fileBrowser_.initialize (url, list);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.openButton_)
-	  {
-	    this.getURL ();
-	  }
-	else if (e.target == this.clearButton_)
-	  {
-	    this.openURLText_.setText (new String ());
-	    this.openURLText_.requestFocus ();
-	  }
-	else if (e.target == this.cancelButton_)
-	  this.dispose ();
-	validate ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  public boolean keyDown (Event e, int key)
-  {
-    if (key == 10)
-      {
-	this.getURL ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private void getURL ()
-  {
-    this.hide ();
-    String url = this.openURLText_.getText ();
-    this.dispose ();
-
-    // The following is only for debugging
-    if (url.compareTo ("ru") == 0)
-      url = "http://www.cs/~pjain/gifs/";
-    else if (url.compareTo ("pj") == 0)
-      url = "http://www.cs/~pjain/myphoto.gif";
-
-    if (!url.endsWith ("/") &&
-	(this.parent_.openURL (url) != -1))  // Try to open it as an image
-      return;
-    else
-      {
-	ListFiles list = new ListFiles ();
-	switch (this.browseFiles (url))
-	  {
-	  case 1:
-	    this.fileBrowser_.show ();
-	    break;
-	  case 0:
-	    DialogManager.popDialog (DialogType.MALFORMED_URL,
-				     "Error: Directory contains index.html");
-	    break;
-	  default:
-	    DialogManager.popDialog (DialogType.MALFORMED_URL,
-				     "Error: Not a valid image or URL not found");
-	    break;
-	  }		
-      }
-  }
-
-  // Create the Open URL Frame and also the buttons which appear in
-  // it
-  private Button openButton_ = new Button ("Open");
-  private Button clearButton_ = new Button ("Clear");
-  private Button cancelButton_ = new Button ("Cancel");
-
-  private TextField openURLText_ = new TextField (40);
-
-  private FileBrowser fileBrowser_ = null;
-  private ImageApp parent_;
-
-}
diff --git a/java/ImageProcessing/framework/MedJava.html b/java/ImageProcessing/framework/MedJava.html
deleted file mode 100644
index fe9ce09e7eb..00000000000
--- a/java/ImageProcessing/framework/MedJava.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<HTML>
-<!-- $Id$ -->
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#888888">
-
-<HR>
-<APPLET CODEBASE="/classes/" CODE="imaging.framework.ImageApp.class" width=700 height=700>
-<param name=filename value="myphoto.gif">
-
-</APPLET>
-<HR>
-
-</HTML>
diff --git a/java/ImageProcessing/framework/Options.java b/java/ImageProcessing/framework/Options.java
deleted file mode 100644
index edbe90ba904..00000000000
--- a/java/ImageProcessing/framework/Options.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-
-class Options
-{
-  // Set GridBagConstraints
-  public static void constrain (Container container, Component component,
-				int gridx, int gridy, 
-				int gridwidth, int gridheight,
-				int fill, int anchor)
-  {
-    GridBagConstraints c = new GridBagConstraints ();
-    GridBagLayout gbl = (GridBagLayout) container.getLayout ();
-
-    c.gridx = gridx;
-    c.gridy = gridy;
-    c.gridwidth = gridwidth;
-    c.gridheight = gridheight;
-    c.fill = fill;
-    c.anchor = anchor;
-    gbl.setConstraints (component, c);
-    container.add (component);
-  }
-}
diff --git a/java/ImageProcessing/framework/SaveURLFrame.java b/java/ImageProcessing/framework/SaveURLFrame.java
deleted file mode 100755
index c3b6adf3490..00000000000
--- a/java/ImageProcessing/framework/SaveURLFrame.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.net.*;
-import java.io.*;
-
-/******************************************************
- * Future idea:
- *
- * Create a smart button class with an invoke method that's
- * to be called when the button is pressed.
- *
- * Subclasses override the invoke method to define 
- * specific behavior.
- *
- * That would allow things like load and save frames
- * to be almost exactly the same -- one could inherit
- * from the other and override addButtons, etc
- *****************************************************/
-
-
-class SaveURLFrame extends Frame
-{
-  public SaveURLFrame (String title, ImageApp parent)
-  {
-    super (title);
-
-    this.parent_ = parent;
-    this.resize (500,200);
- 
-    this.addButtons();
-  }
-
-  private void addButtons()
-  {
-    this.setLayout (new BorderLayout ());
-
-    Panel textPanels = new Panel();
-    textPanels.setLayout(new BorderLayout());
-
-    Panel URLPanel = new Panel ();
-    URLPanel.setLayout (new BorderLayout ());
-    URLPanel.add ("North", new Label ("Image Location:"));
-    URLPanel.add ("Center", this.openURLText_);
-
-    // Password panel
-    Panel pwPanel = new Panel();
-    pwPanel.setLayout (new BorderLayout ());
-    pwPanel.add ("North", new Label ("Authentication:"));
-    pwPanel.add ("Center", this.passwordText_);
-
-    textPanels.add("North", URLPanel);
-    textPanels.add("South", pwPanel);
-
-    Panel buttonPanel = new Panel ();
-    buttonPanel.setLayout (new FlowLayout (FlowLayout.CENTER));
-
-    buttonPanel.add (this.saveButton_);
-    buttonPanel.add (this.clearButton_);
-    buttonPanel.add (this.cancelButton_);
-
-    this.add ("North", textPanels);
-    this.add ("South", buttonPanel);
-  }
-
-  // Handle all action events
-  public boolean action (Event e, Object arg)
-  {
-    if (e.target instanceof Button)
-      {
-	if (e.target == this.saveButton_)
-	  {
-	    this.saveFile ();
-	  }
-	else if (e.target == this.clearButton_)
-	  {
-	    this.openURLText_.setText (new String ());
-	    this.openURLText_.requestFocus ();
-	  }
-	else if (e.target == this.cancelButton_)
-	  this.dispose ();
-	validate ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  public boolean keyDown (Event e, int key)
-  {
-    if (key == 10)
-      {
-	this.saveFile ();
-	return true;
-      }
-    else
-      return false;
-  }
-
-  private void saveFile ()
-  {
-    String url = this.openURLText_.getText ();
-    String password = this.passwordText_.getText();
-    this.hide ();
-    this.dispose ();
-
-    // The following is only for debugging
-    if (url.startsWith ("#"))
-      url = "http://merengue.cs:5432/" + url.substring (1);
-
-    if ((password != null) && (password.length() > 0))
-      this.parent_.saveFile (url, password);
-    else
-      this.parent_.saveFile (url);
-  }
-
-
-  // Create the Open URL Frame and also the buttons which appear in
-  // it
-  private Button saveButton_ = new Button ("Save");
-  private Button clearButton_ = new Button ("Clear");
-  private Button cancelButton_ = new Button ("Cancel");
-
-  private TextField openURLText_ = new TextField (40);
-  private TextField passwordText_ = new TextField (40);
-
-  private ImageApp parent_;
-
-  // Flag indicating if this is a load window or a save window
-  private boolean open_ = true;
-
-}
diff --git a/java/ImageProcessing/framework/Separator.java b/java/ImageProcessing/framework/Separator.java
deleted file mode 100644
index 6bd610e1ad9..00000000000
--- a/java/ImageProcessing/framework/Separator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A separator that is drawn either vertically or horizontally 
- * depending upon how it is laid out.  Can be drawn either 
- * etched-in or etched-out, with varying thicknesses.  Both 
- * thickness and etching are settable at construction time 
- * only.<p>
- *
- * Default thickness is 2 pixels and default etching is 
- * Etching.IN.  Note that thicknesses greater than 4 loose the 
- * etching effect.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Etching
- * @see     gjt.test.SeparatorTest
- */
-public class Separator extends Canvas {
-    static private Etching _defaultEtching   = Etching.IN;
-    static private int     _defaultThickness = 2;
-
-    private Etching etching;
-    private int     thickness;
-
-    public Separator() {
-        this(_defaultThickness, _defaultEtching);
-    }
-    public Separator(int thickness) {
-        this(thickness, _defaultEtching);
-    }
-    public Separator(Etching etching) {
-        this(_defaultThickness, etching);
-    }
-    public Separator(int thickness, Etching etching) {
-        this.etching   = etching;
-        this.thickness = thickness;
-        resize(thickness, thickness);
-    }
-    public Dimension minimumSize() {
-        return preferredSize();
-    }
-    public Dimension preferredSize() {
-        return new Dimension(thickness, thickness);
-    }
-    public void paint(Graphics g) {
-        Dimension size     = size();
-        Color brighter = getBackground().brighter().brighter();
-        Color darker   = getBackground().darker().darker();
-
-        if(etching == Etching.IN) {
-            if(size.width > size.height)
-                paintHorizontal(g, size, darker, brighter);
-            else
-                paintVertical(g, size, darker, brighter);
-        }
-        else {
-            if(size.width > size.height)
-                paintHorizontal(g, size, brighter, darker);
-            else
-                paintVertical(g, size, brighter, darker);
-        }
-    }
-    public String paramString() {
-        Dimension   size = size();
-        Orientation orient = size.width > size.height ? 
-                             Orientation.HORIZONTAL :
-                             Orientation.VERTICAL;
-        return super.paramString() + "thickness=" + 
-               thickness + "," + etching + "," + orient;
-    }
-    private void paintHorizontal(Graphics g, Dimension size, 
-                                 Color top, Color bottom) {
-        g.setColor(top);
-        g.fillRect(0, (size.height/2) - (thickness/2), 
-                       size.width, thickness/2);
-        g.setColor(bottom);
-        g.fillRect(0, size.height/2, size.width, thickness/2); 
-    }
-    private void paintVertical(Graphics g, Dimension size, 
-                               Color left, Color right) {
-        g.setColor(left);
-        g.fillRect((size.width/2) - (thickness/2), 
-                    0, thickness/2, size.height);
-        g.setColor(right);
-        g.fillRect(size.width/2, 0, thickness/2, size.height);
-    }
-}
diff --git a/java/ImageProcessing/framework/ServerHandler.java b/java/ImageProcessing/framework/ServerHandler.java
deleted file mode 100644
index 88da64d6328..00000000000
--- a/java/ImageProcessing/framework/ServerHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ServerHandler extends SvcHandler
-{
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  public void run ()
-    {
-      int msg_len;
-      try
-	{
-	  while (true)
-	    {
-	      StringBuffer msg = new StringBuffer ();
-	      msg_len = this.peer ().recv (msg);
-	      if (msg_len == 0)
-		break;
-	      System.out.println (msg);
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.peer ().close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-      
-    }
-}
diff --git a/java/ImageProcessing/framework/ServerTest.java b/java/ImageProcessing/framework/ServerTest.java
deleted file mode 100644
index b5ab00596ea..00000000000
--- a/java/ImageProcessing/framework/ServerTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ServerTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: ServerTest [<port>]");
-      System.exit (0);
-    }
-
-  public void init (int port)
-    {
-      try
-	{
-	  Acceptor acceptor = new Acceptor (Class.forName ("imaging.framework.ServerHandler"));
-	  acceptor.open (port);
-	  while (true)
-	    {
-	      acceptor.accept ();
-	    }
-	}
-      catch (ClassNotFoundException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Socket Exception: " + e);
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR ("Dang!" + e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      ServerTest server = new ServerTest ();
-
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      server.print_usage_and_die ();
-	    }
-	}
-      server.init (port);
-    }
-}
diff --git a/java/ImageProcessing/framework/StatusDisplay.java b/java/ImageProcessing/framework/StatusDisplay.java
deleted file mode 100644
index e20e9b8384d..00000000000
--- a/java/ImageProcessing/framework/StatusDisplay.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package imaging.framework;
-
-import java.awt.*;
-import gjt.Separator;
-
-class StatusDisplay extends Panel
-{
-  public StatusDisplay ()
-  {
-    this.setLayout (new BorderLayout ());
-    this.textField_.setEditable (false);
-    this.add ("North", new Separator ());
-    this.add ("Center", this.textField_);
-    this.add ("South", new Separator ());
-  }
-
-  public void setText (String s)
-  {
-    this.textField_.setText (s);
-  }
-
-  private TextField textField_ = new TextField ();
-}
diff --git a/java/ImageProcessing/framework/StatusIndicator.java b/java/ImageProcessing/framework/StatusIndicator.java
deleted file mode 100644
index 0f13a71c016..00000000000
--- a/java/ImageProcessing/framework/StatusIndicator.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.awt.*;
-
-public class StatusIndicator extends Frame
-{
-  public StatusIndicator (String title, Image image)
-  {
-    super (title);
-    this.image_ = image;
-    //    statusCanvas_ = new CounterCanvas (image);
-    this.setLayout (new BorderLayout ());
-    this.text_ = new TextField ();
-    this.label_ = new TextField ("Generating");
-
-    this.add ("North", this.label_);
-    this.add ("Center", text_);
-    //    this.add ("Center", statusCanvas_);
-    //    this.add ("Center", new Button ("Hello"));
-    //    this.add ("South", new Button ("Hello"));
-    this.resize (300,200);
-    this.show ();
-  }
-
-  public void update (int count)
-  {
-    //    this.label_.setText ("Generating...");
-    this.text_.setText ((new Integer (count++)).toString ());
-    //    statusCanvas_.update ();
-    //    textCanvas_.setCount (count);
-  }
-
-  TextField text_;
-  TextField label_;
-  Image image_;
-  //  CounterCanvas statusCanvas_ = null;
-}
-
-class CounterCanvas extends Canvas
-{
-  public CounterCanvas (Image image)
-  {
-    this.image_ = image;
-  }
-
-  public void paint (Graphics g)
-  {
-    g.clearRect (0, 0, this.size ().width, this.size ().height);
-    this.setBackground (Color.white);
-
-    if (this.image_ != null)
-      g.drawImage(this.image_, 
-		  40, 40,
-		  this.image_.getWidth (this),
-		  this.image_.getHeight (this),
-		  this);
-
-    g.setFont (new Font ("TimesRoman", Font.PLAIN, 18));
-    g.drawString ("Generating GIF format: ", 120, 120);
-  }
-
-  public void update ()
-  {
-    repaint ();
-  }
-
-  Image image_ = null;
-}
-
diff --git a/java/ImageProcessing/framework/TestHandler.java b/java/ImageProcessing/framework/TestHandler.java
deleted file mode 100644
index 5a97ae6f8b2..00000000000
--- a/java/ImageProcessing/framework/TestHandler.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.net.*;
-import java.awt.*;
-import java.awt.image.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Timers.*;
-
-public class TestHandler extends SvcHandler
-{
-  public TestHandler (String imageList,
-		      String JAWSServer, int JAWSPort,
-		      ImageApp parent)
-  {
-    this.imageList_ = imageList;
-    this.JAWSServer_ = JAWSServer;
-    this.JAWSPort_ = JAWSPort;
-    this.parent_ = parent;
-    this.filterTable_ = this.parent_.filterTable();
-  }
-
-  public int open (Object obj)
-  {
-    // We got called by the Connector so assume connection was set up
-    // fine and therfore do not use standard output
-    stdOut = false;
-
-    doTesting ();
-    return 0;
-  }
-
-  public void doTesting ()
-  {
-    if (imageList_ != null)
-      {
-	StringTokenizer tokens = new StringTokenizer (imageList_);
-	String image = null;
-	
-	// Now parse the string, picking up image names. 
-	while (tokens.hasMoreTokens ())
-	  {
-	    // Get the next token
-	    image = tokens.nextToken ();
-	    this.process (image);
-	  }
-      }
-  }
-
-  private void write (String data)
-  {
-    try
-      {
-	// If we are connected to the server then send the data to the
-	// server, otherwise write it to standard out.
-	if (stdOut)
-	  System.out.print (data);
-	else
-	  this.peer ().send (data);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-  }
-
-  private void process (String image)
-  {
-    this.write ("Image: " + image + "\n");
-
-    this.loadImage (image);
-    this.processImage (image);
-    this.uploadImage (image);
-  }
-
-  private void loadImage (String image)
-  {
-    this.write ("\tLoading...");
-    
-    // Start the timer
-    timer_.start ();
-    
-    // Load the image
-    parent_.openURL (image);
-    
-    // Stop the timer
-    timer_.stop ();
-    long time = timer_.elapsedTime ();
-
-    this.write ("done (" + ((double) time)/1000 + " seconds).\n");
-  }
-
-  private void processImage (String image)
-  {
-    this.write ("\tProcessing...\n");
-
-    for (Enumeration e = filterTable_.keys (); e.hasMoreElements (); )
-      {
-	String filterName = (String) e.nextElement ();
-
-	this.write ("\t\t" + filterName + "...");
-	
-	ImageFilter filter = (ImageFilter) filterTable_.get (filterName);
-	    
-	// Reset the image -- in case it was modified earlier
-	this.parent_.resetImage ();
-
-	// Start the timer
-	timer_.start ();
-	
-	this.parent_.apply (filter);
-	
-	// Stop the timer
-	timer_.stop ();
-	long time = timer_.elapsedTime ();
-	
-	this.write ("done (" + ((double) time)/1000 + " seconds).\n");
-      }
-  }
-   
-  private void uploadImage (String image)
-  {
-    int index = image.lastIndexOf ("/");
-    String imageName = image.substring (index+1);
-    String url = "http://" + this.JAWSServer_ + ":" + this.JAWSPort_ + "/" + imageName;
-    this.write ("\tUploading " + url + "...");
-
-    // Start the timer
-    timer_.start ();
-
-    this.parent_.saveFile (url);
-
-    // Stop the timer
-    timer_.stop ();
-    long time = timer_.elapsedTime ();
-
-    this.write ("done (" + ((double) time)/1000 + " seconds).\n");		       
-  }
-
-  private ImageApp parent_ = null;
-  private ProfileTimer timer_ = new ProfileTimer ();
-  private String imageList_ = null;
-  private boolean stdOut = true;
-  private Hashtable filterTable_ = null;
-  private String JAWSServer_ = null;
-  private int JAWSPort_ = 5432;
-}
diff --git a/java/ImageProcessing/framework/Tester.java b/java/ImageProcessing/framework/Tester.java
deleted file mode 100644
index 79204bb4c5a..00000000000
--- a/java/ImageProcessing/framework/Tester.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package imaging.framework;
-
-import java.io.*;
-import java.net.*;
-import java.awt.*;
-import java.awt.image.*;
-import java.util.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-
-public class Tester implements Runnable
-{
-  public static final String DEFAULT_TEST_SERVER = "siesta.cs.wustl.edu";
-  public static final int DEFAULT_TEST_SERVER_PORT = 7787;
-  public static final String DEFAULT_JAWS_SERVER = "siesta.cs.wustl.edu";
-  public static final int DEFAULT_JAWS_SERVER_PORT = 5432;
-
-  public Tester (String testInFile, 
-		 ImageApp parent)
-  {
-    this.testInFile_ = testInFile;
-    this.parent_ = parent;
-  }
-
-  public void initialize ()
-  {
-    System.out.println ("Initializing tester...");
-
-    // Get the hostname of the test server
-    this.server_ = this.parent_.getParameter ("testServer");
-    if (this.server_ == null)
-      this.server_ = DEFAULT_TEST_SERVER;
-
-    // Get the port number of the test server
-    String testPortString = this.parent_.getParameter ("testPort");
-    if (testPortString == null)
-      this.port_ = DEFAULT_TEST_SERVER_PORT;
-    else
-      this.port_ = (new Integer (testPortString)).intValue ();
-
-    // Get the hostname of the JAWS server
-    this.JAWSServer_ = this.parent_.getParameter ("JAWSServer");
-    if (this.JAWSServer_ == null)
-      this.JAWSServer_ = DEFAULT_JAWS_SERVER;
-
-    // Get the port number of the JAWS server
-    String JAWSPortString = this.parent_.getParameter ("JAWSPort");
-    if (JAWSPortString == null)
-      this.JAWSServerPort_ = DEFAULT_JAWS_SERVER_PORT;
-    else
-      this.JAWSServerPort_ = (new Integer (JAWSPortString)).intValue ();
-
-    System.out.println ("Test Input File: " + this.testInFile_);
-    System.out.println ("Test Server: " + this.server_ + "\tPort: " + this.port_);
-    System.out.println ("JAWS Server: " + this.JAWSServer_ + "\tPort: " + this.JAWSServerPort_);
-
-    // Run in your own thread of control
-    (new Thread (this)).start ();
-  }
-
-  public void run ()
-  {
-    this.setupConnection (this.getImages ());
-  }
-
-  private String getImages ()
-  {
-    URL inputURL;
-    String imageList = null;
-    try
-      {
-	// Create input URL
-	inputURL = new URL (this.testInFile_);
-
-	// Get the input stream and pipe it to a DataInputStream
-	DataInputStream iStream = new DataInputStream (inputURL.openStream ());
-
-	// Create a buffer to hold all the data we get
-	StringBuffer tempBuf = new StringBuffer ();
-	// Keep reading the data until we are done
-	String tempString = iStream.readLine ();
-	while (tempString != null)
-	  {
-	    tempBuf.append (tempString);
-	    tempBuf.append (" ");
-	    tempString = iStream.readLine ();
-	  }
-	imageList = tempBuf.toString ();
-      }
-    catch (MalformedURLException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    return imageList;
-  }
-
-  private void setupConnection (String imageList)
-  {
-    // First try to connect to the server. If the server is not
-    // running then we will write to standard output.
-
-    // Create a handler which will handle our connection.
-    TestHandler handler = new TestHandler (imageList, 
-					   this.JAWSServer_, this.JAWSServerPort_,
-					   this.parent_);
-    try
-      {
-	Connector connector = new Connector ();
-	connector.open (server_, port_);
-	connector.connect (handler);
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (SocketException e)
-      {
-	System.out.println ("Test Server not running! Writing to standard out...");
-	// The server is not running so write all the output to screen
-	handler.doTesting ();
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-  }
-
-  private String testInFile_ = null;
-  private ImageApp parent_ = null;
-  private String server_ = "siesta.cs.wustl.edu";
-  private int port_ = 7787;
-
-  private String JAWSServer_ = "siesta.cs.wustl.edu";
-  private int JAWSServerPort_ = 5432;
-}
-
diff --git a/java/ImageProcessing/framework/doc01.gif b/java/ImageProcessing/framework/doc01.gif
deleted file mode 100644
index 51262529f6d..00000000000
--- a/java/ImageProcessing/framework/doc01.gif
+++ /dev/null
diff --git a/java/ImageProcessing/framework/file03.gif b/java/ImageProcessing/framework/file03.gif
deleted file mode 100644
index c98654c604b..00000000000
--- a/java/ImageProcessing/framework/file03.gif
+++ /dev/null
diff --git a/java/ImageProcessing/framework/filter.conf b/java/ImageProcessing/framework/filter.conf
deleted file mode 100644
index 2e90ea136ce..00000000000
--- a/java/ImageProcessing/framework/filter.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-imaging.filters.EmbossFilter
-imaging.filters.BleachFilter
-imaging.filters.BlurFilter
-imaging.filters.DarkenFilter
-imaging.filters.DeSpeckleFilter
-imaging.filters.EdgeDetectFilter
-imaging.filters.OilPaintFilter
-imaging.filters.PixelizeFilter
-imaging.filters.RotateFilter
-imaging.filters.SharpenFilter
-imaging.filters.SpreadFilter
-
-
-
-
diff --git a/java/ImageProcessing/framework/help.conf b/java/ImageProcessing/framework/help.conf
deleted file mode 100644
index 8a07e2867d9..00000000000
--- a/java/ImageProcessing/framework/help.conf
+++ /dev/null
@@ -1,216 +0,0 @@
-			MedJava
-			~~~~~~~
-
-Overview
---------
-
-MedJava is a prototype of a large scale distributed medical imaging
-system.  It has been developed using Java, in particular, several
-components of Java ACE.
-
-Here are the key features of the MedJava toolkit:
-
-* Images can be both downloaded and uploaded across the network.
-* Images can be uploaded to Web servers that support HTTP PUT
-  functionality (for example, JAWS).
-* The tool contains more than a dozen image filters to do image
-  processing.
-* The image filters can be configured into the system dynamically
-  using the Service Configurator pattern.
-
-Please send comments/suggestions to Prashant Jain (pjain@cs.wustl.edu).
-
-======================================================================
-Getting Started
----------------
-
-MedJava applet can be configured with several (optional) parameters
-via the HTML file from which the applet is invoked.  Here is a list of
-the parameters:
-
-Note:
- 1) * indicates test-mode parameters
- 2) All Default URLs begin with 
-     http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/
-
-<START>
-Name  
-<TAB>
-<TAB>
-Description                  
-<TAB>
-<TAB>
-<TAB>
-<TAB>
-Default
-<P>
---------------------------------------------------------------
-<P>
-configFile
-<TAB>
-<TAB>
-Specifies a URL that points to the filter
-<P>
-<TAB>
-<TAB>
-configuration file.
-<TAB>
-<TAB>
-<TAB>
-<TAB>
-<TAB>
-filter.conf
-<P>
-<P>
-*testFile
-<TAB>
-<TAB>
-Specifies a URL that points to the file that contains 
-<P>
-<TAB>
-<TAB>
-a list of images that need to be tested.
-<TAB>
-<TAB>
-<TAB>
-testImages.conf
-<P>
-<P>
-*testServer
-<TAB>
-Specifies the name of the test server.
-<TAB>
-<TAB>
-<TAB>
-siesta.cs.wustl.edu
-<P>
-<P>
-*testPort
-<TAB>
-<TAB>
-Specifies the port number of the test server.
-<TAB>
-<TAB>
-<TAB>
-7789
-<P>
-<P>
-*JAWSServer
-<TAB>
-Specifies the name of the server to use in
-<P>
-<TAB>
-<TAB>
-doing image uploading during testing.
-<TAB>
-<TAB>
-<TAB>
-siesta.cs.wustl.edu
-<P>
-<P>
-*JAWSPort
-<TAB>
-Specifies the port number of the server to use 
-<P>
-<TAB>
-<TAB>
-in doing image uploading during testing.
-<TAB>
-<TAB>
-<TAB>
-5432
-<P>
-======================================================================
-<END>
-
-Menu
-----
-
-o Open URL
-
-  Allows user to specify a URL.  If the URL points to an image that is
-  readable, then the image is downloaded and displayed in the view
-  panel. 
-
-  If the URL points to a directory that is readable then a window
-  appears displaying a list of files in that directory.  The user can
-  then click on an image file in this window to fetch an image. 
-
-  IMPORTANT NOTE: If the URL points to a directory, the directory must
-		  not contain an "index.html" file! If it does, the
-		  query will fail and no list of files will appear.
-
-o Save
-
-  Allows user to specify a URL to save the currently loaded image to.
-  All images are saved in GIF format.  Note that saving/uploading a
-  file can take a while depending upon the size of the image.  This is
-  because, the tool first generates the GIF format and then sends the
-  bytes across the network.
-
-  IMPORTANT NOTE: The Web server must support image uploading, that is
-		  HTTP PUT functionality. Also, due to applet
-		  restrictions, the server MUST be running on the same
-		  host from which the applet was downloaded from.
-
-o Reset
-
-  Resets the image to the original.  Note that the effects of any
-  filters that were applied to the image will be lost.
-
-o Reload Filters
-
-  Reads the filter configuration file again and reloads all the image
-  filters.  Note that this serves as the trigger of the Service
-  Configurator pattern allowing the tool to reconfigure based on new
-  configuration information.
-
-  The filters are specified in filter.conf.  To add/remove filters,
-  change this file and then select "Reload Filters".
-
-  To specify a different configuration file, please see "Getting Started".
-
-o Zoom In
-
-  Zooms in to the currently displayed image.  Note that the applet only
-  allows to zoom in 4 x times.
-
-o Zoom Out
-
-  Zooms out of the currently displayed image.  Note that the applet
-  only allows to zoom out 1/4 x times.
-
-o Apply
-
-  Apply the currently selected filter.  By default no filter is
-  selected.  Note that applying a filter to an image can taken
-  anywhere between a few seconds to a few minutes depending upon the
-  image size, the filter type, and the speed of the machine on which
-  the applet is running.
-
-o Filters:
-
-  Allows the user to select a filter from the ones that have been
-  configured into the applet.  Note that this is a choice menu and its
-  entries depend upon the filters that were specified in the filter
-  configuration file.
-
-  For more information, on how to specify the filters, please see
-  "Getting Started".
-
-o About
-
-  Displays the "About" dialog containing the version of the MedJava
-  applet.
-
-o Help
-
-  Displays this window
-
-======================================================================
-
-Limitations
------------
-
-In several browsers, for images larger than 100 KB, the Java virtual
-machine may run out of memory while doing image processing.
diff --git a/java/ImageProcessing/framework/test.html b/java/ImageProcessing/framework/test.html
deleted file mode 100644
index 4c0c080bbfa..00000000000
--- a/java/ImageProcessing/framework/test.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<!-- $Id$ -->
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#888888">
-
-<HR>
-<APPLET CODEBASE="../../classes" CODE="imaging.framework.ImageApp.class" width=700 height=700>
-<param name=configFile value="http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/testFilter.conf">
-<param name=testFile value="http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/testImages.conf">
-<param name=testServer value="siesta.cs.wustl.edu">
-<param name=testPort value="7789">
-<param name=JAWSServer value="siesta.cs.wustl.edu">
-<param name=JAWSPort value="5432">
-</APPLET>
-<HR>
-
-</HTML>
diff --git a/java/ImageProcessing/framework/testFilter.conf b/java/ImageProcessing/framework/testFilter.conf
deleted file mode 100644
index 2e90ea136ce..00000000000
--- a/java/ImageProcessing/framework/testFilter.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-imaging.filters.EmbossFilter
-imaging.filters.BleachFilter
-imaging.filters.BlurFilter
-imaging.filters.DarkenFilter
-imaging.filters.DeSpeckleFilter
-imaging.filters.EdgeDetectFilter
-imaging.filters.OilPaintFilter
-imaging.filters.PixelizeFilter
-imaging.filters.RotateFilter
-imaging.filters.SharpenFilter
-imaging.filters.SpreadFilter
-
-
-
-
diff --git a/java/JACE/ASX/IOCntlCmds.java b/java/JACE/ASX/IOCntlCmds.java
deleted file mode 100644
index 3cc7c76256d..00000000000
--- a/java/JACE/ASX/IOCntlCmds.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TaskFlags.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-/**
- * Constants used for IOCTL messages.
- *
- *@see JACE.ASX.IOCntlMsg
- */
-public abstract class IOCntlCmds
-{
-  /**  Set the low water mark. */
-  public static final int SET_LWM    = 1;
-
-  /** Get the low water mark. */
-  public static final int GET_LWM    = 2; 
-
-  /**  Set the high water mark. */
-  public static final int SET_HWM    = 3;
-
-  /** Get the high water mark. */
-  public static final int GET_HWM    = 4;
-
-  /** Link modules */
-  public static final int MOD_LINK    = 5;
-
-  /** Unlink modules */
-  public static final int MOD_UNLINK    = 6;
-}
diff --git a/java/JACE/ASX/IOCntlMsg.java b/java/JACE/ASX/IOCntlMsg.java
deleted file mode 100644
index 4eea18b36f6..00000000000
--- a/java/JACE/ASX/IOCntlMsg.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    IOCntlMsg.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * Data format for IOCTL messages.
- */
-public class IOCntlMsg
-{
-
-  // = Initialization method.
-
-  /*
-   * Initialize the control message.
-   *@param c IOCntlCmd for the control message. Note that this should
-   * be of type IOCntlCmds
-   */
-  public IOCntlMsg (int c) 
-  { 
-    this.cmd_ = c; 
-  }
-
-  // = Get/set methods
-
-  /*
-   * Get the command.
-   *@return the command.
-   */
-  public int cmd () 
-  { 
-    return this.cmd_; 
-  }
-
-  /*
-   * Set the command.
-   *@param c the command.
-   */
-  public void cmd (int c) 
-  { 
-    this.cmd_ = c; 
-  }
-
-  /*
-   * Get the count.
-   *@return the count.
-   */
-  public int count () 
-  { 
-    return this.count_; 
-  }
-
-  /*
-   * Set the count.
-   *@param c the count.
-   */
-  public void count (int c) 
-  { 
-    this.count_ = c; 
-  }
-
-  /*
-   * Get the error.
-   *@return the error.
-   */
-  public int error () 
-  { 
-    return this.error_; 
-  }
-
-  /*
-   * Set the error.
-   *@param e the error.
-   */
-  public void error (int e) 
-  { 
-    this.error_ = e; 
-  }
-
-  /*
-   * Get the return value.
-   *@return the return value.
-   */
-  public int rval () 
-  { 
-    return this.rval_; 
-  }
-
-  /*
-   * Set the return value.
-   *@param r the return value.
-   */
-  public void rval (int r) 
-  { 
-    this.rval_ = r; 
-  }
-
-  public String toString ()
-  {
-    return (new Integer (this.cmd_)).toString ();
-  }
-
-  private int cmd_;
-  // Command.
-
-   private int count_;
-   // Count.
-
-   private int error_;
-   // Error.
-
-   private int rval_;
-   // Return value
-}
diff --git a/java/JACE/ASX/MessageBlock.java b/java/JACE/ASX/MessageBlock.java
deleted file mode 100644
index 4035e34a7bd..00000000000
--- a/java/JACE/ASX/MessageBlock.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    MessageBlock.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- *     Object used to store messages in the ASX framework.<P>
- *
- *     <tt>MessageBlock</tt> is modeled after the message data structures
- *     used in System V STREAMS. A <tt>MessageBlock</tt> is composed of
- *     one or more <tt>MessageBlock</tt>s that are linked together by 
- *     <em>PREV</em> and <em>NEXT</em> pointers. In addition, a 
- *     <tt>MessageBlock</tt> may also be linked to a chain of other 
- *     <tt>MessageBlock</tt>s. This structure enables efficient manipulation 
- *     of arbitrarily-large messages <em>without</em> incurring memory 
- *     copying overhead.
- *
- *@see MessageQueue
- */
-public class MessageBlock
-{
-  /**
-   * Create an empty Message Block
-   */
-  public MessageBlock ()
-    {
-      this (0);
-    }
-
-  /**
-   * Create an empty Message Block.
-   * Note that this assumes that type of MessageBlock is MB_DATA.
-   *@param size size of the Message Block to create.
-   */
-  public MessageBlock (int size)
-    {
-      // Note the explicit cast toString() is needed. For some strange
-      // reason, it fails otherwise if size == 0.
-      this ((new StringBuffer (size)).toString ());
-    }
-
-  /**
-   * Create a Message Block. Note that this assumes that type of
-   * MessageBlock is MB_DATA. 
-   *@param data initial data to create a Message Block with.
-   */
-  public MessageBlock (String data)
-    {
-      this (MessageType.MB_DATA,
-	    null,
-	    data);
-    }
-
-  /**
-   * Create a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param data initial data to create Message Block with
-   */
-  public MessageBlock (int type,
-		       MessageBlock cont,
-		       String data)
-    {
-      this.flags_ = 0;
-      this.priority_ = 0;
-      this.next_ = null;
-      this.prev_ = null;
-
-      this.init (type, cont, data);
-    }
-
-  /**
-   * Create a Message Block. Note that this assumes that type of
-   * MessageBlock is MB_OBJECT.
-   *@param obj initial object to create a Message Block with.
-   */
-  public MessageBlock (Object obj)
-  {
-    this (MessageType.MB_OBJECT,
-	  null,
-	  obj);
-  }
-
-  /**
-   * Create a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param obj initial object to create Message Block with
-   */
-  public MessageBlock (int type,
-		       MessageBlock cont,
-		       Object obj)
-  {
-    this.init (type, cont, obj);
-  }
-
-  /* Initialize the Message Block
-   *@param data data to initialize Message Block with
-   */
-  public void init (String data)
-    {
-      this.base_ = new StringBuffer (data);
-    }
-
-  /**
-   * Initialize a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param data data to initialize Message Block with
-   */
-  public void init (int msgType,
-		   MessageBlock msgCont,
-		   String data)
-    {
-      if (data.length () == 0)
-	this.base_ = new StringBuffer (0);
-      else
-	this.base_ = new StringBuffer (data);
-      this.type_ = msgType;
-      this.cont_ = msgCont;
-    }
-
-  /**
-   * Initialize a Message Block. Note that this assumes that type of
-   * MessageBlock is MB_OBJECT.
-   *@param obj initial object to initialize a Message Block with.
-   */
-  public void init (Object obj)
-    {
-      this.init (MessageType.MB_OBJECT, null, obj);
-    }
-
-  /**
-   * Initialize a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param obj object to initialize Message Block with
-   */
-  public void init (int msgType,
-		   MessageBlock msgCont,
-		   Object obj)
-    {
-      this.obj_ = obj;
-      this.type_ = msgType;
-      this.cont_ = msgCont;
-      this.flags_ = 0;
-      this.priority_ = 0;
-      this.next_ = null;
-      this.prev_ = null;
-    }
-
-  /**
-   * Set message flags. Note that the flags will be set on top of
-   * already set flags.
-   *@param moreFlags flags to set for the Message Block.
-   */
-  public long setFlags (long moreFlags)
-    {
-      // Later we might mask more_flags so that user can't change
-      // internal ones: more_flags &= ~(USER_FLAGS -1).
-      this.flags_ = ACE.SET_BITS (this.flags_, moreFlags);
-      return this.flags_;
-    }
-
-  /**
-   * Unset message flags.
-   *@param lessFlags flags to unset for the Message Block.
-   */
-  public long clrFlags (long lessFlags)
-    {
-      // Later we might mask more_flags so that user can't change
-      // internal ones: less_flags &= ~(USER_FLAGS -1).
-      this.flags_ = ACE.CLR_BITS (this.flags_, lessFlags);
-      return this.flags_;
-    }
-
-  /**
-   * Get the message flags.
-   *@return Message flags
-   */
-  public long flags ()
-    {
-      return this.flags_;
-    }
-
-  /**
-   * Get the type of the message.
-   *@return message type
-   */
-  public int msgType ()
-    {
-      return this.type_;
-    }
-
-  /**
-   * Set the type of the message.
-   *@param t type of the message
-   */
-  public void msgType (int t)
-    {
-      this.type_ = t;
-    }
-
-  /**
-   * Get the class of the message. Note there are two classes,
-   * <normal> messages and <high-priority> messages.
-   *@return message class
-   */
-  public int msgClass ()
-    {
-      return this.msgType () >= MessageType.MB_PRIORITY
-	? MessageType.MB_PRIORITY : MessageType.MB_NORMAL;
-    }
-
-  /**
-   * Find out if the message is a data message.
-   *@return true if message is a data message, false otherwise
-   */
-  public boolean isDataMsg ()
-    {
-      int mt = this.msgType ();
-      return mt == MessageType.MB_DATA
-	|| mt == MessageType.MB_PROTO
-	  || mt == MessageType.MB_PCPROTO;
-    }
-
-  /**
-   * Find out if the message is an object message.
-   *@return true if message is an object message, false otherwise
-   */
-  public boolean isObjMsg ()
-    {
-      int mt = this.msgType ();
-      return mt == MessageType.MB_OBJECT
-	|| mt == MessageType.MB_PROTO
-	  || mt == MessageType.MB_PCPROTO;
-    }
-
-  /**
-   * Get the priority of the message.
-   *@return message priority
-   */
-  public long msgPriority ()
-    {
-      return this.priority_;
-    }
-
-  /**
-   * Set the priority of the message.
-   *@param pri priority of the message
-   */
-  public void msgPriority (long pri)
-    {
-      this.priority_ = pri;
-    }
-
-  /**
-   * Get message data. This assumes that msgType is MB_DATA.
-   *@return message data
-   */
-  public String base () 
-    {
-      // Create a String object to return
-      char temp[] = new char [this.base_.length ()];
-      this.base_.getChars (0, this.base_.length (), temp, 0);
-      return new String (temp);
-    }
-
-  /**
-   * Set the message data. This assumes that msgType is MB_DATA.
-   *@param data message data
-   *@param msgFlags message flags
-   */
-  public void base (String data,
-		    long msgFlags)
-    {
-      this.base_ = new StringBuffer (data);
-      this.flags_ = msgFlags;
-    }
-
-  /**
-   * Get message object. This assumes that msgType is MB_OBJECT.
-   *@return message object
-   */
-  public Object obj () 
-    {
-      return this.obj_;
-    }
-
-  /**
-   * Set the message object. This assumes that msgType is MB_OBJECT.
-   *@param object message object
-   *@param msgFlags message flags
-   */
-  public void obj (Object obj,
-		   long msgFlags)
-    {
-      this.obj_ = obj;
-      this.flags_ = msgFlags;
-    }
-
-  // = The following four methods only make sense if the Message_Block
-  // is of type MB_DATA and not MB_OBJECT.
-
-  /**
-   * Get length of the message. This method only makes sense if the
-   * MessageBlock is of type MB_DATA and not MB_OBJECT.
-   *@return length of the message.
-   */
-  public int length ()
-    {
-      return this.base_.length ();
-    }
-
-  /**
-   * Set the length of the message. This method only makes sense if the
-   * MessageBlock is of type MB_DATA and not MB_OBJECT.
-   *@param n message length
-   */
-  public void length (int n)
-    {
-      this.base_.setLength (n);
-    }
-
-  /**
-   * Get size of the allocated buffer for the message. This method
-   * only makes sense if the MessageBlock is of type MB_DATA and not
-   * MB_OBJECT. 
-   *@return size of the message buffer
-   */
-  public int size ()
-    {
-      return this.base_.capacity ();
-    }
-
-  /**
-   * Set the total size of the buffer. This method will grow the
-   * buffer if need be. Also, this method only makes sense if the
-   * MessageBlock is of type MB_DATA and not MB_OBJECT.
-   *@param n size of message buffer
-   */
-  public void size (int n)
-    {
-      this.base_.ensureCapacity (n);
-    }
-
-
-  /**
-   * Get the continuation field. The coninuation field is used to
-   * chain together composite messages.
-   *@return the continuation field
-   */
-  public MessageBlock cont ()
-    {
-      return this.cont_;
-    }
-
-  /**
-   * Set the continuation field. The coninuation field is used to
-   * chain together composite messages.
-   *@param msgCont continuation field
-   */
-  void cont (MessageBlock msgCont)
-    {
-      this.cont_ = msgCont;
-    }
-
-  /**
-   * Get link to next message. The next message points to the
-   * <MessageBlock> directly ahead in the MessageQueue.
-   *@return next message block
-   */
-  MessageBlock next ()
-    {
-      return this.next_;
-    }
-
-  /**
-   * Set link to next message. The next message points to the
-   * <MessageBlock> directly ahead in the MessageQueue.
-   *@param msgBlock next message block
-   */
-  void next (MessageBlock msgBlock)
-    {
-      this.next_ = msgBlock;
-    }
-
-  /**
-   * Get link to previous message. The previous message points to the
-   * <MessageBlock> directly before in the MessageQueue.
-   *@return previous message block
-   */
-  MessageBlock prev ()
-    {
-      return this.prev_;
-    }
-
-  /**
-   * Set link to previous message. The previous message points to the
-   * <MessageBlock> directly before in the MessageQueue.
-   *@param msgBlock previous message block
-   */
-  void prev (MessageBlock msgBlock)
-    {
-      this.prev_ = msgBlock;
-    }
-
-  private int type_;		
-  // Type of message.
-
-  private long flags_;
-  // Misc flags.
-
-  private long priority_;
-  // Priority of message.
-
-  private StringBuffer base_;
-  // String data of message block (initialized to null).
-
-  private Object obj_;
-  // Object data of message block (initialized to null).
-
-  private MessageBlock cont_;
-  // Next message block in the chain.
-
-  private MessageBlock next_;	
-  // Next message in the list.
-
-  private MessageBlock prev_;	
-  // Previous message in the list.
-
-}
-
diff --git a/java/JACE/ASX/MessageQueue.java b/java/JACE/ASX/MessageQueue.java
deleted file mode 100644
index df25870dd52..00000000000
--- a/java/JACE/ASX/MessageQueue.java
+++ /dev/null
@@ -1,633 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    MessageQueue.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import java.util.Date;
-import JACE.OS.*;
-import JACE.Reactor.*;
-
-class NotFullCondition extends TimedWait
-{
-  public NotFullCondition (MessageQueue mq)
-  { 
-    super (mq);
-    this.mq_ = mq;
-  }
-
-  public boolean condition () {
-    // Delegate to the appropriate conditional
-    // check on the MessageQueue.
-    return !this.mq_.isFull ();
-  }
-  private MessageQueue mq_;
-}
-
-class NotEmptyCondition extends TimedWait
-{
-  public NotEmptyCondition (MessageQueue mq)
-  { 
-    super (mq);
-    this.mq_ = mq;
-  }
-
-  public boolean condition () {
-    // Delegate to the appropriate conditional
-    // check on the MessageQueue.
-    return !this.mq_.isEmpty ();
-  }
-  private MessageQueue mq_;
-}
-
-
-/**
- *     A thread-safe message queueing facility, modeled after the
- *     queueing facilities in System V StreamS. <P>
- *
- *     <tt>MessageQueue</tt> is the central queueing facility for messages
- *     in the ASX framework. All operations are thread-safe, as it is intended
- * to be used for inter-thread communication (<em>e.g.</em>, a producer and
- * consumer thread joined by a <tt>MessageQueue</tt>).  The queue
- * consists of <tt>MessageBlock</tt>s.
- *</blockquote>
- *
- *@see MessageBlock
- *@see TimeValue
- */
-public class MessageQueue
-{
-  /**
-   * Default constructor
-   */
-  public MessageQueue ()
-  {
-    this (DEFAULT_HWM, DEFAULT_LWM);
-  }
-
-  /**
-   * Create a Message Queue with high and low water marks.
-   *@param hwm High water mark (max number of bytes allowed in the
-   * queue) 
-   *@param lwm Low water mark (min number of bytes in the queue)
-   */
-  public MessageQueue (int hwm, int lwm)
-  {
-    if (this.open (hwm, lwm) == -1)
-      ACE.ERROR ("open");
-  }
-
-  /**
-   * Initialize a Message Queue with high and low water marks.
-   *@param hwm High water mark (max number of bytes allowed in the
-   * queue) 
-   *@param lwm Low water mark (min number of bytes in the queue)
-   */
-  public synchronized int open (int hwm, int lwm)
-  {
-    this.highWaterMark_ = hwm;
-    this.lowWaterMark_ = lwm;
-    this.deactivated_ = false;
-    this.currentBytes_	= 0;
-    this.currentCount_	= 0;
-    this.tail_ = null;
-    this.head_ = null;
-    return 0;
-  }
-
-  // ************ Note! ***********
-  // = For enqueue, enqueueHead, enqueueTail, and dequeueHead if
-  // timeout is specified, the caller will wait until the *absolute time*
-  // tv.  Calls will return, however, when queue is closed,
-  // deactivated, or if it is past the time tv
-
-  /**
-   * Enqueue a <MessageBlock> into the <MessageQueue> in accordance
-   * with its <msgPriority> (0 is lowest priority). Note that the
-   * call will block (unless the queue has been deactivated).
-   *
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   *@param newItem item to enqueue onto the Message Queue
-   *@return -1 on failure, else the number of items still on the queue.
-   */
-  public synchronized int enqueue (MessageBlock newItem) throws InterruptedException
-  {
-    return this.enqueue (newItem, null);
-  }
-
-  /**
-   * Enqueue a <MessageBlock> into the <MessageQueue> in accordance
-   * with its <msgPriority> (0 is lowest priority). Note that the
-   * call will return if the queue has been deactivated or it is
-   * later than the specified absolute time value.
-   *@param newItem item to enqueue onto the Message Queue
-   *@param tv absolute TimeValue to timeout after
-   *@return -1 on failure, else the number of items still on the
-   * queue. 
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  public synchronized int enqueue (MessageBlock newItem, 
-				   TimeValue tv) throws InterruptedException
-  {
-    int result = -1;
-    if (this.deactivated_)
-      return -1;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notFullCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notFullCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return -1;
-      }
-	  
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return -1;
-    else
-      result = this.enqueueInternal (newItem);
-
-    // Tell any blocked threads that the queue has a new item!
-    this.notEmptyCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the end of the <MessageQueue>. Note
-     * that the call will block (unless the queue has been deactivated).
-     *@param newItem item to enqueue onto the Message Queue
-     *@return -1 on failure, else the number of items still on the queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized int enqueueTail (MessageBlock newItem) throws InterruptedException
-  {
-    return this.enqueueTail (newItem, null);
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the end of the <MessageQueue>. Note
-     * that the call will return when it's later than the given TimeValue or
-     * if the queue has been deactivated.
-     *@param newItem item to enqueue onto the Message Queue
-     *@param tv absolute TimeValue to wait until before returning (unless
-     * the operation compeltes before this time)
-     *@return -1 on failure, else the number of items still on the queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized int enqueueTail (MessageBlock newItem,
-				       TimeValue tv) throws InterruptedException
-  {
-    int result = -1;
-    if (this.deactivated_)
-      return -1;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notFullCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notFullCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return -1;
-      }
-	  
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return -1;
-    else
-      result = this.enqueueTailInternal (newItem);
-
-    // Tell any blocked threads that the queue has a new item!
-    this.notEmptyCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the head of the <MessageQueue>. Note
-     * that the call will block (unless the queue has been deactivated).
-     *@param newItem item to enqueue onto the Message Queue
-     *@return -1 on failure, else the number of items still on the queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized int enqueueHead (MessageBlock newItem) throws InterruptedException
-  {
-    return this.enqueueHead (newItem, null);
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the head of the <MessageQueue>.  Note
-     * that the call will return when it's later than the given TimeValue or
-     * if the queue has been deactivated.
-     *@param newItem item to enqueue onto the Message Queue
-     *@param tv absolute TimeValue to wait until before returning (unless
-     * the operation completes before that time)
-     *@return -1 on failure, else the number of items still on the queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized int enqueueHead (MessageBlock newItem,
-				       TimeValue tv) throws InterruptedException
-  {
-    int result = -1;
-    if (this.deactivated_)
-      return -1;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notFullCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notFullCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return -1;
-      }
-    
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return -1;
-    else
-      result = this.enqueueHeadInternal (newItem);
-
-    // Tell any blocked threads that the queue has a new item!
-    this.notEmptyCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Dequeue and return the <MessageBlock> at the head of the
-     * <MessageQueue>. Note that the call will block (unless the queue
-     * has been deactivated). 
-     *@return null on failure, else the <MessageBlock> at the head of queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized MessageBlock dequeueHead () throws InterruptedException
-  {
-    return this.dequeueHead (null);
-  }
-
-  /**
-     * Dequeue and return the <MessageBlock> at the head of the
-     * <MessageQueue>.  Note that the call when return if the queue has 
-     * been deactivated or when the current time is later than the given 
-     * time value.
-     *@param tv absolute time timeout (blocks indefinitely if null)
-     *@return null on failure, else the <MessageBlock> at the head of queue.
-     *@exception InterruptedException Interrupted while accessing queue
-     */
-  public synchronized MessageBlock dequeueHead (TimeValue tv) 
-      throws InterruptedException
-  {
-    MessageBlock result = null;
-    if (this.deactivated_)
-      return null;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notEmptyCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notEmptyCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return null;
-      }
-	  
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return null;
-    else
-      result = this.dequeueHeadInternal ();
-
-    // Tell any blocked threads that the queue has room for an item!
-    this.notFullCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Check if queue is full.
-     *@return true if queue is full, else false.
-     */
-  public synchronized boolean isFull ()
-  {
-    return this.isFullInternal ();
-  }
-
-  /**
-     * Check if queue is empty.
-     *@return true if queue is empty, else false.
-     */
-  public synchronized boolean isEmpty ()
-  {
-    return this.isEmptyInternal ();
-  }
-
-  /**
-     * Get total number of bytes on the queue.
-     *@return total number number of bytes on the queue
-     */
-  public int messageBytes ()
-  {
-    return this.currentBytes_;
-  }
-
-  /**
-     * Get total number of messages on the queue.
-     *@return total number number of messages on the queue
-     */
-  public int messageCount ()
-  {
-    return this.currentCount_;
-  }
-
-  // = Flow control routines 
-
-    /**
-     * Get high watermark.
-     *@return high watermark
-     */
-  public int highWaterMark ()
-  {
-    return this.highWaterMark_;
-  }
-
-  /**
-     * Set high watermark.
-     *@param hwm high watermark
-     */
-  public void highWaterMark (int hwm)
-  {
-    this.highWaterMark_ = hwm;
-  }
-
-  /**
-     * Get low watermark.
-     *@return low watermark
-     */
-  public int lowWaterMark ()
-  {
-    return this.lowWaterMark_;
-  }
-
-  /**
-     * Set low watermark.
-     *@param lwm low watermark
-     */
-  public void lowWaterMark (int lwm)
-  {
-    this.lowWaterMark_ = lwm;
-  }
-
-  // = Activation control methods.
-
-    /**
-     * Deactivate the queue and wakeup all threads waiting on the queue
-     * so they can continue.  No messages are removed from the queue,
-     * however.  Any other operations called until the queue is
-     * activated again will immediately return -1.  
-     *@return WAS_INACTIVE if queue was inactive before the call and
-     * WAS_ACTIVE if queue was active before the call.
-     */
-  public synchronized int deactivate ()
-  {
-    return this.deactivateInternal ();
-  }
-
-
-  /**
-     * Reactivate the queue so that threads can enqueue and dequeue
-     * messages again.  
-     *@return WAS_INACTIVE if queue was inactive before the call and
-     * WAS_ACTIVE if queue was active before the call.
-     */
-  public synchronized int activate ()
-  {
-    return this.activateInternal ();
-  }
-
-  protected boolean isEmptyInternal ()
-  {
-    // Not sure about this one!!!!
-    return this.currentBytes_ <= this.lowWaterMark_ && this.currentCount_ <= 0;
-  }
-
-  protected boolean isFullInternal ()
-  {
-    return this.currentBytes_ > this.highWaterMark_;
-  }
-
-  protected int deactivateInternal ()
-  {
-    int currentStatus = 
-      this.deactivated_ ? WAS_INACTIVE : WAS_ACTIVE;
-      
-    this.notFullCondition_.broadcast ();
-    this.notEmptyCondition_.broadcast ();
-      
-    this.deactivated_ = true;
-    return currentStatus;
-  }
-
-  protected int activateInternal ()
-  {
-    int currentStatus = 
-      this.deactivated_ ? WAS_INACTIVE : WAS_ACTIVE;
-    this.deactivated_ = false;
-
-    return currentStatus;
-  }
-
-  protected int enqueueTailInternal (MessageBlock newItem)
-  {
-    if (newItem == null)
-      return -1;
-
-    // List was empty, so build a new one.
-    if (this.tail_ == null)
-      {
-	this.head_     = newItem;
-	this.tail_     = newItem;
-	newItem.next (null);
-	newItem.prev (null);
-      }
-    // Link at the end.
-    else 
-      {
-	newItem.next (null);
-	this.tail_.next (newItem);
-	newItem.prev (this.tail_);
-	this.tail_ = newItem;
-      }
-
-    if (newItem.msgType() != MessageType.MB_OBJECT)
-      {
-	// Make sure to count *all* the bytes in a composite message!!! 
-	for (MessageBlock temp = newItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ += temp.size ();
-      }
-
-    this.currentCount_++;
-    return this.currentCount_;
-  }
-
-  protected int enqueueHeadInternal (MessageBlock newItem)
-  {
-    if (newItem == null)
-      return -1;
-
-    newItem.prev (null);
-    newItem.next (this.head_);
-
-    if (this.head_ != null)
-      this.head_.prev (newItem);
-    else
-      this.tail_ = newItem;
-
-    this.head_ = newItem;
-
-    if (newItem.msgType() != MessageType.MB_OBJECT)
-      {
-	// Make sure to count *all* the bytes in a composite message!!!
-	for (MessageBlock temp = newItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ += temp.size ();
-      }
-
-    this.currentCount_++;
-
-    return this.currentCount_;
-  }
-
-  protected int enqueueInternal (MessageBlock newItem)
-  {
-    if (newItem == null)
-      return -1;
-
-    if (this.head_ == null)
-      // Check for simple case of an empty queue, where all we need to
-      // do is insert <newItem> into the head.
-      return this.enqueueHeadInternal (newItem);
-    else
-      {
-	MessageBlock temp;
-
-	// Figure out where the new item goes relative to its priority.
-
-	for (temp = this.head_;
-	     temp != null;
-	     temp = temp.next ())
-	  {
-	    if (temp.msgPriority () <= newItem.msgPriority ())
-	      // Break out when we've located an item that has lower
-	      // priority that <newItem>.
-	      break;
-	  }
-
-	if (temp == null)
-	  // Check for simple case of inserting at the end of the queue,
-	  // where all we need to do is insert <newItem> after the
-	  // current tail.
-	  return this.enqueueTailInternal (newItem);
-	else if (temp.prev () == null)
-	  // Check for simple case of inserting at the beginning of the
-	  // queue, where all we need to do is insert <newItem> before
-	  // the current head.
-	  return this.enqueueHeadInternal (newItem);
-	else
-	  {
-	    // Insert the message right before the item of equal or lower
-	    // priority.
-	    newItem.next (temp);
-	    newItem.prev (temp.prev ());
-	    temp.prev ().next (newItem);
-	    temp.prev (newItem);
-	  }
-      }
-
-    if (newItem.msgType() != MessageType.MB_OBJECT)
-      {    
-	// Make sure to count *all* the bytes in a composite message!!!
-	for (MessageBlock temp = newItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ += temp.size ();
-      }
-
-    this.currentCount_++;
-    return this.currentCount_;
-  }
-
-  protected MessageBlock dequeueHeadInternal ()
-  {
-    MessageBlock firstItem = this.head_;
-    this.head_ = this.head_.next ();
-
-    if (this.head_ == null)
-      this.tail_ = null;
-
-    if (firstItem.msgType() != MessageType.MB_OBJECT)
-      {
-	// Make sure to subtract off all of the bytes associated with this
-	// message.
-	for (MessageBlock temp = firstItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ -= temp.size ();
-      }
-
-    this.currentCount_--;
-    return firstItem;
-  }
-
-  
-  /** Default high watermark (16 K). */
-  public final static int DEFAULT_HWM = 16 * 1024;
-
-  /** Default low watermark. */
-  public final static int DEFAULT_LWM = 0;
-
-  /** Message queue was active before activate() or deactivate(). */
-  public final static int WAS_ACTIVE = 1;
-  
-  /** Message queue was inactive before activate() or deactivate(). */
-  public final static int WAS_INACTIVE = 2;
-
-  private int highWaterMark_;
-  // Greatest number of bytes before blocking.
-
-  private int lowWaterMark_;
-  // Lowest number of bytes before unblocking occurs.
-
-  private boolean deactivated_;
-  // Indicates that the queue is inactive.
-
-  private int currentBytes_;
-  // Current number of bytes in the queue.
-
-  private int currentCount_;
-  // Current number of messages in the queue.
-
-  private MessageBlock head_;
-  // Head of Message_Block list.
-
-  private MessageBlock tail_;
-  // Tail of Message_Block list.
-
-  // The Delegated Notification mechanisms.
-  private NotFullCondition notFullCondition_ = new NotFullCondition (this);
-  private NotEmptyCondition notEmptyCondition_ = new NotEmptyCondition (this);
-
-}
diff --git a/java/JACE/ASX/MessageType.java b/java/JACE/ASX/MessageType.java
deleted file mode 100644
index 97e33a6c6ba..00000000000
--- a/java/JACE/ASX/MessageType.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    MessageType.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-/**
- * Message types used by MessageBlock. <P>
- *
- * Defines bit masks used to identify various types of messages.<P>
- *
- * This class is not intended to be instantiable.
- *
- *@see MessageBlock
- */
-public class MessageType
-{
-  // = Data and protocol messages (regular and priority)
-  /** regular data */
-  public static final int MB_DATA     = 0x01;
-
-  /** protocol control */
-  public static final int MB_PROTO    = 0x02;
-
-  /** regular data */
-  public static final int MB_OBJECT   = 0x09;
-
-
-  // = Control messages (regular and priority)
-  /** line break */
-  public static final int MB_BREAK    = 0x03;
-
-  /** pass file pointer */
-  public static final int MB_PASSFP   = 0x04;
-
-  /** post an event to an event queue */
-  public static final int MB_EVENT    = 0x05;
-
-  /** generate process signal */
-  public static final int MB_SIG      = 0x06;
-
-  /** ioctl; set/get params */
-  public static final int MB_IOCTL    = 0x07;
-
-  /** set various stream head options */
-  public static final int MB_SETOPTS  = 0x08; 
-
-
-  // = Control messages (high priority; go to head of queue)
-  /** acknowledge ioctl */
-  public static final int MB_IOCACK   = 0x81;
-
-  /** negative ioctl acknowledge */
-  public static final int MB_IOCNAK   = 0x82;
-
-  /** priority proto message */
-  public static final int MB_PCPROTO  = 0x83;
-
-  /** generate process signal */
-  public static final int MB_PCSIG    = 0x84;
-
-  /** generate read notification */
-  public static final int MB_READ     = 0x85;
-
-  /** flush your queues */
-  public static final int MB_FLUSH    = 0x86;
-
-  /** stop transmission immediately */
-  public static final int MB_STOP     = 0x87;
-
-  /** restart transmission after stop */
-  public static final int MB_START    = 0x88;
-
-  /** line disconnect */
-  public static final int MB_HANGUP   = 0x89;
-
-  /** fatal error used to set u.u_error */
-  public static final int MB_ERROR    = 0x8a;
-
-  /** post an event to an event queue */
-  public static final int MB_PCEVENT  = 0x8b; 
-
-
-  /** Normal priority messages */
-  public static final int MB_NORMAL   = 0x00;
-
-  /** High priority control messages */
-  public static final int MB_PRIORITY = 0x80; 
-
-  // Default private constructor to avoid instantiation
-  private MessageType ()
-  {
-  }
-}
-
diff --git a/java/JACE/ASX/Module.java b/java/JACE/ASX/Module.java
deleted file mode 100644
index 2b80cd690c9..00000000000
--- a/java/JACE/ASX/Module.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    Module.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- *   Provides an abstraction for managing a bi-directional flow of
- *   messages. <P>
- *
- *   This is based on the Module concept in System V Streams,
- *   which contains a pair of Tasks, one for handling upstream
- *   processing, one for handling downstream processing.
- */
-public class Module
-{
-  // = Initialization and termination methods.
-
-  /**
-   * Create an empty Module.
-   */
-  public Module ()
-  {
-    // Do nothing...
-    this.name ("<unknown>");
-  }
-
-  /*
-   * Create an initialized module.
-   *@param modName identity of the module.
-   *@param writerQ writer task of the module.
-   *@param readerQ reader task of the module.
-   *@param flags Module flags
-   */
-  public Module (String modName,
-		 Task writerQ,
-		 Task readerQ,
-		 Object flags)
-  {
-    this.open (modName, writerQ, readerQ, flags);
-  }
-		
-  /*
-   * Create an initialized module.
-   *@param modName identity of the module.
-   *@param writerQ writer task of the module.
-   *@param readerQ reader task of the module.
-   *@param flags Module flags
-   */
-  public void open (String modName,
-		   Task writerQ,
-		   Task readerQ,
-		   Object arg)
-  {
-    this.name (modName);
-    this.arg_ = arg;
-
-    if (writerQ == null)
-      writerQ = new ThruTask ();
-    if (readerQ == null)
-      readerQ = new ThruTask ();
-
-    this.reader (readerQ);
-    this.writer (writerQ);
-
-    // Setup back pointers.
-    readerQ.module (this);
-    writerQ.module (this);
-  }
-
-
-  /*
-   * Set the writer task.
-   *@param q the writer task
-   */
-  public void writer (Task q)
-  { 
-    this.qPair_[1] = q;
-    if (q != null)
-      q.flags (ACE.CLR_BITS (q.flags (), TaskFlags.ACE_READER));
-  }
-
-  /*
-   * Set the reader task.
-   *@param q the reader task
-   */
-  public void reader (Task q) 
-  {
-    this.qPair_[0] = q;
-    if (q != null)
-      q.flags (ACE.SET_BITS (q.flags (), TaskFlags.ACE_READER));
-  }
-
-  /*
-   * Link this Module on top of Module.
-   *@param m the module to link this on top of.
-   */
-  public void link (Module m)
-  {
-    this.next (m);
-    this.writer ().next (m.writer ());
-    m.reader ().next (this.reader ());
-  }
-
-  /*
-   * Set and get pointer to sibling Task in Module.
-   *@param orig the task to get the sibling for
-   *@return the sibling of the task
-   */
-  public Task sibling (Task orig)
-  {
-  if (this.qPair_[0] == orig)
-    return this.qPair_[1];
-  else if (this.qPair_[1] == orig)
-    return this.qPair_[0];
-  else
-    return null;
-  }
-
-  /*
-   * Close down the module and its tasks.
-   *@param flags Module flags
-   *@return 0 on success, -1 on failure
-   */
-  public int close (long flags)
-  {
-    Task readerQ = this.reader ();
-    Task writerQ = this.writer ();
-    int result = 0;
-
-    if (readerQ != null)
-      {
-	if (readerQ.close (flags) == -1)
-	  result = -1;
-	readerQ.flush (flags);
-	readerQ.next (null);
-      }
-
-    if (writerQ != null)
-      {
-	if (writerQ.close (flags) == -1)
-	  result = -1;
-	writerQ.flush (flags);
-	writerQ.next (null);
-      }
-
-    return result;
-  }
-
-  /* 
-   * Get the argument passed to tasks.
-   *@return the argument passed to tasks.
-   */
-  public Object arg ()
-  {
-    return this.arg_;
-  }
-
-  /* 
-   * Set the argument to be passed to tasks.
-   *@param a the argument to be passed to tasks.
-   */
-  public void arg (Object a)
-  {
-    this.arg_ = a;
-  }
-
-  /* 
-   * Get the name of the module.
-   *@return the name of the module.
-   */
-  public String name ()
-  {
-    return this.name_;
-  }
-
-  /* 
-   * Set the name of the module.
-   *@param n the name of the module.
-   */
-  public void name (String n)
-  {
-    this.name_ = n;
-  }
-
-  /* 
-   * Get the writer task of the module.
-   *@return the writer task of the module.
-   */
-  public Task writer ()
-  { 
-    return this.qPair_[1];
-  }
-
-  /* 
-   * Get the reader task of the module.
-   *@return the reader task of the module.
-   */
-  public Task reader ()
-  {
-    return this.qPair_[0];
-  }
-
-  /*
-   * Get the next pointer to the module above in the stream.
-   *@return the next pointer to the module above in the stream.
-   */
-  public Module next ()
-  {
-    return this.next_;
-  }
-
-  /*
-   * Set the next pointer to the module above in the stream.
-   *@param m the next pointer to the module above in the stream.
-   */
-  public void next (Module m) 
-  {
-    this.next_ = m;
-  }
-
-  private Task qPair_[] = new Task[2];
-  // Pair of Tasks that form the "read-side" and "write-side" of the
-  // ACE_Module partitioning.
-
-  private String name_ = null;
-  // Name of the ACE_Module.
-
-  private Module next_;
-  // Next ACE_Module in the stack.
-
-  private Object arg_;
-  // Argument passed through to the reader and writer task when they
-  // are opened.
-
-}
-
diff --git a/java/JACE/ASX/Stream.java b/java/JACE/ASX/Stream.java
deleted file mode 100644
index 6a968714ab7..00000000000
--- a/java/JACE/ASX/Stream.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    Stream.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- *   This class is the primary abstraction for the ASX framework.
- *   It is moduled after System V Stream. <P>
- *
- *   A Stream consists of a stack of Modules, each of which
- *   contains two Tasks.
- *
- *@see Module
- *@see Task
- */
-
-public class Stream
-{
-
-  public Stream ()
-  {
-    this (null, null, null);
-  }
-
-  // Create a Stream consisting of <head> and <tail> as the Stream
-  // head and Stream tail, respectively.  If these are 0 then the
-  // <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively.
-  // <arg> is the value past in to the open() methods of the tasks.
-
-  public Stream (Object a,
-		 Module head,
-		 Module tail)
-  {
-    this.linkedUs_ = null;
-    // this.final_close_ = this.lock_;
-
-    if (this.open (a, head, tail) == -1)
-      ACE.ERROR ("open" + head.name () + " " +  tail.name ());
-  }
-
-  public int push (Module newTop)
-  {
-    if (this.pushModule  (newTop, 
-			  this.streamHead_.next (), 
-			  this.streamHead_) == -1)
-      return -1;
-    else
-      return 0;
-  }
-
-    // Note that the timeout tv is absolute time
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    return this.streamHead_.writer ().put (mb, tv);
-  }
-
-    // Note that the timeout tv is absolute time
-  public MessageBlock get (TimeValue tv) throws InterruptedException
-  {
-    return this.streamHead_.reader ().getq (tv);
-  }
-
-// Return the "top" ACE_Module in a ACE_Stream, skipping over the
-// stream_head.
-
-  public Module top ()
-  {
-    if (this.streamHead_.next () == this.streamTail_)
-      return null;
-    else
-      return this.streamHead_.next ();
-  }
-
-// Remove the "top" ACE_Module in a ACE_Stream, skipping over the
-// stream_head.
-
-  public int pop (long flags)
-  {
-    if (this.streamHead_.next () == this.streamTail_)
-      return -1;
-    else
-      {
-	// Skip over the ACE_Stream head.
-	Module top = this.streamHead_.next ();
-	Module newTop = top.next ();
-
-	this.streamHead_.next (newTop);
-
-	// Close the top ACE_Module.
-
-	top.close (flags);
-
-	this.streamHead_.writer ().next (newTop.writer ());
-	newTop.reader ().next (this.streamHead_.reader ());
-
-	return 0;
-      }
-  }
-
-// Remove a named ACE_Module from an arbitrary place in the
-// ACE_Stream.
-
-  public int remove (String name, long flags)
-  {
-    Module prev = null;
-
-    for (Module mod = this.streamHead_; 
-	 mod != null; mod = mod.next ())
-      if (name.compareTo (mod.name ()) == 0)
-	{
-	  if (prev == null) // Deleting ACE_Stream Head
-	    this.streamHead_.link (mod.next ());
-	  else
-	    prev.link (mod.next ());
-	  
-	  mod.close (flags);
-	  return 0;
-	}
-      else
-	prev = mod;
-
-    return -1;
-  }
-
-  public Module find (String name)
-  {
-    for (Module mod = this.streamHead_; 
-	 mod != null; 
-	 mod = mod.next ())
-      if (name.compareTo (mod.name ()) == 0)
-	return mod;
-
-    return null;
-  }
-
-// Actually push a module onto the stack...
-
-  private int pushModule (Module newTop, 
-			  Module currentTop, 
-			  Module head)
-  {
-    Task ntReader = newTop.reader ();
-    Task ntWriter = newTop.writer ();
-    Task ctReader = null;
-    Task ctWriter = null;
-
-    if (currentTop != null)
-      {
-      ctReader = currentTop.reader ();
-      ctWriter = currentTop.writer ();
-      ctReader.next (ntReader);
-      }
-
-    ntWriter.next (ctWriter);
-
-    if (head != null)
-      {
-	if (head != newTop)
-	  head.link (newTop);
-      }
-    else
-      ntReader.next (null);
-
-    newTop.next (currentTop);
-
-    if (ntReader.open (newTop.arg ()) == -1)
-      return -1;
-
-    if (ntWriter.open (newTop.arg ()) == -1)
-      return -1;
-    return 0;
-  }
-
-  public synchronized int open (Object a, 
-				Module head, 
-				Module tail)
-  {
-    Task h1 = null, h2 = null;
-    Task t1 = null, t2 = null;
-
-    if (head == null)
-      {
-	h1 = new StreamHead ();
-	h2 = new StreamHead ();
-	head = new Module ("ACEStreamHead", h1, h2, a);
-      }
-
-    if (tail == null)
-      {
-	t1 = new StreamTail ();
-	t2 = new StreamTail ();
-	tail = new Module ("ACEStreamTail", 
-			   t1, t2, a);
-      }
-
-    // Make sure *all* the allocation succeeded!
-    if (h1 == null || h2 == null || head == null
-	|| t1 == null || t2 == null || tail == null)
-      {
-      // Close up!
-	head.close (0);
-	tail.close (0);
-	return -1;
-      }
-
-    this.streamHead_ = head;
-    this.streamTail_ = tail;
-
-    if (this.pushModule (this.streamTail_,
-			 null, null) == -1)
-      return -1;
-    else if (this.pushModule (this.streamHead_, 
-			      this.streamTail_, 
-			      this.streamHead_) == -1)
-      return -1;
-    else
-      return 0;
-  }
-
-  public synchronized int close (long flags)
-  {
-    if (this.streamHead_ != null
-	&& this.streamTail_ != null)
-      {
-	// Don't bother checking return value here.
-	this.unlinkInternal ();
-
-	int result = 0;
-
-	// Remove and cleanup all the intermediate modules.
-
-	while (this.streamHead_.next () != this.streamTail_)
-	  {
-	    if (this.pop (flags) == -1)
-	      result = -1;
-	  }
-  
-	// Clean up the head and tail of the stream.
-	if (this.streamHead_.close (flags) == -1)
-	  result = -1;
-	if (this.streamTail_.close (flags) == -1)
-	  result = -1;
-
-	this.streamHead_ = null;
-	this.streamTail_ = null;
-
-	// Tell all threads waiting on the close that we are done.
-	//      this.final_close_.broadcast ();
-	return result;
-      }
-    return 0;
-  }
-
-  public int control (int cmd, Object a) throws InterruptedException
-  {
-    IOCntlMsg ioc = new IOCntlMsg (cmd);
-
-    // Create a data block that contains the user-supplied data.
-    MessageBlock db = 
-      new MessageBlock (MessageType.MB_IOCTL, 
-			null, 
-			a);
-
-    // Create a control block that contains the control field and a
-    // pointer to the data block.
-    MessageBlock cb = 
-      new MessageBlock (MessageType.MB_IOCTL, 
-			db, 
-			(Object) ioc);
-
-    int result = 0;
-
-    if (this.streamHead_.writer ().put (cb, null) == -1)
-      result = -1;
-    else if ((cb = this.streamHead_.reader ().getq (null)) == null)
-      result = -1;
-    else
-      result = ((IOCntlMsg ) cb.obj ()).rval ();
-
-    return result;
-  }
-
-// Link two streams together at their bottom-most Modules (i.e., the
-// one just above the Stream tail).  Note that all of this is premised
-// on the fact that the Stream head and Stream tail are non-NULL...
-// This must be called with locks held.
-
-  private int linkInternal (Stream us)
-  {
-    this.linkedUs_ = us;
-    // Make sure the other side is also linked to us!
-    us.linkedUs_ = this;
-
-    Module myTail = this.streamHead_;
-
-    if (myTail == null)
-      return -1;
-
-    // Locate the module just above our Stream tail. 
-    while (myTail.next () != this.streamTail_)
-      myTail = myTail.next ();
-
-    Module otherTail = us.streamHead_;
-
-    if (otherTail == null)
-      return -1;
-
-  // Locate the module just above the other Stream's tail.
-    while (otherTail.next () != us.streamTail_)
-      otherTail = otherTail.next ();
-
-    // Reattach the pointers so that the two streams are linked!
-    myTail.writer ().next (otherTail.reader ());
-    otherTail.writer ().next (myTail.reader ());
-    return 0;
-  }
-
-  public synchronized int link (Stream us)
-  {
-    return this.linkInternal (us);
-  }  
-
-// Must be called with locks held...
-
-  private int unlinkInternal ()
-  {
-  // Only try to unlink if we are in fact still linked!
-    
-    if (this.linkedUs_ != null)
-    {
-      Module myTail = this.streamHead_;
-
-      // Only relink if we still exist!
-      if (myTail != null)
-	{
-	  // Find the module that's just before our stream tail.
-	  while (myTail.next () != this.streamTail_)
-	    myTail = myTail.next ();
-
-	  // Restore the writer's next() link to our tail.
-	  myTail.writer ().next (this.streamTail_.writer ());
-	}
-
-      Module otherTail = this.linkedUs_.streamHead_;
-
-      // Only fiddle with the other side if it in fact still remains.
-      if (otherTail != null)
-	{
-	  while (otherTail.next () != this.linkedUs_.streamTail_)
-	    otherTail = otherTail.next ();
-
-	  otherTail.writer ().next (this.linkedUs_.streamTail_.writer ());
-	  
-	}
-
-      // Make sure the other side is also aware that it's been unlinked!
-      this.linkedUs_.linkedUs_ = null;
-
-      this.linkedUs_ = null;
-      return 0;
-    }
-    else
-      return -1;
-  }
-
-  public synchronized int unlink ()
-  {
-    return this.unlinkInternal ();
-  }
-
-  public void dump ()
-  {
-    ACE.DEBUG ("-------- module links --------");
-
-    for (Module mp = this.streamHead_; ; mp = mp.next ())
-      {
-	ACE.DEBUG ("module name = " + mp.name ());
-	if (mp == this.streamTail_)
-	  break;
-      }
-    
-    ACE.DEBUG ("-------- writer links --------");
-    
-    Task tp;
-    
-    for (tp = this.streamHead_.writer (); ; tp = tp.next ())
-      {
-	ACE.DEBUG ("writer queue name = " + tp.name ());
-	tp.dump ();
-	ACE.DEBUG ("-------\n");
-	if (tp == this.streamTail_.writer ()
-	    || (this.linkedUs_ != null && tp == this.linkedUs_.streamHead_.reader ()))
-	  break;
-      }
-
-    ACE.DEBUG ("-------- reader links --------\n");
-    for (tp = this.streamTail_.reader (); ; tp = tp.next ())
-      {
-	ACE.DEBUG ("reader queue name = " + tp.name ());
-	tp.dump ();
-	ACE.DEBUG ("-------\n");
-	if (tp == this.streamHead_.reader ()
-	    || (this.linkedUs_ != null && tp == this.linkedUs_.streamHead_.writer ()))
-	  break;
-      }
-  }
-
-  Module streamHead_ = null;
-  // Pointer to the head of the stream.
-
-  Module streamTail_ = null;
-  // Pointer to the tail of the stream.
-
-  Stream linkedUs_ = null;
-  // Pointer to an adjoining linked stream.
-
-  // = Synchronization objects used for thread-safe streams.
-  //  ACE_SYNCH_MUTEX lock_;
-  // Protect the stream against race conditions.
-  
-  //  ACE_SYNCH_CONDITION final_close_;
-  // Use to tell all threads waiting on the close that we are done.
-
-}
-
-
diff --git a/java/JACE/ASX/StreamHead.java b/java/JACE/ASX/StreamHead.java
deleted file mode 100644
index 1492b43a297..00000000000
--- a/java/JACE/ASX/StreamHead.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    StreamHead.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * Standard module that acts as the head of a ustream.
- */
-
-public class StreamHead extends Task
-{
-  // Module that acts as the head of a Stream.
-
-  public int open (Object obj)
-  {
-    return 0;
-  }
-
-  public int close (long l)
-  {
-    return 0;
-  }
-
-  public int svc ()
-  {
-    return -1;
-  }
-
-  private int control (MessageBlock mb)
-  {
-    
-    IOCntlMsg ioc = (IOCntlMsg) mb.obj ();
-    int cmd = ioc.cmd ();
-
-    switch (cmd)
-      {
-      case IOCntlCmds.SET_LWM:
-      case IOCntlCmds.SET_HWM:
-	this.waterMarks (cmd, mb.cont ().length ());
-	ioc.rval (0);
-      break;
-    default:
-      return 0;
-    }
-  return ioc.rval ();
-  }
-
-  /* Performs canonical flushing at the ACE_Stream Head */
-
-  private int canonicalFlush (MessageBlock mb)
-  {
-    String s = mb.base ();
-    long f = (new Long (s)).longValue ();
-
-    if ((f & TaskFlags.ACE_FLUSHR) != 0)
-      {
-	this.flush (TaskFlags.ACE_FLUSHALL);
-	f &= ~TaskFlags.ACE_FLUSHR;
-      }
-    if ((f & TaskFlags.ACE_FLUSHW) != 0)
-      return this.reply (mb, null);
-    return 0;
-  }
-
-  // Will block forever to add the given MessageBlock
-  public int put (MessageBlock mb) 
-  {
-      return this.put (mb, null);
-  }
-
-  // tv is absolute time
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    int res = 0;
-    if (mb.msgType () == MessageType.MB_IOCTL
-	&& (res = this.control (mb)) == -1)
-      return res;
-    
-    if (this.isWriter ())
-      {
-	return this.putNext (mb, tv);
-      }
-    else /* this.isReader () */
-      {      
-	switch (mb.msgType ())
-	  {
-	  case MessageType.MB_FLUSH:
-	    return this.canonicalFlush (mb);
-	  default:
-	    break;
-	  }
-      
-	try
-	  {
-	    return this.putq (mb, tv);
-	  }
-	catch (InterruptedException e)
-	  {
-	    return -1;
-	  }
-      }
-  }
-
-  public void dump ()
-  {
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-
-}
diff --git a/java/JACE/ASX/StreamTail.java b/java/JACE/ASX/StreamTail.java
deleted file mode 100644
index c1148a4c0f1..00000000000
--- a/java/JACE/ASX/StreamTail.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    StreamTail.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- *     Standard module that acts as the tail of a ustream.
- */
-public class StreamTail extends Task
-{
-  // Module that acts as the tail of a Stream.
-
-  public int open (Object obj)
-  {
-    return 0;
-  }
-
-  public int close (long l)
-  {
-    return 0;
-  }
-
-  public int svc ()
-  {
-    return -1;
-  }
-
-  private int control (MessageBlock mb)
-  {
-    IOCntlMsg ioc = (IOCntlMsg) mb.obj ();
-    int cmd = ioc.cmd ();
-
-    switch (cmd)
-      {
-      case IOCntlCmds.SET_LWM:
-      case IOCntlCmds.SET_HWM:
-	{
-	  int size = mb.cont ().length ();
-	  
-	  this.waterMarks (cmd, size);
-	  this.sibling ().waterMarks (cmd, size);
-	  ioc.rval (0);
-	  break;
-	}
-      default:
-	mb.msgType (MessageType.MB_IOCNAK);
-      }
-    return this.reply (mb, null);
-  }
-
-  // Perform flush algorithm as though we were the driver
-  private int canonicalFlush (MessageBlock mb)
-  {
-    String s = mb.base ();
-    long f = (new Long (s)).longValue ();
-
-    if ((f & TaskFlags.ACE_FLUSHW) != 0)
-      {
-	this.flush (TaskFlags.ACE_FLUSHALL);
-	f &= ~TaskFlags.ACE_FLUSHW;
-      }
-    if ((f & TaskFlags.ACE_FLUSHR) != 0)
-      {
-	this.sibling ().flush (TaskFlags.ACE_FLUSHALL);
-	return this.reply (mb, null);
-      }
-    return 0;
-  }
-
-  // put the given MessageBlock without a timeout (block forever if
-  // necessary)
-  public int put (MessageBlock mb) 
-  {
-    return this.put (mb, null);
-  }
-
-  // tv is an absolute time timeout
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    if (this.isWriter ())
-    {
-      switch (mb.msgType ())
-	{
-	case MessageType.MB_IOCTL:
-	  return this.control (mb);
-	  /* NOTREACHED */
-	default:
-	  break;
-	}
-    }
-
-    return -1;
-  }
-
-  public void dump ()
-  {
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-
-}
diff --git a/java/JACE/ASX/Task.java b/java/JACE/ASX/Task.java
deleted file mode 100644
index b13de64f16a..00000000000
--- a/java/JACE/ASX/Task.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    Task.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-import JACE.Reactor.*;
-import JACE.Concurrency.*;
-
-/**
- *  Primary interface for application message processing, as well
- *  as input and output message queueing. <P>
- *
- *  This class serves as the basis for passive and active objects
- *  in ACE.
- *
- *@see MessageQueue
- *@see EventHandler
- */
-public abstract class Task implements Runnable, EventHandler
-{
-  // = Initialization/termination methods.
-
-  /**
-   * Initialize a Task. Note, we allocate a message queue ourselves.
-   */
-  public Task ()
-  {
-    this.msgQueue_ = new MessageQueue ();
-    this.thrMgr_ = null;
-  }
-
-  /**
-   * Initialize a Task. Note, we use the message queue and thread
-   * manager supplied by the user.
-   *@param mq Message Queue to hold list of messages on the Task
-   *@param thrMgr Thread Manager that manages all the spawned threads
-   */
-  public Task (MessageQueue mq,
-	       ThreadManager thrMgr)
-  {
-    this.msgQueue_ = mq;
-    this.thrMgr_ = thrMgr;
-  }
-
-  /**
-   * Not meant to be invoked by the user directly!. This needs to be
-   * in the public interface in order to get invoked by Thread
-   * class.
-   */
-  public void run ()
-  {
-    this.svc ();
-  }
-
-  // = Initialization and termination hooks (note that these *must* be
-  // defined by subclasses).
-
-  /**
-   * Hook called to open a Task. 
-   *@param obj used to pass arbitrary information
-   */
-  public abstract int open (Object obj);
-
-  /**
-   * Hook called to close a Task.
-   */
-  public abstract int close (long flags);
-
-  // = Immediate and deferred processing methods, respectively.
-
-  /**
-   * Transfer a message into the queue to handle immediate
-   * processing.
-   *@param mb Message Block to handle immediately
-   *@param tv Latest time to wait until (absolute time)
-   */
-  public abstract int put (MessageBlock mb, TimeValue tv);
-
-  /** 
-   * Run by a daemon thread to handle deferred processing. Note, that
-   * to do anything useful, this method should be overriden by the
-   * subclass.
-   *@return default implementation always returns 0.
-   */
-  public int svc ()
-  {
-    return 0;
-  }
-
-  /**
-   * Set the underlying Thread Manager.
-   *@param t Thread Manager to use
-   */
-  public synchronized void thrMgr (ThreadManager t)
-  {
-    this.thrMgr_ = t;
-  }
-
-  /**
-   * Get the Thread Manager.
-   *@return Underlying Thread Manager 
-   */
-  public synchronized ThreadManager thrMgr ()
-  {
-    return this.thrMgr_;
-  }
-
-  // = Active object method.
-
-  /**
-   * Turn the task into an active object. That is, having <nThreads>
-   * separate threads of control that all invoke Task::svc.
-   *@param flags Task Flags
-   *@param nThreads number of threads to spawn
-   *@param forceActive whether to force creation of new threads or not
-   *@return -1 if failure occurs, 1 if Task is already an active
-   * object and <forceActive> is false (doesn't *not* create a new
-   * thread in this case), and 0 if Task was not already an active
-   * object and a thread is created successfully or thread is an active
-   * object and <forceActive> is true.
-   */
-  public synchronized int activate (long flags, int nThreads, boolean forceActive)
-  {
-    // Create a Thread Manager if we do not already have one
-    if (this.thrMgr_ == null)
-      this.thrMgr_ = new ThreadManager ();
-
-    if (this.thrCount () > 0 && forceActive == false)
-      return 1; // Already active.
-    this.flags_ = flags;
-
-    if (ACE.BIT_ENABLED (flags, TaskFlags.THR_DAEMON))
-      this.thrMgr_.spawnN (nThreads, this, true); // Spawn off all threads as daemon threads
-    else        // Spawn off all threads as normal threads
-      this.thrMgr_.spawnN (nThreads, this, false);
-
-    return 0;
-  }
-  
-  // = Suspend/resume a Task
-
-  /**
-   * Suspend a task.  Default implementation is a no-op.
-   */
-  public synchronized void suspend ()
-  {
-  }
-
-  /** 
-   * Resume a suspended task.  Default implementation is a no-op.
-   */
-  public synchronized void resume ()
-  {
-  }
-
-  /**
-   * Get the current group name.
-   *@return name of the current thread group
-   */
-  public synchronized String grpName ()
-  {
-    if (this.thrMgr_ != null)
-      return this.thrMgr_.thrGrp ().getName ();
-    else
-      return null;
-  }
-
-  /**
-   * Get the message queue associated with this task.
-   *@return the message queue associated with this task.
-   */
-  public MessageQueue msgQueue ()
-  {
-    return this.msgQueue_;
-  }
-
-  /**
-   * Set the message queue associated with this task.
-   *@param mq Message Queue to use with this Task.
-   */
-  public void msgQueue (MessageQueue mq)
-  {
-    this.msgQueue_ = mq;
-  }
-
-  /**
-   * Get the number of threads currently running within the Task.
-   *@return the number of threads currently running within the Task.
-   * 0 if we're a passive object, else > 0.
-   */
-  public synchronized int thrCount ()
-  {
-    if (this.thrMgr_ != null)
-      return this.thrMgr_.thrGrp ().activeCount ();
-    else
-      return 0;
-  }
-
-  /**
-   * Set the Task flags
-   *@param flags Task Flags
-   */
-  public synchronized void flags (long flags)
-  {
-    this.flags_ = flags;
-  }
-
-  /**
-   * Get the Task flags
-   *@return Task Flags
-   */
-  public synchronized long flags ()
-  {
-    return this.flags_;
-  }
-
-  // = Message queue manipulation methods.
-
-
-  /*
-   * Dump debug information.
-   */
-  public void dump ()
-  {
-  }
-
-  /**
-   * Insert a message into the queue, blocking forever if necessary.
-   *@param mb Message Block to insert
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  protected int putq (MessageBlock mb) throws InterruptedException
-  {
-    return this.putq(mb, null);
-  }
-
-  /**
-   * Insert message into the message queue.
-   *@param mb Message Block to insert into the Message Queue
-   *@param tv time to wait until (absolute time)
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  protected int putq (MessageBlock mb, TimeValue tv) throws InterruptedException
-  {
-    return this.msgQueue_.enqueueTail (mb, tv);
-  }
-
-  /**
-   * Extract the first message from the queue, blocking forever if
-   * necessary.
-   *@return the first Message Block from the Message Queue.
-   *@exception InterrupteException Interrupted while accessing queue
-   */
-  protected MessageBlock getq() throws InterruptedException
-  {
-    return this.getq(null);
-  }
-
-  /**
-   * Extract the first message from the queue. Note that the call is blocking.
-   *@return the first Message Block from the Message Queue.
-   *@param tv Latest time to wait until (absolute time)
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  protected MessageBlock getq (TimeValue tv) throws InterruptedException
-  {
-    return this.msgQueue_.dequeueHead (tv);
-  }
-
-  /**
-   * Return a message back to the queue.
-   *@param mb Message Block to return back to the Message Queue
-   *@param tv Latest time to wait until (absolute time)
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  protected int ungetq (MessageBlock mb, TimeValue tv) throws InterruptedException
-  {
-    return this.msgQueue_.enqueueHead (mb, tv);
-  }
-
-  /**
-   * Transfer message to the adjacent ACETask in an ACEStream.
-   *@param mb Message Block to transfer to the adjacent Task
-   *@param tv Latest time to wait until (absolute time)
-   *@return -1 if there is no adjacent Task, else the return value of
-   * trying to put the Message Block on that Task's Message Queue.
-   */
-  protected int putNext (MessageBlock mb, TimeValue tv)
-  {
-    return this.next_ == null ? -1 : this.next_.put (mb, tv);
-  }
-
-  /**
-   * Turn the message back around. Puts the message in the sibling's
-   * Message Queue.
-   *@param mb Message Block to put into sibling's Message Queue
-   *@param tv Latest time to wait until (absolute time)
-   *@return -1 if there is no adjacent Task to the sibling, else the
-   * return value of trying to put the Message Block on sibling's
-   * Message Queue. 
-   */
-  protected int reply (MessageBlock mb, TimeValue tv)
-  {
-    return this.sibling ().putNext (mb, tv);
-  }
-
-  // = ACE_Task utility routines to identify names et al.
-
-  /**
-   * Get the name of the enclosing Module.
-   *@return the name of the enclosing Module if there's one associated
-   * with the Task, else null.
-   */
-  protected String name ()
-  {
-    if (this.mod_ == null)
-      return null;
-    else
-      return this.mod_.name ();
-  }
-
-  /**
-   * Get the Task's sibling.
-  *@return the Task's sibling if there's one associated with the
-  * Task's Module, else null.
-  */
-  protected Task sibling ()
-  {
-    if (this.mod_ == null)
-      return null;
-    else
-      return this.mod_.sibling (this);
-  }
-
-  /**
-   * Set the Task's module.
-  *@param mod the Task's Module.
-  */
-  protected void module (Module mod)
-  {
-    this.mod_ = mod;
-  }
-
-  /**
-   * Get the Task's module.
-  *@return the Task's Module if there is one, else null.
-  */
-  protected Module module ()
-  {
-    return this.mod_;
-  }
-
-  /**
-   * Check if queue is a reader.
-   *@return true if queue is a reader, else false.
-   */
-  protected boolean isReader ()
-  {
-    return (ACE.BIT_ENABLED (this.flags_, TaskFlags.ACE_READER));
-  }
-
-  /**
-   * Check if queue is a writer.
-   *@return true if queue is a writer, else false.
-   */
-  protected boolean isWriter ()
-  {
-    return (ACE.BIT_DISABLED (this.flags_, TaskFlags.ACE_READER));
-  }
-
-  // = Pointers to next ACE_Queue (if ACE is part of an ACE_Stream).
-
-  /**
-   * Get next Task pointer.
-   *@return pointer to the next Task
-   */
-  protected Task next ()
-  {
-    return this.next_;
-  }
-
-  /**
-   * Set next Task pointer.
-   *@param task next task pointer
-   */
-  protected void next (Task task)
-  {
-    this.next_ = task;
-  }
-
-  // Special routines corresponding to certain message types.
-
-  /**
-   * Flush the Message Queue
-   *@return 0 if Message Queue is null, 1 if flush succeeds, -1 if
-   * ACE_FLUSHALL bit is not enabled in flags.
-   */
-  protected int flush (long flag)
-  {
-    if (ACE.BIT_ENABLED (flag, TaskFlags.ACE_FLUSHALL))
-      return (this.msgQueue_ == null ? 0 : 1);
-    else
-      return -1;
-  }
-
-
-  /**
-   * Manipulate watermarks.
-   *@param cmd IOCntlCmd
-   *@param size watermark
-   */
-  protected void waterMarks (int cmd, int size)
-  {
-    if (cmd == IOCntlCmds.SET_LWM)
-      this.msgQueue_.lowWaterMark (size);
-    else /* cmd == IOCntlMsg.SET_HWM */
-      this.msgQueue_.highWaterMark (size);
-  }
-
-  private ThreadManager thrMgr_ = null;
-  // Thread_Manager that manages all the spawned threads
-
-  private long flags_;
-  // Task flags.
-
-  private MessageQueue msgQueue_;
-  // List of messages on the Task..
-
-  private Task next_;
-  // Adjacent ACE_Task.
-
-  private Module mod_;
-  // Back-pointer to the enclosing module.
-}
diff --git a/java/JACE/ASX/TaskFlags.java b/java/JACE/ASX/TaskFlags.java
deleted file mode 100644
index 13347283adf..00000000000
--- a/java/JACE/ASX/TaskFlags.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TaskFlags.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-/**
- * Flags used within Task.
- *
- *@see Task
- */
-public abstract class TaskFlags
-{
-  /** Identifies a Task as being the "reader" in a Module. */
-  public static final int ACE_READER    = 01;
-
-  /** Just flush data messages in the queue. */
-  public static final int ACE_FLUSHDATA = 02;
-
-  /** Flush all messages in the Queue. */
-  public static final int ACE_FLUSHALL  = 04;
-
-  /** Flush read queue */
-  public static final int ACE_FLUSHR    = 010;
-
-  /** Flush write queue */
-  public static final int ACE_FLUSHW    = 020;
-
-  /** Flush both queues */
-  public static final int ACE_FLUSHRW   = 030;
-
-  /** Identifies a thread as suspended */
-  public static final int THR_SUSPENDED = 0x00000080;
-
-  /** Identifies a thread as a daemon thread */
-  public static final int THR_DAEMON    = 0x00000100;
-
-  // Default private constructor to avoid instantiation
-  private TaskFlags ()
-  {
-  }
-}
diff --git a/java/JACE/ASX/ThruTask.java b/java/JACE/ASX/ThruTask.java
deleted file mode 100644
index 3fd0bbd4476..00000000000
--- a/java/JACE/ASX/ThruTask.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    ThruTask.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-    
-/**
- *     Standard module that acts as a "no op", simply passing on all
- *     data to its adjacent neighbor.
- */
-public class ThruTask extends Task
-{
-  public int open (Object obj)
-  {
-    return 0;
-  }
-
-  public int close (long flags)
-  {
-    return 0;
-  }
-  
-  public int put (MessageBlock msg, TimeValue tv)
-  {
-    return this.putNext (msg, tv);
-  }
-
-  public int svc ()
-  {
-    return -1;
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-}
diff --git a/java/JACE/ASX/TimeValue.java b/java/JACE/ASX/TimeValue.java
deleted file mode 100644
index 452f80447c4..00000000000
--- a/java/JACE/ASX/TimeValue.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Reactor
- *
- * = FILENAME
- *    TimeValue.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-//package JACE.Reactor;
-package JACE.ASX;
-
-/**
- * Encapsulates a specific time or time interval. <P>
- *
- * Also provides methods for generating absolute times from
- * relative times.  This is used throughout JACE for timeouts.
- *
- *@see TimedWait
- */
-public class TimeValue
-{
-  /**
-   * TimeValue representing 0 seconds and 0 nanoseconds.
-   */
-  public final static TimeValue zero = new TimeValue (0,0);
-
-  /** 
-   * Default constructor.  This creates a TimeValue that is
-   * equal to TimeValue.zero.
-   */
-  public TimeValue ()
-  {
-    this (0, 0);
-  }
-
-  /** 
-   * Constructor
-   *@param sec seconds
-   */
-  public TimeValue (long sec)
-  {
-    this (sec, 0);
-  }
-
-  /** 
-   * Constructor
-   *@param sec seconds
-   *@param nanos nanoseconds
-   */
-  public TimeValue (long sec, int nanos)
-  {
-    this.set (sec, nanos);
-  }
-
-  /** 
-   * Sets the seconds and nanoseconds of Time Value
-   *@param sec seconds
-   *@param nanos nanoseconds
-   */
-  public void set (long sec, int nanos)
-  {
-    this.millisec_ = sec * 1000;
-    this.nanos_ = nanos;
-    this.normalize ();
-  }
-
-  /** 
-   * Get seconds
-   *@return Seconds
-   */
-  public long sec ()
-  {
-    return this.millisec_/1000;
-  }
-
-  /** 
-   * Get nanoseconds
-   *@return Nanoseconds
-   */
-  public int nanos ()
-  {
-    return this.nanos_;
-  }
-
-  /** 
-   * Get time in milliseconds.
-   *@return time in milliseconds
-   */
-  public long getMilliTime ()
-  {
-    return this.millisec_;
-  }
-
-  /**
-   * Get a String representation of the Time Value.
-   *@return String representation of the Time Value
-   */
-  public String toString ()
-  {
-    return (new Long (this.millisec_/1000)).toString () + ":" +
-      (new Integer (this.nanos_)).toString ();
-  }
-
-  /** 
-   * Get current time.
-   *@return the current system time as a new TimeValue
-   */
-  public static TimeValue getTimeOfDay ()
-  {
-    return new TimeValue (System.currentTimeMillis ()/1000);
-  }
-
-  /**
-   * Return a new TimeValue that represents the current system time 
-   * of day offset by the given number of seconds and nanoseconds.  
-   *@param sec Number of seconds to offset by
-   *@param nanos Number of nanoseconds to offset by
-   *@see JACE.ASX.TimeValue
-   *@return TimeValue for the system time plus the given offset
-   */
-  public static TimeValue relativeTimeOfDay(long sec, int nanos) 
-  {
-    return new TimeValue ((System.currentTimeMillis() / 1000) + sec,
-			 nanos);
-  }  
-
-  /**
-   * Return a new TimeValue that represents the current system time 
-   * of day offset by the given TimeValue.
-   *@param tv TimeValue to offset by
-   *@see JACE.ASX.TimeValue
-   *@return TimeValue for the system time plus the given offset
-   */
-  public static TimeValue relativeTimeOfDay(TimeValue offset)
-  {
-    return new TimeValue ((System.currentTimeMillis() / 1000) +
-			  offset.sec(),
-			  offset.nanos());
-  }
-
-  /**
-   * Compare two Time Values for equality.
-   *@param tv Time Value to compare with
-   *@return true if the two Time Values are equal, false otherwise
-   */
-  public boolean equals (TimeValue tv)
-  {
-    return this.millisec_ == (tv.sec () * 1000) && this.nanos_ == tv.nanos ();
-  }
-
-  /**
-   * Compare two Time Values for non-equality.
-   *@param tv Time Value to compare with
-   *@return true if the two Time Values are not equal, false otherwise
-   */
-  public boolean notEquals (TimeValue tv)
-  {
-    return !this.equals (tv);
-  }
-
-  /**
-   * Add two Time Values.
-   *@param tv1 The first Time Value
-   *@param tv2 The second Time Value
-   *@return sum of the two Time Values.
-   */
-  public static TimeValue plus (TimeValue tv1, TimeValue tv2)
-  {
-    TimeValue tv = new TimeValue (tv1.sec () + tv2.sec (), 
-				  tv1.nanos () + tv2.nanos ());
-    tv.normalize ();
-    return tv;
-  }
-
-  /**
-   * Subtract two Time Values.
-   *@param tv1 The first Time Value
-   *@param tv2 The second Time Value
-   *@return difference of the two Time Values.
-   */
-  public static TimeValue minus (TimeValue tv1, TimeValue tv2)
-  {
-    TimeValue tv = new TimeValue (tv1.sec () - tv2.sec (), 
-				  tv1.nanos () - tv2.nanos ());
-    tv.normalize ();
-    return tv;
-  }
-
-  /**
-   * Add Time Value to "this".
-   *@param tv The Time Value to add to this.
-   */
-  public void plusEquals (TimeValue tv)
-  {
-    this.set (this.sec () + tv.sec (),
-	      this.nanos () + tv.nanos ());
-    this.normalize ();
-  }
-
-  /**
-   * Subtract Time Value from "this".
-   *@param tv The Time Value to subtract from this.
-   */
-  public void minusEquals (TimeValue tv)
-  {
-    this.set (this.sec () - tv.sec (),
-	      this.nanos () - tv.nanos ());
-    this.normalize ();
-  }
-
-  /**
-   * Compare two Time Values for less than.
-   *@param tv Time Value to compare with
-   *@return true if "this" is less than tv, false otherwise
-   */
-  public boolean lessThan (TimeValue tv)
-  {
-    return tv.greaterThan (this);
-  }
-
-  /**
-   * Compare two Time Values for greater than.
-   *@param tv Time Value to compare with
-   *@return true if "this" is greater than tv, false otherwise
-   */
-  public boolean greaterThan (TimeValue tv)
-  {
-    if (this.sec () > tv.sec ())
-      return true;
-    else if (this.sec () == tv.sec ()
-	     && this.nanos () > tv.nanos ()) 
-      return true;
-    else
-      return false;
-  }
-
-  /**
-   * Compare two Time Values for <=.
-   *@param tv Time Value to compare with
-   *@return true if "this" <= tv, false otherwise
-   */
-  public boolean lessThanEqual (TimeValue tv)
-  {
-    return tv.greaterThanEqual (this);
-  }
-
-  /**
-   * Compare two Time Values for >=.
-   *@param tv Time Value to compare with
-   *@return true if "this" >= tv, false otherwise
-   */
-  public boolean greaterThanEqual (TimeValue tv)
-  {
-    return this.sec () >= tv.sec () && this.nanos () >= tv.nanos ();
-  }
-
-  private void normalize ()
-  {
-    if (this.nanos_ >= ONE_MILLISECOND)
-      {
-	do
-	  { 
-	    this.millisec_++;
-	    this.nanos_ -= ONE_MILLISECOND;
-	  }
-	while (this.nanos_ >= ONE_MILLISECOND);
-      }
-    else if (this.nanos_ <= -ONE_MILLISECOND)
-      {
-	do
-	  { 
-	    this.millisec_--;
-	    this.nanos_ += ONE_MILLISECOND;
-	  }
-	while (this.nanos_ <= -ONE_MILLISECOND);
-      }
-    
-    if (this.millisec_ >= 1 && this.nanos_ < 0)
-      {
-	this.millisec_--;
-	this.nanos_ += ONE_MILLISECOND;
-      }
-    else if (this.millisec_ < 0 && this.nanos_ > 0)
-      {
-	this.millisec_++;
-	this.nanos_ -= ONE_MILLISECOND;
-      }
-  }
-
-  private long millisec_;
-  private int nanos_;
-  private final static int ONE_MILLISECOND = 1000000;
-}
diff --git a/java/JACE/ASX/TimedWait.java b/java/JACE/ASX/TimedWait.java
deleted file mode 100644
index dc1d0bab673..00000000000
--- a/java/JACE/ASX/TimedWait.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TimedWait.java
- *
- *@author Prashant Jain and Doug Schmidt
- *
- *************************************************/
-package JACE.ASX;
-
-/**
- * A wait/notify system with absolute time timeouts and built-in
- * check of a condition. <P>
- *
- * Subclasses define the condition to check, and the object to 
- * wait on can be specified.
- */
-public abstract class TimedWait
-{
-  /**
-   * Default Constructor. Sets "this" to be used for the delegation of
-   * the wait() call to. 
-   */
-  public TimedWait ()
-  {
-    object_ = this;
-  }
-
-  /**
-   * Constructor. Allows subclasses to supply us with an Object that
-   * is delegated the wait() call.
-   *@param obj The Object that is delegated the wait() call.
-   */
-  public TimedWait (Object obj)
-  {
-    object_ = obj;
-  }
-
-  /**
-   * Hook method that needs to be implemented by subclasses.
-   */
-  public abstract boolean condition ();
-
-  /**
-   * Wait until condition becomes true. Note that the method
-   * blocks. Also note that this method is final to ensure that no one
-   * overrides it. 
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   *@exception InterruptedException Interrupted during wait
-   */
-  public final void timedWait () throws InterruptedException
-  {
-    // Acquire the monitor lock.
-    if (!condition ()) 
-      {
-	// Only attempt to perform the wait if the condition isn't
-	// true initially.
-	for (;;) 
-	  {
-	    // Wait until we are notified.
-	    object_.wait ();
-
-	  // Recheck the condition.
-	  if (condition ()) 
-	    break; // Condition became true.
-
-	  // else we were falsely notified so go back into wait
-	  }
-      }
-  }
-
-  /**
-   * Template Method that implements the actual timed wait. Note that
-   * this method is final to ensure that no one overrides it. 
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   * If the specified wait time is zero, this checks the condition,
-   * then returns on success or throws a TimeoutException on failure.
-   *@param tv Absolute time to wait until before throwing an exception
-   * if the condition isn't satisfied
-   *@exception java.lang.InterruptedException Interrupted during wait
-   *@exception JACE.ASX.TimeoutException Reached timeout specified
-   */
-  public final void timedWait (TimeValue tv)
-    throws InterruptedException,
-           TimeoutException 
-  {
-    if (tv == null) {
-	this.timedWait();
-	return;
-    }
-
-    // Acquire the monitor lock.
-    if (!condition ()) 
-      {
-	long start = System.currentTimeMillis();
-	long waitTime = tv.getMilliTime() - start;
-
-	for (;;) {
-	  
-	  // Prevent a conversion from absolute to relative time from
-	  // generating a zero or negative waitTime.
-	  if (waitTime < 1)
-	    throw new TimeoutException ();
-
-	  // Wait until we are notified.
-	  object_.wait (waitTime);
-
-	  // Recheck the condition.
-	  if (!condition ()) {
-
-	    long now = System.currentTimeMillis();
-	    
-	    // Timed out!
-	    if (now >= tv.getMilliTime ()) 
-	      throw new TimeoutException ();
-	    else 
-	      // We still have some time left to wait, so adjust the
-	      // wait_time.
-	      waitTime = tv.getMilliTime() - now; 
-	  }
-	  else
-	    break;  // Condition became true.
-	}
-      }
-  }
-
-  /**
-   * Notify any one thread waiting on the object_.  
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   */
-  public final void signal () {
-    object_.notify ();
-  }
-
-  /**
-   * Notify all threads waiting on the object_.  
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   */
-  public final void broadcast () {
-    object_.notifyAll ();
-  }
-
-  /** 
-   * The object we delegate to. If a subclass gives us a particular
-   * object,  we use that to delegate to, otherwise, we ``delegate''
-   * to ourself (i.e., this).
-   */
-  protected Object object_;
-
-}
diff --git a/java/JACE/ASX/TimeoutException.java b/java/JACE/ASX/TimeoutException.java
deleted file mode 100644
index d55cc4fe999..00000000000
--- a/java/JACE/ASX/TimeoutException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TimeoutException.java
- *
- *@author Prashant Jain and Doug Schmidt
- *
- *************************************************/
-package JACE.ASX;
-
-/**
- * Thrown when a timer has expired.
- */
-public class TimeoutException extends Exception
-{ 
-  /**
-   * Default Constructor.
-   */
-  public TimeoutException ()
-  {
-    super ("Timed Out");
-  }
-
-  /**
-   * Constructor.
-   *@param timeout The timeout value which expired.
-   *@param desc Textual description of the exception
-   */
-  public TimeoutException (TimeValue timeout, String desc)
-  {
-    super ("Timed Out in " + timeout + ": " + desc);
-  }
-
-}
diff --git a/java/JACE/ASX/package.html b/java/JACE/ASX/package.html
deleted file mode 100644
index 346782ed083..00000000000
--- a/java/JACE/ASX/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Message queueing facilities.
-<P>
-@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#ipc">
-Documents on ACE interprocess communication components</a>
-@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#streams">
-Documents on the ACE streams framework</a>
-</BODY>
-</HTML>
diff --git a/java/JACE/Concurrency/AbstractLock.java b/java/JACE/Concurrency/AbstractLock.java
deleted file mode 100644
index c8afaf789ae..00000000000
--- a/java/JACE/Concurrency/AbstractLock.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Lock.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.Concurrency;
-
-import JACE.ASX.*;
-
-/**
- *      Interface for any Java ACE synchronization mechanism.
- * <P>
- *      Defines the interface for Token, Mutex, RWMutex, Semaphore,
- *      and the RemoteLock proxies in the Token service, as well as
- *      the possible constant return values.
- * <P>
- *      Methods which take TimeValue timeouts can throw
- *      JACE.ASX.TimeoutExceptions.  The locks should continue to
- *      function properly after a thread times out or is interrupted.
- *      <em>Also note that the timeouts are absolute time-of-day
- *      values, not relative times.</em>
- * <P>
- *      An AbstractLock.FAILURE can be returned for an undefined type of
- *      failure.
- * <P>
- *      You can assume that 
- *      AbstractLock.FAILURE < AbstractLock.SUCCESS < AbstractLock.SLEEPHOOK
- * <P>
- *      Any method can throw a LockException, providing a way to return
- *      unusual error cases in future types of locks (such as the Token
- *      service).
- * <P>
- *      It is safe to call release () in a finally block, since it will
- *      return FAILURE if the accessing thread is not the owner.
- *
- */
-public interface AbstractLock
-{
-  /**
-   * Generic failure indication, used as a return value.
-   */
-  public static final int FAILURE = -1;
-
-  /**
-   * Success indication, used as a return value.
-   */
-  int SUCCESS = 0;
-  
-  /**
-   * Success indication, but notes that the thread had to sleep
-   * to complete it (and it called the sleep hook).  Used as a
-   * return value.
-   */
-  int SLEEPHOOK = 1;
-
-  
-  /**
-   * Acquire ownership of the lock, blocking indefinitely if necessary.  
-   * <P>
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception LockException special exception defined by a later 
-   *           implementation
-   *@exception InterruptedException indicates another thread has 
-   *           interrupted this one during wait
-   */
-  public int acquire () throws LockException, InterruptedException;
-
-  /**
-   * Acquire ownership of the lock by the given absolute time time-out.
-   * A value of null for the timeout parameter results in a blocking
-   * acquire.
-   * A value of TimeValue.zero throws a TimeoutException if the
-   * acquire would block.
-   * <P>
-   *@param timeout  absolute time by which the lock must be acquired
-   *@return         appropriate Lock return value (AbstractLock.FAILURE, 
-   *                AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK)
-   *@exception      LockException special exception defined by a later
-   *                implementation
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   *@exception      InterruptedException indicates another thread has 
-   *                interrupted this one during wait
-   *@see AbstractLock#tryAcquire
-   */
-  public int acquire (TimeValue timeout)
-    throws LockException, TimeoutException, InterruptedException;
-
-  /**
-   * Acquire a read lock, blocking indefinitely if necessary.  This can
-   * be used to implement Reader-Writer locks in which multiple readers
-   * may have simultaneous access.
-   * <P>
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception LockException special exception defined by a later 
-   *           implementation
-   *@exception InterruptedException indicates another thread has 
-   *           interrupted this one during wait
-   */
-  public int acquireRead () throws LockException, InterruptedException;
-  
-  /**
-   * Acquire a read lock by the given absolute time time-out.  This can 
-   * be used to implement Reader-Writer locks in which multiple readers
-   * may have simultaneous access.  
-   * <P>
-   *@param timeout  absolute time by which the lock must be acquired
-   *@return         appropriate lock return value (AbstractLock.FAILURE, 
-   *                AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK)
-   *@exception      LockException special exception defined by a later
-   *                implementation
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   *@exception      InterruptedException indicates another thread has 
-   *                interrupted this one during wait
-   *@see AbstractLock#tryAcquireRead
-   */
-  public int acquireRead (TimeValue timeout) 
-    throws LockException, TimeoutException, InterruptedException;
-
-  /**
-   * Acquire a write lock, blocking indefinitely if necessary.  This can
-   * be used to implement Reader-Writer locks in which a writer has 
-   * exclusive access.  
-   * <P>
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception LockException special exception defined by a later 
-   *           implementation
-   *@exception InterruptedException indicates another thread has 
-   *           interrupted this one during wait
-   */
-  public int acquireWrite () throws LockException, InterruptedException;
-
-  /** 
-   * Acquire a write lock by the given absolute time time-out.  This can
-   * be used to implement Reader-Writer locks in which a writer has
-   * exclusive access.  
-   * <P>
-   *@param timeout  absolute time by which the lock must be acquired
-   *@return         appropriate AbstractLock return value (AbstractLock.FAILURE, 
-   *                AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK)
-   *@exception      LockException special exception defined by a later
-   *                implementation
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   *@exception      InterruptedException indicates another thread has 
-   *                interrupted this one during wait
-   *@see AbstractLock#tryAcquireWrite
-   */
-  public int acquireWrite (TimeValue timeout) 
-    throws LockException, TimeoutException, InterruptedException;
-  
-  /**
-   * Give up the lock to some number of waiting threads (if any), then 
-   * reacquire, blocking indefinitely if necessary.
-   * <P>
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token. 
-   * <P>
-   *@param     requeuePosition position in the waiters queue to insert
-   *           this thread.  If this value is -1 and there are other
-   *           threads waiting to obtain the token, this thread is queued
-   *           at the end.  If this value is greater than -1, then it
-   *           indicates how many entries to skip over before inserting
-   *           our thread into the queue.  (For example, if it is 0,
-   *           this thread is put at the front of the queue.)  If this 
-   *           value is greater than the number of waiters, this thread is
-   *           simply put at the end of the current waiters queue.
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception LockException special exception defined by a later 
-   *           implementation
-   *@exception InterruptedException indicates another thread has 
-   *           interrupted this one during wait
-   */
-  public int renew (int requeuePosition) throws LockException,
-        InterruptedException;
-
-  /**
-   * Give up the lock to some waiting threads (if any), then reacquire
-   * by the given absolute time time-out.
-   * <P>
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token. 
-   * <P>
-   * A value of null for the timeout should indicate a blocking renew.
-   * <P>
-   *@param     requeuePosition position in the waiters queue to insert
-   *           this thread.  If this value is -1 and there are other
-   *           threads waiting to obtain the token, this thread is queued
-   *           at the end.  If this value is greater than -1, then it
-   *           indicates how many entries to skip over before inserting
-   *           our thread into the queue.  (For example, if it is 0,
-   *           this thread is put at the front of the queue.)  If this 
-   *           value is greater than the number of waiters, this thread is
-   *           simply put at the end of the current waiters queue.
-   * 
-   *@param     timeout absolute time by which the lock must be reacquired
-   *
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception      LockException special exception defined by a later
-   *                implementation
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   *@exception      InterruptedException indicates another thread has 
-   *                interrupted this one during wait
-   */
-  public int renew (int requeuePosition, TimeValue timeout) 
-    throws LockException, TimeoutException, InterruptedException;
-
-  /** 
-   * Try to acquire the lock without blocking.  
-   * <P>
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception      LockException special exception defined by a later
-   *                implementation
-   */
-  public int tryAcquire () throws LockException;
-
-  /** 
-   * Try to acquire a read lock without blocking.  
-   * <P>
-   *@see            #acquireRead
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception      LockException special exception defined by a later
-   *                implementation
-   */
-  public int tryAcquireRead () throws LockException;
-
-  /**
-   * Try to acquire a write lock without blocking.  
-   *<P>
-   *@see            #acquireWrite
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception      LockException special exception defined by a later
-   *                implementation
-   */
-  public int tryAcquireWrite () throws LockException;
-
-  /**
-   * Method that is called before a thread goes to sleep in an
-   * acquire. This should be overridden by a subclass to define 
-   * the appropriate behavior.
-   */
-  public void sleepHook ();
-
-  /** 
-   * Release ownership of this lock.  
-   * <P>
-   *@return    appropriate AbstractLock return value 
-   *           (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception LockException special exception defined by a later
-   *           implementation
-   */
-  public int release () throws LockException;
-}
diff --git a/java/JACE/Concurrency/Condition.java b/java/JACE/Concurrency/Condition.java
deleted file mode 100644
index 1889f6e1edf..00000000000
--- a/java/JACE/Concurrency/Condition.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Condition.java
- *
- *@author Irfan Pyarali
- *
- *************************************************/
-package JACE.Concurrency;
-
-import JACE.ASX.TimeoutException;
-import JACE.ASX.TimeValue;
-
-/**
- *     Abstraction for <em>traditional</em> 
- *     condition variable
- * <P>
- *     This condition variable allows the use of one 
- *     mutex between multiple conditions. 
- *     This implementation is based on the C++ version of ACE.
- */
-public class Condition
-{
-  /** 
-   * Default constructor
-   *@param Mutex for synchronization
-   */
-  public Condition (Mutex mutex)
-  {
-    mutex_ = mutex;
-  }
-  
-  /**
-   * Wait for condition to become signaled. 
-   *@exception InterruptedException exception during wait
-   */
-  public void Wait () 
-    throws InterruptedException
-  {
-    waiters_++;
-
-    try
-      {
-	mutex_.release();
-	synchronized (waitObject_) {
-	  waitObject_.wait ();
-	}
-	mutex_.acquire ();
-      }
-    finally 
-      {
-	waiters_--;
-      }
-  }
-  
-  /**
-   * TimedWait for condition to become signaled.  Note that the
-   * given TimeValue is an absolute time, not a relative time.
-   *
-   *@param tv Absolute time to wait until before timing out
-   *@exception TimeoutException wait timed out exception
-   *@exception InterruptedException exception during wait
-   */
-  public void Wait (TimeValue tv) 
-      throws TimeoutException, InterruptedException
-  {
-    waiters_++;
-
-    try
-      {
-	mutex_.release();
-
-	synchronized (waitObject_) {
-	  long start = System.currentTimeMillis();
-	  long waitTime = tv.getMilliTime() - start;
-	  if (waitTime < 1)
-	    throw new TimeoutException ();
-	  waitObject_.wait (waitTime);
-	}
-
-	mutex_.acquire (tv);
-      }
-    finally 
-      {
-	waiters_--;
-      }
-  }
-  
-  /**
-   * Signal condition. Wake one waiter (if any).
-   */
-  public void signal ()
-  {
-    synchronized (waitObject_) {
-      waitObject_.notify ();
-    }
-  }
-
-  /**
-   * Signal condition. Wake up all waiters (if any).
-   */
-  public void broadcast ()
-  {
-    synchronized (waitObject_) {
-      waitObject_.notifyAll ();
-    }
-  }
-
-  /** 
-   * Accessor to lock
-   *@return Mutex
-   */
-  public Mutex mutex ()
-  {
-    return mutex_;
-  }
-
-  private int waiters_;  
-  private Object waitObject_ = new Object ();
-  private Mutex mutex_;
-}
diff --git a/java/JACE/Concurrency/LockAdapter.java b/java/JACE/Concurrency/LockAdapter.java
deleted file mode 100644
index db2e9de05c7..00000000000
--- a/java/JACE/Concurrency/LockAdapter.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Lock.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.Concurrency;
-
-import JACE.ASX.*;
-
-/**
- *      Abstract adapter class which provides useful default implementations
- *      for several methods in the AbstractLock interface, as well as 
- *      protected helper functions for making sure only the owner
- *      can perform certain operations.
- *
- *@see  JACE.Concurrency.AbstractLock
- */
-public abstract class LockAdapter implements AbstractLock
-{
-  /**
-   * Default implementation that calls acquire (TimeValue) with a null
-   * timeout.
-   *
-   *@see AbstractLock#acquire
-   */
-  public int acquire () throws InterruptedException
-  {
-    try {
-      return acquire (null);
-    } catch (TimeoutException e) {
-      // This should never happen
-      return AbstractLock.FAILURE;
-    }
-  }
-
-  /**
-   * Acquire ownership of the lock by the given absolute time time-out.
-   * A value of null for the timeout parameter results in a blocking
-   * acquire.
-   * A value of TimeValue.zero throws a TimeoutException if the
-   * acquire would block.
-   * <P>
-   *@param timeout  absolute time by which the lock must be acquired
-   *@return         appropriate Lock return value (AbstractLock.FAILURE, 
-   *                AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK)
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   *@exception      InterruptedException indicates another thread has 
-   *                interrupted this one during wait
-   *@see AbstractLock#tryAcquire
-   */
-  public abstract int acquire (TimeValue timeout) 
-    throws TimeoutException, InterruptedException;
-
-  /**
-   * Default implementation that calls acquireRead (TimeValue) with a
-   * null timeout.
-   *
-   *@see AbstractLock#acquireRead
-   */
-  public int acquireRead () throws InterruptedException
-  {
-    try {
-      return acquireRead (null);
-    } catch (TimeoutException e) {
-      // This should never happen
-    }
-
-    return AbstractLock.FAILURE;
-  }
-
-  /**
-   * Default implementation that calls acquire (TimeValue).
-   *
-   *@see AbstractLock#acquireRead(TimeValue)
-   */
-  public int acquireRead (TimeValue timeout) 
-    throws TimeoutException, InterruptedException
-  {
-    return acquire (timeout);
-  }
-
-  /**
-   * Default implementation that calls acquire with a null
-   * timeout.
-   *
-   *@see AbstractLock#acquireWrite
-   */
-  public int acquireWrite () throws InterruptedException
-  {
-    try {
-      return acquire (null);
-    } catch (TimeoutException e) {
-      // This should never happen
-    }
-
-    return AbstractLock.FAILURE;
-  }
-
-  /**
-   * Default implementation that calls acquire (TimeValue).
-   *
-   *@see AbstractLock#acquireWrite(TimeValue)
-   */
-  public int acquireWrite (TimeValue timeout) 
-    throws TimeoutException, InterruptedException
-  {
-    return acquire (timeout);
-  }
-  
-  /**
-   * Default implementation that calls renew (int, TimeValue) with
-   * a null timeout.
-   *
-   *@see AbstractLock#renew(int)
-   */
-  public int renew (int requeuePosition) throws InterruptedException
-  {
-    try 
-      {
-	return renew (requeuePosition, null);
-      } catch (TimeoutException e) {
-	// Note that this should never happen since we requested a
-	// blocking acquire.
-	return AbstractLock.FAILURE;
-      }
-  }
-
-  /**
-   * Give up the lock to some waiting threads (if any), then reacquire
-   * by the given absolute time time-out.
-   * <P>
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token. 
-   * <P>
-   * A value of null for the timeout should indicate a blocking renew.
-   * <P>
-   *@param     requeuePosition position in the waiters queue to insert
-   *           this thread.  If this value is -1 and there are other
-   *           threads waiting to obtain the token, this thread is queued
-   *           at the end.  If this value is greater than -1, then it
-   *           indicates how many entries to skip over before inserting
-   *           our thread into the queue.  (For example, if it is 0,
-   *           this thread is put at the front of the queue.)  If this 
-   *           value is greater than the number of waiters, this thread is
-   *           simply put at the end of the current waiters queue.
-   * 
-   *@param     timeout absolute time by which the lock must be reacquired
-   *
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   *@exception      InterruptedException indicates another thread has 
-   *                interrupted this one during wait
-   */
-  public abstract int renew (int requeuePosition,
-			     TimeValue timeout)
-			     throws TimeoutException,
-				    InterruptedException;
-
-  /**
-   * Default implementation that calls tryAcquire ().
-   *
-   *@see AbstractLock#tryAcquireRead
-   */
-  public int tryAcquireRead ()
-  {
-    return tryAcquire ();
-  }
-
-  /**
-   * Default implementation that calls tryAcquire ().
-   *
-   *@see AbstractLock#tryAcquireWrite
-   */
-  public int tryAcquireWrite ()
-  {
-    return tryAcquire ();
-  }
-  /** 
-   * Try to acquire the lock without blocking.  
-   * <P>
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   */
-  public abstract int tryAcquire ();
-
-  /**
-   * Default implementation as a no-op.
-   *
-   *@see AbstractLock#sleepHook
-   */
-  public void sleepHook ()
-  {
-  }
-
-  /** 
-   * Release ownership of this lock.  
-   * <P>
-   *@return    appropriate AbstractLock return value 
-   *           (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   */
-  public abstract int release ();
-
-  /**
-   * Obtains an Object which uniquely identifies the current accessor
-   * (usually a thread).  This is used to make sure only an owner can
-   * perform certain operations like release.  Subclasses can redefine
-   * the behavior as necessary, such as in the Token service where it is
-   * defined to be the client ID sent by the proxy.
-   * <P>
-   * When using Java 1.2 or later, it might be more efficient to use
-   * ThreadLocal and an Integer for the ID.  The current default 
-   * implementation returns the Thread.currentThread () reference.
-   *
-   *@return Object representing a unique ID for this accessor
-   */
-  protected Object accessorID ()
-  {
-    return Thread.currentThread();
-  }
-
-  /**
-   * Check to see if the current accessor is the (or a) owner of this
-   * lock.
-   */
-  protected boolean isOwner() 
-  {
-    return accessorID().equals(this.owner_);
-  }
-
-  /**
-   * Set the current accessor to be the (or a) owner of this lock.
-   */
-  protected void setOwner()
-  {
-    this.owner_ = accessorID();
-  }
-
-  /**
-   * Make sure that this accessor is no longer the (or a) owner of this
-   * lock.
-   */
-  protected void clearOwner()
-  {
-    this.owner_ = null;
-  }
-
-  /**
-   * Reference to the accessorID of the owner.
-   */
-  private Object owner_;
-}
diff --git a/java/JACE/Concurrency/LockException.java b/java/JACE/Concurrency/LockException.java
deleted file mode 100644
index dff4c09c626..00000000000
--- a/java/JACE/Concurrency/LockException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package JACE.Concurrency;
-
-/**
- * Base class for possible exceptions thrown from Lock
- * mechanisms.  This can be used by later Lock
- * implementations to signal special types of exceptions, such
- * as a remote failure, etc.
- * <P>
- */
-public class LockException extends java.lang.Exception 
-{
-  /** 
-   * Default constructor
-   */
-  public LockException () { }
-  
-  /**
-   * Constructor with a string message that will be returned
-   * via the getMessage() method on Exception.
-   * <P>
-   *@see java.lang.Exception#getMessage
-   */
-  public LockException (String message) 
-  {
-    super(message);
-  }
-}
-
diff --git a/java/JACE/Concurrency/Mutex.java b/java/JACE/Concurrency/Mutex.java
deleted file mode 100644
index 856fdbd79eb..00000000000
--- a/java/JACE/Concurrency/Mutex.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Mutex.java
- *
- *@author Prashant Jain
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-/**
- *     Value added abstraction for mutex variable creation.
- *
- *     A mutex whose operations do not block forever and can time out.
- * <P>
- * <EM>This class does not support recursive semantics.</EM>
- */
-public class Mutex extends LockAdapter
-{
-  /**
-   * Acquire ownership of the lock, blocking indefinitely if necessary.  
-   * <P>
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception InterruptedException indicates another thread has 
-   *           interrupted this one during wait
-   */
-  public synchronized int acquire () throws InterruptedException
-  {
-    if (this.monitor_.condition ()) {
-      this.monitor_.condition (false);
-      setOwner ();
-      return AbstractLock.SUCCESS;
-    }
-
-    this.numberOfWaiters_++;
-    try {
-      sleepHook ();
-      this.monitor_.timedWait ();
-    } finally {
-      this.numberOfWaiters_--;
-    }
-    this.monitor_.condition (false);
-    setOwner();
-  
-    return AbstractLock.SLEEPHOOK;
-  }
-
-  public int renew (int requeuePosition, 
-		    TimeValue timeout) 
-    throws InterruptedException,
-	   TimeoutException
-  {
-    RenewObject rwo;
-
-    synchronized (this) {
-
-      if (!this.isOwner ())
-	return AbstractLock.FAILURE;
-
-      if (numberOfWaiters_ == 0 || requeuePosition == 0)
-	return AbstractLock.SUCCESS;
-
-      if (requeuePosition < 0 || requeuePosition > numberOfWaiters_)
-	requeuePosition = numberOfWaiters_;
-      
-      rwo = new RenewObject (requeuePosition);
-      
-      this.release ();
-      this.renewers_.addElement (rwo);
-    }
-
-    // We can't have the method synchronized, or synchronize on (this)
-    // in here because then the Thread that was woken up won't be able
-    // to continue its acquire.
-    //
-    // Normally when an exception occurs in timedWait, this thread just
-    // needs to remove itself from the renewers queue.
-    //
-    // However, the following situation exists:
-    //   Thread A is the current owner, and is doing processing in release()
-    //   This thread generates a timeout exception in timedWait
-    //   Thread A signals this thread to wake up and take ownership, and
-    //     removes it from the queue.
-    //   This thread never takes ownership -- the exception keeps going up.
-    //
-    // This could lead to other renewers waiting in limbo forever.
-    //
-    // Solution: If this thread has an exception and it looks like it
-    // has been proclaimed the owner, then it calls release and lets
-    // the exception continue.
-
-    boolean exceptionOccured = true;
-    try {
-      synchronized (rwo) {
-	rwo.timedWait (timeout);
-
-	exceptionOccured = false;
-      }
-    } finally {
-      if (exceptionOccured) {
-	synchronized (this) {
-	  if (!renewers_.removeElement (rwo)) {
-	    setOwner ();
-	    release ();
-	  }
-	}
-      }
-    }
-
-    synchronized (this) {
-      setOwner ();
-    }
-
-    // By this point, we should know that we have the lock.  The condition
-    // flag is never set to true in the release() call from the Thread
-    // that gave us control.
-
-    return AbstractLock.SUCCESS;
-  }
-    
-  public synchronized int tryAcquire () {
-    if (this.monitor_.condition ()) {
-      this.monitor_.condition (false);
-      setOwner();
-      return AbstractLock.SUCCESS;
-    } else
-      return AbstractLock.FAILURE;
-  }
-
-  public synchronized int acquire (TimeValue tv) 
-    throws TimeoutException, InterruptedException 
-  {
-    if (this.monitor_.condition ()) {
-      this.monitor_.condition (false);
-      setOwner ();
-      return AbstractLock.SUCCESS;
-    }
-
-    this.numberOfWaiters_++;
-    try {
-      sleepHook ();
-      this.monitor_.timedWait (tv);
-    } finally {
-      this.numberOfWaiters_--;
-    }
-    this.monitor_.condition (false);
-    setOwner();
-    
-    return AbstractLock.SLEEPHOOK;
-  }
-
-  /**
-   * Checks any objects in the renewers queue, giving one of them
-   * the lock if it is appropriate.  Assumes the synchronization
-   * lock is already held.
-   *
-   *@return true if a renewer was signaled, else false
-   */
-  protected boolean signalNextRenewer ()
-  {
-    // First find the renewer with the minimum yieldTo count, processing
-    // all of them along the way.
-    if (this.renewers_.size() > 0) {
-
-      RenewObject renewer = (RenewObject)renewers_.
-	elementAt (renewers_.size () - 1);
-      
-      renewer.decrementYieldTo ();
-
-      for (int i = this.renewers_.size() - 2; i >=0; i--) {
-	
-	RenewObject rwo = (RenewObject)renewers_.elementAt (i);
-	
-	rwo.decrementYieldTo ();
-	
-	renewer = renewer.min (rwo);
-      }
-      
-      // If the renewer with the minimum yieldTo count has yielded to
-      // enough threads, or if there are no waiting threads, it should
-      // be signaled (thus, it wakes up and obtains the lock again).
-      
-      if (renewer.condition () || numberOfWaiters_ == 0) {
-	// Note that we leave monitor_.condition in the false state so
-	// we are assured that only the renewer (and not another
-	// Thread that does an acquire) will gain control.  This
-	// is important since the renew method can't be synchronized
-	// in its current implementation.
-	renewers_.removeElement(renewer);
-
-	synchronized (renewer) {
-	  renewer.signal ();
-	}
-  
-	return true;
-      }
-    }
-
-    return false;
-  }
-
-  public synchronized int release ()
-  {
-    if (!isOwner()) 
-      return AbstractLock.FAILURE;
-
-    if (!signalNextRenewer ()) {
-      // Do a normal release if there are no threads waiting to renew
-      // or no such threads are ready to renew.
-      this.monitor_.condition (true);
-      this.monitor_.signal ();
-    }
-    
-    return AbstractLock.SUCCESS;
-  }
-
-  /**
-   * Monitor used to signal whether or not this Mutex is available.
-   */
-  protected WaitObject monitor_ = new WaitObject (true, this);
-  // The monitor (adapter) to wait on
-
-  /**
-   * Queue of waiting renewers.
-   */
-  protected Vector renewers_ = new Vector ();
-
-  /**
-   * Number of waiting threads.
-   */
-  protected int numberOfWaiters_ = 0;
-}
diff --git a/java/JACE/Concurrency/RWMutex.java b/java/JACE/Concurrency/RWMutex.java
deleted file mode 100644
index abb30ce3bc8..00000000000
--- a/java/JACE/Concurrency/RWMutex.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-/**
- * A read/write lock allows multiple
- * readers or a single writer to access the guarded element.
- * <P>
- * <EM>This class does not support recursive semantics.</EM>
- */
-public class RWMutex extends LockAdapter
-{
-  public synchronized int tryAcquire () 
-  {
-    if (referenceCount_ == 0) {
-      referenceCount_ = -1;
-      setOwner ();
-      return AbstractLock.SUCCESS;
-    } else
-      return AbstractLock.FAILURE;
-  }
-
-  public synchronized int tryAcquireRead () 
-  {
-    if (referenceCount_ > -1 && waiters_.size () == 0) {
-      referenceCount_++;
-      setOwner ();
-      return AbstractLock.SUCCESS;
-    } else
-      return AbstractLock.FAILURE;
-  }
-
-  public int acquire(TimeValue timeout) 
-    throws TimeoutException, InterruptedException
-  {
-    return acquireWrite(timeout);
-  }
-
-  public void waitUntilIsOwner (RWWaitObject waitObj, TimeValue timeout)
-    throws TimeoutException, InterruptedException
-  {
-    boolean exceptionOccured = true;
-    try {
-      sleepHook ();
-      synchronized (waitObj) {
-	waitObj.timedWait (timeout);
-      }
-      exceptionOccured = false;
-    } finally {
-      
-      synchronized (this) {
-
-	if (exceptionOccured) {
-	  if (!waiters_.removeElement (waitObj)) {  
-	    setOwner ();
-	    release ();
-	  } 
-	} else
-	  setOwner();
-      }
-    }
-  }
-  
-  public int acquireRead(TimeValue timeout)
-    throws TimeoutException, InterruptedException
-  {
-    RWWaitObject waitObj = null;
-
-    synchronized (this) {
-
-      if (referenceCount_ > -1 && waiters_.size () == 0) {
-	referenceCount_++;
-	setOwner ();
-	return AbstractLock.SUCCESS;
-      }
-
-      waitObj = new RWWaitObject (true);
-
-      waiters_.addElement (waitObj);
-    }
-
-    waitUntilIsOwner (waitObj, timeout);
-
-    return AbstractLock.SLEEPHOOK;
-  }
-  
-  public int acquireWrite(TimeValue timeout)
-    throws TimeoutException, InterruptedException
-  {
-    RWWaitObject waitObj = null;
-
-    synchronized (this) {
-      
-      if (referenceCount_ == 0) {
-	referenceCount_ = -1;
-	setOwner ();
-	return AbstractLock.SUCCESS;
-      }
-      
-      waitObj = new RWWaitObject (false);
-
-      waiters_.addElement (waitObj);
-    }
-
-    waitUntilIsOwner (waitObj, timeout);
-
-    // When the writer gets here, it has been cleared to go by
-    // whatever thread specifically gave control to this writer in
-    // release.  The referenceCount_ and numberOfWaitingWriters_
-    // variables are also adjusted by the releasing thread since
-    // it already has a synchronization lock.  Not doing that,
-    // and then having another synchronized (this) block in here
-    // could lead to a situation in which another thread sneaks
-    // in inbetween when this thread leaves timedWait and goes to
-    // adjust them.
-
-    return AbstractLock.SLEEPHOOK;
-  }
-
-
-  public synchronized int release ()
-  {
-    if (!isOwner ())
-      return AbstractLock.FAILURE;
-
-    clearOwner ();
-
-    // Releasing a reader.
-    if (referenceCount_ > 0) {
-      referenceCount_--;
-      
-      if (referenceCount_ != 0) 
-	return AbstractLock.SUCCESS;
-
-    } else {
-      // releasing a writer
-      referenceCount_ = 0;
-    }
-    
-    if (waiters_.size () == 0)
-      return AbstractLock.SUCCESS;
-
-    if (releaseFirstReaders () == 0) {
-      RWWaitObject waitObj = (RWWaitObject)waiters_.firstElement ();
-      waiters_.removeElementAt (0);
-      
-      referenceCount_ = -1;
-      
-      waitObj.condition (true);
-      synchronized (waitObj) {
-	waitObj.signal ();
-      }
-    }
-
-    return AbstractLock.SUCCESS;
-  }
-   
-  // Releases all waiting readers up to the first waiting writer
-  // or the end of the queue.  Returns the number of readers
-  // released.
-  protected int releaseFirstReaders ()
-  {
-    int releasedReaders = 0;
-    
-    do {
-      
-      RWWaitObject waitObj = (RWWaitObject)waiters_.firstElement ();
-      if (!waitObj.isReader ())
-	break;
-
-      waiters_.removeElementAt (0);
-
-      referenceCount_++;
-      releasedReaders++;
-      
-      waitObj.condition (true);
-      synchronized (waitObj) {
-	waitObj.signal ();
-      }
-
-    } while (waiters_.size () > 0);
-
-    return releasedReaders;
-  }
-
-  public int renew (int requeuePosition,
-		    JACE.ASX.TimeValue timeout)
-    throws InterruptedException,
-	   TimeoutException
-  {
-    RWWaitObject waitObj = null;
-
-    synchronized (this) {
-
-      if (!isOwner ())
-	return AbstractLock.FAILURE;
-
-      if (requeuePosition == 0 || waiters_.size () == 0) 
-	return AbstractLock.SUCCESS;
-
-      waitObj = new RWWaitObject (referenceCount_ > 0);
-
-      if (requeuePosition < 0 || requeuePosition > waiters_.size ()) {
-	requeuePosition = waiters_.size ();
-      }
-
-      waiters_.insertElementAt (waitObj, requeuePosition);
-
-      release ();
-    }
-    
-    waitUntilIsOwner (waitObj, timeout);
-
-    // When the writer gets here, it has been cleared to go by
-    // whatever thread specifically gave control to this writer in
-    // release.  The referenceCount_ and numberOfWaitingWriters_
-    // variables are also adjusted by the releasing thread since
-    // it already has a synchronization lock.  Not doing that,
-    // and then having another synchronized (this) block in here
-    // could lead to a situation in which another thread sneaks
-    // in inbetween when this thread leaves timedWait and goes to
-    // adjust them.
-
-    return AbstractLock.SUCCESS;
-  }
-
-  static class RWWaitObject extends WaitObject
-  {
-    public RWWaitObject (boolean isReader)
-    {
-      isReader_ = isReader;
-    }
-
-    public boolean isReader ()
-    {
-      return isReader_;
-    }
-
-    private boolean isReader_ = false;
-  }
-
-  protected boolean isOwner ()
-  {
-    return owners_.containsKey (accessorID());
-  }
-
-  protected void setOwner ()
-  {
-    owners_.put (accessorID(), this);
-  }
-
-  protected void clearOwner ()
-  {
-    owners_.remove (accessorID());
-  }
-
-  private Vector waiters_ = new Vector ();
-
-  private int referenceCount_ = 0;
-  // Value is -1 if writer has the lock, else this keeps track of the
-  // number of readers holding the lock.  
-
-  private Hashtable owners_ = new Hashtable ();
-
-  private int nestingLevel_ = 0;
-}
-
diff --git a/java/JACE/Concurrency/RenewObject.java b/java/JACE/Concurrency/RenewObject.java
deleted file mode 100644
index b690958968a..00000000000
--- a/java/JACE/Concurrency/RenewObject.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package JACE.Concurrency;
-
-import JACE.ASX.TimedWait;
-
-class RenewObject extends TimedWait
-{
-  public RenewObject (int maxYieldTo)
-  {
-    yieldTo_ = maxYieldTo;
-  }
-
-  public boolean condition ()
-  {
-    return yieldTo_ <= 0;
-  }
-
-  public void decrementYieldTo()
-  {
-    this.yieldTo_--;
-  }
-
-  public int yieldTo ()
-  {
-    return this.yieldTo_;
-  }
-  
-  public RenewObject min (RenewObject other)
-  {
-    if (other.yieldTo_ < this.yieldTo_)
-      return other;
-    else
-      return this;
-  }
-
-  private int yieldTo_;
-}
diff --git a/java/JACE/Concurrency/Semaphore.java b/java/JACE/Concurrency/Semaphore.java
deleted file mode 100644
index 5e558035aee..00000000000
--- a/java/JACE/Concurrency/Semaphore.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Semaphore.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-/**
- *     Implementation of Dijkstra's counting semaphore in java.
- * <P>
- *     <EM>This class does not support recursive semantics.</EM>
- */
-public class Semaphore extends LockAdapter
-{
-  static class TimedWaitSAdapter extends JACE.ASX.TimedWait
-  {
-    TimedWaitSAdapter (Object obj)
-    {
-      super (obj);
-    }
-  
-    // Check to see if there are any semaphores available.
-    public boolean condition ()
-    {
-      return this.count_ > 0;
-    }
-  
-    // Increment the count by one
-    public void increment ()
-    {
-      this.count_++;
-    }
-  
-    // Decrement the count by one
-    public void decrement ()
-    {
-      this.count_--;
-    }
-  
-    // Set the count
-    public void count (int c)
-    {
-      this.count_ = c;
-    }
-  
-    public int count ()
-    {
-      return this.count_;
-    }
-  
-    private int count_ = 0;
-  }
-
-  /**
-   * Create a Semaphore.
-   *@param count semaphore count
-   */
-  public Semaphore (int c)
-  {
-    this.monitor_.count (c);
-    this.owners_ = new Hashtable (c);
-  }
-  
-  /**
-   * Create a binary Semaphore.
-   */
-  public Semaphore ()
-  {
-    this.monitor_.count (1);
-    this.owners_ = new Hashtable (1);
-  }
-  
-  public synchronized int tryAcquire ()
-  {
-    if (this.monitor_.condition ()) {
-      this.monitor_.decrement ();
-      setOwner ();
-      return AbstractLock.SUCCESS;
-    } else
-      return AbstractLock.FAILURE;
-  }
-  
-  /**
-   * Acquire the Semaphore.  Throws a TimeoutException if the semaphore
-   * isn't acquired before the given absolute time.
-   *@param tv time (TimeValue) to wait until before throwing a
-   * TimeoutException (unless the semaphore is acquired before that)
-   *@exception TimeoutException wait timed out exception
-   *@exception InterruptedException exception during wait
-   */
-  public synchronized int acquire (TimeValue tv)
-    throws TimeoutException, InterruptedException 
-  {
-    if (this.monitor_.condition ()) {
-      this.monitor_.decrement ();
-      setOwner ();
-      return AbstractLock.SUCCESS;
-    }
-
-    numberOfWaiters_++;
-    
-    try {
-      sleepHook ();
-      this.monitor_.timedWait (tv);
-    } finally {
-      numberOfWaiters_--;
-    }
-    
-    this.monitor_.decrement ();
-    setOwner ();
-
-    return AbstractLock.SLEEPHOOK;
-  }
-  
-  public synchronized int release ()
-  {
-    if (!isOwner ())
-      return AbstractLock.FAILURE;
-    
-    if (!signalNextRenewer ()) {
-      this.monitor_.increment ();
-      this.monitor_.signal ();
-      clearOwner ();
-    }
-    
-    return AbstractLock.SUCCESS;
-  }
-  
-  /**
-   * Checks any objects in the renewers queue, giving one of them
-   * the lock if it is appropriate.  Assumes the synchronization
-   * lock is already held.
-   *
-   *@return true if a renewer was signaled, else false
-   */
-  protected boolean signalNextRenewer ()
-  {
-    // First find the renewer with the minimum yieldTo count, processing
-    // all of them along the way.
-    if (this.renewers_.size() > 0) {
-      
-      RenewObject renewer = (RenewObject)renewers_.
-	elementAt (renewers_.size () - 1);
-      
-      renewer.decrementYieldTo ();
-      
-      for (int i = this.renewers_.size() - 2; i >=0; i--) {
-	
-	RenewObject rwo = (RenewObject)renewers_.elementAt (i);
-	
-	rwo.decrementYieldTo ();
-	
-	renewer = renewer.min (rwo);
-      }
-      
-      // If the renewer with the minimum yieldTo count has yielded to
-      // enough threads, or if there are no waiting threads, it should
-      // be signaled (thus, it wakes up and obtains the lock again).
-      
-      if (renewer.condition () || numberOfWaiters_ == 0) {
-	// Note that we leave monitor_.inUse in the true state so
-	// we are assured that only the renewer (and not another
-	// Thread that does an acquire) will gain control.  This
-	// is important since the renew method can't be synchronized
-	// in its current implementation.
-	renewers_.removeElement(renewer);
-
-	synchronized (renewer) {
-	  renewer.signal ();
-	}
-  
-	return true;
-      }
-    }
-
-    return false;
-  }
-
-  public int renew (int requeuePosition, 
-		    JACE.ASX.TimeValue timeout) 
-    throws InterruptedException,
-	   TimeoutException
-  {
-    RenewObject rwo;
-
-    synchronized (this) {
-
-      if (!this.isOwner ())
-	return AbstractLock.FAILURE;
-      
-      if (numberOfWaiters_ == 0 || 
-	  requeuePosition == 0 ||
-	  this.monitor_.condition ())
-	return AbstractLock.SUCCESS;
-
-      if (requeuePosition < 0 || requeuePosition > numberOfWaiters_)
-	requeuePosition = numberOfWaiters_;
-      
-      rwo = new RenewObject (requeuePosition);
-
-      this.release ();
-      this.renewers_.addElement (rwo);
-    }
-
-    boolean exceptionOccured = true;
-    try {
-      synchronized (rwo) {
-	rwo.timedWait (timeout);
-	
-	exceptionOccured = false;
-      }
-    } finally {
-      synchronized (this) {
-
-	if (exceptionOccured) {
-	  if (!renewers_.removeElement (rwo)) {  
-	    setOwner ();
-	    release ();
-	  } 
-	} else {
-	  setOwner();
-	}
-      }
-    }
-  
-    // By this point, we should know that we have the lock.  The inUse
-    // flag is never set to false in the release() call from the Thread
-    // that gave us control.  That thread also set the owner value.
-    
-    return AbstractLock.SUCCESS;
-  }
-
-  protected boolean isOwner ()
-  {
-    return owners_.containsKey (accessorID());
-  }
-
-  protected void setOwner ()
-  {
-    owners_.put (accessorID(), this);
-  }
-
-  protected void clearOwner ()
-  {
-    owners_.remove (accessorID());
-  }
-
-  private TimedWaitSAdapter monitor_ = new TimedWaitSAdapter (this);
-  // The monitor (adapter) to wait on
-
-  private Hashtable owners_;
-  private Vector renewers_ = new Vector ();
-  private int numberOfWaiters_ = 0;
-}
diff --git a/java/JACE/Concurrency/ThreadManager.java b/java/JACE/Concurrency/ThreadManager.java
deleted file mode 100644
index d23e2410676..00000000000
--- a/java/JACE/Concurrency/ThreadManager.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    ThreadManager.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.OS.*;
-
-/**
- * Wrapper for a ThreadGroup which provides additional methods for
- * creating a certain number of Runnable instances.
- */
-public class ThreadManager
-{ 
-  /**
-   * Default constructor
-   */
-  public ThreadManager ()
-    {
-      this (ACE.DEFAULT_THREAD_GROUP_NAME);
-    }
-
-  /**
-   * Create a Thread Manager.
-   *@param groupName name of the thread group that the Thread Manager
-   * will manage
-   */
-  public ThreadManager (String groupName)
-    {
-      this.thrGrp_ = new ThreadGroup (groupName);
-      if (this.thrGrp_ == null)
-	ACE.ERROR ("Thread group create failed");
-    }
-  
-  /** 
-   * Create a new thread.
-   *@param thr the caller whose run method will be invoked when the
-   * thread has been spawned
-   *@param daemon flag indicating whether the thread should be
-   * spawned off as a daemon thread
-   */
-  public void spawn (Runnable thr,
-		     boolean daemon)
-    {
-      Thread t = new Thread (this.thrGrp_, thr);
-      if (daemon)  // Set the thread to be a daemon thread
-	t.setDaemon (true);
-      t.start ();
-    }
-
-  /** 
-   * Create a new thread and also give it a name.
-   *@param thr the caller whose run method will be invoked when the
-   * thread has been spawned
-   *@param threadName the name of the new thread
-   *@param daemon flag indicating whether the thread should be
-   * spawned off as a daemon thread
-   */
-  public void spawn (Runnable thr,
-		     String threadName,
-		     boolean daemon)
-    {
-      Thread t = new Thread (this.thrGrp_, thr, threadName);
-      if (daemon)  // Set the thread to be a daemon thread
-	t.setDaemon (true);
-      t.start ();
-    }
-
-
-  /** 
-   * Create <n> new threads.
-   *@param n the number of threads to spawn
-   *@param thr the caller whose run method will be invoked by each of
-   * the <n> threads
-   *@param daemon flag indicating whether the threads should be
-   * spawned off as daemon threads 
-   */
-  public void spawnN (int n, 
-		      Runnable thr,
-		      boolean daemon)
-    {
-      // Spawn off all the threads.
-      for (int i = 0; i < n; i++)
-	{
-	  this.spawn (thr, daemon);
-	}
-    }
-
-  /**
-   * Get the thread group containing all the threads. Note that the
-   * thread group can be used to get information regarding number of
-   * active threads as well as to suspend/resume all the threads in
-   * the group. 
-   *@return the thread group that contains all the threads managed by
-   * the Thread Manager
-   */
-  public ThreadGroup thrGrp ()
-    {
-      return this.thrGrp_;
-    }
-
-  private ThreadGroup thrGrp_;
-  // Thread Group that contains all the spawned threads
-
-}
diff --git a/java/JACE/Concurrency/Token.java b/java/JACE/Concurrency/Token.java
deleted file mode 100644
index c9080b47fbe..00000000000
--- a/java/JACE/Concurrency/Token.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Token.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-import JACE.OS.*;
-
-/**
- *     Class that acquires, renews, and releases a synchronization
- *     token that is serviced in strict FIFO ordering.
- * <P>
- *     This is a general-purpose synchronization mechanism that offers
- *     several benefits. For example, it implements "recursive mutex"
- *     semantics, where a thread that owns the token can reacquire it
- *     without deadlocking.  In addition, threads that are blocked
- *     awaiting the token are serviced in strict FIFO order as other
- *     threads release the token. The solution makes use of the
- *     Specific Notification pattern presented by Tom Cargill in
- *     "Specific Notification for Java Thread Synchronization," PLoP96.
- *
- * <P>
- *     This class DOES support recursive semantics.
- */
-public class Token extends LockAdapter
-{
-  /**
-   * Acquire ownership of the lock, blocking indefinitely if necessary.  
-   * <P>
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception InterruptedException indicates another thread has 
-   *           interrupted this one during wait
-   */
-  public int acquire () throws InterruptedException
-  {
-    try
-      {
-	return this.acquire (null);
-      }
-    catch (TimeoutException e)
-      {
-	// This really shouldn't happen since we are supposed to
-	// block.
-	return AbstractLock.FAILURE;
-      }
-  }
-
-  /**
-   * Acquire the token by the given absolute time time-out.  The
-   * method uses synchronized blocks internally to avoid race conditions.
-   *@param     timeout time to wait until before throwing a
-   *           TimeoutException (unless the token is acquired before that).
-   *           Performs a blocking acquire if the given timeout is null.
-   *@return    AbstractLock.SUCCESS if acquires without calling <sleepHook>
-   *           AbstractLock.SLEEPHOOK if <sleepHook> is called.
-   *           AbstractLock.FAILURE if failure occurs 
-   *@exception TimeoutException if time-out occurs
-   *@exception InterruptedException exception during wait
-   */
-  public int acquire (TimeValue timeout) throws TimeoutException,
-  InterruptedException
-  {
-    int result = AbstractLock.SUCCESS;
-    WaitObject snl = new WaitObject ();
-    boolean mustWait;
-    synchronized (snl)
-      {
-	synchronized (this)
-	  {
-	    mustWait = !this.snq_.isEmpty ();
-	      
-	    if (mustWait && isOwner ())
-	      {
-		// I am the one who has the token. So just increment
-		// the nesting level
-		this.nestingLevel_++;
-		return AbstractLock.SUCCESS;
-	      }
-	    // Add local lock to the queue
-	    this.snq_.addElement (snl);
-	  }
-	if (mustWait)
-	  {
-	    result = AbstractLock.SLEEPHOOK;
-	    sleepHook();
-
-	    boolean exceptionOccured = true;
-	    try {
-	      snl.timedWait(timeout);
-	      exceptionOccured = false;
-	    } finally {
-	      if (exceptionOccured) {
-		synchronized (this) {
-		  if (!snq_.removeElement (snl)) {
-		    setOwner ();
-		    release ();
-		  }
-		}
-	      }
-	    }
-	  }
-	  
-	// Set the owner of the token
-	synchronized (this) {
-	  setOwner();
-	}
-      }
-
-    return result;
-  }
-
-  /**
-   * Try to acquire the token. Implements a non-blocking acquire.
-   *
-   *@return   AbstractLock.SUCCESS if acquires
-   *          AbstractLock.FAILURE if failure occurs
-   */
-  public synchronized int tryAcquire ()
-  {
-    int result = AbstractLock.SUCCESS;
-
-    if (this.snq_.isEmpty ())
-      {
-	// No one has the token, so acquire it
-	this.snq_.addElement (new WaitObject ());
-	  
-	setOwner();
-      }
-    else if (isOwner())
-      {
-	this.nestingLevel_++;
-      }
-    // Someone else has the token.
-    else
-      {
-	// Would have to block to acquire the token, so return
-	// failure.
-	result = AbstractLock.FAILURE;
-      }
-    return result;
-  }
-
-  /**
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token.  If the given TimeValue
-   * is null, it's the same as calling renew(int requeuePosition).
-   *@param requeuePosition Position in the queue where to insert the
-   * lock. If requeuePosition == -1 and there are other threads
-   * waiting to obtain the token we are queued at the end of the list
-   * of waiters.  If requeuePosition > -1 then it indicates how many
-   * entries to skip over before inserting our thread into the list of
-   * waiters (e.g.,requeuePosition == 0 means "insert at front of the
-   * queue").
-   *@param timeout Throw a TimeoutException if the token isn't renewed
-   * before this absolute time timeout.
-   *@return    AbstractLock.SUCCESS if renewed the lock
-   *           AbstractLock.FAILURE if failure occurs
-   *@exception TimeoutException exception if timeout occurs
-   *@exception InterruptedException exception during wait
-   */
-  public int renew (int requeuePosition, TimeValue timeout) 
-    throws TimeoutException, InterruptedException
-  {
-    WaitObject snl = null;
-    int saveNestingLevel = 0;
-
-    synchronized (this)
-      {
-	if (!isOwner ()) 
-	  return AbstractLock.FAILURE;
-
-        // Check if there is a thread waiting to acquire the token. If
-        // not or if requeuePosition == 0, then we don't do anything
-        // and we simply keep the token. 
-        if (this.snq_.size () > 1 && requeuePosition != 0)
-	  {
-            // Save the nesting level
-            saveNestingLevel = this.nestingLevel_;
-            this.nestingLevel_ = 0;
-            
-            // Reinsert ourselves at requeuePosition in the queue
-            snl = (WaitObject) this.snq_.firstElement ();
-            this.snq_.removeElementAt (0);
-            
-            if (requeuePosition < 0)
-	      this.snq_.addElement (snl);  // Insert at end
-            else
-	      this.snq_.insertElementAt (snl, Math.min(requeuePosition,
-						       this.snq_.size()));
-            
-            synchronized (this.snq_.firstElement ())
-	      {
-                // Notify the first waiting thread in the queue
-                WaitObject obj = (WaitObject) this.snq_.firstElement ();
-                // Set its condition to be true so that it falls out
-                // of the for loop
-                obj.condition (true);
-                // Now signal the thread
-                obj.signal ();
-	      }    
-	  }
-      }
-    
-    // Check if we reinserted the lock in the queue and therefore need
-    // to do a wait 
-    if (snl != null)
-      {
-        synchronized (snl)
-	  {
-            // Set the condition to be false so that we can begin the
-            // wait 
-            snl.condition (false);
-	    // Wait until the given absolute time (or until notified
-	    // if the timeout is null)
-	    
-	    boolean exceptionOccured = true;
-	    try {
-
-	      snl.timedWait (timeout);
-
-	      exceptionOccured = false;
-
-	    } finally {
-	      if (exceptionOccured) {
-		synchronized (this) {
-		  if (!snq_.removeElement (snl)) {
-		    setOwner ();
-		    release ();
-		  }
-		}
-	      }
-	    }
-	  }
-
-	synchronized (this) {
-	  // Restore the nesting level and current owner of the lock
-	  this.nestingLevel_ = saveNestingLevel;
-	  
-	  // Set the owner of the token
-	  setOwner();
-	}
-      }
-
-    return AbstractLock.SUCCESS;
-  }
-
-  /**
-   * Release the token.  It is safe for non-owners to call
-   * this.
-   *@return    AbstractLock.SUCCESS on success
-   *           AbstractLock.FAILURE on failure (for instance, a non-owner
-   *           calling release)
-   */
-  public synchronized int release ()
-  {
-    if (!isOwner())
-      return AbstractLock.FAILURE;
-    
-    // Check if nestingLevel > 0 and if so, decrement it
-    if (this.nestingLevel_ > 0)
-      this.nestingLevel_--;
-    else
-      {
-	clearOwner ();
-	this.snq_.removeElementAt (0);
-	if (!this.snq_.isEmpty ())
-	  {
-	    synchronized (this.snq_.firstElement ())
-	      {
-		// Notify the first waiting thread in the queue
-		WaitObject obj = (WaitObject) this.snq_.firstElement ();
-		// Set its condition to be true so that it falls out
-		// of the for loop
-		obj.condition (true);
-		// Now signal the thread
-		obj.signal ();
-	      }
-	  } 
-      }
-    
-    return AbstractLock.SUCCESS;
-  }
-  
-  private Vector snq_ = new Vector ();
-  // Vector of lock objects
-  
-  private int nestingLevel_ = 0;
-  // Current Nesting Level
-}
diff --git a/java/JACE/Concurrency/WaitObject.java b/java/JACE/Concurrency/WaitObject.java
deleted file mode 100644
index b7c8cbc7191..00000000000
--- a/java/JACE/Concurrency/WaitObject.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package JACE.Concurrency;
-
-import JACE.ASX.TimedWait;
-
-class WaitObject extends TimedWait
-{
-  public WaitObject ()
-  {
-    super ();
-  }
-
-  public WaitObject (Object obj)
-  {
-    super (obj);
-  }
-
-  public WaitObject (boolean initialState)
-  {
-    condition_ = initialState;
-  }
-
-  public WaitObject (boolean initialState, Object obj)
-  {
-    super (obj);
-    condition_ = initialState;
-  }
-
-  public boolean condition ()
-  {
-    return this.condition_;
-  }
-  
-  public void condition (boolean c)
-  {
-    this.condition_ = c;
-  }
-
-  private boolean condition_ = false;
-}
diff --git a/java/JACE/Concurrency/package.html b/java/JACE/Concurrency/package.html
deleted file mode 100644
index ceadb36f662..00000000000
--- a/java/JACE/Concurrency/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Collection of concurrency mechanisms and a Thread manager.
-<P>
-JACE concurrency mechanisms now inherit from a common base class,
-AbstractLock.  This allows users to write code without regard to
-whether a lock is local or remote.
-
-@see JACE.netsvcs.Token.RemoteLock
-@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#concurrency">Documents on ACE concurrency components</a>
-</BODY>
-</HTML>
-
-
diff --git a/java/JACE/Connection/AcceptStrategy.java b/java/JACE/Connection/AcceptStrategy.java
deleted file mode 100644
index 3af87865c79..00000000000
--- a/java/JACE/Connection/AcceptStrategy.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    AcceptStrategy.java
- *
- *@author Prashant Jain
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-
-/**
- * Interface for specifying a passive connection
- * acceptance strategy for a 
- * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>
- * .
- * <P>
- * This class provides a strategy that manages passive
- * connection setup for an application, and can be extended
- * to define new strategies.
- * <P>
- *
- * The default implementation delegates to a generic Acceptor.
- *
- *@see SvcHandler
- *@see Acceptor
- */
-public class AcceptStrategy
-{
-  /**
-   * Create an instance of AcceptStrategy that delegates to the given
-   * Acceptor.
-   *@param port port number where the server will listen for connections
-   *@param peer Acceptor instance to delegate to
-   */
-  AcceptStrategy (int port, Acceptor peer) throws IOException
-  {
-    this.acceptor_ = peer;
-    this.open (port);
-  }
-
-  /**
-   * Create an instance of Accept Strategy that delegates to Acceptor.
-   *@param port port number where the server will listen for connections
-   *@exception IOException couldn't open port
-   */
-  AcceptStrategy (int port) throws IOException
-  {
-    this.acceptor_ = new Acceptor ();
-    this.open (port);
-  }
-
-  /**
-   * Initialize AcceptStrategy.
-   *@param port port number where the server will listen for connections
-   *@exception IOException couldn't open port
-   */
-  public void open (int port) throws IOException
-  {
-    this.acceptor_.open (port);
-  }
-
-  /**
-   * Accept connections into the SvcHandler. Note that subclasses
-   * should overwrite this method to provide a different accept
-   * strategy.
-   *@param sh Svc Handler in which to accept the connection
-   *@exception SocketException Socket error
-   *@exception IOException Socket error
-   *@return 0
-   */
-  public int acceptSvcHandler (SvcHandler sh) throws
-  SocketException, IOException
-    {
-      return this.acceptor_.acceptSvcHandler (sh);
-    }
-
-  // The Acceptor we delegate to (if any)
-  private Acceptor acceptor_;
-}
diff --git a/java/JACE/Connection/Acceptor.java b/java/JACE/Connection/Acceptor.java
deleted file mode 100644
index 00dbed4c056..00000000000
--- a/java/JACE/Connection/Acceptor.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    Acceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-import JACE.ServiceConfigurator.*;
-
-/**
- * Abstract factory for creating a service handler
- * (<a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>),
- * accepting into the
- * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>, and activating the
- * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>.
- * <P>
- *
- * Implements the basic strategy for passively establishing
- * connections with applications.  The <tt>Acceptor</tt>
- * is a factory for <tt>SvcHandler</tt> instances, and, by default
- * generates a new <tt>SvcHandler</tt> instance for each connection
- * esablished.
- *
- * <p>
- *
- * The user of this class <em>must</em> provide a
- * reference to a handler factory prior to calling <a
- * href="#accept()"><tt>accept</tt></a>, or an exception will be
- * thrown.  The handler factory is identified by the meta-class for
- * the <tt>SvcHandler</tt>, and is typically obtained by calling <a
- * href="java.lang.Class#classForName(java.lang.String)"><tt>Class.classForName("SvcHandler")</tt></a>.
- *
- * <p>
- *
- * TCP is the transport mechanism used, via
- * <a href="ACE.SOCK_SAP.SOCKAcceptor.html#_top_"><tt>SOCKAcceptor</tt></a>,
- * <em>et.al.</em> The SvcHandler is instantiated with a concrete type
- * that performs the application-specific service.
- *
- * <P>
- *
- * This class is not directly related to the
- * <tt>AcceptorStrategy</tt> class.
- *
- *
- * @see java.lang.Class
- * @see JACE.Connection.SvcHandler
- * @see JACE.SOCK_SAP.SOCKAcceptor 
- */
-public class Acceptor extends ServiceObject
-{
-  /**
-   * Create an instance of Acceptor. Default constructor.  Note that if
-   * an instance is created via this method, <tt>setHandlerFactory</tt>
-   * must be called prior to using <tt>accept</tt>.
-   *
-   * @see JACE.Connection.Acceptor#setHandlerFactory
-   */
-  public Acceptor ()
-  {
-  }
-  
-  /**
-   * Create an instance of Acceptor.
-   *@param handlerFactory meta-class reference used to create
-   * an instance of a SvcHandler when a connection is accepted
-   * (typically obtained by calling <tt>Class.classForName</tt>).
-   *
-   *@see java.lang.Class#forName
-   */
-  public Acceptor (Class handlerFactory)
-  {
-    this.handlerFactory_ = handlerFactory;
-  }
-
-  /**
-   * Set the handler factory. This is provided to aid the default
-   * no-arg constructor.
-   *@param handlerFactory meta-class reference used to create
-   * an instance of a SvcHandler when a connection is accepted
-   * (typically obtained by calling <tt>Class.forName</tt>).
-   *
-   *@see java.lang.Class#forName
-   */
-  public void setHandlerFactory (Class handlerFactory)
-  {
-    this.handlerFactory_ = handlerFactory;
-  }
-
-  /**
-   * Initialize the Acceptor.
-   *@param port TCP port number where the Acceptor will listen for connections
-   *@exception IOException socket level exception
-   */
-  public void open (int port) throws IOException
-  {
-    this.port_ = port;
-    this.sockAcceptor_ = new SOCKAcceptor (port);
-  }
-
-  /**
-   * Template method for accepting connections. Delegates operational
-   * activities to the following bridge methods:
-   * <ul>
-   * <li><tt>makeSvcHandler</tt></li>
-   * <li><tt>acceptSvcHandler</tt></li>
-   * <li><tt>activateSvcHandler</tt></li>
-   * </ul>
-   *
-   * <p>
-   *
-   * The method first obtains a <tt>SvcHandler</tt> via
-   * <tt>makeSvcHandler</tt>, accepts the connection <q>into</q> the
-   * handler using <tt>acceptSvcHandler</tt>, and finally turns over
-   * control to the handler with <tt>activateSvcHandler</tt>.
-   *
-   *@exception SocketException socket level error
-   *@exception InstantiationException <tt>makeSvcHandler</tt> failure
-   *@exception IllegalAccessException <tt>makeSvcHandler</tt> failure
-   *@exception IOException socket level error
-   */
-  public void accept () throws SocketException, 
-    InstantiationException, 
-    IllegalAccessException,
-    IOException
-  {
-
-    // Create a Svc_Handler using the appropriate Creation_Strategy
-    SvcHandler sh = this.makeSvcHandler ();
-
-    // Accept a connection into the SvcHandler using the appropriate
-    // Accept_Strategy 
-    this.acceptSvcHandler (sh);
-
-    // Activate the SvcHandler using the appropriate ActivationStrategy
-    this.activateSvcHandler (sh);
-  }
-
-  /**
-   * Bridge method for creating a <tt>SvcHandler</tt>. The default is to
-   * create a new <SvcHandler>.  However, subclasses can override this
-   * policy to perform <SvcHandler> creation in any way that they like
-   * (such as creating subclass instances of <SvcHandler>, using a
-   * singleton, etc.)
-   *@return a new instance of the SvcHandler
-   *@exception InstantiationException could not create new SvcHandler
-   *@exception IllegalAccessException no SvcHandler factory provided
-   */
-  protected SvcHandler makeSvcHandler ()
-        throws InstantiationException, IllegalAccessException
-  {
-    // Create a new handler for the connection
-    return (SvcHandler) handlerFactory_.newInstance ();
-  }
-
-  /**
-   * Bridge method for accepting the new connection into the
-   * <tt>SvcHandler</tt>.  The default behavior delegates the work to
-   * <tt>SOCKAcceptor.accept</tt>. However, subclasses can override this
-   * strategy.
-   *@param sh SvcHandler in which to accept the connection
-   *@return 0
-   *@exception SocketException socket level error
-   *@exception IOException socket level error
-   */
-  protected int acceptSvcHandler (SvcHandler sh)
-       throws SocketException, IOException
-  {
-    // Create a new stream
-    SOCKStream sockStream = new SOCKStream ();
-
-    // Block in accept. Returns when a connection shows up
-    this.sockAcceptor_.accept (sockStream);
-
-    // Set the streams for the new handler
-    sh.setHandle (sockStream);
-    return 0;
-  }
-  
-  /**
-   * Bridge method for activating a <tt>SvcHandler</tt>.  The default
-   * behavior of this method is to activate the <tt>SvcHandler</tt> by
-   * calling its open() method (which allows the <tt>SvcHandler</tt> to
-   * define its own concurrency strategy).  However, subclasses can
-   * override this strategy to do more sophisticated concurrency
-   * activations.
-   *@param sh SvcHandler to activate
-   *@return 0
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-  {
-    sh.open (null);
-    return 0;
-  }
-
-  protected int port_ = ACE.DEFAULT_SERVER_PORT;
-
-  // Handler class that should be instantiated when a connection is
-  // made with a client
-  protected Class handlerFactory_;
-
-  // Our connection acceptance factory
-  protected SOCKAcceptor sockAcceptor_;
-}
-
diff --git a/java/JACE/Connection/ActivateStrategy.java b/java/JACE/Connection/ActivateStrategy.java
deleted file mode 100644
index 91072a6c823..00000000000
--- a/java/JACE/Connection/ActivateStrategy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    ActivateStrategy.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-
-/**
- * Bridge supporting activation strategy used by
- * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>
- * <P>
- * Subclass and overload
- * <a href="#activateSvcHandler(ACE.Connection.SvcHandler)"><tt>activateSvcHandler</tt></a>
- * in order change the activation strategy.  Then, submit this subclass to 
- * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>
- * as the activation strategy.
- *
- *@see StrategyAcceptor
- */
-public class ActivateStrategy
-{
-  /**
-   * Activate the Svc Handler. Note that subclasses should overwrite
-   * this method to provide a different Activate strategy.
-   *@param sh Svc Handler to activate
-   *@return zero if success, non-zero for failure
-   */
-  public int activateSvcHandler (SvcHandler sh)
-    {
-      sh.open (null);
-      return 0;
-    }
-}
diff --git a/java/JACE/Connection/Blob.java b/java/JACE/Connection/Blob.java
deleted file mode 100644
index d3102c81aa2..00000000000
--- a/java/JACE/Connection/Blob.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    Blob.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-/**
- * Provides a way of reading from or writing to a remote file 
- * using MessageBlocks.
- */
-public class Blob
-{
-  /**
-   * Initialize the Blob.
-   *
-   *@param filename File to read or write
-   *@param hostname Host to contact for the file
-   *@param port Port on which to connect
-   */
-  public int open (String filename, String hostname , int port) 
-  {
-    this.filename_ = filename;
-    this.hostname_ = hostname;
-    this.port_ = port;
-    return 0;
-  }
-
-  /**
-   * Read a certain amount from the file.
-   */
-  public MessageBlock read (int length, int offset) 
-  {
-    // Check if we have a valid length and a valid offset
-    if (length < 0 || offset < 0)
-      {
-	ACE.ERROR ("Blob::read(): Negative length or offset");
-	return null;
-      }
-    
-    // Create a Blob Reader
-    BlobReader blobReader = new BlobReader (length, 
-					    offset, 
-					    this.filename_, 
-					    this.hostname_, this.port_);
-
-    // Receive data
-    MessageBlock mb = blobReader.receiveData ();
-    if (blobReader.bytesRead () != length)
-      return null;
-    else
-      return mb;
-  }
-
-  /**
-   * Write a certain amount to the file.
-   */
-  public int write (MessageBlock mb, int length, int offset) 
-  {
-    // Check if we have a valid length and a valid offset
-    if (length < 0 || offset < 0)
-      ACE.ERROR ("Blob::write(): Negative length or offset");
-    
-    // Create a Blob Writer
-    BlobWriter blobWriter = new BlobWriter (mb, length, offset, this.filename_);
-    
-    try
-      {
-	// Connect to the server
-	this.connector_.open (this.hostname_, this.port_);
-	this.connector_.connect (blobWriter);
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    
-    return blobWriter.bytesWritten ();
-  }
-
-  public int close () 
-  {
-    return 0;
-  }
-
-  String filename_;
-  String hostname_;
-  int port_;
-  Connector connector_ = new Connector ();
-}
diff --git a/java/JACE/Connection/BlobHandler.java b/java/JACE/Connection/BlobHandler.java
deleted file mode 100644
index ec282bdeaa9..00000000000
--- a/java/JACE/Connection/BlobHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    BlobHandler.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-public abstract class BlobHandler extends SvcHandler
-{
-  public BlobHandler (int length, int offset, String filename)
-  {
-    this.length_ = length;
-    this.offset_ = offset;
-    this.filename_ = filename;
-  }
-
-  public abstract int open (Object obj);
-
-  protected int length_ = 0;
-  protected int offset_ = 0;
-  protected String filename_ = null;
-}
-
diff --git a/java/JACE/Connection/BlobReader.java b/java/JACE/Connection/BlobReader.java
deleted file mode 100644
index 4de6b65bedc..00000000000
--- a/java/JACE/Connection/BlobReader.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    BlobReader.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-/**
- * Provides a way to read from a remote file using
- * MessageBlocks (and HTTP). <P>
- *
- * Created by Blob during a call to read.
- */
-public class BlobReader
-{
-  public BlobReader (int length, 
-		     int offset, 
-		     String filename,
-		     String hostname,
-		     int port)
-  {
-    this.length_ = length;
-    this.offset_= offset;
-    this.filename_ = filename;    
-    this.hostname_ = hostname;
-    this.port_ = port;
-  }
-
-
-  public MessageBlock receiveData ()
-  {
-    String hostname = this.hostname_;
-    String filename = this.filename_;
-
-    // Check if the filename begins with a "/" and if so, remove it
-    // since we are concatenating a "/" to the hostname.
-    if (this.filename_.startsWith ("/"))
-      filename = this.filename_.substring (1);
-    
-    hostname = hostname + ":" + this.port_ + "/";
-    //    System.out.println (hostname + filename);
-    
-    // Allocate a buffer to hold the offset worth of data
-    byte tempBuf [] = new byte [this.offset_];
-    // Allocate a buffer to hold the actual data
-    byte dataBuf [] = new byte [this.length_];
-
-    try
-      {
-	// Create a URL to fetch the file
-	URL url = new URL (this.protocol_ + hostname + filename);
-	
-	// Get the input stream and pipe it to a DataInputStream
-	DataInputStream iStream = new DataInputStream (url.openStream ());
-
-	// Read the offset worth of bytes
-	iStream.readFully (tempBuf, 0, this.offset_);
-
-	// Read length worth of bytes
-	iStream.readFully (dataBuf, 0, this.length_);
-      }
-    catch (MalformedURLException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    // Cache number of bytes read
-    this.bytesRead_ = this.length_;
-    return new MessageBlock (new String (dataBuf, 0, this.length_));
-  }
-
-  public int close (long flags)
-  {
-    return 0;
-  }
-
-  public int bytesRead ()
-  {
-    return this.bytesRead_;
-  }
-
-  private String protocol_ = "http://";
-
-  int length_ = 0;
-  int offset_= 0;
-  String filename_ = null;
-  String hostname_ = "localhost";
-  int port_ = 80;
-
-  int bytesRead_ = 0;
-}
-
-
diff --git a/java/JACE/Connection/BlobWriter.java b/java/JACE/Connection/BlobWriter.java
deleted file mode 100644
index 18c9b092964..00000000000
--- a/java/JACE/Connection/BlobWriter.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    BlobWriter.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-/**
- * Provides a way to write to a remote file using MessageBlocks
- * (and HTTP). <P>
- *
- * Created by Blob during a write.
- */
-public class BlobWriter extends BlobHandler
-{
-  public BlobWriter (MessageBlock mb,
-		     int length, 
-		     int offset, 
-		     String filename)
-  {
-    super (length, offset, filename);
-    this.mb_ = mb;
-    this.returnCode_ = -1;
-
-  }
-
-  /*******************************
-   *  This constructor should be used when using the basic HTTP 1.1 
-   *  authentication scheme
-   *******************************/
-  public BlobWriter (MessageBlock mb,
-		     int length, 
-		     int offset, 
-		     String filename,
-		     String authentication)
-  {
-    super (length, offset, filename);
-    this.mb_ = mb;
-    this.returnCode_ = -1;
-    this.authentication_ = authentication;
-  }
-
-
-  public int open (Object obj)
-  {
-    if (this.sendRequest () != 0)
-      {
-	ACE.ERROR ("BlobWriter::open():sendRequest failed");
-	return -1;
-      }
-    else if (this.receiveReply () != 0)
-      {
-	ACE.ERROR ("BlobWriter::open():receiveReply failed");
-	return -1;
-      }
-    return 0;
-  }
-
-  public int close (long flags)
-  {
-    return 0;
-  }
-
-  public int bytesWritten ()
-  {
-    return this.bytesWritten_;;
-  }
-
-  protected int sendRequest ()
-  {
-    // Check for sanity -- check if we have any data to send.
-    if (this.offset_+ this.length_ > this.mb_.length ())
-      {
-	ACE.ERROR ("BlobWriter::sendRequest():Invalid offset/length");
-	return -1;
-      }
-
-    if (this.sendHeader () == -1)
-      {
-	ACE.ERROR ("BlobWriter::sendHeader failed.");
-	return -1;
-      }
-    else
-      if (this.sendData () == -1)
-      {
-	ACE.ERROR ("BlobWriter::sendData failed.");
-	return -1;
-      }
-    return 0;
-  }
-  
-  // Send the header
-  protected int sendHeader ()
-  {
-    String filename = this.filename_;
-    // Check if the filename begins with a "/" and if it doesn't, add it
-    if (!this.filename_.startsWith ("/"))
-      filename = "/" + this.filename_;
-
-    // Create the header, store the actual length in mesglen 
-    String mesg = this.requestPrefix_ + " " + filename + " " + this.requestSuffix_;
-
-    if (this.authentication_ != null) 
-      mesg += "Authorization: Basic " + JACE.Connection.HTTPHelper.EncodeBase64(this.authentication_) + '\n';
-
-    mesg += "Content-length: " + this.length_ + "\n";
-
-    try
-      {
-	if (this.peer ().send (mesg) < 0)
-	  {
-	    ACE.ERROR ("Error sending request");
-	    return -1;
-	  }
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-	return -1;
-      }
-    return 0;
-  }
-
-  // Send the data
-  protected int sendData ()
-  {
-    // Get the actual data to send
-    String data = this.mb_.base ().substring (this.offset_,
-					      this.offset_ + this.length_);
-
- 
-    try
-      {
-	//	System.out.println (data);
-	// Now send the data
-	if (this.peer ().send (data) != this.length_)
-	  {
-	    ACE.ERROR ("Error sending file");
-	    return -1;
-	  }
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-	return -1;
-      }
-    this.bytesWritten_ = this.length_;
-    return 0;
-  }
-
-
-  protected int receiveReply ()
-  {
-    System.out.println("Waiting for reply");
-
-    // Receive the reply from the server
-    StringBuffer reply = new StringBuffer (1024);
-    
-    try
-      {
-	if (this.peer ().recv (reply) < 0)
-	  {
-	    ACE.ERROR ("Error receiving reply from server");
-	    return -1;
-	  }
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    String s = reply.toString ();
-
-    int index = -1;
-    // Now parse the reply to see if it was a success or a failure
-    if ((index = s.indexOf (replyPrefix_)) == -1)
-      {
-	ACE.ERROR ("Error receiving reply from server");
-	return -1;
-      }
-
-    int codeIndex = index + replyPrefix_.length () + 1;
-
-    // Assume code is a 3 digit number
-    String codeString = s.substring (codeIndex, codeIndex + 3);
-
-    returnCode_ = (new Integer (codeString)).intValue ();
-    //    System.out.println (code);
-
-    if (returnCode_ >= 200 && returnCode_ < 300) {  // Check if everything went smoothly
-      System.out.println("We got the goodies!");
-      return 0;
-    } else 
-      return -1;
-  }
-
-  public int returnCode ()
-  {
-    return this.returnCode_;
-  }
-
-  protected String authentication_ = null;
-  protected String protocol_ = "http://";
-  protected int bytesWritten_ = 0;
-  protected MessageBlock mb_ = null;
-  protected String requestPrefix_ = "PUT";
-  protected String requestSuffix_ = "HTTP/1.0\n";
-  protected String replyPrefix_ = "HTTP/1.0";
-  protected int returnCode_;
-}
-
-
diff --git a/java/JACE/Connection/Connector.java b/java/JACE/Connection/Connector.java
deleted file mode 100644
index dbe72b8c359..00000000000
--- a/java/JACE/Connection/Connector.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    Connector.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-import JACE.ServiceConfigurator.*;
-
-/**
- * Abstract factory for connecting a
- * (<a href="JACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>),
- * to an application.
- * <P>
- * Implements the basic strategy for actively establishing connections
- * with applications.  The <tt>Connector</tt> establishes the connection,
- * passing it on to a <tt>SvcHandler</tt> instance, and handing over
- * control to that instance.
- *<p>
- * TCP is the transport mechanism used, via
- * <a href="JACE.SOCK_SAP.SOCKConnector.html#_top_"><tt>SOCKConnector</tt></a>.
- *<P>
- * This class, as currently implemented, does not work like its C++ 
- * counterpart.
- * Future versions are expected to rectify this discrepancy.
- *
- *@see SOCKConnector
- *@see SvcHandler
- */
-public class Connector extends ServiceObject
-{
-  /**
-   * Create a Connector. Do nothing constructor. Allows user to
-   * call <a href="#open(java.lang.String)">open</a>() later.
-   */
-  public Connector ()
-    {
-    }
-
-  /**
-   * Create a Connector passing in server hostname and port
-   * number, effectively shorthand for calling
-   * <a href="#open(java.lang.String)">open</a>().
-   *@param hostname server hostname
-   *@param port server port number
-   */
-  public Connector (String hostname, int port)
-    {
-      this.open (hostname, port);
-    }
-
-  /**
-   * Initialize the Connector passing in server hostname and port
-   * number.  Note that no connection attempt is made.
-   *@param hostname server hostname
-   *@param port server port number
-   */
-  public void open (String hostname, int port)
-    {
-      this.hostname_ = hostname;
-      this.port_ = port;
-    }
-
-  /**
-   * Connect to the server.
-   *@param sh Svc Handler to use to handle the connection
-   *@exception UnknownHostException Bad host
-   *@exception SocketException Socket error
-   *@exception InstantiationException Couldn't create new SOCKConnector
-   *@exception IllegalAccessException No strategy available
-   *@exception IOException Socket error
-   */
-  public void connect (SvcHandler sh) throws UnknownHostException, 
-      SocketException,
-      InstantiationException, 
-      IllegalAccessException, 
-      IOException
-  {
-    // Make a connection using the appropriate Connection_Strategy
-    this.connectSvcHandler (sh);
-
-    // Activate the Svc_Handler using the appropriate Activation_Strategy
-    this.activateSvcHandler (sh);
-  }
-
-  /**
-   * Bridge method for making a new connection. The default behavior
-   * creates a new SOCKConnector and then calls setHandle() on the
-   * <SvcHandler> that was passed in. Subclasses can override this
-   * strategy, if needed.
-   *@param sh Svc Handler to use to handle the connection
-   *@return 0
-   *@exception SocketException Socket error
-   *@exception IOException Socket error
-   */
-  protected int connectSvcHandler (SvcHandler sh) throws
-  SocketException, IOException
-  {
-    // Create a new stream
-    SOCKStream sockStream = new SOCKStream ();
-
-    // Create a SOCK_Connector (note the constructor does the connect for us)
-    this.sockConnector_ = new SOCKConnector (sockStream,
-					       this.hostname_,
-					       this.port_);
-    ACE.DEBUG ("Connected to " +
-	       sockStream.socket ().getInetAddress ());
-    
-    // Set the streams for the new handler
-    sh.setHandle (sockStream);
-    return 0;
-  }
-  
-  /**
-   * Bridge method for activating a <SvcHandler>.  The default
-   * behavior of this method is to activate the <SvcHandler> by
-   * calling its open() method (which allows the SVC_HANDLER to define
-   * its own concurrency strategy).  However, subclasses can override
-   * this strategy to do more sophisticated concurrency activations.
-   *@param sh Svc Handler to activate
-   *@return 0
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-    {
-      sh.open (null);
-      return 0;
-    }
-
-  
-  // Port server is listening on
-  private int port_;
-
-  // Server hostname
-  private String hostname_;
-
-  // Our connection factory
-  private SOCKConnector sockConnector_;
-}
diff --git a/java/JACE/Connection/CreationStrategy.java b/java/JACE/Connection/CreationStrategy.java
deleted file mode 100644
index f4828d5bff5..00000000000
--- a/java/JACE/Connection/CreationStrategy.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    CreationStrategy.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-/**
- * Defines the interface for specifying a creation strategy for a
- * <a href="ACE.Connection.SvcHandler.html#_top_"><tt>SvcHandler</tt></a> to the
- * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>.
- * <P>
- *     The default behavior is to make a new SvcHandler.  However,
- *     subclasses can override this strategy to perform SvcHandler
- *     creation in any way that they like (such as creating subclass
- *     instances of SvcHandler, using a singleton, dynamically
- *     linking the handler, etc.).
- *
- *@see SvcHandler
- *@see StrategyAcceptor
- *@see AcceptStrategy
- *@see ActivateStrategy
- */
-public class CreationStrategy
-{
-  /**
-   * Create an instance of Creation Strategy.
-   *@param handlerFactory Svc Handler factory that is used to create
-   * an instance of a Svc Handler
-   */
-  public CreationStrategy (Class handlerFactory)
-  {
-    this.handlerFactory_ = handlerFactory;
-  }
-
-  /**
-   * Create a new SvcHandler. Note that subclasses should override
-   * this method to provide a new creation strategy.
-   *@return reference to a new instance of the SvcHandler (or subclass)
-   *@exception InstantiationException Unable to instantiate.
-   *@exception IllegalAccessException No handler factory available.
-   */
-  public SvcHandler makeSvcHandler () throws InstantiationException, 
-    IllegalAccessException
-    {
-      // Create a new Svc_Handler
-      return (SvcHandler) handlerFactory_.newInstance ();
-    }
-
-  private Class handlerFactory_;
-}
diff --git a/java/JACE/Connection/HTTPHelper.java b/java/JACE/Connection/HTTPHelper.java
deleted file mode 100644
index 2901d74a14a..00000000000
--- a/java/JACE/Connection/HTTPHelper.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package JACE.Connection;
-
-import JACE.OS.*;
-
-/**
- * Collection of methods concerning HTTP.
- */
-public class HTTPHelper
-{
-  /**
-   * Alphabet used in encoding and decoding basic base64 authentication.
-   * See the HTTP 1.1 RFC for details.
-   */
-  public static String Alphabet 
-    = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-  /**
-   * Decode a secret encrypted with the basic base64 HTTP 1.1 authentication
-   * scheme.
-   *
-   *@param secret Message to decode
-   *@return null on error, decoded String on success
-   */
-  public static String DecodeBase64 (String secret)
-  {
-    StringBuffer output = new StringBuffer ();
-    boolean inalphabet [] = new boolean[256];
-    char decoder [] = new char [256];
-
-    for (int i = 0; i < 256; i++) {
-      inalphabet [i] = false;
-      decoder [i] = 0;
-    }
-
-    for (int i = Alphabet.length () - 1;
-	 i >= 0;
-	 i--)
-      {
-	inalphabet [(int)Alphabet.charAt (i)] = true;
-	decoder [(int)Alphabet.charAt (i)] = (char)i;
-      }
-
-    int inidx = 0;
-    int c = 0;
-    int char_count = 0;
-    int bits = 0;
-    boolean error = false;
-
-    while (inidx < secret.length ())
-      {
-	c = secret.charAt (inidx++);
-
-	if (c == '=')
-	  break;
-
-	if (c > 255 || !inalphabet[(int)c]) 
-	  continue;
-	
-	bits += decoder[c];
-	char_count++;
-	if (char_count == 4) {
-	  output.append ((char) (bits >> 16));
-	  output.append ((char) ((bits >> 8) & 0xff));
-	  output.append ((char) (bits & 0xff));
-	  bits = 0;
-	  char_count = 0;
-	} else 
-	  bits <<= 6;
-      }
-
-    if (c == '\0') {
-      if (char_count != 0) {
-	ACE.DEBUG ("base64 encoding incomplete: at least "
-		   + ((4 - char_count) * 6) + " bits truncated");
-	error = true;
-      }
-    } else {
-      // c == '='
-      switch (char_count)
-	{
-	case 1:
-	  ACE.DEBUG ("output so far: " + output.toString ());
-	  ACE.DEBUG ("base64 encoding incomplete: at least 2 bits missing");
-	  error = true;
-	  break;
-	case 2:
-	  output.append ((char) (bits >> 10));
-	  break;
-	case 3:
-	  output.append ((char) (bits >> 16));
-	  output.append ((char) ((bits >> 8) & 0xff));
-	  break;
-	}
-    }
-
-    if (!error)
-      return output.toString ();
-    else
-      return null;
-  }
-
-  /**
-   * Encode a message with the basic base64 HTTP 1.1 authentication
-   * scheme.  Adapted from James' JAWS HTTP_Helpers code.  
-   *
-   *@param secret Message to encode
-   *@return null on error, an encoded String on success
-   */
-  public static String EncodeBase64 (String secret)
-  {
-    StringBuffer output = new StringBuffer ();
-
-    // Index of the input string
-    int inidx = 0;
-
-    // character value
-    int c;
-
-    int char_count = 0;
-    int bits = 0;
-    boolean error = false;
-
-    while (inidx < secret.length())
-      {
-	c = secret.charAt(inidx++);
-
-	// This will mess up internationalization.  I wonder if it is really
-	// necessary for HTTP?
-	if (c > 255)
-	  {
-	    ACE.DEBUG ("encountered char > 255 (decimal %d): " + c);
-	    error = true;
-	    break;
-	  }
-
-	bits += c;
-	char_count++;
-
-	if (char_count == 3)
-	  {
-	    output.append(HTTPHelper.Alphabet.charAt(bits >> 18));
-	    output.append(HTTPHelper.Alphabet.charAt((bits >> 12) & 0x3f));
-	    output.append(HTTPHelper.Alphabet.charAt((bits >> 6) & 0x3f));
-	    output.append(HTTPHelper.Alphabet.charAt(bits & 0x3f));
-
-	    bits = 0;
-	    char_count = 0;
-	  }
-	else
-	  bits <<= 8;
-      }
-
-    if (!error)
-      {
-	if (char_count != 0)
-	  {
-	    bits <<= 16 - (8 * char_count);
-	    output.append(HTTPHelper.Alphabet.charAt(bits >> 18));
-	    output.append(HTTPHelper.Alphabet.charAt((bits >> 12) & 0x3f));
-	      
-	    if (char_count == 1)
-	      {
-		output.append("==");
-	      }
-	    else
-	      {
-		output.append(HTTPHelper.Alphabet.charAt((bits >> 6) & 0x3f));
-		output.append('=');
-	      }
-	  }
-
-	return output.toString();
-      }
-
-    // Returns null on error
-    return null;
-  }
-
-  private HTTPHelper () {}
-}
-
-
diff --git a/java/JACE/Connection/StrategyAcceptor.java b/java/JACE/Connection/StrategyAcceptor.java
deleted file mode 100644
index 743d384776f..00000000000
--- a/java/JACE/Connection/StrategyAcceptor.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    StrategyAcceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-/**
- * Abstract factory for creating, accepting into, and activating
- * a service handler.
- * <P>
- * Uses instances of CreationStrategy, AcceptStrategy, and
- * ActivateStrategy.
- *
- *@see SvcHandler
- *@see CreationStrategy
- *@see AcceptStrategy
- *@see ActivateStrategy
- */
-public class StrategyAcceptor extends Acceptor
-{
-  /**
-   * Create an instance of StrategyAcceptor.  The caller must
-   * call setHandlerFactory before open!
-   */
-  public StrategyAcceptor ()
-  {
-    this (null, null, null, null);
-  }
-
-  /**
-   * Create an instance of StrategyAcceptor.
-   *@param handlerFactory Svc Handler factory that is used to create
-   * an instance of a Svc Handler when a connection is accepted.
-   */
-  public StrategyAcceptor (Class handlerFactory)
-    {
-      this (handlerFactory, null, null, null);
-    }
-
-  /**
-   * Create an instance of StrategyAcceptor. Use the creation
-   * strategy and the handlerFactory passed in to creae a new instance
-   * of the Svc Handler.
-   *@param handlerFactory Svc Handler factory that is used to create
-   * an instance of a Svc Handler when a connection is accepted.
-   *@param creStrategy Creation strategy to use to create a new
-   * instance of the Svc Handler.
-   *@param acceptStrategy Accept strategy to use to accept a new
-   * connection into the Svc Handler.
-   *@param activateStrategy Activate strategy to use to activate the
-   * instance of the Svc Handler.
-   */
-  public StrategyAcceptor (Class handlerFactory,
-			   CreationStrategy creStrategy,
-			   AcceptStrategy acceptStrategy,
-			   ActivateStrategy activateStrategy)
-  {
-      // Cache everything
-      this.handlerFactory_ = handlerFactory;
-      this.creStrategy_ = creStrategy;
-      this.acceptStrategy_ = acceptStrategy;
-      this.activateStrategy_ = activateStrategy;
-    }
-
-  /**
-   * Initialize the Strategy Acceptor. The method creates the
-   * appropriate strategies as needed.
-   *@param port port number where the server will listen for connections
-   *@exception IOException Socket level error
-   */
-  public void open (int port) throws IOException
-    {
-      if (this.creStrategy_ == null)
-	this.creStrategy_ = new CreationStrategy (this.handlerFactory_);
-      if (this.acceptStrategy_ == null)
-	this.acceptStrategy_ = new AcceptStrategy (port);
-      else
-	this.acceptStrategy_.open (port);
-      if (this.activateStrategy_ == null)
-	this.activateStrategy_ = new ActivateStrategy ();
-    }
-
-  /**
-   * Accept a connection using the appropriate strategies.
-   *
-   *@exception SocketException Socket level error
-   *@exception InstantiationException Problem creating a handler
-   *@exception IllegalAccessException No strategy available
-   *@exception IOException Socket level error
-   */
-  public void accept () throws SocketException, 
-      InstantiationException, 
-      IllegalAccessException,
-      IOException
-  {
-    // Create a Svc_Handler using the appropriate Creation_Strategy
-    SvcHandler sh = this.makeSvcHandler ();
-
-    // Accept a connection into the Svc_Handler
-    this.acceptSvcHandler (sh);
-
-    // Activate the Svc_Handler
-    this.activateSvcHandler (sh);
-  }
-
-  /**
-   * Bridge method for creating a SvcHandler.  The strategy for
-   * creating a SvcHandler is configured into the Acceptor via it's
-   * creStrategy_.  If no strategy is passed in, the default behavior
-   * of this method is to use the default CreationStrategy.
-   *@return a new instance of the Svc Handler
-   *@exception InstantiationException Couldn't create SvcHandler
-   *@exception IllegalAccessException No strategy available
-   */
-  protected SvcHandler makeSvcHandler () 
-    throws InstantiationException, IllegalAccessException
-    {
-      // Create a new handler for the connection
-      return this.creStrategy_.makeSvcHandler ();
-    }
-
-
-  /**
-   * Bridge method for accepting the new connection into the
-   * <SvcHandler>.  The strategy for accepting into a SvcHandler is
-   * configured into the Acceptor via it's acceptStrategy_.  If no
-   * strategy is passed in, the default behavior of this method is to
-   * use the default AcceptStrategy. 
-   *@param sh Svc Handler in which to accept the connection
-   *@return result of accepting a connection using the accept strategy
-   *@exception SocketException Socket level error
-   *@exception IOException Socket level error
-   */
-  protected int acceptSvcHandler (SvcHandler sh) throws SocketException, IOException
-  {
-    // Delegate responsibility to the appropriate strategy
-    return this.acceptStrategy_.acceptSvcHandler (sh);
-  }
-  
-  /**
-   * Bridge method for activating a <SvcHandler>.  The strategy for
-   * activating a SvcHandler is configured into the Acceptor via it's
-   * activateStrategy_. If no strategy is passed in, the default
-   * behavior of this method is to use the default ActivateStrategy.
-   *@param sh Svc Handler to activate
-   *@return result of activating the Svc Handler
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-    {
-      // Delegate responsibility to the appropriate strategy
-      return this.activateStrategy_.activateSvcHandler (sh);
-    }
-
-  // Creation Strategy
-  private CreationStrategy creStrategy_;
-
-  // Accept Strategy
-  private AcceptStrategy acceptStrategy_;
-
-  // Activation Strategy
-  private ActivateStrategy activateStrategy_;
-}
diff --git a/java/JACE/Connection/SvcHandler.java b/java/JACE/Connection/SvcHandler.java
deleted file mode 100644
index 1df62247baa..00000000000
--- a/java/JACE/Connection/SvcHandler.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    SvcHandler.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-/**
- * Defines the interface for a service that exchanges data with its
- * connected peer.
- * <P>
- * This class provides a well-defined interface that the Acceptor and
- * Connector pattern factories use as their target.  Typically, client
- * applications will subclass SvcHandler and do all the interesting work
- * in the subclass.  One thing that the SvcHandler does contain is a
- * peer SOCKStream endpoint that is initialized by Acceptor or Connector
- * when a connection is established successfully.  This endpoint is used
- * to exchange data between a SvcHandler and the peer it is connected
- * with.
- */
-public abstract class SvcHandler extends Task
-{
-
-  /**
-   * Do nothing constructor. 
-   */
-  public SvcHandler ()
-  {
-  }
-  
-  /**
-   * Set the stream using the SOCKStream passed in. This sets the
-   * underlying peer
-   *@param s SOCK Stream to use for the connection
-   */
-  public void setHandle (SOCKStream s) throws IOException
-  {
-    this.stream_ = s;
-  }
-
-  /**
-   * Get the underlying peer
-   *@return the underlying peer
-   */
-  public SOCKStream peer ()
-  {
-    return this.stream_;
-  }
-
-  /**
-   * Abstract method that subclasses must define to allow
-   * initialization to take place.
-   */
-  public abstract int open (Object obj);
-
-  /**
-   * Provide a default implementation to simplify ancestors.
-   *@return 0
-   */
-  public int close (long flags)
-  {
-    return 0;
-  }
-
-  /**
-   * Provide a default implementation to simplify ancestors.
-   *@return -1
-   */
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    return -1;
-  }
-
-  /**
-   * Provide a default implementation to simplify ancestors.
-   *@param tv Time Value when the event occured
-   *@param obj An arbitrary object that was passed to the Timer Queue
-   * (Asynchronous Completion Token)
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return -1;
-  }
-
-  /**
-   * Underlying peer socket stream.
-   */  
-  protected SOCKStream stream_;
-}
diff --git a/java/JACE/Connection/package.html b/java/JACE/Connection/package.html
deleted file mode 100644
index 429904216d5..00000000000
--- a/java/JACE/Connection/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Collection of factories for services.
-@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#initialize">Documents on ACE object and service initialization components</a>
-</BODY>
-</HTML>
diff --git a/java/JACE/Misc/GetOpt.java b/java/JACE/Misc/GetOpt.java
deleted file mode 100644
index e373baedb67..00000000000
--- a/java/JACE/Misc/GetOpt.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Misc
- *
- * = FILENAME
- *    GetOpt.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Misc;
-
-import java.io.*;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-/**
- *     Iterator for parsing command-line arguments.
- * <P>
- *     This version of `get_opt' appears to the caller like standard
- *     Unix `get_opt' but it behaves differently for the user, since
- *     it allows the user to intersperse the options with the other
- *     arguments.
- * 
- * <p> As `get_opt' works, it permutes the elements of `argv' so that,
- *     when it is done, all the options precede everything else. Thus
- *     all application programs are extended to handle flexible argument
- *     order.
- */
-public class GetOpt
-{
-  /** 
-   * Constructor
-   *@param args command line arguments
-   *@param optstring string containing the legitimate option
-   * characters. A colon in optstring means that the previous character
-   * is an option that wants an argument which is then taken from the
-   * rest of the current args-element. Here is an example of what
-   * optstring might look like: "c:dP:p".
-   */
-  public GetOpt (String[] args, String optstring)
-  {
-    this (args, optstring, false);
-  }
-
-  /**  
-   * Constructor
-   *@param args command line arguments
-   *@param optstring string containing the legitimate option
-   * characters. A colon in optstring means that the previous character
-   * is an option that wants an argument which is then taken from the
-   * rest of the current args-element. Here is an example of what
-   * optstring might look like: "c:dP:p".
-   *@param returnAllArgs specify true if next() should return any
-   * arguments, even if not in the optstring.  This is useful for
-   * providing an error message.
-   */
-  public GetOpt (String[] args, String optstring, boolean returnAllArgs)
-  {
-    returnAllArgs_ = returnAllArgs;
-
-    // Cache the arguments
-    this.args_ = args;
-    this.hasArg_ = false;
-
-    // Build the arg hashtable
-    this.buildArgTable (optstring);
-  }
-
-  /** 
-   * Scan elements specified in optstring for next option flag.
-   *@return The character corresponding to the next flag.
-   */
-  public int next ()
-  {
-    if (this.args_ == null)
-      return -1;
-
-    if (this.index_ < this.args_.length) 
-      {
-	String arg = this.args_[this.index_++];
-
-	// Make sure flag starts with "-"
-	if (!arg.startsWith ("-"))
-	  return -1;
-	
-	// Check if there is more than one character specified as flag
-	if (arg.length () > 2)
-	  return -1;
-	
-	// So far so good
-	// Check if the flag is in the arg_table and if it is get the
-	// associated binding.
-	Character c = (Character) this.argTable_.get 
-	  (new Character (arg.charAt (1)));
-
-	if (c == null) {
-	  if (returnAllArgs_)
-	    return arg.charAt (1);
-	  else
-	    return -1;
-	}
-
-	if (c.charValue () == '#')
-	  {
-	    this.hasArg_ = false;
-	    return arg.charAt (1);
-	  }
-	else if (c.charValue () == ':')
-	  {
-	    this.hasArg_ = true;
-	    return arg.charAt (1);
-	  }
-	else   // This should not happen
-	  return -1; 
-      }
-    return -1;
-  }
-  
-  /**
-   * Get the argument (if any) associated with the flag.
-   *@return the argument associated with the flag.
-   */
-  public String optarg ()
-  {
-    if (this.hasArg_)
-      return this.args_[this.index_++];
-    else
-      return null;
-  }
-  
-  // Build the argument table
-  private void buildArgTable (String s)
-  {
-    this.argTable_ = new Hashtable ();
-    StringTokenizer tokens = new StringTokenizer (s, ":");
-    while (tokens.hasMoreTokens ())
-      {
-	// Get the next token
-	String t = tokens.nextToken ();
-
-	// First add all flags except the one with ":" after it
-	// Note "#" is an arbitrary character we use to distinguish
-	// the two cases
-	for (int i = 0; i < t.length () - 1; i++)
-	  this.argTable_.put (new Character (t.charAt (i)),
-			       new Character ('#'));
-
-	// Now Add the flag just before ":" to the arg_table
-	this.argTable_.put (new Character (t.charAt (t.length () - 1)),
-			     new Character (':'));
-      }
-  }
-  
-  private String [] args_;
-  // Copy of the args passed in
-  
-  private boolean hasArg_;
-  // Indicator that the flag has an argument following it
-
-  private int index_;
-  // Index into the array of arguments
-
-  private Hashtable argTable_;
-  // Table of flags that take arguments after them
-
-  private boolean returnAllArgs_;
-  // When true, GetOpt returns arguments even if not present in the
-  // given optstring.
-}
diff --git a/java/JACE/Misc/package.html b/java/JACE/Misc/package.html
deleted file mode 100644
index 31803472e19..00000000000
--- a/java/JACE/Misc/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Miscellaneous utility classes.
-</BODY>
-</HTML>
diff --git a/java/JACE/OS/ACE.java b/java/JACE/OS/ACE.java
deleted file mode 100644
index 3979fa6c2d2..00000000000
--- a/java/JACE/OS/ACE.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.OS
- *
- * = FILENAME
- *    JACE.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.OS;
-
-/**
- * Constants, utility "functions", etc.
- * <P>
- * Defines default constants for ACE. Many of these are used for the
- * ACE tests and applications. You may want to change some of these to
- * correspond to your environment. Also, routines for error handling,
- * debugging and bit manipulation are included.
- * <P>
- * This class is non-instantiable, and intended only to provide a constrained
- * namespace.
- */
-public abstract class ACE
-{
-  /**
-   * Default port on which a server listens for connections.
-   */
-  public static final int DEFAULT_SERVER_PORT = 10002;
-
-  /** 
-   * Default name to use for a thread group.
-   */
-  public static final String DEFAULT_THREAD_GROUP_NAME = "ace_thread_group";
-
-  /**
-   * Disable debugging. Once debugging is disabled, all ACE.DEBUG
-   * statements would be ignored. 
-   */
-  public static final void disableDebugging ()
-  {
-    ACE.debug_ = false;
-  }
-
-  /**
-   * Enable debugging. Once debugging is enabled, all ACE.DEBUG
-   * statements get printed.
-   */
-  public static final void enableDebugging ()
-  {
-    ACE.debug_ = true;
-  }
-
-  /** 
-   * Print the string representation of Java Exception.
-   *@param e Java exception
-   */
-  public static final void ERROR (Exception e)
-  {
-    System.err.println (e);
-  }
-
-  /** 
-   * Print the string being passed in.
-   *@param s a Java String
-   */
-  public static final void ERROR (String s)
-  {
-    System.err.println (s);
-  }
-
-  /** 
-   * Print the string being passed in.
-   *@param s A Java String
-   *@return Error value passed in
-   */
-  public static final int ERROR_RETURN (String s, int errorVal)
-  {
-    System.err.println (s);
-    return errorVal;
-  }
-
-  /** 
-   * Print the string being passed in. Note the behavior will vary
-   * depending upon whether debugging is enabled or disabled.
-   *@param s a Java String
-   */
-  public static final void DEBUG (String s)
-  {
-    if (ACE.debug_)
-      System.out.println (s);
-  }
-
-  /** 
-   * Flush out any data that may be buffered.
-   */
-  public static final void FLUSH ()
-  {
-    System.out.flush ();
-  }
-
-  /** 
-   * Set the bits of WORD using BITS as the mask.
-   *@param WORD the bits to be set.
-   *@param BITS the mask to use.
-   *@return The value obtained after setting the bits.
-   */
-  public static final long SET_BITS (long WORD, long BITS)
-  {
-    return WORD | BITS;
-  }
-
-  /** 
-   * Clear the bits of WORD using BITS as the mask.
-   *@param WORD the bits to clear.
-   *@param BITS the mask to use.
-   *@return The value obtained after clearing the bits.
-   */
-  public static final long CLR_BITS (long WORD, long BITS)
-  {
-    return WORD & ~BITS;
-  }
-  
-  /** 
-   * Check if bits are enabled in WORD.
-   *@param WORD the bits to check.
-   *@param BIT the bit to check to see if it is enabled or not.
-   *@return true if bit is enabled, false otherwise.
-   */
-  public static final boolean BIT_ENABLED (long WORD, long BIT)
-  {
-    return (WORD & BIT) != 0;
-  }
-
-  /** 
-   * Check if bits are disabled in WORD.
-   *@param WORD the bits to check.
-   *@param BIT the bit to check to see if it is disabled or not.
-   *@return true if bit is disabled, false otherwise.
-   */
-  public static final boolean BIT_DISABLED (long WORD, long BIT)
-  {
-    return (WORD & BIT) == 0;
-  }
-  
-  // Debug flag (turn debugging on/off)
-  private static boolean debug_ = false;
-
-  // Default private constructor to avoid instantiation
-  private ACE ()
-  {
-  }
-}
-
-
diff --git a/java/JACE/OS/OS.java b/java/JACE/OS/OS.java
deleted file mode 100644
index 3f15a028cc2..00000000000
--- a/java/JACE/OS/OS.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.OS
- *
- * = FILENAME
- *    OS.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.OS;
-
-import java.util.StringTokenizer;
-
-/**
- *     Methods to extend the capabilities of the Java runtime system.
- * <P>
- * This non-instantiable class contains little <q>utility functions</q>
- * that should have been in Java to begin with :-)
- */
-public class OS
-{
-  /**
-   * Create an array of Strings from a single String using <delim> as
-   * the delimiter.
-   *@param args the String to break up to make an array of Strings
-   *@param delim the delimeter to use to break the String up
-   *@return an array containing the original String broken up
-   */
-  public static String [] createStringArray (String args, String delim)
-  {
-    // First determine the number of arguments
-    int count = 0;
-    StringTokenizer tokens = new StringTokenizer (args, delim);
-    while (tokens.hasMoreTokens ())
-      {
-	tokens.nextToken ();
-	count++;
-      }
-    if (count == 0)
-      return null;
-    
-    // Create argument array
-    String [] argArray = new String [count];
-    int index = 0;
-    tokens = new StringTokenizer (args, " ");
-    while (tokens.hasMoreTokens ())
-      {
-	argArray [index] = tokens.nextToken ();
-	index++;
-      }
-
-    // Assert index == count
-    if (index != count)
-      return null;
-    else
-      return argArray;    
-  }
-
-  // Default private constructor to avoid instantiation
-  private OS ()
-  {
-  }
-}
diff --git a/java/JACE/OS/package.html b/java/JACE/OS/package.html
deleted file mode 100644
index 01245ef0b51..00000000000
--- a/java/JACE/OS/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Extensions to the Java runtime system.
-</BODY>
-</HTML>
diff --git a/java/JACE/Reactor/EventHandler.java b/java/JACE/Reactor/EventHandler.java
deleted file mode 100644
index 220f999fcb5..00000000000
--- a/java/JACE/Reactor/EventHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Reactor
- *
- * = FILENAME
- *    EventHandler.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Reactor;
-
-import JACE.ASX.TimeValue;
-
-/**
- *     Provides an abstract interface for handling timer events.
- * <P>
- *     Classes implementing this interface handle a timer's
- *     expiration.
- * <P>
- * Users of C++ ACE will notice that this defines a substantially
- * smaller interface than the C++ counterpart.  Signal events are
- * absent due to the complete absence of this feature from Java itself.
- * Moreover, at this point
- * there is still some question regarding whether or not the I/O
- * portion will make any sense or fit into the Java model for I/O.
- *
- *@see JACE.Reactor.TimerQueue
- *@see JACE.Reactor
- */
-public interface EventHandler
-{
-  /** 
-   * Called when timer expires.
-   *@param tv Time Value for which timer was set
-   *@param obj An arbitrary object that was passed to the Timer Queue
-   * (Asynchronous Completion Token)
-   */
-  public int handleTimeout (TimeValue tv, Object obj);
-}
-
-// Note that more methods will be added as needed
diff --git a/java/JACE/Reactor/TimerQueue.java b/java/JACE/Reactor/TimerQueue.java
deleted file mode 100644
index 638cffe3391..00000000000
--- a/java/JACE/Reactor/TimerQueue.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Reactor
- *
- * = FILENAME
- *    TimerQueue.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Reactor;
-
-import java.util.*;
-import JACE.ASX.*;
-
-import JACE.OS.*;
-
-/**
- *     Timer Queue implementation which calls back to the handleTimeout
- *     method on EventHandler implementations when their timers expire.
- * <P>
- *     This is a simple implementation that keeps a linked list of
- *     absolute timers. It allows multiple timers to be scheduled
- *     and returns a timer id for each timer scheduled. In addition,
- *     it allows periodic timers to be scheduled.
- * <P>
- *     Note that timeouts given to the TimerQueue are relative time
- *     ("2 seconds from now", etc).
- */
-public class TimerQueue implements Runnable
-{
-  static class TimerNode
-  {
-    public TimerNode (EventHandler handler,
-		      Object arg,
-		      TimeValue timerValue,
-		      TimeValue interval,
-		      TimerNode next,
-		      int timerId)
-    {
-      this.handler_ = handler;
-      this.arg_ = arg;
-      this.timerValue_ = timerValue;
-      this.interval_ = interval;
-      this.next_ = next;
-      this.timerId_ = timerId;
-    }
-
-    public EventHandler handler_;
-    // Handler to invoke <handleTimeout> on when a timeout occurs.
-
-    public Object arg_;
-    // Argument to pass to <handleTimeout>.
-
-    public TimeValue timerValue_;
-    // Time until the timer expires.
-
-    public TimeValue interval_;
-    // If this is a periodic timer this holds the time until the next
-    // timeout.
-
-    public TimerNode next_;
-    // Pointer to next timer.
-  
-    public int timerId_;
-    // Id of this timer (used to cancel timers before they expire).
-  }
-
-  static class WaitObject extends TimedWait
-  {
-    public boolean condition ()
-    {
-      return this.condition_;
-    }
-  
-    public void condition (boolean c)
-    {
-      this.condition_ = c;
-    }
-
-    private boolean condition_ = false;
-  }
-
-  /**
-   * Constructor.  The caller is responsible for calling handleEvents ()
-   * to run the event loop.
-   */
-  public TimerQueue ()
-  {
-    this (false);
-  }
-
-  /**
-   * Constructor.
-   *@param createInternalThread flag specifying whether to create an
-   * internal thread that runs the event loop. If it is true, a thread
-   * is spawned and it runs the event loop, handling all timeout
-   * events. If it is false, the caller is then responsible for calling
-   * handleEvents () to run the event loop.  The thread that is created
-   * is set to be a daemon thread.
-   */
-  public TimerQueue (boolean createInternalThread)
-  {
-    this.eventLoopRunning_ = false;
-    if (createInternalThread) {
-      Thread queueThread = new Thread (this, "Timer Queue");
-      queueThread.setDaemon (true);
-      queueThread.start ();
-    }
-  }
-  
-  /**
-   * The thread run method. Do *NOT* call this method! It gets called
-   * automatically. 
-   */
-  public void run ()
-  {
-    this.handleEvents ();
-  }
-
-  /**
-   * Handle timeout events. This forms the event loop and takes care
-   * of all scheduling. This method should only be called if the Timer
-   * Queue was constructed with the value of createInternalThread as
-   * false.
-   */
-  public void handleEvents ()
-  {
-    if (!this.eventLoopRunning_)
-      {
-	// Set the flag indicating that the event loop is now running
-	this.eventLoopRunning_ = true;
-
-	for (;;)
-	  {
-	    synchronized (this.obj_) 
-	      {
-		try {
-		  // Extract the earliest time from the queue and do a 
-		  // timed wait
-
-		  this.obj_.timedWait (this.earliestTime ());
-		  
-		  // We have been notified. Check to see if we need to
-		  // restart the wait with a different timeout
-		  if (this.reset_)
-		    {
-		      this.reset_ = false;
-		      this.obj_.condition (false);
-		    }
-		  
-		} catch (TimeoutException e) {
-		  // Timeout occurred. Call handleTimeout on appropriate
-		  // Event Handlers
-		  this.dispatchHandlers ();
-		  
-		} catch (InterruptedException e) {
-		  ACE.ERROR ("TimerQueue was interrupted");
-		  return;
-		}
-	      }
-	  }
-      }
-  }
-
-  /**
-   * Check if the queue is empty.
-   *@return true if queue is empty, else false.
-   */
-  boolean isEmpty ()
-  {
-    return this.head_ == null;
-  }
-
-  /**
-   * Get the node of the earliest node in the TimerQueue.
-   *@return the time of the earlier node in the TimerQueue.
-   */
-  TimeValue earliestTime ()
-  {
-    synchronized (this.obj_)
-      {
-	if (!this.isEmpty ())
-	  return this.head_.timerValue_;
-	else
-	  return null;
-      }
-  }
-
-  /**
-   * Schedule an <EventHandler> that will expire after <delta> amount
-   * of time.  If it expires then <obj> is passed in as the value to
-   * the <EventHandler>'s <handleTimeout> callback method. This method
-   * returns a timer id that uniquely identifies the timer and can be
-   * used to cancel the timer before it expires.
-   *@param handler Event Handler that is to be scheduled with the timer
-   *@param obj Object that is passed back to the Event Handler when
-   * timeout occurs (Asynchronous Completion Token)
-   *@param delta amount of time for which to schedule the timer
-   *@return id of the timer scheduled
-   */
-  public int scheduleTimer (EventHandler handler,
-			    Object obj,
-			    TimeValue delta)
-  {
-    return this.scheduleTimer (handler, obj, delta, TimeValue.zero);
-  }
-
-  /**
-   * Schedule an <EventHandler> that will expire after <delta> amount
-   * of time.  If it expires then <obj> is passed in as the value to
-   * the <EventHandler>'s <handleTimeout> callback method.  If
-   * <interval> is != to <TimeValue.zero> then it is used to
-   * reschedule the <EventHandler> automatically.  This method
-   * returns a timer id that uniquely identifies the timer and can be
-   * used to cancel the timer before it expires.
-   *@param handler Event Handler that is to be scheduled with the timer
-   *@param arg Object that is passed back to the Event Handler when
-   * timeout occurs (Asynchronous Completion Token)
-   *@param timeout amount of time for which to schedule the timer
-   *@param interval amount of time to use to reschedule the timer
-   *@return id of the timer scheduled
-   */
-  public int scheduleTimer (EventHandler handler,
-			    Object arg,
-			    TimeValue timeout,
-			    TimeValue interval)
-  {
-
-    // Increment the sequence number (it will wrap around).
-    this.timerId_++;
-
-    ACE.DEBUG("scheduleTimer (" + this.timerId_ + "): " + 
-	      timeout + ", " + interval);
-
-
-    TimeValue futureTime = TimeValue.plus (timeout, TimeValue.getTimeOfDay ());
-    TimerNode node = new TimerNode (handler, 
-				    arg,
-				    futureTime,
-				    interval, 
-				    null,
-				    this.timerId_);
-    synchronized (this.obj_)
-      {
-	// Check if event loop is running. If it is not, then we can
-	// just place it at the appropriate place in the queue and
-	// don't need to do any notification. If event loop is
-	// running, then check if the node is the first node in the
-	// queue (either because the queue is empty or because the
-	// time for the node is earlier than the currently scheduled
-	// timer node).
-	if (this.eventLoopRunning_ &&
-	    (this.isEmpty () || futureTime.lessThan (this.earliestTime ())))
-	  {
-	    // Insert the node into (the beginning of) the queue to be
-	    // scheduled. 
-	    this.reschedule (node);
-
-	    // Notify the waiting thread so that it can reschedule
-	    // using the earliest timeout
-	    this.obj_.notify ();
-	  }
-	else // Place in the appropriate position in the queue.
-	  {
-	    this.reschedule (node);
-	  }
-      }
-    return this.timerId_;
-  }
-
-
-  /**
-   * Cancel the single timer associated with <timerId>.
-   *@param timerId id of the timer that needs to be cancelled.
-   *@return Object that was passed in when timer was scheduled
-   * (Asynchronous Completion Token). 
-   */
-  public Object cancelTimer (int timerId)
-  {
-    TimerNode prev = null;
-    TimerNode curr = null;
-
-    synchronized (this.obj_)
-      {
-	// Try to locate the TimerNode that matches the timerId.
-	for (curr = this.head_; 
-	     curr != null && curr.timerId_ != timerId;
-	     curr = curr.next_)
-	  prev = curr;
-
-	if (curr != null)
-	  {
-	    if (prev == null)
-	      this.head_ = curr.next_;
-	    else
-	      prev.next_ = curr.next_;
-
-	    return curr.arg_;
-	  }
-      }
-    return null;
-  }
-
-  /**
-   * Cancel all timers associated with <Event Handler>.
-   *@param handler Event Handler whose associated timers need to be cancelled.
-   */
-  public void cancelTimer (EventHandler handler)
-  {
-    TimerNode prev = null;
-    TimerNode curr = this.head_;
-
-    synchronized (this.obj_)
-      {
-	while (curr != null)
-	  {
-	    if (curr.handler_ == handler)
-	      {
-		if (prev == null)
-		  {
-		    this.head_ = curr.next_;
-		    curr = this.head_;
-		  }
-		else
-		  {
-		    prev.next_ = curr.next_;
-		    curr = prev.next_;
-		  }
-	      }
-	    else
-	      {
-		prev = curr;
-		curr = curr.next_;
-	      }
-	  }
-      }
-  }
-
-  // Call handleTimeout() on all handlers whose timers have expired.
-  private void dispatchHandlers ()
-  {
-    TimeValue currentTime = TimeValue.getTimeOfDay ();
-
-    for (;;)
-      {
-	if (this.isEmpty () || this.earliestTime ().greaterThan (currentTime))
-	  break; // There aren't any more timers eligible to expire.
-
-	TimerNode expired = this.head_;
-	EventHandler handler = expired.handler_;
-	Object arg = expired.arg_;
-	int result;
-	
-	this.head_ = this.head_.next_;
-	
-	// Check whether this is an interval timer.
-	if (expired.interval_.greaterThan (TimeValue.zero))
-	  {
-	    // Make sure that we skip past values that have already
-	    // "expired".
-	    do
-	      expired.timerValue_.plusEquals (expired.interval_);
-	    while (expired.timerValue_.lessThanEqual (currentTime));
-		   
-	    // Since this is an interval timer, we need to reschedule
-	    // it.
-	    this.reschedule (expired);
-	  }
-	
-	ACE.DEBUG("Calling handleTimeout for ID " + expired.timerId_);
-
-	// Perform the callback.
-	result = handler.handleTimeout (currentTime, arg);
-	
-	if (result == -1)
-	  this.cancelTimer (handler);
-      }
-  }
-
-  // Reschedule a TimerNode by inserting it at the appropriate
-  // position in the queue.
-  private void reschedule (TimerNode expired)
-  {
-    if (this.isEmpty () || 
-	expired.timerValue_.lessThan (this.earliestTime ()))
-      {
-	expired.next_ = this.head_;
-	this.head_ = expired;
-	// Set the condition to true so that the waiting thread can be
-	// notified and it can reschedule.
-	this.obj_.condition (true);
-	this.reset_ = true;
-      }
-    else
-      {
-	TimerNode prev = this.head_;
-	TimerNode after  = this.head_.next_;
-
-	// Locate the proper position in the queue. 
-
-	while (after != null 
-	       && expired.timerValue_.greaterThan (after.timerValue_))
-	  {
-	    prev = after;
-	    after  = after.next_;
-	  }
-
-	expired.next_ = after;
-	prev.next_  = expired;
-      }
-  }
-
-  public boolean eventLoopRunning ()
-  {
-    return eventLoopRunning_;
-  }
-
-  private WaitObject obj_ = new WaitObject ();
-  // Synchronization object (as well as object to use to do wait on)
-
-  private TimerNode head_; 
-  // Pointer to linked list of TimerHandles. 
-
-  private int timerId_;
-  // Keeps track of the timer id that uniquely identifies each timer.
-  // This id can be used to cancel a timer via the <cancel (int)>
-  // method.
-
-  private boolean reset_;
-  // Flag indicating whether to start the wait again
-
-  private boolean eventLoopRunning_;
-  // Flag indicating whether the event loop is running or not
-}
-
diff --git a/java/JACE/Reactor/package.html b/java/JACE/Reactor/package.html
deleted file mode 100644
index 8cf9b2a941a..00000000000
--- a/java/JACE/Reactor/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Timer queue implementation and a system for handling timeout events.
-</BODY>
-</HTML>
diff --git a/java/JACE/SOCK_SAP/INETAddr.java b/java/JACE/SOCK_SAP/INETAddr.java
deleted file mode 100644
index 11b74a2b0ba..00000000000
--- a/java/JACE/SOCK_SAP/INETAddr.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    INETAddr.java
- *
- *@author Chris Cleeland
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- *     Defines an endpoint of a connection, encapsulating host and port.
- * This is only a part-way implementation of C++ ACE's ACE_INET_Addr.
- * <P>
- *     Currently the class is very limited in its capabilities; it will
- * be expanded in future revisions of ACE.
- */
-public class INETAddr // extends Addr
-{
-  private InetAddress addr_;
-  private int port_ = 0;
-  /**
-   */
-  public INETAddr ()
-    {
-      // Do nothing constructor
-    }
-
-  /**
-   * Create an INETAddr from a port/hostname
-   *@param port port number to connect with server at
-   *@param hostname hostname of the server
-   */
-  public INETAddr (int port, String hostname) throws UnknownHostException
-  {
-    super();
-    port_ = port;
-    addr_ = InetAddress.getByName(hostname);
-				// Should really use getAllByName(),
-				// but I don't think we do that in
-				// C++ ACE, even.
-  }
-
-  /**
-   * Create an INETAddr from an address.
-   * @param address an address in the form "ip-number:port-number", <em>e.g.</em> <pre>tango.cs.wustl.edu:1234</pre> or <pre>128.252.166.57:1234</pre>; if no ':' is present address is assumed to be <b>INADDR_ANY</b> and address contains only the port number
-   * @throws UnknownHostException
-   */
-  public INETAddr (String address) throws UnknownHostException
-  {
-    int colon = address.indexOf(':');
-    if (colon != 0)
-      {
-	addr_ = InetAddress.getByName(address.substring(0, colon));
-	address = address.substring(colon+1);
-      }
-
-    port_ = Integer.parseInt(address);
-  }
-
-  /**
-   * Return the name of the host.
-   */
-  public String getHostName()
-  {
-    return addr_.getHostName();
-  }
-
-  /**
-   * Return the dotted Internet address.
-   */
-  public String getHostAddr()
-  {
-    return addr_.toString();
-  }
-
-  /**
-   * Return the port number.
-   */
-  public int getPortNumber()
-  {
-    return port_;
-  }
-
-  public String toString()
-  {
-    return getHostAddr() + Integer.toString(port_);
-  }
-}
diff --git a/java/JACE/SOCK_SAP/SOCKAcceptor.java b/java/JACE/SOCK_SAP/SOCKAcceptor.java
deleted file mode 100644
index dc9e12c8496..00000000000
--- a/java/JACE/SOCK_SAP/SOCKAcceptor.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    SOCKAcceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- *     Defines a factory that creates new SOCKStreams passively.
- */
-public class SOCKAcceptor
-{
-  // = Initialization
-
-  /**
-   * Create a SOCKAcceptor. Do nothing constructor. Allows user to
-   * call open() later and pass in the port number.
-   */
-  public SOCKAcceptor ()
-    {
-    }
-
-  /**
-   * Create a SOCKAcceptor.
-   *@param port port number where the server will listen for connections
-   */
-  public SOCKAcceptor (int port) throws IOException
-    {
-      this.open (port);
-    }
-
-  /**
-   * Create socket to listen for connections on.
-   *@param port port number where the server will listen for connections
-   */
-  public void open(int port) throws IOException
-    {
-      // Close old socket (if there is one)
-      this.close ();
-
-      // Create a new server socket
-      this.listenSocket_ = new ServerSocket (port);
-      //      ACE.DEBUG ("Server listening on port " + port);
-    }
-
-  /**
-   * Close the socket and do any necessary cleanup.
-   */
-  public void close () throws IOException
-    {
-      if (this.listenSocket_ != null)
-	{
-	  this.listenSocket_.close ();
-	  this.listenSocket_ = null;
-	}
-    }
-
-  /**
-   * Accept a connection. The streams are set when the method returns.
-   *@param sockStream SOCK Stream to use for the connection
-   */
-  public void accept (SOCKStream sockStream) throws SocketException, IOException
-    {
-      // Block in accept. Returns when a connection shows up and sets
-      // the streams
-      sockStream.socket (this.listenSocket_.accept ());
-      ACE.DEBUG ("Accepted connection from " +
-		 sockStream.socket ().getInetAddress ());
-    }
-
-  /**
-   * Get the underlying listen socket.
-   *@return the underlying listen socket
-   */
-  public ServerSocket listenSocket ()
-  {
-    return this.listenSocket_;
-  }
-
-  /**
-   * Set the underlying listen socket.
-   *@param s the underlying listen socket
-   */
-  public void listenSocket (ServerSocket s)
-  {
-    this.listenSocket_ = s;
-  }
-
-  /**
-   * Clean up when the garbage collector gets run (if at all). Note
-   * that there is no guarantee that finalize () will get called.
-   *@exception Throwable (Probably IOException from the socket level)
-   */
-  protected void finalize () throws Throwable
-    {
-      super.finalize ();
-      this.close ();
-    }
-
-  // Socket on which listen for connections (by default initialized to
-  // null)
-  private ServerSocket listenSocket_;
-}
diff --git a/java/JACE/SOCK_SAP/SOCKConnector.java b/java/JACE/SOCK_SAP/SOCKConnector.java
deleted file mode 100644
index cc3a558f77f..00000000000
--- a/java/JACE/SOCK_SAP/SOCKConnector.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    SOCKConnector.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- *     Defines an active connection factory for the socket wrappers. 
- */
-public class SOCKConnector
-{
-  // = Initialization
-
-  /**
-   * Create a SOCKConnector. Do nothing constructor. Allows user to
-   * call connect() later.
-   */
-  public SOCKConnector ()
-    {
-      // Do nothing constructor
-    }
-
-  /**
-   * Create a SOCKConnector and connect to the server.
-   *@param sockStream SOCK Stream to use for the connection
-   *@param hostname hostname of the server
-   *@param port port number to connect with server at
-   */
-  public SOCKConnector (SOCKStream sockStream,
-			 String hostname,
-			 int port) throws SocketException, IOException
-    {
-      this.connect (sockStream,
-		    hostname,
-		    port);
-    }
-
-  /**
-   * Connect to the server.
-   *@param sockStream SOCK Stream to use for the connection
-   *@param hostname hostname of the server
-   *@param port port number to connect with server at
-   */
-  public void connect (SOCKStream sockStream,
-		       String hostname,
-		       int port) throws SocketException, IOException
-    {
-      sockStream.socket (new Socket (hostname, port));
-    }
-
-  /**
-   * Connect to the server.
-   *@param sockStream SOCK Stream to use for the connection
-   *@param addr INETAddr instance specifying host/port
-   */
-  public void connect (SOCKStream sockStream,
-		       INETAddr addr) throws SocketException, IOException
-    {
-      sockStream.socket (new Socket (addr.getHostName(),
-				     addr.getPortNumber()));
-    }
-}
diff --git a/java/JACE/SOCK_SAP/SOCKStream.java b/java/JACE/SOCK_SAP/SOCKStream.java
deleted file mode 100644
index 05e2535e62a..00000000000
--- a/java/JACE/SOCK_SAP/SOCKStream.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    SOCKStream.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- *     This adds additional wrapper methods atop the java Socket class.
- */
-public class SOCKStream
-{
-  /**
-   * Create a default SOCK Stream. Do nothing constructor.
-   */
-  public SOCKStream ()
-  {
-  }
-
-  /**
-   * Create a SOCK Stream.
-   *@param s Socket to initialize SOCK Stream with.
-   */
-  public SOCKStream (Socket s) throws IOException
-  {
-    this.socket (s);
-  }
-
-  /**
-   * Set the socket and the underlying streams.
-   *@param s Socket associated with the SOCK Stream.
-   */
-  public void socket (Socket s) throws IOException
-  {
-    this.socket_ = s;
-    // Note that if s is not a valid socket or is null, the
-    // following calls will throw exceptions
-
-    this.iStream_ = 
-      new DataInputStream(new BufferedInputStream(s.getInputStream()));
-
-    this.oStream_ = 
-      new DataOutputStream(new BufferedOutputStream(s.getOutputStream()));
-  }
-
-  /* Get the underlying Socket.
-   *@return the underlying socket
-   */
-  public Socket socket ()
-  {
-    return this.socket_;
-  }
-
-  /**
-   * Close the streams and the underlying socket.
-   */
-  public void close () throws IOException
-  {
-    if (this.socket_ != null)
-      this.socket_.close ();
-    this.socket_ = null;
-  }
-  
-  // = The following send and recv methods are overloaded to provide a
-  // flexible interface
-
-  /**
-   * Send a StringBuffer. Note that the method blocks.
-   *@param s the StringBuffer to send
-   *@return the length of the StringBuffer
-   */
-  public int send (StringBuffer s) throws IOException
-  {
-    // Get the data out
-    String buf = s.toString ();
-
-      //this.oStream_.println(buf);
-    this.oStream_.writeChars(buf.toString());
-    this.oStream_.writeChar('\n');
-    this.oStream_.flush ();
-
-    return buf.length ();
-  }
-
-  /**
-   * Send a String. Note that the method blocks.
-   *@param s the String to send
-   *@return the length of the String
-   */
-  public int send (String s) throws IOException
-  {
-    this.oStream_.writeChars(s);
-    this.oStream_.writeChar('\n');
-
-    //this.oStream_.println(s);
-    this.oStream_.flush();
-
-    return s.length ();
-  }
-
-  /** 
-   * Send an array of bytes. Note that the method blocks.
-   *@param b array of bytes to send
-   *@param offset offset into the byte array to start sending from
-   *@param length number of bytes to send
-   *@return number of bytes sent
-   */
-  public int sendN (byte[] b, int offset, int length) throws IOException
-  {
-    this.oStream_.write (b, offset, length);
-    this.oStream_.flush ();
-    return length;
-  }
-
-  /**
-   * Receive data and append it to the StringBuffer that was passed
-   * in. Note that the method blocks.
-   *@param s the StringBuffer to append the result of the recv to
-   *@return the length of the String received
-   */
-  public int recv (StringBuffer s) throws IOException
-  {
-    int len = 0;
-    char in = (char)this.iStream_.readByte();
-
-    while (in != '\n') {
-      s.append(in);
-      in = (char)this.iStream_.readByte();
-      len++;
-    }
-
-    return len;
-  }
-
-  /**
-   * Receive an array of characters. This method blocks until either
-   * all the bytes are read, the end of the stream is detected, or
-   * an exception is thrown.
-   *@param b byte array to receive the data in
-   *@param offset the start offset of the data in the byte array.
-   *@param n number of bytes to receive
-   *@return n
-   */
-  public int recvN (byte[] b, int offset, int n) throws IOException
-  {
-    this.iStream_.readFully (b, offset, n);
-    return n;
-  }
-
-  /**
-   * Set the underlying input stream.
-   *@param iStream the input stream
-   */
-  public void inputStream (InputStream iStream)
-  {
-    this.iStream_ = new DataInputStream(new BufferedInputStream(iStream));
-  }
-
-  /**
-   * Get the underlying input stream.
-   *@return the underlying input stream
-   */
-  public InputStream inputStream ()
-  {
-    return this.iStream_;
-  }
-
-  /**
-   * Set the underlying output stream.
-   *@param iStream the output stream
-   */
-  public void outputStream (OutputStream oStream)
-  {    
-    this.oStream_ = new DataOutputStream(new BufferedOutputStream(oStream));
-  }
-
-  /**
-   * Get the underlying output stream.
-   *@return the underlying output stream
-   */
-  public OutputStream outputStream ()
-  {
-    return this.oStream_;
-  }
-
-  /**
-   * Get the underlying stream wrapped in a buffered DataOutputStream
-   */
-  public DataOutputStream dataOutputStream ()
-  {
-    return this.oStream_;
-  }
-
-  /**
-   * Get the underlying stream wrapped in a buffered DataInputStream
-   */
-  public DataInputStream dataInputStream ()
-  {
-    return this.iStream_;
-  }
-
-  /**
-   * Cleanup when the SOCK Stream is garbage collected.
-   *@exception Throwable (Probably IOException from the socket level)
-   */
-  protected void finalize () throws Throwable
-  {
-    super.finalize ();
-    this.close ();
-  }
-  
-  private Socket socket_;
-
-  // = The input and output streams (by default null)
-  private DataInputStream iStream_;
-  private DataOutputStream oStream_;
-}
diff --git a/java/JACE/SOCK_SAP/package.html b/java/JACE/SOCK_SAP/package.html
deleted file mode 100644
index fa4b9346aab..00000000000
--- a/java/JACE/SOCK_SAP/package.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Wrappers for the sockets system.
-
-@see JACE.Connection.Acceptor
-</BODY>
-</HTML>
diff --git a/java/JACE/ServiceConfigurator/Service.java b/java/JACE/ServiceConfigurator/Service.java
deleted file mode 100644
index fac0b0fc54b..00000000000
--- a/java/JACE/ServiceConfigurator/Service.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package JACE.ServiceConfigurator;
-
-/**
- * Interface common to all services loaded with the
- * Service Configurator.
- * <P>
- * In order to create a completely new type of service, all that
- * is necessary is to implement this interface, and ServiceConfig
- * will be able to load it.  A concrete example is ServiceObject,
- * the base class for the network services.
- * <P>
- * Implementing classes must also:
- * <UL>
- * <LI> Provide a default constructor
- * <LI> Begin in their own thread (probably in init (String[]))
- * </UL>
- * <P>
- * Implementing classes should also:
- * <UL>
- * <LI> Shut down completely when close () has been called.  That
- * means ending thread activity.  
- * </UL>
- *
- *@see JACE.ServiceConfigurator.ServiceObject
- *@see JACE.ServiceConfigurator.ServiceConfig
- *@author Everett Anderson
- */
-public interface Service
-{
-  /**
-   * Temporarily disable this service.  This will only be called for a 
-   * service which returns false from its suspended() method.
-   * <P>
-   *@return -1 on failure, 0 on success
-   */
-  int suspend ();
-
-  /**
-   * Re-enable this service.  This will only be called for a service
-   * which returns true from its suspended() method.
-   * <P>
-   *@return -1 on failure, 0 on success
-   */
-  int resume ();
-
-  /**
-   * Initialize this service.  The arguments will be given as if they
-   * were from the command line, separated into Strings using spaces
-   * as the delimiters.
-   * <P>
-   *@param args set of command line arguments
-   *@return -1 on failure, 0 on success
-   */
-  int init (String [] args);
-
-  /**
-   * Close this service and free any internal resources.
-   * <P>
-   *@return -1 on failure, 0 on success
-   */
-  int fini ();
-
-  /**
-   * Provide a status message for this service.
-   * <P>
-   *@return status message
-   */
-  String info ();
-
-  /**
-   * Return the name of this service.  The name is typically set
-   * in ServiceConfig to a name supplied in a configuration file.
-   * <P>
-   *@return name of this service
-   */
-  String name ();
-
-  /**
-   * Set the name of this service.  This is typically caled in
-   * ServiceConfig, setting the name to one supplied in a configuration
-   * file.
-   * <P>
-   *@param name new name for this service
-   */
-  void name (String name);
-
-  /**
-   * Returns whether or not this service is suspended.  The result 
-   * determines whether or not this service's resume() and suspend()
-   * methods will be called by ServiceConfig.  (For instance, while
-   * a service returns true, its suspend() method will not be called.)
-   * <P>
-   *@return true if suspended, else false
-   */
-  boolean suspended ();
-}
diff --git a/java/JACE/ServiceConfigurator/ServiceConfig.java b/java/JACE/ServiceConfigurator/ServiceConfig.java
deleted file mode 100644
index 894cf415f06..00000000000
--- a/java/JACE/ServiceConfigurator/ServiceConfig.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceConfig.java
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-
-/**
- *     Provide the base class that supplies common server daemon
- *     operations.  Also provides a global point for interacting with
- *     the service repository.  Services can be suspended, resumed,
- *     removed, and reloaded.
- *     <P>
- *     ServiceConfig files contain lines of the following forms:
- *
- * <PRE>
- *  load (Service Name) (Class Name) (Type) "argument list" (opt URL path)
- *
- *  resume (Service Name)
- *  suspend (Service Name)
- *  remove (Service Name)
- *
- * where (Type) is currently only ServiceObject or Service_Object 
- * [Note:  This is not enforced by the ServiceConfig program, but
- * something must be there.]
- * </PRE>
- * <P>
- * <B>Valid command line arguments:</B>
- * <PRE>
- *    -f (filename)     Specify name of the service config file
- *    -d                Enable debugging
- *    -p (URL path)     If not found locally, search this URL path
- *                      for classes (multiple -p options allowed)
- * </PRE>
- *
- *@author Prashant Jain
- *@author Everett Anderson
- */
-public class ServiceConfig
-{
-  /** Begins the process of loading a service configurator file:
-   *  parses the command line and calls processDirectives
-   *
-   *@param args command line arguments to the Service Configurator
-   *@exception FileNotFoundException Couldn't find service config file
-   *@exception IOException Problem reading or parsing the config file
-   *@exception ClassNotFoundException Couldn't find a certain class
-   *@exception IllegalAccessException Inappropriate method call on a class
-   *@exception InstantiationException Couldn't create a certain class instance
-   *@return -1 on failure, 0 on success
-   */
-  public static int open (String [] args) 
-    throws FileNotFoundException, IOException, ClassNotFoundException, 
-	   IllegalAccessException, InstantiationException
-  {
-    // Parse the command line
-    if (ServiceConfig.parseArgs (args) < 0) {
-      printUsage ();
-      return -1;
-    }
-
-    return ServiceConfig.processDirectives ();
-  }
-
-  protected static void printUsage ()
-  {
-    ACE.ERROR ("Valid options:\n");
-    ACE.ERROR ("-f <filename>     Specify name of the service config file");
-    ACE.ERROR ("-d                Enable debugging");
-    ACE.ERROR ("-p <URL path>     If not found locally, search this URL path");
-    ACE.ERROR ("                  for classes (multiple -p options allowed)");
-  }
-
-  /** Parse the command line.
-   * <P>
-   * Currently, valid command line options are the following:
-   * <PRE>
-   * -d             Debug mode
-   * -f (filename)  Load services in the given file
-   * -p (URL path)  If not found locally, search this URL path for classes
-   *                (there can be multiple -p URL options)
-   * </PRE>
-   *@param args command line arguments
-   *@exception ClassNotFoundException Couldn't find a specified Service
-   *@exception IllegalAccessException Inappropriate method call on a Service
-   *@exception InstantiationException Couldn't create a Service instance
-   */
-  protected static int parseArgs (String [] args) 
-    throws ClassNotFoundException, IllegalAccessException,
-	   InstantiationException
-  {
-    GetOpt getopt = new GetOpt (args, "df:p:", true);
-    for (int c; (c = getopt.next ()) != -1; )
-      switch (c)
-	{
-	case 'p':
-	  // Specify a URL path
-	  try {
-	    ServiceConfig.loader_.addURLPath (getopt.optarg ());
-	  } catch (MalformedURLException e) {
-	    ACE.ERROR ("Invalid URL: " + getopt.optarg ());
-	  }
-	  break;
-	  /*
-	    Not supported:
-	    
-	    case 'b':
-	      ServiceConfig.beADaemon_ = true;
-	      break;
-	    case 'n':
-	      break;
-	  */
-	case 'd': 
-	  ACE.enableDebugging ();
-	  ACE.DEBUG ("Debugging is enabled");
-	  break;
-	case 'f':
-	  // Specify the file name of the config file
-	  ServiceConfig.serviceConfigFile_ = getopt.optarg ();
-	  break;
-	default:
-	  ACE.ERROR ((char ) c + " is not a ServiceConfig option");
-	  return -1;
-	}
-
-    return 0;
-  }
-
-  /** 
-   * Uses the Service Repository to suspend a service with the given name.
-   *
-   *@param name name of the Service to suspend
-   *@return -1 on failure, 0 on success
-   */
-  public static int suspend (String name)
-  {
-    return ServiceConfig.svcRep_.suspend (name);
-  }
-
-  /**
-   * Uses the Service Repository to resume a service with the given name.
-   *
-   *@param name name of the Service to resume
-   *@return -1 on failure, 0 on success
-   */
-  public static int resume (String name)
-  {
-    return ServiceConfig.svcRep_.resume (name);
-  }
-
-  /**
-   * Removes the specified Service from the Service Repository.
-   *
-   *@param name name of the Service to remove
-   *@return -1 on failure, 0 on success
-   */
-  public static int remove (String name)
-  {
-    return ServiceConfig.svcRep_.remove (name);
-  }
-
-  /**
-   * Returns the info String from the specified Service.
-   *
-   *@param name name of the Service to query
-   *@return information about the Service
-   */
-  public static String info (String name)
-  {
-    return ServiceConfig.svcRep_.info (name);
-  }
-
-  /**
-   * Call fini on the specified Service.
-   *
-   *@param name name of the Service to shut down
-   *@return -1 on failure, 0 on success
-   */
-  public static int fini (String name)
-  {
-    return ServiceConfig.svcRep_.fini (name);
-  }
-
-  /**
-   * Call init on the specified Service.  This is only needed
-   * when a user wants to add a Service to the repository without
-   * using service config files.  
-   *
-   *@param name name of the Service to initialize
-   *@param args command line arguments to pass to the Service
-   *@return -1 on failure, 0 on success
-   *@see ServiceConfig#insert
-   */
-  public static int init (String name, String [] args) 
-  { 
-    return ServiceConfig.svcRep_.init (name, args);
-  }
-
-  /**
-   * Adds the given Service to the Service Repository.  This is
-   * only needed when a user wants to add a Service to the repository
-   * without using service config files.
-   *
-   *@param service Service to insert
-   *@see ServiceConfig#init
-   */
-  public static void insert (Service service)
-  {
-    ServiceConfig.svcRep_.insert (service);
-  }
-
-  /**
-   * Check to see if the specified Service is suspended.
-   *
-   *@param name name of the Service to check
-   *@return true if it is suspended, else false
-   */
-  public static boolean suspended (String name)
-  {
-    return ServiceConfig.svcRep_.suspended (name);
-  }
-
-  /**
-   * Check to see if the repository contains a service with the given
-   * name.
-   *
-   *@param name name of the Service to check
-   *@return true if it is in the repository, else false
-   */
-  public static boolean contains (String name)
-  {
-    return (ServiceConfig.svcRep_.find (name) == null ? false : true);
-  }
-
-  /**
-   * Get an Enumeration of all of the names of the Services in the
-   * repository.
-   *
-   *@return Enumeration of Service names
-   */
-  public static Enumeration serviceNames ()
-  {
-    return ServiceConfig.svcRep_.serviceNames ();
-  }
-
-  /**
-   * Get an Enumeration of all Services in the repository.
-   *
-   *@return Enumeration of Services
-   */
-  public static Enumeration services ()
-  {
-    return ServiceConfig.svcRep_.services ();
-  }
-
-  /** 
-   * Load a service of the given name, type, and arguments, then 
-   * initialize it with the given arguments.
-   *
-   * Should be aware that this could also throw a class cast exception if
-   * the author of the service didn't implement the Service interface.
-   *
-   *@param serviceName name of the service to load
-   *@param className class name to load
-   *@param args command line arguments to initialize the service
-   *@exception ClassNotFoundException couldn't find the specified class file
-   *@exception IllegalAccessException problem calling a method on the service
-   *@exception InstantiationException problem creating an instance
-   *@exception IOException problem reading the class file
-   *@return -1 on failure, 0 on success
-   */
-  public static int load (String serviceName,
-			  String className,
-			  String [] args) 
-    throws ClassNotFoundException, IllegalAccessException,
-	   InstantiationException, IOException 
-  {
-    Class svcClass = ServiceConfig.loader_.loadClass (className);
-
-    Service svc = (Service)(svcClass.newInstance());
-
-    svc.name (serviceName);
-
-    ServiceConfig.svcRep_.insert (svc);
-
-    return ServiceConfig.svcRep_.init (serviceName, args);
-  }
-
-  /**
-   * Same as load (String, String, String[]) but creates the
-   * String array from the given args parameter using the space
-   * character as a delimiter.
-   *
-   */
-  public static int load (String serviceName, 
-			  String className,
-			  String args)
-    throws ClassNotFoundException, IllegalAccessException,
-	   InstantiationException, IOException 
-  {
-    return ServiceConfig.load (serviceName,
-			       className,
-			       OS.createStringArray (args, " "));
-  }
-
-  /**
-   * Parse a service configurator file, creating classes as necessary. 
-   *
-   *@return -1 on failure, 0 on success
-   *@exception FileNotFoundException Couldn't find the file 
-   *(default "svc.conf")
-   *@exception IOException Problem reading/parsing 
-   *@exception ClassNotFoundException Couldn't find a certain class
-   *@exception IllegalAccessException Inappropriate method call
-   *@exception InstantiationException Couldn't create a class instance
-   */
-  protected static int processDirectives () 
-    throws FileNotFoundException, IOException, ClassNotFoundException, 
-	   IllegalAccessException, InstantiationException 
-  {
-    ACE.DEBUG("Processing directives in file " + 
-	      ServiceConfig.serviceConfigFile_);
-
-    File configFile = new File (ServiceConfig.serviceConfigFile_);
-    
-    // Check if file exists and is a normal file
-    if (!configFile.exists () || !configFile.isFile ())
-      throw new FileNotFoundException ("File " + 
-				       ServiceConfig.serviceConfigFile_ + 
-				       " not found");
-    
-    // Check if the file is readable
-    if (!configFile.canRead ())
-      throw new IOException ("File " + 
-			     ServiceConfig.serviceConfigFile_ + 
-			     " not readable");
-
-    // Set up the stream
-    FileInputStream fileIn = new FileInputStream (configFile);
-
-    // Parse the file
-    Reader r = new BufferedReader(new InputStreamReader(fileIn));
-    StreamTokenizer in = new StreamTokenizer (r);
-
-    // Set characters in ASCII range 32 to 47, ASCII range 91 to 96,
-    // and ASCII range 123 to 126 as ordinary characters
-    in.wordChars ('.', '/');  // ASCII range 32 to 47
-    in.wordChars (':', '@');  // ASCII range 58 to 64
-    in.wordChars ('[', '`');  // ASCII range 91 to 96
-    in.wordChars ('{', '~');  // ASCII range 123 to 126
-    in.quoteChar ('\"');
-    in.commentChar ('#');
-    in.eolIsSignificant(true);
-    in.lowerCaseMode(false);
-
-    Vector strs = new Vector();
-    int lineNumber = 1;
-
-    while (in.nextToken () != StreamTokenizer.TT_EOF) {
-
-      if (in.ttype == StreamTokenizer.TT_EOL) {
-
-	String command = ((String)strs.elementAt(COMMAND_NAME)).toLowerCase();
-	String name = (String)strs.elementAt(SERVICE_NAME);
-
-	if (strs.size() == 2) {
-	  if (command.equals("remove"))
-	    ServiceConfig.remove(name);
-	  else
-	  if (command.equals("suspend"))
-	    ServiceConfig.suspend(name);
-	  else
-	  if (command.equals("resume"))
-	    ServiceConfig.resume(name);
-	} else {
-
-	  if (!command.equals("load")) 
-	    throw new IOException ("Unknown command: " +
-				   command +
-				   " at line " +
-				   lineNumber);
-
-	  if (strs.size() < 5)
-	    throw new IOException ("Line " + lineNumber +
-				   " requires 5 values, not " + 
-				   strs.size());
-
-	  // Type is currently unenforced since everything must descend
-	  // from Service anyway.
-	  //String type = (String)strs.elementAt (SERVICE_TYPE);
-	  String className = (String)strs.elementAt (CLASS_NAME);
-	  
-	  if (strs.size () > CODE_BASE) {
-	    try {
-	      String url = (String)strs.elementAt (CODE_BASE);
-
-	      ServiceConfig.loader_.addURLPath (url);
-
-	    } catch (MalformedURLException e) {
-	      ACE.ERROR("Bad code base on line " + lineNumber);
-	    }
-	  }
-
-	  ServiceConfig.load(name, 
-			     className, 
-			     (String)strs.elementAt(ARGS));
-	}
-
-	lineNumber++;
-	strs.removeAllElements();
-	continue;
-      }
-
-      // Skip over non-strings
-      if ((in.ttype == StreamTokenizer.TT_WORD) ||
-	  (in.ttype == '\"'))
-	strs.addElement(new String(in.sval));
-      else
-	ACE.DEBUG ("Invalid string on line " + lineNumber +
-		   " element " + strs.size() +
-		   " type " + in.ttype);
-    }
-
-    return 0;
-  }
-
-  /**
-   * Close all services.
-   */
-  public static void close ()
-  {
-    ServiceConfig.svcRep_.close ();
-  }
-
-  /**
-   * Return a reference to the ServiceLoader used to load
-   * classes.
-   *
-   *@return ServiceLoader used internally by ServiceConfig.
-   */
-  public static ServiceLoader loader () 
-  {
-    return ServiceConfig.loader_;
-  }
-
-  /**
-   * Specify the ServiceLoader to be used by ServiceConfig.
-   *
-   *@param loader ServiceLoader instance to use (should support remote
-   * loading)
-   */
-  public static void loader (ServiceLoader loader)
-  {
-    ServiceConfig.loader_ = loader;
-  }
-
-  // Set by command line options
-  private static boolean beADaemon_ = false;
-
-  private static String serviceConfigFile_ = "svc.conf";
-
-  private static ServiceRepository svcRep_ = new ServiceRepository ();
-  private static ServiceLoader loader_ = new ServiceLoader ();
-
-  // Order for the commands on a line in the config file
-  private final static int COMMAND_NAME = 0;
-  private final static int SERVICE_NAME = 1;
-  private final static int CLASS_NAME = 2;
-  private final static int SERVICE_TYPE = 3;
-  private final static int ARGS = 4;
-  private final static int CODE_BASE = 5;
-}
diff --git a/java/JACE/ServiceConfigurator/ServiceLoader.java b/java/JACE/ServiceConfigurator/ServiceLoader.java
deleted file mode 100644
index 75297f9631d..00000000000
--- a/java/JACE/ServiceConfigurator/ServiceLoader.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceLoader.java
- * 
- * Implementation of a network-capable class loader
- *
- *@author Prashant Jain
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-
-/**
- * ClassLoader that can load classes from across the network
- * via provided URL search paths, or from the local machine. 
- * <P>
- * This operates in the same way as the JDK 1.2 ClassLoader by
- * first checking for preloaded classes, then trying to use the system
- * loader, and finally trying to load it via the network.  The user can also
- * provide URL search paths, or explicitly call the loadClass method which
- * takes a URL. 
- *
- *@see java.lang.ClassLoader
- *@see java.lang.Class
- */
-public class ServiceLoader extends ClassLoader
-{
-  /**
-   * Creates a loader that will only search the local machine for classes
-   * until URL paths are registered via addURLPath.
-   */
-  public ServiceLoader ()
-  {
-    this.URLSearchPaths_ = new Vector();
-  }
-
-  /**
-   * Creates a loader that will search the local machine followed by
-   * this array of URL paths when loading classes.  Note that additional
-   * paths can be added later with the addURLPath method.
-   *@param remotePaths array of URLs to search when loading classes, after
-   *attempts to load from the local machine have failed
-   */
-  public ServiceLoader (URL remotePaths[]) 
-  {
-    this();
-
-    if (remotePaths == null)
-      return;
-
-    for (int i = 0; i < remotePaths.length; i++) 
-      this.addURLPath(remotePaths[i]);
-  }
-
-  /**
-   * Add the given URL to the list of URL paths to search when loading
-   * classes.  
-   *@param url URL ending in '/' where classes can be found
-   */
-  public void addURLPath (URL url) 
-  {
-    if (!URLSearchPaths_.contains(url))
-      URLSearchPaths_.addElement(url);
-  }
-
-  /**
-   * Add the given URL to the list of URL paths to search when loading
-   * classes.
-   *@param String representation of a URL ending in '/'
-   *@exception MalformedURLException the given String wasn't a valid URL
-   */
-  public void addURLPath (String url) throws MalformedURLException
-  {
-    URL resource = new URL (url);
-    this.addURLPath (resource);
-  }
-
-  /**
-   * Tries to load the given class by following the example of JDK 1.2
-   * ClassLoader.  First check loaded classes, then try to use the system
-   * loader, and only then perform the user defined subclass behavior
-   * from findClass (in this case, it's searching over the network).
-   *@param name name of the class to load
-   *@param resolve whether or not to resolve the class 
-   *@exception ClassNotFoundException if the class could not be found
-   *@return loaded Class instance
-   */
-  protected Class loadClass(String name,
-			    boolean resolve)
-    throws ClassNotFoundException 
-  {
-    
-    Class c = null;
-      
-    // Has this class already been loaded once?
-    c = findLoadedClass(name);
-    if (c != null)
-      return c;
-    
-    try {
-
-      // Can the system loader find it?
-      c = findSystemClass(name);
-      return c;
-
-    } catch (ClassNotFoundException e2) {
-      // The system loader couldn't find it
-    }
-    
-    // If none of the above, try searching our way
-    return findClass(name);
-  }
-
-  /**
-   * This should duplicate the behavior of this class in JDK 1.2.  It is
-   * called by the protected loadClass method after trying to load the
-   * class in other ways.  It simply calls loadClassData and then defines
-   * the class.
-   *@param name name of the class to load
-   *@exception ClassNotFoundException couldn't find the class
-   *@return loaded Class
-   */
-  protected Class findClass(String name) throws ClassNotFoundException 
-  {
-    byte[] b = loadClassData(name);
-    return defineClass(name, b, 0, b.length);
-  }
-
-  /**
-   * Try loading a class with the given name, searching the remote
-   * URL paths that have been registered.  Note that this will only
-   * be called after first checking to see if the class has already
-   * been loaded, then checking to see whether or not the system
-   * loader can find it.
-   * <P>
-   * This could be overriden by subclasses to define different
-   * loading behavior.
-   *
-   *@param className name of the class (not file name) of the class to load
-   *@exception ClassNotFoundException couldn't find the class
-   *@return bytes of a .class file
-   */
-  private byte[] loadClassData(String className) throws ClassNotFoundException
-  {
-    byte data[] = null;
-
-    // Try to load it by reading in the bytes from the net
-    Enumeration e = URLSearchPaths_.elements();
-
-    while (e.hasMoreElements()) 
-      {
-	try
-	  {
-	    URL path = (URL)e.nextElement();
-	    URL classFileURL;
-
-	    try 
-	      {
-		classFileURL = new URL(path.toExternalForm() +
-				       className +
-				       ".class");
-	      } catch (MalformedURLException ex) {
-		ACE.ERROR("Bad URL: " + ex.getMessage());
-		continue;
-	      }
-
-	    ACE.DEBUG("Looking for " + classFileURL.toExternalForm());
-	    URLConnection urlConnection = classFileURL.openConnection ();
-
-	    // Get the input stream associated with the URL connection and
-	    // pipe it to a newly created DataInputStream
-	    DataInputStream i = new DataInputStream 
-	      (urlConnection.getInputStream ());
-
-	    // Allocate a buffer big enough to hold the contents of the
-	    // data we are about to read
-	    data = new byte [urlConnection.getContentLength ()];
-
-	    // Now read all the data into the buffer
-	    i.readFully (data);
-
-	  } catch (IOException ex) {
-	    // Either the URL wasn't there or we couldn't get the data
-	    continue;
-	  }
-      }
-
-    // Couldn't find it or it loaded improperly
-    if (data == null)
-      throw new ClassNotFoundException("Can't obtain " + className);
-
-    return data;
-  }
-
-  /**
-   * Load a class from across the network
-   *
-   * The newer way to do this is similar to JDK 1.2 URLClassLoader:
-   *   Add URLs that end in '/' via the addURLPath method
-   *   Call loadClass (class name without .class extension) method
-   *
-   *@param url URL of the class to load
-   *@exception ClassNotFoundException Couldn't find the class
-   *@return loaded Class
-   */
-  public Class loadClass (URL url) throws ClassNotFoundException
-  {
-    // Extract the name of the class from the URL
-    String URLPath = url.getFile();
-
-    // Get the class name by removing any directory information
-    int idx = URLPath.lastIndexOf("/");
-    if (idx == -1)
-      throw new ClassNotFoundException("Can't find " + URLPath);
-    String className = URLPath.substring(idx + 1);
-    URLPath = URLPath.substring(0, idx + 1);
-
-    // Get rid of the class suffix
-    idx = className.lastIndexOf(".class");
-    if (idx != -1)
-      className = className.substring(0, idx);
-
-    ACE.DEBUG("The name of the class about to load is " + className);
-
-    try {
-      // Add the URL to the list of URL search paths
-      URL path = new URL(URLPath);
-
-      this.addURLPath(path);
-
-    } catch (MalformedURLException e) {
-      throw new ClassNotFoundException("Can't find " + URLPath);
-    }
-    
-    // Try to load the class
-    return loadClass(className);
-  }
-
-  /**
-   * Collection of URLs which end in the HTTP path separator.  Used
-   * for searching for classes across the network.
-   */
-  protected Vector URLSearchPaths_;
-}
diff --git a/java/JACE/ServiceConfigurator/ServiceObject.java b/java/JACE/ServiceConfigurator/ServiceObject.java
deleted file mode 100644
index 4538698e8a6..00000000000
--- a/java/JACE/ServiceConfigurator/ServiceObject.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceObject.java
- *
- *@author Prashant Jain
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-/**
- * Provides a default implementation of the Service interface, and can also
- * be registered with the Reactor.
- *
- *@see JACE.Reactor
- *@see Service
- */
-public class ServiceObject implements EventHandler, Service
-{
-  /**
-   * Initialize object when dynamic loading occurs. Overwrite this
-   * method to do anything useful. 
-   *@return -1 (default implementation)
-   */
-  public int init (String [] args)
-  {
-    return -1;
-  }
-
-  /** 
-   * Terminate the object. Note that an object can not be explicitly
-   * unloaded. Overwrite this method to do anything useful.
-   *@return -1 (default implementation)
-   */
-  public int fini ()
-  {
-    return -1;
-  }
-
-  /**
-   * Get information on an active object. Overwrite this method to do
-   * anything useful. 
-   *@return null (default implementation)
-   */
-  public String info ()
-  {
-    return null;
-  }
-
-  /** 
-   * Called when timer expires. Overwrite this method to do
-   * anything useful. 
-   *@param tv Time Value for when timer expired
-   *@param obj An arbitrary object that was passed to the Timer Queue
-   * (Asynchronous Completion Token)
-   *@return -1
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return -1;
-  }
-
-  /**
-   * Request that this service suspend activity.  Overwrite this
-   * method to do anything useful.  Currently, this sets an internal
-   * state variable to true.
-   */
-  public int suspend () 
-  {
-    this.suspended_ = true;
-
-    return 0;
-  }
-
-  /**
-   * Request that this service resume activity.  Currently, this sets
-   * an internal state variable to false.
-   */
-  public int resume ()
-  {
-    this.suspended_ = false;
-
-    return 0;
-  }
-
-  /**
-   * Is this service suspended? 
-   */
-  public boolean suspended ()
-  {
-    return this.suspended_;
-  }
-
-  /**
-   * Return the name of the Service.  Implementation provided.
-   */
-  public String name ()
-  {
-    return this.name_;
-  }
-
-  /**
-   * Set the name of the Service.  Should be called when a Service is
-   * created -- this is done automatically by ServiceConfig when loading
-   * from a file.  Implementation provided.
-   */
-  public void name (String name)
-  {
-    this.name_ = name;
-  }
-
-  /**
-   * Name of this ServiceObject.
-   */
-  protected String name_ = null;
-
-  /**
-   * Status of whether this ServiceObject is suspended or not.
-   * (Initially false)
-   */
-  protected boolean suspended_ = false;
-}
diff --git a/java/JACE/ServiceConfigurator/ServiceRepository.java b/java/JACE/ServiceConfigurator/ServiceRepository.java
deleted file mode 100644
index 33f9a088077..00000000000
--- a/java/JACE/ServiceConfigurator/ServiceRepository.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceRepository.java
- *
- * The service repository stores the network services, allowing them to be 
- * removed, suspended, resumed, etc.  
- *
- *@see JACE.ServiceConfigurator.ServiceConfig;
- *@see JACE.ServiceConfigurator.Service;
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
- 
-/**
- * Stores Services, providing operations such as remove, suspend, resume, etc.
- */
-public class ServiceRepository
-{
-  /**
-   * Constructor
-   */
-  public ServiceRepository ()
-  {
-    this.serviceMap_ = new Hashtable ();
-    this.serviceNames_ = new Vector ();
-  }
-
-  /**
-   * Constructor
-   *
-   *@param initialSize    Initial vector size for the repository
-   */
-  public ServiceRepository (int initialSize)
-  {
-    this.serviceMap_ = new Hashtable (initialSize);
-    this.serviceNames_ = new Vector (initialSize);
-  }
-
-  /**
-   *  Shut down all the services, closing them in reverse order of insertion.
-   *  This calls fini on each service.
-   *@return -1 on failure, 0 on sucess
-   */
-  public int close() 
-  { 
-    int result = 0;
-
-    for (int i = this.size() - 1; i >= 0; i--) {
-
-      String name = (String)this.serviceNames_.elementAt (i);
-
-      Service s = (Service)this.serviceMap_.get (name);
-
-      result = (s.fini () == -1 ? -1 : result);
-    }
-
-    this.serviceMap_.clear ();
-    this.serviceNames_.removeAllElements ();
-
-    return result;
-  }
-
-  /**
-   * Insert a Service into the repository.
-   * (If already in, calls fini() and replaces)
-   *
-   *@param service      Service to add
-   */
-  public void insert (Service service)
-  {
-    String name = service.name ();
-    Service alreadyIn = this.find (name);
-
-    if (alreadyIn != null) {
-
-      alreadyIn.fini ();
-      this.remove (alreadyIn);
-
-    } else {
-
-      this.serviceMap_.put (name, service);
-      this.serviceNames_.addElement (name);
-
-    }
-  }
-
-  /**
-   * Returns an enumeration of all the Service objects.
-   *
-   */
-  public Enumeration services ()
-  {
-    return this.serviceMap_.elements ();
-  }
-
-  /**
-   * Returns an enumeration of all the Service names
-   */
-  public Enumeration serviceNames ()
-  {
-    return this.serviceMap_.keys ();
-  }
-
-  /**
-   * Convenience method that returns null when the service isn't
-   * found.
-   */
-  public Service find (String name) 
-  {
-    Object serviceObj = this.serviceMap_.get (name);
-
-    if (serviceObj == null)
-      return null;
-
-    return (Service)serviceObj;
-  }
-
-  /**
-   * Finds the Service associated with a given
-   * name.
-   *
-   *@param name    Name of the service to find
-   *@exception NoSuchElementException if the given service is not found
-   */
-  protected Service findService (String name) throws NoSuchElementException
-  {
-    Object serviceObj = this.serviceMap_.get (name);
-
-    if (serviceObj == null)
-      throw new NoSuchElementException ("Service " + name + " not found.");
-
-    return (Service)serviceObj;
-  }
-
-  /**
-   * Removes the given Service and calls its fini () method.
-   *@param service Service to remove
-   *@return -1 on failure, 0 on success
-   */
-  protected int remove (Service service)
-  {
-    String name = service.name ();
-
-    this.serviceMap_.remove (name);
-
-    int index = this.serviceNames_.indexOf (name);
-
-    this.serviceNames_.removeElementAt (index);
-
-    return service.fini ();
-  }
-
-  /**
-   * Shut down the specified Service.
-   *
-   *@param name name of the Service to shut down
-   *@return -1 on failure, 0 on success
-   */
-  public int fini (String name)
-  {
-    Service service = this.findService (name);
-
-    return service.fini ();
-  }
-
-  /**
-   * Remove the specified Service, calling its fini () method.
-   *
-   *@param name name of the Service to remove
-   *@return -1 on failure, 0 on success
-   */
-  public int remove (String name)
-  {
-    Service service = this.findService (name);
-
-    return this.remove (service);
-  }
-
-  /**
-   * Resume a suspended service
-   *@param name    Name of the service to resume
-   *@return -1 on failure, 0 on success
-   */
-  public int resume (String name)
-  {
-    Service service = this.findService (name);
-
-    return service.resume();
-  }
-
-  /**
-   * Suspend a service
-   *@param name    Name of the service to suspend
-   *@return -1 on failure, 0 on success
-   */
-  public int suspend (String name)
-  {
-    Service service = this.findService (name);
-    
-    if (service.suspended ())
-      return 0;
-
-    return service.suspend ();
-  }
-
-  /**
-   * Returns status information about the specified Service.
-   *
-   *@param name name of the Service to query
-   *@return String of information about the Service's status
-   */
-  public String info (String name)
-  {
-    Service service = this.findService (name);
-
-    return service.info ();
-  }
-
-  /** 
-   * Check to see if the specified Service is suspended or not
-   */
-  public boolean suspended (String name)
-  {
-    Service service = this.findService (name);
-
-    return service.suspended ();
-  }
-
-  /**
-   * Initialize the specified Service with the given command
-   * line arguments.
-   */
-  public int init (String name, String [] args)
-  {
-    Service service = this.findService (name);
-
-    return service.init (args);
-  }
-
-  /**
-   * Returns the number of items in the repository
-   */
-  public int size ()
-  {
-    return this.serviceNames_.size();
-  }
-
-  /**
-   * Stores the Service names in order of insertion
-   */
-  Vector serviceNames_;
-
-  /**
-   * A mapping between Service names and Service objects
-   */
-  Hashtable serviceMap_;
-};
-  
-
-
-  
-
-  
-
-  
diff --git a/java/JACE/ServiceConfigurator/package.html b/java/JACE/ServiceConfigurator/package.html
deleted file mode 100644
index 2092fc34f5a..00000000000
--- a/java/JACE/ServiceConfigurator/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Point for loading and managing services.
-<P>
-See also:
-<a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#config">
-Documents on the ACE Service Configurator</a>
-</BODY>
-</HTML>
diff --git a/java/JACE/Timers/ProfileTimer.java b/java/JACE/Timers/ProfileTimer.java
deleted file mode 100644
index 210d8887907..00000000000
--- a/java/JACE/Timers/ProfileTimer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Timers
- *
- * = FILENAME
- *    ProfileTimer.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Timers;
-
-/**
- *     A Java wrapper for interval timers.
- */
-public class ProfileTimer
-{
-  /**
-   * Start the timer.
-   */
-  public void start ()
-    {
-      this.startTime_ = java.lang.System.currentTimeMillis ();
-    }
-
-  /**
-   * Stop the timer.
-   */
-  public void stop ()
-    {
-      this.stopTime_ = java.lang.System.currentTimeMillis ();
-    }
-
-  /**
-   * Determine elapsed time between start and stop.
-   *@return Total elapsed time (stop - start).
-   */
-  public long elapsedTime ()
-    {
-      return this.stopTime_ - this.startTime_;
-    }
-
-  private long startTime_;
-  private long stopTime_;
-}
diff --git a/java/JACE/Timers/package.html b/java/JACE/Timers/package.html
deleted file mode 100644
index 4aa67ec1fd6..00000000000
--- a/java/JACE/Timers/package.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Time related classes.
-
-@see JACE.ASX.TimeValue
-</BODY>
-</HTML>
diff --git a/java/JACE/makebat.zip b/java/JACE/makebat.zip
deleted file mode 100644
index a05c72f274e..00000000000
--- a/java/JACE/makebat.zip
+++ /dev/null
diff --git a/java/JACE/netsvcs/Handler.java b/java/JACE/netsvcs/Handler.java
deleted file mode 100644
index 7bf73f01206..00000000000
--- a/java/JACE/netsvcs/Handler.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package JACE.netsvcs;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-/**
- * Abstract class representing a handler for a Server.  Provides
- * default implementations and template methods.
- *
- *@see Server
- *@author Everett Anderson
- */
-public abstract class Handler extends SvcHandler
-{
-  /**
-   * Initialize this Handler.  The default implementation sets the
-   * done flag to false.
-   *
-   *@return -1 on failure, 0 on success
-   */
-  public int open (Object obj)
-  {
-    done_ = false;
-    return 0;
-  }
-
-  /**
-   * Shut down this handler.  Default implementation calls close ().
-   */
-  public int close (long flags)
-  {
-    return close ();
-  }
-
-  /**
-   * Shut down this handler, setting the done flag, and removing it
-   * from the parent Server's handler list.
-   */
-  public synchronized int close ()
-  {
-    if (!done ()) {
-      try {
-	done_ = true;
-	parent_.removeHandler (this);
-	peer ().close ();
-      } catch (IOException e) {
-	return -1;
-      }
-    }
-
-    return 0;
-  }
-
-  /**
-   * Returns the name of the host that is connected to this handler,
-   * or null if not connected.
-   */
-  public String hostName ()
-  {
-    if (done ())
-      return null;
-    else 
-      return this.peer().socket().getInetAddress().getHostName();
-  }
-
-  /**
-   * Process a single request and handle any errors.  The default
-   * implementation calls handleRequest with an Object from
-   * newRequest ().
-   */
-  public void handleRequest ()
-  {
-    handleRequest (newRequest ());
-  }
-
-  /**
-   * Process a single request and handle any errors.  The default
-   * implementation calls processRequest with the given request
-   * Object, and then handles exceptions appropriately.  Subclasses
-   * normally just implement processRequest rather than override
-   * this method.
-   *
-   *@param request request to process
-   */
-  public void handleRequest (Object request)
-  {
-    try {
-
-      processRequest (request);
-
-    } catch (NullPointerException e) {
-      if (!done ()) {
-	ACE.ERROR("Failure: " + e);
-	close ();
-      }
-    } catch (SocketException e) {
-      if (!done ()) {
-	ACE.DEBUG (hostName () + " disconnected");
-	close ();
-      }
-    } catch (EOFException e) {
-      if (!done ()) {
-	ACE.DEBUG (hostName () + " disconnected");
-	close ();
-      }
-    } catch (IOException e) {
-      if (!done ()) {
-	ACE.ERROR ("Lost connection: " + e);
-	close ();
-      }
-    }
-  }
-
-  /**
-   * Process a single request (including reading it from the wire) 
-   * without handling errors.  Subclasses must define the behavior.
-   *
-   *@param requestObject request to process
-   *@exception SocketException problem with the socket
-   *@exception EOFException end of connection, 
-   *           usually means client disconnected
-   *@exception IOException error during transmission
-   */
-  protected abstract void processRequest (Object requestObject) 
-    throws SocketException, EOFException, IOException;
-
-  /**
-   * Returns a new instance of a request object.  Subclasses must
-   * define the behavior.
-   */
-  public abstract Object newRequest ();
-  
-  /**
-   * Called by the JVM when a Handler is run in its own Thread.  The
-   * default implementation creates a single request object which is
-   * reused during multiple handleRequest calls.  The loop exits
-   * when the Handler's done() method returns true.
-   */
-  public void run()
-  {
-    Object request = newRequest ();
-
-    while (!done ()) 
-      handleRequest (request);
-
-    close ();
-  }
-
-  /**
-   * Set the Server parent of this Handler.
-   */
-  public void parent (Server parent)
-  {
-    parent_ = parent;
-  }
-
-  /**
-   * Return the Server parent of this Handler.
-   */
-  public Server parent ()
-  {
-    return parent_;
-  }
-
-  /**
-   * Check to see if this Handler should shut down.
-   */
-  protected synchronized boolean done ()
-  {
-    return done_;
-  }
-
-  /**
-   * Closes the handler, freeing resources.
-   */
-  protected void finalize () throws Throwable
-  {
-    close ();
-  }
-
-  private boolean done_ = true;
-  private Server parent_;
-}
diff --git a/java/JACE/netsvcs/Logger/LogRecord.java b/java/JACE/netsvcs/Logger/LogRecord.java
deleted file mode 100644
index 972cf45af74..00000000000
--- a/java/JACE/netsvcs/Logger/LogRecord.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.netsvcs.Logger
- *
- * = FILENAME
- *    LogRecord.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package JACE.netsvcs.Logger;
-
-import java.util.*;
-import java.io.*;
-import JACE.OS.*;
-
-/**
- * Communicates logging information.  Compatible with the C++ ACE
- * ACE_Log_Record class.
- */
-public class LogRecord
-{
-  /**
-   * Maximum size of a LogRecord
-   */
-  final public int MAXLOGMSGLEN = 4 * 1024;
-
-  private int type_;
-  private int length_;
-  private long msec_;
-  private int pid_;
-  private byte[] msgData_;
-  private final static int numIntMembers = 5;
-  private final static int sizeofIntInBytes = 4;
-
-  /**
-   * Create a default instance.
-   */
-  public LogRecord()
-  {
-    type(0);
-    timeStamp((int)new Date().getTime());
-    length(0);
-    pid(0);
-  }
-
-  /**
-   * Create a LogRecord.  This is the designated initializer.
-   * @param priority a numeric specification of the priority (ascending)
-   * @param milliseconds time attached to the log entry in Unix <pre>time_t</pre> format 
-   * @param pid the process ID 
-   */
-  public LogRecord(int priority,
-		   long milliseconds,
-		   int pid)
-  {
-    type(priority);
-    timeStamp(milliseconds);
-    length(0);
-    pid(pid);
-  }
-
-  /**
-   * Create a LogRecord with the current time and the given message.
-   *
-   *@param message message to log
-   */
-  public LogRecord (String message)
-  {
-    this ();
-
-    msgData (message);
-  }
-
-  /**
-   * Conversion to string.  Only includes the <pre>msgData_</pre> member.
-   */
-  public String toString()
-  {
-    String result = null;
-    try {
-      result = new String (msgData_,
-			   "US-ASCII");
-    } catch (UnsupportedEncodingException e) {
-      result = new String (msgData_);
-    }
-
-    return result;
-  }
-
-  /**
-   * Place a textual representation of the record on a PrintStream.
-   * When verbose is specified to be true, the output takes the form
-   * <PRE>(Date)@(host name)@(PID)@(type)@(message)</PRE>
-   * Otherwise it just prints the message.
-   * @param hostname name of the host generating this record
-   * @param verbose specify how much information to print (see above)
-   * @param ps A PrintStream instance to which the output should go.
-   */
-  public void print(String hostname,
-		    boolean verbose,
-		    PrintStream ps)
-  {
-    String toprint;
-    if (verbose)
-      {
-	Date now = new Date(this.timeStamp());
-
-	/* 01234567890123456789012345 */
-	/* Wed Oct 18 14:25:36 1989n0 */
-	toprint = now.toString().substring(4) + "@"
-                + hostname + "@" + pid_ + "@" + type_ + "@"
-                + this.toString();
-      }
-    else
-      {
-	toprint = this.toString();
-      }
-    ps.println(toprint);
-  }
-
-  /**
-   * Read in the data for this LogRecord from the given InputStream.
-   *
-   *@param is InputStream to read from
-   *@exception IOException error during transmission
-   */
-  public void streamInFrom (InputStream is) throws IOException
-  {
-    BufferedInputStream bis = new BufferedInputStream (is);
-
-    DataInputStream dis = new DataInputStream (bis);
-
-    streamInFrom (dis);
-  }
-
-  /**
-   * Read in the data for this LogRecord from the given DataInputStream.
-   *
-   *@param dis DataInputStream to read from
-   *@exception IOException error during transmission
-   */
-  public void streamInFrom(DataInputStream dis) throws IOException
-  {
-    // Order here must match layout order in the C++ class.
-    length(dis.readInt());
-    type(dis.readInt());
-    this.timeStamp((long)dis.readInt() * 1000);
-
-    // Skip smaller time resolution info since we're lucky if Java's
-    // timer can handle more than millisecond precision, anyway
-    dis.skipBytes(4); 
-
-    pid(dis.readInt());
-
-    int dataLength = (int) (length_ - numIntMembers * sizeofIntInBytes);
-
-    msgData_ = new byte[dataLength];
-
-    dis.readFully(msgData_, 0, dataLength);
-  }
-
-  /** 
-   * Write this LogRecord out to the given OutputStream.
-   *
-   *@param os OutputStream to write to
-   *@exception IOException error during transmission
-   */
-  public void streamOutTo (OutputStream os) throws IOException
-  {
-    BufferedOutputStream bos = new BufferedOutputStream (os);
-
-    DataOutputStream dos = new DataOutputStream (bos);
-
-    streamOutTo (dos);
-  }
-
-  /**
-   * Write this LogRecord out to the given DataOutputStream.
-   *
-   *@param dos OutputStream to write to
-   *@exception IOException error during transmission
-   */
-  public void streamOutTo(DataOutputStream dos) throws IOException
-  {
-    dos.writeInt(length());
-    dos.writeInt(type());
-    dos.writeInt((int)(this.msec_ / 1000));
-    dos.writeInt(0);  
-    dos.writeInt(pid());
-
-    dos.write(msgData_);
-
-    dos.flush ();
-  }
-
-  /**
-   * Return the LogRecord type.
-   */
-  public int type()            { return type_; }
-
-  /**
-   * Set the LogRecord type.
-   */
-  public void type(int t)      { type_ = t; }
-
-  /**
-   * Return the length of this LogRecord.
-   */
-  public int length()          { return length_;  }
-
-  /**
-   * Set the length of this LogRecord.
-   */
-  public void length(int l)    { length_ = l; }
-
-  /**
-   * Calculate the length of this LogRecord from the size of
-   * the message and the header.
-   */
-  private void setLen(int msgLen)
-       { length(msgLen + numIntMembers * sizeofIntInBytes); }
-
-  /**
-   * Return the millisec time stamp of this LogRecord.
-   */
-  public long timeStamp()      { return this.msec_; }
-
-  /**
-   * Set the millisec time stamp of this LogRecord.
-   */
-  public void timeStamp(long msec){ this.msec_ = msec; }
-
-  /**
-   * Return the PID of this LogRecord.
-   */
-  public int pid()             { return pid_; }
-
-  /**
-   * Set the PID of this LogRecord.
-   */
-  public void pid(int p)       { pid_ = p; }
-
-  /**
-   * Return the message of this LogRecord as a byte array.
-   */
-  public byte[] msgData()      { return msgData_; }
-
-  /**
-   * Set the message of this LogRecord to a given byte array.
-   */
-  public void msgData(byte[] m)
-    { 
-      int size = m.length;
-
-      if (size > MAXLOGMSGLEN) 
-	size = MAXLOGMSGLEN;
-
-      this.msgData_ = new byte[size];
- 
-      System.arraycopy(m, 0, msgData_, 0, size);
-
-      setLen(size);
-    }
-
-  /**
-   * Set the message of this LogRecord to a given byte array.  First
-   * tries to use US-ASCII encoding, then uses the default encoding
-   * if that fails.  The toString method is essentially the opposite
-   * version.
-   */
-  public void msgData(String m)
-  {
-    byte temp[] = null;
-    try {
-      temp = m.getBytes("US-ASCII");
-    } catch (UnsupportedEncodingException e) {
-      temp = m.getBytes ();
-    }
-    if (temp.length > MAXLOGMSGLEN) {
-      this.msgData_ = new byte[MAXLOGMSGLEN];
-      
-      System.arraycopy(temp, 0, msgData_, 0, MAXLOGMSGLEN);
-    } else
-      this.msgData_ = temp;
-    
-    setLen(msgData_.length);
-  }
-}
diff --git a/java/JACE/netsvcs/Logger/LoggingStrategy.java b/java/JACE/netsvcs/Logger/LoggingStrategy.java
deleted file mode 100644
index b7912499385..00000000000
--- a/java/JACE/netsvcs/Logger/LoggingStrategy.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    LogMessageReceiver.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.netsvcs.Logger;
-
-import java.io.*;
-
-/**
- * Encapsulates the handling of a LogRecord from a given host, allowing
- * easy swapping of behavior in the logging service.  Strategies could
- * be developed to save to a file, print on a certain stream, forward
- * to another service, etc.
- *
- *@see StderrStrategy
- *@see LogRecord
- */
-public interface LoggingStrategy
-{
-  /**
-   * Process the given LogRecord.
-   *
-   *@param hostname host from which this LogRecord originated
-   *@param record LogRecord instance to process
-   */
-  public void logRecord (String hostname,
-			 LogRecord record);
-}
diff --git a/java/JACE/netsvcs/Logger/ServerLoggingAcceptor.java b/java/JACE/netsvcs/Logger/ServerLoggingAcceptor.java
deleted file mode 100644
index c0ef8831fc6..00000000000
--- a/java/JACE/netsvcs/Logger/ServerLoggingAcceptor.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package JACE.netsvcs.Logger;
-
-import java.util.*;
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.netsvcs.Server;
-
-/**
- * Server for the logging service.  Sets the default logging strategy
- * to StderrStrategy so that logging requests are printed on the
- * System.err stream.  Other strategies can be specified on the
- * command line.  
- * <P>
- * <B>Valid command line arguments:</B>
- * <PRE>
- *   -r (class name)  Specify a LoggingStrategy
- *                    (Default is StdErrStrategy)
- *   -p (port)        Port to listen on for clients
- *   -d               Enable debugging messages
- *   -a (class name)  Specify ActivateStrategy
- *                    (Default is thread per connection)
- * </PRE>
- *
- *@see LoggingStrategy
- *@see StderrStrategy
- */
-public class ServerLoggingAcceptor extends Server
-{
-  /**
-   * Default constructor.  Sets the default LoggingStrategy to
-   * StderrStrategy.
-   */
-  public ServerLoggingAcceptor ()
-  {
-    name ("Logging Service");
-    logStrategy_ = new StderrStrategy ();
-  }
-
-  /**
-   * Simple main program for running the logging service without the
-   * service configurator.
-   *
-   *@param args command line arguments
-   */
-  public static void main (String [] args)
-  {
-    ServerLoggingAcceptor sla = new ServerLoggingAcceptor();
-    
-    sla.init(args);
-  }
-
-  /** 
-   * Accessor for the LoggingStrategy
-   */
-  public LoggingStrategy loggingStrategy ()
-  {
-    return this.logStrategy_;
-  }
-
-  /**
-   * Creates a new ServerLoggingHandler instance.
-   */
-  protected SvcHandler makeSvcHandler ()
-  {
-    return new ServerLoggingHandler ();
-  }
-
-  /**
-   * Prints out the valid command line arguments.  See the class
-   * description for more information.  Called by Server.init when
-   * parseArgs returns -1.
-   */
-  protected void printUsage ()
-  {
-    ACE.ERROR ("Valid options:\n");
-    ACE.ERROR ("-r <class name>  Specify a LoggingStrategy");
-    ACE.ERROR ("                 (Default is StdErrStrategy");
-    ACE.ERROR ("-p <port>        Port to listen on for clients");
-    ACE.ERROR ("-d               Enable debugging messages");
-    ACE.ERROR ("-a <class name>  Specify ActivateStrategy");
-    ACE.ERROR ("                 (Default is single threaded");
-  }
-  
-  /**
-   * Parses the command line arguments.  See the class description
-   * for more information.
-   *
-   *@param args command line arguments
-   *@return -1 on failure, 0 on success
-   */
-  protected int parseArgs (String args[])
-  {
-    String s;
-    Object strategy;
-    GetOpt opt = new GetOpt (args, "p:r:da:", true);
-    int c = 0;
-   
-    try {
-
-      while ((c = opt.next ()) != -1)
-	{
-	  switch (c)
-	    {
-	    case 'd':
-	      ACE.enableDebugging ();
-	      ACE.DEBUG ("Debugging is enabled");
-	      break;
-	    case 'p':
-	      if (!port (opt.optarg ()))
-		return -1;
-	      break;
-	    case 'a':
-	      strategy = newStrategyInstance (opt.optarg (),
-					      "ActivateStrategy");
-	      if (strategy == null)
-		return -1;
-
-	      activateStrategy ((ActivateStrategy) strategy);
-	      break;
-	    case 'r':
-	      // Load the Strategy with the given name
-	      strategy = newStrategyInstance (opt.optarg (),
-					      "LoggingStrategy");
-	      if (strategy == null) 
-		return -1;
-	      
-	      logStrategy_ = (LoggingStrategy)strategy;
-	      break;
-	    default:
-	      ACE.ERROR ("Unknown argument: " + c);
-	      return -1;
-	    }
-	}
-    } catch (ArrayIndexOutOfBoundsException e) {
-      ACE.ERROR ("Option -" + (char)c + " requires an argument");
-      return -1;
-    }
-
-    return 0;
-  }
-
-  private LoggingStrategy logStrategy_;
-}
diff --git a/java/JACE/netsvcs/Logger/ServerLoggingHandler.java b/java/JACE/netsvcs/Logger/ServerLoggingHandler.java
deleted file mode 100644
index 88a564c2c34..00000000000
--- a/java/JACE/netsvcs/Logger/ServerLoggingHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    ServerLoggingHandler.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.netsvcs.Logger;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-import JACE.netsvcs.Handler;
-
-/**
- *
- * Created by ServerLoggingAcceptor to handle logging requests.  This
- * simply reads the record and hands it to the registered LoggingStrategy.
- *
- * @see JACE.netsvcs.Logger.ServerLoggingAcceptor
- */
-public class ServerLoggingHandler extends Handler
-{
-  /**
-   * Reads in the given LogRecord request and hands it to the
-   * LoggingStrategy registered with the ServerLoggingAcceptor parent.
-   *
-   *@param request LogRecord instance to use
-   */
-  public void processRequest (Object request) 
-    throws SocketException, EOFException, IOException
-  {
-    LogRecord rec = (LogRecord)request;
-
-    rec.streamInFrom (this.peer ().dataInputStream ());
-
-    ServerLoggingAcceptor parent = (ServerLoggingAcceptor)parent ();
-
-    parent.loggingStrategy ().logRecord (this.hostName (), rec);
-  }
-
-  /**
-   * Creates a new instance of LogRecord.
-   */
-  public Object newRequest ()
-  {
-    return new LogRecord ();
-  }
-}
-
-
-
-
diff --git a/java/JACE/netsvcs/Logger/StderrStrategy.java b/java/JACE/netsvcs/Logger/StderrStrategy.java
deleted file mode 100644
index ee927e19062..00000000000
--- a/java/JACE/netsvcs/Logger/StderrStrategy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    DefaultLMR.java
- *
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.netsvcs.Logger;
-
-import java.io.*;
-
-/**
- * Default LoggingStrategy for the logging service.  This prints out the
- * LogRecord on the System.err stream.
- *
- * @see JACE.netsvcs.Logger.LogRecord
- */
-public class StderrStrategy implements LoggingStrategy
-{
-  /**
-   * Process the given LogRecord by printing it on the System.err stream.
-   *
-   *@param hostname host from which this LogRecord originated
-   *@param record LogRecord instance to process
-   */
-  public void logRecord (String hostname,
-			 LogRecord record)
-  {
-    record.print(hostname, true, System.err);
-  }
-}
diff --git a/java/JACE/netsvcs/Logger/c.bat b/java/JACE/netsvcs/Logger/c.bat
deleted file mode 100644
index 6600766df1d..00000000000
--- a/java/JACE/netsvcs/Logger/c.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-javac -d C:\Everett\JACE\classes *.java
diff --git a/java/JACE/netsvcs/Logger/package.html b/java/JACE/netsvcs/Logger/package.html
deleted file mode 100644
index 84bffb246d9..00000000000
--- a/java/JACE/netsvcs/Logger/package.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Logging Service for processing logging records received from remote hosts.
-<P>
-The strategy for how to process the records can be easily changed via the
-command line.
-<P>
-A simple test client is available in the tests directory under netsvcs\Logger.
-The service itself can either be run on the command line (by running
-ServerLoggingAcceptor) or by loading it with a ServiceConfig file (see
-the tests for the service configurator).
-
-@see JACE.netsvcs.Logger.LoggingStrategy
-@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a>
-</BODY>
-</HTML>
diff --git a/java/JACE/netsvcs/Naming/NameAcceptor.java b/java/JACE/netsvcs/Naming/NameAcceptor.java
deleted file mode 100644
index 7e7be457d70..00000000000
--- a/java/JACE/netsvcs/Naming/NameAcceptor.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameAcceptor.java
- *
- *************************************************/
-package JACE.netsvcs.Naming;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.TimeValue;
-import JACE.netsvcs.Server;
-
-/**
- * Server for the naming service.  
- * Listens on the specified port (command line option) and launches
- * NameHandlers when connections are made.  
- * <P>
- * The hash table for the mapping and a timer queue are created here.
- * Periodically, if it has been changed, the mapping is saved to a file.
- * If the data file exists at load time, it is read from disk.  Currently,
- * the service stores the entire mapping in one Hashtable (which is probably
- * kept in memory at all times).
- * <P>
- * <B>Valid command line arguments:</B>
- * <PRE>
- *    -f (file name)    File name of the database
- *                      (Default is namedata.dat)
- *    -p (port number)  Port to listen on for clients
- *    -d                Enable debugging
- *    -t (time sec)     How often to save the database (default 60 sec)
- *    -a (class name)   Specify ActivateStrategy
- *                      (Default is multi-threaded)
- * </PRE>
- *
- *@see NameHandler
- *
- *@author Everett Anderson
- *
- */
-public class NameAcceptor extends Server
-{
-  /**
-   * Constructor
-   */
-  public NameAcceptor ()
-  {
-    // Set the name in case we are not using the service
-    // configurator
-    name ("Naming Service");
-
-    // Create the hash table and timer queue
-    this.mapping_ = new Hashtable ();
-    this.tq_ = new TimerQueue (true);
-  }
-
-  /**
-   * Simple main program.  See the class description for more
-   * information about command line arguments.
-   */
-  public static void main (String [] args)
-  {
-    // Simple main program to get things rolling
-    NameAcceptor na = new NameAcceptor();
-
-    na.init(args);
-  }
-
-  /**
-   * Check to see if the mapping has been modified since the last
-   * save.
-   */
-  synchronized boolean modifiedMapping ()
-  {
-    return mappingWasModified_;
-  }
-
-  /**
-   * Set the modified state of the mapping.
-   */
-  synchronized void modifiedMapping (boolean value)
-  {
-    mappingWasModified_ = value;
-  }
-
-  /**
-   * Cancels the timer which was used to save the mapping, then delegates
-   * to Server.fini ().
-   *
-   *@return -1 on failure, 0 on success
-   */
-  public int fini ()
-  {
-    if (!done () && tq_ != null) 
-      tq_.cancelTimer (this);
-
-    return super.fini ();
-  }
-
-  /**
-   * Read the data file (if it exists) and schedule a periodic timer
-   * to save it at intervals.  At the end, this delegates to
-   * Server.initialize () (which currently sets the default
-   * activation scheme if it wasn't defined on the command line).
-   *
-   *@see Server#initialize
-   *@return -1 on failure, 0 on success
-   */
-  protected int initialize ()
-  {
-    this.loadTable ();
-
-    this.tq_.scheduleTimer (this,
-			    null,
-			    new TimeValue (this.updateInterval_),
-			    new TimeValue (this.updateInterval_));
-
-    // Use whatever default ActivateStrategy is defined in the
-    // Server class (unless specified in parseArgs)
-    return super.initialize ();
-  }
-
-  /**
-   * Create a new NameHandler instance.
-   */
-  protected SvcHandler makeSvcHandler ()
-  {
-    return new NameHandler (mapping_);
-  }
-
-  /**
-   * Prints out the valid command line arguments.  See the class
-   * description for more information.  Called by Server.init when
-   * parseArgs returns -1.
-   */
-  protected void printUsage ()
-  {
-    ACE.ERROR ("Valid options:\n");
-    ACE.ERROR ("-f <file name>    File name of the database");
-    ACE.ERROR ("                  (Default is namedata.dat)");
-    ACE.ERROR ("-p <port number>  Port to listen on for clients");
-    ACE.ERROR ("-d                Enable debugging");
-    ACE.ERROR ("-t <time sec>     How often to save the database");
-    ACE.ERROR ("                  (Default is 60 seconds)");
-    ACE.ERROR ("-a <class name>   Specify ActivateStrategy");
-    ACE.ERROR ("                  (Default is multi-threaded");
-  }
-
-  /**
-   * Parses the command line arguments.  See the class description
-   * for more information.
-   *
-   *@param args command line arguments
-   *@return -1 on failure, 0 on success
-   */
-  protected int parseArgs (String [] args)
-  {
-    int c = 0;
-    String s;
-    GetOpt opt = new GetOpt (args, "p:f:t:da:", true);
-
-    try {
-
-      while ((c = opt.next ()) != -1) {
-	switch (c)
-	  {
-	  case 'f':
-	    this.filename_ = opt.optarg ();
-	    break;
-	  case 't':
-	    try {
-	      this.updateInterval_ = Integer.parseInt (opt.optarg ());
-	    } catch (NumberFormatException e) {
-	      ACE.ERROR ("Invalid interval specified: " + e.getMessage ());
-	      return -1;
-	    }
-	    break;
-	  case 'd':
-	    ACE.enableDebugging ();
-	    ACE.DEBUG ("Debugging is enabled");
-	    break;
-	  case 'p':
-	    if (!port (opt.optarg ()))
-	      return -1;
-	    break;
-	  case 'a':
-	    Object strategy = newStrategyInstance (opt.optarg (),
-						   "ActivateStrategy");
-	    if (strategy == null)
-	      return -1;
-	    
-	    activateStrategy ((ActivateStrategy) strategy);
-	    break;	
-	  default:
-	    ACE.ERROR ("Unknown argument: " + (char)c);
-	    return -1;
-	  }
-      }
-    } catch (ArrayIndexOutOfBoundsException e) {
-      ACE.ERROR ("Option -" + (char)c + " requires an argument");
-      return -1;
-    }
-    
-    return 0;
-  }
-
-  /**
-   * Loads the hash table into memory from the specified
-   * file.  Uses ObjectInputStream.
-   */
-  protected void loadTable ()
-  {
-    File file = new File(this.filename_);
-    FileInputStream fis;
-    ObjectInputStream ois;
-
-    Hashtable ht = null;
-
-    try {
-
-      if ((file.exists()) && (file.canRead())) {
-
-	fis = new FileInputStream (file);
-
-	ois = new ObjectInputStream(fis);
-
-	ht = (Hashtable)ois.readObject();
-      } else 
-	return;
-    } catch (ClassNotFoundException e) {
-      ACE.ERROR(e);
-    } catch (StreamCorruptedException e) {
-      ACE.ERROR(e);
-    } catch (SecurityException e) {
-      ACE.ERROR(e);
-    } catch (IOException e) {
-      ACE.ERROR(e);
-    }
-
-    if (ht != null) 
-      this.mapping_ = ht;
-
-  }
-
-  /**
-   * Writes the table out to the specified file if it has been modified.
-   */
-  protected void saveTable ()
-  {
-    if (!modifiedMapping ())
-      return;
-
-    FileOutputStream fos;
-    ObjectOutputStream oos;
-
-    try {
-
-      fos = new FileOutputStream(this.filename_);
-      oos = new ObjectOutputStream(fos);
-
-      synchronized (this.mapping_) {
-	oos.writeObject(this.mapping_);
-
-	modifiedMapping (false);
-      }
-
-      oos.flush();
-
-      oos.close();
-
-    } catch (OptionalDataException e) {
-      ACE.ERROR(e);
-    } catch (NotSerializableException e) {
-      ACE.ERROR(e);
-    } catch (IOException e) {
-      ACE.ERROR(e);
-    }
-  }
-
-  /**
-   * Call back for the TimerQueue.  This calls the method to save the
-   * hash table.  The default time out is 60 seconds.
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    this.saveTable();
-
-    return 0;
-  }
-
-  // Mapping data structure
-  Hashtable mapping_ = null;
-
-  // Default file name
-  String filename_ = "namedata.dat";
-
-  // How often to save the table (seconds)
-  int updateInterval_ = 60;
-
-  // Calls handleTimeout at updateInterval_ intervals
-  TimerQueue tq_ = null;
-
-  boolean mappingWasModified_ = false;
-}
-
diff --git a/java/JACE/netsvcs/Naming/NameHandler.java b/java/JACE/netsvcs/Naming/NameHandler.java
deleted file mode 100644
index 9989e925543..00000000000
--- a/java/JACE/netsvcs/Naming/NameHandler.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameHandler.java
- *
- *************************************************/
-package JACE.netsvcs.Naming;
-
-import java.net.SocketException;
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.SOCK_SAP.*;
-import JACE.netsvcs.Handler;
-
-/**
- * Handlers interaction between a client (NameProxy) and the naming
- * service database.  Created by NameAcceptor to handle requests.
- * <P>
- * In general, the user binds a name to a (value, type) pair.  The type is just
- * treated as just another String (in the C++ version the name and value are
- * arrays of 16 bit data types and the type is an array of 8 bit chars).
- * <P>
- * For this to work in the hash table scheme, the type and value are wrapped in
- * a ValueType class defined as a nested top level class within the
- * NameHandler.
- * <P>
- * This is compatible with the C++ ACE remote name service. 
- *
- *@see JACE.netsvcs.Naming.NameAcceptor
- *@see JACE.netsvcs.Naming.NameRequest
- *@see JACE.netsvcs.Naming.NameReply
- *
- *@author Everett Anderson
- */
-public class NameHandler extends Handler
-{
-  /**
-   * Constructor
-   *
-   * @param mapping     Hash table created in NameAcceptor
-   */
-  public NameHandler (Hashtable mapping)
-  {
-    this.mapping_ = mapping;
-  }
-  
-  /**
-   * Read in the given NameRequest and calls dispatch.
-   */
-  public void processRequest (Object request)
-    throws SocketException, EOFException, IOException
-  {
-    NameRequest nameRequest = (NameRequest)request;
-
-    nameRequest.streamInFrom (peer ().dataInputStream ());
-
-    this.dispatch (nameRequest);
-  }
-
-  /**
-   * Create a new instance of NameRequest.
-   */
-  public Object newRequest ()
-  {
-    return new NameRequest ();
-  }
-
-  /**
-   * This is the point at which a request is sent to the various methods
-   * that fulfill it.  It switches on the request type -- bind, 
-   * rebind, resolve, etc.
-   *
-   *@param nameRequest     The request to respond to
-   */
-  void dispatch (NameRequest nameRequest) throws IOException
-  {
-    NameAcceptor parent = (NameAcceptor)parent ();
-
-    // Call the various other member functions based on the
-    // message type of the request -- bind, rebind, etc.
-    switch (nameRequest.requestType()) 
-      {
-      case NameRequest.BIND:
-	this.bind(nameRequest, false);
-	parent.modifiedMapping (true);
-	break;
-      case NameRequest.REBIND:
-	this.bind(nameRequest, true);
-	parent.modifiedMapping (true);
-	break;
-      case NameRequest.RESOLVE:
-	this.resolve(nameRequest);
-	break;
-      case NameRequest.UNBIND:
-	this.unbind(nameRequest);
-	parent.modifiedMapping (true);
-	break;
-      case NameRequest.LIST_NAMES:
-	this.listByName(nameRequest.name(), false);
-	break;
-      case NameRequest.LIST_VALUES:
-	this.listByValue(nameRequest.name(), false);
-	break;
-      case NameRequest.LIST_TYPES:
-	this.listByType(nameRequest.name(), false);
-	break;
-      case NameRequest.LIST_NAME_ENTRIES:
-	this.listByName(nameRequest.name(), true);
-	break;
-      case NameRequest.LIST_VALUE_ENTRIES:
-	this.listByValue(nameRequest.name(), true);
-	break;
-      case NameRequest.LIST_TYPE_ENTRIES:
-	this.listByType(nameRequest.name(), true);
-	break;
-      default:
-	ACE.ERROR("Unknown type: " + nameRequest.requestType());
-
-	// Send a failure message.  This will only work if the other
-	// side is expecting something like a NameReply rather than
-	// a NameRequest.  It would've been better to have everything
-	// use NameRequests to avoid this kind of thing.
-	NameReply reply = new NameReply (NameReply.FAILURE, 0);
-	reply.streamOutTo(peer ().dataOutputStream ());
-	break;
-      }
-
-  }
-
-  /**
-   * 
-   * Bind a name and a (value, type) pair.  All this data is given in the
-   * NameRequest from the client.  Returns a NameReply back to the client
-   * with either Reply.SUCCESS or Reply.FAILURE as the type.
-   *
-   *@param request        NameRequest given by the client
-   *@param rebind         Is this a rebind or not?
-   */
-  void bind (NameRequest request, 
-	     boolean rebind) throws IOException
-  {
-    // The hash table entries consists of (String name, ValueType data) 
-    // pairs, so create the appropriate ValueType
-    ValueType vt = new ValueType(request.type(),
-				 request.value());
-
-    // Reply to tell sender of success or failure
-    NameReply reply = new NameReply();
-
-    // If it's a rebind request, overwrite the old entry.  If the key doesn't
-    // exist, add it.  If it does exist and it's not a bind request, return
-    // a failure code via a NameReply.
-    if ((rebind) || (!this.mapping_.containsKey(request.name()))) {
-      
-      ACE.DEBUG ("Binding: " + request.name() + " and " + vt.value_);
-      
-      // Add/Update the entry in the hash table
-      this.mapping_.put(request.name(), vt);
-      
-      // Set the reply code to success
-      reply.type(NameReply.SUCCESS);
-      
-    } else {
-      
-      ACE.DEBUG ("Key " + request.name() + " already exists");
-      
-      // Set reply code to failure
-      reply.type(NameReply.FAILURE);
-      
-      // reply error code unused as far as I know
-    }
-	
-    reply.streamOutTo(peer ().dataOutputStream ());
-  }
-
-  /**
-   * Given a name, this looks up and returns the type and value.  This is
-   * done by sending back a full NameRequest with the correct info.  If
-   * there is a problem, an "empty" NameRequest is returned -- it has no
-   * name, type, or value fields.
-   *
-   *@param request     NameRequest sent by the client (has the name to lookup)
-   */
-  void resolve (NameRequest request) throws IOException
-  {
-    // A NameRequest is also used in response
-    NameRequest result;
-
-    // If the requested name is in the hash table, return the data
-    if (this.mapping_.containsKey(request.name())) {
-
-      // Get the data pair based on the name
-      ValueType vt = (ValueType)this.mapping_.get(request.name());
-
-      ACE.DEBUG("Good resolve: " + vt.value_);
-
-      // Fill the reply structure 
-      result = new NameRequest(NameRequest.RESOLVE,
-			       null,
-			       vt.value_,
-			       vt.type_,
-			       null);
-
-    } else {
-
-      // Otherwise return a null response 
-      result = new NameRequest(NameRequest.RESOLVE,
-			       null,
-			       null,
-			       null,
-			       null);
-
-    }
-
-    result.streamOutTo (peer ().dataOutputStream ());
-  }
-
-  /**
-   * 
-   * Given a name, remove its entry in the mapping.  Returns a NameReply
-   * to the client with NameReply.SUCCESS or NameReply.FAILURE.
-   *
-   *@param request    NameRequest from the client (has the name to remove)
-   */
-  void unbind (NameRequest request) throws IOException
-  {
-    NameReply reply = new NameReply();
-
-    // If the given key isn't in the table, return an error
-    // Otherwise remove it.  Uses a NameReply to respond.
-    if (!this.mapping_.containsKey(request.name())) 
-      reply.type(NameReply.FAILURE);
-    else {
-      this.mapping_.remove(request.name());
-      reply.type(NameReply.SUCCESS);
-    }
-
-    // Send the reply out to the socket
-    reply.streamOutTo (peer ().dataOutputStream ());
-  }
-
-  /**
-   *
-   * Given a pattern string (given in NameRequest's name field), this 
-   * finds all the entries in the mapping which have a name that begins with
-   * the string.  Each one is sent back separately via a NameRequest, and this
-   * sequence is followed by a blank NameRequest.
-   *
-   *@param pattern           Pattern to find (what result names should 
-   *                         begin with)
-   *@param completeLookup    Should the value and type be returned as well?
-   */
-  void listByName (String pattern, 
-		   boolean completeLookup) throws IOException
-  {
-    // Get a listing of all the keys in the hash table
-    Enumeration enum = this.mapping_.keys();
-
-    // References used in the loop
-    String name;
-    ValueType vt;
-
-    // A NameRequest is used to return each item corresponding to the pattern.
-    NameRequest result = 
-      new NameRequest((completeLookup ? NameRequest.LIST_NAMES :
-		       NameRequest.LIST_NAME_ENTRIES),
-		      null,
-		      null,
-		      null,
-		      null);
-
-    // Keep ourselves safe from null pointer exceptions
-    if (pattern == null)
-      pattern = new String("");
-      
-    // Scan through all the elements
-    while (enum.hasMoreElements()) {
-
-      // Get a key
-      name = (String)enum.nextElement();
-
-      // Does it fit the pattern?
-      if (name.startsWith(pattern)) {
-
-	// Set the result name
-	result.name(name);
-
-	// Only make another hash table request if the user
-	// wants all the data
-	if (completeLookup) {
-
-	  // Get data from the hash table
-	  vt = (ValueType)mapping_.get(name);
-
-	  // Set the rest of the data
-	  result.type(vt.type_);
-	  result.value(vt.value_);
-	}
-	  
-	// Send it to the socket
-	result.streamOutTo (peer ().dataOutputStream ());
-      }
-    }
-    
-    // Send final null message
-    result.name(null);
-    result.type(null);
-    result.value(null);
-    result.requestType(NameRequest.MAX_ENUM);
-    result.streamOutTo (peer ().dataOutputStream ());
-  }
-
-  /**
-   *
-   * Given a pattern string (given in NameRequest's name field), this 
-   * finds all the entries in the mapping which have a type that begins with
-   * the string.  Each one is sent back separately via a NameRequest, and this
-   * sequence is followed by a blank NameRequest.
-   *
-   *@param pattern           Pattern to find (what result types should 
-   *                         begin with)
-   *@param completeLookup    Should the value be returned as well?  This is 
-   *                         only used to decide between LIST_TYPES and 
-   *                         LIST_TYPE_ENTRIES since we might as well send 
-   *                         back both if we look them up together.
-   */
-  void listByType (String pattern, 
-		   boolean completeLookup) throws IOException
-  {
-    // Get a listing of all the keys in the hash table
-    Enumeration enum = this.mapping_.keys();
-
-    // References used in the loop
-    String name;
-    ValueType vt;
-
-    // A NameRequest is used to return each item corresponding to the pattern.
-    NameRequest result = 
-      new NameRequest((completeLookup ? NameRequest.LIST_TYPES :
-		       NameRequest.LIST_TYPE_ENTRIES),
-		      null,
-		      null,
-		      null,
-		      null);
-    // Keep ourselves safe from null pointer exceptions
-    if (pattern == null)
-      pattern = new String("");
-
-      // Scan through all the elements
-    while (enum.hasMoreElements()) {
-
-      // Get a key
-      name = (String)enum.nextElement();
-
-      // Have to get all the data for this entry to compare
-      vt = (ValueType)mapping_.get(name);
-
-      // Does it fit the pattern?
-      if (vt.type_ != null)
-	if (vt.type_.startsWith(pattern)) {
-
-	  // Set the result values
-	  result.name(name);
-	  result.type(vt.type_);
-	  result.value(vt.value_);
-      
-	  // Send it out to the socket
-	  result.streamOutTo (peer ().dataOutputStream ());
-	}
-    }
-
-    // Send final null message
-    result.name(null);
-    result.type(null);
-    result.value(null);
-    result.requestType(NameRequest.MAX_ENUM);
-    result.streamOutTo (peer ().dataOutputStream ());
-  }
-  /**
-   *
-   * Given a pattern string (given in NameRequest's name field), this 
-   * finds all the entries in the mapping which have a value that begins with
-   * the string.  Each one is sent back separately via a NameRequest, and this
-   * sequence is followed by a blank NameRequest.
-   *
-   *@param pattern           Pattern to find (what result values should 
-   *                         begin with)
-   *@param completeLookup    Should the value be returned as well?  This is 
-   *                         only used to decide between LIST_TYPES and 
-   *                         LIST_TYPE_ENTRIES since we might as well send 
-   *                         back both if we look them up together.
-   */
-  void listByValue (String pattern, 
-		    boolean completeLookup) throws IOException
-  {
-    // Get a listing of all the keys in the hash table
-    Enumeration enum = this.mapping_.keys();
-
-    // References used in the loop
-    String name;
-    ValueType vt;
-
-    // A NameRequest is used to return each item corresponding to the pattern.
-    NameRequest result = 
-      new NameRequest((completeLookup ? NameRequest.LIST_VALUES :
-		       NameRequest.LIST_VALUE_ENTRIES),
-		      null,
-		      null,
-		      null,
-		      null);
-    // Keep ourselves safe from null pointer exceptions
-    if (pattern == null)
-      pattern = new String("");
-
-      // Scan through all the elements
-    while (enum.hasMoreElements()) {
-
-      // Get a key
-      name = (String)enum.nextElement();
-
-      // Have to get all the data for this entry to compare
-      vt = (ValueType)mapping_.get(name);
-
-      // Does it fit the pattern?
-      if (vt.value_ != null)
-	if (vt.value_.startsWith(pattern)) {
-
-	  // Set the result values
-	  result.name(name);
-	  result.type(vt.type_);
-	  result.value(vt.value_);
-      
-	  // Send it out to the socket
-	  result.streamOutTo (peer ().dataOutputStream ());
-	}
-    }
-
-    // Send final null message
-    result.name(null);
-    result.type(null);
-    result.value(null);
-    result.requestType(NameRequest.MAX_ENUM);
-    result.streamOutTo (peer ().dataOutputStream ());
-  }
-
-  // References to the hash table and the timer queue
-  private Hashtable mapping_;
-
-  /**
-   * A simple wrapper to keep the type and value together in
-   * the hash table.
-   */
-  static class ValueType implements Serializable
-  {
-    /**
-     * Constructor
-     *
-     *@param type   Type string to include
-     *@param value  Value string to include
-     */
-    ValueType(String type, String value)
-    { this.type_ = type; this.value_ = value; }
-
-    public String type_;
-    public String value_;
-  }
-}
diff --git a/java/JACE/netsvcs/Naming/NameProxy.java b/java/JACE/netsvcs/Naming/NameProxy.java
deleted file mode 100644
index 9b1b3102f1d..00000000000
--- a/java/JACE/netsvcs/Naming/NameProxy.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameProxy.java
- *
- *************************************************/
-package JACE.netsvcs.Naming;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-import JACE.Connection.*;
-
-/**
- * Proxy which clients can use to interact with the naming service.
- * Can be used with the Connector.
- *
- *@see JACE.Connection.Connector
- *@see NameAcceptor
- *@see NameHandler
- *
- *@author Everett Anderson
- */
-public class NameProxy extends SvcHandler
-{
-  /**
-   * Constructor, connects itself using a Connector.
-   *
-   *@param host name of the host of the naming service
-   *@param port port to connect to on the host
-   */
-  public NameProxy (String host, int port)
-    throws UnknownHostException, 
-	   SocketException,
-	   InstantiationException,
-	   IllegalAccessException,
-	   IOException
-  {
-    Connector c = new Connector ();
-    c.open (host, port);
-    c.connect (this);
-  }
-
-  /**
-   * Default constructor.  Proxies created with this constructor must
-   * be connected to use.
-   */
-  public NameProxy ()
-  {
-  }
-
-  /**
-   * Constructor taking a SOCKStream to use.
-   *
-   *@param sock SOCKStream already open to the naming service
-   */
-  public NameProxy (SOCKStream sock)
-  {
-    this.stream_ = sock;
-  }
-
-  /**
-   * Initialize this proxy.  (Called by Connector)
-   */
-  public int open (Object obj)
-  {
-    connected_ = true;
-    return 0;
-  }
-
-  /**
-   * Close the proxy, shutting down the connection to the service.
-   */
-  public int close ()
-  {
-    if (!connected_)
-      return 0;
-
-    try {
-      this.peer ().close ();
-    } catch (IOException e) {
-      return -1;
-    } finally {
-      connected_ = false;
-    }
-
-    return 0;
-  }
-
-  /**
-   * Attempt to bind the given data pair
-   * @param name      Name/key
-   * @param value     Value to bind 
-   *
-   * @return   True iff bind is successful
-   */
-  public boolean bind(String name, String value) throws IOException
-  {
-    return this.bind(name, value, null, false);
-  }
-
-  /**
-   * Attempt to bind the given data triplet
-   * @param name      Name/key
-   * @param value     Value to bind 
-   * @param type      Type to bind (another string)
-   *
-   * @return   True iff the bind was successful
-   */
-  public boolean bind(String name, String value, String type) 
-    throws IOException
-  {
-    return this.bind(name, value, type, false);
-  }
-
-  /**
-   * The most generic of the bind methods.  Allows factoring out of 
-   * common code.  Not public.
-   */
-  boolean bind (String name, String value, String type, boolean rebind) 
-    throws IOException
-  {
-    // Create a new NameRequest with the desired info
-    NameRequest request = 
-      new NameRequest(rebind ? NameRequest.REBIND : NameRequest.BIND,
-		      name,
-		      value,
-		      type,
-		      null);
-
-    // Send it to the naming service
-    request.streamOutTo(this.stream_);
-
-    // Create a reply
-    NameReply reply = new NameReply();
-
-    // Get the status of the bind from the naming service
-    reply.streamInFrom(this.stream_);
-      
-    // Return true on success
-    return (reply.type() == NameReply.SUCCESS ? true : false);
-  }
-
-  /**
-   * Rebind a name and a value
-   * @param name     Name/key
-   * @param value    Bound value
-   *
-   * @return     True if the rebind was successful
-   */
-  public boolean rebind (String name, String value) throws IOException
-  {
-    return this.bind(name, value, null, true);
-  }
-
-  /** 
-   * Rebind a name, value, and type
-   * @param name     Name/key
-   * @param value    Bound value
-   * @param type     Bound type
-   *
-   * @return    True if rebind was successful
-   */
-  public boolean rebind (String name, String value, String type) 
-    throws IOException
-  {
-    return this.bind(name, value, type, true);
-  }
-  /**
-   * Look up information bound to the given key/name.
-   *
-   * @param  name     Name/key
-   *
-   * @return     Vector with three elements:
-   *                 0   Name/key
-   *                 1   Value
-   *                 2   Type
-   */
-  public Vector resolve (String name) throws IOException
-  {
-    // Create a new NameRequest with the name & request type
-    NameRequest request = new NameRequest(NameRequest.RESOLVE,
-					  name,
-					  null,
-					  null,
-					  null);
-
-    // Send it to the naming service
-    request.streamOutTo(this.stream_);
-
-    // Get a response (hopefully with the value and type)
-    request.streamInFrom(this.stream_);
-
-    // Dump the result into a vector
-    Vector result = new Vector();
-
-    result.addElement(request.name());
-    result.addElement(request.value());
-    result.addElement(request.type());
-
-      // Cut it down to the size we need
-    result.trimToSize();
-
-    return result;
-  }
-
-  /**
-   * Remove the entry in the mapping corresponding to the given name/key.
-   *
-   * @param      name      Name/key
-   *
-   * @return     True if the unbind was successful
-   */
-  public boolean unbind (String name) throws IOException
-  {
-    NameRequest request = new NameRequest(NameRequest.UNBIND,
-					  name,
-					  null,
-					  null,
-					  null);
-    // Send the request to the naming service
-    request.streamOutTo(this.stream_);
-
-    NameReply reply = new NameReply();
-
-    // Get reply
-    reply.streamInFrom(this.stream_);
-
-    return (reply.type() == NameReply.SUCCESS ? true : false);
-  }
-
-  /**
-   * Return a vector that's a list of names (Strings) that begin with
-   * the given pattern
-   * @param    pattern      Search pattern
-   * @return   Vector       List of names
-   */
-  public Vector listNames (String pattern) throws IOException
-  {
-    return this.requestSimpleList(pattern, NameRequest.LIST_NAMES);
-  }
-
-  /**
-   * Return a vector that's a list of types (Strings) that begin with
-   * the given pattern
-   * @param    pattern      Search pattern
-   * @return   Vector       List of types
-   */
-  public Vector listTypes (String pattern) throws IOException
-  {
-    return this.requestSimpleList(pattern, NameRequest.LIST_TYPES);
-  }
-
-  /**
-   * Return a vector that's a list of values (Strings) that begin with
-   * the given pattern
-   * @param    pattern      Search pattern
-   * @return   Vector       List of values
-   */
-  public Vector listValues (String pattern) throws IOException
-  {
-    return this.requestSimpleList(pattern, NameRequest.LIST_VALUES);
-  }
-
-  /**
-   * Non-public generic list gathering method
-   */
-  Vector requestSimpleList (String pattern, int type) throws IOException
-  {
-    // Make request for a list of the given type
-    NameRequest request = new NameRequest(type,
-					  pattern,
-					  null,
-					  null,
-					  null);
-    request.streamOutTo(this.stream_);
-
-      // Allocate and reuse the DIS here rather than each time we call
-      // streamInFrom
-    DataInputStream dis = new DataInputStream(this.stream_.inputStream());
-
-    request.streamInFrom(dis);
-    Vector result = new Vector();
-
-    // Add elements until there's a null message with the MAX_ENUM
-    // request type
-    while (request.requestType() != NameRequest.MAX_ENUM) {
-      if (type == NameRequest.LIST_NAMES)
-	result.addElement(new String(request.name()));
-      else
-	if (type == NameRequest.LIST_VALUES)
-	  result.addElement(new String(request.value()));
-	else
-	  result.addElement(new String(request.type()));
-
-      request.streamInFrom(dis);
-    }
-
-    // Adjust the vector to the minimal size
-    result.trimToSize();
-
-    return result;
-  }
-
-  /**
-   * Get a vector with the entire data set for entries whose name begins with
-   * the given pattern.  Each element in the vector is another vector
-   * with the following layout:
-   *               0     Name/key
-   *               1     Value
-   *               2     Type
-   *
-   * @param    pattern     Search pattern
-   * @return   Vector of vectors
-   */
-  public Vector listNameEntries (String pattern) throws IOException
-  {
-    return this.requestComplexList(pattern, NameRequest.LIST_NAME_ENTRIES);
-  }
-
-  /**
-   * Get a vector with the entire data set for entries whose value begins with
-   * the given pattern.  Each element in the vector is another vector
-   * with the following layout:
-   *               0     Name/key
-   *               1     Value
-   *               2     Type
-   *
-   * @param    pattern     Search pattern
-   * @return   Vector of vectors
-   */
-  public Vector listValueEntries (String pattern) throws IOException
-  {
-    return this.requestComplexList(pattern, NameRequest.LIST_VALUE_ENTRIES);
-  }
-
-  /**
-   * Get a vector with the entire data set for entries whose type begins with
-   * the given pattern.  Each element in the vector is another vector
-   * with the following layout:
-   *               0     Name/key
-   *               1     Value
-   *               2     Type
-   *
-   * @param    pattern     Search pattern
-   * @return   Vector of vectors
-   */
-
-  public Vector listTypeEntries (String pattern) throws IOException
-  {
-    return this.requestComplexList(pattern, NameRequest.LIST_TYPE_ENTRIES);
-  }
-
-  /**
-   * Non-public generic method for getting a a vector of vectors with the 
-   * entire data set for entries fitting the given pattern.
-   */
-  Vector requestComplexList (String pattern, int type) throws IOException
-  {
-    // Create request with desired type
-    NameRequest request = new NameRequest(type,
-					  pattern,
-					  null,
-					  null,
-					  null);
-    // Send it to the naming service
-    request.streamOutTo(this.stream_);
-
-    // Allocate the DIS here and reuse
-    DataInputStream dis = new DataInputStream(this.stream_.inputStream());
-
-    // Get the first response
-    request.streamInFrom(dis);
-    Vector result = new Vector();
-
-    // Loop while we don't see a null response with the MAX_ENUM 
-    //request type
-    while (request.requestType() != NameRequest.MAX_ENUM) {
-      Vector entry = new Vector();
-
-      // Create an element in the main vector
-      entry.addElement(request.name());
-      entry.addElement(request.value());
-      entry.addElement(request.type());
-      entry.trimToSize();
-	
-      // Add it to the result
-      result.addElement(entry);
-
-      // Get another NameRequest
-      request.streamInFrom(dis);
-    }
-
-    result.trimToSize();
-
-    return result;
-  }
-
-  private boolean connected_ = false;
-}
diff --git a/java/JACE/netsvcs/Naming/NameReply.java b/java/JACE/netsvcs/Naming/NameReply.java
deleted file mode 100644
index d20c9ed05f0..00000000000
--- a/java/JACE/netsvcs/Naming/NameReply.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameReply.java
- *
- *************************************************/
-package JACE.netsvcs.Naming;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.*;
-import JACE.SOCK_SAP.*;
-
-/**
- * Used by the naming server to give quick status messages
- * to the client.  This is only used to signal the success or
- * failure of bind and unbind requests.  The error number seems
- * to be unused in the C++ version.
- *
- *@see NameHandler
- *@author Everett Anderson
- *
- */
-public class NameReply
-{
-  /** Successful operation indicator */
-  public final static int SUCCESS = 0;
-
-  /** Failed operation indicator */
-  public final static int FAILURE = -1;
-
-  /**
-   * Default Constructor (success, errno 0)
-   */
-  public NameReply () 
-  { 
-    this.type_ = this.SUCCESS;
-    this.errno_ = 0;
-  }
-
-  /**
-   * Constructor
-   *
-   *@param type    Success or failure
-   *@param err     Error number (unused)
-   */
-  public NameReply (int type, int err)
-  {
-    this.type_ = type;
-    this.errno_ = err;
-  }
-
-  /**
-   * Length accessor
-   */
-  int length() 
-  { return this.length_; }
-
-  /**
-   * Type accessor -- success or failure
-   */
-  int type()
-  { return this.type_; }
-
-  /**
-   * Error number accessor 
-   */
-  int errno()
-  { return this.errno_; }
-
-  /** 
-   * Set type
-   * @param type    New type
-   */
-  void type(int type)
-  { this.type_ = type; }
-
-  /**
-   * Set error number
-   * @param errno     New error number
-   */
-  void errno(int errno)
-  { this.errno_ = errno; }
-
-  /**
-   * Send this data to the given SOCKStream.
-   *
-   *@param sock     SOCKStream to send to
-   */
-  public void streamOutTo (JACE.SOCK_SAP.SOCKStream sock) throws IOException
-  {
-    streamOutTo (sock.dataOutputStream ());
-  }
-
-  /**
-   * Send this instance to the given DataOutputStream.
-   */
-  public void streamOutTo (DataOutputStream dos) throws IOException
-  {
-    dos.writeInt(this.length_);
-    dos.writeInt(this.type_);
-    dos.writeInt(this.errno_);
-    
-    dos.flush();
-  }
-
-  /**
-   * Send this instance to the given OutputStream.
-   */
-  public void streamOutTo (OutputStream os) throws IOException
-  {
-    BufferedOutputStream bos = new BufferedOutputStream (os);
-    DataOutputStream dos = new DataOutputStream (bos);
-
-    streamOutTo (dos);
-  }
-
-  /**
-   * Fill the fields of this instance from data in the socket
-   *
-   *@param sock     SOCKStream to read from
-   */
-  public void streamInFrom (JACE.SOCK_SAP.SOCKStream sock) throws IOException
-  {
-    this.streamInFrom(sock.dataInputStream ());
-  }
-
-  /**
-   * Fill this instance from the DataInputStream (which should be buffered).
-   *
-   *@param dis      DataInputStream to use
-   */
-  public void streamInFrom (DataInputStream dis) throws IOException
-  {
-    int length = dis.readInt();
-      
-    if (length != this.length_) 
-      throw new IOException("Incorrect NameReply length");
-      
-    type_ = dis.readInt();
-    errno_ = dis.readInt();
-  }
-
-  /**
-   * Fill this instance from the given InputStream.
-   */
-  public void streamInFrom (InputStream is) throws IOException
-  {
-    BufferedInputStream bis = new BufferedInputStream (is);
-    DataInputStream dis = new DataInputStream (bis);
-
-    streamInFrom (dis);
-  }
-
-  final static int length_ = 12;
-
-  int type_;
-  int errno_;
-}
-
-  
-  
-  
diff --git a/java/JACE/netsvcs/Naming/NameRequest.java b/java/JACE/netsvcs/Naming/NameRequest.java
deleted file mode 100644
index 706b14728c5..00000000000
--- a/java/JACE/netsvcs/Naming/NameRequest.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameRequest.java
- *
- *@see netsvcs.Naming.NameHandler
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.netsvcs.Naming;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.*;
-import JACE.SOCK_SAP.*;
-
-/**
- * Holds information including name, value, type, and request
- * type.  Used by both client and naming server as detailed in
- * NameHandler.  Compatible with the C++ ACE_Name_Request.
- *
- *@see NameHandler
- */
-public class NameRequest
-{
-  /** Bind request type */
-  public static final int BIND = 1; 
-
-  /** Rebind request type */
-  public static final int REBIND = 2; 
-
-  /** Resolve request type */
-  public static final int RESOLVE = 3; 
-
-  /** Unbind request type */
-  public static final int UNBIND  = 4; 
-
-  /** List Names request type */
-  public static final int LIST_NAMES = 5;
-
-  /** List Values request type */
-  public static final int LIST_VALUES = 13;
-
-  /** List Types request type */
-  public static final int LIST_TYPES = 21;
-
-  /** List Name Entries request type */
-  public static final int LIST_NAME_ENTRIES = 6;
-
-  /** List Value Entries request type */
-  public static final int LIST_VALUE_ENTRIES = 14;
-
-  /** List Type Entries request type */
-  public static final int LIST_TYPE_ENTRIES = 22;
-
-  /** Type used to send a final "null" request when returning
-   * a list of items */
-  public static final int MAX_ENUM = 11; 
-  /**
-   * Maximum length of a NameRequest instance.
-   * See C++ ACE Name_Request_Reply.h for the details of the
-   * value of this constant.
-   */
-  public static final int MAX_LEN = 6182;
-
-  /**
-   * Default constructor.
-   */
-  public NameRequest () 
-  {
-    this.name_ = this.value_ = this.type_ = null;
-    this.length_ = 32;
-  } 
-
-  /** 
-   * Constructor
-   *
-   * @param requestType      Type of request this is (BIND, REBIND, etc)
-   * @param name             Key to bind
-   * @param value            Value to bind
-   * @param type             Type to couple with the value
-   * @param timeout          Timer information (not really used in JACE yet)
-   */
-  public NameRequest(int requestType,
-		     String name,
-		     String value,
-		     String type,
-		     TimeValue timeout)
-  {
-    this.requestType_ = requestType;
-
-    if (timeout == null) {
-
-      this.blockForever_ = 1;
-      this.secTimeout_ = 0;
-      this.usecTimeout_ = 0;
-    } else {
-
-      this.blockForever_ = 0;
-      this.secTimeout_ = (int)timeout.sec();
-      this.usecTimeout_ = (int)timeout.getMilliTime() * 1000;
-    }
-
-    // This is necessary to make sure null pointer exceptions are
-    // avoided.  It makes it more consistent later on
-    if (name == null)
-      this.name_ = new String("");
-    else
-      this.name_ = new String(name);
-    if (value == null)
-      this.value_ = new String("");
-    else
-      this.value_ = new String(value);
-    if (type == null)
-      this.type_ = new String("");
-    else
-      this.type_ = new String(type);
-
-    // Set the length
-    this.calculateLength();
-  }
-
-  /** 
-   * Calculate the transmission length (bytes) of this structure
-   */
-  private void calculateLength()
-  {
-    // The type is sent as an 8 bit data type (chars in the C++ version),
-    // but the name and value are sent as 16 bit chars (ACE_USHORT16's in C++)
-
-    this.length_ = 34 + this.type_.length() + 2 * (this.name_.length() +
-						   this.value_.length());
-  }
-
-  /**
-   * Return the transmission length
-   */
-  public int length() 
-  { return this.length_; }
-
-  /**
-   * Return the name/key
-   */
-  public String name()
-  { return new String(this.name_); }
-
-  /**
-   * Set the name/key
-   * @param name    Name to set to
-   */
-  public void name(String name)
-  {
-    if (name == null)
-      this.name_ = new String("");
-    else
-      this.name_ = new String(name);
-
-    this.calculateLength();
-  }
-
-  /**
-   * Return the value
-   */
-  public String value()
-  { return new String(this.value_); }
-
-  /** 
-   * Set the value 
-   * @param value   New value
-   */
-  public void value(String value)
-  {
-    if (value == null)
-      this.value_ = new String("");
-    else
-      this.value_ = new String(value);
-
-    this.calculateLength();
-  }
-
-  /**
-   * Return the type
-   */
-  public String type()
-  { return new String(this.type_); }
-
-  /**
-   * Set the type
-   * @param type    New type
-   */
-  public void type(String type)
-  {
-    if (type == null)
-      this.type_ = new String("");
-    else
-      this.type_ = new String(type);
-
-    this.calculateLength();
-  }
-
-  /**
-   * Fill the fields of this instance with data from the InputStream.
-   */
-  public void streamInFrom (InputStream is) throws IOException
-  {
-    BufferedInputStream bis = new BufferedInputStream (is);
-
-    DataInputStream dis = new DataInputStream (bis);
-
-    this.streamInFrom(dis);
-  }
-
-  /**
-   * Fill the fields of this instance with data from the SOCKStream.
-   */
-  public void streamInFrom (SOCKStream sock) throws IOException
-  {
-    streamInFrom (sock.dataInputStream ());
-  }
-
-  /**
-   * Fill the fields of this instance from the given DataInputStream
-   *
-   *@param dis     DataInputStream to read from
-   */
-  public void streamInFrom (DataInputStream dis) throws IOException
-  {
-    // Read the length (32 bits)
-    length_ = dis.readInt();
-
-    if (length_ > MAX_LEN)
-      throw new IOException ("Invalid NameRequest length " + length_);
-
-    // Read the request type
-    requestType_ = dis.readInt();
-
-    // Can we block forever to fulfill this request?  (unused)
-    blockForever_ = dis.readInt();
-
-    // How long until we should time out this request?  (unused)
-    secTimeout_ = dis.readInt();
-    usecTimeout_ = dis.readInt();
-
-    // The sizes are in bytes, and there are two bytes per char
-    // (ACE_USHORT16 in C++ land)
-    int nameLen = dis.readInt() / 2;
-    int valueLen = dis.readInt() / 2;
-
-    int typeLen = dis.readInt();
-
-    // Read the name -- just read chars since they're 16 bits.
-    // Hopefully the SOCKStream has buffered the data
-    char buf[] = new char[nameLen];
-    for (int i = 0; i < nameLen; i++) {
-      buf[i] = dis.readChar();
-    }
-    this.name_ = new String(buf);
-
-    // Read the value
-    buf = new char[valueLen];
-    for (int i = 0; i < valueLen; i++)
-      buf[i] = dis.readChar();
-    this.value_ = new String(buf);
-      
-    // Read the type -- now we can use readFully since 
-    // the type was sent as 8 bit chars
-    byte tbuf[] = new byte[typeLen];
-    dis.readFully(tbuf);
-    this.type_ = new String(tbuf);
-
-    // Skip the null char at the end
-    dis.skipBytes(2);
-  }
-
-  /**
-   * Write the data of this instance to the given SOCKStream.
-   */
-  public void streamOutTo (SOCKStream sock) throws IOException
-  {
-    streamOutTo (sock.dataOutputStream ());
-  }
-
-  /**
-   * Write the data of this instance to the given OutputStream.
-   */
-  public void streamOutTo (OutputStream os) throws IOException
-  {
-    BufferedOutputStream bos = new BufferedOutputStream (os);
-    DataOutputStream dos = new DataOutputStream (bos);
-
-    streamOutTo (dos);
-  }
-  
-  /**
-   * Send this NameRequest out to the given DataOutputStream
-   */
-  public void streamOutTo (DataOutputStream dos) throws IOException
-  {
-    dos.writeInt(length_);
-    dos.writeInt(requestType_);
-    dos.writeInt(blockForever_);
-    dos.writeInt(secTimeout_);
-    dos.writeInt(usecTimeout_);
-
-    // Byte sizes are sent, and the name and value are stored as
-    // 16 bit char arrays (ACE_USHORT16 arrays in C++ version)
-    dos.writeInt(this.name_.length() * 2);
-    dos.writeInt(this.value_.length() * 2);
-    dos.writeInt(this.type_.length());
-
-    // Making sure the name_ wasn't null comes in handy
-    // in situations like this
-    dos.writeChars(this.name_);
-    dos.writeChars(this.value_);
-    dos.writeBytes(this.type_);
-
-    // Null termination
-    dos.writeChar(0);
-
-    // Send it for real
-    dos.flush();
-  }
-
-  /**
-   * Set the requestType
-   *@param type   Type to set to
-   */
-  public void requestType(int type)
-  {
-    this.requestType_ = type;
-  }
-
-  /**
-   * Get requestType
-   */
-  public int requestType()
-  {
-    return this.requestType_;
-  }
-
-  /**
-   * Can we block forever to fulfill the request? (unused)
-   */
-  public boolean blockForever()
-  {
-    return (this.blockForever_ != 0) ? true : false;
-  }
-
-  /** 
-   * Allowed timeout (unused)
-   */
-  public int secTimeout()
-  {
-    return this.secTimeout_;
-  }
-
-  int length_;
-  int requestType_;
-  int blockForever_;
-  int secTimeout_;
-  int usecTimeout_;
-
-  String name_;
-  String value_;
-  String type_;
-};
diff --git a/java/JACE/netsvcs/Naming/c.bat b/java/JACE/netsvcs/Naming/c.bat
deleted file mode 100644
index 2b540b1b051..00000000000
--- a/java/JACE/netsvcs/Naming/c.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-javac -d c:\Everett\JACE\classes *.java
diff --git a/java/JACE/netsvcs/Naming/package.html b/java/JACE/netsvcs/Naming/package.html
deleted file mode 100644
index b7ee951fc2e..00000000000
--- a/java/JACE/netsvcs/Naming/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Naming Service for associating names and values in a distributed system.
-<P>
-A simple test program for NameProxy and the naming service is in
-the tests directory under netsvcs\Naming.
-
-@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a>
-</BODY>
-</HTML>
diff --git a/java/JACE/netsvcs/Server.java b/java/JACE/netsvcs/Server.java
deleted file mode 100644
index 199a830d0c5..00000000000
--- a/java/JACE/netsvcs/Server.java
+++ /dev/null
@@ -1,356 +0,0 @@
-package JACE.netsvcs;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Misc.GetOpt;
-import JACE.ServiceConfigurator.Service;
-
-/**
- * Abstract class providing default implementations for several
- * Service methods.  Currently, all the network services
- * descend from this class.  The real work for a service is done
- * by a Handler.  
- * <P>
- * Inner classes are provided for thread per connection
- * and single threaded server activation strategies.  Currently,
- * specifying a single threaded strategy means that the server will
- * disconnect the client after handling one request.  Acceptor and
- * EventHandler may be changed later to incorporate handleInput to
- * address this.  Thus, the default activation strategy is thread
- * per connection.
- *
- *@see Handler
- *@see JACE.Connection.ActivateStrategy
- *@author Everett Anderson
- */
-public abstract class Server extends Acceptor implements Runnable
-{
-  /**
-   * Safely shuts down all the handlers as well as the accepting socket.
-   *
-   *@return -1 on failure, 0 on success
-   */
-  public synchronized int fini ()
-  {
-    if (!done ()) {
-      ACE.DEBUG ("Shutting down " + name ());
-      try {
-	this.done_ = true;
-	for (int i = handlers_.size () - 1; i >= 0; i--)
-	  ((Handler)handlers_.elementAt (i)).close ();
-
-	this.sockAcceptor_.close();
-      } catch (IOException e) {
-	ACE.ERROR(e);
-	return -1;
-      }
-    }      
-    
-    return 0;
-  }
-
-  /**
-   * Returns information about the state of the service such as
-   * suspended, not running, or running.
-   */
-  public String info ()
-  {
-    if (suspended ())
-      return "suspended";
-    else
-    if (done ())
-      return "not running";
-    else
-      return "running on port " + port_;
-  }
-  
-  /**
-   * Provided for extra initialization in subclasses after the
-   * command line arguments have been parsed but before starting the
-   * service.  This is a good place to set the default ActivateStrategy
-   * since you can make sure it wasn't set in parseArgs.  The default
-   * implementation sets the strategy to Server.ThreadPerConnection.
-   *
-   *@return -1 on error, 0 on success
-   */
-  protected int initialize ()
-  {
-    if (activateStrategy_ == null)
-      activateStrategy (new Server.ThreadPerConnection ());
-
-    return 0;
-  }
-
-  /**
-   * Template method for initialization.  Calls parseArgs, initialize,
-   * sets the done() state to false, and starts this Server in its own
-   * thread.  If parseArgs fails, this calls printUsage.
-   *
-   *@param args command line arguments
-   *@return -1 on failure, 0 on success
-   */
-  public int init (String [] args)
-  {
-    // Parse arguments
-    if (this.parseArgs (args) == -1) {
-      printUsage ();
-      return -1;
-    }
-
-    if (initialize () < 0) {
-      ACE.ERROR (name () + " failed initializing");
-      return -1;
-    }
-
-    ACE.DEBUG ("Using " + activateStrategy_.getClass().getName ());
-    ACE.DEBUG ("Starting " + name () + " on port: " + this.port_);
-
-    done_ = false;
-
-    // Run in own thread of control so that we don't block the caller
-    new Thread (this).start();
-    return 0;
-  }
-
-  /**
-   * Called by the JVM when this Server starts running in its own
-   * thread.
-   */
-  public void run ()
-  {
-    try {
-      this.open (this.port_);
-      while (!this.done ()) {
-	this.accept ();
-      }
-    } catch (InstantiationException e) {
-      ACE.ERROR (e);
-    } catch (IllegalAccessException e) {
-      ACE.ERROR (e);
-    } catch (IOException e) {
-      if (!done ())
-	ACE.ERROR (e);
-    } finally {
-      fini ();
-    }
-  }
-
-  /**
-   * Calls the appropriate activation strategy with the given
-   * service handler.  This assumes the SvcHandler is an instance
-   * of type Handler, and sets its parent accordingly.
-   *
-   *@param sh SvcHandler (assumed to be a Handler) to activate
-   *@return -1 on failure, 0 on success
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-  {
-    if (done ())
-      return -1;
-    
-    addHandler (sh);
-    ((Handler)sh).parent (this);
-
-    while (suspended () && !done ())
-      Thread.yield ();
-
-    if (activateStrategy_.activateSvcHandler (sh) != 0) {
-      removeHandler (sh);
-      return -1;
-    }
-
-    return 0;
-  }
-  
-  /**
-   * Add the given SvcHandler to this Servers list of handlers.
-   * @param sh service handler to add (assumed to be a Handler)
-   */
-  protected void addHandler (SvcHandler sh)
-  {
-    handlers_.addElement (sh);
-  }
-
-  /**
-   * Called by Handler instances during their close () method.
-   *@param sh service handler to remove
-   */
-  public void removeHandler (SvcHandler sh)
-  {
-    handlers_.removeElement (sh);
-  }
-  
-  /**
-   * Parses the command line arguments.  Subclasses must override
-   * this.
-   *
-   *@param args command line arguments
-   *@return -1 on failure, 0 on success
-   */
-  protected abstract int parseArgs (String [] args);
-
-  /**
-   * Create the appropriate Handler.  Subclasses must override this,
-   * returning a new instance of the proper subclass of Handler.
-   *
-   *@return new Handler instance
-   */
-  protected abstract SvcHandler makeSvcHandler ();
-
-  /**
-   * Print out the correct syntax and meaning of the command line
-   * arguments.
-   */
-  protected abstract void printUsage ();
-
-  /**
-   * Set the ActivateStrategy for handlers.
-   *
-   *@param strategy new ActivateStrategy to use
-   *@see JACE.Connection.ActivateStrategy
-   */
-  protected void activateStrategy (ActivateStrategy strategy)
-  {
-    activateStrategy_ = strategy;
-  }
-
-  /**
-   * Return the current ActivateStrategy for handlers.
-   *
-   *@return current ActivateStrategy instance
-   */
-  protected ActivateStrategy activateStrategy ()
-  {
-    return activateStrategy_;
-  }
-
-  /**
-   * Check to see if this Server has been shut down.
-   */
-  protected synchronized boolean done ()
-  {
-    return done_;
-  }
-
-  /**
-   * Useful method for subclasses when parsing the port command
-   * line option.  
-   *
-   *@param port String gathered from the command line representing the port
-   *@return false if there was an error, true if successful
-   */
-  protected boolean port (String port)
-  {
-    try {
-      
-      this.port_ = Integer.parseInt (port);
-
-    } catch (NumberFormatException e) {
-      ACE.ERROR("Invalid port specified: " + e.getMessage ());
-      return false;
-    } catch (ArrayIndexOutOfBoundsException e) {
-      ACE.ERROR("Port option requires an argument");
-      return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Useful method for subclasses when trying to load and instantiate
-   * a certain class from a command line argument.  This can be used
-   * when a possible command line argument is what kind of activation
-   * strategy is used for handlers.
-   *
-   *@param classname name of the class to load and create an instance of
-   *@param descrption descrption of what type of class it is
-   *@return null if failed loading, a new instance of the class on success
-   */
-  protected Object newStrategyInstance (String classname,
-					String description)
-  {
-    try {
-      Class factory = Class.forName (classname);
-
-      return factory.newInstance ();
-    
-    } catch (ClassNotFoundException e) {
-      ACE.ERROR("Unable to find " + description + ": " 
-		+ e.getMessage ());
-    } catch (InstantiationException e) {
-      ACE.ERROR ("Instantiating " + description + ": " 
-		 + e.getMessage ());
-    } catch (IllegalAccessException e) {
-      ACE.ERROR ("Illegal access on " + description + ": " 
-		 + e.getMessage ());
-    }    
-
-    return null;
-  }
-
-  /**
-   * Shuts down the Server if it wasn't already done
-   */
-  protected void finalize () throws Throwable
-  {
-    fini ();
-  }
-
-  private boolean done_ = true;
-
-  /**
-   * List of currently active Handlers
-   */
-  protected Vector handlers_ = new Vector ();
-  private ActivateStrategy activateStrategy_ = null;
-
-  /**
-   * Activation strategy in which each Handler is run in its own
-   * Thread.
-   */
-  public static class ThreadPerConnection extends ActivateStrategy
-  {
-    /**
-     * Opens the given service handler, and runs it in its own
-     * Thread.
-     *@param sh service handler to activate
-     *@return -1 on failure, 0 on success
-     */
-    public int activateSvcHandler (SvcHandler sh)
-    {
-      if (sh.open (null) < 0)
-	return -1;
-
-      new Thread (sh).start ();
-      return 0;
-    }
-  }
-
-  /**
-   * Activation strategy in which all Handlers are run in the
-   * Server Thread in sequence.  This assumes that the given
-   * SvcHandler is a Handler instance. 
-   */
-  public static class SingleThreaded extends ActivateStrategy
-  {
-    /**
-     * Opens the given service handler, calls Handler.handleRequest, and
-     * then Handler.close before returning.
-     *@param sh service handler to activate (assumed to be a Handler)
-     *@return -1 on failure, 0 on success
-     */
-    public int activateSvcHandler (SvcHandler sh)
-    {
-      if (sh.open (null) < 0)
-	return -1;
-
-      ((Handler)sh).handleRequest ();
-      ((Handler)sh).close ();
-
-      return 0;
-    }
-  }
-}
diff --git a/java/JACE/netsvcs/Time/TSClerkHandler.java b/java/JACE/netsvcs/Time/TSClerkHandler.java
deleted file mode 100644
index e0a2290d81b..00000000000
--- a/java/JACE/netsvcs/Time/TSClerkHandler.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package JACE.netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.ASX.*;
-
-/**
- * Requests a time update from a time server.  This is used by the
- * TSClerkProcessor to query a server.
- */
-public class TSClerkHandler extends SvcHandler
-{
-  /**
-   * Constructor.
-   *
-   *@param parent TSClerkProcessor which is creating this instance
-   *@param host name of the machine this handler is connected to
-   *@param port port on the time server to connect to
-   */
-  public TSClerkHandler (TSClerkProcessor parent,
-			 String host,
-			 int port)
-  {
-    parent_ = parent;
-    host_ = host;
-    port_ = port;
-  }
-
-  /**
-   * Initialize this handler.  Called automatically by Connector when a
-   * successful connection is made.
-   *
-   *@return -1 on failure, 0 on success
-   */
-  public int open (Object obj)
-  {
-    ACE.DEBUG ("Successful connection to " + host ());
-    connected (true);
-    return 0;
-  }
-
-  /**
-   * Safely shut down this handler, closing the socket.
-   *
-   *@return -1 on failure, 0 on success
-   */
-  public synchronized int close ()
-  {
-    if (!connected ())
-      return 0;
-
-    ACE.DEBUG ("Shutting down connection to " + host ());
-    try {
-      peer ().close ();
-    } catch (IOException e) {
-      return -1;
-    } finally {
-      connected (false);
-    }
-
-    return 0;
-  }
-
-  /**
-   * Accessor for the port number of the server.
-   */
-  public int port ()
-  {
-    return port_;
-  }
-
-  /**
-   * Accessor for the host name of the server.
-   */
-  public String host ()
-  {
-    return host_;
-  }
-
-  /**
-   * Check to see if this handler is currently connected to a server.
-   */
-  public synchronized boolean connected ()
-  {
-    return connected_;
-  }
-
-  /**
-   * Set the connected state.
-   *
-   *@param state true if connected, false if not
-   */
-  protected synchronized void connected (boolean state)
-  {
-    connected_ = state;
-  }
-
-  /**
-   * (Isn't used, just fulfills the interface.  Returns -1 by
-   * default)
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return -1;
-  }
-
-  /**
-   * (Isn't used, just fulfills the interface.)
-   */
-  public void run ()
-  {
-    ACE.ERROR ("TSClerkHandler is not setup to run in its own thread");
-  }
-
-  /**
-   * Sends a request to the server and waits for a reply.  This is called
-   * by TSClerkProcessor.
-   *
-   *@return -1 on failure, 0 on success
-   */
-  public int sendRequest ()
-  {
-    // Ask the clerk processor to connect this handler if it isn't
-    // already.  Thus, it tries to reconnect if the server has gone
-    // down.
-    if (!connected ()) 
-      parent_.connectHandler (this, host_, port_);
-
-    TimeRequest request = new TimeRequest ();
-
-    long start, stop;
-    try {
-
-      start = System.currentTimeMillis ();
-      request.streamOutTo (peer().outputStream ());
-      
-      request.streamInFrom (peer().inputStream ());
-      stop = System.currentTimeMillis ();
-
-    } catch (NullPointerException e) {
-      close ();
-      return -1;
-    } catch (IOException e) {
-      close ();
-      return -1;
-    }
-
-    // Compute the difference in the local time and the server time
-    // (in seconds)   
-    long difference = request.time () - (stop / 1000);
-
-    // Calculate the transmission time (in seconds)
-    long oneWayTime = (stop - start) / 2000;
-
-    difference += oneWayTime;
-
-    /*
-    ACE.DEBUG (host() + " reports:");
-    ACE.DEBUG ("    time difference: " + difference);
-    ACE.DEBUG ("    trans. delay: " + oneWayTime);
-    */
-
-    // Set the time difference for this handler
-    delta (difference);
-
-    return 0;
-  }
-
-  /**
-   * Returns the current time difference between local time and
-   * the server (in seconds).
-   */
-  public synchronized long delta ()
-  {
-    return delta_;
-  }
-
-  /**
-   * Sets the current time difference between local time and the
-   * server (in seconds).
-   */
-  protected synchronized void delta (long delta)
-  {
-    delta_ = delta;
-  }
-
-  private long delta_;
-  private TSClerkProcessor parent_;
-  private boolean connected_ = false;
-  private String host_;
-  private int port_;
-}
diff --git a/java/JACE/netsvcs/Time/TSClerkProcessor.java b/java/JACE/netsvcs/Time/TSClerkProcessor.java
deleted file mode 100644
index bec3bd417df..00000000000
--- a/java/JACE/netsvcs/Time/TSClerkProcessor.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package JACE.netsvcs.Time;
-
-import java.net.*;
-import java.io.*;
-import java.util.*;
-
-import JACE.ASX.TimeValue;
-import JACE.Connection.*;
-import JACE.OS.*;
-import JACE.Reactor.*;
-import JACE.Misc.*;
-
-/**
- * Clerk used to query a number of time servers, compute the average
- * of the time differences, and report it with a sequence number.  This
- * can be used to adjust the current local time accordingly.
- * <P>
- * <B>Valid command line arguments:</B>
- * <PRE>
- *   -h (host name:port)   Specify a time server to contact
- *   -t (time in seconds)  Specify how often to query the servers
- *                         (Defaults to five minutes)
- *   -d                    Enable debugging messages
- * </PRE>
- */
-public class TSClerkProcessor implements EventHandler, Runnable
-{
-  /**
-   * Prints out the valid command line arguments.  See the class
-   * description for more information.  
-   */
-  public void printUsage ()
-  {
-    ACE.ERROR ("Valid options:");
-    ACE.ERROR ("-h <host name>:<port>  Specify a time server to contact");
-    ACE.ERROR ("-t <time in seconds>   How often to query the servers");
-    ACE.ERROR ("-d                     Enable debugging messages");
-  }
-
-  /**
-   * Parses the command line arguments.  See the class description
-   * for more information.
-   */
-  protected int parseArgs (String args[])
-  {
-    GetOpt opt = new GetOpt (args, "h:t:d", true);
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	    // Specify a hostname:port pair to query
-	  case 'h':
-	    if (newHandler (opt.optarg ()) == -1) {
-	      printUsage ();
-	      return -1;
-	    }
-	    break;
-	    // Specify time interval to query servers
-	  case 't':
-	    int sec = Integer.parseInt (opt.optarg ());
-	    updateInterval_ = new TimeValue (sec);
-	    break;
-	  case 'd':
-	    ACE.enableDebugging ();
-	    ACE.DEBUG ("Debugging is enabled");
-	    break;
-	  default:
-	    ACE.ERROR ("Unknown argument: " + (char)c);
-	    printUsage ();
-	    return -1;
-	  }
-      }
-    return 0;
-  }
-
-  /**
-   * Safely shut down the clerk and all its handlers.
-   */
-  public synchronized void close ()
-  {
-    if (!done_) {
-      done_ = true;
-      tq_.cancelTimer (this);
-
-      for (int i = 0; i < handlerSet_.size (); i++) {
-	TSClerkHandler h = (TSClerkHandler)handlerSet_.elementAt (i);
-	
-	h.close ();
-      }
-    }
-  }
-
-  /**
-   * Called by the JVM when the clerk is run in its own thread.  If the
-   * TimerQueue provided to (or created by) this TSClerkProcessor isn't
-   * running its event loop, it will be run in this thread (by calling
-   * handleEvents ()).
-   *
-   *@see JACE.Reactor.TimerQueue
-   */
-  public void run ()
-  {
-    if (handlerSet_.size () == 0) {
-      ACE.DEBUG ("No servers are registered.  Call init first.");
-      return;
-    }
-
-    if (!tq_.eventLoopRunning ()) 
-      tq_.handleEvents ();
-  }
-
-  /**
-   * Initialize this TSClerkProcessor with command line arguments.  See
-   * the class description for more information.  This also schedules
-   * a timeout with the timer queue for when to query the servers.
-   *
-   *@return -1 on failure, 0 on success
-   */
-  public int init (String args[]) 
-  {
-    if (args.length < 2) {
-      printUsage ();
-      return -1;
-    }
-
-    if (parseArgs (args) == -1) 
-      return -1;
-
-    if (handlerSet_.size () == 0) {
-      ACE.ERROR ("No servers are registered.");
-      done_ = true;
-      return -1;
-    }
-
-    if (tq_ == null) 
-      tq_ = new TimerQueue (true);
-
-    tq_.scheduleTimer (this,
-		       "Time Service Processor",
-		       TimeValue.zero,
-		       updateInterval_);
-
-    return 0;
-  }
-
-  /**
-   * Called by TSClerkHandler instances when they need to connect
-   * (or reconnect) to a server.  This uses Connector to make the
-   * connection.
-   *
-   *@param handler TSClerkHandler to connect to the server
-   *@param host name of the service
-   *@param port port to connect to on the server
-   */
-  void connectHandler (TSClerkHandler handler,
-		       String host,
-		       int port)
-  {
-    // Don't let handlers reconnect if we are in the process of closing
-    if (done_)
-      return;
-
-    ACE.DEBUG ("Connecting handler to " + host + " on port " + port);
-    try {
-
-      Connector c = new Connector ();
-      c.open (host, port);
-      c.connect (handler);
-
-    } catch (UnknownHostException e) {
-      synchronized (this) {
-	handlerSet_.removeElement (handler);
-      }
-      ACE.ERROR (e);
-    } catch (SocketException e) {
-      ACE.ERROR (e);
-    } catch (InstantiationException e) {
-      ACE.ERROR (e);
-    } catch (IllegalAccessException e) {
-      ACE.ERROR (e);
-    } catch (IOException e) {
-      ACE.ERROR (e);
-    }
-  }
-
-  /**
-   * Create a new TSClerkHandler for the given (host name):(port)
-   * combination.  See the class description for more information about
-   * providing a host names and ports on the command line.
-   *
-   *@param hostAndPort String with the host name and port separated by
-   *                   a colon.
-   *@return -1 on failure, 0 on success
-   */
-  protected int newHandler (String hostAndPort)
-  {
-    int colon = hostAndPort.lastIndexOf (':');
-
-    if (colon < 1) {
-      ACE.ERROR ("Invalid -h <host>:<port> parameter: " + hostAndPort);
-      return -1;
-    }
-
-    int port = Integer.parseInt (hostAndPort.substring (colon + 1));
-    String host = hostAndPort.substring (0, colon);
-
-    ACE.DEBUG ("New handler for server " + host + " on port " + port);
-
-    TSClerkHandler handler = new TSClerkHandler (this, host, port);
-    handlerSet_.addElement (handler);
-
-    return 0;
-  }
-
-  /**
-   * Have each TSClerkHandler query its time server, average the results,
-   * and set the timeStatus accordingly.  This is called by the
-   * TimerQueue when appropriate.  The interval can be specified on the
-   * command line.
-   */
-  public synchronized int handleTimeout (TimeValue tv, Object obj)
-  {
-    if (done_)
-      return -1;
-
-    // Increment the sequence number
-    int sequenceNumber = status_.sequenceNumber () + 1;
-    Enumeration handlers = handlerSet_.elements ();
-
-    long total = 0;
-    int count = 0;
-
-    // Use each handler to query its server, collecting the time
-    // difference information.
-    while (handlers.hasMoreElements ()) {
-      TSClerkHandler h = (TSClerkHandler)handlers.nextElement ();
-
-      if (h.sendRequest () < 0)
-	continue;
-
-      total += h.delta ();
-      count++;
-    }
-
-    if (count == 0) {
-      ACE.ERROR ("Could not reach any time servers, will keep trying.");      
-      return 0;
-    }
-
-    timeStatus (new TimeInfo (sequenceNumber, total / count));
-
-    ACE.DEBUG ("Status: " + timeStatus ());
-
-    return 0;
-  }
-
-  /**
-   * Return the current sequence number and time difference pair.
-   */
-  public synchronized TimeInfo timeStatus ()
-  {
-    return status_;
-  }
-
-  /**
-   * Set the current sequence number and time difference pair.
-   */
-  protected synchronized void timeStatus (TimeInfo status)
-  {
-    status_ = status;
-  }
-
-  /**
-   * Default constructor.  Results in this TSClerkProcessor creating
-   * a new timer queue which runs in its own thread.  Thus, this
-   * TSClerkProcessor runs in its own thread.
-   */
-  public TSClerkProcessor ()
-  {
-    // Effectively runs in its own thread because of the timer queue
-  }
-
-  /**
-   * Constructor allowing the timer queue to be specified.  If the timer
-   * queue isn't already running, the caller is responsible for calling
-   * handleEvents to start the clerk.  Be careful since the querying
-   * process for the servers may take a while.
-   *
-   *@param queue TimerQueue to register with
-   */
-  public TSClerkProcessor (TimerQueue queue)
-  {
-    tq_ = queue;
-  }
-
-  private boolean done_ = false;
-
-  // List of the TSClerkHandlers this uses to maintain its
-  // server connections.
-  private Vector handlerSet_ = new Vector ();
-  private TimerQueue tq_ = null;
-
-  // Default is every five minutes
-  private TimeValue updateInterval_ = new TimeValue (300, 0);
-
-  TimeInfo status_ = new TimeInfo ();
-}
diff --git a/java/JACE/netsvcs/Time/TSServerAcceptor.java b/java/JACE/netsvcs/Time/TSServerAcceptor.java
deleted file mode 100644
index 7e8b9476c19..00000000000
--- a/java/JACE/netsvcs/Time/TSServerAcceptor.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package JACE.netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.TimeValue;
-import JACE.Concurrency.ThreadManager;
-import JACE.netsvcs.Server;
-
-/**
- * Server for the time service.  Creates TSServerHandlers as necessary
- * to handle the requests.
- * <P>
- * <B>Valid command line arguments:</B>
- * <PRE>
- *    -p (port)        Port to listen on for clients");
- *    -d               Enable debugging messages");
- *    -a (class name)  Specify ActivateStrategy");
- *                     (Default is multi-threaded");
- * </PRE>
- *
- */
-public class TSServerAcceptor extends Server
-{
-  public TSServerAcceptor ()
-  {
-    // Set the name in case we're not using the service configurator
-    name ("Time Service");
-  }
-
-  /**
-   * Simple main program for running the logging service without the
-   * service configurator.
-   *
-   *@param args command line arguments
-   */
-  public static void main (String [] args)
-  {
-    // Simple main program to get things rolling
-    TSServerAcceptor ta = new TSServerAcceptor();
-
-    ta.init (args);
-  }
-
-  /**
-   * Creates a new TSServerHandler instance.
-   */  
-  protected SvcHandler makeSvcHandler ()
-  {
-    return new TSServerHandler ();
-  }
-  
-  /**
-   * Prints out the valid command line arguments.  See the class
-   * description for more information.  Called by Server.init when
-   * parseArgs returns -1.
-   */
-  protected void printUsage ()
-  {
-    ACE.ERROR ("Valid options:\n");
-    ACE.ERROR ("-p <port>        Port to listen on for clients");
-    ACE.ERROR ("-d               Enable debugging messages");
-    ACE.ERROR ("-a <class name>  Specify ActivateStrategy");
-    ACE.ERROR ("                 (Default is multi-threaded");
-  }
-
-  /**
-   * Parses the command line arguments.  See the class description
-   * for more information.
-   *
-   *@param args command line arguments
-   *@return -1 on failure, 0 on success
-   */
-  protected int parseArgs (String [] args) 
-  {
-    int c = 0;
-    GetOpt opt = new GetOpt(args, "p:da:", true);
-    
-    try {
-
-      while ((c = opt.next ()) != -1) {
-	switch (c) 
-	  {
-	  case 'd':
-	    ACE.enableDebugging ();
-	    ACE.DEBUG ("Debugging is enabled");
-	    break;
-	  case 'p':
-	    if (!port (opt.optarg ()))
-	      return -1;
-	    break;
-	  case 'a':
-	    Object strategy = newStrategyInstance (opt.optarg (),
-						   "ActivateStrategy");
-	    if (strategy == null)
-	      return -1;
-	    
-	    activateStrategy ((ActivateStrategy) strategy);
-	    break;
-	  default:
-	    ACE.ERROR("Unknown argument: " + (char)c);
-	    return -1;
-	  }
-      }
-    } catch (ArrayIndexOutOfBoundsException e) {
-      ACE.ERROR ("Option -" + (char)c + " requires an argument");
-      return -1;
-    }
-
-    return 0;
-  }
-}
diff --git a/java/JACE/netsvcs/Time/TSServerHandler.java b/java/JACE/netsvcs/Time/TSServerHandler.java
deleted file mode 100644
index 69bf4239280..00000000000
--- a/java/JACE/netsvcs/Time/TSServerHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package JACE.netsvcs.Time;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.SOCK_SAP.*;
-import JACE.netsvcs.Handler;
-
-/**
- * Created by TSServerAcceptor to handle time update requests.  Currently,
- * this simply sends back the current time (in seconds).
- *
- * @see JACE.netsvcs.Logger.ServerLoggingAcceptor
- */
-public class TSServerHandler extends Handler
-{
-  /**
-   * Reads in the given TimeRequest request and calls dispatch.
-   *
-   *@param request TimeRequest instance to use
-   */
-  public void processRequest (Object requestObject)
-    throws SocketException, EOFException, IOException
-  {
-    TimeRequest request = (TimeRequest)requestObject;
-
-    request.streamInFrom (peer ().dataInputStream ());
-
-    this.dispatch (request);
-  }
-
-  /**
-   * Sets the time value of the request to be the local time (in sec)
-   * and sends it back to the client.
-   */
-  void dispatch(TimeRequest request) throws IOException
-  {
-    request.time ((int)(System.currentTimeMillis () / 1000));
-
-    request.streamOutTo (peer().outputStream ());
-  }
-
-  /**
-   * Creates a new instance of TimeRequest.
-   */
-  public Object newRequest ()
-  {
-    return new TimeRequest ();
-  }
-}
diff --git a/java/JACE/netsvcs/Time/TimeInfo.java b/java/JACE/netsvcs/Time/TimeInfo.java
deleted file mode 100644
index 4ebfc793adb..00000000000
--- a/java/JACE/netsvcs/Time/TimeInfo.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package JACE.netsvcs.Time;
-
-/**
- * Wrapper for use with the clerk, containing a sequence number and
- * time offset pair.
- */
-public class TimeInfo
-{
-  /**
-   * Default constructor.
-   */
-  public TimeInfo ()
-  {
-    this (0, 0);
-  }
-
-  /** 
-   * Constructor.
-   *
-   *@param seqNum sequence number
-   *@param delta time offset in seconds
-   */
-  public TimeInfo (int seqNum, long delta)
-  {
-    sequenceNumber_ = seqNum;
-    delta_ = delta;
-  }
-
-  /** 
-   * Returns this TimeInfo's sequence number.
-   */
-  public int sequenceNumber ()
-  {
-    return sequenceNumber_;
-  }
-
-  /** 
-   * Sets this TimeInfo's sequence number.
-   */
-  public void sequenceNumber (int num)
-  {
-    sequenceNumber_ = num;
-  }
-
-  /**
-   * Returns the time offset represented by this TimeInfo instance. 
-   * (in sec)
-   */
-  public long delta ()
-  {
-    return delta_;
-  }
-
-  /**
-   * Sets the time offset (in sec).
-   */
-  public void delta (long num)
-  {
-    delta_ = num;
-  }
-
-  /**
-   * Returns an informative String about the time difference represented
-   * by this TimeInfo instance.  The sequence number is included in
-   * brackets.
-   * <P>
-   * Example:
-   * <PRE>
-   * Local time is 3 sec slower [57]
-   * </PRE>
-   */
-  public String toString ()
-  {
-    String result = "Local time is ";
-    if (delta_ > 0) {
-      result += (delta_ + " sec slower");
-    } else
-    if (delta_ < 0) {
-      result += (delta_ + " sec faster");
-    } else
-      result += "the same as the average";
-
-    result += " [" + sequenceNumber_ + "]";
-
-    return result;
-  }
-
-  private long delta_;
-  private int sequenceNumber_;
-}
diff --git a/java/JACE/netsvcs/Time/TimeRequest.java b/java/JACE/netsvcs/Time/TimeRequest.java
deleted file mode 100644
index 1b0e691398a..00000000000
--- a/java/JACE/netsvcs/Time/TimeRequest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package JACE.netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-
-/**
- * Request for a time update (and its reply).  This is compatible with 
- * C++ ACE_Time_Request.  Currently, the Java version always specifies to
- * block forever for requests.
- */
-public class TimeRequest
-{
-  /**
-   * Type for requesting updates.
-   */
-  public static int TIME_UPDATE = 01;
-
-  /**
-   * Default constructor, specifies block forever for an update.
-   */
-  public TimeRequest ()
-  {
-    messageType_ = TIME_UPDATE;
-    blockForever_ = 1;
-  }
-
-  /**
-   * Constructor specifying the type of request, the current
-   * time, and to block forever.
-   */
-  public TimeRequest (int messageType,
-		      int timeSec)
-  {
-    time_ = timeSec;
-    messageType_ = messageType;
-    blockForever_ = 1;
-  }
-
-  /**
-   * Dump all class information to a String.
-   */
-  public String toString ()
-  {
-    return "TimeRequest (" + messageType_ +
-      ", " + blockForever_ + ", " + secTimeout_ + ", " +
-      usecTimeout_ + ", " + time_ + ")";
-  }
-
-  /**
-   * Read the TimeRequest in from a given InputStream.
-   */
-  public void streamInFrom (InputStream is) 
-    throws IOException, EOFException
-  {
-    BufferedInputStream bis = new BufferedInputStream (is, 25);
-    DataInputStream dis = new DataInputStream (bis);
-
-    streamInFrom (dis);
-  }
-
-  /**
-   * Read the TimeRequest in from a given DataInputStream.
-   */
-  public void streamInFrom (DataInputStream dis)
-    throws IOException, EOFException
-  {
-    messageType_ = dis.readInt ();
-    blockForever_ = dis.readInt ();
-    secTimeout_ = dis.readInt ();
-    usecTimeout_ = dis.readInt ();
-    time_ = dis.readInt ();
-  }
-
-  /**
-   * Write this TimeRequest out to a given OutputStream.
-   */
-  public void streamOutTo (OutputStream os)
-    throws IOException
-  {
-    BufferedOutputStream bos = new BufferedOutputStream (os, 25);
-    DataOutputStream dos = new DataOutputStream (bos);
-
-    streamOutTo (dos);
-  }
-
-  /** 
-   * Write this TimeRequest out to a given DataOutputStream.
-   */
-  public void streamOutTo (DataOutputStream dos) throws IOException
-  {
-    dos.writeInt (messageType_);
-    dos.writeInt (blockForever_);
-    dos.writeInt (secTimeout_);
-    dos.writeInt (usecTimeout_);
-    dos.writeInt (time_);
-
-    dos.flush ();
-  }
-
-  /**
-   * Return the time value in seconds.
-   */
-  public int time ()
-  {
-    return time_;
-  }
-
-  /**
-   * Set the time value in seconds.
-   */
-  public void time (int value)
-  {
-    time_ = value;
-  }
-
-  private int messageType_;
-  private int blockForever_;
-  private int secTimeout_;
-  private int usecTimeout_;
-  private int time_;
-}
diff --git a/java/JACE/netsvcs/Time/c.bat b/java/JACE/netsvcs/Time/c.bat
deleted file mode 100644
index 5e9e99f5807..00000000000
--- a/java/JACE/netsvcs/Time/c.bat
+++ /dev/null
@@ -1 +0,0 @@
-javac -d C:\Everett\JACE\classes *.java
diff --git a/java/JACE/netsvcs/Time/package.html b/java/JACE/netsvcs/Time/package.html
deleted file mode 100644
index 96fff45b643..00000000000
--- a/java/JACE/netsvcs/Time/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Time Service for synchronizing clocks of collaborating network computers.
-<P>
-A simple test client is available under the tests directory in netsvcs\Time.
-
-@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a>
-</BODY>
-</HTML>
diff --git a/java/JACE/netsvcs/Time/r.bat b/java/JACE/netsvcs/Time/r.bat
deleted file mode 100644
index 7c89fbddd77..00000000000
--- a/java/JACE/netsvcs/Time/r.bat
+++ /dev/null
@@ -1 +0,0 @@
-java JACE.netsvcs.Time.%1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/java/JACE/netsvcs/Token/LockHandler.java b/java/JACE/netsvcs/Token/LockHandler.java
deleted file mode 100644
index 8e3612efb42..00000000000
--- a/java/JACE/netsvcs/Token/LockHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package JACE.netsvcs.Token;
-
-/**
- * Defines a handler for a certain type of lock.  This allows new types
- * of synchronization mechanisms to be added to the Token service without
- * any modification of existing code.   Implementing class instances that
- * are registered (via the command line or another way)
- * with the token service can be created as requests for that type of
- * lock come into the service.
- *
- *@see LockHandlerAdapter
- *@see MutexHandler
- *@author Everett Anderson
- */
-public interface LockHandler
-{
-  /**
-   * Process a given TokenRequest and construct the appropriate
-   * reply.  The request has already been read from the connection,
-   * and the reply will be sent without the LockHandler having to
-   * worry about the details.
-   *
-   *@param caller TokenRequestHandler which is accessing this LockHandler
-   *@param request request read from the connection
-   *@return appropriate TokenReply (success, failure, etc)
-   */
-  TokenReply handleRequest(TokenRequestHandler caller,
-			   TokenRequest request);
-
-  /**
-   * Release any claim the client represented with the given ID
-   * has on this handler's lock.  This is used when a client
-   * disconnects.
-   *
-   *@param clientID ID of the client whose claims to abandon
-   */
-  void abandonLock (String clientID);
-}
diff --git a/java/JACE/netsvcs/Token/LockHandlerAdapter.java b/java/JACE/netsvcs/Token/LockHandlerAdapter.java
deleted file mode 100644
index e240000161c..00000000000
--- a/java/JACE/netsvcs/Token/LockHandlerAdapter.java
+++ /dev/null
@@ -1,380 +0,0 @@
-package JACE.netsvcs.Token;
-
-import java.util.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-/**
- * LockHandler implementation for any AbstractLock.
- * <P>
- * Provides the dispatching to appropriate methods on an AbstractLock
- * as requests come in.
- */
-public class LockHandlerAdapter implements LockHandler
-{
-  /**
-   * Constructor taking an AbstractLock to use as the locking
-   * mechanism the requests work on.
-   */
-  public LockHandlerAdapter (AbstractLock lock)
-  {
-    lock_ = lock;
-  }
-
-  /**
-   * Default constructor.
-   */
-  public LockHandlerAdapter ()
-  {
-    lock_ = null;
-  }
-
-  /**
-   * Dispatch the request according to its type, calling the
-   * appropriate methods on the AbstractLock member.
-   *
-   *@param caller TokenRequestHandler which called handleRequest (unused)
-   *@param request request to process
-   *@return appropriate reply to send to the client
-   */
-  public TokenReply handleRequest (TokenRequestHandler caller,
-				   TokenRequest request)
-  {
-    String client = request.clientID ();
-    String token = request.tokenName ();
-    TokenReply result = null;
-
-    // Dispatch according to operation type
-    switch (request.operationType ())
-      {
-      case LockOperations.ACQUIRE:
-	ACE.DEBUG (client + " begins ACQUIRE for " + token);
-	result = acquireDispatcher (request);
-	break;
-      case LockOperations.RELEASE:
-	ACE.DEBUG (client + " begins RELEASE for " + token);
-	result = release (request);
-	break;
-      case LockOperations.RENEW:
-	ACE.DEBUG (client + " begins RENEW for " + token);
-	result = renew (request);
-	break;
-      case LockOperations.REMOVE:
-	ACE.DEBUG (client + " begins REMOVE for " + token);
-	result = remove (request);
-	break;
-      case LockOperations.TRY_ACQUIRE:
-	ACE.DEBUG (client + " begins TRY_ACQUIRE for " + token);
-	result = tryAcquireDispatcher (request);
-	break;
-      default:
-	ACE.ERROR ("Unknown operation: " + request.operationType ());
-	break;
-      }
-
-    ACE.DEBUG (client + " result: " + result);
-
-    return result;
-  }
-  
-  /**
-   * Create a TimeValue from the given request's timeout information.  Note
-   * that the time in the request is an absolute time timeout.
-   *
-   *@param request request to obtain the timeout info from
-   *@return null if useTimeout is false, otherwise a TimeValue
-   *        representing the appropriate time period
-   */
-  protected TimeValue getTimeout (TokenRequest request)
-  {
-    if (request.useTimeout ()) 
-      return new TimeValue (request.sec (),
-			    request.usec () * 1000);
-    else
-      return null;
-  }
-
-  /**
-   * Call acquireWrite on the lock, returning its return value.
-   *
-   *@see AbstractLock#acquireWrite
-   *@return value from the lock's operation
-   */
-  protected int acquireWrite (TokenRequest request, TimeValue timeout)
-    throws LockException, TimeoutException, InterruptedException
-  {
-    int result;
-
-    if (timeout != null)
-      result = lock_.acquireWrite (timeout);
-    else
-      result = lock_.acquireWrite ();
-    
-    return result;
-  }
-
-  /**
-   * Call acquireRead on the lock, returning its return value.
-   *
-   *@see AbstractLock#acquireRead
-   *@return value from the lock's operation
-   */
-  protected int acquireRead (TokenRequest request, TimeValue timeout)
-    throws LockException, TimeoutException, InterruptedException
-  {
-    int result;
-
-    if (timeout != null)
-      result = lock_.acquireRead (timeout);
-    else
-      result = lock_.acquireRead ();
-
-    return result;
-  }
-
-  /**
-   * Call acquire on the lock, returning its return value.
-   *
-   *@see AbstractLock#acquire
-   *@return value from the lock's operation
-   */
-  protected int acquire (TokenRequest request, TimeValue timeout)
-    throws LockException, TimeoutException, InterruptedException
-  {
-    int result;
-
-    if (timeout != null)
-      result = lock_.acquire (timeout);
-    else
-      result = lock_.acquire ();
-
-    return result;
-  }
-
-  /**
-   * Dispatch to the appropriate acquire method.  In C++ ACE, when
-   * the type is LockTypes.RWLOCK and the proxy type is
-   * LockTypes.WRITE_LOCK_PROXY, then this calls acquireWrite.
-   * If it's RWLOCK and the proxy is READ_LOCK_PROXY, it calls
-   * acquireRead.  In the normal case, it just calls acquire.
-   *
-   *@return reply to be sent back to the client (values for errno
-   *        include constants in TokenReply such as EFAULT, ETIME,
-   *        EINTR, or NO_ERRORS)
-   */
-  protected TokenReply acquireDispatcher (TokenRequest request)
-  {
-    int result;
-    TimeValue timeout = getTimeout (request);
-    
-    try {
-
-      /*
-	ACE specifies that when requesting a reader lock, the
-	token type will be RWLOCK and the proxy type is 0.
-	When it's a writer lock, the proxy type is 1.
-      */
-      if (request.tokenType () == LockTypes.RWLOCK) {
-	if (request.proxyType () == LockTypes.READ_LOCK_PROXY)
-	  result = acquireRead (request, timeout);
-	else
-	  result = acquireWrite (request, timeout);
-      } else
-	result = acquire (request, timeout);
-  
-    } catch (LockException e) {
-      return new TokenReply (TokenReply.EFAULT,
-			     request.arg ());
-    } catch (TimeoutException e) {
-      return new TokenReply (TokenReply.ETIME,
-			     request.arg ());
-    } catch (InterruptedException e) {
-      return new TokenReply (TokenReply.EINTR,
-			     request.arg ());
-    }
-    
-    if (result == AbstractLock.FAILURE) {
-      return new TokenReply (TokenReply.EFAULT,
-			     request.arg ());
-    } else {
-      return new TokenReply (TokenReply.NO_ERRORS, 
-			     request.arg ());
-    }
-  }
-
-  /**
-   * Process a release request and construct a reply.  The values
-   * for errno include TokenReply constants EFAULT, EACCES, or
-   * NO_ERRORS.
-   */
-  protected TokenReply release (TokenRequest request)
-  {
-    int result;
-
-    try {
-      result = lock_.release ();
-    } catch (LockException e) {
-      return new TokenReply (TokenReply.EFAULT,
-			     request.arg ());
-    }
-
-    if (result == AbstractLock.FAILURE) {
-      return new TokenReply (TokenReply.EACCES,
-			     request.arg ());
-    } else {
-      return new TokenReply (TokenReply.NO_ERRORS,
-			     request.arg ());
-    }
-  }
-
-  /**
-   * Process a renew request and construct a reply.  The values for
-   * errno include TokenReply constants EFAULT, ETIME, EINTR, EACCES,
-   * or NO_ERRORS.
-   */
-  protected TokenReply renew (TokenRequest request)
-  {
-    int result = AbstractLock.FAILURE;
-    TimeValue timeout = getTimeout (request);
-
-    try {
-
-      if (timeout != null) {
-	result = lock_.renew (request.requeuePosition (),
-			     timeout);
-      } else {
-	result = lock_.renew (request.requeuePosition ());
-      }
-
-    } catch (LockException e) {
-      return new TokenReply (TokenReply.EFAULT,
-			     request.arg ());
-    } catch (TimeoutException e) {
-      return new TokenReply (TokenReply.ETIME,
-			     request.arg ());
-    } catch (InterruptedException e) {
-      return new TokenReply (TokenReply.EINTR,
-			     request.arg ());
-    }
-
-    if (result == AbstractLock.FAILURE) {
-      return new TokenReply (TokenReply.EACCES,
-			     request.arg ());
-    } else {
-      return new TokenReply (TokenReply.NO_ERRORS, 
-			     request.arg ());
-    }
-  }
-
-  /**
-   * Process a remove request and construct a reply.  This currently
-   * is not supported in the normal AbstractLock interface, so the
-   * default implementation returns a reply with errno set to
-   * TokenReply.ENOTSUP.
-   */
-  protected TokenReply remove (TokenRequest request)
-  {
-    ACE.ERROR ("Remove is unimplemented");
-    return new TokenReply (TokenReply.ENOTSUP,
-			   request.arg ());
-  }
-
-  /**
-   * Call tryAcquireWrite on the lock, returning the result.
-   */
-  protected int tryAcquireWrite (TokenRequest request)
-    throws LockException
-  {
-    return lock_.tryAcquireWrite ();
-  }
-
-  /**
-   * Call tryAcquireRead on the lock, returning the result.
-   */
-  protected int tryAcquireRead (TokenRequest request)
-    throws LockException
-  {
-    return lock_.tryAcquireRead ();
-  }
-
-  /**
-   * Call tryAcquire on the lock, returning the result.
-   */
-  protected int tryAcquire (TokenRequest request) throws LockException
-  {
-    return lock_.tryAcquire ();
-  }
-
-  /**
-   * Dispatch to the appropriate tryAcquire method.  In C++ ACE, when
-   * the type is LockTypes.RWLOCK and the proxy type is
-   * LockTypes.WRITE_LOCK_PROXY, then this calls acquireWrite.
-   * If it's RWLOCK and the proxy is READ_LOCK_PROXY, it calls
-   * acquireRead.  In the normal case, it just calls acquire.
-   *
-   *@return reply to be sent back to the client (values for errno
-   *        include constants in TokenReply such as EFAULT, 
-   *        EWOULDBLOCK, or NO_ERRORS).
-   */
-  protected TokenReply tryAcquireDispatcher (TokenRequest request)
-  {
-    int result;
-
-    try {
-
-      /*
-	ACE specifies that when requesting a reader lock, the
-	token type will be RWLOCK and the proxy type is 0.
-	When it's a writer lock, the proxy type is 1.
-      */
-      if (request.tokenType () == LockTypes.RWLOCK) {
-	if (request.proxyType () == LockTypes.READ_LOCK_PROXY)
-	  result = tryAcquireRead (request);
-	else
-	  result = tryAcquireWrite (request);
-      } else
-	result = tryAcquire (request);
-  
-    } catch (LockException e) {
-      return new TokenReply (TokenReply.EFAULT,
-			     request.arg ());
-    }
-
-    if (result == AbstractLock.FAILURE) {
-      return new TokenReply (TokenReply.EWOULDBLOCK,
-			     request.arg ());
-    } else {
-      return new TokenReply (TokenReply.NO_ERRORS, 
-			     request.arg ());
-    }
-  }
-
-  /**
-   * Abandon any claim the specified client has on the lock.
-   *
-   *@param clientID identification of the client
-   */
-  public void abandonLock (String clientID)
-  {
-    ACE.DEBUG (clientID + " abandoning lock");
-    try {
-      int nesting_level = 0;
-      while (lock_.release () != AbstractLock.FAILURE) 
-	{
-	  nesting_level++;
-	  // Loop until not the owner in case the lock
-	  // supports nested acquires
-	}
-      if (nesting_level == 0) 
-	ACE.DEBUG (clientID + " was not the owner");
-      else
-	ACE.DEBUG (clientID + " had " + nesting_level + " locks");
-    } catch (LockException e) {
-      ACE.ERROR ("While abandoning lock: " + e.getMessage ());
-      // Don't need to send a reply to the client
-    }
-  }
-
-  protected AbstractLock lock_;
-}
diff --git a/java/JACE/netsvcs/Token/LockOperations.java b/java/JACE/netsvcs/Token/LockOperations.java
deleted file mode 100644
index f5dfa5bc486..00000000000
--- a/java/JACE/netsvcs/Token/LockOperations.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package JACE.netsvcs.Token;
-
-/**
- * Constants defining the operation types available on a lock.  
- * For information on specifying a read/write style lock, see LockTypes.
- *
- *@see LockTypes
- */
-public interface LockOperations
-{
-  int ACQUIRE = 0;
-  int RELEASE = 1;
-  int RENEW = 2;
-  int REMOVE = 3;
-  int TRY_ACQUIRE = 4;
-}
diff --git a/java/JACE/netsvcs/Token/LockTypes.java b/java/JACE/netsvcs/Token/LockTypes.java
deleted file mode 100644
index f377529367a..00000000000
--- a/java/JACE/netsvcs/Token/LockTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package JACE.netsvcs.Token;
-
-/**
- * Constants related to the default lock and proxy types.  New types
- * of LockHandlers and lock types can be created and registered with
- * the token service on the command line without modifying this.
- * <P>
- * C++ ACE handles RWLOCK in this way:
- * When a request comes through for a RWLOCK, the proxy type is
- * 0 for a read lock request and 1 for a write lock request.
- */
-public interface LockTypes
-{
-  int MUTEX = 0;
-  int RWLOCK = 1;
-  
-  int READ_LOCK_PROXY = 0;
-  int WRITE_LOCK_PROXY = 1;
-}
diff --git a/java/JACE/netsvcs/Token/MutexHandler.java b/java/JACE/netsvcs/Token/MutexHandler.java
deleted file mode 100644
index 82f79fe5a76..00000000000
--- a/java/JACE/netsvcs/Token/MutexHandler.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package JACE.netsvcs.Token;
-
-import JACE.Concurrency.*;
-
-/**
- * LockHandler implementation for a mutex lock.  
- * <P>
- * Currently, this uses JACE.Concurrency.Token as the actual lock since
- * it supports nested acquires.
- *
- *@see LockHandler
- */
-public class MutexHandler extends LockHandlerAdapter
-{
-  // Uses token since it supports nested acquires.
-  static class ExtendedMutex extends Token
-  {
-    // This is so that we don't make any assumptions about previous
-    // implementations of LockAdapter, and enable owner checking with
-    // the client ID from TokenRequest.  The thread name is set in
-    // handleRequest.
-    protected Object accessorID ()
-    {
-      return Thread.currentThread().getName();
-    }
-  }
-
-  /**
-   * Default constructor.
-   */
-  public MutexHandler ()
-  {
-    super (new ExtendedMutex ());
-  }
-
-  public TokenReply handleRequest (TokenRequestHandler caller,
-				   TokenRequest request)
-  {
-    Thread.currentThread().setName (request.clientID ());
-    
-    return super.handleRequest (caller, request);
-  }
-
-  public void abandonLock (String clientID)
-  {
-    Thread.currentThread().setName (clientID);
-
-    super.abandonLock (clientID);
-  }
-}
-
diff --git a/java/JACE/netsvcs/Token/RWMutexHandler.java b/java/JACE/netsvcs/Token/RWMutexHandler.java
deleted file mode 100644
index 89dc679dd8d..00000000000
--- a/java/JACE/netsvcs/Token/RWMutexHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package JACE.netsvcs.Token;
-
-import JACE.Concurrency.*;
-
-/**
- * LockHandler implementation for a reader/writer mutex lock.  
- * <P>
- * Since it uses RWMutex as the actual lock, it doesn't support
- * nested acquires.
- *
- *@see LockHandler
- */
-public class RWMutexHandler extends LockHandlerAdapter
-{
-  static class ExtendedRWMutex extends RWMutex
-  {
-    // This is so that we don't make any assumptions about previous
-    // implementations of LockAdapter, and enable owner checking with
-    // the client ID from TokenRequest.  The thread name is set in
-    // handleRequest.
-    protected Object accessorID ()
-    {
-      return Thread.currentThread().getName();
-    }
-  }
-
-  /**
-   * Default constructor.
-   */
-  public RWMutexHandler ()
-  {
-    super (new ExtendedRWMutex ());
-  }
-
-  public TokenReply handleRequest (TokenRequestHandler caller,
-				   TokenRequest request)
-  {
-    // Set the name of this thread to the client ID to perform
-    // proper owner checking.
-    Thread.currentThread().setName (request.clientID ());
-    
-    // process the request
-    return super.handleRequest (caller, request);
-  }
-
-  public void abandonLock (String clientID)
-  {
-    // Set the name of this thread to the client ID to perform
-    // proper owner checking.
-    Thread.currentThread().setName (clientID);
-
-    super.abandonLock (clientID);
-  }
-}
diff --git a/java/JACE/netsvcs/Token/RemoteLock.java b/java/JACE/netsvcs/Token/RemoteLock.java
deleted file mode 100644
index 824e05a31f0..00000000000
--- a/java/JACE/netsvcs/Token/RemoteLock.java
+++ /dev/null
@@ -1,543 +0,0 @@
-package JACE.netsvcs.Token;
-
-import java.io.*;
-import JACE.Concurrency.*;
-import JACE.ASX.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-
-/**
- * Proxy used by clients to connect to the token service.  This 
- * implements the AbstractLock interface, so can be used like any
- * other synchronization mechanism.  The user can either use this
- * class directly, or use a proxy which already inputs its type.
- * <P>
- * Currently, a separate instance (and thus a separate socket connection)
- * must be used for each thread which accesses the service.  The token
- * service itself could handle multiple client IDs and token names per
- * connection with the following requirement -- since the service blocks
- * in its operations, a shadow mutex would have to be used in the proxy.
- * <P>
- * It would be best if the user called the close () method after finishing
- * up with a RemoteLock, but that is not absolutely necessary.  The socket
- * will be closed when the JVM exits or finalize is called.  (That will also
- * free the actual token in the token service in case release was never
- * called.)
- * <P>
- * The SLEEPHOOK result is never returned, only SUCCESS or FAILURE.  (C++
- * version doesn't seem to indicate the sleep hook result.)
- *
- *@see MutexHandler
- *@see RWMutexHandler
- *@see JACE.Concurrency.AbstractLock
- *
- *@author Everett Anderson
- */
-public class RemoteLock extends SvcHandler implements AbstractLock
-{
-  /**
-   * Accessor for the token name. 
-   *
-   *@return name of the token
-   */
-  public String tokenName ()
-  {
-    return request_.tokenName ();
-  }
-
-  /**
-   * Set the name of the token.
-   */
-  public void tokenName (String name)
-  {
-    request_.tokenName (name);
-  }
-
-  /**
-   * Accessor for the client ID.
-   */
-  public String clientID ()
-  {
-    return request_.clientID ();
-  }
-
-  /**
-   * Set the client ID.
-   */
-  public void clientID (String clientID)
-  {
-    request_.clientID (clientID);
-  }
-
-  /**
-   * Constructor.
-   *
-   *@see LockTypes
-   *@param tokenType  type of token to create in the token service
-   *@param proxyType  type of proxy to define this RemoteLock as
-   *@param tokenName  name of the token to connect to in the token service
-   *@param clientID   clientID to use to refer to this client
-   *@param host       host name of the token service
-   *@param port       port to connect to for the token service
-   */
-  public RemoteLock (int tokenType,
-		     int proxyType,
-		     String tokenName,
-		     String clientID,
-		     String host,
-		     int port)
-  {
-    host_ = host;
-    port_ = port;
-
-    // Only allocates one reply and one request
-    reply_ = new TokenReply ();
-
-    request_ = new TokenRequest (tokenType,
-				 proxyType,
-				 0,
-				 tokenName,
-				 clientID);
-  }
-
-  /**
-   * Reconnect this proxy to the token service. 
-   *
-   *@exception LockException problem occured in reconnecting
-   */
-  protected void reconnect () throws LockException
-  {
-    Connector c = new Connector ();
-    c.open (host_, port_);
-
-    try {
-      c.connect (this);
-    } catch (InstantiationException e) {
-      throw new LockException (e.getMessage());
-    } catch (IllegalAccessException e) {
-      throw new LockException (e.getMessage());
-    } catch (IOException e) {
-      throw new LockException (e.getMessage());
-    }
-  }
-
-  /**
-   * Check to see if this RemoteLock is connected.
-   */
-  public boolean connected ()
-  {
-    return connected_;
-  }
-
-  /**
-   * Initialize this RemoteLock.  Called by Connector.
-   */
-  public int open (Object obj)
-  {
-    connected_ = true;
-    return 0;
-  }
-
-  /**
-   * Shut down the connection to the server.  Current implementation
-   * calls close ().
-   */
-  public int close (long flags)
-  {
-    return close ();
-  }
-
-  /**
-   * Shut down the connection to the server and mark this lock
-   * as disconnected.
-   */
-  public int close ()
-  {
-    if (connected ()) {
-      try {
-	connected_ = false;
-	peer ().close ();
-      } catch (IOException e) {
-	return -1;
-      }
-    }
-    
-    return 0;
-  }
-
-  /**
-   * Send the given request to the token service, throwing a 
-   * LockException on error.
-   */
-  protected void sendRequest (TokenRequest request) throws LockException
-  {
-    try {
-      if (!connected ())
-	reconnect ();
-
-      request.streamOutTo (peer ().dataOutputStream ());
-
-    } catch (IOException e) {
-      close ();
-      throw new LockException (e.getMessage ());
-    }
-  }
-
-  /**
-   * Receive a reply from the token service, throwing a LockException
-   * on error.
-   */
-  protected void receiveReply (TokenReply reply) throws LockException
-  {
-    if (!connected ())
-      throw new LockException ("Proxy wasn't connected, any replies lost");
-
-    try {
-
-      reply.streamInFrom (peer ().dataInputStream ());
-
-    } catch (IOException e) {
-      close ();
-      throw new LockException (e.getMessage ());
-    }
-  }
-
-  /**
-   * For errors that shouldn't generate exceptions, return the
-   * appropriate result code as defined in AbstractLock.
-   *
-   *@return AbstractLock.SUCCESS or AbstractLock.FAILURE
-   */
-  protected int processErrno (TokenReply reply)
-  {
-    switch (reply.errno ())
-      {
-      case TokenReply.NO_ERRORS:
-	return AbstractLock.SUCCESS;
-      case TokenReply.EIO:
-	close ();
-	return AbstractLock.FAILURE;
-      default:
-	return AbstractLock.FAILURE;
-      }
-  }
-
-  /**
-   * Make a request to the token service with the given operation
-   * type and arguments.
-   *
-   *@see LockOperations
-   *@see LockTypes
-   *@param operationType type of operation to perform
-   *@param proxyType type of proxy this is
-   *@param requeuePosition put this owner at this position in the
-   *                       waiting queue (only makes sense if the
-   *                       operation is renew)
-   *@return AbstractLock.SUCCESS or AbstractLock.FAILURE
-   *@exception LockException remote access error occured
-   */
-  protected int makeRequest (int operationType,
-			     int proxyType,
-			     int requeuePosition)
-    throws LockException
-  {
-    request_.operationType (operationType);
-    request_.proxyType (proxyType);
-    request_.requeuePosition (requeuePosition);
-    request_.useTimeout (false);
-
-    sendRequest (request_);
-    receiveReply (reply_);
-    
-    // make sure that if someone does send a magic cookie arg back,
-    // to keep it going
-    request_.arg (reply_.arg ());
-
-    return processErrno (reply_);
-  }
-
-  /**
-   * Make a request to the token service with the given arguments
-   * that must be performed by the given absolute time timeout.
-   * Currently, the timeout is managed by the remote service.
-   *
-   *@see LockOperations
-   *@see LockTypes
-   *@param operationType type of operation to perform
-   *@param proxyType type of proxy this is
-   *@param requeuePosition put this owner at this position in the
-   *                       waiting queue (only makes sense if the
-   *                       operation is renew)
-   *@param timeout absolute time timeout to accomplish the operation by
-   *@return AbstractLock.SUCCESS or AbstractLock.FAILURE
-   *@exception LockException remote access error occured
-   */
-  protected int makeRequest (int operationType,
-			     int proxyType,
-			     int requeuePosition,
-			     TimeValue timeout)
-    throws LockException, TimeoutException
-  {
-    request_.operationType (operationType);
-    request_.proxyType (proxyType);
-    request_.requeuePosition (requeuePosition);
-    request_.useTimeout (timeout);
-
-    sendRequest (request_);
-    receiveReply (reply_);
-
-    request_.arg (reply_.arg ());
-
-    if (reply_.errno () == TokenReply.ETIME)
-      throw new TimeoutException (timeout, "Remote Lock");
-
-    return processErrno (reply_);
-  }
-
-  /**
-   * Acquire ownership of the lock, blocking indefinitely if necessary.  
-   * <P>
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception LockException a remote error occured
-   */
-  public int acquire () throws LockException
-  {
-    return makeRequest (LockOperations.ACQUIRE, 0, 0);
-  }
-
-  /**
-   * Acquire ownership of the lock by the given absolute time time-out.
-   * A value of null for the timeout parameter results in a blocking
-   * acquire.
-   * A value of TimeValue.zero throws a TimeoutException if the
-   * acquire would block.
-   * <P>
-   *@param timeout  absolute time by which the lock must be acquired
-   *@return         appropriate Lock return value (AbstractLock.FAILURE, 
-   *                AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK)
-   *@exception      LockException a remote error occured
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   *@see #tryAcquire
-   */
-  public int acquire (TimeValue timeout)
-    throws LockException, TimeoutException
-  {
-    return makeRequest (LockOperations.ACQUIRE, 0, 0, timeout);
-  }
-    
-  /**
-   * Acquire a read lock, blocking indefinitely if necessary. 
-   *
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception LockException a remote error occured
-   */
-  public int acquireRead () throws LockException
-  {
-    return makeRequest (LockOperations.ACQUIRE,
-			LockTypes.READ_LOCK_PROXY,
-			0);
-  }
-
-  /**
-   * Acquire a read lock by the given absolute time time-out.  
-   *
-   *@param timeout  absolute time by which the lock must be acquired
-   *@return         appropriate lock return value (AbstractLock.FAILURE, 
-   *                AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK)
-   *@exception      LockException a remote error occured
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   *@see #tryAcquireRead
-   */
-  public int acquireRead (TimeValue timeout) 
-    throws LockException, TimeoutException
-  {
-    return makeRequest (LockOperations.ACQUIRE,
-			LockTypes.READ_LOCK_PROXY,
-			0,
-			timeout);
-  }
-
-  /**
-   * Acquire a write lock, blocking indefinitely if necessary. 
-   *
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception LockException a remote error occured
-   */
-  public int acquireWrite () 
-    throws LockException
-  {
-    return makeRequest (LockOperations.ACQUIRE,
-			LockTypes.WRITE_LOCK_PROXY,
-			0);
-  }
-
-  /**
-   * Acquire a write lock by the given absolute time time-out.  
-   *
-   *@param timeout  absolute time by which the lock must be acquired
-   *@return         appropriate lock return value (AbstractLock.FAILURE, 
-   *                AbstractLock.SUCCESS or AbstractLock.SLEEPHOOK)
-   *@exception      LockException a remote error occured
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   *@see #tryAcquireWrite
-   */
-  public int acquireWrite (TimeValue timeout) 
-    throws LockException, TimeoutException
-  {
-    return makeRequest (LockOperations.ACQUIRE,
-			LockTypes.WRITE_LOCK_PROXY,
-			0,
-			timeout);
-  }
-
-  
-  /**
-   * Give up the lock to some number of waiting threads (if any), then 
-   * reacquire, blocking indefinitely if necessary.
-   * <P>
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token. 
-   * <P>
-   *@param     requeuePosition position in the waiters queue to insert
-   *           this thread.  If this value is -1 and there are other
-   *           threads waiting to obtain the token, this thread is queued
-   *           at the end.  If this value is greater than -1, then it
-   *           indicates how many entries to skip over before inserting
-   *           our thread into the queue.  (For example, if it is 0,
-   *           this thread is put at the front of the queue.)  If this 
-   *           value is greater than the number of waiters, this thread is
-   *           simply put at the end of the current waiters queue.
-   *@return    AbstractLock.FAILURE or AbstractLock.SUCCESS
-   *@exception LockException a remote error occured
-   */
-  public int renew (int requeuePosition) 
-    throws LockException 
-  {
-    return makeRequest (LockOperations.RENEW,
-			0,
-			requeuePosition);
-  }
-
-  /**
-   * Give up the lock to some waiting threads (if any), then reacquire
-   * by the given absolute time time-out.
-   * <P>
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token. 
-   * <P>
-   * A value of null for the timeout indicates a blocking renew.
-   * <P>
-   *@param     requeuePosition position in the waiters queue to insert
-   *           this thread.  If this value is -1 and there are other
-   *           threads waiting to obtain the token, this thread is queued
-   *           at the end.  If this value is greater than -1, then it
-   *           indicates how many entries to skip over before inserting
-   *           our thread into the queue.  (For example, if it is 0,
-   *           this thread is put at the front of the queue.)  If this 
-   *           value is greater than the number of waiters, this thread is
-   *           simply put at the end of the current waiters queue.
-   * 
-   *@param     timeout absolute time by which the lock must be reacquired
-   *
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception      LockException a remote error occured
-   *@exception      JACE.ASX.TimeoutException thrown when the lock is not
-   *                obtained by the desired time
-   */
-  public int renew (int requeuePosition, TimeValue timeout) 
-    throws LockException, TimeoutException
-  {
-    return makeRequest (LockOperations.RENEW,
-			0,
-			requeuePosition,
-			timeout);
-  }
-
-  /** 
-   * Try to acquire the lock without blocking.  
-   * <P>
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception      LockException a remote error occured
-   */
-  public int tryAcquire () throws LockException
-  {
-    return makeRequest (LockOperations.TRY_ACQUIRE, 0, 0);
-  }
-
-  /** 
-   * Try to acquire a read lock without blocking.  
-   * <P>
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception      LockException a remote error occured
-   */
-  public int tryAcquireRead () throws LockException
-  {
-    return makeRequest (LockOperations.TRY_ACQUIRE,
-			LockTypes.READ_LOCK_PROXY,
-			0);
-  }
-
-  /** 
-   * Try to acquire a write lock without blocking.  
-   * 
-   *@return         appropriate AbstractLock return value 
-   *                (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception      LockException a remote error occured
-   */
-  public int tryAcquireWrite () throws LockException
-  {
-    return makeRequest (LockOperations.TRY_ACQUIRE,
-			LockTypes.WRITE_LOCK_PROXY,
-			0);
-  }
-
-  /** 
-   * Release ownership of this lock.  
-   * 
-   *@return    appropriate AbstractLock return value 
-   *           (AbstractLock.FAILURE or AbstractLock.SUCCESS)
-   *@exception LockException a remote error occured
-   */
-  public int release () throws LockException
-  {
-    return makeRequest (LockOperations.RELEASE, 0, 0);
-  }
-
-  /**
-   * Closes the connection to the server (if it is still open).
-   */
-  protected void finalize () throws Throwable
-  {
-    close ();
-  }
-
-  /**
-   * No-op implementation for the sleep hook (unused).
-   */
-  public void sleepHook () {}
-
-  /** Status of whether this RemoteLock is connected to the server or not */
-  protected boolean connected_ = false;
-
-  /** Request object for transmissions to the server */
-  protected TokenRequest request_;
-
-  /** Reply object for receiving transmissions from the server */
-  protected TokenReply reply_;
-
-  /** Host name of the token service */
-  protected String host_;
-
-  /** Port number of the token service */
-  protected int port_;
-}
diff --git a/java/JACE/netsvcs/Token/RemoteMutex.java b/java/JACE/netsvcs/Token/RemoteMutex.java
deleted file mode 100644
index 7f2a4311116..00000000000
--- a/java/JACE/netsvcs/Token/RemoteMutex.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package JACE.netsvcs.Token;
-
-/**
- * Proxy used by clients for accessing a mutex at the token service.
- */
-public class RemoteMutex extends RemoteLock
-{
-  /**
-   * Constructor.
-   *
-   *@param tokenName name of the mutex to access
-   *@param clientID identification of this client
-   *@param host host of the token service
-   *@param port port number of the token service
-   */
-  public RemoteMutex (String tokenName,
-		      String clientID,
-		      String host,
-		      int port)
-  {
-    super (LockTypes.MUTEX,
-	   0,
-	   tokenName,
-	   clientID,
-	   host,
-	   port);
-  }
-}
diff --git a/java/JACE/netsvcs/Token/RemoteRWMutex.java b/java/JACE/netsvcs/Token/RemoteRWMutex.java
deleted file mode 100644
index cc666bfd70f..00000000000
--- a/java/JACE/netsvcs/Token/RemoteRWMutex.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package JACE.netsvcs.Token;
-
-/**
- * Proxy used by clients for accessing a reader/writer mutex
- *  at the token service.
- */
-public class RemoteRWMutex extends RemoteLock
-{
-  /**
-   * Constructor.
-   *
-   *@param tokenName name of the reader/writer lock to access
-   *@param clientID identification of this client
-   *@param host host of the token service
-   *@param port port number of the token service
-   */
-  public RemoteRWMutex (String tokenName,
-			String clientID,
-			String host,
-			int port)
-  {
-    super (LockTypes.RWLOCK,
-	   0,
-	   tokenName,
-	   clientID,
-	   host,
-	   port);
-  }
-}
diff --git a/java/JACE/netsvcs/Token/TokenAcceptor.java b/java/JACE/netsvcs/Token/TokenAcceptor.java
deleted file mode 100644
index 53adf08753b..00000000000
--- a/java/JACE/netsvcs/Token/TokenAcceptor.java
+++ /dev/null
@@ -1,353 +0,0 @@
-package JACE.netsvcs.Token;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.netsvcs.Server;
-
-/**
- * Server for the token service.  Launches TokenRequestHandlers as
- * connections are made.  Currently, the activation strategy must be
- * thread per connection since the operations are allowed to block
- * during acquires, etc.
- * <P>
- * Two types of locks are supported by default -- Mutex and RWMutex.
- * New lock types can be added from the command line without changing
- * any code in the service.  To do this, just create a class which
- * implements the LockHandler interface.
- * <P>
- * When a request for a new lock comes in, a LockHandler of the corresponding
- * type is created and a mapping is created between the lock name and the
- * handler.  Later requests reuse that mapping.
- * <P>
- * <B>Valid command line arguments:</B>
- * <PRE>
- *    -f (class name):(type)  Specify a LockHandler for a type of lock");
- *    -p (port number)        Port to listen on for clients");
- *    -d                      Enable debugging messages");
- * </PRE>
- *
- *@see JACE.netsvcs.Server
- *@see TokenRequestHandler
- *@see LockHandler
- *@see LockTypes
- */
-public class TokenAcceptor extends Server
-{ 
-  protected void addDefaultFactories() throws ClassNotFoundException {
-    addHandlerFactory(LockTypes.MUTEX,
-		      Class.forName("JACE.netsvcs.Token.MutexHandler"));
-    addHandlerFactory(LockTypes.RWLOCK,
-		      Class.forName("JACE.netsvcs.Token.RWMutexHandler"));
-  }
-  
-  /**
-   * Default constructor.
-   */
-  public TokenAcceptor() {
-
-    // Set the name in case we aren't using the service configurator.
-    name ("Token Service");
-
-    lockHandlerMap_ = new Hashtable();
-    handlerFactoryMap_ = new Hashtable();
-    clientHandlerMap_ = new Hashtable ();
-  }
-  
-  /**
-   * Add a map between a type of lock and the factory which
-   * creates LockHandler instances that handle it.
-   *
-   *@see LockTypes
-   *@param type number representing the type of lock
-   *@param factory Class object for a LockHandler class
-   */
-  public void addHandlerFactory(Integer type, Class factory) {
-    handlerFactoryMap_.put(type, factory);
-  }
-  
-  /**
-   * Add a map between a type of lock and the factory which
-   * creates LockHandler instances that handle it.
-   *
-   *@see LockTypes
-   *@param type number representing the type of lock
-   *@param factory Class object for a LockHandler class
-   */
-  public void addHandlerFactory(int type, Class factory) {
-    addHandlerFactory(new Integer(type), factory);
-  }
-  
-  /**
-   * Remove the LockHandler factory which handles locks
-   * of the specified type.
-   *
-   *@param type type of LockHandler to cease supporting
-   *@return the LockHandler instance (or null if not found)
-   */
-  public Object removeHandlerFactory(Integer type) {
-    return handlerFactoryMap_.remove(type);
-  }
-  
-  /**
-   * Remove the LockHandler factory which handles locks
-   * of the specified type.
-   *
-   *@param type type of LockHandler to cease supporting
-   *@return the LockHandler instance (or null if not found)
-   */
-  public Object removeHandlerFactory(int type) {
-    return handlerFactoryMap_.remove(new Integer(type));
-  }
-
-  /**
-   * Retrieve the LockHandler corresponding to the given name
-   * or create a new one if it doesn't exist.  This is called by
-   * TokenRequestHandlers.
-   *
-   *@param lockName name of the lock to retrieve or create a LockHandler for
-   *@param lockType type of the lock
-   *@return LockHandler which handles the lock with that name
-   */
-  public LockHandler getLockHandler (String lockName, 
-				     int lockType) {
-    synchronized (lockHandlerMap_) {
-      
-      Object obj = lockHandlerMap_.get(lockName);
-      
-      if (obj != null)
-	return (LockHandler)obj;
-      else {
-	LockHandler handler = newHandler (lockType);
-	lockHandlerMap_.put (lockName, handler);
-	return handler;
-      }
-    }
-  }
-  
-  /**
-   * Create a new LockHandler of the specified type.
-   *
-   *@param type type of LockHandler to create
-   *@return a new LockHandler instance
-   */
-  protected LockHandler newHandler (int type) {
-    ACE.DEBUG ("Creating new handler of type " + type);
-    Object factoryObj = handlerFactoryMap_.get(new Integer(type));
-    if (factoryObj == null) 
-      return null;
-    
-    Class factory = (Class)factoryObj;
-    LockHandler handler = null;
-    
-    try {
-      handler = (LockHandler)factory.newInstance();
-    } catch (InstantiationException e) {
-      ACE.ERROR("Can't create a handler of type " + type);
-    } catch (IllegalAccessException e) {
-      ACE.ERROR("Handler of type " + type +
-		" must have a default constructor");
-    }
-    return handler;
-  }
-  
-  /**
-   * Simple main program.  See the class description for more
-   * information about command line arguments.
-   */
-  public static void main(String args[]) {
-    TokenAcceptor ta = new TokenAcceptor();
-    
-    ta.init(args);
-  }
-  
-  /**
-   * Create a new TokenRequestHandler instance.
-   */
-  protected SvcHandler makeSvcHandler() 
-  {
-    return new TokenRequestHandler();
-  }
-  
-  /**
-   * Sets up the default factories so the user can override them on
-   * the command line, then delegates back to Server.init (String[]).
-   *
-   *@see JACE.netsvcs.Server#init
-   *@param args command line arguments
-   *@return -1 on failure, 0 on success
-   */
-  public int init(String [] args) {
-    try {
-      addDefaultFactories ();
-    } catch (ClassNotFoundException e) {
-      ACE.ERROR ("Can't find default factory " + e.getMessage ());
-      return -1;
-    }
-
-    return super.init (args);
-  }
-  
-  /**
-   * Prints out the valid command line arguments.  See the class
-   * description for more information.  Called by Server.init when
-   * parseArgs returns -1.
-   */
-  protected void printUsage ()
-  {
-    ACE.ERROR ("Valid options:\n");
-    ACE.ERROR ("-f <class name>:<type>  Specify a handler for a type of lock");
-    ACE.ERROR ("-p <port number>        Port to listen on for clients");
-    ACE.ERROR ("-d                      Enable debugging messages");
-  }
-
-  /**
-   * Parses the command line arguments.  See the class description
-   * for more information.
-   *
-   *@param args command line arguments
-   *@return -1 on failure, 0 on success
-   */
-  protected int parseArgs(String [] args) 
-  {
-    int c = 0;
-    GetOpt opt = new GetOpt(args, "p:f:d", true);
-    
-    try {
-
-      while ((c = opt.next ()) != -1) {
-	switch (c) 
-	  {
-	  case 'd':
-	    ACE.enableDebugging ();
-	    ACE.DEBUG ("Debugging is enabled");
-	    break;
-	  case 'p':
-	    if (!port (opt.optarg ()))
-	      return -1;
-	    break;
-	  case 'f':
-	    if (newHandlerFactory (opt.optarg ()) < 0)
-	      return -1;
-	    break;
-	  default:
-	    ACE.ERROR("Unknown argument: " + (char)c);
-	    return -1;
-	  }
-      }
-    } catch (ArrayIndexOutOfBoundsException e) {
-      ACE.ERROR ("Option -" + (char)c + " requires an argument");
-      return -1;
-    }
-    
-    return 0;
-  }
-
-  /**
-   * Load the Class for the specified LockHandler and create a mapping
-   * from its type to the Class instance.  Used to parse the command
-   * line pair of (class name):(type).
-   *
-   *@param nameAndType (class name):(type) pair from the command line
-   *@return -1 on failure, 0 on success
-   */
-  protected int newHandlerFactory (String nameAndType)
-  {
-    int colon = nameAndType.lastIndexOf (':');
-
-    if (colon < 1) {
-      ACE.ERROR ("Invalid -f <class name>:<type num> for handler: " + 
-		 nameAndType);
-      return -1;
-    }
-
-    int type = 0;
-    try {
-      type = Integer.parseInt (nameAndType.substring (colon + 1));
-    } catch (NumberFormatException e) {
-      ACE.ERROR ("Invalid token type: " + e.getMessage ());
-      return -1;
-    }
-
-    String name = nameAndType.substring (0, colon);
-
-    Class factory;
-    try {
-      factory = Class.forName (name);
-    } catch (ClassNotFoundException e) {
-      ACE.ERROR (e.getMessage ());
-      return -1;
-    }
-
-    addHandlerFactory (type, factory);
-    ACE.DEBUG ("New handler " + name + " with type " + type);
-
-    return 0;
-  }
-
-  /**
-   * Create a mapping between a client ID and a LockHandler.  This is
-   * only used by TokenRequestHandlers in order to keep track of which
-   * locks a client touches.  That way, if/when a client disconnects,
-   * all its locks can be abandoned successfully.
-   *
-   *@param clientID client identification (key in the mapping)
-   *@param handler LockHandler to map to (value in the mapping)
-   *
-   */
-  void addClientLockHandler (String clientID, 
-			     LockHandler handler)
-  {
-    Object obj = clientHandlerMap_.get (clientID);
-    if (obj == null) {
-      // Probably won't have more than 10 locks per client ID, and the Vector
-      // should resize automatically even if someone does.
-      Vector handlerList = new Vector (10);
-      handlerList.addElement (handler);
-      clientHandlerMap_.put (clientID, handlerList);
-    } else {
-      Vector handlerList = (Vector)obj;
-      int alreadyThereIndex = handlerList.indexOf (handler);
-      if (alreadyThereIndex == -1)
-	handlerList.addElement (handler);
-    }
-  }
-
-  /**
-   * Called by TokenRequestHandlers to remove a specified client ID
-   * from the client ID to LockHandler mapping.
-   */
-  void removeClient (String clientID)
-  {
-    clientHandlerMap_.remove (clientID);
-  }
-
-  /**
-   * Called by TokenRequestHandlers to obtain a list of all LockHandlers
-   * accessed by a particular client.  Useful for abandoning the locks.
-   */
-  Enumeration getClientLockHandlers (String clientID)
-  {
-    Object obj = clientHandlerMap_.get (clientID);
-    if (obj == null)
-      return null;
-    else
-      return ((Vector)obj).elements ();
-  }
-
-  // These should be replaced by weak hash maps when available
-  
-  // Map consisting of (token name) to (LockHandler instance) pairs
-  private Hashtable lockHandlerMap_;
-  
-  // Map consisting of (Integer token type) to (Class instance for 
-  // corresponding LockHandler class)
-  private Hashtable handlerFactoryMap_;
-
-  // Map consisting of (client ID) to (Vector of LockHandler) pairs
-  private Hashtable clientHandlerMap_;
-}
-
diff --git a/java/JACE/netsvcs/Token/TokenReply.java b/java/JACE/netsvcs/Token/TokenReply.java
deleted file mode 100644
index 35f50901610..00000000000
--- a/java/JACE/netsvcs/Token/TokenReply.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package JACE.netsvcs.Token;
-
-import java.io.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-/**
- * Reply from a lock operation, and constants involved in it.  
- * This is compatible with the C++ ACE version.  The user probably
- * never deals directly with the constant errno values in Java ACE since
- * the proxy (RemoteLock) should hide those details.
- */
-public class TokenReply
-{
-
-  /** indicates success */
-  public static final int NO_ERRORS = 0;
-
-  /** indicates a timeout */
-  public static final int ETIME = 62;
-
-  /** indicates the operation was interrupted */
-  public static final int EINTR = 4;
-
-  /** deadlock indication errno (JACE currently doesn't implement a
-   * deadlock detection system, but C++ ACE does and JACE proxies
-   * act appropriately).
-   */
-  public static final int EDEADLK = 45;
-
-  /** indicates the operation would block, used in tryAcquire */
-  public static final int EWOULDBLOCK = 11;
-
-  /** indicates a token name or client ID was too long */
-  public static final int ENAMETOOLONG = 78;
-
-  /** indicates an operation type was not supported */
-  public static final int ENOTSUP = 48;
-
-  /** indicates that this client was not the owner of the lock,
-   * so couldn't perform the desired operation */
-  public static final int EACCES = 13;
-
-  /** indicates an IO error occured during transmission of the request */
-  public static final int EIO = 5;
-
-  /** indicates a generic failure to complete the request */
-  public static final int EFAULT = 14;
-
-  /** indicates an operation was requested on an unknown type of token */
-  public static final int EINVAL = 22;
-
-  /** constant length of a valid token reply */
-  private final static int LENGTH = 12;
-
-  /** error code */
-  private int errno_;
-
-  /** argument (unused in JACE) */
-  private int arg_;
-  
-  /** Dump the state of this TokenReply to a String */
-  public String toString ()
-  {
-    return "TokenReply(" + this.length() + ", " + this.errno_
-      + ", " + this.arg_ + ")";
-  }
-
-  /** Default constructor (NO_ERRORS) */
-  public TokenReply ()
-  {
-    errno_ = NO_ERRORS;
-    arg_ = 0;
-  }
-  
-  /** Constructor which takes the error code and argument */
-  public TokenReply (int errno, int arg)
-  {
-    errno_ = errno;
-    arg_ = arg;
-  }
-
-  /**
-   * Accessor for the length of this TokenReply.
-   */
-  public int length ()
-  {
-    return LENGTH;
-  }
-
-  /** Accessor for the error code of this TokenReply. */
-  public int errno ()
-  {
-    return errno_;
-  }
-
-  /**
-   * Set the error code of this TokenReply.
-   */
-  public void errno (int value)
-  {
-    errno_ = value;
-  }
-
-  /**
-   * Accessor of the argument of this TokenReply.  (Unused in JACE)
-   */
-  public int arg ()
-  {
-    return arg_;
-  }
-
-  /**
-   * Set the argument of this TokenReply.  (Unused in JACE)
-   */
-  public void arg (int value)
-  {
-    arg_ = value;
-  }
-
-  /**
-   * Read this TokenReply in from the given InputStream.
-   */
-  public void streamInFrom (InputStream is) 
-    throws IOException, EOFException
-  {
-    BufferedInputStream bis = new BufferedInputStream (is, LENGTH);
-    DataInputStream dis = new DataInputStream (bis);
-
-    streamInFrom (dis);
-  }
-
-  /** 
-   * Read this TokenReply in from the given DataInputStream.
-   */
-  public void streamInFrom (DataInputStream dis) 
-    throws IOException, EOFException
-  {
-    int length = dis.readInt ();
-    if (length != LENGTH)
-      throw new IOException ("Invalid TokenReply length " + length);
-
-    this.errno_ = dis.readInt ();
-    this.arg_ = dis.readInt ();
-  }
-
-  /**
-   * Write this TokenReply out to the given OutputStream.
-   */
-  public void streamOutTo (OutputStream os)
-    throws IOException
-  {
-    BufferedOutputStream bos = new BufferedOutputStream (os, LENGTH);
-    DataOutputStream dos = new DataOutputStream (bos);
-
-    streamOutTo (dos);
-  }
-
-  /**
-   * Write this TokenReply out to the given DataOutputStream.
-   */
-  public void streamOutTo (DataOutputStream dos)
-    throws IOException
-  {
-    dos.writeInt (LENGTH);
-    dos.writeInt (this.errno_);
-    dos.writeInt (this.arg_);
-
-    dos.flush ();
-  }
-}
diff --git a/java/JACE/netsvcs/Token/TokenRequest.java b/java/JACE/netsvcs/Token/TokenRequest.java
deleted file mode 100644
index eb1113428c5..00000000000
--- a/java/JACE/netsvcs/Token/TokenRequest.java
+++ /dev/null
@@ -1,426 +0,0 @@
-package JACE.netsvcs.Token;
-
-import java.io.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-/**
- * Request for an operation on a lock.  This is compatible with the
- * C++ ACE version.  The US-ASCII character encoding is used for
- * String to byte conversions (and vice versa).  If
- * that encoding isn't supported, it attempts to use the default
- * encoding (but prints a message).  Users probably never need to
- * deal with this class directly.  The notify field isn't used
- * in JACE (or in C++ ACE as far as I can tell).
- *
- *@author Everett Anderson
- */
-public class TokenRequest
-{
-  /** Maximum length for a token name */
-  public final static int MAX_TOKEN_NAME_LEN = 40;
-
-  /** Maximum length for a client ID */
-  public final static int MAX_CLIENT_ID_LEN = 276;
-  
-  /** Length of the fixed size header */
-  protected final static int HEADER_LEN = 40;
-
-  /** Maximum length of any TokenRequest (total) */
-  protected final static int MAX_LEN = 359;
-  
-  /**
-   * Dump this TokenRequest's state out to a String.
-   */
-  public String toString() 
-  {
-    return "TokenRequest(" + this.length() + ", " +
-      this.tokenType_ + ", " +
-      this.proxyType_ + ", " + 
-      this.operationType_ + ", " +
-      this.requeuePosition_ + ", " +
-      this.notify_ + ", " +
-      this.useTimeout_ + ", " +
-      this.sec_ + ", " +
-      this.usec_ + ", " +
-      this.arg_ + ", " +
-      this.tokenName_ + ", " +
-      this.clientID_ + ")";
-  }
-  
-  /** Default constructor. */
-  public TokenRequest() 
-  {
-    // Remember that the length is transmitted first
-    tokenType_ = 0;
-    proxyType_ = 0;
-    operationType_ = 0;
-    requeuePosition_ = 0;
-    notify_ = 0;
-    useTimeout_ = 0;
-    sec_ = 0;
-    usec_ = 0;
-    arg_ = 0;
-    tokenName_ = "";
-    clientID_ = "";
-    // Transmission is "<10 ints><token name>(null):<clientID>(null)"
-    
-    charEncoding_ = "US-ASCII";
-    
-    buffer_ = new byte[MAX_LEN];
-  }
-  
-  /** 
-   * Create a request which doesn't use timeouts.
-   *
-   *@param tokenType type of token (usually a constant in LockTypes)
-   *@param proxyType type of proxy (usually a constant in LockTypes)
-   *@param operationType type of operation (usually a constant in 
-   *                     LockOperations)
-   *@param tokenName name of the token to operate on
-   *@param clientID name of the client requesting an operation
-   *
-   *@see LockTypes
-   *@see LockOperations
-   */
-  public TokenRequest(int tokenType,
-		      int proxyType,
-		      int operationType,
-		      String tokenName,
-		      String clientID) 
-  {
-    this();
-    
-    this.tokenType_ = tokenType;
-    this.proxyType_ = proxyType;
-    this.operationType_ = operationType;
-    this.tokenName_ = tokenName;
-    this.clientID_ = clientID;
-  }
-  
-  /** 
-   * Create a request which uses the given absolute time timeout.
-   *
-   *@param tokenType type of token (usually a constant in LockTypes)
-   *@param proxyType type of proxy (usually a constant in LockTypes)
-   *@param operationType type of operation (usually a constant in 
-   *                     LockOperations)
-   *@param tokenName name of the token to operate on
-   *@param clientID name of the client requesting an operation
-   *@param tv absolute time timeout to process the request by
-   *
-   *@see LockTypes
-   *@see LockOperations
-   */  
-  public TokenRequest(int tokenType,
-		      int proxyType,
-		      int operationType,
-		      String tokenName,
-		      String clientID,
-		      TimeValue tv) 
-  {
-    this(tokenType, 
-	 proxyType,
-	 operationType,
-	 tokenName,
-	 clientID);
-    
-    this.useTimeout_ = 1;
-    this.sec_ = (int)tv.sec();
-    this.usec_ = tv.nanos() / 1000;
-  }
-  
-  /**
-   * Return the length of this TokenRequest.
-   * <P>
-   * Details:
-   * <PRE>
-   * Fixed size header of length HEADER_LEN
-   * token name
-   * null
-   * :
-   * client ID
-   * null
-   * </PRE>
-   */
-  public int length() 
-  { 
-    return (HEADER_LEN + 
-	    this.tokenName_.length() + 
-	    this.clientID_.length() + 3);
-  }
-
-  /** Accessor for the token type. */  
-  public int tokenType() 
-  {
-    return this.tokenType_;
-  }
-  /** Set the token type. */
-  public void tokenType(int type) 
-  {
-    this.tokenType_ = type;
-  }
-  /** Accessor for the proxy type. */
-  public int proxyType() 
-  {
-    return this.proxyType_;
-  }
-  /** Set the proxy type. */
-  public void proxyType(int type) 
-  {
-    this.proxyType_ = type;
-  }
-  /** Accessor for the operation type. */
-  public int operationType() 
-  {
-    return this.operationType_;
-  }
-  /** Set the operation type. */
-  public void operationType(int type) 
-  {
-    this.operationType_ = type;
-  }
-  /** Accessor for the requeue position.  This only makes
-   * sense for a renew operation. */
-  public int requeuePosition() 
-  {
-    return this.requeuePosition_;
-  }
-  /** Set the requeue position.  This only makes sense for
-   * a renew operation. */
-  public void requeuePosition(int position) 
-  {
-    this.requeuePosition_ = position;
-  }
-  /** Accessor for the flag to determine if a timeout should be used. */
-  public boolean useTimeout() 
-  {
-    return (this.useTimeout_ == 1 ? true : false);
-  }
-  /** Set the flag to enable or disable use of timeouts.
-   */
-  public void useTimeout(boolean useIt) 
-  {
-    this.useTimeout_ = (useIt == true ? 1 : 0);
-  }
-
-  /**
-   * Set the absolute time timeout to the given TimeValue's value, and
-   * enable the useTimeout flag.
-   */
-  public void useTimeout (TimeValue timeout)
-  {
-    this.useTimeout_ = 1;
-    this.sec_ = (int)timeout.sec ();
-    this.usec_ = timeout.nanos () / 1000;
-  }
-
-  /**
-   * Accessor for the seconds component of the absolute time timeout.
-   */
-  public int sec() 
-  {
-    return this.sec_;
-  }
-  /** Set the seconds component of the timeout. */
-  public void sec(int sec) 
-  {
-    this.sec_ = sec;
-  }
-  /** Accessor for the usec component of the timeout. */
-  public int usec() 
-  {
-    return this.usec_;
-  }
-  /** Set the usec component of the timeout. */
-  public void usec(int usec) 
-  {
-    this.usec_ = usec;
-  }
-  /** Accessor for the arg value.  (unused in JACE) */
-  public int arg() 
-  {
-    return this.arg_;
-  }
-  /** Set the arg value.  (unused in JACE) */
-  public void arg(int arg) 
-  {
-    this.arg_ = arg;
-  }
-  
-  /** Accessor for the name of the token. */
-  public String tokenName() 
-  {
-    return this.tokenName_;
-  }
-  
-  /** Set the name of the token. */
-  public void tokenName(String name) 
-  {
-    this.tokenName_ = name;
-  }
-  
-  /** Accessor for the client identification string. */
-  public String clientID() 
-  {
-    return this.clientID_;
-  }
-  
-  /** Set the client identification string. */
-  public void clientID(String ID) 
-  {
-    this.clientID_ = ID;
-  }
-  
-  /**
-   * Construct a String from a specific subset of the byte array.
-   * The string begins at the start index and ends at either the
-   * end of the buffer or the first byte with value 0 (null).
-   * Tries to use the specified encoding, but uses the default
-   * platform encoding if it isn't available.
-   *
-   *@param start beginning index in the buffer
-   *@param bufferLength total length of the buffer
-   */
-  protected String stringFromBuffer(int start, int bufferLength) 
-  {
-    int end = start;
-    String result = null;
-
-    while (end < bufferLength && this.buffer_[end] != 0)
-      end++;
-    
-    try {
-      result = new String(this.buffer_,
-			  start,
-			  end - start,
-			  this.charEncoding_);
-    } catch (UnsupportedEncodingException e) {
-      ACE.ERROR(this.charEncoding_ + " is not supported!");
-      result = new String (this.buffer_, start, end - start);
-    }
-
-    return result;
-  }
-  
-  /**
-   * Read the request in from the given InputStream.
-   */
-  public void streamInFrom(InputStream is) 
-    throws IOException, EOFException
-  {
-    BufferedInputStream bis = new BufferedInputStream(is,
-						      MAX_LEN);
-    DataInputStream dis = new DataInputStream(bis);
-
-    streamInFrom (dis);
-  }
-
-  /**
-   * Read the request in from the given DataInputStream.
-   */
-  public void streamInFrom (DataInputStream dis) 
-    throws IOException, EOFException
-  {
-    int length = dis.readInt();
-    if (length > MAX_LEN || length < HEADER_LEN + 5) 
-      throw new IOException ("Invalid TokenRequest length: " + length);
-
-    this.tokenType_ = dis.readInt();
-    this.proxyType_ = dis.readInt();
-    this.operationType_ = dis.readInt();
-    this.requeuePosition_ = dis.readInt();
-    this.notify_ = dis.readInt();
-    this.useTimeout_ = dis.readInt();
-    this.sec_ = dis.readInt();
-    this.usec_ = dis.readInt();
-    this.arg_ = dis.readInt();
-    
-    int total = dis.read(this.buffer_, 0, length - HEADER_LEN);
-    
-    this.tokenName_ = this.stringFromBuffer(0, total);
-    
-    this.clientID_ = this.stringFromBuffer(this.tokenName_.length() + 2,
-					   total);
-    
-    if (this.tokenName_.length() > MAX_TOKEN_NAME_LEN ||
-	this.clientID_.length() > MAX_CLIENT_ID_LEN) 
-      throw new IOException("Exceeds maximum token name or client ID");
-  }
-  
-  /**
-   * Write the request out to the given OutputStream.
-   */
-  public void streamOutTo (OutputStream os) 
-    throws IOException 
-  {
-    BufferedOutputStream bos = new BufferedOutputStream(os);
-    DataOutputStream dos = new DataOutputStream(bos);
-    
-    streamOutTo (dos);
-  }
-
-  /**
-   * Write the request out to the given DataOutputStream.  Tries to use
-   * the specified encoding to the convert the token name and client ID
-   * to bytes, but uses the platform default encoding if necessary.
-   */
-  public void streamOutTo (DataOutputStream dos)
-    throws IOException
-  {
-    dos.writeInt(this.length());
-    dos.writeInt(this.tokenType_);
-    dos.writeInt(this.proxyType_);
-    dos.writeInt(this.operationType_);
-    dos.writeInt(this.requeuePosition_);
-
-    dos.writeInt(this.notify_);
-    dos.writeInt(this.useTimeout_);
-    dos.writeInt(this.sec_);
-    dos.writeInt(this.usec_);
-    dos.writeInt(this.arg_);
-    
-    StringBuffer data = new StringBuffer(this.tokenName_.length() +
-					 this.clientID_.length() +
-					 3);
-    
-    data.append(this.tokenName_);
-    data.append('\0');
-    data.append(':');
-    data.append(this.clientID_);
-    data.append('\0');
-
-    byte buf [] = null;
-    String dataString = data.toString ();
-    try {
-      buf = dataString.getBytes (this.charEncoding_);
-    } catch (UnsupportedEncodingException e) {
-      ACE.ERROR (charEncoding_ + " is unsupported, trying to use default");
-      buf = dataString.getBytes ();
-    }
-
-    dos.write(buf, 0, buf.length);
-    dos.flush();
-  }
-  
-  private int tokenType_;
-  private int proxyType_;
-  private int operationType_;
-  private int requeuePosition_;
-  private int notify_;
-  private int useTimeout_;
-  private int sec_;
-  private int usec_;
-  private int arg_;
-  
-  private String tokenName_;
-  private String clientID_;
-  
-  private byte buffer_[];
-  
-  /**
-   * Character encoding to use for converting the token name and
-   * client ID to/from bytes.
-   */
-  protected String charEncoding_;
-}
diff --git a/java/JACE/netsvcs/Token/TokenRequestHandler.java b/java/JACE/netsvcs/Token/TokenRequestHandler.java
deleted file mode 100644
index cb6d729f3bd..00000000000
--- a/java/JACE/netsvcs/Token/TokenRequestHandler.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package JACE.netsvcs.Token;
-
-import java.io.*;
-import java.net.SocketException;
-import java.util.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-import JACE.netsvcs.Handler;
-
-/**
- * Created by TokenAcceptor to handle token requests.  Delegates to
- * the appropriate LockHandler.  This is fairly robust, and can handle
- * multiple clients and locks (meaning requests can come in to this
- * handle with varying client IDs and token names and still be processed
- * and released appropriately.)  Compatible with the C++ ACE token service.
- *
- *@author Everett Anderson
- */
-class TokenRequestHandler extends Handler
-{
-  /** 
-   * Default constructor.
-   */
-  public TokenRequestHandler() {
-    this.clients_ = new Vector (10);
-  }
-  
-  /** 
-   * Creates a new TokenRequest instance.
-   */
-  public Object newRequest ()
-  {
-    return new TokenRequest ();
-  }
-
-  /** 
-   * Sends an error message to a client with the TokenReply.EIO
-   * errno before abandoning the connection.  This is used when an IO 
-   * error occured while receiving the request.
-   *
-   *@param lastRequest request object to get the arg from
-   */
-  protected void sendAbortMessage (TokenRequest lastRequest)
-  {
-    TokenReply reply = new TokenReply (TokenReply.EIO,
-				       lastRequest.arg ());
-    try {
-      reply.streamOutTo (this.peer ().dataOutputStream ());
-    } catch (Exception e) {
-      // Doesn't matter if there is an error here, we've abandoned
-      // the connection.
-    }
-  }
-
-  /** 
-   * Safely shuts down this handler, making sure to release any locks
-   * that were touched by clients from this TokenRequestHandler.
-   * 
-   *@return -1 on failure, 0 on success
-   */
-  public synchronized int close ()
-  {
-    // For every client X that has used this handler
-    //    for every LockHandler that X has used
-    //        release the lock until it fails because X isn't the owner
-    //    remove the client entries
-    // Call Handler.close ()
-    if (!done ()) {
-      
-      TokenAcceptor parent = (TokenAcceptor) parent ();
-      Enumeration clientEnum = clients_.elements ();
-
-      while (clientEnum.hasMoreElements ()) {
-	String clientID = (String)clientEnum.nextElement ();
-	
-	Enumeration handlers = parent.getClientLockHandlers (clientID);
-	if (handlers == null)
-	  continue;
-	
-	int num = 0;
-	
-	while (handlers.hasMoreElements ()) {
-	  LockHandler handler = (LockHandler)handlers.nextElement ();
-	  
-	  handler.abandonLock (clientID);
-
-	  num++;
-	}
-	
-	parent.removeClient (clientID);
-      }
-
-      return super.close ();
-    }
-
-    return 0;
-  }
-
-  /**
-   * Read in the given TokenRequest and delegates to the appropriate
-   * LockHandler.
-   *
-   *@see JACE.netsvcs.Handler
-   *@param requestObject TokenRequest object to use
-   */
-  public void processRequest (Object requestObject)
-    throws SocketException, EOFException, IOException
-  {
-    TokenRequest request = (TokenRequest)requestObject;
-    TokenAcceptor parent = (TokenAcceptor) parent ();
-
-    try {
-      request.streamInFrom (this.peer ().dataInputStream ());
-      
-      if (!request.tokenName ().equals (lastTokenName_)) {
-	// Switched tokens:
-	//
-	// Either find a handler that's already been made (which would
-	// mean this token has been accessed before), or create a new
-	// one with a new token
-	handler_ = parent.getLockHandler(request.tokenName(),
-					 request.tokenType());
-	
-	if (handler_ == null) {
-	  // The client asked for an operation on a type of token
-	  // that we don't know about.
-	  ACE.ERROR ("Unknown lock type: " + request.tokenType ());
-	  TokenReply error = new TokenReply (TokenReply.EINVAL,
-					     request.arg ());
-	  error.streamOutTo(this.peer ().dataOutputStream ());
-	  return;
-	}
-	
-	// Add this LockHandler to the list of those accessed by
-	// this clientID
-	parent.addClientLockHandler (request.clientID (),
-				     handler_);
-      }
-      
-      if (!request.clientID ().equals (lastClientID_)) {
-	// Switched clients
-	
-	if (!clients_.contains (request.clientID ())) 
-	  clients_.addElement (request.clientID ());
-	
-	parent.addClientLockHandler (request.clientID (),
-				     handler_);
-      }
-      
-      lastClientID_ = request.clientID ();
-      lastTokenName_ = request.tokenName ();
-      
-      TokenReply reply = handler_.handleRequest(this, request);
-
-      reply.streamOutTo(this.peer ().dataOutputStream ());
-      
-    } catch (NullPointerException e) {
-      sendAbortMessage (request);
-      throw e;
-    } catch (IOException e) {
-      sendAbortMessage (request);
-      throw e;
-    }
-  }
-
-  // List of clientIDs that have been processed by this instance
-  // of TokenRequestHandler.  This is useful when abandoning the
-  // locks of any clients that have been using this socket.
-  private Vector clients_;
-
-  // Name of the last token accessed
-  private String lastTokenName_ = null;
-
-  // Last client ID which accessed a token from this handler
-  private String lastClientID_ = null;
-
-  // Current LockHandler
-  private LockHandler handler_ = null;
-}
-
diff --git a/java/JACE/netsvcs/Token/package.html b/java/JACE/netsvcs/Token/package.html
deleted file mode 100644
index 80777aecc0a..00000000000
--- a/java/JACE/netsvcs/Token/package.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Token Service for remote mutexes and reader/writer locks.
-<P>
-New types of lock can be easily added on the command line to the service
-without changing existing code by implementing a LockHandler for the new
-type.
-<P>
-A simple test client is available in the tests directory under
-netsvcs\Token.
-
-@see JACE.netsvcs.Token.LockHandler
-@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a>
-</BODY>
-</HTML>
diff --git a/java/JACE/netsvcs/package.html b/java/JACE/netsvcs/package.html
deleted file mode 100644
index a806080aece..00000000000
--- a/java/JACE/netsvcs/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Bases classes for the network services and two activation strategies.
-<P>
-Services can be loaded and managed via the Service Configurator.
-
-@see JACE.ServiceConfigurator
-@see <a href="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">ACE Network Services</a>
-</BODY>
-</HTML>
diff --git a/java/JACE/overview.html b/java/JACE/overview.html
deleted file mode 100644
index a0c2fdabd73..00000000000
--- a/java/JACE/overview.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-Java ACE is a collection of Java packages containing classes that have been 
-converted from the C++ version of the 
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ADAPTIVE Communication 
-Environment</A> (ACE).
-<P>
-The C++ version of ACE is a large object-oriented network programming toolkit 
-which contains over 125,000 lines of C++ code and uses advanced C++ features 
-like templates.
-</P>
-<P>The goal of converting ACE from C++ to Java is to provide a portable 
-programming toolkit with a similar interface and functionality to the original
- version of ACE. This allows new and current users of C++ ACE an easy transition
-to Java and also adds significant value to programming concurrent Java 
-networking applications. Note that applications written using Java ACE can 
-communicate seamlessly over sockets with applications written using C++ ACE.
-</P>
-<P>
-The following diagram illustrates the architecture of the Java version of ACE:
-</P>
-
-<P ALIGN="CENTER">
-<IMG SRC="images/java-ace.gif" WIDTH="735" HEIGHT="339" ALIGN="BOTTOM" BORDER="0">
-</P>
-
-<P>
-The Java ACE architecture has fewer components than the diagram illustrating 
-the architecture for the 
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">C++ version 
-of ACE </A>. This reduction in size occurs for two reasons. First, the Java 
-Virtual Machine (JVM) handles many of the portability issues provided by C++ 
-ACE. Therefore, the OS adaptation layer is unnecessary. Second,
-Java doesn't support certain OS features provided by Win32, UNIX, and other 
-OS platforms that C++ ACE is ported to.  For example, Java doesn't support 
-shared memory and memory-mapped files and therefore the memory management 
-wrappers (such as <CODE>Mem_Map</CODE> and <CODE>Shared_Malloc</CODE>) are 
-omitted from Java ACE.
-</P>
-
-<P>
-The process of converting ACE from C++ to Java provided us with an excellent 
-source of insights on the strengths and weaknesses of using Java for 
-industrial-strength software system frameworks. We've written a paper 
-documenting our 
-<A HREF="http://www.cs.wustl.edu/~schmidt/C++2java.html">experiences</A> 
-converting the C++ version of ACE to Java.
-</P>
-
-<H3>Copyright Information for Java ACE</H3>
-
-<P>
-Java ACE is copyrighted by 
-<A HREF="http://www.cs.wustl.edu/~schmidt">Douglas C. Schmidt</A> and his 
-research group at 
-<A HREF="http://www.wustl.edu">Washington University</A>.
-You are free to do anything you like with the Java ACE source code such 
-as including it in commercial software, as long as you include this copyright 
-statement along with code built using Java ACE. 
-</P>
-<P>
-You are under no obligation to freely redistribute any of your source
-code that is built using Java ACE. Please note, however, that you may
-not do anything to the Java ACE code that will prevent it from being
-distributed freely (such as copyrighting it yourself). Naturally, I am not
-responsible for any problems caused by using Java ACE.
-</P>
-<P>
-My goal is to see Java ACE continue to evolve and become a more
-comprehensive, robust, and well-documented Java toolkit that is freely
-available to researchers and developers. If you have any
-improvements, suggestions, and or comments, I'd like to hear about it.
-</P>
-<P>
-Thanks, 
-</P>
-<P>
-Douglas C. Schmidt
-<BR>
-<A HREF="mailto@schmidt@cs.wustl.edu">schmidt@cs.wustl.edu</A>
-</P>
-</BODY>
-</HTML>
diff --git a/java/JACE/package.html b/java/JACE/package.html
deleted file mode 100644
index 72d43449ea7..00000000000
--- a/java/JACE/package.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- $Id$ -->
-<HTML>
-<BODY>
-
-<H3>Overview of Java ACE</H3>
-<P>Java ACE is a collection of Java packages containing classes that have been converted from the C++ version of
-the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ADAPTIVE Communication Environment</A> (ACE). The C++ version
-of ACE is a large object-oriented network programming toolkit which contains over 125,000 lines of C++ code and
-uses advanced C++ features like templates.</P>
-<P>The goal of converting ACE from C++ to Java is to provide a portable programming toolkit with a similar interface
-and functionality to the original version of ACE. This allows new and current users of C++ ACE an easy transition
-to Java and also adds significant value to programming concurrent Java networking applications. Note that applications
-written using Java ACE can communicate seamlessly over sockets with applications written using C++ ACE.</P>
-<P>The following diagram illustrates the architecture of the Java version of ACE:</P>
-<CENTER>
-<IMG SRC="java-ace.gif" ALIGN="BOTTOM" BORDER="0"></CENTER>
-<P>
-The Java ACE architecture has fewer components than the diagram illustrating the architecture for the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">C++
-version of ACE </A>. This reduction in size occurs for two reasons. First, the Java Virtual Machine (JVM) handles
-many of the portability issues provided by C++ ACE. Therefore, the OS adaptation layer is unnecessary. Second,
-Java doesn't support certain OS features provided by Win32, UNIX, and other OS platforms that C++ ACE is ported
-to. For example, Java doesn't support shared memory and memory-mapped files and therefore the memory management
-wrappers (such as <CODE>Mem_Map</CODE> and <CODE>Shared_Malloc</CODE>) are omitted from Java ACE.</P>
-
-<P>The process of converting ACE from C++ to Java provided us with an excellent source of insights on the strengths
-and weaknesses of using Java for industrial-strength software system frameworks. We've written a paper documenting
-our <A HREF="http://www.cs.wustl.edu/~schmidt/C++2java.html">experiences</A> converting the C++ version of ACE
-to Java.
-
-</BODY>
-</HTML>
-
diff --git a/java/JACE/tests/ASX/BufferStreamTest.java b/java/JACE/tests/ASX/BufferStreamTest.java
deleted file mode 100644
index a9600da19dc..00000000000
--- a/java/JACE/tests/ASX/BufferStreamTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    BufferStreamTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-
-/**
- * This short program copies stdin to stdout via the use of an ASX
- * STREAM.  It illustrates an implementation of the classic "bounded
- * buffer" program using an ASX STREAM containing two Modules.  Each
- * Module contains two Tasks.  
- */
-public class BufferStreamTest
-{
-
-  static class CommonTask extends Task
-  {
-    // ACE_Task hooks
-    public int open (Object obj)
-    {
-      if (this.activate (0, 1, false) == -1)
-	ACE.ERROR ("spawn");
-      return 0;
-    }
-
-    public int close (long exitStatus)
-    {
-      ACE.DEBUG (Thread.currentThread () + " thread is exiting with status "  +
-		 exitStatus + " in module " + this.name () + "\n");
-      return 0;
-    }
-
-    public int put (MessageBlock mb, TimeValue tv) 
-    { 
-      return 0; 
-    }
-
-    public int handleTimeout (TimeValue tv, Object obj)
-    {
-      return 0;
-    }
-  }
-
-  // Define the Producer interface. 
-
-  static class Producer extends CommonTask
-  {
-    // Read data from stdin and pass to consumer.
-    // The Consumer reads data from the stdin stream, creates a message,
-    // and then queues the message in the message list, where it is
-    // removed by the consumer thread.  A 0-sized message is enqueued when
-    // there is no more data to read.  The consumer uses this as a flag to
-    // know when to exit.
-
-    public int svc ()
-    {
-      // Keep reading stdin, until we reach EOF. 
-
-      BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); 
-
-      String msg = null;
-      try
-	{
-	  while (true)
-	    {
-	      System.out.print ("Enter input: ");
-	      System.out.flush ();
-	      msg = in.readLine ();
-	      if (msg == null)
-		{
-		  // Send a shutdown message to the other thread and exit.
-		  if (this.putNext (new MessageBlock (0), null) == -1)
-		    ACE.ERROR ("putNext");
-		  break;
-		}
-	      else
-		{
-		  // Send the message to the other thread.
-		  if (this.putNext (new MessageBlock (msg), null) == -1)
-		    ACE.ERROR ("putNext");
-		}
-	    }
-	}
-      catch (IOException e)
-	{
-	}
-      return 0;
-    }
-  }
-
-  static class Consumer extends CommonTask
-				// = TITLE
-				//    Define the Consumer interface. 
-  {
-    // Enqueue the message on the MessageQueue for subsequent
-    // handling in the svc() method.
-    public int put (MessageBlock mb, TimeValue tv)
-      { 
-	try
-	  {
-	    return this.putq (mb, tv);
-	  }
-	catch (InterruptedException e)
-	  {
-	  }
-	return 0;
-      }
-
-    // The consumer dequeues a message from the ACE_Message_Queue, writes
-    // the message to the stderr stream, and deletes the message.  The
-    // Consumer sends a 0-sized message to inform the consumer to stop
-    // reading and exit.
-
-    public int svc ()
-      {
-	MessageBlock mb = null;
-
-	// Keep looping, reading a message out of the queue, until we
-	// timeout or get a message with a length == 0, which signals us to
-	// quit.
-	try
-	  {
-	    while (true)
-	      {
-		// Wait for upto 4 seconds
-		mb = this.getq (TimeValue.relativeTimeOfDay (4, 0));
-	  
-		if (mb == null)
-		  break;
-	  
-		int length = mb.length ();
-	  
-		if (length > 0)
-		  System.out.println ("\n" + mb.base ());
-
-		if (length == 0)
-		  break;
-	      }
-	  }
-	catch (InterruptedException e)
-	  {
-	  }
-	if (mb == null)
-	  {
-	    ACE.ERROR ("timed out waiting for message");
-	    System.exit (1);
-	  }
-	return 0;
-      }
-  }
-
-  // Spawn off a new thread.
-
-  public static void main (String args[])
-  {
-    ACE.enableDebugging ();
-
-    // Control hierachically-related active objects
-    Stream stream = new Stream ();
-    Module pm = new Module ("Consumer", new Consumer (), null, null);
-    Module cm = new Module ("Producer", new Producer (), null, null);
-
-    // Create Producer and Consumer Modules and push them onto the
-    // STREAM.  All processing is performed in the STREAM.
-
-    if (stream.push (pm) == -1)
-      {
-	ACE.ERROR ("push");
-	return;
-      }
-    else if (stream.push (cm) == -1)
-      {
-	ACE.ERROR ("push");
-	return;
-      }
-  }
-}
diff --git a/java/JACE/tests/ASX/MessageQueueTest.java b/java/JACE/tests/ASX/MessageQueueTest.java
deleted file mode 100644
index 38f098c1bb7..00000000000
--- a/java/JACE/tests/ASX/MessageQueueTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    MessageQueueTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-
-public class MessageQueueTest
-{
-  public static void main (String args[])
-    {
-      ACE.enableDebugging ();
-
-      try
-	{
-	  MessageBlock conMb;
-	  MessageQueue msgQueue = new MessageQueue ();
-	  MessageBlock mb1 = new MessageBlock ("hello");
-	  MessageBlock mb2 = new MessageBlock ("world");
-	  mb1.msgPriority (5);
-	  mb2.msgPriority (7);
-
-	  // Enqueue in priority order.
-	  if (msgQueue.enqueue (mb1) == -1)
-	    ACE.ERROR ("put_next");
-
-	  if (msgQueue.enqueue (mb2) == -1)
-	    ACE.ERROR ("put_next");
-
-	  // Now try to dequeue
-	  if ((conMb = msgQueue.dequeueHead ()) == null)
-	    ACE.ERROR ("dequeueHead");
-	  else
-	    ACE.DEBUG ("Consumer: removed item " + conMb.base () 
-		       + " of priority " + conMb.msgPriority ());
-	}
-      catch (InterruptedException e)
-	{
-	  ACE.ERROR (e);
-	}
-    }
-}
-  
diff --git a/java/JACE/tests/ASX/PriorityBufferTest.java b/java/JACE/tests/ASX/PriorityBufferTest.java
deleted file mode 100644
index 37f0370522d..00000000000
--- a/java/JACE/tests/ASX/PriorityBufferTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    PriorityBufferTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-
-class consumer extends Thread
-{
-  public void run ()
-    {
-      MessageBlock mb = null;
-      long curPriority = 0;
-      int length = 0;
-
-      try
-	{
-	  // Keep looping, reading a message out of the queue, until we
-	  // get a message with a length == 0, which signals us to quit.
-	  for (;;)
-	    {
-	      if ((mb = PriorityBufferTest.msgQueue.dequeueHead ()) == null)
-		break;
-	      
-	      length = mb.length ();
-	      curPriority = mb.msgPriority ();
-	      
-	      if (length > 0)
-		ACE.DEBUG ("Consumer: removed item \"" + mb.base () + "\" of priority: " + curPriority);
-	      
-	      if (length == 0)
-		break;
-	    }
-	}
-      catch (InterruptedException e)
-	{
-	}
-    }
-}
-
-class producer extends Thread
-{
-  producer (int delay)
-    {
-      this.delay_ = delay;
-    }
-
-  public void run ()
-    {
-      try 
-	{
-	  long count = 0;
-	  for (char c = 'a'; c <= 'z'; c++)
-	    {
-	      count++;
-	      // Allocate a new message
-	      MessageBlock mb = new MessageBlock (new Character (c).toString ());
-	      // Set the priority
-	      mb.msgPriority (count);
-	  
-	      // Enqueue in priority order.
-	      if (PriorityBufferTest.msgQueue.enqueue (mb) == -1)
-		ACE.ERROR ("put_next");
-	      else
-		{
-		  ACE.DEBUG ("Producer: inserted item \"" + mb.base () + "\" of priority: " + count);
-		  if (this.delay_ > 0)
-		    this.sleep (this.delay_);
-		}
-	    }
-
-	  // Now send a 0-sized shutdown message to the other thread
-	  if (PriorityBufferTest.msgQueue.enqueueTail (new MessageBlock (0)) == -1)
-	    ACE.ERROR ("put_next");
-	}
-      catch (InterruptedException e)
-	{
-	}
-    }
-
-  private int delay_;
-}
-
-public class PriorityBufferTest
-{
-  public static MessageQueue msgQueue = new MessageQueue ();
-
-  public static void main (String args[])
-    {
-      ACE.enableDebugging ();
-
-      int delay = 0;
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      delay = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      ACE.ERROR ("Illegal argument.");
-	    }
-	}
-      new producer (delay).start ();
-      new consumer ().start ();      
-    }
-}
diff --git a/java/JACE/tests/ASX/TaskTest.java b/java/JACE/tests/ASX/TaskTest.java
deleted file mode 100644
index 09ebfe22a1f..00000000000
--- a/java/JACE/tests/ASX/TaskTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    TaskTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class TaskTest extends Task
-{
-  int nThreads_;
-  int nIterations_;
-
-  public TaskTest (int nThreads, int nIterations)
-    {
-      this.nIterations_ = nIterations;
-      this.nThreads_ = nThreads;
-    }
-
-  public void beginTest ()
-  {
-    if (this.activate (0, this.nThreads_, true) == -1)
-      ACE.ERROR ("activate failed");
-  }
-  
-  public int open (Object obj)
-    {
-      return 0;
-    }
-
-  public int close (long flags)
-    {
-      return 0;
-    }
-
-  public int put (MessageBlock mb, TimeValue tv)
-    {
-      return 0;
-    }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-  
-  public int svc ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  ACE.DEBUG (Thread.currentThread ().toString () + 
-		     " in iteration " + i);
-	  // Allow other threads to run
-	  Thread.yield ();
-	}
-      return 0;
-    }
-
-  public static void main (String args[])
-    {
-      int nThreads = 1;
-      int nIterations = 1;
-
-      ACE.enableDebugging ();
-
-      try
-	{
-	  if (args.length == 2)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	      nIterations = Integer.parseInt (args[1]);
-	    }
-	  else if (args.length == 1)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-      TaskTest tt = new TaskTest (nThreads, nIterations);
-      tt.beginTest ();
-    }
-}
diff --git a/java/JACE/tests/ASX/ThreadPoolTest.java b/java/JACE/tests/ASX/ThreadPoolTest.java
deleted file mode 100644
index c48b0caf3c2..00000000000
--- a/java/JACE/tests/ASX/ThreadPoolTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    ThreadPoolTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class ThreadPoolTest extends Task
-{
-  int nThreads_;
-  int nIterations_;
-  
-  public static int MAX_MB_SIZE = 1024;
-
-  public ThreadPoolTest (int nThreads, int nIterations)
-    {
-      this.nIterations_ = nIterations;
-      this.nThreads_ = nThreads;
-      if (this.activate (0, nThreads, true) == -1)
-	ACE.ERROR ("activate failed");
-    }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-
-  public int open (Object obj)
-    {
-      return 0;
-    }
-
-  public int close (long flags)
-    {
-      return 0;
-    }
-
-  public int put (MessageBlock mb, TimeValue tv)
-    {
-      try
-	{
-	  return this.putq (mb, tv);
-	}
-      catch (InterruptedException e)
-	{
-	}
-      return 0;
-    }
-  
-  public int svc ()
-    {
-      int count = 1;
-
-      // Keep looping, reading a message out of the queue, until we get a
-      // message with a length == 0, which signals us to quit.
-      try
-	{
-	  for (;; count++)
-	    {       
-	      MessageBlock mb = this.getq (null);
-	      if (mb == null)
-		{
-		  ACE.ERROR (Thread.currentThread ().toString () + " in iteration " + count + ", got result -1, exiting");
-		  break;
-		}
-	      int length = mb.length ();
-	      
-	      if (length > 0)
-		ACE.DEBUG (Thread.currentThread ().toString () +
-			   " in iteration " + count + ", length = " + 
-			   length + ", text = \"" + mb.base () + "\"");
-	      
-	      if (length == 0)
-		{
-		  ACE.DEBUG (Thread.currentThread ().toString () +
-			     " in iteration " + count + 
-			     ", got NULL message, exiting");
-		  break;
-		}
-	      Thread.yield ();
-	    }
-	}
-      catch (InterruptedException e)
-	{
-	}
-      return 0;
-    }
-
-  public static void produce (ThreadPoolTest threadPool, int nIterations)
-    {
-      int count = 0;
-      for (int n = 0;;)
-	{
-	  // Allocate a new message.
-	  MessageBlock mb = new MessageBlock (new Integer (count).toString ());
-	  
-	  if (count == nIterations)
-	    n = 1; // Indicate that we need to shut down.
-	  else
-	    count++;
-
-	  if (count == 0 || (count % 20 == 0))
-	    {
-	      try
-		{
-		  Thread.sleep (1);
-		}
-	      catch (InterruptedException e)
-		{
-		}
-	    }
-	  if (n != 1)
-	    {
-	      ACE.DEBUG ("Producing...");
-	      // Pass the message to the Thread_Pool.
-	      if (threadPool.put (mb, null) == -1)
-		ACE.ERROR ("put");
-	    }
-	  else
-	    {
-	      // Send a shutdown message to the waiting threads and exit.
-	      ACE.DEBUG ("start loop, dump of task");
-
-	      for (int i = threadPool.thrCount (); i > 0; i--)
-		{
-		  ACE.DEBUG (Thread.currentThread ().toString () + 
-			     "EOF, enqueueing NULL block for thread " + i);
-
-		  // Enqueue a NULL message to flag each consumer to
-		  // shutdown.
-		  if (threadPool.put (new MessageBlock (0), null) == -1)
-		    ACE.ERROR ("put");
-		}
-
-	      break;
-	    }
-	}
-    }
-
-  public static void main (String args[])
-    {
-      int nThreads = 1;
-      int nIterations = 100;
-
-      ACE.enableDebugging ();
-
-      try
-	{
-	  if (args.length == 2)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	      nIterations = Integer.parseInt (args[1]);
-	    }
-	  else if (args.length == 1)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-      ACE.DEBUG ("Threads = " + nThreads + " Iterations = " + nIterations);
-
-      // Create the worker tasks.
-      ThreadPoolTest threadPool = new ThreadPoolTest (nThreads,
-						      nIterations);
-
-      // Create work for the worker tasks to process in their own threads.
-      produce (threadPool, nIterations);
-      ACE.DEBUG ("exiting...");
-    }
-}
-
-
diff --git a/java/JACE/tests/Concurrency/Condition/Consumer.java b/java/JACE/tests/Concurrency/Condition/Consumer.java
deleted file mode 100644
index e43a28f00e0..00000000000
--- a/java/JACE/tests/Concurrency/Condition/Consumer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-//File: Consumer.java
-//Seth Widoff 8/8/96
-//This class attempts at random intervals to dequeue random elements
-//from a queue. If the queue is empty the thread waits until an element
-//has been enqueued and another thread has invoked the notify() method.
-package JACE.tests.Concurrency.Condition;
-
-import java.lang.Math;
-import JACE.ASX.TimeValue;
-import java.util.Random;
-
-public class Consumer implements Runnable
-{
-  //Maximum pause between dequeues (in milliseconds)
-  private static final int MAX_PAUSE = 1000;
-
-  private SimpleMessageQueue queue_;
-  private boolean stop_requested_ = false;
-  private String name_;
-  private int iterations_;
-  private TimeValue timeout_;
-  
-  public Consumer(String name, 
-		  SimpleMessageQueue queue, 
-		  int iterations,
-		  TimeValue timeout)
-  {
-    name_ = "Consumer " + name;
-    queue_ = queue;
-    iterations_ = iterations;
-    timeout_ = timeout;
-  }
-
-  public void run()
-  {
-    //Set the random number generator seed to the current time in
-    //milliseconds.
-
-    Random random = new Random(System.currentTimeMillis());
-    Integer element;
-
-    for (int i = 0; i < iterations_; )
-      {
-	try
-	  {
-	    TimeValue absTv = TimeValue.relativeTimeOfDay (timeout_);
-	    element = (Integer)queue_.dequeue(absTv);
-	    if (element != null)
-	      {
-		
-		System.out.println("Consumer::run() " + name_ + " dequeued " 
-				 + element.toString() +
-				 " Queue size: " + queue_.size());
-		
-		Thread.sleep(Math.abs (random.nextLong()) % MAX_PAUSE);
-	      }
-	    else
-	      {
-		System.out.println ("Null");
-	      }
-	    i++;
-	  }
-	catch(Exception excp)
-	  {
-	    System.out.print ("Consumer::run() Exception: ");
-	    System.out.println(excp);
-	  }
-      }
-  }
-
-  public void requestStop()
-  {
-    stop_requested_ = true;
-  }
-}
diff --git a/java/JACE/tests/Concurrency/Condition/JoinableThreadGroup.java b/java/JACE/tests/Concurrency/Condition/JoinableThreadGroup.java
deleted file mode 100644
index 908da33f9f9..00000000000
--- a/java/JACE/tests/Concurrency/Condition/JoinableThreadGroup.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package JACE.tests.Concurrency.Condition;
-
-public class JoinableThreadGroup extends ThreadGroup
-{
-  public JoinableThreadGroup(String name)
-  {
-    super(name);
-  }
-
-  public JoinableThreadGroup(ThreadGroup parent, String name)
-  {
-    super(parent, name);
-  }
-
-  public void join() throws InterruptedException
-  {
-    Thread list[] = new Thread[activeCount()];
-
-    enumerate(list, true);
-
-    for (int i = 0; i < list.length; i++)
-      list[i].join();
-  }
-}
diff --git a/java/JACE/tests/Concurrency/Condition/Producer.java b/java/JACE/tests/Concurrency/Condition/Producer.java
deleted file mode 100644
index cda5063ceed..00000000000
--- a/java/JACE/tests/Concurrency/Condition/Producer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//File: Producer.java
-//Seth Widoff 8/8/96
-//This class attempts at random intervals to enqueue random elements
-//into a queue. If the queue is full the thread waits until an element
-//has been dequeued and another thread has invoked the notify() method.
-
-package JACE.tests.Concurrency.Condition;
-
-import JACE.ASX.TimeValue;
-import java.lang.Math;
-import java.util.Random;
-
-public class Producer implements Runnable
-{
-  //Maximum pause between enqueues (in milliseconds)
-  private static final int MAX_PAUSE = 1000;
-  
-  private SimpleMessageQueue queue_;
-  private boolean stop_requested_ = false;
-  private String name_;
-  private int iterations_;
-  private TimeValue timeout_;
-
-  public Producer(String name, 
-		  SimpleMessageQueue queue, 
-		  int iterations,
-		  TimeValue timeout)
-  {
-    name_ = "Producer " + name;
-    queue_ = queue;
-    iterations_ = iterations;
-    timeout_ = timeout;
-  }
-
-  public void run()
-  {
-    //Set the random number generator seed to the current time in milliseconds.
-    Random random = new Random(System.currentTimeMillis());
-    int element = 1;
-    
-    for (int i = 0; i < iterations_; )
-      {
-	try
-	  {
-	    //	    element = random.nextInt();
-	    TimeValue absTv = TimeValue.relativeTimeOfDay (timeout_);
-	    queue_.enqueue((Object)new Integer(element), absTv);
-
-	    System.out.println("Producer::run() " + name_ 
-			     + " enqueued " + element +
-			       " Queue size: " + queue_.size());
-	    
-	    Thread.sleep(Math.abs (random.nextLong()) % MAX_PAUSE);
-	    i++;
-	    element++;
-	  }
-	catch(Exception excp)
-	  {
-	    System.out.print("Producer::run() Exception: ");
-	    System.out.println(excp);
-	  }
-      }
-  }
-
-  public void requestStop()
-  {
-    stop_requested_ = true;
-  }
-}
-
diff --git a/java/JACE/tests/Concurrency/Condition/QueueTest.java b/java/JACE/tests/Concurrency/Condition/QueueTest.java
deleted file mode 100644
index 7d6560b11a7..00000000000
--- a/java/JACE/tests/Concurrency/Condition/QueueTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-//File: QueueTest.java
-//Seth Widoff, 8/8/96
-//This class is a test method for the Producer and Consumer classes.
-//The main method takes as arguments the number of producers, the
-//number of consumers and the number of elements in the queue. It then
-//spawn the specified threads and starts them.
-
-package JACE.tests.Concurrency.Condition;
-
-import JACE.ASX.TimeValue;
-
-public class QueueTest
-{
-  public static void main(String[] args)
-  {
-    if (args.length < 5)
-      {
-	System.out.println("Usage: java QueueTest <# producers> <# consumers> " +
-			   "<# elements> <#iterations> <#timeout secs> <#timeout nano secs>");
-	System.exit(1);
-      }
-    
-    int num_producers = Integer.parseInt(args[0]),
-      num_consumers = Integer.parseInt(args[1]),
-      num_elements = Integer.parseInt(args[2]),
-      num_iterations = Integer.parseInt(args[3]),
-      num_timeout_secs = Integer.parseInt(args[4]),
-      num_timeout_nano_secs = Integer.parseInt(args[5]);
-    
-    if (num_elements < 1 
-	|| num_consumers < 1 
-	|| num_producers < 1)
-      {
-	System.out.println("All the parameters must be larger than zero.");
-	System.exit(1);
-      }
-    
-    SimpleMessageQueue queue = new SimpleMessageQueue(num_elements);
-    Consumer[] consumers = new Consumer[num_consumers];
-    Producer[] producers = new Producer[num_producers];
-    JoinableThreadGroup thread_group = new JoinableThreadGroup("Producer Consumer");
-
-    for (int i = 0; i < num_producers; i++)
-      {
-	producers[i] = new Producer("Number " + (i + 1), 
-				    queue, 
-				    num_iterations, 
-				    new TimeValue (num_timeout_secs, num_timeout_nano_secs));
-	new Thread(thread_group, producers[i]).start();
-      }
-
-    for (int i = 0; i < num_consumers; i++)
-      {
-	consumers[i] = new Consumer("Number " + (i + 1), queue, num_iterations, new TimeValue (num_timeout_secs, num_timeout_nano_secs));
-	new Thread(thread_group, consumers[i]).start();
-      }
-
-    try
-      {
-	thread_group.join();
-      }
-    catch(InterruptedException excp)
-      {
-	System.out.println("QueueTest::main");
-	System.out.println(excp);
-      }
-  }
-}
diff --git a/java/JACE/tests/Concurrency/Condition/SimpleMessageQueue.java b/java/JACE/tests/Concurrency/Condition/SimpleMessageQueue.java
deleted file mode 100644
index f2a465a9025..00000000000
--- a/java/JACE/tests/Concurrency/Condition/SimpleMessageQueue.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package JACE.tests.Concurrency.Condition;
-
-import JACE.ASX.TimeoutException;
-import JACE.ASX.TimeValue;
-import JACE.Concurrency.*;
-
-public class SimpleMessageQueue
-{
-  private int num_items_ = 0;
-  private int head_ = 0, tail_ = 0;
-  private Object[] queue_;
-
-  private Mutex lock_ = new Mutex ();
-  private Condition notFull_ = new Condition (lock_);
-  private Condition notEmpty_ = new Condition (lock_);
-  
-  public SimpleMessageQueue(int size)
-  {
-    queue_ = new Object[size];
-  }
- 
-   public void enqueue(Object element, TimeValue timeout)
-    throws TimeoutException, InterruptedException
-  {
-    try 
-      {
-	lock_.acquire ();    
-	while (this.isFull ())
-	  notFull_.Wait (timeout);
-	
-	if (tail_ == queue_.length)
-	  tail_ = 0;
-	queue_[tail_] = element;
-	tail_++;
-
-	num_items_++;
-	notEmpty_.signal ();
-      }
-    finally
-      {
-	lock_.release ();
-      }
-  }
-
-  public Object dequeue (TimeValue timeout) 
-       throws TimeoutException, InterruptedException
-  {
-    Object return_value = null;
-	
-    try 
-      {
-	lock_.acquire ();
-	while (this.isEmpty ())
-	  notEmpty_.Wait (timeout);
-	
-	return_value = queue_[head_];
-	head_++;
-	if (head_ == queue_.length)
-	  head_ = 0;
-
-	num_items_--;    
-	notFull_.signal ();
-      }
-    finally 
-      {
-	lock_.release ();
-      }
-    return return_value;
-  }
-
-  public boolean isEmpty()
-  {
-    return num_items_ == 0;
-  }
-
-  public boolean isFull()
-  {
-    return num_items_ == queue_.length;
-  }
-
-  public int size()
-  {
-    return num_items_;
-  }
-}
-
diff --git a/java/JACE/tests/Concurrency/IterationTest.java b/java/JACE/tests/Concurrency/IterationTest.java
deleted file mode 100644
index 79e083e7f7a..00000000000
--- a/java/JACE/tests/Concurrency/IterationTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.tests.Concurrency
- *
- * = FILENAME
- *    IterationTest.java
- *
- *@author Prashant Jain
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.tests.Concurrency;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-/**
- * Test which uses an AbstractLock to prevent threads from mangling
- * shared data.  This currently tests the four local concurrency
- * mechanisms -- Token, Mutex, RWMutex, and Semaphore.
- */
-public class IterationTest
-{
-  static class LockReader extends Thread
-  {
-    LockReader (int nIterations, AbstractLock lock)
-    {
-      this.nIterations_ = nIterations;
-      this.lock_ = lock;
-    }
-
-    public void run ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  // Acquire the lock (will block until it gets it)
-	  try
-	    {
-	      this.lock_.acquire ();
-	    }
-	  catch (InterruptedException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-	  catch (LockException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-
-	  IterationTest.count++;
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " reader acquired lock in iteration " + i +
-		     ", count = " + IterationTest.count);
-
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-	  // Release the lock
-	  try 
-	    {
-	      this.lock_.release ();
-	    }
-	  catch (LockException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	}
-    }
-  
-    int nIterations_;
-    AbstractLock lock_;
-  }
-
-  static class LockWriter extends Thread
-  {
-    LockWriter (int nIterations, AbstractLock lock)
-    {
-      this.nIterations_ = nIterations;
-      this.lock_ = lock;
-    }
-
-    public void run ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  // Acquire the lock (will block until it gets it)
-	  try
-	    {
-	      this.lock_.acquire ();
-	    }
-	  catch (InterruptedException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-	  catch (LockException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-	  
-	  
-	  IterationTest.count++;
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " writer acquired lock in iteration " + i +
-		     ", count = " + IterationTest.count);
-	  
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	  // Release the lock
-	  try 
-	    {
-	      this.lock_.release ();
-	    }
-	  catch (LockException e) 
-	    {
-	      ACE.ERROR (e);
-	    }
-
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	}
-    }
-  
-    int nIterations_;
-    AbstractLock lock_;
-  }
-
-  final static int TOKEN = 0;
-  final static int MUTEX = 1;
-  final static int RWMUTEX = 2;
-  final static int SEMAPHORE = 3;
-
-  /**
-   * Command line arguments:
-   * 
-   * (number of readers) (number of writers) (number of iterations)
-   */
-  public static void main (String args[]) throws InterruptedException
-  {
-    int nReaders = 1;
-    int nWriters = 1;
-    int nIterations = 100;
-    int i;
-
-    ACE.enableDebugging ();
-
-    try
-      {
-	if (args.length == 3)
-	  {
-	    nReaders = Integer.parseInt (args[0]);
-	    nWriters = Integer.parseInt (args[1]);
-	    nIterations = Integer.parseInt (args[2]);
-	  }
-      }
-    catch (NumberFormatException e)
-      {
-	ACE.ERROR ("Illegal argument.");
-      }
-
-    AbstractLock lock = null;
-    Thread threads[] = new Thread [nReaders + nWriters];
-
-    for (int state = TOKEN; state <= SEMAPHORE; state++) {
-
-      count = 0;
-
-      switch (state) 
-	{
-	case TOKEN:
-	  ACE.DEBUG ("--------\nTesting Token:");
-	  lock = new Token ();
-	  break;
-	case MUTEX:
-	  ACE.DEBUG ("--------\nTesting Mutex:");
-	  lock = new Mutex ();
-	  break;
-	case RWMUTEX:
-	  ACE.DEBUG ("--------\nTesting RWMutex:");
-	  lock = new RWMutex ();
-	  break;
-	case SEMAPHORE:
-	  ACE.DEBUG ("--------\nTesting Semaphore:");
-	  lock = new Semaphore ();
-	  break;
-	}
-
-      int numThreads = 0;
-
-      // Spawn off the readers and writers
-      for (i = 0; i < nReaders; i++) {
-	threads[numThreads] = new LockReader (nIterations, lock);
-	threads[numThreads].start ();
-	numThreads++;
-      }
-      
-      for (i = 0; i < nWriters; i++) {
-	threads[numThreads] = new LockWriter (nIterations, lock); 
-	threads[numThreads].start ();
-	numThreads++;
-      }
-
-      for (i = 0; i < numThreads; i++)
-	threads[i].join ();
-
-    }
-  }
-
-  public static int count;
-}
diff --git a/java/JACE/tests/Concurrency/RWMutexTest.java b/java/JACE/tests/Concurrency/RWMutexTest.java
deleted file mode 100644
index ff2bbc1f396..00000000000
--- a/java/JACE/tests/Concurrency/RWMutexTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.tests.Concurrency
- *
- * = FILENAME
- *    RWMutexTest.java
- *
- *@author Ross Dargahi (rossd@krinfo.com)
- *
- *************************************************/
-package JACE.tests.Concurrency;
-
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-public class RWMutexTest
-{
-  static class TestThread extends Thread
-  {
-    TestThread(String  name,
-	       boolean writer,
-	       AbstractLock lock)
-    {
-      super (name);
-      mWriter = writer;
-      mLock = lock;
-    }
-
-    public void output (String msg)
-    {
-      synchronized (iosynch) {
-	ACE.DEBUG (msg);
-      }
-    }
-
-    public void run()
-    {
-      for (int i = 0; i < 10; i++)
-	{
-	  try
-	    {
-	      if (!mWriter)
-		{
-		  mLock.acquireRead();
-		  output (getName() + ": Acquired Read Lock");
-		
-		  int sleepTime = 10;
-		  sleep (sleepTime);
-
-		  mLock.release ();
-		  output (getName () + ": Released Read Lock");
-		}
-	      else
-		{
-		  mLock.acquireWrite ();
-		  output (getName () + ": Acquired Write Lock");
-		
-		  int sleepTime = 10;
-		  sleep (sleepTime);
-
-		  mLock.release ();
-		  output (getName () + ": Released Write Lock");
-		}
-	    }
-	  catch (InterruptedException ex)
-	    {
-	      ACE.ERROR ("InterruptedException");
-	    }
-	  catch (LockException ex) 
-	    {
-	      ACE.ERROR ("LockException: " + ex.getMessage ());
-	    }
-	}
-    }
-
-    AbstractLock  mLock;
-    boolean mWriter;
-
-    static Object iosynch = new Object ();
-  }
-
-  /**
-   * Command line arguments:
-   *
-   * Optional class name to use for the tests (must implement the
-   * AbstractLock interface).  Followed by an optional number of
-   * iterations.
-   */
-  public static void main(String [] args)
-    throws ClassNotFoundException,
-	   IllegalAccessException,
-	   InstantiationException,
-	   InterruptedException,
-	   NumberFormatException
-  {
-    AbstractLock lock;
-    int iterations = 1;
-
-    ACE.enableDebugging ();
-
-    if (args.length > 0) {
-      ACE.DEBUG("Using class " + args[0] + " as the Lock");
-      
-      lock = (AbstractLock)(Class.forName (args[0]).newInstance ());
-
-      if (args.length > 1) 
-	iterations = Integer.parseInt (args[1]);
-	
-    } else
-      lock = new RWMutex ();
- 
-    for (int i = 0; i < iterations; i++) {
-  
-      ACE.DEBUG("Iteration " + (i + 1));
-
-      TestThread t1 = new TestThread ("1", false, lock);
-      TestThread t2 = new TestThread ("2", false, lock);
-      TestThread t3 = new TestThread ("3", false, lock);
-      TestThread t4 = new TestThread ("4", true, lock);
-      TestThread t5 = new TestThread ("5", false, lock);
-      TestThread t6 = new TestThread ("6", false, lock);
-      TestThread t7 = new TestThread ("7", false, lock);
-      TestThread t8 = new TestThread ("8", true, lock);
-
-      t1.start ();
-      t2.start ();
-      t3.start ();
-      t4.start ();
-      t5.start ();
-      t6.start ();
-      t7.start ();
-      t8.start ();
-    }
-  }
-}
-
diff --git a/java/JACE/tests/Concurrency/TimingTest.java b/java/JACE/tests/Concurrency/TimingTest.java
deleted file mode 100644
index 783d2e003a2..00000000000
--- a/java/JACE/tests/Concurrency/TimingTest.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package JACE.tests.Concurrency;
-
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Concurrency.*;
-
-/** 
- * Performs a test with 5 threads.  This should test what happens during
- * renews, also testing what happens when timeout exceptions are generated
- * during operations.
- *
- * Sample output:
- *
- * Thread 1 calling acquire
- * Thread 1 got lock
- * Thread 1 doing work
- * Thread 2 calling acquire
- * Thread 1 finished doing work
- * Thread 1 calling renew -1 1
- * Thread 2 got lock
- * Thread 2 doing work
- * Thread 3 calling acquire
- * Thread 4 calling acquire
- * Thread 5 calling acquire with 1 sec timeout
- * Thread 1 timed out in renew
- * Thread 1 failed renewing
- * Thread 1 calling release
- * Thread 1 failed release
- * Thread 5 timed out in acquire
- * Thread 5 failed acquire
- * Thread 5 calling release
- * Thread 5 failed release
- * Thread 2 finished doing work
- * Thread 2 calling renew 1
- * Thread 3 got lock
- * Thread 3 doing work
- * Thread 3 finished doing work
- * Thread 3 calling release
- * Thread 3 released
- * Thread 2 got the lock back
- * Thread 2 calling release
- * Thread 2 released
- * Thread 4 got lock
- * Thread 4 doing work
- * Thread 4 finished doing work
- * Thread 4 calling release
- * Thread 4 released
- */
-public class TimingTest
-{
-  static class Worker extends Thread
-  {
-    AbstractLock lock;
-    String name;
-    int order;
-
-    public Worker (String name, int order, AbstractLock lock)
-    {
-      this.name = name;
-      this.order = order;
-      this.lock = lock;
-    }
-
-    public void run()
-    {
-      switch (this.order) 
-	{
-	case 1:
-	  methodA();
-	  break;
-	case 2:
-	  methodB();
-	  break;
-	case 3:
-	  methodC();
-	  break;
-	case 4:
-	  methodD();
-	  break;
-	}
-    }
-
-    public void methodA()
-    {
-      // acquires
-      // launches a class 2 worker
-      // works
-      // renew -1 with a 1 sec timeout (intended to fail)
-      // release
-
-      try {
-	if (acquire() == AbstractLock.FAILURE)
-	  return;
-	
-	new Worker("Thread 2", 2, lock).start();
-	
-	work(3000);
-	
-	renew(-1, 1);
-      } finally {
-	release();
-      }
-    }
-
-    public void methodB()
-    {
-      // acquire
-      // launch two new class 3 workers and one class 4 worker 
-      // work
-      // renew, yielding to one waiter
-      // release
-      try {
-	if (acquire() == AbstractLock.FAILURE)
-	  return;
-	
-	new Worker ("Thread 3", 3, lock).start ();
-	new Worker ("Thread 4", 3, lock).start ();
-	new Worker ("Thread 5", 4, lock).start ();
-	
-	work(3000);
-	
-	renew(1);
-      } finally {
-	release();
-      }
-    }
-
-    public void methodC()
-    {
-      // acquire
-      // work
-      // release
-
-      try {
-	if (acquire() == AbstractLock.FAILURE)
-	  return;
-	
-	work(1000);
-      } finally {
-	release();
-      }
-
-    }
-
-    public void methodD()
-    {
-      // acquire with a short timeout 
-      // (shouldn't get past the timeout)
-      try {
-	if (acquire (1) == AbstractLock.FAILURE)
-	  return;
-	
-	ACE.DEBUG (name + " probably should have timed out in acquire");
-	work (1000);
-      } finally {
-	release ();
-      }
-    }
-
-    public int acquire (int relativeTimeout)
-    {
-      int result = AbstractLock.FAILURE;
-      ACE.DEBUG(name + " calling acquire with " + relativeTimeout +
-		" sec timeout");
-
-      try {
-	result = lock.acquire (TimeValue.relativeTimeOfDay (relativeTimeout, 0));
-      } catch (JACE.ASX.TimeoutException e) {
-	ACE.DEBUG(name + " timed out in acquire");
-      } catch (Exception e) {
-	ACE.DEBUG (name + " got exception: " + e);
-      }
-
-      if (result != AbstractLock.FAILURE)
-	ACE.DEBUG(name + " got lock");
-      else
-	ACE.DEBUG(name + " failed acquire");
-
-      return result;
-    }
-
-    public int acquire()
-    {
-      int result = AbstractLock.FAILURE;
-
-      ACE.DEBUG(name + " calling acquire");
-      try {
-	result = lock.acquire();
-      } catch (Exception e) {
-	ACE.DEBUG(name + " got exception: " + e);
-      }
-      if (result != AbstractLock.FAILURE)
-	ACE.DEBUG(name + " got lock");
-      else
-	ACE.DEBUG(name + " failed acquire");
-
-      return result;
-    }
-
-    public void release()
-    {
-      ACE.DEBUG(name + " calling release");
-      int result = AbstractLock.FAILURE;
-      try { 
-	result = lock.release();
-      } catch (Exception e) {
-	ACE.DEBUG (name + " got exception: " + e);
-      }
-
-      if (result != AbstractLock.FAILURE)
-	ACE.DEBUG(name + " released");
-      else
-	ACE.DEBUG(name + " failed release");
-    }
-
-    public void renew(int pos)
-    {
-      int result = AbstractLock.FAILURE;
-      ACE.DEBUG(name + " calling renew " + pos);
-      try {
-	result = lock.renew(pos);
-      } catch (Exception e) {
-	ACE.DEBUG (name + " got exception: " + e);
-      }
-
-      if (result != AbstractLock.FAILURE)
-	ACE.DEBUG(name + " got the lock back");
-      else
-	ACE.DEBUG(name + " failed renewing");
-    }
-
-    public void renew(int pos, int relativeTimeout)
-    {
-      int result = AbstractLock.FAILURE;
-      ACE.DEBUG(name + " calling renew " + pos + " " + 
-		relativeTimeout);
-      try {
-	result = lock.renew(pos,
-			    TimeValue.relativeTimeOfDay(relativeTimeout,
-							0));
-      } catch (JACE.ASX.TimeoutException e) {
-	ACE.DEBUG(name + " timed out in renew");
-      } catch (Exception e) {
-	ACE.DEBUG (name + " got exception: " + e);
-      }
-
-      if (result != AbstractLock.FAILURE)
-	ACE.DEBUG(name + " got the lock back");
-      else
-	ACE.DEBUG(name + " failed renewing");
-    }
-
-    public void work(int ms)
-    {
-      ACE.DEBUG(name + " doing work");
-      try {
-	Thread.sleep(ms);
-      } catch (InterruptedException e) { 
-	ACE.DEBUG(name + " was interrupted");
-      }
-      ACE.DEBUG(name + " finished doing work");
-    }
-  }
- 
-  /**
-   * Command line:
-   *
-   * Optional class name (which implements AbstractLock) to test
-   */
-  public static void main(String args[]) { 
-    AbstractLock lock;
-
-    ACE.enableDebugging ();
-
-    try {
-
-      if (args.length > 0) {
-	ACE.DEBUG("Using class " + args[0] + " as the Lock");
-
-	lock = (AbstractLock)(Class.forName (args[0]).newInstance ());
-      } else
-	lock = new Token ();
-
-      new Worker("Thread 1", 1, lock).start();
-
-    } catch (Exception e) {
-      ACE.ERROR("Error: " + e);
-    }
-  }
-} 
diff --git a/java/JACE/tests/Concurrency/TokenTest.java b/java/JACE/tests/Concurrency/TokenTest.java
deleted file mode 100644
index 162170f1996..00000000000
--- a/java/JACE/tests/Concurrency/TokenTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.Concurrency
- *
- * = FILENAME
- *    TokenTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.tests.Concurrency;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.Concurrency.ThreadManager;
-import JACE.Concurrency.*;
-import JACE.ASX.TimeValue;
-
-public class TokenTest implements Runnable
-{
-  static class MyToken extends Token
-  {
-    public void sleepHook ()
-    {
-      ACE.DEBUG (Thread.currentThread ().getName () + 
-		 " blocking, sleepHook called");
-    }  
-  }
-
-  public void run ()
-  {
-    String name = Thread.currentThread().getName();
-    try
-      {
-	if (this.token_.acquire () != AbstractLock.FAILURE)
-	  ACE.DEBUG (name + " got token");
-	else
-	  ACE.DEBUG (name + " couldn't get token");
-
-	ACE.DEBUG (name + " calling acquire again (test nesting)");
-	if (this.token_.acquire() != AbstractLock.FAILURE)
-	  ACE.DEBUG (name + " got token again");
-	else
-	  ACE.DEBUG (name + " couldn't get token");
-
-	Thread.sleep (1000);
-
-	ACE.DEBUG (name + " gives it up for max 2 sec to first waiter");
-	this.token_.renew (1, TimeValue.relativeTimeOfDay(2, 0));
-
-	ACE.DEBUG (name + " releases the token once");
-	this.token_.release ();
-	ACE.DEBUG (name + " calls release again (nesting level was 2)");
-	this.token_.release ();
-      }
-    catch (InterruptedException e)
-      {
-	this.token_.release ();
-      }
-    catch (JACE.ASX.TimeoutException e) 
-      {
-	ACE.DEBUG (name + " timed out");
-      }
-  }
-
-  /**
-   * Command line: optional number of threads to create (defaults to 2)
-   */
-  public static void main (String args [])
-  {
-    ThreadManager tm = new ThreadManager ();
-    int n = 2;
-
-    ACE.enableDebugging ();
-
-    try
-      {
-	if (args.length == 1)
-	  {
-	    n = Integer.parseInt (args[0]);
-	  }
-      }
-    catch (NumberFormatException e)
-      {
-	ACE.ERROR ("Illegal argument.");
-      }
-
-    tm.spawnN (n,
-	       new TokenTest (),
-	       false);
-  }
-
-  private static MyToken token_ = new MyToken ();
-}
diff --git a/java/JACE/tests/Connection/AcceptorTest.java b/java/JACE/tests/Connection/AcceptorTest.java
deleted file mode 100644
index 0e313ba1f43..00000000000
--- a/java/JACE/tests/Connection/AcceptorTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    AcceptorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class AcceptorTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: test_server [<port>]");
-      System.exit (0);
-    }
-
-  public void init (int port)
-    {
-      try
-	{
-	  Acceptor acceptor = 
-	    new Acceptor 
-	    (Class.forName ("JACE.tests.Connection.ServerHandler"));
-	  acceptor.open (port);
-	  while (true)
-	    {
-	      acceptor.accept ();
-	    }
-	}
-      catch (ClassNotFoundException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Socket Exception: " + e);
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR ("Dang!" + e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      AcceptorTest acceptorTest = new AcceptorTest ();
-
-      ACE.enableDebugging ();
-
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      acceptorTest.print_usage_and_die ();
-	    }
-	}
-      acceptorTest.init (port);
-    }
-}
diff --git a/java/JACE/tests/Connection/ClientHandler.java b/java/JACE/tests/Connection/ClientHandler.java
deleted file mode 100644
index d5885a892e9..00000000000
--- a/java/JACE/tests/Connection/ClientHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    ClientHandler.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ClientHandler extends SvcHandler
-{
-  public ClientHandler ()
-    {
-    }
-  
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  public void run ()
-    {
-      BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); 
-
-      String msg;
-      StringBuffer ack = new StringBuffer ();
-      int ack_len;
-      try
-	{
-	  while (true)
-	    {
-	      System.out.print ("Enter input: ");
-	      System.out.flush ();
-	      msg = in.readLine ();
-	      if (msg == null)
-		break;
-	      this.peer ().send (new StringBuffer (msg));
-	      System.out.println ("Waiting for ack...");
-	      ack_len = this.peer ().recv (ack);
-	      if (ack_len == 0)
-		break;
-	      else
-		System.out.println (ack);
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.peer ().close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-      
-    }
-}
diff --git a/java/JACE/tests/Connection/ConnectorTest.java b/java/JACE/tests/Connection/ConnectorTest.java
deleted file mode 100644
index 285e492dcaf..00000000000
--- a/java/JACE/tests/Connection/ConnectorTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    ConnectorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ConnectorTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: test_Connector <hostname> [<port>]");
-      System.exit (0);
-    }
-
-  public void init (String hostname, int port)
-    {
-      try
-	{
-	  Connector connector = new Connector ();
-	  connector.open (hostname, port);
-	  connector.connect (new ClientHandler ());
-	}
-      catch (UnknownHostException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Connection refused");
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      ConnectorTest connectorTest = new ConnectorTest ();
-
-      ACE.enableDebugging ();
-
-      if (args.length == 2)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[1]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      connectorTest.print_usage_and_die ();
-	    }
-	}
-      connectorTest.init (args[0], port);
-    }
-}
diff --git a/java/JACE/tests/Connection/HTTPHelperTest.java b/java/JACE/tests/Connection/HTTPHelperTest.java
deleted file mode 100644
index 28967acb8d3..00000000000
--- a/java/JACE/tests/Connection/HTTPHelperTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package JACE.tests.Connection;
-
-import java.io.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-
-public class HTTPHelperTest 
-{
-  public static void main(String args[])
-  {
-    ACE.enableDebugging ();
-    // This is just a quick test to confirm that the Base 64 
-    // encoding and decoding work
-    // (tests the example given in the HTTP 1.1 RFC)
-
-    String secret = "Aladdin:open sesame";
-
-    String encoded = HTTPHelper.EncodeBase64(secret);
-
-    System.err.println("Encoding string: \"" + secret + '\"');
-
-    System.err.println("Result: \"" + encoded + '\"');
-
-    System.err.println("Is this right? " + 
-		       (encoded.equals("QWxhZGRpbjpvcGVuIHNlc2FtZQ==") ? 
-			"Yes" : "No"));
-
-    String decoded = HTTPHelper.DecodeBase64 (encoded);
-    System.err.println("Decoded: \"" + decoded + '\"');
-
-    System.err.println("Is this right? " +
-		       (decoded.equals (secret) ? "Yes" : "No"));
-  }
-}
diff --git a/java/JACE/tests/Connection/ServerHandler.java b/java/JACE/tests/Connection/ServerHandler.java
deleted file mode 100644
index 4dec8186427..00000000000
--- a/java/JACE/tests/Connection/ServerHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    ServerHandler.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ServerHandler extends SvcHandler
-{
-  public ServerHandler ()
-    {
-    }
-  
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  public void run ()
-    {
-      int msg_len;
-      System.out.println ("Waiting for messages...");
-      try
-	{
-	  while (true)
-	    {
-	      StringBuffer msg = new StringBuffer ();
-	      msg_len = this.peer ().recv (msg);
-	      if (msg_len == 0)
-		break;
-	      System.out.println ("Received: " + msg);
-	      this.peer ().send (new StringBuffer ("Got it!"));
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.peer ().close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-      
-    }
-}
diff --git a/java/JACE/tests/Misc/ParseArgsTest.java b/java/JACE/tests/Misc/ParseArgsTest.java
deleted file mode 100644
index cc27b28d75b..00000000000
--- a/java/JACE/tests/Misc/ParseArgsTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Misc
-// 
-// = FILENAME
-//    ParseArgsTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.Misc;
-
-import JACE.OS.*;
-import JACE.Misc.*;
-
-public class ParseArgsTest
-{
-  public static void main (String args[])
-  {
-    ACE.enableDebugging ();
-
-    String s;
-    GetOpt opt = new GetOpt (args, "p:rs:", true);
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	System.out.println ("c is " + (char)c);
-	switch (c)
-	  {
-	  case 'p':
-	    s = opt.optarg ();
-	    ACE.DEBUG ("Option <p> selected with argument " + s);
-	    break;
-	  case 'r':
-	    ACE.DEBUG ("Option <r> selected");
-	    break;
-	  case 's':
-	    s = opt.optarg ();
-	    ACE.DEBUG ("Option <s> selected with argument " + s);
-	    break;
-	  default:
-	    ACE.DEBUG ("Usage: java tests.Misc.ParseArgsTest [-p arg1] [-r] [-s arg2]");
-	    break;
-	  }
-      }
-  }
-}
diff --git a/java/JACE/tests/Reactor/TimeValueTest.java b/java/JACE/tests/Reactor/TimeValueTest.java
deleted file mode 100644
index 559f6d15176..00000000000
--- a/java/JACE/tests/Reactor/TimeValueTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    ACE.Reactor
- *
- * = FILENAME
- *    TimeValueTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.tests.Reactor;
-
-import JACE.OS.*;
-import JACE.ASX.*;
-
-public class TimeValueTest
-{
-  public void ASSERT (boolean expression, int i)
-  {
-    if (!expression)
-      ACE.ERROR ("ASSERT failed for " + i);
-  }
-
-  public void runTest ()
-  {
-    TimeValue tv1 = new TimeValue ();
-    TimeValue tv2 = new TimeValue (2);
-    TimeValue tv3 = new TimeValue (100);  
-    TimeValue tv4 = new TimeValue (1, 1000000000);
-    TimeValue tv5 = new TimeValue (2);
-    TimeValue tv6 = new TimeValue (1, -1000000000);
-
-    this.ASSERT (tv1.equals (new TimeValue (0)), 1);
-    this.ASSERT (tv2.lessThan (tv3), 2);
-    this.ASSERT (tv2.lessThanEqual (tv2), 3);
-    this.ASSERT (tv2.greaterThanEqual (tv4), 4);
-    this.ASSERT (tv5.greaterThanEqual (tv6), 5);
-    this.ASSERT (tv2.equals (new TimeValue (1, 1000000000)), 6);
-    this.ASSERT (tv5.equals (tv4), 7);
-    this.ASSERT (tv2.equals (tv4), 8);
-    this.ASSERT (tv1.notEquals (tv2), 9);
-    this.ASSERT (tv6.equals (tv1), 10);
-  }
-
-  public static void main (String [] args)
-  {
-    ACE.enableDebugging ();
-
-    new TimeValueTest ().runTest ();
-  }
-}
diff --git a/java/JACE/tests/Reactor/TimerQueueTest.java b/java/JACE/tests/Reactor/TimerQueueTest.java
deleted file mode 100644
index 93845ccb6ec..00000000000
--- a/java/JACE/tests/Reactor/TimerQueueTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Reactor
-// 
-// = FILENAME
-//    TimerQueueTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.Reactor;
-
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class TimerQueueTest implements EventHandler
-{
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    ACE.DEBUG ("handleTimeout: " + tv.toString () + " " + (String) obj);
-    return 0;
-  }
-
-  public static void main (String args [])
-  {
-    ACE.enableDebugging ();
-
-    TimerQueue tq = new TimerQueue (true);
-    TimerQueueTest th1 = new TimerQueueTest ();
-    int n = 5;
-
-    ACE.enableDebugging ();
-
-    try
-      {
-	if (args.length == 1)
-	  {
-	    n = Integer.parseInt (args[0]);
-	  }
-      }
-    catch (NumberFormatException e)
-      {
-	ACE.ERROR ("Illegal argument.");
-      }
-
-    // Set a periodic timer
-    int id = tq.scheduleTimer (th1,
-			      "periodic",
-			       new TimeValue (2),
-			       new TimeValue (3));
-    
-    int i;
-    // Set a bunch of single timers
-    for (i=1; i <= n; i++)
-      {
-	tq.scheduleTimer (th1,
-			   "A-timer-" + new Integer (i),
-			   new TimeValue (i*2));
-      }
-
-    TimerQueueTest th2 = new TimerQueueTest ();
-    for (i=1; i <= n; i++)
-      {
-	tq.scheduleTimer (th2,
-			  "B-timer-" + new Integer (i),
-			  new TimeValue (i*3));
-      }
-    // Cancel all timers associated with this handler
-    tq.cancelTimer (th2);
-
-    try
-      {
-	Thread.sleep (30000);
-      }
-    catch (InterruptedException e)
-      {
-      }
-    tq.cancelTimer (id);
-    System.exit (0);
-  }
-}
diff --git a/java/JACE/tests/SOCK_SAP/SOCKAcceptorTest.java b/java/JACE/tests/SOCK_SAP/SOCKAcceptorTest.java
deleted file mode 100644
index 3251030fe1c..00000000000
--- a/java/JACE/tests/SOCK_SAP/SOCKAcceptorTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.SOCK_SAP
-// 
-// = FILENAME
-//    SOCKAcceptorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-class TestHandler extends Thread
-{
-  public TestHandler (SOCKStream stream)
-    {
-      this.stream_ = stream;
-    }
-
-  public void run ()
-    {
-      int msgLen;
-      System.out.println ("Waiting for messages...");
-      try
-	{
-	  while (true)
-	    {
-	      StringBuffer msg = new StringBuffer ();
-	      msgLen = this.stream_.recv (msg);
-	      if (msgLen == 0)
-		break;
-	      ACE.DEBUG ("Received: " + msg);
-	      this.stream_.send ("Got it!");
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.stream_.close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-    }
-  SOCKStream stream_;
-}
-
-public class SOCKAcceptorTest
-{
-  void print_usage_and_die ()
-    {
-      ACE.DEBUG ("Usage: SOCKAcceptorTest [<port>]");
-      System.exit (0);
-    }
-
-  public void init (int port)
-    {
-      try
-	{
-	  SOCKAcceptor acceptor = new SOCKAcceptor (port);
-	  while (true)
-	    {
-	      SOCKStream stream = new SOCKStream ();
-	      acceptor.accept (stream);
-	      TestHandler handler = new TestHandler (stream);
-	      handler.start ();
-	    }
-	}
-      catch (IOException e)
-	{
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      ACE.enableDebugging ();
-
-      int port = ACE.DEFAULT_SERVER_PORT;
-      SOCKAcceptorTest server = new SOCKAcceptorTest ();
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      server.print_usage_and_die ();
-	    }
-	}
-      server.init (port);
-    }
-}
diff --git a/java/JACE/tests/SOCK_SAP/SOCKConnectorTest.java b/java/JACE/tests/SOCK_SAP/SOCKConnectorTest.java
deleted file mode 100644
index e14b63936f5..00000000000
--- a/java/JACE/tests/SOCK_SAP/SOCKConnectorTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.SOCK_SAP
-// 
-// = FILENAME
-//    SOCKConnectorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package JACE.tests.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-public class SOCKConnectorTest
-{
-  static void print_usage_and_die ()
-    {
-      System.out.println ("Usage: SOCKConnectorTest <hostname> [<port>]");
-      System.exit (0);
-    }
-
-  void processRequests (SOCKStream stream) throws IOException
-    {
-      // 1.0 JDK      DataInputStream in = new DataInputStream (System.in);
-      BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-      String msg;
-      int ack_len;
-
-      while (true)
- {
-   StringBuffer ack = new StringBuffer ();
-   ACE.DEBUG ("Enter input: ");
-   ACE.FLUSH ();
-   msg = in.readLine ();
-   if (msg == null)
-     break;
-   stream.send (msg);
-   ACE.DEBUG ("Waiting for ack...");
-   ack_len = stream.recv (ack);
-   if (ack_len == 0)
-     break;
-   else
-     ACE.DEBUG (ack.toString ());
- }
-    }
-
-  public void init (String host, int port)
-    {
-      SOCKStream stream = new SOCKStream ();
-      SOCKConnector connector = new SOCKConnector ();
-      try
- {
-   connector.connect (stream,
-        host,
-        port);
-   processRequests (stream);
- }
-      catch (IOException e)
- {
-   ACE.ERROR (e);
- }
-    }
-
-  public static void main (String [] args)
-    {
-      ACE.enableDebugging ();
-
-      int port = ACE.DEFAULT_SERVER_PORT;
-      SOCKConnectorTest client = new SOCKConnectorTest ();
-
-      // check arg count 
-      if (args.length == 0 || args.length > 2) 
-         print_usage_and_die(); 
-
-      if (args.length == 2)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[1]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      client.print_usage_and_die ();
-	    }
-	}
-      client.init (args[0], port);
-	
-
-    }
-}
-
diff --git a/java/JACE/tests/ServiceConfigurator/Main.java b/java/JACE/tests/ServiceConfigurator/Main.java
deleted file mode 100644
index 2b57d5ad429..00000000000
--- a/java/JACE/tests/ServiceConfigurator/Main.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package JACE.tests.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.ServiceConfigurator.*;
-
-/**
- * Runs the service configurator, allowing the user to interact with it.
- */
-public class Main
-{
-  public static void main (String args[])
-    throws FileNotFoundException, IOException, ClassNotFoundException, 
-	   IllegalAccessException, InstantiationException
-  {
-    ACE.enableDebugging ();
-
-    if (ServiceConfig.open (args) < 0) {
-      System.err.println ("Error opening ServiceConfig");
-      return;
-    }
-
-    processCommands (args);
-
-    // close everything down
-    ServiceConfig.close ();
-  }
-
-  public static void report(String s) {
-    System.out.println(s);
-  }
-
-  static InputStreamReader stdin = new InputStreamReader (System.in);
-
-  public static void showMenu ()
-  {
-    report ("\n[C]lose all");
-    report ("[S]uspend all");
-    report ("[R]esume all");
-    report ("[Re[l]oad all");
-    report ("List [n]ames");
-
-    report ("\n[Q]uit");
-    System.out.print ("\nOption (CSRLNQ): ");
-  }
-
-  public static void processCommands (String [] args)
-    throws FileNotFoundException, IOException, ClassNotFoundException, 
-	   IllegalAccessException, InstantiationException
-  {
-    int ch = 0;
-    Enumeration svcs;
-
-    showMenu ();
-
-    do {
-
-      ch = stdin.read ();
-
-      switch (ch)
-	{
-	case 'c':
-	case 'C':
-	  ServiceConfig.close ();
-	  break;
-	case 's':
-	case 'S':
-	  svcs = ServiceConfig.serviceNames ();
-	  while (svcs.hasMoreElements ()) 
-	    ServiceConfig.suspend ((String)svcs.nextElement ());
-	  break;
-	case 'r':
-	case 'R':
-	  svcs = ServiceConfig.serviceNames ();
-	  while (svcs.hasMoreElements ())
-	    ServiceConfig.resume ((String)svcs.nextElement ());
-	  break;
-	case 'l':
-	case 'L':
-	  ServiceConfig.close ();
-	  svcs = ServiceConfig.serviceNames ();
-	  while (svcs.hasMoreElements ()) 
-	    ServiceConfig.remove ((String)svcs.nextElement ());
-	  ServiceConfig.open (args);
-	  break;
-	case 'n':
-	case 'N':
-	  report ("\nService names:\n");
-	  svcs = ServiceConfig.services ();
-	  while (svcs.hasMoreElements ()) {
-	    Service sv = (Service)svcs.nextElement ();
-	    report (sv.name () + " : " + sv.info ());
-	  }
-	  break;
-	case 'q':
-	case 'Q':
-	  report ("\nExiting...");
-	  return;
-	case -1:
-	case 10:
-	case 13:
-	  continue;
-	default:
-	  break;
-	}
-
-      showMenu ();
-
-    } while (true);
-  }
-
-}
diff --git a/java/JACE/tests/ServiceConfigurator/svc.conf b/java/JACE/tests/ServiceConfigurator/svc.conf
deleted file mode 100644
index 5c0c331ed94..00000000000
--- a/java/JACE/tests/ServiceConfigurator/svc.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-load TimeService JACE.netsvcs.Time.TSServerAcceptor ServiceObject "-d -p 30000"
-load LogService JACE.netsvcs.Logger.ServerLoggingAcceptor ServiceObject "-d -p 30001"
-load NameService JACE.netsvcs.Naming.NameAcceptor ServiceObject "-d -p 30002"
-load TokenService JACE.netsvcs.Token.TokenAcceptor ServiceObject "-d -p 30003"
diff --git a/java/JACE/tests/netsvcs/Logger/LoggerTest.java b/java/JACE/tests/netsvcs/Logger/LoggerTest.java
deleted file mode 100644
index ae835b07753..00000000000
--- a/java/JACE/tests/netsvcs/Logger/LoggerTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*************************************************
- *
- * = FILENAME
- *    LoggerTest.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.tests.netsvcs.Logger;
-
-import JACE.SOCK_SAP.*;
-import java.io.*; 
-import java.net.*;
-import JACE.OS.*;
-import JACE.netsvcs.Logger.*;
-
-/**
- *
- * This is a simple test log client very similar to the direct_logging 
- * client of C++ ACE.  The logging service should correctly receive 
- * messages from both the C++ and Java version.
- *
- * @see JACE.netsvcs.Logger.ServerLoggingAcceptor
- */
-public class LoggerTest {
-
-  /** Command line:  <hostname> [<port>]
-   *
-   * Creates a "hello world" log message and sends it to the server logging 
-   * service.
-   */
-  public static void main(String args[])
-    {
-      if (args.length != 2) {
-	System.err.println("Use:  LoggerTest <host name> [<port>]");
-	System.exit(0);
-      }
-
-      ACE.enableDebugging ();
-
-      // Set the port
-      int port = args.length > 1 ? 
-	(new Integer(args[1])).intValue() : ACE.DEFAULT_SERVER_PORT;
-
-      SOCKStream cli_stream = new SOCKStream();
-      INETAddr remote_addr;
-      String host;
-
-      // Try to find the host
-      try {
-
-	host = args[0];
-
-	remote_addr = new INETAddr(port, host);
-
-      } catch (UnknownHostException uhe) {
-	ACE.ERROR("UnknownHostException " + uhe);
-	return;
-      }
-
-      System.out.println("Connecting to " + host + " on port " + port);
-
-      SOCKConnector con = new SOCKConnector();
-
-      try {
-
-	// Connect to the service
-	con.connect(cli_stream, remote_addr);
-
-      } catch (SocketException se) {
-	
-	ACE.ERROR("Socket Exception " + se);
-	return;
-
-      } catch (IOException ie) {
-
-	ACE.ERROR("IOException " + ie);
-	return;
-      }
-
-
-      // Send a message with priority 4, the current time,
-      // and 0 for the process ID.
-      LogRecord record = new LogRecord(4,
-				       System.currentTimeMillis(),
-				       0);
-
-      // Set the text of the message
-      record.msgData("hello world");
-
-      try {
-
-	// Send it
-	record.streamOutTo(cli_stream.socket().getOutputStream ());
-
-	// Close the socket
-	cli_stream.close();
-
-      } catch (IOException ie) {
-
-	ACE.ERROR("" + ie);
-	return;
-      }
-    }
-};
-
-
-      
-
-	
-
-	
-
-	
-      
diff --git a/java/JACE/tests/netsvcs/Naming/ClientTest.java b/java/JACE/tests/netsvcs/Naming/ClientTest.java
deleted file mode 100644
index f6af6f906ea..00000000000
--- a/java/JACE/tests/netsvcs/Naming/ClientTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package JACE.tests.netsvcs.Naming;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.SOCK_SAP.*;
-import JACE.netsvcs.Naming.*;
-
-/**
- * Simple test program for NameProxy and the naming service.
- *
- * Command line: (hostname) (port)
- */
-public class ClientTest
-{
-  public static void print_usage_and_die ()
-  {
-    System.out.println ("Usage: ClientTest <hostname> [<port>]");
-    System.exit (0);
-  }
-  public static void main (String [] args)
-    throws UnknownHostException, 
-	   SocketException,
-	   InstantiationException,
-	   IllegalAccessException,
-	   IOException
-  {
-    ACE.enableDebugging ();
-
-    int port = ACE.DEFAULT_SERVER_PORT;
-
-    if (args.length == 0 || args.length > 2)
-      print_usage_and_die ();
-
-    if (args.length == 2) {
-      try
-	{
-	  port = Integer.parseInt (args[1]);
-	}
-      catch (NumberFormatException e)
-	{
-	  print_usage_and_die ();
-	}
-    }
-
-    System.out.println("Trying to open port " + port + " on " + args[0]);
-
-    NameProxy proxy = new NameProxy ();
-
-    Connector c = new Connector ();
-    c.open (args[0], port);
-    c.connect (proxy);
-
-    System.out.println("---- Beginning tests ----");
-
-    try {
-
-      System.out.println("Binding (five, six, seven):  " 
-			 + proxy.bind("five", "six", "seven"));
-      System.out.println("Binding (filth, rat, eats):  " 
-			 + proxy.bind("filth", "rat", "eats"));
-
-      Vector res = proxy.resolve("five");
-
-      System.out.println("Resolve (five)            :  " 
-			 + (String)res.elementAt(1) + " " 
-			 + (String)res.elementAt(2));
-
-      System.out.println("Binding (fish, words, him):  " 
-			 + proxy.bind("fish", "words", "him"));
-
-      System.out.println("Unbind  (five, six, seven):  " 
-			 + proxy.unbind("five"));
-
-      res = proxy.resolve("five");
-
-      System.out.println("Resolve (five)            :  " 
-			 + (String)res.elementAt(1) + " " 
-			 + (String)res.elementAt(2));
-
-      System.out.println("Binding (fiction, us, you):  " 
-			 + proxy.bind("fiction", "us", "you"));
-
-      System.out.println("\nGetting all records whose names begin with fi:\n");
-      Vector res2 = proxy.listNameEntries("fi");
-
-      Enumeration iter = res2.elements();
-
-      while (iter.hasMoreElements()) {
-	Vector res3 = (Vector)(iter.nextElement());
-
-	System.out.println((String)res3.elementAt(0) 
-			   + "\t" + (String)res3.elementAt(1) 
-			   + "\t" + (String)res3.elementAt(2));
-      }
-
-    } catch (Exception e) {
-      System.err.println ("" + e);
-      e.printStackTrace ();
-    } finally {
-      proxy.close ();
-    }
-  }
-}
-
diff --git a/java/JACE/tests/netsvcs/Time/TSClient.java b/java/JACE/tests/netsvcs/Time/TSClient.java
deleted file mode 100644
index 7a8adf93f42..00000000000
--- a/java/JACE/tests/netsvcs/Time/TSClient.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package JACE.tests.netsvcs.Time;
-
-import JACE.netsvcs.Time.*;
-import JACE.OS.*;
-import JACE.Reactor.*;
-
-public class TSClient
-{
-
-  // Will run until killed since the default is to run the timer
-  // queue in its own thread. 
-  public static void main (String args[])
-  {
-    ACE.enableDebugging ();
-
-    TSClerkProcessor cp = new TSClerkProcessor ();
-
-    if (cp.init (args) != 0)
-      return;
-
-    ACE.DEBUG ("***************************");
-    ACE.DEBUG ("Press enter to end the test");
-    ACE.DEBUG ("***************************");
-
-    try {
-      System.in.read();
-
-      cp.close ();
-
-    } catch (Exception e) {
-      ACE.ERROR (e);
-    }
-  }
-}
- 
-
-
diff --git a/java/JACE/tests/netsvcs/Token/ProxyClientTest.java b/java/JACE/tests/netsvcs/Token/ProxyClientTest.java
deleted file mode 100644
index 1b2118b7f9e..00000000000
--- a/java/JACE/tests/netsvcs/Token/ProxyClientTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package JACE.tests.netsvcs.Token;
-
-import java.net.*;
-import java.io.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Concurrency.*;
-import JACE.netsvcs.Token.*;
- 
-public class ProxyClientTest
-{ 
-  public static void report(String s) {
-    System.out.println(s);
-  }
-
-  static InputStreamReader stdin = new InputStreamReader (System.in);
-  static RemoteLock lock;
-  static int requeuePosition = -1, timeout = -1;
-
-  public static void showMenu ()
-  {
-    report ("\n[A]cquire");
-    report ("Acquire [w]rite");
-    report ("Acquire rea[d]");
-    report ("[T]ry Acquire");
-    report ("Try acquire wr[i]te");
-    report ("Try acquire r[e]ad");
-    report ("Re[n]ew");
-    report ("[R]elease");
-
-    report ("\n[Q]uit");
-    System.out.print ("\nOption (AWDTIENRQ): ");
-  }
-  
-  public static void processCommands () throws IOException
-  {
-    int ch = 0, result = -1;
-
-    showMenu ();
-    do {
-
-      ch = stdin.read();
-      
-      try {
-
-	switch (ch) 
-	  {
-	  case 'a':
-	  case 'A':
-	    if (timeout >= 0) {
-	      TimeValue tv = TimeValue.relativeTimeOfDay (timeout, 0);
-	      result = lock.acquire (tv);
-	    } else
-	      result = lock.acquire ();
-	    break;
-	  case 'w':
-	  case 'W':
-	    if (timeout >= 0) {
-	      TimeValue tv = TimeValue.relativeTimeOfDay (timeout, 0);
-	      result = lock.acquireWrite (tv);
-	    } else
-	      result = lock.acquire ();
-	    break;
-	  case 'd':
-	  case 'D':
-	    if (timeout >= 0) {
-	      TimeValue tv = TimeValue.relativeTimeOfDay (timeout, 0);
-	      result = lock.acquireRead (tv);
-	    } else
-	      result = lock.acquire ();
-	    break;
-	  case 't':
-	  case 'T':
-	    result = lock.tryAcquire ();
-	    break;
-	  case 'i':
-	  case 'I':
-	    result = lock.tryAcquireWrite ();
-	    break;
-	  case 'e':
-	  case 'E':
-	    result = lock.tryAcquireRead ();
-	    break;
-	  case 'r':
-	  case 'R':
-	    result = lock.release ();
-	    break;
-	  case 'n':
-	  case 'N':
-	    if (timeout >= 0) {
-	      TimeValue tv = TimeValue.relativeTimeOfDay (timeout, 0);
-	      result = lock.renew (requeuePosition, tv);
-	    } else
-	      result = lock.renew (requeuePosition);
-	    break;
-	  case 'q':
-	  case 'Q':
-	    continue;
-	  case -1:
-	  case 10:
-	  case 13:
-	    // Ignore line feeds and carriage returns
-	    continue;
-	  default:
-	    report ("Unknown command: " + (char)ch + " (" + ch + ")\n");
-	    showMenu ();
-	    continue;
-	  }
-
-	report ("\nResult: " + (result == lock.SUCCESS ? "Success" : 
-				"Failure"));
-
-      } catch (TimeoutException e) {
-	report ("\nRequest timed out");
-	/*
-      } catch (InterruptedException e) {
-	report ("\nInterrupted while attemping operation");
-	*/
-      } catch (LockException e) {
-	report ("\nLock failure: " + e.getMessage ());
-      }
-
-      showMenu ();
-
-    } while (ch != 'Q' && ch != 'q');
-  }
-
-  public static void printUsage ()
-  {
-    report ("Valid options:\n");
-    report ("-h <host name>      Specify token server host");
-    report ("-p <port number>    Port to connect to");
-    report ("-t <time in sec>    Relative timeout to use");
-    report ("-l <lock type>      0 Mutex, 1 RWMutex");
-    report ("-c <client ID>      Specify ID (default is this machine name)");
-    report ("-n <token name>     Specify token name");
-    report ("-q <requeue pos>    Use this requeue position in renew");
-    report ("-d                  Enable debugging");
-  }
-
-  public static void main (String args[]) throws IOException 
-  { 
-    GetOpt opt = new GetOpt (args, "h:p:t:l:c:n:q:d", true);
-
-    String host = "localhost", tokenName = "token1";
-    int port = ACE.DEFAULT_SERVER_PORT;
-    int type = LockTypes.MUTEX, c;
-    String clientID = InetAddress.getLocalHost().getHostName ();
-
-    try {
-      while ((c = opt.next ()) != -1) {
-	switch (c) 
-	  {
-	  case 'h':
-	    host = opt.optarg ();
-	    break;
-	  case 'p':
-	    port = Integer.parseInt (opt.optarg ());
-	    break;
-	  case 't':
-	    timeout = Integer.parseInt (opt.optarg ());
-	    break;
-	  case 'l':
-	    type = Integer.parseInt (opt.optarg ());
-	    break;
-	  case 'c':
-	    clientID = opt.optarg ();
-	    break;
-	  case 'n':
-	    tokenName = opt.optarg ();
-	    break;
-	  case 'q':
-	    requeuePosition = Integer.parseInt (opt.optarg ());
-	    break;
-	  case 'd':
-	    ACE.enableDebugging ();
-	    ACE.DEBUG ("Debugging is enabled");
-	    break;
-	  default:
-	    printUsage ();
-	    return;
-	  }
-      }
-    } catch (ArrayIndexOutOfBoundsException e) {
-      printUsage ();
-      return;
-    }
-
-    report ("Using    : " + host + " on port " + port);
-    report ("Token    : " + tokenName);
-    report ("Client ID: " + clientID);
-
-    lock = new RemoteLock (type, 0, tokenName, clientID, host, port);
-
-    processCommands ();
-
-    lock.close ();
-  }
-}
diff --git a/java/MSVJProjects.zip b/java/MSVJProjects.zip
deleted file mode 100644
index d5d7c95ebe5..00000000000
--- a/java/MSVJProjects.zip
+++ /dev/null
diff --git a/java/README b/java/README
deleted file mode 100644
index 961a0d94c66..00000000000
--- a/java/README
+++ /dev/null
@@ -1,40 +0,0 @@
-Java ACE Version 1.5
-
-JACE is compatible with Java 1.1 and higher.
-
-Directory information:
-
-JACE/     All main, network service, and test source files
-
-classes/  Output directory for all the .class files.  This may
-          need to be added to your classpath.
-
-doc/      If you generate the javadoc documentation, it will be
-          placed here.  Requires javadoc 1.2 or later.  I think
-          1.2.2 is the first version that correctly "inherits"
-          comments.
-
-Notes on building Java ACE:
-
-UNIX:
-
-Use GNU make on the Makefile in the JACE subdirectory.  That will
-build the main and network service sources.  To build the tests,
-use the Makefile in the JACE/tests subdirectory.
-
-Generate the javadoc documentation with the command "make doc" with
-the Makefile in the JACE subdirectory.
-
-Windows:
-
-Visual J++ 6.0 solution and project files are provided.  The main
-JACE solution file compiles all the source files (main, network
-service, and test).  The solutions and projects are in
-MSVJProjects.zip.
-
-If you don't have VJ++ and are using the JDK from the command line,
-you can compile JACE with the batch files in makebat.zip in the JACE
-subdirectory.
-
-Generate the javadoc documentation with the makedoc.bat file (also
-in makebat.zip).
diff --git a/java/VERSION b/java/VERSION
deleted file mode 100644
index 8c004c2231b..00000000000
--- a/java/VERSION
+++ /dev/null
@@ -1,5 +0,0 @@
-This is Java ACE version 1.5.
-
-If you have any problems, please send email to Douglas C. Schmidt
-at (schmidt@cs.wustl.edu)
-
diff --git a/java/apps/NexusII/README b/java/apps/NexusII/README
deleted file mode 100644
index 60a630cef5a..00000000000
--- a/java/apps/NexusII/README
+++ /dev/null
@@ -1,58 +0,0 @@
-Nexus II - A chat application in Java with image support
---------------------------------------------------------
-
-        Rajeev Bector (rajeev@cs.wustl.edu)
-        Aravind Gopalan (aravind@cs.wustl.edu)
-        Sumedh Mungee (sumedh@cs.wustl.edu)
-
-This is the README file. This distribution contains the NexusII
-server, which is a java application that can be started by a command
-similar to the one contained in the sample "start" shell-script.
-
-It also contains a "start.html" file, which serves as an example on how
-a client applet can be included within a .html file.
-
-A sample use of this, alongwith a simple users manual, can be found at
-http://cumbia.cs.wustl.edu/NexusII/
-
-Compiling (optional, all the class files are already present)
--------------------------------------------------------------
-
-All the source .java files, alongwith the makefile should be placed in
-the  same directory, and can then be compiled using make. 
-
-The client/server use the following packages:
-
-        awtCommand: This package provides a GUI toolkit for the applet
-        ACE:        This is used both by the client/server for
-                    networking. ACE documentation can be found at:
-                    http://www.cs.wustl.edu/~schmidt/ACE.html
-                
-Running
--------
-
-See the "start" and "start.html" files for examples on how to run the
-server and client applet, respectively. The "mywebaddress" variable is
-the "temporary" URL of the server, and the "mywebdir" variable is the
-temporary directory in which images are cached by the server. Make
-sure that both these exist and are world-readable. The "mywebdir"
-should be writable to by the server. The "mywebdir" and "mywebaddress"
-variables should thus point to the same location, of which mywebdir
-contains the path, and mywebaddress contains the URL. 
-
-See "start" for an example on how to do this.
-
-If you only want to use an existing running server, all you need to
-know is the server host-name and port number, and you can directly run
-the start.html file via appletviewer.
-
-Notes
------
-
-1. You can compile the client and server using the same makefile.
-2. The client applet MUST reside on the same host as the server is running on.
-4. run the server using start script. Change the paramters in the start script,
-   suitable to your configurations. The start script contains further
-   information on this.
-
-
diff --git a/java/apps/NexusII/classes/ClientHandler.class b/java/apps/NexusII/classes/ClientHandler.class
deleted file mode 100644
index ecfff46e582..00000000000
--- a/java/apps/NexusII/classes/ClientHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/FrameHandler.class b/java/apps/NexusII/classes/FrameHandler.class
deleted file mode 100644
index c7582979625..00000000000
--- a/java/apps/NexusII/classes/FrameHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/ImageCanvas.class b/java/apps/NexusII/classes/ImageCanvas.class
deleted file mode 100644
index 5768eef7116..00000000000
--- a/java/apps/NexusII/classes/ImageCanvas.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/NexusClientApplet.class b/java/apps/NexusII/classes/NexusClientApplet.class
deleted file mode 100644
index f5c913215f6..00000000000
--- a/java/apps/NexusII/classes/NexusClientApplet.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/NexusIIserver.class b/java/apps/NexusII/classes/NexusIIserver.class
deleted file mode 100644
index 5cf554e2961..00000000000
--- a/java/apps/NexusII/classes/NexusIIserver.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/Room.class b/java/apps/NexusII/classes/Room.class
deleted file mode 100644
index 1dc6e2fab54..00000000000
--- a/java/apps/NexusII/classes/Room.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/RoomFactory.class b/java/apps/NexusII/classes/RoomFactory.class
deleted file mode 100644
index e7addff06a4..00000000000
--- a/java/apps/NexusII/classes/RoomFactory.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/RoomFrame.class b/java/apps/NexusII/classes/RoomFrame.class
deleted file mode 100644
index 76e27e3b97b..00000000000
--- a/java/apps/NexusII/classes/RoomFrame.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/RoomThread.class b/java/apps/NexusII/classes/RoomThread.class
deleted file mode 100644
index 219a0cb0bc9..00000000000
--- a/java/apps/NexusII/classes/RoomThread.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CApplet.class b/java/apps/NexusII/classes/awtCommand/CApplet.class
deleted file mode 100644
index 998ff08bcef..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CApplet.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CApplet.java b/java/apps/NexusII/classes/awtCommand/CApplet.java
deleted file mode 100644
index a8680d9abf3..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CApplet.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-import java.applet.*;
-
-public class CApplet extends Applet {
-
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-    protected Command mouseDownCommand = null,
-		      mouseDragCommand = null,
-		      mouseEnterCommand = null,
-		      mouseExitCommand = null,
-		      mouseMoveCommand = null,
-		      mouseUpCommand = null;
-    protected Command keyUpCommand = null,
-		      keyDownCommand = null;
-
-    /**
-     * Constructs a new CApplet.
-     */
-    public CApplet() {
-	super();
-    }
-
-    /*
-     * event handling methods
-     */
-
-    /**
-     * Called if the window gains focus. This results in a call to
-     * the gotFocusCommand object with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-	    gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the window loses focus. This results in a call to
-     * the lostFocusCommand object with <code>what</code> set to null.
-     */
-     public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-	    lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the mouse is down.
-     * This results in a call to the mouseDownCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDown(Event evt, int x, int y) {
-	if (mouseDownCommand != null)
-	    mouseDownCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is dragged.
-     * This results in a call to the mouseDragCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDrag(Event evt, int x, int y) {
-	if (mouseDragCommand != null)
-	    mouseDragCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse enters the window.
-     * This results in a call to the mouseEnterCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-     public boolean mouseEnter(Event evt, int x, int y) {
-	if (mouseEnterCommand != null)
-	    mouseEnterCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse moves inside the window.
-     * This results in a call to the mouseMoveCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseMove(Event evt, int x, int y) {
-	if (mouseExitCommand != null)
-	    mouseExitCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is up.
-     * This results in a call to the mouseUpCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseUp(Event evt, int x, int y) {
-	if (mouseUpCommand != null)
-	    mouseUpCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if a character is pressed.
-     * This results in a call to the keyDownCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyDown(Event evt, int key) {
-	if (keyDownCommand != null)
-	    keyDownCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called if a character is released.
-     * This results in a call to the keyUpCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyUp(Event evt, int key) {
-	if (keyUpCommand != null)
-	    keyUpCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-
-    /*
-     * set...Command methods
-     */ 
-
-
-    /**
-     * Sets the mouseDownCommand object.
-     */
-    public void setMouseDownCommand(Command c) {
-	mouseDownCommand = c;
-    }
-
-    /**
-     * Sets the moueDragCommand object.
-     */
-    public void setMouseDragCommand(Command c) {
-	mouseDragCommand = c;
-    }
-
-    /**
-     * Sets the mouseEnterCommand object.
-     */
-    public void setMouseEnterCommand(Command c) {
-	mouseEnterCommand = c;
-    }
-
-    /**
-     * Sets the mouseExitCommand object.
-     */
-    public void setMouseExitCommand(Command c) {
-	mouseExitCommand = c;
-    }
-
-    /**
-     * Sets the mouseMoveCommand object.
-     */
-    public void setMouseMoveCommand(Command c) {
-	mouseMoveCommand = c;
-    }
-
-    /**
-     * Sets the mouseUpCommand object.
-     */
-    public void setMouseUpCommand(Command c) {
-	mouseUpCommand = c;
-    }
-
-    /**
-     * Sets the keyDownCommand object.
-     */
-    public void setKeyDownCommand(Command c) {
-	keyDownCommand = c;
-    }
-
-    /**
-     * Sets the keyUpCommand object.
-     */
-    public void setKeyUpCommand(Command c) {
-	keyUpCommand = c;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CButton.class b/java/apps/NexusII/classes/awtCommand/CButton.class
deleted file mode 100644
index b099c2dc4a6..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CButton.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CButton.java b/java/apps/NexusII/classes/awtCommand/CButton.java
deleted file mode 100644
index ff0f3385bad..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CButton.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-package awtCommand;
-
-import java.lang.*;
-import java.awt.*;
-
-public class CButton extends java.awt.Button {
-    protected Command actionCommand = null;
-
-    /**
-     * Constructs a CButton.
-     */
-    public CButton() {
-	super();
-    }
-
-    /**
-     * Constructs a CButton with the given name.
-     */
-    public CButton(String name) {
-	super(name);
-    }
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Called when the button is selected..
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the button's label.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-	    actionCommand.execute(this, evt, what);
-	return false;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CCanvas.class b/java/apps/NexusII/classes/awtCommand/CCanvas.class
deleted file mode 100644
index 48f63357daf..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CCanvas.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CCanvas.java b/java/apps/NexusII/classes/awtCommand/CCanvas.java
deleted file mode 100644
index 837b6f56f7a..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CCanvas.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CCanvas extends Canvas {
-
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-    protected Command mouseDownCommand = null,
-		      mouseDragCommand = null,
-		      mouseEnterCommand = null,
-		      mouseExitCommand = null,
-		      mouseMoveCommand = null,
-		      mouseUpCommand = null;
-    protected Command keyUpCommand = null,
-		      keyDownCommand = null;
-    protected Command actionCommand = null;
-    protected Command scrollAbsoluteCommand = null,
-	      	      lineDownCommand = null,
-	      	      lineUpCommand = null,
-	      	      pageDownCommand = null,
-	      	      pageUpCommand = null;
-    protected Command selectCommand 	= null,
-		      deselectCommand 	= null;
-
-
-    /**
-     * Constructs a new CCanvas.
-     */
-    public CCanvas() {
-	super();
-    }
-
-    /**
-     * Handles the event.
-     * Calls methods for variousL events and passes
-     * others to its superclass method.
-     */
-    public boolean handleEvent(Event evt) {
-	switch (evt.id) {
-	    case Event.SCROLL_ABSOLUTE:
-		return scrollAbsolute(evt, evt.arg);
-	    case Event.SCROLL_LINE_DOWN:
-		return lineDown(evt, evt.arg);
-	    case Event.SCROLL_LINE_UP:
-		return lineUp(evt, evt.arg);
-	    case Event.SCROLL_PAGE_DOWN:
-		return pageDown(evt, evt.arg);
-	    case Event.SCROLL_PAGE_UP:
-		return pageUp(evt, evt.arg);
-	    case Event.LIST_SELECT:
-		return select(evt, evt.arg);
-	    case Event.LIST_DESELECT:
-		return deselect(evt, evt.arg);
-	    default:
-		return super.handleEvent(evt);
-	}
-    }
-
-
-    /*
-     * event handling methods
-     */
-
-    /**
-     * Called if the window gains focus. This results in a call to
-     * the gotFocusCommand object with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-	    gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the window loses focus. This results in a call to
-     * the lostFocusCommand object with <code>what</code> set to null.
-     */
-     public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-	    lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the mouse is down.
-     * This results in a call to the mouseDownCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDown(Event evt, int x, int y) {
-	if (mouseDownCommand != null)
-	    mouseDownCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is dragged.
-     * This results in a call to the mouseDragCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDrag(Event evt, int x, int y) {
-	if (mouseDragCommand != null)
-	    mouseDragCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse enters the window.
-     * This results in a call to the mouseEnterCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-     public boolean mouseEnter(Event evt, int x, int y) {
-	if (mouseEnterCommand != null)
-	    mouseEnterCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse moves inside the window.
-     * This results in a call to the mouseMoveCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseMove(Event evt, int x, int y) {
-	if (mouseExitCommand != null)
-	    mouseExitCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is up.
-     * This results in a call to the mouseUpCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseUp(Event evt, int x, int y) {
-	if (mouseUpCommand != null)
-	    mouseUpCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if a character is pressed.
-     * This results in a call to the keyDownCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyDown(Event evt, int key) {
-	if (keyDownCommand != null)
-	    keyDownCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called if a character is released.
-     * This results in a call to the keyUpCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyUp(Event evt, int key) {
-	if (keyUpCommand != null)
-	    keyUpCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called when an ACTION_EVENT is generated.
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the event's arg.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-	    actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is dragged.
-     * This results in a call to the scrollAbsoluteCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean scrollAbsolute(Event evt, Object what) {
-        if (scrollAbsoluteCommand != null)
-            scrollAbsoluteCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented down.
-     * This results in a call to the lineDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineDown(Event evt, Object what) {
-        if (lineDownCommand != null)
-            lineDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented up.
-     * This results in a call to the lineUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineUp(Event evt, Object what) {
-        if (lineUpCommand != null)
-            lineUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages up.
-     * This results in a call to the pageUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageUp(Event evt, Object what) {
-        if (pageUpCommand != null)
-            pageUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages down.
-     * This results in a call to the pageDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageDown(Event evt, Object what) {
-        if (pageDownCommand != null)
-            pageDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /** 
-     * Called if the mouse selects an item in a List. 
-     * This results in a call to the selectCommand object 
-     * with <code>what</code> set to the selected index.
-     */
-    public boolean select(Event evt, Object what) {
-        if (selectCommand != null)
-            selectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /** 
-     * Called if the mouse deselects an item in a List. 
-     * This results in a call to the deselectCommand object 
-     * with <code>what</code> set to the deselected index.
-     */
-    public boolean deselect(Event evt, Object what) {
-        if (deselectCommand != null)
-            deselectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /*
-     * set...Command methods
-     */ 
-
-
-
-    /**
-     * Sets the mouseDownCommand object.
-     */
-    public void setMouseDownCommand(Command c) {
-	mouseDownCommand = c;
-    }
-
-    /**
-     * Sets the moueDragCommand object.
-     */
-    public void setMouseDragCommand(Command c) {
-	mouseDragCommand = c;
-    }
-
-    /**
-     * Sets the mouseEnterCommand object.
-     */
-    public void setMouseEnterCommand(Command c) {
-	mouseEnterCommand = c;
-    }
-
-    /**
-     * Sets the mouseExitCommand object.
-     */
-    public void setMouseExitCommand(Command c) {
-	mouseExitCommand = c;
-    }
-
-    /**
-     * Sets the mouseMoveCommand object.
-     */
-    public void setMouseMoveCommand(Command c) {
-	mouseMoveCommand = c;
-    }
-
-    /**
-     * Sets the mouseUpCommand object.
-     */
-    public void setMouseUpCommand(Command c) {
-	mouseUpCommand = c;
-    }
-
-    /**
-     * Sets the keyDownCommand object.
-     */
-    public void setKeyDownCommand(Command c) {
-	keyDownCommand = c;
-    }
-
-    /**
-     * Sets the keyUpCommand object.
-     */
-    public void setKeyUpCommand(Command c) {
-	keyUpCommand = c;
-    }
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Sets the scrollAbsoluteCommand.
-     */
-    public void setScrollAbsoluteCommand(Command c) {
-	scrollAbsoluteCommand = c;
-    }
-
-    /**
-     * Sets the lineUpCommand.
-     */
-    public void setLineUpCommand(Command c) {
-	lineUpCommand = c;
-    }
-
-    /**
-     * Sets the lineDownCommand.
-     */
-    public void setLineDownCommand(Command c) {
-	lineDownCommand = c;
-    }
-
-    /**
-     * Sets the pageUpCommand.
-     */
-    public void setPageUpCommand(Command c) {
-	pageUpCommand = c;
-    }
-
-    /**
-     * Sets the pageDownCommand.
-     */
-    public void setPageDownCommand(Command c) {
-	pageDownCommand = c;
-    }
-
-    /**
-     * Sets the selectCommand.
-     */
-    public void setSelectCommand(Command select) {
-	selectCommand = select;
-    }
-
-    /**
-     * Sets the deselectCommand.
-     */
-    public void setDeselectCommand(Command deselect) {
-	deselectCommand = deselect;
-    }
-
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CFrame.class b/java/apps/NexusII/classes/awtCommand/CFrame.class
deleted file mode 100644
index 27f87ab82c8..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CFrame.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CFrame.java b/java/apps/NexusII/classes/awtCommand/CFrame.java
deleted file mode 100644
index f63d3ce8b9a..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CFrame.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CFrame extends Frame {
-
-    protected Command destroyCommand = null,
-		      deiconifyCommand = null,
-		      iconifyCommand = null,
-		      movedCommand = null;
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-    protected Command mouseDownCommand = null,
-		      mouseDragCommand = null,
-		      mouseEnterCommand = null,
-		      mouseExitCommand = null,
-		      mouseMoveCommand = null,
-		      mouseUpCommand = null;
-    protected Command keyUpCommand = null,
-		      keyDownCommand = null;
-    protected Command actionCommand = null;
-    protected Command scrollAbsoluteCommand = null,
-	      	      lineDownCommand = null,
-	      	      lineUpCommand = null,
-	      	      pageDownCommand = null,
-	      	      pageUpCommand = null;
-    protected Command selectCommand 	= null,
-		      deselectCommand 	= null;
-
-    /**
-     * Constructs a new, initially invisible CFrame.
-     */
-    public CFrame() {
-	super();
-    }
-
-    /**
-     * Constructs a new, initially invisible CFrame with the
-     * specified title.
-     */
-    public CFrame(String title) {
-	super(title);
-    }
-
-    /** 
-     * Handles the event
-     */
-    public boolean handleEvent(Event evt) {
-	switch (evt.id) {
-	    case Event.WINDOW_DESTROY:
-		return windowDestroy(evt);
-	    case Event.WINDOW_DEICONIFY:
-		return windowDeiconify(evt);
-	    case Event.WINDOW_ICONIFY:
-		return windowIconify(evt);
-	    case Event.WINDOW_MOVED:
-		return windowMoved(evt);
-	    case Event.SCROLL_ABSOLUTE:
-		return scrollAbsolute(evt, evt.arg);
-	    case Event.SCROLL_LINE_DOWN:
-		return lineDown(evt, evt.arg);
-	    case Event.SCROLL_LINE_UP:
-		return lineUp(evt, evt.arg);
-	    case Event.SCROLL_PAGE_DOWN:
-		return pageDown(evt, evt.arg);
-	    case Event.SCROLL_PAGE_UP:
-		return pageUp(evt, evt.arg);
-	    case Event.LIST_SELECT:
-		return select(evt, evt.arg);
-	    case Event.LIST_DESELECT:
-		return deselect(evt, evt.arg);
-	    default:
-		return super.handleEvent(evt);
-	}
-    }
-
-    /*
-     * event handling methods
-     */
-
-    /** 
-     * Called if the dialog's window is destroyed. This results in a call to
-     * the destroyCommand object with <code>what</code> set to null
-     */
-    public boolean windowDestroy(Event evt) {
-	if (destroyCommand != null)
-	    destroyCommand.execute(this, evt, null);
-	return false;
-    }
-
-    /** 
-     * Called if the dialog's window is deiconified. This results in a call to
-     * the deiconifyCommand object with <code>what</code> set to null 
-     */
-    public boolean windowDeiconify(Event evt) {
-	if (deiconifyCommand != null)
-	    deiconifyCommand.execute(this, evt, null);
-	return false;
-    }
-
-    /** 
-     * Called if the dialog is iconified. This results in a call to
-     * the iconifyCommand object with <code>what</code> set to null 
-     */
-    public boolean windowIconify(Event evt) {
-	if (iconifyCommand != null)
-	    iconifyCommand.execute(this, evt, null);
-	return false;
-    }
-
-    /** 
-     * Called if the dialog's window is moved. This results in a call to
-     * the movedCommand object with <code>what</code> set to Point(x, y) 
-     */
-    public boolean windowMoved(Event evt) {
-	if (movedCommand != null)
-	    movedCommand.execute(this, evt, new Point(evt.x, evt.y));
-	return false;
-    }
-
-    /*
-     * I don't know where what objects this next set should belong
-     * to. Putting them at the top is ok for now
-     */
-
-    /**
-     * Called if the window gains focus. This results in a call to
-     * the gotFocusCommand object with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-	    gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the window loses focus. This results in a call to
-     * the lostFocusCommand object with <code>what</code> set to null.
-     */
-     public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-	    lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the mouse is down.
-     * This results in a call to the mouseDownCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDown(Event evt, int x, int y) {
-	if (mouseDownCommand != null)
-	    mouseDownCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is dragged.
-     * This results in a call to the mouseDragCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDrag(Event evt, int x, int y) {
-	if (mouseDragCommand != null)
-	    mouseDragCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse enters the window.
-     * This results in a call to the mouseEnterCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-     public boolean mouseEnter(Event evt, int x, int y) {
-	if (mouseEnterCommand != null)
-	    mouseEnterCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse moves inside the window.
-     * This results in a call to the mouseMoveCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseMove(Event evt, int x, int y) {
-	if (mouseExitCommand != null)
-	    mouseExitCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is up.
-     * This results in a call to the mouseUpCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseUp(Event evt, int x, int y) {
-	if (mouseUpCommand != null)
-	    mouseUpCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if a character is pressed.
-     * This results in a call to the keyDownCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyDown(Event evt, int key) {
-	if (keyDownCommand != null)
-	    keyDownCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called if a character is released.
-     * This results in a call to the keyUpCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyUp(Event evt, int key) {
-	if (keyUpCommand != null)
-	    keyUpCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-
-    /**
-     * Called when an ACTION_EVENT is generated.
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the event's arg.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-	    actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is dragged.
-     * This results in a call to the scrollAbsoluteCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean scrollAbsolute(Event evt, Object what) {
-        if (scrollAbsoluteCommand != null)
-            scrollAbsoluteCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented down.
-     * This results in a call to the lineDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineDown(Event evt, Object what) {
-        if (lineDownCommand != null)
-            lineDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented up.
-     * This results in a call to the lineUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineUp(Event evt, Object what) {
-        if (lineUpCommand != null)
-            lineUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages up.
-     * This results in a call to the pageUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageUp(Event evt, Object what) {
-        if (pageUpCommand != null)
-            pageUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages down.
-     * This results in a call to the pageDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageDown(Event evt, Object what) {
-        if (pageDownCommand != null)
-            pageDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /** 
-     * Called if the mouse selects an item in a List. 
-     * This results in a call to the selectCommand object 
-     * with <code>what</code> set to the selected index.
-     */
-    public boolean select(Event evt, Object what) {
-        if (selectCommand != null)
-            selectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /** 
-     * Called if the mouse deselects an item in a List. 
-     * This results in a call to the deselectCommand object 
-     * with <code>what</code> set to the deselected index.
-     */
-    public boolean deselect(Event evt, Object what) {
-        if (deselectCommand != null)
-            deselectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /*
-     * set...Command methods
-     */ 
-
-
-    /**
-     * Sets the destroyCommand object.
-     */
-    public void setDestroyCommand(Command c) {
-	destroyCommand = c;
-    }
-
-    /**
-     * Sets the deiconifyCommand object.
-     */
-    public void setDeiconifyCommand(Command c) {
-	deiconifyCommand = c;
-    }
-
-    /**
-     * Sets the iconifyCommand object.
-     */
-    public void setIconifyCommand(Command c) {
-	iconifyCommand = c;
-    }
-
-    /**
-     * Sets the movedCommand object.
-     */
-    public void setMovedCommand(Command c) {
-	movedCommand = c;
-    }
-
-    /**
-     * Sets the mouseDownCommand object.
-     */
-    public void setMouseDownCommand(Command c) {
-	mouseDownCommand = c;
-    }
-
-    /**
-     * Sets the moueDragCommand object.
-     */
-    public void setMouseDragCommand(Command c) {
-	mouseDragCommand = c;
-    }
-
-    /**
-     * Sets the mouseEnterCommand object.
-     */
-    public void setMouseEnterCommand(Command c) {
-	mouseEnterCommand = c;
-    }
-
-    /**
-     * Sets the mouseExitCommand object.
-     */
-    public void setMouseExitCommand(Command c) {
-	mouseExitCommand = c;
-    }
-
-    /**
-     * Sets the mouseMoveCommand object.
-     */
-    public void setMouseMoveCommand(Command c) {
-	mouseMoveCommand = c;
-    }
-
-    /**
-     * Sets the mouseUpCommand object.
-     */
-    public void setMouseUpCommand(Command c) {
-	mouseUpCommand = c;
-    }
-
-    /**
-     * Sets the keyDownCommand object.
-     */
-    public void setKeyDownCommand(Command c) {
-	keyDownCommand = c;
-    }
-
-    /**
-     * Sets the keyUpCommand object.
-     */
-    public void setKeyUpCommand(Command c) {
-	keyUpCommand = c;
-    }
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Sets the scrollAbsoluteCommand.
-     */
-    public void setScrollAbsoluteCommand(Command c) {
-	scrollAbsoluteCommand = c;
-    }
-
-    /**
-     * Sets the lineUpCommand.
-     */
-    public void setLineUpCommand(Command c) {
-	lineUpCommand = c;
-    }
-
-    /**
-     * Sets the lineDownCommand.
-     */
-    public void setLineDownCommand(Command c) {
-	lineDownCommand = c;
-    }
-
-    /**
-     * Sets the pageUpCommand.
-     */
-    public void setPageUpCommand(Command c) {
-	pageUpCommand = c;
-    }
-
-    /**
-     * Sets the pageDownCommand.
-     */
-    public void setPageDownCommand(Command c) {
-	pageDownCommand = c;
-    }
-
-    /**
-     * Sets the selectCommand.
-     */
-    public void setSelectCommand(Command select) {
-	selectCommand = select;
-    }
-
-    public void setGotFocusCommand(Command c) { 
-	 gotFocusCommand = c ; 
-    } 
-    /**
-     * Sets the deselectCommand.
-     */
-    public void setDeselectCommand(Command deselect) {
-	deselectCommand = deselect;
-    }
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/classes/awtCommand/CList.class b/java/apps/NexusII/classes/awtCommand/CList.class
deleted file mode 100644
index 1de89790826..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CList.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CList.java b/java/apps/NexusII/classes/awtCommand/CList.java
deleted file mode 100644
index 110e6a01db2..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CList.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CList extends List {
-    protected Command selectCommand 	= null;
-    protected Command deselectCommand 	= null;
-    protected Command actionCommand 	= null;
-
-    /** 
-     * Handles the event
-     */
-    public boolean handleEvent(Event evt) {
-	switch (evt.id) {
-	    case Event.LIST_SELECT:
-		return select(evt, evt.arg);
-	    case Event.LIST_DESELECT:
-		return deselect(evt, evt.arg);
-	    default:
-		return super.handleEvent(evt);
-	}
-    }
-
-    /*
-     * event handling methods
-     */
-
-
-    /** 
-     * Called if the Enter key is pressed. 
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the selected item.
-     */
-    public boolean action(Event evt, Object what) {
-        if (actionCommand != null)
-            actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /** 
-     * Called if the mouse selects an item. 
-     * This results in a call to the selectCommand object 
-     * with <code>what</code> set to the selected index.
-     */
-    public boolean select(Event evt, Object what) {
-        if (selectCommand != null)
-            selectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /** 
-     * Called if the mouse deselects an item. 
-     * This results in a call to the deselectCommand object 
-     * with <code>what</code> set to the deselected index.
-     */
-    public boolean deselect(Event evt, Object what) {
-        if (deselectCommand != null)
-            deselectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /**
-     * Sets the actionCommand.
-     */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Sets the selectCommand.
-     */
-    public void setSelectCommand(Command select) {
-	selectCommand = select;
-    }
-
-    /**
-     * Sets the deselectCommand.
-     */
-    public void setDeselectCommand(Command deselect) {
-	deselectCommand = deselect;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CPanel.class b/java/apps/NexusII/classes/awtCommand/CPanel.class
deleted file mode 100644
index a1b72ca7cb7..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CPanel.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CPanel.java b/java/apps/NexusII/classes/awtCommand/CPanel.java
deleted file mode 100644
index 1c8d39f8537..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CPanel.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CPanel extends Panel {
-
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-    protected Command mouseDownCommand = null,
-		      mouseDragCommand = null,
-		      mouseEnterCommand = null,
-		      mouseExitCommand = null,
-		      mouseMoveCommand = null,
-		      mouseUpCommand = null;
-    protected Command keyUpCommand = null,
-		      keyDownCommand = null;
-    protected Command actionCommand = null;
-    protected Command scrollAbsoluteCommand = null,
-	      	      lineDownCommand = null,
-	      	      lineUpCommand = null,
-	      	      pageDownCommand = null,
-	      	      pageUpCommand = null;
-    protected Command selectCommand 	= null,
-		      deselectCommand 	= null;
-
-    /**
-     * Constructs a new CPanel.
-     */
-    public CPanel() {
-	super();
-    }
-
-
-    /**
-     * Handles the event.
-     * Calls methods for variousL events and passes
-     * others to its superclass method.
-     */
-    public boolean handleEvent(Event evt) {
-	switch (evt.id) {
-	    case Event.SCROLL_ABSOLUTE:
-		return scrollAbsolute(evt, evt.arg);
-	    case Event.SCROLL_LINE_DOWN:
-		return lineDown(evt, evt.arg);
-	    case Event.SCROLL_LINE_UP:
-		return lineUp(evt, evt.arg);
-	    case Event.SCROLL_PAGE_DOWN:
-		return pageDown(evt, evt.arg);
-	    case Event.SCROLL_PAGE_UP:
-		return pageUp(evt, evt.arg);
-	    case Event.LIST_SELECT:
-		return select(evt, evt.arg);
-	    case Event.LIST_DESELECT:
-		return deselect(evt, evt.arg);
-	    default:
-		return super.handleEvent(evt);
-	}
-    }
-
-    /*
-     * event handling methods
-     */
-
-    /**
-     * Called if the window gains focus. This results in a call to
-     * the gotFocusCommand object with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-	    gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the window loses focus. This results in a call to
-     * the lostFocusCommand object with <code>what</code> set to null.
-     */
-     public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-	    lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called if the mouse is down.
-     * This results in a call to the mouseDownCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDown(Event evt, int x, int y) {
-	if (mouseDownCommand != null)
-	    mouseDownCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is dragged.
-     * This results in a call to the mouseDragCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseDrag(Event evt, int x, int y) {
-	if (mouseDragCommand != null)
-	    mouseDragCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse enters the window.
-     * This results in a call to the mouseEnterCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-     public boolean mouseEnter(Event evt, int x, int y) {
-	if (mouseEnterCommand != null)
-	    mouseEnterCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse moves inside the window.
-     * This results in a call to the mouseMoveCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseMove(Event evt, int x, int y) {
-	if (mouseExitCommand != null)
-	    mouseExitCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if the mouse is up.
-     * This results in a call to the mouseUpCommand object with 
-     * <code>what</code> set to Point(x, y)
-     */
-    public boolean mouseUp(Event evt, int x, int y) {
-	if (mouseUpCommand != null)
-	    mouseUpCommand.execute(this, evt, new Point(x, y));
-	return false;
-    }
-
-    /**
-     * Called if a character is pressed.
-     * This results in a call to the keyDownCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyDown(Event evt, int key) {
-	if (keyDownCommand != null)
-	    keyDownCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-    /**
-     * Called if a character is released.
-     * This results in a call to the keyUpCommand object with 
-     * <code>what</code> set to Integer(key).
-     */
-    public boolean keyUp(Event evt, int key) {
-	if (keyUpCommand != null)
-	    keyUpCommand.execute(this, evt, new Integer(key));
-	return false;
-    }
-
-
-    /**
-     * Called when an ACTION_EVENT is generated.
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the event's arg.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-	    actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is dragged.
-     * This results in a call to the scrollAbsoluteCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean scrollAbsolute(Event evt, Object what) {
-        if (scrollAbsoluteCommand != null)
-            scrollAbsoluteCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented down.
-     * This results in a call to the lineDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineDown(Event evt, Object what) {
-        if (lineDownCommand != null)
-            lineDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar is incremented up.
-     * This results in a call to the lineUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean lineUp(Event evt, Object what) {
-        if (lineUpCommand != null)
-            lineUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages up.
-     * This results in a call to the pageUpCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageUp(Event evt, Object what) {
-        if (pageUpCommand != null)
-            pageUpCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when a scrollbar pages down.
-     * This results in a call to the pageDownCommand object
-     * with <code>what</code> set to the slider location value.
-     */
-    public boolean pageDown(Event evt, Object what) {
-        if (pageDownCommand != null)
-            pageDownCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /** 
-     * Called if the mouse selects an item in a List. 
-     * This results in a call to the selectCommand object 
-     * with <code>what</code> set to the selected index.
-     */
-    public boolean select(Event evt, Object what) {
-        if (selectCommand != null)
-            selectCommand.execute(this, evt, what);
-	return false;
-    }
-
-
-    /** 
-     * Called if the mouse deselects an item in a List. 
-     * This results in a call to the deselectCommand object 
-     * with <code>what</code> set to the deselected index.
-     */
-    public boolean deselect(Event evt, Object what) {
-        if (deselectCommand != null)
-            deselectCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /*
-     * set...Command methods
-     */ 
-
-
- 
-    /**
-     * Sets the mouseDownCommand object.
-     */
-    public void setMouseDownCommand(Command c) {
-	mouseDownCommand = c;
-    }
-
-    /**
-     * Sets the moueDragCommand object.
-     */
-    public void setMouseDragCommand(Command c) {
-	mouseDragCommand = c;
-    }
-
-    /**
-     * Sets the mouseEnterCommand object.
-     */
-    public void setMouseEnterCommand(Command c) {
-	mouseEnterCommand = c;
-    }
-
-    /**
-     * Sets the mouseExitCommand object.
-     */
-    public void setMouseExitCommand(Command c) {
-	mouseExitCommand = c;
-    }
-
-    /**
-     * Sets the mouseMoveCommand object.
-     */
-    public void setMouseMoveCommand(Command c) {
-	mouseMoveCommand = c;
-    }
-
-    /**
-     * Sets the mouseUpCommand object.
-     */
-    public void setMouseUpCommand(Command c) {
-	mouseUpCommand = c;
-    }
-
-    /**
-     * Sets the keyDownCommand object.
-     */
-    public void setKeyDownCommand(Command c) {
-	keyDownCommand = c;
-    }
-
-    /**
-     * Sets the keyUpCommand object.
-     */
-    public void setKeyUpCommand(Command c) {
-	keyUpCommand = c;
-    }
-
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command action) {
-	actionCommand = action;
-    }
-
-    /**
-     * Sets the scrollAbsoluteCommand.
-     */
-    public void setScrollAbsoluteCommand(Command c) {
-	scrollAbsoluteCommand = c;
-    }
-
-    /**
-     * Sets the lineUpCommand.
-     */
-    public void setLineUpCommand(Command c) {
-	lineUpCommand = c;
-    }
-
-    /**
-     * Sets the lineDownCommand.
-     */
-    public void setLineDownCommand(Command c) {
-	lineDownCommand = c;
-    }
-
-    /**
-     * Sets the pageUpCommand.
-     */
-    public void setPageUpCommand(Command c) {
-	pageUpCommand = c;
-    }
-
-    /**
-     * Sets the pageDownCommand.
-     */
-    public void setPageDownCommand(Command c) {
-	pageDownCommand = c;
-    }
-
-    /**
-     * Sets the selectCommand.
-     */
-    public void setSelectCommand(Command select) {
-	selectCommand = select;
-    }
-
-    /**
-     * Sets the deselectCommand.
-     */
-    public void setDeselectCommand(Command deselect) {
-	deselectCommand = deselect;
-    }
-
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CTextArea.class b/java/apps/NexusII/classes/awtCommand/CTextArea.class
deleted file mode 100644
index 307cbf9e01c..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CTextArea.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CTextArea.java b/java/apps/NexusII/classes/awtCommand/CTextArea.java
deleted file mode 100644
index eacaf526929..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CTextArea.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CTextArea extends TextArea {
-    
-    protected Command gotFocusCommand = null,
-		      lostFocusCommand = null;
-
-    /**
-     * Constructs a new TextArea.
-     */
-    public CTextArea() {
-	super();
-    }
-
-    /**
-     * Constructs a new TextArea with the specified number of rows and columns.
-     * @param rows the number of rows
-     * @param cols the number of columns
-     */
-    public CTextArea(int rows, int cols) {
-	super(rows, cols);
-    }
-
-    /**
-     * Constructs a new TextArea with the specified text displayed.
-     * @param text the text to be displayed 
-     */
-    public CTextArea(String text) {
-        super(text);
-    }
-
-    /**
-     * Constructs a new TextArea with the specified text and the 
-     * specified number of rows 
-     * and columns.
-     * @param text the text to be displayed
-     * @param rows the number of rows
-     * @param cols the number of cols
-     */
-    public CTextArea(String text, int rows, int cols) {
-	super(text, rows, cols);
-    }
-
-
-    /**
-     * Called when the text area gains the focus.
-     * This results in a call to the gotFocusCommand object 
-     * with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-            gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when the text area loses the focus.
-     * This results in a call to the lostFocusCommand object 
-     * with <code>what</code> set to null.
-     */
-    public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-            lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-   /**
-    * Sets the gotFocusCommand object.
-    */
-    public void setGotFocusCommand(Command c) {
-	gotFocusCommand = c;
-    }
-
-    /**
-     * Sets the lostFocusCommand object.
-     */
-    public void setLostFocusCommand(Command c) {
-	lostFocusCommand = c;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/CTextField.class b/java/apps/NexusII/classes/awtCommand/CTextField.class
deleted file mode 100644
index 9e8e8bea709..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CTextField.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/CTextField.java b/java/apps/NexusII/classes/awtCommand/CTextField.java
deleted file mode 100644
index 146f13206e5..00000000000
--- a/java/apps/NexusII/classes/awtCommand/CTextField.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-package awtCommand;
-
-import java.awt.*;
-
-public class CTextField extends TextField {
-
-    protected Command actionCommand = null,
-		      gotFocusCommand = null,
-		      lostFocusCommand = null;
-
-    /**
-     * Constructs a new CTextField.
-     */
-    public CTextField() {
-	super();
-    }
-
-    /**
-     * Constructs a new CTextField initialized with the specified columns.
-     * @param cols the number of columns
-     */
-    public CTextField(int cols) {
-	super(cols);
-    }
-
-    /**
-     * Constructs a new CTextField initialized with the specified text.
-     * @param text the text to be displayed
-     */
-    public CTextField(String text) {
-	super(text);
-    }
-
-
-    /**
-     * Constructs a new CTextField initialized with the specified text and columns.
-     * @param text the text to be displayed
-     * @param cols the number of columns
-     */
-    public CTextField(String text, int cols) {
-	super(text, cols);
-    }
-
-
-    /**
-     * Called when Enter is pressed in the text field.
-     * This results in a call to the actionCommand object 
-     * with <code>what</code> set to the text contents.
-     */
-    public boolean action(Event evt, Object what) {
-	if (actionCommand != null)
-            actionCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when the text field gains the focus.
-     * This results in a call to the gotFocusCommand object 
-     * with <code>what</code> set to null.
-     */
-    public boolean gotFocus(Event evt, Object what) {
-	if (gotFocusCommand != null)
-            gotFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-    /**
-     * Called when the text field loses the focus.
-     * This results in a call to the lostFocusCommand object 
-     * with <code>what</code> set to null.
-     */
-    public boolean lostFocus(Event evt, Object what) {
-	if (lostFocusCommand != null)
-            lostFocusCommand.execute(this, evt, what);
-	return false;
-    }
-
-   /**
-    * Sets the actionCommand object.
-    */
-    public void setActionCommand(Command c) {
-	actionCommand = c;
-    }
-
- 
-   /**
-    * Sets the gotFocusCommand object.
-    */
-    public void setGotFocusCommand(Command c) {
-	gotFocusCommand = c;
-    }
-
-    /**
-     * Sets the lostFocusCommand object.
-     */
-    public void setLostFocusCommand(Command c) {
-	lostFocusCommand = c;
-    }
-}
diff --git a/java/apps/NexusII/classes/awtCommand/Command.class b/java/apps/NexusII/classes/awtCommand/Command.class
deleted file mode 100644
index 6b3c12c24f7..00000000000
--- a/java/apps/NexusII/classes/awtCommand/Command.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/awtCommand/Command.java b/java/apps/NexusII/classes/awtCommand/Command.java
deleted file mode 100644
index 373c7a363cf..00000000000
--- a/java/apps/NexusII/classes/awtCommand/Command.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 1996 Jan Newmarch, University of Canberra.
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The author
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-
-
-package awtCommand;
-
-import java.awt.*;
-
-public interface Command {
-
-    /**
-     * Executes application logic.
-     * Called by events occurring in associated objects
-     */
-    public abstract void execute(Object target, Event evt, Object what); 
-}
diff --git a/java/apps/NexusII/classes/commandHandler.class b/java/apps/NexusII/classes/commandHandler.class
deleted file mode 100644
index ce09bf08a09..00000000000
--- a/java/apps/NexusII/classes/commandHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/commandParser.class b/java/apps/NexusII/classes/commandParser.class
deleted file mode 100644
index 19b91f654ff..00000000000
--- a/java/apps/NexusII/classes/commandParser.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/connectionHandler.class b/java/apps/NexusII/classes/connectionHandler.class
deleted file mode 100644
index b91e9259402..00000000000
--- a/java/apps/NexusII/classes/connectionHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/joinHandler.class b/java/apps/NexusII/classes/joinHandler.class
deleted file mode 100644
index 82dc4cd27b3..00000000000
--- a/java/apps/NexusII/classes/joinHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/roomHandler.class b/java/apps/NexusII/classes/roomHandler.class
deleted file mode 100644
index f952c389176..00000000000
--- a/java/apps/NexusII/classes/roomHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/classes/textHandler.class b/java/apps/NexusII/classes/textHandler.class
deleted file mode 100644
index d5ce3bf1d5e..00000000000
--- a/java/apps/NexusII/classes/textHandler.class
+++ /dev/null
diff --git a/java/apps/NexusII/src/Consumer.java b/java/apps/NexusII/src/Consumer.java
deleted file mode 100644
index 84df9b3a3ae..00000000000
--- a/java/apps/NexusII/src/Consumer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-
-// This class encapsulates a Consumer. The consumer dq's from the queue 
-// Supports both a timed and blocking consumer. 
-// Each instance of this class creates a different thread of control. 
-// On timeout, the producer returns. 
-// The producer tries to dq "iteration" number of times, unless it times out
-
-//package NexusII.util ; 
-
-public class Consumer extends Thread 
-{
-public static final int DEFAULT_ITERATIONS = 1 ; 
-public Consumer(MT_Bounded_Queue queue)
-  {
-    this.queue_ = queue ; 
-    this.iterations_ = new Integer(DEFAULT_ITERATIONS); 
-    this.time_out_ = -1 ; 
-  }
-
-public Consumer(MT_Bounded_Queue queue, String name)
-  {
-    super(name); 
-    this.queue_ = queue ; 
-    this.iterations_ = new Integer(DEFAULT_ITERATIONS); 
-    this.time_out_ = -1 ; 
-  }
-
-
-public Consumer(MT_Bounded_Queue queue, String name, Integer iterations)
-  {
-    super(name); 
-    this.queue_ = queue ; 
-    this.iterations_ = iterations ; 
-    this.time_out_ = -1 ; 
-  }
-
-
-public Consumer(MT_Bounded_Queue queue, String name, Integer iterations, long msec_timeout)
-  {
-    super(name); 
-    this.queue_ = queue ; 
-    this.iterations_ = iterations ; 
-    this.time_out_ = msec_timeout ; 
-  }
-
-
-
-public void run()
-  {	
-    for(int i=0;i<iterations_.intValue();i++)
-      {
-	if(time_out_ < 0)
-	  System.out.println(getName() + ": dequeued " + queue_.dq());
-	else
-	  {
-	    Object err = queue_.dq(time_out_); 
-	    if(err == null)
-	      {
-		System.out.println(getName() + ": Timedout\n");
-		return ; 
-	      }
-	    
-	    else
-	      System.out.println(getName() + ": dequeued " + err);
-	  }
-      }
-  }
-  
-
-protected MT_Bounded_Queue queue_ ; 
-private Integer iterations_ ; 
-private long time_out_ ; 
-}
-  
diff --git a/java/apps/NexusII/src/MT_Bounded_Queue.java b/java/apps/NexusII/src/MT_Bounded_Queue.java
deleted file mode 100644
index a9b493fa263..00000000000
--- a/java/apps/NexusII/src/MT_Bounded_Queue.java
+++ /dev/null
@@ -1,226 +0,0 @@
-
-// package NexusII.util ; 
-
-// The minimun functionality to be associated with a queue 
-interface Queue 
-{
-public void nq(Object item);
-public Object dq();
-public boolean is_full();
-public boolean is_empty();
-public static final int DEF_SIZE = 1; 
-}; 
-
-// Specific Conditions associated with MT_Bounded_Queue 
-// Is true if there is space in the queue 
-
-class Not_Full_Condition extends Timed_Wait 
-{
-
-public Not_Full_Condition(MT_Bounded_Queue q)
-  {
-   super(q);
-  }
-  
-public synchronized boolean condition()
-  {
-    MT_Bounded_Queue mq_ = (MT_Bounded_Queue) object_;
-    return !mq_.is_full ();
-  }
-  
-}
-
-// Is true if there's something in the queue 
-
-class Not_Empty_Condition extends Timed_Wait
-{
-
-public Not_Empty_Condition(MT_Bounded_Queue q)
-  {
-    super(q); 
-  }
-  
-public synchronized boolean condition()
-  {
-    // Delegate to the appropriate conditional
-    // check on the MessageQueue.
-    MT_Bounded_Queue mq_ = (MT_Bounded_Queue) object_;
-    return !mq_.is_empty ();
-  }
-
-private MT_Bounded_Queue mq_ ; 
-}
-
-
-
-
-// Encapsulates a bounded - synchronized queue 
-
-public class MT_Bounded_Queue implements Queue 
-{
-
-
-private Object[] queue_ ; 
-private int front_  ; 
-private int back_   ; 
-private int max_size_ ; 
-private int size_ ; 
-private Not_Empty_Condition not_empty_condition_ ; 
-private Not_Full_Condition not_full_condition_ ; 
-private int nq_count_ ; 
-private int dq_count_ ; 
-
-// The counters counts the number of nq's and dq's operations made on this
-// instance of the queue 
-
-public int dq_count()
-{
-  return dq_count_ ; 
-}
-
-public int nq_count()
-{
-  return nq_count_ ; 
-}
-
-public MT_Bounded_Queue()
-  {
-    // 	call the other constructor with DEF_SIZE 
-    this(DEF_SIZE);
-  }
-  
-public MT_Bounded_Queue(int max_size)
-  {
-    this.front_ = 0 ; 
-    this.back_  = 0 ; 
-    this.max_size_  = max_size ; 
-    this.size_ = 0 ; 
-    // these are included for STATISTICS 
-    this.nq_count_ = 0 ; 
-    this.dq_count_ = 0 ; 
-    this.queue_ = new Object[this.max_size_];
-    not_full_condition_  = new Not_Full_Condition(this);
-    not_empty_condition_ = new Not_Empty_Condition(this);
-  }
-
-// Blocking nq 
-public synchronized void nq(Object item)
-  {
-    // Wait till the queue has space 
-    while(is_full())
-      {
-	try {
-	  wait();
-	} catch (InterruptedException e) {}
-      }
-
-    // enqueue here 
-    queue_[back_] = item ; 
-    back_ = (back_ + 1) % max_size_  ; 
-    size_++ ; 
-    // One more enqueue operation has occured 
-    nq_count_ ++ ; 
-    // wakeup the sleeping guys 
-    notifyAll();
-  }
-
-  // Timed nq 
-// returns -1 if timed_out 
-public synchronized int nq(Object item,long msec_timeout)
-  {
-    // Wait till the queue has space 
-    try {
-      not_full_condition_.timed_wait(msec_timeout);
-    } catch (InterruptedException e) {}
-    catch (TimeoutException t) 
-      { 
-	return -1 ; 
-      }
-  
-  // enqueue here 
-  queue_[back_] = item ; 
-  back_ = (back_ + 1) % max_size_  ; 
-  size_++ ; 
-  	
-  // One more enqueue operation has occured 
-  nq_count_ ++ ; 	
-  // wakeup the sleeping consumers 
-  not_empty_condition_.broadcast ();
-  return 0 ; 
-  }
-
-
-
-
-  // Blockin dq 
-public synchronized Object dq()
-  {
-    // wait till the queue has something in it 
-    while(is_empty())
-      {
-	try {
-	  wait();
-	} catch (InterruptedException e) {}
-      }
-
-    // dequeue here 
-    Object return_object = queue_[front_] ; 
-    front_ = (front_ + 1) % max_size_ ; 
-    size_ -- ; 
-    // One more enqueue operation has occured 
-    dq_count_ ++ ; 
-    //wake up the sleeping producers
-    notifyAll(); 
-    return return_object ; 
-  }
-
-
-  // Timed dq 
-
-public synchronized Object dq(long msec_timeout)
-  {
-    // wait till the queue has something in it 
-    try {
-      not_empty_condition_.timed_wait(msec_timeout);
-    } catch (InterruptedException e) {}
-    catch (TimeoutException t)
-      {
-	return null; 
-      }
-
-    // dequeue here 
-    Object return_object = queue_[front_] ; 
-    front_ = (front_ + 1) % max_size_ ; 
-    size_ -- ; 
-    
-    // One more enqueue operation has occured 
-    dq_count_ ++ ; 
-
-    //wake up the sleeping guys 
-    not_full_condition_.broadcast(); 
-    return return_object ; 
-  }
-
-public boolean is_empty()
-  {
-    if (size_ == 0)
-      return true ;
-    else
-      return false ; 
-  
-  } 
-
-public boolean is_full()
-  {
-    if (size_ == max_size_)
-      return true ; 
-    else
-      return false ; 
-  }
-
-}
-
-
-
-
-
diff --git a/java/apps/NexusII/src/MT_Bounded_Queue_Group.java b/java/apps/NexusII/src/MT_Bounded_Queue_Group.java
deleted file mode 100644
index 734dc51a84b..00000000000
--- a/java/apps/NexusII/src/MT_Bounded_Queue_Group.java
+++ /dev/null
@@ -1,79 +0,0 @@
-//package NexusII.server;
-
-//import NexusII.util.*;
-import java.util.*;
-
-
-public class MT_Bounded_Queue_Group {
-
-  public Vector q_group_ = new Vector();
-
-  public MT_Bounded_Queue_Group(int num) { 
-  
-    q_group_ = new Vector(num);
-  
-  }
-
-  public MT_Bounded_Queue_Group() {
-
-    //  q_group_ = new Vector();
-
-  }
-
-  public String toString() {
-  
-    return q_group_.toString();
-
-  }
-
-  // always returns true
-  public boolean addToGroup(MT_Bounded_Queue q) {
-  
-    q_group_.addElement(q);
-    return true; // for now
-  
-  }
-  
-
-  // returns false if the q was not part of the group
-  public boolean delFromGroup(MT_Bounded_Queue q) {
-
-    return q_group_.removeElement(q);
-
-  }
-
-
-  public boolean checkInGroup(MT_Bounded_Queue q) {
-
-    return q_group_.contains(q);
-
-  }
-
-
-    // returns number of q's on which data was successfully enqueued
-  public int nq(Object o) {
-    
-    if(q_group_.isEmpty() ) 
-      return 0;
-    
-    Enumeration e = q_group_.elements();
-    
-      int i = 0;
-      while(e.hasMoreElements()) {
-	
-	MT_Bounded_Queue q = (MT_Bounded_Queue) e.nextElement();
-	q.nq(o);
-	i++;
-	
-      }
-      
-      return i;
-  }
-  
-}
-
-
-
-
-
-  
diff --git a/java/apps/NexusII/src/NexusClientApplet.java b/java/apps/NexusII/src/NexusClientApplet.java
deleted file mode 100644
index 58b26930718..00000000000
--- a/java/apps/NexusII/src/NexusClientApplet.java
+++ /dev/null
@@ -1,494 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:10:59  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.3  1996/12/06  07:25:29  rajeev
-# Got SetRoomName to work -- needed for LROOMS
-#
-# Revision 1.2  1996/12/06  04:48:21  rajeev
-# added handling for l_users and L_room packets from  server
-#
-# Revision 1.1  1996/12/06  03:37:22  rajeev
-# Initial revision
-#
-
-   This is the client applet 
-   Part of Nexus-II project !!
-   Copyright : Aravind Gopalan, Rajeev Bector, Sumedh Mungee
-*/
-
-// package NexusII; 
-
-// I hate packages
-
-import java.applet.Applet;
-import java.awt.* ; 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-//import NexusII.networking.* ; 
-//import NexusII.client.* ;
-//import NexusII.util.* ; 
-
-// get the awtCommand package now 
-import awtCommand.* ; 
-
-// The applet runs the root thread -- easy access to graphics now ... 
-
-public class NexusClientApplet extends CApplet implements consts,Runnable {
-
-  // Who am I  -- will be modified if the /nick command is given 
-  public static String myName = new String("anonymous"); 
-
-  /* All Event Handlers */ 
-
-  // To check if applet is connected
-  boolean connected = false;
-
-  // The connector handler  
-  connectionHandler nexusConnector ;  
-
-  // join handler 
-  joinHandler  nexusJoiner ; 
-
-  // command handler 
-  commandParser nexusParser ; 
-
-  commandHandler commandLineHandler ; 
-  // Streams for writing and reading from Socket 
-  DataOutputStream outStream;
-  DataInputStream  inStream;
-
-  // Thread which does everything for the applet 
-  Thread mainThread ; 
-
-  // this is just a visit 
-  // host where I live actually ;-)
-  String host;
-  
-  // Which server to connect to 
-  Integer serverPort ; 
-
-  // Where are the queues for reading and writing
-  // reader and writers will access these and also the interpretor and dep.
-
-  MT_Bounded_Queue read_q ; 
-  MT_Bounded_Queue write_q ; 
-  MT_Bounded_Queue root_q  ; 
-  // Where Aravind writes his commands 
-  MT_Bounded_Queue command_q ; 
-
-
-
-
-  // ***********************************************************
-  // Graphics objects
-  // ***********************************************************
-
-  // Total applet size
-  int minWidth_ = 500;
-  int minHeight_ = 450;
-
-  // State variables needed to be maintained
-  boolean connected_ = false;
-  int numRooms_ = 0;
-
-  // Buttons
-  private CButton bConn; 
-  private CButton bJoin; 
-  private CButton bLeave; 
-  private CButton bRooms;
-  private CButton bUsers;
-
-  private CTextField tfCommandLine = new CTextField(80);
-  private CTextField tfRoomName = new CTextField(16);
-  private List lRooms = new List(10,false);
-  private Label roomLabel = new Label("Rooms:");
-  private List lUsers = new List(10,false);
-  private Label userLabel = new Label("Users:");
-
-//  private RoomSpace roomspace = new RoomSpace();
-  private Panel roomspace = new Panel();
-    
-  public Dimension preferredSize() {
-      return minimumSize();
-  }
-
-  public Dimension minimumSize() {
-      return new Dimension(minWidth_, minHeight_);
-  }
-
-  // -----------------------------------------------------------------
-  // Basically draws up all the components (not sub-components) of the
-  // Applet window ...
-  // Pretty much straightforward barring quirks of AWT -- ArGo
-  void SetUpButtons(GridBagLayout gbl, GridBagConstraints gbc) { 
-    // The Connect Button
-    gbc.weightx = 1.0;
-    gbc.weighty = 0.5;
-    gbc.gridx = 2;
-    gbc.gridy = 1;
-    gbc.fill = GridBagConstraints.HORIZONTAL;
-    gbc.anchor = GridBagConstraints.CENTER;
-    gbc.ipady = 5;
-    bConn = new CButton("Connect");
-    bConn.setActionCommand(nexusConnector); 
-    gbl.setConstraints(bConn, gbc);
-    add(bConn);
-    gbc.ipady = 0;
-
-    // The remaining buttons
-    gbc.fill = GridBagConstraints.BOTH;
-    gbc.anchor = GridBagConstraints.CENTER;
-    gbc.weightx = 1.0;
-    gbc.weighty = 0.5;
-    gbc.insets = new Insets(2,2,2,2);
-    gbc.ipadx = 2;
-    gbc.ipady = 2;
-
-    // Join Button
-    gbc.gridx = 0;
-    gbc.gridy = 3;
-    bJoin = new CButton("Join");
-    gbl.setConstraints(bJoin,gbc);
-    add(bJoin);
-
-    // Leave Button
-    gbc.gridx = 1;
-    gbc.gridy = 3;
-    bLeave = new CButton("Leave");
-    gbl.setConstraints(bLeave,gbc);
-    add(bLeave);
-
-    // List Rooms Button
-    gbc.gridx = 0;
-    gbc.gridy = 4;
-    bRooms = new CButton("List Rooms");
-    gbl.setConstraints(bRooms,gbc);
-    add(bRooms);
-
-    // List Users Button
-    gbc.gridx = 1;
-    gbc.gridy = 4;
-    bUsers = new CButton("List Users");
-    gbl.setConstraints(bUsers,gbc);
-    add(bUsers);
-
-  }   // of SetUpButtons 
-
-  void SetUpGraphics() { 
-    
-    resize(preferredSize());
-
-    GridBagLayout gbl = new GridBagLayout();
-    GridBagConstraints gbc = new GridBagConstraints();
-    setFont(new Font("Helvetica", Font.PLAIN, 14));
-    setLayout (gbl);
-
-    gbc.weightx = 1.0;
-    gbc.weighty = 1.0;
-
-    // For the list of rooms
-    // First the Room list label 
-    gbc.weightx = 0;
-    gbc.weighty = 0;
-    gbc.gridx = 0;
-    gbc.gridy = 0;
-    gbc.anchor = GridBagConstraints.SOUTHWEST;
-    gbc.fill = GridBagConstraints.NONE;
-    gbl.setConstraints(roomLabel,gbc);
-    add(roomLabel);
-    // Now the Room combo -- list + text field
-    // the actual list
-    gbc.weightx = 1.0;
-    gbc.weighty = 1.0;
-    gbc.gridy = 1;
-    gbc.fill = GridBagConstraints.VERTICAL;
-    gbc.anchor = GridBagConstraints.NORTH;
-    // gbc.insets = new Insets(0,2,0,2);
-    gbl.setConstraints(lRooms,gbc);
-    add(lRooms);
-    if (DEBUG)
-      lRooms.addItem("Room_1");
-    // The text field
-    gbc.weightx = 0;
-    gbc.weighty = 0;
-    gbc.gridy = 2;
-    gbc.anchor = GridBagConstraints.NORTH;
-    gbc.fill = GridBagConstraints.HORIZONTAL;
-    gbc.insets = new Insets(0,0,0,0);
-    gbl.setConstraints(tfRoomName,gbc);
-    add(tfRoomName);
-
-    // Similarly for the list of users
-    // label
-    gbc.weightx = 0;
-    gbc.weighty = 0;
-    gbc.gridx = 1;
-    gbc.gridy = 0;
-    gbc.anchor = GridBagConstraints.SOUTHWEST;
-    gbc.fill = GridBagConstraints.NONE;
-    gbc.insets = new Insets(0,0,0,0);
-    gbl.setConstraints(userLabel,gbc);
-    add(userLabel);
-    // The list
-    gbc.weightx = 1;
-    gbc.weighty = 1;
-    gbc.gridy = 1;
-    gbc.fill = GridBagConstraints.VERTICAL;
-    gbc.anchor = GridBagConstraints.NORTH;
-    gbl.setConstraints(lUsers,gbc);
-    add(lUsers);
-    if (DEBUG)
-      lUsers.addItem("USer #1");
-
-    // Setup all the buttons
-    SetUpButtons(gbl,gbc) ; 
-
-    // The command line
-    gbc.gridx = 0;
-    gbc.gridy = 5;
-    gbc.ipadx = 0;
-    gbc.ipady = 0;
-    gbc.insets = new Insets(0,0,0,0);
-    gbc.gridwidth = GridBagConstraints.REMAINDER;
-    gbc.fill = GridBagConstraints.NONE;
-    gbc.anchor = GridBagConstraints.CENTER;
-    gbl.setConstraints(tfCommandLine,gbc);
-    add(tfCommandLine);
-
-
-    // We are done -- startup with all buttons except connect disabled
-    OnDisconnect(); 
-    return;
-  }
-
-  public void init() {
-    //Get the address of the host the applet was downloaded from 
-    host = getCodeBase().getHost();
-    // Get servers portnumber from the home page 
-    serverPort = Integer.valueOf(getParameter("serverport")); 
-    
-
-    // Create the nexusconnector object whose execute will be called later
-    // on pressing the connect button 
-    nexusConnector = new connectionHandler(host,serverPort,this); 
-
-    if(DEBUG){
-      System.out.println("Server Portnumber is " + serverPort + "\n");
-    }
-
-    // initialize the graphics 
-    SetUpGraphics(); 
-  } // of method init 
-
-  public synchronized void start() { 
-    // Aravind will create the "connect" button here and register an instance
-
-    if (DEBUG) {
-      System.out.println("In start() method.");
-    }
-  }
-
-
-  //  Here is the stop for the applet
-  //  Called when the user goes away from the page 
-  public synchronized void stop() {
-    if (!DEBUG) { 
-      showStatus("Stop has been called ");
-    }
-
-    if (connected) {
-      nexusConnector.execute(null,null,null);
-    }
-  }
-
-
-
-    
-  // -----------------------------------------------------------------------
-  // Public Access functions
-  public Hashtable Mapper() {
-    return nexusJoiner.Mapper();
-  }
-  
-  public String GetRoomName() { 
-    StringTokenizer t = new StringTokenizer(tfRoomName.getText()); 
-    if(t.hasMoreTokens()) { 
-      return  t.nextToken(); 
-    }
-    else
-      return "" ; 
-  }
-  
-  public void AddRoomName(String name) {
-    int count = lRooms.countItems(); 
-    for (int i=0;i<count;i++) 
-      if (lRooms.getItem(i).equalsIgnoreCase(name))
-	return;
-    lRooms.addItem(name);
-  }
- 
-  public void SetRoomName(String name) { 
-    int count = lRooms.countItems(); 
-    for(int i=0;i<count;i++) { 
-      if(lRooms.getItem(i).equalsIgnoreCase(name)) { 
-	// Have to simulate a select event by doing the selection ourselves
-	lRooms.select(i);
-	tfRoomName.setText(lRooms.getSelectedItem());
-	tfRoomName.selectAll();
-	break ; 
-      } 
-    } 
-  } 
-  
-  public void  sendNickToServer(String name) { 
-    nexusJoiner.sendTestPacket("ROOT","NICK",name,nexusConnector.writer_q());
-  }
-
-
-  // will run the mainthread 
-  public void run() { 
-    if(DEBUG) { 
-      System.out.println("Root thread is starting -- ");
-    }
-
-    root_q = new MT_Bounded_Queue(QUEUE_SIZE);
-    nexusJoiner.Mapper().put("ROOT",root_q);
-    // continously wait for something to read and then update the graphics
-    // objects ----
-    if(DEBUG) { 
-      nexusJoiner.sendTestPacket("ROOT","LROOMS","a b c d",root_q);
-    }
- 
-    for(;;) { 
-      dataPacket rootPacket = (dataPacket)root_q.dq(); 
-      if(DEBUG) { 
-	System.out.println("Root got a packet --- ");
-      }
-      if(rootPacket.contentType().equalsIgnoreCase("LROOMS")) { 
-	update_lrooms(rootPacket.content()); 
-      } 
-      else if(rootPacket.contentType().equalsIgnoreCase("LUSERS")) { 
-	update_lusers(rootPacket.destination(),rootPacket.content()); 
-      } 
-    } 
-    
-  }
-  
-
-  
-  // This method will update the graphics of lrooms 
-  void update_lrooms(String data) { 
-    lRooms.disable(); 
-    tfRoomName.disable(); 
-    lRooms.clear(); 
-    
-    StringTokenizer t = new StringTokenizer(data);
-    while(t.hasMoreTokens()) { 
-      lRooms.addItem(t.nextToken()); 
-    }
-    if (lRooms.countItems() != 0) {
-      lRooms.select(0);
-      tfRoomName.setText(lRooms.getItem(0));
-    }
-    tfRoomName.enable(); 
-    lRooms.enable(); 
-    repaint(); 
-  } 
-
-  void update_lusers(String name,String data) { 
-    lUsers.disable(); 
-    userLabel.setText("Users: "+ name);
-    lUsers.clear();
-    StringTokenizer t = new StringTokenizer(data);
-    while(t.hasMoreTokens()) { 
-      lUsers.addItem(t.nextToken()); 
-    }
-    lUsers.enable(); 
-    repaint(); 
-  } 
-    
-  // -----------------------------------------------------------------------
-  // User Input handling -- ArGo
-
-  // Function to handle Connect button being pressed
-  public void OnConnect(){
-    // Create the event handlers -- 
-    nexusJoiner    = new joinHandler(nexusConnector.writer_q(),this); 
-    nexusParser    = new commandParser(nexusConnector.writer_q(),this); 
-    commandLineHandler = new commandHandler(this); 
-    // start the main thread in the applets context 
-    mainThread  =  new Thread(this); 
-    mainThread.start(); 
-    // test 
-      // Graphics here -- 
-    bJoin.enable();
-    bJoin.setActionCommand(nexusJoiner); 
-    bLeave.enable(); 
-    bLeave.setActionCommand(nexusJoiner); 
-    bRooms.enable();
-    bRooms.setActionCommand(nexusParser); 
-    bUsers.enable();
-    bUsers.setActionCommand(nexusParser); 
-    tfCommandLine.enable();
-    tfCommandLine.setActionCommand(commandLineHandler); 
-    tfRoomName.enable();
-    lRooms.enable();
-    lUsers.enable();
-    // Change the name to "Disconnect" and ensure that update happens
-    bConn.setLabel("Disconnect");
-    validate();	// Don't know if this is necessary
-    connected = true; // Applet is now connected
-  }
-
-  // Function to handle Connect button being pressed
-  public void OnDisconnect(){
-    bJoin.disable();
-    bLeave.disable();
-    bRooms.disable();
-    bUsers.disable();
-    tfCommandLine.disable();
-    tfRoomName.disable();
-    lRooms.disable();
-    lUsers.disable();
-    // Change the name back to "Connect" and ensure update happens
-    bConn.setLabel("Connect");
-    validate();
-    // Stop the ROOT room thread
-    if (connected) {
-      mainThread.stop();
-      connected = false;  // Applet is disconnected
-    }
-  }
-
-  // Basically take care of the inputs
-  public boolean handleEvent(Event event) {
-    if (event.target == lRooms) {
-      if (event.id == Event.LIST_SELECT) {	// selected the item
-	tfRoomName.setText(lRooms.getSelectedItem());
-	tfRoomName.selectAll();
-	if (DEBUG)
-	  System.out.println("Actually handling the select event");
-	return true;
-      }
-    }
-    return super.handleEvent(event);
-  }
-
-  public void update(Graphics g) {
-    paint(g);
-  }
-} // of class NexusClientApplet 
-
-
-  
diff --git a/java/apps/NexusII/src/NexusIIserver.java b/java/apps/NexusII/src/NexusIIserver.java
deleted file mode 100644
index e3b5a52acd5..00000000000
--- a/java/apps/NexusII/src/NexusIIserver.java
+++ /dev/null
@@ -1,280 +0,0 @@
-// The Nexus II server.
-// Sumedh Mungee <sumedh@cs.wustl.edu>
-
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import ACE.OS.*;
-import ACE.SOCK_SAP.*;
-
-public class NexusIIserver implements consts {
-
-  // Entry point into the server
-  public static void main(String args[]) throws IOException {
-    
-    if(args.length != 1) {
-      System.out.println("Usage: java NexusIIserver <port_num>");
-      return;
-    }
-
-    // Create a "Hotel", which is a factory to generate Rooms
-    // as and when required.
-    RoomFactory Hotel = new RoomFactory();
-
-    System.out.println("NexusII server booting");
-    SOCKAcceptor sacceptor = new SOCKAcceptor( (new Integer(args[0])).intValue());
-
-    System.out.println("NexusII is now accepting connections on port " + (new Integer(args[0])).intValue());
-    
-    for(;;) { 
-      
-      SOCKStream s = new SOCKStream();
-      sacceptor.accept(s);
-      // Accepted connection
-      // construct a client handler..
-      // Pass in the connected socket as an argument,
-      // and a reference to the Hotel, in case it needs
-      // to create rooms..
-      // and away you go..
-      new Thread(new ClientHandler(s, Hotel)).start();
-      
-    }
-  }
-}  
-
-
-// This thread handles the clients..
-// It uses 2 additional threads for read/write network operations 
-// These threads are dedicated to read/write from the
-// respective read/write queues.. 
-class ClientHandler implements Runnable,consts {
-  
-  private SOCKStream s_;
-  private RoomFactory Hotel_;
-  private MT_Bounded_Queue rq_ = new MT_Bounded_Queue(QUEUE_SIZE);
-  private MT_Bounded_Queue wq_ = new MT_Bounded_Queue(QUEUE_SIZE);
-  private String my_name_;
-  private Vector roomlist_ = new Vector();
-  private boolean finished_ = false;
-  private String init_image_;
-  
-  public ClientHandler(SOCKStream s, RoomFactory h) {
-    s_ = s;
-    Hotel_ = h;
-    init_image_ = new String(System.getProperty("mywebaddress") + NEXUS_LOGO);
-  }
-  
-  public void run()  {
-      // Construct the reader/writer threads with the queues and the
-      // corresponding socket data streams as parameters.
-      Thread r_ = new socketReaderThread(rq_, new DataInputStream(s_.inputStream()));
-      Thread w_ = new socketWriterThread(wq_, new DataOutputStream(s_.outputStream()));
-      r_.start();
-      w_.start(); 
-      
-      // now start parsing the messages, and take action..
-      // todo: optimize the below..
-
-      while(!finished_) {
-	dataPacket d = (dataPacket) rq_.dq();
-	if(d.contentType().startsWith("INIT"))
-	  nexus_init(d);
-	if(d.contentType().startsWith("JOIN"))
-	  nexus_join(d);
-	if(d.contentType().startsWith("LEAVE"))
-	  nexus_leave(d);
-	if(d.contentType().startsWith("QUIT"))
-	  nexus_quit(d);
-	if(d.contentType().startsWith("TEXT"))
-	  nexus_text(d);
-	if(d.contentType().startsWith("LUSERS"))
-	  nexus_lusers(d);
-	if(d.contentType().startsWith("LROOMS"))
-	  nexus_lrooms(d);
-	if(d.contentType().startsWith("NICK"))
-	  nexus_nick(d);
-	if(d.contentType().startsWith("URL"))
-	  nexus_url(d);
-      }
-  }
-  
-  // The following classes implement the server functions..
-  
-  private void nexus_init(dataPacket packet) {
-    my_name_ = new String(packet.clientName());
-    wq_.nq(packet);
-  }
-
-  private void nexus_join(dataPacket packet) {
-    Room r = Hotel_.getRoom(packet.content());
-    if(r.checkClient(this)) 
-      return;
-    r.addClient(this);
-    roomlist_.addElement(r);
-    writeRoom(r, my_name_ + " has joined the room ");
-    String contenttype = new String("url");
-    dataPacket d = new dataPacket(my_name_, packet.content(), contenttype, (new Integer(init_image_.length())).toString() , init_image_);
-    wq_.nq(d);
-  }
-
-  private void nexus_text(dataPacket packet) {
-    Room r = Hotel_.getRoom(packet.destination());
-    r.getQ().nq(packet);
-  }
-  
-  private void nexus_lusers(dataPacket packet) {
-
-    Room r = Hotel_.getRoom(packet.content());
-    Enumeration e = r.clientList();
-    StringBuffer sb = new StringBuffer();
-    while(e.hasMoreElements()) 
-      sb.append(" " + ((ClientHandler)e.nextElement()).getName() + " ");
-    dataPacket d = new dataPacket(my_name_, packet.destination(), packet.contentType(), (new Integer(sb.length())).toString(), sb.toString());
-    wq_.nq(d);
-  }
-  
-  private void nexus_lrooms(dataPacket packet) {
-    String s = Hotel_.listRooms();
-    dataPacket d = new dataPacket(my_name_, packet.destination(), packet.contentType(), (new Integer(s.length())).toString(), s.toString());
-    wq_.nq(d);
-  }
-    
-  private void nexus_nick(dataPacket packet) {
-    Enumeration e = roomlist_.elements();
-    while(e.hasMoreElements()) 
-      writeRoom((Room)e.nextElement(), my_name_ + " is now known as " + packet.content());
-
-    my_name_ = new String(packet.content());
-  }
-
-  private void nexus_leave(dataPacket packet) {
-    
-    Room r = Hotel_.getRoom(packet.content());
-    writeRoom(r, my_name_ + " has left the room " + packet.content());
-    if(r.delClient(this)) Hotel_.delRoom(r);
-    roomlist_.removeElement(r);
-  }      
-  
-  private void nexus_quit(dataPacket packet) {
-    
-    Enumeration e = roomlist_.elements();
-    while(e.hasMoreElements()) {
-      Room r = (Room)e.nextElement();
-      writeRoom(r, my_name_ + " has quit " );
-      r.delClient(this);
-    }
-    finished_ = true;
-  }
-
-  private void nexus_url(dataPacket packet) {
-    try {
-      URL u = new URL(packet.content());
-
-      // first extract the filename stripped of its path.
-      int index = u.getFile().lastIndexOf("/");
-      String infilename = u.getFile().substring(index + 1);
-
-      // next construct the name of the temporary file
-      String outfilename = (System.getProperty("mywebdir") + "_" + packet.destination() + "." + infilename);
-
-      // now the temporary URL assigned to this request
-      String imageURL = new String(System.getProperty("mywebaddress") + "_" + packet.destination() + "." + infilename);
-
-      // Open temporary file for writing
-      FileOutputStream fout = new FileOutputStream(outfilename);
-
-      // Now contact alien ship
-      InputStream i = u.openStream();
-      byte[] buffer = new byte[1024];
-      
-      // And download the image
-      for(;;) {
-	int num = i.read(buffer);
-	if(num < 0) 
-	  break;
-	fout.write(buffer, 0, num);
-      }
-
-      fout.close();
-      i.close();
-      
-      // Get room for which this request was issued
-      Room r = Hotel_.getRoom(packet.destination());
-      
-      // invalidate previous entry
-      File f = new File(r.getLastImageName());
-      if(f.exists()) f.delete();
-
-      // add new image name
-      r.putNextImageName(outfilename);
-      writeRoom(r,"Asynchronously transferring image " + packet.content() + " from " + my_name_ );
-      dataPacket d = new dataPacket(my_name_, packet.destination(), packet.contentType(), (new Integer(imageURL.length())).toString(), imageURL);
-      r.getQ().nq(d); // multicast this imageURL onto the room..
-    
-    }
-    catch(java.net.MalformedURLException ue) {
-      System.out.println("warning:Invalid URL requested");
-    }
-    catch(java.io.IOException e) {
-      System.out.println("warning: IOException occurred");
-    }
-    
-  }
-
-  // Sends a "system" message msg onto room r
-  private void writeRoom(Room r, String msg) {
-    StringBuffer sb = new StringBuffer();
-    sb.append("==>");
-    sb.append(msg);
-    dataPacket d = new dataPacket(my_name_, r.getName() , "TEXT" , (new Integer(sb.length())).toString(), sb.toString());
-    r.getQ().nq(d);
-  }
-
-  public String getName() {
-    return my_name_;
-  }
-
-  public MT_Bounded_Queue getQ() {
-    return wq_;
-  }
-  
-}
-// ----------------------------------------------------------------------
-/** This class implements a room factory. getRoom returns an existing room,
-  or else creates it and returns a reference to a new room.
-  
-**/ 
-class RoomFactory implements consts {
-
-  private Vector Hotel_; 
-  public RoomFactory() { 
-    Hotel_ = new Vector(); 
-  } 
-  public synchronized Room getRoom(String name) {
-    Enumeration e = Hotel_.elements();
-    while(e.hasMoreElements()) {
-      Room r = (Room) e.nextElement();
-      if(r.getName().equals(name)) 
- 	return r;
-    }
-    addRoom(name);
-    return getRoom(name);
-  } 
-  
-  private synchronized void addRoom(String name) {
-    Room r = new Room(name);
-    Hotel_.addElement(r);
-  }
-  public synchronized void delRoom(Room r) {
-    Hotel_.removeElement(r);
-  }
-  public synchronized String listRooms() {
-    Enumeration e = Hotel_.elements();
-    StringBuffer sb = new StringBuffer();
-    while(e.hasMoreElements())
-      sb.append(" " + ((Room)e.nextElement()).getName() + " ");
-    return sb.toString();
-  }
-}  
-
-
diff --git a/java/apps/NexusII/src/Producer.java b/java/apps/NexusII/src/Producer.java
deleted file mode 100644
index 4153f7d79df..00000000000
--- a/java/apps/NexusII/src/Producer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-// This class encapsulates a Producer. Each new instance of this class 
-// creates a different thread which tries to nq into the queue 
-// Currently queues random values generated by the Random class 
-// If timeout expires, the Producer instance returns 
-
-//package NexusII.util ; 
-
-import java.util.Random ; 
-
-public class Producer extends Thread 
-{
-
-// If no time out is desired, timeout value is set to one. so the run method
-// knows which nq to call 
-
-public Producer(MT_Bounded_Queue queue) 
-  {
-    this.queue_ = queue ; 
-    this.iterations_ = new Integer(DEFAULT_ITERATIONS);
-    this.time_out_ = -1 ; 
-  }
-
-// Include the name of the thread as a parameter   
-public Producer(MT_Bounded_Queue queue, String name)
-  {
-    super(name); 
-    this.queue_ = queue ; 
-    this.iterations_ = new Integer(DEFAULT_ITERATIONS);
-    this.time_out_ = -1 ; 
-  }
-
-// If the number of iterations are also included -- 
-public Producer(MT_Bounded_Queue queue, String name, Integer iterations)
-  {
-    super(name);
-    this.queue_ = queue ; 
-    iterations_ = iterations ; 
-    this.time_out_ = -1 ; 
-  }
-
-// Finally, if the timeout period is also included 
-	  
-public Producer(MT_Bounded_Queue queue, String name, Integer iterations, long msec_timeout)
-  {
-    super(name);
-    this.queue_ = queue ; 
-    iterations_ = iterations ; 
-    this.time_out_ = msec_timeout ;     
-  }
-  
-// The  hook method called by start()
-
-public void run()
-  {
-    // Initialize the random number generator
-    Random rand = new Random();	
-    for(int i=0;i<iterations_.intValue();i++)
-      {
-	int err = 0 ; 
-	// Get the next random value for insertion into queue 
-	Integer new_item = new Integer(rand.nextInt()) ; 
-
-	// Doesnt make sense to have a negative timeout -- default 
-	if(time_out_ < 0)
-	  queue_.nq(new_item);
-	else
-	  err = queue_.nq(new_item,time_out_);
-
-	// If timedout stop this thread 
-	if(err == -1)
-	  {
-	    System.out.println(getName() + ": Timed Out \n");
-	    return ; 
-	  }
-
-	System.out.println(getName() + ": enqueued " + new_item.intValue());
-      }
-    
-  }
-
-private static final int DEFAULT_ITERATIONS = 1 ; 
-protected MT_Bounded_Queue queue_ ; 
-private Integer iterations_ ; 
-private long time_out_ ; 
-}
-
-
diff --git a/java/apps/NexusII/src/Room.java b/java/apps/NexusII/src/Room.java
deleted file mode 100644
index 4a9a294c653..00000000000
--- a/java/apps/NexusII/src/Room.java
+++ /dev/null
@@ -1,97 +0,0 @@
-// RoomThread and Room implement the concept of a chat "room"
-// Sumedh Mungee <sumedh@cs.wustl.edu>
-
-
-import java.util.*;
-import java.io.File;
-
-// This class(&thread) is responsible for multicasting
-// packets on its incoming "client" queues, onto one or
-// more outgoing queues, which are picked up by the client.
-class RoomThread implements Runnable, consts {
-
-  private MT_Bounded_Queue rq_;
-  private Vector clientlist_;
-
-  public RoomThread(MT_Bounded_Queue rq, Vector clientlist) {
-    rq_ = rq;
-    clientlist_ = clientlist;
-  }
-  
-  public void run() {
-    for(;;) {
-      dataPacket d = (dataPacket) rq_.dq(); // Extract packet
-      Enumeration e = clientlist_.elements(); // Iterate over clients
-      while(e.hasMoreElements()) 
-        ((ClientHandler)e.nextElement()).getQ().nq(d); // Enqueue packet
-    }
-  }
-}
-
-
-public class Room implements consts {
-  
-  private String name_;         // name of this "room" 
-  private String last_image_ = new String("NexusII.gif"); // filename of the last image broadcast
-  private Thread roomthread_;
-  private  MT_Bounded_Queue rq_ = new MT_Bounded_Queue();
-  private Vector clientlist_ = new Vector();
-  
-  // Constructors
-  public Room(String name) {
-    int i;
-    name_ = new String(name);
-    roomthread_ = new Thread(new RoomThread(rq_, clientlist_));
-    roomthread_.start();
-  } 
- 
-  // Client management methods follow..
-
-  public synchronized void addClient(ClientHandler client) {
-    clientlist_.addElement(client);
-  }
-  // Returns true if this room has now become empty
-  public synchronized boolean delClient(ClientHandler client) {
-    clientlist_.removeElement(client);
-    return clientlist_.isEmpty();
-  }
-  
-  public synchronized boolean checkClient(ClientHandler client) {
-    return clientlist_.contains(client);
-  }
-  
-  public synchronized Enumeration clientList() {
-    return clientlist_.elements();
-  }
-
-  public String getName() {
-    return name_;
-  }
-
-  public MT_Bounded_Queue getQ() {
-    return rq_;
-  }
-
-  public synchronized String getLastImageName() {
-    return last_image_;
-  }
-
-  public synchronized void putNextImageName(String s) {
-    last_image_ = s;
-  }
-
-  protected void finalize() {
-    roomthread_.stop();
-    File f = new File(last_image_);
-    if(f.exists()) 
-      f.delete();
-    roomthread_ = null;
-  }
-}
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/src/RoomFrame.java b/java/apps/NexusII/src/RoomFrame.java
deleted file mode 100644
index e9da19b31d6..00000000000
--- a/java/apps/NexusII/src/RoomFrame.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:02  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.2  1996/12/07  06:25:18  rajeev
-# backup
-#
-# Revision 1.1  1996/12/07  06:15:12  rajeev
-# Initial revision
-#
-
-
-*/
-import java.awt.*;
-import awtCommand.*;
-import java.util.* ;
-
-//import NexusII.client.* ;
-//import NexusII.util.* ;
-//import NexusII.networking.*;
-
-class RoomFrame extends CFrame implements consts {
-  private static String rcsId = new String("$Id$");
-
-  // Graphics Objects
-  private CTextField tfInput ; 
-  private CTextArea taOutput ;
-  private CButton bLeave ;
-  private ImageCanvas icOutput;
-  private Font normalFont = new Font("Helvetica", Font.PLAIN, 14);
-  private Font boldFont = new Font("Helvetica", Font.BOLD, 14);
-  private Font italicFont = new Font("Helvetica", Font.ITALIC, 14);
-  private static final int LINE_LENGTH = 70;
-
-  // Other required objects
-  private MT_Bounded_Queue write_q_ ; 
-  private NexusClientApplet applet_ ; 
-  private String myName_ ; 
-
-  public RoomFrame(MT_Bounded_Queue write_q,
-		   NexusClientApplet applet,
-		   String name) {
-    super(name);
-    write_q_ = write_q ; 
-    applet_  = applet ; 
-    myName_  = name ; 
-    SetUpGraphics();
-    this.pack();
-    this.show();
-  }
-
-  void SetUpGraphics() {
-    // Initialize the graphics objects
-    // The input text line
-    tfInput = new CTextField(LINE_LENGTH);
-    textHandler handlerT = new textHandler(write_q_,applet_,myName_);
-    tfInput.setActionCommand(handlerT);
-    // The leave button
-    bLeave = new CButton(LEAVE_STR);
-    bLeave.setActionCommand(applet_.nexusJoiner);
-	
-    icOutput = new ImageCanvas(myName_);
-    taOutput = new CTextArea(10,LINE_LENGTH);
-
-    GridBagLayout gbl = new GridBagLayout();
-    GridBagConstraints gbc = new GridBagConstraints();
-    setFont(normalFont);
-    setLayout (gbl);
-
-    gbc.insets = new Insets(5,5,5,5);
-    gbc.ipadx  = 5;
-    gbc.ipady  = 5;
-    gbc.weightx = 1.0;
-    gbc.weighty = 1.0;
-
-    // First the Image so that sizes are fixed
-    gbc.gridx = 1;
-    gbc.gridy = 0;
-    gbc.anchor = GridBagConstraints.CENTER;
-    gbc.fill = GridBagConstraints.BOTH;
-    gbl.setConstraints(icOutput, gbc);
-    add(icOutput);
-
-    // The Text Output Area
-    gbc.gridx = 0;
-    gbc.gridy = 0;
-    gbc.weighty = 0.0;
-    gbc.anchor = GridBagConstraints.SOUTH;
-    gbc.fill = GridBagConstraints.BOTH;
-    gbl.setConstraints(taOutput,gbc);
-    taOutput.setEditable(false);
-    add(taOutput);
-
-    // The Text Input Field
-    gbc.gridx = 0;
-    gbc.gridy = 1;
-    gbc.weighty = 0.0;
-    gbc.anchor = GridBagConstraints.NORTH;
-    gbc.fill = GridBagConstraints.HORIZONTAL;
-    gbl.setConstraints(tfInput,gbc);
-    add(tfInput);
-
-    // The Leave Button
-    gbc.gridx = 1;
-    gbc.gridy = 1;
-    gbc.anchor = GridBagConstraints.NORTH;
-    gbc.fill = GridBagConstraints.HORIZONTAL;
-    gbl.setConstraints(bLeave,gbc);
-    add(bLeave);
-
-    resize(800,280);
-    setResizable(true);	// Allow the user to resize
-    validate();
-  }
-
-  public boolean handleEvent(Event event) {
-    if (event.id == Event.WINDOW_DESTROY)
-      dispose();
-    return super.handleEvent(event);
-  }
-
-  // This function will be called by the RoomHandler when it receives
-  // anything for this room and will add the data 
-  public  void addText(String tobeadded) {
-    if (false) {
-      String speaker = null;
-      String msg = null;
-      int pos = tobeadded.indexOf(':');
-      if (pos >= 0)
-        speaker = tobeadded.substring(0,pos+1);
-      else
-        speaker = new String("");
-      msg = tobeadded.substring(pos+1);
-      Font oldf = taOutput.getFont();
-      taOutput.setFont(boldFont);
-      taOutput.appendText(speaker);
-      taOutput.setFont(italicFont);
-      taOutput.appendText(msg+"\n");
-      taOutput.setFont(oldf);
-    }
-    else {
-      taOutput.appendText(tobeadded+"\n");
-    }
-    return;
-  }
-
-  // This function will also be called by the RoomHandler whenit receives
-  // Image data for this room. 
-  public void 	updateImage(Image im) { 
-    if(DEBUG) { 
-      System.out.println("Room : I got an image");
-    }
-    icOutput.setImage(im);
-  } 
-  
-  
-}
-
-
-
-/**
- * The ImageCanvas Class -- for the image in the class
- */
-class ImageCanvas extends Canvas implements consts {
-
-  Image image_ = null;
-  int defWidth_ = 128;
-  int defHeight_ = 128;
-  int margin = 5;
-
-  String name_ = new String("Nexus Room");
-  Font nameFont = new Font("Helvetica",0,14);
-
-  public ImageCanvas(String s) 
-  {
-    name_ = s;
-  }
-
-  public Dimension preferredSize() {
-    return minimumSize();
-  }
-  public Dimension minimumSize() {
-    return new Dimension(defWidth_, defHeight_);
-  }
-
-  public void setImage(Image newIm) {
-    image_ = newIm;
-    repaint();
-  }
-  public Image getImage() {
-    return image_;
-  }
-
-  public void name(String n) {
-    name_ = n;
-  }
-  public String name() {
-    return name_;
-  }
-
-  public void paint(Graphics g) {
-    Dimension d = size();
-    int width = d.width;
-    int height = d.height;
-
-    if (DEBUG)
-      System.out.println("ImageCanvas:: width = "+width+ " height="+height);
-
-    g.setColor(Color.black);
-    g.fillRect(0,0,width-1,height-1);
-    g.setColor(Color.white);
-    g.fillRect(margin,margin,width-2*margin,height-2*margin);
-    // Create image if reqd
-    if (image_ == null)
-      image_ = createImage(width-2*margin,height-2*margin);
-
-    g.drawImage(image_, margin, margin,
-		width-2*margin, height-2*margin, Color.white, this);
-    g.setColor(Color.blue);
-    g.setFont(nameFont);
-    FontMetrics fm = g.getFontMetrics();
-    g.drawString(name_,(width - fm.stringWidth(name_))/2,
-		 (int)(height*0.9 - fm.getMaxDescent()));
-    validate();
-    return;
-  }
-
-  public void update(Graphics g) {
-    paint(g);
-  }
-
-} // End of the Image Canvas Class
-
-
-
-// this is the event handler for the textfield -- whenever anything is typed 
-class textHandler implements Command,consts,Runnable { 
-  private MT_Bounded_Queue write_q_ ; 
-  private NexusClientApplet applet_ ; 
-  private String name_ ; 
-  Object what_ ; 
-
-  public textHandler(MT_Bounded_Queue write_q,
-		     NexusClientApplet applet,
-		     String name) { 
-    write_q_ = write_q ;
-    applet_   = applet ; 
-    name_ = name ; 
-  }
-
-  public void execute(Object target, Event evt, Object what) { 
-    // get the string and send it across in a different thread 
-    what_ = what ; 
-    // clear the field in the gui 
-    ((TextField)target).setText("");
-    // send it off 
-    new Thread(this).start(); 
-  }
-
-  // send off the string in a different thread 
-  public void run() {
-    String data = (String)what_; 
-    // check if data begins with / and is followed by url 
-    if(!data.startsWith("/url")) { 
-      
-      String user = NexusClientApplet.myName ;
-      String command = user + ":" + data ; 
-      String len = Integer.toString(command.length());
-      dataPacket packet  = new dataPacket(NexusClientApplet.myName,name_,
-					  "TEXT",len,command);
-      write_q_.nq(packet);
-    }
-    else { 
-      // it is /url 
-      StringTokenizer t  = new StringTokenizer(data); 
-      // take out the /url from here 
-      String ur = t.nextToken(); 
-      // data now 
-      String command = t.nextToken(); 
-      String len = Integer.toString(command.length());
-      dataPacket packet  = new dataPacket(NexusClientApplet.myName,name_,
-					  "URL",len,command);
-      write_q_.nq(packet);
-    }
-  }
-} // end of class   
-	
-	
-
diff --git a/java/apps/NexusII/src/RoomSpace.java b/java/apps/NexusII/src/RoomSpace.java
deleted file mode 100644
index 9afb78ddff1..00000000000
--- a/java/apps/NexusII/src/RoomSpace.java
+++ /dev/null
@@ -1,110 +0,0 @@
-import java.awt.*;
-
-class RoomFrame extends Frame // implements Runnable
-{
-
-  // Graphics Objects
-    private Panel  panel = new Panel();
-    private TextField tfInput = new TextField(80);
-    private TextArea taOutput = new TextArea(80,10);
-    Button bLeave = new Button("Leave");
-    ImageCanvas icOutput = new ImageCanvas();
-
-  void InitGraphics()
-  {
-      GridBagLayout gbl = new GridBagLayout();
-      GridBagConstraints gbc = new GridBagConstraints();
-      setFont(new Font("Helvetica", Font.PLAIN, 14));
-      panel.setLayout (gbl);
-
-      gbc.weightx = 1.0;
-      gbc.weighty = 1.0;
-
-      // First the Image so that sizes are fixed
-      gbc.gridx = 1;
-      gbc.gridy = 0;
-      gbc.anchor = GridBagConstraints.CENTER;
-      gbc.fill = GridBagConstraints.NONE;
-      gbl.setConstraints(icOutput, gbc);
-      panel.add(icOutput);
-
-      // The Text Output Area
-      gbc.gridx = 0;
-      gbc.gridy = 0;
-      gbc.anchor = GridBagConstraints.WEST;
-      gbc.fill = GridBagConstraints.HORIZONTAL;
-      gbl.setConstraints(taOutput,gbc);
-      taOutput.setEditable(false);
-      panel.add(taOutput);
-
-      // The Text Input Field
-      gbc.gridx = 0;
-      gbc.gridy = 1;
-      gbc.anchor = GridBagConstraints.WEST;
-      gbc.fill = GridBagConstraints.HORIZONTAL;
-      gbl.setConstraints(tfInput,gbc);
-      panel.add(tfInput);
-
-      // The Leave Button
-      gbc.gridx = 1;
-      gbc.gridy = 1;
-      gbc.anchor = GridBagConstraints.WEST;
-      gbc.fill = GridBagConstraints.HORIZONTAL;
-      gbl.setConstraints(bLeave,gbc);
-      panel.add(bLeave);
-  }
-      
-      
-  public RoomFrame()
-  {
-      this("Anonymous");
-  }
-
-  public RoomFrame(String s)
-  {
-      InitGraphics();
-      super(s);
-      this.pack();
-      this.show();
-  }
-
-  public boolean handleEvent(Event event)
-  {
-      if (event.id == Event.WINDOW_DESTROY)
-	  dispose();
-      return super.handleEvent(event);
-  }
-
-}
-
-class ImageCanvas extends Canvas {
-
-  Image image_;
-  int imgWidth_ = 128;
-  int imgHeight_ = 128;
-
-  public Dimension preferredSize() {
-      return minimumSize();
-  }
-
-  public Dimension minimumSize() {
-      return new Dimension(imgWidth_, imgHeight_);
-  }
-
-  public void image(Image newIm) {
-      image_ = newIm;
-  }
-
-  public Image image() {
-      return image_;
-  }
-
-  public void paint(Graphics g) {
-      g.drawImage(image_,0,0,this);
-  }
-
-  public void update() {
-      paint();
-  }
-  
-} // End of the Image Canvas Class
diff --git a/java/apps/NexusII/src/Timed_Wait.java b/java/apps/NexusII/src/Timed_Wait.java
deleted file mode 100644
index 792db39ceb9..00000000000
--- a/java/apps/NexusII/src/Timed_Wait.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// package NexusII.util ; 
-
- 
-// Subclass the Exception class to get TimeoutException 
-  
-class TimeoutException extends Exception
-{
-  public TimeoutException()
-  {
-    super();
-  }
-  
-  public TimeoutException(String s)
-  {
-    super(s);
-  }
-
-}
-
-// Timed_wait class. This can used by enq and deq to do timed_waits 
-public abstract class Timed_Wait
-{
-  // By default the object is itself 
-public Timed_Wait ()
-  {	
-    object_  = this;
-  }
-  // If the calling class specifies objects, delegate to it. 
-public Timed_Wait (Object obj)
-  {
-    object_ = obj;
-  }
-
-  // This is the object we delegate to if a 
-  // subclass gives us a particular object, 
-  // otherwise, we ``delegate'' to ourself 
-  // (i.e., to this).
-protected Object object_;
-  
-  // This hook method must be overridden 
-  // by a subclass to provide the condition.
-
-public abstract boolean condition ();
-
-  // This will borrow the monitor lock from the calling class 
-
-public final void timed_wait(long msec_timeout) 
-throws InterruptedException, TimeoutException 
-  {
-    // wait if the condition is false 
-    if (!condition())
-      {
-	long start = System.currentTimeMillis() ; 
-	long wait_time = msec_timeout ; 
-	
-	for(;;)
-	  {
-	    // anyway have to wait atleast till waittime 
-	    object_.wait(wait_time);
-	    
-	    // on coming out check for the condition again 
-	    if(!condition())
-	      {
-		long now = System.currentTimeMillis() ; 
-		long time_so_far = now - start ; 
-
-		// if timed out 
-		if(time_so_far >= msec_timeout)
-		  throw new TimeoutException() ; 
-		else
-		  // retry !! we have some time left 
-		  wait_time = msec_timeout - time_so_far ; 
-	      }
-	    else // the condition is true here 
-	      break ; 
-	  }
-      }
-  }
-  
-  // Notify all threads waiting on the object_.
-public final void broadcast () 
-  {
-    object_.notifyAll ();
-  }
-}
-
diff --git a/java/apps/NexusII/src/Timer.java b/java/apps/NexusII/src/Timer.java
deleted file mode 100644
index df781274913..00000000000
--- a/java/apps/NexusII/src/Timer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// This class encapsulates a Timer  mechanism 
-// Can be used for Profiling of parts of code and gathering statistics 
-
-package NexusII ; 
-
-public class Timer { 
-
-public Timer()
-{
-  start_ = 0 ; 		
-}
-
-public void start()
-
-{
-  start_ = System.currentTimeMillis(); 
-}
-
-public  long elapsed_time()
-{
-  return System.currentTimeMillis() - start_ ; 
-}
-
-public void stop()
-{
-  start_ = 0 ; 
-}
-
-private long start_ = 0 ; 
-
-}
diff --git a/java/apps/NexusII/src/commandHandler.java b/java/apps/NexusII/src/commandHandler.java
deleted file mode 100644
index 4cf80d04235..00000000000
--- a/java/apps/NexusII/src/commandHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// To handle the events generated by command-line. The user will be saying
-// /nick <nick-name> 
-
-import java.awt.* ; 
-import java.util.* ; 
-
-//import NexusII.client.* ; 
-
-import awtCommand.* ; 
-
-
-public class commandHandler implements Command,consts { 
-  NexusClientApplet applet_ ; 
-  // will handle the /nick command for now -- urgent 
-  public commandHandler(NexusClientApplet applet ) { 
-    applet_ = applet ; 
-  } 
-
-  public void execute(Object target,Event evt,Object what) { 
-    // Right now assume that it is just a nick command 
-    if(DEBUG) { 
-      System.out.println("Nick typed in ---- ");
-    }
-    StringTokenizer t = new StringTokenizer((String)what) ; 
-    // string for holding /nick and <nickname>
-    String command = null  ; 
-    if(t.hasMoreTokens()) { 
-      command = t.nextToken();
-    } 
-
-    if(command.equalsIgnoreCase("/nick")) { 
-      if(t.hasMoreTokens()) { 
-	// have to send a nick packet to server 
-	applet_.myName  = new String(t.nextToken()); 
-	applet_.sendNickToServer(applet_.myName);
-
-      } 
-    }
-    // clear the field in the gui 
-    ((TextField)target).setText(""); 
-
-  }
-}
-// of class 
diff --git a/java/apps/NexusII/src/commandParser.java b/java/apps/NexusII/src/commandParser.java
deleted file mode 100644
index 64e6da66122..00000000000
--- a/java/apps/NexusII/src/commandParser.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:06  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:05:08  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// why not use java utilities !! 
-
-import java.util.* ; 
-import java.lang.* ; 
-import java.awt.* ; 
-
-
-
-//import NexusII.client.* ; 
-//import NexusII.util.* ; 
-//import NexusII.networking.* ; 
-
-
-
-import awtCommand.* ; 
-
-// This class takes a command parses it and packetizes it and puts it in the
-// global send queue. It works in its own thread of control and after nqing
-// its run() method falls off. It does its work and dies 
-// Will act as an eventHandler for TextField most probably 
-
-public class commandParser implements Command,consts,Runnable { 
-
-  String command ; 
-  MT_Bounded_Queue q_ ; 
-  NexusClientApplet applet_ ; 
-  // constructor
-
-  public commandParser(MT_Bounded_Queue write_q,NexusClientApplet applet) {
-    // create a reference to the write_q 
-    q_ = write_q ; 
-    // note the applet name 
-    applet_ = applet ; 
-    
-  }
-  
-
-  public void execute(Object target, Event evt, Object what) { 
-    // Get the text which was entered there -- 
-      command = new String((String) what) ; 
-      // run in a separate thread 
-      Thread main = new Thread(this); 
-      main.start(); 
-  }
-
-  // The parser etc. run here 
-  public synchronized void run() { 
-    String actual_command = new String(); 
-    String data = new String(); 
-    String data_len = new String(); 
-    if(DEBUG) { 
-      System.out.println("commandParser thread running --- \n");
-    }
-     
-    // Do the parsing first 
-    if(command.equalsIgnoreCase(LUSERS_STR)) { 
-      actual_command = new String("LUSERS") ; 
-      data = applet_.GetRoomName() ; 
-      data_len = new String(String.valueOf(data.length()));  
-      if(data.length() == 0)
-	return ; 
-    }
-
-    else if(command.equalsIgnoreCase(LROOMS_STR)) { 
-	actual_command = new String("LROOMS") ; 
-	data = new String("") ; 
-	data_len = new String("0") ; 
-    }
-	
-    String room = new String("ROOT"); 
-
-    if(DEBUG) { 
-      System.out.println("The room  is " + room + "\n");
-    }
-
-    /* 
-       StringBuffer databuffer = new StringBuffer();
-       
-       // Get the data 
-       while(t.hasMoreTokens()) { 
-       databuffer.append(t.nextToken());
-       }
-       String data = new String(databuffer); 
-       if(DEBUG) { 
-       System.out.println("The data  is " + data + "\n");
-       }
-
-    // data length 
-    String data_len =  String.valueOf(data.length());
-    // Now make a packet 
-    */ 
-
-    dataPacket pack = new dataPacket(NexusClientApplet.myName,room,actual_command,data_len,data);
-    // enqueue it now 
-    q_.nq(pack); 
-
-  } // my job is over 
-  
-}
-// of class 
-
diff --git a/java/apps/NexusII/src/connectionHandler.java b/java/apps/NexusII/src/connectionHandler.java
deleted file mode 100644
index 5e9d3823a68..00000000000
--- a/java/apps/NexusII/src/connectionHandler.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:07  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:05:30  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// This class will handle the event generated when user presses "connect/dis
-// connect" button. It will maintain all the state associated with a 
-// connection ; 
-// In particular, it will create reader,writer and demux threads and stop
-// them when user pressed disconnect. It also sends the init and quit
-// packet to the server 
-// -- Rajeev Bector 11/26/96 
-
-// package NexusII.networking ; 
-
-import awtCommand.* ; 
-
-import java.net.* ;
-import java.awt.* ; 
-import java.io.* ; 
-import java.util.* ; 
-import ACE.OS.*;
-import ACE.SOCK_SAP.*;
-
-public class connectionHandler implements Command,consts,Runnable { 
-
-  // The socket for reading and writing 
-  // private Socket nexusSocket;
-  private SOCKConnector nexusConnector_ = new SOCKConnector();
-  private SOCKStream nexusStream_  = new SOCKStream();
-
-  // Threads which will do reading and writing from Socket 
-  private Thread readerThread ; 
-  private Thread writerThread ; 
-
-  // Threads which demuxes the data from Write Queue 
-  private Thread demuxThread; 
-
-  // The socket
-  // private Socket nexusSocket_ ; 
-
-  // Data Streams which flow the data out 
-  private DataInputStream is_ ; 
-  private DataOutputStream os_ ; 
-
-  // links to the outside world 
-  private MT_Bounded_Queue read_q_ ; 
-  private MT_Bounded_Queue write_q_ ; 
-  
-  Integer port_ ; 
-  String  host_ ; 
-
-  NexusClientApplet applet_ ; 
-  // Constructor 
-  public connectionHandler(String host,Integer port,NexusClientApplet applet) { 
-    host_ = host ; 
-    port_ = port ; 
-    applet_ = applet ; 
-  } // of constructor 
-
-  // This will be called when the "connect/disconnet" button is pressed 
-
-  public void execute(Object target, Event evt, Object what) { 
-    // run in a separate thread 
-    new Thread(this).start(); 
-  }
-
-  public synchronized void run() { 
-    
-    // If not connected -- then connect 
-    if(!applet_.connected) { 
-
-      // Initialize the queues now 
-      read_q_ = new MT_Bounded_Queue(QUEUE_SIZE);
-      write_q_ = new MT_Bounded_Queue(QUEUE_SIZE);
-
-      // Try to connect to the server now 
-	// nexusSocket_ = new Socket(host_,port_.intValue());
-      try {
-        nexusConnector_.connect(nexusStream_, host_, port_.intValue());
-      }
-      catch(SocketException s) { }
-      catch(IOException i) { }
-      // Attach Streams to read and write end os socket 
-	os_ = new DataOutputStream(nexusStream_.outputStream());
-	is_  = new DataInputStream(nexusStream_.inputStream());
-      
-      // do something now 
-      
-      // create and start the socket reader  first 
-      readerThread = new socketReaderThread(read_q_,is_); 
-      readerThread.start(); 
-      
-      // now create the writer also -- subclass of consumer 
-      writerThread = new socketWriterThread(write_q_,os_);
-      writerThread.start(); 
-      // Have to send the init packet to the server 
-      sayHelloToServer(); 
-
-      
-      // Do all the graphics needed and also init the join handlers etc.
-      applet_.OnConnect();
-	
-      // make sure that when demux is created -- joinHandler is there ... !!
-
-      // Create the demux here -- he'll spawn off the rooms 
-      demuxThread = new nexusDemuxThread(read_q_,applet_.Mapper()); 
-      demuxThread.start(); 
-    
-    } // of if !connected
-
-    // if  connected already then I have to disconnect --- have to 
-    // write code for this 
-    else { 
-      
-      // first leave all the rooms 
-      for(Enumeration e = applet_.Mapper().keys(); e.hasMoreElements();) { 
-	String name = (String) e.nextElement() ; 
-	applet_.SetRoomName(name); 
-	applet_.nexusJoiner.execute(null,null,LEAVE_STR); 
-      } 
-      // send a quit packet to the server 
-      sayByeToServer();
-      
-      // Have to send a leave for all the rooms and leave all the rooms 
-      
-      // stop the running threads
-      readerThread.stop(); 
-      demuxThread.stop(); 
-
-      // Again meddle with graphics
-      applet_.OnDisconnect();
-      return ; 
-    }
-  } // of run 
-
-  // This method returns the underlying socket descriptor 
-  public Socket handle() {
-    return nexusStream_.socket(); 
-  }
-  
-  public DataInputStream getinStream() {
-    return is_ ; 
-  }
-  
-  public DataOutputStream getoutStream() {
-    return os_ ;
-  }
-  
-  public MT_Bounded_Queue reader_q() { 
-    return read_q_ ; 
-  }
-
-
-  public MT_Bounded_Queue writer_q() { 
-    if(write_q_ == null)
-      System.out.println("Sending a null write_q");
-    return write_q_ ; 
-  }
-
-  // This method will compose a hello packet and send it off -- cannot run 
-  // this in a separate thread. Has to send this first surely to our TCP 
-  // Connection 
-
-  public void sayHelloToServer() {
-    // hello doesnt have any body 
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String roomID   = new String("ROOT");
-    String contentType = new String("INIT");
-    String contentLength  = new String("0");
-    
-    // Make a proper packet out of it 
-    dataPacket initPacket = new dataPacket(clientID,roomID,contentType,contentLength); 
-    
-    // enqueue that packet for socketWriter to read 
-    write_q_.nq(initPacket);
-    
-  }
-  
-  // This method send a Quit command to the server -- to say that it is 
-  // pushing off 
-  public void sayByeToServer() { 
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String roomID   = new String("null");
-    String contentType = new String("QUIT");
-    String contentLength  = new String("0");
-    
-    // Make a proper packet out of it 
-    dataPacket quitPacket = new dataPacket(clientID,roomID,contentType,contentLength); 
-    
-    // enqueue that packet for socketWriter to read 
-    write_q_.nq(quitPacket);
-  } // of sayByeToServer 
-  
-} // of class 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/src/consts.java b/java/apps/NexusII/src/consts.java
deleted file mode 100644
index 304ec41a41e..00000000000
--- a/java/apps/NexusII/src/consts.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// package NexusII.client ; 
-
-// An interface for all the public constants shared by clientApplet
-// All classes that need to access constants will implement this 
-
-public interface consts { 
-  // Length of each field in the header 
-  public static final int FIELD_LENGTH = 32 ; 
-
-  // Total length of header 
-  public static final int PACKET_HEADER_LENGTH = 128; 
-  
-  // Offset where we can find the data length 
-  public static final int DATA_LEN_OFFSET = 96; 
-	
-  // Size of Queues where reader and writer work 
-  public static final int QUEUE_SIZE = 20 ; 
-
-  // Separator used by tokens in the packet 
-  public static final String SEPARATOR = " " ; 
-
-  // End of message 
-  public static final String END_OF_DATA = "\n" ; 
-
-  // Useful for debugging -- set to false for release version (demo) -- Aravind
-  public static final boolean DEBUG = false; 
-	
-  // Size of hash tables 
-  public static final int HASH_SIZE = 16 ; 
-
-  public static final String JOIN_STR = "Join" ;
-  public static final String LEAVE_STR = "Leave" ;
-  public static final String LUSERS_STR = "List Users" ;
-  public static final String LROOMS_STR = "List Rooms" ;
-  
-  public static final int SERVER_PORT   = 42429 ; 
-  public static final String NEXUS_LOGO = "Nexus_Logo.gif";
-} 
-
-  
diff --git a/java/apps/NexusII/src/dataPacket.java b/java/apps/NexusII/src/dataPacket.java
deleted file mode 100644
index 1bd2dfeb6ab..00000000000
--- a/java/apps/NexusII/src/dataPacket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:08  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.2  1996/12/07  06:27:38  rajeev
-# yaah paranoid backup ...
-#
-# Revision 1.1  1996/12/06  18:23:45  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:07:53  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// This class encapsulates a dataPacket 
-// Will encapsulate the byteStream as a characterStream into a single thing
-// no packets for now 
-// package NexusII.networking ; 
-
-//import NexusII.client.* ; 
-
-public class dataPacket implements consts, Cloneable{
-
-  private String clientName ; 
-  private String roomName ; 
-  private String contentType ; 
-  private String contentLength ; 
-  private String content ; 
-
-  // constructor -- will create the data packet 
-  public dataPacket(byte[] header, byte[] body) { 
-    int len = FIELD_LENGTH ; 
-    clientName = new String(header,0,0,len);
-    roomName   = new String(header,0,1*len,len);
-    contentType = new String(header,0,2*len,len);
-    contentLength = new String(header,0,3*len,len);
-    content = new String(body,0);
-    if(DEBUG) 
-      System.out.println("datapacket: Constructed packet with header " + header + " and body " + body);
-  }
-
-  // another constructor for length 0 packets 
-  public dataPacket(String client, String room, String type,String len)
-  {
-    clientName = new String(client);
-    roomName   = new String(room);
-    contentType = new String(type);
-    contentLength = new String(len); 
-    content       = new String();
-  }
-
-  // another one for some data also 
-  public dataPacket(String client, String room, String type,String len,String data)
-  {
-    this(client,room,type,len);
-    content = new String(data);
-  }
-
-  // return the data in bytized header and body 
-  public  void bytize(byte[] header, byte[] body)
-  {
-    // clear the header and body -- fill them with whitespace 
-    String white_space = new String(" "); 
-    
-    if(DEBUG) { 
-      System.out.println("dataPacket: length is " + new Integer(contentLength.trim()).intValue() + "\n");
-    }
-
-    int len = FIELD_LENGTH ; 
-    // copy the header
-    clientName.getBytes(0,clientName.length(),header,0); 
-    roomName.getBytes(0,roomName.length(),header,len*1);
-    contentType.getBytes(0,contentType.length(),header,len*2);
-    contentLength.getBytes(0,contentLength.length(),header,len*3);
-
-    int body_len = (new Integer(contentLength.trim())).intValue(); 
-    // copy the body also 
-    content.getBytes(0,body_len,body,0);
-  }
-
-  public int contentLength() {
-    return new Integer(contentLength.trim()).intValue();
-  }
-
-  // Returns the destination for the current packet 
-  public String destination(){ 
-    return roomName.trim() ; 
-  }
-
-  public String contentType() { 
-    return contentType.trim() ; 
-  }
-
-
-  public String content() { 
-    return content.trim() ; 
-  }
-
- public String clientName() { 
-    return clientName.trim() ; 
- } 
-
-}
-// of class datapacket     
-
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/src/joinHandler.java b/java/apps/NexusII/src/joinHandler.java
deleted file mode 100644
index 3ff071c26ed..00000000000
--- a/java/apps/NexusII/src/joinHandler.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:09  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:06:22  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-
-// This class will handle the event generated when user presses "join/leave"
-// button. It will maintain all the state associated with all the rooms
-// It'll also create and maintain the rooms 
-// -- Rajeev Bector 11/26/96 
-
-// package NexusII.networking ; 
-
-// This is a SINGLETON 
-
-
-import java.net.* ;
-import java.util.* ; 
-import java.awt.* ; 
-import java.io.* ; 
-
-
-//import NexusII.client.* ; 
-//import NexusII.util.* ; 
-//import NexusII.networking.* ; 
-
-import awtCommand.* ; 
-
-public class joinHandler implements Command,consts { 
-  MT_Bounded_Queue write_q_ ; 
-  Hashtable name_to_q_ ; 
-  Hashtable name_to_handler_ ; 
-  NexusClientApplet applet_ ; 
-
-  // This will be called when the "join/leave" button is pressed 
-  public joinHandler(MT_Bounded_Queue writer_q,NexusClientApplet applet) { 
-    write_q_ = writer_q ; 
-    applet_ = applet ; 
-    // init. the Hashtables 
-    name_to_q_ = new Hashtable(HASH_SIZE);
-    name_to_handler_ = new Hashtable(HASH_SIZE); 
-
-  } 
-
-  public Hashtable Mapper() { 
-    return name_to_q_ ; 
-  }
-  
-  public void execute(Object target, Event evt, Object what) { 
-    
-    String roomName = applet_.GetRoomName() ; 
-    if(roomName.length()==0) { 
-      return ; 
-    } 
-
-    // if it is the join button
-    if(((String)what).equalsIgnoreCase(JOIN_STR)) { 
-      //if already joined -- return 
-      if(name_to_q_.get(roomName) != null)
-	return ; 
-      
-      // room doesnt exist 
-      // Just in case the room name isn't listed
-      applet_.AddRoomName(roomName);
-      // create a new queue for the room to use 
-	
-      MT_Bounded_Queue q_ = new MT_Bounded_Queue(QUEUE_SIZE); 
-      if(DEBUG) { 
-	System.out.println("joinHandler: inserted the queue in hash ");
-      }
-      name_to_q_.put(roomName,q_); 
-      roomHandler handler = new roomHandler(roomName,q_,write_q_,applet_);
-      name_to_handler_.put(roomName,handler); 
-      
-      // send a request to the server 
-      sayJoinToServer(roomName); 
-      //  sendTestPacket(roomName,"URL","http://cumbia.cs.wustl.edu:4242/~sumedh/NexusII/NexusII.gif",q_);
-    } // of join 
-
-    else { 
-      // its a "leave packet" 
-      if(name_to_q_.get(roomName) == null)
-	return ; 
-      // remove the entry from the queue 
-      name_to_q_.remove(roomName); 
-      
-      roomHandler handle = (roomHandler) name_to_handler_.get(roomName); 
-      if(DEBUG)
-	System.out.println("joinHandler:Stopiing the room thread" + roomName);
-      handle.mystop();
-      //    handle = null ; 
-
-      // remove the entry from the queue 
-      name_to_handler_.remove(roomName); 
-      sayLeaveToServer(roomName); 
-    } // of else 
-  } // of  execute 
-  
-  private void sayJoinToServer(String roomName) { 
-    //if (DEBUG)
-    // System.out.println("In the say J to server...");
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String roomID   = new String("ROOT");
-    String contentType = new String("JOIN");
-    String contentLength  = String.valueOf(roomName.length());
-    String  content       = new String(roomName); 
-    // Make a proper packet out of it 
-    dataPacket joinPacket = new dataPacket(clientID,roomID,contentType,contentLength,content); 
-    
-    // enqueue that packet for socketWriter to read 
-    write_q_.nq(joinPacket);
-  } 
-  
-  private void sayLeaveToServer(String roomName) { 
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String roomID   = new String("ROOT");
-    String contentType = new String("LEAVE");
-    String contentLength  = new String(Integer.toString(roomName.length()));
-    String  content       = new String(roomName);     
-
-    // Make a proper packet out of it 
-    dataPacket leavePacket = new dataPacket(clientID,roomID,contentType,contentLength,content); 
-    
-    // enqueue that packet for socketWriter to read 
-    write_q_.nq(leavePacket);
-  } 
-
-
-  public void sendTestPacket(String roomName,String type,String content,MT_Bounded_Queue readq) { 
-    byte[] packetHeader = new byte[PACKET_HEADER_LENGTH] ; 
-    String clientID = new String(NexusClientApplet.myName);
-    String contentLength  = new String(Integer.toString(content.length()));
-
-
-    // Make a proper packet out of it 
-    dataPacket testPacket = new dataPacket(clientID,roomName,type,contentLength,content); 
-    
-    // enqueue that packet for socketWriter to read 
-    readq.nq(testPacket);
-  } 
-  
-  
-}
-
-// of class 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/apps/NexusII/src/makefile b/java/apps/NexusII/src/makefile
deleted file mode 100644
index c3cff521511..00000000000
--- a/java/apps/NexusII/src/makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-all: client server
-
-client: ../classes/NexusClientApplet.class
-
-../classes/NexusClientApplet.class:
-	javac -d ../classes -depend -g NexusClientApplet.java 
-
-server: ../classes/NexusIIserver.class
-
-../classes/NexusIIserver.class: 
-	javac -d ../classes -depend -g NexusIIserver.java
-
-clean:
-	rm -f ../classes/*.class *~
-
diff --git a/java/apps/NexusII/src/nexusDemuxThread.java b/java/apps/NexusII/src/nexusDemuxThread.java
deleted file mode 100644
index 96d0fdd06e1..00000000000
--- a/java/apps/NexusII/src/nexusDemuxThread.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:10  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.2  1996/12/05  05:39:47  sumedh
-# ok
-#
-# Revision 1.1  1996/12/02  06:08:20  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-
-// Will take the packets from the input queue 
-// Parse the packet 
-// Call the room handler thread which Aravind will provide 
-
-// Mapper object is the one which returns the room_q reference if you pass
-// it the room number. Aravind has to implement this object called roomMapper
-// which has an instance called mapper in the Applet context. This will be
-// referred by nexusDemuxThread whenever it has anything to put in the room_q
-
-// package NexusII.networking ; 
-
-//import NexusII.util.*  ; 
-//import NexusII.client.* ;
-
-import java.util.* ; 
- 
-public class nexusDemuxThread extends Thread implements consts { 
-  MT_Bounded_Queue q_ ; 
-  dataPacket packet ; 
-  Hashtable mapper_ ; 
-
-  // constructor 
-  public nexusDemuxThread(MT_Bounded_Queue read_q,Hashtable mapper) { 
-    q_ = read_q ; 
-    mapper_ = mapper ; 
-  }
-
-  public void run() { 
-    // run till infinity 
-    for(;;) { 
-      if(DEBUG) { 
-	System.out.println("Demux running ---- ");
-      }
-      // take out packets from the queue 
-      // parse to find out which room they belong to 
-      packet = ((dataPacket)q_.dq()); 
-      if(DEBUG) { 
-	System.out.println("Demux got something ---- ");
-      } 
-      
-      String roomName = packet.destination().trim(); 
-      if(DEBUG) {
-        System.out.println("demux: destination is : " + roomName);
-      }
-      if(DEBUG) { 
-	System.out.println("Hashtable size is " + new Integer(mapper_.size())); 
-      } 
-      // Get a reference to which queue to put it in 
-      MT_Bounded_Queue room_q = (MT_Bounded_Queue)mapper_.get(roomName);
-      
-      // nq the packet on the room q 
-      if(room_q != null) { 
-	room_q.nq(packet); 
-	System.out.println("deMux: I have enqueued it successfully");
-      }	
-      else
-	{
-	  System.out.println("demux: room_q was null: i couldnt do much");
-	}
-    } 
-  }
-  // of run 
-}
-// of class 
-      
-  
-
-  
-
-// 11/24/96 -- Rajeev Bector 
diff --git a/java/apps/NexusII/src/roomHandler.java b/java/apps/NexusII/src/roomHandler.java
deleted file mode 100644
index bd125631b74..00000000000
--- a/java/apps/NexusII/src/roomHandler.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:11  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.4  1996/12/07  06:22:49  rajeev
-# taking a backup !
-#
-# Revision 1.3  1996/12/06  06:20:07  rajeev
-# Changes to include leave handler
-#
-# Revision 1.2  1996/12/06  04:49:44  rajeev
-# working now hopefully !
-#
-# Revision 1.1  1996/12/06  03:44:32  rajeev
-# Initial revision
-#
-
-*/
-
-// per room 
-import java.awt.* ; 
-import awtCommand.* ; 
-import java.io.* ; 
-import java.net.* ; 
-//import NexusII.client.* ;
-//import NexusII.util.* ; 
-//import NexusII.networking.*;
-
-public class roomHandler implements Runnable,consts{ 
-  
-  String roomName_ ; 
-  MT_Bounded_Queue read_q_ ; 
-  MT_Bounded_Queue write_q_ ; 
-  RoomFrame rf_;
-  Thread  mainThread ; 
-  NexusClientApplet applet_ ; 
-
-  // I dont know what to do currently 
-  public roomHandler(String roomName, MT_Bounded_Queue reader_q,MT_Bounded_Queue writer_q,NexusClientApplet applet) { 
-    roomName_ = roomName ; 
-    read_q_   = reader_q ; 
-    write_q_  = writer_q ; 
-    applet_ = applet ; 
-    rf_ = new RoomFrame(write_q_,applet_,roomName_);
-    // whenever this frame gets the mouse focus, handler will be called 
-    FrameHandler fh_ = new FrameHandler(applet_); 
-    rf_.setGotFocusCommand(fh_); 
-    mainThread = new Thread(this); 
-    mainThread.start(); 
-  }
-
-
-  public void mystop() { 
-    // dispose the graphics part here 
-    if(DEBUG)
-      System.out.println("Roomhandlers stop called \n");
-    rf_.hide(); 
-    rf_.dispose();
-    // no longer need the roomframe
-    rf_ = null ; 
-    mainThread.stop(); 
-  }
-
-  public void run() {
-    if(DEBUG) {
-      System.out.println("Room receiver running ---- ");
-    }
-    while(Thread.currentThread() == mainThread) { 
-      // get the data packet
-      dataPacket packet = (dataPacket)(read_q_.dq()) ; 
-      if(DEBUG)
-	System.out.println("Room - I got something\n");
-      
-      // if the packet is of text type -- display it 
-      if(packet.contentType().trim().equalsIgnoreCase("TEXT")) { 
-	rf_.addText(packet.content()); 
-      } 
-      // if the packet is a url address -- pull the image across 
-      // this url has to be an image  as of now 
-      if(packet.contentType().equalsIgnoreCase("URL")) { 
-	Image im = null ; 
-	try { 
-	  im = applet_.getImage(new URL(packet.content())); 
-	} catch (MalformedURLException i) { 
-	  // nothing as of now 
-	}
-	// display the image
-	rf_.updateImage(im); 
-	
-      }
-      
-      if (DEBUG)
-	System.out.println("roomhandler" + roomName_ + " got data");
-    }
-  }
-  
-  public String toString() { 
-    return roomName_ ; 
-  }
-
-}  // of class roomHandler 
-
-// is executed when the room frame gets mouse focus 
-
-class FrameHandler implements Command { 
-  NexusClientApplet applet_ ;
-  public FrameHandler(NexusClientApplet applet) { 
-    applet_ = applet ; 
-  } 
-
-  public void execute(Object target, Event evt, Object what) { 
-    if(target instanceof Frame) { 
-    applet_.SetRoomName(((RoomFrame)target).getTitle()); 
-    } 
-  } 
-}
-
diff --git a/java/apps/NexusII/src/socketReaderThread.java b/java/apps/NexusII/src/socketReaderThread.java
deleted file mode 100644
index 35679c504b4..00000000000
--- a/java/apps/NexusII/src/socketReaderThread.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:11  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.3  1996/12/03  01:35:37  rajeev
-# fixed a big bug with respect to trim()
-#
-# Revision 1.2  1996/12/03  01:01:27  rajeev
-# // fixed the bug at line 76
-#
-# Revision 1.1  1996/12/02  06:08:56  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// The socketReaderThread is like a Producer who reads from the socket and
-// nqs it onto the queue. Thats it ... Big Deal. huh ! 
-
-// This threads task is
-// 1. Take things from SocketBuffer.
-// 2. Ensure that Full Packets are read 
-// 3. Put the packet onto the queue 
-
-//package NexusII.networking ; 
-
-// get hold of java classes
-//import NexusII.client.* ; 
-//import NexusII.util.* ; 
-
-import java.io.* ; 
-
-
-public class socketReaderThread extends Producer implements Runnable,consts
-{
-  DataInputStream is_ ; 
-  
-  // new constructor 
-  // Pass the queue and socketid to the constructor 
-
-  public socketReaderThread(MT_Bounded_Queue q, DataInputStream is) {
-    // call the super constructor 
-    super(q);
-    is_ = is ; 
-  }
-
-  // This will just override the run method and thats it 
-  // I want to have my own run !
-
-  public void run()  {
-    // run indefinitely  -- i am a daemon anyway 
-    if(DEBUG) {
-      System.out.println("--- This is socketReaderThread --- \n");
-    }
-    
-    for(;;) {
-
-      // read header bytes from stream 
-      int field_len = FIELD_LENGTH ; 
-      byte[] packetHeader = new byte[PACKET_HEADER_LENGTH];
-      try {
-	is_.readFully(packetHeader,0,PACKET_HEADER_LENGTH);
-      } 
-      catch (IOException e) {
-	// do something here 
-	System.out.println("socketReader: I/O exception in read: I am quitting");
-	// what to do here -- right now quit
-	return ; 
-      }
-      if(DEBUG){
-	System.out.println("socketReader read:" + new String(packetHeader,0));
-      }
-      
-      // take out the length field from this 
-      String length = new String(packetHeader,0,DATA_LEN_OFFSET,field_len);
-      
-      // Read this much more from the socket 
-      if(DEBUG) { 
-	System.out.println("The length of packet is " + length);
-      }
-
-      Integer Test = new Integer(length.trim());
-      int len = Test.intValue();
-      if(DEBUG) {
-	System.out.println("srt: attempting to read " + Test + " bytes ");
-      }
-
-      byte[] packetBody = new byte[len] ; 
-      try {
-	if(len != 0) 
-	  is_.readFully(packetBody,0,len);
-      }
-      catch (IOException e) {
-	// do something here 
-	System.out.println("socketReader: I/O exception in read: I am quitting");
-	// what to do here -- right now quit
-	return ; 
-      }
-      
-      // The header and the body are there now -- so make a packet
-      dataPacket packet = new dataPacket(packetHeader,packetBody);
-      if(DEBUG)
-	System.out.println("srt: Now nq'ing item body " + packet.content() );
-      queue_.nq(packet);
-      if(DEBUG)
-	System.out.println("srt: Done nq'ing..");
-      
-      // go back to reading the socket now 
-    }
-    // of for(;;)
-  } 
-  // of method run 
-}
diff --git a/java/apps/NexusII/src/socketWriterThread.java b/java/apps/NexusII/src/socketWriterThread.java
deleted file mode 100644
index 395449b6a53..00000000000
--- a/java/apps/NexusII/src/socketWriterThread.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* 
-   $RCSfile$
-   $Author$
-
-   Last Update: $Date$
-   $Revision$
-
-   REVISION HISTORY:
-   $Log$
-   Revision 1.1  1997/01/31 01:11:12  sumedh
-   Added the Nexus II source code files.
-
-# Revision 1.1  1996/12/07  06:27:38  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:09:22  rajeev
-# Initial revision
-#
-# Revision 1.1  1996/12/02  06:02:24  rajeev
-# Initial revision
-#
-
-*/
-// The socketWriterThread is like a Consumer who reads from the write_q and
-// puts it onto the socket. Thats it ... Big Deal. huh ! 
-
-// This threads task is
-// 1. Write things to SocketBuffer.
-// 2. Ensure that Full Packets are sent 
-// 3. Read the packet off the queue 
-
-//package NexusII.networking ; 
-
-// get hold of java classes
-
-import java.io.* ; 
-
-//import NexusII.client.* ; 
-//import NexusII.util.* ; 
-
-public class socketWriterThread extends Consumer implements Runnable,consts
-{
-  DataOutputStream os_ ; 
-
-  // new constructor 
-  // Pass the queue and outstream to the constructor 
-
-  public socketWriterThread(MT_Bounded_Queue q, DataOutputStream os) {
-    // call the super constructor 
-    super(q);
-    os_ = os ; 
-  }
-
-  // This will just override the run method and thats it 
-  // I want to have my own run !
-
-  public void run()  {
-    // run indefinitely  -- i am a daemon anyway 
-    if(DEBUG) {
-      System.out.println("--- This is socketWriterThread --- \n");
-    }
-    boolean bye_sent = false ; 
-    while(!bye_sent) { 
-
-      // read the packet from the queue 
-      dataPacket packet = (dataPacket) queue_.dq(); 
-      if(DEBUG){
-	System.out.println("socketWriterThread: I got something -- \n");
-      }
-       
-      // read length bytes from packet 
-      int len = packet.contentLength() ; 
-      if(DEBUG) {
-	System.out.println("socketWriterThread: length is " + new Integer(len));
-      }
-
-	
-      int field_len = FIELD_LENGTH ; 
-
-      // Allocate storage for holding the fields 
-
-      byte[] packetHeader = new byte[PACKET_HEADER_LENGTH]; 
-      byte[] packetBody = new byte[len] ;
-      
-      // Fill them 
-      packet.bytize(packetHeader,packetBody); 
-
-      // put it on the wire now -- 
-
-      try {
-	os_.write(packetHeader,0,PACKET_HEADER_LENGTH);
-      } 
-      catch (IOException e) {
-	// do something here 
-      }
-      if(DEBUG){
-	System.out.println("I wrote:" + new String(packetHeader,0));
-      }
-
-       try {
-	os_.write(packetBody,0,len);
-      }
-      catch (IOException e) {
-	// do something here 
-      }
-      if(DEBUG){
-	System.out.println("I wrote:" + new String(packetBody,0));
-      }
-      // this is to handle if the user presses disconnect without leaving the
-      // room 
-      if(packet.contentType().equalsIgnoreCase("QUIT")) 
-	 bye_sent = true ; 
-      // go back to reading the queue now 
-    }
-    // of for(;;)
-  } 
-  // of method run 
-  
-}
diff --git a/java/apps/NexusII/src/url_to_url.java b/java/apps/NexusII/src/url_to_url.java
deleted file mode 100644
index 0fe08ab6db3..00000000000
--- a/java/apps/NexusII/src/url_to_url.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// This method takes in a url and a prefix name and pulls that url across the
-// network, stores it in a local file named prefix
-
-// for now it assumes that the url is an image only ! 
-
-import java.net.* ; 
-import java.io.* ; 
-import java.awt.* ; 
-public class url_to_url { 
-  Image im ; 
-
-  public url_to_url(URL url,String prefix) { 
-    try { 
-      im = (Image)url.getContent();
-    } catch (IOException i) {}
-    String www_path = System.getProperty("www-path");
-    String home_dir = System.getProperty("user.home");
-    String dir = home_dir + www_path ; 
-    System.out.println("web dir is this : " + dir);
-    
-  } 
-  
-  public static void main(String[] argv) { 
-  URL test = null ; 
-    try { 
-    test = new URL("http://www.cs.wustl.edu/~rajeev/images/sand.jpg");
-    } catch ( MalformedURLException e) {} 
-
-    url_to_url t = new url_to_url(test,"root") ; 
-
-  } 
-  
-}
diff --git a/java/apps/NexusII/start b/java/apps/NexusII/start
deleted file mode 100755
index c699c96da60..00000000000
--- a/java/apps/NexusII/start
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-## This is an example script to launch the server.
-
-# the mywebaddress variable should point to a URL which is world-readable
-# the mywebdir variable should point to the actual pathname of the URL
-# which is specified by the mywebaddress variable
-# The server needs to have write access to the mywebdir directory.
-# Thus, the server saves images into the "mywebdir", and clients
-# can access them via the "mywebaddress" URL.
-
-# the 222222 number is the port number on which the server is to be launched
-# the same port number should appear in the html document containing
-# the client applet (see start.html for an example)
-
-# while running the server, the ./classes should be part of the CLASSPATH.
-# while running the client, the client classes as well as the awtCommand
-# toolkit should be world-readable. (The awtcommand toolkit is included
-# in this toolkit, under the classes directory.)
-
-
-umask 022
-java -Dmywebaddress=http://cumbia.cs.wustl.edu/NexusII/tmp/ -Dmywebdir=/project/cumbia/sumedh/web/apache/root/NexusII/tmp/ NexusIIserver 222222
-
-
-
-
diff --git a/java/apps/NexusII/start.html b/java/apps/NexusII/start.html
deleted file mode 100644
index e80bdd13d4b..00000000000
--- a/java/apps/NexusII/start.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- $Id$ -->
-<applet code=NexusClientApplet.class width=550 height=500>
-  	<param name=serverport value="222222">
-</applet> 
diff --git a/java/classes/README.TXT b/java/classes/README.TXT
deleted file mode 100644
index ba771e6615d..00000000000
--- a/java/classes/README.TXT
+++ /dev/null
@@ -1,2 +0,0 @@
-The .class files are not included in the release archive.  When properly
-setup and built, a JACE subdirectory will be here. 
diff --git a/java/doc/images/GridBagEx.gif b/java/doc/images/GridBagEx.gif
deleted file mode 100644
index 16c326d88ca..00000000000
--- a/java/doc/images/GridBagEx.gif
+++ /dev/null
diff --git a/java/doc/images/OpenBookIcon.gif b/java/doc/images/OpenBookIcon.gif
deleted file mode 100644
index 86384f7733f..00000000000
--- a/java/doc/images/OpenBookIcon.gif
+++ /dev/null
diff --git a/java/doc/images/blue-ball-small.gif b/java/doc/images/blue-ball-small.gif
deleted file mode 100644
index d4c5cde5b00..00000000000
--- a/java/doc/images/blue-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/blue-ball.gif b/java/doc/images/blue-ball.gif
deleted file mode 100644
index edc29b786ce..00000000000
--- a/java/doc/images/blue-ball.gif
+++ /dev/null
diff --git a/java/doc/images/class-index.gif b/java/doc/images/class-index.gif
deleted file mode 100644
index 7f276bcb242..00000000000
--- a/java/doc/images/class-index.gif
+++ /dev/null
diff --git a/java/doc/images/constructor-index.gif b/java/doc/images/constructor-index.gif
deleted file mode 100644
index 435cac42386..00000000000
--- a/java/doc/images/constructor-index.gif
+++ /dev/null
diff --git a/java/doc/images/constructors.gif b/java/doc/images/constructors.gif
deleted file mode 100644
index d1a6ae507ca..00000000000
--- a/java/doc/images/constructors.gif
+++ /dev/null
diff --git a/java/doc/images/cyan-ball-small.gif b/java/doc/images/cyan-ball-small.gif
deleted file mode 100644
index 7f74357443a..00000000000
--- a/java/doc/images/cyan-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/cyan-ball.gif b/java/doc/images/cyan-ball.gif
deleted file mode 100644
index 97ca1f2b6e3..00000000000
--- a/java/doc/images/cyan-ball.gif
+++ /dev/null
diff --git a/java/doc/images/error-index.gif b/java/doc/images/error-index.gif
deleted file mode 100644
index 22835ff8c64..00000000000
--- a/java/doc/images/error-index.gif
+++ /dev/null
diff --git a/java/doc/images/exception-index.gif b/java/doc/images/exception-index.gif
deleted file mode 100644
index e3830d9c52e..00000000000
--- a/java/doc/images/exception-index.gif
+++ /dev/null
diff --git a/java/doc/images/green-ball-small.gif b/java/doc/images/green-ball-small.gif
deleted file mode 100644
index 17fea5b32bb..00000000000
--- a/java/doc/images/green-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/green-ball.gif b/java/doc/images/green-ball.gif
deleted file mode 100644
index 71e1b2ec2db..00000000000
--- a/java/doc/images/green-ball.gif
+++ /dev/null
diff --git a/java/doc/images/interface-index.gif b/java/doc/images/interface-index.gif
deleted file mode 100644
index bf93dda9e35..00000000000
--- a/java/doc/images/interface-index.gif
+++ /dev/null
diff --git a/java/doc/images/magenta-ball-small.gif b/java/doc/images/magenta-ball-small.gif
deleted file mode 100644
index bd0584b3c67..00000000000
--- a/java/doc/images/magenta-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/magenta-ball.gif b/java/doc/images/magenta-ball.gif
deleted file mode 100644
index 5da03b84d2b..00000000000
--- a/java/doc/images/magenta-ball.gif
+++ /dev/null
diff --git a/java/doc/images/method-index.gif b/java/doc/images/method-index.gif
deleted file mode 100644
index a05e7051160..00000000000
--- a/java/doc/images/method-index.gif
+++ /dev/null
diff --git a/java/doc/images/methods.gif b/java/doc/images/methods.gif
deleted file mode 100644
index 949e01b8a33..00000000000
--- a/java/doc/images/methods.gif
+++ /dev/null
diff --git a/java/doc/images/package-index.gif b/java/doc/images/package-index.gif
deleted file mode 100644
index f894d4210d7..00000000000
--- a/java/doc/images/package-index.gif
+++ /dev/null
diff --git a/java/doc/images/red-ball-small.gif b/java/doc/images/red-ball-small.gif
deleted file mode 100644
index f6b3c372ca1..00000000000
--- a/java/doc/images/red-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/red-ball.gif b/java/doc/images/red-ball.gif
deleted file mode 100644
index dca92960148..00000000000
--- a/java/doc/images/red-ball.gif
+++ /dev/null
diff --git a/java/doc/images/variable-index.gif b/java/doc/images/variable-index.gif
deleted file mode 100644
index 65cc029e722..00000000000
--- a/java/doc/images/variable-index.gif
+++ /dev/null
diff --git a/java/doc/images/variables.gif b/java/doc/images/variables.gif
deleted file mode 100644
index e8a735399a6..00000000000
--- a/java/doc/images/variables.gif
+++ /dev/null
diff --git a/java/doc/images/yellow-ball-small.gif b/java/doc/images/yellow-ball-small.gif
deleted file mode 100644
index 8e5f57cdfcb..00000000000
--- a/java/doc/images/yellow-ball-small.gif
+++ /dev/null
diff --git a/java/doc/images/yellow-ball.gif b/java/doc/images/yellow-ball.gif
deleted file mode 100644
index 2b8c0bb3d6b..00000000000
--- a/java/doc/images/yellow-ball.gif
+++ /dev/null
diff --git a/java/examples/Logger/README b/java/examples/Logger/README
deleted file mode 100644
index 1da7dbcbb19..00000000000
--- a/java/examples/Logger/README
+++ /dev/null
@@ -1,29 +0,0 @@
-This directory contains a simple client/server Java implementation of the
-distributed logging server described in several papers in the C++
-Report (which can be obtained via the following WWW URLs:
-http://www.cs.wustl.edu/~schmidt/{Reactor1-93.ps.gz,Reactor2-93.ps.gz}).
-
-The example consists of the following two directories:
-
-	. client
-		NOT YET CONVERTED
-		This program talks directly to the server logging
-		daemon.  The server daemon must be started before you
-		can run this test. 
-
-	. simple-server
-
-		This program runs a simple
-		implementation of the
-		distributed logging server daemon.  It also contains
-		code for a simple client as well.
-
-	. Acceptor-server
-		NOT YET CONVERTED
-		This program runs templated, Acceptor-based
-		single-threaded Reactive implementation of the
-		distributed logging server daemon.
-
-The server implemented in "simple" is completely compatible with the
-client defined in the C++ version of ACE.
-
diff --git a/java/examples/Logger/simple-server/LogRecord.java b/java/examples/Logger/simple-server/LogRecord.java
deleted file mode 100644
index e29ed6e32b9..00000000000
--- a/java/examples/Logger/simple-server/LogRecord.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Class used to communicate logging information; compatible with
- * the C++ ACE ACE_Log_Record class.
- *
- * @author Chris Cleeland
- */
-
-//package ACE.SimpleLogger;
-
-import java.util.Date;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
-import java.io.PrintStream;
-import java.io.IOException;
-
-public class LogRecord
-{
-  final public static int MAXLOGMSGLEN = 4 * 1024;
-
-  private int type_;
-  private int length_;
-  private int timeStamp_;
-  private int pid_;
-  private byte[] msgData_ = new byte[MAXLOGMSGLEN];
-  private final static int numIntMembers = 4;
-  private final static int sizeofIntInBytes = 4;
-
-  /**
-   * Create a default instance.
-   */
-  public LogRecord()
-  {
-    this(0, (int) ((new Date()).getTime()/1000), 0);
-  }
-
-  /**
-   * Create a LogRecord.  This is the designated initializer.
-   * @param priority a numeric specification of the priority (ascending)
-   * @param time_stamp time attached to the log entry in Unix <pre>time_t</pre> format
-   * @param pid the process ID; not currently used
-   */
-  public LogRecord(int priority,
-		   int timeStamp,
-		   int pid)
-  {
-    type(priority);
-    timeStamp(timeStamp);
-    length(0);
-    pid(pid);
-  }
-
-  /**
-   * Conversion to string.  Only includes the <pre>msgData_</pre> member.
-   */
-  public String toString()
-  {
-    return new String(msgData_, 0);
-  }
-
-  /**
-   * Place a textual representation of the record on a PrintStream.
-   * @param hostname name of the host generating this record
-   * @param verbose if <b>true</b>, print information in the form, (give example)
-   * @param ps A PrintStream instance to which the output should go.
-   * @see PrintStream,String
-   */
-  public void print(String hostname,
-		    boolean verbose,
-		    PrintStream ps)
-  {
-    String toprint;
-    if (verbose)
-      {
-	long cur = (long)timeStamp() * (long)1000;
-	Date now = new Date(cur);
-
-	/* 01234567890123456789012345 */
-	/* Wed Oct 18 14:25:36 1989n0 */
-	toprint = now.toString().substring(4) + "@"
-                + hostname + "@" + pid_ + "@" + type_ + "@"
-                + this.toString();
-      }
-    else
-      {
-	toprint = this.toString();
-      }
-    ps.println(toprint);
-  }
-
-  /**
-   * Streaming methods
-   */
-  public void streamInFrom(DataInputStream dis) throws IOException
-  {
-    // Order here must match layout order in the C++ class.
-    // This, of course, is VERY fragile, and ought not be used as
-    // a model for anything except how NOT to do anything.
-    type(dis.readInt());
-    length(dis.readInt());
-    timeStamp(dis.readInt());
-    pid(dis.readInt());
-
-    // Does readFully() allocate space for the buffer?  Either
-    // way, we won't have memory leaks :-)
-    int dataLength = (int) (length_ - numIntMembers * sizeofIntInBytes);
-    msgData_ = new byte[dataLength];
-    dis.readFully(msgData_, 0, dataLength);
-  }
-
-  public void streamOutTo(DataOutputStream dos) throws IOException
-  {
-    dos.writeInt(type());
-    dos.writeInt(length());
-    dos.writeInt(timeStamp());
-    dos.writeInt(pid());
-    int dataLength = (int) (length_ - numIntMembers * sizeofIntInBytes);
-    dos.write(msgData_, 0, dataLength);
-  }
-
-  /**
-   * Accessor methods
-   */
-  public int type()            { return type_; }
-  public void type(int t)      { type_ = t; }
-
-  public int length()          { return length_;  }
-  public void length(int l)    { length_ = l; }
-  private void setLen(int msgLen)
-  { length(msgLen + numIntMembers * sizeofIntInBytes); }
-
-  public int timeStamp()      { return timeStamp_; }
-  public void timeStamp(int t){ timeStamp_ = t; }
-
-  public int pid()             { return pid_; }
-  public void pid(int p)       { pid_ = p; }
-
-  public byte[] msgData()      { return msgData_; }
-  public void msgData(byte[] m){ msgData_ = m; setLen(m.length); }
-  public void msgData(String m)
-  {
-    m.getBytes(0, m.length(), msgData_, 0);
-    setLen(m.length());
-  }
-};
-
diff --git a/java/examples/Logger/simple-server/LoggerConstants.java b/java/examples/Logger/simple-server/LoggerConstants.java
deleted file mode 100644
index db62d2fff6e..00000000000
--- a/java/examples/Logger/simple-server/LoggerConstants.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// package ACE.Logger;
-
-public class LoggerConstants
-{
-  final public static int DEFAULT_SERVER_PORT = 4000;
-  final public static String DEFAULT_SERVER_HOSTNAME = "localhost";
-}
diff --git a/java/examples/Logger/simple-server/LoggingAcceptor.java b/java/examples/Logger/simple-server/LoggingAcceptor.java
deleted file mode 100644
index 7925e3d5a15..00000000000
--- a/java/examples/Logger/simple-server/LoggingAcceptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-//package ACE.SimpleLogger;
-
-import JACE.SOCK_SAP.*;
-import java.io.IOException;
-
-public class LoggingAcceptor extends Thread
-{
-  private SOCKAcceptor peerAcceptor_;
-
-  public LoggingAcceptor(int port) throws IOException
-  {
-    peerAcceptor_ = new SOCKAcceptor(port);
-    this.setName("LoggingAcceptor");
-    System.err.println("Waiting for connection on port " +
-		       port);
-  }
-
-  public void run()
-  {
-    try
-      {
-	while (true)
-	  {
-	    LoggingHandler handler = new LoggingHandler();
-	    peerAcceptor_.accept(handler.stream());
-	    handler.open();
-	  }
-      }
-    catch (IOException e)
-      {
-      }
-  }
-};
diff --git a/java/examples/Logger/simple-server/LoggingClient.java b/java/examples/Logger/simple-server/LoggingClient.java
deleted file mode 100644
index e6ea986c011..00000000000
--- a/java/examples/Logger/simple-server/LoggingClient.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Main class that acts as an example logging client.
- */
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import LogRecord;
-import LoggerConstants;
-
-public class LoggingClient implements Runnable
-{
-  private String loggerHost_;
-  private int port_;
-  private int maxIter_;
-  private static final int DEFAULT_ITERATIONS = 10;
-  
-  public static void main(String[] args)
-  {
-    // Really need to put code in here to parse options
-    int iter;
-    int port;
-    String host;
-
-	iter = (args.length > 0) ? Integer.parseInt(args[0])
-          : DEFAULT_ITERATIONS;
-	port = (args.length > 1) ? Integer.parseInt(args[1])
-	  : LoggerConstants.DEFAULT_SERVER_PORT;
-	host = (args.length > 2) ? args[2]
-	  : LoggerConstants.DEFAULT_SERVER_HOSTNAME;
-
-    LoggingClient lc = new LoggingClient(iter, port, host);
-    lc.run();
-  }
-
-  public LoggingClient()
-  {
-
-    this(DEFAULT_ITERATIONS,
-	 LoggerConstants.DEFAULT_SERVER_PORT,
-	 LoggerConstants.DEFAULT_SERVER_HOSTNAME);
-  }
-
-  public LoggingClient(int iterations, int thePort, String theHost)
-  {
-    maxIter_ = iterations;
-    port_ = thePort;
-    loggerHost_ = theHost;
-  }
-
-  public void run()
-  {
-    SOCKStream logger = new SOCKStream();
-    SOCKConnector connector = new SOCKConnector();
-    // INETAddr addr = new INETAddr(port_, loggerHost_);
-
-    LogRecord rec = new LogRecord(9, 2, 0);
-
-    try
-      {
-        connector.connect(logger, loggerHost_, port_);
-
-	int oneSecond = 1000;
-	// Currently SOCKStream uses DataInputStream for its input stream,
-	// and PrintStream for its output stream.  It probably ought to use
-	// DataOutputStream for the output stream for symmetry, or at least
-	// provide a mechanism for changing the type of the filter stream
-	// used (which might be better in the long run...give it the class
-	// id).
-	BufferedOutputStream bos = new BufferedOutputStream((OutputStream) logger.outputStream(), LogRecord.MAXLOGMSGLEN);
-	DataOutputStream dos = new DataOutputStream(bos);
-
-	for (int i = 0; i < maxIter_; i++)
-	  {
-	    // Need to overload LogRecord.msgData to take a String
-	    // argument so that it's easy to create instances with text
-	    // inside.
-	    rec.msgData("message = " + i);
-	    try
-	      {
-		dos.writeInt(rec.length());
-		rec.streamOutTo(dos);
-		bos.flush();
-		rec.print("localhost", true, System.err);
-	      }
-	    catch (IOException ex) { }
-
-	    try
-	      {
-		Thread.sleep(oneSecond);
-	      }
-	    catch (InterruptedException ex) { }
-	  }
-
-	try { logger.close(); } catch (IOException ex) { }
-
-      }
-    catch (SocketException ex)
-      {
-        System.err.println("socket exception: " + ex);
-      }
-    catch (IOException ex)
-      {
-        System.err.println("io exception: " + ex);
-      }
-
-  }
-}
diff --git a/java/examples/Logger/simple-server/LoggingHandler.java b/java/examples/Logger/simple-server/LoggingHandler.java
deleted file mode 100644
index aeffc991ac3..00000000000
--- a/java/examples/Logger/simple-server/LoggingHandler.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*************************************************
- *
- *@author Chris Cleeland
- *
- * What we really need to define is a run() (or whatever
- * the Thread class has as its method to execute code), and
- * have that do the usual delegated work of handle_input.
- * We also need to figure out the best place to close the
- * the socket, which probably ISN'T the finalizer.
- *
- *************************************************/
-
-//package ACE.SimpleLogger;
-
-import JACE.SOCK_SAP.*;
-import java.util.*;
-import java.io.*;
-
-// Should this extend or simply be handed to a Thread instance to
-// be run?
-public class LoggingHandler extends Thread
-{
-  private SOCKStream cliStream_;
-
-  /**
-   * Create a default Logging Handler
-   */
-  public  LoggingHandler()
-  {
-    this(new SOCKStream());
-  }
-
-  /**
-   * Create a LoggingHandler with an existing stream
-   */
-  public LoggingHandler(SOCKStream aStream)
-  {
-    cliStream_ = aStream;
-    setName();
-  }
-
-  private void setName()
-  {
-    int portnum = ((cliStream_.socket() == null)
-		   ? 0
-		   : cliStream_.socket().getLocalPort());
-    this.setName("LoggingHandler#" + portnum);
-  }
-
-  /**
-   * Start
-   */ 
-  public void open()
-  {
-    this.start();
-  }
-
-  /**
-   */
-  public SOCKStream stream()
-  {
-    return cliStream_;
-  }
-
-  /**
-   * Handle logging events
-   */
-  public void run()
-  {
-    DataInputStream dis = (DataInputStream) cliStream_.inputStream();
-
-    for (;;)
-      {
-	// Messages arrive in the following format:
-	// o 4 byte length (network format)
-	// o message, in ACE.LogRecord format
-	//
-	// Hey!  We need exception catching in here too!
-	try
-	  {
-	    // Reconstitute a log message from the wire
-	    LogRecord rec = new LogRecord();
-
-	    // We don't really need this, because
-	    // the object already knows how to
-	    // extract itself properly.  However,
-	    // in order to interoperate with the
-	    // C++ version, this must be extracted.
-	    // Plus, it makes a convenient way to
-	    // check everything.
-	    int length = dis.readInt();
-	
-	    rec.streamInFrom(dis);
-	
-	    if (rec.length() == length)
-	      {
-		rec.print(cliStream_.socket().getInetAddress().getHostName(),
-			  true, System.out);
-		System.out.flush();
-	      }
-	    else
-	      {
-		System.err.println("Logging_Handler: Length error receiving logging message\n");
-	      }
-	  }
-	catch (EOFException eof)
-	  {
-	    System.err.println(Thread.currentThread().getName()
-			       + ": end-of-file condition found; terminating.");
-	    try { cliStream_.close(); } catch (IOException n) { }
-	    this.stop();
-	  }
-	catch (IOException ioe)
-	  {
-	    System.err.println(Thread.currentThread().getName()
-			       + ": IOException received -- "
-			       + ioe.getMessage());
-	  }
-      }
-  }
-};
diff --git a/java/examples/Logger/simple-server/README b/java/examples/Logger/simple-server/README
deleted file mode 100644
index 90393c1aae8..00000000000
--- a/java/examples/Logger/simple-server/README
+++ /dev/null
@@ -1,25 +0,0 @@
-======
-BASICS
-======
-
-This directory contains both the client (LoggingClient.java) and the
-server (SimpleLogger.java).  To compile, use GNU make with no specific
-target.
-
-To execute, use "java <classname>" where <classname> is from the
-following table:
-
-	Application		<classname>
-	===========================================
-	client			LoggingClient
-	server			SimpleLogger
-
-
-==============
-KNOWN PROBLEMS
-==============
-
-Interoperability between the C++ client and the Java server
-implementation is fine.  Interoperability between the C++ server and
-the Java client seems to work right now.  See the CVS information on
-LoggingClient.java for details.
diff --git a/java/examples/Logger/simple-server/SimpleLogger.java b/java/examples/Logger/simple-server/SimpleLogger.java
deleted file mode 100644
index f562689e283..00000000000
--- a/java/examples/Logger/simple-server/SimpleLogger.java
+++ /dev/null
@@ -1,44 +0,0 @@
-//package ACE.SimpleLogger;
-
-import java.io.IOException;
-
-class SimpleLogger implements Runnable
-{
-  private LoggingAcceptor la;
-  private int port;
-
-  public static void main(String[] args)
-  {
-    SimpleLogger sl = new SimpleLogger();
-    sl.run();
-  }
-
-  public SimpleLogger()
-  {
-    this(LoggerConstants.DEFAULT_SERVER_PORT);
-  }
-
-  public SimpleLogger(int port)
-  {
-    try
-      {
-	la = new LoggingAcceptor(port);
-      }
-    catch (IOException ioe)
-      {
-	System.err.println("SimpleLogger: unable to create LoggingAcceptor ("
-			   + ioe.getMessage() + ")");
-      }
-  }
-
-  public void run()
-  {
-    la.run();
-    try
-      {
-	la.join();
-      }
-    catch (InterruptedException ie)
-      { }
-  }
-};
diff --git a/java/gjt/Assert.java b/java/gjt/Assert.java
deleted file mode 100644
index b704be9ff3c..00000000000
--- a/java/gjt/Assert.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package gjt;
-
-/**
- * A simple assertion mechanism for asserting validity of
- * arguments.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- */
-public class Assert {
-    static public void notFalse(boolean b) 
-                       throws IllegalArgumentException {
-        if(b == false) 
-            throw new IllegalArgumentException(
-                            "boolean expression false");
-    }
-    static public void notNull(Object obj) 
-                       throws IllegalArgumentException {
-        if(obj == null) 
-            throw new IllegalArgumentException("null argument");
-    }
-
-    static public void notFalse(boolean b, String s) 
-                               throws IllegalArgumentException {
-        if(b == false)
-            throw new IllegalArgumentException(s);
-    }
-    static public void notNull(Object obj, String s) 
-                               throws IllegalArgumentException {
-        if(obj == null) 
-            throw new IllegalArgumentException(s);
-    }
-}
diff --git a/java/gjt/Bargauge.java b/java/gjt/Bargauge.java
deleted file mode 100644
index 27be8afad7b..00000000000
--- a/java/gjt/Bargauge.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A bargauge which can be filled (wholly or partially) with a 
- * client-specified color.  Fill color is specified at 
- * construction time; both fill color and fill percent may be 
- * set after construction time.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ThreeDRectangle
- * @see     gjt.test.BargaugeTest
- */
-public class Bargauge extends Canvas {
-    private double          percentFill = 0;
-    private ThreeDRectangle border = new ThreeDRectangle(this);
-    private Color           fillColor;
-
-    public Bargauge(Color fillColor) {
-        setFillColor(fillColor);
-    }
-    public void setFillColor(Color fillColor) {
-        this.fillColor = fillColor;
-    }
-    public void setFillPercent(double percentage) {
-        Assert.notFalse(percentage >= 0 && percentage <= 100);
-        percentFill = percentage;
-    }
-    public void resize(int w, int h) { 
-        reshape(location().x, location().y, w, h);
-    }
-    public void reshape(int x, int y, int w, int h) { 
-        super.reshape(x,y,w,h);
-        border.resize(w,h); 
-    }
-    public Dimension minimumSize() { return preferredSize(); }
-
-    public Dimension preferredSize() {
-        int w = border.getThickness() * 3;
-        return new Dimension(w, w*4);
-    }
-    public void paint(Graphics g) {
-        border.raise();
-        border.paint();
-        fill();
-    }
-    public void fill() {
-        Graphics g = getGraphics();
-
-        if((g != null) && (percentFill > 0)) {
-            Rectangle b       = border.getInnerBounds();
-            int       fillw   = b.width; 
-            int       fillh   = b.height;
-
-            if(b.width > b.height) fillw *= percentFill/100;
-            else                   fillh *= percentFill/100;
-
-            g.setColor(fillColor);
-            border.clearInterior();
-
-            if(b.width > b.height) 
-                g.fillRect(b.x, b.y, fillw, b.height);
-            else                   
-                g.fillRect(b.x, b.y + b.height - fillh, 
-                           b.width, fillh);
-        }
-    }
-    protected String paramString() {
-        Dimension size = size();
-        Orientation orient = size.width > size.height ? 
-                             Orientation.HORIZONTAL :
-                             Orientation.VERTICAL;
-        String    str  = "fill percent=" + percentFill + "," + 
-                         "orientation="  + orient      + "," +
-                         "color"         + fillColor;
-        return str;
-    }
-}
diff --git a/java/gjt/Border.java b/java/gjt/Border.java
deleted file mode 100644
index ba80ef2e76a..00000000000
--- a/java/gjt/Border.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A panel containing a single component, around which a border 
- * is drawn.  Of course, the single component may be a 
- * container which may contain other components, so a Border
- * can surround multiple components.<p>
- * 
- * Thickness of the border, and the gap between the Component 
- * and the border are specified at time of construction.
- * Default border thickness is 2 - default gap is 0.<p>
- *
- * Border color may be set via setLineColor(Color).<p>
- *
- * Border employs a DrawnRectangle to paint the border.  Derived 
- * classes are free to override DrawnRectangle border() if they 
- * wish to use an extension of DrawnRectangle for drawing their 
- * border.<p>
- *
- * The following code snippet, from gjt.test.BorderTest creates
- * and AWT Button, and embeds the button in a border.  That
- * border is then embedded in another border.  The AWT Button
- * winds up inside of a cyan border with a pixel width of 7,
- * inside of a black border (pixel width 2):<p>
- *
- * <pre>
- *      private Border makeBorderedAWTButton() {
- *          Button button;
- *          Border cyanBorder, blackBorder;
- *
- *          button = new Button("Button Inside Two Borders");
- *          cyanBorder = new Border(button, 7);
- *          cyanBorder.setLineColor(Color.cyan);
- *
- *          blackBorder = new Border(cyanBorder);
- *
- *          return blackBorder;
- *      }
- *</pre>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     DrawnRectangle
- * @see     ThreeDBorder
- * @see     EtchedBorder
- * @see     gjt.test.BorderTest
- */
-public class Border extends Panel {
-    protected int            thickness;
-    protected int            gap;
-    protected DrawnRectangle border;
-
-    protected static int _defaultThickness = 2;
-    protected static int _defaultGap       = 0;
-
-    public Border(Component borderMe) { 
-        this(borderMe, _defaultThickness, _defaultGap);
-    }
-    public Border(Component borderMe, int thickness) {
-        this(borderMe, thickness, _defaultGap);
-    }
-    public Border(Component borderMe, int thickness, int gap) {
-        this.thickness = thickness;
-        this.gap       = gap;
-
-        setLayout(new BorderLayout());
-        add("Center", borderMe);
-    }
-    public Insets insets() {
-        return new Insets(thickness+gap, thickness+gap, 
-                          thickness+gap, thickness+gap);
-    }
-    public Rectangle getInnerBounds() { 
-        return border().getInnerBounds(); 
-    }
-    public void setLineColor(Color c) { 
-        border().setLineColor(c);         
-    }
-    public Color getLineColor()        { 
-        return border().getLineColor();   
-    }
-    public void paint(Graphics g) { 
-        border().paint();                 
-    }
-    public void resize(int w, int h) {
-        Point location = location();
-        reshape(location.x, location.y, w, h);
-    }
-    public void reshape(int x, int y, int w, int h) {
-        super.reshape(x, y, w, h);
-        border().resize(w, h);
-    }
-    protected String paramString() {
-        return super.paramString() + ",border=" + 
-               border().toString() + ",thickness=" + thickness 
-               + ",gap=" + gap;
-    }
-    protected DrawnRectangle border() {
-        if(border == null)
-            border = new DrawnRectangle(this, thickness);
-        return border;
-    }
-}
diff --git a/java/gjt/Box.java b/java/gjt/Box.java
deleted file mode 100644
index 8feda366942..00000000000
--- a/java/gjt/Box.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A Panel containing a single component; an etched rectangle is 
- * drawn around the component, and a Label is centered at the top
- * of the rectangle. Of course, the single component may be
- * a container, and therefore a Box may surround many components.
- * <p>
- * 
- * Both the Component around which the box is drawn, and the 
- * String drawn at the top of the box are specified at 
- * construction time.<p>
- *
- * Etching of the box is controlled by etchedIn() and 
- * etchedOut().  Default etching is etched in.<p>
- *
- * <em>Note: AWT 1.0.2 contains a bug which causes the 
- * Label.CENTER argument of the Label created for the title
- * to be ignored, under Win95.  Therefore, under Win95, the
- * title will be off-center.</em><p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     EtchedRectangle
- * @see     gjt.test.BoxTest
- */
-public class Box extends Panel {
-    private EtchedRectangle box = new EtchedRectangle(this);
-    private Label           titleLabel;
-
-    public Box(Component surrounded, String title) {
-        this(surrounded, new Label(title, Label.CENTER));
-    }
-    public Box(Component surrounded, Label label) {
-        Assert.notNull(surrounded);
-        Assert.notNull(label);
-
-        titleLabel = label;
-
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        setLayout(gbl);
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbl.setConstraints(titleLabel, gbc);
-        add(titleLabel);
-
-        gbc.insets  = new Insets(0,10,10,10);
-        gbc.anchor  = GridBagConstraints.CENTER;
-        gbc.weighty = 1.0;
-        gbc.weightx = 1.0;
-        gbc.fill    = GridBagConstraints.BOTH;
-        gbl.setConstraints(surrounded,gbc); 
-        add(surrounded);
-    }
-    public void etchedIn ()           { box.etchedIn (); }
-    public void etchedOut()           { box.etchedOut(); }
-    public void paint    (Graphics g) { box.paint();     }
-
-    public void resize(int w, int h) {
-        reshape(location().x, location().y, w, h);
-    }
-    public void reshape(int x, int y, int w, int h) {
-        super.reshape(x,y,w,h);
-
-        FontMetrics fm   = titleLabel.getFontMetrics(
-                                titleLabel.getFont());
-        int         top  = insets().top + fm.getAscent();
-        Dimension   size = size();
-
-        box.reshape(0, top, size.width-1, size.height-top-1);
-    }
-    protected String paramString() {
-        return super.paramString() + ",etching=" +
-        (box.isEtchedIn() ? Etching.IN : Etching.OUT) +
-        ",title=" + titleLabel;
-    }
-}
diff --git a/java/gjt/BulletinLayout.java b/java/gjt/BulletinLayout.java
deleted file mode 100644
index 848a280de03..00000000000
--- a/java/gjt/BulletinLayout.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Lays out components as though they were pinned to 
- * a bulletin board.<p>
- *
- * Components are simply reshaped to their location and their
- * preferred size.  BulletinLayout is preferrable to setting
- * a container's layout manager to null and explicitly positioning
- * and sizing components.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- */
-public class BulletinLayout implements LayoutManager {
-    public BulletinLayout() {
-    }
-    public void addLayoutComponent(String name, Component comp) {
-    }
-    public void removeLayoutComponent(Component comp) {
-    }
-    public Dimension preferredLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-        Rectangle preferredBounds = new Rectangle(0,0);
-        Rectangle compPreferredBounds;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.preferredSize();
-                compPreferredBounds = 
-                    new Rectangle(comp.location());
-                compPreferredBounds.width  = d.width;
-                compPreferredBounds.height = d.height;
-
-                preferredBounds = 
-                    preferredBounds.union(compPreferredBounds);
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top + insets.bottom;
-
-        return dim;
-    }
-    public Dimension minimumLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-        Rectangle minimumBounds = new Rectangle(0,0);
-        Rectangle compMinimumBounds;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.minimumSize();
-                compMinimumBounds = 
-                    new Rectangle(comp.location());
-                compMinimumBounds.width  = d.width;
-                compMinimumBounds.height = d.height;
-
-                minimumBounds = 
-                    minimumBounds.union(compMinimumBounds);
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top + insets.bottom;
-
-        return dim;
-    }
-    public void layoutContainer(Container target) {
-        Insets    insets      = target.insets();
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension ps;
-        Point loc;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                ps  = comp.preferredSize();    
-                loc = comp.location();
-
-                comp.reshape(insets.left + loc.x, 
-                             insets.top + loc.y,
-                             ps.width, ps.height);
-            }
-        }
-    }
-}
diff --git a/java/gjt/ButtonPanel.java b/java/gjt/ButtonPanel.java
deleted file mode 100644
index 6fc72ecaab2..00000000000
--- a/java/gjt/ButtonPanel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Button panel employs a BorderLayout to lay out a Separator in 
- * the north, and a Panel to which Buttons are added in the 
- * center.<p>
- *
- * Buttons may be added to the panel via two methods:
- * <dl>
- * <dd> void   add(Button)
- * <dd> Button add(String)
- * </dl>
- * <p>
- *
- * Button add(String) creates a Button and adds it to the
- * panel, then returns the Button created, as a convenience to
- * clients so that they do not have to go through the pain
- * and agony of creating an ImageButton.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MessageDialog
- * @see     QuestionDialog
- * @see     YesNoDialog
- * @see     gjt.test.DialogTest
- * @see     gjt.test.ComponentScrollerTest
- */
-public class ButtonPanel extends Panel {
-    Panel     buttonPanel = new Panel();
-    Separator separator   = new Separator();
-
-    public ButtonPanel() {
-        setLayout(new BorderLayout(0,5));
-        add("North",  separator);
-        add("Center", buttonPanel);
-    }
-    public void add(Button button) {
-        buttonPanel.add(button);
-    }
-    public Button add(String buttonLabel) {
-        Button addMe = new Button(buttonLabel);
-        buttonPanel.add(addMe);
-        return addMe;
-    }
-    protected String paramString() {
-        return super.paramString() + "buttons=" +
-        countComponents();
-    }
-}
diff --git a/java/gjt/CardPanel.java b/java/gjt/CardPanel.java
deleted file mode 100644
index c2ab1a9033c..00000000000
--- a/java/gjt/CardPanel.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * CardPanel employs a BorderLayout to lay out North and Center 
- * panels; extensions of CardPanel must implement 
- * Component viewSelector().  The component returned from 
- * Component viewSelector() is centered in the North panel, and 
- * should contain UI controls that allow selection of the 
- * component to be displayed in the Center panel.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     IconCardPanel
- * @see     ChoiceCardPanel
- * @see     gjt.test.ChoiceCardPanelTest
- * @see     gjt.test.IconCardPanelTest
- */
-public abstract class CardPanel extends Panel {
-    private Panel       north, center;
-    private CardLayout  cards;
-
-    abstract public Component viewSelector();
-
-    public CardPanel() {
-        center = new Panel();
-        north  = new Panel();
-        
-        setLayout(new BorderLayout());
-        center.setLayout(cards = new CardLayout());
-        north.setLayout (new BorderLayout());
-
-        add("North",  north);
-        add("Center", center);
-    }
-    public void addNotify() {
-        super.addNotify();
-        north.add("Center", viewSelector());
-        north.add("South",  new Separator());
-    }
-    protected void addView(String name, Component component) {
-        center.add(name, component);
-    }
-    protected void showView(String name) {
-        cards.show(center, name); 
-    }
-}
diff --git a/java/gjt/ChoiceCardPanel.java b/java/gjt/ChoiceCardPanel.java
deleted file mode 100644
index 6273e03a5aa..00000000000
--- a/java/gjt/ChoiceCardPanel.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * ChoiceCardPanel is an extension of CardPanel which presents
- * an awt.Choice for selecting the panel to be displayed
- * in the center panel.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CardPanel
- * @see     IconCardPanel
- * @see     gjt.test.IconCardPanelTest
- * @see     gjt.test.ChoiceCardPanelTest
- */
-public class ChoiceCardPanel extends CardPanel {
-    private ChoiceViewSelector viewSelector;
-
-    public ChoiceCardPanel() {
-        viewSelector = new ChoiceViewSelector(this);
-    }
-    public Component viewSelector() {
-        return viewSelector;
-    }
-    public void addChoice(String    name, 
-                          Component component) {
-        viewSelector.addItem(name);
-        super.addView(name, component);
-    }
-}
-
-class ChoiceViewSelector extends Panel {
-    private ChoiceCardPanel mvp;
-    private Choice          choice;
-
-    public ChoiceViewSelector(ChoiceCardPanel panel) {
-        setLayout(new FlowLayout());
-        add(choice = new Choice());
-        mvp = panel;
-    }
-    public void addItem(String name) {
-        choice.addItem(name);
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id == Event.ACTION_EVENT) {
-            if(event.target instanceof Choice) {
-                mvp.showView(choice.getSelectedItem());
-            }
-        }
-        return super.handleEvent(event);
-    }
-}
diff --git a/java/gjt/ColumnLayout.java b/java/gjt/ColumnLayout.java
deleted file mode 100644
index bc51b44e456..00000000000
--- a/java/gjt/ColumnLayout.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * ColumnLayout lays out components in a column.  At 
- * construction time, both horizontal orientation and vertical 
- * orientation may be specified, along with the gap to use 
- * between components.<p>
- *
- * Horizontal orientation must be one of the following:
- * <dl>
- * <dd> LEFT 
- * <dd> CENTER  
- * <dd> RIGHT
- * </dl>
- *
- * Vertical orientation must be one of the following:
- * <dl>
- * <dd> TOP
- * <dd> CENTER  
- * <dd> BOTTOM
- * </dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Orientation
- * @see     RowLayout
- */
-public class ColumnLayout implements LayoutManager {
-    static private int _defaultGap = 5;
-
-    private int         gap;
-    private Orientation horizontalOrientation;
-    private Orientation verticalOrientation;
-
-    public ColumnLayout() {
-        this(Orientation.CENTER, 
-             Orientation.CENTER, _defaultGap);
-    }
-    public ColumnLayout(int gap) {
-        this(Orientation.CENTER, Orientation.CENTER, gap);
-    }
-    public ColumnLayout(Orientation horizontalOrient, 
-                        Orientation verticalOrient) {
-        this(horizontalOrient, verticalOrient, _defaultGap);
-    }
-    public ColumnLayout(Orientation horizontalOrient, 
-                        Orientation verticalOrient, int gap) {
-        Assert.notFalse(gap >= 0);
-        Assert.notFalse(
-            horizontalOrient == Orientation.LEFT   ||
-            horizontalOrient == Orientation.CENTER ||
-            horizontalOrient == Orientation.RIGHT);
-        Assert.notFalse(
-            verticalOrient   == Orientation.TOP    ||
-            verticalOrient   == Orientation.CENTER ||
-            verticalOrient   == Orientation.BOTTOM);
-
-        this.gap                   = gap;
-        this.verticalOrientation   = verticalOrient;
-        this.horizontalOrientation = horizontalOrient;
-    }
-
-    public void addLayoutComponent(String name, 
-                                   Component comp) {
-    }
-    public void removeLayoutComponent(Component comp) { 
-    }
-
-    public Dimension preferredLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.preferredSize();
-                if(i > 0) 
-                    dim.height += gap;
-
-                dim.height += d.height;
-                dim.width   = Math.max(d.width, dim.width);
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top  + insets.bottom;
-        return dim;
-    }
-    public Dimension minimumLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.minimumSize();
-
-                dim.width  = Math.max(d.width, dim.width);
-                dim.height += d.height;
-
-                if(i > 0) dim.height += gap;
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top  + insets.bottom;
-
-        return dim;
-    }
-    public void layoutContainer(Container target) {
-        Insets    insets        = target.insets();
-        int       top           = insets.top;
-        int       left          = 0;
-        int       ncomponents   = target.countComponents();
-        Dimension preferredSize = target.preferredSize();
-        Dimension targetSize    = target.size();
-        Component comp;
-        Dimension ps;
-
-        if(verticalOrientation == Orientation.CENTER)
-            top += (targetSize.height/2) - 
-                   (preferredSize.height/2);
-        else if(verticalOrientation == Orientation.BOTTOM)
-            top = targetSize.height - preferredSize.height + 
-                  insets.top;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-            left = insets.left;
-
-            if(comp.isVisible()) {
-                ps = comp.preferredSize();
-
-                if(horizontalOrientation == Orientation.CENTER)
-                    left = (targetSize.width/2) - (ps.width/2);
-                else if(
-                  horizontalOrientation == Orientation.RIGHT) {
-                    left = targetSize.width - ps.width - 
-                           insets.right;
-                }
-                comp.reshape(left,top,ps.width,ps.height);
-                top += ps.height + gap;
-            }
-        }
-    }
-}
diff --git a/java/gjt/ComponentScroller.java b/java/gjt/ComponentScroller.java
deleted file mode 100644
index 3aef71c4ea2..00000000000
--- a/java/gjt/ComponentScroller.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Scrolls any component.  Component to be scrolled may be a
- * container, so ultimately many components may be scrolled
- * at once.<p>
- *
- * Component to be scrolled may be specified at construction
- * time, or may be set after construction via 
- * void setComponent(Component).<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     BulletinLayout
- * @see     Scroller
- * @see     ScrollerLayout
- * @see     ImageScroller
- * @see     gjt.test.ComponentScrollerTest
- */
-public class ComponentScroller extends Scroller {
-    private Component scrollMe;
-
-    public ComponentScroller() {
-    }
-    public ComponentScroller(Component component) {
-        setComponent(component);
-    }
-    public void setComponent(Component component) {
-        scrollMe = component;
-        viewport.setLayout(new BulletinLayout());
-        viewport.add      (scrollMe);
-        viewport.move     (0,0);
-    }
-    public void scrollTo(int x, int y) {
-        scrollMe.move(-x,-y);
-    }
-    public Dimension getScrollAreaSize() {
-        return scrollMe.preferredSize();
-    }
-}
diff --git a/java/gjt/DialogClient.java b/java/gjt/DialogClient.java
deleted file mode 100644
index 7e67cea758e..00000000000
--- a/java/gjt/DialogClient.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package gjt;
-
-import java.awt.Dialog;
-
-/**
- * DialogClients are notified when the Dialog with which they 
- * are associated is dismissed.  A reference to the dismissed 
- * Dialog is passed as a parameter of dialogDismissed() in case 
- * a DialogClient is a client of more than one Dialog.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MessageDialog
- * @see     QuestionDialog
- * @see     YesNoDialog
- * @see     gjt.test.DialogTest
- */
-public interface DialogClient {
-    abstract public void dialogDismissed(Dialog d); 
-}
diff --git a/java/gjt/DrawingPanel.java b/java/gjt/DrawingPanel.java
deleted file mode 100644
index cda3fd69431..00000000000
--- a/java/gjt/DrawingPanel.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package gjt;
-
-import java.awt.*;
-import gjt.rubberband.*;
-
-/**
- * An extension of gjt.rubberband.RubberbandPanel which serves
- * as a panel used for drawing simple shapes (lines, rectangles,
- * and ellipses).  The shapes may be filled (except for lines,
- * of course), and the color of the shapes may be specified.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.rubberband.RubberbandPanel
- * @see     gjt.rubberband.RubberbandEllipse
- * @see     gjt.rubberband.RubberbandLine
- * @see     gjt.rubberband.RubberbandRectangle
- * @see     gjt.test.RubberbandTest
- * @see     gjt.test.ToolbarTest
- */
-public class DrawingPanel extends RubberbandPanel {
-    private Rubberband rbLine, rbRect, rbEllipse;
-    private Color   color;
-    private boolean fill;
-
-    public DrawingPanel() {
-        rbLine    = new RubberbandLine     (this);
-        rbRect    = new RubberbandRectangle(this);
-        rbEllipse = new RubberbandEllipse  (this);
-
-        setRubberband(rbLine);
-    }
-    public void drawLines     () { setRubberband(rbLine);    } 
-    public void drawRectangles() { setRubberband(rbRect);    } 
-    public void drawEllipses  () { setRubberband(rbEllipse); } 
-    
-    public void  setColor(Color color) { this.color = color; }
-    public Color getColor()            { return color;       }
-
-    public void    setFill(boolean b) { fill = b;    }
-    public boolean getFill()          { return fill; }
-
-    public boolean mouseUp(Event event, int x, int y) {
-        Rubberband rb = getRubberband();
-        Graphics   g  = getGraphics();
-
-        super.mouseUp(event, x, y);
-        g.setColor(color);
-
-        if(rb == rbLine)         drawLine     (rb, g);
-        else if(rb == rbRect)    drawRectangle(rb, g);
-        else if(rb == rbEllipse) drawEllipse  (rb, g);
-
-        return true;
-    }
-    protected void drawLine(Rubberband rb, Graphics g) {
-        Point anchor = rb.getAnchor(), end = rb.getEnd();
-        g.drawLine(anchor.x, anchor.y, end.x, end.y);
-    }
-    protected void drawRectangle(Rubberband rb, Graphics g) {
-        Rectangle r = rb.bounds();
-
-        if(fill) g.fillRect(r.x, r.y, r.width, r.height);
-        else     g.drawRect(r.x, r.y, r.width, r.height);
-    }
-    protected void drawEllipse(Rubberband rb, Graphics g) {
-        Rectangle r = rb.bounds();
-
-        if(fill) g.fillArc(r.x, r.y, r.width, r.height, 0, 360);
-        else     g.drawArc(r.x, r.y, r.width, r.height, 0, 360);
-    }
-}
diff --git a/java/gjt/DrawnRectangle.java b/java/gjt/DrawnRectangle.java
deleted file mode 100644
index e96fd8d3673..00000000000
--- a/java/gjt/DrawnRectangle.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A Rectangle which draws itself inside of a Component.<p>
- * 
- * DrawnRectangles may have their thickness and line color set, 
- * and are capable of reporting their inner bounds (the area 
- * inside the lines).<p>
- *
- * Default thickness is 2.<p>
- *
- * If not set explicitly, the line color used is three shades 
- * darker than the background color of the Component being 
- * drawn into.<p>
- * 
- * DrawnRectangles may be clear()ed, which clears both the 
- * exterior (the lines) and the interior (the area inside of 
- * the lines) of the DrawnRectangle.<p>
- *
- * DrawnRectangles may also be fill()ed with a specified color 
- * by calling fill(Color), or by calling setFillColor(Color) 
- * followed by fill().<p>
- *
- * By default, the fill Color is the background color of the 
- * Component drawn into.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ThreeDRectangle
- * @see     EtchedRectangle
- * @see     Border
- * @see     EtchedBorder
- * @see     ThreeDBorder
- * @see     gjt.test.DrawnRectangleTest
- */
-public class DrawnRectangle extends Rectangle {
-    protected static int    _defaultThickness = 2;
-
-    protected Component drawInto;
-    private   int       thick;
-    private   Color     lineColor, fillColor;
-
-    public DrawnRectangle(Component drawInto) {
-        this(drawInto, _defaultThickness, 0, 0, 0, 0);
-    }
-    public DrawnRectangle(Component drawInto, int thick) {
-        this(drawInto, thick, 0, 0, 0, 0);
-    }
-    public DrawnRectangle(Component drawInto, int x, int y, 
-                                              int w, int h) {
-        this(drawInto, _defaultThickness, x, y, w, h);
-    }
-    public DrawnRectangle(Component drawInto, int thick,
-                          int x, int y, int w, int h) {
-        Assert.notNull(drawInto);
-        Assert.notFalse(thick > 0);
-
-        this.drawInto = drawInto;
-        this.thick    = thick;
-        reshape(x,y,w,h);
-    }
-    public Component component()          {return drawInto;    }
-    public int  getThickness  ()          {return thick;       }
-    public void setThickness  (int thick) {this.thick = thick; }
-
-    public void setLineColor(Color lineColor) {
-        this.lineColor = lineColor;
-    }
-    public void setFillColor(Color fillColor) {
-        this.fillColor = fillColor;
-    }
-    public void fill() {
-        fill(getFillColor());      
-    }
-    public Color getLineColor() {
-        if(lineColor == null)
-            lineColor = 
-            drawInto.getBackground().darker().darker().darker();
-        return lineColor;
-    }
-    public Color getFillColor() {
-        if(fillColor == null)
-            fillColor = drawInto.getBackground();
-        return fillColor;
-    }
-    public Rectangle getInnerBounds() {
-        return new Rectangle(x+thick, y+thick, 
-                             width-(thick*2), height-(thick*2));
-    }
-    public void paint() {
-        Graphics g = drawInto.getGraphics();
-        paintFlat(g, getLineColor()); 
-    }
-    private void paintFlat(Graphics g, Color color) {
-        if(g != null) {
-            g.setColor(color);
-            for(int i=0; i < thick; ++i)
-                g.drawRect(x+i, y+i, 
-                           width-(i*2)-1, height-(i*2)-1);
-        }
-    }
-    public void clearInterior() {
-        fill(drawInto.getBackground());
-    }
-    public void clearExterior() {
-        paintFlat(drawInto.getGraphics(), 
-                  drawInto.getBackground());
-    }
-    public void clear() { 
-        clearExterior(); 
-        clearInterior(); 
-    }
-    public void fill(Color color) {
-        Graphics g = drawInto.getGraphics();
-
-        if(g != null) {
-            Rectangle r = getInnerBounds();
-            g.setColor(color);
-            g.fillRect(r.x, r.y, r.width, r.height);
-            setFillColor(color);
-        }
-    }
-    public String toString() {
-        return super.toString() + "[" + paramString() + "]";
-    }
-    public String paramString() {
-        return "color=" + getLineColor() + ",thickness=" + 
-                thick + ",fillColor=" + getFillColor();
-    }
-    protected Color brighter() {
-        return 
-    getLineColor().brighter().brighter().brighter().brighter();
-    }
-}
diff --git a/java/gjt/EtchedBorder.java b/java/gjt/EtchedBorder.java
deleted file mode 100644
index 09ff845014b..00000000000
--- a/java/gjt/EtchedBorder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * An extension of Border that draws an etched border.
- * 
- * Drawn etchedIn by default, drawing style used by paint() is 
- * controlled by etchedIn() and etchedOut().  Note that 
- * etchedIn() and etchedOut() do not result in anything being 
- * painted, but only set the state for the next call to paint().
- * To set the state and paint in one operation, use 
- * paintEtchedIn() and paintEtchedOut().<p>
- *
- * The current state of the border may be obtained by calling 
- * isEtchedIn().<p>
- *
- * @version 1.0, Apr 1 1996 
- * @author  David Geary   
- * @see     Border
- * @see     ThreeDRectangle
- * @see     gjt.test.BorderTest
- */ 
-public class EtchedBorder extends Border {
-    public EtchedBorder(Component borderMe) {
-        this(borderMe, _defaultThickness, _defaultGap); 
-    }
-    public EtchedBorder(Component borderMe, 
-                        int borderThickness) {
-        this(borderMe, borderThickness, _defaultGap);
-    }
-    public EtchedBorder(Component borderMe, 
-                        int borderThickness, int gap) {
-        super(borderMe, borderThickness, gap);
-    }
-    public void etchedIn() {
-        ((EtchedRectangle)border()).etchedIn();      
-    }
-    public void etchedOut() {
-        ((EtchedRectangle)border()).etchedOut();     
-    }
-    public void paintEtchedIn() {
-        ((EtchedRectangle)border()).paintEtchedIn ();
-    }
-    public void paintEtchedOut() {
-        ((EtchedRectangle)border()).paintEtchedOut();
-    }
-    public boolean isEtchedIn() { 
-        return ((EtchedRectangle)border()).isEtchedIn();
-    }
-    protected String paramString() {
-        return super.paramString() + (EtchedRectangle)border();
-    }
-    protected DrawnRectangle border() {
-        if(border == null)
-            border = new EtchedRectangle(this, thickness);
-        return border;
-    }
-}
diff --git a/java/gjt/EtchedRectangle.java b/java/gjt/EtchedRectangle.java
deleted file mode 100644
index b8026d42f8d..00000000000
--- a/java/gjt/EtchedRectangle.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A DrawnRectangle that draws an etched border.<p>
- * 
- * Drawn etched in by default, drawing style used by paint() is 
- * controlled by etchedIn() and etchedOut().  Note that 
- * etchedIn() and etchedOut() do not result in anything being 
- * painted, but only set the state for the next call to paint(). 
- * To set the state and paint in one operation, use 
- * paintEtchedIn() and paintEtchedOut().<p>
- * 
- * Although it is permissible to set the thickness of 
- * EtchedRectangles, they tend to loose the etching effect 
- * if thickness is greater than 4.<p>
- *
- * The current state of the rectangle may be obtained by 
- * calling isEtchedIn().
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     DrawnRectangle
- * @see     ThreeDRectangle
- * @see     gjt.test.DrawnRectangleTest
- */
-public class EtchedRectangle extends DrawnRectangle {
-    protected static Etching _defaultEtching = Etching.IN;
-    private Etching etching;
-
-    public EtchedRectangle(Component drawInto) {
-        this(drawInto, _defaultEtching, 
-             _defaultThickness, 0, 0, 0, 0);
-    }
-    public EtchedRectangle(Component drawInto, int thickness) {
-        this(drawInto, _defaultEtching, thickness, 0, 0, 0, 0);
-    }
-    public EtchedRectangle(Component drawInto, int x, int y, 
-                                               int w, int h) {
-        this(drawInto, _defaultEtching, 
-             _defaultThickness, x, y, w, h);
-    }
-    public EtchedRectangle(Component drawInto, int thickness,
-                                               int x, int y, 
-                                               int w, int h) {
-        this(drawInto, _defaultEtching, thickness, x, y, w, h);
-    }
-    public EtchedRectangle(Component drawInto, Etching etching, 
-                           int thickness, int x, int y, 
-                           int w, int h) {
-        super(drawInto, thickness, x, y, w, h);
-        this.etching = etching;
-    }
-    public void    etchedIn  () { etching = Etching.IN;        }
-    public void    etchedOut () { etching = Etching.OUT;       }
-    public boolean isEtchedIn() { return etching == Etching.IN;}
-
-    public void paint() {
-        if(etching == Etching.IN) paintEtchedIn();
-        else                      paintEtchedOut();
-    }
-    public void paintEtchedIn() {
-        Graphics g = drawInto.getGraphics();
-        if(g != null)
-            paintEtched(g, getLineColor(), brighter());
-
-        etchedIn();
-    }
-    public void paintEtchedOut() {
-        Graphics g = drawInto.getGraphics();
-        if(g != null)
-            paintEtched(g, brighter(), getLineColor());
-
-        etchedOut();
-    }
-    public String paramString() { 
-        return super.paramString() + "," + etching;
-    }
-    private void paintEtched(Graphics g, 
-                             Color topLeft, 
-                             Color bottomRight) {
-        int  thickness = getThickness();
-        int  w = width  - thickness;
-        int  h = height - thickness;
-
-        g.setColor(topLeft);
-        for(int i=0; i < thickness/2; ++i) 
-            g.drawRect(x+i, y+i, w, h);
-
-        g.setColor(bottomRight);
-
-        for(int i=0; i < thickness/2; ++i) 
-            g.drawRect(x+(thickness/2)+i, 
-                       y+(thickness/2)+i, w, h);
-    }
-}
diff --git a/java/gjt/Etching.java b/java/gjt/Etching.java
deleted file mode 100644
index ad40d9caaea..00000000000
--- a/java/gjt/Etching.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package gjt;
-
-/**
- * Constants for Etching.
- *
- * This class may not be instantiated.
- *
- * @version 1.0, Apr 11 1996
- * @author  David Geary
- */
-public class Etching {
-    public static final Etching OUT = new Etching();
-    public static final Etching IN  = new Etching();
-
-    public String toString() {
-        if(this == Etching.OUT) 
-            return getClass().getName() + "=OUT";
-        else                    
-            return getClass().getName() + "=IN";
-    }
-    private Etching() { }
-}
diff --git a/java/gjt/ExclusiveImageButtonPanel.java b/java/gjt/ExclusiveImageButtonPanel.java
deleted file mode 100644
index f1d0878a499..00000000000
--- a/java/gjt/ExclusiveImageButtonPanel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package gjt;
-
-import java.awt.Image;
-
-/**
- * An ImageButtonPanel which fits all of its ImageButtons with 
- * a StickyImageButtonController.  ExclusiveImageButtonPanel 
- * relies upon its superclass' controller:  a 
- * RadioImageButtonPanelController, which ensures that only one 
- * of the ImageButtons is selected at a time.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonPanel
- * @see     gjt.test.ToolbarTest
- */
-public class ExclusiveImageButtonPanel extends 
-                                       ImageButtonPanel {
-    public ExclusiveImageButtonPanel(Orientation orient) {
-        this(orient, 5);
-    }
-    public ExclusiveImageButtonPanel(Orientation orient, 
-                                     int gap) {
-        super(orient, gap);
-    }
-    public ExclusiveImageButtonPanel(Orientation orient, 
-                                     Orientation horient,
-                                     Orientation vorient,
-                                     int gap) {
-        super(orient, horient, vorient, gap);
-    }
-    public void add(ImageButton button) {
-        super.add(button);
-        new StickyImageButtonController(button);
-    }
-    public ImageButton add(Image image) {
-        ImageButton button = super.add(image);
-        new StickyImageButtonController(button);
-        return button;
-    }
-    public ImageButton add(Image image, String name) {
-        ImageButton button = super.add(image, name);
-        new StickyImageButtonController(button);
-        return button;
-    }
-}
diff --git a/java/gjt/FontDialog.java b/java/gjt/FontDialog.java
deleted file mode 100644
index 182ca582884..00000000000
--- a/java/gjt/FontDialog.java
+++ /dev/null
@@ -1,362 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A dialog used for selecting a font.  FontDialog is 
- * constructed with a Frame, DialogClient, initial font to 
- * display, and boolean that indicates modality.<p>
- *
- * FontDialog contains a preview panel which previews the 
- * currently selected font.  Updating of the preview panel is 
- * triggered by a preview button at the bottom of the dialog.<p>
- *
- * FontDialog contains 3 methods which define the labels for 
- * the buttons it contains:
- * <dl>
- * <dd> String getPreviewButtonLabel()
- * <dd> String getOkButtonLabel()
- * <dd> String getCancelButtonLabel()
- * </dl><p>
- * 
- * By default the 3 methods return "Preview", "Ok" and "Cancel" 
- * respectively.  FontDialog may be extended and the 3 methods 
- * overridden to customize the labels displayed in the 
- * buttons.<p>
- * 
- * FontDialog uses Toolkit to get a list of fonts by invoking
- * Toolkit.getFontList().  This is done in the getFontNames() 
- * method, which may be overridden by extensions of FontDialog 
- * in case the standard set of font names are inadequate.<p>
- *
- * Finally, font sizes are obtained by the getFontSizes() 
- * method.  FontDialog defines 8 sizes by default:  8, 12, 14, 
- * 16, 18, 24, 48 and 64. Extensions of FontDialog may override 
- * getFontSizes() to provide a different list of sizes.<p>
- *
- * See gjt.test.FontDialogTest for an example of an extension 
- * of FontDialog which overrides the methods discussed above.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     java.awt.Dialog
- * @see     java.awt.Toolkit
- * @see     DialogClient
- * @see     gjt.test.FontDialogTest
- */
-public class FontDialog extends Dialog {
-    private static String _defaultSizes[] = 
-        { "8",  "12", "14", "16", "18", "24", "48", "64" };
-
-    private FontPanel    fontPanel;
-    private Font         fontSelected;
-    private DialogClient client;
-
-    public FontDialog(Frame        frame, 
-                      DialogClient client, 
-                      Font         font,    // initial font
-                      boolean      modal) {
-        super(frame, "Select A Font", modal);
-        this.client = client;
-        
-        setLayout(new BorderLayout());
-        add("Center", fontPanel = new FontPanel(this, font));
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id == Event.WINDOW_DESTROY)
-            done(null);
-
-        return super.handleEvent(event);
-    }
-    public String[] getFontNames() { 
-        return getToolkit().getFontList(); 
-    }
-    public String[] getFontSizes() { 
-        return _defaultSizes;   
-    }
-
-    public String getPreviewButtonLabel() { return "Preview"; }
-    public String getOkButtonLabel     () { return "Ok";      }
-    public String getCancelButtonLabel () { return "Cancel";  }
-
-    public void show() {
-        Point frameLoc = getParent().location();
-        reshape(frameLoc.x + 50, frameLoc.x + 50, 550, 450);
-        super.show();
-    }
-    public void done(Font font) {
-        fontSelected = font;
-        client.dialogDismissed(this);
-        hide   ();
-        dispose();
-    }
-    public Font getFontSelected() {
-        return fontSelected;
-    }
-    public void listSelectedInPicker() {
-        fontPanel.getPreviewButton().requestFocus();
-    }
-}
-
-class FontPanel extends Panel {
-    private static Font defaultFont = 
-        new Font("TimesRoman", Font.PLAIN, 12);
-
-    private FontPreviewPanel   preview;
-    private FontSelectionPanel fsp;
-
-    public FontPanel(FontDialog dialog, Font f) {
-        Font font = f == null ? defaultFont : f;
-
-        setLayout(new BorderLayout());
-        add("North",  preview = new FontPreviewPanel  ());
-        add("Center", fsp     = 
-            new FontSelectionPanel(dialog, preview, font));
-    }
-    public Button getPreviewButton() {
-        return fsp.getPreviewButton();
-    }
-}
-
-class FontPreviewPanel extends Panel {
-    TextField textField = new TextField();
-    Box       box       = new Box(textField, "Preview");
-
-    public FontPreviewPanel() {
-        textField.setEditable(false);
-
-        setLayout(new BorderLayout());
-        add("Center", box);
-    }
-    public void setPreviewFont(Font font) {
-        String name  = font.getName();
-        String size  = String.valueOf(font.getSize());
-        String style = new String();
-
-        if(font.isPlain () == true) style = "Plain";
-        else {
-            if(font.isBold  () == true) style += "Bold";
-            if(font.isItalic() == true) style += "Italic";
-        }
-        textField.setFont(font);
-        textField.setText(name + " " + style + " " + size);
-        retrofitPreviewPanel();
-    }
-    private void retrofitPreviewPanel() {
-        Dimension tfps, tfs;
-        FontPanel fontPanel = (FontPanel)getParent();
-
-        tfps = textField.preferredSize();
-        tfs  = textField.size();
-
-        if(tfps.width != tfs.width || 
-           tfps.height != tfs.height) {
-            fontPanel.invalidate();
-            fontPanel.getParent().validate();
-            box.repaint();           // Only necessary on Win95
-        }
-    }
-}
-
-class FontSelectionPanel extends Panel {
-    private FontPickerPanel  picker;
-    private FontButtonsPanel buttons;
-    private FontPreviewPanel preview;
-    private Font             initialFont;
-
-    public FontSelectionPanel(FontDialog       dialog,
-                              FontPreviewPanel preview, 
-                              Font initialFont) {
-        this.preview     = preview;
-        this.initialFont = initialFont;
-
-        picker  = new FontPickerPanel (dialog, initialFont);
-        buttons = new FontButtonsPanel(dialog, picker, preview);
-
-        setLayout(new BorderLayout());
-        add("Center", picker);
-        add("South",  buttons);
-    }
-    public void addNotify() {
-        super.addNotify();
-        preview.setPreviewFont(initialFont);
-    }
-    public Button getPreviewButton() {
-        return buttons.getPreviewButton();
-    }
-}
-
-class FontPickerPanel extends Panel {
-    private FontDialog dialog;
-    private Button     previewButton;
-    private List       fonts  = new List();
-    private List       styles = new List();
-    private List       sizes  = new List();
-    private Font       initialFont;
-
-    public FontPickerPanel(FontDialog dialog, 
-                           Font       initialFont) {
-        GridBagLayout      gbl    = new GridBagLayout();
-        GridBagConstraints gbc    = new GridBagConstraints();
-        Label              family = new Label("Family");
-        Label              style  = new Label("Style");
-        Label              size   = new Label("Size");
-
-        this.initialFont = initialFont;
-        this.dialog      = dialog;
-        
-        populateFonts ();
-        populateStyles();
-        populateSizes ();
-
-        setLayout(gbl);
-
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = 1;
-        gbl.setConstraints(family, gbc); add(family);
-        gbl.setConstraints(style,  gbc); add(style);
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(size,   gbc); add(size);
-
-        gbc.gridwidth = 1;
-        gbc.weighty   = 1.0;
-        gbc.weightx   = 1.0;
-        gbc.fill      = GridBagConstraints.BOTH;
-        gbl.setConstraints(fonts,  gbc); add(fonts);
-        gbl.setConstraints(styles, gbc); add(styles);
-        gbl.setConstraints(sizes,  gbc); add(sizes);
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id  == Event.LIST_SELECT) {
-            dialog.listSelectedInPicker();
-            return true;
-        }
-        return false;
-    }
-    public void addNotify() {
-        super.addNotify();
-        String initialFamily = initialFont.getName();
-        int    initialSize   = initialFont.getSize();
-        int    initialStyle  = initialFont.getStyle();
-
-        styles.select(initialStyle);
-
-        for(int i=0; i < fonts.countItems(); ++i) {
-            String nextFamily = fonts.getItem(i);
-            if(nextFamily.equals(initialFamily))
-                fonts.select(i);
-        }
-        for(int i=0; i < sizes.countItems(); ++i) {
-            String nextSize = sizes.getItem(i);
-            if(nextSize.equals(String.valueOf(initialSize)))
-                sizes.select(i);
-        }
-    }
-    public String fontSelected() { 
-        return fonts.getSelectedItem (); 
-    }
-    public String styleSelected() { 
-        return styles.getSelectedItem(); 
-    }
-    public int sizeSelected() {
-        String szstring = sizes.getSelectedItem();
-
-        if(szstring != null) {
-            Integer integer = new Integer(szstring);
-            return integer.intValue();
-        }
-        else
-            return 0;
-    }
-    private void populateFonts() {
-        String names[] = dialog.getFontNames();
-
-        for(int i=0; i < names.length; ++i) {
-            fonts.addItem(names[i]);
-        }
-    }
-    private void populateSizes() {
-        String sizeArray[] = dialog.getFontSizes();
-
-        for(int i=0; i < sizeArray.length; ++i) {
-            sizes.addItem(sizeArray[i]);
-        }
-    }
-    private void populateStyles() {
-        styles.addItem("Plain");
-        styles.addItem("Bold");
-        styles.addItem("Italic");
-        styles.addItem("BoldItalic");
-    }
-}
-
-class FontButtonsPanel extends Panel {
-    private FontDialog       dialog;
-    private FontPickerPanel  picker;
-    private FontPreviewPanel preview;
-    private Button           previewButton, 
-                             okButton, 
-                             cancelButton;
-
-    public FontButtonsPanel(FontDialog       dialog,
-                            FontPickerPanel  picker, 
-                            FontPreviewPanel preview) {
-        this.picker  = picker;
-        this.preview = preview;
-        this.dialog  = dialog;
-
-        add(previewButton = 
-            new Button(dialog.getPreviewButtonLabel()));
-        add(cancelButton  = 
-            new Button(dialog.getCancelButtonLabel()));
-        add(okButton      = 
-            new Button(dialog.getOkButtonLabel()));
-    }
-    public void addNotify() {
-        super.addNotify();
-        cancelButton.requestFocus();
-    }
-    public boolean action(Event event, Object object) {
-        Button  button = (Button)event.target;
-        boolean handledEvent = true;
-
-        if(event.target == previewButton) {
-            Font selectedFont = fontSelected();
-
-            if(selectedFont != null) {
-                preview.setPreviewFont(selectedFont);
-                okButton.requestFocus();
-            }
-        }
-        else if(event.target == okButton)     
-            dialog.done(fontSelected());
-        else if(event.target == cancelButton) 
-            dialog.done(null);
-        else                                  
-            handledEvent = false;
-
-        return handledEvent;
-    }
-    public Button getPreviewButton() {
-        return previewButton;
-    }
-    private Font fontSelected() {
-        String font   = picker.fontSelected ();
-        String style  = picker.styleSelected();
-        int    size   = picker.sizeSelected ();
-        int    istyle = Font.PLAIN;
-
-        if(font != null && style != null && size > 0) {
-            if(style.equals("Bold"))   istyle = Font.BOLD;
-            if(style.equals("Plain"))  istyle = Font.PLAIN;
-            if(style.equals("Italic")) istyle = Font.ITALIC;
-
-            if(style.equals("BoldItalic")) 
-                istyle = Font.BOLD + Font.ITALIC;
-
-            return new Font(font, istyle, size);
-        }
-        else
-            return null;
-    }
-}
diff --git a/java/gjt/GJTDialog.java b/java/gjt/GJTDialog.java
deleted file mode 100644
index 7fc0bd39f40..00000000000
--- a/java/gjt/GJTDialog.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A base class for gjt dialog classes, this concrete class 
- * establishes the relationship between a dialog and its 
- * client (DialogClient).<p>
- *
- * Note that show() is overridden to ensure that the dialog is 
- * centered in the frame which is specified as its parent.  This
- * is necessary due to a bug in the Win95 implementation of the 
- * AWT (version 1.0.2) that causes dialogs to be displayed at 
- * a screen coordinate of 0,0.  While the overridden show() is 
- * not necessary under non-Win95 Java implementations, it 
- * alleviates the Win95 bug and results in no dire consequences 
- * on other platforms.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MessageDialog
- * @see     QuestionDialog
- * @see     YesNoDialog
- * @see     ProgressDialog
- * @see     gjt.test.DialogTest
- */
-public class GJTDialog extends Dialog {
-    protected DialogClient client;
-
-    public GJTDialog(Frame        frame, 
-                     String       title, 
-                     DialogClient client, 
-                     boolean      modal) {
-        super(frame, title, modal); 
-        setClient(client);
-    }
-    public void setClient(DialogClient client) {
-        this.client = client;
-    }
-    public void show() {  // Fixes bug under Win95
-        Dimension frameSize = getParent().size();
-        Point     frameLoc  = getParent().location();
-        Dimension mySize    = size();
-        int       x,y;
-
-        x = frameLoc.x + (frameSize.width/2) -(mySize.width/2); 
-        y = frameLoc.y + (frameSize.height/2)-(mySize.height/2); 
-        reshape(x,y,size().width,size().height);
-        super.show();
-    }
-}
diff --git a/java/gjt/IconCardPanel.java b/java/gjt/IconCardPanel.java
deleted file mode 100644
index 78940bf8f4f..00000000000
--- a/java/gjt/IconCardPanel.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A CardPanel whose Component viewSelector() returns
- * a panel with image buttons to control the selection of the
- * panel to be displayed beneath the view selector panel.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CardPanel
- * @see     ChoiceCardpanel
- * @see     gjt.test.IconCardPanelTest
- */
-public class IconCardPanel extends CardPanel {
-    private ImageButtonPanel viewSelector;
-
-    public IconCardPanel() {
-        viewSelector = new IconViewSelector(this);
-    }
-    public Component viewSelector() {
-        return viewSelector;
-    }
-    public void addImageButton(Image     image, 
-                               String    name, 
-                               Component component) {
-        ImageButton newButton;
-
-        viewSelector.add(
-            newButton = new ImageButton(image), name);
-        newButton.setController(
-            new StickyImageButtonController(newButton));
-        super.addView(name, component);
-    }
-}
-
-class IconViewSelector extends ImageButtonPanel {
-    private IconCardPanel mvp;
-
-    public IconViewSelector(IconCardPanel panel) {
-        super(Orientation.HORIZONTAL);
-        setLayout(new FlowLayout());
-        mvp = panel;
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id == Event.MOUSE_DOWN) {
-            if(event.target instanceof ImageButton) {
-                ImageButton ib = (ImageButton)event.target;
-                    mvp.showView(getButtonName(ib)); 
-            }
-        }
-        return super.handleEvent(event);
-    }
-}
diff --git a/java/gjt/ImageButton.java b/java/gjt/ImageButton.java
deleted file mode 100644
index 07bdeff0ef8..00000000000
--- a/java/gjt/ImageButton.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package gjt;
-
-import java.awt.*;
-import java.awt.image.FilteredImageSource;
-
-import gjt.image.BleachImageFilter;
-
-/**
- * An Image painted in a Canvas, bordered by a ThreeDRectangle.
- * <p>
- *
- * ImageButtons have two constructors, both of which take an 
- * Image.  The Image passed to the constructor must not be null;
- * this is enforced by an assertion.<p>
- *
- * Default border thickness is 2 pixels - thickness may be set 
- * at construction time only.<p>
- *
- * Event handling is delegated to an ImageButtonController.  By 
- * default, all ImageButtons are fitted with an instance of 
- * SpringyImageButtonController, however, 
- * setController(ImageButtonController) may be used to fit an
- * ImageButton with a different derivation of 
- * ImageButtonController after construction.<p>
- *
- * ImageButtons ensure that their Images are completely loaded 
- * before they are displayed.<p>
- * 
- * Drawn either raised or inset, current state may be queried 
- * via the isRaised() method.<p>
- *
- * disable() disables response to input and repaints the image 
- * with a bleached version.  enable() restores the original 
- * image and enables response to input.  The intensity of the 
- * bleaching effect may be controlled (for all ImageButtons) 
- * via the static setBleachPercent(int) method.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ThreeDRectangle
- * @see     ImageButtonController
- * @see     ImageButtonEvent
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- * @see     BleachImageFilter
- * @see     gjt.test.ImageButtonTest
- */
-public class ImageButton extends Canvas {
-    private static BleachImageFilter _bleachFilter;
-    private static int               _bleachPercent    = 50;
-    private static int               _offset           = 1;
-    private static int               _defaultThickness = 2;
-
-    private ThreeDRectangle border  = new ThreeDRectangle(this);
-    private boolean         isDisabled    = false;
-    private Dimension       preferredSize = new Dimension(0,0);
-    private int             thickness;
-    private Image           image, disabledImage;
-    private ImageButtonController controller;
-
-    public static int setBleachPercent() { 
-        return _bleachPercent; 
-    }
-    public static void getBleachPercent(int p) { 
-        _bleachPercent = p;    
-    }
-    public ImageButton(Image image) {
-        this(image, _defaultThickness, null);
-    }
-    public ImageButton(Image image, 
-                       ImageButtonController controller) {
-        this(image, _defaultThickness, controller);
-    }
-    public ImageButton(Image image, int thickness, 
-                       ImageButtonController controller) {
-        Assert.notNull(image);
-        Assert.notFalse(thickness > 0);
-
-        if(controller == null) 
-            this.controller = 
-                new SpringyImageButtonController(this);
-        else                   
-            this.controller = controller;
-
-        border.setThickness(this.thickness = thickness);  
-        setImage(image);
-    }
-    public void setImage(Image image) {
-        Util.waitForImage(this, this.image = image);
-
-        preferredSize.width  = image.getWidth (this) + 
-                               (2*thickness);
-        preferredSize.height = image.getHeight(this) + 
-                               (2*thickness);
-    }
-    public Dimension minimumSize() { 
-        return preferredSize; 
-    }
-    public Dimension preferredSize() { 
-        return preferredSize;                
-    }
-    public boolean isRaised  () { return border.isRaised();    }
-    public boolean isDisabled() { return isDisabled;           }
-
-    public void enable() { 
-        isDisabled = false; 
-        repaint();
-    }
-    public void disable() { 
-        isDisabled = true;  
-
-        if(disabledImage == null) 
-            createDisabledImage();
-
-        repaint();       
-    }
-    public void resize(int w, int h) { 
-        reshape(location().x, location().y, w, h);
-    }
-    public void reshape(int x, int y, int w, int h) { 
-        super.reshape(x,y,w,h);
-        border.resize(w,h);
-    }
-    public void paint(Graphics g) {
-        if(isRaised()) paintRaised();
-        else           paintInset ();
-    }
-    public void paintInset() {
-        Point     upperLeft = findUpperLeft();
-        Graphics  g         = getGraphics();
-        Image     image     = isDisabled() ? 
-                              disabledImage : this.image;
-        Dimension size      = size();
-
-        if(g != null) {
-            border.clearInterior();
-            g.drawImage(image, 
-                        upperLeft.x + thickness + _offset, 
-                        upperLeft.y + thickness + _offset,this);
-
-            g.setColor(getBackground().darker());
-            for(int i=0; i < _offset; ++i) {
-                g.drawLine(thickness+i,thickness+i,
-                           size.width-thickness-i,thickness+i);
-                g.drawLine(thickness+i,thickness+i,
-                           thickness+i,size.height-thickness-i);
-            }
-            border.paintInset();
-        }
-    }
-    public void paintRaised() {
-        Point    upperLeft = findUpperLeft();
-        Graphics g         = getGraphics();
-        Image    image     = isDisabled() ? 
-                             disabledImage : this.image;
-
-        if(g != null) {
-            border.clearInterior();
-            g.drawImage(image, upperLeft.x + thickness, 
-                               upperLeft.y + thickness, this);
-            border.paintRaised();
-        }
-    }
-    public boolean isInside(int x, int y) {
-      Dimension size = size();
-      return x >= 0 && x < size.width && y >= 0 && 
-             y < size.height;
-    }
-    public void setController(ImageButtonController controller){
-        this.controller = controller;
-    }
-    public ImageButtonController getController() {
-        return controller;
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(isDisabled()) return false;
-        else             return controller.mouseDown(event,x,y);
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        if(isDisabled()) return false;
-        else             return controller.mouseUp(event,x,y);
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        if(isDisabled()) return false;
-        else             return controller.mouseDrag(event,x,y);
-    }
-
-    private void createDisabledImage() {
-        if(_bleachFilter == null)
-            _bleachFilter = 
-                new BleachImageFilter(_bleachPercent);
-
-        if(_bleachPercent != _bleachFilter.percent())
-            _bleachFilter.percent(_bleachPercent);
-
-        FilteredImageSource fis = 
-            new FilteredImageSource(image.getSource(), 
-                                    _bleachFilter);
-
-        Util.waitForImage(this, disabledImage=createImage(fis));
-    }
-    private Point findUpperLeft() {
-        Dimension size = size();
-        return new Point((size.width/2) - 
-                         (preferredSize.width/2), 
-                         (size.height/2) - 
-                         (preferredSize.height/2));
-    }
-}
diff --git a/java/gjt/ImageButtonController.java b/java/gjt/ImageButtonController.java
deleted file mode 100644
index 0f6aa6f4add..00000000000
--- a/java/gjt/ImageButtonController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package gjt;
-import java.awt.Event;
-
-/**
- * A controller for an ImageButton, this abstract class 
- * establishes the association between itself and an ImageButton
- * and delivers events to its ImageButton.<p>
- *
- * ImageButtonControllers must be constructed with an 
- * ImageButton; the ImageButton's controller gets set by 
- * ImageButtonController's constructor.<p>
- *
- * The ImageButton passed into the constructor must not be null; 
- * this is enforced by an assertion.<p>
- *
- * Methods defined in the MouseController interface are left 
- * for subclasses to implement.  ImageButtonController defines
- * mouseMove(), mouseEnter() and mouseExit() as no-ops, so
- * that extensions of ImageButtonController only have to
- * implement mouseDown(), mouseUp() and mouseDrag().  Note
- * that extensions are still free to override mouseMove(),
- * mouseEnter() and mouseExit() if desired.<p>
- *
- * Subclasses should also call the protected XXXButton(Event)
- * methods below, where XXX is either arm, disarm, activate, or
- * deactivate as appropriate.  SpringyImageButtonController is
- * a good example of this (so is StickyImageButtonController,
- * but it is more complicated than it's springy sibling).<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MouseController
- * @see     ImageButton
- * @see     ImageButtonEvent
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- * @see     gjt.test.ImageButtonTest
- */
-public abstract class ImageButtonController 
-         implements MouseController {
-    private ImageButton button;
-
-    ImageButtonController(ImageButton button) {
-        Assert.notNull(button);
-        this.button = button;
-        button.setController(this);
-    }
-    public ImageButton getButton() {
-        return button;
-    }
-    public boolean mouseEnter(Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseExit (Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseMove (Event event, int x, int y) {
-        return false;
-    }
-
-    protected void armButton(Event event) {
-        button.deliverEvent(
-            new ImageButtonEvent(button, 
-                                 event, 
-                                 ImageButtonEvent.ARM));
-    }
-    protected void disarmButton(Event event) {
-        button.deliverEvent(
-            new ImageButtonEvent(button, 
-                                 event, 
-                                 ImageButtonEvent.DISARM));
-    }
-    protected void activateButton(Event event) {
-        button.deliverEvent(
-            new ImageButtonEvent(button, 
-                                 event, 
-                                 ImageButtonEvent.ACTIVATE));
-    }
-}
diff --git a/java/gjt/ImageButtonEvent.java b/java/gjt/ImageButtonEvent.java
deleted file mode 100644
index bb7f196698f..00000000000
--- a/java/gjt/ImageButtonEvent.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * An extension of java.awt.Event, specifically designed for
- * ImageButton events.<p>
- *
- * ImageButtonEvents are constructed with 3 arguments:
- * <dl>
- * <dd> ImageButton in which the event occurred
- * <dd> The AWT event that triggered the image button event
- * <dd> The id of the event.
- * </dl>
- *
- * An ImageButtonEvent's id (the constructor's 3rd argument),
- * must be one of the following:
- *
- * <dl>
- * <dd> ImageButtonEvent.ARM
- * <dd> ImageButtonEvent.DISARM
- * <dd> ImageButtonEvent.ACTIVATE
- * </dl>
- *
- * ImageButtonEvent has only a constructor and a paramString() 
- * method.  Containers that contain ImageButtons should check 
- * for ImageButtonEvents like so: <p>
- * 
- * <pre>
- *      // handleEvent(Event) method of a container that
- *      // contains ImageButtons.
- *
- *      public boolean handleEvent(Event event) {
- *              if(event instanceof ImageButtonEvent) {
- *                  ImageButtonEvent ibevent = 
- *                  (ImageButtonEvent)event;
- *
- *                  if(ibevent.isArmed()) {
- *                      // do something for arming
- *                  }
- *                  if(ibevent.isDisarmed()) {
- *                      // do something for disarming
- *                  }
- *                  if(ibevent.isActivated()) {
- *                      // do something for activation
- *                  }
- *              }
- *      }
- * </pre>
- *
- * ImageButtonController is the only GJT class that creates
- * ImageButtonEvents.
- * 
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonController
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- * @see     gjt.test.ImageButtonTest
- */
-public class ImageButtonEvent extends Event {
-    public static final int ARM      = 1;
-    public static final int DISARM   = 2;
-    public static final int ACTIVATE = 3;
-
-    private int eventType;
-
-    public ImageButtonEvent(ImageButton button,
-                            Event       event, 
-                            int         type) {
-        super(button, event.when, event.id, event.x, event.y,
-                      event.key,  event.modifiers, event.arg);
-
-        Assert.notFalse(type == ARM    ||
-                        type == DISARM ||
-                        type == ACTIVATE);
-
-        eventType = type;
-        id = -1;
-    }
-    public boolean isArmed() {
-        return eventType == ARM;
-    }
-    public boolean isDisarmed() {
-        return eventType == DISARM;
-    }
-    public boolean isActivated() {
-        return eventType == ACTIVATE;
-    }
-    protected String paramString() {
-        String str = new String();
-
-        if(eventType == ImageButtonEvent.ARM)         
-            str = "ARM";
-        else if(eventType == ImageButtonEvent.DISARM) 
-            str = "DISARM";
-        else if(eventType == ImageButtonEvent.ACTIVATE) 
-            str = "ACTIVATE";
-
-        return super.paramString() + str;
-    }
-}
diff --git a/java/gjt/ImageButtonPanel.java b/java/gjt/ImageButtonPanel.java
deleted file mode 100644
index 0d033b7967b..00000000000
--- a/java/gjt/ImageButtonPanel.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package gjt;
-
-import java.awt.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-/**
- * A panel which contains a collection of ImageButtons, 
- * arranged either horizontally or vertically.<p>
- *
- * Handling of mouse events is delegated to an image button 
- * panel controller.  By default, an image button panel is 
- * outfitted with an instance of RadioImageButtonPanelController
- * which implements mutually exclusive selection behavior.
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     RadioImageButtonPanelController
- * @see     gjt.test.ToolbarTest
- */
-public class ImageButtonPanel extends Panel {
-    static private int _defaultGap = 5;
-
-    private Hashtable nameAndButtonPairs = new Hashtable();
-    private ImageButtonPanelController controller;
-
-    public ImageButtonPanel(Orientation orient) { 
-        this(orient, Orientation.CENTER, 
-                     Orientation.CENTER, _defaultGap); 
-    }
-    public ImageButtonPanel(Orientation orient, int gap) {
-        this(orient, Orientation.CENTER, 
-                     Orientation.CENTER, gap);
-    }
-    public ImageButtonPanel(Orientation orient, 
-                            Orientation horient, 
-                            Orientation vorient, int gap) {
-        Assert.notFalse(orient == Orientation.HORIZONTAL || 
-                        orient == Orientation.VERTICAL);
-
-        if(orient == Orientation.VERTICAL) 
-            setLayout(new ColumnLayout(horient, vorient, gap));
-        else                               
-            setLayout(new RowLayout(horient, vorient, gap));
-
-        setController(
-            new RadioImageButtonPanelController(this));
-    }
-    public void setController(ImageButtonPanelController c) {
-        this.controller = c;
-    }
-    public Insets insets() { return new Insets(10,10,10,10); }
-
-    public ImageButton add(Image image, String name) {
-        ImageButton button = new ImageButton(image);
-        add(button);
-        nameAndButtonPairs.put(name, button);
-        return button;
-    }   
-    public ImageButton add(Image image) { 
-        return add(image, "noname"); 
-    }
-    public void add(ImageButton button) { 
-        add(button, "noname");       
-    }
-    public void add(ImageButton button, String name) {
-        nameAndButtonPairs.put(name, button);
-        super.add(button);
-    }
-    public ImageButton getButtonByName(String name) {
-        return (ImageButton)nameAndButtonPairs.get(name);
-    }
-    public String getButtonName(ImageButton button) {
-        Enumeration e = nameAndButtonPairs.keys();
-        ImageButton nbutt;
-        String nstr;
-
-        while(e.hasMoreElements()) {
-            nstr = (String)e.nextElement();
-            nbutt = (ImageButton)nameAndButtonPairs.get(nstr);
-
-            if(nbutt.equals(button))
-              return nstr;
-        }
-        return null;
-    }
-    public void addSpacer(int sizeInPixels) {
-        Assert.notFalse(sizeInPixels > 0);
-        Canvas spacer = new Canvas();
-        spacer.resize(sizeInPixels, sizeInPixels);
-        add(spacer);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        return controller != null ? 
-               controller.mouseDown(event,x,y) : false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        return controller != null ? 
-               controller.mouseDrag(event,x,y) : false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        return controller != null ? 
-               controller.mouseUp(event,x,y) : false;
-    }
-}
diff --git a/java/gjt/ImageButtonPanelController.java b/java/gjt/ImageButtonPanelController.java
deleted file mode 100644
index 74f900001b6..00000000000
--- a/java/gjt/ImageButtonPanelController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * A controller for an ImageButtonPanel, this abstract class 
- * does nothing more than establish the association between an 
- * ImageButton and its controller.<p>
- *
- * ImageButtonControllers must be constructed with an 
- * ImageButtonPanel; the ImageButtonPanels' controller gets set 
- * by the constructor.<p>
- *
- * The ImageButton passed into the constructor must not be null; 
- * this is enforced by an assertion.<p>
- *
- * Methods defined in the MouseController interface are left 
- * for subclasses to implement.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     MouseController
- * @see     ImageButtonPanel
- * @see     gjt.test.Toolbar
- */
-abstract class ImageButtonPanelController implements 
-                                          MouseController {
-    private ImageButtonPanel panel;
-
-    ImageButtonPanelController(ImageButtonPanel panel) {
-        Assert.notNull(panel);
-        this.panel = panel;
-        panel.setController(this);
-    }
-    public ImageButtonPanel panel() {
-        return panel;
-    }
-    public boolean mouseEnter(Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseExit (Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseMove (Event event, int x, int y) {
-        return false;
-    }
-}
diff --git a/java/gjt/ImageCanvas.java b/java/gjt/ImageCanvas.java
deleted file mode 100644
index 49e3bc72f3f..00000000000
--- a/java/gjt/ImageCanvas.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A Canvas that displays an image.<p>
- *
- * update() is overridden to call paint() directly, thus 
- * bypassing the default implementation of update() which 
- * erases the background of the canvas before calling paint().
- * This eliminates nasty flashing.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Util
- */
-class ImageCanvas extends Canvas {
-    private Image image;
-
-    public ImageCanvas(Image image) {
-        this.image = image;
-        Util.waitForImage(this, image);
-        resize(image.getWidth(this), image.getHeight(this));
-    }
-    public void paint(Graphics g) {
-        g.drawImage(image, 0, 0, this);
-    }
-    public void update(Graphics g) {
-        paint(g);
-    }
-}
diff --git a/java/gjt/ImageScroller.java b/java/gjt/ImageScroller.java
deleted file mode 100644
index 79fdc86ea3c..00000000000
--- a/java/gjt/ImageScroller.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * An extension of Scroller that smoothly scrolls an Image.<p>
- *
- * An Image must be supplied at construction time.  The image 
- * may be reset any time after construction.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Scroller
- * @see     ImageCanvas
- * @see     gjt.test.ScrollerTest
- */
-public class ImageScroller extends Scroller {
-    private Image  image;
-    private ScrollerImageCanvas canvas;
-
-    public ImageScroller(Image image) {
-        viewport.setLayout(new BorderLayout());
-        setImage(image);
-    }
-    public void resetImage(Image image) {
-        viewport.remove(canvas);
-        setImage(image);
-        invalidate();
-        validate();
-    }
-    public void scrollTo(int x, int y) {
-        Graphics g = canvas.getGraphics();
-        if(g != null) {
-            g.translate(-x,-y);
-            g.drawImage(image, 0, 0, this);
-        }
-    }
-    public Dimension getScrollAreaSize() {
-        return new Dimension(image.getWidth(this), 
-                             image.getHeight(this));
-    }
-    private void setImage(Image image) {
-        this.image = image;
-        hbar.setValue(0);
-        vbar.setValue(0);
-        viewport.add("Center", 
-            canvas = new ScrollerImageCanvas(this, image));
-    }
-}
-
-class ScrollerImageCanvas extends ImageCanvas {
-    private ImageScroller scroller;
-
-    public ScrollerImageCanvas(ImageScroller scroller, 
-                               Image         image) {
-        super(image);
-        this.scroller = scroller;
-    }
-    public void paint(Graphics g) {
-        scroller.repaint(); 
-    }
-}
diff --git a/java/gjt/LabelCanvas.java b/java/gjt/LabelCanvas.java
deleted file mode 100644
index ba733249b76..00000000000
--- a/java/gjt/LabelCanvas.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A selectable label.  Clients can set the insets around the 
- * label via setInsets(Insets).
- *
- * LabelCanvases generate SelectionEvents when they are
- * selected or deselected.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     SelectionEvent
- * @see     gjt.test.LabelCanvasTest
- */
-public class LabelCanvas extends Canvas {
-    private String  label;
-    private boolean selected = false;
-    private Insets  insets   = new Insets(2,2,2,2);
-    private Point   labelLoc = new Point(0,0);
-
-    public LabelCanvas(String label) {
-        this.label = label;
-    }
-    public void paint(Graphics g) {
-        if(selected == true) paintSelected(g);
-        else                 
-            g.drawString(label, labelLoc.x, labelLoc.y);
-    }
-    public void setInsets(Insets insets) { 
-        this.insets = insets;   
-        repaint();
-    }
-    public String  getLabel  () { return label;                }
-    public boolean isSelected() { return selected;             }
-    public void    select    () { selected = true;  repaint(); }
-    public void    deselect  () { selected = false; repaint(); }
-
-    public void resize(int w, int h) { 
-        reshape(location().x, location().y, w, h); 
-    }
-    public void reshape(int x, int y, int w, int h) {
-        super.reshape(x, y, w, h);
-        labelLoc = labelLocation(getGraphics());
-    }
-    public Dimension minimumSize() { 
-        return preferredSize(); 
-    }
-    public Dimension preferredSize() {
-        FontMetrics fm = getFontMetrics(getFont());
-            return new Dimension(
-                     insets.left + fm.stringWidth(label) + 
-                     insets.right, 
-                     insets.top  + fm.getHeight() + 
-                     insets.bottom);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(selected) deselect();
-        else         select  ();
-
-        int eventType = isSelected() ? 
-                        SelectionEvent.SELECT : 
-                        SelectionEvent.DESELECT;
-
-        Event newEvent = new SelectionEvent(this, 
-                                            event, 
-                                            eventType);
-        deliverEvent(newEvent);
-
-        return true;
-    }
-    protected void paintSelected(Graphics g) {
-        Point labelLoc = labelLocation(g);
-
-        g.setColor(getForeground());
-        g.fillRect(0,0,size().width,size().height);
-        g.setColor(getBackground());
-        g.drawString(label, labelLoc.x, labelLoc.y);
-    }
-    protected String paramString() {
-        return super.paramString() + ",text=" + label;
-    }
-    private Point labelLocation(Graphics g) {
-        Dimension   size = size();
-        FontMetrics fm   = g.getFontMetrics();
-
-        int x = (size.width/2) - (fm.stringWidth(label)/2);
-        int y = (size.height/2) + (fm.getAscent()/2) - 
-                                   fm.getLeading();
-        return new Point(x,y);
-    }
-}
diff --git a/java/gjt/MessageDialog.java b/java/gjt/MessageDialog.java
deleted file mode 100644
index 4b00bc7033f..00000000000
--- a/java/gjt/MessageDialog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A dialog that displays a message and comes equipped with an 
- * Ok button with which the dialog is dismissed.<p>
- *
- * Note that there is only one MessageDialog, that gets
- * reused.  Clients must call getMessageDialog() in order to
- * access the one and only MessageDialog.<p>
- *
- * <em>Note:  The 1.0.2 version of the AWT seems to have
- * introduced a bug that causes pack() to work incorrectly
- * under Win95.</em>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     GJTDialog
- * @see     gjt.test.MessageDialogTest
- * @see     gjt.test.DialogTest
- */
-public class MessageDialog extends GJTDialog {
-    static private MessageDialog _theMessageDialog;
-
-    private Button      okButton;
-    private String      message;
-    private ButtonPanel buttonPanel = new ButtonPanel();
-
-    static public MessageDialog getMessageDialog(Frame frame,
-                                  DialogClient client,
-                                  String       title,
-                                  String       message) {
-        if(_theMessageDialog == null) 
-            _theMessageDialog = new MessageDialog(frame,
-                                                  client,
-                                                  title,
-                                                  message);
-        else {
-            _theMessageDialog.setClient (client);
-            _theMessageDialog.setTitle  (title);
-            _theMessageDialog.setMessage(message);
-        }
-        return _theMessageDialog;
-    }
-    private MessageDialog(Frame  frame, DialogClient client, 
-                          String title, String       message) {
-        super(frame, title, client, true);
-        okButton = buttonPanel.add("Ok");
-
-        setLayout(new BorderLayout());
-        add("Center", new MessagePanel(message));
-        add("South", buttonPanel);
-        pack();
-    }
-    public void show() {
-        okButton.requestFocus();
-        super.show();
-    }
-    public boolean action(Event event, Object what) {
-        hide();
-        client.dialogDismissed(this);
-        return true;
-    }
-    private void setMessage(String message) {
-        this.message = message;
-    }
-}
-
-class MessagePanel extends Panel {
-    public MessagePanel(String message) {
-        add("Center", new Label(message, Label.CENTER));
-    }
-    public Insets insets() {
-        return new Insets(10,10,10,10);
-    }
-}
diff --git a/java/gjt/MouseController.java b/java/gjt/MouseController.java
deleted file mode 100644
index f044adee5ba..00000000000
--- a/java/gjt/MouseController.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * An interface for handling mouse events.<p>
- *
- * Components delegate handling of mouse events to a 
- * MouseController derivation.<p>
- *
- * For instance:<p>
- *<pre> 
- *      mouseDown(Event event, int x, int y) {
- *          return controller.mouseDown(event,x,y);
- *      }
- *</pre>
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonController
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- */
-public interface MouseController {
-    public boolean mouseEnter(Event event, int x, int y);
-    public boolean mouseExit (Event event, int x, int y);
-
-    public boolean mouseMove (Event event, int x, int y);
-    public boolean mouseDown (Event event, int x, int y);
-    public boolean mouseUp   (Event event, int x, int y);
-    public boolean mouseDrag (Event event, int x, int y);
-}
diff --git a/java/gjt/Orientation.java b/java/gjt/Orientation.java
deleted file mode 100644
index f83b27451da..00000000000
--- a/java/gjt/Orientation.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package gjt;
-
-/**
- * Constants for orientations (and alignments).<p>
- *
- * This class may not be instantiated.
- *
- * @version 1.0, Apr 11 1996
- * @author  David Geary
- */
-public class Orientation {
-    public static final Orientation BAD    = new Orientation();
-    public static final Orientation NORTH  = new Orientation();
-    public static final Orientation SOUTH  = new Orientation();
-    public static final Orientation EAST   = new Orientation();
-    public static final Orientation WEST   = new Orientation();
-    public static final Orientation CENTER = new Orientation();
-    public static final Orientation TOP    = new Orientation();
-    public static final Orientation LEFT   = new Orientation();
-    public static final Orientation RIGHT  = new Orientation();
-    public static final Orientation BOTTOM = new Orientation();
-
-    public static final Orientation HORIZONTAL = 
-        new Orientation();
-    public static final Orientation VERTICAL   = 
-        new Orientation();
-
-    static public Orientation fromString(String s) {
-        Orientation o = BAD;
-
-        if(s.equals("NORTH") || s.equals("north"))    o = NORTH;
-        else if(s.equals("SOUTH") || s.equals("south"))    
-            o = SOUTH;
-        else if(s.equals("EAST")  || s.equals("east"))     
-            o = EAST;
-        else if(s.equals("WEST")  || s.equals("west"))     
-            o = WEST;
-        else if(s.equals("CENTER") || s.equals("center"))   
-            o = CENTER;
-        else if(s.equals("TOP")   || s.equals("top"))      
-            o = TOP;
-        else if(s.equals("LEFT")  || s.equals("left"))     
-            o = LEFT;
-        else if(s.equals("RIGHT")  || s.equals("right"))    
-            o = RIGHT;
-        else if(s.equals("BOTTOM") || s.equals("bottom"))   
-            o = BOTTOM;
-        else if(s.equals("VERTICAL") || s.equals("vertical")) 
-            o = VERTICAL;
-        else if(s.equals("HORIZONTAL") || 
-                s.equals("horizontal"))
-          o = HORIZONTAL;
-
-        return o;
-    }
-    public String toString() {
-        String s = new String();
-
-        if(this == Orientation.NORTH) 
-            s = getClass().getName() + "=NORTH";
-        else if(this == Orientation.SOUTH)
-            s = getClass().getName() + "=SOUTH";
-        else if(this == Orientation.EAST)
-            s = getClass().getName() + "=EAST";
-        else if(this == Orientation.WEST)
-            s = getClass().getName() + "=WEST";
-        else if(this == Orientation.CENTER)
-            s = getClass().getName() + "=CENTER";
-        else if(this == Orientation.TOP)
-            s = getClass().getName() + "=TOP";
-        else if(this == Orientation.LEFT)
-            s = getClass().getName() + "=LEFT";
-        else if(this == Orientation.RIGHT)
-            s = getClass().getName() + "=RIGHT";
-        else if(this == Orientation.BOTTOM)
-            s = getClass().getName() + "=BOTTOM";
-        else if(this == Orientation.HORIZONTAL)
-            s = getClass().getName() + "=HORIZONTAL";
-        else if(this == Orientation.VERTICAL)
-            s = getClass().getName() + "=VERTICAL";
-        else if(this == Orientation.BAD)
-            s = getClass().getName() + "=BAD";
-
-        return s;
-    }
-    private Orientation() { }  // Defeat instantiation
-}
diff --git a/java/gjt/ProgressDialog.java b/java/gjt/ProgressDialog.java
deleted file mode 100644
index de7d4be1674..00000000000
--- a/java/gjt/ProgressDialog.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A dialog that uses a bargauge to indicate progress made on a
- * task that presumably takes some time to complete.
- *
- * ProgressDialog implements the singleton pattern:  clients
- * may only access the one and only ProgressDialog through the
- * static getProgressDialog() method.<p>
- *
- * <em>Note:  The 1.0.2 version of the AWT has introduced a
- * bug that breaks the ProgressDialog under Motif - the 
- * bargauge does not function.  This worked fine in 1.0.1.<em>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     GJTDialog
- * @see     Bargauge
- * @see     gjt.test.DialogTest
- */
-public class ProgressDialog extends GJTDialog {
-    static private ProgressDialog _theProgressDialog;
-    static private int     _preferredWidth  = 400;
-    static private int     _preferredHeight = 75;
-    static private Color   _color;
-    static private boolean _dialogUp;
-
-    private Bargauge bargauge;
-
-    static public ProgressDialog getProgressDialog(
-                                   Frame  frame,
-                                   String title,
-                                   Color  color){
-        if(_theProgressDialog == null) 
-            _theProgressDialog = new ProgressDialog(frame, 
-                                                    title, 
-                                                    color);
-        else {
-            _theProgressDialog.setTitle (title);
-            _theProgressDialog.reset    ();
-        }
-        return _theProgressDialog;
-    }
-    private ProgressDialog(Frame frame, 
-                           String title, 
-                           Color color) {
-        super(frame, title, null, true);
-        setLayout(new BorderLayout());
-        add("Center", bargauge = new Bargauge(color));
-        pack();
-    }
-    public void setPercentComplete(double percent) {
-        bargauge.setFillPercent(percent);
-        bargauge.fill();
-
-        if(percent == 100)
-            hide();
-    }
-    public void reset() {
-        bargauge.setFillPercent(0);
-    }
-    public Dimension preferredSize() {
-        return new Dimension(_preferredWidth, _preferredHeight);
-    }
-}
diff --git a/java/gjt/QuestionDialog.java b/java/gjt/QuestionDialog.java
deleted file mode 100644
index 042b491e178..00000000000
--- a/java/gjt/QuestionDialog.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A dialog that presents a prompt and a TextField into which 
- * a reply may be entered.  Comes complete with an Ok button 
- * and a Cancel button, whose uses will be left to the 
- * imagination.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     GJTDialog
- * @see     gjt.test.DialogTest
- */
-public class QuestionDialog extends GJTDialog {
-    static private int  _defaultTextFieldSize = 20;
-    private Button      okButton;
-    private Button      cancelButton;
-    private String      question;
-    private TextField   textField;
-    private boolean     wasCancelled;
-    private ButtonPanel buttonPanel = new ButtonPanel();
-
-    public QuestionDialog(Frame  frame, DialogClient client,
-                          String title, String       question,
-                          String initialResponse) {
-        this(frame, client, title, question, initialResponse, 
-             _defaultTextFieldSize);
-    }
-    public QuestionDialog(Frame  frame, DialogClient client,
-                          String title, String       question) {
-        this(frame, client, title,
-             question, null, _defaultTextFieldSize);
-    }
-    public QuestionDialog(Frame  frame, DialogClient client,
-                          String title, String       question, 
-                          int    textFieldSize) {
-        this(frame, client, title, 
-             question, null, textFieldSize);
-    }
-    public QuestionDialog(Frame  frame, DialogClient client, 
-                          String title, String       question,
-                          String initialResponse, 
-                          int textFieldSize) {
-        super(frame, title, client, true);
-
-        QuestionPanel questionPanel;
-
-        okButton     = buttonPanel.add("Ok");
-        cancelButton = buttonPanel.add("Cancel");
-
-        setLayout(new BorderLayout());
-        add("North", questionPanel = 
-            new QuestionPanel(this, question, 
-                              initialResponse, textFieldSize));
-        add("South", buttonPanel);
-        textField = questionPanel.getTextField();
-        pack();
-    }
-    public boolean action(Event event, Object what) {
-        if(event.target == cancelButton) wasCancelled = true;
-        else                             wasCancelled = false;
-
-        hide();
-        dispose();
-        client.dialogDismissed(this);
-        return true;
-    }
-    public void show() {
-        textField.requestFocus();
-        super.show();
-    }
-    public void returnInTextField() {
-        okButton.requestFocus();
-    }
-    public TextField getTextField() {
-        return textField;
-    }
-    public String getAnswer() {
-        return textField.getText();
-    }
-    public boolean wasCancelled() {
-        return wasCancelled;
-    }
-    private void setQuestion(String question) {
-        this.question = question;
-    }
-}
-
-class QuestionPanel extends Panel {
-    private TextField      field;
-    private QuestionDialog dialog;
-
-    public QuestionPanel(QuestionDialog dialog, 
-                         String question) {
-        this(dialog, question, null, 0);
-    }
-    public QuestionPanel(QuestionDialog dialog, String question,
-                         int columns) {
-        this(dialog, question, null, columns);
-    }
-    public QuestionPanel(QuestionDialog dialog, String question,
-                         String initialResponse, int cols) {
-        this.dialog = dialog;
-        setLayout(new RowLayout());
-        add(new Label(question));
-
-        if(initialResponse != null) {
-            if(cols != 0) 
-                add(field=new TextField(initialResponse, cols));
-            else          
-                add(field=new TextField(initialResponse));
-        }
-        else {
-            if(cols != 0) add(field = new TextField(cols));
-            else          add(field = new TextField());
-        }
-    }
-    public TextField getTextField() {
-        return field;
-    }
-    public boolean action(Event event, Object what) {
-        dialog.returnInTextField();
-        return false;
-    }
-    public Insets insets() {
-        return new Insets(10,10,10,10);
-    }
-}
diff --git a/java/gjt/RadioImageButtonPanelController.java b/java/gjt/RadioImageButtonPanelController.java
deleted file mode 100644
index 8dc34d25bff..00000000000
--- a/java/gjt/RadioImageButtonPanelController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * A controller for an ImageButtonPanel that ensures that only 
- * one ImageButton in its associated ImageButtonPanel is 
- * selected at a time.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButtonPanelController
- * @see     ImageButton
- * @see     ImageButtonPanel
- * @see     gjt.test.ToolbarTest
- */
-class RadioImageButtonPanelController 
-                 extends ImageButtonPanelController {
-    ImageButton down;
-
-    public RadioImageButtonPanelController(
-                ImageButtonPanel panel) {
-        super(panel);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        ImageButton button;
-
-        if(event.target instanceof ImageButton) {
-            button = (ImageButton)event.target;
-            if(down == button) return false;
-
-            if(down != null)
-                down.paintRaised();
-
-            down = button;
-        }
-        return false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        return false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        return false;
-    }
-}
diff --git a/java/gjt/RowLayout.java b/java/gjt/RowLayout.java
deleted file mode 100644
index eecd074c34f..00000000000
--- a/java/gjt/RowLayout.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * RowLayout lays out components in a row.  At construction 
- * time, both horizontal orientation and vertical orientation 
- * may be specified, along with the gap to use between 
- * components.<p>
- *
- * Horizontal orientation must be one of the following:
- * <dl>
- * <dd> LEFT 
- * <dd> CENTER  
- * <dd> RIGHT
- * </dl>
- *
- * Vertical orientation must be one of the following:
- * <dl>
- * <dd> TOP
- * <dd> CENTER  
- * <dd> BOTTOM
- * </dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ColumnLayout
- * @see     Orientation
- */
-public class RowLayout implements LayoutManager {
-    static private int _defaultGap = 5;
-
-    private int gap;
-    private Orientation verticalOrientation;
-    private Orientation horizontalOrientation;
-
-    public RowLayout() {
-        this(Orientation.CENTER, 
-             Orientation.CENTER, _defaultGap);
-    }
-    public RowLayout(int gap) {
-        this(Orientation.CENTER, Orientation.CENTER, gap);
-    }
-    public RowLayout(Orientation horizontalOrient, 
-                     Orientation verticalOrient) {
-        this(horizontalOrient, verticalOrient, _defaultGap);
-    }
-    public RowLayout(Orientation horizontalOrient, 
-                     Orientation verticalOrient, int gap) {
-        Assert.notFalse(gap >= 0);
-        Assert.notFalse(
-            horizontalOrient == Orientation.LEFT   ||
-            horizontalOrient == Orientation.CENTER ||
-            horizontalOrient == Orientation.RIGHT);
-        Assert.notFalse(
-            verticalOrient   == Orientation.TOP    ||
-            verticalOrient   == Orientation.CENTER ||
-            verticalOrient   == Orientation.BOTTOM);
-
-        this.gap                   = gap;
-        this.verticalOrientation   = verticalOrient;
-        this.horizontalOrientation = horizontalOrient;
-    }
-
-    public void addLayoutComponent(String name, Component comp) {
-    }
-    public void removeLayoutComponent(Component comp) {
-    }
-
-    public Dimension preferredLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.preferredSize();
-
-                dim.width  += d.width;
-                dim.height  = Math.max(d.height, dim.height);
-
-                if(i > 0) dim.width += gap;
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top + insets.bottom;
-
-        return dim;
-    }
-    public Dimension minimumLayoutSize(Container target) {
-        Insets    insets      = target.insets();
-        Dimension dim         = new Dimension(0,0);
-        int       ncomponents = target.countComponents();
-        Component comp;
-        Dimension d;
-
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                d = comp.minimumSize();
-
-                dim.width  += d.width;
-                dim.height  = Math.max(d.height, dim.height);
-
-                if(i > 0) dim.width += gap;
-            }
-        }
-        dim.width  += insets.left + insets.right;
-        dim.height += insets.top + insets.bottom;
-
-        return dim;
-    }
-    public void layoutContainer(Container target) {
-        Insets    insets      = target.insets();
-        int       ncomponents = target.countComponents();
-        int       top         = 0;
-        int       left        = insets.left;
-        Dimension tps         = target.preferredSize();
-        Dimension targetSize  = target.size();
-        Component comp;
-        Dimension ps;
-
-        if(horizontalOrientation == Orientation.CENTER)
-            left = left + (targetSize.width/2) - (tps.width/2);
-        if(horizontalOrientation == Orientation.RIGHT)
-            left = left + targetSize.width - tps.width;
-        
-        for (int i = 0 ; i < ncomponents ; i++) {
-            comp = target.getComponent(i);
-
-            if(comp.isVisible()) {
-                ps  = comp.preferredSize();
-
-                if(verticalOrientation == Orientation.CENTER)
-                    top = (targetSize.height/2) - (ps.height/2);
-                else if(verticalOrientation == Orientation.TOP)
-                    top = insets.top;
-                else if(
-                    verticalOrientation == Orientation.BOTTOM)
-                    top = targetSize.height - 
-                          ps.height - insets.bottom;
-
-                comp.reshape(left,top,ps.width,ps.height);
-                left += ps.width + gap;
-            }
-        }
-    }
-}
diff --git a/java/gjt/Scroller.java b/java/gjt/Scroller.java
deleted file mode 100644
index 61d6e5f55e5..00000000000
--- a/java/gjt/Scroller.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Each Scroller contains a Panel (viewport) and two Scrollbars 
- * (horizontal and vertical).  Works in conjunction with a 
- * ScrollerLayout, that lays out the viewport and two 
- * scrollbars.<p>
- * 
- * Subclasses must override:<p>
- * <dl>
- * <dd> abstract public void      scrollTo(int x, int y)
- * <dd> abstract public Dimension getScrollAreaSize()
- * </dl>
- * 
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ComponentScroller
- * @see     ImageScroller
- * @see     ScrollerLayout
- * @see     gjt.test.ComponentScrollerTest
- * @see     gjt.test.ImageScrollerTest
- */
-public abstract class Scroller extends Panel {
-    protected Panel     viewport;
-    protected Scrollbar hbar, vbar;
-
-    abstract public void      scrollTo(int x, int y);
-    abstract public Dimension getScrollAreaSize();
-
-    public Scroller() {
-        setLayout(new ScrollerLayout(this));
-        add("Scroll", viewport = new Panel());
-        add("East", vbar = new Scrollbar(Scrollbar.VERTICAL));
-        add("South",hbar = new Scrollbar(Scrollbar.HORIZONTAL));
-    }
-    public Scrollbar getHorizontalScrollbar() {return hbar;    }
-    public Scrollbar getVerticalScrollbar  () {return vbar;    }
-    public Panel     getViewport           () {return viewport;}
-
-    public boolean handleEvent(Event event) {
-        boolean handledEvent;
-
-        switch(event.id) {
-            case Event.SCROLL_LINE_UP:   scrollLineUp(event); 
-            break;
-            case Event.SCROLL_LINE_DOWN: scrollLineDown(event); 
-            break;
-            case Event.SCROLL_PAGE_UP:   scrollPageUp  (event); 
-            break;
-            case Event.SCROLL_PAGE_DOWN: scrollPageDown(event); 
-            break;
-            case Event.SCROLL_ABSOLUTE:  scrollAbsolute(event); 
-            break;
-        }
-        handledEvent = event.id == Event.SCROLL_LINE_UP   ||
-                       event.id == Event.SCROLL_LINE_DOWN ||
-                       event.id == Event.SCROLL_PAGE_UP   ||
-                       event.id == Event.SCROLL_PAGE_DOWN ||
-                       event.id == Event.SCROLL_ABSOLUTE;
-
-        if(handledEvent) return true;
-        else             return super.handleEvent(event);
-    }
-    public void paint (Graphics g) { scroll(); }
-    public void update(Graphics g) { paint(g); }
-
-    public void manageScrollbars() { 
-        manageHorizontalScrollbar();
-        manageVerticalScrollbar  ();
-    }
-    protected void manageHorizontalScrollbar() {
-        Dimension size           = size();
-        Dimension scrollAreaSize = getScrollAreaSize();
-
-        if(vbar.isVisible())
-            size.width -= vbar.size().width;
-
-        if(scrollAreaSize.width > size.width) {
-            if( ! hbar.isVisible())
-                hbar.show();
-        }
-        else if(hbar.isVisible()) {
-            hbar.hide();
-            hbar.setValue(0);
-            repaint();
-        }
-    }
-    protected void manageVerticalScrollbar() {
-        Dimension size           = size();
-        Dimension scrollAreaSize = getScrollAreaSize();
-
-        if(hbar.isVisible())
-            size.height -= hbar.size().height;
-
-        if(scrollAreaSize.height > size.height) {
-            if( ! vbar.isVisible())
-                vbar.show();
-        }
-        else if(vbar.isVisible()) {
-            vbar.hide();
-            vbar.setValue(0);
-            repaint();
-        }
-    }
-    public void setScrollbarValues() {
-        if(hbar.isVisible()) setHorizontalScrollbarValues();
-        if(vbar.isVisible()) setVerticalScrollbarValues();
-    }
-    protected void setHorizontalScrollbarValues() {
-        Dimension vsize          = viewport.size();
-        Dimension scrollAreaSize = getScrollAreaSize(); 
-        int max = scrollAreaSize.width - vsize.width;
-
-        hbar.setValues(hbar.getValue(), // value
-                       vsize.width,     // amt visible/page
-                       0,               // minimum
-                       max);            // maximum
-
-        setHorizontalLineAndPageIncrements();
-    }
-    protected void setVerticalScrollbarValues() {
-        Dimension vsize          = viewport.size();
-        Dimension scrollAreaSize = getScrollAreaSize(); 
-        int max = scrollAreaSize.height - vsize.height;
-
-        vbar.setValues(vbar.getValue(), // value
-                       vsize.height,    // amt visible/page
-                       0,               // minimum
-                       max);            // maximum
-
-        setVerticalLineAndPageIncrements();
-    }
-    protected void scrollLineUp  (Event event) { scroll(); }
-    protected void scrollLineDown(Event event) { scroll(); }
-    protected void scrollPageUp  (Event event) { scroll(); }
-    protected void scrollPageDown(Event event) { scroll(); }
-    protected void scrollAbsolute(Event event) { scroll(); }
-
-    protected void setHorizontalLineAndPageIncrements() {
-        Dimension size = getScrollAreaSize();
-        hbar.setLineIncrement(size.width/10);
-        hbar.setPageIncrement(size.width/5);
-    }
-    protected void setVerticalLineAndPageIncrements() {
-        Dimension size = getScrollAreaSize();
-        vbar.setLineIncrement(size.height/10);
-        vbar.setPageIncrement(size.height/5);
-    }
-    protected void scroll() {
-        scrollTo(hbar.getValue(), vbar.getValue());
-    }
-}
diff --git a/java/gjt/ScrollerLayout.java b/java/gjt/ScrollerLayout.java
deleted file mode 100644
index 21012fd5688..00000000000
--- a/java/gjt/ScrollerLayout.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Layout manager for a Scroller.<p>
- *
- * Lays out 3 Components:  a horizontal scrollbar, a vertical 
- * scrollbar and a viewport (Panel).<p>
- *
- * Valid names/Component pairs that can be added via 
- * addLayoutComponent(String, Component):<p>
- * <dl>
- * <dd> "East"   Scrollbar (vertical)
- * <dd> "West"   Scrollbar (vertical)
- * <dd> "North"  Scrollbar (horizontal)
- * <dd> "South"  Scrollbar (horizontal)
- * <dd> "Scroll" Panel (viewport)
- * </dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Scroller
- */
-public class ScrollerLayout implements LayoutManager {
-    private Scroller  scroller;
-    private Scrollbar hbar, vbar;
-    private String    hbarPosition, vbarPosition;
-    private Component viewport;
-    private int       top, bottom, right, left;
-
-    public ScrollerLayout(Scroller scroller) {
-        this.scroller = scroller;
-    }
-
-    public void addLayoutComponent(String name, 
-                                   Component comp) {
-        Assert.notFalse(comp != null);
-
-        if(comp instanceof Scrollbar) {
-            Scrollbar sbar = (Scrollbar)comp;
-
-            if(sbar.getOrientation() == Scrollbar.VERTICAL) {
-                Assert.notFalse("East".equals(name) == true ||
-                                "West".equals(name) == true);
-                vbar         = sbar;
-                vbarPosition = name;
-            }
-            else {
-                Assert.notFalse("North".equals(name) == true ||
-                                "South".equals(name) == true);
-                hbar         = sbar;
-                hbarPosition = name;
-            }
-        }
-        else {
-            Assert.notFalse("Scroll".equals(name) == true);
-            viewport = comp;
-        }
-    }
-    public void removeLayoutComponent(Component comp) {
-        if(comp == vbar)     vbar     = null;
-        if(comp == hbar)     hbar     = null;
-        if(comp == viewport) viewport = null;
-    }
-    public Dimension preferredLayoutSize(Container parent) {
-        Dimension dim = new Dimension(0,0);
-
-        if(vbar != null && vbar.isVisible()) {
-            Dimension d = vbar.preferredSize();
-            dim.width += d.width;
-            dim.height = d.height;
-        }
-        if(hbar != null && hbar.isVisible()) {
-            Dimension d = hbar.preferredSize();
-            dim.width += d.width;
-            dim.height = Math.max(d.height, dim.height);
-        }
-        if(viewport != null && viewport.isVisible()) {
-            Dimension d = viewport.preferredSize();
-            dim.width += d.width;
-            dim.height = Math.max(d.height, dim.height);
-        }
-        return dim;
-    }
-    public Dimension minimumLayoutSize(Container parent) {
-        Dimension dim = new Dimension(0,0);
-
-        if(vbar != null && vbar.isVisible()) {
-            Dimension d = vbar.minimumSize();
-            dim.width += d.width;
-            dim.height = d.height;
-        }
-        if(hbar != null && hbar.isVisible()) {
-            Dimension d = hbar.minimumSize();
-            dim.width += d.width;
-            dim.height = Math.max(d.height, dim.height);
-        }
-        if(viewport != null && viewport.isVisible()) {
-            Dimension d = viewport.minimumSize();
-            dim.width += d.width;
-            dim.height = Math.max(d.height, dim.height);
-        }
-        return dim;
-    }
-    public void layoutContainer(Container target) {
-        Insets insets        = target.insets();
-        Dimension targetSize = target.size();
-
-        top    = insets.top;
-        bottom = targetSize.height - insets.bottom;
-        left   = insets.left;
-        right  = targetSize.width - insets.right;
-
-        scroller.manageScrollbars();
-
-        reshapeHorizontalScrollbar();
-        reshapeVerticalScrollbar  ();
-        reshapeViewport           ();
-
-        scroller.setScrollbarValues();
-    }
-    private void reshapeHorizontalScrollbar() {
-        if(hbar != null && hbar.isVisible()) {
-            if("North".equals(hbarPosition)) {
-                Dimension d = hbar.preferredSize();
-                hbar.reshape(left, top, right - left, d.height);
-                top += d.height;
-            }
-            else {  // South
-                Dimension d = hbar.preferredSize();
-                hbar.reshape(left, bottom - d.height,
-                            right - left,d.height);
-                bottom -= d.height;
-            }
-        }
-    }
-    private void reshapeVerticalScrollbar() {
-        if(hbar != null && vbar.isVisible()) {
-            if("East".equals(vbarPosition)) {
-                Dimension d = vbar.preferredSize();
-                vbar.reshape(right - d.width, top, 
-                             d.width, bottom - top);
-                right -= d.width;
-            }
-            else { // West
-                Dimension d = vbar.preferredSize();
-                vbar.reshape(left, top, 
-                             d.width, bottom - top);
-                left += d.width;
-            }
-        }
-    }
-    private void reshapeViewport() {
-        if(viewport != null && viewport.isVisible()) {
-            viewport.reshape(left, top, 
-                             right - left, bottom - top);
-        }
-    }
-}
diff --git a/java/gjt/SelectionEvent.java b/java/gjt/SelectionEvent.java
deleted file mode 100644
index 4bcab59cd0a..00000000000
--- a/java/gjt/SelectionEvent.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * An extension of java.awt.Event, specifically designed for
- * selection events.<p>
- *
- * SelectionEvents are constructed with arguments:<p>
- * <dl>
- * <dd> The AWT event that triggered the image button event
- * <dd> The id of the event.
- * </dl>
- *
- * An SelectionEvent's id (the constructor's 3rd argument),
- * must be one of the following:<p>
- * <dl>
- * <dd> SelectionEvent.SELECT
- * <dd> SelectionEvent.DESELECT
- * </dl>
- *
- * SelectionEvent has only a constructor and a paramString() 
- * method.  Containers that contain objects which are capable
- * of generating SelectionEvents should check the events
- * like so:
- * 
- * <pre>
- *      // handleEvent(Event) method of a container that
- *      // contain objects that generate SelectionEvents
- *
- *      public boolean handleEvent(Event event) {
- *              if(event instanceof SelectionEvent) {
- *                  SelectionEvent sevent = 
- *                  (SelectionEvent)event;
- *
- *                  if(sevent.isSelected()) {
- *                      // do something for selection
- *                  }
- *                  else {
- *                      // do something for deselection
- *                  }
- *              }
- *      }
- * </pre>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     LabelCanvas
- * @see     ImageButtonEvent
- * @see     gjt.test.LabelCanvasTest
- */
-public class SelectionEvent extends Event {
-    public static final int SELECT   = 1;
-    public static final int DESELECT = 2;
-
-    private int eventType;
-
-    public SelectionEvent(Object target,
-                          Event  event, 
-                          int    type) {
-        super(target, event.when, event.id, event.x, event.y,
-                      event.key,  event.modifiers, event.arg);
-
-        Assert.notFalse(type == SELECT || type == DESELECT);
-
-        eventType = type;
-        id = -1;
-    }
-    public boolean isSelected() {
-        return eventType == SELECT;
-    }
-    protected String paramString() {
-        String typeString = new String();
-
-        if(eventType == SelectionEvent.SELECT)    
-            typeString = "SELECT";
-        else if(eventType == SelectionEvent.DESELECT) 
-            typeString = "DESELECT";
-
-        return super.paramString() + typeString;
-    }
-}
diff --git a/java/gjt/Separator.java b/java/gjt/Separator.java
deleted file mode 100644
index 6bd610e1ad9..00000000000
--- a/java/gjt/Separator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A separator that is drawn either vertically or horizontally 
- * depending upon how it is laid out.  Can be drawn either 
- * etched-in or etched-out, with varying thicknesses.  Both 
- * thickness and etching are settable at construction time 
- * only.<p>
- *
- * Default thickness is 2 pixels and default etching is 
- * Etching.IN.  Note that thicknesses greater than 4 loose the 
- * etching effect.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Etching
- * @see     gjt.test.SeparatorTest
- */
-public class Separator extends Canvas {
-    static private Etching _defaultEtching   = Etching.IN;
-    static private int     _defaultThickness = 2;
-
-    private Etching etching;
-    private int     thickness;
-
-    public Separator() {
-        this(_defaultThickness, _defaultEtching);
-    }
-    public Separator(int thickness) {
-        this(thickness, _defaultEtching);
-    }
-    public Separator(Etching etching) {
-        this(_defaultThickness, etching);
-    }
-    public Separator(int thickness, Etching etching) {
-        this.etching   = etching;
-        this.thickness = thickness;
-        resize(thickness, thickness);
-    }
-    public Dimension minimumSize() {
-        return preferredSize();
-    }
-    public Dimension preferredSize() {
-        return new Dimension(thickness, thickness);
-    }
-    public void paint(Graphics g) {
-        Dimension size     = size();
-        Color brighter = getBackground().brighter().brighter();
-        Color darker   = getBackground().darker().darker();
-
-        if(etching == Etching.IN) {
-            if(size.width > size.height)
-                paintHorizontal(g, size, darker, brighter);
-            else
-                paintVertical(g, size, darker, brighter);
-        }
-        else {
-            if(size.width > size.height)
-                paintHorizontal(g, size, brighter, darker);
-            else
-                paintVertical(g, size, brighter, darker);
-        }
-    }
-    public String paramString() {
-        Dimension   size = size();
-        Orientation orient = size.width > size.height ? 
-                             Orientation.HORIZONTAL :
-                             Orientation.VERTICAL;
-        return super.paramString() + "thickness=" + 
-               thickness + "," + etching + "," + orient;
-    }
-    private void paintHorizontal(Graphics g, Dimension size, 
-                                 Color top, Color bottom) {
-        g.setColor(top);
-        g.fillRect(0, (size.height/2) - (thickness/2), 
-                       size.width, thickness/2);
-        g.setColor(bottom);
-        g.fillRect(0, size.height/2, size.width, thickness/2); 
-    }
-    private void paintVertical(Graphics g, Dimension size, 
-                               Color left, Color right) {
-        g.setColor(left);
-        g.fillRect((size.width/2) - (thickness/2), 
-                    0, thickness/2, size.height);
-        g.setColor(right);
-        g.fillRect(size.width/2, 0, thickness/2, size.height);
-    }
-}
diff --git a/java/gjt/SpringyImageButtonController.java b/java/gjt/SpringyImageButtonController.java
deleted file mode 100644
index 3559e040459..00000000000
--- a/java/gjt/SpringyImageButtonController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-import java.awt.Graphics;
-
-/**
- * An ImageButtonController that reacts to mouseDown/mouseUp 
- * events exactly as a java.awt.Button does.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonController
- * @see     StickyImageButtonController
- */
-public class SpringyImageButtonController 
-                extends ImageButtonController {
-    public SpringyImageButtonController(ImageButton ib) {
-        super(ib);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(event.modifiers == 0) {
-            getButton().paintInset();
-            armButton(event);
-        }
-        return false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        if(event.modifiers == 0) { 
-            if(getButton().isRaised() == false) {
-                getButton().paintRaised();
-                activateButton(event);
-            }
-        }
-        return false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        if(event.modifiers == 0) { 
-            if(getButton().isInside(x,y)) {
-                if(getButton().isRaised()) {
-                    getButton().paintInset();
-                    armButton(event);
-                }
-            }
-            else {
-                if(getButton().isRaised() == false) {
-                    getButton().paintRaised();
-                    disarmButton(event);
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/java/gjt/StateButton.java b/java/gjt/StateButton.java
deleted file mode 100644
index 6de20a76f98..00000000000
--- a/java/gjt/StateButton.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package gjt;
-
-import java.awt.Image;
-
-/**
- * An ImageButton that cycles through a series of images.  The 
- * image advances to the next image in the series every time 
- * the button is activated.<p>
- *
- * Note that the cycling is actually performed by the buttons' 
- * controller - a StateButtonController.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     StateButtonController
- * @see     gjt.test.StateButtonTest
- */
-public class StateButton extends ImageButton {
-    private Image[] images;
-    private int     state = 0;
-    private int     numStates;
-
-    public StateButton(Image[] images) {
-        super(images[0]);
-
-        this.images = images;
-        numStates   = images.length;
-        setController(new StateButtonController(this));
-        waitForImages();
-    }
-    public Image nextImage() {
-        if(state + 1 < numStates) state++;
-        else                      state = 0;
-
-        return images[state];
-    }
-    public int state() {
-        return state;
-    }
-    private void waitForImages() {
-        for(int i=0; i < images.length; ++i)
-            Util.waitForImage(this, images[i]);
-    }
-}
diff --git a/java/gjt/StateButtonController.java b/java/gjt/StateButtonController.java
deleted file mode 100644
index d6fc83830a6..00000000000
--- a/java/gjt/StateButtonController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-
-/**
- * A controller for a StateButton, that cycles through a 
- * series of images which reside in the StateButton class.  
- * Each time a mouse up is detected in the StateButton, the 
- * buttons image is set to the next image in the array.
- * 
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     StateButton
- * @see     SpringyImageButtonController
- * @see     gjt.test.StateButtonTest
- */
-class StateButtonController extends SpringyImageButtonController {
-    public StateButtonController(StateButton button) {
-        super(button);
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        StateButton button = (StateButton)getButton();
-        button.setImage(button.nextImage());
-        activateButton(event);
-        return super.mouseUp(event, x, y);
-    }
-}
diff --git a/java/gjt/StickyImageButtonController.java b/java/gjt/StickyImageButtonController.java
deleted file mode 100644
index c459e5cdae1..00000000000
--- a/java/gjt/StickyImageButtonController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package gjt;
-
-import java.awt.Event;
-import java.awt.Graphics;
-
-/**
- * An ImageButtonController that causes its associated 
- * ImageButton to "stick" when activated.  If the ImageButton 
- * is raised it depresses<b>[1]</b> upon a mouse down and stays 
- * down upon a subsequent mouse up event.  The same "sticky" 
- * behaviour occurs when a depressed ImageButton encounters a 
- * mouse down followed by a subsequent mouse up.<p>
- *
- * Note that false is returned from mouse event handlers; 
- * therefore mouse events will be propagated to the 
- * ImageButton's container.  While this is not always 
- * desirable, it was deemed a better default than swallowing 
- * the event here.  Subclasses may, of course, modify this 
- * behavior.<p>
- * 
- * <b>[1]</b> No psychiatric consultation is necessary.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonController
- * @see     SpringyImageButtonController
- */
-public class StickyImageButtonController 
-                    extends ImageButtonController {
-    private boolean buttonUpOnLastMouseDown = true;
-
-    public StickyImageButtonController(ImageButton ib) {
-        super(ib);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        ImageButton button = getButton();
-
-        if(event.modifiers == 0) {  
-            if(button.isRaised()) button.paintInset();
-            else                  button.paintRaised();
-
-            buttonUpOnLastMouseDown = getButton().isRaised();
-            armButton(event);
-        }
-        return false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        activateButton(event);
-        return false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        ImageButton button = getButton();
-
-        if(event.modifiers == 0) {  
-            if(button.isInside(x,y)) {
-                if(buttonUpOnLastMouseDown) {
-                    if(button.isRaised() == false) {
-                        button.paintRaised();
-                        armButton(event);
-                    }
-                }
-                else {
-                    if(button.isRaised()) {
-                        button.paintInset();
-                        armButton(event);
-                    }
-                }
-            }
-            else {
-                if(buttonUpOnLastMouseDown) {
-                    if(button.isRaised()) {
-                        button.paintInset();
-                        disarmButton(event);
-                    }
-                }
-                else {
-                    if(button.isRaised() == false) {
-                        button.paintRaised();
-                        disarmButton(event);
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/java/gjt/Stopwatch.java b/java/gjt/Stopwatch.java
deleted file mode 100644
index fc8963e88a1..00000000000
--- a/java/gjt/Stopwatch.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A Thread that acts as a stopwatch.<p>
- *
- * Stopwatch starts running when it is constructed, and may be 
- * reset by the reset() method.  getHour(), getMinute(), 
- * getSecond(), and getMillisecond() are used to get the 
- * elapsed time since construction, or since the last reset.<p>
- *
- * toString() returns the elapsed time in the form of 
- * HH:MM:SS:mm, where HH == hours, MM == minutes, SS == seconds 
- * and mm == milliseconds.<p>
- *
- * Each Stopwatch may have a StopwatchClient associated with it.
- * If the StopwatchClient is non-null, the StopwatchClients' 
- * tick() method is invoked every 50 milliseconds.<p>
- *
- * @version 1.0, Apr 21 1996
- * @author  David Geary
- * @see     StopwatchClient
- * @see     gjt.animation.Sequence
- * @see     gjt.animation.Sprite
- */
-public class Stopwatch extends Thread {
-    private StopwatchClient client;
-    private long            start, now, elapsed;
-    private long            hour, minute, second, millisecond;
-
-    public Stopwatch() {
-        this(null);
-    }
-    public Stopwatch(StopwatchClient client) {
-        start       = System.currentTimeMillis();
-        this.client = client;
-    }
-    public void update() {
-        now     = System.currentTimeMillis();
-        elapsed = now - start;
-        hour    = minute = second = millisecond = 0;
-
-        second = elapsed / 1000;
-        millisecond  = elapsed % 1000;
-        millisecond  = (millisecond == 0) ? 0 : millisecond/10;
-
-        if(second > 59) {
-            minute = second / 60;
-            second = second - (minute*60);
-        }
-        if(minute > 59) {
-            hour   = minute / 60;
-            minute = minute - (hour*60);
-        }
-    }
-    public String toString() {
-        update();
-        return new String(stringValueOf(hour)   + ":" + 
-                          stringValueOf(minute) + ":" + 
-                          stringValueOf(second) + ":" +
-                          stringValueOf(millisecond));
-    }
-    public long getHour        () { return hour;        }
-    public long getMinute      () { return minute;      }
-    public long getSecond      () { return second;      }
-    public long getMillisecond () { return millisecond; }
-
-    public long elapsedTime() { 
-        update();
-        return elapsed;
-    }
-    public void reset() {
-        start = System.currentTimeMillis();
-    }
-    public void run() {
-        while(true) {
-            try {
-                Thread.currentThread().sleep(50, 0);
-                update();
-                if(client != null)
-                    client.tick();
-            }
-            catch(InterruptedException e) {
-                Assert.notFalse(false);
-            }
-        }
-    }
-    private String stringValueOf(long l) {
-        if(l < 10) return "0" + String.valueOf(l);
-        else       return String.valueOf(l);
-
-    }
-}
diff --git a/java/gjt/StopwatchClient.java b/java/gjt/StopwatchClient.java
deleted file mode 100644
index c2eb5fb0460..00000000000
--- a/java/gjt/StopwatchClient.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gjt;
-
-/**
- * Client of a Stopwatch.  Stopwatches that have non-null 
- * clients, call their clients' tick() method every 50 
- * milliseconds.<p>
- *
- * @version 1.0, Apr 21 1996
- * @author  David Geary
- * @see     Stopwatch
- */
-public interface StopwatchClient {
-    public void tick();
-}
diff --git a/java/gjt/ThreeDBorder.java b/java/gjt/ThreeDBorder.java
deleted file mode 100644
index 0441fdf3052..00000000000
--- a/java/gjt/ThreeDBorder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Extension of Border that draws a 3D border.
- * 
- * Drawn raised by default, drawing style used by paint() is 
- * controlled by raise() and inset().  Note that raise() and 
- * inset() do not result in anything being painted, but only set
- * the state for the next call to paint().  To set the state and
- * paint in one operation, use paintRaised() and paintInset().
- * <p>
- *
- * The current state of the border may be obtained by calling 
- * isRaised().<p>
- *
- * @version 1.0, Apr 1 1996 
- * @author  David Geary   
- * @see     Border
- * @see     EtchedRectangle
- * @see     gjt.test.BorderTest
- */ 
-public class ThreeDBorder extends Border {
-    public ThreeDBorder(Component borderMe) {
-        this(borderMe, _defaultThickness, _defaultGap); 
-    }
-    public ThreeDBorder(Component borderMe, 
-                        int borderThickness) {
-        this(borderMe, borderThickness, _defaultGap);
-    }
-    public ThreeDBorder(Component borderMe, 
-                        int borderThickness, int gap) {
-        super(borderMe, borderThickness, gap);
-    }
-    public void inset() { ((ThreeDRectangle)border()).inset(); }
-    public void raise() { ((ThreeDRectangle)border()).raise(); }
-
-    public void paintRaised() { 
-        ((ThreeDRectangle)border()).paintRaised(); 
-    }
-    public void paintInset() { 
-        ((ThreeDRectangle)border()).paintInset (); 
-    }
-    public boolean isRaised() { 
-        return ((ThreeDRectangle)border()).isRaised();
-    }
-    protected DrawnRectangle border() {
-        if(border == null)
-            border = new ThreeDRectangle(this, thickness);
-        return border;
-    }
-}
diff --git a/java/gjt/ThreeDBorderStyle.java b/java/gjt/ThreeDBorderStyle.java
deleted file mode 100644
index b0e1b7d8ab8..00000000000
--- a/java/gjt/ThreeDBorderStyle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package gjt;
-
-/**
- * Constants for 3D border styles.
- *
- * This class may not be instantiated.
- *
- * @version 1.0, Apr 11 1996
- * @author  David Geary
- */
-public class ThreeDBorderStyle {
-    public static final ThreeDBorderStyle RAISED = 
-                            new ThreeDBorderStyle();
-    public static final ThreeDBorderStyle INSET  = 
-                            new ThreeDBorderStyle();
-
-    public String toString() {
-        if(this == ThreeDBorderStyle.RAISED) 
-            return getClass().getName() + "=RAISED";
-        else                      
-            return getClass().getName() + "=INSET";
-    }
-    private ThreeDBorderStyle() { }  // defeat instantiation
-}
diff --git a/java/gjt/ThreeDRectangle.java b/java/gjt/ThreeDRectangle.java
deleted file mode 100644
index 647129190c5..00000000000
--- a/java/gjt/ThreeDRectangle.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A DrawnRectangle which draws in 3D.<p>
- *
- * Drawn raised by default, drawing style used by paint() is 
- * controlled by raise() and inset().  Note that raise() and 
- * inset() do not result in anything being painted, but only set
- * the state for the next call to paint().  To set the state and
- * paint in one operation, use paintRaised() and paintInset().
- * <p>
- *
- * The current state of the rectangle may be obtained by 
- * calling isRaised().<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     DrawnRectangle
- * @see     EtchedRectangle
- * @see     gjt.test.DrawnRectangleTest
- */
-public class ThreeDRectangle extends DrawnRectangle {
-    protected static ThreeDBorderStyle 
-                      _defaultState = ThreeDBorderStyle.RAISED;
-
-    private ThreeDBorderStyle state;
-
-    public ThreeDRectangle(Component drawInto) {
-        this(drawInto, _defaultState, 
-             _defaultThickness, 0, 0, 0, 0);
-    }
-    public ThreeDRectangle(Component drawInto, int thickness) {
-        this(drawInto, _defaultState, thickness, 0, 0, 0, 0);
-    }
-    public ThreeDRectangle(Component drawInto, 
-                           int x, int y, int w, int h) {
-        this(drawInto, 
-             _defaultState, _defaultThickness, x, y, w, h);
-    }
-    public ThreeDRectangle(Component drawInto, int thickness,
-                                               int x, int y, 
-                                               int w, int h) {
-        this(drawInto, _defaultState, thickness, x, y, w, h);
-    }
-    public ThreeDRectangle(Component drawInto, 
-                           ThreeDBorderStyle state, 
-                           int thickness, int x, int y, 
-                           int w, int h) {
-        super(drawInto, thickness, x, y, w, h);
-        this.state = state;
-    }
-    public void paint() {
-        if(state == ThreeDBorderStyle.RAISED) paintRaised();
-        else                                  paintInset ();
-    }
-    public void raise() { state = ThreeDBorderStyle.RAISED; }
-    public void inset() { state = ThreeDBorderStyle.INSET;  }
-
-    public boolean isRaised() { 
-        return state == ThreeDBorderStyle.RAISED; 
-    }
-    public String paramString() {
-        return super.paramString() + "," + state;
-    }
-    public void paintRaised() {
-        Graphics g = drawInto.getGraphics();
-
-        if(g != null) {
-            raise               ();
-            drawTopLeftLines    (g, brighter());
-            drawBottomRightLines(g, getLineColor());
-        }
-    }    
-    public void paintInset() {
-        Graphics g = drawInto.getGraphics();
-
-        if(g != null) {
-            inset               ();
-            drawTopLeftLines    (g, getLineColor());
-            drawBottomRightLines(g, brighter());
-        }
-    }
-    private void drawTopLeftLines(Graphics g, Color color) {
-        int thick = getThickness();
-        g.setColor(color);
-
-        for(int i=0; i < thick; ++i) {
-            g.drawLine(x+i, y+i,   x + width-(i+1), y+i);
-            g.drawLine(x+i, y+i+1, x+i, y + height-(i+1));  
-        }
-    }
-    private void drawBottomRightLines(Graphics g, Color color) {
-        int thick = getThickness();
-        g.setColor(color);
-
-        for(int i=1; i <= thick; ++i) {
-            g.drawLine(x+i-1, y + height-i, 
-                       x + width-i, y + height-i);
-            g.drawLine(x + width-i, y+i-1,        
-                       x + width-i, y + height-i);
-        }
-    }
-}
diff --git a/java/gjt/Toolbar.java b/java/gjt/Toolbar.java
deleted file mode 100644
index 4d6ebddc217..00000000000
--- a/java/gjt/Toolbar.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * A toolbar containing image buttons which are laid out to the
- * north of (horizontal) separator.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ImageButton
- * @see     ImageButtonPanel
- * @see     gjt.test.ToolbarTest
- */
-public class Toolbar extends Panel {
-    static private int _defaultGap       = 0;
-    static private int _defaultLeftInset = 0;
-
-    private ToolbarButtonPanel buttonPanel;
-
-    public Toolbar() {
-        this(_defaultLeftInset, _defaultGap);
-    }
-    public Toolbar(int leftInset, int gap) {
-        buttonPanel = new ToolbarButtonPanel(leftInset, gap);
-        
-        setLayout(new BorderLayout());
-        add      ("North", buttonPanel);
-        add      ("South", new Separator());
-    }
-    public ImageButton add(Image image) {
-        return buttonPanel.add(image);
-    }
-    public void add(ImageButton button) {
-        buttonPanel.add(button);      
-    }
-    public void addSpacer(int sizeInPixels) {
-        Assert.notFalse(sizeInPixels > 0);
-        buttonPanel.addSpacer(sizeInPixels);
-    }
-}
-
-class ToolbarButtonPanel extends ImageButtonPanel {
-    private int leftInset;
-
-    public ToolbarButtonPanel(int leftInset, int gap) {
-        super(Orientation.HORIZONTAL,
-              Orientation.LEFT,         
-              Orientation.CENTER,
-              gap);
-
-        this.leftInset = leftInset;
-        setController(null);
-    }
-    public Insets insets() {
-        return new Insets(5,leftInset,5,5);
-    }
-}
diff --git a/java/gjt/Util.java b/java/gjt/Util.java
deleted file mode 100644
index 0970a6fd488..00000000000
--- a/java/gjt/Util.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package gjt;
-
-import java.applet.Applet;
-import java.awt.*;
-
-/**
- * A handy collection of methods for getting a component's 
- * frame, getting a component's applet, waiting for a 
- * component's image, and wallpapering a components background.
- * <p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- */
-public class Util {
-    public static Frame getFrame(Component component) {
-        Component c = component;
-
-        if(c instanceof Frame)
-            return (Frame)c;
-
-        while((c = c.getParent()) != null) {
-            if(c instanceof Frame)
-                return (Frame)c;
-        }
-        return null;
-    }
-    public static Applet getApplet(Component component) {
-        Component c = component;
-
-        if(c instanceof Applet)
-            return (Applet)c;
-
-        while((c = c.getParent()) != null) {
-            if(c instanceof Applet)
-                return (Applet)c;
-        }
-        return null;
-    }
-    public static void waitForImage(Component component, 
-                                    Image image) {
-        MediaTracker tracker = new MediaTracker(component);
-        try {
-            tracker.addImage(image, 0);
-            tracker.waitForID(0);
-        }
-        catch(InterruptedException e) { Assert.notNull(null); }
-    }
-    public static void wallPaper(Component component, 
-                                 Graphics  g, 
-                                 Image     image) {
-        Dimension compsize = component.size();
-        Util.waitForImage(component, image);
-
-        int patchW = image.getWidth(component);
-        int patchH = image.getHeight(component);
-
-        Assert.notFalse(patchW != -1 && patchH != -1);
-
-        for(int r=0; r < compsize.width; r += patchW) {
-            for(int c=0; c < compsize.height; c += patchH)
-            g.drawImage(image, r, c, component);
-        }
-    }
-    public static void setCursor(int cursor, 
-                                 Component component) {
-        getFrame(component).setCursor(cursor);      
-    }
-}
diff --git a/java/gjt/YesNoDialog.java b/java/gjt/YesNoDialog.java
deleted file mode 100644
index 2db64ea6e4b..00000000000
--- a/java/gjt/YesNoDialog.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package gjt;
-
-import java.awt.*;
-
-/**
- * Similar in fuction to the MessageDialog, YesNoDialog poses 
- * a question, that is answered by selection of either a Yes 
- * button or a No button.<p>
- *
- * Note that the YesNoDialog is a singleton - meaning there is
- * only one YesNoDialog in existence per applet.  Clients
- * may obtain the YesNoDialog by invoking getYesNoDialog().<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     GJTDialog
- * @see     MessageDialog
- * @see     gjt.test.DialogTest
- */
-public class YesNoDialog extends GJTDialog {
-    static private YesNoDialog _theYesNoDialog;
-    private Button      yesButton;
-    private Button      noButton;
-    private String      message;
-    private boolean     answer      = false;
-    private ButtonPanel buttonPanel = new ButtonPanel();
-
-    static public YesNoDialog getYesNoDialog( Frame frame,
-                                  DialogClient client,
-                                  String       title,
-                                  String       message) {
-        if(_theYesNoDialog == null) 
-            _theYesNoDialog = new YesNoDialog(frame,client,
-                                              title,message);
-        else {
-            _theYesNoDialog.setClient (client);
-            _theYesNoDialog.setTitle  (title);
-            _theYesNoDialog.setMessage(message);
-        }
-        return _theYesNoDialog;
-    }
-    private YesNoDialog(Frame  frame, DialogClient client, 
-                        String title, String       message) {
-        super(frame, title, client, true);
-        yesButton = buttonPanel.add("Yes");
-        noButton  = buttonPanel.add("No");
-
-        setLayout(new BorderLayout());
-        add("Center", new YesNoPanel(message));
-        add("South", buttonPanel);
-        pack();
-    }
-    public void show() {
-        yesButton.requestFocus();
-        super.show();
-    }
-    public boolean answeredYes() {
-        return answer;
-    }
-    public boolean action(Event event, Object what) {
-        if(event.target == yesButton) answer = true;
-        else                          answer = false;
-
-        hide();
-        client.dialogDismissed(this);
-        return true;
-    }
-    private void setMessage(String message) {
-        this.message = message;
-    }
-}
-
-class YesNoPanel extends Panel {
-    public YesNoPanel(String question) {
-        add("Center", new Label(question, Label.CENTER));
-    }
-    public Insets insets() {
-        return new Insets(10,10,10,10);
-    }
-}
diff --git a/java/gjt/animation/CollisionArena.java b/java/gjt/animation/CollisionArena.java
deleted file mode 100644
index defb1a6d86b..00000000000
--- a/java/gjt/animation/CollisionArena.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package gjt.animation;
-
-import java.awt.Dimension;
-import java.awt.Insets;
-import java.util.Vector;
-import gjt.Orientation;
-
-/**
- * A CollisionArena is defined as an arena in which collisions
- * may take place.<p>
- *
- * CollisionArenas must be able to report their size and 
- * insets, and return a Vector of the Sprites contained in the 
- * arena.<p>
- *
- * CollisionArenas must also implement two methods for handling
- * sprite and edge collisions, respectively.
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Playfield
- * @see     CollisionDetector
- * @see     EdgeCollisionDetector
- * @see     SpriteCollisionDetector
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public interface CollisionArena {
-    abstract public Vector    getSprites();
-    abstract public Dimension getSize   ();
-    abstract public Insets    getInsets ();
-
-    abstract public void spriteCollision(Sprite sprite, 
-                                         Sprite other);
-
-    abstract public void edgeCollision(Sprite      sprite, 
-                                       Orientation orient); 
-}
diff --git a/java/gjt/animation/CollisionDetector.java b/java/gjt/animation/CollisionDetector.java
deleted file mode 100644
index ff05f16c6d3..00000000000
--- a/java/gjt/animation/CollisionDetector.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package gjt.animation;
-
-/**
- * Collision detectors detect collisions that take place within
- * a CollisionArena.
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CollisionArena
- * @see     EdgeCollisionDetector
- * @see     SpriteCollisionDetector
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-abstract public class CollisionDetector {
-    protected CollisionArena arena;
-
-    abstract public void detectCollisions();
-
-    public CollisionDetector(CollisionArena arena) {
-        this.arena = arena;
-    }
-}
diff --git a/java/gjt/animation/EdgeCollisionDetector.java b/java/gjt/animation/EdgeCollisionDetector.java
deleted file mode 100644
index 8624b7c2f28..00000000000
--- a/java/gjt/animation/EdgeCollisionDetector.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gjt.animation;
-
-import java.awt.*;
-import java.util.Enumeration;
-import java.util.Vector;
-import gjt.Orientation;
-
-/**
- * A CollisionDetector that detects collisions between Sprites
- * and the edges of the CollisionArena in which they reside.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CollisionDetector
- * @see     Sprite
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public class EdgeCollisionDetector extends CollisionDetector {
-    public EdgeCollisionDetector(CollisionArena arena) {
-        super(arena);
-    }
-    public void detectCollisions() {
-        Enumeration sprites     = arena.getSprites().elements();
-        Dimension   arenaSize   = arena.getSize();
-        Insets      arenaInsets = arena.getInsets();
-        Sprite      sprite;
-
-        while(sprites.hasMoreElements()) {
-            sprite = (Sprite)sprites.nextElement();
-            
-            Point nl = sprite.nextLocation ();
-            Point mv = sprite.getMoveVector();
-            int   nextRightEdge   = nl.x + sprite.width();
-            int   nextBottomEdge  = nl.y + sprite.height();
-            int   arenaBottomEdge = arenaSize.height - 
-                                    arenaInsets.bottom;
-            int   arenaRightEdge  = arenaSize.width - 
-                                    arenaInsets.right;
-
-            if(nextRightEdge > arenaRightEdge) 
-                arena.edgeCollision(sprite, Orientation.LEFT);
-            else if(nl.x < arenaInsets.left)
-                arena.edgeCollision(sprite, Orientation.RIGHT);
-
-            if(nextBottomEdge > arenaBottomEdge) 
-                arena.edgeCollision(sprite, Orientation.BOTTOM);
-            else if(nl.y < arenaInsets.top)
-                arena.edgeCollision(sprite, Orientation.TOP);
-        }
-    }
-}
diff --git a/java/gjt/animation/Playfield.java b/java/gjt/animation/Playfield.java
deleted file mode 100644
index 386c0fb24c4..00000000000
--- a/java/gjt/animation/Playfield.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package gjt.animation;
-
-import java.awt.*;
-import java.util.Enumeration;
-import java.util.Vector;
-import gjt.Util;
-
-/**
- * A surface upon which Sprites are animated.  Playfields are 
- * responsible for animating the sprites.<p>
- *
- * Each Playfield comes complete with two collision detectors:
- * an edge collision detector and a sprite collision detector.
- *
- * Playfield is an abstract class:  extensions must implement
- * the following methods:
- * <dl>
- * <dd> void paintBackground(Graphics)
- * <dd> void void spriteCollision(Sprite sprite, Sprite other)
- * <dd> void void edgeCollision  (Sprite sprite, Sprite other)
- * </dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CollisionArena
- * @see     Sprite
- * @see     SpriteCollisionDetector
- * @see     EdgeCollisionDetector
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public abstract class Playfield extends    Canvas 
-                                implements Runnable, 
-                                           CollisionArena {
-    protected Vector    sprites = new Vector();
-    private   boolean   running = false;
-    private   Insets    insets  = new Insets(0,0,0,0);
-
-    private   Thread                  animationThread;
-    private   Image                   bgoffscreen, 
-                                      workplaceBuffer;
-    private   Dimension               offscreenSize;
-    private   EdgeCollisionDetector   edgeCollisionDetector;
-    private   SpriteCollisionDetector spriteCollisionDetector;
-
-    abstract public void paintBackground(Graphics g);
-
-    public Playfield() {
-        edgeCollisionDetector   = 
-            new EdgeCollisionDetector(this);
-        spriteCollisionDetector =
-            new SpriteCollisionDetector(this);
-    }
-    public void      stop      ()  { running = false;  }
-    public boolean   running   ()  { return running;   }
-    public Dimension getSize   ()  { return size();    }
-    public Insets    getInsets ()  { return insets;    }
-    public Vector    getSprites()  { return sprites;   }
-
-    public void addSprite(Sprite sprite) { 
-        sprites.addElement(sprite); 
-    }
-    public void setInsets(Insets insets) {
-        this.insets = insets;
-    }
-    public void start() {
-        animationThread = new Thread(this);
-        running = true;
-        animationThread.start();
-    }
-    public void paint(Graphics g) {
-        if(needNewOffscreenBuffer()) {
-            workplaceBuffer   = createOffscreenImage(size());
-            bgoffscreen = createOffscreenImage(size());
-            paintBackground(bgoffscreen.getGraphics());
-        }
-        g.drawImage(bgoffscreen, 0, 0, this);
-        paintSprites();
-    }
-    public void reshape(int x, int y, int w, int h) {
-        super.reshape(x,y,w,h);
-        repaint();
-    }
-    public void run() {
-        while(running == true) {
-            edgeCollisionDetector.detectCollisions  ();
-            spriteCollisionDetector.detectCollisions();
-
-            animateSprites();
-            Thread.currentThread().yield();
-        }
-        animationThread = null;
-    }
-    private boolean needNewOffscreenBuffer() {
-        return (workplaceBuffer == null              || 
-                bgoffscreen     == null              ||
-                size().width  != offscreenSize.width ||
-                size().height != offscreenSize.height);
-    }
-    private Image createOffscreenImage(Dimension size) {
-        Image image = createImage(size.width, size.height);
-        Util.waitForImage(this, image);
-        offscreenSize = size;
-        return image;
-    }
-    protected void animateSprites() {
-        Sprite      nextSprite;
-        Enumeration e = sprites.elements();
-
-        while(e.hasMoreElements()) {
-            nextSprite = (Sprite)e.nextElement();
-            nextSprite.animate();
-        }
-    }
-    protected void paintSprites() {
-        Sprite      nextSprite;
-        Enumeration e = sprites.elements();
-
-        while(e.hasMoreElements()) {
-            nextSprite = (Sprite)e.nextElement();
-            paintSprite(nextSprite);
-        }
-    }
-    protected void paintSprite(Sprite sprite) {
-        Graphics  g    = getGraphics();
-        Graphics  wpg  = workplaceBuffer.getGraphics();
-        Rectangle clip = sprite.clipRect();
-
-        wpg.clipRect(clip.x, clip.y, clip.width, clip.height);
-        wpg.drawImage(bgoffscreen, 0, 0, this);
-        sprite.paint(wpg);
-
-        g.clipRect (clip.x, clip.y, clip.width, clip.height);
-        g.drawImage(workplaceBuffer, 0, 0, this);
-
-        g.dispose();
-        wpg.dispose();
-    }
-}
diff --git a/java/gjt/animation/Sequence.java b/java/gjt/animation/Sequence.java
deleted file mode 100644
index 7b777ecd0d8..00000000000
--- a/java/gjt/animation/Sequence.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package gjt.animation;
-
-import java.util.Vector;
-import java.awt.*;
-import java.awt.image.ImageObserver;
-import gjt.Util;
-import gjt.Stopwatch;
-
-/**
- * A sequence of images used in an animation.  Each sequence
- * keeps track of the number of cycles the sequence is to run,
- * and reports whether or not the cycles have been completed
- * via the boolean animationOver() method.
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Sprite
- * @see     Playfield
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public class Sequence {
-    private static long infiniteCycle = -1;
-
-    private Vector    cells               = new Vector();
-    private Point     lastPaintLocation   = new Point(0,0);
-    private Stopwatch cellAdvanceTimer    = new Stopwatch();
-    private Image     currentImage, lastImagePainted;
-    private long      cellAdvanceInterval = 0,
-                      currentCycle        = 0, 
-                      cyclesPerAnimation  = 0;
-
-    public Sequence() { }
-
-    public Sequence(Component component, Image[] images) {
-        for(int i=0; i < images.length; ++i) {
-            addImage(component, images[i]);
-        }
-        cyclesPerAnimation = infiniteCycle;
-    }
-    public void  start          () { cellAdvanceTimer.start(); }
-    public Image getLastImage   () { return lastImagePainted;  }
-    public Point getLastLocation() { return lastPaintLocation; }
-    public int   getNumImages   () { return cells.size();      } 
-
-    public long getCurrentCycle()       { return currentCycle; }
-    public void setCurrentCycle(long c) { currentCycle = c;    }
-
-    public long getCyclesPerAnimation() { 
-        return currentCycle;            
-    }
-    public void setCyclesPerAnimation(long cyclesPerAnimation) { 
-        this.cyclesPerAnimation = cyclesPerAnimation;
-    }
-    public Image getFirstImage() {
-        return (Image)cells.firstElement();
-    }
-    public Image getCurrentImage() { 
-        return currentImage;      
-    }
-    public int getCurrentImagePosition() { 
-        return cells.indexOf(currentImage); 
-    }
-    public Image getNextImage() {
-        int   index = cells.indexOf(currentImage);
-        Image image;
-
-        if(index == cells.size() - 1)   
-            image = (Image)cells.elementAt(0);
-        else                                
-            image = (Image)cells.elementAt(index + 1); 
-
-        return image;
-    }
-    public void setAdvanceInterval(long interval) {
-        cellAdvanceInterval = interval;
-    }
-    public void addImage(Component component, Image image) {
-        if(currentImage == null)
-            currentImage = image;
-
-        Util.waitForImage(component, image);
-        cells.addElement(image);
-    }
-    public void removeImage(Image image) {
-        cells.removeElement(image);
-    } 
-    public boolean needsRepainting(Point point) {
-        return (lastPaintLocation.x != point.x ||
-                lastPaintLocation.y != point.y ||
-                lastImagePainted    != currentImage);
-    }
-    public void paint(Graphics g, int x, int y, 
-                      ImageObserver observer) {
-        g.drawImage(currentImage, x, y,  observer);
-        lastPaintLocation.x = x;
-        lastPaintLocation.y = y;
-        lastImagePainted    = currentImage;
-    }
-    public boolean isAtLastImage() {
-        return getCurrentImagePosition() == (cells.size() - 1);
-    }
-    public boolean timeToAdvanceCell() {
-        return 
-          cellAdvanceTimer.elapsedTime() > cellAdvanceInterval;
-    }
-    public boolean animationOver() {
-        return (cyclesPerAnimation != infiniteCycle) &&
-               (currentCycle >= cyclesPerAnimation);
-    }
-    public void advance() {
-        if(isAtLastImage())
-            ++currentCycle;
-
-        currentImage = getNextImage();
-        cellAdvanceTimer.reset();
-    }
-}
diff --git a/java/gjt/animation/Sprite.java b/java/gjt/animation/Sprite.java
deleted file mode 100644
index e7840b7615b..00000000000
--- a/java/gjt/animation/Sprite.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package gjt.animation;
-
-import java.awt.*;
-import java.util.Vector;
-import gjt.Assert;
-import gjt.Stopwatch;
-import gjt.Util;
-
-/**
- * A sequence of images which are animated and moved about on
- * a Playfield.<p>
- *
- * Each Sprite is constructed with a reference to it's 
- * Playfield, a Sequence, and a beginning position for it's 
- * upper left hand corner.<p>
- *
- * A Sprite's animation is controlled by invoking the following
- * methods:
- *<dl>
- *<dd> setMoveVector(Point)
- *<dd> setMoveInterval(long)
- *<dd> setImageChangeInterval(long)
- *<dd> setMainSequence(Sequence)
- *<dd> setSequence(Sequence)
- *</dl>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     Sequence
- * @see     Playfield
- * @see     SpriteCollisionDetector
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public class Sprite {
-    private Playfield field;
-    private Sequence currentSequence, mainSequence;
-    private Stopwatch moveTimer = new Stopwatch();
-
-    private Point ulhc       = new Point(0,0); 
-    private Point start      = new Point(0,0);
-    private Point moveVector = new Point(1,1);
-
-    private Rectangle clip = new Rectangle(0,0);
-    private Rectangle curBounds, lastBounds; 
-
-    private int  width, height;
-    private long moveInterval = 0;
-
-    public Sprite(Playfield field, 
-                  Sequence  sequence, 
-                  Point     ulhc) {
-        Assert.notNull(field);
-        Assert.notNull(sequence);
-        Assert.notNull(ulhc);
-
-        this.field = field;
-        this.ulhc  = ulhc;
-        start.x    = ulhc.x;
-        start.y    = ulhc.y;
-
-        setSequence(sequence);
-        setMainSequence(sequence);
-
-        initializeBounds();
-        moveTimer.start();
-        currentSequence.start();
-    }
-    public Playfield getPlayfield() { return field;            }
-    public Rectangle clipRect    () { return clip;             }
-    public Rectangle curBounds   () { return curBounds;        }
-
-    public int   width    () { return width;                   }
-    public int   height   () { return height;                  }
-    public void  reverseX () { moveVector.x = 0-moveVector.x;  }
-    public void  reverseY () { moveVector.y = 0-moveVector.y;  }
-    public void  reverse  () { reverseX(); reverseY();         }
-    public Point start    () { return start;                   }
-
-    public void  setMoveVector (Point p) { moveVector = p;     }
-    public Point getMoveVector()         { return moveVector;  }
-
-    public void play(Sequence sequence, long cycles) {
-        setSequence(sequence);
-        sequence.setCyclesPerAnimation(cycles);
-        sequence.setCurrentCycle(0);
-    }
-    public void animate() {
-        if(currentSequence.animationOver())
-            currentSequence = mainSequence;
-
-        if(timeToChangeImage()) currentSequence.advance();
-        if(timeToMove())        move();
-        if(needsRepainting())   field.paintSprite(this); 
-    }
-    public void setMainSequence(Sequence sequence) {
-        mainSequence = sequence;
-    }
-    public Sequence getMainSequence() { 
-        return mainSequence; 
-    }
-    public void setSequence(Sequence sequence) {
-        currentSequence = sequence;
-
-        if(curBounds != null)
-            updateBounds();
-    }
-    public Sequence getSequence() { 
-        return currentSequence; 
-    }
-    public boolean intersects(Sprite otherSprite) {
-        return curBounds().intersects(otherSprite.curBounds());
-    }
-    public boolean willIntersect(Sprite otherSprite) {
-        return 
-          nextBounds().intersects(otherSprite.nextBounds());
-    }
-    public boolean timeToMove() {
-        return moveTimer.elapsedTime() > moveInterval;
-    }
-    public boolean timeToChangeImage() {
-        return currentSequence.timeToAdvanceCell();
-    }
-    public void moveTo(Point p) {
-        ulhc = p;
-        moveTimer.reset();
-    }
-    public boolean needsRepainting() {
-        return currentSequence.needsRepainting(ulhc);
-    }
-    public void setMoveInterval(long interval) {
-        moveInterval = interval;
-    }
-    public void setImageChangeInterval(long interval) {
-        currentSequence.setAdvanceInterval(interval);
-    }
-    public void move() {
-        ulhc.x += moveVector.x;
-        ulhc.y += moveVector.y;
-        updateBounds();
-        moveTimer.reset();
-    }
-    public Point location() {
-        return ulhc;
-    }
-    public Point nextLocation() {
-        return new Point(ulhc.x + moveVector.x, 
-                         ulhc.y + moveVector.y);
-    }
-    public Rectangle nextBounds() {
-        Image nextImage = currentSequence.getNextImage();
-        Point nextLoc   = nextLocation();
-
-        return new Rectangle(
-                        nextLoc.x, nextLoc.y, width, height);
-    }
-    public void paint(Graphics g) {
-        currentSequence.paint(g, ulhc.x, ulhc.y, field);
-    }
-    private void initializeBounds() {
-        Image curImage = currentSequence.getCurrentImage();
-
-        width  = curImage.getWidth (field); 
-        height = curImage.getHeight(field);
-
-        curBounds = 
-          new Rectangle(ulhc.x, ulhc.y, width, height);
-
-        lastBounds = new Rectangle(curBounds.x, 
-                                   curBounds.y,
-                                   curBounds.width, 
-                                   curBounds.height);
-
-        clip = lastBounds.union(curBounds);
-    }
-    private void updateBounds() {
-        Image curImage = currentSequence.getCurrentImage();
-
-        lastBounds.width  = curBounds.width;
-        lastBounds.height = curBounds.height;
-
-        curBounds.width  = width  = curImage.getWidth(field);
-        curBounds.height = height = curImage.getHeight(field);
-
-        lastBounds.move(curBounds.x, curBounds.y);
-        curBounds.move (ulhc.x, ulhc.y);
-
-        clip = lastBounds.union(curBounds);
-    }
-}
diff --git a/java/gjt/animation/SpriteCollisionDetector.java b/java/gjt/animation/SpriteCollisionDetector.java
deleted file mode 100644
index 2ef37d79208..00000000000
--- a/java/gjt/animation/SpriteCollisionDetector.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package gjt.animation;
-
-import java.awt.*;
-import java.util.Enumeration;
-import java.util.Vector;
-import gjt.Orientation;
-
-/**
- * A CollisionDetector that detects collisions between Sprites
- * residing in a CollisionArena.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     CollisionArena
- * @see     CollisionDetector
- * @see     Sprite
- * @see     gjt.test.SimpleAnimationTest
- * @see     gjt.test.BumpAnimationTest
- * @see     gjt.test.TwoDrinkersAnimationTest
- */
-public class SpriteCollisionDetector extends CollisionDetector {
-    public SpriteCollisionDetector(CollisionArena arena) {
-        super(arena);
-    }
-    public void detectCollisions() {
-        Enumeration sprites = arena.getSprites().elements();
-        Sprite      sprite;
-
-        while(sprites.hasMoreElements()) {
-            sprite = (Sprite)sprites.nextElement();
-
-            Enumeration otherSprites = 
-                            arena.getSprites().elements();
-            Sprite otherSprite;
-
-            while(otherSprites.hasMoreElements()) {
-                otherSprite=(Sprite)otherSprites.nextElement();
-
-                if(otherSprite != sprite) 
-                    if(sprite.willIntersect(otherSprite))
-                      arena.spriteCollision(sprite,otherSprite);
-            }
-        }
-    }
-}
diff --git a/java/gjt/image/BleachImageFilter.java b/java/gjt/image/BleachImageFilter.java
deleted file mode 100644
index f698a218284..00000000000
--- a/java/gjt/image/BleachImageFilter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gjt.image;
-
-import java.awt.image.*;
-import gjt.Assert;
-
-/**
- * A derivation of RGBImageFilter that bleaches an image.<p>
- *
- * Extent of the bleaching effect is controlled by the only 
- * constructor argument: an integer representing the percentage 
- * of bleaching.  The percentage of bleaching may also be 
- * controlled after instantiation by invoking the 
- * void percent(int) method.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     RGBImageFilter
- */
-public class BleachImageFilter extends RGBImageFilter {
-    private int percent;
-
-    public BleachImageFilter(int percent) {
-        Assert.notFalse(percent >= 0 && percent <= 100);
-        this.percent = percent;
-        canFilterIndexColorModel = true;
-    }
-    public int  percent()            { return percent;    }
-    public void percent(int percent) { percent = percent; }
-
-    public int filterRGB(int x, int y, int rgb) {
-        DirectColorModel cm = 
-            (DirectColorModel)ColorModel.getRGBdefault();
-
-        int    alpha = cm.getAlpha(rgb);
-        int    red   = cm.getRed  (rgb);
-        int    green = cm.getGreen(rgb);
-        int    blue  = cm.getBlue (rgb);
-        double percentMultiplier = (double)percent/100;
-
-        red   = Math.min((int)
-                (red + (red * percentMultiplier)), 255);
-        green = Math.min((int)
-                (green + (green * percentMultiplier)), 255);
-        blue  = Math.min((int)
-                (blue  + (blue  * percentMultiplier)), 255);
-
-        alpha = alpha << 24;
-        red   = red   << 16;
-        green = green << 8;
-
-        return alpha | red | green | blue;
-    }
-}
diff --git a/java/gjt/image/DissolveFilter.java b/java/gjt/image/DissolveFilter.java
deleted file mode 100644
index 027455b39b6..00000000000
--- a/java/gjt/image/DissolveFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gjt.image;
-
-import java.awt.image.*;
-import gjt.Assert;
-
-/**
- * A derivation of RGBImageFilter that partially or wholly
- * dissolves an image.<p>
- *
- * Extent of dissolving is set by the setOpacity(int) method,
- * which is passed an integer between 0 and 255 (inclusive).
- * The integer represents the alpha value to be applied to
- * every color in the image.<p>
- *
- * An alpha value of 255 signifies an opaque color, while an
- * alpha value of 0 signifies a translucent color.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     RGBImageFilter
- */
-public class DissolveFilter extends RGBImageFilter {
-    private int opacity;
-
-    public DissolveFilter() {
-        this(0);
-    }
-    public DissolveFilter(int opacity) {
-        canFilterIndexColorModel = true;
-        setOpacity(opacity);
-    }
-    public void setOpacity(int opacity) {
-        Assert.notFalse(opacity >= 0 && opacity <= 255);
-        this.opacity = opacity;
-    }
-    public int filterRGB(int x, int y, int rgb) {
-        DirectColorModel cm = 
-            (DirectColorModel)ColorModel.getRGBdefault();
-        int alpha = cm.getAlpha(rgb);
-        int red   = cm.getRed  (rgb);
-        int green = cm.getGreen(rgb);
-        int blue  = cm.getBlue (rgb);
-
-        alpha = opacity;
-
-        return alpha << 24 | red << 16 | green << 8 | blue;
-    }
-}
diff --git a/java/gjt/image/ImageDissolver.java b/java/gjt/image/ImageDissolver.java
deleted file mode 100644
index 5d0e6a2daf6..00000000000
--- a/java/gjt/image/ImageDissolver.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package gjt.image;
-
-import java.awt.*;
-import java.awt.image.*;
-import gjt.Util;
-
-/**
- * Given an image, an ImageDissolver produces an array of
- * images of varying opacity that are used in the fadeIn()
- * and fadeOut() methods for fading the image in and out
- * respectively.<p>
- *
- * As a convenience, ImageDissolver has a static method:
- * Image[] createImages() that creates the array of images
- * mentioned above, in case clients would like to create their
- * own array of images instead of using an ImageDissolver
- * directly.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     ThreeDBorder
- * @see     ImageButtonController
- * @see     SpringyImageButtonController
- * @see     StickyImageButtonController
- * @see     BleachImageFilter
- * @see     gjt.test.ImageButtonTest
- */
-public class ImageDissolver {
-    private static int _defaultNumImages = 10, 
-                       _defaultPause = 50;
-    Component comp;
-    int       numImages, pauseInterval;
-    Image     image, offscreen;
-    Image[]   dissolvedImages;
-
-    static public Image[] createImages(Image image, 
-                                       int numImages,
-                                       Component component) {
-        Image        images[] = new Image[numImages];
-        MediaTracker tracker  = new MediaTracker(component);
-
-        DissolveFilter      filter;
-        FilteredImageSource fis;
-
-        for(int i=0; i < numImages; ++i) {
-            filter = new DissolveFilter((255/(numImages-1))*i);
-            fis    = new FilteredImageSource(image.getSource(), 
-                                             filter);
-
-            images[i] = component.createImage(fis);
-            tracker.addImage(images[i], i);
-        }
-        try { tracker.waitForAll(); }
-        catch(InterruptedException e) { }
-
-        return images;
-    }
-
-    public ImageDissolver(Component comp, Image image) {
-        this(comp, image, _defaultNumImages, _defaultPause);
-    }
-    public ImageDissolver(Component comp, Image im, 
-                          int numImages, int pause) {
-        this.image      = im;
-        this.comp       = comp;
-        this.numImages  = numImages;
-        dissolvedImages = new Image[numImages];
-        pauseInterval   = pause;
-
-        Util.waitForImage(comp, im);
-        dissolvedImages = createImages(image, numImages, comp);
-    }
-    public void fadeIn(int x, int y) {
-        if(offscreen == null) 
-            offscreen = comp.createImage(image.getWidth(comp), 
-                                         image.getHeight(comp));
-
-        Graphics offg  = offscreen.getGraphics();
-        Graphics compg = comp.getGraphics();
-
-        if(offg != null && compg != null) {
-            clearComponent(compg, x, y);
-            for(int i=0; i < numImages; ++i) {
-                blitImage(compg, offg, x, y, i);
-                pause    ();
-            }
-            blitOpaqueImage(compg, offg, x, y);
-        }
-    }
-    public void fadeOut(int x, int y) {
-        if(offscreen == null) 
-            offscreen = comp.createImage(image.getWidth(comp), 
-                                         image.getHeight(comp));
-
-        Graphics offg  = offscreen.getGraphics();
-        Graphics compg = comp.getGraphics();
-
-        if(offg != null && compg != null) {
-            blitOpaqueImage(compg, offg, x, y);
-            for(int i=numImages-1; i >= 0; --i) {
-                clearOffscreen();
-                blitImage     (compg, offg, x, y, i);
-                pause         ();
-            }
-        }
-    }
-    private void blitImage(Graphics compg, Graphics offg, 
-                           int x, int y, int index) {
-        offg.drawImage (dissolvedImages[index], 0, 0, comp);
-        compg.drawImage(offscreen,              x, y, comp);
-    }
-    private void blitOpaqueImage(Graphics compg, Graphics offg, 
-                                 int x, int y) {
-        offg.drawImage(image, 0, 0, comp);
-        compg.drawImage(offscreen, x, y, comp);
-    }
-    private void clearComponent(Graphics compg, int x, int y) {
-        clearOffscreen();
-        compg.drawImage(offscreen, x, y, comp);
-    }
-    private void clearOffscreen() {
-        Graphics offg = offscreen.getGraphics();
-
-        offg.setColor(comp.getBackground());
-        offg.fillRect(0, 0, 
-                image.getWidth(comp), image.getHeight(comp));
-    }
-    private void pause() {
-        try { Thread.currentThread().sleep(pauseInterval); }
-        catch(InterruptedException e) { }       
-    }
-}
diff --git a/java/gjt/rubberband/Rubberband.java b/java/gjt/rubberband/Rubberband.java
deleted file mode 100644
index be4b1b6ac05..00000000000
--- a/java/gjt/rubberband/Rubberband.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.*;
-
-/** 
- * A abstract base class for rubberbands.<p>
- *
- * Rubberbands do their rubberbanding inside of a Component, 
- * which must be specified at construction time.<p>
- * 
- * Subclasses are responsible for implementing 
- * <em>void drawLast(Graphics g)</em> and 
- * <em>void drawNext(Graphics g)</em>.  
- *
- * drawLast() draws the appropriate geometric shape at the last 
- * rubberband location, while drawNext() draws the appropriate 
- * geometric shape at the next rubberband location.  All of the 
- * underlying support for rubberbanding is taken care of here, 
- * including handling XOR mode setting; extensions of Rubberband
- * need not concern themselves with anything but drawing the 
- * last and next geometric shapes.<p>
- *
- * @version 1.00, 12/27/95
- * @author  David Geary
- * @see     RubberbandLine
- * @see     RubberbandRectangle
- * @see     RubberbandEllipse
- * @see     gjt.test.RubberbandTest
- */
-abstract public class Rubberband {
-    protected Point anchor    = new Point(0,0); 
-    protected Point stretched = new Point(0,0);
-    protected Point last      = new Point(0,0); 
-    protected Point end       = new Point(0,0);
-
-    private Component component;
-    private boolean   firstStretch = true;
-
-    abstract public void drawLast(Graphics g);
-    abstract public void drawNext(Graphics g);
-
-    public Rubberband(Component component) {
-        this.component = component;
-    }
-    public Point getAnchor   () { return anchor;    }
-    public Point getStretched() { return stretched; }
-    public Point getLast     () { return last;      }
-    public Point getEnd      () { return end;       }
-
-    public void anchor(Point p) {
-        firstStretch = true;
-        anchor.x = p.x;
-        anchor.y = p.y;
-
-        stretched.x = last.x = anchor.x;
-        stretched.y = last.y = anchor.y;
-    }
-    public void stretch(Point p) {
-        last.x      = stretched.x;
-        last.y      = stretched.y;
-        stretched.x = p.x;
-        stretched.y = p.y;
-
-        Graphics g = component.getGraphics();
-        if(g != null) {
-            g.setXORMode(component.getBackground());
-
-            if(firstStretch == true) firstStretch = false;
-            else                     drawLast(g);
-
-            drawNext(g);
-        }
-    }
-    public void end(Point p) {
-        last.x = end.x = p.x;
-        last.y = end.y = p.y;
-
-        Graphics g = component.getGraphics();
-        if(g != null) {
-            g.setXORMode(component.getBackground());
-            drawLast(g);
-        }
-    }
-    public Rectangle bounds() {
-      return new Rectangle(stretched.x < anchor.x ? 
-                           stretched.x : anchor.x,
-                           stretched.y < anchor.y ? 
-                           stretched.y : anchor.y,
-                           Math.abs(stretched.x - anchor.x),
-                           Math.abs(stretched.y - anchor.y));
-    }
-
-    public Rectangle lastBounds() {
-      return new Rectangle(
-                  last.x < anchor.x ? last.x : anchor.x,
-                  last.y < anchor.y ? last.y : anchor.y,
-                  Math.abs(last.x - anchor.x),
-                  Math.abs(last.y - anchor.y));
-    }
-}
diff --git a/java/gjt/rubberband/RubberbandEllipse.java b/java/gjt/rubberband/RubberbandEllipse.java
deleted file mode 100644
index 50ddb0cdd6b..00000000000
--- a/java/gjt/rubberband/RubberbandEllipse.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-
-/** 
- *  A Rubberband that does ellipses.
- *
- * @version 1.00, 12/27/95
- * @author  David Geary
- * @see     Rubberband
- * @see     gjt.test.RubberbandTest
- */
-public class RubberbandEllipse extends Rubberband {
-    private final int startAngle = 0;
-    private final int endAngle   = 360;
-
-    public RubberbandEllipse(Component component) {
-        super(component);
-    }
-    public void drawLast(Graphics graphics) {
-        Rectangle r = lastBounds();
-        graphics.drawArc(r.x, r.y, 
-            r.width, r.height, startAngle, endAngle);
-    }
-    public void drawNext(Graphics graphics) {
-        Rectangle r = bounds();
-        graphics.drawArc(r.x, r.y, 
-            r.width, r.height, startAngle, endAngle);
-    }
-}
diff --git a/java/gjt/rubberband/RubberbandLine.java b/java/gjt/rubberband/RubberbandLine.java
deleted file mode 100644
index 95daafa32a6..00000000000
--- a/java/gjt/rubberband/RubberbandLine.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.Component;
-import java.awt.Graphics;
-
-/** 
- * A Rubberband that does lines.
- *
- * @version 1.0, 12/27/95
- * @author  David Geary
- * @see     Rubberband
- * @see     gjt.test.RubberbandTest
- */
-public class RubberbandLine extends Rubberband {
-    public RubberbandLine(Component component) {
-        super(component);
-    }
-    public void drawLast(Graphics graphics) {
-        graphics.drawLine(anchor.x, anchor.y, last.x, last.y);
-    }
-    public void drawNext(Graphics graphics) {
-        graphics.drawLine(anchor.x, anchor.y, 
-                          stretched.x, stretched.y);
-    }
-}
diff --git a/java/gjt/rubberband/RubberbandPanel.java b/java/gjt/rubberband/RubberbandPanel.java
deleted file mode 100644
index e4c25f4efb5..00000000000
--- a/java/gjt/rubberband/RubberbandPanel.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.*;
-
-/**
- * An extension of Panel which is fitted with a Rubberband.  
- * Handling of mouse events is automatically handled for 
- * rubberbanding.<p>
- *
- * Clients may set or get the Rubberband at any time.<p>
- *
- * @version 1.0, Dec 27 1995
- * @author  David Geary
- * @see     Rubberband
- * @see     gjt.test.RubberbandTest
- */
-public class RubberbandPanel extends Panel {
-    private Rubberband rubberband;
-
-    public void setRubberband(Rubberband rubberband) {
-        this.rubberband = rubberband;
-    }
-    public Rubberband getRubberband() {
-        return rubberband;
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        rubberband.anchor(new Point(x,y));
-        return false;
-    }
-    public boolean mouseDrag(Event event, int x, int y) {
-        rubberband.stretch(new Point(x,y));
-        return false;
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        rubberband.end(new Point(x,y));
-        return false;
-    }
-}
diff --git a/java/gjt/rubberband/RubberbandRectangle.java b/java/gjt/rubberband/RubberbandRectangle.java
deleted file mode 100644
index bfcb1bfc32c..00000000000
--- a/java/gjt/rubberband/RubberbandRectangle.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package gjt.rubberband;
-
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-
-/** 
- * A Rubberband that does rectangles.
- *
- * @version 1.00, 12/27/95
- * @author  David Geary
- * @see     Rubberband
- * @see     gjt.test.RubberbandTest
- */
-public class RubberbandRectangle extends Rubberband {
-    public RubberbandRectangle(Component component) {
-        super(component);
-    }
-    public void drawLast(Graphics graphics) {
-        Rectangle rect = lastBounds();
-        graphics.drawRect(rect.x, rect.y, 
-                          rect.width, rect.height);
-    }
-    public void drawNext(Graphics graphics) {
-        Rectangle rect = bounds();
-        graphics.drawRect(rect.x, rect.y, 
-                          rect.width, rect.height);
-    }
-}
diff --git a/java/gjt/test/AttributesPanel.java b/java/gjt/test/AttributesPanel.java
deleted file mode 100644
index 535a12edaeb..00000000000
--- a/java/gjt/test/AttributesPanel.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.*;
-
-class AttributesPanel extends Panel {
-    private Applet applet;
-    private Box    iconbox, labelbox, checkboxbox;
-    private Panel  panelInLabelbox    = new Panel(); 
-    private Panel  panelInCheckboxbox = new Panel();
-    private ExclusiveImageButtonPanel panelInIconbox;
-
-    public AttributesPanel(Applet applet) {
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        this.applet    = applet;
-        panelInIconbox = new ExclusiveImageButtonPanel(
-                                Orientation.HORIZONTAL);
-
-        populateIconPanel    ();
-        populateLabelPanel   ();
-        populateCheckboxPanel();
-
-        iconbox     = new Box(panelInIconbox, 
-                              "Meaningless Images");
-        labelbox    = new Box(panelInLabelbox,    "Labels");
-        checkboxbox = new Box(panelInCheckboxbox, "Fruits");
-        iconbox.etchedOut();
-
-        setLayout(gbl);
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weighty   = 0.50;
-        gbl.setConstraints(iconbox,  gbc); 
-        add(iconbox);
-        gbl.setConstraints(labelbox, gbc); 
-        add(labelbox);
-
-        gbc.anchor    = GridBagConstraints.SOUTH;
-        gbc.weighty   = 0;
-        gbl.setConstraints(panelInCheckboxbox, gbc); 
-        add(checkboxbox);
-    }
-    private void populateIconPanel() {
-        Image ballot, film, ticket;
-
-        ballot  = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/ballot_box.gif");
-        ticket  = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/movie_ticket.gif");
-        film    = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/filmstrip.gif");
-
-        panelInIconbox.add(ballot);
-        panelInIconbox.add(ticket);
-        panelInIconbox.add(film);
-    }   
-    private void populateLabelPanel() {
-        panelInLabelbox.add(new Label("Label One"));
-        panelInLabelbox.add(new Label("Label Two"));
-        panelInLabelbox.add(new Label("Label Three"));
-        panelInLabelbox.add(new Label("Label Four"));
-        panelInLabelbox.add(new Label("Label Five"));
-    }
-    private void populateCheckboxPanel() {
-        CheckboxGroup group = new CheckboxGroup();
-
-        panelInCheckboxbox.setLayout(new GridLayout(3,0));
-        panelInCheckboxbox.add(new Checkbox("apples",  
-                                            group, false));
-        panelInCheckboxbox.add(new Checkbox("oranges", 
-                                            group, false));
-        panelInCheckboxbox.add(new Checkbox("pears",   
-                                            group, true));
-    }
-}
diff --git a/java/gjt/test/BargaugeTest.java b/java/gjt/test/BargaugeTest.java
deleted file mode 100644
index 47733d6b0bf..00000000000
--- a/java/gjt/test/BargaugeTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import java.applet.*;
-import gjt.Bargauge;
-
-/**
- * An array of either horizontal or vertical animated bargauges.
- * The orientation of the bargauges is controlled by a parameter
- * passed into the applet.<p>
- *
- * <em>
- * Warning:  An AWT bug causes this test to be a gluttenous 
- * consumer of resources (especially under Win95). A mouse down 
- * will halt the animation thread along with its consumption of 
- * resources.<p>
- * </em>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Bargauge
- */
-public class BargaugeTest extends UnitTest {
-    private Bargauge[] gauges = new Bargauge[10];
-    private Thread     animatorThread;
-    private boolean    running;
-
-    public String title() { 
-        return "Bargauge Test"; 
-    }
-    public Panel  centerPanel() { 
-        return new BargaugeTestPanel(
-                    gauges, getParameter("orientation"));
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running == true) { 
-            animatorThread.suspend(); 
-            running = false; 
-        }
-        else { 
-            animatorThread.resume (); 
-            running = true;  
-        }
-        return true;
-    }
-    public void start() {
-        super.start();
-        animatorThread = new BargaugeAnimator(gauges);
-        animatorThread.start();
-        running = true;
-    }
-    public void stop() {
-        super.stop();
-        animatorThread.suspend();
-        running = false;
-    }
-}
-
-class BargaugeTestPanel extends Panel {
-    public BargaugeTestPanel(Bargauge[] gauges, String orient) {
-        Panel bargaugePanel = new Panel();
-
-        setLayout(new BorderLayout());
-        add("North",  
-            new Label("Mouse Down Starts/Stops",Label.CENTER));
-        add("Center", bargaugePanel);
-
-        bargaugePanel.add(new BargaugeGridPanel(gauges,orient));
-    }
-}
-
-class BargaugeGridPanel extends Panel {
-    private Dimension  preferredSize = new Dimension(200, 250);
-
-    public BargaugeGridPanel(Bargauge[] gauges, String orient) {
-        Bargauge nextGauge;
-        Color    color = Color.gray;
-
-        if("horizontal".equals(orient))
-            setLayout(new GridLayout(gauges.length,0,5,5));
-        else
-            setLayout(new GridLayout(0,gauges.length,5,5));
-
-        for(int i=0; i < gauges.length; ++i) {
-            switch(i) {
-                case 1:  color = Color.darkGray;    break;
-                case 2:  color = Color.blue;        break;
-                case 3:  color = Color.magenta;     break;
-                case 4:  color = Color.yellow;      break;
-                case 5:  color = Color.green;       break;
-                case 6:  color = Color.cyan;        break;
-                case 7:  color = Color.orange;      break;
-                case 8:  color = Color.pink;        break;
-                case 9:  color = Color.red;         break;
-                case 10: color = Color.yellow;      break;
-            }
-            nextGauge = new Bargauge(color);
-            gauges[i] = nextGauge;
-            add(nextGauge);
-        }
-    }
-    public Dimension preferredSize() { return preferredSize; }
-    public Dimension minimumSize  () { return preferredSize; }
-}
-
-class BargaugeAnimator extends Thread {
-    private Bargauge[] gauges;
-    private boolean    firstAnimation = true;
-
-    public BargaugeAnimator(Bargauge[] gauges) {
-        this.gauges = gauges;
-    }
-    public void run() {
-        int count = gauges.length;
-
-        while(true) {
-            try { Thread.currentThread().sleep(500,0); }
-            catch(InterruptedException e) { }
-            for(int i=0; i < count; ++i) {
-                gauges[i].setFillPercent(Math.random() * 100);
-                gauges[i].fill();
-
-                if(firstAnimation)
-                    System.out.println(gauges[i].toString());
-            }
-            firstAnimation = false;
-        }
-    }
-}
diff --git a/java/gjt/test/BleachImageFilterTest.java b/java/gjt/test/BleachImageFilterTest.java
deleted file mode 100644
index 08fda725a08..00000000000
--- a/java/gjt/test/BleachImageFilterTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.image.FilteredImageSource;
-
-import gjt.Util;
-import gjt.image.BleachImageFilter;
-
-/**
- * Initially displays an unbleached image.  Subsequent mouse
- * clicks in the canvas containing the image toggle between
- * a bleached version of the image and an unbleached version.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.image.BleachImageFilter
- */
-public class BleachImageFilterTest extends UnitTest {
-    public String title() { 
-        return "BleachImageFilter Test " + 
-               "(Click below to Bleach/Unbleach Picture)";
-    }
-    public Panel centerPanel() { 
-        return new BleachImageFilterTestPanel(this); 
-    }
-}
-
-class BleachImageFilterTestPanel extends Panel {
-    BleachImageFilterTestCanvas canvas;
-
-    public BleachImageFilterTestPanel(Applet applet) {
-        add(canvas = new BleachImageFilterTestCanvas(applet));
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        canvas.toggleBleaching();
-        canvas.repaint();
-        return true;
-    }
-}
-
-class BleachImageFilterTestCanvas extends Canvas {
-    private Image   im;
-    private Image   bleached;
-    private boolean showingBleached = false;
-
-    public BleachImageFilterTestCanvas(Applet applet) {
-        int    bp;
-        String bleachPercent = 
-                applet.getParameter("bleachPercent");
-
-        if(bleachPercent != null) 
-            bp = new Integer(bleachPercent).intValue();
-        else                      
-            bp = 50;
-        
-        im = applet.getImage(applet.getCodeBase(), 
-                             "gifs/saint.gif");
-        Util.waitForImage(this, im);
-
-        FilteredImageSource source = 
-            new FilteredImageSource(im.getSource(), 
-                                    new BleachImageFilter(bp));
-
-        bleached = createImage(source);
-        Util.waitForImage(this, bleached);
-        
-        showImageSize();
-    }
-    public Dimension preferredSize() {
-        return new Dimension(im.getWidth(this), 
-                             im.getHeight(this));
-    }
-    public void paint(Graphics g) {
-        if(showingBleached) g.drawImage(bleached,0,0,this);
-        else                g.drawImage(im,      0,0,this);
-    }
-    public void toggleBleaching() {
-        showingBleached = showingBleached ? false : true;
-    }
-    private void showImageSize() {
-        System.out.print  ("Image width=" + im.getWidth(this));
-        System.out.println(" height=" + im.getHeight(this));
-    }
-}
diff --git a/java/gjt/test/BorderTest.java b/java/gjt/test/BorderTest.java
deleted file mode 100644
index 450b5ffc7ea..00000000000
--- a/java/gjt/test/BorderTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.Border;
-import gjt.Box;
-import gjt.EtchedBorder;
-import gjt.ImageButton;
-import gjt.ThreeDBorder;
-
-/**
- * Creates 10 bordered Components:
- * <dl>
- * <dd> A Canvas (click in canvas to depress/raise the border).
- * <dd> A Label with an etched out border. 
- * <dd> A TextField with an inset 3D border.
- * <dd> A CheckBox with a default border.
- * <dd> A List with a raised 3D border.
- * <dd> A Choice with an etched in border.
- * <dd> A Box with a raised 3D border.
- * <dd> An ImageButton with a thick, red border.
- * <dd> An AWT Button with a cyan border.
- * <dd> A TextArea with a blue default-width border.
- * </dl>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Border
- * @see     gjt.ThreeDBorder
- * @see     gjt.EtchedBorder
- */
-public class BorderTest extends UnitTest {
-    public String title() { 
-        return "Border Test";             
-    }
-    public Panel  centerPanel() { 
-        return new BorderTestPanel(this); 
-    }
-}
-
-class BorderTestPanel extends Panel {
-    TextField tf = new TextField(
-            "Inset TextField: border 5 pixels, gap 5 pixels ");
-    ThreeDBorder threeDBorder;
-    EtchedBorder etchedLabel;
-    Border       border;
-
-    public BorderTestPanel(Applet applet) {
-        setLayout(new FlowLayout(FlowLayout.CENTER, 10, 10));
-
-        add(new BorderedCanvas());
-        add(etchedLabel = 
-                new EtchedBorder(new Label("Etched Label")));
-        add(threeDBorder = new ThreeDBorder(tf, 5, 5));
-        add(new Border(new Checkbox("Check Me Out")));
-        add(makeThreeDBorderedList      ());
-        add(makeEtchedBorderedChoice    ());
-        add(makeThreeDBorderedCheckboxes());
-        add(makeBorderedImageButton     (applet));
-        add(makeBorderedAWTButton       ());
-        add(makeBorderedTextArea        ());
-
-        threeDBorder.inset();
-        etchedLabel.etchedOut();
-    }
-    private Border makeThreeDBorderedList() {
-        List list = new List(10, true);
-
-        list.addItem("One");
-        list.addItem("Two");
-        list.addItem("Three");
-        list.addItem("Four");
-        list.addItem("Five");
-        list.addItem("Six");
-        list.addItem("Seven");
-        list.addItem("Eight");
-        list.addItem("Nine");
-        list.addItem("Ten");
-        list.addItem("Eleven");
-        list.addItem("Twelve");
-        list.addItem("Thirteen");
-        list.addItem("Fourteen");
-        list.addItem("Fiveteen");
-        list.addItem("Sixteen");
-        list.addItem("Seventeen");
-        list.addItem("Eightteen");
-        list.addItem("Nineteen");
-        list.addItem("Twenty");
-
-        return new ThreeDBorder(list);
-    }
-    private Border makeEtchedBorderedChoice() {
-        Choice choice = new Choice();
-
-        choice.addItem("Toadies");
-        choice.addItem("SilverChair");
-        choice.addItem("Rug Burns");
-        choice.addItem("Cracker");
-        choice.addItem("Seven Mary Three");
-        choice.addItem("Dishwalla");
-        choice.addItem("Blues Traveler");
-        choice.addItem("BottleRockets");
-        choice.addItem("SpaceHog");
-        
-        return new EtchedBorder(choice);
-    }
-    private Border makeBorderedImageButton(Applet applet) {
-        Image  snail;
-        Border border;
-
-        snail = applet.getImage(applet.getCodeBase(),
-                                   "gifs/snail.gif");
-        border  = new Border(new ImageButton(snail), 10);
-        border.setLineColor(Color.red);
-
-        return border;
-    }
-    private Border makeBorderedAWTButton() {
-        Button button;
-        Border cyanBorder, blackBorder;
-
-        button = new Button("Button Inside Two Borders");
-        cyanBorder = new Border(button, 7);
-        cyanBorder.setLineColor(Color.cyan);
-
-        blackBorder = new Border(cyanBorder);
-
-        return blackBorder;
-    }
-    private Border makeThreeDBorderedCheckboxes() {
-        Panel         panel = new Panel();
-        Box           box   = new Box(panel, "Options");
-        CheckboxGroup group = new CheckboxGroup();
-
-        panel.setLayout(new GridLayout(3,0));
-        panel.add(new Checkbox("bordered",    group, false));
-        panel.add(new Checkbox("transparent", group, false));
-        panel.add(new Checkbox("continuous",  group, true));
-
-        return new ThreeDBorder(box, 4);
-    }
-    private Border makeBorderedTextArea() {
-        Border border;
-
-        border = new Border(
-                 new TextArea("Blue Bordered TextArea", 5, 30));
-        border.setLineColor(Color.blue);
-
-        return border;
-    }
-}
-
-class BorderedCanvas extends ThreeDBorder {
-    public BorderedCanvas() {
-        super(new TestCanvas());
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(isRaised()) paintInset ();
-        else           paintRaised();
-        return true;
-    }
-}
-
-class TestCanvas extends Canvas {
-    private boolean centeredShowing = false;
-    private String  centered = new String ("Red Centered Text");
-
-    public void paint(Graphics g) {
-        String      canvas = "Canvas";
-        String      click  = "Click Me";
-        Dimension   size   = size();
-        FontMetrics fm     = g.getFontMetrics();
-
-        g.drawString(canvas, (size.width/2) - 
-                             (fm.stringWidth(canvas)/2),
-                             fm.getHeight() - fm.getDescent());
-
-        g.drawString(click, (size.width/2) - 
-                             (fm.stringWidth(click)/2),
-                             size.height - fm.getHeight() + 
-                             fm.getAscent());
-        
-        if(centeredShowing == true) {
-            g.setColor(Color.red);
-            g.drawString(centered, 
-                size.width/2-(fm.stringWidth(centered)/2),
-                size.height/2 - (fm.getHeight()/2) + 
-                fm.getAscent());
-        }
-    }
-    public Dimension preferredSize() {
-        FontMetrics fm = getGraphics().getFontMetrics();
-        return new Dimension(fm.stringWidth(centered)+10, 100);
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        if(centeredShowing == false) centeredShowing = true;
-        else                         centeredShowing = false;
-        repaint();
-        return true;
-    }
-}
diff --git a/java/gjt/test/BoxTest.java b/java/gjt/test/BoxTest.java
deleted file mode 100644
index 24e3de9213e..00000000000
--- a/java/gjt/test/BoxTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.Box;
-import gjt.ExclusiveImageButtonPanel;
-import gjt.Orientation;
-
-/**
- * Three Boxes, each of which surrounds either:  ImageButtons, 
- * Labels or Checkboxes.  The Box surrounding the ImageButtons 
- * is etched out, while the other two Boxes are etched in.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ImageButton
- * @see     gjt.Box
- */
-public class BoxTest extends UnitTest {
-    public String title() { 
-        return "Box Test";             
-    }
-    public Panel centerPanel() { 
-        return new BoxTestPanel(this); 
-    }
-}
-
-class BoxTestPanel extends Panel {
-    private Applet applet;
-    private Box    iconbox, labelbox, checkboxbox;
-    private Panel  panelInLabelbox    = new Panel(); 
-    private Panel  panelInCheckboxbox = new Panel();
-    private ExclusiveImageButtonPanel panelInIconbox;
-
-    public BoxTestPanel(Applet applet) {
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        this.applet    = applet;
-        panelInIconbox = new ExclusiveImageButtonPanel(
-                                Orientation.HORIZONTAL);
-
-        populateIconPanel    ();
-        populateLabelPanel   ();
-        populateCheckboxPanel();
-
-        iconbox     = new Box(panelInIconbox, 
-                              "Meaningless Images");
-        labelbox    = new Box(panelInLabelbox,    "Labels");
-        checkboxbox = new Box(panelInCheckboxbox, "Fruits");
-        iconbox.etchedOut();
-
-        setLayout(gbl);
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.weighty   = 0.50;
-        gbl.setConstraints(iconbox,  gbc); 
-        add(iconbox);
-        gbl.setConstraints(labelbox, gbc); 
-        add(labelbox);
-
-        gbc.anchor    = GridBagConstraints.SOUTH;
-        gbc.weighty   = 0;
-        gbl.setConstraints(checkboxbox, gbc); 
-        add(checkboxbox);
-    }
-    private void populateIconPanel() {
-        Image ballot, film, ticket;
-
-        ballot  = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/ballot_box.gif");
-        ticket  = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/movie_ticket.gif");
-        film    = applet.getImage(applet.getCodeBase(), 
-                                  "gifs/filmstrip.gif");
-
-        panelInIconbox.add(ballot);
-        panelInIconbox.add(ticket);
-        panelInIconbox.add(film);
-    }   
-    private void populateLabelPanel() {
-        panelInLabelbox.add(new Label("Label One"));
-        panelInLabelbox.add(new Label("Label Two"));
-        panelInLabelbox.add(new Label("Label Three"));
-        panelInLabelbox.add(new Label("Label Four"));
-        panelInLabelbox.add(new Label("Label Five"));
-    }
-    private void populateCheckboxPanel() {
-        CheckboxGroup group = new CheckboxGroup();
-
-        panelInCheckboxbox.setLayout(new GridLayout(3,0));
-        panelInCheckboxbox.add(new Checkbox("apples",  
-                                            group, false));
-        panelInCheckboxbox.add(new Checkbox("oranges", 
-                                            group, false));
-        panelInCheckboxbox.add(new Checkbox("pears",   
-                                            group, true));
-    }
-}
diff --git a/java/gjt/test/BumpAnimationTest.java b/java/gjt/test/BumpAnimationTest.java
deleted file mode 100644
index 81b6fb5ce8e..00000000000
--- a/java/gjt/test/BumpAnimationTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package gjt.test;
-
-import java.net.URL;
-import java.applet.Applet;
-import java.awt.*;
-
-import gjt.Util;
-import gjt.Orientation;
-import gjt.animation.*;
-
-/**
- * A simple animation playfield with one sprite that bounces
- * off the boundaries of the playfield.<p>
- *
- * When the sprite bounces off the left wall, it plays a
- * bump sequence once; when it bounces off the right wall
- * it plays the bump sequence twice.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.animation.Playfield
- * @see     gjt.animation.Sprite
- */
-public class BumpAnimationTest extends UnitTest {
-    public String title() { 
-        return "Bump Animation - Mouse Down Starts/Stops"; 
-    } 
-    public Panel centerPanel() { 
-        return new BumpAnimationTestPanel(this); 
-    }
-}
-
-class BumpAnimationTestPanel extends Panel {
-    public BumpAnimationTestPanel(Applet applet) {
-        setLayout(new BorderLayout());
-        add("Center", new BumpPlayfield(applet)); 
-    }
-}
-
-class BumpPlayfield extends Playfield {
-    private Applet   applet;
-    private URL      cb;
-    private Sprite   javaDrinker;
-    private Sequence spinSequence, bumpSequence;
-
-    public BumpPlayfield(Applet applet) {
-        this.applet = applet;
-        cb          = applet.getCodeBase();
-        makeSequencesAndSprites();
-    }
-    public void paintBackground(Graphics g) {
-        Image bg = applet.getImage(cb, "gifs/background.gif");
-        Util.wallPaper(this, g, bg);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running() == true) stop ();
-        else                  start();
-        return true;
-    }
-    public void spriteCollision(Sprite sprite, Sprite sprite2) {
-        // Nothing to do:  only 1 sprite!
-    }
-    public void edgeCollision(Sprite      sprite, 
-                              Orientation orientation) {
-        if(orientation == Orientation.RIGHT || 
-           orientation == Orientation.LEFT) {
-            if(sprite.getSequence() != bumpSequence) {
-                sprite.reverseX();
-
-                if(orientation == Orientation.RIGHT)
-                    sprite.play(bumpSequence, 1);
-                else
-                    sprite.play(bumpSequence, 2);
-            }
-        }   
-        else 
-            sprite.reverseY();
-    }
-    private void makeSequencesAndSprites() {
-        String  file;
-        Point   startLoc   = new Point(10, 10);
-        Image[] spinImages = new Image[19];
-        Image[] bumpImages = new Image[6];
-
-        for(int i=0; i < spinImages.length; ++i) {
-            file = "gifs/spin";
-
-            if(i < 10) file += "0" + i + ".gif";
-            else       file += i + ".gif";
-
-            spinImages[i] = applet.getImage(cb, file);
-        }
-        for(int i=0; i < bumpImages.length; ++i) {
-            file = "gifs/bump0" + i + ".gif";
-            bumpImages[i] = applet.getImage(cb, file);
-        }
-        spinSequence = new Sequence(this, spinImages);
-        bumpSequence = new Sequence(this, bumpImages);
-        javaDrinker  = new Sprite(this, spinSequence, startLoc);
-
-        spinSequence.setAdvanceInterval(100);
-        bumpSequence.setAdvanceInterval(200);
-
-        javaDrinker.setMoveVector(new Point(2,2));
-        addSprite(javaDrinker);
-    }
-}
diff --git a/java/gjt/test/ChoiceCardPanelTest.java b/java/gjt/test/ChoiceCardPanelTest.java
deleted file mode 100644
index 4ec27ac8945..00000000000
--- a/java/gjt/test/ChoiceCardPanelTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.ChoiceCardPanel;
-
-/**
- * A ChoiceCardPanel that controls three Panels.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ChoiceCardPanel
- */
-public class ChoiceCardPanelTest extends UnitTest {
-    public String title() { return "Choice CardPanel Test"; }
-    public Panel centerPanel() {
-        return new ChoiceCardPanelTestPanel(this);
-    }
-}
-
-class ChoiceCardPanelTestPanel extends Panel {
-    private ChoiceCardPanel mvp = new ChoiceCardPanel();
-
-    public ChoiceCardPanelTestPanel(Applet applet) {
-        setLayout(new BorderLayout());
-
-        mvp.addChoice("Attributes",  
-                        new AttributesPanel(applet));
-        mvp.addChoice("Connections", new ConnectionsPanel());
-        mvp.addChoice("Oracle",      new OccupationOracle());
-        add("Center", mvp);
-    }
-}
diff --git a/java/gjt/test/ColumnLayoutTest.java b/java/gjt/test/ColumnLayoutTest.java
deleted file mode 100644
index fcef2151a25..00000000000
--- a/java/gjt/test/ColumnLayoutTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.net.URL;
-import java.awt.*;
-import gjt.*;
-
-/**
- * Lays out 3 image buttons, and provides controls for setting
- * orientations and gaps on the fly.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ImageButton
- * @see     gjt.Box
- */
-public class ColumnLayoutTest extends UnitTest {
-    public String title() { 
-        return "ColumnLayout Test"; 
-    }
-    public Panel centerPanel() {
-        ColumnButtonPanel buttonPanel;
-        Panel panel = new Panel();
-
-        buttonPanel = new ColumnButtonPanel(this);
-
-        panel.setLayout(new BorderLayout());
-        panel.add("Center", buttonPanel);
-        panel.add("North", new Box(new ColumnPicker(buttonPanel),
-                           "Column Layout Settings"));
-        return panel;
-    }
-}
-
-class ColumnButtonPanel extends Panel implements DialogClient {
-    private ImageButton    one, two, three;
-    private Panel          panel  = new Panel();
-    private TenPixelBorder border = new TenPixelBorder(panel);
-
-    public ColumnButtonPanel(Applet applet) {
-        URL cb = applet.getCodeBase();
-
-        one   = new ImageButton(applet.getImage(cb, 
-                                        "gifs/one.gif"));
-        two   = new ImageButton(applet.getImage(cb, 
-                                        "gifs/two.gif"));
-        three = new ImageButton(applet.getImage(cb, 
-                                        "gifs/three.gif"));
-
-        panel.setLayout(new ColumnLayout(0));
-        panel.add(one);   
-        panel.add(two);   
-        panel.add(three); 
-
-        setLayout(new BorderLayout());
-        add      ("Center", border);
-    }
-    public void updateOrientations(Orientation horient, 
-                                   Orientation vorient,
-                                   int gap) {
-        panel.setLayout(new ColumnLayout(horient, vorient, gap));
-        border.validate();
-    }
-    public void dialogDismissed(Dialog d) { }
-}
-
-class ColumnPicker extends Panel {
-    private Label  horientLabel = new Label("Horizontal:");
-    private Label  vorientLabel = new Label("Vertical:");
-    private Label  gapLabel     = new Label("Gap:");
-
-    private Choice hchoice   = new Choice();
-    private Choice vchoice   = new Choice();
-    private Choice gapChoice = new Choice();
-
-    private ColumnButtonPanel buttonPanel;
-
-    public ColumnPicker(ColumnButtonPanel buttonPanel) {
-        Panel orientations = new Panel();
-        Panel gap          = new Panel();
-
-        this.buttonPanel = buttonPanel;
-        hchoice.addItem("left");
-        hchoice.addItem("center");
-        hchoice.addItem("right");
-        hchoice.select(1);
-
-        vchoice.addItem("top");
-        vchoice.addItem("center");
-        vchoice.addItem("bottom");
-        vchoice.select(1);
-
-        gapChoice.addItem("0");
-        gapChoice.addItem("5");
-        gapChoice.addItem("10");
-        gapChoice.addItem("15");
-        gapChoice.addItem("20");
-
-        orientations.add(horientLabel);  
-        orientations.add(hchoice);
-        orientations.add(vorientLabel);  
-        orientations.add(vchoice);
-
-        gap.add(gapLabel);               
-        gap.add(gapChoice);
-
-        add(new Box(orientations, "Orientations"));
-        add(new Box(gap,          "Gap"));
-    }
-    public boolean action(Event event, Object what) {
-        String horient, vorient;
-        int    gap;
-
-        horient = hchoice.getSelectedItem();
-        vorient = vchoice.getSelectedItem();
-        gap     = 
-        (new Integer(gapChoice.getSelectedItem())).intValue();
-
-        buttonPanel.updateOrientations(
-            Orientation.fromString(horient), 
-            Orientation.fromString(vorient), gap);
-
-        return true;
-    }
-}
diff --git a/java/gjt/test/ComponentScrollerTest.java b/java/gjt/test/ComponentScrollerTest.java
deleted file mode 100644
index 4f0e4a2ec70..00000000000
--- a/java/gjt/test/ComponentScrollerTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import java.util.Vector;
-import java.applet.Applet;
-import java.net.URL;
-
-import gjt.Border;
-import gjt.ButtonPanel;
-import gjt.ColumnLayout;
-import gjt.ComponentScroller;
-import gjt.EtchedBorder;
-import gjt.ImageButton;
-import gjt.RowLayout;
-import gjt.Separator;
-import gjt.StickyImageButtonController;
-
-/**
- * A phony image store, where you can purchase images.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     Border
- * @see     ButtonPanel
- * @see     ImageButton
- * @see     Separator
- * @see     StickyImageButtonController
- * @see     ComponentScroller
- */
-public class ComponentScrollerTest extends UnitTest {
-    public String title() { 
-        return "ComponentScroller Test"; 
-    }
-    public Panel  centerPanel() { 
-        return new ComponentScrollerTestPanel(this);
-    }
-}
-
-class ComponentScrollerTestPanel extends Panel {
-    private ComponentScroller scroller;
-    private Panel             purchasePanel;
-    private ImageButtonRow    nextRow;
-    private String[][]        imageNames = {
-        { "gifs/ballot_box.gif",  "gifs/filmstrip.gif",
-          "gifs/fly.gif",         "gifs/eagle.gif",
-          "gifs/bullet_hole.gif" },
-        { "gifs/mad_hacker.gif",  "gifs/tricycle.gif",
-          "gifs/light_bulb1.gif", "gifs/scissors.gif",
-          "gifs/palette.gif" },
-        { "gifs/frog.gif",        "gifs/gear.gif",
-          "gifs/wrench.gif",      "gifs/www.gif",
-          "gifs/Dining.gif" },
-        { "gifs/ant.gif",         "gifs/abomb.gif",
-          "gifs/basketball.gif",  "gifs/soccer.gif",
-          "gifs/skelly.gif" },
-    };
-    public ComponentScrollerTestPanel(Applet applet) {
-        URL    base = applet.getCodeBase();
-        Image  nextImage;
-        Border border, blackBorder;
-
-        purchasePanel = new Panel();
-        purchasePanel.setLayout(new ColumnLayout());
-
-        for(int r=0; r < imageNames.length; ++r) {
-            nextRow = new ImageButtonRow();
-            nextRow.setLayout(new RowLayout());
-
-            for(int c=0; c < imageNames[r].length; ++c) {
-                nextImage = applet.getImage(base, 
-                                            imageNames[r][c]);
-                nextRow.add(nextImage);
-            }
-            purchasePanel.add(nextRow);
-        }
-        purchasePanel.add(new ButtonPurchaseForm());
-
-        scroller    = new ComponentScroller();
-        border      = new Border(purchasePanel, 3, 2);
-        blackBorder = new Border(border, 1, 0);
-
-        border.setLineColor(Color.gray);
-        blackBorder.setLineColor(Color.black);
-        scroller.setComponent(blackBorder);
-
-        setLayout(new BorderLayout());
-        add("Center", scroller);
-    }
-}
-
-class ButtonPurchaseForm extends Panel {
-    TextField nameField    = new TextField(25);
-    TextField addressField = new TextField(25);
-    TextField cityField    = new TextField(15);
-    TextField stateField   = new TextField(2);
-
-    Choice    paymentChoice = new Choice();
-
-    Button    paymentButton = new Button("Purchase");
-    Button    cancelButton   = new Button("Cancel");
-
-    public ButtonPurchaseForm() {
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        Separator sep = new Separator();
-        Label title   = 
-            new Label("Purchase A Fine Image Today");
-        Label name    = new Label("Name:");
-        Label address = new Label("Address:");
-        Label payment = new Label("Purchase Method:");
-        Label phone   = new Label("Phone:");
-        Label city    = new Label("City:");
-        Label state   = new Label("State:");
-
-        setLayout(gbl);
-
-        paymentChoice.addItem("Visa");
-        paymentChoice.addItem("MasterCard");
-        paymentChoice.addItem("COD");
-
-        title.setFont(new Font("Times-Roman", 
-                               Font.BOLD + Font.ITALIC,
-                               16));
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(title, gbc);
-        add(title);
-
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.fill      = GridBagConstraints.HORIZONTAL;
-        gbc.insets    = new Insets(0,0,10,0);
-        gbl.setConstraints(sep, gbc);
-        add(sep);
-
-        gbc.anchor    = GridBagConstraints.WEST;
-        gbc.gridwidth = 1;
-        gbc.insets    = new Insets(0,0,0,10);
-        gbl.setConstraints(name, gbc);
-        add(name);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(nameField, gbc);
-        add(nameField);
-
-        gbc.gridwidth = 1;
-        gbl.setConstraints(address, gbc);
-        add(address);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.fill = GridBagConstraints.HORIZONTAL;
-        gbl.setConstraints(addressField, gbc);
-        add(addressField);
-
-        gbc.gridwidth = 1;
-        gbl.setConstraints(city, gbc);
-        add(city);
-
-        gbl.setConstraints(cityField, gbc);
-        add(cityField);
-
-        gbl.setConstraints(state, gbc);
-        add(state);
-
-        gbl.setConstraints(stateField, gbc);
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbl.setConstraints(stateField, gbc);
-        add(stateField);
-
-        gbc.gridwidth = 1;
-        gbl.setConstraints(payment, gbc);
-        gbc.insets = new Insets(5,0,5,0);
-        add(payment);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.fill      = GridBagConstraints.NONE;
-        gbl.setConstraints(paymentChoice, gbc);
-        add(paymentChoice);
-
-        ButtonPanel buttonPanel = new ButtonPanel();
-
-        buttonPanel.add(paymentButton);
-        buttonPanel.add(cancelButton);
-
-        gbc.anchor    = GridBagConstraints.SOUTH;
-        gbc.insets    = new Insets(5,0,0,0);
-        gbc.fill      = GridBagConstraints.HORIZONTAL;
-        gbc.gridwidth = 4;
-        gbl.setConstraints(buttonPanel, gbc);
-        add(buttonPanel);
-    }
-}
-class ImageButtonRow extends Panel {
-    public ImageButtonRow() {
-        setLayout(new RowLayout());
-    }
-    public void add(Image image) {
-        ImageButton button = new ImageButton(image);
-        add(button);
-        button.setController(
-                new StickyImageButtonController(button));
-    }
-}
diff --git a/java/gjt/test/ConnectionsPanel.java b/java/gjt/test/ConnectionsPanel.java
deleted file mode 100644
index 7790d0709b1..00000000000
--- a/java/gjt/test/ConnectionsPanel.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-
-class ConnectionsPanel extends Panel {
-    public ConnectionsPanel() {
-        add(new Label("Connections"));
-    }
-}
diff --git a/java/gjt/test/DialogTest.java b/java/gjt/test/DialogTest.java
deleted file mode 100644
index f92069b7c49..00000000000
--- a/java/gjt/test/DialogTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import java.applet.Applet;
-
-import gjt.Util;
-import gjt.DialogClient;
-import gjt.MessageDialog;
-import gjt.ProgressDialog;
-import gjt.QuestionDialog;
-import gjt.YesNoDialog;
-
-/**
- * Tests 4 gjt custom dialogs:
- * <dl>
- * <dd> MessageDialog  (a dialog which displays a message)
- * <dd> QuestionDialog (a dialog which asks a question)
- * <dd> YesNoDialog    (a dialog with yes/no buttons)
- * <dd> ProgressDialog (a dialog which records progress of task)
- * </dl>
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.DialogClient
- * @see     gjt.MessageDialog
- * @see     gjt.ProgressDialog;
- * @see     gjt.QuestionDialog;
- * @see     gjt.YesNoDialog;
- */
-public class DialogTest extends UnitTest {
-    public String title() { 
-        return "Graphic Java Toolkit Dialog Test"; 
-    }
-    public Panel centerPanel() { 
-        return new DialogLauncher();
-    }
-}
-
-class DialogLauncher extends Panel implements DialogClient {
-    private MessageDialog  messageDialog;
-    private QuestionDialog questionDialog;
-    private YesNoDialog    yesNoDialog;
-    private ProgressDialog progressDialog;
-
-    private Button messageDialogButton, questionDialogButton,
-                   yesNoDialogButton,   progressDialogButton;
-
-    public DialogLauncher() {
-        setLayout(new GridLayout(0,1));
-
-        add(messageDialogButton  = 
-            new Button("Message Dialog"));
-
-        add(questionDialogButton = 
-            new Button("Question Dialog"));
-
-        add(yesNoDialogButton    = 
-            new Button("YesNo Dialog"));
-
-        add(progressDialogButton = 
-                new Button("Progress Dialog"));
-    }
-    public boolean action(Event event, Object what) {
-        if(event.target == messageDialogButton) {
-            messageDialog = MessageDialog.getMessageDialog(
-                Util.getFrame(this), this, 
-                "Example Message Dialog", 
-                "This is an example of a message dialog.");
-
-            messageDialog.show();
-        }
-        else if(event.target == questionDialogButton) {
-            questionDialog = 
-                new QuestionDialog(Util.getFrame(this), this, 
-                                   "Example Question Dialog", 
-                                   "Name:  ", "Gumby", 45);
-            questionDialog.show();
-        }
-        else if(event.target == yesNoDialogButton) {
-            yesNoDialog = 
-                YesNoDialog.getYesNoDialog(Util.getFrame(this), 
-                                       this, 
-                                       "Example YesNo Dialog",
-                                       "Another cup of Java?");
-            yesNoDialog.show();
-        }
-        else if(event.target == progressDialogButton) {
-            progressDialog = 
-                ProgressDialog.getProgressDialog(
-                    Util.getFrame(this), 
-                    "Example Progress Dialog",
-                    Color.blue);
-
-            progressDialog.show();
-
-            ProgressThread thread = 
-                new ProgressThread(progressDialog);
-            thread.start();
-        }
-
-        return true;
-    }
-    public void dialogDismissed(Dialog d) {
-        if(d == messageDialog)  {
-            System.out.println("MessageDialog Down");
-        }
-        if(d == questionDialog) {
-            if(questionDialog.wasCancelled())
-                System.out.println("CANCELLED"); 
-            else 
-            System.out.println(
-                "Name:  " + 
-                questionDialog.getTextField().getText());
-        }
-        if(d == yesNoDialog) {
-            if(yesNoDialog.answeredYes())
-                System.out.println("YES");
-            else
-                System.out.println("NO");
-        }
-    }
-}
-
-class ProgressThread extends Thread {
-    private ProgressDialog dialog;
-    private double         percentComplete = 0;
-
-    public ProgressThread(ProgressDialog dialog) {
-        this.dialog = dialog;
-    }
-    public void run() {
-        while(percentComplete <= 100) {
-            try { Thread.currentThread().sleep(500); }
-            catch(InterruptedException e) { }
-
-            dialog.setPercentComplete(percentComplete);
-            percentComplete += 10;
-        }
-    }
-}
diff --git a/java/gjt/test/DrawnRectangleTest.java b/java/gjt/test/DrawnRectangleTest.java
deleted file mode 100644
index 19e3c195f7c..00000000000
--- a/java/gjt/test/DrawnRectangleTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import gjt.DrawnRectangle;
-import gjt.EtchedRectangle;
-import gjt.ThreeDRectangle;
-
-/**
- * 9 DrawnRectangles (some of which are EtchedRectangles
- * and ThreeDRectangles) with varying characteristics such
- * as line widths and colors.<p>
- *
- * A mouse down (any mouse button) in any of the rectangles 
- * causes information about the rectangle to be printed to 
- * System.out. (Output will go to Java Console in Netscape).<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.DrawnRectangle
- * @see     gjt.EtchedRectangle
- * @see     gjt.ThreeDRectangle
- */
-public class DrawnRectangleTest extends UnitTest {
-    public String title() { 
-        return "Drawn Rectangle Test";  
-    }
-    public Panel centerPanel() { 
-        return new DrawnRectangleTestPanel();
-    }
-}
-
-class DrawnRectangleTestPanel extends Panel {
-    private DrawnRectangle  drawnFilledOrange, 
-                            drawnFilledBlue, drawnBlue;
-    private EtchedRectangle etchedOut, 
-                            etchedIn, etchedFilledCyan;
-    private ThreeDRectangle thinRaised, 
-                            thinInset, thickRaised, thickInset;
-
-    public DrawnRectangleTestPanel() {
-        drawnFilledOrange = 
-            new DrawnRectangle (this, 10,  10,  100, 100);
-        drawnFilledBlue = 
-            new DrawnRectangle (this, 135, 135, 100, 100);
-        drawnBlue = 
-            new DrawnRectangle (this, 505, 135, 100, 100);
-        etchedFilledCyan = 
-            new EtchedRectangle(this, 10,  135, 100, 100);
-
-        etchedIn = new EtchedRectangle(this, 385, 10, 100, 100);
-        etchedOut= new EtchedRectangle(this, 505, 10, 100, 100);
-
-        thinRaised = 
-            new ThreeDRectangle(this, 135, 10,  100, 100);
-        thinInset  = 
-            new ThreeDRectangle(this, 260, 10,  100, 100);
-        thickRaised = 
-            new ThreeDRectangle(this, 385, 135, 100, 100);
-        thickInset = 
-            new ThreeDRectangle(this, 260, 135, 100, 100);
-
-        drawnFilledOrange.setLineColor(Color.black);
-
-        drawnFilledBlue.setLineColor(Color.yellow);
-        drawnFilledBlue.setThickness(3);
-
-        drawnBlue.setLineColor(Color.blue);
-        drawnBlue.setThickness(5);
-
-        thickRaised.setThickness(5);
-        thickInset.setThickness (5);
-    }
-    public Dimension preferredSize() {
-        return new Dimension(610, 270);
-    }
-    public void paint(Graphics g) {
-        drawnFilledOrange.paint();
-        drawnFilledOrange.fill (Color.orange);
-
-        drawnFilledBlue.paint  ();
-        drawnFilledBlue.fill   (Color.blue);
-
-        drawnBlue.paint         ();
-
-        etchedIn.paintEtchedIn  ();
-        etchedOut.paintEtchedOut();
-
-        etchedFilledCyan.paintEtchedIn();
-        etchedFilledCyan.fill(Color.cyan);
-
-        thinRaised.paintRaised  ();
-        thinInset.paintInset    ();
-
-        thickRaised.paintRaised ();
-
-        thickInset.paintInset  ();
-        thickInset.fill      (Color.red);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(drawnFilledOrange.inside(x,y)) 
-            show(drawnFilledOrange);
-
-        if(drawnFilledBlue.inside(x,y))  show(drawnFilledBlue);
-        if(drawnBlue.inside(x,y))        show(drawnBlue);
-        if(etchedIn.inside(x,y))         show(etchedIn);
-        if(etchedOut.inside(x,y))        show(etchedOut);
-        if(etchedFilledCyan.inside(x,y)) show(etchedFilledCyan);
-        if(thinRaised.inside(x,y))       show(thinRaised);
-        if(thickRaised.inside(x,y))      show(thickRaised);
-        if(thinInset.inside(x,y))        show(thinInset);
-        if(thickInset.inside(x,y))       show(thickInset);
-
-        return true;
-    }
-    private void show(DrawnRectangle drawnRectangle) {
-        System.out.println(drawnRectangle);
-    }
-}
diff --git a/java/gjt/test/FontDialogTest.java b/java/gjt/test/FontDialogTest.java
deleted file mode 100644
index d0b535c27f9..00000000000
--- a/java/gjt/test/FontDialogTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-
-import gjt.FontDialog;
-import gjt.DialogClient;
-import gjt.Util;
-
-/**
- * Activating the button causes the FontDialog to be displayed.  
- * Selecting a font from the FontDialog causes the button to 
- * use the selected font.<p>
- *
- * This unit test overrides FontDialog to reset the labels 
- * displayed in the buttons, and to reset the list of font 
- * sizes displayed.  See FontDialog for a discussion of the 
- * overridden methods.<p>
- *
- *<em>Note:  The FontDialog takes forever to come up in 
- * Netscape.</em>
- *
- * @version 1.0, Apr 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Util
- * @see     gjt.FontDialog
- * @see     gjt.DialogClient
- */
-class LotsOfSizesFontDialog extends FontDialog {
-    private static String _defaultSizes[] = 
-        { "8", "10", "12", "14", "16", 
-          "18", "20", "22", "24",
-          "26", "28", "30", "32", "34",
-          "36", "38", "40", "42", "44",
-          "46", "48", "50", "52", "54",
-          "56", "58", "60", "62", "64",
-          "66", "68", "70", "72", "74",
-          "76", "78", "80", "82", "84",
-          "86", "88", "90", "92", "94",
-          "96", "98", "100" };
-
-    public LotsOfSizesFontDialog(Frame        frame, 
-                                 DialogClient client, 
-                                 Font         font) {
-        super(frame, client, font, true);
-    }
-    public String getPreviewButtonLabel() { 
-        return "Preview Selected Font";
-    }
-    public String getOkButtonLabel     () { 
-        return "I'll Take It";         
-    }
-    public String getCancelButtonLabel () { 
-        return "Nevermind";            
-    }
-    public String[] getFontSizes         () { 
-        return _defaultSizes;          
-    }
-}
-
-public class FontDialogTest extends UnitTest {
-    public String title() { return "Font Dialog Test"; }
-    public Panel centerPanel() { 
-        return new FontDialogTestPanel(); 
-    }
-}
-
-class FontDialogTestPanel extends    Panel 
-                          implements DialogClient {
-    private Button fontButton;
-
-    public FontDialogTestPanel() {
-        setLayout(new BorderLayout());
-        add("Center", fontButton = new Button("Fonts ..."));
-    }
-    public boolean handleEvent(Event event) {
-        if(event.id == Event.ACTION_EVENT) {
-            LotsOfSizesFontDialog d;
-            d = new LotsOfSizesFontDialog(Util.getFrame(this), 
-                                          this,
-                                          fontButton.getFont());
-            d.show();
-        }
-        return true;
-    }
-    public void dialogDismissed(Dialog d) {
-        FontDialog fontDialog   = (FontDialog)d;
-        Font       fontSelected = fontDialog.getFontSelected();
-
-        if(fontSelected != null)
-            fontButton.setFont(fontSelected);
-
-        fontButton.requestFocus();
-    }
-}
diff --git a/java/gjt/test/IconCardPanelTest.java b/java/gjt/test/IconCardPanelTest.java
deleted file mode 100644
index 33a65e1939c..00000000000
--- a/java/gjt/test/IconCardPanelTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import java.net.URL;
-import gjt.IconCardPanel; 
-
-/**
- * A gjt.IconCardPanel that controls 3 Panels.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.IconCardPanel
- */
-public class IconCardPanelTest extends UnitTest {
-    public String title() { return "IconCardPanel Test"; }
-    public Panel centerPanel() { 
-        return new CardPanelTestPanel(this); 
-    }
-}
-class CardPanelTestPanel extends Panel {
-    IconCardPanel mvp = new IconCardPanel();
-
-    public CardPanelTestPanel(Applet applet) {
-        URL cb = applet.getCodeBase();
-
-        setLayout(new BorderLayout());
-
-        Image folks = applet.getImage(cb,"gifs/cell_phone.gif");
-        Image pencil = applet.getImage(cb,"gifs/clipboard.gif");
-        Image library =
-                applet.getImage(cb, "gifs/mad_hacker.gif");
-
-        mvp.addImageButton(folks, 
-                           "Attributes", 
-                           new AttributesPanel(applet));
-        mvp.addImageButton(pencil, 
-                           "Connections", 
-                           new ConnectionsPanel());
-        mvp.addImageButton(library, 
-                           "Oracle", 
-                           new OccupationOracle());
-
-        add("Center", mvp);
-    }
-}
diff --git a/java/gjt/test/ImageButtonTest.java b/java/gjt/test/ImageButtonTest.java
deleted file mode 100644
index 52df6efeba0..00000000000
--- a/java/gjt/test/ImageButtonTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import gjt.Box;
-import gjt.ImageButton;
-import gjt.ImageButtonEvent;
-import gjt.SpringyImageButtonController;
-import gjt.StickyImageButtonController;
-
-/**
- * 2 ImageButtons, one springy and the other sticky, both 
- * crabby.<p>
- *
- * Both ImageButtons come with an awt.Button that is used to 
- * enable/disable the ImageButton it's associated with.<p>
- *
- * ImageButtonEvents, along with mouse enter and mouse exit
- * events for the two image buttons are printed out.<p>
- *
- * @version 1.0, Apr 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ImageButton
- * @see     gjt.ImageButtonEvent
- * @see     gjt.SpringyImageButtonController
- * @see     gjt.StickyImageButtonController
- */
-public class ImageButtonTest extends UnitTest {
-    public String title() { 
-        return "ImageButton Test"; 
-    }
-    public Panel centerPanel() { 
-        return new ImageButtonTestPanel(this); 
-    }
-}
-
-class ImageButtonTestPanel extends Panel {
-    private ImageButton springyButton;
-    private Button      springyButtonEnabler;
-    private ImageButton stickyButton;
-    private Button      stickyButtonEnabler;
-
-    public ImageButtonTestPanel(Applet applet) {
-        Image              image;
-        Box                springyBox, stickyBox;
-        GridBagLayout      gbl = new GridBagLayout();
-        GridBagConstraints gbc = new GridBagConstraints();
-
-        image = 
-        applet.getImage(applet.getCodeBase(), "gifs/crab.gif");
-
-        springyButton        = new ImageButton(image);
-        springyButtonEnabler = new Button     ("Disable");
-        stickyButton         = new ImageButton(image);
-        stickyButtonEnabler  = new Button     ("Disable");
-
-        stickyButton.setController(
-			new StickyImageButtonController(stickyButton));
-
-        setLayout(gbl);
-
-        gbc.anchor    = GridBagConstraints.NORTH;
-        springyBox    = new Box(springyButton, "Springy");
-        gbc.insets    = new Insets(10,0,0,0);
-        gbl.setConstraints(springyBox, gbc); add(springyBox);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.insets    = new Insets(45,10,0,0);
-        gbl.setConstraints(springyButtonEnabler, gbc); 
-        add(springyButtonEnabler);
-
-        gbc.anchor    = GridBagConstraints.NORTH;
-        gbc.gridwidth = 1;
-        stickyBox     = new Box(stickyButton, "Sticky");
-        gbc.insets    = new Insets(10,0,0,0);
-        gbc.weighty   = 1.0;
-        gbl.setConstraints(stickyBox, gbc); add(stickyBox);
-
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-        gbc.insets    = new Insets(45,10,0,0);
-        gbl.setConstraints(stickyButtonEnabler, gbc); 
-        add(stickyButtonEnabler);
-    }
-    public boolean action(Event event, Object what) {
-        Button button = (Button)event.target;
-        String label  = (String)what;
-
-        if(button == stickyButtonEnabler) {
-            if(label.equals("Disable")) stickyButton.disable();
-            else                        stickyButton.enable();
-        }
-        else {
-            if(label.equals("Disable")) springyButton.disable();
-            else                        springyButton.enable();
-        }
-        if(label.equals("Disable")) button.setLabel("Enable");
-        else                        button.setLabel("Disable");
-
-        return true;
-    }
-    public boolean handleEvent(Event event) {
-        boolean eventHandled = false;
-        
-        if(event instanceof ImageButtonEvent) {
-            System.out.println("ImageButton " + event);
-            eventHandled = true;
-        }
-        if(event.id == Event.MOUSE_ENTER) {
-            if(event.target == stickyButton)
-                System.out.println("Sticky Button Entered");
-
-            else if(event.target == springyButton)
-                System.out.println("Springy Button Entered");
-
-            eventHandled = true;
-        }
-        if(event.id == Event.MOUSE_EXIT) {
-            if(event.target == stickyButton)
-                System.out.println("Sticky Button Exited");
-
-            else if(event.target == springyButton)
-                System.out.println("Springy Button Exited");
-
-            eventHandled = true;
-        }
-        if(eventHandled) return true;
-        else             return super.handleEvent(event);
-    }
-}
diff --git a/java/gjt/test/ImageDissolverTest.java b/java/gjt/test/ImageDissolverTest.java
deleted file mode 100644
index c157408d2af..00000000000
--- a/java/gjt/test/ImageDissolverTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.image.FilteredImageSource;
-
-import gjt.Util;
-import gjt.image.ImageDissolver;
-
-/**
- * Initially displays an image.  Subsequent mouse clicks in the 
- * canvas containing the image cause the image to fade in or 
- * fade out, depending upon it's current state.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.image.DissolveFilter
- * @see     gjt.image.ImageDissolver
- */
-public class ImageDissolverTest extends UnitTest {
-    public String title() { 
-        return "ImageDissolver Test " + 
-               "(Click Below to Fade Picture In/Out)";     
-    }
-    public Panel centerPanel() { 
-        return new ImageDissolverTestPanel(this); 
-    }
-}
-
-class ImageDissolverTestPanel extends Panel {
-    ImageDissolverTestCanvas canvas;
-
-    public ImageDissolverTestPanel(Applet applet) {
-        add(canvas = new ImageDissolverTestCanvas(applet));
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        canvas.doFade();
-        return true;
-    }
-}
-
-class ImageDissolverTestCanvas extends Canvas {
-    private boolean         isFaded = false;
-    private Image           image;
-    private ImageDissolver  dissolver;
-
-    public ImageDissolverTestCanvas(Applet applet) {
-        image = 
-        applet.getImage(applet.getCodeBase(),"gifs/saint.gif");
-
-        Util.waitForImage(this, image);
-        dissolver = new ImageDissolver(this, image);
-    }
-    public void paint(Graphics g) {
-        if( ! isFaded)
-            g.drawImage(image, 0, 0, this);
-    }
-    public Dimension preferredSize() {
-        return new Dimension(image.getWidth(this), 
-                             image.getHeight(this));
-    }
-    public void doFade() {
-        if(isFaded) dissolver.fadeIn (0,0);
-        else        dissolver.fadeOut(0,0);
-
-        isFaded = isFaded ? false : true;
-    }
-}
diff --git a/java/gjt/test/ImageScrollerTest.java b/java/gjt/test/ImageScrollerTest.java
deleted file mode 100644
index 0476682eb6d..00000000000
--- a/java/gjt/test/ImageScrollerTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import java.applet.Applet;
-import java.net.URL;
-
-import gjt.ImageScroller;
-import gjt.Util;
-
-/**
- * Four images are loaded; subsequent mouse clicks cycle 
- * through the images, that are displayed in an ImageScroller.
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Scroller
- * @see     gjt.ImageScroller
- */
-public class ImageScrollerTest extends UnitTest {
-    public String title() { 
-        return "ImageScroller Test"; 
-    }
-    public Panel centerPanel() { 
-        return new ImageScrollerTestPanel(this); 
-    }
-}
-
-class ImageScrollerTestPanel extends Panel {
-    private Image[]       images     = new Image[4];         
-    private int           imageIndex = 0;
-    private ImageScroller scroller;
-
-    public ImageScrollerTestPanel(Applet applet) {
-        URL cb = applet.getCodeBase();
-
-        images[0]=applet.getImage(cb,"gifs/ashleyAndRoy.gif"); 
-        images[1]=applet.getImage(cb,"gifs/ashleyAndSabre.gif");
-        images[2]=applet.getImage(cb,"gifs/anjinAndMariko.gif");
-        images[3]=applet.getImage(cb,"gifs/ashleyAndAnjin.gif");
-
-        setLayout(new BorderLayout());
-        add("Center", scroller = new ImageScroller(images[0]));
-    }
-    public boolean mouseUp(Event event, int x, int y) {
-        if(imageIndex == images.length-1) imageIndex = 0;
-        else                              imageIndex++;
-
-        Util.setCursor(Frame.WAIT_CURSOR, this);
-        scroller.resetImage(images[imageIndex]);
-        Util.setCursor(Frame.DEFAULT_CURSOR, this);
-
-        return true;
-    }
-}
diff --git a/java/gjt/test/LabelCanvasTest.java b/java/gjt/test/LabelCanvasTest.java
deleted file mode 100644
index cb4c0a857ae..00000000000
--- a/java/gjt/test/LabelCanvasTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package gjt.test;
-import java.applet.Applet;
-import java.awt.Event;
-import java.awt.Panel;
-import java.awt.Insets;
-import java.awt.Graphics;
-import gjt.LabelCanvas;
-import gjt.SelectionEvent;
-import gjt.Util;
-
-/**
- * Four LabelCanvases, each with different insets.  The leftmost
- * LabelCanvas has standard insets (2 all around), while the
- * other three were constructed as follows:
- * <pre>
- *      insetFive.setInsets   (new Insets(5,5,5,5));
- *      insetTen.setInsets    (new Insets(10,10,10,10));
- *      insetFifteen.setInsets(new Insets(15,15,15,15));
- * </pre><p>
- *
- * LabelCanvases generate SelectionEvents, that we watch
- * for in our handleEvent() method, and print out.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.LabelCanvas
- */
-public class LabelCanvasTest extends UnitTest {
-    public String title() { return "LabelCanvas Test"; }
-    public Panel centerPanel() { 
-        return new LabelCanvasTestPanel(this); 
-    }
-}
-
-class LabelCanvasTestPanel extends Panel {
-    Applet applet;
-    public LabelCanvasTestPanel(Applet applet) {
-        this.applet = applet;
-        LabelCanvas standard = 
-            new LabelCanvas("Standard Insets");
-        LabelCanvas insetFive = 
-            new LabelCanvas("Insets = Five");
-        LabelCanvas insetTen = 
-            new LabelCanvas("Insets = Ten");
-        LabelCanvas insetFifteen = 
-            new LabelCanvas("Insets = Fifteen");
-
-        insetFive.setInsets   (new Insets(5,5,5,5));
-        insetTen.setInsets    (new Insets(10,10,10,10));
-        insetFifteen.setInsets(new Insets(15,15,15,15));
-        
-        add(standard);
-        add(insetFive);
-        add(insetTen);
-        add(insetFifteen);
-    }
-    public boolean handleEvent(Event event) {
-        if(event instanceof SelectionEvent) {
-            SelectionEvent sevent = (SelectionEvent)event;
-            LabelCanvas    canvas = (LabelCanvas)event.target;
-
-            if(sevent.isSelected())
-                System.out.println("LabelCanvas "    + 
-                                   canvas.getLabel() + 
-                                   " selected");
-            else
-                System.out.println("LabelCanvas "    + 
-                                   canvas.getLabel() +
-                                   " deselected");
-            return true;
-        }
-        return super.handleEvent(event);
-    }
-}
diff --git a/java/gjt/test/MessageDialogTest.java b/java/gjt/test/MessageDialogTest.java
deleted file mode 100644
index 6efddd08cb4..00000000000
--- a/java/gjt/test/MessageDialogTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-
-package gjt.test;
-
-import java.awt.*;
-import java.applet.Applet;
-
-import gjt.MessageDialog;
-import gjt.DialogClient;
-import gjt.Util;
-
-/**
- * Simple unit test that exercises gjt.MessageDialog.  This 
- * unit test serves to illustrate the use of gjt.DialogClient.  
- * For a unit test which covers all of the gjt dialogs, 
- * see gjt.test.DialogTest.
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.DialogClient
- * @see     gjt.MessageDialog
- */
-public class MessageDialogTest extends UnitTest {
-    public String title() { 
-        return "Message Dialog Test"; 
-    }
-    public Panel centerPanel() { 
-        return new MessageDialogLauncher();  
-    }
-}
-
-class MessageDialogLauncher extends Panel 
-                            implements DialogClient {
-    private MessageDialog  messageDialog;
-
-    public MessageDialogLauncher() {
-        add(new Button("Show Message Dialog"));
-    }
-    public boolean action(Event event, Object what) {
-        messageDialog = MessageDialog.getMessageDialog(
-                     Util.getFrame(this), this, 
-                     "Example Message Dialog", 
-                     "This is an example of a message dialog.");
-        messageDialog.show();
-        return true;
-    }
-    public void dialogDismissed(Dialog d) {
-        System.out.println("MessageDialog Down");
-    }
-}
diff --git a/java/gjt/test/OccupationOracle.java b/java/gjt/test/OccupationOracle.java
deleted file mode 100644
index a34c2ad2064..00000000000
--- a/java/gjt/test/OccupationOracle.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-
-// The OccupationOracle class makes a guess at a person's occupation 
-// within an engineering organization based on a few "key" traits.
-// Invalid entries in numeric fields result in an "Unknown" occupation.
-// This applet uses the awt.GridBagLayout class to structure the
-// occupation form.  The awt.GridBagLayout class allows fields to
-// be placed in rows and columns within a form.  Each component
-// is given a "display area" based on the constraints in effect
-// when it is added to the layout.
-
-// Author:  Jerry Jackson (thanks, sifu)
-
-public class OccupationOracle extends Panel {
-
-    // Construct the form.  Create each component of the form and
-    // add it to the layout.  Initialize the occupation to "Unknown". 
-
-    public OccupationOracle() {
-
-    // Use the GridBagLayout layout to construct rows and
-    // columns.
-
-    GridBagLayout      gridbag     = new GridBagLayout();
-
-    // Create a new set of constraints to use when adding
-    // a component to the layout.  The constraint values
-    // in effect when a component is added to the layout
-    // are cloned and stored in conjunction with the component 
-    // by the layout.
-
-    GridBagConstraints constraints = new GridBagConstraints();
-
-    // Set the font for the form.
-
-    //setFont(new Font("TimesRoman", Font.BOLD, 12));
-
-    // Associate the GridBagLayout object with the applet.
-
-    setLayout(gridbag);
-
-    // The "anchor" constraint determines how a component
-    // is justified within its display area.
-
-    constraints.anchor  = GridBagConstraints.WEST;
-
-    // Determines how much space should be given to this component.
-    // if left at 0.0, all components clump up in the middle as the
-    // padding is applied to the outside.
-
-    constraints.weightx = 1.0;
-
-    // Create a name label and text field.
-
-    makeNameField();
-
-    // Setting the "gridwidth" constraint to 1  will
-    // cause the component to take up the minimum 
-    // horizontal space in its row.
-    
-    constraints.gridwidth = 1;
-
-    // "addFormComponent" will associate the current constraints 
-    // with a component and add the component to the form.
-
-    addFormComponent(gridbag, nameLabel, constraints);
-
-    // Setting the "gridwidth" constraint to REMAINDER will
-    // cause the component to fill up the remainder of its row. 
-    // i.e. it will be the last entry in the row.
-
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-
-    // The "fill" constraint tells what to do if the item is in
-    // a area larger than it is.  In this case we want to fill
-    // any extra horizontal space.
-
-    constraints.fill      = GridBagConstraints.HORIZONTAL;
-
-    addFormComponent(gridbag, nameField, constraints);
-
-    // Create and add an age label and text field.
-
-    makeAgeField();
-
-    constraints.gridwidth = 1;
-    constraints.fill      = GridBagConstraints.NONE;
-    constraints.weightx   = 0.0;
-    addFormComponent(gridbag, ageLabel, constraints);
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 1.0;
-    addFormComponent(gridbag, ageField, constraints);
-
-    // Create and add a world view label and a single checkbox
-    // for a true/false value.
-
-    makeWorldViewField();
-
-    constraints.gridwidth = 1;
-    constraints.weightx   = 0.0;
-    addFormComponent(gridbag, worldViewLabel, constraints);
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 1.0;
-    addFormComponent(gridbag, worldViewField, constraints);
-
-
-    // Create and add a coffee consumption label and text field.
-
-    makeCoffeeField();
-
-    constraints.gridwidth = 1;
-    constraints.weightx   = 0.0;
-    addFormComponent(gridbag, coffeeLabel, constraints);
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 1.0;
-    addFormComponent(gridbag, coffeeField, constraints);
-
-
-    // Create and add a fashion sense label and a checkbox
-    // group that has three mutually exclusive values.
-
-    makeFashionField();
-
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 0.0;
-    constraints.weighty   = 0.0;
-    addFormComponent(gridbag, fashionLabel, constraints);
-
-    // The three checkboxes that represent fashion sense.
-
-    addFormComponent(gridbag, low, constraints);
-    addFormComponent(gridbag, medium, constraints);
-    addFormComponent(gridbag, high, constraints);
-
-    // The Occupation field is output only.
-
-    makeOccupationField();
-
-    constraints.gridwidth = 1;
-    constraints.weightx   = 0.0;
-    constraints.weighty   = 1.0;
-    constraints.fill      = GridBagConstraints.NONE;
-    addFormComponent(gridbag, occupationLabel, constraints);
-    constraints.fill      = GridBagConstraints.HORIZONTAL;
-    constraints.gridwidth = GridBagConstraints.REMAINDER;
-    constraints.weightx   = 1.0;
-    addFormComponent(gridbag, occupationField, constraints);
-
-    // Display the initial "Unknown" occupation.
-
-    recalculateOccupation();
-
-    resize(400, 250);
-    }
-
-    // The paint() method for this applet just calls the paintComponents()
-    // method which is defined by the Container class.  It causes all
-    // the components visible within the Container to get painted.
-
-    public void paint(Graphics g) {
-    paintComponents(g);
-    }
-
-    // When any action occurs within the form we do the same thing:
-    // recalculate the person's occupation.
-
-    public boolean action(Event event, Object arg) {
-    recalculateOccupation();
-    return true;
-    }
-
-    // A helper function that associates constraints with a component
-    // and adds it to the form.
-
-    private void addFormComponent(GridBagLayout grid, Component comp, 
-                  GridBagConstraints c) {
-    grid.setConstraints(comp, c);
-    add(comp);
-    }
-
-
-    // recalculateOccupation() fetches the values of each component
-    // and computes an occupation based on some truly stupid heuristics. 
-
-    private void recalculateOccupation() {
-
-    // If we don't have a name yet we might incorrectly categorize
-    // the CEO!
-
-    if (nameField.getText() == "") {
-        occupationField.setText("Unknown");
-    }
-
-    // Fetch other important values that we'll use in our 
-    // calculations.
-
-    int     age;
-    int     coffeeConsumption;
-    boolean binaryView = worldViewField.getState();
-
-
-    // Try to fetch integer values for age and coffeeConsumption.
-    // If the values in the fields can't be parsed as integers,
-    // set the occupation to "Unknown".
-
-    try {
-        age               = Integer.parseInt(ageField.getText());
-        coffeeConsumption = Integer.parseInt(coffeeField.getText());
-    } catch (Exception e) {
-        occupationField.setText("Unknown");
-        return;
-    }
-
-    // Check for the CEO.
-
-    String name = nameField.getText();
-
-    if (name.endsWith("II")  || 
-        name.endsWith("III") || 
-        name.endsWith("IV")) {
-
-        if (age < 35 || coffeeConsumption < 4) {
-        occupationField.setText("Junior Executive");
-        } else {
-        occupationField.setText("CEO");
-        }
-
-        return;
-    }
-
-    // Fashion sense is a critical piece of information.  
-    // The getCurrent() method of CheckboxGroup returns whichever
-    // Checkbox in the group is currently selected.  Only one
-    // can be selected at a time.
-
-    Checkbox fashionValue = fashionGroup.getCurrent();
-
-    if (fashionValue == low || fashionValue == medium) {
-
-        // There are two kinds of people in the world: those who
-        // divide people into two kinds and those who don't.
-
-        if (binaryView && coffeeConsumption >= 4) {
-        occupationField.setText("Engineer");
-
-        } else if ((age > 40 && binaryView) || 
-               (age < 40 && coffeeConsumption >= 4)) {
-        occupationField.setText("Engineering Manager");
-
-        } else {
-        occupationField.setText("Product Manager");
-        }
-
-    } else {
-
-        // High fashion sense.  Not an engineer!
-
-        if (binaryView || coffeeConsumption >= 4) {
-        occupationField.setText("Vice President");
-
-        } else {
-        occupationField.setText("Product Marketing");
-        }
-    }
-    }
-
-    // Helper functions to create form components.
-
-    private void makeNameField() {
-    nameLabel = new Label("Name: ");
-    nameField = new TextField(40);
-    }
-
-    private void makeAgeField() {
-    ageLabel = new Label("Age: ");
-    ageField = new TextField(3);
-    }
-
-    private void makeOccupationField() {
-    occupationLabel = new Label("Occupation: ");
-    occupationField = new TextField(40);
-    }
-
-    private void makeWorldViewField() {
-    worldViewLabel = new Label("Binary World View: ");
-    worldViewField = new Checkbox();
-    }
-
-    private void makeCoffeeField() {
-    coffeeLabel = new Label("Coffee consumption: ");
-    coffeeField = new TextField(3);
-    }
-
-    private void makeFashionField() {
-    fashionLabel = new Label("Fashion sense:");
-
-    fashionGroup = new CheckboxGroup();
-    low      = new Checkbox("Low   ", fashionGroup, false);
-    medium       = new Checkbox("Medium", fashionGroup, true);
-    high         = new Checkbox("High  ", fashionGroup, false);
-    }
-
-    // Text fields.
-
-    private TextField     nameField;
-    private TextField     ageField;
-    private TextField     coffeeField;
-    private TextField     occupationField;
-
-    // Labels.
-
-    private Label         nameLabel;
-    private Label         ageLabel;
-    private Label         coffeeLabel;
-    private Label         fashionLabel;
-    private Label         worldViewLabel;
-    private Label         occupationLabel;
-
-    // Checkboxes.
-
-    private Checkbox      worldViewField;
-    private Checkbox      low;
-    private Checkbox      medium;
-    private Checkbox      high;
-
-    // The fashion sense checkbox group.
-
-    private CheckboxGroup fashionGroup;
-}
-
-    
diff --git a/java/gjt/test/RowLayoutTest.java b/java/gjt/test/RowLayoutTest.java
deleted file mode 100644
index eb7b419ca17..00000000000
--- a/java/gjt/test/RowLayoutTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.net.URL;
-import java.awt.*;
-import gjt.*;
-
-/**
- * Lays out 3 image buttons, and provides controls for setting
- * orientations and gaps on the fly.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ImageButton
- * @see     gjt.Box
- */
-public class RowLayoutTest extends UnitTest {
-    public String title() { 
-        return "RowLayout Test";
-    }
-    public Panel centerPanel() {
-        RowButtonPanel buttonPanel = new RowButtonPanel(this);
-        Panel panel = new Panel();
-
-        panel.setLayout(new BorderLayout());
-        panel.add("Center", buttonPanel);
-        panel.add("North",  new Box(new RowPicker(buttonPanel),
-                            "Row Layout Settings"));
-        return panel;
-    }
-}
-
-class RowButtonPanel extends Panel implements DialogClient {
-    private ImageButton    one, two, three;
-    private Panel          panel  = new Panel();
-    private TenPixelBorder border = new TenPixelBorder(panel);
-
-    public RowButtonPanel(Applet applet) {
-        URL cb = applet.getCodeBase();
-
-        one   = new ImageButton(applet.getImage(cb, 
-                                            "gifs/one.gif"));
-        two   = new ImageButton(applet.getImage(cb, 
-                                            "gifs/two.gif"));
-        three = new ImageButton(applet.getImage(cb, 
-                                            "gifs/three.gif"));
-
-        panel.setLayout(new RowLayout(0));
-        panel.add(one);   
-        panel.add(two);   
-        panel.add(three); 
-
-        setLayout(new BorderLayout());
-        add      ("Center", border);
-    }
-    public void updateOrientations(Orientation horient, 
-                                   Orientation vorient,
-                                   int gap) {
-        panel.setLayout(new RowLayout(horient, vorient, gap));
-        border.validate();
-    }
-    public void dialogDismissed(Dialog d) { }
-}
-
-class RowPicker extends Panel {
-    private Label  horientLabel = new Label("Horizontal:");
-    private Label  vorientLabel = new Label("Vertical:");
-    private Label  gapLabel     = new Label("Gap:");
-
-    private Choice hchoice   = new Choice();
-    private Choice vchoice   = new Choice();
-    private Choice gapChoice = new Choice();
-
-    private RowButtonPanel buttonPanel;
-
-    public RowPicker(RowButtonPanel buttonPanel) {
-        Panel orientations = new Panel();
-        Panel gap          = new Panel();
-
-        this.buttonPanel = buttonPanel;
-        hchoice.addItem("left");
-        hchoice.addItem("center");
-        hchoice.addItem("right");
-        hchoice.select(1);
-
-        vchoice.addItem("top");
-        vchoice.addItem("center");
-        vchoice.addItem("bottom");
-        vchoice.select(1);
-
-        gapChoice.addItem("0");
-        gapChoice.addItem("5");
-        gapChoice.addItem("10");
-        gapChoice.addItem("15");
-        gapChoice.addItem("20");
-
-        orientations.add(horientLabel);  
-        orientations.add(hchoice);
-        orientations.add(vorientLabel);  
-        orientations.add(vchoice);
-
-        gap.add(gapLabel);               
-        gap.add(gapChoice);
-
-        add(new Box(orientations, "Orientations"));
-        add(new Box(gap,          "Gap"));
-    }
-    public boolean action(Event event, Object what) {
-        String horient, vorient;
-        int    gap;
-
-        horient = hchoice.getSelectedItem();
-        vorient = vchoice.getSelectedItem();
-        gap     = 
-        (new Integer(gapChoice.getSelectedItem())).intValue();
-
-        buttonPanel.updateOrientations(
-                    Orientation.fromString(horient), 
-                    Orientation.fromString(vorient), gap);
-
-        return true;
-    }
-}
diff --git a/java/gjt/test/RubberbandTest.java b/java/gjt/test/RubberbandTest.java
deleted file mode 100644
index ae256fb2c3a..00000000000
--- a/java/gjt/test/RubberbandTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import gjt.DrawingPanel;
-import gjt.Separator;
-import gjt.RowLayout;
-import gjt.rubberband.*;
-
-/**
- * A simple drawing applet that demonstrates the utility of 
- * the gjt.rubberband package.<p>
- *
- * Note that this unit test also serves as the unit test for
- * gjt.DrawingPanel.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.DrawingPanel
- * @see     gjt.rubberband.Rubberband
- * @see     gjt.rubberband.RubberbandLine
- * @see     gjt.rubberband.RubberbandRectangle
- * @see     gjt.rubberband.RubberbandEllipse
- * @see     gjt.rubberband.RubberbandPanel
- */
-public class RubberbandTest extends UnitTest {
-    public String title() { 
-        return "Rubberband Test"; 
-    }
-    public Panel centerPanel() { 
-        return new RubberbandTestPanel(); 
-    }
-}
-
-class RubberbandTestPanel extends Panel {
-    private DrawingPanel drawingPanel;
-    private ChoicePanel  choicePanel;
-
-    public RubberbandTestPanel() {
-        drawingPanel = new DrawingPanel();
-        choicePanel  = new ChoicePanel(drawingPanel);
-
-        setLayout(new BorderLayout());
-        add("North",  choicePanel);
-        add("Center", drawingPanel);
-    }
-}
-
-class ChoicePanel extends Panel {
-    private DrawingPanel drawingPanel;
-    private Color        color;
-    private Checkbox     fillCheckbox = new Checkbox();
-
-    public ChoicePanel(DrawingPanel drawingPanel) {
-        Panel    choicePanel     = new Panel();
-        Choice   geometricChoice = new Choice();
-        Choice   colorChoice     = new Choice();
-
-        this.drawingPanel = drawingPanel;
-    
-        geometricChoice.addItem("Lines");
-        geometricChoice.addItem("Rectangles");
-        geometricChoice.addItem("Ellipses");
-
-        colorChoice.addItem("Black");
-        colorChoice.addItem("Red");
-        colorChoice.addItem("Blue");
-        colorChoice.addItem("Gray");
-        colorChoice.addItem("White");
-
-        choicePanel.setLayout(new RowLayout(10));
-        choicePanel.add(new Label("Shape:"));
-        choicePanel.add(geometricChoice);
-        choicePanel.add(new Label("Color:"));
-        choicePanel.add(colorChoice);
-        choicePanel.add(new Label("Fill:"));
-        choicePanel.add(fillCheckbox);
-
-        setLayout(new BorderLayout());
-        add("Center", choicePanel);
-        add("South",  new Separator());
-    }
-    public boolean action(Event event, Object what) {
-        if(event.target instanceof Checkbox) {
-            drawingPanel.setFill(fillCheckbox.getState());
-        }
-        else if(event.target instanceof Choice) {
-            if(((String)what).equals("Lines")) {     
-                fillCheckbox.setState(false);
-                drawingPanel.drawLines();
-            }
-            else if(((String)what).equals("Rectangles")) {
-                System.out.println("Rectangles");
-                drawingPanel.drawRectangles();
-            }
-            else if(((String)what).equals("Ellipses"))   
-                drawingPanel.drawEllipses  ();
-            else if(((String)what).equals("Black")) 
-                drawingPanel.setColor(Color.black);
-            else if(((String)what).equals("Red"))   
-                drawingPanel.setColor(Color.red);
-            else if(((String)what).equals("Blue"))  
-                drawingPanel.setColor(Color.blue);
-            else if(((String)what).equals("Gray"))  
-                drawingPanel.setColor(Color.gray);
-            else if(((String)what).equals("White")) 
-                drawingPanel.setColor(Color.white);
-        }
-        return true;
-    }
-    public Insets insets() { return new Insets(5,0,5,0); }
-}
diff --git a/java/gjt/test/SeparatorTest.java b/java/gjt/test/SeparatorTest.java
deleted file mode 100644
index 3dd80173ea3..00000000000
--- a/java/gjt/test/SeparatorTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import gjt.Etching;
-import gjt.Separator;
-
-/**
- * Two Separators, one horizontal and the other vertical, the 
- * former etched in, and the latter etched out are laid out with 
- * an adorning Label for each.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.UnitTest
- * @see     gjt.Separator
- */
-public class SeparatorTest extends UnitTest {
-    public String title      () { return "Separator Test"; }
-    public Panel  centerPanel() { 
-        return new SeparatorTestPanel(); 
-    }
-}
-
-class SeparatorTestPanel extends Panel {
-    public SeparatorTestPanel() {
-        setLayout(new BorderLayout());
-        add("North",  new SeparatorTestNorthPanel ());
-        add("Center", new SeparatorTestCenterPanel());
-    }
-}
-
-class SeparatorTestNorthPanel extends Panel {
-    Separator separator = new Separator();
-
-    public SeparatorTestNorthPanel() {
-        setLayout(new BorderLayout());
-        add("North", new Label("North Of Etched-In Separator"));
-        add("South", separator);
-    }
-}
-
-class SeparatorTestCenterPanel extends Panel {
-    Separator separator = new Separator(Etching.OUT);
-    
-    public SeparatorTestCenterPanel() {
-        GridBagConstraints gbc = new GridBagConstraints();
-        GridBagLayout      gbl = new GridBagLayout();
-        Label label = new Label("West Of Etched-Out Separator");
-
-        setLayout(gbl);
-        gbc.anchor  = GridBagConstraints.WEST;
-        gbc.insets  = new Insets(0,0,0,10);
-        gbl.setConstraints(label, gbc);
-        add(label);
-
-        gbc.insets  = new Insets(0,0,0,0);
-        gbc.weightx = 1.0;
-        gbc.weighty = 1.0;
-        gbc.fill    = GridBagConstraints.VERTICAL;
-        gbl.setConstraints(separator, gbc);
-        add(separator);
-
-    }
-}
diff --git a/java/gjt/test/SimpleAnimationTest.java b/java/gjt/test/SimpleAnimationTest.java
deleted file mode 100644
index faf0c7c611c..00000000000
--- a/java/gjt/test/SimpleAnimationTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package gjt.test;
-
-import java.net.URL;
-import java.applet.Applet;
-import java.awt.*;
-
-import gjt.Util;
-import gjt.Orientation;
-import gjt.animation.*;
-
-/**
- * An animation playfield containing a lone sprite that bounces
- * off the boundaries of the playfield.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.test.AnimationTest
- * @see     gjt.animation.Playfield
- * @see     gjt.animation.Sprite
- */
-public class SimpleAnimationTest extends UnitTest {
-    public String title() { 
-        return "Simple Animation - Mouse Down Starts/Stops"; 
-    } 
-    public Panel centerPanel() { 
-        return new SimpleAnimationTestPanel(this); 
-    }
-}
-
-class SimpleAnimationTestPanel extends Panel {
-    public SimpleAnimationTestPanel(Applet applet) {
-        setLayout(new BorderLayout());
-        add("Center", new SimplePlayfield(applet)); 
-    }
-}
-
-class SimplePlayfield extends Playfield {
-    private Applet   applet;
-    private URL      cb;
-    private Sprite   javaDrinker;
-    private Sequence spinSequence;
-
-    public SimplePlayfield(Applet applet) {
-        this.applet = applet;
-        cb          = applet.getCodeBase();
-        makeSequencesAndSprites();
-    }
-    public void paintBackground(Graphics g) {
-        Image bg = applet.getImage(cb, "gifs/background.gif");
-        Util.wallPaper(this, g, bg);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running() == true) stop ();
-        else                  start();
-        return true;
-    }
-    public void spriteCollision(Sprite sprite, Sprite sprite2) {
-        // Nothing to do:  only 1 sprite!
-    }
-    public void edgeCollision(Sprite      sprite, 
-                              Orientation orientation) {
-        if(orientation == Orientation.RIGHT || 
-           orientation == Orientation.LEFT)
-            sprite.reverseX();
-        else
-            sprite.reverseY();
-    }
-    private void makeSequencesAndSprites() {
-        String  file;
-        Point   startLoc   = new Point(10, 10);
-        Image[] spinImages = new Image[19];
-
-        for(int i=0; i < spinImages.length; ++i) {
-            file = "gifs/spin";
-
-            if(i < 10) file += "0" + i + ".gif";
-            else       file += i + ".gif";
-
-            spinImages[i] = applet.getImage(cb, file);
-        }
-        spinSequence = new Sequence(this, spinImages);
-        javaDrinker  = new Sprite(this, spinSequence, startLoc);
-
-        javaDrinker.setMoveVector(new Point(2,2));
-        addSprite(javaDrinker);
-    }
-}
diff --git a/java/gjt/test/SimpleBargaugeTest.java b/java/gjt/test/SimpleBargaugeTest.java
deleted file mode 100644
index 57eb464f4b1..00000000000
--- a/java/gjt/test/SimpleBargaugeTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-import gjt.Bargauge;
-
-/**
- * A lone Barguage which animates.  This unit test is meant to 
- * illustrate that a Bargauge can cope with having its 
- * orientation chanaged from horizontal to vertical or 
- * vice-versa.  This test is best run in appletviewer, so that
- * the window may be resized such that the Bargauge changes its 
- * orientation.<p>
- *
- * <em>
- * Warning:  An AWT bug causes this test to be a gluttenous 
- * consumer of resources (especially under Win95). A mouse down 
- * will halt the animation thread along with its consumption of 
- * resources.<p>
- * </em>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.Bargauge
- */
-public class SimpleBargaugeTest extends UnitTest {
-    public String title() { 
-        return "Simple Bargauge Test"; 
-    }
-    public Panel centerPanel() { 
-        return new SimpleBargaugeTestPanel(); 
-    }
-}
-
-class SimpleBargaugeTestPanel extends Panel implements Runnable {
-    private Bargauge gauge = new Bargauge(Color.blue);
-    private boolean  running = true;
-    private Thread   t;
-
-    public SimpleBargaugeTestPanel() {
-        setLayout(new BorderLayout());
-        add("Center", gauge);
-
-        t = new Thread(this);
-        t.start();
-    }
-    public void run() {
-        while(true) {
-            try { Thread.currentThread().sleep(500,0); }
-            catch(InterruptedException e) { }
-
-            gauge.setFillPercent(Math.random() * 100);
-            gauge.fill();
-        }
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running)  { t.suspend(); running = false; }
-        else         { t.resume (); running = true;  }
-        return true;
-    }
-}
diff --git a/java/gjt/test/StateButtonTest.java b/java/gjt/test/StateButtonTest.java
deleted file mode 100644
index 508aee1682e..00000000000
--- a/java/gjt/test/StateButtonTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package gjt.test;
-
-import java.applet.Applet;
-import java.awt.*;
-import java.net.URL;
-import gjt.StateButton;
-import gjt.ImageButtonEvent;
-
-/**
- * A StateButton which cycles through a fascinating series of 
- * Images.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.StateButton
- */
-public class StateButtonTest extends UnitTest {
-    public String title      () { return "StateButton Test";  }
-    public Panel  centerPanel() { 
-        return new StateButtonTestPanel(this); 
-    }
-}
-
-class StateButtonTestPanel extends Panel {
-    private URL         codeBase;
-    private Image[]     images;
-    private StateButton button;
-
-    public StateButtonTestPanel(Applet applet) {
-        codeBase  = applet.getCodeBase();
-        images    = new Image[3];
-        images[0] = applet.getImage(codeBase, "gifs/fly.gif");
-        images[1] = applet.getImage(codeBase, "gifs/frog.gif");
-        images[2] = applet.getImage(codeBase, "gifs/eagle.gif");
-        button    = new StateButton(images);
-
-        setLayout(new FlowLayout(FlowLayout.CENTER, 20, 20));
-        add      (button);
-    }
-}
diff --git a/java/gjt/test/TenPixelBorder.java b/java/gjt/test/TenPixelBorder.java
deleted file mode 100644
index bab694d0fb1..00000000000
--- a/java/gjt/test/TenPixelBorder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package gjt.test;
-
-import java.awt.*;
-
-public class TenPixelBorder extends Panel {
-	public TenPixelBorder(Component borderMe) { 
-		setLayout(new BorderLayout());
-		add("Center", borderMe);
-	}
-	public void paint(Graphics g) {
-		Dimension mySize   = size();
-		Insets    myInsets = insets();
-
-		g.setColor(Color.gray);
-
-		// Top Inset area
-		g.fillRect(0,
-		           0, 
-				   mySize.width,  
-				   myInsets.top);
-
-		// Left Inset area
-		g.fillRect(0, 
-		           0, 
-				   myInsets.left, 
-				   mySize.height);
-
-		// Right Inset area
-		g.fillRect(mySize.width - myInsets.right, 
-		           0, 
-		           myInsets.right, 
-				   mySize.height);
-
-		// Bottom Inset area
-		g.fillRect(0, 
-		           mySize.height - myInsets.bottom, 
-				   mySize.width,
-				   mySize.height);
-	}
-	public Insets insets() { 
-		return new Insets(10,10,10,10); 
-	}
-	
-}
diff --git a/java/gjt/test/TitledPanel.java b/java/gjt/test/TitledPanel.java
deleted file mode 100644
index cb8d054e888..00000000000
--- a/java/gjt/test/TitledPanel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package gjt.test;
-
-import java.awt.BorderLayout;
-import java.awt.Label;
-import java.awt.Panel;
-import gjt.Separator;
-
-/**
- * A Panel fitted with a BorderLayout that contains a Label 
- * (title) in the North, and a Separator in the South.
- *
- * @version 1.0, Apr 2 1996
- * @author  David Geary
- */
-
-public class TitledPanel extends Panel {
-    public TitledPanel(String title) {
-        setLayout(new BorderLayout());
-        add("North", new Label(title, Label.CENTER));
-        add("South", new Separator());
-    }   
-}
diff --git a/java/gjt/test/ToolbarTest.java b/java/gjt/test/ToolbarTest.java
deleted file mode 100644
index f739ce96236..00000000000
--- a/java/gjt/test/ToolbarTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package gjt.test;
-
-import java.net.URL;
-import java.awt.*;
-import java.applet.Applet;
-import gjt.ExclusiveImageButtonPanel;
-import gjt.ImageButton;
-import gjt.ImageButtonEvent;
-import gjt.Orientation;
-import gjt.Toolbar;
-import gjt.Separator;
-
-/**
- * A Toolbar to the north, and an ExclusiveImageButtonPanel on 
- * the west give this little applet its own unique charm.  
- * Owner is motivated.<p>
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     gjt.test.UnitTest
- * @see     gjt.ExclusiveImageButtonPanel
- * @see     gjt.ImageButton
- * @see     gjt.Toolbar
- */
-public class ToolbarTest extends UnitTest {
-    public String title() { 
-        return "Toolbar/ImageButtonPanel Test"; 
-    }
-    public Panel centerPanel() { 
-        return new ToolbarTestPanel(this);      
-    }
-}
-
-class ToolbarTestPanel extends Panel {
-    ImageButton     newButton,   openButton, diskButton, 
-                    printButton, cutButton,  copyButton,
-                    pasteButton;
-
-    public ToolbarTestPanel(Applet app) {
-        setLayout(new BorderLayout());  
-        add("North", makeToolbar(app, app.getCodeBase()));
-        add("West",  makePalette(app, app.getCodeBase()));
-    }
-    public boolean handleEvent(Event event) {
-        if(event instanceof ImageButtonEvent) {
-            ImageButtonEvent ibevent = (ImageButtonEvent)event;
-          
-            if(ibevent.isActivated()) {
-                if(event.target == newButton)
-                    System.out.println("New Button Activated");
-                if(event.target == openButton)
-                    System.out.println("Open Button Activated");
-                if(event.target == diskButton)
-                    System.out.println("Disk Button Activated");
-                if(event.target == printButton)
-                    System.out.println("Print Button Activated");
-                if(event.target == cutButton)
-                    System.out.println("Cut Button Activated");
-                if(event.target == copyButton)
-                    System.out.println("Copy Button Activated");
-                if(event.target == pasteButton)
-                    System.out.println("Paste Button Activated");
-            
-                return true;
-            }
-        }
-
-        return super.handleEvent(event);
-    }
-    private Toolbar makeToolbar(Applet app, URL cb) {
-        Toolbar tb  = new Toolbar(10, 0);
-
-        newButton   = tb.add(app.getImage(cb, "gifs/new.gif"));
-        openButton  = tb.add(app.getImage(cb, "gifs/open.gif"));
-        diskButton  = tb.add(app.getImage(cb, "gifs/disk.gif"));
-
-        tb.addSpacer(newButton.preferredSize().width);
-
-        printButton = tb.add(app.getImage(cb, "gifs/print.gif"));
-
-        tb.addSpacer(newButton.preferredSize().width);
-
-        cutButton   = tb.add(app.getImage(cb, "gifs/cut.gif"));
-        copyButton  = tb.add(app.getImage(cb, "gifs/copy.gif"));
-        pasteButton = tb.add(app.getImage(cb, "gifs/paste.gif"));
-
-        return tb;
-    }
-    private Panel makePalette(Applet app, URL cb) {
-        ExclusiveImageButtonPanel iconPalette;
-        Panel                     iconPalettePanel = new Panel();
-
-        iconPalette = new ExclusiveImageButtonPanel(
-                              Orientation.VERTICAL,
-                              Orientation.CENTER,
-                              Orientation.TOP, 10);
-
-        iconPalette.add(app.getImage(cb,"gifs/ballot_box.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/palette.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/light_bulb1.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/Dining.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/scissors.gif"));
-        iconPalette.add(app.getImage(cb,"gifs/tricycle.gif"));
-
-        iconPalettePanel = new Panel();
-        iconPalettePanel.setLayout(new BorderLayout());
-        iconPalettePanel.add      ("Center", iconPalette);
-        iconPalettePanel.add      ("East",   new Separator());
-        return iconPalettePanel;
-    }
-}
diff --git a/java/gjt/test/TwoDrinkersAnimationTest.java b/java/gjt/test/TwoDrinkersAnimationTest.java
deleted file mode 100644
index ae4041b9eb6..00000000000
--- a/java/gjt/test/TwoDrinkersAnimationTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gjt.test;
-
-import java.net.URL;
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.Panel;
-
-import gjt.Util;
-import gjt.Orientation;
-import gjt.animation.*;
-
-/**
- * An animation playfield containing two "java drinkers", that
- * both bounce off the sides of the playfield.<p>
- *
- * One of the java drinkers moves slow and spins fast, while
- * the other java drinker moves fast and spins slow.  When
- * the two java drinkers collide, they both play a bump
- * sequence - at different speeds.<p>
- *
- * @version 1.0, Apr 1 1996
- * @author  David Geary
- * @see     gjt.test.AnimationTest
- * @see     gjt.animation.Playfield
- * @see     gjt.animation.Sprite
- */
-public class TwoDrinkersAnimationTest extends UnitTest {
-    public String title() { 
-        return 
-            "TwoDrinkers Animation - Mouse Down Starts/Stops"; 
-    } 
-    public Panel centerPanel() { 
-        return new TwoDrinkersAnimationTestPanel(this); 
-    }
-}
-
-class TwoDrinkersAnimationTestPanel extends Panel {
-    public TwoDrinkersAnimationTestPanel(Applet applet) {
-        setLayout(new BorderLayout());
-        add("Center", new TwoDrinkersPlayfield(applet)); 
-    }
-}
-
-class TwoDrinkersPlayfield extends Playfield {
-    private Applet   applet;
-    private URL      cb;
-    private Sprite   moveFastSpinSlow, moveSlowSpinFast;
-    private Sequence fastSpinSequence, 
-                     slowSpinSequence,
-                     fastBumpSequence,
-                     slowBumpSequence;
-
-    public TwoDrinkersPlayfield(Applet applet) {
-        this.applet = applet;
-        cb          = applet.getCodeBase();
-        makeSequencesAndSprites();
-    }
-    public void paintBackground(Graphics g) {
-        Image bg = applet.getImage(cb, "gifs/background.gif");
-        Util.wallPaper(this, g, bg);
-    }
-    public boolean mouseDown(Event event, int x, int y) {
-        if(running() == true) stop ();
-        else                  start();
-        return true;
-    }
-    public void spriteCollision(Sprite sprite, Sprite sprite2) {
-        if(moveSlowSpinFast.getSequence() != fastBumpSequence) {
-            sprite.reverse();
-            sprite2.reverse();
-
-            moveSlowSpinFast.play(fastBumpSequence, 3);
-            moveFastSpinSlow.play(slowBumpSequence, 3);
-        }   
-    }
-    public void edgeCollision(Sprite      sprite, 
-                              Orientation orientation) {
-        if(orientation == Orientation.RIGHT || 
-           orientation == Orientation.LEFT) 
-            sprite.reverseX();
-        else 
-            sprite.reverseY();
-    }
-    private void makeSequencesAndSprites() {
-        String  file;
-        Image[] spinImages = new Image[19];
-        Image[] bumpImages = new Image[6];
-        Image[] volleyball = new Image[4];
-
-        for(int i=0; i < spinImages.length; ++i) {
-            file = "gifs/spin";
-
-            if(i < 10) file += "0" + i + ".gif";
-            else       file += i + ".gif";
-
-            spinImages[i] = applet.getImage(cb, file);
-        }
-        for(int i=0; i < bumpImages.length; ++i) {
-            file = "gifs/bump0" + i + ".gif";
-            bumpImages[i] = applet.getImage(cb, file);
-        }
-        fastSpinSequence = new Sequence(this, spinImages);
-        slowSpinSequence = new Sequence(this, spinImages);
-
-        fastBumpSequence = new Sequence(this, bumpImages);
-        slowBumpSequence = new Sequence(this, bumpImages);
-
-        moveFastSpinSlow = 
-            new Sprite(this, 
-                slowSpinSequence, new Point(25, 75));
-
-        moveSlowSpinFast = 
-            new Sprite(this, 
-                fastSpinSequence, new Point(250,250));
-
-        fastSpinSequence.setAdvanceInterval(50);
-        slowSpinSequence.setAdvanceInterval(300);
-
-        fastBumpSequence.setAdvanceInterval(25);
-        slowBumpSequence.setAdvanceInterval(200);
-
-        moveFastSpinSlow.setMoveVector(new Point(2,3));
-        moveSlowSpinFast.setMoveVector(new Point(-1,-1));
-
-        moveSlowSpinFast.setMoveInterval(100);
-
-        addSprite(moveFastSpinSlow);
-        addSprite(moveSlowSpinFast);
-    }
-}
diff --git a/java/gjt/test/UnitTest.java b/java/gjt/test/UnitTest.java
deleted file mode 100644
index 1fa262d5629..00000000000
--- a/java/gjt/test/UnitTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package gjt.test;
-
-import java.awt.BorderLayout;
-import java.awt.Frame;
-import java.awt.Panel;
-import java.applet.Applet;
-import gjt.*;
-
-/**
- * An (abstract) Applet fitted with a BorderLayout that 
- * contains a TitledPanel in the North, and a Panel created by 
- * derived classes in the Center.<p>
- *
- * Since some Applets take awhile to load, UnitTest changes the 
- * cursor to a wait cursor in init(), changing it back to the 
- * default cursor in start().  Derived classes must be sure to 
- * call super.init() if they override init(); likewise for 
- * start().<p>
- *
- * Subclasses must implement: 
- * <dl>
- * <dd>String title()
- * <dd>Panel centerPanel()
- * </dl>
- * Subclasses should populate the Panel returned from 
- * centerPanel() with whatever makes sense for their unit test.
- *
- * @version 1.0, April 25, 1996
- * @author  David Geary
- * @see     TitledPanel
- */
-abstract public class UnitTest extends Applet {
-    abstract public String title();
-    abstract public Panel  centerPanel();
-
-    public void init() {
-        Util.getFrame(this).setCursor(Frame.WAIT_CURSOR);
-        Panel titledPanel = new TitledPanel(title());
-        setLayout(new BorderLayout());
-        add("North",  titledPanel);
-        add("Center", centerPanel());
-    }
-    public void start() {
-        Util.getFrame(this).setCursor(Frame.DEFAULT_CURSOR);
-    }
-}
diff --git a/java/java-ace.gif b/java/java-ace.gif
deleted file mode 100644
index c3d89df46c0..00000000000
--- a/java/java-ace.gif
+++ /dev/null
diff --git a/java/netsvcs/Logger/DefaultLMR.java b/java/netsvcs/Logger/DefaultLMR.java
deleted file mode 100644
index 19e319de015..00000000000
--- a/java/netsvcs/Logger/DefaultLMR.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    DefaultLMR.java
- *
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import java.io.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * The LogMessageReceiver removes the code that handles a log message from
- * the logging service acceptor.  The DefaultLMR simply calls the LogRecord's
- * print method.  
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor
- * @see netsvcs.Logger.LogRecord
- */
-class DefaultLMR implements LogMessageReceiver
-{
-  public void logRecord (String hostname,
-			 LogRecord record)
-    {
-      record.print(hostname, true, System.err);
-    }
-}
diff --git a/java/netsvcs/Logger/LogMessageReceiver.java b/java/netsvcs/Logger/LogMessageReceiver.java
deleted file mode 100644
index c001e06f2bd..00000000000
--- a/java/netsvcs/Logger/LogMessageReceiver.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    LogMessageReceiver.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import java.io.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * The LogMessageReceiver removes the code that handles a log message from
- * the logging service acceptor.  The DefaultLMR simply calls the LogRecord's
- * print method.  Other implementations of this interface can be built and
- * given to the ServerLoggingAcceptor to change the result.
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor
- * @see netsvcs.Logger.LogRecord
- */
-public interface LogMessageReceiver
-{
-  public void logRecord (String hostname,
-			 LogRecord record);
-};
diff --git a/java/netsvcs/Logger/LogRecord.java b/java/netsvcs/Logger/LogRecord.java
deleted file mode 100644
index 0043c040f74..00000000000
--- a/java/netsvcs/Logger/LogRecord.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    LogRecord.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import java.util.Date;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
-import java.io.PrintStream;
-import java.io.IOException;
-import JACE.OS.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * Communicates logging information.  Compatible with the C++ ACE
- * ACE_Log_Record class.
- *
- */
-public class LogRecord
-{
-  final public int MAXLOGMSGLEN = 4 * 1024;
-
-  private int type_;
-  private int length_;
-  private long msec_;
-  private int pid_;
-  private byte[] msgData_;
-  private final static int numIntMembers = 5;
-  private final static int sizeofIntInBytes = 4;
-
-  /**
-   * Create a default instance.
-   */
-  public LogRecord()
-  {
-    type(0);
-    timeStamp((int)new Date().getTime());
-    length(0);
-    pid(0);
-  }
-
-  /**
-   * Create a LogRecord.  This is the designated initializer.
-   * @param priority a numeric specification of the priority (ascending)
-   * @param milliseconds time attached to the log entry in Unix <pre>time_t</pre> format 
-   * @param pid the process ID; not currently used
-   */
-  public LogRecord(int priority,
-		   long milliseconds,
-		   int pid)
-  {
-    type(priority);
-    timeStamp(milliseconds);
-    length(0);
-    pid(pid);
-  }
-
-  /**
-   * Conversion to string.  Only includes the <pre>msgData_</pre> member.
-   */
-  public String toString()
-  {
-    return new String(msgData_);
-  }
-
-  /**
-   * Place a textual representation of the record on a PrintStream.
-   * @param hostname name of the host generating this record
-   * @param verbose if <b>true</b>, print information in the form, (give example)
-   * @param ps A PrintStream instance to which the output should go.
-   * @see PrintStream,String
-   */
-  public void print(String hostname,
-		    boolean verbose,
-		    PrintStream ps)
-  {
-    String toprint;
-    if (verbose)
-      {
-	Date now = new Date(this.timeStamp());
-
-	/* 01234567890123456789012345 */
-	/* Wed Oct 18 14:25:36 1989n0 */
-	toprint = now.toString().substring(4) + "@"
-                + hostname + "@" + pid_ + "@" + type_ + "@"
-                + this.toString();
-      }
-    else
-      {
-	toprint = this.toString();
-      }
-    ps.println(toprint);
-  }
-
-  /**
-   * Streaming methods
-   */
-  public void streamInFrom(DataInputStream dis) throws IOException
-  {
-    // Order here must match layout order in the C++ class.
-    // This, of course, is VERY fragile, and ought not be used as
-    // a model for anything except how NOT to do anything.
-    length(dis.readInt());
-    type(dis.readInt());
-    this.timeStamp((long)dis.readInt() * 1000);
-
-    // Skip smaller time resolution info since we're lucky if Java's
-    // timer can handle more than millisecond precision, anyway
-    dis.skipBytes(4); 
-
-    pid(dis.readInt());
-
-    // Does readFully() allocate space for the buffer?  Either
-    // way, we won't have memory leaks :-)
-    int dataLength = (int) (length_ - numIntMembers * sizeofIntInBytes);
-
-    msgData_ = new byte[dataLength];
-    dis.readFully(msgData_, 0, dataLength);
-  }
-
-  public void streamOutTo(DataOutputStream dos) throws IOException
-  {
-    dos.writeInt(length());
-    dos.writeInt(type());
-    dos.writeInt((int)(this.msec_ / 1000));
-    dos.writeInt(0);  
-    dos.writeInt(pid());
-
-    dos.write(msgData_);
-  }
-
-  /**
-   * Accessor methods
-   */
-  public int type()            { return type_; }
-  public void type(int t)      { type_ = t; }
-
-  public int length()          { return length_;  }
-  public void length(int l)    { length_ = l; }
-  private void setLen(int msgLen)
-       { length(msgLen + numIntMembers * sizeofIntInBytes); }
-
-  public long timeStamp()      { return this.msec_; }
-  public void timeStamp(long msec){ this.msec_ = msec; }
-
-  public int pid()             { return pid_; }
-  public void pid(int p)       { pid_ = p; }
-
-  public byte[] msgData()      { return msgData_; }
-  public void msgData(byte[] m)
-    { 
-      int size = m.length;
-
-      if (size > MAXLOGMSGLEN) 
-	size = MAXLOGMSGLEN;
-
-      this.msgData_ = new byte[size];
- 
-      System.arraycopy(m, 0, msgData_, 0, size);
-
-      setLen(size);
-    }
-
-  public void msgData(String m)
-  {
-    byte temp[] = m.getBytes();
-    if (temp.length > MAXLOGMSGLEN) {
-      this.msgData_ = new byte[MAXLOGMSGLEN];
-      
-      System.arraycopy(temp, 0, msgData_, 0, MAXLOGMSGLEN);
-    } else
-      this.msgData_ = temp;
-    
-    setLen(msgData_.length);
-  }
-};
-
diff --git a/java/netsvcs/Logger/ServerLoggingAcceptor.java b/java/netsvcs/Logger/ServerLoggingAcceptor.java
deleted file mode 100644
index d5d4ae5220d..00000000000
--- a/java/netsvcs/Logger/ServerLoggingAcceptor.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    ServerLoggingAcceptor.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import JACE.SOCK_SAP.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-import java.io.*;
-import java.net.*;
-import JACE.Misc.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * Acceptor:  Listens on a specified port and launches ServerLoggingHandlers
- * in response to requests.  A LogMessageReceiver can be specified on the
- * command line to change the way the logging service processes messages.
- *
- * @see netsvcs.Logger.ServerLoggingHandler, netsvcs.Logger.LogMessageReceiver
- */
-public class ServerLoggingAcceptor extends Acceptor implements Runnable
-{
-  /** Main function to bootstrap the process
-   *
-   *  Command line arguments:
-   *
-   *  -p <port>         Select a port for listening for requests
-   *  -r <class name>   Specify a LogMessageReceiver (make sure it's a full class name)
-   * 
-   */
-  public static void main (String [] args)
-    {
-      ServerLoggingAcceptor sla = new ServerLoggingAcceptor();
-
-      sla.init(args);
-    }
-
-  /** 
-   * Receives the command line and launches its own thread
-   */
-  public int init (String [] args)
-    {
-      this.parseArgs(args);
-
-      // If the user didn't specify a LogMessageReceiver, use the default
-      // (which just calls a print method on LogMessage)
-      if (this.receiver_ == null)
-	this.receiver_ = new DefaultLMR();
-
-      new Thread (this).start();
-      return 0;
-    }
-
-  /**
-   * Specify what LogMessageReceiver to use 
-   */
-  public void setLMR(LogMessageReceiver receiver)
-    {
-      this.receiver_ = receiver;
-    }
-
-  /** 
-   * Accessor for the LogMessageReceiver
-   */
-  public LogMessageReceiver getLMR ()
-    {
-      return this.receiver_;
-    }
-
-  /** 
-   * Create a new ServerLoggingHandler 
-   */
-  protected SvcHandler makeSvcHandler ()
-    throws InstantiationException, IllegalAccessException
-    {
-      return new netsvcs.Logger.ServerLoggingHandler (this.receiver_);
-    }
-
-  /**
-   * Run forever accepting new connections
-   */
-  public void run ()
-    {
-      try {
-
-	this.open (this.port_);
-	while (true) 
-	  this.accept();  
-
-      } catch (SocketException e)
-	{
-	  ACE.ERROR ("Socket Exception: " + e);
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-
-      ACE.ERROR("ServerLoggingAcceptor has exited");
-    }
-
-  /**
-   * Process the command line
-   */
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "p:r:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 'p':
-	    s = opt.optarg ();
-	    this.port_ = (new Integer (s)).intValue ();
-	    break;
-	  case 'r':
-	    // Load the LMR with the given name
-	    s = new String(opt.optarg ());
-	    Class LMRfactory;
-	    try {
-	      LMRfactory = Class.forName(s);
-
-	      receiver_ = (LogMessageReceiver)LMRfactory.newInstance();
-
-	    } catch (ClassNotFoundException e) {
-	      ACE.ERROR("Unable to find LMR factory: " + e);
-	    } catch (InstantiationException e) {
-	      ACE.ERROR("Creating LMR: " + e);
-	    } catch (IllegalAccessException e) {
-	      ACE.ERROR("Creating LMR: " + e);
-	    }
-	    // Any of the above exceptions will result in just using the
-	    // default LMR
-	    break;
-	  default:
-	    ACE.ERROR ("Unknown argument: " + c);
-	    ACE.ERROR ("Valid args: -p <port> -r <LogMessageReceiver name>");
-	    break;
-	  }
-      }
-  }
-
-  private int port_ = ACE.DEFAULT_SERVER_PORT;
-  private LogMessageReceiver receiver_ = null;
-};
-
-
-
-
-
-
diff --git a/java/netsvcs/Logger/ServerLoggingHandler.java b/java/netsvcs/Logger/ServerLoggingHandler.java
deleted file mode 100644
index 40f1aee8440..00000000000
--- a/java/netsvcs/Logger/ServerLoggingHandler.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    ServerLoggingHandler.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import JACE.SOCK_SAP.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-import java.util.*;
-import java.io.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * Created by ServerLoggingAcceptor every time a client connects.  This reads 
- * a logging statement passes it to the LogMessageReceiver for processing.
- * </blockquote>
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor
- */
-public class ServerLoggingHandler extends SvcHandler
-{
-  // Processes log messages
-  private LogMessageReceiver receiver_;
-
-  /**
-   * Constructor
-   *
-   *@param receiver    LogMessageReceiver that handles what to do with a message
-   */
-  public ServerLoggingHandler (LogMessageReceiver receiver)
-  {
-    super();
-    this.receiver_ = receiver;
-  }
-
-  /**
-   * Start this handler in its own thread
-   */
-  public int open(Object obj)
-  {
-    new Thread (this).start();
-    return 0;
-  }
-
-  /**
-   * Accessor: get the host name of the connected client
-   */
-  protected String hostName ()
-  {
-    return new String(this.peer().socket().getInetAddress().getHostName());
-  }
-
-  /**
-   * Receive input from the client, and send it to the LMR.  This is the
-   * main loop for this thread.
-   */
-  public void run()
-  {
-    DataInputStream dis = new DataInputStream(this.peer().inputStream());
-
-    for (;;)
-      {
-	// Messages arrive in the ACE.LogRecord format
-	//
-	// Hey!  We need exception catching in here too!
-	try
-	  {
-	    // Reconstitute a log message from the wire
-	    LogRecord rec = new LogRecord();
-	
-	    rec.streamInFrom(dis);
-	
-	    // Give the record to the log processor
-	    this.receiver_.logRecord(this.hostName(),
-				     rec);
-	  }
-	catch (EOFException eof)
-	  {
-	    try { 
-	      this.stream_.close(); 
-	    } catch (IOException n) { }
-
-	    return;
-	  }
-	catch (IOException ioe)
-	  {
-	    ACE.ERROR(Thread.currentThread().getName()
-			       + ": "
-			       + ioe);
-	  }
-      }
-  }
-};
-
diff --git a/java/netsvcs/Naming/NameAcceptor.java b/java/netsvcs/Naming/NameAcceptor.java
deleted file mode 100644
index f704504ee3c..00000000000
--- a/java/netsvcs/Naming/NameAcceptor.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameAcceptor.java
- *
- * Listens on the specified port (command line option) and launches
- * NameHandlers when connections are made.  Each NameHandler runs in
- * its own thread.
- *
- * The hash table for the mapping and a timer queue are created here.
- * Periodically the mapping is written out to a file.
- *
- * A small main program is included to start things off.  If the
- * data file exists, it is read into memory.  Currently the service
- * stores the entire mapping in memory at all times.  The mapping is
- * dumped to a file at regular intervals.
- *
- *@see netsvcs.Naming.NameHandler
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Naming;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.TimeValue;
-
-public class NameAcceptor extends Acceptor implements Runnable
-{
-  /**
-   * Constructor
-   */
-  public NameAcceptor ()
-    {
-      super();
-
-      // Create the hash table and timer queue
-      this.mapping_ = new Hashtable();
-      this.tq_ = new TimerQueue(true);
-    }
-
-  /**
-   * Simple main program.  Command line options are
-   * described under parseArgs.
-   */
-  public static void main (String [] args)
-    {
-      // Simple main program to get things rolling
-      NameAcceptor na = new NameAcceptor();
-
-      na.init(args);
-    }
-
-
-  /**
-   * Close the socket when shutting down
-   */
-  public int fini ()
-  {
-    try 
-      {
-	this.done_ = true;
-	this.sockAcceptor_.close();
-      } 
-    catch (IOException e) 
-      {
-	ACE.ERROR("" + e);
-	return -1;
-      }
-
-    return 0;
-  }
-
-  /**
-   * Stops accepting when suspended 
-   */
-  public int suspend()
-  {
-    this.suspended_ = true;
-    return 0;
-  }
-
-  /**
-   * Resumes accepting 
-   */
-  public int resume()
-  {
-    this.suspended_ = false;
-    return 0;
-  }
-
-
-  /**
-   * Runs this instance in its own thread
-   */
-  public int init (String [] args)
-    {
-      // Parse arguments
-      this.parseArgs (args);
-
-      System.out.println("Starting naming service on port: " + this.port_);
-
-      // Run in own thread of control so that we don't block the caller
-      new Thread (this).start();
-
-      return 0;
-    }
-
-  /**
-   * 
-   * Main loop:  launches NameHandlers in separate threads whenever a
-   * connection request is made
-   */
-  public void run ()
-  {
-    // Load the hash table from disk
-    this.loadTable();
-
-    // Schedule to write out the memory copy of the hash table at regular
-    // intervals
-    this.tq_.scheduleTimer(this, 
-			   null, 
-			   new TimeValue(this.updateInterval_), 
-			   new TimeValue(this.updateInterval_));
-
-    try
-      {
-	// Create new NameHandlers as requests come in
-	this.open (this.port_);
-	while (!this.done_) {
-
-	  if (!this.suspended_)
-	    this.accept ();
-	}
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR ("Socket Exception: " + e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-  }
-
-  /**
-   * Create a new NameHandler
-   */
-  protected SvcHandler makeSvcHandler ()
-    throws InstantiationException, IllegalAccessException
-    {
-      return new netsvcs.Naming.NameHandler (this.mapping_);
-    }
-
-  /** 
-   * Process the command line.  The following options are available:
-   *
-   * -p <port>       Port number for listening
-   * -f <filename>   Name of the database file
-   * -t <time>       Mapping write-out time interval (in seconds)
-   *
-   */
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "p:f:t:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	    // Specify port
-	  case 'p':
-	    s = opt.optarg ();
-	    this.port_ = (new Integer (s)).intValue ();
-	    break;
-	    // Specify file name of the database
-	  case 'f':
-	    s = opt.optarg ();
-	    this.filename_ = new String(s);
-	    break;
-	    // Specify time interval to write out the table
-	  case 't':
-	    s = opt.optarg ();
-	    this.updateInterval_ = (new Integer (s)).intValue();
-	    break;
-	  default:
-	    ACE.ERROR ("Unknown argument: " + c);
-	    break;
-	  }
-      }
-  }
-
-  /**
-   * Loads the hash table into memory from the specified
-   * file.  Uses ObjectInputStream.
-   */
-  protected void loadTable ()
-    {
-      File file = new File(this.filename_);
-      FileInputStream fis;
-      ObjectInputStream ois;
-
-      Hashtable ht = null;
-
-      try {
-
-	if ((file.exists()) && (file.canRead())) {
-
-	  fis = new FileInputStream (file);
-
-	  ois = new ObjectInputStream(fis);
-
-	  ht = (Hashtable)ois.readObject();
-	} else 
-	  return;
-      } catch (ClassNotFoundException e) {
-	ACE.ERROR(e);
-      } catch (StreamCorruptedException e) {
-	ACE.ERROR(e);
-      } catch (SecurityException e) {
-	ACE.ERROR(e);
-      } catch (IOException e) {
-	ACE.ERROR(e);
-      }
-
-      if (ht != null) 
-	this.mapping_ = ht;
-
-    }
-
-  /**
-   * Writes the table out to the specified file.
-   */
-  protected void saveTable ()
-    {
-      FileOutputStream fos;
-      ObjectOutputStream oos;
-
-      try {
-
-	fos = new FileOutputStream(this.filename_);
-	oos = new ObjectOutputStream(fos);
-
-	oos.writeObject(this.mapping_);
-
-	oos.flush();
-
-	oos.close();
-
-      } catch (OptionalDataException e) {
-	ACE.ERROR(e);
-      } catch (NotSerializableException e) {
-	ACE.ERROR(e);
-      } catch (IOException e) {
-	ACE.ERROR(e);
-      }
-    }
-
-  /**
-   * Call back for the TimerQueue.  This calls the method to save the
-   * hash table.  The default time out is 60 seconds.
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-    {
-      this.saveTable();
-
-      return 0;
-    }
-
-  // Port to listen on
-  private int port_ = ACE.DEFAULT_SERVER_PORT;
-
-  // Mapping data structure
-  Hashtable mapping_ = null;
-
-  // Default file name
-  String filename_ = "namedata.dat";
-
-  // How often to save the table (seconds)
-  int updateInterval_ = 60;
-
-  // Calls handleTimeout at updateInterval_ intervals
-  TimerQueue tq_ = null;
-
-  boolean done_ = false;
-  boolean suspended_ = false;
-
-}
-
diff --git a/java/netsvcs/Naming/NameHandler.java b/java/netsvcs/Naming/NameHandler.java
deleted file mode 100644
index a619eab0733..00000000000
--- a/java/netsvcs/Naming/NameHandler.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameHandler.java
- *
- * An instance of this class is created in a separate thread for each connection 
- * request received by the NameAcceptor.  All interaction between the
- * client's requests and the database are handled here.
- *
- * In general, the user binds a name to a (value, type) pair.  The type is just
- * treated as just another String (in the C++ version the name and value are
- * arrays of 16 bit data types and the type is an array of 8 bit chars).
- *
- * For this to work in the hash table scheme, the type and value are wrapped in
- * a ValueType class defined at the end of this file.
- *
- * This is compatible with the C++ ACE remote name service. 
- *
- *@see netsvcs.Naming.NameAcceptor
- *@see netsvcs.Naming.NameRequest
- *@see netsvcs.Naming.NameReply
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Naming;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.SOCK_SAP.*;
-
-public class NameHandler extends SvcHandler
-{
-  /**
-   * Constructor
-   *
-   * @param mapping     Hash table created in NameAcceptor
-   */
-  public NameHandler (Hashtable mapping)
-  {
-    super();
-
-    this.mapping_ = mapping;
-  }
-  
-  /**
-   * Starts this handler in its own thread
-   *
-   */
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  /**
-   * Main loop that this thread executes.  Waits for connection requests and
-   * creates a NameHandler thread for each.
-   *
-   */
-  public void run ()
-  {
-    ACE.DEBUG("NameHandler instance running");
-    
-    // Can't assume the SOCKStream uses DataInputStream, so put one
-    // over its OutputStream 
-    DataInputStream dis = new DataInputStream (this.peer().inputStream());
-
-    // The NameRequest is the how all requests come in to the naming service.
-    NameRequest nameRequest = new NameRequest();
-
-    // Main loop -- wait for requests
-    int msgLen;
-    try
-      {
-	while (!this.done_)
-	  {
-	    // Read a NameRequest from the stream
-	    nameRequest.streamInFrom(dis);
-	    
-	    // Decide what to do based on the request type
-	    this.dispatch(nameRequest);
-
-	  }
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("Connection reset by peer");
-      }
-    catch (EOFException e)
-      {
-	/* The client has shut down the connection */
-	
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    finally
-      {
-	try 
-	  {
-	    this.peer ().close ();
-	  }
-	catch (IOException e)
-	  {
-	  }
-      }
-  }
-
-
-  /**
-   *
-   * This is the point at which a request is sent to the various methods
-   * that fulfill it.  Switches on the request type -- bind, rebind, resolve,
-   * etc.
-   *
-   *@param nameRequest     The request to fill
-   */
- void dispatch(NameRequest nameRequest) throws IOException
-    {
-
-      // Call the various other member functions based on the
-      // message type of the request -- bind, rebind, etc.
-      switch (nameRequest.requestType()) 
-	{
-	case NameRequest.BIND:
-	  this.bind(nameRequest, false);
-	  break;
-	case NameRequest.REBIND:
-	  this.bind(nameRequest, true);
-	  break;
-	case NameRequest.RESOLVE:
-	  this.resolve(nameRequest);
-	  break;
-	case NameRequest.UNBIND:
-	  this.unbind(nameRequest);
-	  break;
-	case NameRequest.LIST_NAMES:
-	  this.listByName(nameRequest.name(), false);
-	  break;
-	case NameRequest.LIST_VALUES:
-	  this.listByValue(nameRequest.name(), false);
-	  break;
-	case NameRequest.LIST_TYPES:
-	  this.listByType(nameRequest.name(), false);
-	  break;
-	case NameRequest.LIST_NAME_ENTRIES:
-	  this.listByName(nameRequest.name(), true);
-	  break;
-	case NameRequest.LIST_VALUE_ENTRIES:
-	  this.listByValue(nameRequest.name(), true);
-	  break;
-	case NameRequest.LIST_TYPE_ENTRIES:
-	  this.listByType(nameRequest.name(), true);
-	  break;
-	default:
-	  System.err.println("unknown type");
-
-	  ACE.ERROR("Unknown type: " + nameRequest.requestType());
-
-	  // Send a failure message.  This will only work if the other
-	  // side is expecting something like a NameReply rather than
-	  // a NameRequest.  It would've been better to have everything
-	  // use NameRequests to avoid this kind of thing.
-	  NameReply reply = new NameReply(NameReply.FAILURE, 0);
-	  reply.streamOutTo(this.peer());
-
-	  break;
-	}
-
-    }
-
-  /**
-   * 
-   * Bind a name and a (value, type) pair.  All this data is given in the
-   * NameRequest from the client.  Returns a NameReply back to the client
-   * with either Reply.SUCCESS or Reply.FAILURE as the type.
-   *
-   *@param request        NameRequest given by the client
-   *@param rebind         Is this a rebind or not?
-   */
-  void bind (NameRequest request, boolean rebind) throws IOException
-    {
-      // The hash table entries consists of (String name, ValueType data) pairs, so
-      // create the appropriate ValueType
-      ValueType vt = new ValueType(request.type(),
-				   request.value());
-
-      // Reply to tell sender of success or failure
-      NameReply reply = new NameReply();
-
-      // If it's a rebind request, overwrite the old entry.  If the key doesn't
-      // exist, add it.  If it does exist and it's not a bind request, return
-      // a failure code via a NameReply.
-      if ((rebind) || (!this.mapping_.containsKey(request.name()))) {
-
-	System.err.println("Binding: " + request.name() + " and " + vt.value_);
-
-	// Add/Update the entry in the hash table
-	this.mapping_.put(request.name(), vt);
-
-	// Set the reply code to success
-	reply.type(NameReply.SUCCESS);
-
-      } else {
-
-	ACE.DEBUG("Key " + request.name() + " already exists");
-
-	// Set reply code to failure
-	reply.type(NameReply.FAILURE);
-
-	// reply error code unused as far as I know
-      }
-	
-      reply.streamOutTo(this.peer());
-    }
-
-  /**
-   * Given a name, this looks up and returns the type and value.  This is
-   * done by sending back a full NameRequest with the correct info.  If
-   * there is a problem, an "empty" NameRequest is returned -- it has no
-   * name, type, or value fields.
-   *
-   *@param request     NameRequest sent by the client (has the name to lookup)
-   */
-  void resolve (NameRequest request) throws IOException
-    {
-      // A NameRequest is also used in response
-      NameRequest result;
-
-      // Wrap a DataOutputStream around the socket's output stream
-      // (the socket should already have at least a BufferedOutputStream)
-      DataOutputStream dos = new DataOutputStream(this.peer().outputStream());
-
-      // If the requested name is in the hash table, return the data
-      if (this.mapping_.containsKey(request.name())) {
-
-	// Get the data pair based on the name
-	ValueType vt = (ValueType)this.mapping_.get(request.name());
-
-	ACE.DEBUG("Good resolve: " + vt.value_);
-
-	// Fill the reply structure 
-	result = new NameRequest(NameRequest.RESOLVE,
-				 null,
-				 vt.value_,
-				 vt.type_,
-				 null);
-
-      } else {
-
-	// Otherwise return a null response 
-	result = new NameRequest(NameRequest.RESOLVE,
-			      null,
-			      null,
-			      null,
-			      null);
-
-      }
-
-      // Send the result to the socket
-      //      result.streamOutTo(dos);
-
-      result.streamOutTo(this.peer());
-
-    }
-
-  /**
-   * 
-   * Given a name, remove its entry in the mapping.  Returns a NameReply
-   * to the client with NameReply.SUCCESS or NameReply.FAILURE.
-   *
-   *@param request    NameRequest from the client (has the name to remove)
-   */
-  void unbind (NameRequest request) throws IOException
-    {
-      NameReply reply = new NameReply();
-
-      // If the given key isn't in the table, return an error
-      // Otherwise remove it.  Uses a NameReply to respond.
-      if (!this.mapping_.containsKey(request.name())) 
-	reply.type(NameReply.FAILURE);
-      else {
-	this.mapping_.remove(request.name());
-	reply.type(NameReply.SUCCESS);
-      }
-
-      // Send the reply out to the socket
-      reply.streamOutTo(this.peer());
-    }
-
-  /**
-   *
-   * Given a pattern string (given in NameRequest's name field), this 
-   * finds all the entries in the mapping which have a name that begins with
-   * the string.  Each one is sent back separately via a NameRequest, and this
-   * sequence is followed by a blank NameRequest.
-   *
-   *@param pattern           Pattern to find (what result names should begin with)
-   *@param completeLookup    Should the value and type be returned as well?
-   */
-  void listByName (String pattern, boolean completeLookup) throws IOException
-    {
-      // Get a listing of all the keys in the hash table
-      Enumeration enum = this.mapping_.keys();
-
-      // References used in the loop
-      String name;
-      ValueType vt;
-
-      // A NameRequest is used to return each item corresponding to the pattern.
-      NameRequest result = new NameRequest((completeLookup ? NameRequest.LIST_NAMES :
-					                  NameRequest.LIST_NAME_ENTRIES),
-					null,
-					null,
-					null,
-					null);
-
-      // Keep ourselves safe from null pointer exceptions
-      if (pattern == null)
-	pattern = new String("");
-      
-      // Scan through all the elements
-      while (enum.hasMoreElements()) {
-
-	// Get a key
-	name = (String)enum.nextElement();
-
-	// Does it fit the pattern?
-	if (name.startsWith(pattern)) {
-
-	  // Set the result name
-	  result.name(name);
-
-	  // Only make another hash table request if the user
-	  // wants all the data
-	  if (completeLookup) {
-
-	    // Get data from the hash table
-	    vt = (ValueType)mapping_.get(name);
-
-	    // Set the rest of the data
-	    result.type(vt.type_);
-	    result.value(vt.value_);
-	  }
-	  
-	  // Send it to the socket
-	  result.streamOutTo(this.peer());
-	}
-      }
-
-      // Send final null message
-      result.name(null);
-      result.type(null);
-      result.value(null);
-      result.requestType(NameRequest.MAX_ENUM);
-      result.streamOutTo(this.peer());
-    }
-
-  /**
-   *
-   * Given a pattern string (given in NameRequest's name field), this 
-   * finds all the entries in the mapping which have a type that begins with
-   * the string.  Each one is sent back separately via a NameRequest, and this
-   * sequence is followed by a blank NameRequest.
-   *
-   *@param pattern           Pattern to find (what result types should begin with)
-   *@param completeLookup    Should the value be returned as well?  This is only
-   *                         used to decide between LIST_TYPES and LIST_TYPE_ENTRIES
-   *                         since we might as well send back both if we look them up
-   *                         together.
-   */
-  void listByType (String pattern, boolean completeLookup) throws IOException
-    {
-      // Get a listing of all the keys in the hash table
-      Enumeration enum = this.mapping_.keys();
-
-      // References used in the loop
-      String name;
-      ValueType vt;
-
-      // A NameRequest is used to return each item corresponding to the pattern.
-      NameRequest result = new NameRequest((completeLookup ? NameRequest.LIST_TYPES :
-					                  NameRequest.LIST_TYPE_ENTRIES),
-					null,
-					null,
-					null,
-					null);
-      // Keep ourselves safe from null pointer exceptions
-      if (pattern == null)
-	pattern = new String("");
-
-      // Scan through all the elements
-      while (enum.hasMoreElements()) {
-
-	// Get a key
-	name = (String)enum.nextElement();
-
-	// Have to get all the data for this entry to compare
-	vt = (ValueType)mapping_.get(name);
-
-	// Does it fit the pattern?
-	if (vt.type_ != null)
-	  if (vt.type_.startsWith(pattern)) {
-
-	    // Set the result values
-	    result.name(name);
-	    result.type(vt.type_);
-	    result.value(vt.value_);
-      
-	    // Send it out to the socket
-	    result.streamOutTo(this.peer());
-	  }
-      }
-
-      // Send final null message
-      result.name(null);
-      result.type(null);
-      result.value(null);
-      result.requestType(NameRequest.MAX_ENUM);
-      result.streamOutTo(this.peer());
-    }
-  /**
-   *
-   * Given a pattern string (given in NameRequest's name field), this 
-   * finds all the entries in the mapping which have a value that begins with
-   * the string.  Each one is sent back separately via a NameRequest, and this
-   * sequence is followed by a blank NameRequest.
-   *
-   *@param pattern           Pattern to find (what result values should begin with)
-   *@param completeLookup    Should the type be returned as well?  This is only
-   *                         used to decide between LIST_VALUES and LIST_VALUE_ENTRIES
-   *                         since we might as well send back both if we look them up
-   *                         together.
-   */
-
-  void listByValue (String pattern, boolean completeLookup) throws IOException
-    {
-      // Get a listing of all the keys in the hash table
-      Enumeration enum = this.mapping_.keys();
-
-      // References used in the loop
-      String name;
-      ValueType vt;
-
-      // A NameRequest is used to return each item corresponding to the pattern.
-      NameRequest result = new NameRequest((completeLookup ? NameRequest.LIST_VALUES :
-					                  NameRequest.LIST_VALUE_ENTRIES),
-					null,
-					null,
-					null,
-					null);
-      // Keep ourselves safe from null pointer exceptions
-      if (pattern == null)
-	pattern = new String("");
-
-      // Scan through all the elements
-      while (enum.hasMoreElements()) {
-
-	// Get a key
-	name = (String)enum.nextElement();
-
-	// Have to get all the data for this entry to compare
-	vt = (ValueType)mapping_.get(name);
-
-	// Does it fit the pattern?
-	if (vt.value_ != null)
-	  if (vt.value_.startsWith(pattern)) {
-
-	    // Set the result values
-	    result.name(name);
-	    result.type(vt.type_);
-	    result.value(vt.value_);
-      
-	    // Send it out to the socket
-	    result.streamOutTo(this.peer());
-	  }
-      }
-
-      // Send final null message
-      result.name(null);
-      result.type(null);
-      result.value(null);
-      result.requestType(NameRequest.MAX_ENUM);
-      result.streamOutTo(this.peer());
-    }
-
-  boolean done_ = false;
- 
-
-  // References to the hash table and the timer queue
-  Hashtable mapping_;
-}
-
-
-/**
- * A simple wrapper to keep the type and value together in
- * the hash table.
- */
-class ValueType implements Serializable
-{
-  /**
-   * Constructor
-   *
-   *@param type   Type string to include
-   *@param value  Value string to include
-   */
-  ValueType(String type, String value)
-    { this.type_ = type; this.value_ = value; }
-
-  public String type_;
-  public String value_;
-}
-
diff --git a/java/netsvcs/Naming/NameProxy.java b/java/netsvcs/Naming/NameProxy.java
deleted file mode 100644
index 249f745f5ce..00000000000
--- a/java/netsvcs/Naming/NameProxy.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameProxy.java
- *
- * This is a proxy which clients can use to interact with the naming service.  They
- * open a SOCKStream to the service, and can then call simple bind and resolve
- * methods.
- *
- *@see netsvcs.Naming.NameAcceptor
- *@see netsvcs.Naming.NameHandler
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Naming;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-public class NameProxy
-{
-  /**
-   * Constructor
-   *
-   *@param socket    A SOCKStream already connected to the naming service
-   */
-  public NameProxy(SOCKStream socket)
-    {
-      this.socket_ = socket;
-    }
-
-  /**
-   * Attempt to bind the given data pair
-   * @param name      Name/key
-   * @param value     Value to bind 
-   *
-   * @return   True iff bind is successful
-   */
-  public boolean bind(String name, String value) throws IOException
-    {
-      return this.bind(name, value, null, false);
-    }
-
-  /**
-   * Attempt to bind the given data triplet
-   * @param name      Name/key
-   * @param value     Value to bind 
-   * @param type      Type to bind (another string)
-   *
-   * @return   True iff the bind was successful
-   */
-  public boolean bind(String name, String value, String type) throws IOException
-    {
-      return this.bind(name, value, type, false);
-    }
-
-  /**
-   * The most generic of the bind methods.  Allows factoring out of common code.  Not public.
-   */
-  boolean bind (String name, String value, String type, boolean rebind) throws IOException
-    {
-      // Create a new NameRequest with the desired info
-      NameRequest request = new NameRequest(rebind ? NameRequest.REBIND : NameRequest.BIND,
-					    name,
-					    value,
-					    type,
-					    null);
-
-      // Send it to the naming service
-      request.streamOutTo(this.socket_);
-
-      // Create a reply
-      NameReply reply = new NameReply();
-
-      // Get the status of the bind from the naming service
-      reply.streamInFrom(this.socket_);
-      
-      // Return true on success
-      return (reply.type() == NameReply.SUCCESS ? true : false);
-    }
-
-  /**
-   * Rebind a name and a value
-   * @param name     Name/key
-   * @param value    Bound value
-   *
-   * @return     True if the rebind was successful
-   */
-  public boolean rebind (String name, String value) throws IOException
-    {
-      return this.bind(name, value, null, true);
-    }
-
-  /** 
-   * Rebind a name, value, and type
-   * @param name     Name/key
-   * @param value    Bound value
-   * @param type     Bound type
-   *
-   * @return    True if rebind was successful
-   */
-  public boolean rebind (String name, String value, String type) throws IOException
-    {
-      return this.bind(name, value, type, true);
-    }
-  /**
-   * Look up information bound to the given key/name.
-   *
-   * @param  name     Name/key
-   *
-   * @return     Vector with three elements:
-   *                 0   Name/key
-   *                 1   Value
-   *                 2   Type
-   */
-  public Vector resolve (String name) throws IOException
-    {
-      // Create a new NameRequest with the name & request type
-      NameRequest request = new NameRequest(NameRequest.RESOLVE,
-					    name,
-					    null,
-					    null,
-					    null);
-
-      // Send it to the naming service
-      request.streamOutTo(this.socket_);
-
-      // Get a response (hopefully with the value and type)
-      request.streamInFrom(this.socket_);
-
-      // Dump the result into a vector
-      Vector result = new Vector();
-
-      result.addElement(request.name());
-      result.addElement(request.value());
-      result.addElement(request.type());
-
-      // Cut it down to the size we need
-      result.trimToSize();
-
-      return result;
-    }
-
-  /**
-   * Remove the entry in the mapping corresponding to the given name/key.
-   *
-   * @param      name      Name/key
-   *
-   * @return     True if the unbind was successful
-   */
-  public boolean unbind (String name) throws IOException
-    {
-      NameRequest request = new NameRequest(NameRequest.UNBIND,
-					    name,
-					    null,
-					    null,
-					    null);
-      // Send the request to the naming service
-      request.streamOutTo(this.socket_);
-
-      NameReply reply = new NameReply();
-
-      // Get reply
-      reply.streamInFrom(this.socket_);
-
-      return (reply.type() == NameReply.SUCCESS ? true : false);
-    }
-
-  /**
-   * Return a vector that's a list of names (Strings) that begin with
-   * the given pattern
-   * @param    pattern      Search pattern
-   * @return   Vector       List of names
-   */
-  public Vector listNames (String pattern) throws IOException
-    {
-      return this.requestSimpleList(pattern, NameRequest.LIST_NAMES);
-    }
-
-  /**
-   * Return a vector that's a list of types (Strings) that begin with
-   * the given pattern
-   * @param    pattern      Search pattern
-   * @return   Vector       List of types
-   */
-  public Vector listTypes (String pattern) throws IOException
-    {
-      return this.requestSimpleList(pattern, NameRequest.LIST_TYPES);
-    }
-
-  /**
-   * Return a vector that's a list of values (Strings) that begin with
-   * the given pattern
-   * @param    pattern      Search pattern
-   * @return   Vector       List of values
-   */
-  public Vector listValues (String pattern) throws IOException
-    {
-      return this.requestSimpleList(pattern, NameRequest.LIST_VALUES);
-    }
-
-  /**
-   * Non-public generic list gathering method
-   */
-  Vector requestSimpleList (String pattern, int type) throws IOException
-    {
-      // Make request for a list of the given type
-      NameRequest request = new NameRequest(type,
-					    pattern,
-					    null,
-					    null,
-					    null);
-      request.streamOutTo(this.socket_);
-
-      // Allocate and reuse the DIS here rather than each time we call
-      // streamInFrom
-      DataInputStream dis = new DataInputStream(this.socket_.inputStream());
-
-      request.streamInFrom(dis);
-      Vector result = new Vector();
-
-      // Add elements until there's a null message with the MAX_ENUM
-      // request type
-      while (request.requestType() != NameRequest.MAX_ENUM) {
-	if (type == NameRequest.LIST_NAMES)
-	  result.addElement(new String(request.name()));
-	else
-	if (type == NameRequest.LIST_VALUES)
-	  result.addElement(new String(request.value()));
-	else
-	  result.addElement(new String(request.type()));
-
-	request.streamInFrom(dis);
-      }
-
-      // Adjust the vector to the minimal size
-      result.trimToSize();
-
-      return result;
-    }
-
-  /**
-   * Get a vector with the entire data set for entries whose name begins with
-   * the given pattern.  Each element in the vector is another vector
-   * with the following layout:
-   *               0     Name/key
-   *               1     Value
-   *               2     Type
-   *
-   * @param    pattern     Search pattern
-   * @return   Vector of vectors
-   */
-  public Vector listNameEntries (String pattern) throws IOException
-    {
-      return this.requestComplexList(pattern, NameRequest.LIST_NAME_ENTRIES);
-    }
-
-  /**
-   * Get a vector with the entire data set for entries whose value begins with
-   * the given pattern.  Each element in the vector is another vector
-   * with the following layout:
-   *               0     Name/key
-   *               1     Value
-   *               2     Type
-   *
-   * @param    pattern     Search pattern
-   * @return   Vector of vectors
-   */
-  public Vector listValueEntries (String pattern) throws IOException
-    {
-      return this.requestComplexList(pattern, NameRequest.LIST_VALUE_ENTRIES);
-    }
-
-  /**
-   * Get a vector with the entire data set for entries whose type begins with
-   * the given pattern.  Each element in the vector is another vector
-   * with the following layout:
-   *               0     Name/key
-   *               1     Value
-   *               2     Type
-   *
-   * @param    pattern     Search pattern
-   * @return   Vector of vectors
-   */
-
-  public Vector listTypeEntries (String pattern) throws IOException
-    {
-      return this.requestComplexList(pattern, NameRequest.LIST_TYPE_ENTRIES);
-    }
-
-  /**
-   * Non-public generic method for getting a a vector of vectors with the 
-   * entire data set for entries fitting the given pattern.
-   */
-  Vector requestComplexList (String pattern, int type) throws IOException
-    {
-      // Create request with desired type
-      NameRequest request = new NameRequest(type,
-					    pattern,
-					    null,
-					    null,
-					    null);
-      // Send it to the naming service
-      request.streamOutTo(this.socket_);
-
-      // Allocate the DIS here and reuse
-      DataInputStream dis = new DataInputStream(this.socket_.inputStream());
-
-      // Get the first response
-      request.streamInFrom(dis);
-      Vector result = new Vector();
-
-      // Loop while we don't see a null response with the MAX_ENUM request type
-      while (request.requestType() != NameRequest.MAX_ENUM) {
-	Vector entry = new Vector();
-
-	// Create an element in the main vector
-	entry.addElement(request.name());
-	entry.addElement(request.value());
-	entry.addElement(request.type());
-	entry.trimToSize();
-	
-	// Add it to the result
-	result.addElement(entry);
-
-	// Get another NameRequest
-	request.streamInFrom(dis);
-      }
-
-      result.trimToSize();
-
-      return result;
-    }
-
-  // The SOCKStream used to communication with the service
-  SOCKStream socket_;
-};
-
-
-  
-  
-  
-      
-  
diff --git a/java/netsvcs/Naming/NameReply.java b/java/netsvcs/Naming/NameReply.java
deleted file mode 100644
index 52ebb111574..00000000000
--- a/java/netsvcs/Naming/NameReply.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameReply.java
- *
- * Used by the naming server to give quick status messages
- * to the client.  This is only used to signal the success or
- * failure of bind and unbind requests.  The error number is
- * unused (same in C++ version?).
- *
- *@see netsvcs.Naming.NameHandler
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Naming;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.*;
-import JACE.SOCK_SAP.*;
-
-public class NameReply
-{
-  // Success and failure constants
-  public final static int SUCCESS = 1;
-  public final static int FAILURE = 2;
-
-  /**
-   * Default Constructor
-   */
-  public NameReply () 
-    { 
-      this.type_ = this.SUCCESS;
-      this.errno_ = 0;
-    }
-
-  /**
-   * Constructor
-   *
-   *@param type    Success or failure
-   *@param err     Error number (unused)
-   */
-  public NameReply (int type, int err)
-    {
-      this.type_ = type;
-      this.errno_ = err;
-    }
-
-  /**
-   * Length accessor
-   */
-  int length() 
-    { return this.length_; }
-
-  /**
-   * Type accessor -- success or failure
-   */
-  int type()
-    { return this.type_; }
-
-  /**
-   * Error number accessor 
-   */
-  int errno()
-    { return this.errno_; }
-
-  /** 
-   * Set type
-   * @param type    New type
-   */
-  void type(int type)
-    { this.type_ = type; }
-
-  /**
-   * Set error number
-   * @param errno     New error number
-   */
-  void errno(int errno)
-    { this.errno_ = errno; }
-
-  /**
-   * Send this data to the given SOCKStream
-   *
-   *@param sock     SOCKStream to send to
-   */
-  public void streamOutTo (JACE.SOCK_SAP.SOCKStream sock) throws IOException
-    {
-      ByteArrayOutputStream bout = new ByteArrayOutputStream();
-      DataOutputStream dos = new DataOutputStream(bout);
-      
-      dos.writeInt(this.length_);
-      dos.writeInt(this.type_);
-      dos.writeInt(this.errno_);
-
-      dos.flush();
-
-      byte[] array = bout.toByteArray();
-
-      sock.sendN(array, 0, array.length);
-    }
-
-  /**
-   * Fill the fields of this instance from data in the socket
-   *
-   *@param sock     SOCKStream to read from
-   */
-  public void streamInFrom (JACE.SOCK_SAP.SOCKStream sock) throws IOException
-    {
-      DataInputStream dis = new DataInputStream(sock.inputStream());
-
-      this.streamInFrom(dis);
-    }
-
-  /**
-   * Send this data to the given DataInputStream (which should be buffered)
-   *
-   *@param dis      DataInputStream to use
-   */
-  public void streamInFrom (DataInputStream dis) throws IOException
-    {
-      int length = dis.readInt();
-      
-      if (length != this.length_) 
-	throw new IOException("Incorrect NameReply length");
-      
-      type_ = dis.readInt();
-      errno_ = dis.readInt();
-    }
-  
-  final static int length_ = 12;
-
-  int type_;
-  int errno_;
-}
-
-  
-  
-  
diff --git a/java/netsvcs/Naming/NameRequest.java b/java/netsvcs/Naming/NameRequest.java
deleted file mode 100644
index f8a3579fa35..00000000000
--- a/java/netsvcs/Naming/NameRequest.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Naming
- *
- * = FILENAME
- *    NameRequest.java
- *
- * Used by both client and naming server as detailed in
- * the NameHandler.  This structure transfers information
- * including name, value, type, and request type.
- *
- *@see netsvcs.Naming.NameHandler
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Naming;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.*;
-import JACE.SOCK_SAP.*;
-
-public class NameRequest
-{
-  /**
-   * Different types of requests 
-   */
-  public static final int BIND = 1; 
-  public static final int REBIND = 2; 
-  public static final int RESOLVE = 3; 
-  public static final int UNBIND  = 4; 
-  public static final int LIST_NAMES = 5;
-  public static final int LIST_VALUES = 13;
-  public static final int LIST_TYPES = 21;
-  public static final int LIST_NAME_ENTRIES = 6;
-  public static final int LIST_VALUE_ENTRIES = 14;
-  public static final int LIST_TYPE_ENTRIES = 22;
-  public static final int MAX_ENUM = 11; 
-
-  /**
-   * Default constructor
-   */
-  public NameRequest () 
-    {
-      this.name_ = this.value_ = this.type_ = null;
-      this.length_ = 32;
-    } 
-
-  /** 
-   * Constructor
-   *
-   * @param requestType      Type of request this is (BIND, REBIND, etc)
-   * @param name             Key to bind
-   * @param value            Value to bind
-   * @param type             Type to couple with the value
-   * @param timeout          Timer information (not really used in JACE yet)
-   */
-  public NameRequest(int requestType,
-		     String name,
-		     String value,
-		     String type,
-		     TimeValue timeout)
-    {
-      this.requestType_ = requestType;
-
-      if (timeout == null) {
-
-	this.blockForever_ = 1;
-	this.secTimeout_ = 0;
-	this.usecTimeout_ = 0;
-      } else {
-
-	this.blockForever_ = 0;
-	this.secTimeout_ = (int)timeout.sec();
-	this.usecTimeout_ = (int)timeout.getMilliTime() * 1000;
-      }
-
-      // This is necessary to make sure null pointer exceptions are
-      // avoided.  It makes it more consistent later on
-      if (name == null)
-	this.name_ = new String("");
-      else
-	this.name_ = new String(name);
-      if (value == null)
-	this.value_ = new String("");
-      else
-	this.value_ = new String(value);
-      if (type == null)
-	this.type_ = new String("");
-      else
-	this.type_ = new String(type);
-
-      // Set the length
-      this.calculateLength();
-    }
-
-  /** 
-   * Calculate the transmission length (bytes) of this structure
-   */
-  private void calculateLength()
-    {
-      // The type is sent as an 8 bit data type (chars in the C++ version),
-      // but the name and value are sent as 16 bit chars (ACE_USHORT16's in C++)
-
-      this.length_ = 34 + this.type_.length() + 2 * (this.name_.length() +
-						     this.value_.length());
-
-    }
-
-  /**
-   * Return the transmission length
-   */
-  public int length() 
-    { return this.length_; }
-
-  /**
-   * Return the name/key
-   */
-  public String name()
-    { return new String(this.name_); }
-
-  /**
-   * Set the name/key
-   * @param name    Name to set to
-   */
-  public void name(String name)
-    {
-      if (name == null)
-	this.name_ = new String("");
-      else
-	this.name_ = new String(name);
-
-      this.calculateLength();
-    }
-
-  /**
-   * Return the value
-   */
-  public String value()
-    { return new String(this.value_); }
-
-  /** 
-   * Set the value 
-   * @param value   New value
-   */
-  public void value(String value)
-    {
-      if (value == null)
-	this.value_ = new String("");
-      else
-	this.value_ = new String(value);
-
-      this.calculateLength();
-    }
-
-  /**
-   * Return the type
-   */
-  public String type()
-    { return new String(this.type_); }
-
-  /**
-   * Set the type
-   * @param type    New type
-   */
-  public void type(String type)
-    {
-      if (type == null)
-	this.type_ = new String("");
-      else
-	this.type_ = new String(type);
-
-      this.calculateLength();
-    }
-
-  /**
-   * Fill the fields of this instance with data from the socket
-   *
-   *@param sock     Socket to read from
-   */
-  public void streamInFrom (JACE.SOCK_SAP.SOCKStream sock) throws IOException
-    {
-      DataInputStream dis = new DataInputStream(sock.inputStream());
-
-      this.streamInFrom(dis);
-    }
-
-  /**
-   * Fill the fields of this instance from the given DataInputStream
-   *
-   *@param dis     DataInputStream to read from
-   */
-  public void streamInFrom (DataInputStream dis) throws IOException
-    {
-      // Read the length (32 bits)
-      length_ = dis.readInt();
-
-      // Read the request type
-      requestType_ = dis.readInt();
-
-      // Can we block forever to fulfill this request?  (unused)
-      blockForever_ = dis.readInt();
-
-      // How long until we should time out this request?  (unused)
-      secTimeout_ = dis.readInt();
-      usecTimeout_ = dis.readInt();
-
-      // The sizes are in bytes, and there are two bytes per char
-      // (ACE_USHORT16 in C++ land)
-      int nameLen = dis.readInt() / 2;
-      int valueLen = dis.readInt() / 2;
-
-      int typeLen = dis.readInt();
-
-      // Read the name -- just read chars since they're 16 bits.
-      // Hopefully the SOCKStream has buffered the data
-      char buf[] = new char[nameLen];
-      for (int i = 0; i < nameLen; i++) {
-	buf[i] = dis.readChar();
-      }
-      this.name_ = new String(buf);
-
-      // Read the value
-      buf = new char[valueLen];
-      for (int i = 0; i < valueLen; i++)
-	buf[i] = dis.readChar();
-      this.value_ = new String(buf);
-      
-      // Read the type -- now we can use readFully since 
-      // the type was sent as 8 bit chars
-      byte tbuf[] = new byte[typeLen];
-      dis.readFully(tbuf);
-      this.type_ = new String(tbuf);
-
-      // Skip the null char at the end
-      dis.skipBytes(2);
-    }
-  
-  /**
-   * Send this NameRequest out to the given SOCKStream
-   *
-   *@param sock    SOCKStream to send to
-   */
-  public void streamOutTo (JACE.SOCK_SAP.SOCKStream sock) throws IOException
-    {
-      ByteArrayOutputStream bout = new ByteArrayOutputStream();
-      DataOutputStream dos = new DataOutputStream(bout);
-
-      dos.writeInt(length_);
-      dos.writeInt(requestType_);
-      dos.writeInt(blockForever_);
-      dos.writeInt(secTimeout_);
-      dos.writeInt(usecTimeout_);
-
-      // Byte sizes are sent, and the name and value are stored as
-      // 16 bit char arrays (ACE_USHORT16 arrays in C++ version)
-      dos.writeInt(this.name_.length() * 2);
-      dos.writeInt(this.value_.length() * 2);
-      dos.writeInt(this.type_.length());
-
-      // Making sure the name_ wasn't null comes in handy
-      // in situations like this
-      dos.writeChars(this.name_);
-      dos.writeChars(this.value_);
-      dos.writeBytes(this.type_);
-
-      // Null termination
-      dos.writeChar(0);
-
-      // Send it for real
-      dos.flush();
-
-      byte[] array = bout.toByteArray();
-
-      sock.sendN(array, 0, array.length);
-    }
-
-  /**
-   * Set the requestType
-   *@param type   Type to set to
-   */
-  public void requestType(int type)
-    {
-      this.requestType_ = type;
-    }
-
-  /**
-   * Get requestType
-   */
-  public int requestType()
-    {
-      return this.requestType_;
-    }
-
-  /**
-   * Can we block forever to fulfill the request? (unused)
-   */
-  public boolean blockForever()
-    {
-      return (this.blockForever_ != 0) ? true : false;
-    }
-
-  /** 
-   * Allowed timeout (unused)
-   */
-  public int secTimeout()
-    {
-      return this.secTimeout_;
-    }
-
-  int length_;
-  int requestType_;
-  int blockForever_;
-  int secTimeout_;
-  int usecTimeout_;
-
-  String name_;
-  String value_;
-  String type_;
-};
-
-
-  
-
-  
-
diff --git a/java/netsvcs/Time/Clerk.java b/java/netsvcs/Time/Clerk.java
deleted file mode 100755
index f29e08e06f8..00000000000
--- a/java/netsvcs/Time/Clerk.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    netsvcs.Time
-// 
-// = FILENAME
-//    Clerk.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package netsvcs.Time;
-
-// Test driver for the time server clerk
-public class Clerk
-{
-  public static void main (String [] args)
-    {
-      TSClerkProcessor clerk = new TSClerkProcessor ();
-      clerk.init (args);
-    }
-}
diff --git a/java/netsvcs/Time/Server.java b/java/netsvcs/Time/Server.java
deleted file mode 100755
index 6b44ddf8d9f..00000000000
--- a/java/netsvcs/Time/Server.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    netsvcs.Time
-// 
-// = FILENAME
-//    Server.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package netsvcs.Time;
-
-// Test driver for the time service server
-public class Server
-{
-  public static void main (String [] args)
-    {
-      TSServerAcceptor server = new TSServerAcceptor ();
-      server.init (args);
-    }
-}
diff --git a/java/netsvcs/Time/TSClerkHandler.java b/java/netsvcs/Time/TSClerkHandler.java
deleted file mode 100755
index fc89b69c45c..00000000000
--- a/java/netsvcs/Time/TSClerkHandler.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TS_Clerk_Handler.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.util.Date;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.TimeValue;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Requests the remote time on a server at regular
- * intervals.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>TSClerkHandlers are created by a TSClerkProcessor.  There
- * is one handler for each server that the Clerk Processor factors into
- * its calculations.</blockquote>
- */
-public class TSClerkHandler extends SvcHandler
-{
-  /**
-   * Constructor.  TSClerkProcessor specifies the server machine and
-   * port, as well as the interval at which to make the query.
-   */
-  public TSClerkHandler (String hostname, 
-			 int port,
-			 TimerQueue tq, 
-			 int timeout,
-			 TSClerkProcessor parent)
-  {
-
-    this.hostname_ = hostname;
-    this.port_ = port;
-    this.tq_ = tq;
-    this.timeout_ = timeout;
-
-    this.initialTimeout_ = timeout;
-    this.processor_ = parent;
-
-    this.sendMsg_ = new String ("TIME_UPDATE_REQUEST");
-  }
-  
-  /**
-   * Called to start this handler in a new thread.  This only
-   * does it when the state of the handler is INITIALIZING.
-   */
-  public int open (Object obj)
-  {
-    if (this.state_ != RECONNECTING) {
-
-      Thread test = new Thread(this);
-
-      new Thread (this).start ();
-
-    }
-    return 0;
-  }
-
-  /**
-   * Accessor - return the host name of the server
-   */
-  public String hostname ()
-  {
-    return this.hostname_;
-  }
-
-  /**
-   * Accessor - return the port used to contact the server
-   */
-  public int port ()
-  {
-    return this.port_;
-  }
-
-  /**
-   * Accessor - returns the difference between the local time and
-   * the remote server. 
-   */
-  public long delta ()
-  {
-    return this.delta_;
-  }
-
-  /**
-   * Called when the thread starts.  Schedules itself with the
-   * timer queue.
-   */
-  public void run ()
-  {
-    this.timerId_ = this.tq_.scheduleTimer (this,
-					    null,
-					    new TimeValue (this.timeout_),
-					    new TimeValue (this.timeout_));
-
-  }
-
-  /**
-   * Accessor - return the state
-   */
-  public int state() 
-  {
-    return this.state_;
-  }
-
-  /**
-   * Sets the state of the handler
-   */
-  public void state(int newState)
-  {
-    this.state_ = newState;
-  }
-
-  /**
-   * Provides a new time out interval (exponentially increasing) so
-   * that if the server doesn't respond, we don't keep trying to
-   * reconnect as often.  Maximum value is 5 minutes.
-   */
-  public int recalculateTimeout() 
-  {
-    this.timeout_ *= 2;
-
-    if (this.timeout_ > this.max_timeout_)
-      this.timeout_ = max_timeout_;
-
-    return this.timeout_;
-  }
-
-  /**
-   * Start the recovery from a server disconnection by closing the
-   * port and recalculating the timeout value.
-   */
-  protected void errorRecovery()
-  {
-    ACE.DEBUG("Time Service failure with server " + this.hostname_);
-
-    this.timeout_ = this.recalculateTimeout();
-
-    this.reschedule();
-  }
-
-  /**
-   * Removes this handler from the timer queue, and reschedules it
-   * (presumably with a new timeout value)
-   */
-  public void reschedule()
-    {
-      this.tq_.cancelTimer(this);
-
-      this.timerId_ = this.tq_.scheduleTimer (this,
-					      null,
-					      new TimeValue (this.timeout_),
-					      new TimeValue (this.timeout_));
-    }
-
-  /**
-   * Called back by the timer queue.  If the handler isn't connected,
-   * it tries to reconnect to the server.  Otherwise, it requests
-   * the remote time.  The server is said to have disconnected when
-   * an exception is thrown in the socket system, or the result is
-   * a string with length <= 0.
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    if (this.state_ != CONNECTED) {
-
-      this.processor_.initiateConnection(this);
-
-      // If still not connected
-      if (this.state_ != CONNECTED) { 
-
-	// used to set state to reconnecting here
-	this.state_ = RECONNECTING;
-
-	// Reschedule to try again later
-	this.errorRecovery();
-	return 0;
-      } 
-
-      // If connected, poll the server at the requested intervals
-      this.resetTimeout();
-    }
-
-    StringBuffer ack = new StringBuffer ();
-    int ackLen;
-    try
-      {
-	// Used to calculate the turn-around time
-	long sendTime = System.currentTimeMillis();
-
-	this.peer ().send(this.sendMsg_);
-	ackLen = this.peer ().recv (ack);
-
-	long recvTime = System.currentTimeMillis();
-
-	if (ackLen <= 0) {
-
-	  this.state_ = DISCONNECTED;
-	  return -1;
-
-	} else {   
-
-	  long delta = (new Long(ack.toString())).longValue() - recvTime;
-
-	  delta += (recvTime - sendTime) / 2;
-
-	  this.delta_ = delta;
-
-          System.err.println("Delta: " + this.delta_);
-	}
-
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("connection reset by peer");
-	this.state_ = DISCONNECTED;
-	return -1;
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-	this.state_ = DISCONNECTED;
-	return -1;
-      }
-
-    return 0;
-  }
-  
-  /**
-   * Resets the timer interval to be the one supplied to the
-   * constructor.
-   */
-  public void resetTimeout()
-    {
-      this.timeout_ = this.initialTimeout_;
-
-      this.reschedule();
-    }
-    
-  private TSClerkProcessor processor_;
-  // Reference used to re-establish connections
-
-  public static final int MAX_RETRY_TIMEOUT = 300;
-  // Wait at most 5 minutes before trying to reconnect
-
-  // States
-  public static final int CONNECTED = 0;
-  public static final int DISCONNECTED = 1;
-  public static final int RECONNECTING = 2;
-
-  // If there has been a failure, try reconnecting
-  // at least every MAX_RETRY_TIMEOUT seconds
-  private int max_timeout_ = MAX_RETRY_TIMEOUT;
-
-  // State of the handler
-  private int state_ = DISCONNECTED;
-
-  // Difference between the remote time and the local time.
-  private long delta_ = 0;
-
-  // Name of the remote host
-  private String hostname_;
-
-  // Port used for the connection
-  private int port_;
-
-  // Current timer interval
-  private int timeout_;
-
-  // Reference to the Clerk Processor's timer queue
-  private TimerQueue tq_;
-
-  // Message to send for a time update
-  private String sendMsg_;
-
-  // ID of the handler in the queue
-  private int timerId_;
-
-  // Desired time interval to receive updates
-  private int initialTimeout_;
-
-}
diff --git a/java/netsvcs/Time/TSClerkProcessor.java b/java/netsvcs/Time/TSClerkProcessor.java
deleted file mode 100755
index d7b1773cc9e..00000000000
--- a/java/netsvcs/Time/TSClerkProcessor.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TSClerkProcessor.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.TimeValue;
-
-/**
- *
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Monitors a specified port (default 7989) and launches
- * TSClerkHandlers when connections are made.  The handlers communicate
- * with servers and calculate the difference between the server time
- * and local time.  The Clerk Processor averages these differences
- * and reports them to clients.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>This doesn't actually change the system clock, but it
- * provides the average of the differences of the local and server
- * times.  A client could use this information to adjust the clock, or
- * just use the midpoint to determine the correct network time.</blockquote>
- *
- */
-public class TSClerkProcessor extends Connector implements Runnable
-{
-  /**
-   * Default constructor
-   */
-  public TSClerkProcessor ()
-  {
-    this.serverArray_ = new Vector ();
-
-  }
-
-  /**
-   * Parse the command line, setup the TSRequestAcceptor, and run
-   * the Clerk Processor in its own thread.
-   */
-  public int init (String [] args)
-    {
-      // Parse arguments
-      this.parseArgs (args);
-      
-      TSRequestAcceptor ra = new TSRequestAcceptor (this);
-      ra.init (args);
-
-      // Run in own thread of control so that we don't block the caller
-      new Thread (this).start ();
-      return 0;
-    }
-
-
-  /**
-   * Makes connections to the servers, schedules itself for intervals
-   * to update the delta time.
-   */
-  public void run ()
-  {
-
-    // Set up connections with all servers
-    Enumeration table = this.serverArray_.elements ();
-    while (table.hasMoreElements ())
-      {
-	this.initiateConnection((TSClerkHandler)table.nextElement());
-      }
-
-    // Set up timer
-    this.timer_id_ = this.tq_.scheduleTimer (this,
-					     null,
-					     new TimeValue (this.timeout_),
-					     new TimeValue (this.timeout_));
-  }
-
-  /**
-   * Makes connections to the servers.
-   */
-  public void initiateConnection (TSClerkHandler handler)
-  {
-    this.open (handler.hostname(), handler.port());
-
-    try
-      {
-	// Connect to the server
-	this.connect (handler);
-
-	// Set the state of the Clerk Handler so it queries the
-	// server at intervals.
-	handler.state(TSClerkHandler.CONNECTED);
-	
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR ("Connection refused");
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-  }
-
-
-  /**
-   *
-   * Called by the timer queue.  Calls updateTime().
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return this.updateTime ();
-  }
-
-  /**
-   * Calculates the delta time by averaging the results from
-   * Clerk Handler delta()'s.  It only includes handlers whose
-   * state is currently CONNECTED.  If they're not connected, it
-   * reschedules them to begin the error correction process of
-   * trying to reconnect to the server (possible synch problems?).
-   */
-  protected int updateTime ()
-  {
-    TSClerkHandler handler;
-    int count = 0;
-    long totalDeltaTime = 0;
-
-    Enumeration table = this.serverArray_.elements ();
-
-    while (table.hasMoreElements ())
-      {
-	handler = (TSClerkHandler) table.nextElement ();
-
-	if (handler.state() != TSClerkHandler.CONNECTED) {
-
-	  // Reconnecting state means we don't need to put
-	  // it in the timer queue again
-	  if (handler.state() == TSClerkHandler.RECONNECTING)
-	    continue;
-	  else
-	  if (handler.state() == TSClerkHandler.DISCONNECTED) 
-	    handler.state(TSClerkHandler.RECONNECTING);
-
-	  handler.errorRecovery();
-	  continue;
-	}
-
-	long delta = handler.delta();
-
-	ACE.DEBUG(handler.hostname() + ": " + delta);
-
-	totalDeltaTime += delta;
-	count++;
-      }
-
-    if (count > 0) {
-
-      this.timeDelta_ = totalDeltaTime / count;
-
-      ACE.DEBUG("Average deviation: " + totalDeltaTime/count);
-
-    } else
-
-      this.timeDelta_ = 0;
-
-    return 0;
-  }
-
-  /**
-   * Return the delta time.
-   */
-  public long getDelta()
-    {
-      return this.timeDelta_;
-    }
-
-  /**
-   * Parse the command line.  Watches for -t <time> and
-   * -h <machine:port> switches.  Must specify time
-   * value before host switches!
-   */
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "t:h:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 't':
-	    s = opt.optarg ();
-	    this.timeout_ = (new Integer (s)).intValue ();
-	    break;
-	  case 'h':
-	    s = opt.optarg ();
-	    this.addNewHandler (s);
-	    break;
-	  default:
-	    ACE.ERROR ("Bad command line argument: " + c);
-
-	    ACE.ERROR ("Valid arguments: -t <timeout> -h <hostname>:<port> -h ...");
-	    break;
-	  }
-      }
-  }
-  
-  /**
-   *
-   * Creates a new Clerk Handler and adds it to the serverArray_
-   */
-  private void addNewHandler (String s)
-  {
-    StringTokenizer tokens = new StringTokenizer (s, ":");
-    String hostname = tokens.nextToken ();
-
-    int port = (new Integer (tokens.nextToken ())).intValue ();
-    
-    // Create new handler and add it to array of servers
-    this.serverArray_.addElement (new TSClerkHandler (hostname, 
-						      port,
-						      this.tq_,
-						      this.timeout_,
-						      this));
-  }
-  
-  // Vector of TSClerkHandlers, one for each server
-  private Vector serverArray_;
-
-  // Default interval at which to update the time
-  private int timeout_ = 1000;
-
-  // Timer queue which calls handleTimeout when the Clerk Processor
-  // is supposed to update the time.
-  private TimerQueue tq_ = new TimerQueue (true);
-
-  // Clerk Processor ID in the timer queue
-  private int timer_id_;
-
-  // Average of the differences of the local and server times.
-  private long timeDelta_;
-}
diff --git a/java/netsvcs/Time/TSRequestAcceptor.java b/java/netsvcs/Time/TSRequestAcceptor.java
deleted file mode 100755
index e02b0b261ba..00000000000
--- a/java/netsvcs/Time/TSRequestAcceptor.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TSRequestAcceptor.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Monitors a specified port (default 7990) and launches 
- * TSRequestHandlers when connections are made.  The handlers
- * report the average deviation from the local time when input
- * is received to their sockets.</blockquote>
- * 
- * <p><h2>DESCRIPTION</h2>
- * <blockquote>This is in place of the shared memory system used in C++ ACE.  
- * The clients need to request the correct time range from the Clerk, so
- * they can do it with <a href="ACE.SOCK_SAP.SOCKStream.html#_top_">
- * <tt>sockets</tt></a>.  An instance of TSRequestAcceptor is created
- * and initialized in TSClerkProcessor init().  This should be the
- * only place it's used.</blockquote>
- *
- * @see ACE.SOCK_SAP.SOCKAcceptor,ACE.netsvcs.Time.TSClerkProcessor
- */
-
-public class TSRequestAcceptor extends Acceptor implements Runnable
-{
-  /**
-   * Create an instance of TSRequestAcceptor.  Default constructor.
-   */
-  public TSRequestAcceptor (TSClerkProcessor parent) 
-    {
-      this.parent_ = parent;
-    }
-
-  /**
-   *
-   * Process command line arguments (port), and start this instance
-   * in its own thread.
-   *
-   */
-  public int init(String [] args)
-    {
-      this.parseArgs (args);
-
-      new Thread (this).start();
-      return 0;
-    }
-
-  /**
-   *
-   * Called when the thread starts.  Open the port and accept
-   * connections.
-   */
-  public void run ()
-    {
-      try {
-	this.open (this.port_);
-	while (true)
-	  this.accept();
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("Stopped accepting");
-    }
-
-  /**
-   *
-   * Parse the command line.  This only looks for -p <port number>.
-   *
-   */
-  protected void parseArgs (String args[])
-    {
-      String s;
-      GetOpt opt = new GetOpt (args, "p:");
-
-      for (int c; (c = opt.next ()) != -1; )
-	{
-	  switch (c)
-	    {
-	    case 'p':
-	      s = opt.optarg ();
-	      this.port_ = (new Integer (s)).intValue ();
-	      break;
-	    default:
-	      ACE.ERROR("Invalid argument: " + c);
-	      break;
-	    }
-	}
-    }
-
-  /**
-   *
-   * Modifies to behavior of Acceptor accept() so the TSClerkProcessor
-   * reference can be passed to the TSRequestHandler.
-   *
-   */
-
-  protected SvcHandler makeSvcHandler ()
-        throws InstantiationException, IllegalAccessException
-  {
-    return (SvcHandler) new TSRequestHandler(parent_);
-  }
-
-  // Port to monitor
-  private int port_ = 7990;
-
-  // Reference to the Clerk Processor (which holds the time value)
-  private TSClerkProcessor parent_;
-};
-     
diff --git a/java/netsvcs/Time/TSRequestHandler.java b/java/netsvcs/Time/TSRequestHandler.java
deleted file mode 100755
index dbeded22250..00000000000
--- a/java/netsvcs/Time/TSRequestHandler.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package netsvcs.Time;
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TSRequestHandler.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Handles giving the client the average difference between
- * the local time and the server times.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>Whenever the RequestHandler receives input to the port, it
- * sends the current delta (average difference time) in return as a string.
- * Instances of this class are created by TSRequestAcceptor.</blockquote>
- */
-public class TSRequestHandler extends SvcHandler
-{
-  /**
-   * Constructor.  Takes in a reference to the Clerk Processor
-   * so it can call TSClerkProcessor getDelta().
-   */
-  public TSRequestHandler (TSClerkProcessor processor)
-  {
-    this.processor_ = processor;
-  }
-  
-  /**
-   *
-   * Run this in a separate thread.
-   */
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  /**
-   *
-   * Called when the thread starts.  This is the main code -- whenever
-   * input comes to the socket, it sends out the current delta time
-   * as a string.
-   */
-  public void run ()
-  {
-    int msgLen;
-    try
-      {
-	while (true)
-	  {
-	    StringBuffer msg = new StringBuffer ();
-	    
-	    msgLen = this.peer ().recv (msg);
-
-	    if (msgLen < 0)
-	      break;
-	    else {
-	      
-	      // No matter what was sent in, send the average difference back
-
-	      String msgOut = new String("" + this.processor_.getDelta() + '\n');
-	      this.peer ().send (msgOut);
-
-	    }
-	  }
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("Connection reset by peer");
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    finally
-      {
-	try 
-	  {
-	    this.peer ().close ();
-	  }
-	catch (IOException e)
-	  {
-	    ACE.ERROR (e);
-	  }
-      }
-  }
-  
-
-  // Reference to the Clerk Processor to call getDelta()
-  TSClerkProcessor processor_;
-}
diff --git a/java/netsvcs/Time/TSServerAcceptor.java b/java/netsvcs/Time/TSServerAcceptor.java
deleted file mode 100755
index 2d54f7b740b..00000000000
--- a/java/netsvcs/Time/TSServerAcceptor.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TS_Server_Acceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>DESCRIPTION</h2>
- *
- * Acceptor: listens to a port and launches TSServerHandlers
- * when connections are made.
- *
- * @see netsvcs.Time.TSServerHandler, JACE.Connection.Acceptor
- */
-public class TSServerAcceptor extends Acceptor implements Runnable
-{
-  // Run this in its own thread
-  public int init (String [] args)
-    {
-      // Parse arguments
-      this.parseArgs (args);
-
-      // Run in own thread of control so that we don't block the caller
-      new Thread (this).start ();
-      return 0;
-    }
-
-  // Create a TSServerHandler for each client that wants to connect
-  public void run ()
-  {
-    try
-      {
-	this.setHandlerFactory (Class.forName ("netsvcs.Time.TSServerHandler"));
-	this.open (this.port_);
-	while (true)
-	  this.accept ();
-      }
-    catch (ClassNotFoundException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR ("Socket Exception: " + e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("Stopped accepting");
-  }
-
-  // Process the command line
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "p:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 'p':
-	    s = opt.optarg ();
-	    this.port_ = (new Integer (s)).intValue ();
-	    break;
-	  default:
-	    ACE.ERROR ("Unknown argument: " + c);
-	    break;
-	  }
-      }
-  }
-
-  private int port_ = 7989;
-}
-
diff --git a/java/netsvcs/Time/TSServerHandler.java b/java/netsvcs/Time/TSServerHandler.java
deleted file mode 100755
index 4ee700254ed..00000000000
--- a/java/netsvcs/Time/TSServerHandler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TS_Server_Handler.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>DESCRIPTION</h2>
- *     
- * <blockquote>Handles requests from a TSClerkHandler and sends
- * back the current local time.</blockquote>
- *
- * @see netsvcs.Time.TSClerkHandler. netsvcs.Time.TSServerAcceptor
- */
-
-public class TSServerHandler extends SvcHandler
-{
-  // Constructor
-  public TSServerHandler ()
-  {
-  }
-  
-  // Start this handler in its own thread
-  public int open (Object obj)
-  {
-
-    new Thread (this).start ();
-    return 0;
-  }
-
-  // Wait for messages from the Client and send the current local
-  // time back as a string.
-  public void run ()
-  {
-    int msgLen;
-    try
-      {
-	while (true)
-	  {
-	    // Use a new one each time since recv appends
-	    StringBuffer msg = new StringBuffer ();
-
-	    // Get the message from the client (blocks)
-	    msgLen = this.peer ().recv (msg);
-
-	    // Just keep waiting if there's a problem
-	    if (msgLen <= 0)
-	      break;
-
-	    // Is the message for the right thing?
-	    if (msg.toString().compareTo ("TIME_UPDATE_REQUEST") != 0) {
-	      System.err.println("Unknown message: \"" + msg + '\"');
-	      this.peer().send("\n");  // send so other side isn't stuck
-	      break;
-	    }
-
-	    // Get local time
-	    long time = System.currentTimeMillis();
-
-	    // Send as a string
-	    this.peer ().send ("" + time);
-
-	    ACE.DEBUG("Time: " + new Date(time));
-	  }
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("Connection reset by peer");
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    finally
-      {
-	try 
-	  {
-	    this.peer ().close ();
-	  }
-	catch (IOException e)
-	  {
-	  }
-      }
-  }
-}
diff --git a/java/src/ACE.java b/java/src/ACE.java
deleted file mode 100644
index 8fa6e1823fa..00000000000
--- a/java/src/ACE.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.OS
- *
- * = FILENAME
- *    JACE.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.OS;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- * <blockquote>Constants, utility "functions", etc.</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- * Defines default constants for ACE. Many of these are used for the
- * ACE tests and applications. You may want to change some of these to
- * correspond to your environment. Also, routines for error handling,
- * debugging and bit manipulation are included.
- *</blockquote>
- *
- * <h2>NOTES</h2>
- *<blockquote>
- * This class is non-instantiable, and intended only to provide a constrained
- * namespace.
- *</blockquote>
- */
-public abstract class ACE
-{
-  /**
-   * Default port on which a server listens for connections.
-   */
-  public static final int DEFAULT_SERVER_PORT = 10002;
-
-  /** 
-   * Default name to use for a thread group.
-   */
-  public static final String DEFAULT_THREAD_GROUP_NAME = "ace_thread_group";
-
-  /**
-   * Disable debugging. Once debugging is disabled, all ACE.DEBUG
-   * statements would be ignored. 
-   */
-  public static final void disableDebugging ()
-  {
-    ACE.debug_ = false;
-  }
-
-  /**
-   * Enable debugging. Once debugging is enabled, all ACE.DEBUG
-   * statements get printed.
-   */
-  public static final void enableDebugging ()
-  {
-    ACE.debug_ = true;
-  }
-
-  /** 
-   * Print the string representation of Java Exception.
-   *@param e Java exception
-   */
-  public static final void ERROR (Exception e)
-    {
-      System.err.println (e);
-    }
-
-  /** 
-   * Print the string being passed in.
-   *@param s a Java String
-   */
-  public static final void ERROR (String s)
-    {
-      System.err.println (s);
-    }
-
-  /** 
-   * Print the string being passed in.
-   *@param s A Java String
-   *@return Error value passed in
-   */
-  public static final int ERROR_RETURN (String s, int errorVal)
-    {
-      System.err.println (s);
-      return errorVal;
-    }
-
-  /** 
-   * Print the string being passed in. Note the behavior will vary
-   * depending upon whether debugging is enabled or disabled.
-   *@param s a Java String
-   */
-  public static final void DEBUG (String s)
-    {
-      if (ACE.debug_)
-	System.out.println (s);
-    }
-
-  /** 
-   * Flush out any data that may be buffered.
-   */
-  public static final void FLUSH ()
-    {
-      System.out.flush ();
-    }
-
-  /** 
-   * Set the bits of WORD using BITS as the mask.
-   *@param WORD the bits to be set.
-   *@param BITS the mask to use.
-   *@return The value obtained after setting the bits.
-   */
-  public static final long SET_BITS (long WORD, long BITS)
-    {
-      return WORD | BITS;
-    }
-
-  /** 
-   * Clear the bits of WORD using BITS as the mask.
-   *@param WORD the bits to clear.
-   *@param BITS the mask to use.
-   *@return The value obtained after clearing the bits.
-   */
-  public static final long CLR_BITS (long WORD, long BITS)
-    {
-      return WORD & ~BITS;
-    }
-  
-  /** 
-   * Check if bits are enabled in WORD.
-   *@param WORD the bits to check.
-   *@param BIT the bit to check to see if it is enabled or not.
-   *@return true if bit is enabled, false otherwise.
-   */
-  public static final boolean BIT_ENABLED (long WORD, long BIT)
-    {
-      return (WORD & BIT) != 0;
-    }
-
-  /** 
-   * Check if bits are disabled in WORD.
-   *@param WORD the bits to check.
-   *@param BIT the bit to check to see if it is disabled or not.
-   *@return true if bit is disabled, false otherwise.
-   */
-  public static final boolean BIT_DISABLED (long WORD, long BIT)
-    {
-      return (WORD & BIT) == 0;
-    }
-  
-  // Debug flag (turn debugging on/off)
-  private static boolean debug_ = true;
-
-  // Default private constructor to avoid instantiation
-  private ACE ()
-  {
-  }
-}
-
-
diff --git a/java/src/AcceptStrategy.java b/java/src/AcceptStrategy.java
deleted file mode 100644
index e5af43f07f5..00000000000
--- a/java/src/AcceptStrategy.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    AcceptStrategy.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- * Interface for specifying a passive connection
- * acceptance strategy for a 
- * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>
- * .
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *
- *<blockquote>
- * This class provides a strategy that manages passive
- * connection setup for an application, and can be extended
- * to define new strategies.
- *</blockquote>
- *
- * @see SvcHandler
- * @see Acceptor
- */
-
-public class AcceptStrategy
-{
-  /**
-   * Create an instance of Accept Strategy.
-   *@param port port number where the server will listen for connections
-   *@exception IOException couldn't open port
-   */
-  AcceptStrategy (int port) throws IOException
-  {
-    this.open (port);
-  }
-
-  /**
-   * Initialize AcceptStrategy.
-   *@param port port number where the server will listen for connections
-   *@exception IOException couldn't open port
-   */
-  public void open (int port) throws IOException
-  {
-    // Create a new SOCK_Acceptor to accept client connections
-    this.sockAcceptor_ = new SOCKAcceptor (port);
-  }
-
-  /**
-   * Accept connections into the SvcHandler. Note that subclasses
-   * should overwrite this method to provide a different accept
-   * strategy.
-   *@param sh Svc Handler in which to accept the connection
-   *@exception SocketException Socket error
-   *@exception IOException Socket error
-   *@return 0
-   */
-  public int acceptSvcHandler (SvcHandler sh) throws
-  SocketException, IOException
-    {
-      // Create a new stream
-      SOCKStream sockStream = new SOCKStream ();
-      
-      // Block in accept. Returns when a connection shows up
-      this.sockAcceptor_.accept (sockStream);
-      
-      // Set the streams for the new handler
-      sh.setHandle (sockStream);
-      return 0;
-    }
-
-  // Our connection acceptance factory
-  private SOCKAcceptor sockAcceptor_;
-
-}
diff --git a/java/src/Acceptor.java b/java/src/Acceptor.java
deleted file mode 100644
index 945f170fe38..00000000000
--- a/java/src/Acceptor.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    Acceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-import JACE.ServiceConfigurator.*;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Abstract factory for creating a service handler
- * (<a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>),
- * accepting into the
- * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>, and activating the
- * <a href="ACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>Implements the basic strategy for passively establishing
- * connections with applications.  The <tt>Acceptor</tt>
- * is a factory for <tt>SvcHandler</tt> instances, and, by default
- * generates a new <tt>SvcHandler</tt> instance for each connection
- * esablished.</blockquote>
- *
- * <p>
- *
- * <blockquote> The user of this class <em>must</em> provide a
- * reference to a handler factory prior to calling <a
- * href="#accept()"><tt>accept</tt></a>, or an exception will be
- * thrown.  The handler factory is identified by the meta-class for
- * the <tt>SvcHandler</tt>, and is typically obtained by calling <a
- * href="java.lang.Class#classForName(java.lang.String)"><tt>Class.classForName("SvcHandler")</tt></a>.
- * </blockquote>
- *
- * <p>
- *
- * <blockquote> TCP is the transport mechanism used, via
- * <a href="ACE.SOCK_SAP.SOCKAcceptor.html#_top_"><tt>SOCKAcceptor</tt></a>,
- * <em>et.al.</em> The SvcHandler is instantiated with a concrete type
- * that performs the application-specific service. </blockquote>
- *
- * <h2>NOTES</h2>
- *
- * <blockquote> This class is not directly related to the
- * <tt>AcceptorStrategy</tt> class.</blockquote>
- *
- *
- * @see java.lang.Class
- * @see JACE.Connection.SvcHandler
- * @see JACE.SOCK_SAP.SOCKAcceptor 
- */
-public class Acceptor extends ServiceObject
-{
-  /**
-   * Create an instance of Acceptor. Default constructor.  Note that if
-   * an instance is created via this method, <tt>setHandlerFactory</tt>
-   * must be called prior to using <tt>accept</tt>.
-   *
-   * @see JACE.Connection.Acceptor#setHandlerFactory
-   */
-  public Acceptor ()
-  {
-  }
-  
-  /**
-   * Create an instance of Acceptor.
-   *@param handlerFactory meta-class reference used to create
-   * an instance of a SvcHandler when a connection is accepted
-   * (typically obtained by calling <tt>Class.classForName</tt>).
-   *
-   *@see java.lang.Class#forName
-   */
-  public Acceptor (Class handlerFactory)
-  {
-    this.handlerFactory_ = handlerFactory;
-  }
-
-  /**
-   * Set the handler factory. This is provided to aid the default
-   * no-arg constructor.
-   *@param handlerFactory meta-class reference used to create
-   * an instance of a SvcHandler when a connection is accepted
-   * (typically obtained by calling <tt>Class.forName</tt>).
-   *
-   *@see java.lang.Class#forName
-   */
-  public void setHandlerFactory (Class handlerFactory)
-  {
-    this.handlerFactory_ = handlerFactory;
-  }
-
-  /**
-   * Initialize the Acceptor.
-   *@param port TCP port number where the Acceptor will listen for connections
-   *@exception IOException socket level exception
-   */
-  public void open (int port) throws IOException
-  {
-    this.sockAcceptor_ = new SOCKAcceptor (port);
-  }
-
-  /**
-   * Template method for accepting connections. Delegates operational
-   * activities to the following bridge methods:
-   * <ul>
-   * <li><tt>makeSvcHandler</tt></li>
-   * <li><tt>acceptSvcHandler</tt></li>
-   * <li><tt>activateSvcHandler</tt></li>
-   * </ul>
-   *
-   * <p>
-   *
-   * The method first obtains a <tt>SvcHandler</tt> via
-   * <tt>makeSvcHandler</tt>, accepts the connection <q>into</q> the
-   * handler using <tt>acceptSvcHandler</tt>, and finally turns over
-   * control to the handler with <tt>activateSvcHandler</tt>.
-   *
-   *@exception SocketException socket level error
-   *@exception InstantiationException <tt>makeSvcHandler</tt> failure
-   *@exception IllegalAccessException <tt>makeSvcHandler</tt> failure
-   *@exception IOException socket level error
-   */
-  public void accept () throws SocketException, 
-    InstantiationException, 
-    IllegalAccessException,
-    IOException
-  {
-
-    // Create a Svc_Handler using the appropriate Creation_Strategy
-    SvcHandler sh = this.makeSvcHandler ();
-
-    // Accept a connection into the SvcHandler using the appropriate
-    // Accept_Strategy 
-    this.acceptSvcHandler (sh);
-
-    // Activate the SvcHandler using the appropriate ActivationStrategy
-    this.activateSvcHandler (sh);
-  }
-
-  /**
-   * Bridge method for creating a <tt>SvcHandler</tt>. The default is to
-   * create a new <SvcHandler>.  However, subclasses can override this
-   * policy to perform <SvcHandler> creation in any way that they like
-   * (such as creating subclass instances of <SvcHandler>, using a
-   * singleton, etc.)
-   *@return a new instance of the SvcHandler
-   *@exception InstantiationException could not create new SvcHandler
-   *@exception IllegalAccessException no SvcHandler factory provided
-   */
-  protected SvcHandler makeSvcHandler ()
-        throws InstantiationException, IllegalAccessException
-  {
-    // Create a new handler for the connection
-    return (SvcHandler) handlerFactory_.newInstance ();
-  }
-
-  /**
-   * Bridge method for accepting the new connection into the
-   * <tt>SvcHandler</tt>.  The default behavior delegates the work to
-   * <tt>SOCKAcceptor.accept</tt>. However, subclasses can override this
-   * strategy.
-   *@param sh SvcHandler in which to accept the connection
-   *@return 0
-   *@exception SocketException socket level error
-   *@exception IOException socket level error
-   */
-  protected int acceptSvcHandler (SvcHandler sh)
-       throws SocketException, IOException
-  {
-    // Create a new stream
-    SOCKStream sockStream = new SOCKStream ();
-
-    // Block in accept. Returns when a connection shows up
-    this.sockAcceptor_.accept (sockStream);
-
-    // Set the streams for the new handler
-    sh.setHandle (sockStream);
-    return 0;
-  }
-  
-  /**
-   * Bridge method for activating a <tt>SvcHandler</tt>.  The default
-   * behavior of this method is to activate the <tt>SvcHandler</tt> by
-   * calling its open() method (which allows the <tt>SvcHandler</tt> to
-   * define its own concurrency strategy).  However, subclasses can
-   * override this strategy to do more sophisticated concurrency
-   * activations.
-   *@param sh SvcHandler to activate
-   *@return 0
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-  {
-    sh.open (null);
-    return 0;
-  }
-
-  // Handler class that should be instantiated when a connection is
-  // made with a client
-  private Class handlerFactory_;
-
-  // Our connection acceptance factory
-  protected SOCKAcceptor sockAcceptor_;
-}
diff --git a/java/src/ActivateStrategy.java b/java/src/ActivateStrategy.java
deleted file mode 100644
index 882203ad552..00000000000
--- a/java/src/ActivateStrategy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    ActivateStrategy.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-
-/**
- * <hr>
- *<h2>SYNOPSIS</h2>
- * Bridge supporting activation strategy used by
- * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>
- *
- *<h2>DESCRIPTION</h2>
- * Subclass and overload
- * <a href="#activateSvcHandler(ACE.Connection.SvcHandler)"><tt>activateSvcHandler</tt></a>
- * in order change the activation strategy.  Then, submit this subclass to 
- * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>
- * as the activation strategy.
- *
- *@see StrategyAcceptor
- */
-public class ActivateStrategy
-{
-  /**
-   * Activate the Svc Handler. Note that subclasses should overwrite
-   * this method to provide a different Activate strategy.
-   *@param sh Svc Handler to activate
-   *@return zero if success, non-zero for failure
-   */
-  public int activateSvcHandler (SvcHandler sh)
-    {
-      sh.open (null);
-      return 0;
-    }
-}
diff --git a/java/src/AddServiceObjectNode.java b/java/src/AddServiceObjectNode.java
deleted file mode 100644
index aa99c51ebc3..00000000000
--- a/java/src/AddServiceObjectNode.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-
-class AddServiceObjectNode extends ParseNode
-{
-
-  public AddServiceObjectNode ()
-  {
-    this.locator_ = new String();
-    this.params_ = new String();
-  }
-
-  /* This should be the class name, fully qualified or in the class path */
-  public String locator ()
-  {
-    return this.locator_;
-  }
-
-  public String params ()
-  {
-    return this.params_;
-  }
-
-  public void params (String params)
-  {
-    this.params_ = params;
-  }
-
-  public boolean suspended ()
-  {
-    return this.suspended_;
-  }
-
-  public void init(String name, String locator, boolean suspended)
-  {
-    super.name_ = name;
-    this.locator_ = locator;
-    this.suspended_ = suspended;
-  }
-
-  public void apply ()
-  {
-    ACE.DEBUG("AddServiceObjectNode apply");
-
-    if (JACE.ServiceConfigurator.ServiceConfig.initialize(this) == -1)
-      ACE.ERROR("Error adding " + this.name_);
-  }
-
-  String params_;
-  String locator_;
-  boolean suspended_;
-};
diff --git a/java/src/Blob.java b/java/src/Blob.java
deleted file mode 100644
index 69feef248b3..00000000000
--- a/java/src/Blob.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    Blob.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-public class Blob
-{
-  public int open (String filename, String hostname , int port) 
-  {
-    this.filename_ = filename;
-    this.hostname_ = hostname;
-    this.port_ = port;
-    return 0;
-  }
-
-  public MessageBlock read (int length, int offset) 
-  {
-    // Check if we have a valid length and a valid offset
-    if (length < 0 || offset < 0)
-      {
-	ACE.ERROR ("Blob::read(): Negative length or offset");
-	return null;
-      }
-    
-    // Create a Blob Reader
-    BlobReader blobReader = new BlobReader (length, offset, this.filename_, this.hostname_, this.port_);
-
-    // Receive data
-    MessageBlock mb = blobReader.receiveData ();
-    if (blobReader.bytesRead () != length)
-      return null;
-    else
-      return mb;
-  }
-
-  public int write (MessageBlock mb, int length, int offset) 
-  {
-    // Check if we have a valid length and a valid offset
-    if (length < 0 || offset < 0)
-      ACE.ERROR ("Blob::write(): Negative length or offset");
-    
-    // Create a Blob Writer
-    BlobWriter blobWriter = new BlobWriter (mb, length, offset, this.filename_);
-    
-    try
-      {
-	// Connect to the server
-	this.connector_.open (this.hostname_, this.port_);
-	this.connector_.connect (blobWriter);
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    
-    return blobWriter.bytesWritten ();
-  }
-
-  public int close () 
-  {
-    return 0;
-  }
-
-  String filename_;
-  String hostname_;
-  int port_;
-  Connector connector_ = new Connector ();
-}
diff --git a/java/src/BlobHandler.java b/java/src/BlobHandler.java
deleted file mode 100644
index ec282bdeaa9..00000000000
--- a/java/src/BlobHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    BlobHandler.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-public abstract class BlobHandler extends SvcHandler
-{
-  public BlobHandler (int length, int offset, String filename)
-  {
-    this.length_ = length;
-    this.offset_ = offset;
-    this.filename_ = filename;
-  }
-
-  public abstract int open (Object obj);
-
-  protected int length_ = 0;
-  protected int offset_ = 0;
-  protected String filename_ = null;
-}
-
diff --git a/java/src/BlobReader.java b/java/src/BlobReader.java
deleted file mode 100644
index 7209f3c721f..00000000000
--- a/java/src/BlobReader.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    BlobReader.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-// Reader **************************************************
-
-public class BlobReader
-{
-  public BlobReader (int length, 
-		     int offset, 
-		     String filename,
-		     String hostname,
-		     int port)
-  {
-    this.length_ = length;
-    this.offset_= offset;
-    this.filename_ = filename;    
-    this.hostname_ = hostname;
-    this.port_ = port;
-  }
-
-
-  public MessageBlock receiveData ()
-  {
-    String hostname = this.hostname_;
-    String filename = this.filename_;
-
-    // Check if the filename begins with a "/" and if so, remove it
-    // since we are concatenating a "/" to the hostname.
-    if (this.filename_.startsWith ("/"))
-      filename = this.filename_.substring (1);
-    
-    hostname = hostname + ":" + this.port_ + "/";
-    //    System.out.println (hostname + filename);
-    
-    // Allocate a buffer to hold the offset worth of data
-    byte tempBuf [] = new byte [this.offset_];
-    // Allocate a buffer to hold the actual data
-    byte dataBuf [] = new byte [this.length_];
-
-    try
-      {
-	// Create a URL to fetch the file
-	URL url = new URL (this.protocol_ + hostname + filename);
-	
-	// Get the input stream and pipe it to a DataInputStream
-	DataInputStream iStream = new DataInputStream (url.openStream ());
-
-	// Read the offset worth of bytes
-	iStream.readFully (tempBuf, 0, this.offset_);
-
-	// Read length worth of bytes
-	iStream.readFully (dataBuf, 0, this.length_);
-      }
-    catch (MalformedURLException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    // Cache number of bytes read
-    this.bytesRead_ = this.length_;
-    return new MessageBlock (new String (dataBuf, 0, this.length_));
-  }
-
-  public int close (long flags)
-  {
-    return 0;
-  }
-
-  public int bytesRead ()
-  {
-    return this.bytesRead_;
-  }
-
-  private String protocol_ = "http://";
-
-  int length_ = 0;
-  int offset_= 0;
-  String filename_ = null;
-  String hostname_ = "localhost";
-  int port_ = 80;
-
-  int bytesRead_ = 0;
-}
-
-
diff --git a/java/src/BlobWriter.java b/java/src/BlobWriter.java
deleted file mode 100644
index 09cc88a1f9e..00000000000
--- a/java/src/BlobWriter.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    BlobWriter.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.OS.*;
-
-// Writer **************************************************
-
-public class BlobWriter extends BlobHandler
-{
-  public BlobWriter (MessageBlock mb,
-		     int length, 
-		     int offset, 
-		     String filename)
-  {
-    super (length, offset, filename);
-    this.mb_ = mb;
-    this.returnCode_ = -1;
-
-  }
-
-  /*******************************
-   *  This constructor should be used when using the basic HTTP 1.1 
-   *  authentication scheme
-   *******************************/
-  public BlobWriter (MessageBlock mb,
-		     int length, 
-		     int offset, 
-		     String filename,
-		     String authentication)
-  {
-    super (length, offset, filename);
-    this.mb_ = mb;
-    this.returnCode_ = -1;
-    this.authentication_ = authentication;
-  }
-
-
-  public int open (Object obj)
-  {
-    if (this.sendRequest () != 0)
-      {
-	ACE.ERROR ("BlobWriter::open():sendRequest failed");
-	return -1;
-      }
-    else if (this.receiveReply () != 0)
-      {
-	ACE.ERROR ("BlobWriter::open():receiveReply failed");
-	return -1;
-      }
-    return 0;
-  }
-
-  public int close (long flags)
-  {
-    return 0;
-  }
-
-  public int bytesWritten ()
-  {
-    return this.bytesWritten_;;
-  }
-
-  protected int sendRequest ()
-  {
-    // Check for sanity -- check if we have any data to send.
-    if (this.offset_+ this.length_ > this.mb_.length ())
-      {
-	ACE.ERROR ("BlobWriter::sendRequest():Invalid offset/length");
-	return -1;
-      }
-
-    if (this.sendHeader () == -1)
-      {
-	ACE.ERROR ("BlobWriter::sendHeader failed.");
-	return -1;
-      }
-    else
-      if (this.sendData () == -1)
-      {
-	ACE.ERROR ("BlobWriter::sendData failed.");
-	return -1;
-      }
-    return 0;
-  }
-  
-  // Send the header
-  protected int sendHeader ()
-  {
-    String filename = this.filename_;
-    // Check if the filename begins with a "/" and if it doesn't, add it
-    if (!this.filename_.startsWith ("/"))
-      filename = "/" + this.filename_;
-
-    // Create the header, store the actual length in mesglen 
-    String mesg = this.requestPrefix_ + " " + filename + " " + this.requestSuffix_;
-
-    if (this.authentication_ != null) 
-      mesg += "Authorization: Basic " + JACE.Connection.HTTPHelper.EncodeBase64(this.authentication_) + '\n';
-
-    mesg += "Content-length: " + this.length_ + "\n";
-
-    try
-      {
-	if (this.peer ().send (mesg) < 0)
-	  {
-	    ACE.ERROR ("Error sending request");
-	    return -1;
-	  }
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-	return -1;
-      }
-    return 0;
-  }
-
-  // Send the data
-  protected int sendData ()
-  {
-    // Get the actual data to send
-    String data = this.mb_.base ().substring (this.offset_,
-					      this.offset_ + this.length_);
-
- 
-    try
-      {
-	//	System.out.println (data);
-	// Now send the data
-	if (this.peer ().send (data) != this.length_)
-	  {
-	    ACE.ERROR ("Error sending file");
-	    return -1;
-	  }
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-	return -1;
-      }
-    this.bytesWritten_ = this.length_;
-    return 0;
-  }
-
-
-  protected int receiveReply ()
-  {
-    System.out.println("Waiting for reply");
-
-    // Receive the reply from the server
-    StringBuffer reply = new StringBuffer (1024);
-    
-    try
-      {
-	if (this.peer ().recv (reply) < 0)
-	  {
-	    ACE.ERROR ("Error receiving reply from server");
-	    return -1;
-	  }
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    String s = reply.toString ();
-
-    int index = -1;
-    // Now parse the reply to see if it was a success or a failure
-    if ((index = s.indexOf (replyPrefix_)) == -1)
-      {
-	ACE.ERROR ("Error receiving reply from server");
-	return -1;
-      }
-
-    int codeIndex = index + replyPrefix_.length () + 1;
-
-    // Assume code is a 3 digit number
-    String codeString = s.substring (codeIndex, codeIndex + 3);
-
-    returnCode_ = (new Integer (codeString)).intValue ();
-    //    System.out.println (code);
-
-    if (returnCode_ >= 200 && returnCode_ < 300) {  // Check if everything went smoothly
-      System.out.println("We got the goodies!");
-      return 0;
-    } else 
-      return -1;
-  }
-
-  public int returnCode ()
-  {
-    return this.returnCode_;
-  }
-
-  protected String authentication_ = null;
-  protected String protocol_ = "http://";
-  protected int bytesWritten_ = 0;
-  protected MessageBlock mb_ = null;
-  protected String requestPrefix_ = "PUT";
-  protected String requestSuffix_ = "HTTP/1.0\n";
-  protected String replyPrefix_ = "HTTP/1.0";
-  protected int returnCode_;
-}
-
-
diff --git a/java/src/ClassNameGenerator.java b/java/src/ClassNameGenerator.java
deleted file mode 100644
index 0be175c5275..00000000000
--- a/java/src/ClassNameGenerator.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ClassNameGenerator.java
- * 
- * Given a locator string which may specify a class name, this generates as many possible locations for that
- * class file as possible.  This is needed when trying to infer a class name from a C++ DLL line in the
- * svc.conf file.  Implements the Enumeration interface.  A variety of questionable tactics are
- * used.
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-
-public class ClassNameGenerator implements Enumeration
-{
-  /**
-   * Constructor
-   * @param locator    Locator string -- approximate class name
-   */
-  public ClassNameGenerator (String locator)
-  {
-    this.locator_ = locator;
-    this.current_ = 0;
-    this.suggestions_ = new Vector();
-  
-    this.makeSuggestions();
-  }
-
-  /** 
-   * More unseen possibilities?
-   */
-  public boolean hasMoreElements() 
-  {
-    return this.current_ < this.suggestions_.size();
-  }
-
-  /**
-   * Get the next string
-   */
-  public Object nextElement()
-  {
-    return this.suggestions_.elementAt(this.current_++);
-  }
-
-  /**
-   * Take away things underscores, adjust capitalization.  This
-   * makes a name more like a Java class name
-   */
-  String makeJavaName(String oldName)
-  {
-    StringTokenizer tok = new StringTokenizer(oldName, "_");
-    String result = new String();
-
-    while (tok.hasMoreTokens()) {
-      String token = tok.nextToken();
-      
-      if (token.length() > 0) {
-
-	result += (Character.toUpperCase(token.charAt(0)) + token.substring(1));
-      }
-    }
-
-    return result;
-  }
-
-
-  /**
-   * Generate the suggestions
-   */
-  void makeSuggestions() 
-  {
-    String slash = new String(System.getProperty("file.separator"));
-
-    // Discard things like .shobj
-    if ((this.locator_.charAt(0) == '.') && (this.locator_.charAt(1) != '.')) {
-      int firstslash = this.locator_.indexOf(slash);
-      if (firstslash > 0) 
-	this.locator_ = this.locator_.substring(firstslash + 1);
-    }
-
-    // Find the last directory separator and the colon (inbetween
-    // these two is the last directory name, and by our convention
-    // this should be the class name)
-    int lastSlash = this.locator_.lastIndexOf(slash);
-    int colon = this.locator_.lastIndexOf(":");
-
-    ACE.DEBUG("Working with " + this.locator_ + " " + 
-		       lastSlash + " " + colon);
-
-    // Best bet first:
-    // Locator string is a path, and the last directory name is the class
-    // name
-    String lastDir = new String(this.locator_.substring(lastSlash + 1,
-                                                        colon));
-
-    // Save any other path info for later tries
-    String path = null;
-    if (lastSlash >= 0) 
-      path = this.locator_.substring(0, lastSlash + 1);
-  
-    int tryNum = 0;
-
-    if (lastDir.length() > 0) {
-
-      // Add this try
-      this.suggestions_.addElement(lastDir);
-
-      if (path != null)
-	this.suggestions_.addElement(path + lastDir);
-
-      // Second try:
-      // Same as the first, but changed to the Java convention for class names:
-      // Begins with a capital letter, capital letters for new words rather
-      // than underscores.
-
-      String try2 = this.makeJavaName(lastDir);
-
-      this.suggestions_.addElement(try2);
-      if (path != null)
-	this.suggestions_.addElement(path + try2);
-    }
-
-    // Third try:
-    // After the colon, the name of the method that created instances of the
-    // class in C++ may contain the class name.  Maybe in the format of
-    // make_classname, etc.
-
-    String lastWord = new String(this.locator_.substring(colon + 1));
-
-    if (lastWord.length() > 0) {
-
-      // Try the word after the colon, too
-      this.suggestions_.addElement(lastWord);
-      if (path != null)
-	this.suggestions_.addElement(path + lastWord);
-
-      String try2 = this.makeJavaName(lastWord);
-      
-      this.suggestions_.addElement(try2);
-      if (path != null)
-	this.suggestions_.addElement(path + try2);
-
-      int make = lastWord.indexOf("make");
-      if (make >= 0) {
-
-	make += 4;
-	String makeTry = new String(lastWord.substring(make));
-
-	if (makeTry.length() > 0) {
-
-	  this.suggestions_.addElement(makeTry);
-	  if (path != null)
-	    this.suggestions_.addElement(path + makeTry);
-
-	  String try3 = this.makeJavaName(makeTry);
-
-	  this.suggestions_.addElement(try3);
-	  if (path != null)
-	    this.suggestions_.addElement(path + try3);
-	}
-      }
-    }
-
-  }
-
-  String locator_;
-  Vector suggestions_;
-
-  int current_;
-};
-
-
diff --git a/java/src/ClassReader.java b/java/src/ClassReader.java
deleted file mode 100644
index c10c00b061c..00000000000
--- a/java/src/ClassReader.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ClassReader.java
- *
- *@author Everett Anderson
- *
- *@see JACE.ServiceConfigurator
- *@see JACE.ServiceConfigurator.ServiceLoader
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import JACE.OS.*;
-import java.io.*;
-import java.util.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *    Given a classfile name, this determines the qualified class name
- *    of what's inside (pacakage and class name together).  It is necessary
- *    when users want to dynamically load classes, but don't provide the
- *    full name in svc.conf.
- */
-
-public class ClassReader 
-{
-  // Types found in classfiles
-  public static final byte CONSTANT_Class = 7;
-  public static final byte CONSTANT_Fieldref = 9;
-  public static final byte CONSTANT_Methodref = 10;
-  public static final byte CONSTANT_InterfaceMethodref = 11;
-  public static final byte CONSTANT_String = 8;
-  public static final byte CONSTANT_Integer = 3;
-  public static final byte CONSTANT_Float = 4;
-  public static final byte CONSTANT_Long = 5;
-  public static final byte CONSTANT_Double = 6;
-  public static final byte CONSTANT_NameAndType = 12;
-  public static final byte CONSTANT_Utf8 = 1;
-
-  /** Returns a string that is the qualified class name of the
-   *  given file.  It returns null if there are any problems.
-   *
-   *@param   fileName   File to examine
-   *
-   *@return  String that's the qualified class name of the
-   *         given file (null on error)
-   */
-  public static String getClassName(String fileName)
-  {
-    try { 
-
-      // Open the .class file
-      FileInputStream fis = new FileInputStream(fileName); 
-
-      DataInputStream dis = new DataInputStream(fis);
-
-      // Skip magic number and version numbers
-      dis.skipBytes(8);
-
-      // Find out how many entries are in the constant pool table
-      int count = dis.readUnsignedShort();
-
-      // Hash table to hold the text entries (possibilities for
-      // the class name)
-      Hashtable ht = new Hashtable();
-
-      // Vector that holds the index of the class name for each
-      // class record (the vector is indexed by placement in the
-      // table)
-      Vector vt = new Vector(count);
-      Integer noValue = new Integer(-1);
-      int type;
-
-      // Scan through all the entries
-      for (int i = 1; i < count; i++) {
-
-	// Read what type of entry this is
-	type = dis.readUnsignedByte();
-
-	switch (type) {
-
-	  case CONSTANT_Class:
-	    // Save the index of the class name
-	    vt.addElement(new Integer(dis.readUnsignedShort()));
-	    break;
-	  case CONSTANT_Fieldref:
-	  case CONSTANT_Methodref:
-	  case CONSTANT_InterfaceMethodref:
- 	  case CONSTANT_Integer:
-	  case CONSTANT_Float:
-  	  case CONSTANT_NameAndType:
-	    // Skip the data
-	    vt.addElement(noValue);
-	    dis.skipBytes(4);
-	    break;
-	  case CONSTANT_String:
-	    // Skip the data
-	    vt.addElement(noValue);
-	    dis.skipBytes(2);
-	    break;
-	  case CONSTANT_Long:
-	  case CONSTANT_Double:
-	    // Skip the data
-	    vt.addElement(noValue);
-	    dis.skipBytes(8);
-	    // These take up two spots in the table
-	    i++;
-	    break;
-	  case CONSTANT_Utf8:
-	    vt.addElement(noValue);
-	    // Save the text in the hash table
-	    ht.put(new Integer(i), new String(dis.readUTF()));
-	    break;
- 	  default:
-	    ACE.DEBUG("Unknown type: " + type);
-	    break;
-
-	}
-
-      }
-
-      // Skip the access flags
-      dis.skipBytes(2);
-
-      // Get index in table of this class
-      int classIdx = dis.readUnsignedShort();
-
-      // Get index in the table of the name of this class
-      Integer idx = (Integer)vt.elementAt(classIdx - 1);
-
-      // Put the result in period separated notation 
-      String result = new String(((String)ht.get(idx)).replace('/', '.'));
-
-      return result;
-
-    } catch (IOException e) {
-      ACE.ERROR("" + e);
-      return null;
-    }
-  }
-}
diff --git a/java/src/Condition.java b/java/src/Condition.java
deleted file mode 100644
index d0b5e10a84e..00000000000
--- a/java/src/Condition.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Condition.java
- *
- *@author Irfan Pyarali
- *
- *************************************************/
-package JACE.Concurrency;
-
-import JACE.ASX.TimeoutException;
-import JACE.ASX.TimeValue;
-
-/**
- * <hr>
- * <h2>TITLE</h2>
- *<blockquote>
- *     Abstraction for <em>traditional</em> 
- *     condition variable
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     This condition variable allows the use of one 
- *     mutex between multiple conditions. 
- *     This implementation is based on the C++ version of ACE.
- *</blockquote>
- */
-public class Condition
-{
-  /** 
-   * Default constructor
-   *@param Mutex for synchronization
-   */
-  public Condition (Mutex mutex)
-  {
-    mutex_ = mutex;
-  }
-  
-  /**
-   * Wait for condition to become signaled. 
-   *@exception InterruptedException exception during wait
-   */
-  public void Wait () 
-    throws InterruptedException
-  {
-    waiters_++;
-
-    try
-      {
-	mutex_.release();
-	semaphore_.acquire ();
-	mutex_.acquire ();
-      }
-    finally 
-      {
-	waiters_--;
-      }
-  }
-  
-  /**
-   * TimedWait for condition to become signaled.  Note that the
-   * given TimeValue is an absolute time, not a relative time.
-   *
-   *@param tv Absolute time to wait until before timing out
-   *@exception TimeoutException wait timed out exception
-   *@exception InterruptedException exception during wait
-   */
-  public void Wait (TimeValue tv) 
-      throws TimeoutException, InterruptedException
-  {
-    waiters_++;
-
-    try
-      {
-	mutex_.release();
-
-	semaphore_.acquire (tv);
-
-	mutex_.acquire (tv);
-      }
-    finally 
-      {
-	waiters_--;
-      }
-  }
-  
-  /**
-   * Signal condition. Wake one waiter (if any).
-   */
-  public void signal ()
-  {
-    if (waiters_ > 0)
-      semaphore_.release ();
-  }
-
-  /**
-   * Signal condition. Wake up all waiters (if any).
-   */
-  public void broadcast ()
-  {
-    for (int i = waiters_; i > 0; i--)
-      semaphore_.release ();
-  }
-
-  /** 
-   * Accessor to lock
-   *@return Mutex
-   */
-  public Mutex mutex ()
-  {
-    return mutex_;
-  }
-
-  private int waiters_;  
-  private Semaphore semaphore_ = new Semaphore (0);
-  private Mutex mutex_;
-
-}
diff --git a/java/src/Connector.java b/java/src/Connector.java
deleted file mode 100644
index 7393ea486e0..00000000000
--- a/java/src/Connector.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    Connector.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-import JACE.ServiceConfigurator.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- * Abstract factory for connecting a
- * (<a href="JACE.Connection.SvcHandler.html"><tt>SvcHandler</tt></a>),
- * to an application.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- * Implements the basic strategy for actively establishing connections
- * with applications.  The <tt>Connector</tt> establishes the connection,
- * passing it on to a <tt>SvcHandler</tt> instance, and handing over
- * control to that instance.
- *<p>
- * TCP is the transport mechanism used, via
- * <a href="JACE.SOCK_SAP.SOCKConnector.html#_top_"><tt>SOCKConnector</tt></a>.
- *</blockquote>
- *
- *<h2>NOTES</h2>
- *<blockquote>
- * This class, as currently implemented, does not work like its C++ counterpart.
- * Future versions are expected to rectify this discrepancy.
- *</blockquote>
- *
- *@see SOCKConnector
- *@see SvcHandler
- */
-public class Connector extends ServiceObject
-{
-  /**
-   * Create a Connector. Do nothing constructor. Allows user to
-   * call <a href="#open(java.lang.String)">open</a>() later.
-   */
-  public Connector ()
-    {
-    }
-
-  /**
-   * Create a Connector passing in server hostname and port
-   * number, effectively shorthand for calling
-   * <a href="#open(java.lang.String)">open</a>().
-   *@param hostname server hostname
-   *@param port server port number
-   */
-  public Connector (String hostname, int port)
-    {
-      this.open (hostname, port);
-    }
-
-  /**
-   * Initialize the Connector passing in server hostname and port
-   * number.  Note that no connection attempt is made.
-   *@param hostname server hostname
-   *@param port server port number
-   */
-  public void open (String hostname, int port)
-    {
-      this.hostname_ = hostname;
-      this.port_ = port;
-    }
-
-  /**
-   * Connect to the server.
-   *@param sh Svc Handler to use to handle the connection
-   *@exception UnknownHostException Bad host
-   *@exception SocketException Socket error
-   *@exception InstantiationException Couldn't create new SOCKConnector
-   *@exception IllegalAccessException No strategy available
-   *@exception IOException Socket error
-   */
-  public void connect (SvcHandler sh) throws UnknownHostException, 
-      SocketException,
-      InstantiationException, 
-      IllegalAccessException, 
-      IOException
-  {
-    // Make a connection using the appropriate Connection_Strategy
-    this.connectSvcHandler (sh);
-
-    // Activate the Svc_Handler using the appropriate Activation_Strategy
-    this.activateSvcHandler (sh);
-  }
-
-  /**
-   * Bridge method for making a new connection. The default behavior
-   * creates a new SOCKConnector and then calls setHandle() on the
-   * <SvcHandler> that was passed in. Subclasses can override this
-   * strategy, if needed.
-   *@param sh Svc Handler to use to handle the connection
-   *@return 0
-   *@exception SocketException Socket error
-   *@exception IOException Socket error
-   */
-  protected int connectSvcHandler (SvcHandler sh) throws
-  SocketException, IOException
-  {
-    // Create a new stream
-    SOCKStream sockStream = new SOCKStream ();
-
-    // Create a SOCK_Connector (note the constructor does the connect for us)
-    this.sockConnector_ = new SOCKConnector (sockStream,
-					       this.hostname_,
-					       this.port_);
-    ACE.DEBUG ("Connected to " +
-	       sockStream.socket ().getInetAddress ());
-    
-    // Set the streams for the new handler
-    sh.setHandle (sockStream);
-    return 0;
-  }
-  
-  /**
-   * Bridge method for activating a <SvcHandler>.  The default
-   * behavior of this method is to activate the <SvcHandler> by
-   * calling its open() method (which allows the SVC_HANDLER to define
-   * its own concurrency strategy).  However, subclasses can override
-   * this strategy to do more sophisticated concurrency activations.
-   *@param sh Svc Handler to activate
-   *@return 0
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-    {
-      sh.open (null);
-      return 0;
-    }
-
-  
-  // Port server is listening on
-  private int port_;
-
-  // Server hostname
-  private String hostname_;
-
-  // Our connection factory
-  private SOCKConnector sockConnector_;
-}
diff --git a/java/src/CreationStrategy.java b/java/src/CreationStrategy.java
deleted file mode 100644
index f929ef86204..00000000000
--- a/java/src/CreationStrategy.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    CreationStrategy.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- * Defines the interface for specifying a creation strategy for a
- * <a href="ACE.Connection.SvcHandler.html#_top_"><tt>SvcHandler</tt></a> to the
- * <a href="ACE.Connection.StrategyAcceptor.html#_top_"><tt>StrategyAcceptor</tt></a>.
- *</blockquote>
- *
- * <p><b>DESCRIPTION</b><br>
- *<blockquote>
- *     The default behavior is to make a new SvcHandler.  However,
- *     subclasses can override this strategy to perform SvcHandler
- *     creation in any way that they like (such as creating subclass
- *     instances of SvcHandler, using a singleton, dynamically
- *     linking the handler, etc.).
- *</blockquote>
- *
- *@see SvcHandler
- *@see StrategyAcceptor
- *@see AcceptStrategy
- *@see ActivateStrategy
- */
-public class CreationStrategy
-{
-  /**
-   * Create an instance of Creation Strategy.
-   *@param handlerFactory Svc Handler factory that is used to create
-   * an instance of a Svc Handler
-   */
-  public CreationStrategy (Class handlerFactory)
-  {
-    this.handlerFactory_ = handlerFactory;
-  }
-
-  /**
-   * Create a new SvcHandler. Note that subclasses should override
-   * this method to provide a new creation strategy.
-   *@return reference to a new instance of the SvcHandler (or subclass)
-   *@exception InstantiationException Unable to instantiate.
-   *@exception IllegalAccessException No handler factory available.
-   */
-  public SvcHandler makeSvcHandler () throws InstantiationException, 
-    IllegalAccessException
-    {
-      // Create a new Svc_Handler
-      return (SvcHandler) handlerFactory_.newInstance ();
-    }
-
-  private Class handlerFactory_;
-}
diff --git a/java/src/EventHandler.java b/java/src/EventHandler.java
deleted file mode 100644
index 30f5bb1dba4..00000000000
--- a/java/src/EventHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Reactor
- *
- * = FILENAME
- *    EventHandler.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Reactor;
-
-import JACE.ASX.TimeValue;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Provides an abstract interface for handling timer events.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     Classes implementing this interface handle a timer's
- *     expiration.
- *</blockquote>
- *
- * <h2>NOTES</h2>
- *<blockquote>
- * Users of C++ ACE will notice that this defines a substantially
- * smaller interface than the C++ counterpart.  Signal events are
- * absent due to the complete absence of this feature from Java itself.
- * Moreover, at this point
- * there is still some question regarding whether or not the I/O
- * portion will make any sense or fit into the Java model for I/O.
- *</blockquote>
- *
- *@see TimerQueue
- *@see JACE.Reactor
- */
-public interface EventHandler
-{
-  /** 
-   * Called when timer expires.
-   *@param tv Time Value at which the event occured 
-   *@param obj An arbitrary object that was passed to the Timer Queue
-   * (Asynchronous Completion Token)
-   */
-  public int handleTimeout (TimeValue tv, Object obj);
-}
-
-// Note that more methods will be added as needed
diff --git a/java/src/GetOpt.java b/java/src/GetOpt.java
deleted file mode 100644
index 2bf5d27c406..00000000000
--- a/java/src/GetOpt.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Misc
- *
- * = FILENAME
- *    GetOpt.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Misc;
-
-import java.io.*;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Iterator for parsing command-line arguments.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     This version of `get_opt' appears to the caller like standard
- *     Unix `get_opt' but it behaves differently for the user, since
- *     it allows the user to intersperse the options with the other
- *     arguments.
- * 
- * <p> As `get_opt' works, it permutes the elements of `argv' so that,
- *     when it is done, all the options precede everything else. Thus
- *     all application programs are extended to handle flexible argument
- *     order.
- *</blockquote>
- *
- */
-public class GetOpt
-{
-  /** 
-   * Constructor
-   *@param args command line arguments
-   *@param optstring string containing the legitimate option
-   * characters. A colon in optstring means that the previous character
-   * is an option that wants an argument which is then taken from the
-   * rest of the current args-element. Here is an example of what
-   * optstring might look like: "c:dP:p".
-   */
-  public GetOpt (String[] args, String optstring)
-  {
-    // Cache the arguments
-    this.args_ = args;
-    this.hasArg_ = false;
-
-    // Build the arg hashtable
-    this.buildArgTable (optstring);
-  }
-  
-  /** 
-   * Scan elements specified in optstring for next option flag.
-   *@return The character corresponding to the next flag.
-   */
-  public int next ()
-  {
-    if (this.args_ == null)
-      return -1;
-
-    if (this.index_ < this.args_.length) 
-      {
-	String arg = this.args_[this.index_++];
-
-	// Make sure flag starts with "-"
-	if (!arg.startsWith ("-"))
-	  return -1;
-	
-	// Check if there is more than one character specified as flag
-	if (arg.length () > 2)
-	  return -1;
-	
-	// So far so good
-	// Check if the flag is in the arg_table and if it is get the
-	// associated binding.
-	Character c = (Character) this.argTable_.get (new Character (arg.charAt (1)));
-	if (c == null)
-	  return -1;
-
-	if (c.charValue () == '#')
-	  {
-	    this.hasArg_ = false;
-	    return arg.charAt (1);
-	  }
-	else if (c.charValue () == ':')
-	  {
-	    this.hasArg_ = true;
-	    return arg.charAt (1);
-	  }
-	else   // This should not happen
-	  return -1; 
-      }
-    return -1;
-  }
-  
-  /**
-   * Get the argument (if any) associated with the flag.
-   *@return the argument associated with the flag.
-   */
-  public String optarg ()
-  {
-    if (this.hasArg_)
-      return this.args_[this.index_++];
-    else
-      return null;
-  }
-  
-  // Build the argument table
-  private void buildArgTable (String s)
-  {
-    this.argTable_ = new Hashtable ();
-    StringTokenizer tokens = new StringTokenizer (s, ":");
-    while (tokens.hasMoreTokens ())
-      {
-	// Get the next token
-	String t = tokens.nextToken ();
-
-	// First add all flags except the one with ":" after it
-	// Note "#" is an arbitrary character we use to distinguish
-	// the two cases
-	for (int i = 0; i < t.length () - 1; i++)
-	  this.argTable_.put (new Character (t.charAt (i)),
-			       new Character ('#'));
-
-	// Now Add the flag just before ":" to the arg_table
-	this.argTable_.put (new Character (t.charAt (t.length () - 1)),
-			     new Character (':'));
-      }
-  }
-  
-  private String [] args_;
-  // Copy of the args passed in
-  
-  private boolean hasArg_;
-  // Indicator that the flag has an argument following it
-
-  private int index_;
-  // Index into the array of arguments
-
-  private Hashtable argTable_;
-  // Table of flags that take arguments after them
-}
diff --git a/java/src/HTTPHelper.java b/java/src/HTTPHelper.java
deleted file mode 100644
index d946913693c..00000000000
--- a/java/src/HTTPHelper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package JACE.Connection;
-
-import JACE.OS.*;
-// Collection of various methods that have to do with HTTP
-
-public class HTTPHelper
-{
-  // Encoding and decoding yadda
-  public static String Alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-  // Basic encoding used in the HTTP 1.1 RFC.  This doesn't
-  // put the string "Basic " at the beginning of the return
-  // string.  Adapted from James' JAWS HTTP_Helpers code.
-  // Returns null on error.
-  public static String EncodeBase64 (String secret)
-    {
-      StringBuffer output = new StringBuffer();
-
-      // Index of the input string
-      int inidx = 0;
-
-      // character value
-      int c;
-
-      int char_count = 0;
-      int bits = 0;
-      boolean error = false;
-
-      while (inidx < secret.length())
-	{
-	  c = secret.charAt(inidx++);
-
-	  // This will mess up internationalization.  I wonder if it is really
-	  // necessary for HTTP?
-	  if (c > 255)
-	    {
-	      ACE.DEBUG ("encountered char > 255 (decimal %d): " + c);
-	      error = true;
-	      break;
-	    }
-
-	  bits += c;
-	  char_count++;
-
-          if (char_count == 3)
-	    {
-	      output.append(HTTPHelper.Alphabet.charAt(bits >> 18));
-	      output.append(HTTPHelper.Alphabet.charAt((bits >> 12) & 0x3f));
-	      output.append(HTTPHelper.Alphabet.charAt((bits >> 6) & 0x3f));
-	      output.append(HTTPHelper.Alphabet.charAt(bits & 0x3f));
-
-	      bits = 0;
-	      char_count = 0;
-	    }
-	  else
-	    bits <<= 8;
-	}
-
-      if (!error)
-	{
-	  if (char_count != 0)
-	    {
-	      bits <<= 16 - (8 * char_count);
-	      output.append(HTTPHelper.Alphabet.charAt(bits >> 18));
-	      output.append(HTTPHelper.Alphabet.charAt((bits >> 12) & 0x3f));
-	      
-	      if (char_count == 1)
-		{
-		  output.append("==");
-		}
-	      else
-		{
-		  output.append(HTTPHelper.Alphabet.charAt((bits >> 6) & 0x3f));
-		  output.append('=');
-		}
-	    }
-
-	  return output.toString();
-	}
-
-      // Returns null on error
-      return null;
-    }
-};
diff --git a/java/src/INETAddr.java b/java/src/INETAddr.java
deleted file mode 100644
index 8d16c46c6b3..00000000000
--- a/java/src/INETAddr.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    INETAddr.java
- *
- *@author Chris Cleeland
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Defines an endpoint of a connection, encapsulating host and port.
- * This is only a part-way implementation of C++ ACE's ACE_INET_Addr.
- *
- * <p><b>LIMITATIONS</b><br>
- *     Currently the class is very limited in its capabilities; it will
- * be expanded in future revisions of ACE.
- */
-public class INETAddr // extends Addr
-{
-  private InetAddress addr_;
-  private int port_ = 0;
-  /**
-   */
-  public INETAddr ()
-    {
-      // Do nothing constructor
-    }
-
-  /**
-   * Create an INETAddr from a port/hostname
-   *@param port port number to connect with server at
-   *@param hostname hostname of the server
-   */
-  public INETAddr (int port, String hostname) throws UnknownHostException
-  {
-    super();
-    port_ = port;
-    addr_ = InetAddress.getByName(hostname);
-				// Should really use getAllByName(),
-				// but I don't think we do that in
-				// C++ ACE, even.
-  }
-
-  /**
-   * Create an INETAddr from an address.
-   * @param address an address in the form "ip-number:port-number", <em>e.g.</em> <pre>tango.cs.wustl.edu:1234</pre> or <pre>128.252.166.57:1234</pre>; if no ':' is present address is assumed to be <b>INADDR_ANY</b> and address contains only the port number
-   * @throws UnknownHostException
-   */
-  public INETAddr (String address) throws UnknownHostException
-  {
-    int colon = address.indexOf(':');
-    if (colon != 0)
-      {
-	addr_ = InetAddress.getByName(address.substring(0, colon));
-	address = address.substring(colon+1);
-      }
-
-    port_ = Integer.parseInt(address);
-  }
-
-  /**
-   * Return the name of the host.
-   */
-  public String getHostName()
-  {
-    return addr_.getHostName();
-  }
-
-  /**
-   * Return the dotted Internet address.
-   */
-  public String getHostAddr()
-  {
-    return addr_.toString();
-  }
-
-  /**
-   * Return the port number.
-   */
-  public int getPortNumber()
-  {
-    return port_;
-  }
-
-  public String toString()
-  {
-    return getHostAddr() + Integer.toString(port_);
-  }
-}
diff --git a/java/src/IOCntlCmds.java b/java/src/IOCntlCmds.java
deleted file mode 100644
index 2469428a3a6..00000000000
--- a/java/src/IOCntlCmds.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TaskFlags.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-public abstract class IOCntlCmds
-{
-  /**  Set the low water mark. */
-  public static final int SET_LWM    = 1;
-
-  /** Get the low water mark. */
-  public static final int GET_LWM    = 2; 
-
-  /**  Set the high water mark. */
-  public static final int SET_HWM    = 3;
-
-  /** Get the high water mark. */
-  public static final int GET_HWM    = 4;
-
-  /** Link modules */
-  public static final int MOD_LINK    = 5;
-
-  /** Unlink modules */
-  public static final int MOD_UNLINK    = 6;
-
-}
diff --git a/java/src/IOCntlMsg.java b/java/src/IOCntlMsg.java
deleted file mode 100644
index 8b69310c4f7..00000000000
--- a/java/src/IOCntlMsg.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    IOCntlMsg.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *      Data format for IOCTL messages 
- *</blockquote>
- */
-public class IOCntlMsg
-{
-
-  // = Initialization method.
-
-  /*
-   * Initialize the control message.
-   *@param c IOCntlCmd for the control message. Note that this should
-   * be of type IOCntlCmds
-   */
-  public IOCntlMsg (int c) 
-  { 
-    this.cmd_ = c; 
-  }
-
-  // = Get/set methods
-
-  /*
-   * Get the command.
-   *@return the command.
-   */
-  public int cmd () 
-  { 
-    return this.cmd_; 
-  }
-
-  /*
-   * Set the command.
-   *@param c the command.
-   */
-  public void cmd (int c) 
-  { 
-    this.cmd_ = c; 
-  }
-
-  /*
-   * Get the count.
-   *@return the count.
-   */
-  public int count () 
-  { 
-    return this.count_; 
-  }
-
-  /*
-   * Set the count.
-   *@param c the count.
-   */
-  public void count (int c) 
-  { 
-    this.count_ = c; 
-  }
-
-  /*
-   * Get the error.
-   *@return the error.
-   */
-  public int error () 
-  { 
-    return this.error_; 
-  }
-
-  /*
-   * Set the error.
-   *@param e the error.
-   */
-  public void error (int e) 
-  { 
-    this.error_ = e; 
-  }
-
-  /*
-   * Get the return value.
-   *@return the return value.
-   */
-  public int rval () 
-  { 
-    return this.rval_; 
-  }
-
-  /*
-   * Set the return value.
-   *@param r the return value.
-   */
-  public void rval (int r) 
-  { 
-    this.rval_ = r; 
-  }
-
-  public String toString ()
-  {
-    return (new Integer (this.cmd_)).toString ();
-  }
-
-  private int cmd_;
-  // Command.
-
-   private int count_;
-   // Count.
-
-   private int error_;
-   // Error.
-
-   private int rval_;
-   // Return value
-}
diff --git a/java/src/MessageBlock.java b/java/src/MessageBlock.java
deleted file mode 100644
index 1741f9bef80..00000000000
--- a/java/src/MessageBlock.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    MessageBlock.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Object used to store messages in the ASX framework.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     <tt>MessageBlock</tt> is modeled after the message data structures
- *     used in System V STREAMS. A <tt>MessageBlock</tt> is composed of
- *     one or more <tt>MessageBlock</tt>s that are linked together by <em>PREV</em>
- *     and <em>NEXT</em> pointers. In addition, a <tt>MessageBlock</tt> may also be
- *     linked to a chain of other <tt>MessageBlock</tt>s. This structure
- *     enables efficient manipulation of arbitrarily-large messages
- *     <em>without</em> incurring memory copying overhead.
- *</blockquote>
- *
- *@see MessageQueue
- */
-public class MessageBlock
-{
-  /**
-   * Create an empty Message Block
-   */
-  public MessageBlock ()
-    {
-      this (0);
-    }
-
-  /**
-   * Create an empty Message Block.
-   * Note that this assumes that type of MessageBlock is MB_DATA.
-   *@param size size of the Message Block to create.
-   */
-  public MessageBlock (int size)
-    {
-      // Note the explicit cast toString() is needed. For some strange
-      // reason, it fails otherwise if size == 0.
-      this ((new StringBuffer (size)).toString ());
-    }
-
-  /**
-   * Create a Message Block. Note that this assumes that type of
-   * MessageBlock is MB_DATA. 
-   *@param data initial data to create a Message Block with.
-   */
-  public MessageBlock (String data)
-    {
-      this (MessageType.MB_DATA,
-	    null,
-	    data);
-    }
-
-  /**
-   * Create a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param data initial data to create Message Block with
-   */
-  public MessageBlock (int type,
-		       MessageBlock cont,
-		       String data)
-    {
-      this.flags_ = 0;
-      this.priority_ = 0;
-      this.next_ = null;
-      this.prev_ = null;
-
-      this.init (type, cont, data);
-    }
-
-  /**
-   * Create a Message Block. Note that this assumes that type of
-   * MessageBlock is MB_OBJECT.
-   *@param obj initial object to create a Message Block with.
-   */
-  public MessageBlock (Object obj)
-  {
-    this (MessageType.MB_OBJECT,
-	  null,
-	  obj);
-  }
-
-  /**
-   * Create a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param obj initial object to create Message Block with
-   */
-  public MessageBlock (int type,
-		       MessageBlock cont,
-		       Object obj)
-  {
-    this.init (type, cont, obj);
-  }
-
-  /* Initialize the Message Block
-   *@param data data to initialize Message Block with
-   */
-  public void init (String data)
-    {
-      this.base_ = new StringBuffer (data);
-    }
-
-  /**
-   * Initialize a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param data data to initialize Message Block with
-   */
-  public void init (int msgType,
-		   MessageBlock msgCont,
-		   String data)
-    {
-      if (data.length () == 0)
-	this.base_ = new StringBuffer (0);
-      else
-	this.base_ = new StringBuffer (data);
-      this.type_ = msgType;
-      this.cont_ = msgCont;
-    }
-
-  /**
-   * Initialize a Message Block. Note that this assumes that type of
-   * MessageBlock is MB_OBJECT.
-   *@param obj initial object to initialize a Message Block with.
-   */
-  public void init (Object obj)
-    {
-      this.init (MessageType.MB_OBJECT, null, obj);
-    }
-
-  /**
-   * Initialize a Message Block.
-   *@param type type of the Message Block (must be one of those
-   * specified in class Message Type)
-   *@param cont next block of data 
-   *@param obj object to initialize Message Block with
-   */
-  public void init (int msgType,
-		   MessageBlock msgCont,
-		   Object obj)
-    {
-      this.obj_ = obj;
-      this.type_ = msgType;
-      this.cont_ = msgCont;
-      this.flags_ = 0;
-      this.priority_ = 0;
-      this.next_ = null;
-      this.prev_ = null;
-    }
-
-  /**
-   * Set message flags. Note that the flags will be set on top of
-   * already set flags.
-   *@param moreFlags flags to set for the Message Block.
-   */
-  public long setFlags (long moreFlags)
-    {
-      // Later we might mask more_flags so that user can't change
-      // internal ones: more_flags &= ~(USER_FLAGS -1).
-      this.flags_ = ACE.SET_BITS (this.flags_, moreFlags);
-      return this.flags_;
-    }
-
-  /**
-   * Unset message flags.
-   *@param lessFlags flags to unset for the Message Block.
-   */
-  public long clrFlags (long lessFlags)
-    {
-      // Later we might mask more_flags so that user can't change
-      // internal ones: less_flags &= ~(USER_FLAGS -1).
-      this.flags_ = ACE.CLR_BITS (this.flags_, lessFlags);
-      return this.flags_;
-    }
-
-  /**
-   * Get the message flags.
-   *@return Message flags
-   */
-  public long flags ()
-    {
-      return this.flags_;
-    }
-
-  /**
-   * Get the type of the message.
-   *@return message type
-   */
-  public int msgType ()
-    {
-      return this.type_;
-    }
-
-  /**
-   * Set the type of the message.
-   *@param t type of the message
-   */
-  public void msgType (int t)
-    {
-      this.type_ = t;
-    }
-
-  /**
-   * Get the class of the message. Note there are two classes,
-   * <normal> messages and <high-priority> messages.
-   *@return message class
-   */
-  public int msgClass ()
-    {
-      return this.msgType () >= MessageType.MB_PRIORITY
-	? MessageType.MB_PRIORITY : MessageType.MB_NORMAL;
-    }
-
-  /**
-   * Find out if the message is a data message.
-   *@return true if message is a data message, false otherwise
-   */
-  public boolean isDataMsg ()
-    {
-      int mt = this.msgType ();
-      return mt == MessageType.MB_DATA
-	|| mt == MessageType.MB_PROTO
-	  || mt == MessageType.MB_PCPROTO;
-    }
-
-  /**
-   * Find out if the message is an object message.
-   *@return true if message is an object message, false otherwise
-   */
-  public boolean isObjMsg ()
-    {
-      int mt = this.msgType ();
-      return mt == MessageType.MB_OBJECT
-	|| mt == MessageType.MB_PROTO
-	  || mt == MessageType.MB_PCPROTO;
-    }
-
-  /**
-   * Get the priority of the message.
-   *@return message priority
-   */
-  public long msgPriority ()
-    {
-      return this.priority_;
-    }
-
-  /**
-   * Set the priority of the message.
-   *@param pri priority of the message
-   */
-  public void msgPriority (long pri)
-    {
-      this.priority_ = pri;
-    }
-
-  /**
-   * Get message data. This assumes that msgType is MB_DATA.
-   *@return message data
-   */
-  public String base () 
-    {
-      // Create a String object to return
-      char temp[] = new char [this.base_.length ()];
-      this.base_.getChars (0, this.base_.length (), temp, 0);
-      return new String (temp);
-    }
-
-  /**
-   * Set the message data. This assumes that msgType is MB_DATA.
-   *@param data message data
-   *@param msgFlags message flags
-   */
-  public void base (String data,
-		    long msgFlags)
-    {
-      this.base_ = new StringBuffer (data);
-      this.flags_ = msgFlags;
-    }
-
-  /**
-   * Get message object. This assumes that msgType is MB_OBJECT.
-   *@return message object
-   */
-  public Object obj () 
-    {
-      return this.obj_;
-    }
-
-  /**
-   * Set the message object. This assumes that msgType is MB_OBJECT.
-   *@param object message object
-   *@param msgFlags message flags
-   */
-  public void obj (Object obj,
-		   long msgFlags)
-    {
-      this.obj_ = obj;
-      this.flags_ = msgFlags;
-    }
-
-  // = The following four methods only make sense if the Message_Block
-  // is of type MB_DATA and not MB_OBJECT.
-
-  /**
-   * Get length of the message. This method only makes sense if the
-   * MessageBlock is of type MB_DATA and not MB_OBJECT.
-   *@return length of the message.
-   */
-  public int length ()
-    {
-      return this.base_.length ();
-    }
-
-  /**
-   * Set the length of the message. This method only makes sense if the
-   * MessageBlock is of type MB_DATA and not MB_OBJECT.
-   *@param n message length
-   */
-  public void length (int n)
-    {
-      this.base_.setLength (n);
-    }
-
-  /**
-   * Get size of the allocated buffer for the message. This method
-   * only makes sense if the MessageBlock is of type MB_DATA and not
-   * MB_OBJECT. 
-   *@return size of the message buffer
-   */
-  public int size ()
-    {
-      return this.base_.capacity ();
-    }
-
-  /**
-   * Set the total size of the buffer. This method will grow the
-   * buffer if need be. Also, this method only makes sense if the
-   * MessageBlock is of type MB_DATA and not MB_OBJECT.
-   *@param n size of message buffer
-   */
-  public void size (int n)
-    {
-      this.base_.ensureCapacity (n);
-    }
-
-
-  /**
-   * Get the continuation field. The coninuation field is used to
-   * chain together composite messages.
-   *@return the continuation field
-   */
-  public MessageBlock cont ()
-    {
-      return this.cont_;
-    }
-
-  /**
-   * Set the continuation field. The coninuation field is used to
-   * chain together composite messages.
-   *@param msgCont continuation field
-   */
-  void cont (MessageBlock msgCont)
-    {
-      this.cont_ = msgCont;
-    }
-
-  /**
-   * Get link to next message. The next message points to the
-   * <MessageBlock> directly ahead in the MessageQueue.
-   *@return next message block
-   */
-  MessageBlock next ()
-    {
-      return this.next_;
-    }
-
-  /**
-   * Set link to next message. The next message points to the
-   * <MessageBlock> directly ahead in the MessageQueue.
-   *@param msgBlock next message block
-   */
-  void next (MessageBlock msgBlock)
-    {
-      this.next_ = msgBlock;
-    }
-
-  /**
-   * Get link to previous message. The previous message points to the
-   * <MessageBlock> directly before in the MessageQueue.
-   *@return previous message block
-   */
-  MessageBlock prev ()
-    {
-      return this.prev_;
-    }
-
-  /**
-   * Set link to previous message. The previous message points to the
-   * <MessageBlock> directly before in the MessageQueue.
-   *@param msgBlock previous message block
-   */
-  void prev (MessageBlock msgBlock)
-    {
-      this.prev_ = msgBlock;
-    }
-
-  private int type_;		
-  // Type of message.
-
-  private long flags_;
-  // Misc flags.
-
-  private long priority_;
-  // Priority of message.
-
-  private StringBuffer base_;
-  // String data of message block (initialized to null).
-
-  private Object obj_;
-  // Object data of message block (initialized to null).
-
-  private MessageBlock cont_;
-  // Next message block in the chain.
-
-  private MessageBlock next_;	
-  // Next message in the list.
-
-  private MessageBlock prev_;	
-  // Previous message in the list.
-
-}
-
diff --git a/java/src/MessageQueue.java b/java/src/MessageQueue.java
deleted file mode 100644
index 8c8dab1a0fe..00000000000
--- a/java/src/MessageQueue.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    MessageQueue.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import java.util.Date;
-import JACE.OS.*;
-import JACE.Reactor.*;
-
-class NotFullCondition extends TimedWait
-{
-  public NotFullCondition (MessageQueue mq)
-  { 
-    super (mq);
-    this.mq_ = mq;
-  }
-
-  public boolean condition () {
-    // Delegate to the appropriate conditional
-    // check on the MessageQueue.
-    return !this.mq_.isFull ();
-  }
-  private MessageQueue mq_;
-}
-
-class NotEmptyCondition extends TimedWait
-{
-  public NotEmptyCondition (MessageQueue mq)
-  { 
-    super (mq);
-    this.mq_ = mq;
-  }
-
-  public boolean condition () {
-    // Delegate to the appropriate conditional
-    // check on the MessageQueue.
-    return !this.mq_.isEmpty ();
-  }
-  private MessageQueue mq_;
-}
-
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     A thread-safe message queueing facility, modeled after the
- *     queueing facilities in System V StreamS.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *</blockquote>
- *     <tt>MessageQueue</tt> is the central queueing facility for messages
- *     in the ASX framework. All operations are thread-safe, as it is intended
- * to be used for inter-thread communication (<em>e.g.</em>, a producer and
- * consumer thread joined by a <tt>MessageQueue</tt>).  The queue
- * consiste of <tt>MessageBlock</tt>s.
- *</blockquote>
- *
- *@see MessageBlock
- *@see TimeValue
- */
-public class MessageQueue
-{
-  /**
-   * Default constructor
-   */
-  public MessageQueue ()
-  {
-    this (DEFAULT_HWM, DEFAULT_LWM);
-  }
-
-  /**
-   * Create a Message Queue with high and low water marks.
-   *@param hwm High water mark (max number of bytes allowed in the
-   * queue) 
-   *@param lwm Low water mark (min number of bytes in the queue)
-   */
-  public MessageQueue (int hwm, int lwm)
-  {
-    if (this.open (hwm, lwm) == -1)
-      ACE.ERROR ("open");
-  }
-
-  /**
-   * Initialize a Message Queue with high and low water marks.
-   *@param hwm High water mark (max number of bytes allowed in the
-   * queue) 
-   *@param lwm Low water mark (min number of bytes in the queue)
-   */
-  public synchronized int open (int hwm, int lwm)
-  {
-    this.highWaterMark_ = hwm;
-    this.lowWaterMark_ = lwm;
-    this.deactivated_ = false;
-    this.currentBytes_	= 0;
-    this.currentCount_	= 0;
-    this.tail_ = null;
-    this.head_ = null;
-    return 0;
-  }
-
-  // ************ Note! ***********
-  // = For enqueue, enqueueHead, enqueueTail, and dequeueHead if
-  // timeout is specified, the caller will wait until the *absolute time*
-  // tv.  Calls will return, however, when queue is closed,
-  // deactivated, or if it is past the time tv
-
-  /**
-   * Enqueue a <MessageBlock> into the <MessageQueue> in accordance
-   * with its <msgPriority> (0 is lowest priority). Note that the
-   * call will block (unless the queue has been deactivated).
-   *
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   *@param newItem item to enqueue onto the Message Queue
-   *@return -1 on failure, else the number of items still on the queue.
-   */
-  public synchronized int enqueue (MessageBlock newItem) throws InterruptedException
-  {
-    return this.enqueue (newItem, null);
-  }
-
-  /**
-   * Enqueue a <MessageBlock> into the <MessageQueue> in accordance
-   * with its <msgPriority> (0 is lowest priority). Note that the
-   * call will return if the queue has been deactivated or it is
-   * later than the specified absolute time value.
-   *@param newItem item to enqueue onto the Message Queue
-   *@param tv absolute TimeValue to timeout after
-   *@return -1 on failure, else the number of items still on the
-   * queue. 
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  public synchronized int enqueue (MessageBlock newItem, 
-				   TimeValue tv) throws InterruptedException
-  {
-    int result = -1;
-    if (this.deactivated_)
-      return -1;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notFullCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notFullCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return -1;
-      }
-	  
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return -1;
-    else
-      result = this.enqueueInternal (newItem);
-
-    // Tell any blocked threads that the queue has a new item!
-    this.notEmptyCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the end of the <MessageQueue>. Note
-     * that the call will block (unless the queue has been deactivated).
-     *@param newItem item to enqueue onto the Message Queue
-     *@return -1 on failure, else the number of items still on the queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized int enqueueTail (MessageBlock newItem) throws InterruptedException
-  {
-    return this.enqueueTail (newItem, null);
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the end of the <MessageQueue>. Note
-     * that the call will return when it's later than the given TimeValue or
-     * if the queue has been deactivated.
-     *@param newItem item to enqueue onto the Message Queue
-     *@param tv absolute TimeValue to wait until before returning (unless
-     * the operation compeltes before this time)
-     *@return -1 on failure, else the number of items still on the queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized int enqueueTail (MessageBlock newItem,
-				       TimeValue tv) throws InterruptedException
-  {
-    int result = -1;
-    if (this.deactivated_)
-      return -1;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notFullCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notFullCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return -1;
-      }
-	  
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return -1;
-    else
-      result = this.enqueueTailInternal (newItem);
-
-    // Tell any blocked threads that the queue has a new item!
-    this.notEmptyCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the head of the <MessageQueue>. Note
-     * that the call will block (unless the queue has been deactivated).
-     *@param newItem item to enqueue onto the Message Queue
-     *@return -1 on failure, else the number of items still on the queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized int enqueueHead (MessageBlock newItem) throws InterruptedException
-  {
-    return this.enqueueHead (newItem, null);
-  }
-
-  /**
-     * Enqueue a <MessageBlock> at the head of the <MessageQueue>.  Note
-     * that the call will return when it's later than the given TimeValue or
-     * if the queue has been deactivated.
-     *@param newItem item to enqueue onto the Message Queue
-     *@param tv absolute TimeValue to wait until before returning (unless
-     * the operation completes before that time)
-     *@return -1 on failure, else the number of items still on the queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized int enqueueHead (MessageBlock newItem,
-				       TimeValue tv) throws InterruptedException
-  {
-    int result = -1;
-    if (this.deactivated_)
-      return -1;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notFullCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notFullCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return -1;
-      }
-    
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return -1;
-    else
-      result = this.enqueueHeadInternal (newItem);
-
-    // Tell any blocked threads that the queue has a new item!
-    this.notEmptyCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Dequeue and return the <MessageBlock> at the head of the
-     * <MessageQueue>. Note that the call will block (unless the queue
-     * has been deactivated). 
-     *@return null on failure, else the <MessageBlock> at the head of queue.
-     *@exception java.lang.InterruptedException Interrupted while accessing queue
-     */
-  public synchronized MessageBlock dequeueHead () throws InterruptedException
-  {
-    return this.dequeueHead (null);
-  }
-
-  /**
-     * Dequeue and return the <MessageBlock> at the head of the
-     * <MessageQueue>.  Note that the call when return if the queue has 
-     * been deactivated or when the current time is later than the given 
-     * time value.
-     *@param tv absolute time timeout (blocks indefinitely if null)
-     *@return null on failure, else the <MessageBlock> at the head of queue.
-     *@exception InterruptedException Interrupted while accessing queue
-     */
-  public synchronized MessageBlock dequeueHead (TimeValue tv) 
-      throws InterruptedException
-  {
-    MessageBlock result = null;
-    if (this.deactivated_)
-      return null;
-    try
-      {
-	if (tv == null)  // Need to do a blocking wait
-	  notEmptyCondition_.timedWait ();
-	else             // Need to do a timed wait
-	  notEmptyCondition_.timedWait (tv);
-      }
-    catch (TimeoutException e)
-      {
-	return null;
-      }
-	  
-    // Check again if queue is still active
-    if (this.deactivated_)
-      return null;
-    else
-      result = this.dequeueHeadInternal ();
-
-    // Tell any blocked threads that the queue has room for an item!
-    this.notFullCondition_.broadcast ();
-    return result;
-  }
-
-  /**
-     * Check if queue is full.
-     *@return true if queue is full, else false.
-     */
-  public synchronized boolean isFull ()
-  {
-    return this.isFullInternal ();
-  }
-
-  /**
-     * Check if queue is empty.
-     *@return true if queue is empty, else false.
-     */
-  public synchronized boolean isEmpty ()
-  {
-    return this.isEmptyInternal ();
-  }
-
-  /**
-     * Get total number of bytes on the queue.
-     *@return total number number of bytes on the queue
-     */
-  public int messageBytes ()
-  {
-    return this.currentBytes_;
-  }
-
-  /**
-     * Get total number of messages on the queue.
-     *@return total number number of messages on the queue
-     */
-  public int messageCount ()
-  {
-    return this.currentCount_;
-  }
-
-  // = Flow control routines 
-
-    /**
-     * Get high watermark.
-     *@return high watermark
-     */
-  public int highWaterMark ()
-  {
-    return this.highWaterMark_;
-  }
-
-  /**
-     * Set high watermark.
-     *@param hwm high watermark
-     */
-  public void highWaterMark (int hwm)
-  {
-    this.highWaterMark_ = hwm;
-  }
-
-  /**
-     * Get low watermark.
-     *@return low watermark
-     */
-  public int lowWaterMark ()
-  {
-    return this.lowWaterMark_;
-  }
-
-  /**
-     * Set low watermark.
-     *@param lwm low watermark
-     */
-  public void lowWaterMark (int lwm)
-  {
-    this.lowWaterMark_ = lwm;
-  }
-
-  // = Activation control methods.
-
-    /**
-     * Deactivate the queue and wakeup all threads waiting on the queue
-     * so they can continue.  No messages are removed from the queue,
-     * however.  Any other operations called until the queue is
-     * activated again will immediately return -1.  
-     *@return WAS_INACTIVE if queue was inactive before the call and
-     * WAS_ACTIVE if queue was active before the call.
-     */
-  public synchronized int deactivate ()
-  {
-    return this.deactivateInternal ();
-  }
-
-
-  /**
-     * Reactivate the queue so that threads can enqueue and dequeue
-     * messages again.  
-     *@return WAS_INACTIVE if queue was inactive before the call and
-     * WAS_ACTIVE if queue was active before the call.
-     */
-  public synchronized int activate ()
-  {
-    return this.activateInternal ();
-  }
-
-  protected boolean isEmptyInternal ()
-  {
-    // Not sure about this one!!!!
-    return this.currentBytes_ <= this.lowWaterMark_ && this.currentCount_ <= 0;
-  }
-
-  protected boolean isFullInternal ()
-  {
-    return this.currentBytes_ > this.highWaterMark_;
-  }
-
-  protected int deactivateInternal ()
-  {
-    int currentStatus = 
-      this.deactivated_ ? WAS_INACTIVE : WAS_ACTIVE;
-      
-    this.notFullCondition_.broadcast ();
-    this.notEmptyCondition_.broadcast ();
-      
-    this.deactivated_ = true;
-    return currentStatus;
-  }
-
-  protected int activateInternal ()
-  {
-    int currentStatus = 
-      this.deactivated_ ? WAS_INACTIVE : WAS_ACTIVE;
-    this.deactivated_ = false;
-
-    return currentStatus;
-  }
-
-  protected int enqueueTailInternal (MessageBlock newItem)
-  {
-    if (newItem == null)
-      return -1;
-
-    // List was empty, so build a new one.
-    if (this.tail_ == null)
-      {
-	this.head_     = newItem;
-	this.tail_     = newItem;
-	newItem.next (null);
-	newItem.prev (null);
-      }
-    // Link at the end.
-    else 
-      {
-	newItem.next (null);
-	this.tail_.next (newItem);
-	newItem.prev (this.tail_);
-	this.tail_ = newItem;
-      }
-
-    if (newItem.msgType() != MessageType.MB_OBJECT)
-      {
-	// Make sure to count *all* the bytes in a composite message!!! 
-	for (MessageBlock temp = newItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ += temp.size ();
-      }
-
-    this.currentCount_++;
-    return this.currentCount_;
-  }
-
-  protected int enqueueHeadInternal (MessageBlock newItem)
-  {
-    if (newItem == null)
-      return -1;
-
-    newItem.prev (null);
-    newItem.next (this.head_);
-
-    if (this.head_ != null)
-      this.head_.prev (newItem);
-    else
-      this.tail_ = newItem;
-
-    this.head_ = newItem;
-
-    if (newItem.msgType() != MessageType.MB_OBJECT)
-      {
-	// Make sure to count *all* the bytes in a composite message!!!
-	for (MessageBlock temp = newItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ += temp.size ();
-      }
-
-    this.currentCount_++;
-
-    return this.currentCount_;
-  }
-
-  protected int enqueueInternal (MessageBlock newItem)
-  {
-    if (newItem == null)
-      return -1;
-
-    if (this.head_ == null)
-      // Check for simple case of an empty queue, where all we need to
-      // do is insert <newItem> into the head.
-      return this.enqueueHeadInternal (newItem);
-    else
-      {
-	MessageBlock temp;
-
-	// Figure out where the new item goes relative to its priority.
-
-	for (temp = this.head_;
-	     temp != null;
-	     temp = temp.next ())
-	  {
-	    if (temp.msgPriority () <= newItem.msgPriority ())
-	      // Break out when we've located an item that has lower
-	      // priority that <newItem>.
-	      break;
-	  }
-
-	if (temp == null)
-	  // Check for simple case of inserting at the end of the queue,
-	  // where all we need to do is insert <newItem> after the
-	  // current tail.
-	  return this.enqueueTailInternal (newItem);
-	else if (temp.prev () == null)
-	  // Check for simple case of inserting at the beginning of the
-	  // queue, where all we need to do is insert <newItem> before
-	  // the current head.
-	  return this.enqueueHeadInternal (newItem);
-	else
-	  {
-	    // Insert the message right before the item of equal or lower
-	    // priority.
-	    newItem.next (temp);
-	    newItem.prev (temp.prev ());
-	    temp.prev ().next (newItem);
-	    temp.prev (newItem);
-	  }
-      }
-
-    if (newItem.msgType() != MessageType.MB_OBJECT)
-      {    
-	// Make sure to count *all* the bytes in a composite message!!!
-	for (MessageBlock temp = newItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ += temp.size ();
-      }
-
-    this.currentCount_++;
-    return this.currentCount_;
-  }
-
-  protected MessageBlock dequeueHeadInternal ()
-  {
-    MessageBlock firstItem = this.head_;
-    this.head_ = this.head_.next ();
-
-    if (this.head_ == null)
-      this.tail_ = null;
-
-    if (firstItem.msgType() != MessageType.MB_OBJECT)
-      {
-	// Make sure to subtract off all of the bytes associated with this
-	// message.
-	for (MessageBlock temp = firstItem; 
-	     temp != null; 
-	     temp = temp.cont ())
-	  this.currentBytes_ -= temp.size ();
-      }
-
-    this.currentCount_--;
-    return firstItem;
-  }
-
-  
-  /** Default high watermark (16 K). */
-  public final static int DEFAULT_HWM = 16 * 1024;
-
-  /** Default low watermark. */
-  public final static int DEFAULT_LWM = 0;
-
-  /** Message queue was active before activate() or deactivate(). */
-  public final static int WAS_ACTIVE = 1;
-  
-  /** Message queue was inactive before activate() or deactivate(). */
-  public final static int WAS_INACTIVE = 2;
-
-  private int highWaterMark_;
-  // Greatest number of bytes before blocking.
-
-  private int lowWaterMark_;
-  // Lowest number of bytes before unblocking occurs.
-
-  private boolean deactivated_;
-  // Indicates that the queue is inactive.
-
-  private int currentBytes_;
-  // Current number of bytes in the queue.
-
-  private int currentCount_;
-  // Current number of messages in the queue.
-
-  private MessageBlock head_;
-  // Head of Message_Block list.
-
-  private MessageBlock tail_;
-  // Tail of Message_Block list.
-
-  // The Delegated Notification mechanisms.
-  private NotFullCondition notFullCondition_ = new NotFullCondition (this);
-  private NotEmptyCondition notEmptyCondition_ = new NotEmptyCondition (this);
-
-}
diff --git a/java/src/MessageType.java b/java/src/MessageType.java
deleted file mode 100644
index 62c34455854..00000000000
--- a/java/src/MessageType.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    MessageType.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Message types used by ACE.MessageBlock.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     Defines bit masks used to identify various types of messages.
- *</blockquote>
- *
- *<h2>NOTES</h2>
- *<blockquote>
- * This class is not intended to be instantiable.
- *</blockquote>
- */
-public class MessageType
-{
-  // = Data and protocol messages (regular and priority)
-  /** regular data */
-  public static final int MB_DATA     = 0x01;
-
-  /** protocol control */
-  public static final int MB_PROTO    = 0x02;
-
-  /** regular data */
-  public static final int MB_OBJECT   = 0x09;
-
-
-  // = Control messages (regular and priority)
-  /** line break */
-  public static final int MB_BREAK    = 0x03;
-
-  /** pass file pointer */
-  public static final int MB_PASSFP   = 0x04;
-
-  /** post an event to an event queue */
-  public static final int MB_EVENT    = 0x05;
-
-  /** generate process signal */
-  public static final int MB_SIG      = 0x06;
-
-  /** ioctl; set/get params */
-  public static final int MB_IOCTL    = 0x07;
-
-  /** set various stream head options */
-  public static final int MB_SETOPTS  = 0x08; 
-
-
-  // = Control messages (high priority; go to head of queue)
-  /** acknowledge ioctl */
-  public static final int MB_IOCACK   = 0x81;
-
-  /** negative ioctl acknowledge */
-  public static final int MB_IOCNAK   = 0x82;
-
-  /** priority proto message */
-  public static final int MB_PCPROTO  = 0x83;
-
-  /** generate process signal */
-  public static final int MB_PCSIG    = 0x84;
-
-  /** generate read notification */
-  public static final int MB_READ     = 0x85;
-
-  /** flush your queues */
-  public static final int MB_FLUSH    = 0x86;
-
-  /** stop transmission immediately */
-  public static final int MB_STOP     = 0x87;
-
-  /** restart transmission after stop */
-  public static final int MB_START    = 0x88;
-
-  /** line disconnect */
-  public static final int MB_HANGUP   = 0x89;
-
-  /** fatal error used to set u.u_error */
-  public static final int MB_ERROR    = 0x8a;
-
-  /** post an event to an event queue */
-  public static final int MB_PCEVENT  = 0x8b; 
-
-
-  /** Normal priority messages */
-  public static final int MB_NORMAL   = 0x00;
-
-  /** High priority control messages */
-  public static final int MB_PRIORITY = 0x80; 
-
-  // Default private constructor to avoid instantiation
-  private MessageType ()
-  {
-  }
-}
-
diff --git a/java/src/Module.java b/java/src/Module.java
deleted file mode 100644
index 6eb56bcbf43..00000000000
--- a/java/src/Module.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    Module.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Provides an abstraction for managing a bi-directional flow of
- * messages. 
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *   This is based on the Module concept in System V Streams,
- *   which contains a pair of Tasks, one for handling upstream
- *   processing, one for handling downstream processing.
- *</blockquote>
- */
-public class Module
-{
-  // = Initialization and termination methods.
-
-  /**
-   * Create an empty Module.
-   */
-  public Module ()
-  {
-    // Do nothing...
-    this.name ("<unknown>");
-  }
-
-  /*
-   * Create an initialized module.
-   *@param modName identity of the module.
-   *@param writerQ writer task of the module.
-   *@param readerQ reader task of the module.
-   *@param flags Module flags
-   */
-  public Module (String modName,
-		 Task writerQ,
-		 Task readerQ,
-		 Object flags)
-  {
-    this.open (modName, writerQ, readerQ, flags);
-  }
-		
-  /*
-   * Create an initialized module.
-   *@param modName identity of the module.
-   *@param writerQ writer task of the module.
-   *@param readerQ reader task of the module.
-   *@param flags Module flags
-   */
-  public void open (String modName,
-		   Task writerQ,
-		   Task readerQ,
-		   Object arg)
-  {
-    this.name (modName);
-    this.arg_ = arg;
-
-    if (writerQ == null)
-      writerQ = new ThruTask ();
-    if (readerQ == null)
-      readerQ = new ThruTask ();
-
-    this.reader (readerQ);
-    this.writer (writerQ);
-
-    // Setup back pointers.
-    readerQ.module (this);
-    writerQ.module (this);
-  }
-
-
-  /*
-   * Set the writer task.
-   *@param q the writer task
-   */
-  public void writer (Task q)
-  { 
-    this.qPair_[1] = q;
-    if (q != null)
-      q.flags (ACE.CLR_BITS (q.flags (), TaskFlags.ACE_READER));
-  }
-
-  /*
-   * Set the reader task.
-   *@param q the reader task
-   */
-  public void reader (Task q) 
-  {
-    this.qPair_[0] = q;
-    if (q != null)
-      q.flags (ACE.SET_BITS (q.flags (), TaskFlags.ACE_READER));
-  }
-
-  /*
-   * Link this Module on top of Module.
-   *@param m the module to link this on top of.
-   */
-  public void link (Module m)
-  {
-    this.next (m);
-    this.writer ().next (m.writer ());
-    m.reader ().next (this.reader ());
-  }
-
-  /*
-   * Set and get pointer to sibling Task in Module.
-   *@param orig the task to get the sibling for
-   *@return the sibling of the task
-   */
-  public Task sibling (Task orig)
-  {
-  if (this.qPair_[0] == orig)
-    return this.qPair_[1];
-  else if (this.qPair_[1] == orig)
-    return this.qPair_[0];
-  else
-    return null;
-  }
-
-  /*
-   * Close down the module and its tasks.
-   *@param flags Module flags
-   *@return 0 on success, -1 on failure
-   */
-  public int close (long flags)
-  {
-    Task readerQ = this.reader ();
-    Task writerQ = this.writer ();
-    int result = 0;
-
-    if (readerQ != null)
-      {
-	if (readerQ.close (flags) == -1)
-	  result = -1;
-	readerQ.flush (flags);
-	readerQ.next (null);
-      }
-
-    if (writerQ != null)
-      {
-	if (writerQ.close (flags) == -1)
-	  result = -1;
-	writerQ.flush (flags);
-	writerQ.next (null);
-      }
-
-    return result;
-  }
-
-  /* 
-   * Get the argument passed to tasks.
-   *@return the argument passed to tasks.
-   */
-  public Object arg ()
-  {
-    return this.arg_;
-  }
-
-  /* 
-   * Set the argument to be passed to tasks.
-   *@param a the argument to be passed to tasks.
-   */
-  public void arg (Object a)
-  {
-    this.arg_ = a;
-  }
-
-  /* 
-   * Get the name of the module.
-   *@return the name of the module.
-   */
-  public String name ()
-  {
-    return this.name_;
-  }
-
-  /* 
-   * Set the name of the module.
-   *@param n the name of the module.
-   */
-  public void name (String n)
-  {
-    this.name_ = n;
-  }
-
-  /* 
-   * Get the writer task of the module.
-   *@return the writer task of the module.
-   */
-  public Task writer ()
-  { 
-    return this.qPair_[1];
-  }
-
-  /* 
-   * Get the reader task of the module.
-   *@return the reader task of the module.
-   */
-  public Task reader ()
-  {
-    return this.qPair_[0];
-  }
-
-  /*
-   * Get the next pointer to the module above in the stream.
-   *@return the next pointer to the module above in the stream.
-   */
-  public Module next ()
-  {
-    return this.next_;
-  }
-
-  /*
-   * Set the next pointer to the module above in the stream.
-   *@param m the next pointer to the module above in the stream.
-   */
-  public void next (Module m) 
-  {
-    this.next_ = m;
-  }
-
-  private Task qPair_[] = new Task[2];
-  // Pair of Tasks that form the "read-side" and "write-side" of the
-  // ACE_Module partitioning.
-
-  private String name_ = null;
-  // Name of the ACE_Module.
-
-  private Module next_;
-  // Next ACE_Module in the stack.
-
-  private Object arg_;
-  // Argument passed through to the reader and writer task when they
-  // are opened.
-
-}
-
diff --git a/java/src/Mutex.java b/java/src/Mutex.java
deleted file mode 100644
index 1b796062ae8..00000000000
--- a/java/src/Mutex.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Mutex.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-class TimedWaitMAdapter extends TimedWait
-{
-  TimedWaitMAdapter (Object obj)
-  {
-    super (obj);
-  }
-
-  // Check to see if the lock is currently held or not.
-  public boolean condition ()
-  {
-    return !this.inUse_;
-  }
-
-  // Acquire/Release the lock
-  public void inUse (boolean c)
-  {
-    this.inUse_ = c;
-  }
-
-  private boolean inUse_ = false;
-  // The actual lock
-}
-
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Value added abstraction for mutex variable creation.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     A timed mutex, <em>i.e.</em> a mutex whose operations do not
- * block forever and can <q>time out</q>.
- *</blockquote>
- */
-public class Mutex
-{
-  /**
-   * Acquire the mutex. Note that this will block.
-   *@exception InterruptedException exception during wait
-   */
-  public synchronized void acquire () throws InterruptedException
-    {
-      this.monitor_.timedWait ();
-      this.monitor_.inUse (true);
-      setOwner();
-    }
-
-  /**
-   * Acquire the mutex.
-   * Throws a TimeoutException if the mutex isn't acquired before the
-   * given absolute time timeout.
-   *@param tv time (TimeValue) to wait until before throwing a
-   * TimeoutException (unless the mutex is acquired before that)
-   *@exception TimeoutException wait timed out exception
-   *@exception InterruptedException exception during wait
-   */
-  public synchronized void acquire (TimeValue tv) throws
-  TimeoutException, InterruptedException 
-    {
-      this.monitor_.timedWait (tv);
-      this.monitor_.inUse (true);
-      setOwner();
-    }
-
-  /**
-   * Release the mutex.  This is safe for non-owners to call.
-   */
-  public synchronized void release ()
-    {
-      if (isOwner()) {
-	  this.monitor_.inUse (false);
-	  this.monitor_.signal ();
-      }
-    }
-
-  private TimedWaitMAdapter monitor_ = new TimedWaitMAdapter (this);
-  // The monitor (adapter) to wait on
-
-  // Keep track of the owner.  Allow subclasses to redefine this
-  // behavior
-  private Object owner_ = null;
-    
-  protected void setOwner() {
-      this.owner_ = Thread.currentThread().toString();
-  }
-
-  protected boolean isOwner() {
-      return Thread.currentThread().toString().equals(this.owner_);
-  }
-}
diff --git a/java/src/OS.java b/java/src/OS.java
deleted file mode 100644
index c17fd6d07f2..00000000000
--- a/java/src/OS.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.OS
- *
- * = FILENAME
- *    OS.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.OS;
-
-import java.util.StringTokenizer;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Methods to extend the capabilities of the Java runtime system.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- * This non-instantiable class contains little <q>utility functions</q>
- * that should have been in Java to begin with :-)
- *</blockquote>
- */
-public class OS
-{
-  /**
-   * Create an array of Strings from a single String using <delim> as
-   * the delimiter.
-   *@param args the String to break up to make an array of Strings
-   *@param delim the delimeter to use to break the String up
-   *@return an array containing the original String broken up
-   */
-  public static String [] createStringArray (String args, String delim)
-  {
-    // First determine the number of arguments
-    int count = 0;
-    StringTokenizer tokens = new StringTokenizer (args, delim);
-    while (tokens.hasMoreTokens ())
-      {
-	tokens.nextToken ();
-	count++;
-      }
-    if (count == 0)
-      return null;
-    
-    // Create argument array
-    String [] argArray = new String [count];
-    int index = 0;
-    tokens = new StringTokenizer (args, " ");
-    while (tokens.hasMoreTokens ())
-      {
-	argArray [index] = tokens.nextToken ();
-	index++;
-      }
-
-    // Assert index == count
-    if (index != count)
-      return null;
-    else
-      return argArray;    
-  }
-
-  // Default private constructor to avoid instantiation
-  private OS ()
-  {
-  }
-}
diff --git a/java/src/ParseNode.java b/java/src/ParseNode.java
deleted file mode 100644
index cdf8bb57955..00000000000
--- a/java/src/ParseNode.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ParseNode.java
- *
- * Base class for the data types used in the parse tree for adjusting 
- * services.  Things like SuspendNode extend this. 
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-
-public class ParseNode 
-{
-  /** 
-   * Constructor
-   *
-   */
-  public ParseNode ()
-  {
-    this.name_ = new String("Uninitialized");
-  }
-
-  /**
-   * Initialize the service (subclasses
-   * may do more than set the name)
-   */
-  public void init (String name)
-  {
-    this.name_ = name;
-  }
-
-  /**
-   * Subclasses override to do real work, usually
-   * initiating a service or modifying one
-   */
-  public void apply () 
-  {
-    // Empty
-  }
-
-  /**
-    * Retrive the service name
-    */
-  public String name() 
-  {
-    return this.name_;
-  }
-
-  /**
-   * Set the name of the service
-   */
-  public void name(String newName)
-  {
-    this.name_ = newName;
-  }
-  
-  String name_;
-};
-
- 
-  
diff --git a/java/src/ProfileTimer.java b/java/src/ProfileTimer.java
deleted file mode 100644
index b7e9c908a13..00000000000
--- a/java/src/ProfileTimer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Timers
- *
- * = FILENAME
- *    ProfileTimer.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Timers;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     A Java wrapper for interval timers.
- */
-public class ProfileTimer
-{
-  /**
-   * Start the timer.
-   */
-  public void start ()
-    {
-      this.startTime_ = java.lang.System.currentTimeMillis ();
-    }
-
-  /**
-   * Stop the timer.
-   */
-  public void stop ()
-    {
-      this.stopTime_ = java.lang.System.currentTimeMillis ();
-    }
-
-  /**
-   * Determine elapsed time between start and stop.
-   *@return Total elapsed time (stop - start).
-   */
-  public long elapsedTime ()
-    {
-      return this.stopTime_ - this.startTime_;
-    }
-
-  private long startTime_;
-  private long stopTime_;
-}
diff --git a/java/src/README b/java/src/README
deleted file mode 100644
index 1882de26380..00000000000
--- a/java/src/README
+++ /dev/null
@@ -1,19 +0,0 @@
-$Id$
-
-Make sure to update the environment variable CLASSPATH to include the
-path to where java/classes/ is located. The Java compiler uses this to
-find classes when resolving dependencies.
-
-As with the C++ version of ACE, the Makefile requires GNU Make.
-
-Suggestions are welcome to:
-
-Douglas C. Schmidt (schmidt@cs.wustl.edu)
-Everett Anderson (eea1@cs.wustl.edu)
-Darrell Brunsch (brunsch@cs.wustl.edu)
-Prashant Jain (pjain@cs.wustl.edu)
-
-The documentation for Java ACE has not been included in the release
-but can be automatically generated by typing "make doc" in the src
-directory. Note that the gif images needed by the documentation ARE
-included in the release.
diff --git a/java/src/RWMutex.java b/java/src/RWMutex.java
deleted file mode 100644
index 1161d9a8618..00000000000
--- a/java/src/RWMutex.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    RWMutex.java
- *
- *@author Ross Dargahi (rossd@krinfo.com), Prashant Jain, and Irfan Pyarali
- *
- *************************************************/
-
-package JACE.Concurrency;
-
-import JACE.OS.*;
-
-/*******************************************************************************
-* <HR>
-* <B> Description </B>
-* <BR>
-* This class increments a read/write lock. A read/write lock allows multiple
-* readers or a single writer to access the guarded element.
-* This implementation is based on the C++ version of ACE.
-* </PRE><P><HR>
-* <B> Notes </B>
-* <UL>
-* <LI> This class does not support recursive semantics
-* </UL>
-*******************************************************************************/
-public class RWMutex
-{
-  /**
-   * Acquires the write lock
-   * @exception InterruptedException Lock acquisition interrupted
-   **/
-  public void acquire()
-    throws InterruptedException
-  {
-    acquireWrite();
-  }
-
-  /**
-   * Acquires the read lock
-   * @exception InterruptedException Lock acquisition interrupted
-   **/
-  public void acquireRead()
-    throws InterruptedException
-  {
-    // make sure we start with no exception
-    InterruptedException exception_ = null;
-    
-    // grab lock
-    lock_.acquire ();
-    
-    // Give preference to writers who are waiting.
-    while (referenceCount_ < 0 || numberOfWaitingWriters_ > 0)
-      {
-	numberOfWaitingReaders_++;
-	try 
-	  {
-	    waitingReaders_.Wait ();
-	  }
-	catch (InterruptedException exception)
-	  {
-	    // cache exception
-	    exception_ = exception;
-	  }
-	numberOfWaitingReaders_--;
-      }
-    
-    if (exception_ == null)
-      // No errors
-      referenceCount_++;
-
-    // make sure this is released in all cases
-    lock_.release ();
-
-    if (exception_ != null)
-      // error: propogate
-      throw exception_;
-  }
-  
-  /**
-   * Acquires the write lock
-   * @exception InterruptedException Lock acquisition interrupted
-   **/
-  public void acquireWrite()
-    throws InterruptedException
-  {
-    // make sure we start with no exception
-    InterruptedException exception_ = null;
-    
-    // grab lock
-    lock_.acquire ();
-    
-    // Give preference to writers who are waiting.
-    while (referenceCount_ != 0)
-      {
-	numberOfWaitingWriters_++;
-	try 
-	  {
-	    waitingWriters_.Wait ();
-	  }
-	catch (InterruptedException exception)
-	  {
-	    // cache exception
-	    exception_ = exception;
-	  }
-	numberOfWaitingWriters_--;
-      }
-    
-    if (exception_ == null)
-      // No errors
-      referenceCount_ = -1;
-
-    // make sure this is released in all cases
-    lock_.release ();
-
-    if (exception_ != null)
-      // error: propogate
-      throw exception_;
-  }
-
-  /**
-   * Release held lock
-   * @exception InterruptedException Lock acquisition interrupted
-   **/
-  public void release()
-    throws InterruptedException
-  {
-    lock_.acquire ();
-    
-    // Releasing a reader.
-    if (referenceCount_ > 0) 
-      referenceCount_--;
-    else 
-      // Releasing a writer.
-      if (referenceCount_ == -1) 
-	referenceCount_ = 0;
-    
-    // Give preference to writers over readers...
-    if (numberOfWaitingWriters_ > 0)
-      {
-	waitingWriters_.signal ();
-      }
-    else if (numberOfWaitingReaders_ > 0)
-      {
-	waitingReaders_.broadcast ();
-      }
-	
-    
-    lock_.release ();
-  }
-
-  private Mutex lock_ = new Mutex (); 
-  // Serialize access to internal state.
- 
-  private Condition waitingReaders_ = new Condition (lock_);
-  // Reader threads waiting to acquire the lock.
- 
-  private int numberOfWaitingReaders_;
-  // Number of waiting readers.
- 
-  private Condition waitingWriters_ = new Condition (lock_);
-  // Writer threads waiting to acquire the lock.
- 
-  private int numberOfWaitingWriters_ = 0;
-  // Number of waiting writers.
- 
-  private int referenceCount_ = 0;
-  // Value is -1 if writer has the lock, else this keeps track of the
-  // number of readers holding the lock.
-}
-
diff --git a/java/src/RemoveNode.java b/java/src/RemoveNode.java
deleted file mode 100644
index b613d981ee5..00000000000
--- a/java/src/RemoveNode.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    RemoveNode.java
- *
- * Used when a service is specified to be removed based on a line
- * in a service configurator file.  Note:  Make sure to call the
- * prepareToReload method in ServiceConfig before reloading the
- * service that is being removed.
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-
-class RemoveNode extends ParseNode
-{
-  public RemoveNode ()
-  {
-  }  
-
-  public void apply () 
-  {
-    ACE.DEBUG("RemoveNode apply");
-
-    if (JACE.ServiceConfigurator.ServiceConfig.remove(this.name_) == -1)
-      ACE.ERROR("Error removing " + this.name_);
-  }
-};
diff --git a/java/src/ResumeNode.java b/java/src/ResumeNode.java
deleted file mode 100644
index 055c19da408..00000000000
--- a/java/src/ResumeNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ResumeNode.java
- *
- * Used when a service is specified to be resumed based on a line
- * in a service configurator file.  The actual implementation of the
- * service being resumed does the work.
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-
-class ResumeNode extends ParseNode
-{
-  public ResumeNode () 
-  {
-  }
-
-  public void apply ()
-  {
-    ACE.DEBUG("ResumeNode apply: " + this.name_);
-
-    if (JACE.ServiceConfigurator.ServiceConfig.resume(this.name_) == -1)
-      ACE.ERROR("Error resuming " + this.name_);
-  }
-};
diff --git a/java/src/SOCKAcceptor.java b/java/src/SOCKAcceptor.java
deleted file mode 100644
index f94d037d462..00000000000
--- a/java/src/SOCKAcceptor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    SOCKAcceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Defines the format and interface for an ACE.SOCKAcceptor.
- */
-public class SOCKAcceptor
-{
-  // = Initialization
-
-  /**
-   * Create a SOCKAcceptor. Do nothing constructor. Allows user to
-   * call open() later and pass in the port number.
-   */
-  public SOCKAcceptor ()
-    {
-    }
-
-  /**
-   * Create a SOCKAcceptor.
-   *@param port port number where the server will listen for connections
-   */
-  public SOCKAcceptor (int port) throws IOException
-    {
-      this.open (port);
-    }
-
-  /**
-   * Create socket to listen for connections on.
-   *@param port port number where the server will listen for connections
-   */
-  public void open(int port) throws IOException
-    {
-      // Close old socket (if there is one)
-      this.close ();
-
-      // Create a new server socket
-      this.listenSocket_ = new ServerSocket (port);
-      //      ACE.DEBUG ("Server listening on port " + port);
-    }
-
-  /**
-   * Close the socket and do any necessary cleanup.
-   */
-  public void close () throws IOException
-    {
-      if (this.listenSocket_ != null)
-	{
-	  this.listenSocket_.close ();
-	  this.listenSocket_ = null;
-	}
-    }
-
-  /**
-   * Accept a connection. The streams are set when the method returns.
-   *@param sockStream SOCK Stream to use for the connection
-   */
-  public void accept (SOCKStream sockStream) throws SocketException, IOException
-    {
-      // Block in accept. Returns when a connection shows up and sets
-      // the streams
-      sockStream.socket (this.listenSocket_.accept ());
-      ACE.DEBUG ("Accepted connection from " +
-		 sockStream.socket ().getInetAddress ());
-    }
-
-  /**
-   * Get the underlying listen socket.
-   *@return the underlying listen socket
-   */
-  public ServerSocket listenSocket ()
-  {
-    return this.listenSocket_;
-  }
-
-  /**
-   * Set the underlying listen socket.
-   *@param s the underlying listen socket
-   */
-  public void listenSocket (ServerSocket s)
-  {
-    this.listenSocket_ = s;
-  }
-
-  /**
-   * Clean up when the garbage collector gets run (if at all). Note
-   * that there is no guarantee that finalize () will get called.
-   *@exception Throwable (Probably IOException from the socket level)
-   */
-  protected void finalize () throws Throwable
-    {
-      super.finalize ();
-      this.close ();
-    }
-
-  // Socket on which listen for connections (by default initialized to
-  // null)
-  private ServerSocket listenSocket_;
-}
diff --git a/java/src/SOCKConnector.java b/java/src/SOCKConnector.java
deleted file mode 100644
index 98dfcaf6b3d..00000000000
--- a/java/src/SOCKConnector.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    SOCKConnector.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Defines an active connection factory for the socket wrappers. 
- */
-public class SOCKConnector
-{
-  // = Initialization
-
-  /**
-   * Create a SOCKConnector. Do nothing constructor. Allows user to
-   * call connect() later.
-   */
-  public SOCKConnector ()
-    {
-      // Do nothing constructor
-    }
-
-  /**
-   * Create a SOCKConnector and connect to the server.
-   *@param sockStream SOCK Stream to use for the connection
-   *@param hostname hostname of the server
-   *@param port port number to connect with server at
-   */
-  public SOCKConnector (SOCKStream sockStream,
-			 String hostname,
-			 int port) throws SocketException, IOException
-    {
-      this.connect (sockStream,
-		    hostname,
-		    port);
-    }
-
-  /**
-   * Connect to the server.
-   *@param sockStream SOCK Stream to use for the connection
-   *@param hostname hostname of the server
-   *@param port port number to connect with server at
-   */
-  public void connect (SOCKStream sockStream,
-		       String hostname,
-		       int port) throws SocketException, IOException
-    {
-      sockStream.socket (new Socket (hostname, port));
-    }
-
-  /**
-   * Connect to the server.
-   *@param sockStream SOCK Stream to use for the connection
-   *@param addr INETAddr instance specifying host/port
-   */
-  public void connect (SOCKStream sockStream,
-		       INETAddr addr) throws SocketException, IOException
-    {
-      sockStream.socket (new Socket (addr.getHostName(),
-				     addr.getPortNumber()));
-    }
-}
diff --git a/java/src/SOCKStream.java b/java/src/SOCKStream.java
deleted file mode 100644
index f255b7bc44a..00000000000
--- a/java/src/SOCKStream.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.SOCK_SAP
- *
- * = FILENAME
- *    SOCKStream.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Defines the methods in the ACE.SOCKStream abstraction.
- *     
- * <p><b>DESCRIPTION</b><br>
- *     This adds additional wrapper methods atop the java Socket class.
- */
-public class SOCKStream
-{
-  /**
-   * Create a default SOCK Stream. Do nothing constructor.
-   */
-  public SOCKStream ()
-    {
-    }
-
-  /**
-   * Create a SOCK Stream.
-   *@param s Socket to initialize SOCK Stream with.
-   */
-  public SOCKStream (Socket s) throws IOException
-    {
-      this.socket (s);
-    }
-
-  /**
-   * Set the socket and the underlying streams.
-   *@param s Socket associated with the SOCK Stream.
-   */
-  public void socket (Socket s) throws IOException
-  {
-    this.socket_ = s;
-    // Note that if s is not a valid socket or is null, the
-    // following calls will throw exceptions
-
-    // Create buffered, platform independent byte streams.  This hasn't been switched
-    // to the newer character streams since the change would break cross talk with
-    // non-Java sockets.
-
-    this.iStream_ = new DataInputStream(new BufferedInputStream(s.getInputStream()));
-
-    this.oStream_ = new DataOutputStream(new BufferedOutputStream(s.getOutputStream()));
-  }
-
-  /* Get the underlying Socket.
-   *@return the underlying socket
-   */
-  public Socket socket ()
-    {
-      return this.socket_;
-    }
-
-  /**
-   * Close the streams and the underlying socket.
-   */
-  public void close () throws IOException
-    {
-      if (this.socket_ != null)
-	this.socket_.close ();
-      this.socket_ = null;
-    }
-  
-  // = The following send and recv methods are overloaded to provide a
-  // flexible interface
-
-  /**
-   * Send a StringBuffer. Note that the method blocks.
-   *@param s the StringBuffer to send
-   *@return the length of the StringBuffer
-   */
-  public int send (StringBuffer s) throws IOException
-    {
-      // Get the data out
-      String buf = s.toString ();
-
-      //this.oStream_.println(buf);
-      this.oStream_.writeChars(buf.toString());
-      this.oStream_.writeChar('\n');
-      this.oStream_.flush ();
-
-      return buf.length ();
-    }
-
-  /**
-   * Send a String. Note that the method blocks.
-   *@param s the String to send
-   *@return the length of the String
-   */
-  public int send (String s) throws IOException
-    {
-      this.oStream_.writeChars(s);
-      this.oStream_.writeChar('\n');
-
-      //this.oStream_.println(s);
-      this.oStream_.flush();
-
-      return s.length ();
-    }
-
-  /** 
-   * Send an array of bytes. Note that the method blocks.
-   *@param b array of bytes to send
-   *@param offset offset into the byte array to start sending from
-   *@param length number of bytes to send
-   *@return number of bytes sent
-   */
-  public int sendN (byte[] b, int offset, int length) throws IOException
-    {
-      this.oStream_.write (b, offset, length);
-      this.oStream_.flush ();
-      return length;
-    }
-
-  /**
-   * Receive data and append it to the StringBuffer that was passed
-   * in. Note that the method blocks.
-   *@param s the StringBuffer to append the result of the recv to
-   *@return the length of the String received
-   */
-  public int recv (StringBuffer s) throws IOException
-    {
-      int len = 0;
-      char in = (char)this.iStream_.readByte();
-
-      while (in != '\n') {
-	s.append(in);
-	in = (char)this.iStream_.readByte();
-	len++;
-      }
-
-      return len;
-    }
-
-  /**
-   * Receive an array of characters. This method blocks until either
-   * all the bytes are read, the end of the stream is detected, or
-   * an exception is thrown.
-   *@param b byte array to receive the data in
-   *@param offset the start offset of the data in the byte array.
-   *@param n number of bytes to receive
-   *@return n
-   */
-  public int recvN (byte[] b, int offset, int n) throws IOException
-    {
-      this.iStream_.readFully (b, offset, n);
-      return n;
-    }
-
-  /**
-   * Set the underlying input stream.
-   *@param iStream the input stream
-   */
-  public void inputStream (InputStream iStream)
-    {
-      this.iStream_ = new DataInputStream(new BufferedInputStream(iStream));
-    }
-
-  /**
-   * Get the underlying input stream.
-   *@return the underlying input stream
-   */
-  public InputStream inputStream ()
-    {
-      return this.iStream_;
-    }
-
-  /**
-   * Set the underlying output stream.
-   *@param iStream the output stream
-   */
-  public void outputStream (OutputStream oStream)
-    {    
-      this.oStream_ = new DataOutputStream(new BufferedOutputStream(oStream));
-    }
-
-  /**
-   * Get the underlying output stream.
-   *@return the underlying output stream
-   */
-  public OutputStream outputStream ()
-    {
-      return this.oStream_;
-    }
-
-  /**
-   * Cleanup when the SOCK Stream is garbage collected.
-   *@exception Throwable (Probably IOException from the socket level)
-   */
-  protected void finalize () throws Throwable
-    {
-      super.finalize ();
-      this.close ();
-    }
-  
-  private Socket socket_;
-
-  // = The input and output streams (by default null)
-  private DataInputStream iStream_;
-  private DataOutputStream oStream_;
-}
diff --git a/java/src/Semaphore.java b/java/src/Semaphore.java
deleted file mode 100644
index 6c5427bb0c0..00000000000
--- a/java/src/Semaphore.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Semaphore.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-class TimedWaitSAdapter extends JACE.ASX.TimedWait
-{
-  TimedWaitSAdapter (Object obj)
-  {
-    super (obj);
-  }
-
-  // Check to see if there are any semaphores available.
-  public boolean condition ()
-  {
-    return this.count_ > 0;
-  }
-
-  // Increment the count by one
-  public void increment ()
-  {
-    this.count_++;
-  }
-
-  // Decrement the count by one
-  public void decrement ()
-  {
-    this.count_--;
-  }
-
-  // Set the count
-  public void count (int c)
-  {
-    this.count_ = c;
-  }
-
-  private int count_ = 0;
-}
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *     Implementation of Dijkstra's counting semaphore in java.
- */
-public class Semaphore
-{  
-  /**
-   * Create a Semaphore.
-   *@param count semaphore count
-   */
-  public Semaphore (int c)
-    {
-      this.monitor_.count (c);
-    }
-
-  /**
-   * Acquire the Semaphore. Note that this will block.
-   *@exception InterruptedException exception during wait
-   */
-  public synchronized void acquire () throws InterruptedException
-    {
-      this.monitor_.timedWait ();
-      this.monitor_.decrement ();
-    }
-
-  /**
-   * Acquire the Semaphore.  Throws a TimeoutException if the semaphore
-   * isn't acquired before the given absolute time.
-   *@param tv time (TimeValue) to wait until before throwing a
-   * TimeoutException (unless the semaphore is acquired before that)
-   *@exception TimeoutException wait timed out exception
-   *@exception InterruptedException exception during wait
-   */
-  public synchronized void acquire (TimeValue tv)
-      throws JACE.ASX.TimeoutException, InterruptedException 
-    {
-      this.monitor_.timedWait (tv);
-      this.monitor_.decrement ();
-    }
-
-  /**
-   * Release the Semaphore.
-   */
-  public synchronized void release ()
-    {
-      this.monitor_.increment ();
-      this.monitor_.signal ();
-    }
-
-  private TimedWaitSAdapter monitor_ = new TimedWaitSAdapter (this);
-  // The monitor (adapter) to wait on
-}
diff --git a/java/src/ServiceConfig.java b/java/src/ServiceConfig.java
deleted file mode 100644
index e749076137b..00000000000
--- a/java/src/ServiceConfig.java
+++ /dev/null
@@ -1,375 +0,0 @@
- /*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceConfig.java
- *
- * Services can be suspended, resumed, removed, and reloaded.  Reloading requires a
- * call to prepareForReload method after removing a service (done in remove()).  You can't access
- * the ServiceObjects that are loaded directly -- anything loaded with a class loader
- * must be wrapped and have its methods called via reflection.  This is because a
- * loaded class doesn't exist in the same space as one loaded with the system loader.
- *
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-
-/**
- * <hr>
- * <p><b>TITLE</b><br>
- *     Provide the base class that supplies common server daemon
- *     operations.  Also provides a global point for interacting with
- *     the service repository.
- */
-public class ServiceConfig
-{
-  /** Begins the process of loading a service configurator file:
-   *  parses the command line and calls processDirectives
-   *
-   *@exception FileNotFoundException Couldn't find service config file
-   *@exception IOException Problem reading or parsing
-   *@exception ClassNotFoundException Couldn't find a certain class
-   *@exception IllegalAccessException Inappropriate method call on a class
-   *@exception InstantiationException Couldn't create a certain class instance
-   */
-  public static int open (String [] args) throws FileNotFoundException, IOException, ClassNotFoundException, IllegalAccessException, InstantiationException
-   {
-     // Parse the command line
-    ServiceConfig.parseArgs (args);
-
-    // Create a repository and class loader
-    if (ServiceConfig.svcRep_ == null)
-      ServiceConfig.svcRep_ = new ServiceRepository ();
-    if (ServiceConfig.loader_ == null)
-      ServiceConfig.loader_ = new ServiceLoader();
-
-    return ServiceConfig.processDirectives ();
-    
-  }
-
-  /** Parses the command line
-    * Valid command line options:
-    * -b             Run as a daemon (not implemented yet)
-    * -d             Debug mode
-    * -n             No defaults
-    * -f <filename>  Load services in the given file [see below for info]
-    *
-    */
-  protected static void parseArgs (String [] args)
-  {
-    GetOpt getopt = new GetOpt (args, "bdnf:");
-    for (int c; (c = getopt.next ()) != -1; )
-      switch (c)
-	{
-	case 'b':
-	  // Note: not supported yet!
-	  ServiceConfig.beADaemon_ = true;
-	  break;
-	case 'd': 
-	  ServiceConfig.debug_ = true;
-	  break;
-	case 'n':
-	  ServiceConfig.noDefaults_ = true;
-	  break;
-	case 'f':
-	  ServiceConfig.serviceConfigFile_ = getopt.optarg ();
-	  break;
-	default:
-	  ACE.ERROR ((char ) c + " is not a ServiceConfig option");
-	  break;
-	}
-  }
-
-  /** Called by ParseNode subclass
-   * Asks the Service Repository to spend a service
-   */
-  public static int suspend (String name)
-  {
-    return svcRep_.suspend(name);
-  }
-
-  /** Called by ParseNode subclass
-   * Asks the Service Repository to resume a service
-   */
-  public static int resume (String name)
-  {
-    return svcRep_.resume(name);
-  }
-
-  /** Called by ParseNode subclass
-   * Asks the Service Repository to remove a service, also calls
-   * prepareForReload so the user doesn't have to.
-   */
-  public static int remove (String name)
-  {
-    int result = svcRep_.remove(name);
-
-    prepareForReload();
-
-    return result;
-  }
-
-  /** Should be called before the user wants to reload
-   * a service.  This calls garbage collection to
-   * (hopefully) obliterate the names of any unused
-   * service classes, and creates a new instance
-   * of the ClassLoader so there won't be problems
-   * reloading.
-   */
-  public static void prepareForReload()
-  {
-    ServiceConfig.loader_ = new ServiceLoader();
-
-    System.gc();
-
-  }
-
-  /**
-   * Parse a service configurator file, creating classes as necessary
-   *
-   * This is getting complicated, but there were too many installation problems when using
-   * CUP and JLex to merit developing a grammar.
-   *
-   * Current formats:
-   *
-   *    load <Service Name> <Full Class Name> Service_Object "<argument list>"
-   *
-   *    resume <Service Name>
-   *    suspend <Service Name>
-   *    remove <Service Name>
-   *
-   *@exception FileNotFoundException Couldn't find the file (default "svc.conf")
-   *@exception IOException Problem reading/parsing 
-   *@exception ClassNotFoundException Couldn't find a certain class
-   *@exception IllegalAccessException Inappropriate method call
-   *@exception InstantiationException Couldn't create a class instance
-   */
-  protected static int processDirectives () throws FileNotFoundException, IOException, ClassNotFoundException, IllegalAccessException, InstantiationException 
-  {
-    if (ServiceConfig.serviceConfigFile_ == null) 
-      ServiceConfig.serviceConfigFile_ = "svc.conf";
-
-    ACE.DEBUG("Processing directives in file " + ServiceConfig.serviceConfigFile_);
-
-    File configFile = new File (ServiceConfig.serviceConfigFile_);
-    
-    // Check if file exists and is a normal file
-    if (!configFile.exists () || !configFile.isFile ())
-      throw new FileNotFoundException ("File " + ServiceConfig.serviceConfigFile_ + " not found");
-    
-    // Check if the file is readable
-    if (!configFile.canRead ())
-      throw new IOException ("File " + ServiceConfig.serviceConfigFile_ + " not readable");
-
-    // Set up the stream
-    FileInputStream fileIn = new FileInputStream (configFile);
-
-    // Parse the file
-    Reader r = new BufferedReader(new InputStreamReader(fileIn));
-    StreamTokenizer in = new StreamTokenizer (r);
-
-    // Set '#' as comment character to be ignored and set '/' as
-    // ordinary character (was original comment character) 
-    //    in.commentChar ('#');
-    in.ordinaryChar ('/');
-
-    // Set characters in ASCII range 33 to 47, ASCII range 91 to 96,
-    // and ASCII range 123 to 126 as ordinary characters
-    in.wordChars ('!', '/');  // ASCII range 33 to 47
-    in.wordChars (':', '@');  // ASCII range 58 to 64
-    in.wordChars ('[', '`');  // ASCII range 91 to 96
-    in.wordChars ('{', '~');  // ASCII range 123 to 126
-
-    String commandName = null;
-    String serviceName = null;
-    String className = null;
-    String classType = null;
-    String args = null;
-    // Create a state machine
-    int state = ServiceConfig.COMMAND_NAME;
-
-    // The apply() method on ParseNode starts the process of actually executing the
-    // desired action (suspend, load, etc)
-    ParseNode result = null;
-
-    while (in.nextToken () != StreamTokenizer.TT_EOF)
-      {
-	switch (state)
-	  {
-	  case ServiceConfig.COMMAND_NAME:
-	    if (in.ttype == StreamTokenizer.TT_WORD) {
-	      commandName = in.sval;
-
-	      // **** This should be changed so that instantiation is only done
-	      // when we find out the type (ServiceObject or something else) a few
-	      // words later.  Right now it works because we only have ServiceObjects
-	      // to load.
-	      if (commandName.equals("load"))
-		result = new AddServiceObjectNode();
-	      else
-	      if (commandName.equals("remove"))
-		result = new RemoveNode();
-	      else
-	      if (commandName.equals("suspend"))
-		result = new SuspendNode();
-	      else
-	      if (commandName.equals("resume"))
-		result = new ResumeNode();
-	      else
-		throw new IOException ("COMMAND NAME missing or invalid: " + commandName);
-
-	      ACE.DEBUG("Command node type: " + ((Object)result).getClass().getName());
-
-
-	    } else
-	      throw new IOException ("Illegal COMMAND NAME argument in file " + ServiceConfig.serviceConfigFile_);
-	    state = ServiceConfig.SERVICE_NAME;
-	    break;
-	  case ServiceConfig.SERVICE_NAME:
-	    if (in.ttype == StreamTokenizer.TT_WORD)
-	      serviceName = in.sval;
-	    else
-	      throw new IOException ("Illegal SERVICE NAME argument in file " + ServiceConfig.serviceConfigFile_);
-
-
-	    if (!commandName.equals("load")) {
-	        result.init(serviceName);
-		result.apply(); 
-		in.whitespaceChars (' ', ' ');
-		state = ServiceConfig.SERVICE_NAME;
-	    } else
-	      state = ServiceConfig.CLASS_NAME;
-	    break;
-	  case ServiceConfig.CLASS_NAME:
-	    if (in.ttype == StreamTokenizer.TT_WORD)
-	      className = in.sval;
-	    else
-	      throw new IOException ("Illegal CLASS NAME argument in file " + ServiceConfig.serviceConfigFile_);
-	    state = ServiceConfig.CLASS_TYPE;
-	    break;
-	  case ServiceConfig.CLASS_TYPE:
-	    // This is only Service_Object or ServiceObject at this time
-	    if (in.ttype == StreamTokenizer.TT_WORD)
-	      classType = in.sval;
-	    else
-	      throw new IOException ("Illegal CLASS TYPE argument in file " + ServiceConfig.serviceConfigFile_);
-	    state = ServiceConfig.ARGS;
-	    // Set space to be an ordinary character to allow
-	    // arguments to be parsed in
-	    in.wordChars (' ', ' ');
-	    break;
-	  case ServiceConfig.ARGS:
-	    ACE.DEBUG("Processing arguments");
-
-	    args = new String("");
-
-	    if (in.ttype == StreamTokenizer.TT_WORD)
-	      {
-		args = in.sval;
-
-		// If just two double quotes, there are no args
-		if (args.length() == 2) {
-		  args = new String("");
-		} else
-		  args = args.substring(1, args.length() - 1);
-	      }
-
-	    // Quick hack until more parsing necessary -- set the needed data
-	    ((AddServiceObjectNode)result).init(serviceName, className, false);
-	    ((AddServiceObjectNode)result).params(args);
-
-	    result.apply();
-
-	    state = ServiceConfig.SERVICE_NAME;
-	    // Set space back to whitespace-character to extract the
-	    // next token
-	    in.whitespaceChars (' ', ' ');
-	    break;
-	  default:
-	    throw new IOException ("Illegal argument in file " + ServiceConfig.serviceConfigFile_);
-	  }
-      }
-    return 0;
-  }
-
-
-  /**
-   * This is called when apply() is called on AddServiceObjectNodes.  Similar
-   * methods could be developed for later data types (AddStreamNode, etc).  This
-   * tries to load the ServiceObject and its classes.  When trying to find info
-   * from the C++ files, this generates possible file paths.
-   */
-  public static int initialize (AddServiceObjectNode son)
-  {
-     Class c = null;
-
-     try {
-
-       c = loader_.loadClass(son.locator(), true);
-
-     } catch (ClassNotFoundException e) {
-       ACE.ERROR("Can't find class with locator: " + son.locator());
-       return -1;
-     }
-
-    try {
-
-      Object service = c.newInstance();
-      // Can't cast this to a ServiceObject, even though it will look just
-      // like one -- Java puts things loaded with a non-standard class loader
-      // in their own name space.  The ServiceObjectRecord is a wrapper that
-      // gets around this by using reflection.
-      ServiceObjectRecord svcObjRec = new ServiceObjectRecord(service, son.name());
-
-      // Split the argument array up into smaller pieces
-      String [] argArray = OS.createStringArray (son.params(), " ");
-
-      // Initialize the service -- start it running
-      svcObjRec.init(argArray);
-
-      // Put it in the service repository
-      svcRep_.insert((ServiceRecord)svcObjRec);
-
-    } catch (IllegalAccessException e) {
-        ACE.ERROR("Error " + e);
-	return -1;
-    } catch (InstantiationException e) {
-        ACE.ERROR("Error " + e);
-	return -1;
-    }
-
-    return 0;
-  }
-
-  // Set by command line options
-  private static boolean beADaemon_ = false;
-  private static boolean debug_ = false;
-  private static boolean noDefaults_ = false;
-
-  public static String serviceConfigFile_ = "svc.conf";
-
-  private static ServiceRepository svcRep_ = null;
-  private static ServiceLoader loader_ = null;
-
-  // States for the state-machine used in parsing the config file
-  private final static int SERVICE_NAME = 0;
-  private final static int CLASS_NAME = 1;
-  private final static int CLASS_TYPE = 2;
-  private final static int ARGS = 3;
-  private final static int COMMAND_NAME = 4;
-
-
-}
-
-
-
diff --git a/java/src/ServiceLoader.java b/java/src/ServiceLoader.java
deleted file mode 100644
index 86f15dc57c9..00000000000
--- a/java/src/ServiceLoader.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceLoader.java
- * 
- * Implementation of a ClassLoader  
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-
-public class ServiceLoader extends ClassLoader
-{
-  /**
-   * Constructor
-   */
-  public ServiceLoader ()
-  {
-    super ();
-    this.getClassPath ();
-  }
-
-  /**
-   * Searches the class path for a given file
-   *
-   *@param filename     File name to look for
-   *@return             Returns the absolute path to the file
-   *                    (useful for package name)
-   */
-  public String findFileInClasspath (String filename) 
-  {
-    // Checks for the given name across the classpath
-    StringTokenizer tokens = new StringTokenizer (this.classPath_,
-						  this.pathSeparator_);
-
-    while (tokens.hasMoreTokens()) 
-      {
-	String fn = tokens.nextToken() + this.fileSeparator_ + filename;
-
-	File f = new File (fn);
-
-	if (f.exists() && f.isFile() && f.canRead())
-	  return new String(f.getAbsolutePath());
-      }
-
-    return null;
-  }
-
-  /**
-   * Load a class from across the network 
-   *@exception ClassNotFoundException Couldn't find the class
-   */
-  public Class loadClass (URL url, boolean resolve) throws ClassNotFoundException
-  {
-    Class newClass = null;
-
-    // Extract the name of the class from the URL
-
-    String className = url.getFile();
-
-    // Remove any directory information
-    int idx = className.lastIndexOf("/");
-    if (idx != -1)
-      className = className.substring(idx + 1);
-
-    // Get rid of the class suffix
-    idx = className.lastIndexOf(".class");
-    if (idx != -1)
-      className = className.substring(0, idx);
-
-    ACE.DEBUG("The name of the class about to load is " + className);
-
-    // Try to load it the class by reading in the bytes.
-    // Note that we are not catching ClassNotFoundException here
-    // since our caller will catch it.
-    try
-      {
-	URLConnection urlConnection = url.openConnection ();
-
-	// Get the input stream associated with the URL connection and
-	// pipe it to a newly created DataInputStream
-	DataInputStream i = new DataInputStream (urlConnection.getInputStream ());
-
-	// Allocate a buffer big enough to hold the contents of the
-	// data we are about to read
-	byte [] buf = new byte [urlConnection.getContentLength ()];
-
-	// Now read all the data into the buffer
-	i.readFully (buf);
-
-	newClass = defineClass (className, buf, 0, buf.length);
-	//	    ACE.DEBUG ("Loaded class: "+ name);
-	    
-	// Check if we need to load other classes referred to by this class.
-	if (resolve)
-	  resolveClass (newClass);
-      }
-    catch (IOException e)
-      {
-	throw new ClassNotFoundException (e.toString ());
-      }
-    return newClass;
-  }
-
-
-  /**
-   * Load a class file:
-   *
-   * @param fn       A file name WITHOUT the .class extension
-   * @param resolve  Standard resolve flag -- user should set to true
-   *
-   * @return   A Class file capable of creating quasi-useful instances
-   *           of the loaded class.  They can't exist in the normal
-   *           Java space, though, so it's impossible to cast them
-   *           to something useful.  Use a wrapper and reflection
-   *           as in ServiceRecords.
-   *@exception ClassNotFoundException Couldn't find the class
-   */
-  public Class loadClass (String fn, boolean resolve) throws ClassNotFoundException
-  {
-    Class newClass;
-
-    // Load built-in java classes with the system loader
-    if (fn.startsWith("java")) {
-      newClass = findSystemClass(fn);
-      if (newClass == null)
-	throw (new ClassNotFoundException());
-      else
-	return newClass;
-    }
-
-    // If given a dot separated qualified name, put it in OS path format.
-    // This assumes the file separator is one char
-    String str = new String(fn);
-    if (str.indexOf('.') >= 0)
-      str = str.replace('.', this.fileSeparator_.charAt(0));
-    str = str + ".class";
-    
-    // Search the class path for the given file name
-    String fullname = this.findFileInClasspath(str);
-    if (fullname == null) {
-      
-      // If we can't find the class file, see if the
-      // system can
-      if ((newClass = findSystemClass(fn)) != null) {
-	return newClass;
-      } else 
-	throw (new ClassNotFoundException());
-    }
-
-    try
-      {
-	// Try to load it the class by reading in the bytes.
-	// Note that we are not catching ClassNotFoundException here
-	// since our caller will catch it.
-	try
-	  {
-	    byte[] buf = bytesForClass (fullname);
-
-	    // ***** Note *****
-	    // This looks inside the class file and digs up the true
-	    // fully qualified class name.  You need this to
-	    // load the class!
-	    String className = ClassReader.getClassName(fullname);
-
-	    if (className != null) {
-	      ACE.DEBUG("Defining class with name: " + className);
-	      newClass = defineClass (className, buf, 0, buf.length);
-	    } else {
-	      // Try it anyway
-	      newClass = defineClass (null, buf, 0, buf.length);
-	     
-	      ACE.ERROR("Unknown class name");
-	    }  
-
-	    // Check if we need to load other classes referred to by this class.
-	    if (resolve)
-	      resolveClass (newClass);
-	  	  
-	  } catch (ClassNotFoundException e) {
-	  
-	    ACE.DEBUG ("Using default loader for class: " + fn);
-
-	    if ((newClass = findSystemClass (fn)) != null)
-	      return newClass;
-	    else 
-	      throw (e);   // Rethrow the exception
-	  }
-      }
-    catch (IOException e)
-      {
-	throw new ClassNotFoundException (e.toString ());
-      }
-
-    return newClass;
-  }
-
-  /**
-   * Get system properties for later use
-   */
-  private void getClassPath ()
-  {
-    // Cache system properties that are needed when trying to find a
-    // class file
-    this.classPath_     = System.getProperty ("java.class.path", ".");
-    this.pathSeparator_ = System.getProperty ("path.separator", ":");
-    this.fileSeparator_ = System.getProperty ("file.separator", "/");
-  }
-
-  /**
-   * Read file into a byte array
-   */
-  private byte[] bytesForClass (String name) throws IOException, ClassNotFoundException
-  {
-    // Set up the stream
-    FileInputStream in = new FileInputStream (name);
-
-    // Get byte count
-    int length = in.available ();
-	    
-    if (length == 0)
-      throw new ClassNotFoundException (name);
-
-    // Create an array of bytes to read the file in
-    byte[] buf = new byte[length];
-
-    // Read the file
-    in.read (buf);
-
-    // Return byte array
-    return buf;
-  }
-
-  private String classPath_;
-  // Class path that is loaded at construction
-
-  private String pathSeparator_;
-  // Platform-dependent path separator (e.g., : or ;)
-
-  private String fileSeparator_;
-  // Platform-dependent file separator (e.g., / or \)
-
-  private String context_ = null;
-}
-
-
-
-
-
-
diff --git a/java/src/ServiceObject.java b/java/src/ServiceObject.java
deleted file mode 100644
index faf5a28daa4..00000000000
--- a/java/src/ServiceObject.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceObject.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class ServiceObject implements EventHandler
-{
-  /**
-   * Initialize object when dynamic loading occurs. Overwrite this
-   * method to do anything useful. 
-   *@return -1 (default implementation)
-   */
-  public int init (String [] args)
-  {
-    return -1;
-  }
-
-  /** 
-   * Terminate the object. Note that an object can not be explicitly
-   * unloaded. Overwrite this method to do anything useful.
-   *@return -1 (default implementation)
-   */
-  public int fini ()
-  {
-    return -1;
-  }
-
-  /**
-   * Get information on an active object. Overwrite this method to do
-   * anything useful. 
-   *@return null (default implementation)
-   */
-  public String info ()
-  {
-    return null;
-  }
-
-  /** 
-   * Called when timer expires. Overwrite this method to do
-   * anything useful. 
-   *@param tv Time Value for when timer expired
-   *@param obj An arbitrary object that was passed to the Timer Queue
-   * (Asynchronous Completion Token)
-   *@return -1
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return -1;
-  }
-
-  /**
-   * Request that this service suspend activity.  Overwrite this
-   * method to do anything useful.
-   */
-  public int suspend () 
-  {
-    return -1;
-  }
-
-  /**
-   * Request that this service resume activity.  Overwrite this
-   * method to do anything useful.
-   */
-  public int resume ()
-  {
-    return -1;
-  }
-}
diff --git a/java/src/ServiceObjectRecord.java b/java/src/ServiceObjectRecord.java
deleted file mode 100644
index 282d4360fbf..00000000000
--- a/java/src/ServiceObjectRecord.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceObjectRecord.java
- *
- * Provided to show future symmetry.  ServiceRecord currently
- * provides all the desired behavior necessary for a record
- * of a ServiceObject, but later there could be ModuleRecords,
- * etc.
- *
- *@see JACE.ServiceConfigurator.ServiceRecord;
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-public class ServiceObjectRecord extends ServiceRecord
-{
-  public ServiceObjectRecord (Object so, String name)
-  {
-    super (so, name);
-  }
-
-};
-
-
-
-
-
diff --git a/java/src/ServiceRecord.java b/java/src/ServiceRecord.java
deleted file mode 100644
index e0bd75a1405..00000000000
--- a/java/src/ServiceRecord.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceRecord.java
- *
- * This class structure is used in the ServiceRepository.  Each service
- * object, module, or stream in the repository should be wrapped by a
- * type of ServiceRecord.  The contained object does the real work.
- *
- * Modules and Streams will require records with more functionality.
- *
- * The caller should never be allowed to access the Object within the
- * record -- casting will result in a ClassCastException because of
- * the problem with loading classes with a ClassLoader.  To get
- * around this, all the method calls are made on the Object via
- * reflection.
- *
- *@see JACE.ServiceConfigurator.ServiceObject
- *@see JACE.ServiceConfigurator.ServiceRepository
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.lang.reflect.*;
-import JACE.OS.*;
-
-public class ServiceRecord
-{
-  /** 
-   * Constructor
-   *
-   *@param  service   A java Object, the service
-   *@param  name      Name of this service
-   */
-  ServiceRecord (Object service, String name) 
-  {
-    this.service_ = service;
-    this.name_ = name;
-    this.suspended_ = false;
-  }
-
-  /**
-   * Forward the call to suspend
-   * @return -1 error
-   */
-  public int suspend()
-  {
-    this.setSuspend(true);
-
-    Object result = this.invokeSimpleReflected("suspend");
-    
-    if (result == null)
-      return -1;
-    else
-      return ((Integer)result).intValue();
-  }
-
-
-  /**
-   * Forward the call to resume
-   * @return -1 error
-   */
-  public int resume()
-  {
-    this.setSuspend(false);
-
-    Object result = this.invokeSimpleReflected("resume");
-
-    if (result == null)
-      return -1;
-    else
-      return ((Integer)result).intValue();
-  }
-
-
-  /** 
-   *  Initialize the service, provide the given command line args to it.
-   *  
-   */
-  public int init(String [] args)
-  {
-    Class types[] = new Class[1];
-    if (args == null)
-      args = new String[0];
-
-    types[0] = args.getClass();
-
-    // Find the method we want to call
-    Method m;
-    try {
-      m = this.object().getClass().getMethod("init", types);
-    } catch (NoSuchMethodException e) {
-      ACE.ERROR("" + e);
-      return -1;
-    } catch (SecurityException e) {
-      ACE.ERROR("" + e);
-      return -1;
-    }
-
-    Class ptypes[] = m.getParameterTypes();
-    //for (int x = 0; x < ptypes.length; x++) 
-    //  System.err.println(ptypes[x].getName());
-    Object params[] = new Object[1];
-
-    params[0] = args;
-
-    int result = -1;
-    try {
-      result = ((Integer)m.invoke(this.object(), params)).intValue();
-    } catch (IllegalAccessException e) {
-      ACE.ERROR("" + e);
-      return -1;
-    } catch (IllegalArgumentException e) {
-      ACE.ERROR("" + e);
-      return -1;
-    } catch (InvocationTargetException e) {
-      ACE.ERROR("init(): " + e.getTargetException());
-      return -1;
-    }
-
-    return result;
-  }
-
-  /**
-   * Prepare to close it
-   */
-  public int fini()
-  {
-    Object result = this.invokeSimpleReflected("fini");
-
-    if (result == null)
-      return -1;
-    else
-      return ((Integer)result).intValue();
-  }
-
-  /** 
-   * Obtain information about this service
-   */
-  public String info()
-  {
-    Object result = this.invokeSimpleReflected("info");
-
-    if (result == null)
-      return null;
-    else
-      return new String((String)result);  
-  }
-
-  /** Invokes the method with the given name on the ServiceObject.
-   * The invoked method must take no parameters for this to work.
-   * Could be adjusted to throw a generic exception.
-   */
-  private Object invokeSimpleReflected(String name) 
-  {
-    Method m;
-
-    // find the desired method
-    try {
-      m = this.object().getClass().getMethod(name, null);
-    } catch (NoSuchMethodException e) {
-      ACE.ERROR("" + e);
-      return null;
-    } catch (SecurityException e) {
-      ACE.ERROR("" + e);
-      return null;
-    }
-
-    // Invoke it
-    Object result = null;
-    
-    try {
-      result = m.invoke(this.object(), null);
-    } catch (IllegalAccessException e) {
-      ACE.ERROR("" + e);
-    } catch (IllegalArgumentException e) {
-      ACE.ERROR("" + e);
-    } catch (InvocationTargetException e) {
-      ACE.ERROR(name + "(): " + e.getTargetException());
-    }
-
-    return result;
-  }
-
-  /**
-   * Accessor for the name
-   */
-  public String name()
-  {
-    return new String(this.name_);
-  }
-
-  /** Set the name of the service
-   */
-  public void name(String name)
-  {
-    this.name_ = name;
-  }
-
-  /** Is this service suspended?
-   */
-  public boolean suspended() 
-  {
-    return this.suspended_;
-  }
-
-  /** Set the suspended flag
-   */
-  void setSuspend (boolean suspended)
-  {
-    this.suspended_ = suspended;
-  }
-
-  /** Accessor for the contained Object.  This should
-   *  never be available to the end user since they
-   *  might try casting the result.
-   */
-  Object object()
-  {
-    return this.service_;
-  }
-
-  /**
-   * Set the contained object
-   */
-  void object(Object service)
-  {
-    this.service_ = service;
-  }
-
-  Object service_;
-  String name_;
-  boolean suspended_;
-};
-
-
-/*
-class ModuleRecord extends ServiceRecord
-{
-};
-
-class StreamRecord extends ServiceRecord
-{
-};
-*/
-
-
diff --git a/java/src/ServiceRepository.java b/java/src/ServiceRepository.java
deleted file mode 100644
index 4190646d213..00000000000
--- a/java/src/ServiceRepository.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    ServiceRepository.java
- *
- * The service repository stores the network services, allowing them to be removed, suspended,
- * resumed, etc.  To reload a service, ServiceConfig.prepareForReload() must be called.  This is
- * already done in the ServiceConfig.remove method.
- *
- *@see JACE.ServiceConfigurator.ServiceRecord;
- *@see JACE.ServiceConfigurator.ServiceConfig;
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import java.util.*;
- 
-public class ServiceRepository
-{
-  /**
-   * Constructor
-   */
-  public ServiceRepository ()
-  {
-    this.serviceVector_ = new Vector();
-  }
-
-  /**
-   * Constructor
-   *
-   *@param initialSize    Initial vector size for the repository
-   */
-  public ServiceRepository (int initialSize)
-  {
-    this.serviceVector_ = new Vector (initialSize);
-  }
-
-  /**
-   *  Shut down all the services, closing them in reverse order of insertion
-   *  
-   *  Maybe should be called by finalize?
-   */
-  public int close() 
-  { 
-    for (int i = this.size() - 1; i >= 0; i--) {
-      ServiceRecord  rec = (ServiceRecord)this.serviceVector_.elementAt(i);
-
-      rec.fini();
-
-      this.serviceVector_.removeElementAt(i);
-    }
-
-    return 0;
-  }
-
-  /**
-   * Insert a ServiceRecord into the repository.
-   * (If already in, calls fini() and replaces)
-   *
-   *@param srvRec      ServiceRecord to add
-   */
-  public void insert (ServiceRecord srvRec)
-  {
-    ServiceRecord alreadyIn = find(srvRec.name());
-
-    // Replace the service
-    if (alreadyIn != null) {
-      alreadyIn.fini();
-      this.serviceVector_.removeElement(alreadyIn);
-    }
-
-    this.serviceVector_.addElement(srvRec);
-  }
-
-  /**
-   * Finds the ServiceRecord associated with a given
-   * service name.  Note -- the user should not try to
-   * get a ServiceObject out of the ServiceRecord.
-   * Same as saying ignoreSuspended is false on the
-   * next method.
-   *
-   *@param name    Name of the service to find
-   */
-  public ServiceRecord find (String name)
-  {
-    return this.find(name, false);
-  }
-
-  /** Return the service record for the given service.  The caller
-    * should NOT try to access a ServiceObject (or Module or Stream)
-    * by taking it out of the ServiceRecord -- just make the calls
-    * through the record!
-    *
-    *@param   name             Name of the service to find
-    *@param   ignoreSuspended  Allow finding suspended services?
-    */
-  public ServiceRecord find (String name, boolean ignoreSuspended)
-  {
-    ServiceRecord rec;
-
-    for (int i = 0; i < this.size(); i++) {
-      rec = (ServiceRecord)this.serviceVector_.elementAt(i);
-
-      if ((rec.name().equals(name)) && ((!ignoreSuspended) || (!rec.suspended())))
-	return rec;
-    }
-
-    return null;
-  }
-
-  /** Take the given service out of the repository.  This also sets the
-   * reference in the repository to null to ensure there are no
-   * hidden references to the old ServiceObject.  To reload, the
-   * ServiceConfig.prepareToReload method must be called.  This is already
-   * done in the ServiceConfig.remove method.
-   */
-  public int remove (String name)
-  {
-    ServiceRecord rec = this.find(name, false);
-
-    if (rec == null)
-      return -1;
-
-    int index = this.serviceVector_.indexOf(rec);
-
-    // Shut down the service
-    rec.fini();
-
-    // Make sure there are no hidden references left
-    this.serviceVector_.setElementAt(null, index);
-
-    this.serviceVector_.removeElementAt(index);
-
-    return 0;
-  }
-
-  /**
-   * Resume a suspended service
-   *@param name    Name of the service to resume
-   */
-  public int resume (String name)
-  {
-    ServiceRecord rec = this.find(name, false);
-
-    if (rec == null)
-      return -1;
-
-    return rec.resume();
-  }
-
-  /**
-   * Suspend a service
-   *@param name    Name of the service to suspend
-   */
-  public int suspend (String name)
-  {
-    ServiceRecord rec = this.find(name, true);
-
-    if (rec == null)
-      return -1;
-
-    return rec.suspend();
-  }
-
-  /**
-   * Returns the number of items in the repository
-   */
-  public int size ()
-  {
-    return this.serviceVector_.size();
-  }
-
-  // Vector representation
-  Vector serviceVector_;
-};
-  
-
-
-  
-
-  
-
-  
diff --git a/java/src/StrategyAcceptor.java b/java/src/StrategyAcceptor.java
deleted file mode 100644
index d73c7b93006..00000000000
--- a/java/src/StrategyAcceptor.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    StrategyAcceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-public class StrategyAcceptor
-{
-  /**
-   * Create an instance of StrategyAcceptor.
-   *@param handlerFactory Svc Handler factory that is used to create
-   * an instance of a Svc Handler when a connection is accepted.
-   */
-  public StrategyAcceptor (Class handlerFactory)
-    {
-      this (handlerFactory, null, null, null);
-    }
-
-  /**
-   * Create an instance of StrategyAcceptor. Use the creation
-   * strategy and the handlerFactory passed in to creae a new instance
-   * of the Svc Handler.
-   *@param handlerFactory Svc Handler factory that is used to create
-   * an instance of a Svc Handler when a connection is accepted.
-   *@param creStrategy Creation strategy to use to create a new
-   * instance of the Svc Handler.
-   *@param acceptStrategy Accept strategy to use to accept a new
-   * connection into the Svc Handler.
-   *@param activateStrategy Activate strategy to use to activate the
-   * instance of the Svc Handler.
-   */
-  public StrategyAcceptor (Class handlerFactory,
-			    CreationStrategy creStrategy,
-			    AcceptStrategy acceptStrategy,
-			    ActivateStrategy activateStrategy)
-    {
-      // Cache everything
-      this.handlerFactory_ = handlerFactory;
-      this.creStrategy_ = creStrategy;
-      this.acceptStrategy_ = acceptStrategy;
-      this.activateStrategy_ = activateStrategy;
-    }
-
-  /**
-   * Initialize the Strategy Acceptor. The method creates the
-   * appropriate strategies as needed.
-   *@param port port number where the server will listen for connections
-   *@exception IOException Socket level error
-   */
-  public void open (int port) throws IOException
-    {
-      if (this.creStrategy_ == null)
-	this.creStrategy_ = new CreationStrategy (this.handlerFactory_);
-      if (this.acceptStrategy_ == null)
-	this.acceptStrategy_ = new AcceptStrategy (port);
-      else
-	this.acceptStrategy_.open (port);
-      if (this.activateStrategy_ == null)
-	this.activateStrategy_ = new ActivateStrategy ();
-    }
-
-  /**
-   * Accept a connection using the appropriate strategies.
-   *
-   *@exception SocketException Socket level error
-   *@exception InstantiationException Problem creating a handler
-   *@exception IllegalAccessException No strategy available
-   *@exception IOException Socket level error
-   */
-  public void accept () throws SocketException, 
-      InstantiationException, 
-      IllegalAccessException,
-      IOException
-  {
-    // Create a Svc_Handler using the appropriate Creation_Strategy
-    SvcHandler sh = this.makeSvcHandler ();
-
-    // Accept a connection into the Svc_Handler
-    this.acceptSvcHandler (sh);
-
-    // Activate the Svc_Handler
-    this.activateSvcHandler (sh);
-  }
-
-  /**
-   * Bridge method for creating a SvcHandler.  The strategy for
-   * creating a SvcHandler is configured into the Acceptor via it's
-   * creStrategy_.  If no strategy is passed in, the default behavior
-   * of this method is to use the default CreationStrategy.
-   *@return a new instance of the Svc Handler
-   *@exception InstantiationException Couldn't create SvcHandler
-   *@exception IllegalAccessException No strategy available
-   */
-  protected SvcHandler makeSvcHandler () throws InstantiationException, IllegalAccessException
-    {
-      // Create a new handler for the connection
-      return this.creStrategy_.makeSvcHandler ();
-    }
-
-
-  /**
-   * Bridge method for accepting the new connection into the
-   * <SvcHandler>.  The strategy for accepting into a SvcHandler is
-   * configured into the Acceptor via it's acceptStrategy_.  If no
-   * strategy is passed in, the default behavior of this method is to
-   * use the default AcceptStrategy. 
-   *@param sh Svc Handler in which to accept the connection
-   *@return result of accepting a connection using the accept strategy
-   *@exception SocketException Socket level error
-   *@exception IOException Socket level error
-   */
-  protected int acceptSvcHandler (SvcHandler sh) throws SocketException, IOException
-  {
-    // Delegate responsibility to the appropriate strategy
-    return this.acceptStrategy_.acceptSvcHandler (sh);
-  }
-  
-  /**
-   * Bridge method for activating a <SvcHandler>.  The strategy for
-   * activating a SvcHandler is configured into the Acceptor via it's
-   * activateStrategy_. If no strategy is passed in, the default
-   * behavior of this method is to use the default ActivateStrategy.
-   *@param sh Svc Handler to activate
-   *@return result of activating the Svc Handler
-   */
-  protected int activateSvcHandler (SvcHandler sh)
-    {
-      // Delegate responsibility to the appropriate strategy
-      return this.activateStrategy_.activateSvcHandler (sh);
-    }
-
-  // Handler class that should be instantiated when a connection is
-  // made with a client
-  private Class handlerFactory_;
-
-  // Creation Strategy
-  private CreationStrategy creStrategy_;
-
-  // Accept Strategy
-  private AcceptStrategy acceptStrategy_;
-
-  // Activation Strategy
-  private ActivateStrategy activateStrategy_;
-}
diff --git a/java/src/Stream.java b/java/src/Stream.java
deleted file mode 100644
index 3c67efef220..00000000000
--- a/java/src/Stream.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    Stream.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     This class is the primary abstraction for the ASX framework.
- *     It is moduled after System V Stream.
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *   A Stream consists of a stack of <Modules>, each of which
- *   contains two <Tasks>.
- *</blockquote>
- */
-
-public class Stream
-{
-
-  public Stream ()
-  {
-    this (null, null, null);
-  }
-
-  // Create a Stream consisting of <head> and <tail> as the Stream
-  // head and Stream tail, respectively.  If these are 0 then the
-  // <ACE_Stream_Head> and <ACE_Stream_Tail> are used, respectively.
-  // <arg> is the value past in to the open() methods of the tasks.
-
-  public Stream (Object a,
-		 Module head,
-		 Module tail)
-  {
-    this.linkedUs_ = null;
-    // this.final_close_ = this.lock_;
-
-    if (this.open (a, head, tail) == -1)
-      ACE.ERROR ("open" + head.name () + " " +  tail.name ());
-  }
-
-  public int push (Module newTop)
-  {
-    if (this.pushModule  (newTop, 
-			  this.streamHead_.next (), 
-			  this.streamHead_) == -1)
-      return -1;
-    else
-      return 0;
-  }
-
-    // Note that the timeout tv is absolute time
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    return this.streamHead_.writer ().put (mb, tv);
-  }
-
-    // Note that the timeout tv is absolute time
-  public MessageBlock get (TimeValue tv) throws InterruptedException
-  {
-    return this.streamHead_.reader ().getq (tv);
-  }
-
-// Return the "top" ACE_Module in a ACE_Stream, skipping over the
-// stream_head.
-
-  public Module top ()
-  {
-    if (this.streamHead_.next () == this.streamTail_)
-      return null;
-    else
-      return this.streamHead_.next ();
-  }
-
-// Remove the "top" ACE_Module in a ACE_Stream, skipping over the
-// stream_head.
-
-  public int pop (long flags)
-  {
-    if (this.streamHead_.next () == this.streamTail_)
-      return -1;
-    else
-      {
-	// Skip over the ACE_Stream head.
-	Module top = this.streamHead_.next ();
-	Module newTop = top.next ();
-
-	this.streamHead_.next (newTop);
-
-	// Close the top ACE_Module.
-
-	top.close (flags);
-
-	this.streamHead_.writer ().next (newTop.writer ());
-	newTop.reader ().next (this.streamHead_.reader ());
-
-	return 0;
-      }
-  }
-
-// Remove a named ACE_Module from an arbitrary place in the
-// ACE_Stream.
-
-  public int remove (String name, long flags)
-  {
-    Module prev = null;
-
-    for (Module mod = this.streamHead_; 
-	 mod != null; mod = mod.next ())
-      if (name.compareTo (mod.name ()) == 0)
-	{
-	  if (prev == null) // Deleting ACE_Stream Head
-	    this.streamHead_.link (mod.next ());
-	  else
-	    prev.link (mod.next ());
-	  
-	  mod.close (flags);
-	  return 0;
-	}
-      else
-	prev = mod;
-
-    return -1;
-  }
-
-  public Module find (String name)
-  {
-    for (Module mod = this.streamHead_; 
-	 mod != null; 
-	 mod = mod.next ())
-      if (name.compareTo (mod.name ()) == 0)
-	return mod;
-
-    return null;
-  }
-
-// Actually push a module onto the stack...
-
-  private int pushModule (Module newTop, 
-			  Module currentTop, 
-			  Module head)
-  {
-    Task ntReader = newTop.reader ();
-    Task ntWriter = newTop.writer ();
-    Task ctReader = null;
-    Task ctWriter = null;
-
-    if (currentTop != null)
-      {
-      ctReader = currentTop.reader ();
-      ctWriter = currentTop.writer ();
-      ctReader.next (ntReader);
-      }
-
-    ntWriter.next (ctWriter);
-
-    if (head != null)
-      {
-	if (head != newTop)
-	  head.link (newTop);
-      }
-    else
-      ntReader.next (null);
-
-    newTop.next (currentTop);
-
-    if (ntReader.open (newTop.arg ()) == -1)
-      return -1;
-
-    if (ntWriter.open (newTop.arg ()) == -1)
-      return -1;
-    return 0;
-  }
-
-  public synchronized int open (Object a, 
-				Module head, 
-				Module tail)
-  {
-    Task h1 = null, h2 = null;
-    Task t1 = null, t2 = null;
-
-    if (head == null)
-      {
-	h1 = new StreamHead ();
-	h2 = new StreamHead ();
-	head = new Module ("ACEStreamHead", h1, h2, a);
-      }
-
-    if (tail == null)
-      {
-	t1 = new StreamTail ();
-	t2 = new StreamTail ();
-	tail = new Module ("ACEStreamTail", 
-			   t1, t2, a);
-      }
-
-    // Make sure *all* the allocation succeeded!
-    if (h1 == null || h2 == null || head == null
-	|| t1 == null || t2 == null || tail == null)
-      {
-      // Close up!
-	head.close (0);
-	tail.close (0);
-	return -1;
-      }
-
-    this.streamHead_ = head;
-    this.streamTail_ = tail;
-
-    if (this.pushModule (this.streamTail_,
-			 null, null) == -1)
-      return -1;
-    else if (this.pushModule (this.streamHead_, 
-			      this.streamTail_, 
-			      this.streamHead_) == -1)
-      return -1;
-    else
-      return 0;
-  }
-
-  public synchronized int close (long flags)
-  {
-    if (this.streamHead_ != null
-	&& this.streamTail_ != null)
-      {
-	// Don't bother checking return value here.
-	this.unlinkInternal ();
-
-	int result = 0;
-
-	// Remove and cleanup all the intermediate modules.
-
-	while (this.streamHead_.next () != this.streamTail_)
-	  {
-	    if (this.pop (flags) == -1)
-	      result = -1;
-	  }
-  
-	// Clean up the head and tail of the stream.
-	if (this.streamHead_.close (flags) == -1)
-	  result = -1;
-	if (this.streamTail_.close (flags) == -1)
-	  result = -1;
-
-	this.streamHead_ = null;
-	this.streamTail_ = null;
-
-	// Tell all threads waiting on the close that we are done.
-	//      this.final_close_.broadcast ();
-	return result;
-      }
-    return 0;
-  }
-
-  public int control (int cmd, Object a) throws InterruptedException
-  {
-    IOCntlMsg ioc = new IOCntlMsg (cmd);
-
-    // Create a data block that contains the user-supplied data.
-    MessageBlock db = 
-      new MessageBlock (MessageType.MB_IOCTL, 
-			null, 
-			a);
-
-    // Create a control block that contains the control field and a
-    // pointer to the data block.
-    MessageBlock cb = 
-      new MessageBlock (MessageType.MB_IOCTL, 
-			db, 
-			(Object) ioc);
-
-    int result = 0;
-
-    if (this.streamHead_.writer ().put (cb, null) == -1)
-      result = -1;
-    else if ((cb = this.streamHead_.reader ().getq (null)) == null)
-      result = -1;
-    else
-      result = ((IOCntlMsg ) cb.obj ()).rval ();
-
-    return result;
-  }
-
-// Link two streams together at their bottom-most Modules (i.e., the
-// one just above the Stream tail).  Note that all of this is premised
-// on the fact that the Stream head and Stream tail are non-NULL...
-// This must be called with locks held.
-
-  private int linkInternal (Stream us)
-  {
-    this.linkedUs_ = us;
-    // Make sure the other side is also linked to us!
-    us.linkedUs_ = this;
-
-    Module myTail = this.streamHead_;
-
-    if (myTail == null)
-      return -1;
-
-    // Locate the module just above our Stream tail. 
-    while (myTail.next () != this.streamTail_)
-      myTail = myTail.next ();
-
-    Module otherTail = us.streamHead_;
-
-    if (otherTail == null)
-      return -1;
-
-  // Locate the module just above the other Stream's tail.
-    while (otherTail.next () != us.streamTail_)
-      otherTail = otherTail.next ();
-
-    // Reattach the pointers so that the two streams are linked!
-    myTail.writer ().next (otherTail.reader ());
-    otherTail.writer ().next (myTail.reader ());
-    return 0;
-  }
-
-  public synchronized int link (Stream us)
-  {
-    return this.linkInternal (us);
-  }  
-
-// Must be called with locks held...
-
-  private int unlinkInternal ()
-  {
-  // Only try to unlink if we are in fact still linked!
-    
-    if (this.linkedUs_ != null)
-    {
-      Module myTail = this.streamHead_;
-
-      // Only relink if we still exist!
-      if (myTail != null)
-	{
-	  // Find the module that's just before our stream tail.
-	  while (myTail.next () != this.streamTail_)
-	    myTail = myTail.next ();
-
-	  // Restore the writer's next() link to our tail.
-	  myTail.writer ().next (this.streamTail_.writer ());
-	}
-
-      Module otherTail = this.linkedUs_.streamHead_;
-
-      // Only fiddle with the other side if it in fact still remains.
-      if (otherTail != null)
-	{
-	  while (otherTail.next () != this.linkedUs_.streamTail_)
-	    otherTail = otherTail.next ();
-
-	  otherTail.writer ().next (this.linkedUs_.streamTail_.writer ());
-	  
-	}
-
-      // Make sure the other side is also aware that it's been unlinked!
-      this.linkedUs_.linkedUs_ = null;
-
-      this.linkedUs_ = null;
-      return 0;
-    }
-    else
-      return -1;
-  }
-
-  public synchronized int unlink ()
-  {
-    return this.unlinkInternal ();
-  }
-
-  public void dump ()
-  {
-    ACE.DEBUG ("-------- module links --------");
-
-    for (Module mp = this.streamHead_; ; mp = mp.next ())
-      {
-	ACE.DEBUG ("module name = " + mp.name ());
-	if (mp == this.streamTail_)
-	  break;
-      }
-    
-    ACE.DEBUG ("-------- writer links --------");
-    
-    Task tp;
-    
-    for (tp = this.streamHead_.writer (); ; tp = tp.next ())
-      {
-	ACE.DEBUG ("writer queue name = " + tp.name ());
-	tp.dump ();
-	ACE.DEBUG ("-------\n");
-	if (tp == this.streamTail_.writer ()
-	    || (this.linkedUs_ != null && tp == this.linkedUs_.streamHead_.reader ()))
-	  break;
-      }
-
-    ACE.DEBUG ("-------- reader links --------\n");
-    for (tp = this.streamTail_.reader (); ; tp = tp.next ())
-      {
-	ACE.DEBUG ("reader queue name = " + tp.name ());
-	tp.dump ();
-	ACE.DEBUG ("-------\n");
-	if (tp == this.streamHead_.reader ()
-	    || (this.linkedUs_ != null && tp == this.linkedUs_.streamHead_.writer ()))
-	  break;
-      }
-  }
-
-  Module streamHead_ = null;
-  // Pointer to the head of the stream.
-
-  Module streamTail_ = null;
-  // Pointer to the tail of the stream.
-
-  Stream linkedUs_ = null;
-  // Pointer to an adjoining linked stream.
-
-  // = Synchronization objects used for thread-safe streams.
-  //  ACE_SYNCH_MUTEX lock_;
-  // Protect the stream against race conditions.
-  
-  //  ACE_SYNCH_CONDITION final_close_;
-  // Use to tell all threads waiting on the close that we are done.
-
-}
-
-
diff --git a/java/src/StreamHead.java b/java/src/StreamHead.java
deleted file mode 100644
index fc4419d819e..00000000000
--- a/java/src/StreamHead.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    StreamHead.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Standard module that acts as the head of a ustream.
- *</blockquote>
- */
-
-public class StreamHead extends Task
-{
-  // Module that acts as the head of a Stream.
-
-  public int open (Object obj)
-  {
-    return 0;
-  }
-
-  public int close (long l)
-  {
-    return 0;
-  }
-
-  public int svc ()
-  {
-    return -1;
-  }
-
-  private int control (MessageBlock mb)
-  {
-    
-    IOCntlMsg ioc = (IOCntlMsg) mb.obj ();
-    int cmd = ioc.cmd ();
-
-    switch (cmd)
-      {
-      case IOCntlCmds.SET_LWM:
-      case IOCntlCmds.SET_HWM:
-	this.waterMarks (cmd, mb.cont ().length ());
-	ioc.rval (0);
-      break;
-    default:
-      return 0;
-    }
-  return ioc.rval ();
-  }
-
-  /* Performs canonical flushing at the ACE_Stream Head */
-
-  private int canonicalFlush (MessageBlock mb)
-  {
-    String s = mb.base ();
-    long f = (new Long (s)).longValue ();
-
-    if ((f & TaskFlags.ACE_FLUSHR) != 0)
-      {
-	this.flush (TaskFlags.ACE_FLUSHALL);
-	f &= ~TaskFlags.ACE_FLUSHR;
-      }
-    if ((f & TaskFlags.ACE_FLUSHW) != 0)
-      return this.reply (mb, null);
-    return 0;
-  }
-
-  // Will block forever to add the given MessageBlock
-  public int put (MessageBlock mb) 
-  {
-      return this.put (mb, null);
-  }
-
-  // tv is absolute time
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    int res = 0;
-    if (mb.msgType () == MessageType.MB_IOCTL
-	&& (res = this.control (mb)) == -1)
-      return res;
-    
-    if (this.isWriter ())
-      {
-	return this.putNext (mb, tv);
-      }
-    else /* this.isReader () */
-      {      
-	switch (mb.msgType ())
-	  {
-	  case MessageType.MB_FLUSH:
-	    return this.canonicalFlush (mb);
-	  default:
-	    break;
-	  }
-      
-	try
-	  {
-	    return this.putq (mb, tv);
-	  }
-	catch (InterruptedException e)
-	  {
-	    return -1;
-	  }
-      }
-  }
-
-  public void dump ()
-  {
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-
-}
diff --git a/java/src/StreamTail.java b/java/src/StreamTail.java
deleted file mode 100644
index 1c28c676c9c..00000000000
--- a/java/src/StreamTail.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    StreamTail.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Standard module that acts as the tail of a ustream.
- *</blockquote>
- */
-
-public class StreamTail extends Task
-{
-  // Module that acts as the tail of a Stream.
-
-  public int open (Object obj)
-  {
-    return 0;
-  }
-
-  public int close (long l)
-  {
-    return 0;
-  }
-
-  public int svc ()
-  {
-    return -1;
-  }
-
-  private int control (MessageBlock mb)
-  {
-    IOCntlMsg ioc = (IOCntlMsg) mb.obj ();
-    int cmd = ioc.cmd ();
-
-    switch (cmd)
-      {
-      case IOCntlCmds.SET_LWM:
-      case IOCntlCmds.SET_HWM:
-	{
-	  int size = mb.cont ().length ();
-	  
-	  this.waterMarks (cmd, size);
-	  this.sibling ().waterMarks (cmd, size);
-	  ioc.rval (0);
-	  break;
-	}
-      default:
-	mb.msgType (MessageType.MB_IOCNAK);
-      }
-    return this.reply (mb, null);
-  }
-
-  // Perform flush algorithm as though we were the driver
-  private int canonicalFlush (MessageBlock mb)
-  {
-    String s = mb.base ();
-    long f = (new Long (s)).longValue ();
-
-    if ((f & TaskFlags.ACE_FLUSHW) != 0)
-      {
-	this.flush (TaskFlags.ACE_FLUSHALL);
-	f &= ~TaskFlags.ACE_FLUSHW;
-      }
-    if ((f & TaskFlags.ACE_FLUSHR) != 0)
-      {
-	this.sibling ().flush (TaskFlags.ACE_FLUSHALL);
-	return this.reply (mb, null);
-      }
-    return 0;
-  }
-
-  // put the given MessageBlock without a timeout (block forever if
-  // necessary)
-  public int put (MessageBlock mb) 
-  {
-    return this.put (mb, null);
-  }
-
-  // tv is an absolute time timeout
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    if (this.isWriter ())
-    {
-      switch (mb.msgType ())
-	{
-	case MessageType.MB_IOCTL:
-	  return this.control (mb);
-	  /* NOTREACHED */
-	default:
-	  break;
-	}
-    }
-
-    return -1;
-  }
-
-  public void dump ()
-  {
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-
-}
diff --git a/java/src/SuspendNode.java b/java/src/SuspendNode.java
deleted file mode 100644
index 5b16a368458..00000000000
--- a/java/src/SuspendNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ServiceConfigurator
- *
- * = FILENAME
- *    SuspendNode.java
- *
- * Used when a service is specified to be suspended based on a line
- * in a service configurator file.  The actual implementation of the
- * service being suspended does the work.
- *
- *@author Everett Anderson
- *
- *************************************************/
-package JACE.ServiceConfigurator;
-
-import java.io.*;
-import JACE.OS.*;
-
-class SuspendNode extends ParseNode 
-{
-  public SuspendNode ()
-  {
-  }
-
-  public void apply () 
-  {
-    ACE.DEBUG("Suspend Node apply: " + this.name_);
-
-    if (JACE.ServiceConfigurator.ServiceConfig.suspend(this.name_) == -1)
-      ACE.ERROR("Error suspending " + this.name_);
-  }
-};
diff --git a/java/src/SvcHandler.java b/java/src/SvcHandler.java
deleted file mode 100644
index 17bac41a62d..00000000000
--- a/java/src/SvcHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Connection
- *
- * = FILENAME
- *    SvcHandler.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.SOCK_SAP.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public abstract class SvcHandler extends Task
-{
-
-  /**
-   * Do nothing constructor. 
-   */
-  public SvcHandler ()
-  {
-  }
-  
-  /**
-   * Set the stream using the SOCKStream passed in. This sets the
-   * underlying peer
-   *@param s SOCK Stream to use for the connection
-   */
-  public void setHandle (SOCKStream s) throws IOException
-  {
-    this.stream_ = s;
-  }
-
-  /**
-   * Get the underlying peer
-   *@return the underlying peer
-   */
-  public SOCKStream peer ()
-  {
-    return this.stream_;
-  }
-
-  /**
-   * Abstract method that subclasses must define to allow
-   * initialization to take place.
-   */
-  public abstract int open (Object obj);
-
-  /**
-   * Provide a default implementation to simplify ancestors.
-   *@return 0
-   */
-  public int close (long flags)
-  {
-    return 0;
-  }
-
-  /**
-   * Provide a default implementation to simplify ancestors.
-   *@return -1
-   */
-  public int put (MessageBlock mb, TimeValue tv)
-  {
-    return -1;
-  }
-
-  /**
-   * Provide a default implementation to simplify ancestors.
-   *@param tv Time Value when the event occured
-   *@param obj An arbitrary object that was passed to the Timer Queue
-   * (Asynchronous Completion Token)
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return -1;
-  }
-  
-  protected SOCKStream stream_;
-}
diff --git a/java/src/Task.java b/java/src/Task.java
deleted file mode 100644
index 825254e69a8..00000000000
--- a/java/src/Task.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    Task.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-import JACE.OS.*;
-import JACE.Reactor.*;
-import JACE.Concurrency.*;
-
-public abstract class Task implements Runnable, EventHandler
-{
-  // = Initialization/termination methods.
-
-  /**
-   * Initialize a Task. Note, we allocate a message queue ourselves.
-   */
-  public Task ()
-    {
-      this.msgQueue_ = new MessageQueue ();
-      this.thrMgr_ = null;
-    }
-
-  /**
-   * Initialize a Task. Note, we use the message queue and thread
-   * manager supplied by the user.
-   *@param mq Message Queue to hold list of messages on the Task
-   *@param thrMgr Thread Manager that manages all the spawned threads
-   */
-  public Task (MessageQueue mq,
-	       ThreadManager thrMgr)
-    {
-      this.msgQueue_ = mq;
-      this.thrMgr_ = thrMgr;
-    }
-
-  /**
-   * Not meant to be invoked by the user directly!. This needs to be
-   * in the public interface in order to get invoked by Thread
-   * class.
-   */
-  public void run ()
-    {
-      this.svc ();
-    }
-
-  // = Initialization and termination hooks (note that these *must* be
-  // defined by subclasses).
-
-  /**
-   * Hook called to open a Task. 
-   *@param obj used to pass arbitrary information
-   */
-  public abstract int open (Object obj);
-
-  /**
-   * Hook called to close a Task.
-   */
-  public abstract int close (long flags);
-
-  // = Immediate and deferred processing methods, respectively.
-
-  /**
-   * Transfer a message into the queue to handle immediate
-   * processing.
-   *@param mb Message Block to handle immediately
-   *@param tv Latest time to wait until (absolute time)
-   */
-  public abstract int put (MessageBlock mb, TimeValue tv);
-
-  /** 
-   * Run by a daemon thread to handle deferred processing. Note, that
-   * to do anything useful, this method should be overriden by the
-   * subclass.
-   *@return default implementation always returns 0.
-   */
-  public int svc ()
-    {
-      return 0;
-    }
-
-  /**
-   * Set the underlying Thread Manager.
-   *@param t Thread Manager to use
-   */
-  public synchronized void thrMgr (ThreadManager t)
-  {
-    this.thrMgr_ = t;
-  }
-
-  /**
-   * Get the Thread Manager.
-   *@return Underlying Thread Manager 
-   */
-  public synchronized ThreadManager thrMgr ()
-  {
-    return this.thrMgr_;
-  }
-
-  // = Active object method.
-
-  /**
-   * Turn the task into an active object. That is, having <nThreads>
-   * separate threads of control that all invoke Task::svc.
-   *@param flags Task Flags
-   *@param nThreads number of threads to spawn
-   *@param forceActive whether to force creation of new threads or not
-   *@return -1 if failure occurs, 1 if Task is already an active
-   * object and <forceActive> is false (doesn't *not* create a new
-   * thread in this case), and 0 if Task was not already an active
-   * object and a thread is created successfully or thread is an active
-   * object and <forceActive> is true.
-   */
-  public synchronized int activate (long flags, int nThreads, boolean forceActive)
-    {
-       // Create a Thread Manager if we do not already have one
-       if (this.thrMgr_ == null)
-	 this.thrMgr_ = new ThreadManager ();
-
-       if (this.thrCount () > 0 && forceActive == false)
-	 return 1; // Already active.
-       this.flags_ = flags;
-
-       if (ACE.BIT_ENABLED (flags, TaskFlags.THR_DAEMON))
-	 this.thrMgr_.spawnN (nThreads, this, true); // Spawn off all threads as daemon threads
-       else        // Spawn off all threads as normal threads
-	 this.thrMgr_.spawnN (nThreads, this, false);
-
-       return 0;
-    }
-  
-  // = Suspend/resume a Task
-
-  /**
-   * Suspend a task.
-   */
-  public synchronized void suspend ()
-    {
-      // Suspend all threads
-      if (this.thrMgr_ != null)
-	this.thrMgr_.thrGrp ().suspend ();
-    }
-
-  /** 
-   * Resume a suspended task.
-   */
-  public synchronized void resume ()
-    {
-      // Resume all threads
-      if (this.thrMgr_ != null)
-	this.thrMgr_.thrGrp ().resume ();
-    }
-
-  /**
-   * Get the current group name.
-   *@return name of the current thread group
-   */
-  public synchronized String grpName ()
-    {
-      if (this.thrMgr_ != null)
-	return this.thrMgr_.thrGrp ().getName ();
-      else
-	return null;
-    }
-
-  /**
-   * Get the message queue associated with this task.
-   *@return the message queue associated with this task.
-   */
-  public MessageQueue msgQueue ()
-    {
-      return this.msgQueue_;
-    }
-
-  /**
-   * Set the message queue associated with this task.
-   *@param mq Message Queue to use with this Task.
-   */
-  public void msgQueue (MessageQueue mq)
-    {
-      this.msgQueue_ = mq;
-    }
-
-  /**
-   * Get the number of threads currently running within the Task.
-   *@return the number of threads currently running within the Task.
-   * 0 if we're a passive object, else > 0.
-   */
-  public synchronized int thrCount ()
-    {
-      if (this.thrMgr_ != null)
-	return this.thrMgr_.thrGrp ().activeCount ();
-      else
-	return 0;
-    }
-
-  /**
-   * Set the Task flags
-   *@param flags Task Flags
-   */
-  public synchronized void flags (long flags)
-  {
-    this.flags_ = flags;
-  }
-
-  /**
-   * Get the Task flags
-   *@return Task Flags
-   */
-  public synchronized long flags ()
-  {
-    return this.flags_;
-  }
-
-  // = Message queue manipulation methods.
-
-
-  /*
-   * Dump debug information.
-   */
-  public void dump ()
-  {
-  }
-
-  /**
-   * Insert a message into the queue, blocking forever if necessary.
-   *@param mb Message Block to insert
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  protected int putq (MessageBlock mb) throws InterruptedException
-  {
-      return this.putq(mb, null);
-  }
-
-  /**
-   * Insert message into the message queue.
-   *@param mb Message Block to insert into the Message Queue
-   *@param tv time to wait until (absolute time)
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  protected int putq (MessageBlock mb, TimeValue tv) throws InterruptedException
-    {
-      return this.msgQueue_.enqueueTail (mb, tv);
-    }
-
-  /**
-   * Extract the first message from the queue, blocking forever if
-   * necessary.
-   *@return the first Message Block from the Message Queue.
-   *@exception InterrupteException Interrupted while accessing queue
-   */
-  protected MessageBlock getq() throws InterruptedException
-    {
-      return this.getq(null);
-    }
-
-  /**
-   * Extract the first message from the queue. Note that the call is blocking.
-   *@return the first Message Block from the Message Queue.
-   *@param tv Latest time to wait until (absolute time)
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  protected MessageBlock getq (TimeValue tv) throws InterruptedException
-    {
-      return this.msgQueue_.dequeueHead (tv);
-    }
-
-  /**
-   * Return a message back to the queue.
-   *@param mb Message Block to return back to the Message Queue
-   *@param tv Latest time to wait until (absolute time)
-   *@exception java.lang.InterruptedException Interrupted while accessing queue
-   */
-  protected int ungetq (MessageBlock mb, TimeValue tv) throws InterruptedException
-    {
-      return this.msgQueue_.enqueueHead (mb, tv);
-    }
-
-  /**
-   * Transfer message to the adjacent ACETask in an ACEStream.
-   *@param mb Message Block to transfer to the adjacent Task
-   *@param tv Latest time to wait until (absolute time)
-   *@return -1 if there is no adjacent Task, else the return value of
-   * trying to put the Message Block on that Task's Message Queue.
-   */
-  protected int putNext (MessageBlock mb, TimeValue tv)
-    {
-      return this.next_ == null ? -1 : this.next_.put (mb, tv);
-    }
-
-  /**
-   * Turn the message back around. Puts the message in the sibling's
-   * Message Queue.
-   *@param mb Message Block to put into sibling's Message Queue
-   *@param tv Latest time to wait until (absolute time)
-   *@return -1 if there is no adjacent Task to the sibling, else the
-   * return value of trying to put the Message Block on sibling's
-   * Message Queue. 
-   */
-  protected int reply (MessageBlock mb, TimeValue tv)
-    {
-      return this.sibling ().putNext (mb, tv);
-    }
-
-  // = ACE_Task utility routines to identify names et al.
-
-  /**
-   * Get the name of the enclosing Module.
-   *@return the name of the enclosing Module if there's one associated
-   * with the Task, else null.
-   */
-  protected String name ()
-    {
-      if (this.mod_ == null)
-	return null;
-      else
-	return this.mod_.name ();
-    }
-
-  /**
-   * Get the Task's sibling.
-  *@return the Task's sibling if there's one associated with the
-  * Task's Module, else null.
-  */
-  protected Task sibling ()
-    {
-      if (this.mod_ == null)
-	return null;
-      else
-	return this.mod_.sibling (this);
-    }
-
-  /**
-   * Set the Task's module.
-  *@param mod the Task's Module.
-  */
-  protected void module (Module mod)
-  {
-    this.mod_ = mod;
-  }
-
-  /**
-   * Get the Task's module.
-  *@return the Task's Module if there is one, else null.
-  */
-  protected Module module ()
-  {
-    return this.mod_;
-  }
-
-  /**
-   * Check if queue is a reader.
-   *@return true if queue is a reader, else false.
-   */
-  protected boolean isReader ()
-    {
-      return (ACE.BIT_ENABLED (this.flags_, TaskFlags.ACE_READER));
-    }
-
-  /**
-   * Check if queue is a writer.
-   *@return true if queue is a writer, else false.
-   */
-  protected boolean isWriter ()
-    {
-      return (ACE.BIT_DISABLED (this.flags_, TaskFlags.ACE_READER));
-    }
-
-  // = Pointers to next ACE_Queue (if ACE is part of an ACE_Stream).
-
-  /**
-   * Get next Task pointer.
-   *@return pointer to the next Task
-   */
-  protected Task next ()
-    {
-      return this.next_;
-    }
-
-  /**
-   * Set next Task pointer.
-   *@param task next task pointer
-   */
-  protected void next (Task task)
-    {
-      this.next_ = task;
-    }
-
-  // Special routines corresponding to certain message types.
-
-  /**
-   * Flush the Message Queue
-   *@return 0 if Message Queue is null, 1 if flush succeeds, -1 if
-   * ACE_FLUSHALL bit is not enabled in flags.
-   */
-  protected int flush (long flag)
-    {
-      if (ACE.BIT_ENABLED (flag, TaskFlags.ACE_FLUSHALL))
-	return (this.msgQueue_ == null ? 0 : 1);
-      else
-	return -1;
-    }
-
-
-  /**
-   * Manipulate watermarks.
-   *@param cmd IOCntlCmd
-   *@param size watermark
-   */
-  protected void waterMarks (int cmd, int size)
-  {
-    if (cmd == IOCntlCmds.SET_LWM)
-      this.msgQueue_.lowWaterMark (size);
-    else /* cmd == IOCntlMsg.SET_HWM */
-      this.msgQueue_.highWaterMark (size);
-  }
-
-  private ThreadManager thrMgr_ = null;
-  // Thread_Manager that manages all the spawned threads
-
-  private long flags_;
-  // Task flags.
-
-  private MessageQueue msgQueue_;
-  // List of messages on the Task..
-
-  private Task next_;
-  // Adjacent ACE_Task.
-
-  private Module mod_;
-  // Back-pointer to the enclosing module.
-}
diff --git a/java/src/TaskFlags.java b/java/src/TaskFlags.java
deleted file mode 100644
index 590e514b5e2..00000000000
--- a/java/src/TaskFlags.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TaskFlags.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-
-public abstract class TaskFlags
-{
-  /** Identifies a Task as being the "reader" in a Module. */
-  public static final int ACE_READER    = 01;
-
-  /** Just flush data messages in the queue. */
-  public static final int ACE_FLUSHDATA = 02;
-
-  /** Flush all messages in the Queue. */
-  public static final int ACE_FLUSHALL  = 04;
-
-  /** Flush read queue */
-  public static final int ACE_FLUSHR    = 010;
-
-  /** Flush write queue */
-  public static final int ACE_FLUSHW    = 020;
-
-  /** Flush both queues */
-  public static final int ACE_FLUSHRW   = 030;
-
-  /** Identifies a thread as suspended */
-  public static final int THR_SUSPENDED = 0x00000080;
-
-  /** Identifies a thread as a daemon thread */
-  public static final int THR_DAEMON    = 0x00000100;
-
-  // Default private constructor to avoid instantiation
-  private TaskFlags ()
-  {
-  }
-}
diff --git a/java/src/ThreadManager.java b/java/src/ThreadManager.java
deleted file mode 100644
index 5043d26511e..00000000000
--- a/java/src/ThreadManager.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    ThreadManager.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.OS.*;
-
-public class ThreadManager
-{ 
-  /**
-   * Default constructor
-   */
-  public ThreadManager ()
-    {
-      this (ACE.DEFAULT_THREAD_GROUP_NAME);
-    }
-
-  /**
-   * Create a Thread Manager.
-   *@param groupName name of the thread group that the Thread Manager
-   * will manage
-   */
-  public ThreadManager (String groupName)
-    {
-      this.thrGrp_ = new ThreadGroup (groupName);
-      if (this.thrGrp_ == null)
-	ACE.ERROR ("Thread group create failed");
-    }
-  
-  /** 
-   * Create a new thread.
-   *@param thr the caller whose run method will be invoked when the
-   * thread has been spawned
-   *@param daemon flag indicating whether the thread should be
-   * spawned off as a daemon thread
-   */
-  public void spawn (Runnable thr,
-		     boolean daemon)
-    {
-      Thread t = new Thread (this.thrGrp_, thr);
-      if (daemon)  // Set the thread to be a daemon thread
-	t.setDaemon (true);
-      t.start ();
-    }
-
-  /** 
-   * Create a new thread and also give it a name.
-   *@param thr the caller whose run method will be invoked when the
-   * thread has been spawned
-   *@param threadName the name of the new thread
-   *@param daemon flag indicating whether the thread should be
-   * spawned off as a daemon thread
-   */
-  public void spawn (Runnable thr,
-		     String threadName,
-		     boolean daemon)
-    {
-      Thread t = new Thread (this.thrGrp_, thr, threadName);
-      if (daemon)  // Set the thread to be a daemon thread
-	t.setDaemon (true);
-      t.start ();
-    }
-
-
-  /** 
-   * Create <n> new threads.
-   *@param n the number of threads to spawn
-   *@param thr the caller whose run method will be invoked by each of
-   * the <n> threads
-   *@param daemon flag indicating whether the threads should be
-   * spawned off as daemon threads 
-   */
-  public void spawnN (int n, 
-		      Runnable thr,
-		      boolean daemon)
-    {
-      // Spawn off all the threads.
-      for (int i = 0; i < n; i++)
-	{
-	  this.spawn (thr, daemon);
-	}
-    }
-
-  /**
-   * Get the thread group containing all the threads. Note that the
-   * thread group can be used to get information regarding number of
-   * active threads as well as to suspend/resume all the threads in
-   * the group. 
-   *@return the thread group that contains all the threads managed by
-   * the Thread Manager
-   */
-  public ThreadGroup thrGrp ()
-    {
-      return this.thrGrp_;
-    }
-
-  private ThreadGroup thrGrp_;
-  // Thread Group that contains all the spawned threads
-
-}
diff --git a/java/src/ThruTask.java b/java/src/ThruTask.java
deleted file mode 100644
index aebc8eb1f48..00000000000
--- a/java/src/ThruTask.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    ThruTask.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.ASX;
-    
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Standard module that acts as a "no op", simply passing on all
- *     data to its adjacent neighbor.
- *</blockquote>
- */
-public class ThruTask extends Task
-{
-  public int open (Object obj)
-  {
-    return 0;
-  }
-
-  public int close (long flags)
-  {
-    return 0;
-  }
-  
-  public int put (MessageBlock msg, TimeValue tv)
-  {
-    return this.putNext (msg, tv);
-  }
-
-  public int svc ()
-  {
-    return -1;
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-}
diff --git a/java/src/TimeValue.java b/java/src/TimeValue.java
deleted file mode 100644
index 274fdd8cc3d..00000000000
--- a/java/src/TimeValue.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Reactor
- *
- * = FILENAME
- *    TimeValue.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-//package JACE.Reactor;
-package JACE.ASX;
-
-public class TimeValue
-{
-  public final static TimeValue zero = new TimeValue (0,0);
-
-  /** 
-   * Default constructor.  This creates a TimeValue that is
-   * equal to TimeValue.zero.
-   */
-  public TimeValue ()
-  {
-    this (0, 0);
-  }
-
-  /** 
-   * Constructor
-   *@param sec seconds
-   */
-  public TimeValue (long sec)
-  {
-    this (sec, 0);
-  }
-
-  /** 
-   * Constructor
-   *@param sec seconds
-   *@param nanos nanoseconds
-   */
-  public TimeValue (long sec, int nanos)
-  {
-    this.set (sec, nanos);
-  }
-
-  /** 
-   * Sets the seconds and nanoseconds of Time Value
-   *@param sec seconds
-   *@param nanos nanoseconds
-   */
-  public void set (long sec, int nanos)
-  {
-    this.millisec_ = sec * 1000;
-    this.nanos_ = nanos;
-    this.normalize ();
-  }
-
-  /** 
-   * Get seconds
-   *@return Seconds
-   */
-  public long sec ()
-  {
-    return this.millisec_/1000;
-  }
-
-  /** 
-   * Get nanoseconds
-   *@return Nanoseconds
-   */
-  public int nanos ()
-  {
-    return this.nanos_;
-  }
-
-  /** 
-   * Get time in milliseconds.
-   *@return time in milliseconds
-   */
-  public long getMilliTime ()
-  {
-    return this.millisec_;
-  }
-
-  /**
-   * Get a String representation of the Time Value.
-   *@return String representation of the Time Value
-   */
-  public String toString ()
-  {
-    return (new Long (this.millisec_/1000)).toString () + ":" +
-      (new Integer (this.nanos_)).toString ();
-  }
-
-  /** 
-   * Get current time.
-   *@return the current system time as a new TimeValue
-   */
-  public static TimeValue getTimeOfDay ()
-  {
-    return new TimeValue (System.currentTimeMillis ()/1000);
-  }
-
-  /**
-   * Return a new TimeValue that represents the current system time 
-   * of day offset by the given number of seconds and nanoseconds.  
-   *@param sec Number of seconds to offset by
-   *@param nanos Number of nanoseconds to offset by
-   *@see JACE.ASX.TimeValue
-   *@return TimeValue for the system time plus the given offset
-   */
-  public static TimeValue relativeTimeOfDay(long sec, int nanos) 
-  {
-    return new TimeValue ((System.currentTimeMillis() / 1000) + sec,
-			 nanos);
-  }  
-
-  /**
-   * Return a new TimeValue that represents the current system time 
-   * of day offset by the given TimeValue.
-   *@param tv TimeValue to offset by
-   *@see JACE.ASX.TimeValue
-   *@return TimeValue for the system time plus the given offset
-   */
-  public static TimeValue relativeTimeOfDay(TimeValue offset)
-  {
-    return new TimeValue ((System.currentTimeMillis() / 1000) +
-			  offset.sec(),
-			  offset.nanos());
-  }
-
-  /**
-   * Compare two Time Values for equality.
-   *@param tv Time Value to compare with
-   *@return true if the two Time Values are equal, false otherwise
-   */
-  public boolean equals (TimeValue tv)
-  {
-    return this.millisec_ == (tv.sec () * 1000) && this.nanos_ == tv.nanos ();
-  }
-
-  /**
-   * Compare two Time Values for non-equality.
-   *@param tv Time Value to compare with
-   *@return true if the two Time Values are not equal, false otherwise
-   */
-  public boolean notEquals (TimeValue tv)
-  {
-    return !this.equals (tv);
-  }
-
-  /**
-   * Add two Time Values.
-   *@param tv1 The first Time Value
-   *@param tv2 The second Time Value
-   *@return sum of the two Time Values.
-   */
-  public static TimeValue plus (TimeValue tv1, TimeValue tv2)
-  {
-    TimeValue tv = new TimeValue (tv1.sec () + tv2.sec (), 
-				  tv1.nanos () + tv2.nanos ());
-    tv.normalize ();
-    return tv;
-  }
-
-  /**
-   * Subtract two Time Values.
-   *@param tv1 The first Time Value
-   *@param tv2 The second Time Value
-   *@return difference of the two Time Values.
-   */
-  public static TimeValue minus (TimeValue tv1, TimeValue tv2)
-  {
-    TimeValue tv = new TimeValue (tv1.sec () - tv2.sec (), 
-				  tv1.nanos () - tv2.nanos ());
-    tv.normalize ();
-    return tv;
-  }
-
-  /**
-   * Add Time Value to "this".
-   *@param tv The Time Value to add to this.
-   */
-  public void plusEquals (TimeValue tv)
-  {
-    this.set (this.sec () + tv.sec (),
-	      this.nanos () + tv.nanos ());
-    this.normalize ();
-  }
-
-  /**
-   * Subtract Time Value from "this".
-   *@param tv The Time Value to subtract from this.
-   */
-  public void minusEquals (TimeValue tv)
-  {
-    this.set (this.sec () - tv.sec (),
-	      this.nanos () - tv.nanos ());
-    this.normalize ();
-  }
-
-  /**
-   * Compare two Time Values for less than.
-   *@param tv Time Value to compare with
-   *@return true if "this" is less than tv, false otherwise
-   */
-  public boolean lessThan (TimeValue tv)
-  {
-    return tv.greaterThan (this);
-  }
-
-  /**
-   * Compare two Time Values for greater than.
-   *@param tv Time Value to compare with
-   *@return true if "this" is greater than tv, false otherwise
-   */
-  public boolean greaterThan (TimeValue tv)
-  {
-    if (this.sec () > tv.sec ())
-      return true;
-    else if (this.sec () == tv.sec ()
-	     && this.nanos () > tv.nanos ()) 
-      return true;
-    else
-      return false;
-  }
-
-  /**
-   * Compare two Time Values for <=.
-   *@param tv Time Value to compare with
-   *@return true if "this" <= tv, false otherwise
-   */
-  public boolean lessThanEqual (TimeValue tv)
-  {
-    return tv.greaterThanEqual (this);
-  }
-
-  /**
-   * Compare two Time Values for >=.
-   *@param tv Time Value to compare with
-   *@return true if "this" >= tv, false otherwise
-   */
-  public boolean greaterThanEqual (TimeValue tv)
-  {
-    return this.sec () >= tv.sec () && this.nanos () >= tv.nanos ();
-  }
-
-  private void normalize ()
-  {
-    if (this.nanos_ >= ONE_MILLISECOND)
-      {
-	do
-	  { 
-	    this.millisec_++;
-	    this.nanos_ -= ONE_MILLISECOND;
-	  }
-	while (this.nanos_ >= ONE_MILLISECOND);
-      }
-    else if (this.nanos_ <= -ONE_MILLISECOND)
-      {
-	do
-	  { 
-	    this.millisec_--;
-	    this.nanos_ += ONE_MILLISECOND;
-	  }
-	while (this.nanos_ <= -ONE_MILLISECOND);
-      }
-    
-    if (this.millisec_ >= 1 && this.nanos_ < 0)
-      {
-	this.millisec_--;
-	this.nanos_ += ONE_MILLISECOND;
-      }
-    else if (this.millisec_ < 0 && this.nanos_ > 0)
-      {
-	this.millisec_++;
-	this.nanos_ -= ONE_MILLISECOND;
-      }
-  }
-
-  private long millisec_;
-  private int nanos_;
-  private final static int ONE_MILLISECOND = 1000000;
-}
diff --git a/java/src/TimedWait.java b/java/src/TimedWait.java
deleted file mode 100644
index a8f337c086b..00000000000
--- a/java/src/TimedWait.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TimedWait.java
- *
- *@author Prashant Jain and Doug Schmidt
- *
- *************************************************/
-package JACE.ASX;
-
-public abstract class TimedWait
-{
-  /**
-   * Default Constructor. Sets "this" to be used for the delegation of
-   * the wait() call to. 
-   */
-  public TimedWait ()
-  {
-    object_ = this;
-  }
-
-  /**
-   * Constructor. Allows subclasses to supply us with an Object that
-   * is delegated the wait() call.
-   *@param obj The Object that is delegated the wait() call.
-   */
-  public TimedWait (Object obj)
-  {
-    object_ = obj;
-  }
-
-  /**
-   * Hook method that needs to be implemented by subclasses.
-   */
-  public abstract boolean condition ();
-
-  /**
-   * Wait until condition becomes true. Note that the method
-   * blocks. Also note that this method is final to ensure that no one
-   * overrides it. 
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   *@exception InterruptedException Interrupted during wait
-   */
-  public final void timedWait () throws InterruptedException
-  {
-    // Acquire the monitor lock.
-    if (!condition ()) 
-      {
-	// Only attempt to perform the wait if the condition isn't
-	// true initially.
-	for (;;) 
-	  {
-	    // Wait until we are notified.
-	    object_.wait ();
-
-	  // Recheck the condition.
-	  if (condition ()) 
-	    break; // Condition became true.
-	  // else we were falsely notified so go back into wait
-	  }
-      }
-  }
-
-  /**
-   * Template Method that implements the actual timed wait. Note that
-   * this method is final to ensure that no one overrides it. 
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   * If the specified wait time is zero, this checks the condition,
-   * then returns on success or throws a TimeoutException on failure.
-   *@param tv Absolute time to wait until before throwing an exception
-   * if the condition isn't satisfied
-   *@exception java.lang.InterruptedException Interrupted during wait
-   *@exception JACE.ASX.TimeoutException Reached timeout specified
-   */
-  public final void timedWait (TimeValue tv)
-    throws InterruptedException,
-           TimeoutException 
-  {
-    if (tv == null) {
-	this.timedWait();
-	return;
-    }
-
-    // Acquire the monitor lock.
-    if (!condition ()) 
-      {
-	long start = System.currentTimeMillis();
-	long waitTime = tv.getMilliTime() - start;
-
-	// Safety check since there is a possibility that it is now
-	// exactly the same time as the tv.  That would cause
-	// waitTime to be 0, and since Java's wait(timeout) blocks
-	// when timeout is 0, it would mean trouble.
-	if (waitTime < 1)
-	    throw new TimeoutException();
-
-	for (;;) {
-	  // Wait until we are notified.
-	  object_.wait (waitTime);
-
-	  // Recheck the condition.
-	  if (!condition ()) {
-
-	    long now = System.currentTimeMillis();
-	    
-	    // Timed out!
-	    if (now >= tv.getMilliTime ()) 
-	      throw new TimeoutException ();
-	    else 
-	      // We still have some time left to wait, so adjust the
-	      // wait_time.
-	      waitTime = tv.getMilliTime() - now; 
-	  }
-	  else
-	    break;  // Condition became true.
-	}
-      }
-  }
-
-  /**
-   * Notify any one thread waiting on the object_.  
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   */
-  public final void signal () {
-    object_.notify ();
-  }
-
-  /**
-   * Notify all threads waiting on the object_.  
-   * IMPORTANT: This method assumes it is called with the object_'s
-   * monitor lock already held.
-   */
-  public final void broadcast () {
-    object_.notifyAll ();
-  }
-
-  /** 
-   * The object we delegate to. If a subclass gives us a particular
-   * object,  we use that to delegate to, otherwise, we ``delegate''
-   * to ourself (i.e., this).
-   */
-  protected Object object_;
-
-}
diff --git a/java/src/TimeoutException.java b/java/src/TimeoutException.java
deleted file mode 100644
index b55549938dc..00000000000
--- a/java/src/TimeoutException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.ASX
- *
- * = FILENAME
- *    TimeoutException.java
- *
- *@author Prashant Jain and Doug Schmidt
- *
- *************************************************/
-package JACE.ASX;
-
-public class TimeoutException extends Exception
-{ 
-  /**
-   * Default Constructor.
-   */
-  public TimeoutException ()
-  {
-    super ("Timed Out");
-  }
-
-  /**
-   * Constructor.
-   *@param timeout The timeout value which expired.
-   *@param desc Textual description of the exception
-   */
-  public TimeoutException (TimeValue timeout, String desc)
-  {
-    super ("Timed Out in " + timeout + ": " + desc);
-  }
-
-}
diff --git a/java/src/TimerQueue.java b/java/src/TimerQueue.java
deleted file mode 100644
index a374a9603cd..00000000000
--- a/java/src/TimerQueue.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Reactor
- *
- * = FILENAME
- *    TimerQueue.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Reactor;
-
-import java.util.*;
-import JACE.ASX.*;
-
-import JACE.OS.*;
-
-class TimerNode
-{
-  public TimerNode (EventHandler handler,
-		    Object arg,
-		    TimeValue timerValue,
-		    TimeValue interval,
-		    TimerNode next,
-		    int timerId)
-  {
-    this.handler_ = handler;
-    this.arg_ = arg;
-    this.timerValue_ = timerValue;
-    this.interval_ = interval;
-    this.next_ = next;
-    this.timerId_ = timerId;
-  }
-
-  public EventHandler handler_;
-  // Handler to invoke <handleTimeout> on when a timeout occurs.
-
-  public Object arg_;
-  // Argument to pass to <handleTimeout>.
-
-  public TimeValue timerValue_;
-  // Time when the timer expires.  (absolute time)
-
-  public TimeValue interval_;
-  // If this is a periodic timer this holds the time until the next
-  // timeout.
-
-  public TimerNode next_;
-  // Pointer to next timer.
-  
-  public int timerId_;
-  // Id of this timer (used to cancel timers before they expire).
-}
-
-class WaitObject extends TimedWait
-{
-  public boolean condition ()
-  {
-    return this.condition_;
-  }
-  
-  public void condition (boolean c)
-  {
-    this.condition_ = c;
-  }
-
-  private boolean condition_ = false;
-}
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Class that provides an interface to timers. 
- *
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     This is a simple implementation that keeps a linked list of
- *     absolute timers. It allows multiple timers to be scheduled
- *     and returns a timer id for each timer scheduled. In addition,
- *     it allows periodic timers to be scheduled.
- *</blockquote>
- */
-public class TimerQueue implements Runnable
-{
-  /**
-   * Constructor.
-   *@param createInternalThread flag specifying whether to create an
-   * internal thread that runs the event loop. If it is true, a thread
-   * is spawned and it runs the event loop, handling all timeout
-   * events. If it is false, the caller is then responsible for calling
-   * handleEvents () to run the event loop.
-   */
-  public TimerQueue (boolean createInternalThread)
-  {
-    this.eventLoopRunning_ = false;
-    if (createInternalThread)
-      new Thread (this).start ();
-  }
-  
-  /**
-   * The thread run method. Do *NOT* call this method! It gets called
-   * automatically. 
-   */
-  public void run ()
-  {
-    this.handleEvents ();
-  }
-
-  /**
-   * Handle timeout events. This forms the event loop and takes care
-   * of all scheduling. This method should only be called if the Timer
-   * Queue was constructed with the value of createInternalThread as
-   * false.
-   */
-  public void handleEvents ()
-  {
-    if (!this.eventLoopRunning_)
-      {
-	// Set the flag indicating that the event loop is now running
-	this.eventLoopRunning_ = true;
-
-	TimeValue timeout = null;
-
-	for (;;)
-	  {
-	    synchronized (this.obj_) 
-	      {
-		timeout = this.earliestTime ();
-
-		try
-		  {
-		    // Extract the earliest time from the queue and do a timed wait
-		    // Note that this does a blocking wait if timeout is null 
-		    this.obj_.timedWait (timeout);
-		
-		    // We have been notified. 
-		    if (this.reset_)
-		      {
-			this.reset_ = false;
-			this.obj_.condition (false);
-			// Don't need to change the timer since it's an absolute
-			// time value.
-		      }
-		  }
-		catch (TimeoutException e)
-		  {
-		    // Timeout occurred. Call handleTimeout on appropriate
-		    // Event Handlers
-		    this.dispatchHandlers ();
-		  }
-		catch (InterruptedException e)
-		  {
-		  }
-	      }
-	  }
-      }
-  }
-
-  /**
-   * Check if the queue is empty.
-   *@return true if queue is empty, else false.
-   */
-  boolean isEmpty ()
-  {
-    return this.head_ == null;
-  }
-
-  /**
-   * Get the node of the earliest node in the TimerQueue.
-   *@return the time of the earlier node in the TimerQueue.
-   */
-  TimeValue earliestTime ()
-  {
-    synchronized (this.obj_)
-      {
-	if (!this.isEmpty ())
-	  return this.head_.timerValue_;
-	else
-	  return null;
-      }
-  }
-
-  /**
-   * Schedule an <EventHandler> that will expire after <delta> amount
-   * of time.  If it expires then <obj> is passed in as the value to
-   * the <EventHandler>'s <handleTimeout> callback method. This method
-   * returns a timer id that uniquely identifies the timer and can be
-   * used to cancel the timer before it expires.
-   *@param handler Event Handler that is to be scheduled with the timer
-   *@param obj Object that is passed back to the Event Handler when
-   * timeout occurs (Asynchronous Completion Token)
-   *@param delta amount of time for which to schedule the timer (relative time)
-   *@return id of the timer scheduled
-   */
-  public int scheduleTimer (EventHandler handler,
-			     Object obj,
-			     TimeValue delta)
-  {
-    return this.scheduleTimer (handler, obj, delta, TimeValue.zero);
-  }
-
-  /**
-   * Schedule an <EventHandler> that will expire after <delta> amount
-   * of time.  If it expires then <obj> is passed in as the value to
-   * the <EventHandler>'s <handleTimeout> callback method.  If
-   * <interval> is != to <TimeValue.zero> then it is used to
-   * reschedule the <EventHandler> automatically.  This method
-   * returns a timer id that uniquely identifies the timer and can be
-   * used to cancel the timer before it expires.
-   *@param handler Event Handler that is to be scheduled with the timer
-   *@param arg Object that is passed back to the Event Handler when
-   * timeout occurs (Asynchronous Completion Token)
-   *@param delta amount of time for which to schedule the timer (relative time)
-   *@param interval amount of time to use to reschedule the timer
-   *@return id of the timer scheduled
-   */
-  public int scheduleTimer (EventHandler handler,
-			    Object arg,
-			    TimeValue delta,
-			    TimeValue interval)
-  {
-
-    // Increment the sequence number (it will wrap around).
-    this.timerId_++;
-
-    ACE.DEBUG("scheduleTimer (" + this.timerId_ + "): " + 
-	      delta + ", " + interval);
-
-    // futureTime is the current time of day plus the given delta
-    TimeValue futureTime = TimeValue.relativeTimeOfDay (delta);
-
-    TimerNode node = new TimerNode (handler, 
-				    arg,
-				    futureTime,
-				    interval, 
-				    null,
-				    this.timerId_);
-    synchronized (this.obj_)
-      {
-	// Check if event loop is running. If it is not, then we can
-	// just place it at the appropriate place in the queue and
-	// don't need to do any notification. If event loop is
-	// running, then check if the node is the first node in the
-	// queue (either because the queue is empty or because the
-	// time for the node is earlier than the currently scheduled
-	// timer node).
-	if (this.eventLoopRunning_ &&
-	    (this.isEmpty () || futureTime.lessThan (this.earliestTime ())))
-	  {
-	    // Insert the node into (the beginning of) the queue to be
-	    // scheduled. 
-	    this.reschedule (node);
-
-	    // Notify the waiting thread so that it can reschedule
-	    // using the earliest timeout
-	    this.obj_.notify ();
-	  }
-	else // Place in the appropriate position in the queue.
-	  {
-	    this.reschedule (node);
-	  }
-      }
-    return this.timerId_;
-  }
-
-
-  /**
-   * Cancel the single timer associated with <timerId>.
-   *@param timerId id of the timer that needs to be cancelled.
-   *@return Object that was passed in when timer was scheduled
-   * (Asynchronous Completion Token). 
-   */
-  public Object cancelTimer (int timerId)
-  {
-    TimerNode prev = null;
-    TimerNode curr = null;
-
-    synchronized (this.obj_)
-      {
-	// Try to locate the TimerNode that matches the timerId.
-	for (curr = this.head_; 
-	     curr != null && curr.timerId_ != timerId;
-	     curr = curr.next_)
-	  prev = curr;
-
-	if (curr != null)
-	  {
-	    if (prev == null)
-	      this.head_ = curr.next_;
-	    else
-	      prev.next_ = curr.next_;
-
-	    return curr.arg_;
-	  }
-      }
-    return null;
-  }
-
-  /**
-   * Cancel all timers associated with <Event Handler>.
-   *@param handler Event Handler whose associated timers need to be cancelled.
-   */
-  public void cancelTimer (EventHandler handler)
-  {
-    TimerNode prev = null;
-    TimerNode curr = this.head_;
-
-    synchronized (this.obj_)
-      {
-	while (curr != null)
-	  {
-	    if (curr.handler_ == handler)
-	      {
-		if (prev == null)
-		  {
-		    this.head_ = curr.next_;
-		    curr = this.head_;
-		  }
-		else
-		  {
-		    prev.next_ = curr.next_;
-		    curr = prev.next_;
-		  }
-	      }
-	    else
-	      {
-		prev = curr;
-		curr = curr.next_;
-	      }
-	  }
-      }
-  }
-
-  // Call handleTimeout() on all handlers whose timers have expired.
-  private void dispatchHandlers ()
-  {
-    TimeValue currentTime = TimeValue.getTimeOfDay ();
-
-    for (;;)
-      {
-	if (this.isEmpty () || this.earliestTime ().greaterThan (currentTime))
-	  break; // There aren't any more timers eligible to expire.
-
-	TimerNode expired = this.head_;
-	EventHandler handler = expired.handler_;
-	Object arg = expired.arg_;
-	int result;
-	
-	this.head_ = this.head_.next_;
-	
-	// Check whether this is an interval timer.
-	if (expired.interval_.greaterThan (TimeValue.zero))
-	  {
-	    // Make sure that we skip past values that have already
-	    // "expired".
-	    do
-	      expired.timerValue_.plusEquals (expired.interval_);
-	    while (expired.timerValue_.lessThanEqual (currentTime));
-		   
-	    // Since this is an interval timer, we need to reschedule
-	    // it.
-	    this.reschedule (expired);
-	  }
-	
-	ACE.DEBUG("handleTimeout " + expired.timerId_);
-
-	// Perform the callback.
-	result = handler.handleTimeout (currentTime, arg);
-	
-	if (result == -1)
-	  this.cancelTimer (handler);
-      }
-  }
-
-  // Reschedule a TimerNode by inserting it at the appropriate
-  // position in the queue.
-  private void reschedule (TimerNode expired)
-  {
-    ACE.DEBUG("reschedule " + expired.timerId_ + " for " + expired.timerValue_);
-    // *** Shouldn't it use interval here?
-
-    if (this.isEmpty () || 
-	expired.timerValue_.lessThan (this.earliestTime ()))
-      {
-	expired.next_ = this.head_;
-	this.head_ = expired;
-	// Set the condition to true so that the waiting thread can be
-	// notified and it can reschedule.
-	this.obj_.condition (true);
-	this.reset_ = true;
-      }
-    else
-      {
-	TimerNode prev = this.head_;
-	TimerNode after  = this.head_.next_;
-
-	// Locate the proper position in the queue. 
-
-	while (after != null 
-	       && expired.timerValue_.greaterThan (after.timerValue_))
-	  {
-	    prev = after;
-	    after  = after.next_;
-	  }
-
-	expired.next_ = after;
-	prev.next_  = expired;
-      }
-  }
-
-  private WaitObject obj_ = new WaitObject ();
-  // Synchronization object (as well as object to use to do wait on)
-
-  private TimerNode head_; 
-  // Pointer to linked list of TimerHandles. 
-
-  private int timerId_;
-  // Keeps track of the timer id that uniquely identifies each timer.
-  // This id can be used to cancel a timer via the <cancel (int)>
-  // method.
-
-  private boolean reset_;
-  // Flag indicating whether to start the wait again
-
-  private boolean eventLoopRunning_;
-  // Flag indicating whether the event loop is running or not
-}
-
diff --git a/java/src/Token.java b/java/src/Token.java
deleted file mode 100644
index c112acdb653..00000000000
--- a/java/src/Token.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    JACE.Concurrency
- *
- * = FILENAME
- *    Token.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package JACE.Concurrency;
-
-import java.util.*;
-import JACE.ASX.*;
-
-class WaitObject extends TimedWait
-{
-  public boolean condition ()
-  {
-    return this.condition_;
-  }
-  
-  public void condition (boolean c)
-  {
-    this.condition_ = c;
-  }
-
-  private boolean condition_ = false;
-}
-
-/**
- * <hr>
- * <h2>SYNOPSIS</h2>
- *<blockquote>
- *     Class that acquires, renews, and releases a synchronization
- *     token that is serviced in strict FIFO ordering.
- *
- *</blockquote>
- *
- * <h2>DESCRIPTION</h2>
- *<blockquote>
- *     This is a general-purpose synchronization mechanism that offers
- *     several benefits. For example, it implements "recursive mutex"
- *     semantics, where a thread that owns the token can reacquire it
- *     without deadlocking.  In addition, threads that are blocked
- *     awaiting the token are serviced in strict FIFO order as other
- *     threads release the token. The solution makes use of the
- *     Specific Notification pattern presented by Tom Cargill in
- *     "Specific Notification for Java Thread Synchronization," PLoP96.
- *</blockquote>
- */
-public class Token
-{
-
-  /**
-   * Acquire the token. Note that this will block. The method uses
-   * synchronized blocks internally to avoid race conditions.  It
-   * ignores thread interrupts.
-   *@return 0 if acquires without calling <sleepHook>
-   * 1 if <sleepHook> is called.
-   * -1 if failure occurs (should never happen)
-   */
-  public int acquire ()
-    {
-      try
-	{
-	    return this.acquire (null);
-	}
-      catch (TimeoutException e)
-	{
-	  // This really shouldn't happen since we are supposed to
-	  // block.
-	  return -1;
-	}
-    }
-
-  /**
-   * Acquire the token.  Returns failure   
-   * Throws a TimeoutException if the token isn't acquired before the
-   * given absolute time timeout.
-   *@param timeout time (TimeValue) to wait until before throwing a
-   * TimeoutException (unless the token is acquired before that).
-   * Performs a blocking acquire if the given timeout is null.
-   *@return 0 if acquires without calling <sleepHook>
-   * 1 if <sleepHook> is called.
-   * -1 if failure occurs (timeout)
-   */
-  public int acquire (TimeValue timeout) throws TimeoutException
-    {
-      int result = 0;
-      WaitObject snl = new WaitObject ();
-      boolean mustWait;
-      synchronized (snl)
-	{
-	  synchronized (this)
-	    {
-	      mustWait = !this.snq_.isEmpty ();
-
-	      if (mustWait && isOwner ())
-		{
-		  // I am the one who has the token. So just increment
-		  // the nesting level
-		  this.nestingLevel_++;
-		  return 0;
-		}
-	      // Add local lock to the queue
-	      this.snq_.addElement (snl);
-	    }
-	  if (mustWait)
-	  {
-	      result = 1;
-	      sleepHook();
-
-	      while (mustWait) { 
-		  try {
-		      snl.timedWait(timeout);
-		      mustWait = false;
-		  } catch (InterruptedException e) {
-		      // must keep waiting
-		  }
-	      }
-	  }
-
-	  // Set the owner of the token
-	  setOwner();
-	}
-      return result;
-    }
-
-  /**
-   * Try to acquire the token. Implements a non-blocking acquire.
-   *@return 0 if acquires without calling <sleepHook>
-   * -1 if failure occurs
-   */
-  public synchronized int tryAcquire ()
-    {
-      int result = 0;
-
-      if (this.snq_.isEmpty ())
-	{
-	  // No one has the token, so acquire it
-	  this.snq_.addElement (new WaitObject ());
-
-      setOwner();
-	}
-      else if (isOwner())
-	{
-	  this.nestingLevel_++;
-	}
-      // Someone else has the token.
-      else
-	{
-      // Would have to block to acquire the token, so return
-      // failure.
-	  result = -1;
-	}
-      return result;
-    }
-
-  /**
-   * Method that is called before a thread goes to sleep in an
-   * acquire(). This should be overridden by a subclass to define 
-   * the appropriate behavior before acquire() goes to sleep.
-   * By default, this is a no-op.
-   */
-  public void sleepHook ()
-  {
-  }
-
-  /**
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token.  This blocks until it
-   * can regain the token.
-   *@param requeuePosition Position in the queue where to insert the
-   * lock. If requeuePosition == -1 and there are other threads
-   * waiting to obtain the token we are queued at the end of the list
-   * of waiters.  If requeuePosition > -1 then it indicates how many
-   * entries to skip over before inserting our thread into the list of
-   * waiters (e.g.,requeuePosition == 0 means "insert at front of the
-   * queue"). 
-   */
-  public void renew (int requeuePosition)
-  {
-    try
-      {
-	this.renew (requeuePosition, null);
-      }
-    catch (TimeoutException e)
-      {
-	// This really shouldn't happen since we are supposed to
-	// block.
-      }
-  }
-
-  /**
-   * An optimized method that efficiently reacquires the token if no
-   * other threads are waiting.  This is useful for situations where
-   * you don't want to degrade the quality of service if there are
-   * other threads waiting to get the token.  If the given TimeValue
-   * is null, it's the same as calling renew(int requeuePosition).
-   *@param requeuePosition Position in the queue where to insert the
-   * lock. If requeuePosition == -1 and there are other threads
-   * waiting to obtain the token we are queued at the end of the list
-   * of waiters.  If requeuePosition > -1 then it indicates how many
-   * entries to skip over before inserting our thread into the list of
-   * waiters (e.g.,requeuePosition == 0 means "insert at front of the
-   * queue").
-   *@param timeout Throw a TimeoutException if the token isn't renewed
-   * before this absolute time timeout.
-   *@exception TimeoutException exception if timeout occurs
-   */
-  public void renew (int requeuePosition, TimeValue timeout) 
-    throws TimeoutException
-  {
-    WaitObject snl = null;
-    int saveNestingLevel = 0;
-
-    synchronized (this)
-    {
-        // Check if there is a thread waiting to acquire the token. If
-        // not or if requeuePosition == 0, then we don't do anything
-        // and we simply keep the token. 
-        if (this.snq_.size () > 1 && requeuePosition != 0)
-        {
-            // Save the nesting level
-            saveNestingLevel = this.nestingLevel_;
-            this.nestingLevel_ = 0;
-            
-            // Reinsert ourselves at requeuePosition in the queue
-            snl = (WaitObject) this.snq_.firstElement ();
-            this.snq_.removeElementAt (0);
-            
-            if (requeuePosition < 0)
-                this.snq_.addElement (snl);  // Insert at end
-            else
-                this.snq_.insertElementAt (snl, Math.min(requeuePosition,
-                                                         this.snq_.size()));
-            
-            synchronized (this.snq_.firstElement ())
-            {
-                // Notify the first waiting thread in the queue
-                WaitObject obj = (WaitObject) this.snq_.firstElement ();
-                // Set its condition to be true so that it falls out
-                // of the for loop
-                obj.condition (true);
-                // Now signal the thread
-                obj.signal ();
-            }    
-        }
-    }
-    
-    // Check if we reinserted the lock in the queue and therefore need
-    // to do a wait 
-    if (snl != null)
-    {
-        synchronized (snl)
-        {
-            // Set the condition to be false so that we can begin the
-            // wait 
-            snl.condition (false);
-	    // Wait until the given absolute time (or until notified
-	    // if the timeout is null)
-	    boolean mustWait = true;
-	    while (mustWait) {
-		try {
-		    snl.timedWait (timeout);
-		    mustWait = false;
-		} catch (InterruptedException e) { 
-		    // must keep waiting
-		}
-	    }
-        }
-        // Restore the nesting level and current owner of the lock
-        this.nestingLevel_ = saveNestingLevel;
-
-        // Set the owner of the token
-        setOwner();
-    }
-  }
-
-  /**
-   * Release the token.  It is safe for non-owners to call
-   * this.
-   */
-  public synchronized void release ()
-  {
-    if (!isOwner())
-        return;
-
-    // Check if nestingLevel > 0 and if so, decrement it
-    if (this.nestingLevel_ > 0)
-        this.nestingLevel_--;
-    else
-        {
-            this.snq_.removeElementAt (0);
-            if (!this.snq_.isEmpty ())
-            {
-                synchronized (this.snq_.firstElement ())
-                {
-                    // Notify the first waiting thread in the queue
-                    WaitObject obj = (WaitObject) this.snq_.firstElement ();
-                    // Set its condition to be true so that it falls out
-                    // of the for loop
-                    obj.condition (true);
-                    // Now signal the thread
-                    obj.signal ();
-                }
-            }
-        }
-  }
-
-  // The next two methods allow subclasses to change the behavior of the
-  // checking and setting the Object owner_ member variable.  The default
-  // is to use the current Thread's toString() as the Object.
-  protected void setOwner() {
-      this.owner_ = Thread.currentThread().toString();
-  }
-
-  protected boolean isOwner() {
-      return Thread.currentThread().toString().equals(this.owner_);
-  }
-
-  private Vector snq_ = new Vector ();
-  // Vector of lock objects
-
-  private int nestingLevel_ = 0;
-  // Current Nesting Level
-
-  private Object owner_ = null;
-  // Current owner of the token.  The setOwner() and isOwner()
-  // methods provide subclasses with the ability to change the
-  // behavior.  The default is to use the Thread.toString().
-}
diff --git a/java/tests/ASX/BufferStreamTest.java b/java/tests/ASX/BufferStreamTest.java
deleted file mode 100644
index c61f94f281e..00000000000
--- a/java/tests/ASX/BufferStreamTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    BufferStreamTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-
-// This short program copies stdin to stdout via the use of an ASX
-// STREAM.  It illustrates an implementation of the classic "bounded
-// buffer" program using an ASX STREAM containing two Modules.  Each
-// Module contains two Tasks.  
-
-class CommonTask extends Task
-{
-  // ACE_Task hooks
-  public int open (Object obj)
-  {
-    if (this.activate (0, 1, false) == -1)
-      ACE.ERROR ("spawn");
-    return 0;
-  }
-
-  public int close (long exitStatus)
-  {
-    ACE.DEBUG (Thread.currentThread () + " thread is exiting with status "  +
-	       exitStatus + " in module " + this.name () + "\n");
-    return 0;
-  }
-
-  public int put (MessageBlock mb, TimeValue tv) 
-  { 
-    return 0; 
-  }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-}
-
-// Define the Producer interface. 
-
-class Producer extends CommonTask
-{
-  // Read data from stdin and pass to consumer.
-  // The Consumer reads data from the stdin stream, creates a message,
-  // and then queues the message in the message list, where it is
-  // removed by the consumer thread.  A 0-sized message is enqueued when
-  // there is no more data to read.  The consumer uses this as a flag to
-  // know when to exit.
-
-  public int svc ()
-  {
-    // Keep reading stdin, until we reach EOF. 
-
-      BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); 
-
-      String msg = null;
-      try
-	{
-	  while (true)
-	    {
-	      System.out.print ("Enter input: ");
-	      System.out.flush ();
-	      msg = in.readLine ();
-	      if (msg == null)
-		{
-		  // Send a shutdown message to the other thread and exit.
-		  if (this.putNext (new MessageBlock (0), new TimeValue ()) == -1)
-		    ACE.ERROR ("putNext");
-		  break;
-		}
-	      else
-		{
-		  // Send the message to the other thread.
-		  if (this.putNext (new MessageBlock (msg), new TimeValue ()) == -1)
-		    ACE.ERROR ("putNext");
-		}
-	    }
-	}
-      catch (IOException e)
-	{
-	}
-      return 0;
-  }
-}
-
-class Consumer extends CommonTask
-  // = TITLE
-  //    Define the Consumer interface. 
-{
-  // Enqueue the message on the MessageQueue for subsequent
-  // handling in the svc() method.
-  public int put (MessageBlock mb, TimeValue tv)
-    { 
-      try
-	{
-	  return this.putq (mb, tv);
-	}
-      catch (InterruptedException e)
-	{
-	}
-      return 0;
-    }
-
-  // The consumer dequeues a message from the ACE_Message_Queue, writes
-  // the message to the stderr stream, and deletes the message.  The
-  // Consumer sends a 0-sized message to inform the consumer to stop
-  // reading and exit.
-
-  public int svc ()
-    {
-      MessageBlock mb = null;
-
-      // Keep looping, reading a message out of the queue, until we
-      // timeout or get a message with a length == 0, which signals us to
-      // quit.
-      try
-	{
-	  while (true)
-	    {
-	      // Wait for upto 4 seconds
-	      mb = this.getq (new TimeValue (4));
-	  
-	      if (mb == null)
-		break;
-	  
-	      int length = mb.length ();
-	  
-	      if (length > 0)
-		System.out.println ("\n" + mb.base ());
-
-	      if (length == 0)
-		break;
-	    }
-	}
-      catch (InterruptedException e)
-	{
-	}
-      if (mb == null)
-	{
-	  ACE.ERROR ("timed out waiting for message");
-	  System.exit (1);
-	}
-      return 0;
-    }
-}
-
-// Spawn off a new thread.
-
-public class BufferStreamTest
-{
-  public static void main (String args[])
-  {
-    // Control hierachically-related active objects
-    Stream stream = new Stream ();
-    Module pm = new Module ("Consumer", new Consumer (), null, null);
-    Module cm = new Module ("Producer", new Producer (), null, null);
-
-    // Create Producer and Consumer Modules and push them onto the
-    // STREAM.  All processing is performed in the STREAM.
-
-    if (stream.push (pm) == -1)
-      {
-	ACE.ERROR ("push");
-	return;
-      }
-    else if (stream.push (cm) == -1)
-      {
-	ACE.ERROR ("push");
-	return;
-      }
-  }
-}
diff --git a/java/tests/ASX/MessageQueueTest.java b/java/tests/ASX/MessageQueueTest.java
deleted file mode 100644
index c22d2cf041d..00000000000
--- a/java/tests/ASX/MessageQueueTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    MessageQueueTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-
-public class MessageQueueTest
-{
-  public static void main (String args[])
-    {
-      try
-	{
-	  MessageBlock conMb;
-	  MessageQueue msgQueue = new MessageQueue ();
-	  MessageBlock mb1 = new MessageBlock ("hello");
-	  MessageBlock mb2 = new MessageBlock ("world");
-	  mb1.msgPriority (5);
-	  mb2.msgPriority (7);
-
-	  // Enqueue in priority order.
-	  if (msgQueue.enqueue (mb1) == -1)
-	    ACE.ERROR ("put_next");
-
-	  if (msgQueue.enqueue (mb2) == -1)
-	    ACE.ERROR ("put_next");
-
-	  // Now try to dequeue
-	  if ((conMb = msgQueue.dequeueHead ()) == null)
-	    ACE.ERROR ("dequeueHead");
-	  else
-	    ACE.DEBUG ("Consumer: removed item " + conMb.base () + " of priority " + conMb.msgPriority ());
-	}
-      catch (InterruptedException e)
-	{
-	}
-    }
-}
-  
diff --git a/java/tests/ASX/PriorityBufferTest.java b/java/tests/ASX/PriorityBufferTest.java
deleted file mode 100644
index 5cce32fa3b1..00000000000
--- a/java/tests/ASX/PriorityBufferTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    PriorityBufferTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-
-class consumer extends Thread
-{
-  public void run ()
-    {
-      MessageBlock mb = null;
-      long curPriority = 0;
-      int length = 0;
-
-      try
-	{
-	  // Keep looping, reading a message out of the queue, until we
-	  // get a message with a length == 0, which signals us to quit.
-	  for (;;)
-	    {
-	      if ((mb = PriorityBufferTest.msgQueue.dequeueHead ()) == null)
-		break;
-	      
-	      length = mb.length ();
-	      curPriority = mb.msgPriority ();
-	      
-	      if (length > 0)
-		ACE.DEBUG ("Consumer: removed item \"" + mb.base () + "\" of priority: " + curPriority);
-	      
-	      if (length == 0)
-		break;
-	    }
-	}
-      catch (InterruptedException e)
-	{
-	}
-    }
-}
-
-class producer extends Thread
-{
-  producer (int delay)
-    {
-      this.delay_ = delay;
-    }
-
-  public void run ()
-    {
-      try 
-	{
-	  long count = 0;
-	  for (char c = 'a'; c <= 'z'; c++)
-	    {
-	      count++;
-	      // Allocate a new message
-	      MessageBlock mb = new MessageBlock (new Character (c).toString ());
-	      // Set the priority
-	      mb.msgPriority (count);
-	  
-	      // Enqueue in priority order.
-	      if (PriorityBufferTest.msgQueue.enqueue (mb) == -1)
-		ACE.ERROR ("put_next");
-	      else
-		{
-		  ACE.DEBUG ("Producer: inserted item \"" + mb.base () + "\" of priority: " + count);
-		  if (this.delay_ > 0)
-		    this.sleep (this.delay_);
-		}
-	    }
-
-	  // Now send a 0-sized shutdown message to the other thread
-	  if (PriorityBufferTest.msgQueue.enqueueTail (new MessageBlock (0)) == -1)
-	    ACE.ERROR ("put_next");
-	}
-      catch (InterruptedException e)
-	{
-	}
-    }
-
-  private int delay_;
-}
-
-public class PriorityBufferTest
-{
-  public static MessageQueue msgQueue = new MessageQueue ();
-
-  public static void main (String args[])
-    {
-      int delay = 0;
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      delay = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      ACE.ERROR ("Illegal argument.");
-	    }
-	}
-      new producer (delay).start ();
-      new consumer ().start ();      
-    }
-}
diff --git a/java/tests/ASX/TaskTest.java b/java/tests/ASX/TaskTest.java
deleted file mode 100644
index b26b48ea148..00000000000
--- a/java/tests/ASX/TaskTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    TaskTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class TaskTest extends Task
-{
-  int nThreads_;
-  int nIterations_;
-
-  public TaskTest (int nThreads, int nIterations)
-    {
-      this.nIterations_ = nIterations;
-      this.nThreads_ = nThreads;
-      if (this.activate (0, nThreads, true) == -1)
-	ACE.ERROR ("activate failed");
-    }
-  
-  public int open (Object obj)
-    {
-      return 0;
-    }
-
-  public int close (long flags)
-    {
-      return 0;
-    }
-
-  public int put (MessageBlock mb, TimeValue tv)
-    {
-      return 0;
-    }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-  
-  public int svc ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  ACE.DEBUG (Thread.currentThread ().toString () + " in iteration " + i);
-	  // Allow other threads to run
-	  Thread.yield ();
-	}
-      return 0;
-    }
-
-  public static void main (String args[])
-    {
-      int nThreads = 1;
-      int nIterations = 1;
-      try
-	{
-	  if (args.length == 2)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	      nIterations = Integer.parseInt (args[1]);
-	    }
-	  else if (args.length == 1)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-      TaskTest tt = new TaskTest (nThreads, nIterations);
-    }
-}
diff --git a/java/tests/ASX/ThreadPoolTest.java b/java/tests/ASX/ThreadPoolTest.java
deleted file mode 100644
index cfb20f87adb..00000000000
--- a/java/tests/ASX/ThreadPoolTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.ASX
-// 
-// = FILENAME
-//    ThreadPoolTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.ASX;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class ThreadPoolTest extends Task
-{
-  int nThreads_;
-  int nIterations_;
-  
-  public static int MAX_MB_SIZE = 1024;
-
-  public ThreadPoolTest (int nThreads, int nIterations)
-    {
-      this.nIterations_ = nIterations;
-      this.nThreads_ = nThreads;
-      if (this.activate (0, nThreads, true) == -1)
-	ACE.ERROR ("activate failed");
-    }
-
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return 0;
-  }
-
-  public int open (Object obj)
-    {
-      return 0;
-    }
-
-  public int close (long flags)
-    {
-      return 0;
-    }
-
-  public int put (MessageBlock mb, TimeValue tv)
-    {
-      try
-	{
-	  return this.putq (mb, tv);
-	}
-      catch (InterruptedException e)
-	{
-	}
-      return 0;
-    }
-  
-  public int svc ()
-    {
-      int result = 0;
-      int count = 1;
-
-      // Keep looping, reading a message out of the queue, until we get a
-      // message with a length == 0, which signals us to quit.
-      try
-	{
-	  for (;; count++)
-	    {       
-	      MessageBlock mb = this.getq (new TimeValue ());
-	      if (mb == null)
-		{
-		  ACE.ERROR (Thread.currentThread ().toString () + " in iteration " + count + ", got result -1, exiting");
-		  break;
-		}
-	      int length = mb.length ();
-	      
-	      if (length > 0)
-		ACE.DEBUG (Thread.currentThread ().toString () +
-			   " in iteration " + count + ", length = " + 
-			   length + ", text = \"" + mb.base () + "\"");
-	      
-	      if (length == 0)
-		{
-		  ACE.DEBUG (Thread.currentThread ().toString () +
-			     " in iteration " + count + 
-			     ", got NULL message, exiting");
-		  break;
-		}
-	      Thread.yield ();
-	    }
-	}
-      catch (InterruptedException e)
-	{
-	}
-      return 0;
-    }
-
-  public static void produce (ThreadPoolTest threadPool, int nIterations)
-    {
-      int count = 0;
-      for (int n = 0;;)
-	{
-	  // Allocate a new message.
-	  MessageBlock mb = new MessageBlock (new Integer (count).toString ());
-	  
-	  if (count == nIterations)
-	    n = 1; // Indicate that we need to shut down.
-	  else
-	    count++;
-
-	  if (count == 0 || (count % 20 == 0))
-	    {
-	      try
-		{
-		  Thread.sleep (1);
-		}
-	      catch (InterruptedException e)
-		{
-		}
-	    }
-	  if (n != 1)
-	    {
-	      ACE.DEBUG ("Producing...");
-	      // Pass the message to the Thread_Pool.
-	      if (threadPool.put (mb, new TimeValue ()) == -1)
-		ACE.ERROR ("put");
-	    }
-	  else
-	    {
-	      // Send a shutdown message to the waiting threads and exit.
-	      ACE.DEBUG ("start loop, dump of task");
-
-	      for (int i = threadPool.thrCount (); i > 0; i--)
-		{
-		  ACE.DEBUG (Thread.currentThread ().toString () + 
-			     "EOF, enqueueing NULL block for thread " + i);
-
-		  // Enqueue a NULL message to flag each consumer to
-		  // shutdown.
-		  if (threadPool.put (new MessageBlock (0), new TimeValue ()) == -1)
-		    ACE.ERROR ("put");
-		}
-
-	      break;
-	    }
-	}
-    }
-
-  public static void main (String args[])
-    {
-      int nThreads = 1;
-      int nIterations = 100;
-      try
-	{
-	  if (args.length == 2)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	      nIterations = Integer.parseInt (args[1]);
-	    }
-	  else if (args.length == 1)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-      ACE.DEBUG ("Threads = " + nThreads + " Iterations = " + nIterations);
-
-      // Create the worker tasks.
-      ThreadPoolTest threadPool = new ThreadPoolTest (nThreads,
-						      nIterations);
-
-      // Create work for the worker tasks to process in their own threads.
-      produce (threadPool, nIterations);
-      ACE.DEBUG ("exiting...");
-    }
-}
-
-
diff --git a/java/tests/Concurrency/Condition/Consumer.java b/java/tests/Concurrency/Condition/Consumer.java
deleted file mode 100644
index ff4f5ff4a4b..00000000000
--- a/java/tests/Concurrency/Condition/Consumer.java
+++ /dev/null
@@ -1,73 +0,0 @@
-//File: Consumer.java
-//Seth Widoff 8/8/96
-//This class attempts at random intervals to dequeue random elements
-//from a queue. If the queue is empty the thread waits until an element
-//has been enqueued and another thread has invoked the notify() method.
-
-package tests.Concurrency.Condition;
-
-import JACE.ASX.TimeValue;
-import java.util.Random;
-
-public class Consumer implements Runnable
-{
-  //Maximum pause between dequeues (in milliseconds)
-  private static final int MAX_PAUSE = 1000;
-
-  private SimpleMessageQueue queue_;
-  private boolean stop_requested_ = false;
-  private String name_;
-  private int iterations_;
-  private TimeValue timeout_;
-  
-  public Consumer(String name, 
-		  SimpleMessageQueue queue, 
-		  int iterations,
-		  TimeValue timeout)
-  {
-    name_ = "Consumer " + name;
-    queue_ = queue;
-    iterations_ = iterations;
-    timeout_ = timeout;
-  }
-
-  public void run()
-  {
-    //Set the random number generator seed to the current time in
-    //milliseconds.
-
-    Random random = new Random(System.currentTimeMillis());
-    Integer element;
-
-    for (int i = 0; i < iterations_; )
-      {
-	try
-	  {
-	    element = (Integer)queue_.dequeue(timeout_);
-	    if (element != null)
-	      {
-		
-		System.out.print("Consumer::run() " + name_ + " dequeued " + element.toString());
-		System.out.println(" Queue size: " + queue_.size());
-		
-		Thread.sleep(random.nextLong() % MAX_PAUSE);
-	      }
-	    else
-	      {
-		System.out.println ("Null");
-	      }
-	    i++;
-	  }
-	catch(Exception excp)
-	  {
-	    System.out.print ("Consumer::run() Exception: ");
-	    System.out.println(excp);
-	  }
-      }
-  }
-
-  public void requestStop()
-  {
-    stop_requested_ = true;
-  }
-}
diff --git a/java/tests/Concurrency/Condition/JoinableThreadGroup.java b/java/tests/Concurrency/Condition/JoinableThreadGroup.java
deleted file mode 100644
index c878eb026d3..00000000000
--- a/java/tests/Concurrency/Condition/JoinableThreadGroup.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package tests.Concurrency.Condition;
-
-public class JoinableThreadGroup extends ThreadGroup
-{
-  public JoinableThreadGroup(String name)
-  {
-    super(name);
-  }
-
-  public JoinableThreadGroup(ThreadGroup parent, String name)
-  {
-    super(parent, name);
-  }
-
-  public void join() throws InterruptedException
-  {
-    Thread list[] = new Thread[activeCount()];
-
-    enumerate(list, true);
-
-    for (int i = 0; i < list.length; i++)
-      list[i].join();
-  }
-}
diff --git a/java/tests/Concurrency/Condition/Producer.java b/java/tests/Concurrency/Condition/Producer.java
deleted file mode 100644
index ed6da2251ba..00000000000
--- a/java/tests/Concurrency/Condition/Producer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-//File: Producer.java
-//Seth Widoff 8/8/96
-//This class attempts at random intervals to enqueue random elements
-//into a queue. If the queue is full the thread waits until an element
-//has been dequeued and another thread has invoked the notify() method.
-
-package tests.Concurrency.Condition;
-
-import JACE.ASX.TimeValue;
-import java.util.Random;
-
-public class Producer implements Runnable
-{
-  //Maximum pause between enqueues (in milliseconds)
-  private static final int MAX_PAUSE = 1000;
-  
-  private SimpleMessageQueue queue_;
-  private boolean stop_requested_ = false;
-  private String name_;
-  private int iterations_;
-  private TimeValue timeout_;
-
-  public Producer(String name, 
-		  SimpleMessageQueue queue, 
-		  int iterations,
-		  TimeValue timeout)
-  {
-    name_ = "Producer " + name;
-    queue_ = queue;
-    iterations_ = iterations;
-    timeout_ = timeout;
-  }
-
-  public void run()
-  {
-    //Set the random number generator seed to the current time in milliseconds.
-    Random random = new Random(System.currentTimeMillis());
-    int element = 1;
-    
-    for (int i = 0; i < iterations_; )
-      {
-	try
-	  {
-	    //	    element = random.nextInt();
-
-	    queue_.enqueue((Object)new Integer(element), timeout_);
-	    System.out.print("Producer::run() " + name_ + " enqueued " + element);
-	    System.out.println(" Queue size: " + queue_.size());
-	    
-	    Thread.sleep(random.nextLong() % MAX_PAUSE);
-	    i++;
-	    element++;
-	  }
-	catch(Exception excp)
-	  {
-	    System.out.print("Producer::run() Exception: ");
-	    System.out.println(excp);
-	  }
-      }
-  }
-
-  public void requestStop()
-  {
-    stop_requested_ = true;
-  }
-}
-
diff --git a/java/tests/Concurrency/Condition/QueueTest.java b/java/tests/Concurrency/Condition/QueueTest.java
deleted file mode 100644
index 87e7d57bbbd..00000000000
--- a/java/tests/Concurrency/Condition/QueueTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-//File: QueueTest.java
-//Seth Widoff, 8/8/96
-//This class is a test method for the Producer and Consumer classes.
-//The main method takes as arguments the number of producers, the
-//number of consumers and the number of elements in the queue. It then
-//spawn the specified threads and starts them.
-
-package tests.Concurrency.Condition;
-
-import JACE.ASX.TimeValue;
-
-public class QueueTest
-{
-  public static void main(String[] args)
-  {
-    if (args.length < 5)
-      {
-	System.out.println("Usage: java QueueTest <# producers> <# consumers> <# elements> <#iterations> <#timeout secs> <#timeout nano secs>");
-	System.exit(1);
-      }
-    
-    int num_producers = Integer.parseInt(args[0]),
-      num_consumers = Integer.parseInt(args[1]),
-      num_elements = Integer.parseInt(args[2]),
-      num_iterations = Integer.parseInt(args[3]),
-      num_timeout_secs = Integer.parseInt(args[4]),
-      num_timeout_nano_secs = Integer.parseInt(args[5]);
-    
-    if (num_elements < 1 
-	|| num_consumers < 1 
-	|| num_producers < 1)
-      {
-	System.out.println("All the parameters must be larger than zero.");
-	System.exit(1);
-      }
-    
-    SimpleMessageQueue queue = new SimpleMessageQueue(num_elements);
-    Consumer[] consumers = new Consumer[num_consumers];
-    Producer[] producers = new Producer[num_producers];
-    JoinableThreadGroup thread_group = new JoinableThreadGroup("Producer Consumer");
-    
-    for (int i = 0; i < num_producers; i++)
-      {
-	producers[i] = new Producer("Number " + (i + 1), queue, num_iterations, new TimeValue (num_timeout_secs, num_timeout_nano_secs));
-	new Thread(thread_group, producers[i]).start();
-      }
-
-    for (int i = 0; i < num_consumers; i++)
-      {
-	consumers[i] = new Consumer("Number " + (i + 1), queue, num_iterations, new TimeValue (num_timeout_secs, num_timeout_nano_secs));
-	new Thread(thread_group, consumers[i]).start();
-      }
-
-    try
-      {
-	thread_group.join();
-      }
-    catch(InterruptedException excp)
-      {
-	System.out.println("QueueTest::main");
-	System.out.println(excp);
-      }
-  }
-}
diff --git a/java/tests/Concurrency/Condition/SimpleMessageQueue.java b/java/tests/Concurrency/Condition/SimpleMessageQueue.java
deleted file mode 100644
index bb703516858..00000000000
--- a/java/tests/Concurrency/Condition/SimpleMessageQueue.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package tests.Concurrency.Condition;
-
-import JACE.ASX.TimeoutException;
-import JACE.ASX.TimeValue;
-import JACE.Concurrency.*;
-
-public class SimpleMessageQueue
-{
-  private int num_items_ = 0;
-  private int head_ = 0, tail_ = 0;
-  private Object[] queue_;
-
-  private Mutex lock_ = new Mutex ();
-  private Condition notFull_ = new Condition (lock_);
-  private Condition notEmpty_ = new Condition (lock_);
-  
-  public SimpleMessageQueue(int size)
-  {
-    queue_ = new Object[size];
-  }
- 
-   public void enqueue(Object element, TimeValue timeout)
-    throws TimeoutException, InterruptedException
-  {
-    try 
-      {
-	lock_.acquire ();    
-	while (this.isFull ())
-	  notFull_.Wait (timeout);
-	
-	if (tail_ == queue_.length)
-	  tail_ = 0;
-	queue_[tail_] = element;
-	tail_++;
-
-	num_items_++;
-	notEmpty_.signal ();
-      }
-    finally
-      {
-	lock_.release ();
-      }
-  }
-
-  public Object dequeue (TimeValue timeout) 
-       throws TimeoutException, InterruptedException
-  {
-    Object return_value = null;
-	
-    try 
-      {
-	lock_.acquire ();
-	while (this.isEmpty ())
-	  notEmpty_.Wait (timeout);
-	
-	return_value = queue_[head_];
-	head_++;
-	if (head_ == queue_.length)
-	  head_ = 0;
-
-	num_items_--;    
-	notFull_.signal ();
-      }
-    finally 
-      {
-	lock_.release ();
-      }
-    return return_value;
-  }
-
-  public boolean isEmpty()
-  {
-    return num_items_ == 0;
-  }
-
-  public boolean isFull()
-  {
-    return num_items_ == queue_.length;
-  }
-
-  public int size()
-  {
-    return num_items_;
-  }
-}
-
diff --git a/java/tests/Concurrency/MutexTest.java b/java/tests/Concurrency/MutexTest.java
deleted file mode 100644
index 680266ef071..00000000000
--- a/java/tests/Concurrency/MutexTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.Concurrency
- *
- * = FILENAME
- *    MutexTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.Concurrency;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-class MutexReader extends Thread
-{
-  MutexReader (int nIterations, Mutex mutex)
-    {
-      this.nIterations_ = nIterations;
-      this.mutex_ = mutex;
-    }
-
-  public void run ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  // Acquire the mutex (will block until it gets it)
-	  try
-	    {
-	      this.mutex_.acquire ();
-	    }
-	  catch (InterruptedException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-
-	  MutexTest.count++;
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " reader acquired mutex in iteration " + i +
-		     ", count = " + MutexTest.count);
-
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-	  // Release the mutex
-	  this.mutex_.release ();
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	}
-    }
-  
-  int nIterations_;
-  Mutex mutex_;
-}
-
-class MutexWriter extends Thread
-{
-  MutexWriter (int nIterations, Mutex mutex)
-    {
-      this.nIterations_ = nIterations;
-      this.mutex_ = mutex;
-    }
-
-  public void run ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  // Acquire the mutex (will block until it gets it)
-	  try
-	    {
-	      this.mutex_.acquire ();
-	    }
-	  catch (InterruptedException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-	  
-	  MutexTest.count++;
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " writer acquired mutex in iteration " + i +
-		     ", count = " + MutexTest.count);
-	  
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	  // Release the mutex
-	  this.mutex_.release ();
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	}
-    }
-  
-  int nIterations_;
-  Mutex mutex_;
-}
-
-public class MutexTest
-{
-  public static void main (String args[])
-    {
-      int nReaders = 1;
-      int nWriters = 1;
-      int nIterations = 100;
-      int i;
-      try
-	{
-	  if (args.length == 3)
-	    {
-	      nReaders = Integer.parseInt (args[0]);
-	      nWriters = Integer.parseInt (args[1]);
-	      nIterations = Integer.parseInt (args[2]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-
-      // Create a lock
-      Mutex mutex = new Mutex ();
-
-      // Now spawn off the readers and writers
-      for (i = 0; i < nReaders; i++)
-	new MutexReader (nIterations, mutex).start ();
-      
-      for (i = 0; i < nWriters; i++)
-	new MutexWriter (nIterations, mutex).start ();            
-    }
-  public static int count;
-}
diff --git a/java/tests/Concurrency/RWMutexTest.java b/java/tests/Concurrency/RWMutexTest.java
deleted file mode 100644
index ab28c9a83fd..00000000000
--- a/java/tests/Concurrency/RWMutexTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.Concurrency
- *
- * = FILENAME
- *    RWMutexTest.java
- *
- *@author Ross Dargahi (rossd@krinfo.com)
- *
- *************************************************/
-package tests.Concurrency;
-
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-class TestThread extends Thread
-{
-  TestThread(String  name,
-	     boolean writer,
-	     RWMutex  lock)
-  {
-    super (name);
-    mWriter = writer;
-    mLock = lock;
-  }
-
-  public void run()
-  {
-    for (int i = 0; i < 10; i++)
-      {
-	try
-	  {
-	    if (!mWriter)
-	      {
-		mLock.acquireRead();
-		ACE.DEBUG (getName() + ": Acquired Read Lock");
-		
-		int sleepTime = i * 100;
-		sleep (sleepTime);
-
-		mLock.release ();
-		ACE.DEBUG (getName () + ": Released Read Lock");
-	      }
-	    else
-	      {
-		mLock.acquireWrite ();
-		ACE.DEBUG (getName () + ": Acquired Write Lock");
-					
-		int sleepTime = i * 100;
-		sleep (sleepTime);
-
-		mLock.release ();
-		ACE.DEBUG (getName () + ": Released Write Lock");
-	      }
-	  }
-	catch (InterruptedException ex)
-	  {
-	    ACE.ERROR ("InterruptedException");
-	  }
-      }
-  }
-
-  RWMutex  mLock;
-  boolean mWriter;
-}
-
-public class RWMutexTest
-{
-  public static void main(String [] args)
-  {
-    RWMutex lock = new RWMutex();
-    
-    TestThread t1 = new TestThread ("1", false, lock);
-    TestThread t2 = new TestThread ("2", false, lock);
-    TestThread t3 = new TestThread ("3", false, lock);
-    TestThread t4 = new TestThread ("4", true, lock);
-    TestThread t5 = new TestThread ("5", false, lock);
-    TestThread t6 = new TestThread ("6", false, lock);
-    TestThread t7 = new TestThread ("7", false, lock);
-    TestThread t8 = new TestThread ("8", true, lock);
-
-    t1.start ();
-    t2.start ();
-    t3.start ();
-    t4.start ();
-    t5.start ();
-    t6.start ();
-    t7.start ();
-    t8.start ();
-  }
-}
-
diff --git a/java/tests/Concurrency/SemaphoreTest.java b/java/tests/Concurrency/SemaphoreTest.java
deleted file mode 100644
index b45929daa55..00000000000
--- a/java/tests/Concurrency/SemaphoreTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.Concurrency
- *
- * = FILENAME
- *    SemaphoreTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.Concurrency;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-class SemaphoreWriter extends Thread
-{
-  SemaphoreWriter (int nIterations, Semaphore s)
-    {
-      this.nIterations_ = nIterations;
-      this.s_ = s;
-    }
-
-  public void run ()
-    {
-      for (int i = 1; i <= this.nIterations_; i++)
-	{
-	  // Acquire the semaphore (will block until it gets it)
-	  try
-	    {
-	      this.s_.acquire ();
-	    }
-	  catch (InterruptedException e)
-	    {
-	      ACE.ERROR (e);
-	    }
-	  
-	  SemaphoreTest.counter++;
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " acquired semaphore in iteration " + i +
-		     ", counter = " + SemaphoreTest.counter);
-	  
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	  // Release the semaphore
-	  this.s_.release ();
-	  ACE.DEBUG (Thread.currentThread ().toString () +
-		     " released semaphore in iteration " + i);
-	  try
-	    {
-	      Thread.sleep (1);
-	    }
-	  catch (InterruptedException e)
-	    {
-	    }
-
-	}
-    }
-  
-  int nIterations_;
-  Semaphore s_;
-}
-
-public class SemaphoreTest
-{
-  public static void main (String args[])
-    {
-      int nThreads = 1;
-      int count = 1;
-      int nIterations = 100;
-      int i;
-      try
-	{
-	  if (args.length == 3)
-	    {
-	      nThreads = Integer.parseInt (args[0]);
-	      count = Integer.parseInt (args[1]);
-	      nIterations = Integer.parseInt (args[2]);
-	    }
-	}
-      catch (NumberFormatException e)
-	{
-	  ACE.ERROR ("Illegal argument.");
-	}
-
-      // Create a lock
-      Semaphore s = new Semaphore (count);
-
-      // Spawn off n_threads
-      for (i = 0; i < nThreads; i++)
-	new SemaphoreWriter (nIterations, s).start ();            
-    }
-  public static int counter;
-}
diff --git a/java/tests/Concurrency/TokenTest.java b/java/tests/Concurrency/TokenTest.java
deleted file mode 100644
index ededed9fed9..00000000000
--- a/java/tests/Concurrency/TokenTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.Concurrency
- *
- * = FILENAME
- *    TokenTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.Concurrency;
-
-import java.io.*;
-import JACE.OS.*;
-import JACE.Concurrency.*;
-
-class MyToken extends Token
-{
-  public void sleepHook ()
-  {
-    ACE.DEBUG (Thread.currentThread () + " blocking, sleepHook called");
-  }  
-}
-
-public class TokenTest implements Runnable
-{
-  public void run ()
-  {
-    try
-      {
-	this.token_.acquire ();
-	ACE.DEBUG (Thread.currentThread () + " acquired token");
-	this.token_.acquire ();
-	ACE.DEBUG (Thread.currentThread () + " acquired token");
-	Thread.sleep (100);
-
-	this.token_.renew (1);
-
-	this.token_.release ();
-	ACE.DEBUG (Thread.currentThread () + " released token");
-	this.token_.release ();
-	ACE.DEBUG (Thread.currentThread () + " released token");
-      }
-    catch (InterruptedException e)
-      {
-	this.token_.release ();
-      }
-  }
-
-  public static void main (String args [])
-  {
-    ThreadManager tm = new ThreadManager ();
-    int n = 1;
-    try
-      {
-	if (args.length == 1)
-	  {
-	    n = Integer.parseInt (args[0]);
-	  }
-      }
-    catch (NumberFormatException e)
-      {
-	ACE.ERROR ("Illegal argument.");
-      }
-
-    tm.spawnN (n,
-	       new TokenTest (),
-	       false);
-  }
-
-  private MyToken token_ = new MyToken ();
-}
diff --git a/java/tests/Connection/AcceptorTest.java b/java/tests/Connection/AcceptorTest.java
deleted file mode 100644
index 0f8877f52d9..00000000000
--- a/java/tests/Connection/AcceptorTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    AcceptorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class AcceptorTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: test_server [<port>]");
-      System.exit (0);
-    }
-
-  public void init (int port)
-    {
-      try
-	{
-	  Acceptor acceptor = new Acceptor (Class.forName ("tests.Connection.ServerHandler"));
-	  acceptor.open (port);
-	  while (true)
-	    {
-	      acceptor.accept ();
-	    }
-	}
-      catch (ClassNotFoundException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Socket Exception: " + e);
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR ("Dang!" + e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      AcceptorTest acceptorTest = new AcceptorTest ();
-
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      acceptorTest.print_usage_and_die ();
-	    }
-	}
-      acceptorTest.init (port);
-    }
-}
diff --git a/java/tests/Connection/ClientHandler.java b/java/tests/Connection/ClientHandler.java
deleted file mode 100644
index a18f7740cce..00000000000
--- a/java/tests/Connection/ClientHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    ClientHandler.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ClientHandler extends SvcHandler
-{
-  public ClientHandler ()
-    {
-    }
-  
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  public void run ()
-    {
-      BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); 
-
-      String msg;
-      StringBuffer ack = new StringBuffer ();
-      int ack_len;
-      try
-	{
-	  while (true)
-	    {
-	      System.out.print ("Enter input: ");
-	      System.out.flush ();
-	      msg = in.readLine ();
-	      if (msg == null)
-		break;
-	      this.peer ().send (new StringBuffer (msg));
-	      System.out.println ("Waiting for ack...");
-	      ack_len = this.peer ().recv (ack);
-	      if (ack_len == 0)
-		break;
-	      else
-		System.out.println (ack);
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.peer ().close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-      
-    }
-}
diff --git a/java/tests/Connection/ConnectorTest.java b/java/tests/Connection/ConnectorTest.java
deleted file mode 100644
index 605d5e7a400..00000000000
--- a/java/tests/Connection/ConnectorTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    ConnectorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ConnectorTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: test_Connector <hostname> [<port>]");
-      System.exit (0);
-    }
-
-  public void init (String hostname, int port)
-    {
-      try
-	{
-	  Connector connector = new Connector ();
-	  connector.open (hostname, port);
-	  connector.connect (new ClientHandler ());
-	}
-      catch (UnknownHostException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Connection refused");
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      ConnectorTest connectorTest = new ConnectorTest ();
-
-      if (args.length == 2)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[1]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      connectorTest.print_usage_and_die ();
-	    }
-	}
-      connectorTest.init (args[0], port);
-    }
-}
diff --git a/java/tests/Connection/HTTPHelperTest.java b/java/tests/Connection/HTTPHelperTest.java
deleted file mode 100644
index 02a16d838af..00000000000
--- a/java/tests/Connection/HTTPHelperTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package tests.Connection;
-
-import java.io.*;
-import JACE.Connection.*;
-
-public class HTTPHelperTest 
-{
-  public static void main(String args[])
-    {
-      // This is just a quick test to confirm that the Base 64 encoding and decoding work
-      // (tests the example given in the HTTP 1.1 RFC)
-
-      String secret = "Aladdin:open sesame";
-
-      String encoded = JACE.Connection.HTTPHelper.EncodeBase64(secret);
-
-      System.err.println("Encoding string: " + secret);
-
-      System.err.println("Result: " + encoded);
-
-      System.err.println("Is this right? " + (encoded.equals("QWxhZGRpbjpvcGVuIHNlc2FtZQ==") ? "Yes" : "No"));
-
-      // Decode should also be tested
-      //
-    }
-};
-      
diff --git a/java/tests/Connection/ServerHandler.java b/java/tests/Connection/ServerHandler.java
deleted file mode 100644
index 7cdd50d7d37..00000000000
--- a/java/tests/Connection/ServerHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Connection
-// 
-// = FILENAME
-//    ServerHandler.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Connection;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-
-public class ServerHandler extends SvcHandler
-{
-  public ServerHandler ()
-    {
-    }
-  
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  public void run ()
-    {
-      int msg_len;
-      System.out.println ("Waiting for messages...");
-      try
-	{
-	  while (true)
-	    {
-	      StringBuffer msg = new StringBuffer ();
-	      msg_len = this.peer ().recv (msg);
-	      if (msg_len == 0)
-		break;
-	      System.out.println ("Received: " + msg);
-	      this.peer ().send (new StringBuffer ("Got it!"));
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.peer ().close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-      
-    }
-}
diff --git a/java/tests/Misc/ParseArgsTest.java b/java/tests/Misc/ParseArgsTest.java
deleted file mode 100644
index 5baddd2745d..00000000000
--- a/java/tests/Misc/ParseArgsTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Misc
-// 
-// = FILENAME
-//    ParseArgsTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Misc;
-
-import JACE.OS.*;
-import JACE.Misc.*;
-
-public class ParseArgsTest
-{
-  public static void main (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "p:rs:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 'p':
-	    s = opt.optarg ();
-	    ACE.DEBUG ("Option <p> selected with argument " + s);
-	    break;
-	  case 'r':
-	    ACE.DEBUG ("Option <r> selected");
-	    break;
-	  case 's':
-	    s = opt.optarg ();
-	    ACE.DEBUG ("Option <s> selected with argument " + s);
-	    break;
-	  default:
-	    ACE.DEBUG ("Usage: java tests.Misc.ParseArgsTest [-p arg1] [-r] [-s arg2]");
-	    break;
-	  }
-      }
-  }
-}
diff --git a/java/tests/Reactor/TimeValueTest.java b/java/tests/Reactor/TimeValueTest.java
deleted file mode 100644
index b4f3e420ae1..00000000000
--- a/java/tests/Reactor/TimeValueTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    ACE.Reactor
- *
- * = FILENAME
- *    TimeValueTest.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.Reactor;
-
-import JACE.OS.*;
-import JACE.ASX.*;
-
-public class TimeValueTest
-{
-  public void ASSERT (boolean expression, int i)
-  {
-    if (!expression)
-      ACE.DEBUG ("ASSERT failed for " + i);
-  }
-
-  public void runTest ()
-  {
-    TimeValue tv1 = new TimeValue ();
-    TimeValue tv2 = new TimeValue (2);
-    TimeValue tv3 = new TimeValue (100);  
-    TimeValue tv4 = new TimeValue (1, 1000000000);
-    TimeValue tv5 = new TimeValue (2);
-    TimeValue tv6 = new TimeValue (1, -1000000000);
-
-    this.ASSERT (tv1.equals (new TimeValue (0)), 1);
-    this.ASSERT (tv2.lessThan (tv3), 2);
-    this.ASSERT (tv2.lessThanEqual (tv2), 3);
-    this.ASSERT (tv2.greaterThanEqual (tv4), 4);
-    this.ASSERT (tv5.greaterThanEqual (tv6), 5);
-    this.ASSERT (tv2.equals (new TimeValue (1, 1000000000)), 6);
-    this.ASSERT (tv5.equals (tv4), 7);
-    this.ASSERT (tv2.equals (tv4), 8);
-    this.ASSERT (tv1.notEquals (tv2), 9);
-    this.ASSERT (tv6.equals (tv1), 10);
-  }
-
-  public static void main (String [] args)
-  {
-    new TimeValueTest ().runTest ();
-  }
-}
diff --git a/java/tests/Reactor/TimerQueueTest.java b/java/tests/Reactor/TimerQueueTest.java
deleted file mode 100644
index d34439dcf9b..00000000000
--- a/java/tests/Reactor/TimerQueueTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.Reactor
-// 
-// = FILENAME
-//    TimerQueueTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.Reactor;
-
-import JACE.OS.*;
-import JACE.ASX.*;
-import JACE.Reactor.*;
-
-public class TimerQueueTest implements EventHandler
-{
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    ACE.DEBUG ("handleTimeout: " + tv.toString () + " " + (String) obj);
-    return 0;
-  }
-
-  public static void main (String args [])
-  {
-    TimerQueue tq = new TimerQueue (true);
-    TimerQueueTest th1 = new TimerQueueTest ();
-    int n = 5;
-
-    try
-      {
-	if (args.length == 1)
-	  {
-	    n = Integer.parseInt (args[0]);
-	  }
-      }
-    catch (NumberFormatException e)
-      {
-	ACE.ERROR ("Illegal argument.");
-      }
-
-    // Set a periodic timer
-    int id= tq.scheduleTimer (th1,
-			      "periodic",
-			      new TimeValue (2),
-			      new TimeValue (3));
-    
-    int i;
-    // Set a bunch of single timers
-    for (i=1; i <= n; i++)
-      {
-	tq.scheduleTimer (th1,
-			   "A-timer-" + new Integer (i),
-			   new TimeValue (i*2));
-      }
-
-    TimerQueueTest th2 = new TimerQueueTest ();
-    for (i=1; i <= n; i++)
-      {
-	tq.scheduleTimer (th2,
-			  "B-timer-" + new Integer (i),
-			  new TimeValue (i*3));
-      }
-    // Cancel all timers associated with this handler
-    tq.cancelTimer (th2);
-
-    try
-      {
-	Thread.sleep (30000);
-      }
-    catch (InterruptedException e)
-      {
-      }
-    tq.cancelTimer (id);
-    System.exit (0);
-  }
-}
diff --git a/java/tests/SOCK_SAP/SOCKAcceptorTest.java b/java/tests/SOCK_SAP/SOCKAcceptorTest.java
deleted file mode 100644
index 34ab8ecb6c9..00000000000
--- a/java/tests/SOCK_SAP/SOCKAcceptorTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.SOCK_SAP
-// 
-// = FILENAME
-//    SOCKAcceptorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-class TestHandler extends Thread
-{
-  public TestHandler (SOCKStream stream)
-    {
-      this.stream_ = stream;
-      this.start ();
-    }
-
-  public void run ()
-    {
-      int msgLen;
-      System.out.println ("Waiting for messages...");
-      try
-	{
-	  while (true)
-	    {
-	      StringBuffer msg = new StringBuffer ();
-	      msgLen = this.stream_.recv (msg);
-	      if (msgLen == 0)
-		break;
-	      ACE.DEBUG ("Received: " + msg);
-	      this.stream_.send ("Got it!");
-	    }
-	}
-      catch (NullPointerException e)
-	{
-	  ACE.ERROR ("connection reset by peer");
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-      finally
-	{
-	  try 
-	    {
-	      this.stream_.close ();
-	    }
-	  catch (IOException e)
-	    {
-	    }
-	}
-    }
-  SOCKStream stream_;
-}
-
-public class SOCKAcceptorTest
-{
-  void print_usage_and_die ()
-    {
-      ACE.DEBUG ("Usage: SOCKAcceptorTest [<port>]");
-      System.exit (0);
-    }
-
-  public void init (int port)
-    {
-      try
-	{
-	  SOCKAcceptor acceptor = new SOCKAcceptor (port);
-	  while (true)
-	    {
-	      SOCKStream stream = new SOCKStream ();
-	      acceptor.accept (stream);
-	      TestHandler handler = new TestHandler (stream);
-	    }
-	}
-      catch (IOException e)
-	{
-	}
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      SOCKAcceptorTest server = new SOCKAcceptorTest ();
-      if (args.length == 1)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[0]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      server.print_usage_and_die ();
-	    }
-	}
-      server.init (port);
-    }
-}
diff --git a/java/tests/SOCK_SAP/SOCKConnectorTest.java b/java/tests/SOCK_SAP/SOCKConnectorTest.java
deleted file mode 100644
index d1fdacc48a4..00000000000
--- a/java/tests/SOCK_SAP/SOCKConnectorTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    tests.SOCK_SAP
-// 
-// = FILENAME
-//    SOCKConnectorTest.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package tests.SOCK_SAP;
-
-import java.io.*;
-import java.net.*;
-import JACE.OS.*;
-import JACE.SOCK_SAP.*;
-
-public class SOCKConnectorTest
-{
-  static void print_usage_and_die ()
-    {
-      System.out.println ("Usage: SOCKConnectorTest <hostname> [<port>]");
-      System.exit (0);
-    }
-
-  void processRequests (SOCKStream stream) throws IOException
-    {
-      // 1.0 JDK      DataInputStream in = new DataInputStream (System.in);
-      BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-      String msg;
-      int ack_len;
-
-      while (true)
- {
-   StringBuffer ack = new StringBuffer ();
-   ACE.DEBUG ("Enter input: ");
-   ACE.FLUSH ();
-   msg = in.readLine ();
-   if (msg == null)
-     break;
-   stream.send (msg);
-   ACE.DEBUG ("Waiting for ack...");
-   ack_len = stream.recv (ack);
-   if (ack_len == 0)
-     break;
-   else
-     ACE.DEBUG (ack.toString ());
- }
-    }
-
-  public void init (String host, int port)
-    {
-      SOCKStream stream = new SOCKStream ();
-      SOCKConnector connector = new SOCKConnector ();
-      try
- {
-   connector.connect (stream,
-        host,
-        port);
-   processRequests (stream);
- }
-      catch (IOException e)
- {
-   ACE.ERROR (e);
- }
-    }
-
-  public static void main (String [] args)
-    {
-      int port = ACE.DEFAULT_SERVER_PORT;
-      SOCKConnectorTest client = new SOCKConnectorTest ();
-
-      // check arg count 
-      if (args.length == 0 || args.length > 2) 
-         print_usage_and_die(); 
-
-      if (args.length == 2)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[1]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      client.print_usage_and_die ();
-	    }
-	}
-      client.init (args[0], port);
-	
-
-    }
-}
-
diff --git a/java/tests/ServiceConfigurator/TestService.java b/java/tests/ServiceConfigurator/TestService.java
deleted file mode 100644
index 7b34c181c60..00000000000
--- a/java/tests/ServiceConfigurator/TestService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.ServiceConfigurator
- *
- * = FILENAME
- *    TestService.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package tests.ServiceConfigurator;
-
-import JACE.ServiceConfigurator.*;
-import JACE.OS.*;
-
-public class TestService extends ServiceObject
-{
-  public int init (String [] args)
-  {
-    System.out.println("TestService init with arguments: ");
-
-    if (args != null)
-      for (int i = 0; i < args.length; i++)
-        ACE.DEBUG (args[i]);
-
-    return 0;
-  }
-
-  public int suspend()
-  {
-    System.out.println("TestService suspend ----");
-
-    return 0;
-  }
-
-  public int resume()
-  {
-    System.out.println("TestService resume ----");
-
-    return 0;
-  }
-
-  public int fini()
-  {
-    System.out.println("TestService remove ----");
-
-    return 0;
-  }
-    
-}
-
diff --git a/java/tests/ServiceConfigurator/reloadTest.java b/java/tests/ServiceConfigurator/reloadTest.java
deleted file mode 100644
index 27806890239..00000000000
--- a/java/tests/ServiceConfigurator/reloadTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.ServiceConfigurator
- *
- * = FILENAME
- *    mainTest.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package tests.ServiceConfigurator;
-
-import JACE.ServiceConfigurator.*;
-import JACE.OS.*;
-import java.io.*;
-
-public class reloadTest
-{
-
-  public static void main (String args [])
-  {
-    ServiceConfig daemon = new ServiceConfig ();
-    try
-      {
-	daemon.open (args);
-	Thread.sleep (10000);
-
-	daemon.remove("TimeService");
-
-	daemon.open (args);
-      }
-    catch (InterruptedException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (FileNotFoundException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      } 
-    catch (ClassNotFoundException e)
-      {
-	ACE.ERROR (e + "foo");
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);	
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("End of reloadTest");
-  }
-
-}
diff --git a/java/tests/ServiceConfigurator/suspendTest.java b/java/tests/ServiceConfigurator/suspendTest.java
deleted file mode 100644
index ab12d06f2f5..00000000000
--- a/java/tests/ServiceConfigurator/suspendTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    tests.ServiceConfigurator
- *
- * = FILENAME
- *    mainTest.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package tests.ServiceConfigurator;
-
-import JACE.ServiceConfigurator.*;
-import JACE.OS.*;
-import java.io.*;
-
-public class suspendTest
-{
-
-  public static void main (String args [])
-  {
-    ServiceConfig daemon = new ServiceConfig ();
-    ACE.enableDebugging();
-
-    try
-      {
-	String args1 = "-f suspendTest1.conf";
-	String[] argv1 = OS.createStringArray(args1, " ");
-
-	daemon.open (argv1);
-
-	Thread.sleep (10000);
-
-
-	System.err.println("Suspending");
-	String args2 = "-f suspendTest2.conf";
-	String[] argv2 = OS.createStringArray(args2, " ");
-	
-	daemon.open (argv2);
-
-	Thread.sleep (10000);
-
-	System.err.println("Resuming");
-	String args3 = "-f suspendTest3.conf";
-	String[] argv3 = OS.createStringArray(args3, " ");
-
-	daemon.open (argv3);
-
-	Thread.sleep(10000);
-      }
-    catch (InterruptedException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (FileNotFoundException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      } 
-    catch (ClassNotFoundException e)
-      {
-	ACE.ERROR (e + "foo");
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);	
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("End of suspendTest");
-  }
-
-}
diff --git a/java/tests/ServiceConfigurator/suspendTest1.conf b/java/tests/ServiceConfigurator/suspendTest1.conf
deleted file mode 100644
index 983af3234c1..00000000000
--- a/java/tests/ServiceConfigurator/suspendTest1.conf
+++ /dev/null
@@ -1 +0,0 @@
-load TestService tests.ServiceConfigurator.TestService ServiceObject "-p 10002"
diff --git a/java/tests/ServiceConfigurator/suspendTest2.conf b/java/tests/ServiceConfigurator/suspendTest2.conf
deleted file mode 100644
index 5cd6cd0fc77..00000000000
--- a/java/tests/ServiceConfigurator/suspendTest2.conf
+++ /dev/null
@@ -1 +0,0 @@
-suspend TestService
diff --git a/java/tests/ServiceConfigurator/suspendTest3.conf b/java/tests/ServiceConfigurator/suspendTest3.conf
deleted file mode 100644
index 71250c3acd7..00000000000
--- a/java/tests/ServiceConfigurator/suspendTest3.conf
+++ /dev/null
@@ -1 +0,0 @@
-resume TestService
diff --git a/java/tests/ServiceConfigurator/svc.conf b/java/tests/ServiceConfigurator/svc.conf
deleted file mode 100644
index 983af3234c1..00000000000
--- a/java/tests/ServiceConfigurator/svc.conf
+++ /dev/null
@@ -1 +0,0 @@
-load TestService tests.ServiceConfigurator.TestService ServiceObject "-p 10002"
diff --git a/java/tests/netsvcs/Logger/LoggerTest.java b/java/tests/netsvcs/Logger/LoggerTest.java
deleted file mode 100644
index 40ac903a1d3..00000000000
--- a/java/tests/netsvcs/Logger/LoggerTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************
- *
- * = FILENAME
- *    LoggerTest.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package tests.netsvcs.Logger;
-
-import JACE.SOCK_SAP.*;
-import java.io.*; 
-import java.net.*;
-import JACE.OS.*;
-import netsvcs.Logger.LogRecord;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * This is a simple test log client very similar to the direct_logging client of
- * C++ ACE.  The logging service should correctly receive messages from both
- * the C++ and Java version.
- * </blockquote>
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor, netsvcs.Logger.LogRecord
- */
-public class LoggerTest {
-
-  /** Command line:  <hostname> [<port>]
-   *
-   * Creates a "hello world" log message and sends it to the server logging service.
-   * If no command line arguments are given, it uses ACE.DEFAULT_SERVER_PORT, and the
-   * current machine for the service location.
-   *
-   */
-  public static void main(String args[])
-    {
-      if (args.length < 1) {
-	System.err.println("Use:  LoggerTest <host name> [<port>]");
-	System.exit(0);
-      }
-
-      // Set the port
-      int port = args.length > 1 ? (new Integer(args[1])).intValue() : ACE.DEFAULT_SERVER_PORT;
-
-      SOCKStream cli_stream = new SOCKStream();
-      INETAddr remote_addr;
-      String host;
-
-      // Try to find the host
-      try {
-
-	host = args[0];
-
-	remote_addr = new INETAddr(port, host);
-
-      } catch (UnknownHostException uhe) {
-	ACE.ERROR("UnknownHostException " + uhe);
-	return;
-      }
-
-      System.out.println("Connecting to " + host + " on port " + port);
-
-      SOCKConnector con = new SOCKConnector();
-
-      try {
-
-	// Connect to the service
-	con.connect(cli_stream, remote_addr);
-
-      } catch (SocketException se) {
-	
-	ACE.ERROR("Socket Exception " + se);
-	return;
-
-      } catch (IOException ie) {
-
-	ACE.ERROR("IOException " + ie);
-	return;
-      }
-
-
-      // Send a message with priority 4, the current time,
-      // and 0 for the process ID.
-      LogRecord record = new LogRecord(4,
-				       System.currentTimeMillis(),
-				       0);
-
-      // Set the text of the message
-      record.msgData("hello world");
-
-      try {
-
-	// Get a transmission system from the socket
-	OutputStream os = cli_stream.socket().getOutputStream();
-	DataOutputStream dos = new DataOutputStream(os);
-
-	// Send it
-	record.streamOutTo(dos);
-
-	// Close the socket
-	cli_stream.close();
-
-      } catch (IOException ie) {
-
-	ACE.ERROR("IOException, loop: " + ie);
-	return;
-      }
-    }
-};
-
-
-      
-
-	
-
-	
-
-	
-      
diff --git a/java/tests/netsvcs/Naming/ClientTest.java b/java/tests/netsvcs/Naming/ClientTest.java
deleted file mode 100644
index c1189fecd7f..00000000000
--- a/java/tests/netsvcs/Naming/ClientTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package tests.netsvcs.Naming;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.SOCK_SAP.*;
-import netsvcs.Naming.*;
-
-public class ClientTest
-{
-  void print_usage_and_die ()
-    {
-      System.out.println ("Usage: ClientTest <hostname> [<port>]");
-      System.exit (0);
-    }
-
-  public SOCKStream init (SOCKStream socket, String hostname, int port)
-    {
-      try
-	{
-	  SOCKConnector sc = new SOCKConnector(socket, hostname, port);
-	}
-      catch (UnknownHostException e)
-	{
-	  ACE.ERROR (e);
-	  System.exit(0);
-	}
-      catch (SocketException e)
-	{
-	  ACE.ERROR ("Connection refused");
-	  System.exit(0);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	  System.exit(0);
-	}
-
-      return socket;
-    }
-
-  public static void main (String [] args)
-    {
-      SOCKStream socket;
-      int port = ACE.DEFAULT_SERVER_PORT;
-      ClientTest clientTest = new ClientTest ();
-
-      if (args.length == 2)
-	{
-	  try
-	    {
-	      port = Integer.parseInt (args[1]);
-	    }
-	  catch (NumberFormatException e)
-	    {
-	      clientTest.print_usage_and_die ();
-	    }
-	}
-      System.out.println("Trying to open port " + port + " on " + args[0]);
-
-      socket = clientTest.init (new SOCKStream(), args[0], port);
-
-      NameProxy proxy = new NameProxy(socket);
-
-      System.out.println("---- Beginning tests ----");
-
-      try {
-
-	System.out.println("Binding (five, six, seven):  " + proxy.bind("five", "six", "seven"));
-	System.out.println("Binding (filth, rat, eats):  " + proxy.bind("filth", "rat", "eats"));
-
-	Vector res = proxy.resolve("five");
-
-	System.out.println("Resolve (five)            :  " + (String)res.elementAt(1) + " " 
-			                                   + (String)res.elementAt(2));
-
-	System.out.println("Binding (fish, words, him):  " + proxy.bind("fish", "words", "him"));
-
-	System.out.println("Unbind  (five, six, seven):  " + proxy.unbind("five"));
-
-	res = proxy.resolve("five");
-
-	System.out.println("Resolve (five)            :  " + (String)res.elementAt(1) + " " 
-			                                   + (String)res.elementAt(2));
-	System.out.println("Binding (fiction, us, you):  " + proxy.bind("fiction", "us", "you"));
-
-	System.out.println("\nGetting all records whose names begin with fi:\n");
-	Vector res2 = proxy.listNameEntries("fi");
-
-	Enumeration iter = res2.elements();
-
-	while (iter.hasMoreElements()) {
-	  Vector res3 = (Vector)(iter.nextElement());
-
-	  System.out.println((String)res3.elementAt(0) + "\t" + (String)res3.elementAt(1) 
-			     + "\t" + (String)res3.elementAt(2));
-	}
-
-      } catch (IOException e) 
-	{
-	ACE.ERROR("" + e);
-	} 
-      finally 
-	{
-	  try {
-	    socket.close();
-	  } catch (IOException e) {
-	    ACE.ERROR("" + e);
-	  }
-	}
-
-    }
-
-};
-
diff --git a/m4/ace.m4 b/m4/ace.m4
index 4b8d34bfe72..ff858621ce8 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -316,6 +316,55 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
   ])
  AM_CONDITIONAL([BUILD_THREADS], [test X$ace_user_enable_threads = Xyes])
 
+ AC_ARG_ENABLE([pthreads],
+  AS_HELP_STRING(--enable-pthreads,enable POSIX thread (Pthreads) support [[[yes]]]),
+  [
+   case "${enableval}" in
+    yes)
+      ace_user_enable_pthreads=yes
+      ;;
+    no)
+      ace_user_enable_pthreads=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${enableval} for --enable-pthreads])
+      ;;
+   esac
+  ],
+  [
+    ace_user_enable_pthreads=yes
+  ])
+
+ AC_ARG_ENABLE([uithreads],
+  AS_HELP_STRING(--enable-uithreads,enable UNIX International thread support [[[no]]]),
+  [
+   case "${enableval}" in
+    yes)
+      ace_user_enable_uithreads=yes
+      ;;
+    no)
+      ace_user_enable_uithreads=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${enableval} for --enable-uithreads])
+      ;;
+   esac
+  ],
+  [
+    dnl The default is to disable UI threads. However, on Solaris, we
+    dnl enable it by default since it's functionality is very useful and
+    dnl has traditionally been enabled in ACE.
+    case "$host" in
+      *solaris2*)
+        ace_user_enable_uithreads=yes
+        AC_MSG_NOTICE([[--enable-uithreads enabled by default for Solaris; use --enable-uithreads=no to disable it.]])
+        ;;
+      *)
+        ace_user_enable_uithreads=no
+        ;;
+    esac
+  ])
+
  AC_ARG_ENABLE([verb-not-sup],
   AS_HELP_STRING(--enable-verb-not-sup,enable verbose ENOTSUP reports [[[no]]]),
   [
@@ -332,23 +381,23 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
    esac
   ],)
 
+ dnl The ace/config-all.h file defaults ACE_NTRACE properly, so only emit
+ dnl something if the user specifies this option.
  AC_ARG_ENABLE([trace],
   AS_HELP_STRING(--enable-trace,enable ACE tracing [[[no]]]),
   [
    case "${enableval}" in
     yes)
+      AC_DEFINE([ACE_NTRACE],0)
       ;;
     no)
-      AC_DEFINE([ACE_NTRACE])
+      AC_DEFINE([ACE_NTRACE],1)
       ;;
     *)
       AC_MSG_ERROR([bad value ${enableval} for --enable-trace])
       ;;
    esac
-  ],
-  [
-   AC_DEFINE([ACE_NTRACE])
-  ])
+  ],)
 
  AC_ARG_ENABLE([wfmo],
   AS_HELP_STRING(--enable-wfmo,build WFMO-using examples [[[no]]]),
@@ -388,7 +437,7 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
       ace_user_enable_winregistry=no
       ;;
     *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-rtti])
+      AC_MSG_ERROR([bad value ${enableval} for --enable-winregistry])
       ;;
    esac
   ],
@@ -404,53 +453,10 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
   ])
  AM_CONDITIONAL([BUILD_WINREGISTRY], [test X$ace_user_enable_winregistry = Xyes])
 
- AC_ARG_ENABLE([xt-reactor],
-  AS_HELP_STRING(--enable-xt-reactor,build support for the XtReactor [[[no]]]),
-  [
-   case "${enableval}" in
-    yes)
-      AC_PATH_XTRA
-dnl Here, if X isn't found or the user sets "--without-x" on the command
-dnl line, then "no_x" is set to "yes."
-      AS_IF([test "$no_x" != yes],
-        [
-         ACE_XLIBS="-lX11 -lXt"
-         ace_user_enable_xt_reactor=yes
-        ],
-        [
-         ACE_XLIBS=""
-         ace_user_enable_xt_reactor=no
-         AC_MSG_WARN([X was not found or it was disabled.])
-         AC_MSG_WARN([ACE_XtReactor will not be enabled.])
-        ])
-      ;;
-    no)
-      ACE_XLIBS=""
-      ace_user_enable_xt_reactor=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-xt-reactor])
-      ;;
-   esac
-  ],)
-
- AC_ARG_ENABLE([fl-reactor],
-  AS_HELP_STRING(--enable-fl-reactor,build support for the FlReactor [[[no]]]),
-  [
-   case "${enableval}" in
-    yes)
-      AC_MSG_ERROR([--enable-fl-reactor currently unimplemented])
-      ace_user_enable_fl_reactor=yes
-      ;;
-    no)
-      AC_MSG_ERROR([--enable-fl-reactor currently unimplemented])
-      ace_user_enable_fl_reactor=no
-      ;;
-    *)
-      AC_MSG_ERROR([bad value ${enableval} for --enable-fl-reactor])
-      ;;
-   esac
-  ],)
+ ACE_ENABLE_FL_REACTOR
+ ACE_ENABLE_QT_REACTOR
+ ACE_ENABLE_TK_REACTOR
+ ACE_ENABLE_XT_REACTOR
 
  AC_ARG_WITH([gperf],
   AS_HELP_STRING(--with-gperf,compile the gperf program [[[yes]]]),
@@ -484,9 +490,9 @@ dnl line, then "no_x" is set to "yes."
   ])
  AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_with_gperf = Xyes])
 
- ACE_WITH_RMCAST
- ACE_WITH_QOS
- ACE_WITH_SSL
+ ACE_ENABLE_QOS
+ ACE_ENABLE_SSL
+ ACE_ENABLE_ACEXML
 
  AC_ARG_WITH([tao],
   AS_HELP_STRING(--with-tao,build TAO (the ACE ORB) [[[yes]]]),
@@ -562,6 +568,7 @@ AC_DEFUN([ACE_COMPILATION_OPTIONS],
       ;;
     no)
       AC_DEFINE([ACE_NDEBUG])
+      AC_DEFINE([ACE_USE_RCSID],[0])
       ;;
     *)
       AC_MSG_ERROR([bad value ${enableval} for --enable-debug])
@@ -810,7 +817,7 @@ dnl    fi
   ],)
 
  AC_ARG_ENABLE([stdcpplib],
-  AS_HELP_STRING(--enable-stdcpplib,enable standard C++ library [[[yes]]]),
+  AS_HELP_STRING([--enable-stdcpplib],[enable standard C++ library [[yes]]]),
   [
    case "${enableval}" in
     yes)
@@ -828,64 +835,247 @@ dnl    fi
    ace_user_enable_stdcpplib=yes
   ])
 
-])
+ AC_ARG_ENABLE([uses-wchar],
+               AS_HELP_STRING([--enable-uses-wchar],
+                            [enable use of wide characters [[no]]]),
+               [case "${withval}" in
+                 yes) 
+                  AC_DEFINE([ACE_USES_WCHAR])
+                  ace_user_enable_wide_char=yes
+                  ;;
+                 no)
+                  ace_user_enable_wide_char=no
+                  ;;
+                 *)
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-uses-wchar])
+                  ;;
+                esac])
+ AC_CACHE_CHECK([whether to use wide characters internally],
+                [ace_user_enable_wide_char], [ace_user_enable_wide_char=no])
+ AM_CONDITIONAL([BUILD_USES_WCHAR], [test X$ace_user_enable_wide_char = Xyes])
 
-AC_DEFUN([ACE_WITH_RMCAST],
-[AC_ARG_WITH([rmcast],
-             AS_HELP_STRING([--with-rmcast],
-                            [compile/use the ACE_RMCast library [[yes]]]),
-             [case "${withval}" in
-               yes) 
-                ace_user_with_rmcast=yes
-                ;;
-               no)
-                ace_user_with_rmcast=no
-                ;;
-               *)
-                AC_MSG_ERROR(bad value ${withval} for --with-rmcast)
-                ;;
-              esac])
-AC_CACHE_CHECK([whether to compile/use the ACE_RMCast library],
-               [ace_user_with_rmcast],[ace_user_with_rmcast=yes])
-AM_CONDITIONAL([BUILD_RMCAST], [test X$ace_user_with_rmcast = Xyes])
 ])
 
-AC_DEFUN([ACE_WITH_QOS],
-[AC_ARG_WITH([qos],
-             AS_HELP_STRING([--with-qos],
-                            [compile/use the ACE_QoS library [[no]]]),
-             [case "${withval}" in
-               yes) 
-                ace_user_with_qos=yes
-                ;;
-               no)
-                ace_user_with_qos=no
-                ;;
-               *)
-                AC_MSG_ERROR(bad value ${withval} for --with-qos)
-                ;;
-              esac])
+AC_DEFUN([ACE_ENABLE_QOS],
+[AC_ARG_ENABLE([qos],
+	       AS_HELP_STRING([--enable-qos],
+			      [compile/use the ACE_QoS library [[no]]]),
+	       [case "${withval}" in
+		 yes) 
+		  ace_user_enable_qos=yes
+		  ;;
+		 no)
+		  ace_user_enable_qos=no
+		  ;;
+		 *)
+		  AC_MSG_ERROR(bad value ${withval} for --with-qos)
+		  ;;
+		esac])
 AC_CACHE_CHECK([whether to compile/use the ACE_QoS library],
-               [ace_user_with_qos],[ace_user_with_qos=no])
-AM_CONDITIONAL([BUILD_QOS], [test X$ace_user_with_qos = Xyes])
+               [ace_user_enable_qos],[ace_user_enable_qos=no])
+AM_CONDITIONAL([BUILD_QOS], [test X$ace_user_enable_qos = Xyes])
 ])
 
-AC_DEFUN([ACE_WITH_SSL],
-[AC_ARG_WITH([ssl],
-             AS_HELP_STRING([--with-ssl],
-                            [compile/use the ACE_SSL library [[yes]]]),
-             [case "${withval}" in
-               yes) 
-                ace_user_with_ssl=yes
-                ;;
-               no)
-                ace_user_with_ssl=no
-                ;;
-               *)
-                AC_MSG_ERROR(bad value ${withval} for --with-ssl)
-                ;;
-              esac])
+AC_DEFUN([ACE_ENABLE_SSL],
+[AC_ARG_ENABLE([ssl],
+	       AS_HELP_STRING([--enable-ssl],
+			      [compile/use the ACE_SSL library [[yes]]]),
+	       [case "${withval}" in
+		 yes) 
+		  ace_user_enable_ssl=yes
+		  ;;
+		 no)
+		  ace_user_enable_ssl=no
+		  ;;
+		 *)
+		  AC_MSG_ERROR(bad value ${withval} for --with-ssl)
+		  ;;
+		esac])
 AC_CACHE_CHECK([whether to compile/use the ACE_SSL library],
-               [ace_user_with_ssl], [ace_user_with_ssl=yes])
-AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes])
+               [ace_user_enable_ssl], [ace_user_enable_ssl=yes])
+AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_enable_ssl = Xyes])
+])
+
+AC_DEFUN([ACE_ENABLE_ACEXML],
+[AC_ARG_ENABLE([acexml],
+	       AS_HELP_STRING([--enable-acexml],
+			      [compile/use the ACEXML library [[yes]]]),
+	       [case "${withval}" in
+		 yes) 
+		  ace_user_enable_acexml=yes
+		  ;;
+		 no)
+		  ace_user_enable_acexml=no
+		  ;;
+		 *)
+		  AC_MSG_ERROR(bad value ${withval} for --with-acexml)
+		  ;;
+		esac],
+		[
+		 ace_user_enable_acexml=yes
+		])
+AC_CACHE_CHECK([whether to compile/use the ACEXML library],
+               [ace_user_enable_acexml], [ace_user_enable_acexml=yes])
+AM_CONDITIONAL([BUILD_ACEXML], [test X$ace_user_enable_acexml = Xyes])
+])
+
+
+# ACE_PATH_GL
+#---------------------------------------------------------------------------
+# Find OpenGL Libraries, flags, etc.
+AC_DEFUN([ACE_PATH_GL],
+[
+AM_CONDITIONAL([BUILD_GL], [false])
+])
+
+
+# ACE_PATH_FL
+#---------------------------------------------------------------------------
+# Find FL/TK Libraries, flags, etc.
+AC_DEFUN([ACE_PATH_FL],
+[AC_REQUIRE([ACE_PATH_GL])
+])
+
+
+# ACE_PATH_QT
+#---------------------------------------------------------------------------
+# Find Qt Libraries, flags, etc.
+AC_DEFUN([ACE_PATH_QT],
+[
+])
+
+
+# ACE_PATH_TK
+#---------------------------------------------------------------------------
+# Find Tk Libraries, flags, etc.
+AC_DEFUN([ACE_PATH_TK],
+[
+])
+
+
+# ACE_ENABLE_FL_REACTOR
+#---------------------------------------------------------------------------
+AC_DEFUN([ACE_ENABLE_FL_REACTOR],
+[AC_REQUIRE([ACE_PATH_FL])
+AC_ARG_ENABLE([fl-reactor],
+  	       AS_HELP_STRING([--enable-fl-reactor],
+		              [build support for the FlReactor [[no]]]),
+               [case "${enableval}" in
+                 yes)
+		  AC_MSG_ERROR([--enable-fl-reactor currently unimplemented])
+		  ace_user_enable_fl_reactor=yes
+		  ;;
+		no)
+		  AC_MSG_ERROR([--enable-fl-reactor currently unimplemented])
+		  ace_user_enable_fl_reactor=no
+		  ;;
+		*)
+		  AC_MSG_ERROR([bad value ${enableval} for --enable-fl-reactor])
+		  ;;
+	        esac],
+                [
+                 ace_user_enable_fl_reactor=no
+                ])
+AM_CONDITIONAL([BUILD_FL], [test X$ace_enable_fl_reactor = Xyes])
+AM_CONDITIONAL([BUILD_ACE_FLREACTOR], 
+               [test X$ace_enable_fl_reactor = Xyes])
+])
+
+
+# ACE_ENABLE_QT_REACTOR
+#---------------------------------------------------------------------------
+AC_DEFUN([ACE_ENABLE_QT_REACTOR],
+[AC_REQUIRE([ACE_PATH_QT])
+AC_ARG_ENABLE([qt-reactor],
+  	       AS_HELP_STRING([--enable-qt-reactor],
+		              [build support for the QtReactor [[no]]]),
+               [case "${enableval}" in
+                 yes)
+		  AC_MSG_ERROR([--enable-qt-reactor currently unimplemented])
+		  ace_user_enable_qt_reactor=yes
+		  ;;
+		no)
+		  AC_MSG_ERROR([--enable-qt-reactor currently unimplemented])
+		  ace_user_enable_qt_reactor=no
+		  ;;
+		*)
+		  AC_MSG_ERROR([bad value ${enableval} for --enable-qt-reactor])
+		  ;;
+	        esac],
+                [
+                 ace_user_enable_qt_reactor=no
+                ])
+AM_CONDITIONAL([BUILD_QT], [test X$ace_enable_qt_reactor = Xyes])
+AM_CONDITIONAL([BUILD_ACE_QTREACTOR], 
+               [test X$ace_enable_qt_reactor = Xyes])
+])
+
+
+# ACE_ENABLE_TK_REACTOR
+#---------------------------------------------------------------------------
+AC_DEFUN([ACE_ENABLE_TK_REACTOR],
+[AC_REQUIRE([ACE_PATH_TK])
+AC_ARG_ENABLE([tk-reactor],
+  	       AS_HELP_STRING([--enable-tk-reactor],
+		              [build support for the TkReactor [[no]]]),
+               [case "${enableval}" in
+                 yes)
+		  AC_MSG_ERROR([--enable-tk-reactor currently unimplemented])
+		  ace_user_enable_tk_reactor=yes
+		  ;;
+		no)
+		  AC_MSG_ERROR([--enable-tk-reactor currently unimplemented])
+		  ace_user_enable_tk_reactor=no
+		  ;;
+		*)
+		  AC_MSG_ERROR([bad value ${enableval} for --enable-tk-reactor])
+		  ;;
+	        esac],
+                [
+                 ace_user_enable_tk_reactor=no
+                ])
+AM_CONDITIONAL([BUILD_TK], [test X$ace_enable_tk_reactor = Xyes])
+AM_CONDITIONAL([BUILD_ACE_TKREACTOR], 
+               [test X$ace_enable_tk_reactor = Xyes])
+])
+
+
+# ACE_ENABLE_XT_REACTOR
+#---------------------------------------------------------------------------
+AC_DEFUN([ACE_ENABLE_XT_REACTOR],
+[AC_ARG_ENABLE([xt-reactor],
+               AS_HELP_STRING([--enable-xt-reactor],
+                              [build support for the XtReactor [[no]]]),
+               [case "${enableval}" in
+                 yes)
+                  AC_PATH_XTRA
+dnl Here, if X isn't found or the user sets "--without-x" on the command
+dnl line, then "no_x" is set to "yes."
+                  AS_IF([test "$no_x" != yes],
+                        [
+		          ACE_XLIBS="-lX11 -lXt"
+                          ace_user_enable_xt_reactor=yes
+                        ],[
+                          ACE_XLIBS=""
+                          ace_user_enable_xt_reactor=no
+                          AC_MSG_WARN([X was not found or it was disabled.])
+                          AC_MSG_WARN([ACE_XtReactor will not be enabled.])
+                        ])
+                  ;;
+                 no)
+                  ACE_XLIBS=""
+                  ace_user_enable_xt_reactor=no
+                  ;;
+                 *)
+		  AC_MSG_ERROR([bad value ${enableval} for --enable-xt-reactor])
+		  ;;
+                esac],
+		[
+                  ACE_XLIBS=""
+                  ace_user_enable_xt_reactor=no
+		])
+AM_CONDITIONAL([BUILD_X11], [test X$ace_enable_xt_reactor = Xyes])
+AM_CONDITIONAL([BUILD_XT], [test X$ace_enable_xt_reactor = Xyes])
+AM_CONDITIONAL([BUILD_ACE_XTREACTOR], 
+               [test X$ace_enable_xt_reactor = Xyes])
 ])
diff --git a/m4/aio.m4 b/m4/aio.m4
index 63574e66ff3..aaa5622dd33 100644
--- a/m4/aio.m4
+++ b/m4/aio.m4
@@ -275,10 +275,37 @@ main ()
   return 0;
 }
        ]])],[
-        dnl Now try another test
+        ace_cv_feature_aio_calls=yes
+       ],[
+        ace_cv_feature_aio_calls=no
+       ],[
+        dnl Asynchronous IO test for cross-compiled platforms
+        dnl This test is weaker than the above run-time tests but it will
+        dnl have to do.
+        AC_COMPILE_IFELSE(
+          [AC_LANG_PROGRAM([[
+#include <aio.h>
+          ]],
+          [[
+           aiocb* aiocb_ptr (void);
+          ]])],
+          [
+           ace_cv_feature_aio_calls=yes
+          ],
+          [
+           ace_cv_feature_aio_calls=no
+          ])
+       ])
+    ],[AC_DEFINE([ACE_HAS_AIO_CALLS])],[LIBS="$ace_save_LIBS"])
+fi dnl test "$ace_has_aio_funcs" = yes
 
-        dnl Create a file for the test program to read.
-        cat > test_aiosig.txt <<EOF
+
+if test "$ace_cv_feature_aio_calls" = yes; then
+  ACE_CACHE_CHECK([for working POSIX realtime signals],
+    [ace_cv_feature_posix_rt_sigs],
+    [
+      dnl Create a file for the test program to read.
+      cat > test_aiosig.txt <<EOF
 
 *******************************************************
 FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR
@@ -286,8 +313,11 @@ FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR FOO BAR
 EOF
 
 
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+extern "C" {
+#include <signal.h>
+}
 #ifndef ACE_LACKS_UNISTD_H
 #include <unistd.h>
 #endif
@@ -297,7 +327,6 @@ EOF
 #endif
 #include <sys/stat.h>
 #include <pthread.h>
-#include <signal.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
@@ -583,41 +612,22 @@ main ()
   return -1;
 
 }
-         ]])],
-         [
-          ace_cv_feature_aio_calls=yes
-         ],
-         [
-          ace_cv_feature_aio_calls=no
-         ],
-         [
+        ]])],
+        [
+          ace_cv_feature_posix_rt_sigs=yes
+        ],
+        [
+          ace_cv_feature_posix_rt_sigs=no
+        ],
+        [
           dnl Don't bother doing anything for cross-compiling here
-          dnl since the outer run-time test will prevent this
-          dnl inner run-time test from ever running when cross-compiling.
+          dnl since the basic aio run-time test will prevent this
+          dnl rt sig run-time test from ever running when cross-compiling.
           dnl We just put something in here to prevent autoconf
           dnl from complaining.
           ace_just_a_place_holder=ignoreme
-         ])
-       ],[
-        ace_cv_feature_aio_calls=no
-       ],[
-        dnl Asynchronous IO test for cross-compiled platforms
-        dnl This test is weaker than the above run-time tests but it will
-        dnl have to do.
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM([[
-#include <aio.h>
-          ]],
-          [[
-           aiocb* aiocb_ptr (void);
-          ]])],
-          [
-           ace_cv_feature_aio_calls=yes
-          ],
-          [
-           ace_cv_feature_aio_calls=no
-          ])
-       ])
-    ],[AC_DEFINE([ACE_HAS_AIO_CALLS])],[LIBS="$ace_save_LIBS"])
-fi dnl test "$ace_has_aio_funcs" = yes
+        ])
+    ],[AC_DEFINE([ACE_HAS_POSIX_REALTIME_SIGNALS])],[])
+fi dnl test "$ace_cv_feature_aio_calls" = yes
+
 ])
diff --git a/m4/config_h.m4 b/m4/config_h.m4
index 704f1bc079c..e83bd52c8d8 100644
--- a/m4/config_h.m4
+++ b/m4/config_h.m4
@@ -189,7 +189,6 @@ AH_TEMPLATE([ACE_HAS_DLL],[Build ACE using the frigging PC DLL nonsense...])
 AH_TEMPLATE([ACE_HAS_STRICT],[Use the STRICT compilation mode on Win32.])
 
 AH_TEMPLATE([CYGWIN32], [GNU Win32 environement])
-AH_TEMPLATE([ACE_HAS_CYGWIN32_SOCKET_H],[Platform has cygwin32 socket.h.])
 
 
 dnl ACE internals
@@ -206,20 +205,19 @@ AH_TEMPLATE([ACE_USE_RCSID],[Enable embedding of global RCS ID strings into comp
 AH_TEMPLATE([IP_ADD_MEMBERSHIP],[])
 AH_TEMPLATE([IP_DROP_MEMBERSHIP],[])
 
+AH_VERBATIM([ACE_INT64_TYPEDEF],
+[
+/*
+   typedef for ACE_INT64
 
-dnl Specify sizes of given built-in types.  If a size isn't defined here,
-dnl then ace/Basic_Types.h will attempt to deduce the size.
-dnl AH_TEMPLATE([ACE_SIZEOF_CHAR],[Size of native "char" type])
-AH_TEMPLATE([ACE_SIZEOF_WCHAR],[Size of native "wchar_t" type])
-AH_TEMPLATE([ACE_SIZEOF_SHORT],[Size of the native "short" type])
-AH_TEMPLATE([ACE_SIZEOF_INT],[Size of the native "int" type])
-AH_TEMPLATE([ACE_SIZEOF_LONG],[Size of the native "long" type])
-AH_TEMPLATE([ACE_SIZEOF_LONG_LONG],[Size of the native "long long" type])
-AH_TEMPLATE([ACE_SIZEOF_VOID_P],[Size of the native "pointer to void" type])
-AH_TEMPLATE([ACE_SIZEOF_FLOAT],[Size of the native "float" type])
-AH_TEMPLATE([ACE_SIZEOF_DOUBLE],[Size of the native "double" type])
-AH_TEMPLATE([ACE_SIZEOF_LONG_DOUBLE],[Size of the native "long double" type])
-
+   We only make the typedef if ACE_INT64_TYPEDEF is defined.  Otherwise,
+   let ace/Basic_Types.h do the work for us.
+*/
+#undef ACE_INT64_TYPEDEF
+#ifdef ACE_INT64_TYPEDEF
+   typedef ACE_INT64_TYPEDEF ACE_INT64;
+#endif /* ACE_INT64_TYPEDEF */
+])
 
 AH_VERBATIM([ACE_UINT64_TYPEDEF],
 [
@@ -311,8 +309,10 @@ AH_TEMPLATE([ACE_HAS_AUTOMATIC_INIT_FINI],
 [Compiler/platform correctly calls init()/fini() for shared libraries.])
 
 AH_TEMPLATE([ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR],
-[Compiler handles explicit calling of template destructor correctly.
-See `ace/OS.h' for details.])
+[Compiler handles explicit calling of template destructor correctly.])
+
+AH_TEMPLATE([ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS],
+[Compiler requires template args when explicitly calling template destructor.])
 
 AH_TEMPLATE([ACE_HAS_BROKEN_MAP_FAILED],
 [Platform doesn't cast MAP_FAILED to a (void *).])
@@ -390,6 +390,9 @@ AH_TEMPLATE([ACE_HAS_CONFLICTING_XTI_MACROS],
 AH_TEMPLATE([ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES],
 [Prototypes for both signal() and struct sigaction are consistent.])
 
+AH_TEMPLATE([ACE_HAS_CONST_CHAR_SWAB],
+[Platform has swab(const char*, char*, ssize_t) variant.])
+
 AH_TEMPLATE([ACE_HAS_CPLUSPLUS_HEADERS],
 [Compiler/platform has correctly prototyped header files.])
 
@@ -429,8 +432,6 @@ AH_TEMPLATE([ACE_HAS_LLSEEK],
 AH_TEMPLATE([ACE_HAS_HI_RES_TIMER],
 [Compiler/platform supports SunOS high resolution timers])
 
-AH_TEMPLATE([ACE_HAS_IDTYPE_T],[Compiler/platform supports idtype_t.])
-
 AH_TEMPLATE([ACE_HAS_INLINED_OSCALLS],[
 Inline all the static class OS methods to remove call overhead
 Note: This gets defined by OS.h if __ACE_INLINE__ is defined])
@@ -444,6 +445,9 @@ AH_TEMPLATE([ACE_USES_IPV4_IPV6_MIGRATION],
 AH_TEMPLATE([ACE_HAS_NEW_NOTHROW],
 [Compiler supports new (std::nothrow)])
 
+AH_TEMPLATE([ACE_HAS_NONCONST_SWAB],
+[Platform has swab(char*, char*, ssize_t) variant.])
+
 AH_TEMPLATE([ACE_HAS_NONSTATIC_OBJECT_MANAGER],
 [Causes the ACE_Object_Manager instance to be created in
    main (int, char *[]), instead of as a static (global) instance.])
@@ -537,6 +541,9 @@ AH_TEMPLATE([ACE_HAS_POSIX_GETPWNAM_R],
 AH_TEMPLATE([ACE_HAS_POSIX_NONBLOCK],
 [Platform supports POSIX O_NONBLOCK semantics])
 
+AH_TEMPLATE([ACE_HAS_POSIX_REALTIME_SIGNALS],
+[Platform supports POSIX realtime signals])
+
 AH_TEMPLATE([ACE_HAS_POSIX_SEM],
 [Platform supports POSIX real-time semaphores (e.g., VxWorks and
    Solaris)])
@@ -643,8 +650,6 @@ AH_TEMPLATE([ACE_HAS_SET_T_ERRNO],
 
 AH_TEMPLATE([ACE_HAS_SHM_OPEN],[Platform has shm_open()])
 
-AH_TEMPLATE([ACE_HAS_SIGINFO_T],[Platform supports SVR4 extended signals])
-
 AH_TEMPLATE([ACE_HAS_SIGISMEMBER_BUG],
 [Platform has bug with sigismember() (HP/UX 11).])
 
@@ -677,8 +682,6 @@ AH_TEMPLATE([ACE_HAS_SOCKLEN_T],
 AH_TEMPLATE([ACE_HAS_SPARCWORKS_401_SIGNALS],
 [Compiler has brain-damaged SPARCwork SunOS 4.x signal prototype...])
 
-AH_TEMPLATE([ACE_HAS_SSIZE_T],[Compiler supports the ssize_t typedef])
-
 AH_TEMPLATE([ACE_HAS_THR_YIELD],[Platform has thr_yield()])
 
 AH_TEMPLATE([ACE_HAS_STANDARD_CPP_LIBRARY],
@@ -810,6 +813,7 @@ AH_TEMPLATE([ACE_HAS_UNIXWARE_SVR4_SIGNAL_T],
    platforms])
 
 AH_TEMPLATE([ACE_HAS_WCHAR],[Platform/compiler supports wchar_t])
+AH_TEMPLATE([ACE_USES_WCHAR],[ACE is built to use wide characters internally])
 
 AH_TEMPLATE([ACE_HAS_TYPENAME_KEYWORD],
 [Compiler supports the C++ typename keyword])
@@ -822,7 +826,7 @@ AH_TEMPLATE([ACE_HAS_VERBOSE_NOTSUP],
    origin of ACE_NOTSUP.])
 
 AH_TEMPLATE([ACE_HAS_VOIDPTR_GETTIMEOFDAY],
-[Platform/compiler supports void * as second parameter to 
+[Platform/compiler supports void * as second parameter to
    gettimeofday() and has a prototype.])
 
 AH_TEMPLATE([ACE_HAS_VOIDPTR_MMAP],[Platform requires void * for mmap().])
@@ -946,9 +950,6 @@ AH_TEMPLATE([ACE_LACKS_PLACEMENT_OPERATOR_DELETE],
 AH_TEMPLATE([ACE_LACKS_PRAGMA_ONCE],
 [Compiler complains about use of obsolete "pragma once"])
 
-AH_TEMPLATE([ACE_LACKS_PRI_T],
-[Platform lacks pri_t (e.g., Tandem NonStop UNIX).])
-
 AH_TEMPLATE([ACE_LACKS_THREAD_STACK_ADDR],
 [Platform lack pthread_attr_setstackaddr()])
 
@@ -992,9 +993,6 @@ AH_TEMPLATE([ACE_LACKS_SYS_MSG_H],
 AH_TEMPLATE([ACE_LACKS_SYSV_MSQ_PROTOS],
 [Platform lacks SYSV message queue prototypes])
 
-AH_TEMPLATE([ACE_LACKS_KEY_T],
-[Platform lacks key_t (e.g., Chorus, VxWorks, Win32)])
-
 AH_TEMPLATE([ACE_LACKS_SI_ADDR],
 [Platform lacks the si_addr field of siginfo_t (e.g., VxWorks and
    HP/UX 10.x)])
@@ -1059,8 +1057,6 @@ AH_TEMPLATE([ACE_LACKS_UNIX_SIGNALS],
 AH_TEMPLATE([ACE_LACKS_UTSNAME_T],
 [Platform lacks struct utsname (e.g., Win32 and VxWorks)])
 
-AH_TEMPLATE([ACE_LACKS_WCHAR_T],[Platform lacks wchar_t typedef])
-
 AH_TEMPLATE([ACE_HAS_3_PARAM_WCSTOK],
 [Platform's wcstok() takes 3 arguments])
 
@@ -1127,6 +1123,9 @@ AH_TEMPLATE([ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION],
    explicit C++ specializations for all used templates. This is also
    used for GNU G++ if you don't use the "repo" patches.])
 
+AH_TEMPLATE([ACE_HAS_ICMP_SUPPORT],
+[Defined to 1 if platform supports ICMP over raw sockets])
+
 AH_TEMPLATE([ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA],
 [Compiler's template instantiation mechanism supports the use of
    "#pragma instantiate".  Edison Design Group compilers, e.g., SGI
@@ -1147,11 +1146,17 @@ AH_TEMPLATE([ACE_USE_POLL],
 
 AH_TEMPLATE([ACE_POLL_IS_BROKEN],[Platform has broken poll()])
 
+AH_TEMPLATE([ACE_HAS_EVENT_POLL],[Platform (Linux) supports event poll 
+  interface.])
+
+AH_TEMPLATE([ACE_HAS_DEV_POLL],[Platform supports /dev/poll character
+  device.])
+
 AH_TEMPLATE([ACE_USES_ASM_SYMBOL_IN_DLSYM],
 [Platform uses assembly symbols instead of C symbols in dlsym()])
 
 AH_TEMPLATE([ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB],
-[Platform has its standard c++ library in the namespace std.])
+[Platform has its standard C++ library in the namespace std.])
 
 AH_TEMPLATE([HAVE_RESTARTABLE_SYSCALLS],[])
 
diff --git a/m4/platform.m4 b/m4/platform.m4
index c0e477f5695..67e0f161282 100644
--- a/m4/platform.m4
+++ b/m4/platform.m4
@@ -375,12 +375,12 @@ AH_TEMPLATE([ACE_INT64_FORMAT_SPECIFIER],
 AH_TEMPLATE([ACE_UINT64_FORMAT_SPECIFIER],
 [Define to the *printf format specifier (e.g. "%llu") for the 64 bit signed integer type])dnl
 
-case "$target_os" in
+case "$host_os" in
 darwin*)
   AC_DEFINE([ACE_SIZE_T_FORMAT_SPECIFIER], ["%lu"])
   ;;
 netbsd*)
-  case "$target_cpu" in
+  case "$host_cpu" in
     x86_64)
       AC_DEFINE([ACE_SIZE_T_FORMAT_SPECIFIER], ["%lu"])
       AC_DEFINE([ACE_SSIZE_T_FORMAT_SPECIFIER], ["%ld"])
@@ -406,7 +406,7 @@ esac])
 AC_DEFUN([ACE_CHECK_LACKS_PERFECT_MULTICAST_FILTERING],
 [AC_CACHE_CHECK([whether platform lacks perfect multicast filtering],
   [ace_cv_lacks_perfect_multicast_filtering],
-  [case "$target_os" in
+  [case "$host_os" in
   darwin* | freebsd* | netbsd* | openbsd* | qnx*)
     ace_cv_lacks_perfect_multicast_filtering=yes ;;
   *)
@@ -437,7 +437,7 @@ fi
 AC_DEFUN([ACE_FUNC_IOCTL_ARGTYPES],
 [AC_CACHE_CHECK([types of arguments for ioctl()],
   [ace_cv_func_ioctl_arg2],
-  [case "$target_os" in
+  [case "$host_os" in
    darwin* | freebsd* | netbsd* | openbsd*)
     ace_cv_func_ioctl_arg2="unsigned long" ;;
    *)
@@ -458,9 +458,12 @@ AC_DEFUN([ACE_VAR_TIMEZONE],
 [AC_CACHE_CHECK([for timezone variable],
 		[ace_cv_var_timezone],
 		[AC_TRY_LINK([#include <time.h>],
-			     [return (int)timezone;],
-		             [ace_cv_var_timezone=yes],
-			     [ace_cv_var_timezone=no])
+			     [return (int) timezone(0, 0);],
+		             [ace_cv_var_timezone=no],
+			     [AC_TRY_LINK([#include <time.h>],
+					  [return (int) timezone;],
+					  [ace_cv_var_timezone=yes],
+			                  [ace_cv_var_timezone=no])])
 		])
 if test "$ace_cv_var_timezone" = yes; then
   AC_DEFINE([ACE_HAS_TIMEZONE], 1,
diff --git a/m4/threads.m4 b/m4/threads.m4
index bfffd5ac02a..d6fc759b4c1 100644
--- a/m4/threads.m4
+++ b/m4/threads.m4
@@ -67,60 +67,70 @@ dnl  AC_REQUIRE([AC_LANG])
     dnl Do nothing
    ])
 
- dnl Check for UNIX International Threads -- STHREADS
- AC_SEARCH_LIBS([thr_create], [thread],
-   [
-    ace_has_sthreads=yes
-    AC_DEFINE([ACE_HAS_STHREADS], 1, 
-	      [Define to 1 if platform has UNIX International Threads])
-   ],
-   [
-    ace_has_sthreads=no
-   ])
-
- dnl Sometimes thr_create is actually found with explicitly linking against
- dnl -lthread, so try a more "exotic" function.
- AC_SEARCH_LIBS([rwlock_destroy], [thread],[],[])
+ dnl Check for UNIX International Threads (ACE calls this STHREADS)
+ dnl This used to check for thr_create(), but AIX has a semi-functional
+ dnl UI Threads capability that includes thr_create(). We don't want to
+ dnl find such a half-hearted UI Threads, so this was changed to look for
+ dnl a UI Threads function that AIX doesn't offer.
+ AS_IF([test "$ace_user_enable_uithreads" = yes],
+   [ AC_MSG_CHECKING([for UNIX International threads capability])
+     AC_SEARCH_LIBS([mutex_lock], [thread],
+     [
+       ace_has_sthreads=yes
+       AC_DEFINE([ACE_HAS_STHREADS], 1, 
+	         [Define to 1 if platform has UNIX International Threads])
+     ],
+     [
+       ace_has_sthreads=no
+     ])
+     dnl Sometimes thr_create is actually found with explicitly linking against
+     dnl -lthread, so try a more "exotic" function.
+     AC_SEARCH_LIBS([rwlock_destroy], [thread],[],[])
+     AC_MSG_RESULT([$ace_has_sthreads])
+   ],[])
 
  dnl Check if any thread related preprocessor flags are needed.
  ACE_CHECK_THREAD_CPPFLAGS
 
  dnl Check for POSIX threads
  ace_has_pthreads=no
-
- AC_MSG_CHECKING([for POSIX threads library])
-
- ACE_CHECK_POSIX_THREADS(
-   [
-    ace_has_pthreads=yes
-    AC_DEFINE([ACE_HAS_PTHREADS], 1,
-	      [Define to 1 if platform has POSIX threads])
-    AC_MSG_RESULT([none required])
-   ],
-   [])
-
- AS_IF([test "$ace_has_pthreads" != yes],
-   [
-    ace_posix_threads_search_LIBS="$LIBS"
-    for ace_p in pthread pthreads c_r gthreads; do
-      LIBS="-l$ace_p $ace_posix_threads_search_LIBS"
-      ACE_CHECK_POSIX_THREADS(
-        [
+ AS_IF([test "$ace_user_enable_pthreads" = yes],
+   [ AC_MSG_CHECKING([for POSIX threads library])
+     ACE_CHECK_POSIX_THREADS(
+       [
          ace_has_pthreads=yes
-         AC_DEFINE([ACE_HAS_PTHREADS])
-         AC_MSG_RESULT([-l$ace_p])
-         break
+         AC_DEFINE([ACE_HAS_PTHREADS], 1,
+	           [Define to 1 if platform has POSIX threads])
+         AC_MSG_RESULT([none required])
+       ],
+       [])
+
+     AS_IF([test "$ace_has_pthreads" != yes],
+       [
+         ace_posix_threads_search_LIBS="$LIBS"
+         for ace_p in pthread pthreads c_r gthreads; do
+           LIBS="-l$ace_p $ace_posix_threads_search_LIBS"
+           ACE_CHECK_POSIX_THREADS(
+             [
+               ace_has_pthreads=yes
+               AC_DEFINE([ACE_HAS_PTHREADS])
+               AC_MSG_RESULT([-l$ace_p])
+               break
+             ],
+             [])
+         done
+
+         AS_IF([test "$ace_has_pthreads" != yes],
+           [
+             AC_MSG_RESULT([no])
+             LIBS="$ace_posix_threads_search_LIBS"
+           ],[])
         ],
         [])
-    done
-
-    AS_IF([test "$ace_has_pthreads" != yes],
-      [
-       AC_MSG_RESULT([no])
-       LIBS="$ace_posix_threads_search_LIBS"
-      ],[])
    ],
-   [])
+   [
+     AC_MSG_NOTICE([Pthreads disabled by user; not checking for it])
+   ])
 
  dnl If we don't have any thread library, then disable threading altogether!
  AS_IF([test "$ace_has_pthreads" != yes && test "$ace_has_sthreads" != yes],
@@ -143,13 +153,24 @@ AC_DEFUN([ACE_CHECK_THREAD_FLAGS],
  dnl to get around this nuisance by checking the return value of
  dnl thr_create().  The cross-compiled case will use a link-time
  dnl test, instead.
+ dnl Furthermore, we need the implementation to be a real one, not
+ dnl a half-hearted attempt such as that provided on AIX 5. So, we
+ dnl make sure it can at least work with a mutex.
 
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <thread.h>
+#if ((THR_BOUND & THR_SUSPEND & THR_DETACHED) != 0)
+#  error This is a silly UI Threads implementation.
+#endif
 
 extern "C" void *
 ace_start_func (void *)
 {
+ mutex_t m;
+ mutex_init (&m, USYNC_THREAD, NULL);
+ mutex_lock (&m);
+ mutex_unlock (&m);
+ mutex_destroy (&m);
  return 0;
 }
 
diff --git a/m4/tls.m4 b/m4/tls.m4
index 1713802c486..ebbf9d97613 100644
--- a/m4/tls.m4
+++ b/m4/tls.m4
@@ -42,6 +42,7 @@ AC_DEFUN([ACE_CHECK_TLS],
  dnl ---------------------------------------------------------
 
  ace_TLS_CPPFLAGS=""
+ ace_TLS_LDFLAGS=""
 
  dnl Check if OpenSSL requires the Kerberos include directory to be
  dnl added to the header search path.
@@ -49,10 +50,7 @@ AC_DEFUN([ACE_CHECK_TLS],
  AC_CACHE_CHECK([for Kerberos include flags needed by OpenSSL],
  [ac_cv_kerberos_dir],
  [
-  for ace_kerberos in usr usr/local; do
-   ace_TLS_CPPFLAGS="-I/${ace_kerberos}/kerberos/include"
-
-   CPPFLAGS="$ace_TLS_CPPFLAGS $ace_save_CPPFLAGS"
+   dnl Try compiling without any Kerberos-specific flags first.
 
    AC_COMPILE_IFELSE([
      AC_LANG_PROGRAM([
@@ -79,19 +77,59 @@ SSL_shutdown (ssl);
      ])
    ],
    [
-    ac_cv_kerberos_dir="$ace_TLS_CPPFLAGS"
-    break
+    ac_cv_kerberos_dir=no
    ],
    [
-    ac_cv_kerberos_dir=no
-   ])
+    ace_kerberos_dir=""
+    for ace_kerberos in /usr /usr/local; do
+     ace_kerberos_dir="${ace_kerberos}/kerberos/include"
+     ace_TLS_CPPFLAGS="-I${ace_kerberos_dir}"
+
+     CPPFLAGS="$ace_TLS_CPPFLAGS $ace_save_CPPFLAGS"
+
+     AC_COMPILE_IFELSE([
+       AC_LANG_PROGRAM([
+#include <openssl/ssl.h>
+       ],
+       [
+// ... THIS CODE DOES NOTHING!  IT IS JUST USED FOR COMPILE TESTS ...
 
-  done
+// ... Perform TCP connection ...
+
+// ... Perform TLS/SSL stuff ...
+CRYPTO_set_locking_callback (0);
+SSLeay_add_ssl_algorithms ();
+SSL_load_error_strings ();
+SSL_METHOD * meth = TLSv1_method ();
+SSL_CTX * ctx = SSL_CTX_new (meth);
+SSL * ssl = SSL_new (ctx);
+int fd = 2000;  // Dummy file descriptor value.
+SSL_set_fd (ssl, fd);
+SSL_connect (ssl);
+SSL_shutdown (ssl);
+
+// ...
+       ])
+     ],
+     [
+      ac_cv_kerberos_dir="$ace_kerberos_dir"
+      break
+     ],
+     [
+      ac_cv_kerberos_dir=no
+     ])
+    done
+   ])
  ])
 
- if test $ac_cv_kerberos_dir != no; then
-    AC_SUBST([ACE_TLS_CPPFLAGS],[$ace_TLS_CPPFLAGS])
- fi   
+ AS_IF([test "$ac_cv_kerberos_dir" = no],
+       [
+        AC_SUBST([ACE_KERBEROS_INCLUDES],[.])
+       ],
+       [
+        AC_SUBST([ACE_TLS_CPPFLAGS],[-I${ac_cv_kerberos_dir}])
+        AC_SUBST([ACE_KERBEROS_INCLUDES],[$ac_cv_kerberos_dir])
+       ])
 
  dnl ---------------------------------------------------------
 
@@ -136,9 +174,9 @@ SSL_shutdown (ssl);
   ])
  ])
 
- if test $ac_cv_openssl_libs != no; then
-   AC_SUBST([ACE_TLS_LIBS],[$ace_TLS_LIBS])
- fi   
+ AS_IF([test $ac_cv_openssl_libs != no],
+       [AC_SUBST([ACE_TLS_LIBS],[$ace_TLS_LIBS])],
+       [])
 
  AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes])
 
diff --git a/netsvcs/Makefile.am b/netsvcs/Makefile.am
index f3d559265e8..422221e4029 100644
--- a/netsvcs/Makefile.am
+++ b/netsvcs/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         lib \
diff --git a/netsvcs/clients/Logger/Makefile.am b/netsvcs/clients/Logger/Makefile.am
index 962adef1494..72637468a3a 100644
--- a/netsvcs/clients/Logger/Makefile.am
+++ b/netsvcs/clients/Logger/Makefile.am
@@ -6,16 +6,16 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
 ## Makefile.direct_logging.am 
 noinst_PROGRAMS = direct_logging
 
 direct_logging_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
+  -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR)
 
 direct_logging_SOURCES = \
@@ -28,8 +28,7 @@ direct_logging_LDADD = \
 noinst_PROGRAMS += indirect_logging
 
 indirect_logging_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
+  -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR)
 
 indirect_logging_SOURCES = \
@@ -40,6 +39,8 @@ indirect_logging_LDADD = \
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/netsvcs/clients/Makefile.am b/netsvcs/clients/Makefile.am
index 595f146924e..c959505ff73 100644
--- a/netsvcs/clients/Makefile.am
+++ b/netsvcs/clients/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Logger \
diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index 0f87432d246..600860db7dc 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -7,6 +7,7 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Thread_Manager.h"
 #include "Client_Test.h"
+#include "ace/Reactor.h"
 #include "ace/os_include/os_ctype.h"
 #include "ace/OS_NS_signal.h"
 #include "ace/OS_NS_stdio.h"
@@ -14,7 +15,9 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_assert.h"
 
-ACE_RCSID(Client, Client_Test, "$Id$")
+ACE_RCSID (Client,
+           Client_Test,
+           "$Id$")
 
 class ACE_Svc_Export Client_Test : public ACE_Service_Object
 {
@@ -30,7 +33,7 @@ public:
   virtual int handle_input (ACE_HANDLE handle);
   // Handle user entered commands
 
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialize name options and naming context when dynamically
   // linked.
 
@@ -120,7 +123,7 @@ Client_Test::Client_Test (void)
 
 int
 Client_Test::init (int /* argc */,
-                   char * /* argv */ [])
+                   ACE_TCHAR * /* argv */ [])
 {
   ACE_DEBUG ((LM_DEBUG, "Client_Test::init\n"));
 
diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am
index c1e6cfc66ac..342611b669e 100644
--- a/netsvcs/clients/Naming/Client/Makefile.am
+++ b/netsvcs/clients/Naming/Client/Makefile.am
@@ -6,16 +6,16 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Netsvsc_Client_Test_Lib.am 
 noinst_LTLIBRARIES = libClient_Test.la
 
 libClient_Test_la_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
+  -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -DACE_CLIENT_TEST_BUILD_DLL
 
@@ -32,8 +32,7 @@ noinst_HEADERS = \
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
+  -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR)
 
 main_SOURCES = \
@@ -45,6 +44,8 @@ main_LDADD = \
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp
index 25a87893d27..e355386f4bb 100644
--- a/netsvcs/clients/Naming/Client/main.cpp
+++ b/netsvcs/clients/Naming/Client/main.cpp
@@ -6,10 +6,13 @@
 #include "ace/Naming_Context.h"
 #include "ace/ARGV.h"
 #include "ace/Log_Msg.h"
+#include "ace/Reactor.h"
 
 #include "Client_Test.h"
 
-ACE_RCSID(Client, main, "$Id$")
+ACE_RCSID (Client,
+           main,
+           "$Id$")
 
 int
 ACE_TMAIN (int, ACE_TCHAR *argv[])
@@ -20,9 +23,9 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
   // Load the existing <argv> into our new one.
   new_args.add (argv);
   // Enable loading of static services.
-  new_args.add (ACE_TEXT ("-y")); 
+  new_args.add (ACE_TEXT ("-y"));
   // Enable debugging within dynamically linked services.
-  new_args.add (ACE_TEXT ("-d")); 
+  new_args.add (ACE_TEXT ("-d"));
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("argc = %d\n"),
@@ -39,33 +42,33 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
                    new_args.argv ()) == -1)
     {
       if (errno != ENOENT)
-	ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")),
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")),
                           1);
       else // Use static binding.
-	{
+        {
           ACE_ARGV args;
 
           args.add (argv[0]);
-	  args.add (ACE_TEXT ("-p10011")); // Port number.
-	  ACE_Service_Object *so =
+          args.add (ACE_TEXT ("-p10011")); // Port number.
+          ACE_Service_Object *so =
             ACE_SVC_INVOKE (ACE_Naming_Context);
 
-	  if (so->init (args.argc (),
+          if (so->init (args.argc (),
                         args.argv ()) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR,
+            ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("%p\n"),
                                ACE_TEXT ("ACE_Naming_Context")),
                               1);
 
-	  so = ACE_SVC_INVOKE (Client_Test);
+          so = ACE_SVC_INVOKE (Client_Test);
 
-	  if (so->init (0,
+          if (so->init (0,
                         args.argv ()) == -1)
-	    ACE_ERROR ((LM_ERROR,
+            ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Client_Test",
                         1));
-	}
+        }
     }
 
   // Run forever, performing the configured services until we are shut
diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am
index cc5dfd0c1c7..51e678fdac5 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Makefile.am
+++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.am
@@ -6,16 +6,16 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Netsvcs_Dump_Restore_Lib.am 
 noinst_LTLIBRARIES = libDump_Restore.la
 
 libDump_Restore_la_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
+  -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -DACE_BUILD_SVC_DLL
 
@@ -32,8 +32,7 @@ noinst_HEADERS = \
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
+  -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR)
 
 main_SOURCES = \
@@ -41,10 +40,12 @@ main_SOURCES = \
   Dump_Restore.h
 
 main_LDADD = \
-  libDump_Restore.la $(top_builddir)/ace/libACE.la
+ libDump_Restore.la $(top_builddir)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/netsvcs/clients/Naming/Makefile.am b/netsvcs/clients/Naming/Makefile.am
index ce115bb2cc7..883b9bab54d 100644
--- a/netsvcs/clients/Naming/Makefile.am
+++ b/netsvcs/clients/Naming/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 SUBDIRS = \
         Client \
diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am
index 7fd980d3c3b..9bc75012a7d 100644
--- a/netsvcs/lib/Makefile.am
+++ b/netsvcs/lib/Makefile.am
@@ -6,16 +6,16 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
 ## Makefile.netsvcs.am 
-noinst_LTLIBRARIES = libnetsvcs.la
+lib_LTLIBRARIES = libnetsvcs.la
 
 libnetsvcs_la_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
+  -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -DACE_NETSVCS_BUILD_DLL
 
@@ -25,6 +25,7 @@ libnetsvcs_la_SOURCES = \
   Log_Message_Receiver.cpp \
   Name_Handler.cpp \
   Server_Logging_Handler.cpp \
+  Server_Logging_Handler_T.cpp \
   TS_Clerk_Handler.cpp \
   TS_Server_Handler.cpp \
   Token_Handler.cpp
@@ -46,6 +47,8 @@ noinst_HEADERS = \
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index a0c20e4c386..628a604511f 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -560,8 +560,7 @@ ACE_Name_Handler::lists_entries (void)
   int result = -1;
 
   const ACE_Name_Request::Constants msg_type =
-    ACE_static_cast (ACE_Name_Request::Constants,
-                     this->name_request_.msg_type ());
+    static_cast<ACE_Name_Request::Constants> (this->name_request_.msg_type ());
 
   // NOTE:  This multi-branch conditional statement used to be
   // (and should be) a switch statement.  However, it caused
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index abb2d82affb..042f1dcf0aa 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -31,7 +31,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::AC
    // Initialize the CString to something that is not the empty string
    // to avoid problems when calling fast_rep()
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
-  : receiver_ (receiver, ACE_CString (" ", 1))
+  : receiver_ (receiver, ACE_TString (ACE_TEXT(" "), 1))
 #else
   : receiver_ (receiver),
     host_name_ (ACE_TString (ACE_TEXT (" "), 1))
diff --git a/netsvcs/lib/Server_Logging_Handler_T.h b/netsvcs/lib/Server_Logging_Handler_T.h
index 4cf1a5d3fbc..2bd8942093c 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/netsvcs/lib/Server_Logging_Handler_T.h
@@ -70,7 +70,7 @@ protected:
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
-  Base_Optimizer<LOG_MESSAGE_RECEIVER, ACE_CString> receiver_;
+  Base_Optimizer<LOG_MESSAGE_RECEIVER, ACE_TString> receiver_;
   // Packs a LOG_MESSAGE_RECEIVER and ACE_CString attribute together
   // in a optimized fashion.  The LOG_MESSAGE_RECEIVER class is often
   // a class with no instance data.
diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am
index b1dbc676a98..c24b4f8a81c 100644
--- a/netsvcs/servers/Makefile.am
+++ b/netsvcs/servers/Makefile.am
@@ -6,17 +6,16 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
 
-ACE_ROOT = $(top_srcdir)
 ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
 ## Makefile.Netsvcs_server.am 
 noinst_PROGRAMS = main
 
 main_CPPFLAGS = \
-  -I$(top_builddir) \
-  -I$(top_srcdir) \
+  -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/netsvcs/lib
 
@@ -28,6 +27,8 @@ main_LDADD = \
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/performance-tests/Misc/Misc.mpc b/performance-tests/Misc/Misc.mpc
index 94a3bea51b4..5c2aa3ec7d5 100644
--- a/performance-tests/Misc/Misc.mpc
+++ b/performance-tests/Misc/Misc.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*basic_perf) : aceexe {
+  exename = basic_perf
   Source_Files {
     basic_func.cpp
     basic_perf.cpp
@@ -9,36 +10,42 @@ project(*basic_perf) : aceexe {
 }
 
 project(*childbirth_time) : aceexe {
+  exename = childbirth_time
   Source_Files {
     childbirth_time.cpp
   }
 }
 
 project(*context_switch_time) : aceexe {
+  exename = context_switch_time
   Source_Files {
     context_switch_time.cpp
   }
 }
 
 project(*test_mutex) : aceexe {
+  exename = test_mutex
   Source_Files {
     test_mutex.cpp
   }
 }
 
 project(*test_naming) : aceexe {
+  exename = test_naming
   Source_Files {
     test_naming.cpp
   }
 }
 
 project(*test_singleton) : aceexe {
+  exename = test_singleton
   Source_Files {
     test_singleton.cpp
   }
 }
 
 project(*preempt) : aceexe {
+  exename = preempt
   Source_Files {
     preempt.cpp
   }
@@ -46,6 +53,7 @@ project(*preempt) : aceexe {
 
 // May need to add an ace_obsolete_guard_class feature
 //project(*test_guard) : aceexe {
+//  exename = test_guard
 //  Source_Files {
 //    test_guard.cpp
 //  }
diff --git a/performance-tests/Misc/basic_perf.cpp b/performance-tests/Misc/basic_perf.cpp
index c34adbceb9c..d084e84e1b2 100644
--- a/performance-tests/Misc/basic_perf.cpp
+++ b/performance-tests/Misc/basic_perf.cpp
@@ -130,7 +130,7 @@ Basic_Test::iteration_time (void)
 {
   return per_iteration (elapsed_time_ > empty_iteration_time_  ?
                           elapsed_time_ - empty_iteration_time_  :
-                          ACE_static_cast (ACE_hrtime_t, 0));
+                          static_cast<ACE_hrtime_t> (0));
 }
 
 void
diff --git a/performance-tests/Misc/childbirth_time.cpp b/performance-tests/Misc/childbirth_time.cpp
index 308f3f97e48..f487f58eed3 100644
--- a/performance-tests/Misc/childbirth_time.cpp
+++ b/performance-tests/Misc/childbirth_time.cpp
@@ -350,8 +350,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
           iteration = ACE_OS::atoi (get_opt.opt_arg ());
           break;
         case 'l':
-          MULTIPLY_FACTOR = ACE_static_cast (size_t,
-                                             ACE_OS::atoi (get_opt.opt_arg ()));
+          MULTIPLY_FACTOR = static_cast<size_t> (ACE_OS::atoi (get_opt.opt_arg ()));
           break;
         case 'p':                       // test ACE_Process.spawn ()
           profiler = prof_ace_process;
diff --git a/performance-tests/Misc/context_switch_time.cpp b/performance-tests/Misc/context_switch_time.cpp
index d4c70e005eb..084d85eaca6 100644
--- a/performance-tests/Misc/context_switch_time.cpp
+++ b/performance-tests/Misc/context_switch_time.cpp
@@ -828,8 +828,7 @@ High_Priority_Synchronized_Task::svc ()
     Mutex_Acquire_Release_Test mutex_acquire_release_test (num_iterations);
     mutex_acquire_release_test.svc ();
     mutex_acquire_release_time =
-      ACE_static_cast (ACE_UINT32,
-                       mutex_acquire_release_test.elapsed_time () /
+      static_cast<ACE_UINT32> (mutex_acquire_release_test.elapsed_time () /
                        num_iterations);
 #if ACE_DEBUG_CST > 0
     ACE_DEBUG ((LM_DEBUG, "mutex_acquire_release: %u nsec\n",
@@ -901,8 +900,7 @@ High_Priority_Synchronized_Task::done ()
 ACE_UINT32
 High_Priority_Synchronized_Task:: average_context_switch_time () const
 {
-  return iterations_ > 0  ?  ACE_static_cast (ACE_UINT32,
-                                              total_time_ / iterations_)
+  return iterations_ > 0  ?  static_cast<ACE_UINT32> (total_time_ / iterations_)
                           : 0;
 }
 
@@ -989,8 +987,7 @@ Synchronized_Suspend_Resume_Test::svc ()
     Mutex_Acquire_Release_Test mutex_acquire_release_test (num_iterations);
     mutex_acquire_release_test.svc ();
     mutex_acquire_release_time_ =
-      ACE_static_cast (ACE_UINT32,
-                       mutex_acquire_release_test.elapsed_time () /
+      static_cast<ACE_UINT32> (mutex_acquire_release_test.elapsed_time () /
                        num_iterations);
 #if ACE_DEBUG_CST > 0
     ACE_DEBUG ((LM_DEBUG, "mutex_acquire_release: %u nsec\n",
diff --git a/performance-tests/SCTP/Options_Manager.cpp b/performance-tests/SCTP/Options_Manager.cpp
index 8bfbc42a270..6d28a393fdf 100644
--- a/performance-tests/SCTP/Options_Manager.cpp
+++ b/performance-tests/SCTP/Options_Manager.cpp
@@ -1,13 +1,9 @@
 // -*- C++ -*-
-
 // $Id$
 
-extern "C" {
-#include "ace/os_include/sys/os_types.h"
-}
-
 #include "ace/Get_Opt.h"
 #include "ace/os_include/netinet/os_in.h"
+#include "ace/os_include/sys/os_types.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 
@@ -61,10 +57,10 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
 {
   if (!__initialized) {
     // Set default values that were not set during static initialization
-    ACE_OS::strcpy(server_host, "localhost");
+    ACE_OS::strcpy(server_host, ACE_LOCALHOST);
 
     // Remember argv[0]
-    if (strlen(argv[0]) < Options_Manager::string_len)
+    if (ACE_OS::strlen(argv[0]) < Options_Manager::string_len)
       ACE_OS::strcpy(__program_name, argv[0]);
     else{
       ACE_OS::strncpy(__program_name, argv[0], (Options_Manager::string_len-1));
@@ -73,33 +69,47 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
 
     // Declare options with ACE_Get_Opt
     int c;
-    ACE_Get_Opt * get_opt=NULL;
-    if (!ACE_OS::strcmp("client-opts", opts_set)){
+    ACE_Get_Opt * get_opt = 0;
+    if (!ACE_OS::strcmp(ACE_TEXT ("client-opts"), opts_set)){
       get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h"));
 
-      get_opt->long_option("test_iterations",         'c', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("test_enable_nagle",       'n');
-      get_opt->long_option("test_transport_protocol", 't', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("histogram_min_bin",       'm', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("histogram_max_bin",       'M', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("histogram_num_outliers",  'x', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("histogram_bin_count",     'b', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("client_port",             'C', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("client_accept_addr",      'i', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("server_port",             'p', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("server_host",             'H', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("payload_size_power_of_2", 's', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("help",                    'h');
-    } else if (!ACE_OS::strcmp("server-opts", opts_set)){
+      get_opt->long_option (ACE_TEXT ("test_iterations"),         'c',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("test_enable_nagle"),       'n');
+      get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("histogram_min_bin"),       'm',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("histogram_max_bin"),       'M',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("histogram_num_outliers"),  'x',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("histogram_bin_count"),     'b',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("client_port"),             'C',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("client_accept_addr"),      'i',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("server_port"),             'p',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("server_host"),             'H',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("payload_size_power_of_2"), 's',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("help"),                    'h');
+    } else if (!ACE_OS::strcmp (ACE_TEXT ("server-opts"), opts_set)){
       get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("nt:p:a:u"));
-      get_opt->long_option("test_enable_nagle",       'n');
-      get_opt->long_option("test_transport_protocol", 't', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("server_port",             'p', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("server_accept_addr",      'a', ACE_Get_Opt::ARG_REQUIRED);
-      get_opt->long_option("help",                    'h');
+      get_opt->long_option (ACE_TEXT ("test_enable_nagle"),       'n');
+      get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("server_port"),             'p',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("server_accept_addr"),      'a',
+                            ACE_Get_Opt::ARG_REQUIRED);
+      get_opt->long_option (ACE_TEXT ("help"),                    'h');
     } else {
       _error = 1;
-      _error_message = "invalid options set specified";
+      _error_message = ACE_TEXT ("invalid options set specified");
       delete get_opt;
       return;
     }
@@ -116,10 +126,10 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
             test_enable_nagle     = 1;
             break;
           case 't':{
-            char const * const str=get_opt->opt_arg();
-            if (!ACE_OS::strcmp(str, "tcp"))
+            ACE_TCHAR const * const str = get_opt->opt_arg ();
+            if (!ACE_OS::strcmp (str, ACE_TEXT ("tcp")))
               test_transport_protocol = IPPROTO_TCP;
-            else if (!ACE_OS::strcmp(str, "sctp"))
+            else if (!ACE_OS::strcmp (str, ACE_TEXT ("sctp")))
               test_transport_protocol = IPPROTO_SCTP;
             else
               test_transport_protocol = -1;
@@ -146,11 +156,11 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
             // of dotted-decimal ipv4 addresses.
 
             // Create a writable copy of the options argument
-            char str[Options_Manager::string_len];
+            ACE_TCHAR str[Options_Manager::string_len];
             ACE_OS::strncpy(str, get_opt->opt_arg(), Options_Manager::string_len);
 
             // Get a pointer to the first comma in the list
-            char *next_secondary_addr = ACE_OS::strchr(str, ',');
+            ACE_TCHAR *next_secondary_addr = ACE_OS::strchr(str, ',');
 
             // If found, the comma is replaced with \0 and pointer
             // updated to point to the string that begins immediately
@@ -163,17 +173,18 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
             // Obtain the 32-bit, host-byte-order representation of
             // the primary address.
             struct in_addr foo;
-            int aton_retval = ACE_OS::inet_aton(str, &foo);
+            int aton_retval = ACE_OS::inet_aton(ACE_TEXT_ALWAYS_CHAR (str),
+                                                &foo);
 
             // If this representation was not obtained, terminate with
             // an error.
             if (!aton_retval) {
 
-              char error_message[Options_Manager::string_len + 100];
-              ACE_OS::sprintf(error_message,
-                              "Could not make sense of primary "
-                              "address: %s",
-                              str);
+              ACE_TCHAR error_message[Options_Manager::string_len + 100];
+              ACE_OS::strcpy
+                (error_message,
+                 ACE_TEXT ("Could not make sense of primary address: "));
+              ACE_OS::strcat (error_message, str);
 
               _error = 1;
               _error_message = ACE_OS::strdup(error_message);
@@ -207,7 +218,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
                    max_num_secondary_connect_addrs) {
 
               // Get a pointer to the next comma in the list.
-              char *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ',');
+              ACE_TCHAR *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ',');
 
               // If found, the comma is replaced with \0 and pointer
               // updated to point to the string that begins immediately
@@ -219,7 +230,9 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
 
               // Obtain the 32-bit, host-byte-order representation of
               // a secondary address.
-              aton_retval = ACE_OS::inet_aton(next_secondary_addr, &foo);
+              aton_retval =
+                ACE_OS::inet_aton(ACE_TEXT_ALWAYS_CHAR (next_secondary_addr),
+                                  &foo);
 
               // If the representation was obtained without error,
               // store it in the next available slot of the
@@ -230,12 +243,11 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
                   ntohl(foo.s_addr);
               } else {
 
-                char error_message[Options_Manager::string_len + 100];
-                ACE_OS::sprintf(error_message,
-                                "Could not make sense of secondary "
-                                "address: %s",
-                                next_secondary_addr);
-
+                ACE_TCHAR error_message[Options_Manager::string_len + 100];
+                ACE_OS::strcpy
+                  (error_message,
+                   ACE_TEXT ("Could not make sense of secondary address: "));
+                ACE_OS::strcat (error_message, next_secondary_addr);
                 _error = 1;
                 _error_message = ACE_OS::strdup(error_message);
                 break;
@@ -261,11 +273,11 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
             // of dotted-decimal ipv4 addresses.
 
             // Create a writable copy of the options argument
-            char str[Options_Manager::string_len];
+            ACE_TCHAR str[Options_Manager::string_len];
             ACE_OS::strncpy(str, get_opt->opt_arg(), Options_Manager::string_len);
 
             // Get a pointer to the first comma in the list
-            char *next_secondary_addr = ACE_OS::strchr(str, ',');
+            ACE_TCHAR *next_secondary_addr = ACE_OS::strchr(str, ',');
 
             // If found, the comma is replaced with \0 and pointer
             // updated to point to the string that begins immediately
@@ -278,17 +290,18 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
             // Obtain the 32-bit, host-byte-order representation of
             // the primary address.
             struct in_addr foo;
-            int aton_retval = ACE_OS::inet_aton(str, &foo);
+            int aton_retval = ACE_OS::inet_aton (ACE_TEXT_ALWAYS_CHAR (str),
+                                                 &foo);
 
             // If this representation was not obtained, terminate with
             // an error.
             if (!aton_retval) {
 
-              char error_message[Options_Manager::string_len + 100];
-              ACE_OS::sprintf(error_message,
-                              "Could not make sense of primary "
-                              "address: %s",
-                              str);
+              ACE_TCHAR error_message[Options_Manager::string_len + 100];
+              ACE_OS::strcpy
+                (error_message,
+                 ACE_TEXT ("Could not make sense of primary address: "));
+              ACE_OS::strcat (error_message, str);
 
               _error = 1;
               _error_message = ACE_OS::strdup(error_message);
@@ -322,7 +335,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
                    max_num_secondary_accept_addrs) {
 
               // Get a pointer to the next comma in the list.
-              char *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ',');
+              ACE_TCHAR *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ',');
 
               // If found, the comma is replaced with \0 and pointer
               // updated to point to the string that begins immediately
@@ -334,7 +347,9 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
 
               // Obtain the 32-bit, host-byte-order representation of
               // a secondary address.
-              aton_retval = ACE_OS::inet_aton(next_secondary_addr, &foo);
+              aton_retval =
+                ACE_OS::inet_aton (ACE_TEXT_ALWAYS_CHAR (next_secondary_addr),
+                                   &foo);
 
               // If the representation was obtained without error,
               // store it in the next available slot of the
@@ -345,11 +360,11 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
                   ntohl(foo.s_addr);
               } else {
 
-                char error_message[Options_Manager::string_len + 100];
-                ACE_OS::sprintf(error_message,
-                                "Could not make sense of secondary "
-                                "address: %s",
-                                next_secondary_addr);
+                ACE_TCHAR error_message[Options_Manager::string_len + 100];
+                ACE_OS::strcpy
+                  (error_message,
+                   ACE_TEXT ("Could not make sense of secondary address: "));
+                ACE_OS::strcat (error_message, next_secondary_addr);
 
                 _error = 1;
                 _error_message = ACE_OS::strdup(error_message);
@@ -368,8 +383,8 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
             break;
           }
           case 'H':{
-            char const * const str=get_opt->opt_arg();
-            if (strlen(str) < Options_Manager::string_len)
+            ACE_TCHAR const * const str=get_opt->opt_arg();
+            if (ACE_OS::strlen (str) < Options_Manager::string_len)
               ACE_OS::strcpy(server_host, str);
             else{
               ACE_OS::strncpy(server_host, str, (Options_Manager::string_len-1));
@@ -390,49 +405,49 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
     if (test_iterations < 1)
       {
         _error = 1;
-        _error_message = "test_iterations must be no less than than 1";
+        _error_message = ACE_TEXT ("test_iterations must be no less than than 1");
       }
 
     if (histogram_min_bin < 0.0)
       {
         _error = 1;
-        _error_message = "histogram_min_bin must be no less than 0.0";
+        _error_message = ACE_TEXT ("histogram_min_bin must be no less than 0.0");
       }
 
     if (histogram_max_bin < histogram_min_bin)
       {
         _error = 1;
-        _error_message = "histogram_max_bin must be no less than histogram_min_bin";
+        _error_message = ACE_TEXT ("histogram_max_bin must be no less than histogram_min_bin");
       }
 
     if (histogram_num_outliers < 1)
       {
         _error = 1;
-        _error_message = "histogram_num_outliers must be no less than 1";
+        _error_message = ACE_TEXT ("histogram_num_outliers must be no less than 1");
       }
 
     if (histogram_bin_count < 1)
       {
         _error = 1;
-        _error_message = "histogram_bin_count must be no less than 1";
+        _error_message = ACE_TEXT ("histogram_bin_count must be no less than 1");
       }
 
     if ((server_port < 1010 ||
         server_port > 65000) && server_port != 0)
       {
         _error = 1;
-        _error_message = "server_port must be between 1010 and 65000 inclusive, or zero.";
+        _error_message = ACE_TEXT ("server_port must be between 1010 and 65000 inclusive, or zero.");
       }
 
-    if ((!ACE_OS::strcmp("client-opts", opts_set)) && payload_size_power_of_2 > 17)
+    if ((!ACE_OS::strcmp(ACE_TEXT ("client-opts"), opts_set)) && payload_size_power_of_2 > 17)
       {
         _error = 1;
-        _error_message = "payload_size_power_of_2 must be specified between 0 and 16 inclusive";
+        _error_message = ACE_TEXT("payload_size_power_of_2 must be specified between 0 and 16 inclusive");
       }
 
     if (test_transport_protocol == -1) {
       _error = 1;
-      _error_message = "test_transport_protocol may only take 'sctp' and 'tcp' as values";
+      _error_message = ACE_TEXT ("test_transport_protocol may only take 'sctp' and 'tcp' as values");
     }
 
     __initialized = 1;
@@ -441,87 +456,86 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
   }
 }
 
-void Options_Manager::_show_usage(ostream& out, ACE_TCHAR const * const opts_set)
+void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set)
 {
   // Show usage message.  KEEP THE DEFAULTS DISPLAYED HERE IN SYNC
   // WITH THE DEFAULTS SET AT THE BEGINNING OF THE CONSTRUCTOR.
 
-  out << __program_name << " - Measures round trip latency statistics of ACE synchronous" << endl;
+  ACE_OS::fprintf (out, "%s - Measures round trip latency statistics of ACE synchronous\n", __program_name);
   // indent past program name
   for (unsigned int i=0;i<ACE_OS::strlen(__program_name);++i)
-    out << " ";
+    ACE_OS::fprintf (out, " ");
 
-  if (ACE_OS::strstr(__program_name, "SOCK_STREAM_clt") || ACE_OS::strstr(__program_name, "SOCK_STREAM_srv")) {
-    out << "   messaging (SOCK_Stream) using unmarshalled ACE_CDR::Octet." << endl;
+  if (ACE_OS::strstr(__program_name, ACE_TEXT ("SOCK_STREAM_clt")) ||
+      ACE_OS::strstr(__program_name, ACE_TEXT ("SOCK_STREAM_srv"))    ) {
+    ACE_OS::fprintf (out, "   messaging (SOCK_Stream) using unmarshalled ACE_CDR::Octet.\n");
   } else {
-    out << "   messaging (SOCK_SEQPACK) using unmarshalled ACE_CDR::Octet." << endl;
+    ACE_OS::fprintf (out, "   messaging (SOCK_SEQPACK) using unmarshalled ACE_CDR::Octet.\n");
   }
 
-  out << "USAGE: " << __program_name << " [ -<flag> [<val>] | --<name> [<val>] ]..." << endl;
-
-  out << endl;
+  ACE_OS::fprintf (out, "USAGE: %s [ -<flag> [<val>] | --<name> [<val>] ]...\n\n", __program_name);
 
-  if (!ACE_OS::strcmp("client-opts", opts_set)){
-    out << "  Flag  Args           Option-Name                 Default"    << endl;
-    out << "   -c   int            test-iterations             1000000"    << endl;
-    out << "   -n   none           test-enable-nagle           NO NAGLING" << endl;
-    if (ACE_OS::strstr(__program_name, "SOCK_STREAM_clt")) {
-      out << "   -t   str (sctp|tcp) test-transport-protocol     sctp"       << endl;
+  if (!ACE_OS::strcmp (ACE_TEXT ("client-opts"), opts_set)){
+    ACE_OS::fprintf (out,   "  Flag  Args           Option-Name                 Default\n"
+    					    "   -c   int            test-iterations             1000000\n"
+    				        "   -n   none           test-enable-nagle           NO NAGLING\n");
+    if (ACE_OS::strstr(__program_name, ACE_TEXT ("SOCK_STREAM_clt"))) {
+      ACE_OS::fprintf (out, "   -t   str (sctp|tcp) test-transport-protocol     sctp\n");
     }
 
-    out << endl;
+    ACE_OS::fprintf (out, "\n");
 
-    out << "   -m   dbl            histogram-min-bin           0"     << endl;
-    out << "   -M   dbl            histogram-max-bin           10000" << endl;
-    out << "   -x   int            histogram-num-outliers      100"   << endl;
-    out << "   -b   int            histogram-bin-count         1000"  << endl;
+    ACE_OS::fprintf (out, "   -m   dbl            histogram-min-bin           0\n"
+    				      "   -M   dbl            histogram-max-bin           10000\n"
+    					  "   -x   int            histogram-num-outliers      100\n"
+    					  "   -b   int            histogram-bin-count         1000\n");
 
-    out << endl;
+    ACE_OS::fprintf (out, "\n");
 
-    out << "   -C   int            client-port                 assigned by kernel"     << endl;
-    out << "   -i   str            client-connect-addr         INADDR_ANY" << endl;
+    ACE_OS::fprintf (out, "   -C   int            client-port                 assigned by kernel\n"
+    					  "   -i   str            client-connect-addr         INADDR_ANY\n");
 
-    out << endl;
+    ACE_OS::fprintf (out, "\n");
 
-    out << "   -p   int            server-port                 45453"     << endl;
-    out << "   -H   str            server-host                 localhost" << endl;
+    ACE_OS::fprintf (out, "   -p   int            server-port                 45453\n"
+    				      "   -H   str            server-host                 localhost\n");
 
-    out << endl;
+    ACE_OS::fprintf (out, "\n");
 
-    out << "   -s   int (0-16)     payload-size-power-of-2     <MUST SET VALUE>" << endl;
+    ACE_OS::fprintf (out, "   -s   int (0-16)     payload-size-power-of-2     <MUST SET VALUE>\n");
 
-    out << endl;
+    ACE_OS::fprintf (out, "\n");
 
-    out << "   -h   none           help" << endl;
+    ACE_OS::fprintf (out, "   -h   none           help\n");
 
-    out << endl;
+    ACE_OS::fprintf (out, "\n");
 
-  } else if (!ACE_OS::strcmp("server-opts", opts_set)){
-    out << "  Flag  Args           Option-Name                 Default"    << endl;
-    out << "   -n   none           test-enable-nagle           NO NAGLING" << endl;
-    if (ACE_OS::strstr(__program_name, "SOCK_STREAM_srv")) {
-      out << "   -t   str (sctp|tcp) test-transport-protocol     sctp"       << endl;
+  } else if (!ACE_OS::strcmp(ACE_TEXT ("server-opts"), opts_set)){
+    ACE_OS::fprintf (out, "  Flag  Args           Option-Name                 Default\n"
+    				      "   -n   none           test-enable-nagle           NO NAGLING\n");
+    if (ACE_OS::strstr(__program_name, ACE_TEXT ("SOCK_STREAM_srv"))) {
+      ACE_OS::fprintf (out, "   -t   str (sctp|tcp) test-transport-protocol     sctp\n");
     }
 
-    out << endl;
+    ACE_OS::fprintf (out, "\n");
 
-    out << "   -p   int            server-port                 45453"     << endl;
+    ACE_OS::fprintf (out, "   -p   int            server-port                 45453\n");
 
-    if (ACE_OS::strstr(__program_name, "SOCK_SEQPACK_srv")) {
-      out << "   -a   w.x.y.z,a.b.c.d,...  server-accept-addr    INADDR_ANY" << endl;
-      out << "        (comma-separated                                     " << endl;
-      out << "         list of one or more                                 " << endl;
-      out << "         addresses)                                          " << endl;
+    if (ACE_OS::strstr(__program_name, ACE_TEXT ("SOCK_SEQPACK_srv"))) {
+      ACE_OS::fprintf (out, "   -a   w.x.y.z,a.b.c.d,...  server-accept-addr    INADDR_ANY\n"
+      					    "        (comma-separated                                     \n"
+      						"         list of one or more                                 \n"
+      						"         addresses)                                          \n");
     } else {
-      out << "   -a   w.x.y.z        server-accept-addr          INADDR_ANY" << endl;
+      ACE_OS::fprintf (out, "   -a   w.x.y.z        server-accept-addr          INADDR_ANY\n");
     }
 
-    out << "   -h   none           help" << endl;
+    ACE_OS::fprintf (out, "   -h   none           help\n");
 
-    out << endl;
+    ACE_OS::fprintf (out, "\n");
 
   } else {
-    out << "Invalid options set specified." << endl;
+    ACE_OS::fprintf (out, "Invalid options set specified.\n");
   }
 
   return;
diff --git a/performance-tests/SCTP/Options_Manager.h b/performance-tests/SCTP/Options_Manager.h
index 2b9b8b3b7d3..7fbcc2dbfcc 100644
--- a/performance-tests/SCTP/Options_Manager.h
+++ b/performance-tests/SCTP/Options_Manager.h
@@ -13,6 +13,7 @@
 #endif
 
 #include "ace/streams.h"
+#include "ace/OS_NS_stdio.h"
 
 class Options_Manager
 {
@@ -55,7 +56,7 @@ public:
   static const ACE_TCHAR* _error_message;
 
   static ACE_CDR::UShort _usage;
-  void _show_usage(ostream& out, ACE_TCHAR const * const opts_set);
+  void _show_usage(FILE* out, ACE_TCHAR const * const opts_set);
 
 private:
   static ACE_CDR::Boolean __initialized;
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp b/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp
index f47421060f4..bb423300062 100644
--- a/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp
+++ b/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp
@@ -30,7 +30,7 @@
 
 void dump_names(const ACE_SOCK_SEQPACK_Association& assoc);
 
-int main (int argc, ACE_TCHAR *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int status = 0;     // Innocent until proven guilty
 
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
index 140efc1784b..0307b36ddab 100644
--- a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
+++ b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/OS_Memory.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_SEQPACK_Association.h"
 #include "ace/SOCK_SEQPACK_Connector.h"
@@ -41,26 +42,26 @@ ACE_UINT32 const microsec_clock_scale_factor = ACE_High_Res_Timer::global_scale_
 // file readability.
 HIST runTest(ACE_SOCK_SEQPACK_Association &);
 
-int main(int argc, char **argv){
+int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
   // Initialize the options manager
-  Options_Manager optsMgr(argc, argv, "client-opts");
+  Options_Manager optsMgr(argc, argv, ACE_TEXT ("client-opts"));
 
   // show usage is requested
   if (optsMgr._usage) {
-    optsMgr._show_usage(cerr, "client-opts");
+    optsMgr._show_usage(stderr, ACE_TEXT ("client-opts"));
     return 1;
   }
 
 #ifndef ACE_HAS_SCTP
   ACE_ERROR_RETURN((LM_ERROR,
-                    "SCTP was NOT installed/accessible when this binary was compiled.\n"),
+                    ACE_TEXT ("SCTP was NOT installed/accessible when this binary was compiled.\n")),
                    1);
 #endif
 
   // check that valid options were specified
   if (optsMgr._error) {
-    cerr << "ERROR: " << optsMgr._error_message << endl;
+    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
     return 1;
   }
 
@@ -89,12 +90,12 @@ int main(int argc, char **argv){
                          0,clientAddr, 0, 0, 0, optsMgr.test_transport_protocol) == -1) /*, // ALL DEFAULT ARGUMENTS
                                                                                                  Options_Manager::test_transport_protocol) == -1) */
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "connection failed"),
+                       ACE_TEXT ("(%P|%t) %p\n"),
+                       ACE_TEXT ("connection failed")),
                       1);
 
   // run the test
-  HIST testResultsHistogram = NULL;
+  HIST testResultsHistogram = 0;
   // connection is closed by runTest* functions
   testResultsHistogram = runTest(dataStream);
 
@@ -174,8 +175,8 @@ HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_SEQPA
     nagle=1;
   if (-1 == stream.set_option(IPPROTO_SCTP, SCTP_NODELAY, &nagle, sizeof nagle))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "set_option"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("set_option")),
                       0);
 
   // prime the client and server before starting the test
@@ -186,33 +187,33 @@ HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_SEQPA
     ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen);
     if (-1 == stream.send_n (&msgLenExpressed, ACE_CDR::LONG_SIZE, 0, &bt))
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "send_n"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("send_n")),
                         0);
 
     // send a message
     if (-1 == stream.send_n (buf, msgLen, 0, &bt))
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "send_n"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("send_n")),
                         0);
 
     // block for a Short reply
     ACE_CDR::Short reply;
     if ((stream.recv_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "recv_n"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("recv_n")),
                        0);
   }
 
   // AFTER PRIMING THE PUMP CREATE THE HISTOGRAM
-  HIST aceStream_hist=NULL;
+  HIST aceStream_hist = 0;
   aceStream_hist = createHistogram(msgLen);
-  if (NULL == aceStream_hist)
+  if (0 == aceStream_hist)
     ACE_ERROR_RETURN((LM_ERROR,
-                      "%p\n",
-                      "histogram create failed"),
+                      ACE_TEXT ("%p\n"),
+                      ACE_TEXT ("histogram create failed")),
                      0);
 
   iovec iov[2];
@@ -223,45 +224,43 @@ HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_SEQPA
     startTime = ACE_OS::gethrtime();
     if (!startTime)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "ACE_OS::gethrtime()"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("ACE_OS::gethrtime()")),
                        0);
 
     ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen);
-    iov[0].iov_base = ACE_reinterpret_cast(char *, &msgLenExpressed);
+    iov[0].iov_base = reinterpret_cast<char *> (&msgLenExpressed);
     iov[0].iov_len = ACE_CDR::LONG_SIZE;
-    iov[1].iov_base = ACE_reinterpret_cast(char *, buf);
+    iov[1].iov_base = reinterpret_cast<char *> (buf);
     iov[1].iov_len = msgLen;
 
     if (-1 == stream.sendv_n (iov, 2))
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "send_n"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("send_n")),
                         0);
 
     // block for a Short reply
     ACE_CDR::Short reply;
     if ((stream.recv_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "recv_n"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("recv_n")),
                        0);
 
     // get the end time
     endTime = ACE_OS::gethrtime();
     if (!endTime)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "ACE_OS::gethrtime()"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("ACE_OS::gethrtime()")),
                        0);
 
     // compute the message latency in micro-seconds
     messageLatency_usec =
 
-      (ACE_static_cast(double,
-                       ACE_UINT64_DBLCAST_ADAPTER(endTime)) -
-       ACE_static_cast(double,
-                       ACE_UINT64_DBLCAST_ADAPTER(startTime)))
+      (static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER(endTime)) -
+       static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER(startTime)))
 
       / microsec_clock_scale_factor;
 
@@ -288,13 +287,13 @@ HIST runTest(ACE_SOCK_SEQPACK_Association & stream)
   size_t msgLen = 1;
   for (int i=1; i <= Options_Manager::payload_size_power_of_2; i++)
     msgLen *= 2;
-  
+
 
 
   // send a header to the server that contains test parameters
   if (sendHeader(stream) < 0)
     ACE_ERROR_RETURN((LM_ERROR,
-                      "Could NOT Send CDR Encoded Header"),
+                      ACE_TEXT ("Could NOT Send CDR Encoded Header")),
                      0);
 
   // create the forward message buffer
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
index 0191628c60c..84db9afc541 100644
--- a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
+++ b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
@@ -44,7 +44,7 @@ struct ArgStruct {
 static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
 
   // unbundle the arguments
-  ArgStruct * args = ACE_reinterpret_cast(ArgStruct *,arg);
+  ArgStruct * args = reinterpret_cast<ArgStruct *> (arg);
   ACE_SOCK_SEQPACK_Association * dataModeStream = args->stream;
   ACE_CDR::ULong numIterations = args->numIters;
   delete args;
@@ -59,13 +59,13 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
     // read the size of the buffer to follow
     if ((dataModeStream->recv_n(&msgBufSize, ACE_CDR::LONG_SIZE, 0, &bt)) == -1)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "recv_n"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("recv_n")),
                        0);
     msgBufSize = ACE_NTOHL(msgBufSize);
 
     // allocate the buffer for the message payload
-    ACE_CDR::Octet * msgBuf=NULL;
+    ACE_CDR::Octet * msgBuf = 0;
     ACE_NEW_RETURN(msgBuf,
                    ACE_CDR::Octet[msgBufSize],
                    0);
@@ -73,8 +73,8 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
     // read the buffer
     if ((dataModeStream->recv_n(msgBuf, msgBufSize, 0, &bt)) == -1)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "recv_n"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("recv_n")),
                        0);
 
     // clean up the allocated buffer
@@ -86,8 +86,8 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
     ACE_CDR::Short reply;
     if ((dataModeStream->send_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "send_n"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("send_n")),
                        0);
 
   } while (--numIterations);
@@ -96,7 +96,7 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
   dataModeStream->close();
   delete dataModeStream;
 
-  return NULL;
+  return 0;
 }
 
 // sets up the dataModeSocket Stream, reads the test header infomation
@@ -112,8 +112,8 @@ static void run_server (ACE_HANDLE handle)
   // Make sure we're not in non-blocking mode.
   if (dataModeStream->disable (ACE_NONBLOCK) == -1){
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "disable"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("disable")));
     return;
   }
   else if (dataModeStream->get_remote_addr (cli_addr) == -1){
@@ -135,13 +135,13 @@ static void run_server (ACE_HANDLE handle)
   if (-1 == dataModeStream->set_option(IPPROTO_SCTP, SCTP_NODELAY, &nagle, sizeof nagle)){
     // can't ise ACE_ERROR_RETURN b/c function has void return value
     ACE_ERROR((LM_ERROR,
-               "%p\n",
-               "set_option"));
+               ACE_TEXT ("%p\n"),
+               ACE_TEXT ("set_option")));
     return;
   }
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) client %s connected from %d\n",
+              ACE_TEXT("(%P|%t) client %C connected from %d\n"),
               cli_addr.get_host_name (),
               cli_addr.get_port_number ()));
 
@@ -158,8 +158,8 @@ static void run_server (ACE_HANDLE handle)
   // read the header
   if ((dataModeStream->recv_n(hdrBuf_a, hdrBufSize, 0, &bt)) == -1){
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "recv_n"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("recv_n")));
     return;
   }
 
@@ -179,14 +179,14 @@ static void run_server (ACE_HANDLE handle)
   // make sure the stream is good after the extractions
   if (!hdrCDR.good_bit()){
     ACE_ERROR((LM_ERROR,
-               "%p\n",
-               "hdrCDR"));
+               ACE_TEXT ("%p\n"),
+               ACE_TEXT ("hdrCDR")));
 
     return;
   }
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Test for %u iterations\n",
+              ACE_TEXT ("(%P|%t) Test for %u iterations\n"),
               numIterations));
 
   // deallocate the header buffer
@@ -201,37 +201,37 @@ static void run_server (ACE_HANDLE handle)
   // Spawn a new thread and run the new connection in that thread of
   // control using the <server> function as the entry point.
   if (ACE_Thread_Manager::instance ()->spawn (unmarshalledOctetServer,
-                                              ACE_reinterpret_cast(void *,args),
+                                              reinterpret_cast<void *> (args),
                                               THR_DETACHED) == -1)
     ACE_ERROR ((LM_ERROR,
-                "(%P|%t) %p\n",
-                "spawn"));
+                ACE_TEXT ("(%P|%t) %p\n"),
+                ACE_TEXT ("spawn")));
 #else
-  (*unmarshalledOctetServer) (ACE_reinterpret_cast(void *, args));
+  (*unmarshalledOctetServer) (reinterpret_cast<void *> (args));
 #endif /* ACE_HAS_THREADS */
 
 }
 
-int main(int argc, char **argv){
+int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
-  Options_Manager optsMgr(argc, argv, "server-opts");
+  Options_Manager optsMgr(argc, argv, ACE_TEXT ("server-opts"));
 
   // show usage is requested
   if (optsMgr._usage) {
-    optsMgr._show_usage(cerr, "server-opts");
+    optsMgr._show_usage(stderr, ACE_TEXT ("server-opts"));
     return 1;
   }
 
 #ifndef ACE_HAS_SCTP
   // SCTP is not installed. Exit with informative error message.
   ACE_ERROR_RETURN((LM_ERROR,
-                    "SCTP was NOT installed/accessible when this binary was compiled.\n"),
+                    ACE_TEXT ("SCTP was NOT installed/accessible when this binary was compiled.\n")),
                    1);
 #endif
 
   // check that valid options were specified
   if (optsMgr._error) {
-    cerr << "ERROR: " << optsMgr._error_message << endl;
+    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
     return 1;
   }
 
@@ -259,8 +259,8 @@ int main(int argc, char **argv){
                            ACE_DEFAULT_BACKLOG,
                            optsMgr.test_transport_protocol) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       1);
 
   // this function checks that the port that was actually bound was
@@ -269,24 +269,26 @@ int main(int argc, char **argv){
   // used.
   if (acceptor_socket.get_local_addr(serverAddr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_local_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_local_addr")),
                       1);
 
     sockaddr_in *addresses = new sockaddr_in[ 1 + serverAddr.get_num_secondary_addresses() ];
     serverAddr.get_addresses( addresses, 1 + serverAddr.get_num_secondary_addresses() ) ;
-    ACE_DEBUG((LM_DEBUG,
-               "(%P|%t) Accepting connections, using %s on port %u "
-               "on interfaces %s",
-               (optsMgr.test_transport_protocol == IPPROTO_SCTP) ? "IPPROTO_SCTP" : "IPPROTO_TCP", 
-               serverAddr.get_port_number(), 
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT ("(%P|%t) Accepting connections, using %C on ")
+                ACE_TEXT ("port %u on interfaces %C"),
+               (optsMgr.test_transport_protocol == IPPROTO_SCTP) ? "IPPROTO_SCTP" : "IPPROTO_TCP",
+               serverAddr.get_port_number(),
                ACE_OS::inet_ntoa( addresses[0].sin_addr)  ));
 
    unsigned int i;
-   for(i=1; i < serverAddr.get_num_secondary_addresses() ; ++i ) {
-     ACE_DEBUG((LM_DEBUG, " and %s", ACE_OS::inet_ntoa( addresses[i].sin_addr) ));
+   for(i=1; i <= serverAddr.get_num_secondary_addresses() ; ++i ) {
+     ACE_DEBUG ((LM_DEBUG,
+                 ACE_TEXT (" and %C"),
+                 ACE_OS::inet_ntoa (addresses[i].sin_addr)));
    }
-   ACE_DEBUG((LM_DEBUG, "\n" ));
+   ACE_DEBUG((LM_DEBUG, ACE_TEXT ("\n")));
 
    delete[] addresses;
 
@@ -319,31 +321,31 @@ int main(int argc, char **argv){
     // check that select did not end with an error.
     if (result == -1)
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) %p\n",
-                  "select"));
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("select")));
     // check to see if select timed out.
     else if (result == 0){
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) select timed out\n"));
+                  ACE_TEXT ("(%P|%t) select timed out\n")));
 
     }
     else { // case where a file descriptor was actually set
       if (!(temp.is_set(acceptor_socket.get_handle()))){
         // CANNOT BE REACHED
         ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) %p\n",
-                    "select: NO ERROR BUT NO FD SET"));
+                    ACE_TEXT ("(%P|%t) %p\n"),
+                    ACE_TEXT ("select: NO ERROR BUT NO FD SET")));
       } else {
         // call accept to set up the new stream.
         if (acceptor_socket.accept(new_stream) == -1) {
           ACE_ERROR ((LM_ERROR,
-                      "%p\n",
-                      "accept"));
+                      ACE_TEXT ("%p\n"),
+                      ACE_TEXT ("accept")));
           continue;
         }
         else{
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) spawning server\n"));
+                      ACE_TEXT ("(%P|%t) spawning server\n")));
 
         }
         // Run the server.
diff --git a/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/performance-tests/SCTP/SOCK_STREAM_clt.cpp
index 55fd85c2c15..1c6c3879f4d 100644
--- a/performance-tests/SCTP/SOCK_STREAM_clt.cpp
+++ b/performance-tests/SCTP/SOCK_STREAM_clt.cpp
@@ -6,6 +6,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/CDR_Stream.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/OS_Memory.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
@@ -42,14 +43,14 @@ ACE_UINT32 const microsec_clock_scale_factor = ACE_High_Res_Timer::global_scale_
 // file readability.
 HIST runTest(ACE_SOCK_Stream &);
 
-int main(int argc, char **argv){
+int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
   // Initialize the options manager
-  Options_Manager optsMgr(argc, argv, "client-opts");
+  Options_Manager optsMgr(argc, argv, ACE_TEXT ("client-opts"));
 
   // show usage if requested
   if (optsMgr._usage) {
-    optsMgr._show_usage(cerr, "client-opts");
+    optsMgr._show_usage(stderr, ACE_TEXT ("client-opts"));
     return 1;
   }
 
@@ -58,13 +59,13 @@ int main(int argc, char **argv){
 #ifndef ACE_HAS_SCTP
   if (optsMgr.test_transport_protocol == IPPROTO_SCTP)
     ACE_ERROR_RETURN((LM_ERROR,
-                      "SCTP was NOT installed when this binary was compiled.\nSOCK_STREAM_clt may still be run using TCP via the '-t tcp' option.\n"),
+                      ACE_TEXT ("SCTP was NOT installed when this binary was compiled.\nSOCK_STREAM_clt may still be run using TCP via the '-t tcp' option.\n")),
                      1);
 #endif
 
   // check that valid options were specified
   if (optsMgr._error) {
-    cerr << "ERROR: " << optsMgr._error_message << endl;
+    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
     return 1;
   }
 
@@ -89,12 +90,12 @@ int main(int argc, char **argv){
                          0,clientAddr, 0, 0, 0, // ALL DEFAULT ARGUMENTS
                          Options_Manager::test_transport_protocol) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) %p\n",
-                       "connection failed"),
+                       ACE_TEXT ("(%P|%t) %p\n"),
+                       ACE_TEXT ("connection failed")),
                       1);
 
   // run the test
-  HIST testResultsHistogram = NULL;
+  HIST testResultsHistogram = 0;
   // connection is closed by runTest* functions
   testResultsHistogram = runTest(dataStream);
 
@@ -217,9 +218,9 @@ HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_Strea
   }
 
   // AFTER PRIMING THE PUMP CREATE THE HISTOGRAM
-  HIST aceStream_hist=NULL;
+  HIST aceStream_hist = 0;
   aceStream_hist = createHistogram(msgLen);
-  if (NULL == aceStream_hist)
+  if (0 == aceStream_hist)
     ACE_ERROR_RETURN((LM_ERROR,
                       "%p\n",
                       "histogram create failed"),
@@ -239,9 +240,9 @@ HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_Strea
 
 
     ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen);
-    iov[0].iov_base = ACE_reinterpret_cast(char *, &msgLenExpressed);
+    iov[0].iov_base = reinterpret_cast<char *> (&msgLenExpressed);
     iov[0].iov_len = ACE_CDR::LONG_SIZE;
-    iov[1].iov_base = ACE_reinterpret_cast(char *, buf);
+    iov[1].iov_base = reinterpret_cast<char *> (buf);
     iov[1].iov_len = msgLen;
 
     if (-1 == stream.sendv_n (iov, 2))
@@ -269,10 +270,8 @@ HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_Strea
     // compute the message latency in micro-seconds
     messageLatency_usec =
 
-      (ACE_static_cast(double,
-                       ACE_UINT64_DBLCAST_ADAPTER(endTime)) -
-       ACE_static_cast(double,
-                       ACE_UINT64_DBLCAST_ADAPTER(startTime)))
+      (static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER(endTime)) -
+       static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER(startTime)))
 
       / microsec_clock_scale_factor;
 
diff --git a/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/performance-tests/SCTP/SOCK_STREAM_srv.cpp
index 1e04d41807d..c2d3cceb1fc 100644
--- a/performance-tests/SCTP/SOCK_STREAM_srv.cpp
+++ b/performance-tests/SCTP/SOCK_STREAM_srv.cpp
@@ -24,7 +24,7 @@ extern "C" {
 };
 #else
 #ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132 /* always the same value on every platform */ 
+#define IPPROTO_SCTP 132 /* always the same value on every platform */
 #endif
 #define SCTP_NODELAY -1
 #endif
@@ -43,7 +43,7 @@ struct ArgStruct {
 static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
 
   // unbundle the arguments
-  ArgStruct * args = ACE_reinterpret_cast(ArgStruct *,arg);
+  ArgStruct * args = reinterpret_cast<ArgStruct *> (arg);
   ACE_SOCK_Stream * dataModeStream = args->stream;
   ACE_CDR::ULong numIterations = args->numIters;
   delete args;
@@ -58,13 +58,13 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
     // read the size of the buffer to follow
     if ((dataModeStream->recv_n(&msgBufSize, ACE_CDR::LONG_SIZE, 0, &bt)) == -1)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "recv_n"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("recv_n")),
                        0);
     msgBufSize = ACE_NTOHL(msgBufSize);
 
     // allocate the buffer for the message payload
-    ACE_CDR::Octet * msgBuf=NULL;
+    ACE_CDR::Octet * msgBuf = 0;
     ACE_NEW_RETURN(msgBuf,
                    ACE_CDR::Octet[msgBufSize],
                    0);
@@ -72,8 +72,8 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
     // read the buffer
     if ((dataModeStream->recv_n(msgBuf, msgBufSize, 0, &bt)) == -1)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "recv_n"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("recv_n")),
                        0);
 
     // clean up the allocated buffer
@@ -85,8 +85,8 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
     ACE_CDR::Short reply;
     if ((dataModeStream->send_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1)
       ACE_ERROR_RETURN((LM_ERROR,
-                        "%p\n",
-                        "send_n"),
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("send_n")),
                        0);
 
   } while (--numIterations);
@@ -95,7 +95,7 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
   dataModeStream->close();
   delete dataModeStream;
 
-  return NULL;
+  return 0;
 }
 
 // sets up the dataModeSocket Stream, reads the test header infomation
@@ -111,14 +111,14 @@ static void run_server (ACE_HANDLE handle)
   // Make sure we're not in non-blocking mode.
   if (dataModeStream->disable (ACE_NONBLOCK) == -1){
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "disable"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("disable")));
     return;
   }
   else if (dataModeStream->get_remote_addr (cli_addr) == -1){
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "get_remote_addr"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("get_remote_addr")));
     return;
   }
 
@@ -135,8 +135,8 @@ static void run_server (ACE_HANDLE handle)
     // default - sctp case
     if (-1 == dataModeStream->set_option(IPPROTO_SCTP, SCTP_NODELAY, &nagle, sizeof nagle)){
       ACE_ERROR((LM_ERROR,
-                 "%p\n",
-                 "set_option"));
+                 ACE_TEXT ("%p\n"),
+                 ACE_TEXT ("set_option")));
       return;
     }
   } else {
@@ -150,7 +150,7 @@ static void run_server (ACE_HANDLE handle)
   }
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) client %s connected from %d\n",
+              ACE_TEXT ("(%P|%t) client %C connected from %d\n"),
               cli_addr.get_host_name (),
               cli_addr.get_port_number ()));
 
@@ -167,8 +167,8 @@ static void run_server (ACE_HANDLE handle)
   // read the header
   if ((dataModeStream->recv_n(hdrBuf_a, hdrBufSize, 0, &bt)) == -1){
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "recv_n"));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("recv_n")));
     return;
   }
 
@@ -188,14 +188,14 @@ static void run_server (ACE_HANDLE handle)
   // make sure the stream is good after the extractions
   if (!hdrCDR.good_bit()){
     ACE_ERROR((LM_ERROR,
-               "%p\n",
-               "hdrCDR"));
+               ACE_TEXT ("%p\n"),
+               ACE_TEXT ("hdrCDR")));
 
     return;
   }
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Test for %u iterations\n",
+              ACE_TEXT ("(%P|%t) Test for %u iterations\n"),
               numIterations));
 
   // deallocate the header buffer
@@ -210,24 +210,24 @@ static void run_server (ACE_HANDLE handle)
   // Spawn a new thread and run the new connection in that thread of
   // control using the <server> function as the entry point.
   if (ACE_Thread_Manager::instance ()->spawn (unmarshalledOctetServer,
-                                              ACE_reinterpret_cast(void *,args),
+                                              reinterpret_cast<void *> (args),
                                               THR_DETACHED) == -1)
     ACE_ERROR ((LM_ERROR,
-                "(%P|%t) %p\n",
-                "spawn"));
+                ACE_TEXT ("(%P|%t) %p\n"),
+                ACE_TEXT ("spawn")));
 #else
-  (*unmarshalledOctetServer) (ACE_reinterpret_cast(void *, args));
+  (*unmarshalledOctetServer) (reinterpret_cast<void *> (args));
 #endif /* ACE_HAS_THREADS */
 
 }
 
-int main(int argc, char **argv){
+int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
-  Options_Manager optsMgr(argc, argv, "server-opts");
+  Options_Manager optsMgr(argc, argv, ACE_TEXT ("server-opts"));
 
   // show usage is requested
   if (optsMgr._usage) {
-    optsMgr._show_usage(cerr, "server-opts");
+    optsMgr._show_usage(stderr, ACE_TEXT ("server-opts"));
     return 1;
   }
 
@@ -236,15 +236,15 @@ int main(int argc, char **argv){
 #ifndef ACE_HAS_SCTP
   if (optsMgr.test_transport_protocol == IPPROTO_SCTP)
     ACE_ERROR_RETURN((LM_ERROR,
-                      "SCTP was NOT installed when this binary was compiled.\n"
-                      "SOCK_STREAM_srv may still be run using TCP "
-                      "via the '-t tcp' option.\n"),
+                      ACE_TEXT ("SCTP was NOT installed when this binary was compiled.\n")
+                      ACE_TEXT ("SOCK_STREAM_srv may still be run using TCP ")
+                      ACE_TEXT ("via the '-t tcp' option.\n")),
                      1);
 #endif
 
   // check that valid options were specified
   if (optsMgr._error) {
-    cerr << "ERROR: " << optsMgr._error_message << endl;
+    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
     return 1;
   }
 
@@ -259,7 +259,7 @@ int main(int argc, char **argv){
                            optsMgr.server_accept_addr);
 
   ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) Accepting connections on port %u on interface %s using %s\n",
+             ACE_TEXT ("(%P|%t) Accepting connections on port %u on interface %C using %C\n"),
              serverAddr.get_port_number(),
              (optsMgr.server_accept_addr == INADDR_ANY) ? "INADDR_ANY" : serverAddr.get_host_addr(),
              (optsMgr.test_transport_protocol == IPPROTO_SCTP) ? "IPPROTO_SCTP" : "IPPROTO_TCP"));
@@ -273,8 +273,8 @@ int main(int argc, char **argv){
                            ACE_DEFAULT_BACKLOG,
                            optsMgr.test_transport_protocol) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       1);
 
   // this function checks that the port that was actually bound was
@@ -283,12 +283,12 @@ int main(int argc, char **argv){
   // used.
   else if (acceptor_socket.get_local_addr(serverAddr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_local_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_local_addr")),
                       1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) starting server at port %d\n",
+              ACE_TEXT ("(%P|%t) starting server at port %d\n"),
               serverAddr.get_port_number()));
 
   // this is the stream object that will associated with a completed
@@ -320,31 +320,31 @@ int main(int argc, char **argv){
     // check that select did not end with an error.
     if (result == -1)
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) %p\n",
-                  "select"));
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("select")));
     // check to see if select timed out.
     else if (result == 0){
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) select timed out\n"));
+                  ACE_TEXT ("(%P|%t) select timed out\n")));
 
     }
     else { // case where a file descriptor was actually set
       if (!(temp.is_set(acceptor_socket.get_handle()))){
         // CANNOT BE REACHED
         ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) %p\n",
-                    "select: NO ERROR BUT NO FD SET"));
+                    ACE_TEXT ("(%P|%t) %p\n"),
+                    ACE_TEXT ("select: NO ERROR BUT NO FD SET")));
       } else {
         // call accept to set up the new stream.
         if (acceptor_socket.accept(new_stream) == -1) {
           ACE_ERROR ((LM_ERROR,
-                      "%p\n",
-                      "accept"));
+                      ACE_TEXT ("%p\n"),
+                      ACE_TEXT ("accept")));
           continue;
         }
         else{
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) spawning server\n"));
+                      ACE_TEXT ("(%P|%t) spawning server\n")));
 
         }
         // Run the server.
diff --git a/performance-tests/SCTP/hist.cpp b/performance-tests/SCTP/hist.cpp
index 81197b7939e..beeb880280c 100644
--- a/performance-tests/SCTP/hist.cpp
+++ b/performance-tests/SCTP/hist.cpp
@@ -37,11 +37,11 @@ hist_t *head_hist, *tail_hist;
 hist_t *histogram(char *name, unsigned int num_bins, double first,
                   double last) {
   hist_t *hist;
-  if ((hist = (hist_t *)malloc(sizeof(hist_t))) == NULL) {
+  if ((hist = (hist_t *)malloc(sizeof(hist_t))) == 0) {
     fprintf(stderr, "unable to allocate memory for histogram : %s", name);
     exit(-1);
   }
-  if ((hist->hs = (unsigned int *)malloc(sizeof(unsigned int) * (num_bins+2))) == NULL){
+  if ((hist->hs = (unsigned int *)malloc(sizeof(unsigned int) * (num_bins+2))) == 0){
     fprintf(stderr, "unable to allocate memory for histogram : %s", name);
     exit(-1);
   }
@@ -58,11 +58,11 @@ hist_t *histogram(char *name, unsigned int num_bins, double first,
   hist->sum4 = 0.0;
   hist->max = DBL_MIN;
   hist->min = DBL_MAX;
-  hist->outer = NULL;
-  hist->next = NULL;
+  hist->outer = 0;
+  hist->next = 0;
   hist->skew = 0;
-  hist->firstoptheader = NULL;
-  if(head_hist == NULL)
+  hist->firstoptheader = 0;
+  if(head_hist == 0)
     head_hist = tail_hist = hist;
   else {
     tail_hist->next = hist;
@@ -90,16 +90,16 @@ void add_field(char *key, char *value, hist_t *hist) {
   nextoptheader = (struct optheader *) malloc(sizeof(struct optheader));
   nextoptheader->key = (char *) malloc(strlen(key)+1);
   nextoptheader->value = (char *) malloc(strlen(value)+1);
-  nextoptheader->next = NULL;
+  nextoptheader->next = 0;
   strcpy(nextoptheader->key,key);
   strcpy(nextoptheader->value,value);
 
      /* tack nextoptheader onto end of optheader list */
-  if (hist->firstoptheader == NULL) {
+  if (hist->firstoptheader == 0) {
      hist->firstoptheader = nextoptheader;
   } else {
      trace = hist->firstoptheader;
-     while (trace->next != NULL) {
+     while (trace->next != 0) {
         trace = trace->next;
      }
      trace->next = nextoptheader;
@@ -185,7 +185,7 @@ void report_to(FILE *strm, hist_t *hist) {
   fprintf(strm, "num_bins: %d %g %g\n", hist->num_bins,hist->first,hist->last);
   if (hist->firstoptheader) {
      trace = hist->firstoptheader;
-     while(trace->next != NULL) {
+     while(trace->next != 0) {
         fprintf(strm, "%s: %s\n", trace->key, trace->value);
         trace = trace->next;
      }
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
index 9ac4bcd71f7..59b6844836a 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
+++ b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
@@ -164,6 +164,7 @@ Leader_Follower_Task::svc (void)
         while (leader_available)
           {
             int result = this->synch_.condition_.wait ();
+            
             if (result == -1)
               {
                 ACE_ERROR_RETURN ((LM_ERROR,
@@ -259,7 +260,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
           number_of_threads = ACE_OS::atoi (get_opt.opt_arg ());
           break;
         case 'd':
-          debug = ACE_static_cast (DEBUGGING_RANGE, ACE_OS::atoi (get_opt.opt_arg ()));
+          debug = static_cast<DEBUGGING_RANGE> (ACE_OS::atoi (get_opt.opt_arg ()));
           break;
         case 's':
           message_size = ACE_OS::atoi (get_opt.opt_arg ());
@@ -289,6 +290,7 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int result = parse_args (argc, argv);
+  
   if (result != 0)
     {
       return result;
@@ -304,13 +306,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                   Leader_Follower_Task *[number_of_threads],
                   -1);
 
-
-
-
   int priority =
     ACE_Sched_Params::priority_max (ACE_SCHED_FIFO);
 
-
   long flags = THR_SCOPE_PROCESS;
 
   // Number of messages left = Number_Of_messages
@@ -365,11 +363,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   test_timer.elapsed_time (elapsed_time);
 
   double elapsed_time_per_invocation =
-    ACE_UINT64_DBLCAST_ADAPTER (elapsed_time / number_of_messages);
-
-  /*ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Throughput is [%f] \n",
-              elapsed_time_per_invocation));*/
+    static_cast<double> (
+        ACE_UINT64_DBLCAST_ADAPTER (elapsed_time / number_of_messages)
+      );
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Throughput is [%f] \n",
@@ -383,6 +379,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                   i, leader_followers[i]->processed ()));
       delete leader_followers[i];
     }
+    
   delete[] leader_followers;
 
   return result;
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc b/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc
index 18b9e28febf..d4a5ce02924 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc
+++ b/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc
@@ -2,13 +2,15 @@
 // $Id$
 
 project : aceexe {
+  exename = leader_follower
   source_files {
     leader_follower.cpp
   }
 }
 
 project(*RT_CORBA) : aceexe {
+  exename = RT_CORBA_Leader_Follower
   source_files {
     RT_CORBA_Leader_Follower.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
index 66b17c0e43d..55b7707b89a 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
+++ b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
@@ -215,7 +215,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
           timeout_between_bursts = ACE_OS::atoi (get_opt.opt_arg ());
           break;
         case 'd':
-          debug = ACE_static_cast (DEBUGGING_RANGE, ACE_OS::atoi (get_opt.opt_arg ()));
+          debug = static_cast<DEBUGGING_RANGE> (ACE_OS::atoi (get_opt.opt_arg ()));
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
index 2a22d18b385..eb9671dba41 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
@@ -410,7 +410,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
           number_of_workers = ACE_OS::atoi (get_opt.opt_arg ());
           break;
         case 'd':
-          debug = ACE_static_cast (DEBUGGING_RANGE, ACE_OS::atoi (get_opt.opt_arg ()));
+          debug = static_cast<DEBUGGING_RANGE> (ACE_OS::atoi (get_opt.opt_arg ()));
           break;
         case 's':
           message_size = ACE_OS::atoi (get_opt.opt_arg ());
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc b/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc
index 4b4291e1f43..d916bb820ac 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc
@@ -2,13 +2,15 @@
 // $Id$
 
 project : aceexe {
+  exename = workers
   source_files {
     workers.cpp
   }
 }
 
 project(*RTCorba) : aceexe {
+  exename = RT_CORBA_Workers
   source_files {
     RT_CORBA_Workers.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
index 3771e80307e..dd403c05d19 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
@@ -104,7 +104,7 @@ Worker_Task::svc (void)
         }
 
       Message_Block *message_block =
-        ACE_dynamic_cast (Message_Block *, mb);
+        dynamic_cast<Message_Block *> (mb);
 
       ACE_hrtime_t start_of_burst_for_this_message_block =
         message_block->start_of_burst_;
@@ -258,7 +258,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
           timeout_between_bursts = ACE_OS::atoi (get_opt.opt_arg ());
           break;
         case 'd':
-          debug = ACE_static_cast (DEBUGGING_RANGE, ACE_OS::atoi (get_opt.opt_arg ()));
+          debug = static_cast<DEBUGGING_RANGE> (ACE_OS::atoi (get_opt.opt_arg ()));
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
index 99ae0a06c1d..ed2703e7401 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
@@ -54,7 +54,7 @@ Baseline_Test_Base::parse_args (int argc, ACE_TCHAR *argv[])
                                "%d is not a valid value for iteration\n",
                                tmp), -1);
           else
-            this->iteration_ = ACE_static_cast (size_t, tmp);
+            this->iteration_ = static_cast<size_t> (tmp);
         }
         break;
 
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc b/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
index e5e86e69dea..3f34fc753a9 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : aceexe {
+project : acelib {
   after    += Synch_Lib
   libs     += Synch_Lib
   libpaths += ../Synch_Lib
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp
index 13c9863d7f1..42045f5963e 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp
@@ -10,6 +10,7 @@
 #include "Benchmark_Performance.h"
 
 #include "ace/Service_Repository.h"
+#include "ace/Reactor.h"
 
 ACE_RCSID (Perf_Test,
            Performance_Test,
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
index 83ce801f066..11c45f3f155 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
@@ -42,7 +42,7 @@ Performance_Test_Options::Performance_Test_Options (void)
                  : thr_wc_size (10000),
                    _service_entry (0),
                    _mapped_file (0),
-                   _pipe_addr (ACE_const_cast (ACE_TCHAR *, ACE_DEFAULT_RENDEZVOUS)),
+                   _pipe_addr (const_cast<ACE_TCHAR *> (ACE_DEFAULT_RENDEZVOUS)),
                    _sleep_time (100),
                    _n_lwps (0),
                    _thr_count (4),
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc b/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
index e5e86e69dea..3f34fc753a9 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : aceexe {
+project : acelib {
   after    += Synch_Lib
   libs     += Synch_Lib
   libpaths += ../Synch_Lib
diff --git a/performance-tests/Synch-Benchmarks/Synch_Benchmarks.mpc b/performance-tests/Synch-Benchmarks/Synch_Benchmarks.mpc
index 5c1492dc75b..92ad3685637 100644
--- a/performance-tests/Synch-Benchmarks/Synch_Benchmarks.mpc
+++ b/performance-tests/Synch-Benchmarks/Synch_Benchmarks.mpc
@@ -2,10 +2,11 @@
 // $Id$
 
 project : aceexe {
+  exename   = synch_driver
   after    += Synch_Lib
   libs     += Synch_Lib
   libpaths += Synch_Lib
   source_files {
     synch_driver.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Benchmarks_Synch_Lib.mpc b/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Benchmarks_Synch_Lib.mpc
index 0cf7df2601e..34f382f3faa 100644
--- a/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Benchmarks_Synch_Lib.mpc
+++ b/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Benchmarks_Synch_Lib.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Synch_Lib) : aceexe {
+project(Synch_Lib) : acelib {
   sharedname = Synch_Lib
   dynamicflags += SYNCHLIB_BUILD_DLL
-}
\ No newline at end of file
+}
diff --git a/performance-tests/TCP/TCP.mpc b/performance-tests/TCP/TCP.mpc
index ca6b8ee6622..e2244fe35a3 100644
--- a/performance-tests/TCP/TCP.mpc
+++ b/performance-tests/TCP/TCP.mpc
@@ -2,4 +2,5 @@
 // $Id$
 
 project : aceexe {
-}
\ No newline at end of file
+  exename = tcp_test
+}
diff --git a/performance-tests/UDP/UDP.mpc b/performance-tests/UDP/UDP.mpc
index b145e73b879..355aba0d9db 100644
--- a/performance-tests/UDP/UDP.mpc
+++ b/performance-tests/UDP/UDP.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : aceexe {
+  exename = udp_test
   verbatim(gnuace, local) {
     LDLIBS += $(MATHLIB)
   }
diff --git a/psosim/drv_conf.c b/psosim/drv_conf.c
deleted file mode 100644
index 026e9d97193..00000000000
--- a/psosim/drv_conf.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $Id$ */
-/***********************************************************************/
-/*                                                                     */
-/*   MODULE:  drv_conf.c                                               */
-/*   DATE:    94/01/06                                                 */
-/*   PURPOSE: pSOSystem driver configuration and initialization        */
-/*                                                                     */
-/*            There is one function in this file:                      */
-/*                                                                     */
-/*            SetUpDrivers to setup drivers except for Network drivers */
-/*                                                                     */
-/*                                                                     */
-/*---------------------------------------------------------------------*/
-/*                                                                     */
-/*           Copyright 1991 - 1993, Integrated Systems, Inc.           */
-/*                      ALL RIGHTS RESERVED                            */
-/*                                                                     */
-/*   Permission is hereby granted to licensees of Integrated Systems,  */
-/*   Inc. products to use or abstract this computer program for the    */
-/*   sole purpose of implementing a product based on Integrated        */
-/*   Systems, Inc. products.   No other rights to reproduce, use,      */
-/*   or disseminate this computer program, whether in part or in       */
-/*   whole, are granted.                                               */
-/*                                                                     */
-/*   Integrated Systems, Inc. makes no representation or warranties    */
-/*   with respect to the performance of this computer program, and     */
-/*   specifically disclaims any responsibility for any damages,        */
-/*   special or consequential, connected with the use of this program. */
-/*                                                                     */
-/***********************************************************************/
-#include "sys_conf.h"
-#include "bsp.h"
-#include <bspfuncs.h>
-#include <configs.h>
-
-struct ioparms;
-#define NULLF ((void (*)(struct ioparms *)) 0)
-UCHAR *SetUpDrivers(UCHAR *FreeMemPtr)
-{
-
-/*---------------------------------------------------------------------*/
-/* Install pSOSystem serial device driver                              */
-/*---------------------------------------------------------------------*/
-#if (SC_DEV_SERIAL && BSP_SERIAL)
-    InstallDriver(SC_DEV_SERIAL, CnslInit, NULLF, NULLF,CnslRead,
-                  CnslWrite, CnslCntrl, 0, 0);
-    FreeMemPtr = CnslSetup(FreeMemPtr, SD_DEF_BAUD, SC_APP_CONSOLE);
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Install pSOSystem tick timer                                        */
-/*---------------------------------------------------------------------*/
-#if SC_DEV_TIMER
-    InstallDriver(SC_DEV_TIMER, RtcInit, NULLF, NULLF, NULLF, NULLF,
-                  NULLF, 0, 0);
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Install pSOSystem ramdisk driver                                    */
-/*---------------------------------------------------------------------*/
-#if SC_DEV_RAMDISK
-    InstallDriver(SC_DEV_RAMDISK, RdskInit, NULLF, NULLF, RdskRead,
-                  RdskWrite, NULLF, 0, 0);
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Install pSOSystem TFTP driver                                       */
-/*---------------------------------------------------------------------*/
-#if (SC_DEV_TFTP)
-    InstallDriver(SC_DEV_TFTP, TftpInit, TftpOpen, TftpClose, TftpRead,
-                  NULLF, TftpCntl, 0, 0);
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Add additional drivers to install here.                             */
-/*---------------------------------------------------------------------*/
-
-return(FreeMemPtr);
-}
-
diff --git a/tests/.cvsignore b/tests/.cvsignore
index bfe9b1ba53f..27b310a252c 100755
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -1,5 +1,305 @@
-*.ilk
-*.pdb
-*.plg
-*.ncb
-*.opt
+ACE_Init_Test
+ACE_Init_Test
+ACE_Test
+ACE_Test
+ARGV_Test
+ARGV_Test
+Aio_Platform_Test
+Aio_Platform_Test
+Arg_Shifter_Test
+Arg_Shifter_Test
+Atomic_Op_Test
+Atomic_Op_Test
+Auto_IncDec_Test
+Auto_IncDec_Test
+Barrier_Test
+Barrier_Test
+Basic_Types_Test
+Basic_Types_Test
+Bound_Ptr_Test
+Bound_Ptr_Test
+Buffer_Stream_Test
+Buffer_Stream_Test
+Bug_1576_Regression_Test
+Bug_1576_Regression_Test
+CDR_Array_Test
+CDR_Array_Test
+CDR_File_Test
+CDR_File_Test
+CDR_Test
+CDR_Test
+Cache_Map_Manager_Test
+Cache_Map_Manager_Test
+Cached_Accept_Conn_Test
+Cached_Accept_Conn_Test
+Cached_Allocator_Test
+Cached_Allocator_Test
+Cached_Conn_Test
+Cached_Conn_Test
+Capabilities_Test
+Capabilities_Test
+Codecs_Test
+Codecs_Test
+Collection_Test
+Collection_Test
+Config_Test
+Config_Test
+Conn_Test
+Conn_Test
+DLL_Test
+DLL_Test
+DLList_Test
+DLList_Test
+Date_Time_Test
+Date_Time_Test
+Dev_Poll_Reactor_Test
+Dev_Poll_Reactor_Test
+Dirent_Test
+Dirent_Test
+Dynamic_Priority_Test
+Dynamic_Priority_Test
+Enum_Interfaces_Test
+Enum_Interfaces_Test
+Env_Value_Test
+Env_Value_Test
+FIFO_Test
+FIFO_Test
+FlReactor_Test
+FlReactor_Test
+Framework_Component_Test
+Framework_Component_Test
+Future_Set_Test
+Future_Set_Test
+Future_Test
+Future_Test
+Get_Opt_Test
+Get_Opt_Test
+Handle_Set_Test
+Handle_Set_Test
+Hash_Map_Bucket_Iterator_Test
+Hash_Map_Bucket_Iterator_Test
+Hash_Map_Manager_Test
+Hash_Map_Manager_Test
+High_Res_Timer_Test
+High_Res_Timer_Test
+INET_Addr_Test
+INET_Addr_Test
+INET_Addr_Test_IPV6
+INET_Addr_Test_IPV6
+IOStream_Test
+IOStream_Test
+Lazy_Map_Manager_Test
+Lazy_Map_Manager_Test
+Log_Msg_Test
+Log_Msg_Test
+Logging_Strategy_Test
+Logging_Strategy_Test
+MEM_Stream_Test
+MEM_Stream_Test
+MM_Shared_Memory_Test
+MM_Shared_Memory_Test
+MT_Reactor_Timer_Test
+MT_Reactor_Timer_Test
+MT_Reactor_Upcall_Test
+MT_Reactor_Upcall_Test
+MT_Reference_Counted_Event_Handler_Test
+MT_Reference_Counted_Event_Handler_Test
+MT_Reference_Counted_Notify_Test
+MT_Reference_Counted_Notify_Test
+MT_SOCK_Test
+MT_SOCK_Test
+Malloc_Test
+Malloc_Test
+Map_Manager_Test
+Map_Manager_Test
+Map_Test
+Map_Test
+Max_Default_Port_Test
+Max_Default_Port_Test
+Max_Default_Port_Test_IPV6
+Max_Default_Port_Test_IPV6
+Mem_Map_Test
+Mem_Map_Test
+Message_Block_Test
+Message_Block_Test
+Message_Queue_Notifications_Test
+Message_Queue_Notifications_Test
+Message_Queue_Test
+Message_Queue_Test
+Message_Queue_Test_Ex
+Message_Queue_Test_Ex
+Multicast_Test
+Multicast_Test
+Multicast_Test_IPV6
+Multicast_Test_IPV6
+Multihomed_INET_Addr_Test
+Multihomed_INET_Addr_Test
+Multihomed_INET_Addr_Test_IPV6
+Multihomed_INET_Addr_Test_IPV6
+Naming_Test
+Naming_Test
+Network_Adapters_Test
+Network_Adapters_Test
+New_Fail_Test
+New_Fail_Test
+NonBlocking_Conn_Test
+NonBlocking_Conn_Test
+Notify_Performance_Test
+Notify_Performance_Test
+OS_Test
+OS_Test
+Object_Manager_Test
+Object_Manager_Test
+Obstack_Test
+Obstack_Test
+OrdMultiSet_Test
+OrdMultiSet_Test
+Pipe_Test
+Pipe_Test
+Priority_Buffer_Test
+Priority_Buffer_Test
+Priority_Reactor_Test
+Priority_Reactor_Test
+Priority_Task_Test
+Priority_Task_Test
+Proactor_Scatter_Gather_Test
+Proactor_Scatter_Gather_Test
+Proactor_Test
+Proactor_Test
+Proactor_Test_IPV6
+Proactor_Test_IPV6
+Proactor_Timer_Test
+Proactor_Timer_Test
+Process_Manager_Test
+Process_Manager_Test
+Process_Mutex_Test
+Process_Mutex_Test
+Process_Strategy_Test
+Process_Strategy_Test
+QtReactor_Test
+QtReactor_Test
+QtReactor_Test_moc.cpp
+QtReactor_Test_moc.cpp
+RB_Tree_Test
+RB_Tree_Test
+Reactor_Dispatch_Order_Test
+Reactor_Dispatch_Order_Test
+Reactor_Exceptions_Test
+Reactor_Exceptions_Test
+Reactor_Notification_Queue_Test
+Reactor_Notification_Queue_Test
+Reactor_Notify_Test
+Reactor_Notify_Test
+Reactor_Performance_Test
+Reactor_Performance_Test
+Reactor_Registration_Test
+Reactor_Registration_Test
+Reactor_Timer_Test
+Reactor_Timer_Test
+Reactors_Test
+Reactors_Test
+Reader_Writer_Test
+Reader_Writer_Test
+Recursive_Condition_Bug_Test
+Recursive_Condition_Bug_Test
+Recursive_Condition_Test
+Recursive_Condition_Test
+Recursive_Mutex_Test
+Recursive_Mutex_Test
+Refcounted_Auto_Ptr_Test
+Refcounted_Auto_Ptr_Test
+Reference_Counted_Event_Handler_Test
+Reference_Counted_Event_Handler_Test
+Reverse_Lock_Test
+Reverse_Lock_Test
+SOCK_Connector_Test
+SOCK_Connector_Test
+SOCK_Dgram_Bcast_Test
+SOCK_Dgram_Bcast_Test
+SOCK_Dgram_Test
+SOCK_Dgram_Test
+SOCK_SEQPACK_SCTP_Test
+SOCK_SEQPACK_SCTP_Test
+SOCK_Send_Recv_Test
+SOCK_Send_Recv_Test
+SOCK_Send_Recv_Test_IPV6
+SOCK_Send_Recv_Test_IPV6
+SOCK_Test
+SOCK_Test
+SOCK_Test_IPv6
+SOCK_Test_IPv6
+SPIPE_Test
+SPIPE_Test
+SString_Test
+SString_Test
+SV_Shared_Memory_Test
+SV_Shared_Memory_Test
+Semaphore_Test
+Semaphore_Test
+Service_Config_Test
+Service_Config_Test
+Signal_Test
+Signal_Test
+Sigset_Ops_Test
+Sigset_Ops_Test
+Simple_Message_Block_Test
+Simple_Message_Block_Test
+Svc_Handler_Test
+Svc_Handler_Test
+TP_Reactor_Test
+TP_Reactor_Test
+TSS_Static_Test
+TSS_Static_Test
+TSS_Test
+TSS_Test
+Task_Ex_Test
+Task_Ex_Test
+Task_Test
+Task_Test
+Thread_Manager_Test
+Thread_Manager_Test
+Thread_Mutex_Test
+Thread_Mutex_Test
+Thread_Pool_Reactor_Resume_Test
+Thread_Pool_Reactor_Resume_Test
+Thread_Pool_Reactor_Test
+Thread_Pool_Reactor_Test
+Thread_Pool_Test
+Thread_Pool_Test
+Time_Service_Test
+Time_Service_Test
+Time_Value_Test
+Time_Value_Test
+Timeprobe_Test
+Timeprobe_Test
+Timer_Cancellation_Test
+Timer_Cancellation_Test
+Timer_Queue_Reference_Counting_Test
+Timer_Queue_Reference_Counting_Test
+Timer_Queue_Test
+Timer_Queue_Test
+TkReactor_Test
+TkReactor_Test
+Token_Strategy_Test
+Token_Strategy_Test
+Tokens_Test
+Tokens_Test
+UPIPE_SAP_Test
+UPIPE_SAP_Test
+UUIDTest
+UUIDTest
+Unbounded_Set_Test
+Unbounded_Set_Test_Ex
+Unbounded_Set_Test_Ex
+Upgradable_RW_Test
+Upgradable_RW_Test
+Vector_Test
+Vector_Test
+WFMO_Reactor_Test
+WFMO_Reactor_Test
+XtAthenaReactor_Test
+XtAthenaReactor_Test
+XtMotifReactor_Test
+XtMotifReactor_Test
+XtReactor_Test
+test.reg
diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp
index ae354fc0d4f..64d77320e07 100644
--- a/tests/ACE_Init_Test.cpp
+++ b/tests/ACE_Init_Test.cpp
@@ -119,8 +119,7 @@ BOOL CACE_Init_TestApp::InitInstance()
 static ACE_THR_FUNC_RETURN
 wait_and_kill_dialog (void *pBox)
 {
-  CACE_Init_TestDlg *pDialog = ACE_reinterpret_cast (CACE_Init_TestDlg *,
-                                                     pBox);
+  CACE_Init_TestDlg *pDialog = reinterpret_cast<CACE_Init_TestDlg *> (pBox);
   ACE_OS::sleep(2);
   pDialog->EndModalLoop (IDOK);
   return 0;
diff --git a/tests/ACE_Test.cpp b/tests/ACE_Test.cpp
index c2f7e2dd079..0ead45838fd 100644
--- a/tests/ACE_Test.cpp
+++ b/tests/ACE_Test.cpp
@@ -39,7 +39,7 @@ execname_test (void)
   if (newname != prog1)   // Didn't find .exe correctly
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Name %s, not %s\n"), newname, prog1));
-      delete [] ACE_const_cast (ACE_TCHAR *, newname);
+      delete [] const_cast<ACE_TCHAR *> (newname);
       ++error_count;
     }
 
@@ -47,7 +47,7 @@ execname_test (void)
   if (newname != prog2)   // Didn't find .exe correctly
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Name %s, not %s\n"), newname, prog2));
-      delete [] ACE_const_cast (ACE_TCHAR *, newname);
+      delete [] const_cast<ACE_TCHAR *> (newname);
       ++error_count;
     }
 
@@ -59,7 +59,7 @@ execname_test (void)
       ++error_count;
     }
   else
-    delete [] ACE_const_cast (ACE_TCHAR *, newname);
+    delete [] const_cast<ACE_TCHAR *> (newname);
 #endif /* ACE_WIN32 */
 
   return error_count;
diff --git a/tests/CDR_Array_Test.cpp b/tests/CDR_Array_Test.cpp
index dd87408bd7b..7ebf8be66d2 100644
--- a/tests/CDR_Array_Test.cpp
+++ b/tests/CDR_Array_Test.cpp
@@ -266,7 +266,7 @@ CDR_Test<T, H>::checkval (int i)
   else
     {
       T v;
-      unsigned char* s = ACE_reinterpret_cast(unsigned char*, (&v));
+      unsigned char* s = reinterpret_cast<unsigned char*> ((&v));
       unsigned int j;
       for (j = 0; j < H::size (); j++)
         {
@@ -290,7 +290,7 @@ template<class T, class H> void
 CDR_Test<T, H>::ttoh (const T& t, char* s)
 {
   const unsigned char *const p =
-    ACE_reinterpret_cast(const unsigned char*, &t);
+    reinterpret_cast<const unsigned char*> (&t);
 
   static char digits[16] = {
     '0', '1', '2', '3',
@@ -313,7 +313,7 @@ CDR_Test<T, H>::ttoh (const T& t, char* s)
 void
 do_seal (char* pos)
 {
-  char* ps = ACE_reinterpret_cast(char*, &seal);
+  char* ps = reinterpret_cast<char*> (&seal);
   pos[0] = ps[0];
   pos[1] = ps[1];
   pos[2] = ps[2];
@@ -323,7 +323,7 @@ do_seal (char* pos)
 int
 check_seal (char* pos)
 {
-  char* ps = ACE_reinterpret_cast(char*, &seal);
+  char* ps = reinterpret_cast<char*> (&seal);
   return (pos[0] == ps[0]
           && pos[1] == ps[1]
           && pos[2] == ps[2]
@@ -374,9 +374,9 @@ CDR_Test<T, H>::do_test (int total, int niter, int use_array,
     }
 
   char* src = ACE_ptr_align_binary(srcbuf, H::size ());
-  T* idata = ACE_reinterpret_cast(T*, src);
+  T* idata = reinterpret_cast<T*> (src);
   idata += src_offset;
-  src = ACE_reinterpret_cast(char*, idata);
+  src = reinterpret_cast<char*> (idata);
 
   {
     int i;
@@ -605,8 +605,8 @@ CDR_Test<T, H>::do_test (int total, int niter, int use_array,
       {
         T rv;
 
-        const char* src = ACE_reinterpret_cast(const char*, (idata + i));
-        char* dst = ACE_reinterpret_cast(char*, (&rv));
+        const char* src = reinterpret_cast<const char*> ((idata + i));
+        char* dst = reinterpret_cast<char*> ((&rv));
 
         H::swap(src, dst);
 
@@ -852,7 +852,7 @@ struct CharHelper
     }
 };
 
-void usage (ACE_TCHAR* cmd)
+void usage (const ACE_TCHAR* cmd)
 {
   ACE_ERROR((LM_ERROR,
              ACE_TEXT ("Usage: %s ")
@@ -932,7 +932,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               int v = ACE_OS::atoi (get_opt.opt_arg ());
               if (!(opts[i].checkf) (v))
                 {
-                  usage(argv[0]);
+                  usage(ACE_TEXT("CDR_Array_Test"));
                 }
 
               *(opts[i].v) = v;
@@ -943,7 +943,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
       if (!got)
         {
-          usage(argv[0]);
+          usage(ACE_TEXT("CDR_Array_Test"));
         }
     }
 
diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index b433c67050d..4457cd08d89 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -303,7 +303,7 @@ run_test (int write_file,
 }
 
 static void
-usage (ACE_TCHAR *cmd)
+usage (const ACE_TCHAR *cmd)
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("Usage: %s ")
@@ -345,15 +345,15 @@ run_main (int argc, ACE_TCHAR *argv[])
           break;
         case '?':
         default:
-          usage (argv[0]);
+          usage (ACE_TEXT("CDR_File_Test"));
         }
     }
 
   if ((!reading || !writing) && fn == 0)
-    usage (argv[0]);
+    usage (ACE_TEXT("CDR_File_Test"));
 
   if (!reading && !writing)
-    usage (argv[0]);
+    usage (ACE_TEXT("CDR_File_Test"));
 
   // Create a temporary filename.
   ACE_FILE_Addr filename (ACE_sap_any_cast (ACE_FILE_Addr &));
diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp
index 49582de3872..bc07ac45499 100644
--- a/tests/CDR_Test.cpp
+++ b/tests/CDR_Test.cpp
@@ -80,7 +80,7 @@ short_stream (void)
 
   // Basic types for output
   ACE_CDR::Char ch = 'A';
-  ACE_CDR::Char wchtmp[] = {"\xF3"};
+  ACE_CDR::Char wchtmp[] = {'\xF3'};
   ACE_CDR::WChar wch = *wchtmp;
   ACE_CDR::WChar wchar2[] = {'\x00'};    // empty wide string
   ACE_CDR::WChar *wstr = wchar2;
@@ -444,7 +444,7 @@ run_main (int argc, ACE_TCHAR *argv[])
                         ACE_TEXT ("-n <num> ")
                         ACE_TEXT ("-l <loops> ")
                         ACE_TEXT ("\n"),
-                        argv[0]));
+                        ACE_TEXT ("CDR_Test")));
             return -1;
         }
     }
diff --git a/tests/CLASSIX/CLASSIX_Addr_Test.cpp b/tests/CLASSIX/CLASSIX_Addr_Test.cpp
deleted file mode 100644
index a9d9f34c24c..00000000000
--- a/tests/CLASSIX/CLASSIX_Addr_Test.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    CLASSIX_Addr_Test.cpp
-//
-// = DESCRIPTION
-//     This is a test of the <IPP_CLASSIX_Addr> class.
-//
-// = AUTHOR
-//    Wei Chiang
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Addr.h"
-#include "ace/CLASSIX/CLASSIX_SAP.h"
-#include "ace/CLASSIX/CLASSIX_Port_Default.h"
-
-#include "CLASSIX_test_config.h"
-
-class testSap : public ACE_CLASSIX_SAP
-{
-public:
-    testSap(): ACE_CLASSIX_SAP() {}
-    testSap(const ACE_Addr& theAddr) : ACE_CLASSIX_SAP(theAddr) {}
-
-    ~testSap() {}
-};
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("Addr_Test");
-
-  /* ================================================================== */
-  ACE_DEBUG((LM_INFO, "------test virtual destructor------\n"));
-  testSap *n1 = new testSap();
-  ACE_CLASSIX_SAP *n2 = n1;
-  delete n2;
-
-  /* ================================================================== */
-  ACE_DEBUG((LM_INFO, "--------ACE_CLASSIX_Addr----------\n"));
-  ACE_DEBUG((LM_DEBUG, "\n--------------------------------\n"));
-  ACE_CLASSIX_Port_Core *k2 = new ACE_CLASSIX_Port_Core();
-  int p2 = k2->get_handle();
-  ACE_CLASSIX_Port a2(*k2);
-  ACE_DEBUG((LM_INFO, "Addr a2(ipc port id = %d)\n", p2));
-  a2.dump();
-
-  ACE_CLASSIX_Port *a1 = ACE_CLASSIX_DEFAULT_PORT::instance();
-  ACE_DEBUG((LM_INFO, "Default port:"));
-  a1->dump();
-  a1->set_addr(a2.get_addr(), a2.get_size());
-  if (*a1 != *ACE_CLASSIX_DEFAULT_PORT::instance())
-      ACE_DEBUG((LM_ERROR, "???? Default port cannot be changed-2 !!!"));
-
-  ACE_DEBUG((LM_DEBUG, "\n--------------------------------\n"));
-  ACE_CLASSIX_Port_Core k3;
-  ACE_CLASSIX_Port a3(k3);
-  ACE_DEBUG((LM_INFO, "Addr a3(ipc port id = %d)\n", k3.get_handle));
-  a3.dump();
-
-  ACE_DEBUG((LM_DEBUG, "\n--------------------------------\n"));
-  ACE_CLASSIX_Port a4(a1->get_addr(), a1->get_size());
-  a4.dump();
-  if (a4 == *a1)
-      ACE_DEBUG((LM_INFO, "OK: Addr a4 == a1\n"));
-  else
-      ACE_ERROR((LM_ERROR, "Error: Addr a4 != a1\n"));
-
-  if (a4 != a2)
-      ACE_DEBUG((LM_INFO, "OK: Addr a4 != a2\n"));
-  else
-      ACE_ERROR((LM_ERROR, "Error: Addr a4 == a2\n"));
-
-  /* ================================================================== */
-
-  ACE_DEBUG((LM_INFO, "\n--------ACE_CLASSIX_Sap----------\n"));
-  testSap sap1;
-  sap1.set_addr(*a1);
-  ACE_CLASSIX_Port b1; 
-  if (sap1.get_addr(b1) < 0)
-      ACE_ERROR((LM_ERROR, "failed to get sap1 address"));
-  if (b1 != *a1)
-      ACE_ERROR((LM_ERROR, "Error: sap1 address"));
-  sap1.dump();
-
-
-  ACE_DEBUG((LM_DEBUG, "\n--------------------------------\n"));
-  testSap sap2(a2);
-  ACE_CLASSIX_Port b2; 
-  if (sap2.get_addr(b2) < 0)
-      ACE_ERROR((LM_ERROR, "failed to get sap1 address"));
-  if (b2 != a2)
-      ACE_ERROR((LM_ERROR, "Error: sap2 address"));
-  b2.dump();
-  sap2.dump();
-
-
-  /* ================================================================== */
-  int result = 0;
-  int p = k2->get_handle();
-  delete k2;
-  if ((result = portDelete(K_MYACTOR, p)) == 0)
-      ACE_ERROR((LM_ERROR, 
-		 "????Error: delete already deleted port"));
-
-  ACE_END_TEST;
-  return 0;
-}
-
diff --git a/tests/CLASSIX/CLASSIX_CLD_Connector_Test.cpp b/tests/CLASSIX/CLASSIX_CLD_Connector_Test.cpp
deleted file mode 100644
index c100b768caf..00000000000
--- a/tests/CLASSIX/CLASSIX_CLD_Connector_Test.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    CLD_Connector.cpp
-//
-// = DESCRIPTION
-//     Based on $ACE_ROOT/tests/MT_SOCK.cpp
-//     
-//     This is a multi-threaded torture test of the ACE_CLASSIX_CLD_Connector
-//     class.
-//
-//     The test spawns a server and multiple clients allowing clients to 
-//     exchange data with the server.
-//
-//     This example demonstrates the following use cases
-//     - server is a subclass of ACE_Svc_Handler,
-//     but it does not  involve an acceptor class.
-//     - server multicasts message to the clients
-//     - client uses ACE_CLASSIX_Connector to "connect" to the server
-//     
-// ============================================================================
-
-#include "ace/OS.h"
-#include "ace/Thread.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Handle_Set.h"
-#include "ace/Svc_Handler.h"
-
-#include "ace/CLASSIX/CLASSIX_Select_Reactor.h"
-#include "ace/CLASSIX/CLASSIX_Stream.h"
-#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.h"
-#include "ace/CLASSIX/CLASSIX_Group_Stamp.h"
-#include "ace/CLASSIX/CLASSIX_CLD_Connector.h"
-
-#include "CLASSIX_test_config.h"
-
-#define MAX_TEST_CLIENTS 30
-#define TEST_STAMP 300
-#define ACE_CLASSIX_MCAST_DGRAM ACE_CLASSIX_Dgram_Mcast, ACE_CLASSIX_Group
-
-static ACE_Atomic_Op<ACE_Thread_Mutex, u_int> client_id = 0;
-
-
-struct client_arg
-{
-    ACE_Barrier           *wait;
-    ACE_CLASSIX_Port_Core *server;
-};
-
-struct client_data
-{
-    u_int me;
-    char c;
-};
-
-class server_handler : public ACE_Svc_Handler<ACE_CLASSIX_MCAST_DGRAM,
-		       ACE_MT_SYNCH>
-{
-public:
-    server_handler(int /* stamp */, const ACE_CLASSIX_Port_Core&);
-    // port that the server uses to receive data from all sorts of clients
-    virtual int open (void * = 0 /* args */);
-    virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-    virtual int svc (void);
-	
-    // = Demultiplexing hooks for Reactor
-    virtual int handle_input (ACE_HANDLE);
-    // The first int of each message identifies the sender
-
-private:
-    ACE_Atomic_Op<ACE_Thread_Mutex, u_int> in_svc_;
-    // 1 if svc() is running
-};
-
-server_handler::server_handler(int theStamp,
-			       const ACE_CLASSIX_Port_Core & thePort)
-    : ACE_Svc_Handler<ACE_CLASSIX_MCAST_DGRAM, ACE_MT_SYNCH> (),
-      in_svc_ (0)
-{
-    if (this->peer().set_saps(theStamp, thePort) != 0)
-	ACE_DEBUG((LM_DEBUG, "failed to set up IO stream \n"));
-}
-
-int
-server_handler::open (void *)
-{
-    ACE_DEBUG((LM_DEBUG, "server_handler::open()\n"));
-    if (reactor ()->register_handler (this, READ_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "(%t)server_handler:: cannot register handler\n"),
-			  -1);
-
-    if (this->peer().selectable() != 0)
-	ACE_DEBUG ((LM_DEBUG, 
-		    "(%t) failed to make Server's port %d selectable\n", 
-		get_handle ()));
-    else
-	ACE_DEBUG ((LM_DEBUG, "(%t) created svc_handler for handle %d\n", 
-		    get_handle ()));
-
-    if (this->peer().control(K_BROADMODE) != 0)
-	ACE_DEBUG((LM_DEBUG, "(%t) %p\n"
-		   "server cannot send data to destination\n"));
-
-    return this->activate (THR_BOUND);
-}
-
-int
-server_handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-    while (this->in_svc_ == 1)
-    {
-	ACE_DEBUG ((LM_DEBUG,  "(%t) server is closing down\n"));
-
-	// Use a blank message to tell the thread to stop 
-	ACE_Message_Block *mb = new ACE_Message_Block((size_t) 0);
-	ACE_Time_Value timeout(0, 10*1000); // wait for at most 10 usec
-	this->putq(mb, &timeout);
-	ACE_OS::thr_yield();
-    }
-
-    this->destroy();
-}
-
-int
-server_handler::handle_input(ACE_HANDLE)
-{
-    // Get input as fast as it can to free the reactor to handle other work.
-    size_t n = 0;
-    if (ACE_Reactor::instance()->
-	current_info(this->get_handle(),n) == -1)
-	ACE_ERROR_RETURN((LM_ERROR, "???(%t) failed to get input size\n"), -1);
-
-    ACE_Message_Block *msg;
-    ACE_NEW_RETURN(msg, ACE_Message_Block(n == 0 ? 1 : n), -1);
-    if (this->peer().recv(msg->wr_ptr(), n) == -1)
-	ACE_ERROR_RETURN((LM_ERROR, "???(%t) %p\n", "get_data()"), -1);
-    msg->wr_ptr(n);
-
-
-    if (this->putq(msg) == -1)
-	ACE_ERROR_RETURN((LM_ERROR, "???(%t) failed to enqueue message\n"), 
-			 -1);
-    return 0;
-}
-
-int
-server_handler::svc(void)
-{
-    this->peer().open_writer();
-    this->in_svc_ = 1;
-
-    ACE_Message_Block *mb = 0;
-    int result = 0;
-    char *storage[MAX_TEST_CLIENTS];
-
-    // initialize the expected result per client
-    for (int i = 0; i < MAX_TEST_CLIENTS; i++)
-	storage[i] = ACE_ALPHABET;
-
-    int len = sizeof (client_data);
-    int total_clients = MAX_TEST_CLIENTS;
-
-    ACE_DEBUG((LM_DEBUG, "(%t)server is waiting for clients\n"));
-    // read input
-    for (;;)
-    {
-	// wait until a message has arrived
-	result = this->getq (mb);
-
-	if (result == -1)
-	{
-	    ACE_ERROR_RETURN((LM_ERROR, 
-			      "???(%t), error while waiting for a message "
-			      "on the queue\n"), 0);
-	}
-
-	int length = mb->length ();
-
-	u_int client = 0;
-	if (length != 0 && length  == len)
-	{
-	    client = *((u_int*) mb->rd_ptr ());
-	    mb->rd_ptr(sizeof (u_int));
-	    char* data = storage[client];
-	    // Check if the client has done
-	    if (*(mb->rd_ptr()) == '\0')
-	    {		
-		ACE_DEBUG((LM_DEBUG, "handshake with client %d\n", client));
-		client_data response;
-		response.me = client;
-		int r = this->peer().send_n(&response, len);
-		if (r != len)
-		    ACE_ERROR((LM_ERROR, 
-			       "(%t):%d %p\n",r,
-			       "server faided to send handshake msg"));
-		total_clients--;
-		if (total_clients == 0)
-		{
-		    mb->release();
-		    ACE_DEBUG((LM_DEBUG, "(%t) end event loop \n"));
-		    ACE_Reactor::end_event_loop();
-		    this->in_svc_ = 0;
-		    break;
-		}
-	    }
-	    if (*data != *(mb->rd_ptr()))
-		ACE_ERROR((LM_ERROR, "???(%t), invalid input\n"));
-	    storage[client] = ++data;
-	}
-	else if (length > 0)
-	{
-	    ACE_ERROR((LM_ERROR, "???(%t), invalid input length(%d)\n",
-		       length));
-	}
-	mb->release();
-
-    }
-
-    return 0;
-}
-
-
-static void *
-client (void *arg)
-{  
-    client_data info;
-    info.me = client_id++;
-    int info_len = sizeof (client_data);
-    
-    client_arg *data = (client_arg*) arg;
-    ACE_CLASSIX_Port_Core *server_port = data->server;
-    ACE_CLASSIX_Port server_addr(*server_port);
-    ACE_Barrier *barrier = data->wait;
-    //===================================================================
-    // Stream & Connector
-    // 
-//    ACE_CLASSIX_Stream cli_stream(*server_port);
-    ACE_CLASSIX_Stream cli_stream;
-    // create a stream where the local SAP uses the actor's default port.
-
-    ACE_CLASSIX_CLD_Connector con;
-    // create a connector for the stream
-
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting local and peer SAPs\n"));
-    // Connect local and peer SAPs.
-
-    barrier->wait();
-    //===================================================================
-    // Attempt a connect to the server...
-    // A local port will be created as a local SAP
-    if (con.connect (cli_stream, server_addr) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P|%t) %p\n",
-                         "connection failed"),
-                        0);
-    }
-    ACE_CLASSIX_Port client_addr;
-    if (cli_stream.local_sap().get_addr (client_addr) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "get_local_addr"), 0);
-    else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) connected client at %d\n",
-		    client_addr.get_handle ()));
-
-    
-    //===================================================================
-    // Insert the local SAP to the test group
-    ACE_CLASSIX_Group_Stamp  group(TEST_STAMP);
-    // group that the client's port is in
-    if (group.insert(&client_addr) == -1)
-	ACE_ERROR_RETURN((LM_ERROR, 
-			  "Failed to insert local SAP of client %d in to the"
-			  "group \n"), -1);
-
-    //===================================================================
-    // Do not use Reactor, so disable  local port from being monitored
-    int result = cli_stream.unselectable();
-    if (result != 0)
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   "(%P|%t) failed to disable local port(%d)\n", 
-			   result), -1);
-
-    //===================================================================
-    // Send data to server (correctly handles "incomplete writes").
-    char *c = ACE_ALPHABET;
-
-    do
-    {
-	ACE_OS::thr_yield();
-	info.c = *c;
-	if (cli_stream.send_n (&info, info_len) != info_len)
-	    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n"));
-    }while(*c++ != '\0');
-
-    //===================================================================
-    // Close writer
-    // ACE_DEBUG ((LM_DEBUG, "(%P|%t) closing writer\n"));
-    // Explicitly close the writer-side of the connection.
-    //if (cli_stream.close_writer () == -1)
-    //	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close_writer"));
-
-    // Wait for handshake with server.
-    client_data response;
-    do
-    {
-	if (cli_stream.ipcRecv_n (&response, info_len) != info_len)
-	    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "recv_n"));
-    }
-    while (response.me != info.me);
-
-    ACE_DEBUG ((LM_DEBUG,
-		"(%P|%t) received handshake from server\n"));
-
-    // Close the connection completely.
-    if (cli_stream.close () == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close"));
-
-    return 0;
-}
-
-
-static void
-spawn (ACE_CLASSIX_Port_Core* theServer)
-{
-    // create a port for the server
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting server at port %d\n",
-		theServer->get_handle ()));
-
-    // activate server
-    server_handler handler(TEST_STAMP, *theServer);
-    handler.open();		// make the server active
-
-    // activate clients
-    // make sure
-    // - we don't let client send messages before the event loop is running
-    ACE_Barrier wait(MAX_TEST_CLIENTS);
-    client_arg  data;
-    data.server = theServer;
-    data.wait   = &wait;
-
-    ACE_DEBUG ((LM_DEBUG, "(%t) starting clients\n"));
-    if (ACE_Thread_Manager::instance ()->spawn_n
-	(MAX_TEST_CLIENTS,
-	 ACE_THR_FUNC (client),
-	 (void *) &data,
-	 THR_BOUND | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "spawn failed"));
-
-    // handle event
-    ACE_DEBUG((LM_DEBUG, "(%t)run event loop\n"));
-    ACE_Reactor::run_event_loop();
-
-    // wait until all server has completed
-    ACE_Thread_Manager::instance()->wait_task(&handler);
-}
-
-int
-main (int, char *[])
-{
-    ACE_START_TEST ("CLD_Connector_Test");
-    
-    // initialize classix environment, such as reactor
-    ACE_CLASSIX_OS classix;
-
-    // running server and clients
-    ACE_CLASSIX_Port_Core server_port;
-    spawn(&server_port);
-
-
-    // Wait all the threads to exit.
-    ACE_Thread_Manager::instance ()->wait ();
-    
-    ACE_END_TEST;
-    return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, u_int>;
-template class ACE_Svc_Handler<ACE_CLASSIX_MCAST_DGRAM, ACE_MT_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, u_int>
-#pragma instantiate ACE_Svc_Handler<ACE_CLASSIX_MCAST_DGRAM, ACE_MT_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp b/tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp
deleted file mode 100644
index 741c8cd2412..00000000000
--- a/tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    CLASSIX_Con_Acc_Test.cpp
-//
-// = DESCRIPTION
-//     Based on $ACE_ROOT/tests/Priority_Reactor_Test.cpp
-//     However, this test is not to test the priority aspect of the
-//     CLASSIX Reactor.  In fact <ACE_CLASSIX_Select_Reactor> does not
-//     handle priorities.
-//
-//     This is a test for <ACE_CLASSIX_CO_Connector> and
-//     <ACE_CLASSIX_CO_Acceptor>
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "ace/Acceptor.h"
-#include "ace/Handle_Set.h"
-#include "ace/Connector.h"
-#include "ace/Strategies.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Priority_Reactor.h"
-
-#include "ace/CLASSIX/CLASSIX_CO_Connector.h"
-#include "ace/CLASSIX/CLASSIX_CO_Acceptor.h"
-
-#include "CLASSIX_test_config.h"
-#include "CLASSIX_Con_Acc_Test.h"
-
-
-// The number of children to run, it can be changed using the -c
-// option.
-static int opt_nchildren = 2 /* 10 */;
-
-// The number of loops per children, it can be changed using the -l
-// option.
-static int opt_nloops = 200 /* 200 */;
-
-// If not set use the normal reactor, it can be changed using the -d
-// option.
-static int opt_priority_reactor = 1;
-
-// Maximum time to wait for the test termination (-t)
-static int opt_max_duration = 60;
-
-// Maximum number of unread messages (-i)
-static int opt_max_msgs = 300;
-
-// Maximum number of retries to connect, it can be changed using the
-// -m option.
-static int max_retries = 5;
-
-typedef ACE_Connector<Write_Handler, ACE_CLASSIX_CO_CONNECTOR>
-        CONNECTOR;
-typedef ACE_Acceptor<Read_Handler, ACE_CLASSIX_CO_ACCEPTOR>
-        ACCEPTOR;
-
-typedef ACE_CLASSIX_Port ADDR;
-
-ACE_Atomic_Op<ACE_Thread_Mutex, int> Read_Handler::waiting_ = 0;
-ACE_Atomic_Op<ACE_Thread_Mutex, int> Read_Handler::started_ = 0;
-
-// Maximum number of unread messages
-// This is to overcome the blocking problem with ipcSend() in ClassixOS 3.1
-ACE_Atomic_Op<ACE_Thread_Mutex, int> max_msg = 0;
-
-void
-Read_Handler::set_countdown (int nchildren)
-{
-  Read_Handler::waiting_ = nchildren;
-}
-
-int
-Read_Handler::get_countdown (void)
-{
-  return Read_Handler::waiting_.value();
-}
-
-int
-Read_Handler::open (void *)
-{
-  if (this->peer ().enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Read_Handler::open, "
-                       "cannot set non blocking mode"), -1);
-
-  if (reactor ()->register_handler (this, READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Read_Handler::open, "
-                       "cannot register handler"), -1);
-
-  // A number larger than the actual number of priorities, so some
-  // clients are misbehaved, hence pusnished.
-  const int max_priority = 15;
-
-  this->priority (ACE_Event_Handler::LO_PRIORITY + started_.value() % max_priority);
-  started_++;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) created svc_handler for handle %d\n",
-              get_handle ()));
-  return 0;
-}
-
-int
-Read_Handler::handle_input (ACE_HANDLE h)
-{
-  char buf[BUFSIZ];
-
-//  ACE_DEBUG((LM_DEBUG,
-//           "(%P|%t|%x) read from handle %d...", this, h));
-  ssize_t result = this->peer ().recv (buf, sizeof (buf));
-
-  //
-  // Work around the blocking problem with ipcSend() in ClassixOS 3.1
-  // This counter ensures that the reader reads before the writer sends too
-  // many messages.
-  //
-  max_msg--;
-
-  if (result <= 0)
-    {
-      if (result < 0 && errno == EWOULDBLOCK)
-      {
-          max_msg++;
-          return 0;
-      }
-
-      if (result != 0)
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) %p\n",
-                    "Read_Handler::handle_input"));
-      waiting_--;
-
-      if (waiting_ == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Last svc_handler closed, shutting down\n"));
-          ACE_Reactor::instance()->end_event_loop();
-        }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Read_Handler(%d)::handle_input closing down\n", h));
-      return -1;
-    }
-
-//  ACE_DEBUG((LM_DEBUG,
-//           "...(%P|%t) read %d bytes from handle %d, priority %d\n",
-//           result, h, priority ()));
-  return 0;
-}
-
-int
-Write_Handler::open (void *)
-{
-  return 0;
-}
-
-int
-Write_Handler::svc (void)
-{
-  // Send several short messages, doing pauses between each message.
-  // The number of messages can be controlled from the command line.
-
-    ACE_Time_Value pause (0, 1000);
-    for (int i = 0; i < opt_nloops; ++i)
-    {
-        // Work around the blocking problem with ipcSend() in ClassixOS 3.1
-        // ipcSend() will block instead of returning K_EFULL value,
-        // if resources are not available.
-        //
-        // sleep for the reader to empty some messages
-        while (max_msg.value() >= opt_max_msgs)
-            ACE_OS::sleep(pause);
-
-
-        if (this->peer ().send_n (ACE_ALPHABET,
-                                  sizeof (ACE_ALPHABET) - 1) == -1)
-        {
-            ACE_DEBUG((LM_DEBUG, "%t %p\n", "send_n\n"));
-            ACE_OS::sleep (pause);
-            continue;
-        }
-        max_msg++;
-    }
-  this->peer().close_writer();
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Write Handler exiting svc\n"));
-  return 0;
-}
-
-// Execute the client tests.
-static void *
-client (void *arg)
-{
-  ADDR *connection_addr = (ADDR *) arg;
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) running client\n"));
-  CONNECTOR connector;
-
-  Write_Handler *writer = 0;
-
-  // Do exponential backoff connections
-  ACE_Synch_Options options = ACE_Synch_Options::synch;
-
-  // Start with one msec timeouts.
-  ACE_Time_Value msec (0, 1000);
-  options.timeout (msec);
-
-  // Try up to <max_retries> to connect to the server.
-  for (int i = 0; i < max_retries; i++)
-    {
-      if (connector.connect (writer,
-                             *connection_addr,
-                             options) == -1)
-        {
-          // Double the timeout...
-          ACE_Time_Value tmp = options.timeout ();
-          tmp += options.timeout ();
-          options.timeout (tmp);
-          writer = 0;
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) still trying to connect\n"));
-        }
-      else
-        {
-            // Let the new Svc_Handler to its job...
-            writer->svc ();
-
-            // then close the connection and release the Svc_Handler.
-            writer->destroy ();
-
-            return 0;
-        }
-    }
-
-  ACE_ERROR ((LM_ERROR,
-              "(%P|%t) failed to connect after %d retries\n",
-              max_retries));
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_START_TEST ("Con_Acc_Test");
-
-  // initialize environment, eg. reactor, etc.
-  ACE_CLASSIX_OS os;
-
-  ACE_Get_Opt getopt (argc, argv, "dc:l:m:t:i:", 1);
-
-  for (int c; (c = getopt ()) != -1; )
-    switch (c)
-      {
-      case 'd':
-        opt_priority_reactor = 0;
-        break;
-      case 'i':
-        opt_max_msgs = atoi (getopt.opt_arg ());
-        break;
-      case 'c':
-        opt_nchildren = atoi (getopt.opt_arg ());
-        break;
-      case 'l':
-        opt_nloops = atoi (getopt.opt_arg ());
-        break;
-      case 'm':
-        max_retries = atoi (getopt.opt_arg ());
-        break;
-      case 't':
-        opt_max_duration = atoi (getopt.opt_arg ());
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR, "Usage: Priority_Reactor_Test "
-                           "   [-d] (disable priority reactor)\n"
-                           "   [-i max_msgs] (max. unread messages)\n"
-                           "   [-c nchildren] (number of threads/processes)\n"
-                           "   [-l loops] (number of loops per child)\n"
-                           "   [-m maxretries] (attempts to connect)\n"
-                           "   [-t max_time] (limits test duration)\n"), -1);
-        ACE_NOTREACHED (break);
-      }
-
-  Read_Handler::set_countdown (opt_nchildren);
-
-  // Acceptor
-  ACE_DEBUG((LM_DEBUG, "Create an Acceptor\n"));
-  ACCEPTOR acceptor(ACE_Reactor::instance(), 0);
-  // The acceptor uses the global reactor and does not use select.
-
-  acceptor.priority (ACE_Event_Handler::HI_PRIORITY);
-  ADDR server_addr;
-
-  // Bind acceptor to any port and then find out what the port was.
-  ACE_DEBUG((LM_DEBUG, "Open the acceptor\n"));
-  if (acceptor.open ((const ADDR &) ACE_Addr::sap_any) == -1
-      || acceptor.acceptor ().get_local_addr (server_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "open"), -1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) starting server at port %d\n",
-              server_addr.get_port_number ()));
-
-  ADDR connection_addr (server_addr);
-
-  int i;
-
-  for (i = 0; i < opt_nchildren; ++i)
-    {
-      if (ACE_Thread_Manager::instance ()->spawn
-          (ACE_THR_FUNC (client),
-           (void *) &connection_addr,
-           THR_NEW_LWP | THR_DETACHED) == -1)
-        ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed"));
-    }
-
-  ACE_Time_Value tv (opt_max_duration);
-
-  ACE_Reactor::instance()->register_handler
-    (&acceptor, ACE_Event_Handler::READ_MASK);
-  ACE_Reactor::instance()->run_event_loop (tv);
-
-  if (Read_Handler::get_countdown () != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) running out of time, "
-                  "probably due to failed connections.\n"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) waiting for the children...\n"));
-
-  ACE_Thread_Manager::instance ()->wait ();
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Connector_Base<Write_Handler>;
-template class ACE_Connector<Write_Handler, ACE_CLASSIX_CO_CONNECTOR>;
-template class ACE_Acceptor<Read_Handler, ACE_CLASSIX_CO_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_CLASSIX_STREAM, ACE_SYNCH>;
-template class auto_ptr<ACE_Reactor>;
-template class ACE_Auto_Basic_Ptr<ACE_Reactor>;
-template class auto_ptr<ACE_Select_Reactor>;
-template class ACE_Auto_Basic_Ptr<ACE_Select_Reactor>;
-template class ACE_NonBlocking_Connect_Handler<Write_Handler>;
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Connector_Base<Write_Handler>
-#pragma instantiate ACE_Connector<Write_Handler, ACE_CLASSIX_CONNECTOR>
-#pragma instantiate ACE_Acceptor<Read_Handler, ACE_CLASSIX_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_CLASSIX_STREAM, ACE_SYNCH>
-#pragma instantiate auto_ptr<ACE_Reactor>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Reactor>
-#pragma instantiate auto_ptr<ACE_Select_Reactor>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Select_Reactor>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<Write_Handler>
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/CLASSIX/CLASSIX_Con_Acc_Test.h b/tests/CLASSIX/CLASSIX_Con_Acc_Test.h
deleted file mode 100644
index ff34d698eeb..00000000000
--- a/tests/CLASSIX/CLASSIX_Con_Acc_Test.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Priority_Reactor_Test.h
-//
-// = DESCRIPTION
-//    This class gets its own header file to work around AIX C++
-//    compiler "features" related to template instantiation...  It is
-//    only used by Priority_Reactor_Test.cpp.
-//
-// = AUTHOR
-//    Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef ACE_TESTS_PRIORITY_REACTOR_TEST_H
-#define ACE_TESTS_PRIORITY_REACTOR_TEST_H
-
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-
-#define ACE_CLASSIX_STREAM ACE_CLASSIX_Stream, ACE_CLASSIX_Addr
-#define ACE_CLASSIX_CO_CONNECTOR ACE_CLASSIX_CO_Connector, ACE_CLASSIX_Port
-#define ACE_CLASSIX_CO_ACCEPTOR ACE_CLASSIX_CO_Acceptor, ACE_CLASSIX_Port
-
-class Read_Handler : public ACE_Svc_Handler<ACE_CLASSIX_STREAM, ACE_SYNCH>
-  // = TITLE
-  //   A Svc_Handler with a priority twist.
-  //
-  // = DESCRIPTION
-  //   This Svc_Handler receives the data sent by the childs or writer
-  //   threads; each one sets it own priority to a new level, in a
-  //   cyclic manner.  The main point is test and exercise the
-  //   priority dispatching features of ACE_Priority_Reactor.
-{
-public:
-  static void set_countdown (int nchildren);
-  // Set the number of children or writer threads we will be running,
-  // when they are all gone we terminate the reactor loop.
-
-  static int get_countdown (void);
-  // Get the number of children we are still waiting for.
-
-  virtual int open (void *);
-  virtual int handle_input (ACE_HANDLE h);
-  // The Svc_Handler callbacks.
-
-private:
-  static ACE_Atomic_Op<ACE_Thread_Mutex, int>  waiting_;
-  // How many writers are we waiting for.
-
-  static ACE_Atomic_Op<ACE_Thread_Mutex, int>  started_;
-  // How many readers have started.
-};
-
-class Write_Handler : public ACE_Svc_Handler<ACE_CLASSIX_STREAM, ACE_SYNCH>
-  // = TITLE
-  //   A simple writer.
-  //
-  // = DESCRIPTION
-  //   This Svc_Handler simply connects to a server and sends some
-  //   output to it.  Its purpose is to feed the test.
-{
-public:
-  virtual int open (void *);
-  virtual int svc (void);
-};
-
-#endif /* ACE_TESTS_PRIORITY_REACTOR_TEST_H */
diff --git a/tests/CLASSIX/CLASSIX_Group_Test.cpp b/tests/CLASSIX/CLASSIX_Group_Test.cpp
deleted file mode 100644
index 0cb653e6e8f..00000000000
--- a/tests/CLASSIX/CLASSIX_Group_Test.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Group_Test.cpp
-//
-// = DESCRIPTION
-//     This is a test of the <IPP_CLASSIX_Group_*> class.
-//
-// = AUTHOR
-//    Wei Chiang
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Addr.h"
-#include "ace/CLASSIX/CLASSIX_Group_Stamp.h"
-#include "ace/CLASSIX/CLASSIX_Group_Dynamic.h"
-
-#include "tests/test_config.h"
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("Group_Test");
-
-  int stamp = 20;
-  /* ================================================================== */
-  ACE_DEBUG((LM_INFO, "-----------group target-----------\n"));
-
-  ACE_DEBUG((LM_INFO, "constrctor(Stamp)..................\n"));
-  ACE_CLASSIX_Group_Stamp t0(100);
-  t0.dump();
-
-  /* ================================================================== */
-  ACE_DEBUG((LM_INFO, "-----------group target-----------\n"));
-
-  ACE_DEBUG((LM_INFO, "constrctor(Stamp)..................\n"));
-  ACE_CLASSIX_Group_Stamp t1(stamp);
-  t1.dump();
-
-  /* ================================================================== */
-  ACE_DEBUG((LM_INFO, "empty constrctor(Stamp) & set_group()\n"));
-  ACE_CLASSIX_Group_Stamp t2;
-  if (t2 == t1)
-      ACE_DEBUG((LM_ERROR, "t2 == t1, should be !=\n"));
-  t2.set_addr(&stamp);
-  t2.dump();
-  if (t2 != t1)
-      ACE_DEBUG((LM_ERROR, "????t2 != t1, should be ==\n"));
-      
-
-  /* ================================================================== */
-  ACE_DEBUG((LM_INFO, "Constrctor(Dynamic) & set_group()\n"));
-  ACE_CLASSIX_Group_Dynamic t3;
-  t3.dump();
-
-  ACE_CLASSIX_Group_Stamp t4;
-  t4.set_addr(t2.get_addr(), t2.get_size()); 
-  t4.dump();
-  if (t4 == t2)
-      ACE_DEBUG((LM_ERROR, "????t4 == t2, should be !=\n"));
-  t4.set_addr(&stamp); 
-  t4.dump();
-  if (t4 != t2)
-      ACE_DEBUG((LM_ERROR, "????t4 != t2, should be ==\n"));
-
-  ACE_CLASSIX_Group t5(t3.get_addr(), t3.get_size());
-  t5.dump();
-  if (t5 != t3)
-      ACE_DEBUG((LM_ERROR, "????t5 != t3, should be ==\n"));
-      
-
-  if (t2 != t1)
-      ACE_DEBUG((LM_ERROR, "????t2 != t1, should be ==\n"));
-      
-  /* ================================================================== */
-  ACE_END_TEST;
-  return 0;
-}
-
diff --git a/tests/CLASSIX/CLASSIX_Notify_Test.cpp b/tests/CLASSIX/CLASSIX_Notify_Test.cpp
deleted file mode 100644
index f176155c4c9..00000000000
--- a/tests/CLASSIX/CLASSIX_Notify_Test.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Notify_Test.cpp
-//
-// = DESCRIPTION
-//      Based on $ACE_ROOT/tests/Reactors_test.cpp
-//      
-//      This is a test that performs a torture test of multiple
-//      <ACE_Reactors> and <ACE_Tasks> in the same process.
-//
-// = NOTE
-//      Use ACE_Reactor and thus Chorus's socket sub-system, it behave
-//      quite stragnely including a printout such as
-//      "(15) task_9: !!!notify: Not a stream device"
-//
-// = AUTHOR
-//     Prashant Jain, Detlef Becker, and Douglas C. Schmidt   
-//
-// ============================================================================
-
-#include "ace/Task.h"
-
-#include "ace/CLASSIX/CLASSIX_OS.h"
-#include "ace/CLASSIX/CLASSIX_Select_Reactor.h"
-
-#include "CLASSIX_test_config.h"
-
-#if defined (ACE_HAS_THREADS)
-
-ACE_Thread_Manager *tm;
-
-static const int MAX_TASKS = 20;
-
-class Test_Task : public ACE_Task<ACE_MT_SYNCH>
-  // = TITLE
-  //    Exercise the tasks.
-{
-public:
-  // = Initialization and termination methods.
-  Test_Task (void);
-  ~Test_Task (void);
-
-  // = Task hooks.
-  virtual int open (void *args = 0);
-  virtual int close (u_long flags = 0);
-  virtual int svc (void);
-
-  // = Event Handler hooks.
-  virtual int handle_input (ACE_HANDLE handle);
-  virtual int handle_close (ACE_HANDLE fd,
-                            ACE_Reactor_Mask close_mask);
-
-private:
-  size_t handled_;
-  char name_[10];
-  // Number of iterations handled.
-
-  static int task_count_;
-  // Number of tasks running.
-};
-
-// Static data member initialization.
-int Test_Task::task_count_ = 0;
-
-static ACE_Atomic_Op<ACE_Thread_Mutex, int> done_count = MAX_TASKS * 2;
-
-static ACE_Recursive_Thread_Mutex recursive_lock;
-
-Test_Task::Test_Task (void)
-  : handled_ (0)
-{
-  ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, recursive_lock);
-
-  Test_Task::task_count_++;
-
-  ACE_OS::sprintf(this->name_, "%s_%d", "task", Test_Task::task_count_); 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) TT+ %s\n",
-	      this->name_));
-}
-
-Test_Task::~Test_Task (void)
-{
-  ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, recursive_lock);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) TT- %s: %d\n",
-              this->name_, Test_Task::task_count_));
-
-  ACE_ASSERT (Test_Task::task_count_ == 0);
-}
-
-int
-Test_Task::open (void *args)
-{
-  this->reactor ((ACE_Reactor *) args);
-  return this->activate (THR_NEW_LWP);
-}
-
-int
-Test_Task::close (u_long)
-{
-  ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, recursive_lock, -1);
-
-  Test_Task::task_count_--;
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) close %s, task_count_ = %d\n",
-              this->name_, Test_Task::task_count_));
-
-  if (Test_Task::task_count_ < 0)
-    abort ();
-
-  return 0;
-}
-
-int
-Test_Task::svc (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) svc(%s)\n", this->name_));
-
-  for (size_t i = 0; i < ACE_MAX_ITERATIONS; i++)
-    {
-      ACE_OS::thr_yield ();
-
-      // Only wait up to 10 milliseconds to notify the Reactor.
-      ACE_Time_Value timeout (0, 10 * 1000);
-
-      if (this->reactor ()->notify (this,
-                                    ACE_Event_Handler::READ_MASK,
-                                    &timeout) == -1)
-        {
-          if (errno == ETIME)
-            ACE_DEBUG ((LM_DEBUG, "(%t) %p\n", "notify() timed out"));
-          else
-            ACE_ERROR_RETURN ((LM_ERROR, "(%t) %s: %p\n", this->name_,
-			       "!!!notify"), -1);
-        }
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) end svc(%s)\n", this->name_));
-  return 0;
-}
-
-int
-Test_Task::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  return 0;
-}
-
-int
-Test_Task::handle_input (ACE_HANDLE)
-{
-  this->handled_++;
-
-  if (this->handled_ == ACE_MAX_ITERATIONS)
-    {
-      done_count--;
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%t) handle_input, handled_ = %d, done_count = %d\n",
-                  this->handled_, done_count.value ()));
-    }
-
-  ACE_OS::thr_yield ();
-  return -1;			// this will trigger hnalde_close() be called
-}
-
-static void *
-worker (void *args)
-{
-    ACE_DEBUG((LM_DEBUG, "(%t) worker started\n"));
-  ACE_Reactor *reactor = (ACE_Reactor *) args;
-
-  // Make this thread the owner of the Reactor's event loop.
-  reactor->owner (ACE_Thread::self ());
-
-  // Use a timeout to inform the Reactor when to shutdown.
-  ACE_Time_Value timeout (1);
-
-  for (;;)
-    {
-      switch (reactor->handle_events (timeout))
-        {
-        case -1:
-          ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "reactor"), 0);
-          /* NOTREACHED */
-        case 0:
-          ACE_ERROR_RETURN ((LM_ERROR, "(%t) Reactor shutdown\n"), 0);
-          /* NOTREACHED */
-	default:
-	    timeout.sec(1);
-        }
-    }
-
-  ACE_NOTREACHED (return 0);
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_THREADS */
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("Notify_Test");
-
-  // initialize the singletons and environment
-  ACE_CLASSIX_OS classix;
-
-#if defined (ACE_HAS_THREADS)
-  ACE_ASSERT (ACE_LOG_MSG->op_status () != -1);
-
-  tm = ACE_Thread_Manager::instance ();
-
-  ACE_Reactor reactor;
-  ACE_ASSERT (ACE_LOG_MSG->op_status () != -1);
-
-  Test_Task tt1[MAX_TASKS];
-  Test_Task tt2[MAX_TASKS];
-
-  // Activate all of the Tasks.
-
-  for (int i = 0; i < MAX_TASKS; i++)
-    {
-      tt1[i].open (ACE_Reactor::instance ());
-//      tt2[i].open (&reactor);
-      tt2[i].open (ACE_Reactor::instance ());
-    }
-
-  // Spawn two threads each running a different reactor.
-
-  if (ACE_Thread_Manager::instance ()->spawn
-      (ACE_THR_FUNC (worker),
-       (void *) ACE_Reactor::instance (),
-       THR_BOUND | THR_DETACHED) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), -1);
-
-#if 0
-  else if (ACE_Thread_Manager::instance ()->spawn
-      (ACE_THR_FUNC (worker), (void *) &reactor,
-       THR_BOUND | THR_DETACHED) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), -1);
-#endif
-
-  if (ACE_Thread_Manager::instance ()->wait () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "wait"), -1);
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) all threads are finished \n"));
-
-#else
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-#endif /* ACE_HAS_THREADS */
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/tests/CLASSIX/CLASSIX_OS_Test.cpp b/tests/CLASSIX/CLASSIX_OS_Test.cpp
deleted file mode 100644
index ba61f47fad1..00000000000
--- a/tests/CLASSIX/CLASSIX_OS_Test.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    CLASSIX_OS_Test.cpp
-//
-// = DESCRIPTION
-//     This is a test of the <ACE_CLASSIX_OS> class.
-//
-// = AUTHOR
-//    Wei Chiang
-// 
-// ============================================================================
-
-#include "tests/test_config.h"
-#include "ace/CLASSIX/CLASSIX_OS.h"
-
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("CLASSIX_OS_Test");
-
-  ACE_DEBUG((LM_INFO, "Empty Message\n"));
-  ACE_CLASSIX_Msg msg1;
-  msg1.dump();
-
-  char buf[] ="This is a test message";
-  int size = sizeof (buf);
-  ACE_DEBUG((LM_INFO, "%s(size = %d)\n", buf, size));
-  ACE_CLASSIX_Msg msg2(buf, size);
-  msg2.dump();
-
-
-  ACE_END_TEST;
-  return 0;
-}
-
diff --git a/tests/CLASSIX/CLASSIX_Reactor_Test.cpp b/tests/CLASSIX/CLASSIX_Reactor_Test.cpp
deleted file mode 100644
index 81d2ca6c9c3..00000000000
--- a/tests/CLASSIX/CLASSIX_Reactor_Test.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Reactor_Test.cpp
-//
-// = DESCRIPTION
-//     This is a test of the <ACE_CLASSIX_Select_Reactor> class.
-//     based on $ACE_ROOT/tests/MT_Reactor_Timer_Test.cpp
-//     
-// = AUTHOR
-//    Wei Chiang
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Select_Reactor.h"
-
-#include "CLASSIX_test_config.h"
-#include "CLASSIX_Reactor_Test.h"
-
-static ACE_Reactor *the_reactor;
-
-Time_Handler::Time_Handler (void)
-{
-  for (int i = 0;
-       i < Time_Handler::TIMER_SLOTS;
-       this->timer_id_[i++] = -1)
-    continue;
-}
-
-// Set up initial timer conditions.
-
-void 
-Time_Handler::setup (void)
-{
-  this->timer_id_[1] = the_reactor->schedule_timer (this,
-                                                    (const void *) 1,
-                                                    ACE_Time_Value (5));
-}
-
-
-// In the secondary thread, set a heartbeat timer to go off every
-// second.  The heartbeat checks the status of things to be sure
-// they're being set and expired correctly.
-
-int 
-Time_Handler::svc (void)
-{
-  ACE_Time_Value backstop (30);
-
-  this->timer_id_[2] = the_reactor->schedule_timer(this,
-                                                   (const void *) 2,
-                                                   ACE_Time_Value (3));
-  this->my_reactor_.owner (ACE_OS::thr_self ());
-  this->my_reactor_.schedule_timer (this, (const void *) 0,
-                                    ACE_Time_Value (1),
-                                    ACE_Time_Value (1));
-
-  while (!ACE_Reactor::event_loop_done())
-  {
-      int result = this->my_reactor_.handle_events (backstop);
-      if (result == -1)
-         break;
-      ACE_Thread::yield();
-  }
-
-  ACE_DEBUG((LM_DEBUG, "(%T(%t) heartbeat's event loop ended\n"));
-
-  return 0;
-}
-
-int 
-Time_Handler::handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg)
-{
-  long time_tag = long (arg);
-  ACE_UNUSED_ARG(tv);
-
-  if (time_tag == 0) 
-    {   // Heartbeat.
-      int i;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "%T (%t): heartbeat...\n"));
-      // See if all of the timers have fired.  If so, leave the thread's
-      // reactor loop which will exit the thread and end the test.
-
-      for (i = 0; i < Time_Handler::TIMER_SLOTS; i++) 
-        if (this->timer_id_[i] != -1)
-          break;
-
-      if (i == Time_Handler::TIMER_SLOTS)
-        {       // All timers should be gone.
-
-          // Cancel heartbeat.
-          ACE_ASSERT (this->my_reactor_.cancel_timer (this) == 1);
-
-          // Shouldn't be any.
-          ACE_ASSERT (the_reactor->cancel_timer (this) == 0); 
-          this->my_reactor_.end_event_loop ();
-        }
-      ACE_DEBUG ((LM_DEBUG,
-                  "%T (%t): ...heartbeat\n"));
-      return 0;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "%T (%t): Timer #%d (id #%d) expired\n",
-              time_tag,
-              this->timer_id_[time_tag]));
-
-  ACE_ASSERT (this->timer_id_[time_tag] != -1);
-  this->timer_id_[time_tag] = -1;
-
-  return 0;
-}
-
-
-//===============================================================//
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("Reactor_Test");
-
-  // CLASSIX environment initialization
-  ACE_CLASSIX_OS classix;
-  the_reactor = ACE_Reactor::instance();
-  Time_Handler other_thread;
-
-
-  // Set up initial set of timers.
-  other_thread.setup ();
-
-  other_thread.activate (THR_NEW_LWP | THR_JOINABLE);
-  the_reactor->run_event_loop ();
-  ACE_DEBUG((LM_DEBUG, "(%t) main thread's event loop ended\n"));
-  other_thread.wait ();
-
-
-  ACE_END_TEST;
-  return 0;
-}
-
diff --git a/tests/CLASSIX/CLASSIX_Reactor_Test.h b/tests/CLASSIX/CLASSIX_Reactor_Test.h
deleted file mode 100644
index 877c930df30..00000000000
--- a/tests/CLASSIX/CLASSIX_Reactor_Test.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Reactor_Test.h
-//
-// = DESCRIPTION
-//      This file contains class definitions needed for template
-//      instantiation in the Reactor_Test.cpp file.
-//      Based on $ACE_ROOT/tests/MT_Reactor_Timer_Test.h
-//
-// = AUTHOR
-//    Wei Chiang
-//
-// ============================================================================
-
-#ifndef __CLASSIX_REACTOR_TEST_H
-#define __CLASSIX_REACTOR_TEST_H
-
-#include "ace/Reactor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Task.h"
-
-class Time_Handler : public ACE_Task<ACE_SYNCH>
-{
-public:
-  Time_Handler (void);
-
-  void setup (void);
-
-  virtual int svc (void);
-  // Run by a daemon thread to handle deferred processing.
-
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg);
-
-private:
-  enum
-  {
-    TIMER_SLOTS = 10
-  };
-
-  long timer_id_[TIMER_SLOTS];
-  int step_;
-  ACE_Reactor my_reactor_;
-};
-
-#endif /* __CLASSIX_REACTOR_TEST_H */
diff --git a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.cpp b/tests/CLASSIX/CLASSIX_Select_Reactor_Test.cpp
deleted file mode 100644
index 8e124ebc54f..00000000000
--- a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    MT_Reactor_Timer_Test.cpp
-//
-// = DESCRIPTION
-//      This is a simple test that illustrates the timer mechanism of
-//      the reactor scheduling timers, handling expired timers and
-//      cancelling scheduled timers from multiple threads.
-//      No command line arguments are needed to run the test.
-//
-// = AUTHOR
-//    Steve Huston
-// 
-// ============================================================================
-
-#include "CLASSIX_test_config.h"
-#include "CLASSIX_Select_Reactor_Test.h"
-
-#if defined (ACE_HAS_THREADS)
-
-static ACE_Reactor *the_reactor;
-
-Time_Handler::Time_Handler (void)
-{
-  for (int i = 0;
-       i < Time_Handler::TIMER_SLOTS;
-       this->timer_id_[i++] = -1)
-    continue;
-}
-
-// Set up initial timer conditions.
-
-void 
-Time_Handler::setup (void)
-{
-  this->timer_id_[1] = the_reactor->schedule_timer (this,
-                                                    (const void *) 1,
-                                                    ACE_Time_Value (5));
-}
-
-
-// In the secondary thread, set a heartbeat timer to go off every
-// second.  The heartbeat checks the status of things to be sure
-// they're being set and expired correctly.
-
-int 
-Time_Handler::svc (void)
-{
-  ACE_Time_Value backstop (30);
-
-  this->timer_id_[2] = the_reactor->schedule_timer(this,
-                                                   (const void *) 2,
-                                                   ACE_Time_Value (3));
-  ACE_thread_t tid;
-  this->my_reactor_.owner(&tid);
-  ACE_DEBUG((LM_DEBUG, "((%t) hearbeat reactor's owner was %d\n", tid));
-  this->my_reactor_.owner (ACE_Thread::self ());
-  this->my_reactor_.owner(&tid);
-  ACE_DEBUG((LM_DEBUG, "((%t) hearbeat reactor's owner is %d\n", tid));
-
-  long id = this->my_reactor_.schedule_timer (this, (const void *) 0,
-                                    ACE_Time_Value (1),
-                                    ACE_Time_Value (1));
-  this->my_reactor_.owner(&tid);
-
-  while (!ACE_Reactor::event_loop_done())
-  {
-      int result = this->my_reactor_.handle_events (backstop);
-      if (result == -1)
-         break;
-    }
-
-  ACE_DEBUG((LM_DEBUG, "(%T(%t) exit from heartbeat\n"));
-  return 0;
-}
-
-int 
-Time_Handler::handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg)
-{
-  long time_tag = long (arg);
-  ACE_UNUSED_ARG(tv);
-
-  if (time_tag == 0) 
-    {	// Heartbeat.
-      int i;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "%T (%t): heartbeat\n"));
-      // See if all of the timers have fired.  If so, leave the thread's
-      // reactor loop which will exit the thread and end the test.
-
-      for (i = 0; i < Time_Handler::TIMER_SLOTS; i++) 
-        if (this->timer_id_[i] != -1)
-          break;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "%T (%t): heartbeat done: time slot = %d\n", i));
-      if (i == Time_Handler::TIMER_SLOTS)
-        {	// All timers should be gone.
-
-          // Cancel heartbeat.
-          ACE_ASSERT (this->my_reactor_.cancel_timer (this) == 1);	
-
-          // Shouldn't be any.
-          ACE_ASSERT (the_reactor->cancel_timer (this) == 0); 
-          this->my_reactor_.end_event_loop ();
-	  ACE_DEBUG ((LM_DEBUG,
-		      "%T (%t): event loop ended\n"));
-        }
-      return 0;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "%T (%t): Timer #%d (id #%d) expired\n",
-              time_tag,
-              this->timer_id_[time_tag]));
-
-  ACE_ASSERT (this->timer_id_[time_tag] != -1);
-  this->timer_id_[time_tag] = -1;
-
-  return 0;
-}
-
-#endif /* ACE_HAS_THREADS */
-
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("Select_Reactor_Test");
-
-#if defined (ACE_HAS_THREADS)
-
-  the_reactor = ACE_Reactor::instance ();
-  Time_Handler other_thread;
-
-
-  // Set up initial set of timers.
-  other_thread.setup ();
-
-  #if 0
-  the_reactor->schedule_timer (&other_thread,
-                               (const void *) 1,
-                               ACE_Time_Value (5));
-  #endif /* 0 */
-
-  other_thread.activate (THR_NEW_LWP | THR_JOINABLE);
-  the_reactor->run_event_loop ();
-  ACE_DEBUG ((LM_DEBUG,
-	      "%T (%t): waiting for thread to exit\n"));
-  other_thread.wait ();
-#else
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
-#endif /* ACE_HAS_THREADS */
-
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.h b/tests/CLASSIX/CLASSIX_Select_Reactor_Test.h
deleted file mode 100644
index 6f992a74f90..00000000000
--- a/tests/CLASSIX/CLASSIX_Select_Reactor_Test.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    MT_Reactor_Timer_Test.h
-//
-// = DESCRIPTION
-//      This file contains class definitions needed for template
-//      instantiation in the MT_Reactor_Timer_Test.cpp file.
-//
-// = AUTHOR
-//    Steve Huston
-//
-// ============================================================================
-
-#ifndef __MT_REACTOR_TIMER_TEST_H
-#define __MT_REACTOR_TIMER_TEST_H
-
-#include "ace/Reactor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Task.h"
-
-class Time_Handler : public ACE_Task<ACE_SYNCH>
-{
-public:
-  Time_Handler (void);
-
-  void setup (void);
-
-  virtual int svc (void);
-  // Run by a daemon thread to handle deferred processing.
-
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg);
-
-private:
-  enum
-  {
-    TIMER_SLOTS = 10
-  };
-
-  long timer_id_[TIMER_SLOTS];
-  int step_;
-  ACE_Reactor my_reactor_;
-};
-
-#endif /* __MT_REACTOR_TIMER_TEST_H */
diff --git a/tests/CLASSIX/CLASSIX_Stream_Test.cpp b/tests/CLASSIX/CLASSIX_Stream_Test.cpp
deleted file mode 100644
index 4956339f41c..00000000000
--- a/tests/CLASSIX/CLASSIX_Stream_Test.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    Stream_Test.cpp
-//
-// = DESCRIPTION
-//     This is a test of the <IPP_CLASSIX_Addr> class.
-//
-// = AUTHOR
-//    Wei Chiang
-// 
-// ============================================================================
-
-#include "ace/CLASSIX/CLASSIX_Stream.h"
-
-#include "tests/test_config.h"
-
-#define RCV_DELAY 1000        /* We should NOT wait in ipcReceive */
-
-static char sndBody[]  = "The sea is calm, the tide is full ...\n";
-static char rcvAnnex[K_CMSGANNEXSIZE];
-static char rcvBody[1000];
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("Stream_Test");
-
-  /* ================================================================== */
-  ACE_CLASSIX_Port_Core remote_port;
-
-  // Sender's socket
-  // Use my default port as the sending address
-  ACE_CLASSIX_Stream send(remote_port);
-
-  ACE_CLASSIX_Stream rcv(send.local_sap().get_addr(), 
-			 ACE_CLASSIX_Port(remote_port));
-  // make the rcv's port be one of the multiple receive ports  
-  if (rcv.selectable() < 0)
-      ACE_DEBUG((LM_DEBUG, "failed to make the port selectable\n"));
-
-  send.open_writer();
-
-  ACE_DEBUG((LM_DEBUG, "send and block on receive....\n"));
-  if (send.send_n(&sndBody[0], sizeof(sndBody)) == sizeof(sndBody))
-  {
-      // Receiver's Socket
-      int rslt = rcv.ipcRecv(rcvBody, 1000);
-      if (rslt == sizeof (sndBody))
-	  ACE_DEBUG((LM_DEBUG, "received %s\n", rcvBody));
-      else
-	  ACE_DEBUG((LM_ERROR, "???? Error in ipcReceive():%d\n", rslt));
-  }
-  else
-  {
-	  ACE_ERROR((LM_ERROR, "(%t)|%p\n", "???? Error in send_n()\n"));
-  }
-
-  ACE_DEBUG((LM_DEBUG, "send, peek then block on receive....\n"));
-  if (send.send_n(&sndBody[0], sizeof(sndBody)) == sizeof(sndBody))
-  {
-      // Receiver's Socket
-      //  int rslt = rcv.recv(rcvBody, 1000, MSG_PEEK);
-      // Equivalent to rcv.peek()
-      int rslt = rcv.peek();
-      if (rslt < 0)
-	  ACE_DEBUG((LM_ERROR, "???? Error while peeking :%d\n", rslt));
-      else
-      {
-	  char *buf = new char(rslt);
-	  if (int n = rcv.recv(buf, rslt) == rslt)
-	      ACE_DEBUG((LM_DEBUG, "received %s\n", buf));
-	  else
-	      ACE_DEBUG((LM_ERROR, "???? Error in ipcReceive(): %d\n", n));
-	  delete buf;
-      }
-  }
-  else
-  {
-	  ACE_DEBUG((LM_ERROR, "???? Error in send_n()\n"));
-  }
-
-  ACE_DEBUG((LM_DEBUG, "test recv_n()....\n"));
-  if (send.send_n(&sndBody[0], sizeof(sndBody)) == sizeof(sndBody) &&
-      send.send_n(&sndBody[0], sizeof(sndBody)) == sizeof(sndBody))
-  {
-      // Receiver's Socket
-
-      int rslt = rcv.ipcRecv_n(rcvBody, 2*sizeof (sndBody) - 10);
-      if (rslt == (2 * sizeof (sndBody) -10))
-      {
-	  rcvBody[rslt] = '\0';	// For %s printout format
-	  ACE_DEBUG((LM_DEBUG, "received %d byte: %s + %s\n", rslt,
-		     rcvBody,  rcvBody + sizeof(sndBody)));
-      }
-      else
-	  ACE_DEBUG((LM_ERROR, "???(%P|%t) %p\n", "ipcRecv_n()"));
-  }
-  else
-      ACE_DEBUG((LM_ERROR, "???(%P|%t) %p\n", "ipcRecv_n()"));
-
-  ACE_END_TEST;
-  return 0;
-}
-
diff --git a/tests/CLASSIX/CLASSIX_test_config.h b/tests/CLASSIX/CLASSIX_test_config.h
deleted file mode 100644
index cce7e86c1af..00000000000
--- a/tests/CLASSIX/CLASSIX_test_config.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-// = FILENAME
-//    test_config.h
-//
-// = AUTHOR
-//    Prashant Jain <pjain@cs.wustl.edu>, Tim Harrison
-//    <harrison@cs.wustl.edu>, and David Levine <levine@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_TEST_CONFIG_H
-#define ACE_TEST_CONFIG_H
-
-// This first #undef protects against command-line definitions.
-#undef ACE_NDEBUG
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/streams.h"
-
-// The second #undef protects against being reset in a config.h file.
-#undef ACE_NDEBUG
-
-#if !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-class KEY
-// ============================================================================
-// = TITLE
-//    Define a key for use with the Map_Manager_Test.
-//
-// = DESCRIPTION
-//    This class is put into the test_config.h header file to work
-//    around AIX C++ compiler "features" related to template
-//    instantiation...  It is only used by Map_Manager_Test.cpp
-// ============================================================================
-{
-public:
-  KEY (size_t v = 0): value_ (v)
-  { }
-
-  size_t hash (void) const { return this->value_; }
-  operator size_t () const { return this->value_; }
-
-private:
-  size_t value_;
-};
-#else
-typedef size_t KEY;
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
-
-#if defined (ACE_WIN32)
-
-#define ACE_DEFAULT_TEST_FILE_A "C:\\temp\\ace_test_file"
-#define ACE_TEMP_FILE_NAME_A "C:\\temp\\ace_temp_file"
-#define ACE_LOG_DIRECTORY_A "C:\\temp\\log\\"
-#define MAKE_PIPE_NAME_A(X) "\\\\.\\pipe\\"#X
-
-#define ACE_DEFAULT_TEST_FILE_W L"C:\\temp\\ace_test_file"
-#define ACE_TEMP_FILE_NAME_W L"C:\\temp\\ace_temp_file"
-#define ACE_LOG_DIRECTORY_W L"C:\\temp\\log\\"
-#define MAKE_PIPE_NAME_W(X) L"\\\\.\\pipe\\"#X
-
-#else
-
-#define ACE_DEFAULT_TEST_FILE_A "/tmp/ace_test_file"
-#define ACE_TEMP_FILE_NAME_A "/tmp/ace_temp_file"
-#define ACE_LOG_DIRECTORY_A "log/"
-#define MAKE_PIPE_NAME_A(X) X
-
-#if defined (ACE_HAS_UNICODE)
-#define ACE_DEFAULT_TEST_FILE_W L"/tmp/ace_test_file"
-#define ACE_TEMP_FILE_NAME_W L"/tmp/ace_temp_file"
-#define ACE_LOG_DIRECTORY_W L"log/"
-#define MAKE_PIPE_NAME_W(X) L##X
-#else
-#define ACE_DEFAULT_TEST_FILE_W "/tmp/ace_test_file"
-#define ACE_TEMP_FILE_NAME_W "/tmp/ace_temp_file"
-#define ACE_LOG_DIRECTORY_W "log/"
-#define MAKE_PIPE_NAME_W(X) X
-#endif /* ACE_HAS_UNICODE */
-
-#endif /* ACE_WIN32 */
-
-#if defined (UNICODE)
-#define ACE_DEFAULT_TEST_FILE ACE_DEFAULT_TEST_FILE_W
-#define ACE_TEMP_FILE_NAME ACE_TEMP_FILE_NAME_W
-#define ACE_LOG_DIRECTORY ACE_LOG_DIRECTORY_W
-#define MAKE_PIPE_NAME MAKE_PIPE_NAME_W
-#else
-#define ACE_DEFAULT_TEST_FILE ACE_DEFAULT_TEST_FILE_A
-#define ACE_TEMP_FILE_NAME ACE_TEMP_FILE_NAME_A
-#define ACE_LOG_DIRECTORY ACE_LOG_DIRECTORY_A
-#define MAKE_PIPE_NAME MAKE_PIPE_NAME_A
-#endif /* UNICODE */
-
-#define ACE_START_TEST(NAME) \
-  const char *program = NAME; \
-  ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
-  if (ace_file_stream.set_output (program) != 0) \
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set_output failed"), -1); \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting %s test at %D\n", program));
-
-#define ACE_END_TEST \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Ending %s test at %D\n", program)); \
-  ace_file_stream.close ()
-
-#define ACE_APPEND_LOG(NAME) \
-  const char *program = NAME; \
-  ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
-  ace_file_stream.close (); \
-  if (ace_file_stream.set_output (program, 1) != 0) \
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set_output failed"), -1); \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting %s test at %D\n", program));
-
-#define ACE_END_LOG \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Ending %s test at %D\n\n", program)); \
-  ace_file_stream.close ();
-
-#if defined (VXWORKS)
-  // This is the only way I could figure out to avoid an error
-  // about attempting to unlink a non-existant file.
-#define ACE_INIT_LOG(NAME) \
-  char temp[MAXPATHLEN]; \
-  ACE_OS::sprintf (temp, "%s%s%s", \
-                   ACE_LOG_DIRECTORY_A, \
-                   ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \
-                   ".log"); \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Deleting old log file %s (if any)\n\n", temp)); \
-  int fd_init_log; \
-  if ((fd_init_log = ACE_OS::open (temp, \
-                                   O_WRONLY | O_CREAT, 0x644)) != ERROR) \
-    { \
-      ACE_OS::close (fd_init_log); \
-      ACE_OS::unlink (temp); \
-    }
-#else /* ! VXWORKS */
-#define ACE_INIT_LOG(NAME) \
-  char temp[MAXPATHLEN]; \
-  ACE_OS::sprintf (temp, "%s%s%s", \
-                   ACE_LOG_DIRECTORY_A, \
-                   ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \
-                   ".log"); \
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Deleting old log file %s (if any)\n\n", temp)); \
-  ACE_OS::unlink (temp);
-#endif /* ! VXWORKS */
-
-const size_t ACE_NS_MAX_ENTRIES = 1000;
-const size_t ACE_DEFAULT_USECS = 1000;
-const size_t ACE_MAX_TIMERS = 4;
-const size_t ACE_MAX_THREADS = 4;
-const size_t ACE_MAX_DELAY = 10;
-const size_t ACE_MAX_INTERVAL = 0;
-const size_t ACE_MAX_ITERATIONS = 10;
-const size_t ACE_MAX_PROCESSES = 10;
-const size_t ACE_MAX_CLIENTS = 30;
-
-char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
-
-class ACE_Test_Output
-{
-public:
-  ACE_Test_Output (void);
-  ~ACE_Test_Output (void);
-  int set_output (const char *filename, int append = 0);
-  ofstream *output_file (void);
-  void close (void);
-
-private:
-  ofstream output_file_;
-};
-
-static ACE_Test_Output ace_file_stream;
-
-ACE_Test_Output::ACE_Test_Output (void)
-{
-}
-
-ACE_Test_Output::~ACE_Test_Output (void)
-{
-}
-
-int
-ACE_Test_Output::set_output (const char *filename, int append)
-{
-  char temp[MAXPATHLEN];
-  // Ignore the error value since the directory may already exist.
-
-  char *test_dir = ACE_OS::getenv ("ACE_TEST_DIR");
-
-  if (test_dir == 0)
-    test_dir = "";
-
-  ACE_OS::sprintf (temp,
-                   "%s%s%s%s",
-                   test_dir,
-                   ACE_LOG_DIRECTORY_A,
-                   ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR_A),
-                   ".log");
-
-#if defined (VXWORKS)
-  // This is the only way I could figure out to avoid a console warning
-  // about opening an existing file (w/o O_CREAT), or attempting to unlink
-  // a non-existant one.
-  int fd;
-  if ((fd = ACE_OS::open (temp, O_WRONLY | O_CREAT, 0x644)) != ERROR)
-    {
-      ACE_OS::close (fd);
-      ACE_OS::unlink (temp);
-    }
-#else /* ! VXWORKS */
-  // This doesn't seem to work on VxWorks if the directory doesn't
-  // exist:  it creates a plain file instead of a directory.  If the
-  // directory does exist, it causes a wierd console error message
-  // about "cat: input error on standard input: Is a directory".  So,
-  // VxWorks users must create the directory manually.
-  ACE_OS::mkdir (ACE_LOG_DIRECTORY_A);
-#endif /* ! VXWORKS */
-
-  int flags = ios::out;
-  if (append)
-    flags |= ios::app;
-  else
-    flags |= ios::trunc;
-
-  this->output_file_.open (temp, flags);
-  if (this->output_file_.bad ())
-    {
-      return -1;
-    }
-
-  ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ());
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
-  ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-
-  return 0;
-}
-
-ofstream *
-ACE_Test_Output::output_file (void)
-{
-  return &this->output_file_;
-}
-
-void
-ACE_Test_Output::close (void)
-{
-  this->output_file_.flush ();
-  this->output_file_.close ();
-}
-
-void
-randomize (int array[], size_t size)
-{
-  size_t i;
-
-  for (i = 0; i < size; i++)
-    array [i] = i;
-
-  ACE_OS::srand (ACE_OS::time (0L));
-
-  // Generate an array of random numbers from 0 .. size - 1.
-
-  for (i = 0; i < size; i++)
-    {
-      int index = ACE_OS::rand() % size--;
-      int temp = array [index];
-      array [index] = array [size];
-      array [size] = temp;
-    }
-}
-
-#endif /* ACE_TEST_CONFIG_H */
diff --git a/tests/CLASSIX/Imakefile b/tests/CLASSIX/Imakefile
deleted file mode 100644
index 4b8d8362d85..00000000000
--- a/tests/CLASSIX/Imakefile
+++ /dev/null
@@ -1,152 +0,0 @@
-INDIR   = $(IPP_CHORUS_ROOT)/lib
-
-CDEBUGFLAGS += -gstabs+
-CXXDEBUGFLAGS += -gstabs+
-
-INCLUDES=       \
-        -I$(ACE_ROOT)   \
-        -I$(IPP_CHORUS_ROOT)
-
-CCOPTIONS += -fno-implicit-templates
-
-CCSRCS  =  \
-	CLASSIX_Con_Acc_Test.C	\
-	CLASSIX_CLD_Connector_Test.C	\
-	CLASSIX_Select_Reactor_Test.C	\
-	CLASSIX_Reactor_Test.C	\
-	CLASSIX_Stream_Test.C	\
-	CLASSIX_OS_Test.C	\
-	CLASSIX_Addr_Test.C	\
-	CLASSIX_Group_Test.C
-
-OBJS    =  \
-	CLASSIX_Con_Acc_Test.o	\
-	CLASSIX_CLD_Connector_Test.o	\
-	CLASSIX_Select_Reactor_Test.o	\
-	CLASSIX_Reactor_Test.o	\
-	CLASSIX_Stream_Test.o	\
-	CLASSIX_OS_Test.o	\
-	CLASSIX_Addr_Test.o	\
-	CLASSIX_Group_Test.o
-
-
-BININDIR= $(CLASSIXDIR)/users/wei
-
-CLASSIXLIB = \
-                $(CLASSIXDIR)/lib/CC/libC.a     \
-                ClassiXUserLibs
-
-LOCALLIB	= \
-	$(IPP_CHORUS_ROOT)/libCLASSIX.a
-
-ClassiXObjectRule()
-
-################################################################
-ClassiXCplusplusUserProgramTarget(CLASSIX_Con_Acc_Test,\
-                                CLASSIX_Con_Acc_Test.o,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a \
-                                $(CLASSIXLIB))
-
-AllTarget(CLASSIX_Con_Acc_Test)
-InstallProgram(CLASSIX_Con_Acc_Test,$(BININDIR))
-
-################################################################
-ClassiXCplusplusUserProgramTarget(CLASSIX_CLD_Connector_Test,\
-                                CLASSIX_CLD_Connector_Test.o,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a \
-                                $(CLASSIXLIB))
-
-AllTarget(CLASSIX_CLD_Connector_Test)
-InstallProgram(CLASSIX_CLD_Connector_Test,$(BININDIR))
-
-################################################################
-ClassiXCplusplusUserProgramTarget(CLASSIX_Notify_Test,\
-                                CLASSIX_Notify_Test.o,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a \
-                                $(CLASSIXLIB))
-
-AllTarget(CLASSIX_Notify_Test)
-InstallProgram(CLASSIX_Notify_Test,$(BININDIR))
-
-################################################################
-ClassiXCplusplusUserProgramTarget(CLASSIX_Reactor_Test,\
-                                CLASSIX_Reactor_Test.o,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a \
-                                $(CLASSIXLIB))
-
-AllTarget(CLASSIX_Reactor_Test)
-InstallProgram(CLASSIX_Reactor_Test,$(BININDIR))
-
-################################################################
-ClassiXCplusplusUserProgramTarget(CLASSIX_Select_Reactor_Test,\
-                                CLASSIX_Select_Reactor_Test.o,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a \
-                                $(CLASSIXLIB))
-
-AllTarget(CLASSIX_Select_Reactor_Test)
-InstallProgram(CLASSIX_Select_Reactor_Test,$(BININDIR))
-
-################################################################
-ClassiXCplusplusUserProgramTarget(CLASSIX_Addr_Test,\
-                                CLASSIX_Addr_Test.o,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a \
-                                $(CLASSIXLIB))
-
-AllTarget(CLASSIX_Addr_Test)
-InstallProgram(CLASSIX_Addr_Test,$(BININDIR))
-
-################################################################
-ClassiXCplusplusUserProgramTarget(CLASSIX_Group_Test,\
-                                CLASSIX_Group_Test.o,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a \
-                                $(CLASSIXLIB))
-
-AllTarget(CLASSIX_Group_Test)
-InstallProgram(CLASSIX_Group_Test,$(BININDIR))
-
-################################################################
-ClassiXCplusplusUserProgramTarget(CLASSIX_OS_Test,\
-                                CLASSIX_OS_Test.o,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a \
-                                $(CLASSIXLIB))
-
-AllTarget(CLASSIX_OS_Test)
-InstallProgram(CLASSIX_OS_Test,$(BININDIR))
-
-################################################################
-ClassiXCplusplusUserProgramTarget(CLASSIX_Stream_Test,\
-                                CLASSIX_Stream_Test.o,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a,\
-				$(LOCALLIB) \
-                                $(ACE_ROOT)/ace/libACE.a \
-                                $(CLASSIXLIB))
-
-AllTarget(CLASSIX_Stream_Test)
-InstallProgram(CLASSIX_Stream_Test,$(BININDIR))
-
-
diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp
index 43664e33d7a..98787b1c8ce 100644
--- a/tests/Cache_Map_Manager_Test.cpp
+++ b/tests/Cache_Map_Manager_Test.cpp
@@ -522,7 +522,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                     ACE_TEXT ("[-d (debug, i.e., addition printouts)] ")
                     ACE_TEXT ("[-p (purge percent)] ")
                     ACE_TEXT ("[-f (number of lookups)] \n"),
-                    argv[0]));
+                    ACE_TEXT ("Cache_Map_Manager_Test")));
         return -1;
       }
     }
@@ -544,7 +544,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::VERBOSE_LITE);
 
   // Providing random a unique seed.
-  ACE_OS::srand (ACE_static_cast (u_int, ACE_OS::time (0)));
+  ACE_OS::srand (static_cast<u_int> (ACE_OS::time (0)));
 
   // Create the lookup array.
   ACE_NEW_RETURN (lookup_array,
diff --git a/tests/Cache_Map_Manager_Test.h b/tests/Cache_Map_Manager_Test.h
index a6bead7858d..6ca91ddf4de 100644
--- a/tests/Cache_Map_Manager_Test.h
+++ b/tests/Cache_Map_Manager_Test.h
@@ -31,7 +31,7 @@ public:
   u_long operator () (size_t t) const
     {
       // Simply returns t
-      return ACE_static_cast (u_long, t);
+      return static_cast<u_long> (t);
     }
 };
 
diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp
index c1b1f1197e2..9de44c037c0 100644
--- a/tests/Cached_Accept_Conn_Test.cpp
+++ b/tests/Cached_Accept_Conn_Test.cpp
@@ -604,7 +604,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                     ACE_TEXT ("[-d (addition debugging output)] ")
                     ACE_TEXT ("[-p (purge percent)] ")
                     ACE_TEXT ("[-a (keep handles available)] "),
-                    argv[0]));
+                    ACE_TEXT ("Cached_Accept_Conn_Test")));
         return -1;
       }
 
diff --git a/tests/Cached_Allocator_Test.cpp b/tests/Cached_Allocator_Test.cpp
index 0e5bcf5f28f..78cab3e70e4 100644
--- a/tests/Cached_Allocator_Test.cpp
+++ b/tests/Cached_Allocator_Test.cpp
@@ -149,6 +149,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   size_t chunk_size = 0;
   size_t n_chunks   = 0;
   size_t requested_size = 0;
+  size_t depth = 0;
   char *ptr1 = 0;
   char *ptr2 = 0;
   char *ptr3 = 0;
@@ -174,6 +175,12 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   DYNAMIC_ALLOCATOR allocator (n_chunks, chunk_size);
 
+  if ((depth = allocator.pool_depth ()) != n_chunks)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("Expected pool depth ") ACE_SIZE_T_FORMAT_SPECIFIER
+                ACE_TEXT (" but reported ") ACE_SIZE_T_FORMAT_SPECIFIER
+                ACE_TEXT ("\n"),
+                n_chunks, depth));
   requested_size = chunk_size;
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT (" (%t) Allocating chunk 1: %d bytes, should succeed...\n"),
@@ -184,6 +191,12 @@ run_main (int argc, ACE_TCHAR *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%t) Failed, exiting.\n")), -1);
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) OK, succeeded.\n")));
+  if ((depth = allocator.pool_depth ()) != (n_chunks - 1))
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("Expected pool depth ") ACE_SIZE_T_FORMAT_SPECIFIER
+                ACE_TEXT (" but reported ") ACE_SIZE_T_FORMAT_SPECIFIER
+                ACE_TEXT ("\n"),
+                n_chunks - 1, depth));
 
   requested_size = chunk_size + 1;
   ACE_DEBUG ((LM_INFO,
@@ -208,6 +221,12 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) OK, succeeded.\n")));
 
   // One chunk too far...
+  if ((depth = allocator.pool_depth ()) != 0)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("Expected pool depth 0")
+                ACE_TEXT (" but reported ") ACE_SIZE_T_FORMAT_SPECIFIER
+                ACE_TEXT ("\n"),
+                depth));
   requested_size = chunk_size;
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT (" (%t) Allocating chunk 4: %d bytes, no free chunks,")
diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp
index efeada8dcb2..9e4352eceb8 100644
--- a/tests/Cached_Conn_Test.cpp
+++ b/tests/Cached_Conn_Test.cpp
@@ -320,6 +320,8 @@ static CACHED_CONNECT_STRATEGY *connect_strategy = 0;
 // more iterations to get to the handle limit.
 #if defined (ACE_WIN32)
 static int iterations = 2000;
+#elif defined (__Lynx__)
+static int iterations = 134;
 #else
 static int iterations = 200;
 #endif /* ACE_WIN32 */
@@ -565,7 +567,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                     ACE_TEXT ("[-d (addition debugging output)] ")
                     ACE_TEXT ("[-p (purge percent)] ")
                     ACE_TEXT ("[-a (keep handles available)] "),
-                    argv[0]));
+                    ACE_TEXT ("Cached_Conn_Test")));
         return -1;
       }
 
diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp
index 81d8e606fb7..4cf08965fcb 100644
--- a/tests/Config_Test.cpp
+++ b/tests/Config_Test.cpp
@@ -578,7 +578,10 @@ run_tests (void)
   ACE_Configuration_Heap pers_config;
 
   if (pers_config.open (ACE_TEXT ("test.reg")))
-    return 0;
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("Cannot open test.reg\n")),
+                      -1);
+
   {
     int result = test (&pers_config);
     if (result)
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index cab6ad01a5d..6b587e2e314 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -142,13 +142,6 @@ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 template class ACE_NonBlocking_Connect_Handler<Svc_Handler>;
 template class ACE_Auto_Basic_Array_Ptr<pid_t>;
 
-#if defined (__BORLANDC__)
-// Borland C++ doesn't link with these instantiations in the ACE library.
-template class ACE_Double_Linked_List<ACE_Thread_Descriptor>;
-template class ACE_Unbounded_Queue<ACE_Thread_Descriptor_Base>;
-template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
-#endif /* defined (__BORLANDC__) */
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate CACHED_CONNECT_STRATEGY
@@ -194,13 +187,6 @@ template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
 #pragma instantiate ACE_NonBlocking_Connect_Handler<Svc_Handler>
 #pragma instantiate ACE_Auto_Basic_Array_Ptr<pid_t>
 
-#if defined (__BORLANDC__)
-// Borland C++ doesn't link with these instantiations in the ACE library.
-#pragma instantiate ACE_Double_Linked_List<ACE_Thread_Descriptor>
-#pragma instantiate ACE_Unbounded_Queue<ACE_Thread_Descriptor_Base>
-#pragma instantiate ACE_Unbounded_Queue<ACE_Thread_Descriptor*>
-#endif /* defined (__BORLANDC__) */
-
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // Default number of clients/servers.
@@ -510,8 +496,7 @@ client_connections (void *arg)
 static void *
 client (void *arg)
 {
-  ACE_INET_Addr *remote_addr = ACE_reinterpret_cast (ACE_INET_Addr *,
-                                                     arg);
+  ACE_INET_Addr *remote_addr = reinterpret_cast<ACE_INET_Addr *> (arg);
   ACE_INET_Addr server_addr (remote_addr->get_port_number (),
                              ACE_DEFAULT_SERVER_HOST);
   CONNECTOR connector;
@@ -718,7 +703,7 @@ spawn_threads (ACCEPTOR *acceptor,
 {
   int status = 0;
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
   // Assign thread (VxWorks task) names to test that feature.
   ACE_thread_t *server_name;
   ACE_NEW_RETURN (server_name,
@@ -750,18 +735,18 @@ spawn_threads (ACCEPTOR *acceptor,
     }
 
   ACE_TCHAR *client_name = ACE_TEXT ("Conn client");
-#endif /* VXWORKS */
+#endif /* VXWORKS && !ACE_HAS_PTHREADS*/
 
   if (ACE_Thread_Manager::instance ()->spawn_n
       (
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
        server_name,
 #endif /* VXWORKS */
        n_servers,
        (ACE_THR_FUNC) server,
        (void *) acceptor,
        THR_NEW_LWP
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
        , ACE_DEFAULT_THREAD_PRIORITY
        , -1
 #if 0 /* Don't support setting of stack, because it doesn't seem to work. */
@@ -781,7 +766,7 @@ spawn_threads (ACCEPTOR *acceptor,
       ((ACE_THR_FUNC) client,
        (void *) server_addr,
        THR_NEW_LWP
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
        , &client_name
 #endif /* VXWORKS */
        ) == -1)
@@ -806,7 +791,7 @@ spawn_threads (ACCEPTOR *acceptor,
       status = -1;
     }
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
   for (i = 0; i < n_servers; ++i)
     {
       delete [] server_name[i];
diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp
index 4fcfcbb6672..5548feccba1 100644
--- a/tests/DLL_Test.cpp
+++ b/tests/DLL_Test.cpp
@@ -97,8 +97,8 @@ int basic_test (ACE_DLL &dll)
   foo = dll.symbol (ACE_TEXT ("get_hello"));
 
   // Cast the void* to long first.
-  ptrdiff_t tmp = ACE_reinterpret_cast (ptrdiff_t, foo);
-  Hello_Factory factory = ACE_reinterpret_cast (Hello_Factory, tmp);
+  ptrdiff_t tmp = reinterpret_cast<ptrdiff_t> (foo);
+  Hello_Factory factory = reinterpret_cast<Hello_Factory> (tmp);
   if (factory == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
@@ -138,8 +138,8 @@ int dynamic_cast_test (ACE_DLL &dll)
   foo = dll.symbol (ACE_TEXT ("dynamic_cast_test"));
 
   // Cast the void* to long first.
-  ptrdiff_t tmp = ACE_reinterpret_cast (ptrdiff_t, foo);
-  PFN pfnAcquire = ACE_reinterpret_cast (PFN, tmp);
+  ptrdiff_t tmp = reinterpret_cast<ptrdiff_t> (foo);
+  PFN pfnAcquire = reinterpret_cast<PFN> (tmp);
   if (pfnAcquire == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
diff --git a/tests/DLL_Test_Impl.cpp b/tests/DLL_Test_Impl.cpp
index 7fbf681ec17..133d15295ef 100644
--- a/tests/DLL_Test_Impl.cpp
+++ b/tests/DLL_Test_Impl.cpp
@@ -86,7 +86,7 @@ get_hello (void)
 
   ACE_NEW_RETURN (hello,
                   Hello_Impl,
-                  NULL);
+                  0);
 
   return hello;
 }
diff --git a/tests/DLList_Test.cpp b/tests/DLList_Test.cpp
index e00def67b13..3b8ac8f53fc 100644
--- a/tests/DLList_Test.cpp
+++ b/tests/DLList_Test.cpp
@@ -43,12 +43,12 @@ static ACE_STRING string_table[] =
   // Note: all these casts are to appease SC 5.0 which is not pleased
   // with using string literals (i.e. const char *'s) as char
   // *'s. It's ugly, but necessary.
-  ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("hello")),
-  ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("guten Tag")),
-  ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("goodbye")),
-  ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("auf wiedersehen")),
-  ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("funny")),
-  ACE_const_cast (ACE_TCHAR *, ACE_TEXT ("lustig")),
+  const_cast<ACE_TCHAR *> (ACE_TEXT ("hello")),
+  const_cast<ACE_TCHAR *> (ACE_TEXT ("guten Tag")),
+  const_cast<ACE_TCHAR *> (ACE_TEXT ("goodbye")),
+  const_cast<ACE_TCHAR *> (ACE_TEXT ("auf wiedersehen")),
+  const_cast<ACE_TCHAR *> (ACE_TEXT ("funny")),
+  const_cast<ACE_TCHAR *> (ACE_TEXT ("lustig")),
   0
 };
 
diff --git a/tests/Dev_Poll_Reactor_Test.cpp b/tests/Dev_Poll_Reactor_Test.cpp
index 78d8551d45d..7d851ca0842 100644
--- a/tests/Dev_Poll_Reactor_Test.cpp
+++ b/tests/Dev_Poll_Reactor_Test.cpp
@@ -29,6 +29,7 @@ ACE_RCSID (tests,
 
 #if defined (ACE_HAS_DEV_POLL) || defined (ACE_HAS_EVENT_POLL)
 
+#include "ace/OS_NS_signal.h"
 #include "ace/Reactor.h"
 #include "ace/Dev_Poll_Reactor.h"
 
@@ -153,13 +154,10 @@ Client::handle_timeout (const ACE_Time_Value &, const void *)
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("(%P|%t) Expected client timeout occured at: %T\n")));
 
-  int status = this->handle_output (this->get_handle ());
-  if (status != 0)
-    return status;
-
   this->call_count_++;
 
-  if (this->call_count_ > 10)
+  int status = this->handle_output (this->get_handle ());
+  if (status == -1 || this->call_count_ > 10)
     {
       if (this->reactor ()->end_reactor_event_loop () == 0)
         ACE_DEBUG ((LM_INFO,
@@ -419,6 +417,20 @@ public:
     return result;
   }
 
+  virtual int connect_svc_handler (
+    CONNECTOR::handler_type *& handler,
+    CONNECTOR::handler_type *& sh_copy,
+    const CONNECTOR::addr_type &remote_addr,
+    ACE_Time_Value *timeout,
+    const CONNECTOR::addr_type &local_addr,
+    int reuse_addr,
+    int flags,
+    int perms) {
+    sh_copy = handler;
+    return this->connect_svc_handler (handler, remote_addr, timeout,
+                                      local_addr, reuse_addr, flags,
+                                      perms);
+  }
 };
 
 // ----------------------------------------------------
@@ -489,6 +501,13 @@ run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Dev_Poll_Reactor_Test"));
 
+  // Make sure we ignore SIGPIPE
+  sigset_t sigsetNew[1];
+  sigset_t sigsetOld[1];
+  ACE_OS::sigemptyset (sigsetNew);
+  ACE_OS::sigaddset (sigsetNew, SIGPIPE);
+  ACE_OS::sigprocmask (SIG_BLOCK, sigsetNew, sigsetOld);
+
   ACE_Dev_Poll_Reactor dp_reactor;
   ACE_Reactor reactor (&dp_reactor);
 
diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp
index ba2f45cbe29..5eb92d07339 100644
--- a/tests/Dirent_Test.cpp
+++ b/tests/Dirent_Test.cpp
@@ -39,6 +39,8 @@ ACE_RCSID (tests,
 
 #if defined (VXWORKS) || defined(CHORUS)
 #define TEST_DIR "log"
+#define DIR_DOT "."
+#define DIR_DOT_DOT ".."
 #define TEST_ENTRY ".."
 #else
 #  define TEST_DIR "../tests"
@@ -152,11 +154,34 @@ dirent_count (const ACE_TCHAR *dir_path,
               int &file_count,
               int recursion_level)
 {
+#if !defined (ACE_LACKS_CHDIR)
+
+# if defined (ACE_VXWORKS)
+  // VxWorks only allows full paths (incl. device spec if applicable) to be specified
+  ACE_TCHAR full_path[MAXPATHLEN];
+  if (ACE_OS::getcwd (full_path, sizeof(full_path)) == NULL)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("getcwd: failed\n")),
+                      -1);
+  if ((ACE_OS::strlen (full_path) + 1 + ACE_OS::strlen (dir_path)) >= sizeof(full_path))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("getcwd: too long\n")),
+                      -1);
+  ACE_OS::strcat (ACE_OS::strcat (full_path, "/"), dir_path);
+  if (ACE_OS::chdir (full_path) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("chdir: %p\n"),
+                       full_path),
+                      -1);
+# else
   if (ACE_OS::chdir (dir_path) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("chdir: %p\n"),
                        dir_path),
                       -1);
+# endif
+#endif /* !ACE_LACKS_CHDIR */
+
   ACE_Dirent dir (ACE_TEXT ("."));
 
   // Since the dir struct d_name type changes depending on the setting
@@ -232,12 +257,23 @@ dirent_count (const ACE_TCHAR *dir_path,
                   local_dir_count));
               dir_count++;
 
+#if !defined (ACE_LACKS_CHDIR)
+# if defined (ACE_VXWORKS)
+              // Move back to parent directory.
+              if (ACE_OS::chdir (full_path) == -1)
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   ACE_TEXT ("chdir: %p\n"),
+                                   full_path),
+                                  -1);
+# else
               // Move back up a level.
               if (ACE_OS::chdir (ACE_TEXT ("..")) == -1)
                 ACE_ERROR_RETURN ((LM_ERROR,
                                    ACE_TEXT ("chdir: %p\n"),
                                    dir_path),
                                   -1);
+# endif
+#endif /* !ACE_LACKS_CHDIR */
             }
           break;
         }
diff --git a/tests/Dynamic_Priority_Test.cpp b/tests/Dynamic_Priority_Test.cpp
index 665670bb309..e1ec028c631 100644
--- a/tests/Dynamic_Priority_Test.cpp
+++ b/tests/Dynamic_Priority_Test.cpp
@@ -53,6 +53,10 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Sched_Params.h"
 
+#if defined (VXWORKS)
+# include "ace/OS_NS_string.h"
+#endif /* VXWORKS */
+
 ACE_RCSID(tests, Dynamic_Priority_Test, "$Id$")
 
 #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS)
@@ -136,11 +140,11 @@ order_consumer (void *args)
   ACE_ASSERT (args != 0);
 
   ACE_Message_Queue<ACE_SYNCH> *msg_queue =
-    ACE_static_cast (ArgStruct *, args)->queue_;
+    static_cast<ArgStruct *> (args)->queue_;
   const char *receipt_order =
-    ACE_static_cast (ArgStruct *, args)->order_string_;
+    static_cast<ArgStruct *> (args)->order_string_;
   u_int expected_count =
-    ACE_static_cast (ArgStruct *, args)->expected_count_;
+    static_cast<ArgStruct *> (args)->expected_count_;
 
   ACE_ASSERT (receipt_order != 0);
   ACE_ASSERT (msg_queue != 0);
@@ -182,13 +186,13 @@ order_producer (void *args)
   ACE_ASSERT (args != 0);
 
   ACE_Message_Queue<ACE_SYNCH> *msg_queue =
-    ACE_static_cast (ArgStruct *, args)->queue_;
+    static_cast<ArgStruct *> (args)->queue_;
   const char *send_order =
-    ACE_static_cast (ArgStruct *, args)->order_string_;
+    static_cast<ArgStruct *> (args)->order_string_;
   ACE_Message_Block **block_array =
-    ACE_static_cast (ArgStruct *, args)->array_;
+    static_cast<ArgStruct *> (args)->array_;
   int expected_count =
-    ACE_static_cast (ArgStruct *, args)->expected_count_;
+    static_cast<ArgStruct *> (args)->expected_count_;
 
   ACE_ASSERT (send_order != 0);
   ACE_ASSERT (block_array != 0);
@@ -339,9 +343,9 @@ performance_consumer (void * args)
   ACE_ASSERT (args != 0);
 
   ACE_Message_Queue<ACE_SYNCH> *msg_queue =
-    ACE_static_cast (ArgStruct *, args)->queue_;
+    static_cast<ArgStruct *> (args)->queue_;
   u_int expected_count =
-    ACE_static_cast (ArgStruct *, args)->expected_count_;
+    static_cast<ArgStruct *> (args)->expected_count_;
 
   ACE_ASSERT (msg_queue != 0);
 
@@ -385,11 +389,11 @@ performance_producer (void *args)
   ACE_ASSERT (args != 0);
 
   ACE_Message_Queue<ACE_SYNCH> *msg_queue =
-    ACE_static_cast (ArgStruct *, args)->queue_;
+    static_cast<ArgStruct *> (args)->queue_;
   ACE_Message_Block **block_array =
-    ACE_static_cast (ArgStruct *, args)->array_;
+    static_cast<ArgStruct *> (args)->array_;
   int expected_count =
-    ACE_static_cast (ArgStruct *, args)->expected_count_;
+    static_cast<ArgStruct *> (args)->expected_count_;
 
   ACE_ASSERT (send_order != 0);
   ACE_ASSERT (block_array != 0);
diff --git a/tests/FIFO_Test.cpp b/tests/FIFO_Test.cpp
index 378a1d188db..5fa60ffaf6c 100644
--- a/tests/FIFO_Test.cpp
+++ b/tests/FIFO_Test.cpp
@@ -34,7 +34,7 @@
 
 ACE_RCSID(tests, SOCK_Test, "$Id$")
 
-#if !defined (ACE_WIN32)
+#if !defined (ACE_LACKS_MKFIFO)
 
 static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
 
@@ -44,7 +44,7 @@ static const size_t big_size = (BUFSIZ * 4);
 static void *
 client (void *arg)
 {
-  ACE_TCHAR *fifo_path = ACE_reinterpret_cast (ACE_TCHAR *, arg);
+  ACE_TCHAR *fifo_path = reinterpret_cast <ACE_TCHAR *> (arg);
   ACE_FIFO_Send_Msg fifo;
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client opening %s\n"), fifo_path));
   if (fifo.open (fifo_path) == -1)
@@ -53,7 +53,7 @@ client (void *arg)
   // Try some transfers - the server part is expecting this data.
   // First, try a nice, easy send.
   ssize_t send_count;
-  ssize_t expect = ACE_static_cast (ssize_t, ACE_OS::strlen (ACE_ALPHABET));
+  ssize_t expect = static_cast <ssize_t> (ACE_OS::strlen (ACE_ALPHABET));
   send_count = fifo.send (ACE_ALPHABET, ACE_OS::strlen (ACE_ALPHABET));
   if (send_count == expect)
     {
@@ -63,11 +63,11 @@ client (void *arg)
       char big[big_size];
       for (size_t i = 0; i < big_size; ++i)
         big[i] = (i % 2) ? 0x05 : 0x0A;  // Make nice pattern in blown stack
-      expect = ACE_static_cast (ssize_t, big_size);
+      expect = static_cast <ssize_t> (big_size);
       send_count = fifo.send (big, big_size);
       if (send_count == expect)
         {
-          expect = ACE_static_cast (ssize_t, ACE_OS::strlen (ACE_ALPHABET));
+          expect = static_cast <ssize_t> (ACE_OS::strlen (ACE_ALPHABET));
           send_count = fifo.send (ACE_ALPHABET, ACE_OS::strlen (ACE_ALPHABET));
           if (send_count != expect)
             ACE_ERROR ((LM_ERROR,
@@ -101,7 +101,7 @@ client (void *arg)
 static void *
 server (void *arg)
 {
-  ACE_FIFO_Recv_Msg *fifo = ACE_reinterpret_cast (ACE_FIFO_Recv_Msg *, arg);
+  ACE_FIFO_Recv_Msg *fifo = reinterpret_cast <ACE_FIFO_Recv_Msg *> (arg);
 
   // Wait for the client to get going and open the FIFO.
   errno = 0;
@@ -124,7 +124,7 @@ server (void *arg)
 
   char buf[BUFSIZ];
   ssize_t recv_count;
-  ssize_t expect = ACE_static_cast (ssize_t, ACE_OS::strlen (ACE_ALPHABET));
+  ssize_t expect = static_cast <ssize_t> (ACE_OS::strlen (ACE_ALPHABET));
   recv_count = fifo->recv (buf, sizeof (buf));
   if (recv_count != expect)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -155,9 +155,9 @@ server (void *arg)
 
       // recv_count is sizeof(buf) on ACE_HAS_STREAM_PIPES; big_size on others.
 #if defined (ACE_HAS_STREAM_PIPES)
-      expect = ACE_static_cast (ssize_t, sizeof (buf));
+      expect = static_cast <ssize_t> (sizeof (buf));
 #else
-      expect = ACE_static_cast (ssize_t, big_size);
+      expect = static_cast <ssize_t> (big_size);
 #endif /* ACE_HAS_STREAM_PIPES */
       recv_count = fifo->recv (buf, sizeof (buf));
       if (recv_count != expect)
@@ -170,7 +170,7 @@ server (void *arg)
     }
 #endif /* ACE_HAS_STREAM_PIPES */
 
-  expect = ACE_static_cast (ssize_t, ACE_OS::strlen (ACE_ALPHABET));
+  expect = static_cast <ssize_t> (ACE_OS::strlen (ACE_ALPHABET));
   recv_count = fifo->recv (buf, sizeof (buf));
   if (recv_count != expect)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -296,6 +296,7 @@ run_main (int, ACE_TCHAR *[])
 }
 
 #else
+
 int
 run_main (int, ACE_TCHAR *[])
 {
@@ -307,4 +308,4 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
-#endif /* !ACE_WIN32 */
+#endif /* !ACE_LACKS_MKFIFO */
diff --git a/tests/FlReactor_Test.cpp b/tests/FlReactor_Test.cpp
index ee0218ceeb0..65ae1ed4bdc 100644
--- a/tests/FlReactor_Test.cpp
+++ b/tests/FlReactor_Test.cpp
@@ -26,21 +26,6 @@
 
 ACE_RCSID(tests, FlReactor_Test, "$Id$")
 
-#if !defined (ACE_HAS_FL)
-
-int
-run_main (int, ACE_TCHAR*[])
-{
-  ACE_START_TEST (ACE_TEXT ("FlReactor_Test"));
-
-  ACE_ERROR ((LM_INFO,
-              "FL not supported on this platform\n"));
-  ACE_END_TEST;
-
-  return 0;
-}
-
-#else
 
 #include "ace/FlReactor.h"
 #include "ace/Event_Handler.h"
@@ -138,10 +123,10 @@ Test_Window::draw (void)
 void sides_cb (Fl_Widget *o, void *p)
 {
   Test_Window *tw =
-    ACE_reinterpret_cast (Test_Window *,p);
+    reinterpret_cast<Test_Window *> (p);
   Fl_Slider *slider =
-    ACE_dynamic_cast (Fl_Slider*,o);
-  tw->sides (ACE_static_cast (int, slider->value ()));
+    dynamic_cast<Fl_Slider*> (o);
+  tw->sides (static_cast<int> (slider->value ()));
 }
 
 class Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
@@ -225,7 +210,10 @@ int
 Acceptor::make_svc_handler (Connection_Handler *&sh)
 {
   if (sh == 0)
-    ACE_NEW_RETURN (sh, Connection_Handler (this->w_, this->box_), -1);
+    {
+      ACE_NEW_RETURN (sh, Connection_Handler (this->w_, this->box_), -1);
+      sh->reactor (this->reactor());
+    }
   return 0;
 }
 
@@ -296,5 +284,3 @@ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_FL */
diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp
index 06e5c9a1ad7..2e9770429d3 100644
--- a/tests/Handle_Set_Test.cpp
+++ b/tests/Handle_Set_Test.cpp
@@ -40,7 +40,7 @@ test_duplicates (size_t count)
   for (size_t i = 0; i < count; i++)
     {
       size_t handle =
-        ACE_static_cast (size_t, ACE_OS::rand () % ACE_Handle_Set::MAXSIZE);
+        static_cast<size_t> (ACE_OS::rand () % ACE_Handle_Set::MAXSIZE);
 
       if (ACE_ODD (handle))
         {
diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp
index d05f5bcdf98..c3bcc9b1157 100644
--- a/tests/Hash_Map_Bucket_Iterator_Test.cpp
+++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp
@@ -52,7 +52,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                     ACE_TEXT ("usage: %s ")
                     ACE_TEXT ("[-i (iterations)] ")
                     ACE_TEXT ("[-t (table size)] "),
-                    argv[0]));
+                    ACE_TEXT ("Hash_Map_Bucket_Iterator_Test")));
         return -1;
       }
 
diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp
index 4a57d519156..7f02a590fcf 100644
--- a/tests/IOStream_Test.cpp
+++ b/tests/IOStream_Test.cpp
@@ -293,7 +293,7 @@ server (void *arg = 0)
 
   ACE_INET_Addr server_addr;
   ACE_SOCK_Acceptor *acceptor =
-    ACE_reinterpret_cast (ACE_SOCK_Acceptor *, arg);
+    reinterpret_cast<ACE_SOCK_Acceptor *> (arg);
 
   if (acceptor->get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/tests/Log_Msg_Test.cpp b/tests/Log_Msg_Test.cpp
index daff113d3b4..f1d79b27607 100644
--- a/tests/Log_Msg_Test.cpp
+++ b/tests/Log_Msg_Test.cpp
@@ -230,6 +230,11 @@ test_log_msg_features (const ACE_TCHAR *program)
                 badname,
                 cleanup));
 
+// Don't try this on VxWorks, it will result in an overflow and end the test.
+// Platforms that don't define ACE_HAS_SNPRINTF are candidates to fail here.
+// This then proves that logging to big messages is problematic but on VxWorks
+// we know this and we want to rest of the test to continue
+#if !defined (VXWORKS)
   // Try a log operation that would overflow the logging buffer if not
   // properly guarded.
   ACE_TCHAR big[ACE_Log_Record::MAXLOGMSGLEN + 1];
@@ -239,6 +244,7 @@ test_log_msg_features (const ACE_TCHAR *program)
   while (i < ACE_Log_Record::MAXLOGMSGLEN)
     big[i++] = alphabet[i % j];
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("This is too big: %s\n"), big));
+#endif /* !VXWORKS */
 
   // Exercise many different combinations of OSTREAM.
 
@@ -353,6 +359,7 @@ test_ostream (void)
   if (myostream.bad ())
     return -1;
 
+  OFSTREAM *old_stream = ace_file_stream::instance ()->output_file ();
   // Set the ostream.
   ACE_LOG_MSG->msg_ostream (&myostream);
 
@@ -360,7 +367,7 @@ test_ostream (void)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("fourth message\n")));
   // Set the ostream back to the test's log file.
-  ACE_LOG_MSG->msg_ostream (ace_file_stream::instance ()->output_file ());
+  ACE_LOG_MSG->msg_ostream (old_stream);
   // Now close the ostream file and check its contents.
   myostream.close ();
 
diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp
index fc744ae7462..051bf72c8c8 100644
--- a/tests/Logging_Strategy_Test.cpp
+++ b/tests/Logging_Strategy_Test.cpp
@@ -39,6 +39,7 @@
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 #include "ace/Thread_Manager.h"
 
 #if defined (ACE_AS_STATIC_LIBS) || \
@@ -426,7 +427,7 @@ int run_main (int argc, ACE_TCHAR *argv [])
     }
   else
     {
-      l_argv[0] = argv[0];
+      l_argv[0] = (ACE_TCHAR *)ACE_TEXT ("Logging_Strategy_Test");
       l_argv[1] =
         (ACE_TCHAR *) ACE_TEXT ("-slog/Logging_Strategy_Test")
                       ACE_LOG_FILE_EXT_NAME;
diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp
index 7032700efc1..92574933fb2 100644
--- a/tests/MEM_Stream_Test.cpp
+++ b/tests/MEM_Stream_Test.cpp
@@ -223,7 +223,7 @@ run_client (u_short port,
 static ACE_THR_FUNC_RETURN
 connect_client (void *arg)
 {
-  u_short *sport =  ACE_reinterpret_cast (u_short *, arg);
+  u_short *sport =  reinterpret_cast <u_short *> (arg);
   run_client (*sport, client_strategy);
   return 0;
 }
@@ -436,9 +436,9 @@ run_main (int argc, ACE_TCHAR *argv[])
       reset_handler (NUMBER_OF_REACTIVE_CONNECTIONS);
 
 #if defined (ACE_HAS_WINCE)
-      test_reactive (ACE_LIB_TEXT("\\Windows\\Start Menu\\MEM_Stream_Test_WinCE.exe"), server_addr);
+      test_reactive (ACE_TEXT("\\Windows\\Start Menu\\MEM_Stream_Test_WinCE.exe"), server_addr);
 #else
-      test_reactive (argv[0], server_addr);
+      test_reactive (ACE_TEXT ("MEM_Stream_Test"), server_addr);
 #endif  // ACE_HAS_WINCE
 
       ACE_Reactor::instance ()->reset_reactor_event_loop ();
@@ -450,9 +450,9 @@ run_main (int argc, ACE_TCHAR *argv[])
       reset_handler (NUMBER_OF_MT_CONNECTIONS);
 
 #if defined (ACE_HAS_WINCE)
-      test_concurrent (ACE_LIB_TEXT("\\Windows\\Start Menu\\MEM_Stream_Test_WinCE.exe"), server_addr);
+      test_concurrent (ACE_TEXT("\\Windows\\Start Menu\\MEM_Stream_Test_WinCE.exe"), server_addr);
 #else
-      test_concurrent (argv[0], server_addr);
+      test_concurrent (ACE_TEXT ("MEM_Stream_Test"), server_addr);
 #endif  // ACE_HAS_WINCE
 
       ACE_END_TEST;
@@ -479,7 +479,7 @@ run_main (int argc, ACE_TCHAR *argv[])
             {
             case 'p':
               iport = ACE_OS::atoi (opts.opt_arg ());
-              port = ACE_static_cast (u_short, iport);
+              port = static_cast <u_short> (iport);
               break;
 
             case 'r':
diff --git a/tests/MT_Reactor_Timer_Test.cpp b/tests/MT_Reactor_Timer_Test.cpp
index 1b83864122e..5a714be719b 100644
--- a/tests/MT_Reactor_Timer_Test.cpp
+++ b/tests/MT_Reactor_Timer_Test.cpp
@@ -124,8 +124,7 @@ int
 Time_Handler::handle_timeout (const ACE_Time_Value &tv,
                               const void *arg)
 {
-  long time_tag = ACE_static_cast (long,
-                    ACE_reinterpret_cast (size_t, arg));
+  long time_tag = static_cast <long> (reinterpret_cast <size_t> (arg));
   ACE_UNUSED_ARG(tv);
 
   ACE_GUARD_RETURN (ACE_Thread_Mutex, id_lock, this->lock_, 0);
@@ -236,8 +235,7 @@ Dispatch_Count_Handler::handle_timeout (const ACE_Time_Value &tv,
 
   ++this->timers_fired_;
 
-  long value = ACE_static_cast (long,
-                 ACE_reinterpret_cast (size_t, arg));
+  long value = static_cast <long> (reinterpret_cast <size_t> (arg));
 
   // This case just tests to make sure the Reactor is counting timer
   // expiration correctly.
@@ -250,12 +248,34 @@ Dispatch_Count_Handler::handle_timeout (const ACE_Time_Value &tv,
 int
 Dispatch_Count_Handler::verify_results (void)
 {
+  int result = 0;
 
-  ACE_ASSERT (this->input_seen_ == 1);
-  ACE_ASSERT (this->notify_seen_ == 1);
-  ACE_ASSERT (this->timers_fired_ == ACE_MAX_TIMERS);
-  return 0;
+  if (this->input_seen_ != 1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                 ACE_TEXT ("input_seen_ is not 1 but %d\n"),
+                 input_seen_));
+    result = -1;
+  }
+
+  if (this->notify_seen_ != 1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                 ACE_TEXT ("notify_seen_ is not 1 but %d\n"),
+                 notify_seen_));
+    result = -1;
+  }
+
+  if (this->timers_fired_ != ACE_MAX_TIMERS)
+    {
+      ACE_ERROR ((LM_ERROR,
+                 ACE_TEXT ("timers fired not equal max timers: %d != %d\n"),
+                 this->timers_fired_,
+                 ACE_MAX_TIMERS));
+    result = -1;
+  }
 
+  return result;
 }
 
 int
@@ -273,8 +293,7 @@ run_main (int, ACE_TCHAR *[])
   for (int i = ACE_MAX_TIMERS; i > 0; i--)
     // Schedule a timeout to expire immediately.
     if (r->schedule_timer (&callback,
-                           ACE_reinterpret_cast (const void *,
-                                                 ACE_static_cast (size_t, i)),
+                           reinterpret_cast <const void *> (static_cast <size_t> (i)),
                            ACE_Time_Value (0)) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
@@ -307,7 +326,6 @@ run_main (int, ACE_TCHAR *[])
                   ACE_TEXT ("expected %d events, got %d instead\n"),
                   ACE_MAX_TIMERS + 2,
                   events));
-      ACE_ASSERT (events >= ACE_MAX_TIMERS + 2);
     }
 
   status = callback.verify_results ();
diff --git a/tests/MT_Reactor_Upcall_Test.cpp b/tests/MT_Reactor_Upcall_Test.cpp
index 572aa533070..49c203b5f2c 100644
--- a/tests/MT_Reactor_Upcall_Test.cpp
+++ b/tests/MT_Reactor_Upcall_Test.cpp
@@ -24,6 +24,7 @@
 #include "ace/Reactor.h"
 #include "ace/TP_Reactor.h"
 #include "ace/WFMO_Reactor.h"
+#include "ace/Dev_Poll_Reactor.h"
 #include "ace/Pipe.h"
 #include "ace/Task.h"
 #include "ace/Get_Opt.h"
@@ -114,7 +115,7 @@ Handler::handle_input (ACE_HANDLE fd)
     ACE::recv_n (fd,
                  &message.type_,
                  sizeof (message.type_));
-  if (result != ACE_static_cast (ssize_t, sizeof (message.type_)))
+  if (result != static_cast<ssize_t> (sizeof (message.type_)))
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t): read %d, %p\n"),
                 result,
                 ACE_TEXT ("recv 1")));
@@ -122,7 +123,7 @@ Handler::handle_input (ACE_HANDLE fd)
     ACE::recv_n (fd,
                  &message.size_,
                  sizeof (message.size_));
-  if (result != ACE_static_cast (ssize_t, sizeof (message.size_)))
+  if (result != static_cast<ssize_t> (sizeof (message.size_)))
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t): read %d, %p\n"),
                 result,
                 ACE_TEXT ("recv 2")));
@@ -145,7 +146,7 @@ Handler::handle_input (ACE_HANDLE fd)
     ACE::recv_n (fd,
                  &message.data_,
                  message.size_);
-  if (result != ACE_static_cast (ssize_t, message.size_))
+  if (result != static_cast<ssize_t> (message.size_))
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t): read %d, %p\n"),
                 result,
                 ACE_TEXT ("recv 3")));
@@ -330,6 +331,17 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   test_reactor_upcall (tp_reactor);
 
+#if defined (ACE_HAS_EVENT_POLL)
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing Dev Poll Reactor\n")));
+
+  ACE_Dev_Poll_Reactor dev_poll_reactor_impl;
+  ACE_Reactor dev_poll_reactor (&dev_poll_reactor_impl);
+
+  test_reactor_upcall (dev_poll_reactor);
+
+#endif /* ACE_HAS_EVENT_POLL */
+
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing WFMO Reactor\n")));
diff --git a/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/tests/MT_Reference_Counted_Event_Handler_Test.cpp
index c77d2616fea..e2f5fa5a23b 100644
--- a/tests/MT_Reference_Counted_Event_Handler_Test.cpp
+++ b/tests/MT_Reference_Counted_Event_Handler_Test.cpp
@@ -12,8 +12,8 @@
 //
 //    This test tries to represents what happens in the ORB wrt to
 //    event handlers, reactors, timer queues, threads, and connection
-//    caches, minus the other complexities.  The following three
-//    Reactors are tested: Select, TP, and WFMO.
+//    caches, minus the other complexities.  The following reactors
+//    are tested: Select, TP, WFMO, and Dev Poll (if enabled).
 //
 //    The test checks proper use and shutting down of client-side
 //    event handlers when it is used by invocation threads and/or
@@ -32,6 +32,7 @@
 #include "ace/Select_Reactor.h"
 #include "ace/TP_Reactor.h"
 #include "ace/WFMO_Reactor.h"
+#include "ace/Dev_Poll_Reactor.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/SOCK_Acceptor.h"
@@ -51,6 +52,7 @@ static const int message_size = 26;
 static int test_select_reactor = 1;
 static int test_tp_reactor = 1;
 static int test_wfmo_reactor = 1;
+static int test_dev_poll_reactor = 1;
 static int debug = 0;
 static int number_of_connections = 5;
 static int max_nested_upcall_level = 10;
@@ -1217,7 +1219,7 @@ test<REACTOR_IMPL>::test (int ignore_nested_upcalls,
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:f:g:k:l:m:n:o:uz:"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:f:g:k:l:m:n:o:uz:"));
 
   int cc;
   while ((cc = get_opt ()) != -1)
@@ -1233,6 +1235,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
         case 'c':
           test_wfmo_reactor = ACE_OS::atoi (get_opt.opt_arg ());
           break;
+        case 'd':
+          test_dev_poll_reactor = ACE_OS::atoi (get_opt.opt_arg ());
+          break;
         case 'f':
           number_of_connections = ACE_OS::atoi (get_opt.opt_arg ());
           break;
@@ -1264,6 +1269,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                       ACE_TEXT ("\t[-a test Select Reactor] (defaults to %d)\n")
                       ACE_TEXT ("\t[-b test TP Reactor] (defaults to %d)\n")
                       ACE_TEXT ("\t[-c test WFMO Reactor] (defaults to %d)\n")
+                      ACE_TEXT ("\t[-d test Dev Poll Reactor] (defaults to %d)\n")
                       ACE_TEXT ("\t[-f number of connections] (defaults to %d)\n")
                       ACE_TEXT ("\t[-g close timeout] (defaults to %d)\n")
                       ACE_TEXT ("\t[-k make invocations] (defaults to %d)\n")
@@ -1277,6 +1283,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                       test_select_reactor,
                       test_tp_reactor,
                       test_wfmo_reactor,
+                      test_dev_poll_reactor,
                       number_of_connections,
                       close_timeout,
                       make_invocations,
@@ -1341,6 +1348,20 @@ run_main (int argc, ACE_TCHAR *argv[])
       ACE_UNUSED_ARG (test);
     }
 
+#if defined (ACE_HAS_EVENT_POLL)
+
+  if (test_dev_poll_reactor)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "\n\nTesting Dev Poll Reactor....\n\n"));
+
+      test<ACE_Dev_Poll_Reactor> test (perform_nested_upcalls,
+                                       event_loop_thread_not_required);
+      ACE_UNUSED_ARG (test);
+    }
+
+#endif
+
 #if defined (ACE_WIN32)
 
   if (test_wfmo_reactor)
diff --git a/tests/MT_Reference_Counted_Notify_Test.cpp b/tests/MT_Reference_Counted_Notify_Test.cpp
index b861c814202..ef0a0a52b31 100644
--- a/tests/MT_Reference_Counted_Notify_Test.cpp
+++ b/tests/MT_Reference_Counted_Notify_Test.cpp
@@ -24,6 +24,7 @@
 #include "ace/Select_Reactor.h"
 #include "ace/TP_Reactor.h"
 #include "ace/WFMO_Reactor.h"
+#include "ace/Dev_Poll_Reactor.h"
 #include "ace/Task.h"
 #include "ace/Get_Opt.h"
 
@@ -34,6 +35,7 @@ ACE_RCSID(tests, MT_Reference_Counted_Notify_Test, "$Id$")
 static int test_select_reactor = 1;
 static int test_tp_reactor = 1;
 static int test_wfmo_reactor = 1;
+static int test_dev_poll_reactor = 1;
 static int test_empty_notify = 1;
 static int test_simple_notify = 1;
 static int test_reference_counted_notify = 1;
@@ -62,26 +64,46 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (void)
     (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 
   if (debug)
-    ACE_DEBUG ((LM_DEBUG,
-                "Reference count in Reference_Counted_Event_Handler() is %d\n",
-                this->reference_count_.value ()));
+    ACE_DEBUG
+      ((LM_DEBUG,
+        ACE_TEXT ("Reference count in Reference_Counted_Event_Handler() ")
+        ACE_TEXT ("is %d\n"),
+        this->reference_count_.value ()));
 }
 
 Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void)
 {
   if (debug)
-    ACE_DEBUG ((LM_DEBUG,
-                "Reference count in ~Reference_Counted_Event_Handler() is %d\n",
-                this->reference_count_.value ()));
+    ACE_DEBUG
+      ((LM_DEBUG,
+        ACE_TEXT ("Reference count in ~Reference_Counted_Event_Handler() ")
+        ACE_TEXT ("is %d\n"),
+        this->reference_count_.value ()));
+
+  if (0 != this->reference_count_.value ())
+    ACE_ERROR
+      ((LM_ERROR,
+        ACE_TEXT ("Reference count in ~Reference_Counted_Event_Handler() ")
+        ACE_TEXT ("should be 0 but is %d\n"),
+        this->reference_count_.value ()));
 }
 
 int
 Reference_Counted_Event_Handler::handle_input (ACE_HANDLE)
 {
   if (debug)
-    ACE_DEBUG ((LM_DEBUG,
-                "Reference count in Reference_Counted_Event_Handler::handle_input() is %d\n",
-                this->reference_count_.value ()));
+    ACE_DEBUG
+      ((LM_DEBUG,
+        ACE_TEXT ("Reference count in Reference_Counted_Event_Handler::")
+        ACE_TEXT ("handle_input() is %d\n"),
+        this->reference_count_.value ()));
+
+  if (2 != this->reference_count_.value ())
+    ACE_ERROR
+      ((LM_ERROR,
+        ACE_TEXT ("Reference count in Reference_Counted_Event_Handler::")
+        ACE_TEXT ("handle_input() should be 2 but is %d\n"),
+        this->reference_count_.value ()));
 
   return 0;
 }
@@ -94,7 +116,7 @@ Reference_Counted_Event_Handler::add_reference (void)
 
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
-                "Reference count after add_reference() is %d\n",
+                ACE_TEXT ("Reference count after add_reference() is %d\n"),
                 this->reference_count_.value ()));
 
   return reference_count;
@@ -108,7 +130,7 @@ Reference_Counted_Event_Handler::remove_reference (void)
 
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
-                "Reference count after remove_reference() is %d\n",
+                ACE_TEXT ("Reference count after remove_reference() is %d\n"),
                 reference_count));
 
   return reference_count;
@@ -131,15 +153,13 @@ Simple_Event_Handler::Simple_Event_Handler (int notifies)
   : notifies_ (notifies)
 {
   if (debug)
-    ACE_DEBUG ((LM_DEBUG,
-                "Simple_Event_Handler()\n"));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Event_Handler()\n")));
 }
 
 Simple_Event_Handler::~Simple_Event_Handler (void)
 {
   if (debug)
-    ACE_DEBUG ((LM_DEBUG,
-                "~Simple_Event_Handler()\n"));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Simple_Event_Handler()\n")));
 }
 
 int
@@ -147,7 +167,7 @@ Simple_Event_Handler::handle_input (ACE_HANDLE)
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
-                "Simple_Event_Handler::handle_input()\n"));
+                ACE_TEXT ("Simple_Event_Handler::handle_input()\n")));
 
   this->notifies_--;
 
@@ -195,7 +215,7 @@ Event_Loop_Thread::svc (void)
 
       if (debug)
         ACE_DEBUG ((LM_DEBUG,
-                    "Event Loop iteration %d....\n",
+                    ACE_TEXT ("Event Loop iteration %d....\n"),
                     counter));
 
       this->reactor_.handle_events ();
@@ -251,8 +271,7 @@ test<REACTOR_IMPLEMENTATION>::test (int extra_iterations_needed)
 {
   if (test_empty_notify)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n\nTesting empty notifies....\n\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTesting empty notifies...\n\n")));
 
       REACTOR_IMPLEMENTATION impl;
       ACE_Reactor reactor (&impl, 0);
@@ -265,8 +284,7 @@ test<REACTOR_IMPLEMENTATION>::test (int extra_iterations_needed)
 
   if (test_simple_notify)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n\nTesting simple notifies....\n\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTesting simple notifies...\n\n")));
 
       REACTOR_IMPLEMENTATION impl;
       ACE_Reactor reactor (&impl, 0);
@@ -282,7 +300,7 @@ test<REACTOR_IMPLEMENTATION>::test (int extra_iterations_needed)
   if (test_reference_counted_notify)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "\n\nTesting reference counted notifies....\n\n"));
+                  ACE_TEXT ("\n\nTesting reference counted notifies...\n\n")));
 
       REACTOR_IMPLEMENTATION impl;
       ACE_Reactor reactor (&impl, 0);
@@ -301,7 +319,7 @@ test<REACTOR_IMPLEMENTATION>::test (int extra_iterations_needed)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:e:f:g:z:"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:e:f:g:z:"));
 
   int cc;
   while ((cc = get_opt ()) != -1)
@@ -317,6 +335,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
         case 'c':
           test_wfmo_reactor = ACE_OS::atoi (get_opt.opt_arg ());
           break;
+        case 'd':
+          test_dev_poll_reactor = ACE_OS::atoi (get_opt.opt_arg ());
+          break;
         case 'e':
           test_empty_notify = ACE_OS::atoi (get_opt.opt_arg ());
           break;
@@ -335,6 +356,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                       ACE_TEXT ("\t[-a test Select Reactor] (defaults to %d)\n")
                       ACE_TEXT ("\t[-b test TP Reactor] (defaults to %d)\n")
                       ACE_TEXT ("\t[-c test WFMO Reactor] (defaults to %d)\n")
+                      ACE_TEXT ("\t[-d test Dev Poll Reactor] (defaults to %d)\n")
                       ACE_TEXT ("\t[-e test empty notify] (defaults to %d)\n")
                       ACE_TEXT ("\t[-f test simple notify] (defaults to %d)\n")
                       ACE_TEXT ("\t[-g test reference counted notify] (defaults to %d)\n")
@@ -344,6 +366,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                       test_select_reactor,
                       test_tp_reactor,
                       test_wfmo_reactor,
+                      test_dev_poll_reactor,
                       test_empty_notify,
                       test_simple_notify,
                       test_reference_counted_notify,
@@ -387,6 +410,19 @@ run_main (int argc, ACE_TCHAR *argv[])
       ACE_UNUSED_ARG (test);
     }
 
+#if defined (ACE_HAS_EVENT_POLL)
+
+  if (test_dev_poll_reactor)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "\n\nTesting Dev Poll Reactor....\n\n"));
+
+      test<ACE_Dev_Poll_Reactor> test (extra_iterations_not_needed);
+      ACE_UNUSED_ARG (test);
+    }
+
+#endif
+
 #if defined (ACE_WIN32)
 
   if (test_wfmo_reactor)
diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp
index 4220a76ae33..0f310d55190 100644
--- a/tests/MT_SOCK_Test.cpp
+++ b/tests/MT_SOCK_Test.cpp
@@ -125,7 +125,7 @@ static void *
 server (void *arg)
 {
   ACE_SOCK_Acceptor *peer_acceptor =
-    ACE_static_cast (ACE_SOCK_Acceptor *, arg);
+    static_cast<ACE_SOCK_Acceptor *> (arg);
 
   if (peer_acceptor->enable (ACE_NONBLOCK) == -1)
     ACE_ERROR ((LM_ERROR,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b00f60209e7..7fcf1af3806 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,638 +1,2289 @@
-##----------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile.am for all the ACE ``one-button'' tests
-##----------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc
 
-## We can't add "CLASSIX" to the SUBDIRS list as this point since "CLASSIX"
-## would be built before the "test" directory.  How do we get around this
-## without moving directories around?
-##                         -Ossama
-## SUBDIRS = CLASSIX \
-##           WinCE \
-##           version_tests
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+SUBDIRS = \
+        . \
+        HTBP \
+        SSL
 
+CLEANFILES =
+BUILT_SOURCES =
+noinst_PROGRAMS =
+noinst_HEADERS =
 
-if BUILD_SSL
-SSL_DIR = SSL
-else
-SSL_DIR =
-endif
+dist_check_SCRIPTS = run_test.lst run_test.pl
+TESTS = $(noinst_PROGRAMS)
+TEST_ENVIRONMENT = $(srcdir)/run_test.pl -t
 
-## List of conditionally built subdirectories.
-##
-## Note that the "." (current) directory in the below SUBDIRS list is
-## required to make the ACE directory be built prior to the
-## subdirectories.
-SUBDIRS = \
-  . \
-  $(SSL_DIR)
+## Makefile.Test_Output.am 
 
+noinst_SCRIPTS = run_test.lst run_test.pl
 
-## Local lib directory
-libdir = @ACE_TESTS_DIR@
+noinst_LTLIBRARIES = libTest_Output.la
 
-## LDFLAGS =
-## Libtool will automatically link against the "proper" library.
-## Do not change the "libACE.la."  It is not a typographical error!
-##
-## We override the "LIBS" variable provided by the configure script since
-## we should only need to link against the ACE library for these tests.
-LDADD = Main.o libTest_Output.la $(top_builddir)/ace/libACE.la
-##LIBS = $(top_builddir)/ace/libACE.la
-
-noinst_SCRIPTS = \
-  run_tests.check \
-  run_test.pl \
-  run_tests_remote.sh
-
-
-## @todo Do not build/run this test if running on LynxOS < 3.1.0.
-CDR_ARRAY_TEST = CDR_Array_Test
-
-## @todo Do not build these tests if their corresponding components in
-##       ACE have not been enabled/built.
-##if BUILD_CODECS_FILES
-CODECS_TEST = Codecs_Test
-##else
-##CODECS_TEST =
-##endif
-
-##if BUILD_TOKEN_FILES
-TOKENS_TEST = Tokens_Test
-##else
-##TOKENS_TEST =
-##endif
-
-if COMPILE_XTREACTOR_TEST
-XTREACTOR_TEST = XtReactor_Test
-else
-XTREACTOR_TEST =
-endif
-
-## @todo Make the DLL_Test, Service_Config_Test and
-##       Framework_Component tests conditional on shared library
-##       builds.  Do not build in static library only builds.
-FRAMEWORK_COMPONENT_TEST = Framework_Component_Test
-## FRAMEWORK_COMPONENT_TEST =
-
-## Build the shared libraries needed for the DLL_Test and the
-## Service_Config_DLL test. 
-## libdir = $(shell pwd)
-lib_LTLIBRARIES = \
-  libDLL_Test.la \
-  libFramework_Component_DLL.la \
-  libService_Config_DLL.la \
-  libTest_Output.la
+libTest_Output_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DTEST_OUTPUT_BUILD_DLL
 
 libTest_Output_la_SOURCES = \
-  Test_Output.cpp Test_Output_Export.h test_config.h
-libTest_Output_la_LIBADD = $(top_builddir)/ace/libACE.la
+  Test_Output.cpp
+
+libTest_Output_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+
+libTest_Output_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
+
+noinst_HEADERS += \
+  Test_Output_Export.h \
+  test_config.h
+
+## Makefile.ACE_Init_Test.am 
+noinst_PROGRAMS += ACE_Init_Test
+
+ACE_Init_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+ACE_Init_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  ACE_Init_Test.cpp \
+  ACE_Init_Test.h
+
+ACE_Init_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.ACE_Test.am 
+noinst_PROGRAMS += ACE_Test
+
+ACE_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+ACE_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  ACE_Test.cpp
+
+ACE_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.ARGV_Test.am 
+noinst_PROGRAMS += ARGV_Test
+
+ARGV_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+ARGV_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  ARGV_Test.cpp
+
+ARGV_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Aio_Platform_Test.am 
+noinst_PROGRAMS += Aio_Platform_Test
+
+Aio_Platform_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Aio_Platform_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Aio_Platform_Test.cpp
+
+Aio_Platform_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Arg_Shifter_Test.am 
+noinst_PROGRAMS += Arg_Shifter_Test
+
+Arg_Shifter_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Arg_Shifter_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Arg_Shifter_Test.cpp
+
+Arg_Shifter_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Atomic_Op_Test.am 
+noinst_PROGRAMS += Atomic_Op_Test
+
+Atomic_Op_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Atomic_Op_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Atomic_Op_Test.cpp
+
+Atomic_Op_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Auto_IncDec_Test.am 
+noinst_PROGRAMS += Auto_IncDec_Test
+
+Auto_IncDec_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Auto_IncDec_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Auto_IncDec_Test.cpp
+
+Auto_IncDec_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Barrier_Test.am 
+noinst_PROGRAMS += Barrier_Test
+
+Barrier_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Barrier_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Barrier_Test.cpp
+
+Barrier_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Basic_Types_Test.am 
+noinst_PROGRAMS += Basic_Types_Test
+
+Basic_Types_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Basic_Types_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Basic_Types_Test.cpp
+
+Basic_Types_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Bound_Ptr_Test.am 
+noinst_PROGRAMS += Bound_Ptr_Test
+
+Bound_Ptr_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Bound_Ptr_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Bound_Ptr_Test.cpp \
+  Bound_Ptr_Test.h
+
+Bound_Ptr_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Buffer_Stream_Test.am 
+noinst_PROGRAMS += Buffer_Stream_Test
+
+Buffer_Stream_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Buffer_Stream_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Buffer_Stream_Test.cpp
+
+Buffer_Stream_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Bug_1576_Regression_Test.am 
+noinst_PROGRAMS += Bug_1576_Regression_Test
+
+Bug_1576_Regression_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Bug_1576_Regression_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Bug_1576_Regression_Test.cpp
+
+Bug_1576_Regression_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.CDR_Array_Test.am 
+noinst_PROGRAMS += CDR_Array_Test
+
+CDR_Array_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+CDR_Array_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  CDR_Array_Test.cpp
+
+CDR_Array_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.CDR_File_Test.am 
+noinst_PROGRAMS += CDR_File_Test
+
+CDR_File_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+CDR_File_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  CDR_File_Test.cpp \
+  CE_fostream.cpp \
+  CE_fostream.h
+
+CDR_File_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.CDR_Test.am 
+noinst_PROGRAMS += CDR_Test
+
+CDR_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+CDR_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  CDR_Test.cpp
+
+CDR_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Cache_Map_Manager_Test.am 
+noinst_PROGRAMS += Cache_Map_Manager_Test
+
+Cache_Map_Manager_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Cache_Map_Manager_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Cache_Map_Manager_Test.cpp \
+  Cache_Map_Manager_Test.h
+
+Cache_Map_Manager_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Cached_Accept_Conn_Test.am 
+noinst_PROGRAMS += Cached_Accept_Conn_Test
+
+Cached_Accept_Conn_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Cached_Accept_Conn_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Cached_Accept_Conn_Test.cpp \
+  Cached_Accept_Conn_Test.h
+
+Cached_Accept_Conn_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Cached_Allocator_Test.am 
+noinst_PROGRAMS += Cached_Allocator_Test
+
+Cached_Allocator_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Cached_Allocator_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Cached_Allocator_Test.cpp
+
+Cached_Allocator_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Cached_Conn_Test.am 
+noinst_PROGRAMS += Cached_Conn_Test
+
+Cached_Conn_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Cached_Conn_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Cached_Conn_Test.cpp \
+  Cached_Conn_Test.h
+
+Cached_Conn_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Capabilities_Test.am 
+noinst_PROGRAMS += Capabilities_Test
+
+Capabilities_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Capabilities_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Capabilities_Test.cpp
+
+Capabilities_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Codecs_Test.am 
+
+if BUILD_ACE_CODECS
+noinst_PROGRAMS += Codecs_Test
+
+Codecs_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Codecs_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Codecs_Test.cpp
+
+Codecs_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACE_CODECS
+
+## Makefile.Collection_Test.am 
+noinst_PROGRAMS += Collection_Test
+
+Collection_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Collection_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Collection_Test.cpp \
+  Collection_Test.h
+
+Collection_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Config_Test.am 
+noinst_PROGRAMS += Config_Test
+
+Config_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Config_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Config_Test.cpp \
+  Config_Test.h
+
+Config_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Conn_Test.am 
+noinst_PROGRAMS += Conn_Test
+
+Conn_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Conn_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Conn_Test.cpp \
+  Conn_Test.h
+
+Conn_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.DLL_Test.am 
+noinst_PROGRAMS += DLL_Test
+
+DLL_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+DLL_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  DLL_Test.cpp \
+  DLL_Test.h
+
+DLL_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.DLL_Test_Lib.am 
+
+noinst_LTLIBRARIES += libDLL_Test.la
+
+libDLL_Test_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DACE_BUILD_SVC_DLL
+
+libDLL_Test_la_SOURCES = \
+  DLL_Test_Impl.cpp
+
+libDLL_Test_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+
+libDLL_Test_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
+
+noinst_HEADERS += \
+  DLL_Test_Impl.h \
+  test_config.h
+
+## Makefile.DLList_Test.am 
+noinst_PROGRAMS += DLList_Test
+
+DLList_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+DLList_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  DLList_Test.cpp
+
+DLList_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Date_Time_Test.am 
+noinst_PROGRAMS += Date_Time_Test
+
+Date_Time_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Date_Time_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Date_Time_Test.cpp
+
+Date_Time_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Dev_Poll_Reactor_Test.am 
+noinst_PROGRAMS += Dev_Poll_Reactor_Test
+
+Dev_Poll_Reactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Dev_Poll_Reactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Dev_Poll_Reactor_Test.cpp
+
+Dev_Poll_Reactor_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-libDLL_Test_la_SOURCES = DLL_Test_Impl.cpp DLL_Test_Impl.h
-libDLL_Test_la_LDFLAGS = -module
+## Makefile.Dirent_Test.am 
+noinst_PROGRAMS += Dirent_Test
+
+Dirent_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Dirent_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Dirent_Test.cpp
+
+Dirent_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Dynamic_Priority_Test.am 
+noinst_PROGRAMS += Dynamic_Priority_Test
+
+Dynamic_Priority_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Dynamic_Priority_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Dynamic_Priority_Test.cpp
+
+Dynamic_Priority_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Enum_Interfaces_Test.am 
+noinst_PROGRAMS += Enum_Interfaces_Test
+
+Enum_Interfaces_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Enum_Interfaces_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Enum_Interfaces_Test.cpp
+
+Enum_Interfaces_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Env_Value_Test.am 
+noinst_PROGRAMS += Env_Value_Test
+
+Env_Value_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Env_Value_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Env_Value_Test.cpp
+
+Env_Value_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.FIFO_Test.am 
+noinst_PROGRAMS += FIFO_Test
+
+FIFO_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+FIFO_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  FIFO_Test.cpp
+
+FIFO_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.FlReactor_Test.am 
+
+if BUILD_ACE_FLREACTOR
+if BUILD_FL
+if BUILD_GL
+if BUILD_X11
+
+noinst_PROGRAMS += FlReactor_Test
+
+FlReactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+FlReactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  FlReactor_Test.cpp
+
+FlReactor_Test_LDADD = \
+ $(top_builddir)/ace/libACE_FlReactor.la libTest_Output.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_X11
+endif BUILD_GL
+endif BUILD_FL
+endif BUILD_ACE_FLREACTOR
+
+## Makefile.Framework_Component_DLL.am 
+
+noinst_LTLIBRARIES += libFramework_Component_DLL.la
+
+libFramework_Component_DLL_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DFRAMEWORK_COMPONENT_DLL_BUILD_DLL
 
 libFramework_Component_DLL_la_SOURCES = \
-  Framework_Component_DLL.cpp \
+  Framework_Component_DLL.cpp
+
+libFramework_Component_DLL_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+
+libFramework_Component_DLL_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
+
+noinst_HEADERS += \
   Framework_Component_DLL.h \
   Framework_Component_DLL_Export.h
-libFramework_Component_DLL_la_LDFLAGS = -module
-libFramework_Component_DLL_la_LIBADD = $(top_builddir)/ace/libACE.la
 
-libService_Config_DLL_la_SOURCES = \
-  Service_Config_DLL.cpp \
-  Service_Config_DLL.h \
-  Service_Config_DLL_Export.h
-libService_Config_DLL_la_LDFLAGS = -module
-libService_Config_DLL_la_LIBADD = $(top_builddir)/ace/libACE.la
-
-
-## Build the following test programs when a `make check' is
-## issued by the user.
-##check_PROGRAMS =
-noinst_PROGRAMS = \
-  ACE_Test \
-  Aio_Platform_Test \
-  Arg_Shifter_Test \
-  ARGV_Test \
-  Atomic_Op_Test \
-  Auto_IncDec_Test \
-  Barrier_Test \
-  Basic_Types_Test \
-  Bound_Ptr_Test \
-  Buffer_Stream_Test \
-  Bug_1576_Regression_Test \
-  Cache_Map_Manager_Test \
-  Cached_Accept_Conn_Test \
-  Cached_Allocator_Test \
-  Cached_Conn_Test \
-  Capabilities_Test \
-  CDR_File_Test \
-  CDR_Test \
-  Collection_Test \
-  Config_Test \
-  Conn_Test \
-  Date_Time_Test \
-  Dev_Poll_Reactor_Test \
-  Dirent_Test \
-  DLL_Test\
-  DLList_Test \
-  Dynamic_Priority_Test \
-  Enum_Interfaces_Test \
-  Env_Value_Test \
-  FIFO_Test \
-  Future_Set_Test \
-  Future_Test \
-  Get_Opt_Test \
-  Handle_Set_Test \
-  Hash_Map_Bucket_Iterator_Test \
-  Hash_Map_Manager_Test \
-  High_Res_Timer_Test \
-  INET_Addr_Test \
-  IOStream_Test \
-  Lazy_Map_Manager_Test \
-  Log_Msg_Test \
-  Logging_Strategy_Test \
-  Malloc_Test \
-  Map_Manager_Test \
-  Map_Test \
-  Max_Default_Port_Test \
-  Mem_Map_Test \
-  MEM_Stream_Test \
-  Message_Block_Test \
-  Message_Queue_Notifications_Test \
-  Message_Queue_Test \
-  Message_Queue_Test_Ex \
-  MM_Shared_Memory_Test \
-  MT_Reactor_Timer_Test \
-  MT_Reactor_Upcall_Test \
-  MT_Reference_Counted_Event_Handler_Test \
-  MT_Reference_Counted_Notify_Test \
-  MT_SOCK_Test \
-  Multicast_Test \
-  Multihomed_INET_Addr_Test \
-  NonBlocking_Conn_Test \
-  Notify_Performance_Test \
-  Object_Manager_Test \
-  Obstack_Test \
-  OrdMultiSet_Test \
-  OS_Test \
-  Pipe_Test \
-  Priority_Buffer_Test \
-  Priority_Reactor_Test \
-  Priority_Task_Test \
-  Proactor_Scatter_Gather_Test \
-  Proactor_Test \
-  Proactor_Timer_Test \
-  Process_Manager_Test \
-  Process_Mutex_Test \
-  Process_Strategy_Test \
-  RB_Tree_Test \
-  Reactor_Dispatch_Order_Test \
-  Reactor_Exceptions_Test \
-  Reactor_Notify_Test \
-  Reactor_Performance_Test \
-  Reactor_Registration_Test \
-  Reactor_Timer_Test \
-  Reactors_Test \
-  Reader_Writer_Test \
-  Recursive_Condition_Test \
-  Recursive_Mutex_Test \
-  Refcounted_Auto_Ptr_Test \
-  Reference_Counted_Event_Handler_Test \
-  Reverse_Lock_Test \
-  Semaphore_Test \
-  Service_Config_Test \
-  Signal_Test \
-  Sigset_Ops_Test \
-  Simple_Message_Block_Test \
-  SOCK_Connector_Test \
-  SOCK_Send_Recv_Test \
-  SOCK_Test \
-  SPIPE_Test \
-  SString_Test \
-  SV_Shared_Memory_Test \
-  Svc_Handler_Test \
-  Task_Test \
-  Task_Ex_Test \
-  Thread_Manager_Test \
-  Thread_Mutex_Test \
-  Thread_Pool_Test \
-  Time_Service_Test \
-  Time_Value_Test \
-  Timeprobe_Test \
-  Timer_Cancellation_Test \
-  Timer_Queue_Reference_Counting_Test \
-  Timer_Queue_Test \
-  Token_Strategy_Test \
-  TP_Reactor_Test \
-  TSS_Test \
-  TSS_Static_Test \
-  Unbounded_Set_Test_Ex \
-  Upgradable_RW_Test \
-  UPIPE_SAP_Test \
-  Vector_Test \
-  WFMO_Reactor_Test \
-  \
-  Naming_Test \
-  \
-  FlReactor_Test \
-  Thread_Pool_Reactor_Test \
-  Thread_Pool_Reactor_Resume_Test \
-  TkReactor_Test \
-  UUIDTest \
-  $(CDR_ARRAY_TEST) \
-  $(CODECS_TEST) \
-  $(FRAMEWORK_COMPONENT_TEST) \
-  $(TOKENS_TEST) \
-  $(XTREACTOR_TEST)
-
-## Conditionally built IPv6 tests.
-if BUILD_IPV6
-noinst_PROGRAMS += \
-  INET_Addr_Test_IPV6 \
-  Max_Default_Port_Test_IPV6 \
-  Multicast_Test_IPV6 \
-  Multihomed_INET_Addr_Test_IPV6 \
-  Proactor_Test_IPV6 \
-  SOCK_Send_Recv_Test_IPV6 \
-  SOCK_Test_IPv6
-endif
-
-ACE_Test_SOURCES = ACE_Test.cpp
-
-Aio_Platform_Test_SOURCES = Aio_Platform_Test.cpp
+## Makefile.Framework_Component_Test.am 
+noinst_PROGRAMS += Framework_Component_Test
+
+Framework_Component_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Framework_Component_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Framework_Component_Test.cpp \
+  Framework_Component_Test.h
+
+Framework_Component_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Future_Set_Test.am 
+noinst_PROGRAMS += Future_Set_Test
+
+Future_Set_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Future_Set_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Future_Set_Test.cpp
+
+Future_Set_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Future_Test.am 
+noinst_PROGRAMS += Future_Test
+
+Future_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Future_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Future_Test.cpp
+
+Future_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Get_Opt_Test.am 
+noinst_PROGRAMS += Get_Opt_Test
+
+Get_Opt_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Get_Opt_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Get_Opt_Test.cpp
+
+Get_Opt_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Arg_Shifter_Test_SOURCES = Arg_Shifter_Test.cpp
+## Makefile.Handle_Set_Test.am 
+noinst_PROGRAMS += Handle_Set_Test
 
-ARGV_Test_SOURCES = ARGV_Test.cpp
+Handle_Set_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Atomic_Op_Test_SOURCES = Atomic_Op_Test.cpp
+Handle_Set_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Handle_Set_Test.cpp
 
-Auto_IncDec_Test_SOURCES = Auto_IncDec_Test.cpp
+Handle_Set_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Barrier_Test_SOURCES = Barrier_Test.cpp
+## Makefile.Hash_Map_Bucket_Iterator_Test.am 
+noinst_PROGRAMS += Hash_Map_Bucket_Iterator_Test
 
-Basic_Types_Test_SOURCES = Basic_Types_Test.cpp
+Hash_Map_Bucket_Iterator_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Bound_Ptr_Test_SOURCES = Bound_Ptr_Test.cpp Bound_Ptr_Test.h
+Hash_Map_Bucket_Iterator_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Hash_Map_Bucket_Iterator_Test.cpp
 
-Buffer_Stream_Test_SOURCES = Buffer_Stream_Test.cpp
+Hash_Map_Bucket_Iterator_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Bug_1576_Regression_Test_SOURCES = Bug_1576_Regression_Test.cpp
+## Makefile.Hash_Map_Manager_Test.am 
+noinst_PROGRAMS += Hash_Map_Manager_Test
 
-CDR_Array_Test_SOURCES = CDR_Array_Test.cpp
+Hash_Map_Manager_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-CDR_Test_SOURCES = CDR_Test.cpp
+Hash_Map_Manager_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Hash_Map_Manager_Test.cpp
 
-CDR_File_Test_SOURCES = CDR_File_Test.cpp
+Hash_Map_Manager_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Cached_Accept_Conn_Test_SOURCES = Cached_Accept_Conn_Test.cpp \
-                                  Cached_Accept_Conn_Test.h
+## Makefile.High_Res_Timer_Test.am 
+noinst_PROGRAMS += High_Res_Timer_Test
 
-Cached_Allocator_Test_SOURCES = Cached_Allocator_Test.cpp
+High_Res_Timer_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Cached_Conn_Test_SOURCES = Cached_Conn_Test.cpp \
-                           Cached_Conn_Test.h
+High_Res_Timer_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  High_Res_Timer_Test.cpp
 
-Cache_Map_Manager_Test_SOURCES = Cache_Map_Manager_Test.cpp \
-                                 Cache_Map_Manager_Test.h
+High_Res_Timer_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Capabilities_Test_SOURCES = Capabilities_Test.cpp
+## Makefile.INET_Addr_Test.am 
+noinst_PROGRAMS += INET_Addr_Test
 
-Codecs_Test_SOURCES = Codecs_Test.cpp
+INET_Addr_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Collection_Test_SOURCES = Collection_Test.cpp Collection_Test.h
+INET_Addr_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  INET_Addr_Test.cpp
 
-Config_Test_SOURCES = Config_Test.cpp Config_Test.h
+INET_Addr_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Conn_Test_SOURCES = Conn_Test.cpp Conn_Test.h
+## Makefile.INET_Addr_Test_IPV6.am 
+noinst_PROGRAMS += INET_Addr_Test_IPV6
 
-DLList_Test_SOURCES = DLList_Test.cpp
+INET_Addr_Test_IPV6_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-DLL_Test_SOURCES = DLL_Test.cpp DLL_Test.h
-DLL_Test_DEPENDENCIES = libDLL_Test.la libTest_Output.la
+INET_Addr_Test_IPV6_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  INET_Addr_Test_IPV6.cpp
 
-Date_Time_Test_SOURCES = Date_Time_Test.cpp
+INET_Addr_Test_IPV6_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Dev_Poll_Reactor_Test_SOURCES = Dev_Poll_Reactor_Test.cpp
+## Makefile.IOStream_Test.am 
+noinst_PROGRAMS += IOStream_Test
 
-Dirent_Test_SOURCES = Dirent_Test.cpp
+IOStream_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Dynamic_Priority_Test_SOURCES = Dynamic_Priority_Test.cpp
+IOStream_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  IOStream_Test.cpp
 
-Enum_Interfaces_Test_SOURCES = Enum_Interfaces_Test.cpp
+IOStream_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Env_Value_Test_SOURCES = Env_Value_Test.cpp
+## Makefile.Lazy_Map_Manager_Test.am 
+noinst_PROGRAMS += Lazy_Map_Manager_Test
 
-FIFO_Test_SOURCES = FIFO_Test.cpp
+Lazy_Map_Manager_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-FlReactor_Test_SOURCES = FlReactor_Test.cpp
+Lazy_Map_Manager_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Lazy_Map_Manager_Test.cpp
 
-Framework_Component_Test_SOURCES = Framework_Component_Test.cpp \
-                                   Framework_Component_Test.h
-Framework_Component_Test_DEPENDENCIES = \
-  libFramework_Component_DLL.la libTest_Output.la
+Lazy_Map_Manager_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Future_Test_SOURCES = Future_Test.cpp
+## Makefile.Log_Msg_Test.am 
+noinst_PROGRAMS += Log_Msg_Test
 
-Future_Set_Test_SOURCES = Future_Set_Test.cpp
+Log_Msg_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Get_Opt_Test_SOURCES = Get_Opt_Test.cpp
+Log_Msg_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Log_Msg_Test.cpp
 
-Handle_Set_Test_SOURCES = Handle_Set_Test.cpp
+Log_Msg_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Hash_Map_Manager_Test_SOURCES = Hash_Map_Manager_Test.cpp
+## Makefile.Logging_Strategy_Test.am 
+noinst_PROGRAMS += Logging_Strategy_Test
 
-Hash_Map_Bucket_Iterator_Test_SOURCES = Hash_Map_Bucket_Iterator_Test.cpp
+Logging_Strategy_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-High_Res_Timer_Test_SOURCES = High_Res_Timer_Test.cpp
+Logging_Strategy_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Logging_Strategy_Test.cpp
 
-INET_Addr_Test_SOURCES = INET_Addr_Test.cpp
+Logging_Strategy_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-IOStream_Test_SOURCES = IOStream_Test.cpp
+## Makefile.MEM_Stream_Test.am 
+noinst_PROGRAMS += MEM_Stream_Test
 
-Lazy_Map_Manager_Test_SOURCES = Lazy_Map_Manager_Test.cpp
+MEM_Stream_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Log_Msg_Test_SOURCES = Log_Msg_Test.cpp
+MEM_Stream_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  MEM_Stream_Test.cpp \
+  MEM_Stream_Test.h
 
-Logging_Strategy_Test_SOURCES = Logging_Strategy_Test.cpp
+MEM_Stream_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-MEM_Stream_Test_SOURCES = MEM_Stream_Test.cpp MEM_Stream_Test.h
+## Makefile.MM_Shared_Memory_Test.am 
+noinst_PROGRAMS += MM_Shared_Memory_Test
 
-MM_Shared_Memory_Test_SOURCES = MM_Shared_Memory_Test.cpp
+MM_Shared_Memory_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-MT_Reactor_Timer_Test_SOURCES = MT_Reactor_Timer_Test.cpp \
-                                MT_Reactor_Timer_Test.h
+MM_Shared_Memory_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  MM_Shared_Memory_Test.cpp
 
-MT_Reactor_Upcall_Test_SOURCES = MT_Reactor_Upcall_Test.cpp
+MM_Shared_Memory_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.MT_Reactor_Timer_Test.am 
+noinst_PROGRAMS += MT_Reactor_Timer_Test
+
+MT_Reactor_Timer_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+MT_Reactor_Timer_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  MT_Reactor_Timer_Test.cpp \
+  MT_Reactor_Timer_Test.h
+
+MT_Reactor_Timer_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.MT_Reactor_Upcall_Test.am 
+noinst_PROGRAMS += MT_Reactor_Upcall_Test
+
+MT_Reactor_Upcall_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+MT_Reactor_Upcall_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  MT_Reactor_Upcall_Test.cpp
+
+MT_Reactor_Upcall_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.MT_Ref_Counted_Event_Handler_Test.am 
+noinst_PROGRAMS += MT_Reference_Counted_Event_Handler_Test
+
+MT_Reference_Counted_Event_Handler_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
 MT_Reference_Counted_Event_Handler_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
   MT_Reference_Counted_Event_Handler_Test.cpp
 
+MT_Reference_Counted_Event_Handler_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.MT_Reference_Counted_Notify_Test.am 
+noinst_PROGRAMS += MT_Reference_Counted_Notify_Test
+
+MT_Reference_Counted_Notify_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
 MT_Reference_Counted_Notify_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
   MT_Reference_Counted_Notify_Test.cpp
 
-MT_SOCK_Test_SOURCES = MT_SOCK_Test.cpp
+MT_Reference_Counted_Notify_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.MT_SOCK_Test.am 
+noinst_PROGRAMS += MT_SOCK_Test
+
+MT_SOCK_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+MT_SOCK_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  MT_SOCK_Test.cpp
 
-Malloc_Test_SOURCES = Malloc_Test.cpp Malloc_Test.h
+MT_SOCK_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Map_Manager_Test_SOURCES = Map_Manager_Test.cpp
+## Makefile.Malloc_Test.am 
+noinst_PROGRAMS += Malloc_Test
 
-Map_Test_SOURCES = Map_Test.cpp Map_Test.h
+Malloc_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Max_Default_Port_Test_SOURCES = Max_Default_Port_Test.cpp \
-                                Max_Default_Port_Test.h
+Malloc_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Malloc_Test.cpp \
+  Malloc_Test.h
 
-Mem_Map_Test_SOURCES = Mem_Map_Test.cpp
+Malloc_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Message_Block_Test_SOURCES = Message_Block_Test.cpp
+## Makefile.Map_Manager_Test.am 
+noinst_PROGRAMS += Map_Manager_Test
 
-Message_Queue_Notifications_Test_SOURCES = Message_Queue_Notifications_Test.cpp
+Map_Manager_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Message_Queue_Test_SOURCES = Message_Queue_Test.cpp
+Map_Manager_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Map_Manager_Test.cpp
 
-Message_Queue_Test_Ex_SOURCES = Message_Queue_Test_Ex.cpp \
-                                Message_Queue_Test_Ex.h
+Map_Manager_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Multicast_Test_SOURCES = Multicast_Test.cpp
+## Makefile.Map_Test.am 
+noinst_PROGRAMS += Map_Test
 
-Multihomed_INET_Addr_Test_SOURCES = Multihomed_INET_Addr_Test.cpp
+Map_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Naming_Test_SOURCES = Naming_Test.cpp
+Map_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Map_Test.cpp \
+  Map_Test.h
+
+Map_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Max_Default_Port_Test.am 
+noinst_PROGRAMS += Max_Default_Port_Test
+
+Max_Default_Port_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Max_Default_Port_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Max_Default_Port_Test.cpp \
+  Max_Default_Port_Test.h
+
+Max_Default_Port_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Max_Default_Port_Test_IPV6.am 
+noinst_PROGRAMS += Max_Default_Port_Test_IPV6
+
+Max_Default_Port_Test_IPV6_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Max_Default_Port_Test_IPV6_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Max_Default_Port_Test_IPV6.cpp
+
+Max_Default_Port_Test_IPV6_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Mem_Map_Test.am 
+noinst_PROGRAMS += Mem_Map_Test
+
+Mem_Map_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Mem_Map_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Mem_Map_Test.cpp
+
+Mem_Map_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Message_Block_Test.am 
+noinst_PROGRAMS += Message_Block_Test
+
+Message_Block_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Message_Block_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Message_Block_Test.cpp
+
+Message_Block_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Message_Queue_Notifications_Test.am 
+noinst_PROGRAMS += Message_Queue_Notifications_Test
+
+Message_Queue_Notifications_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Message_Queue_Notifications_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Message_Queue_Notifications_Test.cpp
+
+Message_Queue_Notifications_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Message_Queue_Test.am 
+noinst_PROGRAMS += Message_Queue_Test
+
+Message_Queue_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Message_Queue_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Message_Queue_Test.cpp
+
+Message_Queue_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Message_Queue_Test_Ex.am 
+noinst_PROGRAMS += Message_Queue_Test_Ex
+
+Message_Queue_Test_Ex_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Message_Queue_Test_Ex_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Message_Queue_Test_Ex.cpp \
+  Message_Queue_Test_Ex.h
+
+Message_Queue_Test_Ex_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Multicast_Test.am 
+noinst_PROGRAMS += Multicast_Test
+
+Multicast_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Multicast_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Multicast_Test.cpp
+
+Multicast_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Multicast_Test_IPV6.am 
+noinst_PROGRAMS += Multicast_Test_IPV6
+
+Multicast_Test_IPV6_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Multicast_Test_IPV6_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Multicast_Test_IPV6.cpp
+
+Multicast_Test_IPV6_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Multihomed_INET_Addr_Test.am 
+noinst_PROGRAMS += Multihomed_INET_Addr_Test
+
+Multihomed_INET_Addr_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Multihomed_INET_Addr_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Multihomed_INET_Addr_Test.cpp
+
+Multihomed_INET_Addr_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Multihomed_INET_Addr_Test_IPV6.am 
+noinst_PROGRAMS += Multihomed_INET_Addr_Test_IPV6
+
+Multihomed_INET_Addr_Test_IPV6_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Multihomed_INET_Addr_Test_IPV6_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Multihomed_INET_Addr_Test_IPV6.cpp
+
+Multihomed_INET_Addr_Test_IPV6_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Naming_Test.am 
+
+if BUILD_ACE_OTHER
+noinst_PROGRAMS += Naming_Test
+
+Naming_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Naming_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Naming_Test.cpp
+
+Naming_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACE_OTHER
+
+## Makefile.Network_Adapters_Test.am 
+noinst_PROGRAMS += Network_Adapters_Test
+
+Network_Adapters_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Network_Adapters_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Network_Adapters_Test.cpp \
+  Network_Adapters_Test.h
+
+Network_Adapters_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.New_Fail_Test.am 
+noinst_PROGRAMS += New_Fail_Test
+
+New_Fail_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+New_Fail_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  New_Fail_Test.cpp
+
+New_Fail_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.NonBlocking_Conn_Test.am 
+noinst_PROGRAMS += NonBlocking_Conn_Test
+
+NonBlocking_Conn_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
 NonBlocking_Conn_Test_SOURCES = \
-  NonBlocking_Conn_Test.cpp NonBlocking_Conn_Test.h
+  $(ACE_ROOT)/tests/Main.cpp \
+  NonBlocking_Conn_Test.cpp \
+  NonBlocking_Conn_Test.h
+
+NonBlocking_Conn_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Notify_Performance_Test.am 
+noinst_PROGRAMS += Notify_Performance_Test
+
+Notify_Performance_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Notify_Performance_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Notify_Performance_Test.cpp
 
-Notify_Performance_Test_SOURCES = Notify_Performance_Test.cpp
+Notify_Performance_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-OS_Test_SOURCES = OS_Test.cpp
+## Makefile.OS_Test.am 
+noinst_PROGRAMS += OS_Test
 
-Object_Manager_Test_SOURCES = Object_Manager_Test.cpp
+OS_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Obstack_Test_SOURCES = Obstack_Test.cpp
+OS_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  OS_Test.cpp
 
-OrdMultiSet_Test_SOURCES = OrdMultiSet_Test.cpp
+OS_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Pipe_Test_SOURCES = Pipe_Test.cpp
+## Makefile.Object_Manager_Test.am 
+noinst_PROGRAMS += Object_Manager_Test
 
-Priority_Buffer_Test_SOURCES = Priority_Buffer_Test.cpp
+Object_Manager_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Priority_Reactor_Test_SOURCES = Priority_Reactor_Test.cpp \
-                                Priority_Reactor_Test.h
+Object_Manager_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Object_Manager_Test.cpp
 
-Priority_Task_Test_SOURCES = Priority_Task_Test.cpp
+Object_Manager_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Proactor_Scatter_Gather_Test_SOURCES = Proactor_Scatter_Gather_Test.cpp
+## Makefile.Obstack_Test.am 
+noinst_PROGRAMS += Obstack_Test
 
-Proactor_Test_SOURCES = Proactor_Test.cpp
+Obstack_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Proactor_Timer_Test_SOURCES = Proactor_Timer_Test.cpp
+Obstack_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Obstack_Test.cpp
 
-Process_Manager_Test_SOURCES = Process_Manager_Test.cpp
+Obstack_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Process_Mutex_Test_SOURCES = Process_Mutex_Test.cpp
+## Makefile.OrdMultiSet_Test.am 
+noinst_PROGRAMS += OrdMultiSet_Test
 
-Process_Strategy_Test_SOURCES = Process_Strategy_Test.cpp \
-                                Process_Strategy_Test.h
+OrdMultiSet_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-RB_Tree_Test_SOURCES = RB_Tree_Test.cpp RB_Tree_Test.h
+OrdMultiSet_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  OrdMultiSet_Test.cpp
 
-Reactor_Dispatch_Order_Test_SOURCES = Reactor_Dispatch_Order_Test.cpp
+OrdMultiSet_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Reactor_Exceptions_Test_SOURCES = Reactor_Exceptions_Test.cpp
+## Makefile.Pipe_Test.am 
+noinst_PROGRAMS += Pipe_Test
 
-Reactor_Notify_Test_SOURCES = Reactor_Notify_Test.cpp
+Pipe_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Reactor_Performance_Test_SOURCES = Reactor_Performance_Test.cpp \
-                                   Reactor_Performance_Test.h
+Pipe_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Pipe_Test.cpp
 
-Reactor_Registration_Test_SOURCES = Reactor_Registration_Test.cpp
+Pipe_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Reactor_Timer_Test_SOURCES = Reactor_Timer_Test.cpp
+## Makefile.Priority_Buffer_Test.am 
+noinst_PROGRAMS += Priority_Buffer_Test
 
-Reactors_Test_SOURCES = Reactors_Test.cpp
+Priority_Buffer_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Reader_Writer_Test_SOURCES = Reader_Writer_Test.cpp
+Priority_Buffer_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Priority_Buffer_Test.cpp
 
-Recursive_Condition_Test_SOURCES = Recursive_Condition_Test.cpp
+Priority_Buffer_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Recursive_Mutex_Test_SOURCES = Recursive_Mutex_Test.cpp
+## Makefile.Priority_Reactor_Test.am 
+noinst_PROGRAMS += Priority_Reactor_Test
 
-Refcounted_Auto_Ptr_Test_SOURCES = Refcounted_Auto_Ptr_Test.cpp \
-                                   Refcounted_Auto_Ptr_Test.h
+Priority_Reactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Priority_Reactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Priority_Reactor_Test.cpp \
+  Priority_Reactor_Test.h
+
+Priority_Reactor_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Priority_Task_Test.am 
+noinst_PROGRAMS += Priority_Task_Test
+
+Priority_Task_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Priority_Task_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Priority_Task_Test.cpp
+
+Priority_Task_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Proactor_Scatter_Gather_Test.am 
+noinst_PROGRAMS += Proactor_Scatter_Gather_Test
+
+Proactor_Scatter_Gather_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Proactor_Scatter_Gather_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Proactor_Scatter_Gather_Test.cpp
+
+Proactor_Scatter_Gather_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Proactor_Test.am 
+noinst_PROGRAMS += Proactor_Test
+
+Proactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Proactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Proactor_Test.cpp \
+  Proactor_Test.h
+
+Proactor_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Proactor_Test_IPV6.am 
+noinst_PROGRAMS += Proactor_Test_IPV6
+
+Proactor_Test_IPV6_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Proactor_Test_IPV6_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Proactor_Test_IPV6.cpp
+
+Proactor_Test_IPV6_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Proactor_Timer_Test.am 
+noinst_PROGRAMS += Proactor_Timer_Test
+
+Proactor_Timer_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Proactor_Timer_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Proactor_Timer_Test.cpp
+
+Proactor_Timer_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Process_Manager_Test.am 
+noinst_PROGRAMS += Process_Manager_Test
+
+Process_Manager_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Process_Manager_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Process_Manager_Test.cpp
+
+Process_Manager_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Process_Mutex_Test.am 
+noinst_PROGRAMS += Process_Mutex_Test
+
+Process_Mutex_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Process_Mutex_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Process_Mutex_Test.cpp
+
+Process_Mutex_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Process_Strategy_Test.am 
+noinst_PROGRAMS += Process_Strategy_Test
+
+Process_Strategy_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Process_Strategy_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Process_Strategy_Test.cpp \
+  Process_Strategy_Test.h
+
+Process_Strategy_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.QtReactor_Test.am 
+
+if BUILD_ACE_QTREACTOR
+if BUILD_QT
+
+BUILT_SOURCES += \
+  QtReactor_Test_moc.cpp
+
+CLEANFILES += \
+  QtReactor_Test_moc.cpp
+
+QtReactor_Test_moc.cpp: $(srcdir)/QtReactor_Test.h
+	$(QTDIR)/bin/moc  $(srcdir)/QtReactor_Test.h -o QtReactor_Test_moc.cpp
+
+noinst_PROGRAMS += QtReactor_Test
+
+QtReactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(QTDIR)/include \
+  -DQT_THREAD_SUPPORT
+
+QtReactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  QtReactor_Test.cpp \
+  QtReactor_Test_moc.cpp \
+  QtReactor_Test.h
+
+QtReactor_Test_LDADD = \
+ $(top_builddir)/ace/libACE_QtReactor.la libTest_Output.la $(top_builddir)/ace/libACE.la -lqt-mt
+
+endif BUILD_QT
+endif BUILD_ACE_QTREACTOR
+
+## Makefile.RB_Tree_Test.am 
+noinst_PROGRAMS += RB_Tree_Test
+
+RB_Tree_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+RB_Tree_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  RB_Tree_Test.cpp \
+  RB_Tree_Test.h
+
+RB_Tree_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reactor_Dispatch_Order_Test.am 
+noinst_PROGRAMS += Reactor_Dispatch_Order_Test
+
+Reactor_Dispatch_Order_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reactor_Dispatch_Order_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reactor_Dispatch_Order_Test.cpp
+
+Reactor_Dispatch_Order_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reactor_Exceptions_Test.am 
+noinst_PROGRAMS += Reactor_Exceptions_Test
+
+Reactor_Exceptions_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reactor_Exceptions_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reactor_Exceptions_Test.cpp
+
+Reactor_Exceptions_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reactor_Notification_Queue_Test.am 
+noinst_PROGRAMS += Reactor_Notification_Queue_Test
+
+Reactor_Notification_Queue_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reactor_Notification_Queue_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reactor_Notification_Queue_Test.cpp
+
+Reactor_Notification_Queue_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reactor_Notify_Test.am 
+noinst_PROGRAMS += Reactor_Notify_Test
+
+Reactor_Notify_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reactor_Notify_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reactor_Notify_Test.cpp
+
+Reactor_Notify_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reactor_Performance_Test.am 
+noinst_PROGRAMS += Reactor_Performance_Test
+
+Reactor_Performance_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reactor_Performance_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reactor_Performance_Test.cpp \
+  Reactor_Performance_Test.h
+
+Reactor_Performance_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reactor_Registration_Test.am 
+noinst_PROGRAMS += Reactor_Registration_Test
+
+Reactor_Registration_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reactor_Registration_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reactor_Registration_Test.cpp
+
+Reactor_Registration_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reactor_Timer_Test.am 
+noinst_PROGRAMS += Reactor_Timer_Test
+
+Reactor_Timer_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reactor_Timer_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reactor_Timer_Test.cpp
+
+Reactor_Timer_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reactors_Test.am 
+noinst_PROGRAMS += Reactors_Test
+
+Reactors_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reactors_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reactors_Test.cpp
+
+Reactors_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reader_Writer_Test.am 
+noinst_PROGRAMS += Reader_Writer_Test
+
+Reader_Writer_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reader_Writer_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reader_Writer_Test.cpp
+
+Reader_Writer_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Recursive_Condition_Bug_Test.am 
+noinst_PROGRAMS += Recursive_Condition_Bug_Test
+
+Recursive_Condition_Bug_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Recursive_Condition_Bug_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Recursive_Condition_Bug_Test.cpp
+
+Recursive_Condition_Bug_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Recursive_Condition_Test.am 
+noinst_PROGRAMS += Recursive_Condition_Test
+
+Recursive_Condition_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Recursive_Condition_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Recursive_Condition_Test.cpp
+
+Recursive_Condition_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Recursive_Mutex_Test.am 
+noinst_PROGRAMS += Recursive_Mutex_Test
+
+Recursive_Mutex_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Recursive_Mutex_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Recursive_Mutex_Test.cpp
+
+Recursive_Mutex_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Refcounted_Auto_Ptr_Test.am 
+noinst_PROGRAMS += Refcounted_Auto_Ptr_Test
+
+Refcounted_Auto_Ptr_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Refcounted_Auto_Ptr_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Refcounted_Auto_Ptr_Test.cpp \
+  Refcounted_Auto_Ptr_Test.h
+
+Refcounted_Auto_Ptr_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Reference_Counted_Event_Handler_Test.am 
+noinst_PROGRAMS += Reference_Counted_Event_Handler_Test
+
+Reference_Counted_Event_Handler_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
 Reference_Counted_Event_Handler_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
   Reference_Counted_Event_Handler_Test.cpp
 
-Reverse_Lock_Test_SOURCES = Reverse_Lock_Test.cpp
+Reference_Counted_Event_Handler_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-SOCK_Connector_Test_SOURCES = SOCK_Connector_Test.cpp
+## Makefile.Reverse_Lock_Test.am 
+noinst_PROGRAMS += Reverse_Lock_Test
 
-SOCK_Send_Recv_Test_SOURCES = SOCK_Send_Recv_Test.cpp
+Reverse_Lock_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-SOCK_Test_SOURCES = SOCK_Test.cpp
+Reverse_Lock_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reverse_Lock_Test.cpp
 
-SPIPE_Test_SOURCES = SPIPE_Test.cpp
+Reverse_Lock_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-SString_Test_SOURCES = SString_Test.cpp
+## Makefile.SOCK_Connector_Test.am 
+noinst_PROGRAMS += SOCK_Connector_Test
 
-SV_Shared_Memory_Test_SOURCES = SV_Shared_Memory_Test.cpp
+SOCK_Connector_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Semaphore_Test_SOURCES = Semaphore_Test.cpp
+SOCK_Connector_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SOCK_Connector_Test.cpp
 
-Service_Config_Test_SOURCES = Service_Config_Test.cpp
-Service_Config_Test_DEPENDENCIES = libService_Config_DLL.la libTest_Output.la
+SOCK_Connector_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Signal_Test_SOURCES = Signal_Test.cpp
+## Makefile.SOCK_Dgram_Bcast_Test.am 
+noinst_PROGRAMS += SOCK_Dgram_Bcast_Test
 
-Sigset_Ops_Test_SOURCES = Sigset_Ops_Test.cpp
+SOCK_Dgram_Bcast_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Simple_Message_Block_Test_SOURCES = Simple_Message_Block_Test.cpp
+SOCK_Dgram_Bcast_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SOCK_Dgram_Bcast_Test.cpp
 
-Svc_Handler_Test_SOURCES = Svc_Handler_Test.cpp
+SOCK_Dgram_Bcast_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-TP_Reactor_Test_SOURCES = TP_Reactor_Test.cpp TP_Reactor_Test.h
+## Makefile.SOCK_Dgram_Test.am 
+noinst_PROGRAMS += SOCK_Dgram_Test
 
-TSS_Test_SOURCES = TSS_Test.cpp \
-                   TSS_Test_Errno.h
+SOCK_Dgram_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-TSS_Static_Test_SOURCES = TSS_Static_Test.cpp
+SOCK_Dgram_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SOCK_Dgram_Test.cpp
 
-Task_Test_SOURCES = Task_Test.cpp
+SOCK_Dgram_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Task_Ex_Test_SOURCES = Task_Ex_Test.cpp Task_Ex_Test.h
+## Makefile.SOCK_SEQPACK_SCTP_Test.am 
+noinst_PROGRAMS += SOCK_SEQPACK_SCTP_Test
 
-Thread_Manager_Test_SOURCES = Thread_Manager_Test.cpp
+SOCK_SEQPACK_SCTP_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Thread_Mutex_Test_SOURCES = Thread_Mutex_Test.cpp
+SOCK_SEQPACK_SCTP_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SOCK_SEQPACK_SCTP_Test.cpp
 
-Thread_Pool_Reactor_Test_SOURCES = \
-  Thread_Pool_Reactor_Test.cpp \
-  Thread_Pool_Reactor_Test.h
+SOCK_SEQPACK_SCTP_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.SOCK_Send_Recv_Test.am 
+noinst_PROGRAMS += SOCK_Send_Recv_Test
+
+SOCK_Send_Recv_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+SOCK_Send_Recv_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SOCK_Send_Recv_Test.cpp
+
+SOCK_Send_Recv_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.SOCK_Send_Recv_Test_IPV6.am 
+noinst_PROGRAMS += SOCK_Send_Recv_Test_IPV6
+
+SOCK_Send_Recv_Test_IPV6_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+SOCK_Send_Recv_Test_IPV6_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SOCK_Send_Recv_Test_IPV6.cpp
+
+SOCK_Send_Recv_Test_IPV6_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.SOCK_Test.am 
+noinst_PROGRAMS += SOCK_Test
+
+SOCK_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+SOCK_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SOCK_Test.cpp
+
+SOCK_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.SOCK_Test_IPv6.am 
+noinst_PROGRAMS += SOCK_Test_IPv6
+
+SOCK_Test_IPv6_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+SOCK_Test_IPv6_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SOCK_Test_IPv6.cpp
+
+SOCK_Test_IPv6_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.SPIPE_Test.am 
+noinst_PROGRAMS += SPIPE_Test
+
+SPIPE_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+SPIPE_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SPIPE_Test.cpp
+
+SPIPE_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.SString_Test.am 
+noinst_PROGRAMS += SString_Test
+
+SString_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+SString_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SString_Test.cpp
+
+SString_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.SV_Shared_Memory_Test.am 
+noinst_PROGRAMS += SV_Shared_Memory_Test
+
+SV_Shared_Memory_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+SV_Shared_Memory_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  SV_Shared_Memory_Test.cpp
+
+SV_Shared_Memory_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Semaphore_Test.am 
+noinst_PROGRAMS += Semaphore_Test
+
+Semaphore_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Semaphore_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Semaphore_Test.cpp
+
+Semaphore_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Service_Config_DLL.am 
+
+noinst_LTLIBRARIES += libService_Config_DLL.la
+
+libService_Config_DLL_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -DSERVICE_CONFIG_DLL_BUILD_DLL
+
+libService_Config_DLL_la_SOURCES = \
+  Service_Config_DLL.cpp
+
+libService_Config_DLL_la_LDFLAGS = \
+ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ 
+
+libService_Config_DLL_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
+
+noinst_HEADERS += \
+  Service_Config_DLL.h \
+  Service_Config_DLL_Export.h
+
+## Makefile.Service_Config_Test.am 
+noinst_PROGRAMS += Service_Config_Test
+
+Service_Config_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Service_Config_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Service_Config_Test.cpp
+
+Service_Config_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Signal_Test.am 
+noinst_PROGRAMS += Signal_Test
+
+Signal_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Signal_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Signal_Test.cpp
+
+Signal_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Sigset_Ops_Test.am 
+noinst_PROGRAMS += Sigset_Ops_Test
+
+Sigset_Ops_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Sigset_Ops_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Sigset_Ops_Test.cpp
+
+Sigset_Ops_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Simple_Message_Block_Test.am 
+noinst_PROGRAMS += Simple_Message_Block_Test
+
+Simple_Message_Block_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Simple_Message_Block_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Simple_Message_Block_Test.cpp
+
+Simple_Message_Block_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Svc_Handler_Test.am 
+noinst_PROGRAMS += Svc_Handler_Test
+
+Svc_Handler_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Svc_Handler_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Svc_Handler_Test.cpp
+
+Svc_Handler_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.TP_Reactor_Test.am 
+noinst_PROGRAMS += TP_Reactor_Test
+
+TP_Reactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+TP_Reactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  TP_Reactor_Test.cpp \
+  TP_Reactor_Test.h
+
+TP_Reactor_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.TSS_Static_Test.am 
+noinst_PROGRAMS += TSS_Static_Test
+
+TSS_Static_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+TSS_Static_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  TSS_Static_Test.cpp
+
+TSS_Static_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.TSS_Test.am 
+noinst_PROGRAMS += TSS_Test
+
+TSS_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+TSS_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  TSS_Test.cpp
+
+TSS_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Task_Ex_Test.am 
+noinst_PROGRAMS += Task_Ex_Test
+
+Task_Ex_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Task_Ex_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Task_Ex_Test.cpp \
+  Task_Ex_Test.h
+
+Task_Ex_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Task_Test.am 
+noinst_PROGRAMS += Task_Test
+
+Task_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Task_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Task_Test.cpp
+
+Task_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Thread_Manager_Test.am 
+noinst_PROGRAMS += Thread_Manager_Test
+
+Thread_Manager_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Thread_Manager_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Thread_Manager_Test.cpp
+
+Thread_Manager_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Thread_Mutex_Test.am 
+noinst_PROGRAMS += Thread_Mutex_Test
+
+Thread_Mutex_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Thread_Mutex_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Thread_Mutex_Test.cpp
+
+Thread_Mutex_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Thread_Pool_Reactor_Resume_Test.am 
+
+if BUILD_ACE_OTHER
+noinst_PROGRAMS += Thread_Pool_Reactor_Resume_Test
+
+Thread_Pool_Reactor_Resume_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
 Thread_Pool_Reactor_Resume_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
   Thread_Pool_Reactor_Resume_Test.cpp \
   Thread_Pool_Reactor_Resume_Test.h
 
-Thread_Pool_Test_SOURCES = Thread_Pool_Test.cpp
+Thread_Pool_Reactor_Resume_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACE_OTHER
+
+## Makefile.Thread_Pool_Reactor_Test.am 
+
+if BUILD_ACE_OTHER
+noinst_PROGRAMS += Thread_Pool_Reactor_Test
+
+Thread_Pool_Reactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Thread_Pool_Reactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Thread_Pool_Reactor_Test.cpp \
+  Thread_Pool_Reactor_Test.h
+
+Thread_Pool_Reactor_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACE_OTHER
+
+## Makefile.Thread_Pool_Test.am 
+noinst_PROGRAMS += Thread_Pool_Test
+
+Thread_Pool_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Thread_Pool_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Thread_Pool_Test.cpp
+
+Thread_Pool_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Time_Service_Test.am 
+noinst_PROGRAMS += Time_Service_Test
+
+Time_Service_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Time_Service_Test_SOURCES = Time_Service_Test.cpp
+Time_Service_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Time_Service_Test.cpp
 
-Time_Value_Test_SOURCES = Time_Value_Test.cpp
+Time_Service_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-Timeprobe_Test_SOURCES = Timeprobe_Test.cpp
+## Makefile.Time_Value_Test.am 
+noinst_PROGRAMS += Time_Value_Test
 
-Timer_Cancellation_Test_SOURCES = Timer_Cancellation_Test.cpp
+Time_Value_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Time_Value_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Time_Value_Test.cpp
+
+Time_Value_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Timeprobe_Test.am 
+noinst_PROGRAMS += Timeprobe_Test
+
+Timeprobe_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Timeprobe_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Timeprobe_Test.cpp
+
+Timeprobe_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Timer_Cancellation_Test.am 
+noinst_PROGRAMS += Timer_Cancellation_Test
+
+Timer_Cancellation_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Timer_Cancellation_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Timer_Cancellation_Test.cpp
+
+Timer_Cancellation_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Timer_Queue_Reference_Counting_Test.am 
+noinst_PROGRAMS += Timer_Queue_Reference_Counting_Test
+
+Timer_Queue_Reference_Counting_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
 Timer_Queue_Reference_Counting_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
   Timer_Queue_Reference_Counting_Test.cpp
 
-Timer_Queue_Test_SOURCES = Timer_Queue_Test.cpp
+Timer_Queue_Reference_Counting_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Timer_Queue_Test.am 
+noinst_PROGRAMS += Timer_Queue_Test
+
+Timer_Queue_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Timer_Queue_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Timer_Queue_Test.cpp
+
+Timer_Queue_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-TkReactor_Test_SOURCES = TkReactor_Test.cpp
+## Makefile.TkReactor_Test.am 
 
-Token_Strategy_Test_SOURCES = Token_Strategy_Test.cpp
+if BUILD_ACE_TKREACTOR
+if BUILD_TK
 
-Tokens_Test_SOURCES = Tokens_Test.cpp
+noinst_PROGRAMS += TkReactor_Test
 
-UPIPE_SAP_Test_SOURCES = UPIPE_SAP_Test.cpp
+TkReactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-Upgradable_RW_Test_SOURCES = Upgradable_RW_Test.cpp \
-                             Upgradable_RW_Test.h
+TkReactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  TkReactor_Test.cpp
 
-Unbounded_Set_Test_Ex_SOURCES = \
-  Unbounded_Set_Test_Ex.cpp \
-  Unbounded_Set_Test_Ex.h
+TkReactor_Test_LDADD = \
+ $(top_builddir)/ace/libACE_TkReactor.la libTest_Output.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_TK
+endif BUILD_ACE_TKREACTOR
+
+## Makefile.Token_Strategy_Test.am 
+noinst_PROGRAMS += Token_Strategy_Test
+
+Token_Strategy_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Token_Strategy_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Token_Strategy_Test.cpp
+
+Token_Strategy_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Tokens_Test.am 
+
+if BUILD_ACE_TOKEN
+noinst_PROGRAMS += Tokens_Test
+
+Tokens_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Tokens_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Tokens_Test.cpp
+
+Tokens_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACE_TOKEN
+
+## Makefile.UPIPE_SAP_Test.am 
+noinst_PROGRAMS += UPIPE_SAP_Test
+
+UPIPE_SAP_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+UPIPE_SAP_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  UPIPE_SAP_Test.cpp
+
+UPIPE_SAP_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.UUIDTest.am 
+
+if BUILD_ACE_UUID
+noinst_PROGRAMS += UUIDTest
+
+UUIDTest_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
 UUIDTest_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
   UUIDTest.cpp
 
-Vector_Test_SOURCES = Vector_Test.cpp
-
-WFMO_Reactor_Test_SOURCES = WFMO_Reactor_Test.cpp
-
-XtReactor_Test_SOURCES = XtReactor_Test.cpp
-XtReactor_Test_LDADD = $(top_builddir)/ace/libACE.la @XTREACTOR_TEST_XLIBS@
-
-## Source for conditionally built IPv6 tests.
-if BUILD_IPV6
-INET_Addr_Test_IPV6_SOURCES = INET_Addr_Test_IPV6.cpp
-Max_Default_Port_Test_IPV6_SOURCES = Max_Default_Port_Test_IPV6.cpp
-Multicast_Test_IPV6_SOURCES = Multicast_Test_IPV6.cpp
-Multihomed_INET_Addr_Test_IPV6_SOURCES = Multihomed_INET_Addr_Test_IPV6.cpp
-Proactor_Test_IPV6_SOURCES = Proactor_Test_IPV6.cpp
-SOCK_Send_Recv_Test_IPV6_SOURCES = SOCK_Send_Recv_Test_IPV6.cpp
-SOCK_Test_IPv6_SOURCES = SOCK_Test_IPv6.cpp
-endif
-
-
-
-## Additional test header files
-noinst_HEADERS = test_config.h
-
-## Architecture independent data files
-noinst_DATA = \
-  run_test.lst \
-  \
-  Config_Test.ini \
-  Config_Test_Import_1.ini \
-  \
-  TkReactor_Test.tcl \
-  \
-  Service_Config_Test.UTF-16.conf \
-  Service_Config_Test.conf \
-  UNIXserver.conf \
-  UNIXclerk.conf \
-  UNIXtokens.conf \
-  Win32server.conf \
-  Win32clerk.conf \
-  Win32tokens.conf
-
-
-## The tests we want to run are all of the test programs we are going to build.
-## Do not run them if they are cross-compiled.
-if ACE_CROSS_COMPILED
-TESTS =
-else
-##TESTS = $(check_PROGRAMS)
-TESTS = $(noinst_PROGRAMS)
-endif
+UUIDTest_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+endif BUILD_ACE_UUID
+
+## Makefile.Unbounded_Set_Test.am 
+noinst_PROGRAMS += Unbounded_Set_Test
+
+Unbounded_Set_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Unbounded_Set_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Unbounded_Set_Test.cpp
+
+Unbounded_Set_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Upgradable_RW_Test.am 
+noinst_PROGRAMS += Upgradable_RW_Test
+
+Upgradable_RW_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Upgradable_RW_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Upgradable_RW_Test.cpp \
+  Upgradable_RW_Test.h
+
+Upgradable_RW_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
+
+## Makefile.Vector_Test.am 
+noinst_PROGRAMS += Vector_Test
+
+Vector_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Vector_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Vector_Test.cpp
+
+Vector_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
-## Set up the test environment
-##TESTS_ENVIRONMENT =
+## Makefile.WFMO_Reactor_Test.am 
+noinst_PROGRAMS += WFMO_Reactor_Test
 
-EXTRA_DIST = Main.cpp $(noinst_SCRIPTS) $(noinst_DATA)
+WFMO_Reactor_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
 
-##DISTCLEANFILES = \
-##  ace_pipe_name pattern \
-##  $(tmp)/ace_temp_file* \
-##  $(tmp)/ace_test_file \
-##  $(tmp)/Naming_Test*
+WFMO_Reactor_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  WFMO_Reactor_Test.cpp
 
-## Automake recognized target.  Appends these rules to the "all"
-## target.
-all-local:
-	for p in $(noinst_SCRIPTS) $(noinst_DATA); do \
-	  test -f $$p \
-	  || $(LN_S) $(srcdir)/$$p $$p; done
-	touch tests-link-stamp
+WFMO_Reactor_Test_LDADD = \
+ libTest_Output.la $(top_builddir)/ace/libACE.la
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core core.*
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
 	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf Templates.DB gcctemp.c gcctemp so_locations *.ics
-	-rm -rf templateregistry SunWS_cache ir.out
-
-## Clean up files and directories created by this Makefile.
-distclean-local:
-	-test -f tests-link-stamp \
-	   && rm $(noinst_SCRIPTS) $(noinst_DATA) tests-link-stamp
-	-rm -rf log
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp
index 755bf7964e5..45496fbb496 100644
--- a/tests/Malloc_Test.cpp
+++ b/tests/Malloc_Test.cpp
@@ -30,7 +30,7 @@
 
 ACE_RCSID(tests, Malloc_Test, "Malloc_Test.cpp,v 4.22 1999/12/13 22:24:42 nanbor Exp")
 
-#if !defined (__Lynx__) && defined (ACE_HAS_PROCESS_SPAWN)
+#if defined (ACE_HAS_PROCESS_SPAWN)
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 typedef ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> MALLOC;
@@ -301,8 +301,7 @@ child (void)
     }
 
   print ("child",
-         ACE_reinterpret_cast (Test_Data *,
-                               bar));
+         reinterpret_cast<Test_Data *> (bar));
   return 0;
 }
 
@@ -461,4 +460,4 @@ run_main (int, ACE_TCHAR *[])
   ACE_END_TEST;
   return 0;
 }
-#endif /* ! __Lynx__  &&  ACE_HAS_PROCESS_SPAWN */
+#endif /* ACE_HAS_PROCESS_SPAWN */
diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp
index 66eed2714a0..e98b91b66fa 100644
--- a/tests/Map_Manager_Test.cpp
+++ b/tests/Map_Manager_Test.cpp
@@ -873,12 +873,10 @@ run_test (void (*ptf) (size_t, size_t, int),
 
   if (test_iterators)
     test_iterators_string =
-      ACE_const_cast (ACE_TCHAR*,
-                      ACE_TEXT ( "includes executing iterators"));
+      const_cast<ACE_TCHAR*> (ACE_TEXT ( "includes executing iterators"));
   else
     test_iterators_string =
-      ACE_const_cast (ACE_TCHAR*,
-                      ACE_TEXT ("doesn't include executing iterators"));
+      const_cast<ACE_TCHAR*> (ACE_TEXT ("doesn't include executing iterators"));
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("time to test a map of size %d for %d iterations using %s (%s)\n"),
diff --git a/tests/Max_Default_Port_Test.cpp b/tests/Max_Default_Port_Test.cpp
index 9849e8b3f98..974ae5bcd4e 100644
--- a/tests/Max_Default_Port_Test.cpp
+++ b/tests/Max_Default_Port_Test.cpp
@@ -101,8 +101,7 @@ long max_connected_port = 0;
 static void *
 client (void *arg)
 {
-  ACE_INET_Addr *remote_addr = ACE_reinterpret_cast (ACE_INET_Addr *,
-                                                     arg);
+  ACE_INET_Addr *remote_addr = reinterpret_cast<ACE_INET_Addr *> (arg);
 
   ACE_INET_Addr server_addr (remote_addr->get_port_number (),
                              ACE_LOCALHOST,
@@ -178,7 +177,7 @@ run_main (int argc, ACE_TCHAR *argv[])
       if (ACE_Thread_Manager::instance ()->spawn_n
           (1,
            ACE_THR_FUNC (client),
-           ACE_reinterpret_cast (void *, &addr),
+           reinterpret_cast <void *> (&addr),
            THR_NEW_LWP | THR_DETACHED) == -1)
 
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/tests/Max_Default_Port_Test_IPV6.cpp b/tests/Max_Default_Port_Test_IPV6.cpp
index 965d0b6b891..bc0e9809ee0 100644
--- a/tests/Max_Default_Port_Test_IPV6.cpp
+++ b/tests/Max_Default_Port_Test_IPV6.cpp
@@ -98,8 +98,7 @@ long max_connected_port = 0;
 static void *
 client (void *arg)
 {
-  ACE_INET_Addr *remote_addr = ACE_reinterpret_cast (ACE_INET_Addr *,
-                                                     arg);
+  ACE_INET_Addr *remote_addr = reinterpret_cast<ACE_INET_Addr *> (arg);
 
   ACE_INET_Addr server_addr (remote_addr->get_port_number (),
                              "::1");
@@ -176,7 +175,7 @@ run_main (int argc, ACE_TCHAR *argv[])
       if (ACE_Thread_Manager::instance ()->spawn_n
           (1,
            ACE_THR_FUNC (client),
-           ACE_reinterpret_cast (void *, &addr),
+           reinterpret_cast<void *> (&addr),
            THR_NEW_LWP | THR_DETACHED) == -1)
 
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp
index 041be42bcca..064ca1a03ec 100644
--- a/tests/Message_Block_Test.cpp
+++ b/tests/Message_Block_Test.cpp
@@ -268,7 +268,7 @@ struct
   ACE_Profile_Timer::ACE_Elapsed_Time et_;
 } alloc_struct[ACE_ALLOC_STRATEGY_NO] =
 {
-  { NULL, ACE_TEXT ("Default"), {0,0,0} },
+  { 0, ACE_TEXT ("Default"), {0,0,0} },
   { &mem_allocator, ACE_TEXT ("Cached Memory"), {0,0,0} }
 };
 
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index af5f2faf0e6..01884fff603 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -91,7 +91,8 @@ iterator_test (void)
   // default of 16 Kb (defined by ACE_Message_Queue_Base::DEFAULT_HWM),
   // so that the test runs on machines with 8Kb pagesizes.
 #if !defined(_UNICOS)
-  QUEUE queue (32 * 1024 * sizeof (ACE_TCHAR));
+  //  QUEUE queue (32 * 1024 * sizeof (ACE_TCHAR));
+  QUEUE queue (sizeof(buffer));
 #else
   // this works on the Cray, where BUFSIZ is defined as 32Kb
   QUEUE queue (ITERATIONS * BUFSIZ - 1);
@@ -300,8 +301,7 @@ static void *
 receiver (void *arg)
 {
   Queue_Wrapper *queue_wrapper =
-    ACE_reinterpret_cast (Queue_Wrapper *,
-                          arg);
+    reinterpret_cast<Queue_Wrapper *> (arg);
   int i;
 
   ACE_Message_Block **receive_block_p = 0;
@@ -348,7 +348,7 @@ static void *
 sender (void *arg)
 {
   Queue_Wrapper *queue_wrapper =
-    ACE_reinterpret_cast (Queue_Wrapper *, arg);
+    reinterpret_cast<Queue_Wrapper *> (arg);
   int i;
 
   timer->start ();
diff --git a/tests/Message_Queue_Test_Ex.cpp b/tests/Message_Queue_Test_Ex.cpp
index 20cc2159b9a..c7f7e6320ff 100644
--- a/tests/Message_Queue_Test_Ex.cpp
+++ b/tests/Message_Queue_Test_Ex.cpp
@@ -153,8 +153,7 @@ static void *
 receiver (void *arg)
 {
   Queue_Wrapper *queue_wrapper =
-    ACE_reinterpret_cast (Queue_Wrapper *,
-                          arg);
+    reinterpret_cast<Queue_Wrapper *> (arg);
   int i;
 
   User_Class **receive_block_p = 0;
@@ -162,25 +161,6 @@ receiver (void *arg)
                   User_Class *[max_messages],
                   (void *) -1);
 
-#if defined (VXWORKS)
-  // Set up blocks to receive the messages.  Allocate these off the
-  // heap in case messages is large relative to the amount of stack
-  // space available.
-  User_Class *receive_block;
-  ACE_NEW_RETURN (receive_block,
-                  User_Class[max_messages],
-                  (void *) -1);
-
-  for (i = 0; i < max_messages; ++i)
-    {
-      receive_block[i].init (MAX_MESSAGE_SIZE);
-
-      // For VxWorks Message Queues, the receive block pointer must be
-      // assigned.  It will be used by <dequeue_head>.
-      receive_block_p[i] = &receive_block[i];
-    }
-#endif /* VXWORKS */
-
   for (i = 0; i < max_messages; ++i)
     if (queue_wrapper->q_->dequeue_head (receive_block_p[i]) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -190,9 +170,6 @@ receiver (void *arg)
   timer->stop ();
 
   delete [] receive_block_p;
-#if defined (VXWORKS)
-  delete [] receive_block;
-#endif /* VXWORKS */
 
   return 0;
 }
@@ -201,7 +178,7 @@ static void *
 sender (void *arg)
 {
   Queue_Wrapper *queue_wrapper =
-    ACE_reinterpret_cast (Queue_Wrapper *, arg);
+    reinterpret_cast<Queue_Wrapper *> (arg);
   int i;
 
   timer->start ();
@@ -322,8 +299,6 @@ run_main (int argc, ACE_TCHAR *argv[])
     }
   }
 
-#if !defined (VXWORKS)
-#endif /* ! VXWORKS */
   ACE_NEW_RETURN (timer,
                   ACE_High_Res_Timer,
                   -1);
diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp
index f132ff9efdf..27d938d557a 100644
--- a/tests/Multicast_Test.cpp
+++ b/tests/Multicast_Test.cpp
@@ -121,7 +121,7 @@ public:
   int wait (void) const { return this->wait_;}
   ACE_SOCK_Dgram_Mcast::options options (void) const
   {
-    return ACE_static_cast (ACE_SOCK_Dgram_Mcast::options, this->sdm_opts_);
+    return static_cast<ACE_SOCK_Dgram_Mcast::options> (this->sdm_opts_);
   }
 
 private:
@@ -482,6 +482,7 @@ MCT_Event_Handler::~MCT_Event_Handler (void)
       delete this->address_vec_[i];
       this->address_vec_[i] = 0;
     }
+  mcast_.close ();
 }
 
 
@@ -511,7 +512,7 @@ MCT_Event_Handler::find (const char *buf)
       local += this->address_vec_[i]->c_str ();
       local += "\n";
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s not in:\n%s"),
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%C not in:\n%C"),
               buf, local.c_str ()));
 
   return -1;
@@ -757,7 +758,7 @@ int producer (MCT_Config &config)
   int retval = 0;
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("Starting producer...\n")));
-  ACE_SOCK_Dgram socket (ACE_sap_any_cast (ACE_INET_Addr &));
+  ACE_SOCK_Dgram socket (ACE_sap_any_cast (ACE_INET_Addr &), PF_INET);
 
   // Note that is is IPv4 specific and needs to be changed once
   //
@@ -794,6 +795,7 @@ int producer (MCT_Config &config)
       // Give the task thread a chance to run.
       ACE_Thread::yield ();
     }
+  socket.close ();
   return retval;
 }
 
@@ -901,6 +903,12 @@ run_main (int argc, ACE_TCHAR *argv[])
                                 ? &wait_time : 0;
       if (ACE_Thread_Manager::instance ()->wait (ptime) == -1)
         {
+          // We will no longer wait for this thread, so we must
+          // force it to exit otherwise the thread will be referencing
+          // deleted memory.
+          finished = 1;
+          reactor->end_reactor_event_loop ();
+
           if (errno == ETIME)
             ACE_ERROR ((LM_ERROR,
                         ACE_TEXT ("maximum wait time of %d msec exceeded\n"),
@@ -929,14 +937,14 @@ template class ACE_Array<ACE_String_Base<char> *>;
 
 #else
 int
-run_main (int, ACE_TCHAR *argv[])
+run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Multicast_Test"));
 
   ACE_ERROR ((LM_INFO,
-              ACE_TEXT ("%s must be run on a platform ")
-              ACE_TEXT ("that support IP multicast.\n"),
-              argv[0]));
+              ACE_TEXT ("This test must be run on a platform ")
+              ACE_TEXT ("that support IP multicast.\n")));
+
   ACE_END_TEST;
   return 1;
 }
diff --git a/tests/Multicast_Test_IPV6.cpp b/tests/Multicast_Test_IPV6.cpp
index 38223648d86..aa450519131 100644
--- a/tests/Multicast_Test_IPV6.cpp
+++ b/tests/Multicast_Test_IPV6.cpp
@@ -123,7 +123,7 @@ public:
   int wait (void) const { return this->wait_;}
   ACE_SOCK_Dgram_Mcast::options options (void) const
   {
-    return ACE_static_cast (ACE_SOCK_Dgram_Mcast::options, this->sdm_opts_);
+    return static_cast<ACE_SOCK_Dgram_Mcast::options> (this->sdm_opts_);
   }
 
   int set_group (int port, const char *group);
@@ -872,10 +872,8 @@ int advance_addr (ACE_INET_Addr &addr)
 #if defined (__linux__) && defined (ACE_HAS_IPV6)
   else  // assume AF_INET6
     {
-      sockaddr_in6 *saddr = ACE_reinterpret_cast (sockaddr_in6 *,
-                                                  addr.get_addr ());
-      unsigned char *sin6_addr = ACE_reinterpret_cast (unsigned char *,
-                                                       &saddr->sin6_addr);
+      sockaddr_in6 *saddr = reinterpret_cast<sockaddr_in6 *> (addr.get_addr ());
+      unsigned char *sin6_addr = reinterpret_cast<unsigned char *> (&saddr->sin6_addr);
       int i = 15;
 
       // i >= 2 is used here so that the flags and scope for the
@@ -998,15 +996,16 @@ template class ACE_Array<ACE_String_Base<char> *>;
 
 #else
 int
-run_main (int, ACE_TCHAR *argv[])
+run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Multicast_Test_IPV6"));
 
   ACE_ERROR ((LM_INFO,
-              ACE_TEXT ("%s must be run on a platform ")
-              ACE_TEXT ("that support IP multicast.\n"),
-              argv[0]));
+              ACE_TEXT ("This test must be run on a platform ")
+              ACE_TEXT ("that support IP multicast and threads.\n")));
+
   ACE_END_TEST;
-  return 1;
+
+  return 0;
 }
 #endif /* ACE_HAS_IP_MULTICAST && ACE_HAS_THREADS */
diff --git a/tests/NonBlocking_Conn_Test.cpp b/tests/NonBlocking_Conn_Test.cpp
index 4d240a150a7..42ed8adc1e1 100644
--- a/tests/NonBlocking_Conn_Test.cpp
+++ b/tests/NonBlocking_Conn_Test.cpp
@@ -157,14 +157,18 @@ test_connect (ACE_Reactor &reactor,
 void
 test (ACE_Reactor_Impl *impl)
 {
-  number_of_connections = sizeof hosts / sizeof (char *);
-
+  size_t nr_names = sizeof hosts / sizeof (char *);
   ACE_INET_Addr *addresses =
-    new ACE_INET_Addr[number_of_connections];
+    new ACE_INET_Addr[nr_names];
 
-  for (int i = 0; i < number_of_connections; ++i)
+  for (size_t i = 0, number_of_connections = 0; i < nr_names; ++i)
     {
-      addresses[i] = ACE_INET_Addr (hosts[i]);
+      if (addresses[number_of_connections].set (hosts[i]) == 0)
+        ++number_of_connections;
+      else
+        ACE_DEBUG ((LM_INFO,
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT_CHAR_TO_TCHAR (hosts[i])));
     }
 
   ACE_Reactor reactor (impl,
diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp
index 0da04d67a24..9c4bfe4ae39 100644
--- a/tests/Notify_Performance_Test.cpp
+++ b/tests/Notify_Performance_Test.cpp
@@ -26,6 +26,7 @@
 #include "ace/Reactor.h"
 #include "ace/WFMO_Reactor.h"
 #include "ace/Select_Reactor.h"
+#include "ace/Dev_Poll_Reactor.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Atomic_Op.h"
 
@@ -45,6 +46,9 @@ static int opt_wfmo_reactor = 0;
 // Use the Select_Reactor
 static int opt_select_reactor = 0;
 
+// Use the Dev_Poll_Reactor
+static int opt_dev_poll_reactor = 0;
+
 // Pass data through the notify call
 static int opt_pass_notify_data = 0;
 
@@ -106,6 +110,12 @@ create_reactor (void)
     {
       ACE_NEW (impl, ACE_Select_Reactor);
     }
+  else if (opt_dev_poll_reactor)
+    {
+#if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
+      ACE_NEW (impl, ACE_Dev_Poll_Reactor);
+#endif /* ACE_HAS_EVENT_POLL || ACE_HAS_DEV_POLL */
+    }
   ACE_Reactor *reactor = 0;
   ACE_NEW (reactor, ACE_Reactor (impl));
   ACE_Reactor::instance (reactor);
@@ -119,6 +129,8 @@ print_results (ACE_Profile_Timer::ACE_Elapsed_Time &et)
     reactor_type = ACE_TEXT ("WFMO_Reactor");
   else if (opt_select_reactor)
     reactor_type = ACE_TEXT ("Select_Reactor");
+  else if (opt_dev_poll_reactor)
+    reactor_type = ACE_TEXT ("Dev_Poll_Reactor");
   else
     reactor_type = ACE_TEXT ("Platform's default Reactor");
 
@@ -154,11 +166,14 @@ run_main (int argc, ACE_TCHAR *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Notify_Performance_Test"));
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("swdc:l:"));
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("pswdc:l:"));
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
       {
+      case 'p':
+        opt_dev_poll_reactor = 1;
+        break;
       case 's':
         opt_select_reactor = 1;
         break;
@@ -185,7 +200,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   // If we are using other that the default implementation, we must
   // clean up.
-  if (opt_select_reactor || opt_wfmo_reactor)
+  if (opt_select_reactor || opt_wfmo_reactor || opt_dev_poll_reactor)
     {
       auto_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
       impl = auto_impl;
diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp
index 9b26a1b34a2..e5f089e1ed1 100644
--- a/tests/OS_Test.cpp
+++ b/tests/OS_Test.cpp
@@ -53,7 +53,9 @@ access_test (void)
 int
 rename_test (void)
 {
-#if defined (ACE_LACKS_RENAME)
+#if defined (ACE_LACKS_RENAME) || defined (ACE_VXWORKS)
+  // On VxWorks only some filesystem drivers support rename
+  // and as we do not know which is used, skip the test here
   ACE_ERROR_RETURN ((LM_INFO,
                      ACE_TEXT ("rename not supported on this platform\n")),
                     0);
@@ -172,7 +174,7 @@ string_emulation_test (void)
 
     const char *memchr1 = "abcdefghijklmnopqrstuvwxyz";
 
-    ACE_ASSERT (ACE_OS::memchr (ACE_static_cast (const void *, NULL),
+    ACE_ASSERT (ACE_OS::memchr (static_cast<const void *> (NULL),
                                 'a',
                                 0) == NULL);
     ACE_ASSERT (ACE_OS::memchr (memchr1, 'a', sizeof (memchr1)) != NULL);
@@ -743,8 +745,8 @@ string_convert_test (void)
   int result = 0;
   const char *test1_n = "abcdefg";
   const wchar_t *test1_w = ACE_TEXT_WIDE ("abcdefg");
-  const char *test2_n = "éèàùê";
-  const wchar_t *test2_w = ACE_TEXT_WIDE ("éèàùê");
+  const char *test2_n = "\xe9\xe8\xe0\xf9\xea";
+  const wchar_t *test2_w = ACE_TEXT_WIDE ("\xe9\xe8\xe0\xf9\xea");
   wchar_t str_w[10];
   char str_n[10];
   ACE_OS::strcpy (str_w, ACE_Ascii_To_Wide (test1_n).wchar_rep ());
diff --git a/tests/Object_Manager_Test.cpp b/tests/Object_Manager_Test.cpp
index 2031f982bbe..d89cc47e558 100644
--- a/tests/Object_Manager_Test.cpp
+++ b/tests/Object_Manager_Test.cpp
@@ -36,7 +36,7 @@ extern "C"
 void
 hook2 (void * /* object */, void *param)
 {
-  u_int *paramp = ACE_reinterpret_cast (u_int *, param);
+  u_int *paramp = reinterpret_cast<u_int *> (param);
 
   // We can use ACE_Log_Msg in an ACE_Object_Manager cleanup hook.
   // But NOT in an ACE_OS::atexit () hook!  However, the ACE_END_TEST
diff --git a/tests/Priority_Buffer_Test.cpp b/tests/Priority_Buffer_Test.cpp
index 7dfedbc49b8..dbb9b27046c 100644
--- a/tests/Priority_Buffer_Test.cpp
+++ b/tests/Priority_Buffer_Test.cpp
@@ -45,8 +45,7 @@ static void *
 consumer (void *args)
 {
   ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue =
-    ACE_reinterpret_cast (ACE_Message_Queue<ACE_MT_SYNCH> *,
-                          args);
+    reinterpret_cast<ACE_Message_Queue<ACE_MT_SYNCH> *> (args);
 
   u_long cur_priority = 27;
   ACE_UNUSED_ARG (cur_priority);
@@ -103,8 +102,7 @@ static void *
 producer (void *args)
 {
   ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue =
-    ACE_reinterpret_cast (ACE_Message_Queue<ACE_MT_SYNCH> *,
-                          args);
+    reinterpret_cast<ACE_Message_Queue<ACE_MT_SYNCH> *> (args);
 
   ACE_Message_Block *mb;
 
diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp
index 36514b4208a..62b0c5ae5f4 100644
--- a/tests/Priority_Reactor_Test.cpp
+++ b/tests/Priority_Reactor_Test.cpp
@@ -43,12 +43,7 @@ static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
 
 // The number of children to run, it can be changed using the -c
 // option.
-static int opt_nchildren =
-#if defined (__Lynx__)
-  5;
-#else  /* ! __Lynx__ */
- 10;
-#endif /* ! __Lynx__ */
+static int opt_nchildren = 10;
 
 // The number of loops per children, it can be changed using the -l
 // option.
@@ -187,7 +182,7 @@ static void *
 client (void *arg)
 {
   ACE_INET_Addr *connection_addr =
-    ACE_reinterpret_cast (ACE_INET_Addr *, arg);
+    reinterpret_cast<ACE_INET_Addr *> (arg);
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) running client\n")));
   CONNECTOR connector;
diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp
index 19b58828ad4..3c4cf5c7bd6 100644
--- a/tests/Priority_Task_Test.cpp
+++ b/tests/Priority_Task_Test.cpp
@@ -113,7 +113,7 @@ Priority_Task::open (void *arg)
         {
 #if !defined (ACE_HAS_WINCE)
           if (ACE_OS::last_error () == EPERM)
-            ACE_ERROR_RETURN ((LM_ERROR,
+            ACE_ERROR_RETURN ((LM_INFO,
                                ACE_TEXT ("Insufficient privilege to run this test.\n")),
                               -1);
           else
diff --git a/tests/Proactor_Scatter_Gather_Test.cpp b/tests/Proactor_Scatter_Gather_Test.cpp
index de281142de2..03271b59f8e 100644
--- a/tests/Proactor_Scatter_Gather_Test.cpp
+++ b/tests/Proactor_Scatter_Gather_Test.cpp
@@ -91,7 +91,7 @@ static int allocate_chunks_chain (ACE_Message_Block *&head_mb,
 #endif /* ACE_WIN32 */
       if (addr)
         {
-          ACE_Message_Block *mb = new ACE_Message_Block (ACE_static_cast (char *, addr),
+          ACE_Message_Block *mb = new ACE_Message_Block (static_cast<char *> (addr),
                                                          chunk_size);
           if (!head_mb)
             head_mb = mb;
@@ -830,7 +830,7 @@ Writer::initiate_write_file (void)
   // pipelined writing (that is, mulitple calls to write before the callbacks
   // to handle_x)
   this->writing_file_offset_ +=
-    ACE_static_cast (u_long, increment_writing_file_offset);
+    static_cast<u_long> (increment_writing_file_offset);
   ++this->io_count_;
   return 0;
 }
@@ -846,7 +846,7 @@ Writer::handle_write_file (const ACE_Asynch_Write_File::Result &result)
               result.bytes_transferred ()));
 
   this->reported_file_offset_ +=
-    ACE_static_cast (u_long, result.bytes_transferred ());
+    static_cast<u_long> (result.bytes_transferred ());
 
   // Always truncate as required,
   // because partial will always be the last write to a file
@@ -856,7 +856,7 @@ Writer::handle_write_file (const ACE_Asynch_Write_File::Result &result)
   if (last_mb->space ())
     ACE_OS::truncate (output_file,
                       this->reported_file_offset_ -
-                        ACE_static_cast (u_long, last_mb->space ()));
+                        static_cast<u_long> (last_mb->space ()));
 
   free_chunks_chain (mb);
 
@@ -891,6 +891,10 @@ public:
   Connector (void);
   virtual ~Connector (void);
 
+  // Address to pass to Sender for secondary connect.
+  void set_address (const ACE_INET_Addr &addr);
+  const ACE_INET_Addr &get_address (void);
+
   void stop (void);
 
   // Virtual from ACE_Asynch_Connector
@@ -901,6 +905,7 @@ private:
   void on_delete_sender (Sender &rcvr);
 
   int sessions_;
+  ACE_INET_Addr addr_;
   Sender *list_senders_[SENDERS];
 };
 
@@ -964,6 +969,19 @@ Connector::~Connector (void)
   this->stop ();
 }
 
+// Address to pass to Sender for secondary connect.
+void
+Connector::set_address (const ACE_INET_Addr &addr)
+{
+  this->addr_ = addr;
+}
+
+const ACE_INET_Addr &
+Connector::get_address (void)
+{
+  return this->addr_;
+}
+
 void
 Connector::stop (void)
 {
@@ -1073,11 +1091,12 @@ Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
   this->socket_handle_[ODD] = handle;
 
   // Open the input file
-  if (ACE_INVALID_HANDLE == (this->input_file_handle_ = ACE_OS::open (input_file,
-                                                                      _O_RDONLY |\
-                                                                      FILE_FLAG_OVERLAPPED |\
-                                                                      FILE_FLAG_NO_BUFFERING,
-                                                                      ACE_DEFAULT_FILE_PERMS)))
+  if (ACE_INVALID_HANDLE == (this->input_file_handle_ =
+                               ACE_OS::open (input_file,
+                                             _O_RDONLY |\
+                                             FILE_FLAG_OVERLAPPED |\
+                                             FILE_FLAG_NO_BUFFERING,
+                                             ACE_DEFAULT_FILE_PERMS)))
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
@@ -1085,12 +1104,13 @@ Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
     }
   else
     {
-      // now connect (w/o the connector factory) to the even (=second) receiver:
-      // we don't connect thru the factory in order not to instantiate another Sender
+      // Now connect (w/o the connector factory) to the even (=second)
+      // receiver. We don't connect thru the factory in order not to
+      // instantiate another Sender.
       ACE_SOCK_Connector sock_connector;
       ACE_SOCK_Stream    sock_stream;
       if (-1 == sock_connector.connect (sock_stream,
-                                        ACE_INET_Addr (port, host)))
+                                        this->connector_->get_address ()))
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("%p\n"),
                     ACE_TEXT ("Sender::open::ACE_SOCK_Connector::connect")));
@@ -1133,7 +1153,7 @@ Sender::initiate_read_file (void)
   static const size_t file_size = ACE_OS::filesize (input_file);
 
   static const size_t number_of_chunks_needed_for_file =
-    ACE_static_cast (size_t, ACE_OS::ceil ((double) file_size / chunk_size));
+    static_cast<size_t> (ACE_OS::ceil ((double) file_size / chunk_size));
 
   size_t relevant_number_of_chunks =
     ACE_MIN ((size_t)ACE_IOV_MAX,
@@ -1238,7 +1258,7 @@ Sender::handle_read_file (const ACE_Asynch_Read_File::Result &result)
                   bytes_transferred,
                   chunks_chain_size));
 
-      this->file_offset_ += ACE_static_cast (u_long, bytes_transferred);
+      this->file_offset_ += static_cast<u_long> (bytes_transferred);
 
       this->initiate_write_stream (*mb);
 
@@ -1361,27 +1381,31 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   Acceptor  acceptor;
   Connector connector;
+  ACE_INET_Addr addr (port);
 
-  if (!server_only)
+  if (!client_only)
     {
-      if (-1 == connector.open (1, ACE_Proactor::instance ()))
+      // Simplify, initial read with zero size
+      if (-1 == acceptor.open (addr, 0, 1))
         {
           ACE_ASSERT (0);
           return -1;
         }
+    }
 
-      // connect to first destination
-      if (-1 == connector.connect (ACE_INET_Addr (port, host)))
+  if (!server_only)
+    {
+      if (-1 == connector.open (1, ACE_Proactor::instance ()))
         {
           ACE_ASSERT (0);
           return -1;
         }
-    }
 
-  if (!client_only)
-    {
-      // Simplify, initial read with zero size
-      if (-1 == acceptor.open (ACE_INET_Addr (port), 0, 1))
+      // connect to first destination
+      if (addr.set (port, host, 1, addr.get_type ()) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), host), -1);
+      connector.set_address (addr);
+      if (-1 == connector.connect (addr))
         {
           ACE_ASSERT (0);
           return -1;
diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp
index 9e1012cd594..9ec8cb123d8 100644
--- a/tests/Proactor_Test.cpp
+++ b/tests/Proactor_Test.cpp
@@ -47,6 +47,9 @@ ACE_RCSID (tests,
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/os_include/netinet/os_tcp.h"
 
+#include "ace/Atomic_Op.h"
+#include "ace/Synch_Traits.h"
+
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 
 #  include "ace/WIN32_Proactor.h"
@@ -76,10 +79,10 @@ static int both = 0;
 // Host that we're connecting to.
 static const ACE_TCHAR *host = 0;
 
-// number of Senders instances
-static int senders = 1;
-const  int MAX_SENDERS = 1000;
-const  int MAX_RECEIVERS = 1000;
+// number of Client instances
+static int clients = 1;
+const  int MAX_CLIENTS = 1000;
+const  int MAX_SERVERS = 1000;
 
 // duplex mode: == 0 half-duplex
 //              != 0 full duplex
@@ -94,7 +97,7 @@ static u_short port = ACE_DEFAULT_SERVER_PORT;
 // Log options
 static int loglevel;       // 0 full , 1 only errors
 
-static size_t xfer_limit;  // Number of bytes for Sender to send.
+static size_t xfer_limit;  // Number of bytes for Client to send.
 
 static char complete_message[] =
   "GET / HTTP/1.1\r\n"
@@ -356,149 +359,304 @@ MyTask::svc (void)
 }
 
 
-class Acceptor : public ACE_Asynch_Acceptor<Receiver>
+// TestData collects and reports on test-related transfer and connection
+// statistics.
+class TestData
 {
-  friend class Receiver;
 public:
-  int get_number_sessions (void) { return this->sessions_; }
-  size_t get_total_snd (void) { return this->total_snd_; }
-  size_t get_total_rcv (void) { return this->total_rcv_; }
-  long get_total_w   (void) { return this->total_w_; }
-  long get_total_r   (void) { return this->total_r_; }
+  TestData ();
+  bool testing_done (void);
+  Server *server_up (void);
+  Client *client_up (void);
+  void server_done (Server *s);
+  void client_done (Client *c);
+  void stop_all (void);
+  void report (void);
 
-  Acceptor (void);
-  virtual ~Acceptor (void);
+private:
+  struct Local_Stats
+  {
+    // Track number of sessions that report start, and those that report
+    // their end (and stats).
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> sessions_up_;
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> sessions_down_;
+
+    // Total read and write bytes for all sessions.
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, size_t> w_cnt_;
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, size_t> r_cnt_;
+    // Total read and write operations issues for all sessions.
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, size_t> w_ops_;
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, size_t> r_ops_;
+  } servers_, clients_;
+
+  ACE_SYNCH_MUTEX list_lock_;
+  Server *server_list_[MAX_SERVERS];
+  Client *client_list_[MAX_CLIENTS];
+};
 
-  void stop (void);
-  void cancel_all (void);
+TestData::TestData ()
+{
+  int i;
+  for (i = 0; i < MAX_SERVERS; ++i)
+    this->server_list_[i] = 0;
+  for (i = 0; i < MAX_CLIENTS; ++i)
+    this->client_list_[i] = 0;
+}
 
-  // Virtual from ACE_Asynch_Acceptor
-  Receiver *make_handler (void);
+bool
+TestData::testing_done (void)
+{
+  int svr_up = this->servers_.sessions_up_.value ();
+  int svr_dn = this->servers_.sessions_down_.value ();
+  int clt_up = this->clients_.sessions_up_.value ();
+  int clt_dn = this->clients_.sessions_down_.value ();
 
-private:
-  void on_new_receiver (Receiver &rcvr);
-  void on_delete_receiver (Receiver &rcvr);
+  if (svr_up == 0 && clt_up == 0)      // No connections up yet
+    return false;
 
-  ACE_SYNCH_RECURSIVE_MUTEX lock_;
-  int sessions_;
-  Receiver *list_receivers_[MAX_RECEIVERS];
-  size_t total_snd_;
-  size_t total_rcv_;
-  long total_w_;
-  long total_r_;
-};
+  return (svr_dn >= svr_up && clt_dn >= clt_up);
+}
 
-// *************************************************************
-Acceptor::Acceptor (void)
-  : sessions_ (0),
-    total_snd_(0),
-    total_rcv_(0),
-    total_w_  (0),
-    total_r_  (0)
+Server *
+TestData::server_up (void)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
+  ++this->servers_.sessions_up_;
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
 
-  for (int i = 0; i < MAX_RECEIVERS; ++i)
-     this->list_receivers_[i] = 0;
+  for (int i = 0; i < MAX_SERVERS; ++i)
+    {
+      if (this->server_list_[i] == 0)
+        {
+          ACE_NEW_RETURN (this->server_list_[i], Server (this, i), 0);
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%t) Server %d up; now %d up, %d down.\n"),
+                      i,
+                      this->servers_.sessions_up_.value (),
+                      this->servers_.sessions_down_.value ()));
+          return this->server_list_[i];
+        }
+    }
+  return 0;
 }
 
-Acceptor::~Acceptor (void)
+Client *
+TestData::client_up (void)
 {
-  this->stop ();
-}
+  ++this->clients_.sessions_up_;
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
 
+  for (int i = 0; i < MAX_CLIENTS; ++i)
+    {
+      if (this->client_list_[i] == 0)
+        {
+          ACE_NEW_RETURN (this->client_list_[i], Client (this, i), 0);
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%t) Client %d up; now %d up, %d down.\n"),
+                      i,
+                      this->clients_.sessions_up_.value (),
+                      this->clients_.sessions_down_.value ()));
+          return this->client_list_[i];
+        }
+    }
+  return 0;
+}
 
 void
-Acceptor::cancel_all (void)
+TestData::server_done (Server *s)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  this->cancel ();
-
-  for (int i = 0; i < MAX_RECEIVERS; ++i)
+  this->servers_.w_cnt_ += s->get_total_snd ();
+  this->servers_.r_cnt_ += s->get_total_rcv ();
+  this->servers_.w_ops_ += s->get_total_w ();
+  this->servers_.r_ops_ += s->get_total_r ();
+  ++this->servers_.sessions_down_;
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%t) Server %d gone; now %d up, %d down\n"),
+              s->id (),
+              this->servers_.sessions_up_.value (),
+              this->servers_.sessions_down_.value ()));
+
+  ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->list_lock_);
+  int i;
+  for (i = 0; i < MAX_SERVERS; ++i)
     {
-      if (this->list_receivers_[i] != 0)
-        this->list_receivers_[i]->cancel ();
+      if (this->server_list_[i] == s)
+        {
+          if (s->id () != i)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("Server %d is pos %d in list\n"),
+                        s->id (),
+                        i));
+          this->server_list_[i] = 0;
+          break;
+        }
     }
+  if (i >= MAX_SERVERS)
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Server %@ done but not listed\n"), s));
+
   return;
 }
 
-
 void
-Acceptor::stop (void)
+TestData::client_done (Client *c)
 {
-  // This method can be called only after proactor event loop is done
-  // in all threads.
-
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  for (int i = 0; i < MAX_RECEIVERS; ++i)
+  this->clients_.w_cnt_ += c->get_total_snd ();
+  this->clients_.r_cnt_ += c->get_total_rcv ();
+  this->clients_.w_ops_ += c->get_total_w ();
+  this->clients_.r_ops_ += c->get_total_r ();
+  ++this->clients_.sessions_down_;
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%t) Client %d gone; now %d up, %d down\n"),
+              c->id (),
+              this->clients_.sessions_up_.value (),
+              this->clients_.sessions_down_.value ()));
+
+  ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->list_lock_);
+  int i;
+  for (i = 0; i < MAX_CLIENTS; ++i)
     {
-      delete this->list_receivers_[i];
-      this->list_receivers_[i] = 0;
+      if (this->client_list_[i] == c)
+        {
+          if (c->id () != i)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("Client %d is pos %d in list\n"),
+                        c->id (),
+                        i));
+          this->client_list_[i] = 0;
+          break;
+        }
     }
+  if (i >= MAX_CLIENTS)
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Client %@ done but not listed\n"), c));
+
+  return;
 }
 
 void
-Acceptor::on_new_receiver (Receiver & rcvr)
+TestData::stop_all (void)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-  this->sessions_++;
-  this->list_receivers_[rcvr.index_] = &rcvr;
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Acceptor: receiver %d up; now have %d.\n"),
-              rcvr.index_,
-              this->sessions_));
+  int i;
+
+  // Lock and cancel everything. Then release the lock, possibly allowing
+  // cleanups, then grab it again and delete all Servers and Clients.
+  {
+    ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->list_lock_);
+    for (i = 0; i < MAX_CLIENTS; ++i)
+      {
+        if (this->client_list_[i] != 0)
+          this->client_list_[i]->cancel ();
+      }
+
+    for (i = 0; i < MAX_SERVERS; ++i)
+      {
+        if (this->server_list_[i] != 0)
+          this->server_list_[i]->cancel ();
+      }
+  }
+  {
+    ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->list_lock_);
+    for (i = 0; i < MAX_CLIENTS; ++i)
+      {
+        if (this->client_list_[i] != 0)
+          delete this->client_list_[i];
+      }
+
+    for (i = 0; i < MAX_SERVERS; ++i)
+      {
+        if (this->server_list_[i] != 0)
+          delete this->server_list_[i];
+      }
+  }
 }
 
 void
-Acceptor::on_delete_receiver (Receiver & rcvr)
+TestData::report (void)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
+  // Print statistics
+  ACE_TCHAR bufs [256];
+  ACE_TCHAR bufr [256];
 
-  this->sessions_--;
+  ACE_OS::sprintf (bufs,
+                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_TEXT ("(") ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (")"),
+                   this->clients_.w_cnt_.value (),
+                   this->clients_.w_ops_.value ());
 
-  this->total_snd_ += rcvr.get_total_snd();
-  this->total_rcv_ += rcvr.get_total_rcv();
-  this->total_w_   += rcvr.get_total_w();
-  this->total_r_   += rcvr.get_total_r();
+  ACE_OS::sprintf (bufr,
+                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_TEXT ("(") ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (")"),
+                   this->clients_.r_cnt_.value (),
+                   this->clients_.r_ops_.value ());
 
-  if (rcvr.index_ >= 0
-      && rcvr.index_ < MAX_RECEIVERS
-      && this->list_receivers_[rcvr.index_] == &rcvr)
-    this->list_receivers_[rcvr.index_] = 0;
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Clients total bytes (ops): snd=%s rcv=%s\n"),
+              bufs,
+              bufr));
+
+  ACE_OS::sprintf (bufs,
+                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_TEXT ("(") ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (")"),
+                   this->servers_.w_cnt_.value (),
+                   this->servers_.w_ops_.value ());
+
+  ACE_OS::sprintf (bufr,
+                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_TEXT ("(") ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (")"),
+                   this->servers_.r_cnt_.value (),
+                   this->servers_.r_ops_.value ());
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Acceptor: receiver %d gone; %d remain\n"),
-              rcvr.index_,
-              this->sessions_));
+              ACE_TEXT ("Servers total bytes (ops): snd=%s rcv=%s\n"),
+              bufs,
+              bufr));
+
+  if (this->clients_.w_cnt_.value () == 0 ||
+      this->clients_.r_cnt_.value () == 0 ||
+      this->servers_.w_cnt_.value () == 0 ||
+      this->servers_.r_cnt_.value () == 0   )
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("It appears that this test didn't ")
+                ACE_TEXT ("really do anything. Something is very wrong.\n")));
 }
 
-Receiver *
-Acceptor::make_handler (void)
+
+class Acceptor : public ACE_Asynch_Acceptor<Server>
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_, 0);
+public:
+  Acceptor (TestData *tester);
+  virtual ~Acceptor (void);
 
-  if (this->sessions_ >= MAX_RECEIVERS)
-    return 0;
+  // Virtual from ACE_Asynch_Acceptor
+  Server *make_handler (void);
 
-  for (int i = 0; i < MAX_RECEIVERS; ++i)
-    {
-      if (this->list_receivers_[i] == 0)
-        {
-          ACE_NEW_RETURN (this->list_receivers_[i],
-                          Receiver (this, i),
-                          0);
-          return this->list_receivers_[i];
-        }
-    }
+private:
+  TestData *tester_;
+};
 
-  return 0;
+// *************************************************************
+Acceptor::Acceptor (TestData *tester)
+  : tester_ (tester)
+{
 }
+
+Acceptor::~Acceptor (void)
+{
+  this->cancel ();
+}
+
+Server *
+Acceptor::make_handler (void)
+{
+  return this->tester_->server_up ();
+}
+
 // ***************************************************
-Receiver::Receiver (Acceptor * acceptor, int index)
-  : acceptor_ (acceptor),
-    index_    (index),
+Server::Server ()
+{
+  ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shouldn't use this constructor!\n")));
+}
+
+Server::Server (TestData *tester, int id)
+  : tester_   (tester),
+    id_       (id),
     handle_   (ACE_INVALID_HANDLE),
     io_count_ (0),
     flg_cancel_(0),
@@ -507,26 +665,24 @@ Receiver::Receiver (Acceptor * acceptor, int index)
     total_w_  (0),
     total_r_  (0)
 {
-  if (this->acceptor_ != 0)
-    this->acceptor_->on_new_receiver (*this);
 }
 
-Receiver::~Receiver (void)
+Server::~Server (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Receiver %d dtor; %d sends (%d bytes); ")
+              ACE_TEXT ("(%t) Server %d dtor; %d sends (%d bytes); ")
               ACE_TEXT ("%d recvs (%d bytes)\n"),
-              this->index_,
+              this->id_,
               this->total_w_, this->total_snd_,
               this->total_r_, this->total_rcv_));
   if (this->io_count_ != 0)
     ACE_ERROR ((LM_WARNING,
-                ACE_TEXT ("(%t) Receiver %d deleted with ")
+                ACE_TEXT ("(%t) Server %d deleted with ")
                 ACE_TEXT ("%d I/O outstanding\n"),
-                this->index_,
+                this->id_,
                 this->io_count_));
 
-  // This test bounces data back and forth between Senders and Receivers.
+  // This test bounces data back and forth between Clients and Servers.
   // Therefore, if there was significantly more data in one direction, that's
   // a problem. Remember, the byte counts are unsigned values.
   int issue_data_warning = 0;
@@ -548,18 +704,18 @@ Receiver::~Receiver (void)
     ACE_DEBUG ((LM_WARNING,
                 ACE_TEXT ("(%t) Above byte counts look odd; need review\n")));
 
-  if (this->acceptor_ != 0)
-    this->acceptor_->on_delete_receiver (*this);
+  if (this->tester_ != 0)
+    this->tester_->server_done (this);
 
   if (this->handle_ != ACE_INVALID_HANDLE)
     ACE_OS::closesocket (this->handle_);
 
-  this->index_ = -1;
+  this->id_ = -1;
   this->handle_= ACE_INVALID_HANDLE;
 }
 
 void
-Receiver::cancel ()
+Server::cancel ()
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
 
@@ -571,24 +727,24 @@ Receiver::cancel ()
 
 
 void
-Receiver::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr&)
+Server::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr&)
 {
   ACE_TCHAR str[256];
   if (0 == peer.addr_to_string (str, sizeof (str) / sizeof (ACE_TCHAR)))
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%t) Receiver %d connection from %s\n"),
-                this->index_,
+                ACE_TEXT ("(%t) Server %d connection from %s\n"),
+                this->id_,
                 str));
   else
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Receiver %d %p\n"),
-                this->index_,
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Server %d %p\n"),
+                this->id_,
                 ACE_TEXT ("addr_to_string")));
   return;
 }
 
 
 void
-Receiver::open (ACE_HANDLE handle, ACE_Message_Block &)
+Server::open (ACE_HANDLE handle, ACE_Message_Block &)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -606,11 +762,11 @@ Receiver::open (ACE_HANDLE handle, ACE_Message_Block &)
     if (this->ws_.open (*this, this->handle_) == -1)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%t) %p\n"),
-                  ACE_TEXT ("Receiver::ACE_Asynch_Write_Stream::open")));
+                  ACE_TEXT ("Server::ACE_Asynch_Write_Stream::open")));
     else if (this->rs_.open (*this, this->handle_) == -1)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%t) %p\n"),
-                  ACE_TEXT ("Receiver::ACE_Asynch_Read_Stream::open")));
+                  ACE_TEXT ("Server::ACE_Asynch_Read_Stream::open")));
     else
       this->initiate_read_stream ();
 
@@ -621,7 +777,7 @@ Receiver::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Receiver::initiate_read_stream (void)
+Server::initiate_read_stream (void)
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     return -1;
@@ -640,13 +796,13 @@ Receiver::initiate_read_stream (void)
       // a 0-byte read as we would if underlying calls used WSARecv.
       if (ACE_OS::last_error () == ERROR_NETNAME_DELETED)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           ACE_TEXT ("(%t) Receiver %d, peer closed\n"),
-                           this->index_),
+                           ACE_TEXT ("(%t) Server %d, peer closed\n"),
+                           this->id_),
                           -1);
 #endif /* ACE_WIN32 */
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%t) Receiver %d, %p\n"),
-                         this->index_,
+                         ACE_TEXT ("(%t) Server %d, %p\n"),
+                         this->id_,
                          ACE_TEXT ("read")),
                         -1);
     }
@@ -657,7 +813,7 @@ Receiver::initiate_read_stream (void)
 }
 
 int
-Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
+Server::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     {
@@ -669,7 +825,7 @@ Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
     {
       mb.release ();
       ACE_ERROR_RETURN((LM_ERROR,
-                        ACE_TEXT ("(%t) Receiver::ACE_Asynch_Write_Stream::write nbytes <0 ")),
+                        ACE_TEXT ("(%t) Server::ACE_Asynch_Write_Stream::write nbytes <0 ")),
                        -1);
     }
 
@@ -680,13 +836,13 @@ Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
       // On peer close, WriteFile will yield ERROR_NETNAME_DELETED.
       if (ACE_OS::last_error () == ERROR_NETNAME_DELETED)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           ACE_TEXT ("(%t) Receiver %d, peer gone\n"),
-                           this->index_),
+                           ACE_TEXT ("(%t) Server %d, peer gone\n"),
+                           this->id_),
                           -1);
 #endif /* ACE_WIN32 */
       ACE_ERROR_RETURN((LM_ERROR,
-                        ACE_TEXT ("(%t) Receiver %d, %p\n"),
-                        this->index_,
+                        ACE_TEXT ("(%t) Server %d, %p\n"),
+                        this->id_,
                         ACE_TEXT ("write")),
                        -1);
     }
@@ -697,7 +853,7 @@ Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
 }
 
 void
-Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
+Server::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_ );
@@ -712,8 +868,8 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
         LogLocker log_lock;
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) **** Receiver %d: handle_read_stream() ****\n"),
-                    this->index_));
+                    ACE_TEXT ("(%t) **** Server %d: handle_read_stream() ****\n"),
+                    this->id_));
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %d\n"),
                     ACE_TEXT ("bytes_to_read"),
@@ -763,15 +919,15 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
           prio = LM_ERROR;
         ACE_Log_Msg::instance ()->errnum (result.error ());
         ACE_Log_Msg::instance ()->log (prio,
-                                       ACE_TEXT ("(%t) Receiver %d; %p\n"),
-                                       this->index_,
+                                       ACE_TEXT ("(%t) Server %d; %p\n"),
+                                       this->id_,
                                        ACE_TEXT ("read"));
       }
     else if (loglevel > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Receiver %d: read %d bytes\n"),
-                    this->index_,
+                    ACE_TEXT ("(%t) Server %d: read %d bytes\n"),
+                    this->id_,
                     result.bytes_transferred ()));
       }
 
@@ -797,7 +953,7 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 }
 
 void
-Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
+Server::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -812,8 +968,8 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
         mb.rd_ptr (mb.rd_ptr () - result.bytes_transferred ());
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) **** Receiver %d: handle_write_stream() ****\n"),
-                    this->index_));
+                    ACE_TEXT ("(%t) **** Server %d: handle_write_stream() ****\n"),
+                    this->id_));
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %d\n"),
                     ACE_TEXT ("bytes_to_write"),
@@ -863,15 +1019,15 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
           prio = LM_ERROR;
         ACE_Log_Msg::instance ()->errnum (result.error ());
         ACE_Log_Msg::instance ()->log (prio,
-                                       ACE_TEXT ("(%t) Receiver %d; %p\n"),
-                                       this->index_,
+                                       ACE_TEXT ("(%t) Server %d; %p\n"),
+                                       this->id_,
                                        ACE_TEXT ("write"));
       }
     else if (loglevel > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Receiver %d: wrote %d bytes ok\n"),
-                    this->index_,
+                    ACE_TEXT ("(%t) Server %d: wrote %d bytes ok\n"),
+                    this->id_,
                     result.bytes_transferred ()));
       }
 
@@ -896,156 +1052,45 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 //  Connector
 // *******************************************
 
-class Connector : public ACE_Asynch_Connector<Sender>
+class Connector : public ACE_Asynch_Connector<Client>
 {
-  friend class Sender;
 public:
-  int get_number_sessions (void) { return this->sessions_; }
-  size_t get_total_snd (void) { return this->total_snd_; }
-  size_t get_total_rcv (void) { return this->total_rcv_; }
-  long get_total_w   (void) { return this->total_w_; }
-  long get_total_r   (void) { return this->total_r_; }
-
-  Connector (void);
+  Connector (TestData *tester);
   virtual ~Connector (void);
 
   int  start (const ACE_INET_Addr &addr, int num);
-  void stop (void);
-  void cancel_all (void);
 
   // Virtual from ACE_Asynch_Connector
-  Sender *make_handler (void);
+  Client *make_handler (void);
 
 private:
-  void on_new_sender  (Sender &rcvr);
-  void on_delete_sender (Sender &rcvr);
-
-  ACE_SYNCH_RECURSIVE_MUTEX lock_;
-  int sessions_;
-  Sender *list_senders_[MAX_SENDERS];
-  size_t total_snd_;
-  size_t total_rcv_;
-  long total_w_;
-  long total_r_;
+  TestData *tester_;
 };
 
 // *************************************************************
 
-Connector::Connector (void)
-  : sessions_ (0),
-    total_snd_(0),
-    total_rcv_(0),
-    total_w_  (0),
-    total_r_  (0)
+Connector::Connector (TestData *tester)
+  : tester_ (tester)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  for (int i = 0; i < MAX_SENDERS; ++i)
-     this->list_senders_[i] = 0;
 }
 
 Connector::~Connector (void)
 {
-  this->stop ();
-}
-
-
-void
-Connector::cancel_all(void)
-{
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
   this->cancel ();
-
-  for (int i = 0; i < MAX_SENDERS; ++i)
-    {
-      if (this->list_senders_[i] != 0)
-        this->list_senders_[i]->cancel ();
-    }
-  return;
 }
 
-
-void
-Connector::stop (void)
-{
-  // This method can be called only after proactor event loop is done
-  // in all threads.
-
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  for (int i = 0; i < MAX_SENDERS; ++i)
-    {
-      delete this->list_senders_[i];
-      this->list_senders_[i] = 0;
-    }
-}
-
-void
-Connector::on_new_sender (Sender &sndr)
-{
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-  this->sessions_++;
-  this->list_senders_[sndr.index_] = &sndr;
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Connector: sender %d up; now have %d.\n"),
-              sndr.index_,
-              this->sessions_));
-}
-
-void
-Connector::on_delete_sender (Sender &sndr)
-{
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  this->sessions_--;
-  this->total_snd_ += sndr.get_total_snd();
-  this->total_rcv_ += sndr.get_total_rcv();
-  this->total_w_   += sndr.get_total_w();
-  this->total_r_   += sndr.get_total_r();
-
-  if (sndr.index_ >= 0
-      && sndr.index_ < MAX_SENDERS
-      && this->list_senders_[sndr.index_] == &sndr)
-    this->list_senders_[sndr.index_] = 0;
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Connector: sender %d gone; %d remain\n"),
-              sndr.index_,
-              this->sessions_));
-}
-
-Sender *
+Client *
 Connector::make_handler (void)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_, 0);
-
-  if (this->sessions_ >= MAX_SENDERS)
-    return 0;
-
-  for (int i = 0; i < MAX_SENDERS; ++i)
-    {
-      if (this->list_senders_ [i] == 0)
-        {
-          ACE_NEW_RETURN (this->list_senders_[i],
-                          Sender (this, i),
-                          0);
-          return this->list_senders_[i];
-        }
-    }
-
-  return 0;
+  return this->tester_->client_up ();
 }
 
 
 int
 Connector::start (const ACE_INET_Addr& addr, int num)
 {
-
-  ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_, 0);
-
-  if (num > MAX_SENDERS)
-    num = MAX_SENDERS;
+  if (num > MAX_CLIENTS)
+    num = MAX_CLIENTS;
 
   if (num < 0)
     num = 1;
@@ -1078,9 +1123,14 @@ Connector::start (const ACE_INET_Addr& addr, int num)
 }
 
 
-Sender::Sender (Connector * connector, int index)
-  : index_        (index),
-    connector_    (connector),
+Client::Client ()
+{
+  ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shouldn't use this constructor!\n")));
+}
+
+Client::Client (TestData *tester, int id)
+  : tester_       (tester),
+    id_           (id),
     handle_       (ACE_INVALID_HANDLE),
     io_count_     (0),
     stop_writing_ (0),
@@ -1090,25 +1140,23 @@ Sender::Sender (Connector * connector, int index)
     total_w_      (0),
     total_r_      (0)
 {
-  if (this->connector_ != 0)
-    this->connector_->on_new_sender (*this);
 }
 
-Sender::~Sender (void)
+Client::~Client (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Sender %d dtor; %d sends (%d bytes); ")
+              ACE_TEXT ("(%t) Client %d dtor; %d sends (%d bytes); ")
               ACE_TEXT ("%d recvs (%d bytes)\n"),
-              this->index_,
+              this->id_,
               this->total_w_, this->total_snd_,
               this->total_r_, this->total_rcv_));
   if (this->io_count_ != 0)
     ACE_ERROR ((LM_WARNING,
-                ACE_TEXT ("(%t) Sender %d deleted with %d I/O outstanding\n"),
-                this->index_,
+                ACE_TEXT ("(%t) Client %d deleted with %d I/O outstanding\n"),
+                this->id_,
                 this->io_count_));
 
-  // This test bounces data back and forth between Senders and Receivers.
+  // This test bounces data back and forth between Clients and Servers.
   // Therefore, if there was significantly more data in one direction, that's
   // a problem. Remember, the byte counts are unsigned values.
   int issue_data_warning = 0;
@@ -1130,20 +1178,20 @@ Sender::~Sender (void)
     ACE_DEBUG ((LM_WARNING,
                 ACE_TEXT ("(%t) Above byte counts look odd; need review\n")));
 
-  if (this->connector_ != 0)
-    this->connector_->on_delete_sender (*this);
+  if (this->tester_ != 0)
+    this->tester_->client_done (this);
 
+  this->id_ = -1;
+  this->handle_= ACE_INVALID_HANDLE;
   if (this->handle_ != ACE_INVALID_HANDLE)
     {
       ACE_OS::closesocket (this->handle_);
     }
-
-  this->index_ = -1;
   this->handle_= ACE_INVALID_HANDLE;
 }
 
 void
-Sender::cancel ()
+Client::cancel ()
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
 
@@ -1154,12 +1202,12 @@ Sender::cancel ()
 }
 
 void
-Sender::close ()
+Client::close ()
 {
   // This must be called with the lock_ held.
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Closing Sender %d writes; %d I/O outstanding\n"),
-              this->index_, this->io_count_));
+              ACE_TEXT ("(%t) Closing Client %d writes; %d I/O outstanding\n"),
+              this->id_, this->io_count_));
   ACE_OS::shutdown (this->handle_, ACE_SHUTDOWN_WRITE);
   this->stop_writing_ = 1;
   return;
@@ -1167,24 +1215,24 @@ Sender::close ()
 
 
 void
-Sender::addresses (const ACE_INET_Addr& /* peer */, const ACE_INET_Addr& local)
+Client::addresses (const ACE_INET_Addr& /* peer */, const ACE_INET_Addr& local)
 {
   ACE_TCHAR str[256];
   if (0 == local.addr_to_string (str, sizeof (str) / sizeof (ACE_TCHAR)))
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%t) Sender %d connected on %s\n"),
-                this->index_,
+                ACE_TEXT ("(%t) Client %d connected on %s\n"),
+                this->id_,
                 str));
   else
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Receiver %d %p\n"),
-                this->index_,
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Client %d %p\n"),
+                this->id_,
                 ACE_TEXT ("addr_to_string")));
   return;
 }
 
 
 void
-Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
+Client::open (ACE_HANDLE handle, ACE_Message_Block &)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -1203,13 +1251,13 @@ Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
     if (this->ws_.open (*this, this->handle_) == -1)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%t) %p\n"),
-                  ACE_TEXT ("Sender::ACE_Asynch_Write_Stream::open")));
+                  ACE_TEXT ("Client::ACE_Asynch_Write_Stream::open")));
 
     // Open ACE_Asynch_Read_Stream
     else if (this->rs_.open (*this, this->handle_) == -1)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%t) %p\n"),
-                  ACE_TEXT ("Sender::ACE_Asynch_Read_Stream::open")));
+                  ACE_TEXT ("Client::ACE_Asynch_Read_Stream::open")));
 
     else if (this->initiate_write_stream () == 0)
       {
@@ -1224,7 +1272,7 @@ Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Sender::initiate_write_stream (void)
+Client::initiate_write_stream (void)
 {
   if (this->flg_cancel_ != 0 ||
       this->stop_writing_ ||
@@ -1268,7 +1316,7 @@ Sender::initiate_write_stream (void)
       mb1->release ();
       ACE_ERROR_RETURN((LM_ERROR,
                         ACE_TEXT ("(%t) %p\n"),
-                        ACE_TEXT ("Sender::ACE_Asynch_Stream::writev")),
+                        ACE_TEXT ("Client::ACE_Asynch_Stream::writev")),
                        -1);
     }
 #else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
@@ -1288,13 +1336,13 @@ Sender::initiate_write_stream (void)
       // On peer close, WriteFile will yield ERROR_NETNAME_DELETED.
       if (ACE_OS::last_error () == ERROR_NETNAME_DELETED)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           ACE_TEXT ("(%t) Sender %d, peer gone\n"),
-                           this->index_),
+                           ACE_TEXT ("(%t) Client %d, peer gone\n"),
+                           this->id_),
                           -1);
 #endif /* ACE_WIN32 */
       ACE_ERROR_RETURN((LM_ERROR,
-                        ACE_TEXT ("(%t) Sender %d, %p\n"),
-                        this->index_,
+                        ACE_TEXT ("(%t) Client %d, %p\n"),
+                        this->id_,
                         ACE_TEXT ("write")),
                        -1);
     }
@@ -1306,12 +1354,13 @@ Sender::initiate_write_stream (void)
 }
 
 int
-Sender::initiate_read_stream (void)
+Client::initiate_read_stream (void)
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     return -1;
 
-  static const size_t complete_message_length = ACE_OS::strlen (complete_message);
+  static const size_t complete_message_length =
+    ACE_OS::strlen (complete_message);
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
   ACE_Message_Block *mb1 = 0,
@@ -1359,7 +1408,7 @@ Sender::initiate_read_stream (void)
       mb1->release ();
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("(%t) %p\n"),
-                         ACE_TEXT ("Sender::ACE_Asynch_Read_Stream::readv")),
+                         ACE_TEXT ("Client::ACE_Asynch_Read_Stream::readv")),
                         -1);
     }
 #else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
@@ -1373,8 +1422,8 @@ Sender::initiate_read_stream (void)
   // We allocate +1 only for proper printing - we can just set the last byte
   // to '\0' before printing out
   ACE_NEW_RETURN (mb,
-                  ACE_Message_Block (blksize + 1)
-                  , -1);
+                  ACE_Message_Block (blksize + 1),
+                  -1);
 
   // Inititiate read
   if (this->rs_.read (*mb, mb->size () - 1) == -1)
@@ -1385,13 +1434,13 @@ Sender::initiate_read_stream (void)
       // a 0-byte read as we would if underlying calls used WSARecv.
       if (ACE_OS::last_error () == ERROR_NETNAME_DELETED)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           ACE_TEXT ("(%t) Receiver %d, peer closed\n"),
-                           this->index_),
+                           ACE_TEXT ("(%t) Client %d, peer closed\n"),
+                           this->id_),
                           -1);
 #endif /* ACE_WIN32 */
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%t) Sender %d, %p\n"),
-                         this->index_,
+                         ACE_TEXT ("(%t) Client %d, %p\n"),
+                         this->id_,
                          ACE_TEXT ("read")),
                         -1);
     }
@@ -1403,7 +1452,7 @@ Sender::initiate_read_stream (void)
 }
 
 void
-Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
+Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -1415,8 +1464,8 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
         LogLocker log_lock;
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) **** Sender %d: handle_write_stream() ****\n"),
-                    index_));
+                    ACE_TEXT ("(%t) **** Client %d: handle_write_stream() ****\n"),
+                    this->id_));
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %d\n"),
                     ACE_TEXT ("bytes_to_write"),
@@ -1505,15 +1554,15 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
           prio = LM_ERROR;
         ACE_Log_Msg::instance ()->errnum (result.error ());
         ACE_Log_Msg::instance ()->log (prio,
-                                       ACE_TEXT ("(%t) Sender %d; %p\n"),
-                                       this->index_,
+                                       ACE_TEXT ("(%t) Client %d; %p\n"),
+                                       this->id_,
                                        ACE_TEXT ("write"));
       }
     else if (loglevel > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Sender %d: wrote %d bytes ok\n"),
-                    this->index_,
+                    ACE_TEXT ("(%t) Client %d: wrote %d bytes ok\n"),
+                    this->id_,
                     result.bytes_transferred ()));
       }
 
@@ -1522,13 +1571,13 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
     if (result.error () == 0 && result.bytes_transferred () > 0)
       {
         this->total_snd_ += result.bytes_transferred ();
-	if (this->total_snd_ >= xfer_limit)
-	  {
-	    ACE_DEBUG ((LM_DEBUG,
-			ACE_TEXT ("(%t) Sender %d sent %d, limit %d\n"),
-			this->index_, this->total_snd_, xfer_limit));
-	    this->close ();
-	  }
+        if (this->total_snd_ >= xfer_limit)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT ("(%t) Client %d sent %d, limit %d\n"),
+                        this->id_, this->total_snd_, xfer_limit));
+            this->close ();
+          }
         if (duplex != 0)   // full duplex, continue write
           {
             if ((this->total_snd_- this->total_rcv_) < 1024*32 ) //flow control
@@ -1546,7 +1595,7 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 }
 
 void
-Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
+Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -1558,8 +1607,8 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
         LogLocker log_lock;
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) **** Sender %d: handle_read_stream() ****\n"),
-                    index_));
+                    ACE_TEXT ("(%t) **** Client %d: handle_read_stream() ****\n"),
+                    this->id_));
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %d\n"),
                     ACE_TEXT ("bytes_to_read"),
@@ -1631,15 +1680,15 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
           prio = LM_ERROR;
         ACE_Log_Msg::instance ()->errnum (result.error ());
         ACE_Log_Msg::instance ()->log (prio,
-                                       ACE_TEXT ("(%t) Sender %d; %p\n"),
-                                       this->index_,
+                                       ACE_TEXT ("(%t) Client %d; %p\n"),
+                                       this->id_,
                                        ACE_TEXT ("read"));
       }
     else if (loglevel > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Sender %d: read %d bytes ok\n"),
-                    this->index_,
+                    ACE_TEXT ("(%t) Client %d: read %d bytes ok\n"),
+                    this->id_,
                     result.bytes_transferred ()));
       }
 
@@ -1679,10 +1728,10 @@ print_usage (int /* argc */, ACE_TCHAR *argv[])
       ACE_TEXT ("\n    s SUN")
       ACE_TEXT ("\n    d default")
       ACE_TEXT ("\n-d <duplex mode 1-on/0-off>")
-      ACE_TEXT ("\n-h <host> for Sender mode")
+      ACE_TEXT ("\n-h <host> for Client mode")
       ACE_TEXT ("\n-n <number threads for Proactor pool>")
       ACE_TEXT ("\n-p <port to listen/connect>")
-      ACE_TEXT ("\n-s <number of sender's instances>")
+      ACE_TEXT ("\n-c <number of client instances>")
       ACE_TEXT ("\n-b run client and server at the same time")
       ACE_TEXT ("\n    f file")
       ACE_TEXT ("\n    c console")
@@ -1690,7 +1739,7 @@ print_usage (int /* argc */, ACE_TCHAR *argv[])
       ACE_TEXT ("\n    0 - log errors and highlights")
       ACE_TEXT ("\n    1 - log level 0 plus progress information")
       ACE_TEXT ("\n    2 - log level 1 plus operation parameters and results")
-      ACE_TEXT ("\n-x max transfer byte count per Sender")
+      ACE_TEXT ("\n-x max transfer byte count per Client")
       ACE_TEXT ("\n-u show this message")
       ACE_TEXT ("\n"),
       argv[0]
@@ -1742,7 +1791,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   max_aio_operations = 512;       // POSIX Proactor params
   proactor_type = DEFAULT;        // Proactor type = default
   threads = 3;                    // size of Proactor thread pool
-  senders = 10;                   // number of senders
+  clients = 10;                   // number of clients
   loglevel = 0;                   // log level : only errors and highlights
   // Default transfer limit 50 messages per Sender
   xfer_limit = 50 * ACE_OS::strlen (complete_message);
@@ -1750,7 +1799,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   if (argc == 1) // no arguments , so one button test
     return 0;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:s:v:ub"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub"));
   int c;
 
   while ((c = get_opt ()) != EOF)
@@ -1758,10 +1807,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'x':  // xfer limit
-        xfer_limit = ACE_static_cast (size_t,
-				      ACE_OS::atoi (get_opt.opt_arg ()));
+        xfer_limit = static_cast<size_t> (ACE_OS::atoi (get_opt.opt_arg ()));
         if (xfer_limit == 0)
-	  xfer_limit = 1;          // Bare minimum.
+          xfer_limit = 1;          // Bare minimum.
         break;
       case 'b':  // both client and server
         both = 1;
@@ -1781,10 +1829,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
       case 'n':         // thread pool size
         threads = ACE_OS::atoi (get_opt.opt_arg ());
         break;
-      case 's':     // number of senders
-        senders = ACE_OS::atoi (get_opt.opt_arg ());
-        if (senders > MAX_SENDERS)
-          senders = MAX_SENDERS;
+      case 'c':     // number of clients
+        clients = ACE_OS::atoi (get_opt.opt_arg ());
+        if (clients > MAX_CLIENTS)
+          clients = MAX_CLIENTS;
         break;
       case 'o':     // max number of aio for proactor
         max_aio_operations = ACE_OS::atoi (get_opt.opt_arg ());
@@ -1821,118 +1869,50 @@ run_main (int argc, ACE_TCHAR *argv[])
   disable_signal (SIGPIPE, SIGPIPE);
 
   MyTask    task1;
-  Acceptor  acceptor;
-  Connector connector;
+  TestData  test;
 
-  if (task1.start (threads,
-                   proactor_type,
-                   max_aio_operations) == 0)
+  if (task1.start (threads, proactor_type, max_aio_operations) == 0)
     {
+      Acceptor  acceptor (&test);
+      Connector connector (&test);
+      ACE_INET_Addr addr (port);
+
       int rc = 0;
 
       if (both != 0 || host == 0) // Acceptor
         {
           // Simplify, initial read with zero size
-          if (acceptor.open (ACE_INET_Addr (port), 0, 1) == 0)
+          if (acceptor.open (addr, 0, 1) == 0)
             rc = 1;
         }
 
       if (both != 0 || host != 0)
         {
-          ACE_INET_Addr addr;
           if (host == 0)
             host = ACE_LOCALHOST;
 
-          if (addr.set (port, host) == -1)
+          if (addr.set (port, host, 1, addr.get_type ()) == -1)
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), host));
           else
-            rc += connector.start (addr, senders);
+            rc += connector.start (addr, clients);
         }
-    }
 
-  // Wait a couple of seconds to let things get going, then poll til
-  // all sessions are done.
-  ACE_OS::sleep (2);
+      // Wait a few seconds to let things get going, then poll til
+      // all sessions are done. Note that when we exit this scope, the
+      // Acceptor and Connector will be destroyed, which should prevent
+      // further connections and also test how well destroyed handlers
+      // are handled.
+      ACE_OS::sleep (3);
+    }
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Sleeping til sessions run down.\n")));
-  while (acceptor.get_number_sessions () > 0 ||
-	 connector.get_number_sessions () > 0   )
+  while (!test.testing_done ())
     ACE_OS::sleep (1);
 
-#if 0
-  // Cancel all pending AIO on Connector and Senders
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Cancel Connector/Senders: sessions_=%d\n"),
-              connector.get_number_sessions ()
-            ));
-  connector.cancel_all ();
-#endif
-
-  //Cancel all pending AIO on Acceptor And Receivers
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Cancel Acceptor/Receivers:sessions_=%d\n"),
-              acceptor.get_number_sessions ()
-            ));
-  acceptor.cancel_all ();
+  test.stop_all ();
 
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Stop Thread Pool Task\n")
-            ));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Stop Thread Pool Task\n")));
   task1.stop ();
 
-  // As Proactor event loop now is inactive it is safe to destroy all
-  // Senders
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Stop Connector/Senders: sessions_=%d\n"),
-              connector.get_number_sessions ()
-            ));
-  connector.stop ();
-
-  // As Proactor event loop now is inactive it is safe to destroy all
-  // Receivers
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Stop Acceptor/Receivers:sessions_=%d\n"),
-              acceptor.get_number_sessions ()
-            ));
-  acceptor.stop ();
-
-  //Print statistic
-  ACE_TCHAR bufs [256];
-  ACE_TCHAR bufr [256];
-
-  ACE_OS::sprintf (bufs,
-                   ACE_SIZE_T_FORMAT_SPECIFIER
-                   ACE_TEXT ("(%ld)"),
-                   connector.get_total_snd (),
-                   connector.get_total_w ());
-
-  ACE_OS::sprintf (bufr,
-                   ACE_SIZE_T_FORMAT_SPECIFIER
-                   ACE_TEXT ("(%ld)"),
-                   connector.get_total_rcv (),
-                   connector.get_total_r ());
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Connector/Senders  total bytes: snd=%s rcv=%s\n"),
-              bufs,
-              bufr));
-
-  ACE_OS::sprintf (bufs,
-                   ACE_SIZE_T_FORMAT_SPECIFIER
-                   ACE_TEXT ("(%ld)"),
-                   acceptor.get_total_snd (),
-                   acceptor.get_total_w ());
-
-  ACE_OS::sprintf (bufr,
-                   ACE_SIZE_T_FORMAT_SPECIFIER
-                   ACE_TEXT ("(%ld)"),
-                   acceptor.get_total_rcv (),
-                   acceptor.get_total_r ());
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Acceptor/Receivers total bytes: snd=%s rcv=%s\n"),
-              bufs,
-              bufr));
-
   ACE_END_TEST;
 
   return 0;
@@ -1940,13 +1920,13 @@ run_main (int argc, ACE_TCHAR *argv[])
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Asynch_Acceptor<Receiver>;
-template class ACE_Asynch_Connector<Sender>;
+template class ACE_Asynch_Acceptor<Server>;
+template class ACE_Asynch_Connector<Client>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Asynch_Acceptor<Receiver>
-#pragma instantiate ACE_Asynch_Connector<Sender>
+#pragma instantiate ACE_Asynch_Acceptor<Server>
+#pragma instantiate ACE_Asynch_Connector<Client>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/tests/Proactor_Test.h b/tests/Proactor_Test.h
index 6d36e5fe137..044839a4cb5 100644
--- a/tests/Proactor_Test.h
+++ b/tests/Proactor_Test.h
@@ -24,15 +24,16 @@
 #include "ace/Thread_Mutex.h"
 
 // forward declaration
-class Acceptor;
+class TestData;
 
-class Receiver : public ACE_Service_Handler
+class Server : public ACE_Service_Handler
 {
-  friend class Acceptor;
 public:
-  Receiver  (Acceptor *acceptor = 0, int index = -1);
-  ~Receiver (void);
+  Server ();
+  Server (TestData *tester, int id);
+  ~Server (void);
 
+  int id (void) { return this->id_; }
   size_t get_total_snd (void) { return this->total_snd_; }
   size_t get_total_rcv (void) { return this->total_rcv_; }
   long get_total_w   (void) { return this->total_w_; }
@@ -45,6 +46,7 @@ public:
   /// This is called after the new connection has been accepted.
   virtual void open (ACE_HANDLE handle,
                      ACE_Message_Block &message_block);
+  void cancel ();
 
 protected:
   /**
@@ -63,10 +65,9 @@ protected:
 private:
   int initiate_read_stream (void);
   int initiate_write_stream (ACE_Message_Block &mb, size_t nbytes);
-  void cancel ();
 
-  Acceptor *acceptor_;
-  int index_;
+  TestData *tester_;
+  int id_;
 
   ACE_Asynch_Read_Stream rs_;
   ACE_Asynch_Write_Stream ws_;
@@ -82,23 +83,22 @@ private:
 };
 
 // *******************************************
-//   Sender
+//   Client
 // *******************************************
 
-class Connector;
-
-class Sender : public ACE_Service_Handler
+class Client : public ACE_Service_Handler
 {
-  friend class Connector;
 public:
 
   /// This is called after the new connection has been established.
   virtual void open (ACE_HANDLE handle,
                      ACE_Message_Block &message_block);
 
-  Sender  (Connector *connector = 0, int index = -1);
-  ~Sender (void);
+  Client ();
+  Client (TestData *tester, int id);
+  ~Client (void);
 
+  int id (void) { return this->id_; }
   size_t get_total_snd (void) { return this->total_snd_; }
   size_t get_total_rcv (void) { return this->total_rcv_; }
   long get_total_w   (void) { return this->total_w_; }
@@ -114,14 +114,15 @@ public:
   virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
   // This is called when asynchronous writes from the socket complete
 
+  void cancel (void);
+
 private:
   int initiate_read_stream (void);
   int initiate_write_stream (void);
-  void cancel (void);
   void close (void);
 
-  int  index_;
-  Connector * connector_;
+  TestData *tester_;
+  int id_;
 
   ACE_Asynch_Read_Stream rs_;
   ACE_Asynch_Write_Stream ws_;
diff --git a/tests/Proactor_Test_IPV6.cpp b/tests/Proactor_Test_IPV6.cpp
index 45d32db07c5..b4480c42aae 100644
--- a/tests/Proactor_Test_IPV6.cpp
+++ b/tests/Proactor_Test_IPV6.cpp
@@ -3,6 +3,8 @@
 /**
  *  @file Proactor_Test_IPV6.cpp
  *
+ *  $Id$
+ *
  *  This program illustrates how the ACE_Proactor can be used to
  *  implement an application that does various asynchronous
  *  operations.
@@ -14,6 +16,10 @@
 
 #include "test_config.h"
 
+ACE_RCSID (tests,
+           Proactor_Test,
+           "$Id$")
+
 #if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
   // This only works on Win32 platforms and on Unix platforms
   // supporting POSIX aio calls.
@@ -41,6 +47,9 @@
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/os_include/netinet/os_tcp.h"
 
+#include "ace/Atomic_Op.h"
+#include "ace/Synch_Traits.h"
+
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 
 #  include "ace/WIN32_Proactor.h"
@@ -70,10 +79,10 @@ static int both = 0;
 // Host that we're connecting to.
 static const ACE_TCHAR *host = 0;
 
-// number of Senders instances
-static int senders = 1;
-const  int MAX_SENDERS = 1000;
-const  int MAX_RECEIVERS = 1000;
+// number of Client instances
+static int clients = 1;
+const  int MAX_CLIENTS = 1000;
+const  int MAX_SERVERS = 1000;
 
 // duplex mode: == 0 half-duplex
 //              != 0 full duplex
@@ -88,7 +97,7 @@ static u_short port = ACE_DEFAULT_SERVER_PORT;
 // Log options
 static int loglevel;       // 0 full , 1 only errors
 
-static size_t xfer_limit;  // Number of bytes for Sender to send.
+static size_t xfer_limit;  // Number of bytes for Client to send.
 
 static char complete_message[] =
   "GET / HTTP/1.1\r\n"
@@ -157,7 +166,10 @@ disable_signal (int sigmin, int sigmax)
 class MyTask : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  MyTask (void): lock_ (), sem_ (0), proactor_(0) {}
+  MyTask (void):
+    lock_ (),
+    sem_ ((unsigned int) 0),
+    proactor_(0) {}
 
   virtual ~MyTask()
     {
@@ -347,149 +359,304 @@ MyTask::svc (void)
 }
 
 
-class Acceptor : public ACE_Asynch_Acceptor<Receiver>
+// TestData collects and reports on test-related transfer and connection
+// statistics.
+class TestData
 {
-  friend class Receiver;
 public:
-  int get_number_sessions (void) { return this->sessions_; }
-  size_t get_total_snd (void) { return this->total_snd_; }
-  size_t get_total_rcv (void) { return this->total_rcv_; }
-  long get_total_w   (void) { return this->total_w_; }
-  long get_total_r   (void) { return this->total_r_; }
+  TestData ();
+  bool testing_done (void);
+  Server *server_up (void);
+  Client *client_up (void);
+  void server_done (Server *s);
+  void client_done (Client *c);
+  void stop_all (void);
+  void report (void);
 
-  Acceptor (void);
-  virtual ~Acceptor (void);
+private:
+  struct Local_Stats
+  {
+    // Track number of sessions that report start, and those that report
+    // their end (and stats).
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> sessions_up_;
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> sessions_down_;
+
+    // Total read and write bytes for all sessions.
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, size_t> w_cnt_;
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, size_t> r_cnt_;
+    // Total read and write operations issues for all sessions.
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, size_t> w_ops_;
+    ACE_Atomic_Op<ACE_SYNCH_MUTEX, size_t> r_ops_;
+  } servers_, clients_;
+
+  ACE_SYNCH_MUTEX list_lock_;
+  Server *server_list_[MAX_SERVERS];
+  Client *client_list_[MAX_CLIENTS];
+};
 
-  void stop (void);
-  void cancel_all (void);
+TestData::TestData ()
+{
+  int i;
+  for (i = 0; i < MAX_SERVERS; ++i)
+    this->server_list_[i] = 0;
+  for (i = 0; i < MAX_CLIENTS; ++i)
+    this->client_list_[i] = 0;
+}
 
-  // Virtual from ACE_Asynch_Acceptor
-  Receiver *make_handler (void);
+bool
+TestData::testing_done (void)
+{
+  int svr_up = this->servers_.sessions_up_.value ();
+  int svr_dn = this->servers_.sessions_down_.value ();
+  int clt_up = this->clients_.sessions_up_.value ();
+  int clt_dn = this->clients_.sessions_down_.value ();
 
-private:
-  void on_new_receiver (Receiver &rcvr);
-  void on_delete_receiver (Receiver &rcvr);
+  if (svr_up == 0 && clt_up == 0)      // No connections up yet
+    return false;
 
-  ACE_SYNCH_RECURSIVE_MUTEX lock_;
-  int sessions_;
-  Receiver *list_receivers_[MAX_RECEIVERS];
-  size_t total_snd_;
-  size_t total_rcv_;
-  long total_w_;
-  long total_r_;
-};
+  return (svr_dn >= svr_up && clt_dn >= clt_up);
+}
 
-// *************************************************************
-Acceptor::Acceptor (void)
-  : sessions_ (0),
-    total_snd_(0),
-    total_rcv_(0),
-    total_w_  (0),
-    total_r_  (0)
+Server *
+TestData::server_up (void)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
+  ++this->servers_.sessions_up_;
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
 
-  for (int i = 0; i < MAX_RECEIVERS; ++i)
-     this->list_receivers_[i] = 0;
+  for (int i = 0; i < MAX_SERVERS; ++i)
+    {
+      if (this->server_list_[i] == 0)
+        {
+          ACE_NEW_RETURN (this->server_list_[i], Server (this, i), 0);
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%t) Server %d up; now %d up, %d down.\n"),
+                      i,
+                      this->servers_.sessions_up_.value (),
+                      this->servers_.sessions_down_.value ()));
+          return this->server_list_[i];
+        }
+    }
+  return 0;
 }
 
-Acceptor::~Acceptor (void)
+Client *
+TestData::client_up (void)
 {
-  this->stop ();
-}
+  ++this->clients_.sessions_up_;
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0);
 
+  for (int i = 0; i < MAX_CLIENTS; ++i)
+    {
+      if (this->client_list_[i] == 0)
+        {
+          ACE_NEW_RETURN (this->client_list_[i], Client (this, i), 0);
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%t) Client %d up; now %d up, %d down.\n"),
+                      i,
+                      this->clients_.sessions_up_.value (),
+                      this->clients_.sessions_down_.value ()));
+          return this->client_list_[i];
+        }
+    }
+  return 0;
+}
 
 void
-Acceptor::cancel_all (void)
+TestData::server_done (Server *s)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  this->cancel ();
-
-  for (int i = 0; i < MAX_RECEIVERS; ++i)
+  this->servers_.w_cnt_ += s->get_total_snd ();
+  this->servers_.r_cnt_ += s->get_total_rcv ();
+  this->servers_.w_ops_ += s->get_total_w ();
+  this->servers_.r_ops_ += s->get_total_r ();
+  ++this->servers_.sessions_down_;
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%t) Server %d gone; now %d up, %d down\n"),
+              s->id (),
+              this->servers_.sessions_up_.value (),
+              this->servers_.sessions_down_.value ()));
+
+  ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->list_lock_);
+  int i;
+  for (i = 0; i < MAX_SERVERS; ++i)
     {
-      if (this->list_receivers_[i] != 0)
-        this->list_receivers_[i]->cancel ();
+      if (this->server_list_[i] == s)
+        {
+          if (s->id () != i)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("Server %d is pos %d in list\n"),
+                        s->id (),
+                        i));
+          this->server_list_[i] = 0;
+          break;
+        }
     }
+  if (i >= MAX_SERVERS)
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Server %@ done but not listed\n"), s));
+
   return;
 }
 
-
 void
-Acceptor::stop (void)
+TestData::client_done (Client *c)
 {
-  // This method can be called only after proactor event loop is done
-  // in all threads.
-
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  for (int i = 0; i < MAX_RECEIVERS; ++i)
+  this->clients_.w_cnt_ += c->get_total_snd ();
+  this->clients_.r_cnt_ += c->get_total_rcv ();
+  this->clients_.w_ops_ += c->get_total_w ();
+  this->clients_.r_ops_ += c->get_total_r ();
+  ++this->clients_.sessions_down_;
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%t) Client %d gone; now %d up, %d down\n"),
+              c->id (),
+              this->clients_.sessions_up_.value (),
+              this->clients_.sessions_down_.value ()));
+
+  ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->list_lock_);
+  int i;
+  for (i = 0; i < MAX_CLIENTS; ++i)
     {
-      delete this->list_receivers_[i];
-      this->list_receivers_[i] = 0;
+      if (this->client_list_[i] == c)
+        {
+          if (c->id () != i)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("Client %d is pos %d in list\n"),
+                        c->id (),
+                        i));
+          this->client_list_[i] = 0;
+          break;
+        }
     }
+  if (i >= MAX_CLIENTS)
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Client %@ done but not listed\n"), c));
+
+  return;
 }
 
 void
-Acceptor::on_new_receiver (Receiver & rcvr)
+TestData::stop_all (void)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-  this->sessions_++;
-  this->list_receivers_[rcvr.index_] = &rcvr;
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Acceptor: receiver %d up; now have %d.\n"),
-              rcvr.index_,
-              this->sessions_));
+  int i;
+
+  // Lock and cancel everything. Then release the lock, possibly allowing
+  // cleanups, then grab it again and delete all Servers and Clients.
+  {
+    ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->list_lock_);
+    for (i = 0; i < MAX_CLIENTS; ++i)
+      {
+        if (this->client_list_[i] != 0)
+          this->client_list_[i]->cancel ();
+      }
+
+    for (i = 0; i < MAX_SERVERS; ++i)
+      {
+        if (this->server_list_[i] != 0)
+          this->server_list_[i]->cancel ();
+      }
+  }
+  {
+    ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->list_lock_);
+    for (i = 0; i < MAX_CLIENTS; ++i)
+      {
+        if (this->client_list_[i] != 0)
+          delete this->client_list_[i];
+      }
+
+    for (i = 0; i < MAX_SERVERS; ++i)
+      {
+        if (this->server_list_[i] != 0)
+          delete this->server_list_[i];
+      }
+  }
 }
 
 void
-Acceptor::on_delete_receiver (Receiver & rcvr)
+TestData::report (void)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
+  // Print statistics
+  ACE_TCHAR bufs [256];
+  ACE_TCHAR bufr [256];
 
-  this->sessions_--;
+  ACE_OS::sprintf (bufs,
+                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_TEXT ("(") ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (")"),
+                   this->clients_.w_cnt_.value (),
+                   this->clients_.w_ops_.value ());
 
-  this->total_snd_ += rcvr.get_total_snd();
-  this->total_rcv_ += rcvr.get_total_rcv();
-  this->total_w_   += rcvr.get_total_w();
-  this->total_r_   += rcvr.get_total_r();
+  ACE_OS::sprintf (bufr,
+                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_TEXT ("(") ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (")"),
+                   this->clients_.r_cnt_.value (),
+                   this->clients_.r_ops_.value ());
 
-  if (rcvr.index_ >= 0
-      && rcvr.index_ < MAX_RECEIVERS
-      && this->list_receivers_[rcvr.index_] == &rcvr)
-    this->list_receivers_[rcvr.index_] = 0;
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Clients total bytes (ops): snd=%s rcv=%s\n"),
+              bufs,
+              bufr));
+
+  ACE_OS::sprintf (bufs,
+                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_TEXT ("(") ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (")"),
+                   this->servers_.w_cnt_.value (),
+                   this->servers_.w_ops_.value ());
+
+  ACE_OS::sprintf (bufr,
+                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_TEXT ("(") ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (")"),
+                   this->servers_.r_cnt_.value (),
+                   this->servers_.r_ops_.value ());
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Acceptor: receiver %d gone; %d remain\n"),
-              rcvr.index_,
-              this->sessions_));
+              ACE_TEXT ("Servers total bytes (ops): snd=%s rcv=%s\n"),
+              bufs,
+              bufr));
+
+  if (this->clients_.w_cnt_.value () == 0 ||
+      this->clients_.r_cnt_.value () == 0 ||
+      this->servers_.w_cnt_.value () == 0 ||
+      this->servers_.r_cnt_.value () == 0   )
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("It appears that this test didn't ")
+                ACE_TEXT ("really do anything. Something is very wrong.\n")));
 }
 
-Receiver *
-Acceptor::make_handler (void)
+
+class Acceptor : public ACE_Asynch_Acceptor<Server>
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_, 0);
+public:
+  Acceptor (TestData *tester);
+  virtual ~Acceptor (void);
 
-  if (this->sessions_ >= MAX_RECEIVERS)
-    return 0;
+  // Virtual from ACE_Asynch_Acceptor
+  Server *make_handler (void);
 
-  for (int i = 0; i < MAX_RECEIVERS; ++i)
-    {
-      if (this->list_receivers_[i] == 0)
-        {
-          ACE_NEW_RETURN (this->list_receivers_[i],
-                          Receiver (this, i),
-                          0);
-          return this->list_receivers_[i];
-        }
-    }
+private:
+  TestData *tester_;
+};
 
-  return 0;
+// *************************************************************
+Acceptor::Acceptor (TestData *tester)
+  : tester_ (tester)
+{
+}
+
+Acceptor::~Acceptor (void)
+{
+  this->cancel ();
+}
+
+Server *
+Acceptor::make_handler (void)
+{
+  return this->tester_->server_up ();
 }
+
 // ***************************************************
-Receiver::Receiver (Acceptor * acceptor, int index)
-  : acceptor_ (acceptor),
-    index_    (index),
+Server::Server ()
+{
+  ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shouldn't use this constructor!\n")));
+}
+
+Server::Server (TestData *tester, int id)
+  : tester_   (tester),
+    id_       (id),
     handle_   (ACE_INVALID_HANDLE),
     io_count_ (0),
     flg_cancel_(0),
@@ -498,26 +665,24 @@ Receiver::Receiver (Acceptor * acceptor, int index)
     total_w_  (0),
     total_r_  (0)
 {
-  if (this->acceptor_ != 0)
-    this->acceptor_->on_new_receiver (*this);
 }
 
-Receiver::~Receiver (void)
+Server::~Server (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Receiver %d dtor; %d sends (%d bytes); ")
+              ACE_TEXT ("(%t) Server %d dtor; %d sends (%d bytes); ")
               ACE_TEXT ("%d recvs (%d bytes)\n"),
-              this->index_,
+              this->id_,
               this->total_w_, this->total_snd_,
               this->total_r_, this->total_rcv_));
   if (this->io_count_ != 0)
     ACE_ERROR ((LM_WARNING,
-                ACE_TEXT ("(%t) Receiver %d deleted with ")
+                ACE_TEXT ("(%t) Server %d deleted with ")
                 ACE_TEXT ("%d I/O outstanding\n"),
-                this->index_,
+                this->id_,
                 this->io_count_));
 
-  // This test bounces data back and forth between Senders and Receivers.
+  // This test bounces data back and forth between Clients and Servers.
   // Therefore, if there was significantly more data in one direction, that's
   // a problem. Remember, the byte counts are unsigned values.
   int issue_data_warning = 0;
@@ -539,18 +704,18 @@ Receiver::~Receiver (void)
     ACE_DEBUG ((LM_WARNING,
                 ACE_TEXT ("(%t) Above byte counts look odd; need review\n")));
 
-  if (this->acceptor_ != 0)
-    this->acceptor_->on_delete_receiver (*this);
+  if (this->tester_ != 0)
+    this->tester_->server_done (this);
 
   if (this->handle_ != ACE_INVALID_HANDLE)
     ACE_OS::closesocket (this->handle_);
 
-  this->index_ = -1;
+  this->id_ = -1;
   this->handle_= ACE_INVALID_HANDLE;
 }
 
 void
-Receiver::cancel ()
+Server::cancel ()
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
 
@@ -562,24 +727,24 @@ Receiver::cancel ()
 
 
 void
-Receiver::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr&)
+Server::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr&)
 {
   ACE_TCHAR str[256];
   if (0 == peer.addr_to_string (str, sizeof (str) / sizeof (ACE_TCHAR)))
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%t) Receiver %d connection from %s\n"),
-                this->index_,
+                ACE_TEXT ("(%t) Server %d connection from %s\n"),
+                this->id_,
                 str));
   else
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Receiver %d %p\n"),
-                this->index_,
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Server %d %p\n"),
+                this->id_,
                 ACE_TEXT ("addr_to_string")));
   return;
 }
 
 
 void
-Receiver::open (ACE_HANDLE handle, ACE_Message_Block &)
+Server::open (ACE_HANDLE handle, ACE_Message_Block &)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -597,11 +762,11 @@ Receiver::open (ACE_HANDLE handle, ACE_Message_Block &)
     if (this->ws_.open (*this, this->handle_) == -1)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%t) %p\n"),
-                  ACE_TEXT ("Receiver::ACE_Asynch_Write_Stream::open")));
+                  ACE_TEXT ("Server::ACE_Asynch_Write_Stream::open")));
     else if (this->rs_.open (*this, this->handle_) == -1)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%t) %p\n"),
-                  ACE_TEXT ("Receiver::ACE_Asynch_Read_Stream::open")));
+                  ACE_TEXT ("Server::ACE_Asynch_Read_Stream::open")));
     else
       this->initiate_read_stream ();
 
@@ -612,7 +777,7 @@ Receiver::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Receiver::initiate_read_stream (void)
+Server::initiate_read_stream (void)
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     return -1;
@@ -631,13 +796,13 @@ Receiver::initiate_read_stream (void)
       // a 0-byte read as we would if underlying calls used WSARecv.
       if (ACE_OS::last_error () == ERROR_NETNAME_DELETED)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           ACE_TEXT ("(%t) Receiver %d, peer closed\n"),
-                           this->index_),
+                           ACE_TEXT ("(%t) Server %d, peer closed\n"),
+                           this->id_),
                           -1);
 #endif /* ACE_WIN32 */
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%t) Receiver %d, %p\n"),
-                         this->index_,
+                         ACE_TEXT ("(%t) Server %d, %p\n"),
+                         this->id_,
                          ACE_TEXT ("read")),
                         -1);
     }
@@ -648,7 +813,7 @@ Receiver::initiate_read_stream (void)
 }
 
 int
-Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
+Server::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     {
@@ -660,7 +825,7 @@ Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
     {
       mb.release ();
       ACE_ERROR_RETURN((LM_ERROR,
-                        ACE_TEXT ("(%t) Receiver::ACE_Asynch_Write_Stream::write nbytes <0 ")),
+                        ACE_TEXT ("(%t) Server::ACE_Asynch_Write_Stream::write nbytes <0 ")),
                        -1);
     }
 
@@ -671,13 +836,13 @@ Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
       // On peer close, WriteFile will yield ERROR_NETNAME_DELETED.
       if (ACE_OS::last_error () == ERROR_NETNAME_DELETED)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           ACE_TEXT ("(%t) Receiver %d, peer gone\n"),
-                           this->index_),
+                           ACE_TEXT ("(%t) Server %d, peer gone\n"),
+                           this->id_),
                           -1);
 #endif /* ACE_WIN32 */
       ACE_ERROR_RETURN((LM_ERROR,
-                        ACE_TEXT ("(%t) Receiver %d, %p\n"),
-                        this->index_,
+                        ACE_TEXT ("(%t) Server %d, %p\n"),
+                        this->id_,
                         ACE_TEXT ("write")),
                        -1);
     }
@@ -688,7 +853,7 @@ Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes)
 }
 
 void
-Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
+Server::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_ );
@@ -703,8 +868,8 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
         LogLocker log_lock;
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) **** Receiver %d: handle_read_stream() ****\n"),
-                    this->index_));
+                    ACE_TEXT ("(%t) **** Server %d: handle_read_stream() ****\n"),
+                    this->id_));
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %d\n"),
                     ACE_TEXT ("bytes_to_read"),
@@ -754,15 +919,15 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
           prio = LM_ERROR;
         ACE_Log_Msg::instance ()->errnum (result.error ());
         ACE_Log_Msg::instance ()->log (prio,
-                                       ACE_TEXT ("(%t) Receiver %d; %p\n"),
-                                       this->index_,
+                                       ACE_TEXT ("(%t) Server %d; %p\n"),
+                                       this->id_,
                                        ACE_TEXT ("read"));
       }
     else if (loglevel > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Receiver %d: read %d bytes\n"),
-                    this->index_,
+                    ACE_TEXT ("(%t) Server %d: read %d bytes\n"),
+                    this->id_,
                     result.bytes_transferred ()));
       }
 
@@ -788,7 +953,7 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 }
 
 void
-Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
+Server::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -803,8 +968,8 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
         mb.rd_ptr (mb.rd_ptr () - result.bytes_transferred ());
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) **** Receiver %d: handle_write_stream() ****\n"),
-                    this->index_));
+                    ACE_TEXT ("(%t) **** Server %d: handle_write_stream() ****\n"),
+                    this->id_));
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %d\n"),
                     ACE_TEXT ("bytes_to_write"),
@@ -854,15 +1019,15 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
           prio = LM_ERROR;
         ACE_Log_Msg::instance ()->errnum (result.error ());
         ACE_Log_Msg::instance ()->log (prio,
-                                       ACE_TEXT ("(%t) Receiver %d; %p\n"),
-                                       this->index_,
+                                       ACE_TEXT ("(%t) Server %d; %p\n"),
+                                       this->id_,
                                        ACE_TEXT ("write"));
       }
     else if (loglevel > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Receiver %d: wrote %d bytes ok\n"),
-                    this->index_,
+                    ACE_TEXT ("(%t) Server %d: wrote %d bytes ok\n"),
+                    this->id_,
                     result.bytes_transferred ()));
       }
 
@@ -887,156 +1052,45 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 //  Connector
 // *******************************************
 
-class Connector : public ACE_Asynch_Connector<Sender>
+class Connector : public ACE_Asynch_Connector<Client>
 {
-  friend class Sender;
 public:
-  int get_number_sessions (void) { return this->sessions_; }
-  size_t get_total_snd (void) { return this->total_snd_; }
-  size_t get_total_rcv (void) { return this->total_rcv_; }
-  long get_total_w   (void) { return this->total_w_; }
-  long get_total_r   (void) { return this->total_r_; }
-
-  Connector (void);
+  Connector (TestData *tester);
   virtual ~Connector (void);
 
   int  start (const ACE_INET_Addr &addr, int num);
-  void stop (void);
-  void cancel_all (void);
 
   // Virtual from ACE_Asynch_Connector
-  Sender *make_handler (void);
+  Client *make_handler (void);
 
 private:
-  void on_new_sender  (Sender &rcvr);
-  void on_delete_sender (Sender &rcvr);
-
-  ACE_SYNCH_RECURSIVE_MUTEX lock_;
-  int sessions_;
-  Sender *list_senders_[MAX_SENDERS];
-  size_t total_snd_;
-  size_t total_rcv_;
-  long total_w_;
-  long total_r_;
+  TestData *tester_;
 };
 
 // *************************************************************
 
-Connector::Connector (void)
-  : sessions_ (0),
-    total_snd_(0),
-    total_rcv_(0),
-    total_w_  (0),
-    total_r_  (0)
+Connector::Connector (TestData *tester)
+  : tester_ (tester)
 {
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  for (int i = 0; i < MAX_SENDERS; ++i)
-     this->list_senders_[i] = 0;
 }
 
 Connector::~Connector (void)
 {
-  this->stop ();
-}
-
-
-void
-Connector::cancel_all(void)
-{
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
   this->cancel ();
-
-  for (int i = 0; i < MAX_SENDERS; ++i)
-    {
-      if (this->list_senders_[i] != 0)
-        this->list_senders_[i]->cancel ();
-    }
-  return;
-}
-
-
-void
-Connector::stop (void)
-{
-  // This method can be called only after proactor event loop is done
-  // in all threads.
-
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  for (int i = 0; i < MAX_SENDERS; ++i)
-    {
-      delete this->list_senders_[i];
-      this->list_senders_[i] = 0;
-    }
-}
-
-void
-Connector::on_new_sender (Sender &sndr)
-{
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-  this->sessions_++;
-  this->list_senders_[sndr.index_] = &sndr;
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Connector: sender %d up; now have %d.\n"),
-              sndr.index_,
-              this->sessions_));
 }
 
-void
-Connector::on_delete_sender (Sender &sndr)
-{
-  ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_);
-
-  this->sessions_--;
-  this->total_snd_ += sndr.get_total_snd();
-  this->total_rcv_ += sndr.get_total_rcv();
-  this->total_w_   += sndr.get_total_w();
-  this->total_r_   += sndr.get_total_r();
-
-  if (sndr.index_ >= 0
-      && sndr.index_ < MAX_SENDERS
-      && this->list_senders_[sndr.index_] == &sndr)
-    this->list_senders_[sndr.index_] = 0;
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Connector: sender %d gone; %d remain\n"),
-              sndr.index_,
-              this->sessions_));
-}
-
-Sender *
+Client *
 Connector::make_handler (void)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_, 0);
-
-  if (this->sessions_ >= MAX_SENDERS)
-    return 0;
-
-  for (int i = 0; i < MAX_SENDERS; ++i)
-    {
-      if (this->list_senders_ [i] == 0)
-        {
-          ACE_NEW_RETURN (this->list_senders_[i],
-                          Sender (this, i),
-                          0);
-          return this->list_senders_[i];
-        }
-    }
-
-  return 0;
+  return this->tester_->client_up ();
 }
 
 
 int
 Connector::start (const ACE_INET_Addr& addr, int num)
 {
-
-  ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_, 0);
-
-  if (num > MAX_SENDERS)
-    num = MAX_SENDERS;
+  if (num > MAX_CLIENTS)
+    num = MAX_CLIENTS;
 
   if (num < 0)
     num = 1;
@@ -1070,9 +1124,14 @@ Connector::start (const ACE_INET_Addr& addr, int num)
 }
 
 
-Sender::Sender (Connector * connector, int index)
-  : index_        (index),
-    connector_    (connector),
+Client::Client ()
+{
+  ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shouldn't use this constructor!\n")));
+}
+
+Client::Client (TestData *tester, int id)
+  : tester_       (tester),
+    id_           (id),
     handle_       (ACE_INVALID_HANDLE),
     io_count_     (0),
     stop_writing_ (0),
@@ -1082,25 +1141,23 @@ Sender::Sender (Connector * connector, int index)
     total_w_      (0),
     total_r_      (0)
 {
-  if (this->connector_ != 0)
-    this->connector_->on_new_sender (*this);
 }
 
-Sender::~Sender (void)
+Client::~Client (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Sender %d dtor; %d sends (%d bytes); ")
+              ACE_TEXT ("(%t) Client %d dtor; %d sends (%d bytes); ")
               ACE_TEXT ("%d recvs (%d bytes)\n"),
-              this->index_,
+              this->id_,
               this->total_w_, this->total_snd_,
               this->total_r_, this->total_rcv_));
   if (this->io_count_ != 0)
     ACE_ERROR ((LM_WARNING,
-                ACE_TEXT ("(%t) Sender %d deleted with %d I/O outstanding\n"),
-                this->index_,
+                ACE_TEXT ("(%t) Client %d deleted with %d I/O outstanding\n"),
+                this->id_,
                 this->io_count_));
 
-  // This test bounces data back and forth between Senders and Receivers.
+  // This test bounces data back and forth between Clients and Servers.
   // Therefore, if there was significantly more data in one direction, that's
   // a problem. Remember, the byte counts are unsigned values.
   int issue_data_warning = 0;
@@ -1122,20 +1179,20 @@ Sender::~Sender (void)
     ACE_DEBUG ((LM_WARNING,
                 ACE_TEXT ("(%t) Above byte counts look odd; need review\n")));
 
-  if (this->connector_ != 0)
-    this->connector_->on_delete_sender (*this);
+  if (this->tester_ != 0)
+    this->tester_->client_done (this);
 
+  this->id_ = -1;
+  this->handle_= ACE_INVALID_HANDLE;
   if (this->handle_ != ACE_INVALID_HANDLE)
     {
       ACE_OS::closesocket (this->handle_);
     }
-
-  this->index_ = -1;
   this->handle_= ACE_INVALID_HANDLE;
 }
 
 void
-Sender::cancel ()
+Client::cancel ()
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
 
@@ -1146,12 +1203,12 @@ Sender::cancel ()
 }
 
 void
-Sender::close ()
+Client::close ()
 {
   // This must be called with the lock_ held.
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Closing Sender %d writes; %d I/O outstanding\n"),
-              this->index_, this->io_count_));
+              ACE_TEXT ("(%t) Closing Client %d writes; %d I/O outstanding\n"),
+              this->id_, this->io_count_));
   ACE_OS::shutdown (this->handle_, ACE_SHUTDOWN_WRITE);
   this->stop_writing_ = 1;
   return;
@@ -1159,7 +1216,7 @@ Sender::close ()
 
 
 void
-Sender::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr& local)
+Client::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr& local)
 {
   char my_name[256];
   char peer_name[256];
@@ -1178,7 +1235,7 @@ Sender::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr& local)
                 ((LM_ERROR,
                   ACE_TEXT ("(%t) Sender %d peer address (%C) does not ")
                   ACE_TEXT ("match host address (%C)\n"),
-                  this->index_,
+                  this->id_,
                   peer_name, my_name));
               return;
             }
@@ -1188,7 +1245,7 @@ Sender::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr& local)
            ACE_ERROR
              ((LM_ERROR,
                ACE_TEXT ("(%t) Sender %d unable to convert host addr\n"),
-               this->index_));
+               this->id_));
            return;
         }
      }
@@ -1196,28 +1253,26 @@ Sender::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr& local)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%t) Sender %d unable to convert peer addr\n"),
-                  this->index_));
+                  this->id_));
       return;
     }
 
   if (0 == local.addr_to_string (local_str,
                                  sizeof (local_str) / sizeof (ACE_TCHAR)))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) Sender %d connected on %s\n"),
-                  this->index_,
-                  local_str));
-    }
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT ("(%t) Client %d connected on %s\n"),
+                this->id_,
+                local_str));
   else
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Receiver %d %p\n"),
-                this->index_,
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Client %d %p\n"),
+                this->id_,
                 ACE_TEXT ("addr_to_string")));
   return;
 }
 
 
 void
-Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
+Client::open (ACE_HANDLE handle, ACE_Message_Block &)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -1236,13 +1291,13 @@ Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
     if (this->ws_.open (*this, this->handle_) == -1)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%t) %p\n"),
-                  ACE_TEXT ("Sender::ACE_Asynch_Write_Stream::open")));
+                  ACE_TEXT ("Client::ACE_Asynch_Write_Stream::open")));
 
     // Open ACE_Asynch_Read_Stream
     else if (this->rs_.open (*this, this->handle_) == -1)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%t) %p\n"),
-                  ACE_TEXT ("Sender::ACE_Asynch_Read_Stream::open")));
+                  ACE_TEXT ("Client::ACE_Asynch_Read_Stream::open")));
 
     else if (this->initiate_write_stream () == 0)
       {
@@ -1257,7 +1312,7 @@ Sender::open (ACE_HANDLE handle, ACE_Message_Block &)
 }
 
 int
-Sender::initiate_write_stream (void)
+Client::initiate_write_stream (void)
 {
   if (this->flg_cancel_ != 0 ||
       this->stop_writing_ ||
@@ -1301,7 +1356,7 @@ Sender::initiate_write_stream (void)
       mb1->release ();
       ACE_ERROR_RETURN((LM_ERROR,
                         ACE_TEXT ("(%t) %p\n"),
-                        ACE_TEXT ("Sender::ACE_Asynch_Stream::writev")),
+                        ACE_TEXT ("Client::ACE_Asynch_Stream::writev")),
                        -1);
     }
 #else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
@@ -1321,13 +1376,13 @@ Sender::initiate_write_stream (void)
       // On peer close, WriteFile will yield ERROR_NETNAME_DELETED.
       if (ACE_OS::last_error () == ERROR_NETNAME_DELETED)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           ACE_TEXT ("(%t) Sender %d, peer gone\n"),
-                           this->index_),
+                           ACE_TEXT ("(%t) Client %d, peer gone\n"),
+                           this->id_),
                           -1);
 #endif /* ACE_WIN32 */
       ACE_ERROR_RETURN((LM_ERROR,
-                        ACE_TEXT ("(%t) Sender %d, %p\n"),
-                        this->index_,
+                        ACE_TEXT ("(%t) Client %d, %p\n"),
+                        this->id_,
                         ACE_TEXT ("write")),
                        -1);
     }
@@ -1339,12 +1394,13 @@ Sender::initiate_write_stream (void)
 }
 
 int
-Sender::initiate_read_stream (void)
+Client::initiate_read_stream (void)
 {
   if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE)
     return -1;
 
-  static const size_t complete_message_length = ACE_OS::strlen (complete_message);
+  static const size_t complete_message_length =
+    ACE_OS::strlen (complete_message);
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
   ACE_Message_Block *mb1 = 0,
@@ -1392,7 +1448,7 @@ Sender::initiate_read_stream (void)
       mb1->release ();
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("(%t) %p\n"),
-                         ACE_TEXT ("Sender::ACE_Asynch_Read_Stream::readv")),
+                         ACE_TEXT ("Client::ACE_Asynch_Read_Stream::readv")),
                         -1);
     }
 #else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */
@@ -1406,8 +1462,8 @@ Sender::initiate_read_stream (void)
   // We allocate +1 only for proper printing - we can just set the last byte
   // to '\0' before printing out
   ACE_NEW_RETURN (mb,
-                  ACE_Message_Block (blksize + 1)
-                  , -1);
+                  ACE_Message_Block (blksize + 1),
+                  -1);
 
   // Inititiate read
   if (this->rs_.read (*mb, mb->size () - 1) == -1)
@@ -1418,13 +1474,13 @@ Sender::initiate_read_stream (void)
       // a 0-byte read as we would if underlying calls used WSARecv.
       if (ACE_OS::last_error () == ERROR_NETNAME_DELETED)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           ACE_TEXT ("(%t) Receiver %d, peer closed\n"),
-                           this->index_),
+                           ACE_TEXT ("(%t) Client %d, peer closed\n"),
+                           this->id_),
                           -1);
 #endif /* ACE_WIN32 */
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%t) Sender %d, %p\n"),
-                         this->index_,
+                         ACE_TEXT ("(%t) Client %d, %p\n"),
+                         this->id_,
                          ACE_TEXT ("read")),
                         -1);
     }
@@ -1436,7 +1492,7 @@ Sender::initiate_read_stream (void)
 }
 
 void
-Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
+Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -1448,8 +1504,8 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
         LogLocker log_lock;
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) **** Sender %d: handle_write_stream() ****\n"),
-                    index_));
+                    ACE_TEXT ("(%t) **** Client %d: handle_write_stream() ****\n"),
+                    this->id_));
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %d\n"),
                     ACE_TEXT ("bytes_to_write"),
@@ -1538,15 +1594,15 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
           prio = LM_ERROR;
         ACE_Log_Msg::instance ()->errnum (result.error ());
         ACE_Log_Msg::instance ()->log (prio,
-                                       ACE_TEXT ("(%t) Sender %d; %p\n"),
-                                       this->index_,
+                                       ACE_TEXT ("(%t) Client %d; %p\n"),
+                                       this->id_,
                                        ACE_TEXT ("write"));
       }
     else if (loglevel > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Sender %d: wrote %d bytes ok\n"),
-                    this->index_,
+                    ACE_TEXT ("(%t) Client %d: wrote %d bytes ok\n"),
+                    this->id_,
                     result.bytes_transferred ()));
       }
 
@@ -1555,13 +1611,13 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
     if (result.error () == 0 && result.bytes_transferred () > 0)
       {
         this->total_snd_ += result.bytes_transferred ();
-	if (this->total_snd_ >= xfer_limit)
-	  {
-	    ACE_DEBUG ((LM_DEBUG,
-			ACE_TEXT ("(%t) Sender %d sent %d, limit %d\n"),
-			this->index_, this->total_snd_, xfer_limit));
-	    this->close ();
-	  }
+        if (this->total_snd_ >= xfer_limit)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT ("(%t) Client %d sent %d, limit %d\n"),
+                        this->id_, this->total_snd_, xfer_limit));
+            this->close ();
+          }
         if (duplex != 0)   // full duplex, continue write
           {
             if ((this->total_snd_- this->total_rcv_) < 1024*32 ) //flow control
@@ -1579,7 +1635,7 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 }
 
 void
-Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
+Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 {
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_);
@@ -1591,8 +1647,8 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
         LogLocker log_lock;
 
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) **** Sender %d: handle_read_stream() ****\n"),
-                    index_));
+                    ACE_TEXT ("(%t) **** Client %d: handle_read_stream() ****\n"),
+                    this->id_));
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s = %d\n"),
                     ACE_TEXT ("bytes_to_read"),
@@ -1664,15 +1720,15 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
           prio = LM_ERROR;
         ACE_Log_Msg::instance ()->errnum (result.error ());
         ACE_Log_Msg::instance ()->log (prio,
-                                       ACE_TEXT ("(%t) Sender %d; %p\n"),
-                                       this->index_,
+                                       ACE_TEXT ("(%t) Client %d; %p\n"),
+                                       this->id_,
                                        ACE_TEXT ("read"));
       }
     else if (loglevel > 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Sender %d: read %d bytes ok\n"),
-                    this->index_,
+                    ACE_TEXT ("(%t) Client %d: read %d bytes ok\n"),
+                    this->id_,
                     result.bytes_transferred ()));
       }
 
@@ -1712,10 +1768,10 @@ print_usage (int /* argc */, ACE_TCHAR *argv[])
       ACE_TEXT ("\n    s SUN")
       ACE_TEXT ("\n    d default")
       ACE_TEXT ("\n-d <duplex mode 1-on/0-off>")
-      ACE_TEXT ("\n-h <host> for Sender mode")
+      ACE_TEXT ("\n-h <host> for Client mode")
       ACE_TEXT ("\n-n <number threads for Proactor pool>")
       ACE_TEXT ("\n-p <port to listen/connect>")
-      ACE_TEXT ("\n-s <number of sender's instances>")
+      ACE_TEXT ("\n-c <number of client instances>")
       ACE_TEXT ("\n-b run client and server at the same time")
       ACE_TEXT ("\n    f file")
       ACE_TEXT ("\n    c console")
@@ -1723,7 +1779,7 @@ print_usage (int /* argc */, ACE_TCHAR *argv[])
       ACE_TEXT ("\n    0 - log errors and highlights")
       ACE_TEXT ("\n    1 - log level 0 plus progress information")
       ACE_TEXT ("\n    2 - log level 1 plus operation parameters and results")
-      ACE_TEXT ("\n-x max transfer byte count per Sender")
+      ACE_TEXT ("\n-x max transfer byte count per Client")
       ACE_TEXT ("\n-u show this message")
       ACE_TEXT ("\n"),
       argv[0]
@@ -1779,7 +1835,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   max_aio_operations = 512;       // POSIX Proactor params
   proactor_type = DEFAULT;        // Proactor type = default
   threads = 3;                    // size of Proactor thread pool
-  senders = 10;                   // number of senders
+  clients = 10;                   // number of clients
   loglevel = 0;                   // log level : only errors and highlights
   // Default transfer limit 50 messages per Sender
   xfer_limit = 50 * ACE_OS::strlen (complete_message);
@@ -1787,7 +1843,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   if (argc == 1) // no arguments , so one button test
     return 0;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:s:v:ub"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub"));
   int c;
 
   while ((c = get_opt ()) != EOF)
@@ -1795,10 +1851,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'x':  // xfer limit
-        xfer_limit = ACE_static_cast (size_t,
-				      ACE_OS::atoi (get_opt.opt_arg ()));
+        xfer_limit = static_cast<size_t> (ACE_OS::atoi (get_opt.opt_arg ()));
         if (xfer_limit == 0)
-	  xfer_limit = 1;          // Bare minimum.
+          xfer_limit = 1;          // Bare minimum.
         break;
       case 'b':  // both client and server
         both = 1;
@@ -1818,10 +1873,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
       case 'n':         // thread pool size
         threads = ACE_OS::atoi (get_opt.opt_arg ());
         break;
-      case 's':     // number of senders
-        senders = ACE_OS::atoi (get_opt.opt_arg ());
-        if (senders > MAX_SENDERS)
-          senders = MAX_SENDERS;
+      case 'c':     // number of clients
+        clients = ACE_OS::atoi (get_opt.opt_arg ());
+        if (clients > MAX_CLIENTS)
+          clients = MAX_CLIENTS;
         break;
       case 'o':     // max number of aio for proactor
         max_aio_operations = ACE_OS::atoi (get_opt.opt_arg ());
@@ -1859,119 +1914,52 @@ run_main (int argc, ACE_TCHAR *argv[])
   disable_signal (SIGPIPE, SIGPIPE);
 
   MyTask    task1;
-  Acceptor  acceptor;
-  Connector connector;
-
-  int rc = 0;
+  TestData  test;
 
-  if (task1.start (threads,
-                   proactor_type,
-                   max_aio_operations) == 0)
+  if (task1.start (threads, proactor_type, max_aio_operations) == 0)
     {
+      Acceptor  acceptor (&test);
+      Connector connector (&test);
+      ACE_INET_Addr addr (port, "::");
+
+      int rc = 0;
 
       if (both != 0 || host == 0) // Acceptor
         {
-          if (acceptor.open (ACE_INET_Addr (port, "::"), 0, 1) == 0)
+          // Simplify, initial read with zero size
+          if (acceptor.open (addr, 0, 1) == 0)
             rc = 1;
         }
 
       if (both != 0 || host != 0)
         {
-          ACE_INET_Addr addr;
           if (host == 0)
             host = ACE_IPV6_LOCALHOST;
 
-          if (addr.set (port, host) == -1)
+          if (addr.set (port, host, 1, addr.get_type ()) == -1)
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), host));
           else
-            rc += connector.start (addr, senders);
+            rc += connector.start (addr, clients);
         }
-    }
 
-  // Wait a couple of seconds to let things get going, then poll til
-  // all sessions are done.
-  ACE_OS::sleep (2);
+      // Wait a few seconds to let things get going, then poll til
+      // all sessions are done. Note that when we exit this scope, the
+      // Acceptor and Connector will be destroyed, which should prevent
+      // further connections and also test how well destroyed handlers
+      // are handled.
+      ACE_OS::sleep (3);
+    }
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Sleeping til sessions run down.\n")));
-  while (acceptor.get_number_sessions () > 0 ||
-	 connector.get_number_sessions () > 0   )
+  while (!test.testing_done ())
     ACE_OS::sleep (1);
 
-#if 0
-  // Cancel all pending AIO on Connector and Senders
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Cancel Connector/Senders: sessions_=%d\n"),
-              connector.get_number_sessions ()
-            ));
-  connector.cancel_all ();
-#endif
-
-  //Cancel all pending AIO on Acceptor And Receivers
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Cancel Acceptor/Receivers:sessions_=%d\n"),
-              acceptor.get_number_sessions ()
-            ));
-  acceptor.cancel_all ();
+  test.stop_all ();
 
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Stop Thread Pool Task\n")
-            ));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Stop Thread Pool Task\n")));
   task1.stop ();
 
-  // As Proactor event loop now is inactive it is safe to destroy all
-  // Senders
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Stop Connector/Senders: sessions_=%d\n"),
-              connector.get_number_sessions ()
-            ));
-  connector.stop ();
-
-  // As Proactor event loop now is inactive it is safe to destroy all
-  // Receivers
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Stop Acceptor/Receivers:sessions_=%d\n"),
-              acceptor.get_number_sessions ()
-            ));
-  acceptor.stop ();
-
-  //Print statistic
-  ACE_TCHAR bufs [256];
-  ACE_TCHAR bufr [256];
-
-  ACE_OS::sprintf (bufs,
-                   ACE_SIZE_T_FORMAT_SPECIFIER
-                   ACE_TEXT ("(%ld)"),
-                   connector.get_total_snd (),
-                   connector.get_total_w ());
-
-  ACE_OS::sprintf (bufr,
-                   ACE_SIZE_T_FORMAT_SPECIFIER
-                   ACE_TEXT ("(%ld)"),
-                   connector.get_total_rcv (),
-                   connector.get_total_r ());
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Connector/Senders  total bytes: snd=%s rcv=%s\n"),
-              bufs,
-              bufr));
-
-  ACE_OS::sprintf (bufs,
-                   ACE_SIZE_T_FORMAT_SPECIFIER
-                   ACE_TEXT ("(%ld)"),
-                   acceptor.get_total_snd (),
-                   acceptor.get_total_w ());
-
-  ACE_OS::sprintf (bufr,
-                   ACE_SIZE_T_FORMAT_SPECIFIER
-                   ACE_TEXT ("(%ld)"),
-                   acceptor.get_total_rcv (),
-                   acceptor.get_total_r ());
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Acceptor/Receivers total bytes: snd=%s rcv=%s\n"),
-              bufs,
-              bufr));
-
 #endif /* ACE_HAS_IPV6 */
+
   ACE_END_TEST;
 
   return 0;
@@ -1979,13 +1967,13 @@ run_main (int argc, ACE_TCHAR *argv[])
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Asynch_Acceptor<Receiver>;
-template class ACE_Asynch_Connector<Sender>;
+template class ACE_Asynch_Acceptor<Server>;
+template class ACE_Asynch_Connector<Client>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Asynch_Acceptor<Receiver>
-#pragma instantiate ACE_Asynch_Connector<Sender>
+#pragma instantiate ACE_Asynch_Acceptor<Server>
+#pragma instantiate ACE_Asynch_Connector<Client>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
@@ -1998,7 +1986,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Threads or Asynchronous IO is unsupported.\n")
-              ACE_TEXT ("Proactor_Test_IPV6 will not be run.")));
+              ACE_TEXT ("Proactor_Test will not be run.")));
 
   ACE_END_TEST;
 
diff --git a/tests/Proactor_Timer_Test.cpp b/tests/Proactor_Timer_Test.cpp
index 9939f131e2a..da61f142143 100644
--- a/tests/Proactor_Timer_Test.cpp
+++ b/tests/Proactor_Timer_Test.cpp
@@ -69,7 +69,7 @@ Time_Handler::Time_Handler (void)
 void
 Time_Handler::handle_time_out (const ACE_Time_Value &, const void *arg)
 {
-  size_t current_count = *(ACE_reinterpret_cast (const size_t *, arg));
+  size_t current_count = *(reinterpret_cast<const size_t *> (arg));
   if (current_count != count)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("Expected timer %d, not %d\n"),
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index 46104a724f0..0b53482a25e 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -511,8 +511,7 @@ static void *
 client (void *arg)
 {
   ACE_INET_Addr *remote_addr =
-    ACE_reinterpret_cast (ACE_INET_Addr *,
-                          arg);
+    reinterpret_cast<ACE_INET_Addr *> (arg);
   ACE_INET_Addr server_addr (remote_addr->get_port_number (),
                              ACE_DEFAULT_SERVER_HOST);
   ACE_SOCK_Stream stream;
diff --git a/tests/QtReactor_Test.cpp b/tests/QtReactor_Test.cpp
index d6aafd3e706..544b7cd8b7b 100644
--- a/tests/QtReactor_Test.cpp
+++ b/tests/QtReactor_Test.cpp
@@ -10,32 +10,32 @@
 //    QtReactor_Test.cpp
 //
 // = DESCRIPTION
-//    Simple test of QtReactor. Test is intended to verify if QtReactor 
-//    correctly cooperates with Qt event loop in typical application. Test 
-//    creates a number of timers which send datagrams. These datagrams are 
-//    expected by datagram_handlers registered in reactor. Test asynchronously 
-//    establishes also a number of loopback tcp connections using ACE_Acceptors 
-//    and ACE_Connectors. Socket activities are handled asynchronously to ensure 
-//    that reactor does not lose events in traffic transmission. Moreover, test 
-//    registers and removes handlers frequently to cover register/remove_handler 
+//    Simple test of QtReactor. Test is intended to verify if QtReactor
+//    correctly cooperates with Qt event loop in typical application. Test
+//    creates a number of timers which send datagrams. These datagrams are
+//    expected by datagram_handlers registered in reactor. Test asynchronously
+//    establishes also a number of loopback tcp connections using ACE_Acceptors
+//    and ACE_Connectors. Socket activities are handled asynchronously to ensure
+//    that reactor does not lose events in traffic transmission. Moreover, test
+//    registers and removes handlers frequently to cover register/remove_handler
 //    method of QtReactor which are known (10/07/2004) to be buggy.
 //
 //    Classes:
-//      QTestApplication     - main qt application running event loop for a 
+//      QTestApplication     - main qt application running event loop for a
 //                             finite time
 //      Dgram_Handler        - responsible for sending and receiving datagrams as
-//                             well as handling timeouts. Datagrams are sent in 
+//                             well as handling timeouts. Datagrams are sent in
 //                             handle_timeout method.
-//      TCPConnectionHandler - connection handler responsible for sending and 
+//      TCPConnectionHandler - connection handler responsible for sending and
 //                             receiving data using tcp streams.
-//      TCPAcceptorHandler   - acceptor responsible for acceptance and 
-//                             registration of connections in HandlersRegister 
+//      TCPAcceptorHandler   - acceptor responsible for acceptance and
+//                             registration of connections in HandlersRegister
 //                             class.
-//      HandlersRegister     - register of event_handlers, responsible also for 
+//      HandlersRegister     - register of event_handlers, responsible also for
 //                             the analysis of test results.
-//      
+//
 // = AUTHOR
-//    Marek Brudka, mbrudka@elka.pw.edu.pl      
+//    Marek Brudka, mbrudka@elka.pw.edu.pl
 //
 // ============================================================================
 
@@ -45,7 +45,7 @@ ACE_RCSID (tests,
 	QtReactor_Test,
 	"$Id$" )
 
-#include <assert.h> 
+#include <assert.h>
 #include <qapplication.h>
 #include <qtimer.h>
 
@@ -59,11 +59,10 @@ ACE_RCSID (tests,
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Dgram.h"
 
-#if defined (ACE_HAS_QT)
 // Qt specific code
 #include "QtReactor_Test.h"
 
-/* 
+/*
    QTestApplication class implementation
 */
 
@@ -81,21 +80,20 @@ void QTestApplication::finishTest()
 void QTestApplication::exec( int msec )
 {
 	finishTimer_.stop();
-	if ( 0 < msec  ) 
+	if ( 0 < msec  )
 		finishTimer_.start( msec, TRUE );
 	inherited::exec();
 }
 
-#endif /* ACE_HAS_QT */
 
 // maximum time for testing QtReactor (msec)
-const int TotalTestTime = 8000; 
+const int TotalTestTime = 8000;
 
 // how many handlers for each event handler class should be started ?
 #ifndef __QNXNTO__
-const int HandlersNo = 8 ; 
+const int HandlersNo = 8 ;
 #else /* __QNXNTO__ */
-// it seems that Qt 3.1 for NTO 6.2 is compiled with rather small FD_SETSIZE 
+// it seems that Qt 3.1 for NTO 6.2 is compiled with rather small FD_SETSIZE
 // Nevertheless, test works fine with native select reactor
 const int HandlersNo = 4;
 #endif
@@ -117,9 +115,9 @@ const int TCPClientPings = 16;
 // total number of bytes in TCP transmission
 const int TCPTotalBytesToSend = TCPClientPings * TCPBytesToSend;
 
-/** 
+/**
 	\class DgramHandler
-	\brief Simple event handler that receives and counts datagrams 
+	\brief Simple event handler that receives and counts datagrams
 	as well as sends dgrams using timeouts.
 */
 class DgramHandler: public ACE_Event_Handler
@@ -128,9 +126,9 @@ public:
     DgramHandler( ACE_Reactor *p_reactor = 0 );
 	virtual ~DgramHandler( );
 
-	int  open (const ACE_INET_Addr &local, 
-		int protocol_family=ACE_PROTOCOL_FAMILY_INET, 
-		int protocol=0, 
+	int  open (const ACE_INET_Addr &local,
+		int protocol_family=ACE_PROTOCOL_FAMILY_INET,
+		int protocol=0,
 		int reuse_addr=0);
 	virtual ACE_HANDLE get_handle() const;
 	virtual int handle_input ( ACE_HANDLE handle );
@@ -149,7 +147,7 @@ private:
 	ACE_SOCK_Dgram peer_; //!< datagram socket we listen to
 };
 
-/** 
+/**
 	\class TCPConnectionHandler
 	\brief TCP stream handler for both sides of connection.
 */
@@ -198,18 +196,18 @@ public:
 	int analyzeTCP(  ) const; //!< analyze TCP transmission
 	int registerTCPServer( TCPConnectionHandler * );
 	int TCPServersNo() const; //!< return the number of accepted connections
-	
+
 private:
 	ACE_Reactor          *reactor_; //!< reactor for this application
 	DgramHandler         *DgramHandlers_[ HandlersNo] ;//!< dgram input handlers
 	int                  TCPServersNo_; //!< number of accepted connections
-	TCPConnectionHandler *TCPServers_[ HandlersNo ]; 
-	TCPConnectionHandler *TCPClients_[ HandlersNo ]; 
+	TCPConnectionHandler *TCPServers_[ HandlersNo ];
+	TCPConnectionHandler *TCPClients_[ HandlersNo ];
 	TCPAcceptorHandler   *acceptor_;
 	TCPConnectorHandler  *connectors_[ HandlersNo ];
 };
 
-class TCPAcceptorHandler : public ACE_Acceptor< TCPConnectionHandler, ACE_SOCK_ACCEPTOR > 
+class TCPAcceptorHandler : public ACE_Acceptor< TCPConnectionHandler, ACE_SOCK_ACCEPTOR >
 {
 public:
 	typedef ACE_Acceptor< TCPConnectionHandler, ACE_SOCK_ACCEPTOR > inherited;
@@ -222,11 +220,11 @@ private:
 	HandlersRegister *handlersRegister_;
 };
 
-/* 
+/*
    DgramHandler class implementation
 */
 
-DgramHandler::DgramHandler( ACE_Reactor *p_reactor ): 
+DgramHandler::DgramHandler( ACE_Reactor *p_reactor ):
 	ACE_Event_Handler( p_reactor ),
 	dgramsSent_( 0 ),
 	dgramsReceived_( 0 ),
@@ -238,22 +236,21 @@ DgramHandler::DgramHandler( ACE_Reactor *p_reactor ):
 
 DgramHandler::~DgramHandler( )
 {
-	ACE_TRACE( ( LM_TRACE,
-		ACE_TEXT( "virtual DgramHandler::~DgramHandler( )\n" ) ) );
+  ACE_TRACE ("DgramHandler::~DgramHandler");
 }
 
-int  DgramHandler::open (const ACE_INET_Addr &local, 
-	int protocol_family, 
-	int protocol, 
+int  DgramHandler::open (const ACE_INET_Addr &local,
+	int protocol_family,
+	int protocol,
 	int reuse_addr )
 {
-	if ( 0 > peer_.open( local, 		
-			 protocol_family, 
-			 protocol, 
+	if ( 0 > peer_.open( local,
+			 protocol_family,
+			 protocol,
 			 reuse_addr ) )
-		ACE_ERROR_RETURN ( ( LM_ERROR,
-							  ACE_TEXT( "(%P) %p \n" ),
-							  ACE_TEXT( "Cannot oper dgram socket" ) ), 
+    ACE_ERROR_RETURN ((LM_ERROR,
+                ACE_TEXT ("(%P) %p \n"),
+                ACE_TEXT ("Cannot oper dgram socket")),
 			-1);
 
 	return 0;
@@ -274,18 +271,18 @@ int DgramHandler::handle_input( ACE_HANDLE handle )
 	result = peer_.recv( &recvBuffer, sizeof( recvBuffer) , peerAddress );
 
 	if (  0 >= result )
-		ACE_ERROR_RETURN ( ( LM_ERROR,
-							  ACE_TEXT( "(%P) %p \n" ),
-							  ACE_TEXT( "While reading datagram from socket" ) )
+    ACE_ERROR_RETURN ((LM_ERROR,
+                ACE_TEXT ("(%P) %p \n"),
+                ACE_TEXT ("While reading datagram from socket"))
             , -1 );
 	else
 		++dgramsReceived_;
 
-	return 0;		
+	return 0;
 }
 
 int DgramHandler::handle_timeout (const ACE_Time_Value &current_time, const void *act )
-{	
+{
 	ACE_UNUSED_ARG( current_time );
 	ACE_UNUSED_ARG( act );
 	int sendBuffer = 0;
@@ -293,23 +290,23 @@ int DgramHandler::handle_timeout (const ACE_Time_Value &current_time, const void
 	if ( ++timeoutsTriggered_ >= expectedTriggers_ )
 		reactor()->cancel_timer( this, 1 );
 
-	ACE_SOCK_Dgram socket;	
-	if ( -1 == socket.open( 
-			 ACE_INET_Addr( static_cast< u_short >( 0 ), 
-				 static_cast< ACE_UINT32 >( INADDR_ANY ) ), 
+	ACE_SOCK_Dgram socket;
+	if ( -1 == socket.open(
+			 ACE_INET_Addr( static_cast< u_short >( 0 ),
+				 static_cast< ACE_UINT32 >( INADDR_ANY ) ),
 			 ACE_PROTOCOL_FAMILY_INET, 0, 1 ) )
-		ACE_ERROR ( ( LM_ERROR,
-					   ACE_TEXT( "(%P) %p \n" ),
-					   ACE_TEXT( "Cannot open socket for sending Qt dgrams" ) ) );
+    ACE_ERROR ((LM_ERROR,
+             ACE_TEXT ("(%P) %p \n"),
+             ACE_TEXT ("Cannot open socket for sending Qt dgrams")));
 
 	ACE_INET_Addr peerAddr;
 	peer_.get_local_addr( peerAddr);
-	
-	if ( sizeof( sendBuffer ) != socket.send (&sendBuffer, 
+
+	if ( sizeof( sendBuffer ) != socket.send (&sendBuffer,
 			 sizeof( sendBuffer ), peerAddr ) )
-		ACE_ERROR ( ( LM_ERROR,
-					   ACE_TEXT( "(%P) %p \n" ),
-					   ACE_TEXT( "Cannot send dgram" ) ) );
+    ACE_ERROR (( LM_ERROR,
+             ACE_TEXT ("(%P) %p \n"),
+             ACE_TEXT ("Cannot send dgram")));
 	else
 		++dgramsSent_;
 
@@ -321,13 +318,13 @@ int DgramHandler::handle_timeout (const ACE_Time_Value &current_time, const void
 int DgramHandler::handle_close( ACE_HANDLE handle, ACE_Reactor_Mask close_mask )
 {
 	if ( peer_.get_handle() != handle  )
-        ACE_ERROR( ( LM_ERROR, 
-                       ACE_TEXT( "Unknown handle %d DgramHandler::handle_close "
-                       "with mask %x. My handle is %d\n" ), 
-                       handle, 
+        ACE_ERROR ((LM_ERROR,
+                       ACE_TEXT ("Unknown handle %d DgramHandler::handle_close "
+                       "with mask %x. My handle is %d\n"),
+                       handle,
                        close_mask,
-                       peer_.get_handle() ) );
-    else        
+                       peer_.get_handle()));
+    else
         peer_.close();
 
 	return 0;
@@ -344,11 +341,11 @@ int DgramHandler::dgramsReceived() const
 }
 
 int DgramHandler::timeoutsTriggered( ) const
-{ 
-	return timeoutsTriggered_; 
+{
+	return timeoutsTriggered_;
 }
 
-void DgramHandler::expectedTriggers( int triggers ) 
+void DgramHandler::expectedTriggers( int triggers )
 {
 	expectedTriggers_ = triggers;
 }
@@ -358,7 +355,7 @@ int DgramHandler::expectedTriggers( ) const
 	return expectedTriggers_;
 }
 
-/* 
+/*
    TCPConnectionHandler class implementation
 */
 
@@ -374,8 +371,7 @@ TCPConnectionHandler::TCPConnectionHandler( bool p_serverSide ):
 
 TCPConnectionHandler::~TCPConnectionHandler( )
 {
-	ACE_TRACE( (LM_TRACe, 
-			ACE_TEXT( "TCPConnectionHandler::~TCPConnectionHandler( )\n" ) ) );
+  ACE_TRACE ("TCPConnectionHandler::~TCPConnectionHandler");
 }
 
 int TCPConnectionHandler::handle_input( ACE_HANDLE handle)
@@ -392,9 +388,9 @@ int TCPConnectionHandler::handle_input( ACE_HANDLE handle)
 			buffer->wr_ptr( bytesReceived );
 			int result = scheduleSend( buffer );
 			if (0 > result )
-				ACE_ERROR_RETURN ( ( LM_ERROR,
-									  ACE_TEXT( "(%P) %p \n" ),
-									  ACE_TEXT( "Cannot schedule TCP reply" ) ), 
+        ACE_ERROR_RETURN ((LM_ERROR,
+                    ACE_TEXT ("(%P) %p \n"),
+                    ACE_TEXT ("Cannot schedule TCP reply")),
 					-1);
 		}
 		else
@@ -402,15 +398,15 @@ int TCPConnectionHandler::handle_input( ACE_HANDLE handle)
 
 		return 0;
 	}
-		
+
 	if ( errno != EWOULDBLOCK )
 	   ACE_ERROR_RETURN( ( LM_ERROR,
-			ACE_TEXT( "(%P:%p (%d)\n" ), 
+			ACE_TEXT( "(%P:%p (%d)\n" ),
 			ACE_TEXT( "TCPConnectionHandler::handle_input call with no data on handle " ), handle ),
 			-1 );
 
-	ACE_ERROR( (LM_WARNING, 
-		ACE_TEXT( "(%P:%p (%d)\n" ), 
+	ACE_ERROR( (LM_WARNING,
+		ACE_TEXT( "(%P:%p (%d)\n" ),
 		ACE_TEXT( "TCPConnectionHandler::handle_input call with no data on handle " ), handle ) );
 
 	return 0;
@@ -420,20 +416,20 @@ int TCPConnectionHandler::handle_output( ACE_HANDLE handle )
 {
 	ACE_UNUSED_ARG( handle );
 	if ( !buffers_ )
-		ACE_ERROR( (LM_ERROR, 
+		ACE_ERROR( (LM_ERROR,
 			ACE_TEXT( "TCPConnectionHandler::handle_output call for empty buffers (%d)\n" ), handle ) );
 	if ( 0 > sendBuffers() ) // socket broken, kill yourself
 		return -1;
 
-	if ( !buffers_ ) // everything already send, unregister 
+	if ( !buffers_ ) // everything already send, unregister
 	{
-		reactor()->cancel_wakeup( this,  
+		reactor()->cancel_wakeup( this,
             ACE_Event_Handler::WRITE_MASK | ACE_Event_Handler::DONT_CALL);
-		reactor()->remove_handler( this, 
+		reactor()->remove_handler( this,
             ACE_Event_Handler::WRITE_MASK  | ACE_Event_Handler::DONT_CALL );
 	}
 
-	return 0;		
+	return 0;
 }
 
 int TCPConnectionHandler::open( void *  )
@@ -474,20 +470,20 @@ int TCPConnectionHandler::scheduleSend( ACE_Message_Block * buffer)
 	if ( 0 > sendBuffers() )
 		ACE_ERROR_RETURN ( ( LM_ERROR,
 							  ACE_TEXT( "(%P) %p \n" ),
-							  ACE_TEXT( "Cannot schedule TCP send." ) ), 
+							  ACE_TEXT( "Cannot schedule TCP send." ) ),
 			-1);
 	return 0;
 }
 
 int TCPConnectionHandler::sendBuffers( )
-{ 
+{
 	int result = 0;
 
 	if ( buffers_ )
 		if ( 0 < ( result = peer_.send_n( buffers_ ) ) ) // remove sent blocks
-		{	
+		{
 			totalSent_ += result;
-			while( buffers_ && 
+			while( buffers_ &&
                 static_cast< size_t >( result ) >= buffers_->length() )
 			{
 				ACE_Message_Block *buffer = buffers_;
@@ -507,13 +503,13 @@ int TCPConnectionHandler::sendBuffers( )
 int TCPConnectionHandler::handle_close( ACE_HANDLE handle,ACE_Reactor_Mask close_mask )
 {
 	if ( peer_.get_handle() != handle  )
-        ACE_ERROR( ( LM_ERROR, 
+        ACE_ERROR( ( LM_ERROR,
                        ACE_TEXT( "Unknown handle %d TCPConnectionHandler::handle_close "
-                       "with mask %x. My handle is %d\n" ), 
-                       handle, 
+                       "with mask %x. My handle is %d\n" ),
+                       handle,
                        close_mask,
                        peer_.get_handle() ) );
-    else        
+    else
         peer_.close();
 
 	return 0;
@@ -530,18 +526,18 @@ int TCPConnectionHandler::totalSent() const
 }
 
 
-/* 
+/*
    HandlersRegister class implementation
 */
 
-HandlersRegister::HandlersRegister( ACE_Reactor *p_reactor ): 
+HandlersRegister::HandlersRegister( ACE_Reactor *p_reactor ):
 	reactor_( p_reactor ),
 	TCPServersNo_( 0 )
 {
 	int i;
 
 	for( i = 0; i < HandlersNo; ++i )
-	{	
+	{
 		// create dgram input handler
 		DgramHandlers_[ i ] = new DgramHandler( p_reactor );
 
@@ -550,11 +546,11 @@ HandlersRegister::HandlersRegister( ACE_Reactor *p_reactor ):
 		TCPClients_[ i ] = new TCPConnectionHandler( false );
 
 		connectors_[ i ] =new TCPConnectorHandler( p_reactor, ACE_NONBLOCK );
-		connectors_[ i ]->reference_counting_policy().value( 
+		connectors_[ i ]->reference_counting_policy().value(
             ACE_Event_Handler::Reference_Counting_Policy::ENABLED ) ;
 	}
 
-	acceptor_ = new TCPAcceptorHandler( this );	
+	acceptor_ = new TCPAcceptorHandler( this );
 	acceptor_->reactor( p_reactor );
 }
 
@@ -563,7 +559,7 @@ HandlersRegister::~HandlersRegister( )
 	int i;
 	if ( acceptor_ )
 	{
-		reactor_->remove_handler( acceptor_, ACE_Event_Handler::ALL_EVENTS_MASK ); 
+		reactor_->remove_handler( acceptor_, ACE_Event_Handler::ALL_EVENTS_MASK );
 		acceptor_->close();
 		acceptor_->remove_reference();
 	}
@@ -571,25 +567,25 @@ HandlersRegister::~HandlersRegister( )
 	for( i = 0; i < HandlersNo; ++i )
 	{
 		reactor_->cancel_timer( DgramHandlers_[ i ], 1 );
-		reactor_->remove_handler( DgramHandlers_[ i ], 
+		reactor_->remove_handler( DgramHandlers_[ i ],
             ACE_Event_Handler::ALL_EVENTS_MASK );
 		DgramHandlers_[ i ]->remove_reference();
 
 		if ( TCPServers_[ i ] )
 		{
-			reactor_->remove_handler( TCPServers_[ i ], 
+			reactor_->remove_handler( TCPServers_[ i ],
                 ACE_Event_Handler::ALL_EVENTS_MASK );
 			TCPServers_[ i ]->remove_reference();
 		}
 
-		reactor_->remove_handler( connectors_[ i ], 
-            ACE_Event_Handler::ALL_EVENTS_MASK ); 
+		reactor_->remove_handler( connectors_[ i ],
+            ACE_Event_Handler::ALL_EVENTS_MASK );
 		connectors_[ i ]->close();
 		connectors_[ i ]->remove_reference();
 
 		if ( TCPClients_[ i ] )
 		{
-			reactor_->remove_handler( TCPClients_[ i ], 
+			reactor_->remove_handler( TCPClients_[ i ],
                 ACE_Event_Handler::ALL_EVENTS_MASK );
 			TCPClients_[ i ]->remove_reference();
 		}
@@ -607,13 +603,13 @@ int HandlersRegister::scheduleTimers( const ACE_Time_Value &p_TestTime )
 
 	for( i = 0; i < HandlersNo; ++i )
 	{
-		if ( -1 == reactor_->schedule_timer ( DgramHandlers_[ i ], 
-				 (const void *) 0, 
-				 ACE_Time_Value::zero, 
+		if ( -1 == reactor_->schedule_timer ( DgramHandlers_[ i ],
+				 (const void *) 0,
+				 ACE_Time_Value::zero,
 				 p_TestTime * ( 0.5 / DgramsToSend ) ) )
 			ACE_ERROR_RETURN ( ( LM_ERROR,
 								  ACE_TEXT( "(%P) %p \n" ),
-								  ACE_TEXT( "Cannot schedule ACE timer" ) ), 
+								  ACE_TEXT( "Cannot schedule ACE timer" ) ),
 				-1);
 
 		DgramHandlers_[ i ] ->expectedTriggers( DgramsToSend );
@@ -629,22 +625,22 @@ int HandlersRegister::registerDgramHandlers()
 
 	// open dgram handlers for all ports
 	for( i = 0; i < HandlersNo; ++i )
-		if ( -1 == DgramHandlers_[ i ]->open( 
-				 ACE_INET_Addr ( i + BaseDgramPort, 
-                     ACE_TEXT( "127.0.0.1" ), 
+		if ( -1 == DgramHandlers_[ i ]->open(
+				 ACE_INET_Addr ( i + BaseDgramPort,
+                     ACE_TEXT( "127.0.0.1" ),
                      ACE_PROTOCOL_FAMILY_INET ) ) )
 			ACE_ERROR_RETURN ( ( LM_ERROR,
 								  ACE_TEXT( "(%P) %p \n" ),
 								  ACE_TEXT( "Cannot open dgram handler" ) ),
 								  -1 );
 
-	// register dgram handlers 
+	// register dgram handlers
 	for( i = 0; i < HandlersNo; ++i )
-		if ( -1 == reactor_->register_handler( DgramHandlers_[ i ], 
+		if ( -1 == reactor_->register_handler( DgramHandlers_[ i ],
 				 ACE_Event_Handler::READ_MASK ) )
 			ACE_ERROR_RETURN ( ( LM_ERROR,
 								  ACE_TEXT( "(%P) %p \n" ),
-								  ACE_TEXT( "Cannot register dgram handler" ) ), 
+								  ACE_TEXT( "Cannot register dgram handler" ) ),
 				-1);
 	return 0;
 }
@@ -656,23 +652,23 @@ int HandlersRegister::registerTCPHandlers()
 	if ( -1 == acceptor_->open( addr, reactor_, 1 ) )
 		ACE_ERROR_RETURN ( ( LM_ERROR,
 							  ACE_TEXT( "(%P) %p \n" ),
-							  ACE_TEXT( "Cannot open acceptor port" ) ), 
-			-1);	
+							  ACE_TEXT( "Cannot open acceptor port" ) ),
+			-1);
 
 	int i;
 	addr.set( BaseTCPPort, ACE_TEXT( "127.0.0.1" ) );
 
 	for( i = 0; i < HandlersNo; ++i )
 	{
-		if ( -1 == connectors_[ i ]->connect( 
-                 TCPClients_[ i ], 
-                 addr, 
+		if ( -1 == connectors_[ i ]->connect(
+                 TCPClients_[ i ],
+                 addr,
                  ACE_Synch_Options::asynch ) )
  			if ( errno != EWOULDBLOCK  )
  				ACE_ERROR_RETURN ( ( LM_ERROR,
 									  ACE_TEXT( "(%P) %p (%d)\n" ),
-									  ACE_TEXT( "Cannot connect connector" ), 
-                                      i ), 
+									  ACE_TEXT( "Cannot connect connector" ),
+                                      i ),
 					-1);
 	}
 
@@ -687,12 +683,12 @@ int HandlersRegister::registerTCPServer( TCPConnectionHandler *handler )
 		return 0;
 	}
 	ACE_ERROR( ( LM_ERROR,
-		ACE_TEXT( "Too many servers registered (%d). ACE_Reactor or ACE_Acceptor broken?\n" ), 
+		ACE_TEXT( "Too many servers registered (%d). ACE_Reactor or ACE_Acceptor broken?\n" ),
 		handler->get_handle() ) );
 	return -1;
 }
 
-int HandlersRegister::analyze( ) const 
+int HandlersRegister::analyze( ) const
 {
 	int result = 0;
 
@@ -714,13 +710,13 @@ int HandlersRegister::analyzeTimeouts( ) const
 	int result = 0;
 
 	for( i = 0; i < HandlersNo; ++i )
-		if ( DgramHandlers_[ i ]->expectedTriggers() != 
+		if ( DgramHandlers_[ i ]->expectedTriggers() !=
             DgramHandlers_[ i ]->timeoutsTriggered( ) )
 		{
-			ACE_ERROR( ( LM_ERROR, 
+			ACE_ERROR( ( LM_ERROR,
                            ACE_TEXT( "Dgram_Handlers(%d) expected %d timeouts"
                            " but triggered only %d.\n" ),
-						   i, 
+						   i,
 						   DgramHandlers_[ i ]->expectedTriggers( ),
 						   DgramHandlers_[ i ]->timeoutsTriggered( ) ) );
             result = -1;
@@ -735,13 +731,13 @@ int HandlersRegister::analyzeDgrams(  ) const
 	int i;
 
 	for( i = 0; i < HandlersNo; ++i )
-		if ( DgramHandlers_[ i ]->dgramsSent() != 
+		if ( DgramHandlers_[ i ]->dgramsSent() !=
             DgramHandlers_[ i ]->dgramsReceived() )
 		{
-			ACE_ERROR( ( LM_ERROR, 
+			ACE_ERROR( ( LM_ERROR,
                            ACE_TEXT( "DgramsHandler(%d) sent  %d dgrams but received only %d."
 						   "Either reactor failed or system lost local dgrams..\n" ),
-						   DgramHandlers_[ i ]->dgramsSent(), 
+						   DgramHandlers_[ i ]->dgramsSent(),
 						   DgramHandlers_[ i ]->dgramsReceived() ) );
 			result = -1 ;
 		}
@@ -756,45 +752,45 @@ int HandlersRegister::analyzeTCP(  ) const
 
 	for( i = 0; i < HandlersNo; ++i )
 	{
-		if ( TCPClients_[ i ]->totalSent() != TCPTotalBytesToSend  ) 
+		if ( TCPClients_[ i ]->totalSent() != TCPTotalBytesToSend  )
 		{
-			ACE_ERROR( (LM_ERROR, 
-						  ACE_TEXT( "TCPClient(%d): wanted to send  %d  but sent only (%d).\n" ), 
-						  i, 
-						  TCPTotalBytesToSend, 
+			ACE_ERROR( (LM_ERROR,
+						  ACE_TEXT( "TCPClient(%d): wanted to send  %d  but sent only (%d).\n" ),
+						  i,
+						  TCPTotalBytesToSend,
 						  TCPClients_[ i ]->totalSent() ) );
 			result = -1;
 		}
 
-		if ( TCPClients_[ i ]->totalReceived() != TCPTotalBytesToSend  ) 
+		if ( TCPClients_[ i ]->totalReceived() != TCPTotalBytesToSend  )
 		{
-			ACE_ERROR( (LM_ERROR, 
-						  ACE_TEXT( "TCPClient(%d): expected %d bytes but received only (%d).\n" ), 
-						  i, 
-						  TCPTotalBytesToSend, 
+			ACE_ERROR( (LM_ERROR,
+						  ACE_TEXT( "TCPClient(%d): expected %d bytes but received only (%d).\n" ),
+						  i,
+						  TCPTotalBytesToSend,
 						  TCPClients_[ i ]->totalReceived() ) );
 			result = -1;
 		}
 
 		if ( TCPServers_[ i ] )
 		{
-			if ( TCPServers_[ i ]->totalSent() != TCPTotalBytesToSend  ) 
+			if ( TCPServers_[ i ]->totalSent() != TCPTotalBytesToSend  )
 			{
-				ACE_ERROR( (LM_ERROR, 
+				ACE_ERROR( (LM_ERROR,
 							  ACE_TEXT( "TCPServer(%d): wanted to send %d bytes "
-                              "but sent only (%d).\n" ), 
-							  i, 
-							  TCPTotalBytesToSend, 
+                              "but sent only (%d).\n" ),
+							  i,
+							  TCPTotalBytesToSend,
 							  TCPServers_[ i ]->totalSent() ) );
 				result = -1;
 			}
-			
-			if ( TCPServers_[ i ]->totalReceived() != TCPTotalBytesToSend  ) 
+
+			if ( TCPServers_[ i ]->totalReceived() != TCPTotalBytesToSend  )
 			{
-				ACE_ERROR( (LM_ERROR, 
-							  ACE_TEXT( "TCPServer(%d): expected %d bytes but received only (%d).\n" ), 
-							  i, 
-							  TCPTotalBytesToSend, 
+				ACE_ERROR( (LM_ERROR,
+							  ACE_TEXT( "TCPServer(%d): expected %d bytes but received only (%d).\n" ),
+							  i,
+							  TCPTotalBytesToSend,
 							  TCPServers_[ i ]->totalReceived() ) );
 				result = -1;
 			}
@@ -802,8 +798,8 @@ int HandlersRegister::analyzeTCP(  ) const
 		}
 		else
 		{
-			ACE_ERROR( (LM_ERROR, 
-						  ACE_TEXT( "TCPServer(%d): not connected.\n" ), 
+			ACE_ERROR( (LM_ERROR,
+						  ACE_TEXT( "TCPServer(%d): not connected.\n" ),
 						  i ) );
 			result = -1;
 		}
@@ -813,12 +809,12 @@ int HandlersRegister::analyzeTCP(  ) const
 }
 
 
-/* 
+/*
    TCPAcceptorHandler class implementation
 */
 
-TCPAcceptorHandler::TCPAcceptorHandler( HandlersRegister *p_handlersRegister): 
-	handlersRegister_( p_handlersRegister ) 
+TCPAcceptorHandler::TCPAcceptorHandler( HandlersRegister *p_handlersRegister):
+	handlersRegister_( p_handlersRegister )
 {
 	reference_counting_policy().value( Reference_Counting_Policy::ENABLED );
 }
@@ -828,33 +824,33 @@ int TCPAcceptorHandler::make_svc_handler( TCPConnectionHandler *& sh )
 	sh = new TCPConnectionHandler( true );
 	sh->reactor( reactor() );
 	if ( handlersRegister_->TCPServersNo() >= HandlersNo )
-		ACE_ERROR( ( LM_ERROR, 
-			ACE_TEXT( "TCPAcceptorHandler::make_svc_handler called to many times!\n" ) ) );
+    ACE_ERROR ((LM_ERROR,
+      ACE_TEXT ("TCPAcceptorHandler::make_svc_handler called to many times!\n")));
 	else
-		ACE_TRACE( ( LM_TRACE, 
-		ACE_TEXT( "TCPAcceptorHandler::make_svc_handler new TCP server created\n" ) ) );
+    ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("TCPAcceptorHandler::make_svc_handler new TCP server created\n")));
 
 	return 0;
 }
 
 int TCPAcceptorHandler::activate_svc_handler( TCPConnectionHandler * sh )
 {
-	if ( 0 == inherited::activate_svc_handler( sh )  ) 
+	if ( 0 == inherited::activate_svc_handler( sh )  )
 	{
 		if ( 0 != handlersRegister_->registerTCPServer( sh ) )  // for analysis
 		{
-			// release event handler		
+			// release event handler
 			reactor()->remove_handler( sh, ACE_Event_Handler::ALL_EVENTS_MASK );
 			sh->remove_reference();
 			// report error
-			ACE_ERROR_RETURN( ( LM_ERROR, 
+			ACE_ERROR_RETURN( ( LM_ERROR,
 								  ACE_TEXT( "Cannot register server TCPConnectionHandler\n" ) ),
-				-1 ); 
+				-1 );
 		}
 
 	}
 	else
-		ACE_ERROR_RETURN( ( LM_ERROR, 
+		ACE_ERROR_RETURN( ( LM_ERROR,
 							  ACE_TEXT( "Failed to create server TCPConnectionHandler\n" ) ),
 			-1 );
 
@@ -863,8 +859,7 @@ int TCPAcceptorHandler::activate_svc_handler( TCPConnectionHandler * sh )
 
 TCPAcceptorHandler::~TCPAcceptorHandler( )
 {
-	ACE_TRACE( ( LM_TRACE,
-		ACE_TEXT( "TCPAcceptorHandler::~TCPAcceptorHandler( )\n" ) ) );
+  ACE_TRACE ("TCPAcceptorHandler::~TCPAcceptorHandler");
 }
 
 void testNativeReactor( int argc, ACE_TCHAR *argv[] )
@@ -872,12 +867,12 @@ void testNativeReactor( int argc, ACE_TCHAR *argv[] )
 	ACE_UNUSED_ARG (argc);
 	ACE_UNUSED_ARG (argv);
 
-	ACE_DEBUG( ( LM_INFO, ACE_TEXT( "Testing autotest using native reactor\n" ) ) );
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("Testing autotest using native reactor\n")));
 
 	ACE_Reactor      reactor;
 	HandlersRegister handlersRegister( &reactor );
 	ACE_Time_Value   testTime( TotalTestTime / 1000,  ( TotalTestTime % 1000 ) * 1000 );
-	
+
 	if (0 <= handlersRegister.scheduleTimers( testTime )  &&
 		0 <= handlersRegister.registerDgramHandlers( ) &&
 		0 <= handlersRegister.registerTCPHandlers() )
@@ -885,7 +880,7 @@ void testNativeReactor( int argc, ACE_TCHAR *argv[] )
 		reactor.run_reactor_event_loop( testTime );
 
 		if ( 0  != handlersRegister.analyze( ) )
-			ACE_ERROR( ( LM_ERROR, 
+			ACE_ERROR( ( LM_ERROR,
                            ACE_TEXT( "Test failed for native reactor. "
                            "Fix QtReactor_Test or ACE_Reactor.\n" ) ) );
 		else
@@ -895,29 +890,27 @@ void testNativeReactor( int argc, ACE_TCHAR *argv[] )
 
 void testQtReactor( int argc, ACE_TCHAR *argv[] )
 {
-#if defined (ACE_HAS_QT)
 	// Qt specific code
-	ACE_DEBUG( ( LM_INFO, ACE_TEXT( "Testing QtReactor\n" ) ) );
-	
+  ACE_DEBUG ((LM_INFO, ACE_TEXT( "Testing QtReactor\n")));
+
 	QTestApplication app (argc, argv);
 	ACE_QtReactor    qtReactor ( &app );
 	ACE_Reactor      reactor( &qtReactor );
     HandlersRegister handlersRegister( &reactor );
     ACE_Time_Value   testTime( TotalTestTime / 1000,  ( TotalTestTime % 1000 ) * 1000 );
-        
+
     if (0 <= handlersRegister.scheduleTimers( testTime )  &&
         0 <= handlersRegister.registerDgramHandlers( ) &&
         0 <= handlersRegister.registerTCPHandlers() )
     {
-            
+
         app.exec( TotalTestTime );
-            
+
         if ( 0  != handlersRegister.analyze( ) )
-            ACE_ERROR( ( LM_ERROR, ACE_TEXT( "QtReactor_Test failed.\n" ) ) );
+            ACE_ERROR ((LM_ERROR, ACE_TEXT( "QtReactor_Test failed.\n")));
         else
-            ACE_ERROR( ( LM_INFO, ACE_TEXT( "QtReactor_Test passed.\n" ) ) );
+            ACE_ERROR ((LM_INFO, ACE_TEXT( "QtReactor_Test passed.\n")));
     }
-#endif /* ACE_HAS_QT */
 }
 
 int
@@ -928,11 +921,6 @@ run_main ( int argc, ACE_TCHAR *argv[] )
 	testNativeReactor( argc, argv );
 	testQtReactor( argc, argv );
 
-#ifndef ACE_HAS_QT
-	ACE_ERROR ( (LM_INFO,
-				   ACE_TEXT( "ACE is not configured for Qt on this platform\n" ) ) );
-#endif /* ACE_HAS_QT */
-
 	ACE_END_TEST;
 
 	return 0;
diff --git a/tests/QtReactor_Test.h b/tests/QtReactor_Test.h
index e2ce413521e..f2be9a5331c 100644
--- a/tests/QtReactor_Test.h
+++ b/tests/QtReactor_Test.h
@@ -3,7 +3,6 @@
 #ifndef QTREACTOR_TEST_H
 #define QTREACTOR_TEST_H
 
-#ifdef ACE_HAS_QT
 #include <qapplication.h>
 #include <qtimer.h>
 
@@ -21,6 +20,4 @@ private:
 	QTimer finishTimer_; //!< timer to finish the test
 };
 
-#endif /*ACE_HAS_QT*/
-
 #endif /*QTREACTOR_TEST_H*/
diff --git a/tests/RMCast/Main.cpp b/tests/RMCast/Main.cpp
deleted file mode 100644
index 44b92128394..00000000000
--- a/tests/RMCast/Main.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Main.cpp
-//
-// = DESCRIPTION
-//     This is a wrapper for the test programs.  It obviates the test cpp's
-//     from having to always include OS.h.
-//
-// = AUTHOR
-//    Don Hinton <dhinton@dresystems.com>
-//
-// ============================================================================
-
-#include "ace/OS_main.h"
-#if defined (ACE_HAS_WINCE)
-#  include "ace/ACE.h"
-#endif /* ACE_HAS_WINCE */
-int run_main (int argc, ACE_TCHAR *argv[]);
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  return run_main (argc, argv);
-}
diff --git a/tests/RMCast/RMCast_Fragment_Test.cpp b/tests/RMCast/RMCast_Fragment_Test.cpp
deleted file mode 100644
index c4acbb87bd5..00000000000
--- a/tests/RMCast/RMCast_Fragment_Test.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = DESCRIPTION
-//    Unit test for the fragmentation module of the RMCast library.
-//
-// = AUTHORS
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#include "../test_config.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_time.h"
-#include "ace/ACE.h"
-#include "ace/Message_Block.h"
-#include "ace/Task.h"
-#include "ace/RMCast/RMCast_Fragment.h"
-
-ACE_RCSID(tests, RMCast_Fragment_Test, "$Id$")
-
-class ACE_RMCast_Fragment_Tester
-  : public ACE_Task_Base
-  , public ACE_RMCast_Module
-{
-public:
-  ACE_RMCast_Fragment_Tester (void);
-
-  virtual int data (ACE_RMCast::Data &data);
-  virtual int svc (void);
-
-private:
-  void initialize (ACE_Message_Block *mb);
-  // Initialize the message block with zero data
-
-  int compare (ACE_Message_Block *mb);
-  // Compare the message block to <received_>
-
-private:
-  ACE_RMCast_Fragment fragment_;
-
-  ACE_Message_Block received_;
-  ACE_UINT32 received_bytes_;
-  ACE_UINT32 message_sequence_number_;
-};
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("RMCast_Fragment_Test"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
-              ACE::major_version(),
-              ACE::minor_version(),
-              ACE::beta_version()));
-
-  ACE_RMCast_Fragment_Tester tester;
-
-  if (tester.svc () == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error running the svc() routine\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-// ****************************************************************
-
-ACE_RMCast_Fragment_Tester::ACE_RMCast_Fragment_Tester (void)
-{
-  this->fragment_.next (this);
-}
-
-int
-ACE_RMCast_Fragment_Tester::svc (void)
-{
-  {
-    this->received_.wr_ptr (this->received_.rd_ptr ());
-    this->received_bytes_ = 0;
-    this->message_sequence_number_ = 0;
-
-    ACE_UINT32 n = 128 * 1024;
-    ACE_Message_Block big_blob (n);
-    big_blob.wr_ptr (n);
-
-    this->initialize (&big_blob);
-
-    ACE_RMCast::Data data;
-    data.payload = &big_blob;
-    if (this->fragment_.data (data) == -1)
-      return -1;
-
-    if (this->received_bytes_ != n)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Unexpected number of ")
-                         ACE_TEXT ("received bytes (%d/%d)\n"),
-                         this->received_bytes_, n),
-                        -1);
-
-    if (this->compare (&big_blob) == -1)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Mismatched big_blob data\n")),
-                          -1);
-      }
-
-  }
-
-
-  {
-    this->received_.wr_ptr (this->received_.rd_ptr ());
-    this->received_bytes_ = 0;
-    this->message_sequence_number_ = 0;
-
-    const int n = 256;
-    const int size = 512;
-    ACE_Message_Block smallb[n];
-    smallb[0].size (size);
-    smallb[0].wr_ptr (size);
-
-    for (int i = 1; i != n; ++i)
-      {
-        smallb[i].size (size);
-        smallb[i].wr_ptr (size);
-        smallb[i - 1].cont (&smallb[i]);
-      }
-    this->initialize (smallb);
-
-    ACE_RMCast::Data data;
-    data.payload = smallb;
-    if (this->fragment_.data (data) == -1)
-      return -1;
-
-    ACE_UINT32 total = n * size;
-    if (this->received_bytes_ != total)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Unexpected number of ")
-                         ACE_TEXT ("received bytes (%d/%d)\n"),
-                         this->received_bytes_, total),
-                        -1);
-
-    if (this->compare (smallb) == -1)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Mismatched smallb chain data\n")),
-                          -1);
-      }
-
-  }
-
-  {
-    this->received_.wr_ptr (this->received_.rd_ptr ());
-    this->received_bytes_ = 0;
-    this->message_sequence_number_ = 0;
-
-    const int n = 256;
-    ACE_UINT32 total = 0;
-
-    ACE_RANDR_TYPE seed =
-      ACE_static_cast(ACE_RANDR_TYPE,ACE_OS::time (0));
-
-    int size = 64 + ACE_OS::rand_r(seed) % 128;
-    ACE_Message_Block smallb[n];
-    smallb[0].size (size);
-    smallb[0].wr_ptr (size);
-    total += size;
-
-    for (int i = 1; i != n; ++i)
-      {
-        size = 64 + ACE_OS::rand_r(seed) % 128;
-        total += size;
-        smallb[i].size (size);
-        smallb[i].wr_ptr (size);
-        smallb[i - 1].cont (&smallb[i]);
-      }
-    this->initialize (smallb);
-
-    ACE_RMCast::Data data;
-    data.payload = smallb;
-    if (this->fragment_.data (data) == -1)
-      return -1;
-
-    if (this->received_bytes_ != total)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Unexpected number of ")
-                         ACE_TEXT ("received bytes (%d/%d)\n"),
-                         this->received_bytes_, total),
-                        -1);
-
-    if (this->compare (smallb) == -1)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Mismatched smallb chain data\n")),
-                          -1);
-      }
-
-  }
-  return 0;
-}
-
-void
-ACE_RMCast_Fragment_Tester::initialize (ACE_Message_Block *mb)
-{
-  for (ACE_Message_Block *i = mb; i != 0; i = i->cont ())
-    {
-      char z = 0;
-      for (char *j = i->rd_ptr (); j != i->wr_ptr (); ++j)
-        {
-          *j = ++z;
-        }
-    }
-}
-
-int
-ACE_RMCast_Fragment_Tester::compare (ACE_Message_Block *mb)
-{
-  size_t n = mb->total_size ();
-  ACE_Message_Block blob (n);
-
-  for (const ACE_Message_Block *i = mb; i != 0; i = i->cont ())
-    {
-      blob.copy (i->rd_ptr (), i->length ());
-    }
-
-  if (ACE_OS::memcmp (blob.rd_ptr (),
-                      this->received_.rd_ptr (),
-                      n) != 0)
-    {
-      for (size_t offset = 0; offset < n; offset += 256)
-        {
-          size_t z = 256;
-          if (n - offset < 256)
-            z = n - offset;
-          ACE_HEX_DUMP ((LM_DEBUG,
-                         blob.rd_ptr () + offset,
-                         z,
-                         ACE_TEXT ("BIG BLOB")));
-          ACE_HEX_DUMP ((LM_DEBUG,
-                         this->received_.rd_ptr () + offset,
-                         z,
-                         ACE_TEXT ("RECEIVED")));
-        }
-      return -1;
-    }
-  return 0;
-}
-
-int
-ACE_RMCast_Fragment_Tester::data (ACE_RMCast::Data &data)
-{
-  ACE_UINT32 sequence_number = data.sequence_number;
-  ACE_UINT32 message_size = data.total_size;
-  size_t offset = data.fragment_offset;
-  ACE_Message_Block *mb = data.payload;
-
-  if (this->received_bytes_ == 0)
-    {
-      this->received_.size (message_size);
-      this->received_.wr_ptr (message_size);
-      this->message_sequence_number_ =  sequence_number;
-    }
-  else
-    {
-      if (this->message_sequence_number_ != sequence_number)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Mismatched sequence number\n")),
-                          -1);
-      if (this->received_.length () != message_size)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Mismatched sequence size\n")),
-                          -1);
-    }
-
-  size_t payload_size = mb->length ();
-  size_t fragment_size = payload_size;
-  if (payload_size > 0)
-    {
-      ACE_OS::memcpy (this->received_.rd_ptr () + offset,
-                      mb->rd_ptr (),
-                      payload_size);
-      this->received_bytes_ += ACE_static_cast (ACE_UINT32, payload_size);
-      offset += payload_size;
-    }
-
-  for (const ACE_Message_Block *i = mb->cont (); i != 0; i = i->cont ())
-    {
-      payload_size = i->length ();
-      // ACE_DEBUG ((LM_DEBUG,
-      //         "offset = %d , payload = %d\n", offset, payload_size));
-      fragment_size += payload_size;
-      ACE_OS::memcpy (this->received_.rd_ptr () + offset,
-                      i->rd_ptr (), payload_size);
-      this->received_bytes_ += ACE_static_cast (ACE_UINT32, payload_size);
-      offset += payload_size;
-    }
-
-  if (fragment_size > this->fragment_.max_fragment_size ())
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Invalid fragment size\n")),
-                      -1);
-
-  return 0;
-}
diff --git a/tests/RMCast/RMCast_Membership_Test.cpp b/tests/RMCast/RMCast_Membership_Test.cpp
deleted file mode 100644
index 4a34a73c5fd..00000000000
--- a/tests/RMCast/RMCast_Membership_Test.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = DESCRIPTION
-//    Unit test for the UDP sending module of the RMCast library.
-//
-// = AUTHORS
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#include "../test_config.h"
-#include "ace/RMCast/RMCast_Proxy.h"
-#include "ace/RMCast/RMCast_Membership.h"
-#include "ace/ACE.h"
-#include "ace/OS_NS_time.h"
-#include "ace/Task.h"
-
-ACE_RCSID(tests, RMCast_Membership_Test, "$Id$")
-
-// ****************************************************************
-
-//! Simple proxy for the ACE_RMCast_Membership test harness
-/*!
- * Implement a simple version of the ACE_RMCast_Proxy class used in
- * the ACE_RMCast_Membership test harness.
- */
-class Test_Proxy : public ACE_RMCast_Proxy
-{
-public:
-  Test_Proxy (void);
-
-  //! Get the flag to remember if this proxy has joined the group or
-  //! not.
-  int joined (void) const
-  {
-    return this->joined_;
-  }
-  //! Set the flag to remember if this proxy has joined the group or
-  //! not.
-  void joined (int j)
-  {
-    this->joined_ = j;
-  }
-
-  //@{
-  //! All the reply_ methods just return 0, there is no real remote
-  //! peer, this is just a test harness
-  virtual int reply_data (ACE_RMCast::Data &)
-  {
-    return 0;
-  }
-  virtual int reply_poll (ACE_RMCast::Poll &)
-  {
-    return 0;
-  }
-  virtual int reply_ack_join (ACE_RMCast::Ack_Join &)
-  {
-    return 0;
-  }
-  virtual int reply_ack_leave (ACE_RMCast::Ack_Leave &)
-  {
-    return 0;
-  }
-  virtual int reply_ack (ACE_RMCast::Ack &)
-  {
-    return 0;
-  }
-  virtual int reply_join (ACE_RMCast::Join &)
-  {
-    return 0;
-  }
-  virtual int reply_leave (ACE_RMCast::Leave &)
-  {
-    return 0;
-  }
-  //@}
-
-private:
-  //! Remember if we joined the group already.
-  int joined_;
-};
-
-// ****************************************************************
-
-//! The number of proxies used in the test
-/*!
- * Not all member will be present in the group at the same time. But
- * this variable controls the maximum number
- */
-const size_t nproxy = 16;
-
-//! A simple module to receive the messages from ACE_RMCast_Membership
-/*!
- * The ACE_RMCast_Membership layer pushes messages to its next module
- * when all the members have acked a message, when a new member joins,
- * when a member leaves, etc.
- * This class will verify that the messages are exactly what we
- * expect.
- */
-class Tester : public ACE_RMCast_Module
-{
-public:
-  Tester (void);
-
-  //! Run the test for \iterations times
-  void run (int iterations);
-
-  virtual int join (ACE_RMCast::Join &join);
-  virtual int leave (ACE_RMCast::Leave &leave);
-  virtual int ack (ACE_RMCast::Ack &ack);
-
-private:
-  //! Add a few proxies to the group
-  void join_random (void);
-
-  //! Remove a few proxies from the group
-  void leave_random (void);
-
-  //! Generate a few ack messages from all the proxies currently in
-  //! the group
-  void generate_acks (int iterations);
-
-private:
-  //! The array of proxies
-  Test_Proxy proxy_[nproxy];
-
-  //! The Membership layer
-  ACE_RMCast_Membership membership_;
-
-  //! Synchronize internal data structures
-  ACE_SYNCH_MUTEX lock_;
-
-  //! The test is randomized to get better coverage.  This is the seed
-  //! variable for the test
-  ACE_RANDR_TYPE seed_;
-};
-
-// ****************************************************************
-
-//! An Adapter to run Tester::run the test is a separate thread
-class Task : public ACE_Task_Base
-{
-public:
-  Task (Tester *tester);
-
-  // = Read the documentation in "ace/Task.h"
-  int svc (void);
-
-private:
-  //! The tester object.
-  Tester *tester_;
-};
-
-// ****************************************************************
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("RMCast_Membership_Test"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
-              ACE::major_version(),
-              ACE::minor_version(),
-              ACE::beta_version()));
-
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running single threaded test\n")));
-    //! Run the test in single threaded mode
-    Tester tester;
-    tester.run (100);
-  }
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running multi threaded test\n")));
-    //! Run the test in multi-threaded mode
-    Tester tester;
-    Task task (&tester);
-    if (task.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Cannot activate the threads\n")),
-                        1);
-    ACE_Thread_Manager::instance ()->wait ();
-  }
-
-  ACE_END_TEST;
-  return 0;
-}
-
-// ****************************************************************
-
-Test_Proxy::Test_Proxy (void)
-  :  joined_ (0)
-{
-}
-
-// ****************************************************************
-
-Tester::Tester (void)
-  : seed_ (ACE_static_cast(ACE_RANDR_TYPE,ACE_OS::time (0)))
-{
-  // Initialize the stack...
-  this->membership_.next (this);
-  for (size_t i = 0; i != nproxy; ++i)
-    this->proxy_[i].next (&this->membership_);
-}
-
-void
-Tester::run (int iterations)
-{
-  for (int i = 0; i < iterations; ++i)
-    {
-      // Connect a few....
-      this->join_random ();
-
-      // Push acks....
-      this->generate_acks (iterations);
-
-      // Disconnect a few
-      this->leave_random ();
-
-      // Push acks...
-      this->generate_acks (iterations / 10);
-    }
-}
-
-int
-Tester::join (ACE_RMCast::Join &join)
-{
-  if (join.source == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Invalid join message in Tester\n")),
-                        -1);
-    }
-  for (size_t i = 0; i != nproxy; ++i)
-    {
-      if (&this->proxy_[i] != join.source)
-        continue;
-      if (this->proxy_[i].joined () != 1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Invalid state for proxy %d ")
-                           ACE_TEXT ("in Tester::join\n")),
-                          -1);
-      return 0;
-    }
-  // Not found
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ACE_TEXT ("Unknown proxy in Tester::join\n")),
-                    -1);
-}
-
-int
-Tester::leave (ACE_RMCast::Leave &leave)
-{
-  if (leave.source == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Invalid leave message in Tester\n")),
-                        -1);
-    }
-  for (size_t i = 0; i != nproxy; ++i)
-    {
-      if (&this->proxy_[i] != leave.source)
-        continue;
-      if (this->proxy_[i].joined () != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Invalid state for proxy %d ")
-                           ACE_TEXT ("in Tester::leave\n")),
-                          -1);
-      return 0;
-    }
-  // Not found
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ACE_TEXT ("Unknown proxy in Tester::leave\n")),
-                    -1);
-}
-
-int
-Tester::ack (ACE_RMCast::Ack &ack)
-{
-  // After the membership layer the source makes no sense....
-  if (ack.source == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Invalid ack message in Tester\n")),
-                        -1);
-    }
-
-  //  ACE_DEBUG ((LM_DEBUG,
-  //              ACE_TEXT ("Received ack in Tester %d,%d\n"),
-  //              ack.next_expected,
-  //              ack.highest_received));
-
-  // Assume the lock is held, verify that the ack message satisfy the
-  // invariants...
-  ACE_UINT32 next_expected = 0;
-  ACE_UINT32 highest_received = 0;
-  int set = 0;
-  for (size_t i = 0; i != nproxy; ++i)
-    {
-      if (!this->proxy_[i].joined ())
-        continue;
-      if (!set)
-        {
-          set = 1;
-          next_expected = this->proxy_[i].next_expected ();
-          highest_received = this->proxy_[i].highest_received ();
-        }
-      else
-        {
-          if (next_expected >
-              this->proxy_[i].next_expected ())
-            {
-              next_expected =
-                this->proxy_[i].next_expected ();
-            }
-          if (highest_received <
-              this->proxy_[i].highest_received ())
-            {
-              highest_received =
-                this->proxy_[i].highest_received ();
-            }
-        }
-    }
-  // No local proxy just return...
-  if (!set)
-    return 0;
-
-  // Check the invariants
-  if (ack.next_expected != next_expected)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Invalid next_expected in Ack\n")),
-                        -1);
-    }
-  if (ack.highest_received != highest_received)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Invalid highest_received in Ack\n")),
-                        -1);
-    }
-  return 0;
-}
-
-void
-Tester::join_random (void)
-{
-  for (size_t i = 0; i != nproxy; ++i)
-    {
-      ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-      int r = ACE_OS::rand_r (this->seed_) % 100;
-      if (this->proxy_[i].joined () == 0 && r > 25)
-        {
-          this->proxy_[i].joined (1);
-
-          ACE_RMCast::Join join;
-          join.source = &this->proxy_[i];
-          //          ACE_DEBUG ((LM_DEBUG,
-          //                      ACE_TEXT ("Sending join mesage for proxy %d\n"),
-          //                      i));
-          this->proxy_[i].join (join);
-        }
-    }
-}
-
-void
-Tester::leave_random (void)
-{
-  for (size_t i = 0; i != nproxy; ++i)
-    {
-      ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-      int r = ACE_OS::rand_r (this->seed_) % 100;
-      if (this->proxy_[i].joined () == 1 && r > 75)
-        {
-          this->proxy_[i].joined (0);
-
-          ACE_RMCast::Leave leave;
-          leave.source = &this->proxy_[i];
-          //          ACE_DEBUG ((LM_DEBUG,
-          //                      ACE_TEXT ("Sending leave mesage for proxy %d\n"),
-          //                      i));
-          this->proxy_[i].leave (leave);
-        }
-    }
-}
-
-void
-Tester::generate_acks (int iterations)
-{
-  int n = 0;
-  for (size_t i = 0; n < iterations && i != nproxy; ++i, ++n)
-    {
-      ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-      int r = ACE_OS::rand_r (this->seed_) % 10;
-      if (this->proxy_[i].joined () == 0)
-        continue;
-
-      ACE_RMCast::Ack ack;
-      ack.source = &this->proxy_[i];
-      ack.next_expected =
-        this->proxy_[i].next_expected ();
-      ack.highest_received =
-        this->proxy_[i].highest_received ();
-
-      // we randomly perform one of 3 actions, with different
-      // probabilities
-      switch (r)
-        {
-        case 0:
-          // Ack the same data that we already have:
-          break;
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-          // Simulate out of sequence messages...
-          ack.highest_received++;
-          break;
-        default:
-          if (ack.highest_received > ack.next_expected)
-            ack.next_expected++;
-          break;
-        }
-      //      ACE_DEBUG ((LM_DEBUG,
-      //                  ACE_TEXT ("Sending ack message (%d,%d) through proxy %d\n"),
-      //                  ack.next_expected,
-      //                  ack.highest_received,
-      //                  i));
-      int result = this->proxy_[i].ack (ack);
-      if (result != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Returned %d in proxy %d\n"),
-                      result, i));
-        }
-    }
-}
-
-// ****************************************************************
-
-Task::Task (Tester *tester)
-  :  tester_ (tester)
-{
-}
-
-int
-Task::svc (void)
-{
-  this->tester_->run (100);
-  return 0;
-}
diff --git a/tests/RMCast/RMCast_Reassembly_Test.cpp b/tests/RMCast/RMCast_Reassembly_Test.cpp
deleted file mode 100644
index e99dae225aa..00000000000
--- a/tests/RMCast/RMCast_Reassembly_Test.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = DESCRIPTION
-//    Unit test for the reassembly module of the RMCast library.
-//
-// = AUTHORS
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#include "../test_config.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_time.h"
-#include "ace/Task.h"
-#include "ace/ACE.h"
-#include "ace/RMCast/RMCast_Reassembly.h"
-
-ACE_RCSID(tests, RMCast_Reassembly_Test, "$Id$")
-
-class ACE_RMCast_Reassembly_Tester
-  : public ACE_Task_Base
-  , public ACE_RMCast_Module
-{
-public:
-  ACE_RMCast_Reassembly_Tester (void);
-
-  virtual int data (ACE_RMCast::Data &data);
-  virtual int svc (void);
-
-private:
-  void initialize (ACE_Message_Block *mb);
-  // Initialize the message block with zero data
-
-  int compare (ACE_Message_Block *received,
-               ACE_Message_Block *original);
-  // Compare the message block to <received_>
-
-  int put_fragment (ACE_UINT32 sequence_number,
-                    ACE_UINT32 offset,
-                    ACE_UINT32 fragment_size,
-                    ACE_Message_Block *mb);
-  // Put one fragment out
-
-  ACE_UINT32 next_sequence_number (void);
-  // Return the next sequence number..
-
-private:
-  ACE_RMCast_Reassembly reassembly_;
-
-  ACE_SYNCH_MUTEX mutex_;
-  ACE_UINT32 message_sequence_number_;
-};
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("RMCast_Reassembly_Test"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
-              ACE::major_version(),
-              ACE::minor_version(),
-              ACE::beta_version()));
-
-  ACE_RMCast_Reassembly_Tester tester;
-
-  if (tester.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Cannot activate the threads\n")),
-                      1);
-
-  ACE_Thread_Manager::instance ()->wait ();
-
-  ACE_END_TEST;
-  return 0;
-}
-
-// ****************************************************************
-
-ACE_RMCast_Reassembly_Tester::ACE_RMCast_Reassembly_Tester (void)
-  : message_sequence_number_ (0)
-{
-  this->reassembly_.next (this);
-}
-
-int
-ACE_RMCast_Reassembly_Tester::svc (void)
-{
-  for (int iteration = 0; iteration != 50; ++iteration)
-    {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) iteration %d\n"), iteration));
-      ACE_UINT32 sequence_number = this->next_sequence_number ();
-      {
-        ACE_Message_Block received;
-
-        const size_t fragment_size = 128;
-        ACE_UINT32 n = 32 * fragment_size;
-        ACE_Message_Block big_blob (n);
-        big_blob.wr_ptr (n);
-
-        this->initialize (&big_blob);
-
-        // Use an ACT to store the results in <received>
-        ACE_Message_Block *received_pointer = &received;
-        ACE_OS::memcpy (big_blob.rd_ptr (),
-                        &received_pointer,
-                        sizeof(received_pointer));
-
-        for (size_t offset = 0; offset < n; offset += fragment_size)
-          {
-            if (this->put_fragment (sequence_number,
-                                    ACE_static_cast (ACE_UINT32, offset),
-                                    ACE_static_cast (ACE_UINT32,
-                                                     fragment_size),
-                                    &big_blob) == -1)
-              {
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("Error in put_fragment\n")));
-                return -1;
-              }
-          }
-
-        if (this->compare (&received, &big_blob) == -1)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("Mismatched big_blob data\n")),
-                              -1);
-          }
-      }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) iteration %d, first test passed\n"),
-                  iteration));
-      sequence_number = this->next_sequence_number ();
-      {
-        ACE_Message_Block received;
-
-        const size_t fragment_size = 128;
-        ACE_UINT32 n = 32 * fragment_size;
-        ACE_Message_Block big_blob (n);
-        big_blob.wr_ptr (n);
-
-        this->initialize (&big_blob);
-
-        // Use an ACT to store the results in <received>
-        ACE_Message_Block *received_pointer = &received;
-        ACE_OS::memcpy (big_blob.rd_ptr (),
-                        &received_pointer,
-                        sizeof(received_pointer));
-
-        ACE_RANDR_TYPE seed =
-          ACE_static_cast(ACE_RANDR_TYPE, ACE_OS::time (0));
-        for (int i = 0; i != 100; ++i)
-          {
-            size_t offset = ACE_OS::rand_r (seed) % n;
-            if (offset >= n)
-              {
-                offset = n/2;
-              }
-            if (this->put_fragment (sequence_number,
-                                    ACE_static_cast (ACE_UINT32, offset),
-                                    ACE_static_cast (ACE_UINT32,
-                                                     fragment_size),
-                                    &big_blob) == -1)
-              {
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("Error in put_fragment\n")));
-                return -1;
-              }
-          }
-
-        for (size_t offset = 0; offset < n; offset += fragment_size)
-          {
-            if (this->put_fragment (sequence_number,
-                                    ACE_static_cast (ACE_UINT32, offset),
-                                    ACE_static_cast (ACE_UINT32,
-                                                     fragment_size),
-                                    &big_blob) == -1)
-              {
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("Error in put_fragment\n")));
-                return -1;
-              }
-          }
-
-        if (this->compare (&received, &big_blob) == -1)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("Mismatched random big_blob data\n")),
-                              -1);
-          }
-      }
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) iteration %d, random test passed\n"),
-                  iteration));
-    }
-
-  return 0;
-}
-
-void
-ACE_RMCast_Reassembly_Tester::initialize (ACE_Message_Block *mb)
-{
-  for (ACE_Message_Block *i = mb; i != 0; i = i->cont ())
-    {
-      char z = 0;
-      for (char *j = i->rd_ptr (); j != i->wr_ptr (); ++j)
-        {
-          *j = ++z;
-        }
-    }
-}
-
-int
-ACE_RMCast_Reassembly_Tester::compare (ACE_Message_Block *received,
-                                       ACE_Message_Block *original)
-{
-  size_t n = original->total_size ();
-  ACE_Message_Block blob (n);
-
-  for (const ACE_Message_Block *i = original; i != 0; i = i->cont ())
-    {
-      blob.copy (i->rd_ptr (), i->length ());
-    }
-
-  if (received->rd_ptr () == 0)
-    ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("INCOMPLETE MESSAGE\n")), -1);
-
-  if (ACE_OS::memcmp (blob.rd_ptr (),
-                      received->rd_ptr (),
-                      n) != 0)
-    {
-      for (size_t i = 0; i < n; i += 256)
-        {
-          size_t z = 256;
-          if (n - i < 256)
-            z = n - i;
-          ACE_HEX_DUMP ((LM_DEBUG,
-                         blob.rd_ptr () + i,
-                         z,
-                         ACE_TEXT ("BIG BLOB")));
-        }
-      for (size_t j = 0; j < n; j += 256)
-        {
-          size_t z = 256;
-          if (n - j < 256)
-            z = n - j;
-          ACE_HEX_DUMP ((LM_DEBUG,
-                         received->rd_ptr () + j,
-                         z,
-                         ACE_TEXT ("RECEIVED")));
-        }
-      return -1;
-    }
-  return 0;
-}
-
-int
-ACE_RMCast_Reassembly_Tester::data (ACE_RMCast::Data &data)
-{
-  ACE_Message_Block *mb = data.payload;
-
-  ACE_Message_Block *pointer;
-  ACE_OS::memcpy (&pointer, mb->rd_ptr (), sizeof(pointer));
-
-  size_t l = mb->length ();
-  pointer->size (l);
-  pointer->wr_ptr (pointer->rd_ptr () + l);
-  ACE_OS::memcpy (pointer->rd_ptr (), mb->rd_ptr (), l);
-  return 0;
-}
-
-int
-ACE_RMCast_Reassembly_Tester::put_fragment (ACE_UINT32 sequence_number,
-                                            ACE_UINT32 offset,
-                                            ACE_UINT32 fragment_size,
-                                            ACE_Message_Block *mb)
-{
-  size_t total_length = mb->total_length ();
-
-  size_t size = fragment_size;
-  if (offset + size >= total_length)
-    {
-      size = total_length - offset;
-    }
-  ACE_Message_Block p (mb->rd_ptr () + offset, size);
-
-  p.wr_ptr (size);
-
-  ACE_RMCast::Data data;
-  data.sequence_number = sequence_number;
-  data.total_size = ACE_static_cast (ACE_UINT32, total_length);
-  data.fragment_offset = offset;
-  data.payload = &p;
-  return this->reassembly_.data (data);
-}
-
-ACE_UINT32
-ACE_RMCast_Reassembly_Tester::next_sequence_number ()
-{
-  ACE_UINT32 r;
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-    r = this->message_sequence_number_++;
-  }
-  return r;
-}
diff --git a/tests/RMCast/RMCast_Reordering_Test.cpp b/tests/RMCast/RMCast_Reordering_Test.cpp
deleted file mode 100644
index c7771afe2e8..00000000000
--- a/tests/RMCast/RMCast_Reordering_Test.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-// $Id$
-
-#include "../test_config.h"
-#include "ace/OS_NS_time.h"
-#include "ace/ACE.h"
-#include "ace/Task.h"
-#include "ace/RMCast/RMCast_Proxy.h"
-#include "ace/RMCast/RMCast_Reordering.h"
-
-ACE_RCSID(tests, RMCast_Reordering_Test, "$Id$")
-
-// ****************************************************************
-
-class Tester;
-
-//! Simple proxy for the ACE_RMCast_Reordering test harness
-/*!
- * Implement a simple version of the ACE_RMCast_Proxy class used in
- * the ACE_RMCast_Reordering test harness.
- */
-class Test_Proxy : public ACE_RMCast_Proxy
-{
-public:
-  Test_Proxy (void);
-
-  void set_tester (Tester *tester)
-  {
-    this->tester_ = tester;
-  }
-
-  //! Most of the reply_ methods just return 0, there is no real remote
-  //! peer, this is just a test harness
-  //@{
-  virtual int reply_data (ACE_RMCast::Data &)
-  {
-    return 0;
-  }
-  virtual int reply_poll (ACE_RMCast::Poll &)
-  {
-    return 0;
-  }
-  virtual int reply_ack_join (ACE_RMCast::Ack_Join &)
-  {
-    return 0;
-  }
-  virtual int reply_ack_leave (ACE_RMCast::Ack_Leave &)
-  {
-    return 0;
-  }
-  //! Must check that that sequence number is reasonable
-  virtual int reply_ack (ACE_RMCast::Ack &);
-  virtual int reply_join (ACE_RMCast::Join &)
-  {
-    return 0;
-  }
-  virtual int reply_leave (ACE_RMCast::Leave &)
-  {
-    return 0;
-  }
-  //@}
-
-private:
-  //! Keep a reference to the main testing class so it can be called
-  //! back.
-  Tester *tester_;
-};
-
-// ****************************************************************
-
-//! A simple module to receive the messages from ACE_RMCast_Reordering
-/*!
- * The ACE_RMCast_Reordering layer pushes messages to its next module
- * when all the members have acked a message, when a new member joins,
- * when a member leaves, etc.
- * This class will verify that the messages are exactly what we
- * expect.
- */
-class Tester : public ACE_RMCast_Module
-{
-public:
-  Tester (void);
-
-  //! Run the test for \iterations times
-  void run (int iterations);
-
-  //! The proxy has received an Ack message, we need to validate it
-  int reply_ack (ACE_RMCast::Ack &ack);
-
-  //! Receive the data messages and validate their order
-  virtual int data (ACE_RMCast::Data &data);
-
-private:
-  //! Generate a new message to drive the test
-  void generate_messages (int count);
-
-private:
-  //! The array of proxies
-  Test_Proxy proxy_;
-
-  //! The Reordering layer
-  ACE_RMCast_Reordering reordering_;
-
-  //! The test is randomized to get better coverage.  This is the seed
-  //! variable for the test
-  ACE_RANDR_TYPE seed_;
-
-  //! The lowest sequence number used to generate messages
-  ACE_UINT32 lowest_sequence_number_;
-
-  //! The next expected sequence number
-  ACE_UINT32 next_expected_;
-
-  //! Synchronization
-  ACE_SYNCH_MUTEX mutex_;
-};
-
-// ****************************************************************
-
-//! An Adapter to run Tester::run the test is a separate thread
-class Task : public ACE_Task_Base
-{
-public:
-  Task (Tester *tester);
-
-  // = Read the documentation in "ace/Task.h"
-  int svc (void);
-
-private:
-  //! The tester object.
-  Tester *tester_;
-};
-
-// ****************************************************************
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("RMCast_Reordering_Test"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
-              ACE::major_version(),
-              ACE::minor_version(),
-              ACE::beta_version()));
-
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running single threaded test\n")));
-    //! Run the test in single threaded mode
-    Tester tester;
-    tester.run (100);
-  }
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running multi threaded test\n")));
-    //! Run the test in multi-threaded mode
-    Tester tester;
-    Task task (&tester);
-    if (task.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Cannot activate the threads\n")),
-                        1);
-    ACE_Thread_Manager::instance ()->wait ();
-  }
-
-  ACE_END_TEST;
-  return 0;
-}
-
-// ****************************************************************
-
-Tester::Tester (void)
-  : seed_ (ACE_static_cast(ACE_RANDR_TYPE,ACE_OS::time (0)))
-  , lowest_sequence_number_ (0)
-  , next_expected_ (0)
-{
-  // Initialize the stack...
-  this->reordering_.next (this);
-
-  this->proxy_.set_tester (this);
-}
-
-void
-Tester::run (int iterations)
-{
-  ACE_RMCast::Ack_Join ack_join;
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
-    ack_join.source = &this->proxy_;
-    ack_join.next_sequence_number = this->lowest_sequence_number_;
-  }
-  int result = this->reordering_.ack_join (ack_join);
-  if (result != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Reordering::ack_join returned %d\n"),
-                  result));
-    }
-
-  for (int i = 0; i < iterations; ++i)
-    {
-      // Push data
-      this->generate_messages (iterations / 10);
-    }
-  if (this->next_expected_ == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Tester::run - no messages received\n")));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Tester::run (%t) - %d messages received\n"),
-                  this->next_expected_));
-    }
-}
-
-int
-Tester::reply_ack (ACE_RMCast::Ack &ack)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-
-  // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received Ack message (%d, %d)\n"),
-  //             ack.next_expected, this->lowest_sequence_number_));
-
-  const int success_ratio = 95;
-  int c = ACE_OS::rand_r (this->seed_) % 100;
-
-  if (c < success_ratio)
-    {
-      this->lowest_sequence_number_ = ack.next_expected;
-    }
-  return 0;
-}
-
-void
-Tester::generate_messages (int count)
-{
-  ACE_Message_Block payload (1024);
-  payload.wr_ptr (1024);
-
-  ACE_RMCast::Data data;
-  data.source = &this->proxy_;
-  data.payload = &payload;
-
-  ACE_UINT32 min_sn;
-  ACE_UINT32 max_sn;
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
-    min_sn = this->lowest_sequence_number_;
-    max_sn = this->lowest_sequence_number_ + count;
-  }
-  for (ACE_UINT32 i = min_sn; i != max_sn; ++i)
-    {
-      data.sequence_number = i;
-
-      const int success_ratio = 95;
-      int c;
-      {
-        ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
-        c = ACE_OS::rand_r (this->seed_) % 100;
-      }
-      if (c < success_ratio)
-        {
-          int result = this->reordering_.data (data);
-          if (result != 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("Reordering::data returned %d\n"),
-                          result));
-            }
-        }
-    }
-}
-
-int
-Tester::data (ACE_RMCast::Data &data)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-
-  if (this->next_expected_ != data.sequence_number)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Tester::data - ")
-                  ACE_TEXT ("out of sequence message (%d != %d)\n"),
-                  this->next_expected_,
-                  data.sequence_number));
-      return -1;
-    }
-
-  this->next_expected_++;
-  return 0;
-}
-
-// ****************************************************************
-
-Task::Task (Tester *tester)
-  :  tester_ (tester)
-{
-}
-
-int
-Task::svc (void)
-{
-  this->tester_->run (100);
-  return 0;
-}
-
-// ****************************************************************
-
-Test_Proxy::Test_Proxy (void)
-  : tester_ (0)
-{
-}
-
-int
-Test_Proxy::reply_ack (ACE_RMCast::Ack & ack)
-{
-  return this->tester_->reply_ack (ack);
-}
diff --git a/tests/RMCast/RMCast_Retransmission_Test.cpp b/tests/RMCast/RMCast_Retransmission_Test.cpp
deleted file mode 100644
index f8f2f0c5bb0..00000000000
--- a/tests/RMCast/RMCast_Retransmission_Test.cpp
+++ /dev/null
@@ -1,501 +0,0 @@
-// $Id$
-
-#include "../test_config.h"
-#include "ace/OS_NS_time.h"
-#include "ace/ACE.h"
-#include "ace/Task.h"
-
-#include "ace/RMCast/RMCast_Proxy.h"
-#include "ace/RMCast/RMCast_Retransmission.h"
-
-ACE_RCSID(tests, RMCast_Retransmission_Test, "$Id$")
-
-// ****************************************************************
-
-class Tester;
-
-//! Simple proxy for the ACE_RMCast_Retransmission test harness
-/*!
- * Implement a simple version of the ACE_RMCast_Proxy class used in
- * the ACE_RMCast_Retransmission test harness.
- */
-class Test_Proxy : public ACE_RMCast_Proxy
-{
-public:
-  Test_Proxy (void);
-
-  void set_tester (Tester *tester)
-  {
-    this->tester_ = tester;
-  }
-
-  //! Get the flag to remember if this proxy has joined the group or
-  //! not.
-  int joined (void) const
-  {
-    return this->joined_;
-  }
-
-  //! Set the flag to remember if this proxy has joined the group or
-  //! not.
-  void joined (int j)
-  {
-    this->joined_ = j;
-  }
-
-  //! Most of the reply_ methods just return 0, there is no real remote
-  //! peer, this is just a test harness
-  //@{
-  virtual int reply_data (ACE_RMCast::Data &)
-  {
-    return 0;
-  }
-  virtual int reply_poll (ACE_RMCast::Poll &)
-  {
-    return 0;
-  }
-  //! Must check that that sequence number is reasonable
-  virtual int reply_ack_join (ACE_RMCast::Ack_Join &);
-  virtual int reply_ack_leave (ACE_RMCast::Ack_Leave &)
-  {
-    return 0;
-  }
-  virtual int reply_ack (ACE_RMCast::Ack &)
-  {
-    return 0;
-  }
-  virtual int reply_join (ACE_RMCast::Join &)
-  {
-    return 0;
-  }
-  virtual int reply_leave (ACE_RMCast::Leave &)
-  {
-    return 0;
-  }
-  //@}
-
-  int data (ACE_RMCast::Data &data);
-  int ack (ACE_RMCast::Ack &ack);
-
-private:
-  //! Remember if we joined the group already.
-  int joined_;
-
-  //! Keep a reference to the main testing class so it can be called
-  //! back.
-  Tester *tester_;
-
-  //! The test is randomized to get better coverage.  This is the seed
-  //! variable for the test
-  ACE_RANDR_TYPE seed_;
-
-  //! Synchronize internal data structures.
-  ACE_SYNCH_MUTEX lock_;
-};
-
-// ****************************************************************
-
-//! The number of proxies used in the test
-/*!
- * Not all member will be present in the group at the same time. But
- * this variable controls the maximum number
- */
-const size_t nproxy = 16;
-//! A simple module to receive the messages from ACE_RMCast_Retransmission
-/*!
- * The ACE_RMCast_Retransmission layer pushes messages to its next module
- * when all the members have acked a message, when a new member joins,
- * when a member leaves, etc.
- * This class will verify that the messages are exactly what we
- * expect.
- */
-class Tester : public ACE_RMCast_Module
-{
-public:
-  Tester (void);
-
-  //! Run the test for \param iterations times
-  void run (int iterations);
-
-  //! Validate the number of messages received by each proxy
-  void validate_message_count (void);
-
-  //! One of the proxies has received an Ack_Join message, we need to
-  //! validate it
-  int reply_ack_join (Test_Proxy *proxy, ACE_RMCast::Ack_Join &ack_join);
-
-  //! One of the proxies has received an Ack message.
-  /*!
-   * In this method we simulate the role of the Membership layer,
-   * however we just do brute force instead of trying to optimize the
-   * Ack processing
-   */
-  int proxy_received_ack (Test_Proxy *proxy, ACE_RMCast::Ack &ack);
-
-  virtual int data (ACE_RMCast::Data &data);
-
-private:
-  //! Generate a new message to drive the test
-  void generate_one_message (void);
-
-  //! Send a single Ack that summarizes the state of all the proxies.
-  int send_ack (void);
-
-  //! Ask the retransmission layer to resend lost messages
-  int resend (void);
-
-private:
-  //! The array of proxies
-  Test_Proxy proxy_[nproxy];
-
-  //! The Retransmission layer
-  ACE_RMCast_Retransmission retransmission_;
-
-  //! Synchronize internal data structures
-  ACE_SYNCH_MUTEX lock_;
-
-  //! The test is randomized to get better coverage.  This is the seed
-  //! variable for the test
-  ACE_RANDR_TYPE seed_;
-
-  //! Generate sequence numbers for the Retransmission layer
-  ACE_UINT32 sequence_number_generator_;
-};
-
-// ****************************************************************
-
-//! An Adapter to run Tester::run the test is a separate thread
-class Task : public ACE_Task_Base
-{
-public:
-  Task (Tester *tester);
-
-  // = Read the documentation in "ace/Task.h"
-  int svc (void);
-
-private:
-  //! The tester object.
-  Tester *tester_;
-};
-
-// ****************************************************************
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("RMCast_Retransmission_Test"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
-              ACE::major_version(),
-              ACE::minor_version(),
-              ACE::beta_version()));
-
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running single threaded test\n")));
-    //! Run the test in single threaded mode
-    Tester tester;
-    tester.run (100);
-    tester.validate_message_count ();
-  }
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running multi threaded test\n")));
-    //! Run the test in multi-threaded mode
-    Tester tester;
-    Task task (&tester);
-    if (task.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Cannot activate the threads\n")),
-                        1);
-    ACE_Thread_Manager::instance ()->wait ();
-    tester.validate_message_count ();
-  }
-
-  ACE_END_TEST;
-  return 0;
-}
-
-// ****************************************************************
-
-Tester::Tester (void)
-  : seed_ (ACE_static_cast(ACE_RANDR_TYPE,ACE_OS::time (0)))
-  , sequence_number_generator_ (0)
-{
-  // Initialize the stack...
-  this->retransmission_.next (this);
-
-  for (size_t i = 0; i != nproxy; ++i)
-    {
-      this->proxy_[i].set_tester (this);
-      this->proxy_[i].joined (1);
-    }
-}
-
-void
-Tester::run (int iterations)
-{
-  for (int i = 0; i < iterations; ++i)
-    {
-      // Push data
-      this->generate_one_message ();
-
-      this->send_ack ();
-
-      // Re-send unacked data
-      if (i % 5 == 0)
-        {
-          this->resend ();
-          this->send_ack ();
-        }
-    }
-
-  while (this->resend () != 0)
-    {
-      this->send_ack ();
-    }
-}
-
-void
-Tester::validate_message_count (void)
-{
-  for (size_t i = 0; i != nproxy; ++i)
-    {
-      if (this->proxy_[i].joined () == 0)
-        continue;
-      if (this->proxy_[i].next_expected () != this->sequence_number_generator_)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Invalid message count for proxy %d, ")
-                      ACE_TEXT ("it is %d, should be %d\n"),
-                      i, this->proxy_[i].next_expected (),
-                      this->sequence_number_generator_));
-        }
-    }
-}
-
-int
-Tester::reply_ack_join (Test_Proxy *, ACE_RMCast::Ack_Join &ack_join)
-{
-  if (ack_join.next_sequence_number > this->sequence_number_generator_)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Unexpected sequence number in ack_join ")
-                  ACE_TEXT ("(%d,%d)\n"),
-                  ack_join.next_sequence_number,
-                  this->sequence_number_generator_));
-      return -1;
-    }
-  return 0;
-}
-
-int
-Tester::proxy_received_ack (Test_Proxy *, ACE_RMCast::Ack &)
-{
-  return this->send_ack ();
-}
-
-int
-Tester::send_ack ()
-{
-  ACE_RMCast::Ack ack;
-
-  int set = 0;
-  for (size_t i = 0; i != nproxy; ++i)
-    {
-      if (this->proxy_[i].joined () == 0)
-        continue;
-      if (!set)
-        {
-          ack.next_expected = this->proxy_[i].next_expected ();
-          ack.highest_received = this->proxy_[i].highest_received ();
-          set = 1;
-        }
-      else
-        {
-          if (ack.next_expected > this->proxy_[i].next_expected ())
-            ack.next_expected = this->proxy_[i].next_expected ();
-          if (ack.highest_received < this->proxy_[i].highest_received ())
-            ack.highest_received = this->proxy_[i].highest_received ();
-        }
-    }
-  if (!set)
-    return 0;
-  // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Tested::ack - (%d,%d)\n"),
-  //             ack.next_expected, ack.highest_received));
-  return this->retransmission_.ack (ack);
-}
-
-void
-Tester::generate_one_message (void)
-{
-  ACE_Message_Block payload (1024);
-  payload.wr_ptr (1024);
-
-  ACE_RMCast::Data data;
-  data.payload = &payload;
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-    data.sequence_number = this->sequence_number_generator_++;
-  }
-
-  int result = this->retransmission_.data (data);
-  if (result != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Retransmission::data returned %d\n"),
-                  result));
-    }
-}
-
-int
-Tester::resend (void)
-{
-  ACE_UINT32 max_sequence_number =
-    this->sequence_number_generator_;
-  int r = this->retransmission_.resend (max_sequence_number);
-  if (r == -1)
-    {
-      // ACE_DEBUG ((LM_DEBUG,
-      //             ACE_TEXT ("Error returned from Retransmission::resend\n")));
-    }
-  return r;
-}
-
-int
-Tester::data (ACE_RMCast::Data &data)
-{
-  // After going through the Retransmission layer we got some data,
-  // simulate the work of the following layers:
-  //  - Fragmentation: setting message sequence numbers
-  //  - IO_XXX: send to all known members
-  //  - Reassembly: reconstruct the message on the receiving side.
-
-  data.total_size = 1024;
-  data.fragment_offset = 0;
-
-  for (size_t i = 0; i != nproxy; ++i)
-    {
-      int result = this->proxy_[i].data (data);
-      if (result != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Proxy::data returned %d for proxy %d\n"),
-                      result, i));
-          return -1;
-        }
-    }
-  return 0;
-}
-
-// ****************************************************************
-
-Task::Task (Tester *tester)
-  :  tester_ (tester)
-{
-}
-
-int
-Task::svc (void)
-{
-  this->tester_->run (100);
-  return 0;
-}
-
-// ****************************************************************
-
-Test_Proxy::Test_Proxy (void)
-  : joined_ (0)
-  , tester_ (0)
-  , seed_ (ACE_static_cast(ACE_RANDR_TYPE,ACE_OS::time (0)))
-{
-}
-
-int
-Test_Proxy::data (ACE_RMCast::Data &data)
-{
-  // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) Proxy receives message %d\n"),
-  //             data.sequence_number));
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
-
-  int c = ACE_OS::rand_r (this->seed_) % 100;
-
-  const int success_ratio = 95;
-
-  if (this->next_expected () > data.sequence_number)
-    {
-      // An old message, resend the ack...
-      ACE_RMCast::Ack ack;
-      ack.next_expected = this->next_expected ();
-      ack.highest_received = this->highest_received ();
-      // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("....it is an already accepted message\n")));
-      // Ack the message....
-      return this->ack (ack);
-    }
-
-  if (this->next_expected () == data.sequence_number)
-    {
-      // The message is the next one that we expected...
-      // Two choices: accept the message as successfully received or
-      // reject it, we accept them most of the time.
-      if (c > success_ratio)
-        {
-          // We ignore the message completely as if it was lost in the
-          // network
-          // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("....and drops it\n")));
-          return 0;
-        }
-
-      ACE_RMCast::Ack ack;
-      ack.next_expected = data.sequence_number + 1;
-      if (ack.next_expected < this->highest_received ())
-        {
-          ack.highest_received = this->highest_received ();
-        }
-      else
-        {
-          ack.highest_received = data.sequence_number;
-        }
-      // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("....and accepts it\n")));
-      // Ack the message....
-      return this->ack (ack);
-    }
-
-  // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("....the message is out of order\n")));
-  // This is an out of sequence number, maybe it is lost...
-  if (c > success_ratio)
-    {
-      // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("........and is dropped\n")));
-      return 0;
-    }
-
-  // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("........and is accepted\n")));
-  ACE_RMCast::Ack ack;
-  ack.next_expected = this->next_expected ();
-  if (data.sequence_number < this->highest_received ())
-    {
-      ack.highest_received = this->highest_received ();
-    }
-  else
-    {
-      ack.highest_received = data.sequence_number;
-    }
-  // Ack the message....
-  return this->ack (ack);
-}
-
-int
-Test_Proxy::ack (ACE_RMCast::Ack &ack)
-{
-  (void) this->ACE_RMCast_Proxy::ack (ack);
-  (void) this->tester_->proxy_received_ack (this, ack);
-  return 0;
-}
-
-int
-Test_Proxy::reply_ack_join (ACE_RMCast::Ack_Join & ack_join)
-{
-  int r = this->tester_->reply_ack_join (this, ack_join);
-  if (r == 0)
-    (void) this->ACE_RMCast_Proxy::reply_ack_join (ack_join);
-  return r;
-}
diff --git a/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp b/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp
deleted file mode 100644
index c9a7d83ed22..00000000000
--- a/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = DESCRIPTION
-//    Unit test for the UDP sending module of the RMCast library.
-//
-// = AUTHORS
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
-
-#include "../test_config.h"
-#include "ace/RMCast/RMCast_IO_UDP.h"
-#include "ace/RMCast/RMCast_Fragment.h"
-
-#include "ace/RMCast/RMCast_Module_Factory.h"
-#include "ace/RMCast/RMCast_Fragment.h"
-#include "ace/RMCast/RMCast_Reassembly.h"
-
-#include "ace/Task.h"
-#include "ace/ACE.h"
-
-ACE_RCSID(tests, RMCast_UDP_Best_Effort_Test, "$Id$")
-
-const size_t message_size = 8 * 1024;
-const int total_message_count = 40;
-
-// ****************************************************************
-
-class Sender_Factory : public ACE_RMCast_Module_Factory
-{
-public:
-  Sender_Factory (void)
-  {
-  }
-
-  virtual ACE_RMCast_Module *create (void)
-  {
-    return new ACE_RMCast_Reassembly;
-  }
-
-  virtual void destroy (ACE_RMCast_Module *module)
-  {
-    delete module;
-  }
-};
-
-// ****************************************************************
-
-class Receiver_Factory : public ACE_RMCast_Module_Factory
-{
-public:
-  Receiver_Factory (ACE_RMCast_Module *module)
-    : module_ (module)
-  {
-  }
-
-  virtual ACE_RMCast_Module *create (void)
-  {
-    ACE_RMCast_Module *x = new ACE_RMCast_Reassembly;
-    x->next (this->module_);
-    return x;
-  }
-
-  virtual void destroy (ACE_RMCast_Module *module)
-  {
-    delete module;
-  }
-
-private:
-  ACE_RMCast_Module *module_;
-};
-
-// ****************************************************************
-
-class Sender : public ACE_Task_Base
-{
-public:
-  Sender (const ACE_INET_Addr &mcast_group);
-
-  virtual int svc (void);
-
-private:
-  Sender_Factory factory_;
-  ACE_RMCast_IO_UDP io_udp_;
-  ACE_RMCast_Fragment fragment_;
-
-  ACE_INET_Addr mcast_group_;
-};
-
-// ****************************************************************
-
-class Receiver : public ACE_RMCast_Module
-{
-public:
-  Receiver (const ACE_INET_Addr &mcast_group);
-
-  void dump (void);
-  // Print the results of the test
-
-  int handle_events (ACE_Time_Value *tv);
-  // Invoke the UDP Receiver handle_events function
-
-  virtual int open (void);
-  virtual int data (ACE_RMCast::Data &data);
-
-private:
-  Receiver_Factory factory_;
-  ACE_RMCast_IO_UDP io_udp_;
-
-  ACE_INET_Addr mcast_group_;
-
-  int message_count_;
-};
-
-// ****************************************************************
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("RMCast_UDP_Best_Effort_Test"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
-              ACE::major_version(),
-              ACE::minor_version(),
-              ACE::beta_version()));
-
-  ACE_INET_Addr mcast_group;
-  mcast_group.set (12345, ACE_TEXT ("224.9.9.1"));
-
-  Receiver receiver (mcast_group);
-  if (receiver.open () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in Receiver::open\n")), 1);
-
-  Sender sender (mcast_group);
-  if (sender.activate () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in Sender::activate\n")), 1);
-
-  ACE_Time_Value tv (120, 0);
-  for (;;)
-    {
-      int r = receiver.handle_events (&tv);
-
-      if (r < 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("Error in handle_events()\n")),
-                            1);
-        }
-      if (tv == ACE_Time_Value::zero)
-        break;
-    }
-
-  if (ACE_Thread_Manager::instance ()->wait () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Error in Thread_Manager::wait\n")),
-                       1);
-
-  receiver.dump ();
-
-  ACE_END_TEST;
-  return 0;
-}
-
-// ****************************************************************
-
-Receiver::Receiver (const ACE_INET_Addr &mcast_group)
-  :  factory_ (this)
-  ,  io_udp_ (&factory_)
-  ,  mcast_group_ (mcast_group)
-  ,  message_count_ (0)
-{
-}
-
-int
-Receiver::handle_events (ACE_Time_Value *tv)
-{
-  return this->io_udp_.handle_events (tv);
-}
-
-int
-Receiver::open (void)
-{
-  if (this->io_udp_.subscribe (this->mcast_group_) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Error in IO_UDP::subscribe\n")),
-                      -1);
-  return 0;
-}
-
-int
-Receiver::data (ACE_RMCast::Data &data)
-{
-  if (data.total_size != message_size)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Invalid message size (%d,%d,%d)\n"),
-                       data.sequence_number,
-                       data.total_size,
-                       data.fragment_offset), -1);
-  if (data.fragment_offset != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Invalid message size (%d,%d,%d)\n"),
-                       data.sequence_number,
-                       data.total_size,
-                       data.fragment_offset), -1);
-
-  char expected = 0;
-  for (char *j = data.payload->rd_ptr ();
-       j != data.payload->wr_ptr ();
-       ++j)
-    {
-      if (*j != expected++)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Unexpected byte at pos %d\n"),
-                           long(j - data.payload->rd_ptr ())), -1);
-    }
-
-  this->message_count_++;
-
-  return 0;
-}
-
-void
-Receiver::dump (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Message count = %d/%d\n"),
-              this->message_count_,
-              total_message_count));
-}
-
-// ****************************************************************
-
-Sender::Sender (const ACE_INET_Addr &mcast_group)
-  :  io_udp_ (&factory_)
-  ,  mcast_group_ (mcast_group)
-{
-}
-
-int
-Sender::svc ()
-{
-  if (this->fragment_.next (&this->io_udp_) != 0)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error in Fragment::next()\n")));
-
-  if (this->io_udp_.subscribe (this->mcast_group_) != 0)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error in IO_UDP::subscribe()\n")));
-
-  ACE_Message_Block big_blob (message_size);
-  big_blob.wr_ptr (message_size);
-
-  char filler = 0;
-  for (char* j = big_blob.rd_ptr (); j != big_blob.wr_ptr (); ++j)
-    {
-      *j = filler++;
-    }
-
-  for (int i = 0; i != total_message_count; ++i)
-    {
-      ACE_RMCast::Data data;
-      data.sequence_number = i;
-      data.payload = &big_blob;
-      this->fragment_.data (data);
-    }
-  return 0;
-}
diff --git a/tests/RMCast/acetest.mpb b/tests/RMCast/acetest.mpb
deleted file mode 100644
index 3321d43a7fe..00000000000
--- a/tests/RMCast/acetest.mpb
+++ /dev/null
@@ -1,20 +0,0 @@
-//  -*- MPC -*-
-// $Id$
-
-project : aceexe {
-
-  after += Test_Output
-  libs  += Test_Output
-
-  Source_Files {
-    $(ACE_ROOT)/tests/Main.cpp
-  }
-  Header_Files {
-  }
-  Resource_Files {
-  }
-  Documentation_Files {
-  }
-  Inline_Files {
-  }
-}
diff --git a/tests/RMCast/tests.mpc b/tests/RMCast/tests.mpc
deleted file mode 100644
index 08ad42c7558..00000000000
--- a/tests/RMCast/tests.mpc
+++ /dev/null
@@ -1,45 +0,0 @@
-//  -*- MPC -*-
-// $Id$
-
-project(RMCast Fragment Test) : acetest, rmcast {
-  exename  = RMCast_Fragment_Test
-  Source_Files {
-    RMCast_Fragment_Test.cpp
-  }
-}
-
-project(RMCast Membership Test) : acetest, rmcast {
-  exename  = RMCast_Membership_Test
-  Source_Files {
-    RMCast_Membership_Test.cpp
-  }
-}
-
-project(RMCast Reassembly Test) : acetest, rmcast {
-  exename  = RMCast_Reassembly_Test
-  Source_Files {
-    RMCast_Reassembly_Test.cpp
-  }
-}
-
-project(RMCast Reordering Test) : acetest, rmcast {
-  exename  = RMCast_Reordering_Test
-  Source_Files {
-    RMCast_Reordering_Test.cpp
-  }
-}
-
-project(RMCast Retransmission Test) : acetest, rmcast {
-  exename  = RMCast_Retransmission_Test
-  Source_Files {
-    RMCast_Retransmission_Test.cpp
-  }
-}
-
-project(RMCast UDP Best Effort Test) : acetest, rmcast {
-  exename  = RMCast_UDP_Best_Effort_Test
-  Source_Files {
-    RMCast_UDP_Best_Effort_Test.cpp
-  }
-}
-
diff --git a/tests/Reactor_Dispatch_Order_Test.cpp b/tests/Reactor_Dispatch_Order_Test.cpp
index 98237e0f1d3..98973cb34da 100644
--- a/tests/Reactor_Dispatch_Order_Test.cpp
+++ b/tests/Reactor_Dispatch_Order_Test.cpp
@@ -35,6 +35,8 @@ class Handler : public ACE_Event_Handler
 public:
   Handler (ACE_Reactor &reactor);
 
+  ~Handler();
+
   int handle_timeout (const ACE_Time_Value &tv,
                       const void *arg);
 
@@ -75,6 +77,11 @@ Handler::Handler (ACE_Reactor &reactor)
   ACE_ASSERT (result == 0);
 }
 
+Handler::~Handler (void)
+{
+  this->pipe_.close ();
+}
+
 int
 Handler::handle_timeout (const ACE_Time_Value &,
                          const void *)
@@ -95,13 +102,15 @@ Handler::handle_output (ACE_HANDLE)
   ACE_DEBUG ((LM_DEBUG,
               "Handler::handle_output\n"));
 
-#if defined (__OpenBSD__)
+#if defined (__OpenBSD__) || \
+    defined (ACE_VXWORKS) || \
+  ( defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4) ) // LynxOS 3.x
   // All that we need written has been written, so don't
   // call handle_output again.
   this->reactor ()->mask_ops (this->pipe_.read_handle (),
                               ACE_Event_Handler::WRITE_MASK,
                               ACE_Reactor::CLR_MASK);
-#endif /* __OpenBSD__ */
+#endif /* __OpenBSD__ || ACE_VXWORKS || ACE_LYNXOS_MAJOR ... */
 
   return 0;
 }
diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp
index a60ddeb03c3..ad39ee0cf09 100644
--- a/tests/Reactor_Exceptions_Test.cpp
+++ b/tests/Reactor_Exceptions_Test.cpp
@@ -173,8 +173,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT;
 
   ACE_INET_Addr local_addr (port);
-  ACE_INET_Addr remote_addr (port,
-                             ACE_DEFAULT_SERVER_HOST);
+  ACE_INET_Addr remote_addr (port, ACE_LOCALHOST, PF_INET);
   My_Reactor reactor;
 
   ACE_Reactor::instance (&reactor);
@@ -202,7 +201,7 @@ run_main (int argc, ACE_TCHAR *argv[])
                 ACE_TEXT ("threads not supported on this platform\n")));
 #endif /* ACE_HAS_THREADS */
 
-    ACE_SOCK_Dgram dgram (ACE_sap_any_cast (ACE_INET_Addr &));
+    ACE_SOCK_Dgram dgram (ACE_sap_any_cast (ACE_INET_Addr &), PF_INET);
 
     for (size_t i = 0; i < ACE_MAX_ITERATIONS; i++)
       dgram.send (ACE_TEXT ("Hello"),
diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp
index 4923c877dec..2b2a41790fb 100644
--- a/tests/Reactor_Notify_Test.cpp
+++ b/tests/Reactor_Notify_Test.cpp
@@ -175,7 +175,13 @@ Supplier_Task::perform_notifications (int notifications)
   size_t iterations = ACE_MAX_ITERATIONS;
 
   if (this->long_timeout_)
-    iterations *= (iterations * iterations * 2);
+    {
+      iterations *= (iterations * iterations * 2);
+#if defined (ACE_VXWORKS)
+	  // scale down otherwise the test won'y finish in time
+      iterations /= 4;
+#endif
+    }
 
   for (size_t i = 0; i < iterations; i++)
     {
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index e99ea762c53..e0ebcfb60c3 100644
--- a/tests/Reactor_Performance_Test.cpp
+++ b/tests/Reactor_Performance_Test.cpp
@@ -180,7 +180,7 @@ client (void *arg)
               ACE_TEXT ("(%t) running client\n")));
 
   ACE_INET_Addr *connection_addr =
-    ACE_reinterpret_cast (ACE_INET_Addr *, arg);
+    reinterpret_cast<ACE_INET_Addr *> (arg);
   CONNECTOR connector;
 
   int i;
diff --git a/tests/Reactor_Timer_Test.cpp b/tests/Reactor_Timer_Test.cpp
index 6057d8c20b2..73c537b3933 100644
--- a/tests/Reactor_Timer_Test.cpp
+++ b/tests/Reactor_Timer_Test.cpp
@@ -81,8 +81,7 @@ int
 Time_Handler::handle_timeout (const ACE_Time_Value &tv,
                               const void *arg)
 {
-  long current_count = ACE_static_cast (long,
-                          ACE_reinterpret_cast (size_t, arg));
+  long current_count = static_cast<long> (reinterpret_cast<size_t> (arg));
   if (current_count >= 0)
     ACE_ASSERT (current_count == count);
 
diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp
index 8c4971134c9..9cbc60a0b66 100644
--- a/tests/Reactors_Test.cpp
+++ b/tests/Reactors_Test.cpp
@@ -94,8 +94,7 @@ Test_Task::~Test_Task (void)
 int
 Test_Task::open (void *args)
 {
-  this->reactor (ACE_reinterpret_cast (ACE_Reactor *,
-                                       args));
+  this->reactor (reinterpret_cast<ACE_Reactor *> (args));
   return this->activate (THR_NEW_LWP);
 }
 
@@ -174,8 +173,7 @@ Test_Task::handle_input (ACE_HANDLE)
 static void *
 worker (void *args)
 {
-  ACE_Reactor *reactor = ACE_reinterpret_cast (ACE_Reactor *,
-                                               args);
+  ACE_Reactor *reactor = reinterpret_cast<ACE_Reactor *> (args);
 
   // Make this thread the owner of the Reactor's event loop.
   reactor->owner (ACE_Thread::self ());
diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp
index cd6292ab803..80fc770fd98 100644
--- a/tests/Reader_Writer_Test.cpp
+++ b/tests/Reader_Writer_Test.cpp
@@ -33,12 +33,12 @@ ACE_RCSID(tests, Reader_Writer_Test, "$Id$")
 #if defined (ACE_HAS_THREADS)
 
 // Default number of iterations.
-#if defined (VXWORKS) || defined (__Lynx__)
+#if defined (VXWORKS)
   // So the test doesn't run for too long . . .
   static size_t n_iterations = 25;
 #else
   static size_t n_iterations = 50;
-#endif /* ACE_HAS_WINCE */
+#endif /* VXWORKS */
 
 // Default number of loops.
 #if defined (VXWORKS)
@@ -46,7 +46,7 @@ ACE_RCSID(tests, Reader_Writer_Test, "$Id$")
   static size_t n_loops = 10;
 #else
   static size_t n_loops = 100;
-#endif /* ACE_HAS_WINCE */
+#endif /* VXWORKS */
 
 // Default number of readers.
 static size_t n_readers = 6;
diff --git a/tests/Recursive_Condition_Bug_Test.cpp b/tests/Recursive_Condition_Bug_Test.cpp
index 803c58bf22c..309b3084e69 100644
--- a/tests/Recursive_Condition_Bug_Test.cpp
+++ b/tests/Recursive_Condition_Bug_Test.cpp
@@ -59,13 +59,12 @@ public:
                              ACE_TEXT ("getq failed")),
                             -1);
 
-        Test_Handler *handler = ACE_reinterpret_cast (Test_Handler *, mb->base ());
+        Test_Handler *handler = reinterpret_cast<Test_Handler *> (mb->base ());
         mb->release ();
 
         ACE_Time_Value timeout = ACE_OS::gettimeofday () + ACE_Time_Value (1, 0);
 
-        if (timer_queue_.schedule (ACE_reinterpret_cast (ACE_Event_Handler *,
-                                                         handler),
+        if (timer_queue_.schedule (reinterpret_cast<ACE_Event_Handler *> (handler),
                                    this,
                                    timeout) == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -112,13 +111,12 @@ public:
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%t) Test_Handler::handle_timeout\n")));
 
-    void *nc_arg = ACE_const_cast (void *, arg);
+    void *nc_arg = const_cast<void *> (arg);
     Test_Task *test_task =
-      ACE_reinterpret_cast (Test_Task *, nc_arg);
+      reinterpret_cast<Test_Task *> (nc_arg);
     ACE_Message_Block *mb;
     ACE_NEW_MALLOC_RETURN (mb,
-                           ACE_static_cast (ACE_Message_Block *,
-                                            ACE_Allocator::instance()->malloc (sizeof (ACE_Message_Block))),
+                           static_cast<ACE_Message_Block *> (ACE_Allocator::instance()->malloc (sizeof (ACE_Message_Block))),
                            ACE_Message_Block (sizeof (*this),    // size
                                               ACE_Message_Block::MB_DATA, // type
                                               0,       // cont
@@ -152,8 +150,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_Message_Block *mb;
   ACE_NEW_MALLOC_RETURN (mb,
-                         ACE_static_cast(ACE_Message_Block *,
-                                         ACE_Allocator::instance()->malloc (sizeof (ACE_Message_Block))),
+                         static_cast<ACE_Message_Block *> (ACE_Allocator::instance()->malloc (sizeof (ACE_Message_Block))),
                          ACE_Message_Block (sizeof (handler),    // size
                                             ACE_Message_Block::MB_DATA, // type
                                             0,       // cont
diff --git a/tests/Recursive_Condition_Test.cpp b/tests/Recursive_Condition_Test.cpp
index a3e82d52aea..02643995d7c 100644
--- a/tests/Recursive_Condition_Test.cpp
+++ b/tests/Recursive_Condition_Test.cpp
@@ -47,9 +47,9 @@ public:
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Test_Handler::handle_timeout\n")));
     ++this->nr_expirations_;
 
-    void *nc_arg = ACE_const_cast (void *, arg);
+    void *nc_arg = const_cast<void *> (arg);
     Thread_Timer_Queue *timer_queue =
-      ACE_reinterpret_cast (Thread_Timer_Queue *, nc_arg);
+      reinterpret_cast<Thread_Timer_Queue *> (nc_arg);
 
     ACE_Time_Value timeout = ACE_OS::gettimeofday () + ACE_Time_Value (1, 0);
 
diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp
index b7dc5541161..b90a95893da 100644
--- a/tests/Recursive_Mutex_Test.cpp
+++ b/tests/Recursive_Mutex_Test.cpp
@@ -66,8 +66,7 @@ static void *
 worker (void *arg)
 {
   ACE_Recursive_Thread_Mutex *rm =
-    ACE_reinterpret_cast (ACE_Recursive_Thread_Mutex *,
-                          arg);
+    reinterpret_cast<ACE_Recursive_Thread_Mutex *> (arg);
   recursive_worker (0, rm);
   return 0;
 }
diff --git a/tests/Reference_Counted_Event_Handler_Test.cpp b/tests/Reference_Counted_Event_Handler_Test.cpp
index 68c35a8cd59..721f895bf38 100644
--- a/tests/Reference_Counted_Event_Handler_Test.cpp
+++ b/tests/Reference_Counted_Event_Handler_Test.cpp
@@ -95,6 +95,8 @@ Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void)
   ACE_DEBUG ((LM_DEBUG,
               "Reference count in ~Reference_Counted_Event_Handler() is %d\n",
               this->reference_count_.value ()));
+
+  this->pipe_.close ();
 }
 
 int
@@ -467,6 +469,8 @@ Simple_Event_Handler::~Simple_Event_Handler (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "~Simple_Event_Handler()\n"));
+
+  this->pipe_.close ();
 }
 
 int
@@ -731,6 +735,8 @@ Closed_In_Upcall_Event_Handler::~Closed_In_Upcall_Event_Handler (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "~Closed_In_Upcall_Event_Handler()\n"));
+
+  this->pipe_.close ();
 }
 
 int
diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp
index c59ff63e537..0eee2d171d3 100644
--- a/tests/SOCK_Connector_Test.cpp
+++ b/tests/SOCK_Connector_Test.cpp
@@ -111,7 +111,7 @@ find_another_host (ACE_TCHAR other_host[])
       // Linux systems between <gethostent> and <gethostbyname_r>
       // (called by ACE_INET_Addr in host_is_up) This otherwise causes
       // an infinite loop on Linux --mas 03-08-2001
-      while ((h = gethostent ()) != NULL)
+      while ((h = gethostent ()) != 0)
         {
           if (ACE_OS::strcmp (h->h_name,
                               ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0)
diff --git a/tests/SOCK_Dgram_Bcast_Test.cpp b/tests/SOCK_Dgram_Bcast_Test.cpp
index 080a4b2cdee..fc8149bce3c 100644
--- a/tests/SOCK_Dgram_Bcast_Test.cpp
+++ b/tests/SOCK_Dgram_Bcast_Test.cpp
@@ -250,7 +250,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
         return -1;
       }
   ACE_START_TEST (ACE_TEXT ("SOCK_Dgram_Bcast_Test"));
-  result = run_auto_test (argv[0]);
+  result = run_auto_test (ACE_TEXT ("SOCK_Dgram_Bcast_Test"));
   ACE_END_TEST;
   return result;
 }
diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp
index 5ceb4ca60c7..f971c98e65b 100644
--- a/tests/SOCK_Send_Recv_Test.cpp
+++ b/tests/SOCK_Send_Recv_Test.cpp
@@ -56,8 +56,7 @@ const size_t Test3_Total_Size = Test3_Send_Size * Test3_Loops;
 static void *
 client (void *arg)
 {
-  ACE_INET_Addr *remote_addr = ACE_reinterpret_cast (ACE_INET_Addr *,
-                                                     arg);
+  ACE_INET_Addr *remote_addr = reinterpret_cast<ACE_INET_Addr *> (arg);
   ACE_INET_Addr server_addr (remote_addr->get_port_number (),
                              ACE_LOCALHOST);
   ACE_SOCK_Stream cli_stream;
@@ -97,23 +96,23 @@ client (void *arg)
   // The server will verify that this data pattern gets there intact.
 
   for (i = 0; i < sizeof buffer; ++i)
-    buffer[i] = ACE_static_cast (u_char, i);
+    buffer[i] = static_cast<u_char> (i);
 
   iovec iov[5];
 
-  iov[0].iov_base = ACE_reinterpret_cast (char *, &buffer[0]);
+  iov[0].iov_base = reinterpret_cast<char *> (&buffer[0]);
   iov[0].iov_len = 50;
 
-  iov[1].iov_base = ACE_reinterpret_cast (char *, &buffer[50]);
+  iov[1].iov_base = reinterpret_cast<char *> (&buffer[50]);
   iov[1].iov_len = 25;
 
-  iov[2].iov_base = ACE_reinterpret_cast (char *, &buffer[75]);
+  iov[2].iov_base = reinterpret_cast<char *> (&buffer[75]);
   iov[2].iov_len = 150;
 
-  iov[3].iov_base = ACE_reinterpret_cast (char *, &buffer[225]);
+  iov[3].iov_base = reinterpret_cast<char *> (&buffer[225]);
   iov[3].iov_len = 29;
 
-  iov[4].iov_base = ACE_reinterpret_cast (char *, &buffer[254]);
+  iov[4].iov_base = reinterpret_cast<char *> (&buffer[254]);
   iov[4].iov_len = 1;
 
   len = cli_stream.sendv (iov, 5);
@@ -225,13 +224,13 @@ server (void *arg)
   ssize_t len;
   int i;
 
-  iov[0].iov_base = ACE_reinterpret_cast (char *, &buffer[0]);
+  iov[0].iov_base = reinterpret_cast<char *> (&buffer[0]);
   iov[0].iov_len = 75;
 
-  iov[1].iov_base = ACE_reinterpret_cast (char *, &buffer[75]);
+  iov[1].iov_base = reinterpret_cast<char *> (&buffer[75]);
   iov[1].iov_len = 100;
 
-  iov[2].iov_base = ACE_reinterpret_cast (char *, &buffer[175]);
+  iov[2].iov_base = reinterpret_cast<char *> (&buffer[175]);
   iov[2].iov_len = 80;
 
   len = sock_str.recvv_n (iov, 3);
@@ -351,14 +350,13 @@ spawn (void)
           ACE_OS::exit (0);
           /* NOTREACHED */
         default:
-          server (ACE_reinterpret_cast (void *,
-                                        &peer_acceptor));
+          server (reinterpret_cast<void *> (&peer_acceptor));
           ACE_OS::wait ();
         }
 #elif defined (ACE_HAS_THREADS)
       if (ACE_Thread_Manager::instance ()->spawn
           (ACE_THR_FUNC (server),
-           ACE_reinterpret_cast (void *, &peer_acceptor),
+           reinterpret_cast<void *> (&peer_acceptor),
            THR_NEW_LWP | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) %p\n%a"),
@@ -367,7 +365,7 @@ spawn (void)
 
       if (ACE_Thread_Manager::instance ()->spawn
           (ACE_THR_FUNC (client),
-           ACE_reinterpret_cast (void *, &server_addr),
+           reinterpret_cast<void *> (&server_addr),
            THR_NEW_LWP | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) %p\n%a"),
diff --git a/tests/SOCK_Send_Recv_Test_IPV6.cpp b/tests/SOCK_Send_Recv_Test_IPV6.cpp
index 24e21eed980..7cff181aee6 100644
--- a/tests/SOCK_Send_Recv_Test_IPV6.cpp
+++ b/tests/SOCK_Send_Recv_Test_IPV6.cpp
@@ -50,8 +50,7 @@ const size_t Test3_Total_Size = Test3_Send_Size * Test3_Loops;
 static void *
 client (void *arg)
 {
-  ACE_INET_Addr *remote_addr = ACE_reinterpret_cast (ACE_INET_Addr *,
-                                                     arg);
+  ACE_INET_Addr *remote_addr = reinterpret_cast<ACE_INET_Addr *> (arg);
   ACE_INET_Addr server_addr (remote_addr->get_port_number (),
                              ACE_IPV6_LOCALHOST);
 
@@ -92,23 +91,23 @@ client (void *arg)
   // The server will verify that this data pattern gets there intact.
 
   for (i = 0; i < sizeof buffer; ++i)
-    buffer[i] = ACE_static_cast (u_char, i);
+    buffer[i] = static_cast<u_char> (i);
 
   iovec iov[5];
 
-  iov[0].iov_base = ACE_reinterpret_cast (char *, &buffer[0]);
+  iov[0].iov_base = reinterpret_cast<char *> (&buffer[0]);
   iov[0].iov_len = 50;
 
-  iov[1].iov_base = ACE_reinterpret_cast (char *, &buffer[50]);
+  iov[1].iov_base = reinterpret_cast<char *> (&buffer[50]);
   iov[1].iov_len = 25;
 
-  iov[2].iov_base = ACE_reinterpret_cast (char *, &buffer[75]);
+  iov[2].iov_base = reinterpret_cast<char *> (&buffer[75]);
   iov[2].iov_len = 150;
 
-  iov[3].iov_base = ACE_reinterpret_cast (char *, &buffer[225]);
+  iov[3].iov_base = reinterpret_cast<char *> (&buffer[225]);
   iov[3].iov_len = 29;
 
-  iov[4].iov_base = ACE_reinterpret_cast (char *, &buffer[254]);
+  iov[4].iov_base = reinterpret_cast<char *> (&buffer[254]);
   iov[4].iov_len = 1;
 
   len = cli_stream.sendv (iov, 5);
@@ -220,13 +219,13 @@ server (void *arg)
   ssize_t len;
   int i;
 
-  iov[0].iov_base = ACE_reinterpret_cast (char *, &buffer[0]);
+  iov[0].iov_base = reinterpret_cast<char *> (&buffer[0]);
   iov[0].iov_len = 75;
 
-  iov[1].iov_base = ACE_reinterpret_cast (char *, &buffer[75]);
+  iov[1].iov_base = reinterpret_cast<char *> (&buffer[75]);
   iov[1].iov_len = 100;
 
-  iov[2].iov_base = ACE_reinterpret_cast (char *, &buffer[175]);
+  iov[2].iov_base = reinterpret_cast<char *> (&buffer[175]);
   iov[2].iov_len = 80;
 
   len = sock_str.recvv_n (iov, 3);
@@ -349,14 +348,13 @@ spawn (void)
           ACE_OS::exit (0);
           /* NOTREACHED */
         default:
-          server (ACE_reinterpret_cast (void *,
-                                        &peer_acceptor));
+          server (reinterpret_cast<void *> (&peer_acceptor));
           ACE_OS::wait ();
         }
 #elif defined (ACE_HAS_THREADS)
       if (ACE_Thread_Manager::instance ()->spawn
           (ACE_THR_FUNC (server),
-           ACE_reinterpret_cast (void *, &peer_acceptor),
+           reinterpret_cast<void *> (&peer_acceptor),
            THR_NEW_LWP | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) %p\n%a"),
@@ -365,7 +363,7 @@ spawn (void)
 
       if (ACE_Thread_Manager::instance ()->spawn
           (ACE_THR_FUNC (client),
-           ACE_reinterpret_cast (void *, &server_addr),
+           reinterpret_cast<void *> (&server_addr),
            THR_NEW_LWP | THR_DETACHED) == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) %p\n%a"),
diff --git a/tests/SSL/Makefile.am b/tests/SSL/Makefile.am
index 46ac10a96c5..4a67fb3cbe3 100644
--- a/tests/SSL/Makefile.am
+++ b/tests/SSL/Makefile.am
@@ -1,52 +1,43 @@
-##----------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile.am for all the ACE_SSL ``one-button'' tests
-##----------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
+
+ACE_BUILDDIR = $(top_builddir)
+ACE_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+## Makefile.Thread_Pool_Reactor_SSL_Test.am 
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) @ACE_TLS_CPPFLAGS@
+if BUILD_SSL
+noinst_PROGRAMS += Thread_Pool_Reactor_SSL_Test
 
-noinst_PROGRAMS = Thread_Pool_Reactor_SSL_Test
+Thread_Pool_Reactor_SSL_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(SSL_ROOT)/include \
+  -I/usr/kerberos/include \
+  -DACE_HAS_SSL=1
 
 Thread_Pool_Reactor_SSL_Test_SOURCES = \
-  Thread_Pool_Reactor_SSL_Test.h \
+  $(ACE_ROOT)/tests/Main.cpp \
   Thread_Pool_Reactor_SSL_Test.cpp \
-  Main.cpp
+  Thread_Pool_Reactor_SSL_Test.h
 
 Thread_Pool_Reactor_SSL_Test_LDADD = \
-  $(top_builddir)/tests/libTest_Output.la \
-  $(top_builddir)/ace/SSL/libACE_SSL.la
+ $(top_builddir)/ace/SSL/libACE_SSL.la $(top_builddir)/tests/libTest_Output.la $(top_builddir)/ace/libACE.la -lssl -lcrypto
 
-noinst_DATA = \
-  dummy.pem \
-  key.pem
-
-EXTRA_DIST = \
-  dummy.pem \
-  key.pem
-
-## Automake recognized target.  Appends these rules to the "all"
-## target.
-all-local:
-	for p in $(noinst_DATA); do \
-	  test -f $$p \
-	  || $(LN_S) $(srcdir)/$$p $$p; done
-	touch tests-link-stamp
+endif BUILD_SSL
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core core.*
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
 	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf Templates.DB gcctemp.c gcctemp so_locations *.ics
-	-rm -rf templateregistry SunWS_cache ir.out
-
-
-## Clean up files and directories created by this Makefile.
-distclean-local:
-	-test -f tests-link-stamp \
-	   && rm $(noinst_DATA) tests-link-stamp
-	-rm -rf log
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
index c9c5992be17..6a9a8ebf740 100644
--- a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
+++ b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
@@ -143,7 +143,7 @@ Request_Handler::handle_input (ACE_HANDLE fd)
 
   if (result > 0
       && this->peer ().recv_n (buffer, len * sizeof (ACE_TCHAR))
-          == ACE_static_cast (ssize_t, len * sizeof (ACE_TCHAR)))
+          == static_cast<ssize_t> (len * sizeof (ACE_TCHAR)))
     {
       ++this->nr_msgs_rcvd_;
 
@@ -215,7 +215,7 @@ cli_worker (void *arg)
   ACE_SSL_SOCK_Stream stream;
   ACE_SSL_SOCK_Connector connect;
   ACE_Time_Value delay (0, req_delay);
-  size_t len = * ACE_reinterpret_cast (ACE_TCHAR *, arg);
+  size_t len = * reinterpret_cast<ACE_TCHAR *> (arg);
 
   for (size_t i = 0 ; i < cli_conn_no; i++)
     {
diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp
index 0e13d659ed0..971a9c50aee 100644
--- a/tests/SString_Test.cpp
+++ b/tests/SString_Test.cpp
@@ -278,7 +278,7 @@ run_main (int, ACE_TCHAR *[])
 
     const char *str = "What_a_day_it_has_been";
 
-    sstr.rep (ACE_const_cast (char *, str));
+    sstr.rep (const_cast<char *> (str));
 
     ACE_SString tmp =
       sstr.substring (2, 300);
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index 7f22a2da468..a63f3ed78ad 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -24,8 +24,11 @@
 
 #include "test_config.h"
 #include "ace/Malloc.h"
+#include "ace/SV_Semaphore_Simple.h"
+#include "ace/SV_Semaphore_Complex.h"
 #include "ace/OS_NS_unistd.h"
 
+
 ACE_RCSID(tests, SV_Shared_Memory_Test, "$Id$")
 
 #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM)
@@ -151,8 +154,7 @@ run_main (int, ACE_TCHAR *[])
 
 #if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK) && \
     !defined(ACE_LACKS_SYSV_SHMEM)
-  char *shm = ACE_reinterpret_cast (char *,
-                                    myallocator ().malloc (SHMSZ));
+  char *shm = reinterpret_cast<char *> (myallocator ().malloc (SHMSZ));
 
   // Create the mutex and synch before spawning the child process, to
   // avoid race condition between their creation in the parent and use
diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp
index 18cb3e7eb61..7232666ff10 100644
--- a/tests/Semaphore_Test.cpp
+++ b/tests/Semaphore_Test.cpp
@@ -162,7 +162,9 @@ worker (void *)
           ++timeouts;
           ACE_Time_Value diff = ACE_OS::gettimeofday ();
           diff = diff - tv;       // tv should have been reset to time acquired
-          if (diff.msec () > ACE_ALLOWED_SLACK)
+          long diff_msec = diff.msec ();
+
+          if (diff_msec > ACE_ALLOWED_SLACK)
             {
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("Acquire fails time reset test\n")));
@@ -212,7 +214,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
   s.release (n_release_count);
 
   if (ACE_Thread_Manager::instance ()->spawn_n
-      (ACE_static_cast (size_t, n_workers),
+      (static_cast<size_t> (n_workers),
        ACE_THR_FUNC (worker),
        0,
        THR_NEW_LWP) == -1)
diff --git a/tests/Service_Config_DLL.cpp b/tests/Service_Config_DLL.cpp
index 54b58705bad..04f45ea10ce 100644
--- a/tests/Service_Config_DLL.cpp
+++ b/tests/Service_Config_DLL.cpp
@@ -12,8 +12,7 @@ ACE_RCSID (tests,
 static ACE_THR_FUNC_RETURN
 invoke_service_config (void *arg)
 {
-  const ACE_TCHAR *directive = ACE_reinterpret_cast (const ACE_TCHAR *,
-                                                     arg);
+  const ACE_TCHAR *directive = reinterpret_cast<const ACE_TCHAR *> (arg);
 
 
   // Process a Service Configurator directive in the current thread.
diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp
index 6006d661a6f..da513ae8382 100644
--- a/tests/Service_Config_Test.cpp
+++ b/tests/Service_Config_Test.cpp
@@ -20,6 +20,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/Object_Manager.h"
 #include "ace/Service_Config.h"
+#include "ace/Reactor.h"
 #include "ace/Thread_Manager.h"
 #include "ace/ARGV.h"
 
@@ -82,8 +83,7 @@ Test_Singleton::instance (u_short variety)
 
   ACE_Object_Manager::at_exit (instances[variety],
                                test_singleton_cleanup,
-                               ACE_reinterpret_cast (void *,
-                                 ACE_static_cast (size_t, variety)));
+                               reinterpret_cast<void *> (static_cast<size_t> (variety)));
   return instances[variety];
 }
 
diff --git a/tests/Signal_Test.cpp b/tests/Signal_Test.cpp
index c13467e6773..acf7bf5ea05 100644
--- a/tests/Signal_Test.cpp
+++ b/tests/Signal_Test.cpp
@@ -113,7 +113,7 @@ handle_signal (int signum)
 
 // This function handles signals synchronously.
 
-static void *
+static ACE_THR_FUNC_RETURN
 synchronous_signal_handler (void *)
 {
   ACE_Sig_Set sigset;
@@ -146,7 +146,7 @@ synchronous_signal_handler (void *)
 // This function arranges to handle signals asynchronously, which is
 // necessary if an OS platform lacks threads.
 
-static void *
+static ACE_THR_FUNC_RETURN
 asynchronous_signal_handler (void *)
 {
   ACE_Sig_Set sigset;
@@ -174,11 +174,11 @@ asynchronous_signal_handler (void *)
 
 // Function that runs in the child process in its own worker thread.
 
-static void *
+static ACE_THR_FUNC_RETURN
 worker_child (void *arg)
 {
   long handle_signals_synchronously =
-    ACE_reinterpret_cast (long, arg);
+    reinterpret_cast <long> (arg);
 
   for (size_t i = 0; i < n_iterations; i++)
     {
@@ -231,12 +231,11 @@ worker_child (void *arg)
 }
 
 // This function runs the parent process in a separate worker thread.
-
-static void *
+static ACE_THR_FUNC_RETURN
 worker_parent (void *arg)
 {
   long handle_signals_synchronously =
-    ACE_reinterpret_cast (long, arg);
+    reinterpret_cast <long> (arg);
   ACE_Process_Options options;
 
   ACE_TCHAR *l_argv[3];
@@ -245,7 +244,7 @@ worker_parent (void *arg)
   // portably.  Also, pass the test number, as well.
   ACE_OS::sprintf (pid_str,
                    ACE_TEXT ("-p %ld -t %d"),
-                   ACE_static_cast (long, parent_pid),
+                   static_cast <long> (parent_pid),
                    test_number);
 
   // We're going to create a new process that runs this program again,
@@ -255,8 +254,7 @@ worker_parent (void *arg)
                        ACE_TEXT ("Signal_Test")
                        ACE_PLATFORM_EXE_SUFFIX
                        ACE_TEXT (" -c");
-  l_argv[0] = ACE_const_cast (ACE_TCHAR *,
-                              t);
+  l_argv[0] = const_cast <ACE_TCHAR *> (t);
   l_argv[1] = pid_str;
   l_argv[2] = 0;
 
@@ -322,8 +320,7 @@ run_test (ACE_THR_FUNC worker,
                     ACE_TEXT ("(%P|%t) spawning worker thread\n")));
         result = ACE_Thread_Manager::instance ()->spawn
           (worker,
-           ACE_reinterpret_cast (void *,
-                                 handle_signals_synchronously),
+           reinterpret_cast <void *> (handle_signals_synchronously),
            THR_DETACHED);
         ACE_ASSERT (result != -1);
 
@@ -362,8 +359,7 @@ run_test (ACE_THR_FUNC worker,
       ACE_UNUSED_ARG (handle_signals_in_separate_thread);
       // Arrange to handle signals asynchronously.
       asynchronous_signal_handler (0);
-      (*worker) (ACE_reinterpret_cast (void *,
-                                       handle_signals_synchronously));
+      (*worker) (reinterpret_cast <void *> (handle_signals_synchronously));
     }
 }
 
diff --git a/tests/TP_Reactor_Test.cpp b/tests/TP_Reactor_Test.cpp
index 7882417a1cc..f81635170c4 100644
--- a/tests/TP_Reactor_Test.cpp
+++ b/tests/TP_Reactor_Test.cpp
@@ -1065,6 +1065,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
       senders = 20;           // number of senders
       loglevel = 1;           // log level : 0 full/ 1 only errors
       seconds = 20;           // time to run in seconds
+#if defined(SOMAXCONN) // The test is invalid if senders > SOMAXCONN
+      if(SOMAXCONN < senders)
+        senders = SOMAXCONN;
+#endif
       return 0;
     }
 
@@ -1117,7 +1121,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 static int
 disable_signal (int sigmin, int sigmax)
 {
-#ifndef ACE_WIN32
+#if defined (ACE_HAS_PTHREADS_STD)  &&  !defined (ACE_LACKS_PTHREAD_SIGMASK)
   sigset_t signal_set;
   if (sigemptyset (&signal_set) == - 1)
     ACE_ERROR ((LM_ERROR,
@@ -1135,7 +1139,7 @@ disable_signal (int sigmin, int sigmax)
 #else
   ACE_UNUSED_ARG(sigmin);
   ACE_UNUSED_ARG(sigmax);
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_PTHREADS_STD && !ACE_LACKS_PTHREAD_SIGMASK */
 
   return 1;
 }
@@ -1179,16 +1183,18 @@ run_main (int argc, ACE_TCHAR *argv[])
     {
       int rc = 0;
 
+      ACE_INET_Addr addr (port);
       if (both != 0 || host == 0) // Acceptor
-        rc += acceptor.start (ACE_INET_Addr (port));
+        rc += acceptor.start (addr);
 
       if (both != 0 || host != 0)
         {
           if (host == 0)
-            host = ACE_TEXT ("localhost");
+            host = ACE_LOCALHOST;
 
-          rc += connector.start (ACE_INET_Addr (port, host),
-                                 senders);
+          if (addr.set (port, host, 1, addr.get_type ()) == -1)
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), host));
+          rc += connector.start (addr, senders);
 
         }
 
diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp
index a148559c49a..641bbcd9423 100644
--- a/tests/TSS_Test.cpp
+++ b/tests/TSS_Test.cpp
@@ -43,11 +43,6 @@ static u_int errors = 0;
     (ACE_DEFAULT_THREAD_KEYS - ACE_MAX_THREADS) / (2 * ACE_MAX_THREADS) < 2
       ?  1
       :  (ACE_DEFAULT_THREAD_KEYS - ACE_MAX_THREADS) / (2 * ACE_MAX_THREADS);
-
-#elif defined (__Lynx__)
-  // LynxOS only has 16 native TSS keys, and most of those don't seem
-  // to be available.
-  static const int ITERATIONS = 1;
 #else
   // POSIX requires at least _POSIX_THREAD_KEYS_MAX (128) keys.  25
   // iterations with 4 worker threads should be sufficient to check
@@ -58,6 +53,9 @@ static u_int errors = 0;
 
 // Static variables.
 int Errno::flags_;
+int Errno::created_;
+int Errno::deleted_;
+
 ACE_Thread_Mutex *Errno::lock_ = 0;
 
 // This is our thread-specific error handler . . .
@@ -81,15 +79,17 @@ cleanup (void *ptr)
   // old value is replaced.  This function is intended to be
   // used with Draft 6 and later threads, where it is called
   // on thread termination with the thread-specific value.
-
-  // Anyways, for whatever reason, the ACE_DEBUG causes a
-  // core dump on LynxOS 2.5.0.
   ACE_UNUSED_ARG (ptr);
 #else  /* ! ACE_HAS_PTHREADS_DRAFT4 */
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) in cleanup, ptr = %x\n"), ptr));
+  // Don't do this:  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) in cleanup, ptr = %x\n"), ptr));
+  // The Log_Msg buffer is a TSS object, too, and it may be gone!
+  // if you must say something here try:
+  //  ACE_OS::fprintf (stderr, ACE_TEXT("(%d) in cleanup, ptr = %x\n"), ACE_Thread::self(), ptr);
+  // and this:
+  //    operator delete (ptr);
+  // is nonsense when applied to a void *! (even tho the compilers accept it????
+  delete static_cast <int *> (ptr);
 #endif /* ! ACE_HAS_PTHREADS_DRAFT4 */
-
-  operator delete (ptr);
 }
 
 // This worker function is the entry point for each thread.
@@ -97,7 +97,7 @@ cleanup (void *ptr)
 static void *
 worker (void *c)
 {
-  int count = *(ACE_static_cast (int*, c));
+  int count = *(static_cast<int*> (c));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) worker, iterations = %d\n"), count));
 
@@ -200,7 +200,7 @@ worker (void *c)
         }
 #endif /* !defined (ACE_HAS_BROKEN_EXPLICIT_TYPECAST_OPERATOR_INVOCATION) */
 
-#if !defined (__Lynx__) || defined (ACE_HAS_TSS_EMULATION)
+#if defined (ACE_HAS_TSS_EMULATION)
       key = ACE_OS::NULL_key;
 
       if (ACE_Thread::keycreate (&key, cleanup) == -1)
@@ -243,9 +243,8 @@ worker (void *c)
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
                     ACE_TEXT ("ACE_Thread::keyfree")));
 #  endif /* !(PTHREADS_DRAFT4 or 6) || defined (ACE_HAS_TSS_EMULATION) */
-#endif /* ! __Lynx__ || ACE_HAS_TSS_EMULATION */
+#endif /* ACE_HAS_TSS_EMULATION */
     }
-
   return 0;
 }
 
@@ -298,7 +297,20 @@ run_main (int, ACE_TCHAR *[])
   delete tss_error;
 
   Errno::deallocate_lock ();
-#else
+
+
+  if (Errno::created () != Errno::deleted ())
+    {
+      //@@TODO: this should probably be promoted to an error rather than just a
+      // warning.
+      ACE_ERROR ((LM_DEBUG,
+        ACE_TEXT ("(%P|%t) Warning: Number created (%d) != number deleted (%d)\n"),
+        Errno::created (),
+        Errno::deleted ()
+        ));
+    }
+
+#else /* ACE_HAS_THREADS */
   ACE_ERROR ((LM_INFO,
               ACE_TEXT ("threads are not supported on this platform\n")));
 #endif /* ACE_HAS_THREADS */
diff --git a/tests/TSS_Test_Errno.h b/tests/TSS_Test_Errno.h
index 26c0b0e0ae0..7d822a7099b 100644
--- a/tests/TSS_Test_Errno.h
+++ b/tests/TSS_Test_Errno.h
@@ -29,6 +29,17 @@ class Errno
   //    compiler "features" related to template instantiation...  It is
   //    only used by TSS_Test.cpp.
 public:
+  Errno()
+  {
+    ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_Mon, *Errno::lock_));
+    created_ += 1;
+  }
+  ~Errno()
+  {
+    ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_Mon, *Errno::lock_));
+    deleted_ += 1;
+  }
+
   int error (void) { return this->errno_; }
   void error (int i) { this->errno_ = i; }
 
@@ -51,6 +62,16 @@ public:
     return 0;
   }
 
+  static int created (void)
+  {
+    return created_;
+  }
+
+  static int deleted (void)
+  {
+    return deleted_;
+  }
+
 #if defined (ACE_HAS_THREADS)
   static
   ACE_Thread_Mutex *
@@ -72,6 +93,8 @@ private:
   int lineno_;
 
   static int flags_;
+  static int created_;
+  static int deleted_;
 #if defined (ACE_HAS_THREADS)
   // flags_ needs a lock.
   static ACE_Thread_Mutex *lock_;
diff --git a/tests/Task_Ex_Test.cpp b/tests/Task_Ex_Test.cpp
index 1b8d4f97322..efa01f9ba86 100644
--- a/tests/Task_Ex_Test.cpp
+++ b/tests/Task_Ex_Test.cpp
@@ -11,7 +11,7 @@
 // = DESCRIPTION
 //    This test program illustrates the ACE_Task_Ex class which has the ACE_Message_Queue_Ex
 //    that has the capability to hold user-defined messages instead of ACE_Message_Block
-//    
+//
 //
 // = AUTHOR
 //    Kobi Cohen-Arazi <kobi-co@barak-online.net>
@@ -29,9 +29,16 @@ ACE_RCSID(tests, Task_Test_Ex, "$Id$")
 #if defined (ACE_HAS_THREADS)
 
 /// default params
+#if defined (ACE_VXWORKS)
+// this is a very expensive test on VxWorks so limit it otherwise it will never finish in time:-)
+const ACE_INT32 PRODUCER_THREADS_NO=10;
+const ACE_INT32 CONSUMER_THREADS_NO=10;
+const ACE_INT32 NUMBER_OF_MSGS=200;
+#else
 const ACE_INT32 PRODUCER_THREADS_NO=20;
 const ACE_INT32 CONSUMER_THREADS_NO=20;
 const ACE_INT32 NUMBER_OF_MSGS=2000;
+#endif
 
 /// @class Consumer consumes user defined Msgs
 class Consumer : public ACE_Task_Ex<ACE_MT_SYNCH, User_Defined_Msg>
@@ -66,14 +73,14 @@ int Consumer::svc ()
   {
     ACE_ASSERT (pMsg!=0);
     auto_ptr<User_Defined_Msg> pAuto(pMsg);
-    ACE_DEBUG((LM_DEBUG, 
+    ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("Consumer::svc got msg id=%d\n"),
                pMsg->msg_id ()));
     if(pMsg->msg_id ()==NUMBER_OF_MSGS-1)
       break;
   }
 
-  ACE_DEBUG((LM_INFO, 
+  ACE_DEBUG((LM_INFO,
              ACE_TEXT("Consumer::svc ended thread %t\n")));
 
   return 0;
@@ -83,7 +90,7 @@ int Consumer::svc ()
 /// producer function produces user defined messages.
 ACE_THR_FUNC_RETURN producer (void *arg)
 {
-  Consumer* c = ACE_static_cast (Consumer*, arg);
+  Consumer* c = static_cast<Consumer*> (arg);
   ACE_ASSERT(c!=0);
   if (c==0)
   {
@@ -133,17 +140,17 @@ run_main (int, ACE_TCHAR *[])
 
   Consumer c;
   if(c.open (0)==-1)
-    ACE_ERROR_RETURN((LM_ERROR, 
+    ACE_ERROR_RETURN((LM_ERROR,
                       ACE_TEXT ("main Error opening consumer\n")),-1);
-        
-  
+
+
   int result=ACE_Thread_Manager::instance()->spawn_n (PRODUCER_THREADS_NO,
                                                       ACE_THR_FUNC(producer),
-                                                      ACE_static_cast(void*,&c));
+                                                      static_cast<void*> (&c));
   if (result==-1)
   {
-    ACE_ERROR_RETURN((LM_ERROR, 
-                      ACE_TEXT ("main Error spawning threads %p\n"), 
+    ACE_ERROR_RETURN((LM_ERROR,
+                      ACE_TEXT ("main Error spawning threads %p\n"),
                       "err="),-1);
   }
 
diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp
index ca52863c3b7..bc24acf9eca 100644
--- a/tests/Test_Output.cpp
+++ b/tests/Test_Output.cpp
@@ -30,6 +30,11 @@
 #include "ace/Log_Msg.h"
 #include "ace/ACE.h"
 
+#if defined (VXWORKS)
+# include "ace/OS_NS_unistd.h"
+# include "ace/OS_NS_fcntl.h"
+#endif /* VXWORKS */
+
 ACE_Test_Output *ACE_Test_Output::instance_ = 0;
 
 ACE_Test_Output::ACE_Test_Output (void)
@@ -43,21 +48,33 @@ ACE_Test_Output::ACE_Test_Output (void)
 ACE_Test_Output::~ACE_Test_Output (void)
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_PSOS)
-  ACE_LOG_MSG->msg_ostream (&cerr);
+  ACE_OSTREAM_TYPE *log_msg_stream =  ACE_LOG_MSG->msg_ostream ();
+
+  ACE_LOG_MSG->msg_ostream (&cerr, 0);
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY && ! ACE_PSOS */
 
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP)
-  delete this->output_file_;
+  if (this->output_file_ == log_msg_stream)
+    delete this->output_file_;
+  // else something else changed the stream and hence should
+  // have closed and deleted the output_file_ 
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
 OFSTREAM *
 ACE_Test_Output::output_file (void)
 {
-  return this->output_file_;
+  // the output_file_ is given to ACE_LOG_MSG
+  // and something else might destroy and/or change the stream
+  // so return what ACE_LOG_MSG is using.
+#if defined (ACE_LACKS_IOSTREAM_TOTALLY)
+  return reinterpret_cast<OFSTREAM*>(ACE_LOG_MSG->msg_ostream ());
+#else
+  return dynamic_cast<OFSTREAM*>(ACE_LOG_MSG->msg_ostream ());
+#endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
 int
@@ -141,7 +158,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   this->output_file_ = ACE_OS::fopen (temp, fmode);
 # endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
-  ACE_LOG_MSG->msg_ostream (this->output_file ());
+  ACE_LOG_MSG->msg_ostream (this->output_file_);
 #endif /* ACE_HAS_PHARLAP */
 
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
@@ -153,13 +170,22 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 void
 ACE_Test_Output::close (void)
 {
+  if (this->output_file_ &&
+      (this->output_file_ == ACE_LOG_MSG->msg_ostream ())) 
+  {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-  this->output_file_->flush ();
-  this->output_file_->close ();
+    this->output_file_->flush ();
+    this->output_file_->close ();
+    delete this->output_file_;
 #else
   ACE_OS::fflush (this->output_file_);
   ACE_OS::fclose (this->output_file_);
 #endif /* !ACE_LACKS_IOSTREAM_TOTALLY */
+    this->output_file_=0;
+    ACE_LOG_MSG->msg_ostream (this->output_file_, 0);
+  }
+  // else something else changed the stream and hence should
+  // have closed and deleted the output_file_ 
 }
 
 ACE_Test_Output*
@@ -207,7 +233,7 @@ randomize (int array[], size_t size)
   size_t i;
 
   for (i = 0; i < size; i++)
-    array [i] = ACE_static_cast (int, i);
+    array [i] = static_cast <int> (i);
 
   // See with a fixed number so that we can produce "repeatable"
   // random numbers.
diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp
index 50600c18158..2fb5c9ced47 100644
--- a/tests/Thread_Manager_Test.cpp
+++ b/tests/Thread_Manager_Test.cpp
@@ -283,7 +283,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
   // Assign thread (VxWorks task) names to test that feature.
   ACE_thread_t *thread_name;
   ACE_NEW_RETURN (thread_name,
@@ -313,18 +313,18 @@ run_main (int, ACE_TCHAR *[])
 
       stack_size[i] = 40000;
     }
-#endif /* VXWORKS */
+#endif /* VXWORKS && !ACE_HAS_PTHREADS */
 
   int grp_id = thr_mgr->spawn_n
                  (
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
                   thread_name,
-#endif /* VXWORKS */
+#endif /* VXWORKS && !ACE_HAS_PTHREADS */
                   n_threads,
                   (ACE_THR_FUNC) worker,
-                  ACE_reinterpret_cast (void *, n_iterations),
+                  reinterpret_cast <void *> (n_iterations),
                   THR_BOUND
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
                   , ACE_DEFAULT_THREAD_PRIORITY
                   , -1
                   , 0
@@ -414,7 +414,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) main thread finished\n")));
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) && !defined (ACE_HAS_PTHREADS)
   for (i = 0; i < n_threads - 1; ++i)
     {
       delete [] thread_name[i];
@@ -423,7 +423,7 @@ run_main (int, ACE_TCHAR *[])
     }
   delete [] thread_name;
   delete [] stack_size;
-#endif /* VXWORKS */
+#endif /* VXWORKS && !ACE_HAS_PTHREADS */
 
   delete thread_start;
   thread_start = 0;
diff --git a/tests/Thread_Mutex_Test.cpp b/tests/Thread_Mutex_Test.cpp
index 4f1d62c6114..2a89dcbe315 100644
--- a/tests/Thread_Mutex_Test.cpp
+++ b/tests/Thread_Mutex_Test.cpp
@@ -245,12 +245,7 @@ spawn (void)
 #if defined (ACE_HAS_THREADS)
   ACE_TEST_MUTEX mutex;
 
-  const u_int n_threads =
-#if defined (__Lynx__)
-    3;  /* It just doesn't work with 4 threads. */
-#else  /* ! __Lynx__ */
-    ACE_MAX_THREADS;
-#endif /* ! __Lynx_- */
+  const u_int n_threads = ACE_MAX_THREADS;
 
   if (ACE_Thread_Manager::instance ()->spawn_n (n_threads,
                                                 ACE_THR_FUNC (test),
diff --git a/tests/Thread_Pool_Reactor_Resume_Test.cpp b/tests/Thread_Pool_Reactor_Resume_Test.cpp
index 3376bfe3f08..c4640241475 100644
--- a/tests/Thread_Pool_Reactor_Resume_Test.cpp
+++ b/tests/Thread_Pool_Reactor_Resume_Test.cpp
@@ -60,8 +60,10 @@ static const ACE_TCHAR *rendezvous = ACE_TEXT ("127.0.0.1:10010");
 static size_t svr_thrno = ACE_MAX_THREADS;
 
 
-#if defined (CHORUS) // Add platforms that can't handle too many
-                     // connection simultaneously here.
+#if defined (CHORUS) \
+	|| defined (ACE_VXWORKS) 	// default network parameters (MAX_BINDS and system buffers) are too small for full test
+		 // Add platforms that can't handle too many
+         // connection simultaneously here.
 #define ACE_LOAD_FACTOR /2
 #else
 #define ACE_LOAD_FACTOR
@@ -172,7 +174,7 @@ Request_Handler::handle_input (ACE_HANDLE fd)
 
   if (result > 0
       && this->peer ().recv_n (buffer, len * sizeof (ACE_TCHAR))
-          == ACE_static_cast (ssize_t, len * sizeof (ACE_TCHAR)))
+          == static_cast<ssize_t> (len * sizeof (ACE_TCHAR)))
     {
       ++this->nr_msgs_rcvd_;
 
@@ -254,7 +256,7 @@ cli_worker (void *arg)
   ACE_SOCK_Stream stream;
   ACE_SOCK_Connector connect;
   ACE_Time_Value delay (0, req_delay);
-  size_t len = * ACE_reinterpret_cast (ACE_TCHAR *, arg);
+  size_t len = * reinterpret_cast<ACE_TCHAR *> (arg);
 
   for (size_t i = 0 ; i < cli_conn_no; i++)
     {
@@ -295,7 +297,7 @@ worker (void *)
   ACE_OS::sleep (3);
   const ACE_TCHAR *msg = ACE_TEXT ("Message from Connection worker");
   ACE_TCHAR buf [BUFSIZ];
-  buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS::strlen (msg) + 1));
+  buf[0] = static_cast<ACE_TCHAR> ((ACE_OS::strlen (msg) + 1));
   ACE_OS::strcpy (&buf[1], msg);
 
   ACE_INET_Addr addr (rendezvous);
diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp
index d50d6fdfbb2..97469108eb7 100644
--- a/tests/Thread_Pool_Reactor_Test.cpp
+++ b/tests/Thread_Pool_Reactor_Test.cpp
@@ -63,8 +63,10 @@ static const ACE_TCHAR *rendezvous = ACE_TEXT ("127.0.0.1:10010");
 // Total number of server threads.
 static size_t svr_thrno = ACE_MAX_THREADS;
 
-#if defined (CHORUS) // Add platforms that can't handle too many
-                     // connection simultaneously here.
+#if defined (CHORUS) \
+	|| defined (ACE_VXWORKS) 	// default network parameters (MAX_BINDS and system buffers) are too small for full test
+		// Add platforms that can't handle too many
+        // connection simultaneously here.
 #define ACE_LOAD_FACTOR /2
 #else
 #define ACE_LOAD_FACTOR
@@ -140,7 +142,7 @@ Request_Handler::handle_input (ACE_HANDLE fd)
 
   if (result > 0
       && this->peer ().recv_n (buffer, len * sizeof (ACE_TCHAR))
-          == ACE_static_cast (ssize_t, len * sizeof (ACE_TCHAR)))
+          == static_cast<ssize_t> (len * sizeof (ACE_TCHAR)))
     {
       ++this->nr_msgs_rcvd_;
 
@@ -212,7 +214,7 @@ cli_worker (void *arg)
   ACE_SOCK_Stream stream;
   ACE_SOCK_Connector connect;
   ACE_Time_Value delay (0, req_delay);
-  size_t len = * ACE_reinterpret_cast (ACE_TCHAR *, arg);
+  size_t len = * reinterpret_cast<ACE_TCHAR *> (arg);
 
   for (size_t i = 0 ; i < cli_conn_no; i++)
     {
@@ -253,7 +255,7 @@ worker (void *)
   ACE_OS::sleep (3);
   const ACE_TCHAR *msg = ACE_TEXT ("Message from Connection worker");
   ACE_TCHAR buf [BUFSIZ];
-  buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS::strlen (msg) + 1));
+  buf[0] = static_cast<ACE_TCHAR> ((ACE_OS::strlen (msg) + 1));
   ACE_OS::strcpy (&buf[1], msg);
 
   ACE_INET_Addr addr (rendezvous);
diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index e7cc08c6f3d..a201efaf3ee 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -235,7 +235,7 @@ Thread_Pool::test_queue_deactivation_shutdown (void)
         {
           static size_t count = 0;
 
-          ACE_OS::sprintf (ACE_reinterpret_cast (ACE_TCHAR *, mb->wr_ptr ()),
+          ACE_OS::sprintf (reinterpret_cast<ACE_TCHAR *> (mb->wr_ptr ()),
                            ACE_SIZE_T_FORMAT_SPECIFIER,
                            count);
           n = ACE_OS::strlen (mb->rd_ptr ());
@@ -327,7 +327,7 @@ Thread_Pool::test_empty_message_shutdown (void)
         {
           static size_t count = 0;
 
-          ACE_OS::sprintf (ACE_reinterpret_cast (ACE_TCHAR *, mb->wr_ptr ()),
+          ACE_OS::sprintf (reinterpret_cast<ACE_TCHAR *> (mb->wr_ptr ()),
                            ACE_SIZE_T_FORMAT_SPECIFIER,
                            count);
           n = ACE_OS::strlen (mb->rd_ptr ());
diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp
index bb8d8e0cf49..fd77f41714b 100644
--- a/tests/Time_Value_Test.cpp
+++ b/tests/Time_Value_Test.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
 // $Id$
 
 // ============================================================================
@@ -191,13 +190,13 @@ run_main (int, ACE_TCHAR *[])
   ACE_Time_Value tv4 (1, 1000000);
   ACE_Time_Value tv5 (2UL);
   ACE_Time_Value tv6 (1, -1000000);
-  ACE_Time_Value tv7 (ACE_static_cast (long, 2.0));
+  ACE_Time_Value tv7 (static_cast<long> (2.0));
 
   // Beware!  2.5 gets truncated to 2!
   // NOTE:  this is intended to show what happens with
   // ACE_Time_Value (2.5).  Some compilers, such as g++ 2.7.2.3,
   // actually warn about it without the case.
-  ACE_Time_Value tv8 (ACE_static_cast (long, 2.5));
+  ACE_Time_Value tv8 (static_cast <long> (2.5));
 
   // Test assignment operator, tv9 and tv6 must be the same after this
   ACE_Time_Value tv9;
diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp
index 0fac4b94c72..2ec6c5c597c 100644
--- a/tests/Timeprobe_Test.cpp
+++ b/tests/Timeprobe_Test.cpp
@@ -21,11 +21,12 @@
 //#define ACE_TSS_TIMEPROBES
 
 #include "tests/test_config.h"
-#include "ace/Timeprobe.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Recursive_Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Timeprobe.h"
 
 ACE_RCSID(tests, Timeprobe_Test, "$Id$")
 
diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp
index 0ea7e561998..13427a3503b 100644
--- a/tests/Timer_Queue_Test.cpp
+++ b/tests/Timer_Queue_Test.cpp
@@ -486,7 +486,7 @@ public:
   // = Initialization method
   Timer_Queue_Stack (ACE_Timer_Queue *queue,
     const ACE_TCHAR *name,
-    Timer_Queue_Stack *next = NULL)
+    Timer_Queue_Stack *next = 0)
     : queue_ (queue),
     name_ (name),
     next_ (next)
@@ -515,7 +515,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   // = Perform initializations.
 
-  Timer_Queue_Stack *tq_stack = NULL;
+  Timer_Queue_Stack *tq_stack = 0;
 
   // Add new Timer_Queue implementations here.  Note that these will
   // be executed in "reverse order".
@@ -587,7 +587,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   Timer_Queue_Stack *tq_ptr = tq_stack;
 
-  while (tq_ptr != NULL)
+  while (tq_ptr != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("**** starting test of %s\n"),
diff --git a/tests/TkReactor_Test.cpp b/tests/TkReactor_Test.cpp
index c6089e47c5c..26e2895d0e1 100644
--- a/tests/TkReactor_Test.cpp
+++ b/tests/TkReactor_Test.cpp
@@ -28,21 +28,6 @@ ACE_RCSID (tests,
            TkReactor_Test,
            "$Id$")
 
-#if !defined (ACE_HAS_TK)
-
-int run_main (int, ACE_TCHAR*[])
-{
-  ACE_START_TEST (ACE_TEXT ("TkReactor_Test"));
-
-  ACE_ERROR ((LM_ERROR,
-              "Tk not supported on this platform\n"));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#else
-
 #include "ace/Event_Handler.h"
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
@@ -153,7 +138,7 @@ inc_count (ClientData client_data, Tcl_Interp *interp,int, const char **)
   //  sprintf (command,"set %s %s",(char *)client_data,new_string);
   // eval (command);
   const char *varValue = Tcl_SetVar (interp,(char *)client_data,new_string,TCL_LEAVE_ERR_MSG);
-  if (varValue == NULL)
+  if (varValue == 0)
     return TCL_ERROR;
   return TCL_OK;
 }
@@ -176,7 +161,7 @@ inc_tmo (ClientData client_data)
   //  sprintf (command,"set %s %s",(char *)client_data,new_string);
   //  eval (command);
   const char *varValue = Tcl_SetVar (tcl_interp,(char *)client_data,new_string,TCL_LEAVE_ERR_MSG);
-  if (varValue == NULL)
+  if (varValue == 0)
     ACE_ERROR ((LM_ERROR,"Tcl_SetVar failed in inc_tmo\n"));
 
   (void) Tk_CreateTimerHandler (1000,
@@ -200,7 +185,7 @@ public:
     //    sprintf (command,"set %s %s",(char *)arg,new_string);
     //    eval (command);
     const char *varValue = Tcl_SetVar (tcl_interp,(char *)arg,new_string,TCL_LEAVE_ERR_MSG);
-    if (varValue == NULL)
+    if (varValue == 0)
       ACE_ERROR_RETURN ((LM_ERROR,"Tcl_SetVar failed in handle_timeout\n"),-1);
 
     return 0;
@@ -316,7 +301,7 @@ run_main (int, ACE_TCHAR *[])
                       -1);
 
   ACE_Thread_Manager::instance ()->spawn ((ACE_THR_FUNC) client,
-                                          NULL,
+                                          0,
                                           THR_NEW_LWP | THR_DETACHED);
 
   while (!quit)
@@ -337,5 +322,3 @@ run_main (int, ACE_TCHAR *[])
   ACE_END_TEST;
   return 0;
 }
-
-#endif /* ACE_HAS_TK */
diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp
index a8849480a0d..24d08fdc5f7 100644
--- a/tests/UPIPE_SAP_Test.cpp
+++ b/tests/UPIPE_SAP_Test.cpp
@@ -184,20 +184,3 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if defined (__BORLANDC__)
-// Borland C++ doesn't link with these instantiations in the ACE library.
-template class ACE_Stream<ACE_SYNCH>;
-template class ACE_Double_Linked_List<ACE_Thread_Descriptor>;
-template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
-template class ACE_Unbounded_Queue<ACE_Thread_Descriptor_Base>;
-#endif /* defined (__BORLANDC__) */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if defined (__BORLANDC__)
-// Borland C++ doesn't link with these instantiations in the ACE library.
-#pragma instantiate ACE_Stream<ACE_SYNCH>
-#pragma instantiate ACE_Double_Linked_List<ACE_Thread_Descriptor>
-#pragma instantiate ACE_Unbounded_Queue<ACE_Thread_Descriptor*>
-#pragma instantiate ACE_Unbounded_Queue<ACE_Thread_Descriptor_Base>
-#endif /* defined (__BORLANDC__) */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Unbounded_Set_Test.cpp b/tests/Unbounded_Set_Test.cpp
index f95777b4ae0..69d88068240 100644
--- a/tests/Unbounded_Set_Test.cpp
+++ b/tests/Unbounded_Set_Test.cpp
@@ -10,7 +10,6 @@
 //
 // = DESCRIPTION
 //      This test illustrates the use of ACE_Unbounded_Set.
-//      In addition, it acts as a regression test for Bugzilla bug 1460.
 //      No command line arguments are needed to run the test.
 //
 // = AUTHOR
@@ -130,19 +129,6 @@ run_main (int, ACE_TCHAR *[])
   size_t s = count_const_set (ubs);
   ACE_ASSERT (s == ubs.size ());
 
-  // Test deletion under the cursor.
-  // This is the regression test for Bugzilla bug 1460.
-  {
-    MySet::iterator end = ubs2.end ();
-    for (MySet::iterator i = ubs2.begin (); i != end; i++)
-      {
-        r = ubs2.remove (*i);
-        ACE_ASSERT (r == 0);
-      }
-    ACE_ASSERT (ubs2.size () == 0);
-  }
-  ACE_ASSERT (ubs2.is_empty ());
-
   ACE_END_TEST;
   return 0;
 }
diff --git a/tests/Unbounded_Set_Test_Ex.cpp b/tests/Unbounded_Set_Test_Ex.cpp
deleted file mode 100644
index 0b395ca3c5e..00000000000
--- a/tests/Unbounded_Set_Test_Ex.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Unbounded_Set_Test_Ex.cpp
-//
-// = DESCRIPTION
-//      This test is a carbon copy of the Unbounded_Set_Test, but uses
-//      the ACE_Unbounded_Set_Ex class instead of ACE_Unbounded_Set.
-//      It is for side-by-side comparison to demonstrate that
-//      ACE_Unbounded_Set_Ex fixes Bugzilla bug 1460.
-//      No command line arguments are needed to run the test.
-//
-// = AUTHOR
-//    Rudolf Weber <rfweber@tesionmail.de>,
-//    ace/tests integration <Oliver.Kellogg@sysde.eads.net>
-//
-// ============================================================================
-
-#include "test_config.h"
-#include "Unbounded_Set_Test_Ex.h"
-#include "ace/Unbounded_Set_Ex.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/SString.h"
-
-ACE_RCSID(tests, Unbounded_Set_Test_Ex, "$Id$")
-
-size_t count_const_set (const ACE_Unbounded_Set_Ex<MyNode>& cubs)
-{
-  size_t number_of_elements = 0;
-  for (ACE_Unbounded_Set_Ex<MyNode>::const_iterator ci (cubs); !ci.done(); ci++)
-    number_of_elements++;
-  return number_of_elements;
-}
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  int r;
-  unsigned k;
-  MyNode node (1);
-
-  ACE_START_TEST (ACE_TEXT ("Unbounded_Set_Test_Ex"));
-
-  ACE_Unbounded_Set_Ex<MyNode> ubs;
-  ACE_ASSERT (ubs.size () == 0);
-
-  // Insert a value. Immediately remove it.
-  r = ubs.insert (node);
-  ACE_ASSERT (r == 0);
-  ACE_ASSERT (ubs.size () == 1);
-  r = ubs.remove (node);
-  ACE_ASSERT (r == 0);
-  ACE_ASSERT (ubs.size () == 0);
-
-  // Insert several different values.
-  for (node.k = 1; node.k <= 5; node.k++)
-    {
-      r = ubs.insert (node);
-      ACE_ASSERT (r == 0);
-      ACE_ASSERT (ubs.size () == node.k);
-    }
-
-  // Test assigment of sets.
-  // To do that, we also test some of the iterator methods.
-  typedef ACE_Unbounded_Set_Ex<MyNode> MySet;
-  MySet ubs2 = ubs;              // Test a typedef of a set.
-  ACE_ASSERT (ubs2.size() == ubs.size());
-  {
-    MySet::ITERATOR it1 (ubs);
-    MySet::iterator it2 (ubs2);
-    for (k = 1; k <= 5; k++)
-      {
-        ACE_ASSERT (! it1.done ());
-        ACE_ASSERT (! it2.done ());
-        MyNode n1 = *it1;
-        MyNode n2 = *it2;
-        ACE_ASSERT (n1 == n2);
-        it1.advance ();
-        it2.advance ();
-      }
-    ACE_ASSERT (it1.done ());
-    ACE_ASSERT (it2.done ());
-    // Verify that a set may be emptied while an iterator on the set is
-    // in-scope but inactive:
-    ubs.reset ();
-    // Restore original set from ubs2
-    ubs = ubs2;
-  }
-
-  // Selective deletion of elements and element retrieval.
-  {
-    MySet::iterator it (ubs2);
-    int deleted = 0;
-    while (! it.done ())
-      {
-        MyNode n = *it;
-        it.advance ();  /* Being friendly here: Move the iterator on
-                           so that element removal does not interfere
-                           with the current iterator position.
-                           The less friendly case, removal under the
-                           current iterator position, is below.  */
-        if (n.k % 2 == 1)
-          {
-            r = ubs2.remove (n);
-            deleted++;
-          }
-      }
-    ACE_ASSERT (ubs2.size () + deleted == ubs.size());
-
-    MyNode node2 (2);
-    ACE_ASSERT (ubs2.find (node2) == 0);
-
-    MyNode node3 (3);
-    ACE_ASSERT (ubs2.find (node3) != 0);
-
-    ubs2.insert (node3);
-  }
-
-  size_t s = count_const_set (ubs);
-  ACE_ASSERT (s == ubs.size ());
-
-  // Test deletion under the cursor.
-  // This is the regression test for Bugzilla bug 1460.
-  {
-    MySet::iterator end = ubs2.end ();
-    for (MySet::iterator i = ubs2.begin (); i != end; i++)
-      {
-        r = ubs2.remove (*i);
-        ACE_ASSERT (r == 0);
-      }
-    ACE_ASSERT (ubs2.size () == 0);
-  }
-  ACE_ASSERT (ubs2.is_empty ());
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<MyNode>;
-template class ACE_Unbounded_Set_Ex<MyNode>;
-template class ACE_Unbounded_Set_Ex_Iterator<MyNode>;
-template class ACE_Unbounded_Set_Ex_Const_Iterator<MyNode>;
-template class ACE_Auto_Basic_Ptr<ACE_CString>;
-template class auto_ptr<ACE_CString>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<MyNode>
-#pragma instantiate ACE_Unbounded_Set_Ex<MyNode>
-#pragma instantiate ACE_Unbounded_Set_Ex_Iterator<MyNode>
-#pragma instantiate ACE_Unbounded_Set_Ex_Const_Iterator<MyNode>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_CString>
-#pragma instantiate auto_ptr<ACE_CString>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/tests/Unbounded_Set_Test_Ex.h b/tests/Unbounded_Set_Test_Ex.h
deleted file mode 100644
index 1987bd7feaa..00000000000
--- a/tests/Unbounded_Set_Test_Ex.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Unbounded_Set_Test_Ex.h
-//
-// = DESCRIPTION
-//    This class gets its own header file to work around AIX C++
-//    compiler "features" related to template instantiation...  It is
-//    only used by Unbounded_Set_Test_Ex.cpp.
-//
-// = AUTHOR
-//      Oliver Kellogg <Oliver.Kellogg@sysde.eads.net>
-//
-// ============================================================================
-
-#ifndef ACE_TESTS_UNBOUNDED_SET_TEST_EX_H
-#define ACE_TESTS_UNBOUNDED_SET_TEST_EX_H
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-struct MyNode
-{
-  unsigned k;
-  MyNode () : k (0) {}
-  MyNode (int pk) : k (pk) {}
-  MyNode (const MyNode& o) : k (o.k) {}
-  bool operator== (const MyNode& o) { return (k == o.k); }
-};
-
-#endif /* ACE_TESTS_UNBOUNDED_SET_TEST_EX_H */
diff --git a/tests/Vector_Test.cpp b/tests/Vector_Test.cpp
index 61b3d0b9f50..6ca974c548d 100644
--- a/tests/Vector_Test.cpp
+++ b/tests/Vector_Test.cpp
@@ -23,7 +23,7 @@ ACE_RCSID(tests, Vector_Test, "$Id$")
 #include "ace/Vector_T.h"
 
 typedef size_t DATA;
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x570)
 // Borland C++ Builder 6 and earlier don't handle the second template
 // argument correctly. We have to pass it explicitly
 typedef ACE_Vector<DATA, ACE_VECTOR_DEFAULT_SIZE> VECTOR;
diff --git a/tests/XtReactor_Test.cpp b/tests/XtReactor_Test.cpp
deleted file mode 100644
index ed9fbabde15..00000000000
--- a/tests/XtReactor_Test.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    XtReactor_Test.cpp
-//
-// = DESCRIPTION
-//      This is a simple test that illustrates the possibility to integrate
-//      ACE to the X Main Loop. This program uses ACE_XtReactor class to
-//      schedule three additional event sources:
-//      1. Events from button "Stop Test" (registed with XtAddCallback)
-//      2. Events from button "Press Me" (registed with XtAddCallback)
-//      3. Events from X timer (registed with XtAppAddTimeOut)
-//      4. Events from ACE timer (registed with ACE_XtReactor::schedule_timer)
-//      5. Events from the TCP/IP channel using ACE_Acceptor
-//      No command line arguments are needed to run the test.
-//
-// = AUTHOR
-//    Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
-//
-// ============================================================================
-
-#include "test_config.h"
-
-ACE_RCSID (tests,
-           XtReactor_Test,
-           "$Id$")
-
-#if defined (ACE_HAS_XT)
-
-#include "ace/XtReactor.h"
-#include "ace/Event_Handler.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-#include "ace/OS_NS_unistd.h"
-
-#include /**/ <X11/Intrinsic.h>
-#include /**/ <X11/Xatom.h>
-#include /**/ <X11/Shell.h>
-
-#if !defined (ACE_LACKS_MOTIF)
-
-#include /**/ <Xm/Xm.h>
-#include /**/ <Xm/Label.h>
-#include /**/ <Xm/PushB.h>
-#include /**/ <Xm/RowColumn.h>
-
-static void set_label(Widget w, const char *p)
-{
-  XtVaSetValues (w,
-                 XmNlabelString,
-                 XmStringCreateLocalized( (char*) p),
-                 NULL);
-}
-#define LABEL_WIDGET xmLabelWidgetClass
-#define BUTTON_WIDGET xmPushButtonWidgetClass
-#define PRESS_ME_CALLBACK XmNactivateCallback
-static Widget create_box(Widget parent, const char *name)
-{
-  Arg al[10];
-  int ac = 0;
-  XtSetArg (al[ac], XmNnumColumns, 3); ac++;
-  XtSetArg (al[ac], XmNpacking, XmPACK_COLUMN); ac++;
-  XtSetArg (al[ac], XmNentryAlignment, XmALIGNMENT_CENTER); ac++;
-  return XmCreateRowColumn (parent, (char *) name, al, ac);
-}
-
-#else  // Athena Widgets
-
-#include /**/ <X11/Xaw/Command.h>
-#include /**/ <X11/Xaw/Label.h>
-#include /**/ <X11/Xaw/Box.h>
-#include /**/ <X11/StringDefs.h>
-
-static void set_label(Widget w, const char *p)
-{
-    XtVaSetValues (w, XtNlabel, p, NULL);
-}
-#define LABEL_WIDGET labelWidgetClass
-#define BUTTON_WIDGET commandWidgetClass
-#define PRESS_ME_CALLBACK XtNcallback
-static Widget create_box(Widget parent, const char * name)
-{
-    return XtCreateWidget( (char*) name, boxWidgetClass, parent, NULL, 0);
-}
-#endif /* ACE_HAS_MOTIF */
-
-// Port we listen on.
-static const u_short SERV_TCP_PORT = 6670;
-
-// counter for events from "Press Me" button.
-static int count1 = 0;
-
-// counter for events from X Timer.
-static int count2 = 0;
-
-// counter for events from ACE Timer.
-static int count3 = 0;
-
-// Callback for "Stop Test" buton - quit the program.
-void
-Quit (Widget, XtPointer, XtPointer)
-{
-  ACE_OS::exit (0);
-}
-
-static void *
-client (void *)
-{
-  char buf[100];
-  size_t mes_len;
-  ACE_OS::sleep (1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              " (%P) Client: Starting...\n"));
-
-  ACE_SOCK_Stream stream;
-  ACE_SOCK_Connector connector;
-  sprintf (buf, "Client: the life was good!");
-
-  mes_len = (int) htonl (ACE_OS::strlen (buf) + 1);
-
-  if (connector.connect (stream,
-                         ACE_INET_Addr (SERV_TCP_PORT,
-                                        ACE_DEFAULT_SERVER_HOST)) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "(%P) %p\n",
-                "Socket open"));
-
-  if (stream.send (4,
-                   (void *) &mes_len,
-                   sizeof (size_t),
-                   (void *)buf,
-                   ACE_OS::strlen (buf) + 1) == -1)
-
-    ACE_ERROR ((LM_ERROR,
-                "(%P) %p\n",
-                "Socket send"));
-
-  if (stream.close () == -1)
-    ACE_ERROR ((LM_ERROR,
-                "(%P) %p\n",
-                "Socket close"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P) Client: Message has been sent, about to exit...\n"));
-  return 0;
-}
-
-// Callback for "Press Me" button.
-
-static void
-inc_count (Widget, XtPointer client_data, XtPointer)
-{
-  char new_string[80];
-
-  sprintf (new_string,
-           "Events: [%d] [%d] [%d]",
-           count1++,
-           count2,
-           count3);
-  set_label((Widget) client_data, new_string);
-}
-
-// Callback for X Timer.
-
-static void
-inc_tmo (void *w,XtIntervalId *)
-{
-  char new_string[80];
-
-  if (count2 > 10)
-    ACE_OS::exit (0);
-  sprintf (new_string,
-           "Events: [%d] [%d] [%d]",
-           count1,
-           count2++,
-           count3);
-
-  set_label((Widget) w, new_string);
-
-  (void) XtAppAddTimeOut (XtWidgetToApplicationContext ((Widget) w),
-                          1000,
-                          inc_tmo,
-                          (Widget) w);
-}
-
-class EV_handler : public ACE_Event_Handler
-{
-public:
-  virtual int handle_timeout (const ACE_Time_Value &,
-                              const void *arg)
-  {
-    char new_string[80];
-    sprintf (new_string,
-             "Events: [%d] [%d] [%d]",
-             count1,
-             count2,
-             count3++);
-    set_label((Widget) arg, new_string);
-    return 0;
-  }
-};
-
-class Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  virtual int open (void *)
-  {
-    char buf[100];
-    int head;
-    ssize_t ret = this->peer ().recv_n ((char *) &head,
-                                        sizeof (int));
-    if (ret != sizeof (int))
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P) %p\n",
-                         "read header"),
-                        -1);
-
-    ret = this->peer ().recv_n (buf,
-                                (int) ntohl (head));
-
-    if (ret != (int) ntohl (head))
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P) %p\n",
-                         "read message"),
-                        -1);
-    ACE_DEBUG ((LM_DEBUG,
-                " (%P)Server (ACE_SOCKET channel message): [%s]\n",
-                buf));
-    return 0;
-  }
-};
-
-#if defined (HummingBird_X)
-extern "C" void HCLXmInit (void);
-#endif /* HummingBird_X */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_XT */
-
-int
-run_main (int argc, ACE_TCHAR *argv[])
-{
-  ACE_START_TEST (ACE_TEXT ("XtReactor_Test"));
-
-#if defined (ACE_HAS_XT)
-  XtAppContext app_context;
-  Widget topLevel, goodbye, PressMe, lbl, digits_rc;
-  Widget children[5];
-
-#if defined (HummingBird_X)
-  HCLXmInit ();
-#endif /* HummingBird_X */
-  topLevel = XtVaAppInitialize (&app_context,
-                                "XTReactor_Test",
-                                NULL,
-                                0,
-                                &argc,
-                                argv,
-                                NULL,
-                                NULL);
-
-  digits_rc = create_box(topLevel, "digits_rc");
-
-  //"Stop Test" button.
-  goodbye = XtCreateWidget ( (char *) "goodbye",
-                             BUTTON_WIDGET,
-                             digits_rc,
-                             NULL,
-                             0);
-  set_label(goodbye, "Stop Test");
-
-  //"Press Me" button
-  PressMe = XtCreateWidget ((char *) "PressMe",
-                            BUTTON_WIDGET,
-                            digits_rc,
-                            NULL,
-                            0);
-
-  //Display for event counter
-  lbl = XtCreateWidget ((char *) "label_for_event_one",
-                        LABEL_WIDGET,
-                        digits_rc,
-                        NULL,
-                        0);
-  set_label(lbl, "label_for_all_events");
-  int ac = 0;
-  children[ac++] = goodbye;
-  children[ac++] = PressMe;
-  children[ac++] = lbl;
-  XtManageChildren (children, ac);
-  XtManageChild (digits_rc);
-
-  //Register callback for "Stop Test" button
-  XtAddCallback (goodbye, PRESS_ME_CALLBACK, Quit, 0);
-
-  //Register callback for "Press Me" button
-  XtAddCallback (PressMe,
-                 PRESS_ME_CALLBACK,
-                 inc_count,
-                 (XtPointer) lbl);
-
-  // Register callback for X Timer
-  (void) XtAppAddTimeOut (app_context,
-                          1000,
-                          inc_tmo,
-                          (XtPointer) lbl);
-
-  XtRealizeWidget (topLevel);
-
-  // It will perform X Main Loop
-  ACE_XtReactor reactor (app_context);
-
-  ACE_Reactor r (&reactor);
-
-  //Event Handler for ACE Timer.
-  EV_handler evh;
-
-  ACE_Acceptor <Connection_Handler, ACE_SOCK_ACCEPTOR> acceptor;
-
-  if (acceptor.open (ACE_INET_Addr ((u_short) SERV_TCP_PORT),
-                     &r) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
-                      -1);
-
-  if (reactor.schedule_timer (&evh,
-                              (const void *) lbl,
-                              ACE_Time_Value (2),
-                              ACE_Time_Value (2))==-1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) can't register with reactor\n"),
-                      -1);
-
-  ACE_Thread_Manager::instance ()->spawn ((ACE_THR_FUNC) client,
-                                          NULL,
-                                          THR_NEW_LWP | THR_DETACHED);
-
-  XtAppMainLoop (XtWidgetToApplicationContext (topLevel));
-#else
-  ACE_UNUSED_ARG (argc);
-  ACE_UNUSED_ARG (argv);
-  ACE_ERROR ((LM_INFO,
-              "Xt not supported on this platform\n"));
-#endif /* ACE_HAS_XT */
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/tests/log/Makefile.am b/tests/log/Makefile.am
deleted file mode 100644
index 916ed556f55..00000000000
--- a/tests/log/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for all the ACE ``one-button'' tests log directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-## This file is just here so that this directory gets added to the
-## distribution
-
-DISTCLEANFILES = \
-         ACE_DLList_Test.log \
-         Aio_Platform_Test.log \
-         Atomic_Op_Test.log  \
-         Barrier_Test.log  \
-         Basic_Types_Test.log  \
-         Buffer_Stream_Test.log  \
-         Conn_Test.log  \
-         Dynamic_Priority_Test.log  \
-         Enum_Interfaces_Test.log  \
-         Env_Value_Test.log  \
-         Future_Test.log  \
-         Handle_Set_Test.log  \
-         Hash_Map_Manager_Test.log \
-         High_Res_Timer_Test.log \
-         IOStream_Test.log  \
-         MM_Shared_Memory_Test.log  \
-         MT_Reactor_Timer_Test.log \
-         MT_SOCK_Test.log  \
-         Map_Manager_Test.log  \
-         Mem_Map_Test.log  \
-         Message_Block_Test.log  \
-         Message_Queue_Notifications_Test.log  \
-         Message_Queue_Test.log  \
-         Naming_Test.log  \
-         Notify_Performance_Test.log  \
-         OrdMultiSet_Test.log  \
-         Pipe_Test.log  \
-         Pipe_Test-children.log \
-         Priority_Buffer_Test.log  \
-         Priority_Reactor_Test.log  \
-         Priority_Task_Test.log  \
-         Process_Mutex_Test.log  \
-         Process_Mutex_Test-children.log \
-         Process_Strategy_Test.log  \
-         Reactor_Exceptions_Test.log  \
-         Reactor_Notify_Test.log  \
-         Reactor_Performance_Test.log  \
-         Reactor_Timer_Test.log  \
-         Reactors_Test.log  \
-         Reader_Writer_Test.log  \
-         Recursive_Mutex_Test.log  \
-         SOCK_Connector_Test.log  \
-         SOCK_Test.log  \
-         SPIPE_Test.log  \
-         SString_Test.log  \
-         SV_Shared_Memory_Test.log  \
-         Semaphore_Test.log  \
-         Service_Config_Test.log  \
-         Sigset_Ops_Test.log  \
-         Simple_Message_Block_Test.log  \
-         TSS_Test.log  \
-         Task_Test.log  \
-         Thread_Manager_Test.log  \
-         Thread_Mutex_Test.log  \
-         Thread_Pool_Test.log  \
-         Time_Service_Test.log  \
-         Time_Value_Test.log  \
-         Timeprobe_Test.log  \
-         Timer_Queue_Test.log  \
-         Tokens_Test.log  \
-         UPIPE_SAP_Test.log  \
-         Upgradable_RW_Test.log \
-         XtReactor_Test.log
diff --git a/tests/run_test.lst b/tests/run_test.lst
index 31f98fa4959..c20800093ca 100644
--- a/tests/run_test.lst
+++ b/tests/run_test.lst
@@ -31,11 +31,11 @@ CDR_Test
 Cache_Map_Manager_Test
 Cached_Accept_Conn_Test: !VxWorks
 Cached_Allocator_Test
-Cached_Conn_Test: !LynxOS !VxWorks
+Cached_Conn_Test: !VxWorks
 Capabilities_Test
 Codecs_Test
 Collection_Test
-Config_Test
+Config_Test: !LynxOS !VxWorks
 Conn_Test: !chorus
 DLL_Test: !Unicos !STATIC !KCC_Linux
 DLList_Test
@@ -43,10 +43,10 @@ Date_Time_Test
 Dev_Poll_Reactor_Test
 Dirent_Test
 Dynamic_Priority_Test
-Enum_Interfaces_Test
+Enum_Interfaces_Test: !LynxOS
 Env_Value_Test: !chorus !WinCE
-FIFO_Test: !Win32 !Cygwin
-Framework_Component_Test: !STATIC
+FIFO_Test
+Framework_Component_Test: !STATIC !LynxOS
 Future_Set_Test
 Future_Test
 Get_Opt_Test
@@ -57,16 +57,16 @@ High_Res_Timer_Test
 INET_Addr_Test
 IOStream_Test
 Lazy_Map_Manager_Test
-Log_Msg_Test
+Log_Msg_Test: !LynxOS
 Logging_Strategy_Test: !STATIC !ST
-MEM_Stream_Test: !VxWorks
+MEM_Stream_Test: !VxWorks !LynxOS
 MM_Shared_Memory_Test: !chorus !Unicos !VxWorks
-MT_Reactor_Timer_Test: !VxWorks
-MT_Reactor_Upcall_Test: !VxWorks
+MT_Reactor_Timer_Test
+MT_Reactor_Upcall_Test
 MT_Reference_Counted_Event_Handler_Test
 MT_Reference_Counted_Notify_Test
-MT_SOCK_Test: !chorus
-Malloc_Test: !VxWorks
+MT_SOCK_Test: !chorus !LynxOS
+Malloc_Test: !VxWorks !LynxOS
 Map_Manager_Test
 Map_Test
 Max_Default_Port_Test: !ST
@@ -77,7 +77,8 @@ Message_Queue_Test: !chorus
 Message_Queue_Test_Ex: !chorus
 Multicast_Test: !ST
 Multihomed_INET_Addr_Test
-Naming_Test: OTHER !chorus !LynxOS !Unicos !VxWorks
+Naming_Test: !chorus !LynxOS !Unicos !VxWorks
+Network_Adapters_Test
 New_Fail_Test: ALL !DISABLED
 NonBlocking_Conn_Test
 Notify_Performance_Test
@@ -93,7 +94,7 @@ Proactor_Scatter_Gather_Test: !chorus !VxWorks !LynxOS
 Proactor_Test: !chorus !VxWorks !LynxOS
 Proactor_Timer_Test: !chorus !VxWorks !LynxOS
 Process_Manager_Test: !chorus !VxWorks
-Process_Mutex_Test: !chorus !VxWorks
+Process_Mutex_Test: !chorus !VxWorks !LynxOS
 RB_Tree_Test
 Reactor_Dispatch_Order_Test
 Reactor_Exceptions_Test
@@ -106,7 +107,7 @@ Reactors_Test
 Reader_Writer_Test
 Recursive_Condition_Test: !ST
 Recursive_Mutex_Test: !ST
-Refcounted_Auto_Ptr_Test: !VxWorks
+Refcounted_Auto_Ptr_Test
 Reference_Counted_Event_Handler_Test
 Reverse_Lock_Test
 SOCK_Connector_Test
@@ -116,30 +117,30 @@ SPIPE_Test: !VxWorks
 SString_Test
 SV_Shared_Memory_Test: !MSVC !Unicos !VxWorks !RH_7.1
 Semaphore_Test
-Service_Config_Test: !STATIC
+Service_Config_Test: !STATIC !LynxOS
 Sigset_Ops_Test
 Simple_Message_Block_Test: !chorus
 Svc_Handler_Test
-TP_Reactor_Test: ALL
+TP_Reactor_Test: !LynxOS
 TSS_Test
 TSS_Static_Test
 Task_Test
 Task_Ex_Test
 Thread_Manager_Test: !Unicos
 Thread_Mutex_Test: !chorus
-Thread_Pool_Reactor_Resume_Test: OTHER !ST
-Thread_Pool_Reactor_Test: OTHER
-Thread_Pool_Test: !LynxOS !VxWorks
-Time_Service_Test: ALL !STATIC !DISABLED !missing_netsvcs TOKEN !chorus !Unicos
+Thread_Pool_Reactor_Resume_Test: !ST
+Thread_Pool_Reactor_Test
+Thread_Pool_Test
+Time_Service_Test: !STATIC !DISABLED !missing_netsvcs TOKEN !chorus !Unicos
 Time_Value_Test
 Timeprobe_Test
 Timer_Cancellation_Test
 Timer_Queue_Reference_Counting_Test
 Timer_Queue_Test
 Token_Strategy_Test: !ST
-Tokens_Test: ALL MSVC !DISABLED TOKEN !chorus !Unicos
+Tokens_Test: MSVC !DISABLED TOKEN !chorus !Unicos
 UPIPE_SAP_Test: !VxWorks
-Unbounded_Set_Test_Ex
+Unbounded_Set_Test
 Upgradable_RW_Test: !chorus
 Vector_Test
 WFMO_Reactor_Test
@@ -151,6 +152,7 @@ Proactor_Test_IPV6
 SOCK_Send_Recv_Test_IPV6
 SOCK_Dgram_Test
 SOCK_Dgram_Bcast_Test
+SOCK_SEQPACK_SCTP_Test: !MSVC
 SOCK_Test_IPv6
-Process_Strategy_Test: !chorus !LynxOS !VxWorks
+Process_Strategy_Test: !chorus !VxWorks
 Recursive_Condition_Bug_Test: !ST
diff --git a/tests/run_test.pl b/tests/run_test.pl
index 4393a012876..b8a6d0d82cb 100755
--- a/tests/run_test.pl
+++ b/tests/run_test.pl
@@ -7,7 +7,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This file is for running the tests in the ACE tests directory.
 # It is usually used for auto_compiles.
 
-use lib "$ENV{ACE_ROOT}/bin";
+if (defined $ENV{ACE_ROOT}) {
+  use lib "$ENV{ACE_ROOT}/bin";
+}
+if (defined $ENV{top_srcdir}) {
+  use lib "$ENV{top_srcdir}/bin";
+}
 use PerlACE::Run_Test;
 
 use Cwd;
@@ -17,6 +22,9 @@ use FileHandle;
 
 $config_list = new PerlACE::ConfigList;
 
+$set_vx_defgw = 1;
+$do_vx_init = 1;
+
 ################################################################################
 
 sub check_for_more_configs ()
@@ -105,7 +113,7 @@ sub run_program ($)
     my $P;
 
     if ($config_list->check_config ('Valgrind')) {
-      $P = new PerlACE::Process ($program);   
+      $P = new PerlACE::Process ($program);
       $P->IgnoreExeSubDir(1);
     }
     else {
@@ -147,18 +155,117 @@ sub run_program ($)
 
 ################################################################################
 
+sub run_vxworks_command ($)
+{
+    my $program = shift;
+
+    unlink <log/$program*.log>;
+    unlink "core";
+    unlink "run_test.vxs";
+
+    my $P;
+
+    my $WINDSH = $ENV{"ACE_RUN_WINDSH"};
+    if (!defined $WINDSH) {
+        $WINDSH = $ENV{"WIND_BASE"} . "\\host\\" . $ENV{"WIND_HOST_TYPE"} . "\\bin\\windsh";
+    }
+
+    ## check module existence
+    if (! -e $program . ".out") {
+        print STDERR "Error: " . $program . ".out" .
+                     " does not exist\n";
+        return;
+    }
+
+	## initialize VxWorks kernel (reboot!) if starting first test
+    if ($do_vx_init) {
+        ## reboot VxWorks kernel to cleanup
+        $P = new PerlACE::Process ($WINDSH, "-e \"shParse {reboot}; shParse{exit}\" " . $ENV{"ACE_RUN_VX_TGTSVR"});
+        $P->SpawnWaitKill (60);
+		$set_vx_defgw = 1;
+		$do_vx_init = 0;
+    }
+
+
+    my $oh = new FileHandle();
+    if (!open($oh, ">run_test.vxs")) {
+        print STDERR "ERROR: Unable to write to run_test.vxs\n";
+        return;
+    }
+
+    print $oh "?\n" .
+              "proc aceRunTest {fname} {\n" .
+              "  shParse \"ld 1,0,\\\"\$fname\\\"\"\n" .
+              "  set procId [shParse { taskSpawn 0,100,0x0008,64000,ace_main }]\n" .
+              "  while { [shParse \"taskIdFigure \$procId\"] != -1 } {\n" .
+              "    shParse { taskDelay (13 * sysClkRateGet ()) }\n" .
+              "  }\n" .
+              "  shParse \"unld \\\"\$fname\\\"\"\n" .
+              "}\n" .
+              "?\n";
+
+	if ( defined $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} && $set_vx_defgw ) {
+      print $oh "\n" .
+                "mRouteAdd(\"0.0.0.0\", \"" . $ENV{"ACE_RUN_VX_TGTSVR_DEFGW"} . "\", 0,0,0)\n";
+	  $set_vx_defgw = 0;
+	}
+
+    print $oh "\n" .
+              "cd \"" . $ENV{"ACE_ROOT"} . "/tests\"\n" .
+              "\@cd \"" . $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} . "/tests\"\n" .
+              "putenv(\"TMPDIR=" . $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} . "/tests\")\n";
+
+    output_vxworks_commands ($oh, $program);
+
+    print $oh "\n" .
+              "exit\n";
+
+    close($oh);
+
+    $P = new PerlACE::Process ($WINDSH, "-s run_test.vxs " . $ENV{"ACE_RUN_VX_TGTSVR"});
+    $P->IgnoreExeSubDir(1);
+
+    ### Try to run the VxWorks shell
+
+    print "auto_run_tests: tests/$program\n";
+    my $start_time = time();
+    $status = $P->SpawnWaitKill (400);
+    my $time = time() - $start_time;
+
+    ### Check for problems
+
+    if ($status == -1 || $config_list->check_config ('VX_TGT_REBOOT')) {
+        if ($status == -1) {
+            print STDERR "Error: $program FAILED (time out)\n";
+            $P->Kill ();
+            $P->TimedWait (1);
+		}
+        ## reboot VxWorks kernel to cleanup leftover module
+        $P = new PerlACE::Process ($WINDSH, "-e \"shParse {reboot}; shParse{exit}\" " . $ENV{"ACE_RUN_VX_TGTSVR"});
+        $P->SpawnWaitKill (60);
+		sleep(90);
+		$set_vx_defgw = 1;
+    }
+
+    print "\nauto_run_tests_finished: test/$program Time:$time"."s Result:$status\n";
+
+    check_log ($program);
+}
+
+################################################################################
+
 sub output_vxworks_commands
 {
   my($oh)      = shift;
   my($program) = shift;
   my($length)  = length($program) + 2;
+
   if ($config_list->check_config ('CHECK_RESOURCES')) {
     print $oh "memShow();\n";
   }
+
   print $oh "write(2, \"\\n$program\\n\", $length);\n" .
-            "ld < $program\n" .
-            "ace_main (0, 0);\n" .
-            "unld \"$program\"\n";
+            "?aceRunTest {$program.out}\n"
 }
 
 ################################################################################
@@ -192,8 +299,14 @@ sub check_log ($)
     my $program = shift;
 
     ### Check the logs
-
-    local $log = "log/".$program.".log";
+    local $log_suffix;
+    if (defined $ENV{"ACE_WINCE_TEST_CONTROLLER"}) {
+        $log_suffix = ".txt";
+    }
+    else {
+        $log_suffix = ".log";
+    }
+    local $log = "log/".$program.$log_suffix;
 
     if (-e "core") {
         print STDERR "Error: $program dumped core\n";
@@ -261,7 +374,7 @@ sub check_log ($)
             # Now check for any sub-logs. If either the main log or a
             # sub-log has an error, print the sub-log.
             opendir (THISDIR, "log");
-            local $sublognames = "$program\-.*\.log";
+            local $sublognames = "$program\-.*".$log_suffix;
             @sublogs = grep (/$sublognames/, readdir (THISDIR));
             closedir (THISDIR);
             foreach $log (@sublogs) {
@@ -294,7 +407,7 @@ sub check_log ($)
                        print STDERR "Error ($log): no line with 'Starting'\n";
                        $print_log = 1;
                     }
- 
+
                     if ($number_ending == 0) {
                        print STDERR "Error ($log): no line with 'Ending'\n";
                        $print_log = 1;
@@ -403,6 +516,10 @@ if (!($tmp = $ENV{TMP}) && !($tmp = $ENV{TEMP})) {
 
 check_for_more_configs ();
 
+if ($config_list->check_config ('VxWorks')) {
+    $opt_v = 1;
+}
+
 @tests = ();
 
 if (defined $opt_t) {
@@ -421,13 +538,13 @@ record_resources () if (!defined $opt_d);
 my($oh) = \*STDOUT;
 if (defined $opt_v && defined $opt_o) {
   $oh = new FileHandle();
-  if (!open($oh, ">$opt_o")) {
-    print STDERR "ERROR: Unable to write to $opt_o\n";
-    exit(1);
+  if ($opt_o != 1) {
+    if (!open($oh, ">$opt_o")) {
+      print STDERR "ERROR: Unable to write to $opt_o\n";
+      exit(1);
+    }
   }
-}
 
-if (defined $opt_v) {
   print $oh "#\n" .
             "# ACE one-button test for VxWorks 5.x.\n" .
             "# To use:  -> < run_test.vxworks > run_test.log\n" .
@@ -439,21 +556,40 @@ if (defined $opt_v) {
             "#\n" .
             "# The output logs can be checked from a Unix host:\n" .
             "#    % ./run_tests.check log/*.log\n\n";
+
+  print $oh "?\n" .
+            "proc aceRunTest {fname} {\n" .
+            "  shParse \"ld 1,0,\\\"\$fname\\\"\"\n" .
+            "  set procId [shParse { taskSpawn 0,100,0x0008,64000,ace_main }]\n" .
+            "  while { [shParse \"taskIdFigure \$procId\"] != -1 } {\n" .
+            "    shParse { taskDelay (13 * sysClkRateGet ()) }\n" .
+            "  }\n" .
+            "  shParse \"unld \\\"\$fname\\\"\"\n" .
+            "}\n" .
+            "?\n";
+
+  foreach $test (@tests) {
+    output_vxworks_commands ($oh, $test);
+  }
 }
+else {
+  $set_vx_defgw = 1;
+  $do_vx_init = 1;
 
-foreach $test (@tests) {
+  foreach $test (@tests) {
     if (defined $opt_d) {
-        print "Would run test $test now\n";
+      print "Would run test $test now\n";
     }
     elsif ($config_list->check_config ('Purify')) {
-        purify_program ($test);
+      purify_program ($test);
     }
-    elsif (defined $opt_v) {
-        output_vxworks_commands ($oh, $test);
+    if (defined $opt_v) {
+      run_vxworks_command ($test);
     }
     else {
-        run_program ($test);
+      run_program ($test);
     }
+  }
 }
 
 check_resources ($oh) if (!defined $opt_d);
diff --git a/tests/test_config.h b/tests/test_config.h
index 74e6934f5da..50c0a23f9d0 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -98,6 +98,9 @@ const size_t ACE_MAX_THREADS = 4;
 #if defined (VXWORKS)
   // This is the only way I could figure out to avoid an error
   // about attempting to unlink a non-existant file.
+
+#include "ace/OS_NS_fcntl.h"
+
 #define ACE_INIT_LOG(NAME) \
   ACE_TCHAR temp[MAXPATHLEN]; \
   ACE_OS::sprintf (temp, ACE_TEXT ("%s%s%s"), \
diff --git a/tests/tests.mpc b/tests/tests.mpc
index 3bca142df5f..2242cb04395 100644
--- a/tests/tests.mpc
+++ b/tests/tests.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*-
 // $Id$
 
-project(Test_Output) : acelib {
+project(Test_Output) : acelib, script {
   sharedname = Test_Output
   dynamicflags = TEST_OUTPUT_BUILD_DLL
   Source_Files {
@@ -13,6 +13,10 @@ project(Test_Output) : acelib {
   }
   Resource_Files {
   }
+  Script_Files {
+    run_test.pl
+    run_test.lst
+  }
 }
 
 project(Framework Component DLL) : acelib {
@@ -463,6 +467,13 @@ project(Multihomed INET Addr Test) : acetest {
   }
 }
 
+project(Network_Adapters_Test) : acetest {
+  exename = Network_Adapters_Test
+  Source_Files {
+    Network_Adapters_Test.cpp
+  }
+}
+
 project(New Fail Test) : acetest {
   exename = New_Fail_Test
   Source_Files {
@@ -869,13 +880,6 @@ project(UPIPE SAP Test) : acetest {
   }
 }
 
-project(Unbounded Set Test Ex) : acetest {
-  exename = Unbounded_Set_Test_Ex
-  Source_Files {
-    Unbounded_Set_Test_Ex.cpp
-  }
-}
-
 project(Upgradable RW Test) : acetest {
   exename = Upgradable_RW_Test
   Source_Files {
@@ -910,26 +914,31 @@ project(Thread Pool Reactor Resume Test) : acetest {
   }
 }
 
-project(XtReactor Test) : acetest {
-  exename   = XtReactor_Test
-  requires += ace_other
+project(XtMotifReactor Test) : acetest, ace_xtreactor, ace_motif {
+  exename   = XtMotifReactor_Test
+
   Source_Files {
-    XtReactor_Test.cpp
+    XtMotifReactor_Test.cpp
   }
 }
 
-project(FlReactor Test) : acetest {
+project(XtAthenaReactor Test) : acetest, ace_xtreactor, ace_athena {
+  exename   = XtAthenaReactor_Test
+  Source_Files {
+    XtAthenaReactor_Test.cpp
+  }
+}
+
+project(FlReactor Test) : acetest, ace_flreactor {
   exename   = FlReactor_Test
-  requires += ace_other
 
   Source_Files {
     FlReactor_Test.cpp
   }
 }
 
-project(TkReactor Test) : acetest {
+project(TkReactor Test) : acetest,ace_tkreactor {
   exename   = TkReactor_Test
-  requires += ace_other
 
   Source_Files {
     TkReactor_Test.cpp
@@ -1064,6 +1073,13 @@ project(UUIDTest) : acetest {
   }
 }
 
+project(Unbounded Set Test) : acetest {
+  exename = Unbounded_Set_Test
+  Source_Files {
+    Unbounded_Set_Test.cpp
+  }
+}
+
 project(INET Addr Test IPV6) : acetest {
   exename = INET_Addr_Test_IPV6
   Source_Files {
@@ -1120,9 +1136,15 @@ project(SOCK_Dgram_Bcast_Test) : acetest {
   }
 }
 
-project(QtReactor Test) : acetest, ace_qt, qt_moc {
+project(SOCK_SEQPACK_SCTP_Test) : acetest {
+  exename = SOCK_SEQPACK_SCTP_Test
+  Source_Files {
+  	SOCK_SEQPACK_SCTP_Test.cpp
+  }
+}
+
+project(QtReactor Test) : acetest, ace_qtreactor {
   exename   = QtReactor_Test
-  requires += qt
   MOC_Files {
     QtReactor_Test.h
   }
diff --git a/websvcs/lib/URL_Addr.cpp b/websvcs/lib/URL_Addr.cpp
index 82ae6e93f2f..86a0a9d0cea 100644
--- a/websvcs/lib/URL_Addr.cpp
+++ b/websvcs/lib/URL_Addr.cpp
@@ -250,8 +250,7 @@ ACE_HTTP_Addr::set (const ACE_TCHAR *host_name,
 
   ACE_TCHAR *buffer;
   ACE_ALLOCATOR_RETURN (buffer,
-                        ACE_reinterpret_cast(ACE_TCHAR *,
-                                             ACE_OS::malloc (size)),
+                        reinterpret_cast<ACE_TCHAR *> (ACE_OS::malloc (size)),
                         -1);
   if (this->addr_to_string (buffer, size, 1) == -1)
     return -1;
@@ -609,8 +608,7 @@ ACE_FTP_Addr::set (const ACE_TCHAR *host_name,
 
   ACE_TCHAR *buffer;
   ACE_ALLOCATOR_RETURN (buffer,
-                        ACE_reinterpret_cast(ACE_TCHAR *,
-                                             ACE_OS::malloc (size)),
+                        reinterpret_cast<ACE_TCHAR *> (ACE_OS::malloc (size)),
                         -1);
   if (this->addr_to_string (buffer, size, 1) == -1)
     return -1;
@@ -839,8 +837,7 @@ ACE_Mailto_Addr::set (const ACE_TCHAR *user,
   size_t size = this->url_size (1);
   ACE_TCHAR *buffer;
   ACE_ALLOCATOR_RETURN (buffer,
-                        ACE_reinterpret_cast(ACE_TCHAR *,
-                                             ACE_OS::malloc (size)),
+                        reinterpret_cast<ACE_TCHAR *> (ACE_OS::malloc (size)),
                         -1);
   if (this->addr_to_string (buffer, size, 1) == -1)
     return -1;
diff --git a/websvcs/tests/Test_URL_Addr.cpp b/websvcs/tests/Test_URL_Addr.cpp
index 602d9375479..22389abcf69 100644
--- a/websvcs/tests/Test_URL_Addr.cpp
+++ b/websvcs/tests/Test_URL_Addr.cpp
@@ -10,7 +10,7 @@ void test_ftp_addr (void);
 void test_mailto_addr (void);
 void test_url_addr (void);
 
-int main (int, char*[])
+int ACE_TMAIN (int, ACE_TCHAR*[])
 {
   test_http_addr ();
   test_ftp_addr ();
@@ -62,7 +62,7 @@ void test_http_addr (void)
                       i, addresses[i]));
           continue;
         }
-      
+
       ACE_TCHAR buffer[BUFSIZ];
       if (addr.addr_to_string (buffer, BUFSIZ, i%2) == 0)
         {
@@ -121,7 +121,7 @@ void test_ftp_addr (void)
                       "FTP[%d]\n"
                       "    \"%s\" ERROR\n",
                       i, addresses[i]));
-                      
+
         }
     }
 }
@@ -162,7 +162,7 @@ void test_mailto_addr (void)
                       "Mailto[%d]\n"
                       "    \"%s\" ERROR\n",
                       i, addresses[i]));
-                      
+
         }
     }
 }
@@ -178,7 +178,7 @@ void test_url_addr (void)
   static int naddresses = sizeof(addresses)/sizeof(addresses[0]);
   for (int i = 0; i < naddresses; ++i)
     {
-      ACE_URL_Addr* addr = 
+      ACE_URL_Addr* addr =
         ACE_URL_Addr::create_address (addresses[i]);
       if (addr == 0)
         {